diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 774da18b982ba1..0a5684b2d9eb3d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -74,3 +74,12 @@ RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/
 RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/
 
 RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.10-hardknott/
+
+# Add access to openocd for VSCode debugging
+RUN chown -R $USERNAME:$USERNAME /opt/openocd
+
+# Fix Tizen SDK paths for new user
+RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
+    && echo TIZEN_SDK_DATA_PATH=/home/$USERNAME/tizen-sdk-data >> $TIZEN_SDK_ROOT/sdk.info \
+    && ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
+    && : # last line
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d7503bcf6d0e62..ba21e5e4402d30 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,7 +17,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.5.73"
+            "BUILD_VERSION": "0.5.77"
         }
     },
     "remoteUser": "vscode",
@@ -38,7 +38,8 @@
         "christian-kohler.path-intellisense",
         "knisterpeter.vscode-github",
         "npclaudiu.vscode-gn",
-        "marus25.cortex-debug"
+        "marus25.cortex-debug",
+        "msedge-dev.gnls"
     ],
     // Use 'settings' to set *default* container specific settings.json values on container create.
     // You can edit these settings after create using File > Preferences > Settings > Remote.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index dcf58ac5b08236..9189db4df34508 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -430,6 +430,7 @@ DS
 duplicative
 DUT
 DV
+DVK
 dynload
 eabi
 EB
@@ -532,6 +533,7 @@ fsync
 ftd
 fullclean
 fuzzer
+FW
 gbl
 gcloud
 GDB
@@ -624,7 +626,6 @@ IlluminanceMeasurement
 IM
 imager
 imagetool
-ImageURI
 imageUri
 img
 Impl
@@ -879,6 +880,7 @@ nongnu
 nordicsemi
 NotAvailable
 notValue
+npm
 nRF
 nrfconnect
 nrfdks
@@ -1103,6 +1105,7 @@ RPi
 RPis
 rsn
 RSSI
+RST
 rsync
 RTL
 rtld
@@ -1274,6 +1277,7 @@ timedInteractionTimeoutMs
 TimeFormatLocalization
 timeoutMs
 TimeSynchronization
+tinycrypt
 Tizen
 TKIP
 tlsr
@@ -1308,6 +1312,7 @@ ttyACMx
 ttymxc
 ttyUSB
 TurbidityConcentrationMeasurement
+TvCasting
 TXD
 txt
 uargument
diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index 7ad83e0a9b68bb..39efab85d61e66 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 00c620e9326e78..7b1a88b1b3ee9a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -107,7 +107,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -237,7 +237,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
new file mode 100644
index 00000000000000..7f856d8e9f085c
--- /dev/null
+++ b/.github/workflows/chef.yaml
@@ -0,0 +1,119 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Build Chef CI examples on all platforms
+
+on:
+    push:
+    pull_request:
+
+concurrency:
+    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    cancel-in-progress: true
+
+jobs:
+
+    validate_zzz:
+        name: Chef - Validate cached ZAP output
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+        container:
+            image: connectedhomeip/chip-build:0.5.77
+            options: --user root
+        steps:
+            - uses: Wandalen/wretry.action@v1.0.15
+              name: Checkout
+              with:
+                  action: actions/checkout@v3
+                  with: |
+                      token: ${{ github.token }}
+                  attempt_limit: 3
+                  attempt_delay: 2000
+            - name: Chef validate zzz
+              shell: bash
+              run: |
+                cd examples/chef
+                python3 chef.py --validate_zzz
+
+    chef_linux:
+        name: Chef - Linux CI Examples
+        needs: validate_zzz
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build:0.5.77
+            options: --user root
+
+        steps:
+            - uses: Wandalen/wretry.action@v1.0.15
+              name: Checkout
+              with:
+                  action: actions/checkout@v3
+                  with: |
+                      token: ${{ github.token }}
+                  attempt_limit: 3
+                  attempt_delay: 2000
+            - name: CI Examples Linux
+              shell: bash
+              run: |
+                ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t linux"
+
+    chef_esp32:
+        name: Chef - ESP32 CI Examples
+        needs: validate_zzz
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-esp32:0.5.77
+            options: --user root
+
+        steps:
+            - uses: Wandalen/wretry.action@v1.0.15
+              name: Checkout
+              with:
+                  action: actions/checkout@v3
+                  with: |
+                      token: ${{ github.token }}
+                  attempt_limit: 3
+                  attempt_delay: 2000
+            - name: CI Examples ESP32
+              shell: bash
+              run: |
+                ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t esp32"
+
+    chef_nrfconnect:
+        name: Chef - NRFConnect CI Examples
+        needs: validate_zzz
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-nrf-platform:0.5.77
+            options: --user root
+
+        steps:
+            - uses: Wandalen/wretry.action@v1.0.15
+              name: Checkout
+              with:
+                  action: actions/checkout@v3
+                  with: |
+                      token: ${{ github.token }}
+                  attempt_limit: 3
+                  attempt_delay: 2000
+            - name: CI Examples NRFConnect
+              shell: bash
+              run: |
+                ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t nrfconnect"
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index 989e263675d9cf..ca77207d322d94 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -38,7 +38,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: connectedhomeip/chip-build-cirque:0.5.75
+        #             image: connectedhomeip/chip-build-cirque:0.5.77
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index 384a85e4d4032d..0f0f57b57104a5 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -29,7 +29,7 @@ concurrency:
 jobs:
     test_suites_chip_tool_darwin:
         name: Test Suites - Darwin
-        timeout-minutes: 120
+        timeout-minutes: 135
 
         strategy:
             matrix:
@@ -82,11 +82,11 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build Apps
-              timeout-minutes: 30
+              timeout-minutes: 45
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                        --target darwin-x64-chip-tool-darwin-${BUILD_VARIANT} \
+                        --target darwin-x64-darwin-framework-tool-${BUILD_VARIANT} \
                         --target darwin-x64-all-clusters-${BUILD_VARIANT} \
                         --target darwin-x64-lock-${BUILD_VARIANT} \
                         --target darwin-x64-ota-provider-${BUILD_VARIANT} \
@@ -96,11 +96,11 @@ jobs:
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
-              timeout-minutes: 45
+              timeout-minutes: 60
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
-                     --chip-tool ./out/darwin-x64-chip-tool-darwin-${BUILD_VARIANT}/chip-tool-darwin \
+                     --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
                      --target-skip-glob '{TestGroupMessaging}' \
                      run \
                      --iterations 1 \
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index 40c160b50b1f7c..258d2d66336833 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -91,10 +91,10 @@ jobs:
             - name: Clean Build
               run: xcodebuild clean
               working-directory: src/darwin/Framework
-            - name: Build example chip-tool-darwin
+            - name: Build example darwin-framework-tool
               timeout-minutes: 15
               run: |
-                  scripts/examples/gn_build_example.sh examples/chip-tool-darwin out/debug chip_config_network_layer_ble=false is_asan=true
+                  scripts/examples/gn_build_example.sh examples/darwin-framework-tool out/debug chip_config_network_layer_ble=false is_asan=true
             - name: Build example All Clusters Server
               timeout-minutes: 15
               run: |
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index e8da8037750c1b..a3ccea381f4060 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -82,7 +82,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-doxygen:0.5.75
+            image: connectedhomeip/chip-build-doxygen:0.5.77
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 470298121b5d05..fdfeae09cdefae 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.5.75
+            image: connectedhomeip/chip-build-ameba:0.5.77
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
index f7ea96fa03660e..ab358c4e7721a9 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ti:0.5.75
+            image: connectedhomeip/chip-build-ti:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -106,6 +106,13 @@ jobs:
                     cc13x2_26x2 LP_CC2652R7 all-clusters-app \
                     out/artifacts/cc13x2x7_26x2x7-all-clusters/chip-LP_CC2652R7-all-clusters-example.out \
                     /tmp/bloat_reports/
+            - name: Get All Clusters Minimal App size stats
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cc13x2_26x2 LP_CC2652R7 all-clusters-minimal-app \
+                    out/artifacts/cc13x2x7_26x2x7-all-clusters-minimal/chip-LP_CC2652R7-all-clusters-minimal-example.out \
+                    /tmp/bloat_reports/
             - name: Get Shell App size stats
               timeout-minutes: 5
               run: |
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index 3b71f064e013a8..548909c27aa7bb 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.75
+            image: connectedhomeip/chip-build-efr32:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 2dfd0e15bd8280..f7f27572b4b35f 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.75
+            image: connectedhomeip/chip-build-esp32:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -66,12 +66,12 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build some M5Stack variations
-              timeout-minutes: 30
+              timeout-minutes: 45
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
                         --enable-flashbundle \
-                        --target-glob '*-m5stack-{all-clusters,all-clusters-rpc-ipv6only}' \
+                        --target-glob '*-m5stack-{all-clusters,all-clusters-minimal,all-clusters-rpc-ipv6only}' \
                         build \
                         --copy-artifacts-to out/artifacts \
                      "
@@ -118,7 +118,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.75
+            image: connectedhomeip/chip-build-esp32:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -163,10 +163,6 @@ jobs:
               timeout-minutes: 15
               run: scripts/examples/esp_example.sh temperature-measurement-app sdkconfig.optimize.defaults
 
-            - name: Build example IPv6 Only App
-              timeout-minutes: 15
-              run: scripts/examples/esp_example.sh ipv6only-app sdkconfig.defaults
-
             - name: Build example OTA Requestor App
               run: scripts/examples/esp_example.sh ota-requestor-app sdkconfig.defaults
               timeout-minutes: 15
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index 3804cdb33afdea..8604a3b6756326 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-infineon:0.5.75
+            image: connectedhomeip/chip-build-infineon:0.5.77
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
@@ -89,6 +89,19 @@ jobs:
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                       p6 default all-clusters-app \
                       out/infineon-p6-all-clusters/chip-p6-clusters-example.out
+            - name: Build all-clusters-minimal-app example
+              timeout-minutes: 10
+              run: |
+                  scripts/run_in_build_env.sh \
+                    "scripts/build/build_examples.py \
+                        --enable-flashbundle --no-log-timestamps \
+                        --target infineon-p6-all-clusters-minimal \
+                        build \
+                        --copy-artifacts-to out/artifacts \
+                    "
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                      p6 default all-clusters-minimal-app \
+                      out/infineon-p6-all-clusters-minimal/chip-p6-clusters-minimal-example.out
             - name: Build lighting-app example
               timeout-minutes: 10
               run: |
@@ -110,4 +123,5 @@ jobs:
                   path: |
                       out/infineon-p6-lock/p6-default-lock-app-sizes.json
                       out/infineon-p6-all-clusters/p6-default-all-clusters-app-sizes.json
+                      out/infineon-p6-all-clusters-minimal/p6-default-all-clusters-minimal-app-sizes.json
                       out/infineon-p6-light/p6-default-light-app-sizes.json
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
index 1bf51ac1e3b070..3342c4f5739884 100644
--- a/.github/workflows/examples-k32w.yaml
+++ b/.github/workflows/examples-k32w.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.75
+            image: connectedhomeip/chip-build-k32w:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
index 6ad5590f00379a..88ffe8491e48df 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-crosscompile:0.5.75
+            image: connectedhomeip/chip-build-crosscompile:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index 22dd10de9d8b59..c1c9971c9dd985 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-imx:0.5.75
+            image: connectedhomeip/chip-build-imx:0.5.77
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
@@ -69,6 +69,13 @@ jobs:
                      "./scripts/build/build_examples.py \
                          --target imx-all-clusters-app build \
                      "
+            - name: Build all-cluster-minimal
+              timeout-minutes: 30
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                         --target imx-all-clusters-minimal-app build \
+                     "
             - name: Build ota-provider-app
               timeout-minutes: 30
               run: |
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index 1990b03b24e932..f557aaeb597f9f 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -96,6 +96,14 @@ jobs:
                     linux debug all-clusters-app \
                     out/all_clusters_debug/chip-all-clusters-app \
                     /tmp/bloat_reports/
+            - name: Build example Standalone All Clusters Mininal Server
+              timeout-minutes: 10
+              run: |
+                  scripts/examples/gn_build_example.sh examples/all-clusters-minimal-app/linux out/all_clusters_minimal_debug
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    linux debug all-clusters-minimal-app \
+                    out/all_clusters_minimal_debug/chip-all-clusters-minimal-app \
+                    /tmp/bloat_reports/
             - name: Build example TV app
               timeout-minutes: 10
               run: |
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index 2ac13165a74285..19d59ad4bad2a8 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-mbed-os:0.5.75
+            image: connectedhomeip/chip-build-mbed-os:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -121,6 +121,16 @@ jobs:
                     examples/all-clusters-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-all-clusters-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: Build all-clusters-minimal-app example
+              if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
+              timeout-minutes: 20
+              run: |
+                  scripts/examples/mbed_example.sh -a=all-clusters-minimal-app -b=$APP_TARGET -p=$APP_PROFILE
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    mbed $APP_TARGET+$APP_PROFILE all-clusters-minimal-app \
+                    examples/all-clusters-minimal-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-all-clusters-minimal-app-example.elf \
+                    /tmp/bloat_reports/
+
             - name: Build shell example
               if: github.event_name == 'push' || steps.changed_paths.outputs.mbed == 'true'
               timeout-minutes: 20
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index 9b0b74d4f85912..458bf7fa712c80 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.75
+            image: connectedhomeip/chip-build-nrf-platform:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -181,6 +181,14 @@ jobs:
                     nrfconnect nrf52840dk_nrf52840 all-clusters-app \
                     examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
+            - name: Build example nRF Connect SDK All Clusters Minimal App on nRF52840 DK
+              timeout-minutes: 15
+              run: |
+                  scripts/examples/nrfconnect_example.sh all-clusters-minimal-app nrf52840dk_nrf52840 -DCONF_FILE=prj_dfu.conf
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    nrfconnect nrf52840dk_nrf52840 all-clusters-minimal-app \
+                    examples/all-clusters-minimal-app/nrfconnect/build/zephyr/zephyr.elf \
+                    /tmp/bloat_reports/
             - name: Run unit tests for Zephyr native_posix_64 platform
               if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true'
               timeout-minutes: 10
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index ace36d1373e789..278d535dbe0a55 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index 12061f605d2a71..58fea93d501b9f 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.5.75
+            image: connectedhomeip/chip-build-telink:0.5.77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index 22c4152f0d5902..eeadfd200d916b 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-tizen:0.5.75
+            image: connectedhomeip/chip-build-tizen:0.5.77
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index 7cbc347042c685..cd278c6c1e75b0 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.75
+            image: connectedhomeip/chip-build-android:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index c54fd61836a4b5..c2ecc70cdecd91 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b5c296573021d7..ce0a12059f6916 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -85,6 +85,10 @@ jobs:
               if: always()
               run: scripts/tools/check_includes.sh
 
+            - name: Check for zcl.json and extension sync status
+              if: always()
+              run: scripts/tools/check_zcl_file_sync.py .
+
             - name: Ensure all PICS are set for tests (to true or false)
               if: always()
               run: |
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index aba3d6760cc63f..c9e26c8cc97914 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.5.75
+            image: connectedhomeip/chip-build-esp32-qemu:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 0ce3451f8c9741..4ab6fcfbe0f6b3 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.75
+            image: connectedhomeip/chip-build-esp32:0.5.77
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
@@ -75,7 +75,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.75
+            image: connectedhomeip/chip-build-efr32:0.5.77
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
               name: Checkout
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index db5b4fe1331b74..bf59a586b67bde 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.75
+            image: connectedhomeip/chip-build-android:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9058c0697bcb03..ebb81d9ed58df4 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -28,7 +28,7 @@ concurrency:
 jobs:
     test_suites_linux:
         name: Test Suites - Linux
-        timeout-minutes: 120
+        timeout-minutes: 140
 
         strategy:
             matrix:
@@ -43,7 +43,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -76,7 +76,7 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build Apps
-              timeout-minutes: 30
+              timeout-minutes: 45
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -90,7 +90,7 @@ jobs:
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
-              timeout-minutes: 40
+              timeout-minutes: 60
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
@@ -121,7 +121,7 @@ jobs:
                   retention-days: 5
     test_suites_darwin:
         name: Test Suites - Darwin
-        timeout-minutes: 120
+        timeout-minutes: 140
 
         strategy:
             matrix:
@@ -190,12 +190,12 @@ jobs:
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
-              timeout-minutes: 50
+              timeout-minutes: 70
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
-                     --target-skip-glob '{TestGroupMessaging}' \
+                     --target-skip-glob '{TestGroupMessaging,Test_TC_DIAG_TH_NW_1_1,Test_TC_DIAG_TH_NW_1_2,Test_TC_DIAG_TH_NW_2_2,Test_TC_DIAG_TH_NW_2_3,Test_TC_DIAG_TH_NW_2_6,Test_TC_DIAG_TH_NW_2_7,Test_TC_DIAG_TH_NW_2_8,Test_TC_DIAG_TH_NW_2_9}' \
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
@@ -237,7 +237,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             options:
                 --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index b82411998f3681..92c5db7a27a938 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.75
+            image: connectedhomeip/chip-build:0.5.77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 9c2c299f1b5e0e..0584c11887fd1d 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-zap:0.5.75
+            image: connectedhomeip/chip-build-zap:0.5.77
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 7a6ad22c9e2271..f5a1d809540dfd 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-zap:0.5.75
+            image: connectedhomeip/chip-build-zap:0.5.77
         defaults:
             run:
                 shell: sh
diff --git a/.gitmodules b/.gitmodules
index 7a0b2154efd292..0682becb54cfce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -88,7 +88,6 @@
 [submodule "third_party/openthread/ot-ifx"]
 	path = third_party/openthread/ot-ifx
 	url = https://github.com/Infineon/ot-ifx-release.git
-	branch = cyw30739
 	platforms = cyw30739
 [submodule "third_party/mbed-os/repo"]
 	path = third_party/mbed-os/repo
@@ -203,7 +202,7 @@
 	url = https://github.com/open-source-parsers/jsoncpp.git
 [submodule "cyw30739_sdk/30739A0"]
 	path = third_party/cyw30739_sdk/repos/30739A0
-	url = https://github.com/Infineon/30739A0.git
+	url = https://github.com/Infineon/OT-Matter-30739A0.git
 	platforms = cyw30739
 [submodule "cyw30739_sdk/include"]
 	path = third_party/cyw30739_sdk/repos/btsdk-include
@@ -211,7 +210,7 @@
 	platforms = cyw30739
 [submodule "cyw30739_sdk/target"]
 	path = third_party/cyw30739_sdk/repos/CYW930739M2EVB-01
-	url = https://github.com/Infineon/TARGET_CYW930739M2EVB-01.git
+	url = https://github.com/Infineon/OT-Matter-TARGET_CYW930739M2EVB-01.git
 	platforms = cyw30739
 [submodule "cyw30739_sdk/tools"]
 	path = third_party/cyw30739_sdk/repos/btsdk-tools
@@ -247,3 +246,8 @@
 	url = https://github.com/bouffalolab/bl_iot_sdk_matter.git
 	branch = bl602_release
 	platforms = bl602
+[submodule "third_party/nxp/libs/mbedtls/repo"]
+	path = third_party/nxp/libs/mbedtls/repo
+	url = https://github.com/NXPmicro/mbedtls.git
+	branch = tinycrypt-mbedtls-2.28
+	platforms = k32w0
diff --git a/.restyled.yaml b/.restyled.yaml
index 28003f28532fd4..937a8b4afa2a53 100644
--- a/.restyled.yaml
+++ b/.restyled.yaml
@@ -70,6 +70,8 @@ exclude:
     - "src/controller/python/chip/clusters/Objects.py" # generated file, no point to restyle
     - "src/controller/python/chip/clusters/CHIPClusters.py" # generated file, no point to restyle
     - "scripts/idl/tests/outputs/**/*" # Matches generated output 1:1
+    - "examples/chef/sample_app_util/test_files/*.yaml"
+    - "examples/chef/zzz_generated/**/*"
 
 
 changed_paths:
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index fbd94e8520286d..425b49fdf84ae3 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -82,6 +82,18 @@
                 "path": ["${workspaceFolder}/out/debug/"],
                 "limitSymbolsToIncludedHeaders": true
             }
+        },
+        {
+            "name": "Tizen examples debug (GN)",
+            "cStandard": "c11",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "gcc-arm",
+            "compilerPath": "/opt/tizen-sdk/tools/arm-linux-gnueabi-gcc-9.2/bin/arm-linux-gnueabi-gcc",
+            "compileCommands": "${workspaceFolder}/out/debug/compile_commands.tizen_arm.json",
+            "browse": {
+                "path": ["${workspaceFolder}/out/debug/"],
+                "limitSymbolsToIncludedHeaders": true
+            }
         }
     ],
     "version": 4
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 33cc32c99b49c9..3439327d84e5a2 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -97,8 +97,8 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
             "executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-${input:mbedApp}-example.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
-            "openocdPath": "${env:OPENOCD_PATH/bin}",
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
+            "serverpath": "${env:OPENOCD_PATH}/bin/openocd",
             "servertype": "openocd",
             "searchDir": [
                 "${workspaceRoot}/config/mbed/scripts",
@@ -130,7 +130,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
             "executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-${input:mbedApp}-example.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "external",
             "gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
             "overrideLaunchCommands": [
@@ -157,8 +157,8 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
             "executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-${input:mbedApp}-example.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
-            "openocdPath": "${env:OPENOCD_PATH/bin}",
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
+            "serverpath": "${env:OPENOCD_PATH}/bin/openocd",
             "servertype": "openocd",
             "searchDir": [
                 "${workspaceRoot}/config/mbed/scripts",
@@ -182,7 +182,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
             "executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-${input:mbedApp}-example.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "external",
             "gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
             "overrideLaunchCommands": [
@@ -200,9 +200,9 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/src/test_driver/mbed/unit_tests",
             "executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-unit-tests.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "openocd",
-            "openocdPath": "${env:OPENOCD_PATH/bin}",
+            "serverpath": "${env:OPENOCD_PATH}/bin/openocd",
             "searchDir": [
                 "${workspaceRoot}/config/mbed/scripts",
                 "${env:OPENOCD_PATH}/scripts"
@@ -233,7 +233,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/src/test_driver/mbed/unit_tests",
             "executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-unit-tests.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "external",
             "gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
             "overrideLaunchCommands": [
@@ -260,9 +260,9 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/src/test_driver/mbed//unit_tests",
             "executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-unit-tests.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "openocd",
-            "openocdPath": "${env:OPENOCD_PATH/bin}",
+            "serverpath": "${env:OPENOCD_PATH}/bin/openocd",
             "searchDir": [
                 "${workspaceRoot}/config/mbed/scripts",
                 "${env:OPENOCD_PATH/scripts}"
@@ -285,7 +285,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/src/test_driver/mbed/unit_tests",
             "executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-unit-tests.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "external",
             "gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
             "overrideLaunchCommands": [
@@ -303,9 +303,9 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/platform/mbed/bootloader",
             "executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-bootloader.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "openocd",
-            "openocdPath": "${env:OPENOCD_PATH/bin}",
+            "serverpath": "${env:OPENOCD_PATH}/bin/openocd",
             "searchDir": [
                 "${workspaceRoot}/config/mbed/scripts",
                 "${env:OPENOCD_PATH}/scripts"
@@ -336,7 +336,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/platform/mbed/bootloader",
             "executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-bootloader.elf",
-            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/", // Pigweed environment bootstraping required
             "servertype": "external",
             "gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
             "overrideLaunchCommands": [
diff --git a/BUILD.gn b/BUILD.gn
index d978b56af01a31..f8aa0cc17bd289 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -135,6 +135,10 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         "${chip_root}/src/setup_payload/java",
       ]
     }
+
+    if (build_tv_casting_common_a) {
+      deps += [ "${chip_root}/examples/tv-casting-app/tv-casting-common:tvCastingCommon" ]
+    }
   }
 
   if (chip_build_tools) {
@@ -162,6 +166,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     if (chip_link_tests) {
       deps = [
         "//:fake_platform_tests",
+        "//examples/chef:chef.tests",
         "//scripts/build:build_examples.tests",
         "//scripts/idl:idl.tests",
         "//src:tests_run",
@@ -178,6 +183,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     # Enable building for Android.
     enable_android_builds = false
 
+    # Enable building for Tizen.
+    enable_tizen_builds = false
+
     # Set this to true to enable TI builds by default.
     enable_ti_simplelink_builds = false
 
@@ -215,7 +223,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     enable_standalone_chip_tool_build =
         enable_default_builds && host_os != "win"
 
-    # Build the chip-tool-darwin example.
+    # Build the darwin-framework-tool example.
     enable_standalone_chip_tool_darwin_build =
         enable_default_builds && host_os == "mac"
 
@@ -284,6 +292,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     enable_bl602_lighting_app_build = enable_bl602_builds
 
     enable_fake_tests = enable_default_builds && host_os == "linux"
+
+    enable_tizen_lighting_app = enable_tizen_builds
   }
 
   if (enable_host_clang_build) {
@@ -345,8 +355,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
 
   if (enable_standalone_chip_tool_darwin_build) {
     group("standalone_chip_tool_darwin") {
-      deps =
-          [ "${chip_root}/examples/chip-tool-darwin(${standalone_toolchain})" ]
+      deps = [
+        "${chip_root}/examples/darwin-framework-tool(${standalone_toolchain})",
+      ]
     }
   }
 
@@ -467,6 +478,12 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     }
   }
 
+  if (enable_tizen_lighting_app) {
+    group("tizen_lighting_app") {
+      deps = [ "${chip_root}/examples/lighting-app/tizen/(${chip_root}/build/toolchain/tizen:tizen_arm)" ]
+    }
+  }
+
   group("default") {
     deps = []
     if (enable_host_clang_build) {
@@ -486,6 +503,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         ":android_x86",
       ]
     }
+    if (enable_tizen_builds) {
+      deps += [ ":tizen_lighting_app" ]
+    }
     if (enable_standalone_chip_cert_build) {
       deps += [ ":standalone_chip_cert" ]
     }
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 0a58245f688ef9..b2e1787a7939d3 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -110,7 +110,8 @@ if (_chip_defaults.custom_toolchain != "") {
       "${_build_overrides.build_root}/toolchain/tizen:tizen_${target_cpu}"
 } else if (target_os == "webos") {
   if (target_cpu == "arm" || target_cpu == "arm64") {
-    _default_toolchain = "//build/toolchain/webos"
+    _default_toolchain =
+      "${_build_overrides.build_root}/toolchain/webos"
   } else {
     assert(false,
            "Unsupported target_cpu: ${current_cpu}. Shall be arm for webOS")
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index bf2669f0a469b0..8c5d105c76e4cd 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -26,6 +26,8 @@ if (sysroot_platform_config == "") {
     sysroot_platform_config = "${build_root}/config/webos/webos_sysroot.gni"
   } else if (is_clang && current_cpu == "arm" && current_os == "freertos") {
     sysroot_platform_config = "${build_root}/toolchain/arm/arm_sysroot.gni"
+  } else if (current_os == "tizen") {
+    sysroot_platform_config = "${build_root}/config/tizen/tizen_sysroot.gni"
   }
 }
 
diff --git a/build/config/tizen/config.gni b/build/config/tizen/config.gni
index eb3be358bbf6a7..585a889ccfbffd 100644
--- a/build/config/tizen/config.gni
+++ b/build/config/tizen/config.gni
@@ -13,6 +13,9 @@
 # limitations under the License.
 
 declare_args() {
+  # Location of The Tizen sysroot
+  tizen_sdk_sysroot = ""
+
   # Location of the Tizen SDK.
   tizen_sdk_root = ""
 }
diff --git a/build/config/tizen/tizen_sysroot.gni b/build/config/tizen/tizen_sysroot.gni
new file mode 100644
index 00000000000000..ab2943869d061d
--- /dev/null
+++ b/build/config/tizen/tizen_sysroot.gni
@@ -0,0 +1,18 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("${build_root}/config/tizen/config.gni")
+
+sysroot = tizen_sdk_sysroot
diff --git a/build_overrides/mbedtls.gni b/build_overrides/mbedtls.gni
index 04f377ed99eabc..ac8a6f16203880 100644
--- a/build_overrides/mbedtls.gni
+++ b/build_overrides/mbedtls.gni
@@ -15,4 +15,5 @@
 declare_args() {
   # Root directory for mbedTLS.
   mbedtls_root = "//third_party/mbedtls"
+  mbedtls_repo = "//third_party/mbedtls"
 }
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml b/build_overrides/zephyr.gni
similarity index 50%
rename from src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml
rename to build_overrides/zephyr.gni
index 03a8eec9fe4241..9ad63cf8d53544 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml
+++ b/build_overrides/zephyr.gni
@@ -11,22 +11,5 @@
 # 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: 28.2.5. [TC-BDX-2.5] Asynchronous file receiving
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "DUT sends a ReceiveInit message to TH + TH sends a ReceiveAccept
-          message back to DUT + TH sends a Block message to DUT"
-      disabled: true
-
-    - label:
-          "TH sends a BlockEOF message to DUT + DUT sends a BlockAckEOF message
-          back to TH"
-      disabled: true
+# place holder
diff --git a/config/ameba/chip.cmake b/config/ameba/chip.cmake
index 015f5bf72f2a9f..40dc11bd659711 100644
--- a/config/ameba/chip.cmake
+++ b/config/ameba/chip.cmake
@@ -114,6 +114,7 @@ string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/
 string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba\"\n")
 string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/connectedhomeip/third_party/nanopb/repo\"\n")
 string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert:impl\", \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log:impl\"]\n")
+string(APPEND CHIP_GN_ARGS "pw_rpc_CONFIG = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc:disable_global_mutex\"")
 endif (matter_enable_rpc)
 
 # Build ota-requestor
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
index bcd7af4b0add58..4f8c60e4af25d4 100644
--- a/config/esp32/components/chip/CMakeLists.txt
+++ b/config/esp32/components/chip/CMakeLists.txt
@@ -90,6 +90,7 @@ if(CONFIG_ENABLE_PW_RPC)
     chip_gn_arg_append("pw_trace_BACKEND"                   "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_trace_tokenized\"")
     chip_gn_arg_append("dir_pw_third_party_nanopb"          "\"//third_party/connectedhomeip/third_party/nanopb/repo\"")
     chip_gn_arg_append("pw_build_LINK_DEPS"                 "[\"\$dir_pw_assert:impl\", \"\$dir_pw_log:impl\"]")
+    chip_gn_arg_append("pw_rpc_CONFIG"                      "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc:disable_global_mutex\"")
 endif()
 
 if (CONFIG_BUILD_CHIP_TESTS)
@@ -136,6 +137,24 @@ if (CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM)
     chip_gn_arg_append("chip_platform_target"   "\"//${CONFIG_CHIP_EXTERNAL_PLATFORM_DIR}\"")
 endif()
 
+# Set up CHIP project configuration file
+
+if (CONFIG_CHIP_PROJECT_CONFIG)
+    get_filename_component(CHIP_PROJECT_CONFIG
+        ${CONFIG_CHIP_PROJECT_CONFIG}
+        REALPATH
+        BASE_DIR ${CMAKE_SOURCE_DIR}
+    )
+    set(CHIP_PROJECT_CONFIG "<${CHIP_PROJECT_CONFIG}>")
+else()
+    set(CHIP_PROJECT_CONFIG "")
+endif()
+
+if (CHIP_PROJECT_CONFIG)
+    chip_gn_arg_append("chip_project_config_include" "\"${CHIP_PROJECT_CONFIG}\"")
+    chip_gn_arg_append("chip_system_project_config_include" "\"${CHIP_PROJECT_CONFIG}\"")
+endif()
+
 if (CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER)
     chip_gn_arg_append("chip_use_transitional_commissionable_data_provider" "false")
 endif()
diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt
index 0a54cc303e86b0..dbf7e91ba13708 100644
--- a/config/mbed/CMakeLists.txt
+++ b/config/mbed/CMakeLists.txt
@@ -375,6 +375,10 @@ target_sources(${APP_TARGET} PRIVATE
     ${MBED_COMMON}/util/PigweedLogger.cpp
 )
 
+list(APPEND CHIP_DEFINES
+    PW_RPC_USE_GLOBAL_MUTEX=0
+)
+
 target_include_directories(${APP_TARGET} PRIVATE
                     ${PIGWEED_ROOT}/pw_sys_io/public
                     ${PIGWEED_ROOT}/pw_assert/public
diff --git a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
index 79a34c17f17346..f35741414952c5 100644
--- a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
+++ b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
@@ -28,5 +28,6 @@ pw_build_LINK_DEPS = [
 ]
 
 dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
+pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
 
 chip_enable_pw_rpc = true
diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
index 64f70a191193e6..bf3768f23580c0 100644
--- a/config/nrfconnect/.nrfconnect-recommended-revision
+++ b/config/nrfconnect/.nrfconnect-recommended-revision
@@ -1 +1 @@
-5ea8f7fa91d7315fcc6cd9eb3aa74f9640d0abac
+fd5905aa6b04febd99d00dba6c482ac25eb15222
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
index d75f3eddd3d9f3..ac4a8f7e561aa1 100644
--- a/config/nrfconnect/chip-module/CMakeLists.txt
+++ b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -30,7 +30,7 @@ if (CONFIG_CHIP)
 include(ExternalProject)
 include(../../zephyr/ota-image.cmake)
 include(../../zephyr/zephyr-util.cmake)
-include(ota-content-header.cmake)
+include(generate_factory_data.cmake)
 
 # ==============================================================================
 # Declare configuration variables and define constants
@@ -100,7 +100,7 @@ endif()
 if (CONFIG_POSIX_API)
     list(APPEND CHIP_CFLAGS
         -D_SYS__PTHREADTYPES_H_
-        -isystem${ZEPHYR_BASE}/include/posix
+        -isystem${ZEPHYR_BASE}/include/zephyr/posix
     )
 endif()
 
@@ -342,32 +342,21 @@ add_dependencies(chip chip-gn)
 # ==============================================================================
 
 if (CONFIG_CHIP_OTA_IMAGE_BUILD)
-    if (CONFIG_CHIP_OTA_IMAGE_INCLUDE_MCUBOOT)
-        list(APPEND CHIP_IMAGE_TYPES "mcuboot")
-        list(APPEND CHIP_IMAGE_PATHS "${APPLICATION_BINARY_DIR}/mcuboot/zephyr/zephyr.bin")
-    endif()
-
-    list(APPEND CHIP_IMAGE_TYPES "app_mcuboot")
-    list(APPEND CHIP_IMAGE_PATHS "${PROJECT_BINARY_DIR}/app_update.bin")
-
-    if (CONFIG_NRF53_UPGRADE_NETWORK_CORE)
-        list(APPEND CHIP_IMAGE_TYPES "net_mcuboot")
-        list(APPEND CHIP_IMAGE_PATHS "${PROJECT_BINARY_DIR}/net_core_app_update.bin")
-    endif()
-
-    chip_ota_content_header(chip-ota-content-header
-        FILE_TYPES ${CHIP_IMAGE_TYPES}
-        FILE_PATHS ${CHIP_IMAGE_PATHS}
-        OUTPUT_FILE ${PROJECT_BINARY_DIR}/${CONFIG_CHIP_OTA_IMAGE_FILE_NAME}.content
-    )
 
     chip_ota_image(chip-ota-image
-        INPUT_FILES ${PROJECT_BINARY_DIR}/${CONFIG_CHIP_OTA_IMAGE_FILE_NAME}.content ${CHIP_IMAGE_PATHS}
+        INPUT_FILES ${PROJECT_BINARY_DIR}/dfu_multi_image.bin
         OUTPUT_FILE ${PROJECT_BINARY_DIR}/${CONFIG_CHIP_OTA_IMAGE_FILE_NAME}
     )
 
-    add_dependencies(chip-ota-content-header mcuboot_sign_target)
-    add_dependencies(chip-ota-image chip-ota-content-header)
+    add_dependencies(chip-ota-image dfu_multi_image_pkg)
+endif()
+
+# ==============================================================================
+# Define 'factory_data' target for generating a factory data partition
+# ==============================================================================
+
+if(CONFIG_CHIP_FACTORY_DATA_BUILD)
+    nrfconnect_generate_factory_data()
 endif()
 
 endif() # CONFIG_CHIP
diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
index de12cbb5e6ad67..54dbe2cd8ef750 100644
--- a/config/nrfconnect/chip-module/Kconfig
+++ b/config/nrfconnect/chip-module/Kconfig
@@ -31,6 +31,7 @@ config CHIP_NFC_COMMISSIONING
 # See config/zephyr/Kconfig for full definition
 config CHIP_OTA_REQUESTOR
 	bool
+	imply DFU_MULTI_IMAGE
 	imply DFU_TARGET
 	imply BOOTLOADER_MCUBOOT
 	imply IMG_MANAGER
@@ -60,6 +61,7 @@ config CHIP_OTA_IMAGE_BUILD
 	bool
 	default y if CHIP_OTA_REQUESTOR
 	depends on SIGN_IMAGES
+	select DFU_MULTI_IMAGE_PACKAGE_BUILD
 
 config CHIP_EXAMPLE_DEVICE_INFO_PROVIDER
 	bool "Include default device information provider build"
@@ -70,3 +72,155 @@ config CHIP_DEBUG_SYMBOLS
 	default y
 	help
 	  Build the application with debug symbols.
+
+config CHIP_FACTORY_DATA_BUILD
+	bool "Enable Factory Data build"
+	default n
+	help
+	  Enables generation of factory data during the building.
+	  It requires factory_data partition to exist in the partition manager 
+	  configuration file pm_static.yml.
+	  As a result a new output file factory_data.hex will be created.
+
+if CHIP_FACTORY_DATA_BUILD
+
+# Factory data definitions
+config CHIP_MERGE_FACTORY_DATA_WITH_FIRMWARE
+	bool "Enable merging generated factory data with the build target .hex file"
+	default y
+	help
+	  Enables merging generated factory data with the build target merged.hex file.
+	  As a result, a new output file merged.hex will consist of all partitions including 
+	  factory data.
+
+# Use default certificates without generating or providing them
+config CHIP_FACTORY_DATA_USE_DEFAULTS_CERTS
+	bool "Use default certificates located in Matter repository"
+	default y
+	help
+	  Pre-generated certificates can be used for development purpose.
+	  This config includes default pre-generated certificates 
+	  which are located in credentials/development/attestation/ directory 
+	  instead of generating new ones.
+	  If this config is set to `n` new certificates will be generated.
+
+# Configs for SPAKE2 generation
+config CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER
+	bool "Enable spake2 verifier generation"
+	help
+	  Enables generation of spake2 verifier according to 
+	  given iteration counter, salt and passcode.
+	  To generate Spake2 verifier a spake2p executable must be available 
+	  from system variables environment.
+
+config CHIP_DEVICE_GENERATE_ROTATING_DEVICE_UID
+	bool "Enable generation of a new Rotating device id unique id"
+	default y
+	help
+	  Enables generation of a new Rotating device id unique id.
+
+endif #CHIP_FACTORY_DATA_BUILD
+
+# Factory data parameters
+config CHIP_DEVICE_SERIAL_NUMBER
+	string "Serial number of device"
+	default "11223344556677889900"
+	help
+	  A serial number parameter defines an unique number of manufactured device.
+	  Maximum length of serial number is 32 characters.
+
+config CHIP_DEVICE_VENDOR_NAME
+	string "Human-readable vendor name"
+	default "Nordic Semiconductor ASA"
+	help
+	  A human-readable vendor name which provides a simple string 
+	  containing identification of device's vendor for the Content APP.
+	  This information should be included in the Matter Basic Cluster.
+
+config CHIP_DEVICE_PRODUCT_NAME
+	string "Human-readable product name"
+	default "not-specified"
+	help
+	  A human-readable product name which provides a simple string 
+	  containing identification of the product for the Content APP.
+
+config CHIP_DEVICE_MANUFACTURING_DATE
+	string "Manufacturing date in ISO 8601"
+	default "2022-01-01"
+	help
+	  A manufacturing date specifies the date that the device was manufactured.
+	  The format used for providing a manufacturing date is ISO 8601 e.g. YYYY-MM-DD.
+	
+config CHIP_DEVICE_HARDWARE_VERSION
+	int "Integer representation of hardware version"
+	default 0
+	help
+	  A hardware version number specifies the version number
+	  of the hardware of the device. The meaning of its value, 
+	  and the versioning scheme, are vendor defined.
+
+config CHIP_DEVICE_HARDWARE_VERSION_STRING
+	string "user-friendly string representation of hardware version"
+	default "prerelease"
+	help
+	  A hardware version string parameter specifies the version
+	  of the hardware of the device as a more user-friendly value
+	  than that represented by the hardware version integer value.
+	  The meaning of its value, and the versioning scheme, are
+	  vendor defined.
+
+config CHIP_DEVICE_DISCRIMINATOR
+	hex "Device pairing discriminator"
+	default 0xF00
+	help
+	  A 12-bit value matching the field of the same name in
+	  the setup code. Discriminator is used during
+	  a discovery process.
+
+config CHIP_DEVICE_SPAKE2_PASSCODE 
+	int "Spake2+ passcode"
+	default 20202021
+	range 1 99999998
+	help
+	  A pairing passcode is a 27-bit unsigned integer which serves
+	  as a proof of possession during commissioning. 
+	  Its value shall be restricted to the values 0x0000001 to 0x5F5E0FE
+	  (00000001 to 99999998 in decimal), excluding the invalid Passcode values:
+	  - 00000000, 11111111, 22222222, 33333333, 44444444, 55555555, 
+	  66666666, 77777777, 88888888, 99999999, 12345678, 87654321.
+
+config CHIP_DEVICE_SPAKE2_IT
+	int "Spake2+ iteration count"
+	default 1000
+	help
+	  The Spake2 iteration count is associated with the ephemeral
+	  PAKE passcode verifier to be used for the commissioning.
+	  The iteration count is used as a crypto parameter to process
+	  spake2 verifier.
+
+config CHIP_DEVICE_SPAKE2_SALT
+	string "Spake2+ salt in string format"
+	default "U1BBS0UyUCBLZXkgU2FsdA=="
+	help
+	  The spake2 salt is random data that is used as an additional input 
+	  to a one-way function that “hashes” data. 
+	  A new salt should be randomly generated for each password.
+	  The minimum length of spake2 salt is 16 Bytes.
+	  The maximum length of spake2 salt is 32 Bytes.
+
+config CHIP_DEVICE_SPAKE2_TEST_VERIFIER
+	string "Testing spake2+ verifier"
+	default "uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw=="
+	help
+	  The spake 2 verifier generated using default SPAKE2 salt, 
+	  iteration count and passcode. This value can be used for development
+	  or testing purposes.
+	  Generated with: 
+	  spake2p gen-verifier -o - -i 1000 -s "U1BBS0UyUCBLZXkgU2FsdA==" -p 20202021
+
+config CHIP_DEVICE_ROTATING_DEVICE_UID
+	string  "A rotating device id unique id"
+	default "91a9c12a7c80700a31ddcfa7fce63e44"
+	help
+	  A device rotating id unique id which will be generated if
+	  this config is not set in prj.conf file.
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
index 73216d9dbfc9c2..4ffa2034b9b22a 100644
--- a/config/nrfconnect/chip-module/Kconfig.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -190,6 +190,15 @@ config CHIP_EXTENDED_DISCOVERY
     bool
     default y
 
+config NVS_LOOKUP_CACHE
+    bool
+    default y
+
+# Increase the default RX stack size
+config IEEE802154_NRF5_RX_STACK_SIZE
+    int
+    default 1024
+
 # Enable OpenThread
 
 config NET_L2_OPENTHREAD
@@ -202,9 +211,9 @@ choice OPENTHREAD_SECURITY
 	default OPENTHREAD_NRF_SECURITY_CHOICE
 endchoice
 
-config CC3XX_BACKEND
-    bool
-    default n
+config PSA_CRYPTO_DRIVER_CC3XX
+	bool
+	default n
 
 config OBERON_BACKEND
     bool
@@ -347,6 +356,10 @@ endif # SOC_SERIES_NRF52X
 
 if SOC_SERIES_NRF53X
 
+config UPDATEABLE_IMAGE_NUMBER
+    int
+    default 2
+
 # Generate random numbers using Xoroshiro algorithm instead of direct calls
 # to the cryptocell library to workaround firmware hangs.
 choice RNG_GENERATOR_CHOICE
diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
index 07c0cc5c4759aa..b63983a11e9e3f 100644
--- a/config/nrfconnect/chip-module/Kconfig.features
+++ b/config/nrfconnect/chip-module/Kconfig.features
@@ -93,10 +93,6 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
 
 if SOC_SERIES_NRF53X
 
-config UPDATEABLE_IMAGE_NUMBER
-	int
-	default 2
-
 # FLASH nop device is enabled to prevent bus faults when mcumgr tries to access
 # simulated partition with network core image data.
 config FLASH_NOP_DEVICE
diff --git a/config/nrfconnect/chip-module/generate_factory_data.cmake b/config/nrfconnect/chip-module/generate_factory_data.cmake
new file mode 100644
index 00000000000000..1928b3e4ff1441
--- /dev/null
+++ b/config/nrfconnect/chip-module/generate_factory_data.cmake
@@ -0,0 +1,206 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+
+# Create a JSON file based on factory data given via kConfigs.
+#
+# This function creates a list of arguments for external script and then run it to write a JSON file.
+# Created JSON file can be checked using JSON SCHEMA file if it is provided.
+#
+# This script can be manipulated using following kConfigs:
+# - To merge generated factory data with final zephyr.hex file set kConfig CONFIG_CHIP_MERGE_FACTORY_DATA_WITH_FIRMWARE=y
+# - To use default certification paths set CONFIG_CHIP_FACTORY_DATA_USE_DEFAULTS_CERTS_PATH=y 
+# 
+# During generation process a some file will be created in zephyr's build directory:
+# - <factory_data_target>.args a file containing arguments for nrfconnect_generate_partition.py script.
+# - <factory_data_target>.json a file containing all factory data written in JSON format.
+#
+# [Args]:
+#   factory_data_target - a name for target to generate factory_data.
+#   script_path         - a path to script that makes a JSON factory data file from given arguments.
+#   schema_path         - a path to JSON schema file which can be used to verify generated factory data JSON file.
+#                         This argument is optional, if you don't want to verify the JSON file put it empty "".
+#   output_path         - a path to output directory, where created JSON file will be stored.
+function(nrfconnect_create_factory_data_json factory_data_target script_path schema_path output_path)
+
+# set script args for future purpose
+set(script_args)
+## generate all script arguments
+string(APPEND script_args "--sn \"${CONFIG_CHIP_DEVICE_SERIAL_NUMBER}\"\n")
+string(APPEND script_args "--date \"${CONFIG_CHIP_DEVICE_MANUFACTURING_DATE}\"\n")
+string(APPEND script_args "--vendor_id ${CONFIG_CHIP_DEVICE_VENDOR_ID}\n")
+string(APPEND script_args "--product_id ${CONFIG_CHIP_DEVICE_PRODUCT_ID}\n")
+string(APPEND script_args "--vendor_name \"${CONFIG_CHIP_DEVICE_VENDOR_NAME}\"\n")
+string(APPEND script_args "--product_name \"${CONFIG_CHIP_DEVICE_PRODUCT_NAME}\"\n")
+string(APPEND script_args "--hw_ver ${CONFIG_CHIP_DEVICE_HARDWARE_VERSION}\n")
+string(APPEND script_args "--hw_ver_str \"${CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING}\"\n")
+
+# check if Rotating Device Id Unique Id should be generated
+if(NOT CONFIG_CHIP_DEVICE_GENERATE_ROTATING_DEVICE_UID)
+    if(NOT DEFINED CONFIG_CHIP_DEVICE_ROTATING_DEVICE_UID)
+        message(FATAL_ERROR "CHIP_DEVICE_ROTATING_DEVICE_UID was not provided. To generate it use CONFIG_CHIP_DEVICE_GENERATE_ROTATING_DEVICE_UID=y")
+    else()
+        string(APPEND script_args "--rd_uid \"${CONFIG_CHIP_DEVICE_ROTATING_DEVICE_UID}\"\n")
+    endif()
+endif()
+
+# for development purpose user can use default certs instead of generating or providing them
+if(CONFIG_CHIP_FACTORY_DATA_USE_DEFAULTS_CERTS)
+    # convert decimal PID to its hexadecimal representation to find out certification files in repository
+    math(EXPR LOCAL_PID "${CONFIG_CHIP_DEVICE_PRODUCT_ID}" OUTPUT_FORMAT HEXADECIMAL)
+    string(SUBSTRING ${LOCAL_PID} 2 -1 raw_pid)
+    # all certs are located in ${CHIP_ROOT}/credentials/development/attestation
+    # it can be used during development without need to generate new certifications
+    string(APPEND script_args "--dac_cert \"${CHIP_ROOT}/credentials/development/attestation/Matter-Development-DAC-${raw_pid}-Cert.der\"\n")
+    string(APPEND script_args "--dac_key \"${CHIP_ROOT}/credentials/development/attestation/Matter-Development-DAC-${raw_pid}-Key.der\"\n")
+    string(APPEND script_args "--pai_cert \"${CHIP_ROOT}/credentials/development/attestation/Matter-Development-PAI-noPID-Cert.der\"\n")
+else()
+    # try to generate a new DAC and PAI certs and DAC key
+    # request script to generate a new certificates
+    # by adding an argument to script_args
+    find_program(chip-cert NAMES chip-cert)
+    if(NOT chip-cert)
+        message(FATAL_ERROR "Could not find chip_cert_path executable in PATH")
+    endif()
+    string(APPEND script_args "--chip_cert_path ${chip-cert}\n") 
+endif()
+
+# add Password-Authenticated Key Exchange parameters
+string(APPEND script_args "--spake2_it \"${CONFIG_CHIP_DEVICE_SPAKE2_IT}\"\n")
+string(APPEND script_args "--spake2_salt \"${CONFIG_CHIP_DEVICE_SPAKE2_SALT}\"\n")
+string(APPEND script_args "--discriminator ${CONFIG_CHIP_DEVICE_DISCRIMINATOR}\n")
+string(APPEND script_args "--passcode ${CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE}\n")
+
+# check if spake2 verifier should be generated using script
+if(CONFIG_CHIP_FACTORY_DATA_GENERATE_SPAKE2_VERIFIER)
+    # request script to generate a new spake2_verifier
+    # by adding an argument to script_args
+    find_program(spake_exe NAMES spake2p)
+    if(NOT spake_exe)
+        message(FATAL_ERROR "Could not find spake2p executable in PATH")
+    endif()
+    string(APPEND script_args "--spake2p_path ${spake_exe}\n")   
+else()
+    # Spake2 verifier should be provided using kConfig
+    string(APPEND script_args "--spake2_verifier \"${CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER}\"\n")
+endif()
+
+# Set output JSON file and path to SCHEMA file to validate generated factory data
+string(APPEND script_args "-o \"${output_path}/${factory_data_target}.json\"\n")
+string(APPEND script_args "-s \"${schema_path}\"\n")
+
+# execute first script to create a JSON file
+separate_arguments(separated_script_args NATIVE_COMMAND ${script_args})
+add_custom_target(${factory_data_target} ALL
+    COMMAND ${Python3_EXECUTABLE} ${FACTORY_DATA_SCRIPT_PATH} ${separated_script_args}
+    COMMENT "Generating new Factory Data..."
+    )
+
+endfunction()
+
+
+# Create a .hex file with factory data in CBOR format.
+#
+# This function creates a .hex and .cbor files from given JSON factory data file.
+#
+# 
+# During generation process some files will be created in zephyr's build directory:
+# - <factory_data_target>_cbor.args a file containing arguments for nrfconnect_generate_partition.py script.
+# - <factory_data_target>.hex a file containing all factory data in CBOR format.
+# - <factory_data_target>.bin a binary file containing all raw factory data in CBOR format.
+# - <factory_data_target>.cbor a file containing all factory data in CBOR format.
+#
+# [Args]:
+#   factory_data_target - a name for target to generate factory_data.
+#   script_path         - a path to script that makes a factory data .hex file from given arguments.
+#   output_path         - a path to output directory, where created JSON file will be stored.
+#   output_hex          - an output variable to store a .hex file. This variable can be used to merge with firmware .hex file.
+function(nrfconnect_create_factory_data_hex_file factory_data_target script_path output_path output_hex)
+
+# Pass the argument list via file
+set(cbor_script_args "-i ${output_path}/${factory_data_target}.json\n")
+string(APPEND cbor_script_args "-o ${output_path}/${factory_data_target}\n")
+# get partition address and offset from partition manager during compilation
+string(APPEND cbor_script_args "--offset $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_ADDRESS>\n")
+string(APPEND cbor_script_args "--size $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_OFFSET>\n")
+string(APPEND cbor_script_args "-r\n")
+
+# execute second script to create a hex file containing factory data in cbor format
+separate_arguments(separated_cbor_script_args NATIVE_COMMAND ${cbor_script_args})
+set(factory_data_hex ${output_path}/${factory_data_target}.hex)
+
+# return output hex to parent scope
+set(${output_hex} ${factory_data_hex} PARENT_SCOPE)
+add_custom_command(OUTPUT ${factory_data_hex}
+    COMMAND ${Python3_EXECUTABLE} ${script_path} ${separated_cbor_script_args}
+    COMMENT "Generating factory data HEX file..."
+    DEPENDS ${factory_data_target}
+    )
+
+endfunction()
+
+# Generate factory data partition using given args
+#
+# 
+# During generation process a some file will be created in zephyr's build directory:
+# - merged.hex a file containing firmware and factory data merged to single file
+# - factory_data.hex a file containing only a factory data partition including proper offset
+#
+function(nrfconnect_generate_factory_data)
+
+find_package(Python REQUIRED)
+
+# CHIP_ROOT must be provided as a reference set all localization of scripts
+if(NOT CHIP_ROOT)
+message(FATAL_ERROR "CHIP_ROOT variable is not set, please add it to CMakeLists.txt file")
+endif()
+
+# Localize all scripts needed to generate factory data partition
+set(FACTORY_DATA_SCRIPT_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py)
+set(GENERATE_CBOR_SCRIPT_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/nrfconnect_generate_partition.py)
+SET(MERGE_HEX_SCRIPT_PATH ${CHIP_ROOT}/config/nrfconnect/chip-module/merge_factory_data.py)
+set(FACTORY_DATA_SCHEMA_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/nrfconnect_factory_data.schema)
+set(OUTPUT_FILE_PATH ${APPLICATION_BINARY_DIR}/zephyr)
+
+# create a JSON file with all factory data
+nrfconnect_create_factory_data_json(factory_data
+                                    ${FACTORY_DATA_SCRIPT_PATH} 
+                                    ${FACTORY_DATA_SCHEMA_PATH} 
+                                    ${OUTPUT_FILE_PATH})
+
+# create a .hex file with factory data in CBOR format based on the JSON file created previously 
+nrfconnect_create_factory_data_hex_file(factory_data
+                                        ${GENERATE_CBOR_SCRIPT_PATH} 
+                                        ${OUTPUT_FILE_PATH} 
+                                        factory_data_hex)
+
+if(CONFIG_CHIP_MERGE_FACTORY_DATA_WITH_FIRMWARE)                                   
+    # set custom target for merging factory_data hex file
+    add_custom_target(factory_data_merge
+        DEPENDS ${factory_data_hex}
+        )
+    set_property(GLOBAL PROPERTY 
+    factory_data_PM_HEX_FILE 
+        ${factory_data_hex}
+        )
+    set_property(GLOBAL PROPERTY
+        ${parent_slot}_PM_TARGET
+        ${target_name}_merge
+        )
+endif()
+
+
+endfunction()
diff --git a/config/nrfconnect/chip-module/make_ota_content_header.py b/config/nrfconnect/chip-module/make_ota_content_header.py
deleted file mode 100755
index 1aa437a6b96f30..00000000000000
--- a/config/nrfconnect/chip-module/make_ota_content_header.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python3
-
-#
-#    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.
-#
-
-"""
-Utility for creating a Matter OTA content header that describes a list of files
-included in a Matter OTA image. The header format is specific to the nRF Connect
-platform.
-
-Usage example:
-
-./make_ota_content_header.py \
-    --file mcuboot mcuboot/zephyr/zephyr.bin \
-    --file app_mcuboot zephyr/app_update.bin \
-    out.header
-"""
-
-import argparse
-import os
-import struct
-import sys
-from enum import IntEnum
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    __file__), '../../../src/controller/python'))
-from chip.tlv import TLVWriter, uint  # noqa: E402
-
-
-# Context-specific tags describing members of the top-level header TLV structure
-class HeaderTag(IntEnum):
-    FILE_INFO_LIST = 0,
-
-
-# Context-specific tags describing members of the file info TLV structure
-class FileInfoTag(IntEnum):
-    FILE_ID = 0,
-    FILE_SIZE = 1,
-
-
-# File identifiers for all the supported file types
-FILE_IDS = dict(
-    mcuboot=0,
-    app_mcuboot=1,
-    net_mcuboot=2,
-)
-
-
-def generate_header_tlv(file_infos: list):
-    """
-    Generate TLV structure describing OTA image contents:
-
-    Header ::=
-        [0] FileInfoList: [
-            [0]:
-                [0] FileId: <file_id>
-                [1] FileSize: <file_size>
-            [1]:
-                [0] FileId: <file_id>
-                [1] FileSize: <file_size>
-            ...
-        ]
-    """
-
-    writer = TLVWriter()
-    writer.put(None, {
-        HeaderTag.FILE_INFO_LIST: [{
-            FileInfoTag.FILE_ID: uint(file_id),
-            FileInfoTag.FILE_SIZE: uint(file_size),
-        } for file_id, file_size in file_infos]
-    })
-
-    return writer.encoding
-
-
-def generate_header(file_infos: list, output_file: str):
-    """
-    Generate OTA image content header and save it to file
-    """
-
-    header_tlv = generate_header_tlv(file_infos)
-    header = struct.pack('<I', len(header_tlv)) + header_tlv
-
-    with open(output_file, 'wb') as file:
-        file.write(header)
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description='nRF Connect Matter OTA image content header utility',
-        fromfile_prefix_chars='@')
-
-    file_types = '{' + ','.join(FILE_IDS.keys()) + '}'
-    parser.add_argument('--file', required=True, nargs=2, action='append',
-                        metavar=(file_types, 'path'),
-                        help='File included in Matter OTA image')
-    parser.add_argument('output_file', help='Path to output header file')
-
-    args = parser.parse_args()
-
-    file_infos = [(FILE_IDS[type], os.path.getsize(path))
-                  for type, path in args.file]
-
-    generate_header(file_infos, args.output_file)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/config/nrfconnect/chip-module/ota-content-header.cmake b/config/nrfconnect/chip-module/ota-content-header.cmake
deleted file mode 100644
index cb23cb37af188b..00000000000000
--- a/config/nrfconnect/chip-module/ota-content-header.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#   Copyright (c) 2022 Project CHIP Authors
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-find_package(Python3 REQUIRED)
-
-#
-# Create CMake target for building a Matter OTA content header that describes a list of files
-# included in a Matter OTA image. The header format is specific to the nRF Connect platform.
-#
-# Required arguments:
-#   FILE_TYPES type, [type...] - list of file types that identify files included in the image.
-#   Currently recognized file types are:
-#     * mcuboot     - MCUBoot bootloader image in the raw binary format
-#     * app_mcuboot - application core image in the MCUBoot-defined format
-#     * net_mcuboot - network core image in the MCUBoot-defined format
-#   FILE_PATHS path, [path...] - list of paths to files included in the image
-#   OUTPUT_FILE path - file path to write the newly created Matter OTA content header
-#
-function(chip_ota_content_header TARGET_NAME)
-    cmake_parse_arguments(ARG "" "OUTPUT_FILE" "FILE_TYPES;FILE_PATHS" ${ARGN})
-
-    if (NOT ARG_FILE_TYPES OR NOT ARG_FILE_PATHS OR NOT ARG_OUTPUT_FILE)
-        message(FATAL_ERROR "All FILE_TYPES, FILE_PATHS and OUTPUT_FILE arguments must be specified")
-    endif()
-
-    # Prepare make_ota_content_header.py argument list
-    set(SCRIPT_ARGS)
-
-    foreach(file_info IN ZIP_LISTS ARG_FILE_TYPES ARG_FILE_PATHS)
-        list(APPEND SCRIPT_ARGS
-            --file
-            "${file_info_0}"
-            "${file_info_1}"
-        )
-    endforeach()
-
-    list(APPEND SCRIPT_ARGS ${ARG_OUTPUT_FILE})
-
-    # Convert the argument list to multi-line string
-    string(REPLACE ";" "\n" SCRIPT_ARGS "${SCRIPT_ARGS}")
-
-    # Pass the argument list via file to avoid hitting Windows command-line length limit
-    file(GENERATE
-        OUTPUT ${ARG_OUTPUT_FILE}.args
-        CONTENT ${SCRIPT_ARGS}
-    )
-
-    add_custom_target(${TARGET_NAME} ALL
-        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make_ota_content_header.py @${ARG_OUTPUT_FILE}.args
-    )
-endfunction()
diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
index d171fea25334cc..080ea97ce4e475 100644
--- a/config/telink/app/zephyr.conf
+++ b/config/telink/app/zephyr.conf
@@ -71,8 +71,6 @@ CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
 
 # OpenThread configs
-CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
 CONFIG_OPENTHREAD_SLAAC=y
 CONFIG_OPENTHREAD_DHCP6_CLIENT=y
 CONFIG_OPENTHREAD_SNTP_CLIENT=y
diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
index adcf4d9d336e53..42055393de2a58 100644
--- a/config/zephyr/Kconfig
+++ b/config/zephyr/Kconfig
@@ -242,13 +242,6 @@ config CHIP_OTA_IMAGE_EXTRA_ARGS
 	  This option allows one to pass optional arguments to the ota_image_tool.py
 	  script, used for building OTA image.
 
-config CHIP_OTA_IMAGE_INCLUDE_MCUBOOT
-	bool "Include MCUBoot in OTA image"
-	depends on BOOTLOADER_MCUBOOT
-	help
-	  Include MCUBoot bootloader image in the generated Matter OTA image. This
-	  option can be enabled if the device supports the bootloader update.
-
 endif
 
 config CHIP_EXTENDED_DISCOVERY
diff --git a/config/zephyr/README.md b/config/zephyr/README.md
new file mode 100644
index 00000000000000..bb780288a34606
--- /dev/null
+++ b/config/zephyr/README.md
@@ -0,0 +1,10 @@
+# Zephyr build and configuration files
+
+This directory contains build scripts and common configuration files used by
+CHIP Zephyr applications. It is structured as follows:
+
+| File/Folder | Contents                                                                                                                            |
+| ----------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| chip-gn     | GN project used to build selected CHIP libraries with the _Zephyr_ platform integration layer                                       |
+| chip-module | CMake wrapper for the GN project defined in `chip-gn` directory, and other components that allow one to use CHIP as a Zephyr module |
+| app         | Common and optional Kconfig configuration files that can be used in Zephyr applications                                             |
diff --git a/config/zephyr/app/copy-flashbundle-firmware.cmake b/config/zephyr/app/copy-flashbundle-firmware.cmake
new file mode 100644
index 00000000000000..93464f7aceb837
--- /dev/null
+++ b/config/zephyr/app/copy-flashbundle-firmware.cmake
@@ -0,0 +1,25 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# Copy the merged.hex file if it exists, otherwise copy zephyr.hex
+
+set(HEX_NAME merged.hex)
+
+if(EXISTS "zephyr/${HEX_NAME}")
+  configure_file("zephyr/${HEX_NAME}" "${FLASHBUNDLE_FIRMWARE}" COPYONLY)
+else()
+  configure_file("zephyr/${KERNEL_HEX_NAME}" "${FLASHBUNDLE_FIRMWARE}" COPYONLY)
+endif()
diff --git a/config/zephyr/app/enable-gnu-std.cmake b/config/zephyr/app/enable-gnu-std.cmake
new file mode 100644
index 00000000000000..5f31e1a5c62ab8
--- /dev/null
+++ b/config/zephyr/app/enable-gnu-std.cmake
@@ -0,0 +1,6 @@
+add_library(gnu17 INTERFACE)
+target_compile_options(gnu17
+    INTERFACE 
+        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
+        -D_SYS__PTHREADTYPES_H_)
+target_link_libraries(app PRIVATE gnu17)
diff --git a/config/zephyr/app/flashing.cmake b/config/zephyr/app/flashing.cmake
new file mode 100644
index 00000000000000..b70e166ff28cfe
--- /dev/null
+++ b/config/zephyr/app/flashing.cmake
@@ -0,0 +1,55 @@
+#
+#   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.
+#
+
+# Adds rules to generate a flashing wrapper script for an nrfconnect firmware.
+
+set(FLASHBUNDLE_FLASHER_COMMON ${CMAKE_PROJECT_NAME}/firmware_utils.py)
+set(FLASHBUNDLE_FLASHER_PLATFORM ${CMAKE_PROJECT_NAME}/nrfconnect_firmware_utils.py)
+set(FLASHBUNDLE_FLASHER_WRAPPER ${CMAKE_PROJECT_NAME}/${CMAKE_PROJECT_NAME}.flash.py)
+set(FLASHBUNDLE_FIRMWARE ${CMAKE_PROJECT_NAME}/${CMAKE_PROJECT_NAME}.hex)
+set(FLASHBUNDLE_FILES ${FLASHBUNDLE_FLASHER_COMMON} ${FLASHBUNDLE_FLASHER_PLATFORM} ${FLASHBUNDLE_FLASHER_WRAPPER} ${FLASHBUNDLE_FIRMWARE})
+
+get_filename_component(FLASHBUNDLE_FIRMWARE_BASENAME ${FLASHBUNDLE_FIRMWARE} NAME)
+
+list(JOIN FLASHBUNDLE_FILES "\n" FLASHBUNDLE_MANIFEST)
+
+file(GENERATE
+  OUTPUT ${CMAKE_PROJECT_NAME}.flashbundle.txt
+  CONTENT "${FLASHBUNDLE_MANIFEST}\n"
+  )
+
+add_custom_command(OUTPUT "${FLASHBUNDLE_FLASHER_COMMON}"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${PROJECT_SOURCE_DIR}/third_party/connectedhomeip/scripts/flashing/firmware_utils.py" "${FLASHBUNDLE_FLASHER_COMMON}"
+    VERBATIM)
+
+add_custom_command(OUTPUT "${FLASHBUNDLE_FLASHER_PLATFORM}"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${PROJECT_SOURCE_DIR}/third_party/connectedhomeip/scripts/flashing/nrfconnect_firmware_utils.py" "${FLASHBUNDLE_FLASHER_PLATFORM}"
+    VERBATIM)
+
+add_custom_command(OUTPUT "${FLASHBUNDLE_FIRMWARE}"
+    DEPENDS zephyr/${KERNEL_HEX_NAME}
+    COMMAND ${CMAKE_COMMAND} ARGS -DFLASHBUNDLE_FIRMWARE=${FLASHBUNDLE_FIRMWARE} -DKERNEL_HEX_NAME=${KERNEL_HEX_NAME} -P "${CHIP_ROOT}/config/nrfconnect/app/copy-flashbundle-firmware.cmake"
+    VERBATIM)
+
+add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}/${CMAKE_PROJECT_NAME}.flash.py"
+    COMMAND ${python}
+            "${PROJECT_SOURCE_DIR}/third_party/connectedhomeip/scripts/flashing/gen_flashing_script.py" nrfconnect
+            --output "${FLASHBUNDLE_FLASHER_WRAPPER}"
+            --application "${FLASHBUNDLE_FIRMWARE_BASENAME}"
+    COMMENT "To flash ${FLASHBUNDLE_FIRMWARE_BASENAME} run ${FLASHBUNDLE_FLASHER_WRAPPER}"
+    VERBATIM)
+
+add_custom_target(flashing_script DEPENDS ${FLASHBUNDLE_FILES})
diff --git a/config/zephyr/app/overlay-usb_support.conf b/config/zephyr/app/overlay-usb_support.conf
new file mode 100644
index 00000000000000..1b4a2d56fe8490
--- /dev/null
+++ b/config/zephyr/app/overlay-usb_support.conf
@@ -0,0 +1,24 @@
+#
+#   Copyright (c) 2020 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+CONFIG_GPIO=y
+
+CONFIG_USB=y
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_UART_CONSOLE=y
+
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_LINE_CTRL=y
diff --git a/config/zephyr/chip-gn/.gn b/config/zephyr/chip-gn/.gn
new file mode 100644
index 00000000000000..2024e95fed6079
--- /dev/null
+++ b/config/zephyr/chip-gn/.gn
@@ -0,0 +1,29 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  target_cpu = ""
+  target_os = "zephyr"
+
+  import("${chip_root}/config/zephyr/chip-gn/args.gni")
+}
diff --git a/config/zephyr/chip-gn/BUILD.gn b/config/zephyr/chip-gn/BUILD.gn
new file mode 100644
index 00000000000000..85288992c84812
--- /dev/null
+++ b/config/zephyr/chip-gn/BUILD.gn
@@ -0,0 +1,40 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/build/chip/tests.gni")
+
+assert(current_os == "zephyr")
+
+declare_args() {
+  chip_build_example_providers = false
+}
+
+group("zephyr") {
+  deps = [ "${chip_root}/src/lib" ]
+
+  if (chip_build_tests) {
+    deps += [ "${chip_root}/src:tests" ]
+  }
+
+  if (chip_build_example_providers) {
+    deps += [ "${chip_root}/examples/providers:device_info_provider" ]
+  }
+}
+
+group("default") {
+  deps = [ ":zephyr" ]
+}
diff --git a/config/zephyr/chip-gn/args.gni b/config/zephyr/chip-gn/args.gni
new file mode 100644
index 00000000000000..e5d5aedf5bc17d
--- /dev/null
+++ b/config/zephyr/chip-gn/args.gni
@@ -0,0 +1,27 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+chip_device_platform = "zephyr"
+
+chip_build_tests = false
+
+chip_project_config_include = ""
+chip_system_project_config_include = ""
+chip_ble_project_config_include = ""
+
+custom_toolchain = "${chip_root}/config/zephyr/chip-gn/toolchain:zephyr"
+
+pw_build_PIP_CONSTRAINTS = [ "${chip_root}/scripts/constraints.txt" ]
diff --git a/config/zephyr/chip-gn/toolchain/BUILD.gn b/config/zephyr/chip-gn/toolchain/BUILD.gn
new file mode 100644
index 00000000000000..28fbe6d8e939b0
--- /dev/null
+++ b/config/zephyr/chip-gn/toolchain/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/toolchain/gcc_toolchain.gni")
+import("//build_overrides/build.gni")
+
+declare_args() {
+  zephyr_ar = ""
+  zephyr_cc = ""
+  zephyr_cxx = ""
+}
+
+gcc_toolchain("zephyr") {
+  ar = zephyr_ar
+  cc = zephyr_cc
+  cxx = zephyr_cxx
+
+  toolchain_args = {
+    current_os = "zephyr"
+    is_clang = false
+  }
+}
diff --git a/config/zephyr/chip-module/CMakeLists.txt b/config/zephyr/chip-module/CMakeLists.txt
new file mode 100644
index 00000000000000..ba25a316f57a2e
--- /dev/null
+++ b/config/zephyr/chip-module/CMakeLists.txt
@@ -0,0 +1,257 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+#
+#   @file
+#     CMake sub-project defining 'chip' target which represents CHIP library
+#     Since CHIP doesn't provide native CMake support, ExternalProject
+#     module is used to build the required artifacts with GN meta-build
+#     system. It is assumed that find_package(Zephyr) has been called before
+#     including this file.
+#
+
+if (CONFIG_CHIP)
+
+include(ExternalProject)
+include(../zephyr-util.cmake)
+
+# ==============================================================================
+# Declare configuration variables and define constants
+# ==============================================================================
+
+# C/C++ compiler flags passed to CHIP build system
+list(APPEND CHIP_CFLAGS)
+
+# C compiler flags passed to CHIP build system
+list(APPEND CHIP_CFLAGS_C)
+
+# C++ compiler flags passed to CHIP build system
+list(APPEND CHIP_CFLAGS_CC)
+
+# CHIP libraries that the application should be linked with
+list(APPEND CHIP_LIBRARIES)
+
+# GN meta-build system arguments in the form of 'key1 = value1\nkey2 = value2...' string
+string(APPEND CHIP_GN_ARGS)
+
+# C/C++ compiler flags which should not be forwarded to CHIP
+# build system (e.g. because CHIP configures them on its own)
+set(CHIP_CFLAG_EXCLUDES
+    "-fno-asynchronous-unwind-tables"
+    "-fno-common"
+    "-fno-defer-pop"
+    "-fno-reorder-functions"
+    "-ffunction-sections"
+    "-fdata-sections"
+    "-g*"
+    "-O*"
+    "-W*"
+)
+
+# ==============================================================================
+# Helper macros
+# ==============================================================================
+
+macro(chip_gn_arg_import FILE)
+    string(APPEND CHIP_GN_ARGS "import(\"${FILE}\")\n")
+endmacro()
+
+macro(chip_gn_arg_string ARG STRING)
+    string(APPEND CHIP_GN_ARGS "${ARG} = \"${STRING}\"\n")
+endmacro()
+
+macro(chip_gn_arg_bool ARG BOOLEAN)
+    if (${BOOLEAN})
+        string(APPEND CHIP_GN_ARGS "${ARG} = true\n")
+    else()
+        string(APPEND CHIP_GN_ARGS "${ARG} = false\n")
+    endif()
+endmacro()
+
+macro(chip_gn_arg_cflags ARG CFLAGS)
+    set(CFLAG_EXCLUDES "[")
+    foreach(cflag ${CHIP_CFLAG_EXCLUDES})
+        string(APPEND CFLAG_EXCLUDES "\"${cflag}\", ")
+    endforeach()
+    string(APPEND CFLAG_EXCLUDES "]")
+    string(APPEND CHIP_GN_ARGS "${ARG} = filter_exclude(string_split(\"${CFLAGS}\"), ${CFLAG_EXCLUDES})\n")
+endmacro()
+
+# ==============================================================================
+# Prepare CHIP configuration based on the project Kconfig configuration
+# ==============================================================================
+
+if (NOT CHIP_ROOT)
+    get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH)
+endif()
+
+set(GN_ROOT_TARGET ${CHIP_ROOT}/config/zephyr/chip-gn)
+
+if (CONFIG_POSIX_API)
+    list(APPEND CHIP_CFLAGS
+        -D_SYS__PTHREADTYPES_H_
+        -isystem${ZEPHYR_BASE}/include/zephyr/posix
+    )
+endif()
+
+list(APPEND CHIP_CFLAGS -isystem${ZEPHYR_BASE}/../modules/crypto/mbedtls/include/)
+
+zephyr_get_compile_flags(CHIP_CFLAGS_C C)
+zephyr_get_compile_flags(CHIP_CFLAGS_CC CXX)
+zephyr_get_gnu_cpp_standard(CHIP_CFLAGS_CC)
+
+convert_list_of_flags_to_string_of_flags(CHIP_CFLAGS CHIP_CFLAGS)
+convert_list_of_flags_to_string_of_flags(CHIP_CFLAGS_C CHIP_CFLAGS_C)
+convert_list_of_flags_to_string_of_flags(CHIP_CFLAGS_CC CHIP_CFLAGS_CC)
+
+# Prepare CHIP libraries that the application should be linked with
+
+if (NOT CHIP_LIBRARIES)
+    set(CHIP_LIBRARIES -lCHIP)
+endif()
+
+if (CONFIG_CHIP_LIB_SHELL)
+    list(APPEND CHIP_LIBRARIES -lCHIPShell)
+endif()
+
+if (CONFIG_CHIP_PW_RPC)
+    list(APPEND CHIP_LIBRARIES -lPwRpc)
+endif()
+
+
+# Set up CHIP project configuration file
+
+if (CONFIG_CHIP_PROJECT_CONFIG)
+    get_filename_component(CHIP_PROJECT_CONFIG
+        ${CONFIG_CHIP_PROJECT_CONFIG}
+        REALPATH
+        BASE_DIR ${CMAKE_SOURCE_DIR}
+    )
+    set(CHIP_PROJECT_CONFIG "<${CHIP_PROJECT_CONFIG}>")
+else()
+    set(CHIP_PROJECT_CONFIG "")
+endif()
+
+# Set up custom OpenThread configuration
+
+if (CONFIG_CHIP_OPENTHREAD_CONFIG)
+    get_filename_component(CHIP_OPENTHREAD_CONFIG
+        ${CONFIG_CHIP_OPENTHREAD_CONFIG}
+        REALPATH
+        BASE_DIR ${CMAKE_SOURCE_DIR}
+    )
+    zephyr_set_openthread_config(${CHIP_OPENTHREAD_CONFIG})
+endif()
+
+# Find required programs
+
+find_program(GN_EXECUTABLE gn)
+if (${GN_EXECUTABLE} STREQUAL GN_EXECUTABLE-NOTFOUND)
+    message(FATAL_ERROR "The 'gn' command was not found. Make sure you have GN installed.")
+else()
+    # Parse the 'gn --version' output to find the installed version.
+    set(MIN_GN_VERSION 1000)
+    execute_process(
+        COMMAND
+        ${GN_EXECUTABLE} --version
+        OUTPUT_VARIABLE gn_version_output
+        ERROR_VARIABLE  gn_error_output
+        RESULT_VARIABLE gn_status
+    )
+
+    if(${gn_status} EQUAL 0)
+        if(gn_version_output VERSION_LESS ${MIN_GN_VERSION})
+            message(FATAL_ERROR "Found unsuitable version of 'gn'. Required is at least ${MIN_GN_VERSION}")
+        endif()
+    else()
+        message(FATAL_ERROR "Could NOT find working gn: Found gn (${GN_EXECUTABLE}), but failed to load with:\n ${gn_error_output}")
+    endif()
+endif()
+
+find_package(Python3 REQUIRED)
+
+# ==============================================================================
+# Generate configuration for CHIP GN build system
+# ==============================================================================
+chip_gn_arg_cflags("target_cflags"                          ${CHIP_CFLAGS})
+chip_gn_arg_cflags("target_cflags_c"                        ${CHIP_CFLAGS_C})
+chip_gn_arg_cflags("target_cflags_cc"                       ${CHIP_CFLAGS_CC})
+chip_gn_arg_string("zephyr_ar"                              ${CMAKE_AR})
+chip_gn_arg_string("zephyr_cc"                              ${CMAKE_C_COMPILER})
+chip_gn_arg_string("zephyr_cxx"                             ${CMAKE_CXX_COMPILER})
+chip_gn_arg_string("chip_project_config_include"            "${CHIP_PROJECT_CONFIG}")
+chip_gn_arg_string("chip_system_project_config_include"     "${CHIP_PROJECT_CONFIG}")
+chip_gn_arg_bool  ("is_debug"                               CONFIG_DEBUG)
+chip_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTHREAD)
+chip_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
+chip_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
+chip_gn_arg_bool  ("chip_build_tests"                       CONFIG_CHIP_BUILD_TESTS)
+chip_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)
+chip_gn_arg_bool  ("chip_build_libshell"                    CONFIG_CHIP_LIB_SHELL)
+
+if (CONFIG_CHIP_ENABLE_DNSSD_SRP)
+    chip_gn_arg_string("chip_mdns" "platform")
+endif()
+
+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/args.gn CONTENT ${CHIP_GN_ARGS})
+
+# ==============================================================================
+# Define 'chip-gn' target that builds CHIP library(ies) with GN build system
+# ==============================================================================
+
+ExternalProject_Add(
+    chip-gn
+    PREFIX                  ${CMAKE_CURRENT_BINARY_DIR}
+    SOURCE_DIR              ${CHIP_ROOT}
+    BINARY_DIR              ${CMAKE_CURRENT_BINARY_DIR}
+    CONFIGURE_COMMAND       ${GN_EXECUTABLE}
+                                --root=${CHIP_ROOT}
+                                --root-target=${GN_ROOT_TARGET}
+                                --dotfile=${GN_ROOT_TARGET}/.gn
+                                --script-executable=${Python3_EXECUTABLE}
+                                gen --check --fail-on-unused-args ${CMAKE_CURRENT_BINARY_DIR}
+    BUILD_COMMAND           ninja
+    INSTALL_COMMAND         ""
+    BUILD_BYPRODUCTS        ${CHIP_LIBRARIES}
+    BUILD_ALWAYS            TRUE
+    USES_TERMINAL_CONFIGURE TRUE
+    USES_TERMINAL_BUILD     TRUE
+)
+add_dependencies(chip-gn kernel)
+
+# ==============================================================================
+# Define 'chip' target that exposes CHIP headers & libraries to the application
+# ==============================================================================
+
+zephyr_interface_library_named(chip)
+target_compile_definitions(chip INTERFACE CHIP_HAVE_CONFIG_H)
+target_include_directories(chip INTERFACE
+    ${CHIP_ROOT}/src
+    ${CHIP_ROOT}/src/include
+    ${CHIP_ROOT}/src/lib
+    ${CHIP_ROOT}/third_party/nlassert/repo/include
+    ${CMAKE_CURRENT_BINARY_DIR}/gen/include
+)
+target_link_directories(chip INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/lib)
+
+if (CONFIG_CHIP_LIB_SHELL)
+    target_link_options(chip INTERFACE -Wl,--whole-archive -lCHIPShell -Wl,--no-whole-archive)
+endif()
+
+target_link_libraries(chip INTERFACE -Wl,--start-group ${CHIP_LIBRARIES} -Wl,--end-group)
+add_dependencies(chip chip-gn)
+
+endif() # CONFIG_CHIP
\ No newline at end of file
diff --git a/config/zephyr/chip-module/Kconfig b/config/zephyr/chip-module/Kconfig
new file mode 100644
index 00000000000000..90c7d73f470b8f
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig
@@ -0,0 +1,17 @@
+#
+#   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.
+#
+
+rsource "../Kconfig"
\ No newline at end of file
diff --git a/config/zephyr/chip-module/Kconfig.defaults b/config/zephyr/chip-module/Kconfig.defaults
new file mode 100644
index 00000000000000..4cf4edea17a939
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig.defaults
@@ -0,0 +1,225 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# The purpose of this file is to define new default values of settings used when building Matter samples.
+# This file only changes defaults and thus all symbols here must be promptless
+# and safeguarded so that they only are applied when building Matter.
+
+if CHIP
+
+config LOG
+	bool
+	default y
+
+if LOG
+
+choice LOG_MODE
+	default LOG_MODE_MINIMAL
+endchoice
+
+choice MATTER_LOG_LEVEL_CHOICE
+	default MATTER_LOG_LEVEL_DBG
+endchoice
+
+config LOG_DEFAULT_LEVEL
+	int
+	default 2
+
+endif
+
+config PRINTK_SYNC
+	bool
+	default y
+
+config ASSERT
+	bool
+	default y
+
+config HW_STACK_PROTECTION
+	bool
+	default y
+
+config FPU
+	bool
+	default y
+
+config SHELL
+	bool
+	default y
+
+# Enable getting reboot reasons information
+config HWINFO
+	bool
+	default y
+
+# Generic networking options
+config NET_SOCKETS_POSIX_NAMES
+	bool
+	default n
+
+# Application stack size
+config MAIN_STACK_SIZE
+	int
+	default 8192
+
+config INIT_STACKS
+	bool
+	default y
+
+config CHIP_DEVICE_VENDOR_ID
+	int
+	default 65521
+
+config CHIP_DEVICE_PRODUCT_ID
+	int
+	default 32768
+
+# Disable certain parts of Zephyr IPv6 stack
+config NET_IPV6_NBR_CACHE
+	bool
+	default n
+
+config NET_IPV6_MLD
+	bool
+	default y
+
+config NET_IF_MCAST_IPV6_ADDR_COUNT
+	int
+	default 14
+
+# Network buffers
+config NET_PKT_RX_COUNT
+	int
+	default 16
+
+config NET_PKT_TX_COUNT
+	int
+	default 16
+
+config NET_BUF_RX_COUNT
+	int
+	default 80
+
+config NET_BUF_TX_COUNT
+	int
+	default 80
+
+# Bluetooth Low Energy configs
+config BT
+	bool
+	default y
+
+config BT_PERIPHERAL
+	bool
+	default y
+
+config BT_PERIPHERAL_PREF_MIN_INT
+	int
+	default 36
+
+config BT_PERIPHERAL_PREF_MAX_INT
+	int
+	default 36
+
+config BT_GAP_AUTO_UPDATE_CONN_PARAMS
+	bool
+	default y
+
+config BT_GATT_DYNAMIC_DB
+	bool
+	default y
+
+config BT_DEVICE_NAME_DYNAMIC
+	bool
+	default y
+
+config BT_DEVICE_NAME_MAX
+	int
+	default 15
+
+config BT_MAX_CONN
+	int
+	default 1
+
+config BT_L2CAP_TX_MTU
+	int
+	default 247
+
+config BT_BUF_ACL_RX_SIZE
+	int
+	default 251
+
+config BT_BUF_ACL_TX_SIZE
+	int
+	default 251
+
+config BT_RX_STACK_SIZE
+	int
+	default 1200
+
+config CHIP_OTA_REQUESTOR
+	bool
+	default y
+
+# Enable extended discovery
+config CHIP_EXTENDED_DISCOVERY
+	bool
+	default y
+
+config NVS_LOOKUP_CACHE
+	bool
+	default y
+
+# Enable OpenThread
+config NET_L2_OPENTHREAD
+	bool
+	default y
+
+# Enable mbedTLS
+config MBEDTLS_ENABLE_HEAP
+	bool
+	default y
+
+config MBEDTLS_HEAP_SIZE
+	int
+	default 15360
+
+# Disable not used shell modules
+config SENSOR_SHELL
+	bool
+	default n
+
+config DEVICE_SHELL
+	bool
+	default n
+
+config DATE_SHELL
+	bool
+	default n
+
+config DEVMEM_SHELL
+	bool
+	default n
+
+config MCUBOOT_SHELL
+	bool
+	default n
+
+config FLASH_SHELL
+	bool
+	default n
+
+endif # CHIP
diff --git a/config/zephyr/chip-module/Kconfig.features b/config/zephyr/chip-module/Kconfig.features
new file mode 100644
index 00000000000000..bc800095dc7ce0
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig.features
@@ -0,0 +1,68 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# The purpose of this file is to define Kconfig options enabling specific features.
+# Feature options will define defaults for settings that are related to the specific feature.
+
+if CHIP
+
+# MCU Manager and SMP configuration
+config MCUMGR
+	bool
+	default y
+
+config MCUMGR_CMD_IMG_MGMT
+	bool
+	default y
+
+config MCUMGR_CMD_OS_MGMT
+	bool
+	default y
+
+config MCUMGR_SMP_BT
+	bool
+	default y
+
+config MCUMGR_SMP_BT_AUTHEN
+	bool
+	default n
+
+config MCUMGR_BUF_COUNT
+	int
+	default 6
+
+# Increase BT MTU and RX buffer for big size DFU messages
+config BT_L2CAP_TX_MTU
+	int
+	default 498
+
+config BT_BUF_ACL_RX_SIZE
+	int
+	default 502
+
+# Increase MCUMGR_BUF_SIZE, as it must be big enough to fit MAX MTU + overhead and for single-image DFU default is 384 B
+config MCUMGR_BUF_SIZE
+	int
+	default 1024
+
+# Increase system workqueue size, as SMP is processed within it
+config SYSTEM_WORKQUEUE_STACK_SIZE
+	int
+	default 2800
+
+endif # CHIP_DFU_OVER_BT_SMP
+
+endif # CHIP
diff --git a/config/zephyr/chip-module/Kconfig.mcuboot.defaults b/config/zephyr/chip-module/Kconfig.mcuboot.defaults
new file mode 100644
index 00000000000000..4d5979330000f4
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig.mcuboot.defaults
@@ -0,0 +1,89 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# The purpose of this file is to define new default values of settings used when building mcuboot child image for Matter samples.
+
+config MAIN_STACK_SIZE
+	int
+	default 10240
+
+config BOOT_SWAP_SAVE_ENCTLV
+	bool
+	default n
+
+config BOOT_ENCRYPT_RSA
+	bool
+	default n
+
+config BOOT_ENCRYPT_EC256
+	bool
+	default n
+
+config BOOT_ENCRYPT_X25519
+	bool
+	default n
+
+config BOOT_BOOTSTRAP
+	bool
+	default n
+
+config PM
+	bool
+	default n
+
+config FLASH
+	bool
+	default y
+
+config FPROTECT
+	bool
+	default y
+
+config BOOT_MAX_IMG_SECTORS
+	int
+	default 256
+
+config LOG
+	bool
+	default n
+
+config CONSOLE_HANDLER
+	bool
+	default n
+
+config BOOT_BANNER
+	bool
+	default n
+
+config TIMESLICING
+	bool
+	default n
+
+config RESET_ON_FATAL_ERROR
+	bool
+	default n
+
+config MULTITHREADING
+	bool
+	default n
+
+config TICKLESS_KERNEL
+	bool
+	default n
+
+config TIMEOUT_64BIT
+	bool
+	default n
diff --git a/config/zephyr/chip-module/Kconfig.mcuboot.root b/config/zephyr/chip-module/Kconfig.mcuboot.root
new file mode 100644
index 00000000000000..e8756636dfd66d
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig.mcuboot.root
@@ -0,0 +1,21 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# The purpose of this file is to create a wrapper Kconfig file that will be set as
+# mcuboot_KCONFIG_ROOT and processed before any other Kconfig for mcuboot child image.
+
+rsource "Kconfig.mcuboot.defaults"
+source "${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr/Kconfig"
diff --git a/config/zephyr/chip-module/Kconfig.multiprotocol_rpmsg.defaults b/config/zephyr/chip-module/Kconfig.multiprotocol_rpmsg.defaults
new file mode 100644
index 00000000000000..dea52bae56e2f4
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig.multiprotocol_rpmsg.defaults
@@ -0,0 +1,91 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# The purpose of this file is to define new default values of settings used when building multiprotocol_rpmsg child image for Matter samples.
+
+config LOG
+	bool
+	default n
+
+config HEAP_MEM_POOL_SIZE
+	int
+	default 8192
+
+config MAIN_STACK_SIZE
+	int
+	default 2048
+
+config SYSTEM_WORKQUEUE_STACK_SIZE
+	int
+	default 2048
+
+config BT
+	bool
+	default y
+
+config BT_HCI_RAW
+	bool
+	default y
+
+config BT_MAX_CONN
+	int
+	default 1
+
+config BT_PERIPHERAL
+	bool
+	default y
+
+config BT_CENTRAL
+	bool
+	default n
+
+config BT_BUF_ACL_RX_SIZE
+	int
+	default 502
+
+config BT_BUF_ACL_TX_SIZE
+	int
+	default 251
+
+config BT_CTLR_DATA_LENGTH_MAX
+	int
+	default 251
+
+config BT_CTLR_ASSERT_HANDLER
+	bool
+	default y
+
+config BT_HCI_RAW_RESERVE
+	int
+	default 1
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+config BT_BUF_CMD_TX_COUNT
+	int
+	default 10
+
+config ASSERT
+	bool
+	default y
+
+config DEBUG_INFO
+	bool
+	default y
+
+config EXCEPTION_STACK_TRACE
+	bool
+	default y
diff --git a/config/zephyr/chip-module/Kconfig.multiprotocol_rpmsg.root b/config/zephyr/chip-module/Kconfig.multiprotocol_rpmsg.root
new file mode 100644
index 00000000000000..b34c82243585b4
--- /dev/null
+++ b/config/zephyr/chip-module/Kconfig.multiprotocol_rpmsg.root
@@ -0,0 +1,21 @@
+#
+#   Copyright (c) 2022 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# The purpose of this file is to create a wrapper Kconfig file that will be set as
+# multiprotocol_rpmsg_KCONFIG_ROOT and processed before any other Kconfig for multiprotocol_rpmsg child image.
+
+rsource "Kconfig.multiprotocol_rpmsg.defaults"
+source "Kconfig.zephyr"
diff --git a/config/zephyr/chip-module/make_gn_args.py b/config/zephyr/chip-module/make_gn_args.py
new file mode 100644
index 00000000000000..f30cd459a6e7d4
--- /dev/null
+++ b/config/zephyr/chip-module/make_gn_args.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+
+#
+#    Copyright (c) 2021 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import argparse
+import re
+import sys
+
+GN_SPECIAL_CHARACTERS = r'(["$\\])'
+GN_CFLAG_EXCLUDES = [
+    '-fno-asynchronous-unwind-tables',
+    '-fno-common',
+    '-fno-defer-pop',
+    '-fno-reorder-functions',
+    '-ffunction-sections',
+    '-fdata-sections',
+    '-g*',
+    '-O*',
+    '-W*',
+]
+
+
+def escape_strings(gn_args):
+    return [[key, re.sub(GN_SPECIAL_CHARACTERS, r'\\\1', value)] for key, value in gn_args]
+
+
+def write_gn_args(args):
+    if args.module:
+        sys.stdout.write('import("{}")\n'.format(args.module))
+
+    for key, value in args.arg:
+        sys.stdout.write('{} = {}\n'.format(key, value))
+
+    for key, value in args.arg_string:
+        sys.stdout.write('{} = "{}"\n'.format(key, value))
+
+    cflag_excludes = ', '.join(['"{}"'.format(exclude)
+                               for exclude in GN_CFLAG_EXCLUDES])
+
+    for key, value in args.arg_cflags:
+        sys.stdout.write('{} = filter_exclude(string_split("{}"), [{}])\n'.format(
+            key, value, cflag_excludes))
+
+
+def main():
+    parser = argparse.ArgumentParser(fromfile_prefix_chars='@')
+    parser.add_argument('--module', action='store')
+    parser.add_argument('--arg', action='append', nargs=2, default=[])
+    parser.add_argument('--arg-string', action='append', nargs=2, default=[])
+    parser.add_argument('--arg-cflags', action='append', nargs=2, default=[])
+    args = parser.parse_args()
+    args.arg_string = escape_strings(args.arg_string)
+    args.arg_cflags = escape_strings(args.arg_cflags)
+    write_gn_args(args)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/config/zephyr/chip-module/zephyr/module.yml b/config/zephyr/chip-module/zephyr/module.yml
new file mode 100644
index 00000000000000..c09c9ea59e218a
--- /dev/null
+++ b/config/zephyr/chip-module/zephyr/module.yml
@@ -0,0 +1,22 @@
+#
+#   Copyright (c) 2021 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+name: connectedhomeip
+build:
+    cmake: .
+    kconfig: Kconfig
+    depends:
+        - openthread
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der
index 53e5cb4d67a06b..759c4d4831647a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der
index 80c0de2e6a7887..f7d0520d6e3a74 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem
index 2e1d0da26077b5..ce041492264709 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIDtJw5lBJd2IwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIcLZzJNOZdCMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-aHdm7IC/HRIUD7pJ9BGAbZrjoLqtusIoXHEvNtH337dSpJ33XmTurNOVM5djDaDQ
-JCyTMdJRGPzyW9w3NSvWc6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFP5jEcg1BvluzHKajDenbFY3MWfeMB8GA1UdIwQYMBaAFI7a
-GmEQADreTTAcq0PbQI4sd/oUMAoGCCqGSM49BAMCA0gAMEUCIEayqWJRPerLDxbG
-9lbZPDYAHcMM0Y9uCnI7pk+ViPBrAiEA+UYtsuqD6UMmZuSqSuq5DbsSPlQRSOZc
-An01lyXwtbk=
+g0oUQN48dQ5KfjCnrEWLpmo1UcClyooPOviF9uWhe6cxm0vc8Rn+x73RoWqMZK/H
+4P1/u5Ud+ailIB5d8vIB/qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFGED+3fjAwmr7LTg80ALYOmP61vmMB8GA1UdIwQYMBaAFAP3
+VqzDRhOGPY6lPTdia6Ujj3k6MAoGCCqGSM49BAMCA0gAMEUCIQD8dFapxcs/R87W
+Ly+wtW1HC64DNFGJYDu/WKfH2zUZ8gIgRO+864Qo9nq0873KSMJTiV2F7++evnLJ
+FIZTmUWVfhI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der
index 3e8026da7f527a..1ce770fdc4c4e3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem
index 784eeb332cc7ca..535c8d58d43078 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICGpPB4uswCmHUOinM96MynNntO/Yr1Fw8T2Ep5siSncoAoGCCqGSM49
-AwEHoUQDQgAEaHdm7IC/HRIUD7pJ9BGAbZrjoLqtusIoXHEvNtH337dSpJ33XmTu
-rNOVM5djDaDQJCyTMdJRGPzyW9w3NSvWcw==
+MHcCAQEEIFkRqEET0o9sXIm7H1mDIguJ8pU1aBeFRnf9fOz+NCV9oAoGCCqGSM49
+AwEHoUQDQgAEg0oUQN48dQ5KfjCnrEWLpmo1UcClyooPOviF9uWhe6cxm0vc8Rn+
+x73RoWqMZK/H4P1/u5Ud+ailIB5d8vIB/g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der
index ebfe85e6b0f5e4..018f8de165c3fb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem
index dc8066cb07163b..cd401e341c001a 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIG+yCQ0e7q7cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIfm3eggiakfswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQtjUKXG5iMToM+b9qyITgksM1W3FDF
-7X44zEiDpmI3o4OS/wegQFjhG60UDzpElL0fpWWpKaIa5K7/F6vcTse/o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUjtoa
-YRAAOt5NMByrQ9tAjix3+hQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOJyYz0uUlxhw9hVExzpW84h3aolmWw93SAx
-Udds3NxvAiAs7MlDu7sw4iNL51MgwBYRa3MyVV8BUyU6dS7E02iwnQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ5F4O2t1nOj7D+y56ZmTGRT2AQB16P
+87gexd0Xog3M8bnsZ4mINkMpk3p+sN4MTm/0W71rrfuunZ4NKJKy9QFVo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUA/dW
+rMNGE4Y9jqU9N2JrpSOPeTowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgT4guacQ825+4Eht8Bopviywsn7bgTV8TkRdq
+mWbqmlUCID/7eYXyV5NlttSvDE0CpSVUInH6RcTRAgGm7g7BLSYw
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der
index 50e04be6267d4f..dea4c2eadf0a64 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem
index 33d5c3f0350d51..7e6ddfc73ee476 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJeiWx406I1+OsL0h1xWOY93lhbyZLoZQTMhJyyZ5LhQoAoGCCqGSM49
-AwEHoUQDQgAELY1ClxuYjE6DPm/asiE4JLDNVtxQxe1+OMxIg6ZiN6ODkv8HoEBY
-4RutFA86RJS9H6VlqSmiGuSu/xer3E7Hvw==
+MHcCAQEEIFb8ZQbqebrWSCzBU2Yqw80UDKEtesajUfT9Pnzk20v4oAoGCCqGSM49
+AwEHoUQDQgAEOReDtrdZzo+w/suemZkxkU9gEAdej/O4HsXdF6INzPG57GeJiDZD
+KZN6frDeDE5v9Fu9a637rp2eDSiSsvUBVQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json
index 4cc3cde0bbe43f..6ec5be0b5e483b 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains one valid PAA which is authorized to sign the PAI.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202080ed270e650497762300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004687766ec80bf1d12140fba49f411806d9ae3a0baadbac2285c712f36d1f7dfb752a49df75e64eeacd3953397630da0d0242c9331d25118fcf25bdc37352bd673a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414fe6311c83506f96ecc729a8c37a76c56373167de301f0603551d230418301680148eda1a6110003ade4d301cab43db408e2c77fa14300a06082a8648ce3d0403020348003045022046b2a962513deacb0f16c6f656d93c36001dc30cd18f6e0a723ba64f9588f06b022100f9462db2ea83e9432666e4aa4aeab90dbb123e541148e65c027d359725f0b5b9",
-    "pai_cert": "308201d43082017aa00302010202081bec824347bbabb7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042d8d42971b988c4e833e6fdab2213824b0cd56dc50c5ed7e38cc4883a66237a38392ff07a04058e11bad140f3a4494bd1fa565a929a21ae4aeff17abdc4ec7bfa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604148eda1a6110003ade4d301cab43db408e2c77fa14301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e272633d2e525c61c3d855131ce95bce21ddaa25996c3ddd203151d76cdcdc6f02202cecc943bbbb30e2234be75320c016116b7332555f0153253a752ec4d368b09d",
-    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b1818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100eb42d6fe79c28db107bb6564695e2b53c990b500b97587eea57accb8034016a802202d2c21557fe74e1cba1444f14e844c79200d495fd86d28c1194966e7a0e0049b",
-    "dac_private_key": "21a93c1e2eb300a61d43a29ccf7a3329cd9ed3bf62bd45c3c4f6129e6c8929dc",
-    "dac_public_key": "04687766ec80bf1d12140fba49f411806d9ae3a0baadbac2285c712f36d1f7dfb752a49df75e64eeacd3953397630da0d0242c9331d25118fcf25bdc37352bd673"
+    "dac_cert": "308201e43082018aa003020102020870b67324d3997423300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004834a1440de3c750e4a7e30a7ac458ba66a3551c0a5ca8a0f3af885f6e5a17ba7319b4bdcf119fec7bdd1a16a8c64afc7e0fd7fbb951df9a8a5201e5df2f201fea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146103fb77e30309abecb4e0f3400b60e98feb5be6301f0603551d2304183016801403f756acc34613863d8ea53d37626ba5238f793a300a06082a8648ce3d0403020348003045022100fc7456a9c5cb3f47ced62f2fb0b56d470bae03345189603bbf58a7c7db3519f2022044efbceb8428f67ab4f3bdca48c253895d85efef9ebe72c91486539945957e12",
+    "pai_cert": "308201d33082017aa00302010202087e6dde82089a91fb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004391783b6b759ce8fb0fecb9e999931914f6010075e8ff3b81ec5dd17a20dccf1b9ec678988364329937a7eb0de0c4e6ff45bbd6badfbae9d9e0d2892b2f50155a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041403f756acc34613863d8ea53d37626ba5238f793a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204f882e69c43cdb9fb8121b7c068a6f8b2c2c9fb6e04d5f1391176a9966ea9a5502203ffb7985f2579365b6d4af0c4d02a525542271fa45c4d10201a6ee0ec12d2630",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b1818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ac7febbe34655cf6e060681f2a5d178a6af556f0a00dca2e6a599cac1228149f02205c9f189911266e8d5d695c7499411dcf11249ff5e99483b293d8b44bd8cf8d62",
+    "dac_private_key": "5911a84113d28f6c5c89bb1f5983220b89f295356817854677fd7cecfe34257d",
+    "dac_public_key": "04834a1440de3c750e4a7e30a7ac458ba66a3551c0a5ca8a0f3af885f6e5a17ba7319b4bdcf119fec7bdd1a16a8c64afc7e0fd7fbb951df9a8a5201e5df2f201fe"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der
index db95fba7b30b2a..c3116108b0690b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der
index 5858c42dafc644..6f03a61d232230 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem
index d40f0e615d6609..45e6467e389bd2 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIK8pbdgy1VcgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIJkiozFuUL3IwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-Rj6Qncdf/SueNI8ZRxZNtM/NC1DZ9DzNIPHfSf+t0bNP6x4zUzOPeav//tyhqC/j
-VXKkpgOAa0bVbR5kAKKE4qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFAHOVpBnnpk6BcVnpCA+7NdUGsUhMB8GA1UdIwQYMBaAFCqm
-Z1/xFOE20znvG+X0ec+jrdTKMAoGCCqGSM49BAMCA0gAMEUCIQCEREcr7Lzqn5ai
-yT7WtN3tEgagSBgArTRJup7Spfri8QIgXsX5Y0+GP5E4aAIh6MAsvIn/SOVycnk0
-ZMOoZML5u1g=
+mxN0vKmsU7qcBagXWnfg2sR/vqQuA+6ZaqBJrENuJiuDArPL0e33yF98NsMrtM/f
++Kz/MkHaqUUbCMe3tVuCL6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFL04t1SWDjUexyYsYRmD4EajIGFwMB8GA1UdIwQYMBaAFEMY
+UYctih1brnzQCdqMXlEWJasMMAoGCCqGSM49BAMCA0gAMEUCIGaMB4BA4nmD97ao
+DmZM2A0UqAzg2FBds/6vXgy3qnXQAiEAlqh3AxC4C056hmt6mxtWWLWEu0CX5lRo
+MZE6F0le1O0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der
index 681ebe04f81f2d..877687b8370ff4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem
index d6190f5d6b1f04..3bc99e8168c416 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMhqmLcYCUX/E7Pfe7VlQyQKRmEPEJ7LJMldfCgaVCa8oAoGCCqGSM49
-AwEHoUQDQgAERj6Qncdf/SueNI8ZRxZNtM/NC1DZ9DzNIPHfSf+t0bNP6x4zUzOP
-eav//tyhqC/jVXKkpgOAa0bVbR5kAKKE4g==
+MHcCAQEEIAnMbelVOLMHAACTmra3m8jYftyJhnbH6LrMPykmwaX+oAoGCCqGSM49
+AwEHoUQDQgAEmxN0vKmsU7qcBagXWnfg2sR/vqQuA+6ZaqBJrENuJiuDArPL0e33
+yF98NsMrtM/f+Kz/MkHaqUUbCMe3tVuCLw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der
index f4440d034740df..08b98b81e8bfca 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem
index e9a7d69d3a1425..75555dd9a97e10 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIG8kqUmYTRaYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIf1AvR3iy3tYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASWb8VOfeZJ7r1OSB68PiboYRviYGy3
-RL4ePhIb/kcx3e4wFrLGPGHvv+ob52vjel6yABOfYVzhoL+mDikTcwL/o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUKqZn
-X/EU4TbTOe8b5fR5z6Ot1MowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAIYxtlFKXyQ/qrFj4/e7eMoR7OzIld2u680v
-6+fujQ3yAiBUC1rWdBazLJJdVTWTuxxXC+pgMQXmJTEM1Igi+odjWg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT3Jlc/ZGIrAMBtuRLOdBRSsyRTAwZN
+fEEO37ddScPSdG9f6vfGwUJlIXdUmQQuLvN5wRKBDfx0P2BtX/y/q8vbo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQxhR
+hy2KHVuufNAJ2oxeURYlqwwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKm9CD49W72/2y39hPw4OzMSUQOddX07hmrM
+waB8U5xPAiEAskxvUHLcjNQ1SKXLjWC+w+MtIDcYX4SBDOwFyCo33zw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der
index 2c8c687848afc9..9542b60f4c1717 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem
index 08f6851bb59da6..0cc03441af7ec6 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOYZnNFrOFWzHr8wf7ZA2nTFvclJqCTAHQ2RmPuvw541oAoGCCqGSM49
-AwEHoUQDQgAElm/FTn3mSe69TkgevD4m6GEb4mBst0S+Hj4SG/5HMd3uMBayxjxh
-77/qG+dr43pesgATn2Fc4aC/pg4pE3MC/w==
+MHcCAQEEIGzo+oDDHVQ3GJHFdznjt8c1iNl5QeRHj3cslvxbHVG8oAoGCCqGSM49
+AwEHoUQDQgAE9yZXP2RiKwDAbbkSznQUUrMkUwMGTXxBDt+3XUnD0nRvX+r3xsFC
+ZSF3VJkELi7zecESgQ38dD9gbV/8v6vL2w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json
index 2717d050c9f7b7..eb2f4511ee8308 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains ten PAAs none of which is a valid PAA authorized to sign the PAI.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202082bca5b760cb555c8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004463e909dc75ffd2b9e348f1947164db4cfcd0b50d9f43ccd20f1df49ffadd1b34feb1e3353338f79abfffedca1a82fe35572a4a603806b46d56d1e6400a284e2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041401ce5690679e993a05c567a4203eecd7541ac521301f0603551d230418301680142aa6675ff114e136d339ef1be5f479cfa3add4ca300a06082a8648ce3d04030203480030450221008444472becbcea9f96a2c93ed6b4dded1206a0481800ad3449ba9ed2a5fae2f102205ec5f9634f863f9138680221e8c02cbc89ff48e57272793464c3a864c2f9bb58",
-    "pai_cert": "308201d43082017aa00302010202081bc92a52661345a6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004966fc54e7de649eebd4e481ebc3e26e8611be2606cb744be1e3e121bfe4731ddee3016b2c63c61efbfea1be76be37a5eb200139f615ce1a0bfa60e29137302ffa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604142aa6675ff114e136d339ef1be5f479cfa3add4ca301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008631b6514a5f243faab163e3f7bb78ca11ececc895ddaeebcd2febe7ee8d0df20220540b5ad67416b32c925d553593bb1c570bea603105e625310cd48822fa87635a",
-    "certification_declaration": "308201d106092a864886f70d010702a08201c2308201be020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe662010140bbb3544c5016577aa8b44ffb90fcca140fe662010140bbb35443a016577aa8b44ffb90fcca140fe662010140bbb35443afe6577aa8b44ffb90fcca140fe662010140bbb35443afe9a77aa8b44ffb90fcca140fe662010140bbb35443afe9a88aa8b44ffb90fcca140fe662010140bbb35443afe9a88558b44ffb90fcca140fe662010140bbb35443afe9a88557444ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e8d48d7040c6268533898c0fa4830938a3b4c21240cb6fa8109dbba8ad6a2a6b022100d7231e9fde1b472e481d412c799c303577912e0ada5c2ef192c74a49f6ed5c97",
-    "dac_private_key": "c86a98b7180945ff13b3df7bb56543240a46610f109ecb24c95d7c281a5426bc",
-    "dac_public_key": "04463e909dc75ffd2b9e348f1947164db4cfcd0b50d9f43ccd20f1df49ffadd1b34feb1e3353338f79abfffedca1a82fe35572a4a603806b46d56d1e6400a284e2"
+    "dac_cert": "308201e43082018aa00302010202082648a8cc5b942f72300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049b1374bca9ac53ba9c05a8175a77e0dac47fbea42e03ee996aa049ac436e262b8302b3cbd1edf7c85f7c36c32bb4cfdff8acff3241daa9451b08c7b7b55b822fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bd38b754960e351ec7262c611983e046a3206170301f0603551d23041830168014431851872d8a1d5bae7cd009da8c5e511625ab0c300a06082a8648ce3d04030203480030450220668c078040e27983f7b6a80e664cd80d14a80ce0d8505db3feaf5e0cb7aa75d002210096a8770310b80b4e7a866b7a9b1b5658b584bb4097e6546831913a17495ed4ed",
+    "pai_cert": "308201d53082017aa00302010202087f502f4778b2ded6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f726573f64622b00c06db912ce741452b3245303064d7c410edfb75d49c3d2746f5feaf7c6c1426521775499042e2ef379c112810dfc743f606d5ffcbfabcbdba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414431851872d8a1d5bae7cd009da8c5e511625ab0c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a9bd083e3d5bbdbfdb2dfd84fc383b331251039d757d3b866accc1a07c539c4f022100b24c6f5072dc8cd43548a5cb8d60bec3e32d2037185f84810cec05c82a37df3c",
+    "certification_declaration": "308201d106092a864886f70d010702a08201c2308201be020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe662010140bbb3544c5016577aa8b44ffb90fcca140fe662010140bbb35443a016577aa8b44ffb90fcca140fe662010140bbb35443afe6577aa8b44ffb90fcca140fe662010140bbb35443afe9a77aa8b44ffb90fcca140fe662010140bbb35443afe9a88aa8b44ffb90fcca140fe662010140bbb35443afe9a88558b44ffb90fcca140fe662010140bbb35443afe9a88557444ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008ab7808cc2dce431af11785256dc9ed4cee7e365a6d8420ae344784da981fee60221008c2c865c2ca2a6e8304f3138ef7d88f9cf365552c64841113cc2fc33acf73664",
+    "dac_private_key": "09cc6de95538b3070000939ab6b79bc8d87edc898676c7e8bacc3f2926c1a5fe",
+    "dac_public_key": "049b1374bca9ac53ba9c05a8175a77e0dac47fbea42e03ee996aa049ac436e262b8302b3cbd1edf7c85f7c36c32bb4cfdff8acff3241daa9451b08c7b7b55b822f"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der
index 0cc501a035e017..b3be1d20332fbe 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der
index 3351b5bffcdf10..ecfe041e9ce2ef 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem
index a2e446179b9044..42ac79bfdc2e06 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIf1mCoDxz4yYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIGwYoGLddI3gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-iFaVmjbYp9C9gJtoElpmY5EQ0iBw9wEjvUP0J/COujvDi58sTvR5CPovGupplS9a
-7T5XFbe4awTlG9CVKToyq6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFLKeOK0VZRfBgjT6Mh5EttzqTipzMB8GA1UdIwQYMBaAFHSX
-aLhQ+/ogweNwQqzkjJxn6/SHMAoGCCqGSM49BAMCA0gAMEUCIQC6jKkrvF86l/xg
-DTmrDAOPbSa6e6UcHEv3FIVY2U5blgIgLb9KpOg8bcgeq2G4URM55JdvxK8UTx5B
-p89RCgo6NlY=
+asounqdQYyOLLe653F55bFxU2Rs0CrhvxquBOIlSG1c6P15BMa98ZExcurwBAKiI
+RKtLDas3kQla3ebE/ziGMKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNyVXVNU/7SrmL/1sBeuNCAFH1OuMB8GA1UdIwQYMBaAFDjx
+ejkWk5X+4iCiapW4PkrgoXZUMAoGCCqGSM49BAMCA0gAMEUCIQCaHamOREc88xXS
+ucpwomQoPku6amSfyst2ASlIWF9JpgIgPGOZrEfpnQAAkg9cAyQr0TuyrXx+SxNu
+jwMUL7ZJf+s=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der
index 0461728b2b8258..80a7841b794306 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem
index d251900f6489a4..7eacf5cae37525 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIE+dxvaEHTTPjeplvsFNzv7VHLu6Z4eng9enqZqoEfqJoAoGCCqGSM49
-AwEHoUQDQgAEiFaVmjbYp9C9gJtoElpmY5EQ0iBw9wEjvUP0J/COujvDi58sTvR5
-CPovGupplS9a7T5XFbe4awTlG9CVKToyqw==
+MHcCAQEEIMZh9j4K3pmHFph6KBPoxvXP7h/tL6d2IdmtwAmc8eEmoAoGCCqGSM49
+AwEHoUQDQgAEasounqdQYyOLLe653F55bFxU2Rs0CrhvxquBOIlSG1c6P15BMa98
+ZExcurwBAKiIRKtLDas3kQla3ebE/ziGMA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der
index 45093e62652cd0..7b029ad62996c8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem
index 49e53ae204387b..3b7ef508178c0a 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIbZOk9e/o6C4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIdNV0SXUqsWUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASE3aaZb3xnAzzOamqq2dYzgeYZLbI7
-zCIpN33TdTjxFnzNWgU2EjzT3bbzmf95R64vaZuw3ctblKtx6f9xCrT0o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUdJdo
-uFD7+iDB43BCrOSMnGfr9IcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgLqiaveztkXqVy7NaJ1lXMY+iBu8gnLnQJEhE
-dIyXT4ACIBNNP0+W8LUwjtSP6DneliN9DQLeAdnxhb6O60n0G4Ua
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASwumg2OCld9yDbJh2rgqFdc20k9Obo
+82OHGpAhiXDPKbMMuXrTjORqSrBs+XvR25OICM0mL8x23c73eUPhbGsCo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUOPF6
+ORaTlf7iIKJqlbg+SuChdlQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOVfkkfMBn+SJ0M00z2eTgg+V9UyseH5rIN/
+cb9mACX4AiB6uPa2jrf8dYHrcoWl0z+RZfvRi+n7M/7uCxEPMThoXA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der
index e57e30892702ba..33664539bc8228 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem
index c845d07e07f218..6f196115947b52 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGb30EUs4LkuZ0sdJBYhCWqd9Fzcuu+qj9NM5LD0yuIToAoGCCqGSM49
-AwEHoUQDQgAEhN2mmW98ZwM8zmpqqtnWM4HmGS2yO8wiKTd903U48RZ8zVoFNhI8
-092285n/eUeuL2mbsN3LW5Srcen/cQq09A==
+MHcCAQEEIGMQaXPIOBP5k/xhKd8u+HFxtnlqWKDNQlL7TAGEmOSkoAoGCCqGSM49
+AwEHoUQDQgAEsLpoNjgpXfcg2yYdq4KhXXNtJPTm6PNjhxqQIYlwzymzDLl604zk
+akqwbPl70duTiAjNJi/Mdt3O93lD4WxrAg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json
index 9ea14e2c24d7d6..0aa6e96b81f893 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains ten PAAs one of which is valid PAA authorized to sign the PAI.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202087f5982a03c73e326300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048856959a36d8a7d0bd809b68125a66639110d22070f70123bd43f427f08eba3bc38b9f2c4ef47908fa2f1aea69952f5aed3e5715b7b86b04e51bd095293a32aba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b29e38ad156517c18234fa321e44b6dcea4e2a73301f0603551d23041830168014749768b850fbfa20c1e37042ace48c9c67ebf487300a06082a8648ce3d0403020348003045022100ba8ca92bbc5f3a97fc600d39ab0c038f6d26ba7ba51c1c4bf7148558d94e5b9602202dbf4aa4e83c6dc81eab61b8511339e4976fc4af144f1e41a7cf510a0a3a3656",
-    "pai_cert": "308201d33082017aa00302010202086d93a4f5efe8e82e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000484dda6996f7c67033cce6a6aaad9d63381e6192db23bcc2229377dd37538f1167ccd5a0536123cd3ddb6f399ff7947ae2f699bb0ddcb5b94ab71e9ff710ab4f4a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414749768b850fbfa20c1e37042ace48c9c67ebf487301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202ea89abdeced917a95cbb35a275957318fa206ef209cb9d0244844748c974f800220134d3f4f96f0b5308ed48fe839de96237d0d02de01d9f185be8eeb49f41b851a",
-    "certification_declaration": "308201cf06092a864886f70d010702a08201c0308201bc020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201014f4bb35bbc5016577aa8b44ffb90fcca140fe66201014f4bb3544c5016577aa8b44ffb90fcca140fe66201014f4bb35443a016577aa8b44ffb90fcca140fe66201014f4bb35443afe6577aa8b44ffb90fcca140fe66201014f4bb35443afe9a77aa8b44ffb90fcca140fe66201014f4bb35443afe9a88aa8b44ffb90fcca140fe66201014f4bb35443afe9a88558b44ffb90fcca140fe66201014f4bb35443afe9a88557444ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220036cfdbd9efc823d801a3f906cd764f4392cfd97200747a8f48f623ca8935312022055d32d8f87b3012575f1db54d3418c1807ef8dee5dcae0b261d4f3dfbaaebe8d",
-    "dac_private_key": "4f9dc6f6841d34cf8dea65bec14dcefed51cbbba6787a783d7a7a99aa811fa89",
-    "dac_public_key": "048856959a36d8a7d0bd809b68125a66639110d22070f70123bd43f427f08eba3bc38b9f2c4ef47908fa2f1aea69952f5aed3e5715b7b86b04e51bd095293a32ab"
+    "dac_cert": "308201e43082018aa00302010202081b062818b75d2378300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046aca2e9ea75063238b2deeb9dc5e796c5c54d91b340ab86fc6ab813889521b573a3f5e4131af7c644c5cbabc0100a88844ab4b0dab3791095adde6c4ff388630a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dc955d5354ffb4ab98bff5b017ae3420051f53ae301f0603551d2304183016801438f17a39169395fee220a26a95b83e4ae0a17654300a06082a8648ce3d04030203480030450221009a1da98e44473cf315d2b9ca70a264283e4bba6a649fcacb76012948585f49a602203c6399ac47e99d0000920f5c03242bd13bb2ad7c7e4b136e8f03142fb6497feb",
+    "pai_cert": "308201d43082017aa003020102020874d57449752ab165300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b0ba683638295df720db261dab82a15d736d24f4e6e8f363871a90218970cf29b30cb97ad38ce46a4ab06cf97bd1db938808cd262fcc76ddcef77943e16c6b02a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041438f17a39169395fee220a26a95b83e4ae0a17654301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e55f9247cc067f92274334d33d9e4e083e57d532b1e1f9ac837f71bf660025f802207ab8f6b68eb7fc7581eb7285a5d33f9165fbd18be9fb33feee0b110f3138685c",
+    "certification_declaration": "308201d106092a864886f70d010702a08201c2308201be020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201014f4bb35bbc5016577aa8b44ffb90fcca140fe66201014f4bb3544c5016577aa8b44ffb90fcca140fe66201014f4bb35443a016577aa8b44ffb90fcca140fe66201014f4bb35443afe6577aa8b44ffb90fcca140fe66201014f4bb35443afe9a77aa8b44ffb90fcca140fe66201014f4bb35443afe9a88aa8b44ffb90fcca140fe66201014f4bb35443afe9a88558b44ffb90fcca140fe66201014f4bb35443afe9a88557444ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100baa33a2b9363fc16483e5f87830d96871af61d38c87fd3ce3ecbee6d43ff15d80221009192020c3c7f82959208b73f84e2808240436d55c4ab2549e63ae06e86398263",
+    "dac_private_key": "c661f63e0ade998716987a2813e8c6f5cfee1fed2fa77621d9adc0099cf1e126",
+    "dac_public_key": "046aca2e9ea75063238b2deeb9dc5e796c5c54d91b340ab86fc6ab813889521b573a3f5e4131af7c644c5cbabc0100a88844ab4b0dab3791095adde6c4ff388630"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der
index c3fef102317cfd..6758e5ba4a4b58 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der
index a6bf015433038c..1469ca3bd71475 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem
index 0ac834df730e39..329f4f5da8d068 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIcETZsl89VkQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIdNmZKNQCYWMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-S+zLGT/RZV4t6W31W+dT5GCiPSPsth4tCMm6s5nG+n7jA3gv0imMHslqx3fn1ASR
-UN/q59c40Sz46Ec/2QOaDaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFO8ZZZcuM1EJOrm6RwEuTmZNvXgTMB8GA1UdIwQYMBaAFGEM
-k/YcOyOVLhNKzhITzZC2Lj/VMAoGCCqGSM49BAMCA0kAMEYCIQDzPAYt0TRUddya
-52vqz8AC07Kq9/O2nmIN26xKQuG5YAIhAKKQwQTi/qChn9PRmT5jX0d0bqhSR+AP
-+g+QlA9rO/Ad
+lHyn6BTU7jJky1sXvayobEIIC/UifDpDSEYyUMwrp4sxC5VjDwid/BvCIs3WRjdC
+SXsgDrGgrsfXiqu8QGo44KNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBsbwvK0M49z3l/ILHy6l1xWZXu2MB8GA1UdIwQYMBaAFLOt
+0tb0sCTx9ppthyk4NdEN9j7cMAoGCCqGSM49BAMCA0gAMEUCIQC6jg4+m1bf6rH6
+tuILqO93F5X6GgEub9/N1duj8IzOCgIgFuaU5SSNhorqYtIaCAttCzbB9IWSxaaR
+XVdYjkS4Wmo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der
index 1431ad1c3c8c40..44083ab6aa3e50 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem
index 86fd78a7202826..5d9a7ccfb3126e 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBkxC7e8YWX2+/XfgF44wqTSbnLmcl1ieG4h8kGy5VnFoAoGCCqGSM49
-AwEHoUQDQgAES+zLGT/RZV4t6W31W+dT5GCiPSPsth4tCMm6s5nG+n7jA3gv0imM
-Hslqx3fn1ASRUN/q59c40Sz46Ec/2QOaDQ==
+MHcCAQEEIMdUQLHKR6+i9GH0z3rYMW/9Uefw2XaJkkg5Be7zQim0oAoGCCqGSM49
+AwEHoUQDQgAElHyn6BTU7jJky1sXvayobEIIC/UifDpDSEYyUMwrp4sxC5VjDwid
+/BvCIs3WRjdCSXsgDrGgrsfXiqu8QGo44A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der
index 81ec578304221a..a8356045568dbc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem
index f7054d13ce4bcc..b1550bc01f8c02 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIaCIr2PF5HccwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIVFUGBqrBvmkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARWqEls3lfJzFIGpI7QNUSlD6HM7sQX
-t566fcYTbGO9UCnY5lRwvGCT0rEv5eBksVS5cFVgiRp1eWuFt/rGG5Syo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUYQyT
-9hw7I5UuE0rOEhPNkLYuP9UwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgR6aCRE7AE30bqDAwWsC8/CYo5fL+l+RjCALI
-Tjxdp8sCIQCC1Lan4znOavR8X/WCTGcE6qeV0UW6zg7DpIH8KaP4ag==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATPAnkb0YNM15fIozq9uwwGUp1AVGup
+uyzZvnaIN+8b1L0yDOEd6bQODl41GffzTTF9bCGjN8zYIcPgIggHj3Yfo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs63S
+1vSwJPH2mm2HKTg10Q32PtwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgNyhN/2mcUHnb8ME/zxVPTc733OR+med1DFcN
+xlWA4d0CIQCdSjpjOOpbNP3xCM5j67A+OIni7i1+F/9yrqA7crvMKA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der
index f9361903775012..0340c6532e8d89 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem
index 7be6f23a2f3468..e07394adadbf38 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA7T1qen3KCrXmubdr2k4QXBp/vFO90JiIAau/rYi4BUoAoGCCqGSM49
-AwEHoUQDQgAEVqhJbN5XycxSBqSO0DVEpQ+hzO7EF7eeun3GE2xjvVAp2OZUcLxg
-k9KxL+XgZLFUuXBVYIkadXlrhbf6xhuUsg==
+MHcCAQEEIKuVA2YM5OftMZgGQvN4E4ij1ibTiWtiMhMrd56pBmrIoAoGCCqGSM49
+AwEHoUQDQgAEzwJ5G9GDTNeXyKM6vbsMBlKdQFRrqbss2b52iDfvG9S9MgzhHem0
+Dg5eNRn3800xfWwhozfM2CHD4CIIB492Hw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json
index ee794a021dd9dc..0b2ce1a0a4d1db 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains one valid PAA which is authorized to sign the PAI.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa00302010202087044d9b25f3d5644300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044beccb193fd1655e2de96df55be753e460a23d23ecb61e2d08c9bab399c6fa7ee303782fd2298c1ec96ac777e7d4049150dfeae7d738d12cf8e8473fd9039a0da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ef1965972e3351093ab9ba47012e4e664dbd7813301f0603551d23041830168014610c93f61c3b23952e134ace1213cd90b62e3fd5300a06082a8648ce3d0403020349003046022100f33c062dd1345475dc9ae76beacfc002d3b2aaf7f3b69e620ddbac4a42e1b960022100a290c104e2fea0a19fd3d1993e635f47746ea85247e00ffa0f90940f6b3bf01d",
-    "pai_cert": "308201d43082017aa003020102020868222bd8f1791dc7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000456a8496cde57c9cc5206a48ed03544a50fa1cceec417b79eba7dc6136c63bd5029d8e65470bc6093d2b12fe5e064b154b9705560891a75796b85b7fac61b94b2a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414610c93f61c3b23952e134ace1213cd90b62e3fd5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022047a682444ec0137d1ba830305ac0bcfc2628e5f2fe97e4630802c84e3c5da7cb02210082d4b6a7e339ce6af47c5ff5824c6704eaa795d145bace0ec3a481fc29a3f86a",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100aa83c3d8602da9e1267445aaca0a53476c7a1026df7aa2c39fd350a5353a382d022100ee23b14794a218b2b78943ae1cc98b028418572d455723aa2c0d933d98228c11",
-    "dac_private_key": "19310bb7bc6165f6fbf5df805e38c2a4d26e72e6725d62786e21f241b2e559c5",
-    "dac_public_key": "044beccb193fd1655e2de96df55be753e460a23d23ecb61e2d08c9bab399c6fa7ee303782fd2298c1ec96ac777e7d4049150dfeae7d738d12cf8e8473fd9039a0d"
+    "dac_cert": "308201e43082018aa003020102020874d99928d4026163300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004947ca7e814d4ee3264cb5b17bdaca86c42080bf5227c3a4348463250cc2ba78b310b95630f089dfc1bc222cdd6463742497b200eb1a0aec7d78aabbc406a38e0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141b1bc2f2b4338f73de5fc82c7cba975c56657bb6301f0603551d23041830168014b3add2d6f4b024f1f69a6d87293835d10df63edc300a06082a8648ce3d0403020348003045022100ba8e0e3e9b56dfeab1fab6e20ba8ef771795fa1a012e6fdfcdd5dba3f08cce0a022016e694e5248d868aea62d21a080b6d0b36c1f48592c5a6915d57588e44b85a6a",
+    "pai_cert": "308201d43082017aa003020102020854550606aac1be69300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cf02791bd1834cd797c8a33abdbb0c06529d40546ba9bb2cd9be768837ef1bd4bd320ce11de9b40e0e5e3519f7f34d317d6c21a337ccd821c3e02208078f761fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b3add2d6f4b024f1f69a6d87293835d10df63edc301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022037284dff699c5079dbf0c13fcf154f4dcef7dce47e99e7750c570dc65580e1dd0221009d4a3a6338ea5b34fdf108ce63ebb03e3889e2ee2d7e17ff72aea03b72bbcc28",
+    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022053886321101af891530f5961c3fe0ed2ea65806aa7301f8b8e0a5f863bbd82d6022055fd216de9938a02f50eefadbce6a7fdb6d2d98aff506c26d56035e6f0412961",
+    "dac_private_key": "c75440b1ca47afa2f461f4cf7ad8316ffd51e7f0d9768992483905eef34229b4",
+    "dac_public_key": "04947ca7e814d4ee3264cb5b17bdaca86c42080bf5227c3a4348463250cc2ba78b310b95630f089dfc1bc222cdd6463742497b200eb1a0aec7d78aabbc406a38e0"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der
index 4fd7d29fdc52ef..51b636e02e717d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der
index dcbd5790847bdd..94a0484251ccf7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem
index 8d7d013c0b956e..9a85744620b91e 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIILtgK8IVOgO0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIEqLB8RL8he0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-q9pwikfoPwiDZEd3d2azEshSOYAMaav0966ynB1tASy9IIHCwzfF8+r3/Q++uTnK
-N2fn73fsVxOpER8fAVKIaKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFAvfzUVdPws9EjKg9NI0GaAR2FfwMB8GA1UdIwQYMBaAFCRk
-COBkjb+cWIX3LIiyJiQ5KtGKMAoGCCqGSM49BAMCA0gAMEUCIQCH6Y6XiAL8d8LV
-dbVUOdcpGe4YemZ8OTYNL3Q1nNak2gIgcH7FO7k2YyOIVBo1gvFAjFmAQkrvc0TC
-uX4fDkzakNg=
+/vL1pWtjv89pKsbhAj3BEHHomk/jeepQcgdRmtDdgJsF8ZdxDuoNOdpF7E8No2/k
+VJP0wxqsgztHQc1XQstJgaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFQfDidKime/iDRWT009y7kiMlWpMB8GA1UdIwQYMBaAFOWm
+UOmP0w+x9KIGN/qpz3cWvF1rMAoGCCqGSM49BAMCA0cAMEQCIE6H581SftxXACyp
+MevqOJgUJOvhmX31nnHt9HLeCF0HAiBJcCaBucV/7Qw6OKA9ejcOGG8lpDbTsNxa
+RMu3QKlHrA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der
index bcd0ebd3ed220e..0d63b533f37ae2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem
index 1a4679eebb0440..db4f2ef457bda3 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP3ppsU8X1F+yRlNkQ4c/yagX1OHTphHQaIDoQcLuGVIoAoGCCqGSM49
-AwEHoUQDQgAEq9pwikfoPwiDZEd3d2azEshSOYAMaav0966ynB1tASy9IIHCwzfF
-8+r3/Q++uTnKN2fn73fsVxOpER8fAVKIaA==
+MHcCAQEEILJiPTolwyBDRdvTBoKGknmKNzQ+8HRE+d2uNx1TK9vooAoGCCqGSM49
+AwEHoUQDQgAE/vL1pWtjv89pKsbhAj3BEHHomk/jeepQcgdRmtDdgJsF8ZdxDuoN
+OdpF7E8No2/kVJP0wxqsgztHQc1XQstJgQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der
index c1993989c58bc1..de9186d59137a3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem
index 9f68677f836807..0b722cb8cc6d1c 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIIWFYrYJRS/owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIINySEY6V9jJQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR1Ue2PTPiv0LJ4J+VHvhgwhR7CbOkH
-UMUSXvWL3H2c1yoDfms1HqplGGEUd10VHdrgcD/1VQdJ0cZ8r3/seV+io2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJGQI
-4GSNv5xYhfcsiLImJDkq0YowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgUEEGcYnxFFI1udDW6MsOR8I2O7xoeoCLfCNd
-n5NakdECIQDDVueR4PSML1wzVpLEo+0gpjepomPbPxT5xFOukiJ+tA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAShS1YELdTRR6aI8ILwK6J1Ig2j6e+U
+P9pszA1GqsWFRCmUkWI93scA+K+L1Mcq5xbdNTSTKRHWzFLK4Z2NiONXo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU5aZQ
+6Y/TD7H0ogY3+qnPdxa8XWswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgIlVmQEYxbcmHHnuOIVjZnVqcM6sJ8vGp1t7t
+kzyLLMQCIC5kD2Xy7w9Vl7zg3PxH8KDQtlBydUL9I5sHgZwlHBRS
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der
index 52877110d42b7f..c78a2f5a000891 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem
index f54da100d91dcf..98e744ec036073 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICXCXn+HuGQY27ctSG7uSyNcY8KS3qoIKhoyyBNOAC2qoAoGCCqGSM49
-AwEHoUQDQgAEdVHtj0z4r9CyeCflR74YMIUewmzpB1DFEl71i9x9nNcqA35rNR6q
-ZRhhFHddFR3a4HA/9VUHSdHGfK9/7Hlfog==
+MHcCAQEEILiTIVBw+tq0rUz4BJ3fub+81Lz/kety3w6Q+Vg5Wn6eoAoGCCqGSM49
+AwEHoUQDQgAEoUtWBC3U0UemiPCC8CuidSINo+nvlD/abMwNRqrFhUQplJFiPd7H
+APivi9THKucW3TU0kykR1sxSyuGdjYjjVw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json
index 5e41046a881d44..3d1a5c9897d1c1 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains two PAAs one of which is valid PAA authorized to sign the PAI.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202082ed80af0854e80ed300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004abda708a47e83f08836447777766b312c85239800c69abf4f7aeb29c1d6d012cbd2081c2c337c5f3eaf7fd0fbeb939ca3767e7ef77ec5713a9111f1f01528868a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140bdfcd455d3f0b3d1232a0f4d23419a011d857f0301f0603551d23041830168014246408e0648dbf9c5885f72c88b22624392ad18a300a06082a8648ce3d040302034800304502210087e98e978802fc77c2d575b55439d72919ee187a667c39360d2f74359cd6a4da0220707ec53bb936632388541a3582f1408c5980424aef7344c2b97e1f0e4cda90d8",
-    "pai_cert": "308201d43082017aa0030201020208216158ad82514bfa300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047551ed8f4cf8afd0b27827e547be1830851ec26ce90750c5125ef58bdc7d9cd72a037e6b351eaa65186114775d151ddae0703ff5550749d1c67caf7fec795fa2a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414246408e0648dbf9c5885f72c88b22624392ad18a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205041067189f1145235b9d0d6e8cb0e47c2363bbc687a808b7c235d9f935a91d1022100c356e791e0f48c2f5c335692c4a3ed20a637a9a263db3f14f9c453ae92227eb4",
-    "certification_declaration": "3082011a06092a864886f70d010702a082010b30820107020103310d300b0609608648016503040201307406092a864886f70d010701a0670465152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206debec7b91394474896b5c86c0a505ae8f6ee8415acde6c9d0b8bdaff1b6dc44022100f799e5fc9cddd66606698073fe9cbb61d4ee58890996c68ced64181bcf2bc0ad",
-    "dac_private_key": "fde9a6c53c5f517ec9194d910e1cff26a05f53874e984741a203a1070bb86548",
-    "dac_public_key": "04abda708a47e83f08836447777766b312c85239800c69abf4f7aeb29c1d6d012cbd2081c2c337c5f3eaf7fd0fbeb939ca3767e7ef77ec5713a9111f1f01528868"
+    "dac_cert": "308201e33082018aa003020102020812a2c1f112fc85ed300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fef2f5a56b63bfcf692ac6e1023dc11071e89a4fe379ea507207519ad0dd809b05f197710eea0d39da45ec4f0da36fe45493f4c31aac833b4741cd5742cb4981a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414541f0e274a8a67bf8834564f4d3dcbb9223255a9301f0603551d23041830168014e5a650e98fd30fb1f4a20637faa9cf7716bc5d6b300a06082a8648ce3d040302034700304402204e87e7cd527edc57002ca931ebea38981424ebe1997df59e71edf472de085d07022049702681b9c57fed0c3a38a03d7a370e186f25a436d3b0dc5a44cbb740a947ac",
+    "pai_cert": "308201d33082017aa003020102020837248463a57d8c94300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a14b56042dd4d147a688f082f02ba275220da3e9ef943fda6ccc0d46aac58544299491623ddec700f8af8bd4c72ae716dd3534932911d6cc52cae19d8d88e357a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e5a650e98fd30fb1f4a20637faa9cf7716bc5d6b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202255664046316dc9871e7b8e2158d99d5a9c33ab09f2f1a9d6deed933c8b2cc402202e640f65f2ef0f5597bce0dcfc47f0a0d0b650727542fd239b07819c251c1452",
+    "certification_declaration": "3082011906092a864886f70d010702a082010a30820106020103310d300b0609608648016503040201307406092a864886f70d010701a0670465152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402205036c90aca5885fda4fc51c7c5a0069dd87fba06a991877e30ea9713a63e092e02200d6fb45b507cb0f841146c6729484a284dc69003572da46dd8f16841d473787c",
+    "dac_private_key": "b2623d3a25c3204345dbd306828692798a37343ef07444f9ddae371d532bdbe8",
+    "dac_public_key": "04fef2f5a56b63bfcf692ac6e1023dc11071e89a4fe379ea507207519ad0dd809b05f197710eea0d39da45ec4f0da36fe45493f4c31aac833b4741cd5742cb4981"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der
index a274b4ca57b512..a477e606641e75 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der
index b3f85c2ac410a2..40edf75a96fce2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem
index 72bf3b65130d22..d536d0db77a540 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIUYu7Q7WxD2AwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIPc6myJwo42YwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-CZ0bbCHRPFoi7ahtIgVNqXd3KDhEMgVkdNCBcH80RroUvUQVs+dGjG7ZijOrNfAm
-eD3mUSVGvjoQ3TmECRsEtKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKgC0WYIZQrs4w4KY1sAgTYey2yhMB8GA1UdIwQYMBaAFDDS
-WyKJEiotsKibeXczyzGKmeA3MAoGCCqGSM49BAMCA0gAMEUCIEygGm8jekQk0p1a
-Xcrx+CxlB21EEv66/39rDzXMt1a3AiEA6VG3InK0NjkgO9y7x4ZguS4NRx0vhW3z
-facKhSJ9SMo=
+T0Uq1XUb2c4R91QlOxAV/f/Lad48pl8YZis8uy3R+o9PGYRiFUNR4+cINucG/ES2
+KxT1+rHI78vi++0us+EyFqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNrZJxnzoqTOUQ07CMuwURsbREuxMB8GA1UdIwQYMBaAFHiI
+2HASDYJpr38+BN84oUvjspuyMAoGCCqGSM49BAMCA0gAMEUCIQDfo0nO4Lgd3riJ
+1hsiDi1ZOtUdZY/5pDKMD2U/MmsSxQIgdtAqUu5s3VDRxZ3MKHE3Q1OobYVodSw7
+vTZu3NDEAtY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der
index 5b0bfa2414da0d..cecf91fde03161 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem
index f65aa8ad19be6d..479fdc9222cedb 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINMfFMkjZEL9lRh9uU5O1QWWAazHXPhjvGbAkNIag4CaoAoGCCqGSM49
-AwEHoUQDQgAECZ0bbCHRPFoi7ahtIgVNqXd3KDhEMgVkdNCBcH80RroUvUQVs+dG
-jG7ZijOrNfAmeD3mUSVGvjoQ3TmECRsEtA==
+MHcCAQEEIPxcpKYFQTEZ8UzNlCXx+870QFIP/aUYay7WxJ5FzmC5oAoGCCqGSM49
+AwEHoUQDQgAET0Uq1XUb2c4R91QlOxAV/f/Lad48pl8YZis8uy3R+o9PGYRiFUNR
+4+cINucG/ES2KxT1+rHI78vi++0us+EyFg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der
index 1a8d5153503d23..4e4f027c0f1bb9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem
index 62b8b4f6411aba..d0b72754cfea94 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIEhmidBNI/tQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIILq0G3MIkSIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARe80WynXdUccvepI/ckVLpdY8QakZj
-++bxAk5VddghLE3yShO4tlTeZJnAyzBxlbcM1Jch5GEnxwVaUDDwWQxco2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUMNJb
-IokSKi2wqJt5dzPLMYqZ4DcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgPqj+ObogQrmrO98Q4zb08jwAV9kIK7ujgMSa
-00VNaOECIQC9HhcI9DYAWB9FkHofh2JszGuj24xpoCHbYa7rv0sFHw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARJaQB6ThZZCGIy2p5vR+jyRCuzephg
+KDnrNJfW9vqJefwEunRnqboNullf43KxMkMT4yw3ReyfscspUSjCk4z7o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeIjY
+cBINgmmvfz4E3zihS+Oym7IwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgCq3FrHs6ULv732atHLbE2fxm39c30YQtR53B
+asvqPiwCIQCgBVl8I5hWFZnLrjX+8+Ov5qReAKt5rCsiUM+dZQLYvQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der
index 1a65a4a0c76770..72f1df7459e1c3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem
index 818b2bd690e9cb..948ce8981bc8c2 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHhZDwwJF7WntLQlh6rQmys2GpyBCjloQDS7Dfu66G9AoAoGCCqGSM49
-AwEHoUQDQgAEXvNFsp13VHHL3qSP3JFS6XWPEGpGY/vm8QJOVXXYISxN8koTuLZU
-3mSZwMswcZW3DNSXIeRhJ8cFWlAw8FkMXA==
+MHcCAQEEIGzfCxVa9BuJYacxJz6fwz8ApySjzWW+JJ2hI8p6l33uoAoGCCqGSM49
+AwEHoUQDQgAESWkAek4WWQhiMtqeb0fo8kQrs3qYYCg56zSX1vb6iXn8BLp0Z6m6
+DbpZX+NysTJDE+MsN0Xsn7HLKVEowpOM+w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json
index 835967465cb1fe..bf7755519e58cb 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains three PAAs none of which is a valid PAA authorized to sign the PAI.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208518bbb43b5b10f60300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004099d1b6c21d13c5a22eda86d22054da9777728384432056474d081707f3446ba14bd4415b3e7468c6ed98a33ab35f026783de6512546be3a10dd3984091b04b4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a802d16608650aece30e0a635b0081361ecb6ca1301f0603551d2304183016801430d25b2289122a2db0a89b797733cb318a99e037300a06082a8648ce3d040302034800304502204ca01a6f237a4424d29d5a5dcaf1f82c65076d4412febaff7f6b0f35ccb756b7022100e951b72272b43639203bdcbbc78660b92e0d471d2f856df37da70a85227d48ca",
-    "pai_cert": "308201d43082017aa00302010202081219a2741348fed4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045ef345b29d775471cbdea48fdc9152e9758f106a4663fbe6f1024e5575d8212c4df24a13b8b654de6499c0cb307195b70cd49721e46127c7055a5030f0590c5ca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041430d25b2289122a2db0a89b797733cb318a99e037301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203ea8fe39ba2042b9ab3bdf10e336f4f23c0057d9082bbba380c49ad3454d68e1022100bd1e1708f43600581f45907a1f87626ccc6ba3db8c69a021db61aeebbf4b051f",
-    "certification_declaration": "3082013206092a864886f70d010702a08201233082011f020103310d300b060960864801650304020130818a06092a864886f70d010701a07d047b152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100df70d10986d5d723b7756c75d43803b45a4a8e5c7baa031ee9bf6e45b5b2fcdd022100be6de163e8bf924352e3618afa1ace3bd3f56c8b54d1e9d4c8775c9fbe32440f",
-    "dac_private_key": "d31f14c9236442fd95187db94e4ed5059601acc75cf863bc66c090d21a83809a",
-    "dac_public_key": "04099d1b6c21d13c5a22eda86d22054da9777728384432056474d081707f3446ba14bd4415b3e7468c6ed98a33ab35f026783de6512546be3a10dd3984091b04b4"
+    "dac_cert": "308201e43082018aa00302010202083dcea6c89c28e366300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044f452ad5751bd9ce11f754253b1015fdffcb69de3ca65f18662b3cbb2dd1fa8f4f198462154351e3e70836e706fc44b62b14f5fab1c8efcbe2fbed2eb3e13216a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dad92719f3a2a4ce510d3b08cbb0511b1b444bb1301f0603551d230418301680147888d870120d8269af7f3e04df38a14be3b29bb2300a06082a8648ce3d0403020348003045022100dfa349cee0b81ddeb889d61b220e2d593ad51d658ff9a4328c0f653f326b12c5022076d02a52ee6cdd50d1c59dcc2871374353a86d8568752c3bbd366edcd0c402d6",
+    "pai_cert": "308201d43082017aa003020102020820bab41b73089122300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044969007a4e1659086232da9e6f47e8f2442bb37a98602839eb3497d6f6fa8979fc04ba7467a9ba0dba595fe372b1324313e32c3745ec9fb1cb295128c2938cfba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147888d870120d8269af7f3e04df38a14be3b29bb2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200aadc5ac7b3a50bbfbdf66ad1cb6c4d9fc66dfd737d1842d479dc16acbea3e2c022100a005597c2398561599cbae35fef3e3afe6a45e00ab79ac2b2250cf9d6502d8bd",
+    "certification_declaration": "3082013106092a864886f70d010702a08201223082011e020103310d300b060960864801650304020130818a06092a864886f70d010701a07d047b152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200377dd745c729b6785752d4c5ac1ca068a920c32e04c6f9973ea0da636f3b51a022100cc0699fd6c9a999ecf37dfb23b6c32fb339c802725b0dac9fb83205f5280495d",
+    "dac_private_key": "fc5ca4a605413119f14ccd9425f1fbcef440520ffda5186b2ed6c49e45ce60b9",
+    "dac_public_key": "044f452ad5751bd9ce11f754253b1015fdffcb69de3ca65f18662b3cbb2dd1fa8f4f198462154351e3e70836e706fc44b62b14f5fab1c8efcbe2fbed2eb3e13216"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der
index cec8ac3a9b1665..18d86ba6227c5e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der
index f231380cee0aa5..f0416ff4c47830 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem
index f6af79a2fdc4fd..241f043561e42e 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIGJvSMGkBBFIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIQms4STrnqFwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-KBTJ26EPrk3bps57lqS9nuFCxKuqITxjPOda3ay1KIga2u6VW2te1jJdkeYlSBf3
-89WW5jYEhEgqnT/AR1daJaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFG0GK0+NL03JjynODodUMehSOv7oMB8GA1UdIwQYMBaAFBU6
-rFmtO7zA6mSf5sPE0lt9UvlxMAoGCCqGSM49BAMCA0gAMEUCIDJnOGTTsFSgBhCB
-RX2khwKrtXsjvHLp0Su8CJQlm+fhAiEAvjrHcLP5jTJJEiUlxmA3lp3o0IRBew50
-L1t+wJAdZpE=
+2MCKse/tfP/MOznSBNh+4DenB1/AKV1qdaZ1vXbXn2RgdSHD6GsiTpY590BE8/A+
+o4m2AGIDO2mpXbXU/3v9h6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDVaPUbefo+lauAtnQ6tcRtD/dzmMB8GA1UdIwQYMBaAFCcw
+uzWh3CQmeYS3Wy4L4a97bUaSMAoGCCqGSM49BAMCA0gAMEUCIQDDYRdEg603p8Wm
+8pggq8r0JiogV3U4SJtbqX0UzM/Y7gIgcYcP7Zhn+CjPAcW1+vlZq8vCf/nf7Zm1
+2C5mQkC2FVM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der
index 72564fb08c53b1..bd16bf21401e82 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem
index 2a429b546feae9..4aeca65160ba9b 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICLK+xHpMqWVFqfp7/8JDPLNCN60xpQicfwTJyte6igKoAoGCCqGSM49
-AwEHoUQDQgAEKBTJ26EPrk3bps57lqS9nuFCxKuqITxjPOda3ay1KIga2u6VW2te
-1jJdkeYlSBf389WW5jYEhEgqnT/AR1daJQ==
+MHcCAQEEIIbh0k5+GXFxBkaqq4PzltZ+bSHSbxxj0rhmenAAcu+noAoGCCqGSM49
+AwEHoUQDQgAE2MCKse/tfP/MOznSBNh+4DenB1/AKV1qdaZ1vXbXn2RgdSHD6Gsi
+TpY590BE8/A+o4m2AGIDO2mpXbXU/3v9hw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der
index 079415583c9d89..473ddc2de96095 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem
index 81fc0614b5063c..b0a5b7d4225757 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIITQWjzp/UP0kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIfhvC58nKbpIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbUTSCrL6Aee8k++q65miV59AVM85F
-PzM/V1rrKMBniLTXnvq31dMeL/eJ8nlF2agL5K5yYnEa/umvjnJ11yAco2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUFTqs
-Wa07vMDqZJ/mw8TSW31S+XEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAPs9+PlvxIYXnDHWZV3IUoyixrT7EeOSJbd6
-DWrow60CAiAApJxztGwaEr4ueKzbJMPf9CJskBUGpHhzl+ofXESb6g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATJ4KsdXFk8NKBg1zXjp9kW2o4Ugeam
+1SQMYuCASZPSi2sBkkogReIc9DV+plFZQpe5sV1tZnmWYTl58idyvUwto2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJzC7
+NaHcJCZ5hLdbLgvhr3ttRpIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhALLLvlnzzRN+4lPsiq0/N6Fx0NEGVgWdfLZ9
+czBFe7erAiEAhlcXJnkOSU9MHjGg5pNJmt3Rs3WfnIXW4WbRQk7hUX4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der
index 9246d36c47e2f1..5c427c2beeb768 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem
index c8b94a95b76f8c..b58d82a6650237 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFdbifx3vALiRZ4js8td+9nMRhZgABC0qC5nohiiCF8yoAoGCCqGSM49
-AwEHoUQDQgAE21E0gqy+gHnvJPvquuZolefQFTPORT8zP1da6yjAZ4i01576t9XT
-Hi/3ifJ5RdmoC+SucmJxGv7pr45yddcgHA==
+MHcCAQEEIMJmNbGya4KPkWptWQV2pCpaoJTgb+BsKr1A0J4dKqzNoAoGCCqGSM49
+AwEHoUQDQgAEyeCrHVxZPDSgYNc146fZFtqOFIHmptUkDGLggEmT0otrAZJKIEXi
+HPQ1fqZRWUKXubFdbWZ5lmE5efIncr1MLQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json
index ada0ecb15f0d1b..e8815b2d57bc0a 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The optional authorized_paa_list field is not present.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa0030201020208189bd23069010452300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042814c9dba10fae4ddba6ce7b96a4bd9ee142c4abaa213c633ce75addacb528881adaee955b6b5ed6325d91e6254817f7f3d596e6360484482a9d3fc047575a25a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146d062b4f8d2f4dc98f29ce0e875431e8523afee8301f0603551d23041830168014153aac59ad3bbcc0ea649fe6c3c4d25b7d52f971300a06082a8648ce3d0403020348003045022032673864d3b054a0061081457da48702abb57b23bc72e9d12bbc0894259be7e1022100be3ac770b3f98d3249122525c66037969de8d084417b0e742f5b7ec0901d6691",
-    "pai_cert": "308201d43082017aa00302010202084d05a3ce9fd43f49300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004db513482acbe8079ef24fbeabae66895e7d01533ce453f333f575aeb28c06788b4d79efab7d5d31e2ff789f27945d9a80be4ae7262711afee9af8e7275d7201ca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414153aac59ad3bbcc0ea649fe6c3c4d25b7d52f971301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100fb3df8f96fc486179c31d6655dc8528ca2c6b4fb11e39225b77a0d6ae8c3ad02022000a49c73b46c1a12be2e78acdb24c3dff4226c901506a4787397ea1f5c449bea",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009d0671e7751a9672bce1211c070e5fa9856122c84b591221c61768a46612e3c40220200e658b3717370a8598a5b34f7740ce06acadac3907777a694c7a3f9d3bf511",
-    "dac_private_key": "22cafb11e932a59516a7e9efff090cf2cd08deb4c6942271fc13272b5eea280a",
-    "dac_public_key": "042814c9dba10fae4ddba6ce7b96a4bd9ee142c4abaa213c633ce75addacb528881adaee955b6b5ed6325d91e6254817f7f3d596e6360484482a9d3fc047575a25"
+    "dac_cert": "308201e43082018aa0030201020208426b38493ae7a85c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d8c08ab1efed7cffcc3b39d204d87ee037a7075fc0295d6a75a675bd76d79f64607521c3e86b224e9639f74044f3f03ea389b60062033b69a95db5d4ff7bfd87a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414355a3d46de7e8fa56ae02d9d0ead711b43fddce6301f0603551d230418301680142730bb35a1dc24267984b75b2e0be1af7b6d4692300a06082a8648ce3d0403020348003045022100c361174483ad37a7c5a6f29820abcaf4262a20577538489b5ba97d14cccfd8ee022071870fed9867f828cf01c5b5faf959abcbc27ff9dfed99b5d82e664240b61553",
+    "pai_cert": "308201d53082017aa00302010202087e1bc2e7c9ca6e92300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c9e0ab1d5c593c34a060d735e3a7d916da8e1481e6a6d5240c62e0804993d28b6b01924a2045e21cf4357ea651594297b9b15d6d667996613979f22772bd4c2da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142730bb35a1dc24267984b75b2e0be1af7b6d4692301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b2cbbe59f3cd137ee253ec8aad3f37a171d0d10656059d7cb67d7330457bb7ab02210086571726790e494f4c1e31a0e693499addd1b3759f9c85d6e166d1424ee1517e",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220600400539d3b287082cddc61d39be3800027d7abdf6ca1a3ace28b405117dab3022100c43de458625e47d3f8e878335ebc4609023d0496d8e26989c20fc3f3eed72ac9",
+    "dac_private_key": "86e1d24e7e1971710646aaab83f396d67e6d21d26f1c63d2b8667a700072efa7",
+    "dac_public_key": "04d8c08ab1efed7cffcc3b39d204d87ee037a7075fc0295d6a75a675bd76d79f64607521c3e86b224e9639f74044f3f03ea389b60062033b69a95db5d4ff7bfd87"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der
index 9abab0879b4200..0966dd7bc4a7b0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der
index e95645ccdd02d6..b694ab4910c81b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem
index 7569f3b19ba1f6..6a288ee8cfa645 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIGoBGORoGjbcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIXVOXr/aOFGcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-tU1g+OyXpT134o12s4jHKrWx0OxoOjvut9uw2jSM/ScOURjcuKVUYvSJs3TipBJj
-itFknDFdCc76ME/M+Sa/MKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOrbxDTWqIqLeAbgKOZR9FzrTNjEMB8GA1UdIwQYMBaAFNv6
-Bw6XkVUKqLb0i0REi7YLKeS6MAoGCCqGSM49BAMCA0kAMEYCIQCkF4QynSt6W4xw
-D2B/nOBgMlqJAfSe1Pz0eO2yzRs+ugIhAJ4NtXrFv7Stmyhu12zhnMNsKW2LpTh+
-E+0Pw8L3Ugyn
+2TaccSRRawA/i2TdbRyK27mHZfU+i9yJPqmcmeGnX3WBH1Cj9BsESPCxUGpeBDGi
+7wGeLZ4MymjMxq578Z7NmqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFHJtfAOZqMWkeyPhLrH3Q+hl9IchMB8GA1UdIwQYMBaAFEDH
+pCdFc6xbSiE1IKHu4Emj5U85MAoGCCqGSM49BAMCA0gAMEUCIBpgTQm7STvNKhGQ
+nbFSDUUSTNuR2jGHHcuOE5f19Mt0AiEA0W+EMwR2uz1s0LL6xj8Vpx1cbY5GZC6c
+KlCK6SKkIyg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der
index 211246b7c17614..99cb9c092295c8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem
index ce5dba1a28adf8..bad57815db7bcf 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG7DBxG+DsbOj2vpacTgTPekdthlvEBJ1AjqCbw3FPM6oAoGCCqGSM49
-AwEHoUQDQgAEtU1g+OyXpT134o12s4jHKrWx0OxoOjvut9uw2jSM/ScOURjcuKVU
-YvSJs3TipBJjitFknDFdCc76ME/M+Sa/MA==
+MHcCAQEEINjzBs0ABnaVgvAOYeE2/PkLhi21fvR7RsltuJyUrEKWoAoGCCqGSM49
+AwEHoUQDQgAE2TaccSRRawA/i2TdbRyK27mHZfU+i9yJPqmcmeGnX3WBH1Cj9BsE
+SPCxUGpeBDGi7wGeLZ4MymjMxq578Z7Nmg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der
index 112c478d2ae589..464475bb073b6f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem
index 25b800ce9f9ed9..f1cc985754e1de 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIINPkT6IeMjLkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIMT5MMy0KGPcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATuZUkWKm3bKUSLqBerjlsZXAAUPlM8
-ocA62rTadMUgDw74AzwAyEyurjSK+FiA7gaBUld7AuSUoxNLlUgnlriyo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU2/oH
-DpeRVQqotvSLRESLtgsp5LowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJGjhOZD/p9B2VyDgOLQbOKaQP4xh5GGQMQW
-mB2MA4sOAiARZSsECRQqkPZ3QqElYvLQBYOH4p6OJcZzZH00RH/odg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR4rZmC3pAIo4gW6P0brfANqcRJ+wrP
+GpFj2drbcaRpwwuDWej38KOyLnONt7Pbw9stnBgjxEgjuqah+5gGyarPo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQMek
+J0VzrFtKITUgoe7gSaPlTzkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgWgTMoGN/mq+N3vaO75Pf72DXB6r2rf6C7t6s
+JPDGL4oCIQDapgNBztWsiAX9vFikYENGuPcG1KjcQrr7qMxTTBFQ9w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der
index 216a3ec6f446e9..d75a499bd927f0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem
index 68d6ed8f6fdf7e..4c97d4f9dedb8e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGGxWu8N9B56PBQvX7wl2RR0EEhYKPl6VqpC/sZJ4SuPoAoGCCqGSM49
-AwEHoUQDQgAE7mVJFipt2ylEi6gXq45bGVwAFD5TPKHAOtq02nTFIA8O+AM8AMhM
-rq40ivhYgO4GgVJXewLklKMTS5VIJ5a4sg==
+MHcCAQEEIIR7XSzcJ8zOiW58eTSy/viZ/RKat4EVBJI3Gt5kQs0NoAoGCCqGSM49
+AwEHoUQDQgAEeK2Zgt6QCKOIFuj9G63wDanESfsKzxqRY9na23GkacMLg1no9/Cj
+si5zjbez28PbLZwYI8RII7qmofuYBsmqzw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json
index ce77ed4be2afd9..4edf553d19773a 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certificate_id field has wrong length.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202081a8046391a068db7300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b54d60f8ec97a53d77e28d76b388c72ab5b1d0ec683a3beeb7dbb0da348cfd270e5118dcb8a55462f489b374e2a412638ad1649c315d09cefa304fccf926bf30a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414eadbc434d6a88a8b7806e028e651f45ceb4cd8c4301f0603551d23041830168014dbfa070e9791550aa8b6f48b44448bb60b29e4ba300a06082a8648ce3d0403020349003046022100a41784329d2b7a5b8c700f607f9ce060325a8901f49ed4fcf478edb2cd1b3eba0221009e0db57ac5bfb4ad9b286ed76ce19cc36c296d8ba5387e13ed0fc3c2f7520ca7",
-    "pai_cert": "308201d43082017aa003020102020834f913e8878c8cb9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ee6549162a6ddb29448ba817ab8e5b195c00143e533ca1c03adab4da74c5200f0ef8033c00c84caeae348af85880ee068152577b02e494a3134b95482796b8b2a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414dbfa070e9791550aa8b6f48b44448bb60b29e4ba301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210091a384e643fe9f41d95c8380e2d06ce29a40fe3187918640c416981d8c038b0e022011652b0409142a90f67742a12562f2d0058387e29e8e25c673647d34447fe876",
-    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04175a494732303134315a423333303030312d32343132333424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206c4ddfa910850cb37c0e5f03e4877700053699b66c7c8be023be13c5fecf690902201a13e5d9a7a1a394d86bb86d904aaf76a45537ad75493ac4ae317fc0a8c89b08",
-    "dac_private_key": "6ec30711be0ec6ce8f6be969c4e04cf7a476d865bc4049d408ea09bc3714f33a",
-    "dac_public_key": "04b54d60f8ec97a53d77e28d76b388c72ab5b1d0ec683a3beeb7dbb0da348cfd270e5118dcb8a55462f489b374e2a412638ad1649c315d09cefa304fccf926bf30"
+    "dac_cert": "308201e43082018aa00302010202085d5397aff68e1467300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d9369c7124516b003f8b64dd6d1c8adbb98765f53e8bdc893ea99c99e1a75f75811f50a3f41b0448f0b1506a5e0431a2ef019e2d9e0cca68ccc6ae7bf19ecd9aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414726d7c0399a8c5a47b23e12eb1f743e865f48721301f0603551d2304183016801440c7a4274573ac5b4a213520a1eee049a3e54f39300a06082a8648ce3d040302034800304502201a604d09bb493bcd2a11909db1520d45124cdb91da31871dcb8e1397f5f4cb74022100d16f84330476bb3d6cd0b2fac63f15a71d5c6d8e46642e9c2a508ae922a42328",
+    "pai_cert": "308201d43082017aa0030201020208313e4c332d0a18f7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000478ad9982de9008a38816e8fd1badf00da9c449fb0acf1a9163d9dadb71a469c30b8359e8f7f0a3b22e738db7b3dbc3db2d9c1823c44823baa6a1fb9806c9aacfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041440c7a4274573ac5b4a213520a1eee049a3e54f39301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205a04cca0637f9aaf8ddef68eef93dfef60d707aaf6adfe82eedeac24f0c62f8a022100daa60341ced5ac8805fdbc58a4604346b8f706d4a8dc42bafba8cc534c1150f7",
+    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04175a494732303134315a423333303030312d32343132333424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022052d7e30b120a81160cd6ed795091196759de0286c029cbb9614cefe25d4669fd0220225fa6ec012986aa6e2e7aa512d33a5fd958d55b40681f19ae45175645cdf19f",
+    "dac_private_key": "d8f306cd0006769582f00e61e136fcf90b862db57ef47b46c96db89c94ac4296",
+    "dac_public_key": "04d9369c7124516b003f8b64dd6d1c8adbb98765f53e8bdc893ea99c99e1a75f75811f50a3f41b0448f0b1506a5e0431a2ef019e2d9e0cca68ccc6ae7bf19ecd9a"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der
index 0a75bd3f7fec47..5e3d7ec741aa2c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der
index b084e1202f969e..d24fb0d5af27f4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem
index 533dfc447f9169..bce0074c4e7d5e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIelRAQDSbAM8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIZ4HmaDpeyU8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-EdIfUar65dV4qb4co3UHBuFKmg4VAhxVWsa98OxEL8G77Ix6WccXzRkwlZcxOYNU
-TTUZyxpizeHxVW4+l38kq6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFsfX3NRDFPR+Hh93E8C808KNTqYMB8GA1UdIwQYMBaAFIIH
-FbG55bWOqdxCsNQ1d0c/H0rKMAoGCCqGSM49BAMCA0gAMEUCIQCfonmuo00ObF/t
-Ms8jwRdgI8mfDafxkWWkLtayIbVRngIga7s7KSzs3GwNSdKIPkA1++VsrQbibnHz
-NmVRC1DiiQ8=
+AhBU4SDORsW3huPapYTERe0bLqfu3T+36iwVAFA5Qrf6dpOfpOc2DE47hB29KxF6
+887U1iagHC83Yl26dUkkC6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFC0+vHGlsLa4BXeO8K/GALlodrfMB8GA1UdIwQYMBaAFG8f
+0dZgM8MPq6/lNo2aGgqpLNqiMAoGCCqGSM49BAMCA0gAMEUCIGAK8PJ6pFeCE1uk
+AspIspiYnS3J3xhrs7ZGyYNcfaFnAiEA8Kw0vJKI4N37cE0mCVSqhTSmr1WjU/F3
+XB0dzAqcMnw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der
index 83193f3772855c..66ddde4bb19453 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem
index 0c8054b5caea62..5ab7b5c76f8284 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPYAV7qSzFbdVj6cX2thbLxfEuTOyfwDl0kgn+UB0Lu7oAoGCCqGSM49
-AwEHoUQDQgAEEdIfUar65dV4qb4co3UHBuFKmg4VAhxVWsa98OxEL8G77Ix6WccX
-zRkwlZcxOYNUTTUZyxpizeHxVW4+l38kqw==
+MHcCAQEEICloF+XV6xh5iXphMCSoSDqIY7WjmdwLU0uvuiza0f1GoAoGCCqGSM49
+AwEHoUQDQgAEAhBU4SDORsW3huPapYTERe0bLqfu3T+36iwVAFA5Qrf6dpOfpOc2
+DE47hB29KxF6887U1iagHC83Yl26dUkkCw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der
index 23d854be064308..fbdb9849f26e3f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem
index 9debaccdeaa718..aa3cc38f3c9e59 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIVmP9HJVZtegwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIfRjqqXCQT4IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ7fVkZu8WSfPdIj0vKAZl0rddffME2
-UWY3zM5Rr2+oT1VsRmNFuVlVifrr7umNJ9daGINRYNQYN4uoRMP/Vraio2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUggcV
-sbnltY6p3EKw1DV3Rz8fSsowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAIazE8eM4W+L2mfXw2E0jhSPqZ5zCwuIEM38
-pOkWEH5NAiAlMs72Rvhm/zxbSEA8ib9wDextZws9l2Jt/VnZq2qQ1Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQKv0D+XLAyvBsgzGfwT6tO/eJOSMw3
+2p8uQdWUyK7sI10EtkrlPMbEoOOzeQ3QS8rxOdI8UkZHzZuSY62f2U56o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUbx/R
+1mAzww+rr+U2jZoaCqks2qIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAN+kERUWuyNQkHDlWqLGkPNZBd5p6IBxBf2y
+mDIvM9woAiAFX4oFcMwV1NN5wVaas6qePx2naEi9CpV2U745X5sCxw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der
index 1fa17d6a38d1ec..aeb2c4da0e1115 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem
index a37f2a606c7eef..6fe0ecaa36cabe 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIF7GtIsAT/X0XZYFPgZ2jiXf1gDuRP0X24S4sApmHRBZoAoGCCqGSM49
-AwEHoUQDQgAEO31ZGbvFknz3SI9LygGZdK3XX3zBNlFmN8zOUa9vqE9VbEZjRblZ
-VYn66+7pjSfXWhiDUWDUGDeLqETD/1a2og==
+MHcCAQEEIMkU6/b2gaoDxKLduzKLw+cAj/E8gQiuPJrmgwc5pWiGoAoGCCqGSM49
+AwEHoUQDQgAECr9A/lywMrwbIMxn8E+rTv3iTkjMN9qfLkHVlMiu7CNdBLZK5TzG
+xKDjs3kN0EvK8TnSPFJGR82bkmOtn9lOeg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json
index d43ca518e0c929..f718edc1177b10 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certificate_id field doesn't contain a globally unique serial number allocated by the CSA for this CD.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202087a544040349b00cf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000411d21f51aafae5d578a9be1ca3750706e14a9a0e15021c555ac6bdf0ec442fc1bbec8c7a59c717cd19309597313983544d3519cb1a62cde1f1556e3e977f24aba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145b1f5f73510c53d1f8787ddc4f02f34f0a353a98301f0603551d23041830168014820715b1b9e5b58ea9dc42b0d43577473f1f4aca300a06082a8648ce3d04030203480030450221009fa279aea34d0e6c5fed32cf23c1176023c99f0da7f19165a42ed6b221b5519e02206bbb3b292cecdc6c0d49d2883e4035fbe56cad06e26e71f33665510b50e2890f",
-    "pai_cert": "308201d43082017aa00302010202085663fd1c9559b5e8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043b7d5919bbc5927cf7488f4bca019974add75f7cc136516637ccce51af6fa84f556c466345b9595589faebeee98d27d75a18835160d418378ba844c3ff56b6a2a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414820715b1b9e5b58ea9dc42b0d43577473f1f4aca301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210086b313c78ce16f8bda67d7c361348e148fa99e730b0b8810cdfca4e916107e4d02202532cef646f866ff3c5b48403c89bf700dec6d670b3d97626dfd59d9ab6a90d5",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c0413494e5632303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022017fd411eb2fa77c2979aa8042ab218ddd72cd4313f5c9e5df2d0f3904060736f02205de116d2bccd7d013fde28f289289490b39e9f54c0263f3824358c67c683453c",
-    "dac_private_key": "f60057ba92cc56dd563e9c5f6b616cbc5f12e4cec9fc039749209fe501d0bbbb",
-    "dac_public_key": "0411d21f51aafae5d578a9be1ca3750706e14a9a0e15021c555ac6bdf0ec442fc1bbec8c7a59c717cd19309597313983544d3519cb1a62cde1f1556e3e977f24ab"
+    "dac_cert": "308201e43082018aa00302010202086781e6683a5ec94f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004021054e120ce46c5b786e3daa584c445ed1b2ea7eedd3fb7ea2c1500503942b7fa76939fa4e7360c4e3b841dbd2b117af3ced4d626a01c2f37625dba7549240ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041450b4faf1c696c2dae015de3bc2bf1802e5a1dadf301f0603551d230418301680146f1fd1d66033c30fabafe5368d9a1a0aa92cdaa2300a06082a8648ce3d04030203480030450220600af0f27aa45782135ba402ca48b298989d2dc9df186bb3b646c9835c7da167022100f0ac34bc9288e0ddfb704d260954aa8534a6af55a353f1775c1d1dcc0a9c327c",
+    "pai_cert": "308201d43082017aa00302010202087d18eaa970904f82300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040abf40fe5cb032bc1b20cc67f04fab4efde24e48cc37da9f2e41d594c8aeec235d04b64ae53cc6c4a0e3b3790dd04bcaf139d23c524647cd9b9263ad9fd94e7aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146f1fd1d66033c30fabafe5368d9a1a0aa92cdaa2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100dfa4111516bb23509070e55aa2c690f35905de69e8807105fdb298322f33dc280220055f8a0570cc15d4d379c1569ab3aa9e3f1da76848bd0a957653be395f9b02c7",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c0413494e5632303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201a65b8b75d451a236f57f0b9e72d1ff31912753052c6a74efb3148b7a04d9c83022100ab03902b380b47152e9afc60797f5c00da02c4184b44b3cb1bdefcaeb143c48d",
+    "dac_private_key": "296817e5d5eb1879897a613024a8483a8863b5a399dc0b534bafba2cdad1fd46",
+    "dac_public_key": "04021054e120ce46c5b786e3daa584c445ed1b2ea7eedd3fb7ea2c1500503942b7fa76939fa4e7360c4e3b841dbd2b117af3ced4d626a01c2f37625dba7549240b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der
index 518b97bb99a143..d2a30326b0ca00 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der
index 43e17965fea34b..0e5c28396d76af 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem
index 556b27c7b7f4de..725e5075e1ab88 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIMl0q2jMcrCMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIICMn7tKjYE+gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-jAT8rEL/l6aVezTNe6Qq1PWx0St6h7cBIegym+vYySz+YPm+lGvRkNKS1ojXvCae
-6WL7cCOoe8PPebSCOuD+qKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGfrwOcJQRfwmz8nRCFIVGX9KtFcMB8GA1UdIwQYMBaAFMMH
-7FtCNNh6y1qMi5b6in+0HasvMAoGCCqGSM49BAMCA0cAMEQCIFqYUze8vAlF15t9
-r/wSauMNtIviEGUgqF6c9Bet47SVAiARz0N5rIHQbXumoeMTO8XKNCvSl5ATEjU2
-oB+gI58SyQ==
+l3/1azs3ab+miXmCqYbAJ9UIZ7TGFeu86FXfvoA3Wc4RcHpagKuvcEW9lNoUjWbT
+qqVhFadlI4PVYQPoeRj5OqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKTY5AHlpCyq/lAdB8PejdoJitreMB8GA1UdIwQYMBaAFP/i
+DQIJ+kbfR1SNzvgScCFHrKU5MAoGCCqGSM49BAMCA0cAMEQCIAvZufoG8Mqy+Pjt
+1BnKJM7+sNS/FrkE2RoCjlz6TxJYAiAQj1EMC/fojXgJg8DIWDFs1onUgOOTbOiV
+mD2NxkGOcA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der
index 58701706251589..341e6a65f27778 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem
index e9e077eb5f14cc..2f3a71da77c7b9 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOog12VT5oTXDSObHUdQl5Rspoi+GggndqoqRapyORpaoAoGCCqGSM49
-AwEHoUQDQgAEjAT8rEL/l6aVezTNe6Qq1PWx0St6h7cBIegym+vYySz+YPm+lGvR
-kNKS1ojXvCae6WL7cCOoe8PPebSCOuD+qA==
+MHcCAQEEIJzLho7kwA5+8J3uV4gTtgUsJcUKUWGz9cx5btUc0L37oAoGCCqGSM49
+AwEHoUQDQgAEl3/1azs3ab+miXmCqYbAJ9UIZ7TGFeu86FXfvoA3Wc4RcHpagKuv
+cEW9lNoUjWbTqqVhFadlI4PVYQPoeRj5Og==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der
index 835a6d934a713d..ebd7403d278aa6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem
index c9bba4d287164c..0b5a9a6fdd6849 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIQdzlu1cJeWUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIL69Jy/an4rQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT0WZmBSOZ1DxUUTq6ctCYf02kyJlQh
-FxS9yilARBpUFgT1hyOCHdQ2j2BS6cxhME0Ekn7orWTS+JaPiJgjPqldo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUwwfs
-W0I02HrLWoyLlvqKf7Qdqy8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgY5ckfakzrj/CrPOzMqmZ1bTEvL+5anrK80Xi
-CvL3vJsCIQCCb9C5cghdmUXc0E5MguMalH70cluSQpslw/sD1I7B6g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASsByeiDawMAgmgKer11mSqwBwJh+h7
+afRtK2xtNCQ2LP9FLQeu8TN+M/C/B9WWMuB6gp0cPyZmIMAUVFRhS0UZo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU/+IN
+Agn6Rt9HVI3O+BJwIUespTkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKDKZRWg6qkzz+brGUo6kLEfOXMlyJ7Xcju5
+OdZsOpE5AiEAzRmkLIU6NNxEpzkXkiPGglMmnJVKhK2kpXREl1eLKH4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der
index 6335ad071a79d1..cbc73d6705ed03 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem
index e1930a6e8efe2a..a8821766d31473 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB0B3BOZDI/qoKQvssp+TkzMbyIVwXEc+BCHidMl82YuoAoGCCqGSM49
-AwEHoUQDQgAE9FmZgUjmdQ8VFE6unLQmH9NpMiZUIRcUvcopQEQaVBYE9Ycjgh3U
-No9gUunMYTBNBJJ+6K1k0viWj4iYIz6pXQ==
+MHcCAQEEID6S4QMHk3yNPEX1hDhWNHY9DQhLVxabYHkLMb5ByOcgoAoGCCqGSM49
+AwEHoUQDQgAErAcnog2sDAIJoCnq9dZkqsAcCYfoe2n0bStsbTQkNiz/RS0HrvEz
+fjPwvwfVljLgeoKdHD8mZiDAFFRUYUtFGQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json
index e1d987efc62311..040eda54d7c636 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certificate_id field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa0030201020208325d2ada331cac23300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048c04fcac42ff97a6957b34cd7ba42ad4f5b1d12b7a87b70121e8329bebd8c92cfe60f9be946bd190d292d688d7bc269ee962fb7023a87bc3cf79b4823ae0fea8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041467ebc0e7094117f09b3f274421485465fd2ad15c301f0603551d23041830168014c307ec5b4234d87acb5a8c8b96fa8a7fb41dab2f300a06082a8648ce3d040302034700304402205a985337bcbc0945d79b7daffc126ae30db48be2106520a85e9cf417ade3b495022011cf4379ac81d06d7ba6a1e3133bc5ca342bd2979013123536a01fa0239f12c9",
-    "pai_cert": "308201d43082017aa003020102020841dce5bb57097965300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f459998148e6750f15144eae9cb4261fd369322654211714bdca2940441a541604f58723821dd4368f6052e9cc61304d04927ee8ad64d2f8968f8898233ea95da366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c307ec5b4234d87acb5a8c8b96fa8a7fb41dab2f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206397247da933ae3fc2acf3b332a999d5b4c4bcbfb96a7acaf345e20af2f7bc9b022100826fd0b972085d9945dcd04e4c82e31a947ef4725b92429b25c3fb03d48ec1ea",
-    "certification_declaration": "3081ed06092a864886f70d010702a081df3081dc020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152000012501f1ff3602050080182503341224050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210087eb4707e94d0b3032b8ea1a20b63953968d25e28129a8a135d66386b14b53e80221008d841413fd65f1a5119c5c4616316cfae7c8cda576a28fd7fabe93b23fb168ac",
-    "dac_private_key": "ea20d76553e684d70d239b1d475097946ca688be1a082776aa2a45aa72391a5a",
-    "dac_public_key": "048c04fcac42ff97a6957b34cd7ba42ad4f5b1d12b7a87b70121e8329bebd8c92cfe60f9be946bd190d292d688d7bc269ee962fb7023a87bc3cf79b4823ae0fea8"
+    "dac_cert": "308201e33082018aa003020102020808c9fbb4a8d813e8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004977ff56b3b3769bfa6897982a986c027d50867b4c615ebbce855dfbe803759ce11707a5a80abaf7045bd94da148d66d3aaa56115a7652383d56103e87918f93aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a4d8e401e5a42caafe501d07c3de8dda098adade301f0603551d23041830168014ffe20d0209fa46df47548dcef812702147aca539300a06082a8648ce3d040302034700304402200bd9b9fa06f0cab2f8f8edd419ca24cefeb0d4bf16b904d91a028e5cfa4f12580220108f510c0bf7e88d780983c0c858316cd689d480e3936ce895983d8dc6418e70",
+    "pai_cert": "308201d53082017aa00302010202082faf49cbf6a7e2b4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ac0727a20dac0c0209a029eaf5d664aac01c0987e87b69f46d2b6c6d3424362cff452d07aef1337e33f0bf07d59632e07a829d1c3f266620c0145454614b4519a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ffe20d0209fa46df47548dcef812702147aca539301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a0ca6515a0eaa933cfe6eb194a3a90b11f397325c89ed7723bb939d66c3a9139022100cd19a42c853a34dc44a739179223c68253269c954a84ada4a5744497578b287e",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152000012501f1ff3602050080182503341224050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022019ca0856a34f33902e880d26b28b234eb866a7fca5c56d500fa0b50822235f8d022100b58b48d72a5c7570864b6774764ec2d5f2183302a1cf72c623fbed3ed6f06dcd",
+    "dac_private_key": "9ccb868ee4c00e7ef09dee578813b6052c25c50a5161b3f5cc796ed51cd0bdfb",
+    "dac_public_key": "04977ff56b3b3769bfa6897982a986c027d50867b4c615ebbce855dfbe803759ce11707a5a80abaf7045bd94da148d66d3aaa56115a7652383d56103e87918f93a"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der
index b29379e4d79165..69438cbfa06fc6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der
index f50c9209d436a2..66fe4cba8f25f1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem
index c316ac723db2c9..05fb399087efb6 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIcGVd0lPSaCAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIdMFTkU3cd40wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-jQBrxvGLuCXfb6Q0TXVC8xhrk7oie+okKVipM7kyRtS8OdqSUVRDfOaLHETa6qwR
-ElM5cDyvpQ7NZXl09qOVPqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFlcHAE/e+EqLugeGMZ0NG/JVztxMB8GA1UdIwQYMBaAFIb7
-vJw1HBdp94XIROL0Qig8If2aMAoGCCqGSM49BAMCA0cAMEQCIAdiavS3RyqV1Cyd
-nGbo9GONuZtECmnAbgEYN7T9PUGiAiAqlJ6e9Y/XgS7+xdxda6zV5lFuTav5Qydn
-j4XRfp2QLw==
+Qxkf0c2eprbM1bZkSD1okhhSr7Jrd+lFS5qvzxy72G+ph3sRwXMjGIsIS+S3GviG
+YBvHmaVgIziMMQACHhL5kqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNNyjOO9nQLddsT30V2au0GzxhhxMB8GA1UdIwQYMBaAFEHJ
+pPr668toRRTDjmU9OEhizfpdMAoGCCqGSM49BAMCA0kAMEYCIQCLzfbkUfMKPjeN
+rrUNkq6pmSDDV+husvKQiIGvw7TMngIhAKzDZZ/3ipx934+0nfOF3hR/9cySrNVw
+NKbhPP2o+/s8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der
index 31c961e441fd50..df6205d96b0882 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem
index fd83bfb7e7a0ef..99c35159770b74 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIE2nxS0uSqSCLqzUixT5zkFFJeE47scGDJryLtqf9K87oAoGCCqGSM49
-AwEHoUQDQgAEjQBrxvGLuCXfb6Q0TXVC8xhrk7oie+okKVipM7kyRtS8OdqSUVRD
-fOaLHETa6qwRElM5cDyvpQ7NZXl09qOVPg==
+MHcCAQEEIOCqQXk0IURvJqiwjZE7rWMuMqfquPCyXPk+I2xQx73joAoGCCqGSM49
+AwEHoUQDQgAEQxkf0c2eprbM1bZkSD1okhhSr7Jrd+lFS5qvzxy72G+ph3sRwXMj
+GIsIS+S3GviGYBvHmaVgIziMMQACHhL5kg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der
index 364790d931e240..4bf83d1a6d985d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem
index e6ea29ec991018..945bf9a05b5be8 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIBP0lej+YSSowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIZI0sZe6Cv0YwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASuu+BXXgG03u/GGyaxxlYC61UsSY2P
-SixXg/7r9ANgay+1mmtZiwhqVyPu1jRJ+VBCKJJBiCbUqfoE0w8y4UZIo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUhvu8
-nDUcF2n3hchE4vRCKDwh/ZowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgHDMxx0uVbkU1IrV3dWAkTpa+wddU/HlxYl9X
-O0k8Gu0CIBIf1Wwd4liq8oAOA2bFuJZNJ50lR9xVOWN4zYR/XnvM
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQc7GJZjrX8i+qndSyWY3xqsiuMMUky
+AzXa0NepBg9uHAEMU7/QfzM+5jNcQkAQNcbYxh8eC3dXv8yGBE0qmsRno2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQcmk
++vrry2hFFMOOZT04SGLN+l0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgZm5e9JSlm18FWbXSXwho3i2ye1E/rXTeos42
+wksgmzMCIQDTMPnrHnJZYAhik2LpfabLS3sFT0n2EJLLgt6IQVeLvA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der
index 22531d57289087..68abb6165b6087 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem
index 76c237a3813b4b..6e7575f424af4b 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHKJyysY7Cujm9B1qXoFsGCHHe95zEmgmZElOh7X998BoAoGCCqGSM49
-AwEHoUQDQgAErrvgV14BtN7vxhsmscZWAutVLEmNj0osV4P+6/QDYGsvtZprWYsI
-alcj7tY0SflQQiiSQYgm1Kn6BNMPMuFGSA==
+MHcCAQEEIEvPrIQYFWEJ9EuUmi7T93iLGPBngLMjmEvL2IWRD0DPoAoGCCqGSM49
+AwEHoUQDQgAEHOxiWY61/Ivqp3UslmN8arIrjDFJMgM12tDXqQYPbhwBDFO/0H8z
+PuYzXEJAEDXG2MYfHgt3V7/MhgRNKprEZw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json
index 17e9726ae1671c..b35bbbe55e3092 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certification_type field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa003020102020870655dd253d26820300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048d006bc6f18bb825df6fa4344d7542f3186b93ba227bea242958a933b93246d4bc39da925154437ce68b1c44daeaac11125339703cafa50ecd657974f6a3953ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414595c1c013f7be12a2ee81e18c674346fc9573b71301f0603551d2304183016801486fbbc9c351c1769f785c844e2f442283c21fd9a300a06082a8648ce3d0403020347003044022007626af4b7472a95d42c9d9c66e8f4638db99b440a69c06e011837b4fd3d41a202202a949e9ef58fd7812efec5dc5d6bacd5e6516e4dabf94327678f85d17e9d902f",
-    "pai_cert": "308201d33082017aa003020102020804fd257a3f98492a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004aebbe0575e01b4deefc61b26b1c65602eb552c498d8f4a2c5783feebf403606b2fb59a6b598b086a5723eed63449f950422892418826d4a9fa04d30f32e14648a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041486fbbc9c351c1769f785c844e2f442283c21fd9a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201c3331c74b956e453522b5777560244e96bec1d754fc7971625f573b493c1aed0220121fd56c1de258aaf2800e0366c5b8964d279d2547dc55396378cd847f5e7bcc",
-    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009d5c0ccefc62c914828ee6bf1bf248b2a0e951e03948d94f1dcaf4a8fe037831022036a2f396bd672041aaf63225c9e555a0dde172a855d66f835a6136ecf2a8f2fc",
-    "dac_private_key": "4da7c52d2e4aa4822eacd48b14f9ce414525e138eec7060c9af22eda9ff4af3b",
-    "dac_public_key": "048d006bc6f18bb825df6fa4344d7542f3186b93ba227bea242958a933b93246d4bc39da925154437ce68b1c44daeaac11125339703cafa50ecd657974f6a3953e"
+    "dac_cert": "308201e53082018aa003020102020874c153914ddc778d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000443191fd1cd9ea6b6ccd5b664483d68921852afb26b77e9454b9aafcf1cbbd86fa9877b11c17323188b084be4b71af886601bc799a56023388c3100021e12f992a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d3728ce3bd9d02dd76c4f7d15d9abb41b3c61871301f0603551d2304183016801441c9a4fafaebcb684514c38e653d384862cdfa5d300a06082a8648ce3d04030203490030460221008bcdf6e451f30a3e378daeb50d92aea99920c357e86eb2f2908881afc3b4cc9e022100acc3659ff78a9c7ddf8fb49df385de147ff5cc92acd57034a6e13cfda8fbfb3c",
+    "pai_cert": "308201d43082017aa0030201020208648d2c65ee82bf46300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041cec62598eb5fc8beaa7752c96637c6ab22b8c3149320335dad0d7a9060f6e1c010c53bfd07f333ee6335c42401035c6d8c61f1e0b7757bfcc86044d2a9ac467a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041441c9a4fafaebcb684514c38e653d384862cdfa5d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220666e5ef494a59b5f0559b5d25f0868de2db27b513fad74dea2ce36c24b209b33022100d330f9eb1e72596008629362e97da6cb4b7b054f49f61092cb82de8841578bbc",
+    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220026b2621f8587114476b1274bb00d4b7008b7f5c0357ae757742734300533d3c02203f242d6ba80a89211ff18b3a0787f8ce3bdc58b26dc99d3d565ccdb01446c3de",
+    "dac_private_key": "e0aa41793421446f26a8b08d913bad632e32a7eab8f0b25cf93e236c50c7bde3",
+    "dac_public_key": "0443191fd1cd9ea6b6ccd5b664483d68921852afb26b77e9454b9aafcf1cbbd86fa9877b11c17323188b084be4b71af886601bc799a56023388c3100021e12f992"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der
index add3eda3f06d8f..8e4c350d46c83a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der
index 91f7c0f3e341f3..5ac03972b2c71f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem
index f93891f6949b7f..7875f93839a748 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIO3CHv0Rc1PgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIC9d0jKyav0gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-R+HhzbcgEV45yI4QHVQta4adeoWXzwRbI2KUQQs8UHbOuE4MD8sHIBjkLWVvHIpf
-CKUYjydBgExoMg3ko8bQW6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFAnu/HiD1V8WRlV7r/b1G39NUts2MB8GA1UdIwQYMBaAFNf4
-hvhvywuARlGVwm0zVVgtmgiqMAoGCCqGSM49BAMCA0cAMEQCICVQSS+oH+TR0wmO
-0dL6o5xxmRVEy6thkrfYIYjyWvagAiAjTrdRqRR1ybDLPfPt/TPiIbT8zxcLc7aK
-j9ISxCTaYg==
+wj/V33C0LTTDruuEEElQ5h/bCA4do4aIxYiI54ilu+mm3OTAze/R3ySgXjDuhlW/
+vi1k1A9E2+D+x6LL5OZ8fqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFCY3QYBeLelCRA79dJFAaiKnoLFiMB8GA1UdIwQYMBaAFPQI
+cXl6OcxZ+4PaIpOxgKTwKMeQMAoGCCqGSM49BAMCA0gAMEUCIQDsA+nqWq6vX+ke
+J69DtBr7tyu/V6MQ9fCQKQ0uke5g0gIgLSpLdMUP1GMYc12wDTO77XF62fg2T3Bz
+KnCNYysYgnk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der
index a094c89a416f60..7f1c1124cbf6c8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem
index 4212bcd5338f16..e49cde88106660 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAc0YflpU43791Tsdz285OYQtamLpxx7SShQesVPxyUjoAoGCCqGSM49
-AwEHoUQDQgAER+HhzbcgEV45yI4QHVQta4adeoWXzwRbI2KUQQs8UHbOuE4MD8sH
-IBjkLWVvHIpfCKUYjydBgExoMg3ko8bQWw==
+MHcCAQEEIP2HDXIzm+FatCYZCiMsNRUXBdvHukPK/7fJoX2FlUb1oAoGCCqGSM49
+AwEHoUQDQgAEwj/V33C0LTTDruuEEElQ5h/bCA4do4aIxYiI54ilu+mm3OTAze/R
+3ySgXjDuhlW/vi1k1A9E2+D+x6LL5OZ8fg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der
index 8a47de1517aaa7..46243cc01ea273 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem
index d50228b1a4655c..33cdf7b9c9f584 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIKk9PSO9fSKswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIISVRM2vIIKX0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATRhc+mw9SD7L/g9qvOaI0ulS0QjGoU
-dbygHSdsbjMSA2cRK01F3AaFpPAQY9qonlcEwvKeu/xSUmWvZHoMsIl+o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1/iG
-+G/LC4BGUZXCbTNVWC2aCKowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgEujHAhbQSju1SnBH2zNqf+S20ciEVS6FbY8q
-MY7vJSsCIQDQYhcctUef8iHKI6dbHzs6qeCQ1ceaRpcCKfolj8YfTA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASEcqZ5heS/+y7bOH4snDBeLSod9lTM
+HyYdacLxDXRLu6eaOq9oP/oW13tYunx1ctuIXT8lz4Mem24WnVIN+lsto2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9Ahx
+eXo5zFn7g9oik7GApPAox5AwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJftZV+BZ1nW/0L21F3AJKfHC/CKM8ba0VUw
+S7tek0DsAiA8zrbdWJn56mlc28vwNL3pmyiuiWEBIuK2CQHQcBJl4Q==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der
index d4c1a549fda02c..c52381d59a60b0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem
index 009ea45343d00a..2a5bf11d964864 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOZPLhGTC5/sJpUG23m4l1Yo4YkkXgRZJBePvzfycct2oAoGCCqGSM49
-AwEHoUQDQgAE0YXPpsPUg+y/4ParzmiNLpUtEIxqFHW8oB0nbG4zEgNnEStNRdwG
-haTwEGPaqJ5XBMLynrv8UlJlr2R6DLCJfg==
+MHcCAQEEILKpEQtdoi9kKjgktd5ZyUQumKIm5b9kei6Kx7zc8HYioAoGCCqGSM49
+AwEHoUQDQgAEhHKmeYXkv/su2zh+LJwwXi0qHfZUzB8mHWnC8Q10S7unmjqvaD/6
+Ftd7WLp8dXLbiF0/Jc+DHptuFp1SDfpbLQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json
index 9922727ee6eaf2..ecdcb40be3f66e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certification_type field is set to invalid value.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202083b7087bf445cd4f8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000447e1e1cdb720115e39c88e101d542d6b869d7a8597cf045b236294410b3c5076ceb84e0c0fcb072018e42d656f1c8a5f08a5188f2741804c68320de4a3c6d05ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041409eefc7883d55f1646557baff6f51b7f4d52db36301f0603551d23041830168014d7f886f86fcb0b80465195c26d3355582d9a08aa300a06082a8648ce3d040302034700304402202550492fa81fe4d1d3098ed1d2faa39c71991544cbab6192b7d82188f25af6a00220234eb751a91475c9b0cb3df3edfd33e221b4fccf170b73b68a8fd212c424da62",
-    "pai_cert": "308201d43082017aa00302010202082a4f4f48ef5f48ab300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d185cfa6c3d483ecbfe0f6abce688d2e952d108c6a1475bca01d276c6e33120367112b4d45dc0685a4f01063daa89e5704c2f29ebbfc525265af647a0cb0897ea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414d7f886f86fcb0b80465195c26d3355582d9a08aa301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022012e8c70216d04a3bb54a7047db336a7fe4b6d1c884552e856d8f2a318eef252b022100d062171cb5479ff221ca23a75b1f3b3aa9e090d5c79a46970229fa258fc61f4c",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ed73b064eddf1e69529f4bd8ca1cae7b5ad1d5ee96255b979ab30fe27f02bf06022100a1bc5c3c1f2a4804f536c51acecd7703a206b7ee37793a54ad4aed914825b1ae",
-    "dac_private_key": "073461f969538dfbf754ec773dbce4e610b5a98ba71c7b4928507ac54fc72523",
-    "dac_public_key": "0447e1e1cdb720115e39c88e101d542d6b869d7a8597cf045b236294410b3c5076ceb84e0c0fcb072018e42d656f1c8a5f08a5188f2741804c68320de4a3c6d05b"
+    "dac_cert": "308201e43082018aa00302010202080bd7748cac9abf48300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c23fd5df70b42d34c3aeeb84104950e61fdb080e1da38688c58888e788a5bbe9a6dce4c0cdefd1df24a05e30ee8655bfbe2d64d40f44dbe0fec7a2cbe4e67c7ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414263741805e2de942440efd7491406a22a7a0b162301f0603551d23041830168014f40871797a39cc59fb83da2293b180a4f028c790300a06082a8648ce3d0403020348003045022100ec03e9ea5aaeaf5fe91e27af43b41afbb72bbf57a310f5f090290d2e91ee60d202202d2a4b74c50fd46318735db00d33bbed717ad9f8364f70732a708d632b188279",
+    "pai_cert": "308201d43082017aa003020102020849544cdaf208297d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048472a67985e4bffb2edb387e2c9c305e2d2a1df654cc1f261d69c2f10d744bbba79a3aaf683ffa16d77b58ba7c7572db885d3f25cf831e9b6e169d520dfa5b2da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f40871797a39cc59fb83da2293b180a4f028c790301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210097ed655f816759d6ff42f6d45dc024a7c70bf08a33c6dad155304bbb5e9340ec02203cceb6dd5899f9ea695cdbcbf034bde99b28ae89610122e2b60901d0701265e1",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ade26d9e024856a06bcc2eb905a7781d45c5fe582577b207b1db32b413b5621e022016bf78e30d5e4a1c1790f6811517c7e401a390166d00ea280d9cc7b4f2c81fed",
+    "dac_private_key": "fd870d72339be15ab426190a232c35151705dbc7ba43caffb7c9a17d859546f5",
+    "dac_public_key": "04c23fd5df70b42d34c3aeeb84104950e61fdb080e1da38688c58888e788a5bbe9a6dce4c0cdefd1df24a05e30ee8655bfbe2d64d40f44dbe0fec7a2cbe4e67c7e"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der
index ef330113161563..9b3cb55bfb1418 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der
index 7513a02224892d..ec27c17436f19d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem
index 06f6d9a2932b12..1f20aed9826a34 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIILgGHRW6c5ncwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIbm1Cyk2mUPIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-pkq74TU6MBGqU5Zi3XEPRZUMjaBxaM8L1L2ttRkBImS5XjuR/4oeU2RAOY7CzEqj
-6FdTiJ3W8Xu7lXyqvsaleaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFCgaa3hWcFwhq1tBXGca7MItc7f3MB8GA1UdIwQYMBaAFPZ5
-RIO5t2+z6ym83LIUds8pEc4AMAoGCCqGSM49BAMCA0cAMEQCID0402JhDkOkyRL0
-wM8FHbmitppvNxOC9zlBTnhpMPMOAiBomw+sFkYBwm7rSJ9kBakYTrNnBd8KMx4R
-8JOvPcc2xQ==
+qbb9dMhkxnZhqtDxoZsO1m0p5pDbXlDqafqnuyGqbRutQKGmlTjkUlYf+KrKXQBX
+ixaL6FTUs/DTfKJ/cdRvXKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNVcipGRosRkgh4YTNnb6MsalqWIMB8GA1UdIwQYMBaAFB3N
+ZBg/4tDOJY96me7jh6zZu+0kMAoGCCqGSM49BAMCA0kAMEYCIQDCdxtCChgj7qpr
+FimoEyE7cj7EvJxAZonyzv9vyB22BQIhANnhAct75rZIsWv4MqydGtXQ456JvLu0
+4rvEVMUztXGq
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der
index 7d0ee14af3c306..941071441ebf3a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem
index add167402ff720..470bc511d74534 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH0OgRWlMtVZmGuh9Eig3QyPdCiXtGB+CCXA9pwok5xooAoGCCqGSM49
-AwEHoUQDQgAEpkq74TU6MBGqU5Zi3XEPRZUMjaBxaM8L1L2ttRkBImS5XjuR/4oe
-U2RAOY7CzEqj6FdTiJ3W8Xu7lXyqvsaleQ==
+MHcCAQEEIMQATNqqXWIsKRvjcNuoVUas7wrkG693beAkceZc0aKOoAoGCCqGSM49
+AwEHoUQDQgAEqbb9dMhkxnZhqtDxoZsO1m0p5pDbXlDqafqnuyGqbRutQKGmlTjk
+UlYf+KrKXQBXixaL6FTUs/DTfKJ/cdRvXA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der
index 31ab12077be645..256060bc59fedf 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem
index d387ad4a6b1d08..221b6686b59868 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIXCw6DxrI+3IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIZSgLZhd5Yu0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQCqjVPE8k5UCLeLEowiyBBND9ymWt+
-1sDX5nhnjl0pT2bzLahid5fj5zIu7JBjZIrp+onuVtkZIjnKQXd56W/vo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9nlE
-g7m3b7PrKbzcshR2zykRzgAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJx07GAgyBpQZ/SzLQa59zMUWwSI6tb3H79r
-jHLa3VI+AiEA6a8VTUrXTOI0ywPvtjWWLNfEsAoD394VDMLXr4I1p3I=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASp65LHyfx1jeip9Bl5VLuyBPpweVAb
+mAtcW8ScBmJNzt2as8H7tslXPEtQa8UF6tk0sudvC82bDzDpKDcOjsfVo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUHc1k
+GD/i0M4lj3qZ7uOHrNm77SQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgPVSUJV1iAxS7FhgLNN1pX36ERqSfYZKE5jnv
+Svt7wpICIB2KHyX095mTSZ2JmLSac8oUnlJ9bC77FDQI19OHs+a7
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der
index a45d85137e8979..c0eb4f5869695b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem
index 815885b617c657..b32d5e1ad20e03 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM7cLW050gsxFf6D5egt6GMN+QjFr6obzzUxoi2X0CmhoAoGCCqGSM49
-AwEHoUQDQgAEAqo1TxPJOVAi3ixKMIsgQTQ/cplrftbA1+Z4Z45dKU9m8y2oYneX
-4+cyLuyQY2SK6fqJ7lbZGSI5ykF3eelv7w==
+MHcCAQEEIM0GPHOtYsjnggsG8edYpGGa3esicz4vZzswzoO3IGx1oAoGCCqGSM49
+AwEHoUQDQgAEqeuSx8n8dY3oqfQZeVS7sgT6cHlQG5gLXFvEnAZiTc7dmrPB+7bJ
+VzxLUGvFBerZNLLnbwvNmw8w6Sg3Do7H1Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json
index e3aad9e7fd8dd5..50816286f29ead 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS digest algorithm SHA1.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202082e0187456e9ce677300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a64abbe1353a3011aa539662dd710f45950c8da07168cf0bd4bdadb519012264b95e3b91ff8a1e536440398ec2cc4aa3e85753889dd6f17bbb957caabec6a579a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414281a6b7856705c21ab5b415c671aecc22d73b7f7301f0603551d23041830168014f6794483b9b76fb3eb29bcdcb21476cf2911ce00300a06082a8648ce3d040302034700304402203d38d362610e43a4c912f4c0cf051db9a2b69a6f371382f739414e786930f30e0220689b0fac164601c26eeb489f6405a9184eb36705df0a331e11f093af3dc736c5",
-    "pai_cert": "308201d53082017aa00302010202085c2c3a0f1ac8fb72300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000402aa354f13c9395022de2c4a308b2041343f72996b7ed6c0d7e678678e5d294f66f32da8627797e3e7322eec9063648ae9fa89ee56d9192239ca417779e96fefa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f6794483b9b76fb3eb29bcdcb21476cf2911ce00301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009c74ec6020c81a5067f4b32d06b9f733145b0488ead6f71fbf6b8c72dadd523e022100e9af154d4ad74ce234cb03efb635962cd7c4b00a03dfde150cc2d7af8235a772",
-    "certification_declaration": "3081fd06092a864886f70d010702a081ef3081ec0201033109300706052b0e03021a305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022023716c7ca3a0d8b6f0a052e075b220fc2b845b230806f4226d015551021afb13022038c9ee68dc4e153a53ca69974fef3b339fcd718baa28d3024501e55f4f6f3965",
-    "dac_private_key": "7d0e8115a532d559986ba1f448a0dd0c8f742897b4607e0825c0f69c28939c68",
-    "dac_public_key": "04a64abbe1353a3011aa539662dd710f45950c8da07168cf0bd4bdadb519012264b95e3b91ff8a1e536440398ec2cc4aa3e85753889dd6f17bbb957caabec6a579"
+    "dac_cert": "308201e53082018aa00302010202086e6d42ca4da650f2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a9b6fd74c864c67661aad0f1a19b0ed66d29e690db5e50ea69faa7bb21aa6d1bad40a1a69538e452561ff8aaca5d00578b168be854d4b3f0d37ca27f71d46f5ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d55c8a9191a2c464821e184cd9dbe8cb1a96a588301f0603551d230418301680141dcd64183fe2d0ce258f7a99eee387acd9bbed24300a06082a8648ce3d0403020349003046022100c2771b420a1823eeaa6b1629a813213b723ec4bc9c406689f2ceff6fc81db605022100d9e101cb7be6b648b16bf832ac9d1ad5d0e39e89bcbbb4e2bbc454c533b571aa",
+    "pai_cert": "308201d33082017aa003020102020865280b66177962ed300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a9eb92c7c9fc758de8a9f4197954bbb204fa7079501b980b5c5bc49c06624dcedd9ab3c1fbb6c9573c4b506bc505ead934b2e76f0bcd9b0f30e928370e8ec7d5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141dcd64183fe2d0ce258f7a99eee387acd9bbed24301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203d5494255d620314bb16180b34dd695f7e8446a49f619284e639ef4afb7bc29202201d8a1f25f4f79993499d8998b49a73ca149e527d6c2efb143408d7d387b3e6bb",
+    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed0201033109300706052b0e03021a305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cc6d9e30253e6de04c586eea69a587a71cd6f0936aea09fd2ef5b53e93b5278702201ed54646c500db8d7aea993fd81f729a22a86957b094db142eda2d5e68a6d00b",
+    "dac_private_key": "c4004cdaaa5d622c291be370dba85546acef0ae41baf776de02471e65cd1a28e",
+    "dac_public_key": "04a9b6fd74c864c67661aad0f1a19b0ed66d29e690db5e50ea69faa7bb21aa6d1bad40a1a69538e452561ff8aaca5d00578b168be854d4b3f0d37ca27f71d46f5c"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der
index 2570c5b433239b..475e2320453b13 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der
index 4b530235ebc3d8..a5dd30714dac30 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem
index c622261bdb379f..7f4824c302def2 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIEi/iMIBYtXQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIISKU4M8BWiB4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-yC6yDoVO/N7/IHkdYc7+A6/RwW3flNd+A5OSIkIz/E7JEaOqt2MixUM9buOeBtIq
-+wmi1+et9cRs8dLtIgHlcaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFJIWJu+gcJnUe8d+IaOBlGLKi0D7MB8GA1UdIwQYMBaAFAMk
-/5Mjpqe0rvPRF4eLS/KuBd6EMAoGCCqGSM49BAMCA0kAMEYCIQCQIi0Lt83lBfJn
-TCKCVuoUSE5CTNZEVjM51X8Iyg18HQIhAIfcd4K/Psy3wRyEno+HT3o49WZgP0Fb
-kE6bxT3PRvYe
+dqqHm6oQEjtRk02BqnDueNw9IMoeDny1PkEdvSV5MTkQ5Ben6/Zp6+VloZ8MZA2/
+gIxY4CMu0DvvE9/wJFB4/6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFI8ovkl7pVxNprHkyeqn5AJSxhlhMB8GA1UdIwQYMBaAFL1L
+VQW/LTZJKIJUOJBDW0tBkT+GMAoGCCqGSM49BAMCA0kAMEYCIQDFpPxV428batig
+pjdgk7tgNmqUXfNPRJk1aDw2G+YDMwIhAOmrmjPc3K9qe/nFAoX7KNhdK4XP5+JM
+BHamHnljyJlF
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der
index bfb142854125db..c346570bb00587 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem
index d3741aa0684a44..3573c6164f28c4 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJPS4BZKmRTZiTQaBoisjfE6PGMozB3C3x7w1c0XX/tZoAoGCCqGSM49
-AwEHoUQDQgAEyC6yDoVO/N7/IHkdYc7+A6/RwW3flNd+A5OSIkIz/E7JEaOqt2Mi
-xUM9buOeBtIq+wmi1+et9cRs8dLtIgHlcQ==
+MHcCAQEEIOK6NPP0m2OJCcYd3rFdoaZlVeAhOiOm9ZbtS5dNYWZ9oAoGCCqGSM49
+AwEHoUQDQgAEdqqHm6oQEjtRk02BqnDueNw9IMoeDny1PkEdvSV5MTkQ5Ben6/Zp
+6+VloZ8MZA2/gIxY4CMu0DvvE9/wJFB4/w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der
index d222d23cfc8c9f..3e319cf12e99f4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem
index 2a1542ffab7cf8..d12e6013c58864 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIF00YgRODnFQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIITG3VmD3G9QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARHVZCKDsa9hPiSdP+hoIIFE7mZWnTP
-SW27STmfi8qTZdh97gLQjKgi44x9qWKIVD3myOw6UOZhlNbUzthfZ8Pxo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUAyT/
-kyOmp7Su89EXh4tL8q4F3oQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgXhlFRpURnDHndgPJj5jTQor2NCEFlkhOv1F1
-Nj6LxEMCIQD3U29Qbeh30HDx4kSQJC/FYcGzOeEnV54PzDPYOZL7xw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQtwnbAQX9fhAzJNi0x9yaqJxma+m+5
++/guG2fbSSCg12AVRBSEMopDQko/XaFvGt0Ivl0qFlbTHr3c1jlPC3VYo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUvUtV
+Bb8tNkkoglQ4kENbS0GRP4YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhALe5Yy7GcrPD/K7WDgHWTPxr0u0Tn/OV36tX
+jj19+KMOAiBCqxCu1rMKYbL9/Ju7L2PsG+csiIpSfNUiQvf3htprzA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der
index b7fa65180fe74b..02a042a58c6a68 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem
index c74c21e4f07d2e..389a170b4f684f 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEeu67/ISo1LO5qCc7od2RSl9D+iPHLHzXfjwhCE08cyoAoGCCqGSM49
-AwEHoUQDQgAER1WQig7GvYT4knT/oaCCBRO5mVp0z0ltu0k5n4vKk2XYfe4C0Iyo
-IuOMfaliiFQ95sjsOlDmYZTW1M7YX2fD8Q==
+MHcCAQEEIMeqqc2505KlX/H5wA5VRj4PdggDn1oovmWACOa6s+fyoAoGCCqGSM49
+AwEHoUQDQgAELcJ2wEF/X4QMyTYtMfcmqicZmvpvufv4Lhtn20kgoNdgFUQUhDKK
+Q0JKP12hbxrdCL5dKhZW0x693NY5Twt1WA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json
index a0966bf63fac87..bac15927e1a0c0 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS digest algorithm SHA256.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa0030201020208122fe2308058b574300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c82eb20e854efcdeff20791d61cefe03afd1c16ddf94d77e039392224233fc4ec911a3aab76322c5433d6ee39e06d22afb09a2d7e7adf5c46cf1d2ed2201e571a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414921626efa07099d47bc77e21a3819462ca8b40fb301f0603551d230418301680140324ff9323a6a7b4aef3d117878b4bf2ae05de84300a06082a8648ce3d040302034900304602210090222d0bb7cde505f2674c228256ea14484e424cd644563339d57f08ca0d7c1d02210087dc7782bf3eccb7c11c849e8f874f7a38f566603f415b904e9bc53dcf46f61e",
-    "pai_cert": "308201d43082017aa0030201020208174d188113839c54300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044755908a0ec6bd84f89274ffa1a0820513b9995a74cf496dbb49399f8bca9365d87dee02d08ca822e38c7da96288543de6c8ec3a50e66194d6d4ced85f67c3f1a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604140324ff9323a6a7b4aef3d117878b4bf2ae05de84301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205e19454695119c31e77603c98f98d3428af634210596484ebf5175363e8bc443022100f7536f506de877d070f1e24490242fc561c1b339e127579e0fcc33d83992fbc7",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a5ea65630305148e481ad89839b6d8fd4471fa4535e5bb8624187e1e7367e6d7022064925c0cbdb5afc7cf9a6d527ba01ec58a999919c3a8442b7841cab1c62120f0",
-    "dac_private_key": "93d2e0164a9914d989341a0688ac8df13a3c6328cc1dc2df1ef0d5cd175ffb59",
-    "dac_public_key": "04c82eb20e854efcdeff20791d61cefe03afd1c16ddf94d77e039392224233fc4ec911a3aab76322c5433d6ee39e06d22afb09a2d7e7adf5c46cf1d2ed2201e571"
+    "dac_cert": "308201e53082018aa003020102020848a53833c056881e300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000476aa879baa10123b51934d81aa70ee78dc3d20ca1e0e7cb53e411dbd2579313910e417a7ebf669ebe565a19f0c640dbf808c58e0232ed03bef13dff0245078ffa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148f28be497ba55c4da6b1e4c9eaa7e40252c61961301f0603551d23041830168014bd4b5505bf2d36492882543890435b4b41913f86300a06082a8648ce3d0403020349003046022100c5a4fc55e36f1b6ad8a0a6376093bb60366a945df34f449935683c361be60333022100e9ab9a33dcdcaf6a7bf9c50285fb28d85d2b85cfe7e24c0476a61e7963c89945",
+    "pai_cert": "308201d43082017aa00302010202082131b75660f71bd4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042dc276c0417f5f840cc9362d31f726aa27199afa6fb9fbf82e1b67db4920a0d76015441484328a43424a3f5da16f1add08be5d2a1656d31ebddcd6394f0b7558a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bd4b5505bf2d36492882543890435b4b41913f86301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b7b9632ec672b3c3fcaed60e01d64cfc6bd2ed139ff395dfab578e3d7df8a30e022042ab10aed6b30a61b2fdfc9bbb2f63ec1be72c888a527cd52242f7f786da6bcc",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d934e704af35d291bce12c7354a62be19849735e8efec88d59bb28fe5f657df5022100bbacda2cbeda18eb656e404d3a970978506024449ea8cd68fb8f769d67ad73de",
+    "dac_private_key": "e2ba34f3f49b638909c61ddeb15da1a66555e0213a23a6f596ed4b974d61667d",
+    "dac_public_key": "0476aa879baa10123b51934d81aa70ee78dc3d20ca1e0e7cb53e411dbd2579313910e417a7ebf669ebe565a19f0c640dbf808c58e0232ed03bef13dff0245078ff"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der
index e0b70e1e245260..dffc045be1177f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der
index 1d68a4106932c5..31d1e0e77f0b4f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem
index 99127a1c2c6d9a..32d323d8d0404c 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIICHwd/zKjS1kwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIaazjpdp9GlUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-GpThL/7QNxWPh7cGoWAU6ibBNBpOnTbKRcTeOnuaW+r3L8ro6BeRq6d7IQb7FYkL
-oXvItHLmASDSDnEOXUW8UaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFC5BHVhOM7cwUcmNUhugB4Bi3fXHMB8GA1UdIwQYMBaAFCO1
-YTp13J75z35Xzy25ocYtKDclMAoGCCqGSM49BAMCA0gAMEUCIDKkESKy1ZnCKkZw
-4vJeZvbV5u5eRySgQVpMZmwJbSitAiEAlTBSBSodgP/OoAupJyvbwn6UcIMKgeh6
-J1GtQEYSOSY=
+uRQnH/yQQzVCF2wpAIpRUFfLHGEidUWYpU/MWIbjSjwQnqz7Q0PgibBTPs8H5S5/
+cSP1bp9iCTqA/fz+CuCrvKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFrbZzlwxWTb+4ABPlRwbFFPaoT7MB8GA1UdIwQYMBaAFIr1
+oy+jsBNYxUGNwpcjMM+ZuWSLMAoGCCqGSM49BAMCA0gAMEUCIHhM7WPf4MY+7/Nc
+/wXWCZxZ+5Gqicqs6SNU5JFl9zkqAiEAybT4Leql+aKVKZLmCOqmXFLhiCmPF4qf
+Y2lF/NrjbqU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der
index 4c5734b4a3a3c6..3236797a5bfd30 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem
index 71cb096cb871ca..7c69c6b0a55ff5 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAlPFon7NwOFiKWzBkDcsxblgc8h/iEVCMB8H5DsfrZsoAoGCCqGSM49
-AwEHoUQDQgAEGpThL/7QNxWPh7cGoWAU6ibBNBpOnTbKRcTeOnuaW+r3L8ro6BeR
-q6d7IQb7FYkLoXvItHLmASDSDnEOXUW8UQ==
+MHcCAQEEIIL+r+uRByApNudYfV1lzHa9/0P77f2VYXlEg1YFcZYPoAoGCCqGSM49
+AwEHoUQDQgAEuRQnH/yQQzVCF2wpAIpRUFfLHGEidUWYpU/MWIbjSjwQnqz7Q0Pg
+ibBTPs8H5S5/cSP1bp9iCTqA/fz+CuCrvA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der
index 346aee6c3e0040..50d44ba7697988 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem
index d8a06119051e00..975c9e8d4de97f 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIYl01dUM84EQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIUk5HAkGBwVswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS5sBhFJPDCRnnxMZVtVhfmwmFAjGEX
-Kg4/JuayI1X7jOh+Dtbyw2injqRvaZ+khyQj1J1zYGPHaruvT1tGlpToo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUI7Vh
-OnXcnvnPflfPLbmhxi0oNyUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAIR5RcsMEsNK5GzQDOW2KMbv74PSrSlhAwdC
-PxUAs/xRAiBwaWyncOzoQRv0sN5DUMYR/vzwqlKb5kMRJDNfoWlOSw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCx+PkqubkGCox/frM8m0VSQZfnGp
+TWS+NxnKbySmRNaf5rlspqETBgLRGaTvBfe0ufKvolS+vZCcSk4UqSMYo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUivWj
+L6OwE1jFQY3ClyMwz5m5ZIswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhANa76pQpBvjOjUMZxs/IzrMoZ7jUrXf2SzLW
+t1QMdl79AiEAyvn5GkwlbUP/qt+YHvY+DGx8LmUgErlZ228kyKBRyW4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der
index 3987a190fb32e0..c1eb28fad71d70 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem
index b3ce709ab57ce7..411d7bdc9c45b7 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO6EaL3vV2y8wA9Ad3xPsRa6TcbQPVrj0TqgDmR8mFoMoAoGCCqGSM49
-AwEHoUQDQgAEubAYRSTwwkZ58TGVbVYX5sJhQIxhFyoOPybmsiNV+4zofg7W8sNo
-p46kb2mfpIckI9Sdc2Bjx2q7r09bRpaU6A==
+MHcCAQEEIMVws14K7CCWVihcGsakKSLK05AKZ9WER1LNRkBSU4OUoAoGCCqGSM49
+AwEHoUQDQgAE2wsfj5Krm5BgqMf36zPJtFUkGX5xqU1kvjcZym8kpkTWn+a5bKah
+EwYC0Rmk7wX3tLnyr6JUvr2QnEpOFKkjGA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json
index 7eac89a1a15e15..46ec5639c57fcc 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS eContentType is set to Microsoft Authenticode [MSAC] OID = { 1.3.6.1.4.1.311.2.1.4 }.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208087c1dff32a34b59300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041a94e12ffed037158f87b706a16014ea26c1341a4e9d36ca45c4de3a7b9a5beaf72fcae8e81791aba77b2106fb15890ba17bc8b472e60120d20e710e5d45bc51a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142e411d584e33b73051c98d521ba0078062ddf5c7301f0603551d2304183016801423b5613a75dc9ef9cf7e57cf2db9a1c62d283725300a06082a8648ce3d0403020348003045022032a41122b2d599c22a4670e2f25e66f6d5e6ee5e4724a0415a4c666c096d28ad022100953052052a1d80ffcea00ba9272bdbc27e9470830a81e87a2751ad4046123926",
-    "pai_cert": "308201d43082017aa0030201020208625d3575433ce044300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b9b0184524f0c24679f131956d5617e6c261408c61172a0e3f26e6b22355fb8ce87e0ed6f2c368a78ea46f699fa4872423d49d736063c76abbaf4f5b469694e8a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041423b5613a75dc9ef9cf7e57cf2db9a1c62d283725301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100847945cb0c12c34ae46cd00ce5b628c6efef83d2ad29610307423f1500b3fc51022070696ca770ece8411bf4b0de4350c611fefcf0aa529be6431124335fa1694e4b",
-    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b06096086480165030402013061060c060a2b060104018237020104a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201421395e60a0ea620f02ae238cd5b9841c4dd2684c60091e28abfa02b02b3f250221009b501736577bbaf4a9fe4a9fdaad01ead1c5e2625d36c8b1ed552b56d8d1b468",
-    "dac_private_key": "094f1689fb37038588a5b30640dcb316e581cf21fe211508c07c1f90ec7eb66c",
-    "dac_public_key": "041a94e12ffed037158f87b706a16014ea26c1341a4e9d36ca45c4de3a7b9a5beaf72fcae8e81791aba77b2106fb15890ba17bc8b472e60120d20e710e5d45bc51"
+    "dac_cert": "308201e43082018aa003020102020869ace3a5da7d1a55300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b914271ffc90433542176c29008a515057cb1c6122754598a54fcc5886e34a3c109eacfb4343e089b0533ecf07e52e7f7123f56e9f62093a80fdfcfe0ae0abbca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145adb673970c564dbfb80013e54706c514f6a84fb301f0603551d230418301680148af5a32fa3b01358c5418dc2972330cf99b9648b300a06082a8648ce3d04030203480030450220784ced63dfe0c63eeff35cff05d6099c59fb91aa89caace92354e49165f7392a022100c9b4f82deaa5f9a2952992e608eaa65c52e188298f178a9f636945fcdae36ea5",
+    "pai_cert": "308201d53082017aa0030201020208524e47024181c15b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004db0b1f8f92ab9b9060a8c7f7eb33c9b45524197e71a94d64be3719ca6f24a644d69fe6b96ca6a1130602d119a4ef05f7b4b9f2afa254bebd909c4a4e14a92318a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148af5a32fa3b01358c5418dc2972330cf99b9648b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d6bbea942906f8ce8d4319c6cfc8ceb32867b8d4ad77f64b32d6b7540c765efd022100caf9f91a4c256d43ffaadf981ef63e0c6c7c2e652012b959db6f24c8a051c96e",
+    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b06096086480165030402013061060c060a2b060104018237020104a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022060f76293c68c5ba66807336606c0952eb9d822a719ff4d141fb8e4b0c1229576022100ca79502edac5331d966e42eb23d2916d9d79482de9d32858c4bb3468ae90f77c",
+    "dac_private_key": "82feafeb9107202936e7587d5d65cc76bdff43fbedfd9561794483560571960f",
+    "dac_public_key": "04b914271ffc90433542176c29008a515057cb1c6122754598a54fcc5886e34a3c109eacfb4343e089b0533ecf07e52e7f7123f56e9f62093a80fdfcfe0ae0abbc"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der
index fc45cd70e72011..e4febc48721b5e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der
index 3f22bff4a0f49c..17a2c412a79827 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem
index f2a902c9d03b42..cdc6a08ab94256 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIPdMLkeVstGYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIII8f2dsMKtOQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-16gc704lreu/RKUduFNo6NzJAmgee/PYr9He+4wI4egpNTt+Jg+IdRpV+ih7F6UG
-zZKT2D7JWvj+t5naTVJnAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFIgpPFPjTY17JQojQFh7QOZNxp82MB8GA1UdIwQYMBaAFDeF
-i+5KOyiAIoinLoIBETWbpv51MAoGCCqGSM49BAMCA0cAMEQCIFVfibQknxyHYYNj
-jCmkp3As53v7/A6T12Oj+lqgyv4BAiB6P+88ldBxAnGVNkbC5/xMFM/OpU/+LPhk
-wnoUMDUZew==
+IIhcUMf6Uiyb7dMFrWrpL20yfnrVOQ6qQ+JoE3Ywp3dvSR4HB/e8jpcIrrq6WPSQ
+6w8FnZQgTF8/BYN1tJhyu6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFHXlAz5nm1QOc7VTjKJPhh9RzllXMB8GA1UdIwQYMBaAFNFs
+uoOFh/8nd1XG1P6SQNyPci7kMAoGCCqGSM49BAMCA0gAMEUCIBnqSp0QMzsorz+3
+mTAJqqhEKdUQ3yciI9aeVI6i3Q5SAiEAs6gImdOLNL+9pP30jMJA0WbZUHmvrO6U
+uyA2WTdwwmo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der
index f623c42a1b0f76..cebe3b5580e651 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem
index 0f35e72ba49602..032e1067ffb3ec 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIF+gpplUh1GvzEkgpeszSvIxLypMHGI8rvwVHEG0J4AyoAoGCCqGSM49
-AwEHoUQDQgAE16gc704lreu/RKUduFNo6NzJAmgee/PYr9He+4wI4egpNTt+Jg+I
-dRpV+ih7F6UGzZKT2D7JWvj+t5naTVJnAQ==
+MHcCAQEEIOQQdgxUj4Gak8WZXTlPUQPorgIybsKoW5G9pz1OjbsuoAoGCCqGSM49
+AwEHoUQDQgAEIIhcUMf6Uiyb7dMFrWrpL20yfnrVOQ6qQ+JoE3Ywp3dvSR4HB/e8
+jpcIrrq6WPSQ6w8FnZQgTF8/BYN1tJhyuw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der
index 7909603eda7e34..65c9b4d3b49234 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem
index c6cf90fc98c1e2..0d7d7472b25078 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIOW38WinyliIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIKzJhyani0/cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARMCz03jxIxvpuvO3Mh431jAbGrcvmq
-XpdRZp6HHytywW9vmBajtXBb6RuUoemSvsDKmJNBTQG3x9bEXa1S2Lk0o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN4WL
-7ko7KIAiiKcuggERNZum/nUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgXTtnLiXM88qiOp1zarIChDZqQXOu4CDmAMnL
-5HaQL8YCIQCWQf1OTcBcjIgBn3s09tlFGbGQipOXcVQzXQG3UGnX/g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQH7IWQkm2ybCC+iwNOOqeSiEy0OyLh
+x2Qpd7uLRsmMX7QFiq53sexlHJYSyU8mnEim05uD4U3iLtIFl4w3FNmSo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0Wy6
+g4WH/yd3VcbU/pJA3I9yLuQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKtUne/gtPNiAtpbQq/gLKgoDaBLTBvhyaa7
+v4y9PPZtAiEAq+d+9LA+0BRV92/5ZoyXW71xXCCMUGQcCZK+HcDa3+k=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der
index c13d7e9fe30d45..9fa0571af76195 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem
index 12ecdb4d7f08c2..134e08335b466c 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOOt0X7+bPYEHc3GWS0wGKlA+70IgyW5HQdr4eKP3K0AoAoGCCqGSM49
-AwEHoUQDQgAETAs9N48SMb6brztzIeN9YwGxq3L5ql6XUWaehx8rcsFvb5gWo7Vw
-W+kblKHpkr7AypiTQU0Bt8fWxF2tUti5NA==
+MHcCAQEEIEUTf3EIxcJR2kdie5K116J+LfXPJlnAAOWJogsE0yxAoAoGCCqGSM49
+AwEHoUQDQgAEB+yFkJJtsmwgvosDTjqnkohMtDsi4cdkKXe7i0bJjF+0BYqud7Hs
+ZRyWEslPJpxIptObg+FN4i7SBZeMNxTZkg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json
index d4163b88877681..6663786a4a2920 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS eContentType pkcs7-data.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa00302010202083dd30b91e56cb466300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d7a81cef4e25adebbf44a51db85368e8dcc902681e7bf3d8afd1defb8c08e1e829353b7e260f88751a55fa287b17a506cd9293d83ec95af8feb799da4d526701a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041488293c53e34d8d7b250a2340587b40e64dc69f36301f0603551d2304183016801437858bee4a3b28802288a72e820111359ba6fe75300a06082a8648ce3d04030203470030440220555f89b4249f1c876183638c29a4a7702ce77bfbfc0e93d763a3fa5aa0cafe0102207a3fef3c95d0710271953646c2e7fc4c14cfcea54ffe2cf864c27a143035197b",
-    "pai_cert": "308201d43082017aa0030201020208396dfc5a29f29622300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044c0b3d378f1231be9baf3b7321e37d6301b1ab72f9aa5e9751669e871f2b72c16f6f9816a3b5705be91b94a1e992bec0ca9893414d01b7c7d6c45dad52d8b934a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041437858bee4a3b28802288a72e820111359ba6fe75301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205d3b672e25ccf3caa23a9d736ab20284366a4173aee020e600c9cbe476902fc60221009641fd4e4dc05c8c88019f7b34f6d94519b1908a93977154335d01b75069d7fe",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206b479b74f2d3ad86fafca5e20ed8cc719306841c90b4330637e960766fad658802203e3f0c886f6bc87467886a16388a5c3e0cf21e3c1b2e642129f8d1537ae9e3c3",
-    "dac_private_key": "5fa0a699548751afcc4920a5eb334af2312f2a4c1c623caefc151c41b4278032",
-    "dac_public_key": "04d7a81cef4e25adebbf44a51db85368e8dcc902681e7bf3d8afd1defb8c08e1e829353b7e260f88751a55fa287b17a506cd9293d83ec95af8feb799da4d526701"
+    "dac_cert": "308201e43082018aa003020102020823c7f676c30ab4e4300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000420885c50c7fa522c9bedd305ad6ae92f6d327e7ad5390eaa43e268137630a7776f491e0707f7bc8e9708aebaba58f490eb0f059d94204c5f3f058375b49872bba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041475e5033e679b540e73b5538ca24f861f51ce5957301f0603551d23041830168014d16cba838587ff277755c6d4fe9240dc8f722ee4300a06082a8648ce3d0403020348003045022019ea4a9d10333b28af3fb7993009aaa84429d510df272223d69e548ea2dd0e52022100b3a80899d38b34bfbda4fdf48cc240d166d95079afacee94bb2036593770c26a",
+    "pai_cert": "308201d53082017aa00302010202082b3261c9a9e2d3f7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000407ec8590926db26c20be8b034e3aa792884cb43b22e1c7642977bb8b46c98c5fb4058aae77b1ec651c9612c94f269c48a6d39b83e14de22ed205978c3714d992a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d16cba838587ff277755c6d4fe9240dc8f722ee4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100ab549defe0b4f36202da5b42afe02ca8280da04b4c1be1c9a6bbbf8cbd3cf66d022100abe77ef4b03ed01455f76ff9668c975bbd715c208c50641c0992be1dc0dadfe9",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c56193c26339204622c3362e7d38c546cff314c33026eb2bef1be2ac647a21a902210087f25223fb20425a824923d862e2863cc20b3a21fbfb98ed46bd7cf3e88cbbc7",
+    "dac_private_key": "e410760c548f819a93c5995d394f5103e8ae02326ec2a85b91bda73d4e8dbb2e",
+    "dac_public_key": "0420885c50c7fa522c9bedd305ad6ae92f6d327e7ad5390eaa43e268137630a7776f491e0707f7bc8e9708aebaba58f490eb0f059d94204c5f3f058375b49872bb"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der
index a5f58832d8e427..52e1d8b2b29c80 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der
index f0a9cbc8714718..99fd898cdce70b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem
index b6179be052f897..449b0cda1961e8 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIWYA/T0sgELIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIBetDoiGQoM4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-d/29qL0KisWKa/vTr3kKf9dhZSoYffwPdAaDCC5qelTH+QlOAPJCKeLuVBysfQMH
-pgw2odTi75A0yJGXIvBvlqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGFMfIaAwMiUFfe1hluv40jP8KMXMB8GA1UdIwQYMBaAFJph
-dBbQmGerFDhJ5jaFylHYb740MAoGCCqGSM49BAMCA0gAMEUCIQC9JeXc6M3KhBBO
-kmNNQbyuDTJKLiSwIF4YP7J5k2PO9wIgBeuLPy++ubBrWnj3psam2Z+Yq3wfDRKn
-liJCEsFzAjA=
+7WYn3XVSsq/wT9Eq8YCgfYONqxiO5huLEJoNnCUmcuOZLALHHM6HG/UmlcQvKX9F
+nhoIB2kc58YPuU4M4OdUy6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFE3NXV+43iNuxiuN/7w9sZcp5FUvMB8GA1UdIwQYMBaAFNXO
+TfbMKamgTcdNlbgxEGQYddVfMAoGCCqGSM49BAMCA0cAMEQCIFfqWM0v3GMtc8nB
+9EZNYrUbOjS262tV169YtihLxzEtAiA5WWqy4i2FMu91XI7loHSVGoD2QcyVeQTj
+YZmGXHtMqQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der
index f0669b297ea791..b7a31e7a1e2d5c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem
index cc10771f544df9..446c478aa64c5a 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAilEVcXWEe2TWYAFij6rjyJvIMDA63q5HOtBZhreqH3oAoGCCqGSM49
-AwEHoUQDQgAEd/29qL0KisWKa/vTr3kKf9dhZSoYffwPdAaDCC5qelTH+QlOAPJC
-KeLuVBysfQMHpgw2odTi75A0yJGXIvBvlg==
+MHcCAQEEIP7gpLvwifggwOS0Jx7nJRNvuZR31c94v0XTNm2NiIJIoAoGCCqGSM49
+AwEHoUQDQgAE7WYn3XVSsq/wT9Eq8YCgfYONqxiO5huLEJoNnCUmcuOZLALHHM6H
+G/UmlcQvKX9FnhoIB2kc58YPuU4M4OdUyw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der
index 91dc22603f9b53..f585d45b9f9830 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem
index 672ffa0de6c09e..8335d91fe0c5e3 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIFMwDSPKHQqcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIJi9kgBr37tQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQzkE63fa2BDDjwCmbmIqV8ySv5iWQV
-4LvKNrdva+o6UnHOGKE8yEDPso9qGhI9wjHB5GXYmqLCWcQNlzaQJsJZo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmmF0
-FtCYZ6sUOEnmNoXKUdhvvjQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALl9bL3b+XmTEJ06ZxD36OpplOHWqh52bPia
-blEKTLgzAiAF+KjWgsCV3dgE1tryPbAnVxJ5y3Nje3uFzNd0hFVQtA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARv+RUwomHntZS0sKQE2eMeG4Ns113K
+55cGe1DBfwBlokZt5mfDYcyTeF95rCPtmDByecrJvyEWna2VYKCx8CFVo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1c5N
+9swpqaBNx02VuDEQZBh11V8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJJT7mZJLvmCCK12MU8MlerWxXfZHB77/V6l
+SL3ss5QFAiBg2gztHUkWpiw6mcSOOtqizmy7FfS+NDAgKrluOyMNjA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der
index 03fae6fd01002f..e8103a400af16d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem
index b5b5c9b33e5cce..8dfb6a9b7fc715 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMVJNQKPENfHZPNLHzOr5o8XEuJfdJu0HpNi+l5/aV3DoAoGCCqGSM49
-AwEHoUQDQgAEM5BOt32tgQw48Apm5iKlfMkr+YlkFeC7yja3b2vqOlJxzhihPMhA
-z7KPahoSPcIxweRl2JqiwlnEDZc2kCbCWQ==
+MHcCAQEEIC9uFvpy4MFs8k8M4GkbhyPjMvuGgtYSWu+Cdp1C3sf+oAoGCCqGSM49
+AwEHoUQDQgAEb/kVMKJh57WUtLCkBNnjHhuDbNddyueXBntQwX8AZaJGbeZnw2HM
+k3hfeawj7ZgwcnnKyb8hFp2tlWCgsfAhVQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json
index dc211e2a891cbc..cbef8ba2b1b94d 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS signature algorithm ECDSA_WITH_SHA1.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020859803f4f4b2010b2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000477fdbda8bd0a8ac58a6bfbd3af790a7fd761652a187dfc0f740683082e6a7a54c7f9094e00f24229e2ee541cac7d0307a60c36a1d4e2ef9034c8919722f06f96a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414614c7c8680c0c89415f7b5865bafe348cff0a317301f0603551d230418301680149a617416d09867ab143849e63685ca51d86fbe34300a06082a8648ce3d0403020348003045022100bd25e5dce8cdca84104e92634d41bcae0d324a2e24b0205e183fb2799363cef7022005eb8b3f2fbeb9b06b5a78f7a6c6a6d99f98ab7c1f0d12a796224212c1730230",
-    "pai_cert": "308201d43082017aa003020102020814cc0348f28742a7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000433904eb77dad810c38f00a66e622a57cc92bf9896415e0bbca36b76f6bea3a5271ce18a13cc840cfb28f6a1a123dc231c1e465d89aa2c259c40d97369026c259a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604149a617416d09867ab143849e63685ca51d86fbe34301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b97d6cbddbf97993109d3a6710f7e8ea6994e1d6aa1e766cf89a6e510a4cb833022005f8a8d682c095ddd804d6daf23db027571279cb73637b7b85ccd774845550b4",
-    "certification_declaration": "3082010006092a864886f70d010702a081f23081ef020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317b3079020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300906072a8648ce3d040104463044022049f9b5d56c8df4df39b8438a21025d8ea7316c64131c3c167f73bf99e6bb046702207b0b6a2720baf548fc3964c39748c33b02cd96042d5b8355f37d7099851a25da",
-    "dac_private_key": "08a51157175847b64d66001628faae3c89bc830303adeae473ad05986b7aa1f7",
-    "dac_public_key": "0477fdbda8bd0a8ac58a6bfbd3af790a7fd761652a187dfc0f740683082e6a7a54c7f9094e00f24229e2ee541cac7d0307a60c36a1d4e2ef9034c8919722f06f96"
+    "dac_cert": "308201e33082018aa003020102020805eb43a22190a0ce300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ed6627dd7552b2aff04fd12af180a07d838dab188ee61b8b109a0d9c252672e3992c02c71cce871bf52695c42f297f459e1a0807691ce7c60fb94e0ce0e754cba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144dcd5d5fb8de236ec62b8dffbc3db19729e4552f301f0603551d23041830168014d5ce4df6cc29a9a04dc74d95b83110641875d55f300a06082a8648ce3d0403020347003044022057ea58cd2fdc632d73c9c1f4464d62b51b3a34b6eb6b55d7af58b6284bc7312d022039596ab2e22d8532ef755c8ee5a074951a80f641cc957904e36199865c7b4ca9",
+    "pai_cert": "308201d43082017aa0030201020208262f64801af7eed4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046ff91530a261e7b594b4b0a404d9e31e1b836cd75dcae797067b50c17f0065a2466de667c361cc93785f79ac23ed98307279cac9bf21169dad9560a0b1f02155a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d5ce4df6cc29a9a04dc74d95b83110641875d55f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009253ee66492ef98208ad76314f0c95ead6c577d91c1efbfd5ea548bdecb39405022060da0ced1d4916a62c3a99c48e3adaa2ce6cbb15f4be3430202ab96e3b230d8c",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300906072a8648ce3d0401044830460221008b344b948a2322356dff2b091859a4edd7deaafa61b336849af08656cf61828c022100a392c688e6177c5f8cfef6cc2849240097e1deb8213b4bdb95557d3ffacd183d",
+    "dac_private_key": "fee0a4bbf089f820c0e4b4271ee725136fb99477d5cf78bf45d3366d8d888248",
+    "dac_public_key": "04ed6627dd7552b2aff04fd12af180a07d838dab188ee61b8b109a0d9c252672e3992c02c71cce871bf52695c42f297f459e1a0807691ce7c60fb94e0ce0e754cb"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der
index 320f79fe86509e..5629f047d210d2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der
index 7272ea69583961..68b2aeb3f5da5e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem
index beed86f3486bfa..09aa8e11f12dbe 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIUa+/awG73QcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIHx/+qCnI3D8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-EFnP3n8Qgh8uZudyZCkD9mJXpl0Ai/+Wmb/Dc1CgXGpqUbEZ4ra/7KgHnQMi4pYc
-rnqHIxYZ1Vve6WFYe2S4NqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHquxgnj0CVuN8AVgod7XNrc2Z+RMB8GA1UdIwQYMBaAFGR8
-lcYl2RWQpYBNGNPQEadSenC7MAoGCCqGSM49BAMCA0gAMEUCIQClmcCcXr0fU7Ei
-WSdvza2vQYtXU1X9e0dtIGousLyt8wIgKVSFVu7vi24HOt1OI/mPWULjdsMJzpUF
-2BxFTMNoL8w=
+uKnNfeXawCOf18CszNGtcOJCdFU/UyCLKHJE9+gx22KtpHGrFT4ig4SdTzjZzEGz
+DjiaXp6UtDjgR7dzoFGXJaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFIvUD50vX51LM7ZWiUhnPRK3m8XCMB8GA1UdIwQYMBaAFImh
+Lm1ABbKxXtfYUpBUKsgSMaivMAoGCCqGSM49BAMCA0gAMEUCIQC6gfPN9bb4kp+n
+xSRpgWUp69gudt57TBxy20r0zrxB/QIgTyUQxSWhQ+Z+lkgLHXwkO++eI1JJsXpE
+VMRA+jdxtR4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der
index 0ade22b7e90086..7cd39bec3cc884 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem
index 8e0f87730b9400..2d0c3bc4df5b63 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP1yvpYRrZUkkuY4TjcIwDIoBq2YMdYH6uvQ/zIE2KD9oAoGCCqGSM49
-AwEHoUQDQgAEEFnP3n8Qgh8uZudyZCkD9mJXpl0Ai/+Wmb/Dc1CgXGpqUbEZ4ra/
-7KgHnQMi4pYcrnqHIxYZ1Vve6WFYe2S4Ng==
+MHcCAQEEIC5VyV5cJKdDW33DgAzfagP5bPs09qlf2bRl5detp6hcoAoGCCqGSM49
+AwEHoUQDQgAEuKnNfeXawCOf18CszNGtcOJCdFU/UyCLKHJE9+gx22KtpHGrFT4i
+g4SdTzjZzEGzDjiaXp6UtDjgR7dzoFGXJQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der
index 777a035d8814a3..a1191ea8bf1149 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem
index bd237aad71abfc..9510cd58c5f429 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIHNO7+2g/W9IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIcGvX8CQYHIcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR7Kn2DWq7jxwru8iDEtCvxtGcBenKG
-J43lIzi076C2T+N/cQ7QldYjMdSw0yYjYYjMWyv9gAdJokyQAcxYHJHoo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUZHyV
-xiXZFZClgE0Y09ARp1J6cLswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgLEHiRUg+8X9xvIdDV/lZHjDa79/TyVosM8P5
-jb046RYCIATt5XR/1neaENVBpdLYwIb3DAszzN70pJiT/c8tLvn6
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS+A/77KY26MaMI6DhgQ0aqwlpke/hM
+6qpHd6lSd8RrW8GfMd/INjz7gJJ6OXNj5uT5RBU4k2jq584GBlWNKliEo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiaEu
+bUAFsrFe19hSkFQqyBIxqK8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAM/Q4Z2Ve4/TZTfUexB5Z5B/cvrDy91ebhje
++D5b9SuTAiEAzFf4AEp2RccKhe6tsKdB8ElzLzrIYHpUS0wWE7uyTho=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der
index 212a8506bdaf5b..58fc538ba228d5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem
index a7735d190dbff8..fba4e6b59eb2b1 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGXEdqJrz0YBnq7iI9naAhOhJMbritLmWEF0DGfda2wNoAoGCCqGSM49
-AwEHoUQDQgAEeyp9g1qu48cK7vIgxLQr8bRnAXpyhieN5SM4tO+gtk/jf3EO0JXW
-IzHUsNMmI2GIzFsr/YAHSaJMkAHMWByR6A==
+MHcCAQEEIHOaPGmmli+hgLv42yoxuXW8EO9aY6RMuGokGXjT2rMIoAoGCCqGSM49
+AwEHoUQDQgAEvgP++ymNujGjCOg4YENGqsJaZHv4TOqqR3epUnfEa1vBnzHfyDY8
++4CSejlzY+bk+UQVOJNo6ufOBgZVjSpYhA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json
index 43831cf8c5e8c4..324e771f040932 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS signature algorithm ECDSA_WITH_SHA256.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa003020102020851afbf6b01bbdd07300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041059cfde7f10821f2e66e772642903f66257a65d008bff9699bfc37350a05c6a6a51b119e2b6bfeca8079d0322e2961cae7a87231619d55bdee961587b64b836a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147aaec609e3d0256e37c01582877b5cdadcd99f91301f0603551d23041830168014647c95c625d91590a5804d18d3d011a7527a70bb300a06082a8648ce3d0403020348003045022100a599c09c5ebd1f53b12259276fcdadaf418b575355fd7b476d206a2eb0bcadf3022029548556eeef8b6e073add4e23f98f5942e376c309ce9505d81c454cc3682fcc",
-    "pai_cert": "308201d33082017aa00302010202081cd3bbfb683f5bd2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047b2a7d835aaee3c70aeef220c4b42bf1b467017a7286278de52338b4efa0b64fe37f710ed095d62331d4b0d326236188cc5b2bfd800749a24c9001cc581c91e8a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414647c95c625d91590a5804d18d3d011a7527a70bb301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202c41e245483ef17f71bc874357f9591e30daefdfd3c95a2c33c3f98dbd38e916022004ede5747fd6779a10d541a5d2d8c086f70c0b33ccdef4a49893fdcf2d2ef9fa",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100eee5435e9f6666883e39b126cbc5fae347032a169abc55929b41e1ed68bbc40b02206bdc22977e3ffe804922e178369d67c47e86b3e4e67d87d14409177e4164936d",
-    "dac_private_key": "fd72be9611ad952492e6384e3708c0322806ad9831d607eaebd0ff3204d8a0fd",
-    "dac_public_key": "041059cfde7f10821f2e66e772642903f66257a65d008bff9699bfc37350a05c6a6a51b119e2b6bfeca8079d0322e2961cae7a87231619d55bdee961587b64b836"
+    "dac_cert": "308201e43082018aa00302010202081f1ffea829c8dc3f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b8a9cd7de5dac0239fd7c0acccd1ad70e24274553f53208b287244f7e831db62ada471ab153e2283849d4f38d9cc41b30e389a5e9e94b438e047b773a0519725a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148bd40f9d2f5f9d4b33b6568948673d12b79bc5c2301f0603551d2304183016801489a12e6d4005b2b15ed7d85290542ac81231a8af300a06082a8648ce3d0403020348003045022100ba81f3cdf5b6f8929fa7c52469816529ebd82e76de7b4c1c72db4af4cebc41fd02204f2510c525a143e67e96480b1d7c243bef9e235249b17a4454c440fa3771b51e",
+    "pai_cert": "308201d53082017aa0030201020208706bd7f024181c87300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004be03fefb298dba31a308e838604346aac25a647bf84ceaaa4777a95277c46b5bc19f31dfc8363cfb80927a397363e6e4f94415389368eae7ce0606558d2a5884a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041489a12e6d4005b2b15ed7d85290542ac81231a8af301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100cfd0e19d957b8fd36537d47b107967907f72fac3cbdd5e6e18def83e5bf52b93022100cc57f8004a7645c70a85eeadb0a741f049732f3ac8607a544b4c1613bbb24e1a",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f9f71dacadba36990cd390d9858873cf754972a638dff54bfe869de2f4943366022075a6f1b9b2bb86b5074f15b24999f019b28e580e15c0409fdbcc4c292328d342",
+    "dac_private_key": "2e55c95e5c24a7435b7dc3800cdf6a03f96cfb34f6a95fd9b465e5d7ada7a85c",
+    "dac_public_key": "04b8a9cd7de5dac0239fd7c0acccd1ad70e24274553f53208b287244f7e831db62ada471ab153e2283849d4f38d9cc41b30e389a5e9e94b438e047b773a0519725"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der
index d832ff2dee0088..a0c02537887c98 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der
index a1b7b3c3a402d2..c3f4436a81d0bb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem
index a6c340b4c99e92..0a7a11560403ad 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIZB+UTV2XfT0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIITodBibhaoAEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-kJLXerOu6ysHzmCxqwYNj8uVJtM1T19H19dTOGGvEpz7UpF3tWk3SiNf9bMbb2nV
-PNS+pqEO2EZYE8ssPbRMv6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOyGGeIlsPO9fyYTwl8a63iJsiBuMB8GA1UdIwQYMBaAFFYh
-h6gBCq2Mjx5KraGoPWFKy3SBMAoGCCqGSM49BAMCA0cAMEQCID2p6rJsOcjefKb4
-c62ddfEBTDgWEgE73ah0g8XHBtVYAiBp1VIo0OJntQ1TjcKAaMb9DZ1+PBOXW02P
-JG99TsNwVQ==
+Dml60tber0B0bC4UOnwf3EXr92kg9iiO6XDkljevE9Sv7j4LWlYodNKZNBm46bNl
+MzvldG+Jdi70xw8+bROYfqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFM/bcX4oG2GonHl00T3mz6KLX4dxMB8GA1UdIwQYMBaAFOwJ
+lFqsH5sa6U4WQP5KBZ145OvtMAoGCCqGSM49BAMCA0kAMEYCIQD9lEVu68pczlhv
+UQnbiEzBS6oZ6feCWTXqA5NxjrIE3QIhAP/AdqK1yLdmBeGX7rmhYF9sNlu5Wn1h
+GYqvY/CUb5+O
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der
index 28d71a8d551614..04ff5cf66d82fa 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem
index af194e828d1003..b6ce1c16c0bfea 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOFDuHbLrpxlVvvP00IAuAglKVmh3FkMZh2oBT9cJyTRoAoGCCqGSM49
-AwEHoUQDQgAEkJLXerOu6ysHzmCxqwYNj8uVJtM1T19H19dTOGGvEpz7UpF3tWk3
-SiNf9bMbb2nVPNS+pqEO2EZYE8ssPbRMvw==
+MHcCAQEEIKcP58Uz2uqUXUKqjzVPuecEaGDoZUKuyhGihkQE+1L3oAoGCCqGSM49
+AwEHoUQDQgAEDml60tber0B0bC4UOnwf3EXr92kg9iiO6XDkljevE9Sv7j4LWlYo
+dNKZNBm46bNlMzvldG+Jdi70xw8+bROYfg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der
index d228555d16c801..e07cce6241b3c7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem
index 52fb00d97984bd..f753c901fa206e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIVy3yKzzyswwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIZlhE88L24hkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHqYCBjFhwURB1vFv+U0Csz00Yuvps
-c40V4CwX7Eh0TGgBVfhkVQu3LwT6MvitXBALwnF0zXmkJMnDf1YzuuTZo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUViGH
-qAEKrYyPHkqtoag9YUrLdIEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgQVg1d0g/z3eEX5povioGq5dycjh3Eds+NhB/
-Q6RrYUoCIQD59OyRkyONzepimsC9srkxaFJQZyP8jo0o+kBOaj57/Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATDJ0DvKty0IOSjvoppJn1fFDWM+nyH
+/iI0XzUtDOBDP+WTJLyFzLYqU2NEKJwLWtsiXZYJorjQF0kKDtIGogtZo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7AmU
+WqwfmxrpThZA/koFnXjk6+0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhANjLZzb14B/jGMgdgHmyIP4hoEOxt6JHAOJR
+bCTRpAPYAiEArZjC09r6hLg80YGJzugkKyIKtsmpyVXvBftULE7wKFU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der
index 3c581e68891ff1..321f91f97c4d7a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem
index 6e8cdba227549b..7555fb7a732776 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP+0y35+Wl09aF45bGAenM3vakJfxB0C185/Bf1JCq4SoAoGCCqGSM49
-AwEHoUQDQgAEB6mAgYxYcFEQdbxb/lNArM9NGLr6bHONFeAsF+xIdExoAVX4ZFUL
-ty8E+jL4rVwQC8JxdM15pCTJw39WM7rk2Q==
+MHcCAQEEIAPrnEWEYOvBpG07XnZc92RdfvufXizdcVnZbMuRLESNoAoGCCqGSM49
+AwEHoUQDQgAEwydA7yrctCDko76KaSZ9XxQ1jPp8h/4iNF81LQzgQz/lkyS8hcy2
+KlNjRCicC1rbIl2WCaK40BdJCg7SBqILWQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json
index 00e8b9d2660bba..a5b1ba36d50678 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS Signature.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa0030201020208641f944d5d977d3d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049092d77ab3aeeb2b07ce60b1ab060d8fcb9526d3354f5f47d7d7533861af129cfb529177b569374a235ff5b31b6f69d53cd4bea6a10ed8465813cb2c3db44cbfa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ec8619e225b0f3bd7f2613c25f1aeb7889b2206e301f0603551d23041830168014562187a8010aad8c8f1e4aada1a83d614acb7481300a06082a8648ce3d040302034700304402203da9eab26c39c8de7ca6f873ad9d75f1014c381612013bdda87483c5c706d558022069d55228d0e267b50d538dc28068c6fd0d9d7e3c13975b4d8f246f7d4ec37055",
-    "pai_cert": "308201d43082017aa0030201020208572df22b3cf2b30c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000407a980818c5870511075bc5bfe5340accf4d18bafa6c738d15e02c17ec48744c680155f864550bb72f04fa32f8ad5c100bc27174cd79a424c9c37f5633bae4d9a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414562187a8010aad8c8f1e4aada1a83d614acb7481301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022041583577483fcf77845f9a68be2a06ab977272387711db3e36107f43a46b614a022100f9f4ec9193238dcdea629ac0bdb2b9316852506723fc8e8d28fa404e6a3e7bfd",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220508c3b11006d745208ebe4d8b47a5fc3150c24f449b2cf55d4059359ce68cc3b02210086ac5f4e6d3733848bc6b63efe7a31002932acc3b6d3e594d6d47dbee9fc89af",
-    "dac_private_key": "e143b876cbae9c6556fbcfd34200b808252959a1dc590c661da8053f5c2724d1",
-    "dac_public_key": "049092d77ab3aeeb2b07ce60b1ab060d8fcb9526d3354f5f47d7d7533861af129cfb529177b569374a235ff5b31b6f69d53cd4bea6a10ed8465813cb2c3db44cbf"
+    "dac_cert": "308201e53082018aa00302010202084e874189b85aa001300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040e697ad2d6deaf40746c2e143a7c1fdc45ebf76920f6288ee970e49637af13d4afee3e0b5a562874d2993419b8e9b365333be5746f89762ef4c70f3e6d13987ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cfdb717e281b61a89c7974d13de6cfa28b5f8771301f0603551d23041830168014ec09945aac1f9b1ae94e1640fe4a059d78e4ebed300a06082a8648ce3d0403020349003046022100fd94456eebca5cce586f5109db884cc14baa19e9f7825935ea0393718eb204dd022100ffc076a2b5c8b76605e197eeb9a1605f6c365bb95a7d61198aaf63f0946f9f8e",
+    "pai_cert": "308201d53082017aa0030201020208665844f3c2f6e219300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c32740ef2adcb420e4a3be8a69267d5f14358cfa7c87fe22345f352d0ce0433fe59324bc85ccb62a536344289c0b5adb225d9609a2b8d017490a0ed206a20b59a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ec09945aac1f9b1ae94e1640fe4a059d78e4ebed301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d8cb6736f5e01fe318c81d8079b220fe21a043b1b7a24700e2516c24d1a403d8022100ad98c2d3dafa84b83cd18189cee8242b220ab6c9a9c955ef05fb542c4ef02855",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d78b101a2f977e551c575ed5f355bb3feec9cd65cf39b69e431f74271cdf8c75022100c8da9da310a9b77784126617fe4a31a772819e661861498651541024f22ab066",
+    "dac_private_key": "a70fe7c533daea945d42aa8f354fb9e7046860e86542aeca11a2864404fb52f7",
+    "dac_public_key": "040e697ad2d6deaf40746c2e143a7c1fdc45ebf76920f6288ee970e49637af13d4afee3e0b5a562874d2993419b8e9b365333be5746f89762ef4c70f3e6d13987e"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der
index 0cec6f03d80f2c..a89a83ab121953 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der
index 2f5590f877d213..1719e845f1c116 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem
index 1548c487f67892..107a8467f67c6b 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIatD/GBMuvkkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIBnjr7G9ebzkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-A7cNuuIxo/lkyfHv28FO3b7ybhz79kTmubkPDqNqLdwRc5B2vrBrRR28b2huoPbn
-IuoNTsETgBkeIhAfDPqV3aNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHKd28iQYutSi1iNOuvUwyiNwFJlMB8GA1UdIwQYMBaAFGP0
-RHvw5ZsEEGFYd/g+b0PVkLgDMAoGCCqGSM49BAMCA0cAMEQCICXfBCZ2VdugCl3q
-4ki1hImTQs6kmMIA6yd5yz58BjkwAiBPXbNFH5SvalLRr3RwoJ3MggEpcEqdJxQa
-XRbdBgFGlw==
+uJcDCUisHQsDdpI4/WOlqVOuIYgwBN11PS4XfRIXblsx+11m1ZPdsn0eG8079OI3
+enPzfLH1c0Pc3rvc0hyUrqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFMLhLHfxZDcBGJKr9vXQLwIo+GupMB8GA1UdIwQYMBaAFEAN
+tiQG0VpJWZWszGb7wF21gjWJMAoGCCqGSM49BAMCA0kAMEYCIQCcWPT01sxKnNe/
+UDWhe3zmt/x1m2pqNcWVv7uttGGyUAIhAKq31bX8d7R5fjGdt5knmmM6WaT2uCBq
+Pxam9B71yHXq
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der
index debfe88c6ccaa2..e1e60cdc30ae4b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem
index 24eccaae52b755..bac3a09a37e748 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIwOzCwKHV5B8K+e/pWT+dDdnNIVHrMKaHwc98XLSKsHoAoGCCqGSM49
-AwEHoUQDQgAEA7cNuuIxo/lkyfHv28FO3b7ybhz79kTmubkPDqNqLdwRc5B2vrBr
-RR28b2huoPbnIuoNTsETgBkeIhAfDPqV3Q==
+MHcCAQEEILFi/V4koEHiGAN8NZ0Yeu53fQHrBILNAsOmQp1+bQ/2oAoGCCqGSM49
+AwEHoUQDQgAEuJcDCUisHQsDdpI4/WOlqVOuIYgwBN11PS4XfRIXblsx+11m1ZPd
+sn0eG8079OI3enPzfLH1c0Pc3rvc0hyUrg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der
index 91eb78573563f8..2c0184c5686590 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem
index 79747ac45a6290..46fa9cf3d961fd 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIEAYfyyDdug0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIINvg+dWL638MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASF77xXt/l+9OVfaOudjCgBn6VsYGz6
-imsz7UKrFIAqUNVuWHlhqkkkiW62hPwqtmwdX6rUqLGhPImgbL/NZ1glo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUY/RE
-e/DlmwQQYVh3+D5vQ9WQuAMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAIsXhx3hoNcZLxf6Vb3B8cZNZ20QFp06wA/i
-LoNdQk9uAiAE3iiuuZc5GJQ1ud8kf8ba//ao/w3L9OACiiGts5LHig==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATfDGYycYLdly5ZNtCZALecFS4K6N/x
+BSK1lGlknx0M/zjsgFoNcInlvsBpWZ3KNhh9zn6YmLXxU07iJ3KxwAggo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQA22
+JAbRWklZlazMZvvAXbWCNYkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKIpxdI5HmYxL9/WYtiVNLXvVFHZg1ynPuil
+EShV8kgNAiBMtB5k0MnCEP3MsCg5lpFoCv4dC0CMcbE+giwpjYQzmg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der
index 0d706d74dc4283..2ffe9060c507c1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem
index 9b9f5d02c50025..43e051863cb617 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFJP9xtsdXzE0BBnOFDKxD3REAGs0NfrBu4V2VE/A050oAoGCCqGSM49
-AwEHoUQDQgAEhe+8V7f5fvTlX2jrnYwoAZ+lbGBs+oprM+1CqxSAKlDVblh5YapJ
-JIlutoT8KrZsHV+q1KixoTyJoGy/zWdYJQ==
+MHcCAQEEIC1ScE4GhRwlsYx9mBl9cqiI8FIxixpdmeUB52LS2tbooAoGCCqGSM49
+AwEHoUQDQgAE3wxmMnGC3ZcuWTbQmQC3nBUuCujf8QUitZRpZJ8dDP847IBaDXCJ
+5b7AaVmdyjYYfc5+mJi18VNO4idyscAIIA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json
index 4d94363e5259ba..d47b1d437b31ce 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS version set to v2.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202086ad0ff18132ebe49300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000403b70dbae231a3f964c9f1efdbc14eddbef26e1cfbf644e6b9b90f0ea36a2ddc11739076beb06b451dbc6f686ea0f6e722ea0d4ec11380191e22101f0cfa95dda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414729ddbc89062eb528b588d3aebd4c3288dc05265301f0603551d2304183016801463f4447bf0e59b0410615877f83e6f43d590b803300a06082a8648ce3d0403020347003044022025df04267655dba00a5deae248b584899342cea498c200eb2779cb3e7c06393002204f5db3451f94af6a52d1af7470a09dcc820129704a9d27141a5d16dd06014697",
-    "pai_cert": "308201d43082017aa003020102020810061fcb20ddba0d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000485efbc57b7f97ef4e55f68eb9d8c28019fa56c606cfa8a6b33ed42ab14802a50d56e587961aa4924896eb684fc2ab66c1d5faad4a8b1a13c89a06cbfcd675825a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041463f4447bf0e59b0410615877f83e6f43d590b803301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008b17871de1a0d7192f17fa55bdc1f1c64d676d10169d3ac00fe22e835d424f6e022004de28aeb99739189435b9df247fc6dafff6a8ff0dcbf4e0028a21adb392c78a",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020102310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022019f5259dd5e6b80fce74e06a8a23c1d9e1352f230d79dd5dd6b554e79b53195702204719e8b44ef27b723afd74404ec3d2163b9039957d38a4d48d275fb5e32a9a51",
-    "dac_private_key": "8c0ecc2c0a1d5e41f0af9efe9593f9d0dd9cd2151eb30a687c1cf7c5cb48ab07",
-    "dac_public_key": "0403b70dbae231a3f964c9f1efdbc14eddbef26e1cfbf644e6b9b90f0ea36a2ddc11739076beb06b451dbc6f686ea0f6e722ea0d4ec11380191e22101f0cfa95dd"
+    "dac_cert": "308201e53082018aa00302010202080678ebec6f5e6f39300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b897030948ac1d0b03769238fd63a5a953ae21883004dd753d2e177d12176e5b31fb5d66d593ddb27d1e1bcd3bf4e2377a73f37cb1f57343dcdebbdcd21c94aea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c2e12c77f16437011892abf6f5d02f0228f86ba9301f0603551d23041830168014400db62406d15a495995accc66fbc05db5823589300a06082a8648ce3d04030203490030460221009c58f4f4d6cc4a9cd7bf5035a17b7ce6b7fc759b6a6a35c595bfbbadb461b250022100aab7d5b5fc77b4797e319db799279a633a59a4f6b8206a3f16a6f41ef5c875ea",
+    "pai_cert": "308201d43082017aa003020102020836f83e7562fadfc3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004df0c66327182dd972e5936d09900b79c152e0ae8dff10522b59469649f1d0cff38ec805a0d7089e5bec069599dca36187dce7e9898b5f1534ee22772b1c00820a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414400db62406d15a495995accc66fbc05db5823589301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a229c5d2391e66312fdfd662d89534b5ef5451d9835ca73ee8a5112855f2480d02204cb41e64d0c9c210fdccb028399691680afe1d0b408c71b13e822c298d84339a",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020102310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207380d00c09bbbc2455d598f8242ad670a6ca351f255583ed23eb72ad1a36c41d022100a59ed7a414f5465872325942a2218edf15c4f00fb9ffef2d503540521d00c041",
+    "dac_private_key": "b162fd5e24a041e218037c359d187aee777d01eb0482cd02c3a6429d7e6d0ff6",
+    "dac_public_key": "04b897030948ac1d0b03769238fd63a5a953ae21883004dd753d2e177d12176e5b31fb5d66d593ddb27d1e1bcd3bf4e2377a73f37cb1f57343dcdebbdcd21c94ae"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der
index 7383b4d362994b..7f4b111ed2e187 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der
index 03678411c06e2a..f1daff9c6941f7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem
index c9e47a89598d12..89db9b1bcbfe5f 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIHiDnEYI1sxEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIAff8umNaPb4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-dSfTwrc9Te/7N3LDV1LjZFJiVJ1tEhHK+KATpQ9NkFF2s9iPXYmuDTuXbzy8UpWf
-rSCB0QDnkdM4USKZ9x9ZDqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFCKmbtZ+MuufFuWxoXnwlEKLde+pMB8GA1UdIwQYMBaAFLXH
-Pikar4NAjdaGNJyANhW0Av73MAoGCCqGSM49BAMCA0kAMEYCIQDRYbwfyajiog3J
-5rTJlT+ouHHOTvBS+7s5+VPSoCYV0AIhALbirlKSUHf9gmvkRBdJGZsOjX414fuP
-10UrrkWZjhsY
+dwJFiUCXGpJHgaKozoOkASn/fpFXNH0NNDap8EQha5q0aoWRsTks8/EG2ieR3til
+ND5W9a8knVw/i2xatIb0VqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFGgo+I0LleWWUsbkYBSUBuiNoJzfMB8GA1UdIwQYMBaAFPdG
+brQ62LAZk0LU47KQIVJzhEcxMAoGCCqGSM49BAMCA0gAMEUCIQDXNgtPm45wAgFf
+4tcEJvbNjX/Wfl/+BROeRFmRIuUBzQIgQbbMyUioRsxbZxd7fPIeEvY64nAorcg8
+81lrF6iS9uk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der
index a4db3edb42ec75..9091f28d36db14 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem
index 599a32870eac3d..5acd7bb499b167 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBm7pUsR+PFnsLnFT1syUbQ011B9pXU7Rl4MWAZGoqaxoAoGCCqGSM49
-AwEHoUQDQgAEdSfTwrc9Te/7N3LDV1LjZFJiVJ1tEhHK+KATpQ9NkFF2s9iPXYmu
-DTuXbzy8UpWfrSCB0QDnkdM4USKZ9x9ZDg==
+MHcCAQEEII1FUwgyDxZP+nJouH2WS3rOXgFNRT83GSkykhrxyekZoAoGCCqGSM49
+AwEHoUQDQgAEdwJFiUCXGpJHgaKozoOkASn/fpFXNH0NNDap8EQha5q0aoWRsTks
+8/EG2ieR3tilND5W9a8knVw/i2xatIb0Vg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der
index e72e1bdc289e65..a967702a3fe7d8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem
index 83f7ee936ebe3d..6bfbf2324ece0f 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIWEAO9H/LrnMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIJkLJQne7zuswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR83Y2hx9XrLzl0MimCT4Bauc0pl649
-cMIw+kJdoefj/ltob54P7tJ3d2XzzUZJI+y9xe9elEbmuKQP2FUvqUm7o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtcc+
-KRqvg0CN1oY0nIA2FbQC/vcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgfYc6cVZvc2mNEdoV1/MRaOHsL6B7pCral7km
-6Ef262ACIQCtX4nYWzjhx80ON/4Us90CpdIvlJrzrwaoJY1cyew8oA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQkz8bDSMVHPBEC43N6cjqB4tX7Lf1U
+i10dgfq78eB+AzTiX+jSGx1Y1JSxwBjk3wtkTKugxkDsD3RuqUbwjOuio2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU90Zu
+tDrYsBmTQtTjspAhUnOERzEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgSLADi3ZBrWkwmDI+c/erG1GmfFfyS3J+O01x
+iY4TUkMCIQDzhxWuBfNDKbFkBMuuyIrWLIJ44C3DcyVFVDOHZKjDlQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der
index 08155849b3541a..ae3dbbf6e74d75 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem
index 8791c186b97c13..073fb359d7fc87 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOw7UllUZomdfOkDPK9a2MfWZhIejepw8AS56MV8bsraoAoGCCqGSM49
-AwEHoUQDQgAEfN2NocfV6y85dDIpgk+AWrnNKZeuPXDCMPpCXaHn4/5baG+eD+7S
-d3dl881GSSPsvcXvXpRG5rikD9hVL6lJuw==
+MHcCAQEEIM7eDm0ywOnTpS9a/VsROt2eKbgSKJVVA7ZyilSdesT3oAoGCCqGSM49
+AwEHoUQDQgAEJM/Gw0jFRzwRAuNzenI6geLV+y39VItdHYH6u/HgfgM04l/o0hsd
+WNSUscAY5N8LZEyroMZA7A90bqlG8Izrog==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json
index ee06d5d581aecf..4069d357a84679 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS version set to v3.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa00302010202081e20e7118235b311300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047527d3c2b73d4deffb3772c35752e3645262549d6d1211caf8a013a50f4d905176b3d88f5d89ae0d3b976f3cbc52959fad2081d100e791d338512299f71f590ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041422a66ed67e32eb9f16e5b1a179f094428b75efa9301f0603551d23041830168014b5c73e291aaf83408dd686349c803615b402fef7300a06082a8648ce3d0403020349003046022100d161bc1fc9a8e2a20dc9e6b4c9953fa8b871ce4ef052fbbb39f953d2a02615d0022100b6e2ae52925077fd826be4441749199b0e8d7e35e1fb8fd7452bae45998e1b18",
-    "pai_cert": "308201d43082017aa003020102020858400ef47fcbae73300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047cdd8da1c7d5eb2f39743229824f805ab9cd2997ae3d70c230fa425da1e7e3fe5b686f9e0feed2777765f3cd464923ecbdc5ef5e9446e6b8a40fd8552fa949bba366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b5c73e291aaf83408dd686349c803615b402fef7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207d873a71566f73698d11da15d7f31168e1ec2fa07ba42ada97b926e847f6eb60022100ad5f89d85b38e1c7cd0e37fe14b3dd02a5d22f949af3af06a8258d5cc9ec3ca0",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d25e9b259829f79d4d34d9a098b9f66ddf2b3bf387c8fe378079bcee2913f96a022100cf6ec0bc9f5bb179904f7e6f5a3c4f583caf21847603b2b1ad237681e1191178",
-    "dac_private_key": "19bba54b11f8f167b0b9c54f5b3251b434d7507da5753b465e0c580646a2a6b1",
-    "dac_public_key": "047527d3c2b73d4deffb3772c35752e3645262549d6d1211caf8a013a50f4d905176b3d88f5d89ae0d3b976f3cbc52959fad2081d100e791d338512299f71f590e"
+    "dac_cert": "308201e43082018aa003020102020801f7fcba635a3dbe300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047702458940971a924781a2a8ce83a40129ff7e9157347d0d3436a9f044216b9ab46a8591b1392cf3f106da2791ded8a5343e56f5af249d5c3f8b6c5ab486f456a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146828f88d0b95e59652c6e460149406e88da09cdf301f0603551d23041830168014f7466eb43ad8b0199342d4e3b290215273844731300a06082a8648ce3d0403020348003045022100d7360b4f9b8e7002015fe2d70426f6cd8d7fd67e5ffe05139e44599122e501cd022041b6ccc948a846cc5b67177b7cf21e12f63ae27028adc83cf3596b17a892f6e9",
+    "pai_cert": "308201d43082017aa00302010202082642c94277bbceeb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000424cfc6c348c5473c1102e3737a723a81e2d5fb2dfd548b5d1d81fabbf1e07e0334e25fe8d21b1d58d494b1c018e4df0b644caba0c640ec0f746ea946f08ceba2a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f7466eb43ad8b0199342d4e3b290215273844731301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022048b0038b7641ad693098323e73f7ab1b51a67c57f24b727e3b4d71898e135243022100f38715ae05f34329b16404cbaec88ad62c8278e02dc373254554338764a8c395",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022056ada9b84252bcd38a9a3416fdcd94f2bc58cb7f4e96b8c351b2d09c227e110c022100960f812ce9699e273a05b29d63c7baddb4224c16e9eaa43d0666b75ebc41c807",
+    "dac_private_key": "8d455308320f164ffa7268b87d964b7ace5e014d453f37192932921af1c9e919",
+    "dac_public_key": "047702458940971a924781a2a8ce83a40129ff7e9157347d0d3436a9f044216b9ab46a8591b1392cf3f106da2791ded8a5343e56f5af249d5c3f8b6c5ab486f456"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der
index 35357f994c513d..946d9fc2a32dee 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der
index 1827eea7a1a554..1503c715e4df1a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem
index ab98859efcb1bf..a6386314f10f02 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIPKLZP2LwPS4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIN5c+V6/YlLwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-FHTP4riz3/QDoHNTwXudq2TNQ4JmbW03ZuF0qeEx9ctyEy3NyU5ofp+F+Fs92CL7
-CMey0dknt74kR1BAARZsLaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFAE1YvIh7zVCuXW/rAAmr3Pm8xHYMB8GA1UdIwQYMBaAFEWF
-UEVirtEXa717VeR5KlfxFwwfMAoGCCqGSM49BAMCA0kAMEYCIQC+9F2IHOkMyWE3
-mTMgjwNxDS1DznKV+AvjuS9VExFXngIhAOYxW6A1YNIFp8w2ZY/PZKcNzSCiCF/g
-rVn+is8yoGzV
+E9aREPEQ6Ded8EKoejog9kh7qJ38vDa5+7hWpEeuy/csJ+JRdNNhedRWH9TXeDR+
+12GmbgRfWoR1XX7dN6btPaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFG+oPy7NjCXTyZOKRbrEx3hmPJptMB8GA1UdIwQYMBaAFA4K
+GGG0T3oxsx7moZWk/EmYKmFhMAoGCCqGSM49BAMCA0kAMEYCIQDffBxPYWlXfDNV
+5sm0duyGGL2nexiLkbyj6pV02e6OmAIhAIfoiSU6SbA7TE5Y4yB6sdVh1NJIQy2Z
+9mK1gwe67cvE
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der
index a984cc91df8387..33f25f58012bc2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem
index 0bffa695ed4502..ec138ddc2591aa 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHPwR1JafqJmyDQFJ0rNP1DaIOzl2oTJKITbF8SjKeOvoAoGCCqGSM49
-AwEHoUQDQgAEFHTP4riz3/QDoHNTwXudq2TNQ4JmbW03ZuF0qeEx9ctyEy3NyU5o
-fp+F+Fs92CL7CMey0dknt74kR1BAARZsLQ==
+MHcCAQEEINhJAVcujwL/wE9efTdlKYHJqyfOvmCGY78ztqPOyS93oAoGCCqGSM49
+AwEHoUQDQgAEE9aREPEQ6Ded8EKoejog9kh7qJ38vDa5+7hWpEeuy/csJ+JRdNNh
+edRWH9TXeDR+12GmbgRfWoR1XX7dN6btPQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der
index 6aec9bbb00f704..2325d8f0854bd1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem
index 8078ccac543c6d..19810aae42a67f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIC/cAUgBOTjIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIN8PbZJOFO4EwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASn2Mn3bT8apGi9WzWfX28v8BfVy47U
-I/ADklEojp5D7MdFerTUh3KQEe0ioKweRJkw65naMI6FhP27d73fhDfso2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQURYVQ
-RWKu0RdrvXtV5HkqV/EXDB8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKPBbEUmZrWbHi61AuEa/xda9EToTkkYExAd
-t5AEli44AiEA7zgCBeQ4Ax676kwLRPLCzQvTttLxh6c+f8y4bda7I2c=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQTkCR1ErcpIEeww8hoFOIs1nN7nIa3
+v4FTemkoYXRiYhXRhqPq2Ya/GAE5R8cSwFqQthweR9k6MPhgQIhKDZP1o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUDgoY
+YbRPejGzHuahlaT8SZgqYWEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgNI4iI7gLrLg7N8b1cHJgXD4RcUujR6sOClMx
+rYSUgYQCIBNEtXNqHbO1lJSj2alGHuOLTWY9rrN5RrvBDjtMMwbT
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der
index 5a94ee8a212f50..acdd77ef738d6e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem
index e88b9a8d929721..2d6da788a156b3 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBqGwzfAG/VZU+6gmGTwjNALCipCa23f91P9LhFQnB6HoAoGCCqGSM49
-AwEHoUQDQgAEp9jJ920/GqRovVs1n19vL/AX1cuO1CPwA5JRKI6eQ+zHRXq01Idy
-kBHtIqCsHkSZMOuZ2jCOhYT9u3e934Q37A==
+MHcCAQEEIKgIKaU8yo8RcqZdYPrufk5Cuz5bvuRr1QdRdA4ZvVHLoAoGCCqGSM49
+AwEHoUQDQgAEE5AkdRK3KSBHsMPIaBTiLNZze5yGt7+BU3ppKGF0YmIV0Yaj6tmG
+vxgBOUfHEsBakLYcHkfZOjD4YECISg2T9Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
index 022dfcad06e90f..eacc7f3e1a07cb 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id fild is not present and dac_origin_product_id is present.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202083ca2d93f62f03d2e300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041474cfe2b8b3dff403a07353c17b9dab64cd4382666d6d3766e174a9e131f5cb72132dcdc94e687e9f85f85b3dd822fb08c7b2d1d927b7be2447504001166c2da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414013562f221ef3542b975bfac0026af73e6f311d8301f0603551d230418301680144585504562aed1176bbd7b55e4792a57f1170c1f300a06082a8648ce3d0403020349003046022100bef45d881ce90cc961379933208f03710d2d43ce7295f80be3b92f551311579e022100e6315ba03560d205a7cc36658fcf64a70dcd20a2085fe0ad59fe8acf32a06cd5",
-    "pai_cert": "308201d53082017aa00302010202080bf70052004e4e32300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a7d8c9f76d3f1aa468bd5b359f5f6f2ff017d5cb8ed423f0039251288e9e43ecc7457ab4d487729011ed22a0ac1e449930eb99da308e8584fdbb77bddf8437eca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604144585504562aed1176bbd7b55e4792a57f1170c1f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a3c16c452666b59b1e2eb502e11aff175af444e84e491813101db79004962e38022100ef380205e438031ebbea4c0b44f2c2cd0bd3b6d2f187a73e7fccb86dd6bb2367",
-    "certification_declaration": "3082010606092a864886f70d010702a081f83081f5020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800250a0080360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b06bf38312df4bd88390de9af2c8e9f54ea98c4ef5ede8c54d16ae1b82c19ba402207a0844691a300b22cfde61aa1ab2ec7031201ee95b9e44a52ff0356703002088",
-    "dac_private_key": "73f047525a7ea266c83405274acd3f50da20ece5da84c92884db17c4a329e3af",
-    "dac_public_key": "041474cfe2b8b3dff403a07353c17b9dab64cd4382666d6d3766e174a9e131f5cb72132dcdc94e687e9f85f85b3dd822fb08c7b2d1d927b7be2447504001166c2d"
+    "dac_cert": "308201e53082018aa003020102020837973e57afd894bc300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000413d69110f110e8379df042a87a3a20f6487ba89dfcbc36b9fbb856a447aecbf72c27e25174d36179d4561fd4d778347ed761a66e045f5a84755d7edd37a6ed3da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146fa83f2ecd8c25d3c9938a45bac4c778663c9a6d301f0603551d230418301680140e0a1861b44f7a31b31ee6a195a4fc49982a6161300a06082a8648ce3d0403020349003046022100df7c1c4f6169577c3355e6c9b476ec8618bda77b188b91bca3ea9574d9ee8e9802210087e889253a49b03b4c4e58e3207ab1d561d4d248432d99f662b58307baedcbc4",
+    "pai_cert": "308201d33082017aa003020102020837c3db6493853b81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041390247512b7292047b0c3c86814e22cd6737b9c86b7bf81537a69286174626215d186a3ead986bf18013947c712c05a90b61c1e47d93a30f86040884a0d93f5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140e0a1861b44f7a31b31ee6a195a4fc49982a6161301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220348e2223b80bacb83b37c6f57072605c3e11714ba347ab0e0a5331ad8494818402201344b5736a1db3b59494a3d9a9461ee38b4d663daeb37946bbc10e3b4c3306d3",
+    "certification_declaration": "3082010606092a864886f70d010702a081f83081f5020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800250a0080360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220126f13eafead3c674a29d5f6cae02c6a8a42a75e6d50987f7ca6a5e988f2bf35022100bdd09b007cfe0d7576d510d0b11dfc11eded7f49ea61af12afc3df477eed8aff",
+    "dac_private_key": "d84901572e8f02ffc04f5e7d37652981c9ab27cebe608663bf33b6a3cec92f77",
+    "dac_public_key": "0413d69110f110e8379df042a87a3a20f6487ba89dfcbc36b9fbb856a447aecbf72c27e25174d36179d4561fd4d778347ed761a66e045f5a84755d7edd37a6ed3d"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der
index 79d91a71c099b1..17720cae56c52f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der
index 244d7bfc8cb72c..6fad516397c048 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem
index 44944c828af6a2..dc9ef8c6248228 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIFBryveui1dowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIFzxUc6nJ8oEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-+7zGBq2m55gQtztxoaQ6tPsz4b3Rwdgw1sjWyAb/5/AR+4P/GEl5UodEvb7gntfS
-3JjUGaWvWGEBC39cd4cJwqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKkUehZ6rjUqVrLupggel5mBnXMMMB8GA1UdIwQYMBaAFMhi
-ou2NWYW785NCE6OmZkPTK0fGMAoGCCqGSM49BAMCA0cAMEQCIFm5BkByqBFNTUpF
-Jv/t0sPtamfMUW5SUXBBVxzXrxfiAiBbwgc/c6rfG3xJisMJlD1SCmmH01WqILdq
-l0hlG5Zo5w==
+NwWonmb3xT+x/P4ey9UWM87KBZGwcUXHxPFH0rh+sWDD31CvVqThJ7IpNR63kV6j
+eOPT42qqiHckQGFy4oDAX6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFC/Takh6/cm2WZ1F7R0lkn+qS0o9MB8GA1UdIwQYMBaAFOzd
+NYioNpGQ43wdxDsg55UWUoS6MAoGCCqGSM49BAMCA0gAMEUCIQDU4izaqnmGpDM0
+IUtu4eYWop9VduLMevJYRoPJGKLC1gIgDO+9fvyEx2i/KFpVnx073VumhsmePmfg
+VTO+5zDfdTQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der
index bcc9ee4932c5de..7579d965fa0248 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem
index 48c8060f6b380f..3713cc0cae7a01 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGDCBI+Wdigz7UF33TIlBkfxBgNrOMAdbLn8u6xNIK1foAoGCCqGSM49
-AwEHoUQDQgAE+7zGBq2m55gQtztxoaQ6tPsz4b3Rwdgw1sjWyAb/5/AR+4P/GEl5
-UodEvb7gntfS3JjUGaWvWGEBC39cd4cJwg==
+MHcCAQEEIHSZgUawD8hnF9XJqXOoSB1Kst+XatzHhUdYHVecjY7MoAoGCCqGSM49
+AwEHoUQDQgAENwWonmb3xT+x/P4ey9UWM87KBZGwcUXHxPFH0rh+sWDD31CvVqTh
+J7IpNR63kV6jeOPT42qqiHckQGFy4oDAXw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der
index 1c769f245a9a4d..e6fe7997607876 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem
index 31bea54163a0d4..fc85bcefd1a86f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIFZApYO9UD6swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIaAV2pI71JRAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASuwNx1cCOUoFOh9RIDzQZ7AoEswYXB
-fkJvT3swJwpcTb5/gexJ1QeGThqqY/cY9sRutdf63rf0K3rv5+f0fMOIo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUyGKi
-7Y1Zhbvzk0ITo6ZmQ9MrR8YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgaN1KhSpaFuMrAZol9wnnytko6scC0q45/gsr
-ztTqpn4CIQCv+oPlDaifesfQZBit/+xjS5JwRwHEraskhVXW8KBY0g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ9AigDkzgFw7pcpgC0UoBl82OKFFCt
+gY2sC+nHwbsiQapUCLSkG5qX0jGoVCk18f1244gRsDY586ejcGRsX/zzo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7N01
+iKg2kZDjfB3EOyDnlRZShLowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIaAhAGgG7aTvWOeBirLbSOkcpIkAUIaCRq6
+/KFbL4QPAiEA6ru/+1su/ICzViB+T5jOZ0z1gqQtK8XR43kNNQW6vyM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der
index 98507a2207c8a3..7a2692d0ff3616 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem
index b362e1c937bf61..c019b24312e92e 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKx5rPIQh0I7bfgznssx0XKiCJIUODDwVZPhCu64fqFhoAoGCCqGSM49
-AwEHoUQDQgAErsDcdXAjlKBTofUSA80GewKBLMGFwX5Cb097MCcKXE2+f4HsSdUH
-hk4aqmP3GPbEbrXX+t639Ct67+fn9HzDiA==
+MHcCAQEEIBHrRyIKtaJR5EL5bbHqjllVxXu4ngVyzAK6SWMCEYZloAoGCCqGSM49
+AwEHoUQDQgAEPQIoA5M4BcO6XKYAtFKAZfNjihRQrYGNrAvpx8G7IkGqVAi0pBua
+l9IxqFQpNfH9duOIEbA2OfOno3BkbF/88w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json
index 03279780f4b696..ec0708143802e6 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields are not present.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa0030201020208141af2bdeba2d5da300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fbbcc606ada6e79810b73b71a1a43ab4fb33e1bdd1c1d830d6c8d6c806ffe7f011fb83ff184979528744bdbee09ed7d2dc98d419a5af5861010b7f5c778709c2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a9147a167aae352a56b2eea6081e9799819d730c301f0603551d23041830168014c862a2ed8d5985bbf3934213a3a66643d32b47c6300a06082a8648ce3d0403020347003044022059b9064072a8114d4d4a4526ffedd2c3ed6a67cc516e52517041571cd7af17e202205bc2073f73aadf1b7c498ac309943d520a6987d355aa20b76a9748651b9668e7",
-    "pai_cert": "308201d43082017aa003020102020815902960ef540fab300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004aec0dc75702394a053a1f51203cd067b02812cc185c17e426f4f7b30270a5c4dbe7f81ec49d507864e1aaa63f718f6c46eb5d7fadeb7f42b7aefe7e7f47cc388a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c862a2ed8d5985bbf3934213a3a66643d32b47c6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022068dd4a852a5a16e32b019a25f709e7cad928eac702d2ae39fe0b2bced4eaa67e022100affa83e50da89f7ac7d06418adffec634b92704701c4adab248555d6f0a058d2",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203d016d2d0934828cd314d7fdb19a88a9ad55d4fabcc213b50531d79a3bd85c77022100d755e7bbbbedae040ddeee8688dd54889d0e2ad3980ee118c63ebebc7071b04b",
-    "dac_private_key": "60c2048f96762833ed4177dd32250647f106036b38c01d6cb9fcbbac4d20ad5f",
-    "dac_public_key": "04fbbcc606ada6e79810b73b71a1a43ab4fb33e1bdd1c1d830d6c8d6c806ffe7f011fb83ff184979528744bdbee09ed7d2dc98d419a5af5861010b7f5c778709c2"
+    "dac_cert": "308201e43082018aa0030201020208173c5473a9c9f281300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043705a89e66f7c53fb1fcfe1ecbd51633ceca0591b07145c7c4f147d2b87eb160c3df50af56a4e127b229351eb7915ea378e3d3e36aaa887724406172e280c05fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142fd36a487afdc9b6599d45ed1d25927faa4b4a3d301f0603551d23041830168014ecdd3588a8369190e37c1dc43b20e795165284ba300a06082a8648ce3d0403020348003045022100d4e22cdaaa7986a43334214b6ee1e616a29f5576e2cc7af2584683c918a2c2d602200cefbd7efc84c768bf285a559f1d3bdd5ba686c99e3e67e05533bee730df7534",
+    "pai_cert": "308201d53082017aa0030201020208680576a48ef52510300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043d022803933805c3ba5ca600b4528065f3638a1450ad818dac0be9c7c1bb2241aa5408b4a41b9a97d231a8542935f1fd76e38811b03639f3a7a370646c5ffcf3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ecdd3588a8369190e37c1dc43b20e795165284ba301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210086808401a01bb693bd639e062acb6d23a472922401421a091abafca15b2f840f022100eabbbffb5b2efc80b356207e4f98ce674cf582a42d2bc5d1e3790d3505babf23",
+    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022062a5599b044e3d22014801194c59118145f4e8e2fa98188356426e232b497aaa0220293921578e23e3d85dc9df00226b8aa4ef3cfc5ebd04d4c9fe288721a6b93420",
+    "dac_private_key": "74998146b00fc86717d5c9a973a8481d4ab2df976adcc78547581d579c8d8ecc",
+    "dac_public_key": "043705a89e66f7c53fb1fcfe1ecbd51633ceca0591b07145c7c4f147d2b87eb160c3df50af56a4e127b229351eb7915ea378e3d3e36aaa887724406172e280c05f"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der
index 916e779cfab009..cf7a8f036274d5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der
index 0de6ac486c358f..9856168f56fa5d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem
index 194a33a695b9a8..ece9389db67033 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIL2kTwFJl2V8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIILY2cVqGzLVYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-h5a981lmF1DUvSGaSodCkoIL1xhJbTiHZjpG7Eeznnq7mOJf1UyiiklTB8xmBGCl
-CvWOYhOHBuKVazShKfD2oaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFPgwlK+pBJV52h44H5yyRhzwwaM0MB8GA1UdIwQYMBaAFDjM
-tJZSoxpks80SAXp7q17/fEALMAoGCCqGSM49BAMCA0cAMEQCIF0/s09Fe2SmDBE6
-EY7YAteYZSbGTc1Zo7I1RFTAWOWjAiBworHn7cr5buEquOslTq+q/Rx/ZaPEb1rl
-SkH21Ra0EA==
+xus3QGDvf25ZyvScm3itALu5C7gyeAB+nQcvqFmg0XxXds8lMThUDKCaGCUyUR8a
+NO/xcmBPH/rf4+nwrzVFkKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFG2VAgwn4ERoASi3Xo+9yfnc9n/YMB8GA1UdIwQYMBaAFEe6
+9EsY7aJOg7cB4ksA+z1q6qvHMAoGCCqGSM49BAMCA0kAMEYCIQC3AiriaqkEARhu
+dK0cE/EcCsVNnqrRvNwHEJ5+fyp/LgIhAO0zviDtXCs+sJnyXymfMF7rpbhv/3fK
+2zjETEu4l3x7
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der
index 8ab8f6ffe08394..1cfd238785054e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem
index bf83136887f946..36d768b1cd3056 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHknMdCWK5I8Vj4A8xNlIH2VpO9UoZd23Cb3kdvK4o4woAoGCCqGSM49
-AwEHoUQDQgAEh5a981lmF1DUvSGaSodCkoIL1xhJbTiHZjpG7Eeznnq7mOJf1Uyi
-iklTB8xmBGClCvWOYhOHBuKVazShKfD2oQ==
+MHcCAQEEIEKsAC1GNU5otNnBgH1vsqARYUJXPVQeczz7wEm6GlTcoAoGCCqGSM49
+AwEHoUQDQgAExus3QGDvf25ZyvScm3itALu5C7gyeAB+nQcvqFmg0XxXds8lMThU
+DKCaGCUyUR8aNO/xcmBPH/rf4+nwrzVFkA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der
index ae2214f17a57a9..455e245ba52d37 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem
index a9c9f9449216a8..e5d512f58b4bcb 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIK3lXIPSYT5MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIf/UiU84qYy0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATwFy9vHDGsCNLbs9ZS/c3RBnyX1x9k
-chUoCME5i5WBouO4SgEYb3l1r6/A4Z5irnnLv8RH1GOp5sM8bDpNHp98o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUOMy0
-llKjGmSzzRIBenurXv98QAswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgJ7c8hx7jvKb2gwMuWfEj++6lb/itCALDMDRA
-ziV+u5ACIQC6vn4hkFA4RKLfGELD3d4AspMQGQkjwto/25k3cOhqmg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASQJ7ef2USioSL7qiT2l4z+XDSX6cuo
+o+sxvBC2VZyjQx6vRa89bLrvhjcwUWaglveGsKSQnH5ghsq7fQiQKaG/o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR7r0
+Sxjtok6DtwHiSwD7PWrqq8cwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAPtozGKjANywu/VOvoJ1avlKVMxh6qbAKysA
+x24/odjEAiA+UcWqD9oHZtKapLtvvhlNsCU8tWIHtxFDose6ebI7ig==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der
index 88efe1bc074e5f..67d0efd48f40f0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem
index 110b8a4f96c224..f378418954fa57 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKOHNUl0RM8IxDsEO9tRtCIrYgYTB7x84BBvbtormSY1oAoGCCqGSM49
-AwEHoUQDQgAE8BcvbxwxrAjS27PWUv3N0QZ8l9cfZHIVKAjBOYuVgaLjuEoBGG95
-da+vwOGeYq55y7/ER9RjqebDPGw6TR6ffA==
+MHcCAQEEIMRbyq0BucetfRDLzNLcSXSluV10goA4Zo2uvdj/gh/xoAoGCCqGSM49
+AwEHoUQDQgAEkCe3n9lEoqEi+6ok9peM/lw0l+nLqKPrMbwQtlWco0Mer0WvPWy6
+74Y3MFFmoJb3hrCkkJx+YIbKu30IkCmhvw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json
index fa2eaa5aff63d1..6dd2ca5da1c00f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields present and contain the VID and PID values that match the VID and PID found in the DAC Subject DN.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa00302010202082f6913c05265d95f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048796bdf359661750d4bd219a4a874292820bd718496d3887663a46ec47b39e7abb98e25fd54ca28a495307cc660460a50af58e62138706e2956b34a129f0f6a1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f83094afa9049579da1e381f9cb2461cf0c1a334301f0603551d2304183016801438ccb49652a31a64b3cd12017a7bab5eff7c400b300a06082a8648ce3d040302034700304402205d3fb34f457b64a60c113a118ed802d7986526c64dcd59a3b2354454c058e5a3022070a2b1e7edcaf96ee12ab8eb254eafaafd1c7f65a3c46f5ae54a41f6d516b410",
-    "pai_cert": "308201d43082017aa00302010202082b795720f4984f93300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f0172f6f1c31ac08d2dbb3d652fdcdd1067c97d71f6472152808c1398b9581a2e3b84a01186f7975afafc0e19e62ae79cbbfc447d463a9e6c33c6c3a4d1e9f7ca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041438ccb49652a31a64b3cd12017a7bab5eff7c400b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022027b73c871ee3bca6f683032e59f123fbeea56ff8ad0802c3303440ce257ebb90022100babe7e2190503844a2df1842c3ddde00b29310190923c2da3fdb993770e86a9a",
-    "certification_declaration": "3082010906092a864886f70d010702a081fb3081f8020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff250a0080360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402205b07a7bac8aa6db5e79a1a0471b6c33b07b0f4ea8da7e6d9e35dfe3bbbbae7df0220449e2667909b442fcb65943def9b26db2f9aaae4701a9d36312798b1c4c26bc2",
-    "dac_private_key": "792731d0962b923c563e00f31365207d95a4ef54a19776dc26f791dbcae28e30",
-    "dac_public_key": "048796bdf359661750d4bd219a4a874292820bd718496d3887663a46ec47b39e7abb98e25fd54ca28a495307cc660460a50af58e62138706e2956b34a129f0f6a1"
+    "dac_cert": "308201e53082018aa00302010202082d8d9c56a1b32d56300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c6eb374060ef7f6e59caf49c9b78ad00bbb90bb83278007e9d072fa859a0d17c5776cf253138540ca09a182532511f1a34eff172604f1ffadfe3e9f0af354590a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146d95020c27e044680128b75e8fbdc9f9dcf67fd8301f0603551d2304183016801447baf44b18eda24e83b701e24b00fb3d6aeaabc7300a06082a8648ce3d0403020349003046022100b7022ae26aa90401186e74ad1c13f11c0ac54d9eaad1bcdc07109e7e7f2a7f2e022100ed33be20ed5c2b3eb099f25f299f305eeba5b86fff77cadb38c44c4bb8977c7b",
+    "pai_cert": "308201d43082017aa00302010202087ff52253ce2a632d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049027b79fd944a2a122fbaa24f6978cfe5c3497e9cba8a3eb31bc10b6559ca3431eaf45af3d6cbaef8637305166a096f786b0a4909c7e6086cabb7d089029a1bfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041447baf44b18eda24e83b701e24b00fb3d6aeaabc7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100fb68cc62a300dcb0bbf54ebe82756af94a54cc61eaa6c02b2b00c76e3fa1d8c402203e51c5aa0fda0766d29aa4bb6fbe194db0253cb56207b71143a2c7ba79b23b8a",
+    "certification_declaration": "3082010a06092a864886f70d010702a081fc3081f9020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff250a0080360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100eb0602ea25f357700d6f39582d2cc273764fd7a48d4f78b672471c173b0fc59902202029f73f5cb06d0dce4b872ffb61559d6d83d3a7b6d7448022e2f0b32bf7fd55",
+    "dac_private_key": "42ac002d46354e68b4d9c1807d6fb2a0116142573d541e733cfbc049ba1a54dc",
+    "dac_public_key": "04c6eb374060ef7f6e59caf49c9b78ad00bbb90bb83278007e9d072fa859a0d17c5776cf253138540ca09a182532511f1a34eff172604f1ffadfe3e9f0af354590"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der
index 9b0964bc3dae09..ba396736737841 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der
index 3ef51b47dd24ab..b3055d781f8fc2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem
index f5db07dbeebf8d..e29ad1354f73f3 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIClEuk5qM4AgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIRT4kWtqebgIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-iw3y9n8cLpR2bq8E7cajlZ7uwblFB8r1/UzL2gO5UrfcIO19Ub/vd+DaOSZ0NEB9
-4hCnN+2lv3Uzqg64RDlMhqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHsy91L5Nb18Hplb3UWFOsis98ACMB8GA1UdIwQYMBaAFOY1
-KVMOQ8gu5e/Vffixn8UHaTlOMAoGCCqGSM49BAMCA0gAMEUCIA6BHAMaswlm/KTl
-9CKuH1Q3bXGRt2DPnpGO0T64UdK+AiEA4o5E4mOuldG2guM6QvWwcn8MqfgEoaWd
-wgPmSfqKglc=
+KmN1yIIGzgi2b0nV1iHeDJVw8c/xaMAnAd/3kd/K+McCI6zStMr+NRf3XcaCWl2A
+1KSH39/lRFbK2ylhqRC1XaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFOH57la50tXT+kz+ziG+ba1B/qAdMB8GA1UdIwQYMBaAFP0J
+pVBELan2bsfbUN0DvyguZFopMAoGCCqGSM49BAMCA0gAMEUCIQC5oJ4pxJQ0wHLg
+qwO4d1rmhCnY5Bydd+8ZsFHfOtn8OwIgelpUZZlfOir18vw4I81w/3V1N0yegzhe
+yR7dWTzYTyE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der
index 4baaad9b46f82a..16e737757106fe 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem
index 2c133fbf7ad4bc..0c31a2896fb965 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEj0X+pnTDSRkJrrpKILvXawNJAiTJgJljn2b9w8kdkfoAoGCCqGSM49
-AwEHoUQDQgAEiw3y9n8cLpR2bq8E7cajlZ7uwblFB8r1/UzL2gO5UrfcIO19Ub/v
-d+DaOSZ0NEB94hCnN+2lv3Uzqg64RDlMhg==
+MHcCAQEEIFig2eRdcriJq/J0Yw2p7hXf0B3oZy/O6l8glWcl39oZoAoGCCqGSM49
+AwEHoUQDQgAEKmN1yIIGzgi2b0nV1iHeDJVw8c/xaMAnAd/3kd/K+McCI6zStMr+
+NRf3XcaCWl2A1KSH39/lRFbK2ylhqRC1XQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der
index e5b2b1cc640696..f63967c578590a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem
index 39c039cb3820c3..3a2268926fc01f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIINAseX9srVKQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIcCw2uR6umbUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARMv/bgf/rF2Xqd5X8ZHGf6LyQ7Z0TL
-LcocqRXBe2eKYTbuAWO7WixLKwDXqJxo2PpuMGs1xluZunGJ/D8kcATXo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU5jUp
-Uw5DyC7l79V9+LGfxQdpOU4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgAgJa6/thQiQiRSPfrsmBIspEMVdfnWuqc3ni
-EGfcH/4CIAcL4OwMS3Oii2FW1QN6rzHFX+e8feUvEGOaO5xym6Md
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATjSmDky9WaBBXc9t5wKUB32/dlTXiL
+mZNRFF5Sh7SlDQp58LIFKTDZHtAY2Om0GG2warl0Dys8AitPzgeX88yCo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU/Qml
+UEQtqfZux9tQ3QO/KC5kWikwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMCzRaMQqGYbSyklQjOEDhpfjrvgpNM/2Y/i
+nbE/OEkvAiAV3I6Aw2EGRCarotOtszzb/uobjDDAa/FTpRI495ihFQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der
index 66c2596447eb53..e47350fa2d632e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem
index 8cf3ee29b48910..2d71b1dd0d9914 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICXupILzHXU7bq6WuXPN7J4MFtOo/paC6aSy6XQH5htRoAoGCCqGSM49
-AwEHoUQDQgAETL/24H/6xdl6neV/GRxn+i8kO2dEyy3KHKkVwXtnimE27gFju1os
-SysA16icaNj6bjBrNcZbmbpxifw/JHAE1w==
+MHcCAQEEIJdGMXh1zEChNZAX3emOYdk2UMq5VaVjbt91GhfkYKOuoAoGCCqGSM49
+AwEHoUQDQgAE40pg5MvVmgQV3PbecClAd9v3ZU14i5mTURReUoe0pQ0KefCyBSkw
+2R7QGNjptBhtsGq5dA8rPAIrT84Hl/PMgg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json
index 1f852b14881286..751d9f1b8bab14 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields present and the PID value doesn't match the PID found in the DAC Subject DN.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202080a512e939a8ce008300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048b0df2f67f1c2e94766eaf04edc6a3959eeec1b94507caf5fd4ccbda03b952b7dc20ed7d51bfef77e0da39267434407de210a737eda5bf7533aa0eb844394c86a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147b32f752f935bd7c1e995bdd45853ac8acf7c002301f0603551d23041830168014e63529530e43c82ee5efd57df8b19fc50769394e300a06082a8648ce3d040302034800304502200e811c031ab30966fca4e5f422ae1f54376d7191b760cf9e918ed13eb851d2be022100e28e44e263ae95d1b682e33a42f5b0727f0ca9f804a1a59dc203e649fa8a8257",
-    "pai_cert": "308201d33082017aa0030201020208340b1e5fdb2b54a4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044cbff6e07ffac5d97a9de57f191c67fa2f243b6744cb2dca1ca915c17b678a6136ee0163bb5a2c4b2b00d7a89c68d8fa6e306b35c65b99ba7189fc3f247004d7a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414e63529530e43c82ee5efd57df8b19fc50769394e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022002025aebfb614224224523dfaec98122ca4431575f9d6baa7379e21067dc1ffe0220070be0ec0c4b73a28b6156d5037aaf31c55fe7bc7de52f10639a3b9c729ba31d",
-    "certification_declaration": "3082010a06092a864886f70d010702a081fc3081f9020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022007112bef07d67f28e5987f0681e7ff3315991e0e208a470fbb83a1c9ac56258d022100cc173ee88366038a3fbbee34323eda9e8796f66df5d0f12bae0bffa76b9bbb36",
-    "dac_private_key": "48f45fea674c3491909aeba4a20bbd76b03490224c98099639f66fdc3c91d91f",
-    "dac_public_key": "048b0df2f67f1c2e94766eaf04edc6a3959eeec1b94507caf5fd4ccbda03b952b7dc20ed7d51bfef77e0da39267434407de210a737eda5bf7533aa0eb844394c86"
+    "dac_cert": "308201e43082018aa0030201020208453e245ada9e6e02300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042a6375c88206ce08b66f49d5d621de0c9570f1cff168c02701dff791dfcaf8c70223acd2b4cafe3517f75dc6825a5d80d4a487dfdfe54456cadb2961a910b55da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e1f9ee56b9d2d5d3fa4cfece21be6dad41fea01d301f0603551d23041830168014fd09a550442da9f66ec7db50dd03bf282e645a29300a06082a8648ce3d0403020348003045022100b9a09e29c49434c072e0ab03b8775ae68429d8e41c9d77ef19b051df3ad9fc3b02207a5a5465995f3a2af5f2fc3823cd70ff7575374c9e83385ec91edd593cd84f21",
+    "pai_cert": "308201d43082017aa0030201020208702c36b91eae99b5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e34a60e4cbd59a0415dcf6de70294077dbf7654d788b999351145e5287b4a50d0a79f0b2052930d91ed018d8e9b4186db06ab9740f2b3c022b4fce0797f3cc82a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414fd09a550442da9f66ec7db50dd03bf282e645a29301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c0b345a310a8661b4b29254233840e1a5f8ebbe0a4d33fd98fe29db13f38492f022015dc8e80c361064426aba2d3adb33cdbfeea1b8c30c06bf153a51238f798a115",
+    "certification_declaration": "3082010b06092a864886f70d010702a081fd3081fa020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008d2087a64f755602d132c9c05c688240ba27b9153081c9fc49c92b92f6654ab2022100cecabcaed42bee5021cdc4d79a5208f74c6d80f70b734983bb467e5ef896b4da",
+    "dac_private_key": "58a0d9e45d72b889abf274630da9ee15dfd01de8672fceea5f20956725dfda19",
+    "dac_public_key": "042a6375c88206ce08b66f49d5d621de0c9570f1cff168c02701dff791dfcaf8c70223acd2b4cafe3517f75dc6825a5d80d4a487dfdfe54456cadb2961a910b55d"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der
index e15bcf7089181e..8fa15c6e6cadd6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der
index 9087896f369b60..123d0e13447c8e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem
index 3a9a2f6311b374..1a477e2f2c34e6 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIZvUWJmJPJuIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIDsFM3tIJY4swCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-JRcrpgHlOa8iwCX17lkRWjxhdMHDxOTbZHDlv3w5fUOh96oHFBWoLo2ulajTmHHk
-TiR3ZoWfFAoUZyB/XyfsgKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFPTUaQ2L83aRP/xiYfQZM8Q6XPvRMB8GA1UdIwQYMBaAFHgB
-wEBGn+ekZQPSg36fnJcnI5fhMAoGCCqGSM49BAMCA0gAMEUCIQCw0tR3AO8b+TP3
-dy0epqTcvle+Ta7WG7hrJxOMc+1CxwIgbo79w7/fJOF90KjyAIwal+RXSV4y4YU3
-9ZIMYpiTxSM=
+AXrv8SGerAMB0umDpkw0RkGC9tk0Wgm9Fj//mTGkMv1WtOHYq7JilR/hAE5xfQEm
+gCJylor+Wzq1xeiz82FQvaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFLuoTj16HS8QeU0WlWb4Zk2K98cMB8GA1UdIwQYMBaAFBNS
+Cn8R5nJg29yvQomKtOtz/eb2MAoGCCqGSM49BAMCA0gAMEUCIEXg3crNC3uPjBkk
+rOrnYsK0leM2N+vH6U2S8c9lTNCcAiEAjou8RTa4qdP3ZMWNen4GKkBa6Ej29JCb
+unyek5Ciny4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der
index 6750824aaf7b6f..0353af8b8d44c9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem
index 3f02ea7a5136a1..81807d91112f8f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIACF70lsdafBLNTQMcM/WsVMb6pFp6Pt9ZMMhUDXBGl3oAoGCCqGSM49
-AwEHoUQDQgAEJRcrpgHlOa8iwCX17lkRWjxhdMHDxOTbZHDlv3w5fUOh96oHFBWo
-Lo2ulajTmHHkTiR3ZoWfFAoUZyB/XyfsgA==
+MHcCAQEEIB7gZ5Os8e+U1DgNTVVmA1X8X12fdEmKEwv7P083LVYboAoGCCqGSM49
+AwEHoUQDQgAEAXrv8SGerAMB0umDpkw0RkGC9tk0Wgm9Fj//mTGkMv1WtOHYq7Ji
+lR/hAE5xfQEmgCJylor+Wzq1xeiz82FQvQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der
index 46be24550c0c71..8627d8fd2eb175 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem
index 7cca94bc711cdc..559246babf35e8 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIaCFGD5Isg/wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIEkkAf5kui6UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT3ZAvXWzRfYC0lnsfCz5iLOoB+ccvr
-HIZdAxfCH/Ye3kX8o4v/3aHfAdnLRJw0xAA07YsoepvFxBaL6qRmGJkho2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeAHA
-QEaf56RlA9KDfp+clycjl+EwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAOQX7xz4YLTzvKl4S/cQj+/CRbMEBc+PA1lP
-gk+ntrThAiEAi0NJr6KsO3kNuzoPLNSof4AcKv+C8rylj6/BbAzwibo=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHdSDVMCer9ll8DNTEr9lpXtwxesoQ
+rJyOlpcAyY9I8X63Y3VJum4/7NVTHnO2loDQPJiW0IwrM9DByFsDKuOGo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUE1IK
+fxHmcmDb3K9CiYq063P95vYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJwY6s0x3FOWHbEGyvO6XX9pgBCGxAZ4OKCu
+nYW98gt3AiBgxjnTvVrMRSikYBvYJPFFV0QAUjsDAEpHGbZoStPYow==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der
index b18961d447575f..339d0c603427e8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem
index 4a3c5fb4d648e7..ad6d29e4a33662 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM4/RxmHxCsDzF3g2JSdMAvoZV94b9yhO9lknRRhOH0soAoGCCqGSM49
-AwEHoUQDQgAE92QL11s0X2AtJZ7Hws+YizqAfnHL6xyGXQMXwh/2Ht5F/KOL/92h
-3wHZy0ScNMQANO2LKHqbxcQWi+qkZhiZIQ==
+MHcCAQEEIHDVH7Z/IMDtl2ZSlvWAZ78r+ipjwC5qgB3HgM3g4HQLoAoGCCqGSM49
+AwEHoUQDQgAEB3Ug1TAnq/ZZfAzUxK/ZaV7cMXrKEKycjpaXAMmPSPF+t2N1Sbpu
+P+zVUx5ztpaA0DyYltCMKzPQwchbAyrjhg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json
index 5b2f3d761346a1..b9b7e0006e69eb 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields present and the VID value doesn't match the VID found in the DAC Subject DN.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020866f51626624f26e2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000425172ba601e539af22c025f5ee59115a3c6174c1c3c4e4db6470e5bf7c397d43a1f7aa071415a82e8dae95a8d39871e44e247766859f140a1467207f5f27ec80a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f4d4690d8bf376913ffc6261f41933c43a5cfbd1301f0603551d230418301680147801c040469fe7a46503d2837e9f9c97272397e1300a06082a8648ce3d0403020348003045022100b0d2d47700ef1bf933f7772d1ea6a4dcbe57be4daed61bb86b27138c73ed42c702206e8efdc3bfdf24e17dd0a8f2008c1a97e457495e32e18537f5920c629893c523",
-    "pai_cert": "308201d53082017aa00302010202086821460f922c83fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f7640bd75b345f602d259ec7c2cf988b3a807e71cbeb1c865d0317c21ff61ede45fca38bffdda1df01d9cb449c34c40034ed8b287a9bc5c4168beaa466189921a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604147801c040469fe7a46503d2837e9f9c97272397e1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e417ef1cf860b4f3bca9784bf7108fefc245b30405cf8f03594f824fa7b6b4e10221008b4349afa2ac3b790dbb3a0f2cd4a87f801c2aff82f2bca58fafc16c0cf089ba",
-    "certification_declaration": "3082010b06092a864886f70d010702a081fd3081fa020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100a423ae3c91c27d56d4091dacd4a1f7d97373f9cc13f7eb97a1ab173cf3709264022100d1b217747980c9ffe28b451d75608f6ff000a2c29e0aabb478ffa473c727604a",
-    "dac_private_key": "0085ef496c75a7c12cd4d031c33f5ac54c6faa45a7a3edf5930c8540d7046977",
-    "dac_public_key": "0425172ba601e539af22c025f5ee59115a3c6174c1c3c4e4db6470e5bf7c397d43a1f7aa071415a82e8dae95a8d39871e44e247766859f140a1467207f5f27ec80"
+    "dac_cert": "308201e43082018aa00302010202080ec14cded209638b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004017aeff1219eac0301d2e983a64c34464182f6d9345a09bd163fff9931a432fd56b4e1d8abb262951fe1004e717d0126802272968afe5b3ab5c5e8b3f36150bda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041452eea138f5e874bc41e5345a559be199362bdf1c301f0603551d2304183016801413520a7f11e67260dbdcaf42898ab4eb73fde6f6300a06082a8648ce3d0403020348003045022045e0ddcacd0b7b8f8c1924aceae762c2b495e33637ebc7e94d92f1cf654cd09c0221008e8bbc4536b8a9d3f764c58d7a7e062a405ae848f6f4909bba7c9e9390a29f2e",
+    "pai_cert": "308201d43082017aa00302010202081249007f992e8ba5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004077520d53027abf6597c0cd4c4afd9695edc317aca10ac9c8e969700c98f48f17eb7637549ba6e3fecd5531e73b69680d03c9896d08c2b33d0c1c85b032ae386a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041413520a7f11e67260dbdcaf42898ab4eb73fde6f6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009c18eacd31dc53961db106caf3ba5d7f69801086c4067838a0ae9d85bdf20b77022060c639d3bd5acc4528a4601bd824f145574400523b03004a4719b6684ad3d8a3",
+    "certification_declaration": "3082010b06092a864886f70d010702a081fd3081fa020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210098274181c3c7282114426896d0f510d31d39d32d228f13fb14507b92107913eb0221008c33978b88ca12c79eba51d9fd2de9c0476c139344479589b66e999773e078b6",
+    "dac_private_key": "1ee06793acf1ef94d4380d4d55660355fc5f5d9f74498a130bfb3f4f372d561b",
+    "dac_public_key": "04017aeff1219eac0301d2e983a64c34464182f6d9345a09bd163fff9931a432fd56b4e1d8abb262951fe1004e717d0126802272968afe5b3ab5c5e8b3f36150bd"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der
index 9b1a87d2b16630..e35ccbf304d19e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der
index fe174896274356..2fc94874264961 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem
index 026286ddb0de3b..b6f269fca6d833 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIITpeKQOtSc8gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIQyOd5XAjakEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-rnkLQ4V4RMDftZ5PevxSbss+Y+hxvEn9yqxy0vxkPzRpRw/NSUX5KIIejctMD0xG
-gVWdcZd8zyvNWUX0+dDSqaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFPdta+27l/2heXA1N4m8hZCZ4SjQMB8GA1UdIwQYMBaAFBUR
-JJg6Ho/F9wBFtXhhybLuHekiMAoGCCqGSM49BAMCA0cAMEQCIC8lAPU1eoExnm9C
-Vh4NKs/z03aldtF8FKk4gNNU+GqQAiAtXgwTrWB7JjvJTd3vRkuFh2b50dp6bxad
-d6bO8UPBrA==
+i9/WKm1va8vLvk/2f0Rla4+pgBAhXr/KmdXKK+tgLnEv+1I57VQ6as2ZOExWdR8F
+zvA2GDN/5hjTLt7vj9EfH6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFHfZPcc5eAWFp87Y7ll5Sr4xd0BOMB8GA1UdIwQYMBaAFKjQ
+bUQc6OS7QqGPJuSXCW4Vxb3TMAoGCCqGSM49BAMCA0gAMEUCIQDB1Ldt+M9bWKrw
+lfFIvyt1NjbyvwnOWqPO0aiUpZvUWAIgSNDch0WXeXQDyfCA2su71fWaUXESdPU0
+AK6Tp+D/+Bk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der
index d80533ec35184c..1298c82dde7081 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem
index a1a406e040ddba..2ccd459e2a66d6 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDAlLmaeMzrFYCcJPaALCwafOJ7gbzhKEbkljW+1fDbuoAoGCCqGSM49
-AwEHoUQDQgAErnkLQ4V4RMDftZ5PevxSbss+Y+hxvEn9yqxy0vxkPzRpRw/NSUX5
-KIIejctMD0xGgVWdcZd8zyvNWUX0+dDSqQ==
+MHcCAQEEIPUb6ojwF7CDfTBbygk9is2oJp7s+izujkZLoCcTi1sMoAoGCCqGSM49
+AwEHoUQDQgAEi9/WKm1va8vLvk/2f0Rla4+pgBAhXr/KmdXKK+tgLnEv+1I57VQ6
+as2ZOExWdR8FzvA2GDN/5hjTLt7vj9EfHw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der
index 063ed82d1b79d0..242f5047c54e66 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem
index 4983663f7538fd..5c267ae9c4bcc4 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIITtLKkw7Xm3owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIOSDwDhfeWa8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQedsBuhSznsAXmsrhFonJgmdua2vl1
-dw/JBhfhT/lLaGh2KXovU6p98cTMPC3NIAwd75aNNEhAaNM2UkJFmFfGo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUFREk
-mDoej8X3AEW1eGHJsu4d6SIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgLaBXOm+qxEB3mljBleVuvECw/1hVUME1raK+
-GJ33A1QCIQDs7JoX6WS+ovuZrmMXvRDH0dMGe4isEpebn4rhFuRFKA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdXNS9aez7/ohTq+i7R3lMJosQMBoD
+JlS8vVSf3d/ItY3BkEyLo7SxbfKkjFrGoup1id18ynM3TwRZjJx8jKnEo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUqNBt
+RBzo5LtCoY8m5JcJbhXFvdMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgAIrQaxC8Mvxvh3R8udsX1X9lsLa/0Xqsk4zH
+6Hy6qxECIQDU4bQooJ5JjX0I5xPOUL3+iti149GYFjP3eXJ5gPArFQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der
index bed64e8b43c157..87784c29ae3599 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem
index a191c10a4d8576..a94876f785c3b8 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICZHYDKWFEPm2D3DFhNt/vINCKDoBIbDMPrSvoL5qb3AoAoGCCqGSM49
-AwEHoUQDQgAEHnbAboUs57AF5rK4RaJyYJnbmtr5dXcPyQYX4U/5S2hodil6L1Oq
-ffHEzDwtzSAMHe+WjTRIQGjTNlJCRZhXxg==
+MHcCAQEEIGBR+MQga37w9rNFc8sfM2MC1l0RE62vhYjnIK1v4I+koAoGCCqGSM49
+AwEHoUQDQgAEXVzUvWns+/6IU6vou0d5TCaLEDAaAyZUvL1Un93fyLWNwZBMi6O0
+sW3ypIxaxqLqdYndfMpzN08EWYycfIypxA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json
index 17060cdefe779e..2726ec7eaa71da 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id fild is present and dac_origin_product_id fields is not present.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202084e978a40eb5273c8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ae790b43857844c0dfb59e4f7afc526ecb3e63e871bc49fdcaac72d2fc643f3469470fcd4945f928821e8dcb4c0f4c4681559d71977ccf2bcd5945f4f9d0d2a9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f76d6bedbb97fda17970353789bc859099e128d0301f0603551d23041830168014151124983a1e8fc5f70045b57861c9b2ee1de922300a06082a8648ce3d040302034700304402202f2500f5357a81319e6f42561e0d2acff3d376a576d17c14a93880d354f86a9002202d5e0c13ad607b263bc94dddef464b858766f9d1da7a6f169d77a6cef143c1ac",
-    "pai_cert": "308201d43082017aa00302010202084ed2ca930ed79b7a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041e76c06e852ce7b005e6b2b845a2726099db9adaf975770fc90617e14ff94b686876297a2f53aa7df1c4cc3c2dcd200c1def968d34484068d3365242459857c6a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414151124983a1e8fc5f70045b57861c9b2ee1de922301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502202da0573a6faac440779a58c195e56ebc40b0ff585550c135ada2be189df70354022100ecec9a17e964bea2fb99ae6317bd10c7d1d3067b88ac12979b9f8ae116e44528",
-    "certification_declaration": "3082010606092a864886f70d010702a081f83081f5020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220057d8dcc397b75d7e74e5777b5627e44b221385c509d9131cf7da30b0dcf1df9022100e4b356d30d9db3910dbacaafd055f9f59de4538f158661b7eec3a1b53f1e107c",
-    "dac_private_key": "30252e669e333ac56027093da00b0b069f389ee06f384a11b9258d6fb57c36ee",
-    "dac_public_key": "04ae790b43857844c0dfb59e4f7afc526ecb3e63e871bc49fdcaac72d2fc643f3469470fcd4945f928821e8dcb4c0f4c4681559d71977ccf2bcd5945f4f9d0d2a9"
+    "dac_cert": "308201e43082018aa003020102020843239de570236a41300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048bdfd62a6d6f6bcbcbbe4ff67f44656b8fa98010215ebfca99d5ca2beb602e712ffb5239ed543a6acd99384c56751f05cef03618337fe618d32edeef8fd11f1fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041477d93dc739780585a7ced8ee59794abe3177404e301f0603551d23041830168014a8d06d441ce8e4bb42a18f26e497096e15c5bdd3300a06082a8648ce3d0403020348003045022100c1d4b76df8cf5b58aaf095f148bf2b753636f2bf09ce5aa3ced1a894a59bd458022048d0dc874597797403c9f080dacbbbd5f59a51711274f53400ae93a7e0fff819",
+    "pai_cert": "308201d43082017aa00302010202083920f00e17de59af300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d5cd4bd69ecfbfe8853abe8bb47794c268b10301a032654bcbd549fdddfc8b58dc1904c8ba3b4b16df2a48c5ac6a2ea7589dd7cca73374f04598c9c7c8ca9c4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a8d06d441ce8e4bb42a18f26e497096e15c5bdd3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220008ad06b10bc32fc6f87747cb9db17d57f65b0b6bfd17aac938cc7e87cbaab11022100d4e1b428a09e498d7d08e713ce50bdfe8ad8b5e3d1981633f779727980f02b15",
+    "certification_declaration": "3082010606092a864886f70d010702a081f83081f5020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022038edcc96a1f97e1adedebe39a958c060adfe365f4912d016ae520c32fa0a64bf022100dfb86c94e78e5f05753ee27aa415a072d57479d98f91c668d9f70833ee78e5ba",
+    "dac_private_key": "f51bea88f017b0837d305bca093d8acda8269eecfa2cee8e464ba027138b5b0c",
+    "dac_public_key": "048bdfd62a6d6f6bcbcbbe4ff67f44656b8fa98010215ebfca99d5ca2beb602e712ffb5239ed543a6acd99384c56751f05cef03618337fe618d32edeef8fd11f1f"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der
index 73c8768fa1cccb..f63027a133ef6d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der
index afb64f2da0729e..36d1fbad6ec1d0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem
index a808423c9504e6..81833e5e0b77e4 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIOoA42SdJRPowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIINWM7GMn2z38wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-pbjDNcIxusS7itpr3YIiMxlD8bhXa/5cGJ2wOT6vCtMahq3YJt+CxNZJZm2uXf3o
-k4NjCtRbiYjflSsYUEX76aNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFDNaSyTXKP3VFRF3ZXfKWlizSGpuMB8GA1UdIwQYMBaAFMPI
-Xa9BHXmrPotOc0MMVX7gm38MMAoGCCqGSM49BAMCA0cAMEQCIHOae+vkzChY/MJD
-n3QFmd1Eyg+5DAg5PQde3kBNZ+VfAiAiWrYW7x5l1961FTRcZhGNZ21mj/uQzVxe
-YnCCmT6x7A==
+6gc85K+EElZ72TraQtnjIR2Y6smJ+/Z+XyMCmU5qedv87EqBZ12MByS441407W2R
+czwscpSK3bvgfp+dJYbze6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKX2QeTFC5iLkzxE9i+i2wASD5LEMB8GA1UdIwQYMBaAFJf7
+WyHclWDHzs4m83JZaLBT2sRxMAoGCCqGSM49BAMCA0gAMEUCIBFvwT7MWYp8RUjy
+ft0cQcRLbVuG3iuCYg5jOt5XqaXMAiEAygCmaDXyD7gfxxrLNNINdGBC940kryHk
+kO3vs8+tthQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der
index 50ad4167043cc7..1f02f6f54072ef 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem
index a4d2771ef305fd..4822421ffd6395 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBLny6wa7lE7N9siOT322H263YOS28QdkfqZJbNZMtX6oAoGCCqGSM49
-AwEHoUQDQgAEpbjDNcIxusS7itpr3YIiMxlD8bhXa/5cGJ2wOT6vCtMahq3YJt+C
-xNZJZm2uXf3ok4NjCtRbiYjflSsYUEX76Q==
+MHcCAQEEIOzbXnjNvltzCYzpfJkxMK5mHsltIC+1wtQMooVQo57OoAoGCCqGSM49
+AwEHoUQDQgAE6gc85K+EElZ72TraQtnjIR2Y6smJ+/Z+XyMCmU5qedv87EqBZ12M
+ByS441407W2RczwscpSK3bvgfp+dJYbzew==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der
index d14f217df80679..250743fb6b147c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem
index 0853616fac9e3b..4fa2fb49153777 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIYB85njKWyDEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIBWdEeY4WI10wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQlJRmqiOrzsEVd0hP9mffouYgo4LDk
-3U1O8SagrIEIj9RV0fBmf5g8q+swT1tCNRDoZoJMTBDrXD1dO1mHQoVjo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUw8hd
-r0Edeas+i05zQwxVfuCbfwwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgQJ6bbnfwYBNkT+GYdQmupAwyHFY+oKzuCdgy
-iZkA9fMCIDXMUAYJZLWg9igSFtug0gcoRn4062EWkpqDR3DyJB6I
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASJ510mMVIqRYZ6y8gFPLhkV1fp8jfY
+3smqKg6lCsgmv2KtI0NVbkjWdJZ/iVEXew5ZOLvdHaAIo/KG1lOK2ubno2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUl/tb
+IdyVYMfOzibzcllosFPaxHEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgSwdcACJ20UvlEagcgAZoE697BrOKjqot/Pio
+qa60b3oCIQD4gl4DksziW7IGvTmFB4p3JEvE5tCM1bBIptC9iJf5hg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der
index c7c01c72c2d845..26edce655b12c5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem
index a53108e1ffdb21..bd3f6be8c33847 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEsLiHQlA0CoWWRe/nKx/sBK9cMSW7Ibf5Ml6QsGzTVnoAoGCCqGSM49
-AwEHoUQDQgAEJSUZqojq87BFXdIT/Zn36LmIKOCw5N1NTvEmoKyBCI/UVdHwZn+Y
-PKvrME9bQjUQ6GaCTEwQ61w9XTtZh0KFYw==
+MHcCAQEEIBvAO7wltJibqsImCxZ+BOaT8mO3YwTfe/JQFs0R9zMzoAoGCCqGSM49
+AwEHoUQDQgAEieddJjFSKkWGesvIBTy4ZFdX6fI32N7JqioOpQrIJr9irSNDVW5I
+1nSWf4lRF3sOWTi73R2gCKPyhtZTitrm5w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json
index ad072ceadecc38..888fd056bddda0 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The device_type_id field doesn't match the device_type_id value in the DCL entries associated with the VID and PID.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202083a8038d9274944fa300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a5b8c335c231bac4bb8ada6bdd8222331943f1b8576bfe5c189db0393eaf0ad31a86add826df82c4d649666dae5dfde89383630ad45b8988df952b185045fbe9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414335a4b24d728fdd51511776577ca5a58b3486a6e301f0603551d23041830168014c3c85daf411d79ab3e8b4e73430c557ee09b7f0c300a06082a8648ce3d04030203470030440220739a7bebe4cc2858fcc2439f740599dd44ca0fb90c08393d075ede404d67e55f0220225ab616ef1e65d7deb515345c66118d676d668ffb90cd5c5e627082993eb1ec",
-    "pai_cert": "308201d33082017aa0030201020208601f399e3296c831300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004252519aa88eaf3b0455dd213fd99f7e8b98828e0b0e4dd4d4ef126a0ac81088fd455d1f0667f983cabeb304f5b423510e866824c4c10eb5c3d5d3b5987428563a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c3c85daf411d79ab3e8b4e73430c557ee09b7f0c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220409e9b6e77f06013644fe1987509aea40c321c563ea0acee09d832899900f5f3022035cc50060964b5a0f6281216dba0d20728467e34eb6116929a834770f2241e88",
-    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b0609608648016503040201306006092a864886f70d010701a0530451152000012501f1ff3602050080182603cbedffff2c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b9533e419c94349dae9a73a93c1c917531d16ae9c11518fa238ba1959591a01c0221009967653898d11a0d7ea3f1fd96dc74d742bbf0c67339c2c3653e6bf0426df4bf",
-    "dac_private_key": "12e7cbac1aee513b37db22393df6d87dbadd8392dbc41d91fa9925b35932d5fa",
-    "dac_public_key": "04a5b8c335c231bac4bb8ada6bdd8222331943f1b8576bfe5c189db0393eaf0ad31a86add826df82c4d649666dae5dfde89383630ad45b8988df952b185045fbe9"
+    "dac_cert": "308201e43082018aa003020102020835633b18c9f6cf7f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ea073ce4af8412567bd93ada42d9e3211d98eac989fbf67e5f2302994e6a79dbfcec4a81675d8c0724b8e35e34ed6d91733c2c72948addbbe07e9f9d2586f37ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a5f641e4c50b988b933c44f62fa2db00120f92c4301f0603551d2304183016801497fb5b21dc9560c7cece26f3725968b053dac471300a06082a8648ce3d04030203480030450220116fc13ecc598a7c4548f27edd1c41c44b6d5b86de2b82620e633ade57a9a5cc022100ca00a66835f20fb81fc71acb34d20d746042f78d24af21e490edefb3cfadb614",
+    "pai_cert": "308201d43082017aa0030201020208056744798e16235d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000489e75d2631522a45867acbc8053cb8645757e9f237d8dec9aa2a0ea50ac826bf62ad2343556e48d674967f8951177b0e5938bbdd1da008a3f286d6538adae6e7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041497fb5b21dc9560c7cece26f3725968b053dac471301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204b075c002276d14be511a81c80066813af7b06b38a8eaa2dfcf8a8a9aeb46f7a022100f8825e0392cce25bb206bd3985078a77244bc4e6d08cd5b048a6d0bd8897f986",
+    "certification_declaration": "3082010406092a864886f70d010702a081f63081f3020103310d300b0609608648016503040201306006092a864886f70d010701a0530451152000012501f1ff3602050080182603cbedffff2c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f4f82b239cfd2f8cea53df37dd69f5405cb310a99797ec372603e4cb15a7d573022042f6f585b9f9a4ada57162fed47acf98a87a96e4469af80020507a094d4cc51c",
+    "dac_private_key": "ecdb5e78cdbe5b73098ce97c993130ae661ec96d202fb5c2d40ca28550a39ece",
+    "dac_public_key": "04ea073ce4af8412567bd93ada42d9e3211d98eac989fbf67e5f2302994e6a79dbfcec4a81675d8c0724b8e35e34ed6d91733c2c72948addbbe07e9f9d2586f37b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der
index 309be2c998a698..edf0fc5a0abcce 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der
index 7d5aac336621a6..a06e4ca4b8c1a8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem
index ac107f296a55e7..87d2fbdb0e3948 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIIczR0EbmfmwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIc+C8/Au85WAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-5UltaoaBbSSE5vcwiEmvTegCdtJ2TRd+hL123RCwAhv8uIqXwaaJcUV67CWF6RDt
-YDdJlCqFVN+inBqWRHhpsKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKZPozavyCjfRqJeuBk1XYcVMHtkMB8GA1UdIwQYMBaAFPS7
-6dx6RWa5AGf7sEjhx0sxbZ5iMAoGCCqGSM49BAMCA0gAMEUCIQD96ZRLx74Vkci2
-W2aZyTkePXPzVqrBlTr+WMWgjM0K9gIgevd0x5ATnr7X153AiZRQha774Gy57cZk
-bYuUaZe9RTU=
+R2XTKEutymlr/n+cFInaexB+PZAp/BCddo8tcmZCaxgrCVol7vnHUBoakfR78Wli
+iHMYhts6wslt4Zszp63xvqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFEZDgm1A+XwgrJPTYXbTdtyvN1pjMB8GA1UdIwQYMBaAFPEZ
+JRSheDjIrAuVuY7sNpLZQo96MAoGCCqGSM49BAMCA0kAMEYCIQCqzTN7M9g2TY1E
+0SsSUpwn5DqP4zYUyLw1iT+xPhbd8AIhAPaiwSNdzf8VoVHV+BT0/1g6DYkoZ0DO
+7npzHVd3kNOZ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der
index d5fd3932c87d92..40e566c55ac839 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem
index 598797bff8fb28..6456a58b30ddb7 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOpYl1XDthBf3vqarjkFjml9fLbhb4KSRBKG76E7ql5aoAoGCCqGSM49
-AwEHoUQDQgAE5UltaoaBbSSE5vcwiEmvTegCdtJ2TRd+hL123RCwAhv8uIqXwaaJ
-cUV67CWF6RDtYDdJlCqFVN+inBqWRHhpsA==
+MHcCAQEEIJ5/tDG+GYOGIQJJkJY8tk7AtUK3bDZkQfdDr/dnYyIqoAoGCCqGSM49
+AwEHoUQDQgAER2XTKEutymlr/n+cFInaexB+PZAp/BCddo8tcmZCaxgrCVol7vnH
+UBoakfR78WliiHMYhts6wslt4Zszp63xvg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der
index 80e21e3b744e23..9f664af9731cd8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem
index e91bc0c9c22ac6..0e93af893dddc9 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIJhxUwaQ5L3IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIIc1o61HXsKswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT4+iWlu+4cdkvXJA1xqiLX4ibElwbJ
-6nZeiG0YpBoMeLYfDr4YqDxU3L1uHlEiOf0JOZq0YUlEaEvNusR0twoyo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9Lvp
-3HpFZrkAZ/uwSOHHSzFtnmIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgE5QL9ta2dm/xLHSBE5FzzW8AeG7oSO2m2FuP
-xzQkztkCIHzXTiLZKo9/i6oRkfYsqKL58TAtVUs9PdWUbc1M7vHN
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQr/bbqa5MHQe+mTBjcxXF/rOHS7X4N
+YDUx0SjjC/k1sBE5U90A3AgG4htTyPbUkW9Ef2tEJhJfkJ3EXB71Y4UNo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8Rkl
+FKF4OMisC5W5juw2ktlCj3owHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKp404qNofxo/L3kpayECbQZBzK7t3/0tUgo
+o3lggVKKAiASGn8l7ZRm8A4oyaAdmnq9OXxqZfjQ0fjkOo6gGPV7xA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der
index 8dd3072ff7b6f9..d68b27e59d1633 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem
index 1c5bb49fe60bb7..a19c61081e282e 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAEvsBvl36qxuHWpklcmGIbbuNc7bxY9C+dh9y76VHxGoAoGCCqGSM49
-AwEHoUQDQgAE+PolpbvuHHZL1yQNcaoi1+ImxJcGyep2XohtGKQaDHi2Hw6+GKg8
-VNy9bh5RIjn9CTmatGFJRGhLzbrEdLcKMg==
+MHcCAQEEIHASSe6GEaKI15whZvh/8GsRgoBZV7wMgAEOh4N1y5xooAoGCCqGSM49
+AwEHoUQDQgAEK/226muTB0HvpkwY3MVxf6zh0u1+DWA1MdEo4wv5NbAROVPdANwI
+BuIbU8j21JFvRH9rRCYSX5CdxFwe9WOFDQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json
index 1ffe8542d6647b..a8c9f09be015a1 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The device_type_id field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020821ccd1d046e67e6c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e5496d6a86816d2484e6f7308849af4de80276d2764d177e84bd76dd10b0021bfcb88a97c1a68971457aec2585e910ed603749942a8554dfa29c1a96447869b0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a64fa336afc828df46a25eb819355d8715307b64301f0603551d23041830168014f4bbe9dc7a4566b90067fbb048e1c74b316d9e62300a06082a8648ce3d0403020348003045022100fde9944bc7be1591c8b65b6699c9391e3d73f356aac1953afe58c5a08ccd0af602207af774c790139ebed7d79dc089945085aefbe06cb9edc6646d8b946997bd4535",
-    "pai_cert": "308201d33082017aa0030201020208261c54c1a4392f72300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f8fa25a5bbee1c764bd7240d71aa22d7e226c49706c9ea765e886d18a41a0c78b61f0ebe18a83c54dcbd6e1e512239fd09399ab4614944684bcdbac474b70a32a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f4bbe9dc7a4566b90067fbb048e1c74b316d9e62301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022013940bf6d6b6766ff12c7481139173cd6f00786ee848eda6d85b8fc73424ced902207cd74e22d92a8f7f8baa1191f62ca8a2f9f1302d554b3d3dd5946dcd4ceef1cd",
-    "certification_declaration": "3081fd06092a864886f70d010702a081ef3081ec020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b152000012501f1ff3602050080182c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201a964402d8cb92a6cb59f1984fef77f833e7a7600db8d7150a3894416d13e53102207461724c01add824c78b61f67aec5649a45ae0076adf77fb6626b37ce618e4c7",
-    "dac_private_key": "ea589755c3b6105fdefa9aae39058e697d7cb6e16f8292441286efa13baa5e5a",
-    "dac_public_key": "04e5496d6a86816d2484e6f7308849af4de80276d2764d177e84bd76dd10b0021bfcb88a97c1a68971457aec2585e910ed603749942a8554dfa29c1a96447869b0"
+    "dac_cert": "308201e53082018aa003020102020873e0bcfc0bbce560300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044765d3284badca696bfe7f9c1489da7b107e3d9029fc109d768f2d7266426b182b095a25eef9c7501a1a91f47bf1696288731886db3ac2c96de19b33a7adf1bea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144643826d40f97c20ac93d36176d376dcaf375a63301f0603551d23041830168014f1192514a17838c8ac0b95b98eec3692d9428f7a300a06082a8648ce3d0403020349003046022100aacd337b33d8364d8d44d12b12529c27e43a8fe33614c8bc35893fb13e16ddf0022100f6a2c1235dcdff15a151d5f814f4ff583a0d89286740ceee7a731d577790d399",
+    "pai_cert": "308201d43082017aa003020102020821cd68eb51d7b0ab300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042bfdb6ea6b930741efa64c18dcc5717face1d2ed7e0d603531d128e30bf935b0113953dd00dc0806e21b53c8f6d4916f447f6b4426125f909dc45c1ef563850da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f1192514a17838c8ac0b95b98eec3692d9428f7a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100aa78d38a8da1fc68fcbde4a5ac8409b4190732bbb77ff4b54828a3796081528a0220121a7f25ed9466f00e28c9a01d9a7abd397c6a65f8d0d1f8e43a8ea018f57bc4",
+    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b152000012501f1ff3602050080182c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dd5f901f2529515fbc7bd9aa7daf07d1aeaca7dc5f99cc2856b0d246f831f13902201e0fbf2b3302a80424c85f1cfa206b75526c0b25c310f58585fb9165ca31526b",
+    "dac_private_key": "9e7fb431be19838621024990963cb64ec0b542b76c366441f743aff76763222a",
+    "dac_public_key": "044765d3284badca696bfe7f9c1489da7b107e3d9029fc109d768f2d7266426b182b095a25eef9c7501a1a91f47bf1696288731886db3ac2c96de19b33a7adf1be"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der
index c404fa1ce917e5..626ecc3d71b4f9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der
index e6c14307acab1d..0b725574fc2a39 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem
index bf6f65428b7a4c..13ec080587fc01 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIREaH9eT2TUEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIaP0AInrLBg8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-kO2NHVlNOXLKvt1+Fc7PxlzmQyJUvBC+cSKiSUxyCJHy740Rv/s8u1NiC0RsOKO2
-oyag/TA4DUBA3QXnPkwIfKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFECRN36RK3PgV3uQJNdSVsRpSLDkMB8GA1UdIwQYMBaAFLPA
-cKh0c5BRa7Xgmo5xymHvAE7FMAoGCCqGSM49BAMCA0gAMEUCIDhvV7zSdQTSE92Y
-CZwP7ENbDgpi1z0ReH9wy8q4XtukAiEAwAdsskjpRBQ7xe74EKZd3luDm5BoRAJm
-kStJ+moPQoI=
+sAwzhggJChb2Trvysoa0zBBxgLYunI05tE0V7YBmISc5NwaU2nb4Fp8ZM8WGq0hf
+2lUtLuUgnhcX8OcWhG5YIKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFMb+5aHmYNQHVLE10fSexNnqaFWHMB8GA1UdIwQYMBaAFHhm
+KJlJLyTG65MJ6WyDT1C702yVMAoGCCqGSM49BAMCA0kAMEYCIQCBfQ9LGMMMI5gT
+2DgwC4wFOJqQPyGjz1m0QGyTWSBi8QIhAO423ZR/mOagtHbsbeDtY8a/5iwo2bxG
+If8fTBlauOVf
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der
index ae468e237e34ba..d598bf192e4f5d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem
index 63322aa2503fa5..6ee3f6c30e2122 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKkbyY28dSzrcnlS8g9mz+tFfCl2vuNSzFMs4uUlcSRloAoGCCqGSM49
-AwEHoUQDQgAEkO2NHVlNOXLKvt1+Fc7PxlzmQyJUvBC+cSKiSUxyCJHy740Rv/s8
-u1NiC0RsOKO2oyag/TA4DUBA3QXnPkwIfA==
+MHcCAQEEIMe9OrnX7hNnp0mT318HFmiOHe3838sxxoQIvmohcBC1oAoGCCqGSM49
+AwEHoUQDQgAEsAwzhggJChb2Trvysoa0zBBxgLYunI05tE0V7YBmISc5NwaU2nb4
+Fp8ZM8WGq0hf2lUtLuUgnhcX8OcWhG5YIA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der
index 7abc8ce2a2ea53..c928dbaf4c3304 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem
index 327cbaf9eb577e..2548d67fbd00e6 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIAcL94d5XecgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIKm/KdWrtoEowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASZRot4DT/0+VpTUaiublozKnN8zI6A
-dDSQmAnJMmoMbdHhneV+uBd7MBYfzKeL2mIugOVq4Tq8W4AVke2MXOCxo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs8Bw
-qHRzkFFrteCajnHKYe8ATsUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALFVo+Vnc+0CADbHu9gsfNuixl6uLztJ/98N
-XGx6o9OKAiAC1ep7PzbVwceTKEjsYhXfEHYKH20pz5F0eldNTh8ObA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASL7IaGEfkSdQq1TkzFKrYGsd/WbCpU
+l8MVvkMhzJv61NoOz5xw/ySRmNwPIFCKXXtNTCw+GLNqtlgLBmSMLjZ9o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeGYo
+mUkvJMbrkwnpbINPULvTbJUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOS8bfv0csX9rhYGaoVf57Kdwhf/bwWDjl3K
+pNPKaVrwAiBnvA6kUvpLdo46m48DjeKgsM+1DPENkqk8TCFVpUN7pA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der
index e8d55e3715d608..c88fc88c1c4196 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem
index 8076ac9cf70bc6..4302cbac5f8dc9 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBnS9jSN1856qT/78l1OzEyirlyoeZltQ8vjXfZi+hfooAoGCCqGSM49
-AwEHoUQDQgAEmUaLeA0/9PlaU1Gorm5aMypzfMyOgHQ0kJgJyTJqDG3R4Z3lfrgX
-ezAWH8yni9piLoDlauE6vFuAFZHtjFzgsQ==
+MHcCAQEEIAtZwtCcsEBKqNOiUf5Git1NZt2d131XlaT+PBs8nR9woAoGCCqGSM49
+AwEHoUQDQgAEi+yGhhH5EnUKtU5MxSq2BrHf1mwqVJfDFb5DIcyb+tTaDs+ccP8k
+kZjcDyBQil17TUwsPhizarZYCwZkjC42fQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json
index e65aa958c0896a..5938afeabcbafc 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid format_version field set to 1.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa0030201020208444687f5e4f64d41300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000490ed8d1d594d3972cabedd7e15cecfc65ce6432254bc10be7122a2494c720891f2ef8d11bffb3cbb53620b446c38a3b6a326a0fd30380d4040dd05e73e4c087ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144091377e912b73e0577b9024d75256c46948b0e4301f0603551d23041830168014b3c070a8747390516bb5e09a8e71ca61ef004ec5300a06082a8648ce3d04030203480030450220386f57bcd27504d213dd98099c0fec435b0e0a62d73d11787f70cbcab85edba4022100c0076cb248e944143bc5eef810a65dde5b839b9068440266912b49fa6a0f4282",
-    "pai_cert": "308201d43082017aa003020102020801c2fde1de5779c8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000499468b780d3ff4f95a5351a8ae6e5a332a737ccc8e807434909809c9326a0c6dd1e19de57eb8177b30161fcca78bda622e80e56ae13abc5b801591ed8c5ce0b1a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b3c070a8747390516bb5e09a8e71ca61ef004ec5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b155a3e56773ed020036c7bbd82c7cdba2c65eae2f3b49ffdf0d5c6c7aa3d38a022002d5ea7b3f36d5c1c7932848ec6215df10760a1f6d29cf91747a574d4e1f0e6c",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f690c75cc9f011ce8e03fc43bb7de9cc0dda0a41e966bc45ffda24898a1a8c4e022100eab979048ea0a0d069fd72a1ab6ccce7e05522353f7244e019cccb43cf5e23c2",
-    "dac_private_key": "a91bc98dbc752ceb727952f20f66cfeb457c2976bee352cc532ce2e525712465",
-    "dac_public_key": "0490ed8d1d594d3972cabedd7e15cecfc65ce6432254bc10be7122a2494c720891f2ef8d11bffb3cbb53620b446c38a3b6a326a0fd30380d4040dd05e73e4c087c"
+    "dac_cert": "308201e53082018aa003020102020868fd00227acb060f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b00c338608090a16f64ebbf2b286b4cc107180b62e9c8d39b44d15ed8066212739370694da76f8169f1933c586ab485fda552d2ee5209e1717f0e716846e5820a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c6fee5a1e660d40754b135d1f49ec4d9ea685587301f0603551d2304183016801478662899492f24c6eb9309e96c834f50bbd36c95300a06082a8648ce3d0403020349003046022100817d0f4b18c30c239813d838300b8c05389a903f21a3cf59b4406c93592062f1022100ee36dd947f98e6a0b476ec6de0ed63c6bfe62c28d9bc4621ff1f4c195ab8e55f",
+    "pai_cert": "308201d43082017aa00302010202082a6fca756aeda04a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048bec868611f912750ab54e4cc52ab606b1dfd66c2a5497c315be4321cc9bfad4da0ecf9c70ff249198dc0f20508a5d7b4d4c2c3e18b36ab6580b06648c2e367da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041478662899492f24c6eb9309e96c834f50bbd36c95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e4bc6dfbf472c5fdae16066a855fe7b29dc217ff6f05838e5dcaa4d3ca695af0022067bc0ea452fa4b768e3a9b8f038de2a0b0cfb50cf10d92a93c4c2155a5437ba4",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207092fe41f57172ff0fc86b8f190337e7be48a25679166f046c642c0fa92cf45f022100daf90a2229a7af6bb162d4a78b1251ce8a16a9ca2283c75017de46fb858ea7d5",
+    "dac_private_key": "c7bd3ab9d7ee1367a74993df5f0716688e1dedfcdfcb31c68408be6a217010b5",
+    "dac_public_key": "04b00c338608090a16f64ebbf2b286b4cc107180b62e9c8d39b44d15ed8066212739370694da76f8169f1933c586ab485fda552d2ee5209e1717f0e716846e5820"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der
index 34bf8edcf8aaf5..09c7cb616496b5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der
index 352fa4f3a1c545..70b05a01426b37 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem
index 60e9e40fee280c..0cf351e108101f 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIPnTcEahpN7IwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIWaW6cAV6JEUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-UEU5k/UGMCcZVR0LOqRdq2dsl79L6cZpfBB2nIq5gXmrQ+eliHwVMdGj64f9kjJh
-WOLWGreCECHfgOV7yX1hH6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNxp8XpNTozvQyNe9x7HQtiXArnsMB8GA1UdIwQYMBaAFBiL
-cVUQ0sfAGt90tSc68MlKmc1JMAoGCCqGSM49BAMCA0gAMEUCIQCWGC0IHJbvRd7Q
-9msfYGmsLVIlEZvmD/4bE8lnMeC6aQIgFv86KiwNc5+EoccqmZ1favteDxotD7/j
-LqHKpyUw+m4=
+rz83CT+pKgvbHr2/2KSS3bdMBElmK6prtuykfQR3Dyp2pK56dKjaUjpPX4i1t0n1
+aihtaefIPKu5EViHdiVh2aNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNy/shMK1q9C6TaANF2QYFcpdvq3MB8GA1UdIwQYMBaAFGMK
+IiqH4D8rSOJnLAr3embxEUjyMAoGCCqGSM49BAMCA0kAMEYCIQCOOc4BzReDdxdf
+a0pL6pVz6clOIUHv2K1MUGzWeLfE2AIhALUg9CbXoEVAfNZZg8dK8M8Yb6aonevR
+1ZFZkreS+HmP
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der
index 4bcd08f745d5b2..ccab1136260658 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem
index 80c78d903c0a1f..07af1c8824fbc4 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMZHiSmsVUFQd45zcKYwskrLHwPLGHljxMbzNNLb06XsoAoGCCqGSM49
-AwEHoUQDQgAEUEU5k/UGMCcZVR0LOqRdq2dsl79L6cZpfBB2nIq5gXmrQ+eliHwV
-MdGj64f9kjJhWOLWGreCECHfgOV7yX1hHw==
+MHcCAQEEIAmEyyJUWWRNq9iXqwW5Jk7bywXlRkPMfal4oY+gWn7VoAoGCCqGSM49
+AwEHoUQDQgAErz83CT+pKgvbHr2/2KSS3bdMBElmK6prtuykfQR3Dyp2pK56dKja
+UjpPX4i1t0n1aihtaefIPKu5EViHdiVh2Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der
index 12652cdc24f73d..8060c68b7c9006 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem
index 6d8416d5436c77..8296d88cb44d34 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIZd3lZp4u2t8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIRpOShFeFnU8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQIAFAKjSDsUx6aR+4xljr7XbnwXElF
-5YYExfX5VfUE0t58a09ZF0SCm6EA6utWRjH+B01K3gLrPnoIf5zNoEQto2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUGItx
-VRDSx8Aa33S1JzrwyUqZzUkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhALf5SLh++XXELnx5CWC/lZr5QreIrZmFUeiC
-Hs+Ir7EwAiEAu8XplhptnfqsIap4b+/6VuKddq8vbaWEQynQ9R+vqQs=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAPAvmgrE+3NKB0qF5KhKtFmFBAIfp
+0c7HQJdP5oaERVOPZ+UF9SQAnay0XmnXyN0JWIkjxP+ME37DjIuDu32oo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUYwoi
+KofgPytI4mcsCvd6ZvERSPIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJkZhjRuM110p2QrL+yYBge0zG7HJWmgJ5Ji
+YjBlFgaKAiEAij/fAUqAq1+GoOVJZrAm68VBvhp+PnsZdustnkXBySo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der
index c1b11bb347d8a6..cdfc98444e10d0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem
index 529b199305ea64..c7605458a57829 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOs5luxmDrPMtKYfjo4aDuDb3aype036FImRc15cHAMzoAoGCCqGSM49
-AwEHoUQDQgAECABQCo0g7FMemkfuMZY6+1258FxJReWGBMX1+VX1BNLefGtPWRdE
-gpuhAOrrVkYx/gdNSt4C6z56CH+czaBELQ==
+MHcCAQEEIJBpsalT3sdmUhSirFc62qXzhBGPNq9KuWr/3cItiC/roAoGCCqGSM49
+AwEHoUQDQgAEwDwL5oKxPtzSgdKheSoSrRZhQQCH6dHOx0CXT+aGhEVTj2flBfUk
+AJ2stF5p18jdCViJI8T/jBN+w4yLg7t9qA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json
index ce9396ef325c19..db06a043552ef8 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid format_version field set to 2.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202083e74dc11a86937b2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000450453993f506302719551d0b3aa45dab676c97bf4be9c6697c10769c8ab98179ab43e7a5887c1531d1a3eb87fd92326158e2d61ab7821021df80e57bc97d611fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dc69f17a4d4e8cef43235ef71ec742d89702b9ec301f0603551d23041830168014188b715510d2c7c01adf74b5273af0c94a99cd49300a06082a8648ce3d040302034800304502210096182d081c96ef45ded0f66b1f6069ac2d5225119be60ffe1b13c96731e0ba69022016ff3a2a2c0d739f84a1c72a999d5f6afb5e0f1a2d0fbfe32ea1caa72530fa6e",
-    "pai_cert": "308201d53082017aa003020102020865dde5669e2edadf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040800500a8d20ec531e9a47ee31963afb5db9f05c4945e58604c5f5f955f504d2de7c6b4f591744829ba100eaeb564631fe074d4ade02eb3e7a087f9ccda0442da366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414188b715510d2c7c01adf74b5273af0c94a99cd49301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b7f948b87ef975c42e7c790960bf959af942b788ad998551e8821ecf88afb130022100bbc5e9961a6d9dfaac21aa786feffa56e29d76af2f6da5844329d0f51fafa90b",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000022501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022043a8ecc147bbf29a42d554ef8f1ebf461bfbeb336b2d5b8d5a3aacc6d26d57f40221009410e764889cfdbaec3276e6f6762747ffb50f1b93f6d6cefbb6ca40d64b4d46",
-    "dac_private_key": "c6478929ac554150778e7370a630b24acb1f03cb187963c4c6f334d2dbd3a5ec",
-    "dac_public_key": "0450453993f506302719551d0b3aa45dab676c97bf4be9c6697c10769c8ab98179ab43e7a5887c1531d1a3eb87fd92326158e2d61ab7821021df80e57bc97d611f"
+    "dac_cert": "308201e53082018aa003020102020859a5ba70057a2445300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004af3f37093fa92a0bdb1ebdbfd8a492ddb74c0449662baa6bb6eca47d04770f2a76a4ae7a74a8da523a4f5f88b5b749f56a286d69e7c83cabb9115887762561d9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dcbfb2130ad6af42e93680345d9060572976fab7301f0603551d23041830168014630a222a87e03f2b48e2672c0af77a66f11148f2300a06082a8648ce3d04030203490030460221008e39ce01cd178377175f6b4a4bea9573e9c94e2141efd8ad4c506cd678b7c4d8022100b520f426d7a045407cd65983c74af0cf186fa6a89debd1d5915992b792f8798f",
+    "pai_cert": "308201d53082017aa00302010202084693928457859d4f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c03c0be682b13edcd281d2a1792a12ad1661410087e9d1cec740974fe6868445538f67e505f524009dacb45e69d7c8dd09588923c4ff8c137ec38c8b83bb7da8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414630a222a87e03f2b48e2672c0af77a66f11148f2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100991986346e335d74a7642b2fec980607b4cc6ec72569a027926262306516068a0221008a3fdf014a80ab5f86a0e54966b026ebc541be1a7e3e7b1976eb2d9e45c1c92a",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000022501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100fe6acbf07b710f74b15938e30d3a0bdd414283f18b87e161a55dd6f520c427dd022100ab1201522158ac046f37f81d45fbd3fea90cecfe64b724b21d21baf1e66c2000",
+    "dac_private_key": "0984cb225459644dabd897ab05b9264edbcb05e54643cc7da978a18fa05a7ed5",
+    "dac_public_key": "04af3f37093fa92a0bdb1ebdbfd8a492ddb74c0449662baa6bb6eca47d04770f2a76a4ae7a74a8da523a4f5f88b5b749f56a286d69e7c83cabb9115887762561d9"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der
index 5894de8439d1da..d4a45ec1930f55 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der
index 7bef10c4558cca..5d2a6458312f35 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem
index d0a8006f190727..8ead6fa8484ff0 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIToCsthpcP34wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIOsdnx/zHpLwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-UtkUUrwNO2au3CV1b1pm/IpkKAe0EDnEy+Ka6om7RbXIwyWWxui1CeESe9Ku1G/J
-i6GyMlsSUDn3Cn30hEM0yKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFBoEbSqIyqI5ZxzSjQWU7Nm+8WowMB8GA1UdIwQYMBaAFANz
-AyMECIbEK4oUNBJk/smfPmyfMAoGCCqGSM49BAMCA0cAMEQCICYk7RSBrTM7uSMf
-FZ6D3E7ht0wECCGVsq8Rot4NugM3AiAVo06xpdXcQeSkP0dsPduak0090PNZ97HQ
-pt4Ofa0FhA==
+iOMQgS8mTMLdCYIIsHkCOEIDk5OrS9Z/wAmQAXCb6oT8XNf4yzwMAh50+jd3OUEM
+O6jqYd3AmWnLGPgOdBmU96NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFCejZkkjHHKsPaYVh3v3s+ZodZOGMB8GA1UdIwQYMBaAFCZ+
++0u3HrM0s2wOxXwnKsMDjXQkMAoGCCqGSM49BAMCA0gAMEUCIBbwRv8y/5FvXovM
+47DyLA5w76DqAzMKH9GSJbiPB5TgAiEA1A/gCZTZyLQB1OqdDfMJnhicA3Z9LDPo
+xU6wu/X846w=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der
index e97a8d0d45f579..54d6fa90102612 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem
index db0e7bfe051076..5759d2bcf061c3 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGGBx55UI0Vai+eK4biawOwyrIXYFcEV18+nQbYzHzOroAoGCCqGSM49
-AwEHoUQDQgAEUtkUUrwNO2au3CV1b1pm/IpkKAe0EDnEy+Ka6om7RbXIwyWWxui1
-CeESe9Ku1G/Ji6GyMlsSUDn3Cn30hEM0yA==
+MHcCAQEEIFhg7xJbwPPbecirbRNBRVjMc8Z9rRCOHT8tvLVpvFGVoAoGCCqGSM49
+AwEHoUQDQgAEiOMQgS8mTMLdCYIIsHkCOEIDk5OrS9Z/wAmQAXCb6oT8XNf4yzwM
+Ah50+jd3OUEMO6jqYd3AmWnLGPgOdBmU9w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der
index bfa0e863e0b2dc..74ef53b0b2888b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem
index 2cb40b8a33c110..a3f516b9574f71 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIGxzOOTbpfu4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIcsiBMWSiWUowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQJ2a5UynmW5X37v1AJCRP9X+EZYwtv
-7TWejpZDinBVrj5rip4HH8mt3CHwALa/xYDdxdJ6IJN0M31B2F7AZHk6o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUA3MD
-IwQIhsQrihQ0EmT+yZ8+bJ8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJ+Fsm7kDvKClyhdUOnI/mrQJvJQjO1ePmlJ
-GsdD217iAiB+0JCStOe5tTivbgqt9gqx9iZGSsIdy105uzj8kzFg1g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARbnIPh06gENBt6n0NeNn3SDOueb0FA
+SxlPKxrNuorykTU4956JPpZcM3cwEw3ZgNg5Y1nk+ECah8XGZ6YqGB3bo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJn77
+S7ceszSzbA7FfCcqwwONdCQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgHLCJ4V7RyKaB9YvP+NJkrzPCv/QR9DCf0/po
+QFXfXR4CIE1g22SYMkunLW+hFMiFSIOM/ORBFU7bp6lvZ5R0hFtP
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der
index f3020428b330ca..77b78408dcc602 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem
index c20d24d160d520..2f3b9cc873da54 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIABJXJ0AxscuWrpgG5a6Dy+eHYIR+hhRIa/O3aXgq6GCoAoGCCqGSM49
-AwEHoUQDQgAECdmuVMp5luV9+79QCQkT/V/hGWMLb+01no6WQ4pwVa4+a4qeBx/J
-rdwh8AC2v8WA3cXSeiCTdDN9QdhewGR5Og==
+MHcCAQEEIM9BWs70e/jJziF1n3xo3RqjVQXeNVOFfe6fMx4q4r2RoAoGCCqGSM49
+AwEHoUQDQgAEW5yD4dOoBDQbep9DXjZ90gzrnm9BQEsZTysazbqK8pE1OPeeiT6W
+XDN3MBMN2YDYOWNZ5PhAmofFxmemKhgd2w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json
index e59bf34752f562..f66aada7998ee0 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The format_version field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202084e80acb61a5c3f7e300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000452d91452bc0d3b66aedc25756f5a66fc8a642807b41039c4cbe29aea89bb45b5c8c32596c6e8b509e1127bd2aed46fc98ba1b2325b125039f70a7df4844334c8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141a046d2a88caa239671cd28d0594ecd9bef16a30301f0603551d2304183016801403730323040886c42b8a14341264fec99f3e6c9f300a06082a8648ce3d040302034700304402202624ed1481ad333bb9231f159e83dc4ee1b74c04082195b2af11a2de0dba0337022015a34eb1a5d5dc41e4a43f476c3ddb9a934d3dd0f359f7b1d0a6de0e7dad0584",
-    "pai_cert": "308201d43082017aa00302010202081b1cce3936e97eee300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000409d9ae54ca7996e57dfbbf50090913fd5fe119630b6fed359e8e96438a7055ae3e6b8a9e071fc9addc21f000b6bfc580ddc5d27a209374337d41d85ec064793aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041403730323040886c42b8a14341264fec99f3e6c9f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009f85b26ee40ef28297285d50e9c8fe6ad026f2508ced5e3e69491ac743db5ee202207ed09092b4e7b9b538af6e0aadf60ab1f626464ac21dcb5d39bb38fc933160d6",
-    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dc24f5310c61101cc8927e66a9a1dc5fd68128b1f5790b126a65d103fc3bc4560220702bf864c3de01cc8865e2ad3c540800549e85d91a65309ebbeca46238527104",
-    "dac_private_key": "6181c79e5423455a8be78ae1b89ac0ec32ac85d815c115d7cfa741b6331f33ab",
-    "dac_public_key": "0452d91452bc0d3b66aedc25756f5a66fc8a642807b41039c4cbe29aea89bb45b5c8c32596c6e8b509e1127bd2aed46fc98ba1b2325b125039f70a7df4844334c8"
+    "dac_cert": "308201e43082018aa00302010202083ac767c7fcc7a4bc300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000488e310812f264cc2dd098208b079023842039393ab4bd67fc0099001709bea84fc5cd7f8cb3c0c021e74fa377739410c3ba8ea61ddc09969cb18f80e741994f7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041427a36649231c72ac3da615877bf7b3e668759386301f0603551d23041830168014267efb4bb71eb334b36c0ec57c272ac3038d7424300a06082a8648ce3d0403020348003045022016f046ff32ff916f5e8bcce3b0f22c0e70efa0ea03330a1fd19225b88f0794e0022100d40fe00994d9c8b401d4ea9d0df3099e189c03767d2c33e8c54eb0bbf5fce3ac",
+    "pai_cert": "308201d33082017aa003020102020872c8813164a2594a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045b9c83e1d3a804341b7a9f435e367dd20ceb9e6f41404b194f2b1acdba8af2913538f79e893e965c337730130dd980d8396359e4f8409a87c5c667a62a181ddba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414267efb4bb71eb334b36c0ec57c272ac3038d7424301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201cb089e15ed1c8a681f58bcff8d264af33c2bff411f4309fd3fa684055df5d1e02204d60db6498324ba72d6fa114c88548838cfce441154edba7a96f679474845b4f",
+    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201d8b681c92a71730f71b3322c28bc1d60374c9dbf2d0f678191b20eb0e05c912022100c616befc743659789384a66fffbab1c199885772b64e71b07872242178bb52a9",
+    "dac_private_key": "5860ef125bc0f3db79c8ab6d13414558cc73c67dad108e1d3f2dbcb569bc5195",
+    "dac_public_key": "0488e310812f264cc2dd098208b079023842039393ab4bd67fc0099001709bea84fc5cd7f8cb3c0c021e74fa377739410c3ba8ea61ddc09969cb18f80e741994f7"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der
index 8e03323c37dc6a..2779a752c98627 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der
index 1c678f06ba6e30..1beb92ef856e37 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem
index 67dd41fc1cc38b..7d338ec9cb6c23 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIEnkoKr3mdwEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIcIigy0osW94wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-/oFFBcx9A6joZHTyxoTm2FDMOi2F0hNdd5cu25AkqPD4hV5TEru/K2wHV8FT6YHU
-fchDD5axL1PJ+DMzCRfhKqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFMmK1IGH9V4dBv7Vd+lpEpjuz6kGMB8GA1UdIwQYMBaAFM9w
-0Ll++7gaB6IZtLYcMKbEeWSbMAoGCCqGSM49BAMCA0gAMEUCIQDqvyxUziE53drZ
-i8zvMxKF/cVamw5mdanV8CTLaRpBCQIgJIu8cCMSw/hgEshYh4KWsZT8Dq+3dCd/
-E8vyB/IPubY=
+j2vAC0d5WQP6l44oLeVy8/okevd5a2RTNpac3FNGG+YqVrVIHC4GJOuJ8zpWYUMT
++fMR6UXgaxBDrhbtjKEHtKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFOrL///1euGaX7h8qijkS7IuZF05MB8GA1UdIwQYMBaAFNsS
+P9ru6XunB4ZX4a64Ib2NkWQNMAoGCCqGSM49BAMCA0cAMEQCIFcjmwKQIamucjCM
+LLrwLPR+UbCezN2CdMzTRg4ib/kkAiBT3HHxOD1/Jvjd++EwWogjjYevJ2Y7mioN
+OCnOzMnABg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der
index 0e85c495206809..9b95f9c829b1ff 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem
index 856f79f565dd4d..30f3960a6b1f05 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOst69kbD93rhgQ81cutVKMnIP4GqiugDJ1a304ictaUoAoGCCqGSM49
-AwEHoUQDQgAE/oFFBcx9A6joZHTyxoTm2FDMOi2F0hNdd5cu25AkqPD4hV5TEru/
-K2wHV8FT6YHUfchDD5axL1PJ+DMzCRfhKg==
+MHcCAQEEILb5RiCdmip9fBngJ2IMw32N6E18N4hdJ9KneQgsifQsoAoGCCqGSM49
+AwEHoUQDQgAEj2vAC0d5WQP6l44oLeVy8/okevd5a2RTNpac3FNGG+YqVrVIHC4G
+JOuJ8zpWYUMT+fMR6UXgaxBDrhbtjKEHtA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der
index f4d2be822f2ffc..f9987e1fa6d109 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem
index 4b0fb1c93a6391..9d978e59e6e895 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIAbqQQe//E5IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIcjK08xvD5XEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQgp6BhS7aKChaBrAudOfTmlkN5DHik
-LipmUhe4Z1fEoWLdAmAf87WfjdbpV93M7qEkvRcm/+aYDUdvRRXFEHYno2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUz3DQ
-uX77uBoHohm0thwwpsR5ZJswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgReWlwiFsMLYcRzZsRmy+JWyJuqOjdYhmN5yG
-SgIIzuICIQCzId3Mljc9mEwDkOdWgOv0SS5nAdKxdVB7XC+HYKzlZg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATvQQMCYbXtlR/arMIGVz0NKMTxf2Wu
+iYve9hodKfcyYjzt4HDKs1Mk7fmFEyvSCBhrg+zQeTQFJtd2uoJtCfifo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU2xI/
+2u7pe6cHhlfhrrghvY2RZA0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgD5yGQz6I8ceTkwzqU3hhXDiRvyQVVErqiNkm
+Ek0G3ZYCIEE7uXZfK72cfMEcv/T4OU2T482StfdRji1TM86w0BDe
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der
index 20915277d9116a..caa2c64ab5168b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem
index 2e691ab7bf9d90..1a6f8862a07500 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIElHUg7wcEJI2L2iTGq6FwNGB35dIXwb2ND/D+HJM8vxoAoGCCqGSM49
-AwEHoUQDQgAEIKegYUu2igoWgawLnTn05pZDeQx4pC4qZlIXuGdXxKFi3QJgH/O1
-n43W6VfdzO6hJL0XJv/mmA1Hb0UVxRB2Jw==
+MHcCAQEEIJTITPlmrg9Wz6iw8UnNdCfuJKURDJ42d75g/lz3KEovoAoGCCqGSM49
+AwEHoUQDQgAE70EDAmG17ZUf2qzCBlc9DSjE8X9lromL3vYaHSn3MmI87eBwyrNT
+JO35hRMr0ggYa4Ps0Hk0BSbXdrqCbQn4nw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json
index d5837e903122b1..56f10bada9959f 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field is empty TLV array.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202081279282abde67701300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fe814505cc7d03a8e86474f2c684e6d850cc3a2d85d2135d77972edb9024a8f0f8855e5312bbbf2b6c0757c153e981d47dc8430f96b12f53c9f833330917e12aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c98ad48187f55e1d06fed577e9691298eecfa906301f0603551d23041830168014cf70d0b97efbb81a07a219b4b61c30a6c479649b300a06082a8648ce3d0403020348003045022100eabf2c54ce2139dddad98bccef331285fdc55a9b0e6675a9d5f024cb691a41090220248bbc702312c3f86012c858878296b194fc0eafb774277f13cbf207f20fb9b6",
-    "pai_cert": "308201d43082017aa003020102020801ba9041efff1392300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000420a7a0614bb68a0a1681ac0b9d39f4e69643790c78a42e2a665217b86757c4a162dd02601ff3b59f8dd6e957ddcceea124bd1726ffe6980d476f4515c5107627a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414cf70d0b97efbb81a07a219b4b61c30a6c479649b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022045e5a5c2216c30b61c47366c466cbe256c89baa3a3758866379c864a0208cee2022100b321ddcc96373d984c0390e75680ebf4492e6701d2b175507b5c2f8760ace566",
-    "certification_declaration": "3082010006092a864886f70d010702a081f23081ef020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360218250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100962ebc86d3c61c0c682fe3e7156b2d79118e06b319b9b76514485e81506df468022100ba58b55452208fad716d7da6b8f059a1cd1fc4335e13cfaba42dc33fb9e06aaf",
-    "dac_private_key": "eb2debd91b0fddeb86043cd5cbad54a32720fe06aa2ba00c9d5adf4e2272d694",
-    "dac_public_key": "04fe814505cc7d03a8e86474f2c684e6d850cc3a2d85d2135d77972edb9024a8f0f8855e5312bbbf2b6c0757c153e981d47dc8430f96b12f53c9f833330917e12a"
+    "dac_cert": "308201e33082018aa00302010202087088a0cb4a2c5bde300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048f6bc00b47795903fa978e282de572f3fa247af7796b645336969cdc53461be62a56b5481c2e0624eb89f33a56614313f9f311e945e06b1043ae16ed8ca107b4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414eacbfffff57ae19a5fb87caa28e44bb22e645d39301f0603551d23041830168014db123fdaeee97ba7078657e1aeb821bd8d91640d300a06082a8648ce3d0403020347003044022057239b029021a9ae72308c2cbaf02cf47e51b09eccdd8274ccd3460e226ff924022053dc71f1383d7f26f8ddfbe1305a88238d87af27663b9a2a0d3829ceccc9c006",
+    "pai_cert": "308201d33082017aa00302010202087232b4f31bc3e571300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ef41030261b5ed951fdaacc206573d0d28c4f17f65ae898bdef61a1d29f732623cede070cab35324edf985132bd208186b83ecd079340526d776ba826d09f89fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414db123fdaeee97ba7078657e1aeb821bd8d91640d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200f9c86433e88f1c793930cea5378615c3891bf2415544aea88d926124d06dd960220413bb9765f2bbd9c7cc11cbff4f8394d93e3cd92b5f7518e2d5333ceb0d010de",
+    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360218250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220320a23c02088e89003c7e2a9abbd76a74ad2b85ed5024a4b920bf66a0f2df968022100c36325bd3b8515eba9f674cbd4855dd7c52c01ef6ab150c46291bc33ed71642d",
+    "dac_private_key": "b6f946209d9a2a7d7c19e027620cc37d8de84d7c37885d27d2a779082c89f42c",
+    "dac_public_key": "048f6bc00b47795903fa978e282de572f3fa247af7796b645336969cdc53461be62a56b5481c2e0624eb89f33a56614313f9f311e945e06b1043ae16ed8ca107b4"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der
index 97c4ae47112477..e14dd90196bf1e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der
index 8961206aadf2c8..8ff8d0cd741e59 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem
index eb1cfa31129b4c..95664db7fe1137 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIEy0H4/DB8WAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIXsR7xEXOdAUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-cmXhpnuZPyGDDSuIjh8DFICbjFIfbrd50sPiI+nmjpcHOn20/ksHAvuq1i7/1ULT
-M7yooJjaKX6NWKRAXT4PLqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFPxHSF/623ozK7fpL4SwWGZQYefjMB8GA1UdIwQYMBaAFJrK
-bB0YJWw1DnVY2Hlze2Zeq8ppMAoGCCqGSM49BAMCA0kAMEYCIQCS46d7YJ9F/tdU
-GfJiCwrobzTbX8zBjvPAyy6HEbfSBAIhAO9AaVsC+IAbtBRcNNw1/Lnvc8YGNLFp
-o1wIXC3EueBZ
+PllOSwpOw2suaxdJ79DSJKI7jrQ9Sy7agBCKYmgsPo9LI2xbX138JVHX6j1uu5BZ
+4cs2nsP93QkZgR8kM6qBW6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDo+bHJ0csmY7id1DXh8yoOG2EbAMB8GA1UdIwQYMBaAFNe5
+p1wY6KwiPqkbpHUJTGTvmKaMMAoGCCqGSM49BAMCA0gAMEUCIHYKvoASQ3Mk2I6v
+ugwiCQHUB1+Y6xdFa4BJH5WU59VhAiEA0o4pAUonTMiUvlSmSYTx4DwQaGjcMU5H
+ObQECJWk7+c=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der
index d6de29726cdeef..e3881b84142f06 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem
index 8977d16b531d0b..f8eee59003dd0f 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIey8wJmRtgNs7Z8oNG74l2+Dnp4oyerTTB1FR2imj0JoAoGCCqGSM49
-AwEHoUQDQgAEcmXhpnuZPyGDDSuIjh8DFICbjFIfbrd50sPiI+nmjpcHOn20/ksH
-Avuq1i7/1ULTM7yooJjaKX6NWKRAXT4PLg==
+MHcCAQEEIBsvrLuyQHiY3ylmkxeF7FaAMGT7M/0hhXTybRxyJxTtoAoGCCqGSM49
+AwEHoUQDQgAEPllOSwpOw2suaxdJ79DSJKI7jrQ9Sy7agBCKYmgsPo9LI2xbX138
+JVHX6j1uu5BZ4cs2nsP93QkZgR8kM6qBWw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der
index 14130b41db8ee9..eb90f3fc346469 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem
index b8ed522c35dbe8..393d051da56522 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIXby76pAcUPIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIDem4WoeaMOQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQyTDVxWvsyJEvMiYCVDyaZTHyk0sAK
-fzIGFLYBCBXXAjgI5KLdZeC5VCEO0vdyxAjHRwkQd+kuqWlj+IzUsyBZo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmsps
-HRglbDUOdVjYeXN7Zl6rymkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAIBeRYzedz7oF15z4gjltHru0wTodfRcaDtY
-d6g5x4ObAiBXrwDptq/LTFnCvaRiQV6Trh37pt073UHX4NWrfhCISQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASrR3cBBffvhK1DWU5rvjSmUWqhNYjb
+uWzPCoyEfPnAvfoArPvziyi6flXS7yyxdZnQg2keXmFIbOMW5SFGr+Kfo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU17mn
+XBjorCI+qRukdQlMZO+YpowwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAMbl0XLMQtlKvcLyaQJnGh7lICLZMeJ8SFtu
+G24TUe8kAiEApBrfXMq1Q3QD2wtehdaVpCJIamK1xXacn5gY2SooE/c=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der
index 3d9164ce5ec69b..f4c273a0650f99 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem
index dbf13b7ed2bd56..3485b62ebd9404 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPIZD0DHgV1++GIOOS+uuuEiTiIltNPFnQH/4JMes9aeoAoGCCqGSM49
-AwEHoUQDQgAEMkw1cVr7MiRLzImAlQ8mmUx8pNLACn8yBhS2AQgV1wI4COSi3WXg
-uVQhDtL3csQIx0cJEHfpLqlpY/iM1LMgWQ==
+MHcCAQEEIB8NqKBo79vxuxqnWncST2CzN1aSruHxMh8MY8TYkNOnoAoGCCqGSM49
+AwEHoUQDQgAEq0d3AQX374StQ1lOa740plFqoTWI27lszwqMhHz5wL36AKz784so
+un5V0u8ssXWZ0INpHl5hSGzjFuUhRq/inw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json
index babc1d004d869c..31bbee9d96c82d 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has one PID value that doesn't match the PID value in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa0030201020208132d07e3f0c1f160300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047265e1a67b993f21830d2b888e1f0314809b8c521f6eb779d2c3e223e9e68e97073a7db4fe4b0702fbaad62effd542d333bca8a098da297e8d58a4405d3e0f2ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414fc47485ffadb7a332bb7e92f84b058665061e7e3301f0603551d230418301680149aca6c1d18256c350e7558d879737b665eabca69300a06082a8648ce3d040302034900304602210092e3a77b609f45fed75419f2620b0ae86f34db5fccc18ef3c0cb2e8711b7d204022100ef40695b02f8801bb4145c34dc35fcb9ef73c60634b169a35c085c2dc4b9e059",
-    "pai_cert": "308201d43082017aa00302010202085dbcbbea901c50f2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004324c35715afb32244bcc8980950f26994c7ca4d2c00a7f320614b6010815d7023808e4a2dd65e0b954210ed2f772c408c747091077e92ea96963f88cd4b32059a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604149aca6c1d18256c350e7558d879737b665eabca69301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100805e458cde773ee8175e73e208e5b47aeed304e875f45c683b5877a839c7839b022057af00e9b6afcb4c59c2bda462415e93ae1dfba6dd3bdd41d7e0d5ab7e108849",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205018018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100fbff6aa7b2470386427ea342e5277a9158fc164679c610f98bcafee00e042c8002200f2c97259f841352b495f168ef01d4ed0b8345be208bd468fedc532a76c6b605",
-    "dac_private_key": "87b2f3026646d80db3b67ca0d1bbe25dbe0e7a78a327ab4d3075151da29a3d09",
-    "dac_public_key": "047265e1a67b993f21830d2b888e1f0314809b8c521f6eb779d2c3e223e9e68e97073a7db4fe4b0702fbaad62effd542d333bca8a098da297e8d58a4405d3e0f2e"
+    "dac_cert": "308201e43082018aa00302010202085ec47bc445ce7405300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043e594e4b0a4ec36b2e6b1749efd0d224a23b8eb43d4b2eda80108a62682c3e8f4b236c5b5f5dfc2551d7ea3d6ebb9059e1cb369ec3fddd0919811f2433aa815ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143a3e6c727472c998ee27750d787cca8386d846c0301f0603551d23041830168014d7b9a75c18e8ac223ea91ba475094c64ef98a68c300a06082a8648ce3d04030203480030450220760abe8012437324d88eafba0c220901d4075f98eb17456b80491f9594e7d561022100d28e29014a274cc894be54a64984f1e03c106868dc314e4739b4040895a4efe7",
+    "pai_cert": "308201d53082017aa00302010202080de9b85a879a30e4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ab47770105f7ef84ad43594e6bbe34a6516aa13588dbb96ccf0a8c847cf9c0bdfa00acfbf38b28ba7e55d2ef2cb17599d083691e5e61486ce316e52146afe29fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d7b9a75c18e8ac223ea91ba475094c64ef98a68c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c6e5d172cc42d94abdc2f26902671a1ee52022d931e27c485b6e1b6e1351ef24022100a41adf5ccab5437403db0b5e85d695a422486a62b5c5769c9f9818d92a2813f7",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205018018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100859ae1b166131e60090f06446274867083cf2f62722dee3e8b3bf3803d7922f0022100fc4cd8a74a119b0e94c6ac6e7c060f71e3a97e07205f7e6c8f6471706dc43152",
+    "dac_private_key": "1b2facbbb2407898df2966931785ec56803064fb33fd218574f26d1c722714ed",
+    "dac_public_key": "043e594e4b0a4ec36b2e6b1749efd0d224a23b8eb43d4b2eda80108a62682c3e8f4b236c5b5f5dfc2551d7ea3d6ebb9059e1cb369ec3fddd0919811f2433aa815b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der
index 92eae9318fa4ba..b807f647d52132 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der
index 75ce16714a7291..a2ccab8fb86577 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem
index a1527d4980d78e..628f8e433a4ad5 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIcX35BqO9ycswCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIS6ptMIr1QTswCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-OKaLnMX5h58knjh8z38o84ONW3KaGYBX7m32snwKtT8XqHSaZQucn63IFmwO4uLn
-Y+8QGBqogVv5kXOhdfZwXaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFN2vTzT9pf8x+mHKhI3havdMn5cuMB8GA1UdIwQYMBaAFAwL
-oW07oFyYfwxJKjWDUu8suA5NMAoGCCqGSM49BAMCA0cAMEQCIGb/+RGAQZsHge72
-35pPwQBRDh8XrnEuFMgsQOtfH4jqAiBT7vY99/QQPiTz++aIMZRWyEMi3dC2aWvr
-jo+F9sRdzA==
+X72ibI3f0MmwwPtACTwETDjtmAMbEJ2jIIhHHIZruIcnK2lsu/QLAOjMSVNqUz/u
+29cAWHwjohh8PNHlweFQG6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFMLfEmNWH5OfkA+cowtG0rzC0pz4MB8GA1UdIwQYMBaAFGjW
+jtrcEbNyMMJpKIdIEPWQtKN2MAoGCCqGSM49BAMCA0gAMEUCIQCPaLX+IL03D56C
+JHrsgBUwd8PZycwMxBQLB9+jTn1+YQIgFc9XY+b4EasndpSQx0Znh6WzuULv1tHV
+yqtMJtSxc+I=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der
index ae1e1a2a543900..444a817a7c7681 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem
index 1f8e1319b3f332..78584e12ffd6de 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIbChvJF23gHGdAvuAldnAveXLTSuIi0raOhGSLjFBM8oAoGCCqGSM49
-AwEHoUQDQgAEOKaLnMX5h58knjh8z38o84ONW3KaGYBX7m32snwKtT8XqHSaZQuc
-n63IFmwO4uLnY+8QGBqogVv5kXOhdfZwXQ==
+MHcCAQEEIDZz/Qwn4nYR/fIpHECgufjRreDaBrh8/2O9mfSTeO6goAoGCCqGSM49
+AwEHoUQDQgAEX72ibI3f0MmwwPtACTwETDjtmAMbEJ2jIIhHHIZruIcnK2lsu/QL
+AOjMSVNqUz/u29cAWHwjohh8PNHlweFQGw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der
index 8390d7f8651d05..9e60f75adc2aaa 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem
index 1ffae51f757bd0..9567e5daaa93e7 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIDnBH/N5oSyUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIKw+WSD+kJtAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7u4DXa7H1Qw6NHWxO/y1tWhnvqxvk
-snDcgdiUs+s7KO82iEYXWDf16aCXAv9HoPQPsS6cEyMmLzQexSBihgyno2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUDAuh
-bTugXJh/DEkqNYNS7yy4Dk0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgIb2ikjcLBHOrdjqfEyPBqWH+pPJxxI+sy3pj
-JYW5AcwCICL2wKULyfX8HfKbsCDXCSKJ4SJnqAJcyAsIvg4c1Zgt
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASLUGuu7HZ52hOt3WS2m9dNVnJlmfow
+mRdU0MyuMw4tpCKfP5zzzQg3iHGwJYZNVDBnTRrY6kRKQlWLoXHLbt/+o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUaNaO
+2twRs3Iwwmkoh0gQ9ZC0o3YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgBwdHA7ielH5tZrl7Op5EBTSq8BygtvHBVOJb
+tPIALFYCIC7UC+KXD/DHJ3YLzk19FQ3HkEsAHY+zse5LLElh6m8d
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der
index 121800556eb4c1..9012838fadff1f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem
index c091a39f0cbb15..29d160e796a3da 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOT37LSWOYEY2y5siokTWqTScAE87EmEkfvPEx8lISGLoAoGCCqGSM49
-AwEHoUQDQgAE+7uA12ux9UMOjR1sTv8tbVoZ76sb5LJw3IHYlLPrOyjvNohGF1g3
-9emglwL/R6D0D7EunBMjJi80HsUgYoYMpw==
+MHcCAQEEIHiOg4d4D91DpJervBqIxqNNrT/DJ3x+a63UngfRToKuoAoGCCqGSM49
+AwEHoUQDQgAEi1Brrux2edoTrd1ktpvXTVZyZZn6MJkXVNDMrjMOLaQinz+c880I
+N4hxsCWGTVQwZ00a2OpESkJVi6Fxy27f/g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json
index 70a405141078e2..db24fe5b8ad831 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has one PID value which matches the PID value in DAC.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa0030201020208717df906a3bdc9cb300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000438a68b9cc5f9879f249e387ccf7f28f3838d5b729a198057ee6df6b27c0ab53f17a8749a650b9c9fadc8166c0ee2e2e763ef10181aa8815bf99173a175f6705da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ddaf4f34fda5ff31fa61ca848de16af74c9f972e301f0603551d230418301680140c0ba16d3ba05c987f0c492a358352ef2cb80e4d300a06082a8648ce3d0403020347003044022066fff91180419b0781eef6df9a4fc100510e1f17ae712e14c82c40eb5f1f88ea022053eef63df7f4103e24f3fbe688319456c84322ddd0b6696beb8e8f85f6c45dcc",
-    "pai_cert": "308201d33082017aa00302010202080e7047fcde684b25300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fbbb80d76bb1f5430e8d1d6c4eff2d6d5a19efab1be4b270dc81d894b3eb3b28ef368846175837f5e9a09702ff47a0f40fb12e9c1323262f341ec52062860ca7a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604140c0ba16d3ba05c987f0c492a358352ef2cb80e4d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022021bda292370b0473ab763a9f1323c1a961fea4f271c48faccb7a632585b901cc022022f6c0a50bc9f5fc1df29bb020d7092289e12267a8025cc80b08be0e1cd5982d",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200b6c6ed3b56ce57225f5192ea39ce426bd6fe878a52eccfffe23f2669fab16fd022100eb2f98aeaf881bcb57d73cf92cf7932e875435eb402915a0d46639b893c6c1f9",
-    "dac_private_key": "86c286f245db780719d02fb8095d9c0bde5cb4d2b888b4ada3a11922e314133c",
-    "dac_public_key": "0438a68b9cc5f9879f249e387ccf7f28f3838d5b729a198057ee6df6b27c0ab53f17a8749a650b9c9fadc8166c0ee2e2e763ef10181aa8815bf99173a175f6705d"
+    "dac_cert": "308201e43082018aa00302010202084baa6d308af5413b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045fbda26c8ddfd0c9b0c0fb40093c044c38ed98031b109da32088471c866bb887272b696cbbf40b00e8cc49536a533feedbd700587c23a2187c3cd1e5c1e1501ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c2df1263561f939f900f9ca30b46d2bcc2d29cf8301f0603551d2304183016801468d68edadc11b37230c26928874810f590b4a376300a06082a8648ce3d04030203480030450221008f68b5fe20bd370f9e82247aec80153077c3d9c9cc0cc4140b07dfa34e7d7e61022015cf5763e6f811ab27769490c7466787a5b3b942efd6d1d5caab4c26d4b173e2",
+    "pai_cert": "308201d33082017aa00302010202082b0f96483fa426d0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048b506baeec7679da13addd64b69bd74d56726599fa30991754d0ccae330e2da4229f3f9cf3cd08378871b025864d5430674d1ad8ea444a42558ba171cb6edffea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041468d68edadc11b37230c26928874810f590b4a376301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022007074703b89e947e6d66b97b3a9e440534aaf01ca0b6f1c154e25bb4f2002c5602202ed40be2970ff0c727760bce4d7d150dc7904b001d8fb3b1ee4b2c4961ea6f1d",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022048bc632f9a578f6d226af805091a123c20327ab34d901d0a7d9210eb9cd9ba8802210088f535696b239773a872de44d0c05d96d53e4b0f3fb52dfc78c2abda088acff5",
+    "dac_private_key": "3673fd0c27e27611fdf2291c40a0b9f8d1ade0da06b87cff63bd99f49378eea0",
+    "dac_public_key": "045fbda26c8ddfd0c9b0c0fb40093c044c38ed98031b109da32088471c866bb887272b696cbbf40b00e8cc49536a533feedbd700587c23a2187c3cd1e5c1e1501b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der
index ad9f29f8888479..f08687e041321b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der
index e54fb7d6afe209..e1896b35d03689 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem
index b945b2d4131d68..2dc13c32f51568 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIZW2Jb1mHNrowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIILNCQSHDFlZUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-z5dk8IbcW+00od8qHzOTDZwdDHC1c6DruXOWpmgfzyF+6LGP40u+4HOs3r/cyiq4
-6Egh/6xsHe5Zu2t/0czkFKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGmKE2aKZAk8qiEhkYL8o1HgTA/eMB8GA1UdIwQYMBaAFKgb
-Kip9yynSEva5ZcDzuKrz3AZJMAoGCCqGSM49BAMCA0gAMEUCIQCIBJYEXlCUaYYK
-XG0xuQAkV9rHAJuKCioOxBh9U9IQ0wIgUXRmG60KsfsfK3cKWRMq6NVGER6C/8jB
-STiHH2ahK48=
+vngr12OauR2VuobqFtCD/US4bZWZht4t4lEXx4/dEnPwrGIWg6LyEBVi07NVOSql
+5dwuc9DonvEWZcowk6CVOKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKh3d0VFqiGiPD+y0QQKHf0qWkFAMB8GA1UdIwQYMBaAFM7/
+dhXBPrPcWAX/dvpHzptsky69MAoGCCqGSM49BAMCA0gAMEUCIQDVU8u5baGW4CDA
+y6Ecy11WDl03UPGhUv1Meua/yQNmHgIgcOoE92PJkTwKvfAgqjyMsMj+Z3n/6H8g
+2aoDjSLVaCM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der
index 9b32801a136e6e..71466d22d55d4b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem
index 891711e86b02c9..91b5613ad6eb9c 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBlG72iJvyOJfe52kdUBHHesuhosneaJpKyTEwhgjtk1oAoGCCqGSM49
-AwEHoUQDQgAEz5dk8IbcW+00od8qHzOTDZwdDHC1c6DruXOWpmgfzyF+6LGP40u+
-4HOs3r/cyiq46Egh/6xsHe5Zu2t/0czkFA==
+MHcCAQEEIC3BH3L83WOnU65hhZcCcjeKEtfy/Fs5C1kQoSJqCdaeoAoGCCqGSM49
+AwEHoUQDQgAEvngr12OauR2VuobqFtCD/US4bZWZht4t4lEXx4/dEnPwrGIWg6Ly
+EBVi07NVOSql5dwuc9DonvEWZcowk6CVOA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der
index 0920718933afd7..bf82f9acdba643 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem
index a61f77e61e2f4d..4342ec26607b74 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIZEKMVFiWD3UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIbCRgTmUFJTYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARowtproGLrUnikKMqXXCaLZhvqxg+Z
-VxoH8rpCg0dluZmrljXWCEgXlT7C4tvWdzE4FmvZ0BLqqRKqRW20KwgBo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUqBsq
-Kn3LKdIS9rllwPO4qvPcBkkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAI3aD6oT5T8Fb9S4K0evXl/XuHpudPN4JY57
-QocJoq/fAiEAq1dAoI3X+Wh/M/OREMyWCby1ZdgoryRR7dvCEGPV6Gk=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQO6ctLLKARXeuw522OX519LMECgXCL
+6NtkVoYwf/PgxTNSbWSnImPUwDSGC6epJ9KHrwalUOkEIc+sn8NaRlw1o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzv92
+FcE+s9xYBf92+kfOm2yTLr0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIjptPauEwGXxL2WRl8lCcXG6R+dLnqWuIDA
+nzfF84rdAiEAiJuXwvVGja5gOiBn93D7EhdZusAAAebhiiISxF9oNIk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der
index 9fa128d9f9c2c2..c87063d401cfe1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem
index 555a3ece86dd58..ba4162ef6d8e8f 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIElS4MdcFHvqb4fdG4Um91GS/YeWN5hwrbynJGyfqRA5oAoGCCqGSM49
-AwEHoUQDQgAEaMLaa6Bi61J4pCjKl1wmi2Yb6sYPmVcaB/K6QoNHZbmZq5Y11ghI
-F5U+wuLb1ncxOBZr2dAS6qkSqkVttCsIAQ==
+MHcCAQEEIFDuOxN1iTFXg+0VzlHiheyGVfAhIIy2Ea6t9lJpVXe1oAoGCCqGSM49
+AwEHoUQDQgAEDunLSyygEV3rsOdtjl+dfSzBAoFwi+jbZFaGMH/z4MUzUm1kpyJj
+1MA0hgunqSfSh68GpVDpBCHPrJ/DWkZcNQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json
index 50c0d74ff13c83..b0500502369c02 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 100 PID values none of which matches the PID value in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208656d896f598736ba300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cf9764f086dc5bed34a1df2a1f33930d9c1d0c70b573a0ebb97396a6681fcf217ee8b18fe34bbee073acdebfdcca2ab8e84821ffac6c1dee59bb6b7fd1cce414a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414698a13668a64093caa21219182fca351e04c0fde301f0603551d23041830168014a81b2a2a7dcb29d212f6b965c0f3b8aaf3dc0649300a06082a8648ce3d0403020348003045022100880496045e509469860a5c6d31b9002457dac7009b8a0a2a0ec4187d53d210d302205174661bad0ab1fb1f2b770a59132ae8d546111e82ffc8c14938871f66a12b8f",
-    "pai_cert": "308201d53082017aa003020102020864428c5458960f75300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000468c2da6ba062eb5278a428ca975c268b661beac60f99571a07f2ba42834765b999ab9635d6084817953ec2e2dbd6773138166bd9d012eaa912aa456db42b0801a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414a81b2a2a7dcb29d212f6b965c0f3b8aaf3dc0649301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008dda0faa13e53f056fd4b82b47af5e5fd7b87a6e74f378258e7b428709a2afdf022100ab5740a08dd7f9687f33f39110cc9609bcb565d828af2451eddbc21063d5e869",
-    "certification_declaration": "3082023206092a864886f70d010702a08202233082021f020103310d300b06096086480165030402013082018b06092a864886f70d010701a082017c04820178152000012501f1ff3602050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638005648018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022008bc5bbca513f1b49d44d2171acc616acdf5e460a0b4f2eedd67bc89d43e045c02203592aac0c48cbfbb3efa5cfb735229d61882afc104a8ad3dc737de673b28c32a",
-    "dac_private_key": "1946ef6889bf23897dee7691d5011c77acba1a2c9de689a4ac931308608ed935",
-    "dac_public_key": "04cf9764f086dc5bed34a1df2a1f33930d9c1d0c70b573a0ebb97396a6681fcf217ee8b18fe34bbee073acdebfdcca2ab8e84821ffac6c1dee59bb6b7fd1cce414"
+    "dac_cert": "308201e43082018aa00302010202082cd0904870c59595300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004be782bd7639ab91d95ba86ea16d083fd44b86d959986de2de25117c78fdd1273f0ac621683a2f2101562d3b355392aa5e5dc2e73d0e89ef11665ca3093a09538a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a877774545aa21a23c3fb2d1040a1dfd2a5a4140301f0603551d23041830168014ceff7615c13eb3dc5805ff76fa47ce9b6c932ebd300a06082a8648ce3d0403020348003045022100d553cbb96da196e020c0cba11ccb5d560e5d3750f1a152fd4c7ae6bfc903661e022070ea04f763c9913c0abdf020aa3c8cb0c8fe6779ffe87f20d9aa038d22d56823",
+    "pai_cert": "308201d53082017aa00302010202086c24604e65052536300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040ee9cb4b2ca0115debb0e76d8e5f9d7d2cc10281708be8db645686307ff3e0c533526d64a72263d4c034860ba7a927d287af06a550e90421cfac9fc35a465c35a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ceff7615c13eb3dc5805ff76fa47ce9b6c932ebd301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210088e9b4f6ae130197c4bd96465f2509c5c6e91f9d2e7a96b880c09f37c5f38add022100889b97c2f5468dae603a2067f770fb121759bac00001e6e18a2212c45f683489",
+    "certification_declaration": "3082023306092a864886f70d010702a082022430820220020103310d300b06096086480165030402013082018b06092a864886f70d010701a082017c04820178152000012501f1ff3602050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638005648018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c0608fcf5b35c5dec988339672ef27ef1eec78397d5b2b696a48cf843c7afd0e02204c84115dc79dae3a827bcbb737f905474dbc139ce728c5cb9aba294d32e058fe",
+    "dac_private_key": "2dc11f72fcdd63a753ae6185970272378a12d7f2fc5b390b5910a1226a09d69e",
+    "dac_public_key": "04be782bd7639ab91d95ba86ea16d083fd44b86d959986de2de25117c78fdd1273f0ac621683a2f2101562d3b355392aa5e5dc2e73d0e89ef11665ca3093a09538"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der
index 588b4bc8264558..5fdb2c8a7440c4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der
index fe1e13eb4fa1cb..76a428365aa9cf 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem
index 855026530f36ce..ab52c5cf595840 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIBWC/Y9m5Rv8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIKUC+rxcclS8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-L4LJQYlnTkwiD+9s2/M+j6sYLIzYh2SXmvFp+Cd8ulPCxT0eSGt4JHqtSwV6CtVU
-aGRfTlI47/H4OFLH953QfaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFPe/WyiCM6fQc5YDqhKnFaSmaA5rMB8GA1UdIwQYMBaAFFFv
-O83LtD0dYvh0Rv/RhyzRj1KXMAoGCCqGSM49BAMCA0cAMEQCIG2weKCroxFbDIoU
-F7aMX4WjA4aCLXSsZzaN99CbPvSKAiB17TqxjK3F40oaiEDVLTJofNVcsU56+LPf
-+a5TAFVPKA==
+EDRuSnlua3UNP1XQ7ZsNszmVeUyyQKWW2yRYR1aT0IB9P9aGCXGmhad3N+u9vSAz
+snSJQzmtRiD74xtEJh/7Q6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFPWyUnmm854VY5QX6TifVyu3OVz3MB8GA1UdIwQYMBaAFKqT
+NrPC7OpusMkH7RZ2hynGpPaBMAoGCCqGSM49BAMCA0gAMEUCIQDzOnutdQkd+DPD
+dEk+fY4MWaeHjcCe9uM3SDm4WmBTqwIgQsj/F+hkdQCOHOpGAqgWC/YmNiHmn8HO
+VJgOvBT7UnA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der
index fc3ca6c0cfe041..0809d8d5d67d19 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem
index f181729b285605..506ca66b7e970c 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFXFYi5J6XOp5uht124ax9vfpMhsWAGtwQcwAc6fiX6goAoGCCqGSM49
-AwEHoUQDQgAEL4LJQYlnTkwiD+9s2/M+j6sYLIzYh2SXmvFp+Cd8ulPCxT0eSGt4
-JHqtSwV6CtVUaGRfTlI47/H4OFLH953QfQ==
+MHcCAQEEILIh4VsbECSwrBT25xHOWuDuZT/aKPeI+kw+vNWEXXPSoAoGCCqGSM49
+AwEHoUQDQgAEEDRuSnlua3UNP1XQ7ZsNszmVeUyyQKWW2yRYR1aT0IB9P9aGCXGm
+had3N+u9vSAzsnSJQzmtRiD74xtEJh/7Qw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der
index 45458dd0d3d9f1..0d7e0517c1965e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem
index efa76bb567ffa9..024694e49d132a 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIITiHl5RrZHxUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIOP420CaYZg8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASkPC36RbTMPcPkGx1RbZj9JLhOH8Z1
-2w45JtOoe/a2ldVHx6JIM09pKY5oc/qLuxpBZqM24C986Xf4T5u0mkRBo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUUW87
-zcu0PR1i+HRG/9GHLNGPUpcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIgFMvVcEL6shzyYufXfuDqqj0uAm6mZLUhl
-LREAW9pJAiEApcXhX9Vn7gHn1rRQqyYUhzCxV8YC4Lq1i/JKx9Nvai8=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3QjveKP276vGM9t+5AJJkrF15x4BY
+gTorBzaJFGJpfx+KkrgiYRXEsddxUR+Z8he1Q16tuA0cXScXGECnAnVlo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUqpM2
+s8Ls6m6wyQftFnaHKcak9oEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgY+ghnAvt7FW0b0cUn4RHWrh+w7Cdu1PhRKAx
+Zfg+aXoCIQDeKM217gKGYuL7OUHWYC2tJKFo4u6yIahh/dHM+IFTHg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der
index 9fcc33697b8188..87d2af4680303d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem
index 0163193e497bf8..9e7624d9831bfc 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP9VripXReOH8r3WBnSKcaOT0oO/gkMq4OaHQNQxDcH3oAoGCCqGSM49
-AwEHoUQDQgAEpDwt+kW0zD3D5BsdUW2Y/SS4Th/GddsOOSbTqHv2tpXVR8eiSDNP
-aSmOaHP6i7saQWajNuAvfOl3+E+btJpEQQ==
+MHcCAQEEIFc/SOW8St+7CaqM2FTvyqEu9HxQbNo80ER3k9Y1UC9aoAoGCCqGSM49
+AwEHoUQDQgAEd0I73ij9u+rxjPbfuQCSZKxdeceAWIE6Kwc2iRRiaX8fipK4ImEV
+xLHXcVEfmfIXtUNerbgNHF0nFxhApwJ1ZQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json
index ab606e6fe8bc9a..714a81ca932a2b 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 100 PID values one of which matches the PID value in DAC.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa00302010202080560bf63d9b946ff300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042f82c94189674e4c220fef6cdbf33e8fab182c8cd88764979af169f8277cba53c2c53d1e486b78247aad4b057a0ad55468645f4e5238eff1f83852c7f79dd07da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f7bf5b288233a7d0739603aa12a715a4a6680e6b301f0603551d23041830168014516f3bcdcbb43d1d62f87446ffd1872cd18f5297300a06082a8648ce3d040302034700304402206db078a0aba3115b0c8a1417b68c5f85a30386822d74ac67368df7d09b3ef48a022075ed3ab18cadc5e34a1a8840d52d32687cd55cb14e7af8b3dff9ae5300554f28",
-    "pai_cert": "308201d53082017aa00302010202084e21e5e51ad91f15300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a43c2dfa45b4cc3dc3e41b1d516d98fd24b84e1fc675db0e3926d3a87bf6b695d547c7a248334f69298e6873fa8bbb1a4166a336e02f7ce977f84f9bb49a4441a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414516f3bcdcbb43d1d62f87446ffd1872cd18f5297301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100880532f55c10beac873c98b9f5dfb83aaa8f4b809ba9992d48652d11005bda49022100a5c5e15fd567ee01e7d6b450ab26148730b157c602e0bab58bf24ac7d36f6a2f",
-    "certification_declaration": "3082023206092a864886f70d010702a08202233082021f020103310d300b06096086480165030402013082018b06092a864886f70d010701a082017c04820178152000012501f1ff3602050080050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022042034456051650bbbf94b1ec355b683de8cd706a10f4d8a43cc14b9956a1fc2802202387f753667ed12639d14849f32ad88585c135bffadae3dca623823b7098eaa5",
-    "dac_private_key": "55c5622e49e973a9e6e86dd76e1ac7dbdfa4c86c5801adc1073001ce9f897ea0",
-    "dac_public_key": "042f82c94189674e4c220fef6cdbf33e8fab182c8cd88764979af169f8277cba53c2c53d1e486b78247aad4b057a0ad55468645f4e5238eff1f83852c7f79dd07d"
+    "dac_cert": "308201e43082018aa00302010202082940beaf171c952f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000410346e4a796e6b750d3f55d0ed9b0db33995794cb240a596db2458475693d0807d3fd6860971a685a77737ebbdbd2033b274894339ad4620fbe31b44261ffb43a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f5b25279a6f39e15639417e9389f572bb7395cf7301f0603551d23041830168014aa9336b3c2ecea6eb0c907ed16768729c6a4f681300a06082a8648ce3d0403020348003045022100f33a7bad75091df833c374493e7d8e0c59a7878dc09ef6e3374839b85a6053ab022042c8ff17e86475008e1cea4602a8160bf6263621e69fc1ce54980ebc14fb5270",
+    "pai_cert": "308201d43082017aa003020102020838fe36d02698660f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000477423bde28fdbbeaf18cf6dfb9009264ac5d79c78058813a2b0736891462697f1f8a92b8226115c4b1d771511f99f217b5435eadb80d1c5d27171840a7027565a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414aa9336b3c2ecea6eb0c907ed16768729c6a4f681301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022063e8219c0bedec55b46f47149f84475ab87ec3b09dbb53e144a03165f83e697a022100de28cdb5ee028662e2fb3941d6602dad24a168e2eeb221a861fdd1ccf881531e",
+    "certification_declaration": "3082023406092a864886f70d010702a082022530820221020103310d300b06096086480165030402013082018b06092a864886f70d010701a082017c04820178152000012501f1ff3602050080050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100bd4d1f301a93348a0ddbc3dd5e211094f895561c05786d9abe73c0d4761c8e24022100fa3ee82640b34776e7db89775cc8d4f84689406050a0479bae67d87903de625d",
+    "dac_private_key": "b221e15b1b1024b0ac14f6e711ce5ae0ee653fda28f788fa4c3ebcd5845d73d2",
+    "dac_public_key": "0410346e4a796e6b750d3f55d0ed9b0db33995794cb240a596db2458475693d0807d3fd6860971a685a77737ebbdbd2033b274894339ad4620fbe31b44261ffb43"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der
index fce4990937451a..968bc702c62748 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der
index 125f8500bd6438..942b24eb99e673 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem
index eaafdddd4b1419..6b00a6ab380735 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIDW/P6/tLfiEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIdd/hpoFGflEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-MjTJB46gDccXixsRZJna9TUV5fZSuzzoNYFN+AR03s9pBkwibIOiCAAr73QX5TXY
-wnnyNCj0BPJb1eq2/cAS9aNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFEbOUOLkv0f7+tHuqf7AWYlWGEkBMB8GA1UdIwQYMBaAFCMe
-EwHbqPnXNbxu8/+fNfSV/wg6MAoGCCqGSM49BAMCA0cAMEQCIAS2B4EzLoxMClz6
-iTC7yoKFOjHCdkkDVSlMaaEhhUpZAiB+md0E/kNaY4flFQWZ7sIg1PAQHN3A2Exx
-oHZr//wacQ==
+VslFXMsXyx0oTj+80hh69FCfHDWtK9SmG+WX2+3LoZobmPW+NpLFZ5UomYVXVueb
+x9sb7E/3PfoRjzJq+DuQn6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFn2DzSMSDadeoMcA+lWEBdaAO2XMB8GA1UdIwQYMBaAFHOk
+QSmm9sKNG4BjfDwxTJVKpwV4MAoGCCqGSM49BAMCA0gAMEUCIGeetvKl8lS9cGR/
+3nDjgH05MAz67b0TLi3Zz3vDTgwGAiEA3ceMpFFRGFyAiP4oQDiwAKShy7HTrdxg
+Znnz6iTlD9c=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der
index 4a9f80b0446e97..1472db84152830 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem
index ca57f553e48f4c..09ce7da1891973 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBqsVMpqMpGbPNE+dHWHUW1ut7A6o5q2YOAQ1IVpWugkoAoGCCqGSM49
-AwEHoUQDQgAEMjTJB46gDccXixsRZJna9TUV5fZSuzzoNYFN+AR03s9pBkwibIOi
-CAAr73QX5TXYwnnyNCj0BPJb1eq2/cAS9Q==
+MHcCAQEEIMMmNtM/gsT0DGUM1ajcicF+lW1riZqQQjVr6tD9unUQoAoGCCqGSM49
+AwEHoUQDQgAEVslFXMsXyx0oTj+80hh69FCfHDWtK9SmG+WX2+3LoZobmPW+NpLF
+Z5UomYVXVuebx9sb7E/3PfoRjzJq+DuQnw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der
index 5a45454c40b781..95775b2aa7fa5f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem
index 5380fa721de8b3..1cca97a238cf89 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIYDkn68zLjzMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1TCCAXqgAwIBAgIIbOGPY+3gWYwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQhMGd7bMeVrT02FRtcfsNMgwUtbp+v
-59Np+ZpQ73T0tsVowHEPfrgMsY0tYHcCm2Ur627W0C33ZMlPNsYgPyl6o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUIx4T
-Aduo+dc1vG7z/5819JX/CDowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgVUAxdY3CTM/IWhkIBtqL5HMka6VnGhskw0D3
-v7eP4qgCIGDnmOt8Sc+JiIeBJkQjLAkhk0sUOckUS2OERVVSClfX
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS1XNaIIOS/v7TMnAhxOSKiPFlnqJY6
+s22tUYKfyFBXUIK9TNeILZSzJFdtMLcc5mOmyrdOeXHD0bPmiyx5UIECo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUc6RB
+Kab2wo0bgGN8PDFMlUqnBXgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIzKLF9RkPbpHOYTgbEYlMt10MrJG9t/Dj6L
+ithQdOzBAiEA7bfTYVT/njOx/PFzjr7SV98bClphWWI5IuyQjy9s7WU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der
index 73fcbfd757c923..a06acf30392709 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem
index 1630347e56e918..39c4f68027a12a 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO6EnMiiW56IaSw/RsoTfZxlClNnF6S0F++jE0xVLrTsoAoGCCqGSM49
-AwEHoUQDQgAEITBne2zHla09NhUbXH7DTIMFLW6fr+fTafmaUO909LbFaMBxD364
-DLGNLWB3AptlK+tu1tAt92TJTzbGID8peg==
+MHcCAQEEIGyHHnffjmEkuASt83Pf4uDv9bBoUxuR34chfoIQ+g6LoAoGCCqGSM49
+AwEHoUQDQgAEtVzWiCDkv7+0zJwIcTkiojxZZ6iWOrNtrVGCn8hQV1CCvUzXiC2U
+syRXbTC3HOZjpsq3Tnlxw9Gz5osseVCBAg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
index d63a05cd8ad98a..48c0a5790a3545 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 10 PID values none of which matches the PID value in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202080d6fcfebfb4b7e21300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043234c9078ea00dc7178b1b116499daf53515e5f652bb3ce835814df80474decf69064c226c83a208002bef7417e535d8c279f23428f404f25bd5eab6fdc012f5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041446ce50e2e4bf47fbfad1eea9fec0598956184901301f0603551d23041830168014231e1301dba8f9d735bc6ef3ff9f35f495ff083a300a06082a8648ce3d0403020347003044022004b60781332e8c4c0a5cfa8930bbca82853a31c276490355294c69a121854a5902207e99dd04fe435a6387e5150599eec220d4f0101cddc0d84c71a0766bfffc1a71",
-    "pai_cert": "308201d33082017aa0030201020208603927ebcccb8f33300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042130677b6cc795ad3d36151b5c7ec34c83052d6e9fafe7d369f99a50ef74f4b6c568c0710f7eb80cb18d2d6077029b652beb6ed6d02df764c94f36c6203f297aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414231e1301dba8f9d735bc6ef3ff9f35f495ff083a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220554031758dc24ccfc85a190806da8be473246ba5671a1b24c340f7bfb78fe2a8022060e798eb7c49cf898887812644232c0921934b1439c9144b63844555520a57d7",
-    "certification_declaration": "3082011f06092a864886f70d010702a08201103082010c020103310d300b0609608648016503040201307906092a864886f70d010701a06c046a152000012501f1ff3602050180050280050380050480050580050680050780050880050980050a8018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201a6b5eaa546d38d7cd8c066b685c5c7476573987fbe360980c4cd2b282d2a1a6022100fbc84274280ae6e2425aa6a5d89dc524fa3fbd33dd01ee4de1ae3e33863f323c",
-    "dac_private_key": "1aac54ca6a32919b3cd13e747587516d6eb7b03aa39ab660e010d485695ae824",
-    "dac_public_key": "043234c9078ea00dc7178b1b116499daf53515e5f652bb3ce835814df80474decf69064c226c83a208002bef7417e535d8c279f23428f404f25bd5eab6fdc012f5"
+    "dac_cert": "308201e43082018aa003020102020875dfe1a681467e51300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000456c9455ccb17cb1d284e3fbcd2187af4509f1c35ad2bd4a61be597dbedcba19a1b98f5be3692c567952899855756e79bc7db1bec4ff73dfa118f326af83b909fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041459f60f348c48369d7a831c03e95610175a00ed97301f0603551d2304183016801473a44129a6f6c28d1b80637c3c314c954aa70578300a06082a8648ce3d04030203480030450220679eb6f2a5f254bd70647fde70e3807d39300cfaedbd132e2dd9cf7bc34e0c06022100ddc78ca45151185c8088fe284038b000a4a1cbb1d3addc606679f3ea24e50fd7",
+    "pai_cert": "308201d53082017aa00302010202086ce18f63ede0598c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b55cd68820e4bfbfb4cc9c08713922a23c5967a8963ab36dad51829fc850575082bd4cd7882d94b324576d30b71ce663a6cab74e7971c3d1b3e68b2c79508102a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041473a44129a6f6c28d1b80637c3c314c954aa70578301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008cca2c5f5190f6e91ce61381b11894cb75d0cac91bdb7f0e3e8b8ad85074ecc1022100edb7d36154ff9e33b1fcf1738ebed257df1b0a5a6159623922ec908f2f6ced65",
+    "certification_declaration": "3082011e06092a864886f70d010702a082010f3082010b020103310d300b0609608648016503040201307906092a864886f70d010701a06c046a152000012501f1ff3602050180050280050380050480050580050680050780050880050980050a8018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203d38b329272ff8c8fd77dfd4e72b69644883362f6d1b55b15b94e027bda056780220221c16d31dcde97337d7eab24f07a019ff2246328821fe5cecba563c0f69232b",
+    "dac_private_key": "c32636d33f82c4f40c650cd5a8dc89c17e956d6b899a9042356bead0fdba7510",
+    "dac_public_key": "0456c9455ccb17cb1d284e3fbcd2187af4509f1c35ad2bd4a61be597dbedcba19a1b98f5be3692c567952899855756e79bc7db1bec4ff73dfa118f326af83b909f"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der
index 0208f48230c9aa..66ea8e33913732 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der
index f95c3bf24e9f1e..e7bd19a6026722 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem
index 2fcccb7057c577..b2265d42f59d9a 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIQs5TRtlQi6AwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIID5rymQC724gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-XDfAn1SgeE4/WB3Sl689uEbetdZ6ShERmihB1rqwXzjyMSWav4/zRgkBw08XRBSP
-iJLYxcocqwf8VUOp407KnKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHoTIkuccC2JWtStO3mPPlcMeXMqMB8GA1UdIwQYMBaAFDcs
-twTu8rJssObpsHiiqilLm8bYMAoGCCqGSM49BAMCA0gAMEUCIQCX9WysIDGWi0fD
-PI0QQKnbsBTql9YWJonpKNQrs8U7ogIgdwNy9lqPIA+lHJ1EkwXFW1HHpSSYF8zD
-rX+VYB/rnNM=
+Kl9ZstKXeKmh8QwrzksjcXeEXmGvcOiMC2mWcpLjlg6EGPcLK/F/4plRI/U1JCyT
+hU98UW+ygYQ4L9VhH6Z+ZaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNIQ188Ovm1Q0cQilHEpcg5psjWYMB8GA1UdIwQYMBaAFPdf
+d6EMk8ji49JDNwk47EeXSufpMAoGCCqGSM49BAMCA0cAMEQCIASLZ3UqYirWQW0v
+OvDc3akOvcwlFzsF0bbX560YuNgpAiBOS5qF5xuZyiT2VCokb8pznHLGsXUUYEs/
+UfJSCIjjfQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der
index eb059edc50f1b7..097f1352ed81f0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem
index a64613b58edcc5..fd84ef21be1be7 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP3DpHfIe2QPIeaawRkVT19Rh8iVvuJsVDH982eir8PMoAoGCCqGSM49
-AwEHoUQDQgAEXDfAn1SgeE4/WB3Sl689uEbetdZ6ShERmihB1rqwXzjyMSWav4/z
-RgkBw08XRBSPiJLYxcocqwf8VUOp407KnA==
+MHcCAQEEIG2LPNOto98L63qpTGXkTcKC5xBfSuJPFkL8w+il6pz9oAoGCCqGSM49
+AwEHoUQDQgAEKl9ZstKXeKmh8QwrzksjcXeEXmGvcOiMC2mWcpLjlg6EGPcLK/F/
+4plRI/U1JCyThU98UW+ygYQ4L9VhH6Z+ZQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der
index 3754751381f427..ae499fe1c6fbee 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem
index 74766ab1894dc8..f06ad86779baf3 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIMAPYAZtS0rEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIISt9GFWbDYVowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARjfyGLY+pMTQiI7KCSgSDvWJLmoy+z
-bUC0f+IYlVKQwj1apqnaqAapc2+guiD8hhHsF+fix76YRUafuKysMQmko2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUNyy3
-BO7ysmyw5umweKKqKUubxtgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhALJ6/i1B4n+WZRczG/NsQpu/Qg7NZxSrRSZa
-vOeR/X/qAiEApRgxy9fxXg4q2dT1blwazv4FD5f+vhxwmtZfMU+yjyA=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7vWtMRQJo2r7s/xVP+nngU6JjBsmp
+Z7FYzTW7SVwwVu+7MmJTRX+nOw2sQKkIXmn+n9NRcNUaKLAOOIokEkJHo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9193
+oQyTyOLj0kM3CTjsR5dK5+kwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgN0dv8sWuRUnYnIc+pmG6HJRACYVwnamjWW+5
+LBFGKj8CIFCwY42gdkZQpSPRtIibPXpCOMzbMA7lCF1hsRzRcfBJ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der
index 90f34dafff2bc9..70d2b3de5ef878 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem
index 7acc7d3afa1c3f..8681158a6fea58 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFCQM5qIPa5xAP0wZEQKuJEL38uVFU+PuWLWR97f3FrdoAoGCCqGSM49
-AwEHoUQDQgAEY38hi2PqTE0IiOygkoEg71iS5qMvs21AtH/iGJVSkMI9Wqap2qgG
-qXNvoLog/IYR7Bfn4se+mEVGn7isrDEJpA==
+MHcCAQEEIAJcPXOcjEDfD+Sad36LwkbhP7Wpf/0CTu9JeojV5KTsoAoGCCqGSM49
+AwEHoUQDQgAE+71rTEUCaNq+7P8VT/p54FOiYwbJqWexWM01u0lcMFbvuzJiU0V/
+pzsNrECpCF5p/p/TUXDVGiiwDjiKJBJCRw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json
index d9cc7002419b65..be7843a18acfce 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 10 PID values one of which matches the PID value in DAC.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa003020102020842ce5346d9508ba0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045c37c09f54a0784e3f581dd297af3db846deb5d67a4a11119a2841d6bab05f38f231259abf8ff3460901c34f1744148f8892d8c5ca1cab07fc5543a9e34eca9ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147a13224b9c702d895ad4ad3b798f3e570c79732a301f0603551d23041830168014372cb704eef2b26cb0e6e9b078a2aa294b9bc6d8300a06082a8648ce3d040302034800304502210097f56cac2031968b47c33c8d1040a9dbb014ea97d6162689e928d42bb3c53ba20220770372f65a8f200fa51c9d449305c55b51c7a5249817ccc3ad7f95601feb9cd3",
-    "pai_cert": "308201d53082017aa00302010202083003d8019b52d2b1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004637f218b63ea4c4d0888eca0928120ef5892e6a32fb36d40b47fe218955290c23d5aa6a9daa806a9736fa0ba20fc8611ec17e7e2c7be9845469fb8acac3109a4a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414372cb704eef2b26cb0e6e9b078a2aa294b9bc6d8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b27afe2d41e27f966517331bf36c429bbf420ecd6714ab45265abce791fd7fea022100a51831cbd7f15e0e2ad9d4f56e5c1acefe050f97febe1c709ad65f314fb28f20",
-    "certification_declaration": "3082011f06092a864886f70d010702a08201103082010c020103310d300b0609608648016503040201307906092a864886f70d010701a06c046a152000012501f1ff360205008005018005028005038005048005058005068005078005088005098018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022073e59b3306940cff0b285a783b2277d7ff2348fe24baba32132ba81bd1b65961022100b74ed8352a2da96a8767c49b8d7678515e31617808ae94f0b9a1ae55b929c0c7",
-    "dac_private_key": "fdc3a477c87b640f21e69ac119154f5f5187c895bee26c5431fdf367a2afc3cc",
-    "dac_public_key": "045c37c09f54a0784e3f581dd297af3db846deb5d67a4a11119a2841d6bab05f38f231259abf8ff3460901c34f1744148f8892d8c5ca1cab07fc5543a9e34eca9c"
+    "dac_cert": "308201e33082018aa00302010202080f9af29900bbdb88300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042a5f59b2d29778a9a1f10c2bce4b237177845e61af70e88c0b69967292e3960e8418f70b2bf17fe2995123f535242c93854f7c516fb28184382fd5611fa67e65a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d210d7cf0ebe6d50d1c422947129720e69b23598301f0603551d23041830168014f75f77a10c93c8e2e3d243370938ec47974ae7e9300a06082a8648ce3d04030203470030440220048b67752a622ad6416d2f3af0dcdda90ebdcc25173b05d1b6d7e7ad18b8d82902204e4b9a85e71b99ca24f6542a246fca739c72c6b17514604b3f51f2520888e37d",
+    "pai_cert": "308201d33082017aa00302010202084adf461566c3615a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fbbd6b4c450268dabeecff154ffa79e053a26306c9a967b158cd35bb495c3056efbb326253457fa73b0dac40a9085e69fe9fd35170d51a28b00e388a24124247a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f75f77a10c93c8e2e3d243370938ec47974ae7e9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022037476ff2c5ae4549d89c873ea661ba1c94400985709da9a3596fb92c11462a3f022050b0638da0764650a523d1b4889b3d7a4238ccdb300ee5085d61b11cd171f049",
+    "certification_declaration": "3082011f06092a864886f70d010702a08201103082010c020103310d300b0609608648016503040201307906092a864886f70d010701a06c046a152000012501f1ff360205008005018005028005038005048005058005068005078005088005098018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220279ee772fed94f6b82b48f2dd16130a902d4ec2bb8d1b3d9712a48f91efed02e022100c9ba714ba1f2530e8ee49d4a8ce8cabe34c52fca7598f461f4764be0606fbd59",
+    "dac_private_key": "6d8b3cd3ada3df0beb7aa94c65e44dc282e7105f4ae24f1642fcc3e8a5ea9cfd",
+    "dac_public_key": "042a5f59b2d29778a9a1f10c2bce4b237177845e61af70e88c0b69967292e3960e8418f70b2bf17fe2995123f535242c93854f7c516fb28184382fd5611fa67e65"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der
index 119ee144c09dc6..cbe968c3033efc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der
index 5fedf783c8aa7b..025a61e9e55218 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem
index fd2a6af632714d..5090e20f80a13e 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIfBaRBm3gh5MwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIICMfC1tClixEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-8NPOXi0IXMvWhagJLoqZAp5+dDsz19qITOXILNuFzlUnhrfbQv/50aIR64nqv7Mz
-mppO8QfGuJ+AZKoX0IX/n6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNYGOBZ8MpaTrD/Caz5k0Of14PeTMB8GA1UdIwQYMBaAFDFz
-y6X6ycIiO+rlQm7Omy/lZWs+MAoGCCqGSM49BAMCA0gAMEUCIE098BPWqvGPBv5o
-OfjbdrdJOyXD/avlXitY69HDOVIhAiEA3VYeVkGi2BV/HbegeYXe7GhIEWDegKOj
-AjfPAz/tPbQ=
+TYDm9E12N+b00xMBGW3mNh2w5fHM0Q0Cxf3lTBPBBqUY6rBZ7saTM8HRWe2bps+r
+zZbESdTb03LsO77UdFsOhaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFOhLlp4xBCd8CiXsL9LgFM9sq7xQMB8GA1UdIwQYMBaAFDB1
+gVp3d5YkrAZJtoIULEIUVk19MAoGCCqGSM49BAMCA0gAMEUCIF/mNcmOFTdcnAKH
+2rqdCeiRDrkU6huWlShRsOQ6Na0lAiEAl6kEtE6QthZyYm+bsPq2DlSAQGHlulhz
+FXmdlb4qKbg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der
index 2eb2b321ae75d2..7ac88a6882181d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem
index 46a7a13a7e0e1e..1155c901cb7a46 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDwsI9AuyproByYy/KQvNV62P2OzY7E49qtH6MxhBPLroAoGCCqGSM49
-AwEHoUQDQgAE8NPOXi0IXMvWhagJLoqZAp5+dDsz19qITOXILNuFzlUnhrfbQv/5
-0aIR64nqv7MzmppO8QfGuJ+AZKoX0IX/nw==
+MHcCAQEEIEhh4VsccqiA3Zp27h5LDxhPtUxmlOmiIy+cwHxqcS60oAoGCCqGSM49
+AwEHoUQDQgAETYDm9E12N+b00xMBGW3mNh2w5fHM0Q0Cxf3lTBPBBqUY6rBZ7saT
+M8HRWe2bps+rzZbESdTb03LsO77UdFsOhQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der
index 3de287053f2fcf..d441ee934f9721 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem
index 9f3df97174caee..6ac58ee3b781b1 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIW6ea2CHad4IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIMY5vvanUmVowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQekHc7791XHA2L59J0TqNNG5fvBEIa
-SPFM+bci5HtkuD/Uik4CCIsu4jlZ0Azw90m/0MNVcGLdefbMdd9Z0RC2o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUMXPL
-pfrJwiI76uVCbs6bL+Vlaz4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKUshZwnLBAmGmelZL8sf+qXu65U6S1W1BZY
-GaufCjvjAiBpWt7xSgMtRVqWEdUYYGMl3kCkXeHFsDenqo7e+FztkQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATN3SFe8aCtSSzLO35WRLw4nN2GkK5d
+JMFb+PHDjxtZxSjgjqWCxy43Xwt0TsZVeUhsgp45PYDPVxZG6x8p1DXzo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUMHWB
+Wnd3liSsBkm2ghQsQhRWTX0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgRY2QpWeE3fcUo2s1ICtUnh5WGO38IDXfMFuG
+3pa1BGYCIDgJ0pcVWqnq2jSrs4M1T/dCVFMWnNSTUT9VJ4NHtJ01
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der
index 88fc9e6dab3d45..19b4581b7baccc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem
index 46eb666770587e..b724bc64c7ea5c 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJgDemzgsb39rnsPaIdNpuKZJ+nIwgJqyWpP0QS4++yZoAoGCCqGSM49
-AwEHoUQDQgAEHpB3O+/dVxwNi+fSdE6jTRuX7wRCGkjxTPm3IuR7ZLg/1IpOAgiL
-LuI5WdAM8PdJv9DDVXBi3Xn2zHXfWdEQtg==
+MHcCAQEEIAiRCMeYrn6/O4n2CVP4vvrc0s4Ec8SJhoBaXSyQmKtEoAoGCCqGSM49
+AwEHoUQDQgAEzd0hXvGgrUksyzt+VkS8OJzdhpCuXSTBW/jxw48bWcUo4I6lgscu
+N18LdE7GVXlIbIKeOT2Az1cWRusfKdQ18w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json
index 1c36b45178f581..e4c8f3d27ad77a 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202087c1691066de08793300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f0d3ce5e2d085ccbd685a8092e8a99029e7e743b33d7da884ce5c82cdb85ce552786b7db42fff9d1a211eb89eabfb3339a9a4ef107c6b89f8064aa17d085ff9fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d60638167c329693ac3fc26b3e64d0e7f5e0f793301f0603551d230418301680143173cba5fac9c2223beae5426ece9b2fe5656b3e300a06082a8648ce3d040302034800304502204d3df013d6aaf18f06fe6839f8db76b7493b25c3fdabe55e2b58ebd1c3395221022100dd561e5641a2d8157f1db7a07985deec68481160de80a3a30237cf033fed3db4",
-    "pai_cert": "308201d43082017aa00302010202085ba79ad821da7782300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041e90773befdd571c0d8be7d2744ea34d1b97ef04421a48f14cf9b722e47b64b83fd48a4e02088b2ee23959d00cf0f749bfd0c3557062dd79f6cc75df59d110b6a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604143173cba5fac9c2223beae5426ece9b2fe5656b3e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a52c859c272c10261a67a564bf2c7fea97bbae54e92d56d4165819ab9f0a3be30220695adef14a032d455a9611d518606325de40a45de1c5b037a7aa8edef85ced91",
-    "certification_declaration": "3081fc06092a864886f70d010702a081ee3081eb020103310d300b0609608648016503040201305806092a864886f70d010701a04b0449152000012501f1ff250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502205f14e817bb8227d694873778a858f9323dddc253dd57bc679c0e5e2d17dcf4770221009c45aadec12394c7a143c1b98ff7f0aa6e953a1cfd4fe5d8f945e8c8f1b14321",
-    "dac_private_key": "3c2c23d02eca9ae8072632fca42f355eb63f63b363b138f6ab47e8cc6104f2eb",
-    "dac_public_key": "04f0d3ce5e2d085ccbd685a8092e8a99029e7e743b33d7da884ce5c82cdb85ce552786b7db42fff9d1a211eb89eabfb3339a9a4ef107c6b89f8064aa17d085ff9f"
+    "dac_cert": "308201e43082018aa003020102020808c7c2d6d0a58b11300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044d80e6f44d7637e6f4d31301196de6361db0e5f1ccd10d02c5fde54c13c106a518eab059eec69333c1d159ed9ba6cfabcd96c449d4dbd372ec3bbed4745b0e85a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e84b969e3104277c0a25ec2fd2e014cf6cabbc50301f0603551d230418301680143075815a77779624ac0649b682142c4214564d7d300a06082a8648ce3d040302034800304502205fe635c98e15375c9c0287daba9d09e8910eb914ea1b96952851b0e43a35ad2502210097a904b44e90b61672626f9bb0fab60e54804061e5ba587315799d95be2a29b8",
+    "pai_cert": "308201d33082017aa0030201020208318e6fbda9d4995a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cddd215ef1a0ad492ccb3b7e5644bc389cdd8690ae5d24c15bf8f1c38f1b59c528e08ea582c72e375f0b744ec65579486c829e393d80cf571646eb1f29d435f3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143075815a77779624ac0649b682142c4214564d7d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220458d90a56784ddf714a36b35202b549e1e5618edfc2035df305b86de96b5046602203809d297155aa9eada34abb383354ff7425453169cd493513f55278347b49d35",
+    "certification_declaration": "3081fc06092a864886f70d010702a081ee3081eb020103310d300b0609608648016503040201305806092a864886f70d010701a04b0449152000012501f1ff250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207bc399d97e81bf2edd52b123e061510c2d8609382c0df0b105321fde35ad7886022100c0b3945714ea5a57afad9abef787345be01b3af75ed028b94ef5bcb510b8d2b7",
+    "dac_private_key": "4861e15b1c72a880dd9a76ee1e4b0f184fb54c6694e9a2232f9cc07c6a712eb4",
+    "dac_public_key": "044d80e6f44d7637e6f4d31301196de6361db0e5f1ccd10d02c5fde54c13c106a518eab059eec69333c1d159ed9ba6cfabcd96c449d4dbd372ec3bbed4745b0e85"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der
index 2284f23596e803..262f81196ca656 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der
index 0c8efbff7ebb79..5651de1347e3e3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem
index 56dc334b58cf5d..c69896ae810ff3 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIe/FfAa+8L2swCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIINkgq+3kzXlEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-MOtQ1FBsDIiIs2m5f/i44GLmyskM/Cr66uM5jkgyWmm4oprnFn6fL/rIj2dt8yN3
-Mh64T/eJrxdWcEr91T7NIKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGVde9k4V7SCSks/rf+lFAIAKL6aMB8GA1UdIwQYMBaAFLlg
-t2bT8ytLvgqNgG8hRMnlbsoqMAoGCCqGSM49BAMCA0gAMEUCIQDMiDcAi6AgFS9Y
-hauVpk5luOCi5sn57DUw12ls+J4anQIgDndbMOh8Ae4bick2PVUk0okh6eminiG8
-2aHxZHtk6eM=
+PWQPXR4Aoi4zCl0HZuuZFI2lFyWJOdTV3fQsmc5zb0B879vXuS8h68+GVsUsguB0
+sD2NW7KwP9YON+XwyH6FCKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNYgvu2nrsdyuPzMnP5EggQSTgaDMB8GA1UdIwQYMBaAFGol
+yH3xUpQZnfeOPTbHjpFmMUKsMAoGCCqGSM49BAMCA0kAMEYCIQCoc72c0vWxxmaH
+Rk2DR2TR1ugyB8zCZ5oTHDD/EI3VSwIhAJCpBgeiRiN1wm9cM9giizUWme12dvrV
+GfcCjj91lJYk
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der
index 2447cd5e9b2e6f..6c833a1623a51c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem
index 13e7f6eb83c7bb..c88a69fbe4945f 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMebWfnqOWtPiN9Xu9IsdxA/8wy5AXXekMYAfne0JQmhoAoGCCqGSM49
-AwEHoUQDQgAEMOtQ1FBsDIiIs2m5f/i44GLmyskM/Cr66uM5jkgyWmm4oprnFn6f
-L/rIj2dt8yN3Mh64T/eJrxdWcEr91T7NIA==
+MHcCAQEEILYOAwiQ90NNo3utsfK4CXDJXBaCDP0FtzhdetGpmEHYoAoGCCqGSM49
+AwEHoUQDQgAEPWQPXR4Aoi4zCl0HZuuZFI2lFyWJOdTV3fQsmc5zb0B879vXuS8h
+68+GVsUsguB0sD2NW7KwP9YON+XwyH6FCA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der
index 67569132f1ac54..aa4ad0463d4e6a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem
index 2ebeacf8a5c91e..734657be29cc0f 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIbjVFTleEe8wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIcqi0cRy/dGswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARYf0gAXoSbMDIbFWJ0+Ki6sf7DuNGV
-4dO0lWht9CgzhJUm8MWxEqGfAsWPfJssf2TlUPuBWizMvh/B7PiD4BWco2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUuWC3
-ZtPzK0u+Co2AbyFEyeVuyiowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgBG6NY06TxuGvs+m4fnXixWlKgw5ZkhX97mCb
-+cFjKLkCIQCtPK9xwOSI6nJyuB9P+NLylOr+MrUwr9O0p33HmB4hRg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATY9Jk5ELR8Pz2EezIfe10choDhDy6M
+1KFJgisorM7DMD0EcXiW5GdlD2b4iS7E1KWO6SKzIxoOD6Od7nH9ciioo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUaiXI
+ffFSlBmd9449NseOkWYxQqwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgR66WUV5/zgshaKrquy5lJ/I756xIyTG/k4AK
+F5nv97UCIDaNxJCLJVpmZjSav4uDr8W5aMiJS0Xl8KXuTFd9FVon
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der
index 17bd2f340e9c33..53fc3b1d9a9984 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem
index dbf024fbe7fb84..083104fbb519c3 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEJ0og2fJJ4O71BJMyXlrELO9A300IHSDg6qgEM+syfsoAoGCCqGSM49
-AwEHoUQDQgAEWH9IAF6EmzAyGxVidPiourH+w7jRleHTtJVobfQoM4SVJvDFsRKh
-nwLFj3ybLH9k5VD7gVoszL4fwez4g+AVnA==
+MHcCAQEEIO2SX/jJBTl3eehl5OnCq7O5IiljiCM0jvRM5Zo2FEVhoAoGCCqGSM49
+AwEHoUQDQgAE2PSZORC0fD89hHsyH3tdHIaA4Q8ujNShSYIrKKzOwzA9BHF4luRn
+ZQ9m+IkuxNSljukisyMaDg+jne5x/XIoqA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json
index 339114c56dfc8e..db7c8949cacb95 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_information field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202087bf15f01afbc2f6b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000430eb50d4506c0c8888b369b97ff8b8e062e6cac90cfc2afaeae3398e48325a69b8a29ae7167e9f2ffac88f676df32377321eb84ff789af1756704afdd53ecd20a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414655d7bd93857b4824a4b3fadffa514020028be9a301f0603551d23041830168014b960b766d3f32b4bbe0a8d806f2144c9e56eca2a300a06082a8648ce3d0403020348003045022100cc8837008ba020152f5885ab95a64e65b8e0a2e6c9f9ec3530d7696cf89e1a9d02200e775b30e87c01ee1b89c9363d5524d28921e9e9a29e21bcd9a1f1647b64e9e3",
-    "pai_cert": "308201d43082017aa00302010202086e35454e57847bcc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004587f48005e849b30321b156274f8a8bab1fec3b8d195e1d3b495686df42833849526f0c5b112a19f02c58f7c9b2c7f64e550fb815a2cccbe1fc1ecf883e0159ca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b960b766d3f32b4bbe0a8d806f2144c9e56eca2a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220046e8d634e93c6e1afb3e9b87e75e2c5694a830e599215fdee609bf9c16328b9022100ad3caf71c0e488ea7272b81f4ff8d2f294eafe32b530afd3b4a77dc7981e2146",
-    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ef62ce9b1b401f6a535184b8f1c8092549ccf01e8653e58760ef2834d764c785022038afb77b661d2a7a9bc63e9e79137a4b19c5efad2f34a6bd78526573084248c0",
-    "dac_private_key": "c79b59f9ea396b4f88df57bbd22c77103ff30cb90175de90c6007e77b42509a1",
-    "dac_public_key": "0430eb50d4506c0c8888b369b97ff8b8e062e6cac90cfc2afaeae3398e48325a69b8a29ae7167e9f2ffac88f676df32377321eb84ff789af1756704afdd53ecd20"
+    "dac_cert": "308201e53082018aa003020102020836482afb79335e51300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043d640f5d1e00a22e330a5d0766eb99148da517258939d4d5ddf42c99ce736f407cefdbd7b92f21ebcf8656c52c82e074b03d8d5bb2b03fd60e37e5f0c87e8508a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d620beeda7aec772b8fccc9cfe448204124e0683301f0603551d230418301680146a25c87df15294199df78e3d36c78e91663142ac300a06082a8648ce3d0403020349003046022100a873bd9cd2f5b1c66687464d834764d1d6e83207ccc2679a131c30ff108dd54b02210090a90607a2462375c26f5c33d8228b351699ed7676fad519f7028e3f75949624",
+    "pai_cert": "308201d33082017aa003020102020872a8b4711cbf746b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d8f4993910b47c3f3d847b321f7b5d1c8680e10f2e8cd4a149822b28accec3303d04717896e467650f66f8892ec4d4a58ee922b3231a0e0fa39dee71fd7228a8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146a25c87df15294199df78e3d36c78e91663142ac301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022047ae96515e7fce0b2168aaeabb2e6527f23be7ac48c931bf93800a1799eff7b50220368dc4908b255a6666349abf8b83afc5b968c8894b45e5f0a5ee4c577d155a27",
+    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022037d8e948fc8bba52507f628a75038db9c50ff7f1f1d2d8c04f4e4b12c7dbaccb022100f2da2ba38820d85f1adde06b766d11e4fecb358c7cf4522a72a404279cf8290e",
+    "dac_private_key": "b60e030890f7434da37badb1f2b80970c95c16820cfd05b7385d7ad1a99841d8",
+    "dac_public_key": "043d640f5d1e00a22e330a5d0766eb99148da517258939d4d5ddf42c99ce736f407cefdbd7b92f21ebcf8656c52c82e074b03d8d5bb2b03fd60e37e5f0c87e8508"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der
index b2c9a93764cc47..e7c193f3f35766 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der
index da4ba19d673e6c..56525c6e436896 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem
index c59eb484dc749f..9379781737b56e 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIXWF8uidLHHgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIZB50ywoitc8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-fVaINndxkCEFoq78yCBtRDjyh34K1VR6GJ98Oeb7jS2cNmT5KL/QiGWJxDXaBd09
-kkHFBoi+t5IDt+dYSFbyIqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFBijnEQzWDIt6bZVX5CQcQcZsAVlMB8GA1UdIwQYMBaAFIko
-6Hw1WCk3RLuT7OcMxg8VShWDMAoGCCqGSM49BAMCA0cAMEQCIDt4lbW6TSRjMs1q
-2IXlWBroLGbcMtzgoj6NAH00IN8dAiBaVk5cgAWztz5hvH3nnUv6oZet9ag7I2IW
-+IFgwCc3Yw==
+9HwXYG4H8oKW1KWZJaHBnR4f8Z5EgPOW5Z+qvSs9JWOOWRvpKnG08YelO9neAqa0
+ABgi2OdoTQaAEATdYBSqTaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKXELYAygaUtUCTcxSExn98fM+ndMB8GA1UdIwQYMBaAFG7C
+vbCZOGdvJLPuDtPG41FWU+YdMAoGCCqGSM49BAMCA0gAMEUCIBt0iroUPvZ3jjjq
+OiVEQ4lssd92AkYYeYPKoAKXdL8iAiEA7VgOqYNsvlsSzzGmowYkYgcwKnfWFRq0
+d6I9mAWcyDM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der
index ae9cb1eed03c2a..130f962702f969 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem
index c1ecce33a3a4e6..9a6f269f1b9655 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGzK5Utqhn2xf7S49G84gS1ntecK0M7oCJ1nJh1x4IZyoAoGCCqGSM49
-AwEHoUQDQgAEfVaINndxkCEFoq78yCBtRDjyh34K1VR6GJ98Oeb7jS2cNmT5KL/Q
-iGWJxDXaBd09kkHFBoi+t5IDt+dYSFbyIg==
+MHcCAQEEIOPfxG36Irs4ginNkhObDyzVLc7vd2UA/f12TKz06oDXoAoGCCqGSM49
+AwEHoUQDQgAE9HwXYG4H8oKW1KWZJaHBnR4f8Z5EgPOW5Z+qvSs9JWOOWRvpKnG0
+8YelO9neAqa0ABgi2OdoTQaAEATdYBSqTQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der
index 0544523e4f359d..d3599a8dbfe461 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem
index 52e794e4c15987..5ae97e84f5a34e 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIEYWE6iUMvhMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIfrIeuBrz6rgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARXQNNxugc+OMxaHVAwhnhHGdWBWUw5
-+2cu2zEwCgR9wqJix05G5fLrbXZzi0oqHuns1mzo33IuQ/wrBXprr3PQo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiSjo
-fDVYKTdEu5Ps5wzGDxVKFYMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKV6+TVpoC9Oz1Fjff1QQbHm6ew76vhjC3Xt
-0YW296UxAiBbNPFWGZuwCcpqqECy1DctbPasnh3Cqv9NKr9BJl3CBQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQjV4YSa9pzPuQpruZiyodPax1mlbXF
+xun1JX7SMQQDSvvO9waINqJ2vCXufAOkx8Bhfa5QDINRxvvldwcG9f1no2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUbsK9
+sJk4Z28ks+4O08bjUVZT5h0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgByivYbeBkHu8MQ/Bn9JFaWDJiZQMJfZ25xHE
+7VMKfPoCIQCrmaBG2GNsfyatvrU9XD0SEDfStltLzO++0X3R/CspJg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der
index 1efa0f2842c893..2444b092f7baee 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem
index a1501868787f7c..5acad2f155f187 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ7b+BlFK4Vt7PLGpkQeG4eqyATmjbiaiFgqIqKYrSKroAoGCCqGSM49
-AwEHoUQDQgAEV0DTcboHPjjMWh1QMIZ4RxnVgVlMOftnLtsxMAoEfcKiYsdORuXy
-6212c4tKKh7p7NZs6N9yLkP8KwV6a69z0A==
+MHcCAQEEIHoVAnU8pQfZMQZrsFWbwvhVSaB0NpN4pShpiRFIz0nWoAoGCCqGSM49
+AwEHoUQDQgAEI1eGEmvacz7kKa7mYsqHT2sdZpW1xcbp9SV+0jEEA0r7zvcGiDai
+drwl7nwDpMfAYX2uUAyDUcb75XcHBvX9Zw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json
index 2d6070993cbcde..43c5eb7108cc8a 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_information field is set to invalid value (different from 0).",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202085d617cba274b1c78300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047d5688367771902105a2aefcc8206d4438f2877e0ad5547a189f7c39e6fb8d2d9c3664f928bfd0886589c435da05dd3d9241c50688beb79203b7e7584856f222a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041418a39c443358322de9b6555f9090710719b00565301f0603551d230418301680148928e87c3558293744bb93ece70cc60f154a1583300a06082a8648ce3d040302034700304402203b7895b5ba4d246332cd6ad885e5581ae82c66dc32dce0a23e8d007d3420df1d02205a564e5c8005b3b73e61bc7de79d4bfaa197adf5a83b236216f88160c0273763",
-    "pai_cert": "308201d43082017aa0030201020208118584ea250cbe13300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045740d371ba073e38cc5a1d503086784719d581594c39fb672edb31300a047dc2a262c74e46e5f2eb6d76738b4a2a1ee9ecd66ce8df722e43fc2b057a6baf73d0a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604148928e87c3558293744bb93ece70cc60f154a1583301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a57af93569a02f4ecf51637dfd5041b1e6e9ec3beaf8630b75edd185b6f7a53102205b34f156199bb009ca6aa840b2d4372d6cf6ac9e1dc2aaff4d2abf41265dc205",
-    "certification_declaration": "3082010406092a864886f70d010702a081f63081f3020103310d300b0609608648016503040201305f06092a864886f70d010701a0520450152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002506ffff25077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b4c6186ac89197f89081ccbf9a070f9d399e9b506a52af397181b27bc6ad4e4e022100a5f9d2fb3d6a6f7a7a4fc1e1d82281e1ce87f1b78eec1fe0ce35d223cc498434",
-    "dac_private_key": "6ccae54b6a867db17fb4b8f46f38812d67b5e70ad0cee8089d67261d71e08672",
-    "dac_public_key": "047d5688367771902105a2aefcc8206d4438f2877e0ad5547a189f7c39e6fb8d2d9c3664f928bfd0886589c435da05dd3d9241c50688beb79203b7e7584856f222"
+    "dac_cert": "308201e43082018aa0030201020208641e74cb0a22b5cf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f47c17606e07f28296d4a59925a1c19d1e1ff19e4480f396e59faabd2b3d25638e591be92a71b4f187a53bd9de02a6b4001822d8e7684d06801004dd6014aa4da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a5c42d803281a52d5024dcc521319fdf1f33e9dd301f0603551d230418301680146ec2bdb09938676f24b3ee0ed3c6e3515653e61d300a06082a8648ce3d040302034800304502201b748aba143ef6778e38ea3a254443896cb1df760246187983caa0029774bf22022100ed580ea9836cbe5b12cf31a6a306246207302a77d6151ab477a23d98059cc833",
+    "pai_cert": "308201d43082017aa00302010202087eb21eb81af3eab8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004235786126bda733ee429aee662ca874f6b1d6695b5c5c6e9f5257ed23104034afbcef7068836a276bc25ee7c03a4c7c0617dae500c8351c6fbe5770706f5fd67a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146ec2bdb09938676f24b3ee0ed3c6e3515653e61d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200728af61b781907bbc310fc19fd2456960c989940c25f676e711c4ed530a7cfa022100ab99a046d8636c7f26adbeb53d5c3d121037d2b65b4bccefbed17dd1fc2b2926",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305f06092a864886f70d010701a0520450152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002506ffff25077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022045fc06db9dbb804d9022c24d5def82b310f35ace521b235a1a6e52148a115dc7022052d30b75dc7f38862a393c552d5599a0728254799c373ea096e92c8ce7bd6c7b",
+    "dac_private_key": "e3dfc46dfa22bb388229cd92139b0f2cd52dceef776500fdfd764cacf4ea80d7",
+    "dac_public_key": "04f47c17606e07f28296d4a59925a1c19d1e1ff19e4480f396e59faabd2b3d25638e591be92a71b4f187a53bd9de02a6b4001822d8e7684d06801004dd6014aa4d"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der
index b7a7a4546af80b..e1a434536d7ae4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der
index b8df4f23852da8..1aa19f316a16c6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem
index 62a993f6f6ed96..653b8225a74e51 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIE2lW9dSOCXEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIXh5/Ha07pBAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-t5w8YXkiv5/tiNjumN3Q2PY6dfst1MvY6XhFlB1omARO9HmjBAUWrTWxtzFT7OSw
-96KpPz4yo2cBpA5B9UPi5qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFIpcc3gGYiwljvCC4W68JVrE8QB4MB8GA1UdIwQYMBaAFEOF
-v5XccWakz5c28Zzn5w8bgDDEMAoGCCqGSM49BAMCA0cAMEQCIF8t+V/oDRZfW9Mj
-rWgFaD0G2Md1swAHtGG1/35bUcTsAiAnvb/PGzp/k92onwkSW8LiYhWDakKigMMo
-+Oxd29vNUQ==
+fF6w6DEECgHiIO9pWs+lNoHy7B1/SO0GMxb1mxbMCgCceDYJzK1cJqhlEW6AjsQN
+Iirbw/+51tCo0cSOum+DJqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFA4llNWmTNxndpKnVV3vfRhrJ+60MB8GA1UdIwQYMBaAFIl3
+tYgFLXkvMakUd+AcmeFaqgtTMAoGCCqGSM49BAMCA0cAMEQCIHjetx0CpYtZWuO3
+sWTHoxZ+klzxr8ivH6nqJ7QQYEOzAiBY1BaT/rhHBvzQHFkHjsL+3kE6ITTYlO7E
+xDE1gjRJUg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der
index 79001453f83ee5..136fd6dadbd5ee 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem
index 60cc1af93d6dfa..273e24b8d7cc92 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDB/06T71jm3TIkm+Ens9myN7rHx284jQAYRSeYQKEm3oAoGCCqGSM49
-AwEHoUQDQgAEt5w8YXkiv5/tiNjumN3Q2PY6dfst1MvY6XhFlB1omARO9HmjBAUW
-rTWxtzFT7OSw96KpPz4yo2cBpA5B9UPi5g==
+MHcCAQEEILlxd46H+FOm9nf/SS06wx523Q5GIHCQVutRUbBXNsepoAoGCCqGSM49
+AwEHoUQDQgAEfF6w6DEECgHiIO9pWs+lNoHy7B1/SO0GMxb1mxbMCgCceDYJzK1c
+JqhlEW6AjsQNIirbw/+51tCo0cSOum+DJg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der
index a99a06f8655310..adb808991e31a6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem
index e133bed25cd9e9..fc8c8348655839 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIZc+RSNNs1g0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIITgos/G5jHqkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ2PvNC80HpuxlqJR0iTxdB9ccsQlS1
-4sY+PYvM3pRZPl30BJdIgK1Eyet2kkcb3J2nkV+tbCzMLyR3uBEbaWKro2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQ4W/
-ldxxZqTPlzbxnOfnDxuAMMQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAOzPUazq0/KGaRcbM9ree1fSm5cysifxQlrh
-jHVWmRkyAiEAkNim1tWp0OCJCQVBMHStRfytLvUiQEhmSUn3vQk9KuM=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARywNeUxPbZOw5TL8LLiHqDdL+hrUQk
+x/t+H9E6mtO7BTSDtcASBofhU5uVGzY1ptzeh1qw5GNGbAEeW8KA7qZdo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiXe1
+iAUteS8xqRR34ByZ4VqqC1MwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAI6KfO44RhCQfcjvCJbg6PXZWqlfIQ92S5kf
+dGD9+IbBAiA3G5TZdZG5GYbYkOm5vzXRMCGv/m9fLmOUgEwd9CjKkg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der
index d6373a4dbdfbe7..6d16570f322bf6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem
index a94c627c37b487..922bec5b3b5fd8 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMczwDpRkOwfuVdXXo2KX1mI2Xi9b18kw6N3bjrVrrbeoAoGCCqGSM49
-AwEHoUQDQgAENj7zQvNB6bsZaiUdIk8XQfXHLEJUteLGPj2LzN6UWT5d9ASXSICt
-RMnrdpJHG9ydp5FfrWwszC8kd7gRG2liqw==
+MHcCAQEEICByQk2XLl9inolBn/G6Xmz8OD27M0USDe37Z9xKAczeoAoGCCqGSM49
+AwEHoUQDQgAEcsDXlMT22TsOUy/Cy4h6g3S/oa1EJMf7fh/ROprTuwU0g7XAEgaH
+4VOblRs2Nabc3odasORjRmwBHlvCgO6mXQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json
index ea8fa08cc30ff5..7bddd7499b83e8 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_level field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa0030201020208136956f5d48e0971300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b79c3c617922bf9fed88d8ee98ddd0d8f63a75fb2dd4cbd8e97845941d6898044ef479a3040516ad35b1b73153ece4b0f7a2a93f3e32a36701a40e41f543e2e6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148a5c737806622c258ef082e16ebc255ac4f10078301f0603551d230418301680144385bf95dc7166a4cf9736f19ce7e70f1b8030c4300a06082a8648ce3d040302034700304402205f2df95fe80d165f5bd323ad6805683d06d8c775b30007b461b5ff7e5b51c4ec022027bdbfcf1b3a7f93dda89f09125bc2e26215836a42a280c328f8ec5ddbdbcd51",
-    "pai_cert": "308201d53082017aa003020102020865cf9148d36cd60d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004363ef342f341e9bb196a251d224f1741f5c72c4254b5e2c63e3d8bccde94593e5df404974880ad44c9eb7692471bdc9da7915fad6c2ccc2f2477b8111b6962aba366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604144385bf95dc7166a4cf9736f19ce7e70f1b8030c4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100eccf51acead3f28669171b33dade7b57d29b9732b227f1425ae18c755699193202210090d8a6d6d5a9d0e0890905413074ad45fcad2ef5224048664949f7bd093d2ae3",
-    "certification_declaration": "3082010006092a864886f70d010702a081f23081ef020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c1a3698a2bccb567d756b54af0f401293edd651d68dc324d6a320f7e788a0a5c0221008e55e68f6444efbe96048ffb2da98bae39d039a9facdf7416aa9ab2c68f14422",
-    "dac_private_key": "307fd3a4fbd639b74c8926f849ecf66c8deeb1f1dbce2340061149e6102849b7",
-    "dac_public_key": "04b79c3c617922bf9fed88d8ee98ddd0d8f63a75fb2dd4cbd8e97845941d6898044ef479a3040516ad35b1b73153ece4b0f7a2a93f3e32a36701a40e41f543e2e6"
+    "dac_cert": "308201e33082018aa00302010202085e1e7f1dad3ba410300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047c5eb0e831040a01e220ef695acfa53681f2ec1d7f48ed063316f59b16cc0a009c783609ccad5c26a865116e808ec40d222adbc3ffb9d6d0a8d1c48eba6f8326a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140e2594d5a64cdc677692a7555def7d186b27eeb4301f0603551d230418301680148977b588052d792f31a91477e01c99e15aaa0b53300a06082a8648ce3d0403020347003044022078deb71d02a58b595ae3b7b164c7a3167e925cf1afc8af1fa9ea27b4106043b3022058d41693feb84706fcd01c59078ec2fede413a2134d894eec4c4313582344952",
+    "pai_cert": "308201d43082017aa00302010202084e0a2cfc6e631ea9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000472c0d794c4f6d93b0e532fc2cb887a8374bfa1ad4424c7fb7e1fd13a9ad3bb053483b5c0120687e1539b951b3635a6dcde875ab0e463466c011e5bc280eea65da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148977b588052d792f31a91477e01c99e15aaa0b53301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008e8a7cee384610907dc8ef0896e0e8f5d95aa95f210f764b991f7460fdf886c10220371b94d97591b91986d890e9b9bf35d13021affe6f5f2e6394804c1df428ca92",
+    "certification_declaration": "3082010006092a864886f70d010702a081f23081ef020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008c0bedb70d449dc9020251a28c17476f88fe52b3c24d6db16fd4a2b8c930f07c022100d64f1a400b9f3cb96f0547088db46898a0db5dccb4c7af0a9331782ea7af2cd3",
+    "dac_private_key": "b971778e87f853a6f677ff492d3ac31e76dd0e4620709056eb5151b05736c7a9",
+    "dac_public_key": "047c5eb0e831040a01e220ef695acfa53681f2ec1d7f48ed063316f59b16cc0a009c783609ccad5c26a865116e808ec40d222adbc3ffb9d6d0a8d1c48eba6f8326"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der
index 16dcac106e58fe..c8098266d9f4ab 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der
index 063e85dfaf779e..42b32ba056c153 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem
index 07412a59670280..76ce3785750b53 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIXpGsBYhRlRIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIZ24FPbpUeMEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-M2+LwXfS/qRQLlgwDp6hMMWWFlbk707SD83Dj6YTRqSRY9W4SYQlHzw46RrxIvAo
-Xlk850xNrCXX4TD9bNbiRKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGW/gt2gUP012Wf2HsKN9iLkh6biMB8GA1UdIwQYMBaAFDis
-zuJlf6dRtipVyaNoO2V3oAQkMAoGCCqGSM49BAMCA0kAMEYCIQCGglATO4sh3bZD
-5BgSHGdDpk2JezKrYrNnQ62aZ/3H4QIhAJjQDFZGhTvz9e3YGRJZE0tlhXvL67zx
-pWxs2c+MVYQn
+8YyE9cQqUb4yb84U+2cA+OSJFvyd6QgBZi/mA9hny/mF9kUFzmSP1FqBkONftnkd
+L7JPXzoU8+qwd+Uqg8xEo6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKbuC6X1Xu1An5k/jcQB+SHjO2YMMB8GA1UdIwQYMBaAFLPh
+L3BpwLNgOgGRfe7KP470zPaIMAoGCCqGSM49BAMCA0gAMEUCIC+Z32cnwC55OtCY
+OldO4biwc6H9G04YPsAgnJsY5sb6AiEA3467VQSPNyfPDZCHdgtkFb3o++5gvNa/
+C7tXGYDRDDc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der
index 01826defc75ae2..1dc5a46cbf43e8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem
index d7962e9e63325a..3ad3e05121ad31 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIImKwcYDnjfA8gWHD54xkDplN9Z0SoIhL2UYEwEwFhUXoAoGCCqGSM49
-AwEHoUQDQgAEM2+LwXfS/qRQLlgwDp6hMMWWFlbk707SD83Dj6YTRqSRY9W4SYQl
-Hzw46RrxIvAoXlk850xNrCXX4TD9bNbiRA==
+MHcCAQEEIBIxubuP/iigEWEZYUwHz8y5eNkVs2SsY+Yqavo9+jgAoAoGCCqGSM49
+AwEHoUQDQgAE8YyE9cQqUb4yb84U+2cA+OSJFvyd6QgBZi/mA9hny/mF9kUFzmSP
+1FqBkONftnkdL7JPXzoU8+qwd+Uqg8xEow==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der
index 11d26fab2f4884..1cac5e14bec6f3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem
index 5f8e149b8a0332..fa1b0f58494988 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIXubQRWqDJCEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIBtpDnv9pi6UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATygrvieiIpGJpJAeAIzWjT9LURbgAg
-MUiSBERZDgtUYsElLb0J0HGr4dg/GGhu1gITLh2A2WgHsvW0vEqe+pkIo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUOKzO
-4mV/p1G2KlXJo2g7ZXegBCQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgcPSj1QQ+FcEJP+0zvSlgx8m3NbYTUZseIH5G
-m2v3pnACIQDgZzYwb43aVrE6ETod3qd0WkYMzaA51+YZ/gCodvYfpA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ789mfPHBO2xjdeaeoBYdA/6PuHCnO
+HQfKhZ88bDTOkUSvvsmk1qdtFz2gI44e/goNURpysqC2aB7ylbkr84IQo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs+Ev
+cGnAs2A6AZF97so/jvTM9ogwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMrxeYrdDMbcoqxdklcEwphMsDaSq9zJkBHK
+L7CRoGu1AiBqf+Trk1FrB+zkYSOV15qbDg+wCmDBlplim/UzTshRsA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der
index f58e8bdc4bc4e8..45ed65ed14acd1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem
index 6ffea0c7371785..0793d135ed4fdc 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPLDDKhOf5fE/PiU3L4s4a2RJxeV/cF14AwI5NN1+lodoAoGCCqGSM49
-AwEHoUQDQgAE8oK74noiKRiaSQHgCM1o0/S1EW4AIDFIkgREWQ4LVGLBJS29CdBx
-q+HYPxhobtYCEy4dgNloB7L1tLxKnvqZCA==
+MHcCAQEEIL8MOabzx6xSgdIZh81N0whIEJbIWAjG7FEyX66MidBQoAoGCCqGSM49
+AwEHoUQDQgAEO/PZnzxwTtsY3XmnqAWHQP+j7hwpzh0HyoWfPGw0zpFEr77JpNan
+bRc9oCOOHv4KDVEacrKgtmge8pW5K/OCEA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json
index 9f8ce76179641d..5573a9a0641d58 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_level field is set to invalid value (different from 0).",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202085e91ac0588519512300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004336f8bc177d2fea4502e58300e9ea130c5961656e4ef4ed20fcdc38fa61346a49163d5b84984251f3c38e91af122f0285e593ce74c4dac25d7e130fd6cd6e244a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041465bf82dda050fd35d967f61ec28df622e487a6e2301f0603551d2304183016801438accee2657fa751b62a55c9a3683b6577a00424300a06082a8648ce3d0403020349003046022100868250133b8b21ddb643e418121c6743a64d897b32ab62b36743ad9a67fdc7e102210098d00c5646853bf3f5edd8191259134b65857bcbebbcf1a56c6cd9cf8c558427",
-    "pai_cert": "308201d43082017aa00302010202085ee6d0456a832421300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f282bbe27a2229189a4901e008cd68d3f4b5116e00203148920444590e0b5462c1252dbd09d071abe1d83f18686ed602132e1d80d96807b2f5b4bc4a9efa9908a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041438accee2657fa751b62a55c9a3683b6577a00424301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022070f4a3d5043e15c1093fed33bd2960c7c9b735b613519b1e207e469b6bf7a670022100e06736306f8dda56b13a113a1ddea7745a460ccda039d7e619fe00a876f61fa4",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405ff24060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201837df6f5bc4a9fe0595e5d34c9ead59b50796b49a745c341e37ed34e2a5e7df02204eef7fc464be4704766fa79c8641c18d6d7af905249c102328761d738aab69b5",
-    "dac_private_key": "898ac1c6039e37c0f205870f9e31903a6537d6744a82212f6518130130161517",
-    "dac_public_key": "04336f8bc177d2fea4502e58300e9ea130c5961656e4ef4ed20fcdc38fa61346a49163d5b84984251f3c38e91af122f0285e593ce74c4dac25d7e130fd6cd6e244"
+    "dac_cert": "308201e43082018aa0030201020208676e053dba5478c1300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f18c84f5c42a51be326fce14fb6700f8e48916fc9de90801662fe603d867cbf985f64505ce648fd45a8190e35fb6791d2fb24f5f3a14f3eab077e52a83cc44a3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a6ee0ba5f55eed409f993f8dc401f921e33b660c301f0603551d23041830168014b3e12f7069c0b3603a01917deeca3f8ef4ccf688300a06082a8648ce3d040302034800304502202f99df6727c02e793ad0983a574ee1b8b073a1fd1b4e183ec0209c9b18e6c6fa022100df8ebb55048f3727cf0d9087760b6415bde8fbee60bcd6bf0bbb571980d10c37",
+    "pai_cert": "308201d43082017aa003020102020806da439eff698ba5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043bf3d99f3c704edb18dd79a7a8058740ffa3ee1c29ce1d07ca859f3c6c34ce9144afbec9a4d6a76d173da0238e1efe0a0d511a72b2a0b6681ef295b92bf38210a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b3e12f7069c0b3603a01917deeca3f8ef4ccf688301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100caf1798add0cc6dca2ac5d925704c2984cb03692abdcc99011ca2fb091a06bb502206a7fe4eb93516b07ece4612395d79a9b0e0fb00a60c19699629bf5334ec851b0",
+    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405ff24060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202198dc69a9adf8da52fb4e383eced228f2e610802e2e9d7ca3b93a5c476111db022053da64e484f0599a687cc2b6b0e9465582364fdd3a6bed0f235ba9326de51ff5",
+    "dac_private_key": "1231b9bb8ffe28a0116119614c07cfccb978d915b364ac63e62a6afa3dfa3800",
+    "dac_public_key": "04f18c84f5c42a51be326fce14fb6700f8e48916fc9de90801662fe603d867cbf985f64505ce648fd45a8190e35fb6791d2fb24f5f3a14f3eab077e52a83cc44a3"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der
index ffa07ed6da852b..446ea70614a86b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der
index 55ed55caec8eed..361075d46c0b02 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem
index ed56b8dc5d7997..74bd473234ce1e 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIeDEMP7L8V3wwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIBR/npElaNEQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-8mOCJde19TnLc/CdbGedVAdjfDYatZ6HZ6SZz5BlLN6itTG3RPj4n370NVkQAuyx
-urVGwZPmWTeP8Gm00yvPbqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFCzsBXRNkmll18XzgCsGLgcFe2yyMB8GA1UdIwQYMBaAFKXo
-hxBq8enTVS/4qlnpfV8U2OWqMAoGCCqGSM49BAMCA0gAMEUCIQD5ADqrN9OmR4Ji
-//RyhuUHeriddDw86oRMLngBpVhCSAIgbGIXYtnBsh0nZV8vdoOd7poWrLsIJ0P8
-1pQCbr9y6n8=
+81Zbr93TQomtY58qdZXGM2gtQ89vvOQpGmJhTdjFdNEqLf8ZKhjzvrI9b+xIn25s
+sH5l5bosFgiudaL9k0hp56NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFGBOORUkhfK+QkZ1WMOIWcpch+uLMB8GA1UdIwQYMBaAFMX/
+3t5iIt4+NBl7cZbkEn5BW95uMAoGCCqGSM49BAMCA0gAMEUCIEtHeYidgkXK2jEK
+tzYy0B7kZ+TcgzsxLc6NH/nXb7iQAiEAs6IRXlV3sh5ycxqBivEnfvnwCljEE4cB
+JljsYK0VF0Y=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der
index 5ef13ddadd7eff..835e2211fd930f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem
index f6132e06b49b9d..c1a81a85b80519 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEGfjcZPnq7NdfbtbhYlc5nSfMMrSlhq+WslXBRCdJCUoAoGCCqGSM49
-AwEHoUQDQgAE8mOCJde19TnLc/CdbGedVAdjfDYatZ6HZ6SZz5BlLN6itTG3RPj4
-n370NVkQAuyxurVGwZPmWTeP8Gm00yvPbg==
+MHcCAQEEIJcs1cvbliOwgKpEIS3yOUpG46hkt/eUdilryG9Ggm8IoAoGCCqGSM49
+AwEHoUQDQgAE81Zbr93TQomtY58qdZXGM2gtQ89vvOQpGmJhTdjFdNEqLf8ZKhjz
+vrI9b+xIn25ssH5l5bosFgiudaL9k0hp5w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der
index 5f5323afc56005..952b7bd9914654 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem
index 55d5bb7f826b5f..9db798e216abd5 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIC7/eSlesK/IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIICI7p5uRKYVEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARBGay/I2l3V3Mv7bnw86UAp7m8/jI7
-wYL3GXqedrhoMBw3vjJDISp6yj6vZmtdZ4Ic1nsSyjO6g5fptPItvglwo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUpeiH
-EGrx6dNVL/iqWel9XxTY5aowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAIdhK5PSB/+kh467OGMgEywocbejWQXBC+1C
-zY/sXd7FAiAlZ98Is3VGGgHQ0svbhso2MhrnEvG9pjZMcGFfllfzOA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ7op178AteCQMeMop/YuCMMMHEkidl
+0qVH2ZIGHz2hT62dKkoyEzC9rSqC+qGWMgCT0kaULsC6IdnkV3FjlT30o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxf/e
+3mIi3j40GXtxluQSfkFb3m4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgW5d4m+OJU2TbJFFluALAKmCuBrtdkdc3MgHS
+esVly3kCIQCebXjkg/iQYevj4xznoB9jzyjTBfuis0WMCYZE64kFCg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der
index 6ffeba74d630cf..d28fe72fef62dd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem
index ceea5ca8adc5b1..64392acf53361a 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFq+dGAI2lydsuSvnmKFPOZ35WUscS8ziGC0pfvUtGaioAoGCCqGSM49
-AwEHoUQDQgAEQRmsvyNpd1dzL+258POlAKe5vP4yO8GC9xl6nna4aDAcN74yQyEq
-eso+r2ZrXWeCHNZ7EsozuoOX6bTyLb4JcA==
+MHcCAQEEIPivqfAJwD4RMwUKRgvQv/tuWLylD5tGEjp+ebp7gp51oAoGCCqGSM49
+AwEHoUQDQgAEO6Kde/ALXgkDHjKKf2LgjDDBxJInZdKlR9mSBh89oU+tnSpKMhMw
+va0qgvqhljIAk9JGlC7AuiHZ5FdxY5U99A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json
index f833120d8fbf5f..e00695b6363838 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid Signer Info digest algorithm SHA1.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020878310c3fb2fc577c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f2638225d7b5f539cb73f09d6c679d5407637c361ab59e8767a499cf90652cdea2b531b744f8f89f7ef435591002ecb1bab546c193e659378ff069b4d32bcf6ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142cec05744d926965d7c5f3802b062e07057b6cb2301f0603551d23041830168014a5e887106af1e9d3552ff8aa59e97d5f14d8e5aa300a06082a8648ce3d0403020348003045022100f9003aab37d3a6478262fff47286e5077ab89d743c3cea844c2e7801a558424802206c621762d9c1b21d27655f2f76839dee9a16acbb082743fcd694026ebf72ea7f",
-    "pai_cert": "308201d43082017aa00302010202080bbfde4a57ac2bf2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044119acbf23697757732fedb9f0f3a500a7b9bcfe323bc182f7197a9e76b868301c37be3243212a7aca3eaf666b5d67821cd67b12ca33ba8397e9b4f22dbe0970a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414a5e887106af1e9d3552ff8aa59e97d5f14d8e5aa301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210087612b93d207ffa4878ebb386320132c2871b7a35905c10bed42cd8fec5ddec502202567df08b375461a01d0d2cbdb86ca36321ae712f1bda6364c70615f9657f338",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe6620181831793077020103801462fa823359acfaa9963e1cfa140addf504f37160300706052b0e03021a300a06082a8648ce3d040302044730450221008ac235ef439bb08e0574ddc4ce0b2dedb738ba389acffe08da8f5fb34ca40037022061bd3eff72b825427c15692e5995ed675380734711b19b4e2b86d2a9ec6684a6",
-    "dac_private_key": "419f8dc64f9eaecd75f6ed6e16257399d27cc32b4a586af96b255c1442749094",
-    "dac_public_key": "04f2638225d7b5f539cb73f09d6c679d5407637c361ab59e8767a499cf90652cdea2b531b744f8f89f7ef435591002ecb1bab546c193e659378ff069b4d32bcf6e"
+    "dac_cert": "308201e43082018aa0030201020208051fe7a4495a3444300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f3565bafddd34289ad639f2a7595c633682d43cf6fbce4291a62614dd8c574d12a2dff192a18f3beb23d6fec489f6e6cb07e65e5ba2c1608ae75a2fd934869e7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414604e39152485f2be42467558c38859ca5c87eb8b301f0603551d23041830168014c5ffdede6222de3e34197b7196e4127e415bde6e300a06082a8648ce3d040302034800304502204b4779889d8245cada310ab73632d01ee467e4dc833b312dce8d1ff9d76fb890022100b3a2115e5577b21e72731a818af1277ef9f00a58c41387012658ec60ad151746",
+    "pai_cert": "308201d43082017aa0030201020208088ee9e6e44a6151300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043ba29d7bf00b5e09031e328a7f62e08c30c1c4922765d2a547d992061f3da14fad9d2a4a321330bdad2a82faa196320093d246942ec0ba21d9e4577163953df4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c5ffdede6222de3e34197b7196e4127e415bde6e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205b97789be3895364db245165b802c02a60ae06bb5d91d7373201d27ac565cb790221009e6d78e483f89061ebe3e31ce7a01f63cf28d305fba2b3458c098644eb89050a",
+    "certification_declaration": "3081fd06092a864886f70d010702a081ef3081ec020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe6620181831783076020103801462fa823359acfaa9963e1cfa140addf504f37160300706052b0e03021a300a06082a8648ce3d0403020446304402203fc5cf1930c4ab98ca300233f003094ad71e343ed91fd81bfb80a8a18ef06d36022070280140ed22bb2b2f309d07f836126e926af102833393b59abbdfbfc21a970d",
+    "dac_private_key": "972cd5cbdb9623b080aa44212df2394a46e3a864b7f79476296bc86f46826f08",
+    "dac_public_key": "04f3565bafddd34289ad639f2a7595c633682d43cf6fbce4291a62614dd8c574d12a2dff192a18f3beb23d6fec489f6e6cb07e65e5ba2c1608ae75a2fd934869e7"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der
index 1b9938727700c9..f0f2465d59f6ae 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der
index 3464601669400c..5d86ee2c13e975 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem
index e0f37f26a60053..79a336e4f425fd 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4jCCAYmgAwIBAgIHGh6W6IpxEzAKBggqhkjOPQQDAjBGMRgwFgYDVQQDDA9N
-YXR0ZXIgVGVzdCBQQUkxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGC
-onwCAgwEODAwMDAgFw0yMjA1MTMwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEY
-MBYGA1UEAwwPTWF0dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEU
-MBIGCisGAQQBgqJ8AgIMBDgwMDAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR9
-xixZwbBz4jINFh+YlZ41A8Md/U5ASgLgu2OSjdttYBEIhe2ZNzAyq5Z4nd33Hm2X
-B4nBsff6z8MvXiy4IxEso2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIH
-gDAdBgNVHQ4EFgQUIDavmSb5ow4jxtf68395zfA+EIowHwYDVR0jBBgwFoAUK9pU
-8OWyvYNaGmDgfHev0vklNYswCgYIKoZIzj0EAwIDRwAwRAIgBeKZZHJayuUsj1Wd
-rg49VFv3U/y6kPrtbTwpoAs0HMoCIBNHv8vJitP1e42nr7UB7Sc63C0oYt3t1TY/
-n8HGmN7H
+MIIB5TCCAYqgAwIBAgIISGFsYHOz+DkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
+FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+yEMrM2JO/IeYYiIKYUae9pcwu9v1oeCOcyGCAksjK7eW2ONaA2YXxFYlz0eNwJgc
+SdB2E02pMYXYsBo/6nPVhqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDEuaoBTadWUiTwYwCP8TKVElCkZMB8GA1UdIwQYMBaAFELV
+jA9yDz0hVWcRtOJ7vSidcrvEMAoGCCqGSM49BAMCA0kAMEYCIQC//FtnRH4l3GXZ
+XAY5HcAnptes5xHR0xLi+ejO0fJOqAIhANoiSjwVl2VTKiHS7M2IujWaQ4PlL0ff
+rRyoEiUMxtfI
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der
index eb4e4c34393912..2d85a2a83bf1a2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem
index ebf5dad60ae7d9..1f470845d4baa7 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINyML+UfOotQFZmODsNeOMSKYwD+0tYdtxDXdFfBXNrKoAoGCCqGSM49
-AwEHoUQDQgAEfcYsWcGwc+IyDRYfmJWeNQPDHf1OQEoC4Ltjko3bbWARCIXtmTcw
-MquWeJ3d9x5tlweJwbH3+s/DL14suCMRLA==
+MHcCAQEEIItLKbjkzvglUg+d184s986sS6z2r0+RWpGoKfLgveKMoAoGCCqGSM49
+AwEHoUQDQgAEyEMrM2JO/IeYYiIKYUae9pcwu9v1oeCOcyGCAksjK7eW2ONaA2YX
+xFYlz0eNwJgcSdB2E02pMYXYsBo/6nPVhg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der
index 92c2b331182b3d..0d73c4ae62f13a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem
index 4056817679fa1d..1ef22cb10895de 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIOph5r4Q3ipYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIOMg6ossYXtowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATIg1xYZ2xbdux7SATmMCp71vkBAZjB
-IfeR+YlDS/Y4U9x0lG7xe2hiQi2wEIYjdhp0RYCyPJ0ZrFg2NmMQc/D8o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUK9pU
-8OWyvYNaGmDgfHev0vklNYswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMsQZluDNtHE9m4FGPtddKwzWQGO/nvtc4ba
-DxFo1jTOAiBrC4blHCJHmxjmI/tRZUUWSH7CYsT/a7ZytAUIiKkPuw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT1uxd0MCXtrp5bZTQiNSr2XbhCiy27
+Q+Xbsbmj7JMWU1Vfyy+FMuGvdJOlePYNMJUQlZrcSYrGDaPbnrVhICkgo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQtWM
+D3IPPSFVZxG04nu9KJ1yu8QwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhALRvlNtIp7R/yWGPVe/srqYIOYB/Y2RgY8Gi
+o2UPWxVoAiAGS7/xLRaQBwjvRoUmJYKvchUiC2DusGIWBzDsHcVz5w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der
index b26a4cdb19fcdf..d49239609b3243 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem
index df838f6f594c4f..d39f4446f7e446 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDYRVUeIKzAWR2+r4V4P8SWtDenJ96gzMBxa456OhFnfoAoGCCqGSM49
-AwEHoUQDQgAEyINcWGdsW3bse0gE5jAqe9b5AQGYwSH3kfmJQ0v2OFPcdJRu8Xto
-YkItsBCGI3YadEWAsjydGaxYNjZjEHPw/A==
+MHcCAQEEIBSr3obHmZNcm/i7mi18vepdHtbNvAwnaqaocdlua6q9oAoGCCqGSM49
+AwEHoUQDQgAE9bsXdDAl7a6eW2U0IjUq9l24Qostu0Pl27G5o+yTFlNVX8svhTLh
+r3STpXj2DTCVEJWa3EmKxg2j2561YSApIA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json
index a9778a2ffbc75f..a135a71cbba7f6 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The subjectKeyIdentifier contains invalid SKID of a certificate unknown by Zigbee Alliance.",
     "is_success_case": "false",
-    "dac_cert": "308201e230820189a00302010202071a1e96e88a7113300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047dc62c59c1b073e2320d161f98959e3503c31dfd4e404a02e0bb63928ddb6d60110885ed99373032ab96789dddf71e6d970789c1b1f7facfc32f5e2cb823112ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142036af9926f9a30e23c6d7faf37f79cdf03e108a301f0603551d230418301680142bda54f0e5b2bd835a1a60e07c77afd2f925358b300a06082a8648ce3d0403020347003044022005e29964725acae52c8f559dae0e3d545bf753fcba90faed6d3c29a00b341cca02201347bfcbc98ad3f57b8da7afb501ed273adc2d2862ddedd5363f9fc1c698dec7",
-    "pai_cert": "308201d43082017aa00302010202083a9879af84378a96300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c8835c58676c5b76ec7b4804e6302a7bd6f9010198c121f791f989434bf63853dc74946ef17b6862422db0108623761a744580b23c9d19ac583636631073f0fca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604142bda54f0e5b2bd835a1a60e07c77afd2f925358b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100cb10665b8336d1c4f66e0518fb5d74ac3359018efe7bed7386da0f1168d634ce02206b0b86e51c22479b18e623fb51654516487ec262c4ff6bb672b4050888a90fbb",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfa56963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100d458770a629b4c0a529b92b9d745a4835da8d0cd04be098e5bf5457fd1ec625502207de56847b47c4b34b8baab77a08f581f8ceef28d63cd18d462602a636ee3a381",
-    "dac_private_key": "dc8c2fe51f3a8b5015998e0ec35e38c48a6300fed2d61db710d77457c15cdaca",
-    "dac_public_key": "047dc62c59c1b073e2320d161f98959e3503c31dfd4e404a02e0bb63928ddb6d60110885ed99373032ab96789dddf71e6d970789c1b1f7facfc32f5e2cb823112c"
+    "dac_cert": "308201e53082018aa003020102020848616c6073b3f839300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c8432b33624efc879862220a61469ef69730bbdbf5a1e08e732182024b232bb796d8e35a036617c45625cf478dc0981c49d076134da93185d8b01a3fea73d586a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414312e6a805369d594893c18c023fc4ca544942919301f0603551d2304183016801442d58c0f720f3d21556711b4e27bbd289d72bbc4300a06082a8648ce3d0403020349003046022100bffc5b67447e25dc65d95c06391dc027a6d7ace711d1d312e2f9e8ced1f24ea8022100da224a3c159765532a21d2eccd88ba359a4383e52f47dfad1ca812250cc6d7c8",
+    "pai_cert": "308201d43082017aa003020102020838c83aa2cb185eda300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f5bb17743025edae9e5b653422352af65db8428b2dbb43e5dbb1b9a3ec931653555fcb2f8532e1af7493a578f60d309510959adc498ac60da3db9eb561202920a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041442d58c0f720f3d21556711b4e27bbd289d72bbc4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b46f94db48a7b47fc9618f55efecaea60839807f63646063c1a2a3650f5b15680220064bbff12d16900708ef4685262582af7215220b60eeb062160730ec1dc573e7",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfa56963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202e972608bd5943d7858d9485321c2001926017de9152db56d8ad7c2ad7b05e2b022100f85818b2cbcfe9a619f0bd8fb3692606315596a2b9df593759e35a866ced9e6a",
+    "dac_private_key": "8b4b29b8e4cef825520f9dd7ce2cf7ceac4bacf6af4f915a91a829f2e0bde28c",
+    "dac_public_key": "04c8432b33624efc879862220a61469ef69730bbdbf5a1e08e732182024b232bb796d8e35a036617c45625cf478dc0981c49d076134da93185d8b01a3fea73d586"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der
index df7f6f3c004469..7cff080d409c3b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der
index 128c6bcdc250ea..48c6659a148865 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem
index f132ef1683d084..e6667a75cb5576 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIFGblAAc74AkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIdwPo/X6KvXcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-5xfYvWYadIG/coEHZqHst/XOmBfyrfBV3lO97047NCJ1bJAUg5lGUGQtE6m7E6e4
-Sd+h9duVDA+bHJvoCM1KPaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFDy3R9sx4FuFjEMlTjAZ0ziDaNIuMB8GA1UdIwQYMBaAFLk1
-nArAV56kNUHkJsodyUp4oYuXMAoGCCqGSM49BAMCA0gAMEUCID2emJnsY516cRGG
-gehafxzeA+OTTadpeCyUwC/wjKvqAiEA0jXEK6+/hwMOVMy/tyepJUUHRpaSWlJ6
-YIRcTAhlBNI=
+okUmFX2FmWBOSSDPFWNC69GhPdB6q6a7gYB+t0/qtCOzG/8Ht4NwqIn9wPeHT/tv
+Q7sWpM9Hntslda1EoUaxeaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFLz9et949uyHAi/lSVWHfjzfGWMsMB8GA1UdIwQYMBaAFCPk
+W1kSpdt4u14xV+R+Ia9Z5O4bMAoGCCqGSM49BAMCA0gAMEUCIEale7C0/XSYSiJN
+ZiXSadJ9NFuALbihFlV1i7OvfSZhAiEAuXOTyYIbyzyzoBDTtdiIgJqufKB5vm0q
+KFeHkSsLwB0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der
index 601cf94f86f8bc..84c11b37e6279d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem
index 8d30ed5b41503d..a622ec2eceb4b2 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKKjLbODZxcsZja79FJfd6qGBbGqJChcwOK+l6TPv8IAoAoGCCqGSM49
-AwEHoUQDQgAE5xfYvWYadIG/coEHZqHst/XOmBfyrfBV3lO97047NCJ1bJAUg5lG
-UGQtE6m7E6e4Sd+h9duVDA+bHJvoCM1KPQ==
+MHcCAQEEIOnN/RXrDxH6E8z8Syqh2Z0BH3XV5+xdIbDj+gadzf9aoAoGCCqGSM49
+AwEHoUQDQgAEokUmFX2FmWBOSSDPFWNC69GhPdB6q6a7gYB+t0/qtCOzG/8Ht4Nw
+qIn9wPeHT/tvQ7sWpM9Hntslda1EoUaxeQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der
index e9c0edf3f89832..8bb1da3282e00c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem
index 29a18e6d0032de..0b3ebc1cb770ba 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIICpyXaSNFMBwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIa8o5gn4gCqcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARxONb6QnkQNA8oBhwjEFGQcVw98eVx
-WfEh+sPwubZnqWgB6uwl8R8stBqcGguA+OD37aakvmSCickjaWoYJLFeo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUuTWc
-CsBXnqQ1QeQmyh3JSnihi5cwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAMOPdZ4niVI+t0hhIyuMUCTxUqA4qxKTlLg2
-3EGyyTjAAiEAzUaOKij49wXkOLEveg5Vj3lUnDHuuBoj4np9fI+dZJ0=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS/4spH2lZiMFxZ8SYg3YPvNCR9MTrO
+qtapZCR1+biobc7QD51sRTQDPqR2sjkYyXCM95rzluLvr57UkqVVyT1To2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUI+Rb
+WRKl23i7XjFX5H4hr1nk7hswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgasZMl9Be7oGznvFWMtE3Ydz2XCJ6MNBUYYPC
+nT+HhBkCIQDmEYgWbs25M1uwCix6bgEk36qU4jrseF2slgbsOUA2Wg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der
index 8d78b2cb0fdde8..bb1d9b5dcf3cb7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem
index d92cef1dbb113e..41ff6fb57478a3 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIElM3ljTjpe3hdv///vwwWTNmqXnxmQi4eyk8qpw9YN5oAoGCCqGSM49
-AwEHoUQDQgAEcTjW+kJ5EDQPKAYcIxBRkHFcPfHlcVnxIfrD8Lm2Z6loAersJfEf
-LLQanBoLgPjg9+2mpL5kgonJI2lqGCSxXg==
+MHcCAQEEIFgNN/ldSePDHEU8oSPbVJsEk4oLHYJlGUioNpv4wfCHoAoGCCqGSM49
+AwEHoUQDQgAEv+LKR9pWYjBcWfEmIN2D7zQkfTE6zqrWqWQkdfm4qG3O0A+dbEU0
+Az6kdrI5GMlwjPea85bi76+e1JKlVck9Uw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json
index 297050af9cb362..e46296a84bb3a3 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The subjectKeyIdentifier contains SKID of a well-known Zigbee Alliance certificate.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202081466e500073be009300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e717d8bd661a7481bf72810766a1ecb7f5ce9817f2adf055de53bdef4e3b3422756c901483994650642d13a9bb13a7b849dfa1f5db950c0f9b1c9be808cd4a3da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143cb747db31e05b858c43254e3019d3388368d22e301f0603551d23041830168014b9359c0ac0579ea43541e426ca1dc94a78a18b97300a06082a8648ce3d040302034800304502203d9e9899ec639d7a71118681e85a7f1cde03e3934da769782c94c02ff08cabea022100d235c42bafbf87030e54ccbfb727a92545074696925a527a60845c4c086504d2",
-    "pai_cert": "308201d53082017aa00302010202080a9c97692345301c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047138d6fa427910340f28061c23105190715c3df1e57159f121fac3f0b9b667a96801eaec25f11f2cb41a9c1a0b80f8e0f7eda6a4be648289c923696a1824b15ea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b9359c0ac0579ea43541e426ca1dc94a78a18b97301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c38f759e2789523eb74861232b8c5024f152a038ab129394b836dc41b2c938c0022100cd468e2a28f8f705e438b12f7a0e558f79549c31eeb81a23e27a7d7c8f9d649d",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022038f750ffb83fe674f203f07035cca23d18bafafbf92b65d07fa0336579676aa00221008648107106f03e5054e9d0bee0df886aca52fc47734a3a935e8cff39afa05feb",
-    "dac_private_key": "a2a32db38367172c6636bbf4525f77aa8605b1aa24285cc0e2be97a4cfbfc200",
-    "dac_public_key": "04e717d8bd661a7481bf72810766a1ecb7f5ce9817f2adf055de53bdef4e3b3422756c901483994650642d13a9bb13a7b849dfa1f5db950c0f9b1c9be808cd4a3d"
+    "dac_cert": "308201e43082018aa00302010202087703e8fd7e8abd77300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a24526157d8599604e4920cf156342ebd1a13dd07aaba6bb81807eb74feab423b31bff07b78370a889fdc0f7874ffb6f43bb16a4cf479edb2575ad44a146b179a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bcfd7adf78f6ec87022fe54955877e3cdf19632c301f0603551d2304183016801423e45b5912a5db78bb5e3157e47e21af59e4ee1b300a06082a8648ce3d0403020348003045022046a57bb0b4fd74984a224d6625d269d27d345b802db8a11655758bb3af7d2661022100b97393c9821bcb3cb3a010d3b5d888809aae7ca079be6d2a285787912b0bc01d",
+    "pai_cert": "308201d43082017aa00302010202086bca39827e200aa7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004bfe2ca47da5662305c59f12620dd83ef34247d313aceaad6a9642475f9b8a86dced00f9d6c4534033ea476b23918c9708cf79af396e2efaf9ed492a555c93d53a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041423e45b5912a5db78bb5e3157e47e21af59e4ee1b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206ac64c97d05eee81b39ef15632d13761dcf65c227a30d0546183c29d3f878419022100e61188166ecdb9335bb00a2c7a6e0124dfaa94e23aec785dac9606ec3940365a",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a8171660122beb90b233ac983b8352fa6cdeffd755d8857586f8e605e0e4f33602201bdc623eeba2c31dc61be31eafb536ad978404ae4fc0ef242f5d85afdd7c4dea",
+    "dac_private_key": "e9cdfd15eb0f11fa13ccfc4b2aa1d99d011f75d5e7ec5d21b0e3fa069dcdff5a",
+    "dac_public_key": "04a24526157d8599604e4920cf156342ebd1a13dd07aaba6bb81807eb74feab423b31bff07b78370a889fdc0f7874ffb6f43bb16a4cf479edb2575ad44a146b179"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der
index 38477c9fe48752..baa7581568cea7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der
index 97435bb597a202..ba17add48795b7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem
index fedca40db5afcd..48fcc03abd3076 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIbrChSIkV+D0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIDJ/2BtnbH+AwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-NdPEwIMABSXkVCJY7ZhrxF4eh9ji9+BZnx7ddyx1WwbVv+zFG8Qb/R57GsYFKok4
-FfrvT6/n8Kyv2AF/UyHSKqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFCeEuaH+uV0hHpg7icTsi3rZW8h1MB8GA1UdIwQYMBaAFLPb
-67ewqiZw8eHkHXPVyUZXhBsoMAoGCCqGSM49BAMCA0gAMEUCIEGCBn7X3bJs1+ib
-1fSVRqerJZHytLH3nQI2WUDuhNXaAiEAm5cQQpl8AzIjC9Zw80n0Xuf6zbmLevfE
-beGGk9XQdMs=
+AIPuPHv0OJP8yUuqFVuj6v+S1pCAAPFf66HOEx3kqnEybomyFAg5YV+e097TAFZM
+NMLYvwzTsAojDYigG2tRWaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFIvmFua2v2OokHxnLektdlJCv+X3MB8GA1UdIwQYMBaAFJl9
+xTnFyvXjNpUcU8XFunMoGN+TMAoGCCqGSM49BAMCA0kAMEYCIQCxTVGWjla6Z7oB
+3Al4L5zF06Gqr1QNV5wE7JMFIuWGFQIhAMw+9UlNFTVUJOrJljv6Y4IH0hj0esQw
+AJVX/vqaejlu
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der
index 8fbd577bda3080..a2c2b9559b7641 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem
index 75013ff3705399..c02d4d8aab0714 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBq8TLeIHx4HC5hdSFdCDW9RD+d40QkZXm7yuNao1cQZoAoGCCqGSM49
-AwEHoUQDQgAENdPEwIMABSXkVCJY7ZhrxF4eh9ji9+BZnx7ddyx1WwbVv+zFG8Qb
-/R57GsYFKok4FfrvT6/n8Kyv2AF/UyHSKg==
+MHcCAQEEINGq7lqSAqZFmfov+8LmPFcnqhq0eJrv/iSxG2FCP97zoAoGCCqGSM49
+AwEHoUQDQgAEAIPuPHv0OJP8yUuqFVuj6v+S1pCAAPFf66HOEx3kqnEybomyFAg5
+YV+e097TAFZMNMLYvwzTsAojDYigG2tRWQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der
index 31249e91bdfb69..c8ae41caf4e7cc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem
index 41b19be77361f1..68deb4cfcabe1b 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIB/fSHXChpKMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIISaU9qI94pY8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ1edXi8Bn7KDp3K8zC7klkVlBKeNRc
-gKmZRZzMN3yH/9ScfOVpaVqqv4/mknvo8/N3yNWgq/QBAbcSibcx8+2Po2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs9vr
-t7CqJnDx4eQdc9XJRleEGygwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAPE0uY/GwXm8B03oJmkb2QgfOFenbTG5OZ65
-YOb5pZ6LAiEA4D1h8PS2XDr427nekkF69Q5qvfSf3lleRTGOmOi9JaY=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR9VnMdD77ab4BigMqWI67j/25tRwOg
+GdF/SS1LoWSotnT1pODp1RqxwHPdZ+vR/hkw3tzWwRvXYedyRhYr9KpXo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmX3F
+OcXK9eM2lRxTxcW6cygY35MwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgWCUhnuW0h+gn+KGP/FxukM78oJKXDtHAVWhQ
+lnPtjhwCIQC1jAwYH0kgzSZo0qCr9rfIpkWzSiIyLrIjIdZQSWgoXw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der
index e1d24b48c82cb5..a43ca4ca3cf874 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem
index aabe62cfef2833..785403f16054d2 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIClKU2LslDDBVadDjBcK7Z8GdvBvavXUpvy66AM1MsAQoAoGCCqGSM49
-AwEHoUQDQgAENXnV4vAZ+yg6dyvMwu5JZFZQSnjUXICpmUWczDd8h//UnHzlaWla
-qr+P5pJ76PPzd8jVoKv0AQG3Eom3MfPtjw==
+MHcCAQEEIFBFF8TKmgiTiwakAziNuyDvCVVBtN7akeZDAEDyhOlZoAoGCCqGSM49
+AwEHoUQDQgAEfVZzHQ++2m+AYoDKliOu4/9ubUcDoBnRf0ktS6FkqLZ09aTg6dUa
+scBz3Wfr0f4ZMN7c1sEb12HnckYWK/SqVw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json
index 623ad47f41aa12..84f74f5c03f38c 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid Signer Info version set to v2.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202086eb0a1488915f83d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000435d3c4c083000525e4542258ed986bc45e1e87d8e2f7e0599f1edd772c755b06d5bfecc51bc41bfd1e7b1ac6052a893815faef4fafe7f0acafd8017f5321d22aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142784b9a1feb95d211e983b89c4ec8b7ad95bc875301f0603551d23041830168014b3dbebb7b0aa2670f1e1e41d73d5c94657841b28300a06082a8648ce3d040302034800304502204182067ed7ddb26cd7e89bd5f49546a7ab2591f2b4b1f79d02365940ee84d5da0221009b971042997c0332230bd670f349f45ee7facdb98b7af7c46de18693d5d074cb",
-    "pai_cert": "308201d53082017aa003020102020807f7d21d70a1a4a3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043579d5e2f019fb283a772bccc2ee496456504a78d45c80a999459ccc377c87ffd49c7ce569695aaabf8fe6927be8f3f377c8d5a0abf40101b71289b731f3ed8fa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b3dbebb7b0aa2670f1e1e41d73d5c94657841b28301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100f134b98fc6c179bc074de826691bd9081f3857a76d31b9399eb960e6f9a59e8b022100e03d61f0f4b65c3af8dbb9de92417af50e6abdf49fde595e45318e98e8bd25a6",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020102801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b1cb0831edf7445f152b21cf0637c301fca39ad79d01982cb392e54622a18f4902205bc356688b1ce990991e9a98a8bb64a4c49139b4c54b19d3b9b2129b8fe38419",
-    "dac_private_key": "1abc4cb7881f1e070b985d4857420d6f510fe778d109195e6ef2b8d6a8d5c419",
-    "dac_public_key": "0435d3c4c083000525e4542258ed986bc45e1e87d8e2f7e0599f1edd772c755b06d5bfecc51bc41bfd1e7b1ac6052a893815faef4fafe7f0acafd8017f5321d22a"
+    "dac_cert": "308201e53082018aa00302010202080c9ff606d9db1fe0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040083ee3c7bf43893fcc94baa155ba3eaff92d6908000f15feba1ce131de4aa71326e89b2140839615f9ed3ded300564c34c2d8bf0cd3b00a230d88a01b6b5159a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148be616e6b6bf63a8907c672de92d765242bfe5f7301f0603551d23041830168014997dc539c5caf5e336951c53c5c5ba732818df93300a06082a8648ce3d0403020349003046022100b14d51968e56ba67ba01dc09782f9cc5d3a1aaaf540d579c04ec930522e58615022100cc3ef5494d15355424eac9963bfa638207d218f47ac430009557fefa9a7a396e",
+    "pai_cert": "308201d43082017aa003020102020849a53da88f78a58f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047d56731d0fbeda6f806280ca9623aee3ff6e6d4703a019d17f492d4ba164a8b674f5a4e0e9d51ab1c073dd67ebd1fe1930dedcd6c11bd761e77246162bf4aa57a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414997dc539c5caf5e336951c53c5c5ba732818df93301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205825219ee5b487e827f8a18ffc5c6e90cefca092970ed1c05568509673ed8e1c022100b58c0c181f4920cd2668d2a0abf6b7c8a645b34a22322eb22321d6504968285f",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020102801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210096056729f26231d2d865c71393b0d705cb62d0cdd9133f5b48f4b801d4bc71730221008e9e3b9bcfe5fd2724bd6375228e3021470f441f882ff5ae28368b0e61817a53",
+    "dac_private_key": "d1aaee5a9202a64599fa2ffbc2e63c5727aa1ab4789aeffe24b11b61423fdef3",
+    "dac_public_key": "040083ee3c7bf43893fcc94baa155ba3eaff92d6908000f15feba1ce131de4aa71326e89b2140839615f9ed3ded300564c34c2d8bf0cd3b00a230d88a01b6b5159"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der
index cd51cf893789c8..1f3fbac0b82362 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der
index 439016ad7e8595..ada0124b6d4a64 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem
index c0d302b934c79e..71fd3c6b07b2cc 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIHm/yBwipzuEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIfeNydAzYBlIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-oIBVl+4vhxeO0sEEU987hKUgnkMdbtPrSAulg/uLQvlytKkV5C9Muzpk/buvn31s
-Kgs+FdtV1Y+DzFGhu2N0/KNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKevbuxU/sVdFh7ST9gkDCIVyAH1MB8GA1UdIwQYMBaAFDcg
-LkdnJBuywytZaXyGEGaLVbF7MAoGCCqGSM49BAMCA0gAMEUCIAgHLSxNlH7Zz0/f
-F2gpB2mh9tMPeW3peYZW4hCdZeCWAiEA/64IT3ckDUjiyoYf1+pnq6ixBIF9ho/4
-AtwR0xaHI3s=
+7JbSzTO5VMyMN3Z4HsnHdyQ4m9SOK9yQQplfEPLQ7k0WuURB6myUK6Rmv7dBEdiJ
+YDXGqvU9p7Vj83didnZNDKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBOsHE17Ty+/mVb6IOT45gSnnSihMB8GA1UdIwQYMBaAFM9S
+lG2C/k4Jy+J73kVOnd/+L8u1MAoGCCqGSM49BAMCA0cAMEQCIEkhQxxfLyy7wg5d
+HN7Pa/5iyCjyzSGjFpQHoBiy2EosAiBY3dccy9aV2nNVKaBLHgITaLuIN5IFSACQ
+AOZnVp8WTA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der
index 4a0a330093abc2..52af5762814825 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem
index a4fba5e94022eb..1178096b3fc9e6 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILcwQTAWqhFvfLCHi8D6/1Y56CkUO+PcJvdKG+2jShhDoAoGCCqGSM49
-AwEHoUQDQgAEoIBVl+4vhxeO0sEEU987hKUgnkMdbtPrSAulg/uLQvlytKkV5C9M
-uzpk/buvn31sKgs+FdtV1Y+DzFGhu2N0/A==
+MHcCAQEEIBA/o+2TnsvVeqFMwW5jj5Mwm36XMIhnhx1y6WIfwfdOoAoGCCqGSM49
+AwEHoUQDQgAE7JbSzTO5VMyMN3Z4HsnHdyQ4m9SOK9yQQplfEPLQ7k0WuURB6myU
+K6Rmv7dBEdiJYDXGqvU9p7Vj83didnZNDA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der
index 5d3c0cd473acbe..8c10bfe257c97c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem
index 0f9d7f569f0b11..e4fbacb804d02d 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIbgBPmdYDFXUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIfaGEMbCpoq4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT44l3a/JRzaY9sGILSSfy+Xa1/S6vZ
-n/JkdjrxwJl1PihglhqmMk5pdm1XGo0VZH4pCrzOs+1+GD4/TOIj6M5ro2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUNyAu
-R2ckG7LDK1lpfIYQZotVsXswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALdqhZyCujWCxx7r4PZUh9Y0qOjthuQTHHTC
-+k4MEc1rAiAbF6NgjTlouO4m07r1fNdYJy9MRyFAJ0EnIajX9F1A2Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASSDXhqmmew/MBlHHUmnyuZcYux6AOj
+9uDXfEgVS3oSN95ErMnMwBCLw5Wqx5G1D88t0+ps0iSeuP6QXeHFvzefo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUz1KU
+bYL+TgnL4nveRU6d3/4vy7UwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMndI9FQNs9wOcUwxp3wCeZJgG3yBJcV9bR1
+BBs6eUq0AiB7wIRRF1ZCzB/Uqur4TBV9FYRlTCpVTdzUn+IdSPEqfQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der
index ec5cce72b652ff..cc40c64a4e1eb9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem
index 8132a218dd30c0..e923c3043dd383 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFVRIHxYzSxG2gG/WX8FkdOJGNsEsSnOAcUZLvc4TwanoAoGCCqGSM49
-AwEHoUQDQgAE+OJd2vyUc2mPbBiC0kn8vl2tf0ur2Z/yZHY68cCZdT4oYJYapjJO
-aXZtVxqNFWR+KQq8zrPtfhg+P0ziI+jOaw==
+MHcCAQEEIKQtD5nMcGn9ebCoeK9ZsnykL3b60NNnwNOoVw2HPV5NoAoGCCqGSM49
+AwEHoUQDQgAEkg14appnsPzAZRx1Jp8rmXGLsegDo/bg13xIFUt6EjfeRKzJzMAQ
+i8OVqseRtQ/PLdPqbNIknrj+kF3hxb83nw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json
index f9d5fe8998c555..23c30d1e8a3faa 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The version_number field matches the VID and PID used in a DeviceSoftwareVersionModel entry in the DCL matching the certification record associated with the product presenting this CD.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202081e6ff20708a9cee1300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a0805597ee2f87178ed2c10453df3b84a5209e431d6ed3eb480ba583fb8b42f972b4a915e42f4cbb3a64fdbbaf9f7d6c2a0b3e15db55d58f83cc51a1bb6374fca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a7af6eec54fec55d161ed24fd8240c2215c801f5301f0603551d2304183016801437202e4767241bb2c32b59697c8610668b55b17b300a06082a8648ce3d0403020348003045022008072d2c4d947ed9cf4fdf1768290769a1f6d30f796de9798656e2109d65e096022100ffae084f77240d48e2ca861fd7ea67aba8b104817d868ff802dc11d31687237b",
-    "pai_cert": "308201d43082017aa00302010202086e004f99d6031575300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f8e25ddafc9473698f6c1882d249fcbe5dad7f4babd99ff264763af1c099753e2860961aa6324e69766d571a8d15647e290abcceb3ed7e183e3f4ce223e8ce6ba366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041437202e4767241bb2c32b59697c8610668b55b17b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b76a859c82ba3582c71eebe0f65487d634a8e8ed86e4131c74c2fa4e0c11cd6b02201b17a3608d3968b8ee26d3baf57cd758272f4c47214027412721a8d7f45d40d9",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402200f7e62d267c01cd3786adf4486609d66d5fe0a7241d800f415f64090a3bd429f0220279e9c286cb14c2d25e138e5e98da129315eca49680ff3eecc42afe7213729a8",
-    "dac_private_key": "b730413016aa116f7cb0878bc0faff5639e829143be3dc26f74a1beda34a1843",
-    "dac_public_key": "04a0805597ee2f87178ed2c10453df3b84a5209e431d6ed3eb480ba583fb8b42f972b4a915e42f4cbb3a64fdbbaf9f7d6c2a0b3e15db55d58f83cc51a1bb6374fc"
+    "dac_cert": "308201e33082018aa00302010202087de372740cd80652300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ec96d2cd33b954cc8c3776781ec9c77724389bd48e2bdc9042995f10f2d0ee4d16b94441ea6c942ba466bfb74111d8896035c6aaf53da7b563f3776276764d0ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041413ac1c4d7b4f2fbf9956fa20e4f8e604a79d28a1301f0603551d23041830168014cf52946d82fe4e09cbe27bde454e9ddffe2fcbb5300a06082a8648ce3d040302034700304402204921431c5f2f2cbbc20e5d1cdecf6bfe62c828f2cd21a3169407a018b2d84a2c022058ddd71ccbd695da735529a04b1e021368bb8837920548009000e667569f164c",
+    "pai_cert": "308201d43082017aa00302010202087da18431b0a9a2ae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004920d786a9a67b0fcc0651c75269f2b99718bb1e803a3f6e0d77c48154b7a1237de44acc9ccc0108bc395aac791b50fcf2dd3ea6cd2249eb8fe905de1c5bf379fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414cf52946d82fe4e09cbe27bde454e9ddffe2fcbb5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c9dd23d15036cf7039c530c69df009e649806df2049715f5b475041b3a794ab402207bc08451175642cc1fd4aaeaf84c157d1584654c2a554ddcd49fe21d48f12a7d",
+    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201ad050638ab544e4f68e402486df11d985548b378fdfef37f9e9ab7c906058b7022040c8ec8ca53bdf6679c09e0b3fb1b648f6eca1c58de8c4a2752183a1818778d5",
+    "dac_private_key": "103fa3ed939ecbd57aa14cc16e638f93309b7e97308867871d72e9621fc1f74e",
+    "dac_public_key": "04ec96d2cd33b954cc8c3776781ec9c77724389bd48e2bdc9042995f10f2d0ee4d16b94441ea6c942ba466bfb74111d8896035c6aaf53da7b563f3776276764d0c"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der
index b07333da99ee25..9a0fdcaa79e260 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der
index 3e2f80644a09d2..66c4575631f41c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem
index 49ed7185cb91d4..06639bf77b18c6 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIe5DzJ8lIqH0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIXxBoxL3QZUYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-KbggDZQkcLFv861ejvBGR4yQw79EGRX9RcX1DGjvwK2IbNkP1RLQv8f9bXqds7Dn
-p1bN2GPY7zdcKiTK5OxRp6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOWR6Pmi8MmKAAAgjjUErPEEEqndMB8GA1UdIwQYMBaAFMV8
-lt+EwEF+BqJyHWV27aq0piJ1MAoGCCqGSM49BAMCA0kAMEYCIQDNZA4b+s+RlovF
-QzOBiLq/N2sOQkV3IbOzrL9+dpj9yAIhALMNMBZmsfthinVhKq1Tpue98vmpyqaD
-/eTd0Krbz11x
+hb/nkDzg3jfeSTLN4zQD9RMz8selhZ15eDRpclvq2CFw2BtJqmduRG+i+sPnPMHB
+qud3ZX9VR2U2ii06AH9/UaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFAtoTWbqNkaNtB334DgABcNU2yu/MB8GA1UdIwQYMBaAFNHY
+IeEWRpgCz6hcCgxUiYuxA/T2MAoGCCqGSM49BAMCA0cAMEQCIGGmkkqiaZvr6e8p
+Z/tVV7uphJW1NtXI56OJbM3DqD+0AiAo7OJJg1sMom24CmRgCR+3RmftrWWkbIdJ
+Q5uYoM4hmg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der
index 9d81b18b0dedae..a2eea19a5b0d65 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem
index 10e4a7d357996d..684d9f2ffa2f3a 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICZmr+9iLlSfMu/d44csNBxEVLm7uF6iND0j/7eo7a6poAoGCCqGSM49
-AwEHoUQDQgAEKbggDZQkcLFv861ejvBGR4yQw79EGRX9RcX1DGjvwK2IbNkP1RLQ
-v8f9bXqds7Dnp1bN2GPY7zdcKiTK5OxRpw==
+MHcCAQEEIMGY0QaOgvwjfzny0/JPTsMhHbw+3MSJpuyDPF0M2Q2FoAoGCCqGSM49
+AwEHoUQDQgAEhb/nkDzg3jfeSTLN4zQD9RMz8selhZ15eDRpclvq2CFw2BtJqmdu
+RG+i+sPnPMHBqud3ZX9VR2U2ii06AH9/UQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der
index a87ab0db1dd159..bdb4a90762757d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem
index 2cc605be803067..af44246698186b 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIBZ0FoZNceuswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIWwjFBlkcmr8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQCxzF8oEN+uABEayi7Wei09akDWnS3
-p1tNbr4uG9oJitDE8Ib7EUisnxuSJtO5xYQCdQrHtwiyBo89JB3YZJQBo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxXyW
-34TAQX4GonIdZXbtqrSmInUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJ7qrm1XPejeyq0XOewn5LDjCj7QZ+irP9h6
-kgFrnLSPAiAYGDDkrQGkhRojbh2HHjB8lvrcCrPg4mlFZ3Qgq1N53Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQdunMkednzImnq30CKoIEwL3WMDR9Z
++HcqqU5gSAAea1FA7ipnIPfZgH19dgJgPC70zu/LlUbVZweiJsYAym5oo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0dgh
+4RZGmALPqFwKDFSJi7ED9PYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhALzXzchh1tWrKHkAfsqyU89v2+SoCcrkHVj5
+D6cfmOYsAiAo8NsBDf0jvxZOPxFK6m9cxPS2/JLkre2dpxU57EztXw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der
index 0be81f55552497..caeccf4b0f67e4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem
index 18d1ae2637534a..7d067456162d2a 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ1/KEXFhGGVeLvK0XJ22SO1mTcQowLwyKC9mXgcfCvpoAoGCCqGSM49
-AwEHoUQDQgAEAscxfKBDfrgARGsou1notPWpA1p0t6dbTW6+LhvaCYrQxPCG+xFI
-rJ8bkibTucWEAnUKx7cIsgaPPSQd2GSUAQ==
+MHcCAQEEIGjZOiHg2e18lJTglmcl2jhm6jGlygzlJ9xba312ilt9oAoGCCqGSM49
+AwEHoUQDQgAEHbpzJHnZ8yJp6t9AiqCBMC91jA0fWfh3KqlOYEgAHmtRQO4qZyD3
+2YB9fXYCYDwu9M7vy5VG1WcHoibGAMpuaA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json
index ccb5e2c06bbf0c..11d5271300088b 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The version_number field is missing.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa00302010202087b90f327c948a87d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000429b8200d942470b16ff3ad5e8ef046478c90c3bf441915fd45c5f50c68efc0ad886cd90fd512d0bfc7fd6d7a9db3b0e7a756cdd863d8ef375c2a24cae4ec51a7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e591e8f9a2f0c98a0000208e3504acf10412a9dd301f0603551d23041830168014c57c96df84c0417e06a2721d6576edaab4a62275300a06082a8648ce3d0403020349003046022100cd640e1bfacf91968bc543338188babf376b0e42457721b3b3acbf7e7698fdc8022100b30d301666b1fb618a75612aad53a6e7bdf2f9a9caa683fde4ddd0aadbcf5d71",
-    "pai_cert": "308201d43082017aa0030201020208059d05a1935c7aeb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000402c7317ca0437eb800446b28bb59e8b4f5a9035a74b7a75b4d6ebe2e1bda098ad0c4f086fb1148ac9f1b9226d3b9c58402750ac7b708b2068f3d241dd8649401a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c57c96df84c0417e06a2721d6576edaab4a62275301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009eeaae6d573de8decaad1739ec27e4b0e30a3ed067e8ab3fd87a92016b9cb48f0220181830e4ad01a4851a236e1d871e307c96fadc0ab3e0e26945677420ab5379dd",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201157e55479d4bd66b470f3282cd7f02df657c485fff508a820ed75b6193c813c0221008214b655a27a6e7a4fdde6c6d3cd6d8dc5d3ad268c1cf6c5911608165d26d902",
-    "dac_private_key": "2666afef622e549f32efdde3872c341c4454b9bbb85ea2343d23ffb7a8edaea9",
-    "dac_public_key": "0429b8200d942470b16ff3ad5e8ef046478c90c3bf441915fd45c5f50c68efc0ad886cd90fd512d0bfc7fd6d7a9db3b0e7a756cdd863d8ef375c2a24cae4ec51a7"
+    "dac_cert": "308201e33082018aa00302010202085f1068c4bdd06546300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000485bfe7903ce0de37de4932cde33403f51333f2c7a5859d79783469725bead82170d81b49aa676e446fa2fac3e73cc1c1aae777657f554765368a2d3a007f7f51a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140b684d66ea36468db41df7e0380005c354db2bbf301f0603551d23041830168014d1d821e116469802cfa85c0a0c54898bb103f4f6300a06082a8648ce3d0403020347003044022061a6924aa2699bebe9ef2967fb5557bba98495b536d5c8e7a3896ccdc3a83fb4022028ece249835b0ca26db80a6460091fb74667edad65a46c8749439b98a0ce219a",
+    "pai_cert": "308201d43082017aa00302010202085b08c506591c9abf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041dba732479d9f32269eadf408aa081302f758c0d1f59f8772aa94e6048001e6b5140ee2a6720f7d9807d7d7602603c2ef4ceefcb9546d56707a226c600ca6e68a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d1d821e116469802cfa85c0a0c54898bb103f4f6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100bcd7cdc861d6d5ab2879007ecab253cf6fdbe4a809cae41d58f90fa71f98e62c022028f0db010dfd23bf164e3f114aea6f5cc4f4b6fc92e4aded9da71539ec4ced5f",
+    "certification_declaration": "3081fd06092a864886f70d010702a081ef3081ec020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203b7959d51993ded96026d187f75989d284d4249f8d3cc6f649bd397a35f36a59022061b6917d5bda6787087073164360471bcfd77d40ccdd162b72f5248c4e8bfd7c",
+    "dac_private_key": "c198d1068e82fc237f39f2d3f24f4ec3211dbc3edcc489a6ec833c5d0cd90d85",
+    "dac_public_key": "0485bfe7903ce0de37de4932cde33403f51333f2c7a5859d79783469725bead82170d81b49aa676e446fa2fac3e73cc1c1aae777657f554765368a2d3a007f7f51"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der
index 89990442431930..3c6ce8365c17e5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der
index 95bab359a07b25..13c8d43f716a0f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem
index ec689acdf10df8..098a0083f786e9 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIRHWAI9XN7lgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIO3glKaYArLwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-TEKG7ImMe3GamPotw3oKJ0af2L/zRzgGGxpW66h0G4Q02v62pnxF3RyCY3/IvE+O
-q7TW6QmK/mkw31Wlv3VgWqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOaSf9YFPe5L+x2bBtUkOO7GgaBCMB8GA1UdIwQYMBaAFGuP
-DhpW3pJtP81lXMOgKqV2VvJIMAoGCCqGSM49BAMCA0cAMEQCIB9/8/OVy9fZRakV
-XJkAxxrhFuhQjicP/oD3N+vhKoGuAiB45RK8Fhudrdj1UX/0LWazYhFxeeaUNBtJ
-K6x7sLDZeA==
+0Dpc83WB3/eyKxLk7yHRkTJt7mAg/TtJy3hFluN/jKlVEDVEJbHOba1/75Iq/QY7
+p5Wo4Lt5G1QgErxR/diXpqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDygFv36cZA/0HNtio+ZlxOQr9I7MB8GA1UdIwQYMBaAFNkj
+IJMGXTeP+RRKx6CGeT45lCI2MAoGCCqGSM49BAMCA0cAMEQCIE7hQ8zXL2DuxHUc
+PZ0kfXVsf7g0l1JWM4tOxYBQB8VVAiAxsTyMz3LBMYRtzUKp2cgIkqAKF6iuOHEb
+aNd0iYjMEA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der
index a9c6908894e349..1f5f0c377fcb6c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem
index ef270b7251690b..0b15ea25d96965 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOelSy6ySSXyClwV7p6e6TsIZjdJgYxnRUqD2h4s5f37oAoGCCqGSM49
-AwEHoUQDQgAETEKG7ImMe3GamPotw3oKJ0af2L/zRzgGGxpW66h0G4Q02v62pnxF
-3RyCY3/IvE+Oq7TW6QmK/mkw31Wlv3VgWg==
+MHcCAQEEIIwCFX+eY8IayvXDbcWy62FRMFgWzgCPBFEZdXRIPo7koAoGCCqGSM49
+AwEHoUQDQgAE0Dpc83WB3/eyKxLk7yHRkTJt7mAg/TtJy3hFluN/jKlVEDVEJbHO
+ba1/75Iq/QY7p5Wo4Lt5G1QgErxR/diXpg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der
index c0b15acd5f6023..0bbf7f4c982270 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem
index bf8448678ce99d..f37605abca2734 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIIR+EJtrV6TIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB1DCCAXqgAwIBAgIIeJcidC1ih1wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQMDbACvU2dnkDA+et2wqfJqlNnfMep
-EuVXRoxEqYZKAjHioZNtmHNg8QVUFdo02d41U7htTEX0nxFJ+QPnQ8Pwo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUa48O
-Glbekm0/zWVcw6AqpXZW8kgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAOf/04IdZtDrX4lKiASX59AR0AuCAQdBJEYN
-vq+CZNGwAiEAxnzihlwEvlwWxXG9hjc4KqT2SZQnzDOLnF8zKX91rj4=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQp0+bklPcWoNSCiVlTCMrjW2A6fBy0
+PS/2wQwhA26+35W9xjZGKBloqp8P7/4pA5x+VJJ34LT3zr1ByDX6QQBto2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU2SMg
+kwZdN4/5FErHoIZ5PjmUIjYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgZHbpRgX3YRoocptPf0jr7C25QuyWju9k9OcW
+pLtmVe8CIQCRU16IozngIwGHZxX/06OVKu1sXRNObHOunUOgls54ug==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der
index 6b65288779f570..d36c298843cf83 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem
index f18c8ec9763ce7..1e5d89a0799ca9 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEXrFkMrkPI1eRh2r/IsllRGGvlNPThy9Rklp2cAPtZnoAoGCCqGSM49
-AwEHoUQDQgAEDA2wAr1NnZ5AwPnrdsKnyapTZ3zHqRLlV0aMRKmGSgIx4qGTbZhz
-YPEFVBXaNNneNVO4bUxF9J8RSfkD50PD8A==
+MHcCAQEEIA0ZqEbY8baBBTfb13oimJADlTNFOMmhRxAIx9IdPwV/oAoGCCqGSM49
+AwEHoUQDQgAEKdPm5JT3FqDUgolZUwjK41tgOnwctD0v9sEMIQNuvt+VvcY2RigZ
+aKqfD+/+KQOcflSSd+C09869Qcg1+kEAbQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json
index 890a96f4f8edb1..ff75af9fc2740a 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The version_number field doesn't match the VID and PID used in a DeviceSoftwareVersionModel entry in the DCL matching the certification record associated with the product presenting this CD.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa003020102020844758023d5cdee58300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044c4286ec898c7b719a98fa2dc37a0a27469fd8bff34738061b1a56eba8741b8434dafeb6a67c45dd1c82637fc8bc4f8eabb4d6e9098afe6930df55a5bf75605aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e6927fd6053dee4bfb1d9b06d52438eec681a042301f0603551d230418301680146b8f0e1a56de926d3fcd655cc3a02aa57656f248300a06082a8648ce3d040302034700304402201f7ff3f395cbd7d945a9155c9900c71ae116e8508e270ffe80f737ebe12a81ae022078e512bc161b9dadd8f5517ff42d66b362117179e694341b492bac7bb0b0d978",
-    "pai_cert": "308201d53082017aa0030201020208211f8426dad5e932300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040c0db002bd4d9d9e40c0f9eb76c2a7c9aa53677cc7a912e557468c44a9864a0231e2a1936d987360f1055415da34d9de3553b86d4c45f49f1149f903e743c3f0a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604146b8f0e1a56de926d3fcd655cc3a02aa57656f248301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e7ffd3821d66d0eb5f894a880497e7d011d00b8201074124460dbeaf8264d1b0022100c67ce2865c04be5c16c571bd8637382aa4f6499427cc338b9c5f33297f75ae3e",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025078967240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100da62840ebeb53d534757931ca061b78abe1285477bc4560f0db28870f41c882f02206da0181b931d025bcafed7ea045530a72be58c9743951ab98e112960a69531ee",
-    "dac_private_key": "e7a54b2eb24925f20a5c15ee9e9ee93b08663749818c67454a83da1e2ce5fdfb",
-    "dac_public_key": "044c4286ec898c7b719a98fa2dc37a0a27469fd8bff34738061b1a56eba8741b8434dafeb6a67c45dd1c82637fc8bc4f8eabb4d6e9098afe6930df55a5bf75605a"
+    "dac_cert": "308201e33082018aa00302010202083b782529a600acbc300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d03a5cf37581dff7b22b12e4ef21d191326dee6020fd3b49cb784596e37f8ca95510354425b1ce6dad7fef922afd063ba795a8e0bb791b542012bc51fdd897a6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143ca016fdfa71903fd0736d8a8f99971390afd23b301f0603551d23041830168014d9232093065d378ff9144ac7a086793e39942236300a06082a8648ce3d040302034700304402204ee143ccd72f60eec4751c3d9d247d756c7fb834975256338b4ec5805007c555022031b13c8ccf72c131846dcd42a9d9c80892a00a17a8ae38711b68d7748988cc10",
+    "pai_cert": "308201d43082017aa0030201020208789722742d62875c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000429d3e6e494f716a0d48289595308cae35b603a7c1cb43d2ff6c10c21036ebedf95bdc63646281968aa9f0feffe29039c7e549277e0b4f7cebd41c835fa41006da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d9232093065d378ff9144ac7a086793e39942236301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206476e94605f7611a28729b4f7f48ebec2db942ec968eef64f4e716a4bb6655ef02210091535e88a339e02301876715ffd3a3952aed6c5d134e6c73ae9d43a096ce78ba",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025078967240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210087e62fd2258fcac1b152a4327e21596d6bd32fd0a619b609caf9eb410b14f58a02205be39c074c528bf3357f4913b99f84c760b8261a3001667c111d6fb4f21b873c",
+    "dac_private_key": "8c02157f9e63c21acaf5c36dc5b2eb6151305816ce008f0451197574483e8ee4",
+    "dac_public_key": "04d03a5cf37581dff7b22b12e4ef21d191326dee6020fd3b49cb784596e37f8ca95510354425b1ce6dad7fef922afd063ba795a8e0bb791b542012bc51fdd897a6"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der
index 20a4845d4c1bed..65f3a9e64c5ad3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der
index cb5bffc9bb86dc..7f21397118402d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem
index 9d2e32a59e957c..65b5bdbee507e7 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIOcveKos3EAEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIIuKx6XkmDfMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-qBcgxPGSTuIQ2x/guluecckbm0yOlZwOzJRbZFR4YvzUcuFEw94jDR2a6AFm5POl
-xsn0Ig5I13HpkIj4Tm+LhaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNCc2Ta4XjZtQRzjLgxTinokz66TMB8GA1UdIwQYMBaAFFIx
-uWZtvLQagstrf5guwol+Lv8sMAoGCCqGSM49BAMCA0kAMEYCIQCaVz9lresSBbSv
-mouQnFEl8Q9HXybeYDL/FIxdijAhIwIhAKXkkQ46opHQAFxEtbeAyMvAozZhDodz
-zmbHFLLlGaxV
+duJARDw0kFu1NVvKkuZtKHaqolG5A+ohJSLHeqMyhUfHo6MYrIPH6seIy2K+oyhh
+qMtWEJWIkB0lTcVe/9bwDKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFAs2xgEIbHIy2QW9ix6yznXZqo7uMB8GA1UdIwQYMBaAFHqJ
+gEtheXpAWlgMIqri1zqsF8+mMAoGCCqGSM49BAMCA0gAMEUCIGOcbapxJlonyfMo
+JB0WA5nAnRUH5k/706TOLvf+IjiIAiEAkClat+MDKOtzJSAfQezFsOUG0Vins86L
+OYZTLWV2krg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der
index 9452cc73438031..8c1638ed7d9f1b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem
index 90ba8af8a49668..c8c29ce5a63c8e 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPrOE+FinVLoBLe3SNFj+Bw7HUjlGghqXYuNOx984AiEoAoGCCqGSM49
-AwEHoUQDQgAEqBcgxPGSTuIQ2x/guluecckbm0yOlZwOzJRbZFR4YvzUcuFEw94j
-DR2a6AFm5POlxsn0Ig5I13HpkIj4Tm+LhQ==
+MHcCAQEEICvKu02wunEmOg4L/E1trjbbF5V6jmOsFS+UGfGhKwP5oAoGCCqGSM49
+AwEHoUQDQgAEduJARDw0kFu1NVvKkuZtKHaqolG5A+ohJSLHeqMyhUfHo6MYrIPH
+6seIy2K+oyhhqMtWEJWIkB0lTcVe/9bwDA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der
index 2e4e85de7213e7..567fe90f1d75ef 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem
index 4a8541a5817142..dd85a943af4929 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIImMHXt/Sm7kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIGSKgoX9NIEkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ7VVk7W+vm0/R56RyGd9VVF2tyY71d
-/ScRvFDZd1Plr1eRDS0jnWkK5LEbaLYwzXBNnxn05s1Th55xFJXeUwW+o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUUjG5
-Zm28tBqCy2t/mC7CiX4u/ywwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgDX4kD8hB7Xq8o5JHvrpV4MXxTeeojhxy04FJ
-XDAD3+ECIQC5YrjY806+enx/ZuvnLiA11B06+6qaXih5Y8DPVEaXCA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR/oJC2BUTw7P8XTi/v+2NL5Vh8bf+S
+FoP4bAJYUomsB0kn8BG9GSdxKKelow/Aoq7AR9na+enMy6hAax586ZqAo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeomA
+S2F5ekBaWAwiquLXOqwXz6YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgYnm5S7xk75obAOXsd5QugAJfgSnFqeSnICiH
+dUCPItMCIDEv525ejFyF9uHEE2X6bkx3sjxnQN8PYjzPvLdEXsNs
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der
index 449857cad1fc89..07d594b7ecb209 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem
index 829baf3b07a2c8..80b13b870101eb 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG9hXzdH3bCO6bVabRCZbj1Z1atyQCvieVoeqK8BllqioAoGCCqGSM49
-AwEHoUQDQgAEO1VZO1vr5tP0eekchnfVVRdrcmO9Xf0nEbxQ2XdT5a9XkQ0tI51p
-CuSxG2i2MM1wTZ8Z9ObNU4eecRSV3lMFvg==
+MHcCAQEEINEe6p4/hQFm73YvxKkjMwrzinsEOEeHq/8aQRNgW5tuoAoGCCqGSM49
+AwEHoUQDQgAEf6CQtgVE8Oz/F04v7/tjS+VYfG3/khaD+GwCWFKJrAdJJ/ARvRkn
+cSinpaMPwKKuwEfZ2vnpzMuoQGsefOmagA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
index 171239421fe7a3..007631589f4cab 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The vendor_id field doesn't match the VID in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020839cbde2a8b371001300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a81720c4f1924ee210db1fe0ba5b9e71c91b9b4c8e959c0ecc945b64547862fcd472e144c3de230d1d9ae80166e4f3a5c6c9f4220e48d771e99088f84e6f8b85a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d09cd936b85e366d411ce32e0c538a7a24cfae93301f0603551d230418301680145231b9666dbcb41a82cb6b7f982ec2897e2eff2c300a06082a8648ce3d04030203490030460221009a573f65adeb1205b4af9a8b909c5125f10f475f26de6032ff148c5d8a302123022100a5e4910e3aa291d0005c44b5b780c8cbc0a336610e8773ce66c714b2e519ac55",
-    "pai_cert": "308201d43082017aa00302010202082263075edfd29bb9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043b55593b5bebe6d3f479e91c8677d555176b7263bd5dfd2711bc50d97753e5af57910d2d239d690ae4b11b68b630cd704d9f19f4e6cd53879e711495de5305bea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604145231b9666dbcb41a82cb6b7f982ec2897e2eff2c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200d7e240fc841ed7abca39247beba55e0c5f14de7a88e1c72d381495c3003dfe1022100b962b8d8f34ebe7a7c7f66ebe72e2035d41d3afbaa9a5e287963c0cf54469708",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305d06092a864886f70d010701a050044e1520000124010e360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221009cecb327c1f8141a190c77233f8ddc79bdd635580285dfee6abb9add2a0751bc022100ff6974085a48755d75e50a221106382d2bf622c6ed4624603e7c11f0cc20c579",
-    "dac_private_key": "face13e1629d52e804b7b748d163f81c3b1d48e51a086a5d8b8d3b1f7ce00884",
-    "dac_public_key": "04a81720c4f1924ee210db1fe0ba5b9e71c91b9b4c8e959c0ecc945b64547862fcd472e144c3de230d1d9ae80166e4f3a5c6c9f4220e48d771e99088f84e6f8b85"
+    "dac_cert": "308201e43082018aa003020102020822e2b1e979260df3300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000476e240443c34905bb5355bca92e66d2876aaa251b903ea212522c77aa3328547c7a3a318ac83c7eac788cb62bea32861a8cb56109588901d254dc55effd6f00ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140b36c601086c7232d905bd8b1eb2ce75d9aa8eee301f0603551d230418301680147a89804b61797a405a580c22aae2d73aac17cfa6300a06082a8648ce3d04030203480030450220639c6daa71265a27c9f328241d160399c09d1507e64ffbd3a4ce2ef7fe22388802210090295ab7e30328eb7325201f41ecc5b0e506d158a7b3ce8b3986532d657692b8",
+    "pai_cert": "308201d33082017aa00302010202081922a0a17f4d2049300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047fa090b60544f0ecff174e2feffb634be5587c6dff921683f86c02585289ac074927f011bd19277128a7a5a30fc0a2aec047d9daf9e9cccba8406b1e7ce99a80a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147a89804b61797a405a580c22aae2d73aac17cfa6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402206279b94bbc64ef9a1b00e5ec77942e80025f8129c5a9e4a720288775408f22d30220312fe76e5e8c5c85f6e1c41365fa6e4c77b23c6740df0f623ccfbcb7445ec36c",
+    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305d06092a864886f70d010701a050044e1520000124010e360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b88fedd6477eb447cfcaf0ee58b73c4b3f164246ff0f7c55929b90928204f712022100f14079ed90603b57784dc7742d672d48e223a98d579db1edb801f6e2deb4ed11",
+    "dac_private_key": "2bcabb4db0ba71263a0e0bfc4d6dae36db17957a8e63ac152f9419f1a12b03f9",
+    "dac_public_key": "0476e240443c34905bb5355bca92e66d2876aaa251b903ea212522c77aa3328547c7a3a318ac83c7eac788cb62bea32861a8cb56109588901d254dc55effd6f00c"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der
index b6452ee41ad238..4ab65e37335021 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der
index 5132070338072f..84f885ac23966d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem
index 0bb0f9dfcc9c66..c6d10050f80c12 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIHbs1hdjFASgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIJ7CM1NMr3qgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTEzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-LjFgARXP0wJXRAgfJfyWYvK4U9SiqWnxRzOeAQOl3jl40x/nlqPv3IlgVrzKaGsE
-DMEEtfd4hhAWdtgJTwb8rKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHwcLKfGMWrIa2SG8Sc32dX0GscZMB8GA1UdIwQYMBaAFKIO
-+2+8IEGWiSZ1zAr6iUUOydodMAoGCCqGSM49BAMCA0kAMEYCIQClecTPeX6U/DC4
-NDj0c9iwWdc6LXfhWRsyfsA2y1ZD5gIhAPcS16cJQibQktHuKwqxMvfTLVT7zHvm
-gCBz26V+lGE5
+3NBPvwhnU9HJr8A59Xslvr7/ebz37hT0qw4jI9YgdrYAYajKVQaEH4Ywqrah/rHy
+lcVdZTu/AKctEuCgB522dqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFHtD4hksZmpfOKZDLHYEF1YjKn2/MB8GA1UdIwQYMBaAFEu1
+IKKN1Rlc0iecXxVrfoKxrLGFMAoGCCqGSM49BAMCA0gAMEUCIQDH1J1REn/eX3DN
+zJK/Majq2KjCyUSAprI9mFxQXtIMygIgWejTMO7RLgu/qb6hk4TNElodgbmdivPq
+NS78EZwQkdc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der
index a00d6d544befea..148b240cf66810 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem
index 06bf6d8b5c6c2e..32b7d99e88f4a9 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ5eTIvmcjtQxy39ymUdqxu5KiqpIjQjC4fJr3PX2YO8oAoGCCqGSM49
-AwEHoUQDQgAELjFgARXP0wJXRAgfJfyWYvK4U9SiqWnxRzOeAQOl3jl40x/nlqPv
-3IlgVrzKaGsEDMEEtfd4hhAWdtgJTwb8rA==
+MHcCAQEEIO/kh8a2zmLLjp0jKrjyfULiqT4xUm9xVyHuQQprRpsAoAoGCCqGSM49
+AwEHoUQDQgAE3NBPvwhnU9HJr8A59Xslvr7/ebz37hT0qw4jI9YgdrYAYajKVQaE
+H4Ywqrah/rHylcVdZTu/AKctEuCgB522dg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der
index e25929dc44fbc1..99affa311f80e4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem
index 4d153408fbf70d..e15a71b9a531ea 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIXGvLy9D1Wl0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1MTMw
+MIIB0zCCAXqgAwIBAgIIVZ5GUukCNmUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+ybj1bdHukJD1cABOikqqXqYomVjp
-lVn+sUiigOJcXbNYKbJWbhO/9S8SR7GCNhCaH3GuEjYl8GOBaqkLocEXo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUog77
-b7wgQZaJJnXMCvqJRQ7J2h0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKtFAWA4LM3z1FP2JG/TonZiCb/MU+1sYCCB
-Lg7Jm872AiB+E51+Ks6uH3x1krVbkG4KhF41DgqKcClpTxfOHcUnCg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAXapYbncS/Z13S5jQPuqG2Zxm3gvQ
+A2KQBGf0xEIu9n6NFHHPRnWr2r4iFHbuz6C4TjU+xulJcpm8F4Rn1rm8o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS7Ug
+oo3VGVzSJ5xfFWt+grGssYUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgXdnOLyLmm2Yu9YZex7BlXFlgVYJpUL7GOBPo
+vlhVWTACIEEe6YgHz/34bd2/sCLDKjbUW/4ezaAxB/45+7OMcWJN
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der
index 0b976abc509635..1d6784b11d1a23 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem
index aab61d2626282a..0599afcb766e59 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILmE3YnU63W5wwebUEknJI/cmF+ZrodL4DwzxWSa8xMioAoGCCqGSM49
-AwEHoUQDQgAE/sm49W3R7pCQ9XAATopKql6mKJlY6ZVZ/rFIooDiXF2zWCmyVm4T
-v/UvEkexgjYQmh9xrhI2JfBjgWqpC6HBFw==
+MHcCAQEEIIEwaTLZWHCOReorGO/2lAqrhfDrQA56tno2DjpNMyuJoAoGCCqGSM49
+AwEHoUQDQgAEwF2qWG53Ev2dd0uY0D7qhtmcZt4L0ANikARn9MRCLvZ+jRRxz0Z1
+q9q+IhR27s+guE41PsbpSXKZvBeEZ9a5vA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json
index 478805ef0f0ab8..ad0f07fa333618 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The vendor_id field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202081dbb3585d8c50128300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042e31600115cfd3025744081f25fc9662f2b853d4a2a969f147339e0103a5de3978d31fe796a3efdc896056bcca686b040cc104b5f77886101676d8094f06fcaca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147c1c2ca7c6316ac86b6486f12737d9d5f41ac719301f0603551d23041830168014a20efb6fbc204196892675cc0afa89450ec9da1d300a06082a8648ce3d0403020349003046022100a579c4cf797e94fc30b83438f473d8b059d73a2d77e1591b327ec036cb5643e6022100f712d7a7094226d092d1ee2b0ab132f7d32d54fbcc7be6802073dba57e946139",
-    "pai_cert": "308201d43082017aa00302010202085c6bcbcbd0f55a5d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303531333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fec9b8f56dd1ee9090f570004e8a4aaa5ea6289958e99559feb148a280e25c5db35829b2566e13bff52f1247b18236109a1f71ae123625f063816aa90ba1c117a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414a20efb6fbc204196892675cc0afa89450ec9da1d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ab450160382ccdf3d453f6246fd3a2766209bfcc53ed6c6020812e0ec99bcef602207e139d7e2aceae1f7c7592b55b906e0a845e350e0a8a7029694f17ce1dc5270a",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b15200001360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a0bb8249ec19b7419523402f61f27098c7784af5905870db932ba9d2f5deddd102203e80686ac1ee9b0735d6784b2cf9338e21c8485374aff30b1a676c121f477c38",
-    "dac_private_key": "9e5e4c8be6723b50c72dfdca651dab1bb92a2aa92234230b87c9af73d7d983bc",
-    "dac_public_key": "042e31600115cfd3025744081f25fc9662f2b853d4a2a969f147339e0103a5de3978d31fe796a3efdc896056bcca686b040cc104b5f77886101676d8094f06fcac"
+    "dac_cert": "308201e43082018aa003020102020827b08cd4d32bdea8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004dcd04fbf086753d1c9afc039f57b25bebeff79bcf7ee14f4ab0e2323d62076b60061a8ca5506841f8630aab6a1feb1f295c55d653bbf00a72d12e0a0079db676a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147b43e2192c666a5f38a6432c76041756232a7dbf301f0603551d230418301680144bb520a28dd5195cd2279c5f156b7e82b1acb185300a06082a8648ce3d0403020348003045022100c7d49d51127fde5f70cdcc92bf31a8ead8a8c2c94480a6b23d985c505ed20cca022059e8d330eed12e0bbfa9bea19384cd125a1d81b99d8af3ea352efc119c1091d7",
+    "pai_cert": "308201d33082017aa0030201020208559e4652e9023665300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c05daa586e7712fd9d774b98d03eea86d99c66de0bd00362900467f4c4422ef67e8d1471cf4675abdabe221476eecfa0b84e353ec6e9497299bc178467d6b9bca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144bb520a28dd5195cd2279c5f156b7e82b1acb185301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205dd9ce2f22e69b662ef5865ec7b0655c596055826950bec63813e8be585559300220411ee98807cffdf86dddbfb022c32a36d45bfe1ecda03107fe39fbb38c71624d",
+    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b15200001360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202728c6779f4343cfa4e7b612777559c3ef5d1434cb961be8d0a49881811df5c2022100ff158c6660016f799f5225393ae29cb966d6248eebe425ca46df2d104f6b25e4",
+    "dac_private_key": "efe487c6b6ce62cb8e9d232ab8f27d42e2a93e31526f715721ee410a6b469b00",
+    "dac_public_key": "04dcd04fbf086753d1c9afc039f57b25bebeff79bcf7ee14f4ab0e2323d62076b60061a8ca5506841f8630aab6a1feb1f295c55d653bbf00a72d12e0a0079db676"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der
index d42203deaa727c..a2fd5c2c03bd6b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der
index 643c6b7386d789..1b155a926d463e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem
index 3b2a00789768b6..76726fd05c799d 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAQIII0N0uct+CD0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAQIICVy5BCcv99kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARYof+dIYjHUxUbgvnGJE555rJtBNB+
-or+pHRej0F8HVH8CNAz2xsaOgRFIdL1VF35ouigs0l+QxNsMRydzqfiDo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUPhMhzb9IJo2+
-qUxFoLC4ZlPlLwIwHwYDVR0jBBgwFoAUFWO+/6gwpNvu5RrJt1Dd/jpurNcwCgYI
-KoZIzj0EAwIDSAAwRQIhAMJdgD3ZZxcBXB7YyWdfeBWOMPvD74e6axfKTdV68LI+
-AiAu8uwuPj1cImdWForwa2uMy76kqvknHG8I34+K04gZ8w==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQZYjs3lvdF5a/MnwnGpGrhJyv6+yiq
+QmiSnjqrozTmsfwS0WSLiDkB3FiPvlCA+wVrvFXS8TTe456DDOAYx+D8o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUU9YqZWl7P0Ln
+Ww1+6ZMIOOtirRkwHwYDVR0jBBgwFoAUca9IfOH5Y5O48h9yuCwkQvZOLtYwCgYI
+KoZIzj0EAwIDSAAwRQIhAMWG6ay42sxcUEKycCuNFyCi880f9ararLXuP/v3aNyv
+AiBkaANC761Xs9ZeQpW5cSMDgYAMhselPifw4hiW+RxJkw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der
index 0712a431c139ea..f28baa5f60f2d6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem
index 880f194edfd333..b5822355258849 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB+GIrQ1pTfjir1z01K6EWx1pPG/L1oFYdb0B7v7gnCPoAoGCCqGSM49
-AwEHoUQDQgAEWKH/nSGIx1MVG4L5xiROeeaybQTQfqK/qR0Xo9BfB1R/AjQM9sbG
-joERSHS9VRd+aLooLNJfkMTbDEcnc6n4gw==
+MHcCAQEEIB7fnHdZ4HsLjCPxVyPY8ouSVT5PUD85jgaHUQ7QprvtoAoGCCqGSM49
+AwEHoUQDQgAEGWI7N5b3ReWvzJ8JxqRq4Scr+vsoqkJokp46q6M05rH8EtFki4g5
+AdxYj75QgPsFa7xV0vE03uOegwzgGMfg/A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der
index 0ca1741cdfc2e8..c29f52c807bf01 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem
index 566be79634b389..39e0d23eaa1226 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIISjYJJhme3RUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIISInkvhWzPA4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABB4OjKHFWi/1u9+oaydHqWARK4QlQflYfoV6z5bgz6qsSffaH11Wr7Dg6fJF
-R+H+mX3o+4ADAGW05CIWC+4M2UWjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQVY77/qDCk2+7lGsm3UN3+Om6s1zAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAy
-4ermeeYY/mOLtpj4syN0Llr3LxNiT6hGjIWh7zw6dQIhAK96fG0/Bzkkd3zJXkO3
-xHBIY4ltnTu6p4RRTx9gGa14
+A0IABBEUapC7hsteVsFRg1GgwZFXfL+9F+qcziRjbUs1zj4pl0TFBKQJFRkXPpvQ
+4KGw9gTPPfqruw6ua8TUzoy2L/ujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRxr0h84fljk7jyH3K4LCRC9k4u1jAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+pqZm2cK+Q9OGvaAuMc30F8VFtg3HNwQ0lpoYH8j+H8cCIBwNjE6FpY/Pp1o+44a7
+xXnBjuwbgWsTmJKSINYEiJwJ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der
index b4ba5f3f14f3c3..95eb03475b1daa 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem
index 87e2380caed7cd..3775d46816114c 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMzKTBvwCy3yIO4yn3lWu96OBf68qn1dnVrGcAshRUDJoAoGCCqGSM49
-AwEHoUQDQgAEHg6MocVaL/W736hrJ0epYBErhCVB+Vh+hXrPluDPqqxJ99ofXVav
-sODp8kVH4f6Zfej7gAMAZbTkIhYL7gzZRQ==
+MHcCAQEEIATX/xcuFW8gQ10DHVqjnQLK3zBFYAWPT5PbIdQYeCbtoAoGCCqGSM49
+AwEHoUQDQgAEERRqkLuGy15WwVGDUaDBkVd8v70X6pzOJGNtSzXOPimXRMUEpAkV
+GRc+m9DgobD2BM89+qu7Dq5rxNTOjLYv+w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json
index 126ee9e62aa368..d2889db76e6d5d 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Invalid certificate version field set to v2(1)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201010208234374b9cb7e083d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000458a1ff9d2188c753151b82f9c6244e79e6b26d04d07ea2bfa91d17a3d05f07547f02340cf6c6c68e81114874bd55177e68ba282cd25f90c4db0c472773a9f883a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143e1321cdbf48268dbea94c45a0b0b86653e52f02301f0603551d230418301680141563beffa830a4dbeee51ac9b750ddfe3a6eacd7300a06082a8648ce3d0403020348003045022100c25d803dd96717015c1ed8c9675f78158e30fbc3ef87ba6b17ca4dd57af0b23e02202ef2ec2e3e3d5c226756168af06b6b8ccbbea4aaf9271c6f08df8f8ad38819f3",
-    "pai_cert": "308201be30820164a00302010202084a360926199edd15300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200041e0e8ca1c55a2ff5bbdfa86b2747a960112b842541f9587e857acf96e0cfaaac49f7da1f5d56afb0e0e9f24547e1fe997de8fb80030065b4e422160bee0cd945a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604141563beffa830a4dbeee51ac9b750ddfe3a6eacd7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022032e1eae679e618fe638bb698f8b323742e5af72f13624fa8468c85a1ef3c3a75022100af7a7c6d3f073924777cc95e43b7c4704863896d9d3bbaa784514f1f6019ad78",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e27b21d80a1291797905d73fd88824780dfb0a2e2b88afa621e034e1f376d02b02204c1b8b28e3ab3a29028b24d2e55b7260eb538d1bb70a13306b46187d846acc62",
-    "dac_private_key": "1f8622b435a537e38abd73d352ba116c75a4f1bf2f5a0561d6f407bbfb82708f",
-    "dac_public_key": "0458a1ff9d2188c753151b82f9c6244e79e6b26d04d07ea2bfa91d17a3d05f07547f02340cf6c6c68e81114874bd55177e68ba282cd25f90c4db0c472773a9f883"
+    "dac_cert": "308201ce30820174a0030201010208095cb904272ff7d9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000419623b3796f745e5afcc9f09c6a46ae1272bfafb28aa4268929e3aaba334e6b1fc12d1648b883901dc588fbe5080fb056bbc55d2f134dee39e830ce018c7e0fca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041453d62a65697b3f42e75b0d7ee9930838eb62ad19301f0603551d2304183016801471af487ce1f96393b8f21f72b82c2442f64e2ed6300a06082a8648ce3d0403020348003045022100c586e9acb8dacc5c5042b2702b8d1720a2f3cd1ff5aadaacb5ee3ffbf768dcaf022064680342efad57b3d65e4295b971230381800c86c7a53e27f0e21896f91c4993",
+    "pai_cert": "308201be30820164a00302010202084889e4be15b33c0e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000411146a90bb86cb5e56c1518351a0c191577cbfbd17ea9cce24636d4b35ce3e299744c504a4091519173e9bd0e0a1b0f604cf3dfaabbb0eae6bc4d4ce8cb62ffba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041471af487ce1f96393b8f21f72b82c2442f64e2ed6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a6a666d9c2be43d386bda02e31cdf417c545b60dc7370434969a181fc8fe1fc702201c0d8c4e85a58fcfa75a3ee386bbc579c18eec1b816b1398929220d604889c09",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210090e5c2b2074ebdd3c07a6d7252397018c0c8ed5a607b5b7d97a80f0df4e81b5f02210080106205a6678a2e4c80841d81d8b491f0c4d18e83648d515ca9b192f64509ad",
+    "dac_private_key": "1edf9c7759e07b0b8c23f15723d8f28b92553e4f503f398e0687510ed0a6bbed",
+    "dac_public_key": "0419623b3796f745e5afcc9f09c6a46ae1272bfafb28aa4268929e3aaba334e6b1fc12d1648b883901dc588fbe5080fb056bbc55d2f134dee39e830ce018c7e0fc"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der
index 3e383d9b991194..ce647632c36ec6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der
index dda894f29bc607..f71ca132dda6a8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem
index 9e408c505a5a13..0b2a67622635f2 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIDK5kwgUSAUEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIICJAxPrP/fzowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARr1Isyp3YsbMyvgXIfrgwbxaOFMiA1
-kZYTGF/pvly+kk+f7vSKOa25/22SPW9lzZPH8su+V/M+RWMB7e2MqOmHo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUa172m9DhX5Ds
-GrhPQPv73mW3UacwHwYDVR0jBBgwFoAU7KOyf6tcqBDXJDqueGsnmTrdz4cwCgYI
-KoZIzj0EAwIDSAAwRQIga/gCMtfLkDGGAnFLsOvHur4i1IwdxKdQce0W/byyTNwC
-IQDS0Rj+XjVpzndahAl3zZiGBwJNir/rc9ftM8PQZdy7Aw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9W7duG5fJVhSXF6u2DwIUTU7gpTyN
+GopDRhD67n/GC4aUKZ4xzr1xYfQt+rQRzVliEZFiPLaXPWvMG8i61wFSo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWms6AsADEUHi
+pZzQDcQICluN+bwwHwYDVR0jBBgwFoAUeZhx076y1NAoy3o889DeiUSoBBgwCgYI
+KoZIzj0EAwIDSQAwRgIhALwXqM0L/eB3DUb2ThEY5StC5E7eclNLv4GzxpgDrQrk
+AiEA+mHNrZ7wd+5CGXRMV6RkKAYwsVIoJ3a2mOPpqMRv8bo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der
index e37170bf571a41..2fb870cdb98c73 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem
index 231079b9a024c7..25dea6737c5522 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICDGoDYvdbSYLkMxlEicMHsnGEwR0tj3lqdoMWPi6ySioAoGCCqGSM49
-AwEHoUQDQgAEa9SLMqd2LGzMr4FyH64MG8WjhTIgNZGWExhf6b5cvpJPn+70ijmt
-uf9tkj1vZc2Tx/LLvlfzPkVjAe3tjKjphw==
+MHcCAQEEIMrNNr5U06vpShkgvo238Rh1P/a+fZkItqVrl+mGfgZhoAoGCCqGSM49
+AwEHoUQDQgAE/Vu3bhuXyVYUlxertg8CFE1O4KU8jRqKQ0YQ+u5/xguGlCmeMc69
+cWH0Lfq0Ec1ZYhGRYjy2lz1rzBvIutcBUg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der
index 96bc202c2aeda6..f19fb3d762657a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem
index 2f02ea6d2a1032..8969d647085153 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIAaU+vbfHd4kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIeA5sd2rLpNgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFLIIJlh1rmfG8rXJd0qMq1WvyYewwaELo7ZsvXH0fBgaHGdufrjwh+4Q5rL
-OA4vAn3ELGBbcOdndgd79zj5XlKjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTso7J/q1yoENckOq54ayeZOt3PhzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA4
-dMPhKKJYbzEwHBWEC4FBNua8P6m90CP32QcKhP/v7QIhALGbumhPxka0fmhte9MG
-5zmG2J/z3UOLkOBLaXwyyqaE
+A0IABBkNJHCvZ1I4e44JUjm/KuubWAR2KbIuO0wcz7FW5CFYiHS6VHXg7MhS0JaZ
+F6/SQPURdfBbLkCY1QVi4d4y6nmjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR5mHHTvrLU0CjLejzz0N6JRKgEGDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBK
+7AwliyMxaaOaJo5Ks2FuKNP6GuzkFO1w80rFm6YD5AIhALUe2mKzEYA0vucsd6ya
+FTk7WQba529Vea7u5KmZM8WC
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der
index bfc8ebc71c8d66..9abe48c9c1ab07 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem
index bab07c039ea260..ab0c5bbfd81931 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPby6KEXHgwmB+hUrnjDU2Kfvwrc4PCTeymHt9bVmJ5aoAoGCCqGSM49
-AwEHoUQDQgAEUsggmWHWuZ8bytcl3SoyrVa/Jh7DBoQujtmy9cfR8GBocZ25+uPC
-H7hDmss4Di8CfcQsYFtw52d2B3v3OPleUg==
+MHcCAQEEIHQ8b60fZ3mpERzSeX3HIGaL9XmEDh77UCSiP9pH60dxoAoGCCqGSM49
+AwEHoUQDQgAEGQ0kcK9nUjh7jglSOb8q65tYBHYpsi47TBzPsVbkIViIdLpUdeDs
+yFLQlpkXr9JA9RF18FsuQJjVBWLh3jLqeQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json
index ed86a0962e0895..cc89c4a49684a7 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Valid certificate version field set to v3(2)",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a00302010202080cae64c205120141300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046bd48b32a7762c6cccaf81721fae0c1bc5a385322035919613185fe9be5cbe924f9feef48a39adb9ff6d923d6f65cd93c7f2cbbe57f33e456301eded8ca8e987a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146b5ef69bd0e15f90ec1ab84f40fbfbde65b751a7301f0603551d23041830168014eca3b27fab5ca810d7243aae786b27993addcf87300a06082a8648ce3d040302034800304502206bf80232d7cb90318602714bb0ebc7babe22d48c1dc4a75071ed16fdbcb24cdc022100d2d118fe5e3569ce775a840977cd988607024d8abfeb73d7ed33c3d065dcbb03",
-    "pai_cert": "308201be30820164a003020102020801a53ebdb7c77789300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000452c8209961d6b99f1bcad725dd2a32ad56bf261ec306842e8ed9b2f5c7d1f06068719db9fae3c21fb8439acb380e2f027dc42c605b70e76776077bf738f95e52a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414eca3b27fab5ca810d7243aae786b27993addcf87301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203874c3e128a2586f31301c15840b814136e6bc3fa9bdd023f7d9070a84ffefed022100b19bba684fc646b47e686d7bd306e73986d89ff3dd438b90e04b697c32caa684",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100beee93d0de9ca5e41a7484013d7050ce439b5e92ee2c47b74399c9ea866e62ff022100b112b86226ed90d8e9136ebd94247e279dbcc6e49494c89cc27f4a8ec86a9f03",
-    "dac_private_key": "20c6a0362f75b4982e433194489c307b27184c11d2d8f796a7683163e2eb24a2",
-    "dac_public_key": "046bd48b32a7762c6cccaf81721fae0c1bc5a385322035919613185fe9be5cbe924f9feef48a39adb9ff6d923d6f65cd93c7f2cbbe57f33e456301eded8ca8e987"
+    "dac_cert": "308201cf30820174a00302010202080890313eb3ff7f3a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fd5bb76e1b97c956149717abb60f02144d4ee0a53c8d1a8a434610faee7fc60b8694299e31cebd7161f42dfab411cd59621191623cb6973d6bcc1bc8bad70152a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145a6b3a02c0031141e2a59cd00dc4080a5b8df9bc301f0603551d23041830168014799871d3beb2d4d028cb7a3cf3d0de8944a80418300a06082a8648ce3d0403020349003046022100bc17a8cd0bfde0770d46f64e1118e52b42e44ede72534bbf81b3c69803ad0ae4022100fa61cdad9ef077ee4219744c57a464280630b152282776b698e3e9a8c46ff1ba",
+    "pai_cert": "308201be30820164a0030201020208780e6c776acba4d8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004190d2470af6752387b8e095239bf2aeb9b58047629b22e3b4c1ccfb156e421588874ba5475e0ecc852d0969917afd240f51175f05b2e4098d50562e1de32ea79a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414799871d3beb2d4d028cb7a3cf3d0de8944a80418301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204aec0c258b233169a39a268e4ab3616e28d3fa1aece414ed70f34ac59ba603e4022100b51eda62b3118034bee72c77ac9a15393b5906dae76f5579aeeee4a99933c582",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008c99c06117c74a180d7be68abf26aa552bf853cb603d9e8969721317d4da209e02210086b9f84da153f87185fa7876d4d779f58009b8180eb03d0aaf3e677a2a879931",
+    "dac_private_key": "cacd36be54d3abe94a1920be8db7f118753ff6be7d9908b6a56b97e9867e0661",
+    "dac_public_key": "04fd5bb76e1b97c956149717abb60f02144d4ee0a53c8d1a8a434610faee7fc60b8694299e31cebd7161f42dfab411cd59621191623cb6973d6bcc1bc8bad70152"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der
index 918fb4d1b1675b..94924eb929da83 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der
index 2a6e760d8ed280..f45acf319085da 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem
index e3819352af3d61..3e18a0c09e06eb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem
@@ -1,12 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBrTCCAVOgAwIBAgIIMtkLdHVP2bUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBrDCCAVOgAwIBAgIIVYg89ltBhgIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARW9M7gXh8q5SN1rEmB4uTs4ulidrVa
-AVF1Fcz3k2RdHZDrXyePPPTkK05dBozXGjfb5bOeal2RwiZ0XjrbxHqRoz8wPTAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUpVLxDDvTkOli
-pRjcmb5XFaTeXm8wCgYIKoZIzj0EAwIDSAAwRQIhAJYBm4Pay1B/56mq27F+oPcm
-3yzfMb91SQjBsbcisE2CAiBBHPFhNjggpfCsEbN55RByqSZ086ECt5elNaj1a9xr
-qQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdCGRCnWhq6WD1hXzfTvR8Qp82Lw4v
+SOlqnTYqgsURkcCgEsqxR3fJNQvPSJyRLQIHONsM8tIcSbr6HTJXEHDNoz8wPTAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUV9UK5wiT6TgF
+BpMVZaR4XnDBwrYwCgYIKoZIzj0EAwIDRwAwRAIgefWv48b2Ju5d2vnbiMqNsRik
+/WR2USVc+uA1fHnM9r0CIDH0wvVCiCAL68ajWdI3nNUUWhLZHT421ruLhYrZLDnw
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der
index c79fdbd9d9f325..e9f14f18337d11 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem
index c8b96a9d87d227..8d7ec5c01dcf85 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM+gM1gxCTeCPBBa+XNxRx+mhdr7fuXG9S9mbqVHtmbaoAoGCCqGSM49
-AwEHoUQDQgAEVvTO4F4fKuUjdaxJgeLk7OLpYna1WgFRdRXM95NkXR2Q618njzz0
-5CtOXQaM1xo32+WznmpdkcImdF4628R6kQ==
+MHcCAQEEIOyB25CKBQyU/r3pvCVAYYRy417t2F1VCG8TbVWcmM4SoAoGCCqGSM49
+AwEHoUQDQgAEXQhkQp1oaulg9YV83070fEKfNi8OL0jpap02KoLFEZHAoBLKsUd3
+yTULz0ickS0CBzjbDPLSHEm6+h0yVxBwzQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der
index 434631e77f9c8c..5b8388ba9326a9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem
index 292df21eb5699f..dedeeb52cb4725 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIGD6qjPnNUJMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIIVWLE8NYmDWAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABGFta88lFn2iFG6mS/uzElSZwqZ6xc3gXqiNiWS1KDXGEhmR+IaFkBgCNwwy
-i27QZvQ6eV1kosBplvG9pYqKBxujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSA7ooNTFQCkPatNhBCGK6Nf7GoQTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-xPy/zoPbwNRKp0Z6d5tUfgks6uXtBhoEUPxyJDW8RlACIDppTE+bZFNJZ7gJANpg
-yqDbDIq3wr28rH6Bo8jviNA1
+A0IABG5LJPaqyvTKTUm9yTU72Nbx3jjPMuFSQ/86GjptioVvFmUBFNOiEiEERm67
+bKImsZr14zkRb6ZlGCdIOdt25majZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSPXdYtA2hsAY2XmCyIQZm7AKs7gjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB7
+YfTP6Tg+ZTK7Bm2l85/IuMv3G/Uxt3EPTs3XnATAIQIgGKW37sd6bPk11GLd8c3p
+zmgRnoQC1Vmvn9wHB1jpYMk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der
index 97ce4e98b33c20..94db86cf89752e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem
index ce1a7405b2656b..87750d1c80c95c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAyi5pJAF/hULeBKQGfOUDI5agImehl4e8NuWxHs4EP0oAoGCCqGSM49
-AwEHoUQDQgAEYW1rzyUWfaIUbqZL+7MSVJnCpnrFzeBeqI2JZLUoNcYSGZH4hoWQ
-GAI3DDKLbtBm9Dp5XWSiwGmW8b2liooHGw==
+MHcCAQEEIAiT5hbAK1x/sZe6byERRuNdqvmFyFihFdoK0SiJaZEjoAoGCCqGSM49
+AwEHoUQDQgAEbksk9qrK9MpNSb3JNTvY1vHeOM8y4VJD/zoaOm2KhW8WZQEU06IS
+IQRGbrtsoiaxmvXjORFvpmUYJ0g523bmZg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json
index 6c72e5e2341aa0..e7caa73e4c2087 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Authority Key ID (AKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ad30820153a003020102020832d90b74754fd9b5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000456f4cee05e1f2ae52375ac4981e2e4ece2e96276b55a01517515ccf793645d1d90eb5f278f3cf4e42b4e5d068cd71a37dbe5b39e6a5d91c226745e3adbc47a91a33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a552f10c3bd390e962a518dc99be5715a4de5e6f300a06082a8648ce3d040302034800304502210096019b83dacb507fe7a9aadbb17ea0f726df2cdf31bf754908c1b1b722b04d820220411cf161363820a5f0ac11b379e51072a92674f3a102b797a535a8f56bdc6ba9",
-    "pai_cert": "308201be30820164a0030201020208183eaa8cf9cd5093300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004616d6bcf25167da2146ea64bfbb3125499c2a67ac5cde05ea88d8964b52835c6121991f88685901802370c328b6ed066f43a795d64a2c06996f1bda58a8a071ba366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041480ee8a0d4c540290f6ad36104218ae8d7fb1a841301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c4fcbfce83dbc0d44aa7467a779b547e092ceae5ed061a0450fc722435bc465002203a694c4f9b64534967b80900da60caa0db0c8ab7c2bdbcac7e81a3c8ef88d035",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220551fc76c663756b163123954662bfef562a097639c153183aaeb4c2672f3a8fb02203f2611d551c5ad5dadbde61b6ce9d54d73b1aaf9ffe68922d4ad8dae43fd79e7",
-    "dac_private_key": "cfa03358310937823c105af97371471fa685dafb7ee5c6f52f666ea547b666da",
-    "dac_public_key": "0456f4cee05e1f2ae52375ac4981e2e4ece2e96276b55a01517515ccf793645d1d90eb5f278f3cf4e42b4e5d068cd71a37dbe5b39e6a5d91c226745e3adbc47a91"
+    "dac_cert": "308201ac30820153a003020102020855883cf65b418602300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d0864429d686ae960f5857cdf4ef47c429f362f0e2f48e96a9d362a82c51191c0a012cab14777c9350bcf489c912d020738db0cf2d21c49bafa1d32571070cda33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041457d50ae70893e9380506931565a4785e70c1c2b6300a06082a8648ce3d0403020347003044022079f5afe3c6f626ee5ddaf9db88ca8db118a4fd647651255cfae0357c79ccf6bd022031f4c2f54288200bebc6a359d2379cd5145a12d91d3e36d6bb8b858ad92c39f0",
+    "pai_cert": "308201bd30820164a00302010202085562c4f0d6260d60300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046e4b24f6aacaf4ca4d49bdc9353bd8d6f1de38cf32e15243ff3a1a3a6d8a856f16650114d3a2122104466ebb6ca226b19af5e339116fa66518274839db76e666a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148f5dd62d03686c018d97982c884199bb00ab3b82301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207b61f4cfe9383e6532bb066da5f39fc8b8cbf71bf531b7710f4ecdd79c04c021022018a5b7eec77a6cf935d462ddf1cde9ce68119e8402d559af9fdc070758e960c9",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c16e6a810773e669ccd301ee9b8e37ff5dc94c7ed1f88e2ab7b47209a3fa4e8302210089c9c70829ca2a43907c9a461debecfcdd3cf2cc6a7e1a292d71014f1f20d5ac",
+    "dac_private_key": "ec81db908a050c94febde9bc2540618472e35eedd85d55086f136d559c98ce12",
+    "dac_public_key": "045d0864429d686ae960f5857cdf4ef47c429f362f0e2f48e96a9d362a82c51191c0a012cab14777c9350bcf489c912d020738db0cf2d21c49bafa1d32571070cd"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der
index 8fd0676c11b05e..c47125dcf981e5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der
index dedb8e2a66cdad..781efc23a97355 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem
index af31cdf4136dfb..2dc4ee0bd259db 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBTCCAaygAwIBAgIIe5d63TeEWm8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIICBzCCAaygAwIBAgIILwJUrVSiHwkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASlm+EG331HTfOs+EgVxwuHX0MQ+DvR
-fkajrFew2M4cGNlPQrnYP8ynbNLIdPdukR3zUxw2T55/Tqk/5fX/LsjWo4GXMIGU
-MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSbDX3f3X2C
-zO7kb2A7PRAjfmez7TAfBgNVHSMEGDAWgBQIX12MM637k7C9Yh2MP1T+JhAnFDA0
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASUXPmld4Fl9lZgshv63Df/LmtjQNkz
+hyIXy4v9JhSJ9Gc2IJhBu1d5XF8HjhVssVATTMHDnpyiACNE5GToJZp4o4GXMIGU
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBROQjz/cGho
+B6HDHYwRzRmaZuiSzDAfBgNVHSMEGDAWgBSdt5KmEWBtitfLRQfYZ1gdR+OzjDA0
 BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmV4YW1wbGUu
-Y29tLzAKBggqhkjOPQQDAgNHADBEAiBUw9xBtgCDRzHIF4U3PCwoM+/iWU+Q5yBb
-xL6koyl+qAIgM9NqI5VlI4Yd997p5nhukb8wyw/v3h9G0Il+Kaq+HhM=
+Y29tLzAKBggqhkjOPQQDAgNJADBGAiEA3AECM2iYa+FUdqI0EIX31iOszjXPli+7
+1vd9/yUzMBcCIQCubK+Aci7wgu5jMbJPREvvWfKVW9NcXaaq1LS7cce9+w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der
index 9eb30bc36bf88d..12c439dfb23176 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem
index 522b58dc17973a..b09b89b0f8489b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMI2eBzlFfhuEc2i4bHmOSlYdePFXvhx9HE2KnIrc2R/oAoGCCqGSM49
-AwEHoUQDQgAEpZvhBt99R03zrPhIFccLh19DEPg70X5Go6xXsNjOHBjZT0K52D/M
-p2zSyHT3bpEd81McNk+ef06pP+X1/y7I1g==
+MHcCAQEEIBDEGxc4/J+Z2C0ORqr3YWv1l7F8zeFGf67ucqiuMU8MoAoGCCqGSM49
+AwEHoUQDQgAElFz5pXeBZfZWYLIb+tw3/y5rY0DZM4ciF8uL/SYUifRnNiCYQbtX
+eVxfB44VbLFQE0zBw56cogAjRORk6CWaeA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der
index cf6e6f712e9a5d..dd719edf35fd91 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem
index 71ad2c6c786870..ac03a419dac477 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIId+Ifj7WiBh4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIR+YomzkbdZcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABNdf9CWhXgi2u8loLJu99vaKhkUOc+2s8J8ZOuE2iJwtO8hbNvhLsroBuHhq
-2rEaqS6TlXx5tIkgdg0bxJDNr6ijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQIX12MM637k7C9Yh2MP1T+JhAnFDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-mAy5vGKK1r03b4XD2f0KDatYtJxjy2DJTKtyHW8aTuICIGwSVHlkOdcyeoGbeJWk
-tYcXmFYM7d7F7yW8ubTLuTgJ
+A0IABPgdEwRy3308d7AqkJ/AuTmxuy3cLN/MIJ0YdIIFDsC2H7G2+QNM2VH9ho5m
+9uBQ29kYr662BHKQ2k5QmXNIWYyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSdt5KmEWBtitfLRQfYZ1gdR+OzjDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAF
+mJLl80vk843e5EG0WPLbWbqrqbSla23NQKTrfc0R5QIhAKbfHxqywDjfHq3PnbbH
+Zknb3lhgUzttWwABGZnd58jy
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der
index d2ed939a8f8e7c..c2d6e800aa19a9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem
index b2e00979c78cf1..78f73e79b35506 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEl8Al+ljxpwoRpcLn/14UAoMdGsEHklyI/qTJf3rbQboAoGCCqGSM49
-AwEHoUQDQgAE11/0JaFeCLa7yWgsm7329oqGRQ5z7azwnxk64TaInC07yFs2+Euy
-ugG4eGrasRqpLpOVfHm0iSB2DRvEkM2vqA==
+MHcCAQEEIOzet/glGWaDi4EDee8lM8yE1cHgn8wh88dzkcBPMwx/oAoGCCqGSM49
+AwEHoUQDQgAE+B0TBHLffTx3sCqQn8C5ObG7Ldws38wgnRh0ggUOwLYfsbb5A0zZ
+Uf2Gjmb24FDb2RivrrYEcpDaTlCZc0hZjA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json
index a9506e24934740..314004bb37475f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate includes optional Authority Information Access extension",
     "is_success_case": "true",
-    "dac_cert": "30820205308201aca00302010202087b977add37845a6f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a59be106df7d474df3acf84815c70b875f4310f83bd17e46a3ac57b0d8ce1c18d94f42b9d83fcca76cd2c874f76e911df3531c364f9e7f4ea93fe5f5ff2ec8d6a38197308194300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149b0d7ddfdd7d82cceee46f603b3d10237e67b3ed301f0603551d23041830168014085f5d8c33adfb93b0bd621d8c3f54fe26102714303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d0403020347003044022054c3dc41b600834731c81785373c2c2833efe2594f90e7205bc4bea4a3297ea8022033d36a23956523861df7dee9e6786e91bf30cb0fefde1f46d0897e29aabe1e13",
-    "pai_cert": "308201be30820164a003020102020877e21f8fb5a2061e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004d75ff425a15e08b6bbc9682c9bbdf6f68a86450e73edacf09f193ae136889c2d3bc85b36f84bb2ba01b8786adab11aa92e93957c79b48920760d1bc490cdafa8a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414085f5d8c33adfb93b0bd621d8c3f54fe26102714301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100980cb9bc628ad6bd376f85c3d9fd0a0dab58b49c63cb60c94cab721d6f1a4ee202206c1254796439d7327a819b7895a4b5871798560ceddec5ef25bcb9b4cbb93809",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e2eddcc4a98c46fdc0940569a77cd5dc991ebe90aeb40bdc51b26df08f474d67022100a99953496e766d789df9f3fa4d2749aefd7d2bdc6a75773108bec4a11d08b031",
-    "dac_private_key": "c236781ce515f86e11cda2e1b1e639295875e3c55ef871f471362a722b73647f",
-    "dac_public_key": "04a59be106df7d474df3acf84815c70b875f4310f83bd17e46a3ac57b0d8ce1c18d94f42b9d83fcca76cd2c874f76e911df3531c364f9e7f4ea93fe5f5ff2ec8d6"
+    "dac_cert": "30820207308201aca00302010202082f0254ad54a21f09300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004945cf9a5778165f65660b21bfadc37ff2e6b6340d933872217cb8bfd261489f46736209841bb57795c5f078e156cb150134cc1c39e9ca2002344e464e8259a78a38197308194300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144e423cff70686807a1c31d8c11cd199a66e892cc301f0603551d230418301680149db792a611606d8ad7cb4507d867581d47e3b38c303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d0403020349003046022100dc01023368986be15476a2341085f7d623acce35cf962fbbd6f77dff25333017022100ae6caf80722ef082ee6331b24f444bef59f2955bd35c5da6aad4b4bb71c7bdfb",
+    "pai_cert": "308201be30820164a003020102020847e6289b391b7597300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f81d130472df7d3c77b02a909fc0b939b1bb2ddc2cdfcc209d187482050ec0b61fb1b6f9034cd951fd868e66f6e050dbd918afaeb6047290da4e50997348598ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149db792a611606d8ad7cb4507d867581d47e3b38c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220059892e5f34be4f38ddee441b458f2db59baaba9b4a56b6dcd40a4eb7dcd11e5022100a6df1f1ab2c038df1eadcf9db6c76649dbde5860533b6d5b00011999dde7c8f2",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ae3b7824e980e6c00453ca1bb12b1cbe06e34afa33481586e34a7fd4b6d8be2a022020cb829d5c1942faca77c3bb3393b5b4f9ff6873659c6635124a4f7235b5b808",
+    "dac_private_key": "10c41b1738fc9f99d82d0e46aaf7616bf597b17ccde1467faeee72a8ae314f0c",
+    "dac_public_key": "04945cf9a5778165f65660b21bfadc37ff2e6b6340d933872217cb8bfd261489f46736209841bb57795c5f078e156cb150134cc1c39e9ca2002344e464e8259a78"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der
index 996142ec0b0ee0..4cd64789aca510 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der
index 282617dd4ad643..4d61c67154f81a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem
index 7fdc9218f9fc8a..2f19ea8c95f5cd 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0TCCAXegAwIBAgIIONUsUAcOxyAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB0jCCAXegAwIBAgIIHM+1x4oQaBEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQlImVG/wtzEPrfNhttUMoUlaIafVrW
-v80Q74/ttMuj/v+eNe2pLDUasLWszyhUGKq02DqNb6NAE18Au5a1mD1po2MwYTAP
-BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUyBELTx0B
-ED/Vu6/HprLzvGw+vMowHwYDVR0jBBgwFoAUOCm8REgwpwfEUFcz0n+D+1qru0gw
-CgYIKoZIzj0EAwIDSAAwRQIgMGjvv0Jhxp45WD8VSwG4+/oGdmhwPv6aSGg1Iptw
-/McCIQC3NSQF54zdeucodVS+6dVJeT6LUS9JdO2XbekwdPgenw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARG3y/2jZ9ygg3ZDdWsypx+ImMT1bL+
+CbCLTsRAoPd9/6H24hgRdhoxbFLOCF00QHu6mmDvblBLMD8CjFwJdqpao2MwYTAP
+BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUde/udeQe
+vlI2Zlj3pzrKLwmgPTwwHwYDVR0jBBgwFoAUzFKQJHx/BAY3nw/zVCcDFoAot68w
+CgYIKoZIzj0EAwIDSQAwRgIhAMeGa5cxsjtnA1BnZT89NWdtAStfJGTuSEotweXP
+84PwAiEAoq2+yK45WKiWTNkLx0YSFF8YZV3Cyt4j18a4h5tz80g=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der
index 66c58c701df444..d68aa345744421 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem
index 5c7c2cfc33dfe5..ea6ffcb711a443 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINon4iaBLXpKixJa21lQvei2dvg8dOD1ZJFYBenvYvrFoAoGCCqGSM49
-AwEHoUQDQgAEJSJlRv8LcxD63zYbbVDKFJWiGn1a1r/NEO+P7bTLo/7/njXtqSw1
-GrC1rM8oVBiqtNg6jW+jQBNfALuWtZg9aQ==
+MHcCAQEEIDA48/R2A3SsjXAO/+kPOuzgC9+gb8G4nij5qCDMp2OqoAoGCCqGSM49
+AwEHoUQDQgAERt8v9o2fcoIN2Q3VrMqcfiJjE9Wy/gmwi07EQKD3ff+h9uIYEXYa
+MWxSzghdNEB7uppg725QSzA/AoxcCXaqWg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der
index 670a3fba99d007..27dcfd8130d63d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem
index ac10d8b7b18bd1..c9728d3e52f8c3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIAvlSNY8X3mYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIF2W5cF8wxR4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABNb7bkNbMaApcAndin5Xbt3O1CjsQsAFYXXfxPUAo2lRuk3wxhb/RLRa+aus
-Ypg0s79y2qoKlIiN+jijjnf8+1mjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQ4KbxESDCnB8RQVzPSf4P7Wqu7SDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-1A+OUuNPMnMsqoQjZ5DezGYpBF0rlhMqXCoT98NtoxgCIA01tH9Ggx2gFwwxWNSY
-NVvKnxJkMxyJPF6EkYZ++yx0
+A0IABEMfCeWkqmW8aQ4CCMoVhi08kVxTsqdexG6yYYU5RV2e0lYxNnGFolJNn+GG
+gbCuz14lWTe+rIcOgZu6LKZCQJujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTMUpAkfH8EBjefD/NUJwMWgCi3rzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+4C5fZawiJyZT/NN+7VreIc4lAfJP3LidROkilu8eGZMCIQDUbjaVcUISEm6+Xdsb
+efFlDIMNgECHyEEn1Z4uIWnmpw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der
index 00aa7b80539d0c..14a16352ad5abb 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem
index 50acc0f4b9d86d..6cc33b3cc3f74d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIARIoSAaogl4iwiNbp+JNF9NBJ9v1S5+BA642YcxR3IUoAoGCCqGSM49
-AwEHoUQDQgAE1vtuQ1sxoClwCd2Kfldu3c7UKOxCwAVhdd/E9QCjaVG6TfDGFv9E
-tFr5q6ximDSzv3LaqgqUiI36OKOOd/z7WQ==
+MHcCAQEEII94hAL6ZY5SYpILGWu+tviBE8c/wVs+OT1oL4cznmN4oAoGCCqGSM49
+AwEHoUQDQgAEQx8J5aSqZbxpDgIIyhWGLTyRXFOyp17EbrJhhTlFXZ7SVjE2cYWi
+Uk2f4YaBsK7PXiVZN76shw6Bm7ospkJAmw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json
index d79752ad019002..5dd8d94b7fa5bc 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension CA field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201d130820177a003020102020838d52c50070ec720300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000425226546ff0b7310fadf361b6d50ca1495a21a7d5ad6bfcd10ef8fedb4cba3feff9e35eda92c351ab0b5accf285418aab4d83a8d6fa340135f00bb96b5983d69a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e04160414c8110b4f1d01103fd5bbafc7a6b2f3bc6c3ebcca301f0603551d230418301680143829bc444830a707c4505733d27f83fb5aabbb48300a06082a8648ce3d040302034800304502203068efbf4261c69e39583f154b01b8fbfa067668703efe9a486835229b70fcc7022100b7352405e78cdd7ae7287554bee9d549793e8b512f4974ed976de93074f81e9f",
-    "pai_cert": "308201be30820164a003020102020802f952358f17de66300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004d6fb6e435b31a0297009dd8a7e576eddced428ec42c0056175dfc4f500a36951ba4df0c616ff44b45af9abac629834b3bf72daaa0a94888dfa38a38e77fcfb59a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604143829bc444830a707c4505733d27f83fb5aabbb48301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100d40f8e52e34f32732caa84236790decc6629045d2b96132a5c2a13f7c36da31802200d35b47f46831da0170c3158d498355bca9f1264331c893c5e8491867efb2c74",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100a8c5f3b1a71919dd80ff1b4e04ceeb5adacb238fd7d85fb10bf0e356ddc99062022100b6f1886d95d93bb1fa06a96808d0dfedf26a8a77c4a86dddfa5df3275115f9ec",
-    "dac_private_key": "da27e226812d7a4a8b125adb5950bde8b676f83c74e0f564915805e9ef62fac5",
-    "dac_public_key": "0425226546ff0b7310fadf361b6d50ca1495a21a7d5ad6bfcd10ef8fedb4cba3feff9e35eda92c351ab0b5accf285418aab4d83a8d6fa340135f00bb96b5983d69"
+    "dac_cert": "308201d230820177a00302010202081ccfb5c78a106811300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000446df2ff68d9f72820dd90dd5acca9c7e226313d5b2fe09b08b4ec440a0f77dffa1f6e21811761a316c52ce085d34407bba9a60ef6e504b303f028c5c0976aa5aa3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e0416041475efee75e41ebe52366658f7a73aca2f09a03d3c301f0603551d23041830168014cc5290247c7f0406379f0ff3542703168028b7af300a06082a8648ce3d0403020349003046022100c7866b9731b23b67035067653f3d35676d012b5f2464ee484a2dc1e5cff383f0022100a2adbec8ae3958a8964cd90bc74612145f18655dc2cade23d7c6b8879b73f348",
+    "pai_cert": "308201bf30820164a00302010202081765b9705f30c51e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004431f09e5a4aa65bc690e0208ca15862d3c915c53b2a75ec46eb2618539455d9ed25631367185a2524d9fe18681b0aecf5e255937beac870e819bba2ca642409ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414cc5290247c7f0406379f0ff3542703168028b7af301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e02e5f65ac22272653fcd37eed5ade21ce2501f24fdcb89d44e92296ef1e1993022100d46e3695714212126ebe5ddb1b79f1650c830d804087c84127d59e2e2169e6a7",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201e3834e2e4fffbf3e1fd9056a76e64cc69e10471ab11c9ec20b6eed1bb765097022100ddddbce8c76cf6574c9c0f0734693a15a5c07b05a68b997ef673901c86a1d975",
+    "dac_private_key": "3038f3f4760374ac8d700effe90f3aece00bdfa06fc1b89e28f9a820cca763aa",
+    "dac_public_key": "0446df2ff68d9f72820dd90dd5acca9c7e226313d5b2fe09b08b4ec440a0f77dffa1f6e21811761a316c52ce085d34407bba9a60ef6e504b303f028c5c0976aa5a"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der
index 01ab18641b69f1..db82b28139c3d1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der
index 07f213437d8eed..e039c377a9d417 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem
index 73ffcfead222f3..63b2d589d49984 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0TCCAXegAwIBAgIID8qy5jChGlMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB0DCCAXegAwIBAgIIYDv0govTSL4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARxWFwP0LvQwD6BJwLxeaFPNnCsJ81x
-9q2fPAkXuU583Ghcdeaph21zonShWzKllx8n2cKC8ixkoy0OPBxupy8ho2MwYTAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUz1YrlnhY
-QXYgKH8zSgjrvJAJaeYwHwYDVR0jBBgwFoAUjkQrE6y+PaFnHDhJBVSKbukbewAw
-CgYIKoZIzj0EAwIDSAAwRQIhAM8YXUS3/SAv+aerShwzJsImYXSH9NZVYBNNF2gY
-mNegAiBKn3itO2+yF4y9LqS5la0LvwBjQ3Nod4RZWdKDUS3F4Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ68mLdQUPLgiTxhiGYWU88Tvck5PCp
+XiOtAl3blSMLkWOTF02PaQaCo7mFnUPtJG7Pln07JuHrcyMw9zqLiGx2o2MwYTAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUJ/7vyorp
+L55iy13xkTelvmt7acAwHwYDVR0jBBgwFoAUZR7kiMphwM7KNzyWEMyuq2jx6lUw
+CgYIKoZIzj0EAwIDRwAwRAIgSuayLoaQvR/R+nPrIu3Sr1dpbbgKon85NstW4yWg
+1YwCIFjJ9awIf8QHSbsVYWD64I8WtKqSuZw4bp3xu/VG2WHg
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der
index 9af1514d4cc89f..d2239e2cba4e40 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem
index a455be20e35208..b053f024d055bf 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILYvqMKsywltjHLh3GFbRTY/vNCyPzHCJYpU0BVsKgyfoAoGCCqGSM49
-AwEHoUQDQgAEcVhcD9C70MA+gScC8XmhTzZwrCfNcfatnzwJF7lOfNxoXHXmqYdt
-c6J0oVsypZcfJ9nCgvIsZKMtDjwcbqcvIQ==
+MHcCAQEEIAmocsUjI9+ewP/5DUMbd3CJiM8TNPP2p+BRj17o+cdBoAoGCCqGSM49
+AwEHoUQDQgAEOvJi3UFDy4Ik8YYhmFlPPE73JOTwqV4jrQJd25UjC5FjkxdNj2kG
+gqO5hZ1D7SRuz5Z9Oybh63MjMPc6i4hsdg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der
index de3b317c3c8dba..09b153a5030190 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem
index 663768080eaa20..200255027a4e33 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIf+lSLm83eBwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIMf3KCOuLkoUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABLRxS5fSTOxRPU3lcWSako3E+4OU+9w1F5zXNHKm3MTKmDYQ4plmdOzG8IN9
-o0QWA2PBEuziLma+9WmkJYqc1w6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSORCsTrL49oWccOEkFVIpu6Rt7ADAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB/
-bGe7/0lL6m8yOWa6dslqbRb18zPDsQyOXXYixH05XgIgCXVfnyzKW4SHRRJUyhP+
-0ZCXEWFEyP+ZlhxvWWPW+g0=
+A0IABO1zteIvYZQunR+a3zyrKJTlDtVWAsogrRXzhJLnQTqDDmo425/sxUQ3FvKu
+ulx4NnWXKA2v2Gy2dpoBAuvmNsqjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlHuSIymHAzso3PJYQzK6raPHqVTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+gkrpA/ghgf5oVtgQ4TktcrDFAb/BDoeJlkELc0RLdW0CIQDV6PSD9cAVaAi01PEe
+gdFk+LXsf+e6yiU4gqYqjY4i/A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der
index e2b5a1bcdad1ce..8d5855b8df9899 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem
index 6631c11a151e97..41ee7eab9f4cf5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBxopVB3yN5bV08yln8Gi+DFc3Tm9oZqee4IRcsxWiZvoAoGCCqGSM49
-AwEHoUQDQgAEtHFLl9JM7FE9TeVxZJqSjcT7g5T73DUXnNc0cqbcxMqYNhDimWZ0
-7Mbwg32jRBYDY8ES7OIuZr71aaQlipzXDg==
+MHcCAQEEICwDKzfq/bE+PJ99AiHYhJiAe+AsDeFdiLnHp/1q6ZKSoAoGCCqGSM49
+AwEHoUQDQgAE7XO14i9hlC6dH5rfPKsolOUO1VYCyiCtFfOEkudBOoMOajjbn+zF
+RDcW8q66XHg2dZcoDa/YbLZ2mgEC6+Y2yg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json
index d6f00d1307723f..7258c25f029245 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension CA field is wrong (TRUE for DAC and FALSE for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201d130820177a00302010202080fcab2e630a11a53300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000471585c0fd0bbd0c03e812702f179a14f3670ac27cd71f6ad9f3c0917b94e7cdc685c75e6a9876d73a274a15b32a5971f27d9c282f22c64a32d0e3c1c6ea72f21a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020780301d0603551d0e04160414cf562b967858417620287f334a08ebbc900969e6301f0603551d230418301680148e442b13acbe3da1671c384905548a6ee91b7b00300a06082a8648ce3d0403020348003045022100cf185d44b7fd202ff9a7ab4a1c3326c226617487f4d65560134d17681898d7a002204a9f78ad3b6fb2178cbd2ea4b995ad0bbf006343736877845959d283512dc5e1",
-    "pai_cert": "308201bd30820164a00302010202087fe9522e6f37781c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b4714b97d24cec513d4de571649a928dc4fb8394fbdc35179cd73472a6dcc4ca983610e2996674ecc6f0837da344160363c112ece22e66bef569a4258a9cd70ea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604148e442b13acbe3da1671c384905548a6ee91b7b00301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207f6c67bbff494bea6f323966ba76c96a6d16f5f333c3b10c8e5d7622c47d395e022009755f9f2cca5b8487451254ca13fed19097116144c8ff99961c6f5963d6fa0d",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210093a5389f26086a12651d3bd2a96399666e1586f6178bf2617bc79a80c8dde3d302203700956415445211bffcb527218aef67ee2c8ac430f2b35a262eccf3450a21df",
-    "dac_private_key": "b62fa8c2accb096d8c72e1dc615b45363fbcd0b23f31c2258a54d0156c2a0c9f",
-    "dac_public_key": "0471585c0fd0bbd0c03e812702f179a14f3670ac27cd71f6ad9f3c0917b94e7cdc685c75e6a9876d73a274a15b32a5971f27d9c282f22c64a32d0e3c1c6ea72f21"
+    "dac_cert": "308201d030820177a0030201020208603bf4828bd348be300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043af262dd4143cb8224f1862198594f3c4ef724e4f0a95e23ad025ddb95230b916393174d8f690682a3b9859d43ed246ecf967d3b26e1eb732330f73a8b886c76a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020780301d0603551d0e0416041427feefca8ae92f9e62cb5df19137a5be6b7b69c0301f0603551d23041830168014651ee488ca61c0ceca373c9610ccaeab68f1ea55300a06082a8648ce3d040302034700304402204ae6b22e8690bd1fd1fa73eb22edd2af57696db80aa27f3936cb56e325a0d58c022058c9f5ac087fc40749bb156160fae08f16b4aa92b99c386e9df1bbf546d961e0",
+    "pai_cert": "308201bf30820164a003020102020831fdca08eb8b9285300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ed73b5e22f61942e9d1f9adf3cab2894e50ed55602ca20ad15f38492e7413a830e6a38db9fecc5443716f2aeba5c78367597280dafd86cb6769a0102ebe636caa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414651ee488ca61c0ceca373c9610ccaeab68f1ea55301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100824ae903f82181fe6856d810e1392d72b0c501bfc10e878996410b73444b756d022100d5e8f483f5c0156808b4d4f11e81d164f8b5ec7fe7baca253882a62a8d8e22fc",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502205b8a7e92c77a7c2a76aaa8797080eb2f44cfd9367ad29285325233fd79307ab3022100dc70ccffe0debdf2b82de33da69b66cbf62d04d801c3c4750ccbc168f8d21892",
+    "dac_private_key": "09a872c52323df9ec0fff90d431b77708988cf1334f3f6a7e0518f5ee8f9c741",
+    "dac_public_key": "043af262dd4143cb8224f1862198594f3c4ef724e4f0a95e23ad025ddb95230b916393174d8f690682a3b9859d43ed246ecf967d3b26e1eb732330f73a8b886c76"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der
index 12e2d6015024bd..c59aff0c1350cc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der
index e215ca2a3098b3..57efdef8cf1370 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem
index f937cbb6f42bb6..373814c9a327ef 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXGgAwIBAgIITNoQlY/6u6IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIByjCCAXGgAwIBAgIIYUVqBat3UlIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATs9qhtbaOOAeK1bxAQNZuMbAwN1F3S
-pDaJ1iCj3LDHPBqVdW54+XJn3L4oaMtCTH/6rmyV2p2x8QZxzcjr6rXSo10wWzAJ
-BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWySeBlIvflK2gPLf
-DG8zYaLiAHIwHwYDVR0jBBgwFoAUpX/u1IuFzbLOjcrbCakr8V65E5YwCgYIKoZI
-zj0EAwIDRwAwRAIgGHSL9o46RJOlBr8csLl6/CEXdRUb/RD3FQ24mRB/mGcCIHZk
-SIz3BK/sk0/W8ShDu/cXCHiJC4TQB643RLKAQJcV
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR8didUZO1tRZKcTPCrwJdzUfj58tiO
+o7XRWQyeQpt3iPsQWko+6u7sWKREsB4JPu1KHI1NZvwxlTFmIqgOWKl1o10wWzAJ
+BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUz0YnuNfwk364m4gW
+hLP/Y6HbgEgwHwYDVR0jBBgwFoAUrjChQeLZ/zXQGY9HKDyAftv45M4wCgYIKoZI
+zj0EAwIDRwAwRAIgF8RIXiTe6pR1YSsVrGAV6i6YLFyM44GQ46gXBxpJENECIGgZ
+/Db58vRH45/b42W17p9gQmLdcj42z0E7j9y0/GKm
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der
index 233f617598ab92..398d4aa2f85d31 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem
index 1e0fa09c4ddb55..ea6395d9481439 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIE89QzLE/9xri06uolUY5jYpvVeQRT+yJHvgRgXGleF7oAoGCCqGSM49
-AwEHoUQDQgAE7PaobW2jjgHitW8QEDWbjGwMDdRd0qQ2idYgo9ywxzwalXVuePly
-Z9y+KGjLQkx/+q5sldqdsfEGcc3I6+q10g==
+MHcCAQEEIGeDi47VKYxUpw97cwmhYgiNDsgZ4SjMk96194vN+zEkoAoGCCqGSM49
+AwEHoUQDQgAEfHYnVGTtbUWSnEzwq8CXc1H4+fLYjqO10VkMnkKbd4j7EFpKPuru
+7FikRLAeCT7tShyNTWb8MZUxZiKoDlipdQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der
index f12a1147dda3e9..ebd1df89925686 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem
index f993fce37cd93c..d3fc04e37771aa 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIRM0rXdRruAIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIekf5VYbSaokwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPa9ho6uDOCP3SbfW5WZghBwwaMt6fQ3rzGhYrarxx2PavItd+FEznuYi/kl
-mQ2Nm+e8Bv4E+ny4rJAMHlkH512jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSlf+7Ui4XNss6NytsJqSvxXrkTljAfBgNV
+A0IABOeN9kH5SAM0yFVQYHv5h4fH9VySytxKrnrGl8mVZWKDL0Vup2eg5BAU5j+j
+HVrcDS50mgzqoA4odvM0VBQI+cSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuMKFB4tn/NdAZj0coPIB+2/jkzjAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-hVoE3RXaZ+LyeWvHTfL9LLVeJEhVHjJNNipb9x6TZuoCIQDQ7fCUJBC2pfY6ljeH
-TiuZCURVZgQwXkYAAHCDAMQJWA==
+3pDq2EJc7E8UzoR/r03tYA9kJFiiPhxIox241dKZlsICIQCo9eJ7JDKTLlrCNSWB
+P5OMrrXezPcLLZ5isSTd69YjOQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der
index 6a59795917d6db..fab553694693ba 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem
index 8d57cc3bf512f1..ff5533f40ff024 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBbJDakrXac0BXhggy5J6jpZzhILOib+Q4ZHgltPzjUuoAoGCCqGSM49
-AwEHoUQDQgAE9r2Gjq4M4I/dJt9blZmCEHDBoy3p9DevMaFitqvHHY9q8i134UTO
-e5iL+SWZDY2b57wG/gT6fLiskAweWQfnXQ==
+MHcCAQEEIHacyaSktwlxCJv92ckRgnsQM6RGa5VxXCtRLVVr8n5DoAoGCCqGSM49
+AwEHoUQDQgAE5432QflIAzTIVVBge/mHh8f1XJLK3EquesaXyZVlYoMvRW6nZ6Dk
+EBTmP6MdWtwNLnSaDOqgDih28zRUFAj5xA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json
index 964ef3fc524d16..2b3f53434d5f2d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201ca30820171a00302010202084cda10958ffabba2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ecf6a86d6da38e01e2b56f1010359b8c6c0c0dd45dd2a43689d620a3dcb0c73c1a95756e78f97267dcbe2868cb424c7ffaae6c95da9db1f10671cdc8ebeab5d2a35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e041604145b249e06522f7e52b680f2df0c6f3361a2e20072301f0603551d23041830168014a57feed48b85cdb2ce8dcadb09a92bf15eb91396300a06082a8648ce3d0403020347003044022018748bf68e3a4493a506bf1cb0b97afc211775151bfd10f7150db899107f986702207664488cf704afec934fd6f12843bbf7170878890b84d007ae3744b280409715",
-    "pai_cert": "308201bf30820164a003020102020844cd2b5dd46bb802300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f6bd868eae0ce08fdd26df5b9599821070c1a32de9f437af31a162b6abc71d8f6af22d77e144ce7b988bf925990d8d9be7bc06fe04fa7cb8ac900c1e5907e75da366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414a57feed48b85cdb2ce8dcadb09a92bf15eb91396301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100855a04dd15da67e2f2796bc74df2fd2cb55e2448551e324d362a5bf71e9366ea022100d0edf0942410b6a5f63a9637874e2b990944556604305e460000708300c40958",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220261e5642187ef1644369b4d0ed9921f005864feda1a899a7a3705fac5b50d15b02205ad7c145af31c4957cae83e7dcd27cb4b6ced9ba77e9a6fa348766059dc219eb",
-    "dac_private_key": "4f3d4332c4ffdc6b8b4eaea25518e63629bd5790453fb2247be04605c695e17b",
-    "dac_public_key": "04ecf6a86d6da38e01e2b56f1010359b8c6c0c0dd45dd2a43689d620a3dcb0c73c1a95756e78f97267dcbe2868cb424c7ffaae6c95da9db1f10671cdc8ebeab5d2"
+    "dac_cert": "308201ca30820171a003020102020861456a05ab775252300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047c76275464ed6d45929c4cf0abc0977351f8f9f2d88ea3b5d1590c9e429b7788fb105a4a3eeaeeec58a444b01e093eed4a1c8d4d66fc3195316622a80e58a975a35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cf4627b8d7f0937eb89b881684b3ff63a1db8048301f0603551d23041830168014ae30a141e2d9ff35d0198f47283c807edbf8e4ce300a06082a8648ce3d0403020347003044022017c4485e24deea9475612b15ac6015ea2e982c5c8ce38190e3a817071a4910d102206819fc36f9f2f447e39fdbe365b5ee9f604262dd723e36cf413b8fdcb4fc62a6",
+    "pai_cert": "308201bf30820164a00302010202087a47f95586d26a89300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e78df641f9480334c85550607bf98787c7f55c92cadc4aae7ac697c9956562832f456ea767a0e41014e63fa31d5adc0d2e749a0ceaa00e2876f334541408f9c4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ae30a141e2d9ff35d0198f47283c807edbf8e4ce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100de90ead8425cec4f14ce847faf4ded600f642458a23e1c48a31db8d5d29996c2022100a8f5e27b2432932e5ac23525813f938caeb5deccf70b2d9e62b124ddebd62339",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cd6f9b77b80ec9104183434625d7512e08438e45f76ff1f195a49a14e8ce9ce60220735f431410deaffbbaf82c09b7d94e66431889549a2c9ef1256e43e6fffec131",
+    "dac_private_key": "67838b8ed5298c54a70f7b7309a162088d0ec819e128cc93deb5f78bcdfb3124",
+    "dac_public_key": "047c76275464ed6d45929c4cf0abc0977351f8f9f2d88ea3b5d1590c9e429b7788fb105a4a3eeaeeec58a444b01e093eed4a1c8d4d66fc3195316622a80e58a975"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der
index 93a353b7c6687b..f47e6aa158939b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der
index 34f9f5121bafa0..d34c1b0842f702 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem
index ff221030093956..41ab8e21b18953 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXGgAwIBAgIIYyGAPQKTUo4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIByzCCAXGgAwIBAgIIeQ4VkymbXcIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ5jHSkoMbgKAkH4/eBtWGTxhuz5LRe
-sFsOjxBi6b5qzoScybTTB/J/g46RVS9I4zvTJVOIsSvDdGFb1LAnZfEMo10wWzAJ
-BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdMe1Xp5k3tQaiSOK
-fx45RElO8o4wHwYDVR0jBBgwFoAUVWfihz+acYgdI1Q0KNmwUl53BXkwCgYIKoZI
-zj0EAwIDRwAwRAIgd0UlgC54I0Tqy2URDBES4LrdHE3XSZMggggFF1CBGfQCIH7M
-X5dNHksomhZ8HoYrd6Gdc2a0C/4tjTNuwREb6I2t
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATZzYl2shqWZeyK7/T17BHLaKE7jSjp
+gUf6I/a/RmqI9hMLqOsj/IbvLfucdY6P+wOW6+8Vu8C0MUAM7ul5Vweso10wWzAJ
+BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUL2cIlHYXJrQ4O+F+
+b4xMm96GUvgwHwYDVR0jBBgwFoAUFpHmCYvYwP+0PkmFcs2aHLG71ogwCgYIKoZI
+zj0EAwIDSAAwRQIgLkXshsyfm0wy2GZwiiwZz7B/ru5JcvlJa8O0ftfSd/QCIQD1
+MsoKaZtNTruEmhEJ8Klib49rrvLFumCWvEPL+KicLA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der
index be9954f4e4204e..9ce84ac91bad47 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem
index 4adeec98a2d2e2..5e59d9645fac25 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO0cp6OVRrul3j3hmvX0EFkR2Y1oh2ydjjnbCMI6BeQloAoGCCqGSM49
-AwEHoUQDQgAEOYx0pKDG4CgJB+P3gbVhk8Ybs+S0XrBbDo8QYum+as6EnMm00wfy
-f4OOkVUvSOM70yVTiLErw3RhW9SwJ2XxDA==
+MHcCAQEEIMzc7NIQPk751e9n2DuUA40y503ZYMqUQaxDVTV14fB3oAoGCCqGSM49
+AwEHoUQDQgAE2c2JdrIalmXsiu/09ewRy2ihO40o6YFH+iP2v0ZqiPYTC6jrI/yG
+7y37nHWOj/sDluvvFbvAtDFADO7peVcHrA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der
index e8ea720f0136d7..7e21afa5fe27ce 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem
index 5eb0bc26a2bc28..010576cf3fa474 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIID+GOMm3R0RwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIJSXTwP8CmrkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCBOXxqtwvxCLDvI+ZI5Lpa2VDgmpsA7/rD1VmHAbdFaeg9+lv7QiOuVQB+J
-3aYkJXVmLRwUU5XVTPgkIr7rnMajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRVZ+KHP5pxiB0jVDQo2bBSXncFeTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-hOqR9RBiP9iSegWwVk/f6qbEM9HovV58bCrv+mYoerUCIQC7+nKd49BL0dteYLG/
-0bkpN62YMpeBShz4ZcxSuCiG0g==
+A0IABHGc9XLZuE66ShNp/uPCJe+xFIj7iU/nb7fd1uWUxJpw6bHRayTv6UZKXnW6
+pvKTGCXiyo8Q/IhQDL8JuGOU3xOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQWkeYJi9jA/7Q+SYVyzZocsbvWiDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBC
+7BwhCq8pc64zVD/V2BSdJNRNAOwOidDG6jhpNvtOXgIhAJjfeOIp0Zjn77tEAsXm
+6+9qU+PUSjem9jPoeJfDZHhz
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der
index 37d0988b3712a6..3929cdd525a625 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem
index 7469ac6ee80969..1b75ab5f5b72f3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGGGKqRljzDBSEMatjbC58lESpAzklvlDgwGM7R87JXioAoGCCqGSM49
-AwEHoUQDQgAEIE5fGq3C/EIsO8j5kjkulrZUOCamwDv+sPVWYcBt0Vp6D36W/tCI
-65VAH4ndpiQldWYtHBRTldVM+CQivuucxg==
+MHcCAQEEIMRNA5knfFa8Ear5IAn8nndPjAlp/mYhdl3TWZr1xEKxoAoGCCqGSM49
+AwEHoUQDQgAEcZz1ctm4TrpKE2n+48Il77EUiPuJT+dvt93W5ZTEmnDpsdFrJO/p
+Rkpedbqm8pMYJeLKjxD8iFAMvwm4Y5TfEw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json
index a5a5551617a223..1aa3dafd3c7577 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201ca30820171a00302010202086321803d0293528e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004398c74a4a0c6e0280907e3f781b56193c61bb3e4b45eb05b0e8f1062e9be6ace849cc9b4d307f27f838e91552f48e33bd3255388b12bc374615bd4b02765f10ca35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e0416041474c7b55e9e64ded41a89238a7f1e3944494ef28e301f0603551d230418301680145567e2873f9a71881d23543428d9b0525e770579300a06082a8648ce3d04030203470030440220774525802e782344eacb65110c1112e0badd1c4dd749932082080517508119f402207ecc5f974d1e4b289a167c1e862b77a19d7366b40bfe2d8d336ec1111be88dad",
-    "pai_cert": "308201bf30820164a00302010202080fe18e326dd1d11c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004204e5f1aadc2fc422c3bc8f992392e96b6543826a6c03bfeb0f55661c06dd15a7a0f7e96fed088eb95401f89dda6242575662d1c145395d54cf82422beeb9cc6a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604145567e2873f9a71881d23543428d9b0525e770579301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210084ea91f510623fd8927a05b0564fdfeaa6c433d1e8bd5e7c6c2aeffa66287ab5022100bbfa729de3d04bd1db5e60b1bfd1b92937ad983297814a1cf865cc52b82886d2",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100d2354c024503be200a34b9254b0f903bb2f7da1a9e661436df19077066f18c47022006c83c4f4b382744605c70322cad2e73021e36a3eb5b7d68afde5975d43d5318",
-    "dac_private_key": "ed1ca7a39546bba5de3de19af5f4105911d98d68876c9d8e39db08c23a05e425",
-    "dac_public_key": "04398c74a4a0c6e0280907e3f781b56193c61bb3e4b45eb05b0e8f1062e9be6ace849cc9b4d307f27f838e91552f48e33bd3255388b12bc374615bd4b02765f10c"
+    "dac_cert": "308201cb30820171a0030201020208790e1593299b5dc2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d9cd8976b21a9665ec8aeff4f5ec11cb68a13b8d28e98147fa23f6bf466a88f6130ba8eb23fc86ef2dfb9c758e8ffb0396ebef15bbc0b431400ceee9795707aca35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e041604142f670894761726b4383be17e6f8c4c9bde8652f8301f0603551d230418301680141691e6098bd8c0ffb43e498572cd9a1cb1bbd688300a06082a8648ce3d040302034800304502202e45ec86cc9f9b4c32d866708a2c19cfb07faeee4972f9496bc3b47ed7d277f4022100f532ca0a699b4d4ebb849a1109f0a9626f8f6baef2c5ba6096bc43cbf8a89c2c",
+    "pai_cert": "308201be30820164a00302010202082525d3c0ff029ab9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004719cf572d9b84eba4a1369fee3c225efb11488fb894fe76fb7ddd6e594c49a70e9b1d16b24efe9464a5e75baa6f2931825e2ca8f10fc88500cbf09b86394df13a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141691e6098bd8c0ffb43e498572cd9a1cb1bbd688301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022042ec1c210aaf2973ae33543fd5d8149d24d44d00ec0e89d0c6ea386936fb4e5e02210098df78e229d198e7efbb4402c5e6ebef6a53e3d44a37a6f633e87897c3647873",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207bae9411164196fae2ad98ccabdac3dbc8284507d3012e553303bd958e02fcd6022037c1e5c24eeb4ecc2d74281e92c4a21ca66a40fe34c99758056d4b29cce5dcd5",
+    "dac_private_key": "ccdcecd2103e4ef9d5ef67d83b94038d32e74dd960ca9441ac43553575e1f077",
+    "dac_public_key": "04d9cd8976b21a9665ec8aeff4f5ec11cb68a13b8d28e98147fa23f6bf466a88f6130ba8eb23fc86ef2dfb9c758e8ffb0396ebef15bbc0b431400ceee9795707ac"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der
index 487e0379d69a6c..1b4c0f60ce6ba3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der
index 9e6ca82fe28176..093e682d36a8d7 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem
index 3ae9e540f9e37d..175274f930411a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWagAwIBAgIIdWQZZ/hRmSMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWagAwIBAgIIfAk8Qci1coIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARZAmOrADqnr1g52t+eEsy/4QsgPCxk
-Dn5LclGUzj//aTx/3vK0emGhxcKuJucyASuT7Hdb/JPykSdO1/ErZqdSo1IwUDAO
-BgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFF1CAVvJbWMv9WpRhPfzORmif6y0MB8G
-A1UdIwQYMBaAFESUBKTSsI5oejdmvN3p3DEHtQblMAoGCCqGSM49BAMCA0cAMEQC
-IE/Du5ZitPyojUXhCHPlF511CY9T0ZVO7lsXNBi4LzN9AiAxYJCXJS7vz7zB5k5U
-mHUkXCXhd4abxumhnZHfdtpLFg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATur9Bvnp5hXk8LxJFGEuJCSO2NpDQo
+NTqlzpKVZWNzIaCMMzE19eH+v5CjkN6gKB0T7Xf+MGmnvc6Jg9fiuAiEo1IwUDAO
+BgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFFgzzji8raFTMmA8ccTjRffph4XAMB8G
+A1UdIwQYMBaAFGDO8h7A1JGRzS+o6FIGnmgs2HvOMAoGCCqGSM49BAMCA0cAMEQC
+IBXq9QZSH9828eCOALqxhV3fFi+J/xcN8vxOH31fwKDsAiA7sJVcWzxUSK0/wh1n
+5sjDBzWqLZDFM7cT3WIC4frCIA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der
index e3a7661d6f24aa..4758555b46c650 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem
index 89f1ec827fa359..dfbbfccea6b673 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAC9QTFk0EAQvVSmHtoTouY+jReslTBAMZ3LW4F2RRbboAoGCCqGSM49
-AwEHoUQDQgAEWQJjqwA6p69YOdrfnhLMv+ELIDwsZA5+S3JRlM4//2k8f97ytHph
-ocXCribnMgErk+x3W/yT8pEnTtfxK2anUg==
+MHcCAQEEIEI5k5bNUiAAHt2imW0VFiHELalNfGU27bVzWGqFNLbKoAoGCCqGSM49
+AwEHoUQDQgAE7q/Qb56eYV5PC8SRRhLiQkjtjaQ0KDU6pc6SlWVjcyGgjDMxNfXh
+/r+Qo5DeoCgdE+13/jBpp73OiYPX4rgIhA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der
index 567410776cfc82..5ef92e1f09af17 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem
index 79052c615b6647..722c47283fc4b5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIB71uNqm8JxswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIF6TrjZMKUu0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCZnC3Y6F6Cd675zP5ifmv1RnfAVxsNxktni1ckSmUB0nKV5SV6mkuw/74BE
-pz8s/RpsTcViTfzdztPnVHZMeB+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRElASk0rCOaHo3Zrzd6dwxB7UG5TAfBgNV
+A0IABICNlJs3kQS0w4bliK8vfGzZ0+Nj6C1NsfrJsKOCEucfw0LeoujbKg4vOjYX
+QpjJaMZIEoMubpbspXR+3RRn8/mjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRgzvIewNSRkc0vqOhSBp5oLNh7zjAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-/6SEDq3rRGxtqS2nJcPhF2BHCiVICcLYZDFIMhgDfV0CIB+AVid9GGivS6GZIOnN
-GmWZkz4yfrZZ8ocfXugeWQvD
+hq+0zeW68ii/PkX1K9uZUXwxdrE7N5UumJs4eM0721UCIFcQoy3VjK9OlTumY2ZY
+U7qsuFdUOlDJmaACGEiz8uZh
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der
index 5bd09a77b395d7..16bd26f8f145bf 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem
index 19afd993f0eb9a..1077998e414a5f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIF42Tg7lKrGd377KLg1yMiwIBwAqsApDRbXY5bzDfQ/noAoGCCqGSM49
-AwEHoUQDQgAEJmcLdjoXoJ3rvnM/mJ+a/VGd8BXGw3GS2eLVyRKZQHScpXlJXqaS
-7D/vgESnPyz9GmxNxWJN/N3O0+dUdkx4Hw==
+MHcCAQEEIH88UhgUEU17SkrYkfroPRvE2JtbqPuEhYb0nTgqL+nFoAoGCCqGSM49
+AwEHoUQDQgAEgI2UmzeRBLTDhuWIry98bNnT42PoLU2x+smwo4IS5x/DQt6i6Nsq
+Di86NhdCmMloxkgSgy5uluyldH7dFGfz+Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json
index bfbb3aa40cfb49..13d9670ed62f58 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Basic Constraint extension",
     "is_success_case": "false",
-    "dac_cert": "308201bf30820166a003020102020875641967f8519923300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004590263ab003aa7af5839dadf9e12ccbfe10b203c2c640e7e4b725194ce3fff693c7fdef2b47a61a1c5c2ae26e732012b93ec775bfc93f291274ed7f12b66a752a3523050300e0603551d0f0101ff040403020780301d0603551d0e041604145d42015bc96d632ff56a5184f7f33919a27facb4301f0603551d23041830168014449404a4d2b08e687a3766bcdde9dc3107b506e5300a06082a8648ce3d040302034700304402204fc3bb9662b4fca88d45e10873e5179d75098f53d1954eee5b173418b82f337d022031609097252eefcfbcc1e64e549875245c25e177869bc6e9a19d91df76da4b16",
-    "pai_cert": "308201be30820164a003020102020807bd6e36a9bc271b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000426670b763a17a09debbe733f989f9afd519df015c6c37192d9e2d5c9129940749ca579495ea692ec3fef8044a73f2cfd1a6c4dc5624dfcddced3e754764c781fa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414449404a4d2b08e687a3766bcdde9dc3107b506e5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ffa4840eadeb446c6da92da725c3e11760470a254809c2d86431483218037d5d02201f8056277d1868af4ba19920e9cd1a6599933e327eb659f2871f5ee81e590bc3",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201e12b625045e8664af852fb665f928310cf31a97ec3c6c68b01b38e731a9134d0220532c5b98d98cb6c4a7765b41fac5a48096b715ace34144bdfcdd9b351c87098b",
-    "dac_private_key": "00bd413164d04010bd54a61eda13a2e63e8d17ac953040319dcb5b81764516db",
-    "dac_public_key": "04590263ab003aa7af5839dadf9e12ccbfe10b203c2c640e7e4b725194ce3fff693c7fdef2b47a61a1c5c2ae26e732012b93ec775bfc93f291274ed7f12b66a752"
+    "dac_cert": "308201bf30820166a00302010202087c093c41c8b57282300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004eeafd06f9e9e615e4f0bc4914612e24248ed8da43428353aa5ce929565637321a08c333135f5e1febf90a390dea0281d13ed77fe3069a7bdce8983d7e2b80884a3523050300e0603551d0f0101ff040403020780301d0603551d0e041604145833ce38bcada15332603c71c4e345f7e98785c0301f0603551d2304183016801460cef21ec0d49191cd2fa8e852069e682cd87bce300a06082a8648ce3d0403020347003044022015eaf506521fdf36f1e08e00bab1855ddf162f89ff170df2fc4e1f7d5fc0a0ec02203bb0955c5b3c5448ad3fc21d67e6c8c30735aa2d90c533b713dd6202e1fac220",
+    "pai_cert": "308201be30820164a003020102020817a4eb8d930a52ed300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004808d949b379104b4c386e588af2f7c6cd9d3e363e82d4db1fac9b0a38212e71fc342dea2e8db2a0e2f3a36174298c968c64812832e6e96eca5747edd1467f3f9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041460cef21ec0d49191cd2fa8e852069e682cd87bce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210086afb4cde5baf228bf3e45f52bdb99517c3176b13b37952e989b3878cd3bdb5502205710a32dd58caf4e953ba663665853baacb857543a50c999a0021848b3f2e661",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e7374f9f6e12792a65b2cb6c3f99a9507d046bbb675cafefa90ba8a1120a3a3602207d27c01bfe5d468b0f6ded348a3ee52464c3c4d3cd17fe2cc6a8b03250c08b09",
+    "dac_private_key": "42399396cd5220001edda2996d151621c42da94d7c6536edb573586a8534b6ca",
+    "dac_public_key": "04eeafd06f9e9e615e4f0bc4914612e24248ed8da43428353aa5ce929565637321a08c333135f5e1febf90a390dea0281d13ed77fe3069a7bdce8983d7e2b80884"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der
index 0f03039c82704c..6c9a2565f37529 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der
index eec9f7e9db8379..ead5da90d9a888 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem
index 51cc73913599fd..b12f9b807eb3fb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIHoVwFqORXV0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIaREobzqbP1UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHTooMbiJAnSmba3S33vV4c2f3XqG/
-gDDJ3DBQZxb6UpVQDkkvtyc+i2RTF/sm65S8OwGjNwHnYPQxgsZIISvso2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUMTJoQeu6sxg3
-yXMfm5uPm5bjK5gwHwYDVR0jBBgwFoAUVmPydcFCBdjLdQKBP0Asz1DFdAgwCgYI
-KoZIzj0EAwIDSQAwRgIhAKJgbwu0VCADEeVF8ro72G/tGYKz4aE6cUPY+/h2CUjh
-AiEA3DsSOT6WrEntlD8InPcrwDCsSihm8eEw1yalnaWEBdk=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASlyFRzQ7Bep3QoNUNB9Pjve36JVkoc
+UapOPW31jHVJZ/9AUhyDL8LBUlaqdbfEt6IQ4BylnKAmebPPhHQbe3sOo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU+QhnErgSgADD
+gzh8QmxtEvuKyTIwHwYDVR0jBBgwFoAUYaIbv+zZ9MfI3MD9hBG7a1P+ZZEwCgYI
+KoZIzj0EAwIDSAAwRQIge/fFk83ukvKAoBea3Vl7p9k2eU+2wpdDZXjWPmH+iQkC
+IQCzoBUAcHW1BieeHKK05TQ2Cs84sszK3l1j2+gh9kPKdQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der
index 41ec05139f9c2e..5e258ae2f17057 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem
index 80a9f8ad28df52..12f08726724b26 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOAb8zXO/0RdOhwW6H2BheYuWMuUcVrGc2T8cF+mm/+noAoGCCqGSM49
-AwEHoUQDQgAEB06KDG4iQJ0pm2t0t971eHNn916hv4AwydwwUGcW+lKVUA5JL7cn
-PotkUxf7JuuUvDsBozcB52D0MYLGSCEr7A==
+MHcCAQEEIDdxyhZwDfeHPAbutmnUXItWWJH/djFApydiVnMMsQbJoAoGCCqGSM49
+AwEHoUQDQgAEpchUc0OwXqd0KDVDQfT473t+iVZKHFGqTj1t9Yx1SWf/QFIcgy/C
+wVJWqnW3xLeiEOAcpZygJnmzz4R0G3t7Dg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der
index a268d51a033f7f..47da29a8e5cf6f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem
index fc5b7392117d38..18b15d82bad51f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIV5Mnr0rRnWswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIIYH7YaArNPm4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABB7+kI07mLslUF2Hit+kmK4UfkVb5X/F77Fx/lzsu6rn7IGcr9j3Fwr+oyhN
-bBv1FaDzlz8oFWtkj8sud18x8jOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRWY/J1wUIF2Mt1AoE/QCzPUMV0CDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-xcpHlJe3z5Roh51BOxy/d1AtbXA8vonadirzEsjpbiMCIQD0pD97ZxyIpiYyRfow
-k9TeJ1fQHa7Fwpc4MXeqCRszsQ==
+A0IABFkKTCTMFwY01qyBWbiZyxHhWedyvBWB7nElqB0IIZrj0IjFTWibUxSGT7N7
+FBR3JWkrhWOLSPV4A2nJ2OAXL7+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRhohu/7Nn0x8jcwP2EEbtrU/5lkTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAR
+/Qu1fTlubnoRd/BB/rwjheEhemMH2zhFvj4laREBawIgZFpi07oNIgV9ve1KpN2j
+ew/h2GOkQ7jsSjjzXM6wU3A=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der
index 9baffb174c981e..b5fee19b37904b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem
index 97d49675220882..41ef5a7439aa9b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJmyRx3KmKC2DQBtj6FVDibvc4mkmjRCthVlbFPh297VoAoGCCqGSM49
-AwEHoUQDQgAEHv6QjTuYuyVQXYeK36SYrhR+RVvlf8XvsXH+XOy7qufsgZyv2PcX
-Cv6jKE1sG/UVoPOXPygVa2SPyy53XzHyMw==
+MHcCAQEEIJ3Ln7ZNU9h9E8uYTKPxZ40/nhwNe+HwErGKu8AUjdKtoAoGCCqGSM49
+AwEHoUQDQgAEWQpMJMwXBjTWrIFZuJnLEeFZ53K8FYHucSWoHQghmuPQiMVNaJtT
+FIZPs3sUFHclaSuFY4tI9XgDacnY4Bcvvw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json
index 3f50c4352dc51f..5b3cdbd9aa4c3b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field set to 0",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a00302010202081e857016a3915d5d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004074e8a0c6e22409d299b6b74b7def5787367f75ea1bf8030c9dc30506716fa5295500e492fb7273e8b645317fb26eb94bc3b01a33701e760f43182c648212beca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041431326841ebbab31837c9731f9b9b8f9b96e32b98301f0603551d230418301680145663f275c14205d8cb7502813f402ccf50c57408300a06082a8648ce3d0403020349003046022100a2606f0bb454200311e545f2ba3bd86fed1982b3e1a13a7143d8fbf8760948e1022100dc3b12393e96ac49ed943f089cf72bc030ac4a2866f1e130d726a59da58405d9",
-    "pai_cert": "308201bf30820164a0030201020208579327af4ad19d6b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200041efe908d3b98bb25505d878adfa498ae147e455be57fc5efb171fe5cecbbaae7ec819cafd8f7170afea3284d6c1bf515a0f3973f28156b648fcb2e775f31f233a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604145663f275c14205d8cb7502813f402ccf50c57408301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c5ca479497b7cf9468879d413b1cbf77502d6d703cbe89da762af312c8e96e23022100f4a43f7b671c88a6263245fa3093d4de2757d01daec5c297383177aa091b33b1",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100adf3c31a4e27816c20544450934b8fc148be00c6b05c01c2f3179aad87a8c7d2022100beaeab2e4e4949f5cdcd65be126632c7bc3841b05d9f8b10d190eebd018a35ca",
-    "dac_private_key": "e01bf335ceff445d3a1c16e87d8185e62e58cb94715ac67364fc705fa69bffa7",
-    "dac_public_key": "04074e8a0c6e22409d299b6b74b7def5787367f75ea1bf8030c9dc30506716fa5295500e492fb7273e8b645317fb26eb94bc3b01a33701e760f43182c648212bec"
+    "dac_cert": "308201ce30820174a00302010202086911286f3a9b3f55300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a5c8547343b05ea77428354341f4f8ef7b7e89564a1c51aa4e3d6df58c754967ff40521c832fc2c15256aa75b7c4b7a210e01ca59ca02679b3cf84741b7b7b0ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f9086712b8128000c383387c426c6d12fb8ac932301f0603551d2304183016801461a21bbfecd9f4c7c8dcc0fd8411bb6b53fe6591300a06082a8648ce3d040302034800304502207bf7c593cdee92f280a0179add597ba7d936794fb6c297436578d63e61fe8909022100b3a015007075b506279e1ca2b4e534360acf38b2cccade5d63dbe821f643ca75",
+    "pai_cert": "308201bd30820164a0030201020208607ed8680acd3e6e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004590a4c24cc170634d6ac8159b899cb11e159e772bc1581ee7125a81d08219ae3d088c54d689b5314864fb37b14147725692b85638b48f5780369c9d8e0172fbfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041461a21bbfecd9f4c7c8dcc0fd8411bb6b53fe6591301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022011fd0bb57d396e6e7a1177f041febc2385e1217a6307db3845be3e256911016b0220645a62d3ba0d22057dbded4aa4dda37b0fe1d863a443b8ec4a38f35cceb05370",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cf465aaf5e38fdbc317fbcd613243876c537c86f3807fceda88ca497b02b9bb4022005cc82dcfe4c77a7aed04b073fc8c9e1391ed25697fb646d6d402138051fff85",
+    "dac_private_key": "3771ca16700df7873c06eeb669d45c8b565891ff763140a7276256730cb106c9",
+    "dac_public_key": "04a5c8547343b05ea77428354341f4f8ef7b7e89564a1c51aa4e3d6df58c754967ff40521c832fc2c15256aa75b7c4b7a210e01ca59ca02679b3cf84741b7b7b0e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der
index 4e1216e9fdb893..b2381a9775a37f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der
index 4e6537b5a515c4..64fb51da8c7b43 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem
index 70886f91e3b5b2..6e8ec24ffd8e64 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIBjENGdju/QEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIKfSKrtFa17MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATHc6vga6WlkfZ6EOi8Ar0I0C47u8TB
-IcZr3BamMBUDaNDm93rcStVWBqK0tG1nvVzySAiS4Ux2jQomxrMfkjh2o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUtq+rBDpG7n63
-MpscYoaVb4fVlswwHwYDVR0jBBgwFoAU3TmCPCfm8TuKhcSqUzjV+0gs6h0wCgYI
-KoZIzj0EAwIDRwAwRAIgP8njHGcJuXDSZ2H8H5cpJUw5cL0YLcNlIhb4wSoaa9YC
-IGh5mbkFxW/ZhrChK98B6t56M+LQZvXoAswcoh2zNeZH
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASDoAdK8YBIYtFITTmhQFRBjeKqmt6A
+VYDBw0wh987fth2jMcg+DVRDM2jh/FIRw5Ra5gWWlXjOlU8Nz4PSKNrYo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUf0fFOhhIdz4x
+3IFoGTlVimiKdP4wHwYDVR0jBBgwFoAUj8U/H4Gl3B5mx/94RVwUGFdtOogwCgYI
+KoZIzj0EAwIDSAAwRQIgSrebPPsQdWxsPuJ3QRPVsG6tdXznpy+DJHBU18Z5d78C
+IQCUDG2mkE0/lZjCl+qUV0nerruiJ2kQE6jLTf/mwpxJ2g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der
index 2cc0a6283ac444..4e44c73ac51597 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem
index 96d6c9258083ec..51742c87443489 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHJbSL/6EzbHP6Vv59AZFoyfKxUwVi7s+Rc0UFcsWe8NoAoGCCqGSM49
-AwEHoUQDQgAEx3Or4GulpZH2ehDovAK9CNAuO7vEwSHGa9wWpjAVA2jQ5vd63ErV
-VgaitLRtZ71c8kgIkuFMdo0KJsazH5I4dg==
+MHcCAQEEIHfL+dEHbB0TsKZPgxwPHn7IhW7kpzD/lkKptBPukelqoAoGCCqGSM49
+AwEHoUQDQgAEg6AHSvGASGLRSE05oUBUQY3iqpregFWAwcNMIffO37YdozHIPg1U
+QzNo4fxSEcOUWuYFlpV4zpVPDc+D0ija2A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der
index 4163a7a6d953e8..1b1f2eb6a9ec67 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem
index 939b18938fba74..ef35f565ddb428 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIasBHdzcQYowwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIcPcXoAaIgCMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABIVGO9BxRwJsuDAW7fQ/C90qYfsyrI1pNeqA+9B002q99oLYPo+aTh82o4mX
-dc9A/6+H6zkWsJKewYb0lpyIlMWjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTdOYI8J+bxO4qFxKpTONX7SCzqHTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-ze9WdCVUO2Berd0XA1epFncdS3QbblrhtFwDI+mekxECICrrWJuXZVXgjMzvqAxd
-V72yqHnIOAthyy8luguZnySZ
+A0IABC8U8VpD4Cs58yQb9l2Ir+pqBS6y1zJM78y4H5g6m5vETYwkTpsdpRnemPpD
+UqgOnb1jR1ZadeFvUVi+9Tw896yjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSPxT8fgaXcHmbH/3hFXBQYV206iDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+j6+zOKNSibs0AigYlKtNpp0o87GNrikIN9l+vP+UfnYCIQC79W32m7hhlZZl/Ygq
+P/H5ej5d9wKi6c1ZN5esxwMgyg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der
index 645a79675660e7..a932c07ba8d801 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem
index 939deae63e3a91..ac235c9a65124b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG/2+Hghi+nFtuGUMfhsYqXQ9sAMn7qVRLZ6P7fXKYhIoAoGCCqGSM49
-AwEHoUQDQgAEhUY70HFHAmy4MBbt9D8L3Sph+zKsjWk16oD70HTTar32gtg+j5pO
-HzajiZd1z0D/r4frORawkp7BhvSWnIiUxQ==
+MHcCAQEEIHNiBNQZfHeGHDCB9SoPfERyfwf4Jw84Px+yIh1tCiatoAoGCCqGSM49
+AwEHoUQDQgAELxTxWkPgKznzJBv2XYiv6moFLrLXMkzvzLgfmDqbm8RNjCROmx2l
+Gd6Y+kNSqA6dvWNHVlp14W9RWL71PDz3rA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json
index 44c179321fb758..025436fef66714 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field set to 1",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a003020102020806310d19d8eefd01300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c773abe06ba5a591f67a10e8bc02bd08d02e3bbbc4c121c66bdc16a630150368d0e6f77adc4ad55606a2b4b46d67bd5cf2480892e14c768d0a26c6b31f923876a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b6afab043a46ee7eb7329b1c6286956f87d596cc301f0603551d23041830168014dd39823c27e6f13b8a85c4aa5338d5fb482cea1d300a06082a8648ce3d040302034700304402203fc9e31c6709b970d26761fc1f9729254c3970bd182dc3652216f8c12a1a6bd60220687999b905c56fd986b0a12bdf01eade7a33e2d066f5e802cc1ca21db335e647",
-    "pai_cert": "308201be30820164a00302010202086ac047773710628c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000485463bd07147026cb83016edf43f0bdd2a61fb32ac8d6935ea80fbd074d36abdf682d83e8f9a4e1f36a3899775cf40ffaf87eb3916b0929ec186f4969c8894c5a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414dd39823c27e6f13b8a85c4aa5338d5fb482cea1d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100cdef567425543b605eaddd170357a916771d4b741b6e5ae1b45c0323e99e931102202aeb589b976555e08cccefa80c5d57bdb2a879c8380b61cb2f25ba0b999f2499",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e9406fa9c1ccbf93fd0347d9adc57cc4b587212903c9349a89d260411e1d176e02200091e072ce3ea216d336330d1cbcb07a574d136d2031c616f576272b70face42",
-    "dac_private_key": "725b48bffa1336c73fa56fe7d019168c9f2b1530562eecf9173450572c59ef0d",
-    "dac_public_key": "04c773abe06ba5a591f67a10e8bc02bd08d02e3bbbc4c121c66bdc16a630150368d0e6f77adc4ad55606a2b4b46d67bd5cf2480892e14c768d0a26c6b31f923876"
+    "dac_cert": "308201ce30820174a003020102020829f48aaed15ad7b3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000483a0074af1804862d1484d39a14054418de2aa9ade805580c1c34c21f7cedfb61da331c83e0d54433368e1fc5211c3945ae605969578ce954f0dcf83d228dad8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147f47c53a1848773e31dc81681939558a688a74fe301f0603551d230418301680148fc53f1f81a5dc1e66c7ff78455c1418576d3a88300a06082a8648ce3d040302034800304502204ab79b3cfb10756c6c3ee2774113d5b06ead757ce7a72f83247054d7c67977bf022100940c6da6904d3f9598c297ea945749deaebba227691013a8cb4dffe6c29c49da",
+    "pai_cert": "308201bf30820164a003020102020870f717a006888023300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042f14f15a43e02b39f3241bf65d88afea6a052eb2d7324cefccb81f983a9b9bc44d8c244e9b1da519de98fa4352a80e9dbd6347565a75e16f5158bef53c3cf7aca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148fc53f1f81a5dc1e66c7ff78455c1418576d3a88301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008fafb338a35289bb3402281894ab4da69d28f3b18dae290837d97ebcff947e76022100bbf56df69bb861959665fd882a3ff1f97a3e5df702a2e9cd593797acc70320ca",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220424153f75255e6b2617f5056880aa41de2c274d56daed676ad0af4a60c6228300221008b576d2f67722b72556f2bd2a9478fb7cf8d7268b99831e035ed4784b126307d",
+    "dac_private_key": "77cbf9d1076c1d13b0a64f831c0f1e7ec8856ee4a730ff9642a9b413ee91e96a",
+    "dac_public_key": "0483a0074af1804862d1484d39a14054418de2aa9ade805580c1c34c21f7cedfb61da331c83e0d54433368e1fc5211c3945ae605969578ce954f0dcf83d228dad8"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der
index f1e2ea264f87e0..ed2a8849a92feb 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der
index 94e0d9b034d836..ece409bc80fff0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem
index 2c1a0d787217a8..ac3935be963afc 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIT02o8vSWed8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIEYZMjpEeEK4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATsRQA/7Ff6+o4F4lZotstSZPf35jfi
-ZCUb8mmIgM5wv2ngNUjM7mriQsWqxVSKzEBbPzI4VmqOCZq9b54jXNqmo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUAiPZQgY/Wliy
-iycCMySy/TbfMdswHwYDVR0jBBgwFoAUZ4FylUaTgMgQpxNPXcGo1XFqsjwwCgYI
-KoZIzj0EAwIDRwAwRAIgU2muwp5prELkbKZ6RDTDMgqRgleAMG9MjuOxUNquuioC
-IHRF8lecKDEratxQGOms4ynoCsN8VzamHcOnyuNzG8pa
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATxWMJAtxFB9AIllZlnvctMTvBU5qvS
+E3jB0xhFhpEizDEhvTVJw7cZX0TcqCgc+mYsKC0aZMvr1IKGkjE821huo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzV49oOoB6+h0
+/V8cpljtli8xu8wwHwYDVR0jBBgwFoAUAayvo+3PJi8nKGsPUHbi0NgSKqQwCgYI
+KoZIzj0EAwIDSQAwRgIhAIH3/DnFzOmfKkmCdTXR6dJuFcEQPdOmZWhiVopET87n
+AiEAv8bUsd8mMn3WnFmpOfYxm4fpZE8rSv/AChmg4uo8Um4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der
index e2ed387e30a79a..8b48400b4a87f3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem
index 6d5dcaf70c4e0d..a1a476559f093c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDhF7DzFGTiWyFI8wLHAcrnCa7nqdNvdJ9NBs7KqEsY3oAoGCCqGSM49
-AwEHoUQDQgAE7EUAP+xX+vqOBeJWaLbLUmT39+Y34mQlG/JpiIDOcL9p4DVIzO5q
-4kLFqsVUisxAWz8yOFZqjgmavW+eI1zapg==
+MHcCAQEEIPD5waj509NXPByjMsGcsJe5szdXK2MPiHtZyUTRy5vJoAoGCCqGSM49
+AwEHoUQDQgAE8VjCQLcRQfQCJZWZZ73LTE7wVOar0hN4wdMYRYaRIswxIb01ScO3
+GV9E3KgoHPpmLCgtGmTL69SChpIxPNtYbg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der
index db7b89617734be..65c7a38223b54f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem
index 5b1e5ebc5e5ddc..7df238c3a91fd7 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIQsGTcLafZJQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIPSv6JCluFLEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABERuQo4p2b1qv0bLMsPy03tp2bcpConGJJRD3xo6OtkZfFRLsvFS0SEB4Y1b
-NwUYsXoFRUp4aYp+bYUyO0gvODejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRngXKVRpOAyBCnE09dwajVcWqyPDAfBgNV
+A0IABMkw4xwx7UXEayIghnfbTVu79zzkX27kmWWr6xgFz/uM9b6m1kgYAhN7/tRz
+GftNB2V7lUkWs+au3oG1pg1cBYOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQBrK+j7c8mLycoaw9QduLQ2BIqpDAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-sxNKtmdram3jCP5JwaLCMYTvEhnFXX9yiLqNaY5euNYCIQC0yqWBVxUI7Fnq5GRP
-matXib9xwMqm51TJfnSV3UdStw==
+/dhUQQpCn7/7rj2qaT3hCLzXHTok58bQ38z55bsVr7UCIQDtwWzFJ9DqZoCfnf3V
+dI24fzfI14iqazQT+H+A25LrfA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der
index 3fed644bf28953..416827329999de 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem
index 2f927fea7c324a..d5a9c3d3ffdc16 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINUvCfFwivDIHiu0QnXn3wOrXtMqK1EJPisBwmXrC7tQoAoGCCqGSM49
-AwEHoUQDQgAERG5CjinZvWq/Rssyw/LTe2nZtykKicYklEPfGjo62Rl8VEuy8VLR
-IQHhjVs3BRixegVFSnhpin5thTI7SC84Nw==
+MHcCAQEEIMUgfpCkg0qIfg0ycuQ8LXoQJ8K9Apof074llp7N1KR0oAoGCCqGSM49
+AwEHoUQDQgAEyTDjHDHtRcRrIiCGd9tNW7v3PORfbuSZZavrGAXP+4z1vqbWSBgC
+E3v+1HMZ+00HZXuVSRaz5q7egbWmDVwFgw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json
index c6662ac7dc73b9..54d9af195d662a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field set to 2",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a00302010202084f4da8f2f49679df300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ec45003fec57fafa8e05e25668b6cb5264f7f7e637e264251bf2698880ce70bf69e03548ccee6ae242c5aac5548acc405b3f3238566a8e099abd6f9e235cdaa6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140223d942063f5a58b28b27023324b2fd36df31db301f0603551d2304183016801467817295469380c810a7134f5dc1a8d5716ab23c300a06082a8648ce3d040302034700304402205369aec29e69ac42e46ca67a4434c3320a91825780306f4c8ee3b150daaeba2a02207445f2579c28312b6adc5018e9ace329e80ac37c5736a61dc3a7cae3731bca5a",
-    "pai_cert": "308201bf30820164a003020102020842c19370b69f6494300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004446e428e29d9bd6abf46cb32c3f2d37b69d9b7290a89c6249443df1a3a3ad9197c544bb2f152d12101e18d5b370518b17a05454a78698a7e6d85323b482f3837a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041467817295469380c810a7134f5dc1a8d5716ab23c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b3134ab6676b6a6de308fe49c1a2c23184ef1219c55d7f7288ba8d698e5eb8d6022100b4caa581571508ec59eae4644f99ab5789bf71c0caa6e754c97e7495dd4752b7",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ac6765617a5c02188bc6bf6b44117e95757c39abd16d7a792cd56751d6bc72970220109f0698347f89a673a2a321f4f9aaba113ceb59ee46f055d2ddc45674e52827",
-    "dac_private_key": "3845ec3cc5193896c8523cc0b1c072b9c26bb9ea74dbdd27d341b3b2aa12c637",
-    "dac_public_key": "04ec45003fec57fafa8e05e25668b6cb5264f7f7e637e264251bf2698880ce70bf69e03548ccee6ae242c5aac5548acc405b3f3238566a8e099abd6f9e235cdaa6"
+    "dac_cert": "308201cf30820174a003020102020811864c8e911e10ae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f158c240b71141f40225959967bdcb4c4ef054e6abd21378c1d31845869122cc3121bd3549c3b7195f44dca8281cfa662c282d1a64cbebd4828692313cdb586ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cd5e3da0ea01ebe874fd5f1ca658ed962f31bbcc301f0603551d2304183016801401acafa3edcf262f27286b0f5076e2d0d8122aa4300a06082a8648ce3d040302034900304602210081f7fc39c5cce99f2a49827535d1e9d26e15c1103dd3a6656862568a444fcee7022100bfc6d4b1df26327dd69c59a939f6319b87e9644f2b4affc00a19a0e2ea3c526e",
+    "pai_cert": "308201bf30820164a00302010202083d2bfa24296e14b1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004c930e31c31ed45c46b22208677db4d5bbbf73ce45f6ee49965abeb1805cffb8cf5bea6d6481802137bfed47319fb4d07657b954916b3e6aede81b5a60d5c0583a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041401acafa3edcf262f27286b0f5076e2d0d8122aa4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100fdd854410a429fbffbae3daa693de108bcd71d3a24e7c6d0dfccf9e5bb15afb5022100edc16cc527d0ea66809f9dfdd5748db87f37c8d788aa6b3413f87f80db92eb7c",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ff43228d7af9ed2fd97e638f5a425b7a3df3f0a75c975a724094fc42437b22a0022100870b2e11ad9332e05f88f061c025648aa863544a618f157a6968c187e52c52a0",
+    "dac_private_key": "f0f9c1a8f9d3d3573c1ca332c19cb097b9b337572b630f887b59c944d1cb9bc9",
+    "dac_public_key": "04f158c240b71141f40225959967bdcb4c4ef054e6abd21378c1d31845869122cc3121bd3549c3b7195f44dca8281cfa662c282d1a64cbebd4828692313cdb586e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der
index 2151772c8dbe23..1f432733da69a0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der
index ccdd6e80c59b62..d7d0e7add720cc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem
index 00145c1c7c91d3..f2597f35c87da7 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0DCCAXegAwIBAgIIH0wmetRMPA8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB0jCCAXegAwIBAgIIdjiFm/WqJb8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ19mhK+sMuyJLnXhdWztanBgouQ8EP
-8mqMYV8MQbJ/KrUQr3W8p9rPx53e+0AUSBu/3/3kENWiJJg8WpSFh0VEo2MwYTAP
-BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUvCDKcND4
-4uFZZpG5Oba7iOrGV1wwHwYDVR0jBBgwFoAUFpIgbP+hhXkolUUJAYtPY0GJ+U4w
-CgYIKoZIzj0EAwIDRwAwRAIgMlbVCbFXZsP4W2EUWbeunGyE5xmVreyKYjI25gBc
-eFQCIG8KU6IOYph4HWWb2t7E9pJP8NlCzTAU+hbb9Fh/SB/9
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASpzVceAh96CllLNR+C27EbmK3bozsG
+cDsvlGukwCeSntoW9CxA2/Tqh+twpj/pBjohuI1wD614QPScSIE0fcROo2MwYTAP
+BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUjHdKkVJc
+NdMyDfVcZexP0v+oodswHwYDVR0jBBgwFoAUxkyFMyLS3QcxxI+IdWKS6471yGIw
+CgYIKoZIzj0EAwIDSQAwRgIhAJhvfWdxmrky2XWbrqjMK2EeK0vCMYH5O5T1rTuV
+KEeUAiEAoWvsAs4ZBaU5KEjdMcp+gtt47ZmNdX5tVSFQRorOkNQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der
index 28c9fd3dce4c04..1ec7c9d29d46d8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem
index 6c6dbcf27f68a1..fd700740535063 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJYfljzHccvqxKJiBEXd2J63PE/OnruijZenr7L/EPCxoAoGCCqGSM49
-AwEHoUQDQgAENfZoSvrDLsiS514XVs7WpwYKLkPBD/JqjGFfDEGyfyq1EK91vKfa
-z8ed3vtAFEgbv9/95BDVoiSYPFqUhYdFRA==
+MHcCAQEEILJs6rJofdBXSp+x7gsP2Zi5DSPh9SzcEmgA23/TNEB9oAoGCCqGSM49
+AwEHoUQDQgAEqc1XHgIfegpZSzUfgtuxG5it26M7BnA7L5RrpMAnkp7aFvQsQNv0
+6ofrcKY/6QY6IbiNcA+teED0nEiBNH3ETg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der
index 1024b2f79a76ac..15c9a1571c4be3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem
index 41db9014fdbc69..66401d0962fd9e 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIB2Rlxt9fJ1swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIIF54TRlmudiMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFVHPJBZoZN9bETBKZ+RLndRMoahQfkLDpJBXo3LaNn2Dq8RWMMPWJfppkJU
-L5bR7akJp0YFWtJQglEthitLM3WjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQWkiBs/6GFeSiVRQkBi09jQYn5TjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAF
-yEg4IkkuYibce6mHMQ3MTomC1C68CHAlaYT2Nk92zwIhAOyuSlLDxkOkWVyPM8LL
-m9c9Zw9plo0RC8JlRN0ItaNp
+A0IABEyXiZDS9DLKQVy5ssFI9DbcRI/pHSI39IqfDJuweCscvSfLdly1wdFLJLkd
+p/rGQl+Ga0m+MATK4w0j4q8cv62jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTGTIUzItLdBzHEj4h1YpLrjvXIYjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBR
+EQOiuI+IR7yyL7PwyDnoZljT5f1b0kyayP1LvxHd7AIgGWgsVVoYTd3zU0fSCCFa
+Doq3I9Qr1Pq7CdEbtoS74wY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der
index 00414b0eab0c97..c5febcd2ec17db 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem
index 857632dade5e9e..0131bdffc3f318 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM529eRb7YVTK5EiMvbOeuSjRUQejMVkp6AGIA1KLtT/oAoGCCqGSM49
-AwEHoUQDQgAEVUc8kFmhk31sRMEpn5Eud1EyhqFB+QsOkkFejcto2fYOrxFYww9Y
-l+mmQlQvltHtqQmnRgVa0lCCUS2GK0szdQ==
+MHcCAQEEIOJDGsphSX82vj5n7HTM60F3JauHYZd7tredI81iicOEoAoGCCqGSM49
+AwEHoUQDQgAETJeJkNL0MspBXLmywUj0NtxEj+kdIjf0ip8Mm7B4Kxy9J8t2XLXB
+0UskuR2n+sZCX4ZrSb4wBMrjDSPirxy/rQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json
index 227f98ccba1451..0d54c07a309370 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field presence is wrong (present for DAC not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201d030820177a00302010202081f4c267ad44c3c0f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000435f6684afac32ec892e75e1756ced6a7060a2e43c10ff26a8c615f0c41b27f2ab510af75bca7dacfc79ddefb4014481bbfdffde410d5a224983c5a9485874544a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e04160414bc20ca70d0f8e2e1596691b939b6bb88eac6575c301f0603551d230418301680141692206cffa1857928954509018b4f634189f94e300a06082a8648ce3d040302034700304402203256d509b15766c3f85b611459b7ae9c6c84e71995adec8a623236e6005c785402206f0a53a20e6298781d659bdadec4f6924ff0d942cd3014fa16dbf4587f481ffd",
-    "pai_cert": "308201be30820164a0030201020208076465c6df5f275b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000455473c9059a1937d6c44c1299f912e77513286a141f90b0e92415e8dcb68d9f60eaf1158c30f5897e9a642542f96d1eda909a746055ad25082512d862b4b3375a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604141692206cffa1857928954509018b4f634189f94e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022005c8483822492e6226dc7ba987310dcc4e8982d42ebc0870256984f6364f76cf022100ecae4a52c3c643a4595c8f33c2cb9bd73d670f69968d110bc26544dd08b5a369",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100992be60da945dca9ef5b485bdfdc23e86e5d2ec9b72f606a78a1b6a81d01d09602205636e879c3eaa6d3617d369a2ac2743535f94626bbbe4c66072ad13aff34178f",
-    "dac_private_key": "961f963cc771cbeac4a2620445ddd89eb73c4fce9ebba28d97a7afb2ff10f0b1",
-    "dac_public_key": "0435f6684afac32ec892e75e1756ced6a7060a2e43c10ff26a8c615f0c41b27f2ab510af75bca7dacfc79ddefb4014481bbfdffde410d5a224983c5a9485874544"
+    "dac_cert": "308201d230820177a00302010202087638859bf5aa25bf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a9cd571e021f7a0a594b351f82dbb11b98addba33b06703b2f946ba4c027929eda16f42c40dbf4ea87eb70a63fe9063a21b88d700fad7840f49c4881347dc44ea3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e041604148c774a91525c35d3320df55c65ec4fd2ffa8a1db301f0603551d23041830168014c64c853322d2dd0731c48f88756292eb8ef5c862300a06082a8648ce3d0403020349003046022100986f7d67719ab932d9759baea8cc2b611e2b4bc23181f93b94f5ad3b95284794022100a16bec02ce1905a5392848dd31ca7e82db78ed998d757e6d552150468ace90d4",
+    "pai_cert": "308201bd30820164a0030201020208179e134659ae7623300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044c978990d2f432ca415cb9b2c148f436dc448fe91d2237f48a9f0c9bb0782b1cbd27cb765cb5c1d14b24b91da7fac6425f866b49be3004cae30d23e2af1cbfada366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c64c853322d2dd0731c48f88756292eb8ef5c862301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220511103a2b88f8847bcb22fb3f0c839e86658d3e5fd5bd24c9ac8fd4bbf11ddec022019682c555a184dddf35347d208215a0e8ab723d42bd4fabb09d11bb684bbe306",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206effa86913725581332ff6f0bf85f3c9cccecb1ba488e3e81ffa85e78a90a4bb022040158dad8a550347d8412009f3767c25afd8dbfc7d5c2c6f051a687585d5f3ba",
+    "dac_private_key": "b26ceab2687dd0574a9fb1ee0b0fd998b90d23e1f52cdc126800db7fd334407d",
+    "dac_public_key": "04a9cd571e021f7a0a594b351f82dbb11b98addba33b06703b2f946ba4c027929eda16f42c40dbf4ea87eb70a63fe9063a21b88d700fad7840f49c4881347dc44e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der
index 26ec086a15c6ba..544f3abd645590 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der
index 0e59c25541c8d7..4a981d9ddae278 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem
index 7c9fbd3669a477..a0efd66b366ae5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB8TCCAZigAwIBAgIIY4D6+Tc+qmwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB8zCCAZigAwIBAgIIWDONXuj76jYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAjtXHtvZTb6bR24TjnDSsJkDr0lGo
-CmrxfqHP43ntAZ4Mzy0PshrTxDbU7NXHuAg7QFMkTVTaJd7z8RFDsLTNo4GDMIGA
-MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQnw5Z+K4VU
-dv2r3jfOlUW8X8mYNzAfBgNVHSMEGDAWgBSTbxPUxXd/obPtwLEKdrUEaMYSDDAg
-BgNVHSUBAf8EFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwCgYIKoZIzj0EAwIDRwAw
-RAIgQuFJcMYaYCTzz2JjvOwT7wmnkp2PqePfy3bcUHC+8UECIF1As8Kpu3j138dy
-SJCqFmm8ZYPKlnuFzQuODEt1UojV
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQnXDa46R3KZLG0hou5YyiukEs7mUIl
+ohDdBBkuILcTGFi5Smn0iVgZjoGQE19eQt4ZVNv5vSIff7TeTnn8QJQ+o4GDMIGA
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTPH5JIU+QL
+77aKrEL6cPZ2MoNgATAfBgNVHSMEGDAWgBThzsCuybQQmaQCZKH2U2uD1JN7xjAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwCgYIKoZIzj0EAwIDSQAw
+RgIhAJU/0RsCiVdggEuH/hR+DmA5vmoQvv4s74fHM+C5n5zsAiEA3GafhI/7gXRj
+b3JmEDPKgi2LOQ48YoYgH1hRVPlpM9A=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der
index 4a7e0676cdd8bb..c33a23380f616c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem
index fd7fc3227cf7e6..97e224c94830cb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHDAqrW4o479C8smnxjvfN1uaJhnoKFKLnTN7/x5/6l8oAoGCCqGSM49
-AwEHoUQDQgAEwI7Vx7b2U2+m0duE45w0rCZA69JRqApq8X6hz+N57QGeDM8tD7Ia
-08Q21OzVx7gIO0BTJE1U2iXe8/ERQ7C0zQ==
+MHcCAQEEIDY2v47hW6tdo/Hsni6u4zo4jMKt9s5cv8TNQ9Wa0fK4oAoGCCqGSM49
+AwEHoUQDQgAEJ1w2uOkdymSxtIaLuWMorpBLO5lCJaIQ3QQZLiC3ExhYuUpp9IlY
+GY6BkBNfXkLeGVTb+b0iH3+03k55/ECUPg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der
index 1bee03811f6d4c..72b1c82d0d47d2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem
index d5fa1613b084f1..12e3bb9b5f915b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIfSojSm7W72gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIJDVEI6w5ioQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABGzWa7RhW1E6GdKo4RNO1rvcwBcLRGSkhelSh3Qy5GtS58sBDWK2u9W0zz/C
-aABhiBopyoGWfZ6GQ2yzba5vq3CjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSTbxPUxXd/obPtwLEKdrUEaMYSDDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBx
-/S/zpLWYCIfnXBJ7euUqHNy0soJkUNBMFwTzcjADFAIgWjrxj0Pvy67eoDNR0RPF
-vnOG0MOPW6Oe30bPp57yPIM=
+A0IABBSJZHXRo/wsw+oBeyRN8NBuky+nn4YS78KoPSrwWcvTsPfb3F2E49m8qGdG
+sz3eRA10ZF9ZfQS9/TWVwnh6ucSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBThzsCuybQQmaQCZKH2U2uD1JN7xjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+xnB78VqJo3dhy4LQJgK7vHTNVCLIv9a+yRdJM+sfHD4CIQDkXSPikDnKK6NeJGlO
+NOHTMSBSlw6vLrH5tyvnWIM4nQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der
index 25239e90ef3535..28b47018f60428 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem
index b8d13298169471..625dfbc255af63 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPteNtbQmMJX6GRMAtXhdxAPK4mp8Ox5kz9y+dx+SlLaoAoGCCqGSM49
-AwEHoUQDQgAEbNZrtGFbUToZ0qjhE07Wu9zAFwtEZKSF6VKHdDLka1LnywENYra7
-1bTPP8JoAGGIGinKgZZ9noZDbLNtrm+rcA==
+MHcCAQEEIETezfeEOHrMWjdUXrqNgSpV+T4u5Gy9AECrWmDygoaUoAoGCCqGSM49
+AwEHoUQDQgAEFIlkddGj/CzD6gF7JE3w0G6TL6efhhLvwqg9KvBZy9Ow99vcXYTj
+2byoZ0azPd5EDXRkX1l9BL39NZXCeHq5xA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json
index 0ee5f9f7cfde21..cd49de1ce784e2 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate includes optional Extended Key Usage extension",
     "is_success_case": "true",
-    "dac_cert": "308201f130820198a00302010202086380faf9373eaa6c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c08ed5c7b6f6536fa6d1db84e39c34ac2640ebd251a80a6af17ea1cfe379ed019e0ccf2d0fb21ad3c436d4ecd5c7b8083b4053244d54da25def3f11143b0b4cda38183308180300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041427c3967e2b855476fdabde37ce9545bc5fc99837301f0603551d23041830168014936f13d4c5777fa1b3edc0b10a76b50468c6120c30200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020347003044022042e14970c61a6024f3cf6263bcec13ef09a7929d8fa9e3dfcb76dc5070bef14102205d40b3c2a9bb78f5dfc7724890aa1669bc6583ca967b85cd0b8e0c4b755288d5",
-    "pai_cert": "308201bd30820164a00302010202087d2a234a6ed6ef68300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046cd66bb4615b513a19d2a8e1134ed6bbdcc0170b4464a485e952877432e46b52e7cb010d62b6bbd5b4cf3fc2680061881a29ca81967d9e86436cb36dae6fab70a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414936f13d4c5777fa1b3edc0b10a76b50468c6120c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022071fd2ff3a4b5980887e75c127b7ae52a1cdcb4b2826450d04c1704f37230031402205a3af18f43efcbaedea03351d113c5be7386d0c38f5ba39edf46cfa79ef23c83",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e042680e0971ccf3d7b623cdcdf3a22809357816693fdf0ad937bacb2689855b022100828be304ddfb7146c7adf3367c8a96220616d251a28efbc28f9719380e66de6f",
-    "dac_private_key": "70c0aab5b8a38efd0bcb269f18ef7cdd6e689867a0a14a2e74cdeffc79ffa97c",
-    "dac_public_key": "04c08ed5c7b6f6536fa6d1db84e39c34ac2640ebd251a80a6af17ea1cfe379ed019e0ccf2d0fb21ad3c436d4ecd5c7b8083b4053244d54da25def3f11143b0b4cd"
+    "dac_cert": "308201f330820198a003020102020858338d5ee8fbea36300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004275c36b8e91dca64b1b4868bb96328ae904b3b994225a210dd04192e20b7131858b94a69f48958198e8190135f5e42de1954dbf9bd221f7fb4de4e79fc40943ea38183308180300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cf1f924853e40befb68aac42fa70f67632836001301f0603551d23041830168014e1cec0aec9b41099a40264a1f6536b83d4937bc630200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020349003046022100953fd11b02895760804b87fe147e0e6039be6a10befe2cef87c733e0b99f9cec022100dc669f848ffb8174636f72661033ca822d8b390e3c6286201f585154f96933d0",
+    "pai_cert": "308201bf30820164a003020102020824354423ac398a84300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000414896475d1a3fc2cc3ea017b244df0d06e932fa79f8612efc2a83d2af059cbd3b0f7dbdc5d84e3d9bca86746b33dde440d74645f597d04bdfd3595c2787ab9c4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e1cec0aec9b41099a40264a1f6536b83d4937bc6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c6707bf15a89a37761cb82d02602bbbc74cd5422c8bfd6bec9174933eb1f1c3e022100e45d23e29039ca2ba35e24694e34e1d3312052970eaf2eb1f9b72be75883389d",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022048b9a7103173404b47ffe6d07cba9338ea826a9f82c6a2266026dbeb8b5c6c2902203428dc3d61cac04e53430c6f00ee86d69f57866bbaa2c165f7a43d0835f3a606",
+    "dac_private_key": "3636bf8ee15bab5da3f1ec9e2eaee33a388cc2adf6ce5cbfc4cd43d59ad1f2b8",
+    "dac_public_key": "04275c36b8e91dca64b1b4868bb96328ae904b3b994225a210dd04192e20b7131858b94a69f48958198e8190135f5e42de1954dbf9bd221f7fb4de4e79fc40943e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der
index 5528b5bb0f6d5b..20f406019d8bd2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der
index 78fbc0971d3a9e..a2f6f62ba0f483 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem
index 64528a19e0ae21..cc13a5163a4ec4 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIXQj07staarQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzDCCAXGgAwIBAgIICD29n0uEuaUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT71Z5WoW+7WHVS85gAU5shAlfA3EGQ
-sVupa4iTJNi05+UWSQKU9Altv02Sd9juklaVxJ6j3mFLI4b0GPR39tfSo10wWzAM
-BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQU37vHokB2Wrf7wBrt
-+5m1jofn2qowHwYDVR0jBBgwFoAU40NKw7j6gBNRzuHjFNkG8Gk+0PEwCgYIKoZI
-zj0EAwIDSQAwRgIhANbZQcv1oyYqhwkTcrkLvKK/iotGTymdTcaGlmpvMfr8AiEA
-2KV+v752ugxTNPrQ6ieljZix8YKrUZZ3c4nXRIzQG0g=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATIgKBf2vixVN8MknKU2dqJ4bgFUgJG
+JHQwbrN8+7czOxl7n3TOwkjALx/qeI1CEVIxmrtTv/5PwkP3kP/jAFIro10wWzAM
+BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUaZih5aGpfxnxsuho
+Z5fBoZP1jmswHwYDVR0jBBgwFoAUgb10r/Jx1uLpC+1J31cNAxHCHEEwCgYIKoZI
+zj0EAwIDSQAwRgIhAJH8C7IVDtWZS/F0/QUFtq7Ov242AgwKQiiQ3Md/AUEuAiEA
+nDZmbhO2YYeuy1tZdrhDwMKGfaKf1vRSqb+V3bkOLKw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der
index 68b3191e519ac7..02be067f8660cd 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem
index df3e17b4986257..708c194d78e9b6 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM5yrjTYtYLByDvsL71FpgQdkdxobC3o18U632pebkrNoAoGCCqGSM49
-AwEHoUQDQgAE+9WeVqFvu1h1UvOYAFObIQJXwNxBkLFbqWuIkyTYtOflFkkClPQJ
-bb9NknfY7pJWlcSeo95hSyOG9Bj0d/bX0g==
+MHcCAQEEIOWHVTEaIgzM29oQ/a69kqtRGh3oxlaqaiFDU5ZnBpE2oAoGCCqGSM49
+AwEHoUQDQgAEyICgX9r4sVTfDJJylNnaieG4BVICRiR0MG6zfPu3MzsZe590zsJI
+wC8f6niNQhFSMZq7U7/+T8JD95D/4wBSKw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der
index e7572880af3e73..e462107e582bd0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem
index 43a415eb460ce6..345e2baf47d1c8 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIKI6IvzCCTBowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIF0ISKdLRvkMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABGBP++HHmgW8bxeu1BBcY6qWKjtCiADeJDO/AN5pDqk9IchybaG5FYClsC6I
-+6a7Qo1stOz9w12RxbH4TXylCaejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjQ0rDuPqAE1HO4eMU2QbwaT7Q8TAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBn
-JeBbdeohH/EoAWg6OGVs2w3VNhyd/HcPjQTzngnMvQIgf+LhA5kgfclwYGvSqNwM
-+ce08THs9jKUazR5ey9EicM=
+A0IABE5C1XdbjU9Otv8iQvz9jVoN8y5reIGA/BkOazsf/O7SwBYNlkG0Q/uWxF/i
+kO7YuRZAHYxMAAACS+PoGCOUBu6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSBvXSv8nHW4ukL7UnfVw0DEcIcQTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+li6QUWEglbY3mg/fu+aTlaYdkAbGvips2KT4c3m6tcwCIEyOKuIqHmXOQok7o1aZ
+JFhO4IFHpQnaXZ+sfRJWzopT
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der
index e1ed68bfafa0d3..129618e07b7090 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem
index 08beb3ae399792..8adefd4cf6e640 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKy3jEw9H1aUugdqYjytHH/EWzF4Y1u4qrrA57uI35swoAoGCCqGSM49
-AwEHoUQDQgAEYE/74ceaBbxvF67UEFxjqpYqO0KIAN4kM78A3mkOqT0hyHJtobkV
-gKWwLoj7prtCjWy07P3DXZHFsfhNfKUJpw==
+MHcCAQEEIFVAx1lhhAglufmTpF3NUFs4K09XbeThYReS5WuUoRlloAoGCCqGSM49
+AwEHoUQDQgAETkLVd1uNT062/yJC/P2NWg3zLmt4gYD8GQ5rOx/87tLAFg2WQbRD
++5bEX+KQ7ti5FkAdjEwAAAJL4+gYI5QG7g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json
index 123052d1ba83b0..3a16775c782edb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820171a00302010202085d08f4eecb5a6ab4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fbd59e56a16fbb587552f39800539b210257c0dc4190b15ba96b889324d8b4e7e516490294f4096dbf4d9277d8ee925695c49ea3de614b2386f418f477f6d7d2a35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e04160414dfbbc7a240765ab7fbc01aedfb99b58e87e7daaa301f0603551d23041830168014e3434ac3b8fa801351cee1e314d906f0693ed0f1300a06082a8648ce3d0403020349003046022100d6d941cbf5a3262a87091372b90bbca2bf8a8b464f299d4dc686966a6f31fafc022100d8a57ebfbe76ba0c5334fad0ea27a58d98b1f182ab5196777389d7448cd01b48",
-    "pai_cert": "308201bd30820164a0030201020208288e88bf30824c1a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004604ffbe1c79a05bc6f17aed4105c63aa962a3b428800de2433bf00de690ea93d21c8726da1b91580a5b02e88fba6bb428d6cb4ecfdc35d91c5b1f84d7ca509a7a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414e3434ac3b8fa801351cee1e314d906f0693ed0f1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402206725e05b75ea211ff12801683a38656cdb0dd5361c9dfc770f8d04f39e09ccbd02207fe2e10399207dc970606bd2a8dc0cf9c7b4f131ecf632946b34797b2f4489c3",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022038c1d56482bc7fe79458357e2916a1d426cbd96b9a5fc6775e404545d6b931fc022003e6796cb5320ef83437b58893469152edc51f11da6fc99c3878fd643b8908b6",
-    "dac_private_key": "ce72ae34d8b582c1c83bec2fbd45a6041d91dc686c2de8d7c53adf6a5e6e4acd",
-    "dac_public_key": "04fbd59e56a16fbb587552f39800539b210257c0dc4190b15ba96b889324d8b4e7e516490294f4096dbf4d9277d8ee925695c49ea3de614b2386f418f477f6d7d2"
+    "dac_cert": "308201cc30820171a0030201020208083dbd9f4b84b9a5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c880a05fdaf8b154df0c927294d9da89e1b8055202462474306eb37cfbb7333b197b9f74cec248c02f1fea788d421152319abb53bffe4fc243f790ffe300522ba35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e041604146998a1e5a1a97f19f1b2e8686797c1a193f58e6b301f0603551d2304183016801481bd74aff271d6e2e90bed49df570d0311c21c41300a06082a8648ce3d040302034900304602210091fc0bb2150ed5994bf174fd0505b6aecebf6e36020c0a422890dcc77f01412e0221009c36666e13b66187aecb5b5976b843c0c2867da29fd6f452a9bf95ddb90e2cac",
+    "pai_cert": "308201be30820164a003020102020817421229d2d1be43300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044e42d5775b8d4f4eb6ff2242fcfd8d5a0df32e6b788180fc190e6b3b1ffceed2c0160d9641b443fb96c45fe290eed8b916401d8c4c0000024be3e818239406eea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041481bd74aff271d6e2e90bed49df570d0311c21c41301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100962e9051612095b6379a0fdfbbe69395a61d9006c6be2a6cd8a4f87379bab5cc02204c8e2ae22a1e65ce42893ba3569924584ee08147a509da5d9fac7d1256ce8a53",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210081ff40388849dde6a1e15c01e23b3017de4a262af8c150583956d0399405cde9022100fb9d7b29b86570de3d720c9da26ef05d97ef8b98bed27fd36c6de96942ee9c6e",
+    "dac_private_key": "e58755311a220cccdbda10fdaebd92ab511a1de8c656aa6a2143539667069136",
+    "dac_public_key": "04c880a05fdaf8b154df0c927294d9da89e1b8055202462474306eb37cfbb7333b197b9f74cec248c02f1fea788d421152319abb53bffe4fc243f790ffe300522b"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der
index a851109ca5aede..26ac4430a419fe 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der
index c3db13a7ef2a59..808e5644882b38 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem
index 942c759ba04311..90e16dfc2c6f32 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByzCCAXGgAwIBAgIIVvBAuqmg3yQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzDCCAXGgAwIBAgIIHyc4fp/l248wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQmeF2XBqZR08+6LMiNFb35YapcW8uG
-dDB3ComNm988sJaaPBE9rr8URWfCJNxDYffK73SnrXLSYsJoB5inpDXfo10wWzAM
-BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUfrxgrAFFKtLwgNsP
-Wbeoe6hovQUwHwYDVR0jBBgwFoAU+xzVzKXcdtdMjsoQcPn/zys9JcowCgYIKoZI
-zj0EAwIDSAAwRQIgdFqMNm2EnzAcDhVGagU8y/Y3eKudVncgt5hBJpTPxt0CIQD6
-GTFxb0sH/9EWMWRya0UfEah4GBMiNUObuqZQvcfM8Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ+JJlPhwbcOhtrKnHpTHkU50McaYJO
+MMHmxw37EoXPrMaPxcSVP+16kVrjjDcVSizTRBGPsbyGBo+fa5/u67pyo10wWzAM
+BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUh5MQbaepE+pfJJ3z
+kAD0lkKgkjwwHwYDVR0jBBgwFoAUEPHENTVRAuv5ZWOOPUy4z9Z4ZMkwCgYIKoZI
+zj0EAwIDSQAwRgIhAMqiSkrgvN2YfF9xNBYYzT1AlNpPKZ5Jwd9UWK0D2dg8AiEA
+jUq+ZkJzTZulGgPY8S1xfoAu6Fs2MKOEDIHiZFNlC+w=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der
index 873b4a7ac8d9d5..aa71db8affd587 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem
index 9d3822405bb547..4cc6c6b462ad0c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBkiGjyHj6GZmY401cOMT4NmTpReo2zcR28up7tMekSRoAoGCCqGSM49
-AwEHoUQDQgAEJnhdlwamUdPPuizIjRW9+WGqXFvLhnQwdwqJjZvfPLCWmjwRPa6/
-FEVnwiTcQ2H3yu90p61y0mLCaAeYp6Q13w==
+MHcCAQEEIPZ9KD83yq2KBKY4hHGsUw7OM9s7xEpwXRkyx5pB7ePUoAoGCCqGSM49
+AwEHoUQDQgAEPiSZT4cG3Dobaypx6Ux5FOdDHGmCTjDB5scN+xKFz6zGj8XElT/t
+epFa44w3FUos00QRj7G8hgaPn2uf7uu6cg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der
index ed392ad2cbfaad..69d052b584a051 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem
index d33e79f667ed28..1d01db923230e7 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIAVzbVaABvRMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIPzuxCtiGqRwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABDvWgy/XLnDQT7if+7BgrPIFA4etcMKNUpscEixalf8Xxq7cWpt2mFHXFG4n
-RTQ7mQOsc4cIclN6KsV1vM0XgiGjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBT7HNXMpdx210yOyhBw+f/PKz0lyjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiA3
-6CCh6t8aVuSup/dlQZT2qnxNLLrnt8TCDyWfbMa8uwIgehSq+kBBX7C4jwI1qb5o
-SRqZMKHsGnRj3KFe+GDwA0w=
+A0IABC5tmEEv4F7Dueh6yFoGrH+iprSb+bRe7mhAaHTHr/uuPyIAwqTViNtB02HF
+PIs8eZXqjyHczCpumgoNKX3jqSOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQQ8cQ1NVEC6/llY449TLjP1nhkyTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+2O3kAUHuRLl2yFZQEwChpswYzHhaiSt7Ie0rYEJ0f+wCIE1cteBlRIEM3TQa8h+u
+poQkrqtluOOZKQaTcgTusCUB
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der
index a31f21c283a2cf..c0c3bc0f7deddf 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem
index e34b4e5baf34f0..3a01ddd43dbc06 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHDmjilk5Dn5BMzuOdm7/wbcMgs0M7QJVRAAzK0rZcOOoAoGCCqGSM49
-AwEHoUQDQgAEO9aDL9cucNBPuJ/7sGCs8gUDh61wwo1SmxwSLFqV/xfGrtxam3aY
-UdcUbidFNDuZA6xzhwhyU3oqxXW8zReCIQ==
+MHcCAQEEINDZDOz/vG0l0EMygJh7nrvmg2yO5snHRxWH3E3PbjL8oAoGCCqGSM49
+AwEHoUQDQgAELm2YQS/gXsO56HrIWgasf6KmtJv5tF7uaEBodMev+64/IgDCpNWI
+20HTYcU8izx5leqPIdzMKm6aCg0pfeOpIw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json
index 95bf0a84c95ff5..b49276fe7cefbc 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201cb30820171a003020102020856f040baa9a0df24300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000426785d9706a651d3cfba2cc88d15bdf961aa5c5bcb867430770a898d9bdf3cb0969a3c113daebf144567c224dc4361f7caef74a7ad72d262c2680798a7a435dfa35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e041604147ebc60ac01452ad2f080db0f59b7a87ba868bd05301f0603551d23041830168014fb1cd5cca5dc76d74c8eca1070f9ffcf2b3d25ca300a06082a8648ce3d04030203480030450220745a8c366d849f301c0e15466a053ccbf63778ab9d567720b798412694cfc6dd022100fa1931716f4b07ffd1163164726b451f11a87818132235439bbaa650bdc7ccf1",
-    "pai_cert": "308201bd30820164a0030201020208015cdb55a001bd13300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043bd6832fd72e70d04fb89ffbb060acf2050387ad70c28d529b1c122c5a95ff17c6aedc5a9b769851d7146e2745343b9903ac73870872537a2ac575bccd178221a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414fb1cd5cca5dc76d74c8eca1070f9ffcf2b3d25ca301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022037e820a1eadf1a56e4aea7f7654194f6aa7c4d2cbae7b7c4c20f259f6cc6bcbb02207a14aafa40415fb0b88f0235a9be68491a9930a1ec1a7463dca15ef860f0034c",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022021f858a256c52c1b80ee1aa02b2be2c92a8b8623e62b004fe21d53a1ed1fbeb7022100f3eda9731aed19439eba82e5b4b1b9f98e29d88c6f6ae893e39117d1e4ac0a4f",
-    "dac_private_key": "19221a3c878fa199998e34d5c38c4f83664e945ea36cdc476f2ea7bb4c7a4491",
-    "dac_public_key": "0426785d9706a651d3cfba2cc88d15bdf961aa5c5bcb867430770a898d9bdf3cb0969a3c113daebf144567c224dc4361f7caef74a7ad72d262c2680798a7a435df"
+    "dac_cert": "308201cc30820171a00302010202081f27387e9fe5db8f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043e24994f8706dc3a1b6b2a71e94c7914e7431c69824e30c1e6c70dfb1285cfacc68fc5c4953fed7a915ae38c37154a2cd344118fb1bc86068f9f6b9feeebba72a35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e041604148793106da7a913ea5f249df39000f49642a0923c301f0603551d2304183016801410f1c435355102ebf965638e3d4cb8cfd67864c9300a06082a8648ce3d0403020349003046022100caa24a4ae0bcdd987c5f71341618cd3d4094da4f299e49c1df5458ad03d9d83c0221008d4abe6642734d9ba51a03d8f12d717e802ee85b3630a3840c81e26453650bec",
+    "pai_cert": "308201be30820164a00302010202083f3bb10ad886a91c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042e6d98412fe05ec3b9e87ac85a06ac7fa2a6b49bf9b45eee68406874c7affbae3f2200c2a4d588db41d361c53c8b3c7995ea8f21dccc2a6e9a0a0d297de3a923a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041410f1c435355102ebf965638e3d4cb8cfd67864c9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100d8ede40141ee44b976c856501300a1a6cc18cc785a892b7b21ed2b6042747fec02204d5cb5e06544810cdd341af21faea68424aeab65b8e3992906937204eeb02501",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022063f24991658339818362b591093d81af99b0fc5f62b0b207d49a9fbd1c1dd7a00221008b04dc9c94a0d53e8a9b8c96645ed146f8c464b46498f9ff24cd31fabb2b09ca",
+    "dac_private_key": "f67d283f37caad8a04a6388471ac530ece33db3bc44a705d1932c79a41ede3d4",
+    "dac_public_key": "043e24994f8706dc3a1b6b2a71e94c7914e7431c69824e30c1e6c70dfb1285cfacc68fc5c4953fed7a915ae38c37154a2cd344118fb1bc86068f9f6b9feeebba72"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der
index d2652374f4c554..9166a85b28fd2e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der
index 7a7bf089eeb203..2e53ec30c5db79 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem
index 4e7af76892807c..b74a99658052b2 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIEBLn2rXPMz4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIINUZUEUcUPdEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAThEAoGNBGf2BsyvmKEh9RpotpqFqGv
-mCm10BoV33OsErf+bsxtoxMv87WLqsxHatmUFoJxIeCZ2GAW9looOBn0o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIBgjAdBgNVHQ4EFgQUEU3eoEycwtgz
-+hNmHZLDtA85fTQwHwYDVR0jBBgwFoAUBolid9OnoBcM9FmjSp91iqc2scowCgYI
-KoZIzj0EAwIDRwAwRAIgBX0QamlGuJn88vNYdIZThqaqJn1fObO02vISWFmnoLAC
-IGBI1Qi9zU4vXrZhZ12qSTfuuU/1aTjELj1djG2ioGGq
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATyB9zkYmG0infcmClC3M5FxUhHA6UX
+LWzYMp6V3JuzUGivsugwbs1NAc3rVCDMDl3bqwnZFWIdpu41Q/AGVDs1o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIBgjAdBgNVHQ4EFgQUhrjpulwxu4PY
+LNnnMOUnOrmSwvswHwYDVR0jBBgwFoAUYrhZT57g3WGNSFQWQhpMZR8nYMIwCgYI
+KoZIzj0EAwIDSAAwRQIhAN6nOB8+LHfJ8pvan4PSMmcCDQI+3ywp30wfkdLclvba
+AiB0gZ/rXbwASJy6RyG0w7RavzJGNr9I7Jf9zSciZttEYQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der
index 5f7cff5a7c4402..35e4b6c5970e3c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem
index 50916dbeeddfc1..b7f6787f0ccf83 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPDlC8qAyEZj2BOpqCnadk/aoSQHlRV4R6Gnl28+pt1ZoAoGCCqGSM49
-AwEHoUQDQgAE4RAKBjQRn9gbMr5ihIfUaaLaahahr5gptdAaFd9zrBK3/m7MbaMT
-L/O1i6rMR2rZlBaCcSHgmdhgFvZaKDgZ9A==
+MHcCAQEEIHBpgrjvSJKgTvtHczXdcUZdL+/BpXkwHQSCZ+WWXTq2oAoGCCqGSM49
+AwEHoUQDQgAE8gfc5GJhtIp33JgpQtzORcVIRwOlFy1s2DKeldybs1Bor7LoMG7N
+TQHN61QgzA5d26sJ2RViHabuNUPwBlQ7NQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der
index 6a0e5a13eea7e2..091719a13da44d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem
index 69d907d8336e30..cc6bf7e94d2ef3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIKdQqq/FNjKAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIaR0KphHGlMYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCUhfHS8wEYvH9IZ/FU3w/VwJCt4QhFtXt/MON/pdEOH4UjBgg+Geo1eiVmb
-1d5fSu3dCp1a9G4O3ehsFgyVkcujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQGiWJ306egFwz0WaNKn3WKpzaxyjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiA8
-3daLkKJI+A1ONOq+z2s0O9Gsh5tZa2rqlV2bEf/0sAIgBqpBZ53NGtemrN+gyESE
-hKwAdjmMwO+wj5XRPyTUVsc=
+A0IABOGay5ski9GjXnvF8ZZmFHWsM1e8H7lcqa/g0d8gd+AddLZ+jMSePM9QV97h
+cokjE9GOqxIy+7I3euk87PK4uMujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRiuFlPnuDdYY1IVBZCGkxlHydgwjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+xM/R5IWllfyd95IzkI19CvpalbE5LVToqiZiLv/SfLoCIQDmPUTZAn1bShuOG/wg
+roHGq/XLfIEfWCbEkm6xi7DZVw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der
index 580a86fd5b4cff..0e814212e8a755 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem
index 79f4f41404d6e4..225863a86a930f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDpea8tinqQdleKJSpbxoM2ibm1m6GTDfCulEHbfD/PQoAoGCCqGSM49
-AwEHoUQDQgAEJSF8dLzARi8f0hn8VTfD9XAkK3hCEW1e38w43+l0Q4fhSMGCD4Z6
-jV6JWZvV3l9K7d0KnVr0bg7d6GwWDJWRyw==
+MHcCAQEEIJJ+YptyZIQIgD3Itq0HxfggBkcAfPojFf9uMTp38C3xoAoGCCqGSM49
+AwEHoUQDQgAE4ZrLmySL0aNee8XxlmYUdawzV7wfuVypr+DR3yB34B10tn6MxJ48
+z1BX3uFyiSMT0Y6rEjL7sjd66Tzs8ri4yw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json
index bc099f8f07a60b..ba62fe2d54cde3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a00302010202081012e7dab5cf333e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e1100a0634119fd81b32be628487d469a2da6a16a1af9829b5d01a15df73ac12b7fe6ecc6da3132ff3b58baacc476ad99416827121e099d86016f65a283819f4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020182301d0603551d0e04160414114ddea04c9cc2d833fa13661d92c3b40f397d34301f0603551d2304183016801406896277d3a7a0170cf459a34a9f758aa736b1ca300a06082a8648ce3d04030203470030440220057d106a6946b899fcf2f35874865386a6aa267d5f39b3b4daf2125859a7a0b002206048d508bdcd4e2f5eb661675daa4937eeb94ff56938c42e3d5d8c6da2a061aa",
-    "pai_cert": "308201bd30820164a003020102020829d42aabf14d8ca0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000425217c74bcc0462f1fd219fc5537c3f570242b7842116d5edfcc38dfe9744387e148c1820f867a8d5e89599bd5de5f4aeddd0a9d5af46e0edde86c160c9591cba366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041406896277d3a7a0170cf459a34a9f758aa736b1ca301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203cddd68b90a248f80d4e34eabecf6b343bd1ac879b596b6aea955d9b11fff4b0022006aa41679dcd1ad7a6acdfa0c8448484ac0076398cc0efb08f95d13f24d456c7",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100937523b1acc3cd829e4b13074b49a9a42ddcfe5f9b3829e4605e5b44e3344e85022023d74801d3bfe19a7824950a2d2e657933ba955636888c9dc112f2a8530f1cc9",
-    "dac_private_key": "f0e50bca80c84663d813a9a829da764fdaa1240795157847a1a7976f3ea6dd59",
-    "dac_public_key": "04e1100a0634119fd81b32be628487d469a2da6a16a1af9829b5d01a15df73ac12b7fe6ecc6da3132ff3b58baacc476ad99416827121e099d86016f65a283819f4"
+    "dac_cert": "308201ce30820174a00302010202083546541147143dd1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f207dce46261b48a77dc982942dcce45c5484703a5172d6cd8329e95dc9bb35068afb2e8306ecd4d01cdeb5420cc0e5ddbab09d915621da6ee3543f006543b35a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020182301d0603551d0e0416041486b8e9ba5c31bb83d82cd9e730e5273ab992c2fb301f0603551d2304183016801462b8594f9ee0dd618d485416421a4c651f2760c2300a06082a8648ce3d0403020348003045022100dea7381f3e2c77c9f29bda9f83d23267020d023edf2c29df4c1f91d2dc96f6da022074819feb5dbc00489cba4721b4c3b45abf324636bf48ec97fdcd272266db4461",
+    "pai_cert": "308201bf30820164a0030201020208691d0aa611c694c6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e19acb9b248bd1a35e7bc5f196661475ac3357bc1fb95ca9afe0d1df2077e01d74b67e8cc49e3ccf5057dee172892313d18eab1232fbb2377ae93cecf2b8b8cba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041462b8594f9ee0dd618d485416421a4c651f2760c2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c4cfd1e485a595fc9df79233908d7d0afa5a95b1392d54e8aa26622effd27cba022100e63d44d9027d5b4a1b8e1bfc20ae81c6abf5cb7c811f5826c4926eb18bb0d957",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220397729bafdf75b1e98119268fbb593c5b7dcb1642938c6de4151652c98c30a22022100bbef4ad93734d15b544269d34aee23a9775cf505a2b1e861db09d43e8c7a4d19",
+    "dac_private_key": "706982b8ef4892a04efb477335dd71465d2fefc1a579301d048267e5965d3ab6",
+    "dac_public_key": "04f207dce46261b48a77dc982942dcce45c5484703a5172d6cd8329e95dc9bb35068afb2e8306ecd4d01cdeb5420cc0e5ddbab09d915621da6ee3543f006543b35"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der
index d7f99324e18d22..3b66b6e1bc5727 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der
index b86ac3e5f5024c..3caedbff1896db 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem
index 4853d6ccc238a5..dca90f1e3af890 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIUTryfNzxw1gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIRTqr9WKWhnYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARASYB2lpb5WVGsrSKqL5pRGZZoBk0k
-3TPh/YkuSDfgKPA8WerUKQ5AfPuAhaL3zzZvjPf5Fn1SpDx1yAaTpc8fo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFIDAdBgNVHQ4EFgQUQdxNLLofxoQR
-INYGIFIL5Hrw0B4wHwYDVR0jBBgwFoAUChS1t5Bl8DFo4e/jblKgXdxpiWUwCgYI
-KoZIzj0EAwIDRwAwRAIgZG3RtkZCR4JehqY3v4eukfw2fTQBffwOoA8eog7JcaUC
-IFwZL+Dwv3KwPOnhtLOm9AKWztP6Z2k9TFoSzsyYXM42
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ/m//oa4u9Tye7qP4tLi6hPDz4uu/k
+RRINQPJ0MlLvBanrT1N9w+O6uOERdnmOkXWH+AzCjiFl/1ZRfg73Vlzro2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFIDAdBgNVHQ4EFgQUVBeUJrjYUr9k
+PNGp33vSouHdOdUwHwYDVR0jBBgwFoAUoT/Sm2NcC+tI/Aflzw/dT/7MuBkwCgYI
+KoZIzj0EAwIDSQAwRgIhANdkSzkqIHYBvIRdA3+85PpbokXnfqsRfmweyCsE77QY
+AiEA9gAc80Ie5BX1a7nVtdwoKRXq6Gi9/Y341B6Kv8M8niY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der
index 15bdfae7802399..a81b19fcd2b69a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem
index 5e0281d6d46c8f..f9ccd29b8732fa 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPZjRK3jx2EvkG82y0WAxvPv4epwVf66oWQ9HhjwbEK1oAoGCCqGSM49
-AwEHoUQDQgAEQEmAdpaW+VlRrK0iqi+aURmWaAZNJN0z4f2JLkg34CjwPFnq1CkO
-QHz7gIWi9882b4z3+RZ9UqQ8dcgGk6XPHw==
+MHcCAQEEIGEvh5IQprakp2GiM2Vmxui80SMZ4lpTXi7IgA/Z83C0oAoGCCqGSM49
+AwEHoUQDQgAEP5v/6GuLvU8nu6j+LS4uoTw8+Lrv5EUSDUDydDJS7wWp609TfcPj
+urjhEXZ5jpF1h/gMwo4hZf9WUX4O91Zc6w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der
index 9e1369e35703de..98bbe8cb73c9ec 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem
index 72964b22579e66..3139e9d3e6db0b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIOObD72boW7MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIYlEnLuWcCfYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABIky0mhFHlheA/t9M32/9zyvVyPv6tdYnFnPhCJKwAv2qaq2qNTXM63Ly7y0
-+lXeyvQtyxr8RRq/vc3VXr1bND6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQKFLW3kGXwMWjh7+NuUqBd3GmJZTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBG
-Ek0Yo5ejV2tvmnZtfofdLMRVTf/ZXdRYzf8yBQkY0AIgMwpXrSPlwT0TbjBPCjDU
-zI45pxLGPswoCEbOS4vdmTQ=
+A0IABCW4iOdLy/PArgHgDG5c5IW9EvgH7XnQU/h4XJjdFd3jFwdKMbtZB77WqB0O
+1LMAEO3lWgiIrXH6STb4ymmpZUOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBShP9KbY1wL60j8B+XPD91P/sy4GTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB0
+65Ir9/A/YHu1OF+D9M1QFkSbPlCuMvc+RhBhcbwVVgIhALdeU2hIWYI5MiHZHIj1
+8lNkZWYeoiTi5sk8yUZsxYYM
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der
index acf2ec77968d2b..d0dc237eee6682 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem
index 1d8b58390affef..549b7993188c86 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOEgvo4uae/RUnOWFuPlK6lJLJLKORr6FPVacfvT1jo5oAoGCCqGSM49
-AwEHoUQDQgAEiTLSaEUeWF4D+30zfb/3PK9XI+/q11icWc+EIkrAC/apqrao1Ncz
-rcvLvLT6Vd7K9C3LGvxFGr+9zdVevVs0Pg==
+MHcCAQEEIHKtUlc8WckhPrC/mV5rAmHAYkn1LwzAOB//x/QQMaWvoAoGCCqGSM49
+AwEHoUQDQgAEJbiI50vL88CuAeAMblzkhb0S+AftedBT+HhcmN0V3eMXB0oxu1kH
+vtaoHQ7UswAQ7eVaCIitcfpJNvjKaallQw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
index dae7c1dceeb80b..818500fe2f8170 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a0030201020208513af27cdcf1c358300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004404980769696f95951acad22aa2f9a51199668064d24dd33e1fd892e4837e028f03c59ead4290e407cfb8085a2f7cf366f8cf7f9167d52a43c75c80693a5cf1fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020520301d0603551d0e0416041441dc4d2cba1fc6841120d60620520be47af0d01e301f0603551d230418301680140a14b5b79065f03168e1efe36e52a05ddc698965300a06082a8648ce3d04030203470030440220646dd1b6464247825e86a637bf87ae91fc367d34017dfc0ea00f1ea20ec971a502205c192fe0f0bf72b03ce9e1b4b3a6f40296ced3fa67693d4c5a12cecc985cce36",
-    "pai_cert": "308201bd30820164a003020102020838e6c3ef66e85bb3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200048932d268451e585e03fb7d337dbff73caf5723efead7589c59cf84224ac00bf6a9aab6a8d4d733adcbcbbcb4fa55decaf42dcb1afc451abfbdcdd55ebd5b343ea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604140a14b5b79065f03168e1efe36e52a05ddc698965301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022046124d18a397a3576b6f9a766d7e87dd2cc4554dffd95dd458cdff32050918d00220330a57ad23e5c13d136e304f0a30d4cc8e39a712c63ecc280846ce4b8bdd9934",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b1d85dfdff236be1dbd390eb8731977dcb0c83abfee9aad4da806ee67cc14d8c022019e4f0621388c03bb0c82b86e98e019b9f348c6743ff8e2e6bb9a1308111d427",
-    "dac_private_key": "f66344ade3c7612f906f36cb4580c6f3efe1ea7055febaa1643d1e18f06c42b5",
-    "dac_public_key": "04404980769696f95951acad22aa2f9a51199668064d24dd33e1fd892e4837e028f03c59ead4290e407cfb8085a2f7cf366f8cf7f9167d52a43c75c80693a5cf1f"
+    "dac_cert": "308201cf30820174a0030201020208453aabf562968676300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043f9bffe86b8bbd4f27bba8fe2d2e2ea13c3cf8baefe445120d40f2743252ef05a9eb4f537dc3e3bab8e11176798e917587f80cc28e2165ff56517e0ef7565ceba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020520301d0603551d0e0416041454179426b8d852bf643cd1a9df7bd2a2e1dd39d5301f0603551d23041830168014a13fd29b635c0beb48fc07e5cf0fdd4ffeccb819300a06082a8648ce3d0403020349003046022100d7644b392a207601bc845d037fbce4fa5ba245e77eab117e6c1ec82b04efb418022100f6001cf3421ee415f56bb9d5b5dc282915eae868bdfd8df8d41e8abfc33c9e26",
+    "pai_cert": "308201be30820164a00302010202086251272ee59c09f6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000425b888e74bcbf3c0ae01e00c6e5ce485bd12f807ed79d053f8785c98dd15dde317074a31bb5907bed6a81d0ed4b30010ede55a0888ad71fa4936f8ca69a96543a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a13fd29b635c0beb48fc07e5cf0fdd4ffeccb819301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022074eb922bf7f03f607bb5385f83f4cd5016449b3e50ae32f73e46106171bc1556022100b75e5368485982393221d91c88f5f2536465661ea224e2e6c93cc9466cc5860c",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f654e93ec3088c86d9bfb5bf43a83e39b4a0444d266eb0d2ac4f365b29795b6902207de15c476f0060ada890f16d4aa59d73b12195eb654b8e49987c78fbf2e4a3a9",
+    "dac_private_key": "612f879210a6b6a4a761a2336566c6e8bcd12319e25a535e2ec8800fd9f370b4",
+    "dac_public_key": "043f9bffe86b8bbd4f27bba8fe2d2e2ea13c3cf8baefe445120d40f2743252ef05a9eb4f537dc3e3bab8e11176798e917587f80cc28e2165ff56517e0ef7565ceb"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der
index 8e1382796469f3..179a413ef03e93 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der
index 5fbd5c10efa5fd..170aac2570d864 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
index bc8fc2d2f2706c..cb1aae4d2e049c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIAS5WQnv3DVYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIEFzJpffHmzgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQixov5rafkf+ZYBOhentHcmjH5mcVE
-Fy9vC9gnGWRtwuqjNDREVs2wUbTPFKeGAIVacbthRQFM6dR4kfKLq7FRo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIChDAdBgNVHQ4EFgQUDFUJB2px7z8u
-Q90FkCiX5iX2xRcwHwYDVR0jBBgwFoAUyHbdYrxgP9kEYhJ49LOJVG7QRkkwCgYI
-KoZIzj0EAwIDSAAwRQIhAK58rVCo2fWl3ZYkTpzloazK9IbexeSURa/+gKDkhYr/
-AiAQnEld/fs4iAKLpwVegypNV5okDU9/KZCi8ZvkfrVQOw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATElkJfuv068x1zIFHtXphRjWLztIAp
+FDFUSoEIplTxRWJbmJPfXHnZKg+Rt8cLHt+TuMB8yC1ITcO2kQX41Lcvo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIChDAdBgNVHQ4EFgQUEgbY7QCPx4UZ
+1nyLihEPdor+eyowHwYDVR0jBBgwFoAUoF8R/mi8GkUgKLc9LbYshaTGjiYwCgYI
+KoZIzj0EAwIDSAAwRQIgdZbk3r6RJU6dmMixTJprhWut7OZoRJn6NPL1Pn33hBkC
+IQDaIMbIrVnDJufmV55E34yXGNXipkYHAknrRD2YP7e5Qg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der
index dce8f06847695d..fecc6ebc8d4721 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
index 6d4a751d7e3244..b83d900c37ae5c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPSORMEWfjBnpST1D5SxCGAXPcAVTzQUKW8d/TJDAr0poAoGCCqGSM49
-AwEHoUQDQgAEIsaL+a2n5H/mWAToXp7R3Jox+ZnFRBcvbwvYJxlkbcLqozQ0RFbN
-sFG0zxSnhgCFWnG7YUUBTOnUeJHyi6uxUQ==
+MHcCAQEEIG3J9DoGDFKEi1zN2Hary9sENsGapb1z27J/itHl/T+GoAoGCCqGSM49
+AwEHoUQDQgAExJZCX7r9OvMdcyBR7V6YUY1i87SAKRQxVEqBCKZU8UViW5iT31x5
+2SoPkbfHCx7fk7jAfMgtSE3DtpEF+NS3Lw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der
index 2f6fd46323a320..96769eccacb8f5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
index a3d73ddca2a8f9..917d03d73c7a1f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIINH0+W+8pxyUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIIS62vBYyR3KowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABMGLdypkDy1LhsyUWHA6bH4NyZlsuOp7yPAxNzt+0ewj1gLymSJ6dwIIDoTc
-4pE91utncSg+UMIDxQUb58rtzEOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTIdt1ivGA/2QRiEnj0s4lUbtBGSTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBu
-PXz5tgejOTrd1vS/5AsPfh5OcXB38N1F+GCo+QnSBgIhAIRp841RnRKd2y3DlRQr
-60WSf+frZDyfBRaW9lSAIuWJ
+A0IABC74mTKv+McrY2USE6hPfvLkME1Mq6PvFlM/nRoMA92U2PH0jmp1OacubX0Y
+5JLSWCByvHykQhaO+qABuXEqnU2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSgXxH+aLwaRSAotz0ttiyFpMaOJjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB0
+KIzSf+DRUL3NsWaSJ7OTKFIyIYYb/DmGm6UbfOstXAIga9Piwn8L8EUlDZsMOd9Z
+NoA6j7rB2vFLJ0TF4dWRWvg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der
index 50168a6fa1d89b..eef244af59e08d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
index fc18452c49e097..237b69f733c483 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEID1/Hl9vwslfio4i3E8mehG2MnBSUZL52e0gqZcHNN0joAoGCCqGSM49
-AwEHoUQDQgAEwYt3KmQPLUuGzJRYcDpsfg3JmWy46nvI8DE3O37R7CPWAvKZInp3
-AggOhNzikT3W62dxKD5QwgPFBRvnyu3MQw==
+MHcCAQEEIJiE5akYkkk/sTLIDSkL/8P8Vk4zYminGJqddBCehLFtoAoGCCqGSM49
+AwEHoUQDQgAELviZMq/4xytjZRITqE9+8uQwTUyro+8WUz+dGgwD3ZTY8fSOanU5
+py5tfRjkktJYIHK8fKRCFo76oAG5cSqdTQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
index 4412d5ec9b68c0..20ddc1f2cb6a3a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208012e56427bf70d56300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000422c68bf9ada7e47fe65804e85e9ed1dc9a31f999c544172f6f0bd82719646dc2eaa334344456cdb051b4cf14a78600855a71bb6145014ce9d47891f28babb151a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020284301d0603551d0e041604140c5509076a71ef3f2e43dd05902897e625f6c517301f0603551d23041830168014c876dd62bc603fd904621278f4b389546ed04649300a06082a8648ce3d0403020348003045022100ae7cad50a8d9f5a5dd96244e9ce5a1accaf486dec5e49445affe80a0e4858aff0220109c495dfdfb3888028ba7055e832a4d579a240d4f7f2990a2f19be47eb5503b",
-    "pai_cert": "308201be30820164a0030201020208347d3e5bef29c725300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004c18b772a640f2d4b86cc9458703a6c7e0dc9996cb8ea7bc8f031373b7ed1ec23d602f299227a7702080e84dce2913dd6eb6771283e50c203c5051be7caedcc43a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c876dd62bc603fd904621278f4b389546ed04649301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206e3d7cf9b607a3393addd6f4bfe40b0f7e1e4e717077f0dd45f860a8f909d2060221008469f38d519d129ddb2dc395142beb45927fe7eb643c9f051696f6548022e589",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221009bfed41235cb42557a06dd76efc6c743d45ca05817693b06996e72d7787005e8022100a0c5b2d25ff54b9982d4de9e8f6339e5831260e0fa2fa144841a7732435443e5",
-    "dac_private_key": "f48e44c1167e3067a524f50f94b10860173dc0154f3414296f1dfd324302bd29",
-    "dac_public_key": "0422c68bf9ada7e47fe65804e85e9ed1dc9a31f999c544172f6f0bd82719646dc2eaa334344456cdb051b4cf14a78600855a71bb6145014ce9d47891f28babb151"
+    "dac_cert": "308201ce30820174a0030201020208105cc9a5f7c79b38300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c496425fbafd3af31d732051ed5e98518d62f3b480291431544a8108a654f145625b9893df5c79d92a0f91b7c70b1edf93b8c07cc82d484dc3b69105f8d4b72fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020284301d0603551d0e041604141206d8ed008fc78519d67c8b8a110f768afe7b2a301f0603551d23041830168014a05f11fe68bc1a452028b73d2db62c85a4c68e26300a06082a8648ce3d040302034800304502207596e4debe91254e9d98c8b14c9a6b856badece6684499fa34f2f53e7df78419022100da20c6c8ad59c326e7e6579e44df8c9718d5e2a646070249eb443d983fb7b942",
+    "pai_cert": "308201bd30820164a00302010202084badaf058c91dcaa300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042ef89932aff8c72b63651213a84f7ef2e4304d4caba3ef16533f9d1a0c03dd94d8f1f48e6a7539a72e6d7d18e492d2582072bc7ca442168efaa001b9712a9d4da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a05f11fe68bc1a452028b73d2db62c85a4c68e26301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022074288cd27fe0d150bdcdb1669227b39328523221861bfc39869ba51b7ceb2d5c02206bd3e2c27f0bf045250d9b0c39df5936803a8fbac1daf14b2744c5e1d5915af8",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f27491ed3abbac4375ee77fc53583a8efa8a899ec514c49a3a2e320cfafd8dd8022100faf829ef4b02257e2b22ab8e0b94faec89d10e9c64e16508e407477404ce67a4",
+    "dac_private_key": "6dc9f43a060c52848b5ccdd876abcbdb0436c19aa5bd73dbb27f8ad1e5fd3f86",
+    "dac_public_key": "04c496425fbafd3af31d732051ed5e98518d62f3b480291431544a8108a654f145625b9893df5c79d92a0f91b7c70b1edf93b8c07cc82d484dc3b69105f8d4b72f"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der
index 1a961872ed43ed..59c7bbab3d6ac9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der
index 0638f4e4a87d5f..2dae056e6c04fc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem
index f648919ac04a3b..7feab06342f937 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIA3y0+bi2ag0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIILLkbpYQ7XZ0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATyEO2ReEjvRsmmPsNoaVgDYZ+XT15p
-j68NF3jqQ0hpnJzWpy4rkZNKZTUzhE1Y2L+ZqhLxrT+YhZkW0FDvet1po1AwTjAM
-BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRxzff2wNg+dXKEwB9vVOBboOKplDAfBgNV
-HSMEGDAWgBTIFcN+HLILhztGKVYUmrUVLlsb6TAKBggqhkjOPQQDAgNIADBFAiBq
-c3MaLSkeqpKQbLs0MnIIFFmz8RW8vsXwHOA/y0UIIwIhANZi+6X62n6LxaUNlf0d
-/p/QtrAn5RxLQ162EYklYqpz
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS6f1g29eaOXxXJt8iKFYfuTN5sPFEL
+5T/8BqUUowmCmuGzq2c/TCk5Jz6iX6daTrGwafJRSeGijrvJM4KvJ5a1o1AwTjAM
+BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQVIWqdUt3bmeDdq1W1g9jlTopb/DAfBgNV
+HSMEGDAWgBRIFeSyHHp7Ykk3ee7gRUF7Mab04zAKBggqhkjOPQQDAgNIADBFAiBm
+nJBxL05ZjI4+5hdbIT+VcbmgkyDPfqQHetFX+I5sJQIhAPm468gvg8Hu5DR5g3KI
+dFonIfhop+Ph2AeKDLAd/ohO
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der
index f0cf119e2fefc6..09c0ba47ad4112 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem
index 30ac1b879ba158..ec116633045957 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICKJxV25Dgh9+t9qyyoBi7/jy+645R/B0mYaOZiMXKxnoAoGCCqGSM49
-AwEHoUQDQgAE8hDtkXhI70bJpj7DaGlYA2Gfl09eaY+vDRd46kNIaZyc1qcuK5GT
-SmU1M4RNWNi/maoS8a0/mIWZFtBQ73rdaQ==
+MHcCAQEEIGt1612Qt6fa16B3nrv7M9chALlRXWxnWT6flgVddtM1oAoGCCqGSM49
+AwEHoUQDQgAEun9YNvXmjl8VybfIihWH7kzebDxRC+U//AalFKMJgprhs6tnP0wp
+OSc+ol+nWk6xsGnyUUnhoo67yTOCryeWtQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der
index 7751df99b85a5c..414d4d00f8d37f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem
index eb9d02337f819e..224c13beea5be4 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIIwR9hccTZ10wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIZkLTNfx+qXwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPGankJUUXijN8RUWmy7+zD+cl8HfMInU1EPpx3LnVgM+etX/S176Eldfzsf
-JkGFTBTILuSZEKbk11T6Z8bO8P+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTIFcN+HLILhztGKVYUmrUVLlsb6TAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAU
-1M5KVLF6tw483Rn25CwDxGZnhVZhcVafmjOmUk60eQIhAN6De1B1R3wsWkOmyroD
-rL8B5aNHxkDvi/fiKU2Fnnyv
+A0IABJr6Hsmx2I4Cl4+H4JRTEKek9L4IK0XI2DzCnPOlrp+uzdg2XgbR4Rsx6z6S
+/RYwzdfPhWbaZZ6E/AQDrUxiOXajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRIFeSyHHp7Ykk3ee7gRUF7Mab04zAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+5QRyuuGFODrsrt8Na8XleLK5vwtFsagWx57fnXP8kooCIBH9kEEW0OguDhxmt4+k
+hHLcZQR5s08c/e2xKBcP3k9b
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der
index 691341f8c42577..f49c7f572671b0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem
index 33918539950f3c..defc1df07c5957 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIrW2aATVgQW3OnbGY9pyRD8S5LFo4qUNeNkakiLz+94oAoGCCqGSM49
-AwEHoUQDQgAE8ZqeQlRReKM3xFRabLv7MP5yXwd8widTUQ+nHcudWAz561f9LXvo
-SV1/Ox8mQYVMFMgu5JkQpuTXVPpnxs7w/w==
+MHcCAQEEIPmKKIgXtkj3f+ZW1o+UgcSEeO4T3Lm+hAcp/puWF6mmoAoGCCqGSM49
+AwEHoUQDQgAEmvoeybHYjgKXj4fglFMQp6T0vggrRcjYPMKc86Wun67N2DZeBtHh
+GzHrPpL9FjDN18+FZtplnoT8BAOtTGI5dg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json
index b36b2d76874a01..16b8cb406bb7eb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Key Usage extension",
     "is_success_case": "false",
-    "dac_cert": "308201be30820164a0030201020208037cb4f9b8b66a0d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f210ed917848ef46c9a63ec368695803619f974f5e698faf0d1778ea4348699c9cd6a72e2b91934a653533844d58d8bf99aa12f1ad3f98859916d050ef7add69a350304e300c0603551d130101ff04023000301d0603551d0e0416041471cdf7f6c0d83e757284c01f6f54e05ba0e2a994301f0603551d23041830168014c815c37e1cb20b873b462956149ab5152e5b1be9300a06082a8648ce3d040302034800304502206a73731a2d291eaa92906cbb343272081459b3f115bcbec5f01ce03fcb450823022100d662fba5fada7e8bc5a50d95fd1dfe9fd0b6b027e51c4b435eb611892562aa73",
-    "pai_cert": "308201be30820164a003020102020823047d85c713675d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f19a9e42545178a337c4545a6cbbfb30fe725f077cc22753510fa71dcb9d580cf9eb57fd2d7be8495d7f3b1f2641854c14c82ee49910a6e4d754fa67c6cef0ffa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c815c37e1cb20b873b462956149ab5152e5b1be9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022014d4ce4a54b17ab70e3cdd19f6e42c03c4666785566171569f9a33a6524eb479022100de837b5075477c2c5a43a6caba03acbf01e5a347c640ef8bf7e2294d859e7caf",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220552725d4e72b4d2952a9582b574080a827b79e29583fd349f8176e370712feaf02201625862eda92b65098e24d104cf9f8b57fad3b7e631abd7ef622591f2906a9ca",
-    "dac_private_key": "2289c55db90e087dfadf6acb2a018bbfe3cbeeb8e51fc1d2661a39988c5cac67",
-    "dac_public_key": "04f210ed917848ef46c9a63ec368695803619f974f5e698faf0d1778ea4348699c9cd6a72e2b91934a653533844d58d8bf99aa12f1ad3f98859916d050ef7add69"
+    "dac_cert": "308201be30820164a00302010202082cb91ba5843b5d9d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ba7f5836f5e68e5f15c9b7c88a1587ee4cde6c3c510be53ffc06a514a309829ae1b3ab673f4c2939273ea25fa75a4eb1b069f25149e1a28ebbc93382af2796b5a350304e300c0603551d130101ff04023000301d0603551d0e0416041415216a9d52dddb99e0ddab55b583d8e54e8a5bfc301f0603551d230418301680144815e4b21c7a7b62493779eee045417b31a6f4e3300a06082a8648ce3d04030203480030450220669c90712f4e598c8e3ee6175b213f9571b9a09320cf7ea4077ad157f88e6c25022100f9b8ebc82f83c1eee43479837288745a2721f868a7e3e1d8078a0cb01dfe884e",
+    "pai_cert": "308201be30820164a00302010202086642d335fc7ea97c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049afa1ec9b1d88e02978f87e0945310a7a4f4be082b45c8d83cc29cf3a5ae9faecdd8365e06d1e11b31eb3e92fd1630cdd7cf8566da659e84fc0403ad4c623976a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144815e4b21c7a7b62493779eee045417b31a6f4e3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e50472bae185383aecaedf0d6bc5e578b2b9bf0b45b1a816c79edf9d73fc928a022011fd904116d0e82e0e1c66b78fa48472dc650479b34f1cfdedb128170fde4f5b",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e7e2133661819f1fda524215132e8cef6ae8eafaeb086e0cdfadc71f84a94d35022100894acf7d1e121dd659f1798ffd532d8267996437fb2be132699ea8bca2386acf",
+    "dac_private_key": "6b75eb5d90b7a7dad7a0779ebbfb33d72100b9515d6c67593e9f96055d76d335",
+    "dac_public_key": "04ba7f5836f5e68e5f15c9b7c88a1587ee4cde6c3c510be53ffc06a514a309829ae1b3ab673f4c2939273ea25fa75a4eb1b069f25149e1a28ebbc93382af2796b5"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der
index 47440f53691bff..0f75249fcfc9f6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der
index 151a1d3bbdf0fb..b18f607eedb6d3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem
index 1dc2e6c9836d0b..c8a285ae92ab7a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrjCCAVWgAwIBAgIIeZ66Jfr6yckwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBrjCCAVWgAwIBAgIIGlc9slQjp0gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARaMF99616kDAuvr63HogWoSsnNimM5
-m2oDBotMkCL5fo0JYcwp1MoK5FA2Nw7KEVGYrJnACqlBDr3BeSC7A75go0EwPzAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAfBgNVHSMEGDAWgBT8LwenSXt/
-UaDF7Mpz0NbhJXCY8jAKBggqhkjOPQQDAgNHADBEAiBMNVxqPTm7Vs1BLrTmm0NH
-60Z4mVKBAaxK6Yi2eVFqtgIgeJi5mfl92dVfBd+gtu1hUbqzv3MrdXLSWHifB8OL
-X3I=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHlbKCWxGqTA6BgUw1hnMptlyEmEw6
+ntu2Us8Pa9FKC2sK+RRVYQqNy+2RVE9B0U8KjQkxF/7C2yGiHpqjIjwHo0EwPzAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAfBgNVHSMEGDAWgBQ5CIys5asK
+uUW4Fe4KhIQzdzP6XjAKBggqhkjOPQQDAgNHADBEAiA6+wVv41VQKm+oJRoHF7F3
+Q3tYuUKCCIGo9KreceA/bgIgYlGOAuTf1iWyTyC1p3sq+oKEJ+YXBhZcKaNuyjrn
+aMA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der
index a161af1e8c5d89..bfeb09651ed853 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem
index 983b9d4150b51a..15386d4d57358f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDBQp1qiOaEF0Tl9Wdq+amD9ODvEzPckVOnrTBE8SR2ToAoGCCqGSM49
-AwEHoUQDQgAEWjBffetepAwLr6+tx6IFqErJzYpjOZtqAwaLTJAi+X6NCWHMKdTK
-CuRQNjcOyhFRmKyZwAqpQQ69wXkguwO+YA==
+MHcCAQEEIMXFNJsIIpOdeWsJSh/YXjUggHJUqE0EYUUU3WZsT9SsoAoGCCqGSM49
+AwEHoUQDQgAEB5WyglsRqkwOgYFMNYZzKbZchJhMOp7btlLPD2vRSgtrCvkUVWEK
+jcvtkVRPQdFPCo0JMRf+wtshoh6aoyI8Bw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der
index 8215f09fa7b197..55050d57802d87 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem
index 8cc31bfffcba6e..60986d6c054633 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIBQOz0+usZc4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIICBfIudGa3bYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABBe4t64HPxkkB1J2b1trX2038cv6MBv/DBqWuTnrz6zWlFNpdJYdD69KrSdU
-0dv5aphFfYLyhMbK4j+7SDTVHUajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBT8LwenSXt/UaDF7Mpz0NbhJXCY8jAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB7
-w7OoZRT7QZbW/IjFAerzGgZnMr8CwnpdyTTe7oCSQwIgf6/HMslDzdXLd8YXzPNZ
-Vl1WLxLYu1pNms5qpQXixJ4=
+A0IABGsLnAET681H1jjmO8ZKp6D/QCt/22ezzUgNphtkwnN1TMc9QAJKFmgAgooU
+9Ak1NGJengqV0vgT+aY5dYJC/mSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQ5CIys5asKuUW4Fe4KhIQzdzP6XjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+pw4Ao5XDw1ryYrCsQDDWsqyaJlUf2CS5zKTql+CptHMCIQCSqxRjutpEUIYnK0Iz
+WmzQ5Fbcuhp5dFebGRlywOjFKw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der
index b3b3eb1036aa06..34dba0b872ff61 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem
index b1d417b4d41f94..c277ece82908f1 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII4wA4W5EbBT5ukkUj/z4g3LrR5h9NTZ0CbtVvU65TDooAoGCCqGSM49
-AwEHoUQDQgAEF7i3rgc/GSQHUnZvW2tfbTfxy/owG/8MGpa5OevPrNaUU2l0lh0P
-r0qtJ1TR2/lqmEV9gvKExsriP7tINNUdRg==
+MHcCAQEEIEf+cUcFqaCdxib5MzieWphhOturjsNeoHdadtTJMU8zoAoGCCqGSM49
+AwEHoUQDQgAEawucARPrzUfWOOY7xkqnoP9AK3/bZ7PNSA2mG2TCc3VMxz1AAkoW
+aACCihT0CTU0Yl6eCpXS+BP5pjl1gkL+ZA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json
index 103085cbbd4a11..ef18ed644bb330 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Subject Key ID (SKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ae30820155a0030201020208799eba25fafac9c9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045a305f7deb5ea40c0bafafadc7a205a84ac9cd8a63399b6a03068b4c9022f97e8d0961cc29d4ca0ae45036370eca115198ac99c00aa9410ebdc17920bb03be60a341303f300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301f0603551d23041830168014fc2f07a7497b7f51a0c5ecca73d0d6e1257098f2300a06082a8648ce3d040302034700304402204c355c6a3d39bb56cd412eb4e69b4347eb467899528101ac4ae988b679516ab602207898b999f97dd9d55f05dfa0b6ed6151bab3bf732b7572d258789f07c38b5f72",
-    "pai_cert": "308201bd30820164a00302010202080503b3d3ebac65ce300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000417b8b7ae073f19240752766f5b6b5f6d37f1cbfa301bff0c1a96b939ebcfacd694536974961d0faf4aad2754d1dbf96a98457d82f284c6cae23fbb4834d51d46a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414fc2f07a7497b7f51a0c5ecca73d0d6e1257098f2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207bc3b3a86514fb4196d6fc88c501eaf31a066732bf02c27a5dc934deee80924302207fafc732c943cdd5cb77c617ccf359565d562f12d8bb5a4d9ace6aa505e2c49e",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022041f14cbf2ec70d10970853d9017663d79f14f7470cb4d133238032f1cf3dd48102210080f2f24b889f0d9cdcdcf70950ad25fa7339fd5ec436fbb8e16b925723edbf9c",
-    "dac_private_key": "3050a75aa239a105d1397d59dabe6a60fd383bc4ccf72454e9eb4c113c491d93",
-    "dac_public_key": "045a305f7deb5ea40c0bafafadc7a205a84ac9cd8a63399b6a03068b4c9022f97e8d0961cc29d4ca0ae45036370eca115198ac99c00aa9410ebdc17920bb03be60"
+    "dac_cert": "308201ae30820155a00302010202081a573db25423a748300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040795b2825b11aa4c0e81814c35867329b65c84984c3a9edbb652cf0f6bd14a0b6b0af91455610a8dcbed91544f41d14f0a8d093117fec2db21a21e9aa3223c07a341303f300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301f0603551d2304183016801439088cace5ab0ab945b815ee0a8484337733fa5e300a06082a8648ce3d040302034700304402203afb056fe355502a6fa8251a0717b177437b58b942820881a8f4aade71e03f6e022062518e02e4dfd625b24f20b5a77b2afa828427e61706165c29a36eca3ae768c0",
+    "pai_cert": "308201bf30820164a00302010202080817c8b9d19addb6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046b0b9c0113ebcd47d638e63bc64aa7a0ff402b7fdb67b3cd480da61b64c273754cc73d40024a166800828a14f4093534625e9e0a95d2f813f9a639758242fe64a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041439088cace5ab0ab945b815ee0a8484337733fa5e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a70e00a395c3c35af262b0ac4030d6b2ac9a26551fd824b9cca4ea97e0a9b47302210092ab1463bada445086272b42335a6cd0e456dcba1a7974579b191972c0e8c52b",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402204ffce6c7e7a792ed9ddad787378d6d9248d720650f62bb3ddb5ff521743fac56022063ce1f4a2408dffbb08b5eccd6a4f57c7269ae09c77bee48377d31918c4de4b1",
+    "dac_private_key": "c5c5349b0822939d796b094a1fd85e3520807254a84d04614514dd666c4fd4ac",
+    "dac_public_key": "040795b2825b11aa4c0e81814c35867329b65c84984c3a9edbb652cf0f6bd14a0b6b0af91455610a8dcbed91544f41d14f0a8d093117fec2db21a21e9aa3223c07"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der
index d9293cb64030e4..0e8ac94af047c4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der
index 4c946ca849269c..5e5e2b67e6a511 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem
index 81a67ce9250fed..8f4f7d8250761e 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYmgAwIBAgIIM+xsoXG2qn8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB5DCCAYmgAwIBAgIIRfaSIY6J8V8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9oXXzJADguKDVz2YrAyzfI6SCuUIt
-TODUcZLIiWHWfYTFlDQpR4WFFBTSawazGjHZOUDYWtPdYwr87xrxkrXdo3UwczAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUPUu04WEWmnQP
-7qNLyp+A+v50f08wHwYDVR0jBBgwFoAUplhcvJ3tRa9Vocsf/XJ2LLUbigEwEwYD
-VR0RBAwwCoIIdGVzdC5jb20wCgYIKoZIzj0EAwIDSAAwRQIgO4MnzG1/+oeBxqS1
-2ScbBlzj6Bf2c7nPhL7EVp+gQ0ECIQCbZR575IrCRwVwD0DmB8k9c/JadQ0u6Kfo
-gnlFS/cwJA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQsZfk1vx9JVGg4yqRKUiF1NC2EVz/X
+lXYzDN6nhL8vmngKLUHyWdJZ47ik0eHaFqxGzLyZwi0K5z0unVWX9vv+o3UwczAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUyPtKUTm+9d0f
+w/NPJWS3V7pYWMEwHwYDVR0jBBgwFoAUfp4Qg3A+Rf68BJv0srQyNJumFI0wEwYD
+VR0RBAwwCoIIdGVzdC5jb20wCgYIKoZIzj0EAwIDSQAwRgIhAPKtbSlS/CUqoALM
+ViBzRB6jWpgVs5SljrwyL5Y3KOV6AiEA7wcll3tpdHVf4FOjTrk/ijyJN9w5Akcw
+HrMrOk6ZjeA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der
index e23808824f9b32..1d652ffc244544 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem
index 0afa574e7aa441..d7e2fe55358dab 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJMK22LlKR8AyIoNidQPw2wdmC3cWOBcyTjK5M6uuABhoAoGCCqGSM49
-AwEHoUQDQgAE/aF18yQA4Lig1c9mKwMs3yOkgrlCLUzg1HGSyIlh1n2ExZQ0KUeF
-hRQU0msGsxox2TlA2FrT3WMK/O8a8ZK13Q==
+MHcCAQEEIMAhzEh3vaeiQZKyZD+cFylGQ4W9gz2ChO0cZbioyLOPoAoGCCqGSM49
+AwEHoUQDQgAELGX5Nb8fSVRoOMqkSlIhdTQthFc/15V2Mwzep4S/L5p4Ci1B8lnS
+WeO4pNHh2hasRsy8mcItCuc9Lp1Vl/b7/g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der
index 6a8d643eb0c682..ef48333b6c8686 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem
index 768032784b9271..e2e8fabf093dc7 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIAR/N/IEcfv4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIILsk2KTIGzpEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABG1YQSfoc7dgdOkYarcSXaCUD38W2tuv15dHbghachcQfCWUx/kTvBmFyp7D
-ByydwDH0Jp/Wqw0TZxWHbeTAyRijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSmWFy8ne1Fr1Whyx/9cnYstRuKATAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBc
-Sp5CYvSPh03a5QfIbKVog7tFa9zXOg/63KUa7+gzlgIhALV1+k/Amxl5Qg0CAWYl
-vyXXAar11+j0clgKxRtoBk0D
+A0IABKBmpj+u8FCGFVqSO1AY7jg7oNpbToNo724jBSt6chqMmjQ7MaLTbmGrxelB
+984rTi2cqdUk9+mu1Faluep0X1SjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR+nhCDcD5F/rwEm/SytDI0m6YUjTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+6t4xireComCYqzF9hyAwtJWxut3ECR+5wux5EFhr1cECIQCq+1cY0e3c+Eck84fL
+fKdtCFguzM/LOhMDZODctyYxJA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der
index 7dae7039a45c4d..6e22c0b39292ff 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem
index 4d72da125a70f4..9596ab1ea364ad 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIZO4FSjKL6SCESftBNKGp2BmmxJ4Erxuckar4EFtMeioAoGCCqGSM49
-AwEHoUQDQgAEbVhBJ+hzt2B06RhqtxJdoJQPfxba26/Xl0duCFpyFxB8JZTH+RO8
-GYXKnsMHLJ3AMfQmn9arDRNnFYdt5MDJGA==
+MHcCAQEEIFuH8xIrG5j3/FFrsuVC/VrqEBPhXg0XR/w0+zmdIIJ3oAoGCCqGSM49
+AwEHoUQDQgAEoGamP67wUIYVWpI7UBjuODug2ltOg2jvbiMFK3pyGoyaNDsxotNu
+YavF6UH3zitOLZyp1ST36a7UVqW56nRfVA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json
index f8802300beaac3..7d6a14beb80a14 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate includes optional Subject Alternative Name extension",
     "is_success_case": "true",
-    "dac_cert": "308201e330820189a003020102020833ec6ca171b6aa7f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fda175f32400e0b8a0d5cf662b032cdf23a482b9422d4ce0d47192c88961d67d84c59434294785851414d26b06b31a31d93940d85ad3dd630afcef1af192b5dda3753073300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143d4bb4e161169a740feea34bca9f80fafe747f4f301f0603551d23041830168014a6585cbc9ded45af55a1cb1ffd72762cb51b8a0130130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d040302034800304502203b8327cc6d7ffa8781c6a4b5d9271b065ce3e817f673b9cf84bec4569fa043410221009b651e7be48ac24705700f40e607c93d73f25a750d2ee8a7e88279454bf73024",
-    "pai_cert": "308201be30820164a0030201020208011fcdfc811c7efe300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046d584127e873b76074e9186ab7125da0940f7f16dadbafd797476e085a7217107c2594c7f913bc1985ca9ec3072c9dc031f4269fd6ab0d136715876de4c0c918a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414a6585cbc9ded45af55a1cb1ffd72762cb51b8a01301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205c4a9e4262f48f874ddae507c86ca56883bb456bdcd73a0ffadca51aefe83396022100b575fa4fc09b1979420d02016625bf25d701aaf5d7e8f472580ac51b68064d03",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207b94ccea0557ed0fca6863ee9699286b349012ec5586112a23008883306df068022100ab8599eaf96edf5430bf1edc4eddae349c4682de58c3e0bab73a416c1a809551",
-    "dac_private_key": "930adb62e5291f00c88a0d89d40fc36c1d982ddc58e05cc938cae4ceaeb80061",
-    "dac_public_key": "04fda175f32400e0b8a0d5cf662b032cdf23a482b9422d4ce0d47192c88961d67d84c59434294785851414d26b06b31a31d93940d85ad3dd630afcef1af192b5dd"
+    "dac_cert": "308201e430820189a003020102020845f692218e89f15f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042c65f935bf1f49546838caa44a522175342d84573fd79576330cdea784bf2f9a780a2d41f259d259e3b8a4d1e1da16ac46ccbc99c22d0ae73d2e9d5597f6fbfea3753073300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c8fb4a5139bef5dd1fc3f34f2564b757ba5858c1301f0603551d230418301680147e9e1083703e45febc049bf4b2b432349ba6148d30130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d0403020349003046022100f2ad6d2952fc252aa002cc562073441ea35a9815b394a58ebc322f963728e57a022100ef0725977b6974755fe053a34eb93f8a3c8937dc390247301eb32b3a4e998de0",
+    "pai_cert": "308201bf30820164a00302010202082ec936293206ce91300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a066a63faef05086155a923b5018ee383ba0da5b4e8368ef6e23052b7a721a8c9a343b31a2d36e61abc5e941f7ce2b4e2d9ca9d524f7e9aed456a5b9ea745f54a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147e9e1083703e45febc049bf4b2b432349ba6148d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100eade318ab782a26098ab317d872030b495b1baddc4091fb9c2ec7910586bd5c1022100aafb5718d1eddcf84724f387cb7ca76d08582ecccfcb3a130364e0dcb7263124",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c3756e4dbb639c1e83d81345ed34031786203befc59e233c611cab89e8111da1022100df2d1359b26745dab9ca98c09c50c8efa2e1c489519ea8fe5fc9d0f02e364ef2",
+    "dac_private_key": "c021cc4877bda7a24192b2643f9c1729464385bd833d8284ed1c65b8a8c8b38f",
+    "dac_public_key": "042c65f935bf1f49546838caa44a522175342d84573fd79576330cdea784bf2f9a780a2d41f259d259e3b8a4d1e1da16ac46ccbc99c22d0ae73d2e9d5597f6fbfe"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der
index d48259c268ed37..61ff3b2cb30548 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der
index 35e87e196e1439..c7318442efc012 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem
index eb2bd5ef87ae0a..cbbb2b26e2757a 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByzCCAXOgAwIBAgIIM5gk1idb9GAwCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
-YXR0ZXIgVGVzdCBQQUkxFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDQyMDAw
+MIIBzTCCAXOgAwIBAgIIZOkhOS6cNu8wCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUkxFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDUyNzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEODAwMDBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABJqpN9xIz/t2V0aVOzvjBGlTcEKhKVGN
-Ro222SoB91tGOm6fe5Vty1FtcAokUzc9xmF1LYtIGSY+25Rek5irn7WjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTEG8rXyBGxKw2p
-oiD3Uof4IBmb8TAfBgNVHSMEGDAWgBQEmm6avssC9OIFC2TUBE54rpoHcjAJBgcq
-hkjOPQQBA0cAMEQCIGolajtuVVBqeqBCCj0Pp6v+pmCmcskonGS4XJzc4ZmnAiAv
-3KgZRYl0033QpAtg+4hZHOtNcElWarZXH9n8eDnbrA==
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABPa/jDt5YdRXzkFr00w0R/eYVOgJV7n7
+OfsZcgVfKUl6Bv7gxuxtCD1eDpVdrqwr2h0imGiRQdpk4Tdx3FDw7eejYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRvSyB3xwOj2X4s
+fQ98MJydsSq7szAfBgNVHSMEGDAWgBQkMl4urCjCKtvIQr7zl4o9DmcycTAJBgcq
+hkjOPQQBA0kAMEYCIQC3G4X7yLj2kzDKA1djCEeq5G7VUSXhD+wwupBAcKMtcQIh
+AL2qBylyXP+xcHmu5bxpF69Ukcpk9F3cL3GGBtcPHDet
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der
index 1db8e9eac5d2fb..224a554b879964 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem
index 8c98517038cb7b..99735db9e1a741 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMfRhXpvxLKIKeAbNide/e918zaymPb/2A7ADUZ7x2mGoAoGCCqGSM49
-AwEHoUQDQgAEmqk33EjP+3ZXRpU7O+MEaVNwQqEpUY1GjbbZKgH3W0Y6bp97lW3L
-UW1wCiRTNz3GYXUti0gZJj7blF6TmKuftQ==
+MHcCAQEEIOeLKTSt/scQx8V+xT+a9TFgVtOfsEXBkUpkr5RVyIz9oAoGCCqGSM49
+AwEHoUQDQgAE9r+MO3lh1FfOQWvTTDRH95hU6AlXufs5+xlyBV8pSXoG/uDG7G0I
+PV4OlV2urCvaHSKYaJFB2mThN3HcUPDt5w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der
index edfe4ca3e1ca2f..c083bcff33fe9b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem
index a5de7f2fe50825..d337c05e0b2ca5 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIJKpVuBhNEYUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIISA2vSOhUggAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABO07jgmIurHX8isdVn/eXijejRGIrhbY2zWwNSTI3itqZxmxtz4ToFAkT3pJ
-bAqymLk40/hR/GX87IwnM1H51K6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQEmm6avssC9OIFC2TUBE54rpoHcjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-vBOJV9xWVZf6vLD1XXNeY5GbPhR15ohgy3/nYldq1MICIE2q4TSV3rBLLOKivD4z
-AgjsKZiLnr9m6jv4paMpjZTw
+A0IABKJjppI89wiEAunU0VMDT8RwCHQSf74fgLqcIO+nK4lXOYR1p1iV+p4mMQEO
+Ov3alGGMvgwGNhcFSKgF7k5iFoyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQkMl4urCjCKtvIQr7zl4o9DmcycTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBl
++YVo5zU9Cbx+eI91MF6IE4U73odyUbIQC72mdlit8AIgWfNXPbPFQJIZ+XEpVgt5
+9oN9vdxBvb0BQJhLbQsBpF8=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der
index 8a313c4aecdfc4..5bd2dba47df920 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem
index 515ccf6836c222..ee9fb2e3549805 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDWwtcylG53VioB5wZcE2M/sra17QenGQYkRkhGrC9k2oAoGCCqGSM49
-AwEHoUQDQgAE7TuOCYi6sdfyKx1Wf95eKN6NEYiuFtjbNbA1JMjeK2pnGbG3PhOg
-UCRPeklsCrKYuTjT+FH8ZfzsjCczUfnUrg==
+MHcCAQEEIMFatehvoLd72z4eDWMZZRMKVd0h/1XiV/jytZ8B1FXEoAoGCCqGSM49
+AwEHoUQDQgAEomOmkjz3CIQC6dTRUwNPxHAIdBJ/vh+Aupwg76criVc5hHWnWJX6
+niYxAQ46/dqUYYy+DAY2FwVIqAXuTmIWjA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
index 844b4a2ee4b82d..7222caa29cab5a 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Invalid certificate signature algorithm ECDSA_WITH_SHA1",
     "is_success_case": "false",
-    "dac_cert": "308201cb30820173a0030201020208339824d6275bf460300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049aa937dc48cffb765746953b3be30469537042a129518d468db6d92a01f75b463a6e9f7b956dcb516d700a2453373dc661752d8b4819263edb945e9398ab9fb5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c41bcad7c811b12b0da9a220f75287f820199bf1301f0603551d23041830168014049a6e9abecb02f4e2050b64d4044e78ae9a0772300906072a8648ce3d0401034700304402206a256a3b6e55506a7aa0420a3d0fa7abfea660a672c9289c64b85c9cdce199a702202fdca819458974d37dd0a40b60fb88591ceb4d7049566ab6571fd9fc7839dbac",
-    "pai_cert": "308201be30820164a003020102020824aa55b8184d1185300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ed3b8e0988bab1d7f22b1d567fde5e28de8d1188ae16d8db35b03524c8de2b6a6719b1b73e13a050244f7a496c0ab298b938d3f851fc65fcec8c273351f9d4aea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414049a6e9abecb02f4e2050b64d4044e78ae9a0772301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100bc138957dc565597fabcb0f55d735e63919b3e1475e68860cb7fe762576ad4c202204daae13495deb04b2ce2a2bc3e330208ec29988b9ebf66ea3bf8a5a3298d94f0",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202af1c292f16ed2e108bebf15144b3e87737f6f6f7684945ad33b6d532511038c022052f961fcc7ce146e7d6efbb5a26618c6e3b32a4e615660fb47c02468553494dc",
-    "dac_private_key": "c7d1857a6fc4b28829e01b36275efdef75f336b298f6ffd80ec00d467bc76986",
-    "dac_public_key": "049aa937dc48cffb765746953b3be30469537042a129518d468db6d92a01f75b463a6e9f7b956dcb516d700a2453373dc661752d8b4819263edb945e9398ab9fb5"
+    "dac_cert": "308201cd30820173a003020102020864e921392e9c36ef300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f6bf8c3b7961d457ce416bd34c3447f79854e80957b9fb39fb1972055f29497a06fee0c6ec6d083d5e0e955daeac2bda1d2298689141da64e13771dc50f0ede7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146f4b2077c703a3d97e2c7d0f7c309c9db12abbb3301f0603551d2304183016801424325e2eac28c22adbc842bef3978a3d0e673271300906072a8648ce3d04010349003046022100b71b85fbc8b8f69330ca0357630847aae46ed55125e10fec30ba904070a32d71022100bdaa0729725cffb17079aee5bc6917af5491ca64f45ddc2f718606d70f1c37ad",
+    "pai_cert": "308201bd30820164a0030201020208480daf48e8548200300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a263a6923cf7088402e9d4d153034fc4700874127fbe1f80ba9c20efa72b8957398475a75895fa9e2631010e3afdda94618cbe0c0636170548a805ee4e62168ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041424325e2eac28c22adbc842bef3978a3d0e673271301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022065f98568e7353d09bc7e788f75305e8813853bde877251b2100bbda67658adf0022059f3573db3c5409219f97129560b79f6837dbddc41bdbd0140984b6d0b01a45f",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207db8196bf7bfa3fc9db3cc81e3f7f2003cde0585785d170aae33aaba2662ee1f0220289383c5abb56e1feaaad03ba788408138412b32f471efa0aee59342e593ad86",
+    "dac_private_key": "e78b2934adfec710c7c57ec53f9af5316056d39fb045c1914a64af9455c88cfd",
+    "dac_public_key": "04f6bf8c3b7961d457ce416bd34c3447f79854e80957b9fb39fb1972055f29497a06fee0c6ec6d083d5e0e955daeac2bda1d2298689141da64e13771dc50f0ede7"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der
index 6616985fcfa31d..a0885e61cb31b5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der
index b18ae808e19cf7..4c86fdf241335d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem
index fc5cc45fb3e9eb..93006e265965b1 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIPWAiOWrKUWIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIDtn0ZNFj3d4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQFZ+vEXJHU0iQ4vq9InW77s1a6ONcz
-9SBF07RLN5aY4RNmGQWT+EXnR6Kuebb+tgbFV12sjoXUyOwWncJhcUHao2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUU8rdAIeJm5X8
-20UYVuwV7pM/V4AwHwYDVR0jBBgwFoAUhm+oOJERBAmS6NXRIoNt7niIygcwCgYI
-KoZIzj0EAwIDRwAwRAIgJupJPWj9lzPejtI4LEzwBIw7ryJ4+lIRNKmpCxM7Z9kC
-IGOKAaLlJbQARBkMu8m63ZQfocmfa1bgspgfv+PKl8um
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHg/DNkZfGO3K5LBB0OdvVQW3Hs//6
+XOvsuoozDFAD56PVeBvw7GRlkY2ugHaRzplU33Ouj2wrh5gXjUMYNvoNo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU1ThDaSHHTVqW
+HksAReX+wfTbpU8wHwYDVR0jBBgwFoAURjh3OZIs0mEGtN4nboM1uIy0ETcwCgYI
+KoZIzj0EAwIDRwAwRAIgYER1KIA2ZckgXRia0VaGsUQlzGaauwVGUd0CnF6Qkr4C
+IAr0dfIWe/jesFVVB/mMInnKd4TJEN825RGt1Ie7qY0I
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der
index dff6da6b07749e..43a0694663a6fc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem
index df5f005244d266..a37e26b7e8e3c1 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJNwzPjJD0JDQ6Kq+OzaeBzorQ2u2iJQOWYMuwEMYd/5oAoGCCqGSM49
-AwEHoUQDQgAEBWfrxFyR1NIkOL6vSJ1u+7NWujjXM/UgRdO0SzeWmOETZhkFk/hF
-50eirnm2/rYGxVddrI6F1MjsFp3CYXFB2g==
+MHcCAQEEII4WzvHK9FreCqhXlsdhEQxJLkBOpWIh2ZEAqcm0Wqw/oAoGCCqGSM49
+AwEHoUQDQgAEB4PwzZGXxjtyuSwQdDnb1UFtx7P/+lzr7LqKMwxQA+ej1Xgb8Oxk
+ZZGNroB2kc6ZVN9zro9sK4eYF41DGDb6DQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der
index 4ac04099c28a7b..484ae5e928aab2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem
index 6cb86f62cd72a7..a4c7cef03367b4 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIajoXVzMNr84wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIEck8NSOx/fgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCvmYW41PLNi0N7TvI+ws4BxQj5XptmSmKkzM7yjg7q4bcBFW6riN1whNonE
-KK2fvKDY9vg1yPrNZLAHJwt61XqjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSGb6g4kREECZLo1dEig23ueIjKBzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBy
-gj7E+oGHZSAR09hl5Vw11hKEwb/RMh6n2XJNikotugIgfoJcXS9X1x/QPMliIoSn
-uN4StVhXpDtyifSTeY51lOs=
+A0IABAa9cWzC6CDxPUrVLJ5xzu6Yho/Q8+hP0dfIpFmpvNPSNAQXTKNZhOd1d5IA
+IwW3wgT1AqKfwSAKpwZDdr3rwLSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRGOHc5kizSYQa03idugzW4jLQRNzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA9
+x0uVw4MZl7AN9ODcD8r+zCERKGIsVvEsU2PH6Qd2sgIhANz7ahBkuTOuuvkjqJsU
+VAQ4jaaiY1C3AjkylJu5BBKo
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der
index 17451d2168625f..3e45eb11e28b25 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem
index 113e8db14e5532..92c50431ae0006 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILJJ/KqisrZwdxtAqPbz1G+qH7g1YMwZUQIGGQiNjKbIoAoGCCqGSM49
-AwEHoUQDQgAEK+ZhbjU8s2LQ3tO8j7CzgHFCPlem2ZKYqTMzvKODurhtwEVbquI3
-XCE2icQorZ+8oNj2+DXI+s1ksAcnC3rVeg==
+MHcCAQEEIOa4LBuTaiKtIoTiGBf/H6oG7feGoQqDZ3Mg5r62huHvoAoGCCqGSM49
+AwEHoUQDQgAEBr1xbMLoIPE9StUsnnHO7piGj9Dz6E/R18ikWam809I0BBdMo1mE
+53V3kgAjBbfCBPUCop/BIAqnBkN2vevAtA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json
index 8d3c02ef261864..47f9e9b3f3362c 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Valid certificate signature algorithm ECDSA_WITH_SHA256",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a00302010202083d6022396aca5162300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040567ebc45c91d4d22438beaf489d6efbb356ba38d733f52045d3b44b379698e11366190593f845e747a2ae79b6feb606c5575dac8e85d4c8ec169dc2617141daa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041453cadd0087899b95fcdb451856ec15ee933f5780301f0603551d23041830168014866fa8389111040992e8d5d122836dee7888ca07300a06082a8648ce3d0403020347003044022026ea493d68fd9733de8ed2382c4cf0048c3baf2278fa521134a9a90b133b67d90220638a01a2e525b40044190cbbc9badd941fa1c99f6b56e0b2981fbfe3ca97cba6",
-    "pai_cert": "308201bd30820164a00302010202086a3a1757330dafce300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042be6616e353cb362d0ded3bc8fb0b38071423e57a6d99298a93333bca383bab86dc0455baae2375c213689c428ad9fbca0d8f6f835c8facd64b007270b7ad57aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414866fa8389111040992e8d5d122836dee7888ca07301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022072823ec4fa8187652011d3d865e55c35d61284c1bfd1321ea7d9724d8a4a2dba02207e825c5d2f57d71fd03cc9622284a7b8de12b55857a43b7289f493798e7594eb",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210099ee26f82318624ae22f5e05a744ace27c846023c9df5c6125305f8aaa35d98f02202665265acfca111fdf50ec6291c7cf9482b0a6c6bf47b303ec5478d146e2a5e0",
-    "dac_private_key": "9370ccf8c90f424343a2aaf8ecda781ce8ad0daeda225039660cbb010c61dff9",
-    "dac_public_key": "040567ebc45c91d4d22438beaf489d6efbb356ba38d733f52045d3b44b379698e11366190593f845e747a2ae79b6feb606c5575dac8e85d4c8ec169dc2617141da"
+    "dac_cert": "308201cd30820174a00302010202080ed9f464d163ddde300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040783f0cd9197c63b72b92c107439dbd5416dc7b3fffa5cebecba8a330c5003e7a3d5781bf0ec6465918dae807691ce9954df73ae8f6c2b8798178d431836fa0da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d538436921c74d5a961e4b0045e5fec1f4dba54f301f0603551d2304183016801446387739922cd26106b4de276e8335b88cb41137300a06082a8648ce3d0403020347003044022060447528803665c9205d189ad15686b14425cc669abb054651dd029c5e9092be02200af475f2167bf8deb0555507f98c2279ca7784c910df36e511add487bba98d08",
+    "pai_cert": "308201be30820164a003020102020811c93c3523b1fdf8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000406bd716cc2e820f13d4ad52c9e71ceee98868fd0f3e84fd1d7c8a459a9bcd3d23404174ca35984e7757792002305b7c204f502a29fc1200aa7064376bdebc0b4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041446387739922cd26106b4de276e8335b88cb41137301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203dc74b95c3831997b00df4e0dc0fcafecc211128622c56f12c5363c7e90776b2022100dcfb6a1064b933aebaf923a89b145404388da6a26350b7023932949bb90412a8",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dbbb297a5a63cfad7096975f0ff303c6562434417d4de107729c4ae18b4d6dc4022030ea2a4ce5ebdd42161c603b94e6716b1bc2ee8ec85eeb184002397509fae962",
+    "dac_private_key": "8e16cef1caf45ade0aa85796c761110c492e404ea56221d99100a9c9b45aac3f",
+    "dac_public_key": "040783f0cd9197c63b72b92c107439dbd5416dc7b3fffa5cebecba8a330c5003e7a3d5781bf0ec6465918dae807691ce9954df73ae8f6c2b8798178d431836fa0d"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der
index dc1210d75a9754..751822f5f5e73d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der
index 5deb3a6b8ba09b..81eb1524223b4a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem
index 5a115999dd5045..16f08840ea5104 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIf1kHgC1llrQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIDXizk4CDa9swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARZ+1AQWFSk303kO2+c9OA0OYR2NfqH
-hWLOWf3ReNAb1szDTgQ2/70mkNeqPvUDpvlmRPgmgt1eIM908bgXrZ04o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUreClz1+4usl3
-bBMEb8+oxb5aRwUwHwYDVR0jBBgwFoAUMfnptlpML8tOY/G26Nt3URYqXFUwCgYI
-KoZIzj0EAwIDSQAwRgIhAI9BXqn9YL+Cmh5aw/bm9vDQ9oWZQKYTWQLAK4hfH9Hu
-AiEA+w5UzYcVuX4cA10XbkabKEMYWTgCL2krM1sE86v6vqE=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7XtRG3IYicRIzpESt4qrelqpkW0xz
+Gs0VRvgNuRH4Ro9qVnhwu3sWuffrcrX0+KO/VTT0WvcllNu00I0MfQzlo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUv8S8nWZ4S1//
+RQILBlkoG/vRdmEwHwYDVR0jBBgwFoAUMTS9unVw33ouG3yaZH6sQU/tgAkwCgYI
+KoZIzj0EAwIDRwAwRAIgdO86K7Kx/3JTpev2K7a1FFQi4PhgIhLXfLFfhI3kC60C
+IF01OKb8CKi6yJGhJfmP1MEDGpgXa7ItHh8IX8j2I8K6
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der
index c2114651bdd7f0..748e6d7cd11fd9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem
index db204b7a493390..a83c7c74efa1ba 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIE3Zw8ruiD4uxKXDtjuD23L1+w14m6Bx+Q2ERGVTJ4nkoAoGCCqGSM49
-AwEHoUQDQgAEWftQEFhUpN9N5DtvnPTgNDmEdjX6h4Vizln90XjQG9bMw04ENv+9
-JpDXqj71A6b5ZkT4JoLdXiDPdPG4F62dOA==
+MHcCAQEEIItTowbrYQGu0kCscPb7X/FbPmM/czNcSwY8bWLDEDtToAoGCCqGSM49
+AwEHoUQDQgAE+17URtyGInESM6REreKq3paqZFtMcxrNFUb4DbkR+EaPalZ4cLt7
+Frn363K19Pijv1U09Fr3JZTbtNCNDH0M5Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der
index 21e309df17205c..d16140a721be80 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem
index 18415e99ce8b12..66016e9365c9cc 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIINu3nG2Jn6v0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIQLZQ6ndDbqwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABMpK60A6epP2SNO7Nn8gPbLKrXgWVpJcTZkHPaj+IlekE+qJKvt001GjeM7U
-CQnOToKrud9NfYN2R4IHfd8IoxejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQx+em2Wkwvy05j8bbo23dRFipcVTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-nZncRQVCvzWDgIgVAyx1utqviy8uJtWgFCyH91Gi7Q4CIQDRq28M9VcXfkLGfK+9
-J95QTsNs1QglxzZb7djtISQiHw==
+A0IABFP/xgputmC2/TsD62OQL+MBFHNVTFNKNH9KG16NXDcTnxdCE+edX1EVfnFD
+OZ4DIgkI8qBzeH/TALpuDzHbxE6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQxNL26dXDfei4bfJpkfqxBT+2ACTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA9
+udSLoVEGOS7RxkuYBwoDEYLUJy2ES5ToXAVkgNchJgIhAMzUBpYaLRSGQpCo/KU9
+/8dogymJOGFb/H8yYW8kOlTs
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der
index 302a6b124c01d6..093f9709399ef0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem
index 59f544240edabb..87ff07d03d624d 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJGqc/UXkzusx2hT+AjOjMnMz7y2U7GHD/dZcBs9zb8NoAoGCCqGSM49
-AwEHoUQDQgAEykrrQDp6k/ZI07s2fyA9ssqteBZWklxNmQc9qP4iV6QT6okq+3TT
-UaN4ztQJCc5Ogqu53019g3ZHggd93wijFw==
+MHcCAQEEIN/DgFEGkNEVHkhMK+tW145q56Dsd14AwBNRdrAr+4YqoAoGCCqGSM49
+AwEHoUQDQgAEU//GCm62YLb9OwPrY5Av4wEUc1VMU0o0f0obXo1cNxOfF0IT551f
+URV+cUM5ngMiCQjyoHN4f9MAum4PMdvETg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json
index 98b305cbaddb8d..46fc5462769acb 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Valid certificate public key curve prime256v1",
     "is_success_case": "true",
-    "dac_cert": "308201cf30820174a00302010202087f5907802d6596b4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000459fb50105854a4df4de43b6f9cf4e03439847635fa878562ce59fdd178d01bd6ccc34e0436ffbd2690d7aa3ef503a6f96644f82682dd5e20cf74f1b817ad9d38a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ade0a5cf5fb8bac9776c13046fcfa8c5be5a4705301f0603551d2304183016801431f9e9b65a4c2fcb4e63f1b6e8db7751162a5c55300a06082a8648ce3d04030203490030460221008f415ea9fd60bf829a1e5ac3f6e6f6f0d0f6859940a6135902c02b885f1fd1ee022100fb0e54cd8715b97e1c035d176e469b2843185938022f692b335b04f3abfabea1",
-    "pai_cert": "308201bf30820164a003020102020836ede71b6267eafd300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ca4aeb403a7a93f648d3bb367f203db2caad781656925c4d99073da8fe2257a413ea892afb74d351a378ced40909ce4e82abb9df4d7d83764782077ddf08a317a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041431f9e9b65a4c2fcb4e63f1b6e8db7751162a5c55301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009d99dc450542bf3583808815032c75badaaf8b2f2e26d5a0142c87f751a2ed0e022100d1ab6f0cf557177e42c67cafbd27de504ec36cd50825c7365bedd8ed2124221f",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220620a83eed8a527c0972862bc9c784a02c114280e4573ec370f9ccf1a56d92dfb02206e8bdb0790366e11ec9f184d5a52c44efb6c575b17a09dc5889012434ab7327d",
-    "dac_private_key": "4dd9c3caee883e2ec4a5c3b63b83db72f5fb0d789ba071f90d844465532789e4",
-    "dac_public_key": "0459fb50105854a4df4de43b6f9cf4e03439847635fa878562ce59fdd178d01bd6ccc34e0436ffbd2690d7aa3ef503a6f96644f82682dd5e20cf74f1b817ad9d38"
+    "dac_cert": "308201cd30820174a00302010202080d78b39380836bdb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fb5ed446dc8622711233a444ade2aade96aa645b4c731acd1546f80db911f8468f6a567870bb7b16b9f7eb72b5f4f8a3bf5534f45af72594dbb4d08d0c7d0ce5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bfc4bc9d66784b5fff45020b0659281bfbd17661301f0603551d230418301680143134bdba7570df7a2e1b7c9a647eac414fed8009300a06082a8648ce3d0403020347003044022074ef3a2bb2b1ff7253a5ebf62bb6b5145422e0f8602212d77cb15f848de40bad02205d3538a6fc08a8bac891a125f98fd4c1031a98176bb22d1e1f085fc8f623c2ba",
+    "pai_cert": "308201be30820164a003020102020840b650ea77436eac300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000453ffc60a6eb660b6fd3b03eb63902fe3011473554c534a347f4a1b5e8d5c37139f174213e79d5f51157e7143399e03220908f2a073787fd300ba6e0f31dbc44ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143134bdba7570df7a2e1b7c9a647eac414fed8009301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203db9d48ba15106392ed1c64b98070a031182d4272d844b94e85c056480d72126022100ccd406961a2d14864290a8fca53dffc76883298938615bfc7f32616f243a54ec",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202bcc6df0b9ec31d1c463b0d6ea9cf1c4243157feb495625e25c6049502394b5f0220035d0cfaa91d11074240bd97cde33da056ca009e2e4ec6cfc747e7987f497c97",
+    "dac_private_key": "8b53a306eb6101aed240ac70f6fb5ff15b3e633f73335c4b063c6d62c3103b53",
+    "dac_public_key": "04fb5ed446dc8622711233a444ade2aade96aa645b4c731acd1546f80db911f8468f6a567870bb7b16b9f7eb72b5f4f8a3bf5534f45af72594dbb4d08d0c7d0ce5"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der
index d8dd4154cd8c57..3bc3077cb953d3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der
index 4323272bd4c69f..30904e5fa7c6d3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem
index b59b5c1f89ae9e..2ee899e45b5b0e 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIII3geiE8t5cswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIByzCCAXGgAwIBAgIIflYuzc4KMvwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-VjAQBgcqhkjOPQIBBgUrgQQACgNCAARXIp4LBQSxjeYThHY/KZBhQ/NlYI+v7DJQ
-EzVnQOcO6btTlEF+MljvRy7xJY/464b6idbK4UL4iFs5kEpiw/kOo2AwXjAMBgNV
-HRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUQeVN5bp/JpqmytZQ
-1q/BOp30q9wwHwYDVR0jBBgwFoAUMq3Sj+eICOBjVatB8oGXmLLyW5AwCgYIKoZI
-zj0EAwIDSQAwRgIhAKQg+R0I2c+y5ndt5mBMAz17hgUrA/px992h3OfUDGPTAiEA
-0JGdTgankwNv9uUYi1FnIyMn7uzn5O89QngaRDEzndA=
+VjAQBgcqhkjOPQIBBgUrgQQACgNCAARf+oHRBQL4LgPqVXwo6guF4UMPwbxVcZza
+rpzEg2Za52lGvtkAOfjX2VMaQlmOiCfnRkLZ8/RF+WGRAEZQXoxNo2AwXjAMBgNV
+HRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUVC6zcAlZ6ZRf1bKX
+wudQRCMfIhMwHwYDVR0jBBgwFoAUIblFLAxTbqGDeISHV1IX2gxP/50wCgYIKoZI
+zj0EAwIDSAAwRQIgfvWg92191WmQqsYKCGGg9u6KnFnVXOVBrtdgiN0gkSQCIQCc
+w99w8BQCWXXVI4bG94zss0B+atfRz+ocZLwmdk5+Pg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der
index 005705cdcafb03..fd20bce88a5f83 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem
index 060c6d43c38616..23788907d34d3c 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHQCAQEEIIZMPYRSoAMI24+YjyVKYQ9iePF1Ey2EUXe5OrE7WxXmoAcGBSuBBAAK
-oUQDQgAEVyKeCwUEsY3mE4R2PymQYUPzZWCPr+wyUBM1Z0DnDum7U5RBfjJY70cu
-8SWP+OuG+onWyuFC+IhbOZBKYsP5Dg==
+MHQCAQEEICixSL4JIIPWjU0ATTZx0KwfffznXzwRTaRmApPDZGJeoAcGBSuBBAAK
+oUQDQgAEX/qB0QUC+C4D6lV8KOoLheFDD8G8VXGc2q6cxINmWudpRr7ZADn419lT
+GkJZjogn50ZC2fP0RflhkQBGUF6MTQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der
index f79a2182e84fa2..7640771e8b0d63 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem
index 03125aff2c1265..9d047a7f5281fe 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIaxIHLuVbdaAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIILRm42syzGWowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABC8Wom5xQ0QdPhxGaPA4ARnm+c2NKt/bD9vG71KBUCvRWDuJctqOBQDWJkiq
-pz7ftO7EVoP+yvuZzyJPXf44cqmjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQyrdKP54gI4GNVq0HygZeYsvJbkDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAr
-NMvv4qqBwZdQGqfDMyt4uIoYjSrvK/Oj8lwkPFPTaAIgLISw1LhqVOyMq1QF5oDE
-bIzOycuVWMZdR0mv4ocglzI=
+A0IABOx8JzQO9NJoG8QlQkrUhGGzvM+Uim2AMOgNb8dw1nCE7Tqd+lLmx7M3H03S
+kGwhUOdC4b7A0M4Z55YAqLkGgVejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQhuUUsDFNuoYN4hIdXUhfaDE//nTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+/6OiavnzJvivMpEIKOe7Ro4E6CHSvC23L5bX1HGCjmECIAaya7LEUIt5QgZ2sp+u
+bvuplFQX5piGzE4ZTHYdjJzC
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der
index 91b21aa1d218b5..0622a6a5844880 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem
index 776e2c07d4ee34..15b40c262348d3 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICn4XEOXSuBmTq1rghDfZGDNhn8aPTyfSTDWNkB0XjasoAoGCCqGSM49
-AwEHoUQDQgAELxaibnFDRB0+HEZo8DgBGeb5zY0q39sP28bvUoFQK9FYO4ly2o4F
-ANYmSKqnPt+07sRWg/7K+5nPIk9d/jhyqQ==
+MHcCAQEEILX1421lzSmj9w41uK3LmHN/JSVuunwlWwir+mUUZoeooAoGCCqGSM49
+AwEHoUQDQgAE7HwnNA700mgbxCVCStSEYbO8z5SKbYAw6A1vx3DWcITtOp36UubH
+szcfTdKQbCFQ50LhvsDQzhnnlgCouQaBVw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json
index c458dac01e50f3..5ce2f6649b7580 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Invalid certificate public key curve secp256k1",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820171a003020102020823781e884f2de5cb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303056301006072a8648ce3d020106052b8104000a0342000457229e0b0504b18de61384763f29906143f365608fafec325013356740e70ee9bb5394417e3258ef472ef1258ff8eb86fa89d6cae142f8885b39904a62c3f90ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041441e54de5ba7f269aa6cad650d6afc13a9df4abdc301f0603551d2304183016801432add28fe78808e06355ab41f2819798b2f25b90300a06082a8648ce3d0403020349003046022100a420f91d08d9cfb2e6776de6604c033d7b86052b03fa71f7dda1dce7d40c63d3022100d0919d4e06a793036ff6e5188b5167232327eeece7e4ef3d42781a4431339dd0",
-    "pai_cert": "308201bd30820164a00302010202086b12072ee55b75a0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042f16a26e7143441d3e1c4668f0380119e6f9cd8d2adfdb0fdbc6ef5281502bd1583b8972da8e0500d62648aaa73edfb4eec45683fecafb99cf224f5dfe3872a9a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041432add28fe78808e06355ab41f2819798b2f25b90301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202b34cbefe2aa81c197501aa7c3332b78b88a188d2aef2bf3a3f25c243c53d36802202c84b0d4b86a54ec8cab5405e680c46c8ccec9cb9558c65d4749afe287209732",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207e3b4477a2e4e088d2f8eadf2d4c3242249a12adf9a96e7a153ddfcbb50514bb022100c3f3b4c2f2825e0a45da13a94dac4cdfc882e04eab6866fb7e9b5d5d9c98ecc6",
-    "dac_private_key": "864c3d8452a00308db8f988f254a610f6278f175132d845177b93ab13b5b15e6",
-    "dac_public_key": "0457229e0b0504b18de61384763f29906143f365608fafec325013356740e70ee9bb5394417e3258ef472ef1258ff8eb86fa89d6cae142f8885b39904a62c3f90e"
+    "dac_cert": "308201cb30820171a00302010202087e562ecdce0a32fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303056301006072a8648ce3d020106052b8104000a034200045ffa81d10502f82e03ea557c28ea0b85e1430fc1bc55719cdaae9cc483665ae76946bed90039f8d7d9531a42598e8827e74642d9f3f445f961910046505e8c4da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414542eb3700959e9945fd5b297c2e75044231f2213301f0603551d2304183016801421b9452c0c536ea183788487575217da0c4fff9d300a06082a8648ce3d040302034800304502207ef5a0f76d7dd56990aac60a0861a0f6ee8a9c59d55ce541aed76088dd2091240221009cc3df70f014025975d52386c6f78cecb3407e6ad7d1cfea1c64bc26764e7e3e",
+    "pai_cert": "308201be30820164a00302010202082d19b8daccb3196a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ec7c27340ef4d2681bc425424ad48461b3bccf948a6d8030e80d6fc770d67084ed3a9dfa52e6c7b3371f4dd2906c2150e742e1bec0d0ce19e79600a8b9068157a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041421b9452c0c536ea183788487575217da0c4fff9d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ffa3a26af9f326f8af32910828e7bb468e04e821d2bc2db72f96d7d471828e61022006b26bb2c4508b79420676b29fae6efba9945417e69886cc4e194c761d8c9cc2",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022057c24bea52d3e5a48d790ed4ba398793d45f95e1c67bf6acf0921e203d3d5b94022100c538389898f52518ffe3af36458c33ae6eb31c48ed0ab95973520c2bc8ac22da",
+    "dac_private_key": "28b148be092083d68d4d004d3671d0ac1f7dfce75f3c114da4660293c364625e",
+    "dac_public_key": "045ffa81d10502f82e03ea557c28ea0b85e1430fc1bc55719cdaae9cc483665ae76946bed90039f8d7d9531a42598e8827e74642d9f3f445f961910046505e8c4d"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der
index d62a4c29240228..58a8e6823d8089 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der
index 778edb359d072f..fedaa283efb44f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem
index 16f7c7c0f8a1f3..4bce0cc1f7188f 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIYyVhuvc8FpYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIWkZypi/XGn8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATE/Jp73Sso9MmjzlVPSwJ+spf9i8Yf
-DlY40c6wktb5jyoYiB4F3yY4S5XNKZY+tQEDVLMZ5nmiMalfXqcqktNXo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUksnOi9WJgFbl
-8g/ZS8gyAPIJvc4wHwYDVR0jBBgwFoAUm22QUoH3psfFktXtl0LBy7odfdowCgYI
-KoZIzj0EAwIDSAAwRQIhAJ3NKty+dRXX2clrR0ozjfXnkQHBq2blSWRLm4ZeOvl/
-AiASOjPUNJL9QJo8DY0HZK6mUDLtsyF3ReRrI8eX/rCVjA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASYGVJrsxXU2Utw8anUE1l1pVzIZOj/
+/Bk9DYlmXa1CeqPOuPcbpy3dk4YayFS1y/VGz8IS8iJidoyYZCQYnT77o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUAQQbYzaiooQE
+iq6U6oG5+BQRo0EwHwYDVR0jBBgwFoAUMOHnSoAYkykrfdvm86LimEDYVhkwCgYI
+KoZIzj0EAwIDRwAwRAIgC1QXN4/LFXo1OziJjHzY11E5n7xkk+qoWL4fB8xY7gQC
+IBx6gxEy5j4O/lzBN/4mifk+DCsMCd1yNt91nRgvBdpC
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der
index f7cec17297de12..533542393d926c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem
index 155a704febdc35..83162b195b9f95 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM2swOQYQ/2jsNUhg1U0tTdNQ+2BMQclGD7yTEBxPjNooAoGCCqGSM49
-AwEHoUQDQgAExPyae90rKPTJo85VT0sCfrKX/YvGHw5WONHOsJLW+Y8qGIgeBd8m
-OEuVzSmWPrUBA1SzGeZ5ojGpX16nKpLTVw==
+MHcCAQEEIJ8NOAM1WUosNj7DJPbHwaNw7ftJxSukrvpGpis+UBh0oAoGCCqGSM49
+AwEHoUQDQgAEmBlSa7MV1NlLcPGp1BNZdaVcyGTo//wZPQ2JZl2tQnqjzrj3G6ct
+3ZOGGshUtcv1Rs/CEvIiYnaMmGQkGJ0++w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der
index b17c34934ce4a9..88bb8ccc9686ab 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem
index 041b310ec86919..e58c0a4d2800d7 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIBXDiJyo/giAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIJg+j7f9ntx4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJCqv94asvygcarBF9frw1M6jXLbI/ZVbPDZVv/Y5vvdBF0DwPDpW8LTdu1C
-deV8mSB5jrDflJ2H4KfLfvqlx06jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSbbZBSgfemx8WS1e2XQsHLuh192jAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-gvuIFdn28gcUOMw0xfLLP4NXi7l14REISNxCtJQ38SwCIQCJNSC6Do5ztzsGAfL7
-6OMM5M6RgKQf1ym1qlNXovGJdg==
+A0IABDIUxgEy6DAZ8omjn9yesSXqTbfjXpCbxJjWbo1QHLNNMagCE5EYsziTJJRf
+n5DtGssSOgwWbn/HvTOGIsxmjf+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQw4edKgBiTKSt92+bzouKYQNhWGTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA/
+XTZRpAH5BFvLbaD3EQOJXK2t4Ry77zICE/9SScNXBwIhAKu5uXZs4pEQq68PrwV7
+06c2ixSnV2RSiKIn1pVX3Ah/
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der
index 57d1e35108f0aa..b27725de16dd8b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem
index 5ee1f9608fe222..b29281407225d4 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKA47yH/1TTnheLOT/AM6fZgMC6in8HlLdm5cmZMFcOloAoGCCqGSM49
-AwEHoUQDQgAEkKq/3hqy/KBxqsEX1+vDUzqNctsj9lVs8NlW/9jm+90EXQPA8Olb
-wtN27UJ15XyZIHmOsN+UnYfgp8t++qXHTg==
+MHcCAQEEIJfQ97ew+uenC74tXnpWaZuLHU0/eRV9LQue41ARCeeeoAoGCCqGSM49
+AwEHoUQDQgAEMhTGATLoMBnyiaOf3J6xJepNt+NekJvEmNZujVAcs00xqAITkRiz
+OJMklF+fkO0ayxI6DBZuf8e9M4YizGaN/w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json
index 809193398371cf..610642ab308b0d 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: PID in Subject field doesn't match PID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208632561baf73c1696300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d03010703420004c4fc9a7bdd2b28f4c9a3ce554f4b027eb297fd8bc61f0e5638d1ceb092d6f98f2a18881e05df26384b95cd29963eb5010354b319e679a231a95f5ea72a92d357a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041492c9ce8bd5898056e5f20fd94bc83200f209bdce301f0603551d230418301680149b6d905281f7a6c7c592d5ed9742c1cbba1d7dda300a06082a8648ce3d04030203480030450221009dcd2adcbe7515d7d9c96b474a338df5e79101c1ab66e549644b9b865e3af97f0220123a33d43492fd409a3c0d8d0764aea65032edb3217745e46b23c797feb0958c",
-    "pai_cert": "308201bf30820164a00302010202080570e2272a3f8220300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000490aabfde1ab2fca071aac117d7ebc3533a8d72db23f6556cf0d956ffd8e6fbdd045d03c0f0e95bc2d376ed4275e57c9920798eb0df949d87e0a7cb7efaa5c74ea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604149b6d905281f7a6c7c592d5ed9742c1cbba1d7dda301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210082fb8815d9f6f2071438cc34c5f2cb3f83578bb975e1110848dc42b49437f12c022100893520ba0e8e73b73b0601f2fbe8e30ce4ce9180a41fd729b5aa5357a2f18976",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210091d00b7a0a27f30bdb3b4ff6b6ffbb7c27c5ffce8775ed1c020da03dd1c867ca022100f5fdd61f0c101ba481a05fed174ab76c03c9e31b33e210ebfab1a3c1bfb9a1e5",
-    "dac_private_key": "cdacc0e41843fda3b0d521835534b5374d43ed81310725183ef24c40713e3368",
-    "dac_public_key": "04c4fc9a7bdd2b28f4c9a3ce554f4b027eb297fd8bc61f0e5638d1ceb092d6f98f2a18881e05df26384b95cd29963eb5010354b319e679a231a95f5ea72a92d357"
+    "dac_cert": "308201cd30820174a00302010202085a4672a62fd71a7f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d030107034200049819526bb315d4d94b70f1a9d4135975a55cc864e8fffc193d0d89665dad427aa3ceb8f71ba72ddd93861ac854b5cbf546cfc212f22262768c986424189d3efba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041401041b6336a2a284048aae94ea81b9f81411a341301f0603551d2304183016801430e1e74a801893292b7ddbe6f3a2e29840d85619300a06082a8648ce3d040302034700304402200b5417378fcb157a353b38898c7cd8d751399fbc6493eaa858be1f07cc58ee0402201c7a831132e63e0efe5cc137fe2689f93e0c2b0c09dd7236df759d182f05da42",
+    "pai_cert": "308201be30820164a0030201020208260fa3edff67b71e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043214c60132e83019f289a39fdc9eb125ea4db7e35e909bc498d66e8d501cb34d31a802139118b3389324945f9f90ed1acb123a0c166e7fc7bd338622cc668dffa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041430e1e74a801893292b7ddbe6f3a2e29840d85619301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203f5d3651a401f9045bcb6da0f71103895cadade11cbbef320213ff5249c35707022100abb9b9766ce29110abaf0faf057bd3a7368b14a757645288a227d69557dc087f",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402200456c0174ef9951b0801baec58a580ca88116f675a5fa2b963fdba7d090407a5022017e3ce50926813a7af33d2d08fdc854533d9e0c8ad2fdadc3f563bf3ff563235",
+    "dac_private_key": "9f0d380335594a2c363ec324f6c7c1a370edfb49c52ba4aefa46a62b3e501874",
+    "dac_public_key": "049819526bb315d4d94b70f1a9d4135975a55cc864e8fffc193d0d89665dad427aa3ceb8f71ba72ddd93861ac854b5cbf546cfc212f22262768c986424189d3efb"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der
index 98aeace7f48cd3..def5e26b045c57 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der
index 06be896a78464f..755af44b4330a9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem
index db23faf1e61a05..6889620cd5c74e 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIGC0sZXdJdd0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIWdvEqqR+R9UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATV4LyDUYxmE+mUrwx8wNvPo32VufUj
-6VLXyuvG6aQiJlaogwJN7SRBMng3ekkWhjv6K/Fk8wSfGZN+vv6cC5Pho2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWP4y9aAsNCMn
-gslWYYHIH2p8UtQwHwYDVR0jBBgwFoAUQwpuurKnWy4kLDtmO7INTT6YKoswCgYI
-KoZIzj0EAwIDSAAwRQIgGAup276bZJ2IBUhYui7FOnGO3+BQcHW4i32URKm8jS8C
-IQDmzhOmBVJrJBt3MfFw+MuAITa2iPYfVEzvGrMN4XPHow==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpAc1oxHgvZVIJ1WxBygzw7Xp7nJ4S
+BJB9fzNbRNmheRqR9xSjMzJfyjFk5djxEjeCaLzKTJfpsePbPy77gKCMo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU4Uuuaocx1UVV
+Sowgab8AZN0ONsgwHwYDVR0jBBgwFoAUl6B6Dz4s1oSMRl+WgfZWWx30vEkwCgYI
+KoZIzj0EAwIDSAAwRQIhANzontg8dR8V8DN+gPjfzsYUbxwu3rpGPM9oz66UljLR
+AiBu9JXDTLJDe9KFUeROR+dpSq4L6dHj6551dJjVuK4jJw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der
index 459e8c91f14c87..c210abf0d5c5ad 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem
index 8702b4b9be0655..5d8895b3c93c71 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIE66URioAdxoJOA/vqwvhFbS3tahhYHkfDGU++vlBegIoAoGCCqGSM49
-AwEHoUQDQgAE1eC8g1GMZhPplK8MfMDbz6N9lbn1I+lS18rrxumkIiZWqIMCTe0k
-QTJ4N3pJFoY7+ivxZPMEnxmTfr7+nAuT4Q==
+MHcCAQEEIH26q2rScwKMLlosUUa0mir5BIaki/c4WNBMcmQleAmYoAoGCCqGSM49
+AwEHoUQDQgAEaQHNaMR4L2VSCdVsQcoM8O16e5yeEgSQfX8zW0TZoXkakfcUozMy
+X8oxZOXY8RI3gmi8ykyX6bHj2z8u+4CgjA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der
index 28b123b7f94b58..e417804aba641f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem
index 0e16d878598610..b322db846b7915 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIN8zDVh9U4BAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIU0FIQ61g6MQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABOIPk4fAJuHA1+0dKwe68qNt0SLeDHCgod/6M19UV+BSmFjdssS2vYYpVvXo
-lxL7wxFT0ExKIuei7HCB45poG3ajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRDCm66sqdbLiQsO2Y7sg1NPpgqizAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAn
-cXtpieO4TOJnUxgYC4bRcRrskWEThYEy8It0P1MeiQIhAKDDdKuuzb9v3qVIhNsO
-InzYUuVuw8XxZ1KVyNh7i5IX
+A0IABK54we/72782khci6L7HX2MK6GfZi5Ylm5QAhNKSauMje3uD4TH3evW2XqHk
+gU4l7OpJveNFc2CUHRPQ1giJbfujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSXoHoPPizWhIxGX5aB9lZbHfS8STAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAg
+97fzEF8JXxZiERDG5mx2ofBR5wusPfCwg/dySHTyZAIhAO6x1Dv5Cd0NuEts99o9
+ZzMSpm6YmGzPQtPPrfAvhiET
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der
index 209bd28cb525ee..b2f36f6d8473f1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem
index 90e7351d48c60b..a03879cff43f6d 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBQAB35TnCEGYtXvF+hnNN59qK62yxG95HLOZCt7sccfoAoGCCqGSM49
-AwEHoUQDQgAE4g+Th8Am4cDX7R0rB7ryo23RIt4McKCh3/ozX1RX4FKYWN2yxLa9
-hilW9eiXEvvDEVPQTEoi56LscIHjmmgbdg==
+MHcCAQEEILaVz+tv6TmiME+in8nVE2zv+qykERsueTmSkNZ4afQjoAoGCCqGSM49
+AwEHoUQDQgAErnjB7/vbvzaSFyLovsdfYwroZ9mLliWblACE0pJq4yN7e4PhMfd6
+9bZeoeSBTiXs6km940VzYJQdE9DWCIlt+w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json
index ec920a4e0b5146..3aad888b99a581 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: VID in Subject field doesn't match VID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208182d2c65774975dd300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d5e0bc83518c6613e994af0c7cc0dbcfa37d95b9f523e952d7caebc6e9a4222656a883024ded24413278377a4916863bfa2bf164f3049f19937ebefe9c0b93e1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041458fe32f5a02c34232782c9566181c81f6a7c52d4301f0603551d23041830168014430a6ebab2a75b2e242c3b663bb20d4d3e982a8b300a06082a8648ce3d04030203480030450220180ba9dbbe9b649d88054858ba2ec53a718edfe0507075b88b7d9444a9bc8d2f022100e6ce13a605526b241b7731f170f8cb802136b688f61f544cef1ab30de173c7a3",
-    "pai_cert": "308201be30820164a003020102020837ccc3561f54e010300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e20f9387c026e1c0d7ed1d2b07baf2a36dd122de0c70a0a1dffa335f5457e0529858ddb2c4b6bd862956f5e89712fbc31153d04c4a22e7a2ec7081e39a681b76a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414430a6ebab2a75b2e242c3b663bb20d4d3e982a8b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022027717b6989e3b84ce2675318180b86d1711aec916113858132f08b743f531e89022100a0c374abaecdbf6fdea54884db0e227cd852e56ec3c5f1675295c8d87b8b9217",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022050e897792b88f626d2d23f766eacef2fae220fa7b869376d93a716b652293a7e022100a194a5f47c6a5e700c7398f5df07dbfdcff2aec25e70c488796b6bd4b813763b",
-    "dac_private_key": "4eba5118a801dc6824e03fbeac2f8456d2ded6a18581e47c3194fbebe505e808",
-    "dac_public_key": "04d5e0bc83518c6613e994af0c7cc0dbcfa37d95b9f523e952d7caebc6e9a4222656a883024ded24413278377a4916863bfa2bf164f3049f19937ebefe9c0b93e1"
+    "dac_cert": "308201ce30820174a003020102020859dbc4aaa47e47d5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046901cd68c4782f655209d56c41ca0cf0ed7a7b9c9e1204907d7f335b44d9a1791a91f714a333325fca3164e5d8f112378268bcca4c97e9b1e3db3f2efb80a08ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e14bae6a8731d545554a8c2069bf0064dd0e36c8301f0603551d2304183016801497a07a0f3e2cd6848c465f9681f6565b1df4bc49300a06082a8648ce3d0403020348003045022100dce89ed83c751f15f0337e80f8dfcec6146f1c2edeba463ccf68cfae949632d102206ef495c34cb2437bd28551e44e47e7694aae0be9d1e3eb9e757498d5b8ae2327",
+    "pai_cert": "308201be30820164a003020102020853414843ad60e8c4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ae78c1effbdbbf36921722e8bec75f630ae867d98b96259b940084d2926ae3237b7b83e131f77af5b65ea1e4814e25ecea49bde3457360941d13d0d608896dfba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041497a07a0f3e2cd6848c465f9681f6565b1df4bc49301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022020f7b7f3105f095f16621110c6e66c76a1f051e70bac3df0b083f7724874f264022100eeb1d43bf909dd0db84b6cf7da3d673312a66e98986ccf42d3cfadf02f862113",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e0e11ce895e44f0c37543c86489b48923b51aea6994d48ce2ec426a883c23531022100f9e5cd84abf0a323919fe968bad3423ec24e2b83018768f6553b0913baa33837",
+    "dac_private_key": "7dbaab6ad273028c2e5a2c5146b49a2af90486a48bf73858d04c726425780998",
+    "dac_public_key": "046901cd68c4782f655209d56c41ca0cf0ed7a7b9c9e1204907d7f335b44d9a1791a91f714a333325fca3164e5d8f112378268bcca4c97e9b1e3db3f2efb80a08c"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der
index 8712acdd3d56be..ccaa15edacb435 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der
index d0d6c812cf484a..f660298761207d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem
index c6cf301aee7e01..db06015626a293 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIdPS0Rry9ddswCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2zCCAYGgAwIBAgIIOzVJbZMAnVgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-RjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEz6yTm/3VzzhP
-RWlPINrL/jB871vqTEwIqz+OYdTL2ooD63jfPEVAygfRHAmrXH7rRPCvNfysZR9u
-fQ3qq3cwUaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFLwuBooXut+fsp4K0MyphSCJToF/MB8GA1UdIwQYMBaAFHvphboKFu4Zbaob
-Axwjc2WrfPXyMAoGCCqGSM49BAMCA0gAMEUCIQCArZaLxQ6DSosIDYSAmcIQtGL7
-zQvLfGtphlF2ECu33QIgI5enn/l7sthJhzCRs2MVsj9S5zJ+Qljr/iHcjyNzb7o=
+RjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQH2ucRm/hqeR
+1nt1bo5bzvi2DIn+wzNdLJv1HAKA5Vjpee+EKgncP8AeGcJKxslaNa7WiWaAkHTD
+6B8Ted3F3qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFOQufAT9m/rdPG92JLYQibNoKky2MB8GA1UdIwQYMBaAFBKCzUsr600bgmw2
+QAx8Sb/CwWhzMAoGCCqGSM49BAMCA0gAMEUCIBkXbxAMHddR/YBDutOBrEty6MYS
+i8roiqoY5ebk5vanAiEA3iKD85I5wgUWapUVb18CSUTdS3U3MgtDmVzczzYZOn8=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der
index 0a62948ead46ed..12ff5b5958725c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem
index 02f8e781c18b2f..5d09e6ef60df0b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFCtNcGAyI7EYRMnheNNLlQi3FmLSawTR/2NB/kHU0oToAoGCCqGSM49
-AwEHoUQDQgAEz6yTm/3VzzhPRWlPINrL/jB871vqTEwIqz+OYdTL2ooD63jfPEVA
-ygfRHAmrXH7rRPCvNfysZR9ufQ3qq3cwUQ==
+MHcCAQEEIHEwJ71+uWZJwuc/L5oxm+3JYknUreDQItqDC4j7Pz1qoAoGCCqGSM49
+AwEHoUQDQgAEQH2ucRm/hqeR1nt1bo5bzvi2DIn+wzNdLJv1HAKA5Vjpee+EKgnc
+P8AeGcJKxslaNa7WiWaAkHTD6B8Ted3F3g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der
index 873f9ac73279c5..60f0ee7a62b607 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem
index b790110b9be32d..1b27d13ad0ca2c 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIWFA9L+I3H8IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIETiV7r4NUBkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATml2V56K3F9tcyE5qim22p/JoHVN3m
-yprbSKBM4flsZflC38DNkw0QcUaJHGq7TKXyBq/Zm/fM67Z9WOfMDF6uo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUe+mF
-ugoW7hltqhsDHCNzZat89fIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgeUArz/4QljTj6t5P6gENjs7RLMB7SNehG0vq
-HHeSmCQCIE+Sl7CggWu/WmtzTx72zB14e0oUqL59IxN1TqDtjn43
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS3ktACjTInvBol50aM2dGhaeL5zPIG
+K3rv2AswajhT6gHIbdgrhjOiK/fNC5z1F0XDv4qDUgCulIOB1GzL4Pa7o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUEoLN
+SyvrTRuCbDZADHxJv8LBaHMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgBP8pBh6cJJGNyzsT9DHXN3gDHfgbUtoa7nMQ
+hNz3A0oCIQCN0tI8MNY0AWi7C0faH7fmpAzzAgfry2eKDQzKFG3eQA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der
index 9c55caed8c844c..fe53a3409caa4d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem
index 5cd22cfad65c9e..f47bc37d3e8a12 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBG2VwT0hHszwy3xi8EXAmF28ch3/ZHT1u7ZCz7f31mmoAoGCCqGSM49
-AwEHoUQDQgAE5pdleeitxfbXMhOaopttqfyaB1Td5sqa20igTOH5bGX5Qt/AzZMN
-EHFGiRxqu0yl8gav2Zv3zOu2fVjnzAxerg==
+MHcCAQEEILwf5fOkdfLDl2gMDLIbKIFt1MyLLqcyCj6Kz6Ym+d0koAoGCCqGSM49
+AwEHoUQDQgAEt5LQAo0yJ7waJedGjNnRoWni+czyBit679gLMGo4U+oByG3YK4Yz
+oiv3zQuc9RdFw7+Kg1IArpSDgdRsy+D2uw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json
index 38b2eee93921dc..83efc4e8be7ecf 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a003020102020874f4b446bcbd75db300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004cfac939bfdd5cf384f45694f20dacbfe307cef5bea4c4c08ab3f8e61d4cbda8a03eb78df3c4540ca07d11c09ab5c7eeb44f0af35fcac651f6e7d0deaab773051a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bc2e068a17badf9fb29e0ad0cca98520894e817f301f0603551d230418301680147be985ba0a16ee196daa1b031c237365ab7cf5f2300a06082a8648ce3d040302034800304502210080ad968bc50e834a8b080d848099c210b462fbcd0bcb7c6b69865176102bb7dd02202397a79ff97bb2d849873091b36315b23f52e7327e4258ebfe21dc8f23736fba",
-    "pai_cert": "308201d33082017aa003020102020858503d2fe2371fc2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e6976579e8adc5f6d732139aa29b6da9fc9a0754dde6ca9adb48a04ce1f96c65f942dfc0cd930d107146891c6abb4ca5f206afd99bf7ccebb67d58e7cc0c5eaea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604147be985ba0a16ee196daa1b031c237365ab7cf5f2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022079402bcffe109634e3eade4fea010d8eced12cc07b48d7a11b4bea1c7792982402204f9297b0a0816bbf5a6b734f1ef6cc1d787b4a14a8be7d2313754ea0ed8e7e37",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220054b0fce684c80b8b6b2d03019c907c446b13542d6c90dbf6252ce7887e63145022100a1d0d38f357e6be72a6a90704d60be111b64438f4bab0f6de385a9650f4ca3d0",
-    "dac_private_key": "50ad35c180c88ec461132785e34d2e5422dc598b49ac1347fd8d07f907534a13",
-    "dac_public_key": "04cfac939bfdd5cf384f45694f20dacbfe307cef5bea4c4c08ab3f8e61d4cbda8a03eb78df3c4540ca07d11c09ab5c7eeb44f0af35fcac651f6e7d0deaab773051"
+    "dac_cert": "308201db30820181a00302010202083b35496d93009d58300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004407dae7119bf86a791d67b756e8e5bcef8b60c89fec3335d2c9bf51c0280e558e979ef842a09dc3fc01e19c24ac6c95a35aed68966809074c3e81f1379ddc5dea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e42e7c04fd9bfadd3c6f7624b61089b3682a4cb6301f0603551d230418301680141282cd4b2beb4d1b826c36400c7c49bfc2c16873300a06082a8648ce3d0403020348003045022019176f100c1dd751fd8043bad381ac4b72e8c6128bcae88aaa18e5e6e4e6f6a7022100de2283f39239c205166a95156f5f024944dd4b7537320b43995cdccf36193a7f",
+    "pai_cert": "308201d43082017aa0030201020208113895eebe0d5019300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b792d0028d3227bc1a25e7468cd9d1a169e2f9ccf2062b7aefd80b306a3853ea01c86dd82b8633a22bf7cd0b9cf51745c3bf8a835200ae948381d46ccbe0f6bba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141282cd4b2beb4d1b826c36400c7c49bfc2c16873301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022004ff29061e9c24918dcb3b13f431d73778031df81b52da1aee731084dcf7034a0221008dd2d23c30d6340168bb0b47da1fb7e6a40cf30207ebcb678a0d0cca146dde40",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206f15931bddc87a10ea25079567a08c72ee0c1f1b5479165a30f1142a40729307022100e4451639b4b1b61458f1a0f875a45c76ca468c7fff805b4fb1af6389cd52d866",
+    "dac_private_key": "713027bd7eb96649c2e73f2f9a319bedc96249d4ade0d022da830b88fb3f3d6a",
+    "dac_public_key": "04407dae7119bf86a791d67b756e8e5bcef8b60c89fec3335d2c9bf51c0280e558e979ef842a09dc3fc01e19c24ac6c95a35aed68966809074c3e81f1379ddc5de"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der
index b8a4a36688658d..bb2c403d257d70 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der
index f606ba35e187b2..46dac31321789f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem
index 2c495ce8ed52c1..820d1e76bd78ab 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIcWt046B6dY8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB3DCCAYGgAwIBAgIIIdYeWvg+mJMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNcGlkOjAw
-QjEgTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEup96tuztjhpo
-GEZ0F7hZArwPHcKpRs5vEVWu0V6MtHUZjIqBaXFu4KVg8dvvwuQC8okw/u2ebs/z
-/Idi3rdCLKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFEmQRNJEn9rv2u+XcqJ6ttVmo/PMMB8GA1UdIwQYMBaAFBKIIIWMqIRSnfMZ
-RZTWvrO1bMsYMAoGCCqGSM49BAMCA0gAMEUCIQCZ91y2O+l3L6gVG1Saeky4Ioie
-Q+R6SaABPvLZvlKPYQIgFyiFACrFRAfqY5jNEI+1wYN2HlBrutQNR9ymQfrFYrY=
+QjEgTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPkw/CJjJvnsS
+KjB9pdZ3MVOpQtQkTPc8y+nmLoqZ3OttDMyb9QaQuf6D7n4W2LmXjtwO3hrnfivx
+ByLWX3qhsKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFNDVnv+6jA8GFpkuLdw5lw6y7S5nMB8GA1UdIwQYMBaAFJI64dxkATrx/V3x
+6Ni35dD1J3SSMAoGCCqGSM49BAMCA0kAMEYCIQCiPutDrAvH5u7bUEiqfnuQl8Bw
+F8/pKctRO33gWIjgKwIhAOcuDbX387UoPstD0nbSAaeWnAZaeLrQk2gPOdpSvGHM
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der
index 8c305c44f62d69..cc345177bf4a23 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem
index aa569c8eb89f4e..ed5fc1519c2728 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPzYraIXm6aylamQGo9lDORz+kaq6/WwKDlzgI9Fw1xioAoGCCqGSM49
-AwEHoUQDQgAEup96tuztjhpoGEZ0F7hZArwPHcKpRs5vEVWu0V6MtHUZjIqBaXFu
-4KVg8dvvwuQC8okw/u2ebs/z/Idi3rdCLA==
+MHcCAQEEIGqO6QNrIlVbv2PCsuCPOhBoEgVPMADqzq+gFK8RVOieoAoGCCqGSM49
+AwEHoUQDQgAEPkw/CJjJvnsSKjB9pdZ3MVOpQtQkTPc8y+nmLoqZ3OttDMyb9QaQ
+uf6D7n4W2LmXjtwO3hrnfivxByLWX3qhsA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der
index 8ab81ac300ff01..f7e4d08a8650e1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem
index 58406552a4b030..aa4c736c6db6f1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIBmpOBBg+jfswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIImiUPDZfeAEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATFgsU94K3KJPEYznPeK3ywYrb+W+Hv
-DKwZ6MHq230EtLtkumY013cQRyLQ17+POWiysdgfAFV4r/Bpbbf6tKqFo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUEogg
-hYyohFKd8xlFlNa+s7VsyxgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgEg7OkS1JuwsGBCCbCaPuDGltuxNmKq7xJfGk
-y/iOeW0CIQDpvrUl3eGmbx3vaNU6Zo9bXj4vxhGERw7p6WXhHe2UKQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQo5RbvNKPYZ17cbRjzthEm9ry1qgcc
+2qdMLt+OJnNFJX4gPvmR4yFZqBm2ofD/hvtoQ05joIEu5dsqvOQjn1Ono2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkjrh
+3GQBOvH9XfHo2Lfl0PUndJIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOoz97ze7ryqVfqbcNtftLOsxRxp7bzydPra
+xJoM9h3UAiAK/zWYMvno4OCwgL1Pr+i7jE784Xv+dLbG+uhhfoAfBA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der
index a131dd9a3763da..b711afd3910cab 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem
index ce0b584fc2d556..2536d1af962820 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIK+LtT8cDUNT7JTngN+b0RMpaX/8WnJw3MrtgGsg0hFfoAoGCCqGSM49
-AwEHoUQDQgAExYLFPeCtyiTxGM5z3it8sGK2/lvh7wysGejB6tt9BLS7ZLpmNNd3
-EEci0Ne/jzlosrHYHwBVeK/waW23+rSqhQ==
+MHcCAQEEINob/Eh108VY2xbqe/ucQbh9bXOWoL8WGJ99E2p6c3ODoAoGCCqGSM49
+AwEHoUQDQgAEKOUW7zSj2Gde3G0Y87YRJva8taoHHNqnTC7fjiZzRSV+ID75keMh
+WagZtqHw/4b7aENOY6CBLuXbKrzkI59Tpw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json
index 51f4b4bd48aa55..3db487ecb0dd47 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a0030201020208716b74e3a07a758f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ba9f7ab6eced8e1a6818467417b85902bc0f1dc2a946ce6f1155aed15e8cb475198c8a8169716ee0a560f1dbefc2e402f28930feed9e6ecff3fc8762deb7422ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414499044d2449fdaefdaef9772a27ab6d566a3f3cc301f0603551d23041830168014128820858ca884529df3194594d6beb3b56ccb18300a06082a8648ce3d040302034800304502210099f75cb63be9772fa8151b549a7a4cb822889e43e47a49a0013ef2d9be528f610220172885002ac54407ea6398cd108fb5c183761e506bbad40d47dca641fac562b6",
-    "pai_cert": "308201d43082017aa0030201020208066a4e04183e8dfb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c582c53de0adca24f118ce73de2b7cb062b6fe5be1ef0cac19e8c1eadb7d04b4bb64ba6634d777104722d0d7bf8f3968b2b1d81f005578aff0696db7fab4aa85a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414128820858ca884529df3194594d6beb3b56ccb18301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220120ece912d49bb0b0604209b09a3ee0c696dbb13662aaef125f1a4cbf88e796d022100e9beb525dde1a66f1def68d53a668f5b5e3e2fc61184470ee9e965e11ded9429",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220345c3dbbc19406a12c002abe2f9fe71a252b415deb8455ec96a2eb5147844321022100c6b6b777baf06eae6fe8def417d179ab41e954b4ada9bc2e934ebef79afb937d",
-    "dac_private_key": "fcd8ada2179ba6b295a9901a8f650ce473fa46aaebf5b0283973808f45c35c62",
-    "dac_public_key": "04ba9f7ab6eced8e1a6818467417b85902bc0f1dc2a946ce6f1155aed15e8cb475198c8a8169716ee0a560f1dbefc2e402f28930feed9e6ecff3fc8762deb7422c"
+    "dac_cert": "308201dc30820181a003020102020821d61e5af83e9893300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d030107034200043e4c3f0898c9be7b122a307da5d6773153a942d4244cf73ccbe9e62e8a99dceb6d0ccc9bf50690b9fe83ee7e16d8b9978edc0ede1ae77e2bf10722d65f7aa1b0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d0d59effba8c0f0616992e2ddc39970eb2ed2e67301f0603551d23041830168014923ae1dc64013af1fd5df1e8d8b7e5d0f5277492300a06082a8648ce3d0403020349003046022100a23eeb43ac0bc7e6eedb5048aa7e7b9097c07017cfe929cb513b7de05888e02b022100e72e0db5f7f3b5283ecb43d276d201a7969c065a78bad093680f39da52bc61cc",
+    "pai_cert": "308201d43082017aa00302010202082268943c365f7801300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000428e516ef34a3d8675edc6d18f3b61126f6bcb5aa071cdaa74c2edf8e267345257e203ef991e32159a819b6a1f0ff86fb68434e63a0812ee5db2abce4239f53a7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414923ae1dc64013af1fd5df1e8d8b7e5d0f5277492301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ea33f7bcdeeebcaa55fa9b70db5fb4b3acc51c69edbcf274fadac49a0cf61dd402200aff359832f9e8e0e0b080bd4fafe8bb8c4efce17bfe74b6c6fae8617e801f04",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022074247aba404142c26d843f28e7ec34ab2326f49c492f87e14640ec452d79ac420221009173791a1a716c12e2a324ee323410f191dbce5c46b4f0a7868da1294a318e6a",
+    "dac_private_key": "6a8ee9036b22555bbf63c2b2e08f3a106812054f3000eaceafa014af1154e89e",
+    "dac_public_key": "043e4c3f0898c9be7b122a307da5d6773153a942d4244cf73ccbe9e62e8a99dceb6d0ccc9bf50690b9fe83ee7e16d8b9978edc0ede1ae77e2bf10722d65f7aa1b0"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der
index 0ac685735a70bf..366eac18105acd 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der
index 0560f3369f7534..50fb8acc27ca41 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem
index aeed1ce6fb1f0c..43ee1e16f37065 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIfcV7AozYTBYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2zCCAYGgAwIBAgIISnTFXxoHKbYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMk1waWQ6MDBCMSxBQ01FIE1hdHRlciBEZXZlbCBEQUMgNUNEQTk4
-OTksTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJsjqG9/yIwut
-avjqeNag7EUxyO43pmIMhsXMD61uyldNZb37OcjQ7SA5jJlHRN9Ze4ECG2UFH8/x
-Tl0AMvSo56NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFD8SIzP2fkVDnNLrU/30pfp2S8qHMB8GA1UdIwQYMBaAFG7NV6Qms1ks4tFO
-xv5FdMoGeXBmMAoGCCqGSM49BAMCA0gAMEUCIB9KVJzOufN5z2Lxpnwkzug6egMJ
-iIYDUfHPWtD/uZaZAiEA+BTBBn48xeZtoFHcVItXZzU+3ncXJ1g8GBKjjhNrL+E=
+OTksTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhp5Afo7BOZyq
+XqJ0ig21e/R+54P6C07jpkVuQLRmC79Fr7P/Sta96oNlbzLxQ55MNXeLMSrijSon
+YbgD6GXUhqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFMI/6wxB0lU62JlN6Egkl/xHNlpPMB8GA1UdIwQYMBaAFNT6CJryYs886wkP
++L2JN3g6T5qTMAoGCCqGSM49BAMCA0gAMEUCIChh10VzgVm9DMtvB+YkrjoTsEor
+XJrDj3sxzB1Qr9QcAiEAz+wJaSgWYpJRQfbvyI9pHmsV0L3mDx5Mt1Vyv2W/tNA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der
index 773a58fcd13e8b..21ccba5c0f291a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem
index cf2d56b99e1786..2ab4d67b2614cd 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBV6oZYC8xxNB84Uek1QPJLrNQkOg4sDwuj7B4529+5VoAoGCCqGSM49
-AwEHoUQDQgAEJsjqG9/yIwutavjqeNag7EUxyO43pmIMhsXMD61uyldNZb37OcjQ
-7SA5jJlHRN9Ze4ECG2UFH8/xTl0AMvSo5w==
+MHcCAQEEIAa6Tdng9kkpJmALZH/AXAws0DOJ4pNk8F8l0qNbGQBYoAoGCCqGSM49
+AwEHoUQDQgAEhp5Afo7BOZyqXqJ0ig21e/R+54P6C07jpkVuQLRmC79Fr7P/Sta9
+6oNlbzLxQ55MNXeLMSrijSonYbgD6GXUhg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der
index 40a583fb36602d..c4fac21c003e6c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem
index 450f945f039fd6..f58d67b290cc63 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIZULK9IyylrUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIILS44DtS4gGgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASAm3ZhwNAAWynq7HpnzgYtFLmJT1DY
-IwaCmSubyiBspIi93BWjrQmxfkeiS1upQdey2hLv1URJdpnrgegVxwkqo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUbs1X
-pCazWSzi0U7G/kV0ygZ5cGYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgZbQGTVd6WXviQgj18nRj1T1L1vqnMr1+FO1e
-IPBpiDUCIBO5yx56NK7MehVvpw3LDz440VKT9NNqMoJNb74EyLlX
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARi9TiJFbZMdfcmZ7VxlJqvx2hKiB+O
+La+PQcwK9FvMmNjOX5aZNfC10NabzWnV+vOBODYKQ1JI8b48GL+6xYn6o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1PoI
+mvJizzzrCQ/4vYk3eDpPmpMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAPlnesVz0tMsHdp6AIDDRMtbgKOw9MEFRko0
+CKMsX9PQAiBCOEpJ5SSPhaMlIgCsou2uc93tO3R2eWcmAgfguidVxA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der
index 7598b35eac1ada..f609a0a1afb131 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem
index 92f435619496dc..cdf10607503138 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAwg9f0a2C3e8smUSzeZGn/C+UWbbM4516qpg00VoTHRoAoGCCqGSM49
-AwEHoUQDQgAEgJt2YcDQAFsp6ux6Z84GLRS5iU9Q2CMGgpkrm8ogbKSIvdwVo60J
-sX5HoktbqUHXstoS79VESXaZ64HoFccJKg==
+MHcCAQEEICiZpurfQKiLPWCv3MsUHdZxTTWPwPKasHHY+xUGNRSXoAoGCCqGSM49
+AwEHoUQDQgAEYvU4iRW2THX3Jme1cZSar8doSogfji2vj0HMCvRbzJjYzl+WmTXw
+tdDWm81p1frzgTg2CkNSSPG+PBi/usWJ+g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json
index add65da71a01bd..84a15ad8645e32 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid example showing that order or separators are not considered at all for the overall validity of the embedded fields",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a00302010202087dc57b028cd84c16300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c204441432035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000426c8ea1bdff2230bad6af8ea78d6a0ec4531c8ee37a6620c86c5cc0fad6eca574d65bdfb39c8d0ed20398c994744df597b81021b65051fcff14e5d0032f4a8e7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143f122333f67e45439cd2eb53fdf4a5fa764bca87301f0603551d230418301680146ecd57a426b3592ce2d14ec6fe4574ca06797066300a06082a8648ce3d040302034800304502201f4a549cceb9f379cf62f1a67c24cee83a7a030988860351f1cf5ad0ffb99699022100f814c1067e3cc5e66da051dc548b5767353ede771727583c1812a38e136b2fe1",
-    "pai_cert": "308201d33082017aa00302010202086542caf48cb296b5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004809b7661c0d0005b29eaec7a67ce062d14b9894f50d8230682992b9bca206ca488bddc15a3ad09b17e47a24b5ba941d7b2da12efd544497699eb81e815c7092aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604146ecd57a426b3592ce2d14ec6fe4574ca06797066301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022065b4064d577a597be24208f5f27463d53d4bd6faa732bd7e14ed5e20f0698835022013b9cb1e7a34aecc7a156fa70dcb0f3e38d15293f4d36a32824d6fbe04c8b957",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502204a1fcc80841ccbf2e99abaffdded774cd4aa1f6c368bfdc62c9634512925d4cd0221008ab5fc105d34d62034ef824bc91c6f0a45aa56ddbc374eb736c39efd54620828",
-    "dac_private_key": "157aa19602f31c4d07ce147a4d503c92eb35090e838b03c2e8fb078e76f7ee55",
-    "dac_public_key": "0426c8ea1bdff2230bad6af8ea78d6a0ec4531c8ee37a6620c86c5cc0fad6eca574d65bdfb39c8d0ed20398c994744df597b81021b65051fcff14e5d0032f4a8e7"
+    "dac_cert": "308201db30820181a00302010202084a74c55f1a0729b6300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c204441432035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004869e407e8ec1399caa5ea2748a0db57bf47ee783fa0b4ee3a6456e40b4660bbf45afb3ff4ad6bdea83656f32f1439e4c35778b312ae28d2a2761b803e865d486a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c23feb0c41d2553ad8994de8482497fc47365a4f301f0603551d23041830168014d4fa089af262cf3ceb090ff8bd8937783a4f9a93300a06082a8648ce3d040302034800304502202861d745738159bd0ccb6f07e624ae3a13b04a2b5c9ac38f7b31cc1d50afd41c022100cfec0969281662925141f6efc88f691e6b15d0bde60f1e4cb75572bf65bfb4d0",
+    "pai_cert": "308201d43082017aa00302010202082d2e380ed4b88068300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000462f5388915b64c75f72667b571949aafc7684a881f8e2daf8f41cc0af45bcc98d8ce5f969935f0b5d0d69bcd69d5faf38138360a435248f1be3c18bfbac589faa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d4fa089af262cf3ceb090ff8bd8937783a4f9a93301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100f9677ac573d2d32c1dda7a0080c344cb5b80a3b0f4c105464a3408a32c5fd3d0022042384a49e5248f85a3252200aca2edae73dded3b74767967260207e0ba2755c4",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f4343cabd2f0ffb022ebdc949f33e87e844d1b1fd32de0756780d98bc6bfb5bf022100ff2d27474c247a17d5d5d5a435d3e241141c07b6763b88967840faeb3a7907a5",
+    "dac_private_key": "06ba4dd9e0f6492926600b647fc05c0c2cd03389e29364f05f25d2a35b190058",
+    "dac_public_key": "04869e407e8ec1399caa5ea2748a0db57bf47ee783fa0b4ee3a6456e40b4660bbf45afb3ff4ad6bdea83656f32f1439e4c35778b312ae28d2a2761b803e865d486"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der
index 50fbc2ac83ef65..3610377f70b60d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der
index 0a65c36c0424d6..d011fd3ff16598 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem
index 955985e8e72c8f..1b47b8c523e180 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYCgAwIBAgIILGRv43DkAPgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2TCCAYCgAwIBAgIITvz6jceslHEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
 OjA4BgNVBAMMMUFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-RjFNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT3EUjjQVzIn90W
-IOgMQ4L1HRXz/Q7UOvdPMpNVD4VVnM/fZ5UYcV3eB/WdxHDAsqqtpCUPWcXIJukN
-UjEM74D4o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQUrD/c7h/OEJt7Vv1HNKvjHwU4ppYwHwYDVR0jBBgwFoAUs1a7Y+bn1itUd2SG
-13WuY0g6ai0wCgYIKoZIzj0EAwIDSAAwRQIhANolC84D8JVbW/Bg9PiBv09kWZEw
-OZyQ/kqPHJBwYgjQAiBjj6ZhY0mw6qB/HjMf7+r+9/ykY8hDrKevtlEsaJ5Vag==
+RjFNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATHDMZOed/fGhvY
+/t66sTqFXVbDglH/284RsE3FJeJmFW/OnmSWJk/vb1bxDpbiTix6KgIBD74/hwD7
+7vmOe5sAo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQU2G6LH0KUbVgozLzpEQqCRXhSXxowHwYDVR0jBBgwFoAU8RhZ10/cIL0IUOlE
+/VEygE2wBbkwCgYIKoZIzj0EAwIDRwAwRAIgJVG3qdlBCEACquifCmpaWI6omEPz
+xtd6kjvlFvydaQoCIBxswamJurkfd3iXO3IjQFcA9S3nUEPU5Wn8uFcAmCM8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der
index 36433b18ada060..ea3b4ede9b15ab 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem
index f9adab139ab057..2aa349841e009e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHmDfKISyMjZxDlI3PAjI080gYNzA4QH6mgVZZu3hJBpoAoGCCqGSM49
-AwEHoUQDQgAE9xFI40FcyJ/dFiDoDEOC9R0V8/0O1Dr3TzKTVQ+FVZzP32eVGHFd
-3gf1ncRwwLKqraQlD1nFyCbpDVIxDO+A+A==
+MHcCAQEEIPBx0kZE8x+O9ORy9Idjf2WWmf0nmLeG4VycslqXK9AGoAoGCCqGSM49
+AwEHoUQDQgAExwzGTnnf3xob2P7eurE6hV1Ww4JR/9vOEbBNxSXiZhVvzp5kliZP
+729W8Q6W4k4seioCAQ++P4cA++75jnubAA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der
index 249f1ed8d18d5e..741fb9ef732ec3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem
index 3523d12c9859ee..a05e66764809eb 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIICvhYxwPnvU8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB0zCCAXqgAwIBAgIICG7BbhEy8dswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARAYgXQT+b7PWJjOXjpbTn3ZFeOk9Q2
-5izemc0LtRAv/uVfVcsxcVivfQe8aZqJcZ6MZZuqcuMsnUQoeOJCGYl4o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs1a7
-Y+bn1itUd2SG13WuY0g6ai0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgQXThQ+Eu8MTcXGw79QVIhFmKrUXc2n4b+qlK
-KnTGuAoCICX1nbV/EDksYO4MWodRGBZB9iFHHsEcsFkJ+RQDDC8l
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQLrJ7s02JpoUuRg0FN8y2q1WMpPbjU
+AOaLyAIdMd8H8+LmzV7jPxQLCziekm/Kach6gUGq6DaminUelFphK/V1o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8RhZ
+10/cIL0IUOlE/VEygE2wBbkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgchKxZf5uNC8O5nt3rH9SNnaetgBVe5X8hq78
+ohKxG18CIFh6cJORlnBLHheAe0CdsL0ECU6wZ/mSTym7uL8KmdS/
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der
index 628a2b135c68be..80cfe836b82bc8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem
index 0dd64c6139f364..7c5a257187ff98 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII5rLrfhXwY/NJE9iosn9Qj1dTUCUoyIoHSvKhCTegiwoAoGCCqGSM49
-AwEHoUQDQgAEQGIF0E/m+z1iYzl46W0592RXjpPUNuYs3pnNC7UQL/7lX1XLMXFY
-r30HvGmaiXGejGWbqnLjLJ1EKHjiQhmJeA==
+MHcCAQEEILFzNpOOtmNIGVuiqW8vAafgWPvZ9eIjMvuq7xMv1IXEoAoGCCqGSM49
+AwEHoUQDQgAEC6ye7NNiaaFLkYNBTfMtqtVjKT241ADmi8gCHTHfB/Pi5s1e4z8U
+Cws4npJvymnIeoFBqug2pop1HpRaYSv1dQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json
index 5a8ec99f4f377f..937d17f4c5986a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid, but less readable",
     "is_success_case": "true",
-    "dac_cert": "308201da30820180a00302010202082c646fe370e400f8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004f71148e3415cc89fdd1620e80c4382f51d15f3fd0ed43af74f3293550f85559ccfdf679518715dde07f59dc470c0b2aaada4250f59c5c826e90d52310cef80f8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ac3fdcee1fce109b7b56fd4734abe31f0538a696301f0603551d23041830168014b356bb63e6e7d62b54776486d775ae63483a6a2d300a06082a8648ce3d0403020348003045022100da250bce03f0955b5bf060f4f881bf4f64599130399c90fe4a8f1c90706208d00220638fa6616349b0eaa07f1e331fefeafef7fca463c843aca7afb6512c689e556a",
-    "pai_cert": "308201d33082017aa00302010202080af858c703e7bd4f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004406205d04fe6fb3d62633978e96d39f764578e93d436e62cde99cd0bb5102ffee55f55cb317158af7d07bc699a89719e8c659baa72e32c9d442878e242198978a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b356bb63e6e7d62b54776486d775ae63483a6a2d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204174e143e12ef0c4dc5c6c3bf5054884598aad45dcda7e1bfaa94a2a74c6b80a022025f59db57f10392c60ee0c5a8751181641f621471ec11cb05909f914030c2f25",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ff607ab0a0b125084b4144a2f0d7cb660337199c08dc5e34690d485a8264612b022100edf4453a9facc3f72df48c3cbdcbc8d57d24e2a208936b34ec26f973507ada00",
-    "dac_private_key": "79837ca212c8c8d9c43948dcf023234f34818373038407ea6815659bb7849069",
-    "dac_public_key": "04f71148e3415cc89fdd1620e80c4382f51d15f3fd0ed43af74f3293550f85559ccfdf679518715dde07f59dc470c0b2aaada4250f59c5c826e90d52310cef80f8"
+    "dac_cert": "308201d930820180a00302010202084efcfa8dc7ac9471300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c70cc64e79dfdf1a1bd8fedebab13a855d56c38251ffdbce11b04dc525e266156fce9e6496264fef6f56f10e96e24e2c7a2a02010fbe3f8700fbeef98e7b9b00a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d86e8b1f42946d5828ccbce9110a824578525f1a301f0603551d23041830168014f11859d74fdc20bd0850e944fd5132804db005b9300a06082a8648ce3d040302034700304402202551b7a9d941084002aae89f0a6a5a588ea89843f3c6d77a923be516fc9d690a02201c6cc1a989bab91f7778973b7223405700f52de75043d4e569fcb8570098233c",
+    "pai_cert": "308201d33082017aa0030201020208086ec16e1132f1db300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040bac9eecd36269a14b9183414df32daad563293db8d400e68bc8021d31df07f3e2e6cd5ee33f140b0b389e926fca69c87a8141aae836a68a751e945a612bf575a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f11859d74fdc20bd0850e944fd5132804db005b9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207212b165fe6e342f0ee67b77ac7f5236769eb600557b95fc86aefca212b11b5f0220587a70939196704b1e17807b409db0bd04094eb067f9924f29bbb8bf0a99d4bf",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ba8e07b0e614a601a72249b8e9d487d9100cf102dd0e6b19ef5f702c3ac7d67d02203d4bc4f3cf156b9db430bec8de0a72f0c59c944dbe131fdd99d744d6be05c239",
+    "dac_private_key": "f071d24644f31f8ef4e472f487637f659699fd2798b786e15c9cb25a972bd006",
+    "dac_public_key": "04c70cc64e79dfdf1a1bd8fedebab13a855d56c38251ffdbce11b04dc525e266156fce9e6496264fef6f56f10e96e24e2c7a2a02010fbe3f8700fbeef98e7b9b00"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der
index 1c186a5ad246d0..834525bc68c47f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der
index 076fb8b06c6325..bf7c8e304c99dc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem
index 5610a18b2667ec..fcb4aa34d24d61 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2TCCAX+gAwIBAgIIVZFOc7JrR6QwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2jCCAX+gAwIBAgIIA9BCyJyshakwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
 OTA3BgNVBAMMME12aWQ6RkZGMUFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBTXBp
-ZDowMEIxOTg5OTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPKBeMj6MMGPyO29
-ogwDZjOhfDK+huko7QwLSA1KpRWJ/I0nd7s0PL8VPcSvDswKE419XrH384MfJWHf
-WLSvrM2jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBSi/Xi0b2latNw7baVaF4OgYBeLezAfBgNVHSMEGDAWgBRBX4e27qhQ2YbUmgxQ
-mQ4v3u5TBDAKBggqhkjOPQQDAgNIADBFAiB2QipNmX8epK3OPz25lfqFJiA+IDp1
-k0XntCOqfi5giAIhAJWzCOwYIDr03yrXWiHV33cN4T6jNjrQPPtmM1mf110e
+ZDowMEIxOTg5OTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKhvvYvWA82S94Uq
+9G6SPA/+g7/s+QAWMsuNa62twYG50tPGlhw03cX3t2Ul3H5GiBw23sk21AyIQOdX
+yyiTZ1OjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBQ2ka3t6XlUDtI8A9HMCAEroQt8izAfBgNVHSMEGDAWgBSlW3Kw/bokMjDBoNUz
+Lct614OORzAKBggqhkjOPQQDAgNJADBGAiEA0VFeohE8WcAk245XDAZ+eViZs3k5
+AlTqqg6HG3Fa1KYCIQDqdhBAxtpiR5L/6T6oxNHwYDYutn5OrmusULulM/uegQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der
index b4237e480a195a..a79774ee317739 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem
index 7c2a7fb571b0ee..4490bd1e4a0f80 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICZaOfefCb5B0X2aSGGyJxkwmao6NiegMnD+MEY+2ahpoAoGCCqGSM49
-AwEHoUQDQgAE8oF4yPowwY/I7b2iDANmM6F8Mr6G6SjtDAtIDUqlFYn8jSd3uzQ8
-vxU9xK8OzAoTjX1esffzgx8lYd9YtK+szQ==
+MHcCAQEEIF6cxiruqoKBbd4S71Hciw4vZ4KnxgDYSW5c6P2VuA6+oAoGCCqGSM49
+AwEHoUQDQgAEqG+9i9YDzZL3hSr0bpI8D/6Dv+z5ABYyy41rra3BgbnS08aWHDTd
+xfe3ZSXcfkaIHDbeyTbUDIhA51fLKJNnUw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der
index a9687822dc3300..9fa40347022562 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem
index 7e2eea662a0a4f..4732604832294e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIEwkQCswFNUcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIZdBPUl3ZSVcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATx0QQlW0OSYHFhqamUexBnehkBR+i/
-cNGtcA1pQxn+LVHsS+sSDEmZQUiarSL760bHl2KeZKwDt3Xd2AfoOmsso2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQV+H
-tu6oUNmG1JoMUJkOL97uUwQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhANoMyLaX/8tXyWnTKxViJ7nCvesjhp/mnnD9
-6Dgj02qGAiBJZSup7jg7LEkSmkQ0RYWaN/bfLKLqFb4d+W2/u0ad+A==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASwrfOiwhX13VM+9Fib4ToYj1tK/+aN
+5a5W54aqluA0fHJuSlBSB0qjf20WYtjA+q5R58alnI9Y7uW6s2eUdb5To2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUpVty
+sP26JDIwwaDVMy3LeteDjkcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKcv+dy0H5f8w9BlE625vml5vPokUcd8Sj7G
+E+SRQdviAiBn7wDgMDGEGCxWm3rfjpMl3M3oUoDA0mpqku/El54jsA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der
index ca5f9643896cb8..d5cf113499e5dc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem
index 966dc8fdb27ee5..45b9b9699df6e9 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDqT4MJIUunzunmul/3EXHgyWdvGZGrp08jR6RqCR6huoAoGCCqGSM49
-AwEHoUQDQgAE8dEEJVtDkmBxYamplHsQZ3oZAUfov3DRrXANaUMZ/i1R7EvrEgxJ
-mUFImq0i++tGx5dinmSsA7d13dgH6DprLA==
+MHcCAQEEIJA8ljo6Z9c6UMq9cVQeMr1ji607Wj1V3F6JKtcV8U94oAoGCCqGSM49
+AwEHoUQDQgAEsK3zosIV9d1TPvRYm+E6GI9bSv/mjeWuVueGqpbgNHxybkpQUgdK
+o39tFmLYwPquUefGpZyPWO7lurNnlHW+Uw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json
index c92d0a9f1ed78a..dabdf090c2ee0f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid, but highly discouraged, since embedding of substrings within other substrings may be confusing to human readers",
     "is_success_case": "true",
-    "dac_cert": "308201d93082017fa003020102020855914e73b26b47a4300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2044414320354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d03010703420004f28178c8fa30c18fc8edbda20c036633a17c32be86e928ed0c0b480d4aa51589fc8d2777bb343cbf153dc4af0ecc0a138d7d5eb1f7f3831f2561df58b4afaccda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a2fd78b46f695ab4dc3b6da55a1783a060178b7b301f0603551d23041830168014415f87b6eea850d986d49a0c50990e2fdeee5304300a06082a8648ce3d0403020348003045022076422a4d997f1ea4adce3f3db995fa8526203e203a759345e7b423aa7e2e608802210095b308ec18203af4df2ad75a21d5df770de13ea3363ad03cfb6633599fd75d1e",
-    "pai_cert": "308201d43082017aa00302010202081309100acc053547300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004f1d104255b4392607161a9a9947b10677a190147e8bf70d1ad700d694319fe2d51ec4beb120c499941489aad22fbeb46c797629e64ac03b775ddd807e83a6b2ca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414415f87b6eea850d986d49a0c50990e2fdeee5304301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100da0cc8b697ffcb57c969d32b156227b9c2bdeb23869fe69e70fde83823d36a86022049652ba9ee383b2c49129a443445859a37f6df2ca2ea15be1df96dbfbb469df8",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022059ae2ad41ed6d56f56b6a8a90a2a56402fa1ac28f203a05fb74a185976b76dc002210098e46fee9ec5665b370cb0396aa236dd1c7eb3237b0a39e00b64e39d0b4aea77",
-    "dac_private_key": "265a39f79f09be41d17d9a4861b227193099aa3a3627a03270fe30463ed9a869",
-    "dac_public_key": "04f28178c8fa30c18fc8edbda20c036633a17c32be86e928ed0c0b480d4aa51589fc8d2777bb343cbf153dc4af0ecc0a138d7d5eb1f7f3831f2561df58b4afaccd"
+    "dac_cert": "308201da3082017fa003020102020803d042c89cac85a9300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2044414320354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d03010703420004a86fbd8bd603cd92f7852af46e923c0ffe83bfecf9001632cb8d6badadc181b9d2d3c6961c34ddc5f7b76525dc7e46881c36dec936d40c8840e757cb28936753a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143691adede979540ed23c03d1cc08012ba10b7c8b301f0603551d23041830168014a55b72b0fdba243230c1a0d5332dcb7ad7838e47300a06082a8648ce3d0403020349003046022100d1515ea2113c59c024db8e570c067e795899b379390254eaaa0e871b715ad4a6022100ea761040c6da624792ffe93ea8c4d1f060362eb67e4eae6bac50bba533fb9e81",
+    "pai_cert": "308201d43082017aa003020102020865d04f525dd94957300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b0adf3a2c215f5dd533ef4589be13a188f5b4affe68de5ae56e786aa96e0347c726e4a5052074aa37f6d1662d8c0faae51e7c6a59c8f58eee5bab3679475be53a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a55b72b0fdba243230c1a0d5332dcb7ad7838e47301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a72ff9dcb41f97fcc3d06513adb9be6979bcfa2451c77c4a3ec613e49141dbe2022067ef00e0303184182c569b7adf8e9325dccde85280c0d26a6a92efc4979e23b0",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203a47bc6efa133d0abb42dbbfc9a92586a4a2da3f1a9a99d7c3fe3a021ea6a6270221009587f37f2b2d32a9131b4baf89291eb5dee0448b5fe019c07e278c9298383d22",
+    "dac_private_key": "5e9cc62aeeaa82816dde12ef51dc8b0e2f6782a7c600d8496e5ce8fd95b80ebe",
+    "dac_public_key": "04a86fbd8bd603cd92f7852af46e923c0ffe83bfecf9001632cb8d6badadc181b9d2d3c6961c34ddc5f7b76525dc7e46881c36dec936d40c8840e757cb28936753"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der
index 408f1eb013d317..18628b3e3f73da 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der
index 72b2ab18b0c2f8..1386269047ba3c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem
index b2f520841d075a..abe94213619c88 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYCgAwIBAgIISqOfCGlGrhMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2zCCAYCgAwIBAgIIHqEGKCZEjt8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
 OjA4BgNVBAMMMUFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-MSBNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASRiWMk9Xt/66Ti
-U6uCRE0rlw8M4edvSOkcqt+uAdQC/stSBF1BkjeJnNcMgJOYDmHQ4/OHnr7Cik57
-doF2nq6Eo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQU0LO6FfuUI6294hHNNK+2WkZO6RUwHwYDVR0jBBgwFoAU+d1AfzG/FUROmmhd
-3VlyUPxc98UwCgYIKoZIzj0EAwIDSQAwRgIhAPn1YaRQyJk5tRmHMNtY/lPdciT2
-v2n6pMIrEZhakDXuAiEAvTrq88dP1vd+5Oaabw2fiYBPatdTLFk4oPH97QUqSFQ=
+MSBNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASWiXXUBEogF1jb
+vdT5RqaFF3JKCBTX+GN59RsvquU7TkuY6Mc8LdFCdwu5Os5NMXy4txWd6fTwfkC2
+rtmjSL4po2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQU6JqrRSSPlUKyaC7VnHHxRZY8FIYwHwYDVR0jBBgwFoAUIB7X+3FHJbpVQg5/
+TZPkRM2MzhswCgYIKoZIzj0EAwIDSQAwRgIhAN1tFsNbeBM0DmifDVBsj1kqfPwE
+JLZTln42kDNC/bGoAiEA7oX4VS9affx1aRi7w/eScjyOdPJOeerSQx7cKDYUxe0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der
index 43bdf9d05d8dee..fc8158672ff67e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem
index 03f208c84fcb55..c14f53ab01525b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDvEj+T2k5mkCZL0sgBMcDhRillT9Gq9atBTnZUY2JMhoAoGCCqGSM49
-AwEHoUQDQgAEkYljJPV7f+uk4lOrgkRNK5cPDOHnb0jpHKrfrgHUAv7LUgRdQZI3
-iZzXDICTmA5h0OPzh56+wopOe3aBdp6uhA==
+MHcCAQEEIA+3xFeX8pcPw319z/8jlqmBW3SPsQy+KOYoT3akOC2HoAoGCCqGSM49
+AwEHoUQDQgAElol11ARKIBdY273U+UamhRdySggU1/hjefUbL6rlO05LmOjHPC3R
+QncLuTrOTTF8uLcVnen08H5Atq7Zo0i+KQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der
index 96c8e919cca07d..10c2746615b5d0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem
index 917fcb1ee94a9d..42f4e8aeb8e230 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIcvnNHlK0IuUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1TCCAXqgAwIBAgIIFqLPvZmMAgYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9uPJsWxYwrcpS0mtcc7s3DwRDEZfR
-MUOIg6lqulLJ2bzQeI4BtZX6JYvhAjlT0imucW9dBiDIWi/SN4bxzy5go2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+d1A
-fzG/FUROmmhd3VlyUPxc98UwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJJoOjIa3djpK+12L0yQYATFgM2KLF4sFDkM
-7WkYocMcAiBStcF5EaYWA7SrQLcsT+swA4e8OOl5BFQSu7JZWbkoxw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS3bpAKmbunzCXVnGqYWNqb5eScKJRR
+jst2qwltCs0l3/NN3nrvwZjQ2Fo9cIunkirze0/wtFKbLgHlUgxafmg9o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUIB7X
++3FHJbpVQg5/TZPkRM2MzhswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAI/ZEDpADHnTpayOYZR22ZlhRFTPwgU5HwOg
+YG38mbErAiEA2kIM3CJPsXL8fJHRXTUC12Mdvvq7rUQ7hN2HUOX1AWc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der
index 2ac2530392f257..0d515fbdc4e064 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem
index c39df828b4ccfd..f8ca08cd407fbd 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILKvUy9sTzpZox/SNY6a2HuB4LlRqQGB6ulfP0EQnJbPoAoGCCqGSM49
-AwEHoUQDQgAE/bjybFsWMK3KUtJrXHO7Nw8EQxGX0TFDiIOparpSydm80HiOAbWV
-+iWL4QI5U9IprnFvXQYgyFov0jeG8c8uYA==
+MHcCAQEEIABeLLAql3Dhr9j5SbfUlotxyR7VVM/us1+1BqGK6CRjoAoGCCqGSM49
+AwEHoUQDQgAEt26QCpm7p8wl1ZxqmFjam+XknCiUUY7LdqsJbQrNJd/zTd5678GY
+0NhaPXCLp5Iq83tP8LRSmy4B5VIMWn5oPQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json
index c4ae675a7367ca..402970a14e5b5a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201db30820180a00302010202084aa39f086946ae13300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d0301070342000491896324f57b7feba4e253ab82444d2b970f0ce1e76f48e91caadfae01d402fecb52045d419237899cd70c8093980e61d0e3f3879ebec28a4e7b7681769eae84a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d0b3ba15fb9423adbde211cd34afb65a464ee915301f0603551d23041830168014f9dd407f31bf15444e9a685ddd597250fc5cf7c5300a06082a8648ce3d0403020349003046022100f9f561a450c89939b5198730db58fe53dd7224f6bf69faa4c22b11985a9035ee022100bd3aeaf3c74fd6f77ee4e69a6f0d9f89804f6ad7532c5938a0f1fded052a4854",
-    "pai_cert": "308201d43082017aa003020102020872f9cd1e52b422e5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004fdb8f26c5b1630adca52d26b5c73bb370f04431197d131438883a96aba52c9d9bcd0788e01b595fa258be1023953d229ae716f5d0620c85a2fd23786f1cf2e60a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f9dd407f31bf15444e9a685ddd597250fc5cf7c5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210092683a321addd8e92bed762f4c906004c580cd8a2c5e2c14390ced6918a1c31c022052b5c17911a61603b4ab40b72c4feb300387bc38e979045412bbb25959b928c7",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220516fb9c4ca69b1c6ce66887997b13c642c98e665a14461ff574df98d5c1c97ed022100ae1891a958893e44ae286511b311f7581d6d747769b0d77e28e65a02a6d7fc35",
-    "dac_private_key": "3bc48fe4f69399a40992f4b2004c7038518a5953f46abd6ad0539d9518d89321",
-    "dac_public_key": "0491896324f57b7feba4e253ab82444d2b970f0ce1e76f48e91caadfae01d402fecb52045d419237899cd70c8093980e61d0e3f3879ebec28a4e7b7681769eae84"
+    "dac_cert": "308201db30820180a00302010202081ea1062826448edf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004968975d4044a201758dbbdd4f946a68517724a0814d7f86379f51b2faae53b4e4b98e8c73c2dd142770bb93ace4d317cb8b7159de9f4f07e40b6aed9a348be29a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e89aab45248f9542b2682ed59c71f145963c1486301f0603551d23041830168014201ed7fb714725ba55420e7f4d93e444cd8cce1b300a06082a8648ce3d0403020349003046022100dd6d16c35b7813340e689f0d506c8f592a7cfc0424b653967e36903342fdb1a8022100ee85f8552f5a7dfc756918bbc3f792723c8e74f24e79ead2431edc283614c5ed",
+    "pai_cert": "308201d53082017aa003020102020816a2cfbd998c0206300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b76e900a99bba7cc25d59c6a9858da9be5e49c2894518ecb76ab096d0acd25dff34dde7aefc198d0d85a3d708ba7922af37b4ff0b4529b2e01e5520c5a7e683da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414201ed7fb714725ba55420e7f4d93e444cd8cce1b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008fd9103a400c79d3a5ac8e619476d999614454cfc205391f03a0606dfc99b12b022100da420cdc224fb172fc7c91d15d3502d7631dbefabbad443b84dd8750e5f50167",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100db81169174ad456c5ccd40466029a3f5411daf37c2de57bf8f070fb9c4dab63002207a74ec81ce64ef0b352099a9193ac44127d84ef35abc70f7d75b90f209a25c60",
+    "dac_private_key": "0fb7c45797f2970fc37d7dcfff2396a9815b748fb10cbe28e6284f76a4382d87",
+    "dac_public_key": "04968975d4044a201758dbbdd4f946a68517724a0814d7f86379f51b2faae53b4e4b98e8c73c2dd142770bb93ace4d317cb8b7159de9f4f07e40b6aed9a348be29"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der
index 35ce3c8f73e381..a5b3385fca173d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der
index 58ba42cae142cc..b995e6231ab8e7 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem
index ac2bca3b8a9c30..343f06cf2cac15 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYGgAwIBAgIIbKeuaKF08lgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2zCCAYGgAwIBAgIIZRjzUKjNt3QwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOmZm
-ZjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBHO25Gq3qa3q
-H5+aIp+SESBHQT5wpicG2+ZrIMcKAYO5hOLZnemEbFAXykCiBViJvNqxW1tPmmgB
-Lb0yQvGjcKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFLbU8+V+zAYGKxNOf/nQXX4ST9S9MB8GA1UdIwQYMBaAFN5Kdl6IZ0NyJmnU
-J9wQczq6XdskMAoGCCqGSM49BAMCA0cAMEQCID9dJ+t0DiL5JaWNWPPqm+GI4lCI
-6LMV89Bo08s6xhxtAiBHHmDCPN8GBuWH7BMM7G3SzZhIzG6yp/zLs6nUCL/NjA==
+ZjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuUZ7Q438KZ/C
+2E4fWIGh3w8O3aqWVMty+R2UPRFMyUHS42lWpittbAZaaMb03zow5dnQENJTd0li
++9FYudzsm6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFIH9ScqDp/ev0Nr/L8rVNK0QtideMB8GA1UdIwQYMBaAFPjY6V5krLORbvmb
+NG+xDx6OfdWTMAoGCCqGSM49BAMCA0gAMEUCIH6JjKKXnzGeuiYKXGjqQ+EGYIef
+px0VDcGoTPKCKdaOAiEAwvzJKOf9oukeO6WfmmUq9otZVUnwPndEGMv85aCL6aw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der
index af27a14d4725f3..873ce95e792dbb 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem
index 4e61e9b1cce7e2..275bd3a58049c6 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN2vTMOSqJjSUKMP7+rGIMv+a9+5yIJuH/2FnSxB+Xw+oAoGCCqGSM49
-AwEHoUQDQgAEBHO25Gq3qa3qH5+aIp+SESBHQT5wpicG2+ZrIMcKAYO5hOLZnemE
-bFAXykCiBViJvNqxW1tPmmgBLb0yQvGjcA==
+MHcCAQEEICEztKZV/C362cadqo6Gynxj7BrsQN8NNPGndr/jHa28oAoGCCqGSM49
+AwEHoUQDQgAEuUZ7Q438KZ/C2E4fWIGh3w8O3aqWVMty+R2UPRFMyUHS42lWpitt
+bAZaaMb03zow5dnQENJTd0li+9FYudzsmw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der
index 2381513b3e6073..5794663bdbd444 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem
index 46bc037ccd9f61..125e6cb289bece 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIWDwphVBcTAQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIWuvpr16xspIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARBR2fwSoVH9HrVAauutRCld4OkLC/I
-NZ9jGsLArEJQXdVWlbLEsCKcD0xcdw9w0ozLi46UaMpJ+NAJuXUFPXofo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU3kp2
-XohnQ3ImadQn3BBzOrpd2yQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgAUsC7NiWCz1xgIgRV4mg4DR2ko5gUFDUqQg9
-pU8gAGkCIEokyYhwIEK08Ix63IlJnRBzixitXdItDglflFNnGuUS
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ98w8m87NKiwMMmMpVmhHv1Tkj2fDo
+WdNhDmF8WTjsQroxXRx5HvEx/GqnDLJt1DI5XezR8edV6Ky6/bB7zFuvo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+Njp
+XmSss5Fu+Zs0b7EPHo591ZMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgBsrbbL/SVqyHr8IX8YN2F1hiTx+6A1TJMUXm
+tlchRvkCIQCrWjv1F+RwNjDM2/Q4LJw7BDpyX/t1vNNtY8aqssTH1w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der
index d8bc1162ca4e03..98e95be1f1fc33 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem
index d62339af47b39b..4c0cdd71856f3a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDKN2q+K9GdoDXuPd99IrBL6FdaD8zgWiOxtPbWPALK4oAoGCCqGSM49
-AwEHoUQDQgAEQUdn8EqFR/R61QGrrrUQpXeDpCwvyDWfYxrCwKxCUF3VVpWyxLAi
-nA9MXHcPcNKMy4uOlGjKSfjQCbl1BT16Hw==
+MHcCAQEEIDRlyjgCT6FCtfpb7skRwkaptv6JykCnAgPaQxTbWPLEoAoGCCqGSM49
+AwEHoUQDQgAEPfMPJvOzSosDDJjKVZoR79U5I9nw6FnTYQ5hfFk47EK6MV0ceR7x
+MfxqpwyybdQyOV3s0fHnVeisuv2we8xbrw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json
index d96f20176be9b2..fbd4f875bd7a5a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201da30820181a00302010202086ca7ae68a174f258300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200040473b6e46ab7a9adea1f9f9a229f92112047413e70a62706dbe66b20c70a0183b984e2d99de9846c5017ca40a2055889bcdab15b5b4f9a68012dbd3242f1a370a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b6d4f3e57ecc06062b134e7ff9d05d7e124fd4bd301f0603551d23041830168014de4a765e886743722669d427dc10733aba5ddb24300a06082a8648ce3d040302034700304402203f5d27eb740e22f925a58d58f3ea9be188e25088e8b315f3d068d3cb3ac61c6d0220471e60c23cdf0606e587ec130cec6dd2cd9848cc6eb2a7fccbb3a9d408bfcd8c",
-    "pai_cert": "308201d33082017aa0030201020208583c2985505c4c04300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004414767f04a8547f47ad501abaeb510a57783a42c2fc8359f631ac2c0ac42505dd55695b2c4b0229c0f4c5c770f70d28ccb8b8e9468ca49f8d009b975053d7a1fa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414de4a765e886743722669d427dc10733aba5ddb24301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220014b02ecd8960b3d718088115789a0e03476928e605050d4a9083da54f20006902204a24c988702042b4f08c7adc89499d10738b18ad5dd22d0e095f9453671ae512",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c2c28f728a012835fe49a96cbcc7794538b5d3d4f5807f23770dd87dcd94022902207c1a32e7bc13812950142f0849ee137c9233e115985a0c6f74ac102174889a21",
-    "dac_private_key": "ddaf4cc392a898d250a30fefeac620cbfe6bdfb9c8826e1ffd859d2c41f97c3e",
-    "dac_public_key": "040473b6e46ab7a9adea1f9f9a229f92112047413e70a62706dbe66b20c70a0183b984e2d99de9846c5017ca40a2055889bcdab15b5b4f9a68012dbd3242f1a370"
+    "dac_cert": "308201db30820181a00302010202086518f350a8cdb774300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b9467b438dfc299fc2d84e1f5881a1df0f0eddaa9654cb72f91d943d114cc941d2e36956a62b6d6c065a68c6f4df3a30e5d9d010d253774962fbd158b9dcec9ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041481fd49ca83a7f7afd0daff2fcad534ad10b6275e301f0603551d23041830168014f8d8e95e64acb3916ef99b346fb10f1e8e7dd593300a06082a8648ce3d040302034800304502207e898ca2979f319eba260a5c68ea43e10660879fa71d150dc1a84cf28229d68e022100c2fcc928e7fda2e91e3ba59f9a652af68b595549f03e774418cbfce5a08be9ac",
+    "pai_cert": "308201d43082017aa00302010202085aebe9af5eb1b292300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043df30f26f3b34a8b030c98ca559a11efd53923d9f0e859d3610e617c5938ec42ba315d1c791ef131fc6aa70cb26dd432395decd1f1e755e8acbafdb07bcc5bafa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f8d8e95e64acb3916ef99b346fb10f1e8e7dd593301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022006cadb6cbfd256ac87afc217f183761758624f1fba0354c93145e6b6572146f9022100ab5a3bf517e4703630ccdbf4382c9c3b043a725ffb75bcd36d63c6aab2c4c7d7",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100eb2e7339e5fa623b2ac178dc56a043619450d70dd708b8891eff7fa15e68ebcf02206128bcb23417e9f8c67add6f4bf49cf3dbd547be249a48d253fa5b64490103b7",
+    "dac_private_key": "2133b4a655fc2dfad9c69daa8e86ca7c63ec1aec40df0d34f1a776bfe31dadbc",
+    "dac_public_key": "04b9467b438dfc299fc2d84e1f5881a1df0f0eddaa9654cb72f91d943d114cc941d2e36956a62b6d6c065a68c6f4df3a30e5d9d010d253774962fbd158b9dcec9b"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der
index c15f8b2aefba41..e95bf172cd1e0a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der
index c0d52b9e219bc8..cfa7bfb3d90f58 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem
index 6947252fe4808a..706b0e245697b1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2DCCAX+gAwIBAgIIYgS2i2TzvpQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2jCCAX+gAwIBAgIIRdc2agcgiA8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
 OTA3BgNVBAMMMEFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-RjEgTXBpZDpCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABD4TQymMOP7bs/cE
-zLgOO0gWghCTsUX3yn9NsFQ1sbZckg6myFPa1eirDb3QdMlnJbjWPBZVfJebHADm
-+c+kHQCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBRoI7vtSSFFv8ASAQFP2wbuS4/7bjAfBgNVHSMEGDAWgBSjADSPmqg4M/TBnBMc
-lDcq6iYhBTAKBggqhkjOPQQDAgNHADBEAiATWijDknkkazIKD/5xmcVJPlE2jk4G
-Jya99sVnOFSB7gIgZaDB6PSrRTVuUOuVqIKsx2/gMiyaxwCbY7uH9yykW/I=
+RjEgTXBpZDpCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHgrcjeVyMXlwBt2
+ensnbD6nSsUc4Gsgb2vpqmi1zbetmaKVsF1snUKmcG9MCRZeiH1jTBsgA89Ett6U
+aNr9zNqjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBTNzgkdBqaRv/23PGLSttJUWoxojTAfBgNVHSMEGDAWgBSMmj0ENolvSSvBxX5S
+xO442+xZNTAKBggqhkjOPQQDAgNJADBGAiEAt04LXs/yjyyfRhYzIB876i0f6GYL
+7VD0vsfaNaQG2IwCIQC7uj1JiBhCKR6CKIcEKE9ok9AJFDSuF6drpZkNowZXug==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der
index fd2d508c5b871d..6cf3cb1c2bbd30 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem
index b823e662025389..cf28ff35f88193 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPlsiyhfLSz2EEba7Yc4rmpyVOtNS8Iro2084HdfrgvkoAoGCCqGSM49
-AwEHoUQDQgAEPhNDKYw4/tuz9wTMuA47SBaCEJOxRffKf02wVDWxtlySDqbIU9rV
-6KsNvdB0yWcluNY8FlV8l5scAOb5z6QdAA==
+MHcCAQEEIIEIrk8squUoma4D0iE4TDIr2W7eer0SThfV7G5M1LV9oAoGCCqGSM49
+AwEHoUQDQgAEeCtyN5XIxeXAG3Z6eydsPqdKxRzgayBva+mqaLXNt62ZopWwXWyd
+QqZwb0wJFl6IfWNMGyADz0S23pRo2v3M2g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der
index 79410716bdfb5b..cf335504861898 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem
index 21cd7271464a39..e82b99056d7fa6 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIBr5QU3nb9aIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1TCCAXqgAwIBAgIIVoWsSomdvwIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASZ05hIjkmREDE31YzhHAqXH8taOt8W
-IXQdeNgNyZntae2QYHz54pC/dBL04gWa/t7Fh8Rfiiq5T6G4unTXNqWho2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUowA0
-j5qoODP0wZwTHJQ3KuomIQUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgDZsw1OIeM6VImRk7oGs4Bb0H/yxccXHs7JFX
-gSqSNegCIGJ6FHbqw+G51jc8ND5vU9kyh+zwK/iSwJqq1wcy+a8n
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT3UF1TBtvSByHCglTYGFnBOYELyImA
++x96RDWC8cE1CLYPfgibpWJ7/Nu+K1tY0ObBxa6iM2uOGMp41Y7pzjoeo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUjJo9
+BDaJb0krwcV+UsTuONvsWTUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAImoSTzlsp75m7Y8hvxeV6CCIhI8QE5UhWhP
+O+sNdCjSAiEA9F5nJ7Jh2Rau2mhVdMz6pUqbLQWtqyFHhxxcT/LUpEU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der
index e21a8f788ae27c..203f4759eb1d90 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem
index 43ce504a082dd9..32e1c5d75da702 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFdgHrg84ltLDGQPvR3CMmDH6YhnebHHSIIaxMx1ctpEoAoGCCqGSM49
-AwEHoUQDQgAEmdOYSI5JkRAxN9WM4RwKlx/LWjrfFiF0HXjYDcmZ7WntkGB8+eKQ
-v3QS9OIFmv7exYfEX4oquU+huLp01zaloQ==
+MHcCAQEEIOL7u+tUjos2ym0OyG4edywyRbhcSwgmKFTlW9rXFSmboAoGCCqGSM49
+AwEHoUQDQgAE91BdUwbb0gchwoJU2BhZwTmBC8iJgPsfekQ1gvHBNQi2D34Im6Vi
+e/zbvitbWNDmwcWuojNrjhjKeNWO6c46Hg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json
index a686423cbc2100..c8ae5216111419 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "true",
-    "dac_cert": "308201d83082017fa00302010202086204b68b64f3be94300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d030107034200043e1343298c38fedbb3f704ccb80e3b4816821093b145f7ca7f4db05435b1b65c920ea6c853dad5e8ab0dbdd074c96725b8d63c16557c979b1c00e6f9cfa41d00a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146823bbed492145bfc01201014fdb06ee4b8ffb6e301f0603551d23041830168014a300348f9aa83833f4c19c131c94372aea262105300a06082a8648ce3d04030203470030440220135a28c39279246b320a0ffe7199c5493e51368e4e062726bdf6c567385481ee022065a0c1e8f4ab45356e50eb95a882acc76fe0322c9ac7009b63bb87f72ca45bf2",
-    "pai_cert": "308201d33082017aa003020102020806be505379dbf5a2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000499d398488e4991103137d58ce11c0a971fcb5a3adf1621741d78d80dc999ed69ed90607cf9e290bf7412f4e2059afedec587c45f8a2ab94fa1b8ba74d736a5a1a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414a300348f9aa83833f4c19c131c94372aea262105301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200d9b30d4e21e33a54899193ba06b3805bd07ff2c5c7171ecec9157812a9235e80220627a1476eac3e1b9d6373c343e6f53d93287ecf02bf892c09aaad70732f9af27",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100aad7460a58995e9ce586a4e55e33527e5c648ebdbf302f286755db27c3b923c602202cff9b9f050f4aeaa7468cf1b6af091c9c53f8389324cef10299d7ea9d363f96",
-    "dac_private_key": "f96c8b285f2d2cf61046daed8738ae6a7254eb4d4bc22ba36d3ce0775fae0be4",
-    "dac_public_key": "043e1343298c38fedbb3f704ccb80e3b4816821093b145f7ca7f4db05435b1b65c920ea6c853dad5e8ab0dbdd074c96725b8d63c16557c979b1c00e6f9cfa41d00"
+    "dac_cert": "308201da3082017fa003020102020845d7366a0720880f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d03010703420004782b723795c8c5e5c01b767a7b276c3ea74ac51ce06b206f6be9aa68b5cdb7ad99a295b05d6c9d42a6706f4c09165e887d634c1b2003cf44b6de9468dafdccdaa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cdce091d06a691bffdb73c62d2b6d2545a8c688d301f0603551d230418301680148c9a3d0436896f492bc1c57e52c4ee38dbec5935300a06082a8648ce3d0403020349003046022100b74e0b5ecff28f2c9f461633201f3bea2d1fe8660bed50f4bec7da35a406d88c022100bbba3d49881842291e82288704284f6893d0091434ae17a76ba5990da30657ba",
+    "pai_cert": "308201d53082017aa00302010202085685ac4a899dbf02300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004f7505d5306dbd20721c28254d81859c139810bc88980fb1f7a443582f1c13508b60f7e089ba5627bfcdbbe2b5b58d0e6c1c5aea2336b8e18ca78d58ee9ce3a1ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148c9a3d0436896f492bc1c57e52c4ee38dbec5935301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210089a8493ce5b29ef99bb63c86fc5e57a08222123c404e5485684f3beb0d7428d2022100f45e6727b261d916aeda685574ccfaa54a9b2d05adab2147871c5c4ff2d4a445",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022029d94c00ec2edbd96f902ee085f93e5d1ead042a70b6e67d38cc1cf77339ac7b022100f0bf06e5ad0c8f0dcb9daa138b12d7a9b8fb57759dd194c76107e17280e7a9e9",
+    "dac_private_key": "8108ae4f2caae52899ae03d221384c322bd96ede7abd124e17d5ec6e4cd4b57d",
+    "dac_public_key": "04782b723795c8c5e5c01b767a7b276c3ea74ac51ce06b206f6be9aa68b5cdb7ad99a295b05d6c9d42a6706f4c09165e887d634c1b2003cf44b6de9468dafdccda"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der
index 949464f60af0aa..25a2de099307c9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der
index 59056056d7972f..af15b5b5669256 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem
index c3edcecff7adc1..c68f3b3d0dd655 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1zCCAX2gAwIBAgIIKJVPdN3JUvowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB1jCCAX2gAwIBAgIIAuVIyDZ3jtUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDkx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDkx
 NzA1BgNVBAMMLkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNcGlkOiBN
-dmlkOkZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQDJ9iFaO5SpXSY/wIT
-LNCaxcOaGCl7F52pQkzj6n1OJpSfBXm+3kRjCyJvFLDzRh+gJF8amTGto3r58UMf
-IkCio2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-fOkueohbDhcZJJoV5Di7K7+Vt60wHwYDVR0jBBgwFoAUCsd3nkBJAezBEyJ8o2ds
-XXeMnOAwCgYIKoZIzj0EAwIDSAAwRQIhAOyBwISjUdtGxBhrXm2gvmUwGVYOw9dt
-XFDFjC9ZNPPmAiAMuESHjH9mtNZwSmyvJn+CMemGywECQJKSsXIzQYdnGw==
+dmlkOkZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4sfxio+ExbKidjmeh
+berpXn+MV5k85E5MBW8C2xU3tfgCiuIAr81KlWjeMTcXaQ5M7Bu7UPqLWOGxHJdq
+ODxwo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+qPmgH+chVnKDvod/a7yVegJmH9MwHwYDVR0jBBgwFoAUJxMKHN4s/bYpexAh1sVe
+GFu16jkwCgYIKoZIzj0EAwIDRwAwRAIgRbm1w0EpFFlCBVh17DkpJ1iwu0d5fXgv
+LvIwV3eUDX4CIDEwdffps9dllp9ucdz4/bdFxUNRgy286EZiVyLyXxhV
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der
index ed4ee9ba63722d..a917f8d2b438f6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem
index 8e1907324a3eab..0dcc6efe62531f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJCbQF9lQ/jioY/LNXorKpa7lamitNGRpVnkB6rmg9EFoAoGCCqGSM49
-AwEHoUQDQgAEAyfYhWjuUqV0mP8CEyzQmsXDmhgpexedqUJM4+p9TiaUnwV5vt5E
-YwsibxSw80YfoCRfGpkxraN6+fFDHyJAog==
+MHcCAQEEIH4xly84rf6wbvLlREh4+Ynk7fLenCzUhscN/4/JAg2/oAoGCCqGSM49
+AwEHoUQDQgAEOLH8YqPhMWyonY5noW3q6V5/jFeZPOROTAVvAtsVN7X4AoriAK/N
+SpVo3jE3F2kOTOwbu1D6i1jhsRyXajg8cA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der
index f904f36d436ccf..95d79cc3e41422 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem
index 48106a72432ad6..1add203b43cbff 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIZAFfKTmaTRowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB0zCCAXqgAwIBAgIIUf03pXlOWRkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR/JHr1EkSXXob2EjYbaidr4bLL7NZv
-9WYsXfwU+NkqkbZBU8+WCVV1jPO0iIx2dR6Ks6cwwhHRmAtILuCcyrUpo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUCsd3
-nkBJAezBEyJ8o2dsXXeMnOAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKRHvnq99hOz2MSx2Mf2VaWnFbMkaSvFiyzj
-jCLFLqSvAiAucRqgQ6X7vDYe8fG531dsGWgXAB5U7+dsOWekQnU6BA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQjh5unjBZBybfwK9Ewq8BqY0wE/VDm
+9CrZ0/sJqP8aar5GdgpensXyPNEzlE3pLezGda/t6k9HXpFx6ZWvSySHo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJxMK
+HN4s/bYpexAh1sVeGFu16jkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgRwRQpzqkUKTPpqOef3DXfsTcL3P+bAx9Xr+k
+JJohhKwCIBCu7FpDCnsPPnu6bz4uXRfF6p+2mOzKroIZJktIaDCZ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der
index ece31cc341ec9b..b5fd3d63637aca 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem
index 9708b5852c27fd..228c7638eb4735 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJvuhtmGa61fCXrwlKd4TSJvdsr9F0z6RaZ6DK8qZIp/oAoGCCqGSM49
-AwEHoUQDQgAEfyR69RJEl16G9hI2G2ona+Gyy+zWb/VmLF38FPjZKpG2QVPPlglV
-dYzztIiMdnUeirOnMMIR0ZgLSC7gnMq1KQ==
+MHcCAQEEIDfh4g5FMJSr2VZRpkgkDxmOomBBN8CjnECo1zPtnH0CoAoGCCqGSM49
+AwEHoUQDQgAEI4ebp4wWQcm38CvRMKvAamNMBP1Q5vQq2dP7Caj/Gmq+RnYKXp7F
+8jzRM5RN6S3sxnWv7epPR16RcemVr0skhw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json
index 5e8aca85c2f1a4..9e39983387604b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "true",
-    "dac_cert": "308201d73082017da003020102020828954f74ddc952fa300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20444143203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d030107034200040327d88568ee52a57498ff02132cd09ac5c39a18297b179da9424ce3ea7d4e26949f0579bede44630b226f14b0f3461fa0245f1a9931ada37af9f1431f2240a2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147ce92e7a885b0e1719249a15e438bb2bbf95b7ad301f0603551d230418301680140ac7779e404901ecc113227ca3676c5d778c9ce0300a06082a8648ce3d0403020348003045022100ec81c084a351db46c4186b5e6da0be653019560ec3d76d5c50c58c2f5934f3e602200cb844878c7f66b4d6704a6caf267f8231e986cb0102409292b172334187671b",
-    "pai_cert": "308201d43082017aa003020102020864015f29399a4d1a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200047f247af51244975e86f612361b6a276be1b2cbecd66ff5662c5dfc14f8d92a91b64153cf960955758cf3b4888c76751e8ab3a730c211d1980b482ee09ccab529a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604140ac7779e404901ecc113227ca3676c5d778c9ce0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a447be7abdf613b3d8c4b1d8c7f655a5a715b324692bc58b2ce38c22c52ea4af02202e711aa043a5fbbc361ef1f1b9df576c196817001e54efe76c3967a442753a04",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220198a36be3313adae2c88cecdef13a2d2dca812208e5edfe93fc1726e40035c56022100a7ddeb481a0d1d308761fd1e8aeaef5373b5d35dfd47c0cc1acb6a0a19a192c1",
-    "dac_private_key": "909b405f6543f8e2a18fcb357a2b2a96bb95a9a2b4d191a559e407aae683d105",
-    "dac_public_key": "040327d88568ee52a57498ff02132cd09ac5c39a18297b179da9424ce3ea7d4e26949f0579bede44630b226f14b0f3461fa0245f1a9931ada37af9f1431f2240a2"
+    "dac_cert": "308201d63082017da003020102020802e548c836778ed5300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20444143203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000438b1fc62a3e1316ca89d8e67a16deae95e7f8c57993ce44e4c056f02db1537b5f8028ae200afcd4a9568de313717690e4cec1bbb50fa8b58e1b11c976a383c70a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a8f9a01fe721567283be877f6bbc957a02661fd3301f0603551d2304183016801427130a1cde2cfdb6297b1021d6c55e185bb5ea39300a06082a8648ce3d0403020347003044022045b9b5c34129145942055875ec39292758b0bb47797d782f2ef2305777940d7e0220313075f7e9b3d765969f6e71dcf8fdb745c54351832dbce846625722f25f1855",
+    "pai_cert": "308201d33082017aa003020102020851fd37a5794e5919300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000423879ba78c1641c9b7f02bd130abc06a634c04fd50e6f42ad9d3fb09a8ff1a6abe46760a5e9ec5f23cd133944de92decc675afedea4f475e9171e995af4b2487a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041427130a1cde2cfdb6297b1021d6c55e185bb5ea39301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220470450a73aa450a4cfa6a39e7f70d77ec4dc2f73fe6c0c7d5ebfa4249a2184ac022010aeec5a430a7b0f3e7bba6f3e2e5d17c5ea9fb698eccaae8219264b48683099",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502205bd2d16fefa65655f9a705fb428bd5ee01773de2e05b723af4148f54d14cffb2022100ed04766f4af742c816bfe1d72c2f269f18e6cd7768569bef21305f5e875bc0b5",
+    "dac_private_key": "7e31972f38adfeb06ef2e5444878f989e4edf2de9c2cd486c70dff8fc9020dbf",
+    "dac_public_key": "0438b1fc62a3e1316ca89d8e67a16deae95e7f8c57993ce44e4c056f02db1537b5f8028ae200afcd4a9568de313717690e4cec1bbb50fa8b58e1b11c976a383c70"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der
index 642ea6d873035a..c5b130d25d7f18 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der
index ffe8421d85c547..8d04f315802148 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem
index 2ed4d9923ea762..63aaa6f64bd634 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWOgAwIBAgIIZP9G9qO4OqAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBvTCCAWOgAwIBAgIIFwm21D5leEYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMB8x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMB8x
 HTAbBgNVBAMMFE12aWQ6RkZGIE1waWQ6MDBCMTB4MFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAE6dA7CLr2kD66givdQSxZpLKUnVoYEJtEdp+2xkUxfDZDD0SI2ldk
-PMShDdok/mpjNJpeZ5I7L1so4rUCNCvwP6NgMF4wDAYDVR0TAQH/BAIwADAOBgNV
-HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFIXOYBMVg94Dd4WFg97if6ntGZu0MB8GA1Ud
-IwQYMBaAFMx09ih0zGCPWoJAFjVCtn8N/THRMAoGCCqGSM49BAMCA0gAMEUCICAa
-+iUQdc/y2kMdyJWa3UtzTJcgXUc43e8HgKOG/eqIAiEAhIUdCyo6p//THRBCgsoK
-PAPDm8mhA6APkgGuEujWPNk=
+zj0DAQcDQgAEImiJ1h4mbvuSAm4myIrF0TOgDZwUutwRlRqP0P8YHGoInS/M328V
+Rr8hCUxC8rvVzFJGxoobu7dLEzDJOjhkDqNgMF4wDAYDVR0TAQH/BAIwADAOBgNV
+HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFJFiGLywnrJYdKzqVtqGYoFNkV29MB8GA1Ud
+IwQYMBaAFJkfmcpeVVE7cpf0Icn7SD/uaJ74MAoGCCqGSM49BAMCA0gAMEUCIBUC
+JEHKhV0qIyh5Xl8dpcrhAj4A+L5u1wXNYHkmZpGiAiEAqKz0RN3GuQJ1cUIxEwUX
+XaAcLuyIfgAyTRuxHfmxZ78=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der
index 26247c900fbf5b..5822f4e879e87e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem
index 020a32e4f45efc..619032165f13c5 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIS/1es6Y+H6vLCHYletNO0BjZQNz+RgKgIA0q+/MHcKoAoGCCqGSM49
-AwEHoUQDQgAE6dA7CLr2kD66givdQSxZpLKUnVoYEJtEdp+2xkUxfDZDD0SI2ldk
-PMShDdok/mpjNJpeZ5I7L1so4rUCNCvwPw==
+MHcCAQEEIDKEMqqGdIXf2w9CYwWCrP8eV8YHz6KOnSXxsZUGHwaQoAoGCCqGSM49
+AwEHoUQDQgAEImiJ1h4mbvuSAm4myIrF0TOgDZwUutwRlRqP0P8YHGoInS/M328V
+Rr8hCUxC8rvVzFJGxoobu7dLEzDJOjhkDg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der
index b4be77100fad6a..414329a0386664 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem
index c5fbba8666a646..a61e2f79d78ea9 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIIgvLeyGt7cwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIMVvjwSHDcEEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATXUUeBs+1u7Hf4ejvujV1LQtNGRosD
-tOxCYsOFa56kLQUVBwPafW8cUE0ApxYL0Am4w5B05j5hViYgV86LoDQ2o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzHT2
-KHTMYI9agkAWNUK2fw39MdEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAL5dR0BIJ/ukPyA8IlIYzEJXjz/z/0iAGSh5
-rwfpcEMGAiEA0agt1KTpCpNy3uk9M1IxaTv7AHwNoNV+yKyRa+TGMm8=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQmCuOhyAmJArwvY9shyDRMh3pO6sft
+4uKZYgLml0JNYZiRkSxFX/Dz3+wPHMjVkHAWevn5GiFzL7/BbFPGUeHJo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmR+Z
+yl5VUTtyl/QhyftIP+5onvgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMshV2U/mhdpLpzjLlMHmB59+yVppRYbaG2/
+gdDU/6W+AiBRgfq9jfcV2t3Ol+TM3iVy3Bx7hSxCbw583MGg0We2aQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der
index c15d0ac15dc208..420d1e4d6f2e68 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem
index f0282f4f766307..bd8aaced94886b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBU8C6va07UFqLgVkCtBFaNws+UYZZCz/D0j9mSsnOddoAoGCCqGSM49
-AwEHoUQDQgAE11FHgbPtbux3+Ho77o1dS0LTRkaLA7TsQmLDhWuepC0FFQcD2n1v
-HFBNAKcWC9AJuMOQdOY+YVYmIFfOi6A0Ng==
+MHcCAQEEIITY6T7+FZFqQsXYUylUcog4SG9GA8lZSs7sqhV/vXjZoAoGCCqGSM49
+AwEHoUQDQgAEJgrjocgJiQK8L2PbIcg0TId6TurH7eLimWIC5pdCTWGYkZEsRV/w
+89/sDxzI1ZBwFnr5+Rohcy+/wWxTxlHhyQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json
index 8ad8d83f1f4588..6f3c33f0f09a88 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid VID encoding",
     "is_success_case": "false",
-    "dac_cert": "308201bd30820163a003020102020864ff46f6a3b83aa0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d03010703420004e9d03b08baf6903eba822bdd412c59a4b2949d5a18109b44769fb6c645317c36430f4488da57643cc4a10dda24fe6a63349a5e67923b2f5b28e2b502342bf03fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041485ce60131583de0377858583dee27fa9ed199bb4301f0603551d23041830168014cc74f62874cc608f5a8240163542b67f0dfd31d1300a06082a8648ce3d04030203480030450220201afa251075cff2da431dc8959add4b734c97205d4738ddef0780a386fdea8802210084851d0b2a3aa7ffd31d104282ca0a3c03c39bc9a103a00f9201ae12e8d63cd9",
-    "pai_cert": "308201d53082017aa0030201020208220bcb7b21adedcc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004d7514781b3ed6eec77f87a3bee8d5d4b42d346468b03b4ec4262c3856b9ea42d05150703da7d6f1c504d00a7160bd009b8c39074e63e6156262057ce8ba03436a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414cc74f62874cc608f5a8240163542b67f0dfd31d1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100be5d47404827fba43f203c225218cc42578f3ff3ff4880192879af07e9704306022100d1a82dd4a4e90a9372dee93d335231693bfb007c0da0d57ec8ac916be4c6326f",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022040c568f8ceb019c28a367be658c810b141d157b5a5f230efa87b44b18f585a8202205c926d1c740560d711162805ebf6cdf2748b06ab6ed7b06df3fc8a9b74d3cbe3",
-    "dac_private_key": "84bfd5eb3a63e1fabcb0876257ad34ed018d940dcfe4602a0200d2afbf30770a",
-    "dac_public_key": "04e9d03b08baf6903eba822bdd412c59a4b2949d5a18109b44769fb6c645317c36430f4488da57643cc4a10dda24fe6a63349a5e67923b2f5b28e2b502342bf03f"
+    "dac_cert": "308201bd30820163a00302010202081709b6d43e657846300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d03010703420004226889d61e266efb92026e26c88ac5d133a00d9c14badc11951a8fd0ff181c6a089d2fccdf6f1546bf21094c42f2bbd5cc5246c68a1bbbb74b1330c93a38640ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414916218bcb09eb25874acea56da8662814d915dbd301f0603551d23041830168014991f99ca5e55513b7297f421c9fb483fee689ef8300a06082a8648ce3d0403020348003045022015022441ca855d2a2328795e5f1da5cae1023e00f8be6ed705cd6079266691a2022100a8acf444ddc6b902757142311305175da01c2eec887e00324d1bb11df9b167bf",
+    "pai_cert": "308201d43082017aa0030201020208315be3c121c37041300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004260ae3a1c8098902bc2f63db21c8344c877a4eeac7ede2e2996202e697424d619891912c455ff0f3dfec0f1cc8d59070167af9f91a21732fbfc16c53c651e1c9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414991f99ca5e55513b7297f421c9fb483fee689ef8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100cb2157653f9a17692e9ce32e5307981e7dfb2569a5161b686dbf81d0d4ffa5be02205181fabd8df715daddce97e4ccde2572dc1c7b852c426f0e7cdcc1a0d167b669",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ec5a3ea09ab47803ffc961536ecc11c23d1d2c51eb48a0d6992e6c319d0dc8e9022100a2a463706f470c04c82037c98d3af0e628f88968089faf1bc28fce0708c31f52",
+    "dac_private_key": "328432aa867485dfdb0f42630582acff1e57c607cfa28e9d25f1b195061f0690",
+    "dac_public_key": "04226889d61e266efb92026e26c88ac5d133a00d9c14badc11951a8fd0ff181c6a089d2fccdf6f1546bf21094c42f2bbd5cc5246c68a1bbbb74b1330c93a38640e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der
index cf8fe1212bf401..ed5b7738646861 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der
index 62c61d3f88d928..f8eb7053caac1f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem
index 7c01661796576a..a70210942b2ead 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXOgAwIBAgIISkLC9P+6Q+owCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBzDCCAXOgAwIBAgIIIitx1aHRPOkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
 LTArBgNVBAMMJE1waWRNdmlkOkZGRjEwIE1hdHRlciBUZXN0IE1waWQ6MDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABIc5gnNpaWniW04145ipOmak7qNi8ZbI
-y45jlFSnOOh8MBouSVjjVHmNbrzArvTUP3lU0fye1k2i32GbMg7z1PSjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTEOWH6WMNJ4/DF
-/b6WhHp0ZldbSDAfBgNVHSMEGDAWgBQQ9ol7OcdtyE9RLopRRzCaMI0XbjAKBggq
-hkjOPQQDAgNHADBEAiBg//cuhQzXwoyBHtoActTOW0HPUtjlecheCpI+VagKBAIg
-FTaQ7nEaJsurfPR/vO5YFcrBjGZjFvENt3X7QCYhvpI=
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABJzBPJvaW0RnMp/CguFAK2ytCJIVL1vU
+sBns5qUIs/cXWeOQJclm/vkmJOYlPYizz9qgLQYVD49J6AhFej8MGfCjYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSdaCX5qs6KEHKV
+2kd5QMMhpMRRoTAfBgNVHSMEGDAWgBRevkyXFL+sWJUbv5NQytu/Etao9zAKBggq
+hkjOPQQDAgNHADBEAiATgexv++hnJux/eOyvzCrN1gmVBAMs8vqO7JJQdELrMgIg
+PgTKlUIpS2PZmS+L33Owe8LWL4yqOkuCkfHBSQKY8PQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der
index 1e71cd4873961f..54410c40b446f2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem
index 2181a7af14217a..9afe13a81d555e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDMP1h+oCu23qA2kzaSBCw9KwTZhEdC/zOZfjPHyug87oAoGCCqGSM49
-AwEHoUQDQgAEhzmCc2lpaeJbTjXjmKk6ZqTuo2LxlsjLjmOUVKc46HwwGi5JWONU
-eY1uvMCu9NQ/eVTR/J7WTaLfYZsyDvPU9A==
+MHcCAQEEIAS+c1CQ1+Eal+JgF38f7Kyb06e//VDRcL4t9maV9JdqoAoGCCqGSM49
+AwEHoUQDQgAEnME8m9pbRGcyn8KC4UArbK0IkhUvW9SwGezmpQiz9xdZ45AlyWb+
++SYk5iU9iLPP2qAtBhUPj0noCEV6PwwZ8A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der
index 64fce72dda703d..0c9042a88b0000 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem
index 0430b6eac0b67b..b571ed2a8b948f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIFZB9AJHyl9gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIGsfIcrFlzaswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAROSsNc/c7iau7pIvFMIt03Yl52ohzl
-XK/7w27B0hlB3z1b2nB21+0DsJmNTMIZTh2w7loD+ZjMgAOop/3u1ApQo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUEPaJ
-eznHbchPUS6KUUcwmjCNF24wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJS0HhHT0TJ8kIYyy2IEMoCpHKg1vsBQcLMh
-HnoLPsvlAiEA7pfIQwvQIBwajsUSSlpeWpiegCnAe3GwJAHmMfDuio0=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQIfJSWhVUS7UUuvl1o46X527OhLcn4
+XFbgbatxH6rfbLmRnaplXkP9OpoLS1tsxKfOAwjeZWSIcyU3uJJUGMHUo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUXr5M
+lxS/rFiVG7+TUMrbvxLWqPcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgSHnzU8k12434iTZyHt0OVonP/D+Pd+l87t1d
+TXq4cggCIQC9aljd6cyB016IY3vd4Odi6ylVrnN/4BIjhXKipTOg0A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der
index caad95486b6737..6a040f6550a9b3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem
index 4455631c1f963d..58cf647d313db0 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGcvW3ex+/f4PcvaNLgnmhUGsGsitmdmx8PStgo8RQZUoAoGCCqGSM49
-AwEHoUQDQgAETkrDXP3O4mru6SLxTCLdN2JedqIc5Vyv+8NuwdIZQd89W9pwdtft
-A7CZjUzCGU4dsO5aA/mYzIADqKf97tQKUA==
+MHcCAQEEIJTpdibSWKPfpLF/dhEFRL4L88WPXLYXPFsAc4Y/So4zoAoGCCqGSM49
+AwEHoUQDQgAECHyUloVVEu1FLr5daOOl+duzoS3J+FxW4G2rcR+q32y5kZ2qZV5D
+/TqaC0tbbMSnzgMI3mVkiHMlN7iSVBjB1A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json
index 4ccbe21446666b..9b385b105c160b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: valid, but less human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201cc30820173a00302010202084a42c2f4ffba43ea300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d0301070342000487398273696969e25b4e35e398a93a66a4eea362f196c8cb8e639454a738e87c301a2e4958e354798d6ebcc0aef4d43f7954d1fc9ed64da2df619b320ef3d4f4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c43961fa58c349e3f0c5fdbe96847a7466575b48301f0603551d2304183016801410f6897b39c76dc84f512e8a5147309a308d176e300a06082a8648ce3d0403020347003044022060fff72e850cd7c28c811eda0072d4ce5b41cf52d8e579c85e0a923e55a80a040220153690ee711a26cbab7cf47fbcee5815cac18c666316f10db775fb402621be92",
-    "pai_cert": "308201d53082017aa003020102020815907d0091f297d8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044e4ac35cfdcee26aeee922f14c22dd37625e76a21ce55caffbc36ec1d21941df3d5bda7076d7ed03b0998d4cc2194e1db0ee5a03f998cc8003a8a7fdeed40a50a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041410f6897b39c76dc84f512e8a5147309a308d176e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210094b41e11d3d1327c908632cb62043280a91ca835bec05070b3211e7a0b3ecbe5022100ee97c8430bd0201c1a8ec5124a5a5e5a989e8029c07b71b02401e631f0ee8a8d",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220730959456261f2e70b55384204c77675d000e1e320b79d097af898b424afa507022100ddbbcc817de33a3197e059f1af924d8ef1d046d185010567b7be49af29e213bd",
-    "dac_private_key": "330fd61fa80aedb7a80da4cda4810b0f4ac1366111d0bfcce65f8cf1f2ba0f3b",
-    "dac_public_key": "0487398273696969e25b4e35e398a93a66a4eea362f196c8cb8e639454a738e87c301a2e4958e354798d6ebcc0aef4d43f7954d1fc9ed64da2df619b320ef3d4f4"
+    "dac_cert": "308201cc30820173a0030201020208222b71d5a1d13ce9300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200049cc13c9bda5b4467329fc282e1402b6cad0892152f5bd4b019ece6a508b3f71759e39025c966fef92624e6253d88b3cfdaa02d06150f8f49e808457a3f0c19f0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149d6825f9aace8a107295da477940c321a4c451a1301f0603551d230418301680145ebe4c9714bfac58951bbf9350cadbbf12d6a8f7300a06082a8648ce3d040302034700304402201381ec6ffbe86726ec7f78ecafcc2acdd6099504032cf2fa8eec92507442eb3202203e04ca9542294b63d9992f8bdf73b07bc2d62f8caa3a4b8291f1c1490298f0f4",
+    "pai_cert": "308201d43082017aa00302010202081ac7c872b165cdab300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004087c9496855512ed452ebe5d68e3a5f9dbb3a12dc9f85c56e06dab711faadf6cb9919daa655e43fd3a9a0b4b5b6cc4a7ce0308de656488732537b8925418c1d4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145ebe4c9714bfac58951bbf9350cadbbf12d6a8f7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204879f353c935db8df88936721edd0e5689cffc3f8f77e97ceedd5d4d7ab87208022100bd6a58dde9cc81d35e88637bdde0e762eb2955ae737fe012238572a2a533a0d0",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e77fd18b36a4d3211fb7ee5c3042961df807093662e210d9917e25510eb16f5902210087a9c532d3bf9442c3fc8abe3c1416fb237f721b09184dbfe8880ed82c6d1343",
+    "dac_private_key": "04be735090d7e11a97e260177f1fecac9bd3a7bffd50d170be2df66695f4976a",
+    "dac_public_key": "049cc13c9bda5b4467329fc282e1402b6cad0892152f5bd4b019ece6a508b3f71759e39025c966fef92624e6253d88b3cfdaa02d06150f8f49e808457a3f0c19f0"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der
index 1d1d4f9dfebb11..9eafdeca2c5be5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der
index 2bad5b91f5c1de..5e058f15ff72a4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem
index e593ced99edc2f..2b6bbd9792f488 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByTCCAW6gAwIBAgIIAglJTHEE31swCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIByTCCAW6gAwIBAgIIJ45b3h2TMZwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
 KDAmBgNVBAMMH01hdHRlciBEZXZlbCBEQUMgTXBpZDpNdmlkOkZmZjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAAQhY+w2hGrr3N2TrWxvMxnNq05O5yOZJtrOhd0p
-d65t+xOAMY9ECXQjygljzmseAgUyIxFTOHQfnwTnEYeQiz/3o2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUxzMlsu45Jd9w3JvzMiOt
-8mYZ1ZkwHwYDVR0jBBgwFoAUA62TF1Iu3Y7THSD9vtPskE7DUU4wCgYIKoZIzj0E
-AwIDSQAwRgIhAOJCp3hosz041ly23xvcn08tCysjaT2giTVkUW2KdK1lAiEAwyEA
-l3WKyVk2qLWshrRp1GxviZR/LGSUZ3QPr/OCUf4=
+hkjOPQIBBggqhkjOPQMBBwNCAAQPTyr25kU+9k7JwRuOPoyadkTZJ/+9v0f/1bzS
+NoAydNBx/u9jeYMXZkYoUOlHxHJy/aVOS5Rg2LoIjRAduYSPo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUemfzsm3Y6nidqX7t9Lgo
+XKudFNswHwYDVR0jBBgwFoAUsreMFKQanWi+c5wJov0/7Z8PIfQwCgYIKoZIzj0E
+AwIDSQAwRgIhAIWu/SiZtGSK9+40SOmzotFAAqQl+3OFPLNPKcGNDcJ7AiEA7Aut
+yvi3ihKeFhivBsRbQgjCIXQekB7hrhdguSXj9+k=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der
index d957248d4aa4c5..149072b7380e1d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem
index 2131b962d71a20..ab3117fb003835 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGP1wZOcoMOnhYj4mHxravXji+YARuNdais53nVboSafoAoGCCqGSM49
-AwEHoUQDQgAEIWPsNoRq69zdk61sbzMZzatOTucjmSbazoXdKXeubfsTgDGPRAl0
-I8oJY85rHgIFMiMRUzh0H58E5xGHkIs/9w==
+MHcCAQEEIP6VgKXIgWBBs72lii01PW2fVYgB3dz7IQs0dYloeAemoAoGCCqGSM49
+AwEHoUQDQgAED08q9uZFPvZOycEbjj6MmnZE2Sf/vb9H/9W80jaAMnTQcf7vY3mD
+F2ZGKFDpR8Rycv2lTkuUYNi6CI0QHbmEjw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der
index 3357445da9e552..20312dbf708520 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem
index 43e1047877e345..c6e223a8b0c9f1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIRmx3stYqJ8kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB0zCCAXqgAwIBAgIIZxPTDGemVVUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASBiFafy8nP5UBxvT4jtet7k7dLNPdb
-0yHhmdMB7BcycwYuKPtvIlQMf+Aldyv/7BCidzdyn9098Z5tAtxMwd1Io2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUA62T
-F1Iu3Y7THSD9vtPskE7DUU4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJHxbLJl1C/zlGc9puR06WR2yC6rLS5HwsZ7
-N9RfnHGkAiBxC7hPtYEDEl22wpXqqXUt3XzIqT9M2k4NxSDT3++atg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQXZ0wtop3KWFSCGWwsGKmtsRJUyGMU
+62xBosc7j6ZJAX5zcv9/yOfHJHC3zgV+nNu8XzoHmJ/VFpEvCUx5we7go2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUsreM
+FKQanWi+c5wJov0/7Z8PIfQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgA98b5eYDTxuHIYZ8kFrpp+mE8p3W7UBV0MsM
+DzumKbECIAn+vDEbKT9bT+cUbrjrCsNvvqtM95+Vw54m/BBFaQ7h
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der
index 7e1375ea15b783..d3af2abcd8149e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem
index 1e9b241887e6b3..e67ec7f7f94a1a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH5YfhOlhdZB1j6HzI0D4od1djFFzaUMN2PwdAt0I1CzoAoGCCqGSM49
-AwEHoUQDQgAEgYhWn8vJz+VAcb0+I7Xre5O3SzT3W9Mh4ZnTAewXMnMGLij7byJU
-DH/gJXcr/+wQonc3cp/dPfGebQLcTMHdSA==
+MHcCAQEEIA8UbQqTAVI+/u8Nt6NifiUus3hh6RXgmRQ2/Plmwff9oAoGCCqGSM49
+AwEHoUQDQgAEF2dMLaKdylhUghlsLBiprbESVMhjFOtsQaLHO4+mSQF+c3L/f8jn
+xyRwt84FfpzbvF86B5if1RaRLwlMecHu4A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json
index 6fb7a4d8d12b3f..7c8dc423526f89 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid, PID not present and VID not upper case",
     "is_success_case": "false",
-    "dac_cert": "308201c93082016ea00302010202080209494c7104df5b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20444143204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d030107034200042163ec36846aebdcdd93ad6c6f3319cdab4e4ee7239926dace85dd2977ae6dfb1380318f44097423ca0963ce6b1e02053223115338741f9f04e71187908b3ff7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c73325b2ee3925df70dc9bf33223adf26619d599301f0603551d2304183016801403ad9317522edd8ed31d20fdbed3ec904ec3514e300a06082a8648ce3d0403020349003046022100e242a77868b33d38d65cb6df1bdc9f4f2d0b2b23693da0893564516d8a74ad65022100c3210097758ac95936a8b5ac86b469d46c6f89947f2c649467740faff38251fe",
-    "pai_cert": "308201d43082017aa0030201020208466c77b2d62a27c9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200048188569fcbc9cfe54071bd3e23b5eb7b93b74b34f75bd321e199d301ec173273062e28fb6f22540c7fe025772bffec10a27737729fdd3df19e6d02dc4cc1dd48a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041403ad9317522edd8ed31d20fdbed3ec904ec3514e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210091f16cb265d42ff394673da6e474e96476c82eab2d2e47c2c67b37d45f9c71a40220710bb84fb58103125db6c295eaa9752ddd7cc8a93f4cda4e0dc520d3dfef9ab6",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201136b40647485b84f8c9a1b014b3dcb7143f0a1ce435595dd4904ccbdaea4e30022100b4c0f22e485f9014e75fea971b56fff5801eb2ea4971206614d7b4ab5954379c",
-    "dac_private_key": "63f5c1939ca0c3a78588f8987c6b6af5e38be60046e35d6a2b39de755ba1269f",
-    "dac_public_key": "042163ec36846aebdcdd93ad6c6f3319cdab4e4ee7239926dace85dd2977ae6dfb1380318f44097423ca0963ce6b1e02053223115338741f9f04e71187908b3ff7"
+    "dac_cert": "308201c93082016ea0030201020208278e5bde1d93319c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20444143204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d030107034200040f4f2af6e6453ef64ec9c11b8e3e8c9a7644d927ffbdbf47ffd5bcd236803274d071feef6379831766462850e947c47272fda54e4b9460d8ba088d101db9848fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147a67f3b26dd8ea789da97eedf4b8285cab9d14db301f0603551d23041830168014b2b78c14a41a9d68be739c09a2fd3fed9f0f21f4300a06082a8648ce3d040302034900304602210085aefd2899b4648af7ee3448e9b3a2d14002a425fb73853cb34f29c18d0dc27b022100ec0badcaf8b78a129e1618af06c45b4208c221741e901ee1ae1760b925e3f7e9",
+    "pai_cert": "308201d33082017aa00302010202086713d30c67a65555300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000417674c2da29dca585482196c2c18a9adb11254c86314eb6c41a2c73b8fa649017e7372ff7fc8e7c72470b7ce057e9cdbbc5f3a07989fd516912f094c79c1eee0a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b2b78c14a41a9d68be739c09a2fd3fed9f0f21f4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022003df1be5e6034f1b8721867c905ae9a7e984f29dd6ed4055d0cb0c0f3ba629b1022009febc311b293f5b4fe7146eb8eb0ac36fbeab4cf79f95c39e26fc1045690ee1",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022059ed1566d873ec02ed3a966dca830403b2a6a285af230e09f06c29627da62ca1022005f431992215f1fc38be50d86be77007498b52fcdc4a458715145604c2ff3da4",
+    "dac_private_key": "fe9580a5c8816041b3bda58a2d353d6d9f558801dddcfb210b347589687807a6",
+    "dac_public_key": "040f4f2af6e6453ef64ec9c11b8e3e8c9a7644d927ffbdbf47ffd5bcd236803274d071feef6379831766462850e947c47272fda54e4b9460d8ba088d101db9848f"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der
index a658123b4a2dc7..4bca7171a623e5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der
index 012341086e522f..2601c6266d2a4b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem
index b5ef594e1daddd..d4f21847a8b975 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXOgAwIBAgIIAwSbdenlXoowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBzDCCAXOgAwIBAgIIJoawc3KzJl8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
 LTArBgNVBAMMJE1hdHRlciBEZXZlbCBEQUMgTXBpZDowMEIxIE1WSUQ6RkZGMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABLERGMh2+VIec4ff3jXX/y+2K4B0xCng
-bTi3AWuSZ54876kOaJtUgqyj49ExaPlFMAP52vxv9adtYObLRL/DN5ejYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTHLGFQADuhhYAC
-M9bAHTvQtfqt/DAfBgNVHSMEGDAWgBT8VbWSU75QgMHBhgz30F8SBEBh+DAKBggq
-hkjOPQQDAgNIADBFAiAQCbDmDCyTy+kZNj0oFX+0ffMhS49MwyXHVUwsh/4VtQIh
-AMyAxN6rNheGfIenXawbspz3Znm57QFIAguouchkbYTo
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABD2YE7Dh/stS3xRYC1y57dWtzrSxQrkn
+9yh7+eFnAp8rsZ/HPiEhjDUQuRlZv+TJsFMOTaMIGpPQmB9/6ii7O3KjYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSnp8GK8BOOaw8n
+mIc0YP62llHsvDAfBgNVHSMEGDAWgBTxmCYaRU/vsZLnUJqoVj2CIzPc6jAKBggq
+hkjOPQQDAgNHADBEAiAGS75l2yaxBRTrxgmCApKHlIoavPSlcZw/9ojF/Ug9GAIg
+Jk77kqyrTSt54EqN5Febbq6sRzTNnAdbeZXliuncgdA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der
index 1339956d09fdba..85f22fd08ee3a8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem
index 1651b0ba2bbf2b..e72a4a5a35a485 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOAkdz0MpRFbwd+AtPNMhhV2ueY9pV0s4AM/dN+kbMRRoAoGCCqGSM49
-AwEHoUQDQgAEsREYyHb5Uh5zh9/eNdf/L7YrgHTEKeBtOLcBa5JnnjzvqQ5om1SC
-rKPj0TFo+UUwA/na/G/1p21g5stEv8M3lw==
+MHcCAQEEIOt817JNX/cGRmcDkd8lmfGVCyGeqp7KXq5Xnc2+eSdHoAoGCCqGSM49
+AwEHoUQDQgAEPZgTsOH+y1LfFFgLXLnt1a3OtLFCuSf3KHv54WcCnyuxn8c+ISGM
+NRC5GVm/5MmwUw5Nowgak9CYH3/qKLs7cg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der
index 4a129db6e99256..1d412b898d5641 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem
index 90d84795955556..3c9496345a8098 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIewrFANQKBlIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1DCCAXqgAwIBAgIIKwCw0pZt1n0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARbkhHNEwr5Brl5QwxWqZzFnLQEg1KQ
-hI14uPFUpfbyMOyf5v2CSQiZOLohzQIxllJa7DcyzFpYQMN5XjMbXaMFo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU/FW1
-klO+UIDBwYYM99BfEgRAYfgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgWHYqJem/PjwZnQG1BCJb+xwIfWSqkVfBoZE5
-X1MpQaoCIEKGmKEwVUmiAakXJdtwshVntjIkiRkDOS7PqxmmLyuy
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASjOBi50XxkvFyanADuEtQ6qd1655Lo
+VV1BwRknO2I8MdhlH5zGHqqEe00A8nn7ztW0Jql2jBAJDNWrt4TdxQW3o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8Zgm
+GkVP77GS51CaqFY9giMz3OowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgIFviMFKoJty0ZEFS+ILKp8+8/YontJyttcBs
+7PFyRcICIQDLhyKSPuEfr+kRErVzelLJiUhyj0XgBA9EYWjvijFT2Q==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der
index 68110a9595883e..03d764ac430fc4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem
index 8ada7674462ccd..b0cb3b31f73645 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBq6xSBmvj8kIMUp0/VmXgURaSmP1Ce3aVLgaYcZTISSoAoGCCqGSM49
-AwEHoUQDQgAEW5IRzRMK+Qa5eUMMVqmcxZy0BINSkISNeLjxVKX28jDsn+b9gkkI
-mTi6Ic0CMZZSWuw3MsxaWEDDeV4zG12jBQ==
+MHcCAQEEIMT4q16XArgG4XNJHKQq8gjcF01i+ItBV0oAUldjjF2OoAoGCCqGSM49
+AwEHoUQDQgAEozgYudF8ZLxcmpwA7hLUOqndeueS6FVdQcEZJztiPDHYZR+cxh6q
+hHtNAPJ5+87VtCapdowQCQzVq7eE3cUFtw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json
index 05f2ece6d3c99d..e780b85c0d4f47 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid VID prefix",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820173a003020102020803049b75e9e55e8a300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b11118c876f9521e7387dfde35d7ff2fb62b8074c429e06d38b7016b92679e3cefa90e689b5482aca3e3d13168f9453003f9dafc6ff5a76d60e6cb44bfc33797a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c72c6150003ba185800233d6c01d3bd0b5faadfc301f0603551d23041830168014fc55b59253be5080c1c1860cf7d05f12044061f8300a06082a8648ce3d040302034800304502201009b0e60c2c93cbe919363d28157fb47df3214b8f4cc325c7554c2c87fe15b5022100cc80c4deab3617867c87a75dac1bb29cf76679b9ed0148020ba8b9c8646d84e8",
-    "pai_cert": "308201d33082017aa00302010202087b0ac500d40a0652300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200045b9211cd130af906b979430c56a99cc59cb404835290848d78b8f154a5f6f230ec9fe6fd8249089938ba21cd023196525aec3732cc5a5840c3795e331b5da305a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414fc55b59253be5080c1c1860cf7d05f12044061f8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022058762a25e9bf3e3c199d01b504225bfb1c087d64aa9157c1a191395f532941aa0220428698a1305549a201a91725db70b21567b63224891903392ecfab19a62f2bb2",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100d1ca7efb52e07bdeb3e3a050c5757339fa4975b939509071a10f58e09871a9e502201c8dc0b248afe230c69fc5bb178eac9d3946884064a47ac7a8f70a7a5fce561c",
-    "dac_private_key": "e024773d0ca5115bc1df80b4f34c861576b9e63da55d2ce0033f74dfa46cc451",
-    "dac_public_key": "04b11118c876f9521e7387dfde35d7ff2fb62b8074c429e06d38b7016b92679e3cefa90e689b5482aca3e3d13168f9453003f9dafc6ff5a76d60e6cb44bfc33797"
+    "dac_cert": "308201cc30820173a00302010202082686b07372b3265f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d030107034200043d9813b0e1fecb52df14580b5cb9edd5adceb4b142b927f7287bf9e167029f2bb19fc73e21218c3510b91959bfe4c9b0530e4da3081a93d0981f7fea28bb3b72a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a7a7c18af0138e6b0f2798873460feb69651ecbc301f0603551d23041830168014f198261a454fefb192e7509aa8563d822333dcea300a06082a8648ce3d04030203470030440220064bbe65db26b10514ebc60982029287948a1abcf4a5719c3ff688c5fd483d180220264efb92acab4d2b79e04a8de4579b6eaeac4734cd9c075b7995e58ae9dc81d0",
+    "pai_cert": "308201d43082017aa00302010202082b00b0d2966dd67d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a33818b9d17c64bc5c9a9c00ee12d43aa9dd7ae792e8555d41c119273b623c31d8651f9cc61eaa847b4d00f279fbced5b426a9768c10090cd5abb784ddc505b7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f198261a454fefb192e7509aa8563d822333dcea301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220205be23052a826dcb4644152f882caa7cfbcfd8a27b49cadb5c06cecf17245c2022100cb8722923ee11fafe91112b5737a52c98948728f45e0040f446168ef8a3153d9",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100a333d5d1b07fd518f4aa0aca7f864d94a31fe5330d0095402e0d035236608e17022100884ac815147940d2f6fce3de826a50562242300c10cb6a93167d9cac8c89bab7",
+    "dac_private_key": "eb7cd7b24d5ff70646670391df2599f1950b219eaa9eca5eae579dcdbe792747",
+    "dac_public_key": "043d9813b0e1fecb52df14580b5cb9edd5adceb4b142b927f7287bf9e167029f2bb19fc73e21218c3510b91959bfe4c9b0530e4da3081a93d0981f7fea28bb3b72"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der
index 4a6134d504a923..d00b9434da8a46 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der
index 94f1f236421e65..f1d76ce7610ca1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem
index 11570b92365ed8..f1f5c8971f48cf 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXOgAwIBAgIIeUpZBB9o7VMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBzDCCAXOgAwIBAgIIVg2NMaqRvN8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
 LTArBgNVBAMMJE1hdHRlciBEZXZlbCBEQUMgTXBpZF8wMEIxIE12aWRfRkZGMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABJUPeKyFf7tQDod2AsD0Id03WTm8sQ5P
-KowETH0rTL/MUQXhYLfIm70v7bQGNPJzt0OgtGALMuV8Qb4DNYY3qISjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBT4cA4LwxTHokHM
-yFdMN93HXDfTBTAfBgNVHSMEGDAWgBQnCLl4sQ5OPiOcrw2Ud+CWGwSPqzAKBggq
-hkjOPQQDAgNHADBEAiA2+ixT5wJc0ygfmhIL+94ortWkEisDppqHn763DEWEwQIg
-JRE6jAeHmJVk1sYmeF/vPlfSZHE98z4Gj5bmh/x/IVQ=
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABIWMkD+Ug4B9PPc81FW4ujTVTquLawM3
+szXXFJXdEPaWFmuKwK3GWtSjXDQTJgZbIT98JI9M/AwxUv+QdWAdnVCjYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSQaOIG9fJcSFTN
+7kfhGfSKJLgVQzAfBgNVHSMEGDAWgBTbxw0HeyeB+qFGZxBhgYmZiMVtazAKBggq
+hkjOPQQDAgNHADBEAiBt5V0DGrN+dKLdBag8dKSI8a9ln9ecu25Y0bB7f/GbnQIg
+KrOBUG8Ly96pY3swE1LT68sShbiJKF5RD5XctgNCEnc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der
index 9af57982c7e956..473d49b613f743 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem
index 68490b693e41fb..bf67dd00fc2212 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDzgnsKU5+31EKGlbMTI/K+6MkXtdBct9K+6OJqtGiItoAoGCCqGSM49
-AwEHoUQDQgAElQ94rIV/u1AOh3YCwPQh3TdZObyxDk8qjARMfStMv8xRBeFgt8ib
-vS/ttAY08nO3Q6C0YAsy5XxBvgM1hjeohA==
+MHcCAQEEIEUlSfHnDFz4hjpW5nFk4rW71TfAENYDkZt3WmUSFXBhoAoGCCqGSM49
+AwEHoUQDQgAEhYyQP5SDgH089zzUVbi6NNVOq4trAzezNdcUld0Q9pYWa4rArcZa
+1KNcNBMmBlshP3wkj0z8DDFS/5B1YB2dUA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der
index 981e9c8ed772f4..df78e8d5f0cba9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem
index 7ab49654cb6156..323e22afc8d7b2 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIZxAvvLVv4dAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB0zCCAXqgAwIBAgIIY0hkFn57Ob0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATq3AEM9Uyw89EUy5pPmK7741N0t1Aa
-MInOnCjXTGn/Dy9dDDBFB6AazqzCD/tcXwAjCxF0YHTIelaPippagmC4o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJwi5
-eLEOTj4jnK8NlHfglhsEj6swHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgMRC6Nx5N1EEcRYC5D8t1oid/Ln6jCW/Ok5Ld
-KEnLQIUCIQCv04dnG5Z9SpkMXQQOg0Qvwep1rO/5erCd5j3xilOPxg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQs49kjA/uYDD/G86Stcnf2Bd68L3t1
+/xZrmm8JMwbuf+SKVDXYqRjEtV8BoLXm/nu2W2tS5BZzE7uWl6nbXRTOo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU28cN
+B3sngfqhRmcQYYGJmYjFbWswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgTE1uIA/veJz/c7bkpeAxFybHmIFb8aVElxOp
+VmZlFTICICeApLnNJAgz1YFnbQ2+QgU046TUNko6+MM/RDRaQPIi
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der
index 78b6a10d8a70e5..1bec7a000dd95c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem
index a78f411d039915..291a5c8971f237 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMywPXTBNUAMKAyii/HEVEfiAxZxJs3/R8wbgt1mqCs4oAoGCCqGSM49
-AwEHoUQDQgAE6twBDPVMsPPRFMuaT5iu++NTdLdQGjCJzpwo10xp/w8vXQwwRQeg
-Gs6swg/7XF8AIwsRdGB0yHpWj4qaWoJguA==
+MHcCAQEEIG3E4ILZmuH5CpP6izCl+ksJ8jsggl9IES7HsNTQkUGRoAoGCCqGSM49
+AwEHoUQDQgAELOPZIwP7mAw/xvOkrXJ39gXevC97df8Wa5pvCTMG7n/kilQ12KkY
+xLVfAaC15v57tltrUuQWcxO7lpep210Uzg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json
index d620ab73a7729d..b68a1dd44c12de 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid PID and VID prefixes",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820173a0030201020208794a59041f68ed53300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d03010703420004950f78ac857fbb500e877602c0f421dd375939bcb10e4f2a8c044c7d2b4cbfcc5105e160b7c89bbd2fedb40634f273b743a0b4600b32e57c41be03358637a884a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f8700e0bc314c7a241ccc8574c37ddc75c37d305301f0603551d230418301680142708b978b10e4e3e239caf0d9477e0961b048fab300a06082a8648ce3d0403020347003044022036fa2c53e7025cd3281f9a120bfbde28aed5a4122b03a69a879fbeb70c4584c1022025113a8c0787989564d6c626785fef3e57d264713df33e068f96e687fc7f2154",
-    "pai_cert": "308201d43082017aa003020102020867102fbcb56fe1d0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004eadc010cf54cb0f3d114cb9a4f98aefbe35374b7501a3089ce9c28d74c69ff0f2f5d0c304507a01aceacc20ffb5c5f00230b11746074c87a568f8a9a5a8260b8a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604142708b978b10e4e3e239caf0d9477e0961b048fab301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203110ba371e4dd4411c4580b90fcb75a2277f2e7ea3096fce9392dd2849cb4085022100afd387671b967d4a990c5d040e83442fc1ea75aceff97ab09de63df18a538fc6",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100831b9b9b9c6d589cdd0ec80ba19c5984a4cb81b6491d0000d8f589eeb3adf10e02201c040145b7d4979cb5e5927f80e9896ca1a2f4472ac719c401d57ee670acafae",
-    "dac_private_key": "3ce09ec294e7edf510a1a56cc4c8fcafba3245ed74172df4afba389aad1a222d",
-    "dac_public_key": "04950f78ac857fbb500e877602c0f421dd375939bcb10e4f2a8c044c7d2b4cbfcc5105e160b7c89bbd2fedb40634f273b743a0b4600b32e57c41be03358637a884"
+    "dac_cert": "308201cc30820173a0030201020208560d8d31aa91bcdf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d03010703420004858c903f9483807d3cf73cd455b8ba34d54eab8b6b0337b335d71495dd10f696166b8ac0adc65ad4a35c341326065b213f7c248f4cfc0c3152ff9075601d9d50a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149068e206f5f25c4854cdee47e119f48a24b81543301f0603551d23041830168014dbc70d077b2781faa14667106181899988c56d6b300a06082a8648ce3d040302034700304402206de55d031ab37e74a2dd05a83c74a488f1af659fd79cbb6e58d1b07b7ff19b9d02202ab381506f0bcbdea9637b301352d3ebcb1285b889285e510f95dcb603421277",
+    "pai_cert": "308201d33082017aa0030201020208634864167e7b39bd300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200042ce3d92303fb980c3fc6f3a4ad7277f605debc2f7b75ff166b9a6f093306ee7fe48a5435d8a918c4b55f01a0b5e6fe7bb65b6b52e4167313bb9697a9db5d14cea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414dbc70d077b2781faa14667106181899988c56d6b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204c4d6e200fef789cff73b6e4a5e0311726c798815bf1a5449713a9566665153202202780a4b9cd240833d581676d0dbe420534e3a4d4364a3af8c33f44345a40f222",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207d0bae88c626436b800173b592788d95ef3537cb221243de2721101e99bbc11802201d9bc69783677291529edd5afa4c3df3d5ed5f8c4514e7b3149b78b6ec29ffda",
+    "dac_private_key": "452549f1e70c5cf8863a56e67164e2b5bbd537c010d603919b775a6512157061",
+    "dac_public_key": "04858c903f9483807d3cf73cd455b8ba34d54eab8b6b0337b335d71495dd10f696166b8ac0adc65ad4a35c341326065b213f7c248f4cfc0c3152ff9075601d9d50"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der
index 5c361a1e4f80d3..9a993fb7995708 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der
index 3c702f3f89104c..00c423477ed9f7 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem
index dfaa5701772e1e..fc76279671c0ac 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBjCCAa2gAwIBAgIIXOBk8tjorLgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIICBzCCAa2gAwIBAgIIbwEkPkVQQiEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
 RjIgTXBpZDowMEIyMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQgikx7krvdtSEwdPi4
-n7UtOqb4mL5VqNTsSKsmQ8wlkncxk9Ooo4r5xjqL7LowIOm3ccr9pjiAf6GHeZ6b
-NU+1o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-YiIUdqU9XdAcJWekJ5REHhoa8zAwHwYDVR0jBBgwFoAUNy+xQBmn4BRgXsWV8KCk
-qDGXUOUwCgYIKoZIzj0EAwIDRwAwRAIgGJhA7y8O0PIUHbBROtjPiyD2t+4XeE4T
-L9gVJmfLzwACIFa8SOpbfM0nghumx4j5MgulI57DQIbG51wVi5zJAWbH
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASj5jHAGTvFGqBIyQwH
+DExq9BfeBnBwcSI8IDU7a8rim3feUfR3wBn6J+0h6hgCqh2XDuYzG+6mtpQWErNH
+4c/so2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+Z5szM3RMZw4kR5wDfYlxXdXfg4MwHwYDVR0jBBgwFoAUx+i3HGjb7lsGb3zJ5e9p
+nbOA/wIwCgYIKoZIzj0EAwIDSAAwRQIhAIUs4cHLSglk+4N9UvsggxBnRC/Jkvck
+ooCzq4QXa8sHAiAMXqtSq/Q+wcV10MpVm6S7WfU4M5zxhHyvdkDqTTxVpg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der
index 3c59f4b2737d9f..b3d69672f2ae84 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem
index a2247638c089aa..8617d66f7fd1d2 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGPbdbiSSx/vROE6fxto6bmJX7jSrHkFdSeT6H6x2ZqEoAoGCCqGSM49
-AwEHoUQDQgAEIIpMe5K73bUhMHT4uJ+1LTqm+Ji+VajU7EirJkPMJZJ3MZPTqKOK
-+cY6i+y6MCDpt3HK/aY4gH+hh3memzVPtQ==
+MHcCAQEEIOjL+zFefFiuS4a1HjcEv+6gICmj3M0RFGKfO+dgP4bzoAoGCCqGSM49
+AwEHoUQDQgAEo+YxwBk7xRqgSMkMBwxMavQX3gZwcHEiPCA1O2vK4pt33lH0d8AZ
++iftIeoYAqodlw7mMxvupraUFhKzR+HP7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der
index 095bc05771f6da..ba98f583cf0bf5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem
index 9c16d6d630d4b3..1402f85e104a23 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIINVF/vWchoNkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB0zCCAXqgAwIBAgIICCXx5ufFkiQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATP50OEIQVguxPWTavLBUzB+6crthjI
-LwzgB6pHcP6kczcJw1Za4NSe/9qtyzTya/g+OZszQ45MNrQcwYSQrOkgo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUNy+x
-QBmn4BRgXsWV8KCkqDGXUOUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAMAXQNTtb5XAHQRgsuGvsmUkVIE0BvWMgdY+
-Gn1nZqZsAiEAuj4SrJnXdJAY6824t64nXjO/garMmjRgiJQCmQoPlrA=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQVUfBZTQDbGqJIRgsQTK4McynQG0M/
+PjtMw/zfXjgDgHpB+QEOW+M+CcwdlbtFbPCe4oOkypsbLeIeq13f6LBXo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUx+i3
+HGjb7lsGb3zJ5e9pnbOA/wIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgZq2VL1JhgY86boYVdxGDguQe5RQ0TKTgXgiC
+K+a/YdYCIBFM13EVYK4MU+gY63zLhCKH5IqH6WmM5u/3Dbvdp3jK
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der
index f0aace17a2b462..ff4399994476c5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem
index be28bcbd23feda..070fdc24e92b7f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPCWnpyZnQ5NB97gK7YenfteJeYV3msaywO5JzUm0jo9oAoGCCqGSM49
-AwEHoUQDQgAEz+dDhCEFYLsT1k2rywVMwfunK7YYyC8M4AeqR3D+pHM3CcNWWuDU
-nv/arcs08mv4PjmbM0OOTDa0HMGEkKzpIA==
+MHcCAQEEIKGn/U/yv44VIdJtg8WCRSLpG+nnqbLotA/9W+/zs2sUoAoGCCqGSM49
+AwEHoUQDQgAEFVHwWU0A2xqiSEYLEEyuDHMp0BtDPz47TMP83144A4B6QfkBDlvj
+PgnMHZW7RWzwnuKDpMqbGy3iHqtd3+iwVw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json
index d45b0f7f232403..112dc298490cbe 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: valid, Matter OIDs are used and wrong values in the common-name are ignored",
     "is_success_case": "true",
-    "dac_cert": "30820206308201ada00302010202085ce064f2d8e8acb8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004208a4c7b92bbddb5213074f8b89fb52d3aa6f898be55a8d4ec48ab2643cc2592773193d3a8a38af9c63a8becba3020e9b771cafda638807fa187799e9b354fb5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041462221476a53d5dd01c2567a42794441e1a1af330301f0603551d23041830168014372fb14019a7e014605ec595f0a0a4a8319750e5300a06082a8648ce3d04030203470030440220189840ef2f0ed0f2141db0513ad8cf8b20f6b7ee17784e132fd8152667cbcf00022056bc48ea5b7ccd27821ba6c788f9320ba5239ec34086c6e75c158b9cc90166c7",
-    "pai_cert": "308201d53082017aa003020102020835517fbd6721a0d9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004cfe74384210560bb13d64dabcb054cc1fba72bb618c82f0ce007aa4770fea4733709c3565ae0d49effdaadcb34f26bf83e399b33438e4c36b41cc18490ace920a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414372fb14019a7e014605ec595f0a0a4a8319750e5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c01740d4ed6f95c01d0460b2e1afb2652454813406f58c81d63e1a7d6766a66c022100ba3e12ac99d7749018ebcdb8b7ae275e33bf81aacc9a3460889402990a0f96b0",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c85114f6f5bac678c8b5ff3b150623fab2b07962d8d92d73bdad561f5b90595f02200283d0b54387d1159584ea27058def8ad90d03b54215a5a410b3d6c8d44e81ba",
-    "dac_private_key": "63db75b8924b1fef44e13a7f1b68e9b9895fb8d2ac7905752793e87eb1d99a84",
-    "dac_public_key": "04208a4c7b92bbddb5213074f8b89fb52d3aa6f898be55a8d4ec48ab2643cc2592773193d3a8a38af9c63a8becba3020e9b771cafda638807fa187799e9b354fb5"
+    "dac_cert": "30820207308201ada00302010202086f01243e45504221300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a3e631c0193bc51aa048c90c070c4c6af417de06707071223c20353b6bcae29b77de51f477c019fa27ed21ea1802aa1d970ee6331beea6b6941612b347e1cfeca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414679b3333744c670e24479c037d89715dd5df8383301f0603551d23041830168014c7e8b71c68dbee5b066f7cc9e5ef699db380ff02300a06082a8648ce3d0403020348003045022100852ce1c1cb4a0964fb837d52fb20831067442fc992f724a280b3ab84176bcb0702200c5eab52abf43ec1c575d0ca559ba4bb59f538339cf1847caf7640ea4d3c55a6",
+    "pai_cert": "308201d33082017aa00302010202080825f1e6e7c59224300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200041551f0594d00db1aa248460b104cae0c7329d01b433f3e3b4cc3fcdf5e3803807a41f9010e5be33e09cc1d95bb456cf09ee283a4ca9b1b2de21eab5ddfe8b057a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c7e8b71c68dbee5b066f7cc9e5ef699db380ff02301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022066ad952f5261818f3a6e861577118382e41ee514344ca4e05e08822be6bf61d60220114cd7711560ae0c53e818eb7ccb842287e48a87e9698ce6eff70dbbdda778ca",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009570dcfc63b8d0852959152c71929d5ef87ac156695b9e3bb23e480fc0ae93da0220166eaf33b177d4f8bb9527445698e16e0dd69228ecca0e8a9189a59cda068b55",
+    "dac_private_key": "e8cbfb315e7c58ae4b86b51e3704bfeea02029a3dccd1114629f3be7603f86f3",
+    "dac_public_key": "04a3e631c0193bc51aa048c90c070c4c6af417de06707071223c20353b6bcae29b77de51f477c019fa27ed21ea1802aa1d970ee6331beea6b6941612b347e1cfec"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der
index f62cfd3a0cf303..4cd994296c8261 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der
index f952cd10ae841b..8dde8cf9cb896a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem
index 36a8ac156322db..5a10e8b92844ae 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBjCCAa2gAwIBAgIIfJsNKbSLL4gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIICBjCCAa2gAwIBAgIILqhMbuW7NRAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
 RjEgTXBpZDowMEIxMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQU67sqfpnukPi6K+y6
-yZ+kKtk3TtZ15N4RWgdutyCipyYfhmUOZeoSpFr2NSomM1Qp94/E0LkUU4wHrU4b
-ZDNIo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-b9p2D5OWgSFrKcmGzrpRTwi1gxswHwYDVR0jBBgwFoAUxJz+iNYtb8mQZfOAj9bU
-boODNXowCgYIKoZIzj0EAwIDRwAwRAIfRuhtyH1xvBiWb1BFQbduKnID6+P+fXCj
-zRKCsc+0BAIhAL8DvN/k/pl918K/lPcJOqvtoea+3COrGtZVH80oYtnN
+AgIMBDAwQjIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATXNHkP/pBT20mNbvdH
+5d+FHIKSJyKbWyVNF2RlipV3oIfU3sMkjtEjn7efUB3rCf3d4/mAv/PCsSZEPTQi
+U9rso2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+xn/TcEdBoTvDgJmIcoHFHxjciScwHwYDVR0jBBgwFoAUli12C+xZHaE8a3F+joC+
+MwKf1n4wCgYIKoZIzj0EAwIDRwAwRAIgPmv9jBeEVU31n3oMEu67aWozHN2BADr8
+lnBGQ/VbCVsCIEhtbu2xsvWYeUjh7Zb4u2xcBtjeT7kE0UC8IqzGAiC3
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der
index 7e153e59f71d27..b3fc140b87f1e9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem
index 2fc5c4ddb3977f..3a54c78facf802 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJYTRDd36VhGuLqgOtJcCH27ONwP6KhGPBcSoQQDuevBoAoGCCqGSM49
-AwEHoUQDQgAEFOu7Kn6Z7pD4uivsusmfpCrZN07WdeTeEVoHbrcgoqcmH4ZlDmXq
-EqRa9jUqJjNUKfePxNC5FFOMB61OG2QzSA==
+MHcCAQEEIHBo7nxxyWg9iCUortSMe+ZG2Kux2wmGdhOot2pYL7b2oAoGCCqGSM49
+AwEHoUQDQgAE1zR5D/6QU9tJjW73R+XfhRyCkicim1slTRdkZYqVd6CH1N7DJI7R
+I5+3n1Ad6wn93eP5gL/zwrEmRD00IlPa7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der
index d1eb3294ece5fd..2fc1f805324815 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem
index aa0694250038b5..6eea855ad059c1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIDyU+ifcHv/4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1TCCAXqgAwIBAgIIUn994QSoiMQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARE+E0LUeBEQ02ysB0ZhSSHzlVBWR/K
-lo7GY6h9sAtcn+ojskC5BOffjI5v87MTqQJ82C7ebRN/2pRACHqBDIiTo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxJz+
-iNYtb8mQZfOAj9bUboODNXowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALW+yUHOg5xQSBDYUT+w9GiuSKc/eO2MfNwT
-OFRlK0RvAiBEprksKitIzAtdw1X5QF8Xr1eOfsrReV9vAi8J9CRWJQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARKR3he3lKGJxN2BqFip+WapWK1X5xP
+fkIvYVUTfBWdXbjGc4xe1AC8qxUGHs1mCvDVAqShFiPnd7k2RVtAVgkqo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUli12
+C+xZHaE8a3F+joC+MwKf1n4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhANXFvE/hT8zTF7thlNPyKNrEfe/Vv5Gun4/A
+rT8HNX5ZAiEAmsitBpHyUoQKGV61/gH3d2hBlF/zkFghYcCjdPw2FHs=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der
index d8f71fc5013113..e6e03966cba452 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem
index ed06b7031256c8..6e40def81c40f7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJj/fN2bymJaAeuHXmXo69HAZxW4oMChvE0oPGMlU9f0oAoGCCqGSM49
-AwEHoUQDQgAERPhNC1HgRENNsrAdGYUkh85VQVkfypaOxmOofbALXJ/qI7JAuQTn
-34yOb/OzE6kCfNgu3m0Tf9qUQAh6gQyIkw==
+MHcCAQEEICzV2iUncZw5z5x9KYUkruZzVINW6gQMHND6QhjCFL5SoAoGCCqGSM49
+AwEHoUQDQgAESkd4Xt5ShicTdgahYqflmqVitV+cT35CL2FVE3wVnV24xnOMXtQA
+vKsVBh7NZgrw1QKkoRYj53e5NkVbQFYJKg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json
index 91b2dada402562..13b4cdc9afbd2f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: wrong, Correct values encoded in the common-name are ignored",
     "is_success_case": "false",
-    "dac_cert": "30820206308201ada00302010202087c9b0d29b48b2f88300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d0301070342000414ebbb2a7e99ee90f8ba2becbac99fa42ad9374ed675e4de115a076eb720a2a7261f86650e65ea12a45af6352a26335429f78fc4d0b914538c07ad4e1b643348a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146fda760f939681216b29c986ceba514f08b5831b301f0603551d23041830168014c49cfe88d62d6fc99065f3808fd6d46e8383357a300a06082a8648ce3d0403020347003044021f46e86dc87d71bc18966f504541b76e2a7203ebe3fe7d70a3cd1282b1cfb404022100bf03bcdfe4fe997dd7c2bf94f7093aabeda1e6bedc23ab1ad6551fcd2862d9cd",
-    "pai_cert": "308201d43082017aa00302010202080f253e89f707bffe300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000444f84d0b51e044434db2b01d19852487ce5541591fca968ec663a87db00b5c9fea23b240b904e7df8c8e6ff3b313a9027cd82ede6d137fda9440087a810c8893a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414c49cfe88d62d6fc99065f3808fd6d46e8383357a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b5bec941ce839c504810d8513fb0f468ae48a73f78ed8c7cdc133854652b446f022044a6b92c2a2b48cc0b5dc355f9405f17af578e7ecad1795f6f022f09f4245625",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220317baf225761234a94320298ee01c255742e3ee44f8000593c3972a4b076fedd022100c2e1e3e5332e12306c9b7106921fbb66bab28fb4f14da1135ed0e1b885a683f4",
-    "dac_private_key": "9613443777e95846b8baa03ad25c087dbb38dc0fe8a8463c1712a10403b9ebc1",
-    "dac_public_key": "0414ebbb2a7e99ee90f8ba2becbac99fa42ad9374ed675e4de115a076eb720a2a7261f86650e65ea12a45af6352a26335429f78fc4d0b914538c07ad4e1b643348"
+    "dac_cert": "30820206308201ada00302010202082ea84c6ee5bb3510300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d03010703420004d734790ffe9053db498d6ef747e5df851c829227229b5b254d1764658a9577a087d4dec3248ed1239fb79f501deb09fddde3f980bff3c2b126443d342253daeca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c67fd3704741a13bc38099887281c51f18dc8927301f0603551d23041830168014962d760bec591da13c6b717e8e80be33029fd67e300a06082a8648ce3d040302034700304402203e6bfd8c1784554df59f7a0c12eebb696a331cdd81003afc96704643f55b095b0220486d6eedb1b2f5987948e1ed96f8bb6c5c06d8de4fb904d140bc22acc60220b7",
+    "pai_cert": "308201d53082017aa0030201020208527f7de104a888c4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044a47785ede528627137606a162a7e59aa562b55f9c4f7e422f6155137c159d5db8c6738c5ed400bcab15061ecd660af0d502a4a11623e777b936455b4056092aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414962d760bec591da13c6b717e8e80be33029fd67e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d5c5bc4fe14fccd317bb6194d3f228dac47defd5bf91ae9f8fc0ad3f07357e590221009ac8ad0691f252840a195eb5fe01f7776841945ff390582161c0a374fc36147b",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022054d4f8eb89bc45c49a46e5a1ec8fe2158f2f2f0576aa81502badc79126b278fb02206c1d4ac2a3f5c0ef5494b61e2ee73ddd7db92b5eb36c06d71d07867eb255091f",
+    "dac_private_key": "7068ee7c71c9683d882528aed48c7be646d8abb1db09867613a8b76a582fb6f6",
+    "dac_public_key": "04d734790ffe9053db498d6ef747e5df851c829227229b5b254d1764658a9577a087d4dec3248ed1239fb79f501deb09fddde3f980bff3c2b126443d342253daec"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der
index 7a1ba7907db3f7..f0a1ed6f790226 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der
index 0e431fb8371fc3..1bbbd2bd4bf5da 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem
index f4462bff80da84..b99938cdf22f88 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByDCCAW6gAwIBAgIIXdG00VUDD6IwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBxzCCAW6gAwIBAgIIWJdI46o6regwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
+gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
 EjAQBgNVBAMMCU12aWQ6RkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAAS73wKHoikvW0tlwSlYPoMbJle5eXjPCsRaMGvP
-2BmjwjBEWWTrskTtZXrdyS94KUnNhRZ4w/bmppMj0NRSQkg8o2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUiRfYHNvrM9JHBvoCgTFk
-MbqYiJ4wHwYDVR0jBBgwFoAU7qywzSqs/erUx9kxt9sZ2fjX9YswCgYIKoZIzj0E
-AwIDSAAwRQIgP9HXg5huHtYD2HLRnW42tbK/HSXuS5TVuI8dw9hH9SMCIQCuG8VS
-7sEf1leaOpV5qCoYXowCHqrDKgafbrgUvialXQ==
+hkjOPQIBBggqhkjOPQMBBwNCAARun5LEBJtF1wRawWwfl5LbAgz8DAmLhF5CdB/Q
+toBUV+BZUkbEhOzu33SDDh3Av6A3aHp4YtGsjq66mjXD6ULso2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUP6OaAF+6k5RmBxCbYsZL
+RabFrkAwHwYDVR0jBBgwFoAUBXJp7MeSkoMdBZ2XEj4CyZaCDzEwCgYIKoZIzj0E
+AwIDRwAwRAIgavjZDZL1OtS2kOhwHvbNmytoUndniIARtDUulohB6AgCIFg9jmEG
+vMEoW0OJKVpmR2g1LjebJZBMzbPorFWgYZkJ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der
index e613ac65347ea8..27e69e2364f438 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem
index 567cfdf9572fbc..e20753c97fe17a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIACoFPEU5VFGtqn7mUUXXEy084aLzmvde5WsNF6Ua9inoAoGCCqGSM49
-AwEHoUQDQgAEu98Ch6IpL1tLZcEpWD6DGyZXuXl4zwrEWjBrz9gZo8IwRFlk67JE
-7WV63ckveClJzYUWeMP25qaTI9DUUkJIPA==
+MHcCAQEEIOcY+vKVDJQhnkQpPvm45uMWZ5uZtKuWnsSW+r6eReWeoAoGCCqGSM49
+AwEHoUQDQgAEbp+SxASbRdcEWsFsH5eS2wIM/AwJi4ReQnQf0LaAVFfgWVJGxITs
+7t90gw4dwL+gN2h6eGLRrI6uupo1w+lC7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der
index ecdf398b3f75a1..fc926827bedb51 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem
index 1ec11f3f0a6dc3..9a5029e1967932 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIAsAW2xzYp+QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB1TCCAXqgAwIBAgIIJ65pOPwh5j4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQK06E3EaPnABJxv99fv6fIn9J7obIN
-0/8gHTT+X0cLQszc3RWrtFqBXla62TwjM/+T8KKdSHsEKM7bKrVZOBV6o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7qyw
-zSqs/erUx9kxt9sZ2fjX9YswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAP3kuG+TMl8STCkXwCw01bhfqX8LsTW+zP9s
-QKSgzl8AAiEAhpFT9cxaJQ7Paxr6r5jQfPwXlADsaMZGkHw7cH94JmM=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS+3YFhrcIC42Od4N8eNddzcux3c8ag
+KZuZHfDFPFGlrIfkMZK1cC4+Pj0UdUBld/RnP9oh23vx8fOW1fPe71k6o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBXJp
+7MeSkoMdBZ2XEj4CyZaCDzEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAImacmfJUf9w4ARfKwI0Rfa/7Wo2TD736w04
+fFedhBMgAiEA76BhBcj0oI0iSpVK5vdoGrwXvWwUyAaZHIK4uPnpVGo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der
index bc92a6f500746a..a5965d49ede14e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem
index 0180add7908744..8987613ea9ef49 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICf17u9PCqqaR3ID40KIUtjJcf6jf8ipyle/SU3csaJpoAoGCCqGSM49
-AwEHoUQDQgAECtOhNxGj5wAScb/fX7+nyJ/Se6GyDdP/IB00/l9HC0LM3N0Vq7Ra
-gV5Wutk8IzP/k/CinUh7BCjO2yq1WTgVeg==
+MHcCAQEEIPN3fpsZ/yNsdiy+AcUyuNWcwkF9k/yQnSGkBvKYTFBKoAoGCCqGSM49
+AwEHoUQDQgAEvt2BYa3CAuNjneDfHjXXc3Lsd3PGoCmbmR3wxTxRpayH5DGStXAu
+Pj49FHVAZXf0Zz/aIdt78fHzltXz3u9ZOg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json
index 03b5471905d8d5..ebdd7328468015 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: invalid, PID is using Matter OID then VID must also use Matter OID",
     "is_success_case": "false",
-    "dac_cert": "308201c83082016ea00302010202085dd1b4d155030fa2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bbdf0287a2292f5b4b65c129583e831b2657b97978cf0ac45a306bcfd819a3c230445964ebb244ed657addc92f782949cd851678c3f6e6a69323d0d45242483ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148917d81cdbeb33d24706fa0281316431ba98889e301f0603551d23041830168014eeacb0cd2aacfdead4c7d931b7db19d9f8d7f58b300a06082a8648ce3d040302034800304502203fd1d783986e1ed603d872d19d6e36b5b2bf1d25ee4b94d5b88f1dc3d847f523022100ae1bc552eec11fd6579a3a9579a82a185e8c021eaac32a069f6eb814be26a55d",
-    "pai_cert": "308201d53082017aa003020102020802c016db1cd8a7e4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040ad3a13711a3e7001271bfdf5fbfa7c89fd27ba1b20dd3ff201d34fe5f470b42ccdcdd15abb45a815e56bad93c2333ff93f0a29d487b0428cedb2ab55938157aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414eeacb0cd2aacfdead4c7d931b7db19d9f8d7f58b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100fde4b86f93325f124c2917c02c34d5b85fa97f0bb135beccff6c40a4a0ce5f00022100869153f5cc5a250ecf6b1afaaf98d07cfc179400ec68c646907c3b707f782663",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022060bf2a921c8883fa2cb925882511878b90b17b4fe38f5734cb94f66162a50fd8022014a54c3bdf86bddecb42efb620d88c7dfff9ad7ac863ea5442fc784b45b65032",
-    "dac_private_key": "00a814f114e55146b6a9fb9945175c4cb4f3868bce6bdd7b95ac345e946bd8a7",
-    "dac_public_key": "04bbdf0287a2292f5b4b65c129583e831b2657b97978cf0ac45a306bcfd819a3c230445964ebb244ed657addc92f782949cd851678c3f6e6a69323d0d45242483c"
+    "dac_cert": "308201c73082016ea0030201020208589748e3aa3aade8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200046e9f92c4049b45d7045ac16c1f9792db020cfc0c098b845e42741fd0b6805457e0595246c484eceedf74830e1dc0bfa037687a7862d1ac8eaeba9a35c3e942eca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143fa39a005fba93946607109b62c64b45a6c5ae40301f0603551d23041830168014057269ecc79292831d059d97123e02c996820f31300a06082a8648ce3d040302034700304402206af8d90d92f53ad4b690e8701ef6cd9b2b68527767888011b4352e968841e8080220583d8e6106bcc1285b4389295a664768352e379b25904ccdb3e8ac55a0619909",
+    "pai_cert": "308201d53082017aa003020102020827ae6938fc21e63e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bedd8161adc202e3639de0df1e35d77372ec7773c6a0299b991df0c53c51a5ac87e43192b5702e3e3e3d1475406577f4673fda21db7bf1f1f396d5f3deef593aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414057269ecc79292831d059d97123e02c996820f31301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100899a7267c951ff70e0045f2b023445f6bfed6a364c3ef7eb0d387c579d841320022100efa06105c8f4a08d224a954ae6f7681abc17bd6c14c806991c82b8b8f9e9546a",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022077056b7ebcad73f44ed82b436b0b0b61417a4a2ec7e4529ba7536b9a144229cd022000f2b776c7c311e04bf41162046c1bd48ecc28253e750aba0c323ef4951b96cf",
+    "dac_private_key": "e718faf2950c94219e44293ef9b8e6e316679b99b4ab969ec496fabe9e45e59e",
+    "dac_public_key": "046e9f92c4049b45d7045ac16c1f9792db020cfc0c098b845e42741fd0b6805457e0595246c484eceedf74830e1dc0bfa037687a7862d1ac8eaeba9a35c3e942ec"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der
index d778884e3d3005..de49cc02f16eae 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der
index 0a687c9d4373a9..657e741c914e17 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem
index d19bbbc85d7586..d4b32595c2ad82 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIICAlLtkhCW7AwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIIQQosaiMfqUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARXl/kIR2vV1FBWK0KigaCUf3kW2c3Y
-orRR4i4BpqEyedhgegtOwGy+P+MU14rR+UYsBIShAM5GPWAaQqsw2krwo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUg63TjfAbkMiV
-dobJKDIpb49cTPAwHwYDVR0jBBgwFoAUKJbJZKBWst3K0Wz0RToQ3eZiQi4wCgYI
-KoZIzj0EAwIDSAAwRQIgYsK5UWoMV1nmOyR83HwG6eZ9e4HcN93JsZe0FmEP5BEC
-IQC3XGWcX6506LHcuzOjA50UoAh9gU1WL+lvvzUr6Lhllw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASTzbtW5xWVMe8ENwY9+P/Ix7h9Fssl
+UVfa3z4Z7yr0YMtPdk0JQz/oHu8j4ByukxrTWuDZ/kjveS+bCvxRLzxLo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUUqlr9P+3zI6e
+x/RNxkfkszSkvoQwHwYDVR0jBBgwFoAUKWjZp2GFytRjh8q+GNBKO8Xp1YcwCgYI
+KoZIzj0EAwIDSAAwRQIhAPVLrITl7ZpQW1IsJXIeHFugXpNw/tN4VO0MRjdYyhG9
+AiAu6GBIexM7uiMMuhNU09HYjKtcC8RpNgaHcDqVB93VbQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der
index b1d69f662c4032..fe2eaa133b056c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem
index 5c0db1110e15b2..d7d7995712c4c4 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFzdIcrGZ0c5gSYp0hIPxZO65ulrsPEfGjf66eweEgyKoAoGCCqGSM49
-AwEHoUQDQgAEV5f5CEdr1dRQVitCooGglH95FtnN2KK0UeIuAaahMnnYYHoLTsBs
-vj/jFNeK0flGLASEoQDORj1gGkKrMNpK8A==
+MHcCAQEEIHiFi9M4HFU+qBFvIPbEQ/bKoAMWmdJX+7Nt5ReTvAXtoAoGCCqGSM49
+AwEHoUQDQgAEk827VucVlTHvBDcGPfj/yMe4fRbLJVFX2t8+Ge8q9GDLT3ZNCUM/
+6B7vI+AcrpMa01rg2f5I73kvmwr8US88Sw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der
index a65a6aa75202dc..47e33bfbcd43b7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem
index 972d760ce2045b..559552f4d657be 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAQIIYKz7I56qQ18wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAQIIHGApekU9qSQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEraEsG33MgSHeIiqvdtmQSG5O6eCUJaa9NyPqFdJD0F/NkHkjAY+fB7s0mu
-I0n0Fh8hHvTaTmJw2Xc6Q69I6LCjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQolslkoFay3crRbPRFOhDd5mJCLjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB8
-GxGn+EHkNbz9apnCYFXNo/pF72jRES92r5BGCY9vjAIgD2i233tU5jUWxXCcmvEJ
-K0tlAUY+DZ0N8zmTrRZhtQE=
+A0IABI6jR8dpr47vQIoStJTPtvtvPfUNWUhSwkulQWotrHPWCP3DAwqkqttIKCx9
+/Ku8CWSfthSfAvf4Q2KNVZnQNTOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQpaNmnYYXK1GOHyr4Y0Eo7xenVhzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+xJIFHJqWy0OQI+k9Vuup5dFkXWvy5HzjjQjs21NCticCIQCh7dpI/vZB1QFOK0dp
+kMy8Oa5yvHUFzaCHLD3LjphGdA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der
index fd1cfd8385346d..c50ea97018a7e9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem
index 492f422a4c5fcf..76137245ab7047 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFlS3ftu/h3XnZV3IdOtaL3vCK1g438DNxART9CDvm45oAoGCCqGSM49
-AwEHoUQDQgAEStoSwbfcyBId4iKq922ZBIbk7p4JQlpr03I+oV0kPQX82QeSMBj5
-8HuzSa4jSfQWHyEe9NpOYnDZdzpDr0josA==
+MHcCAQEEIIu0g+ZguvJ0S6tXETpRRlE2JmHxGqHAaYvN8HxuuFL8oAoGCCqGSM49
+AwEHoUQDQgAEjqNHx2mvju9AihK0lM+2+2899Q1ZSFLCS6VBai2sc9YI/cMDCqSq
+20goLH38q7wJZJ+2FJ8C9/hDYo1VmdA1Mw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json
index 4bf9fa0697b35b..866f5931944842 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Invalid certificate version field set to v2(1)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020808094bb648425bb0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045797f908476bd5d450562b42a281a0947f7916d9cdd8a2b451e22e01a6a13279d8607a0b4ec06cbe3fe314d78ad1f9462c0484a100ce463d601a42ab30da4af0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041483add38df01b90c8957686c92832296f8f5c4cf0301f0603551d230418301680142896c964a056b2ddcad16cf4453a10dde662422e300a06082a8648ce3d0403020348003045022062c2b9516a0c5759e63b247cdc7c06e9e67d7b81dc37ddc9b197b416610fe411022100b75c659c5fae74e8b1dcbb33a3039d14a0087d814d562fe96fbf352be8b86597",
-    "pai_cert": "308201bd30820164a003020101020860acfb239eaa435f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044ada12c1b7dcc8121de222aaf76d990486e4ee9e09425a6bd3723ea15d243d05fcd907923018f9f07bb349ae2349f4161f211ef4da4e6270d9773a43af48e8b0a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604142896c964a056b2ddcad16cf4453a10dde662422e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207c1b11a7f841e435bcfd6a99c26055cda3fa45ef68d1112f76af9046098f6f8c02200f68b6df7b54e63516c5709c9af1092b4b6501463e0d9d0df33993ad1661b501",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c30e031e12d3d890b9619084f2085b6e1d90116536e5f76738d41fa51fb53619022042738ca2e1e4418427417e49b1eb716db6eff97bd2d9a800f5404e33ba365387",
-    "dac_private_key": "5cdd21cac6674739812629d2120fc593bae6e96bb0f11f1a37fae9ec1e120c8a",
-    "dac_public_key": "045797f908476bd5d450562b42a281a0947f7916d9cdd8a2b451e22e01a6a13279d8607a0b4ec06cbe3fe314d78ad1f9462c0484a100ce463d601a42ab30da4af0"
+    "dac_cert": "308201ce30820174a0030201020208210428b1a88c7ea5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000493cdbb56e7159531ef0437063df8ffc8c7b87d16cb255157dadf3e19ef2af460cb4f764d09433fe81eef23e01cae931ad35ae0d9fe48ef792f9b0afc512f3c4ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041452a96bf4ffb7cc8e9ec7f44dc647e4b334a4be84301f0603551d230418301680142968d9a76185cad46387cabe18d04a3bc5e9d587300a06082a8648ce3d0403020348003045022100f54bac84e5ed9a505b522c25721e1c5ba05e9370fed37854ed0c463758ca11bd02202ee860487b133bba230cba1354d3d1d88cab5c0bc469360687703a9507ddd56d",
+    "pai_cert": "308201bf30820164a00302010102081c60297a453da924300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200048ea347c769af8eef408a12b494cfb6fb6f3df50d594852c24ba5416a2dac73d608fdc3030aa4aadb48282c7dfcabbc09649fb6149f02f7f843628d5599d03533a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142968d9a76185cad46387cabe18d04a3bc5e9d587301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c492051c9a96cb439023e93d56eba9e5d1645d6bf2e47ce38d08ecdb5342b627022100a1edda48fef641d5014e2b476990ccbc39ae72bc7505cda0872c3dcb8e984674",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f920383fe42cbee0e7c30cf3ef1c30b0aa0ff7db82a8be6e3b1f3f45471c8525022100f1c8d07ae266390db2af0376ed7723636f8afb596360c6307a8bc1e1fd448082",
+    "dac_private_key": "78858bd3381c553ea8116f20f6c443f6caa0031699d257fbb36de51793bc05ed",
+    "dac_public_key": "0493cdbb56e7159531ef0437063df8ffc8c7b87d16cb255157dadf3e19ef2af460cb4f764d09433fe81eef23e01cae931ad35ae0d9fe48ef792f9b0afc512f3c4b"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der
index 6510d758d6e1a2..9557dceea446ef 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der
index a0161d0cfacff5..d956a202ad8218 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem
index ac2b0964ce8867..f9ca7f0f303e15 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIISFfX5j7PwncwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIEthVub1tYWgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARbNnpFUTHckMcYjmq6c141zxJEXUmm
-F85z/zCz130MbY0NWEPiezYu+otEbo5tUphHtQQEGX8AZCpNAV0vzfA+o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUbeZRd1Y2cVBd
-E8/Ruu4vt7vcNXMwHwYDVR0jBBgwFoAUA0sAyFm9N3M/oUacaxjXJjxVaaYwCgYI
-KoZIzj0EAwIDSAAwRQIhAPam/7tDrclf5q36GaEsGmRkIYxdj/BazbvGtyWdiNGW
-AiAdKrWG8hKOy5ycnOlcvW83FJnZg538/iQRgHyLinLmiw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQeoEYlRQofZo3k39AZjQ0jDMkIOrqf
+kDvXyixrZmCu8Cu6WFLVoUOlHyKxQ7V92Rob1i8gyG2GtxB+QLDfVvmRo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUU2AiZ5uqESqU
+g9s5lz6RNz8PGJkwHwYDVR0jBBgwFoAUvdwOk95U4BkPNT7vV7cFYTSDPCQwCgYI
+KoZIzj0EAwIDSAAwRQIgI3EscIACjq9SX/siigIpIK0Png072WfPBch/0Cp2su0C
+IQDhkdRqyBYQq3ryio3tft4hVnyV3OpYI+A8mmhOqFckqg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der
index 0e6ed225129327..605f0034a02e59 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem
index 1a735ef3057ea8..5c7fdff0dff151 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEID5ng+wku5QaeUhwRacgMe52t/qQizZ7mlC4qNVY8z3loAoGCCqGSM49
-AwEHoUQDQgAEWzZ6RVEx3JDHGI5qunNeNc8SRF1JphfOc/8ws9d9DG2NDVhD4ns2
-LvqLRG6ObVKYR7UEBBl/AGQqTQFdL83wPg==
+MHcCAQEEIGmEIh0P4BYUBihLw/e6BKZ3QXmNzwlTUOOi9ULgzlezoAoGCCqGSM49
+AwEHoUQDQgAEHqBGJUUKH2aN5N/QGY0NIwzJCDq6n5A718osa2ZgrvArulhS1aFD
+pR8isUO1fdkaG9YvIMhthrcQfkCw31b5kQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der
index 808a8252ca7eee..e739cf1d4db27c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem
index d1b515e7cbbade..ad3109b4dd59a5 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIW/tsGvPlBoAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIObLsKM1rYZEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABGpV+P9dLdTYR48gUgPMhDU2jVZ3ehRefgCpOUMn7H2UfXCeNT0ttuKKlpCe
-8MTcfYTrj3TLriqRC5nGcpi6prWjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQDSwDIWb03cz+hRpxrGNcmPFVppjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBf
-XYsBVHU1zLV29zM4mr4wgV2JpHt5MDf5Rddp21ddMQIhAN9Lss1rcWT+8yAABvG9
-/fXiyx+XTOX4iHpYvaPubnHn
+A0IABJ0oDQdcA5FC+pv0Y7DSUQJyjLF2WjhB0PUwis1pvzj9NE96u4PKKqxfTDsX
+w1uZckn0XRgpaeW17Kb/0//OJSijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS93A6T3lTgGQ81Pu9XtwVhNIM8JDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAC
+7HC5PSYWgnWHq90YMje7FkMkhMqsg/ebSYjNsa/XCAIhANt++GWqNhWfGWbIj5xh
+68/4chpK2XclEYK+KrmI3QZ2
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der
index 8304a0243bd8b9..3ba50131683186 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem
index cdc875e01ee636..c7139050b37e6d 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEDLNJaNo9dW0MJG11dW1dQo9bMTOqV2V9ERchH50vFjoAoGCCqGSM49
-AwEHoUQDQgAEalX4/10t1NhHjyBSA8yENTaNVnd6FF5+AKk5QyfsfZR9cJ41PS22
-4oqWkJ7wxNx9hOuPdMuuKpELmcZymLqmtQ==
+MHcCAQEEICMppPWV/ek9fNr8GcAKG+30oTeBrYzQ/iK40SntxxYioAoGCCqGSM49
+AwEHoUQDQgAEnSgNB1wDkUL6m/RjsNJRAnKMsXZaOEHQ9TCKzWm/OP00T3q7g8oq
+rF9MOxfDW5lySfRdGClp5bXspv/T/84lKA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json
index fdd5b864b600be..d70ec1d9ce29dc 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Valid certificate version field set to v3(2)",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a00302010202084857d7e63ecfc277300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045b367a455131dc90c7188e6aba735e35cf12445d49a617ce73ff30b3d77d0c6d8d0d5843e27b362efa8b446e8e6d529847b50404197f00642a4d015d2fcdf03ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146de65177563671505d13cfd1baee2fb7bbdc3573301f0603551d23041830168014034b00c859bd37733fa1469c6b18d7263c5569a6300a06082a8648ce3d0403020348003045022100f6a6ffbb43adc95fe6adfa19a12c1a6464218c5d8ff05acdbbc6b7259d88d19602201d2ab586f2128ecb9c9c9ce95cbd6f371499d9839dfcfe2411807c8b8a72e68b",
-    "pai_cert": "308201be30820164a00302010202085bfb6c1af3e50680300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046a55f8ff5d2dd4d8478f205203cc8435368d56777a145e7e00a9394327ec7d947d709e353d2db6e28a96909ef0c4dc7d84eb8f74cbae2a910b99c67298baa6b5a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414034b00c859bd37733fa1469c6b18d7263c5569a6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205f5d8b01547535ccb576f733389abe30815d89a47b793037f945d769db575d31022100df4bb2cd6b7164fef3200006f1bdfdf5e2cb1f974ce5f8887a58bda3ee6e71e7",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201811db54cf70015fcf78bc15282cf7cce1a4f6199e863024df03f6395179b6e5022100a0142250bab406a532be1664b47bdf42c7a65c022abc9e445e97e0284b338167",
-    "dac_private_key": "3e6783ec24bb941a79487045a72031ee76b7fa908b367b9a50b8a8d558f33de5",
-    "dac_public_key": "045b367a455131dc90c7188e6aba735e35cf12445d49a617ce73ff30b3d77d0c6d8d0d5843e27b362efa8b446e8e6d529847b50404197f00642a4d015d2fcdf03e"
+    "dac_cert": "308201ce30820174a003020102020812d855b9bd6d6168300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041ea04625450a1f668de4dfd0198d0d230cc9083aba9f903bd7ca2c6b6660aef02bba5852d5a143a51f22b143b57dd91a1bd62f20c86d86b7107e40b0df56f991a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414536022679baa112a9483db39973e91373f0f1899301f0603551d23041830168014bddc0e93de54e0190f353eef57b7056134833c24300a06082a8648ce3d0403020348003045022023712c7080028eaf525ffb228a022920ad0f9e0d3bd967cf05c87fd02a76b2ed022100e191d46ac81610ab7af28a8ded7ede21567c95dcea5823e03c9a684ea85724aa",
+    "pai_cert": "308201be30820164a003020102020839b2ec28cd6b6191300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049d280d075c039142fa9bf463b0d25102728cb1765a3841d0f5308acd69bf38fd344f7abb83ca2aac5f4c3b17c35b997249f45d182969e5b5eca6ffd3ffce2528a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bddc0e93de54e0190f353eef57b7056134833c24301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022002ec70b93d2616827587abdd183237bb16432484caac83f79b4988cdb1afd708022100db7ef865aa36159f1966c88f9c61ebcff8721a4ad977251182be2ab988dd0676",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100bd7611b8c95ea21de5ed69e3564174766ada86fc80b72e0faaa7f2cc44d3a8f70221008a74964531575fc1285818cca8dca8150776fb7f398c211d910e161e4e456ea4",
+    "dac_private_key": "6984221d0fe0161406284bc3f7ba04a67741798dcf095350e3a2f542e0ce57b3",
+    "dac_public_key": "041ea04625450a1f668de4dfd0198d0d230cc9083aba9f903bd7ca2c6b6660aef02bba5852d5a143a51f22b143b57dd91a1bd62f20c86d86b7107e40b0df56f991"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der
index 41bc7731ca1f36..3eae714755b35e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der
index 651eba7f8f629b..67fe89c0aa09ad 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem
index c5fb322462e6c0..6a66e14a45b82c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIdkwxeuEn4yswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIaixjNNHVtTkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASZ93tkufChe++twKRnLAcIZjoGcy8A
-FgAxV7kozMTAg044txYSnAW22jSHiagXdkzN12OtRdG6E4clbicSVulko2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdArEY1wm76eR
-ARrgtyyP2PAUdbYwHwYDVR0jBBgwFoAUlAbl+qpwf0kmrUb1ZBdgGa9KfrYwCgYI
-KoZIzj0EAwIDSQAwRgIhAMaffE54k6NM/zFfDTPJLzuB1V2xPXatqgQNfyUIIHzI
-AiEAmHUzJq6cUo38Kqrke22tBwt2eKk8PE/GTScN0n3Pa+A=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQig7TJSz/wlFSfxdyxJ07VZuk324me
+6MyrL6Anm5ALFhxbtndrSp025q+Qa+qp+zamS1uTUYoEUC+PvLS/yAfJo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUrNe2GcpHe9TY
+z2w0MxQdWChFM8cwHwYDVR0jBBgwFoAUYGv9LsCn6k9C3y6YFLAQ1ct7qE0wCgYI
+KoZIzj0EAwIDSAAwRQIhALd8I+ZJB8bUCW0RkwT8hhxghKesLVW9p1hcTvEKqL+b
+AiBplE+0Yu3BPuRxXgZLHLaEUrV41seu9gPMRByImVGDxA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der
index 1316331b2a7456..2037b58515db48 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem
index abb4b97eb4625b..6bec7796639089 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA37ksBIiBDsbFGIznM2scc+VCqzdeKnQoKuRAJY/SDXoAoGCCqGSM49
-AwEHoUQDQgAEmfd7ZLnwoXvvrcCkZywHCGY6BnMvABYAMVe5KMzEwINOOLcWEpwF
-tto0h4moF3ZMzddjrUXRuhOHJW4nElbpZA==
+MHcCAQEEIMT3ChKXFfTjTbQFzRxe2JY7f1Cj0O6yKPdCnbRkUrbloAoGCCqGSM49
+AwEHoUQDQgAEIoO0yUs/8JRUn8XcsSdO1WbpN9uJnujMqy+gJ5uQCxYcW7Z3a0qd
+NuavkGvqqfs2pktbk1GKBFAvj7y0v8gHyQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der
index 183962a3a79d1f..413aeddf9cd240 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem
index 1fd8f39749ef05..12df491da16f22 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBnjCCAUOgAwIBAgIIAozSuBetLHAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBnjCCAUOgAwIBAgIIAmVHq66pnQkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABM422KNrgBYMBq6oQNFPfeBo3WviENigfid8ChwUa4FFGah9cB2eZHzn2LT/
-LMJHZW3wXR9GUCUg9ERjhPpZRg2jRTBDMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSUBuX6qnB/SSatRvVkF2AZr0p+tjAKBggq
-hkjOPQQDAgNJADBGAiEAr1MK9NUcnBWlvGt/k+yD01XH1abKwpox9PTx1QUtpSMC
-IQCLyIKrzerisR11pM1svP8fTh2OmVXWBBamzg/FpwecrQ==
+A0IABNSwp3emKsVJFN09xeT2eRNRu73zVTa4CwLV9BpMG2QcSugS7HvTgfg2Z10j
+/IaP9N3P3kDV9RIwBXpRMzFxx3CjRTBDMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRga/0uwKfqT0LfLpgUsBDVy3uoTTAKBggq
+hkjOPQQDAgNJADBGAiEA1RSDlCgmnb6yT71zCQfCfz59IU/m05LIFrV9GXIhM34C
+IQDNw7l0b87763FdDlI+UQOIy0cVn6logXuXPq0qjGcVKg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der
index 448aa9ef838c80..6ecfd4dc9d363b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem
index 04d143ad195197..f2ddec536c1927 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAJUm08dkStgPdDaC9G3cwXo8xN8UpYf22i5Tm6Dx18ooAoGCCqGSM49
-AwEHoUQDQgAEzjbYo2uAFgwGrqhA0U994Gjda+IQ2KB+J3wKHBRrgUUZqH1wHZ5k
-fOfYtP8swkdlbfBdH0ZQJSD0RGOE+llGDQ==
+MHcCAQEEIIdfKtbL9pBxjJzt5kde1zGJopmgR6BFc0qEWIGNJ5N/oAoGCCqGSM49
+AwEHoUQDQgAE1LCnd6YqxUkU3T3F5PZ5E1G7vfNVNrgLAtX0GkwbZBxK6BLse9OB
++DZnXSP8ho/03c/eQNX1EjAFelEzMXHHcA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json
index 2f8e249136f52b..2cc997c985f2b7 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Authority Key ID (AKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a0030201020208764c317ae127e32b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000499f77b64b9f0a17befadc0a4672c0708663a06732f0016003157b928ccc4c0834e38b716129c05b6da348789a817764ccdd763ad45d1ba1387256e271256e964a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414740ac4635c26efa791011ae0b72c8fd8f01475b6301f0603551d230418301680149406e5faaa707f4926ad46f564176019af4a7eb6300a06082a8648ce3d0403020349003046022100c69f7c4e7893a34cff315f0d33c92f3b81d55db13d76adaa040d7f2508207cc802210098753326ae9c528dfc2aaae47b6dad070b7678a93c3c4fc64d270dd27dcf6be0",
-    "pai_cert": "3082019e30820143a0030201020208028cd2b817ad2c70300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ce36d8a36b80160c06aea840d14f7de068dd6be210d8a07e277c0a1c146b814519a87d701d9e647ce7d8b4ff2cc247656df05d1f46502520f4446384fa59460da345304330120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604149406e5faaa707f4926ad46f564176019af4a7eb6300a06082a8648ce3d0403020349003046022100af530af4d51c9c15a5bc6b7f93ec83d355c7d5a6cac29a31f4f4f1d5052da5230221008bc882abcdeae2b11d75a4cd6cbcff1f4e1d8e9955d60416a6ce0fc5a7079cad",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b57e12767312397c8207dcd64a626ae6568fc3892f6a9a33b1e86aa2bdf5ef5b02202db9402884475683387596f55c087a3c390d10b878ec2799bcdd92cc83a13e00",
-    "dac_private_key": "0dfb92c0488810ec6c5188ce7336b1c73e542ab375e2a74282ae440258fd20d7",
-    "dac_public_key": "0499f77b64b9f0a17befadc0a4672c0708663a06732f0016003157b928ccc4c0834e38b716129c05b6da348789a817764ccdd763ad45d1ba1387256e271256e964"
+    "dac_cert": "308201ce30820174a00302010202086a2c6334d1d5b539300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042283b4c94b3ff094549fc5dcb1274ed566e937db899ee8ccab2fa0279b900b161c5bb6776b4a9d36e6af906beaa9fb36a64b5b93518a04502f8fbcb4bfc807c9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414acd7b619ca477bd4d8cf6c3433141d58284533c7301f0603551d23041830168014606bfd2ec0a7ea4f42df2e9814b010d5cb7ba84d300a06082a8648ce3d0403020348003045022100b77c23e64907c6d4096d119304fc861c6084a7ac2d55bda7585c4ef10aa8bf9b022069944fb462edc13ee4715e064b1cb68452b578d6c7aef603cc441c88995183c4",
+    "pai_cert": "3082019e30820143a0030201020208026547abaea99d09300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004d4b0a777a62ac54914dd3dc5e4f6791351bbbdf35536b80b02d5f41a4c1b641c4ae812ec7bd381f836675d23fc868ff4ddcfde40d5f51230057a51333171c770a345304330120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414606bfd2ec0a7ea4f42df2e9814b010d5cb7ba84d300a06082a8648ce3d0403020349003046022100d514839428269dbeb24fbd730907c27f3e7d214fe6d392c816b57d197221337e022100cdc3b9746fcefbeb715d0e523e510388cb47159fa968817b973ead2a8c67152a",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220627897ec6ff502d8883d68b2241c9df68f5939fbf12cd4e9c47092172b28862d0220587b5b1de37a6cedc9eae779b610676a54685230ae28cc667786d76d1a872ff7",
+    "dac_private_key": "c4f70a129715f4e34db405cd1c5ed8963b7f50a3d0eeb228f7429db46452b6e5",
+    "dac_public_key": "042283b4c94b3ff094549fc5dcb1274ed566e937db899ee8ccab2fa0279b900b161c5bb6776b4a9d36e6af906beaa9fb36a64b5b93518a04502f8fbcb4bfc807c9"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der
index 0480d913456df1..ec5bee369e4e50 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der
index 53bbc4f9e4a28b..a7983b9e5f8a95 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem
index 22f61c4ff8f2de..7e0be81bca6f00 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIdoiBXJZMeZwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIWItL4EAVFVwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQeGzy5wO5Z6OzwSJkAzo+a0vRStx5e
-2vDb9IA3OCRjB64wYUfzw/sPJRGcN4Qm0Kw1nBgtbQ69+brkre1z8YkNo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUDJnqCNuwREpY
-P3jQn6nbsP6YOzwwHwYDVR0jBBgwFoAUh6pW/4U+apckvO3m85LRl445w8YwCgYI
-KoZIzj0EAwIDSAAwRQIhAKxPXg+v0fFA+rqciPtgmAao1Dc2MsoUWMaQAmR+fPH/
-AiB04ohDxSJt7SdtwY4mv/fTfvCEgjImj95AxzE38XU4YA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQbW7NUhTZtA1PY1TdVDqRwRRff45w0
+gQzb9U+lrsvCLmx+ig9Xn9jJh31Xvsfhj77o5fgsa/cxBNZDYYwH0xjWo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUZEZwl+tsAESA
+FL/iDUg9HKrpW9MwHwYDVR0jBBgwFoAUumYhYkpNV6u9mbsTa5vh3Xeik+kwCgYI
+KoZIzj0EAwIDRwAwRAIgVqDowlgAR7wwtpwPXw/y+Vq9jC/PLpd7oAnfWpNVddAC
+IDRGw9LKYiK5Cn4tR+jiyXbFd1n7RqlnINJXOEHvinBs
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der
index 97244c4785c141..ab2d6df36cb267 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem
index 17e323eb162810..70eaf76e747fa8 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIMqZcLjlzn/T2nnkBwH89U1NAcol3E0RMOXFyP+LMQBoAoGCCqGSM49
-AwEHoUQDQgAEHhs8ucDuWejs8EiZAM6PmtL0UrceXtrw2/SANzgkYweuMGFH88P7
-DyURnDeEJtCsNZwYLW0Ovfm65K3tc/GJDQ==
+MHcCAQEEIKZjaT2+i+mmoj52WOm1j3DVcAPrEB+h1nyEZAdBQ7wroAoGCCqGSM49
+AwEHoUQDQgAEG1uzVIU2bQNT2NU3VQ6kcEUX3+OcNIEM2/VPpa7Lwi5sfooPV5/Y
+yYd9V77H4Y++6OX4LGv3MQTWQ2GMB9MY1g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der
index 005fae73ac37ea..0c75933caa1a2d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem
index 055063109423c6..f3523952f82fe4 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB9TCCAZygAwIBAgIIS2oyEPrYgscwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB9TCCAZygAwIBAgIIBOjHNmKsTIEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABGOVzTTGRrL7cFqpKCcflQ/wgHijtukOrZKvLNc2eMBhIXt7oRLN0m+MMtRr
-cwesKdXyY1yqeZdT6O3duHDBmTijgZ0wgZowEgYDVR0TAQH/BAgwBgEB/wIBATAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIeqVv+FPmqXJLzt5vOS0ZeOOcPGMB8G
+A0IABLD55NOV5Uiiebwn7j/oX54cG8zor2boSjGIdqNZ8mTkeMNxEfmnQ97Wyrz2
+mbB52ekct55msQCtOOcvZefFjO+jgZ0wgZowEgYDVR0TAQH/BAgwBgEB/wIBADAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLpmIWJKTVervZm7E2ub4d13opPpMB8G
 A1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MDQGCCsGAQUFBwEBBCgwJjAk
 BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZXhhbXBsZS5jb20vMAoGCCqGSM49BAMC
-A0cAMEQCIArtyjaBTTgUa63GObbw4jF+FfD+IHK4LRYdtuHSf2u+AiBSHI+bnrZ+
-QKusIlALndXSqGKfnLmqaMENLLv6JNoo1w==
+A0cAMEQCIBOUPTnkYx+CReKRHBN2j2/uAUUjhXuU0cGix030oSQkAiB7oPW6nlcF
+BmI97C4xqokqQ4rWSPvay04Lzaf7fZjiDg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der
index d8706df3b27bce..a1dc2b2d7b4d43 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem
index 9c5de9f2ca1f61..db053a7dc7c44e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIhWVT91P7nlNxMNHG2Gfm+E8k8+Szr1e3qRdz5jwP7noAoGCCqGSM49
-AwEHoUQDQgAEY5XNNMZGsvtwWqkoJx+VD/CAeKO26Q6tkq8s1zZ4wGEhe3uhEs3S
-b4wy1GtzB6wp1fJjXKp5l1Po7d24cMGZOA==
+MHcCAQEEIMyclcLHRjuKyMKvpWpHc7NRkGeICLkUM3DKiDYcqMJLoAoGCCqGSM49
+AwEHoUQDQgAEsPnk05XlSKJ5vCfuP+hfnhwbzOivZuhKMYh2o1nyZOR4w3ER+adD
+3tbKvPaZsHnZ6Ry3nmaxAK045y9l58WM7w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json
index 55679174a8891c..1131a079b1cb33 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate includes optional Authority Information Access extension",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a00302010202087688815c964c799c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041e1b3cb9c0ee59e8ecf0489900ce8f9ad2f452b71e5edaf0dbf4803738246307ae306147f3c3fb0f25119c378426d0ac359c182d6d0ebdf9bae4aded73f1890da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140c99ea08dbb0444a583f78d09fa9dbb0fe983b3c301f0603551d2304183016801487aa56ff853e6a9724bcede6f392d1978e39c3c6300a06082a8648ce3d0403020348003045022100ac4f5e0fafd1f140faba9c88fb609806a8d4373632ca1458c69002647e7cf1ff022074e28843c5226ded276dc18e26bff7d37ef0848232268fde40c73137f1753860",
-    "pai_cert": "308201f53082019ca00302010202084b6a3210fad882c7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046395cd34c646b2fb705aa928271f950ff08078a3b6e90ead92af2cd73678c061217b7ba112cdd26f8c32d46b7307ac29d5f2635caa799753e8edddb870c19938a3819d30819a30120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041487aa56ff853e6a9724bcede6f392d1978e39c3c6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d040302034700304402200aedca36814d38146badc639b6f0e2317e15f0fe2072b82d161db6e1d27f6bbe0220521c8f9b9eb67e40abac22500b9dd5d2a8629f9cb9aa68c10d2cbbfa24da28d7",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b7104d907fb69f2d8ccc9b56ef4698c84a027198645458a1f165d76e4beaeb8a022100e8810b9fd8e11128c10223e8919b7176e13829f5178da70adc308e936da47e22",
-    "dac_private_key": "832a65c2e39739ff4f69e7901c07f3d53534072897713444c3971723fe2cc401",
-    "dac_public_key": "041e1b3cb9c0ee59e8ecf0489900ce8f9ad2f452b71e5edaf0dbf4803738246307ae306147f3c3fb0f25119c378426d0ac359c182d6d0ebdf9bae4aded73f1890d"
+    "dac_cert": "308201cd30820174a0030201020208588b4be04015155c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041b5bb35485366d0353d8d537550ea4704517dfe39c34810cdbf54fa5aecbc22e6c7e8a0f579fd8c9877d57bec7e18fbee8e5f82c6bf73104d643618c07d318d6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041464467097eb6c00448014bfe20d483d1caae95bd3301f0603551d23041830168014ba6621624a4d57abbd99bb136b9be1dd77a293e9300a06082a8648ce3d0403020347003044022056a0e8c2580047bc30b69c0f5f0ff2f95abd8c2fcf2e977ba009df5a935575d002203446c3d2ca6222b90a7e2d47e8e2c976c57759fb46a96720d2573841ef8a706c",
+    "pai_cert": "308201f53082019ca003020102020804e8c73662ac4c81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b0f9e4d395e548a279bc27ee3fe85f9e1c1bcce8af66e84a318876a359f264e478c37111f9a743ded6cabcf699b079d9e91cb79e66b100ad38e72f65e7c58cefa3819d30819a30120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ba6621624a4d57abbd99bb136b9be1dd77a293e9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d0403020347003044022013943d39e4631f8245e2911c13768f6fee014523857b94d1c1a2c74df4a1242402207ba0f5ba9e570506623dec2e31aa892a438ad648fbdacb4e0bcda7fb7d98e20e",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ceaf8369dda146f1daf60316286ffe2b45ce0215cde0a73832986460afba69e502200c61f02551e1dcd4882e7d05369dde0b213a05668eed8f5c73444d6442ca57de",
+    "dac_private_key": "a663693dbe8be9a6a23e7658e9b58f70d57003eb101fa1d67c8464074143bc2b",
+    "dac_public_key": "041b5bb35485366d0353d8d537550ea4704517dfe39c34810cdbf54fa5aecbc22e6c7e8a0f579fd8c9877d57bec7e18fbee8e5f82c6bf73104d643618c07d318d6"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der
index ce2e56fa640b4a..fec2d68e67a592 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der
index 51277d4d186a06..2a7c32967e6958 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem
index 0e3015b7ee40e5..65e64058b6ddf0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIeuP4/0mGcIMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIcbsMeoJjhVgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQNMrEtPRNE5KY5/6vzVx7Jvd6wxRHk
-HVCUBDvFqc0SfXSdgaCxv6/GnS32U+bqTznE1a8XB136pC8SLqIEhKpGo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUPEtG3f9/Acuf
-DsRpKwUKvIPjJQUwHwYDVR0jBBgwFoAUYzLq4CioSr3Okh6Bls6B+QzzYZcwCgYI
-KoZIzj0EAwIDSAAwRQIhAPo0rLAOZ/r2C+CAr0bE37P42UdsF0a1Brn++5JCQUdt
-AiAb4arlr3B8rfBwbe7pvRjLJQjiLFXduDt9cXT5EE+wlg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQB6OrI4rYnu6Y9hywvEsxGFHrppfuq
+qaVKH9zuwqQipBSEaHhXpWpOQmPpAS8R5XO84JUX4LQBHGkOzVfhzJbso2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUqzLFYPU7H4kG
+tr5s7nR95Ox0X/4wHwYDVR0jBBgwFoAU++S8uISgK2HT0Vz3gcmPpSryfB4wCgYI
+KoZIzj0EAwIDSAAwRQIgabc3ioSKwGks5OAA2JHVK7iAV8TsciWk3huEzKoEeY8C
+IQCsDKIP7UHhvLZrKNMLSdywttEngGq/t7WlE4oUdrRoQg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der
index 2c327e265e0f38..66547c3d067ee1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem
index de0777015f9cae..c80e35d844ec40 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM+P+LWYaea9uPBbwlkiPD3vQzuLmXty2m48atL5yG2FoAoGCCqGSM49
-AwEHoUQDQgAEDTKxLT0TROSmOf+r81ceyb3esMUR5B1QlAQ7xanNEn10nYGgsb+v
-xp0t9lPm6k85xNWvFwdd+qQvEi6iBISqRg==
+MHcCAQEEIBRo4a6HIddBzf233NQIAMk7jHjjdcA2+mEPBM/cx8QxoAoGCCqGSM49
+AwEHoUQDQgAEAejqyOK2J7umPYcsLxLMRhR66aX7qqmlSh/c7sKkIqQUhGh4V6Vq
+TkJj6QEvEeVzvOCVF+C0ARxpDs1X4cyW7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der
index 6f2180832bdc2e..76fdab9fcac554 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem
index 6ea1d58e279ba6..88a6bd617f1bb6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBujCCAWGgAwIBAgIIJjWZn20LdhAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBuzCCAWGgAwIBAgIIJbLujEzNDwQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABNri63Z1xJp+2BuODdbAudulOldJS3eTyUFNc0fgACVUbYr3lh+PrfW14CNf
-3ljCeDkjBBiMhBY0CUoHsHDmEvujYzBhMA8GA1UdEwEB/wQFMAMCAQEwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBRjMurgKKhKvc6SHoGWzoH5DPNhlzAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAYOzI8
-CTBIFmuYwr2nbNkULJvpiMOkWnNq43O9TYjbNgIge5n7CtHZ0adwbCjMoqeQ4yAY
-kMzjtGW/DysJtd2RUy8=
+A0IABDGPaIW1n8NWzUkq4a8F8Q6uzdnHMtX7uHk6HR8wFsh1wj3QmO9m0f9qluDS
+6bok7u7E/n8i4CJfeK9Q+7vwAuijYzBhMA8GA1UdEwEB/wQFMAMCAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBT75Ly4hKArYdPRXPeByY+lKvJ8HjAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBzrZdB
+Jx2W1Qo31fPV7J93V0MZcOA8855eC0hsHGU0TgIhAMGQGVWfEfSYJpJ5bt2cHnCF
+aP2hvUWBIPNTx/jVfYtY
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der
index b069345373d563..338bbae687d27f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem
index 4b454d1337c22c..92444d7b1456db 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFNww1w6sTGHo/4GUFgqc94KUBCoDE9THo3uTAVIUvY2oAoGCCqGSM49
-AwEHoUQDQgAE2uLrdnXEmn7YG44N1sC526U6V0lLd5PJQU1zR+AAJVRtiveWH4+t
-9bXgI1/eWMJ4OSMEGIyEFjQJSgewcOYS+w==
+MHcCAQEEIMmYm/h1vPlRDkZbMdDzDY+5xJaeJNSZ4jfyN9SO7vleoAoGCCqGSM49
+AwEHoUQDQgAEMY9ohbWfw1bNSSrhrwXxDq7N2ccy1fu4eTodHzAWyHXCPdCY72bR
+/2qW4NLpuiTu7sT+fyLgIl94r1D7u/AC6A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json
index 23b0f7f6fa56d2..f7d9ede1b6d398 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension CA field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202087ae3f8ff49867083300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040d32b12d3d1344e4a639ffabf3571ec9bddeb0c511e41d5094043bc5a9cd127d749d81a0b1bfafc69d2df653e6ea4f39c4d5af17075dfaa42f122ea20484aa46a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143c4b46ddff7f01cb9f0ec4692b050abc83e32505301f0603551d230418301680146332eae028a84abdce921e8196ce81f90cf36197300a06082a8648ce3d0403020348003045022100fa34acb00e67faf60be080af46c4dfb3f8d9476c1746b506b9fefb924241476d02201be1aae5af707cadf0706deee9bd18cb2508e22c55ddb83b7d7174f9104fb096",
-    "pai_cert": "308201ba30820161a00302010202082635999f6d0b7610300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004dae2eb7675c49a7ed81b8e0dd6c0b9dba53a57494b7793c9414d7347e00025546d8af7961f8fadf5b5e0235fde58c278392304188c841634094a07b070e612fba3633061300f0603551d130101ff04053003020101300e0603551d0f0101ff040403020106301d0603551d0e041604146332eae028a84abdce921e8196ce81f90cf36197301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220183b323c093048166b98c2bda76cd9142c9be988c3a45a736ae373bd4d88db3602207b99fb0ad1d9d1a7706c28cca2a790e3201890cce3b465bf0f2b09b5dd91532f",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dd55f47d0c3c1ff2ad4a1c4b4c34af6bcef03655bc53c12b3d1154f32967d56902207045c35c93b08ed29707fa9b9a7cd3bf3cea6351a7fed139fd4ab2bcbe514887",
-    "dac_private_key": "cf8ff8b59869e6bdb8f05bc259223c3def433b8b997b72da6e3c6ad2f9c86d85",
-    "dac_public_key": "040d32b12d3d1344e4a639ffabf3571ec9bddeb0c511e41d5094043bc5a9cd127d749d81a0b1bfafc69d2df653e6ea4f39c4d5af17075dfaa42f122ea20484aa46"
+    "dac_cert": "308201ce30820174a003020102020871bb0c7a82638558300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000401e8eac8e2b627bba63d872c2f12cc46147ae9a5fbaaa9a54a1fdceec2a422a41484687857a56a4e4263e9012f11e573bce09517e0b4011c690ecd57e1cc96eca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ab32c560f53b1f8906b6be6cee747de4ec745ffe301f0603551d23041830168014fbe4bcb884a02b61d3d15cf781c98fa52af27c1e300a06082a8648ce3d0403020348003045022069b7378a848ac0692ce4e000d891d52bb88057c4ec7225a4de1b84ccaa04798f022100ac0ca20fed41e1bcb66b28d30b49dcb0b6d127806abfb7b5a5138a1476b46842",
+    "pai_cert": "308201bb30820161a003020102020825b2ee8c4ccd0f04300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004318f6885b59fc356cd492ae1af05f10eaecdd9c732d5fbb8793a1d1f3016c875c23dd098ef66d1ff6a96e0d2e9ba24eeeec4fe7f22e0225f78af50fbbbf002e8a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020106301d0603551d0e04160414fbe4bcb884a02b61d3d15cf781c98fa52af27c1e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022073ad9741271d96d50a37d5f3d5ec9f7757431970e03cf39e5e0b486c1c65344e022100c19019559f11f4982692796edd9c1e708568fda1bd458120f353c7f8d57d8b58",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ff9a7e62129e4f44f202898ab632beb427ba3171abbff4ceed6a671c2628caa50221008b9fee1eb0faa4047751d12c768ac186605625dffeb6896973406559b32bf941",
+    "dac_private_key": "1468e1ae8721d741cdfdb7dcd40800c93b8c78e375c036fa610f04cfdcc7c431",
+    "dac_public_key": "0401e8eac8e2b627bba63d872c2f12cc46147ae9a5fbaaa9a54a1fdceec2a422a41484687857a56a4e4263e9012f11e573bce09517e0b4011c690ecd57e1cc96ec"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der
index ff16691d151673..ecb09dac258bf0 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der
index 47a2d77ccdebda..51989b110805c3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem
index 6859a04d799f40..36eec166d5f06c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIV9X0y0qgVJUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIS4jxz81t364wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASVbtnqNqXT5P6Zik5LeYJiBq72Jj/Y
-p2Y3w0cbFsMaDkUijBTaJPZlW6te+h64K1yUJKX1y8q33O/8WfI4U3KGo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUW+NY7sX74HT0
-WzPXZyzXpeSLQgQwHwYDVR0jBBgwFoAUtblO2L9w0YgpvAqSXLnCvvBl9a8wCgYI
-KoZIzj0EAwIDRwAwRAIgEsL5I3vVcfLg31a7S1zNnULGztmvnQmhpBfSwsFM0SUC
-IC2pf/GVsl1WkluGasPWBDzisVM8OZmcFgIxctZpb7fC
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATiWCpujmMWMXKieY+oZunzOx4XTRjS
+/OVNjyrJ31hTitAjdf7lytLoNRSforqGlrViIXUG/tCrmjjST8LnLL2co2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUCsANtjvjndIv
+xROCWXFRgHRTkZswHwYDVR0jBBgwFoAUIRnmT86ATWnQG345djOEe7VBAhkwCgYI
+KoZIzj0EAwIDSAAwRQIhAKCvl33BBNVf6eY2asYPySLlzPYaTC/EHyMBO4OdBqnb
+AiAxvcNuF5zGd+MP5AZlOnfmIylrYE1uNKj6TXbZVwYh3g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der
index 171f2e6ae229be..81100c6eef05e3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem
index 92c6f5d6eed8da..64a6c04a81aaa9 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPmj5KSi6XrhgotTSanCuCk2BS0wI/Ah1YfIQzq5xVW4oAoGCCqGSM49
-AwEHoUQDQgAElW7Z6jal0+T+mYpOS3mCYgau9iY/2KdmN8NHGxbDGg5FIowU2iT2
-ZVurXvoeuCtclCSl9cvKt9zv/FnyOFNyhg==
+MHcCAQEEIDUffoXTyV8tRml3kbGKZPf6btOha+cVJLb0ZIdbzOxQoAoGCCqGSM49
+AwEHoUQDQgAE4lgqbo5jFjFyonmPqGbp8zseF00Y0vzlTY8qyd9YU4rQI3X+5crS
+6DUUn6K6hpa1YiF1Bv7Qq5o40k/C5yy9nA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der
index d949efa84e6686..9ef446121fef77 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem
index 3d638bdb191982..5f18921ad6a589 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBujCCAWGgAwIBAgIIEIYYGqPzqXMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBuzCCAWGgAwIBAgIIdERKOCOViG8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCt+w74XxlaAMCsQz2GOJIUMNyYwM/dHCFzduUpfaaaH1XbGglOt5LzB5evP
-sH8qiX+H8zKPdUudV9268FkI2jSjYzBhMA8GA1UdEwEB/wQFMAMCAQEwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBS1uU7Yv3DRiCm8CpJcucK+8GX1rzAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBgL0k1
-fwtPISX6ppip3N4uFibcWjB3bA8BoHRC2j+AjQIgDNX34QFByF4sl0WEdrncPrRY
-sWxf384sLH8jEf0oaW0=
+A0IABElBxFevacK5AG9hIKzNSD9xQGX/GcNyLsbqvjMf4beHzUxEysb8h3Fwfejl
+5bjYMbpOLkXRNjhexjD+C/yXcRyjYzBhMA8GA1UdEwEB/wQFMAMCAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQhGeZPzoBNadAbfjl2M4R7tUECGTAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAPLgpa
+4uKmrtNlLXDXyISoW+tRr7pydOuJCb6ecwOQMgIhAMiS7fKoW/tT//ABwqWzfCG9
+eUYMtMnbHTy/gqWdEJod
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der
index 4ec31d810e5e6a..72c38594ca8721 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem
index 63493664f0af7a..6daec99a9f276a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPRv7Wy/TE+jFCBMvHzczx082XwfErbWQ19mA3KbsW1ooAoGCCqGSM49
-AwEHoUQDQgAEK37DvhfGVoAwKxDPYY4khQw3JjAz90cIXN25Sl9ppofVdsaCU63k
-vMHl68+wfyqJf4fzMo91S51X3brwWQjaNA==
+MHcCAQEEIMDhjGDHXErMrnUyU7F9KC+EBvvRzefyEH6TGWxwIPJpoAoGCCqGSM49
+AwEHoUQDQgAESUHEV69pwrkAb2EgrM1IP3FAZf8Zw3Iuxuq+Mx/ht4fNTETKxvyH
+cXB96OXluNgxuk4uRdE2OF7GMP4L/JdxHA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json
index 8af076712029d7..365fab302748c6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension CA field is wrong (TRUE for DAC and FALSE for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a003020102020857d5f4cb4aa05495300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004956ed9ea36a5d3e4fe998a4e4b79826206aef6263fd8a76637c3471b16c31a0e45228c14da24f6655bab5efa1eb82b5c9424a5f5cbcab7dceffc59f238537286a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145be358eec5fbe074f45b33d7672cd7a5e48b4204301f0603551d23041830168014b5b94ed8bf70d18829bc0a925cb9c2bef065f5af300a06082a8648ce3d0403020347003044022012c2f9237bd571f2e0df56bb4b5ccd9d42c6ced9af9d09a1a417d2c2c14cd12502202da97ff195b25d56925b866ac3d6043ce2b1533c39999c16023172d6696fb7c2",
-    "pai_cert": "308201ba30820161a00302010202081086181aa3f3a973300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042b7ec3be17c65680302b10cf618e24850c37263033f747085cddb94a5f69a687d576c68253ade4bcc1e5ebcfb07f2a897f87f3328f754b9d57ddbaf05908da34a3633061300f0603551d130101ff04053003020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b5b94ed8bf70d18829bc0a925cb9c2bef065f5af301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220602f49357f0b4f2125faa698a9dcde2e1626dc5a30776c0f01a07442da3f808d02200cd5f7e10141c85e2c97458476b9dc3eb458b16c5fdfce2c2c7f2311fd28696d",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206584921c371dbbe4bc60bb87aaa25c1ad6059675b593b6d00dabdbf709fc58780221008e9f1646ca903749c70682ded90dff436d369299118d90bcfadda73333b0cd17",
-    "dac_private_key": "f9a3e4a4a2e97ae1828b5349a9c2b82936052d3023f021d587c8433ab9c555b8",
-    "dac_public_key": "04956ed9ea36a5d3e4fe998a4e4b79826206aef6263fd8a76637c3471b16c31a0e45228c14da24f6655bab5efa1eb82b5c9424a5f5cbcab7dceffc59f238537286"
+    "dac_cert": "308201ce30820174a00302010202084b88f1cfcd6ddfae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e2582a6e8e63163172a2798fa866e9f33b1e174d18d2fce54d8f2ac9df58538ad02375fee5cad2e835149fa2ba8696b562217506fed0ab9a38d24fc2e72cbd9ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140ac00db63be39dd22fc51382597151807453919b301f0603551d230418301680142119e64fce804d69d01b7e397633847bb5410219300a06082a8648ce3d0403020348003045022100a0af977dc104d55fe9e6366ac60fc922e5ccf61a4c2fc41f23013b839d06a9db022031bdc36e179cc677e30fe406653a77e623296b604d6e34a8fa4d76d9570621de",
+    "pai_cert": "308201bb30820161a003020102020874444a382395886f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044941c457af69c2b9006f6120accd483f714065ff19c3722ec6eabe331fe1b787cd4c44cac6fc8771707de8e5e5b8d831ba4e2e45d136385ec630fe0bfc97711ca3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020106301d0603551d0e041604142119e64fce804d69d01b7e397633847bb5410219301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200f2e0a5ae2e2a6aed3652d70d7c884a85beb51afba7274eb8909be9e73039032022100c892edf2a85bfb53fff001c2a5b37c21bd79460cb4c9db1d3cbf82a59d109a1d",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022036d204f608c677e18e9208ec774c10d34153f4c1788716f031075d791b6ecb190220576198ba705ddbd8d2a083db1f5c84212859041e70cb6fec0ff61525054fb546",
+    "dac_private_key": "351f7e85d3c95f2d46697791b18a64f7fa6ed3a16be71524b6f464875bccec50",
+    "dac_public_key": "04e2582a6e8e63163172a2798fa866e9f33b1e174d18d2fce54d8f2ac9df58538ad02375fee5cad2e835149fa2ba8696b562217506fed0ab9a38d24fc2e72cbd9c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der
index 06e7bdb3c5e0ee..64a98d58987369 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der
index c1fc2223f1f89f..61c91fd3559eb9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem
index 01b9a53663ca2e..8ffcc4d1f7f1cb 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIaDUSqQx3/W0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIMQ/civCtW7YwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQyBjM/zY0zbkbqWMw9+4Pd1cIBqS9r
-M++ExJ5z1szvU73Gh/l/xhRPvT+jYaH52rsJPZepBpa674nuBcNuxLsWo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzeII3IyhXAeL
-+vcTlAAdiU3In2MwHwYDVR0jBBgwFoAUdmj5Usd4vvcdUm2ulJWEvnSQhQswCgYI
-KoZIzj0EAwIDSAAwRQIhAKETrJx4goxGkhFiGpDZ98MmGXGuhcrgeuw2AmpPqi8T
-AiBJSysAjn7v4glo1lrOSTtxHDmZUN/muxELT6OGZG7ZbA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS1zJgIlCuuTRwhQduQQFdkHbw5UlAZ
+MejDtYg9lMSt31CIB18sc/bWVcIBiCC1DW3IGoQe8mBuKig+yESVnQ2uo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUKyZkxDM6yrsQ
+ITIu4svJOceffl0wHwYDVR0jBBgwFoAUR1F3/qv6Q5ZrCccDU7KmmrGeAw0wCgYI
+KoZIzj0EAwIDRwAwRAIgLDnrRn0UbPn0v3gbpwqPwPXIN2sVc+pdHV1km/DdnSIC
+IGudo/2NrAM5HzpJ+UXQRSF5KWMIQCMFQEIr97u9zCbp
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der
index 5a9a44b86ce737..bff67330dde089 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem
index 8b7c572174fa82..3d32a0a6002a35 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDTVAw1c2BWxq5IuK3NGyefYe2ZZPn9EBheotHpwDF67oAoGCCqGSM49
-AwEHoUQDQgAEMgYzP82NM25G6ljMPfuD3dXCAakvazPvhMSec9bM71O9xof5f8YU
-T70/o2Gh+dq7CT2XqQaWuu+J7gXDbsS7Fg==
+MHcCAQEEIFqUYgb8iAuwGCTAQK57hlakBjLFR4n44DvL08NvDn0IoAoGCCqGSM49
+AwEHoUQDQgAEtcyYCJQrrk0cIUHbkEBXZB28OVJQGTHow7WIPZTErd9QiAdfLHP2
+1lXCAYggtQ1tyBqEHvJgbiooPshElZ0Nrg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der
index 9c0ecbda27fd22..863f8c6548eae9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem
index f291ba4cbb36a0..59845375d24c24 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIbaWCEsxobHIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvDCCAWGgAwIBAgIIcGGOo7HhXB0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABN6XMMRByk7gARUuUW5Nqei+x2hYKs2FQ40ZVEjw+sp6jVDLSAwCnoxGthn8
-CWp7h15mC1mQZa47GHySLrHA11yjYzBhMA8GA1UdEwQIMAYBAf8CAQEwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBR2aPlSx3i+9x1Sba6UlYS+dJCFCzAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB7cF8i
-OxPjMUyxlNXzhE39Avi+feQGVTPa1w378vuLVgIhAPPcjZBkslymvDnXARfH/HDH
-kNsdXkpU3JROwyVcuZ1w
+A0IABCcgeTMSC5ulBJWeb8gl+VMdDeHFr1xkwyYsRDJc3INsGs39qTqarFjfwLYZ
+x8jkn7iy7msSKQXs1yHC67dwSLejYzBhMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBRHUXf+q/pDlmsJxwNTsqaasZ4DDTAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEApvXD
++2vsByWK8VgF7Ao632MFwD2s6riB7uPlknbhxicCIQCVFvM54vOG4rO1aYeH6BUX
+JcLIDdi4/w4X7MXn8BXXgQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der
index 13d2d7a9458749..ff09d27cf77f6e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem
index 3e787ad49985c2..3ba0560adaf85c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB+EXpLkDA/2d2xvJ0iVpkRIOIkrIzxxDUG5BB4E5Di9oAoGCCqGSM49
-AwEHoUQDQgAE3pcwxEHKTuABFS5Rbk2p6L7HaFgqzYVDjRlUSPD6ynqNUMtIDAKe
-jEa2GfwJanuHXmYLWZBlrjsYfJIuscDXXA==
+MHcCAQEEIOi6T39oHEjXexFDqV8ojaFUo28kOgMcgkcWMj2vwnv8oAoGCCqGSM49
+AwEHoUQDQgAEJyB5MxILm6UElZ5vyCX5Ux0N4cWvXGTDJixEMlzcg2wazf2pOpqs
+WN/AthnHyOSfuLLuaxIpBezXIcLrt3BItw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json
index c5427fb5517e45..b037f082989c9d 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208683512a90c77fd6d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043206333fcd8d336e46ea58cc3dfb83ddd5c201a92f6b33ef84c49e73d6ccef53bdc687f97fc6144fbd3fa361a1f9dabb093d97a90696baef89ee05c36ec4bb16a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cde208dc8ca15c078bfaf71394001d894dc89f63301f0603551d230418301680147668f952c778bef71d526dae949584be7490850b300a06082a8648ce3d0403020348003045022100a113ac9c78828c469211621a90d9f7c3261971ae85cae07aec36026a4faa2f130220494b2b008e7eefe20968d65ace493b711c399950dfe6bb110b4fa386646ed96c",
-    "pai_cert": "308201bb30820161a00302010202086da58212cc686c72300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004de9730c441ca4ee001152e516e4da9e8bec768582acd85438d195448f0faca7a8d50cb480c029e8c46b619fc096a7b875e660b599065ae3b187c922eb1c0d75ca3633061300f0603551d13040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604147668f952c778bef71d526dae949584be7490850b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207b705f223b13e3314cb194d5f3844dfd02f8be7de4065533dad70dfbf2fb8b56022100f3dc8d9064b25ca6bc39d70117c7fc70c790db1d5e4a54dc944ec3255cb99d70",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206e8bde60fe2ecf52a55898cd43945e9903f48af1a6ca3e9202ca624573e51db2022100c5b7fd3a460b3ee9a7a2b400e260421b58bd4c5782e2b5afa7dc2bc908b66631",
-    "dac_private_key": "34d5030d5cd815b1ab922e2b7346c9e7d87b66593e7f440617a8b47a700c5ebb",
-    "dac_public_key": "043206333fcd8d336e46ea58cc3dfb83ddd5c201a92f6b33ef84c49e73d6ccef53bdc687f97fc6144fbd3fa361a1f9dabb093d97a90696baef89ee05c36ec4bb16"
+    "dac_cert": "308201cd30820174a0030201020208310fdc8af0ad5bb6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b5cc9808942bae4d1c2141db904057641dbc3952501931e8c3b5883d94c4addf5088075f2c73f6d655c2018820b50d6dc81a841ef2606e2a283ec844959d0daea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142b2664c4333acabb1021322ee2cbc939c79f7e5d301f0603551d23041830168014475177feabfa43966b09c70353b2a69ab19e030d300a06082a8648ce3d040302034700304402202c39eb467d146cf9f4bf781ba70a8fc0f5c8376b1573ea5d1d5d649bf0dd9d2202206b9da3fd8dac03391f3a49f945d045217929630840230540422bf7bbbdcc26e9",
+    "pai_cert": "308201bc30820161a003020102020870618ea3b1e15c1d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000427207933120b9ba504959e6fc825f9531d0de1c5af5c64c3262c44325cdc836c1acdfda93a9aac58dfc0b619c7c8e49fb8b2ee6b122905ecd721c2ebb77048b7a3633061300f0603551d13040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414475177feabfa43966b09c70353b2a69ab19e030d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a6f5c3fb6bec07258af15805ec0a3adf6305c03daceab881eee3e59276e1c6270221009516f339e2f386e2b3b5698787e8151725c2c80dd8b8ff0e17ecc5e7f015d781",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402200a1a03af66ab1977de0f5b4c46ea1df8ead3badf11abd413bfbc0e24d69688aa022017849bd80c1495d9669415db572faa0d11be10b004f228fa549630feebeae710",
+    "dac_private_key": "5a946206fc880bb01824c040ae7b8656a40632c54789f8e03bcbd3c36f0e7d08",
+    "dac_public_key": "04b5cc9808942bae4d1c2141db904057641dbc3952501931e8c3b5883d94c4addf5088075f2c73f6d655c2018820b50d6dc81a841ef2606e2a283ec844959d0dae"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der
index 16580e7d2d6d10..8d7fe9690b3d89 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der
index 605e7ac8cc8ca4..fee4ec2e57a9c7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem
index 81cc3d9d18344f..9a2708d92eccab 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIIvIMo+2z3JcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIdb3Nlp5blpswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATIpG7SO3kXR63xxZca4fQqFqYo2F3O
-FfG8Xvl/QQODseEUXPxniewCwLCIK3VR4MtSlo/Rh+mx5jpKXhGv05u2o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWjra3/hdKFJ0
-e4iZUp77iADxHYMwHwYDVR0jBBgwFoAUrKN+yHlA9c/+Btcivigzkx83JGswCgYI
-KoZIzj0EAwIDSAAwRQIhAM9G54Z/jQ3PqrD/HqMTpii14uvDe1xKZNc8f9fTQr3n
-AiBIoOpP7vJmb55qRUZ3PAOYQWQZMxDGOElmvMJmoaokZg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+HHBpV+Xgs8TXk2QwyNIrE49hs33T
+dBsmjGxkFtvkC63F9yZ3/ETgel6PC90gaSSKS3kbASlS1r1wouXZCGIuo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUlUm6FFY5w3+P
+QoRRaS5Cn0hwdUwwHwYDVR0jBBgwFoAU9V8WUhHCne1IBikMKbyKDYxNLWMwCgYI
+KoZIzj0EAwIDSAAwRQIhALKGIRutW3nqvvNYsC//YYXbvwuUqwKNrvG7xZqNZi9t
+AiAGcHMmY47S9HzYQ5Lba0219tXwqnCeBGxQy3mYss9GnQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der
index f65192bd07f575..cc39e9ff8b773f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem
index b51d973b4b98ac..0f311485fec959 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIK49G26Z1TOjf49ZrpMO6AOxmrYRQ7+fPrslxszr+Hi6oAoGCCqGSM49
-AwEHoUQDQgAEyKRu0jt5F0et8cWXGuH0KhamKNhdzhXxvF75f0EDg7HhFFz8Z4ns
-AsCwiCt1UeDLUpaP0YfpseY6Sl4Rr9Obtg==
+MHcCAQEEIHIPnpRdewmid4BTuNpqP/TOUz/NDmv55vbVfgdPLROBoAoGCCqGSM49
+AwEHoUQDQgAE/hxwaVfl4LPE15NkMMjSKxOPYbN903QbJoxsZBbb5Autxfcmd/xE
+4HpejwvdIGkkikt5GwEpUta9cKLl2QhiLg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der
index 82090d766f191b..7ccc1420cfaeae 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem
index 51c78615025cea..acd5faef5a81e9 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBujCCAWGgAwIBAgIIIqgF5EvxUZQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBujCCAWGgAwIBAgIIVMm6Jv+mxPcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABHZs39yeMo/FXFzmiygnjQkzowtIyulsjjC+VgbRF996WbkyyLtfEtyZOwSk
-dw86utwzYLWqCvVmZRNzRgwsILqjYzBhMA8GA1UdEwQIMAYBAf8CAQEwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBSso37IeUD1z/4G1yK+KDOTHzckazAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBthVYQ
-AtmywWGoKCUpzF6hIvAtDc3PqNazIaluRDCvAwIgfyYuTq4rhD4QczKUdHwl0SaN
-Ilm4LQxhQwwHnDWckbA=
+A0IABJ2Wl9l6l+gs9rqbfbTsbzCtvEUUwAUrk7KCuAk5T9jZ8BLiM7tZt35zflmK
+kb8z3kjs4ixR5yRDlhHE/xY0zMqjYzBhMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBT1XxZSEcKd7UgGKQwpvIoNjE0tYzAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAr+rce
+p33wOyktgrS9GyGihoGPW2QYe/VwKdJlKhQ38gIgHc9B3Am9Dzh7g5GrPWMGN3rU
+l+7ep/ftYp2J0zavcjM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der
index 4bf2a358f2e46a..68f5fb0b51710a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem
index f1707313b3d9d7..ee9bc684a7cdd0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILEy5NfchV4cNpY6M9xnIYV/KiJP4Db61L0nHJ+B+kEKoAoGCCqGSM49
-AwEHoUQDQgAEdmzf3J4yj8VcXOaLKCeNCTOjC0jK6WyOML5WBtEX33pZuTLIu18S
-3Jk7BKR3Dzq63DNgtaoK9WZlE3NGDCwgug==
+MHcCAQEEIM8HlMqytGy/LgAdt+U5DQZcRU2WkFCd3c6sAngjD3e3oAoGCCqGSM49
+AwEHoUQDQgAEnZaX2XqX6Cz2upt9tOxvMK28RRTABSuTsoK4CTlP2NnwEuIzu1m3
+fnN+WYqRvzPeSOziLFHnJEOWEcT/FjTMyg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json
index 36164cd4a77db9..f2571061790254 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020822f20ca3edb3dc97300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c8a46ed23b791747adf1c5971ae1f42a16a628d85dce15f1bc5ef97f410383b1e1145cfc6789ec02c0b0882b7551e0cb52968fd187e9b1e63a4a5e11afd39bb6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145a3adadff85d2852747b8899529efb8800f11d83301f0603551d23041830168014aca37ec87940f5cffe06d722be2833931f37246b300a06082a8648ce3d0403020348003045022100cf46e7867f8d0dcfaab0ff1ea313a628b5e2ebc37b5c4a64d73c7fd7d342bde7022048a0ea4feef2666f9e6a4546773c03984164193310c6384966bcc266a1aa2466",
-    "pai_cert": "308201ba30820161a003020102020822a805e44bf15194300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004766cdfdc9e328fc55c5ce68b28278d0933a30b48cae96c8e30be5606d117df7a59b932c8bb5f12dc993b04a4770f3abadc3360b5aa0af566651373460c2c20baa3633061300f0603551d13040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414aca37ec87940f5cffe06d722be2833931f37246b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402206d85561002d9b2c161a8282529cc5ea122f02d0dcdcfa8d6b321a96e4430af0302207f262e4eae2b843e10733294747c25d1268d2259b82d0c61430c079c359c91b0",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c46e78d1ec5865c15f7eda4143e16ffc38679d6d81626e1560c068f40da503640220197db5d90fd9b2251c38476158cb69e0b1cd1ab38a481e32d179e3f53255b554",
-    "dac_private_key": "ae3d1b6e99d533a37f8f59ae930ee803b19ab61143bf9f3ebb25c6ccebf878ba",
-    "dac_public_key": "04c8a46ed23b791747adf1c5971ae1f42a16a628d85dce15f1bc5ef97f410383b1e1145cfc6789ec02c0b0882b7551e0cb52968fd187e9b1e63a4a5e11afd39bb6"
+    "dac_cert": "308201ce30820174a003020102020875bdcd969e5b969b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fe1c706957e5e0b3c4d7936430c8d22b138f61b37dd3741b268c6c6416dbe40badc5f72677fc44e07a5e8f0bdd2069248a4b791b012952d6bd70a2e5d908622ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149549ba145639c37f8f428451692e429f4870754c301f0603551d23041830168014f55f165211c29ded4806290c29bc8a0d8c4d2d63300a06082a8648ce3d0403020348003045022100b286211bad5b79eabef358b02fff6185dbbf0b94ab028daef1bbc59a8d662f6d022006707326638ed2f47cd84392db6b4db5f6d5f0aa709e046c50cb7998b2cf469d",
+    "pai_cert": "308201ba30820161a003020102020854c9ba26ffa6c4f7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049d9697d97a97e82cf6ba9b7db4ec6f30adbc4514c0052b93b282b809394fd8d9f012e233bb59b77e737e598a91bf33de48ece22c51e724439611c4ff1634cccaa3633061300f0603551d13040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f55f165211c29ded4806290c29bc8a0d8c4d2d63301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202bfab71ea77df03b292d82b4bd1b21a286818f5b64187bf57029d2652a1437f202201dcf41dc09bd0f387b8391ab3d6306377ad497eedea7f7ed629d89d336af7233",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100815f5318a677166a66950bdf02be6212ef4f1a99e1a0fc81ab80f68c3fa2fc880221008410e82ea0095fdd328b4571d21045da47880c0f0399d3a2801a5f6543a17f02",
+    "dac_private_key": "720f9e945d7b09a2778053b8da6a3ff4ce533fcd0e6bf9e6f6d57e074f2d1381",
+    "dac_public_key": "04fe1c706957e5e0b3c4d7936430c8d22b138f61b37dd3741b268c6c6416dbe40badc5f72677fc44e07a5e8f0bdd2069248a4b791b012952d6bd70a2e5d908622e"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der
index 55013e0ec24f80..ce8f850e77da00 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der
index b6c6d449831623..32cedf18c2d3bc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem
index 79748652d112d3..c7b1258d5f0989 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIcqj4HIFV+OQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIW8xZsDy+utUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAREQXdjPxxEABV3bOC69UIcKjGInp3z
-wRZWAeZU1v+S6xZcgoHFJOv2rzaWh/JeYylVBAIuVZV1r/qvuYfOE/Tio2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU1quN3qlqBRhA
-ultbfWV/Jm49FPswHwYDVR0jBBgwFoAUqi3oUmbUxHiaSCMmFpAyzjkexDswCgYI
-KoZIzj0EAwIDSAAwRQIhAPr2yjEcMgiveEW0I6lKfZFReXZ3hnCi6vKMnEO2+Owp
-AiBvKdELQarCsoQb/n6VTNhjOpPpAjm+iF6bOSDLQkjrUg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdAdeOpU8zzB58Pc6CJHRoAX4OG9nO
+VOJrp56gH6igILibAMEGpBuHgAg8yP90uONyaaV8bqv1M3pyjaDkpR4No2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU98kIxRrO4iSq
+jJDvrNSQQUxbirUwHwYDVR0jBBgwFoAUlHQI+M208hYbyi6p4Lap2pXp5IQwCgYI
+KoZIzj0EAwIDSAAwRQIhAOovv+N8V3k4SDQXzGNv/XPU4pL4yx9d9mxOcJR6BQvi
+AiANwIAb9a312zgGMHPBqlk/jd6OF2jwGurjSjx741BJ6g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der
index 8d28d2664fde1f..af169affecf2cb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem
index b08dc2fa20cba7..121bb77756a400 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO9S0jqLcyxp6SbUTMOuvUWO1bJa2BZKg57UOuWFp6k/oAoGCCqGSM49
-AwEHoUQDQgAEREF3Yz8cRAAVd2zguvVCHCoxiJ6d88EWVgHmVNb/kusWXIKBxSTr
-9q82lofyXmMpVQQCLlWVda/6r7mHzhP04g==
+MHcCAQEEIDuxLZXbl2lK1CIbNoRdSk2mn03DbyHzR7CdTjD0dnmjoAoGCCqGSM49
+AwEHoUQDQgAEXQHXjqVPM8wefD3OgiR0aAF+DhvZzlTia6eeoB+ooCC4mwDBBqQb
+h4AIPMj/dLjjcmmlfG6r9TN6co2g5KUeDQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der
index 0d7f2f91119ce7..219f330f5b27d9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem
index dd5ba181ae4f8e..25694d8d330941 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBqjCCAVCgAwIBAgIIQY6WgUoNjqEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBqjCCAVCgAwIBAgIID878EHeYm7cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABN+lpYIumC6+V5LX2R3BGscTGfKBH3ejl8yKxWBAFnAjraCWENcPIE3VffHk
-f8vmeaoSb7NHyBpHAyQfWa7JOy2jUjBQMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUqi3oUmbUxHiaSCMmFpAyzjkexDswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGX
-ZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIgERugrMoPqgWeVWPA4RioIpep2WmY
-rJB2/bMhOdUmUmwCIQD6ZXHiLsVkzvqZDqpn/ZGp4xXt/YRPkYMAMPbKrzGpzQ==
+A0IABEH0GBS7xtXgBDl/sLWn0aRdIDX2QSbboPdW37A8V7wjBxOQXRoir9iQmPXX
+sAVTH1zWS8svwm+kls9vCKwBiAejUjBQMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUlHQI+M208hYbyi6p4Lap2pXp5IQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGX
+ZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhAJG7tQaKXSVo7RArM2/RwwU4y9UV
+bY8LiO807Fun7OKjAiAVjKxUjnhEsp3tzBLXopv2AL3qoz7rlvPmRWyxcC4kcA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der
index 64350cad328d47..fade1e59b6e855 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem
index 96ab9815621701..1b59cd60eaaac5 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEGpilBeZ6WoFpnB9BVo+ZfyDexR5hh2f7niNd66RhceoAoGCCqGSM49
-AwEHoUQDQgAE36Wlgi6YLr5XktfZHcEaxxMZ8oEfd6OXzIrFYEAWcCOtoJYQ1w8g
-TdV98eR/y+Z5qhJvs0fIGkcDJB9Zrsk7LQ==
+MHcCAQEEIBYD5L9Q/WcmGpnsWW9DI2NgK+RXFVxUZPAS2cW+Mb0YoAoGCCqGSM49
+AwEHoUQDQgAEQfQYFLvG1eAEOX+wtafRpF0gNfZBJtug91bfsDxXvCMHE5BdGiKv
+2JCY9dewBVMfXNZLyy/Cb6SWz28IrAGIBw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json
index cda45e7bb3288d..d31f029ea996f7 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Basic Constraint extension",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020872a8f81c8155f8e4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004444177633f1c440015776ce0baf5421c2a31889e9df3c1165601e654d6ff92eb165c8281c524ebf6af369687f25e63295504022e559575affaafb987ce13f4e2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d6ab8ddea96a051840ba5b5b7d657f266e3d14fb301f0603551d23041830168014aa2de85266d4c4789a482326169032ce391ec43b300a06082a8648ce3d0403020348003045022100faf6ca311c3208af7845b423a94a7d91517976778670a2eaf28c9c43b6f8ec2902206f29d10b41aac2b2841bfe7e954cd8633a93e90239be885e9b3920cb4248eb52",
-    "pai_cert": "308201aa30820150a0030201020208418e96814a0d8ea1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004dfa5a5822e982ebe5792d7d91dc11ac71319f2811f77a397cc8ac56040167023ada09610d70f204dd57df1e47fcbe679aa126fb347c81a4703241f59aec93b2da3523050300e0603551d0f0101ff040403020106301d0603551d0e04160414aa2de85266d4c4789a482326169032ce391ec43b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220111ba0acca0faa059e5563c0e118a82297a9d96998ac9076fdb32139d526526c022100fa6571e22ec564cefa990eaa67fd91a9e315edfd844f91830030f6caaf31a9cd",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cbad358c3a059cfa829489d73bf821769d2f4e7c413b7f96a28c75b0922d3301022100c7c0ad2429dc0fbaaa1359e2e50ca87b7132cd6dbdf7d565e255d616be1db958",
-    "dac_private_key": "ef52d23a8b732c69e926d44cc3aebd458ed5b25ad8164a839ed43ae585a7a93f",
-    "dac_public_key": "04444177633f1c440015776ce0baf5421c2a31889e9df3c1165601e654d6ff92eb165c8281c524ebf6af369687f25e63295504022e559575affaafb987ce13f4e2"
+    "dac_cert": "308201ce30820174a00302010202085bcc59b03cbebad5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d01d78ea54f33cc1e7c3dce82247468017e0e1bd9ce54e26ba79ea01fa8a020b89b00c106a41b8780083cc8ff74b8e37269a57c6eabf5337a728da0e4a51e0da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f7c908c51acee224aa8c90efacd490414c5b8ab5301f0603551d23041830168014947408f8cdb4f2161bca2ea9e0b6a9da95e9e484300a06082a8648ce3d0403020348003045022100ea2fbfe37c577938483417cc636ffd73d4e292f8cb1f5df66c4e70947a050be202200dc0801bf5adf5db38063073c1aa593f8dde8e1768f01aeae34a3c7be35049ea",
+    "pai_cert": "308201aa30820150a00302010202080fcefc1077989bb7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000441f41814bbc6d5e004397fb0b5a7d1a45d2035f64126dba0f756dfb03c57bc230713905d1a22afd89098f5d7b005531f5cd64bcb2fc26fa496cf6f08ac018807a3523050300e0603551d0f0101ff040403020106301d0603551d0e04160414947408f8cdb4f2161bca2ea9e0b6a9da95e9e484301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210091bbb5068a5d2568ed102b336fd1c30538cbd5156d8f0b88ef34ec5ba7ece2a30220158cac548e7844b29dedcc12d7a29bf600bdeaa33eeb96f3e6456cb1702e2470",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b527f4d1698836f14ef8ecae20a643375b642197bf8a6ff2651149e0ebfd9b66022100b9f1e4ab4a3d59f17fc3947eaa70e1dc4acf29cca4715ff5f6504342a522ad02",
+    "dac_private_key": "3bb12d95db97694ad4221b36845d4a4da69f4dc36f21f347b09d4e30f47679a3",
+    "dac_public_key": "045d01d78ea54f33cc1e7c3dce82247468017e0e1bd9ce54e26ba79ea01fa8a020b89b00c106a41b8780083cc8ff74b8e37269a57c6eabf5337a728da0e4a51e0d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der
index 3ce3dbf7659f24..8016cfb7bd7512 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der
index bd5405e34f3638..884b8c03214507 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem
index 6495c4586383fb..5e0936280de507 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIVyne/Lcit5QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIE87T7r1Bhp0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR1V/sIJpj1ZZnENW8Z7QXaRNDgInW+
-9Rq7NNhx23s2VQoxMJbEeCgXfs/MoUcZirP8rhwmEYkZ4BVCWUE1MJjNo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUcpqEo2m5WIMK
-FxThMMc4FlytIOswHwYDVR0jBBgwFoAUZvfmmvLuK0sPoZXvps0ZPIf5+JQwCgYI
-KoZIzj0EAwIDRwAwRAIgeW6fAwuKnaCPi7yePzjRpLo/npYbjYL9P6Ca7j/0WSwC
-IBDzuElaXxDybmJMWwzVjU6lFzBtbKOJ67dT22petRyb
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7o6rYmlkehsGURjgyN+4h6eCNDW+D
+N9vdFYPtszQBXKEfuimlcvxWC/HJMnXPK/Ccf4wZUjWcqVMMuI1880JDo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUeWBrOG/Fzmox
+3mqvlCqKDO+6HeUwHwYDVR0jBBgwFoAUo1n1g1fHzDc7aKU/iiq7m8QviUEwCgYI
+KoZIzj0EAwIDSQAwRgIhAJITH7q0spz0PtDmj+ZNd5VrKp4NpdvwMGPGjJ8LGrDO
+AiEAmV9qYMsA8i/jNesvzrM9iBl3LLQiBNT7st+8OtBROTY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der
index fdc5d437c9583f..83ba60871de70b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem
index 6bd7c2cb908869..80a5143f784a92 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKNv91OZ8xnf7lKe7NjEz4qxfKEPqI/H6tNn42JltNRNoAoGCCqGSM49
-AwEHoUQDQgAEdVf7CCaY9WWZxDVvGe0F2kTQ4CJ1vvUauzTYcdt7NlUKMTCWxHgo
-F37PzKFHGYqz/K4cJhGJGeAVQllBNTCYzQ==
+MHcCAQEEIN0NjQ+lqAT4i/SzFYhpMPkfRYt3olg4X3/khROQi1Y1oAoGCCqGSM49
+AwEHoUQDQgAE+6Oq2JpZHobBlEY4MjfuIengjQ1vgzfb3RWD7bM0AVyhH7oppXL8
+VgvxyTJ1zyvwnH+MGVI1nKlTDLiNfPNCQw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der
index 3861ffb0a97b72..95bf7811ec38ba 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem
index 4d22147506ba5b..79935fd9a6638b 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIKRp9Cuiy3eMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIID5v84wYVAMMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABMox6Cjpeqv49ccPoHp4gQ/dFrL5mBmVB2c6V8VVZfbH9QS7QTSJd2VX/BlZ
-/eQI/NFwzKYEcewlCiLjis74PpujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRm9+aa8u4rSw+hle+mzRk8h/n4lDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-hXmUNnf796Bkj1z182GojM8zq7SeWfFtAKn9qu2XIbECIDkvn4YZb1rnsLKll0VR
-xdoBu31q4TrBFUCyw9ChUyFe
+A0IABFLwkBRiGLl56zj7bjkVNTLKADMtouNS5kIKli3ZV8UyUxyY1bMYhSAjYX+3
+rxkfj0knRp3y8xzKMUNfkLR9krGjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSjWfWDV8fMNztopT+KKrubxC+JQTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBn
+l65zTZ72EseoQ5Xm9+FlVapbbSEBkvys8TMnivKYXAIhAI8+8OgRulGG1Qp7qQMK
+3VGQ/iY3wH4pCjdh5QnXe2gL
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der
index bbfdcdb2dfaaf3..f770a9420b027b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem
index f1397d17baeafc..c1e48c613972c3 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMegMqXX2sBV/RVLZA+zNIEOjA7DX6hC0e4Qjzq2yooWoAoGCCqGSM49
-AwEHoUQDQgAEyjHoKOl6q/j1xw+geniBD90WsvmYGZUHZzpXxVVl9sf1BLtBNIl3
-ZVf8GVn95Aj80XDMpgRx7CUKIuOKzvg+mw==
+MHcCAQEEIBP4UxtzAtK7s/yKzpOESJxMzX21INk9IzfJH9uc0YatoAoGCCqGSM49
+AwEHoUQDQgAEUvCQFGIYuXnrOPtuORU1MsoAMy2i41LmQgqWLdlXxTJTHJjVsxiF
+ICNhf7evGR+PSSdGnfLzHMoxQ1+QtH2SsQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json
index 1801e9330904f3..d34fe3a7dbda3c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field set to 0",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a00302010202085729defcb722b794300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047557fb082698f56599c4356f19ed05da44d0e02275bef51abb34d871db7b36550a313096c47828177ecfcca147198ab3fcae1c26118919e015425941353098cda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414729a84a369b958830a1714e130c738165cad20eb301f0603551d2304183016801466f7e69af2ee2b4b0fa195efa6cd193c87f9f894300a06082a8648ce3d04030203470030440220796e9f030b8a9da08f8bbc9e3f38d1a4ba3f9e961b8d82fd3fa09aee3ff4592c022010f3b8495a5f10f26e624c5b0cd58d4ea517306d6ca389ebb753db6a5eb51c9b",
-    "pai_cert": "308201be30820164a0030201020208291a7d0ae8b2dde3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ca31e828e97aabf8f5c70fa07a78810fdd16b2f998199507673a57c55565f6c7f504bb413489776557fc1959fde408fcd170cca60471ec250a22e38acef83e9ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041466f7e69af2ee2b4b0fa195efa6cd193c87f9f894301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008579943677fbf7a0648f5cf5f361a88ccf33abb49e59f16d00a9fdaaed9721b10220392f9f86196f5ae7b0b2a5974551c5da01bb7d6ae13ac11540b2c3d0a153215e",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220482ad9a336283c8a0f90bb78e27c930df1e1ff6fdfa0d96dd440d07ac0a8e64f0220527d13c193762175ecd5a0e37b0337bc5c8956d3a88de750628798a2d6d38084",
-    "dac_private_key": "a36ff75399f319dfee529eecd8c4cf8ab17ca10fa88fc7ead367e36265b4d44d",
-    "dac_public_key": "047557fb082698f56599c4356f19ed05da44d0e02275bef51abb34d871db7b36550a313096c47828177ecfcca147198ab3fcae1c26118919e015425941353098cd"
+    "dac_cert": "308201cf30820174a003020102020813ced3eebd41869d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fba3aad89a591e86c19446383237ee21e9e08d0d6f8337dbdd1583edb334015ca11fba29a572fc560bf1c93275cf2bf09c7f8c1952359ca9530cb88d7cf34243a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041479606b386fc5ce6a31de6aaf942a8a0cefba1de5301f0603551d23041830168014a359f58357c7cc373b68a53f8a2abb9bc42f8941300a06082a8648ce3d040302034900304602210092131fbab4b29cf43ed0e68fe64d77956b2a9e0da5dbf03063c68c9f0b1ab0ce022100995f6a60cb00f22fe335eb2fceb33d8819772cb42204d4fbb2dfbc3ad0513936",
+    "pai_cert": "308201be30820164a00302010202080f9bfce3061500c3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000452f090146218b979eb38fb6e39153532ca00332da2e352e6420a962dd957c532531c98d5b318852023617fb7af191f8f4927469df2f31cca31435f90b47d92b1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a359f58357c7cc373b68a53f8a2abb9bc42f8941301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206797ae734d9ef612c7a84395e6f7e16555aa5b6d210192fcacf133278af2985c0221008f3ef0e811ba5186d50a7ba9030add5190fe2637c07e290a3761e509d77b680b",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022021196a35d5eb76cb150bb3f70663ded9bad9bcdd5848d20ee3b73d5031a4d9b3022100edfc04bfbfc9308e76339abe7736e1989b2402681a38d7d2801a721ac5156629",
+    "dac_private_key": "dd0d8d0fa5a804f88bf4b315886930f91f458b77a258385f7fe48513908b5635",
+    "dac_public_key": "04fba3aad89a591e86c19446383237ee21e9e08d0d6f8337dbdd1583edb334015ca11fba29a572fc560bf1c93275cf2bf09c7f8c1952359ca9530cb88d7cf34243"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der
index eaa2200a14548b..c2d19e05abadb5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der
index fa8f5926ac5a4b..6cc32e5bf84b5f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem
index db24844a85647a..5d012c88f80d05 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIV53Lt7q6dbcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIQ94ezKBuz7owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9WGk1rie1bYL7SehWXXGOwQgPXtGx
-WfL6ry1esBopbj2Z3HeiSUsnfNrESxwRlhPbkWTLlghsdAj1SJ1CSib5o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzWOTsbiGYkXX
-sOX7e2YXFlwbtwIwHwYDVR0jBBgwFoAU4ybl4hTxNw6tPAyPgow9kR3f9ZMwCgYI
-KoZIzj0EAwIDSAAwRQIgP2/GmzW6oXYlBAdDVCnbOt2tNdyvtyQJ3fWNQw4DfK8C
-IQCcmh0NqOw6WkcsG056VsS8WK3gGPETMj2YrofdDgJYzw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATOeerGnSKKK9gKaFTwwWb9oTlXENpk
+8zckRPmGf8uDQA34e2h4ko+pkjyuYGgTUbjKNmO1zrMQUKrpSEjshTYQo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdcRCF3OJpCGI
+sJ3ESiRxddQc+IIwHwYDVR0jBBgwFoAU0bj1sSC1TYQMeRMB9qezc8mgnAswCgYI
+KoZIzj0EAwIDRwAwRAIgKJnHTBXQHqC/TR941xO40h7RM12VR3mFy/aBGd3iWMIC
+IDbIaRJuLPIhFtQ8ubmQHSOrrzx5EDQfimi3HiZmtqqy
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der
index 5fd046f5d00876..fd60d60addca87 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem
index a72b155b242e8e..7cb0ef0f3e13bf 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHAOr/SVijKkeETRjIECLJXQE6iztcWfGfVo70qioO+MoAoGCCqGSM49
-AwEHoUQDQgAE/VhpNa4ntW2C+0noVl1xjsEID17RsVny+q8tXrAaKW49mdx3oklL
-J3zaxEscEZYT25Fky5YIbHQI9UidQkom+Q==
+MHcCAQEEIF19URBX3zQIrBdZrhxnTC5oKdP5E8Iz/hBvpwcoTOs1oAoGCCqGSM49
+AwEHoUQDQgAEznnqxp0iiivYCmhU8MFm/aE5VxDaZPM3JET5hn/Lg0AN+HtoeJKP
+qZI8rmBoE1G4yjZjtc6zEFCq6UhI7IU2EA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der
index 89c14de17c5c83..9a7716ecd52973 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem
index e8417114821ca8..0a80b6d9a65a18 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIO6AbDsnA+7owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIIJngdx/fnGaEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABB2/smboO4ptf7nYCnsDarQ3bUQ8FXP8JLGlM6ra6Ds29KBeasbj4MlmD8iR
-qut3WBFomka9ZYii6e6lUzfT012jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjJuXiFPE3Dq08DI+CjD2RHd/1kzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-nc3fDteM1KuRL16+eCvSWNjl+SF0ic+pXUg7+ZVrI6MCIDvCK4bkBiTr15MHKbvP
-rVDiMOlyW15OWB7/dj/61vIf
+A0IABD0Xv6bFdvRzHD1WE9gybQ/WvaE5+N3oWCUEFCscmNW1bLeJqR5l/3c9cUPu
+OfbV7xQul6KLwJJAcyRQZBs8K0qjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTRuPWxILVNhAx5EwH2p7NzyaCcCzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBc
+tRMOIZlyWi5YjdE/keJDNl4qpouwFABhWTJ0jiZZ0wIgXG4UadFkPFNiKCGayZlw
+1eDX6nQnnpQUJcbCLrBEzvQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der
index aa971c0319cde8..b8201abac38649 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem
index d9c99ad6627a72..c06f22a23a68f1 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFvO4uX+VmTQF1syrvK6v2sP0in4RHcx759qGCa5mYg5oAoGCCqGSM49
-AwEHoUQDQgAEHb+yZug7im1/udgKewNqtDdtRDwVc/wksaUzqtroOzb0oF5qxuPg
-yWYPyJGq63dYEWiaRr1liKLp7qVTN9PTXQ==
+MHcCAQEEICzkD+kLllNSUQYc+iRa+zWw2DrpqW0ISFXIctbwqOcooAoGCCqGSM49
+AwEHoUQDQgAEPRe/psV29HMcPVYT2DJtD9a9oTn43ehYJQQUKxyY1bVst4mpHmX/
+dz1xQ+459tXvFC6XoovAkkBzJFBkGzwrSg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json
index 1d31c361df1080..fd73e026aac2a7 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field set to 1",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208579dcbb7baba75b7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fd586935ae27b56d82fb49e8565d718ec1080f5ed1b159f2faaf2d5eb01a296e3d99dc77a2494b277cdac44b1c119613db9164cb96086c7408f5489d424a26f9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cd6393b1b8866245d7b0e5fb7b6617165c1bb702301f0603551d23041830168014e326e5e214f1370ead3c0c8f828c3d911ddff593300a06082a8648ce3d040302034800304502203f6fc69b35baa176250407435429db3addad35dcafb72409ddf58d430e037caf0221009c9a1d0da8ec3a5a472c1b4e7a56c4bc58ade018f113323d98ae87dd0e0258cf",
-    "pai_cert": "308201be30820164a00302010202083ba01b0ec9c0fbba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200041dbfb266e83b8a6d7fb9d80a7b036ab4376d443c1573fc24b1a533aadae83b36f4a05e6ac6e3e0c9660fc891aaeb775811689a46bd6588a2e9eea55337d3d35da366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414e326e5e214f1370ead3c0c8f828c3d911ddff593301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009dcddf0ed78cd4ab912f5ebe782bd258d8e5f9217489cfa95d483bf9956b23a302203bc22b86e40624ebd7930729bbcfad50e230e9725b5e4e581eff763ffad6f21f",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206fa26f3807f0d97c57652a38fc299564f543465c9ed9cadd793a290790aa11de022100fa8550d0b761a3c63a6b5b4e5e4309f7b11c23d83deef774a605e23a28d8c5e1",
-    "dac_private_key": "700eaff4958a32a47844d18c81022c95d013a8b3b5c59f19f568ef4aa2a0ef8c",
-    "dac_public_key": "04fd586935ae27b56d82fb49e8565d718ec1080f5ed1b159f2faaf2d5eb01a296e3d99dc77a2494b277cdac44b1c119613db9164cb96086c7408f5489d424a26f9"
+    "dac_cert": "308201cd30820174a003020102020843de1ecca06ecfba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ce79eac69d228a2bd80a6854f0c166fda1395710da64f3372444f9867fcb83400df87b6878928fa9923cae60681351b8ca3663b5ceb31050aae94848ec853610a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041475c442177389a42188b09dc44a247175d41cf882301f0603551d23041830168014d1b8f5b120b54d840c791301f6a7b373c9a09c0b300a06082a8648ce3d040302034700304402202899c74c15d01ea0bf4d1f78d713b8d21ed1335d95477985cbf68119dde258c2022036c869126e2cf22116d43cb9b9901d23abaf3c7910341f8a68b71e2666b6aab2",
+    "pai_cert": "308201bd30820164a003020102020826781dc7f7e719a1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043d17bfa6c576f4731c3d5613d8326d0fd6bda139f8dde8582504142b1c98d5b56cb789a91e65ff773d7143ee39f6d5ef142e97a28bc09240732450641b3c2b4aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414d1b8f5b120b54d840c791301f6a7b373c9a09c0b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205cb5130e2199725a2e588dd13f91e243365e2aa68bb01400615932748e2659d302205c6e1469d1643c536228219ac99970d5e0d7ea74279e941425c6c22eb044cef4",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cec5eed2434fd86ca1fb9c30815b79af49c6740a9e76a5f26268f83c73f816a40221008d3eb5d6c27153b0d1c9393e336088628e79a3bdf188c0314ab4165c024f8f90",
+    "dac_private_key": "5d7d511057df3408ac1759ae1c674c2e6829d3f913c233fe106fa707284ceb35",
+    "dac_public_key": "04ce79eac69d228a2bd80a6854f0c166fda1395710da64f3372444f9867fcb83400df87b6878928fa9923cae60681351b8ca3663b5ceb31050aae94848ec853610"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der
index 9cd34316368ab8..faa14b0514f108 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der
index e53358698459b4..c6c613f770a8f3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem
index 5827c64dcae4a4..03730369ca6826 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIBnC8E0BZ4vwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIfG3PSXrUp5AwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQBlO280rkIlQXnRGWNDRE0ZI3QfbQt
-x6eo++Jn5Q1lFDjEZ9LJh44emhGKC2xvr71p0fMUnEm3na8KuFOraCFKo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUyjutKVH7/9EH
-CeLfKMNg5eqf4BAwHwYDVR0jBBgwFoAUIKWwXLaQflD4B6osdspANiGRnH8wCgYI
-KoZIzj0EAwIDSAAwRQIgBJVSv/tgXr9FA+HdO0l7TpVRidpqLBx9pi98N43ar8sC
-IQCwUYY3S0gIeLTQeNWomc6HIWOqpdTyJub3t2D9upKdUw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAScQK+vNk3a9vS/l6oBY0Nv2oZ29PVI
+lvjkkz5Aa6fjhBFN3Due1hvHcLdT85kFve/Gf8t0CBSO4dEfGSEcLv+Lo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWPUbc0CF8ugL
+8o0YXpvZWaIdIXowHwYDVR0jBBgwFoAUh6gjsu6cuZwBiMjEuuiJG/b1UUwwCgYI
+KoZIzj0EAwIDSQAwRgIhAISt06Ew8fbEh8OR1Z8zkt9bzMAN0qlFbNKKbMF/XJXX
+AiEAzdvw5Dc+ExGtyRrpZcujUAQKJM/QO+m2d9Sa0RIhAMg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der
index ea3ad83a9c84c9..2af72dfaa4b664 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem
index 87309f31bc10b1..f19ad8a151cd9a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBPWuv1HhPAWitV3kRlwVPHYqYYPTh94In5qTq6sP3r2oAoGCCqGSM49
-AwEHoUQDQgAEAZTtvNK5CJUF50RljQ0RNGSN0H20LcenqPviZ+UNZRQ4xGfSyYeO
-HpoRigtsb6+9adHzFJxJt52vCrhTq2ghSg==
+MHcCAQEEIH/V9RrJGKo2o2j7NPYRphXAMbyXs+I2xPAwZh0DobTkoAoGCCqGSM49
+AwEHoUQDQgAEnECvrzZN2vb0v5eqAWNDb9qGdvT1SJb45JM+QGun44QRTdw7ntYb
+x3C3U/OZBb3vxn/LdAgUjuHRHxkhHC7/iw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der
index bf079b4c3ae3c2..c17b97ee0b9cd1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem
index 0c0502bd7ac8f6..9faa5dd17e2d81 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIMkwgriE3ipUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIdsMoPtX/9w4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABI4l7ftfMp404OBuOzw7VIkHX6DNj/xBA/e1fAcDF1Kszrt1o7zn+K+SU/Gz
-LBPzoMLF0OF3h4HFby9LFLUISRyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQIwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQgpbBctpB+UPgHqix2ykA2IZGcfzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-9kI+OonwzGzwf3QZPjfxNsCPfoZJthWotKgIWktfRJkCIHdCSaSA1vfhvKm4+5Np
-rcn9kgRrWYo3agH28y64Igxt
+A0IABPaemmcL9+U8mlSVPbnpsBbkRVyo6dGvMmaUfjSlXnD1ulkwxQGQVFMfSp6X
+LuUnMr4mWo80i1K2xjCJzpeM1i+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQIwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSHqCOy7py5nAGIyMS66Ikb9vVRTDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAb
+766EKsI2khkRRrpx7UC0PUWDOKqtglm9TpXsyFnTIAIhANOiKDcbSCzDsi4jxVuP
+UVdT4IBAkL6vy3bcHKNeklvY
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der
index d8b1ef63a1b806..212c6b80732011 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem
index aa84e1f1601783..03fb33662a7383 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIET3CAWtCuSC8d5tgz2+KeQyueMFIl1gWy9Z3o8YPyLXoAoGCCqGSM49
-AwEHoUQDQgAEjiXt+18ynjTg4G47PDtUiQdfoM2P/EED97V8BwMXUqzOu3WjvOf4
-r5JT8bMsE/OgwsXQ4XeHgcVvL0sUtQhJHA==
+MHcCAQEEIL6s5SgeRMtiOY3MqwBe1e1j2M1u0I2m3IYxWftH/MbWoAoGCCqGSM49
+AwEHoUQDQgAE9p6aZwv35TyaVJU9uemwFuRFXKjp0a8yZpR+NKVecPW6WTDFAZBU
+Ux9Knpcu5ScyviZajzSLUrbGMInOl4zWLw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json
index 804349fca1ea1c..99e2be6a85b650 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field set to 2",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202080670bc134059e2fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040194edbcd2b9089505e744658d0d1134648dd07db42dc7a7a8fbe267e50d651438c467d2c9878e1e9a118a0b6c6fafbd69d1f3149c49b79daf0ab853ab68214aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ca3bad2951fbffd10709e2df28c360e5ea9fe010301f0603551d2304183016801420a5b05cb6907e50f807aa2c76ca403621919c7f300a06082a8648ce3d04030203480030450220049552bffb605ebf4503e1dd3b497b4e955189da6a2c1c7da62f7c378ddaafcb022100b05186374b480878b4d078d5a899ce872163aaa5d4f226e6f7b760fdba929d53",
-    "pai_cert": "308201be30820164a0030201020208324c20ae21378a95300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200048e25edfb5f329e34e0e06e3b3c3b5489075fa0cd8ffc4103f7b57c07031752accebb75a3bce7f8af9253f1b32c13f3a0c2c5d0e1778781c56f2f4b14b508491ca366306430120603551d130101ff040830060101ff020102300e0603551d0f0101ff040403020106301d0603551d0e0416041420a5b05cb6907e50f807aa2c76ca403621919c7f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100f6423e3a89f0cc6cf07f74193e37f136c08f7e8649b615a8b4a8085a4b5f44990220774249a480d6f7e1bca9b8fb9369adc9fd92046b598a376a01f6f32eb8220c6d",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210081ae0531590c4006e2fc60f826643c66943e393524deecc95c3444d7799ab03502206cfc197e1cbe19dba52f37d891fc5a3266a27fc1df515f2fad27ff5455eff68c",
-    "dac_private_key": "13d6bafd4784f0168ad57791197054f1d8a9860f4e1f78227e6a4eaeac3f7af6",
-    "dac_public_key": "040194edbcd2b9089505e744658d0d1134648dd07db42dc7a7a8fbe267e50d651438c467d2c9878e1e9a118a0b6c6fafbd69d1f3149c49b79daf0ab853ab68214a"
+    "dac_cert": "308201cf30820174a00302010202087c6dcf497ad4a790300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049c40afaf364ddaf6f4bf97aa0163436fda8676f4f54896f8e4933e406ba7e384114ddc3b9ed61bc770b753f39905bdefc67fcb7408148ee1d11f19211c2eff8ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041458f51b734085f2e80bf28d185e9bd959a21d217a301f0603551d2304183016801487a823b2ee9cb99c0188c8c4bae8891bf6f5514c300a06082a8648ce3d040302034900304602210084add3a130f1f6c487c391d59f3392df5bccc00dd2a9456cd28a6cc17f5c95d7022100cddbf0e4373e1311adc91ae965cba350040a24cfd03be9b677d49ad1122100c8",
+    "pai_cert": "308201be30820164a003020102020876c3283ed5fff70e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f69e9a670bf7e53c9a54953db9e9b016e4455ca8e9d1af3266947e34a55e70f5ba5930c5019054531f4a9e972ee52732be265a8f348b52b6c63089ce978cd62fa366306430120603551d130101ff040830060101ff020102300e0603551d0f0101ff040403020106301d0603551d0e0416041487a823b2ee9cb99c0188c8c4bae8891bf6f5514c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502201befae842ac23692191146ba71ed40b43d458338aaad8259bd4e95ecc859d320022100d3a228371b482cc3b22e23c55b8f515753e0804090beafcb76dc1ca35e925bd8",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100df7cfa66bc487dd71b6fffc5c2276e564a90a9d93d90efbf9bbf1875efabb85c022100849c622af3f68637631448f93cf2621e83701357c98588b746c7f48677a6a8d6",
+    "dac_private_key": "7fd5f51ac918aa36a368fb34f611a615c031bc97b3e236c4f030661d03a1b4e4",
+    "dac_public_key": "049c40afaf364ddaf6f4bf97aa0163436fda8676f4f54896f8e4933e406ba7e384114ddc3b9ed61bc770b753f39905bdefc67fcb7408148ee1d11f19211c2eff8b"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der
index d86d14e56c66f7..ca98bdc52c0abd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der
index 62ef67e4768ef1..6933bdd5c0073c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem
index d30c9c11492931..ab1889ceb41edd 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIUiZjEXYyY+cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIF3ABhg0fzoEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT2f7TbU6uSALYXSc3g7OFWtabY74Ls
-4VCfer1gM5YYkBT1Okh5Qqjop3RZbwIxOl4L7pGopLp3SQHcA6D53VQco2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU33XnCHqpyhps
-xEFO5sOiAgD8pXQwHwYDVR0jBBgwFoAUCeSrwbocI57KNAMFfCFJhTmHuGMwCgYI
-KoZIzj0EAwIDSAAwRQIhAJ15xefc+NqqMN8hknM9Iyg4poh5kdDIRF9rqRqnjxFS
-AiBzyPcwhfIwk3U9DYbtsra24sgD4MAPRk6H9M0WmkS/Tg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS5VjiaYP9O3r3V367zxG5h+EniXf4A
+ckAd0y7Xkt/qu5w9MQ8PubK7DfYmKw18XlIRlcGI+XeLJQ7l2Oa4mepYo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU0Qp/+39UWh3l
+beR2hK1L+WOGEFUwHwYDVR0jBBgwFoAUSka0yngGRYcCrZfYGsuRd/pHtm0wCgYI
+KoZIzj0EAwIDSQAwRgIhAMbVrF29QysBg8woejHZAyLvud4cmCP4S0PGBwl6A60l
+AiEAlfhYy9DHuZtdX0gu4TYeA91+Is64HyHBs2Ro7cf57DU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der
index 5092408cb41a9f..25f4d7a1c6d455 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem
index d6723c139c507f..f38c28a5128561 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA8agZWiW0H43XTewOMe5DYvH7FbNV09G7AdnwA5V415oAoGCCqGSM49
-AwEHoUQDQgAE9n+021OrkgC2F0nN4OzhVrWm2O+C7OFQn3q9YDOWGJAU9TpIeUKo
-6Kd0WW8CMTpeC+6RqKS6d0kB3AOg+d1UHA==
+MHcCAQEEINnhowhk5o+71z5nmKIV05BiR/+QYr7Q1ddK5vqAUIHAoAoGCCqGSM49
+AwEHoUQDQgAEuVY4mmD/Tt691d+u88RuYfhJ4l3+AHJAHdMu15Lf6rucPTEPD7my
+uw32JisNfF5SEZXBiPl3iyUO5djmuJnqWA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der
index 91e9c7a1b556e6..859ad54d51b2d9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem
index 0b9d4114c3e920..34781615fe3cb5 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvDCCAWGgAwIBAgIICMu5+QjfTP4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBuzCCAWGgAwIBAgIIYRWM8m/zuXcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFLjQZk8bvb/tJ8OkkIRT5MjCU8NfpUvoltvf3NXP2G+YHccyB5P0FPGJCVo
-htmJ315fnYmd6u+T16LWUJMGGeKjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBQJ5KvBuhwjnso0AwV8IUmFOYe4YzAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEAl+k4
-lqiN8T3DPxYHoJPxDo09hKeFjA+k0PyLGiuBOg8CIQC/YlP/zTTdzQK48xPakgxa
-fTemFGZdyy0hXwa1tTCRKw==
+A0IABPf6Xom3hXDktwJUvPX3MmiyLc053QnW/toY7L1JHO3rckSs5/q5E1T/YT8r
+JevpTL8947OebSST9swbY8QORXKjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBRKRrTKeAZFhwKtl9gay5F3+ke2bTAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBNNCgk
+WIHebvPAYrAeG7AEmDzMhnJblHhwPlcBaiy0OQIhAN+0TK/OCFT43KG1oshZ8KvL
+F97Fprn9yLB//iKSHb5+
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der
index 43dc5e8b6984b1..4f2c2e1b23a5c7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem
index cf5980b5571c72..98e86610292599 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJTUqb40S+8fhlBdyhF0HzWuLXz6B4W1dQVzx2Wtyn7qoAoGCCqGSM49
-AwEHoUQDQgAEUuNBmTxu9v+0nw6SQhFPkyMJTw1+lS+iW29/c1c/Yb5gdxzIHk/Q
-U8YkJWiG2YnfXl+diZ3q75PXotZQkwYZ4g==
+MHcCAQEEIPgrDi5y9QR1SEpLiGAzJGhObBa+E8rwhSRLAllPe4mDoAoGCCqGSM49
+AwEHoUQDQgAE9/peibeFcOS3AlS89fcyaLItzTndCdb+2hjsvUkc7etyRKzn+rkT
+VP9hPysl6+lMvz3js55tJJP2zBtjxA5Fcg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json
index bab0fd7906274e..eca1b09f6d8744 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field presence is wrong (present for DAC not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020852266311763263e7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f67fb4db53ab9200b61749cde0ece156b5a6d8ef82ece1509f7abd603396189014f53a487942a8e8a774596f02313a5e0bee91a8a4ba774901dc03a0f9dd541ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414df75e7087aa9ca1a6cc4414ee6c3a20200fca574301f0603551d2304183016801409e4abc1ba1c239eca3403057c2149853987b863300a06082a8648ce3d04030203480030450221009d79c5e7dcf8daaa30df2192733d232838a6887991d0c8445f6ba91aa78f1152022073c8f73085f23093753d0d86edb2b6b6e2c803e0c00f464e87f4cd169a44bf4e",
-    "pai_cert": "308201bc30820161a003020102020808cbb9f908df4cfe300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000452e341993c6ef6ffb49f0e9242114f9323094f0d7e952fa25b6f7f73573f61be60771cc81e4fd053c624256886d989df5e5f9d899deaef93d7a2d650930619e2a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020106301d0603551d0e0416041409e4abc1ba1c239eca3403057c2149853987b863301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210097e93896a88df13dc33f1607a093f10e8d3d84a7858c0fa4d0fc8b1a2b813a0f022100bf6253ffcd34ddcd02b8f313da920c5a7d37a614665dcb2d215f06b5b530912b",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207763a2c5dc7e83cc338192d4e0cd878a625396cf8c41cccfcede8ab6ee24638c0220605bba03643b55e86743dd8822e36b0933978a353a10fd6d860b9066f29c8de8",
-    "dac_private_key": "0f1a8195a25b41f8dd74dec0e31ee4362f1fb15b355d3d1bb01d9f0039578d79",
-    "dac_public_key": "04f67fb4db53ab9200b61749cde0ece156b5a6d8ef82ece1509f7abd603396189014f53a487942a8e8a774596f02313a5e0bee91a8a4ba774901dc03a0f9dd541c"
+    "dac_cert": "308201cf30820174a0030201020208177001860d1fce81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b956389a60ff4edebdd5dfaef3c46e61f849e25dfe0072401dd32ed792dfeabb9c3d310f0fb9b2bb0df6262b0d7c5e521195c188f9778b250ee5d8e6b899ea58a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d10a7ffb7f545a1de56de47684ad4bf963861055301f0603551d230418301680144a46b4ca7806458702ad97d81acb9177fa47b66d300a06082a8648ce3d0403020349003046022100c6d5ac5dbd432b0183cc287a31d90322efb9de1c9823f84b43c607097a03ad2502210095f858cbd0c7b99b5d5f482ee1361e03dd7e22ceb81f21c1b36468edc7f9ec35",
+    "pai_cert": "308201bb30820161a003020102020861158cf26ff3b977300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f7fa5e89b78570e4b70254bcf5f73268b22dcd39dd09d6feda18ecbd491cedeb7244ace7fab91354ff613f2b25ebe94cbf3de3b39e6d2493f6cc1b63c40e4572a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020106301d0603551d0e041604144a46b4ca7806458702ad97d81acb9177fa47b66d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204d3428245881de6ef3c062b01e1bb004983ccc86725b9478703e57016a2cb439022100dfb44cafce0854f8dca1b5a2c859f0abcb17dec5a6b9fdc8b07ffe22921dbe7e",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022062eeefc0052eaac009c76378e120731b3850f71c581c4b20ffdb5005975df9bb022050f1c6b7796e54b43897f3319e0a68cab1465d2f7d39f416717605ca0b746b98",
+    "dac_private_key": "d9e1a30864e68fbbd73e6798a215d3906247ff9062bed0d5d74ae6fa805081c0",
+    "dac_public_key": "04b956389a60ff4edebdd5dfaef3c46e61f849e25dfe0072401dd32ed792dfeabb9c3d310f0fb9b2bb0df6262b0d7c5e521195c188f9778b250ee5d8e6b899ea58"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der
index 3b7fe9c4f78b00..6b8cb835bd3017 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der
index a454952fea9c88..2e599b966a00ec 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem
index 35647681415c40..bce9eff3a6758b 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIbRvkKSR4HZowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIMbVSMboXncAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASdAJBhjtXBKGlN90I6HGZbhehkkCs/
-Ttjf6xumrc+/ilThoSVZ5xiHrjQqynTNxsKDBGnxTg85F6cFtdRHzSvao2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUscQC3p3d3eH2
-NmjNoTC15bdJvJ0wHwYDVR0jBBgwFoAUU51g/ciOjNaYymqI2JzFNIAY8DUwCgYI
-KoZIzj0EAwIDSAAwRQIgRM3YEgb8BRlLLrbbzT0Sok/a5QNd6zQbd6Oa0jENGcYC
-IQD3urqAR46THNhJMQjOmQjGo4SZkM022WJv1ic7jeSdng==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQP3x1Dx7VILdzr/kC1KL5JsVo0xULn
+syUNOLs4mi5rmrz5dtufQYx17c9pnDuHh5mfSAArAdzsWtB5Htx60pSvo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUcLuEVPQItmaR
+xGXKqUTpnbGBw4cwHwYDVR0jBBgwFoAUi/2TGAFILKPn9HM8wrKN6kW57kUwCgYI
+KoZIzj0EAwIDSAAwRQIgSBU2+ut78lVUDSlE1o9L5Pc9aO3AbYU34qKYuoMn5nkC
+IQDhnB6QSK8sMnhckTV9bkp7fuO0RSB6ivHLbVo/TxFIYA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der
index ebe7f3a9214556..e4e77ad711151f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem
index 5bad512a41e216..bd05fb47fdb8ae 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJZKurGYnqBTshrLhHymXM8Q3jO0sXQbrByIb609KQZ8oAoGCCqGSM49
-AwEHoUQDQgAEnQCQYY7VwShpTfdCOhxmW4XoZJArP07Y3+sbpq3Pv4pU4aElWecY
-h640Ksp0zcbCgwRp8U4PORenBbXUR80r2g==
+MHcCAQEEIEhaDO3eM7QNJni9H3ve6ZEKhP29OHOG1oe/tjbwcw+soAoGCCqGSM49
+AwEHoUQDQgAED98dQ8e1SC3c6/5AtSi+SbFaNMVC57MlDTi7OJoua5q8+Xbbn0GM
+de3PaZw7h4eZn0gAKwHc7FrQeR7cetKUrw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der
index df261c4c9e2dae..903f20699e4c7c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem
index 35fccbeda844be..dce4328d720324 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4jCCAYigAwIBAgIIR84x4kpq6RwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB4jCCAYigAwIBAgIIWoFtVcSoPnkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCTQFwdj+PWpd0YBWnMCNKDwYuiOUEhQJ8tdM/UeebXHOnsXD8nhi2zHNO2E
-m3+iKBQWpbDmz1lvLzaeEYvrUuWjgYkwgYYwEgYDVR0TAQH/BAgwBgEB/wIBATAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFOdYP3IjozWmMpqiNicxTSAGPA1MB8G
+A0IABP/9vIDATCtUjHG53A3h5bvr9aYue3JTkm8styENHEWjK267BKPYH8N5bASI
+5Zt/GYTdjbBEjlv6dxDZNLalKzmjgYkwgYYwEgYDVR0TAQH/BAgwBgEB/wIBADAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIv9kxgBSCyj5/RzPMKyjepFue5FMB8G
 A1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MCAGA1UdJQEB/wQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAKBggqhkjOPQQDAgNIADBFAiBMyPzR3e3PI/pTFGtf
-dqnl6au/OzJ+jCLdhsfq9xfp4QIhAMK2Bijyi9CESCdMuc2wv+ShEK0ecdQam1z+
-zo9TmKuu
+AQUFBwMCBggrBgEFBQcDATAKBggqhkjOPQQDAgNIADBFAiAn1jGiiSF0uXrMgdmU
+GjeLZeYBQuScvNA79GY2peKl+gIhAPeP/0kbKyj0Ku+Fxfmh7QWebvc+QDc6aD2P
+/cBueyev
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der
index 1866ab96bd434d..a18fae40a91f4e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem
index 419e55b38c70af..7921a9db06903e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN2ZM/2MI4zaAAkF+1m4p+f9O1pAkwDR8XIQoHsLsi/woAoGCCqGSM49
-AwEHoUQDQgAEJNAXB2P49al3RgFacwI0oPBi6I5QSFAny10z9R55tcc6excPyeGL
-bMc07YSbf6IoFBalsObPWW8vNp4Ri+tS5Q==
+MHcCAQEEIBSM2NxokMzXNud9AFI2gi8KcghiMdoJl20VaICExazCoAoGCCqGSM49
+AwEHoUQDQgAE//28gMBMK1SMcbncDeHlu+v1pi57clOSbyy3IQ0cRaMrbrsEo9gf
+w3lsBIjlm38ZhN2NsESOW/p3ENk0tqUrOQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json
index 1cf21e133a58e1..58d0480b98b097 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate includes optional Extended Key Usage extension",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a00302010202086d1be42924781d9a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049d0090618ed5c128694df7423a1c665b85e864902b3f4ed8dfeb1ba6adcfbf8a54e1a12559e71887ae342aca74cdc6c2830469f14e0f3917a705b5d447cd2bdaa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b1c402de9ddddde1f63668cda130b5e5b749bc9d301f0603551d23041830168014539d60fdc88e8cd698ca6a88d89cc5348018f035300a06082a8648ce3d0403020348003045022044cdd81206fc05194b2eb6dbcd3d12a24fdae5035deb341b77a39ad2310d19c6022100f7baba80478e931cd8493108ce9908c6a3849990cd36d9626fd6273b8de49d9e",
-    "pai_cert": "308201e230820188a003020102020847ce31e24a6ae91c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000424d0170763f8f5a97746015a730234a0f062e88e50485027cb5d33f51e79b5c73a7b170fc9e18b6cc734ed849b7fa2281416a5b0e6cf596f2f369e118beb52e5a3818930818630120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414539d60fdc88e8cd698ca6a88d89cc5348018f035301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d040302034800304502204cc8fcd1ddedcf23fa53146b5f76a9e5e9abbf3b327e8c22dd86c7eaf717e9e1022100c2b60628f28bd08448274cb9cdb0bfe4a110ad1e71d41a9b5cfece8f5398abae",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009e517b74b38b852f7a859a0619d04ae6063c4b5bc3957182fd068d23756605b6022038bd7461bedd8ab4357589620a4f96c7468c0a697d7212bf78f3c32b178f96d7",
-    "dac_private_key": "964abab1989ea053b21acb847ca65ccf10de33b4b1741bac1c886fad3d29067c",
-    "dac_public_key": "049d0090618ed5c128694df7423a1c665b85e864902b3f4ed8dfeb1ba6adcfbf8a54e1a12559e71887ae342aca74cdc6c2830469f14e0f3917a705b5d447cd2bda"
+    "dac_cert": "308201ce30820174a003020102020831b55231ba179dc0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040fdf1d43c7b5482ddcebfe40b528be49b15a34c542e7b3250d38bb389a2e6b9abcf976db9f418c75edcf699c3b8787999f48002b01dcec5ad0791edc7ad294afa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041470bb8454f408b66691c465caa944e99db181c387301f0603551d230418301680148bfd931801482ca3e7f4733cc2b28dea45b9ee45300a06082a8648ce3d04030203480030450220481536faeb7bf255540d2944d68f4be4f73d68edc06d8537e2a298ba8327e679022100e19c1e9048af2c32785c91357d6e4a7b7ee3b445207a8af1cb6d5a3f4f114860",
+    "pai_cert": "308201e230820188a00302010202085a816d55c4a83e79300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004fffdbc80c04c2b548c71b9dc0de1e5bbebf5a62e7b7253926f2cb7210d1c45a32b6ebb04a3d81fc3796c0488e59b7f1984dd8db0448e5bfa7710d934b6a52b39a3818930818630120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148bfd931801482ca3e7f4733cc2b28dea45b9ee45301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020348003045022027d631a2892174b97acc81d9941a378b65e60142e49cbcd03bf46636a5e2a5fa022100f78fff491b2b28f42aef85c5f9a1ed059e6ef73e40373a683d8ffdc06e7b27af",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210082b01366977ca3b9019828b79d85eb6e36bc99083458a047f8cc3b32adfaef1502210097606a7a45c9a1e730d5105b3f22f452298222bcc7ba9451fa0616df55d8b440",
+    "dac_private_key": "485a0cedde33b40d2678bd1f7bdee9910a84fdbd387386d687bfb636f0730fac",
+    "dac_public_key": "040fdf1d43c7b5482ddcebfe40b528be49b15a34c542e7b3250d38bb389a2e6b9abcf976db9f418c75edcf699c3b8787999f48002b01dcec5ad0791edc7ad294af"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der
index 773ed44abf832e..e613ac8f41a798 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der
index a59b4865e1500a..93418d01b37ae3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem
index 7109505fe34bab..f3fc2c85818fd5 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIUyoTJY+pcrgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIJRanq/81IK4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQK03ew9/4zbrriAA747z67C9jfVzPG
-VgIdfboFLrgtyz36DkxRllJe4oFIFm5TXeNTx+py6VVmUPgxnsUu9Q3Mo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUcW+FHVH2bTPN
-5QYBe0LuTWKQjPkwHwYDVR0jBBgwFoAUIakMnQRve+LS42iaMszRe0CoroUwCgYI
-KoZIzj0EAwIDSQAwRgIhAOKnZnSsFr4Xb+cpCAY11ap5iizzpGNkil07xCdAjUNA
-AiEAhtZbl3RlwneGkcYi6cBZI1EY0PiPj7snha6I8zQtS+g=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATF/A84wuV0s+uhDJrYFFt6rflC8uYS
+mHi7hW3mF5ZO7VTsnnEuFnn4JZAKB/oQ/eJWpZJ/dHw7uR+IGQsG0Gt8o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUgZcNFPr+Z8MQ
+0PyeqDtgN2KQN4UwHwYDVR0jBBgwFoAUVS7kAiwtI2cAjydYzc6DZ+18BmAwCgYI
+KoZIzj0EAwIDSAAwRQIgLczjuOk5W3+opVhv72nHhawxPAnTfx3x9wk49oe5rf0C
+IQCiY0bUEO+SjkwL8ED1ZkNCcBhNwYnXssHNSL+5Xho7JA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der
index 1ad6b68646477d..f62f9d1d139b43 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem
index a0f98ee1892c2d..9e8391df915b7e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILHzN0kIsRjRVDBN23w4s1xdFmyr1f277aDxSS+245YQoAoGCCqGSM49
-AwEHoUQDQgAECtN3sPf+M2664gAO+O8+uwvY31czxlYCHX26BS64Lcs9+g5MUZZS
-XuKBSBZuU13jU8fqculVZlD4MZ7FLvUNzA==
+MHcCAQEEIIHn5AQP0brhHHGG8IIhpvq4xUTVsfjD+VDb5Rvis3lwoAoGCCqGSM49
+AwEHoUQDQgAExfwPOMLldLProQya2BRbeq35QvLmEph4u4Vt5heWTu1U7J5xLhZ5
++CWQCgf6EP3iVqWSf3R8O7kfiBkLBtBrfA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der
index 20db1e7ea764ac..a97bcabe0f4ff7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem
index b1b512abe21fab..14730fbff610c2 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBujCCAWGgAwIBAgIIZqGwcjW/W+cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvDCCAWGgAwIBAgIIdpYE/j0z6eYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABOFwoZMtHeWni43yZGlxMvJKgKpihS6IFGtjzvC1aorJdIciSgWewP6Jd1hw
-qKjHuOg94YluhFxq1Jkd94p26pSjYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQEwCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBQhqQydBG974tLjaJoyzNF7QKiuhTAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBN8SSN
-00arGVkpjfLhIDWTr9BHtqnXY7OFPtbYm7krMwIgTCzHn3wpbFfVukH7+1UHFxom
-w1V01FlgT8n2/raDOmA=
+A0IABBPs9YSyLgOJwZsp2kdE1def55ImSPp2oEZirXCezbFAvChkZQuRrAUNVVTP
+7ZQz4LrXKThBXKTXvDrnGpqUjSijYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBRVLuQCLC0jZwCPJ1jNzoNn7XwGYDAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEAxz0q
+y34oXe/Q/e0k9J5QBHqeAx5CLIWxJQEKKeHTR6ICIQCW8H/thBChUWvsljkC6WKY
+nSCj0HarGkXPXdr6uJcBlQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der
index dbb0b4e435fde2..2705e6ca36b2e3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem
index ed0fb76b1159cd..01a0a60c558b90 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGvoKTqhAuw+VhAh7guFJtsZJgNiB0tXieamB/M3hQiVoAoGCCqGSM49
-AwEHoUQDQgAE4XChky0d5aeLjfJkaXEy8kqAqmKFLogUa2PO8LVqisl0hyJKBZ7A
-/ol3WHCoqMe46D3hiW6EXGrUmR33inbqlA==
+MHcCAQEEIFI0IvMeH2Gaf0N4Iz2wki2LPyJAwKGpL5H40JVmJ4/EoAoGCCqGSM49
+AwEHoUQDQgAEE+z1hLIuA4nBmynaR0TV15/nkiZI+nagRmKtcJ7NsUC8KGRlC5Gs
+BQ1VVM/tlDPgutcpOEFcpNe8OucampSNKA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json
index 4d8e1a7c2c6480..782fd9125c3bed 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a0030201020208532a13258fa972b8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040ad377b0f7fe336ebae2000ef8ef3ebb0bd8df5733c656021d7dba052eb82dcb3dfa0e4c5196525ee28148166e535de353c7ea72e9556650f8319ec52ef50dcca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414716f851d51f66d33cde506017b42ee4d62908cf9301f0603551d2304183016801421a90c9d046f7be2d2e3689a32ccd17b40a8ae85300a06082a8648ce3d0403020349003046022100e2a76674ac16be176fe729080635d5aa798a2cf3a463648a5d3bc427408d434002210086d65b977465c2778691c622e9c059235118d0f88f8fbb2785ae88f3342d4be8",
-    "pai_cert": "308201ba30820161a003020102020866a1b07235bf5be7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e170a1932d1de5a78b8df264697132f24a80aa62852e88146b63cef0b56a8ac97487224a059ec0fe89775870a8a8c7b8e83de1896e845c6ad4991df78a76ea94a363306130120603551d130101ff040830060101ff020101300b0603551d0f040403020106301d0603551d0e0416041421a90c9d046f7be2d2e3689a32ccd17b40a8ae85301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204df1248dd346ab1959298df2e1203593afd047b6a9d763b3853ed6d89bb92b3302204c2cc79f7c296c57d5ba41fbfb5507171a26c35574d459604fc9f6feb6833a60",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022016a10fbb091c9f1dfcea447a6c650472c16ce8b1f9efdfce8a2dd69a87633950022026ed8b4a9435f794496465c90115dad57e19c98cc2cd661f09044eb8f99c830e",
-    "dac_private_key": "b1f3374908b118d154304ddb7c38b35c5d166cabd5fdbbeda0f1492fb6e39610",
-    "dac_public_key": "040ad377b0f7fe336ebae2000ef8ef3ebb0bd8df5733c656021d7dba052eb82dcb3dfa0e4c5196525ee28148166e535de353c7ea72e9556650f8319ec52ef50dcc"
+    "dac_cert": "308201ce30820174a00302010202082516a7abff3520ae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c5fc0f38c2e574b3eba10c9ad8145b7aadf942f2e6129878bb856de617964eed54ec9e712e1679f825900a07fa10fde256a5927f747c3bb91f88190b06d06b7ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041481970d14fafe67c310d0fc9ea83b603762903785301f0603551d23041830168014552ee4022c2d2367008f2758cdce8367ed7c0660300a06082a8648ce3d040302034800304502202dcce3b8e9395b7fa8a5586fef69c785ac313c09d37f1df1f70938f687b9adfd022100a26346d410ef928e4c0bf040f566434270184dc189d7b2c1cd48bfb95e1a3b24",
+    "pai_cert": "308201bc30820161a0030201020208769604fe3d33e9e6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000413ecf584b22e0389c19b29da4744d5d79fe7922648fa76a04662ad709ecdb140bc2864650b91ac050d5554cfed9433e0bad72938415ca4d7bc3ae71a9a948d28a363306130120603551d130101ff040830060101ff020100300b0603551d0f040403020106301d0603551d0e04160414552ee4022c2d2367008f2758cdce8367ed7c0660301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c73d2acb7e285defd0fded24f49e50047a9e031e422c85b125010a29e1d347a202210096f07fed8410a1516bec963902e962989d20a3d076ab1a45cf5ddafab8970195",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022061a20875d0800395dc9db0d170ab76698e81442b9759cb0096d43c87a2245c6702207c92c7e4dd0613e7322e9fb93a30e122a7c0e661387c27b22a9dfa348b1184eb",
+    "dac_private_key": "81e7e4040fd1bae11c7186f08221a6fab8c544d5b1f8c3f950dbe51be2b37970",
+    "dac_public_key": "04c5fc0f38c2e574b3eba10c9ad8145b7aadf942f2e6129878bb856de617964eed54ec9e712e1679f825900a07fa10fde256a5927f747c3bb91f88190b06d06b7c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der
index 8c0dddaa5d19fc..60f17930e8fb9a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der
index 5994db23ee89dc..4405bc6d16e291 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem
index a14279d72bfe3c..effe30eade0034 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIQC25J17423QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIQodxwIjU78swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS+OEzLV5THH0NSEUrJ6kexZGt7BpQF
-MJ5ezzHHRE/RSLur9Q3FBbu2RMseJnQ19LAONS0Q052SPP7HS+4m9oMwo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUknsUK88z1D4J
-zuDvAwSI9OdE4gMwHwYDVR0jBBgwFoAUdAQgCo/hyQm8M3FG6hRzOgRz85swCgYI
-KoZIzj0EAwIDSAAwRQIhAPbqpfyYYB0jePOto3NsRe9R5PV7tta4BSPUZfeS9Ed4
-AiB4L9vE/Brht8jx/xjoYbM29yCI4EURABDgqhNKn2kp1A==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS5UDxho3GJ39TboJnlDOu4eK14lXjg
+HTE7FdVJVwAHYFA7xOO3w/Sh4rutevPQKh4v1eQ+hSHO+bEzoxmH3BEYo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUR7GFM7PuSW1o
+dc8dlXSOcczqt4swHwYDVR0jBBgwFoAU0TmfUOrl4XT1k2zzxbukISubAygwCgYI
+KoZIzj0EAwIDSAAwRQIgAv+muzRN+UBm6TBaXgyW5YiDkIfxeL9L7lmidh8JZg8C
+IQDWXNLvNonl8kw5w89XkOwMnhSXPHro+AxulAl7aM98JQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der
index 366846d92a81a4..8260334bef68a8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem
index af6abfec73d6f1..bde1daa8b4e010 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP4QnKbZIkAwC0Km3XAD3lYcB1IZgvUpGHHqjKhI2oyPoAoGCCqGSM49
-AwEHoUQDQgAEvjhMy1eUxx9DUhFKyepHsWRrewaUBTCeXs8xx0RP0Ui7q/UNxQW7
-tkTLHiZ0NfSwDjUtENOdkjz+x0vuJvaDMA==
+MHcCAQEEICn0c5U0ttBu2buMJlPmAU2VcW12rDzvHLsxqOF/yBE/oAoGCCqGSM49
+AwEHoUQDQgAEuVA8YaNxid/U26CZ5QzruHiteJV44B0xOxXVSVcAB2BQO8Tjt8P0
+oeK7rXrz0CoeL9XkPoUhzvmxM6MZh9wRGA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der
index 46129ac8016a9b..ba48cb838bb2af 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem
index 91a11b068ba889..da65b6c83d7c01 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIcYs6+XqkxDwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBuzCCAWGgAwIBAgIIag4yIElCgWowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPZYhoTMg+Lc/4DrM08h7vQ3N39pT7PlRh5/Lf4DpzBmGGFA/VcWzJnfm8+1
-wfZfn5ZLqPTFBxRX5i/ckZTvFyejYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQEwCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBR0BCAKj+HJCbwzcUbqFHM6BHPzmzAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBNWCY0
-f9ucU+ABI5zmBS1pBANrfvGmvGT6P1cZk37M3gIhAIn5xcg7q6SoOhMXSEixgsMf
-AFyovLhkYVBusl3HrHZy
+A0IABEdJKK+5WgO9btr0ArJeu/aFyrz9hJQ1VH9XqIs3AxaYN/C8di2/yPAhXwOI
+HKapDMGDOIYe1kY74PRIyTx7XnKjYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBTROZ9Q6uXhdPWTbPPFu6QhK5sDKDAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBGPZnX
+L4LBHiGf1VUEWFOCuycl/CoWGQjPoEhLOFojeQIhAIaSkeyLbbT2i4KwHsEoxIT9
+WBPRUKLkfqVpnl+WhUvG
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der
index 9ffde342a0bf90..bf66c327096a10 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem
index 608dca61f9b36e..4e38fe8e4626e8 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIJ86hUqT1dgzamV3cPntLlClhODiuH6bC90DcJvroY2oAoGCCqGSM49
-AwEHoUQDQgAE9liGhMyD4tz/gOszTyHu9Dc3f2lPs+VGHn8t/gOnMGYYYUD9VxbM
-md+bz7XB9l+flkuo9MUHFFfmL9yRlO8XJw==
+MHcCAQEEIJsGMcLP6x8CM/KCwo7iDvFxnr24i0fvS93CnJ1yTjkHoAoGCCqGSM49
+AwEHoUQDQgAER0kor7laA71u2vQCsl679oXKvP2ElDVUf1eoizcDFpg38Lx2Lb/I
+8CFfA4gcpqkMwYM4hh7WRjvg9EjJPHtecg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json
index a1c2e731a0eef3..f60c4a851d1a99 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208402db9275ef8db74300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004be384ccb5794c71f4352114ac9ea47b1646b7b069405309e5ecf31c7444fd148bbabf50dc505bbb644cb1e267435f4b00e352d10d39d923cfec74bee26f68330a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414927b142bcf33d43e09cee0ef030488f4e744e203301f0603551d230418301680147404200a8fe1c909bc337146ea14733a0473f39b300a06082a8648ce3d0403020348003045022100f6eaa5fc98601d2378f3ada3736c45ef51e4f57bb6d6b80523d465f792f447780220782fdbc4fc1ae1b7c8f1ff18e861b336f72088e045110010e0aa134a9f6929d4",
-    "pai_cert": "308201bb30820161a0030201020208718b3af97aa4c43c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f6588684cc83e2dcff80eb334f21eef437377f694fb3e5461e7f2dfe03a73066186140fd5716cc99df9bcfb5c1f65f9f964ba8f4c5071457e62fdc9194ef1727a363306130120603551d130101ff040830060101ff020101300b0603551d0f040403020106301d0603551d0e041604147404200a8fe1c909bc337146ea14733a0473f39b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204d5826347fdb9c53e001239ce6052d6904036b7ef1a6bc64fa3f5719937eccde02210089f9c5c83baba4a83a13174848b182c31f005ca8bcb86461506eb25dc7ac7672",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220148a951b7a7a0ef8554c449f1932624f25cd1e6fa0a9cc27c644e8ee786fd0c802203220068def122abc0b6bb575d1f5d0050a31a047d730c1109d77553081c40fc9",
-    "dac_private_key": "fe109ca6d92240300b42a6dd7003de561c07521982f5291871ea8ca848da8c8f",
-    "dac_public_key": "04be384ccb5794c71f4352114ac9ea47b1646b7b069405309e5ecf31c7444fd148bbabf50dc505bbb644cb1e267435f4b00e352d10d39d923cfec74bee26f68330"
+    "dac_cert": "308201ce30820174a0030201020208428771c088d4efcb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b9503c61a37189dfd4dba099e50cebb878ad789578e01d313b15d54957000760503bc4e3b7c3f4a1e2bbad7af3d02a1e2fd5e43e8521cef9b133a31987dc1118a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041447b18533b3ee496d6875cf1d95748e71cceab78b301f0603551d23041830168014d1399f50eae5e174f5936cf3c5bba4212b9b0328300a06082a8648ce3d0403020348003045022002ffa6bb344df94066e9305a5e0c96e588839087f178bf4bee59a2761f09660f022100d65cd2ef3689e5f24c39c3cf5790ec0c9e14973c7ae8f80c6e94097b68cf7c25",
+    "pai_cert": "308201bb30820161a00302010202086a0e32204942816a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004474928afb95a03bd6edaf402b25ebbf685cabcfd849435547f57a88b3703169837f0bc762dbfc8f0215f03881ca6a90cc18338861ed6463be0f448c93c7b5e72a363306130120603551d130101ff040830060101ff020100300b0603551d0f040403020106301d0603551d0e04160414d1399f50eae5e174f5936cf3c5bba4212b9b0328301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220463d99d72f82c11e219fd55504585382bb2725fc2a161908cfa0484b385a2379022100869291ec8b6db4f68b82b01ec128c484fd5813d150a2e47ea5699e5f96854bc6",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c60bfacb7c97ba58798e9411c3a1d88042a1d928bfb8472fdedbae32d426bd5a02206fe135521bdf12ae42e5d4b30d8612dfd4f418a90cbc7893c57dfb978e2d4726",
+    "dac_private_key": "29f4739534b6d06ed9bb8c2653e6014d95716d76ac3cef1cbb31a8e17fc8113f",
+    "dac_public_key": "04b9503c61a37189dfd4dba099e50cebb878ad789578e01d313b15d54957000760503bc4e3b7c3f4a1e2bbad7af3d02a1e2fd5e43e8521cef9b133a31987dc1118"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der
index 3355cfa042bd95..f9c98dd9bcb54e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der
index 9e3ae97471e915..134a348de77d6d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem
index 8509fa14bbd1a7..3fb0c233885eb8 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIILCrBbdnsh4wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIILsfAHcT0zdUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ7fMsgmYybNMrWaMUIPukOWY992sSW
-IGcG7bwdVmrv1ISN1uJBSjUz5cwqyrmWehdWHQTSKo32iJSwhpBnwiRbo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUQZ63HZWRpYbd
-xDN338D5viAb9cMwHwYDVR0jBBgwFoAUyFgBxV8aLAqSd+CesJVMVaiGjY0wCgYI
-KoZIzj0EAwIDSQAwRgIhAJX514J7eXDjFPJxHMB19jzYTosOOSAY1WYYs38ZS2U7
-AiEAk5qu/idiFKA43H1ysP/Q7x1dbI5oSAtDrN8Wkj31ctY=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQZIIc8ug4Vd+tCsxoJihH38bi6fqd7
+kyvH3R5EuMRYgK1QjZeuGSx/XOvU4HQIeIb2CWvW0uWXg2U/1fFULJmTo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzGO9UvAveANs
+o7U5mvoylXnOlZwwHwYDVR0jBBgwFoAUpXlRiR3+Wgz+A45ciA3DStc87hUwCgYI
+KoZIzj0EAwIDSAAwRQIgSoljclNvGbJ39U8swL096Vl6zMrXaZmhtsq3dhLN6cMC
+IQC8t1JaOC+jYfFTF3OTiQdtZUS2noX1TsKYtzuQoV6DIw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der
index 53af0454bf5bd5..b39b355cc1d320 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem
index 9cfe93724fbc34..82de311f3d1a34 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGKPadpk7tqNhVf0keF6b7AUXXEjrPECh+kADIVrpYlCoAoGCCqGSM49
-AwEHoUQDQgAEO3zLIJmMmzTK1mjFCD7pDlmPfdrEliBnBu28HVZq79SEjdbiQUo1
-M+XMKsq5lnoXVh0E0iqN9oiUsIaQZ8IkWw==
+MHcCAQEEII09H28212MbWS0k+8Bkkq2eNX4V7JKqGiotnLLauuTqoAoGCCqGSM49
+AwEHoUQDQgAEGSCHPLoOFXfrQrMaCYoR9/G4un6ne5Mrx90eRLjEWICtUI2Xrhks
+f1zr1OB0CHiG9glr1tLll4NlP9XxVCyZkw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der
index 111744fe59df96..71b63f83e3a11b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem
index 0905e9c3765eea..3606d3fac3d72f 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIJ0JdjMbYjWIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvTCCAWSgAwIBAgIIfzLYjYezNC4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCwwIH8HIUXGq9W9cjzAn+jLA2SyNoE0gWkRTynjJV0vqcgrZ4S+L5gYL57F
-I00QbKbCsqKTJGpKAb7ffEJtNbSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgIEMB0GA1UdDgQWBBTIWAHFXxosCpJ34J6wlUxVqIaNjTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-4yPzbU6ktryX0gTzkhFodmJc6rnpLgUn6BWSne6a8V4CIAS6rQi9EimrLw2ZIUVk
-XgrsdZlACxw7pGAxM7Hf4Seq
+A0IABIVC97+b0l02fdXHSSZDr9hyHMNVrEvPtgeSmR9AsNh0kvjy4W0USm3SUraA
+G0Rs6u3qz9B+wObtKB8/Mm9vSnyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgIEMB0GA1UdDgQWBBSleVGJHf5aDP4DjlyIDcNK1zzuFTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBN
+6Px3AgxeEopG3hD7SnsxhO2jwEK5upBCBzB3DBPAswIgH9J0RXFpW8bD7NScPr3c
+2zRz8KaPlGRV53+JuZAD6j4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der
index 7118a2cace2638..9228a7fe4144c4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem
index a7f670f90c2e79..9dce1f7eb18091 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINwHgaaGRVITwRaY3VQMmvS5lVGZOGkaOST7MtpEIv+xoAoGCCqGSM49
-AwEHoUQDQgAELDAgfwchRcar1b1yPMCf6MsDZLI2gTSBaRFPKeMlXS+pyCtnhL4v
-mBgvnsUjTRBspsKyopMkakoBvt98Qm01tA==
+MHcCAQEEIPSNsUL+pnUKVhxFqapC1xnfQuCD5bRCuyxOQR92kGRKoAoGCCqGSM49
+AwEHoUQDQgAEhUL3v5vSXTZ91cdJJkOv2HIcw1WsS8+2B5KZH0Cw2HSS+PLhbRRK
+bdJStoAbRGzq7erP0H7A5u0oHz8yb29KfA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json
index 7c71851bfcb7e5..30eabc2678df81 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a00302010202082c2ac16dd9ec878c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043b7ccb20998c9b34cad668c5083ee90e598f7ddac496206706edbc1d566aefd4848dd6e2414a3533e5cc2acab9967a17561d04d22a8df68894b0869067c2245ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414419eb71d9591a586ddc43377dfc0f9be201bf5c3301f0603551d23041830168014c85801c55f1a2c0a9277e09eb0954c55a8868d8d300a06082a8648ce3d040302034900304602210095f9d7827b7970e314f2711cc075f63cd84e8b0e392018d56618b37f194b653b022100939aaefe276214a038dc7d72b0ffd0ef1d5d6c8e68480b43acdf16923df572d6",
-    "pai_cert": "308201be30820164a003020102020827425d8cc6d88d62300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042c30207f072145c6abd5bd723cc09fe8cb0364b23681348169114f29e3255d2fa9c82b6784be2f98182f9ec5234d106ca6c2b2a293246a4a01bedf7c426d35b4a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020204301d0603551d0e04160414c85801c55f1a2c0a9277e09eb0954c55a8868d8d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e323f36d4ea4b6bc97d204f392116876625ceab9e92e0527e815929dee9af15e022004baad08bd1229ab2f0d992145645e0aec7599400b1c3ba4603133b1dfe127aa",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d4bac49329ee0571f73eba4472240f6807ab6832ccd19c22c7f794ed7f6fbf66022100b5decf57454821e4ef0b45b21b4f9362cbc8e1ecd6d580594866616e5c8d4fb9",
-    "dac_private_key": "628f69da64eeda8d8557f491e17a6fb0145d7123acf10287e9000c856ba58942",
-    "dac_public_key": "043b7ccb20998c9b34cad668c5083ee90e598f7ddac496206706edbc1d566aefd4848dd6e2414a3533e5cc2acab9967a17561d04d22a8df68894b0869067c2245b"
+    "dac_cert": "308201ce30820174a00302010202082ec7c01dc4f4cdd5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041920873cba0e1577eb42b31a098a11f7f1b8ba7ea77b932bc7dd1e44b8c45880ad508d97ae192c7f5cebd4e074087886f6096bd6d2e59783653fd5f1542c9993a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cc63bd52f02f78036ca3b5399afa329579ce959c301f0603551d23041830168014a57951891dfe5a0cfe038e5c880dc34ad73cee15300a06082a8648ce3d040302034800304502204a896372536f19b277f54f2cc0bd3de9597acccad76999a1b6cab77612cde9c3022100bcb7525a382fa361f15317739389076d6544b69e85f54ec298b73b90a15e8323",
+    "pai_cert": "308201bd30820164a00302010202087f32d88d87b3342e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200048542f7bf9bd25d367dd5c7492643afd8721cc355ac4bcfb60792991f40b0d87492f8f2e16d144a6dd252b6801b446ceaedeacfd07ec0e6ed281f3f326f6f4a7ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020204301d0603551d0e04160414a57951891dfe5a0cfe038e5c880dc34ad73cee15301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204de8fc77020c5e128a46de10fb4a7b3184eda3c042b9ba90420730770c13c0b302201fd2744571695bc6c3ecd49c3ebddcdb3473f0a68f946455e77f89b99003ea3e",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b984babf7270c09fd8d23545e2fdf68b5382603c8c83384b8a19c00a3d9602d50220398268186ec2d37d710fe2cbc5494129824eba95cb42660cbac3c43cd61ff249",
+    "dac_private_key": "8d3d1f6f36d7631b592d24fbc06492ad9e357e15ec92aa1a2a2d9cb2dabae4ea",
+    "dac_public_key": "041920873cba0e1577eb42b31a098a11f7f1b8ba7ea77b932bc7dd1e44b8c45880ad508d97ae192c7f5cebd4e074087886f6096bd6d2e59783653fd5f1542c9993"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der
index 1bc404b04b8aab..bdb7693ef88637 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der
index 37c7aa8bd2a7cb..e136af68e92afb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem
index 940220a7b0fe86..d2d50938607c1f 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIC4u07HoxDRkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIcxRM4XT7h+swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQp4DY0JO05DvnrdHHf1Ga1boc4t3YS
-Of8kZOAggBEgO6Acww737nZiBkPJ8YvtGZMtbjDx0NUcWigRLl6AKdD5o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUVZCfbVFSeaBG
-GNhOz9j9qo/6XNUwHwYDVR0jBBgwFoAUuetPx/mKxu/s4mt6++GsPFIMFq4wCgYI
-KoZIzj0EAwIDSAAwRQIgdG0VuluARAva10j0jMsDqDMekN6dn93YqUeDPQGOqvgC
-IQDFE2LEMb5tIhxFrGDG+V6X6mR0yWlegrseURdi0hzoog==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASLaySlE82rpCe6x0WfCzKzk9hqX+JB
+WN9mMpVjXioOc13S4AS6rQQPZUjl7u3PiOdFnMRd5HT8O9q8OjU7yzpvo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUF48CUt8XX+Ro
+b9ySnutvIZtqygAwHwYDVR0jBBgwFoAUJUK9Et6QaSQiSGFeyAFXVhNVpUkwCgYI
+KoZIzj0EAwIDSQAwRgIhAL9jBmhOkJocROwq/sjZ+KyhSpDqUbFUmy2PPsTeo49b
+AiEAt9BaILFCtMNPS9bwF+t7kARs34dKp6+U/UGEMuoCJgI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der
index e227ae6300b54d..3b1042d6d9ec54 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem
index 513ea6206714f9..3a139e3a906e4b 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFuz6gHH1rzZDnahTKi7d+5CfZkiZ3R+yLiadrJb3DIyoAoGCCqGSM49
-AwEHoUQDQgAEKeA2NCTtOQ7563Rx39RmtW6HOLd2Ejn/JGTgIIARIDugHMMO9+52
-YgZDyfGL7RmTLW4w8dDVHFooES5egCnQ+Q==
+MHcCAQEEIJr05hcHfbCjpAwLnJWgg5d04AC2jEz/c2/uoQld7h8RoAoGCCqGSM49
+AwEHoUQDQgAEi2skpRPNq6QnusdFnwsys5PYal/iQVjfZjKVY14qDnNd0uAEuq0E
+D2VI5e7tz4jnRZzEXeR0/DvavDo1O8s6bw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der
index 0438f55187b8dd..4e17a61f4eb79a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem
index 683ca7aa063795..66e4add5539d8e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIVvqoncpgP2YwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIPuy5Qg96KyswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABDCJ5EEsKSRDAHgKSOVuv+eAeMax3W4z86G/JXBcaY33YPQwMbv+jv7S4aTQ
-tMzPJ2cgS+1NPeUQW8zQZx5OLZyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgGGMB0GA1UdDgQWBBS560/H+YrG7+zia3r74aw8UgwWrjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiA+
-6ycfMRqvxEAoUU4Yhj/W9e25IpyFQrIpCfp29KgBIwIgLG10wHQiz092EqvyTGAi
-vSn4I1A13IR+3Y81iViowZg=
+A0IABE9s5W13BR4Jh2MAfQAvlj29pK6btfNbH/90sJMyypMJLt9pv72Q3SMmPE9i
+En22krmBZZUO6YgH/eworRn3NxyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgGGMB0GA1UdDgQWBBQlQr0S3pBpJCJIYV7IAVdWE1WlSTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+1jQTLJnT87QF90meAcRyuts5N5BdHKmwxos3dDzaULACIQD6ii3j+olbfKnfsOG2
+wQE0KsnHh9d4zV2Sm/VlFP5Jag==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der
index efe4d116d6fdbc..e962c261d6869a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem
index 8e8fc0cf720ac8..bb12bcf2899dbf 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN3Wg87XP3SZGees/FsjU3pmRknvBAigRGNckms/mmcooAoGCCqGSM49
-AwEHoUQDQgAEMInkQSwpJEMAeApI5W6/54B4xrHdbjPzob8lcFxpjfdg9DAxu/6O
-/tLhpNC0zM8nZyBL7U095RBbzNBnHk4tnA==
+MHcCAQEEIAjHj0gBLMfaXun745thNpmdpVBFk+hC3iuZfm6EVC66oAoGCCqGSM49
+AwEHoUQDQgAET2zlbXcFHgmHYwB9AC+WPb2krpu181sf/3SwkzLKkwku32m/vZDd
+IyY8T2ISfbaSuYFllQ7piAf97CitGfc3HA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
index ca148003a218cd..9fbcf3d68bd6ff 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202080b8bb4ec7a310d19300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000429e0363424ed390ef9eb7471dfd466b56e8738b7761239ff2464e0208011203ba01cc30ef7ee76620643c9f18bed19932d6e30f1d0d51c5a28112e5e8029d0f9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041455909f6d515279a04618d84ecfd8fdaa8ffa5cd5301f0603551d23041830168014b9eb4fc7f98ac6efece26b7afbe1ac3c520c16ae300a06082a8648ce3d04030203480030450220746d15ba5b80440bdad748f48ccb03a8331e90de9d9fddd8a947833d018eaaf8022100c51362c431be6d221c45ac60c6f95e97ea6474c9695e82bb1e511762d21ce8a2",
-    "pai_cert": "308201bd30820164a003020102020856faa89dca603f66300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043089e4412c29244300780a48e56ebfe78078c6b1dd6e33f3a1bf25705c698df760f43031bbfe8efed2e1a4d0b4cccf2767204bed4d3de5105bccd0671e4e2d9ca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020186301d0603551d0e04160414b9eb4fc7f98ac6efece26b7afbe1ac3c520c16ae301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203eeb271f311aafc44028514e18863fd6f5edb9229c8542b22909fa76f4a8012302202c6d74c07422cf4f7612abf24c6022bd29f8235035dc847edd8f358958a8c198",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d8a4e31e6270ba0e9dc5d019eb91dcdf2b7a55a51b78d47941c756c6fb5ea8fb0221008ef9bf84a762e459ed3f1a54861bc1c8a5767afd1d463f4fa3e7d72c280850d3",
-    "dac_private_key": "5bb3ea01c7d6bcd90e76a14ca8bb77ee427d992267747ec8b89a76b25bdc3232",
-    "dac_public_key": "0429e0363424ed390ef9eb7471dfd466b56e8738b7761239ff2464e0208011203ba01cc30ef7ee76620643c9f18bed19932d6e30f1d0d51c5a28112e5e8029d0f9"
+    "dac_cert": "308201cf30820174a003020102020873144ce174fb87eb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048b6b24a513cdaba427bac7459f0b32b393d86a5fe24158df663295635e2a0e735dd2e004baad040f6548e5eeedcf88e7459cc45de474fc3bdabc3a353bcb3a6fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414178f0252df175fe4686fdc929eeb6f219b6aca00301f0603551d230418301680142542bd12de9069242248615ec80157561355a549300a06082a8648ce3d0403020349003046022100bf6306684e909a1c44ec2afec8d9f8aca14a90ea51b1549b2d8f3ec4dea38f5b022100b7d05a20b142b4c34f4bd6f017eb7b90046cdf874aa7af94fd418432ea022602",
+    "pai_cert": "308201bf30820164a00302010202083eecb9420f7a2b2b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044f6ce56d77051e098763007d002f963dbda4ae9bb5f35b1fff74b09332ca93092edf69bfbd90dd23263c4f62127db692b98165950ee98807fdec28ad19f7371ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020186301d0603551d0e041604142542bd12de9069242248615ec80157561355a549301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d634132c99d3f3b405f7499e01c472badb3937905d1ca9b0c68b37743cda50b0022100fa8a2de3fa895b7ca9dfb0e1b6c101342ac9c787d778cd5d929bf56514fe496a",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201e4b40da42e15f1d09444591062655fbfc5cfdc6a6a7194ccf186adfde694139022100d541425c3055fc945dc854c0bbd0a8a5f35658388061e6ebccfb85c2caad9d77",
+    "dac_private_key": "9af4e617077db0a3a40c0b9c95a0839774e000b68c4cff736feea1095dee1f11",
+    "dac_public_key": "048b6b24a513cdaba427bac7459f0b32b393d86a5fe24158df663295635e2a0e735dd2e004baad040f6548e5eeedcf88e7459cc45de474fc3bdabc3a353bcb3a6f"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der
index 235ec98e227e88..2d95d4cbcd21f1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der
index 6a600f95707418..fcf4d03e5839dd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
index dffd80a6f42f1e..ee171d12923d95 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIdJyc14RnKCUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzzCCAXSgAwIBAgIIesO/rvsuOL8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASZ5c/rnh8ypvhLaMfLKnP2sCgUGBWw
-eRkLHTSzPHE7U1o1cqE95LVwuyViW75gCuiv6tGMFE2ibjdxUYRUgK35o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUA08J8gSZW78J
-6RV5CSHtyYl8kgMwHwYDVR0jBBgwFoAUgM9bWsr51wb/CychBWKauo6HgP8wCgYI
-KoZIzj0EAwIDSAAwRQIhAPXWVfYd+rtzRfm4gqcpSLaexy2YfjbWYcJRqcSGqcLC
-AiBY2NTsfGX+x3qD3SeEMwO2qCPP50vtb87ZOPgA0ygBZw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARhoRCaH4tGBbFsg54tJ6EkgrWb+HHi
+Wdyq0TEsGCB1IiZJpIMevBQjovWiINJMfrSlutw7AKdT9bcTnSMm+jaUo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUT0oJ2LLw1ocQ
+fFjq0lFt7EBMHJkwHwYDVR0jBBgwFoAU20xQ51WsGDQUxULB/YuA9PqzeOwwCgYI
+KoZIzj0EAwIDSQAwRgIhAKW1walDyJ1IJybX4OmP/GxjuR75VicilaKjucK+aqa/
+AiEA0oPdmVqHYsLtKFIEuoWAWWdv1EuQGdyCNapsx1C3CZg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der
index e7f79054c6674d..a238ec0bd4977d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
index a1e5d6ce80ae6e..ca6bd802a9cd7c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEING6qaPVHFye7GME4CSMRJcfh0pYuU2GBL+XCRvIs9QroAoGCCqGSM49
-AwEHoUQDQgAEmeXP654fMqb4S2jHyypz9rAoFBgVsHkZCx00szxxO1NaNXKhPeS1
-cLslYlu+YAror+rRjBRNom43cVGEVICt+Q==
+MHcCAQEEIIytWdF2N7GteQbNBJSIqFt120VdSjmcPJc1ebwupQjCoAoGCCqGSM49
+AwEHoUQDQgAEYaEQmh+LRgWxbIOeLSehJIK1m/hx4lncqtExLBggdSImSaSDHrwU
+I6L1oiDSTH60pbrcOwCnU/W3E50jJvo2lA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der
index 2898d7dbdbb989..1e7913677ad007 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
index 890d48f5611b9b..66aae1e847dba0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIA1TCahYiJUowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIDO7Z4KdOQxowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABP/iM5sBv20fMQcZAFl9OyUI57XbcSJRh/2Kamm/KrqJzrU/Z36pYfwX8FBk
-Wocsc1W+81NFOrnoCRYe3HBA38CjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgECMB0GA1UdDgQWBBSAz1tayvnXBv8LJyEFYpq6joeA/zAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBP
-ckG/8Mfr8iq0GU1DlTbRQ5NpCdn76f/JLxdjomvHMgIhAM3PyJVGexuVVtigoHSw
-p3pVZGjFvIdqKG1z9RfQ3qP7
+A0IABCvont5u9hJT+iAF9TQ2Lz+XOmr33kp9ILkH/jTajxABUzutK8xD/e9Hbbgn
+1qhZXNwR8mHJyq55l57imQ8xb9ujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgECMB0GA1UdDgQWBBTbTFDnVawYNBTFQsH9i4D0+rN47DAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB3
+D7sLR0uSAXYU9nJRCWFKGPomejhdJgp4dE/Z3Sy/tQIhAIFmbQ425BOGV63gICr9
+ywoYC8z9hs+LkM0l0b2/FXCO
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der
index 297dee549c2a30..d0d3fe126b8d6e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
index 98ea0315cdee34..5985b2076fc88c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG34m0iTZy8L7ZHr0cdnZ0s1zJlmAbO3Iw+e+1vhseO4oAoGCCqGSM49
-AwEHoUQDQgAE/+IzmwG/bR8xBxkAWX07JQjntdtxIlGH/Ypqab8quonOtT9nfqlh
-/BfwUGRahyxzVb7zU0U6uegJFh7ccEDfwA==
+MHcCAQEEIN2I6PZtl9CC0hiFBaGY31Nu8Ds1UO5fnQL9BGlZMn7BoAoGCCqGSM49
+AwEHoUQDQgAEK+ie3m72ElP6IAX1NDYvP5c6avfeSn0guQf+NNqPEAFTO60rzEP9
+70dtuCfWqFlc3BHyYcnKrnmXnuKZDzFv2w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
index df7bfe36f829af..3b3b18d1dc95a0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208749c9cd784672825300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000499e5cfeb9e1f32a6f84b68c7cb2a73f6b028141815b079190b1d34b33c713b535a3572a13de4b570bb25625bbe600ae8afead18c144da26e377151845480adf9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414034f09f204995bbf09e915790921edc9897c9203301f0603551d2304183016801480cf5b5acaf9d706ff0b272105629aba8e8780ff300a06082a8648ce3d0403020348003045022100f5d655f61dfabb7345f9b882a72948b69ec72d987e36d661c251a9c486a9c2c2022058d8d4ec7c65fec77a83dd27843303b6a823cfe74bed6fced938f800d3280167",
-    "pai_cert": "308201be30820164a00302010202080354c26a1622254a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ffe2339b01bf6d1f31071900597d3b2508e7b5db71225187fd8a6a69bf2aba89ceb53f677ea961fc17f050645a872c7355bef353453ab9e809161edc7040dfc0a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020102301d0603551d0e0416041480cf5b5acaf9d706ff0b272105629aba8e8780ff301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204f7241bff0c7ebf22ab4194d439536d143936909d9fbe9ffc92f1763a26bc732022100cdcfc895467b1b9556d8a0a074b0a77a556468c5bc876a286d73f517d0dea3fb",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221008cded09a324293cf55c69c256716640cceae2434bb41bffcb9086270b4f40ce902204aae4537c0c21358d27584f17d401e297713bc9665801ab7416499447d6c87fd",
-    "dac_private_key": "d1baa9a3d51c5c9eec6304e0248c44971f874a58b94d8604bf97091bc8b3d42b",
-    "dac_public_key": "0499e5cfeb9e1f32a6f84b68c7cb2a73f6b028141815b079190b1d34b33c713b535a3572a13de4b570bb25625bbe600ae8afead18c144da26e377151845480adf9"
+    "dac_cert": "308201cf30820174a00302010202087ac3bfaefb2e38bf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000461a1109a1f8b4605b16c839e2d27a12482b59bf871e259dcaad1312c182075222649a4831ebc1423a2f5a220d24c7eb4a5badc3b00a753f5b7139d2326fa3694a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144f4a09d8b2f0d687107c58ead2516dec404c1c99301f0603551d23041830168014db4c50e755ac183414c542c1fd8b80f4fab378ec300a06082a8648ce3d0403020349003046022100a5b5c1a943c89d482726d7e0e98ffc6c63b91ef956272295a2a3b9c2be6aa6bf022100d283dd995a8762c2ed285204ba858059676fd44b9019dc8235aa6cc750b70998",
+    "pai_cert": "308201be30820164a00302010202080ceed9e0a74e431a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042be89ede6ef61253fa2005f534362f3f973a6af7de4a7d20b907fe34da8f1001533bad2bcc43fdef476db827d6a8595cdc11f261c9caae79979ee2990f316fdba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020102301d0603551d0e04160414db4c50e755ac183414c542c1fd8b80f4fab378ec301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220770fbb0b474b92017614f6725109614a18fa267a385d260a78744fd9dd2cbfb502210081666d0e36e4138657ade0202afdcb0a180bccfd86cf8b90cd25d1bdbf15708e",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203ac695f6e79c03428b7006d9991a98c63741e7891f49793d4c614003716726d50221009588c8e361ccad48b0b7e109c9ae098b7ab0ed78f2c154276251471d5ced4ec9",
+    "dac_private_key": "8cad59d17637b1ad7906cd049488a85b75db455d4a399c3c973579bc2ea508c2",
+    "dac_public_key": "0461a1109a1f8b4605b16c839e2d27a12482b59bf871e259dcaad1312c182075222649a4831ebc1423a2f5a220d24c7eb4a5badc3b00a753f5b7139d2326fa3694"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der
index 52390d3d1341e7..1ede1f869d05dd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der
index c940c7e89a38d4..df0a9ffcb19f53 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem
index 37440248eda50d..936d507341eab4 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIWbGRvnjHikowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIVNXeJ1oJQnMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARJdWuVIXEKAKNTpjUJ4Pn5wjgnKMP1
-D82d70uOne9iH33mTmzbl4TUSiEmQNzA1oGudMvmKDY99gvZhBPrL4MPo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUs440MkLIsN2B
-0P9Kvj5jedQ2Cu8wHwYDVR0jBBgwFoAU52xB1U0rpNCw9+lWVQ1ncAmSriYwCgYI
-KoZIzj0EAwIDSAAwRQIgFQNsp2NUynSef9YlYgBiDsdI3mW0OmBDMWNxgDvDpssC
-IQDsu8AZmSITPZSFXgvBR6nBbpg7p7BPetHkfMDqihEMwg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASKSV0IoEwQtx95n9uY5nWSJ7okthvC
+ejphsLXTRr/kruqNsCrbMUE+zhx877AIwvc5BxrIIouJl8qYag8I5Pnoo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUKchxsloZaUm1
+FvkZNnQbyS0jlKgwHwYDVR0jBBgwFoAUpi2icRcYZVnyWOD0+HR9ooINktIwCgYI
+KoZIzj0EAwIDSAAwRQIgYsoYQJ1XpcCITmc0sfulr8bfqYYkth4LbV9ofbkhd34C
+IQDJJXblGLVU9xwErwIBydLk0neUflpp0QsyFNY/D6MNZQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der
index 69b403ecff3565..4ae0a6045101a4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem
index 89856d7711d3f2..ac34d834656025 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINZvmrSIj2gCExDcCsrrTOIWXNPR9x4/pPmvkJTOFjH7oAoGCCqGSM49
-AwEHoUQDQgAESXVrlSFxCgCjU6Y1CeD5+cI4JyjD9Q/Nne9Ljp3vYh995k5s25eE
-1EohJkDcwNaBrnTL5ig2PfYL2YQT6y+DDw==
+MHcCAQEEIBxX5qf0+s6KoLeHWeqRQaM6G/xMS40UEfxbSPutNgBzoAoGCCqGSM49
+AwEHoUQDQgAEikldCKBMELcfeZ/bmOZ1kie6JLYbwno6YbC100a/5K7qjbAq2zFB
+Ps4cfO+wCML3OQcayCKLiZfKmGoPCOT56A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der
index 6fab237acd76e7..cfb40c092122dd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem
index ec40ed24cbd213..36bed85a774f29 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrTCCAVSgAwIBAgIIf/YxpJL0g5YwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBrTCCAVSgAwIBAgIIBcj1ZjgeCG8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJm6Yd1KeN1eMWyELMXfeAdpF9V2OWrMvQme5sacUimWgp3/2aL2xygZP7Vq
-WguiLkGi5bbcdznuvPa7UB6qzOKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYD
-VR0OBBYEFOdsQdVNK6TQsPfpVlUNZ3AJkq4mMB8GA1UdIwQYMBaAFGr9IncfUR/s
-vxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0cAMEQCICmWIOeEFynWwr/pcVZZ5b3W
-3TDXg01OtEOj2+qzPAe6AiAl4QWk0Dl4KbMFLCS/cQ3VKCP0CHiE9WM43YWybK5O
-cw==
+A0IABIflRitRj30XX7YwIBU8+WFguPQx6TPygf+288erRtyRSg/yp/DVlBAn3Fuz
+hUYhchxkwH/DBVkNThAkci9u7y2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYD
+VR0OBBYEFKYtonEXGGVZ8ljg9Ph0faKCDZLSMB8GA1UdIwQYMBaAFGr9IncfUR/s
+vxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0cAMEQCIBzI6r8dv8cXs5rjfcPjwcto
+eX1wTm8GNsMlSt2cEZH8AiBJbZTFphZ/Gy2H6iH+IIbtDLO5Kw/hgVz1LXYMBQpY
+mA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der
index 4641385277723f..43ac08ba69f90b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem
index a0bd25606d5950..3df1a4952de9bb 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDHTz7w6MQ31yjqVenti84HbswatuvBjBrIZXPf5RUUyoAoGCCqGSM49
-AwEHoUQDQgAEmbph3Up43V4xbIQsxd94B2kX1XY5asy9CZ7mxpxSKZaCnf/ZovbH
-KBk/tWpaC6IuQaLlttx3Oe689rtQHqrM4g==
+MHcCAQEEIBb6tM2MZvk2PM8pvwE2HYM53oKQ/va/aIdlZJ3B6BkhoAoGCCqGSM49
+AwEHoUQDQgAEh+VGK1GPfRdftjAgFTz5YWC49DHpM/KB/7bzx6tG3JFKD/Kn8NWU
+ECfcW7OFRiFyHGTAf8MFWQ1OECRyL27vLQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json
index a03ddb6e10304c..8a420d12209a51 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Key Usage extension",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020859b191be78c78a4a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000449756b9521710a00a353a63509e0f9f9c2382728c3f50fcd9def4b8e9def621f7de64e6cdb9784d44a212640dcc0d681ae74cbe628363df60bd98413eb2f830fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b38e343242c8b0dd81d0ff4abe3e6379d4360aef301f0603551d23041830168014e76c41d54d2ba4d0b0f7e956550d67700992ae26300a06082a8648ce3d0403020348003045022015036ca76354ca749e7fd6256200620ec748de65b43a6043316371803bc3a6cb022100ecbbc0199922133d94855e0bc147a9c16e983ba7b04f7ad1e47cc0ea8a110cc2",
-    "pai_cert": "308201ad30820154a00302010202087ff631a492f48396300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000499ba61dd4a78dd5e316c842cc5df78076917d576396accbd099ee6c69c522996829dffd9a2f6c728193fb56a5a0ba22e41a2e5b6dc7739eebcf6bb501eaacce2a356305430120603551d130101ff040830060101ff020101301d0603551d0e04160414e76c41d54d2ba4d0b0f7e956550d67700992ae26301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220299620e7841729d6c2bfe9715659e5bdd6dd30d7834d4eb443a3dbeab33c07ba022025e105a4d0397829b3052c24bf710dd52823f4087884f56338dd85b26cae4e73",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202423dec1aa29a65d8442a21d87179e23ff184d1949a8171e97bb0d2a40464072022100aee1555f303eb506ae2315548e2244d03fa3d5a1231b4648d8139938c01dc6d4",
-    "dac_private_key": "d66f9ab4888f68021310dc0acaeb4ce2165cd3d1f71e3fa4f9af9094ce1631fb",
-    "dac_public_key": "0449756b9521710a00a353a63509e0f9f9c2382728c3f50fcd9def4b8e9def621f7de64e6cdb9784d44a212640dcc0d681ae74cbe628363df60bd98413eb2f830f"
+    "dac_cert": "308201ce30820174a003020102020854d5de275a094273300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048a495d08a04c10b71f799fdb98e6759227ba24b61bc27a3a61b0b5d346bfe4aeea8db02adb31413ece1c7cefb008c2f739071ac8228b8997ca986a0f08e4f9e8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041429c871b25a196949b516f91936741bc92d2394a8301f0603551d23041830168014a62da27117186559f258e0f4f8747da2820d92d2300a06082a8648ce3d0403020348003045022062ca18409d57a5c0884e6734b1fba5afc6dfa98624b61e0b6d5f687db921777e022100c92576e518b554f71c04af0201c9d2e4d277947e5a69d10b3214d63f0fa30d65",
+    "pai_cert": "308201ad30820154a003020102020805c8f566381e086f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000487e5462b518f7d175fb63020153cf96160b8f431e933f281ffb6f3c7ab46dc914a0ff2a7f0d5941027dc5bb3854621721c64c07fc305590d4e1024722f6eef2da356305430120603551d130101ff040830060101ff020100301d0603551d0e04160414a62da27117186559f258e0f4f8747da2820d92d2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201cc8eabf1dbfc717b39ae37dc3e3c1cb68797d704e6f0636c3254add9c1191fc0220496d94c5a6167f1b2d87ea21fe2086ed0cb3b92b0fe1815cf52d760c050a5898",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022034e1e755ddff74b05c99451842d30c26e9b61b362f615de1d9a130d6f01b1f86022015963234a7768203edced2cc154ccce4303d9d67165352359df164d7e6c647dc",
+    "dac_private_key": "1c57e6a7f4face8aa0b78759ea9141a33a1bfc4c4b8d1411fc5b48fbad360073",
+    "dac_public_key": "048a495d08a04c10b71f799fdb98e6759227ba24b61bc27a3a61b0b5d346bfe4aeea8db02adb31413ece1c7cefb008c2f739071ac8228b8997ca986a0f08e4f9e8"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der
index a921332e0d67d9..862c8072354413 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der
index 84524b5f60efa0..5caa622ca8c6d8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem
index 44f6d331096daa..8f8319f5e14d57 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem
@@ -1,11 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrDCCAVOgAwIBAgIIdJS65d0syWUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBrTCCAVOgAwIBAgIIemK9hapxDvswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASIGdeuJxLr1SNsSTzzUjCBvyKLNlkv
-k/vUs4ln1Edc9rkXLvPcndbeGhPO/BA7N42ZgxSJx0lHKUBPCfuQQ9MCoz8wPTAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUR9C9CtE8h+zx
-tcmp5HW9zNQvKmQwCgYIKoZIzj0EAwIDRwAwRAIgbO9jW7/Jq6Id+ud38PRpyfWJ
-xfDrlRibH2BfnVuefqoCIFYAvZzYkP4RfPIM3YvCCHSbWx3huoRMVgNdYWfQnjUo
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3gy+6YVGOeTMAkQQ55jwav664rKon
+m8/Nq0FK91QSj3Isqow29NflltfEl8hPW1VTeUyIAfD2Dl8T8v3XXQiwoz8wPTAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU9qi5ttuhQa44
+slMQlj6JYKcPNvwwCgYIKoZIzj0EAwIDSAAwRQIhAIAYlQ0mGWCfPjQTkbOVr9v7
+vsOJXajC9fwQgznEMv4tAiAzdFUHPbYyKv0TQqPQ8Vypp3FHOiQBE8ZaMLogsZBo
+NQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der
index 3743f10be217f1..33c8e6a7f873f2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem
index 46a764789db441..eb6a39849cb55e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILNq9lfDawglycgUcMNLMgSwmuB8s86qxR7rZgN3tqo1oAoGCCqGSM49
-AwEHoUQDQgAEiBnXricS69UjbEk881Iwgb8iizZZL5P71LOJZ9RHXPa5Fy7z3J3W
-3hoTzvwQOzeNmYMUicdJRylATwn7kEPTAg==
+MHcCAQEEIBh7DtjDRHTS2BojeqHta+l0Fkg2BJfww9tDWHr3FZAXoAoGCCqGSM49
+AwEHoUQDQgAEd4MvumFRjnkzAJEEOeY8Gr+uuKyqJ5vPzatBSvdUEo9yLKqMNvTX
+5ZbXxJfIT1tVU3lMiAHw9g5fE/L9110IsA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der
index 51724719b5d63c..059e944deb660f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem
index d745c97305edc7..7c00f01766daab 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBnjCCAUWgAwIBAgIIANSNX8sZpmMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBnjCCAUWgAwIBAgIIdyNZPBFgYvwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEUrsIIMGq5ecveW7InljKznWMydqXnfOb9gMA5ofJ3QxNpk7GEQWGkHo3Hh
-jHkOsGHhNRB7lAfCd1+b1ZHaacOjRzBFMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+A0IABJg9LckAIrF09o1vJn1aMvy8wakXlCsVbEyUqeMvZb/ARtaH8YlO0mYlq37u
+sfWkXXPD/QxO5PzcXiIp3v7hqXqjRzBFMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
 VR0PAQH/BAQDAgEGMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoG
-CCqGSM49BAMCA0cAMEQCIAtR+AZ0H4GQh7j1GPyZveRi1jPC3ZvxlsdZESd9QFiX
-AiAbicyO/05bDrd2p3J36hwsG7JBUTpi8HI6iVzytCCRXg==
+CCqGSM49BAMCA0cAMEQCIDokg0BR+yBWK8fG/86cQEm4dCnxDHq0OL/XmFtYSHHv
+AiAW/XLJ2ytze3+20SFcnmbv1RBHkNYY8wY9UQAmPXijhw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der
index 2aaf9d05cad17b..d4ae1d7f7ea56b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem
index 63aea807da2ea4..8faca9833080b6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOop+Er8Q+A/0l48vC5MEzIiiu4ffBKh9lyOcGSHRLiIoAoGCCqGSM49
-AwEHoUQDQgAERSuwggwarl5y95bsieWMrOdYzJ2ped85v2AwDmh8ndDE2mTsYRBY
-aQejceGMeQ6wYeE1EHuUB8J3X5vVkdppww==
+MHcCAQEEIGmPk0w5eBDvAXN68xB/XQvay0hutmxXg06mW8ISyi5roAoGCCqGSM49
+AwEHoUQDQgAEmD0tyQAisXT2jW8mfVoy/LzBqReUKxVsTJSp4y9lv8BG1ofxiU7S
+ZiWrfu6x9aRdc8P9DE7k/NxeIine/uGpeg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json
index 8404c0d21be131..afe003c2878f44 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Subject Key ID (SKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ac30820153a00302010202087494bae5dd2cc965300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048819d7ae2712ebd5236c493cf3523081bf228b36592f93fbd4b38967d4475cf6b9172ef3dc9dd6de1a13cefc103b378d99831489c7494729404f09fb9043d302a33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041447d0bd0ad13c87ecf1b5c9a9e475bdccd42f2a64300a06082a8648ce3d040302034700304402206cef635bbfc9aba21dfae777f0f469c9f589c5f0eb95189b1f605f9d5b9e7eaa02205600bd9cd890fe117cf20cdd8bc208749b5b1de1ba844c56035d6167d09e3528",
-    "pai_cert": "3082019e30820145a003020102020800d48d5fcb19a663300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004452bb0820c1aae5e72f796ec89e58cace758cc9da979df39bf60300e687c9dd0c4da64ec6110586907a371e18c790eb061e135107b9407c2775f9bd591da69c3a347304530120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200b51f806741f819087b8f518fc99bde462d633c2dd9bf196c75911277d40589702201b89cc8eff4e5b0eb776a77277ea1c2c1bb241513a62f0723a895cf2b420915e",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022061ecf1cf3b1b58fe4cfd9d864b08d3b30e44c58a7fde88ffe01afbd04fc956e602203118949266eea3c953167e875c9131a06ef5c21c2526f903aa87017d4571c06e",
-    "dac_private_key": "b36af657c36b0825c9c81470c34b3204b09ae07cb3ceaac51eeb660377b6aa35",
-    "dac_public_key": "048819d7ae2712ebd5236c493cf3523081bf228b36592f93fbd4b38967d4475cf6b9172ef3dc9dd6de1a13cefc103b378d99831489c7494729404f09fb9043d302"
+    "dac_cert": "308201ad30820153a00302010202087a62bd85aa710efb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000477832fba61518e793300910439e63c1abfaeb8acaa279bcfcdab414af754128f722caa8c36f4d7e596d7c497c84f5b5553794c8801f0f60e5f13f2fdd75d08b0a33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f6a8b9b6dba141ae38b25310963e8960a70f36fc300a06082a8648ce3d04030203480030450221008018950d2619609f3e341391b395afdbfbbec3895da8c2f5fc108339c432fe2d0220337455073db6322afd1342a3d0f15ca9a771473a240113c65a30ba20b1906835",
+    "pai_cert": "3082019e30820145a00302010202087723593c116062fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004983d2dc90022b174f68d6f267d5a32fcbcc1a917942b156c4c94a9e32f65bfc046d687f1894ed26625ab7eeeb1f5a45d73c3fd0c4ee4fcdc5e2229defee1a97aa347304530120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203a24834051fb20562bc7c6ffce9c4049b87429f10c7ab438bfd7985b584871ef022016fd72c9db2b737b7fb6d1215c9e66efd5104790d618f3063d5100263d78a387",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e71d7a8b9b1a5de233fe53c7b9bb5237688d1a32ab63aff7feb729365e4afb2d02206253b7ba7201eae286ffa3f22916ca30dafc49cef543d8d8c3076c63b0800345",
+    "dac_private_key": "187b0ed8c34474d2d81a237aa1ed6be9741648360497f0c3db43587af7159017",
+    "dac_public_key": "0477832fba61518e793300910439e63c1abfaeb8acaa279bcfcdab414af754128f722caa8c36f4d7e596d7c497c84f5b5553794c8801f0f60e5f13f2fdd75d08b0"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der
index cdd2eab340f659..52b40214bf5672 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der
index 630e2b126ddd48..e72a26cd87e807 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem
index 34331a23dd8e1c..a696efe07c942c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIKR+H/wMSsXgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIYtLJT6Q+sVYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQs7meysjxZmnIto45SP955WZf2cTzq
-8mu/sgwGYb/onq80LxdRV/tpEbONvnVPDs5LXBMmd608C4pJNFumSWVlo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUS+IXzyATlsmU
-iSh6hLKYrKO1XrAwHwYDVR0jBBgwFoAUggAnUeP+qqRS9IIBI/P4TsuD41wwCgYI
-KoZIzj0EAwIDRwAwRAIgXWZ6yI3k/5qY/m/DyN500fpNR+4CA3YMN6WrlQCrXpAC
-IEu78cWaJHxGQk3uNVEWCyhCMfb4miLHWGb27sClz0Ao
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAsr9oJ9tnPabv5S72iGUcZQNpZJij
+YbylnABzeDBhqYfpIpxqmeZr43cTQf0m6+ypypTF7zn44X/dS1lsPaado2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUeRD0jzss8F6j
+FSHMJOaO/uzEa9gwHwYDVR0jBBgwFoAUSqLL5qz3qlujuE7LhqqtQT+kw7gwCgYI
+KoZIzj0EAwIDSAAwRQIhAKHojqc1mRb2zKqOyF/Q+ZLAM/DvCaefbF7sHFyOZKEX
+AiAHSxkQnXs+XO4j/Qs2aE4hgKopAQ6Gt93pTv+EdtyYMg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der
index 94089a298f4006..e8465b1f7af54c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem
index 79d94b274342de..4a7525cd26e6e6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMPBiiJpljNnkZztb027u+w8yqIR/tLmxl0wJ8omphbNoAoGCCqGSM49
-AwEHoUQDQgAELO5nsrI8WZpyLaOOUj/eeVmX9nE86vJrv7IMBmG/6J6vNC8XUVf7
-aRGzjb51Tw7OS1wTJnetPAuKSTRbpkllZQ==
+MHcCAQEEIN3aMYc9isrXogXysgnD/hzUikMKzmYPdt2r70tnKGZwoAoGCCqGSM49
+AwEHoUQDQgAEwLK/aCfbZz2m7+Uu9ohlHGUDaWSYo2G8pZwAc3gwYamH6SKcapnm
+a+N3E0H9JuvsqcqUxe85+OF/3UtZbD2mnQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der
index 6e7201c45cc1cd..0a052a81754f06 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem
index 3ac44c52f1642d..9f83a8e8a02ef0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0jCCAXmgAwIBAgIIdwEBV4tzNpswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIB0jCCAXmgAwIBAgIIVkA6ibDt19MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCTeXBUfG5Q5PgRnisIePC1Fw4wPsrFmBhPVLNZXM/05phoBloDu+Mdugn9M
-GHf+NlIVpLDeQ0Yy7He9Rv5ay0ejezB5MBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSCACdR4/6qpFL0ggEj8/hOy4PjXDAfBgNV
+A0IABDQyduF8jDElSpscWK9szQE/6lsQTIaRmA3J6ZWogMcC1dkS64MuThNW9xyj
+CDPQDDoj8Q4Xb5HArjgbjaCQFp+jezB5MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRKosvmrPeqW6O4TsuGqq1BP6TDuDAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjATBgNVHREEDDAKggh0ZXN0LmNv
-bTAKBggqhkjOPQQDAgNHADBEAiAdy2Mt/W1D80nsOL8Lj11JJH1HxjcaVy8n1E8V
-+gI5TgIgfBsunkYNSr1n+OM+VOLjibWm+OHnSQ0xYgzx4TenN0w=
+bTAKBggqhkjOPQQDAgNHADBEAiAI+SIE93zvH2IDH8srA83Y3ftGw4w5S8jtKvjx
+QZIUnwIgXGQXAI3EuswlJT76alqlnIGqlJzsppEr4Wa6sm9UJGc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der
index c967601a552c0f..c92fa73b18272a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem
index 03f526acaae225..b7ede90d22bd5a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINHsqy5MaHYZCxMtl8dlAPJokMYb33kXbOsJTCEGevm2oAoGCCqGSM49
-AwEHoUQDQgAEJN5cFR8blDk+BGeKwh48LUXDjA+ysWYGE9Us1lcz/TmmGgGWgO74
-x26Cf0wYd/42UhWksN5DRjLsd71G/lrLRw==
+MHcCAQEEICQqmZnfZrA2Ef88yCP+0soBfn0PIL7HpcxDZ8T3tEjmoAoGCCqGSM49
+AwEHoUQDQgAENDJ24XyMMSVKmxxYr2zNAT/qWxBMhpGYDcnplaiAxwLV2RLrgy5O
+E1b3HKMIM9AMOiPxDhdvkcCuOBuNoJAWnw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json
index c131de9443191d..8ab17ba30ea3d6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate includes optional Subject Alternative Name extension",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a0030201020208291f87ff0312b178300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042cee67b2b23c599a722da38e523fde795997f6713ceaf26bbfb20c0661bfe89eaf342f175157fb6911b38dbe754f0ece4b5c132677ad3c0b8a49345ba6496565a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144be217cf201396c99489287a84b298aca3b55eb0301f0603551d2304183016801482002751e3feaaa452f4820123f3f84ecb83e35c300a06082a8648ce3d040302034700304402205d667ac88de4ff9a98fe6fc3c8de74d1fa4d47ee0203760c37a5ab9500ab5e9002204bbbf1c59a247c46424dee3551160b284231f6f89a22c75866f6eec0a5cf4028",
-    "pai_cert": "308201d230820179a0030201020208770101578b73369b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000424de5c151f1b94393e04678ac21e3c2d45c38c0fb2b1660613d52cd65733fd39a61a019680eef8c76e827f4c1877fe365215a4b0de434632ec77bd46fe5acb47a37b307930120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041482002751e3feaaa452f4820123f3f84ecb83e35c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d040302034700304402201dcb632dfd6d43f349ec38bf0b8f5d49247d47c6371a572f27d44f15fa02394e02207c1b2e9e460d4abd67f8e33e54e2e389b5a6f8e1e7490d31620cf1e137a7374c",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b181223f6618758a90645410bc26d1774c9bb7fb3cf2e4335bc1815966c484f6022003c0e6d692970ea45b50c8a1c781981a20b191d2ee9df3577f2af78d8171972e",
-    "dac_private_key": "c3c18a2269963367919ced6f4dbbbbec3ccaa211fed2e6c65d3027ca26a616cd",
-    "dac_public_key": "042cee67b2b23c599a722da38e523fde795997f6713ceaf26bbfb20c0661bfe89eaf342f175157fb6911b38dbe754f0ece4b5c132677ad3c0b8a49345ba6496565"
+    "dac_cert": "308201ce30820174a003020102020862d2c94fa43eb156300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c0b2bf6827db673da6efe52ef688651c6503696498a361bca59c0073783061a987e9229c6a99e66be3771341fd26ebeca9ca94c5ef39f8e17fdd4b596c3da69da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147910f48f3b2cf05ea31521cc24e68efeecc46bd8301f0603551d230418301680144aa2cbe6acf7aa5ba3b84ecb86aaad413fa4c3b8300a06082a8648ce3d0403020348003045022100a1e88ea7359916f6ccaa8ec85fd0f992c033f0ef09a79f6c5eec1c5c8e64a1170220074b19109d7b3e5cee23fd0b36684e2180aa29010e86b7dde94eff8476dc9832",
+    "pai_cert": "308201d230820179a003020102020856403a89b0edd7d3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004343276e17c8c31254a9b1c58af6ccd013fea5b104c8691980dc9e995a880c702d5d912eb832e4e1356f71ca30833d00c3a23f10e176f91c0ae381b8da090169fa37b307930120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144aa2cbe6acf7aa5ba3b84ecb86aaad413fa4c3b8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d0403020347003044022008f92204f77cef1f62031fcb2b03cdd8ddfb46c38c394bc8ed2af8f14192149f02205c6417008dc4bacc25253efa6a5aa59c81aa949ceca6912be166bab26f542467",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009c8535617a42f7b9d6fa3a6d6900a8f54c6e4b2cff3210c2b83ca9442c923a2a022025aec84ea1a17cb7e26eaaaef0eeed22c91219101fd82c87e5fbef816a9537d0",
+    "dac_private_key": "ddda31873d8acad7a205f2b209c3fe1cd48a430ace660f76ddabef4b67286670",
+    "dac_public_key": "04c0b2bf6827db673da6efe52ef688651c6503696498a361bca59c0073783061a987e9229c6a99e66be3771341fd26ebeca9ca94c5ef39f8e17fdd4b596c3da69d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der
index b8a6a322823b31..54eeef1f0f461f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der
index dd7061ebfb1e7a..81e73225f0ab34 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem
index 7c9f73f75fb6c9..707c964245fd75 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIRpWZsmN09+4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIFrUXDTIXeoowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARFtgXITTVbSPen1njw0A48CzY3lOss
-0wqz4gTB/3+zjR77fObjgb0bBcHNZhzsMbywmZezepUshqerCMSri49Jo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUZcZ1JQTG5k0D
-PkD4q4+Cp353OzEwHwYDVR0jBBgwFoAUFI//WmN5pjlPp1jU2zS9EZZiHOAwCgYI
-KoZIzj0EAwIDSAAwRQIhAPwj4HF4abQL4gI1Foj9jEjcls6BnjThkDayB/TnVCU4
-AiAmKz8RsoFHPGrazvTdlqe1mRwRXMFNJPyviZgdatvxyw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATnJnm9mq6e77XNs5PCYSp7CID7nt1g
+UpOZNbIRNulaE8gQjspO1xjAxUg58B5c6teu+pibLeH27spx9galkc0Ro2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUu1hNuRQS4YF2
+Xi71fC9u2hYLXQ8wHwYDVR0jBBgwFoAUEvuhpoab8mPgGModZUwvjCm2G2gwCgYI
+KoZIzj0EAwIDSAAwRQIgUWqyDgRr6uet+0p+MYj6BYp+kK72H6u1AdccEPUcS2MC
+IQD8Ut4M33+F0axom7J7yhS5BYk4a046f3iAgZd7h2p+NQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der
index 8507d351c0fadc..99e74d8c2cd2bd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem
index 329b2400de9fb6..62c3af6fef9e78 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINRxNA/NdXNhK4aysfIKvKTmGCEOkQm/Nuwr3mnUJ9rUoAoGCCqGSM49
-AwEHoUQDQgAERbYFyE01W0j3p9Z48NAOPAs2N5TrLNMKs+IEwf9/s40e+3zm44G9
-GwXBzWYc7DG8sJmXs3qVLIanqwjEq4uPSQ==
+MHcCAQEEIKDIoXd3ERD1HnDt+RpBOsWTApOHoLqcAilwqKlkltfpoAoGCCqGSM49
+AwEHoUQDQgAE5yZ5vZqunu+1zbOTwmEqewiA+57dYFKTmTWyETbpWhPIEI7KTtcY
+wMVIOfAeXOrXrvqYmy3h9u7KcfYGpZHNEQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der
index 6bfd84ae0f54de..5a6f473f8600c0 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem
index 881683cb88d2b3..e4fd995e3ec3cf 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWOgAwIBAgIIb737s5U6eOwwCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
-YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDQyMDAw
+MIIBvDCCAWOgAwIBAgIIBEzFO7MsMz8wCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDUyNzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAwMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBQ
 QUkxFDASBgorBgEEAYKifAIBDARGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEgk7r1zQNvNd3ILGegp9F2A6bSIYXee3+XP4TgCKA/8a8iQY+WfBmh3BBc5RB
-6wmqJfWRsBnWcxsZkzhz0FqykaNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBSP/1pjeaY5T6dY1Ns0vRGWYhzgMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAkGByqGSM49BAEDRwAwRAIgKnfZ
-ygJmumHmgEN4YiOVWJF5ftkFyTKjAmKBeriZrgUCIA7+UtL1AMSmcv5mnXYuWQNB
-Fn39EKFkx2uc3X99bKkw
+QgAEqK/4VQ9ONGr8m1F406+gmvN+3gBXODASW8QS/0Y9nhf8R14OvCqnlZI80jMV
+v/xyDkmER9YB/4b4fmPwvpwqnqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBL7oaaGm/Jj4BjKHWVML4wpthtoMB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAkGByqGSM49BAEDSAAwRQIgZn8x
+rGZB/p8S4ZY/JSgNvc+23qnM0U4dcb4zE9OjHFgCIQDN0kITc5FAQuFg3KLHiSE5
+YW2qRPjZq3d5UIm4ONQ//A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der
index e04c8442d902c1..3d26fdb09293a3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem
index 6829aa710cd997..27b11fb0277b63 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPabvrJ6dnuldMhN0/htkZvVEcdxiXRgWweIvW0fjgRxoAoGCCqGSM49
-AwEHoUQDQgAEgk7r1zQNvNd3ILGegp9F2A6bSIYXee3+XP4TgCKA/8a8iQY+WfBm
-h3BBc5RB6wmqJfWRsBnWcxsZkzhz0FqykQ==
+MHcCAQEEIIelzojq1QhnnRqcrvpNxu6A+aMSG9sVkk3TyGlcma+yoAoGCCqGSM49
+AwEHoUQDQgAEqK/4VQ9ONGr8m1F406+gmvN+3gBXODASW8QS/0Y9nhf8R14OvCqn
+lZI80jMVv/xyDkmER9YB/4b4fmPwvpwqng==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json
index fb9934d3ce23bf..b7b24d3dedf832 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Invalid certificate signature algorithm ECDSA_WITH_SHA1",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208469599b26374f7ee300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000445b605c84d355b48f7a7d678f0d00e3c0b363794eb2cd30ab3e204c1ff7fb38d1efb7ce6e381bd1b05c1cd661cec31bcb09997b37a952c86a7ab08c4ab8b8f49a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041465c6752504c6e64d033e40f8ab8f82a77e773b31301f0603551d23041830168014148fff5a6379a6394fa758d4db34bd1196621ce0300a06082a8648ce3d0403020348003045022100fc23e0717869b40be202351688fd8c48dc96ce819e34e19036b207f4e75425380220262b3f11b281473c6adacef4dd96a7b5991c115cc14d24fcaf89981d6adbf1cb",
-    "pai_cert": "308201bb30820163a00302010202086fbdfbb3953a78ec300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004824eebd7340dbcd77720b19e829f45d80e9b48861779edfe5cfe13802280ffc6bc89063e59f066877041739441eb09aa25f591b019d6731b19933873d05ab291a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414148fff5a6379a6394fa758d4db34bd1196621ce0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300906072a8648ce3d0401034700304402202a77d9ca0266ba61e68043786223955891797ed905c932a30262817ab899ae0502200efe52d2f500c4a672fe669d762e590341167dfd10a164c76b9cdd7f7d6ca930",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cf434b9d9a84c72038dfc44729c6a4cada8beaa1482ff1267a57e8b26e95b0c6022100e019f5be8e9a4984348442753c94ee385afb0b0995af502ee9e38a29e997075d",
-    "dac_private_key": "d471340fcd7573612b86b2b1f20abca4e618210e9109bf36ec2bde69d427dad4",
-    "dac_public_key": "0445b605c84d355b48f7a7d678f0d00e3c0b363794eb2cd30ab3e204c1ff7fb38d1efb7ce6e381bd1b05c1cd661cec31bcb09997b37a952c86a7ab08c4ab8b8f49"
+    "dac_cert": "308201ce30820174a003020102020816b5170d32177a8a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e72679bd9aae9eefb5cdb393c2612a7b0880fb9edd6052939935b21136e95a13c8108eca4ed718c0c54839f01e5cead7aefa989b2de1f6eeca71f606a591cd11a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bb584db91412e181765e2ef57c2f6eda160b5d0f301f0603551d2304183016801412fba1a6869bf263e018ca1d654c2f8c29b61b68300a06082a8648ce3d04030203480030450220516ab20e046beae7adfb4a7e3188fa058a7e90aef61fabb501d71c10f51c4b63022100fc52de0cdf7f85d1ac689bb27bca14b90589386b4e3a7f788081977b876a7e35",
+    "pai_cert": "308201bc30820163a0030201020208044cc53bb32c333f300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a8aff8550f4e346afc9b5178d3afa09af37ede00573830125bc412ff463d9e17fc475e0ebc2aa795923cd23315bffc720e498447d601ff86f87e63f0be9c2a9ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041412fba1a6869bf263e018ca1d654c2f8c29b61b68301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300906072a8648ce3d040103480030450220667f31ac6641fe9f12e1963f25280dbdcfb6dea9ccd14e1d71be3313d3a31c58022100cdd2421373914042e160dca2c7892139616daa44f8d9ab77795089b838d43ffc",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022064bcaa37c863d891771a394f65707de931e82b74035c56299a3c706384bcfa4b022100caa722a322f7a0ce0edfd9f9dc8e50a9b9caf6e60ed5fc05ad9260dda01d55b6",
+    "dac_private_key": "a0c8a177771110f51e70edf91a413ac593029387a0ba9c022970a8a96496d7e9",
+    "dac_public_key": "04e72679bd9aae9eefb5cdb393c2612a7b0880fb9edd6052939935b21136e95a13c8108eca4ed718c0c54839f01e5cead7aefa989b2de1f6eeca71f606a591cd11"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der
index f09c63f325f3d4..a3c072626ac636 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der
index 8aab46e8a26207..626b27bc25cf91 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem
index 87c2c274a8ee9d..b99592118baf24 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIXxWbrEpShi0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIIFR+fp68E8kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARgUxK6QRveTs6JFjAnFF3CTUsiUFQb
-4nj3+V875J+CtbQ5Uls+CLQwqLfQDTnnY6WEv3WbQ8c0kqCMC7jCczaEo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUNTQkF7W1zHiY
-nRTCZg1RIVFQicMwHwYDVR0jBBgwFoAUXViCDgDy7NnurHUCBwdPiCl64ocwCgYI
-KoZIzj0EAwIDRwAwRAIgSde644Xtd7GRWFgfpolow4MAB0P0TLXCmztmioCIF8wC
-IE+ktjNM7KyxGK41xdrT1GcfcJMyvkjF7F3NB9Oa/h8t
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATk67sQiOzcg5GiALLS77qXGigO+rSx
+bbKVi3L/HiAvGWNuYFkjDNwC9UHBSs5Z1m8wi7G+hkhP7F+mS2JhvNBRo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUwDWKmLbCscXF
+8CMybhPTeBPr6LQwHwYDVR0jBBgwFoAUyPech3T5SKsR4iQbsGcjALj/QM4wCgYI
+KoZIzj0EAwIDRwAwRAIgREtTmVzodj3Hexcf4psjM+V8fUd2Vy3rEMsWgUtFBjIC
+ICwAPfXyyEpigqmQt+/HjqYQHI4+MF4VJ7ZuQ4whTISi
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der
index 3ebceb5b92c5fc..fc5f3e2399748d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem
index 0c6f406cce9eb7..aa4b8545b36a73 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAdm/ieRr1rS42XXXbia6Wr5xESqU7ugArMnBQtGeqC1oAoGCCqGSM49
-AwEHoUQDQgAEYFMSukEb3k7OiRYwJxRdwk1LIlBUG+J49/lfO+SfgrW0OVJbPgi0
-MKi30A0552OlhL91m0PHNJKgjAu4wnM2hA==
+MHcCAQEEILjI0eX7lDi6/7cWyZdexhNS3TBgVfbQ4tlnw3htTCOMoAoGCCqGSM49
+AwEHoUQDQgAE5Ou7EIjs3IORogCy0u+6lxooDvq0sW2ylYty/x4gLxljbmBZIwzc
+AvVBwUrOWdZvMIuxvoZIT+xfpktiYbzQUQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der
index b75d8cb30b5ffe..e14c1cab97d85f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem
index 7140ad7bbbc639..a0598b892eec8b 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIOzNnLbPqbVwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvjCCAWSgAwIBAgIIdg0wW1tTQkQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFnxPKodFUFd2VdY/sja070AOjExo1lLfDpDvHUXD1NlGHH0xue2ZqfE26N+
-qUNzrwpgPKMMHoY1pL5ckFXNgNyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRdWIIOAPLs2e6sdQIHB0+IKXrihzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB1
-eM+tCImySKs1NE4irCYHJjCgG0pvgNBBO5y9+5VGcAIhALEMrYFK1XbXB2dPLdJO
-GBij2cvVULt9pD2ckAPwz6xX
+A0IABDTiP+O3k97ocvUjvfuOdCO8eULpwEFy0HSGUZo33Xfbzrr0aRHhqPDOpO0L
+Ny9/uvGPtc/R/36srMysL7FE4+GjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTI95yHdPlIqxHiJBuwZyMAuP9AzjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+3dr8a7kDi+VF0W8d7qBmwBewZfOOMQiQYYGo1H+qaOwCIFy7+6hhMSUqGWmuRpNq
+MK/amQO7xm+N9HvoY192zmsg
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der
index 7e801f752cc552..ab02c6ee1848c7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem
index 3edec1c8941c58..193b1fd1842ec2 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGzVHc2MmjAhaAob63ROuJIY9ZOENXupevS27dYMwAvJoAoGCCqGSM49
-AwEHoUQDQgAEWfE8qh0VQV3ZV1j+yNrTvQA6MTGjWUt8OkO8dRcPU2UYcfTG57Zm
-p8Tbo36pQ3OvCmA8owwehjWkvlyQVc2A3A==
+MHcCAQEEIJiv6+GEkTuUbMc7jQVbQSO9M9L9BZ+CEkoNrXEwr1aGoAoGCCqGSM49
+AwEHoUQDQgAENOI/47eT3uhy9SO9+450I7x5QunAQXLQdIZRmjfdd9vOuvRpEeGo
+8M6k7Qs3L3+68Y+1z9H/fqyszKwvsUTj4Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json
index aadd5c964fc07e..3b48f71977ba74 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Valid certificate signature algorithm ECDSA_WITH_SHA256",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a00302010202085f159bac4a52862d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004605312ba411bde4ece89163027145dc24d4b2250541be278f7f95f3be49f82b5b439525b3e08b430a8b7d00d39e763a584bf759b43c73492a08c0bb8c2733684a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041435342417b5b5cc78989d14c2660d5121515089c3301f0603551d230418301680145d58820e00f2ecd9eeac750207074f88297ae287300a06082a8648ce3d0403020347003044022049d7bae385ed77b19158581fa68968c383000743f44cb5c29b3b668a808817cc02204fa4b6334cecacb118ae35c5dad3d4671f709332be48c5ec5dcd07d39afe1f2d",
-    "pai_cert": "308201be30820164a00302010202083b33672db3ea6d5c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000459f13caa1d15415dd95758fec8dad3bd003a3131a3594b7c3a43bc75170f53651871f4c6e7b666a7c4dba37ea94373af0a603ca30c1e8635a4be5c9055cd80dca366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604145d58820e00f2ecd9eeac750207074f88297ae287301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207578cfad0889b248ab35344e22ac26072630a01b4a6f80d0413b9cbdfb954670022100b10cad814ad576d707674f2dd24e1818a3d9cbd550bb7da43d9c9003f0cfac57",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022004c86dbcd730665a39ba1cf4ec80b1981a09ee51bb97f309d4ac9199b13b6998022040a500361ce33f370287a36f19828fc9190d226b1439aa8f407be620608581aa",
-    "dac_private_key": "0766fe2791af5ad2e365d75db89ae96af9c444aa53bba002b327050b467aa0b5",
-    "dac_public_key": "04605312ba411bde4ece89163027145dc24d4b2250541be278f7f95f3be49f82b5b439525b3e08b430a8b7d00d39e763a584bf759b43c73492a08c0bb8c2733684"
+    "dac_cert": "308201cd30820174a003020102020820547e7e9ebc13c9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e4ebbb1088ecdc8391a200b2d2efba971a280efab4b16db2958b72ff1e202f19636e6059230cdc02f541c14ace59d66f308bb1be86484fec5fa64b6261bcd051a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c0358a98b6c2b1c5c5f023326e13d37813ebe8b4301f0603551d23041830168014c8f79c8774f948ab11e2241bb0672300b8ff40ce300a06082a8648ce3d04030203470030440220444b53995ce8763dc77b171fe29b2333e57c7d4776572deb10cb16814b45063202202c003df5f2c84a6282a990b7efc78ea6101c8e3e305e1527b66e438c214c84a2",
+    "pai_cert": "308201be30820164a0030201020208760d305b5b534244300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000434e23fe3b793dee872f523bdfb8e7423bc7942e9c04172d07486519a37dd77dbcebaf46911e1a8f0cea4ed0b372f7fbaf18fb5cfd1ff7eacacccac2fb144e3e1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c8f79c8774f948ab11e2241bb0672300b8ff40ce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100dddafc6bb9038be545d16f1deea066c017b065f38e3108906181a8d47faa68ec02205cbbfba86131252a1969ae46936a30afda9903bbc66f8df47be8635f76ce6b20",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b5d72a81c7b64ff66a5f5c66fe5a88a54936340ef2bf60ef0a862bac645fe58d022100a2c20dcf768d23603bf51e615b3cd695f3137ce3755161b24ed3ff17d27cacb9",
+    "dac_private_key": "b8c8d1e5fb9438baffb716c9975ec61352dd306055f6d0e2d967c3786d4c238c",
+    "dac_public_key": "04e4ebbb1088ecdc8391a200b2d2efba971a280efab4b16db2958b72ff1e202f19636e6059230cdc02f541c14ace59d66f308bb1be86484fec5fa64b6261bcd051"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der
index f686a6e160c1f8..2437e6c1be1945 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der
index ac6d07ba6c3fbc..f13caf64964d01 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem
index 95eca771d417bd..b1eb3a56299a2f 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIOf04BW6vV8IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzTCCAXSgAwIBAgIIJe0jhZLYIqEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4p31037SjtqAf93IgcYaY4ijUvffU
-iSf4IIOHzvRArwTTH6NjMbN7kqVXe+ThNNK9L+ewvinyEiIxRTo7s8YNo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUGzhAS81hT38G
-SnCC9JhWftEdooYwHwYDVR0jBBgwFoAUgHJCndhbTxnc41Mv73ON+paho9kwCgYI
-KoZIzj0EAwIDSAAwRQIgKy+8+WbDI+M4EFHjM9/kiuV+ABWxkXzkCimuInuznoUC
-IQCt6aBMt/KENPJrRRauBKy5MdDh3FM2OsYWO/RUamqiRQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARBZiRuLBiIB+k2AiehS+W/OO8fgux2
+DfcUmSRx4BzUW0aPlEVoo4k2pOZckZKN6uGTD7gfV+YXbsIZJa3K8S9uo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUOifcZmv6HcmT
+s6lDEEiPlolSJ6gwHwYDVR0jBBgwFoAU1G3q3KyWExehVpvtobDBm+Wec4wwCgYI
+KoZIzj0EAwIDRwAwRAIgXGO48tVqNKwvHeyAwv5c8BD0z5sdFNW+VTokowQFvrgC
+ID1SOhARDq5n/88rZ70GgPKZTqedyqVSXEp/UkhUFSPw
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der
index e1bf6daa4ea393..96236e0faab515 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem
index f562b29997c3fd..6bb2e895fa69a4 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFSwLHyK+SWfuHghGI8VXUs8PB8o5tyPyAYcqkb7Zy5OoAoGCCqGSM49
-AwEHoUQDQgAEuKd9dN+0o7agH/dyIHGGmOIo1L331Ikn+CCDh870QK8E0x+jYzGz
-e5KlV3vk4TTSvS/nsL4p8hIiMUU6O7PGDQ==
+MHcCAQEEICXl56yNKrutVJYMpgiZo/rcl5PJ1LEZAKRAVW8RoowjoAoGCCqGSM49
+AwEHoUQDQgAEQWYkbiwYiAfpNgInoUvlvzjvH4Lsdg33FJkkceAc1FtGj5RFaKOJ
+NqTmXJGSjerhkw+4H1fmF27CGSWtyvEvbg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der
index ad001bd3436d1f..dd09459b95318a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem
index caf52f3512a4d6..e279a51ef351c4 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIISNrAqnBxw40wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIXoqbrYxCfoQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPjf/JjfuN802RaimiTPqMKEZ+ogC82bfu8S9PACkWrbhII2IevaPgEgFKOj
-oHubOqA3nzMY+n9uxdg1T4o5W0WjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSAckKd2FtPGdzjUy/vc436lqGj2TAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBj
-1Djf0YmukM/n1m/18yGgP8WxdE+hZ8/ElykJaQL6AAIgMALC1TKmtApS5xPEfle8
-KtnWMd7//LlYV6LfXH6R37M=
+A0IABAm/W/vQmOTGOpYqOqLBnPz+Jcmak3qXMg2Q6Tm7szbt/r7Rgqifje/PDoyu
+i/p0Bzug0HuhVzdawux0KazrvTujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUbercrJYTF6FWm+2hsMGb5Z5zjDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+w71ShXgEnF/aVsymB9RCFbx63+qb2Aqekcjz1qr1ME8CIQCtk3+6/xOnMAGkCi2i
+PCoUdwMPLYNQ4FdTFJDX6qqPkA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der
index 3597daf2bc418d..4ab406e80d4b3a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem
index 6b6b7a5bc42c4a..8f90d2a7ac2e41 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICym1Iup++x1b0CCnI0MazVOoFTq9c9jTlqNsJmGeWgioAoGCCqGSM49
-AwEHoUQDQgAE+N/8mN+43zTZFqKaJM+owoRn6iALzZt+7xL08AKRatuEgjYh69o+
-ASAUo6Oge5s6oDefMxj6f27F2DVPijlbRQ==
+MHcCAQEEIPFB/K9XgPgVxRUoLl8BdYCBP8d/VhzNtI8jqXEe6lq4oAoGCCqGSM49
+AwEHoUQDQgAECb9b+9CY5MY6lio6osGc/P4lyZqTepcyDZDpObuzNu3+vtGCqJ+N
+788OjK6L+nQHO6DQe6FXN1rC7HQprOu9Ow==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json
index 2000ce4259092b..c76a4a88331a4e 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Valid certificate public key curve prime256v1",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a003020102020839fd38056eaf57c2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b8a77d74dfb4a3b6a01ff77220718698e228d4bdf7d48927f8208387cef440af04d31fa36331b37b92a5577be4e134d2bd2fe7b0be29f2122231453a3bb3c60da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141b38404bcd614f7f064a7082f498567ed11da286301f0603551d230418301680148072429dd85b4f19dce3532fef738dfa96a1a3d9300a06082a8648ce3d040302034800304502202b2fbcf966c323e3381051e333dfe48ae57e0015b1917ce40a29ae227bb39e85022100ade9a04cb7f28434f26b4516ae04acb931d0e1dc53363ac6163bf4546a6aa245",
-    "pai_cert": "308201bd30820164a003020102020848dac0aa7071c38d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f8dffc98dfb8df34d916a29a24cfa8c28467ea200bcd9b7eef12f4f002916adb84823621ebda3e012014a3a3a07b9b3aa0379f3318fa7f6ec5d8354f8a395b45a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604148072429dd85b4f19dce3532fef738dfa96a1a3d9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022063d438dfd189ae90cfe7d66ff5f321a03fc5b1744fa167cfc49729096902fa0002203002c2d532a6b40a52e713c47e57bc2ad9d631defffcb95857a2df5c7e91dfb3",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207776d33f3372fb13042d87bbe4f79c205f74a7835af133164a625834afeefd3f02203e0f8104061262e51e690afd67a0029e74b5b4ba05b661ee907d12afdbc9f85f",
-    "dac_private_key": "54b02c7c8af9259fb87821188f155d4b3c3c1f28e6dc8fc8061caa46fb672e4e",
-    "dac_public_key": "04b8a77d74dfb4a3b6a01ff77220718698e228d4bdf7d48927f8208387cef440af04d31fa36331b37b92a5577be4e134d2bd2fe7b0be29f2122231453a3bb3c60d"
+    "dac_cert": "308201cd30820174a003020102020825ed238592d822a1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044166246e2c188807e9360227a14be5bf38ef1f82ec760df714992471e01cd45b468f944568a38936a4e65c91928deae1930fb81f57e6176ec21925adcaf12f6ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143a27dc666bfa1dc993b3a94310488f96895227a8301f0603551d23041830168014d46deadcac961317a1569beda1b0c19be59e738c300a06082a8648ce3d040302034700304402205c63b8f2d56a34ac2f1dec80c2fe5cf010f4cf9b1d14d5be553a24a30405beb802203d523a10110eae67ffcf2b67bd0680f2994ea79dcaa5525c4a7f5248541523f0",
+    "pai_cert": "308201bf30820164a00302010202085e8a9bad8c427e84300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000409bf5bfbd098e4c63a962a3aa2c19cfcfe25c99a937a97320d90e939bbb336edfebed182a89f8defcf0e8cae8bfa74073ba0d07ba157375ac2ec7429acebbd3ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d46deadcac961317a1569beda1b0c19be59e738c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c3bd528578049c5fda56cca607d44215bc7adfea9bd80a9e91c8f3d6aaf5304f022100ad937fbaff13a73001a40a2da23c2a1477030f2d8350e057531490d7eaaa8f90",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d854c8b6a4c14cab504a6d038a4e1854e1f264fd6184a006ee3580d80225ff3e022100fcd80a6d4b462faf0f56f2048dbaf0c726f31bf21eeb6d4e7ad8b8a81afb3941",
+    "dac_private_key": "25e5e7ac8d2abbad54960ca60899a3fadc9793c9d4b11900a440556f11a28c23",
+    "dac_public_key": "044166246e2c188807e9360227a14be5bf38ef1f82ec760df714992471e01cd45b468f944568a38936a4e65c91928deae1930fb81f57e6176ec21925adcaf12f6e"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der
index 1a2a029375eb2f..b4be37aef572ce 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der
index d7032b1c6964db..f4b3f5219f3024 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem
index 79dad1dc151d7a..e8ff456c5961b1 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIMJOqpF6y40wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIIx3qxdEWprowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS2KNUGvJzCvjxykINceU9NL/djGAL6
-7QoiRPoY3Lw0JgbQpnVxbH6Ae6tNHZF+6RBYJM8ZNhXZI9/Bu6PIRmsso2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQURt3damtx7JKB
-BXjB086Asfy8IYswHwYDVR0jBBgwFoAUucrWpSOd9iHDUQZwwWoVA3JWKT4wCgYI
-KoZIzj0EAwIDSAAwRQIgD7D/Txg0RSaTVUjTcQstlhmzIM55dxlRpJiv8qT5+rMC
-IQCHHxppRDRqL+QqM6eexcE1lWxewnIGC6ljveOQcXYoQA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARSzN6e2noEa+z5UbjFJNvCSKSyTNx/
+B0aC+2wbKLc9e9bFz4V6RFd0B+2K9CpZp4o7OEsZS60nj46TDdZaWx3po2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUPSD8QLwGwFQi
+USDSs0oh60v9nLIwHwYDVR0jBBgwFoAUkD7pKnucef2zVEHTSw4PsrjsRLIwCgYI
+KoZIzj0EAwIDSAAwRQIhAO2StFhjFCddYNUQvzhMiHsJypYiYUBKO8h7wyODh8KL
+AiAdahk+OKXVxOTXkd1reZc4CK2v2RXH+tI8xNDlmeCMQA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der
index 1193c098aaadb0..a2da7d21f7ab28 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem
index 73afe22c8b0da3..803b4f3391c525 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICdnJAw9Rp9pNw9GlvHDQZnvJkMu6qM021syoI+NYjAdoAoGCCqGSM49
-AwEHoUQDQgAEtijVBrycwr48cpCDXHlPTS/3YxgC+u0KIkT6GNy8NCYG0KZ1cWx+
-gHurTR2RfukQWCTPGTYV2SPfwbujyEZrLA==
+MHcCAQEEIB0W1S8T5fjhpkkAaIKnG3vFdwxMcqYBa6mOHwBBrLn8oAoGCCqGSM49
+AwEHoUQDQgAEUszentp6BGvs+VG4xSTbwkikskzcfwdGgvtsGyi3PXvWxc+FekRX
+dAftivQqWaeKOzhLGUutJ4+Okw3WWlsd6Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der
index 8cd27f45a8d810..df4d907b851ccd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem
index b404977eebf7d7..109d79355af5ff 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBujCCAWGgAwIBAgIIQw/MBT645L8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBuzCCAWGgAwIBAgIIfAJDX8UChuwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBWMBAGByqGSM49AgEGBSuBBAAKA0IA
-BEnQeNyjKLu5quBZ7GGJ5q/XPxjj7jXlGJmsISKhKPvScOrtv3zRyj9wZ3/Wq3LB
-o6Sti1TlILO0g+Wi18Lhn/mjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBS5ytalI532IcNRBnDBahUDclYpPjAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB/d5Ys
-vz80gK38377hZJAA/P8XbQOT/vuEO6l9/+gIAQIgGaJzTjdG7KBtEUxX0IwsthL2
-WiItYGNudMAmdjqzT5k=
+BI5DQBVJOS27cySx3Y6AEAkScuMtT6JX431PpsWEiF4x8v3uf2F36r36XOwAk6FP
+M54hJ1s4Dvsnp7kvHc5fOPujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBSQPukqe5x5/bNUQdNLDg+yuOxEsjAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA7Em3
+CtprvA68ajeJGVYWOYSsTCsgnIkIKAdO3kmxhYICIGet+Nh8wr1RFzm/12PhqrF/
+1mjg8d341KnYlLPNA3qw
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der
index be539e7decddaf..b394fec4a1e21d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem
index e51039f408eaed..0483e9ee367d17 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHQCAQEEIKslfNmHqlLMobAa2IwmiCnC39fDlfRaUCmBs8LhsIOBoAcGBSuBBAAK
-oUQDQgAESdB43KMou7mq4FnsYYnmr9c/GOPuNeUYmawhIqEo+9Jw6u2/fNHKP3Bn
-f9arcsGjpK2LVOUgs7SD5aLXwuGf+Q==
+MHQCAQEEIKW+Fw3wJ8iBr6l7cJiq042uPH3hhDD5nyqk8/6eFlKkoAcGBSuBBAAK
+oUQDQgAEjkNAFUk5LbtzJLHdjoAQCRJy4y1PolfjfU+mxYSIXjHy/e5/YXfqvfpc
+7ACToU8zniEnWzgO+yenuS8dzl84+w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json
index 451d759b9db567..0d4c197d3eab33 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Invalid certificate public key curve secp256k1",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202083093aaa45eb2e34c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b628d506bc9cc2be3c7290835c794f4d2ff7631802faed0a2244fa18dcbc342606d0a675716c7e807bab4d1d917ee9105824cf193615d923dfc1bba3c8466b2ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041446dddd6a6b71ec92810578c1d3ce80b1fcbc218b301f0603551d23041830168014b9cad6a5239df621c3510670c16a15037256293e300a06082a8648ce3d040302034800304502200fb0ff4f18344526935548d3710b2d9619b320ce79771951a498aff2a4f9fab3022100871f1a6944346a2fe42a33a79ec5c135956c5ec272060ba963bde39071762840",
-    "pai_cert": "308201ba30820161a0030201020208430fcc053eb8e4bf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313056301006072a8648ce3d020106052b8104000a0342000449d078dca328bbb9aae059ec6189e6afd73f18e3ee35e51899ac2122a128fbd270eaedbf7cd1ca3f70677fd6ab72c1a3a4ad8b54e520b3b483e5a2d7c2e19ff9a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b9cad6a5239df621c3510670c16a15037256293e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207f77962cbf3f3480adfcdfbee1649000fcff176d0393fefb843ba97dffe80801022019a2734e3746eca06d114c57d08c2cb612f65a222d60636e74c026763ab34f99",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022067c907ca4d5344d2288c15fa8589c7c8bda3080649bf9f7e34c28f236699d4af022100e7755f4a20e7ed726c23637ad273d24b207c20fb94d74344a368e0877b40a4a8",
-    "dac_private_key": "2767240c3d469f69370f4696f1c34199ef26432eeaa334db5b32a08f8d62301d",
-    "dac_public_key": "04b628d506bc9cc2be3c7290835c794f4d2ff7631802faed0a2244fa18dcbc342606d0a675716c7e807bab4d1d917ee9105824cf193615d923dfc1bba3c8466b2c"
+    "dac_cert": "308201ce30820174a0030201020208231deac5d116a6ba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000452ccde9eda7a046becf951b8c524dbc248a4b24cdc7f074682fb6c1b28b73d7bd6c5cf857a44577407ed8af42a59a78a3b384b194bad278f8e930dd65a5b1de9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143d20fc40bc06c054225120d2b34a21eb4bfd9cb2301f0603551d23041830168014903ee92a7b9c79fdb35441d34b0e0fb2b8ec44b2300a06082a8648ce3d0403020348003045022100ed92b4586314275d60d510bf384c887b09ca962261404a3bc87bc3238387c28b02201d6a193e38a5d5c4e4d791dd6b79973808adafd915c7fad23cc4d0e599e08c40",
+    "pai_cert": "308201bb30820161a00302010202087c02435fc50286ec300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313056301006072a8648ce3d020106052b8104000a034200048e43401549392dbb7324b1dd8e8010091272e32d4fa257e37d4fa6c584885e31f2fdee7f6177eabdfa5cec0093a14f339e21275b380efb27a7b92f1dce5f38fba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414903ee92a7b9c79fdb35441d34b0e0fb2b8ec44b2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ec49b70ada6bbc0ebc6a37891956163984ac4c2b209c890828074ede49b18582022067adf8d87cc2bd511739bfd763e1aab17fd668e0f1ddf8d4a9d894b3cd037ab0",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100997d93cafbe9dc75bbd437842e91b433ce8d8b1d7018b6d2999beb50286d28240221009962b260124f74263e49ed4bdf240947d1796c089987b5079e3a8dbf763c0196",
+    "dac_private_key": "1d16d52f13e5f8e1a649006882a71b7bc5770c4c72a6016ba98e1f0041acb9fc",
+    "dac_public_key": "0452ccde9eda7a046becf951b8c524dbc248a4b24cdc7f074682fb6c1b28b73d7bd6c5cf857a44577407ed8af42a59a78a3b384b194bad278f8e930dd65a5b1de9"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der
index 27f1da15567edb..89385ffa520882 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der
index 016ebe730c2aae..a0b9a35183bb05 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem
index 4846c1ff63cd06..c94fa70d240504 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIAamK7x1cTdIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIZb0oEtn+N7swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASsbpZbC99s0cVg7Wpsisa0ZTjgqL+u
-1HcpY3+nqQaggtbB9P6wiF2SKZPSUrcxCNWWIVt4jkBzi7M+1aBBOJWEo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU8uE3iC3hc/uF
-lf1OiQJo0+k9DpswHwYDVR0jBBgwFoAU8e4rwqoEwPlrrEKVZyGTY6aAFEkwCgYI
-KoZIzj0EAwIDSAAwRQIhAIio3nLqXxVUnJJpoxFla3ED3ivCe09iJI5SsOuALYXA
-AiA8mw/vD7IDe/38vmwwzwEFAysv+8/oyXIVR8xfgV2QAw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQaFYdy6J+BtDnhaimTC3g61er4e+cm
+QLkotGKhwyf5J8SGhTjhwl45WrJlRfdmbmis4bm8wPkYMQUG57OeMDPFo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUlS18tFJZrRMg
+6tN69fZN+OLI8y4wHwYDVR0jBBgwFoAU2jtauoMmpbKAU9He6sosyRmlXNYwCgYI
+KoZIzj0EAwIDSAAwRQIhALYDFofaHZisfDM3ZLo8+UIOOCnEYW4rLNOgLARYreN9
+AiAA07OZrILAzhZgShH2R24Zun1PKC72v9YcUIip+g048A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der
index cd26526f364503..349c67721973cd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem
index a35cf8ef8a2290..52b7da2faed178 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJuS1bh4olkrp3dOFmmK2NJ9ZRvusqujTpXbw/F+bY2loAoGCCqGSM49
-AwEHoUQDQgAErG6WWwvfbNHFYO1qbIrGtGU44Ki/rtR3KWN/p6kGoILWwfT+sIhd
-kimT0lK3MQjVliFbeI5Ac4uzPtWgQTiVhA==
+MHcCAQEEIJgufXgcb3fs3BpKAut0juCxVgskCI5TCdjmHyBY+4TWoAoGCCqGSM49
+AwEHoUQDQgAEGhWHcuifgbQ54Wopkwt4OtXq+HvnJkC5KLRiocMn+SfEhoU44cJe
+OVqyZUX3Zm5orOG5vMD5GDEFBueznjAzxQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der
index 95e60363a7ea3b..59716bc684dc9f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem
index 74a7442e0245df..06cb8eaa0bacb3 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIIrNMi7TgqxowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIJINcet8PS9swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABKV+lGcPVClXcp55e78Sn6LUFB1VwRKtG+NM+BdxZ3yLz6cSq4uIbhhcyNN3
-KM81OPbSqtM8+icDco2gWOkZzcajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTx7ivCqgTA+WusQpVnIZNjpoAUSTAfBgNV
+A0IABOpb9gzWlLidNhrGmuxHZRfhK5w+B/7u6jSU7spauSwnu/3vXBSYPYAPBldW
+KdKnQvkfw8S2zJ0R0vzkpsOtAjyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTaO1q6gyalsoBT0d7qyizJGaVc1jAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-/10+2Rr8I6nCDGF8a7GP4YOstk9yy740F8K7zgjKJgYCIQDSgzxM/YTyjCC3BVw+
-K8DX9XepnB3Msl5iuMoU6LLAUQ==
+41N2IBiehgZDv3M1/h6tw4gk22srGrsIIW6vlYrle28CIQCcTkRF43QvZ0vEVXeJ
+KR6DKPuho9oP8pJfgh5cEJAy0A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der
index 2e7c073427b3f8..cb9c0b42fc0f01 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem
index e32128c0000ae8..2654608da86662 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDos1yoVM69iCZH1cjdT/e5yWGE16UE5JaZXkus5c2QloAoGCCqGSM49
-AwEHoUQDQgAEpX6UZw9UKVdynnl7vxKfotQUHVXBEq0b40z4F3FnfIvPpxKri4hu
-GFzI03cozzU49tKq0zz6JwNyjaBY6RnNxg==
+MHcCAQEEIChHNbFjpDcHssfz+zaQVGuVJ5qoGvHYJTsKsl/JYXQeoAoGCCqGSM49
+AwEHoUQDQgAE6lv2DNaUuJ02Gsaa7EdlF+ErnD4H/u7qNJTuylq5LCe7/e9cFJg9
+gA8GV1Yp0qdC+R/DxLbMnRHS/OSmw60CPA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json
index 409a99f9980ff1..37dea3454a72b5 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: PID in Subject field doesn't match PID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020801a98aef1d5c4dd2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d03010703420004ac6e965b0bdf6cd1c560ed6a6c8ac6b46538e0a8bfaed47729637fa7a906a082d6c1f4feb0885d922993d252b73108d596215b788e40738bb33ed5a041389584a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f2e137882de173fb8595fd4e890268d3e93d0e9b301f0603551d23041830168014f1ee2bc2aa04c0f96bac429567219363a6801449300a06082a8648ce3d040302034800304502210088a8de72ea5f15549c9269a311656b7103de2bc27b4f62248e52b0eb802d85c002203c9b0fef0fb2037bfdfcbe6c30cf0105032b2ffbcfe8c9721547cc5f815d9003",
-    "pai_cert": "308201bf30820164a003020102020822b34c8bb4e0ab1a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a57e94670f542957729e797bbf129fa2d4141d55c112ad1be34cf81771677c8bcfa712ab8b886e185cc8d37728cf3538f6d2aad33cfa2703728da058e919cdc6a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f1ee2bc2aa04c0f96bac429567219363a6801449301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100ff5d3ed91afc23a9c20c617c6bb18fe183acb64f72cbbe3417c2bbce08ca2606022100d2833c4cfd84f28c20b7055c3e2bc0d7f577a99c1dccb25e62b8ca14e8b2c051",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205018018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100889a248339a7f6c6d1956598ff270dfaef114f5d048eda82dd6ffcbea51b5a3502210080266c4d51feeac0338df36719e143f33cc96b91991c9dc86dad0db255886303",
-    "dac_private_key": "9b92d5b878a2592ba7774e16698ad8d27d651beeb2aba34e95dbc3f17e6d8da5",
-    "dac_public_key": "04ac6e965b0bdf6cd1c560ed6a6c8ac6b46538e0a8bfaed47729637fa7a906a082d6c1f4feb0885d922993d252b73108d596215b788e40738bb33ed5a041389584"
+    "dac_cert": "308201ce30820174a003020102020865bd2812d9fe37bb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d030107034200041a158772e89f81b439e16a29930b783ad5eaf87be72640b928b462a1c327f927c4868538e1c25e395ab26545f7666e68ace1b9bcc0f918310506e7b39e3033c5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414952d7cb45259ad1320ead37af5f64df8e2c8f32e301f0603551d23041830168014da3b5aba8326a5b28053d1deeaca2cc919a55cd6300a06082a8648ce3d0403020348003045022100b6031687da1d98ac7c333764ba3cf9420e3829c4616e2b2cd3a02c0458ade37d022000d3b399ac82c0ce16604a11f6476e19ba7d4f282ef6bfd61c5088a9fa0d38f0",
+    "pai_cert": "308201bf30820164a003020102020824835c7adf0f4bdb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ea5bf60cd694b89d361ac69aec476517e12b9c3e07feeeea3494eeca5ab92c27bbfdef5c14983d800f06575629d2a742f91fc3c4b6cc9d11d2fce4a6c3ad023ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414da3b5aba8326a5b28053d1deeaca2cc919a55cd6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e3537620189e860643bf7335fe1eadc38824db6b2b1abb08216eaf958ae57b6f0221009c4e4445e3742f674bc4557789291e8328fba1a3da0ff2925f821e5c109032d0",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205018018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022064e084a8343b1917a7cad97e381a530e76fc9718d4733ddc6bec5dc5ae3f0e17022100ae5865c585fda20d61ce979ccf913daa0eae335ecdd1ceffbcd2a213a95efde5",
+    "dac_private_key": "982e7d781c6f77ecdc1a4a02eb748ee0b1560b24088e5309d8e61f2058fb84d6",
+    "dac_public_key": "041a158772e89f81b439e16a29930b783ad5eaf87be72640b928b462a1c327f927c4868538e1c25e395ab26545f7666e68ace1b9bcc0f918310506e7b39e3033c5"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der
index 955eaaa4411922..1a35916f0e1e15 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der
index 586e0f07bc28d3..d17f881e239827 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem
index 12f624dcd22a30..5d2ffab81c57ed 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIEHeVG6XB7dowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjAgFw0yMjA0MjAw
+MIIBzjCCAXSgAwIBAgIIf8ziuI8CBNwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASQq3l+BkwNALllfMIPih5HNElzGeb7
-rCF8HuasmvzkcxMTkgj6ddFl159DjrqQmY1GTqFkPtdAWY6EPSoksX1Co2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUsSmLZfAw7L2m
-5ahK4LNG8YW8sgAwHwYDVR0jBBgwFoAUBU657ArGoG8nagEDRiqfaBW/omwwCgYI
-KoZIzj0EAwIDRwAwRAIgH0W/6lDKIYit4IBzA36Vwvwm43EhxiemI/GWbqBt9H0C
-IB60LgXIZXX1JF+j5RjeOa+Gqbpivff9eVb4kSjX0eYq
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASL6mZHIyJkidTMs+tm6AgVQru+1vjx
+cc7lFCeVW7k2Xd/bjqjZfzmIQGIyr63yXNTKZNKPN33UPh6QB9rCh/L8o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU7z/3NGrixu5J
+AUnKzGYqDl8DbHswHwYDVR0jBBgwFoAUmdXLe5AREtNwFOsnMmB1mnkOn2UwCgYI
+KoZIzj0EAwIDSAAwRQIgP4rJXdNl2UJQnAvDm+kgWIlO9UcWBnCaKugqPRyYjmoC
+IQCpZRtuB87eQkQlapxJMFoj4BIvq5u/Xcf4vc/y04lGrw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der
index 6dbd611d1f14d3..9cee875e7774b9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem
index 2e2e4f639d17fc..e2a9ed8351a063 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGoY7JZm4DMvo3JC+xIFQAn26yLOIJ2ZdGd8VQRt/Bw9oAoGCCqGSM49
-AwEHoUQDQgAEkKt5fgZMDQC5ZXzCD4oeRzRJcxnm+6whfB7mrJr85HMTE5II+nXR
-ZdefQ466kJmNRk6hZD7XQFmOhD0qJLF9Qg==
+MHcCAQEEIPXTFWjFqpEgb2l4hK8eDt/evQ/2laHrlSKVVSRhkQdgoAoGCCqGSM49
+AwEHoUQDQgAEi+pmRyMiZInUzLPrZugIFUK7vtb48XHO5RQnlVu5Nl3f246o2X85
+iEBiMq+t8lzUymTSjzd91D4ekAfawofy/A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der
index 0b4941fec8ae3f..14ebb5c3d2252d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem
index b4035dd99d5923..e6f59453b0a18e 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIJqhw65Q60iowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjAw
+MIIBvzCCAWSgAwIBAgIIGEjQ/SahnjswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFrYCZiYQ/rDOk1cpTmYQmS/Py+SFHy/OkMANEdzHLFkKic+AAsYz0rOxm+l
-mmfW/e9Ws3V9K3lzInt0iX+q6U6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQFTrnsCsagbydqAQNGKp9oFb+ibDAfBgNV
+A0IABBq6lN5/b1eL2Q2rY1SYaC8W4nbFb7lVJ2vbQBIwt+S0rSfuopJIPispHaJ8
+6qXzAhc1FY7UVRs9/A6FJGu7QZ2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSZ1ct7kBES03AU6ycyYHWaeQ6fZTAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-hZhZzVaF7sn2kePWeY12JDF1YhyHJY62SZfQHNrStO0CIQDIBPokVZnKqqjCFjI8
-7XtS8OsfrGQ6mN5Cqa5FwIziDw==
+jdfDjCnlGWwtKgD4GgeyS4/UmgFsVGzog4BPycTnNZICIQDTa7n22auhlg1IPknV
+toniOEOKQ/PtqXwURXpP8mHf/g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der
index 0b61acbcaee36f..2592543e33a6ce 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem
index 289d458d1c645d..9a9504d3904509 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMvP12jYFcyGgPUSdW+pZ+UD8xHHHXQVxC85tOKSASz1oAoGCCqGSM49
-AwEHoUQDQgAEWtgJmJhD+sM6TVylOZhCZL8/L5IUfL86QwA0R3McsWQqJz4ACxjP
-Ss7Gb6WaZ9b971azdX0reXMie3SJf6rpTg==
+MHcCAQEEIGn3yFbaUA+mZol8df2PoY7/Ah7zIFvbnm8yiOpMBvgwoAoGCCqGSM49
+AwEHoUQDQgAEGrqU3n9vV4vZDatjVJhoLxbidsVvuVUna9tAEjC35LStJ+6ikkg+
+KykdonzqpfMCFzUVjtRVGz38DoUka7tBnQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json
index f513af1e28bd83..8f044d5626642a 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: VID in Subject field doesn't match VID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a00302010202081077951ba5c1edda300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323020170d3232303432303030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000490ab797e064c0d00b9657cc20f8a1e4734497319e6fbac217c1ee6ac9afce47313139208fa75d165d79f438eba90998d464ea1643ed740598e843d2a24b17d42a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b1298b65f030ecbda6e5a84ae0b346f185bcb200301f0603551d23041830168014054eb9ec0ac6a06f276a0103462a9f6815bfa26c300a06082a8648ce3d040302034700304402201f45bfea50ca2188ade08073037e95c2fc26e37121c627a623f1966ea06df47d02201eb42e05c86575f5245fa3e518de39af86a9ba62bdf7fd7956f89128d7d1e62a",
-    "pai_cert": "308201bf30820164a003020102020826a870eb943ad22a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432303030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323059301306072a8648ce3d020106082a8648ce3d030107034200045ad809989843fac33a4d5ca539984264bf3f2f92147cbf3a43003447731cb1642a273e000b18cf4acec66fa59a67d6fdef56b3757d2b7973227b74897faae94ea366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414054eb9ec0ac6a06f276a0103462a9f6815bfa26c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100859859cd5685eec9f691e3d6798d76243175621c87258eb64997d01cdad2b4ed022100c804fa245599caaaa8c216323ced7b52f0eb1fac643a98de42a9ae45c08ce20f",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f2ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022062c35173cf1e5de1cc0d1628638a6328d51d3515fc9a864307b31cce4b154c550220782b47e6aef81ad40acd0c3baa9cc0684a5a65098e085d080992ac1f90e92a10",
-    "dac_private_key": "6a18ec9666e0332fa37242fb12054009f6eb22ce209d9974677c55046dfc1c3d",
-    "dac_public_key": "0490ab797e064c0d00b9657cc20f8a1e4734497319e6fbac217c1ee6ac9afce47313139208fa75d165d79f438eba90998d464ea1643ed740598e843d2a24b17d42"
+    "dac_cert": "308201ce30820174a00302010202087fcce2b88f0204dc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048bea664723226489d4ccb3eb66e8081542bbbed6f8f171cee51427955bb9365ddfdb8ea8d97f3988406232afadf25cd4ca64d28f377dd43e1e9007dac287f2fca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ef3ff7346ae2c6ee490149cacc662a0e5f036c7b301f0603551d2304183016801499d5cb7b901112d37014eb273260759a790e9f65300a06082a8648ce3d040302034800304502203f8ac95dd365d942509c0bc39be92058894ef5471606709a2ae82a3d1c988e6a022100a9651b6e07cede4244256a9c49305a23e0122fab9bbf5dc7f8bdcff2d38946af",
+    "pai_cert": "308201bf30820164a00302010202081848d0fd26a19e3b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323059301306072a8648ce3d020106082a8648ce3d030107034200041aba94de7f6f578bd90dab635498682f16e276c56fb955276bdb401230b7e4b4ad27eea292483e2b291da27ceaa5f3021735158ed4551b3dfc0e85246bbb419da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041499d5cb7b901112d37014eb273260759a790e9f65301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008dd7c38c29e5196c2d2a00f81a07b24b8fd49a016c546ce883804fc9c4e73592022100d36bb9f6d9aba1960d483e49d5b689e238438a43f3eda97c14457a4ff261dffe",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f2ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220308494c2d41f21fa850b137ae8d3b18c818e3f77cd46552799808ad7e7d791ab022024315c8f6f78530b380fab3f432f77e2723239046a03e6ac4dadbf86ceea8924",
+    "dac_private_key": "f5d31568c5aa91206f697884af1e0edfdebd0ff695a1eb952295552461910760",
+    "dac_public_key": "048bea664723226489d4ccb3eb66e8081542bbbed6f8f171cee51427955bb9365ddfdb8ea8d97f3988406232afadf25cd4ca64d28f377dd43e1e9007dac287f2fc"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der
index ac7f6b4b0c5bfe..ba3dbf3bf442ca 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der
index 9951eedcd29de1..256cafb67e1afa 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem
index c38b326ae18b4f..4318e84fe9665b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIJWSTHFoTGyIwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2jCCAYGgAwIBAgIIJQ8BuhJNXv0wCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAw
-QjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+QjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzOyyidrRoEZv
-msDnjCDyijl4ep/cBb7Hby1xEiQkCve+cFyqM6e55KG0caqvDlBPrYnVo9Hben+m
-FcqOW9q216NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFJglK6ltMcHphTlBRaOO5m9PwxU/MB8GA1UdIwQYMBaAFPJ6ElYXhG+6sk7/
-04xJjIrqOJbxMAoGCCqGSM49BAMCA0gAMEUCIE0e+bYs0PZEfw9osBSRq09pX0W6
-rPIhBZ8KoUCAw2j/AiEAhH8YNVEn/JMf+zSDy+WdA4QGRVIJNt2tBDW6/BUY8FY=
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4waCV1BAhAWt
+78SKb433Iy/dOgW1N9cbxW+9CWwH40aec9UhWOwurYe66HEtQHGWbrZrd4KGsuz0
+LvG9XVlJnKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFBK9OL690jRmiY8lfdFr7z7u/yZnMB8GA1UdIwQYMBaAFHGDWvcgqiLCZy1t
+wbrDqNbGK/N9MAoGCCqGSM49BAMCA0cAMEQCIEFIJriLRnf2vk1xFUAuzq0axPyV
+eEc+PGze+XNG9fmcAiAWfymI1uEVpcQcNHE3HFw4abrDkM64VIUeJcnOg09ODg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der
index 1e5f5e9e716688..59caf986bb91a9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem
index 25691ede042346..e1ee5656eea04b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKbPXvFnV3sAPKbkLDIOP2iEsCu0HZzuiDubnUJC7UgBoAoGCCqGSM49
-AwEHoUQDQgAEzOyyidrRoEZvmsDnjCDyijl4ep/cBb7Hby1xEiQkCve+cFyqM6e5
-5KG0caqvDlBPrYnVo9Hben+mFcqOW9q21w==
+MHcCAQEEIIhKu1RghFNS/kNj172YmDqGy3IicI14x4uL2gVhr0YkoAoGCCqGSM49
+AwEHoUQDQgAE4waCV1BAhAWt78SKb433Iy/dOgW1N9cbxW+9CWwH40aec9UhWOwu
+rYe66HEtQHGWbrZrd4KGsuz0LvG9XVlJnA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der
index c615d491a5b1bc..edbad1c3da59c3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem
index a186767fa4925b..bf2544a68ecde5 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIA5WLXoxgP1owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBzDCCAXGgAwIBAgIIBSo15jCWP34wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAwQjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAAQG22pQ7NQmEZdX2kiEcyIrekzSyjzCoceu1YSn3Fir
-mqhOdrwvm8sGV8rMF3b7VpIThocYZwhCabTN8lfu/Ggfo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8noSVheEb7qyTv/T
-jEmMiuo4lvEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSQAwRgIhAOjNEYPFrLNGPEol9t+bKbqnOasaeUWbLE8QzizKfLKcAiEA
-mktpm0BoQA3fy4YHLdpN3iM++MHK22OSilKPPa/Px80=
+PQIBBggqhkjOPQMBBwNCAAQDBQDpz5rsUCpFh6DtSYS3XrcznmjheBhsVYJHa6W0
+KLDeK7US8kzhTJXybqrAtXVEsJevlaXkgdbk+LTdjYfso2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcYNa9yCqIsJnLW3B
+usOo1sYr830wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSQAwRgIhAJ2tpEnJkDNNHvOZvOITJBjqBxpJfXU8SbFiQFH9MchEAiEA
+pHjjzDDoPiwBkwfLYtibXAIP/cD2fhFrdPHLwnr+c+U=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der
index 24589775e07298..bcb5ec9f34fb4f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem
index c2348fd8baa76a..ab2b9545360216 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAutAseWnSeHbh/IxsJpRarnRXVUGJ82+lt57ohNWHP1oAoGCCqGSM49
-AwEHoUQDQgAEBttqUOzUJhGXV9pIhHMiK3pM0so8wqHHrtWEp9xYq5qoTna8L5vL
-BlfKzBd2+1aSE4aHGGcIQmm0zfJX7vxoHw==
+MHcCAQEEINCvNYfpxhh3c3YaxdcTr9yGJ0NeeM5hOXUlbBL6AgkfoAoGCCqGSM49
+AwEHoUQDQgAEAwUA6c+a7FAqRYeg7UmEt163M55o4XgYbFWCR2ultCiw3iu1EvJM
+4UyV8m6qwLV1RLCXr5Wl5IHW5Pi03Y2H7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json
index fec0c5e72522d4..2f6f675516c753 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a00302010202082564931c5a131b22300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004ccecb289dad1a0466f9ac0e78c20f28a39787a9fdc05bec76f2d711224240af7be705caa33a7b9e4a1b471aaaf0e504fad89d5a3d1db7a7fa615ca8e5bdab6d7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041498252ba96d31c1e985394145a38ee66f4fc3153f301f0603551d23041830168014f27a125617846fbab24effd38c498c8aea3896f1300a06082a8648ce3d040302034800304502204d1ef9b62cd0f6447f0f68b01491ab4f695f45baacf221059f0aa14080c368ff022100847f18355127fc931ffb3483cbe59d03840645520936ddad0435bafc1518f056",
-    "pai_cert": "308201cc30820171a003020102020803958b5e8c603f5a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d0301070342000406db6a50ecd426119757da488473222b7a4cd2ca3cc2a1c7aed584a7dc58ab9aa84e76bc2f9bcb0657cacc1776fb56921386871867084269b4cdf257eefc681fa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f27a125617846fbab24effd38c498c8aea3896f1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e8cd1183c5acb3463c4a25f6df9b29baa739ab1a79459b2c4f10ce2cca7cb29c0221009a4b699b4068400ddfcb86072dda4dde233ef8c1cadb63928a528f3dafcfc7cd",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cf6cf48426e5ea170e6ab8d6d480e09f79371d53b988faaf6e33e0319336beb10220315948c43018d4c5ea4390911a90b4b669623fdad630a8269c79071f08f26497",
-    "dac_private_key": "a6cf5ef167577b003ca6e42c320e3f6884b02bb41d9cee883b9b9d4242ed4801",
-    "dac_public_key": "04ccecb289dad1a0466f9ac0e78c20f28a39787a9fdc05bec76f2d711224240af7be705caa33a7b9e4a1b471aaaf0e504fad89d5a3d1db7a7fa615ca8e5bdab6d7"
+    "dac_cert": "308201da30820181a0030201020208250f01ba124d5efd300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e306825750408405adefc48a6f8df7232fdd3a05b537d71bc56fbd096c07e3469e73d52158ec2ead87bae8712d4071966eb66b778286b2ecf42ef1bd5d59499ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041412bd38bebdd23466898f257dd16bef3eeeff2667301f0603551d2304183016801471835af720aa22c2672d6dc1bac3a8d6c62bf37d300a06082a8648ce3d04030203470030440220414826b88b4677f6be4d7115402ecead1ac4fc9578473e3c6cdef97346f5f99c0220167f2988d6e115a5c41c3471371c5c3869bac390ceb854851e25c9ce834f4e0e",
+    "pai_cert": "308201cc30820171a0030201020208052a35e630963f7e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004030500e9cf9aec502a4587a0ed4984b75eb7339e68e178186c5582476ba5b428b0de2bb512f24ce14c95f26eaac0b57544b097af95a5e481d6e4f8b4dd8d87eca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041471835af720aa22c2672d6dc1bac3a8d6c62bf37d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009dada449c990334d1ef399bce2132418ea071a497d753c49b1624051fd31c844022100a478e3cc30e83e2c019307cb62d89b5c020ffdc0f67e116b74f1cbc27afe73e5",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203641ad984edbc0bdf36b2143c947598a8e3b820e7bf58bf929d3f5e28757bb2a02210097c0a454560f582feb510f583b2702abb03c549fb8ae3d8aefdf3d9b35f37628",
+    "dac_private_key": "884abb5460845352fe4363d7bd98983a86cb7222708d78c78b8bda0561af4624",
+    "dac_public_key": "04e306825750408405adefc48a6f8df7232fdd3a05b537d71bc56fbd096c07e3469e73d52158ec2ead87bae8712d4071966eb66b778286b2ecf42ef1bd5d59499c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der
index 065d2501c4b43c..3b3d2b30f0f64e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der
index f3537cdc6f2ddc..ef9a48dccc52aa 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem
index 538c17533a78a7..7e500f9f72b0bb 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYGgAwIBAgIIRMPXZ3PmGeYwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB3DCCAYGgAwIBAgIIRSr32TMsfK4wCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6MDBCMSBNdmlkOkZG
-RjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+RjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDjJBlKbsn0Zy
-E76fMVrcDL/7Bt4BH/dfwxD51ruARr6nJgyQM1KTTiBa/qfUsmBeiGau3El0T2Qx
-/GDg8h0vd6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFOsEP9dm5Pcz0f24dY1LAINWw+hRMB8GA1UdIwQYMBaAFLAKSO4ly46iX5Vn
-6yrKMS+sMKZQMAoGCCqGSM49BAMCA0cAMEQCIDlqS0tY/nZ73BTw7HiwABHAJZmX
-oxkiSvvglBdRWYA1AiA3xfwqOCN8vy2MVpLdxal6Q8whAcpXlCa1sxcy/D7EeQ==
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEjTyZCFWvDPDc
+iPHH2E9kUVUp0mv/OFnUqA/xtpOngOAQLUzszB8BGoD7zhvB0mIbgA6sL1fqz3y2
+H/cQRwQdLKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFIpaTyaLLTgVyg6MTN9PjilFsH9PMB8GA1UdIwQYMBaAFNIp6YRrCiX6XLQM
+/auOI7y02UAvMAoGCCqGSM49BAMCA0kAMEYCIQDVDtvd6eHSye6MYsfrvJwbusNs
+62b44pltj24nz/ZxaAIhAJEIL5AfbF8DnIqqXO6Z5EraBcLI9d+6qhzBuE0/4zjV
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der
index 605662e7d86f5a..3a0e00a7731926 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem
index 6a9d99bdbd09af..30574de7c23f88 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC5W9Q79UVpUu0Hs+bOwDxiFyK4PqgvYYrE5eT6y6U5koAoGCCqGSM49
-AwEHoUQDQgAEDjJBlKbsn0ZyE76fMVrcDL/7Bt4BH/dfwxD51ruARr6nJgyQM1KT
-TiBa/qfUsmBeiGau3El0T2Qx/GDg8h0vdw==
+MHcCAQEEIFSg7brMRus0m10zqYtzel9jf5wcDcT0tzzYJ4GfP4LfoAoGCCqGSM49
+AwEHoUQDQgAEjTyZCFWvDPDciPHH2E9kUVUp0mv/OFnUqA/xtpOngOAQLUzszB8B
+GoD7zhvB0mIbgA6sL1fqz3y2H/cQRwQdLA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der
index e3ef2c59806e7e..875966b6e473ad 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem
index f991b111a24358..5b1172dc2ffcdd 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByzCCAXGgAwIBAgIIaA2BrelEAHQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIByjCCAXGgAwIBAgIIcRGsn3kMJNMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6MDBCMSBNdmlkOkZGRjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAARFYW4gYKDnKFbkSOfIFmM3MnEptgOh1xk9Gt4MxLwR
-mJ4W5IvEdbx6VSK7aB72QTeBrXtASPGbKVUqXX6k0y4zo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUsApI7iXLjqJflWfr
-KsoxL6wwplAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSAAwRQIgP4xhZR9SMTgihef6DXpjxCL7B9iWtRu+wOHS3X/wPrgCIQCH
-MHjxq4XL0pRlfDS2WHID0ObJhyvetJ2aoXZFcKlamA==
+PQIBBggqhkjOPQMBBwNCAAQEW8fuxTDaFRIaGXuClhlDrJE7eekrRD6sxMoSWcOv
+vBCxG/7HWvJb9/J8jleBmOzaupkSddyKdmgATxlWfBOoo2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0inphGsKJfpctAz9
+q44jvLTZQC8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDRwAwRAIgF2lB0p7YK9sDrCF4n82DaWVO5InosE7aN24c0ABhkkcCIAI3
+/i/w4TUDlsuxgpJajEKM0R1FmCdANUsgzSWALxL7
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der
index 8a6011fadfdc07..ef8797c003990f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem
index 0f4a052627fb5e..f3bc7e97a14829 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMwXelSwd1QCXyTg9c6Qu1lZxeUMJcvCnQ2laZMOQGF4oAoGCCqGSM49
-AwEHoUQDQgAERWFuIGCg5yhW5EjnyBZjNzJxKbYDodcZPRreDMS8EZieFuSLxHW8
-elUiu2ge9kE3ga17QEjxmylVKl1+pNMuMw==
+MHcCAQEEIOS2J5rx6Y6X27GgiuTcd5WVPgt/SIqLqHaEwPlYbyi0oAoGCCqGSM49
+AwEHoUQDQgAEBFvH7sUw2hUSGhl7gpYZQ6yRO3npK0Q+rMTKElnDr7wQsRv+x1ry
+W/fyfI5XgZjs2rqZEnXcinZoAE8ZVnwTqA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json
index ecea932cea0169..ab5edb61f2e233 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201da30820181a003020102020844c3d76773e619e6300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040e324194a6ec9f467213be9f315adc0cbffb06de011ff75fc310f9d6bb8046bea7260c903352934e205afea7d4b2605e8866aedc49744f6431fc60e0f21d2f77a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414eb043fd766e4f733d1fdb8758d4b008356c3e851301f0603551d23041830168014b00a48ee25cb8ea25f9567eb2aca312fac30a650300a06082a8648ce3d04030203470030440220396a4b4b58fe767bdc14f0ec78b00011c0259997a319224afbe0941751598035022037c5fc2a38237cbf2d8c5692ddc5a97a43cc2101ca579426b5b31732fc3ec479",
-    "pai_cert": "308201cb30820171a0030201020208680d81ade9440074300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000445616e2060a0e72856e448e7c8166337327129b603a1d7193d1ade0cc4bc11989e16e48bc475bc7a5522bb681ef6413781ad7b4048f19b29552a5d7ea4d32e33a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414b00a48ee25cb8ea25f9567eb2aca312fac30a650301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203f8c61651f5231382285e7fa0d7a63c422fb07d896b51bbec0e1d2dd7ff03eb8022100873078f1ab85cbd294657c34b6587203d0e6c9872bdeb49d9aa1764570a95a98",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022029431f456f6300daa80ee3ed50efeeae7859c60e359a5747e3382581bc2e6975022100a880db22d4ab21c0ce31d1151fcabc94dcc84c7b0559c141628eaa8795254b93",
-    "dac_private_key": "2e56f50efd515a54bb41ecf9b3b00f1885c8ae0faa0bd862b139793eb2e94e64",
-    "dac_public_key": "040e324194a6ec9f467213be9f315adc0cbffb06de011ff75fc310f9d6bb8046bea7260c903352934e205afea7d4b2605e8866aedc49744f6431fc60e0f21d2f77"
+    "dac_cert": "308201dc30820181a0030201020208452af7d9332c7cae300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200048d3c990855af0cf0dc88f1c7d84f64515529d26bff3859d4a80ff1b693a780e0102d4ceccc1f011a80fbce1bc1d2621b800eac2f57eacf7cb61ff71047041d2ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148a5a4f268b2d3815ca0e8c4cdf4f8e2945b07f4f301f0603551d23041830168014d229e9846b0a25fa5cb40cfdab8e23bcb4d9402f300a06082a8648ce3d0403020349003046022100d50edbdde9e1d2c9ee8c62c7ebbc9c1bbac36ceb66f8e2996d8f6e27cff6716802210091082f901f6c5f039c8aaa5cee99e44ada05c2c8f5dfbaaa1cc1b84d3fe338d5",
+    "pai_cert": "308201ca30820171a00302010202087111ac9f790c24d3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004045bc7eec530da15121a197b82961943ac913b79e92b443eacc4ca1259c3afbc10b11bfec75af25bf7f27c8e578198ecdaba991275dc8a7668004f19567c13a8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d229e9846b0a25fa5cb40cfdab8e23bcb4d9402f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220176941d29ed82bdb03ac21789fcd8369654ee489e8b04eda376e1cd00061924702200237fe2ff0e1350396cbb182925a8c428cd11d45982740354b20cd25802f12fb",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206b74df493b9ca0a065479875a6683fddbcdcd970a49993c077d86e382f01fafb022100e53d990f06e9e5346af91282e79127a66888fb917b008c5f356d753d2da514af",
+    "dac_private_key": "54a0edbacc46eb349b5d33a98b737a5f637f9c1c0dc4f4b73cd827819f3f82df",
+    "dac_public_key": "048d3c990855af0cf0dc88f1c7d84f64515529d26bff3859d4a80ff1b693a780e0102d4ceccc1f011a80fbce1bc1d2621b800eac2f57eacf7cb61ff71047041d2c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der
index 5b676aa358cc7f..a71e397cbfe623 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der
index 0a7182f9b4a47a..a9a061b9fb7dfa 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem
index 65d5cc54515508..fc8d197df5f048 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYGgAwIBAgIIdhrM0vpKbn4wCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2zCCAYGgAwIBAgIIbDoRHJptM2owCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 TXBpZDowMEIxLEFDTUUgTWF0dGVyIERldmVsIFBBSSA1Q0RBOTg5OSxNdmlkOkZG
-RjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+RjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY+o/ejueqTD3
-OlD9FbhWiS2td/6GzvnyS1paOqxYb1EOBgvEih75iIveqScrbumVRPL5Y8FSShms
-dSPhauQ2GqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFABv5OT3JDNw26+XIvMRT0x0NUnAMB8GA1UdIwQYMBaAFGfHAhJMp+BHhrbb
-5dgW4v3TrAI9MAoGCCqGSM49BAMCA0cAMEQCIEF4S2EQ7r3chtxfD/nmvrOFHDZL
-FKWKk4eViSTUt6O9AiB2w0NXSmp2ODVJ8LZcZ2KX124l1OwWhCsa2mx7UFMI6w==
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5kNRKFkgTVQm
+lUUEFFlT6h4qpmRpy5FlOMyuMLxZThDuXaWWj/E09ynFU+hFi7KUHdpG/UFWrSLP
+n/b/jvtJ/qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFOuM5KrFBj5dJiV+CSpzNatWObLKMB8GA1UdIwQYMBaAFLX14b8OX7PZoJhn
+u1VQn9EATW9PMAoGCCqGSM49BAMCA0gAMEUCIQChMDDz6QHZpNj66XGAHmyRHv2M
+z63+FY0r8sX3xmr9IQIgfQexyUtDCUJsDe7hHyx8wtzU5Bdn8KMGzbc+f1s/fr4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der
index 33787ace308dcf..a2b5af1a133871 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem
index ecabcc51aa1634..e4c07e96784a9c 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJk13nv5gcRvSc8DoKdKGSW3bEWQtOCcsQVaa4neYrVsoAoGCCqGSM49
-AwEHoUQDQgAEY+o/ejueqTD3OlD9FbhWiS2td/6GzvnyS1paOqxYb1EOBgvEih75
-iIveqScrbumVRPL5Y8FSShmsdSPhauQ2Gg==
+MHcCAQEEILoI1YGd8tA5tymjFpeE+8CF4jlV/M4cKbCDxxhfGUrnoAoGCCqGSM49
+AwEHoUQDQgAE5kNRKFkgTVQmlUUEFFlT6h4qpmRpy5FlOMyuMLxZThDuXaWWj/E0
+9ynFU+hFi7KUHdpG/UFWrSLPn/b/jvtJ/g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der
index 67f8b2700e3ffa..dbc422480bac19 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem
index fd49f7170fd0e7..e5127c6c9a1fc2 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIbtFAKVfeaS0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBzDCCAXGgAwIBAgIIUrZHsnmd2zMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyTXBpZDowMEIxLEFD
 TUUgTWF0dGVyIERldmVsIFBBSSA1Q0RBOTg5OSxNdmlkOkZGRjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAATgYZeGkDKGF/WkNylbIDtlDeePCsRWgcy1ajH+1s9h
-4rPu3G1F8X9agzpwbwQucmikZ4MFESoP/xcqaXf/cVVgo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUZ8cCEkyn4EeGttvl
-2Bbi/dOsAj0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSQAwRgIhALZ2x5tTVUge/r17tB8h6MYvvYwNwFNor1h96pU9la4MAiEA
-/dp4DAz182k5O/0mMRxE+ph142zz6YqeKYTi44BAAG8=
+PQIBBggqhkjOPQMBBwNCAARkuAa9PJkZo620a8oOmVu1pansHve4FJCi3umwiHZG
+VA8zSsiq0N3hqkEL/v1BI6Dg4s4jGgQCnmeMZY7IKMgyo2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtfXhvw5fs9mgmGe7
+VVCf0QBNb08wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSQAwRgIhAJnk/HPwTyTuphvB5DN8i0uBtNLLDw8rQDAsEsYIuqvAAiEA
+7aNv6ZQmjGd1X7KknM1CrszJ9PgAG5vdpc1Vdl7cMac=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der
index fed6e7d37092ad..58b48f76f0ed23 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem
index 80fc4e7291dd3e..dcca4efe6089b8 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFVYA7mysZJF6hirtCnAsGw1xkTv+OdQudwmHzy9o9WhoAoGCCqGSM49
-AwEHoUQDQgAE4GGXhpAyhhf1pDcpWyA7ZQ3njwrEVoHMtWox/tbPYeKz7txtRfF/
-WoM6cG8ELnJopGeDBREqD/8XKml3/3FVYA==
+MHcCAQEEILTt50iAKSuvk860mMsWk89YIDh6UtGbR8AXH121Cez6oAoGCCqGSM49
+AwEHoUQDQgAEZLgGvTyZGaOttGvKDplbtaWp7B73uBSQot7psIh2RlQPM0rIqtDd
+4apBC/79QSOg4OLOIxoEAp5njGWOyCjIMg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json
index cf61bfb1b5b094..9ef2e60ee03f5b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid example showing that order or separators are not considered at all for the overall validity of the embedded fields",
     "is_success_case": "true",
-    "dac_cert": "308201da30820181a0030201020208761accd2fa4a6e7e300a06082a8648ce3d040302303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000463ea3f7a3b9ea930f73a50fd15b856892dad77fe86cef9f24b5a5a3aac586f510e060bc48a1ef9888bdea9272b6ee99544f2f963c1524a19ac7523e16ae4361aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414006fe4e4f7243370dbaf9722f3114f4c743549c0301f0603551d2304183016801467c702124ca7e04786b6dbe5d816e2fdd3ac023d300a06082a8648ce3d0403020347003044022041784b6110eebddc86dc5f0ff9e6beb3851c364b14a58a9387958924d4b7a3bd022076c343574a6a76383549f0b65c676297d76e25d4ec16842b1ada6c7b505308eb",
-    "pai_cert": "308201cc30820171a00302010202086ed1402957de692d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e061978690328617f5a437295b203b650de78f0ac45681ccb56a31fed6cf61e2b3eedc6d45f17f5a833a706f042e7268a4678305112a0fff172a6977ff715560a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041467c702124ca7e04786b6dbe5d816e2fdd3ac023d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b676c79b5355481efebd7bb41f21e8c62fbd8c0dc05368af587dea953d95ae0c022100fdda780c0cf5f369393bfd26311c44fa9875e36cf3e98a9e2984e2e38040006f",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221009c5b3aaf0d6b791fc2e6a0bff4d2a89a1a4cc6a26dc2e0170251770abedeed15022100a6eb35c80095141e1313aaa533af268fd85e33d7a9622fa609447a34ce1cb166",
-    "dac_private_key": "9935de7bf981c46f49cf03a0a74a1925b76c4590b4e09cb1055a6b89de62b56c",
-    "dac_public_key": "0463ea3f7a3b9ea930f73a50fd15b856892dad77fe86cef9f24b5a5a3aac586f510e060bc48a1ef9888bdea9272b6ee99544f2f963c1524a19ac7523e16ae4361a"
+    "dac_cert": "308201db30820181a00302010202086c3a111c9a6d336a300a06082a8648ce3d040302303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e643512859204d5426954504145953ea1e2aa66469cb916538ccae30bc594e10ee5da5968ff134f729c553e8458bb2941dda46fd4156ad22cf9ff6ff8efb49fea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414eb8ce4aac5063e5d26257e092a7335ab5639b2ca301f0603551d23041830168014b5f5e1bf0e5fb3d9a09867bb55509fd1004d6f4f300a06082a8648ce3d0403020348003045022100a13030f3e901d9a4d8fae971801e6c911efd8ccfadfe158d2bf2c5f7c66afd2102207d07b1c94b4309426c0deee11f2c7cc2dcd4e41767f0a306cdb73e7f5b3f7ebe",
+    "pai_cert": "308201cc30820171a003020102020852b647b2799ddb33300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000464b806bd3c9919a3adb46bca0e995bb5a5a9ec1ef7b81490a2dee9b0887646540f334ac8aad0dde1aa410bfefd4123a0e0e2ce231a04029e678c658ec828c832a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b5f5e1bf0e5fb3d9a09867bb55509fd1004d6f4f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210099e4fc73f04f24eea61bc1e4337c8b4b81b4d2cb0f0f2b40302c12c608baabc0022100eda36fe994268c67755fb2a49ccd42aeccc9f4f8001b9bdda5cd55765edc31a7",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502204d6e869077f79342614d874ef913fce673120a24f025318379d62a42910d8e1e022100ff315391ac8bd063c2c7ce0d998fd2e9d5a3aa25b88709e978a4620cbe7ca19e",
+    "dac_private_key": "ba08d5819df2d039b729a3169784fbc085e23955fcce1c29b083c7185f194ae7",
+    "dac_public_key": "04e643512859204d5426954504145953ea1e2aa66469cb916538ccae30bc594e10ee5da5968ff134f729c553e8458bb2941dda46fd4156ad22cf9ff6ff8efb49fe"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der
index d9a64470e1f146..3cb845a2758347 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der
index 0fc1b56b0e9bea..12639edaf79e2a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem
index 375b53b19ae085..ce4ffc10dab7d7 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2TCCAYCgAwIBAgIISz4jQKYEhbQwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
+MIIB2jCCAYCgAwIBAgIIHTvu4E8T1MwwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMU1waWQ6MDBC
-MTAgFw0yMjA0MjYwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
+MTAgFw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARCAbHwhHx7NO8a
-9G4t5iOaZO1eUk0rCp6JqN7cg5aDt9zP7SZ2WFrEv2K0xbGcgYFFMQDj08e6fjKN
-PNGySW/Mo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQU907/Shbf8N6a20JgWZm6Z7BYdqYwHwYDVR0jBBgwFoAUUeeFcbyYiKv+h14B
-93huj1U9Ns4wCgYIKoZIzj0EAwIDRwAwRAIgK02xc0Jn2M/SzQ4AqfZNPyVGN3D0
-9NFOp3yeyCaAnQcCIA9D+lyVsl8PIAPjo84WtJgbl6i4cYHN5NsadEDOnxUD
+gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQC4PoBPFEAD61c
+FSCV7xdu8EFql3lY05+t+Ae/ZPPNIsy1A0SlboBFkqW1QKuTFSrkxvzeT3PZAzEl
+0udUDXCBo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQUoU/d6L2t24YSYJHk4dMqmF3vdocwHwYDVR0jBBgwFoAUbE46IDCwBpmp2bc3
+Kzd5A0NTKT4wCgYIKoZIzj0EAwIDSAAwRQIgBgJ4fRZfj2saAxFbxubxONRT0/BO
+hbrc2j4C68/dN7QCIQDwGpJrnFvgAPi7dx1LMt8/bt/2humvZxwGEQkYUTytyA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der
index b07ed544a57b5e..83a6caba98a9c5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem
index 80e11d941da0b1..9d6b8a062aa6c8 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOlvBBNBR3y0HvqHT8HxORxc1vmLKyZXUh20aAUqt3aqoAoGCCqGSM49
-AwEHoUQDQgAEQgGx8IR8ezTvGvRuLeYjmmTtXlJNKwqeiaje3IOWg7fcz+0mdlha
-xL9itMWxnIGBRTEA49PHun4yjTzRsklvzA==
+MHcCAQEEIBSUU08XVU3a47XNtiMpJKEvYggzg+8sH+8HgGx35jnloAoGCCqGSM49
+AwEHoUQDQgAEAuD6ATxRAA+tXBUgle8XbvBBapd5WNOfrfgHv2TzzSLMtQNEpW6A
+RZKltUCrkxUq5Mb83k9z2QMxJdLnVA1wgQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der
index 05dac3e5c03328..d0f69e485315aa 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem
index fc684df5c03c8a..c7512914151fac 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXCgAwIBAgIICYnn4yHkPDIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIByjCCAXCgAwIBAgIIFOLcZBy+5tYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPDE6MDgGA1UEAwwxQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMU1waWQ6MDBCMTBZMBMGByqGSM49
-AgEGCCqGSM49AwEHA0IABHsdr5vAG9ATHJW5aFmVP3DXJerjmyIda2XomjZBa0bK
-8KV1jaoneQDW6vRVMbiu4wy0HOYTK5K4zFCAXCv/6VmjZjBkMBIGA1UdEwEB/wQI
-MAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRR54VxvJiIq/6HXgH3
-eG6PVT02zjAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
-PQQDAgNIADBFAiEAwWiVk5YtfnnU6IlZ2EdAznVf7HfkEqFdL4o1Xuk4GNQCIGps
-DQ2ATk1yWPOy0rpE/hOwm+B2I4MTlM8dPK48lQLm
+AgEGCCqGSM49AwEHA0IABBpwCLkuV61oc43ZyTvNEfZaM1QSp4tPs0NQkYyEIXY5
+oQYkkxFl+fx/QB7/uoxVCXzoY9/jVvVxdVfoFCQzq4GjZjBkMBIGA1UdEwEB/wQI
+MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRsTjogMLAGmanZtzcr
+N3kDQ1MpPjAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
+PQQDAgNIADBFAiBfhmPZdDcVaxj1ZT5idjUa3upFaIAePFEEfWQXddC8rwIhAKAI
+/Jm2gDTPaEElgffXpGi46kGpuLcwPUsPD45GDez4
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der
index a1fdb37a2ddd4a..8265546c7e85d5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem
index 551c68e53d42af..c45b0b536a15dd 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICShO6KDwKb7mREJnZFruaMQ1PSTwhe+Q+SHvcQKtWrkoAoGCCqGSM49
-AwEHoUQDQgAEex2vm8Ab0BMclbloWZU/cNcl6uObIh1rZeiaNkFrRsrwpXWNqid5
-ANbq9FUxuK7jDLQc5hMrkrjMUIBcK//pWQ==
+MHcCAQEEIPnf8aTRS4hrKdMGL7VOPPx2emNjUAynRwomOpEstu2hoAoGCCqGSM49
+AwEHoUQDQgAEGnAIuS5XrWhzjdnJO80R9lozVBKni0+zQ1CRjIQhdjmhBiSTEWX5
+/H9AHv+6jFUJfOhj3+NW9XF1V+gUJDOrgQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json
index 63a61008e06485..5bc5d706bdb173 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid, but less readable",
     "is_success_case": "true",
-    "dac_cert": "308201d930820180a00302010202084b3e2340a60485b4300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044201b1f0847c7b34ef1af46e2de6239a64ed5e524d2b0a9e89a8dedc839683b7dccfed2676585ac4bf62b4c5b19c8181453100e3d3c7ba7e328d3cd1b2496fcca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f74eff4a16dff0de9adb42605999ba67b05876a6301f0603551d2304183016801451e78571bc9888abfe875e01f7786e8f553d36ce300a06082a8648ce3d040302034700304402202b4db1734267d8cfd2cd0e00a9f64d3f25463770f4f4d14ea77c9ec826809d0702200f43fa5c95b25f0f2003e3a3ce16b4981b97a8b87181cde4db1a7440ce9f1503",
-    "pai_cert": "308201ca30820170a00302010202080989e7e321e43c32300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200047b1daf9bc01bd0131c95b96859953f70d725eae39b221d6b65e89a36416b46caf0a5758daa277900d6eaf45531b8aee30cb41ce6132b92b8cc50805c2bffe959a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041451e78571bc9888abfe875e01f7786e8f553d36ce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c1689593962d7e79d4e88959d84740ce755fec77e412a15d2f8a355ee93818d402206a6c0d0d804e4d7258f3b2d2ba44fe13b09be07623831394cf1d3cae3c9502e6",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022051705b5e1cafae17429cab045bd72ddeb367c42fb0885db889f31f4173f7c7ff02205588e0de8417d085581ad20b8356f8eee2be0b43915e5754676585332d25d244",
-    "dac_private_key": "e96f041341477cb41efa874fc1f1391c5cd6f98b2b2657521db468052ab776aa",
-    "dac_public_key": "044201b1f0847c7b34ef1af46e2de6239a64ed5e524d2b0a9e89a8dedc839683b7dccfed2676585ac4bf62b4c5b19c8181453100e3d3c7ba7e328d3cd1b2496fcc"
+    "dac_cert": "308201da30820180a00302010202081d3beee04f13d4cc300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000402e0fa013c51000fad5c152095ef176ef0416a977958d39fadf807bf64f3cd22ccb50344a56e804592a5b540ab93152ae4c6fcde4f73d9033125d2e7540d7081a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a14fdde8bdaddb86126091e4e1d32a985def7687301f0603551d230418301680146c4e3a2030b00699a9d9b7372b3779034353293e300a06082a8648ce3d040302034800304502200602787d165f8f6b1a03115bc6e6f138d453d3f04e85badcda3e02ebcfdd37b4022100f01a926b9c5be000f8bb771d4b32df3f6edff686e9af671c06110918513cadc8",
+    "pai_cert": "308201ca30820170a003020102020814e2dc641cbee6d6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200041a7008b92e57ad68738dd9c93bcd11f65a335412a78b4fb34350918c84217639a10624931165f9fc7f401effba8c55097ce863dfe356f5717557e8142433ab81a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146c4e3a2030b00699a9d9b7372b3779034353293e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205f8663d97437156b18f5653e6276351adeea4568801e3c51047d641775d0bcaf022100a008fc99b68034cf68412581f7d7a468b8ea41a9b8b7303d4b0f0f8e460decf8",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b8c4643d9fce2dd67e314ec2f941716e5c7ba57a2d29d001f49626bc89e63eff02210085890e9a0b49f6c43ee73b84cd32d7e753ed2660ac6363f8d16857186b48c524",
+    "dac_private_key": "1494534f17554ddae3b5cdb6232924a12f62083383ef2c1fef07806c77e639e5",
+    "dac_public_key": "0402e0fa013c51000fad5c152095ef176ef0416a977958d39fadf807bf64f3cd22ccb50344a56e804592a5b540ab93152ae4c6fcde4f73d9033125d2e7540d7081"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der
index 56471dc1fe00ad..0da9fe3f6fda79 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der
index 95a09623105aed..307702f3cd8086 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem
index 5b75f40191d7b6..c649e70e5276c3 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2TCCAX+gAwIBAgIIEfL1+DrVPVQwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
+MIIB2jCCAX+gAwIBAgIIMTHLnqc7KtwwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
 TXZpZDpGRkYxQUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREFNcGlkOjAwQjE5ODk5
-MCAXDTIyMDQyNjAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
+MCAXDTIyMDUyNzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
 YXR0ZXIgVGVzdCBEQUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGC
-onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDeVSKUQ2yaplw8e
-vf9z+TEOE+c25KtzyJaucM2DG4uyGcAOq2cHt7Tz9qPkJ03AYgNYcQvCxUL6pJnw
-JOoqsbWjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBTUmfe6+pbulJkh/Y0okYw8Kv3uzTAfBgNVHSMEGDAWgBSWPHCs3Kw9sqkA2vwY
-9X+TH6bV5TAKBggqhkjOPQQDAgNIADBFAiEAvO868ML1Qewl5ZK6lFdMU73P8znD
-7JfXJzQmHepasAkCIHehY+G4puEqWSXe69P17d4SvuRjo+UoYicIWHoBAqjF
+onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKYYBnH5BzT+PZ0c
+GeybkppHaxMDdGXuKmV0DNdXeQG6hCs+/VA9KQ78ckLFpB8Qjbydh2+yi3nDg8GO
+zQTOHgejYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBQDRaPFCi7wYpbbgOzstWXbzwItbzAfBgNVHSMEGDAWgBRtslzJ0jVUrEx6xCd1
+XteDf1RsxjAKBggqhkjOPQQDAgNJADBGAiEAn1ADcoOQ+ptfyZzZCVd37OZaGIH+
+kesu056Axpmg/jsCIQDzvDD3uggyPyWxT2yFXDdEMreR7BKow8+6ZMIukKQoKA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der
index 49fcc40d7a69f8..b5a1d070b2ce25 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem
index c1f5192be5a7ac..b53874b648ec73 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBwpRFRQYqwOjz4b1m1YzF1vkZ5TAgBl5Hf1QmuvCbTXoAoGCCqGSM49
-AwEHoUQDQgAEN5VIpRDbJqmXDx69/3P5MQ4T5zbkq3PIlq5wzYMbi7IZwA6rZwe3
-tPP2o+QnTcBiA1hxC8LFQvqkmfAk6iqxtQ==
+MHcCAQEEII+TfDePW4dqeNJDbjnPe3OKW95WU16SRbI16rDGCtrtoAoGCCqGSM49
+AwEHoUQDQgAEphgGcfkHNP49nRwZ7JuSmkdrEwN0Ze4qZXQM11d5AbqEKz79UD0p
+DvxyQsWkHxCNvJ2Hb7KLecODwY7NBM4eBw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der
index 93f3039c7540f3..cc20356b470f20 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem
index bfc3e26709415c..d902ce0eb2bef6 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByTCCAW+gAwIBAgIIdiAuwg211FAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIByTCCAW+gAwIBAgIIPIl8dQhlBTcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOzE5MDcGA1UEAwwwTXZpZDpGRkYxQUNN
 RSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREFNcGlkOjAwQjE5ODk5MFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAErqaQ/uwmeO9WtSa3g6YEqaCctdijwIpzo4VU1+DCWtzh
-RfkkmhGLYigiSPXJQ9K3kDGCidRL7uN8HaHq88h0AaNmMGQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJY8cKzcrD2yqQDa/Bj1
-f5MfptXlMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
-BAMCA0gAMEUCIQCivuV+LZzohupspr6cF06bxLnKzXr6Avkq4S/G4ZA92AIgUXDx
-E5fjIZRlFudPyi1K1UHqDlUU2ARAnB3x+KK1wMs=
+AQYIKoZIzj0DAQcDQgAEF2boa2yrvHNUYZrtJG5RTkk/v5pT7IpESKLCPzE4T9AY
+ij7cFG0ttCoy6jqvD2BdnVhFJIuplueHZrOKQcENjaNmMGQwEgYDVR0TAQH/BAgw
+BgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFG2yXMnSNVSsTHrEJ3Ve
+14N/VGzGMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
+BAMCA0gAMEUCIQCpSX/8rRS4RoAURl/lY4LAnBZa3kPka1fl0R/gBKEEZAIgcjsj
+DUGHTXJgW5P/J8ZCBDCF43ZPFNO2IKtMD/88AZc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der
index ded399851d776a..5e2bcf4522cf1c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem
index c0053bd9f7291a..10e24c97236984 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPPx1XNMIlV3hJC6GMLwyPIh4c8xMIgnBUnbThesSOE5oAoGCCqGSM49
-AwEHoUQDQgAErqaQ/uwmeO9WtSa3g6YEqaCctdijwIpzo4VU1+DCWtzhRfkkmhGL
-YigiSPXJQ9K3kDGCidRL7uN8HaHq88h0AQ==
+MHcCAQEEIA2XQ+zhAFaCqVeYrHvGgcFAmJDj4NFW+nASQQ8Kv6eyoAoGCCqGSM49
+AwEHoUQDQgAEF2boa2yrvHNUYZrtJG5RTkk/v5pT7IpESKLCPzE4T9AYij7cFG0t
+tCoy6jqvD2BdnVhFJIuplueHZrOKQcENjQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json
index 8be57ef22b8665..2ebbfae63188cd 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid, but highly discouraged, since embedding of substrings within other substrings may be confusing to human readers",
     "is_success_case": "true",
-    "dac_cert": "308201d93082017fa003020102020811f2f5f83ad53d54300a06082a8648ce3d040302303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004379548a510db26a9970f1ebdff73f9310e13e736e4ab73c896ae70cd831b8bb219c00eab6707b7b4f3f6a3e4274dc0620358710bc2c542faa499f024ea2ab1b5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d499f7bafa96ee949921fd8d28918c3c2afdeecd301f0603551d23041830168014963c70acdcac3db2a900dafc18f57f931fa6d5e5300a06082a8648ce3d0403020348003045022100bcef3af0c2f541ec25e592ba94574c53bdcff339c3ec97d72734261dea5ab009022077a163e1b8a6e12a5925deebd3f5edde12bee463a3e528622708587a0102a8c5",
-    "pai_cert": "308201c93082016fa003020102020876202ec20db5d450300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d03010703420004aea690feec2678ef56b526b783a604a9a09cb5d8a3c08a73a38554d7e0c25adce145f9249a118b62282248f5c943d2b790318289d44beee37c1da1eaf3c87401a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414963c70acdcac3db2a900dafc18f57f931fa6d5e5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a2bee57e2d9ce886ea6ca6be9c174e9bc4b9cacd7afa02f92ae12fc6e1903dd802205170f11397e321946516e74fca2d4ad541ea0e5514d804409c1df1f8a2b5c0cb",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100987cc5f60c64e2e2f7293d7a86c67b4e8adc169364eb20ccb99412fe80624562022100d0a5f78a6088a5f829637e9e21dc3c7ed81a2b4056264e7105a9b7136410126a",
-    "dac_private_key": "1c2944545062ac0e8f3e1bd66d58cc5d6f919e53020065e477f5426baf09b4d7",
-    "dac_public_key": "04379548a510db26a9970f1ebdff73f9310e13e736e4ab73c896ae70cd831b8bb219c00eab6707b7b4f3f6a3e4274dc0620358710bc2c542faa499f024ea2ab1b5"
+    "dac_cert": "308201da3082017fa00302010202083131cb9ea73b2adc300a06082a8648ce3d040302303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a6180671f90734fe3d9d1c19ec9b929a476b13037465ee2a65740cd7577901ba842b3efd503d290efc7242c5a41f108dbc9d876fb28b79c383c18ecd04ce1e07a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140345a3c50a2ef06296db80ececb565dbcf022d6f301f0603551d230418301680146db25cc9d23554ac4c7ac427755ed7837f546cc6300a06082a8648ce3d04030203490030460221009f5003728390fa9b5fc99cd9095777ece65a1881fe91eb2ed39e80c699a0fe3b022100f3bc30f7ba08323f25b14f6c855c374432b791ec12a8c3cfba64c22e90a42828",
+    "pai_cert": "308201c93082016fa00302010202083c897c7508650537300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d030107034200041766e86b6cabbc7354619aed246e514e493fbf9a53ec8a4448a2c23f31384fd0188a3edc146d2db42a32ea3aaf0f605d9d5845248ba996e78766b38a41c10d8da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146db25cc9d23554ac4c7ac427755ed7837f546cc6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a9497ffcad14b8468014465fe56382c09c165ade43e46b57e5d11fe004a104640220723b230d41874d72605b93ff27c642043085e3764f14d3b620ab4c0fff3c0197",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220330309fb1ee5265b6dc996c28e9468a38d3bc6c3ea4b38d20d60f4c71dcf8f1b022100ba156574d72cfdbda2707924b2f9d87bfbefaf057a815f7c2e98bd51431f6867",
+    "dac_private_key": "8f937c378f5b876a78d2436e39cf7b738a5bde56535e9245b235eab0c60adaed",
+    "dac_public_key": "04a6180671f90734fe3d9d1c19ec9b929a476b13037465ee2a65740cd7577901ba842b3efd503d290efc7242c5a41f108dbc9d876fb28b79c383c18ecd04ce1e07"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der
index 65288d6a4d76fb..aa20b0c055c7ca 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der
index eca523ad250d82..6fca82e831d7b6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem
index bad92cdbd9a7c3..9b8e8d5e0c9880 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYCgAwIBAgIIcYHgrw7hftkwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
+MIIB2jCCAYCgAwIBAgIIaFuSg1fO06AwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkYxIE1waWQ6MDBC
-MTAgFw0yMjA0MjYwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
+MTAgFw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR1M7GiDZMLlhlV
-iOcEanv7449W0ctaVgD1F9JVrYnMtTc8LrZuyE+y1PKFhI0Lx77abCWzz8+O0N0A
-62BxLXl/o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQUJ/LmVKg2NWVJBaVLHi42RmjIgZQwHwYDVR0jBBgwFoAU8SHC3MWnwIBI7xmU
-qc1P154sxbwwCgYIKoZIzj0EAwIDSAAwRQIgL7Sj3ALYitpNlgjoaJA0jAxm5+bd
-pw3Acu+Mx3w0Q24CIQDf/SsDDsrUPBSZhNUGzHqynXLATY5k1qXZ0w+hQtdzxA==
+gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT034FzT1uclSfO
+1WYg/J9/O/6ESv145iyjFnjQvkW/z44j4WtDomTCIxRkDPy77HhGvmcHFO3uiPiu
+7POLsRkno2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQU84Jm/S0HXWT5OQMt83RM1M4pr8QwHwYDVR0jBBgwFoAUAgipGQX+IUwbCMy1
+6DcBUAoictAwCgYIKoZIzj0EAwIDSAAwRQIhAPH9orGAY+qIxDerxF1EujTjyACo
+0/WLvYq2snqSi1/kAiB5q/rVmuktZBDv01j6+MoyZrASeRFVXQ6KqExUuiJfZw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der
index 3bdd66b3b8ee7f..c534e76f15c174 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem
index e9ea8da085cf04..bd610b4f4179ee 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAahUwfljT3bbI/XdZ1s6vw1szHffWyUDfy/yKgCcgmwoAoGCCqGSM49
-AwEHoUQDQgAEdTOxog2TC5YZVYjnBGp7++OPVtHLWlYA9RfSVa2JzLU3PC62bshP
-stTyhYSNC8e+2mwls8/PjtDdAOtgcS15fw==
+MHcCAQEEIK1mGhnH0baf2XmfhnReXrq1SG9ceZafw7OiWgBkUEkjoAoGCCqGSM49
+AwEHoUQDQgAE9N+Bc09bnJUnztVmIPyffzv+hEr9eOYsoxZ40L5Fv8+OI+FrQ6Jk
+wiMUZAz8u+x4Rr5nBxTt7oj4ruzzi7EZJw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der
index a64e91ec491f68..3ba8996c7ede40 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem
index e16e8dbef0a380..3c71a69db7a6bf 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXCgAwIBAgIINiU96XmJW7QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIByjCCAXCgAwIBAgIIF0SrhL1RN50wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPDE6MDgGA1UEAwwxQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkYxIE1waWQ6MDBCMTBZMBMGByqGSM49
-AgEGCCqGSM49AwEHA0IABGf2xRU3gddyoPyR/4Ra6LXnKUw4ij+XJRHe56T5Gta3
-Nk5bGeh+8ZxUQ31MCzmQ1GhRcTBqmMUdNxBb7RAiYY2jZjBkMBIGA1UdEwEB/wQI
-MAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTxIcLcxafAgEjvGZSp
-zU/XnizFvDAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
-PQQDAgNIADBFAiEAnXQdYiaWxxGjX3jU/mOmAHMmnpkRV/G6H5ztvts5OTMCIDGX
-d57TgtPJTOfDD59QPKFfzIBXqroZ1htsZmcXth9m
+AgEGCCqGSM49AwEHA0IABAYr1zfNJO25edT155EUYSHKTGpG3Ecd5fZcVJi7cqX0
+98hOOKnfSo8S3ULE5HhgHEA+CWB3gQjfkYGS/LW+ZwWjZjBkMBIGA1UdEwEB/wQI
+MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQCCKkZBf4hTBsIzLXo
+NwFQCiJy0DAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
+PQQDAgNIADBFAiEAq0HrnLO1VX2N4RkyJZIRWJRaV8dOPpQJLkMZGWs9MaUCICF5
+3OkLBLNSiPfYj+PyB/Xqg+JcL5WuaxqwVBsEja/H
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der
index 86bc1e3b1cd551..f0160b8b705495 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem
index 4f976401bf05d1..a5177518fcf704 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJXex4pXG7Q5oXUEyZwLpRZ7euSmXC8yDv0TN7q0666roAoGCCqGSM49
-AwEHoUQDQgAEZ/bFFTeB13Kg/JH/hFrotecpTDiKP5clEd7npPka1rc2TlsZ6H7x
-nFRDfUwLOZDUaFFxMGqYxR03EFvtECJhjQ==
+MHcCAQEEIOxnSjizstuYGMm40HYwF7MxvyCa/jkKldClUgRwiES+oAoGCCqGSM49
+AwEHoUQDQgAEBivXN80k7bl51PXnkRRhIcpMakbcRx3l9lxUmLtypfT3yE44qd9K
+jxLdQsTkeGAcQD4JYHeBCN+RgZL8tb5nBQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json
index 7e67b313f80969..215bb5735b9177 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201da30820180a00302010202087181e0af0ee17ed9300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200047533b1a20d930b96195588e7046a7bfbe38f56d1cb5a5600f517d255ad89ccb5373c2eb66ec84fb2d4f285848d0bc7beda6c25b3cfcf8ed0dd00eb60712d797fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041427f2e654a83635654905a54b1e2e364668c88194301f0603551d23041830168014f121c2dcc5a7c08048ef1994a9cd4fd79e2cc5bc300a06082a8648ce3d040302034800304502202fb4a3dc02d88ada4d9608e86890348c0c66e7e6dda70dc072ef8cc77c34436e022100dffd2b030ecad43c149984d506cc7ab29d72c04d8e64d6a5d9d30fa142d773c4",
-    "pai_cert": "308201ca30820170a003020102020836253de979895bb4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d0301070342000467f6c5153781d772a0fc91ff845ae8b5e7294c388a3f972511dee7a4f91ad6b7364e5b19e87ef19c54437d4c0b3990d4685171306a98c51d37105bed1022618da366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f121c2dcc5a7c08048ef1994a9cd4fd79e2cc5bc301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009d741d622696c711a35f78d4fe63a60073269e991157f1ba1f9cedbedb39393302203197779ed382d3c94ce7c30f9f503ca15fcc8057aaba19d61b6c666717b61f66",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207459a61ef788f81f603ad09c636ee5bc08104337bd7232ff18a67de790fc9162022100c2edf2f726d8bbff61aa1ee51ab612196f219411ce13960eb12d693eca99ae74",
-    "dac_private_key": "06a15307e58d3ddb6c8fd7759d6ceafc35b331df7d6c940dfcbfc8a8027209b0",
-    "dac_public_key": "047533b1a20d930b96195588e7046a7bfbe38f56d1cb5a5600f517d255ad89ccb5373c2eb66ec84fb2d4f285848d0bc7beda6c25b3cfcf8ed0dd00eb60712d797f"
+    "dac_cert": "308201da30820180a0030201020208685b928357ced3a0300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004f4df81734f5b9c9527ced56620fc9f7f3bfe844afd78e62ca31678d0be45bfcf8e23e16b43a264c22314640cfcbbec7846be670714edee88f8aeecf38bb11927a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f38266fd2d075d64f939032df3744cd4ce29afc4301f0603551d230418301680140208a91905fe214c1b08ccb5e83701500a2272d0300a06082a8648ce3d0403020348003045022100f1fda2b18063ea88c437abc45d44ba34e3c800a8d3f58bbd8ab6b27a928b5fe4022079abfad59ae92d6410efd358faf8ca3266b0127911555d0e8aa84c54ba225f67",
+    "pai_cert": "308201ca30820170a00302010202081744ab84bd51379d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004062bd737cd24edb979d4f5e791146121ca4c6a46dc471de5f65c5498bb72a5f4f7c84e38a9df4a8f12dd42c4e478601c403e0960778108df918192fcb5be6705a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140208a91905fe214c1b08ccb5e83701500a2272d0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ab41eb9cb3b5557d8de1193225921158945a57c74e3e94092e4319196b3d31a502202179dce90b04b35288f7d88fe3f207f5ea83e25c2f95ae6b1ab0541b048dafc7",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203c9a4a5b55935b44f8b87d79613492134bcbe7592e9fbadc001ac3b99145a2c70220173330c6bb8c3487d644e4ad5e7aaea9ae10c443413debcdf7e33041c0d10497",
+    "dac_private_key": "ad661a19c7d1b69fd9799f86745e5ebab5486f5c79969fc3b3a25a0064504923",
+    "dac_public_key": "04f4df81734f5b9c9527ced56620fc9f7f3bfe844afd78e62ca31678d0be45bfcf8e23e16b43a264c22314640cfcbbec7846be670714edee88f8aeecf38bb11927"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der
index a00f657fc2ace2..22c2dbc9a94c68 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der
index 09a520d100ef71..2cd36841d4cb73 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem
index 53efde115e9d29..8b9163b17d5b2b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIUv4C66MtyOAwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2jCCAYGgAwIBAgIIAjg0q9T18ZowCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6ZmZmMSBNcGlkOjAw
-QjEwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+QjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgNc1wT2D4Asg
-/Q9Ro+HI/YqwrsJxYlFQYekoEvJel31H8VpankXZlE4xB/u3J9FXdzFDbuNvYWzP
-UXmWygrC36NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFFnU6HIX3tvbrJJD8KPrQ81nJToHMB8GA1UdIwQYMBaAFILAErgm9J3dVYDt
-05NGu/QeRdqxMAoGCCqGSM49BAMCA0gAMEUCIHq4W7Lr8wrppxyhtVWp3EZ+WAqI
-XXMFWXAFyRVm1ks/AiEA92sL8koVDDvsKubF+0UXg/znLxX5xWxUZxUjd3Z6ua8=
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEs0X1uuXUrqkY
+n0pxdJo3hE92/IUsntEP0EaX1WdyI2aTcjkNvhavHOSUGQKU8f6WTZyy3tAXjS8d
+FNnCa+HFC6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFLMfPWXaC+KseyHsr3c2SmrlEoPZMB8GA1UdIwQYMBaAFKPkrgdDl6WvJc4Q
+6LFaxEbbpr9+MAoGCCqGSM49BAMCA0cAMEQCIDUk43AHJtU5Trnu6T5iHUrJ8SMb
+0Z8MFQm4tT5wW6DiAiAljIWWgqLWc/UxdvwCy43qBVPbRLrbxrGrAozytyB5eg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der
index 64d944489bb3db..13db58a476bf02 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem
index c266c35a73bfc2..ef03c942139269 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDHVQmw8OLBHHnF0RM85zbvStw2/Safz9z2BX1bCrh4WoAoGCCqGSM49
-AwEHoUQDQgAEgNc1wT2D4Asg/Q9Ro+HI/YqwrsJxYlFQYekoEvJel31H8VpankXZ
-lE4xB/u3J9FXdzFDbuNvYWzPUXmWygrC3w==
+MHcCAQEEIEypTYwqPME41wxkJgKEF9D2mjoUZ2rO2bXGTVUmyLYSoAoGCCqGSM49
+AwEHoUQDQgAEs0X1uuXUrqkYn0pxdJo3hE92/IUsntEP0EaX1WdyI2aTcjkNvhav
+HOSUGQKU8f6WTZyy3tAXjS8dFNnCa+HFCw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der
index 2509b59478ed23..50273966bd1f0f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem
index e2ab5d4dcc07df..ad37cd5fe05cc7 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIJdqBy8pYfVswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBzDCCAXGgAwIBAgIIDdAtFVKhYGYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6ZmZmMSBNcGlkOjAwQjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAAR9pkt01FEQ793SPm2CkZ9qzYmoLPbBcUpovS31Zj2r
-fsEZqTk1D8UNj0xdbWPmTTbQGHaJ4OIQ++HfCzQJyUDFo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUgsASuCb0nd1VgO3T
-k0a79B5F2rEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSQAwRgIhAPZOfTDhie8bTB8XFfAgZfJcldpDS/7Uw34JZGPrBzAFAiEA
-6raQso+szvdCxmFzBX0VzqL+4AtSq+F7fuZxkHhrL3M=
+PQIBBggqhkjOPQMBBwNCAATj8vxn4mlQm1b1mN/kQq3/3P0lILXw4vuKZE8aNs9z
+hBvpAFO+VI/NwYfjG50H4cPpwQEGvCE1VYnOi/ypYjQxo2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo+SuB0OXpa8lzhDo
+sVrERtumv34wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSQAwRgIhAKOYMyLqVPU+LiJfWo6KrUJTGdGg83ECvIZ3Q6eQsIZDAiEA
+hIhv4MVTH+sxKFHc3HRnHh2W8bnbzzVNpTA/e1ObKaw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der
index 168d5fc233e22d..2c9427a88c5d0a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem
index f8cb918dbaf37c..592ede36cc9b0f 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH8g/3Xng1EcUJ84fxKDUdk1IW34cXhGK4e/bvC+TZWloAoGCCqGSM49
-AwEHoUQDQgAEfaZLdNRREO/d0j5tgpGfas2JqCz2wXFKaL0t9WY9q37BGak5NQ/F
-DY9MXW1j5k020Bh2ieDiEPvh3ws0CclAxQ==
+MHcCAQEEIOn7aNNguyUmtHNFJdP7T7jteMAmvJYln5FKw9BE8hdsoAoGCCqGSM49
+AwEHoUQDQgAE4/L8Z+JpUJtW9Zjf5EKt/9z9JSC18OL7imRPGjbPc4Qb6QBTvlSP
+zcGH4xudB+HD6cEBBrwhNVWJzov8qWI0MQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json
index 6749e289bef619..43d4a681683ed3 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201db30820181a003020102020852fe02eba32dc8e0300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000480d735c13d83e00b20fd0f51a3e1c8fd8ab0aec27162515061e92812f25e977d47f15a5a9e45d9944e3107fbb727d1577731436ee36f616ccf517996ca0ac2dfa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041459d4e87217dedbdbac9243f0a3eb43cd67253a07301f0603551d2304183016801482c012b826f49ddd5580edd39346bbf41e45dab1300a06082a8648ce3d040302034800304502207ab85bb2ebf30ae9a71ca1b555a9dc467e580a885d7305597005c91566d64b3f022100f76b0bf24a150c3bec2ae6c5fb451783fce72f15f9c56c5467152377767ab9af",
-    "pai_cert": "308201cc30820171a003020102020825da81cbca587d5b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200047da64b74d45110efddd23e6d82919f6acd89a82cf6c1714a68bd2df5663dab7ec119a939350fc50d8f4c5d6d63e64d36d0187689e0e210fbe1df0b3409c940c5a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041482c012b826f49ddd5580edd39346bbf41e45dab1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100f64e7d30e189ef1b4c1f1715f02065f25c95da434bfed4c37e096463eb073005022100eab690b28faccef742c66173057d15cea2fee00b52abe17b7ee67190786b2f73",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206a29cd43a2ef5ddd4888871ad80780bc68beb131dfda05164dc7fd020f42ba9702210094176364681750bf624a6f4f4b6a446b2411c3ef2f8774d240ddd6d2b288fd01",
-    "dac_private_key": "31d5426c3c38b0471e717444cf39cdbbd2b70dbf49a7f3f73d815f56c2ae1e16",
-    "dac_public_key": "0480d735c13d83e00b20fd0f51a3e1c8fd8ab0aec27162515061e92812f25e977d47f15a5a9e45d9944e3107fbb727d1577731436ee36f616ccf517996ca0ac2df"
+    "dac_cert": "308201da30820181a0030201020208023834abd4f5f19a300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b345f5bae5d4aea9189f4a71749a37844f76fc852c9ed10fd04697d5677223669372390dbe16af1ce494190294f1fe964d9cb2ded0178d2f1d14d9c26be1c50ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b31f3d65da0be2ac7b21ecaf77364a6ae51283d9301f0603551d23041830168014a3e4ae074397a5af25ce10e8b15ac446dba6bf7e300a06082a8648ce3d040302034700304402203524e3700726d5394eb9eee93e621d4ac9f1231bd19f0c1509b8b53e705ba0e20220258c859682a2d673f53176fc02cb8dea0553db44badbc6b1ab028cf2b720797a",
+    "pai_cert": "308201cc30820171a00302010202080dd02d1552a16066300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e3f2fc67e269509b56f598dfe442adffdcfd2520b5f0e2fb8a644f1a36cf73841be90053be548fcdc187e31b9d07e1c3e9c10106bc21355589ce8bfca9623431a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a3e4ae074397a5af25ce10e8b15ac446dba6bf7e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a3983322ea54f53e2e225f5a8e8aad425319d1a0f37102bc867743a790b0864302210084886fe0c5531feb312851dcdc74671e1d96f1b9dbcf354da5303f7b539b29ac",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200dcf99449b2ec378c99d4635178736cf3c0988a5e32f61c604434539f26469af022100e85e0252d373fea140d7f4ef5caec379e393821c1da47017fc30b1eecb222066",
+    "dac_private_key": "4ca94d8c2a3cc138d70c6426028417d0f69a3a14676aced9b5c64d5526c8b612",
+    "dac_public_key": "04b345f5bae5d4aea9189f4a71749a37844f76fc852c9ed10fd04697d5677223669372390dbe16af1ce494190294f1fe964d9cb2ded0178d2f1d14d9c26be1c50b"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der
index 420ffdea253a36..9a64e79a056afd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der
index b952325b34a490..25ad54644d5035 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem
index d621e7fd6a1c83..b5e536eabc5a52 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2TCCAX+gAwIBAgIIaFZ8/Qjzb0UwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
+MIIB2TCCAX+gAwIBAgIIKzOsbhbHWCcwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOkIx
-MCAXDTIyMDQyNjAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
+MCAXDTIyMDUyNzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
 YXR0ZXIgVGVzdCBEQUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGC
-onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOEvJ6qnb2wx3dUQ
-W77+RxOmgMVWIYIgEGhminNLTTRjWPfsN8qwjbZWeBRwLsAjHPLZNSzTzXjfV4W4
-G/O2aFyjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBTB3dc8DLX7geVsanqZ8adaihVh5jAfBgNVHSMEGDAWgBTW+r87bYPEIkYHDlti
-YwZsEQlm3zAKBggqhkjOPQQDAgNIADBFAiEAlqXgqJK9CUSX8qYlTYJ8b0r/S/Ok
-nNHkgZ+1p2/iWzkCICcOKAojmHWrJodtXI+/y+MNmcBLpt7nVmXTiJtGy9ng
+onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEEMoM8hQ+uSX/j4
+mkRxpzkEsDMPPlIVTu6qrxjApUz7AhKUg7Itao2g2wne/uRJkO3GnT+7Us8zq0Vd
+sbWlrH+jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBSlk0YpTGU3PHYwOb3Q1/XLfe0PrjAfBgNVHSMEGDAWgBRuMc10cYzZEF6YcQI3
+0Z6y/kgNhjAKBggqhkjOPQQDAgNIADBFAiA8Y+UfRWE375WbtRSHqiVhbYq28Su8
+U093hCGJvUlangIhAP0/feXccje5fzvM9CVafdVQEXnIz0gONICc/dix3FPX
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der
index 7100fe99b50d28..8f4f090876ad1f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem
index 3902757ef517e0..025ea70304e17d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMLwDcMRKFgspl1l8FXI4ZOztmlLEnNdvkon4AKii5JwoAoGCCqGSM49
-AwEHoUQDQgAE4S8nqqdvbDHd1RBbvv5HE6aAxVYhgiAQaGaKc0tNNGNY9+w3yrCN
-tlZ4FHAuwCMc8tk1LNPNeN9Xhbgb87ZoXA==
+MHcCAQEEINpQPky8BdPz5QVNqPQvjFI6N/k9LMwMimLkgw9mKTGCoAoGCCqGSM49
+AwEHoUQDQgAEQQygzyFD65Jf+PiaRHGnOQSwMw8+UhVO7qqvGMClTPsCEpSDsi1q
+jaDbCd7+5EmQ7cadP7tSzzOrRV2xtaWsfw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der
index c63b2b1e47a9c1..d2ad805ab8382c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem
index a1ef421fcb43ed..97453033c1ec97 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByTCCAW+gAwIBAgIII8uf1L9fw3UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIByjCCAW+gAwIBAgIIZSqzwIXu0DcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOzE5MDcGA1UEAwwwQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOkIxMFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAETXFqZpoYt5fCqNaoJH9Lkju67NOTwDlkEzKrVX9nMyFf
-dlU6jvPSqEBXUq+g4w7xmrSGt685HpGMHcNPHNTH4KNmMGQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNb6vzttg8QiRgcOW2Jj
-BmwRCWbfMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
-BAMCA0gAMEUCIAFWH3uC8eEawZ0sjXYUqC1RRUxgkjKFUQYiEXHzwahvAiEAhz8t
-bFPtUaXXWClIsQ8jLsZgbKKl5FkzEGM6ngc0muc=
+AQYIKoZIzj0DAQcDQgAEMTGfMCT1PovNRKy3ekqKHU32GWbwtKBv+4+lr1uimI+j
+4sZ3R/tZ6U6dNW6VCdvJXZNFygxeeAeMiTYP50nKLaNmMGQwEgYDVR0TAQH/BAgw
+BgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFG4xzXRxjNkQXphxAjfR
+nrL+SA2GMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
+BAMCA0kAMEYCIQCTCRxWEPkh2dfjr+aOd/6f3yhXugnivNLlAxlhh+eQMgIhAM6P
+iOHpRpBE71g/wG7X3iJ3eXVyBvN3nnUXZj2CbfYS
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der
index c5c940fb3f2285..8d60101685d385 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem
index 94729f11cd3563..eca9f56636d881 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOM1fyMxOpTEzyuv/0F/kSsnnYls0LfprjZ2sUg3fV2UoAoGCCqGSM49
-AwEHoUQDQgAETXFqZpoYt5fCqNaoJH9Lkju67NOTwDlkEzKrVX9nMyFfdlU6jvPS
-qEBXUq+g4w7xmrSGt685HpGMHcNPHNTH4A==
+MHcCAQEEIPWzamTiFoWR2jAlmYiJJDdEUf9HK3axqPx1KWKPIBn0oAoGCCqGSM49
+AwEHoUQDQgAEMTGfMCT1PovNRKy3ekqKHU32GWbwtKBv+4+lr1uimI+j4sZ3R/tZ
+6U6dNW6VCdvJXZNFygxeeAeMiTYP50nKLQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json
index 528876589b8ecd..0753d4ec94cf62 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "true",
-    "dac_cert": "308201d93082017fa003020102020868567cfd08f36f45300a06082a8648ce3d040302303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e12f27aaa76f6c31ddd5105bbefe4713a680c5562182201068668a734b4d346358f7ec37cab08db6567814702ec0231cf2d9352cd3cd78df5785b81bf3b6685ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c1ddd73c0cb5fb81e56c6a7a99f1a75a8a1561e6301f0603551d23041830168014d6fabf3b6d83c42246070e5b6263066c110966df300a06082a8648ce3d040302034800304502210096a5e0a892bd094497f2a6254d827c6f4aff4bf3a49cd1e4819fb5a76fe25b390220270e280a239875ab26876d5c8fbfcbe30d99c04ba6dee75665d3889b46cbd9e0",
-    "pai_cert": "308201c93082016fa003020102020823cb9fd4bf5fc375300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d030107034200044d716a669a18b797c2a8d6a8247f4b923bbaecd393c039641332ab557f6733215f76553a8ef3d2a8405752afa0e30ef19ab486b7af391e918c1dc34f1cd4c7e0a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414d6fabf3b6d83c42246070e5b6263066c110966df301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022001561f7b82f1e11ac19d2c8d7614a82d51454c609232855106221171f3c1a86f022100873f2d6c53ed51a5d7582948b10f232ec6606ca2a5e4593310633a9e07349ae7",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206e33fb7643aeac6e3d3ff6dc0a26ef8d2cd065fdda15d8d37bbee58b046393a2022100e036e291ff58e0eb52e710af572628925990f8c52ef02cbb5482f4a284ccb0d2",
-    "dac_private_key": "c2f00dc31128582ca65d65f055c8e193b3b6694b12735dbe4a27e002a28b9270",
-    "dac_public_key": "04e12f27aaa76f6c31ddd5105bbefe4713a680c5562182201068668a734b4d346358f7ec37cab08db6567814702ec0231cf2d9352cd3cd78df5785b81bf3b6685c"
+    "dac_cert": "308201d93082017fa00302010202082b33ac6e16c75827300a06082a8648ce3d040302303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004410ca0cf2143eb925ff8f89a4471a73904b0330f3e52154eeeaaaf18c0a54cfb02129483b22d6a8da0db09defee44990edc69d3fbb52cf33ab455db1b5a5ac7fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a59346294c65373c763039bdd0d7f5cb7ded0fae301f0603551d230418301680146e31cd74718cd9105e98710237d19eb2fe480d86300a06082a8648ce3d040302034800304502203c63e51f456137ef959bb51487aa25616d8ab6f12bbc534f77842189bd495a9e022100fd3f7de5dc7237b97f3bccf4255a7dd5501179c8cf480e34809cfdd8b1dc53d7",
+    "pai_cert": "308201ca3082016fa0030201020208652ab3c085eed037300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d0301070342000431319f3024f53e8bcd44acb77a4a8a1d4df61966f0b4a06ffb8fa5af5ba2988fa3e2c67747fb59e94e9d356e9509dbc95d9345ca0c5e78078c89360fe749ca2da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146e31cd74718cd9105e98710237d19eb2fe480d86301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210093091c5610f921d9d7e3afe68e77fe9fdf2857ba09e2bcd2e503196187e79032022100ce8f88e1e9469044ef583fc06ed7de227779757206f3779e7517663d826df612",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ffe39b9f479f0f6c98a02a3a97c0a8c7c1754d3c87e7b70f6c676bc12ed83dc302203c6f75ed2d90c9c75a28836c6cdf4191f4c9ad9d940d5108217ac597c2f16980",
+    "dac_private_key": "da503e4cbc05d3f3e5054da8f42f8c523a37f93d2ccc0c8a62e4830f66293182",
+    "dac_public_key": "04410ca0cf2143eb925ff8f89a4471a73904b0330f3e52154eeeaaaf18c0a54cfb02129483b22d6a8da0db09defee44990edc69d3fbb52cf33ab455db1b5a5ac7f"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der
index c93c21e10ad505..e3c7d0b4870ff2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der
index 1d09cf28ef0215..8871297d37ca0a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem
index 67da084326b855..7d2f9f22acc6cb 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2DCCAX2gAwIBAgIIFiE5DwA71aYwCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
+MIIB2DCCAX2gAwIBAgIITntKURGuIa8wCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6IE12aWQ6RkZGMTAg
-Fw0yMjA0MjYwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
+Fw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
 dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASAsYU0qUArFmL6XuLn
-JAcgdDWSwz8LGycxc8dp6nx0gZ3J/HbrIOjQURFHYE1KW+zxBTN37F7kHJMv8bp2
-XPlmo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-ySwQTGeeZsDBb4slgX0klbD71zgwHwYDVR0jBBgwFoAUTepRMjDxiPkeP8znBmbS
-ya34Fd0wCgYIKoZIzj0EAwIDSQAwRgIhAKvMRGF7+m4FxeiiGKOg8t/etNQjdTMF
-0/0LkT3LJbIDAiEAseZNma0SBYCIBVfWTeOmw+dZDYlZIMDW9zvldWaWq+M=
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR2DDIOfC1WUILu/euh
+1m81fvULh6mMkMO7SzFKecQqPkAUKWoasL8Wbc7+86hsMOMzT4XeuwklC2R1L5Rd
+RAifo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+1+B6S4ROW6D+m+9AR26eisnopb8wHwYDVR0jBBgwFoAUVRQK9QaXbZJhHFHOw8ID
+d5DdR8AwCgYIKoZIzj0EAwIDSQAwRgIhANxBzygTuSLw+chPtVBZtdLj9oSSOh2D
+9tmquu5gy/vUAiEAoklbCKSmqnu07J9wAKQQsEu2n0jEVX9b3Ehk/LqqeH0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der
index 9a1c5a4b638c14..b5ae1a4cbc96a5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem
index 4c8ac71d015903..625c9a354d7d74 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEMd3bZMGCwblq7Uy3t1uSjMRPnWkj4tTF1mcOugTQSjoAoGCCqGSM49
-AwEHoUQDQgAEgLGFNKlAKxZi+l7i5yQHIHQ1ksM/CxsnMXPHaep8dIGdyfx26yDo
-0FERR2BNSlvs8QUzd+xe5ByTL/G6dlz5Zg==
+MHcCAQEEIPRs2bn77Sgnu1BgZ8GYl/I8jd9orP8R8ZHlgzs3fO4toAoGCCqGSM49
+AwEHoUQDQgAEdgwyDnwtVlCC7v3rodZvNX71C4epjJDDu0sxSnnEKj5AFClqGrC/
+Fm3O/vOobDDjM0+F3rsJJQtkdS+UXUQInw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der
index da0ab7826a58ac..ee746d4bf00032 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem
index 89c9a54c96adba..e20e77cc869887 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBxzCCAW2gAwIBAgIISirY6F5qrpQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBxjCCAW2gAwIBAgIIPZVSLqZoKkwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOTE3MDUGA1UEAwwuQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6IE12aWQ6RkZGMTBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABFlILyUeePP5A8UcsTV5puByLXQNhjbLQKi3ck8AhFXrmjet
-LiwG6l6UBbYqqe6qQCCcf9tobpFvj85QR6iM6NOjZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRN6lEyMPGI+R4/zOcGZtLJ
-rfgV3TAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
-AgNIADBFAiANtyxFkdwy05Txb8i9IwLXaxT8tED3vpREuayOFXnAlgIhANPlrfJ8
-eXYG9BgrrZVRfUTXYA1YCOVmW4XvxCETNFie
+CCqGSM49AwEHA0IABP3qi83ECOWohcvGIXaVdYOgQh5ORHEaCA/xVyJi56/vxNa1
+aniNTTtXGsJdZ4r5ZOiiNbBf4RL5nu479X1xfNijZjBkMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRVFAr1BpdtkmEcUc7DwgN3
+kN1HwDAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
+AgNHADBEAiAUPf5G+P+qEyGigcHFz9DDvkl27QWC0mpSmpPqGHg2NwIgRaX9kDAd
+EVb7PsLf4nP5ymY7AbQYhXkLgRgpN+0bn2w=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der
index 4c042fdda07e1c..ae6c118f1306ea 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem
index 6c017590474bda..236053914b1b5a 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKwxwp4smfEXSn9mTzd6ZFBYn0Xs3KZ68sjvgxty1vtSoAoGCCqGSM49
-AwEHoUQDQgAEWUgvJR548/kDxRyxNXmm4HItdA2GNstAqLdyTwCEVeuaN60uLAbq
-XpQFtiqp7qpAIJx/22hukW+PzlBHqIzo0w==
+MHcCAQEEIMnOpWwbesfaUBE10ikq7Ed8hcvNuhypIh/EdZOgiq7YoAoGCCqGSM49
+AwEHoUQDQgAE/eqLzcQI5aiFy8YhdpV1g6BCHk5EcRoID/FXImLnr+/E1rVqeI1N
+O1cawl1nivlk6KI1sF/hEvme7jv1fXF82A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json
index f71ac861706587..58f67d5a51c7ee 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "true",
-    "dac_cert": "308201d83082017da00302010202081621390f003bd5a6300a06082a8648ce3d04030230393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000480b18534a9402b1662fa5ee2e7240720743592c33f0b1b273173c769ea7c74819dc9fc76eb20e8d0511147604d4a5becf1053377ec5ee41c932ff1ba765cf966a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c92c104c679e66c0c16f8b25817d2495b0fbd738301f0603551d230418301680144dea513230f188f91e3fcce70666d2c9adf815dd300a06082a8648ce3d0403020349003046022100abcc44617bfa6e05c5e8a218a3a0f2dfdeb4d423753305d3fd0b913dcb25b203022100b1e64d99ad120580880557d64de3a6c3e7590d895920c0d6f73be5756696abe3",
-    "pai_cert": "308201c73082016da00302010202084a2ad8e85e6aae94300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000459482f251e78f3f903c51cb13579a6e0722d740d8636cb40a8b7724f008455eb9a37ad2e2c06ea5e9405b62aa9eeaa40209c7fdb686e916f8fce5047a88ce8d3a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604144dea513230f188f91e3fcce70666d2c9adf815dd301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200db72c4591dc32d394f16fc8bd2302d76b14fcb440f7be9444b9ac8e1579c096022100d3e5adf27c797606f4182bad95517d44d7600d5808e5665b85efc4211334589e",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206d8806cbd7b0d97504689e462af1cca52a562731311dc432103ce96eb4e05731022070b8559869e8fa233584039f89d3606eea228a331bc76f78c458354648435f46",
-    "dac_private_key": "431dddb64c182c1b96aed4cb7b75b928cc44f9d6923e2d4c5d6670eba04d04a3",
-    "dac_public_key": "0480b18534a9402b1662fa5ee2e7240720743592c33f0b1b273173c769ea7c74819dc9fc76eb20e8d0511147604d4a5becf1053377ec5ee41c932ff1ba765cf966"
+    "dac_cert": "308201d83082017da00302010202084e7b4a5111ae21af300a06082a8648ce3d04030230393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004760c320e7c2d565082eefdeba1d66f357ef50b87a98c90c3bb4b314a79c42a3e4014296a1ab0bf166dcefef3a86c30e3334f85debb09250b64752f945d44089fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d7e07a4b844e5ba0fe9bef40476e9e8ac9e8a5bf301f0603551d2304183016801455140af506976d92611c51cec3c2037790dd47c0300a06082a8648ce3d0403020349003046022100dc41cf2813b922f0f9c84fb55059b5d2e3f684923a1d83f6d9aabaee60cbfbd4022100a2495b08a4a6aa7bb4ec9f7000a410b04bb69f48c4557f5bdc4864fcbaaa787d",
+    "pai_cert": "308201c63082016da00302010202083d95522ea6682a4c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004fdea8bcdc408e5a885cbc62176957583a0421e4e44711a080ff1572262e7afefc4d6b56a788d4d3b571ac25d678af964e8a235b05fe112f99eee3bf57d717cd8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041455140af506976d92611c51cec3c2037790dd47c0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220143dfe46f8ffaa1321a281c1c5cfd0c3be4976ed0582d26a529a93ea18783637022045a5fd90301d1156fb3ec2dfe273f9ca663b01b41885790b81182937ed1b9f6c",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206d1701c37ff7fffb8dada85e67146289458cc617ac0efc3c115f076ff75d0b280220725e63658d8715bc8dbe2459c499a8456254eec0a518e0205ec52ec80649af4e",
+    "dac_private_key": "f46cd9b9fbed2827bb506067c19897f23c8ddf68acff11f191e5833b377cee2d",
+    "dac_public_key": "04760c320e7c2d565082eefdeba1d66f357ef50b87a98c90c3bb4b314a79c42a3e4014296a1ab0bf166dcefef3a86c30e3334f85debb09250b64752f945d44089f"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der
index de76cea0d34229..0f930a5febd4bc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der
index 69cabfe9a963fd..f96087eea09412 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem
index 74b1e7a54ec926..dde91ceee99475 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWOgAwIBAgIIAohmcBfsChYwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
-TXZpZDpGRkYgTXBpZDowMEIxMHgwIBcNMjIwNDI2MDAwMDAwWhgPOTk5OTEyMzEy
+MIIBvTCCAWOgAwIBAgIIfRsYe5ExaTEwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+TXZpZDpGRkYgTXBpZDowMEIxMHgwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEy
 MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8
 AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAElYDTDK6SWtp6VmxGhs/zmLVrjGxEmL0NT5JbKnA9IlbaEoUSrrpU
-oeIWJigVqPTU/YhXnmWy965TEFGPAUoNZaNgMF4wDAYDVR0TAQH/BAIwADAOBgNV
-HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFP8zRPosB0aexbO7dlAedlNQ0BG9MB8GA1Ud
-IwQYMBaAFPm85870XJhwaFBtAUFiUs6CWssgMAoGCCqGSM49BAMCA0gAMEUCIFP+
-PMfhrsTNZgoNJX1xvr7zk1xYY7dS/DShHapf9izNAiEAlOYZmVrKX0AGqhv+9CNA
-QUwYoDrJ0XvnxONRP5fWN4w=
+zj0DAQcDQgAEiQt3dg6LdUyoEjS2Dg1raQgAJJxN+S1xfK/ywGNVQO0nppRsynUT
+zy7cpozaADsUuK2IRXobAb2ryAPC3ciFCaNgMF4wDAYDVR0TAQH/BAIwADAOBgNV
+HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFEUf3Nxx4uqY+EXukMLgZXN4WulsMB8GA1Ud
+IwQYMBaAFIS5DclmFWUt8hazhCen0szPTzbpMAoGCCqGSM49BAMCA0gAMEUCIFA2
+SdpO2lmgs8g1zjNVxVuQE5fiu3jqUqrbuV0RdscnAiEAju0pkLdmXPtOeA8xwHRI
+uC784Gd3qdHnR1yQ8tZcmdo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der
index d172c5c34fd3b2..522cdb5a3c2c81 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem
index 5d1c3166d22afb..0bdf646cd2d3a4 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKtLJo0BWNvTENpCVr6/d5ftinOoPZvzuyvM+tjPMSNuoAoGCCqGSM49
-AwEHoUQDQgAElYDTDK6SWtp6VmxGhs/zmLVrjGxEmL0NT5JbKnA9IlbaEoUSrrpU
-oeIWJigVqPTU/YhXnmWy965TEFGPAUoNZQ==
+MHcCAQEEIO38/cI1g1CafreX/ydhBt0YAIPMf0Bydyjod0RC0sZPoAoGCCqGSM49
+AwEHoUQDQgAEiQt3dg6LdUyoEjS2Dg1raQgAJJxN+S1xfK/ywGNVQO0nppRsynUT
+zy7cpozaADsUuK2IRXobAb2ryAPC3ciFCQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der
index 0588d260033214..77db0fbabb84f1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem
index 49a028d71e5ab0..0609b99b715db2 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrTCCAVOgAwIBAgIITTZvoDp/BYUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBrjCCAVOgAwIBAgIIZdvrGtcfwNEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowHzEdMBsGA1UEAwwUTXZpZDpGRkYgTXBp
-ZDowMEIxMHgwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARUvJifrmSUAv01R/hV
-jZ8OFZQnDPjpvCzyiXJ/7O4p4JSf8R2QcWkmCF92iPzP4Lqw2+3N2lJ8yCJm59lK
-IL56o2YwZDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQU+bznzvRcmHBoUG0BQWJSzoJayyAwHwYDVR0jBBgwFoAUav0idx9RH+y/
-FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhANScF7FYXB15j6Dy+1pqLlkT
-soxanlngYPcActSiXQcVAiBPzBkTELU8lVRBiTKuMIAp21SnJ6bk9fKmGaD5gnFT
-pQ==
+ZDowMEIxMHgwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARTBMHhSTAOE/9+OodG
+EkmYhAL+OTqWi1H/mDWO069Hq/DBEMJtUN48tnbBmhtVkWFv5/KrYpReIMf7qqu2
+2yfao2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUhLkNyWYVZS3yFrOEJ6fSzM9PNukwHwYDVR0jBBgwFoAUav0idx9RH+y/
+FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSQAwRgIhAM2aDn88FIGF+1pj85XA6SGN
+qJDsgpl0LyY3QUupfw5aAiEAiBJMPfFy0q1DbG7G1/CkBjvUx/uoexk3LhvTeLRQ
+BJ4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der
index 78387a94b17b50..55218b9581503f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem
index c326467a523e51..a5eaee65598ede 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJaqGi8EUJl4IvTalyIKQL+bQbDKIETi3eWPMeERmt5zoAoGCCqGSM49
-AwEHoUQDQgAEVLyYn65klAL9NUf4VY2fDhWUJwz46bws8olyf+zuKeCUn/EdkHFp
-Jghfdoj8z+C6sNvtzdpSfMgiZufZSiC+eg==
+MHcCAQEEIEH0DqFaJ0OudBYts5oLpwYPiN0xNikExsSdXIiIFDhqoAoGCCqGSM49
+AwEHoUQDQgAEUwTB4UkwDhP/fjqHRhJJmIQC/jk6lotR/5g1jtOvR6vwwRDCbVDe
+PLZ2wZobVZFhb+fyq2KUXiDH+6qrttsn2g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json
index dc039efb45ffa9..8b4798194a4ca4 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid VID encoding",
     "is_success_case": "false",
-    "dac_cert": "308201bd30820163a00302010202080288667017ec0a16300a06082a8648ce3d040302301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200049580d30cae925ada7a566c4686cff398b56b8c6c4498bd0d4f925b2a703d2256da128512aeba54a1e216262815a8f4d4fd88579e65b2f7ae5310518f014a0d65a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ff3344fa2c07469ec5b3bb76501e765350d011bd301f0603551d23041830168014f9bce7cef45c987068506d01416252ce825acb20300a06082a8648ce3d0403020348003045022053fe3cc7e1aec4cd660a0d257d71bebef3935c5863b752fc34a11daa5ff62ccd02210094e619995aca5f4006aa1bfef42340414c18a03ac9d17be7c4e3513f97d6378c",
-    "pai_cert": "308201ad30820153a00302010202084d366fa03a7f0585300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d0301070342000454bc989fae649402fd3547f8558d9f0e1594270cf8e9bc2cf289727fecee29e0949ff11d90716926085f7688fccfe0bab0dbedcdda527cc82266e7d94a20be7aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414f9bce7cef45c987068506d01416252ce825acb20301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100d49c17b1585c1d798fa0f2fb5a6a2e5913b28c5a9e59e060f70072d4a25d071502204fcc191310b53c9554418932ae308029db54a727a6e4f5f2a619a0f9827153a5",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022064dae669b1ef497ae474fdb619341e6fd101eea88981a8d9738b734581d7bee802206e56129ccdde62d326657513b8df72d68f03abbe4a8a1804133152bb9f4fa4e7",
-    "dac_private_key": "ab4b268d0158dbd310da4256bebf7797ed8a73a83d9bf3bb2bccfad8cf31236e",
-    "dac_public_key": "049580d30cae925ada7a566c4686cff398b56b8c6c4498bd0d4f925b2a703d2256da128512aeba54a1e216262815a8f4d4fd88579e65b2f7ae5310518f014a0d65"
+    "dac_cert": "308201bd30820163a00302010202087d1b187b91316931300a06082a8648ce3d040302301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004890b77760e8b754ca81234b60e0d6b690800249c4df92d717caff2c0635540ed27a6946cca7513cf2edca68cda003b14b8ad88457a1b01bdabc803c2ddc88509a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414451fdcdc71e2ea98f845ee90c2e06573785ae96c301f0603551d2304183016801484b90dc96615652df216b38427a7d2cccf4f36e9300a06082a8648ce3d04030203480030450220503649da4eda59a0b3c835ce3355c55b901397e2bb78ea52aadbb95d1176c7270221008eed2990b7665cfb4e780f31c07448b82efce06777a9d1e7475c90f2d65c99da",
+    "pai_cert": "308201ae30820153a003020102020865dbeb1ad71fc0d1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d030107034200045304c1e149300e13ff7e3a87461249988402fe393a968b51ff98358ed3af47abf0c110c26d50de3cb676c19a1b5591616fe7f2ab62945e20c7fbaaabb6db27daa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041484b90dc96615652df216b38427a7d2cccf4f36e9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100cd9a0e7f3c148185fb5a63f395c0e9218da890ec8299742f2637414ba97f0e5a02210088124c3df172d2ad436c6ec6d7f0a4063bd4c7fba87b19372e1bd378b450049e",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210088441ac08531b456749ceaf2450e0122cac19e6e96917b37492a2c9476781605022100a70dacbf57c2fe733383feed0983740dff653f802481ef02108cfeba130a55fb",
+    "dac_private_key": "edfcfdc23583509a7eb797ff276106dd180083cc7f40727728e8774442d2c64f",
+    "dac_public_key": "04890b77760e8b754ca81234b60e0d6b690800249c4df92d717caff2c0635540ed27a6946cca7513cf2edca68cda003b14b8ad88457a1b01bdabc803c2ddc88509"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der
index 05b85250fda0c3..ac29a73d3e9f0b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der
index 4f0f7e2fff0741..33b961c1af6c94 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem
index d50fb43ae471cc..9d8b04c8165d6a 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXOgAwIBAgIIApaNWRtV+w8wCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
-TXBpZE12aWQ6RkZGMTAgTWF0dGVyIFRlc3QgTXBpZDowMEIxMCAXDTIyMDQyNjAw
+MIIBzDCCAXOgAwIBAgIIKAMQGorzkWswCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
+TXBpZE12aWQ6RkZGMTAgTWF0dGVyIFRlc3QgTXBpZDowMEIxMCAXDTIyMDUyNzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABBLCMqMecDtCJ1fqu+otkUFs51FRs1JZ
-L/WTM1YhUrzGhtlhOmgxCcqqI4SkzAnqaKMc7vrIvrRNICn2a66H6yKjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTl0GyJmpgxUnYQ
-QPwVr+bcEIl4+zAfBgNVHSMEGDAWgBTOumiwuvvPhGpFyqpcVsQO6AMQSzAKBggq
-hkjOPQQDAgNIADBFAiAgL4brJQ+ktob3h0QWzRqNXNkdUeC3XUrHqO6447gNNgIh
-AMbE0NRiSFahl/FfndsndSYD068TWTvKHgtYRQI+mpfQ
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO2tGs1AhPsq0RQtA/7PJhvBN/lLdc1P
+YpCBrtsI+3ilv2gRkNFGK4qgBl/7ixYhGcKx5oMcz7nxS0/zGUHSVO6jYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSTeamhtjAKlcWT
+G0IuOwzDJTUE7jAfBgNVHSMEGDAWgBSEOYNr4u6qNznaIR0skx2uNEnN/zAKBggq
+hkjOPQQDAgNHADBEAiB5VB0qfQEkKQliAUYsrbSngvxYY2Y3Voc1SuGE9uMCUgIg
+WuYEXGNsXw4DmSx6FgsYxF205b/0d0Z2R29z3ZB176w=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der
index 402a47cabd846a..f78c07242bb4cb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem
index a81ed1242ae512..d505adc11cbd5d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFCTHbDb4bQYSCg5iqNd7TRr8hbrEHJ5Es6fxYuSq6BRoAoGCCqGSM49
-AwEHoUQDQgAEEsIyox5wO0InV+q76i2RQWznUVGzUlkv9ZMzViFSvMaG2WE6aDEJ
-yqojhKTMCepooxzu+si+tE0gKfZrrofrIg==
+MHcCAQEEIJc8x/jAp5hoEbsY5xeKCbAhOwZPInv7j5YRKoKjXZrUoAoGCCqGSM49
+AwEHoUQDQgAE7a0azUCE+yrRFC0D/s8mG8E3+Ut1zU9ikIGu2wj7eKW/aBGQ0UYr
+iqAGX/uLFiEZwrHmgxzPufFLT/MZQdJU7g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der
index b0244b514c2696..3bf9b3f4cd5c39 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem
index d87dd23f7b205c..b1039c8fdf2784 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWOgAwIBAgIIAiEhQzrd4ygwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBvjCCAWOgAwIBAgIICYrXInrw9rYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowLzEtMCsGA1UEAwwkTXBpZE12aWQ6RkZG
 MTAgTWF0dGVyIFRlc3QgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEtCVifrAkpZst153MTGwMR7AaVoob6S4GoDjDPDp7n85e90y3b2otAt+A79bL
-rAGL+aCJJrPsyBpFRjQqaQgDNqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFM66aLC6+8+EakXKqlxWxA7oAxBLMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCIQDG
-rauFUt0KTEIFj2EJL+LlvT4cm8HnZ1z4yHvrxcJCZwIgPu2ptKkRl0KByP55PUC8
-pvUQA5z8sji4APhLWSpgLPg=
+QgAEvJ3EHcsCaFigfbjkoZQ/Nx7/H+wFbuUAxutyd1k6nvZjfHTIlV/uPEsnPRvC
+okdRXR5NpON3/EgiOckTAa5s5qNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIQ5g2vi7qo3OdohHSyTHa40Sc3/MB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0kAMEYCIQDI
+Fgj0JUEhSIB8avz74RqTfpcBo4T6Vx0uvlJ3Ahv8AQIhAM8IplVr3XPUS61U2UzX
+HKYFBxjY7SNSol1M8MM4j145
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der
index 69f207f4b8f9cd..1780a70983b7bc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem
index f4f06d388c6c20..a95b12569bd08d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDI8lzHsONOcoX8XxQLyobfK1pr+ctG1lv9v/oHWiReYoAoGCCqGSM49
-AwEHoUQDQgAEtCVifrAkpZst153MTGwMR7AaVoob6S4GoDjDPDp7n85e90y3b2ot
-At+A79bLrAGL+aCJJrPsyBpFRjQqaQgDNg==
+MHcCAQEEIBod1xsLrej5RRswRs8pXCA2JqMSETJFBVEplW8YO6SvoAoGCCqGSM49
+AwEHoUQDQgAEvJ3EHcsCaFigfbjkoZQ/Nx7/H+wFbuUAxutyd1k6nvZjfHTIlV/u
+PEsnPRvCokdRXR5NpON3/EgiOckTAa5s5g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json
index b61f2aef1d6f84..a85f4fc37932c3 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: valid, but less human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820173a003020102020802968d591b55fb0f300a06082a8648ce3d040302302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000412c232a31e703b422757eabbea2d91416ce75151b352592ff59333562152bcc686d9613a683109caaa2384a4cc09ea68a31ceefac8beb44d2029f66bae87eb22a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e5d06c899a983152761040fc15afe6dc108978fb301f0603551d23041830168014ceba68b0bafbcf846a45caaa5c56c40ee803104b300a06082a8648ce3d04030203480030450220202f86eb250fa4b686f7874416cd1a8d5cd91d51e0b75d4ac7a8eeb8e3b80d36022100c6c4d0d4624856a197f15f9ddb27752603d3af13593bca1e0b5845023e9a97d0",
-    "pai_cert": "308201bd30820163a0030201020208022121433adde328300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b425627eb024a59b2dd79dcc4c6c0c47b01a568a1be92e06a038c33c3a7b9fce5ef74cb76f6a2d02df80efd6cbac018bf9a08926b3ecc81a4546342a69080336a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414ceba68b0bafbcf846a45caaa5c56c40ee803104b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c6adab8552dd0a4c42058f61092fe2e5bd3e1c9bc1e7675cf8c87bebc5c2426702203eeda9b4a911974281c8fe793d40bca6f510039cfcb238b800f84b592a602cf8",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207123dec390756ed1a255d63ec6b5f3c4a2411f8bcc3b8cf9d8cc4533685a59dd02210092faf12630b030dc3f79fcc6540df0ac2b5802c8c853ba78e50c6d6548644f4e",
-    "dac_private_key": "50931db0dbe1b4184828398aa35ded346bf216eb10727912ce9fc58b92aba051",
-    "dac_public_key": "0412c232a31e703b422757eabbea2d91416ce75151b352592ff59333562152bcc686d9613a683109caaa2384a4cc09ea68a31ceefac8beb44d2029f66bae87eb22"
+    "dac_cert": "308201cc30820173a00302010202082803101a8af3916b300a06082a8648ce3d040302302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004edad1acd4084fb2ad1142d03fecf261bc137f94b75cd4f629081aedb08fb78a5bf681190d1462b8aa0065ffb8b162119c2b1e6831ccfb9f14b4ff31941d254eea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149379a9a1b6300a95c5931b422e3b0cc3253504ee301f0603551d230418301680148439836be2eeaa3739da211d2c931dae3449cdff300a06082a8648ce3d0403020347003044022079541d2a7d012429096201462cadb4a782fc586366375687354ae184f6e3025202205ae6045c636c5f0e03992c7a160b18c45db4e5bff4774676476f73dd9075efac",
+    "pai_cert": "308201be30820163a0030201020208098ad7227af0f6b6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bc9dc41dcb026858a07db8e4a1943f371eff1fec056ee500c6eb7277593a9ef6637c74c8955fee3c4b273d1bc2a247515d1e4da4e377fc482239c91301ae6ce6a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148439836be2eeaa3739da211d2c931dae3449cdff301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c81608f425412148807c6afcfbe11a937e9701a384fa571d2ebe5277021bfc01022100cf08a6556bdd73d44bad54d94cd71ca6050718d8ed2352a25d4cf0c3388f5e39",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100fd5791cb0cb78285cb2c02b7dd7a27a1140105b6405097f017d5eee29f81b5bf022100adb2c7dd511b475a5ca2f39ccc4497161d27dee9692f3241425258da64fdf7f3",
+    "dac_private_key": "973cc7f8c0a7986811bb18e7178a09b0213b064f227bfb8f96112a82a35d9ad4",
+    "dac_public_key": "04edad1acd4084fb2ad1142d03fecf261bc137f94b75cd4f629081aedb08fb78a5bf681190d1462b8aa0065ffb8b162119c2b1e6831ccfb9f14b4ff31941d254ee"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der
index f9759cba671ea6..fa03a54d9b1109 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der
index 4b9a81421ba95f..f49b1a66b7993e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem
index 1fac79129522c3..80bf607ce1dedd 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByDCCAW6gAwIBAgIIItdoXf2ZHBIwCgYIKoZIzj0EAwIwKjEoMCYGA1UEAwwf
-TWF0dGVyIERldmVsIFBBSSBNcGlkOk12aWQ6RmZmMTAgFw0yMjA0MjYwMDAwMDBa
+MIIByDCCAW6gAwIBAgIIH6b/VhJpj7kwCgYIKoZIzj0EAwIwKjEoMCYGA1UEAwwf
+TWF0dGVyIERldmVsIFBBSSBNcGlkOk12aWQ6RmZmMTAgFw0yMjA1MjcwMDAwMDBa
 GA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3QgREFDMRQw
 EgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAAS94h/X1LfkQhnk32xOr0Z4qXw0FoxjqTjP99tl
-ajo0jhZsBz1ev19HQJ0a6hTqbUU60AdArV+p6xMr04lse2PZo2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUEdkf9vaR/KlrGFPBR+Et
-Nc0nPBwwHwYDVR0jBBgwFoAUlSwFcRiKTKwk2UVPIOdyWdvb8nQwCgYIKoZIzj0E
-AwIDSAAwRQIgOWcp59ShsB+duaNt4p+LzuUkMsAjOXYvdlgsTwjGjx0CIQCnoJdt
-F5weKLDE6UqcgU2QEmJLtNzZIMkkly98wHCfIg==
+hkjOPQIBBggqhkjOPQMBBwNCAATUOpHOly4FCae9exS3U3P3ueGEmXU2CjNwaeUA
+M6htWiUiD0kHKldpqMvLAnBqOFq9jNn2H+NcIMhx6ZiaCH4Eo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdxhmlWi7OW8Gzaa29LUh
+qT8q3nswHwYDVR0jBBgwFoAUpHaD4doIA7oVUVomzpSgSbr+G6owCgYIKoZIzj0E
+AwIDSAAwRQIhAKcsHetDqnUCPVPZOht+gaWNxtt5celfULK2DWoa4wZAAiBONMyh
+pB59mtu3+3ydUV5GyH+dNcHcGLzlJzgB8VGsAA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der
index bc43da8611fa00..30090c6a08512f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem
index 5a24aec0546a9d..9cfe766c69af87 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDEbJ5etJtQuRxRAVYKyxcYUR3uHeRn0czgIK4Rn28+noAoGCCqGSM49
-AwEHoUQDQgAEveIf19S35EIZ5N9sTq9GeKl8NBaMY6k4z/fbZWo6NI4WbAc9Xr9f
-R0CdGuoU6m1FOtAHQK1fqesTK9OJbHtj2Q==
+MHcCAQEEIOpb7sOQ9geYs8oNyAYXTLB6b8YvwZjaJcDjXnSZDHLroAoGCCqGSM49
+AwEHoUQDQgAE1DqRzpcuBQmnvXsUt1Nz97nhhJl1NgozcGnlADOobVolIg9JBypX
+aajLywJwajhavYzZ9h/jXCDIcemYmgh+BA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der
index 47c6393bbcf10c..fa12675b4e25c5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem
index 21d4d315c3b64a..a5aa18a43c62e0 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuTCCAV6gAwIBAgIIMoYaEdEBWvowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBuDCCAV6gAwIBAgIIGn6kVMLr+UswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowKjEoMCYGA1UEAwwfTWF0dGVyIERldmVs
-IFBBSSBNcGlkOk12aWQ6RmZmMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL+Z
-yFyaL2YFF589DfXPyP/3i7ukC6NteJXnfGLZnKAVftdCB+KVfzEJTuIE6C0gLwgo
-62CVvhft66z+mSU8ItOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBSVLAVxGIpMrCTZRU8g53JZ29vydDAfBgNVHSMEGDAW
-gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEApme/dUTd
-1UuDBiXaaOEHs4Mz5Ky5VzFvATgrweAX2CICIQCN+qJHJszIKD6cu8CvPZ0kxZI2
-Dgn9y7gZg2g9x7WG3g==
+IFBBSSBNcGlkOk12aWQ6RmZmMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOX/
+qKLBVv+pOMj+sl07tag2jQrdA/SwbG9aGFNvc7U2dXdq2ivrFGQNUq+gH4t9OW2w
+hpUJdXuWV92lyXpipKSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBSkdoPh2ggDuhVRWibOlKBJuv4bqjAfBgNVHSMEGDAW
+gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA22qX+MvH
+GC1fZ5JZPHKIYpCEpRMYGzshB5XowRvkcEcCIFs89iX31dv2VC3lgVuvl6SloxOJ
+tJjK51uOPcZdWl76
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der
index 4511c58ade52e2..2bbf5c52d04c11 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem
index 87c65ac4aa87fa..026ca1a2511282 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMNr5OClGS3Mj2TGrST024dh+roG6eDVYCYtOi2upe2IoAoGCCqGSM49
-AwEHoUQDQgAEv5nIXJovZgUXnz0N9c/I//eLu6QLo214led8YtmcoBV+10IH4pV/
-MQlO4gToLSAvCCjrYJW+F+3rrP6ZJTwi0w==
+MHcCAQEEILdX48WX3v1juDxF5Z2RSHBghXd9ky9/QsUGTxbk/bMooAoGCCqGSM49
+AwEHoUQDQgAE5f+oosFW/6k4yP6yXTu1qDaNCt0D9LBsb1oYU29ztTZ1d2raK+sU
+ZA1Sr6Afi305bbCGlQl1e5ZX3aXJemKkpA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json
index 99fd3b3477f6d4..dd48a966f34745 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid, PID not present and VID not upper case",
     "is_success_case": "false",
-    "dac_cert": "308201c83082016ea003020102020822d7685dfd991c12300a06082a8648ce3d040302302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bde21fd7d4b7e44219e4df6c4eaf4678a97c34168c63a938cff7db656a3a348e166c073d5ebf5f47409d1aea14ea6d453ad00740ad5fa9eb132bd3896c7b63d9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041411d91ff6f691fca96b1853c147e12d35cd273c1c301f0603551d23041830168014952c0571188a4cac24d9454f20e77259dbdbf274300a06082a8648ce3d04030203480030450220396729e7d4a1b01f9db9a36de29f8bcee52432c02339762f76582c4f08c68f1d022100a7a0976d179c1e28b0c4e94a9c814d9012624bb4dcd920c924972f7cc0709f22",
-    "pai_cert": "308201b93082015ea003020102020832861a11d1015afa300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d03010703420004bf99c85c9a2f6605179f3d0df5cfc8fff78bbba40ba36d7895e77c62d99ca0157ed74207e2957f31094ee204e82d202f0828eb6095be17edebacfe99253c22d3a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414952c0571188a4cac24d9454f20e77259dbdbf274301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a667bf7544ddd54b830625da68e107b38333e4acb957316f01382bc1e017d8220221008dfaa24726ccc8283e9cbbc0af3d9d24c592360e09fdcbb81983683dc7b586de",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022006a4bc3650f895fb97909e557a37cf612d8dc4586d17207ce56ef875f6ac6869022100d511c007746a94f1d888a4fe177312b03dc63a5a6fda02a6129818e9c2d2f055",
-    "dac_private_key": "311b2797ad26d42e4714405582b2c5c614477b877919f47338082b8467dbcfa7",
-    "dac_public_key": "04bde21fd7d4b7e44219e4df6c4eaf4678a97c34168c63a938cff7db656a3a348e166c073d5ebf5f47409d1aea14ea6d453ad00740ad5fa9eb132bd3896c7b63d9"
+    "dac_cert": "308201c83082016ea00302010202081fa6ff5612698fb9300a06082a8648ce3d040302302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004d43a91ce972e0509a7bd7b14b75373f7b9e1849975360a337069e50033a86d5a25220f49072a5769a8cbcb02706a385abd8cd9f61fe35c20c871e9989a087e04a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147718669568bb396f06cda6b6f4b521a93f2ade7b301f0603551d23041830168014a47683e1da0803ba15515a26ce94a049bafe1baa300a06082a8648ce3d0403020348003045022100a72c1deb43aa75023d53d93a1b7e81a58dc6db7971e95f50b2b60d6a1ae3064002204e34cca1a41e7d9adbb7fb7c9d515e46c87f9d35c1dc18bce5273801f151ac00",
+    "pai_cert": "308201b83082015ea00302010202081a7ea454c2ebf94b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d03010703420004e5ffa8a2c156ffa938c8feb25d3bb5a8368d0add03f4b06c6f5a18536f73b53675776ada2beb14640d52afa01f8b7d396db0869509757b9657dda5c97a62a4a4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a47683e1da0803ba15515a26ce94a049bafe1baa301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100db6a97f8cbc7182d5f6792593c7288629084a513181b3b210795e8c11be4704702205b3cf625f7d5dbf6542de5815baf97a4a5a31389b498cae75b8e3dc65d5a5efa",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022029432f34e1c2fb1ad66b0b8d4e51a8cc2476d4e0888d8db0ceb9423cdcf128760221008448d5cf1ac4229d4198679ae531a4c4ac360ddc7582e7ac775fdc0eccfb2a92",
+    "dac_private_key": "ea5beec390f60798b3ca0dc806174cb07a6fc62fc198da25c0e35e74990c72eb",
+    "dac_public_key": "04d43a91ce972e0509a7bd7b14b75373f7b9e1849975360a337069e50033a86d5a25220f49072a5769a8cbcb02706a385abd8cd9f61fe35c20c871e9989a087e04"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der
index 28e8d922f36fa2..e51951dbf01463 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der
index 0827de6153dcf5..9ed6754e6f4a4f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem
index a8f9a9f92e9bed..09b739d572deae 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXOgAwIBAgIIaCAOuhemK8cwCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
-TWF0dGVyIERldmVsIFBBSSBNcGlkOjAwQjEgTVZJRDpGRkYxMCAXDTIyMDQyNjAw
+MIIBzTCCAXOgAwIBAgIIe+L+O0PdcgswCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
+TWF0dGVyIERldmVsIFBBSSBNcGlkOjAwQjEgTVZJRDpGRkYxMCAXDTIyMDUyNzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABA/ws/JsRwLcWnIvttkuni75rVSnnrUE
-h1q9eI5Eew6hKsTkmVJL2HP8XqZqdjll5BPFYOiIwSWNlLdDrb95xTejYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBS5xDcjtwAeJ2BI
-5bJbLxwTXGT94DAfBgNVHSMEGDAWgBR+XvN0Teomu/pOwfzfD9oYR6YtjzAKBggq
-hkjOPQQDAgNIADBFAiEAzqmIPTlJ2CTMg92jrNEuB3lMGZgZWc9gYZ2mDy/KjKEC
-IAly1dEownebdTBR/BnWjplMfKjC9QEnieP6byaXrdY4
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEsTDUHT3j5Mzi4pwuda4UdU2bMPhmtL
+KZCckFxnAupLHUOAN+tczfWV8Yw1ZVZEiyB1XyquasQeWxHcC0NElZ6jYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRhUu49MvpIN76x
+w6QWXEASsRdBlDAfBgNVHSMEGDAWgBQitr32lazIUKxpEOyF+FNhBFJsEDAKBggq
+hkjOPQQDAgNIADBFAiEAuKGJA1OBTdiONW0Tjg+Idw2gPebJJvl6roMXa1j4neQC
+IGQMzuwwDVuqKc/HwyRHkBwTIsLxTngYIcgIQJjyKuAj
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der
index 00d07e88618c6a..a0d99e1887230f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem
index a7a13622895dc1..eceab67eb78067 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFqxNPqW+MqE4RmtESiePv1k//L8IfqhmF7DTS/yiiXPoAoGCCqGSM49
-AwEHoUQDQgAED/Cz8mxHAtxaci+22S6eLvmtVKeetQSHWr14jkR7DqEqxOSZUkvY
-c/xepmp2OWXkE8Vg6IjBJY2Ut0Otv3nFNw==
+MHcCAQEEIBjZAPNHfSlg4UGEXogj5QGFaWR7sqOoIcD/LzmNBIjioAoGCCqGSM49
+AwEHoUQDQgAESxMNQdPePkzOLinC51rhR1TZsw+Ga0spkJyQXGcC6ksdQ4A361zN
+9ZXxjDVlVkSLIHVfKq5qxB5bEdwLQ0SVng==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der
index 49a72f16d2eeb3..aafdf75228a5a6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem
index 6ffd82ea11a649..91ec3c4007bce0 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWOgAwIBAgIIfHa4eKuGKbMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBvTCCAWOgAwIBAgIIfNRf4aNqu4IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowLzEtMCsGA1UEAwwkTWF0dGVyIERldmVs
 IFBBSSBNcGlkOjAwQjEgTVZJRDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEA+3u4Ke8fVEH77YLnBciTZMw/duZhg8/g16AyBfvCqV5LYeTpGzfUhk0lKvz
-NLmP/5z8ctoCiFOlhiF/GcA/s6NmMGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFH5e83RN6ia7+k7B/N8P2hhHpi2PMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0kAMEYCIQCK
-xygXR994Iy7HY2etnh/TAoizyMOZZNpEfWWS7HSvWQIhAMKGL2rXlTXkC/0rv588
-ob+Te5F+TIEs1YJFjiufWc4y
+QgAELKSd+HKczfr499tVROtorl6uvBsIGp+pMK+79qmOMu0gR+rUbWKWdJf7yw81
+1pcccGbiyhqvhrl1Spx0E6kb6aNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFCK2vfaVrMhQrGkQ7IX4U2EEUmwQMB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCIFop
+jsvlLLk9W18oOeibaXqAQf8impjurEAAIvnpTH4EAiEAw5TPEzkv1KTxR80sek0Z
+13oOf/OCAgYM1qLetlVZjkc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der
index 26767357ed87fb..adaee899c4517e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem
index 29a735e2dc5db7..833303a2626440 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIABTniS5MQbSle4mmyn1g2MWguoDPiPW57Z8p93veFyloAoGCCqGSM49
-AwEHoUQDQgAEA+3u4Ke8fVEH77YLnBciTZMw/duZhg8/g16AyBfvCqV5LYeTpGzf
-Uhk0lKvzNLmP/5z8ctoCiFOlhiF/GcA/sw==
+MHcCAQEEIDbjTyzKeuFSj/Ofy7Mw0B9mZNBrLaZenwMco/KuEcbuoAoGCCqGSM49
+AwEHoUQDQgAELKSd+HKczfr499tVROtorl6uvBsIGp+pMK+79qmOMu0gR+rUbWKW
+dJf7yw811pcccGbiyhqvhrl1Spx0E6kb6Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json
index ead78ca3c62027..5d7576fcea967f 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid VID prefix",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820173a003020102020868200eba17a62bc7300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040ff0b3f26c4702dc5a722fb6d92e9e2ef9ad54a79eb504875abd788e447b0ea12ac4e499524bd873fc5ea66a763965e413c560e888c1258d94b743adbf79c537a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b9c43723b7001e276048e5b25b2f1c135c64fde0301f0603551d230418301680147e5ef3744dea26bbfa4ec1fcdf0fda1847a62d8f300a06082a8648ce3d0403020348003045022100cea9883d3949d824cc83dda3acd12e07794c19981959cf60619da60f2fca8ca102200972d5d128c2779b753051fc19d68e994c7ca8c2f5012789e3fa6f2697add638",
-    "pai_cert": "308201be30820163a00302010202087c76b878ab8629b3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000403edeee0a7bc7d5107efb60b9c17224d9330fddb99860f3f835e80c817ef0aa5792d8793a46cdf52193494abf334b98fff9cfc72da028853a586217f19c03fb3a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604147e5ef3744dea26bbfa4ec1fcdf0fda1847a62d8f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008ac7281747df78232ec76367ad9e1fd30288b3c8c39964da447d6592ec74af59022100c2862f6ad79535e40bfd2bbf9f3ca1bf937b917e4c812cd582458e2b9f59ce32",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201de2c1eedc8e4f7116da63d49f9a2d234af051e37cbe32aa4c540e3eb6295b3502201676f8a689e946d9877d170db0ffe3106b8910f1d8e0bbc5a6fdda46bbe116e6",
-    "dac_private_key": "5ab134fa96f8ca84e119ad11289e3efd64fff2fc21faa1985ec34d2ff28a25cf",
-    "dac_public_key": "040ff0b3f26c4702dc5a722fb6d92e9e2ef9ad54a79eb504875abd788e447b0ea12ac4e499524bd873fc5ea66a763965e413c560e888c1258d94b743adbf79c537"
+    "dac_cert": "308201cd30820173a00302010202087be2fe3b43dd720b300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044b130d41d3de3e4cce2e29c2e75ae14754d9b30f866b4b29909c905c6702ea4b1d438037eb5ccdf595f18c356556448b20755f2aae6ac41e5b11dc0b4344959ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146152ee3d32fa4837beb1c3a4165c4012b1174194301f0603551d2304183016801422b6bdf695acc850ac6910ec85f8536104526c10300a06082a8648ce3d0403020348003045022100b8a1890353814dd88e356d138e0f88770da03de6c926f97aae83176b58f89de40220640cceec300d5baa29cfc7c32447901c1322c2f14e781821c8084098f22ae023",
+    "pai_cert": "308201bd30820163a00302010202087cd45fe1a36abb82300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d030107034200042ca49df8729ccdfaf8f7db5544eb68ae5eaebc1b081a9fa930afbbf6a98e32ed2047ead46d62967497fbcb0f35d6971c7066e2ca1aaf86b9754a9c7413a91be9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041422b6bdf695acc850ac6910ec85f8536104526c10301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205a298ecbe52cb93d5b5f2839e89b697a8041ff229a98eeac400022f9e94c7e04022100c394cf13392fd4a4f147cd2c7a4d19d77a0e7ff38202060cd6a2deb655598e47",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201cedfcfa80ad8b0750c43c58d0a63457011ed9000522b96b41e962f8a95a9cf802200eb04c59657acf103ea2f34a394aa138fff7bab104e274733b93ff28b9f688b4",
+    "dac_private_key": "18d900f3477d2960e141845e8823e5018569647bb2a3a821c0ff2f398d0488e2",
+    "dac_public_key": "044b130d41d3de3e4cce2e29c2e75ae14754d9b30f866b4b29909c905c6702ea4b1d438037eb5ccdf595f18c356556448b20755f2aae6ac41e5b11dc0b4344959e"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der
index d15e2a3e751e98..94a9ecfc9952d0 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der
index 0ac96c50bdf26c..0174d8ad9acf73 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem
index f7a633e625c8ad..f7a0599f34e661 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXOgAwIBAgIIP/JlM2SwXdAwCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
-TWF0dGVyIERldmVsIFBBSSBNcGlkXzAwQjEgTXZpZF9GRkYxMCAXDTIyMDQyNjAw
+MIIBzTCCAXOgAwIBAgIIW2m2ChzvYfQwCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
+TWF0dGVyIERldmVsIFBBSSBNcGlkXzAwQjEgTXZpZF9GRkYxMCAXDTIyMDUyNzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ1MrsIndENIbkjCx2xMT10mk0+9xzd4
-ANcbNjnKOLajHNIs9C0I/id0iTgGT+ImwolGIW9KFgYkYzRJnr4QB0+jYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSMk0e1bI59f/8z
-v1uAjpy4VemStjAfBgNVHSMEGDAWgBR9E3W8jxCtZ0MeEQ02PTG7P4waxjAKBggq
-hkjOPQQDAgNJADBGAiEAxkGicBORYb2BIBKdRkW8+UaVkQErsxwQtTwTJ0HlBwwC
-IQCPqm0IsqGeHwLSTpNzR59jq8+BfblhhuCfAKnYXjfJfw==
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABI9AAvyGDYgTkGitbpJkAtb58bmCXWG6
+h3Jm/zI5JMrzIKIM204UtkQp6lOYeamOO2dVb57zS8NyfLHJxrxO8IajYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTF9uELvG0u4sCT
+P76CaAOywdkPaTAfBgNVHSMEGDAWgBRX7YEr/a00TchHPKNUlO302mrtMjAKBggq
+hkjOPQQDAgNIADBFAiEAgQWtuKPCZGFEWNqQkKIgHEKMdCcqBGbbKbTye8l6oX4C
+IDr77eAhqkTx2NVFbZtTC06d7bFIOhdRuGTyjK+wHwjZ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der
index af1beeec21269b..7f1d3663c561a4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem
index dc327a12001af1..899ca84135333a 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAxh+JYV81CsxE8dKdH5Vxh5Z39nbW8rYnIZ3+YSFMg6oAoGCCqGSM49
-AwEHoUQDQgAEnUyuwid0Q0huSMLHbExPXSaTT73HN3gA1xs2Oco4tqMc0iz0LQj+
-J3SJOAZP4ibCiUYhb0oWBiRjNEmevhAHTw==
+MHcCAQEEILtZJs4hDUZDroHF5YI0+MtpieC5FgJzAT29HYj5A+wkoAoGCCqGSM49
+AwEHoUQDQgAEj0AC/IYNiBOQaK1ukmQC1vnxuYJdYbqHcmb/MjkkyvMgogzbThS2
+RCnqU5h5qY47Z1VvnvNLw3J8scnGvE7whg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der
index 9c13101ed01ad7..3dc89017a35aa6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem
index 82f557bb4f8164..d7b4fe80b62a4b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWOgAwIBAgIIe62L+k82JCUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBvDCCAWOgAwIBAgIIWiPK0Mr6ol0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowLzEtMCsGA1UEAwwkTWF0dGVyIERldmVs
 IFBBSSBNcGlkXzAwQjEgTXZpZF9GRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAE/lq8M9Vgw3CNVzRHkpGfhA3wg6iEdXUVsghUBROPMHWQfcD2A2b/Vs/gW34D
-fHrEo6J5LN8C+jD69LoWu1o7WqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFH0TdbyPEK1nQx4RDTY9Mbs/jBrGMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0kAMEYCIQDD
-0SjjodPDuOxmdmOf/8oFrpHi9lOO0B5BOhFBHcy4MQIhAK5cMcDcZAzLgtL3MyyU
-7lvFINA2fh9pAjkYGQemFuOw
+QgAEkvnZ+9YUNhaUDWRxWWc6IqZwwEB4k3/LTYm3UQQsA6BD0/5wL51TmzWZ70y1
+rZJs0i2t6dVhJcg4+FMTYCxAbaNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFftgSv9rTRNyEc8o1SU7fTaau0yMB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0cAMEQCIArN
+AXhL7kEy98hLicvqjdFnPsjv9cWgIQDTY/CV2kzVAiAtUjLsi1YJLyiPTtZ/jOf3
+jKxromzfMMa4zJ0Vy1lFFw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der
index a769b2be1547de..6e4264b6b87f5e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem
index 2fd5d28bfd7bc6..26aca7a05d65e2 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFpvUCzTjrIDO9wXfeSlVsBuR3hIUsPSTCVhAWfUCtuMoAoGCCqGSM49
-AwEHoUQDQgAE/lq8M9Vgw3CNVzRHkpGfhA3wg6iEdXUVsghUBROPMHWQfcD2A2b/
-Vs/gW34DfHrEo6J5LN8C+jD69LoWu1o7Wg==
+MHcCAQEEIDxBtLCnx0PhwtqGB38h75RuzohOiGodPk6xOYO1TZ9uoAoGCCqGSM49
+AwEHoUQDQgAEkvnZ+9YUNhaUDWRxWWc6IqZwwEB4k3/LTYm3UQQsA6BD0/5wL51T
+mzWZ70y1rZJs0i2t6dVhJcg4+FMTYCxAbQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json
index ac005b11e2aa27..353b5c41f91f37 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid PID and VID prefixes",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820173a00302010202083ff2653364b05dd0300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200049d4caec2277443486e48c2c76c4c4f5d26934fbdc7377800d71b3639ca38b6a31cd22cf42d08fe27748938064fe226c28946216f4a1606246334499ebe10074fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148c9347b56c8e7d7fff33bf5b808e9cb855e992b6301f0603551d230418301680147d1375bc8f10ad67431e110d363d31bb3f8c1ac6300a06082a8648ce3d0403020349003046022100c641a270139161bd8120129d4645bcf9469591012bb31c10b53c132741e5070c0221008faa6d08b2a19e1f02d24e9373479f63abcf817db96186e09f00a9d85e37c97f",
-    "pai_cert": "308201be30820163a00302010202087bad8bfa4f362425300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d03010703420004fe5abc33d560c3708d57344792919f840df083a884757515b2085405138f3075907dc0f60366ff56cfe05b7e037c7ac4a3a2792cdf02fa30faf4ba16bb5a3b5aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604147d1375bc8f10ad67431e110d363d31bb3f8c1ac6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c3d128e3a1d3c3b8ec6676639fffca05ae91e2f6538ed01e413a11411dccb831022100ae5c31c0dc640ccb82d2f7332c94ee5bc520d0367e1f690239181907a616e3b0",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100866e52aacfc33af9fa4f1e482a005350cefdd7d5213fcf7710dc5fdcb63feb0e022004e41d872bb8ef89c2aa41226ddc92389d4beaa9efd6fd98c022aaea0f202c75",
-    "dac_private_key": "0c61f89615f350acc44f1d29d1f9571879677f676d6f2b627219dfe61214c83a",
-    "dac_public_key": "049d4caec2277443486e48c2c76c4c4f5d26934fbdc7377800d71b3639ca38b6a31cd22cf42d08fe27748938064fe226c28946216f4a1606246334499ebe10074f"
+    "dac_cert": "308201cd30820173a00302010202085b69b60a1cef61f4300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200048f4002fc860d88139068ad6e926402d6f9f1b9825d61ba877266ff323924caf320a20cdb4e14b64429ea539879a98e3b67556f9ef34bc3727cb1c9c6bc4ef086a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c5f6e10bbc6d2ee2c0933fbe826803b2c1d90f69301f0603551d2304183016801457ed812bfdad344dc8473ca35494edf4da6aed32300a06082a8648ce3d04030203480030450221008105adb8a3c264614458da9090a2201c428c74272a0466db29b4f27bc97aa17e02203afbede021aa44f1d8d5456d9b530b4e9dedb1483a1751b864f28cafb01f08d9",
+    "pai_cert": "308201bc30820163a00302010202085a23cad0cafaa25d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d0301070342000492f9d9fbd6143616940d647159673a22a670c04078937fcb4d89b751042c03a043d3fe702f9d539b3599ef4cb5ad926cd22dade9d56125c838f85313602c406da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041457ed812bfdad344dc8473ca35494edf4da6aed32301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200acd01784bee4132f7c84b89cbea8dd1673ec8eff5c5a02100d363f095da4cd502202d5232ec8b56092f288f4ed67f8ce7f78cac6ba26cdf30c6b8cc9d15cb594517",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e6bc44890d97d68833fec44ab5c713f160ab19618c605b5d74934ab659c25cb3022100c1aed58eebc4b02b0aa27df267815817e08a41a0724e790f90ca2690db854b8c",
+    "dac_private_key": "bb5926ce210d4643ae81c5e58234f8cb6989e0b9160273013dbd1d88f903ec24",
+    "dac_public_key": "048f4002fc860d88139068ad6e926402d6f9f1b9825d61ba877266ff323924caf320a20cdb4e14b64429ea539879a98e3b67556f9ef34bc3727cb1c9c6bc4ef086"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der
index 412a2aa399d170..068f1d681df562 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der
index 06bc6f5da35dbc..7c2b9095b89b10 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem
index eedc82bebe4ba0..54c1e939117c4c 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBjCCAa2gAwIBAgIILsXaBxBEioMwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
+MIICBzCCAa2gAwIBAgIIa0U5jnEM1mUwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMiBNcGlkOjAw
 QjIxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTAg
-Fw0yMjA0MjYwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
+Fw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
 dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQvQ3tkebVZ/SI/Zuea
-PSLZeCtemL8oiQ6bnZAjrGnrDONrzFjDC8HcIJ8SEbK9IbYcsgSvuyYV2uqIa9K4
-d0dio2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-jCSMuEfsdG7tox6gCeqK0GEXsk0wHwYDVR0jBBgwFoAUZv4kfFxg+Nnf7K9Fnpeu
-0euIqx0wCgYIKoZIzj0EAwIDRwAwRAIgfpO1sGKsm9euiUFXPieBGdLykPG0gcIw
-cxIF4lCNuD4CIBygq1ckDzI2lXssLV0TGJBvfRFaWVhLnL19INKoMWUx
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR52a7SEW1qE34IxG09
+u/lSMPTh5IUlM0nwb3kpxZeiWYz/gnjWn2+6ZOJY6UhlCQ/D/SsqHb8TxgDhZJH5
+LJM9o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+qbQ15k+ogiolsNcmnr/qmnnjV9MwHwYDVR0jBBgwFoAUL6ojeUeqBISQmvEIjcKs
+oOoD/gAwCgYIKoZIzj0EAwIDSAAwRQIgV2c79GRiwDuun2qiWJCqnhhU8wit8URe
+4snaj364e4sCIQDPHAMfExb1zLrBtDUZjntu7oD0i8ViO6ed9r31DqSbRA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der
index cce09210806453..857f559270a5c8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem
index 78efa252cd77e2..dfcfb27e4be19d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGsHiGb5z+52p/hULzex2ttM+Jx5trDQLVRH/ab+NNsJoAoGCCqGSM49
-AwEHoUQDQgAEL0N7ZHm1Wf0iP2bnmj0i2XgrXpi/KIkOm52QI6xp6wzja8xYwwvB
-3CCfEhGyvSG2HLIEr7smFdrqiGvSuHdHYg==
+MHcCAQEEIBcI/GzcHFSX9DKOEyIUPfSYa7FA5E2W4T3VsNCxCR8toAoGCCqGSM49
+AwEHoUQDQgAEedmu0hFtahN+CMRtPbv5UjD04eSFJTNJ8G95KcWXolmM/4J41p9v
+umTiWOlIZQkPw/0rKh2/E8YA4WSR+SyTPQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der
index 0426beabf3700a..2ef2be7bcf2426 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem
index caf128f4dfbca1..0171244582b333 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB+DCCAZ2gAwIBAgIIU7UO1LGKayEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB9jCCAZ2gAwIBAgIIOZoWnKwI7IcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowaTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMiBNcGlkOjAwQjIxFDASBgorBgEE
 AYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABJowGZbl6ZLqL57pSSOOSnpW7p7jfsVViHiC21vxjywf5bq/
-yEH/t72pccl9BsEjlwa+W+zdWtqj0pLh60mSEHCjZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRm/iR8XGD42d/sr0Wel67R
-64irHTAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
-AgNJADBGAiEAk6KjC43pD+vI95k/gtIavcVCsGivQugc/QG6fnY8oj0CIQC8/lHN
-NdSoKUSGGbKOBX0KGIIeqnkhj5OA9g17iRdBSw==
+CCqGSM49AwEHA0IABFKrrQwQAaVbYGjfvUd5IhKzfqSMhiDIznV5BvrNpKrrmQGD
+wE6GzaNQGL90WHP+1IUd3CSmjd9ubKcnI7YCf6OjZjBkMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQvqiN5R6oEhJCa8QiNwqyg
+6gP+ADAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
+AgNHADBEAiARPq7CgerZjgYNersLqt2xq2qu+UgL4n8D0mSoolfY/AIgc3wrEsQS
+jirJNQ9XonuXphxrCy9S5E6FUFHdIpT5UDg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der
index 6a880329e6e2d1..5157f2539be235 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem
index 89d4493eb388df..d761678b0fb2a6 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGCGabgXvJ8UtWx5My99aui8xH6ZiNxwKQDtGPh7qen+oAoGCCqGSM49
-AwEHoUQDQgAEmjAZluXpkuovnulJI45KelbunuN+xVWIeILbW/GPLB/lur/IQf+3
-valxyX0GwSOXBr5b7N1a2qPSkuHrSZIQcA==
+MHcCAQEEIC3N3xFMOWyuPFkC9mF0E1ecIUKfTFa4hxbOYNZIm/ocoAoGCCqGSM49
+AwEHoUQDQgAEUqutDBABpVtgaN+9R3kiErN+pIyGIMjOdXkG+s2kquuZAYPATobN
+o1AYv3RYc/7UhR3cJKaN325spycjtgJ/ow==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json
index 4a52fac7a614ae..19b2f292fa44bf 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: valid, Matter OIDs are used and wrong values in the common-name are ignored",
     "is_success_case": "true",
-    "dac_cert": "30820206308201ada00302010202082ec5da0710448a83300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200042f437b6479b559fd223f66e79a3d22d9782b5e98bf28890e9b9d9023ac69eb0ce36bcc58c30bc1dc209f1211b2bd21b61cb204afbb2615daea886bd2b8774762a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148c248cb847ec746eeda31ea009ea8ad06117b24d301f0603551d2304183016801466fe247c5c60f8d9dfecaf459e97aed1eb88ab1d300a06082a8648ce3d040302034700304402207e93b5b062ac9bd7ae8941573e278119d2f290f1b481c230731205e2508db83e02201ca0ab57240f3236957b2c2d5d1318906f7d115a59584b9cbd7d20d2a8316531",
-    "pai_cert": "308201f83082019da003020102020853b50ed4b18a6b21300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200049a301996e5e992ea2f9ee949238e4a7a56ee9ee37ec555887882db5bf18f2c1fe5babfc841ffb7bda971c97d06c1239706be5becdd5adaa3d292e1eb49921070a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e0416041466fe247c5c60f8d9dfecaf459e97aed1eb88ab1d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210093a2a30b8de90febc8f7993f82d21abdc542b068af42e81cfd01ba7e763ca23d022100bcfe51cd35d4a829448619b28e057d0a18821eaa79218f9380f60d7b8917414b",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100dd0c93fbafd3f8813c819c8101765a565c4bd7286790d708ad74ed7d45acf0e60221008e798c1bc09334d26a85f77ede890e590998f8bd56295615e2034136bbecc2de",
-    "dac_private_key": "6b078866f9cfee76a7f8542f37b1dadb4cf89c79b6b0d02d5447fda6fe34db09",
-    "dac_public_key": "042f437b6479b559fd223f66e79a3d22d9782b5e98bf28890e9b9d9023ac69eb0ce36bcc58c30bc1dc209f1211b2bd21b61cb204afbb2615daea886bd2b8774762"
+    "dac_cert": "30820207308201ada00302010202086b45398e710cd665300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000479d9aed2116d6a137e08c46d3dbbf95230f4e1e485253349f06f7929c597a2598cff8278d69f6fba64e258e94865090fc3fd2b2a1dbf13c600e16491f92c933da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a9b435e64fa8822a25b0d7269ebfea9a79e357d3301f0603551d230418301680142faa237947aa0484909af1088dc2aca0ea03fe00300a06082a8648ce3d0403020348003045022057673bf46462c03bae9f6aa25890aa9e1854f308adf1445ee2c9da8f7eb87b8b022100cf1c031f1316f5ccbac1b435198e7b6eee80f48bc5623ba79df6bdf50ea49b44",
+    "pai_cert": "308201f63082019da0030201020208399a169cac08ec87300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000452abad0c1001a55b6068dfbd47792212b37ea48c8620c8ce757906facda4aaeb990183c04e86cda35018bf745873fed4851ddc24a68ddf6e6ca72723b6027fa3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142faa237947aa0484909af1088dc2aca0ea03fe00301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220113eaec281ead98e060d7abb0baaddb1ab6aaef9480be27f03d264a8a257d8fc0220737c2b12c4128e2ac9350f57a27b97a61c6b0b2f52e44e855051dd2294f95038",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022002efd031c9693288dd9c29d278f663b977c11c1f51cacfbb4165b1baeb092af10220779a8fdc147f2f706eda7e251d89e9e2324f7b00014d79d590df69205982d70c",
+    "dac_private_key": "1708fc6cdc1c5497f4328e1322143df4986bb140e44d96e13dd5b0d0b1091f2d",
+    "dac_public_key": "0479d9aed2116d6a137e08c46d3dbbf95230f4e1e485253349f06f7929c597a2598cff8278d69f6fba64e258e94865090fc3fd2b2a1dbf13c600e16491f92c933d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der
index 9dd836f2b70f8c..9e82f935cedf95 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der
index 9e5f03b65c1d77..676993d0ee4c4f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem
index ccdce33b61e588..ad74c4985ae28e 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBjCCAa2gAwIBAgIINjaikl6utsowCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
+MIICBjCCAa2gAwIBAgIIPxC8j5vOi0YwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAw
 QjExFDASBgorBgEEAYKifAIBDARGRkYyMRQwEgYKKwYBBAGConwCAgwEMDBCMjAg
-Fw0yMjA0MjYwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
+Fw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
 dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATeHQ8QmLgYBgIdhwkp
-/w3H5GUHYzStdaienUh2Wr6OTO94SD4lVHjjcn4RESJ+ngrixDNGbEh3FCoiaaaE
-9WuFo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-kUAXwbSmhvp9wZP5YUPmaXP78nIwHwYDVR0jBBgwFoAU3MrsF3b8JdXWtby8F7jX
-AYmKW+kwCgYIKoZIzj0EAwIDRwAwRAIgJE4iLT2CDZ1G0Ad6Qjo0mhh88UD7Zwkk
-uCAfoe3lma8CIFtUKbA0BpTqsaJLisdD7wV0Az5FKeIis5WG9MrkmeCs
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATFOQi1X2UAz5KAiZNr
+iyRjNlm5Yz9J3NdMarcToKj169Xpu3fx3AphP2109x1wuGanoqsL9uUuJb4Mn4nc
+xmQAo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+EK8tjzDPzrF0dHazFIjGzBWYwdYwHwYDVR0jBBgwFoAUKUoWwtP/Kuuav6jyLUig
+FTgFuAQwCgYIKoZIzj0EAwIDRwAwRAIgXFWgmKWD/AmvHrpl6xAa+9++YLE+V85q
+hjpHpiX/MzACIE5xudZ934ph98c8cd456nmsC7mmqWokctwkSeB5tTFO
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der
index 4a0b6824688860..15cb9312da2586 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem
index ca3fbdfe79a816..fa5e4599b0a762 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKPyuGWkdHixqy8cXQBTIvjhJyZTM4MZDZJ6HHLYnWRioAoGCCqGSM49
-AwEHoUQDQgAE3h0PEJi4GAYCHYcJKf8Nx+RlB2M0rXWonp1Idlq+jkzveEg+JVR4
-43J+EREifp4K4sQzRmxIdxQqImmmhPVrhQ==
+MHcCAQEEIEiiDKOv4TTbeTjPMdF0cHesg7vBLNlGSy0huJUnkAOroAoGCCqGSM49
+AwEHoUQDQgAExTkItV9lAM+SgImTa4skYzZZuWM/SdzXTGq3E6Co9evV6bt38dwK
+YT9tdPcdcLhmp6KrC/blLiW+DJ+J3MZkAA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der
index 44f83f7f47216e..f9c9afbf4ecbb9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem
index 5d4c359ace3e5a..97ec1f65d3091d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAZ2gAwIBAgIIdGAndxnb2YUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIB9jCCAZ2gAwIBAgIIQSEubpdenBYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowaTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAwQjExFDASBgorBgEE
 AYKifAIBDARGRkYyMRQwEgYKKwYBBAGConwCAgwEMDBCMjBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABAh7Y6SkNgnCOoYzYHx+cYD8opD1hS52ePYau+Gbrz+uX7Or
-zEeYCrNPgkaf+R/6OTnMR8H6l4V4b0JWu46BwjGjZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTcyuwXdvwl1da1vLwXuNcB
-iYpb6TAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
-AgNIADBFAiEAtNbuCr+9ZOfkCmvKVfW1cF2XJfmgRV+0e8tkinnl/SoCICMY8QQ8
-vND3TzkKHWP0lkU7rFeVcMM8R0HVaWSbQhM7
+CCqGSM49AwEHA0IABCjFIo2u9LOZF6o/oWpIzWGoAVJON4SEYm4epTA2hy8rcV/0
+xGzPpVv1enzzgOi+7KlGX6YJDoaXWUSBkJr3+XGjZjBkMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQpShbC0/8q65q/qPItSKAV
+OAW4BDAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
+AgNHADBEAiAZYHFaet973iZLkHafZSaka0K2qALVzXYmN15yN7Xx6gIgGY4qyGhD
+EMoK69UiPPu3S8yQwj0IbDv1soUJMS0k8yI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der
index 4fbb73a3d0b09c..05dfaefd132953 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem
index 3beb7f644e7dda..ed75b5d234788c 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIL361TpOyUphrFDGATk+gQmnhy91ZPfP2ovb9x32PMHhoAoGCCqGSM49
-AwEHoUQDQgAECHtjpKQ2CcI6hjNgfH5xgPyikPWFLnZ49hq74ZuvP65fs6vMR5gK
-s0+CRp/5H/o5OcxHwfqXhXhvQla7joHCMQ==
+MHcCAQEEIO7qG6xutH6fpVw3FXOxohA16AXkr5rzWvaXL+4PxXj1oAoGCCqGSM49
+AwEHoUQDQgAEKMUija70s5kXqj+hakjNYagBUk43hIRibh6lMDaHLytxX/TEbM+l
+W/V6fPOA6L7sqUZfpgkOhpdZRIGQmvf5cQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json
index 50f0f0919ebea9..7a84dbf163100f 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: wrong, Correct values encoded in the common-name are ignored",
     "is_success_case": "false",
-    "dac_cert": "30820206308201ada00302010202083636a2925eaeb6ca300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004de1d0f1098b81806021d870929ff0dc7e465076334ad75a89e9d48765abe8e4cef78483e255478e3727e1111227e9e0ae2c433466c4877142a2269a684f56b85a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414914017c1b4a686fa7dc193f96143e66973fbf272301f0603551d23041830168014dccaec1776fc25d5d6b5bcbc17b8d701898a5be9300a06082a8648ce3d04030203470030440220244e222d3d820d9d46d0077a423a349a187cf140fb670924b8201fa1ede599af02205b5429b0340694eab1a24b8ac743ef0574033e4529e222b39586f4cae499e0ac",
-    "pai_cert": "308201f73082019da00302010202087460277719dbd985300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d03010703420004087b63a4a43609c23a8633607c7e7180fca290f5852e7678f61abbe19baf3fae5fb3abcc47980ab34f82469ff91ffa3939cc47c1fa9785786f4256bb8e81c231a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414dccaec1776fc25d5d6b5bcbc17b8d701898a5be9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b4d6ee0abfbd64e7e40a6bca55f5b5705d9725f9a0455fb47bcb648a79e5fd2a02202318f1043cbcd0f74f390a1d63f496453bac579570c33c4741d569649b42133b",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100bccdb1e0d981ea6ab96d081c148b792bf27d7a3247dab9c0a625405721468de1022072c250a3f69b2211a8e580f3d3d27f54b646cbb5c88a9486be07cc5651ee8904",
-    "dac_private_key": "a3f2b865a47478b1ab2f1c5d005322f8e12726533383190d927a1c72d89d6462",
-    "dac_public_key": "04de1d0f1098b81806021d870929ff0dc7e465076334ad75a89e9d48765abe8e4cef78483e255478e3727e1111227e9e0ae2c433466c4877142a2269a684f56b85"
+    "dac_cert": "30820206308201ada00302010202083f10bc8f9bce8b46300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c53908b55f6500cf928089936b8b24633659b9633f49dcd74c6ab713a0a8f5ebd5e9bb77f1dc0a613f6d74f71d70b866a7a2ab0bf6e52e25be0c9f89dcc66400a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041410af2d8f30cfceb1747476b31488c6cc1598c1d6301f0603551d23041830168014294a16c2d3ff2aeb9abfa8f22d48a0153805b804300a06082a8648ce3d040302034700304402205c55a098a583fc09af1eba65eb101afbdfbe60b13e57ce6a863a47a625ff333002204e71b9d67ddf8a61f7c73c71de39ea79ac0bb9a6a96a2472dc2449e079b5314e",
+    "pai_cert": "308201f63082019da003020102020841212e6e975e9c16300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d0301070342000428c5228daef4b39917aa3fa16a48cd61a801524e378484626e1ea53036872f2b715ff4c46ccfa55bf57a7cf380e8beeca9465fa6090e8697594481909af7f971a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414294a16c2d3ff2aeb9abfa8f22d48a0153805b804301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201960715a7adf7bde264b90769f6526a46b42b6a802d5cd7626375e7237b5f1ea0220198e2ac8684310ca0aebd5223cfbb74bcc90c23d086c3bf5b28509312d24f322",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022062c95d1760f1dbe26412f2564c762b114918c9e70ccd1095507104d6c7fadd28022100c486570025adea4a23ad3ce3c3e146b38a3ed33d13faaab4ed2e397219544f44",
+    "dac_private_key": "48a20ca3afe134db7938cf31d1747077ac83bbc12cd9464b2d21b895279003ab",
+    "dac_public_key": "04c53908b55f6500cf928089936b8b24633659b9633f49dcd74c6ab713a0a8f5ebd5e9bb77f1dc0a613f6d74f71d70b866a7a2ab0bf6e52e25be0c9f89dcc66400"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der
index dbd1ce1c0b539d..16604780029563 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der
index 10780ec5dd26a8..fe0d2d5aabc4b5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem
index c7d16cce6c68ea..84bf499280ac1d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByTCCAW6gAwIBAgIIaWRWJl7M4oQwCgYIKoZIzj0EAwIwKjESMBAGA1UEAwwJ
-TXZpZDpGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTAgFw0yMjA0MjYwMDAwMDBa
+MIIByDCCAW6gAwIBAgIILzCLs682ZcQwCgYIKoZIzj0EAwIwKjESMBAGA1UEAwwJ
+TXZpZDpGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTAgFw0yMjA1MjcwMDAwMDBa
 GA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3QgREFDMRQw
 EgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAARLkvF7+FxWjNxOTTEGTp2wXwnZQjrWYfaS817o
-X/0jgZb6+0rFiCrFnK99r99TorOuOBbNqXZXbKDp/+J/4C2Mo2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUoJdo8ecGaTL8kvT79KfD
-rLZJGCUwHwYDVR0jBBgwFoAUDdb4OWpTLIeli/ovEsM6++RG+2kwCgYIKoZIzj0E
-AwIDSQAwRgIhAJ3mAbmIL676/fJ8Oh35uJ4ptlGtEUxmK/MBdjfHq6j+AiEAhAht
-TPKkThK5JaNiHTcLK2gyl9CC73HXhNr5xKJfKbA=
+hkjOPQIBBggqhkjOPQMBBwNCAAQ/2ZZJulDtjKzlHVy0IiuSX3fkf+uq/Go+uWrf
+R8eyL2nAYznZYUw3qqNuEdrVsapQbcj0rComaLIyMcrV7HXxo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUv12HZ/IUBDKNDWJf+HK3
+42ks7H4wHwYDVR0jBBgwFoAUpi3f4yBe2vmeUif5KfDbtc0fcWIwCgYIKoZIzj0E
+AwIDSAAwRQIhAIM5lg2NMCO4Xltu/l3S06bLGh3+QQi7ungjFblQbtkYAiA4fGeG
+m8LrIKV783ojxrVUx8BGjZyFEEDwcOeW8QznbA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der
index c3bbbe10e7afc7..15944b79356ecd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem
index 1dcb62c3a25769..36074ac3018c2e 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILWCfY3cjxpS8POyTOojrTPXJKt6W76MhnpFRhg7w01KoAoGCCqGSM49
-AwEHoUQDQgAES5Lxe/hcVozcTk0xBk6dsF8J2UI61mH2kvNe6F/9I4GW+vtKxYgq
-xZyvfa/fU6KzrjgWzal2V2yg6f/if+AtjA==
+MHcCAQEEIIrL52clUzCDPlJ1ec4ArlsF3kyLDCx0WoAKpDjug4h1oAoGCCqGSM49
+AwEHoUQDQgAEP9mWSbpQ7Yys5R1ctCIrkl935H/rqvxqPrlq30fHsi9pwGM52WFM
+N6qjbhHa1bGqUG3I9KwqJmiyMjHK1ex18Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der
index 748e8d64b3e262..48f5fc9bf91e14 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem
index a36fc3e4df3520..173b6354523c1b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBtzCCAV6gAwIBAgIIBmfvGkKEKAswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA0MjYw
+MIIBtzCCAV6gAwIBAgIIevMNDRv28ocwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowKjESMBAGA1UEAwwJTXZpZDpGRkYxMRQw
-EgYKKwYBBAGConwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBvQ
-clzbzGk3Er+VbXdcSq/3DhnX28M5d9rg14/ldxIwLGUUAGPMwAMdtr6l9dbxO8bZ
-EShbsS4RZNvP4cvImmejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBQN1vg5alMsh6WL+i8Swzr75Eb7aTAfBgNVHSMEGDAW
-gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBuLs2UXYzE
-q8WUfaUEogUv1w7oXQti62az6vOQyHZeLAIgcRdtrn3B7vHZr4TWoGlykHjbxeyd
-ORfyxwt9W6Ri+hw=
+EgYKKwYBBAGConwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABO0Y
+q5AwEFZLuPSs/+WprAIUxQSpDJfmhNw9kloEIyjwwUeCC/QozPRLNrE3HoHvVrvr
+76rRXnBmfr5hhLjmcuijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBSmLd/jIF7a+Z5SJ/kp8Nu1zR9xYjAfBgNVHSMEGDAW
+gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBJqarfgp5Y
+xWk+JRf1Vn3bEBhB3mV+YABfrbMhT1OjQAIgUdIqaiFIjWV74ksHfmG91L/WFGlE
+7WMQ+47CuKSlwAQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der
index 0a2ff5c6f40462..856e91133dd483 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem
index 6ecb67b51062d2..f7241662a1ce8a 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOsLfErihojvByHetHApvIeb4jDnrrOgyf03bUznemw5oAoGCCqGSM49
-AwEHoUQDQgAEG9ByXNvMaTcSv5Vtd1xKr/cOGdfbwzl32uDXj+V3EjAsZRQAY8zA
-Ax22vqX11vE7xtkRKFuxLhFk28/hy8iaZw==
+MHcCAQEEILRP8HmxxmxfHSff7kAt86OuYECwsw3ti5yy9PvIe6eQoAoGCCqGSM49
+AwEHoUQDQgAE7RirkDAQVku49Kz/5amsAhTFBKkMl+aE3D2SWgQjKPDBR4IL9CjM
+9Es2sTcege9Wu+vvqtFecGZ+vmGEuOZy6A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json
index 3fb21bd1b51b1e..3b14324bdc5840 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: invalid, PID is using Matter OID then VID must also use Matter OID",
     "is_success_case": "false",
-    "dac_cert": "308201c93082016ea0030201020208696456265ecce284300a06082a8648ce3d040302302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313020170d3232303432363030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044b92f17bf85c568cdc4e4d31064e9db05f09d9423ad661f692f35ee85ffd238196fafb4ac5882ac59caf7dafdf53a2b3ae3816cda976576ca0e9ffe27fe02d8ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a09768f1e7066932fc92f4fbf4a7c3acb6491825301f0603551d230418301680140dd6f8396a532c87a58bfa2f12c33afbe446fb69300a06082a8648ce3d04030203490030460221009de601b9882faefafdf27c3a1df9b89e29b651ad114c662bf3017637c7aba8fe02210084086d4cf2a44e12b925a3621d370b2b683297d082ef71d784daf9c4a25f29b0",
-    "pai_cert": "308201b73082015ea00302010202080667ef1a4284280b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303432363030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200041bd0725cdbcc693712bf956d775c4aaff70e19d7dbc33977dae0d78fe57712302c65140063ccc0031db6bea5f5d6f13bc6d911285bb12e1164dbcfe1cbc89a67a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604140dd6f8396a532c87a58bfa2f12c33afbe446fb69301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402206e2ecd945d8cc4abc5947da504a2052fd70ee85d0b62eb66b3eaf390c8765e2c022071176dae7dc1eef1d9af84d6a069729078dbc5ec9d3917f2c70b7d5ba462fa1c",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206f09b8e0c3b8fb4490ccdeadd3895e809cba70319cdb75ccf5fc66b51072b5ae0221009f3db6aefce25aa3f7f36e596ffbff48e9475248841be737cffe62eada8f6813",
-    "dac_private_key": "b5827d8ddc8f1a52f0f3b24cea23ad33d724ab7a5bbe8c867a4546183bc34d4a",
-    "dac_public_key": "044b92f17bf85c568cdc4e4d31064e9db05f09d9423ad661f692f35ee85ffd238196fafb4ac5882ac59caf7dafdf53a2b3ae3816cda976576ca0e9ffe27fe02d8c"
+    "dac_cert": "308201c83082016ea00302010202082f308bb3af3665c4300a06082a8648ce3d040302302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043fd99649ba50ed8cace51d5cb4222b925f77e47febaafc6a3eb96adf47c7b22f69c06339d9614c37aaa36e11dad5b1aa506dc8f4ac2a2668b23231cad5ec75f1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bf5d8767f21404328d0d625ff872b7e3692cec7e301f0603551d23041830168014a62ddfe3205edaf99e5227f929f0dbb5cd1f7162300a06082a8648ce3d04030203480030450221008339960d8d3023b85e5b6efe5dd2d3a6cb1a1dfe4108bbba782315b9506ed9180220387c67869bc2eb20a57bf37a23c6b554c7c0468d9c851040f070e796f10ce76c",
+    "pai_cert": "308201b73082015ea00302010202087af30d0d1bf6f287300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004ed18ab903010564bb8f4acffe5a9ac0214c504a90c97e684dc3d925a042328f0c147820bf428ccf44b36b1371e81ef56bbebefaad15e70667ebe6184b8e672e8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a62ddfe3205edaf99e5227f929f0dbb5cd1f7162301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022049a9aadf829e58c5693e2517f5567ddb101841de657e60005fadb3214f53a340022051d22a6a21488d657be24b077e61bdd4bfd6146944ed6310fb8ec2b8a4a5c004",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502204d2a66e481c87ed809de40a15bfe7d9d1367a6bcb03ea6c3ef32d33d519d0b16022100f70d4962fe3e432da5cb021217514dca155ffd4dbdabcd05d7f940aa3a3d714e",
+    "dac_private_key": "8acbe767255330833e527579ce00ae5b05de4c8b0c2c745a800aa438ee838875",
+    "dac_public_key": "043fd99649ba50ed8cace51d5cb4222b925f77e47febaafc6a3eb96adf47c7b22f69c06339d9614c37aaa36e11dad5b1aa506dc8f4ac2a2668b23231cad5ec75f1"
 }
diff --git a/docs/BUG_REPORT.md b/docs/BUG_REPORT.md
index 1620aa154f9d79..20b61efc789e7b 100644
--- a/docs/BUG_REPORT.md
+++ b/docs/BUG_REPORT.md
@@ -88,8 +88,8 @@ build) to get started. Beyond that, you can refine if more items seem relevant:
 *   `Tested with avahi-build and it passes/fails` helps the developer with
     information of non-default builds that pass/fail to narrow down the problem
 
-*   `Passes with chip-tool-darwin and repl but fails with chip-tool` helps the
-    developer in narrowing down the problem
+*   `Passes with darwin-framework-tool and repl but fails with chip-tool` helps
+    the developer in narrowing down the problem
 
 ### Additional information
 
diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md
index 782322c7a73467..5bcd865ca5db1b 100644
--- a/docs/guides/BUILDING.md
+++ b/docs/guides/BUILDING.md
@@ -43,7 +43,7 @@ On Debian-based Linux distributions such as Ubuntu, these dependencies can be
 satisfied with the following:
 
 ```
-sudo apt-get install git gcc g++ python pkg-config libssl-dev libdbus-1-dev \
+sudo apt-get install git gcc g++ pkg-config 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
 ```
@@ -86,7 +86,8 @@ architectures on a micro SD card. This release will have bluez 5.55 or newer
 which is required for BLE functionality.
 
 Boot the SD card, login with the default user account "ubuntu" and password
-"ubuntu", then proceed with "How to install prerequisites on Linux".
+"ubuntu", then proceed with
+[Installing prerequisites on Linux](#installing-prerequisites-on-linux).
 
 Finally, install some Raspberry Pi specific dependencies:
 
diff --git a/docs/guides/chip_tool_guide.md b/docs/guides/chip_tool_guide.md
index a516faef4a79ec..5dbeb5f3b1b678 100644
--- a/docs/guides/chip_tool_guide.md
+++ b/docs/guides/chip_tool_guide.md
@@ -286,22 +286,23 @@ In this command:
 -   _<pin_code\>_ and _<discriminator\>_ are device specific keys determined in
     the step 4.
 
-##### Commissioning with QR code payload
+##### Commissioning with QR code payload or manual pairing code
 
-Matter devices log the QR code and its payload when they boot.
+Matter devices log the QR code payload and manual pairing code when they boot.
 
 Use the following command pattern to discover devices based on the given QR code
-payload and try to pair with the first discovered one:
+payload or manual pairing code and try to pair with the first discovered one:
 
 ```
-$ ./chip-tool qrcode <node_id> <qrcode_payload>
+$ ./chip-tool pairing code <node_id> <qrcode_payload-or-manual_code>
 ```
 
 In this command:
 
 -   _<node_id\>_ is the user-defined ID of the node being commissioned.
--   _<qrcode_payload\>_ is the QR code payload ID, for example
-    `MT:Y.K9042C00KA0648G00`.
+-   _<qrcode_payload-or-manual_code\>_ is the QR code payload ID, for example
+    `MT:Y.K9042C00KA0648G00`, or a manual pairing code like
+    `749701123365521327694`.
 
 #### Forgetting the already-commissioned device
 
diff --git a/docs/guides/infineon_p6_software_update.md b/docs/guides/infineon_p6_software_update.md
new file mode 100644
index 00000000000000..ae88abc5701260
--- /dev/null
+++ b/docs/guides/infineon_p6_software_update.md
@@ -0,0 +1,76 @@
+# Matter Software Update with Infineon P6 example applications
+
+The Over The Air (OTA) Software Update functionality can be added to any of the
+Infineon P6 example applications by passing the `chip_enable_ota_requestor=true`
+option to the build script.
+
+## Running the OTA Download scenario
+
+-   An OTA Provider is a node that can respond to the OTA Requestors' queries
+    about available software updates and share the update packages with them. An
+    OTA Requestor is any node that needs to be updated and can communicate with
+    the OTA Provider to fetch applicable software updates. In the procedure
+    described below, the OTA Provider will be a Linux application and the
+    example running on the Infineon P6 board will work as the OTA Requestor.
+
+-   On a Linux or Darwin platform build the chip-tool and the ota-provider-app
+    as follows:
+
+           ```
+           scripts/examples/gn_build_example.sh examples/chip-tool out/
+           scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
+           ```
+
+-   Build the P6 OTA Requestor application from the chip root dir:
+
+          $ ./examples/<example directory>/p6/ota_base_build.sh
+
+-   Build the P6 OTA Update application from the chip root dir:
+
+          $ ./examples/<example directory>/p6/ota_update_build.sh
+
+*   Additionally a pre-compiled bootloader must be flashed to the board using
+    [Cypress Programmer](https://softwaretools.infineon.com/tools/com.ifx.tb.tool.cypressprogrammer).
+    This image can be found at:
+
+          $ ./third_party/p6/p6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex
+
+*   In a terminal start the Provider app passing to it the path to the Matter
+    OTA file created in the previous step:(output of ota_update_build step)
+
+           ```
+           rm -r /tmp/chip_*
+           ./out/debug/chip-ota-provider-app -f chip-p6-lighting-example.ota
+           ```
+
+*   In a separate terminal run the chip-tool commands to provision the Provider:
+
+           ```
+           ./out/chip-tool pairing onnetwork 1 20202021
+           ./out/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
+           ```
+
+*   If the application device had been previously commissioned press USER Button
+    2 to factory-reset the device.
+
+*   In the chip-tool terminal enter:
+
+           ```
+           ./out/chip-tool pairing ble-wifi 2 <WIFI_SSID> <WIFI_PASSWORD> 20202021 3840
+           ```
+
+*   Once the commissioning process completes enter:
+
+           ```
+           ./out/chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 2 0
+           ```
+
+*   The application device will connect to the Provider and start the image
+    download. Status of the transfer can be monitored in the OTA Provider
+    terminal. Once the image is downloaded the device will reboot into the
+    downloaded image.
+
+In order for the Provider to successfully serve the image to a device during the
+OTA Software Update process the softwareVersion parameter in the Provider config
+file must be greater than the CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
+parameter set in the application's CHIPProjectConfig.h file.
diff --git a/docs/guides/openthread_border_router_pi.md b/docs/guides/openthread_border_router_pi.md
index 3e0ebfeea90f83..91c4b77eef3b0e 100644
--- a/docs/guides/openthread_border_router_pi.md
+++ b/docs/guides/openthread_border_router_pi.md
@@ -18,18 +18,16 @@ functions:
 [OpenThread Border Router](https://openthread.io/guides/border-router) (OTBR)
 released by Google is an open-source implementation of the Thread Border Router.
 
-## Setup
+## Tutorials
 
-**Follow [this CodeLab](https://openthread.io/codelabs/openthread-border-router)
-to set up your OpenThread Border Router on a Raspberry Pi 3/4 device!**
+Follow the
+[CodeLab tutorial on openthread.io](https://openthread.io/codelabs/openthread-border-router)
+to set up your OpenThread Border Router on a Raspberry Pi 3 or Raspberry Pi 4
+device. Ubuntu and debian hosts are also supported. The CodeLab uses Nordic
+Semiconductor's nRF52840 DK as the Border Router RCP device.
 
-> Ubuntu and debian hosts are also supported!
-
-The CodeLab uses Nordic Semiconductor's nRF52840 DK as the Border Router RCP
-device.
-
--   See this [guide](./openthread_rcp_nrf_dongle.md) for configuring the
+-   See [this guide](./openthread_rcp_nrf_dongle.md) for configuring the
     nRF52840 Dongle as an RCP device.
--   See this
-    [guide](https://www.silabs.com/documents/public/application-notes/an1256-using-sl-rcp-with-openthread-border-router.pdf)
+-   See
+    [this guide](https://www.silabs.com/documents/public/application-notes/an1256-using-sl-rcp-with-openthread-border-router.pdf)
     for creating Silicon Labs RCP devices.
diff --git a/docs/guides/openthread_rcp_nrf_dongle.md b/docs/guides/openthread_rcp_nrf_dongle.md
index 4f682f139897ef..57bb716a3ff0d0 100644
--- a/docs/guides/openthread_rcp_nrf_dongle.md
+++ b/docs/guides/openthread_rcp_nrf_dongle.md
@@ -10,66 +10,17 @@ You can build and program
 Once programmed, the dongle can be used for
 [configuring Thread network on a Linux machine](./openthread_border_router_pi.md).
 
-## Building and programming the RCP firmware onto an nRF52840 Dongle
-
-Run the following commands to build and program the RCP firmware onto an
-nRF52840 Dongle:
-
-1.  Clone the OpenThread nRF528xx platform repository into the current
-    directory:
-
-        ```
-        git clone --recursive https://github.com/openthread/ot-nrf528xx.git
-        ```
-
-2.  Enter the _ot-nrf528xx_ directory:
-
-        ```
-        cd ot-nrf528xx
-        ```
-
-3.  Install OpenThread dependencies:
-
-        ```
-        ./script/bootstrap
-        ```
-
-4.  Build OpenThread for the nRF52840 Dongle:
-
-         $ script/build nrf52840 USB_trans -DOT_BOOTLOADER=USB -DOT_THREAD_VERSION=1.2
+## Requirements
 
-    This creates an RCP image at `build/bin/ot-rcp`.
+You need to set up the
+[nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
+to build and program the OpenThread Radio Co-Processor to the nRF52840 Dongle.
+Read the
+[nRF Connect SDK Getting started](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started.html)
+documentation for more information.
 
-5.  Convert the RCP image to the `.hex` format:
-
-        ```
-        arm-none-eabi-objcopy -O ihex build/bin/ot-rcp build/bin/ot-rcp.hex
-        ```
-
-6.  Install
-    [nRF Util](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Util):
-
-        ```
-        python3 -m pip install -U nrfutil
-        ```
-
-7.  Generate the RCP firmware package:
-
-        ```
-        nrfutil pkg generate --hw-version 52 --sd-req=0x00 \
-            --application build/bin/ot-rcp.hex \
-            --application-version 1 build/bin/ot-rcp.zip
-        ```
-
-8.  Connect the nRF52840 Dongle to the USB port.
-
-9.  Press the **Reset** button on the dongle to put it into the DFU mode. Red
-    LED on the dongle starts blinking.
-
-10. To install the RCP firmware package onto the dongle, run the following
-    command, with `/dev/ttyACM0` replaced with the device node name of your
-    nRF52840 Dongle:
+## Building and programming the RCP firmware onto an nRF52840 Dongle
 
-        ```
-        nrfutil dfu usb-serial -pkg build/bin/ot-rcp.zip -p /dev/ttyACM0
-        ```
+After you set up the nRF Connect SDK, follow the steps in the
+[Configuring a radio co-processor](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/ug_thread_tools.html#configuring-a-radio-co-processor)
+section for the nRF52840 Dongle (USB transport).
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 fb6f5cb382b0c1..0bf6a45aeaefcb 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
@@ -989,16 +989,6 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlAlarmMask : BITMAP16 {
-    kLockingMechanismJammed = 0x1;
-    kLockResetToFactoryDefaults = 0x2;
-    kReserved = 0x4;
-    kRFModulePowerCycled = 0x8;
-    kWrongCodeEntryLimit = 0x10;
-    kFrontEscutcheonRemovedFromMain = 0x20;
-    kForcedDoorOpenUnderDoorLockedCondition = 0x40;
-  }
-
   bitmap DlCredentialRuleMask : BITMAP8 {
     kSingle = 0x1;
     kDual = 0x2;
@@ -1600,11 +1590,19 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -1730,74 +1728,6 @@ server cluster Groups = 4 {
   command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster IasZone = 1280 {
-  enum IasEnrollResponseCode : ENUM8 {
-    kSuccess = 0;
-    kNotSupported = 1;
-    kNoEnrollPermit = 2;
-    kTooManyZones = 3;
-  }
-
-  enum IasZoneType : ENUM16 {
-    kStandardCie = 0;
-    kMotionSensor = 13;
-    kContactSwitch = 21;
-    kFireSensor = 40;
-    kWaterSensor = 42;
-    kGasSensor = 43;
-    kPersonalEmergencyDevice = 44;
-    kVibrationMovementSensor = 45;
-    kRemoteControl = 271;
-    kKeyFob = 277;
-    kKeypad = 541;
-    kStandardWarningDevice = 549;
-    kGlassBreakSensor = 550;
-    kCarbonMonoxideSensor = 551;
-    kSecurityRepeater = 553;
-    kInvalidZoneType = 65535;
-  }
-
-  bitmap IasZoneStatus : BITMAP16 {
-    kAlarm1 = 0x1;
-    kAlarm2 = 0x2;
-    kTamper = 0x4;
-    kBattery = 0x8;
-    kSupervisionReports = 0x10;
-    kRestoreReports = 0x20;
-    kTrouble = 0x40;
-    kAc = 0x80;
-    kTest = 0x100;
-    kBatteryDefect = 0x200;
-  }
-
-  readonly attribute enum8 zoneState = 0;
-  readonly attribute enum16 zoneType = 1;
-  readonly attribute bitmap16 zoneStatus = 2;
-  attribute node_id iasCieAddress = 16;
-  readonly attribute int8u zoneId = 17;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ZoneEnrollResponseRequest {
-    IasEnrollResponseCode enrollResponseCode = 0;
-    INT8U zoneId = 1;
-  }
-
-  response struct ZoneStatusChangeNotification = 0 {
-    IasZoneStatus zoneStatus = 0;
-    BITMAP8 extendedStatus = 1;
-    INT8U zoneId = 2;
-    INT16U delay = 3;
-  }
-
-  response struct ZoneEnrollRequest = 1 {
-    IasZoneType zoneType = 0;
-    INT16U manufacturerCode = 1;
-  }
-
-  command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0;
-}
-
 server cluster Identify = 3 {
   enum IdentifyEffectIdentifier : ENUM8 {
     kBlink = 0;
@@ -1958,6 +1888,16 @@ server cluster KeypadInput = 1289 {
 
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
+  }
+
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
+  }
+
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
 server cluster LevelControl = 8 {
@@ -2092,6 +2032,20 @@ server cluster MediaInput = 1287 {
   readonly attribute int8u currentInput = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct SelectInputRequest {
+    INT8U index = 0;
+  }
+
+  request struct RenameInputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
+  }
+
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 server cluster MediaPlayback = 1286 {
@@ -2148,6 +2102,7 @@ server cluster ModeSelect = 80 {
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+  readonly attribute int8u manufacturerExtension = 4293984257;
 
   request struct ChangeToModeRequest {
     INT8U newMode = 0;
@@ -2498,6 +2453,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -2538,13 +2494,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -2565,10 +2522,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -2597,7 +2550,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster PowerSource = 47 {
@@ -2919,12 +2871,16 @@ server cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -2995,6 +2951,18 @@ server cluster TargetNavigator = 1285 {
   readonly attribute int8u currentTarget = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
 }
 
 server cluster TemperatureMeasurement = 1026 {
@@ -3006,7 +2974,7 @@ server cluster TemperatureMeasurement = 1026 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster TestCluster = 1295 {
+server cluster TestCluster = 4294048773 {
   enum SimpleEnum : ENUM8 {
     kUnspecified = 0;
     kValueA = 1;
@@ -3049,8 +3017,8 @@ server cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   struct NullablesAndOptionalsStruct {
@@ -3395,11 +3363,16 @@ server cluster Thermostat = 513 {
   attribute access(write: manage) int8s minSetpointDeadBand = 25;
   attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
   attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 startOfWeek = 32;
-  readonly attribute int8u numberOfWeeklyTransitions = 33;
-  readonly attribute int8u numberOfDailyTransitions = 34;
+  readonly attribute enum8 thermostatRunningMode = 30;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
+  }
+
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
 }
 
 server cluster ThermostatUserInterfaceConfiguration = 516 {
@@ -3495,7 +3468,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -3503,11 +3476,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -3550,12 +3523,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -3775,8 +3748,12 @@ server cluster WindowCovering = 258 {
   }
 
   readonly attribute Type type = 0;
+  readonly attribute int16u physicalClosedLimitLift = 1;
+  readonly attribute int16u physicalClosedLimitTilt = 2;
   readonly attribute nullable int16u currentPositionLift = 3;
   readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute int16u numberOfActuationsLift = 5;
+  readonly attribute int16u numberOfActuationsTilt = 6;
   readonly attribute ConfigStatus configStatus = 7;
   readonly attribute nullable Percent currentPositionLiftPercentage = 8;
   readonly attribute nullable Percent currentPositionTiltPercentage = 9;
@@ -3792,6 +3769,9 @@ server cluster WindowCovering = 258 {
   readonly attribute int16u installedClosedLimitTilt = 19;
   attribute access(write: manage) Mode mode = 23;
   readonly attribute bitmap16 safetyStatus = 26;
+  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;
 
@@ -3820,8 +3800,8 @@ server cluster WindowCovering = 258 {
   command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Identify {
@@ -3974,6 +3954,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -3991,67 +3972,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -4138,8 +4119,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 3;
   }
 }
-
 endpoint 1 {
+  device type onofflight = 256;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -4184,7 +4165,7 @@ endpoint 1 {
   server cluster LevelControl {
     persist  attribute currentLevel default = 0xFE;
     ram      attribute remainingTime;
-    ram      attribute minLevel;
+    ram      attribute minLevel default = 0x01;
     ram      attribute maxLevel default = 0xFE;
     ram      attribute currentFrequency;
     ram      attribute minFrequency;
@@ -4246,7 +4227,7 @@ endpoint 1 {
     ram      attribute numberOfPositions default = 2;
     ram      attribute currentPosition;
     ram      attribute multiPressMax default = 2;
-    ram      attribute featureMap;
+    ram      attribute featureMap default = 1;
     ram      attribute clusterRevision default = 1;
   }
 
@@ -4280,6 +4261,7 @@ endpoint 1 {
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
     ram      attribute clusterRevision default = 1;
+    ram      attribute manufacturerExtension default = 255;
   }
 
   server cluster DoorLock {
@@ -4319,24 +4301,31 @@ endpoint 1 {
   }
 
   server cluster WindowCovering {
-    ram      attribute type;
+    ram      attribute type default = 0x08;
+    ram      attribute physicalClosedLimitLift default = 0xFFFF;
+    ram      attribute physicalClosedLimitTilt default = 0xFFFF;
     persist  attribute currentPositionLift default = 0x7FFF;
     persist  attribute currentPositionTilt default = 0x7FFF;
+    persist  attribute numberOfActuationsLift;
+    persist  attribute numberOfActuationsTilt;
     persist  attribute configStatus default = 0x03;
     persist  attribute currentPositionLiftPercentage default = 50;
     persist  attribute currentPositionTiltPercentage default = 50;
     ram      attribute operationalStatus;
-    ram      attribute targetPositionLiftPercent100ths default = 500;
-    ram      attribute targetPositionTiltPercent100ths default = 500;
+    ram      attribute targetPositionLiftPercent100ths default = 5000;
+    ram      attribute targetPositionTiltPercent100ths default = 5000;
     ram      attribute endProductType;
-    persist  attribute currentPositionLiftPercent100ths default = 500;
-    persist  attribute currentPositionTiltPercent100ths default = 500;
+    persist  attribute currentPositionLiftPercent100ths default = 5000;
+    persist  attribute currentPositionTiltPercent100ths default = 5000;
     persist  attribute installedOpenLimitLift;
     persist  attribute installedClosedLimitLift default = 0xFFFF;
     persist  attribute installedOpenLimitTilt;
     persist  attribute installedClosedLimitTilt default = 0xFFFF;
     persist  attribute mode;
     ram      attribute safetyStatus;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0x17;
     ram      attribute clusterRevision default = 5;
   }
@@ -4393,10 +4382,8 @@ endpoint 1 {
     ram      attribute minSetpointDeadBand default = 0x19;
     ram      attribute controlSequenceOfOperation default = 0x04;
     ram      attribute systemMode default = 0x01;
-    ram      attribute startOfWeek;
-    ram      attribute numberOfWeeklyTransitions default = 7;
-    ram      attribute numberOfDailyTransitions default = 4;
-    ram      attribute featureMap default = 0x000b;
+    ram      attribute thermostatRunningMode;
+    ram      attribute featureMap default = 0x0023;
     ram      attribute clusterRevision default = 5;
   }
 
@@ -4534,16 +4521,6 @@ endpoint 1 {
     ram      attribute clusterRevision default = 3;
   }
 
-  server cluster IasZone {
-    ram      attribute zoneState;
-    ram      attribute zoneType;
-    ram      attribute zoneStatus;
-    ram      attribute iasCieAddress;
-    ram      attribute zoneId default = 0xff;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 2;
-  }
-
   server cluster WakeOnLan {
     ram      attribute MACAddress;
     ram      attribute featureMap;
@@ -4628,6 +4605,22 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster ElectricalMeasurement {
+    ram      attribute measurementType;
+    ram      attribute totalActivePower;
+    ram      attribute rmsVoltage default = 0xffff;
+    ram      attribute rmsVoltageMin default = 0x8000;
+    ram      attribute rmsVoltageMax default = 0x8000;
+    ram      attribute rmsCurrent default = 0xffff;
+    ram      attribute rmsCurrentMin default = 0xffff;
+    ram      attribute rmsCurrentMax default = 0xffff;
+    ram      attribute activePower default = 0xffff;
+    ram      attribute activePowerMin default = 0xffff;
+    ram      attribute activePowerMax default = 0xffff;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
   server cluster TestCluster {
     ram      attribute boolean;
     ram      attribute bitmap8;
@@ -4712,25 +4705,9 @@ endpoint 1 {
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
-
-  server cluster ElectricalMeasurement {
-    ram      attribute measurementType;
-    ram      attribute totalActivePower;
-    ram      attribute rmsVoltage default = 0xffff;
-    ram      attribute rmsVoltageMin default = 0x8000;
-    ram      attribute rmsVoltageMax default = 0x8000;
-    ram      attribute rmsCurrent default = 0xffff;
-    ram      attribute rmsCurrentMin default = 0xffff;
-    ram      attribute rmsCurrentMax default = 0xffff;
-    ram      attribute activePower default = 0xffff;
-    ram      attribute activePowerMin default = 0xffff;
-    ram      attribute activePowerMax default = 0xffff;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 3;
-  }
 }
-
 endpoint 2 {
+  device type onofflight = 256;
 
   server cluster Groups {
     ram      attribute nameSupport;
@@ -4776,8 +4753,8 @@ endpoint 2 {
     ram      attribute clusterRevision default = 3;
   }
 }
-
 endpoint 65534 {
+  device type anonymousEndpointType = 61442;
 
   server cluster NetworkCommissioning {
     callback attribute maxNetworks;
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 4c34a523c26579..933f095975a3c4 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
@@ -18,7 +18,7 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/zcl/zcl.json",
+      "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
       "version": "ZCL Test Data",
       "type": "zcl-properties"
     },
@@ -3366,7 +3366,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -3496,6 +3505,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3756,7 +3781,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3770,9 +3795,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3788,7 +3813,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3804,7 +3829,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3820,7 +3845,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3836,7 +3861,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3852,7 +3877,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3900,7 +3925,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3916,7 +3941,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3932,7 +3957,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3948,7 +3973,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3964,7 +3989,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3980,7 +4005,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3996,7 +4021,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4012,7 +4037,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4028,7 +4053,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4044,7 +4069,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4060,7 +4085,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4076,7 +4101,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4092,7 +4117,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4108,7 +4133,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4124,7 +4149,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4140,7 +4165,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4156,7 +4181,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4172,7 +4197,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4188,7 +4213,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4204,7 +4229,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4220,7 +4245,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4236,7 +4261,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4252,7 +4277,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4268,7 +4293,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4284,7 +4309,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4300,7 +4325,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4316,7 +4341,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4332,7 +4357,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4348,7 +4373,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4364,7 +4389,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4380,7 +4405,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4396,7 +4421,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4412,7 +4437,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4428,7 +4453,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4444,7 +4469,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4460,7 +4485,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4476,7 +4501,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4492,7 +4517,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4508,7 +4533,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4524,7 +4549,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4540,7 +4565,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4556,7 +4581,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4572,7 +4597,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4588,7 +4613,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4604,7 +4629,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4620,7 +4645,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4636,7 +4661,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4652,7 +4677,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4668,7 +4693,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4684,7 +4709,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4698,7 +4723,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4716,7 +4741,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4730,7 +4755,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5617,14 +5642,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -6257,22 +6274,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -6497,134 +6498,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -8395,7 +8268,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -8447,7 +8320,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -9828,7 +9701,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12220,7 +12093,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -12791,6 +12664,22 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
+            },
+            {
+              "name": "ManufacturerExtension",
+              "code": 4293984257,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "255",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
             }
           ]
         },
@@ -13080,22 +12969,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "NumberOfLogRecordsSupported",
-              "code": 16,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NumberOfTotalUsersSupported",
               "code": 17,
@@ -13288,22 +13161,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -13576,134 +13433,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -13889,15 +13618,79 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x08",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PhysicalClosedLimitLift",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65545,
+              "reportableChange": 0
+            },
+            {
+              "name": "PhysicalClosedLimitTilt",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65545,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLift",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x7FFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTilt",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x7FFF",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "CurrentPositionLift",
-              "code": 3,
+              "name": "NumberOfActuationsLift",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
@@ -13905,15 +13698,15 @@
               "storageOption": "NVM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x7FFF",
+              "defaultValue": "0x0000",
               "reportable": 1,
               "minInterval": 0,
-              "maxInterval": 65344,
+              "maxInterval": 65545,
               "reportableChange": 0
             },
             {
-              "name": "CurrentPositionTilt",
-              "code": 4,
+              "name": "NumberOfActuationsTilt",
+              "code": 6,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
@@ -13921,10 +13714,10 @@
               "storageOption": "NVM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x7FFF",
+              "defaultValue": "0x0000",
               "reportable": 1,
               "minInterval": 0,
-              "maxInterval": 65344,
+              "maxInterval": 65545,
               "reportableChange": 0
             },
             {
@@ -14001,7 +13794,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "500",
+              "defaultValue": "5000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 10000,
@@ -14017,7 +13810,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "500",
+              "defaultValue": "5000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 10000,
@@ -14049,7 +13842,7 @@
               "storageOption": "NVM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "500",
+              "defaultValue": "5000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 10000,
@@ -14065,7 +13858,7 @@
               "storageOption": "NVM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "500",
+              "defaultValue": "5000",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 10000,
@@ -14167,6 +13960,54 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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,
@@ -14803,7 +14644,7 @@
               "code": 0,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -14829,14 +14670,6 @@
               "source": "client",
               "incoming": 0,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLog",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 0,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -14873,14 +14706,6 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 0
-            },
-            {
-              "name": "GetRelayStatusLogResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -15140,13 +14965,29 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "ThermostatRunningMode",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "StartOfWeek",
               "code": 32,
               "mfgCode": null,
               "side": "server",
               "type": "enum8",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -15162,7 +15003,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int8u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -15178,7 +15019,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int8u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -15214,7 +15055,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x000b",
+              "defaultValue": "0x0023",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -17998,7 +17839,7 @@
               "code": 0,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             }
           ],
@@ -18028,7 +17869,16 @@
           "define": "TARGET_NAVIGATOR_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "NavigateTargetResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
           "attributes": [
             {
               "name": "TargetList",
@@ -18404,7 +18254,7 @@
               "code": 0,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -18412,7 +18262,7 @@
               "code": 1,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -18420,7 +18270,7 @@
               "code": 2,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -18428,7 +18278,7 @@
               "code": 3,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             }
           ],
@@ -18634,7 +18484,7 @@
               "code": 0,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             }
           ],
@@ -18664,7 +18514,16 @@
           "define": "KEYPAD_INPUT_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "SendKeyResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
           "attributes": [
             {
               "name": "FeatureMap",
@@ -19312,7 +19171,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -19484,7 +19343,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -23175,22 +23034,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -23415,134 +23258,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -25443,5 +25158,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 61442
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "log": []
+}
diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
index 52a77e443857f3..709434c6017f2e 100755
--- a/examples/all-clusters-app/ameba/chip_main.cmake
+++ b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -16,6 +16,7 @@ include(${pigweed_dir}/pw_protobuf_compiler/proto.cmake)
 
 set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING "" FORCE)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.ameba)
@@ -121,6 +122,7 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
 )
 endif (matter_enable_ota_requestor)
 
@@ -139,6 +141,8 @@ list(
     ${chip_dir}/examples/all-clusters-app/ameba/main/Globals.cpp
     ${chip_dir}/examples/all-clusters-app/ameba/main/LEDWidget.cpp
     ${chip_dir}/examples/all-clusters-app/ameba/main/DsoHack.cpp
+
+    ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
 )
 
 add_library(
@@ -178,6 +182,8 @@ target_include_directories(
     ${chip_dir}/examples/all-clusters-app/all-clusters-common
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/include
     ${chip_dir}/examples/all-clusters-app/ameba/main/include
+    ${chip_dir}/examples/platform/ameba
+    ${chip_dir}/examples/providers
     ${chip_dir_output}/gen/include
     ${chip_dir}/src/include/
     ${chip_dir}/src/lib/
@@ -240,14 +246,6 @@ list(
 )
 endif (matter_enable_rpc)
 
-if (matter_enable_ota_requestor)
-list(
-    APPEND chip_main_flags
-
-    -DCONFIG_ENABLE_OTA_REQUESTOR=1
-)
-endif (matter_enable_ota_requestor)
-
 list(
     APPEND chip_main_cpp_flags
 
diff --git a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
index 8f18f730999cde..2db5f21cee2c85 100644
--- a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
@@ -36,6 +36,9 @@
 #include <support/CodeUtils.h>
 #include <support/logging/CHIPLogging.h>
 #include <support/logging/Constants.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <ota/OTAInitializer.h>
+#endif
 
 #include "Globals.h"
 #include "LEDWidget.h"
@@ -50,7 +53,15 @@ using namespace ::chip::DeviceManager;
 using namespace ::chip::Logging;
 
 uint32_t identifyTimerCount;
-constexpr uint32_t kIdentifyTimerDelayMS = 250;
+constexpr uint32_t kIdentifyTimerDelayMS     = 250;
+constexpr uint32_t kInitOTARequestorDelaySec = 3;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
+{
+    OTAInitializer::Instance().InitOTARequestor();
+}
+#endif
 
 void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
 {
@@ -97,6 +108,9 @@ void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Cluster
 
 void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
 {
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    static bool isOTAInitialized = false;
+#endif
     if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
     {
         ChipLogProgress(DeviceLayer, "IPv4 Server ready...");
@@ -110,6 +124,15 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
     {
         ChipLogProgress(DeviceLayer, "IPv6 Server ready...");
         chip::app::DnssdServer::Instance().StartServer();
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+        // Init OTA requestor only when we have gotten IPv6 address
+        if (!isOTAInitialized)
+        {
+            chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds32(kInitOTARequestorDelaySec),
+                                                        InitOTARequestorHandler, nullptr);
+            isOTAInitialized = true;
+        }
+#endif
     }
     else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
     {
diff --git a/examples/all-clusters-app/ameba/main/chipinterface.cpp b/examples/all-clusters-app/ameba/main/chipinterface.cpp
index 306d9c36717e00..673f4d5238ee23 100644
--- a/examples/all-clusters-app/ameba/main/chipinterface.cpp
+++ b/examples/all-clusters-app/ameba/main/chipinterface.cpp
@@ -22,6 +22,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 #include "chip_porting.h"
+#include <DeviceInfoProviderImpl.h>
 #include <lwip_netconf.h>
 
 #include <app/clusters/identify-server/identify-server.h>
@@ -39,16 +40,6 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <support/CHIPMem.h>
 
-#if CONFIG_ENABLE_OTA_REQUESTOR
-#include "app/clusters/ota-requestor/DefaultOTARequestorStorage.h"
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
-#include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
-#include <platform/Ameba/AmebaOTAImageProcessor.h>
-#endif
-
 #if CONFIG_ENABLE_PW_RPC
 #include "Rpc.h"
 #endif
@@ -99,55 +90,7 @@ Identify gIdentify1 = {
 #endif
 
 static DeviceCallbacks EchoCallbacks;
-
-#if CONFIG_ENABLE_OTA_REQUESTOR
-DefaultOTARequestor gRequestorCore;
-DefaultOTARequestorStorage gRequestorStorage;
-ExtendedOTARequestorDriver gRequestorUser;
-BDXDownloader gDownloader;
-AmebaOTAImageProcessor gImageProcessor;
-chip::ota::DefaultOTARequestorUserConsent gUserConsentProvider;
-static chip::ota::UserConsentState gUserConsentState = chip::ota::UserConsentState::kGranted;
-#endif
-
-#if CONFIG_ENABLE_OTA_REQUESTOR
-extern "C" void amebaQueryImageCmdHandler()
-{
-    ChipLogProgress(DeviceLayer, "Calling amebaQueryImageCmdHandler");
-    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->TriggerImmediateQuery(); });
-}
-
-extern "C" void amebaApplyUpdateCmdHandler()
-{
-    ChipLogProgress(DeviceLayer, "Calling amebaApplyUpdateCmdHandler");
-    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->ApplyUpdate(); });
-}
-
-static void InitOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects -- START
-    SetRequestorInstance(&gRequestorCore);
-
-    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-
-    // Set server instance used for session establishment
-    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
-
-    gImageProcessor.SetOTADownloader(&gDownloader);
-
-    // Connect the Downloader and Image Processor objects
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
-
-    if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
-    {
-        gUserConsentProvider.SetUserConsentState(gUserConsentState);
-        gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
-    }
-
-    // Initialize and interconnect the Requestor and Image Processor objects -- END
-}
-#endif // CONFIG_ENABLE_OTA_REQUESTOR
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
 static void InitServer(intptr_t context)
 {
@@ -155,15 +98,13 @@ static void InitServer(intptr_t context)
     static chip::CommonCaseDeviceServerInitParams initParams;
     initParams.InitializeStaticResourcesBeforeServerInit();
     chip::Server::GetInstance().Init(initParams);
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
     NetWorkCommissioningInstInit();
 
-#if CONFIG_ENABLE_OTA_REQUESTOR
-    InitOTARequestor();
-#endif
-
     if (RTW_SUCCESS != wifi_is_connected_to_ap())
     {
         // QR code will be used with CHIP Tool
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
index 33383bb4484128..48f3ef5b7583f9 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
@@ -37,6 +37,7 @@ ti_sysconfig("sysconfig") {
   sources = [ "${project_dir}/chip.syscfg" ]
 
   outputs = [
+    "ti_devices_config.c",
     "ti_radio_config.c",
     "ti_radio_config.h",
     "ti_drivers_config.c",
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni b/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
index 18a8ca6d91747c..bd6e49f7871b4f 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
@@ -26,7 +26,6 @@ ti_simplelink_board = "LP_CC2652R7"
 optimize_debug_level = "s"
 lwip_debug = false
 
-#optimize_for_size=true
 chip_enable_ota_requestor = false
 
 # Disable FTD Build for all-clusters app to save Flash
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg b/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
index c1419eaf6d22bb..4bfc7e52cbd5c5 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
@@ -89,8 +89,7 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
+CCFG.enableCodeGeneration = true;
 
 /* NVS */
 NVS1.$name                      = "CONFIG_NVSINTERNAL";
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
index 7fd0d0cc6f748b..40661af8cd7c7d 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
@@ -34,7 +34,6 @@ using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
 using namespace ::chip::DeviceLayer;
-using namespace ::chip::app::Clusters;
 
 constexpr uint32_t kIdentifyTimerDelayMS     = 250;
 constexpr uint32_t kIdentifyTimerDelayPerSec = 4;
@@ -44,6 +43,45 @@ ClusterManager ClusterManager::sCluster;
 #define ENDPOINT_ID_1 (1)
 #define ENDPOINT_ID_2 (2)
 
+void OnIdentifyTriggerEffect(Identify * identify)
+{
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE");
+        break;
+    default:
+        PLAT_LOG("No identifier effect");
+        break;
+    }
+    return;
+}
+
+Identify gIdentify0 = {
+    chip::EndpointId{ 0 },
+    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
+    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+    OnIdentifyTriggerEffect,
+};
+
+Identify gIdentify1 = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
+    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+    OnIdentifyTriggerEffect,
+};
+
 void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
@@ -94,13 +132,13 @@ void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId
         {
             hue = *value;
             /* Read Current Saturation value when Attribute change callback for HUE Attribute */
-            ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation);
+            app::Clusters::ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation);
         }
         else
         {
             saturation = *value;
             /* Read Current Hue value when Attribute change callback for SATURATION Attribute */
-            ColorControl::Attributes::CurrentHue::Get(endpointId, &hue);
+            app::Clusters::ColorControl::Attributes::CurrentHue::Get(endpointId, &hue);
         }
         PLAT_LOG("Color Control triggered: Hue: %d Saturation: %d", hue, saturation);
     }
@@ -111,7 +149,7 @@ void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId
 void ClusterManager::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint16_t size,
                                                            uint8_t * value)
 {
-    if (attributeId == Identify::Attributes::IdentifyTime::Id && size == 2)
+    if (attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id && size == 2)
     {
         uint16_t identifyTime;
         memcpy(&identifyTime, value, size);
diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt
index afef0aec0d4ab9..d7907d6ba7762f 100644
--- a/examples/all-clusters-app/esp32/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/CMakeLists.txt
@@ -49,6 +49,9 @@ flashing_script()
 if (CONFIG_ENABLE_PW_RPC)
 get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
 include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
+
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.esp32)
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
index df3431cd088b9d..cfeb4965d92efd 100644
--- a/examples/all-clusters-app/esp32/main/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -78,7 +78,6 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ias-zone-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
@@ -88,7 +87,6 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-configuration-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src"
-                      #${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ias-zone-client
 )
 
 if (CONFIG_ENABLE_PW_RPC)
diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
index 987a095134b16d..ef87982f8eb5eb 100644
--- a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "DeviceWithDisplay.h"
+#include <app-common/zap-generated/cluster-enums.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
 #if CONFIG_HAVE_DISPLAY
@@ -134,6 +135,39 @@ class EditAttributeListModel : public TouchesMatterStackModel
         return i == 0 ? "+" : "-";
     }
 
+    // We support system modes - Off, Auto, Heat and Cool currently. This API returns true for all these modes,
+    // false otherwise.
+    bool isValidThermostatSystemMode(uint8_t systemMode)
+    {
+        chip::app::Clusters::Thermostat::ThermostatSystemMode mode =
+            static_cast<chip::app::Clusters::Thermostat::ThermostatSystemMode>(systemMode);
+        switch (mode)
+        {
+        case chip::app::Clusters::Thermostat::ThermostatSystemMode::kOff:
+        case chip::app::Clusters::Thermostat::ThermostatSystemMode::kAuto:
+        case chip::app::Clusters::Thermostat::ThermostatSystemMode::kCool:
+        case chip::app::Clusters::Thermostat::ThermostatSystemMode::kHeat:
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    bool isValidThermostatRunningMode(uint8_t runningMode)
+    {
+        chip::app::Clusters::Thermostat::ThermostatRunningMode mode =
+            static_cast<chip::app::Clusters::Thermostat::ThermostatRunningMode>(runningMode);
+        switch (mode)
+        {
+        case chip::app::Clusters::Thermostat::ThermostatRunningMode::kOff:
+        case chip::app::Clusters::Thermostat::ThermostatRunningMode::kCool:
+        case chip::app::Clusters::Thermostat::ThermostatRunningMode::kHeat:
+            return true;
+        default:
+            return false;
+        }
+    }
+
     void DoAction(int i) override
     {
         auto & attribute = this->attribute();
@@ -182,20 +216,74 @@ class EditAttributeListModel : public TouchesMatterStackModel
                 ESP_LOGI(TAG, "Humidity changed to : %d", n);
                 app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(n * 100));
             }
-            else if (name == "OccupiedCoolingSetpoint")
+            else if (name == "CoolSetpoint")
             {
-                ESP_LOGI(TAG, "OccupiedCoolingSetpoint changed to : %d", n);
+                // update the occupied cooling setpoint for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Occupied Cooling Setpoint changed to : %d", n);
                 app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::Set(1, static_cast<int16_t>(n * 100));
             }
-            else if (name == "OccupiedHeatingSetpoint")
+            else if (name == "HeatSetpoint")
             {
-                ESP_LOGI(TAG, "OccupiedHeatingSetpoint changed to : %d", n);
+                // update the occupied heating setpoint for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Occupied Heating Setpoint changed to : %d", n);
                 app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::Set(1, static_cast<int16_t>(n * 100));
             }
             else if (name == "SystemMode")
             {
-                ESP_LOGI(TAG, "SystemMode changed to : %d", n);
-                app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::Set(1, n);
+                // System modes - Off, Auto, Cool and Heat are currently supported.
+                uint8_t mode = n;
+                // Update the system mode here for hardcoded endpoint 1
+                if (isValidThermostatSystemMode(mode))
+                {
+                    ESP_LOGI(TAG, "System Mode changed to : %d", mode);
+                    app::Clusters::Thermostat::Attributes::SystemMode::Set(1, static_cast<uint8_t>(mode));
+                    // If system mode is auto set running mode to off otherwise set it to what the system mode is set to
+                    if (mode == static_cast<uint8_t>(chip::app::Clusters::Thermostat::ThermostatSystemMode::kAuto))
+                    {
+                        app::Clusters::Thermostat::Attributes::ThermostatRunningMode::Set(
+                            1, static_cast<uint8_t>(chip::app::Clusters::Thermostat::ThermostatRunningMode::kOff));
+                    }
+                    else
+                    {
+                        if (isValidThermostatRunningMode(mode))
+                        {
+                            ESP_LOGI(TAG, "Running Mode changed to : %d", mode);
+                            app::Clusters::Thermostat::Attributes::ThermostatRunningMode::Set(1, static_cast<uint8_t>(mode));
+                        }
+                        else
+                        {
+                            ESP_LOGI(TAG, "Running Mode %d is not valid", mode);
+                        }
+                    }
+                }
+                else
+                {
+                    ESP_LOGI(TAG, "System Mode %d is not valid", mode);
+                }
+            }
+            else if (name == "RunningMode")
+            {
+                // Get the system mode
+                uint8_t systemMode = static_cast<uint8_t>(chip::app::Clusters::Thermostat::ThermostatRunningMode::kOff);
+                app::Clusters::Thermostat::Attributes::SystemMode::Get(1, static_cast<uint8_t *>(&systemMode));
+                if (systemMode != static_cast<uint8_t>(chip::app::Clusters::Thermostat::ThermostatSystemMode::kAuto))
+                {
+                    ESP_LOGI(TAG, "Running mode can be changed only for system mode auto. Current system mode %d", systemMode);
+                }
+                else
+                {
+                    uint8_t mode = n;
+                    // update the running mode here for hardcoded endpoint 1
+                    if (isValidThermostatRunningMode(mode))
+                    {
+                        ESP_LOGI(TAG, "Running Mode changed to : %d", mode);
+                        app::Clusters::Thermostat::Attributes::ThermostatRunningMode::Set(1, static_cast<uint8_t>(mode));
+                    }
+                    else
+                    {
+                        ESP_LOGI(TAG, "Running Mode %d is not valid", mode);
+                    }
+                }
             }
             else if (name == "Current Lift")
             {
@@ -543,11 +631,15 @@ void SetupPretendDevices()
     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, 4);
-    AddAttribute("OccupiedCoolingSetpoint", "19");
+    app::Clusters::Thermostat::Attributes::SystemMode::Set(
+        1, static_cast<uint8_t>(chip::app::Clusters::Thermostat::ThermostatSystemMode::kHeat));
+    AddAttribute("CoolSetpoint", "19");
     app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::Set(1, static_cast<int16_t>(19 * 100));
-    AddAttribute("OccupiedHeatingSetpoint", "25");
+    AddAttribute("HeatSetpoint", "25");
     app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::Set(1, static_cast<int16_t>(25 * 100));
+    AddAttribute("RunningMode", "4");
+    app::Clusters::Thermostat::Attributes::ThermostatRunningMode::Set(
+        1, static_cast<uint8_t>(chip::app::Clusters::Thermostat::ThermostatRunningMode::kHeat));
 
     AddDevice("Humidity Sensor");
     AddEndpoint("External");
diff --git a/examples/all-clusters-app/linux/AppOptions.cpp b/examples/all-clusters-app/linux/AppOptions.cpp
index c3f80a2302a484..ef42660972f8d9 100644
--- a/examples/all-clusters-app/linux/AppOptions.cpp
+++ b/examples/all-clusters-app/linux/AppOptions.cpp
@@ -21,6 +21,8 @@
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/Server.h>
 
+using namespace chip::ArgParser;
+
 using chip::ArgParser::OptionDef;
 using chip::ArgParser::OptionSet;
 using chip::ArgParser::PrintArgError;
@@ -55,8 +57,8 @@ bool AppOptions::HandleOptions(const char * program, OptionSet * options, int id
 OptionSet * AppOptions::GetOptions()
 {
     static OptionDef optionsDef[] = {
-        { "dac_provider", chip::ArgParser::kArgumentRequired, kOptionDacProviderFilePath },
-        { "min_commissioning_timeout", chip::ArgParser::kArgumentRequired, kOptionMinCommissioningTimeout },
+        { "dac_provider", kArgumentRequired, kOptionDacProviderFilePath },
+        { "min_commissioning_timeout", kArgumentRequired, kOptionMinCommissioningTimeout },
         {},
     };
 
diff --git a/examples/all-clusters-app/linux/entitlements/codesign.py b/examples/all-clusters-app/linux/entitlements/codesign.py
index f14ed2e7d68d79..2cf51a1cfa5b9e 100644
--- a/examples/all-clusters-app/linux/entitlements/codesign.py
+++ b/examples/all-clusters-app/linux/entitlements/codesign.py
@@ -34,7 +34,8 @@ def get_identity():
             "No valid identity has been found. Application will run without entitlements.")
         exit(0)
 
-    identity = re.search(r'\b[0-9a-fA-F]{40}\b', command_result)
+    command_result = command_result.replace("\\n", "\n")
+    identity = re.search(r'\b[0-9a-fA-F]{40}\b(?![^\n]*\(CSSMERR_TP_CERT_EXPIRED\))', command_result)
     if identity is None:
         print(
             "No valid identity has been found. Application will run without entitlements.")
diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp
index 7829f3a6c1894a..d4d12553df70e7 100644
--- a/examples/all-clusters-app/linux/main-common.cpp
+++ b/examples/all-clusters-app/linux/main-common.cpp
@@ -21,12 +21,16 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
+#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
+#include <app/clusters/switch-server/switch-server.h>
 #include <app/server/Server.h>
 #include <app/util/af.h>
 #include <lib/support/CHIPMem.h>
 #include <new>
+#include <platform/DiagnosticDataProvider.h>
 #include <platform/Linux/NetworkCommissioningDriver.h>
 #include <platform/PlatformManager.h>
 #include <system/SystemPacketBuffer.h>
@@ -41,6 +45,292 @@ using namespace chip::DeviceLayer;
 
 namespace {
 static LowPowerManager lowPowerManager;
+
+bool IsClusterPresentOnAnyEndpoint(ClusterId clusterId)
+{
+    bool retval = false;
+
+    for (auto endpointId : EnabledEndpointsWithServerCluster(clusterId))
+    {
+        IgnoreUnusedVariable(endpointId);
+        retval = true;
+    }
+
+    return retval;
+}
+
+/**
+ * Should be called when a software fault takes place on the Node.
+ */
+void HandleSoftwareFaultEvent(intptr_t arg)
+{
+    if (!IsClusterPresentOnAnyEndpoint(Clusters::SoftwareDiagnostics::Id))
+        return;
+
+    Clusters::SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type softwareFault;
+    char threadName[kMaxThreadNameLength + 1];
+
+    softwareFault.id = static_cast<uint64_t>(getpid());
+    Platform::CopyString(threadName, std::to_string(softwareFault.id).c_str());
+
+    softwareFault.name = CharSpan::fromCharString(threadName);
+
+    std::time_t result           = std::time(nullptr);
+    char * asctime               = std::asctime(std::localtime(&result));
+    softwareFault.faultRecording = ByteSpan(Uint8::from_const_char(asctime), strlen(asctime));
+
+    Clusters::SoftwareDiagnosticsServer::Instance().OnSoftwareFaultDetect(softwareFault);
+}
+
+/**
+ * Should be called when a general fault takes place on the Node.
+ */
+void HandleGeneralFaultEvent(intptr_t arg)
+{
+    uint32_t eventId = static_cast<uint32_t>(arg);
+
+    if (!IsClusterPresentOnAnyEndpoint(Clusters::GeneralDiagnostics::Id))
+        return;
+
+    if (eventId == Clusters::GeneralDiagnostics::Events::HardwareFaultChange::Id)
+    {
+        GeneralFaults<kMaxHardwareFaults> previous;
+        GeneralFaults<kMaxHardwareFaults> current;
+
+#if CHIP_CONFIG_TEST
+        // On Linux Simulation, set following hardware faults statically.
+        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO));
+        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE));
+
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT));
+#endif
+        Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(previous, current);
+    }
+    else if (eventId == Clusters::GeneralDiagnostics::Events::RadioFaultChange::Id)
+    {
+        GeneralFaults<kMaxRadioFaults> previous;
+        GeneralFaults<kMaxRadioFaults> current;
+
+#if CHIP_CONFIG_TEST
+        // On Linux Simulation, set following radio faults statically.
+        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT));
+        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT));
+
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_NFC_FAULT));
+#endif
+        Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(previous, current);
+    }
+    else if (eventId == Clusters::GeneralDiagnostics::Events::NetworkFaultChange::Id)
+    {
+        GeneralFaults<kMaxNetworkFaults> previous;
+        GeneralFaults<kMaxNetworkFaults> current;
+
+#if CHIP_CONFIG_TEST
+        // On Linux Simulation, set following radio faults statically.
+        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
+        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
+
+        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
+        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
+        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+#endif
+        Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(previous, current);
+    }
+    else
+    {
+        ChipLogError(DeviceLayer, "Unknow event ID:%d", eventId);
+    }
+}
+
+/**
+ * Should be called when a switch operation takes place on the Node.
+ */
+void HandleSwitchEvent(intptr_t arg)
+{
+    uint32_t eventId = static_cast<uint32_t>(arg);
+
+    EndpointId endpoint      = 1;
+    uint8_t newPosition      = 20;
+    uint8_t previousPosition = 10;
+    uint8_t count            = 3;
+
+    if (eventId == Clusters::Switch::Events::SwitchLatched::Id)
+    {
+        Clusters::SwitchServer::Instance().OnSwitchLatch(endpoint, newPosition);
+    }
+    else if (eventId == Clusters::Switch::Events::InitialPress::Id)
+    {
+        Clusters::SwitchServer::Instance().OnInitialPress(endpoint, newPosition);
+    }
+    else if (eventId == Clusters::Switch::Events::LongPress::Id)
+    {
+        Clusters::SwitchServer::Instance().OnLongPress(endpoint, newPosition);
+    }
+    else if (eventId == Clusters::Switch::Events::ShortRelease::Id)
+    {
+        Clusters::SwitchServer::Instance().OnShortRelease(endpoint, previousPosition);
+    }
+    else if (eventId == Clusters::Switch::Events::LongRelease::Id)
+    {
+        Clusters::SwitchServer::Instance().OnLongRelease(endpoint, previousPosition);
+    }
+    else if (eventId == Clusters::Switch::Events::MultiPressOngoing::Id)
+    {
+        Clusters::SwitchServer::Instance().OnMultiPressOngoing(endpoint, newPosition, count);
+    }
+    else if (eventId == Clusters::Switch::Events::MultiPressComplete::Id)
+    {
+        Clusters::SwitchServer::Instance().OnMultiPressComplete(endpoint, newPosition, count);
+    }
+    else
+    {
+        ChipLogError(DeviceLayer, "Unknow event ID:%d", eventId);
+    }
+}
+
+// when the shell is enabled, don't intercept signals since it prevents the user from
+// using expected commands like CTRL-C to quit the application. (see issue #17845)
+// We should stop using signals for those faults, and move to a different notification
+// means, like a pipe. (see issue #19114)
+#if !defined(ENABLE_CHIP_SHELL)
+void OnRebootSignalHandler(int signum)
+{
+    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
+
+    // The BootReason attribute SHALL indicate the reason for the Node’s most recent boot, the real usecase
+    // for this attribute is embedded system. In Linux simulation, we use different signals to tell the current
+    // running process to terminate with different reasons.
+    BootReasonType bootReason = BootReasonType::kUnspecified;
+    switch (signum)
+    {
+    case SIGVTALRM:
+        bootReason = BootReasonType::kPowerOnReboot;
+        break;
+    case SIGALRM:
+        bootReason = BootReasonType::kBrownOutReset;
+        break;
+    case SIGILL:
+        bootReason = BootReasonType::kSoftwareWatchdogReset;
+        break;
+    case SIGTRAP:
+        bootReason = BootReasonType::kHardwareWatchdogReset;
+        break;
+    case SIGIO:
+        bootReason = BootReasonType::kSoftwareUpdateCompleted;
+        break;
+    case SIGINT:
+        bootReason = BootReasonType::kSoftwareReset;
+        break;
+    default:
+        IgnoreUnusedVariable(bootReason);
+        ChipLogError(NotSpecified, "Unhandled signal: Should never happens");
+        chipDie();
+        break;
+    }
+
+    Server::GetInstance().DispatchShutDownAndStopEventLoop();
+}
+
+void OnSoftwareFaultSignalHandler(int signum)
+{
+    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
+
+    VerifyOrDie(signum == SIGUSR1);
+    PlatformMgr().ScheduleWork(HandleSoftwareFaultEvent);
+}
+
+void OnGeneralFaultSignalHandler(int signum)
+{
+    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
+
+    uint32_t eventId;
+    switch (signum)
+    {
+    case SIGUSR2:
+        eventId = Clusters::GeneralDiagnostics::Events::HardwareFaultChange::Id;
+        break;
+    case SIGHUP:
+        eventId = Clusters::GeneralDiagnostics::Events::RadioFaultChange::Id;
+        break;
+    case SIGTTIN:
+        eventId = Clusters::GeneralDiagnostics::Events::NetworkFaultChange::Id;
+        break;
+    default:
+        ChipLogError(NotSpecified, "Unhandled signal: Should never happens");
+        chipDie();
+        break;
+    }
+
+    PlatformMgr().ScheduleWork(HandleGeneralFaultEvent, static_cast<intptr_t>(eventId));
+}
+
+void OnSwitchSignalHandler(int signum)
+{
+    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
+
+    uint32_t eventId;
+    switch (signum)
+    {
+    case SIGTSTP:
+        eventId = Clusters::Switch::Events::SwitchLatched::Id;
+        break;
+    case SIGSTOP:
+        eventId = Clusters::Switch::Events::InitialPress::Id;
+        break;
+    case SIGTTOU:
+        eventId = Clusters::Switch::Events::LongPress::Id;
+        break;
+    case SIGWINCH:
+        eventId = Clusters::Switch::Events::ShortRelease::Id;
+        break;
+    case SIGQUIT:
+        eventId = Clusters::Switch::Events::LongRelease::Id;
+        break;
+    case SIGFPE:
+        eventId = Clusters::Switch::Events::MultiPressOngoing::Id;
+        break;
+    case SIGPIPE:
+        eventId = Clusters::Switch::Events::MultiPressComplete::Id;
+        break;
+    default:
+        ChipLogError(NotSpecified, "Unhandled signal: Should never happens");
+        chipDie();
+        break;
+    }
+
+    PlatformMgr().ScheduleWork(HandleSwitchEvent, static_cast<intptr_t>(eventId));
+}
+void SetupSignalHandlers()
+{
+    // sigaction is not used here because Tsan interceptors seems to
+    // never dispatch the signals on darwin.
+    signal(SIGALRM, OnRebootSignalHandler);
+    signal(SIGVTALRM, OnRebootSignalHandler);
+    signal(SIGILL, OnRebootSignalHandler);
+    signal(SIGTRAP, OnRebootSignalHandler);
+    signal(SIGTERM, OnRebootSignalHandler);
+    signal(SIGIO, OnRebootSignalHandler);
+    signal(SIGINT, OnRebootSignalHandler);
+    signal(SIGUSR1, OnSoftwareFaultSignalHandler);
+    signal(SIGUSR2, OnGeneralFaultSignalHandler);
+    signal(SIGHUP, OnGeneralFaultSignalHandler);
+    signal(SIGTTIN, OnGeneralFaultSignalHandler);
+    signal(SIGTSTP, OnSwitchSignalHandler);
+    signal(SIGSTOP, OnSwitchSignalHandler);
+    signal(SIGTTOU, OnSwitchSignalHandler);
+    signal(SIGWINCH, OnSwitchSignalHandler);
+    signal(SIGQUIT, OnSwitchSignalHandler);
+    signal(SIGFPE, OnSwitchSignalHandler);
+    signal(SIGPIPE, OnSwitchSignalHandler);
+}
+#endif // !defined(ENABLE_CHIP_SHELL)
+
 } // namespace
 
 bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * commandObj)
@@ -118,6 +408,10 @@ Clusters::NetworkCommissioning::Instance sNullNetworkCommissioningInstance(kNetw
 
 void ApplicationInit()
 {
+#if !defined(ENABLE_CHIP_SHELL)
+    SetupSignalHandlers();
+#endif // !defined(ENABLE_CHIP_SHELL)
+
     (void) kNetworkCommissioningEndpointMain;
     // Enable secondary endpoint only when we need it, this should be applied to all platforms.
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
index 8f7c646bd8471d..106c3957f4c5af 100644
--- a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
+++ b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
@@ -21,12 +21,15 @@
 #include "LEDUtil.h"
 #include "binding-handler.h"
 
+#include <DeviceInfoProviderImpl.h>
+
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-id.h>
+#include <app/clusters/identify-server/identify-server.h>
 #include <app/util/attribute-storage.h>
 
 #include <credentials/DeviceAttestationCredsProvider.h>
@@ -37,8 +40,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 using namespace ::chip;
 using namespace ::chip::Credentials;
@@ -53,9 +56,49 @@ using namespace ::chip::DeviceLayer;
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), APP_EVENT_QUEUE_SIZE, alignof(AppEvent));
 
-static LEDWidget sStatusLED;
-static UnusedLedsWrapper<3> sUnusedLeds{ { DK_LED2, DK_LED3, DK_LED4 } };
-static k_timer sFunctionTimer;
+namespace {
+
+LEDWidget sStatusLED;
+UnusedLedsWrapper<3> sUnusedLeds{ { DK_LED2, DK_LED3, DK_LED4 } };
+k_timer sFunctionTimer;
+
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
+constexpr EndpointId kIdentifyEndpointId = 1;
+
+void OnIdentifyTriggerEffect(Identify * identify)
+{
+    ChipLogProgress(Zcl, "OnIdentifyTriggerEffect");
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE");
+        break;
+    default:
+        ChipLogProgress(Zcl, "Effect: No identifier effect");
+        break;
+    }
+    return;
+}
+
+Identify sIdentify = {
+    chip::EndpointId{ kIdentifyEndpointId },
+    [](Identify *) { ChipLogProgress(Zcl, "OnIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "OnIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_NONE,
+    OnIdentifyTriggerEffect,
+};
+
+} // namespace
 
 constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
 
@@ -141,10 +184,12 @@ CHIP_ERROR AppTask::Init()
 
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     // We only have network commissioning on endpoint 0.
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
     ConfigurationMgr().LogDeviceConfig();
@@ -365,6 +410,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* aArg
         Instance().mIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (aEvent->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/examples/all-clusters-app/nrfconnect/main/main.cpp b/examples/all-clusters-app/nrfconnect/main/main.cpp
index 8f71ca55e41070..8563856d1cffd6 100644
--- a/examples/all-clusters-app/nrfconnect/main/main.cpp
+++ b/examples/all-clusters-app/nrfconnect/main/main.cpp
@@ -17,11 +17,11 @@
 
 #include "AppTask.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart)
-#include <drivers/uart.h>
-#include <usb/usb_device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/usb/usb_device.h>
 #endif
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
diff --git a/examples/all-clusters-app/p6/BUILD.gn b/examples/all-clusters-app/p6/BUILD.gn
index 5b99c3f3b3b6f6..59ae7f12293bac 100644
--- a/examples/all-clusters-app/p6/BUILD.gn
+++ b/examples/all-clusters-app/p6/BUILD.gn
@@ -17,6 +17,7 @@ import("//build_overrides/chip.gni")
 import("//build_overrides/p6.gni")
 
 import("${build_root}/config/defaults.gni")
+import("${chip_root}/src/platform/device.gni")
 import("${p6_sdk_build_root}/p6_executable.gni")
 import("${p6_sdk_build_root}/p6_sdk.gni")
 
@@ -34,6 +35,50 @@ declare_args() {
 
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
+
+  # Build update app
+  build_update_image = false
+}
+
+config("p6_ota_config") {
+  ldflags = [ "-T/" + rebase_path(
+                  "${chip_root}/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld",
+                  "/",
+                  "${p6_project_dir}") ]
+
+  ldflags += [ "-Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,MCUBOOT_BOOTLOADER_SIZE=0x18000,--defsym,CY_BOOT_PRIMARY_1_SIZE=0x1C0000" ]
+
+  defines = [
+    "P6_OTA",
+    "OTA_SUPPORT ",
+    "OTA_USE_EXTERNAL_FLASH",
+    "CY_BOOT_USE_EXTERNAL_FLASH",
+    "MCUBOOT_HEADER_SIZE=0x400",
+    "MCUBOOT_MAX_IMG_SECTORS=3584",
+    "CY_BOOT_SCRATCH_SIZE=0x00004000",
+    "MCUBOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_PRIMARY_1_START=0x00018000",
+    "CY_BOOT_PRIMARY_1_SIZE=0x1C0000",
+    "CY_BOOT_SECONDARY_1_START=0x00000000",
+    "CY_BOOT_SECONDARY_1_SIZE=0x001C0000",
+    "CY_FLASH_ERASE_VALUE=0xFF",
+    "MCUBOOT_IMAGE_NUMBER=1",
+    "MCUBOOT_SLOT_SIZE=0x1C0000",
+    "MCUBOOT_SCRATCH_SIZE=0x4000",
+    "MCUBOOT_SECTOR_SIZE = 512",
+    "APP_VERSION_MAJOR=1",
+    "APP_VERSION_MINOR=0",
+    "APP_VERSION_BUILD=0",
+    "MCUBOOT_OVERWRITE_ONLY",
+    "CY_ENABLE_XIP_PROGRAM",
+  ]
+
+  if (build_update_image) {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=2" ]
+  } else {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=1" ]
+  }
 }
 
 p6_sdk_sources("all_clusters_app_sdk_sources") {
@@ -52,6 +97,27 @@ p6_sdk_sources("all_clusters_app_sdk_sources") {
   sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ]
 
   public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/src/bootutil_misc.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_map.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_smif_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/mem_config_sfdp.c",
+    ]
+    include_dirs += [
+      "${chip_root}/third_party/p6/p6_sdk/ota/config",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/flash_map_backend/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/sysflash/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/include",
+    ]
+    public_configs += [ ":p6_ota_config" ]
+  }
 }
 
 p6_executable("clusters_app") {
diff --git a/examples/all-clusters-app/p6/README.md b/examples/all-clusters-app/p6/README.md
index 25b8e53b04d697..1a859b7944dd79 100644
--- a/examples/all-clusters-app/p6/README.md
+++ b/examples/all-clusters-app/p6/README.md
@@ -12,6 +12,7 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
         -   [Setting up chip-tool](#setting-up-chip-tool)
         -   [Commissioning over BLE](#commissioning-over-ble)
             -   [Notes](#notes)
+    -   [OTA Software Update](#ota-software-update)
 
 <hr>
 
@@ -134,3 +135,9 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
           sudo btmgmt -i hci0 bredr off
           sudo btmgmt -i hci0 power on
           ```
+
+## OTA Software Update
+
+For the description of Software Update process with infineon P6 example
+applications see
+[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md)
diff --git a/examples/all-clusters-app/p6/include/AppTask.h b/examples/all-clusters-app/p6/include/AppTask.h
index a5f606cc451b85..5bb9a9163225bf 100644
--- a/examples/all-clusters-app/p6/include/AppTask.h
+++ b/examples/all-clusters-app/p6/include/AppTask.h
@@ -46,6 +46,7 @@ class AppTask
     static void LightActionEventHandler(AppEvent * aEvent);
     void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
     void PostEvent(const AppEvent * event);
+    void InitOTARequestor();
 
 private:
     friend AppTask & GetAppTask(void);
diff --git a/examples/all-clusters-app/p6/ota_base_build.sh b/examples/all-clusters-app/p6/ota_base_build.sh
new file mode 100755
index 00000000000000..61bb808e3c1412
--- /dev/null
+++ b/examples/all-clusters-app/p6/ota_base_build.sh
@@ -0,0 +1,8 @@
+OUT_DIR=out/all-clusters-app/
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+scripts/examples/gn_p6_example.sh examples/all-clusters-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true
+
+mv "$OUT_DIR"/chip-p6-clusters-example.hex "$OUT_DIR"/chip-p6-clusters-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-clusters-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py create 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy ""
diff --git a/examples/all-clusters-app/p6/ota_update_build.sh b/examples/all-clusters-app/p6/ota_update_build.sh
new file mode 100755
index 00000000000000..58f870977fd97b
--- /dev/null
+++ b/examples/all-clusters-app/p6/ota_update_build.sh
@@ -0,0 +1,14 @@
+OUT_DIR=out/all-clusters-app-ota
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+./scripts/examples/gn_p6_example.sh examples/all-clusters-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true build_update_image=true
+
+mv "$OUT_DIR"/chip-p6-clusters-example.hex "$OUT_DIR"/chip-p6-clusters-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-clusters-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py sign 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy "-k $ANYCLOUD_DIR/source/mcuboot/keys/cypress-test-ec-p256.pem"
+
+if [ -f "$OUT_DIR"/chip-p6-clusters-example.ota ]; then
+    rm "$OUT_DIR"/chip-p6-clusters-example.ota
+fi
+
+src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8000 -vn 2 -vs "2.0" -da sha256 "$OUT_DIR"/chip-p6-clusters-example.bin "$OUT_DIR"/chip-p6-clusters-example.ota
diff --git a/examples/all-clusters-app/p6/src/AppTask.cpp b/examples/all-clusters-app/p6/src/AppTask.cpp
index 5ec2cf50dbdcbc..c8717c30740357 100644
--- a/examples/all-clusters-app/p6/src/AppTask.cpp
+++ b/examples/all-clusters-app/p6/src/AppTask.cpp
@@ -43,6 +43,33 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/P6/NetworkCommissioningDriver.h>
 
+/* OTA related includes */
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+#include <platform/P6/OTAImageProcessorImpl.h>
+extern "C" {
+#include "cy_smif_psoc6.h"
+}
+using chip::BDXDownloader;
+using chip::CharSpan;
+using chip::DefaultOTARequestor;
+using chip::FabricIndex;
+using chip::GetRequestorInstance;
+using chip::NodeId;
+using chip::OTADownloader;
+using chip::OTAImageProcessorImpl;
+using chip::System::Layer;
+
+using namespace ::chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+#endif
 #define APP_EVENT_QUEUE_SIZE 10
 #define APP_TASK_STACK_SIZE (4096)
 #define APP_WAIT_LOOP 1000
@@ -61,6 +88,15 @@ StaticQueue_t sAppEventQueueStruct;
 
 StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)];
 StaticTask_t appTaskStruct;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+DefaultOTARequestor gRequestorCore;
+DefaultOTARequestorStorage gRequestorStorage;
+DefaultOTARequestorDriver gRequestorUser;
+BDXDownloader gDownloader;
+OTAImageProcessorImpl gImageProcessor;
+#endif
+
 } // namespace
 
 using namespace ::chip;
@@ -74,6 +110,9 @@ AppTask AppTask::sAppTask;
 namespace {
 app::Clusters::NetworkCommissioning::Instance
     sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::P6WiFiDriver::GetInstance()));
+
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
 } // namespace
 
 void NetWorkCommissioningInstInit()
@@ -88,8 +127,14 @@ static void InitServer(intptr_t context)
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     chip::Server::GetInstance().Init(initParams);
 
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    GetAppTask().InitOTARequestor();
+#endif
 }
 
 CHIP_ERROR AppTask::StartAppTask()
@@ -108,7 +153,14 @@ CHIP_ERROR AppTask::StartAppTask()
 CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    int rc = boot_set_confirmed();
+    if (rc != 0)
+    {
+        P6_LOG("boot_set_confirmed failed");
+        appError(CHIP_ERROR_WELL_UNINITIALIZED);
+    }
+#endif
     // Register the callback to init the MDNS server when connectivity is available
     PlatformMgr().AddEventHandler(
         [](const ChipDeviceEvent * event, intptr_t arg) {
@@ -258,3 +310,39 @@ bool lowPowerClusterSleep()
 {
     return true;
 }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void AppTask::InitOTARequestor()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    SetRequestorInstance(&gRequestorCore);
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+    gImageProcessor.SetOTADownloader(&gDownloader);
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    uint32_t savedSoftwareVersion;
+    err = ConfigurationMgr().GetSoftwareVersion(savedSoftwareVersion);
+    if (err != CHIP_NO_ERROR)
+    {
+        P6_LOG("Can't get saved software version");
+        appError(err);
+    }
+
+    if (savedSoftwareVersion != CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION)
+    {
+        ConfigurationMgr().StoreSoftwareVersion(CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+
+        P6_LOG("Confirming update to version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+        chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+        if (requestor != nullptr)
+        {
+            requestor->NotifyUpdateApplied();
+        }
+    }
+
+    P6_LOG("Current Software Version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+    P6_LOG("Current Firmware Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+}
+#endif
diff --git a/examples/all-clusters-app/p6/src/main.cpp b/examples/all-clusters-app/p6/src/main.cpp
index a8f415ffa3744d..d365f9ff8220d4 100644
--- a/examples/all-clusters-app/p6/src/main.cpp
+++ b/examples/all-clusters-app/p6/src/main.cpp
@@ -35,6 +35,7 @@
 #include <AppTask.h>
 
 #include "AppConfig.h"
+#include "cyhal_wdt.h"
 #include "init_p6Platform.h"
 #include <app/server/Server.h>
 
@@ -131,7 +132,12 @@ static void main_task(void * pvParameters)
 int main(void)
 {
     init_p6Platform();
-
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    // Clear watchdog timer (started by bootloader) so that it doesn't trigger a reset
+    cyhal_wdt_t wdt_obj;
+    cyhal_wdt_init(&wdt_obj, cyhal_wdt_get_max_timeout_ms());
+    cyhal_wdt_free(&wdt_obj);
+#endif
 #ifdef HEAP_MONITORING
     MemMonitoring::startHeapMonitoring();
 #endif
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn b/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
new file mode 100644
index 00000000000000..9991df1e8274ea
--- /dev/null
+++ b/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/src/app/chip_data_model.gni")
+
+chip_data_model("all-clusters-common") {
+  zap_file = "all-clusters-minimal-app.zap"
+
+  zap_pregenerated_dir =
+      "${chip_root}/zzz_generated/all-clusters-minimal-app/zap-generated"
+  is_server = true
+}
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
new file mode 100644
index 00000000000000..de169f34582b4d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -0,0 +1,3902 @@
+// This IDL was generated automatically by ZAP.
+// It is for view/code review purposes only.
+
+struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
+}
+
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
+  }
+
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
+
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
+
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
+
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AccountLogin = 1294 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct GetSetupPINRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+  }
+
+  request struct LoginRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+    CHAR_STRING setupPIN = 1;
+  }
+
+  response struct GetSetupPINResponse = 1 {
+    CHAR_STRING setupPIN = 0;
+  }
+
+  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  timed command Login(LoginRequest): DefaultSuccess = 2;
+  timed command Logout(): DefaultSuccess = 3;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
+  }
+
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
+  }
+
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ApplicationLauncher = 1292 {
+  enum ApplicationLauncherStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kAppNotAvailable = 1;
+    kSystemBusy = 2;
+  }
+
+  bitmap ApplicationLauncherFeature : BITMAP32 {
+    kApplicationPlatform = 0x1;
+  }
+
+  struct Application {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct LaunchAppRequest {
+    Application application = 0;
+    optional OCTET_STRING data = 1;
+  }
+
+  request struct StopAppRequest {
+    Application application = 0;
+  }
+
+  request struct HideAppRequest {
+    Application application = 0;
+  }
+
+  response struct LauncherResponse = 3 {
+    ApplicationLauncherStatusEnum status = 0;
+    OCTET_STRING data = 1;
+  }
+
+  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
+  command StopApp(StopAppRequest): LauncherResponse = 1;
+  command HideApp(HideAppRequest): LauncherResponse = 2;
+}
+
+server cluster AudioOutput = 1291 {
+  enum OutputTypeEnum : ENUM8 {
+    kHdmi = 0;
+    kBt = 1;
+    kOptical = 2;
+    kHeadphone = 3;
+    kInternal = 4;
+    kOther = 5;
+  }
+
+  bitmap AudioOutputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
+  }
+
+  struct OutputInfo {
+    int8u index = 0;
+    OutputTypeEnum outputType = 1;
+    char_string<32> name = 2;
+  }
+
+  readonly attribute OutputInfo outputList[] = 0;
+  readonly attribute int8u currentOutput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SelectOutputRequest {
+    INT8U index = 0;
+  }
+
+  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
+}
+
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
+  }
+
+  readonly attribute boolean stateValue = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster BridgedActions = 37 {
+  enum ActionErrorEnum : ENUM8 {
+    kUnknown = 0;
+    kInterrupted = 1;
+  }
+
+  enum ActionStateEnum : ENUM8 {
+    kInactive = 0;
+    kActive = 1;
+    kPaused = 2;
+    kDisabled = 3;
+  }
+
+  enum ActionTypeEnum : ENUM8 {
+    kOther = 0;
+    kScene = 1;
+    kSequence = 2;
+    kAutomation = 3;
+    kException = 4;
+    kNotification = 5;
+    kAlarm = 6;
+  }
+
+  enum EndpointListTypeEnum : ENUM8 {
+    kOther = 0;
+    kRoom = 1;
+    kZone = 2;
+  }
+
+  bitmap CommandBits : BITMAP16 {
+    kInstantAction = 0x1;
+    kInstantActionWithTransition = 0x2;
+    kStartAction = 0x4;
+    kStartActionWithDuration = 0x8;
+    kStopAction = 0x10;
+    kPauseAction = 0x20;
+    kPauseActionWithDuration = 0x40;
+    kResumeAction = 0x80;
+    kEnableAction = 0x100;
+    kEnableActionWithDuration = 0x200;
+    kDisableAction = 0x400;
+    kDisableActionWithDuration = 0x800;
+  }
+
+  struct ActionStruct {
+    int16u actionID = 0;
+    char_string<32> name = 1;
+    ActionTypeEnum type = 2;
+    int16u endpointListID = 3;
+    int16u supportedCommands = 4;
+    ActionStateEnum status = 5;
+  }
+
+  struct EndpointListStruct {
+    int16u endpointListID = 0;
+    char_string<32> name = 1;
+    EndpointListTypeEnum type = 2;
+    endpoint_no endpoints[] = 3;
+  }
+
+  info event StateChanged = 0 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+  }
+
+  info event ActionFailed = 1 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+    ActionErrorEnum error = 3;
+  }
+
+  readonly attribute ActionStruct actionList[] = 0;
+  readonly attribute EndpointListStruct endpointList[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Channel = 1284 {
+  enum ChannelStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
+  }
+
+  enum LineupInfoTypeEnum : ENUM8 {
+    kMso = 0;
+  }
+
+  bitmap ChannelFeature : BITMAP32 {
+    kChannelList = 0x1;
+    kLineupInfo = 0x2;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeChannelByNumberRequest {
+    INT16U majorNumber = 0;
+    INT16U minorNumber = 1;
+  }
+
+  request struct SkipChannelRequest {
+    INT16U count = 0;
+  }
+
+  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
+  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
+}
+
+server cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
+  }
+
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
+  }
+
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+  }
+
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
+  }
+
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
+  }
+
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
+  }
+
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
+  }
+
+  readonly attribute enum8 colorMode = 8;
+  attribute bitmap8 options = 15;
+  readonly attribute nullable int8u numberOfPrimaries = 16;
+  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute bitmap16 colorCapabilities = 16394;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
+  }
+
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
+  }
+
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
+  }
+
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
+  }
+
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
+  }
+
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
+  }
+
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
+  }
+
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
+  }
+
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
+  }
+
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
+server cluster DoorLock = 257 {
+  enum DlAlarmCode : ENUM8 {
+    kLockJammed = 0;
+    kLockFactoryReset = 1;
+    kLockRadioPowerCycled = 3;
+    kWrongCodeEntryLimit = 4;
+    kFrontEsceutcheonRemoved = 5;
+    kDoorForcedOpen = 6;
+    kDoorAjar = 7;
+    kForcedUser = 8;
+  }
+
+  enum DlCredentialRule : ENUM8 {
+    kSingle = 0;
+    kDouble = 1;
+    kTri = 2;
+  }
+
+  enum DlCredentialType : ENUM8 {
+    kProgrammingPIN = 0;
+    kPin = 1;
+    kRfid = 2;
+    kFingerprint = 3;
+    kFingerVein = 4;
+    kFace = 5;
+  }
+
+  enum DlDataOperationType : ENUM8 {
+    kAdd = 0;
+    kClear = 1;
+    kModify = 2;
+  }
+
+  enum DlDoorState : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
+  }
+
+  enum DlLockDataType : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum DlLockOperationType : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
+
+  enum DlLockState : ENUM8 {
+    kNotFullyLocked = 0;
+    kLocked = 1;
+    kUnlocked = 2;
+  }
+
+  enum DlLockType : ENUM8 {
+    kDeadBolt = 0;
+    kMagnetic = 1;
+    kOther = 2;
+    kMortise = 3;
+    kRim = 4;
+    kLatchBolt = 5;
+    kCylindricalLock = 6;
+    kTubularLock = 7;
+    kInterconnectedLock = 8;
+    kDeadLatch = 9;
+    kDoorFurniture = 10;
+  }
+
+  enum DlOperatingMode : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
+  }
+
+  enum DlOperationError : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
+  }
+
+  enum DlOperationSource : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
+  }
+
+  enum DlStatus : ENUM8 {
+    kSuccess = 0;
+    kFailure = 1;
+    kDuplicate = 2;
+    kOccupied = 3;
+    kInvalidField = 133;
+    kResourceExhausted = 137;
+    kNotFound = 139;
+  }
+
+  enum DlUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
+
+  enum DlUserType : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
+  }
+
+  enum DoorLockOperationEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kLock = 1;
+    kUnlock = 2;
+    kLockInvalidPinOrId = 3;
+    kLockInvalidSchedule = 4;
+    kUnlockInvalidPinOrId = 5;
+    kUnlockInvalidSchedule = 6;
+    kOneTouchLock = 7;
+    kKeyLock = 8;
+    kKeyUnlock = 9;
+    kAutoLock = 10;
+    kScheduleLock = 11;
+    kScheduleUnlock = 12;
+    kManualLock = 13;
+    kManualUnlock = 14;
+  }
+
+  enum DoorLockProgrammingEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kMasterCodeChanged = 1;
+    kPinAdded = 2;
+    kPinDeleted = 3;
+    kPinChanged = 4;
+    kIdAdded = 5;
+    kIdDeleted = 6;
+  }
+
+  enum DoorLockSetPinOrIdStatus : ENUM8 {
+    kSuccess = 0;
+    kGeneralFailure = 1;
+    kMemoryFull = 2;
+    kDuplicateCodeError = 3;
+  }
+
+  enum DoorLockUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+    kNotSupported = 255;
+  }
+
+  enum DoorLockUserType : ENUM8 {
+    kUnrestricted = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kMasterUser = 3;
+    kNonAccessUser = 4;
+    kNotSupported = 255;
+  }
+
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlDaysMaskMap : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
+
+  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+    kEnableLocalProgrammingEnabled = 0x1;
+    kKeypadInterfaceDefaultAccessEnabled = 0x2;
+    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
+    kSoundEnabled = 0x20;
+    kAutoRelockTimeSet = 0x40;
+    kLEDSettingsSet = 0x80;
+  }
+
+  bitmap DlKeypadOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidPIN = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+    kNonAccessUserOpEvent = 0x80;
+  }
+
+  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+  }
+
+  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+    kAddUsersCredentialsSchedulesLocally = 0x1;
+    kModifyUsersCredentialsSchedulesLocally = 0x2;
+    kClearUsersCredentialsSchedulesLocally = 0x4;
+    kAdjustLockSettingsLocally = 0x8;
+  }
+
+  bitmap DlManualOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kThumbturnLock = 0x2;
+    kThumbturnUnlock = 0x4;
+    kOneTouchLock = 0x8;
+    kKeyLock = 0x10;
+    kKeyUnlock = 0x20;
+    kAutoLock = 0x40;
+    kScheduleLock = 0x80;
+    kScheduleUnlock = 0x100;
+    kManualLock = 0x200;
+    kManualUnlock = 0x400;
+  }
+
+  bitmap DlRFIDOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidRFID = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidRFID = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+  }
+
+  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
+  }
+
+  bitmap DlRemoteOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidCode = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+  }
+
+  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
+  }
+
+  bitmap DlSupportedOperatingModes : BITMAP16 {
+    kNormal = 0x1;
+    kVacation = 0x2;
+    kPrivacy = 0x4;
+    kNoRemoteLockUnlock = 0x8;
+    kPassage = 0x10;
+  }
+
+  bitmap DoorLockDayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
+
+  bitmap DoorLockFeature : BITMAP32 {
+    kPINCredentials = 0x1;
+    kRFIDCredentials = 0x2;
+    kFingerCredentials = 0x4;
+    kLogging = 0x8;
+    kAccessSchedules = 0x10;
+    kDoorPositionSensor = 0x20;
+    kFaceCredentials = 0x40;
+    kCredentialsOTA = 0x80;
+    kUsersManagement = 0x100;
+    kNotifications = 0x200;
+  }
+
+  struct DlCredential {
+    DlCredentialType credentialType = 0;
+    int16u credentialIndex = 1;
+  }
+
+  critical event DoorLockAlarm = 0 {
+    DlAlarmCode alarmCode = 0;
+  }
+
+  critical event DoorStateChange = 1 {
+    DlDoorState doorState = 0;
+  }
+
+  critical event LockOperation = 2 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    nullable INT16U userIndex = 2;
+    nullable fabric_idx fabricIndex = 3;
+    nullable NODE_ID sourceNode = 4;
+    optional nullable DlCredential credentials[] = 5;
+  }
+
+  critical event LockOperationError = 3 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    DlOperationError operationError = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    optional nullable DlCredential credentials[] = 6;
+  }
+
+  info event LockUserChange = 4 {
+    DlLockDataType lockDataType = 0;
+    DlDataOperationType dataOperationType = 1;
+    DlOperationSource operationSource = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    nullable INT16U dataIndex = 6;
+  }
+
+  readonly attribute nullable DlLockState lockState = 0;
+  readonly attribute DlLockType lockType = 1;
+  readonly attribute boolean actuatorEnabled = 2;
+  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct LockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
+  }
+
+  request struct UnlockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
+  }
+
+  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
+  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
+}
+
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster FanControl = 514 {
+  enum FanModeSequenceType : ENUM8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
+  }
+
+  enum FanModeType : ENUM8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
+  }
+
+  bitmap FanControlFeature : BITMAP32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
+  }
+
+  bitmap RockSupportMask : BITMAP8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
+  }
+
+  bitmap WindSettingMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  bitmap WindSupportMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  attribute FanModeType fanMode = 0;
+  attribute FanModeSequenceType fanModeSequence = 1;
+  attribute nullable int8u percentSetting = 2;
+  readonly attribute int8u percentCurrent = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
+  }
+
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
+  }
+
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
+  }
+
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
+  }
+
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster IlluminanceMeasurement = 1024 {
+  enum LightSensorType : ENUM8 {
+    kPhotodiode = 0;
+    kCmos = 1;
+  }
+
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
+  }
+
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
+  }
+
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
+  }
+
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
+  }
+
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  attribute bitmap8 options = 15;
+  attribute nullable int8u onLevel = 17;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster LowPower = 1288 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Sleep(): DefaultSuccess = 0;
+}
+
+server cluster MediaInput = 1287 {
+  enum InputTypeEnum : ENUM8 {
+    kInternal = 0;
+    kAux = 1;
+    kCoax = 2;
+    kComposite = 3;
+    kHdmi = 4;
+    kInput = 5;
+    kLine = 6;
+    kOptical = 7;
+    kVideo = 8;
+    kScart = 9;
+    kUsb = 10;
+    kOther = 11;
+  }
+
+  bitmap MediaInputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
+  }
+
+  struct InputInfo {
+    int8u index = 0;
+    InputTypeEnum inputType = 1;
+    char_string<32> name = 2;
+    char_string<32> description = 3;
+  }
+
+  readonly attribute InputInfo inputList[] = 0;
+  readonly attribute int8u currentInput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SelectInputRequest {
+    INT8U index = 0;
+  }
+
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+}
+
+server cluster MediaPlayback = 1286 {
+  enum MediaPlaybackStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
+  enum PlaybackStateEnum : ENUM8 {
+    kPlaying = 0;
+    kPaused = 1;
+    kNotPlaying = 2;
+    kBuffering = 3;
+  }
+
+  readonly attribute PlaybackStateEnum currentState = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  response struct PlaybackResponse = 10 {
+    MediaPlaybackStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command Play(): PlaybackResponse = 0;
+  command Pause(): PlaybackResponse = 1;
+  command StopPlayback(): PlaybackResponse = 2;
+}
+
+server cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
+  }
+
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
+  }
+
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
+  }
+
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  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 ChangeToModeRequest {
+    INT8U newMode = 0;
+  }
+
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
+}
+
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
+  }
+
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
+  }
+
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
+  }
+
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
+
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
+  }
+
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
+  }
+
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
+  }
+
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
+
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
+  }
+
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
+
+server cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
+  }
+
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
+  }
+
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
+  }
+
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
+  }
+
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
+  }
+
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
+  }
+
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
+  }
+
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PumpConfigurationAndControl = 512 {
+  enum PumpControlMode : ENUM8 {
+    kConstantSpeed = 0;
+    kConstantPressure = 1;
+    kProportionalPressure = 2;
+    kConstantFlow = 3;
+    kConstantTemperature = 5;
+    kAutomatic = 7;
+  }
+
+  enum PumpOperationMode : ENUM8 {
+    kNormal = 0;
+    kMinimum = 1;
+    kMaximum = 2;
+    kLocal = 3;
+  }
+
+  bitmap PumpStatus : BITMAP16 {
+    kDeviceFault = 0x1;
+    kSupplyfault = 0x2;
+    kSpeedLow = 0x4;
+    kSpeedHigh = 0x8;
+    kLocalOverride = 0x10;
+    kRunning = 0x20;
+    kRemotePressure = 0x40;
+    kRemoteFlow = 0x80;
+    kRemoteTemperature = 0x100;
+  }
+
+  info event SupplyVoltageLow = 0 {
+  }
+
+  info event SupplyVoltageHigh = 1 {
+  }
+
+  info event PowerMissingPhase = 2 {
+  }
+
+  info event SystemPressureLow = 3 {
+  }
+
+  info event SystemPressureHigh = 4 {
+  }
+
+  critical event DryRunning = 5 {
+  }
+
+  info event MotorTemperatureHigh = 6 {
+  }
+
+  critical event PumpMotorFatalFailure = 7 {
+  }
+
+  info event ElectronicTemperatureHigh = 8 {
+  }
+
+  critical event PumpBlocked = 9 {
+  }
+
+  info event SensorFailure = 10 {
+  }
+
+  info event ElectronicNonFatalFailure = 11 {
+  }
+
+  critical event ElectronicFatalFailure = 12 {
+  }
+
+  info event GeneralFault = 13 {
+  }
+
+  info event Leakage = 14 {
+  }
+
+  info event AirDetection = 15 {
+  }
+
+  info event TurbineOperation = 16 {
+  }
+
+  readonly attribute nullable int16s maxPressure = 0;
+  readonly attribute nullable int16u maxSpeed = 1;
+  readonly attribute nullable int16u maxFlow = 2;
+  readonly attribute PumpOperationMode effectiveOperationMode = 17;
+  readonly attribute PumpControlMode effectiveControlMode = 18;
+  readonly attribute nullable int16s capacity = 19;
+  attribute access(write: manage) PumpOperationMode operationMode = 32;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
+
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
+
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
+
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
+
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
+  }
+
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
+
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
+
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
+  }
+
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
+  }
+
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
+
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TestCluster = 4294048773 {
+  enum SimpleEnum : ENUM8 {
+    kUnspecified = 0;
+    kValueA = 1;
+    kValueB = 2;
+    kValueC = 3;
+  }
+
+  bitmap Bitmap16MaskMap : BITMAP16 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000;
+  }
+
+  bitmap Bitmap32MaskMap : BITMAP32 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40000000;
+  }
+
+  bitmap Bitmap64MaskMap : BITMAP64 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000000000000000;
+  }
+
+  bitmap Bitmap8MaskMap : BITMAP8 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40;
+  }
+
+  bitmap SimpleBitmap : BITMAP8 {
+    kValueA = 0x1;
+    kValueB = 0x2;
+    kValueC = 0x4;
+  }
+
+  struct TestListStructOctet {
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
+  }
+
+  struct NullablesAndOptionalsStruct {
+    nullable int16u nullableInt = 0;
+    optional int16u optionalInt = 1;
+    optional nullable int16u nullableOptionalInt = 2;
+    nullable char_string nullableString = 3;
+    optional char_string optionalString = 4;
+    optional nullable char_string nullableOptionalString = 5;
+    nullable SimpleStruct nullableStruct = 6;
+    optional SimpleStruct optionalStruct = 7;
+    optional nullable SimpleStruct nullableOptionalStruct = 8;
+    nullable SimpleEnum nullableList[] = 9;
+    optional SimpleEnum optionalList[] = 10;
+    optional nullable SimpleEnum nullableOptionalList[] = 11;
+  }
+
+  struct SimpleStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleEnum c = 2;
+    octet_string d = 3;
+    char_string e = 4;
+    SimpleBitmap f = 5;
+    single g = 6;
+    double h = 7;
+  }
+
+  struct TestFabricScoped {
+    int8u fabricSensitiveInt8u = 1;
+    optional int8u optionalFabricSensitiveInt8u = 2;
+    nullable int8u nullableFabricSensitiveInt8u = 3;
+    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
+    char_string fabricSensitiveCharString = 5;
+    SimpleStruct fabricSensitiveStruct = 6;
+    int8u fabricSensitiveInt8uList[] = 7;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct NestedStructList {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
+    SimpleStruct d[] = 3;
+    int32u e[] = 4;
+    octet_string f[] = 5;
+    int8u g[] = 6;
+  }
+
+  struct NestedStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
+  }
+
+  info event TestEvent = 1 {
+    INT8U arg1 = 1;
+    SimpleEnum arg2 = 2;
+    BOOLEAN arg3 = 3;
+    SimpleStruct arg4 = 4;
+    SimpleStruct arg5[] = 5;
+    SimpleEnum arg6[] = 6;
+  }
+
+  info event TestFabricScopedEvent = 2 {
+    fabric_idx arg1 = 254;
+  }
+
+  attribute boolean boolean = 0;
+  attribute Bitmap8MaskMap bitmap8 = 1;
+  attribute Bitmap16MaskMap bitmap16 = 2;
+  attribute Bitmap32MaskMap bitmap32 = 3;
+  attribute Bitmap64MaskMap bitmap64 = 4;
+  attribute int8u int8u = 5;
+  attribute int16u int16u = 6;
+  attribute int24u int24u = 7;
+  attribute int32u int32u = 8;
+  attribute int40u int40u = 9;
+  attribute int48u int48u = 10;
+  attribute int56u int56u = 11;
+  attribute int64u int64u = 12;
+  attribute int8s int8s = 13;
+  attribute int16s int16s = 14;
+  attribute int24s int24s = 15;
+  attribute int32s int32s = 16;
+  attribute int40s int40s = 17;
+  attribute int48s int48s = 18;
+  attribute int56s int56s = 19;
+  attribute int64s int64s = 20;
+  attribute enum8 enum8 = 21;
+  attribute enum16 enum16 = 22;
+  attribute single floatSingle = 23;
+  attribute double floatDouble = 24;
+  attribute octet_string<10> octetString = 25;
+  attribute INT8U listInt8u[] = 26;
+  attribute OCTET_STRING listOctetString[] = 27;
+  attribute TestListStructOctet listStructOctetString[] = 28;
+  attribute long_octet_string<1000> longOctetString = 29;
+  attribute char_string<10> charString = 30;
+  attribute long_char_string<1000> longCharString = 31;
+  attribute epoch_us epochUs = 32;
+  attribute epoch_s epochS = 33;
+  attribute vendor_id vendorId = 34;
+  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
+  attribute SimpleEnum enumAttr = 36;
+  attribute SimpleStruct structAttr = 37;
+  attribute int8u rangeRestrictedInt8u = 38;
+  attribute int8s rangeRestrictedInt8s = 39;
+  attribute int16u rangeRestrictedInt16u = 40;
+  attribute int16s rangeRestrictedInt16s = 41;
+  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
+  attribute TestFabricScoped listFabricScoped[] = 43;
+  attribute boolean timedWriteBoolean = 48;
+  attribute boolean generalErrorBoolean = 49;
+  attribute boolean clusterErrorBoolean = 50;
+  attribute nullable boolean nullableBoolean = 16384;
+  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
+  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
+  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
+  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
+  attribute nullable int8u nullableInt8u = 16389;
+  attribute nullable int16u nullableInt16u = 16390;
+  attribute nullable int24u nullableInt24u = 16391;
+  attribute nullable int32u nullableInt32u = 16392;
+  attribute nullable int40u nullableInt40u = 16393;
+  attribute nullable int48u nullableInt48u = 16394;
+  attribute nullable int56u nullableInt56u = 16395;
+  attribute nullable int64u nullableInt64u = 16396;
+  attribute nullable int8s nullableInt8s = 16397;
+  attribute nullable int16s nullableInt16s = 16398;
+  attribute nullable int24s nullableInt24s = 16399;
+  attribute nullable int32s nullableInt32s = 16400;
+  attribute nullable int40s nullableInt40s = 16401;
+  attribute nullable int48s nullableInt48s = 16402;
+  attribute nullable int56s nullableInt56s = 16403;
+  attribute nullable int64s nullableInt64s = 16404;
+  attribute nullable enum8 nullableEnum8 = 16405;
+  attribute nullable enum16 nullableEnum16 = 16406;
+  attribute nullable single nullableFloatSingle = 16407;
+  attribute nullable double nullableFloatDouble = 16408;
+  attribute nullable octet_string<10> nullableOctetString = 16409;
+  attribute nullable char_string<10> nullableCharString = 16414;
+  attribute nullable SimpleEnum nullableEnumAttr = 16420;
+  attribute nullable SimpleStruct nullableStruct = 16421;
+  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
+  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
+  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
+  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestAddArgumentsRequest {
+    INT8U arg1 = 0;
+    INT8U arg2 = 1;
+  }
+
+  request struct TestStructArgumentRequestRequest {
+    SimpleStruct arg1 = 0;
+  }
+
+  request struct TestNestedStructArgumentRequestRequest {
+    NestedStruct arg1 = 0;
+  }
+
+  request struct TestListStructArgumentRequestRequest {
+    SimpleStruct arg1[] = 0;
+  }
+
+  request struct TestListInt8UArgumentRequestRequest {
+    INT8U arg1[] = 0;
+  }
+
+  request struct TestNestedStructListArgumentRequestRequest {
+    NestedStructList arg1 = 0;
+  }
+
+  request struct TestListNestedStructListArgumentRequestRequest {
+    NestedStructList arg1[] = 0;
+  }
+
+  request struct TestListInt8UReverseRequestRequest {
+    INT8U arg1[] = 0;
+  }
+
+  request struct TestEnumsRequestRequest {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
+  }
+
+  request struct TestNullableOptionalRequestRequest {
+    optional nullable INT8U arg1 = 0;
+  }
+
+  request struct SimpleStructEchoRequestRequest {
+    SimpleStruct arg1 = 0;
+  }
+
+  request struct TestSimpleOptionalArgumentRequestRequest {
+    optional BOOLEAN arg1 = 0;
+  }
+
+  request struct TestEmitTestEventRequestRequest {
+    INT8U arg1 = 0;
+    SimpleEnum arg2 = 1;
+    BOOLEAN arg3 = 2;
+  }
+
+  request struct TestEmitTestFabricScopedEventRequestRequest {
+    INT8U arg1 = 0;
+  }
+
+  response struct TestSpecificResponse = 0 {
+    INT8U returnValue = 0;
+  }
+
+  response struct TestAddArgumentsResponse = 1 {
+    INT8U returnValue = 0;
+  }
+
+  response struct TestListInt8UReverseResponse = 4 {
+    INT8U arg1[] = 0;
+  }
+
+  response struct TestEnumsResponse = 5 {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
+  }
+
+  response struct TestNullableOptionalResponse = 6 {
+    BOOLEAN wasPresent = 0;
+    optional BOOLEAN wasNull = 1;
+    optional INT8U value = 2;
+    optional nullable INT8U originalValue = 3;
+  }
+
+  response struct SimpleStructResponse = 9 {
+    SimpleStruct arg1 = 0;
+  }
+
+  response struct TestEmitTestEventResponse = 10 {
+    INT64U value = 0;
+  }
+
+  response struct TestEmitTestFabricScopedEventResponse = 11 {
+    INT64U value = 0;
+  }
+
+  command Test(): DefaultSuccess = 0;
+  command TestNotHandled(): DefaultSuccess = 1;
+  command TestSpecific(): TestSpecificResponse = 2;
+  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
+  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
+  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
+  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
+  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
+  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
+  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
+  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
+  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
+  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
+  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
+  timed command TimedInvokeRequest(): DefaultSuccess = 18;
+  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
+  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
+  command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21;
+}
+
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
+  }
+
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
+  }
+
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
+  }
+
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
+  }
+
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
+  }
+
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
+  }
+
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
+  }
+
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
+
+  readonly attribute nullable int16s localTemperature = 0;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
+  }
+
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+}
+
+server cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
+  }
+
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
+  }
+
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
+
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
+  }
+
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
+  }
+
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
+  }
+
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
+  }
+
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
+  }
+
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
+  }
+
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : 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;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  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;
+}
+
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
+  }
+
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster WakeOnLan = 1283 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
+  }
+
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
+  }
+
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
+
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
+  }
+
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
+  }
+
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
+  }
+
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
+  }
+
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster WindowCovering = 258 {
+  enum EndProductType : ENUM8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
+  }
+
+  enum Type : ENUM8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
+  }
+
+  bitmap ConfigStatus : BITMAP8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
+  }
+
+  bitmap Mode : BITMAP8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
+  }
+
+  bitmap WcFeature : BITMAP32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
+  }
+
+  bitmap WcOperationalStatus : BITMAP8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
+  }
+
+  bitmap WcSafetyStatus : BITMAP16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
+  }
+
+  readonly attribute Type type = 0;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute bitmap8 operationalStatus = 10;
+  readonly attribute EndProductType endProductType = 13;
+  attribute access(write: manage) Mode mode = 23;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command UpOrOpen(): DefaultSuccess = 0;
+  command DownOrClose(): DefaultSuccess = 1;
+  command StopMotion(): DefaultSuccess = 2;
+}
+
+endpoint 0 {
+  device type rootdevice = 22;
+  binding cluster OtaSoftwareUpdateProvider;
+
+  server cluster Identify {
+    ram      attribute identifyTime;
+    ram      attribute identifyType;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster Groups {
+    ram      attribute nameSupport;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster Binding {
+    callback attribute binding;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster AccessControl {
+    callback attribute acl;
+    callback attribute subjectsPerAccessControlEntry default = 4;
+    callback attribute targetsPerAccessControlEntry default = 3;
+    callback attribute accessControlEntriesPerFabric default = 3;
+    ram      attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster Basic {
+    callback attribute dataModelRevision default = 10;
+    callback attribute vendorName;
+    callback attribute vendorID;
+    callback attribute productName;
+    callback attribute productID;
+    persist  attribute nodeLabel;
+    callback attribute location default = "XX";
+    callback attribute hardwareVersion;
+    callback attribute hardwareVersionString;
+    callback attribute softwareVersion;
+    callback attribute softwareVersionString;
+    callback attribute capabilityMinima;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster OtaSoftwareUpdateRequestor {
+    callback attribute defaultOtaProviders;
+    ram      attribute updatePossible default = 1;
+    ram      attribute updateState;
+    ram      attribute updateStateProgress;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster LocalizationConfiguration {
+    persist  attribute activeLocale default = "en-US";
+    callback attribute supportedLocales;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster TimeFormatLocalization {
+    persist  attribute hourFormat;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UnitLocalization {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster PowerSourceConfiguration {
+    callback attribute sources;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster PowerSource {
+    ram      attribute status;
+    ram      attribute order default = 3;
+    ram      attribute description default = "B1";
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster GeneralCommissioning {
+    ram      attribute breadcrumb;
+    callback attribute basicCommissioningInfo;
+    callback attribute regulatoryConfig;
+    callback attribute locationCapability;
+    callback attribute supportsConcurrentConnection default = 1;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster NetworkCommissioning {
+    ram      attribute maxNetworks;
+    callback attribute networks;
+    ram      attribute scanMaxTimeSeconds;
+    ram      attribute connectMaxTimeSeconds;
+    ram      attribute interfaceEnabled;
+    ram      attribute lastNetworkingStatus;
+    ram      attribute lastNetworkID;
+    ram      attribute lastConnectErrorValue;
+    ram      attribute featureMap default = 2;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster DiagnosticLogs {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster GeneralDiagnostics {
+    callback attribute networkInterfaces;
+    callback attribute rebootCount;
+    callback attribute testEventTriggersEnabled;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster SoftwareDiagnostics {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster ThreadNetworkDiagnostics {
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute neighborTableList;
+    callback attribute routeTableList;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute securityPolicy;
+    callback attribute channelMask;
+    callback attribute operationalDatasetComponents;
+    callback attribute activeNetworkFaultsList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster WiFiNetworkDiagnostics {
+    callback attribute bssid;
+    callback attribute securityType;
+    callback attribute wiFiVersion;
+    callback attribute channelNumber;
+    callback attribute rssi;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster EthernetNetworkDiagnostics {
+    callback attribute PHYRate;
+    callback attribute fullDuplex;
+    callback attribute packetRxCount;
+    callback attribute packetTxCount;
+    callback attribute txErrCount;
+    callback attribute collisionCount;
+    callback attribute overrunCount;
+    callback attribute carrierDetect;
+    callback attribute timeSinceReset;
+    ram      attribute featureMap default = 3;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster AdministratorCommissioning {
+    callback attribute windowStatus;
+    callback attribute adminFabricIndex default = 1;
+    callback attribute adminVendorId;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster OperationalCredentials {
+    callback attribute NOCs;
+    callback attribute fabrics;
+    callback attribute supportedFabrics;
+    callback attribute commissionedFabrics;
+    callback attribute trustedRootCertificates;
+    callback attribute currentFabricIndex;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster FixedLabel {
+    callback attribute labelList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UserLabel {
+    callback attribute labelList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster RelativeHumidityMeasurement {
+    ram      attribute measuredValue;
+    ram      attribute minMeasuredValue;
+    ram      attribute maxMeasuredValue default = 0x2710;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+}
+endpoint 1 {
+  device type onofflight = 256;
+
+  server cluster Identify {
+    ram      attribute identifyTime;
+    ram      attribute identifyType;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster Groups {
+    ram      attribute nameSupport;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster Scenes {
+    ram      attribute sceneCount;
+    ram      attribute currentScene;
+    ram      attribute currentGroup;
+    ram      attribute sceneValid;
+    ram      attribute nameSupport;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster OnOff {
+    persist  attribute onOff;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster LevelControl {
+    persist  attribute currentLevel default = 0xFE;
+    ram      attribute options;
+    ram      attribute onLevel default = 0xFF;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 5;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster Binding {
+    callback attribute binding;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster BridgedActions {
+    callback attribute actionList;
+    callback attribute endpointList;
+    ram      attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster PowerSource {
+    ram      attribute status;
+    ram      attribute order default = 2;
+    ram      attribute description default = "B2";
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster Switch {
+    ram      attribute numberOfPositions default = 2;
+    ram      attribute currentPosition;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster FixedLabel {
+    callback attribute labelList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UserLabel {
+    callback attribute labelList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster BooleanState {
+    ram      attribute stateValue;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster ModeSelect {
+    ram      attribute description default = "Coffee";
+    ram      attribute standardNamespace;
+    callback attribute supportedModes;
+    persist  attribute currentMode;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster DoorLock {
+    ram      attribute lockState default = 2;
+    ram      attribute lockType;
+    ram      attribute actuatorEnabled;
+    ram      attribute autoRelockTime default = 60;
+    ram      attribute operatingMode;
+    ram      attribute supportedOperatingModes default = 0xFFF6;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 6;
+  }
+
+  server cluster WindowCovering {
+    ram      attribute type;
+    persist  attribute configStatus default = 0x03;
+    ram      attribute operationalStatus;
+    ram      attribute endProductType;
+    persist  attribute mode;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 5;
+  }
+
+  server cluster PumpConfigurationAndControl {
+    ram      attribute maxPressure;
+    ram      attribute maxSpeed;
+    ram      attribute maxFlow;
+    ram      attribute effectiveOperationMode;
+    ram      attribute effectiveControlMode;
+    ram      attribute capacity;
+    ram      attribute operationMode;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster Thermostat {
+    ram      attribute localTemperature;
+    ram      attribute occupiedHeatingSetpoint default = 0x07D0;
+    ram      attribute controlSequenceOfOperation default = 0x04;
+    ram      attribute systemMode default = 0x01;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 5;
+  }
+
+  server cluster FanControl {
+    ram      attribute fanMode;
+    ram      attribute fanModeSequence default = 0x02;
+    ram      attribute percentSetting;
+    ram      attribute percentCurrent;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 2;
+  }
+
+  server cluster ThermostatUserInterfaceConfiguration {
+    ram      attribute temperatureDisplayMode;
+    ram      attribute keypadLockout;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 2;
+  }
+
+  server cluster ColorControl {
+    ram      attribute colorMode default = 0x01;
+    ram      attribute options;
+    ram      attribute numberOfPrimaries;
+    ram      attribute enhancedColorMode default = 0x01;
+    ram      attribute colorCapabilities;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 5;
+  }
+
+  server cluster IlluminanceMeasurement {
+    ram      attribute measuredValue;
+    ram      attribute minMeasuredValue default = 0x01;
+    ram      attribute maxMeasuredValue default = 0xFFFE;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster TemperatureMeasurement {
+    ram      attribute measuredValue default = 0x8000;
+    ram      attribute minMeasuredValue default = 0x8000;
+    ram      attribute maxMeasuredValue default = 0x8000;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster PressureMeasurement {
+    ram      attribute measuredValue;
+    ram      attribute minMeasuredValue;
+    ram      attribute maxMeasuredValue;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster FlowMeasurement {
+    ram      attribute measuredValue;
+    ram      attribute minMeasuredValue;
+    ram      attribute maxMeasuredValue;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster RelativeHumidityMeasurement {
+    ram      attribute measuredValue;
+    ram      attribute minMeasuredValue;
+    ram      attribute maxMeasuredValue default = 0x2710;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster OccupancySensing {
+    ram      attribute occupancy;
+    ram      attribute occupancySensorType;
+    ram      attribute occupancySensorTypeBitmap;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster WakeOnLan {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster Channel {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster TargetNavigator {
+    callback attribute targetList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster MediaPlayback {
+    ram      attribute currentState;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster MediaInput {
+    callback attribute inputList;
+    ram      attribute currentInput;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster LowPower {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster KeypadInput {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster ContentLauncher {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster AudioOutput {
+    callback attribute outputList;
+    ram      attribute currentOutput;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster ApplicationLauncher {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster ApplicationBasic {
+    ram      attribute applicationName;
+    callback attribute application;
+    ram      attribute status;
+    ram      attribute applicationVersion;
+    callback attribute allowedVendorList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster AccountLogin {
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster TestCluster {
+    ram      attribute boolean;
+    ram      attribute bitmap8;
+    ram      attribute bitmap16;
+    ram      attribute bitmap32;
+    ram      attribute bitmap64;
+    ram      attribute int8u;
+    ram      attribute int16u;
+    ram      attribute int24u;
+    ram      attribute int32u;
+    ram      attribute int40u;
+    ram      attribute int48u;
+    ram      attribute int56u;
+    ram      attribute int64u;
+    ram      attribute int8s;
+    ram      attribute int16s;
+    ram      attribute int24s;
+    ram      attribute int32s;
+    ram      attribute int40s;
+    ram      attribute int48s;
+    ram      attribute int56s;
+    ram      attribute int64s;
+    ram      attribute enum8;
+    ram      attribute enum16;
+    ram      attribute floatSingle;
+    ram      attribute floatDouble;
+    ram      attribute octetString;
+    callback attribute listInt8u;
+    callback attribute listOctetString;
+    callback attribute listStructOctetString;
+    ram      attribute longOctetString;
+    ram      attribute charString;
+    ram      attribute longCharString;
+    ram      attribute epochUs;
+    ram      attribute epochS;
+    ram      attribute vendorId;
+    callback attribute listNullablesAndOptionalsStruct;
+    ram      attribute enumAttr;
+    callback attribute structAttr;
+    ram      attribute rangeRestrictedInt8u default = 70;
+    ram      attribute rangeRestrictedInt8s default = -20;
+    ram      attribute rangeRestrictedInt16u default = 200;
+    ram      attribute rangeRestrictedInt16s default = -100;
+    callback attribute listLongOctetString;
+    callback attribute listFabricScoped;
+    ram      attribute timedWriteBoolean;
+    callback attribute generalErrorBoolean;
+    callback attribute clusterErrorBoolean;
+    ram      attribute nullableBoolean;
+    ram      attribute nullableBitmap8;
+    ram      attribute nullableBitmap16;
+    ram      attribute nullableBitmap32;
+    ram      attribute nullableBitmap64;
+    ram      attribute nullableInt8u;
+    ram      attribute nullableInt16u;
+    ram      attribute nullableInt24u;
+    ram      attribute nullableInt32u;
+    ram      attribute nullableInt40u;
+    ram      attribute nullableInt48u;
+    ram      attribute nullableInt56u;
+    ram      attribute nullableInt64u;
+    ram      attribute nullableInt8s;
+    ram      attribute nullableInt16s;
+    ram      attribute nullableInt24s;
+    ram      attribute nullableInt32s;
+    ram      attribute nullableInt40s;
+    ram      attribute nullableInt48s;
+    ram      attribute nullableInt56s;
+    ram      attribute nullableInt64s;
+    ram      attribute nullableEnum8;
+    ram      attribute nullableEnum16;
+    ram      attribute nullableFloatSingle;
+    ram      attribute nullableFloatDouble;
+    ram      attribute nullableOctetString;
+    ram      attribute nullableCharString;
+    ram      attribute nullableEnumAttr;
+    callback attribute nullableStruct;
+    ram      attribute nullableRangeRestrictedInt8u default = 70;
+    ram      attribute nullableRangeRestrictedInt8s default = -20;
+    ram      attribute nullableRangeRestrictedInt16u default = 200;
+    ram      attribute nullableRangeRestrictedInt16s default = -100;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+}
+endpoint 2 {
+  device type onofflight = 256;
+
+  server cluster Groups {
+    ram      attribute nameSupport;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster OnOff {
+    ram      attribute onOff;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster PowerSource {
+    ram      attribute status;
+    ram      attribute order default = 1;
+    ram      attribute description default = "B3";
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster OccupancySensing {
+    ram      attribute occupancy;
+    ram      attribute occupancySensorType;
+    ram      attribute occupancySensorTypeBitmap;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 3;
+  }
+}
+endpoint 65534 {
+  device type anonymousEndpointType = 61442;
+
+  server cluster NetworkCommissioning {
+    callback attribute maxNetworks;
+    callback attribute networks;
+    callback attribute scanMaxTimeSeconds;
+    callback attribute connectMaxTimeSeconds;
+    callback attribute interfaceEnabled;
+    callback attribute lastNetworkingStatus;
+    callback attribute lastNetworkID;
+    callback attribute lastConnectErrorValue;
+    callback attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+}
+
+
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
new file mode 100644
index 00000000000000..3681c0960de78d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -0,0 +1,25101 @@
+{
+  "featureLevel": 71,
+  "creator": "zap",
+  "keyValuePairs": [
+    {
+      "key": "commandDiscovery",
+      "value": "1"
+    },
+    {
+      "key": "defaultResponsePolicy",
+      "value": "always"
+    },
+    {
+      "key": "manufacturerCodes",
+      "value": "0x1002"
+    }
+  ],
+  "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/zcl/zcl.json",
+      "version": "ZCL Test Data",
+      "type": "zcl-properties"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "version": "chip-v1",
+      "type": "gen-templates-json"
+    }
+  ],
+  "endpointTypes": [
+    {
+      "name": "MA-rootdevice",
+      "deviceTypeName": "MA-rootdevice",
+      "deviceTypeCode": 22,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "identify type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "name support",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneValid",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NameSupport",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Off",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "On",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Toggle",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "OnOff",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToLevel",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Move",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Step",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Stop",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToLevelWithOnOff",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveWithOnOff",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepWithOnOff",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopWithOnOff",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "current level",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "device list",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "server list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "client list",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "parts list",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Binding",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ACL",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Extension",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SubjectsPerAccessControlEntry",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetsPerAccessControlEntry",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AccessControlEntriesPerFabric",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "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": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_PROVIDER_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "QueryImage",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ApplyUpdateRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "NotifyUpdateApplied",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_PROVIDER_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "QueryImageResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ApplyUpdateResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_REQUESTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AnnounceOtaProvider",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_REQUESTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DefaultOtaProviders",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdatePossible",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdateState",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OTAUpdateStateEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdateStateProgress",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Localization Configuration",
+          "code": 43,
+          "mfgCode": null,
+          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Localization Configuration",
+          "code": 43,
+          "mfgCode": null,
+          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ActiveLocale",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "en-US",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedLocales",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Time Format Localization",
+          "code": 44,
+          "mfgCode": null,
+          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Time Format Localization",
+          "code": 44,
+          "mfgCode": null,
+          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "HourFormat",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "HourFormat",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveCalendarType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CalendarType",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedCalendarTypes",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Unit Localization",
+          "code": 45,
+          "mfgCode": null,
+          "define": "UNIT_LOCALIZATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Unit Localization",
+          "code": 45,
+          "mfgCode": null,
+          "define": "UNIT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "TemperatureUnit",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "TempUnit",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source Configuration",
+          "code": 46,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Power Source Configuration",
+          "code": 46,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Sources",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Status",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Order",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Description",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "B1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedInputVoltage",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedInputFrequency",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredCurrentType",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedCurrent",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredNominalVoltage",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredMaximumCurrent",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredPresent",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveWiredFaults",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryVoltage",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryPercentRemaining",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryTimeRemaining",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargeLevel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplacementNeeded",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplaceability",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryPresent",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveBatteryFaults",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplacementDescription",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryCommonDesignation",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryANSIDesignation",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryIECDesignation",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryApprovedChemistry",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryCapacity",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryQuantity",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargeState",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryTimeToFullCharge",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryFunctionalWhileCharging",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargingCurrent",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveBatteryChargeFaults",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ArmFailSafe",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "CommissioningComplete",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ArmFailSafeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "CommissioningCompleteResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Breadcrumb",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BasicCommissioningInfo",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BasicCommissioningInfo",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocationCapability",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportsConcurrentConnection",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatus",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Diagnostic Logs",
+          "code": 50,
+          "mfgCode": null,
+          "define": "DIAGNOSTIC_LOGS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "RetrieveLogsRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReasons",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "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": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Software Diagnostics",
+          "code": 52,
+          "mfgCode": null,
+          "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetWatermarks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Software Diagnostics",
+          "code": 52,
+          "mfgCode": null,
+          "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ThreadMetrics",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentHeapFree",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentHeapUsed",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentHeapHighWatermark",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thread Network Diagnostics",
+          "code": 53,
+          "mfgCode": null,
+          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": []
+        },
+        {
+          "name": "Thread Network Diagnostics",
+          "code": 53,
+          "mfgCode": null,
+          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "channel",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RoutingRole",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RoutingRole",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NetworkName",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PanId",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ExtendedPanId",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeshLocalPrefix",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NeighborTableList",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RouteTableList",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartitionId",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "weighting",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DataVersion",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StableDataVersion",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LeaderRouterId",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DetachedRoleCount",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChildRoleCount",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RouterRoleCount",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LeaderRoleCount",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttachAttemptCount",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartitionIdChangeCount",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BetterPartitionAttachAttemptCount",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ParentChangeCount",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxTotalCount",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxUnicastCount",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBroadcastCount",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxAckRequestedCount",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxAckedCount",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxNoAckRequestedCount",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDataCount",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDataPollCount",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBeaconCount",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBeaconRequestCount",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxOtherCount",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxRetryCount",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDirectMaxRetryExpiryCount",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxIndirectMaxRetryExpiryCount",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrCcaCount",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrAbortCount",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrBusyChannelCount",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxTotalCount",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxUnicastCount",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBroadcastCount",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDataCount",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDataPollCount",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBeaconCount",
+              "code": 44,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBeaconRequestCount",
+              "code": 45,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxOtherCount",
+              "code": 46,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxAddressFilteredCount",
+              "code": 47,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDestAddrFilteredCount",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDuplicatedCount",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrNoFrameCount",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrUnknownNeighborCount",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrInvalidSrcAddrCount",
+              "code": 52,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrSecCount",
+              "code": 53,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrFcsCount",
+              "code": 54,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrOtherCount",
+              "code": 55,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveTimestamp",
+              "code": 56,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PendingTimestamp",
+              "code": 57,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "delay",
+              "code": 58,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SecurityPolicy",
+              "code": 59,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SecurityPolicy",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChannelMask",
+              "code": 60,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperationalDatasetComponents",
+              "code": 61,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OperationalDatasetComponents",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaultsList",
+              "code": 62,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "WiFi Network Diagnostics",
+          "code": 54,
+          "mfgCode": null,
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "WiFi Network Diagnostics",
+          "code": 54,
+          "mfgCode": null,
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "bssid",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SecurityType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SecurityType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiFiVersion",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WiFiVersionType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChannelNumber",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Rssi",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BeaconLostCount",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BeaconRxCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketMulticastRxCount",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketMulticastTxCount",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketUnicastRxCount",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketUnicastTxCount",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentMaxRate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Ethernet Network Diagnostics",
+          "code": 55,
+          "mfgCode": null,
+          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Ethernet Network Diagnostics",
+          "code": 55,
+          "mfgCode": null,
+          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "PHYRate",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PHYRateType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FullDuplex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketRxCount",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketTxCount",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrCount",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CollisionCount",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CarrierDetect",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TimeSinceReset",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "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": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Switch",
+          "code": 59,
+          "mfgCode": null,
+          "define": "SWITCH_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Switch",
+          "code": 59,
+          "mfgCode": null,
+          "define": "SWITCH_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "number of positions",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "current position",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "multi press max",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "AdministratorCommissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "OpenBasicCommissioningWindow",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RevokeCommissioning",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "AdministratorCommissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminFabricIndex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminVendorId",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AttestationRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "CertificateChainRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "CSRRequest",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddNOC",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "UpdateFabricLabel",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "CertificateChainResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NOCs",
+              "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": "Fabrics",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedFabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CommissionedFabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TrustedRootCertificates",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentFabricIndex",
+              "code": 5,
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "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": "MaxGroupKeysPerFabric",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Door Lock",
+          "code": 257,
+          "mfgCode": null,
+          "define": "DOOR_LOCK_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "LockDoor",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "UnlockDoor",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Door Lock",
+          "code": 257,
+          "mfgCode": null,
+          "define": "DOOR_LOCK_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "LockState",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLockState",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LockType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLockType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActuatorEnabled",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DoorState",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlDoorState",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Language",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LEDSettings",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AutoRelockTime",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoundVolume",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperatingMode",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlOperatingMode",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DefaultConfigurationRegister",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlDefaultConfigurationRegister",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableLocalProgramming",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableOneTouchLocking",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableInsideStatusLED",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnablePrivacyModeButton",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WrongCodeEntryLimit",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UserCodeTemporaryDisableTime",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SendPINOverTheAir",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RequirePINforRemoteOperation",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Barrier Control",
+          "code": 259,
+          "mfgCode": null,
+          "define": "BARRIER_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "BarrierControlGoToPercent",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "BarrierControlStop",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Barrier Control",
+          "code": 259,
+          "mfgCode": null,
+          "define": "BARRIER_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "barrier moving state",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier safety status",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier capabilities",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier position",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToHue",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveHue",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepHue",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToSaturation",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveSaturation",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepSaturation",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToHueAndSaturation",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColor",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColor",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColor",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColorTemperature",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopMoveStep",
+              "code": 71,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColorTemperature",
+              "code": 75,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColorTemperature",
+              "code": 76,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "CurrentHue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentSaturation",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentX",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x616B",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentY",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x607D",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DriftCompensation",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CompensationText",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTemperature",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00FA",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorMode",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Options",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfPrimaries",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1X",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1Y",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1Intensity",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2X",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2Y",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2Intensity",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3X",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3Y",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3Intensity",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4X",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4Y",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4Intensity",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5X",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5Y",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5Intensity",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6X",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6Y",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6Intensity",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WhitePointX",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WhitePointY",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRX",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRY",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRIntensity",
+              "code": 52,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGX",
+              "code": 54,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGY",
+              "code": 55,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGIntensity",
+              "code": 56,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBX",
+              "code": 58,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBY",
+              "code": 59,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBIntensity",
+              "code": 60,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedCurrentHue",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedColorMode",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopActive",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopDirection",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopTime",
+              "code": 16388,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0019",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorCapabilities",
+              "code": 16394,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMinMireds",
+              "code": 16395,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMaxMireds",
+              "code": 16396,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFEFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CoupleColorTempToLevelMinMireds",
+              "code": 16397,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpColorTemperatureMireds",
+              "code": 16400,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Illuminance Measurement",
+          "code": 1024,
+          "mfgCode": null,
+          "define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Illuminance Measurement",
+          "code": 1024,
+          "mfgCode": null,
+          "define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LightSensorType",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMP_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMP_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Relative Humidity Measurement",
+          "code": 1029,
+          "mfgCode": null,
+          "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Relative Humidity Measurement",
+          "code": 1029,
+          "mfgCode": null,
+          "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "measured value",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "min measured value",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "max measured value",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x2710",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "occupancy",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type bitmap",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "IAS Zone",
+          "code": 1280,
+          "mfgCode": null,
+          "define": "IAS_ZONE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ZoneEnrollResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "IAS Zone",
+          "code": 1280,
+          "mfgCode": null,
+          "define": "IAS_ZONE_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ZoneStatusChangeNotification",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ZoneEnrollRequest",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "zone state",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "zone type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "zone status",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IAS CIE address",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "node_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Zone ID",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Test Cluster",
+          "code": 4294048773,
+          "mfgCode": null,
+          "define": "TEST_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Test",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "TestNotHandled",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestSpecific",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Test Cluster",
+          "code": 4294048773,
+          "mfgCode": null,
+          "define": "TEST_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "TestSpecificResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "boolean",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap8",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap8MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap16",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap16MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap32",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap32MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap64",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap64MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int8u",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int16u",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int32u",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int64u",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int8s",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int16s",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int32s",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int64s",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "enum8",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "enum16",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "octet_string",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_int8u",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_octet_string",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_struct_octet_string",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MA-onofflight",
+      "deviceTypeName": "MA-onofflight",
+      "deviceTypeCode": 256,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "identify type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "name support",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneValid",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NameSupport",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Off",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "On",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Toggle",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "OffWithEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "OnWithRecallGlobalScene",
+              "code": 65,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "OnWithTimedOff",
+              "code": 66,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "OnOff",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GlobalSceneControl",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OnTime",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OffWaitTime",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpOnOff",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OnOffStartUpOnOff",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/off Switch Configuration",
+          "code": 7,
+          "mfgCode": null,
+          "define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/off Switch Configuration",
+          "code": 7,
+          "mfgCode": null,
+          "define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "switch type",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "switch actions",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToLevel",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Move",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Step",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Stop",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToLevelWithOnOff",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveWithOnOff",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepWithOnOff",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopWithOnOff",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "current level",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFE",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "remaining time",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "min level",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "max level",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFE",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "current frequency",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "min frequency",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "max frequency",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "options",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "on off transition time",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "on level",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "on transition time",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "off transition time",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "default move rate",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "50",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "start up current level",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "255",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binary Input (Basic)",
+          "code": 15,
+          "mfgCode": null,
+          "define": "BINARY_INPUT_BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binary Input (Basic)",
+          "code": 15,
+          "mfgCode": null,
+          "define": "BINARY_INPUT_BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "out of service",
+              "code": 81,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "present value",
+              "code": 85,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "status flags",
+              "code": 111,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "device list",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "server list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "client list",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "parts list",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Binding",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Bridged Actions",
+          "code": 37,
+          "mfgCode": null,
+          "define": "BRIDGED_ACTIONS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Bridged Actions",
+          "code": 37,
+          "mfgCode": null,
+          "define": "BRIDGED_ACTIONS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "action list",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "endpoint list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "setup url",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_PROVIDER_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "QueryImage",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ApplyUpdateRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_PROVIDER_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ApplyUpdateResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_REQUESTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_REQUESTOR_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Status",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Order",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Description",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "B2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedInputVoltage",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedInputFrequency",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredCurrentType",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedCurrent",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredNominalVoltage",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredMaximumCurrent",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredPresent",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveWiredFaults",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryVoltage",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryPercentRemaining",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryTimeRemaining",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargeLevel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplacementNeeded",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplaceability",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryPresent",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveBatteryFaults",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplacementDescription",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryCommonDesignation",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryANSIDesignation",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryIECDesignation",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryApprovedChemistry",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryCapacity",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryQuantity",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargeState",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryTimeToFullCharge",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryFunctionalWhileCharging",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargingCurrent",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveBatteryChargeFaults",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ArmFailSafe",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ArmFailSafeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Breadcrumb",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "o",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BasicCommissioningInfo",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BasicCommissioningInfo",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportsConcurrentConnection",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatus",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Switch",
+          "code": 59,
+          "mfgCode": null,
+          "define": "SWITCH_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Switch",
+          "code": 59,
+          "mfgCode": null,
+          "define": "SWITCH_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "number of positions",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "current position",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "multi press max",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Boolean State",
+          "code": 69,
+          "mfgCode": null,
+          "define": "BOOLEAN_STATE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Boolean State",
+          "code": 69,
+          "mfgCode": null,
+          "define": "BOOLEAN_STATE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "StateValue",
+              "code": 0,
+              "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,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Mode Select",
+          "code": 80,
+          "mfgCode": null,
+          "define": "MODE_SELECT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ChangeToMode",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Mode Select",
+          "code": 80,
+          "mfgCode": null,
+          "define": "MODE_SELECT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Description",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "Coffee",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "StandardNamespace",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedModes",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentMode",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpMode",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OnMode",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "255",
+              "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": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Door Lock",
+          "code": 257,
+          "mfgCode": null,
+          "define": "DOOR_LOCK_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "LockDoor",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "UnlockDoor",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "UnlockWithTimeout",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "SetWeekDaySchedule",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GetWeekDaySchedule",
+              "code": 12,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "ClearWeekDaySchedule",
+              "code": 13,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "SetYearDaySchedule",
+              "code": 14,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GetYearDaySchedule",
+              "code": 15,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "SetUser",
+              "code": 26,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GetUser",
+              "code": 27,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "ClearUser",
+              "code": 29,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "SetCredential",
+              "code": 34,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GetCredentialStatus",
+              "code": 36,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "ClearCredential",
+              "code": 38,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Door Lock",
+          "code": 257,
+          "mfgCode": null,
+          "define": "DOOR_LOCK_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "GetUserResponse",
+              "code": 28,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "SetCredentialResponse",
+              "code": 35,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GetCredentialStatusResponse",
+              "code": 37,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "LockState",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLockState",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LockType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLockType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActuatorEnabled",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DoorState",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlDoorState",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DoorOpenEvents",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "DoorClosedEvents",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OpenPeriod",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfTotalUsersSupported",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfPINUsersSupported",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfRFIDUsersSupported",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfWeekDaySchedulesSupportedPerUser",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfYearDaySchedulesSupportedPerUser",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfHolidaySchedulesSupported",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxPINCodeLength",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinPINCodeLength",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxRFIDCodeLength",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "20",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinRFIDCodeLength",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CredentialRulesSupport",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlCredentialRuleMask",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfCredentialsSupportedPerUser",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Language",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "en",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LEDSettings",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AutoRelockTime",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "60",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoundVolume",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperatingMode",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlOperatingMode",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedOperatingModes",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlSupportedOperatingModes",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFF6",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "DefaultConfigurationRegister",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlDefaultConfigurationRegister",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableLocalProgramming",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableOneTouchLocking",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableInsideStatusLED",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnablePrivacyModeButton",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalProgrammingFeatures",
+              "code": 44,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLocalProgrammingFeatures",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WrongCodeEntryLimit",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UserCodeTemporaryDisableTime",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SendPINOverTheAir",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "RequirePINforRemoteOperation",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ExpiringUserTimeout",
+              "code": 53,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Window Covering",
+          "code": 258,
+          "mfgCode": null,
+          "define": "WINDOW_COVERING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "UpOrOpen",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "DownOrClose",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StopMotion",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "GoToLiftValue",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GoToLiftPercentage",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GoToTiltValue",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "GoToTiltPercentage",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Window Covering",
+          "code": 258,
+          "mfgCode": null,
+          "define": "WINDOW_COVERING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Type",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Type",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLift",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x7FFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTilt",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x7FFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConfigStatus",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ConfigStatus",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x03",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLiftPercentage",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Percent",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "50",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 100,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTiltPercentage",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Percent",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "50",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 100,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperationalStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 127,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetPositionLiftPercent100ths",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Percent100ths",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "500",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 10000,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetPositionTiltPercent100ths",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Percent100ths",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "500",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 10000,
+              "reportableChange": 0
+            },
+            {
+              "name": "EndProductType",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "EndProductType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLiftPercent100ths",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Percent100ths",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "500",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 10000,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTiltPercent100ths",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Percent100ths",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "500",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 10000,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledOpenLimitLift",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledClosedLimitLift",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledOpenLimitTilt",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledClosedLimitTilt",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Mode",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Mode",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 15,
+              "reportableChange": 0
+            },
+            {
+              "name": "SafetyStatus",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Barrier Control",
+          "code": 259,
+          "mfgCode": null,
+          "define": "BARRIER_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "BarrierControlGoToPercent",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "BarrierControlStop",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Barrier Control",
+          "code": 259,
+          "mfgCode": null,
+          "define": "BARRIER_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "barrier moving state",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier safety status",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier capabilities",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier position",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Pump Configuration and Control",
+          "code": 512,
+          "mfgCode": null,
+          "define": "PUMP_CONFIG_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Pump Configuration and Control",
+          "code": 512,
+          "mfgCode": null,
+          "define": "PUMP_CONFIG_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MaxPressure",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxSpeed",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxFlow",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinConstPressure",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxConstPressure",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinCompPressure",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxCompPressure",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinConstSpeed",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxConstSpeed",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinConstFlow",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxConstFlow",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinConstTemp",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxConstTemp",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PumpStatus",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PumpStatus",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EffectiveOperationMode",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PumpOperationMode",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EffectiveControlMode",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PumpControlMode",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Capacity",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Speed",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LifetimeRunningHours",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int24u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Power",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int24u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LifetimeEnergyConsumed",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperationMode",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PumpOperationMode",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ControlMode",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PumpControlMode",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thermostat",
+          "code": 513,
+          "mfgCode": null,
+          "define": "THERMOSTAT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "SetpointRaiseLower",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetWeeklySchedule",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "GetWeeklySchedule",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ClearWeeklySchedule",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thermostat",
+          "code": 513,
+          "mfgCode": null,
+          "define": "THERMOSTAT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "GetWeeklyScheduleResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "LocalTemperature",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMinHeatSetpointLimit",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x02BC",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMaxHeatSetpointLimit",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0BB8",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMinCoolSetpointLimit",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0640",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMaxCoolSetpointLimit",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0C80",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PICoolingDemand",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PIHeatingDemand",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OccupiedCoolingSetpoint",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0A28",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OccupiedHeatingSetpoint",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x07D0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinHeatSetpointLimit",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x02BC",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxHeatSetpointLimit",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0BB8",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinCoolSetpointLimit",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0640",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxCoolSetpointLimit",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0C80",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinSetpointDeadBand",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x19",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ControlSequenceOfOperation",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ThermostatControlSequence",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x04",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SystemMode",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartOfWeek",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfWeeklyTransitions",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "7",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfDailyTransitions",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TemperatureSetpointHold",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fan Control",
+          "code": 514,
+          "mfgCode": null,
+          "define": "FAN_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Fan Control",
+          "code": 514,
+          "mfgCode": null,
+          "define": "FAN_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "fan mode",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "FanModeType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "fan mode sequence",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "FanModeSequenceType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x02",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "percent setting",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "percent current",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "speed max",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "100",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "speed setting",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "speed current",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "rock support",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "rock setting",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "wind support",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "wind setting",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thermostat User Interface Configuration",
+          "code": 516,
+          "mfgCode": null,
+          "define": "THERMOSTAT_UI_CONFIG_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thermostat User Interface Configuration",
+          "code": 516,
+          "mfgCode": null,
+          "define": "THERMOSTAT_UI_CONFIG_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "temperature display mode",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "keypad lockout",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "schedule programming visibility",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToHue",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveHue",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "StepHue",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToSaturation",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveSaturation",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "StepSaturation",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToHueAndSaturation",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColor",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColor",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColor",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColorTemperature",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "EnhancedMoveToHue",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedMoveHue",
+              "code": 65,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedStepHue",
+              "code": 66,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedMoveToHueAndSaturation",
+              "code": 67,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "ColorLoopSet",
+              "code": 68,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 0
+            },
+            {
+              "name": "StopMoveStep",
+              "code": 71,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColorTemperature",
+              "code": 75,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColorTemperature",
+              "code": 76,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "CurrentHue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentSaturation",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentX",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x616B",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentY",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x607D",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DriftCompensation",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CompensationText",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTemperature",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00FA",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorMode",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Options",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfPrimaries",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1X",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1Y",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1Intensity",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2X",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2Y",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2Intensity",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3X",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3Y",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3Intensity",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4X",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4Y",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4Intensity",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5X",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5Y",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5Intensity",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6X",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6Y",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6Intensity",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WhitePointX",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WhitePointY",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRX",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRY",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRIntensity",
+              "code": 52,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGX",
+              "code": 54,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGY",
+              "code": 55,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGIntensity",
+              "code": 56,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBX",
+              "code": 58,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBY",
+              "code": 59,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBIntensity",
+              "code": 60,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedCurrentHue",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedColorMode",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopActive",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopDirection",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopTime",
+              "code": 16388,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0019",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopStartEnhancedHue",
+              "code": 16389,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x2300",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopStoredEnhancedHue",
+              "code": 16390,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorCapabilities",
+              "code": 16394,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMinMireds",
+              "code": 16395,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMaxMireds",
+              "code": 16396,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFEFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CoupleColorTempToLevelMinMireds",
+              "code": 16397,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpColorTemperatureMireds",
+              "code": 16400,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Illuminance Measurement",
+          "code": 1024,
+          "mfgCode": null,
+          "define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Illuminance Measurement",
+          "code": 1024,
+          "mfgCode": null,
+          "define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFE",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LightSensorType",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMP_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMP_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Pressure Measurement",
+          "code": 1027,
+          "mfgCode": null,
+          "define": "PRESSURE_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Pressure Measurement",
+          "code": 1027,
+          "mfgCode": null,
+          "define": "PRESSURE_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScaledValue",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScaledTolerance",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Flow Measurement",
+          "code": 1028,
+          "mfgCode": null,
+          "define": "FLOW_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Flow Measurement",
+          "code": 1028,
+          "mfgCode": null,
+          "define": "FLOW_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Relative Humidity Measurement",
+          "code": 1029,
+          "mfgCode": null,
+          "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Relative Humidity Measurement",
+          "code": 1029,
+          "mfgCode": null,
+          "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "measured value",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "min measured value",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "max measured value",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x2710",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "occupancy",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type bitmap",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "IAS Zone",
+          "code": 1280,
+          "mfgCode": null,
+          "define": "IAS_ZONE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ZoneEnrollResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "IAS Zone",
+          "code": 1280,
+          "mfgCode": null,
+          "define": "IAS_ZONE_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ZoneStatusChangeNotification",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ZoneEnrollRequest",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "zone state",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "zone type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "zone status",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IAS CIE address",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "node_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Zone ID",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Wake on LAN",
+          "code": 1283,
+          "mfgCode": null,
+          "define": "WAKE_ON_LAN_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Wake on LAN",
+          "code": 1283,
+          "mfgCode": null,
+          "define": "WAKE_ON_LAN_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MACAddress",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Channel",
+          "code": 1284,
+          "mfgCode": null,
+          "define": "CHANNEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ChangeChannel",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ChangeChannelByNumber",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SkipChannel",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Channel",
+          "code": 1284,
+          "mfgCode": null,
+          "define": "CHANNEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ChannelList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Lineup",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LineupInfo",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentChannel",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ChannelInfo",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Target Navigator",
+          "code": 1285,
+          "mfgCode": null,
+          "define": "TARGET_NAVIGATOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "NavigateTarget",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Target Navigator",
+          "code": 1285,
+          "mfgCode": null,
+          "define": "TARGET_NAVIGATOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "NavigateTargetResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "TargetList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentTarget",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Media Playback",
+          "code": 1286,
+          "mfgCode": null,
+          "define": "MEDIA_PLAYBACK_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Play",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Pause",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopPlayback",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StartOver",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "Previous",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "Next",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "Rewind",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "FastForward",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "SkipForward",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "SkipBackward",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Media Playback",
+          "code": 1286,
+          "mfgCode": null,
+          "define": "MEDIA_PLAYBACK_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "PlaybackResponse",
+              "code": 10,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "CurrentState",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PlaybackStateEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartTime",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_us",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Duration",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SampledPosition",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PlaybackPosition",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PlaybackSpeed",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SeekRangeEnd",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SeekRangeStart",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Media Input",
+          "code": 1287,
+          "mfgCode": null,
+          "define": "MEDIA_INPUT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "SelectInput",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ShowInputStatus",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "HideInputStatus",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RenameInput",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Media Input",
+          "code": 1287,
+          "mfgCode": null,
+          "define": "MEDIA_INPUT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "InputList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentInput",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Low Power",
+          "code": 1288,
+          "mfgCode": null,
+          "define": "LOW_POWER_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Sleep",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Low Power",
+          "code": 1288,
+          "mfgCode": null,
+          "define": "LOW_POWER_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Keypad Input",
+          "code": 1289,
+          "mfgCode": null,
+          "define": "KEYPAD_INPUT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "SendKey",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Keypad Input",
+          "code": 1289,
+          "mfgCode": null,
+          "define": "KEYPAD_INPUT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "SendKeyResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Content Launcher",
+          "code": 1290,
+          "mfgCode": null,
+          "define": "CONTENT_LAUNCH_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "LaunchContent",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "LaunchURL",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Content Launcher",
+          "code": 1290,
+          "mfgCode": null,
+          "define": "CONTENT_LAUNCH_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "AcceptHeader",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedStreamingProtocols",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Audio Output",
+          "code": 1291,
+          "mfgCode": null,
+          "define": "AUDIO_OUTPUT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "SelectOutput",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RenameOutput",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Audio Output",
+          "code": 1291,
+          "mfgCode": null,
+          "define": "AUDIO_OUTPUT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "OutputList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentOutput",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Application Launcher",
+          "code": 1292,
+          "mfgCode": null,
+          "define": "APPLICATION_LAUNCHER_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "LaunchApp",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopApp",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "HideApp",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Application Launcher",
+          "code": 1292,
+          "mfgCode": null,
+          "define": "APPLICATION_LAUNCHER_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "LauncherResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "CatalogList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentApp",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ApplicationEP",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Application Basic",
+          "code": 1293,
+          "mfgCode": null,
+          "define": "APPLICATION_BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Application Basic",
+          "code": 1293,
+          "mfgCode": null,
+          "define": "APPLICATION_BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "VendorName",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ApplicationName",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Application",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ApplicationBasicApplication",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Status",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ApplicationStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ApplicationVersion",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AllowedVendorList",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Account Login",
+          "code": 1294,
+          "mfgCode": null,
+          "define": "ACCOUNT_LOGIN_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "GetSetupPIN",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Login",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Logout",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Account Login",
+          "code": 1294,
+          "mfgCode": null,
+          "define": "ACCOUNT_LOGIN_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "GetSetupPINResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Test Cluster",
+          "code": 4294048773,
+          "mfgCode": null,
+          "define": "TEST_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Test",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "TestNotHandled",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "TestSpecific",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestAddArguments",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestStructArgumentRequest",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestNestedStructArgumentRequest",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestListStructArgumentRequest",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestListInt8UArgumentRequest",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestNestedStructListArgumentRequest",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestListNestedStructListArgumentRequest",
+              "code": 12,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestListInt8UReverseRequest",
+              "code": 13,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestEnumsRequest",
+              "code": 14,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestNullableOptionalRequest",
+              "code": 15,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "SimpleStructEchoRequest",
+              "code": 17,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TimedInvokeRequest",
+              "code": 18,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestSimpleOptionalArgumentRequest",
+              "code": 19,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestEmitTestEventRequest",
+              "code": 20,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TestEmitTestFabricScopedEventRequest",
+              "code": 21,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Test Cluster",
+          "code": 4294048773,
+          "mfgCode": null,
+          "define": "TEST_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestSpecificResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "TestAddArgumentsResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "TestListInt8UReverseResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "TestEnumsResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "TestNullableOptionalResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "SimpleStructResponse",
+              "code": 9,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "TestEmitTestEventResponse",
+              "code": 10,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "TestEmitTestFabricScopedEventResponse",
+              "code": 11,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "boolean",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap8",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap8MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap16",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap16MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap32",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap32MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "bitmap64",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap64MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int8u",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int16u",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int24u",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int24u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int32u",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int40u",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int40u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int48u",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int48u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int56u",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int56u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int64u",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int8s",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int16s",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int24s",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int24s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int32s",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "int40s",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int40s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int48s",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int48s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int56s",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int56s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "int64s",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "enum8",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "enum16",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "float_single",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "float_double",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "double",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "octet_string",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_int8u",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_octet_string",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_struct_octet_string",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "long_octet_string",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "char_string",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "long_char_string",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "epoch_us",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_us",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "epoch_s",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "vendor_id",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_nullables_and_optionals_struct",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "enum_attr",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SimpleEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "struct_attr",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SimpleStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "range_restricted_int8u",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "70",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "range_restricted_int8s",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "-20",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "range_restricted_int16u",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "200",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "range_restricted_int16s",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "-100",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_long_octet_string",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "list_fabric_scoped",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "timed_write_boolean",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "general_error_boolean",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "cluster_error_boolean",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "unsupported",
+              "code": 255,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_boolean",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_bitmap8",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap8MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_bitmap16",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap16MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_bitmap32",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap32MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_bitmap64",
+              "code": 16388,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Bitmap64MaskMap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int8u",
+              "code": 16389,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int16u",
+              "code": 16390,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int24u",
+              "code": 16391,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int24u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int32u",
+              "code": 16392,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int40u",
+              "code": 16393,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int40u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int48u",
+              "code": 16394,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int48u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int56u",
+              "code": 16395,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int56u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int64u",
+              "code": 16396,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int8s",
+              "code": 16397,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int16s",
+              "code": 16398,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int24s",
+              "code": 16399,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int24s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int32s",
+              "code": 16400,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int40s",
+              "code": 16401,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int40s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int48s",
+              "code": 16402,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int48s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int56s",
+              "code": 16403,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int56s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_int64s",
+              "code": 16404,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_enum8",
+              "code": 16405,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_enum16",
+              "code": 16406,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_float_single",
+              "code": 16407,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_float_double",
+              "code": 16408,
+              "mfgCode": null,
+              "side": "server",
+              "type": "double",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_octet_string",
+              "code": 16409,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_char_string",
+              "code": 16414,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_enum_attr",
+              "code": 16420,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SimpleEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_struct",
+              "code": 16421,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SimpleStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_range_restricted_int8u",
+              "code": 16422,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "70",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_range_restricted_int8s",
+              "code": 16423,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "-20",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_range_restricted_int16u",
+              "code": 16424,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "200",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "nullable_range_restricted_int16s",
+              "code": 16425,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "-100",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Electrical Measurement",
+          "code": 2820,
+          "mfgCode": null,
+          "define": "ELECTRICAL_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Electrical Measurement",
+          "code": 2820,
+          "mfgCode": null,
+          "define": "ELECTRICAL_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "measurement type",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "total active power",
+              "code": 772,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "rms voltage",
+              "code": 1285,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "rms voltage min",
+              "code": 1286,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "rms voltage max",
+              "code": 1287,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "rms current",
+              "code": 1288,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "rms current min",
+              "code": 1289,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "rms current max",
+              "code": 1290,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "active power",
+              "code": 1291,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "active power min",
+              "code": 1292,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "active power max",
+              "code": 1293,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xffff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MA-onofflight",
+      "deviceTypeName": "MA-onofflight",
+      "deviceTypeCode": 256,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "name support",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneValid",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NameSupport",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Off",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "On",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Toggle",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "OnOff",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GlobalSceneControl",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OnTime",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OffWaitTime",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpOnOff",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OnOffStartUpOnOff",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToLevel",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Move",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Step",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "Stop",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToLevelWithOnOff",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveWithOnOff",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepWithOnOff",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopWithOnOff",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "current level",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "device list",
+              "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": "server list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "client list",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "parts list",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Status",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Order",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Description",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "B3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedInputVoltage",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedInputFrequency",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredCurrentType",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredAssessedCurrent",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredNominalVoltage",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredMaximumCurrent",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredPresent",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveWiredFaults",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryVoltage",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryPercentRemaining",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryTimeRemaining",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargeLevel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplacementNeeded",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplaceability",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryPresent",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveBatteryFaults",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryReplacementDescription",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryCommonDesignation",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryANSIDesignation",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryIECDesignation",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryApprovedChemistry",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryCapacity",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryQuantity",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargeState",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryTimeToFullCharge",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryFunctionalWhileCharging",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatteryChargingCurrent",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveBatteryChargeFaults",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "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": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Door Lock",
+          "code": 257,
+          "mfgCode": null,
+          "define": "DOOR_LOCK_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "LockDoor",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "UnlockDoor",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Door Lock",
+          "code": 257,
+          "mfgCode": null,
+          "define": "DOOR_LOCK_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "LockState",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLockState",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LockType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlLockType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActuatorEnabled",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DoorState",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlDoorState",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Language",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LEDSettings",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AutoRelockTime",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoundVolume",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperatingMode",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlOperatingMode",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DefaultConfigurationRegister",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DlDefaultConfigurationRegister",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableLocalProgramming",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableOneTouchLocking",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnableInsideStatusLED",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnablePrivacyModeButton",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WrongCodeEntryLimit",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UserCodeTemporaryDisableTime",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SendPINOverTheAir",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RequirePINforRemoteOperation",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "6",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Barrier Control",
+          "code": 259,
+          "mfgCode": null,
+          "define": "BARRIER_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "BarrierControlGoToPercent",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "BarrierControlStop",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Barrier Control",
+          "code": 259,
+          "mfgCode": null,
+          "define": "BARRIER_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "barrier moving state",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier safety status",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier capabilities",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "barrier position",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToHue",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveHue",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepHue",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToSaturation",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveSaturation",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepSaturation",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToHueAndSaturation",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColor",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColor",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColor",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColorTemperature",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StopMoveStep",
+              "code": 71,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColorTemperature",
+              "code": 75,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColorTemperature",
+              "code": 76,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "CurrentHue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentSaturation",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentX",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x616B",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentY",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x607D",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DriftCompensation",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CompensationText",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTemperature",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00FA",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorMode",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Options",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfPrimaries",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1X",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1Y",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary1Intensity",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2X",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2Y",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary2Intensity",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3X",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3Y",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary3Intensity",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4X",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4Y",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary4Intensity",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5X",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5Y",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary5Intensity",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6X",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6Y",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Primary6Intensity",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WhitePointX",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WhitePointY",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRX",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRY",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointRIntensity",
+              "code": 52,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGX",
+              "code": 54,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGY",
+              "code": 55,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointGIntensity",
+              "code": 56,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBX",
+              "code": 58,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBY",
+              "code": 59,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorPointBIntensity",
+              "code": 60,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedCurrentHue",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedColorMode",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopActive",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopDirection",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopTime",
+              "code": 16388,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0019",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorCapabilities",
+              "code": 16394,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMinMireds",
+              "code": 16395,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMaxMireds",
+              "code": 16396,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFEFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CoupleColorTempToLevelMinMireds",
+              "code": 16397,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpColorTemperatureMireds",
+              "code": 16400,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMP_MEASUREMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMP_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "occupancy",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type bitmap",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "IAS Zone",
+          "code": 1280,
+          "mfgCode": null,
+          "define": "IAS_ZONE_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ZoneEnrollResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "IAS Zone",
+          "code": 1280,
+          "mfgCode": null,
+          "define": "IAS_ZONE_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ZoneStatusChangeNotification",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "ZoneEnrollRequest",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "zone state",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "zone type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "zone status",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IAS CIE address",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "node_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Zone ID",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xff",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeName": "MA-secondary-network-commissioning",
+      "deviceTypeCode": 61442,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatus",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "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": 0,
+              "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": 0,
+              "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": 0,
+              "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": "External",
+              "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": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "endpoints": [
+    {
+      "endpointTypeName": "MA-rootdevice",
+      "endpointTypeIndex": 0,
+      "profileId": 259,
+      "endpointId": 0,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 22
+    },
+    {
+      "endpointTypeName": "MA-onofflight",
+      "endpointTypeIndex": 1,
+      "profileId": 259,
+      "endpointId": 1,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 256
+    },
+    {
+      "endpointTypeName": "MA-onofflight",
+      "endpointTypeIndex": 2,
+      "profileId": 259,
+      "endpointId": 2,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 256
+    },
+    {
+      "endpointTypeName": "Anonymous Endpoint Type",
+      "endpointTypeIndex": 3,
+      "profileId": 259,
+      "endpointId": 65534,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 61442
+    }
+  ]
+}
diff --git a/examples/ipv6only-app/esp32/.gitignore b/examples/all-clusters-minimal-app/ameba/.gitignore
old mode 100644
new mode 100755
similarity index 100%
rename from examples/ipv6only-app/esp32/.gitignore
rename to examples/all-clusters-minimal-app/ameba/.gitignore
diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md
new file mode 100644
index 00000000000000..3c51bc43cabda9
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/README.md
@@ -0,0 +1,153 @@
+# CHIP Ameba All Clusters Example
+
+A prototype application that demonstrates device commissioning and cluster
+control.
+
+---
+
+-   [CHIP Ameba All Clusters Example](#chip-ameba-all-clusters-example)
+    -   [Supported Device](#supported-device)
+    -   [Building the Example Application](#building-the-example-application)
+    -   [Commissioning and cluster control](#commissioning-and-cluster-control)
+        -   [Commissioning](#commissioning)
+            -   [BLE mode](#ble-mode)
+            -   [IP mode](#ip-mode)
+        -   [Cluster control](#cluster-control)
+    -   [Running RPC Console](#running-rpc-console)
+
+---
+
+## Supported Device
+
+The CHIP demo application is supported on
+[Ameba RTL8722DM Board](https://www.amebaiot.com/en/amebad).
+
+## Building the Example Application
+
+-   Pull docker image:
+
+          ```
+          $ docker pull connectedhomeip/chip-build-ameba:latest
+          ```
+
+-   Run docker container:
+
+          ```
+          $ docker run -it -v ${CHIP_DIR}:/root/chip connectedhomeip/chip-build-ameba:latest
+          ```
+
+-   Setup build environment:
+
+          ```
+          $ source ./scripts/bootstrap.sh
+          ```
+
+-   To build the demo application:
+
+          ```
+          $ ./scripts/build/build_examples.py --target ameba-amebad-all-clusters build
+          ```
+
+    The output image files are stored in
+    `out/ameba-amebad-all-clusters/asdk/image` folder.
+
+    The bootloader image files are stored in
+    `out/ameba-amebad-all-clusters/asdk/bootloader` folder.
+
+-   After building the application, **Ameba Image Tool** is used to flash it to
+    Ameba board.
+
+1. Connect your device via USB and open Ameba Image Tool.
+2. Select correct serial port and set baudrate as **115200**.
+3. Browse and add the corresponding image files in the Flash Download list to
+   the correct locations
+4. Click **Download** button.
+
+## Commissioning and Cluster Control
+
+## Commissioning
+
+There are two commissioning modes supported by Ameba platform:
+
+### BLE mode
+
+1. In "connectedhomeip/config/ameba/args.gni"
+
+    - Set `chip_config_network_layer_ble = true`
+
+2. In `connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h`
+
+    - Set `#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1`
+
+3. Build and Flash
+4. The all-clusters example will run automatically after booting the Ameba
+   board.
+5. Test with
+   [Chip-Tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool)
+
+### IP mode
+
+1. In `connectedhomeip/config/ameba/args.gni`
+
+    - Set `chip_config_network_layer_ble = false`
+
+2. In `connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h`
+
+    - Set `#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0`
+
+3. Build and Flash
+4. The all-clusters example will run automatically after booting the Ameba
+   board.
+5. Connect to AP using `ATW0, ATW1, ATWC` commands
+6. Test with
+   [Chip-Tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool)
+
+## Cluster Control
+
+After successful commissioning, use the OnOff cluster command to control the
+OnOff attribute. This allows you to toggle a parameter implemented by the device
+to be On or Off.
+
+-   Via
+    [Chip-Tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool#using-the-client-to-send-matter-commands)
+
+          ```
+          $ ./chip-tool onoff on ${NODE_ID_TO_ASSIGN} 1
+          $ ./chip-tool onoff off ${NODE_ID_TO_ASSIGN} 1
+          ```
+
+## Running RPC Console
+
+-   Connect a USB-TTL Adapter as shown below
+
+            ```
+            Ameba         USB-TTL
+            A19           TX
+            A18           RX
+            GND           GND
+            ```
+
+-   Build the
+    [chip-rpc console](https://github.com/project-chip/connectedhomeip/tree/master/examples/common/pigweed/rpc_console)
+
+-   As part of building the example with RPCs enabled the chip_rpc python
+    interactive console is installed into your venv. The python wheel files are
+    also created in the output folder: out/debug/chip_rpc_console_wheels. To
+    install the wheel files without rebuilding:
+
+            ```
+            $ pip3 install out/debug/chip_rpc_console_wheels/*.whl
+            ```
+
+-   Launch the chip-rpc console after resetting Ameba board
+
+            ```
+            $ chip-console --device /dev/tty<port connected to USB-TTL adapter> -b 115200
+            ```
+
+-   Get and Set lighting directly using the RPC console
+
+            ```python
+            rpcs.chip.rpc.Lighting.Get()
+            rpcs.chip.rpc.Lighting.Set(on=True, level=128, color=protos.chip.rpc.LightingColor(hue=5, saturation=5))
+            ```
diff --git a/examples/all-clusters-minimal-app/ameba/chip_main.cmake b/examples/all-clusters-minimal-app/ameba/chip_main.cmake
new file mode 100755
index 00000000000000..6d40ce5fe09e7c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/chip_main.cmake
@@ -0,0 +1,267 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(chip_main)
+
+set(chip_dir "${ameba_matter_root}")
+set(chip_dir_output "${matter_output_path}/chip")
+set(dir "${sdk_root}/component/common/api")
+set(chip_main chip_main)
+set(list_chip_main_sources chip_main_sources)
+
+if (matter_enable_rpc)
+set(pigweed_dir "${chip_dir}/third_party/pigweed/repo")
+
+include(${pigweed_dir}/pw_build/pigweed.cmake)
+include(${pigweed_dir}/pw_protobuf_compiler/proto.cmake)
+
+set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING "" FORCE)
+
+pw_set_backend(pw_log pw_log_basic)
+pw_set_backend(pw_assert pw_assert_log)
+pw_set_backend(pw_sys_io pw_sys_io.ameba)
+pw_set_backend(pw_trace pw_trace_tokenized)
+
+add_subdirectory(${chip_dir}/third_party/pigweed/repo ${chip_dir}/examples/all-clusters-minimal-app/ameba/out/pigweed)
+add_subdirectory(${chip_dir}/third_party/nanopb/repo ${chip_dir}/examples/all-clusters-minimal-app/ameba/out/nanopb)
+add_subdirectory(${chip_dir}/examples/platform/ameba/pw_sys_io ${chip_dir}/examples/all-clusters-minimal-app/ameba/out/pw_sys_io)
+
+pw_proto_library(attributes_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/attributes_service.proto
+  INPUTS
+    ${chip_dir}/examples/common/pigweed/protos/attributes_service.options
+  PREFIX
+    attributes_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(button_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/button_service.proto
+  PREFIX
+    button_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(device_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/device_service.proto
+  INPUTS
+    ${chip_dir}/examples/common/pigweed/protos/device_service.options
+  PREFIX
+    device_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(lighting_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/lighting_service.proto
+  PREFIX
+    lighting_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(locking_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/locking_service.proto
+  PREFIX
+    locking_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(wifi_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/wifi_service.proto
+  INPUTS
+    ${chip_dir}/examples/common/pigweed/protos/wifi_service.options
+  PREFIX
+    wifi_service
+  DEPS
+    pw_protobuf.common_protos
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+)
+
+endif(matter_enable_rpc)
+
+include(${prj_root}/GCC-RELEASE/project_hp/asdk/includepath.cmake)
+
+if (matter_enable_rpc)
+list(
+    APPEND ${list_chip_main_sources}
+    #rpc
+    ${chip_dir}/examples/platform/ameba/PigweedLogger.cpp
+    ${chip_dir}/examples/platform/ameba/Rpc.cpp
+    ${chip_dir}/examples/common/pigweed/RpcService.cpp
+    ${chip_dir}/examples/common/pigweed/ameba/PigweedLoggerMutex.cpp
+)
+endif (matter_enable_rpc)
+
+if (matter_enable_ota_requestor)
+list(
+    APPEND ${list_chip_main_sources}
+    #OTARequestor
+    ${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+)
+endif (matter_enable_ota_requestor)
+
+list(
+    APPEND ${list_chip_main_sources}
+
+    ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
+    ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
+
+    ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/bridged-actions-stub.cpp
+    ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/static-supported-modes-manager.cpp
+
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/CHIPDeviceManager.cpp
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/Globals.cpp
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/LEDWidget.cpp
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/DsoHack.cpp
+)
+
+add_library(
+    ${chip_main}
+    STATIC
+    ${chip_main_sources}
+)
+
+chip_configure_data_model(chip_main
+    INCLUDE_SERVER
+    ZAP_FILE ${matter_example_path}/../all-clusters-common/all-clusters-minimal-app.zap
+)
+
+if (matter_enable_rpc)
+target_include_directories(
+    ${chip_main}
+    PUBLIC
+    #rpc
+    ${chip_dir}/examples/platform/ameba
+    ${chip_dir}/examples/platform/ameba/pw_sys_io/public
+    ${chip_dir}/examples/common
+    ${chip_dir}/examples/common/pigweed
+    ${chip_dir}/examples/common/pigweed/ameba
+    ${chip_dir}/src
+    ${chip_dir}/src/lib/support
+    ${pigweed_dir}/pw_rpc/nanopb/public
+)
+endif (matter_enable_rpc)
+
+target_include_directories(
+    ${chip_main}
+    PUBLIC
+    ${inc_path}
+    ${chip_dir}/zzz_generated/all-clusters-minimal-app
+    ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated
+    ${chip_dir}/zzz_generated/app-common
+    ${chip_dir}/examples/all-clusters-app/all-clusters-common
+    ${chip_dir}/examples/all-clusters-app/all-clusters-common/include
+    ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/include
+    ${chip_dir_output}/gen/include
+    ${chip_dir}/src/include/
+    ${chip_dir}/src/lib/
+    ${chip_dir}/src/
+    ${chip_dir}/third_party/nlassert/repo/include/
+    ${chip_dir}/src/app/
+    ${chip_dir}/src/app/util/
+    ${chip_dir}/src/app/server/
+    ${chip_dir}/src/controller/data_model
+    ${chip_dir}/third_party/nlio/repo/include/
+    ${chip_dir}/third_party/nlunit-test/repo/src
+)
+
+if (matter_enable_rpc)
+target_link_libraries(${chip_main} PUBLIC
+    attributes_service.nanopb_rpc
+    button_service.nanopb_rpc
+    device_service.nanopb_rpc
+    lighting_service.nanopb_rpc
+    locking_service.nanopb_rpc
+    wifi_service.nanopb_rpc
+    pw_checksum
+    pw_hdlc
+    pw_log
+    pw_rpc.server
+    pw_trace_tokenized
+    pw_trace_tokenized.trace_buffer
+    pw_trace_tokenized.rpc_service
+    pw_trace_tokenized.protos.nanopb_rpc
+    PwRpc
+)
+
+link_directories(
+    ${chip_dir_output}/lib
+)
+endif (matter_enable_rpc)
+
+list(
+    APPEND chip_main_flags
+
+    -DINET_CONFIG_ENABLE_IPV4=0
+    -DCHIP_PROJECT=1
+    -DCHIP_DEVICE_LAYER_TARGET=Ameba
+    -DUSE_ZAP_CONFIG
+    -DCHIP_HAVE_CONFIG_H
+    -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
+    -DMATTER_ALL_CLUSTERS_APP=1
+)
+
+if (matter_enable_rpc)
+list(
+    APPEND chip_main_flags
+
+    -DPW_RPC_ATTRIBUTE_SERVICE=1
+    -DPW_RPC_BUTTON_SERVICE=1
+    -DPW_RPC_DEVICE_SERVICE=1
+    -DPW_RPC_LIGHTING_SERVICE=1
+    -DPW_RPC_LOCKING_SERVICE=1
+    -DCONFIG_ENABLE_PW_RPC=1
+)
+endif (matter_enable_rpc)
+
+if (matter_enable_ota_requestor)
+list(
+    APPEND chip_main_flags
+
+    -DCONFIG_ENABLE_OTA_REQUESTOR=1
+)
+endif (matter_enable_ota_requestor)
+
+list(
+    APPEND chip_main_cpp_flags
+
+	-Wno-unused-parameter
+	-std=gnu++11
+	-std=c++14
+	-fno-rtti
+)
+target_compile_definitions(${chip_main} PRIVATE ${chip_main_flags} )
+target_compile_options(${chip_main} PRIVATE ${chip_main_cpp_flags})
+
+# move static library post build command
+add_custom_command(
+    TARGET ${chip_main}
+    POST_BUILD
+    COMMAND cp lib${chip_main}.a ${CMAKE_CURRENT_SOURCE_DIR}/lib/application
+)
diff --git a/examples/all-clusters-minimal-app/ameba/main/CHIPDeviceManager.cpp b/examples/all-clusters-minimal-app/ameba/main/CHIPDeviceManager.cpp
new file mode 100644
index 00000000000000..4c1b55fbddb9fc
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/CHIPDeviceManager.cpp
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file implements the CHIP Device Interface that is used by
+ *      applications to interact with the CHIP stack
+ *
+ */
+
+#include <stdlib.h>
+
+#include "CHIPDeviceManager.h"
+#include <app/ConcreteAttributePath.h>
+#include <app/util/basic-types.h>
+#include <support/CHIPMem.h>
+#include <support/CodeUtils.h>
+#include <support/ErrorStr.h>
+
+using namespace ::chip;
+
+namespace chip {
+
+namespace DeviceManager {
+
+using namespace ::chip::DeviceLayer;
+
+void CHIPDeviceManager::CommonDeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
+{
+    CHIPDeviceManagerCallbacks * cb = reinterpret_cast<CHIPDeviceManagerCallbacks *>(arg);
+    if (cb != nullptr)
+    {
+        cb->DeviceEventCallback(event, reinterpret_cast<intptr_t>(cb));
+    }
+}
+
+CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
+{
+    CHIP_ERROR err;
+    mCB = cb;
+
+    err = Platform::MemoryInit();
+    SuccessOrExit(err);
+
+    // Initialize the CHIP stack.
+    err = PlatformMgr().InitChipStack();
+    SuccessOrExit(err);
+
+    if (CONFIG_NETWORK_LAYER_BLE)
+    {
+        ConnectivityMgr().SetBLEAdvertisingEnabled(true);
+    }
+
+    // Register a function to receive events from the CHIP device layer.  Note that calls to
+    // this function will happen on the CHIP event loop thread, not the app_main thread.
+    PlatformMgr().AddEventHandler(CHIPDeviceManager::CommonDeviceEventHandler, reinterpret_cast<intptr_t>(cb));
+
+    // Start a task to run the CHIP Device event loop.
+    err = PlatformMgr().StartEventLoopTask();
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+} // namespace DeviceManager
+} // namespace chip
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value)
+{
+    chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
+        chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
+    if (cb != nullptr)
+    {
+        cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value);
+    }
+}
diff --git a/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
new file mode 100644
index 00000000000000..8f18f730999cde
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
@@ -0,0 +1,168 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.cpp
+ *
+ * Implements all the callbacks to the application from the CHIP Stack
+ *
+ **/
+#include "DeviceCallbacks.h"
+
+#include "CHIPDeviceManager.h"
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/CommandHandler.h>
+#include <app/server/Dnssd.h>
+#include <app/util/af.h>
+#include <app/util/basic-types.h>
+#include <app/util/util.h>
+#include <lib/dnssd/Advertiser.h>
+#include <support/CodeUtils.h>
+#include <support/logging/CHIPLogging.h>
+#include <support/logging/Constants.h>
+
+#include "Globals.h"
+#include "LEDWidget.h"
+
+static const char * TAG = "app-devicecallbacks";
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::Logging;
+
+uint32_t identifyTimerCount;
+constexpr uint32_t kIdentifyTimerDelayMS = 250;
+
+void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kInternetConnectivityChange:
+        OnInternetConnectivityChange(event);
+        break;
+
+    case DeviceEventType::kSessionEstablished:
+        OnSessionEstablished(event);
+        break;
+    case DeviceEventType::kInterfaceIpAddressChanged:
+        if ((event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ||
+            (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned))
+        {
+            // MDNS server restart on any ip assignment: if link local ipv6 is configured, that
+            // will not trigger a 'internet connectivity change' as there is no internet
+            // connectivity. MDNS still wants to refresh its listening interfaces to include the
+            // newly selected address.
+            chip::app::DnssdServer::Instance().StartServer();
+        }
+        break;
+    }
+}
+
+void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
+                                                  uint16_t size, uint8_t * value)
+{
+    switch (clusterId)
+    {
+    case ZCL_ON_OFF_CLUSTER_ID:
+        OnOnOffPostAttributeChangeCallback(endpointId, attributeId, value);
+        break;
+
+    case ZCL_IDENTIFY_CLUSTER_ID:
+        OnIdentifyPostAttributeChangeCallback(endpointId, attributeId, value);
+        break;
+
+    default:
+        break;
+    }
+}
+
+void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
+{
+    if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
+    {
+        ChipLogProgress(DeviceLayer, "IPv4 Server ready...");
+        chip::app::DnssdServer::Instance().StartServer();
+    }
+    else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
+    {
+        ChipLogProgress(DeviceLayer, "Lost IPv4 connectivity...");
+    }
+    if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
+    {
+        ChipLogProgress(DeviceLayer, "IPv6 Server ready...");
+        chip::app::DnssdServer::Instance().StartServer();
+    }
+    else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
+    {
+        ChipLogProgress(DeviceLayer, "Lost IPv6 connectivity...");
+    }
+}
+
+void DeviceCallbacks::OnSessionEstablished(const ChipDeviceEvent * event)
+{
+    if (event->SessionEstablished.IsCommissioner)
+    {
+        ChipLogProgress(DeviceLayer, "Commissioner detected!");
+    }
+}
+
+void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID,
+                 ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2,
+                 ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    // At this point we can assume that value points to a bool value.
+    statusLED1.Set(*value);
+
+exit:
+    return;
+}
+
+void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error)
+{
+    if (identifyTimerCount)
+    {
+        identifyTimerCount--;
+    }
+}
+
+void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID,
+                 ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId));
+    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId));
+
+    // timerCount represents the number of callback executions before we stop the timer.
+    // value is expressed in seconds and the timer is fired every 250ms, so just multiply value by 4.
+    // Also, we want timerCount to be odd number, so the ligth state ends in the same state it starts.
+    identifyTimerCount = (*value) * 4;
+exit:
+    return;
+}
+
+bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * commandObj)
+{
+    emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS);
+    return true;
+}
diff --git a/examples/all-clusters-minimal-app/ameba/main/DsoHack.cpp b/examples/all-clusters-minimal-app/ameba/main/DsoHack.cpp
new file mode 100644
index 00000000000000..6fc5d7a63307c5
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/DsoHack.cpp
@@ -0,0 +1,20 @@
+/*
+ *    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.
+ */
+
+// This hack is needed because Ameba SDK is not linking against libstdc++ correctly.
+extern "C" {
+void * __dso_handle = 0;
+}
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/AppDelegate.h b/examples/all-clusters-minimal-app/ameba/main/Globals.cpp
old mode 100644
new mode 100755
similarity index 80%
rename from examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/AppDelegate.h
rename to examples/all-clusters-minimal-app/ameba/main/Globals.cpp
index 841d43e0dbe390..71d9b6c9f0b940
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/AppDelegate.h
+++ b/examples/all-clusters-minimal-app/ameba/main/Globals.cpp
@@ -1,6 +1,7 @@
-/**
+/*
  *
- *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +16,6 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
+#include "Globals.h"
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@end
+LEDWidget statusLED1;
diff --git a/examples/all-clusters-minimal-app/ameba/main/LEDWidget.cpp b/examples/all-clusters-minimal-app/ameba/main/LEDWidget.cpp
new file mode 100755
index 00000000000000..a050f4a4d4f0f0
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/LEDWidget.cpp
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file LEDWidget.cpp
+ *
+ * Implements an LED Widget controller that is usually tied to a GPIO
+ * It also updates the display widget if it's enabled
+ */
+
+#include "LEDWidget.h"
+
+gpio_t gpio_led;
+
+void LEDWidget::Init(PinName gpioNum)
+{
+
+    mGPIONum = gpioNum;
+    mState   = false;
+
+    if (gpioNum != (PinName) NC)
+    {
+        // Init LED control pin
+        gpio_init(&gpio_led, gpioNum);
+        gpio_dir(&gpio_led, PIN_OUTPUT); // Direction: Output
+        gpio_mode(&gpio_led, PullNone);  // No pull
+        gpio_write(&gpio_led, mState);
+    }
+}
+
+void LEDWidget::Set(bool state)
+{
+    DoSet(state);
+}
+
+void LEDWidget::DoSet(bool state)
+{
+    bool stateChange = (mState != state);
+    mState           = state;
+
+    if (stateChange)
+    {
+        gpio_write(&gpio_led, state);
+    }
+}
diff --git a/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp b/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp
new file mode 100644
index 00000000000000..306d9c36717e00
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp
@@ -0,0 +1,205 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <platform_stdlib.h>
+
+#include "CHIPDeviceManager.h"
+#include "DeviceCallbacks.h"
+#include "Globals.h"
+#include "LEDWidget.h"
+#include "chip_porting.h"
+#include <lwip_netconf.h>
+
+#include <app/clusters/identify-server/identify-server.h>
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/server/Server.h>
+#include <app/util/af.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <lib/support/ErrorStr.h>
+#include <platform/Ameba/AmebaConfig.h>
+#include <platform/Ameba/NetworkCommissioningDriver.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <setup_payload/ManualSetupPayloadGenerator.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+#include <support/CHIPMem.h>
+
+#if CONFIG_ENABLE_OTA_REQUESTOR
+#include "app/clusters/ota-requestor/DefaultOTARequestorStorage.h"
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
+#include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
+#include <platform/Ameba/AmebaOTAImageProcessor.h>
+#endif
+
+#if CONFIG_ENABLE_PW_RPC
+#include "Rpc.h"
+#endif
+
+using namespace ::chip;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+namespace { // Network Commissioning
+constexpr EndpointId kNetworkCommissioningEndpointMain      = 0;
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(kNetworkCommissioningEndpointMain /* Endpoint Id */,
+                                      &(NetworkCommissioning::AmebaWiFiDriver::GetInstance()));
+} // namespace
+
+void NetWorkCommissioningInstInit()
+{
+    sWiFiNetworkCommissioningInstance.Init();
+
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+}
+
+Identify gIdentify0 = {
+    chip::EndpointId{ 0 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+};
+
+Identify gIdentify1 = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+};
+
+#ifdef CONFIG_PLATFORM_8721D
+#define STATUS_LED_GPIO_NUM PB_5
+#elif defined(CONFIG_PLATFORM_8710C)
+#define STATUS_LED_GPIO_NUM PA_20
+#else
+#define STATUS_LED_GPIO_NUM NC
+#endif
+
+static DeviceCallbacks EchoCallbacks;
+
+#if CONFIG_ENABLE_OTA_REQUESTOR
+DefaultOTARequestor gRequestorCore;
+DefaultOTARequestorStorage gRequestorStorage;
+ExtendedOTARequestorDriver gRequestorUser;
+BDXDownloader gDownloader;
+AmebaOTAImageProcessor gImageProcessor;
+chip::ota::DefaultOTARequestorUserConsent gUserConsentProvider;
+static chip::ota::UserConsentState gUserConsentState = chip::ota::UserConsentState::kGranted;
+#endif
+
+#if CONFIG_ENABLE_OTA_REQUESTOR
+extern "C" void amebaQueryImageCmdHandler()
+{
+    ChipLogProgress(DeviceLayer, "Calling amebaQueryImageCmdHandler");
+    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->TriggerImmediateQuery(); });
+}
+
+extern "C" void amebaApplyUpdateCmdHandler()
+{
+    ChipLogProgress(DeviceLayer, "Calling amebaApplyUpdateCmdHandler");
+    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->ApplyUpdate(); });
+}
+
+static void InitOTARequestor(void)
+{
+    // Initialize and interconnect the Requestor and Image Processor objects -- START
+    SetRequestorInstance(&gRequestorCore);
+
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+
+    // Set server instance used for session establishment
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+
+    gImageProcessor.SetOTADownloader(&gDownloader);
+
+    // Connect the Downloader and Image Processor objects
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
+    {
+        gUserConsentProvider.SetUserConsentState(gUserConsentState);
+        gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
+    }
+
+    // Initialize and interconnect the Requestor and Image Processor objects -- END
+}
+#endif // CONFIG_ENABLE_OTA_REQUESTOR
+
+static void InitServer(intptr_t context)
+{
+    // Init ZCL Data Model and CHIP App Server
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
+
+    // Initialize device attestation config
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    NetWorkCommissioningInstInit();
+
+#if CONFIG_ENABLE_OTA_REQUESTOR
+    InitOTARequestor();
+#endif
+
+    if (RTW_SUCCESS != wifi_is_connected_to_ap())
+    {
+        // QR code will be used with CHIP Tool
+        PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
+    }
+}
+
+extern "C" void ChipTest(void)
+{
+    ChipLogProgress(DeviceLayer, "All Clusters Demo!");
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+#if CONFIG_ENABLE_PW_RPC
+    chip::rpc::Init();
+#endif
+
+    initPref();
+
+    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
+
+    err = deviceMgr.Init(&EchoCallbacks);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "DeviceManagerInit() - ERROR!\r\n");
+    }
+    else
+    {
+        ChipLogProgress(DeviceLayer, "DeviceManagerInit() - OK\r\n");
+    }
+
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, 0);
+
+    statusLED1.Init(STATUS_LED_GPIO_NUM);
+}
+
+bool lowPowerClusterSleep()
+{
+    return true;
+}
diff --git a/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h b/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h
new file mode 100644
index 00000000000000..4a4efd1d4d39dd
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h
@@ -0,0 +1,124 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for the CHIP DeviceManager Interface
+ *
+ *      This object will co-ordinate multiple activities such as
+ *      initialisation, rendezvous, session mgmt and other such
+ *      activities within the CHIP stack. This is a singleton object.
+ */
+
+#pragma once
+
+#include <core/CHIPCore.h>
+#include <core/CHIPError.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <support/DLLUtil.h>
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include "af-types.h"
+
+namespace chip {
+namespace DeviceManager {
+
+/**
+ * @brief
+ *   This class provides a skeleton for all the callback functions. The functions will be
+ *   called by other objects within the CHIP stack for specific events.
+ *   Applications interested in receiving specific callbacks can specialize this class and handle
+ *   these events in their implementation of this class.
+ */
+class CHIPDeviceManagerCallbacks
+{
+public:
+    /**
+     * @brief
+     *   Called when CHIP Device events (PublicEventTypes) are triggered.
+     *
+     * @param event   ChipDeviceEvent that occurred
+     * @param arg     arguments specific to the event, if any
+     */
+    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) {}
+
+    /**
+     * @brief
+     *   Called after an attribute has been changed
+     *
+     * @param endpoint           endpoint id
+     * @param clusterID          cluster id
+     * @param attributeId        attribute id that was changed
+     * @param manufacturerCode   manufacturer code
+     * @param type               attribute type
+     * @param size               size of the attribute
+     * @param value              pointer to the new value
+     */
+    virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                             uint8_t type, uint16_t size, uint8_t * value)
+    {}
+    virtual ~CHIPDeviceManagerCallbacks() {}
+};
+
+/**
+ * @brief
+ *   A common class that drives other components of the CHIP stack
+ */
+class DLL_EXPORT CHIPDeviceManager
+{
+public:
+    CHIPDeviceManager(const CHIPDeviceManager &)  = delete;
+    CHIPDeviceManager(const CHIPDeviceManager &&) = delete;
+    CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete;
+
+    static CHIPDeviceManager & GetInstance()
+    {
+        static CHIPDeviceManager instance;
+        return instance;
+    }
+
+    /**
+     * @brief
+     *   Initialise CHIPDeviceManager
+     *
+     * @param cb Application's instance of the CHIPDeviceManagerCallbacks for consuming events
+     */
+    CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
+
+    /**
+     * @brief
+     *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
+     *
+     */
+    CHIPDeviceManagerCallbacks * GetCHIPDeviceManagerCallbacks() { return mCB; }
+
+    /**
+     * Use internally for registration of the ChipDeviceEvents
+     */
+    static void CommonDeviceEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
+private:
+    CHIPDeviceManagerCallbacks * mCB = nullptr;
+    CHIPDeviceManager() {}
+};
+
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/all-clusters-minimal-app/ameba/main/include/DeviceCallbacks.h b/examples/all-clusters-minimal-app/ameba/main/include/DeviceCallbacks.h
new file mode 100644
index 00000000000000..003b6e700db0eb
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/include/DeviceCallbacks.h
@@ -0,0 +1,45 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.h
+ *
+ * Implementations for the DeviceManager callbacks for this application
+ *
+ **/
+
+#pragma once
+
+#include "CHIPDeviceManager.h"
+#include <app/util/af-types.h>
+#include <app/util/basic-types.h>
+#include <platform/CHIPDeviceLayer.h>
+
+class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
+{
+public:
+    void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) override;
+    void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                     uint8_t type, uint16_t size, uint8_t * value) override;
+
+private:
+    void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnSessionEstablished(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+};
diff --git a/examples/tv-casting-app/darwin/darwin/AppDelegate.h b/examples/all-clusters-minimal-app/ameba/main/include/Globals.h
old mode 100644
new mode 100755
similarity index 80%
rename from examples/tv-casting-app/darwin/darwin/AppDelegate.h
rename to examples/all-clusters-minimal-app/ameba/main/include/Globals.h
index 841d43e0dbe390..4033f2d0a996ee
--- a/examples/tv-casting-app/darwin/darwin/AppDelegate.h
+++ b/examples/all-clusters-minimal-app/ameba/main/include/Globals.h
@@ -1,6 +1,7 @@
-/**
+/*
  *
- *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
+#pragma once
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+#include "LEDWidget.h"
 
-@end
+extern LEDWidget statusLED1;
diff --git a/examples/all-clusters-minimal-app/ameba/main/include/LEDWidget.h b/examples/all-clusters-minimal-app/ameba/main/include/LEDWidget.h
new file mode 100755
index 00000000000000..9f1456daa7492d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/ameba/main/include/LEDWidget.h
@@ -0,0 +1,158 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <platform_stdlib.h>
+
+#ifdef CONFIG_PLATFORM_8710C
+#include "gpio_api.h"
+#include "rtl8710c_pin_name.h"
+
+#else
+
+typedef enum
+{
+    PORT_A = 0,
+    PORT_B = 1,
+} GPIO_PORT;
+
+typedef enum
+{
+    PIN_INPUT = 0,
+    PIN_OUTPUT
+} PinDirection;
+
+typedef enum
+{
+    PullNone    = 0, // IN HIGHZ
+    PullUp      = 1,
+    PullDown    = 2,
+    PullDefault = PullNone
+} PinMode;
+
+/* (((port)<<5)|(pin)) */
+typedef enum
+{
+    PA_0  = (PORT_A << 5 | 0),
+    PA_1  = (PORT_A << 5 | 1),
+    PA_2  = (PORT_A << 5 | 2),
+    PA_3  = (PORT_A << 5 | 3),
+    PA_4  = (PORT_A << 5 | 4),
+    PA_5  = (PORT_A << 5 | 5),
+    PA_6  = (PORT_A << 5 | 6),
+    PA_7  = (PORT_A << 5 | 7),
+    PA_8  = (PORT_A << 5 | 8),
+    PA_9  = (PORT_A << 5 | 9),
+    PA_10 = (PORT_A << 5 | 10),
+    PA_11 = (PORT_A << 5 | 11),
+    PA_12 = (PORT_A << 5 | 12),
+    PA_13 = (PORT_A << 5 | 13),
+    PA_14 = (PORT_A << 5 | 14),
+    PA_15 = (PORT_A << 5 | 15),
+    PA_16 = (PORT_A << 5 | 16),
+    PA_17 = (PORT_A << 5 | 17),
+    PA_18 = (PORT_A << 5 | 18),
+    PA_19 = (PORT_A << 5 | 19),
+    PA_20 = (PORT_A << 5 | 20),
+    PA_21 = (PORT_A << 5 | 21),
+    PA_22 = (PORT_A << 5 | 22),
+    PA_23 = (PORT_A << 5 | 23),
+    PA_24 = (PORT_A << 5 | 24),
+    PA_25 = (PORT_A << 5 | 25),
+    PA_26 = (PORT_A << 5 | 26),
+    PA_27 = (PORT_A << 5 | 27),
+    PA_28 = (PORT_A << 5 | 28),
+    PA_29 = (PORT_A << 5 | 29),
+    PA_30 = (PORT_A << 5 | 30),
+    PA_31 = (PORT_A << 5 | 31),
+
+    PB_0  = (PORT_B << 5 | 0),
+    PB_1  = (PORT_B << 5 | 1),
+    PB_2  = (PORT_B << 5 | 2),
+    PB_3  = (PORT_B << 5 | 3),
+    PB_4  = (PORT_B << 5 | 4),
+    PB_5  = (PORT_B << 5 | 5),
+    PB_6  = (PORT_B << 5 | 6),
+    PB_7  = (PORT_B << 5 | 7),
+    PB_8  = (PORT_B << 5 | 8),
+    PB_9  = (PORT_B << 5 | 9),
+    PB_10 = (PORT_B << 5 | 10),
+    PB_11 = (PORT_B << 5 | 11),
+    PB_12 = (PORT_B << 5 | 12),
+    PB_13 = (PORT_B << 5 | 13),
+    PB_14 = (PORT_B << 5 | 14),
+    PB_15 = (PORT_B << 5 | 15),
+    PB_16 = (PORT_B << 5 | 16),
+    PB_17 = (PORT_B << 5 | 17),
+    PB_18 = (PORT_B << 5 | 18),
+    PB_19 = (PORT_B << 5 | 19),
+    PB_20 = (PORT_B << 5 | 20),
+    PB_21 = (PORT_B << 5 | 21),
+    PB_22 = (PORT_B << 5 | 22),
+    PB_23 = (PORT_B << 5 | 23),
+    PB_24 = (PORT_B << 5 | 24),
+    PB_25 = (PORT_B << 5 | 25),
+    PB_26 = (PORT_B << 5 | 26),
+    PB_27 = (PORT_B << 5 | 27),
+    PB_28 = (PORT_B << 5 | 28),
+    PB_29 = (PORT_B << 5 | 29),
+    PB_30 = (PORT_B << 5 | 30),
+    PB_31 = (PORT_B << 5 | 31),
+
+    VBAT_MEAS = (0x7 << 5 | 2),
+    AD_0      = PB_4,      // CH0
+    AD_1      = PB_5,      // CH1
+    AD_2      = PB_6,      // CH2
+    AD_3      = PB_7,      // CH3
+    AD_4      = PB_1,      // CH4
+    AD_5      = PB_2,      // CH5
+    AD_6      = PB_3,      // CH6
+    AD_7      = VBAT_MEAS, // CH7
+
+    // Not connected
+    NC = (uint32_t) 0xFFFFFFFF
+} PinName;
+
+typedef struct gpio_s
+{
+    PinName pin;
+} gpio_t;
+
+#endif
+
+typedef struct gpio_s gpio_t;
+
+extern "C" void gpio_init(gpio_t * obj, PinName pin);
+extern "C" uint32_t gpio_set(PinName pin);
+extern "C" void gpio_mode(gpio_t * obj, PinMode mode);
+extern "C" void gpio_dir(gpio_t * obj, PinDirection direction);
+extern "C" void gpio_write(gpio_t * obj, int value);
+extern "C" int gpio_read(gpio_t * obj);
+
+class LEDWidget
+{
+public:
+    void Init(PinName gpioNum);
+    void Set(bool state);
+
+private:
+    PinName mGPIONum;
+    bool mState;
+    void DoSet(bool state);
+};
diff --git a/examples/ipv6only-app/esp32/third_party/connectedhomeip b/examples/all-clusters-minimal-app/ameba/third_party/connectedhomeip
similarity index 100%
rename from examples/ipv6only-app/esp32/third_party/connectedhomeip
rename to examples/all-clusters-minimal-app/ameba/third_party/connectedhomeip
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn
new file mode 100644
index 00000000000000..3d48789e30ab3d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn
@@ -0,0 +1,28 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  target_cpu = "arm"
+  target_os = "freertos"
+
+  import("//args.gni")
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/BUILD.gn b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/BUILD.gn
new file mode 100644
index 00000000000000..9c870ec32fa84e
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/BUILD.gn
@@ -0,0 +1,122 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+import("//build_overrides/openthread.gni")
+import("//build_overrides/ti_simplelink_sdk.gni")
+
+import("${build_root}/config/defaults.gni")
+
+import("${chip_root}/src/platform/device.gni")
+
+import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
+import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
+
+assert(current_os == "freertos")
+
+project_dir = "${chip_root}/examples/all-clusters-minimal-app/cc13x2x7_26x2x7"
+
+ti_simplelink_sdk("sdk") {
+  include_dirs = [ "${project_dir}/main/include" ]
+  public_configs = [ ":all-clusters-minimal-app_config" ]
+}
+
+ti_sysconfig("sysconfig") {
+  sources = [ "${project_dir}/chip.syscfg" ]
+
+  outputs = [
+    "ti_devices_config.c",
+    "ti_radio_config.c",
+    "ti_radio_config.h",
+    "ti_drivers_config.c",
+    "ti_drivers_config.h",
+    "ti_ble_config.c",
+    "ti_ble_config.h",
+    "ti_dmm_application_policy.c",
+    "ti_dmm_application_policy.h",
+
+    # disabled until upstream generation is aligned
+    #"tiop_config.h",
+    #"tiop_config.c",
+
+    # not traditional source files
+    #"ti_utils_build_linker.cmd.genlibs",
+    #"syscfg_c.rov.xs",
+    #"ti_utils_runtime_model.gv",
+    #"ti_utils_runtime_Makefile",
+    #"ti_ble_app_config.opt",
+    #"ti_build_config.opt",
+  ]
+
+  public_configs = [ ":sdk_dmm_config" ]
+
+  cflags = [
+    "-Wno-comment",
+    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
+                      root_build_dir),
+    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
+                      root_build_dir),
+  ]
+}
+
+ti_simplelink_executable("all-clusters-minimal-app") {
+  output_name = "chip-${ti_simplelink_board}-all-clusters-minimal-example.out"
+
+  sources = [
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
+    "${project_dir}/main/AppTask.cpp",
+    "${project_dir}/main/ClusterManager.cpp",
+    "${project_dir}/main/Globals.cpp",
+    "${project_dir}/main/ZclCallbacks.cpp",
+    "${project_dir}/main/main.cpp",
+  ]
+
+  deps = [
+    ":sdk",
+    ":sysconfig",
+    "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common",
+    "${chip_root}/src/lib",
+  ]
+
+  if (chip_openthread_ftd) {
+    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
+  } else {
+    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
+  }
+
+  include_dirs = [
+    "${project_dir}",
+    "${project_dir}/main",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
+  ]
+
+  cflags = [
+    "-Wno-implicit-fallthrough",
+    "-Wno-sign-compare",
+    "-Wconversion",
+  ]
+
+  output_dir = root_out_dir
+}
+
+group("cc13x2x7_26x2x7") {
+  deps = [ ":all-clusters-minimal-app" ]
+}
+
+group("default") {
+  deps = [ ":cc13x2x7_26x2x7" ]
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/README.md
new file mode 100644
index 00000000000000..c23cf324afe8af
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/README.md
@@ -0,0 +1,245 @@
+# Matter CC1352 CC2652 All-clusters Example Application
+
+An example application showing the use of [Matter][matter] on the Texas
+Instruments CC13XX_26XX family of Wireless MCUs.
+
+---
+
+-   [Matter CC1352 CC2652 All Clusters Example Application](#matter-cc1352-cc2652-all-clusters-example-application)
+    -   [Introduction](#introduction)
+        -   [Device UI](#device-ui)
+    -   [Building](#building)
+        -   [Preparation](#preparation)
+        -   [Compilation](#compilation)
+    -   [Programming](#programming)
+        -   [Code Composer Studio](#code-composer-studio)
+        -   [UniFlash](#uniflash)
+    -   [Viewing Logging Output](#viewing-logging-output)
+    -   [Running the Example](#running-the-example)
+        -   [Provisioning](#provisioning)
+            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
+            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
+        -   [Matter Remote Commands](#matter-remote-commands)
+    -   [TI Support](#ti-support)
+
+---
+
+## Introduction
+
+![CC1352R1_LAUNCHXL](doc/images/cc1352r1_launchxl.jpg)
+
+The CC13XX_26XX all clusters example application provides the basis to query and
+run commands for all currently implemented Matter clusters. This uses the
+open-source Matter implementation and the Texas Instruments SimpleLink™ CC13XX
+and CC26XX software development kit.
+
+This example is enabled to build for CC2652R7 devices.
+
+The all-clusters example is intended to serve both as a means to explore the
+workings of Matter, as well as a template for creating real products based on
+the Texas Instruments devices.
+
+## Device UI
+
+This example application has a simple User Interface to depict the state of the
+various Matter clusters and the attribute changes associated with them. The user
+LEDs on the LaunchPad are used for the onoff, levelcontrol and identify clusters
+to provide a working demonstration of the cluster attribute changes. The Green
+LED is used to represent attribute changes to endpoint 1 while the Red LED is
+used to represent changes to endpoint 2.
+
+Short presses (less than 1000ms) of the user buttons are used currently unused
+in the all-clusters application, but stubs are provided.
+
+Long presses (greater than 1000ms) of the user buttons are used for controlling
+BLE advertisements. The left button (`BTN-1`) is used to disable advertisements
+if they are enabled. The Right button (`BTN-2`) is used to enable
+advertisements.
+
+## Building
+
+### Preparation
+
+Some initial setup is necessary for preparing the build environment. This
+section will need to be done when migrating to new versions of the SDK. This
+guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
+
+-   Download and install [SysConfig][sysconfig] ([recommended
+    version][sysconfig_recommended]). This can be done simply with the following
+    commands.
+
+    ```
+    $ cd ~
+    $ wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run
+    $ chmod +x sysconfig-1.11.0_2225-setup.run
+    $ ./sysconfig-1.11.0_2225-setup.run
+    ```
+
+-   Run the bootstrap script to setup the build environment.
+
+    ```
+    $ cd ~/connectedhomeip
+    $ source ./scripts/bootstrap.sh
+
+    ```
+
+### Compilation
+
+It is necessary to activate the environment in every new shell. Then run GN and
+Ninja to build the executable.
+
+-   Activate the build environment with the repository activate script.
+
+    ```
+    $ cd ~/connectedhomeip
+    $ source ./scripts/activate.sh
+
+    ```
+
+-   Run the build to produce a default executable. By default on Linux both the
+    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
+    home directory, and you must provide the absolute path to them. For example
+    `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is
+    `C:\ti`. Take note of this install path, as it will be used in the next
+    step.
+
+    ```
+    $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x2x7_26x2x7
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.11.0\""
+    $ ninja -C out/debug
+
+    ```
+
+## Programming
+
+Loading the built image onto a LaunchPad is supported through two methods;
+Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
+Code Composer Studio can be used to load the image and debug the source code.
+
+### Code Composer Studio
+
+Programming with CCS will allow for a full debug environment within the IDE.
+This is accomplished by creating a target connection to the XDS110 debugger and
+starting a project-less debug session. The CCS IDE will attempt to find the
+source files on the local machine based on the debug information embedded within
+the ELF. CCS may prompt you to find the source code if the image was built on
+another machine or the source code is located in a different location than is
+recorded within the ELF.
+
+Download and install [Code Composer Studio][ccs].
+
+First open CCS and create a new workspace.
+
+Create a target connection (sometimes called the CCXML) for your target SoC and
+debugger as described in the [Manual Method][ccs_manual_method] section of the
+CCS User's Guide.
+
+Next initiate a project-less debug session as described in the [Manual
+Launch][ccs_manual_launch] section of the CCS User's Guide.
+
+CCS should switch to the debug view described in the [After
+Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
+be disconnected and symbols will not be loaded. Connect to the core as described
+in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
+is connected, use the `Load` button on the toolbar to load the ELF image.
+
+Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
+the full 4-wire JTAG connection to match the default jumper configuration of the
+LaunchPad.
+
+### UniFlash
+
+Uniflash is Texas Instrument's uniform programming tool for embedded processors.
+This will allow you to erase, flash, and inspect the SoC without setting up a
+debugging environment.
+
+Download and install [UniFlash][uniflash].
+
+First open UniFlash. Debug probes connected to the computer will usually be
+displayed under the Detected Devices due to the automatic device detection
+feature. If your device does not show up in this view it my be disconnected, or
+you may have to create a New Configuration. If you already have a CCXML for your
+SoC and debug connection you can use that in the section at the bottom. Once
+your device is selected, click the `Start` button within the section to launch
+the session.
+
+Select the ELF image to load on the device with the `Browse` button. This file
+is placed in the `out/debug` folder by this guide and ends with the `*.out` file
+extension.
+
+Finally click the `Load Image` button to load the executable image onto the
+device. You should be able to see the log output over the XDS110 User UART.
+
+Note that programming the device through JTAG sets the Halt-in-Boot flag and may
+cause issues when performing a software reset. This flag can be reset by
+power-cycling the LaunchPad.
+
+## Viewing Logging Output
+
+By default the log output will be sent to the Application/User UART. Open a
+terminal emulator to that port to see the output with the following options:
+
+| Parameter    | Value    |
+| ------------ | -------- |
+| Speed (baud) | `115200` |
+| Data bits    | `8`      |
+| Stop bits    | `1`      |
+| Parity       | `None`   |
+| Flow control | `None`   |
+
+## Running the Example
+
+Once a device has been flashed with this example, it can now join and operate in
+an existing Thread network. The following sections assume that a Thread network
+is already active, and has at least one [OpenThread Border
+Router][ot_border_router_setup].
+
+For insight into what other components are needed to run this example, please
+refer to our [Matter Getting Started Guide][matter-e2e-faq].
+
+### Provisioning
+
+Interacting with the application begins by enabling BLE advertisements and then
+pairing the device into a Thread network.
+
+#### Bluetooth LE Advertising
+
+To provision this example onto a Thread network, the device must be discoverable
+over Bluetooth LE. BLE advertising is started by long pressing the right button
+(greater than 1000ms), labeled `BTN-2` on the silkscreen. Once the device is
+fully provisioned, BLE advertising will stop.
+
+#### Bluetooth LE Rendezvous
+
+Pairing this application with `ble-thread` can be done with any of the enabled
+[CHIP Controller](../../../src/controller/README.md) applications. Use the
+information printed on the console to aide in pairing the device. The controller
+application can also be used to control the example app with the cluster
+commands.
+
+## TI Support
+
+For technical support, please consider creating a post on TI's [E2E forum][e2e].
+Additionally, we welcome any feedback.
+
+[matter]: https://github.com/project-chip/connectedhomeip
+[ccs]: https://www.ti.com/tool/CCSTUDIO
+[ccs_after_launch]:
+    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
+[ccs_debug_view]:
+    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
+[ccs_manual_launch]:
+    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
+[ccs_manual_method]:
+    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
+[cc1352r1_launchxl]: https://www.ti.com/tool/LAUNCHXL-CC1352R1
+[e2e]: https://e2e.ti.com/support/wireless-connectivity/zigbee-and-thread
+[matter-e2e-faq]:
+    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
+[sysconfig]: https://www.ti.com/tool/SYSCONFIG
+[sysconfig_recommended]:
+    https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run
+[ti_thread_dnd]:
+    https://www.ti.com/wireless-connectivity/thread/design-development.html
+[ot_border_router_setup]: https://openthread.io/guides/border-router/build
+[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni
new file mode 100644
index 00000000000000..e7438af247a9c2
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni
@@ -0,0 +1,49 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
+
+ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
+ti_simplelink_sysconfig_target =
+    get_label_info(":sysconfig", "label_no_toolchain")
+
+ti_simplelink_board = "LP_CC2652R7"
+
+# Size Optimizations
+# use -Os instead of -Og, LWIP release build
+optimize_debug_level = "s"
+lwip_debug = false
+
+chip_enable_ota_requestor = false
+
+# Disable FTD Build for all-clusters app to save Flash
+chip_openthread_ftd = false
+
+# Disable CHIP Logging
+#chip_progress_logging = false
+chip_detail_logging = false
+chip_automation_logging = false
+
+# BLE options
+chip_config_network_layer_ble = true
+
+# Disable lock tracking, since our FreeRTOS configuration does not set
+# INCLUDE_xSemaphoreGetMutexHolder
+chip_stack_lock_tracking = "none"
+
+matter_device_vid = "0xFFF1"
+matter_device_pid = "0x8006"
+matter_software_ver = "0x0001"
+matter_software_ver_str = "1.0d1"
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/build_overrides b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/build_overrides
new file mode 120000
index 00000000000000..e578e73312ebd1
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/build_overrides
@@ -0,0 +1 @@
+../../build_overrides
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg
new file mode 100644
index 00000000000000..4bfc7e52cbd5c5
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg
@@ -0,0 +1,194 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Texas Instruments Incorporated
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+
+/* Modules */
+var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
+var AESECB      = scripting.addModule("/ti/drivers/AESECB");
+var Button      = scripting.addModule("/ti/drivers/apps/Button");
+var LED         = scripting.addModule("/ti/drivers/apps/LED");
+var NVS         = scripting.addModule("/ti/drivers/NVS");
+var RF          = scripting.addModule("/ti/drivers/RF");
+var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
+var RTOS        = scripting.addModule("/ti/drivers/RTOS");
+var TRNG        = scripting.addModule("/ti/drivers/TRNG");
+var Thread      = scripting.addModule("/ti/thread/thread");
+var SHA2        = scripting.addModule("/ti/drivers/SHA2");
+var UART        = scripting.addModule("/ti/drivers/UART");
+var ble         = scripting.addModule("/ti/ble5stack/ble");
+var dmm         = scripting.addModule("/ti/dmm/dmm");
+var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
+var ECDH        = scripting.addModule("/ti/drivers/ECDH");
+
+/* Instances */
+var AESCCM1     = AESCCM.addInstance();
+var AESECB1     = AESECB.addInstance();
+var AESECB2     = AESECB.addInstance();
+var Button1     = Button.addInstance();
+var Button2     = Button.addInstance();
+var NVS1        = NVS.addInstance();
+var NVS2        = NVS.addInstance();
+var SHA21       = SHA2.addInstance();
+var LED1        = LED.addInstance();
+var LED2        = LED.addInstance();
+var TRNG1       = TRNG.addInstance();
+var TRNG2       = TRNG.addInstance();
+var TRNG3       = TRNG.addInstance();
+var UART1       = UART.addInstance();
+var AESCTRDRBG1 = AESCTRDRBG.addInstance();
+var ECDH1       = ECDH.addInstance();
+
+AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
+AESCTRDRBG1.aesctrObject.$name = "CONFIG_AESCTR_0";
+
+AESCCM1.$name = "CONFIG_AESCCM0";
+
+AESECB1.$name = "CONFIG_AESECB0";
+AESECB2.$name = "CONFIG_AESECB_1";
+
+ECDH1.$name = "CONFIG_ECDH0";
+
+/* RTOS */
+RTOS.name = "FreeRTOS";
+
+/* Left Button */
+Button1.$name                       = "CONFIG_BTN_LEFT";
+Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
+Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
+Button1.gpioPin.pull                = "Pull Up";
+Button1.gpioPin.interruptTrigger    = "Falling Edge";
+
+/* Left Button */
+Button2.$name                       = "CONFIG_BTN_RIGHT";
+Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
+Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
+Button2.gpioPin.pull                = "Pull Up";
+Button2.gpioPin.interruptTrigger    = "Falling Edge";
+
+/* ======== CCFG ======== */
+var CCFG  = scripting.addModule("/ti/devices/CCFG");
+const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
+for(var setting in ccfgSettings)
+{
+    CCFG[setting] = ccfgSettings[setting];
+}
+
+CCFG.enableCodeGeneration = true;
+
+/* NVS */
+NVS1.$name                      = "CONFIG_NVSINTERNAL";
+
+NVS1.internalFlash.regionBase = 0xAA000;
+NVS1.internalFlash.regionSize = 0x4000;
+
+NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
+NVS2.nvsType                               = "External"; // NVS Region Type
+NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
+
+/* RF */
+/* if an antenna component exists, assign it to the rf instance */
+if (system.deviceData.board && system.deviceData.board.components.RF) {
+    RF.$hardware = system.deviceData.board.components.RF;
+}
+
+const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
+for(var setting in rfDesignSettings)
+{
+    RFDesign[setting] = rfDesignSettings[setting];
+}
+
+/* Red LED */
+LED1.$name                      = "CONFIG_LED_RED";
+LED1.$hardware                  = system.deviceData.board.components.LED_RED;
+LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
+LED1.gpioPin.mode               = "Output";
+LED1.gpioPin.callbackFunction   = "";
+
+/* Green LED */
+LED2.$name                      = "CONFIG_LED_GREEN";
+LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
+LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
+LED2.gpioPin.mode               = "Output";
+LED2.gpioPin.callbackFunction   = "";
+
+/* Debug UART  */
+UART1.$hardware     = system.deviceData.board.components.XDS110UART;
+UART1.$name         = "CONFIG_UART_DEBUG";
+
+/* TRNG */
+TRNG1.$name     = "CONFIG_TRNG_0";
+TRNG2.$name     = "CONFIG_TRNG_1";
+TRNG3.$name     = "CONFIG_TRNG_APP";
+
+RTOS.name = "FreeRTOS";
+
+/* BLE */
+ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
+ble.maxConnNum                                            = 1;
+ble.numOfAdvSets                                          = 1;
+ble.lockProject                                           = true;
+ble.oneLibSizeOpt                                         = true;
+ble.maxPDUSize                                            = 255;
+ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param1";
+ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
+ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
+ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
+
+ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
+ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
+ble.advSet1.advParam1.primIntMin                    = 100;
+ble.advSet1.advParam1.primIntMax                    = 200;
+
+/* DMM */
+dmm.project                                          = "ti_thread_thermostat_remote_display";
+dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
+dmm.lockStackRoles                                   = true;
+dmm.numApplicationStates                             = 10;
+dmm.applicationState0                                = "ANY";
+dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
+dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
+dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
+dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
+dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
+dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
+dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
+dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
+dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
+dmm.policyArray.create(4);
+dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
+dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
+dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
+dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
+dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
+dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
+dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
+dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
+dmm.policyArray[1].blePeripheral.weight              = 25;
+dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
+dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
+dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
+dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
+dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
+dmm.policyArray[2].threadFTD.weight                  = 30;
+dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
+dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
+dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
+dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
+dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
+dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/AppTask.cpp
new file mode 100644
index 00000000000000..f99dd873e2fd60
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -0,0 +1,362 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Texas Instruments Incorporated
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+#include "AppConfig.h"
+#include "AppEvent.h"
+#include <app/server/Server.h>
+#include <app/util/af.h>
+
+#include "FreeRTOS.h"
+#include "Globals.h"
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+
+#include <platform/CHIPDeviceLayer.h>
+
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CHIPPlatformMemory.h>
+
+#ifdef AUTO_PRINT_METRICS
+#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
+#endif
+#include <app/server/OnboardingCodesUtil.h>
+
+#include <ti/drivers/apps/Button.h>
+#include <ti/drivers/apps/LED.h>
+
+/* syscfg */
+#include <ti_drivers_config.h>
+
+#define APP_TASK_STACK_SIZE (5000)
+#define APP_TASK_PRIORITY 4
+#define APP_EVENT_QUEUE_SIZE 10
+
+using namespace ::chip;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+
+static TaskHandle_t sAppTaskHandle;
+static QueueHandle_t sAppEventQueue;
+
+static Button_Handle sAppLeftHandle;
+static Button_Handle sAppRightHandle;
+
+AppTask AppTask::sAppTask;
+
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+#ifdef AUTO_PRINT_METRICS
+static void printMetrics(void)
+{
+    chip::DeviceLayer::ThreadMetrics *threadMetricsOut, *currThread;
+    uint64_t heapFree, heapUsed;
+
+    DiagnosticDataProviderImpl::GetDefaultInstance().GetCurrentHeapUsed(heapUsed);
+    DiagnosticDataProviderImpl::GetDefaultInstance().GetCurrentHeapFree(heapFree);
+    DiagnosticDataProviderImpl::GetDefaultInstance().GetThreadMetrics(&threadMetricsOut);
+
+    PLAT_LOG("Heap Metrics\n Heap Free: %d Heap Used: %d", (uint32_t) heapFree, (uint32_t) heapUsed);
+
+    PLAT_LOG("Thread Metrics\n");
+
+    currThread = threadMetricsOut;
+    while (currThread)
+    {
+        PLAT_LOG("Task Name: %s ID: %d Stack Free Min: %d", currThread->name, (uint32_t) currThread->id,
+                 (uint32_t) currThread->stackFreeMinimum);
+
+        currThread = currThread->Next;
+    }
+
+    DiagnosticDataProviderImpl::GetDefaultInstance().ReleaseThreadMetrics(threadMetricsOut);
+}
+#endif
+
+void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kSessionEstablished: {
+        if (event->SessionEstablished.IsCommissioner)
+        {
+            PLAT_LOG("Commissioning session established");
+        }
+    }
+    break;
+
+    case DeviceEventType::kCHIPoBLEConnectionEstablished:
+        PLAT_LOG("CHIPoBLE connection established");
+        break;
+
+    case DeviceEventType::kCHIPoBLEConnectionClosed:
+        PLAT_LOG("CHIPoBLE disconnected");
+        break;
+
+    case DeviceEventType::kCommissioningComplete:
+        PLAT_LOG("Commissioning complete");
+        break;
+    }
+
+#ifdef AUTO_PRINT_METRICS
+    printMetrics();
+#endif
+}
+
+int AppTask::StartAppTask()
+{
+    int ret = 0;
+
+    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
+    if (sAppEventQueue == NULL)
+    {
+        PLAT_LOG("Failed to allocate app event queue");
+        while (1)
+            ;
+    }
+
+    // Start App task.
+    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
+        pdPASS)
+    {
+        PLAT_LOG("Failed to create app task");
+        while (1)
+            ;
+    }
+    return ret;
+}
+
+int AppTask::Init()
+{
+    LED_Params ledParams;
+    Button_Params buttonParams;
+
+    cc13x2_26x2LogInit();
+
+    // Initialize LEDs
+    PLAT_LOG("Initialize LEDs");
+    LED_init();
+
+    LED_Params_init(&ledParams); // default PWM LED
+    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
+    LED_setOff(sAppRedHandle);
+
+    LED_Params_init(&ledParams); // default PWM LED
+    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
+    LED_setOff(sAppGreenHandle);
+
+    // Initialize buttons
+    PLAT_LOG("Initialize buttons");
+    Button_init();
+
+    Button_Params_init(&buttonParams);
+    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
+    buttonParams.longPressDuration = 1000U; // ms
+    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
+    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
+
+    Button_Params_init(&buttonParams);
+    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
+    buttonParams.longPressDuration = 1000U; // ms
+    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
+    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
+
+    // Init Chip memory management before the stack
+    Platform::MemoryInit();
+
+    CHIP_ERROR ret = PlatformMgr().InitChipStack();
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("PlatformMgr().InitChipStack() failed");
+        while (1)
+            ;
+    }
+
+    ret = ThreadStackMgr().InitThreadStack();
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
+        while (1)
+            ;
+    }
+
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
+        while (1)
+            ;
+    }
+
+    ret = PlatformMgr().StartEventLoopTask();
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
+        while (1)
+            ;
+    }
+
+    ret = ThreadStackMgrImpl().StartThreadTask();
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
+        while (1)
+            ;
+    }
+
+    // Init ZCL Data Model and start server
+    PLAT_LOG("Initialize Server");
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
+
+    ConfigurationMgr().LogDeviceConfig();
+
+    // Initialize device attestation config
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+
+    // Register a function to receive events from the CHIP device layer.  Note that calls to
+    // this function will happen on the CHIP event loop thread, not the app_main thread.
+    PlatformMgr().AddEventHandler(DeviceEventCallback, reinterpret_cast<intptr_t>(nullptr));
+
+    // QR code will be used with CHIP Tool
+    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
+
+    return 0;
+}
+
+void AppTask::AppTaskMain(void * pvParameter)
+{
+    AppEvent event;
+
+    sAppTask.Init();
+
+    while (1)
+    {
+        /* Task pend until we have stuff to do */
+        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
+        {
+            sAppTask.DispatchEvent(&event);
+        }
+    }
+}
+
+void AppTask::PostEvent(const AppEvent * aEvent)
+{
+    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
+    {
+        /* Failed to post the message */
+    }
+}
+
+void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
+{
+    AppEvent event;
+    event.Type = AppEvent::kEventType_ButtonLeft;
+
+    if (events & Button_EV_CLICKED)
+    {
+        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
+    }
+    else if (events & Button_EV_LONGCLICKED)
+    {
+        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
+    }
+    // button callbacks are in ISR context
+    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
+    {
+        /* Failed to post the message */
+    }
+}
+
+void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
+{
+    AppEvent event;
+    event.Type = AppEvent::kEventType_ButtonRight;
+
+    if (events & Button_EV_CLICKED)
+    {
+        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
+    }
+    else if (events & Button_EV_LONGCLICKED)
+    {
+        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
+    }
+    // button callbacks are in ISR context
+    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
+    {
+        /* Failed to post the message */
+    }
+}
+
+void AppTask::DispatchEvent(AppEvent * aEvent)
+{
+    switch (aEvent->Type)
+    {
+    case AppEvent::kEventType_ButtonLeft:
+        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
+        {
+        }
+        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
+        {
+            // Disable BLE advertisements
+            if (ConnectivityMgr().IsBLEAdvertisingEnabled())
+            {
+                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
+                PLAT_LOG("Disabled BLE Advertisements");
+            }
+        }
+        break;
+
+    case AppEvent::kEventType_ButtonRight:
+        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
+        {
+        }
+        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
+        {
+            // Enable BLE advertisements
+            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
+            {
+                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
+                {
+                    PLAT_LOG("Enabled BLE Advertisement");
+                }
+                else
+                {
+                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
+                }
+            }
+        }
+        break;
+
+    case AppEvent::kEventType_AppEvent:
+        if (NULL != aEvent->Handler)
+        {
+            aEvent->Handler(aEvent);
+        }
+        break;
+
+    case AppEvent::kEventType_None:
+    default:
+        break;
+    }
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
new file mode 100644
index 00000000000000..40661af8cd7c7d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
@@ -0,0 +1,176 @@
+
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include "ClusterManager.h"
+#include "Globals.h"
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/CommandHandler.h>
+#include <app/clusters/identify-server/identify-server.h>
+#include <app/util/basic-types.h>
+
+#ifdef AUTO_PRINT_METRICS
+#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
+#endif
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::DeviceLayer;
+
+constexpr uint32_t kIdentifyTimerDelayMS     = 250;
+constexpr uint32_t kIdentifyTimerDelayPerSec = 4;
+ClusterManager ClusterManager::sCluster;
+
+#define ENDPOINT_ID_0 (0)
+#define ENDPOINT_ID_1 (1)
+#define ENDPOINT_ID_2 (2)
+
+void OnIdentifyTriggerEffect(Identify * identify)
+{
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE:
+        PLAT_LOG("EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE");
+        break;
+    default:
+        PLAT_LOG("No identifier effect");
+        break;
+    }
+    return;
+}
+
+Identify gIdentify0 = {
+    chip::EndpointId{ 0 },
+    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
+    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+    OnIdentifyTriggerEffect,
+};
+
+Identify gIdentify1 = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
+    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+    OnIdentifyTriggerEffect,
+};
+
+void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
+                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    // At this point we can assume that value points to a bool value.
+    mEndpointOnOffState[endpointId - 1] = *value;
+    endpointId == ENDPOINT_ID_1 ? LED_write(sAppGreenHandle, *value) : LED_write(sAppRedHandle, *value);
+
+exit:
+    return;
+}
+
+void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    bool onOffState    = mEndpointOnOffState[endpointId - 1];
+    uint8_t brightness = onOffState ? *value : 0;
+
+    VerifyOrExit(brightness > 0, PLAT_LOG("Brightness set to 0, ignoring"));
+    VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
+                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    if (brightness > LED_BRIGHTNESS_MAX)
+    {
+        brightness = LED_BRIGHTNESS_MAX;
+    }
+
+    endpointId == ENDPOINT_ID_1 ? LED_setOn(sAppGreenHandle, brightness) : LED_setOn(sAppRedHandle, brightness);
+
+exit:
+    return;
+}
+
+void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID ||
+                     attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID,
+                 PLAT_LOG("Unhandled AttributeId ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
+                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    if (endpointId == ENDPOINT_ID_1)
+    {
+        uint8_t hue, saturation;
+        if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID)
+        {
+            hue = *value;
+            /* Read Current Saturation value when Attribute change callback for HUE Attribute */
+            app::Clusters::ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation);
+        }
+        else
+        {
+            saturation = *value;
+            /* Read Current Hue value when Attribute change callback for SATURATION Attribute */
+            app::Clusters::ColorControl::Attributes::CurrentHue::Get(endpointId, &hue);
+        }
+        PLAT_LOG("Color Control triggered: Hue: %d Saturation: %d", hue, saturation);
+    }
+exit:
+    return;
+}
+
+void ClusterManager::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint16_t size,
+                                                           uint8_t * value)
+{
+    if (attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id && size == 2)
+    {
+        uint16_t identifyTime;
+        memcpy(&identifyTime, value, size);
+        if (identifyTime)
+        {
+            // Currently we have no separate indicator LEDs on each endpoints.
+            // We are using LED1 for endpoint 0,1 and LED2 for endpoint 2
+            if (endpointId == ENDPOINT_ID_2)
+            {
+                LED_startBlinking(sAppGreenHandle, kIdentifyTimerDelayMS, identifyTime * kIdentifyTimerDelayPerSec);
+            }
+            else
+            {
+                LED_startBlinking(sAppRedHandle, kIdentifyTimerDelayMS, identifyTime * kIdentifyTimerDelayPerSec);
+            }
+        }
+        else
+        {
+            bool onOffState;
+            endpointId == ENDPOINT_ID_0 ? onOffState = mEndpointOnOffState[0] : onOffState = mEndpointOnOffState[endpointId - 1];
+            endpointId == ENDPOINT_ID_2 ? LED_write(sAppRedHandle, onOffState) : LED_write(sAppGreenHandle, onOffState);
+        }
+    }
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/Globals.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/Globals.cpp
new file mode 100644
index 00000000000000..01a945e1a33d12
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/Globals.cpp
@@ -0,0 +1,22 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "Globals.h"
+
+LED_Handle sAppRedHandle;
+LED_Handle sAppGreenHandle;
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
new file mode 100644
index 00000000000000..0524dc7578fd23
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file
+ *   This file implements the handler for data model messages.
+ */
+
+#include "AppConfig.h"
+#include "Globals.h"
+#include <lib/support/logging/CHIPLogging.h>
+
+#include "ClusterManager.h"
+
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/CommandHandler.h>
+#include <app/util/af-types.h>
+#include <app/util/af.h>
+#include <app/util/basic-types.h>
+
+using namespace ::chip;
+using namespace ::chip::app::Clusters;
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
+{
+    EndpointId endpoint     = attributePath.mEndpointId;
+    ClusterId clusterId     = attributePath.mClusterId;
+    AttributeId attributeId = attributePath.mAttributeId;
+    PLAT_LOG("MatterPostAttributeChangeCallback - Cluster ID: " ChipLogFormatMEI
+             ", EndPoint ID: '0x%02x', Attribute ID: " ChipLogFormatMEI,
+             ChipLogValueMEI(clusterId), endpoint, ChipLogValueMEI(attributeId));
+
+    switch (clusterId)
+    {
+    case OnOff::Id:
+        ClusterMgr().OnOnOffPostAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+
+    case Identify::Id:
+        ClusterMgr().OnIdentifyPostAttributeChangeCallback(endpoint, attributeId, size, value);
+        break;
+
+    case LevelControl::Id:
+        ClusterMgr().OnLevelControlAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+
+    case ColorControl::Id:
+        ClusterMgr().OnColorControlAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+    default:
+        PLAT_LOG("Unhandled cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
+        break;
+    }
+}
+/** @brief OnOff Cluster Init
+ *
+ * This function is called when a specific cluster is initialized. It gives the
+ * application an opportunity to take care of cluster initialization procedures.
+ * It is called exactly once for each endpoint where cluster is present.
+ *
+ * @param endpoint   Ver.: always
+ */
+void emberAfOnOffClusterInitCallback(EndpointId endpoint)
+{
+    // TODO: implement any additional Cluster Server init actions
+}
+
+bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * commandObj)
+{
+    emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS);
+    return true;
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppConfig.h
new file mode 100644
index 00000000000000..f7302b6efd10cd
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppConfig.h
@@ -0,0 +1,22 @@
+/*
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef APP_CONFIG_H
+#define APP_CONFIG_H
+
+#endif // APP_CONFIG_H
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppEvent.h
new file mode 100644
index 00000000000000..ad9e93ee3ad1a5
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppEvent.h
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef APP_EVENT_H
+#define APP_EVENT_H
+
+struct AppEvent;
+typedef void (*EventHandler)(AppEvent *);
+
+struct AppEvent
+{
+    enum AppEventType
+    {
+        kEventType_None = 0,
+        kEventType_ButtonLeft,
+        kEventType_ButtonRight,
+        kEventType_AppEvent,
+    };
+
+    enum AppEventButtonType
+    {
+        kAppEventButtonType_None = 0,
+        kAppEventButtonType_Clicked,
+        kAppEventButtonType_LongClicked,
+    };
+
+    enum AppEventType Type;
+
+    union
+    {
+        struct
+        {
+            enum AppEventButtonType Type;
+        } ButtonEvent;
+
+        struct
+        {
+            void * Context;
+        } BoltLockEvent;
+    };
+
+    EventHandler Handler;
+};
+
+#endif // APP_EVENT_H
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppTask.h
new file mode 100644
index 00000000000000..002e1b3f70557c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/AppTask.h
@@ -0,0 +1,72 @@
+/*
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef APP_TASK_H
+#define APP_TASK_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "FreeRTOS.h"
+#include "semphr.h"
+#include "task.h"
+
+#include "AppEvent.h"
+
+#include <ti/drivers/apps/Button.h>
+
+class AppTask
+{
+public:
+    int StartAppTask();
+    static void AppTaskMain(void * pvParameter);
+
+    void PostEvent(const AppEvent * event);
+
+private:
+    friend AppTask & GetAppTask(void);
+
+    int Init();
+
+    void DispatchEvent(AppEvent * event);
+
+    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
+    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
+    static void TimerEventHandler(void * p_context);
+
+    enum Function_t
+    {
+        kFunction_NoneSelected   = 0,
+        kFunction_SoftwareUpdate = 0,
+        kFunction_FactoryReset,
+
+        kFunction_Invalid
+    } Function;
+
+    Function_t mFunction;
+    bool mFunctionTimerActive;
+
+    static AppTask sAppTask;
+};
+
+inline AppTask & GetAppTask(void)
+{
+    return AppTask::sAppTask;
+}
+
+#endif // APP_TASK_H
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
new file mode 100644
index 00000000000000..a7d7e9beb24e73
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -0,0 +1,128 @@
+/*
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Example project configuration file for CHIP.
+ *
+ *          This is a place to put application or project-specific overrides
+ *          to the default configuration values for general CHIP features.
+ *
+ */
+
+#ifndef CHIP_PROJECT_CONFIG_H
+#define CHIP_PROJECT_CONFIG_H
+
+#if BUILD_RELEASE // release build
+// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
+#endif // BUILD_RELEASE
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_PAIRING_CODE "CHIPUS"
+
+/**
+ * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
+ *
+ * Enables the use of a hard-coded default serial number if none
+ * is found in CHIP NV storage.
+ */
+#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
+ *
+ * The hardware version number assigned to device or product by the device vendor.  This
+ * number is scoped to the device product id, and typically corresponds to a revision of the
+ * physical device, a change to its packaging, and/or a change to its marketing presentation.
+ * This value is generally *not* incremented for device software versions.
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
+
+/**
+ * Values set by args.gni:
+ * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
+ * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
+ * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+ * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
+ */
+
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+ *
+ * Enable support for CHIP-over-BLE (CHIPOBLE).
+ */
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
+
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
+ *
+ * Enables synchronizing the device's real time clock with a remote CHIP Time service
+ * using the CHIP Time Sync protocol.
+ */
+// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
+
+/**
+ * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
+ *
+ * A size, in bytes, of the individual debug event logging buffer.
+ */
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
+
+#define MATTER_CC13X2_26X2_PLATFORM_LOG_ENABLED 1
+
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
+ *
+ * Enable the OpenThread SRP client to allow for CHIP device discovery.
+ */
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
+
+/**
+ * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
+ *
+ * For a development build, set the default importance of events to be logged as Debug.
+ * Since debug is the lowest importance level, this means all standard, critical, info and
+ * debug importance level vi events get logged.
+ */
+#if BUILD_RELEASE
+#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
+#else
+#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
+#endif // BUILD_RELEASE
+
+#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
+
+/**
+ * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
+ *
+ * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
+ */
+#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
+
+/**
+ * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
+ *
+ * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
+ */
+#define CHIP_IM_MAX_NUM_WRITE_HANDLER 1
+
+#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/ClusterManager.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/ClusterManager.h
new file mode 100644
index 00000000000000..1599ef1ef19264
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/ClusterManager.h
@@ -0,0 +1,51 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file ClusterManager.h
+ *
+ * Declarations for the ClusterManager callbacks for this application
+ *
+ **/
+
+#pragma once
+
+#include <app/util/af-types.h>
+#include <app/util/basic-types.h>
+#include <platform/CHIPDeviceLayer.h>
+
+class ClusterManager
+{
+public:
+    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnColorControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint16_t size,
+                                               uint8_t * value);
+
+private:
+    friend ClusterManager & ClusterMgr(void);
+    bool mEndpointOnOffState[2];
+    static ClusterManager sCluster;
+};
+
+inline ClusterManager & ClusterMgr(void)
+{
+    return ClusterManager::sCluster;
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/Globals.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/Globals.h
new file mode 100644
index 00000000000000..43f9362e0341b9
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/Globals.h
@@ -0,0 +1,35 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <ti/drivers/apps/LED.h>
+// Logging
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int cc13x2_26x2LogInit(void);
+void cc13x2_26x2Log(const char * aFormat, ...);
+#define PLAT_LOG(...) cc13x2_26x2Log(__VA_ARGS__);
+
+#ifdef __cplusplus
+}
+#endif
+extern LED_Handle sAppRedHandle;
+extern LED_Handle sAppGreenHandle;
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
new file mode 100644
index 00000000000000..30f5633cc3bc7f
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
@@ -0,0 +1,29 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Overrides to default OpenThread configuration.
+ *
+ */
+
+#pragma once
+
+// Use the TI-supplied default platform configuration for remainder
+#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/main.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/main.cpp
new file mode 100644
index 00000000000000..b432b8da888b34
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/main.cpp
@@ -0,0 +1,97 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Texas Instruments Incorporated
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <platform/CHIPDeviceLayer.h>
+
+#include <AppConfig.h>
+#include <AppTask.h>
+
+#include <FreeRTOS.h>
+
+/* Driver Header files */
+#include <ti/drivers/Board.h>
+#include <ti/drivers/GPIO.h>
+#include <ti/drivers/NVS.h>
+#include <ti/drivers/UART.h>
+
+#include <ti/drivers/AESECB.h>
+#include <ti/drivers/ECDH.h>
+#include <ti/drivers/ECDSA.h>
+#include <ti/drivers/SHA2.h>
+
+#include <bget.h>
+#define TOTAL_ICALL_HEAP_SIZE (58000)
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::DeviceLayer;
+
+__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
+uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
+
+// ================================================================================
+// FreeRTOS Callbacks
+// ================================================================================
+extern "C" void vApplicationStackOverflowHook(void)
+{
+    while (1)
+    {
+        ;
+    }
+}
+
+// ================================================================================
+// Main Code
+// ================================================================================
+int main(void)
+{
+    Board_init();
+    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
+
+    GPIO_init();
+
+    NVS_init();
+
+    UART_init();
+
+    ECDH_init();
+
+    ECDSA_init();
+
+    AESECB_init();
+
+    SHA2_init();
+
+    int ret = GetAppTask().StartAppTask();
+    if (ret != 0)
+    {
+        // can't log until the kernel is started
+        // PLAT_LOG("GetAppTask().StartAppTask() failed");
+        while (1)
+            ;
+    }
+
+    vTaskStartScheduler();
+
+    // Should never get here.
+    while (1)
+        ;
+}
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/third_party/connectedhomeip
new file mode 120000
index 00000000000000..c866b86874994d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../..
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/esp32/.gitignore b/examples/all-clusters-minimal-app/esp32/.gitignore
new file mode 100644
index 00000000000000..234526a082ad26
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/.gitignore
@@ -0,0 +1,5 @@
+*.vscode
+
+/build/
+/sdkconfig
+/sdkconfig.old
diff --git a/examples/ipv6only-app/esp32/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/CMakeLists.txt
similarity index 72%
rename from examples/ipv6only-app/esp32/CMakeLists.txt
rename to examples/all-clusters-minimal-app/esp32/CMakeLists.txt
index 3ec8fe381d6d13..d6fd8adda8185f 100644
--- a/examples/ipv6only-app/esp32/CMakeLists.txt
+++ b/examples/all-clusters-minimal-app/esp32/CMakeLists.txt
@@ -18,12 +18,20 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
 
 set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
+    "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
+    "${IDF_PATH}/examples/common_components/led_strip"
 )
+if(${IDF_TARGET} STREQUAL "esp32")
+    list(APPEND EXTRA_COMPONENT_DIRS "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/m5stack-tft/repo/components/tft"
+                                     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/m5stack-tft/repo/components/spidriver"
+                                     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/screen-framework")
+endif()
 
-project(chip-ipv6only-app)
+project(chip-all-clusters-minimal-app)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
 # For the C3, project_include.cmake sets -Wno-format, but does not clear various
@@ -36,11 +44,16 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-secur
 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 
+flashing_script()
+
+if (CONFIG_ENABLE_PW_RPC)
 get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
 include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.esp32)
+pw_set_backend(pw_trace pw_trace_tokenized)
 
 add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
 add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
@@ -50,3 +63,4 @@ get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS)
 list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
 list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
 set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
+endif(CONFIG_ENABLE_PW_RPC)
diff --git a/examples/all-clusters-minimal-app/esp32/README.md b/examples/all-clusters-minimal-app/esp32/README.md
new file mode 100644
index 00000000000000..8c2965a834013d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/README.md
@@ -0,0 +1,405 @@
+# CHIP ESP32 All Clusters Example
+
+A prototype application that demonstrates device commissioning and cluster
+control.
+
+---
+
+-   [CHIP ESP32 All Clusters Example](#chip-esp32-all-clusters-example)
+    -   [Supported Devices](#supported-devices)
+    -   [Building the Example Application](#building-the-example-application)
+    -   [Commissioning and cluster control](#commissioning-and-cluster-control)
+        -   [Setting up chip-tool](#setting-up-chip-tool)
+        -   [Commissioning over BLE](#commissioning-over-ble)
+        -   [Cluster control](#cluster-control)
+        -   [Flashing app using script](#flashing-app-using-script)
+        -   [Note](#note)
+    -   [Using the RPC console](#using-the-rpc-console)
+    -   [Device Tracing](#device-tracing)
+
+---
+
+## Supported Devices
+
+The CHIP demo application is intended to work on three categories of ESP32
+devices: the
+[ESP32-DevKitC](https://www.espressif.com/en/products/hardware/esp32-devkitc/overview),
+the
+[ESP32-WROVER-KIT_V4.1](https://www.espressif.com/en/products/hardware/esp-wrover-kit/overview),
+the [M5Stack](http://m5stack.com), and the
+[ESP32C3-DevKitM](https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html).
+
+Note: M5Stack Core 2 display is not supported in the tft component, while other
+functionality can still work fine.
+
+## VCP Drivers
+
+Some users might have to install the
+[VCP driver](https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers)
+before the device shows up on `/dev/tty`.
+
+In addition, if the following error is encountered during M5Stack flashing, the
+[CH9102 VCP driver](https://docs.m5stack.com/en/download) would also need to be
+installed:
+
+```
+Failed to write to target RAM (result was 01070000)
+```
+
+## Building the Example Application
+
+Building the example application requires the use of the Espressif ESP32 IoT
+Development Framework and the xtensa-esp32-elf toolchain for ESP32 modules or
+the riscv-esp32-elf toolchain for ESP32C3 modules.
+
+The VSCode devcontainer has these components pre-installed, so you can skip this
+step. To install these components manually, follow these steps:
+
+-   Clone the Espressif ESP-IDF and checkout
+    [v4.4.1 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.1)
+
+          ```
+          $ mkdir ${HOME}/tools
+          $ cd ${HOME}/tools
+          $ git clone https://github.com/espressif/esp-idf.git
+          $ cd esp-idf
+          $ git checkout v4.4.1
+          $ git submodule update --init
+          $ ./install.sh
+          $ . ./export.sh
+          ```
+
+    To update an existing esp-idf toolchain to v4.4.1:
+
+          ```
+          $ cd ~/tools/esp-idf
+          $ git fetch origin
+          $ git checkout v4.4.1
+          $ git reset --hard origin/v4.4.1
+          $ git submodule update --init
+          $ git clean -fdx
+          $ ./install.sh
+          $ . ./export.sh
+          ```
+
+-   Install ninja-build
+
+          ```
+          $ sudo apt-get install ninja-build
+          ```
+
+Currently building in VSCode _and_ deploying from native is not supported, so
+make sure the IDF_PATH has been exported(See the manual setup steps above).
+
+-   Setting up the environment
+
+        ```
+        $ cd ${HOME}/tools/esp-idf
+        $ ./install.sh
+        $ . ./export.sh
+        $ cd {path-to-connectedhomeip}
+        ```
+
+    To download and install packages.
+
+        ```
+        $ source ./scripts/bootstrap.sh
+        $ source ./scripts/activate.sh
+        ```
+
+    If packages are already installed then simply activate them.
+
+        ```
+        $ source ./scripts/activate.sh
+        ```
+
+-   Target Set
+
+To set IDF target, first:
+
+        ```
+        $ cd {path-to-connectedhomeip}/examples/all-clusters-minimal-app/esp32/
+        ```
+
+Then run set-target with one of the commands.
+
+        ```
+        $ idf.py set-target esp32
+        $ idf.py set-target esp32c3
+        ```
+
+-   Configuration Options
+
+To build the default configuration (`sdkconfig.defaults`) skip to building the
+demo application.
+
+To build a specific configuration (as an example `m5stack`):
+
+          ```
+          $ rm sdkconfig
+          $ idf.py -D 'SDKCONFIG_DEFAULTS=sdkconfig_m5stack.defaults' build
+          ```
+
+    Note: If using a specific device configuration, it is highly recommended to
+    start off with one of the defaults and customize on top of that. Certain
+    configurations have different constraints that are customized within the
+    device specific configuration (eg: main app stack size).
+
+To customize the configuration, run menuconfig.
+
+          ```
+          $ idf.py menuconfig
+          ```
+
+Select ESP32 based `Device Type` through `Demo`->`Device Type`. The device types
+that are currently supported include `ESP32-DevKitC` (default),
+`ESP32-WROVER-KIT_V4.1`, `M5Stack` and `ESP32C3-DevKitM`.
+
+-   To build the demo application.
+
+          ```
+          $ idf.py build
+          ```
+
+-   After building the application, to flash it outside of VSCode, connect your
+    device via USB. Then run the following command to flash the demo application
+    onto the device and then monitor its output. If necessary, replace
+    `/dev/tty.SLAB_USBtoUART` with the correct USB device name for your system
+    (like `/dev/ttyUSB0` on Linux or `/dev/tty.usbserial-01CDEEDC` on Mac). Note
+    that sometimes you might have to press and hold the `boot` button on the
+    device while it's trying to connect before flashing. For ESP32-DevKitC
+    devices this is labeled in the
+    [functional description diagram](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/esp32/get-started-devkitc.html#functional-description).
+
+          ```
+          $ idf.py -p /dev/tty.SLAB_USBtoUART flash monitor
+          ```
+
+-   Quit the monitor by hitting `Ctrl+]`.
+
+    Note: You can see a menu of various monitor commands by hitting
+    `Ctrl+t Ctrl+h` while the monitor is running.
+
+-   If desired, the monitor can be run again like so:
+
+          ```
+          $ idf.py -p /dev/tty.SLAB_USBtoUART monitor
+          ```
+
+## Commissioning and cluster control
+
+Commissioning can be carried out using WiFi or BLE.
+
+1.  Set the `Rendezvous Mode` for commissioning using menuconfig; the default
+    Rendezvous mode is BLE.
+
+          ```
+          $ idf.py menuconfig
+          ```
+
+Select the Rendezvous Mode via `Demo -> Rendezvous Mode`.
+
+NOTE: to avoid build error
+`undefined reference to 'chip::DevelopmentCerts::kDacPublicKey'`, set VID to
+`0xFFF1` and PID in range `0x8000..0x8005`.
+
+`idf.py menuconfig -> Component config -> CHIP Device Layer -> Device Identification Options`
+
+2.  Now flash the device with the same command as before. (Use the right `/dev`
+    device)
+
+          ```
+          $ idf.py -p /dev/tty.SLAB_USBtoUART flash monitor
+          ```
+
+3.  The device should boot up. When device connects to your network, you will
+    see a log like this on the device console.
+
+          ```
+          I (5524) chip[DL]: SYSTEM_EVENT_STA_GOT_IP
+          I (5524) chip[DL]: IPv4 address changed on WiFi station interface: <IP_ADDRESS>...
+          ```
+
+4.  Use
+    [python based device controller](https://github.com/project-chip/connectedhomeip/tree/master/src/controller/python)
+    or
+    [standalone chip-tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool)
+    or
+    [iOS chip-tool app](https://github.com/project-chip/connectedhomeip/tree/master/src/darwin/CHIPTool)
+    or
+    [Android chip-tool app](https://github.com/project-chip/connectedhomeip/tree/master/src/android/CHIPTool)
+    to communicate with the device.
+
+Note: The ESP32 does not support 5GHz networks. Also, the Device will persist
+your network configuration. To erase it, simply run.
+
+          ```
+          $ idf.py -p /dev/tty.SLAB_USBtoUART erase_flash
+          ```
+
+-   Once ESP32 is up and running, we need to set up a device controller to
+    perform commissioning and cluster control.
+
+### Setting up chip-tool
+
+See [the build guide](../../../docs/guides/BUILDING.md#prerequisites) for
+general background on build prerequisites.
+
+Building the example:
+
+```
+$ cd examples/chip-tool
+
+$ rm -rf out
+
+$ gn gen out/debug
+
+$ ninja -C out/debug
+```
+
+which puts the binary at `out/debug/chip-tool`
+
+### Commission a device using chip-tool
+
+To initiate a client commissioning request to a device, run the built executable
+and choose the pairing mode.
+
+#### Commissioning over BLE
+
+Run the built executable and pass it the discriminator and pairing code of the
+remote device, as well as the network credentials to use.
+
+The command below uses the default values hard-coded into the debug versions of
+the ESP32 all-clusters-minimal-app to commission it onto a Wi-Fi network:
+
+    ```
+    $ ./out/debug/chip-tool pairing ble-wifi 12344321 ${SSID} ${PASSWORD} 20202021 3840
+    ```
+
+Parameters:
+
+1. Discriminator: 3840 (configurable through menuconfig)
+2. Setup-pin-code: 20202021 (configurable through menuconfig)
+3. Node-id: 12344321 (you can assign any node id)
+
+### Cluster control
+
+#### onoff
+
+To use the Client to send Matter commands, run the built executable and pass it
+the target cluster name, the target command name as well as an endpoint id.
+
+    ```
+    $ ./out/debug/chip-tool onoff on 12344321 1
+    ```
+
+The client will send a single command packet and then exit.
+
+#### levelcontrol
+
+```bash
+Usage:
+  $ ./out/debug/chip-tool levelcontrol move-to-level Level=10 TransitionTime=0 OptionMask=0 OptionOverride=0  12344321 1
+```
+
+### Flashing app using script
+
+-   Follow these steps to use `${app_name}.flash.py`.
+
+    -   First set IDF target, run set-target with one of the commands.
+
+            ```
+            $ idf.py set-target esp32
+            $ idf.py set-target esp32c3
+            ```
+
+    -   Execute below sequence of commands
+
+        ```
+        $ export ESPPORT=/dev/tty.SLAB_USBtoUART
+        $ idf.py build
+        $ idf.py flashing_script
+        $ python ${app_name}.flash.py
+        ```
+
+### Note
+
+This demo app illustrates controlling OnOff cluster (Server) attributes of an
+endpoint. For `ESP32-DevKitC`, `ESP32-WROVER-KIT_V4.1` and `ESP32C3-DevKitM`, a
+GPIO (configurable through `STATUS_LED_GPIO_NUM` in `main/main.cpp`) is updated
+through the on/off/toggle commands from the `python-controller`. For `M5Stack`,
+a virtual Green LED on the display is used for the same.
+
+If you wish to see the actual effect of the commands on `ESP32-DevKitC`,
+`ESP32-WROVER-KIT_V4.1`, you will have to connect an external LED to GPIO
+`STATUS_LED_GPIO_NUM`. For `ESP32C3-DevKitM`, the on-board LED will show the
+actual effect of the commands.
+
+## Using the RPC console
+
+You can use the rpc default config to setup everything correctly for RPCs:
+
+    ```
+    $ export SDKCONFIG_DEFAULTS=$PROJECT_ROOT/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
+    $ rm sdkconfig
+    $ idf.py fullclean
+    ```
+
+Alternatively, Enable RPCs in the build using menuconfig:
+
+    - Enable the RPC library and Disable ENABLE_CHIP_SHELL
+
+        ```
+        Component config → CHIP Core → General Options → Enable Pigweed PRC library
+        Component config → CHIP Core → General Options → Disable CHIP Shell
+        ```
+
+    - Ensure the UART is correctly configured for your board, for m5stack:
+
+        ```
+        PW RPC Debug channel → UART port number → 0
+        PW RPC Debug channel → UART communication speed → 115200
+        PW RPC Debug channel → UART RXD pin number → 3
+        PW RPC Debug channel → UART TXD pin number → 1
+        ```
+
+After configuring you can build and flash normally:
+
+    ```
+    $ idf.py build
+    $ idf.py flash
+    ```
+
+After flashing a build with RPCs enabled you can use the rpc console to send
+commands to the device.
+
+Build or install the [rpc console](../../common/pigweed/rpc_console/README.md)
+
+Start the console
+
+    ```
+    chip-console --device /dev/ttyUSB0
+    ```
+
+From within the console you can then invoke rpcs:
+
+    ```python
+    rpcs.chip.rpc.WiFi.Connect(ssid=b"MySSID", secret=b"MyPASSWORD")
+    rpcs.chip.rpc.WiFi.GetIP6Address()
+
+    rpcs.chip.rpc.Lighting.Get()
+    rpcs.chip.rpc.Lighting.Set(on=True, level=128, color=protos.chip.rpc.LightingColor(hue=5, saturation=5))
+    ```
+
+## Device Tracing
+
+Device tracing is available to analyze the device performance. To turn on
+tracing, build with RPC enabled. See
+[Using the RPC console](#using-the-rpc-console).
+
+Obtain tracing json file.
+
+```
+    $ ./{PIGWEED_REPO}/pw_trace_tokenized/py/pw_trace_tokenized/get_trace.py -d {PORT} -o {OUTPUT_FILE} \
+    -t {ELF_FILE} {PIGWEED_REPO}/pw_trace_tokenized/pw_trace_protos/trace_rpc.proto
+```
diff --git a/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp b/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp
new file mode 100644
index 00000000000000..6db8c63b3c14ec
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp
@@ -0,0 +1,181 @@
+/*
+ *
+ *    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 "AppTask.h"
+#include "Button.h"
+#include "DeviceWithDisplay.h"
+#include "Globals.h"
+#include "LEDWidget.h"
+#include "ScreenManager.h"
+#include "driver/gpio.h"
+#include "esp_log.h"
+#include "esp_spi_flash.h"
+#include "freertos/FreeRTOS.h"
+#include <app/server/OnboardingCodesUtil.h>
+
+#define APP_TASK_NAME "APP"
+#define APP_EVENT_QUEUE_SIZE 10
+#define APP_TASK_STACK_SIZE (3072)
+
+static const char * TAG = "app-task";
+
+namespace {
+
+QueueHandle_t sAppEventQueue;
+TaskHandle_t sAppTaskHandle;
+
+} // namespace
+
+AppTask AppTask::sAppTask;
+
+CHIP_ERROR AppTask::StartAppTask()
+{
+    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
+    if (sAppEventQueue == NULL)
+    {
+        ESP_LOGE(TAG, "Failed to allocate app event queue");
+        return APP_ERROR_EVENT_QUEUE_FAILED;
+    }
+
+    // Start App task.
+    BaseType_t xReturned;
+    xReturned = xTaskCreate(AppTaskMain, APP_TASK_NAME, APP_TASK_STACK_SIZE, NULL, 1, &sAppTaskHandle);
+    return (xReturned == pdPASS) ? CHIP_NO_ERROR : APP_ERROR_CREATE_TASK_FAILED;
+}
+
+CHIP_ERROR AppTask::Init()
+{
+    /* Print chip information */
+    esp_chip_info_t chip_info;
+    esp_chip_info(&chip_info);
+    ESP_LOGI(TAG, "This is ESP32 chip with %d CPU cores, WiFi%s%s, ", chip_info.cores,
+             (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
+    ESP_LOGI(TAG, "silicon revision %d, ", chip_info.revision);
+    ESP_LOGI(TAG, "%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024),
+             (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    statusLED1.Init(STATUS_LED_GPIO_NUM);
+    // Our second LED doesn't map to any physical LEDs so far, just to virtual
+    // "LED"s on devices with screens.
+    statusLED2.Init(GPIO_NUM_MAX);
+    bluetoothLED.Init();
+    wifiLED.Init();
+    pairingWindowLED.Init();
+
+    // Print QR Code URL
+    PrintOnboardingCodes(chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
+
+#if CONFIG_HAVE_DISPLAY
+    InitDeviceDisplay();
+#endif
+    return err;
+}
+
+void AppTask::AppTaskMain(void * pvParameter)
+{
+    AppEvent event;
+    CHIP_ERROR err = sAppTask.Init();
+    if (err != CHIP_NO_ERROR)
+    {
+        ESP_LOGI(TAG, "AppTask.Init() failed due to %" CHIP_ERROR_FORMAT, err.Format());
+        return;
+    }
+
+    ESP_LOGI(TAG, "App Task started");
+
+    while (true)
+    {
+        BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, pdMS_TO_TICKS(10));
+        while (eventReceived == pdTRUE)
+        {
+            sAppTask.DispatchEvent(&event);
+            eventReceived = xQueueReceive(sAppEventQueue, &event, 0); // return immediately if the queue is empty
+        }
+    }
+}
+
+void AppTask::PostEvent(const AppEvent * aEvent)
+{
+    if (sAppEventQueue != NULL)
+    {
+        BaseType_t status;
+        if (xPortInIsrContext())
+        {
+            BaseType_t higherPrioTaskWoken = pdFALSE;
+            status                         = xQueueSendFromISR(sAppEventQueue, aEvent, &higherPrioTaskWoken);
+        }
+        else
+        {
+            status = xQueueSend(sAppEventQueue, aEvent, 1);
+        }
+        if (!status)
+            ESP_LOGE(TAG, "Failed to post event to app task event queue");
+    }
+    else
+    {
+        ESP_LOGE(TAG, "Event Queue is NULL should never happen");
+    }
+}
+
+void AppTask::DispatchEvent(AppEvent * aEvent)
+{
+    if (aEvent->mHandler)
+    {
+        aEvent->mHandler(aEvent);
+    }
+    else
+    {
+        ESP_LOGI(TAG, "Event received with no handler. Dropping event.");
+    }
+}
+
+void AppTask::ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction)
+{
+    AppEvent button_event             = {};
+    button_event.mType                = AppEvent::kEventType_Button;
+    button_event.mButtonEvent.mPinNo  = btnIdx;
+    button_event.mButtonEvent.mAction = btnAction;
+
+    if (btnAction == APP_BUTTON_PRESSED)
+    {
+        button_event.mHandler = ButtonPressedAction;
+        sAppTask.PostEvent(&button_event);
+    }
+}
+
+void AppTask::ButtonPressedAction(AppEvent * aEvent)
+{
+#if CONFIG_DEVICE_TYPE_M5STACK
+    uint32_t io_num = aEvent->mButtonEvent.mPinNo;
+    int level       = gpio_get_level((gpio_num_t) io_num);
+    if (level == 0)
+    {
+        bool woken = WakeDisplay();
+        if (woken)
+        {
+            return;
+        }
+        // Button 1 is connected to the pin 39
+        // Button 2 is connected to the pin 38
+        // Button 3 is connected to the pin 37
+        // So we use 40 - io_num to map the pin number to button number
+        ScreenManager::ButtonPressed(40 - io_num);
+    }
+#endif
+}
diff --git a/examples/all-clusters-minimal-app/esp32/main/BluetoothWidget.cpp b/examples/all-clusters-minimal-app/esp32/main/BluetoothWidget.cpp
new file mode 100644
index 00000000000000..4f8a011254bed0
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/BluetoothWidget.cpp
@@ -0,0 +1,68 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file BluetoothWidget.cpp
+ *
+ * Implements a Bluetooth Widget controller that display the state of bluetooth
+ * connection on display.
+ */
+
+#include "ScreenManager.h"
+
+#include "BluetoothWidget.h"
+
+#include "esp_log.h"
+#include "esp_system.h"
+
+extern const char * TAG;
+
+void BluetoothWidget::Init()
+{
+#if CONFIG_HAVE_DISPLAY
+    mVLED = -1;
+#endif // CONFIG_HAVE_DISPLAY
+
+    mState = false;
+}
+
+void BluetoothWidget::Set(bool state)
+{
+    bool stateChange = (mState != state);
+    mState           = state;
+    if (stateChange)
+    {
+#if CONFIG_HAVE_DISPLAY
+        if (mVLED != -1)
+        {
+            ScreenManager::SetVLED(mVLED, mState);
+        }
+#endif // CONFIG_HAVE_DISPLAY
+    }
+}
+
+#if CONFIG_HAVE_DISPLAY
+void BluetoothWidget::SetVLED(int id)
+{
+    mVLED = id;
+    if (mVLED != -1)
+    {
+        ScreenManager::SetVLED(mVLED, mState);
+    }
+}
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/all-clusters-minimal-app/esp32/main/Button.cpp b/examples/all-clusters-minimal-app/esp32/main/Button.cpp
new file mode 100644
index 00000000000000..5708f196b14944
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/Button.cpp
@@ -0,0 +1,117 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ * @file Button.cpp
+ *
+ * Implements a Button tied to a GPIO and provides debouncing
+ *
+ **/
+
+#include "driver/gpio.h"
+#include "esp_check.h"
+#include "esp_log.h"
+#include "esp_system.h"
+
+#include "AppTask.h"
+#include "Button.h"
+#include "Globals.h"
+#include "ScreenManager.h"
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <vector>
+
+static const char * TAG = "Button.cpp";
+
+extern Button gButtons[BUTTON_NUMBER];
+
+Button::Button() {}
+
+Button::Button(gpio_num_t gpioNum)
+{
+    mGPIONum = gpioNum;
+}
+
+int32_t Find_Button_Via_Pin(gpio_num_t gpioNum)
+{
+    for (int i = 0; i < BUTTON_NUMBER; i++)
+    {
+        if (gButtons[i].GetGPIONum() == gpioNum)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+void IRAM_ATTR button_isr_handler(void * arg)
+{
+    uint32_t gpio_num = (uint32_t) arg;
+    int32_t idx       = Find_Button_Via_Pin((gpio_num_t) gpio_num);
+    if (idx == -1)
+    {
+        return;
+    }
+    BaseType_t taskWoken = pdFALSE;
+    xTimerStartFromISR(gButtons[idx].mbuttonTimer,
+                       &taskWoken); // If the timer had already been started ,restart it will reset its expiry time
+}
+
+esp_err_t Button::Init()
+{
+    return Init(mGPIONum);
+}
+
+esp_err_t Button::Init(gpio_num_t gpioNum)
+{
+    esp_err_t ret = ESP_OK;
+
+    mGPIONum = gpioNum;
+    //  zero-initialize the config structure.
+    gpio_config_t io_conf = {};
+    // interrupt of falling edge
+    io_conf.intr_type = GPIO_INTR_NEGEDGE;
+    // bit mask of the pins, use GPIO4/5 here
+    io_conf.pin_bit_mask = 1ULL << gpioNum;
+    // set as input mode
+    io_conf.mode = GPIO_MODE_INPUT;
+    // enable pull-up mode
+    io_conf.pull_up_en = GPIO_PULLUP_ENABLE;
+
+    gpio_config(&io_conf);
+
+    // hook isr handler for specific gpio pin
+    ret = gpio_isr_handler_add(gpioNum, button_isr_handler, (void *) gpioNum);
+    ESP_RETURN_ON_ERROR(ret, TAG, "gpio_isr_handler_add failed: %s", esp_err_to_name(ret));
+
+    mbuttonTimer = xTimerCreate("BtnTmr",               // Just a text name, not used by the RTOS kernel
+                                pdMS_TO_TICKS(50),      // timer period
+                                false,                  // no timer reload (==one-shot)
+                                (void *) (int) gpioNum, // init timer id = gpioNum index
+                                TimerCallback           // timer callback handler (all buttons use
+                                                        // the same timer cn function)
+    );
+
+    return ESP_OK;
+}
+void Button::TimerCallback(TimerHandle_t xTimer)
+{
+    // Get the button index of the expired timer and call button event Handler.
+    uint32_t gpio_num = (uint32_t) pvTimerGetTimerID(xTimer);
+    GetAppTask().ButtonEventHandler(gpio_num, APP_BUTTON_PRESSED);
+}
diff --git a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
new file mode 100644
index 00000000000000..9754be95bae2e4
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
@@ -0,0 +1,261 @@
+#
+#    Copyright (c) 2021 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
+# The list of src and include dirs must be in sync with that in all-clusters-minimal-app/esp32/main/component.mk
+set(PRIV_INCLUDE_DIRS_LIST
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-minimal-app"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/include"
+                      "${CMAKE_CURRENT_LIST_DIR}/include"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
+)
+set(SRC_DIRS_LIST
+                      "${CMAKE_CURRENT_LIST_DIR}"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-minimal-app/zap-generated"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated/attributes"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/route_hook"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/ota"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/administrator-commissioning-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/application-basic-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/test-cluster-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/descriptor"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fan-control-server"                      
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fixed-label-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/user-label-server"                           
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/access-control-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/account-login-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/application-launcher-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/audio-output-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/barrier-control-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/window-covering-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/color-control-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/content-launch-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/media-input-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/mode-select-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/low-power-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/keypad-input-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/media-playback-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/target-navigator-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-user-interface-configuration-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread-network-diagnostics-server" 
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/channel-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/software-diagnostics-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/switch-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-diagnostics-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wifi-network-diagnostics-server"                      
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wake-on-lan-server"                      
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/pump-configuration-and-control-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-configuration-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src"
+)
+
+if (CONFIG_ENABLE_PW_RPC)
+# Append additional directories for RPC build
+set(PRIV_INCLUDE_DIRS_LIST  "${PRIV_INCLUDE_DIRS_LIST}"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
+                     "${IDF_PATH}/components/freertos/include/freertos"
+)
+set(SRC_DIRS_LIST  "${SRC_DIRS_LIST}"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
+)
+endif (CONFIG_ENABLE_PW_RPC)
+
+if(("${CONFIG_DEVICE_TYPE_ESP32_DEVKITC}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y"))
+    list(APPEND PRIV_INCLUDE_DIRS_LIST
+                "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/screen-framework/include")
+    set(PRIV_REQUIRES_LIST chip QRCode bt)
+elseif(("${CONFIG_DEVICE_TYPE_M5STACK}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_WROVER_KIT}" STREQUAL "y"))
+    set(PRIV_REQUIRES_LIST chip QRCode bt tft spidrier screen-framework)
+endif()
+
+if("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y")
+    list(APPEND PRIV_REQUIRES_LIST led_strip)
+endif()
+
+if (CONFIG_OPENTHREAD_ENABLED)
+    list(APPEND PRIV_REQUIRES_LIST openthread)
+endif()
+
+idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
+                       SRC_DIRS ${SRC_DIRS_LIST}
+                       PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
+
+set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
+target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H")
+target_compile_options(${COMPONENT_LIB} PUBLIC
+           "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
+)
+
+if (CONFIG_ENABLE_PW_RPC)
+
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
+include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
+include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
+set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
+
+pw_proto_library(attributes_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
+  PREFIX
+    attributes_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(button_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
+  PREFIX
+    button_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(descriptor_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
+  PREFIX
+    descriptor_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(device_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
+  PREFIX
+    device_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(lighting_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto
+  PREFIX
+    lighting_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(locking_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/locking_service.proto
+  PREFIX
+    locking_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(wifi_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.options
+  PREFIX
+    wifi_service
+  DEPS
+    pw_protobuf.common_protos
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+)
+
+target_link_libraries(${COMPONENT_LIB} PUBLIC
+  attributes_service.nanopb_rpc
+  button_service.nanopb_rpc
+  descriptor_service.nanopb_rpc
+  device_service.nanopb_rpc
+  lighting_service.nanopb_rpc
+  locking_service.nanopb_rpc
+  wifi_service.nanopb_rpc
+  pw_checksum
+  pw_hdlc
+  pw_log
+  pw_rpc.server
+  pw_trace_tokenized
+  pw_trace_tokenized.trace_buffer
+  pw_trace_tokenized.rpc_service
+  pw_trace_tokenized.protos.nanopb_rpc
+)
+
+target_link_options(${COMPONENT_LIB}
+  PUBLIC
+    "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld"
+)
+
+target_compile_options(${COMPONENT_LIB} PRIVATE
+                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
+                       "-DPW_RPC_BUTTON_SERVICE=1"
+                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
+                       "-DPW_RPC_DEVICE_SERVICE=1"
+                       "-DPW_RPC_LIGHTING_SERVICE=1"
+                       "-DPW_RPC_LOCKING_SERVICE=1"
+                       "-DPW_RPC_TRACING_SERVICE=1"
+                       "-DPW_RPC_WIFI_SERVICE=1"
+                       "-DPW_TRACE_BACKEND_SET=1")
+
+endif (CONFIG_ENABLE_PW_RPC)
diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp
new file mode 100644
index 00000000000000..52d632f7fa5afa
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp
@@ -0,0 +1,219 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.cpp
+ *
+ * Implements all the callbacks to the application from the CHIP Stack
+ *
+ **/
+#include "DeviceCallbacks.h"
+
+#include "Globals.h"
+#include "LEDWidget.h"
+#include "WiFiWidget.h"
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app/CommandHandler.h>
+#include <app/clusters/identify-server/identify-server.h>
+#include <app/util/basic-types.h>
+#include <app/util/util.h>
+#include <common/CHIPDeviceManager.h>
+#include <lib/dnssd/Advertiser.h>
+
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#include <app-common/zap-generated/cluster-id.h>
+#endif
+
+static const char * TAG = "app-devicecallbacks";
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace chip::app;
+
+constexpr uint32_t kIdentifyTimerDelayMS = 250;
+
+void OnIdentifyTriggerEffect(Identify * identify)
+{
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
+        statusLED1.Blink(kIdentifyTimerDelayMS * 2);
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE");
+        break;
+    default:
+        ChipLogProgress(Zcl, "No identifier effect");
+        break;
+    }
+    return;
+}
+
+Identify gIdentify0 = {
+    chip::EndpointId{ 0 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+    OnIdentifyTriggerEffect,
+};
+
+Identify gIdentify1 = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+    OnIdentifyTriggerEffect,
+};
+
+void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId,
+                                                     uint8_t type, uint16_t size, uint8_t * value)
+{
+    ESP_LOGI(TAG,
+             "PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: "
+             "'0x%02x', Attribute ID: '0x%04x'",
+             clusterId, endpointId, attributeId);
+
+    switch (clusterId)
+    {
+    case Clusters::OnOff::Id:
+        OnOnOffPostAttributeChangeCallback(endpointId, attributeId, value);
+        break;
+
+    case Clusters::LevelControl::Id:
+        OnLevelControlAttributeChangeCallback(endpointId, attributeId, value);
+        break;
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    case Clusters::ColorControl::Id:
+        OnColorControlAttributeChangeCallback(endpointId, attributeId, value);
+        break;
+#endif
+    case Clusters::Identify::Id:
+        OnIdentifyPostAttributeChangeCallback(endpointId, attributeId, size, value);
+        break;
+    default:
+        ESP_LOGI(TAG, "Unhandled cluster ID: %d", clusterId);
+        break;
+    }
+
+    ESP_LOGI(TAG, "Current free heap: %u\n", static_cast<unsigned int>(heap_caps_get_free_size(MALLOC_CAP_8BIT)));
+}
+
+void AppDeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    // At this point we can assume that value points to a bool value.
+    mEndpointOnOffState[endpointId - 1] = *value;
+    endpointId == 1 ? statusLED1.Set(*value) : statusLED2.Set(*value);
+
+exit:
+    return;
+}
+
+void AppDeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    bool onOffState    = mEndpointOnOffState[endpointId - 1];
+    uint8_t brightness = onOffState ? *value : 0;
+
+    VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    // At this point we can assume that value points to a bool value.
+    endpointId == 1 ? statusLED1.SetBrightness(brightness) : statusLED2.SetBrightness(brightness);
+
+exit:
+    return;
+}
+
+// Currently we only support ColorControl cluster for ESP32C3_DEVKITM which has
+// an on-board RGB-LED
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+void AppDeviceCallbacks::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID ||
+                     attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID,
+                 ESP_LOGI(TAG, "Unhandled AttributeId ID: '0x%04x", attributeId));
+    VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId));
+    if (endpointId == 1)
+    {
+        uint8_t hue, saturation;
+        if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID)
+        {
+            hue = *value;
+            emberAfReadServerAttribute(endpointId, ZCL_COLOR_CONTROL_CLUSTER_ID, ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID,
+                                       &saturation, sizeof(uint8_t));
+        }
+        else
+        {
+            saturation = *value;
+            emberAfReadServerAttribute(endpointId, ZCL_COLOR_CONTROL_CLUSTER_ID, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, &hue,
+                                       sizeof(uint8_t));
+        }
+        statusLED1.SetColor(hue, saturation);
+    }
+exit:
+    return;
+}
+#endif
+
+void AppDeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint16_t size,
+                                                               uint8_t * value)
+{
+    if (attributeId == Clusters::Identify::Attributes::IdentifyTime::Id && size == 2)
+    {
+        uint16_t identifyTime;
+        memcpy(&identifyTime, value, size);
+        if (identifyTime)
+        {
+            // Currently we have no separate indicator LEDs on each endpoints.
+            // We are using LED1 for endpoint 0,1 and LED2 for endpoint 2
+            endpointId == 2 ? statusLED2.Blink(kIdentifyTimerDelayMS * 2) : statusLED1.Blink(kIdentifyTimerDelayMS * 2);
+        }
+        else
+        {
+            bool onOffState;
+            endpointId == 0 ? onOffState = mEndpointOnOffState[0] : onOffState = mEndpointOnOffState[endpointId - 1];
+            endpointId == 2 ? statusLED2.Set(onOffState) : statusLED1.Set(onOffState);
+        }
+    }
+}
+
+bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * commandObj)
+{
+    emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS);
+    return true;
+}
+
+void AppDeviceCallbacksDelegate::OnIPv4ConnectivityEstablished()
+{
+    wifiLED.Set(true);
+}
+void AppDeviceCallbacksDelegate::OnIPv4ConnectivityLost()
+{
+    wifiLED.Set(false);
+}
diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
new file mode 100644
index 00000000000000..987a095134b16d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
@@ -0,0 +1,698 @@
+/*
+ *
+ *    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 "DeviceWithDisplay.h"
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+
+#if CONFIG_HAVE_DISPLAY
+using namespace ::chip;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::DeviceLayer;
+
+static const char * TAG = "DeviceWithDisplay";
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+
+Button gButtons[BUTTON_NUMBER] = { Button(BUTTON_1_GPIO_NUM), Button(BUTTON_2_GPIO_NUM), Button(BUTTON_3_GPIO_NUM) };
+
+// Pretend these are devices with endpoints with clusters with attributes
+typedef std::tuple<std::string, std::string> Attribute;
+typedef std::vector<Attribute> Attributes;
+typedef std::tuple<std::string, Attributes> Cluster;
+typedef std::vector<Cluster> Clusters;
+typedef std::tuple<std::string, Clusters> Endpoint;
+typedef std::vector<Endpoint> Endpoints;
+typedef std::tuple<std::string, Endpoints> Device;
+typedef std::vector<Device> Devices;
+Devices devices;
+
+void AddAttribute(std::string name, std::string value)
+{
+    Attribute attribute = std::make_tuple(std::move(name), std::move(value));
+    std::get<1>(std::get<1>(std::get<1>(devices.back()).back()).back()).emplace_back(std::move(attribute));
+}
+
+void AddCluster(std::string name)
+{
+    Cluster cluster = std::make_tuple(std::move(name), std::move(Attributes()));
+    std::get<1>(std::get<1>(devices.back()).back()).emplace_back(std::move(cluster));
+}
+
+void AddEndpoint(std::string name)
+{
+    Endpoint endpoint = std::make_tuple(std::move(name), std::move(Clusters()));
+    std::get<1>(devices.back()).emplace_back(std::move(endpoint));
+}
+
+void AddDevice(std::string name)
+{
+    Device device = std::make_tuple(std::move(name), std::move(Endpoints()));
+    devices.emplace_back(std::move(device));
+}
+
+class TouchesMatterStackModel : public ListScreen::Model
+{
+    // We could override Action() and then hope focusIndex has not changed by
+    // the time our queued task runs, but it's cleaner to just capture its value
+    // now.
+    struct QueuedAction
+    {
+        QueuedAction(TouchesMatterStackModel * selfArg, int iArg) : self(selfArg), i(iArg) {}
+        TouchesMatterStackModel * self;
+        int i;
+    };
+
+    void ItemAction(int i) final
+    {
+        auto * action = chip::Platform::New<QueuedAction>(this, i);
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(QueuedActionHandler, reinterpret_cast<intptr_t>(action));
+    }
+
+    static void QueuedActionHandler(intptr_t closure)
+    {
+        auto * queuedAction = reinterpret_cast<QueuedAction *>(closure);
+        queuedAction->self->DoAction(queuedAction->i);
+        chip::Platform::Delete(queuedAction);
+    }
+
+    virtual void DoAction(int i) = 0;
+};
+
+class EditAttributeListModel : public TouchesMatterStackModel
+{
+    int deviceIndex;
+    int endpointIndex;
+    int clusterIndex;
+    int attributeIndex;
+
+public:
+    EditAttributeListModel(int deviceIndex, int endpointIndex, int clusterIndex, int attributeIndex) :
+        deviceIndex(deviceIndex), endpointIndex(endpointIndex), clusterIndex(clusterIndex), attributeIndex(attributeIndex)
+    {}
+    Attribute & attribute()
+    {
+        return std::get<1>(std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex])[clusterIndex])[attributeIndex];
+    }
+    bool IsBooleanAttribute()
+    {
+        auto & attribute = this->attribute();
+        auto & value     = std::get<1>(attribute);
+        return value == "On" || value == "Off" || value == "Yes" || value == "No";
+    }
+    virtual std::string GetTitle()
+    {
+        auto & attribute = this->attribute();
+        auto & name      = std::get<0>(attribute);
+        auto & value     = std::get<1>(attribute);
+        char buffer[64];
+        snprintf(buffer, sizeof(buffer), "%s : %s", name.c_str(), value.c_str());
+        return buffer;
+    }
+    virtual int GetItemCount() { return IsBooleanAttribute() ? 1 : 2; }
+    virtual std::string GetItemText(int i)
+    {
+        if (IsBooleanAttribute())
+        {
+            return "Toggle";
+        }
+        return i == 0 ? "+" : "-";
+    }
+
+    void DoAction(int i) override
+    {
+        auto & attribute = this->attribute();
+        auto & value     = std::get<1>(attribute);
+        int n;
+        if (sscanf(value.c_str(), "%d", &n) == 1)
+        {
+            auto & name = std::get<0>(attribute);
+
+            ESP_LOGI(TAG, "editing attribute as integer: %d (%s)", n, i == 0 ? "+" : "-");
+            n += (i == 0) ? 1 : -1;
+            char buffer[32];
+            sprintf(buffer, "%d", n);
+            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));
+            }
+            else if (name == "Color Current Level")
+            {
+                // update the current level here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Brightness changed to : %d", (n * 100 / 255));
+                app::Clusters::LevelControl::Attributes::CurrentLevel::Set(1, n);
+            }
+            else if (name == "Current Hue")
+            {
+                // update the current hue here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Hue changed to : %d", n * 360 / 254);
+                app::Clusters::ColorControl::Attributes::CurrentHue::Set(1, n);
+            }
+            else if (name == "Current Saturation")
+            {
+                // update the current saturation here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Saturation changed to : %d", n * 100 / 254);
+                app::Clusters::ColorControl::Attributes::CurrentSaturation::Set(1, n);
+            }
+            else if (name == "Illuminance")
+            {
+                // update the current illuminance here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Illuminance changed to : %d", n);
+                app::Clusters::IlluminanceMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(n));
+            }
+            else if (name == "Humidity")
+            {
+                // update the current humidity here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Humidity changed to : %d", n);
+                app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(n * 100));
+            }
+            else if (name == "OccupiedCoolingSetpoint")
+            {
+                ESP_LOGI(TAG, "OccupiedCoolingSetpoint changed to : %d", n);
+                app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::Set(1, static_cast<int16_t>(n * 100));
+            }
+            else if (name == "OccupiedHeatingSetpoint")
+            {
+                ESP_LOGI(TAG, "OccupiedHeatingSetpoint changed to : %d", n);
+                app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::Set(1, static_cast<int16_t>(n * 100));
+            }
+            else if (name == "SystemMode")
+            {
+                ESP_LOGI(TAG, "SystemMode changed to : %d", n);
+                app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::Set(1, n);
+            }
+            else if (name == "Current Lift")
+            {
+                // update the current lift here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Current position lift percent 100ths changed to : %d", n * 100);
+                app::Clusters::WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Set(1, static_cast<uint16_t>(n * 100));
+            }
+            else if (name == "Current Tilt")
+            {
+                // update the current tilt here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Current position tilt percent 100ths changed to : %d", n * 100);
+                app::Clusters::WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Set(1, static_cast<uint16_t>(n * 100));
+            }
+            else if (name == "Opr Status")
+            {
+                // update the operational status here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Operational status changed to : %d", n);
+                app::Clusters::WindowCovering::Attributes::OperationalStatus::Set(1, static_cast<uint8_t>(n));
+            }
+            else if (name == "Bat remaining")
+            {
+                // update the battery percent remaining here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Battery percent remaining changed to : %d", n);
+                app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::Set(1, static_cast<uint8_t>(n * 2));
+            }
+            value = buffer;
+        }
+        else if (IsBooleanAttribute())
+        {
+            auto & name    = std::get<0>(attribute);
+            auto & cluster = std::get<0>(std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex])[i]);
+
+            if (name == "OnOff" && cluster == "OnOff")
+            {
+                value                  = (value == "On") ? "Off" : "On";
+                uint8_t attributeValue = (value == "On") ? 1 : 0;
+                emberAfWriteServerAttribute(endpointIndex + 1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID,
+                                            (uint8_t *) &attributeValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+            }
+
+            if (name == "Occupancy" && cluster == "Occupancy Sensor")
+            {
+                value                  = (value == "Yes") ? "No" : "Yes";
+                uint8_t attributeValue = (value == "Yes") ? 1 : 0;
+                ESP_LOGI(TAG, "Occupancy changed to : %s", value.c_str());
+                // update the current occupancy here for hardcoded endpoint 1
+                app::Clusters::OccupancySensing::Attributes::Occupancy::Set(1, attributeValue);
+            }
+        }
+        else
+        {
+            auto & name    = std::get<0>(attribute);
+            auto & cluster = std::get<0>(std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex])[0]);
+
+            ESP_LOGI(TAG, "editing attribute as string: '%s' (%s)", value.c_str(), i == 0 ? "+" : "-");
+            ESP_LOGI(TAG, "name and cluster: '%s' (%s)", name.c_str(), cluster.c_str());
+            if (name == "State" && cluster == "Lock")
+            {
+                value = (value == "Closed") ? "Open" : "Closed";
+                using namespace chip::app::Clusters;
+                // update the doorlock attribute here
+                auto attributeValue = value == "Closed" ? DoorLock::DlLockState::kLocked : DoorLock::DlLockState::kUnlocked;
+                DoorLock::Attributes::LockState::Set(DOOR_LOCK_SERVER_ENDPOINT, attributeValue);
+            }
+            else if (name == "Charge level" && cluster == "Power Source")
+            {
+                using namespace chip::app::Clusters::PowerSource;
+                auto attributeValue = BatChargeLevel::kOk;
+
+                if (value == "OK")
+                {
+                    value          = "Warning";
+                    attributeValue = BatChargeLevel::kWarning;
+                }
+                else if (value == "Warning")
+                {
+                    value          = "Critical";
+                    attributeValue = BatChargeLevel::kCritical;
+                }
+                else
+                {
+                    value          = "OK";
+                    attributeValue = BatChargeLevel::kOk;
+                }
+
+                // update the battery charge level here for hardcoded endpoint 1
+                ESP_LOGI(TAG, "Battery charge level changed to : %u", static_cast<uint8_t>(attributeValue));
+                app::Clusters::PowerSource::Attributes::BatteryChargeLevel::Set(1, static_cast<uint8_t>(attributeValue));
+            }
+            else
+            {
+                value = (value == "Closed") ? "Open" : "Closed";
+            }
+        }
+    }
+};
+
+class AttributeListModel : public ListScreen::Model
+{
+    int deviceIndex;
+    int endpointIndex;
+    int clusterIndex;
+
+public:
+    AttributeListModel(int deviceIndex, int endpointIndex, int clusterIndex) :
+        deviceIndex(deviceIndex), endpointIndex(endpointIndex), clusterIndex(clusterIndex)
+    {}
+    virtual std::string GetTitle() { return "Attributes"; }
+    virtual int GetItemCount()
+    {
+        return std::get<1>(std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex])[clusterIndex]).size();
+    }
+    virtual std::string GetItemText(int i)
+    {
+        auto & attribute = std::get<1>(std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex])[clusterIndex])[i];
+        auto & name      = std::get<0>(attribute);
+        auto & value     = std::get<1>(attribute);
+        char buffer[64];
+        snprintf(buffer, sizeof(buffer), "%s : %s", name.c_str(), value.c_str());
+        return buffer;
+    }
+    virtual void ItemAction(int i)
+    {
+        ESP_LOGI(TAG, "Opening attribute %d", i);
+        ScreenManager::PushScreen(chip::Platform::New<ListScreen>(
+            chip::Platform::New<EditAttributeListModel>(deviceIndex, endpointIndex, clusterIndex, i)));
+    }
+};
+class ClusterListModel : public ListScreen::Model
+{
+    int deviceIndex;
+    int endpointIndex;
+
+public:
+    ClusterListModel(int deviceIndex, int endpointIndex) : deviceIndex(deviceIndex), endpointIndex(endpointIndex) {}
+    virtual std::string GetTitle() { return "Clusters"; }
+    virtual int GetItemCount() { return std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex]).size(); }
+    virtual std::string GetItemText(int i) { return std::get<0>(std::get<1>(std::get<1>(devices[deviceIndex])[endpointIndex])[i]); }
+    virtual void ItemAction(int i)
+    {
+        ESP_LOGI(TAG, "Opening cluster %d", i);
+        ScreenManager::PushScreen(
+            chip::Platform::New<ListScreen>(chip::Platform::New<AttributeListModel>(deviceIndex, endpointIndex, i)));
+    }
+};
+
+class EndpointListModel : public ListScreen::Model
+{
+    int deviceIndex;
+
+public:
+    EndpointListModel(int deviceIndex) : deviceIndex(deviceIndex) {}
+    virtual std::string GetTitle() { return "Endpoints"; }
+    virtual int GetItemCount() { return std::get<1>(devices[deviceIndex]).size(); }
+    virtual std::string GetItemText(int i) { return std::get<0>(std::get<1>(devices[deviceIndex])[i]); }
+    virtual void ItemAction(int i)
+    {
+        ESP_LOGI(TAG, "Opening endpoint %d", i);
+        ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<ClusterListModel>(deviceIndex, i)));
+    }
+};
+
+class DeviceListModel : public ListScreen::Model
+{
+public:
+    virtual std::string GetTitle() { return "Devices"; }
+    virtual int GetItemCount() { return devices.size(); }
+    virtual std::string GetItemText(int i) { return std::get<0>(devices[i]); }
+    virtual void ItemAction(int i)
+    {
+        ESP_LOGI(TAG, "Opening device %d", i);
+        ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<EndpointListModel>(i)));
+    }
+};
+
+class ActionListModel : public ListScreen::Model
+{
+    int GetItemCount() override { return static_cast<int>(mActions.size()); }
+    std::string GetItemText(int i) override { return mActions[i].title.c_str(); }
+    void ItemAction(int i) override
+    {
+        ESP_LOGI(TAG, "generic action %d", i);
+        mActions[i].action();
+    }
+
+protected:
+    void AddAction(const char * name, std::function<void(void)> action) { mActions.push_back(Action(name, action)); }
+
+private:
+    struct Action
+    {
+        std::string title;
+        std::function<void(void)> action;
+
+        Action(const char * t, std::function<void(void)> a) : title(t), action(a) {}
+    };
+
+    std::vector<Action> mActions;
+};
+
+class MdnsDebugListModel : public ActionListModel
+{
+public:
+    std::string GetTitle() override { return "mDNS Debug"; }
+
+    MdnsDebugListModel() { AddAction("(Re-)Init", std::bind(&MdnsDebugListModel::DoReinit, this)); }
+
+private:
+    void DoReinit()
+    {
+        CHIP_ERROR err = Dnssd::ServiceAdvertiser::Instance().Init(DeviceLayer::UDPEndPointManager());
+        if (err != CHIP_NO_ERROR)
+        {
+            ESP_LOGE(TAG, "Error initializing: %s", err.AsString());
+        }
+    }
+};
+
+class SetupListModel : public TouchesMatterStackModel
+{
+public:
+    SetupListModel()
+    {
+        std::string resetWiFi                   = "Reset WiFi";
+        std::string resetToFactory              = "Reset to factory";
+        std::string forceWiFiCommissioningBasic = "Force WiFi commissioning (basic)";
+        options.emplace_back(resetWiFi);
+        options.emplace_back(resetToFactory);
+        options.emplace_back(forceWiFiCommissioningBasic);
+    }
+    virtual std::string GetTitle() { return "Setup"; }
+    virtual int GetItemCount() { return options.size(); }
+    virtual std::string GetItemText(int i) { return options.at(i); }
+    void DoAction(int i) override
+    {
+        ESP_LOGI(TAG, "Opening options %d: %s", i, GetItemText(i).c_str());
+        if (i == 0)
+        {
+            ConnectivityMgr().ClearWiFiStationProvision();
+            chip::Server::GetInstance().GetFabricTable().DeleteAllFabrics();
+            chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow();
+        }
+        else if (i == 1)
+        {
+            chip::Server::GetInstance().ScheduleFactoryReset();
+        }
+        else if (i == 2)
+        {
+            chip::Server::GetInstance().GetFabricTable().DeleteAllFabrics();
+            auto & commissionMgr = chip::Server::GetInstance().GetCommissioningWindowManager();
+            commissionMgr.OpenBasicCommissioningWindow(commissionMgr.MaxCommissioningTimeout(),
+                                                       CommissioningWindowAdvertisement::kDnssdOnly);
+        }
+    }
+
+private:
+    std::vector<std::string> options;
+};
+class CustomScreen : public Screen
+{
+public:
+    virtual void Display()
+    {
+        TFT_drawCircle(0.3 * DisplayWidth, 0.3 * DisplayHeight, 8, TFT_BLUE);
+        TFT_drawCircle(0.7 * DisplayWidth, 0.3 * DisplayHeight, 8, TFT_BLUE);
+        TFT_drawLine(0.2 * DisplayWidth, 0.6 * DisplayHeight, 0.3 * DisplayWidth, 0.7 * DisplayHeight, TFT_BLUE);
+        TFT_drawLine(0.3 * DisplayWidth, 0.7 * DisplayHeight, 0.7 * DisplayWidth, 0.7 * DisplayHeight, TFT_BLUE);
+        TFT_drawLine(0.7 * DisplayWidth, 0.7 * DisplayHeight, 0.8 * DisplayWidth, 0.6 * DisplayHeight, TFT_BLUE);
+    }
+};
+
+void SetupPretendDevices()
+{
+    AddDevice("Watch");
+    AddEndpoint("Default");
+    AddCluster("Battery");
+    AddAttribute("Level", "89");
+    AddAttribute("Voltage", "490");
+    AddAttribute("Amperage", "501");
+    AddCluster("Heart Monitor");
+    AddAttribute("BPM", "72");
+    AddCluster("Step Counter");
+    AddAttribute("Steps", "9876");
+
+    AddDevice("Light Bulb");
+    AddEndpoint("1");
+    AddCluster("OnOff");
+    AddAttribute("OnOff", "Off");
+    AddCluster("Level Control");
+    AddAttribute("Current Level", "255");
+    AddEndpoint("2");
+    AddCluster("OnOff");
+    AddAttribute("OnOff", "Off");
+    AddCluster("Level Control");
+    AddAttribute("Current Level", "255");
+
+    AddDevice("Thermometer");
+    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));
+
+    AddDevice("Door Lock");
+    AddEndpoint("Default");
+    AddCluster("Lock");
+    AddAttribute("State", "Open");
+    // write the door lock state
+    chip::app::Clusters::DoorLock::Attributes::LockState::Set(DOOR_LOCK_SERVER_ENDPOINT,
+                                                              chip::app::Clusters::DoorLock::DlLockState::kUnlocked);
+    AddDevice("Garage 1");
+    AddEndpoint("Door 1");
+    AddCluster("Door");
+    AddAttribute("State", "Closed");
+    AddEndpoint("Door 2");
+    AddCluster("Door");
+    AddAttribute("State", "Closed");
+    AddEndpoint("Door 3");
+    AddCluster("Door");
+    AddAttribute("State", "Open");
+
+    AddDevice("Garage 2");
+    AddEndpoint("Door 1");
+    AddCluster("Door");
+    AddAttribute("State", "Open");
+    AddEndpoint("Door 2");
+    AddCluster("Door");
+    AddAttribute("State", "Closed");
+
+    AddDevice("Occupancy Sensor");
+    AddEndpoint("External");
+    AddCluster("Occupancy Sensor");
+    AddAttribute("Occupancy", "Yes");
+    app::Clusters::OccupancySensing::Attributes::Occupancy::Set(1, 1);
+
+    AddDevice("Contact Sensor");
+    AddEndpoint("External");
+    AddCluster("Contact Sensor");
+    AddAttribute("Contact", "true");
+    app::Clusters::BooleanState::Attributes::StateValue::Set(1, true);
+
+    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, 4);
+    AddAttribute("OccupiedCoolingSetpoint", "19");
+    app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::Set(1, static_cast<int16_t>(19 * 100));
+    AddAttribute("OccupiedHeatingSetpoint", "25");
+    app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::Set(1, static_cast<int16_t>(25 * 100));
+
+    AddDevice("Humidity Sensor");
+    AddEndpoint("External");
+    AddCluster("Humidity Sensor");
+    AddAttribute("Humidity", "30");
+    app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(30 * 100));
+
+    AddDevice("Light Sensor");
+    AddEndpoint("External");
+    AddCluster("Illuminance Measurement");
+    AddAttribute("Illuminance", "1000");
+    app::Clusters::IlluminanceMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(1000));
+
+    AddDevice("Color Light");
+    AddEndpoint("1");
+    AddCluster("OnOff");
+    AddAttribute("OnOff", "Off");
+    app::Clusters::OnOff::Attributes::OnOff::Set(1, false);
+    AddCluster("Level Control");
+    AddAttribute("Color Current Level", "255");
+    app::Clusters::LevelControl::Attributes::CurrentLevel::Set(1, 255);
+    AddEndpoint("2");
+    AddCluster("Color Control");
+    AddAttribute("Current Hue", "200");
+    app::Clusters::ColorControl::Attributes::CurrentHue::Set(1, 200);
+    AddAttribute("Current Saturation\n", "150");
+    app::Clusters::ColorControl::Attributes::CurrentSaturation::Set(1, 150);
+
+    AddDevice("Window Covering");
+    AddEndpoint("1");
+    AddCluster("Window Covering");
+    AddAttribute("Current Lift", "5");
+    app::Clusters::WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Set(1, static_cast<uint16_t>(5 * 100));
+    AddAttribute("Current Tilt", "5");
+    app::Clusters::WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Set(1, static_cast<uint16_t>(5 * 100));
+    AddAttribute("Opr Status", "0");
+    app::Clusters::WindowCovering::Attributes::OperationalStatus::Set(1, static_cast<uint8_t>(0));
+
+    AddDevice("Battery");
+    AddEndpoint("1");
+    AddCluster("Power Source");
+    AddAttribute("Bat remaining", "70");
+    app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::Set(1, static_cast<uint8_t>(70 * 2));
+    AddAttribute("Charge level", "0");
+    app::Clusters::PowerSource::Attributes::BatteryChargeLevel::Set(1, static_cast<uint8_t>(0));
+}
+
+esp_err_t InitM5Stack(std::string qrCodeText)
+{
+    esp_err_t err;
+    // Initialize the buttons.
+    err = gpio_install_isr_service(0);
+    ESP_RETURN_ON_ERROR(err, TAG, "Button preInit failed: %s", esp_err_to_name(err));
+    for (int i = 0; i < BUTTON_NUMBER; ++i)
+    {
+        err = gButtons[i].Init();
+        ESP_RETURN_ON_ERROR(err, TAG, "Button.Init() failed: %s", esp_err_to_name(err));
+    }
+    // Push a rudimentary user interface.
+    ScreenManager::PushScreen(chip::Platform::New<ListScreen>(
+        (chip::Platform::New<SimpleListModel>())
+            ->Title("CHIP")
+            ->Action([](int i) { ESP_LOGI(TAG, "action on item %d", i); })
+            ->Item("Devices",
+                   []() {
+                       ESP_LOGI(TAG, "Opening device list");
+                       ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<DeviceListModel>()));
+                   })
+            ->Item("mDNS Debug",
+                   []() {
+                       ESP_LOGI(TAG, "Opening MDNS debug");
+                       ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<MdnsDebugListModel>()));
+                   })
+            ->Item("QR Code",
+                   [=]() {
+                       ESP_LOGI(TAG, "Opening QR code screen");
+                       PrintOnboardingCodes(chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
+                       ScreenManager::PushScreen(chip::Platform::New<QRCodeScreen>(qrCodeText));
+                   })
+            ->Item("Setup",
+                   [=]() {
+                       ESP_LOGI(TAG, "Opening Setup list");
+                       ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<SetupListModel>()));
+                   })
+            ->Item("Status",
+                   [=]() {
+                       ESP_LOGI(TAG, "Opening Status screen");
+                       ScreenManager::PushScreen(chip::Platform::New<StatusScreen>());
+                   })
+            ->Item("Custom",
+                   []() {
+                       ESP_LOGI(TAG, "Opening custom screen");
+                       ScreenManager::PushScreen(chip::Platform::New<CustomScreen>());
+                   })
+            ->Item("More")
+            ->Item("Items")
+            ->Item("For")
+            ->Item("Demo")));
+    return ESP_OK;
+}
+#endif
+
+void InitDeviceDisplay()
+{
+    // Create buffer for QR code that can fit max size and null terminator.
+    char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
+    chip::MutableCharSpan qrCodeText(qrCodeBuffer);
+
+    // Get QR Code and emulate its content using NFC tag
+    GetQRCode(qrCodeText, chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
+
+    // Initialize the display device.
+    esp_err_t err = InitDisplay();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "InitDisplay() failed: %s", esp_err_to_name(err));
+        return;
+    }
+
+    // Initialize the screen manager
+    ScreenManager::Init();
+
+    // Connect the status LED to VLEDs.
+    int vled1 = ScreenManager::AddVLED(TFT_GREEN);
+    int vled2 = ScreenManager::AddVLED(TFT_RED);
+    statusLED1.SetVLED(vled1, vled2);
+
+    int vled3 = ScreenManager::AddVLED(TFT_CYAN);
+    int vled4 = ScreenManager::AddVLED(TFT_ORANGE);
+    statusLED2.SetVLED(vled3, vled4);
+
+    bluetoothLED.SetVLED(ScreenManager::AddVLED(TFT_BLUE));
+    wifiLED.SetVLED(ScreenManager::AddVLED(TFT_YELLOW));
+    pairingWindowLED.SetVLED(ScreenManager::AddVLED(TFT_ORANGE));
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+
+    InitM5Stack(qrCodeText.data());
+
+#elif CONFIG_DEVICE_TYPE_ESP32_WROVER_KIT
+
+    // Display the QR Code
+    QRCodeScreen qrCodeScreen(qrCodeText.data());
+    qrCodeScreen.Display();
+
+#endif
+}
+#endif
diff --git a/examples/tv-casting-app/darwin/darwin/SceneDelegate.h b/examples/all-clusters-minimal-app/esp32/main/Globals.cpp
similarity index 72%
rename from examples/tv-casting-app/darwin/darwin/SceneDelegate.h
rename to examples/all-clusters-minimal-app/esp32/main/Globals.cpp
index dd12a1c96cc3af..1334e818ceffdb 100644
--- a/examples/tv-casting-app/darwin/darwin/SceneDelegate.h
+++ b/examples/all-clusters-minimal-app/esp32/main/Globals.cpp
@@ -1,6 +1,7 @@
-/**
+/*
  *
- *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    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.
@@ -15,10 +16,10 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
+#include "Globals.h"
 
-@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
-
-@property (strong, nonatomic) UIWindow * window;
-
-@end
+LEDWidget statusLED1;
+LEDWidget statusLED2;
+BluetoothWidget bluetoothLED;
+WiFiWidget wifiLED;
+WiFiWidget pairingWindowLED;
diff --git a/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild
new file mode 100644
index 00000000000000..8791a80a443e71
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild
@@ -0,0 +1,149 @@
+#
+#    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.
+#
+#    Description:
+#      Configuration options CHIP ESP32 demo application.
+#
+
+menu "Demo"
+
+    choice
+        prompt "Device Type"
+        default DEVICE_TYPE_ESP32_DEVKITC if IDF_TARGET_ESP32
+        default DEVICE_TYPE_ESP32_C3_DEVKITM if IDF_TARGET_ESP32C3
+        help
+            Specifies the type of ESP32 device.
+
+            Note that the "ESP32-DevKitC" choice is compatible with a number of clone devices
+            available from third-party manufacturers.
+
+        config DEVICE_TYPE_ESP32_DEVKITC
+            bool "ESP32-DevKitC"
+            depends on IDF_TARGET_ESP32
+        config DEVICE_TYPE_ESP32_WROVER_KIT
+            bool "ESP32-WROVER-KIT_V4.1"
+            depends on IDF_TARGET_ESP32
+        config DEVICE_TYPE_M5STACK
+            bool "M5Stack"
+            depends on IDF_TARGET_ESP32
+        config DEVICE_TYPE_ESP32_C3_DEVKITM
+            bool "ESP32C3-DevKitM"
+            depends on IDF_TARGET_ESP32C3
+    endchoice
+
+    choice
+      prompt "Rendezvous Mode"
+      default RENDEZVOUS_MODE_BLE if BT_ENABLED
+      default RENDEZVOUS_MODE_SOFTAP
+      help
+          Specifies the Rendezvous mode of the peripheral.
+
+      config RENDEZVOUS_MODE_SOFTAP
+          bool "Soft-AP"
+      config RENDEZVOUS_MODE_BLE
+          bool "BLE"
+          depends on BT_ENABLED
+      config RENDEZVOUS_MODE_ON_NETWORK
+          bool "On-Network"
+      config RENDEZVOUS_MODE_SOFTAP_ON_NETWORK
+          bool "Soft-AP / On-Network"
+      config RENDEZVOUS_MODE_BLE_ON_NETWORK
+          bool "BLE / On-Network"
+    endchoice
+
+    config ECHO_HOST_IP
+        string "IPV4 address"
+        default "127.0.0.1"
+        depends on USE_ECHO_CLIENT
+        help
+            The IPV4 Address of the ECHO Server.
+
+    # NOTE: This config is not displayed as a input in the Kconfig menu, as its value is
+    # entirely derived from the Device Type choice.  However the CONFIG_EXAMPLE_DISPLAY_TYPE
+    # define that is produced is needed to configure the TFT library correctly.
+    config TFT_PREDEFINED_DISPLAY_TYPE
+        int
+        range 0 5
+        default 0 if DEVICE_TYPE_ESP32_DEVKITC
+        default 0 if DEVICE_TYPE_ESP32_C3_DEVKITM
+        default 3 if DEVICE_TYPE_M5STACK
+        default 4 if DEVICE_TYPE_ESP32_WROVER_KIT
+
+    config RENDEZVOUS_MODE
+       int
+       range 0 8
+       default 1 if RENDEZVOUS_MODE_SOFTAP
+       default 2 if RENDEZVOUS_MODE_BLE
+       default 4 if RENDEZVOUS_MODE_ON_NETWORK
+       default 5 if RENDEZVOUS_MODE_SOFTAP_ON_NETWORK
+       default 6 if RENDEZVOUS_MODE_BLE_ON_NETWORK
+
+    config DISPLAY_AUTO_OFF
+        bool "Automatically turn off the M5Stack's Display after a few seconds"
+        default "y"
+        depends on DEVICE_TYPE_M5STACK
+        help
+            To reduce wear and heat the M5Stack's Display is automatically switched off after a few seconds
+
+    config STATUS_LED_GPIO_NUM
+        int 
+        range 0 40
+        default 2 if DEVICE_TYPE_ESP32_DEVKITC         #Use LED1 (blue LED) as status LED on DevKitC      
+        default 8 if DEVICE_TYPE_ESP32_C3_DEVKITM
+        default 26 if DEVICE_TYPE_ESP32_WROVER_KIT     
+        default 40 if DEVICE_TYPE_M5STACK
+        help
+            Each board has a status led, define its pin number.
+
+endmenu
+
+menu "PW RPC Debug channel"
+depends on ENABLE_PW_RPC
+    config EXAMPLE_UART_PORT_NUM
+        int "UART port number"
+        range 0 2 if IDF_TARGET_ESP32
+        range 0 1 if IDF_TARGET_ESP32C3
+        default 0
+        help
+            UART communication port number for the example.
+            See UART documentation for available port numbers.
+
+    config EXAMPLE_UART_BAUD_RATE
+        int "UART communication speed"
+        range 1200 115200
+        default 115200
+        help
+            UART communication speed for Modbus example.
+
+    config EXAMPLE_UART_RXD
+        int "UART RXD pin number"
+        range 0 34 if IDF_TARGET_ESP32
+        range 0 19 if IDF_TARGET_ESP32C3
+        default 5
+        help
+            GPIO number for UART RX pin. See UART documentation for more information
+            about available pin numbers for UART.
+
+    config EXAMPLE_UART_TXD
+        int "UART TXD pin number"
+        range 0 34 if IDF_TARGET_ESP32
+        range 0 19 if IDF_TARGET_ESP32C3
+        default 4
+        help
+            GPIO number for UART TX pin. See UART documentation for more information
+            about available pin numbers for UART.
+
+endmenu
diff --git a/examples/all-clusters-minimal-app/esp32/main/LEDWidget.cpp b/examples/all-clusters-minimal-app/esp32/main/LEDWidget.cpp
new file mode 100644
index 00000000000000..13dcdc4893c2cf
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/LEDWidget.cpp
@@ -0,0 +1,287 @@
+/*
+ *
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file LEDWidget.cpp
+ *
+ * Implements an LED Widget controller that is usually tied to a GPIO
+ * It also updates the display widget if it's enabled
+ */
+
+#include "LEDWidget.h"
+
+#include "ScreenManager.h"
+
+#include "esp_log.h"
+#include "esp_system.h"
+#include "esp_timer.h"
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#include "driver/rmt.h"
+#include "led_strip.h"
+#define RMT_TX_DEFAULT_GPIO GPIO_NUM_8
+#define RMT_TX_DEFAULT_CHANNEL RMT_CHANNEL_0
+static led_strip_t * strip = NULL;
+#else
+#include "driver/ledc.h"
+#include "hal/ledc_types.h"
+#endif
+void LEDWidget::Init(gpio_num_t gpioNum)
+{
+    mLastChangeTimeUS = 0;
+    mBlinkOnTimeMS    = 0;
+    mBlinkOffTimeMS   = 0;
+    mGPIONum          = gpioNum;
+    mVLED1            = -1;
+    mVLED2            = -1;
+    mState            = false;
+    mError            = false;
+    errorTimer        = NULL;
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    if (gpioNum == RMT_TX_DEFAULT_GPIO)
+    {
+        rmt_config_t config = RMT_DEFAULT_CONFIG_TX(RMT_TX_DEFAULT_GPIO, RMT_TX_DEFAULT_CHANNEL);
+        config.clk_div      = 2;
+        rmt_config(&config);
+        rmt_driver_install(config.channel, 0, 0);
+        led_strip_config_t strip_config = LED_STRIP_DEFAULT_CONFIG(1, (led_strip_dev_t) config.channel);
+        strip                           = led_strip_new_rmt_ws2812(&strip_config);
+        mDefaultOnBrightness            = UINT8_MAX;
+        mHue                            = 0;
+        mSaturation                     = 0;
+    }
+#else
+    if (gpioNum < GPIO_NUM_MAX)
+    {
+        ledc_timer_config_t ledc_timer = {
+            .speed_mode      = LEDC_LOW_SPEED_MODE, // timer mode
+            .duty_resolution = LEDC_TIMER_8_BIT,    // resolution of PWM duty
+            .timer_num       = LEDC_TIMER_1,        // timer index
+            .freq_hz         = 5000,                // frequency of PWM signal
+            .clk_cfg         = LEDC_AUTO_CLK,       // Auto select the source clock
+        };
+        ledc_timer_config(&ledc_timer);
+        ledc_channel_config_t ledc_channel = {
+            .gpio_num   = gpioNum,
+            .speed_mode = LEDC_LOW_SPEED_MODE,
+            .channel    = LEDC_CHANNEL_0,
+            .intr_type  = LEDC_INTR_DISABLE,
+            .timer_sel  = LEDC_TIMER_1,
+            .duty       = 0,
+            .hpoint     = 0,
+        };
+        ledc_channel_config(&ledc_channel);
+        mDefaultOnBrightness = UINT8_MAX;
+    }
+#endif
+}
+
+void LEDWidget::Set(bool state)
+{
+    mBlinkOnTimeMS = mBlinkOffTimeMS = 0;
+    DoSet(state);
+}
+
+void LEDWidget::SetBrightness(uint8_t brightness)
+{
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    if (strip)
+    {
+        uint8_t red, green, blue;
+        HSB2rgb(mHue, mSaturation, brightness, red, green, blue);
+        strip->set_pixel(strip, 0, red, green, blue);
+        strip->refresh(strip, 100);
+    }
+#else
+    if (mGPIONum < GPIO_NUM_MAX)
+    {
+        ledc_set_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, brightness);
+        ledc_update_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0);
+    }
+#endif
+    if (brightness > 0)
+    {
+        mDefaultOnBrightness = brightness;
+    }
+#if CONFIG_HAVE_DISPLAY
+    if (mVLED1 != -1)
+    {
+        ScreenManager::SetVLED(mVLED1, mState);
+    }
+#endif // CONFIG_HAVE_DISPLAY
+}
+
+void LEDWidget::Blink(uint32_t changeRateMS)
+{
+    Blink(changeRateMS, changeRateMS);
+}
+
+void LEDWidget::Blink(uint32_t onTimeMS, uint32_t offTimeMS)
+{
+    mBlinkOnTimeMS  = onTimeMS;
+    mBlinkOffTimeMS = offTimeMS;
+    Animate();
+}
+
+void ClearErrorState(TimerHandle_t handle)
+{
+#if CONFIG_HAVE_DISPLAY
+    LEDWidget * pWidget = (LEDWidget *) pvTimerGetTimerID(handle);
+    pWidget->mError     = false;
+    if (pWidget->mVLED2 != -1)
+    {
+        ScreenManager::SetVLED(pWidget->mVLED2, false);
+    }
+#endif
+}
+
+void LEDWidget::BlinkOnError()
+{
+#if CONFIG_HAVE_DISPLAY
+    mError = true;
+    if (errorTimer != NULL)
+    {
+        xTimerDelete(errorTimer, 0);
+    }
+    errorTimer = xTimerCreate("ErrorTimer", pdMS_TO_TICKS(2000), false, this, ClearErrorState);
+    xTimerStart(errorTimer, 0);
+    if (mVLED2 != -1)
+    {
+        ScreenManager::SetVLED(mVLED2, true);
+    }
+#endif
+}
+
+void LEDWidget::Animate()
+{
+    if (mBlinkOnTimeMS != 0 && mBlinkOffTimeMS != 0)
+    {
+        int64_t nowUS            = ::esp_timer_get_time();
+        int64_t stateDurUS       = ((mState) ? mBlinkOnTimeMS : mBlinkOffTimeMS) * 1000LL;
+        int64_t nextChangeTimeUS = mLastChangeTimeUS + stateDurUS;
+
+        if (nowUS > nextChangeTimeUS)
+        {
+            DoSet(!mState);
+            mLastChangeTimeUS = nowUS;
+        }
+    }
+}
+
+void LEDWidget::DoSet(bool state)
+{
+    bool stateChange = (mState != state);
+    mState           = state;
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    if (strip)
+    {
+        uint8_t red, green, blue;
+        uint8_t brightness = state ? mDefaultOnBrightness : 0;
+        HSB2rgb(mHue, mSaturation, brightness, red, green, blue);
+        strip->set_pixel(strip, 0, red, green, blue);
+        strip->refresh(strip, 100);
+    }
+#else
+    if (mGPIONum < GPIO_NUM_MAX)
+    {
+        ledc_set_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, state ? mDefaultOnBrightness : 0);
+        ledc_update_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0);
+    }
+#endif
+    if (stateChange)
+    {
+#if CONFIG_HAVE_DISPLAY
+        if (mVLED1 != -1)
+        {
+            ScreenManager::SetVLED(mVLED1, mState);
+        }
+#endif
+    }
+}
+
+#if CONFIG_HAVE_DISPLAY
+void LEDWidget::SetVLED(int id1, int id2)
+{
+    mVLED1 = id1;
+    if (mVLED1 != -1)
+    {
+        ScreenManager::SetVLED(mVLED1, mState);
+    }
+    mVLED2 = id2;
+    if (mVLED2 != -1)
+    {
+        ScreenManager::SetVLED(mVLED2, mError);
+    }
+}
+#endif
+
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+void LEDWidget::SetColor(uint8_t Hue, uint8_t Saturation)
+{
+    uint8_t red, green, blue;
+    uint8_t brightness = mState ? mDefaultOnBrightness : 0;
+    mHue               = static_cast<uint16_t>(Hue) * 360 / 254;        // mHue [0, 360]
+    mSaturation        = static_cast<uint16_t>(Saturation) * 100 / 254; // mSaturation [0 , 100]
+
+    HSB2rgb(mHue, mSaturation, brightness, red, green, blue);
+    strip->set_pixel(strip, 0, red, green, blue);
+    strip->refresh(strip, 100);
+}
+
+void LEDWidget::HSB2rgb(uint16_t Hue, uint8_t Saturation, uint8_t brightness, uint8_t & red, uint8_t & green, uint8_t & blue)
+{
+    uint16_t i       = Hue / 60;
+    uint16_t rgb_max = brightness;
+    uint16_t rgb_min = rgb_max * (100 - Saturation) / 100;
+    uint16_t diff    = Hue % 60;
+    uint16_t rgb_adj = (rgb_max - rgb_min) * diff / 60;
+
+    switch (i)
+    {
+    case 0:
+        red   = rgb_max;
+        green = rgb_min + rgb_adj;
+        blue  = rgb_min;
+        break;
+    case 1:
+        red   = rgb_max - rgb_adj;
+        green = rgb_max;
+        blue  = rgb_min;
+        break;
+    case 2:
+        red   = rgb_min;
+        green = rgb_max;
+        blue  = rgb_min + rgb_adj;
+        break;
+    case 3:
+        red   = rgb_min;
+        green = rgb_max - rgb_adj;
+        blue  = rgb_max;
+        break;
+    case 4:
+        red   = rgb_min + rgb_adj;
+        green = rgb_min;
+        blue  = rgb_max;
+        break;
+    default:
+        red   = rgb_max;
+        green = rgb_min;
+        blue  = rgb_max - rgb_adj;
+        break;
+    }
+}
+#endif
diff --git a/examples/all-clusters-minimal-app/esp32/main/OpenThreadLaunch.cpp b/examples/all-clusters-minimal-app/esp32/main/OpenThreadLaunch.cpp
new file mode 100644
index 00000000000000..e3372456226e0b
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/OpenThreadLaunch.cpp
@@ -0,0 +1,111 @@
+/*
+ *
+ *    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 "OpenThreadLaunch.h"
+
+#include "sdkconfig.h"
+
+#if CONFIG_OPENTHREAD_ENABLED
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include "driver/uart.h"
+#include "esp_err.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_netif.h"
+#include "esp_netif_types.h"
+#include "esp_openthread.h"
+#include "esp_openthread_lock.h"
+#include "esp_openthread_netif_glue.h"
+#include "esp_openthread_types.h"
+#include "esp_vfs_eventfd.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "hal/uart_types.h"
+#include "openthread/instance.h"
+#include "openthread/logging.h"
+#include "openthread/platform/logging.h"
+#include "sdkconfig.h"
+
+#if CONFIG_IDF_TARGET_ESP32H2
+#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                                                      \
+    {                                                                                                                              \
+        .radio_mode = RADIO_MODE_NATIVE,                                                                                           \
+    }
+#else
+#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                                                      \
+    {                                                                                                                              \
+        .radio_mode = RADIO_MODE_UART_RCP,                    \
+        .radio_uart_config = {                                \
+            .port = 1,                                        \
+            .uart_config =                                    \
+                {                                             \
+                    .baud_rate = 115200,                      \
+                    .data_bits = UART_DATA_8_BITS,            \
+                    .parity = UART_PARITY_DISABLE,            \
+                    .stop_bits = UART_STOP_BITS_1,            \
+                    .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,    \
+                    .rx_flow_ctrl_thresh = 0,                 \
+                    .source_clk = UART_SCLK_APB,              \
+                },                                            \
+            .rx_pin = 4,                                      \
+            .tx_pin = 5,                                      \
+        },                                                                    \
+    }
+#endif
+
+#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                                                       \
+    {                                                                                                                              \
+        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                                                         \
+    }
+
+#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                                                       \
+    {                                                                                                                              \
+        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10,                                     \
+    }
+
+static void OpenThreadTask(void * aContext)
+{
+    esp_openthread_platform_config_t config = {
+        .radio_config = ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG(),
+        .host_config  = ESP_OPENTHREAD_DEFAULT_HOST_CONFIG(),
+        .port_config  = ESP_OPENTHREAD_DEFAULT_PORT_CONFIG(),
+    };
+
+    // Initialize the OpenThread stack
+    ESP_ERROR_CHECK(esp_openthread_init(&config));
+    (void) otLoggingSetLevel(OT_LOG_LEVEL_INFO);
+
+    // Run the main loop
+    esp_openthread_launch_mainloop();
+
+    esp_vfs_eventfd_unregister();
+    vTaskDelete(NULL);
+}
+
+void LaunchOpenThread()
+{
+    esp_vfs_eventfd_config_t eventfd_config = {
+        .max_fds = 3,
+    };
+    ESP_ERROR_CHECK(esp_vfs_eventfd_register(&eventfd_config));
+    xTaskCreate(OpenThreadTask, "ot", 10240, xTaskGetCurrentTaskHandle(), 5, NULL);
+}
+
+#endif // CONFIG_OPENTHREAD_ENABLED
diff --git a/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp b/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp
new file mode 100644
index 00000000000000..2130da0107f31d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp
@@ -0,0 +1,103 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file QRCodeScreen.cpp
+ *
+ * Screen which displays a QR code.
+ *
+ */
+
+#include "QRCodeScreen.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+// TODO organize includes below
+
+#include "esp_log.h"
+#include "esp_system.h"
+#include "esp_wifi.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+#include "qrcodegen.h"
+
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+
+// TODO need sensible library tag when put in library
+extern const char * TAG;
+
+namespace {
+
+constexpr int kVersion    = 4;
+constexpr int kModuleSize = 4;
+constexpr int kBorderSize = 1;
+
+color_t qrCodeColor = TFT_LIGHTGREY;
+
+}; // namespace
+
+QRCodeScreen::QRCodeScreen(std::string text, std::string title) : title(title)
+{
+    constexpr int qrCodeSize = qrcodegen_BUFFER_LEN_FOR_VERSION(kVersion);
+
+    // TODO check text length against max size permitted, or maybe adjust version used accordingly
+
+    std::vector<uint8_t> temp(qrCodeSize);
+    qrCode.resize(qrCodeSize);
+
+    if (!qrcodegen_encodeText(text.c_str(), temp.data(), qrCode.data(), qrcodegen_Ecc_LOW, kVersion, kVersion, qrcodegen_Mask_AUTO,
+                              true))
+    {
+        ESP_LOGE(TAG, "qrcodegen_encodeText() failed");
+        qrCode.clear();
+    }
+}
+
+void QRCodeScreen::Display()
+{
+    if (qrCode.empty())
+    {
+        return;
+    }
+
+    const uint8_t * data  = qrCode.data();
+    const int size        = qrcodegen_getSize(data);
+    const int displaySize = (2 * kBorderSize + size) * kModuleSize;
+    const int displayX    = (DisplayWidth - displaySize) / 2;
+    const int displayY    = ScreenTitleSafeTop + ((DisplayHeight - ScreenTitleSafeTop - ScreenTitleSafeBottom) - displaySize) / 2;
+
+    TFT_fillRect(displayX, displayY, displaySize, displaySize, qrCodeColor);
+
+    for (int y = 0; y < size; ++y)
+    {
+        for (int x = 0; x < size; ++x)
+        {
+            if (qrcodegen_getModule(data, x, y))
+            {
+                TFT_fillRect(displayX + (kBorderSize + x) * kModuleSize, displayY + (kBorderSize + y) * kModuleSize, kModuleSize,
+                             kModuleSize, TFT_BLACK);
+            }
+        }
+    }
+}
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/all-clusters-minimal-app/esp32/main/ShellCommands.cpp b/examples/all-clusters-minimal-app/esp32/main/ShellCommands.cpp
new file mode 100644
index 00000000000000..3c7b4822d21558
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/ShellCommands.cpp
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <ShellCommands.h>
+
+namespace chip {
+namespace Shell {
+
+Shell::Engine OnOffCommands::sSubShell;
+void OnOffCommands::Register()
+{
+    static const shell_command_t subCommands[] = { { &OnLightHandler, "on", "Usage: OnOff on endpoint-id" },
+                                                   { &OffLightHandler, "off", "Usage: OnOff off endpoint-id" },
+                                                   { &ToggleLightHandler, "toggle", "Usage: OnOff toggle endpoint-id" } };
+    sSubShell.RegisterCommands(subCommands, ArraySize(subCommands));
+
+    // Register the root `OnOff` command in the top-level shell.
+    static const shell_command_t onOffCommand = { &OnOffHandler, "OnOff", "OnOff commands" };
+
+    Engine::Root().RegisterCommands(&onOffCommand, 1);
+}
+
+Callback::Callback<OnDeviceConnected> CASECommands::sOnConnectedCallback(CASECommands::OnConnected, nullptr);
+Callback::Callback<OnDeviceConnectionFailure> CASECommands::sOnConnectionFailureCallback(CASECommands::OnConnectionFailure,
+                                                                                         nullptr);
+Shell::Engine CASECommands::sSubShell;
+void CASECommands::Register()
+{
+    static const shell_command_t subCommands[] = {
+        { &ConnectToNodeHandler, "connect", "Establish CASESession to a node, Usage: case connect <fabric-index> <node-id>" },
+    };
+    sSubShell.RegisterCommands(subCommands, ArraySize(subCommands));
+
+    static const shell_command_t CASECommand = { &CASEHandler, "case", "Case Commands" };
+    Engine::Root().RegisterCommands(&CASECommand, 1);
+}
+} // namespace Shell
+} // namespace chip
diff --git a/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp b/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp
new file mode 100644
index 00000000000000..55f42a32723823
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp
@@ -0,0 +1,189 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ * @file StatusScreen.cpp
+ *
+ * Screen which displays device state and status:
+ *      - Fabric Index : none | #
+ *      - Fabric ID : none | #
+ *      - Node ID : none | #
+ *      - UDP Port : #
+ *      - IPv4 : none | addr
+ *      - IPv6 LL : none | addr
+ *      - IPv6 ULA : none | addr
+ */
+
+#include "StatusScreen.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include "esp_log.h"
+#include "esp_system.h"
+#include "esp_wifi.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <app/server/Server.h>
+#include <lib/core/DataModelTypes.h>
+
+#define MAX_LENGTH_SMALL_FONT 30
+
+using namespace chip;
+
+class StatusListModel : public ListScreen::Model
+{
+public:
+    enum
+    {
+        kStatusItemFabricIndex,
+        kStatusItemFabricId,
+        kStatusItemNodeId,
+        kStatusItemPort,
+        kStatusItemIp4,
+        kStatusItemIp6LinkLocal,
+        kStatusItemIp6Ula,
+    };
+
+    StatusListModel()
+    {
+        options.emplace_back("FabricIndex : none");
+        options.emplace_back("FabricID : none");
+        options.emplace_back("NodeID : none");
+        options.emplace_back("UDP port : " + std::to_string(CHIP_PORT));
+        options.emplace_back("IPv4 : none");
+        options.emplace_back("IPv6 LL : none");
+        options.emplace_back("IPv6 ULA : none");
+    }
+
+    virtual std::string GetTitle() { return "Status"; }
+
+    virtual int GetItemCount() { return options.size(); }
+    virtual std::string GetItemText(int i)
+    {
+        std::string itemString = options.at(i);
+        switch (i)
+        {
+        case kStatusItemFabricIndex: {
+            for (const auto & fb : Server::GetInstance().GetFabricTable())
+            {
+                FabricIndex fabricIndex = fb.GetFabricIndex();
+                itemString              = "FabricIdx : " + std::to_string(fabricIndex);
+                break; // Only print first fabric for now
+            }
+            break;
+        }
+
+        case kStatusItemFabricId: {
+            for (const auto & fb : Server::GetInstance().GetFabricTable())
+            {
+                FabricId fabricId = fb.GetFabricId();
+                itemString        = "FabricID : " + std::to_string(fabricId);
+                break; // Only print first fabric for now
+            }
+            break;
+        }
+
+        case kStatusItemNodeId: {
+            for (const auto & fb : Server::GetInstance().GetFabricTable())
+            {
+                NodeId nodeId = fb.GetNodeId();
+                itemString    = "NodeID : " + std::to_string(nodeId);
+                break; // Only print first fabric for now
+            }
+            break;
+        }
+
+        case kStatusItemIp4: {
+            chip::Inet::IPAddress addr;
+            for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+            {
+                if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv4())
+                {
+                    char buf[Inet::IPAddress::kMaxStringLength];
+                    addr.ToString(buf);
+                    itemString = std::string(buf);
+                    break; // Only print first IPv4 address for now
+                }
+            }
+            break;
+        }
+
+        case kStatusItemIp6LinkLocal: {
+            chip::Inet::IPAddress addr;
+            for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+            {
+                if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv6LinkLocal())
+                {
+                    char buf[Inet::IPAddress::kMaxStringLength];
+                    addr.ToString(buf);
+                    itemString = std::string(buf);
+                    if (itemString.length() < MAX_LENGTH_SMALL_FONT)
+                    {
+                        TFT_setFont(SMALL_FONT, nullptr);
+                    }
+                    else
+                    {
+                        TFT_setFont(DEF_SMALL_FONT, nullptr);
+                    }
+                    break; // Only print first IPv6 LL for now
+                }
+            }
+            break;
+        }
+
+        case kStatusItemIp6Ula: {
+            chip::Inet::IPAddress addr;
+            for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+            {
+                if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv6ULA())
+                {
+                    char buf[Inet::IPAddress::kMaxStringLength];
+                    addr.ToString(buf);
+                    itemString = std::string(buf);
+                    if (itemString.length() < MAX_LENGTH_SMALL_FONT)
+                    {
+                        TFT_setFont(SMALL_FONT, nullptr);
+                    }
+                    else
+                    {
+                        TFT_setFont(DEF_SMALL_FONT, nullptr);
+                    }
+                    break; // Only print first IPv6 ULA for now
+                }
+            }
+            break;
+        }
+        }
+        ESP_LOGI("M5 UI", "Display status %d: %s", i, itemString.c_str());
+
+        return itemString;
+    }
+
+    virtual void ItemAction(int i) {}
+
+private:
+    std::vector<std::string> options;
+};
+
+StatusScreen::StatusScreen() : ListScreen(chip::Platform::New<StatusListModel>()) {}
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/all-clusters-minimal-app/esp32/main/WiFiWidget.cpp b/examples/all-clusters-minimal-app/esp32/main/WiFiWidget.cpp
new file mode 100644
index 00000000000000..07fa20d9186fe0
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/WiFiWidget.cpp
@@ -0,0 +1,68 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file WiFiWidget.cpp
+ *
+ * Implements a WiFi Widget controller that display the state of bluetooth
+ * connection on display.
+ */
+
+#include "ScreenManager.h"
+
+#include "WiFiWidget.h"
+
+#include "esp_log.h"
+#include "esp_system.h"
+
+extern const char * TAG;
+
+void WiFiWidget::Init()
+{
+#if CONFIG_HAVE_DISPLAY
+    mVLED = -1;
+#endif // CONFIG_HAVE_DISPLAY
+
+    mState = false;
+}
+
+void WiFiWidget::Set(bool state)
+{
+    bool stateChange = (mState != state);
+    mState           = state;
+    if (stateChange)
+    {
+#if CONFIG_HAVE_DISPLAY
+        if (mVLED != -1)
+        {
+            ScreenManager::SetVLED(mVLED, mState);
+        }
+#endif // CONFIG_HAVE_DISPLAY
+    }
+}
+
+#if CONFIG_HAVE_DISPLAY
+void WiFiWidget::SetVLED(int id)
+{
+    mVLED = id;
+    if (mVLED != -1)
+    {
+        ScreenManager::SetVLED(mVLED, mState);
+    }
+}
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/AppEvent.h b/examples/all-clusters-minimal-app/esp32/main/include/AppEvent.h
new file mode 100644
index 00000000000000..26b97ab86d5018
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/AppEvent.h
@@ -0,0 +1,51 @@
+/*
+ *
+ *    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 "esp_system.h"
+
+struct AppEvent;
+typedef void (*EventHandler)(AppEvent *);
+
+struct AppEvent
+{
+    enum AppEventTypes
+    {
+        kEventType_Button = 0,
+        kEventType_Timer,
+        kEventType_Light,
+        kEventType_Install,
+    };
+
+    uint16_t mType;
+
+    union
+    {
+        struct
+        {
+            uint8_t mPinNo;
+            uint8_t mAction;
+        } mButtonEvent;
+        struct
+        {
+            void * mContext;
+        } mTimerEvent;
+    };
+
+    EventHandler mHandler;
+};
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/AppTask.h b/examples/all-clusters-minimal-app/esp32/main/include/AppTask.h
new file mode 100644
index 00000000000000..3dd8b0bf121a5c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/AppTask.h
@@ -0,0 +1,51 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+#include "AppEvent.h"
+#include <platform/CHIPDeviceLayer.h>
+
+// Application-defined error codes in the CHIP_ERROR space.
+#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
+#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
+#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
+#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
+#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
+#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
+
+class AppTask
+{
+public:
+    CHIP_ERROR StartAppTask();
+    static void AppTaskMain(void * pvParameter);
+    void PostEvent(const AppEvent * event);
+    void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
+    static void ButtonPressedAction(AppEvent * aEvent);
+
+private:
+    CHIP_ERROR Init();
+    void DispatchEvent(AppEvent * event);
+    static AppTask sAppTask;
+    friend AppTask & GetAppTask(void);
+};
+
+inline AppTask & GetAppTask(void)
+{
+    return AppTask::sAppTask;
+}
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/BluetoothWidget.h b/examples/all-clusters-minimal-app/esp32/main/include/BluetoothWidget.h
new file mode 100644
index 00000000000000..93b636e9b3c083
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/BluetoothWidget.h
@@ -0,0 +1,36 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "Display.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+class BluetoothWidget
+{
+public:
+    void Init();
+    void Set(bool state);
+    void SetVLED(int id);
+
+private:
+    int mVLED;
+    bool mState;
+};
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/Button.h b/examples/all-clusters-minimal-app/esp32/main/include/Button.h
new file mode 100644
index 00000000000000..894052463afa2c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/Button.h
@@ -0,0 +1,89 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ * @file Button.h
+ *
+ * Describes a Button tied to a GPIO that provides debouncing
+ *
+ **/
+
+#pragma once
+
+#include "driver/gpio.h"
+#include "esp_log.h"
+#include "esp_system.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/timers.h"
+
+#define APP_BUTTON_PRESSED 0
+#define APP_BUTTON_RELEASED 1
+#define BUTTON_NUMBER 3
+class Button
+{
+public:
+    /**
+     * @brief
+     *  construct a button
+     */
+    Button();
+    /**
+     * @brief
+     *  construct a button with given GPIO number
+     */
+    Button(gpio_num_t gpioNum);
+    /**
+     * @brief
+     *  Initialize a button
+     * @return esp_err_t
+     */
+    esp_err_t Init();
+    /**
+     * @brief
+     *  Initialize a button with given GPIO number
+     * @param gpioNum           The GPIO pin this button should keep track of
+     * @return esp_err_t
+     */
+    esp_err_t Init(gpio_num_t gpioNum);
+    /**
+     * @brief
+     *  Get the pin number assosiate to a button
+     * @return gpio_num_t
+     */
+    inline gpio_num_t GetGPIONum();
+    /**
+     * @brief
+     *  Global Button debouncing Timer Callback function
+     */
+    static void TimerCallback(TimerHandle_t xTimer);
+    /**
+     * @brief
+     *  Button gpio isr
+     */
+    friend void IRAM_ATTR button_isr_handler(void * arg);
+
+private:
+    gpio_num_t mGPIONum;
+    TimerHandle_t mbuttonTimer; // FreeRTOS timers used for debouncing buttons
+};
+
+inline gpio_num_t Button::GetGPIONum()
+{
+    return mGPIONum;
+}
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h b/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h
new file mode 100644
index 00000000000000..db97219ed86c9e
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h
@@ -0,0 +1,53 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.h
+ *
+ * Implementations for the DeviceManager callbacks for this application
+ *
+ **/
+
+#pragma once
+
+#include <common/CHIPDeviceManager.h>
+#include <common/CommonDeviceCallbacks.h>
+
+class AppDeviceCallbacks : public CommonDeviceCallbacks
+{
+public:
+    virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                             uint8_t type, uint16_t size, uint8_t * value);
+
+private:
+    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    void OnColorControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+#endif
+    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint16_t size,
+                                               uint8_t * value);
+    bool mEndpointOnOffState[2];
+};
+
+class AppDeviceCallbacksDelegate : public DeviceCallbacksDelegate
+{
+public:
+    void OnIPv4ConnectivityEstablished(void) override;
+    void OnIPv4ConnectivityLost(void) override;
+};
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h b/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h
new file mode 100644
index 00000000000000..99e53e9be9dc4f
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h
@@ -0,0 +1,57 @@
+/*
+ *
+ *    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 "Button.h"
+#include "DeviceCallbacks.h"
+#include "Display.h"
+#include "Globals.h"
+#include "ListScreen.h"
+#include "QRCodeScreen.h"
+#include "ScreenManager.h"
+#include "StatusScreen.h"
+#include "esp_check.h"
+#include "esp_log.h"
+#include "esp_system.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include <string>
+#include <vector>
+
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/clusters/door-lock-server/door-lock-server.h>
+#include <app/server/Dnssd.h>
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/server/Server.h>
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+#define BUTTON_1_GPIO_NUM ((gpio_num_t) 39) // Left button on M5Stack
+#define BUTTON_2_GPIO_NUM ((gpio_num_t) 38) // Middle button on M5Stack
+#define BUTTON_3_GPIO_NUM ((gpio_num_t) 37) // Right button on M5Stack
+
+void SetupPretendDevices();
+esp_err_t InitM5Stack(std::string qrCodeText);
+#endif
+
+#if CONFIG_HAVE_DISPLAY
+void InitDeviceDisplay();
+#endif
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/Globals.h b/examples/all-clusters-minimal-app/esp32/main/include/Globals.h
new file mode 100644
index 00000000000000..b3d466a8a68bd0
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/Globals.h
@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "BluetoothWidget.h"
+#include "LEDWidget.h"
+#include "WiFiWidget.h"
+#include "transport/raw/MessageHeader.h"
+
+extern LEDWidget statusLED1;
+extern LEDWidget statusLED2;
+extern BluetoothWidget bluetoothLED;
+extern WiFiWidget wifiLED;
+extern const chip::NodeId kLocalNodeId;
+extern WiFiWidget pairingWindowLED;
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/LEDWidget.h b/examples/all-clusters-minimal-app/esp32/main/include/LEDWidget.h
new file mode 100644
index 00000000000000..8ce4323329854d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/LEDWidget.h
@@ -0,0 +1,78 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "Display.h"
+
+#include "driver/gpio.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/timers.h"
+
+#define STATUS_LED_GPIO_NUM ((gpio_num_t) CONFIG_STATUS_LED_GPIO_NUM)
+
+class LEDWidget
+{
+public:
+    void Init(gpio_num_t gpioNum);
+
+    void Set(bool state);
+
+    void SetStateMask(bool state);
+
+    void SetBrightness(uint8_t brightness);
+
+    void Blink(uint32_t changeRateMS);
+
+    void Blink(uint32_t onTimeMS, uint32_t offTimeMS);
+
+    void BlinkOnError();
+
+    void Animate();
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    void SetColor(uint8_t Hue, uint8_t Saturation);
+
+    void HSB2rgb(uint16_t Hue, uint8_t Saturation, uint8_t brightness, uint8_t & red, uint8_t & green, uint8_t & blue);
+#endif
+#if CONFIG_HAVE_DISPLAY
+    void SetVLED(int id1, int id2);
+#endif
+
+private:
+    int64_t mLastChangeTimeUS;
+    uint32_t mBlinkOnTimeMS;
+    uint32_t mBlinkOffTimeMS;
+    uint8_t mDefaultOnBrightness;
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+    uint16_t mHue;       // mHue [0, 360]
+    uint8_t mSaturation; // mSaturation [0, 100]
+#endif
+    gpio_num_t mGPIONum;
+    int mVLED1;
+    int mVLED2;
+    bool mState;
+    bool mError;
+    TimerHandle_t errorTimer;
+
+    void DoSet(bool state);
+
+    friend void ClearErrorState(TimerHandle_t);
+};
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/OpenThreadLaunch.h b/examples/all-clusters-minimal-app/esp32/main/include/OpenThreadLaunch.h
new file mode 100644
index 00000000000000..86b02d6328fdb5
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/OpenThreadLaunch.h
@@ -0,0 +1,20 @@
+/*
+ *
+ *    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.
+ */
+
+#pragma once
+
+void LaunchOpenThread();
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h b/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h
new file mode 100644
index 00000000000000..e24fcd86d81e1a
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h
@@ -0,0 +1,49 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file QRCodeScreen.h
+ *
+ * Screen which displays a QR code.
+ *
+ */
+
+#pragma once
+
+#include "Screen.h"
+#include "ScreenManager.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include <cstdint>
+#include <vector>
+
+class QRCodeScreen : public Screen
+{
+    std::vector<uint8_t> qrCode;
+    std::string title;
+
+public:
+    QRCodeScreen(std::string text, std::string title = "QR Code");
+
+    virtual std::string GetTitle() { return title; }
+
+    virtual void Display();
+};
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/ShellCommands.h b/examples/all-clusters-minimal-app/esp32/main/include/ShellCommands.h
new file mode 100644
index 00000000000000..aea17cca138523
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/ShellCommands.h
@@ -0,0 +1,210 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/CASESessionManager.h>
+#include <app/server/Server.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPEncoding.h>
+#include <lib/shell/Commands.h>
+#include <lib/shell/Engine.h>
+#include <lib/shell/commands/Help.h>
+#include <lib/support/CHIPArgParser.hpp>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+#if CONFIG_DEVICE_LAYER
+#include <platform/CHIPDeviceLayer.h>
+#endif
+
+namespace chip {
+namespace Shell {
+
+class OnOffCommands
+{
+public:
+    // delete the copy constructor
+    OnOffCommands(const OnOffCommands &) = delete;
+    // delete the move constructor
+    OnOffCommands(OnOffCommands &&) = delete;
+    // delete the assignment operator
+    OnOffCommands & operator=(const OnOffCommands &) = delete;
+
+    static OnOffCommands & GetInstance()
+    {
+        static OnOffCommands instance;
+        return instance;
+    }
+
+    // Register the OnOff commands
+    void Register();
+
+private:
+    OnOffCommands() {}
+
+    static CHIP_ERROR OnOffHandler(int argc, char ** argv)
+    {
+        if (argc == 0)
+        {
+            sSubShell.ForEachCommand(PrintCommandHelp, nullptr);
+            return CHIP_NO_ERROR;
+        }
+
+        CHIP_ERROR error = sSubShell.ExecCommand(argc, argv);
+
+        if (error != CHIP_NO_ERROR)
+        {
+            streamer_printf(streamer_get(), "Error: %" CHIP_ERROR_FORMAT "\r\n", error.Format());
+        }
+
+        return error;
+    }
+
+    static CHIP_ERROR OnLightHandler(int argc, char ** argv)
+    {
+        if (argc != 1)
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        chip::app::Clusters::OnOff::Attributes::OnOff::Set(atoi(argv[0]), 1);
+        return CHIP_NO_ERROR;
+    }
+
+    static CHIP_ERROR OffLightHandler(int argc, char ** argv)
+    {
+        if (argc != 1)
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        chip::app::Clusters::OnOff::Attributes::OnOff::Set(atoi(argv[0]), 0);
+        return CHIP_NO_ERROR;
+    }
+
+    static CHIP_ERROR ToggleLightHandler(int argc, char ** argv)
+    {
+        if (argc != 1)
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        bool value;
+        chip::app::Clusters::OnOff::Attributes::OnOff::Get(atoi(argv[0]), &value);
+        chip::app::Clusters::OnOff::Attributes::OnOff::Set(atoi(argv[0]), !value);
+        return CHIP_NO_ERROR;
+    }
+
+    static Shell::Engine sSubShell;
+};
+
+class CASECommands
+{
+public:
+    // delete the copy constructor
+    CASECommands(const CASECommands &) = delete;
+    // delete the move constructor
+    CASECommands(CASECommands &&) = delete;
+    // delete the assignment operator
+    CASECommands & operator=(const CASECommands &) = delete;
+
+    static CASECommands & GetInstance()
+    {
+        static CASECommands instance;
+        return instance;
+    }
+
+    // Register the CASESession commands
+    void Register();
+
+    void SetFabricInfo(FabricInfo * fabricInfo) { mFabricInfo = fabricInfo; }
+    void SetNodeId(NodeId nodeId) { mNodeId = nodeId; }
+    void SetOnConnecting(bool onConnecting) { mOnConnecting = onConnecting; }
+    FabricInfo * GetFabricInfo(void) { return mFabricInfo; }
+    NodeId GetNodeId(void) { return mNodeId; }
+    bool GetOnConnecting(void) { return mOnConnecting; }
+
+private:
+    CASECommands() {}
+    static void OnConnected(void * context, OperationalDeviceProxy * deviceProxy)
+    {
+        streamer_printf(streamer_get(), "Establish CASESession Success!\r\n");
+        GetInstance().SetOnConnecting(false);
+    }
+
+    static void OnConnectionFailure(void * context, PeerId peerId, CHIP_ERROR error)
+    {
+        streamer_printf(streamer_get(), "Establish CASESession Failure!\r\n");
+        GetInstance().SetOnConnecting(false);
+    }
+
+    static void ConnectToNode(intptr_t arg)
+    {
+        CASECommands * caseCommand              = reinterpret_cast<CASECommands *>(arg);
+        Server * server                         = &(chip::Server::GetInstance());
+        CASESessionManager * caseSessionManager = server->GetCASESessionManager();
+        if (caseSessionManager == nullptr)
+        {
+            ChipLogError(SecureChannel, "Can't get the CASESessionManager");
+            return;
+        }
+        caseSessionManager->FindOrEstablishSession(caseCommand->GetFabricInfo()->GetPeerIdForNode(caseCommand->GetNodeId()),
+                                                   &sOnConnectedCallback, &sOnConnectionFailureCallback);
+    }
+
+    static CHIP_ERROR ConnectToNodeHandler(int argc, char ** argv)
+    {
+        if (GetInstance().GetOnConnecting())
+        {
+            return CHIP_ERROR_INCORRECT_STATE;
+        }
+        const FabricIndex fabricIndex = static_cast<FabricIndex>(strtoul(argv[0], nullptr, 10));
+        FabricInfo * fabricInfo       = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
+
+        if (fabricInfo == nullptr)
+        {
+            streamer_printf(streamer_get(), "Can't get fabric information from FabricIndex\r\n");
+            return CHIP_ERROR_NOT_FOUND;
+        }
+        GetInstance().SetFabricInfo(fabricInfo);
+        GetInstance().SetNodeId(static_cast<NodeId>(strtoul(argv[1], nullptr, 10)));
+        streamer_printf(streamer_get(), "Try to establish CaseSession to NodeId:0x" ChipLogFormatX64 " on fabric index %d\r\n",
+                        ChipLogValueX64(GetInstance().GetNodeId()), fabricIndex);
+        GetInstance().SetOnConnecting(true);
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(ConnectToNode, reinterpret_cast<intptr_t>(&GetInstance()));
+        return CHIP_NO_ERROR;
+    }
+
+    static CHIP_ERROR CASEHandler(int argc, char ** argv)
+    {
+        if (argc == 0)
+        {
+            sSubShell.ForEachCommand(PrintCommandHelp, nullptr);
+            return CHIP_NO_ERROR;
+        }
+        CHIP_ERROR err = sSubShell.ExecCommand(argc, argv);
+        if (err != CHIP_NO_ERROR)
+        {
+            streamer_printf(streamer_get(), "Error: %" CHIP_ERROR_FORMAT "\r\n", err.Format());
+        }
+        return err;
+    }
+
+    static Callback::Callback<OnDeviceConnected> sOnConnectedCallback;
+    static Callback::Callback<OnDeviceConnectionFailure> sOnConnectionFailureCallback;
+    static Shell::Engine sSubShell;
+    FabricInfo * mFabricInfo = nullptr;
+    NodeId mNodeId           = 0;
+    bool mOnConnecting       = false;
+};
+
+} // namespace Shell
+} // namespace chip
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/StatusScreen.h b/examples/all-clusters-minimal-app/esp32/main/include/StatusScreen.h
new file mode 100644
index 00000000000000..621604804aa923
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/include/StatusScreen.h
@@ -0,0 +1,45 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ * @file StatusScreen.h
+ *
+ * Screen which displays a QR code.
+ *
+ */
+
+#pragma once
+
+#include "ListScreen.h"
+#include "ScreenManager.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include <cstdint>
+#include <vector>
+
+class StatusScreen : public ListScreen
+{
+
+public:
+    StatusScreen();
+
+    virtual ~StatusScreen() {}
+};
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/SceneDelegate.h b/examples/all-clusters-minimal-app/esp32/main/include/WiFiWidget.h
similarity index 65%
rename from examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/SceneDelegate.h
rename to examples/all-clusters-minimal-app/esp32/main/include/WiFiWidget.h
index dd12a1c96cc3af..986ab48b63ad4b 100644
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/SceneDelegate.h
+++ b/examples/all-clusters-minimal-app/esp32/main/include/WiFiWidget.h
@@ -1,6 +1,7 @@
-/**
+/*
  *
- *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,10 +16,21 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
+#pragma once
 
-@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+#include "Display.h"
 
-@property (strong, nonatomic) UIWindow * window;
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 
-@end
+class WiFiWidget
+{
+public:
+    void Init();
+    void Set(bool state);
+    void SetVLED(int id);
+
+private:
+    int mVLED;
+    bool mState;
+};
diff --git a/examples/all-clusters-minimal-app/esp32/main/main.cpp b/examples/all-clusters-minimal-app/esp32/main/main.cpp
new file mode 100644
index 00000000000000..483f00b41cf678
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/main/main.cpp
@@ -0,0 +1,151 @@
+/*
+ *
+ *    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 "AppTask.h"
+#include "BluetoothWidget.h"
+#include "DeviceCallbacks.h"
+#include "Globals.h"
+#include "LEDWidget.h"
+#include "OpenThreadLaunch.h"
+#include "QRCodeScreen.h"
+#include "ShellCommands.h"
+#include "WiFiWidget.h"
+#include "esp_heap_caps_init.h"
+#include "esp_log.h"
+#include "esp_netif.h"
+#include "esp_spi_flash.h"
+#include "esp_system.h"
+#include "esp_wifi.h"
+#include "nvs_flash.h"
+#include "platform/PlatformManager.h"
+#include "shell_extension/launch.h"
+#include <common/CHIPDeviceManager.h>
+
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/util/af.h>
+#include <binding-handler.h>
+#include <common/Esp32AppServer.h>
+
+#if CONFIG_HAVE_DISPLAY
+#include "DeviceWithDisplay.h"
+#endif
+
+#if CONFIG_ENABLE_PW_RPC
+#include "Rpc.h"
+#endif
+
+#if CONFIG_OPENTHREAD_ENABLED
+#include <platform/ThreadStackManager.h>
+#endif
+
+using namespace ::chip;
+using namespace ::chip::Shell;
+using namespace ::chip::DeviceManager;
+
+// Used to indicate that an IP address has been added to the QRCode
+#define EXAMPLE_VENDOR_TAG_IP 1
+
+const char * TAG = "all-clusters-minimal-app";
+
+static AppDeviceCallbacks EchoCallbacks;
+static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;
+namespace {
+
+class AppCallbacks : public AppDelegate
+{
+public:
+    void OnCommissioningSessionStarted() override { bluetoothLED.Set(true); }
+    void OnCommissioningSessionStopped() override
+    {
+        bluetoothLED.Set(false);
+        pairingWindowLED.Set(false);
+    }
+    void OnCommissioningWindowOpened() override { pairingWindowLED.Set(true); }
+    void OnCommissioningWindowClosed() override { pairingWindowLED.Set(false); }
+};
+
+AppCallbacks sCallbacks;
+
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+} // namespace
+
+static void InitServer(intptr_t context)
+{
+    Esp32AppServer::Init(&sCallbacks); // Init ZCL Data Model and CHIP App Server AND Initialize device attestation config
+
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+
+    InitBindingHandlers();
+#if CONFIG_DEVICE_TYPE_M5STACK
+    SetupPretendDevices();
+#endif
+}
+
+extern "C" void app_main()
+{
+    // Initialize the ESP NVS layer.
+    esp_err_t err = nvs_flash_init();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
+        return;
+    }
+#if CONFIG_ENABLE_PW_RPC
+    chip::rpc::Init();
+#endif
+
+    ESP_LOGI(TAG, "==================================================");
+    ESP_LOGI(TAG, "chip-esp32-all-cluster-demo starting");
+    ESP_LOGI(TAG, "==================================================");
+
+#if CONFIG_ENABLE_CHIP_SHELL
+    chip::LaunchShell();
+    OnOffCommands::GetInstance().Register();
+    CASECommands::GetInstance().Register();
+#endif // CONFIG_ENABLE_CHIP_SHELL
+
+#if CONFIG_OPENTHREAD_ENABLED
+    LaunchOpenThread();
+    ThreadStackMgr().InitThreadStack();
+#endif
+
+    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
+    CHIP_ERROR error              = deviceMgr.Init(&EchoCallbacks);
+    DeviceCallbacksDelegate::Instance().SetAppDelegate(&sAppDeviceCallbacksDelegate);
+    if (error != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "device.Init() failed: %s", ErrorStr(error));
+        return;
+    }
+
+    ESP_LOGI(TAG, "------------------------Starting App Task---------------------------");
+    error = GetAppTask().StartAppTask();
+    if (error != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "GetAppTask().StartAppTask() failed : %s", ErrorStr(error));
+    }
+
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast<intptr_t>(nullptr));
+}
+
+bool lowPowerClusterSleep()
+{
+    return true;
+}
diff --git a/examples/ipv6only-app/esp32/partitions.csv b/examples/all-clusters-minimal-app/esp32/partitions.csv
similarity index 57%
rename from examples/ipv6only-app/esp32/partitions.csv
rename to examples/all-clusters-minimal-app/esp32/partitions.csv
index b338ff11a11589..43acef25d0245d 100644
--- a/examples/ipv6only-app/esp32/partitions.csv
+++ b/examples/all-clusters-minimal-app/esp32/partitions.csv
@@ -1,6 +1,8 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
 nvs,      data, nvs,     ,        0x6000,
+otadata,  data, ota,     ,        0x2000,
 phy_init, data, phy,     ,        0x1000,
-# Factory partition size about 1.9MB
-factory,  app,  factory, ,        1945K,
+ota_0,    app,  ota_0,   ,        1500K,
+ota_1,    app,  ota_1,   ,        1500K,
+ot_storage, data, 0x3a,            , 0x2000,
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults
new file mode 100644
index 00000000000000..5f996f40946d68
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults
@@ -0,0 +1,55 @@
+#
+#    Copyright (c) 2020 Project CHIP Authors
+#    Copyright (c) 2018 Nest Labs, Inc.
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#    Description:
+#      Some useful defaults for the demo app configuration.
+#
+
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#enable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# Vendor and product id
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
+CONFIG_DEVICE_FIRMWARE_REVISION="prerelease"
+
+#enable debug shell
+CONFIG_ENABLE_CHIP_SHELL=y
+
+#enable lwIP route hooks
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig.old b/examples/all-clusters-minimal-app/esp32/sdkconfig.old
new file mode 100644
index 00000000000000..77d2115a14eb6d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/sdkconfig.old
@@ -0,0 +1,1551 @@
+#
+# Automatically generated file. DO NOT EDIT.
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
+CONFIG_IDF_CMAKE=y
+CONFIG_IDF_TARGET_ARCH_XTENSA=y
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
+
+#
+# SDK tool configuration
+#
+CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
+# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
+# end of SDK tool configuration
+
+#
+# Build type
+#
+CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
+# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
+CONFIG_APP_BUILD_GENERATE_BINARIES=y
+CONFIG_APP_BUILD_BOOTLOADER=y
+CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
+# end of Build type
+
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
+#
+# Bootloader config
+#
+CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
+CONFIG_BOOTLOADER_LOG_LEVEL=3
+# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
+# CONFIG_BOOTLOADER_FACTORY_RESET is not set
+# CONFIG_BOOTLOADER_APP_TEST is not set
+CONFIG_BOOTLOADER_WDT_ENABLE=y
+# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
+CONFIG_BOOTLOADER_WDT_TIME_MS=9000
+# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
+CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
+# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
+# end of Bootloader config
+
+#
+# Security features
+#
+# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
+# CONFIG_SECURE_BOOT is not set
+# CONFIG_SECURE_FLASH_ENC_ENABLED is not set
+# end of Security features
+
+#
+# Serial flasher config
+#
+CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
+# CONFIG_ESPTOOLPY_NO_STUB is not set
+# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
+# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+# end of Serial flasher config
+
+#
+# Partition Table
+#
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_MD5=y
+# end of Partition Table
+
+#
+# Demo
+#
+# CONFIG_DEVICE_TYPE_ESP32_DEVKITC is not set
+# CONFIG_DEVICE_TYPE_ESP32_WROVER_KIT is not set
+CONFIG_DEVICE_TYPE_M5STACK=y
+# CONFIG_RENDEZVOUS_MODE_SOFTAP is not set
+CONFIG_RENDEZVOUS_MODE_BLE=y
+# CONFIG_RENDEZVOUS_MODE_ON_NETWORK is not set
+# CONFIG_RENDEZVOUS_MODE_SOFTAP_ON_NETWORK is not set
+# CONFIG_RENDEZVOUS_MODE_BLE_ON_NETWORK is not set
+CONFIG_TFT_PREDEFINED_DISPLAY_TYPE=3
+CONFIG_RENDEZVOUS_MODE=2
+CONFIG_DISPLAY_AUTO_OFF=y
+CONFIG_STATUS_LED_GPIO_NUM=40
+CONFIG_DEINIT_BLE_ON_COMMISSIONING_COMPLETE=y
+# end of Demo
+
+#
+# Compiler options
+#
+CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
+# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
+# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
+# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2
+# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set
+CONFIG_COMPILER_HIDE_PATHS_MACROS=y
+# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
+# CONFIG_COMPILER_CXX_RTTI is not set
+CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
+# CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
+# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
+# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
+# CONFIG_COMPILER_DUMP_RTL_FILES is not set
+# end of Compiler options
+
+#
+# Component config
+#
+
+#
+# Application Level Tracing
+#
+# CONFIG_APPTRACE_DEST_JTAG is not set
+CONFIG_APPTRACE_DEST_NONE=y
+CONFIG_APPTRACE_LOCK_ENABLE=y
+# end of Application Level Tracing
+
+#
+# ESP-ASIO
+#
+# CONFIG_ASIO_SSL_SUPPORT is not set
+# end of ESP-ASIO
+
+#
+# Bluetooth
+#
+CONFIG_BT_ENABLED=y
+
+#
+# Bluetooth controller
+#
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+# CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
+# CONFIG_BTDM_CTRL_MODE_BTDM is not set
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=3
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
+CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
+CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
+CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3
+CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
+CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
+CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y
+# CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
+CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
+# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set
+
+#
+# MODEM SLEEP Options
+#
+# CONFIG_BTDM_CTRL_MODEM_SLEEP is not set
+# end of MODEM SLEEP Options
+
+CONFIG_BTDM_BLE_DEFAULT_SCA_250PPM=y
+CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y
+# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set
+# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set
+CONFIG_BTDM_SCAN_DUPL_TYPE=0
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
+CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
+CONFIG_BTDM_CTRL_HLI=y
+# end of Bluetooth controller
+
+# CONFIG_BT_BLUEDROID_ENABLED is not set
+CONFIG_BT_NIMBLE_ENABLED=y
+# CONFIG_BT_CONTROLLER_ONLY is not set
+
+#
+# NimBLE Options
+#
+CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set
+CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y
+# CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set
+CONFIG_BT_NIMBLE_LOG_LEVEL=1
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3
+CONFIG_BT_NIMBLE_MAX_BONDS=3
+CONFIG_BT_NIMBLE_MAX_CCCDS=8
+CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
+# CONFIG_BT_NIMBLE_PINNED_TO_CORE_1 is not set
+CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
+CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=y
+CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=y
+CONFIG_BT_NIMBLE_ROLE_BROADCASTER=y
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=y
+CONFIG_BT_NIMBLE_NVS_PERSIST=y
+CONFIG_BT_NIMBLE_SM_LEGACY=y
+CONFIG_BT_NIMBLE_SM_SC=y
+# CONFIG_BT_NIMBLE_DEBUG is not set
+# CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS is not set
+CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nimble"
+CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
+CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256
+CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
+CONFIG_BT_NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT=y
+CONFIG_BT_NIMBLE_RPA_TIMEOUT=900
+# CONFIG_BT_NIMBLE_MESH is not set
+CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y
+CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000
+# CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT is not set
+# CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
+CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
+# end of NimBLE Options
+# end of Bluetooth
+
+# CONFIG_BLE_MESH is not set
+
+#
+# CoAP Configuration
+#
+CONFIG_COAP_MBEDTLS_PSK=y
+# CONFIG_COAP_MBEDTLS_PKI is not set
+# CONFIG_COAP_MBEDTLS_DEBUG is not set
+CONFIG_COAP_LOG_DEFAULT_LEVEL=0
+# end of CoAP Configuration
+
+#
+# Driver configurations
+#
+
+#
+# ADC configuration
+#
+# CONFIG_ADC_FORCE_XPD_FSM is not set
+CONFIG_ADC_DISABLE_DAC=y
+# end of ADC configuration
+
+#
+# MCPWM configuration
+#
+# CONFIG_MCPWM_ISR_IN_IRAM is not set
+# end of MCPWM configuration
+
+#
+# SPI configuration
+#
+# CONFIG_SPI_MASTER_IN_IRAM is not set
+CONFIG_SPI_MASTER_ISR_IN_IRAM=y
+# CONFIG_SPI_SLAVE_IN_IRAM is not set
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+# end of SPI configuration
+
+#
+# TWAI configuration
+#
+# CONFIG_TWAI_ISR_IN_IRAM is not set
+# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set
+# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
+# end of TWAI configuration
+
+#
+# UART configuration
+#
+# CONFIG_UART_ISR_IN_IRAM is not set
+# end of UART configuration
+
+#
+# RTCIO configuration
+#
+# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set
+# end of RTCIO configuration
+
+#
+# GPIO Configuration
+#
+# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set
+# end of GPIO Configuration
+
+#
+# GDMA Configuration
+#
+# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_GDMA_ISR_IRAM_SAFE is not set
+# end of GDMA Configuration
+# end of Driver configurations
+
+#
+# eFuse Bit Manager
+#
+# CONFIG_EFUSE_CUSTOM_TABLE is not set
+# CONFIG_EFUSE_VIRTUAL is not set
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
+CONFIG_EFUSE_MAX_BLK_LEN=192
+# end of eFuse Bit Manager
+
+#
+# ESP-TLS
+#
+CONFIG_ESP_TLS_USING_MBEDTLS=y
+# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set
+# CONFIG_ESP_TLS_SERVER is not set
+# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
+# CONFIG_ESP_TLS_PSK_VERIFICATION is not set
+# CONFIG_ESP_TLS_INSECURE is not set
+# end of ESP-TLS
+
+#
+# ESP32-specific
+#
+CONFIG_ESP32_REV_MIN_0=y
+# CONFIG_ESP32_REV_MIN_1 is not set
+# CONFIG_ESP32_REV_MIN_2 is not set
+# CONFIG_ESP32_REV_MIN_3 is not set
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_TRAX is not set
+CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ESP32_ULP_COPROC_ENABLED is not set
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
+CONFIG_ESP32_DEBUG_OCDAWARE=y
+CONFIG_ESP32_BROWNOUT_DET=y
+CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set
+CONFIG_ESP32_BROWNOUT_DET_LVL=0
+CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
+# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set
+# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set
+# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
+CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
+# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set
+# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
+# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
+# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
+# end of ESP32-specific
+
+#
+# ADC-Calibration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# end of ADC-Calibration
+
+#
+# Common ESP-related
+#
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+# end of Common ESP-related
+
+#
+# Ethernet
+#
+CONFIG_ETH_ENABLED=y
+CONFIG_ETH_USE_ESP32_EMAC=y
+CONFIG_ETH_PHY_INTERFACE_RMII=y
+CONFIG_ETH_RMII_CLK_INPUT=y
+# CONFIG_ETH_RMII_CLK_OUTPUT is not set
+CONFIG_ETH_RMII_CLK_IN_GPIO=0
+CONFIG_ETH_DMA_BUFFER_SIZE=512
+CONFIG_ETH_DMA_RX_BUFFER_NUM=10
+CONFIG_ETH_DMA_TX_BUFFER_NUM=10
+CONFIG_ETH_USE_SPI_ETHERNET=y
+# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
+# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
+# CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set
+# CONFIG_ETH_USE_OPENETH is not set
+# end of Ethernet
+
+#
+# Event Loop Library
+#
+# CONFIG_ESP_EVENT_LOOP_PROFILING is not set
+CONFIG_ESP_EVENT_POST_FROM_ISR=y
+CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
+# end of Event Loop Library
+
+#
+# GDB Stub
+#
+# end of GDB Stub
+
+#
+# ESP HTTP client
+#
+CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+# CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
+CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y
+# end of ESP HTTP client
+
+#
+# HTTP Server
+#
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
+CONFIG_HTTPD_MAX_URI_LEN=512
+CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
+CONFIG_HTTPD_PURGE_BUF_LEN=32
+# CONFIG_HTTPD_LOG_PURGE_DATA is not set
+# CONFIG_HTTPD_WS_SUPPORT is not set
+# end of HTTP Server
+
+#
+# ESP HTTPS OTA
+#
+# CONFIG_OTA_ALLOW_HTTP is not set
+# end of ESP HTTPS OTA
+
+#
+# ESP HTTPS server
+#
+# CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
+# end of ESP HTTPS server
+
+#
+# Hardware Settings
+#
+
+#
+# MAC Config
+#
+CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y
+# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
+CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
+CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
+# end of MAC Config
+
+#
+# Sleep Config
+#
+CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
+CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
+# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
+# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
+# end of Sleep Config
+# end of Hardware Settings
+
+#
+# IPC (Inter-Processor Call)
+#
+CONFIG_ESP_IPC_TASK_STACK_SIZE=1536
+CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
+CONFIG_ESP_IPC_ISR_ENABLE=y
+# end of IPC (Inter-Processor Call)
+
+#
+# LCD and Touch Panel
+#
+
+#
+# LCD Peripheral Configuration
+#
+CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
+# end of LCD Peripheral Configuration
+# end of LCD and Touch Panel
+
+#
+# ESP NETIF Adapter
+#
+CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
+CONFIG_ESP_NETIF_TCPIP_LWIP=y
+# CONFIG_ESP_NETIF_LOOPBACK is not set
+CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=y
+# end of ESP NETIF Adapter
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
+# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
+CONFIG_ESP_PHY_MAX_TX_POWER=20
+CONFIG_ESP_PHY_REDUCE_TX_POWER=y
+# end of PHY
+
+#
+# Power Management
+#
+# CONFIG_PM_ENABLE is not set
+# end of Power Management
+
+#
+# ESP System Settings
+#
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set
+CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
+# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
+
+#
+# Memory protection
+#
+# end of Memory protection
+
+CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=5120
+CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
+# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
+# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
+CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
+CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_INT_WDT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_INT_WDT_CHECK_CPU1=y
+CONFIG_ESP_TASK_WDT=y
+# CONFIG_ESP_TASK_WDT_PANIC is not set
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
+CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
+CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
+# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
+CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y
+# end of ESP System Settings
+
+#
+# High resolution timer (esp_timer)
+#
+# CONFIG_ESP_TIMER_PROFILING is not set
+CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
+CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y
+CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
+CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1
+# CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set
+# CONFIG_ESP_TIMER_IMPL_FRC2 is not set
+CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
+# end of High resolution timer (esp_timer)
+
+#
+# Wi-Fi
+#
+CONFIG_ESP32_WIFI_ENABLED=y
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+CONFIG_ESP32_WIFI_NVS_ENABLED=y
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
+# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
+# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
+# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
+CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
+# end of Wi-Fi
+
+#
+# Core dump
+#
+# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set
+# CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set
+CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
+# end of Core dump
+
+#
+# FAT Filesystem support
+#
+# CONFIG_FATFS_CODEPAGE_DYNAMIC is not set
+CONFIG_FATFS_CODEPAGE_437=y
+# CONFIG_FATFS_CODEPAGE_720 is not set
+# CONFIG_FATFS_CODEPAGE_737 is not set
+# CONFIG_FATFS_CODEPAGE_771 is not set
+# CONFIG_FATFS_CODEPAGE_775 is not set
+# CONFIG_FATFS_CODEPAGE_850 is not set
+# CONFIG_FATFS_CODEPAGE_852 is not set
+# CONFIG_FATFS_CODEPAGE_855 is not set
+# CONFIG_FATFS_CODEPAGE_857 is not set
+# CONFIG_FATFS_CODEPAGE_860 is not set
+# CONFIG_FATFS_CODEPAGE_861 is not set
+# CONFIG_FATFS_CODEPAGE_862 is not set
+# CONFIG_FATFS_CODEPAGE_863 is not set
+# CONFIG_FATFS_CODEPAGE_864 is not set
+# CONFIG_FATFS_CODEPAGE_865 is not set
+# CONFIG_FATFS_CODEPAGE_866 is not set
+# CONFIG_FATFS_CODEPAGE_869 is not set
+# CONFIG_FATFS_CODEPAGE_932 is not set
+# CONFIG_FATFS_CODEPAGE_936 is not set
+# CONFIG_FATFS_CODEPAGE_949 is not set
+# CONFIG_FATFS_CODEPAGE_950 is not set
+CONFIG_FATFS_CODEPAGE=437
+CONFIG_FATFS_LFN_NONE=y
+# CONFIG_FATFS_LFN_HEAP is not set
+# CONFIG_FATFS_LFN_STACK is not set
+CONFIG_FATFS_FS_LOCK=0
+CONFIG_FATFS_TIMEOUT_MS=10000
+CONFIG_FATFS_PER_FILE_CACHE=y
+# CONFIG_FATFS_USE_FASTSEEK is not set
+# end of FAT Filesystem support
+
+#
+# Modbus configuration
+#
+CONFIG_FMB_COMM_MODE_TCP_EN=y
+CONFIG_FMB_TCP_PORT_DEFAULT=502
+CONFIG_FMB_TCP_PORT_MAX_CONN=5
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
+CONFIG_FMB_COMM_MODE_RTU_EN=y
+CONFIG_FMB_COMM_MODE_ASCII_EN=y
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_FMB_QUEUE_LENGTH=20
+CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
+CONFIG_FMB_SERIAL_BUF_SIZE=256
+CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
+CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
+CONFIG_FMB_PORT_TASK_PRIO=10
+# CONFIG_FMB_PORT_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_FMB_PORT_TASK_AFFINITY_CPU0=y
+# CONFIG_FMB_PORT_TASK_AFFINITY_CPU1 is not set
+CONFIG_FMB_PORT_TASK_AFFINITY=0x0
+CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT=y
+CONFIG_FMB_CONTROLLER_SLAVE_ID=0x00112233
+CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
+CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
+CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
+CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
+# CONFIG_FMB_TIMER_PORT_ENABLED is not set
+CONFIG_FMB_TIMER_GROUP=0
+CONFIG_FMB_TIMER_INDEX=0
+CONFIG_FMB_MASTER_TIMER_GROUP=0
+CONFIG_FMB_MASTER_TIMER_INDEX=0
+# CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
+# end of Modbus configuration
+
+#
+# FreeRTOS
+#
+# CONFIG_FREERTOS_UNICORE is not set
+CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
+CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y
+CONFIG_FREERTOS_CORETIMER_0=y
+# CONFIG_FREERTOS_CORETIMER_1 is not set
+CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
+CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
+# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
+CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
+CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
+# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
+CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
+CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
+# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
+# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
+CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
+# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
+# CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
+CONFIG_FREERTOS_DEBUG_OCDAWARE=y
+# CONFIG_FREERTOS_FPU_IN_ISR is not set
+CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
+# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
+# end of FreeRTOS
+
+#
+# Hardware Abstraction Layer (HAL) and Low Level (LL)
+#
+CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
+# CONFIG_HAL_ASSERTION_DISABLE is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_ENABLE is not set
+CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
+# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
+
+#
+# Heap memory debugging
+#
+CONFIG_HEAP_POISONING_DISABLED=y
+# CONFIG_HEAP_POISONING_LIGHT is not set
+# CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
+CONFIG_HEAP_TRACING_OFF=y
+# CONFIG_HEAP_TRACING_STANDALONE is not set
+# CONFIG_HEAP_TRACING_TOHOST is not set
+# CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
+# end of Heap memory debugging
+
+#
+# jsmn
+#
+# CONFIG_JSMN_PARENT_LINKS is not set
+# CONFIG_JSMN_STRICT is not set
+# end of jsmn
+
+#
+# libsodium
+#
+# end of libsodium
+
+#
+# Log output
+#
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
+# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
+# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
+CONFIG_LOG_MAXIMUM_LEVEL=3
+CONFIG_LOG_COLORS=y
+CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
+# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
+# end of Log output
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# CONFIG_LWIP_NETIF_API is not set
+# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
+CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
+# CONFIG_LWIP_L2_TO_L3_COPY is not set
+# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_TIMERS_ONDEMAND=y
+CONFIG_LWIP_MAX_SOCKETS=10
+# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
+# CONFIG_LWIP_SO_LINGER is not set
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_SO_REUSE_RXTOALL=y
+# CONFIG_LWIP_SO_RCVBUF is not set
+# CONFIG_LWIP_NETBUF_RECVINFO is not set
+CONFIG_LWIP_IP4_FRAG=y
+CONFIG_LWIP_IP6_FRAG=y
+# CONFIG_LWIP_IP4_REASSEMBLY is not set
+# CONFIG_LWIP_IP6_REASSEMBLY is not set
+# CONFIG_LWIP_IP_FORWARD is not set
+# CONFIG_LWIP_STATS is not set
+# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
+CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
+CONFIG_LWIP_GARP_TMR_INTERVAL=60
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
+CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
+CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
+# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
+
+#
+# DHCP server
+#
+CONFIG_LWIP_DHCPS=y
+CONFIG_LWIP_DHCPS_LEASE_UNIT=60
+CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
+# end of DHCP server
+
+# CONFIG_LWIP_AUTOIP is not set
+CONFIG_LWIP_IPV6=y
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
+# CONFIG_LWIP_IPV6_FORWARD is not set
+CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=0
+# CONFIG_LWIP_IPV6_DHCP6 is not set
+# CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
+CONFIG_LWIP_NETIF_LOOPBACK=y
+CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
+
+#
+# TCP
+#
+CONFIG_LWIP_MAX_ACTIVE_TCP=16
+CONFIG_LWIP_MAX_LISTENING_TCP=16
+CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
+CONFIG_LWIP_TCP_MAXRTX=12
+CONFIG_LWIP_TCP_SYNMAXRTX=12
+CONFIG_LWIP_TCP_MSS=1440
+CONFIG_LWIP_TCP_TMR_INTERVAL=250
+CONFIG_LWIP_TCP_MSL=60000
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
+CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+# CONFIG_LWIP_TCP_SACK_OUT is not set
+# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
+CONFIG_LWIP_TCP_OVERSIZE_MSS=y
+# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
+# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
+CONFIG_LWIP_TCP_RTO_TIME=1500
+# end of TCP
+
+#
+# UDP
+#
+CONFIG_LWIP_MAX_UDP_PCBS=16
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
+# end of UDP
+
+#
+# Checksums
+#
+# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set
+# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set
+CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y
+# end of Checksums
+
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
+CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
+CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+# CONFIG_LWIP_PPP_SUPPORT is not set
+CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
+CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
+# CONFIG_LWIP_SLIP_SUPPORT is not set
+
+#
+# ICMP
+#
+CONFIG_LWIP_ICMP=y
+# CONFIG_LWIP_MULTICAST_PING is not set
+# CONFIG_LWIP_BROADCAST_PING is not set
+# end of ICMP
+
+#
+# LWIP RAW API
+#
+CONFIG_LWIP_MAX_RAW_PCBS=16
+# end of LWIP RAW API
+
+#
+# SNTP
+#
+CONFIG_LWIP_SNTP_MAX_SERVERS=1
+# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+# end of SNTP
+
+CONFIG_LWIP_ESP_LWIP_ASSERT=y
+
+#
+# Hooks
+#
+# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set
+CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y
+# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set
+# CONFIG_LWIP_HOOK_IP6_ROUTE_NONE is not set
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set
+# CONFIG_LWIP_HOOK_ND6_GET_GW_NONE is not set
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+# CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set
+CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
+# end of Hooks
+
+# CONFIG_LWIP_DEBUG is not set
+# end of LWIP
+
+#
+# mbedTLS
+#
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
+# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
+# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
+# CONFIG_MBEDTLS_DEBUG is not set
+
+#
+# Certificate Bundle
+#
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
+# CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
+# end of Certificate Bundle
+
+CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_HARDWARE_AES=y
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+CONFIG_MBEDTLS_ROM_MD5=y
+# CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set
+# CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set
+CONFIG_MBEDTLS_HAVE_TIME=y
+# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
+CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y
+CONFIG_MBEDTLS_SHA512_C=y
+CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
+# CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set
+# CONFIG_MBEDTLS_TLS_CLIENT_ONLY is not set
+# CONFIG_MBEDTLS_TLS_DISABLED is not set
+CONFIG_MBEDTLS_TLS_SERVER=y
+CONFIG_MBEDTLS_TLS_CLIENT=y
+CONFIG_MBEDTLS_TLS_ENABLED=y
+
+#
+# TLS Key Exchange Methods
+#
+# CONFIG_MBEDTLS_PSK_MODES is not set
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
+# end of TLS Key Exchange Methods
+
+CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
+# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
+CONFIG_MBEDTLS_SSL_PROTO_TLS1=y
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
+# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
+CONFIG_MBEDTLS_SSL_ALPN=y
+CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
+CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y
+CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y
+CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
+
+#
+# Symmetric Ciphers
+#
+CONFIG_MBEDTLS_AES_C=y
+# CONFIG_MBEDTLS_CAMELLIA_C is not set
+# CONFIG_MBEDTLS_DES_C is not set
+CONFIG_MBEDTLS_RC4_DISABLED=y
+# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set
+# CONFIG_MBEDTLS_RC4_ENABLED is not set
+# CONFIG_MBEDTLS_BLOWFISH_C is not set
+# CONFIG_MBEDTLS_XTEA_C is not set
+CONFIG_MBEDTLS_CCM_C=y
+CONFIG_MBEDTLS_GCM_C=y
+# CONFIG_MBEDTLS_NIST_KW_C is not set
+# end of Symmetric Ciphers
+
+# CONFIG_MBEDTLS_RIPEMD160_C is not set
+
+#
+# Certificates
+#
+CONFIG_MBEDTLS_PEM_PARSE_C=y
+CONFIG_MBEDTLS_PEM_WRITE_C=y
+CONFIG_MBEDTLS_X509_CRL_PARSE_C=y
+CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
+# end of Certificates
+
+CONFIG_MBEDTLS_ECP_C=y
+CONFIG_MBEDTLS_ECDH_C=y
+CONFIG_MBEDTLS_ECDSA_C=y
+# CONFIG_MBEDTLS_ECJPAKE_C is not set
+CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
+CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+# CONFIG_MBEDTLS_POLY1305_C is not set
+# CONFIG_MBEDTLS_CHACHA20_C is not set
+# CONFIG_MBEDTLS_HKDF_C is not set
+# CONFIG_MBEDTLS_THREADING_C is not set
+# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
+# CONFIG_MBEDTLS_SECURITY_RISKS is not set
+# end of mbedTLS
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+CONFIG_MDNS_TASK_STACK_SIZE=4096
+# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_MDNS_TASK_AFFINITY_CPU0=y
+# CONFIG_MDNS_TASK_AFFINITY_CPU1 is not set
+CONFIG_MDNS_TASK_AFFINITY=0x0
+CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
+# CONFIG_MDNS_STRICT_MODE is not set
+CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
+# end of mDNS
+
+#
+# ESP-MQTT Configurations
+#
+CONFIG_MQTT_PROTOCOL_311=y
+CONFIG_MQTT_TRANSPORT_SSL=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
+# CONFIG_MQTT_MSG_ID_INCREMENTAL is not set
+# CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED is not set
+# CONFIG_MQTT_REPORT_DELETED_MESSAGES is not set
+# CONFIG_MQTT_USE_CUSTOM_CONFIG is not set
+# CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set
+# CONFIG_MQTT_CUSTOM_OUTBOX is not set
+# end of ESP-MQTT Configurations
+
+#
+# Newlib
+#
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set
+CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
+# CONFIG_NEWLIB_NANO_FORMAT is not set
+# end of Newlib
+
+#
+# NVS
+#
+# end of NVS
+
+#
+# OpenSSL
+#
+# CONFIG_OPENSSL_DEBUG is not set
+CONFIG_OPENSSL_ERROR_STACK=y
+# CONFIG_OPENSSL_ASSERT_DO_NOTHING is not set
+CONFIG_OPENSSL_ASSERT_EXIT=y
+# end of OpenSSL
+
+#
+# OpenThread
+#
+# CONFIG_OPENTHREAD_ENABLED is not set
+# end of OpenThread
+
+#
+# PThreads
+#
+CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY=y
+# CONFIG_PTHREAD_DEFAULT_CORE_0 is not set
+# CONFIG_PTHREAD_DEFAULT_CORE_1 is not set
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
+# end of PThreads
+
+#
+# SPI Flash driver
+#
+# CONFIG_SPI_FLASH_VERIFY_WRITE is not set
+# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
+CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
+# CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
+# CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
+CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
+CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
+CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
+CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
+# CONFIG_SPI_FLASH_SIZE_OVERRIDE is not set
+# CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set
+# CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set
+
+#
+# Auto-detect flash chips
+#
+CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y
+# end of Auto-detect flash chips
+
+CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y
+# end of SPI Flash driver
+
+#
+# SPIFFS Configuration
+#
+CONFIG_SPIFFS_MAX_PARTITIONS=3
+
+#
+# SPIFFS Cache Configuration
+#
+CONFIG_SPIFFS_CACHE=y
+CONFIG_SPIFFS_CACHE_WR=y
+# CONFIG_SPIFFS_CACHE_STATS is not set
+# end of SPIFFS Cache Configuration
+
+CONFIG_SPIFFS_PAGE_CHECK=y
+CONFIG_SPIFFS_GC_MAX_RUNS=10
+# CONFIG_SPIFFS_GC_STATS is not set
+CONFIG_SPIFFS_PAGE_SIZE=256
+CONFIG_SPIFFS_OBJ_NAME_LEN=32
+# CONFIG_SPIFFS_FOLLOW_SYMLINKS is not set
+CONFIG_SPIFFS_USE_MAGIC=y
+CONFIG_SPIFFS_USE_MAGIC_LENGTH=y
+CONFIG_SPIFFS_META_LENGTH=4
+CONFIG_SPIFFS_USE_MTIME=y
+
+#
+# Debug Configuration
+#
+# CONFIG_SPIFFS_DBG is not set
+# CONFIG_SPIFFS_API_DBG is not set
+# CONFIG_SPIFFS_GC_DBG is not set
+# CONFIG_SPIFFS_CACHE_DBG is not set
+# CONFIG_SPIFFS_CHECK_DBG is not set
+# CONFIG_SPIFFS_TEST_VISUALISATION is not set
+# end of Debug Configuration
+# end of SPIFFS Configuration
+
+#
+# TCP Transport
+#
+
+#
+# Websocket
+#
+CONFIG_WS_TRANSPORT=y
+CONFIG_WS_BUFFER_SIZE=1024
+# end of Websocket
+# end of TCP Transport
+
+#
+# Unity unit testing library
+#
+CONFIG_UNITY_ENABLE_FLOAT=y
+CONFIG_UNITY_ENABLE_DOUBLE=y
+# CONFIG_UNITY_ENABLE_64BIT is not set
+# CONFIG_UNITY_ENABLE_COLOR is not set
+CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
+# CONFIG_UNITY_ENABLE_FIXTURE is not set
+# CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
+# end of Unity unit testing library
+
+#
+# Virtual file system
+#
+CONFIG_VFS_SUPPORT_IO=y
+CONFIG_VFS_SUPPORT_DIR=y
+CONFIG_VFS_SUPPORT_SELECT=y
+CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_VFS_SUPPORT_TERMIOS=y
+
+#
+# Host File System I/O (Semihosting)
+#
+CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
+CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
+# end of Host File System I/O (Semihosting)
+# end of Virtual file system
+
+#
+# Wear Levelling
+#
+# CONFIG_WL_SECTOR_SIZE_512 is not set
+CONFIG_WL_SECTOR_SIZE_4096=y
+CONFIG_WL_SECTOR_SIZE=4096
+# end of Wear Levelling
+
+#
+# Wi-Fi Provisioning Manager
+#
+CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+# CONFIG_WIFI_PROV_BLE_BONDING is not set
+# end of Wi-Fi Provisioning Manager
+
+#
+# Supplicant
+#
+CONFIG_WPA_MBEDTLS_CRYPTO=y
+# CONFIG_WPA_WAPI_PSK is not set
+# CONFIG_WPA_SUITE_B_192 is not set
+# CONFIG_WPA_DEBUG_PRINT is not set
+# CONFIG_WPA_TESTING_OPTIONS is not set
+# CONFIG_WPA_WPS_STRICT is not set
+# CONFIG_WPA_11KV_SUPPORT is not set
+# end of Supplicant
+
+#
+# CHIP Core
+#
+
+#
+# General Options
+#
+CONFIG_MAX_EXCHANGE_CONTEXTS=8
+CONFIG_MAX_BINDINGS=8
+CONFIG_MAX_FABRICS=5
+CONFIG_MAX_PEER_NODES=16
+CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS=8
+# CONFIG_ENABLE_PW_RPC is not set
+CONFIG_USE_MINIMAL_MDNS=y
+CONFIG_ENABLE_CHIP_SHELL=y
+# CONFIG_DISABLE_IPV4 is not set
+CONFIG_BUILD_CHIP_TESTS=y
+# end of General Options
+
+#
+# Networking Options
+#
+CONFIG_NUM_TCP_ENDPOINTS=8
+CONFIG_NUM_UDP_ENDPOINTS=8
+CONFIG_MAX_CONNECTIONS=8
+CONFIG_DEFAULT_INCOMING_CONNECTION_IDLE_TIMEOUT=15000
+# end of Networking Options
+
+#
+# System Options
+#
+CONFIG_NUM_TIMERS=32
+# CONFIG_ENABLE_OTA_REQUESTOR is not set
+# end of System Options
+
+#
+# Security Options
+#
+CONFIG_MAX_SESSION_KEYS=8
+
+#
+# Debugging
+#
+# CONFIG_SECURITY_TEST_MODE is not set
+# CONFIG_DISABLE_PROVISIONING_AUTH is not set
+# end of Debugging
+# end of Security Options
+# end of CHIP Core
+
+#
+# CHIP Device Layer
+#
+
+#
+# General Options
+#
+CONFIG_CHIP_PROJECT_CONFIG=""
+CONFIG_CHIP_TASK_STACK_SIZE=8192
+CONFIG_CHIP_TASK_PRIORITY=1
+CONFIG_MAX_EVENT_QUEUE_SIZE=25
+CONFIG_SERVICE_DIRECTORY_CACHE_SIZE=512
+# CONFIG_ENABLE_EXTENDED_DISCOVERY is not set
+# CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE is not set
+# end of General Options
+
+#
+# Device Identification Options
+#
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
+CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION=0
+CONFIG_DEVICE_SOFTWARE_VERSION="v1.0"
+CONFIG_DEVICE_SOFTWARE_VERSION_NUMBER=1
+CONFIG_DEVICE_TYPE=0
+# end of Device Identification Options
+
+#
+# WiFi Station Options
+#
+CONFIG_ENABLE_WIFI_STATION=y
+CONFIG_DEFAULT_WIFI_SSID=""
+CONFIG_DEFAULT_WIFI_PASSWORD=""
+CONFIG_WIFI_STATION_RECONNECT_INTERVAL=5000
+CONFIG_MAX_SCAN_NETWORKS_RESULTS=10
+CONFIG_WIFI_SCAN_COMPLETION_TIMEOUT=10000
+CONFIG_WIFI_CONNECTIVITY_TIMEOUT=30000
+# end of WiFi Station Options
+
+#
+# WiFi AP Options
+#
+CONFIG_ENABLE_WIFI_AP=y
+CONFIG_WIFI_AP_SSID_PREFIX="MATTER-"
+CONFIG_WIFI_AP_CHANNEL=1
+CONFIG_WIFI_AP_MAX_STATIONS=4
+CONFIG_WIFI_AP_BEACON_INTERVAL=100
+CONFIG_WIFI_AP_IDLE_TIMEOUT=120000
+# end of WiFi AP Options
+
+#
+# BLE Options
+#
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_BLE_DEVICE_NAME_PREFIX="MATTER-"
+CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN=40
+CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX=40
+CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN=800
+CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX=800
+CONFIG_CHIPOBLE_SINGLE_CONNECTION=y
+# CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED is not set
+# end of BLE Options
+
+#
+# CHIP Trait Manager
+#
+CONFIG_ENABLE_TRAIT_MANAGER=y
+# end of CHIP Trait Manager
+
+#
+# Time Sync Options
+#
+CONFIG_ENABLE_SERVICE_DIRECTORY_TIME_SYNC=y
+# CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC is not set
+# end of Time Sync Options
+
+#
+# Service Provisioning Options
+#
+CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID=18B4300200000010
+CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT=10000
+CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT=10000
+# end of Service Provisioning Options
+
+#
+# Commissioning options
+#
+CONFIG_RENDEZVOUS_WAIT_FOR_COMMISSIONING_COMPLETE=0
+# CONFIG_ENABLE_ROTATING_DEVICE_ID is not set
+# CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER is not set
+# end of Commissioning options
+
+#
+# Testing Options
+#
+CONFIG_USE_TEST_SERIAL_NUMBER="TEST_SN"
+CONFIG_ENABLE_TEST_SETUP_PARAMS=y
+# CONFIG_ENABLE_FIXED_TUNNEL_SERVER is not set
+# CONFIG_LOG_PROVISIONING_HASH is not set
+# end of Testing Options
+
+#
+# Network Telemetry Options
+#
+CONFIG_ENABLE_WIFI_TELEMETRY=y
+# CONFIG_ENABLE_THREAD_TELEMETRY is not set
+# CONFIG_ENABLE_THREAD_TELEMETRY_FULL is not set
+# CONFIG_ENABLE_TUNNEL_TELEMETRY is not set
+# end of Network Telemetry Options
+
+#
+# Event Logging Options
+#
+CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=4096
+CONFIG_EVENT_LOGGING_PROD_BUFFER_SIZE=2048
+CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=1024
+CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=1024
+CONFIG_CHIP_ENABLE_SCHEMA_CHECK=y
+# end of Event Logging Options
+
+#
+# Matter OTA Image
+#
+# CONFIG_CHIP_OTA_IMAGE_BUILD is not set
+# end of Matter OTA Image
+
+#
+# External Platform
+#
+# CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM is not set
+# end of External Platform
+
+#
+# Matter Manufacturing Options
+#
+CONFIG_CHIP_FACTORY_NAMESPACE_PARTITION_LABEL="nvs"
+CONFIG_CHIP_CONFIG_NAMESPACE_PARTITION_LABEL="nvs"
+CONFIG_CHIP_COUNTERS_NAMESPACE_PARTITION_LABEL="nvs"
+# end of Matter Manufacturing Options
+# end of CHIP Device Layer
+
+#
+# TFT Display
+#
+CONFIG_TFT_PREDEFINED_DISPLAY_TYPE0=y
+# CONFIG_TFT_PREDEFINED_DISPLAY_TYPE1 is not set
+# CONFIG_TFT_PREDEFINED_DISPLAY_TYPE4 is not set
+# CONFIG_TFT_PREDEFINED_DISPLAY_TYPE2 is not set
+# CONFIG_TFT_PREDEFINED_DISPLAY_TYPE3 is not set
+# CONFIG_TFT_PREDEFINED_DISPLAY_TYPE5 is not set
+# CONFIG_TFT_PREDEFINED_DISPLAY_TYPE6 is not set
+CONFIG_TFT_DISPLAY_CONTROLLER_MODEL=0
+CONFIG_TFT_DISPLAY_CONTROLLER_ILI9341=y
+# CONFIG_TFT_DISPLAY_CONTROLLER_ILI9488 is not set
+# CONFIG_TFT_DISPLAY_CONTROLLER_ST7789V is not set
+# CONFIG_TFT_DISPLAY_CONTROLLER_ST7735 is not set
+# CONFIG_TFT_DISPLAY_CONTROLLER_ST7735R is not set
+# CONFIG_TFT_DISPLAY_CONTROLLER_ST7735B is not set
+CONFIG_TFT_DISPLAY_WIDTH=240
+CONFIG_TFT_DISPLAY_HEIGHT=320
+# CONFIG_TFT_RGB_BGR is not set
+CONFIG_TFT_TOUCH_CONTROLLER=0
+CONFIG_TFT_TOUCH_CONTROLLER0=y
+# CONFIG_TFT_TOUCH_CONTROLLER1 is not set
+# CONFIG_TFT_TOUCH_CONTROLLER2 is not set
+# CONFIG_TFT_INVERT_ROTATION1 is not set
+CONFIG_TFT_PIN_NUM_MOSI=23
+CONFIG_TFT_PIN_NUM_MISO=19
+CONFIG_TFT_PIN_NUM_CLK=18
+CONFIG_TFT_PIN_NUM_CS=5
+CONFIG_TFT_PIN_NUM_DC=26
+CONFIG_TFT_PIN_NUM_TCS=25
+CONFIG_TFT_PIN_NUM_RST=0
+CONFIG_TFT_PIN_NUM_BCKL=0
+# end of TFT Display
+# end of Component config
+
+#
+# Compatibility options
+#
+# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
+# end of Compatibility options
diff --git a/examples/ipv6only-app/esp32/sdkconfig.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig_c3devkit.defaults
similarity index 67%
rename from examples/ipv6only-app/esp32/sdkconfig.defaults
rename to examples/all-clusters-minimal-app/esp32/sdkconfig_c3devkit.defaults
index e4ce5edbb3c0fd..737935b166f98f 100644
--- a/examples/ipv6only-app/esp32/sdkconfig.defaults
+++ b/examples/all-clusters-minimal-app/esp32/sdkconfig_c3devkit.defaults
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2021 Project CHIP Authors
+#    Copyright (c) 2020 Project CHIP Authors
 #    Copyright (c) 2018 Nest Labs, Inc.
 #    All rights reserved.
 #
@@ -16,9 +16,11 @@
 #    limitations under the License.
 #
 #    Description:
-#      Some useful defaults for the demo app configuration.
+#      CI uses this to select the ESP32C3-DevKitM.
 #
-
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_IDF_TARGET_ESP32C3=y
+CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM=y
 
 # Default to 921600 baud when flashing and monitoring device
 CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -27,17 +29,21 @@ CONFIG_ESPTOOLPY_COMPRESSED=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 
-# UART
-CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1=y
-CONFIG_ESP_CONSOLE_UART_NUM=1
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
 
 #enable lwip ipv6 autoconfig
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+#enable lwIP route hooks
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 
-# Enable Pigweed RPC Library in CHIP
-CONFIG_ENABLE_PW_RPC=y
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults
new file mode 100644
index 00000000000000..6b3de5e5cfea51
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults
@@ -0,0 +1,66 @@
+#
+#    Copyright (c) 2020 Project CHIP Authors
+#    Copyright (c) 2018 Nest Labs, Inc.
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#    Description:
+#      CI uses this to select the ESP32 M5Stack.
+#
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_DEVICE_TYPE_M5STACK=y
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#enable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# Vendor and product id
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
+
+# Main task needs a bit more stack than the default
+# default is 3584, bump this up to 5k.
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=5120
+
+#enable debug shell
+CONFIG_ENABLE_CHIP_SHELL=y
+
+#enable lwIP route hooks
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+
+#disable Bluetooth modem sleep
+#enable it may cause GPIO ISR triggers continuously
+CONFIG_BTDM_CTRL_MODEM_SLEEP=n
+CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=n
+CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=n
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
new file mode 100644
index 00000000000000..5ffdd6672f1205
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
@@ -0,0 +1,70 @@
+#
+#    Copyright (c) 2020 Project CHIP Authors
+#    Copyright (c) 2018 Nest Labs, Inc.
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#    Description:
+#      CI uses this to select the ESP32 M5Stack.
+#
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_DEVICE_TYPE_M5STACK=y
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#enable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# Vendor and product id
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
+
+# Main task needs a bit more stack than the default
+# default is 3584, bump this up to 5k.
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=5120
+
+# PW RPC Debug channel
+CONFIG_EXAMPLE_UART_PORT_NUM=0
+CONFIG_EXAMPLE_UART_BAUD_RATE=115200
+CONFIG_EXAMPLE_UART_RXD=3
+CONFIG_EXAMPLE_UART_TXD=1
+CONFIG_ENABLE_PW_RPC=y
+
+# Disable shell
+CONFIG_ENABLE_CHIP_SHELL=n
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+
+
+#disable Bluetooth modem sleep
+#enable it may cause GPIO ISR triggers continuously
+CONFIG_BTDM_CTRL_MODEM_SLEEP=n
+CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=n
+CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=n
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/esp32/third_party/connectedhomeip b/examples/all-clusters-minimal-app/esp32/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/esp32/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/linux/.gn b/examples/all-clusters-minimal-app/linux/.gn
new file mode 100644
index 00000000000000..5d1ce757507582
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  import("//args.gni")
+}
diff --git a/examples/all-clusters-minimal-app/linux/AppOptions.cpp b/examples/all-clusters-minimal-app/linux/AppOptions.cpp
new file mode 100644
index 00000000000000..c3f80a2302a484
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/AppOptions.cpp
@@ -0,0 +1,77 @@
+/*
+ *
+ *    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 "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 kOptionDacProviderFilePath     = 0xFF01;
+constexpr uint16_t kOptionMinCommissioningTimeout = 0xFF02;
+
+static chip::Credentials::Examples::TestHarnessDACProvider mDacProvider;
+
+bool AppOptions::HandleOptions(const char * program, OptionSet * options, int identifier, const char * name, const char * value)
+{
+    bool retval = true;
+    switch (identifier)
+    {
+    case kOptionDacProviderFilePath:
+        mDacProvider.Init(value);
+        break;
+    case kOptionMinCommissioningTimeout: {
+        auto & commissionMgr = chip::Server::GetInstance().GetCommissioningWindowManager();
+        commissionMgr.OverrideMinCommissioningTimeout(chip::System::Clock::Seconds16(static_cast<uint16_t>(atoi(value))));
+        break;
+    }
+    default:
+        PrintArgError("%s: INTERNAL ERROR: Unhandled option: %s\n", program, name);
+        retval = false;
+        break;
+    }
+
+    return retval;
+}
+
+OptionSet * AppOptions::GetOptions()
+{
+    static OptionDef optionsDef[] = {
+        { "dac_provider", chip::ArgParser::kArgumentRequired, kOptionDacProviderFilePath },
+        { "min_commissioning_timeout", chip::ArgParser::kArgumentRequired, kOptionMinCommissioningTimeout },
+        {},
+    };
+
+    static OptionSet options = {
+        AppOptions::HandleOptions, optionsDef, "PROGRAM OPTIONS",
+        "  --dac_provider <filepath>\n"
+        "       A json file with data used by the example dac provider to validate device attestation procedure.\n"
+        "  --min_commissioning_timeout <value>\n"
+        "       The minimum time in seconds during which commissioning session establishment is allowed by the Node.\n"
+    };
+
+    return &options;
+}
+
+chip::Credentials::DeviceAttestationCredentialsProvider * AppOptions::GetDACProvider()
+{
+    return &mDacProvider;
+}
diff --git a/examples/all-clusters-minimal-app/linux/AppOptions.h b/examples/all-clusters-minimal-app/linux/AppOptions.h
new file mode 100644
index 00000000000000..3073c66176331f
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/AppOptions.h
@@ -0,0 +1,34 @@
+/*
+ *
+ *    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 "AppMain.h"
+
+#include <app/tests/suites/credentials/TestHarnessDACProvider.h>
+
+class AppOptions
+{
+public:
+    static chip::ArgParser::OptionSet * GetOptions();
+    static chip::Credentials::DeviceAttestationCredentialsProvider * GetDACProvider();
+
+private:
+    static bool HandleOptions(const char * program, chip::ArgParser::OptionSet * options, int identifier, const char * name,
+                              const char * value);
+};
diff --git a/examples/all-clusters-minimal-app/linux/BUILD.gn b/examples/all-clusters-minimal-app/linux/BUILD.gn
new file mode 100644
index 00000000000000..cc2714427d4f3e
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/BUILD.gn
@@ -0,0 +1,103 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+import("${build_root}/config/compiler/compiler.gni")
+
+import("${chip_root}/src/lib/lib.gni")
+import("${chip_root}/src/platform/device.gni")
+
+source_set("chip-all-clusters-common") {
+  sources = [
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
+    "AppOptions.cpp",
+    "include/tv-callbacks.cpp",
+    "include/tv-callbacks.h",
+    "main-common.cpp",
+  ]
+
+  deps = [
+    "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common",
+    "${chip_root}/examples/platform/linux:app-main",
+    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
+    "${chip_root}/src/lib",
+  ]
+
+  include_dirs =
+      [ "${chip_root}/examples/all-clusters-app/all-clusters-common/include" ]
+
+  cflags = [ "-Wconversion" ]
+
+  if (chip_build_libshell) {
+    defines = [ "ENABLE_CHIP_SHELL" ]
+  }
+}
+
+source_set("chip-lock-app-common") {
+  sources = [
+    "${chip_root}/examples/lock-app/linux/src/LockEndpoint.cpp",
+    "${chip_root}/examples/lock-app/linux/src/LockManager.cpp",
+    "${chip_root}/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp",
+  ]
+
+  deps =
+      [ "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common" ]
+
+  include_dirs = [ "${chip_root}/examples/lock-app/linux/include" ]
+
+  cflags = [ "-Wconversion" ]
+}
+
+executable("chip-all-clusters-minimal-app") {
+  sources = [ "main.cpp" ]
+
+  deps = [
+    ":chip-all-clusters-common",
+    ":chip-lock-app-common",
+    "${chip_root}/examples/platform/linux:app-main",
+  ]
+
+  cflags = [ "-Wconversion" ]
+
+  include_dirs =
+      [ "${chip_root}/examples/all-clusters-app/all-clusters-common/include" ]
+
+  output_dir = root_out_dir
+}
+
+if (chip_device_platform == "darwin") {
+  action("codesign") {
+    script = "entitlements/codesign.py"
+    public_deps = [ ":chip-all-clusters-minimal-app" ]
+
+    args = [
+      "--target_path",
+      rebase_path("${root_build_dir}/chip-all-clusters-minimal-app",
+                  root_build_dir),
+      "--log_path",
+      rebase_path("${root_build_dir}/codesign_log.txt", root_build_dir),
+    ]
+
+    output_name = "codesign_log.txt"
+    outputs = [ "${root_build_dir}/${output_name}" ]
+  }
+}
+
+group("linux") {
+  deps = []
+  deps += [ ":chip-all-clusters-minimal-app" ]
+}
diff --git a/examples/all-clusters-minimal-app/linux/Dockerfile b/examples/all-clusters-minimal-app/linux/Dockerfile
new file mode 100644
index 00000000000000..697ae5fe2d0087
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/Dockerfile
@@ -0,0 +1,23 @@
+#
+#   Copyright (c) 2020 Project CHIP Authors
+#   All rights reserved.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+from generic_node_image
+RUN apt-get install -y libglib2.0
+COPY out/debug/chip-all-clusters-minimal-app /usr/bin/
+COPY entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh", "server"]
diff --git a/examples/all-clusters-minimal-app/linux/args.gni b/examples/all-clusters-minimal-app/linux/args.gni
new file mode 100644
index 00000000000000..dc89c1c4d16b31
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/args.gni
@@ -0,0 +1,25 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/config/standalone/args.gni")
+
+chip_device_project_config_include = "<CHIPProjectAppConfig.h>"
+chip_project_config_include = "<CHIPProjectAppConfig.h>"
+chip_system_project_config_include = "<SystemProjectConfig.h>"
+
+chip_project_config_include_dirs =
+    [ "${chip_root}/examples/all-clusters-minimal-app/linux/include" ]
+chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
diff --git a/examples/all-clusters-minimal-app/linux/build_overrides b/examples/all-clusters-minimal-app/linux/build_overrides
new file mode 120000
index 00000000000000..e578e73312ebd1
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/build_overrides
@@ -0,0 +1 @@
+../../build_overrides
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/linux/entitlements/codesign.py b/examples/all-clusters-minimal-app/linux/entitlements/codesign.py
new file mode 100644
index 00000000000000..2cf51a1cfa5b9e
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/entitlements/codesign.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env -S python3 -B
+
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import argparse
+import subprocess
+import re
+
+
+def run_command(command):
+    print("Running {}".format(command))
+    return str(subprocess.check_output(command.split()))
+
+
+def get_identity():
+    command = "/usr/bin/security find-identity -v -p codesigning"
+    command_result = run_command(command)
+
+    failure_str = "Error: 0 valid identities found"
+    if failure_str in command_result:
+        print(
+            "No valid identity has been found. Application will run without entitlements.")
+        exit(0)
+
+    command_result = command_result.replace("\\n", "\n")
+    identity = re.search(r'\b[0-9a-fA-F]{40}\b(?![^\n]*\(CSSMERR_TP_CERT_EXPIRED\))', command_result)
+    if identity is None:
+        print(
+            "No valid identity has been found. Application will run without entitlements.")
+        exit(0)
+
+    return identity.group()
+
+
+def codesign(args):
+    command = "codesign --force -d --sign {identity} {target}".format(
+        identity=get_identity(),
+        target=args.target_path)
+    command_result = run_command(command)
+
+    print("Codesign Result: {}".format(command_result))
+    with open(args.log_path, "w") as f:
+        f.write(command_result)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Codesign the binary')
+    parser.add_argument(
+        '--log_path', help='Output log file destination', required=True)
+    parser.add_argument('--target_path', help='Binary to sign', required=True)
+
+    args = parser.parse_args()
+    codesign(args)
diff --git a/examples/all-clusters-minimal-app/linux/entrypoint.sh b/examples/all-clusters-minimal-app/linux/entrypoint.sh
new file mode 100755
index 00000000000000..0d54ba0a11c681
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/entrypoint.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+#
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -ex
+
+service dbus start
+sleep 1
+/usr/sbin/otbr-agent -I wpan0 spinel+hdlc+uart:///dev/ttyUSB0 &
+sleep 1
+ot-ctl panid 0x1234
+ot-ctl ifconfig up
+ot-ctl thread start
+
+chip-all-clusters-minimal-app
diff --git a/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp b/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp
new file mode 100644
index 00000000000000..b1736826ef335a
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp
@@ -0,0 +1,80 @@
+/*
+ *    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 "AppMain.h"
+#include <app/server/Server.h>
+
+using namespace chip;
+using namespace chip::DeviceLayer;
+
+void CleanShutdown()
+{
+    Server::GetInstance().Shutdown();
+    PlatformMgr().Shutdown();
+    // TODO: We don't Platform::MemoryShutdown because ~CASESessionManager calls
+    // Dnssd::ResolverProxy::Shutdown, which starts doing Platform::Delete.
+    // Platform::MemoryShutdown();
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
+{
+    static bool matterStackInitialized = false;
+    if (!matterStackInitialized)
+    {
+        // Might be simpler to do ChipLinuxAppInit() with argc == 0, argv set to
+        // just a fake executable name?
+        VerifyOrDie(Platform::MemoryInit() == CHIP_NO_ERROR);
+        VerifyOrDie(PlatformMgr().InitChipStack() == CHIP_NO_ERROR);
+
+        // ChipLinuxAppMainLoop blocks, and we don't want that here.
+        static chip::CommonCaseDeviceServerInitParams initParams;
+        (void) initParams.InitializeStaticResourcesBeforeServerInit();
+        VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
+
+        ApplicationInit();
+
+        // We don't start the event loop task, because we don't plan to deliver
+        // data on a separate thread.
+
+        matterStackInitialized = true;
+
+        // The fuzzer does not have a way to tell us when it's done, so just
+        // shut down things on exit.
+        atexit(CleanShutdown);
+    }
+
+    // For now, just dump the data as a UDP payload into the session manager.
+    // But maybe we should try to separately extract a PeerAddress and data from
+    // the incoming data?
+    Transport::PeerAddress peerAddr;
+    System::PacketBufferHandle buf =
+        System::PacketBufferHandle::NewWithData(aData, aSize, /* aAdditionalSize = */ 0, /* aReservedSize = */ 0);
+    if (buf.IsNull())
+    {
+        // Too big; we couldn't represent this as a packetbuffer to start with.
+        return 0;
+    }
+
+    // Ignoring the return value from OnMessageReceived, because we might be
+    // passing it all sorts of garbage that will cause it to fail.
+    Server::GetInstance().GetSecureSessionManager().OnMessageReceived(peerAddr, std::move(buf));
+
+    // Now process pending events until our sentinel is reached.
+    PlatformMgr().ScheduleWork([](intptr_t) { PlatformMgr().StopEventLoopTask(); });
+    PlatformMgr().RunEventLoop();
+    return 0;
+}
diff --git a/examples/all-clusters-minimal-app/linux/include/CHIPProjectAppConfig.h b/examples/all-clusters-minimal-app/linux/include/CHIPProjectAppConfig.h
new file mode 100644
index 00000000000000..b6c15f4c98230e
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/include/CHIPProjectAppConfig.h
@@ -0,0 +1,34 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ *    @file
+ *          Example project configuration file for CHIP.
+ *
+ *          This is a place to put application or project-specific overrides
+ *          to the default configuration values for general CHIP features.
+ *
+ */
+
+#pragma once
+
+// include the CHIPProjectConfig from config/standalone
+#include <CHIPProjectConfig.h>
+
+// Allows app options (ports) to be configured on launch of app
+#define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
diff --git a/examples/all-clusters-minimal-app/linux/include/tv-callbacks.cpp b/examples/all-clusters-minimal-app/linux/include/tv-callbacks.cpp
new file mode 100644
index 00000000000000..33a8154e9be6d7
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/include/tv-callbacks.cpp
@@ -0,0 +1,30 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/****************************************************************************
+ * @file
+ * @brief Routines for TV stubs
+ *server stub implementation of TV cluster code.
+ *******************************************************************************
+ ******************************************************************************/
+
+#include "tv-callbacks.h"
+
+bool LowPowerManager::HandleSleep()
+{
+    return true;
+}
diff --git a/examples/all-clusters-minimal-app/linux/include/tv-callbacks.h b/examples/all-clusters-minimal-app/linux/include/tv-callbacks.h
new file mode 100644
index 00000000000000..1ee3f4264370af
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/include/tv-callbacks.h
@@ -0,0 +1,31 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/****************************************************************************
+ * @file
+ * @brief Routines for TV stubs
+ *server stub implementation of TV cluster code.
+ *******************************************************************************
+ ******************************************************************************/
+
+#include <app/clusters/low-power-server/low-power-server.h>
+
+class LowPowerManager : public chip::app::Clusters::LowPower::Delegate
+{
+public:
+    bool HandleSleep() override;
+};
diff --git a/examples/all-clusters-minimal-app/linux/main-common.cpp b/examples/all-clusters-minimal-app/linux/main-common.cpp
new file mode 100644
index 00000000000000..7829f3a6c1894a
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/main-common.cpp
@@ -0,0 +1,185 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "include/tv-callbacks.h"
+#include <app-common/zap-generated/att-storage.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/CommandHandler.h>
+#include <app/clusters/identify-server/identify-server.h>
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/server/Server.h>
+#include <app/util/af.h>
+#include <lib/support/CHIPMem.h>
+#include <new>
+#include <platform/Linux/NetworkCommissioningDriver.h>
+#include <platform/PlatformManager.h>
+#include <system/SystemPacketBuffer.h>
+#include <transport/SessionManager.h>
+#include <transport/raw/PeerAddress.h>
+
+#include <Options.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::DeviceLayer;
+
+namespace {
+static LowPowerManager lowPowerManager;
+} // namespace
+
+bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * commandObj)
+{
+    emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS);
+    return true;
+}
+
+void OnIdentifyStart(::Identify *)
+{
+    ChipLogProgress(Zcl, "OnIdentifyStart");
+}
+
+void OnIdentifyStop(::Identify *)
+{
+    ChipLogProgress(Zcl, "OnIdentifyStop");
+}
+
+void OnTriggerEffect(::Identify * identify)
+{
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE:
+        ChipLogProgress(Zcl, "EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE");
+        break;
+    default:
+        ChipLogProgress(Zcl, "No identifier effect");
+        return;
+    }
+}
+
+static Identify gIdentify0 = {
+    chip::EndpointId{ 0 }, OnIdentifyStart, OnIdentifyStop, EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED, OnTriggerEffect,
+};
+
+static Identify gIdentify1 = {
+    chip::EndpointId{ 1 }, OnIdentifyStart, OnIdentifyStop, EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED, OnTriggerEffect,
+};
+
+// Network commissioning
+namespace {
+// This file is being used by platforms other than Linux, so we need this check to disable related features since we only
+// implemented them on linux.
+constexpr EndpointId kNetworkCommissioningEndpointMain      = 0;
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+NetworkCommissioning::LinuxThreadDriver sLinuxThreadDriver;
+Clusters::NetworkCommissioning::Instance sThreadNetworkCommissioningInstance(kNetworkCommissioningEndpointMain,
+                                                                             &sLinuxThreadDriver);
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+NetworkCommissioning::LinuxWiFiDriver sLinuxWiFiDriver;
+Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(kNetworkCommissioningEndpointSecondary,
+                                                                           &sLinuxWiFiDriver);
+#endif
+NetworkCommissioning::LinuxEthernetDriver sLinuxEthernetDriver;
+Clusters::NetworkCommissioning::Instance sEthernetNetworkCommissioningInstance(kNetworkCommissioningEndpointMain,
+                                                                               &sLinuxEthernetDriver);
+#else  // CHIP_DEVICE_LAYER_TARGET_LINUX
+Clusters::NetworkCommissioning::NullNetworkDriver sNullNetworkDriver;
+Clusters::NetworkCommissioning::Instance sNullNetworkCommissioningInstance(kNetworkCommissioningEndpointMain, &sNullNetworkDriver);
+#endif // CHIP_DEVICE_LAYER_TARGET_LINUX
+} // namespace
+
+void ApplicationInit()
+{
+    (void) kNetworkCommissioningEndpointMain;
+    // Enable secondary endpoint only when we need it, this should be applied to all platforms.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+    const bool kThreadEnabled = {
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+        LinuxDeviceOptions::GetInstance().mThread
+#else
+        false
+#endif
+    };
+
+    const bool kWiFiEnabled = {
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        LinuxDeviceOptions::GetInstance().mWiFi
+#else
+        false
+#endif
+    };
+
+    if (kThreadEnabled && kWiFiEnabled)
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+        sThreadNetworkCommissioningInstance.Init();
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        sWiFiNetworkCommissioningInstance.Init();
+#endif
+        // Only enable secondary endpoint for network commissioning cluster when both WiFi and Thread are enabled.
+        emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, true);
+    }
+    else if (kThreadEnabled)
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+        sThreadNetworkCommissioningInstance.Init();
+#endif
+    }
+    else if (kWiFiEnabled)
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        // If we only enable WiFi on this device, "move" WiFi instance to main NetworkCommissioning cluster endpoint.
+        sWiFiNetworkCommissioningInstance.~Instance();
+        new (&sWiFiNetworkCommissioningInstance)
+            Clusters::NetworkCommissioning::Instance(kNetworkCommissioningEndpointMain, &sLinuxWiFiDriver);
+        sWiFiNetworkCommissioningInstance.Init();
+#endif
+    }
+    else
+#endif // CHIP_DEVICE_LAYER_TARGET_LINUX
+    {
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+        sEthernetNetworkCommissioningInstance.Init();
+#else
+        // Use NullNetworkCommissioningInstance to disable the network commissioning functions.
+        sNullNetworkCommissioningInstance.Init();
+#endif
+    }
+}
+
+void emberAfLowPowerClusterInitCallback(EndpointId endpoint)
+{
+    ChipLogProgress(Zcl, "TV Linux App: LowPower::SetDefaultDelegate");
+    chip::app::Clusters::LowPower::SetDefaultDelegate(endpoint, &lowPowerManager);
+}
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/main.m b/examples/all-clusters-minimal-app/linux/main.cpp
similarity index 60%
rename from examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/main.m
rename to examples/all-clusters-minimal-app/linux/main.cpp
index 17c6551eaa5408..ec71f22c42cc0c 100644
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/main.m
+++ b/examples/all-clusters-minimal-app/linux/main.cpp
@@ -1,6 +1,7 @@
-/**
+/*
  *
- *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,15 +16,17 @@
  *    limitations under the License.
  */
 
-#import "AppDelegate.h"
-#import <UIKit/UIKit.h>
+#include "AppMain.h"
+#include "AppOptions.h"
+#include "binding-handler.h"
 
 int main(int argc, char * argv[])
 {
-    NSString * appDelegateClassName;
-    @autoreleasepool {
-        // Setup code that might create autoreleased objects goes here.
-        appDelegateClassName = NSStringFromClass([AppDelegate class]);
-    }
-    return UIApplicationMain(argc, argv, nil, appDelegateClassName);
+    VerifyOrDie(ChipLinuxAppInit(argc, argv, AppOptions::GetOptions()) == 0);
+    VerifyOrDie(InitBindingHandlers() == CHIP_NO_ERROR);
+
+    LinuxDeviceOptions::GetInstance().dacProvider = AppOptions::GetDACProvider();
+
+    ChipLinuxAppMainLoop();
+    return 0;
 }
diff --git a/examples/all-clusters-minimal-app/linux/third_party/connectedhomeip b/examples/all-clusters-minimal-app/linux/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/linux/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/mbed/.gitignore b/examples/all-clusters-minimal-app/mbed/.gitignore
new file mode 100644
index 00000000000000..ef564644de9016
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/.gitignore
@@ -0,0 +1,2 @@
+build-*/
+mcuboot
diff --git a/examples/all-clusters-minimal-app/mbed/CMakeLists.txt b/examples/all-clusters-minimal-app/mbed/CMakeLists.txt
new file mode 100644
index 00000000000000..e77c80fda2f3cb
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/CMakeLists.txt
@@ -0,0 +1,84 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0)
+
+get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH)
+get_filename_component(MBED_COMMON ${CHIP_ROOT}/examples/platform/mbed REALPATH)
+get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
+get_filename_component(ALL_CLUSTERS_COMMON ${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common REALPATH)
+get_filename_component(NLIO_ROOT ${CHIP_ROOT}/third_party/nlio/repo/include REALPATH)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/chip_build/config
+    @ONLY
+)
+
+set(MBED_PATH ${MBED_OS_PATH} CACHE INTERNAL "")
+set(MBED_CONFIG_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
+set(MCUBOOT_PATH ${MBED_MCU_BOOT_PATH} CACHE INTERNAL "")
+set(APP_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
+set(APP_TYPE ${MBED_APP_TYPE} CACHE INTERNAL "")
+set(BOOT_ENABLED FALSE)
+set(APP_TARGET chip-mbed-all-clusters-minimal-app-example)
+
+if(APP_TYPE STREQUAL "boot" OR APP_TYPE STREQUAL "upgrade")
+    set(BOOT_ENABLED TRUE)
+endif()
+
+include(${MBED_PATH}/tools/cmake/app.cmake)
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)
+    list(REMOVE_ITEM MBED_TARGET_LABELS CM0P_SLEEP)
+    list(REMOVE_ITEM MBED_TARGET_DEFINITIONS COMPONENT_CM0P_SLEEP=1)
+endif()
+include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
+
+project(${APP_TARGET})
+
+add_subdirectory(${MBED_PATH} ./mbed_build)
+add_subdirectory(${MBED_OS_POSIX_SOCKET_PATH} ./mbed_os_posix_socket_build)
+
+add_executable(${APP_TARGET})
+
+add_subdirectory(${CHIP_ROOT}/config/mbed ./chip_build)
+
+mbed_configure_app_target(${APP_TARGET})
+
+target_include_directories(${APP_TARGET} PRIVATE
+                           main/include/
+                           ${MBED_COMMON}/util/include
+                           ${ALL_CLUSTERS_COMMON}/include
+                           ${GEN_DIR}/app-common
+                           ${GEN_DIR}/all-clusters-minimal-app
+                           ${NLIO_ROOT}
+)
+
+target_sources(${APP_TARGET} PRIVATE
+               main/main.cpp
+               main/AppTask.cpp
+               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/callback-stub.cpp
+               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
+               ${MBED_COMMON}/util/LEDWidget.cpp
+               ${MBED_COMMON}/util/DFUManager.cpp
+               ${ALL_CLUSTERS_COMMON}/src/bridged-actions-stub.cpp
+               ${ALL_CLUSTERS_COMMON}/src/static-supported-modes-manager.cpp
+)
+
+chip_configure_data_model(${APP_TARGET}
+    INCLUDE_SERVER
+    ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-minimal-app.zap
+)
+
+target_link_libraries(${APP_TARGET} mbed-os-posix-socket mbed-os mbed-ble mbed-events mbed-netsocket mbed-storage mbed-storage-kv-global-api mbed-mbedtls mbed-emac chip)
+
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W")
+    target_link_libraries(${APP_TARGET} mbed-cy-psoc6-common-network)
+endif()
+
+mbed_set_post_build(${APP_TARGET})
+
+option(VERBOSE_BUILD "Have a verbose build process")
+if(VERBOSE_BUILD)
+    set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()
diff --git a/examples/all-clusters-minimal-app/mbed/README.md b/examples/all-clusters-minimal-app/mbed/README.md
new file mode 100644
index 00000000000000..e5f0ef2233eb3c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/README.md
@@ -0,0 +1,277 @@
+![ARM Mbed-OS logo](https://raw.githubusercontent.com/ARMmbed/mbed-os/master/logo.png)
+
+<h1> Matter Arm Mbed OS All Clusters Example Application </h1>
+
+The Arm Mbed OS All Clusters Example demonstrates device commissioning process
+and all available clusters control.
+
+You can use this example as a reference for creating your own application.
+
+The example is based on
+[Matter](https://github.com/project-chip/connectedhomeip) and Arm Mbed OS, and
+supports remote access and control of device over a WiFi network.
+
+The example behaves as a Matter accessory, in other words a device that can be
+paired into an existing Matter network and can be controlled by this network.
+
+<hr>
+
+-   [Overview](#overview)
+    -   [Bluetooth Low Energy advertising](#bluetooth-low-energy-advertising)
+    -   [Bluetooth Low Energy rendezvous](#bluetooth-low-energy-rendezvous)
+    -   [WiFi provisioning](#wifi-provisioning)
+-   [Run application](#run-application)
+    -   [Environment setup](#environment-setup)
+    -   [Building](#building)
+    -   [Flashing](#flashing)
+    -   [Debugging](#debugging)
+    -   [Testing](#testing)
+        -   [Serial port terminal](#serial-port-terminal)
+        -   [CHIP Tools](#chip-tools)
+    -   [Supported devices](#supported-devices)
+        -   [Notes](#notes)
+-   [Device UI](#device-ui)
+    -   [Notes](#notes-1)
+
+<hr>
+
+# Overview
+
+The Matter device that runs the All Clusters application is controlled by the
+Matter controller device over WiFi. By default, the Matter device is
+disconnected, and it should be paired with Matter controller and get
+configuration from it. Actions required before establishing full communication
+are described below.
+
+## Bluetooth Low Energy advertising
+
+To commission the device onto a Matter network, the device must be discoverable
+over BLE. The BLE advertising starts automatically after device boot-up.
+
+## Bluetooth Low Energy rendezvous
+
+In Matter, the commissioning procedure (called rendezvous) is done over BLE
+between a Matter device and the Matter controller, where the controller has the
+commissioner role.
+
+To start the rendezvous, the controller must get the commissioning information
+from the Matter device. The data payload is encoded within a QR code, printed to
+the UART console.
+
+## WiFi provisioning
+
+The last part of the rendezvous procedure, provisioning involves sending the
+network credentials from the Matter controller to the Matter device. As a
+result, device is able to join the network and communicate with other devices in
+the network.
+
+# Run application
+
+## Environment setup
+
+Before building the example, check out the Matter repository and sync submodules
+using the following command:
+
+    $ git submodule update --init
+
+Building the example application requires the use of **ARM Mbed-OS** sources and
+the **arm-none-gnu-eabi** toolchain.
+
+The Cypress OpenOCD package is required for flashing purpose. Install the
+Cypress OpenOCD and set env var `OPENOCD_PATH` before calling the flashing
+script.
+
+```
+cd ~
+wget https://github.com/Infineon/openocd/releases/download/release-v4.3.0/openocd-4.3.0.1746-linux.tar.gz
+tar xzvf openocd-4.3.0.1746-linux.tar.gz
+export OPENOCD_PATH=$HOME/openocd
+```
+
+Some additional packages may be needed, depending on selected build target and
+its requirements.
+
+> **The VSCode devcontainer has these components pre-installed. Using the VSCode
+> devcontainer is the recommended way to interact with Arm Mbed-OS port of the
+> Matter Project.**
+>
+> **Please read this [README.md](../../..//docs/VSCODE_DEVELOPMENT.md) for more
+> information about using VSCode in container.**
+
+To initialize the development environment, download all registered sub-modules
+and activate the environment:
+
+```
+$ source ./scripts/bootstrap.sh
+$ source ./scripts/activate.sh
+```
+
+If packages are already installed then you just need to activate the development
+environment:
+
+```
+$ source ./scripts/activate.sh
+```
+
+## Building
+
+The All Clusters application can be built in the same way as any other Matter
+example ported to the mbed-os platform.
+
+-   **by using generic vscode task**:
+
+```
+Command Palette (F1) => Run Task... => Run Mbed Application => build => all-clusters-minimal-app => (board name) => (build profile) => (build type)
+```
+
+-   **by calling explicitly building script:**
+
+```
+${MATTER_ROOT}/scripts/examples/mbed_example.sh -c=build -a=all-clusters-minimal-app -b=<board name> -p=<build profile> -T=<build type>
+```
+
+Both approaches are limited to supported evaluation boards which are listed in
+[Supported devices](#supported_devices) paragraph.
+
+Mbed OS defines three building profiles: _develop, debug_ and _release_. For
+more details please visit
+[ARM Mbed OS build profiles](https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html).
+
+There are also three types of built application: _simple, boot_ and _upgrade_:
+
+-   **simple** - standalone application, mainly for developing and testing
+    purpose (all building profiles are supported)
+-   **boot** - signed application + bootloader, it supports booting process and
+    can be use for firmware update (only _release_ building profiles is
+    supported)
+-   **update** - signed application, application image can be used for firmware
+    update (only _release_ building profiles is supported)
+
+When using the building script, it is possible expand the list of acceptable
+targets; this may be useful for rapid testing of a new mbed-targets.
+
+## Flashing
+
+The All Clusters application can be flashed in the same way as any other Matter
+example ported to mbed-os platform.
+
+The [Open On-Chip Debugger](http://openocd.org/) is used to upload a binary
+image and reset the device.
+
+-   **by using VSCode task**:
+
+```
+Command Palette (F1) => Run Task... -> Run Mbed Application => flash => all-clusters-minimal-app => (board name) => (build profile)
+```
+
+-   **by calling explicitly building script:**
+
+```
+${MATTER_ROOT}/scripts/examples/mbed_example.sh -c=flash -a=all-clusters-minimal-app -b=<board name> -p=<build profile>
+```
+
+-   **by using VSCode launch task**:
+
+```
+Run and Debug (Ctrl+Shift+D) => Flash Mbed examples => Start Debugging (F5)  => (board name) => all-clusters-minimal-app => (build profile)
+```
+
+The last option uses the Open On-Chip Debugger to open and manage the gdb-server
+session. Then gdb-client (arm-none-eabi-gdb) upload binary image and reset
+device.
+
+It is possible to connect to an external gdb-server session by using a specific
+**'Flash Mbed examples [remote]'** task.
+
+## Debugging
+
+Debugging can be performed in the same was as with any other Matter example
+ported to mbed-os platform.
+
+The [Open On-Chip Debugger](http://openocd.org/) is used to to open and manage
+the gdb-server session. Then gdb-client (arm-none-eabi-gdb) connect the server
+to upload binary image and control debugging.
+
+```
+Run and Debug (Ctrl+Shift+D) => Debug Mbed examples => Start Debugging (F5) => (board name) => all-clusters-minimal-app => (build profile)
+```
+
+It is possible to connect to an external gdb-server session by using specific
+**'Debug Mbed examples [remote]'** task.
+
+## Testing
+
+### Serial port terminal
+
+The application traces are streaming to serial output. To start communication
+open a terminal session and connect to the serial port of the device. You can
+use **mbed-tools** for this purpose
+([mbed-tools](https://github.com/ARMmbed/mbed-tools)):
+
+    ```
+    mbed-tools sterm -p /dev/ttyACM0 -b 115200 -e off
+    ```
+
+After device reset these lines should be visible:
+
+    ```
+    [INFO][CHIP]: [-]Mbed all-clusters-minimal-app example application start
+    ...
+    [INFO][CHIP]: [-]Mbed all-clusters-minimal-app example application run
+    ```
+
+The all-clusters-minimal-app application launched correctly and you can follow
+traces in the terminal.
+
+### CHIP Tools
+
+Read the [MbedCommissioning](../../../docs/guides/mbedos_commissioning.md) to
+see how to use different CHIP tools to commission and control the application
+within a WiFi network.
+
+## Supported devices
+
+| Manufacturer                                          | Hardware platform                                                         | Build target          | Platform image                                                                                         |       Status       | Platform components                                                                                                                                                                                                                                                           |
+| ----------------------------------------------------- | ------------------------------------------------------------------------- | --------------------- | ------------------------------------------------------------------------------------------------------ | :----------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [Cypress<br> Semiconductor](https://www.cypress.com/) | [CY8CPROTO-062-4343W](https://os.mbed.com/platforms/CY8CPROTO-062-4343W/) | `CY8CPROTO_062_4343W` | ![CY8CPROTO-062-4343W](https://os.mbed.com/media/cache/platforms/p6_wifi-bt_proto.png.250x250_q85.jpg) | :heavy_check_mark: | <details><summary>LEDs</summary><ul><li>Board has only one usable LED (LED4) which corresponds to USER LED from UI.</li></ul></details> <details><summary>Buttons</summary><ul><li>Unused</li></ul></details> <details><summary>Slider</summary><ul><li>Unused</ul></details> |
+
+#### Notes
+
+-   More details and guidelines about porting new hardware into the Matter
+    project with Mbed OS can be found in
+    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+-   Some useful information about HW platform specific settings can be found in
+    `all-clusters-minimal-app/mbed/mbed_app.json`.  
+    Information about this file syntax and its meaning in mbed-os project can be
+    found here:
+    [Mbed-Os configuration system](https://os.mbed.com/docs/mbed-os/latest/program-setup/advanced-configuration.html))
+
+# Device UI
+
+This section lists the User Interface elements that you can use to control and
+monitor the state of the device. These correspond to PCB components on the
+platform image.
+
+**USER LED** shows the overall state of the device and its connectivity. The
+following states are possible:
+
+-   _Short Flash On (50 ms on/950 ms off)_ &mdash; The device is in the
+    unprovisioned (unpaired) state and is waiting for a commissioning
+    application to connect.
+
+-   _Rapid Even Flashing (100 ms on/100 ms off)_ &mdash; The device is in the
+    unprovisioned state and a commissioning application is connected through
+    Bluetooth LE.
+
+-   _Short Flash Off (950ms on/50ms off)_ &mdash; The device is fully
+    provisioned, but does not yet have full network or service connectivity.
+
+-   _Solid On_ &mdash; The device is fully provisioned and has full network and
+    service connectivity.
+
+### Notes
+
+Some of the supported boards may not have sufficient number PCB components to
+follow above description. In that case please refer to
+[Supported devices](#Supported-devices) section and check board's 'Platform
+components' column for additional information about the limitation.
diff --git a/examples/all-clusters-minimal-app/mbed/config.in b/examples/all-clusters-minimal-app/mbed/config.in
new file mode 100644
index 00000000000000..ecf3bb53b4623b
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/config.in
@@ -0,0 +1,6 @@
+CONFIG_CHIP_BUILD_TESTS=n
+CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
+CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
+CONFIG_MBED_BSD_SOCKET_TRACE=n
+CONFIG_CHIP_OTA_REQUESTOR=y
+CONFIG_CHIP_DATA_MODEL=y
diff --git a/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp b/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp
new file mode 100644
index 00000000000000..9343fc33899700
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp
@@ -0,0 +1,151 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+#include "LEDWidget.h"
+#include <DFUManager.h>
+#include <app/server/OnboardingCodesUtil.h>
+
+#include <app/server/Dnssd.h>
+#include <app/server/Server.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+
+#include <support/logging/CHIPLogging.h>
+
+static LEDWidget sStatusLED(MBED_CONF_APP_SYSTEM_STATE_LED);
+
+static bool sIsWiFiStationProvisioned = false;
+static bool sIsWiFiStationEnabled     = false;
+static bool sIsWiFiStationConnected   = false;
+static bool sIsPairedToAccount        = false;
+static bool sHaveBLEConnections       = false;
+
+static events::EventQueue sAppEventQueue;
+
+using namespace ::chip;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::Credentials;
+
+AppTask AppTask::sAppTask;
+
+int AppTask::Init()
+{
+    CHIP_ERROR error;
+    // Register the callback to init the MDNS server when connectivity is available
+    PlatformMgr().AddEventHandler(
+        [](const ChipDeviceEvent * event, intptr_t arg) {
+            // Restart the server whenever an ip address is renewed
+            if (event->Type == DeviceEventType::kInternetConnectivityChange)
+            {
+                if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established ||
+                    event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
+                {
+                    chip::app::DnssdServer::Instance().StartServer();
+                }
+            }
+        },
+        0);
+
+    // Init ZCL Data Model and start server
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    error = Server::GetInstance().Init(initParams);
+    if (error != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Server initialization failed: %s", error.AsString());
+        return EXIT_FAILURE;
+    }
+
+    // Initialize device attestation config
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    ConfigurationMgr().LogDeviceConfig();
+    // QR code will be used with CHIP Tool
+    PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
+
+    error = GetDFUManager().Init();
+    if (error != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "DFU manager initialization failed: %s", error.AsString());
+        return EXIT_FAILURE;
+    }
+
+    return 0;
+}
+
+int AppTask::StartApp()
+{
+    int ret = Init();
+    if (ret)
+    {
+        ChipLogError(NotSpecified, "AppTask.Init() failed");
+        return ret;
+    }
+
+    ChipLogProgress(NotSpecified, "Mbed all-clusters-minimal-app example application run");
+
+    while (true)
+    {
+        sAppEventQueue.dispatch(100);
+
+        // Collect connectivity and configuration state from the CHIP stack.  Because the
+        // CHIP event loop is being run in a separate task, the stack must be locked
+        // while these values are queried.  However we use a non-blocking lock request
+        // (TryLockChipStack()) to avoid blocking other UI activities when the CHIP
+        // task is busy (e.g. with a long crypto operation).
+
+        if (PlatformMgr().TryLockChipStack())
+        {
+            sIsWiFiStationProvisioned = ConnectivityMgr().IsWiFiStationProvisioned();
+            sIsWiFiStationEnabled     = ConnectivityMgr().IsWiFiStationEnabled();
+            sIsWiFiStationConnected   = ConnectivityMgr().IsWiFiStationConnected();
+            sHaveBLEConnections       = (ConnectivityMgr().NumBLEConnections() != 0);
+            PlatformMgr().UnlockChipStack();
+        }
+
+        // Update the status LED
+        //
+        // If system is connected to Wi-Fi station, keep the LED On constantly.
+        //
+        // If Wi-Fi is provisioned, but not connected to Wi-Fi station yet
+        // THEN blink the LED Off for a short period of time.
+        //
+        // If the system has ble connection(s) uptill the stage above, THEN blink the LEDs at an even
+        // rate of 100ms.
+        //
+        // Otherwise, blink the LED ON for a very short time.
+        if (sIsWiFiStationConnected)
+        {
+            sStatusLED.Set(true);
+        }
+        else if (sIsWiFiStationProvisioned && sIsWiFiStationEnabled && sIsPairedToAccount && !sIsWiFiStationConnected)
+        {
+            sStatusLED.Blink(950, 50);
+        }
+        else if (sHaveBLEConnections)
+        {
+            sStatusLED.Blink(100, 100);
+        }
+        else
+        {
+            sStatusLED.Blink(50, 950);
+        }
+
+        sStatusLED.Animate();
+    }
+}
diff --git a/examples/tv-casting-app/darwin/darwin/ViewController.m b/examples/all-clusters-minimal-app/mbed/main/include/AppTask.h
similarity index 67%
rename from examples/tv-casting-app/darwin/darwin/ViewController.m
rename to examples/all-clusters-minimal-app/mbed/main/include/AppTask.h
index 8d070158ac42e7..a1ee9761ae6a2a 100644
--- a/examples/tv-casting-app/darwin/darwin/ViewController.m
+++ b/examples/all-clusters-minimal-app/mbed/main/include/AppTask.h
@@ -1,6 +1,7 @@
-/**
+/*
  *
- *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,18 +16,22 @@
  *    limitations under the License.
  */
 
-#import "ViewController.h"
+#pragma once
 
-@interface ViewController ()
+class AppTask
+{
+public:
+    int StartApp();
+
+private:
+    friend AppTask & GetAppTask(void);
 
-@end
+    int Init();
 
-@implementation ViewController
+    static AppTask sAppTask;
+};
 
-- (void)viewDidLoad
+inline AppTask & GetAppTask(void)
 {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    return AppTask::sAppTask;
 }
-
-@end
diff --git a/examples/all-clusters-minimal-app/mbed/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/mbed/main/include/CHIPProjectConfig.h
new file mode 100644
index 00000000000000..896d53ec97a572
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/main/include/CHIPProjectConfig.h
@@ -0,0 +1,35 @@
+/*
+ *
+ *    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
+ *          Example project configuration file for CHIP.
+ *
+ *          This is a place to put application or project-specific overrides
+ *          to the default configuration values for general CHIP features.
+ *
+ */
+
+#pragma once
+
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 1
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/all-clusters-minimal-app/mbed/main/main.cpp b/examples/all-clusters-minimal-app/mbed/main/main.cpp
new file mode 100644
index 00000000000000..ba24b76da4443d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/main/main.cpp
@@ -0,0 +1,87 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+
+#include "mbedtls/platform.h"
+#include <lib/support/CHIPMem.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/mbed/Logging.h>
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::Logging::Platform;
+
+int main(int argc, char * argv[])
+{
+    int ret        = 0;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    mbed_logging_init();
+
+    ChipLogProgress(NotSpecified, "Mbed all-clusters-minimal-app example application start");
+
+    ret = mbedtls_platform_setup(NULL);
+    if (ret)
+    {
+        ChipLogError(NotSpecified, "Mbed TLS platform initialization failed [%d]", ret);
+        goto exit;
+    }
+
+    err = chip::Platform::MemoryInit();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Memory initialization failed: %s", err.AsString());
+        ret = EXIT_FAILURE;
+        goto exit;
+    }
+
+    err = PlatformMgr().InitChipStack();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Chip stack initialization failed: %s", err.AsString());
+        ret = EXIT_FAILURE;
+        goto exit;
+    }
+
+#ifdef MBED_CONF_APP_BLE_DEVICE_NAME
+    err = ConnectivityMgr().SetBLEDeviceName(MBED_CONF_APP_BLE_DEVICE_NAME);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Set BLE device name failed: %s", err.AsString());
+        ret = EXIT_FAILURE;
+        goto exit;
+    }
+#endif
+
+    err = PlatformMgr().StartEventLoopTask();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Chip stack start failed: %s", err.AsString());
+        ret = EXIT_FAILURE;
+        goto exit;
+    }
+
+    ret = GetAppTask().StartApp();
+
+exit:
+    ChipLogProgress(NotSpecified, "Exited with code %d", ret);
+    return ret;
+}
diff --git a/examples/all-clusters-minimal-app/mbed/mbed_app.json b/examples/all-clusters-minimal-app/mbed/mbed_app.json
new file mode 100644
index 00000000000000..8c167bfcb84c19
--- /dev/null
+++ b/examples/all-clusters-minimal-app/mbed/mbed_app.json
@@ -0,0 +1,61 @@
+{
+    "macros": ["MBEDTLS_USER_CONFIG_FILE=\"chip_mbedtls_config.h\""],
+    "target_overrides": {
+        "*": {
+            "platform.stdio-baud-rate": 115200,
+            "lwip.ipv6-enabled": true,
+            "lwip.raw-socket-enabled": true,
+            "lwip.netbuf-recvinfo-enabled": true,
+            "nsapi.default-wifi-security": "WPA_WPA2",
+            "nsapi.default-wifi-ssid": "\"YOUR_SSID\"",
+            "nsapi.default-wifi-password": "\"YOUR_PASSWORD\"",
+            "mbed-trace.max-level": "TRACE_LEVEL_DEBUG",
+            "mbed-trace.enable": true,
+            "target.printf_lib": "std",
+            "mcuboot.bootloader-build": false,
+            "mcuboot.log-enable": true,
+            "mcuboot.log-level": "MCUBOOT_LOG_LEVEL_ERROR"
+        },
+        "CY8CPROTO_062_4343W": {
+            "target.network-default-interface-type": "WIFI",
+            "target.macros_add": [
+                "MXCRYPTO_DISABLED",
+                "NL_ASSERT_LOG=NL_ASSERT_LOG_DEFAULT",
+                "NL_ASSERT_EXPECT_FLAGS=NL_ASSERT_FLAG_LOG",
+                "WHD_PRINT_DISABLE"
+            ],
+            "mcuboot.primary-slot-address": "0x10022000",
+            "mcuboot.slot-size": "0x180000",
+            "mcuboot.scratch-address": "0x101A2000",
+            "mcuboot.scratch-size": "0x40000",
+            "mcuboot.max-img-sectors": "0xC00",
+            "mcuboot.header-size": "0x400"
+        }
+    },
+    "config": {
+        "led-active-state": {
+            "help": "GPIO output to turn the LED on.",
+            "value": 0
+        },
+        "system-state-led": {
+            "help": "System status LED.",
+            "value": "LED1"
+        },
+        "ble-device-name": {
+            "help": "Name used for BLE advertising.",
+            "value": "\"MBED-clusters\""
+        },
+        "version-number": {
+            "value": "0"
+        },
+        "version-number-str": {
+            "value": "\"0.1.0\""
+        },
+        "vendor-id": {
+            "value": "0xFFF1"
+        },
+        "product-id": {
+            "value": "0x8001"
+        }
+    }
+}
diff --git a/examples/all-clusters-minimal-app/nrfconnect/.gitignore b/examples/all-clusters-minimal-app/nrfconnect/.gitignore
new file mode 100644
index 00000000000000..84c048a73cc2e5
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt b/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt
new file mode 100644
index 00000000000000..d1bc3092977a05
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt
@@ -0,0 +1,76 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+cmake_minimum_required(VERSION 3.13.1)
+
+get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconnect REALPATH)
+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)
+
+include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
+
+# Set Kconfig root files that will be processed as a first Kconfig for used child images.
+set(mcuboot_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.mcuboot.root)
+set(multiprotocol_rpmsg_KCONFIG_ROOT ${CHIP_ROOT}/config/nrfconnect/chip-module/Kconfig.multiprotocol_rpmsg.root)
+
+if(DEFINED CONF_FILE AND NOT CONF_FILE STREQUAL "prj.conf")
+    set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
+endif()
+
+list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
+find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
+
+# -Wmaybe-uninitialized has too many false positives, including on std::optional
+# and chip::Optional.  Make it nonfatal.
+#
+# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
+target_compile_options(app PRIVATE -Werror -Wno-error=maybe-uninitialized)
+
+project(chip-nrfconnect-all-clusters-minimal-app-example)
+
+include(${CHIP_ROOT}/config/nrfconnect/app/enable-gnu-std.cmake)
+include(${CHIP_ROOT}/config/nrfconnect/app/flashing.cmake)
+include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
+
+target_include_directories(app PRIVATE
+                           main/include
+                           ${ALL_CLUSTERS_COMMON_DIR}/include
+                           ${GEN_DIR}/app-common
+                           ${GEN_DIR}/all-clusters-minimal-app
+                           ${NRFCONNECT_COMMON}/util/include)
+
+target_sources(app PRIVATE
+               main/AppTask.cpp
+               main/main.cpp
+               ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
+               ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp
+               ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
+               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/callback-stub.cpp
+               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
+               ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
+
+chip_configure_data_model(app
+    INCLUDE_SERVER
+    ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-minimal-app.zap
+)
+
+if(CONFIG_CHIP_OTA_REQUESTOR)
+    target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/OTAUtil.cpp)
+endif()
+
+if (CONFIG_SHELL AND BOARD STREQUAL "nrf52840dongle_nrf52840")
+  target_sources(app PRIVATE ${NRFCONNECT_COMMON}/util/DFUTrigger.cpp)
+endif()
diff --git a/examples/all-clusters-minimal-app/nrfconnect/Kconfig b/examples/all-clusters-minimal-app/nrfconnect/Kconfig
new file mode 100644
index 00000000000000..9fcdb41ab33208
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/Kconfig
@@ -0,0 +1,27 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+mainmenu "Matter nRF Connect All Clusters Example Application"
+
+config STATE_LEDS
+	bool "Use LEDs to indicate the device state"
+	default y
+	help
+	  Use LEDs to render the current state of the device such as the progress of commissioning of
+	  the device into a network or the factory reset initiation.
+
+rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
+rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults"
+source "Kconfig.zephyr"
diff --git a/examples/all-clusters-minimal-app/nrfconnect/README.md b/examples/all-clusters-minimal-app/nrfconnect/README.md
new file mode 100644
index 00000000000000..919fb768d5fd51
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/README.md
@@ -0,0 +1,451 @@
+# Matter nRF Connect All Clusters Example Application
+
+The nRF All Clusters Example Application implements various ZCL clusters
+populated on three endpoints. You can use this example as a reference for
+creating your own application.
+
+![Nordic Smiconductor logo](../../platform/nrfconnect/doc/images/Logo_RGB_H-small.png)
+![nRF52840 DK](../../platform/nrfconnect/doc/images/nRF52840-DK-small.png)
+
+The example is based on
+[Matter](https://github.com/project-chip/connectedhomeip) and Nordic
+Semiconductor's nRF Connect SDK, and was created to facilitate testing and
+certification of a Matter device communicating over a low-power, 802.15.4 Thread
+network.
+
+The example behaves as a Matter accessory, that is a device that can be paired
+into an existing Matter network and can be controlled by this network.
+
+<hr>
+
+-   [Overview](#overview)
+    -   [Bluetooth LE advertising](#bluetooth-le-advertising)
+    -   [Bluetooth LE rendezvous](#bluetooth-le-rendezvous)
+-   [Requirements](#requirements)
+    -   [Supported devices](#supported_devices)
+-   [Device UI](#device-ui)
+-   [Setting up the environment](#setting-up-the-environment)
+    -   [Using Docker container for setup](#using-docker-container-for-setup)
+    -   [Using native shell for setup](#using-native-shell-for-setup)
+-   [Building](#building)
+    -   [Removing build artifacts](#removing-build-artifacts)
+    -   [Building with release configuration](#building-with-release-configuration)
+    -   [Building with low-power configuration](#building-with-low-power-configuration)
+    -   [Building with Device Firmware Upgrade support](#building-with-device-firmware-upgrade-support)
+-   [Configuring the example](#configuring-the-example)
+    -   [Example build types](#example-build-types)
+-   [Flashing and debugging](#flashing-and-debugging)
+    -   [Flashing on the development kits](#nrfdks_flashing)
+    -   [Flashing on the nRF52840 Dongle](#nrf52840dongle_flashing)
+-   [Testing the example](#testing-the-example)
+    -   [Testing using CHIPTool](#testing-using-chiptool)
+
+<hr>
+
+<a name="overview"></a>
+
+## Overview
+
+This example is running on the nRF Connect platform, which is based on Nordic
+Semiconductor's
+[nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
+and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
+[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+to read more about the platform structure and dependencies.
+
+The Matter device that runs the all clusters application is controlled by the
+Matter controller device over the Thread protocol. By default, the Matter device
+has Thread disabled, and it should be paired with Matter controller and get
+configuration from it. Some actions required before establishing full
+communication are described below.
+
+### Bluetooth LE advertising
+
+In this example, to commission the device onto a Matter network, it must be
+discoverable over Bluetooth LE. For security reasons, you must start Bluetooth
+LE advertising manually after powering up the device by pressing **Button 4**.
+
+### Bluetooth LE rendezvous
+
+In this example, the commissioning procedure is done over Bluetooth LE between a
+Matter device and the Matter controller, where the controller has the
+commissioner role.
+
+To start the rendezvous, the controller must get the commissioning information
+from the Matter device. The data payload is encoded within a QR code, printed to
+the UART console.
+
+#### Thread provisioning
+
+Last part of the rendezvous procedure, the provisioning operation involves
+sending the Thread network credentials from the Matter controller to the Matter
+device. As a result, device is able to join the Thread network and communicate
+with other Thread devices in the network.
+
+<hr>
+
+<a name="requirements"></a>
+
+## Requirements
+
+The application requires a specific revision of the nRF Connect SDK to work
+correctly. See [Setting up the environment](#setting-up-the-environment) for
+more information.
+
+<a name="supported_devices"></a>
+
+### Supported devices
+
+The example supports building and running on the following devices:
+
+| Hardware platform                                                                                 | Build target               | Platform image                                                                                                                                          |
+| ------------------------------------------------------------------------------------------------- | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [nRF52840 DK](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)         | `nrf52840dk_nrf52840`      | <details><summary>nRF52840 DK</summary><img src="../../platform/nrfconnect/doc/images/nRF52840_DK_info-medium.jpg" alt="nRF52840 DK"/></details>        |
+| [nRF5340 DK](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF5340-DK)           | `nrf5340dk_nrf5340_cpuapp` | <details><summary>nRF5340 DK</summary><img src="../../platform/nrfconnect/doc/images/nRF5340_DK_info-medium.jpg" alt="nRF5340 DK"/></details>           |
+| [nRF52840 Dongle](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle) | `nrf52840dongle_nrf52840`  | <details><summary>nRF52840 Dongle</summary><img src="../../platform/nrfconnect/doc/images/nRF52840_Dongle-medium.jpg" alt="nRF52840 Dongle"/></details> |
+
+<hr>
+
+<a name="device-ui"></a>
+
+## Device UI
+
+This section lists the User Interface elements that you can use to control and
+monitor the state of the device. These correspond to PCB components on the
+platform image.
+
+> **Note**:
+>
+> The following Device UI elements are missing on the nRF52840 Dongle: **Button
+> 2**, **Button 3**, **Button 4**, **SEGGER J-Link USB port**, and **NFC port
+> with antenna attached**. You can collect logs from the nRF52840 Dongle using
+> the **nRF USB port** instead of the **SEGGER J-Link USB port**.
+> Functionalities associated with the remaining missing elements are
+> inaccessible.
+
+**LED 1** shows the overall state of the device and its connectivity. The
+following states are possible:
+
+-   _Short Flash On (50 ms on/950 ms off)_ &mdash; The device is in the
+    unprovisioned (unpaired) state and is waiting for a commissioning
+    application to connect.
+
+-   _Rapid Even Flashing (100 ms on/100 ms off)_ &mdash; The device is in the
+    unprovisioned state and a commissioning application is connected through
+    Bluetooth LE.
+
+-   _Short Flash Off (950ms on/50ms off)_ &mdash; The device is fully
+    provisioned, but does not yet have full Thread network or service
+    connectivity.
+
+-   _Solid On_ &mdash; The device is fully provisioned and has full Thread
+    network and service connectivity.
+
+**Button 1** can be used for the following purposes:
+
+-   _Pressed for 6 s_ &mdash; Initiates the factory reset of the device.
+    Releasing the button within the 6-second window cancels the factory reset
+    procedure. **LEDs 1-4** blink in unison when the factory reset procedure is
+    initiated.
+
+**Button 4** &mdash; Pressing the button once starts Bluetooth LE advertising
+for the predefined period of time (15 minutes by default).
+
+**SEGGER J-Link USB port** can be used to get logs from the device or
+communicate with it using the
+[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+
+<hr>
+
+## Setting up the environment
+
+Before building the example, check out the Matter repository and sync submodules
+using the following command:
+
+        $ git submodule update --init
+
+The example requires a specific revision of the nRF Connect SDK. You can either
+install it along with the related tools directly on your system or use a Docker
+image that has the tools pre-installed.
+
+If you are a macOS user, you won't be able to use the Docker container to flash
+the application onto a Nordic development kit due to
+[certain limitations of Docker for macOS](https://docs.docker.com/docker-for-mac/faqs/#can-i-pass-through-a-usb-device-to-a-container).
+Use the [native shell](#using-native-shell) for building instead.
+
+### Using Docker container for setup
+
+To use the Docker container for setup, complete the following steps:
+
+1.  If you do not have the nRF Connect SDK installed yet, create a directory for
+    it by running the following command:
+
+        $ mkdir ~/nrfconnect
+
+2.  Download the latest version of the nRF Connect SDK Docker image by running
+    the following command:
+
+        $ docker pull nordicsemi/nrfconnect-chip
+
+3.  Start Docker with the downloaded image by running the following command,
+    customized to your needs as described below:
+
+         $ docker run --rm -it -e RUNAS=$(id -u) -v ~/nrfconnect:/var/ncs -v ~/connectedhomeip:/var/chip \
+             -v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:* rmw" nordicsemi/nrfconnect-chip
+
+    In this command:
+
+    -   _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
+        SDK source directory.
+    -   _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
+        source directory.
+    -   _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
+        parameters can be omitted if you are not planning to flash the example
+        onto hardware. These parameters give the container access to USB devices
+        connected to your computer such as the nRF52840 DK.
+    -   _--rm_ can be omitted if you do not want the container to be
+        auto-removed when you exit the container shell session.
+    -   _-e RUNAS=\$(id -u)_ is needed to start the container session as the
+        current user instead of root.
+
+4.  Update the nRF Connect SDK to the most recent supported revision, by running
+    the following command:
+
+         $ cd /var/chip
+         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+
+Now you can proceed with the [Building](#building) instruction.
+
+### Using native shell for setup
+
+To use the native shell for setup, complete the following steps:
+
+1.  Download and install the following additional software:
+
+    -   [nRF Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
+    -   [GN meta-build system](https://gn.googlesource.com/gn/)
+
+2.  If you do not have the nRF Connect SDK installed, follow the
+    [guide](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/gs_assistant.html#)
+    in the nRF Connect SDK documentation to install the latest stable nRF
+    Connect SDK version. Since command-line tools will be used for building the
+    example, installing SEGGER Embedded Studio is not required.
+
+    If you have the SDK already installed, continue to the next step and update
+    the nRF Connect SDK after initializing environment variables.
+
+3.  Initialize environment variables referred to by the CHIP and the nRF Connect
+    SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
+    Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
+    Arm Embedded Toolchain.
+
+         $ source nrfconnect-dir/zephyr/zephyr-env.sh
+         $ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
+         $ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
+
+4.  Update the nRF Connect SDK to the most recent supported revision by running
+    the following command (replace _matter-dir_ with the path to Matter
+    repository directory):
+
+         $ cd matter-dir
+         $ python3 scripts/setup/nrfconnect/update_ncs.py --update
+
+Now you can proceed with the [Building](#building) instruction.
+
+<hr>
+
+<a name="building"></a>
+
+## Building
+
+Complete the following steps, regardless of the method used for setting up the
+environment:
+
+1.  Navigate to the example's directory:
+
+        $ cd examples/all-clusters-minimal-app/nrfconnect
+
+2.  Run the following command to build the example, with _build-target_ replaced
+    with the build target name of the Nordic Semiconductor's kit you own, for
+    example `nrf52840dk_nrf52840`:
+
+         $ west build -b build-target
+
+    You only need to specify the build target on the first build. See
+    [Requirements](#requirements) for the build target names of compatible kits.
+
+The output `zephyr.hex` file will be available in the `build/zephyr/` directory.
+
+### Removing build artifacts
+
+If you're planning to build the example for a different kit or make changes to
+the configuration, remove all build artifacts before building. To do so, use the
+following command:
+
+    $ rm -r build
+
+### Building with release configuration
+
+To build the example with release configuration that disables the diagnostic
+features like logs and command-line interface, run the following command:
+
+    $ west build -b build-target -- -DCONF_FILE=prj_release.conf
+
+Remember to replace _build-target_ with the build target name of the Nordic
+Semiconductor's kit you own.
+
+### Building with low-power configuration
+
+You can build the example using the low-power configuration, which enables
+Thread's Sleepy End Device mode and disables debug features, such as the UART
+console or the **LED 1** usage.
+
+To build for the low-power configuration, run the following command with
+_build-target_ replaced with the build target name of the Nordic Semiconductor's
+kit you own (for example `nrf52840dk_nrf52840`):
+
+    $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf
+
+For example, use the following command for `nrf52840dk_nrf52840`:
+
+    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf
+
+### Building with Device Firmware Upgrade support
+
+Support for DFU using Matter OTA is disabled by default.
+
+To build the example with configuration that supports DFU, run the following
+command with _build-target_ replaced with the build target name of the Nordic
+Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
+
+    $ west build -b build-target -- -DCONF_FILE=prj_dfu.conf
+
+> **Note**:
+>
+> There are two types of Device Firmware Upgrade modes: single-image DFU and
+> multi-image DFU. Single-image mode supports upgrading only one firmware image,
+> the application image, and should be used for single-core nRF52840 DK devices.
+> Multi-image mode allows to upgrade more firmware images and is suitable for
+> upgrading the application core and network core firmware in two-core nRF5340
+> DK devices.
+>
+> Currently the multi-image mode is not available for the Matter OTA DFU.
+
+#### Changing bootloader configuration
+
+To change the default MCUboot configuration, edit the `prj.conf` file located in
+the `child_image/mcuboot` directory.
+
+#### Changing flash memory settings
+
+In the default configuration, the MCUboot uses the
+[Partition Manager](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/scripts/partition_manager/partition_manager.html#partition-manager)
+to configure flash partitions used for the bootloader application image slot
+purposes. You can change these settings by defining
+[static partitions](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/scripts/partition_manager/partition_manager.html#ug-pm-static).
+This example uses this option to define using an external flash.
+
+To modify the flash settings of your board (that is, your _build-target_, for
+example `nrf52840dk_nrf52840`), edit the `pm_static_dfu.yml` file located in the
+`configuration/build-target/` directory.
+
+<hr>
+
+<a name="configuring"></a>
+
+## Configuring the example
+
+The Zephyr ecosystem is based on Kconfig files and the settings can be modified
+using the menuconfig utility.
+
+To open the menuconfig utility, run the following command from the example
+directory:
+
+    $ west build -b build-target -t menuconfig
+
+Remember to replace _build-target_ with the build target name of the Nordic
+Semiconductor's kit you own.
+
+Changes done with menuconfig will be lost if the `build` directory is deleted.
+To make them persistent, save the configuration options in the `prj.conf` file.
+
+### Example build types
+
+The example uses different configuration files depending on the supported
+features. Configuration files are provided for different build types and they
+are located in the application root directory.
+
+The `prj.conf` file represents a debug build type. Other build types are covered
+by dedicated files with the build type added as a suffix to the prj part, as per
+the following list. For example, the release build type file name is
+`prj_release.conf`. If a board has other configuration files, for example
+associated with partition layout or child image configuration, these follow the
+same pattern.
+
+Before you start testing the application, you can select one of the build types
+supported by the sample. This sample supports the following build types,
+depending on the selected board:
+
+-   debug -- Debug version of the application - can be used to enable additional
+    features for verifying the application behavior, such as logs or
+    command-line shell.
+-   release -- Release version of the application - can be used to enable only
+    the necessary application functionalities to optimize its performance. It
+    has Device Firmware Upgrade feature enabled. It can be used only for the
+    nRF52840 DK and nRF5340 DK, as only those platforms support the DFU.
+-   dfu -- Debug version of the application with Device Firmware Upgrade feature
+    support. It can be used only for the nRF52840 DK and nRF5340 DK, as only
+    those platforms support the DFU.
+
+For more information, see the
+[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+page.
+
+<hr>
+
+<a name="flashing"></a>
+
+## Flashing and debugging
+
+The flashing and debugging procedure is different for the development kits and
+the nRF52840 Dongle.
+
+<a name="nrfdks_flashing"></a>
+
+### Flashing on the development kits
+
+To flash the application to the device, use the west tool and run the following
+command from the example directory:
+
+        $ west flash --erase
+
+If you have multiple development kits connected, west will prompt you to pick
+the correct one.
+
+To debug the application on target, run the following command from the example
+directory:
+
+        $ west debug
+
+<a name="nrf52840dongle_flashing"></a>
+
+### Flashing on the nRF52840 Dongle
+
+Visit
+[Programming and Debugging nRF52840 Dongle](https://docs.zephyrproject.org/latest/boards/arm/nrf52840dongle_nrf52840/doc/index.html#programming-and-debugging)
+to read more about flashing on the nRF52840 Dongle.
+
+<hr>
+
+## Testing the example
+
+Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
+learn how to use command-line interface of the application.
+
+### Testing using CHIPTool
+
+Read the
+[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+to see how to use [CHIPTool](../../../src/android/CHIPTool/README.md) for
+Android smartphones to commission and control the application within a
+Matter-enabled Thread network.
diff --git a/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000000..04253ef9667617
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,57 @@
+/*
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+
+	/*
+	* In some default configurations within the nRF Connect SDK,
+	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
+	* This devicetree overlay ensures that default is overridden wherever it
+	* is set, as this application uses the RNG node for entropy exclusively.
+	*/
+	chosen {
+		zephyr,entropy = &rng;
+	};
+};
+
+/* Disable unused peripherals to reduce power consumption */
+&adc {
+	status = "disabled";
+};
+&uart1 {
+	status = "disabled";
+};
+&gpio1 {
+	status = "disabled";
+};
+&i2c0 {
+	status = "disabled";
+};
+&pwm0 {
+	status = "disabled";
+};
+&spi1 {
+	status = "disabled";
+};
+&spi3 {
+	status = "disabled";
+};
+&usbd {
+	status = "disabled";
+};
diff --git a/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dongle_nrf52840.conf b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dongle_nrf52840.conf
new file mode 100644
index 00000000000000..dc8c38ed741291
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dongle_nrf52840.conf
@@ -0,0 +1,43 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# Configure logging over USB
+# - do enable shell to reduce flash usage
+# - disable CDC ACM logs as it may lead to infinite loop when CDC ACM is used as the log backend
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_SHELL_LOG_BACKEND=n
+CONFIG_UART_LINE_CTRL=y
+CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
+
+# The minimal logging mode does not work properly with the USB CDC device, so use the deferred mode
+CONFIG_LOG_MODE_MINIMAL=n
+CONFIG_LOG2_MODE_DEFERRED=y
+CONFIG_LOG_BUFFER_SIZE=8192
+
+# Reduce the code size as the dongle reserves some space for MBR and Open Bootloader
+CONFIG_ASSERT_VERBOSE=n
+CONFIG_SHELL=n
+CONFIG_OPENTHREAD_SHELL=n
+CONFIG_MATTER_LOG_LEVEL_INF=y
+
+# Use partition manager to configure the settings partition not to overlap with Open Bootloader
+CONFIG_PM_SINGLE_IMAGE=y
+
+# Enable CHIP pairing automatically on application start.
+CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
diff --git a/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dongle_nrf52840.overlay b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dongle_nrf52840.overlay
new file mode 100644
index 00000000000000..848566b5f43702
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf52840dongle_nrf52840.overlay
@@ -0,0 +1,28 @@
+/*
+ *    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.
+ */
+
+ / {
+ 	chosen {
+ 		zephyr,console = &cdc_acm_uart0;
+		};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000000..5be8b8fd5f736f
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,86 @@
+/*
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+
+	soc {
+		/* Add a flash controller which has the compatible
+		 * 'zephyr,sim-flash'. This will ensure that the flash
+		 * simulator can use it. None of the other properties in this
+		 * node is used for anything.
+		 */
+		nordic_ram_flash_controller: nordic_ram-flash-controller@0 {
+			compatible = "zephyr,sim-flash";
+			reg = <0x00000000 DT_SIZE_K(40)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			erase-value = <0xff>;
+			label = "nordic_ram_flash_flash_controller";
+
+			/* This node label must match that used in the flash
+			 * simulator.
+			 */
+			flash_sim0: flash_sim@0 {
+				status = "okay";
+				compatible = "soc-nv-flash";
+				label = "simulated_flash";
+				erase-block-size = <4096>;
+				write-block-size = <4>;
+				reg = <0x00000000 DT_SIZE_K(256)>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					/* This partition must be defined for
+					 * MCUboot to find the partition ID
+					 * of the primary slot for image 1,
+					 * which is stored in this partition.
+					 */
+					slot2_partition: partition@0 {
+						label = "image-2";
+						reg = <0x00000000 0x00000A000>;
+					};
+				};
+			};
+		};
+	};
+
+};
+
+/* Disable unused peripherals to reduce power consumption */
+&adc {
+	status = "disabled";
+};
+&gpio1 {
+	status = "disabled";
+};
+&i2c1 {
+	status = "disabled";
+};
+&pwm0 {
+	status = "disabled";
+};
+&spi2 {
+	status = "disabled";
+};
+&usbd {
+	status = "disabled";
+};
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_dfu.conf
new file mode 100644
index 00000000000000..287c7829c6a5cf
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_dfu.conf
@@ -0,0 +1,30 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# This target uses Kconfig.mcuboot.defaults to set options common for all
+# samples using mcuboot. This file should contain only options specific for this sample
+# mcuboot configuration or overrides of default values.
+
+CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
+
+# Bootloader size optimization
+# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding
+# in board files.
+CONFIG_GPIO=n
+CONFIG_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_USE_SEGGER_RTT=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_release.conf
new file mode 100644
index 00000000000000..287c7829c6a5cf
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -0,0 +1,30 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# This target uses Kconfig.mcuboot.defaults to set options common for all
+# samples using mcuboot. This file should contain only options specific for this sample
+# mcuboot configuration or overrides of default values.
+
+CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
+
+# Bootloader size optimization
+# Disable not used modules that cannot be set in Kconfig.mcuboot.defaults due to overriding
+# in board files.
+CONFIG_GPIO=n
+CONFIG_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_USE_SEGGER_RTT=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf
new file mode 100644
index 00000000000000..f43614c64500d7
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj.conf
@@ -0,0 +1,25 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all
+# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample
+# multiprotocol_rpmsg configuration or overrides of default values.
+
+# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding
+# in board files.
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_dfu.conf
new file mode 100644
index 00000000000000..f43614c64500d7
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_dfu.conf
@@ -0,0 +1,25 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all
+# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample
+# multiprotocol_rpmsg configuration or overrides of default values.
+
+# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding
+# in board files.
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf
new file mode 100644
index 00000000000000..f43614c64500d7
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_release.conf
@@ -0,0 +1,25 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# This target uses Kconfig.multiprotocol_rpmsg.defaults to set options common for all
+# samples using multiprotocol_rpmsg. This file should contain only options specific for this sample
+# multiprotocol_rpmsg configuration or overrides of default values.
+
+# Disable not used modules that cannot be set in Kconfig.multiprotocol_rpmsg.defaults due to overriding
+# in board files.
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml b/examples/all-clusters-minimal-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml
new file mode 100644
index 00000000000000..1847733295425b
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml
@@ -0,0 +1,38 @@
+mcuboot:
+    address: 0x0
+    size: 0x7000
+    region: flash_primary
+mcuboot_pad:
+    address: 0x7000
+    size: 0x200
+app:
+    address: 0x7200
+    size: 0xf4e00
+mcuboot_primary:
+    orig_span: &id001
+        - mcuboot_pad
+        - app
+    span: *id001
+    address: 0x7000
+    size: 0xf5000
+    region: flash_primary
+mcuboot_primary_app:
+    orig_span: &id002
+        - app
+    span: *id002
+    address: 0x7200
+    size: 0xf4e00
+settings_storage:
+    address: 0xfc000
+    size: 0x4000
+    region: flash_primary
+mcuboot_secondary:
+    address: 0x0
+    size: 0xf5000
+    device: MX25R64
+    region: external_flash
+external_flash:
+    address: 0xf5000
+    size: 0x70b000
+    device: MX25R64
+    region: external_flash
diff --git a/examples/all-clusters-minimal-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml b/examples/all-clusters-minimal-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml
new file mode 100644
index 00000000000000..ba02c6e5645eea
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml
@@ -0,0 +1,52 @@
+mcuboot:
+    address: 0x0
+    size: 0xC000
+    region: flash_primary
+mcuboot_pad:
+    address: 0xC000
+    size: 0x200
+app:
+    address: 0xC200
+    size: 0xefe00
+mcuboot_primary:
+    orig_span: &id001
+        - mcuboot_pad
+        - app
+    span: *id001
+    address: 0xC000
+    size: 0xf0000
+    region: flash_primary
+mcuboot_primary_app:
+    orig_span: &id002
+        - app
+    span: *id002
+    address: 0xC200
+    size: 0xefe00
+settings_storage:
+    address: 0xfc000
+    size: 0x4000
+    region: flash_primary
+mcuboot_primary_1:
+    address: 0x0
+    size: 0x40000
+    device: flash_ctrl
+    region: ram_flash
+mcuboot_secondary:
+    address: 0x0
+    size: 0xf0000
+    device: MX25R64
+    region: external_flash
+mcuboot_secondary_1:
+    address: 0xf0000
+    size: 0x40000
+    device: MX25R64
+    region: external_flash
+external_flash:
+    address: 0x130000
+    size: 0x6D0000
+    device: MX25R64
+    region: external_flash
+pcd_sram:
+    address: 0x20000000
+    size: 0x2000
+    region: sram_primary
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp
new file mode 100644
index 00000000000000..8f7c646bd8471d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp
@@ -0,0 +1,407 @@
+/*
+ *    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 "AppTask.h"
+#include "AppConfig.h"
+#include "AppEvent.h"
+#include "LEDUtil.h"
+#include "binding-handler.h"
+
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/server/Server.h>
+
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/util/attribute-storage.h>
+
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+
+#if CONFIG_CHIP_OTA_REQUESTOR
+#include "OTAUtil.h"
+#endif
+
+#include <dk_buttons_and_leds.h>
+#include <logging/log.h>
+#include <zephyr.h>
+
+using namespace ::chip;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+
+#define FACTORY_RESET_TRIGGER_TIMEOUT 3000
+#define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000
+#define APP_EVENT_QUEUE_SIZE 10
+#define BUTTON_PUSH_EVENT 1
+#define BUTTON_RELEASE_EVENT 0
+
+LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
+K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), APP_EVENT_QUEUE_SIZE, alignof(AppEvent));
+
+static LEDWidget sStatusLED;
+static UnusedLedsWrapper<3> sUnusedLeds{ { DK_LED2, DK_LED3, DK_LED4 } };
+static k_timer sFunctionTimer;
+
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+namespace LedConsts {
+constexpr uint32_t kBlinkRate_ms{ 500 };
+namespace StatusLed {
+namespace Unprovisioned {
+constexpr uint32_t kOn_ms{ 100 };
+constexpr uint32_t kOff_ms{ kOn_ms };
+} // namespace Unprovisioned
+namespace Provisioned {
+constexpr uint32_t kOn_ms{ 50 };
+constexpr uint32_t kOff_ms{ 950 };
+} // namespace Provisioned
+
+} // namespace StatusLed
+} // namespace LedConsts
+
+CHIP_ERROR AppTask::Init()
+{
+    // Initialize CHIP stack
+    LOG_INF("Init CHIP stack");
+
+    CHIP_ERROR err = chip::Platform::MemoryInit();
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("Platform::MemoryInit() failed");
+        return err;
+    }
+
+    err = PlatformMgr().InitChipStack();
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("PlatformMgr().InitChipStack() failed");
+        return err;
+    }
+
+    err = ThreadStackMgr().InitThreadStack();
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("ThreadStackMgr().InitThreadStack() failed");
+        return err;
+    }
+
+#ifdef CONFIG_OPENTHREAD_MTD_SED
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#else
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
+        return err;
+    }
+
+    // Initialize LEDs
+    LEDWidget::InitGpio();
+    LEDWidget::SetStateUpdateCallback(LEDStateUpdateHandler);
+
+    sStatusLED.Init(SYSTEM_STATE_LED);
+
+    UpdateStatusLED();
+
+    // Initialize buttons
+    auto ret = dk_buttons_init(ButtonEventHandler);
+    if (ret)
+    {
+        LOG_ERR("dk_buttons_init() failed");
+        return chip::System::MapErrorZephyr(ret);
+    }
+    err = InitBindingHandlers();
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("InitBindingHandlers() failed");
+    }
+
+    // Initialize timer user data
+    k_timer_init(&sFunctionTimer, &AppTask::TimerEventHandler, nullptr);
+    k_timer_user_data_set(&sFunctionTimer, this);
+
+    // Initialize CHIP server
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
+#if CONFIG_CHIP_OTA_REQUESTOR
+    InitBasicOTARequestor();
+#endif
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+    ConfigurationMgr().LogDeviceConfig();
+    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
+
+    // Add CHIP event handler and start CHIP thread.
+    // Note that all the initialization code should happen prior to this point to avoid data races
+    // between the main and the CHIP threads
+    PlatformMgr().AddEventHandler(ChipEventHandler, 0);
+    err = PlatformMgr().StartEventLoopTask();
+    if (err != CHIP_NO_ERROR)
+    {
+        LOG_ERR("PlatformMgr().StartEventLoopTask() failed");
+    }
+
+    return err;
+}
+
+CHIP_ERROR AppTask::StartApp()
+{
+    ReturnErrorOnFailure(Init());
+
+    AppEvent event{};
+
+    while (true)
+    {
+        k_msgq_get(&sAppEventQueue, &event, K_FOREVER);
+        DispatchEvent(&event);
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+void AppTask::ButtonEventHandler(uint32_t aButtonState, uint32_t aHasChanged)
+{
+    AppEvent event;
+    event.Type = AppEvent::Type::Button;
+
+    if (FUNCTION_BUTTON_MASK & aHasChanged)
+    {
+        event.ButtonEvent.PinNo  = FUNCTION_BUTTON;
+        event.ButtonEvent.Action = (FUNCTION_BUTTON_MASK & aButtonState) ? BUTTON_PUSH_EVENT : BUTTON_RELEASE_EVENT;
+        event.Handler            = FunctionHandler;
+        PostEvent(&event);
+    }
+
+    if (BLE_ADVERTISEMENT_START_BUTTON_MASK & aButtonState & aHasChanged)
+    {
+        event.ButtonEvent.PinNo  = BLE_ADVERTISEMENT_START_BUTTON;
+        event.ButtonEvent.Action = BUTTON_PUSH_EVENT;
+        event.Handler            = StartBLEAdvertisementHandler;
+        PostEvent(&event);
+    }
+}
+
+void AppTask::TimerEventHandler(k_timer * aTimer)
+{
+    if (!aTimer)
+        return;
+
+    AppEvent event;
+    event.Type               = AppEvent::Type::Timer;
+    event.TimerEvent.Context = k_timer_user_data_get(aTimer);
+    event.Handler            = FunctionTimerEventHandler;
+    PostEvent(&event);
+}
+
+void AppTask::FunctionTimerEventHandler(AppEvent * aEvent)
+{
+    if (!aEvent)
+        return;
+    if (aEvent->Type != AppEvent::Type::Timer)
+        return;
+
+    // If we reached here, the button was held past FACTORY_RESET_TRIGGER_TIMEOUT, initiate factory reset
+    if (Instance().mFunctionTimerActive && Instance().mMode == OperatingMode::Normal)
+    {
+        LOG_INF("Factory Reset Triggered. Release button within %ums to cancel.", FACTORY_RESET_TRIGGER_TIMEOUT);
+
+        // Start timer for FACTORY_RESET_CANCEL_WINDOW_TIMEOUT to allow user to cancel, if required.
+        StartTimer(FACTORY_RESET_CANCEL_WINDOW_TIMEOUT);
+        Instance().mMode = OperatingMode::FactoryReset;
+
+#ifdef CONFIG_STATE_LEDS
+        // Turn off all LEDs before starting blink to make sure blink is co-ordinated.
+        sStatusLED.Set(false);
+        sUnusedLeds.Set(false);
+
+        sStatusLED.Blink(LedConsts::kBlinkRate_ms);
+        sUnusedLeds.Blink(LedConsts::kBlinkRate_ms);
+#endif
+    }
+    else if (Instance().mFunctionTimerActive && Instance().mMode == OperatingMode::FactoryReset)
+    {
+        // Actually trigger Factory Reset
+        Instance().mMode = OperatingMode::Normal;
+        ConfigurationMgr().InitiateFactoryReset();
+    }
+}
+
+void AppTask::FunctionHandler(AppEvent * aEvent)
+{
+    if (!aEvent)
+        return;
+    if (aEvent->ButtonEvent.PinNo != FUNCTION_BUTTON)
+        return;
+
+    // To initiate factory reset: press the FUNCTION_BUTTON for FACTORY_RESET_TRIGGER_TIMEOUT + FACTORY_RESET_CANCEL_WINDOW_TIMEOUT
+    // All LEDs start blinking after FACTORY_RESET_TRIGGER_TIMEOUT to signal factory reset has been initiated.
+    // To cancel factory reset: release the FUNCTION_BUTTON once all LEDs start blinking within the
+    // FACTORY_RESET_CANCEL_WINDOW_TIMEOUT
+    if (aEvent->ButtonEvent.Action == BUTTON_PUSH_EVENT)
+    {
+        if (!Instance().mFunctionTimerActive && Instance().mMode == OperatingMode::Normal)
+        {
+            StartTimer(FACTORY_RESET_TRIGGER_TIMEOUT);
+        }
+    }
+    else
+    {
+        if (Instance().mFunctionTimerActive && Instance().mMode == OperatingMode::FactoryReset)
+        {
+            sUnusedLeds.Set(false);
+
+            UpdateStatusLED();
+            CancelTimer();
+
+            // Change the function to none selected since factory reset has been canceled.
+            Instance().mMode = OperatingMode::Normal;
+
+            LOG_INF("Factory Reset has been Canceled");
+        }
+        else if (Instance().mFunctionTimerActive)
+        {
+            CancelTimer();
+            Instance().mMode = OperatingMode::Normal;
+        }
+    }
+}
+
+void AppTask::StartBLEAdvertisementHandler(AppEvent *)
+{
+    if (Server::GetInstance().GetFabricTable().FabricCount() != 0)
+    {
+        LOG_INF("Matter service BLE advertising not started - device is already commissioned");
+        return;
+    }
+
+    if (ConnectivityMgr().IsBLEAdvertisingEnabled())
+    {
+        LOG_INF("BLE advertising is already enabled");
+        return;
+    }
+
+    if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() != CHIP_NO_ERROR)
+    {
+        LOG_ERR("OpenBasicCommissioningWindow() failed");
+    }
+}
+
+void AppTask::UpdateLedStateEventHandler(AppEvent * aEvent)
+{
+    if (!aEvent)
+        return;
+    if (aEvent->Type == AppEvent::Type::UpdateLedState)
+    {
+        aEvent->UpdateLedStateEvent.LedWidget->UpdateState();
+    }
+}
+
+void AppTask::LEDStateUpdateHandler(LEDWidget & aLedWidget)
+{
+    AppEvent event;
+    event.Type                          = AppEvent::Type::UpdateLedState;
+    event.Handler                       = UpdateLedStateEventHandler;
+    event.UpdateLedStateEvent.LedWidget = &aLedWidget;
+    PostEvent(&event);
+}
+
+void AppTask::UpdateStatusLED()
+{
+#ifdef CONFIG_STATE_LEDS
+    /* Update the status LED.
+     *
+     * If thread and service provisioned, keep the LED On constantly.
+     *
+     * If the system has ble connection(s) uptill the stage above, THEN blink the LED at an even
+     * rate of 100ms.
+     *
+     * Otherwise, blink the LED On for a very short time. */
+    if (Instance().mIsThreadProvisioned && Instance().mIsThreadEnabled)
+    {
+        sStatusLED.Set(true);
+    }
+    else if (Instance().mHaveBLEConnections)
+    {
+        sStatusLED.Blink(LedConsts::StatusLed::Unprovisioned::kOn_ms, LedConsts::StatusLed::Unprovisioned::kOff_ms);
+    }
+    else
+    {
+        sStatusLED.Blink(LedConsts::StatusLed::Provisioned::kOn_ms, LedConsts::StatusLed::Provisioned::kOff_ms);
+    }
+#endif
+}
+
+void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* aArg */)
+{
+    if (!aEvent)
+        return;
+    switch (aEvent->Type)
+    {
+    case DeviceEventType::kCHIPoBLEAdvertisingChange:
+        Instance().mHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
+        UpdateStatusLED();
+        break;
+    case DeviceEventType::kThreadStateChange:
+        Instance().mIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned();
+        Instance().mIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
+        UpdateStatusLED();
+        break;
+    default:
+        break;
+    }
+}
+
+void AppTask::CancelTimer()
+{
+    k_timer_stop(&sFunctionTimer);
+    Instance().mFunctionTimerActive = false;
+}
+
+void AppTask::StartTimer(uint32_t aTimeoutInMs)
+{
+    k_timer_start(&sFunctionTimer, K_MSEC(aTimeoutInMs), K_NO_WAIT);
+    Instance().mFunctionTimerActive = true;
+}
+
+void AppTask::PostEvent(AppEvent * aEvent)
+{
+    if (!aEvent)
+        return;
+    if (k_msgq_put(&sAppEventQueue, aEvent, K_NO_WAIT))
+    {
+        LOG_INF("Failed to post event to app task event queue");
+    }
+}
+
+void AppTask::DispatchEvent(AppEvent * aEvent)
+{
+    if (!aEvent)
+        return;
+    if (aEvent->Handler)
+    {
+        aEvent->Handler(aEvent);
+    }
+    else
+    {
+        LOG_INF("Event received with no handler. Dropping event.");
+    }
+}
diff --git a/src/transport/MessageCounter.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppConfig.h
similarity index 62%
rename from src/transport/MessageCounter.cpp
rename to examples/all-clusters-minimal-app/nrfconnect/main/include/AppConfig.h
index 59fae9bfc9f2e7..01465d3bb17a62 100644
--- a/src/transport/MessageCounter.cpp
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppConfig.h
@@ -1,5 +1,6 @@
 /*
- *    Copyright (c) 2021 Project CHIP Authors
+ *    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.
@@ -14,22 +15,13 @@
  *    limitations under the License.
  */
 
-/**
- *    @file
- *      This file defines the CHIP message counters.
- *
- */
-
-#include <transport/MessageCounter.h>
-
-#include <crypto/RandUtils.h>
-#include <platform/CHIPDeviceLayer.h>
+#pragma once
 
-namespace chip {
+// ---- All Clusters Application example config ----
 
-void GlobalUnencryptedMessageCounter::Init()
-{
-    mValue = Crypto::GetRandU32();
-}
+#define FUNCTION_BUTTON DK_BTN1
+#define FUNCTION_BUTTON_MASK DK_BTN1_MSK
+#define BLE_ADVERTISEMENT_START_BUTTON DK_BTN4
+#define BLE_ADVERTISEMENT_START_BUTTON_MASK DK_BTN4_MSK
 
-} // namespace chip
+#define SYSTEM_STATE_LED DK_LED1
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/include/AppEvent.h b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppEvent.h
new file mode 100644
index 00000000000000..f6cac85b182b32
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppEvent.h
@@ -0,0 +1,56 @@
+/*
+ *    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 <cstdint>
+
+class LEDWidget;
+
+struct AppEvent
+{
+    using EventHandler = void (*)(AppEvent *);
+
+    enum class Type : uint8_t
+    {
+        None,
+        Button,
+        Timer,
+        UpdateLedState,
+    };
+
+    Type Type{ Type::None };
+
+    union
+    {
+        struct
+        {
+            uint8_t PinNo;
+            uint8_t Action;
+        } ButtonEvent;
+        struct
+        {
+            void * Context;
+        } TimerEvent;
+        struct
+        {
+            LEDWidget * LedWidget;
+        } UpdateLedStateEvent;
+    };
+
+    EventHandler Handler;
+};
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h
new file mode 100644
index 00000000000000..e7402653f7237c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h
@@ -0,0 +1,66 @@
+/*
+ *    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 <platform/CHIPDeviceLayer.h>
+
+struct k_timer;
+class AppEvent;
+class LEDWidget;
+
+class AppTask
+{
+public:
+    static AppTask & Instance(void)
+    {
+        static AppTask sAppTask;
+        return sAppTask;
+    };
+    CHIP_ERROR StartApp();
+
+private:
+    enum class OperatingMode : uint8_t
+    {
+        Normal,
+        FactoryReset,
+        Invalid
+    };
+
+    CHIP_ERROR Init();
+    void DispatchEvent(AppEvent * aEvent);
+
+    // statics needed to interact with zephyr C API
+    static void CancelTimer(void);
+    static void StartTimer(uint32_t aTimeoutInMs);
+    static void FunctionTimerEventHandler(AppEvent * aEvent);
+    static void FunctionHandler(AppEvent * aEvent);
+    static void ButtonEventHandler(uint32_t aButtonsState, uint32_t aHasChanged);
+    static void TimerEventHandler(k_timer * aTimer);
+    static void PostEvent(AppEvent * aEvent);
+    static void UpdateStatusLED();
+    static void LEDStateUpdateHandler(LEDWidget & aLedWidget);
+    static void UpdateLedStateEventHandler(AppEvent * aEvent);
+    static void StartBLEAdvertisementHandler(AppEvent * aEvent);
+    static void ChipEventHandler(const chip::DeviceLayer::ChipDeviceEvent * aEvent, intptr_t aArg);
+
+    OperatingMode mMode{ OperatingMode::Normal };
+    bool mFunctionTimerActive{ false };
+    bool mIsThreadProvisioned{ false };
+    bool mIsThreadEnabled{ false };
+    bool mHaveBLEConnections{ false };
+};
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h
new file mode 100644
index 00000000000000..7a2941f28621df
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -0,0 +1,33 @@
+/*
+ *    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.
+ */
+
+/**
+ *    @file
+ *          Example project configuration file for CHIP.
+ *
+ *          This is a place to put application or project-specific overrides
+ *          to the default configuration values for general CHIP features.
+ *
+ */
+
+#pragma once
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+
+#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 2000_ms32
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/main.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/main.cpp
new file mode 100644
index 00000000000000..8f71ca55e41070
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/main.cpp
@@ -0,0 +1,70 @@
+/*
+ *    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 "AppTask.h"
+
+#include <logging/log.h>
+
+#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart)
+#include <drivers/uart.h>
+#include <usb/usb_device.h>
+#endif
+
+LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
+
+using namespace ::chip;
+
+#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart)
+static int InitUSB()
+{
+    int err = usb_enable(nullptr);
+
+    if (err)
+    {
+        LOG_ERR("Failed to initialize USB device");
+        return err;
+    }
+
+    const struct device * dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+    uint32_t dtr              = 0;
+
+    while (!dtr)
+    {
+        uart_line_ctrl_get(dev, UART_LINE_CTRL_DTR, &dtr);
+        k_sleep(K_MSEC(100));
+    }
+
+    return 0;
+}
+#endif
+
+int main()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart)
+    err = System::MapErrorZephyr(InitUSB());
+#endif
+
+    if (err == CHIP_NO_ERROR)
+    {
+        err = AppTask::Instance().StartApp();
+    }
+
+    LOG_ERR("Exited with code %" CHIP_ERROR_FORMAT, err.Format());
+    return err == CHIP_NO_ERROR ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/all-clusters-minimal-app/nrfconnect/overlay-low_power.conf b/examples/all-clusters-minimal-app/nrfconnect/overlay-low_power.conf
new file mode 100644
index 00000000000000..c962425f6ef937
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/overlay-low_power.conf
@@ -0,0 +1,30 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+# Enable MTD Sleepy End Device
+CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
+
+# Disable UART console
+CONFIG_SHELL=n
+CONFIG_LOG=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+
+# Suspend devices when the CPU goes to sleep
+CONFIG_PM_DEVICE=y
+
+# Disable auxiliary state LEDs
+CONFIG_STATE_LEDS=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf52840dongle_nrf52840.yml b/examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf52840dongle_nrf52840.yml
new file mode 100644
index 00000000000000..ad0f9426169e9d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf52840dongle_nrf52840.yml
@@ -0,0 +1,8 @@
+settings_storage:
+    address: 0xd8000
+    size: 0x8000
+    region: flash_primary
+open_bootloader:
+    address: 0xe0000
+    size: 0x20000
+    region: flash_primary
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
new file mode 100644
index 00000000000000..a75017723ceea3
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
@@ -0,0 +1,51 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+CONFIG_CHIP=y
+CONFIG_STD_CPP14=y
+
+# This sample uses Kconfig.defaults to set options common for all
+# samples. This file should contain only options specific for this sample
+# or overrides of default values.
+
+# Add support for LEDs and buttons on Nordic development kits
+CONFIG_DK_LIBRARY=y
+
+# OpenThread settings
+CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
+CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
+# Bluetooth overrides
+CONFIG_BT_DEVICE_NAME="AllClusters"
+
+# Additional configs for debbugging experience.
+CONFIG_THREAD_NAME=y
+CONFIG_MPU_STACK_GUARD=y
+CONFIG_RESET_ON_FATAL_ERROR=n
+
+# Disable OTA requestor
+CONFIG_CHIP_OTA_REQUESTOR=n
+
+# Disable QSPI NOR
+CONFIG_CHIP_QSPI_NOR=n
+
+# CHIP configuration
+CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
+
+# CHIP PID: 32769 == 0x8001 (all-clusters-minimal-app)
+CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf
new file mode 100644
index 00000000000000..16dd33d9574500
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf
@@ -0,0 +1,45 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+CONFIG_CHIP=y
+CONFIG_STD_CPP14=y
+
+# This sample uses Kconfig.defaults to set options common for all
+# samples. This file should contain only options specific for this sample
+# or overrides of default values.
+
+# Add support for LEDs and buttons on Nordic development kits
+CONFIG_DK_LIBRARY=y
+
+# OpenThread settings
+CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
+CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
+# Bluetooth overrides
+CONFIG_BT_DEVICE_NAME="AllClusters"
+
+# Additional configs for debbugging experience.
+CONFIG_THREAD_NAME=y
+CONFIG_MPU_STACK_GUARD=y
+CONFIG_RESET_ON_FATAL_ERROR=n
+
+# CHIP configuration
+CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
+
+# CHIP PID: 32769 == 0x8001 (all-clusters-minimal-app)
+CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
new file mode 100644
index 00000000000000..73ff63af0ddcbb
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
@@ -0,0 +1,55 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+CONFIG_CHIP=y
+CONFIG_STD_CPP14=y
+
+# This sample uses Kconfig.defaults to set options common for all
+# samples. This file should contain only options specific for this sample
+# or overrides of default values.
+
+# Add support for LEDs and buttons on Nordic development kits
+CONFIG_DK_LIBRARY=y
+
+# OpenThread settings
+CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
+CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
+# Bluetooth overrides
+CONFIG_BT_DEVICE_NAME="AllClusters"
+
+# Enable system reset on fatal error
+CONFIG_RESET_ON_FATAL_ERROR=y
+
+# CHIP configuration
+CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
+
+# CHIP PID: 32769 == 0x8001 (all-clusters-minimal-app)
+CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
+
+# Disable all debug features
+CONFIG_SHELL=n
+CONFIG_OPENTHREAD_SHELL=n
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_LOG=n
+CONFIG_LOG_MODE_MINIMAL=n
+CONFIG_ASSERT_VERBOSE=n
+CONFIG_PRINTK=n
+CONFIG_THREAD_NAME=n
diff --git a/examples/all-clusters-minimal-app/nrfconnect/third_party/connectedhomeip b/examples/all-clusters-minimal-app/nrfconnect/third_party/connectedhomeip
new file mode 120000
index 00000000000000..c866b86874994d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nrfconnect/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../..
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md b/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md
new file mode 100644
index 00000000000000..9a90a11e0dccc4
--- /dev/null
+++ b/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md
@@ -0,0 +1,4 @@
+To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
+**EVK**, see the associated
+[README document](../../../../../docs/guides/nxp_imx8m_linux_examples.md) for
+details.
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml b/examples/all-clusters-minimal-app/p6/.gn
similarity index 62%
rename from src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml
rename to examples/all-clusters-minimal-app/p6/.gn
index ba3f0276ecbbef..81cec9d11a421b 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml
+++ b/examples/all-clusters-minimal-app/p6/.gn
@@ -11,15 +11,18 @@
 # 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: 28.1.1. [TC-BDX-1.1] Sender Initiated BDX Transfer session
+import("//build_overrides/build.gni")
 
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
 
-tests:
-    - label: "DUT sends a SendInit message to TH"
-      disabled: true
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  target_cpu = "arm"
+  target_os = "freertos"
+
+  import("//args.gni")
+}
diff --git a/examples/all-clusters-minimal-app/p6/BUILD.gn b/examples/all-clusters-minimal-app/p6/BUILD.gn
new file mode 100644
index 00000000000000..a9b88c2125b219
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/BUILD.gn
@@ -0,0 +1,178 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+import("//build_overrides/p6.gni")
+
+import("${build_root}/config/defaults.gni")
+import("${chip_root}/src/platform/device.gni")
+import("${p6_sdk_build_root}/p6_executable.gni")
+import("${p6_sdk_build_root}/p6_sdk.gni")
+
+assert(current_os == "freertos")
+
+p6_project_dir = "${chip_root}/examples/all-clusters-minimal-app/p6"
+examples_plat_dir = "${chip_root}/examples/platform/p6"
+
+declare_args() {
+  # Dump memory usage at link time.
+  chip_print_memory_usage = false
+
+  # PIN code for PASE session establishment.
+  setup_pin_code = 20202021
+
+  # Monitor & log memory usage at runtime.
+  enable_heap_monitoring = false
+
+  # Build update app
+  build_update_image = false
+}
+
+config("p6_ota_config") {
+  ldflags = [ "-T/" + rebase_path(
+                  "${chip_root}/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld",
+                  "/",
+                  "${p6_project_dir}") ]
+
+  ldflags += [ "-Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,MCUBOOT_BOOTLOADER_SIZE=0x18000,--defsym,CY_BOOT_PRIMARY_1_SIZE=0x1C0000" ]
+
+  defines = [
+    "P6_OTA",
+    "OTA_SUPPORT ",
+    "OTA_USE_EXTERNAL_FLASH",
+    "CY_BOOT_USE_EXTERNAL_FLASH",
+    "MCUBOOT_HEADER_SIZE=0x400",
+    "MCUBOOT_MAX_IMG_SECTORS=3584",
+    "CY_BOOT_SCRATCH_SIZE=0x00004000",
+    "MCUBOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_PRIMARY_1_START=0x00018000",
+    "CY_BOOT_PRIMARY_1_SIZE=0x1C0000",
+    "CY_BOOT_SECONDARY_1_START=0x00000000",
+    "CY_BOOT_SECONDARY_1_SIZE=0x001C0000",
+    "CY_FLASH_ERASE_VALUE=0xFF",
+    "MCUBOOT_IMAGE_NUMBER=1",
+    "MCUBOOT_SLOT_SIZE=0x1C0000",
+    "MCUBOOT_SCRATCH_SIZE=0x4000",
+    "MCUBOOT_SECTOR_SIZE = 512",
+    "APP_VERSION_MAJOR=1",
+    "APP_VERSION_MINOR=0",
+    "APP_VERSION_BUILD=0",
+    "MCUBOOT_OVERWRITE_ONLY",
+    "CY_ENABLE_XIP_PROGRAM",
+  ]
+
+  if (build_update_image) {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=2" ]
+  } else {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=1" ]
+  }
+}
+
+p6_sdk_sources("all_clusters_app_sdk_sources") {
+  include_dirs = [
+    "${chip_root}/src/platform/P6",
+    "${p6_project_dir}/include",
+    "${examples_plat_dir}",
+  ]
+
+  defines = [
+    "BOARD_ID=${p6_board}",
+    "P6_LOG_ENABLED=1",
+    "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setup_pin_code}",
+  ]
+
+  sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ]
+
+  public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/src/bootutil_misc.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_map.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_smif_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/mem_config_sfdp.c",
+    ]
+    include_dirs += [
+      "${chip_root}/third_party/p6/p6_sdk/ota/config",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/flash_map_backend/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/sysflash/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/include",
+    ]
+    public_configs += [ ":p6_ota_config" ]
+  }
+}
+
+p6_executable("clusters_minimal_app") {
+  include_dirs = []
+  defines = []
+  output_name = "chip-p6-clusters-minimal-example.out"
+
+  sources = [
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
+    "${examples_plat_dir}/LEDWidget.cpp",
+    "${examples_plat_dir}/init_p6Platform.cpp",
+    "src/AppTask.cpp",
+    "src/ButtonHandler.cpp",
+    "src/ClusterManager.cpp",
+    "src/ZclCallbacks.cpp",
+    "src/main.cpp",
+  ]
+
+  deps = [
+    ":all_clusters_app_sdk_sources",
+    "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common",
+    "${chip_root}/examples/common/QRCode",
+    "${chip_root}/src/lib",
+    "${chip_root}/src/setup_payload",
+  ]
+
+  include_dirs += [
+    "include",
+    "${examples_plat_dir}",
+    "${p6_project_dir}/include",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
+  ]
+
+  defines = []
+
+  if (enable_heap_monitoring) {
+    sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ]
+    defines += [ "HEAP_MONITORING" ]
+  }
+
+  if (chip_print_memory_usage) {
+    ldflags += [
+      "-Wl,--print-memory-usage",
+      "-fstack-usage",
+    ]
+  }
+
+  output_dir = root_out_dir
+}
+
+group("p6") {
+  deps = [ ":clusters_minimal_app" ]
+}
+
+group("default") {
+  deps = [ ":p6" ]
+}
diff --git a/examples/all-clusters-minimal-app/p6/README.md b/examples/all-clusters-minimal-app/p6/README.md
new file mode 100644
index 00000000000000..c6b752d209a6ca
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/README.md
@@ -0,0 +1,143 @@
+#CHIP P6 All Clusters Example
+
+An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
+
+<hr>
+
+-   [Matter P6 All Clusters Example](#chip-p6-clusters-example)
+    -   [Introduction](#introduction)
+    -   [Building](#building)
+    -   [Flashing the Application](#flashing-the-application)
+    -   [Commissioning and cluster control](#commissioning-and-cluster-control)
+        -   [Setting up chip-tool](#setting-up-chip-tool)
+        -   [Commissioning over BLE](#commissioning-over-ble)
+            -   [Notes](#notes)
+    -   [OTA Software Update](#ota-software-update)
+
+<hr>
+
+<a name="intro"></a>
+
+## Introduction
+
+The P6 clusters example provides a baseline demonstration of a Cluster control
+device, built using Matter and the Infineon Modustoolbox SDK. It can be
+controlled by Matter controller over Wi-Fi network.
+
+The P6 device can be commissioned over Bluetooth Low Energy where the device and
+the Matter controller will exchange security information with the Rendezvous
+procedure. Wi-Fi Network credentials are then provided to the P6 device which
+will then join the network.
+
+<a name="building"></a>
+
+## Building
+
+-   [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
+
+    Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
+    `scripts/examples/gn_p6_example.sh` for downloading the Software and related
+    tools.
+
+-   Install some additional tools (likely already present for Matter
+    developers):
+
+    ```
+    sudo apt install gcc g++ clang ninja-build python \
+      python3-venv libssl-dev libavahi-client-dev libglib2.0-dev git cmake \
+      python3-pip
+    ```
+
+-   Supported hardware:
+    [CY8CKIT-062S2-43012](https://www.cypress.com/CY8CKIT-062S2-43012)
+
+*   Build the example application:
+
+          ```
+          $ ./scripts/examples/gn_p6_example.sh ./examples/all-clusters-minimal-app/p6 out/minimal_clusters_app_p6
+          ```
+
+-   To delete generated executable, libraries and object files use:
+
+          ```
+          $ cd ~/connectedhomeip
+          $ rm -rf out/
+          ```
+
+<a name="flashing"></a>
+
+## Flashing the Application
+
+-   Put CY8CKIT-062S2-43012 board on KitProg3 CMSIS-DAP Mode by pressing the
+    `MODE SELECT` button. `KITPROG3 STATUS` LED is ON confirms board is in
+    proper mode.
+
+-   On the command line:
+
+          ```
+          $ cd ~/connectedhomeip
+          $ python3 out/clusters_app_p6/chip-p6-clusters-minimal-example.flash.py
+          ```
+
+<a name="Commissioning and cluster control"></a>
+
+## Commissioning and cluster control
+
+Commissioning can be carried out using BLE.
+
+<a name="Setting up chip-tool"></a>
+
+### Setting up Chip tool
+
+Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to
+perform commissioning and cluster control.
+
+-   Set up python controller.
+
+           ```
+           $ cd {path-to-connectedhomeip}
+           $ ./scripts/examples/gn_build_example.sh examples/chip-tool out/debug
+           ```
+
+-   Execute the controller.
+
+           ```
+           $ ./out/debug/chip-tool
+           ```
+
+<a name="Commissioning over BLE"></a>
+
+### Commissioning over BLE
+
+Run the built executable and pass it the discriminator and pairing code of the
+remote device, as well as the network credentials to use.
+
+         ```
+         $ ./out/debug/chip-tool pairing ble-wifi 1234 ${SSID} ${PASSWORD} 20202021 3840
+
+         Parameters:
+         1. Discriminator: 3840
+         2. Setup-pin-code: 20202021
+         3. Node ID: 1234 (you can assign any node id)
+         4. SSID : Wi-Fi SSID
+         5. PASSWORD : Wi-Fi Password
+         ```
+
+<a name="Notes"></a>
+
+#### Notes
+
+Raspberry Pi 4 BLE connection issues can be avoided by running the following
+commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
+
+          ```
+          sudo btmgmt -i hci0 power off
+          sudo btmgmt -i hci0 bredr off
+          sudo btmgmt -i hci0 power on
+          ```
+
+## OTA Software Update
+
+For the description of Software Update process with infineon P6 example
+applications see
+[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md)
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml b/examples/all-clusters-minimal-app/p6/args.gni
similarity index 57%
rename from src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml
rename to examples/all-clusters-minimal-app/p6/args.gni
index fd1467c55a61dc..2a93385cf36bd6 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml
+++ b/examples/all-clusters-minimal-app/p6/args.gni
@@ -11,17 +11,10 @@
 # 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: 28.1.3. [TC-BDX-1.3] Response to Sender Initiated BDX Transfer session
+import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
+import("${chip_root}/src/platform/P6/args.gni")
 
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH sends a SendInit message to DUT + DUT sends a SendAccept message
-          back to TH"
-      disabled: true
+p6_target_project =
+    get_label_info(":all_clusters_app_sdk_sources", "label_no_toolchain")
diff --git a/examples/all-clusters-minimal-app/p6/build_overrides b/examples/all-clusters-minimal-app/p6/build_overrides
new file mode 120000
index 00000000000000..194ee0b812dc3d
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/build_overrides
@@ -0,0 +1 @@
+../../build_overrides/
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/p6/include/AppConfig.h b/examples/all-clusters-minimal-app/p6/include/AppConfig.h
new file mode 100644
index 00000000000000..8e9ebe286ef421
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/include/AppConfig.h
@@ -0,0 +1,62 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "cybsp.h"
+#include "cyhal.h"
+
+// ---- Lighting Example App Config ----
+
+#define APP_TASK_NAME "APP"
+
+#define APP_LIGHT_BUTTON_IDX 0
+#define APP_LIGHT_BUTTON CYBSP_USER_BTN1
+#define APP_BUTTON_DEBOUNCE_PERIOD_MS 50
+
+#define APP_BUTTON_PRESSED 0
+#define APP_BUTTON_RELEASED 1
+
+#define SYSTEM_STATE_LED CYBSP_USER_LED1
+#define LIGHT_LED CYBSP_USER_LED2
+
+// Time it takes in ms for the simulated actuator to move from one
+// state to another.
+#define ACTUATOR_MOVEMENT_PERIOS_MS 2000
+
+// ---- Thread Polling Config ----
+#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100
+#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000
+
+// P6 Logging
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void appError(int err);
+void P6Log(const char * aFormat, ...);
+#define P6_LOG(...) P6Log(__VA_ARGS__)
+
+#ifdef __cplusplus
+}
+
+#include <lib/core/CHIPError.h>
+void appError(CHIP_ERROR error);
+#endif
diff --git a/examples/all-clusters-minimal-app/p6/include/AppEvent.h b/examples/all-clusters-minimal-app/p6/include/AppEvent.h
new file mode 100644
index 00000000000000..671a1be6419724
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/include/AppEvent.h
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+struct AppEvent;
+typedef void (*EventHandler)(AppEvent *);
+
+struct AppEvent
+{
+    enum AppEventTypes
+    {
+        kEventType_Button = 0,
+        kEventType_Timer,
+        kEventType_Light,
+        kEventType_Install,
+    };
+
+    uint16_t Type;
+
+    union
+    {
+        struct
+        {
+            uint8_t ButtonIdx;
+            uint8_t Action;
+        } ButtonEvent;
+        struct
+        {
+            void * Context;
+        } TimerEvent;
+    };
+
+    EventHandler Handler;
+};
diff --git a/examples/all-clusters-minimal-app/p6/include/AppTask.h b/examples/all-clusters-minimal-app/p6/include/AppTask.h
new file mode 100644
index 00000000000000..5bb9a9163225bf
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/include/AppTask.h
@@ -0,0 +1,64 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "AppEvent.h"
+#include "FreeRTOS.h"
+#include "timers.h" // provides FreeRTOS timer support
+#include <ble/BLEEndPoint.h>
+#include <platform/CHIPDeviceLayer.h>
+
+// Application-defined error codes in the CHIP_ERROR space.
+#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
+#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
+#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
+#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
+#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
+#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
+
+class AppTask
+{
+
+public:
+    CHIP_ERROR StartAppTask();
+    static void AppTaskMain(void * pvParameter);
+    static void LightActionEventHandler(AppEvent * aEvent);
+    void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
+    void PostEvent(const AppEvent * event);
+    void InitOTARequestor();
+
+private:
+    friend AppTask & GetAppTask(void);
+
+    CHIP_ERROR Init();
+
+    static AppTask sAppTask;
+    void DispatchEvent(AppEvent * event);
+    static void OnOffUpdateClusterState(intptr_t context);
+};
+
+inline AppTask & GetAppTask(void)
+{
+    return AppTask::sAppTask;
+}
diff --git a/examples/all-clusters-minimal-app/p6/include/ButtonHandler.h b/examples/all-clusters-minimal-app/p6/include/ButtonHandler.h
new file mode 100644
index 00000000000000..85dcdb5e952ca3
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/include/ButtonHandler.h
@@ -0,0 +1,40 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#include "FreeRTOS.h"
+#include "cyhal.h"
+#include "timers.h" // provides FreeRTOS timer support
+
+#define GPIO_INTERRUPT_PRIORITY (5)
+
+class ButtonHandler
+{
+public:
+    static void Init(void);
+
+private:
+    static void GpioInit(void);
+    static void lightbuttonIsr(void * handler_arg, cyhal_gpio_event_t event);
+    static void TimerCallback(TimerHandle_t xTimer);
+};
diff --git a/examples/all-clusters-minimal-app/p6/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/p6/include/CHIPProjectConfig.h
new file mode 100644
index 00000000000000..f582a28fce06b5
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/include/CHIPProjectConfig.h
@@ -0,0 +1,97 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Example project configuration file for CHIP.
+ *
+ *          This is a place to put application or project-specific overrides
+ *          to the default configuration values for general CHIP features.
+ *
+ */
+
+#pragma once
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+#endif
+
+// For convenience, Chip Security Test Mode can be enabled and the
+// requirement for authentication in various protocols can be disabled.
+//
+//    WARNING: These options make it possible to circumvent basic Chip security functionality,
+//    including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
+//
+#define CHIP_CONFIG_SECURITY_TEST_MODE 0
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
+ *
+ * The hardware version number assigned to device or product by the device vendor.  This
+ * number is scoped to the device product id, and typically corresponds to a version of the
+ * physical device, a change to its packaging, and/or a change to its marketing presentation.
+ * This value is generally *not* incremented for device software versions.
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+ *
+ * A string identifying the software version running on the device.
+ * CHIP service currently expects the software version to be in the format
+ * {MAJOR_VERSION}.0d{MINOR_VERSION}
+ */
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA"
+#endif
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+ *
+ * Enable support for Chip-over-BLE (CHIPoBLE).
+ */
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
+
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
+ *
+ * Enables synchronizing the device's real time clock with a remote Chip Time service
+ * using the Chip Time Sync protocol.
+ */
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
+
+/**
+ * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
+ *
+ * Enables the use of a hard-coded default serial number if none
+ * is found in Chip NV storage.
+ */
+#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
+
+/**
+ * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
+ *
+ * A size, in bytes, of the individual debug event logging buffer.
+ */
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
diff --git a/examples/all-clusters-minimal-app/p6/include/ClusterManager.h b/examples/all-clusters-minimal-app/p6/include/ClusterManager.h
new file mode 100644
index 00000000000000..1f7e073ff8abde
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/include/ClusterManager.h
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file ClusterManager.h
+ *
+ * Implementations for the DeviceManager callbacks for this application
+ *
+ **/
+
+#pragma once
+
+#include "LEDWidget.h"
+#include <app/util/af-types.h>
+#include <app/util/basic-types.h>
+#include <platform/CHIPDeviceLayer.h>
+
+extern LEDWidget sStatusLED;
+extern LEDWidget sLightLED;
+extern LEDWidget sClusterLED;
+
+class ClusterManager
+{
+public:
+    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnColorControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+
+private:
+    friend ClusterManager & ClusterMgr(void);
+    bool mEndpointOnOffState[2];
+    static ClusterManager sCluster;
+};
+
+inline ClusterManager & ClusterMgr(void)
+{
+    return ClusterManager::sCluster;
+}
diff --git a/examples/all-clusters-minimal-app/p6/ota_base_build.sh b/examples/all-clusters-minimal-app/p6/ota_base_build.sh
new file mode 100755
index 00000000000000..c49fad50303fdf
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/ota_base_build.sh
@@ -0,0 +1,8 @@
+OUT_DIR=out/all-clusters-minimal-app/
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+scripts/examples/gn_p6_example.sh examples/all-clusters-minimal-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true
+
+mv "$OUT_DIR"/chip-p6-clusters-minimal-example.hex "$OUT_DIR"/chip-p6-clusters-minimal-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-clusters-minimal-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py create 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy ""
diff --git a/examples/all-clusters-minimal-app/p6/ota_update_build.sh b/examples/all-clusters-minimal-app/p6/ota_update_build.sh
new file mode 100755
index 00000000000000..2aa7902556bd62
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/ota_update_build.sh
@@ -0,0 +1,13 @@
+OUT_DIR=out/all-clusters-minimal-app-ota
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+./scripts/examples/gn_p6_example.sh examples/all-clusters-minimal-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true build_update_image=true
+
+mv "$OUT_DIR"/chip-p6-clusters-minimal-example.hex "$OUT_DIR"/chip-p6-clusters-minimal-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-clusters-minimal-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py sign 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy "-k $ANYCLOUD_DIR/source/mcuboot/keys/cypress-test-ec-p256.pem"
+
+if [ -f "$OUT_DIR"/chip-p6-clusters-minimal-example.ota ]; then
+    rm "$OUT_DIR"/chip-p6-clusters-minimal-example.ota
+fi
+src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8000 -vn 2 -vs "2.0" -da sha256 "$OUT_DIR"/chip-p6-clusters-minimal-example.bin "$OUT_DIR"/chip-p6-clusters-minimal-example.ota
diff --git a/examples/all-clusters-minimal-app/p6/src/AppTask.cpp b/examples/all-clusters-minimal-app/p6/src/AppTask.cpp
new file mode 100644
index 00000000000000..c8717c30740357
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/src/AppTask.cpp
@@ -0,0 +1,348 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+#include "AppConfig.h"
+#include "AppEvent.h"
+#include "ButtonHandler.h"
+#include "LEDWidget.h"
+#include "qrcodegen.h"
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/server/Dnssd.h>
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/server/Server.h>
+#include <app/util/attribute-storage.h>
+#include <assert.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <cy_wcm.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+#include <setup_payload/SetupPayload.h>
+
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <platform/P6/NetworkCommissioningDriver.h>
+
+/* OTA related includes */
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+#include <platform/P6/OTAImageProcessorImpl.h>
+extern "C" {
+#include "cy_smif_psoc6.h"
+}
+using chip::BDXDownloader;
+using chip::CharSpan;
+using chip::DefaultOTARequestor;
+using chip::FabricIndex;
+using chip::GetRequestorInstance;
+using chip::NodeId;
+using chip::OTADownloader;
+using chip::OTAImageProcessorImpl;
+using chip::System::Layer;
+
+using namespace ::chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+#endif
+#define APP_EVENT_QUEUE_SIZE 10
+#define APP_TASK_STACK_SIZE (4096)
+#define APP_WAIT_LOOP 1000
+
+LEDWidget sStatusLED;
+LEDWidget sLightLED;
+LEDWidget sClusterLED;
+
+namespace {
+
+TaskHandle_t sAppTaskHandle;
+QueueHandle_t sAppEventQueue;
+
+uint8_t sAppEventQueueBuffer[APP_EVENT_QUEUE_SIZE * sizeof(AppEvent)];
+StaticQueue_t sAppEventQueueStruct;
+
+StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)];
+StaticTask_t appTaskStruct;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+DefaultOTARequestor gRequestorCore;
+DefaultOTARequestorStorage gRequestorStorage;
+DefaultOTARequestorDriver gRequestorUser;
+BDXDownloader gDownloader;
+OTAImageProcessorImpl gImageProcessor;
+#endif
+
+} // namespace
+
+using namespace ::chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+AppTask AppTask::sAppTask;
+
+namespace {
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::P6WiFiDriver::GetInstance()));
+
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+} // namespace
+
+void NetWorkCommissioningInstInit()
+{
+    sWiFiNetworkCommissioningInstance.Init();
+}
+
+static void InitServer(intptr_t context)
+{
+    // Init ZCL Data Model
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
+
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+
+    // Initialize device attestation config
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    GetAppTask().InitOTARequestor();
+#endif
+}
+
+CHIP_ERROR AppTask::StartAppTask()
+{
+    sAppEventQueue = xQueueCreateStatic(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent), sAppEventQueueBuffer, &sAppEventQueueStruct);
+    if (sAppEventQueue == NULL)
+    {
+        P6_LOG("Failed to allocate app event queue");
+        appError(APP_ERROR_EVENT_QUEUE_FAILED);
+    }
+    // Start App task.
+    sAppTaskHandle = xTaskCreateStatic(AppTaskMain, APP_TASK_NAME, ArraySize(appStack), NULL, 1, appStack, &appTaskStruct);
+    return (sAppTaskHandle == nullptr) ? APP_ERROR_CREATE_TASK_FAILED : CHIP_NO_ERROR;
+}
+
+CHIP_ERROR AppTask::Init()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    int rc = boot_set_confirmed();
+    if (rc != 0)
+    {
+        P6_LOG("boot_set_confirmed failed");
+        appError(CHIP_ERROR_WELL_UNINITIALIZED);
+    }
+#endif
+    // Register the callback to init the MDNS server when connectivity is available
+    PlatformMgr().AddEventHandler(
+        [](const ChipDeviceEvent * event, intptr_t arg) {
+            // Restart the server whenever an ip address is renewed
+            if (event->Type == DeviceEventType::kInternetConnectivityChange)
+            {
+                if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established ||
+                    event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
+                {
+                    chip::app::DnssdServer::Instance().StartServer();
+                }
+            }
+        },
+        0);
+
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast<intptr_t>(nullptr));
+
+    // Initialise WSTK buttons PB0 and PB1 (including debounce).
+    ButtonHandler::Init();
+
+    NetWorkCommissioningInstInit();
+    P6_LOG("Current Software Version: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+
+    // Initialize LEDs
+    sStatusLED.Init(SYSTEM_STATE_LED);
+    sLightLED.Init(LIGHT_LED);
+    sClusterLED.RGB_init();
+
+    ConfigurationMgr().LogDeviceConfig();
+
+    // Print setup info
+    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
+
+    return err;
+}
+
+void AppTask::AppTaskMain(void * pvParameter)
+{
+    AppEvent event;
+    CHIP_ERROR err = sAppTask.Init();
+    if (err != CHIP_NO_ERROR)
+    {
+        P6_LOG("AppTask.Init() failed");
+        appError(err);
+    }
+
+    P6_LOG("App Task started");
+
+    while (true)
+    {
+        BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, pdMS_TO_TICKS(10));
+        while (eventReceived == pdTRUE)
+        {
+            sAppTask.DispatchEvent(&event);
+            eventReceived = xQueueReceive(sAppEventQueue, &event, 0);
+        }
+    }
+}
+
+void AppTask::LightActionEventHandler(AppEvent * aEvent)
+{
+    /* ON/OFF Light Led based on Button interrupt */
+    sLightLED.Invert();
+
+    /* Update OnOff Cluster state */
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(OnOffUpdateClusterState, reinterpret_cast<intptr_t>(nullptr));
+}
+
+void AppTask::ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction)
+{
+    if (btnIdx != APP_LIGHT_BUTTON_IDX)
+    {
+        return;
+    }
+
+    AppEvent button_event              = {};
+    button_event.Type                  = AppEvent::kEventType_Button;
+    button_event.ButtonEvent.ButtonIdx = btnIdx;
+    button_event.ButtonEvent.Action    = btnAction;
+
+    if ((btnIdx == APP_LIGHT_BUTTON_IDX) && (btnAction == APP_BUTTON_RELEASED))
+    {
+        button_event.Handler = LightActionEventHandler;
+        sAppTask.PostEvent(&button_event);
+    }
+}
+
+void AppTask::PostEvent(const AppEvent * aEvent)
+{
+    if (sAppEventQueue != NULL)
+    {
+        BaseType_t status;
+        if (xPortIsInsideInterrupt())
+        {
+            BaseType_t higherPrioTaskWoken = pdFALSE;
+            status                         = xQueueSendFromISR(sAppEventQueue, aEvent, &higherPrioTaskWoken);
+
+#ifdef portYIELD_FROM_ISR
+            portYIELD_FROM_ISR(higherPrioTaskWoken);
+#elif portEND_SWITCHING_ISR // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
+            portEND_SWITCHING_ISR(higherPrioTaskWoken);
+#else                       // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
+#error "Must have portYIELD_FROM_ISR or portEND_SWITCHING_ISR"
+#endif // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
+        }
+        else
+        {
+            status = xQueueSend(sAppEventQueue, aEvent, 1);
+        }
+
+        if (!status)
+            P6_LOG("Failed to post event to app task event queue");
+    }
+    else
+    {
+        P6_LOG("Event Queue is NULL should never happen");
+    }
+}
+
+void AppTask::DispatchEvent(AppEvent * aEvent)
+{
+    if (aEvent->Handler)
+    {
+        aEvent->Handler(aEvent);
+    }
+    else
+    {
+        P6_LOG("Event received with no handler. Dropping event.");
+    }
+}
+
+void AppTask::OnOffUpdateClusterState(intptr_t context)
+{
+    uint8_t onoff = sLightLED.Get();
+
+    // write the new on/off value
+    EmberAfStatus status =
+        emberAfWriteServerAttribute(2, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, &onoff, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        P6_LOG("ERR: updating on/off %x", status);
+    }
+}
+
+bool lowPowerClusterSleep()
+{
+    return true;
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void AppTask::InitOTARequestor()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    SetRequestorInstance(&gRequestorCore);
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+    gImageProcessor.SetOTADownloader(&gDownloader);
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    uint32_t savedSoftwareVersion;
+    err = ConfigurationMgr().GetSoftwareVersion(savedSoftwareVersion);
+    if (err != CHIP_NO_ERROR)
+    {
+        P6_LOG("Can't get saved software version");
+        appError(err);
+    }
+
+    if (savedSoftwareVersion != CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION)
+    {
+        ConfigurationMgr().StoreSoftwareVersion(CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+
+        P6_LOG("Confirming update to version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+        chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+        if (requestor != nullptr)
+        {
+            requestor->NotifyUpdateApplied();
+        }
+    }
+
+    P6_LOG("Current Software Version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+    P6_LOG("Current Firmware Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+}
+#endif
diff --git a/examples/all-clusters-minimal-app/p6/src/ButtonHandler.cpp b/examples/all-clusters-minimal-app/p6/src/ButtonHandler.cpp
new file mode 100644
index 00000000000000..6c768e4148e751
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/src/ButtonHandler.cpp
@@ -0,0 +1,84 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ButtonHandler.h"
+#include "AppConfig.h"
+#include "AppTask.h"
+
+namespace {
+
+TimerHandle_t buttonTimer; // FreeRTOS timers used for debouncing buttons
+
+} // namespace
+
+void ButtonHandler::Init(void)
+{
+    GpioInit();
+
+    buttonTimer = xTimerCreate("BtnTmr",                            // Just a text name, not used by the RTOS kernel
+                               APP_BUTTON_DEBOUNCE_PERIOD_MS,       // timer period
+                               false,                               // no timer reload (==one-shot)
+                               (void *) (int) APP_LIGHT_BUTTON_IDX, // init timer id = button index
+                               TimerCallback                        // timer callback handler (all buttons use
+                                                                    // the same timer cn function)
+    );
+}
+
+void ButtonHandler::GpioInit(void)
+{
+    cy_rslt_t result = CY_RSLT_SUCCESS;
+    // Set up button GPIOs to input with pullups.
+    result = cyhal_gpio_init(APP_LIGHT_BUTTON, CYHAL_GPIO_DIR_INPUT, CYHAL_GPIO_DRIVE_PULLUP, CYBSP_BTN_OFF);
+    if (result != CY_RSLT_SUCCESS)
+    {
+        printf(" cyhal_gpio_init failed for APP_LIGHT_BUTTON\r\n");
+    }
+
+    /* Configure GPIO interrupt. */
+    cyhal_gpio_register_callback(APP_LIGHT_BUTTON, lightbuttonIsr, NULL);
+    cyhal_gpio_enable_event(APP_LIGHT_BUTTON, CYHAL_GPIO_IRQ_FALL, GPIO_INTERRUPT_PRIORITY, true);
+}
+
+void ButtonHandler::lightbuttonIsr(void * handler_arg, cyhal_gpio_event_t event)
+{
+    portBASE_TYPE taskWoken = pdFALSE;
+    xTimerStartFromISR(buttonTimer, &taskWoken);
+}
+
+void ButtonHandler::TimerCallback(TimerHandle_t xTimer)
+{
+    // Get the button index of the expired timer and call button event helper.
+    uint32_t timerId;
+    uint8_t buttonevent = 0;
+    timerId             = (uint32_t) pvTimerGetTimerID(xTimer);
+
+    switch (timerId)
+    {
+    case APP_LIGHT_BUTTON_IDX:
+        buttonevent = cyhal_gpio_read(APP_LIGHT_BUTTON);
+        break;
+
+    default:
+        P6_LOG("Unhandled TimerID: %d", timerId);
+        break;
+    }
+
+    GetAppTask().ButtonEventHandler(timerId, (buttonevent) ? APP_BUTTON_PRESSED : APP_BUTTON_RELEASED);
+}
diff --git a/examples/all-clusters-minimal-app/p6/src/ClusterManager.cpp b/examples/all-clusters-minimal-app/p6/src/ClusterManager.cpp
new file mode 100644
index 00000000000000..4d550f8c4fdaf8
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/src/ClusterManager.cpp
@@ -0,0 +1,156 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file
+ *   This file implements the handler for data model messages.
+ */
+
+#include "ClusterManager.h"
+#include "AppConfig.h"
+#include "LEDWidget.h"
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/CommandHandler.h>
+#include <app/server/Dnssd.h>
+#include <app/util/basic-types.h>
+#include <app/util/util.h>
+#include <lib/dnssd/Advertiser.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::app::Clusters;
+
+#define ENDPOINT_FIRST_IDX 1
+#define ENDPOINT_SECOND_IDX 2
+
+uint32_t identifyTimerCount;
+constexpr uint32_t kIdentifyTimerDelayMS = 250;
+ClusterManager ClusterManager::sCluster;
+
+void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID,
+                 P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId)));
+    VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX,
+                 P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    // At this point we can assume that value points to a bool value.
+    mEndpointOnOffState[endpointId - 1] = *value;
+
+    // On/Off Cluster LED for endpoint 1 and Light Led for endpoint 2
+    endpointId == ENDPOINT_FIRST_IDX ? sClusterLED.RGB_set(*value) : sLightLED.Set(*value);
+
+exit:
+    return;
+}
+
+void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    bool onOffState    = mEndpointOnOffState[endpointId - 1];
+    uint8_t brightness = onOffState ? *value : 0;
+
+    VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID,
+                 P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId)));
+    VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX,
+                 P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    endpointId == ENDPOINT_FIRST_IDX ? sClusterLED.SetBrightness(brightness) : sLightLED.SetBrightness(brightness);
+
+exit:
+    return;
+}
+
+void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == ColorControl::Attributes::CurrentHue::Id ||
+                     attributeId == ColorControl::Attributes::CurrentSaturation::Id,
+                 P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId)));
+    VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX,
+                 P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+    if (endpointId == 1)
+    {
+        uint8_t hue, saturation;
+        /* If the Current Attribute is ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, read the saturation value and
+         * set the color on Cluster LED using both Saturation and Hue.
+         */
+        if (attributeId == ColorControl::Attributes::CurrentHue::Id)
+        {
+            hue = *value;
+            /* Read Current Saturation value when Attribute change callback for HUE Attribute */
+            ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation);
+        }
+        else
+        {
+            /* If the Current Attribute is ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, read the Hue value and
+             * set the color on Cluster LED using both Saturation and Hue.
+             */
+            saturation = *value;
+            /* Read Current Hue value when Attribute change callback for SATURATION Attribute */
+            ColorControl::Attributes::CurrentHue::Get(endpointId, &hue);
+        }
+        /* Set RGB Color on Cluster Indication LED */
+        sClusterLED.SetColor(hue, saturation);
+    }
+exit:
+    return;
+}
+
+/* Identify Cluster puts device into identification mode like flashing a device
+ * This function blinks LED by running timer every 500ms as expected by
+ * IdentifyTimer Attribute
+ */
+
+void IdentifyTimerHandler(Layer * systemLayer, void * appState)
+{
+    /* Status LED On/Off based on Blink Configuration */
+    sStatusLED.Animate();
+
+    if (identifyTimerCount)
+    {
+        systemLayer->StartTimer(Clock::Milliseconds32(kIdentifyTimerDelayMS), IdentifyTimerHandler, appState);
+        // Decrement the timer count.
+        identifyTimerCount--;
+    }
+}
+
+void ClusterManager::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == Identify::Attributes::IdentifyTime::Id,
+                 P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId)));
+    VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX, P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
+
+    /* IdentifyTime Attribute Spec mentions "flashing a light with a period of 0.5 seconds" */
+    sStatusLED.Blink(kIdentifyTimerDelayMS * 2);
+
+    // timerCount represents the number of callback executions before we stop the timer.
+    // value is expressed in seconds and the timer is fired every 250ms, so just multiply value by 4.
+    // Also, we want timerCount to be odd number, so the light state ends in the same state it starts.
+    identifyTimerCount = (*value) * 4;
+
+    DeviceLayer::SystemLayer().CancelTimer(IdentifyTimerHandler, this);
+    DeviceLayer::SystemLayer().StartTimer(Clock::Milliseconds32(kIdentifyTimerDelayMS), IdentifyTimerHandler, this);
+
+exit:
+    return;
+}
diff --git a/examples/all-clusters-minimal-app/p6/src/ZclCallbacks.cpp b/examples/all-clusters-minimal-app/p6/src/ZclCallbacks.cpp
new file mode 100644
index 00000000000000..32ba951b52cfc6
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/src/ZclCallbacks.cpp
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file
+ *   This file implements the handler for data model messages.
+ */
+
+#include "AppConfig.h"
+#include <lib/support/logging/CHIPLogging.h>
+
+#include "ClusterManager.h"
+
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/util/af-types.h>
+
+using namespace ::chip;
+using namespace ::chip::app::Clusters;
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
+{
+    EndpointId endpoint     = attributePath.mEndpointId;
+    ClusterId clusterId     = attributePath.mClusterId;
+    AttributeId attributeId = attributePath.mAttributeId;
+    P6_LOG("MatterPostAttributeChangeCallback - Cluster ID: " ChipLogFormatMEI
+           ", EndPoint ID: '0x%02x', Attribute ID: " ChipLogFormatMEI,
+           ChipLogValueMEI(clusterId), endpoint, ChipLogValueMEI(attributeId));
+
+    switch (clusterId)
+    {
+    case OnOff::Id:
+        ClusterMgr().OnOnOffPostAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+
+    case Identify::Id:
+        ClusterMgr().OnIdentifyPostAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+
+    case LevelControl::Id:
+        ClusterMgr().OnLevelControlAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+
+    case ColorControl::Id:
+        ClusterMgr().OnColorControlAttributeChangeCallback(endpoint, attributeId, value);
+        break;
+    default:
+        P6_LOG("Unhandled cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
+        break;
+    }
+}
+/** @brief OnOff Cluster Init
+ *
+ * This function is called when a specific cluster is initialized. It gives the
+ * application an opportunity to take care of cluster initialization procedures.
+ * It is called exactly once for each endpoint where cluster is present.
+ *
+ * @param endpoint   Ver.: always
+ *
+ * TODO Issue #3841
+ * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
+ * attributes to the default value.
+ * The logic here expects something similar to the deprecated Plugins callback
+ * emberAfPluginOnOffClusterServerPostInitCallback.
+ *
+ */
+void emberAfOnOffClusterInitCallback(EndpointId endpoint)
+{
+    // TODO: implement any additional Cluster Server init actions
+}
diff --git a/examples/all-clusters-minimal-app/p6/src/main.cpp b/examples/all-clusters-minimal-app/p6/src/main.cpp
new file mode 100644
index 00000000000000..d365f9ff8220d4
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/src/main.cpp
@@ -0,0 +1,158 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <FreeRTOS.h>
+
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CHIPPlatformMemory.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/KeyValueStoreManager.h>
+
+#include <AppTask.h>
+
+#include "AppConfig.h"
+#include "cyhal_wdt.h"
+#include "init_p6Platform.h"
+#include <app/server/Server.h>
+
+#ifdef HEAP_MONITORING
+#include "MemMonitoring.h"
+#endif
+#define MAIN_TASK_STACK_SIZE (4096)
+#define MAIN_TASK_PRIORITY 2
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::DeviceLayer;
+
+volatile int apperror_cnt;
+static void main_task(void * pvParameters);
+
+// ================================================================================
+// App Error
+//=================================================================================
+void appError(int err)
+{
+    P6_LOG("!!!!!!!!!!!! App Critical Error: %d !!!!!!!!!!!", err);
+    portDISABLE_INTERRUPTS();
+    while (1)
+        ;
+}
+
+void appError(CHIP_ERROR error)
+{
+    appError(static_cast<int>(error.AsInteger()));
+}
+
+// ================================================================================
+// FreeRTOS Callbacks
+// ================================================================================
+extern "C" void vApplicationIdleHook(void)
+{
+    // FreeRTOS Idle callback
+}
+
+extern "C" void vApplicationDaemonTaskStartupHook()
+{
+    // Init Chip memory management before the stack
+    chip::Platform::MemoryInit();
+
+    /* Create the Main task. */
+    xTaskCreate(main_task, "Main task", MAIN_TASK_STACK_SIZE, NULL, MAIN_TASK_PRIORITY, NULL);
+}
+
+static void main_task(void * pvParameters)
+{
+    CHIP_ERROR ret = chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().Init();
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("PersistedStorage::KeyValueStoreMgrImpl().Init() failed");
+        appError(ret);
+    }
+
+    ret = PlatformMgr().InitChipStack();
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("PlatformMgr().InitChipStack() failed");
+        appError(ret);
+    }
+
+    ret = chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("P6_CLUSTERS");
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("ConnectivityMgr().SetBLEDeviceName() failed");
+        appError(ret);
+    }
+
+    P6_LOG("Starting Platform Manager Event Loop");
+    ret = PlatformMgr().StartEventLoopTask();
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("PlatformMgr().StartEventLoopTask() failed");
+        appError(ret);
+    }
+    ret = GetAppTask().StartAppTask();
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("GetAppTask().Init() failed");
+        appError(ret);
+    }
+
+    /* Delete task */
+    vTaskDelete(NULL);
+}
+
+// ================================================================================
+// Main Code
+// ================================================================================
+int main(void)
+{
+    init_p6Platform();
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    // Clear watchdog timer (started by bootloader) so that it doesn't trigger a reset
+    cyhal_wdt_t wdt_obj;
+    cyhal_wdt_init(&wdt_obj, cyhal_wdt_get_max_timeout_ms());
+    cyhal_wdt_free(&wdt_obj);
+#endif
+#ifdef HEAP_MONITORING
+    MemMonitoring::startHeapMonitoring();
+#endif
+
+    P6_LOG("==================================================\r\n");
+    P6_LOG("chip-p6-all-clusters-example starting\r\n");
+    P6_LOG("==================================================\r\n");
+
+    /* Start the FreeRTOS scheduler */
+    vTaskStartScheduler();
+
+    chip::Platform::MemoryShutdown();
+    PlatformMgr().StopEventLoopTask();
+    PlatformMgr().Shutdown();
+
+    // Should never get here.
+    P6_LOG("vTaskStartScheduler() failed");
+}
diff --git a/examples/all-clusters-minimal-app/p6/third_party/connectedhomeip b/examples/all-clusters-minimal-app/p6/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/all-clusters-minimal-app/p6/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ No newline at end of file
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 1f7ce69cb038dd..64b03dc44a04ff 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1,11 +1,6 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
-struct LabelStruct {
-    char_string<16> label = 0;
-    char_string<16> value = 1;
-}
-
 client cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -67,6 +62,8 @@ client cluster AccessControl = 31 {
   readonly attribute int16u subjectsPerAccessControlEntry = 2;
   readonly attribute int16u targetsPerAccessControlEntry = 3;
   readonly attribute int16u accessControlEntriesPerFabric = 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;
@@ -133,6 +130,8 @@ server cluster AccessControl = 31 {
   readonly attribute int16u subjectsPerAccessControlEntry = 2;
   readonly attribute int16u targetsPerAccessControlEntry = 3;
   readonly attribute int16u accessControlEntriesPerFabric = 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;
@@ -154,6 +153,9 @@ server cluster AdministratorCommissioning = 60 {
   readonly attribute int8u windowStatus = 0;
   readonly attribute fabric_idx adminFabricIndex = 1;
   readonly attribute int16u adminVendorId = 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;
 
@@ -214,6 +216,108 @@ server cluster Basic = 40 {
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  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;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  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;
+}
+
+server cluster BridgedActions = 37 {
+  enum ActionErrorEnum : ENUM8 {
+    kUnknown = 0;
+    kInterrupted = 1;
+  }
+
+  enum ActionStateEnum : ENUM8 {
+    kInactive = 0;
+    kActive = 1;
+    kPaused = 2;
+    kDisabled = 3;
+  }
+
+  enum ActionTypeEnum : ENUM8 {
+    kOther = 0;
+    kScene = 1;
+    kSequence = 2;
+    kAutomation = 3;
+    kException = 4;
+    kNotification = 5;
+    kAlarm = 6;
+  }
+
+  enum EndpointListTypeEnum : ENUM8 {
+    kOther = 0;
+    kRoom = 1;
+    kZone = 2;
+  }
+
+  bitmap CommandBits : BITMAP16 {
+    kInstantAction = 0x1;
+    kInstantActionWithTransition = 0x2;
+    kStartAction = 0x4;
+    kStartActionWithDuration = 0x8;
+    kStopAction = 0x10;
+    kPauseAction = 0x20;
+    kPauseActionWithDuration = 0x40;
+    kResumeAction = 0x80;
+    kEnableAction = 0x100;
+    kEnableActionWithDuration = 0x200;
+    kDisableAction = 0x400;
+    kDisableActionWithDuration = 0x800;
+  }
+
+  struct ActionStruct {
+    int16u actionID = 0;
+    char_string<32> name = 1;
+    ActionTypeEnum type = 2;
+    int16u endpointListID = 3;
+    int16u supportedCommands = 4;
+    ActionStateEnum status = 5;
+  }
+
+  struct EndpointListStruct {
+    int16u endpointListID = 0;
+    char_string<32> name = 1;
+    EndpointListTypeEnum type = 2;
+    endpoint_no endpoints[] = 3;
+  }
+
+  info event StateChanged = 0 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+  }
+
+  info event ActionFailed = 1 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+    ActionErrorEnum error = 3;
+  }
+
+  readonly attribute ActionStruct actionList[] = 0;
+  readonly attribute EndpointListStruct endpointList[] = 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;
 }
@@ -228,6 +332,9 @@ server cluster Descriptor = 29 {
   readonly attribute CLUSTER_ID serverList[] = 1;
   readonly attribute CLUSTER_ID clientList[] = 2;
   readonly attribute ENDPOINT_NO partsList[] = 3;
+  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;
 }
@@ -291,12 +398,6 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster GeneralCommissioning = 48 {
   enum CommissioningError : ENUM8 {
     kOk = 0;
@@ -321,6 +422,9 @@ server cluster GeneralCommissioning = 48 {
   readonly attribute RegulatoryLocationType regulatoryConfig = 2;
   readonly attribute RegulatoryLocationType locationCapability = 3;
   readonly attribute boolean supportsConcurrentConnection = 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;
 
@@ -443,8 +547,133 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  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 KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 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;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
 }
 
 server cluster LevelControl = 8 {
@@ -537,6 +766,9 @@ server cluster LevelControl = 8 {
 server cluster LocalizationConfiguration = 43 {
   attribute 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;
 }
@@ -613,6 +845,9 @@ server cluster NetworkCommissioning = 49 {
   readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
   readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
   readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  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;
 
@@ -726,6 +961,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -753,6 +989,9 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int8u commissionedFabrics = 3;
   readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
   readonly attribute fabric_idx currentFabricIndex = 5;
+  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;
 
@@ -766,13 +1005,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -793,10 +1033,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -825,16 +1061,19 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -972,7 +1211,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -980,11 +1219,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1027,12 +1266,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1062,6 +1301,9 @@ server cluster TimeFormatLocalization = 44 {
   attribute HourFormat hourFormat = 0;
   attribute CalendarType activeCalendarType = 1;
   readonly attribute CalendarType 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;
 }
@@ -1078,11 +1320,19 @@ server cluster UnitLocalization = 45 {
   }
 
   attribute TempUnit temperatureUnit = 0;
+  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;
 }
 
 server cluster UserLabel = 65 {
+  struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
+  }
+
   attribute access(write: manage) LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1149,8 +1399,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type bridge = 22;
   binding cluster AccessControl;
 
   server cluster Descriptor {
@@ -1158,6 +1408,9 @@ endpoint 0 {
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     callback attribute clusterRevision default = 1;
   }
@@ -1168,6 +1421,8 @@ endpoint 0 {
     callback attribute subjectsPerAccessControlEntry default = 4;
     callback attribute targetsPerAccessControlEntry default = 3;
     callback attribute accessControlEntriesPerFabric default = 3;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
@@ -1194,6 +1449,9 @@ endpoint 0 {
     ram      attribute reachable default = 1;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1201,6 +1459,9 @@ endpoint 0 {
   server cluster LocalizationConfiguration {
     persist  attribute activeLocale default = "en-US";
     callback attribute supportedLocales;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1209,12 +1470,18 @@ endpoint 0 {
     persist  attribute hourFormat;
     persist  attribute activeCalendarType;
     callback attribute supportedCalendarTypes;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
   server cluster UnitLocalization {
     persist  attribute temperatureUnit;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0x1;
     ram      attribute clusterRevision default = 1;
   }
@@ -1225,6 +1492,9 @@ endpoint 0 {
     callback attribute regulatoryConfig;
     callback attribute locationCapability;
     callback attribute supportsConcurrentConnection default = 1;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 6;
     ram      attribute clusterRevision default = 1;
   }
@@ -1238,6 +1508,9 @@ endpoint 0 {
     ram      attribute lastNetworkingStatus;
     ram      attribute lastNetworkID;
     ram      attribute lastConnectErrorValue;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 2;
     ram      attribute clusterRevision default = 1;
   }
@@ -1256,6 +1529,10 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1270,67 +1547,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 15;
@@ -1373,6 +1650,9 @@ endpoint 0 {
     callback attribute windowStatus;
     callback attribute adminFabricIndex default = 1;
     callback attribute adminVendorId;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1384,12 +1664,21 @@ endpoint 0 {
     callback attribute commissionedFabrics;
     callback attribute trustedRootCertificates;
     callback attribute currentFabricIndex;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster FixedLabel {
-    callback attribute labelList;
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1400,8 +1689,44 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type anonymousEndpointType = 14;
+  binding cluster Binding;
+
+  server cluster Identify {
+    ram      attribute identifyTime;
+    ram      attribute identifyType;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 2;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster BridgedActions {
+    callback attribute actionList;
+    callback attribute endpointList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+}
+endpoint 2 {
+  device type dimmablelight = 257;
 
   server cluster OnOff {
     ram      attribute onOff;
@@ -1412,7 +1737,7 @@ endpoint 1 {
   server cluster LevelControl {
     persist  attribute currentLevel;
     ram      attribute remainingTime;
-    ram      attribute minLevel;
+    ram      attribute minLevel default = 0x01;
     ram      attribute maxLevel default = 0xFE;
     ram      attribute currentFrequency;
     ram      attribute minFrequency;
@@ -1444,12 +1769,6 @@ endpoint 1 {
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
-
-  server cluster FixedLabel {
-    callback attribute labelList;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-  }
 }
 
 
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 9c4c129a17a05a..1d50e048036115 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -32,8 +32,8 @@
   "endpointTypes": [
     {
       "name": "MA-bridge",
-      "deviceTypeName": "MA-bridge",
-      "deviceTypeCode": 14,
+      "deviceTypeName": "MA-rootdevice",
+      "deviceTypeCode": 22,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -45,6 +45,22 @@
           "enabled": 0,
           "commands": [],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -99,7 +115,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -115,7 +131,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -131,11 +147,59 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -179,6 +243,22 @@
           "enabled": 1,
           "commands": [],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -217,7 +297,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -233,7 +313,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -286,6 +366,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -345,6 +457,22 @@
           "enabled": 0,
           "commands": [],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -383,7 +511,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "10",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -399,7 +527,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -415,7 +543,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -431,7 +559,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -447,7 +575,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -463,7 +591,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -479,7 +607,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "XX",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -495,7 +623,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "0",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -511,7 +639,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -527,7 +655,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "0",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -543,7 +671,7 @@
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -692,6 +820,54 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -734,7 +910,40 @@
           "side": "client",
           "enabled": 0,
           "commands": [],
-          "attributes": []
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
         },
         {
           "name": "Localization Configuration",
@@ -756,7 +965,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "en-US",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -772,67 +981,148 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Time Format Localization",
-          "code": 44,
-          "mfgCode": null,
-          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
-          "side": "client",
-          "enabled": 0,
-          "commands": [],
-          "attributes": []
-        },
-        {
-          "name": "Time Format Localization",
-          "code": 44,
-          "mfgCode": null,
-          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [],
-          "attributes": [
+            },
             {
-              "name": "HourFormat",
-              "code": 0,
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Time Format Localization",
+          "code": 44,
+          "mfgCode": null,
+          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Time Format Localization",
+          "code": 44,
+          "mfgCode": null,
+          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "HourFormat",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
               "type": "HourFormat",
@@ -841,7 +1131,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -878,6 +1168,54 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -920,7 +1258,40 @@
           "side": "client",
           "enabled": 0,
           "commands": [],
-          "attributes": []
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
         },
         {
           "name": "Unit Localization",
@@ -947,6 +1318,54 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1015,6 +1434,22 @@
             }
           ],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -1148,32 +1583,80 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "6",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "6",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -1239,6 +1722,22 @@
             }
           ],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -1419,13 +1918,45 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1528,8 +2059,33 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "client",
           "enabled": 0,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -1555,7 +2111,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -1685,6 +2250,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -1878,7 +2507,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -1892,9 +2521,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -1910,7 +2539,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -1926,7 +2555,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -1942,7 +2571,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -1958,7 +2587,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -1974,7 +2603,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2022,7 +2651,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2038,7 +2667,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2054,7 +2683,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2070,7 +2699,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2086,7 +2715,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2102,7 +2731,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2118,7 +2747,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2134,7 +2763,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2150,7 +2779,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2166,7 +2795,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2182,7 +2811,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2198,7 +2827,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2214,7 +2843,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2230,7 +2859,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2246,7 +2875,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2262,7 +2891,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2278,7 +2907,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2294,7 +2923,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2310,7 +2939,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2326,7 +2955,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2342,7 +2971,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2358,7 +2987,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2374,7 +3003,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2390,7 +3019,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2406,7 +3035,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2422,7 +3051,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2438,7 +3067,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2454,7 +3083,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2470,7 +3099,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2486,7 +3115,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2502,7 +3131,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2518,7 +3147,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2534,7 +3163,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2550,7 +3179,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2566,7 +3195,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2582,7 +3211,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2598,7 +3227,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2614,7 +3243,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2630,7 +3259,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2646,7 +3275,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2662,7 +3291,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2678,7 +3307,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2694,7 +3323,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2710,7 +3339,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2726,7 +3355,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2742,7 +3371,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2758,7 +3387,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2774,7 +3403,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2790,7 +3419,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2806,7 +3435,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2820,7 +3449,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2838,7 +3467,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2852,7 +3481,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3448,6 +4077,22 @@
             }
           ],
           "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -3523,6 +4168,54 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3628,22 +4321,1025 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
             },
             {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
+              "name": "CertificateChainResponse",
+              "code": 3,
               "mfgCode": null,
-              "source": "client",
+              "source": "server",
               "incoming": 1,
-              "outgoing": 0
+              "outgoing": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
             }
           ],
           "attributes": [
+            {
+              "name": "NOCs",
+              "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": "Fabrics",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedFabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CommissionedFabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TrustedRootCertificates",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentFabricIndex",
+              "code": 5,
+              "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": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupKeysPerFabric",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeName": "MA-bridge",
+      "deviceTypeCode": 14,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "identify type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "device list",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "server list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "client list",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "parts list",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "RAM",
+              "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": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
               "mfgCode": null,
-              "side": "client",
+              "side": "server",
               "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
@@ -3651,62 +5347,72 @@
               "bounded": 0,
               "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             }
           ]
         },
         {
-          "name": "Operational Credentials",
-          "code": 62,
+          "name": "Binding",
+          "code": 30,
           "mfgCode": null,
-          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
-          "side": "server",
+          "define": "BINDING_CLUSTER",
+          "side": "client",
           "enabled": 1,
-          "commands": [
-            {
-              "name": "AttestationResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "CertificateChainResponse",
-              "code": 3,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 1
-            },
+          "commands": [],
+          "attributes": [
             {
-              "name": "CSRResponse",
-              "code": 5,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 1
+              "side": "client",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
             },
             {
-              "name": "NOCResponse",
-              "code": 8,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 1
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
             }
-          ],
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
           "attributes": [
             {
-              "name": "NOCs",
+              "name": "Binding",
               "code": 0,
               "mfgCode": null,
               "side": "server",
               "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3716,90 +5422,101 @@
               "reportableChange": 0
             },
             {
-              "name": "Fabrics",
-              "code": 1,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "SupportedFabrics",
-              "code": 2,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "CommissionedFabrics",
-              "code": 3,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "TrustedRootCertificates",
-              "code": 4,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "CurrentFabricIndex",
-              "code": 5,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "fabric_idx",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "Bridged Actions",
+          "code": 37,
+          "mfgCode": null,
+          "define": "BRIDGED_ACTIONS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
             {
               "name": "FeatureMap",
               "code": 65532,
               "mfgCode": null,
-              "side": "server",
+              "side": "client",
               "type": "bitmap32",
               "included": 1,
               "storageOption": "RAM",
@@ -3815,7 +5532,7 @@
               "name": "ClusterRevision",
               "code": 65533,
               "mfgCode": null,
-              "side": "server",
+              "side": "client",
               "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
@@ -3823,39 +5540,29 @@
               "bounded": 0,
               "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             }
           ]
         },
         {
-          "name": "Fixed Label",
-          "code": 64,
-          "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
-          "side": "client",
-          "enabled": 0,
-          "commands": [],
-          "attributes": []
-        },
-        {
-          "name": "Fixed Label",
-          "code": 64,
+          "name": "Bridged Actions",
+          "code": 37,
           "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
+          "define": "BRIDGED_ACTIONS_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [],
           "attributes": [
             {
-              "name": "label list",
+              "name": "action list",
               "code": 0,
               "mfgCode": null,
               "side": "server",
               "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3865,66 +5572,77 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "endpoint list",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "setup url",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "long_char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "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": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "User Label",
-          "code": 65,
-          "mfgCode": null,
-          "define": "USER_LABEL_CLUSTER",
-          "side": "client",
-          "enabled": 0,
-          "commands": [],
-          "attributes": []
-        },
-        {
-          "name": "User Label",
-          "code": 65,
-          "mfgCode": null,
-          "define": "USER_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [],
-          "attributes": [
+            },
             {
-              "name": "label list",
-              "code": 0,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
+              "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": "RAM",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -4700,7 +6418,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5575,7 +7293,7 @@
           "mfgCode": null,
           "define": "FIXED_LABEL_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -5639,16 +7357,26 @@
       "endpointId": 0,
       "networkId": 0,
       "endpointVersion": 1,
-      "deviceIdentifier": 14
+      "deviceIdentifier": 22
     },
     {
-      "endpointTypeName": "MA-dimmablelight",
+      "endpointTypeName": "Anonymous Endpoint Type",
       "endpointTypeIndex": 1,
       "profileId": 259,
       "endpointId": 1,
       "networkId": 0,
       "endpointVersion": 1,
+      "deviceIdentifier": 14
+    },
+    {
+      "endpointTypeName": "MA-dimmablelight",
+      "endpointTypeIndex": 2,
+      "profileId": 259,
+      "endpointId": 2,
+      "networkId": 0,
+      "endpointVersion": 1,
       "deviceIdentifier": 257
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/bridge-app/esp32/main/CMakeLists.txt b/examples/bridge-app/esp32/main/CMakeLists.txt
index ebf11fca948731..4857554dd04e26 100644
--- a/examples/bridge-app/esp32/main/CMakeLists.txt
+++ b/examples/bridge-app/esp32/main/CMakeLists.txt
@@ -30,6 +30,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bridged-device-basic-information-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
index 9ca8038c32a716..51d23c32c75dbd 100644
--- a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
+++ b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
@@ -16,11 +16,23 @@
  *    limitations under the License.
  */
 
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/AttributeAccessInterface.h>
+#include <app/util/attribute-storage.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
 #include "DeviceCallbacks.h"
 
 static const char * TAG = "bridge-devicecallbacks";
 
 using namespace ::chip;
+using namespace ::chip::app;
+using namespace ::chip::app::Clusters;
+using namespace ::chip::app::Clusters::BridgedActions::Attributes;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
 
@@ -31,3 +43,75 @@ void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Clus
              endpointId, attributeId);
     ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT));
 }
+
+namespace {
+
+class BridgedActionsAttrAccess : public AttributeAccessInterface
+{
+public:
+    // Register for the Bridged Actions cluster on all endpoints.
+    BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {}
+
+    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
+
+private:
+    static constexpr uint16_t ClusterRevision = 1;
+
+    CHIP_ERROR ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+};
+
+constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision;
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    // Just return an empty list
+    return aEncoder.EncodeEmptyList();
+}
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    // Just return an empty list
+    return aEncoder.EncodeEmptyList();
+}
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    const char SetupUrl[] = "https://example.com";
+    return aEncoder.Encode(chip::CharSpan::fromCharString(SetupUrl));
+}
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    return aEncoder.Encode(ClusterRevision);
+}
+
+BridgedActionsAttrAccess gAttrAccess;
+
+CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+{
+    VerifyOrDie(aPath.mClusterId == BridgedActions::Id);
+
+    switch (aPath.mAttributeId)
+    {
+    case ActionList::Id:
+        return ReadActionListAttribute(aPath.mEndpointId, aEncoder);
+    case EndpointList::Id:
+        return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder);
+    case SetupUrl::Id:
+        return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder);
+    case ClusterRevision::Id:
+        return ReadClusterRevision(aPath.mEndpointId, aEncoder);
+    default:
+        break;
+    }
+    return CHIP_NO_ERROR;
+}
+} // anonymous namespace
+
+void MatterBridgedActionsPluginServerInitCallback(void)
+{
+    registerAttributeAccessOverride(&gAttrAccess);
+}
diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
index d82b110f1153e2..b09f5d7ddaf950 100644
--- a/examples/bridge-app/esp32/main/main.cpp
+++ b/examples/bridge-app/esp32/main/main.cpp
@@ -22,6 +22,7 @@
 #include <app-common/zap-generated/af-structs.h>
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/cluster-id.h>
+#include <app/clusters/identify-server/identify-server.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
 #include <common/Esp32AppServer.h>
@@ -42,7 +43,6 @@ static AppDeviceCallbacks AppCallback;
 static const int kNodeLabelSize = 32;
 // Current ZCL implementation of Struct uses a max-size array of 254 bytes
 static const int kDescriptorAttributeArraySize = 254;
-static const int kFixedLabelAttributeArraySize = 254;
 
 static EndpointId gCurrentEndpointId;
 static EndpointId gFirstDynamicEndpointId;
@@ -71,7 +71,6 @@ static Device gLight4("Light 4", "Den");
    - On/Off
    - Descriptor
    - Bridged Device Basic
-   - Fixed Label
 */
 
 // Declare On/Off cluster attributes
@@ -93,11 +92,6 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSi
     DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0),               /* Reachable */
     DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
 
-// Declare Fixed Label cluster attributes
-DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(fixedLabelAttrs)
-DECLARE_DYNAMIC_ATTRIBUTE(ZCL_LABEL_LIST_ATTRIBUTE_ID, ARRAY, kFixedLabelAttributeArraySize, 0), /* label list */
-    DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
-
 // Declare Cluster List for Bridged Light endpoint
 // TODO: It's not clear whether it would be better to get the command lists from
 // the ZAP config on our last fixed endpoint instead.
@@ -114,8 +108,8 @@ constexpr CommandId onOffIncomingCommands[] = {
 DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedLightClusters)
 DECLARE_DYNAMIC_CLUSTER(ZCL_ON_OFF_CLUSTER_ID, onOffAttrs, onOffIncomingCommands, nullptr),
     DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nullptr),
-    DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, bridgedDeviceBasicAttrs, nullptr, nullptr),
-    DECLARE_DYNAMIC_CLUSTER(ZCL_FIXED_LABEL_CLUSTER_ID, fixedLabelAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END;
+    DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, bridgedDeviceBasicAttrs, nullptr,
+                            nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END;
 
 // Declare Bridged Light endpoint
 DECLARE_DYNAMIC_ENDPOINT(bridgedLightEndpoint, bridgedLightClusters);
@@ -201,18 +195,6 @@ uint8_t * ToZclCharString(uint8_t * zclString, const char * cString, uint8_t max
     return zclString;
 }
 
-// Converted into bytes and mapped the (label, value)
-void EncodeFixedLabel(const char * label, const char * value, uint8_t * buffer, uint16_t length,
-                      const EmberAfAttributeMetadata * am)
-{
-    _LabelStruct labelStruct;
-
-    labelStruct.label = chip::CharSpan::fromCharString(label);
-    labelStruct.value = chip::CharSpan::fromCharString(value);
-
-    // TODO: Need to set up an AttributeAccessInterface to handle the lists here.
-}
-
 EmberAfStatus HandleReadBridgedDeviceBasicAttribute(Device * dev, chip::AttributeId attributeId, uint8_t * buffer,
                                                     uint16_t maxReadLength)
 {
@@ -238,25 +220,6 @@ EmberAfStatus HandleReadBridgedDeviceBasicAttribute(Device * dev, chip::Attribut
     return EMBER_ZCL_STATUS_SUCCESS;
 }
 
-EmberAfStatus HandleReadFixedLabelAttribute(Device * dev, const EmberAfAttributeMetadata * am, uint8_t * buffer,
-                                            uint16_t maxReadLength)
-{
-    if ((am->attributeId == ZCL_LABEL_LIST_ATTRIBUTE_ID) && (maxReadLength <= kFixedLabelAttributeArraySize))
-    {
-        EncodeFixedLabel("room", dev->GetLocation(), buffer, maxReadLength, am);
-    }
-    else if ((am->attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2))
-    {
-        *buffer = (uint16_t) ZCL_FIXED_LABEL_CLUSTER_REVISION;
-    }
-    else
-    {
-        return EMBER_ZCL_STATUS_FAILURE;
-    }
-
-    return EMBER_ZCL_STATUS_SUCCESS;
-}
-
 EmberAfStatus HandleReadOnOffAttribute(Device * dev, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength)
 {
     ChipLogProgress(DeviceLayer, "HandleReadOnOffAttribute: attrId=%d, maxReadLength=%d", attributeId, maxReadLength);
@@ -300,10 +263,6 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI
         {
             return HandleReadBridgedDeviceBasicAttribute(dev, attributeMetadata->attributeId, buffer, maxReadLength);
         }
-        else if (clusterId == ZCL_FIXED_LABEL_CLUSTER_ID)
-        {
-            return HandleReadFixedLabelAttribute(dev, attributeMetadata, buffer, maxReadLength);
-        }
         else if (clusterId == ZCL_ON_OFF_CLUSTER_ID)
         {
             return HandleReadOnOffAttribute(dev, attributeMetadata->attributeId, buffer, maxReadLength);
@@ -354,18 +313,6 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask)
         MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID,
                                                ZCL_NODE_LABEL_ATTRIBUTE_ID, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, zclName);
     }
-    if (itemChangedMask & Device::kChanged_Location)
-    {
-        uint8_t buffer[kFixedLabelAttributeArraySize];
-        EmberAfAttributeMetadata am = { .attributeId  = ZCL_LABEL_LIST_ATTRIBUTE_ID,
-                                        .size         = kFixedLabelAttributeArraySize,
-                                        .defaultValue = static_cast<uint32_t>(0) };
-
-        EncodeFixedLabel("room", dev->GetLocation(), buffer, sizeof(buffer), &am);
-
-        MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_FIXED_LABEL_CLUSTER_ID, ZCL_LABEL_LIST_ATTRIBUTE_ID,
-                                               ZCL_ARRAY_ATTRIBUTE_TYPE, buffer);
-    }
 }
 
 const EmberAfDeviceType gBridgedRootDeviceTypes[] = { { DEVICE_TYPE_ROOT_NODE, DEVICE_VERSION_DEFAULT },
diff --git a/examples/bridge-app/linux/BUILD.gn b/examples/bridge-app/linux/BUILD.gn
index eac94b9712c3db..6860566c5bdba5 100644
--- a/examples/bridge-app/linux/BUILD.gn
+++ b/examples/bridge-app/linux/BUILD.gn
@@ -20,6 +20,7 @@ assert(chip_build_tools)
 
 executable("chip-bridge-app") {
   sources = [
+    "${chip_root}/examples/bridge-app/linux/bridged-actions-stub.cpp",
     "${chip_root}/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h",
     "Device.cpp",
     "include/Device.h",
diff --git a/examples/bridge-app/linux/Device.cpp b/examples/bridge-app/linux/Device.cpp
index a3c30dc1f200ac..f726baf06c21c2 100644
--- a/examples/bridge-app/linux/Device.cpp
+++ b/examples/bridge-app/linux/Device.cpp
@@ -110,6 +110,12 @@ void DeviceOnOff::SetOnOff(bool aOn)
     }
 }
 
+void DeviceOnOff::Toggle()
+{
+    bool aOn = !IsOn();
+    SetOnOff(aOn);
+}
+
 void DeviceOnOff::SetChangeCallback(DeviceCallback_fn aChanged_CB)
 {
     mChanged_CB = aChanged_CB;
diff --git a/examples/bridge-app/linux/bridged-actions-stub.cpp b/examples/bridge-app/linux/bridged-actions-stub.cpp
new file mode 100644
index 00000000000000..bade30c1c102cb
--- /dev/null
+++ b/examples/bridge-app/linux/bridged-actions-stub.cpp
@@ -0,0 +1,102 @@
+/*
+ *
+ *    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 <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/AttributeAccessInterface.h>
+#include <app/util/attribute-storage.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::BridgedActions::Attributes;
+
+namespace {
+
+class BridgedActionsAttrAccess : public AttributeAccessInterface
+{
+public:
+    // Register for the Bridged Actions cluster on all endpoints.
+    BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {}
+
+    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
+
+private:
+    static constexpr uint16_t ClusterRevision = 1;
+
+    CHIP_ERROR ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder);
+};
+
+constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision;
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    // Just return an empty list
+    return aEncoder.EncodeEmptyList();
+}
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    // Just return an empty list
+    return aEncoder.EncodeEmptyList();
+}
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    const char SetupUrl[] = "https://example.com";
+    return aEncoder.Encode(chip::CharSpan::fromCharString(SetupUrl));
+}
+
+CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+{
+    return aEncoder.Encode(ClusterRevision);
+}
+
+BridgedActionsAttrAccess gAttrAccess;
+
+CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+{
+    VerifyOrDie(aPath.mClusterId == BridgedActions::Id);
+
+    switch (aPath.mAttributeId)
+    {
+    case ActionList::Id:
+        return ReadActionListAttribute(aPath.mEndpointId, aEncoder);
+    case EndpointList::Id:
+        return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder);
+    case SetupUrl::Id:
+        return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder);
+    case ClusterRevision::Id:
+        return ReadClusterRevision(aPath.mEndpointId, aEncoder);
+    default:
+        break;
+    }
+    return CHIP_NO_ERROR;
+}
+} // anonymous namespace
+
+void MatterBridgedActionsPluginServerInitCallback(void)
+{
+    registerAttributeAccessOverride(&gAttrAccess);
+}
diff --git a/examples/bridge-app/linux/include/Device.h b/examples/bridge-app/linux/include/Device.h
index f1a0506c9d6156..3bc7a88a47b6ae 100644
--- a/examples/bridge-app/linux/include/Device.h
+++ b/examples/bridge-app/linux/include/Device.h
@@ -73,6 +73,7 @@ class DeviceOnOff : public Device
 
     bool IsOn();
     void SetOnOff(bool aOn);
+    void Toggle();
 
     using DeviceCallback_fn = std::function<void(DeviceOnOff *, DeviceOnOff::Changed_t)>;
     void SetChangeCallback(DeviceCallback_fn aChanged_CB);
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
index 2a3eadb12c1de0..5709352d28b21e 100644
--- a/examples/bridge-app/linux/main.cpp
+++ b/examples/bridge-app/linux/main.cpp
@@ -39,6 +39,9 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
+#include <pthread.h>
+#include <sys/ioctl.h>
+
 #include "CommissionableInit.h"
 #include "Device.h"
 #include <app/server/Server.h>
@@ -57,9 +60,6 @@ namespace {
 const int kNodeLabelSize = 32;
 // Current ZCL implementation of Struct uses a max-size array of 254 bytes
 const int kDescriptorAttributeArraySize = 254;
-const int kFixedLabelAttributeArraySize = 254;
-// Four attributes in descriptor cluster: DeviceTypeList, ServerList, ClientList, PartsList
-const int kFixedLabelElementsOctetStringSize = 16;
 
 EndpointId gCurrentEndpointId;
 EndpointId gFirstDynamicEndpointId;
@@ -85,10 +85,6 @@ Device * gDevices[CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT];
 // (taken from lo-devices.xml)
 #define DEVICE_TYPE_LO_ON_OFF_LIGHT_SWITCH 0x0103
 // (taken from chip-devices.xml)
-#define DEVICE_TYPE_ROOT_NODE 0x0016
-// (taken from chip-devices.xml)
-#define DEVICE_TYPE_BRIDGE 0x000e
-// (taken from chip-devices.xml)
 #define DEVICE_TYPE_POWER_SOURCE 0x0011
 
 // Device Version for dynamic endpoints:
@@ -100,7 +96,6 @@ Device * gDevices[CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT];
 //   - On/Off
 //   - Descriptor
 //   - Bridged Device Basic
-//   - Fixed Label
 
 // Declare On/Off cluster attributes
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(onOffAttrs)
@@ -121,11 +116,6 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSi
     DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0),               /* Reachable */
     DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
 
-// Declare Fixed Label cluster attributes
-DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(fixedLabelAttrs)
-DECLARE_DYNAMIC_ATTRIBUTE(ZCL_LABEL_LIST_ATTRIBUTE_ID, ARRAY, kFixedLabelAttributeArraySize, 0), /* label list */
-    DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
-
 // Declare Cluster List for Bridged Light endpoint
 // TODO: It's not clear whether it would be better to get the command lists from
 // the ZAP config on our last fixed endpoint instead.
@@ -142,15 +132,22 @@ constexpr CommandId onOffIncomingCommands[] = {
 DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedLightClusters)
 DECLARE_DYNAMIC_CLUSTER(ZCL_ON_OFF_CLUSTER_ID, onOffAttrs, onOffIncomingCommands, nullptr),
     DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nullptr),
-    DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, bridgedDeviceBasicAttrs, nullptr, nullptr),
-    DECLARE_DYNAMIC_CLUSTER(ZCL_FIXED_LABEL_CLUSTER_ID, fixedLabelAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END;
+    DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, bridgedDeviceBasicAttrs, nullptr,
+                            nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END;
 
 // Declare Bridged Light endpoint
 DECLARE_DYNAMIC_ENDPOINT(bridgedLightEndpoint, bridgedLightClusters);
 DataVersion gLight1DataVersions[ArraySize(bridgedLightClusters)];
 DataVersion gLight2DataVersions[ArraySize(bridgedLightClusters)];
-DataVersion gLight3DataVersions[ArraySize(bridgedLightClusters)];
-DataVersion gLight4DataVersions[ArraySize(bridgedLightClusters)];
+
+DeviceOnOff Light1("Light 1", "Office");
+DeviceOnOff Light2("Light 2", "Office");
+
+DeviceSwitch Switch1("Switch 1", "Office", EMBER_AF_SWITCH_FEATURE_LATCHING_SWITCH);
+DeviceSwitch Switch2("Switch 2", "Office",
+                     EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH | EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_RELEASE |
+                         EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_LONG_PRESS |
+                         EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_MULTI_PRESS);
 
 // ---------------------------------------------------------------------------
 //
@@ -158,7 +155,6 @@ DataVersion gLight4DataVersions[ArraySize(bridgedLightClusters)];
 //   - Switch
 //   - Descriptor
 //   - Bridged Device Basic
-//   - Fixed Label
 
 // Declare Switch cluster attributes
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(switchAttrs)
@@ -182,17 +178,12 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSi
     DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0),               /* Reachable */
     DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
 
-// Declare Fixed Label cluster attributes
-DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(switchFixedLabelAttrs)
-DECLARE_DYNAMIC_ATTRIBUTE(ZCL_LABEL_LIST_ATTRIBUTE_ID, ARRAY, kFixedLabelAttributeArraySize, 0), /* label list */
-    DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
-
 // Declare Cluster List for Bridged Switch endpoint
 DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedSwitchClusters)
 DECLARE_DYNAMIC_CLUSTER(ZCL_SWITCH_CLUSTER_ID, switchAttrs, nullptr, nullptr),
     DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, switchDescriptorAttrs, nullptr, nullptr),
-    DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, switchBridgedDeviceBasicAttrs, nullptr, nullptr),
-    DECLARE_DYNAMIC_CLUSTER(ZCL_FIXED_LABEL_CLUSTER_ID, switchFixedLabelAttrs, nullptr, nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END;
+    DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, switchBridgedDeviceBasicAttrs, nullptr,
+                            nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END;
 
 // Declare Bridged Switch endpoint
 DECLARE_DYNAMIC_ENDPOINT(bridgedSwitchEndpoint, bridgedSwitchClusters);
@@ -309,24 +300,6 @@ int RemoveDeviceEndpoint(Device * dev)
     return -1;
 }
 
-void EncodeFixedLabel(const char * label, const char * value, uint8_t * buffer, uint16_t length,
-                      const EmberAfAttributeMetadata * am)
-{
-    char zclOctetStrBuf[kFixedLabelElementsOctetStringSize];
-    _LabelStruct labelStruct;
-
-    // TODO: This size is obviously wrong.  See
-    // https://github.com/project-chip/connectedhomeip/issues/10743
-    labelStruct.label = CharSpan(label, kFixedLabelElementsOctetStringSize);
-
-    strncpy(zclOctetStrBuf, value, sizeof(zclOctetStrBuf));
-    // TODO: This size is obviously wrong.  See
-    // https://github.com/project-chip/connectedhomeip/issues/10743
-    labelStruct.value = CharSpan(&zclOctetStrBuf[0], sizeof(zclOctetStrBuf));
-
-    // TODO: Need to set up an AttributeAccessInterface to handle the lists here.
-}
-
 void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask)
 {
     if (itemChangedMask & Device::kChanged_Reachable)
@@ -344,19 +317,6 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask)
         MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID,
                                                ZCL_NODE_LABEL_ATTRIBUTE_ID, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, zclNameSpan.data());
     }
-
-    if (itemChangedMask & Device::kChanged_Location)
-    {
-        uint8_t buffer[kFixedLabelAttributeArraySize];
-        EmberAfAttributeMetadata am = { .attributeId  = ZCL_LABEL_LIST_ATTRIBUTE_ID,
-                                        .size         = kFixedLabelAttributeArraySize,
-                                        .defaultValue = static_cast<uint32_t>(0) };
-
-        EncodeFixedLabel("room", dev->GetLocation(), buffer, sizeof(buffer), &am);
-
-        MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_FIXED_LABEL_CLUSTER_ID, ZCL_LABEL_LIST_ATTRIBUTE_ID,
-                                               ZCL_ARRAY_ATTRIBUTE_TYPE, buffer);
-    }
 }
 
 void HandleDeviceOnOffStatusChanged(DeviceOnOff * dev, DeviceOnOff::Changed_t itemChangedMask)
@@ -495,25 +455,6 @@ EmberAfStatus HandleWriteOnOffAttribute(DeviceOnOff * dev, chip::AttributeId att
     return EMBER_ZCL_STATUS_SUCCESS;
 }
 
-EmberAfStatus HandleReadFixedLabelAttribute(Device * dev, const EmberAfAttributeMetadata * am, uint8_t * buffer,
-                                            uint16_t maxReadLength)
-{
-    if ((am->attributeId == ZCL_LABEL_LIST_ATTRIBUTE_ID) && (maxReadLength <= kFixedLabelAttributeArraySize))
-    {
-        EncodeFixedLabel("room", dev->GetLocation(), buffer, maxReadLength, am);
-    }
-    else if ((am->attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2))
-    {
-        *buffer = (uint16_t) ZCL_FIXED_LABEL_CLUSTER_REVISION;
-    }
-    else
-    {
-        return EMBER_ZCL_STATUS_FAILURE;
-    }
-
-    return EMBER_ZCL_STATUS_SUCCESS;
-}
-
 EmberAfStatus HandleReadSwitchAttribute(DeviceSwitch * dev, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength)
 {
     if ((attributeId == ZCL_NUMBER_OF_POSITIONS_ATTRIBUTE_ID) && (maxReadLength == 1))
@@ -599,10 +540,6 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI
         {
             ret = HandleReadBridgedDeviceBasicAttribute(dev, attributeMetadata->attributeId, buffer, maxReadLength);
         }
-        else if (clusterId == ZCL_FIXED_LABEL_CLUSTER_ID)
-        {
-            ret = HandleReadFixedLabelAttribute(dev, attributeMetadata, buffer, maxReadLength);
-        }
         else if (clusterId == ZCL_ON_OFF_CLUSTER_ID)
         {
             ret = HandleReadOnOffAttribute(static_cast<DeviceOnOff *>(dev), attributeMetadata->attributeId, buffer, maxReadLength);
@@ -646,9 +583,6 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, Cluster
 
 void ApplicationInit() {}
 
-const EmberAfDeviceType gBridgedRootDeviceTypes[] = { { DEVICE_TYPE_ROOT_NODE, DEVICE_VERSION_DEFAULT },
-                                                      { DEVICE_TYPE_BRIDGE, DEVICE_VERSION_DEFAULT } };
-
 const EmberAfDeviceType gBridgedOnOffDeviceTypes[] = { { DEVICE_TYPE_LO_ON_OFF_LIGHT, DEVICE_VERSION_DEFAULT },
                                                        { DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT } };
 
@@ -661,35 +595,86 @@ const EmberAfDeviceType gComposedSwitchDeviceTypes[] = { { DEVICE_TYPE_LO_ON_OFF
 
 const EmberAfDeviceType gComposedPowerSourceDeviceTypes[] = { { DEVICE_TYPE_POWER_SOURCE, DEVICE_VERSION_DEFAULT } };
 
+#define POLL_INTERVAL_MS (100)
+uint8_t poll_prescale = 0;
+
+bool kbhit()
+{
+    int byteswaiting;
+    ioctl(0, FIONREAD, &byteswaiting);
+    return byteswaiting > 0;
+}
+
+void * bridge_polling_thread(void * context)
+{
+    bool light1_added = true;
+    bool light2_added = false;
+    while (1)
+    {
+        if (kbhit())
+        {
+            int ch = getchar();
+            if (ch == '2' && light2_added == false)
+            {
+                AddDeviceEndpoint(&Light2, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
+                                  Span<DataVersion>(gLight2DataVersions), 1);
+                light2_added = true;
+            }
+            else if (ch == '4' && light1_added == true)
+            {
+                RemoveDeviceEndpoint(&Light1);
+                light1_added = false;
+            }
+            if (ch == '5' && light1_added == false)
+            {
+                AddDeviceEndpoint(&Light1, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
+                                  Span<DataVersion>(gLight1DataVersions), 1);
+                light1_added = true;
+            }
+            if (ch == 'b')
+            {
+                if (light1_added)
+                {
+                    Light1.SetName("Light 1b");
+                }
+                if (light2_added)
+                {
+                    Light2.SetName("Light 2b");
+                }
+            }
+            if (ch == 'c')
+            {
+                if (light1_added)
+                {
+                    Light1.Toggle();
+                }
+                if (light2_added)
+                {
+                    Light2.Toggle();
+                }
+            }
+            continue;
+        }
+
+        // Sleep to avoid tight loop reading commands
+        usleep(POLL_INTERVAL_MS * 1000);
+    }
+
+    return nullptr;
+}
+
 int main(int argc, char * argv[])
 {
     // Clear out the device database
     memset(gDevices, 0, sizeof(gDevices));
 
-    // Create Mock Devices
-
-    // Define 4 lights
-    DeviceOnOff Light1("Light 1", "Office");
-    DeviceOnOff Light2("Light 2", "Office");
-    DeviceOnOff Light3("Light 3", "Office");
-    DeviceOnOff Light4("Light 4", "Den");
+    // Setup Mock Devices
 
     Light1.SetChangeCallback(&HandleDeviceOnOffStatusChanged);
     Light2.SetChangeCallback(&HandleDeviceOnOffStatusChanged);
-    Light3.SetChangeCallback(&HandleDeviceOnOffStatusChanged);
-    Light4.SetChangeCallback(&HandleDeviceOnOffStatusChanged);
 
     Light1.SetReachable(true);
     Light2.SetReachable(true);
-    Light3.SetReachable(true);
-    Light4.SetReachable(true);
-
-    // Define 2 switches
-    DeviceSwitch Switch1("Switch 1", "Office", EMBER_AF_SWITCH_FEATURE_LATCHING_SWITCH);
-    DeviceSwitch Switch2("Switch 2", "Office",
-                         EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH | EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_RELEASE |
-                             EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_LONG_PRESS |
-                             EMBER_AF_SWITCH_FEATURE_MOMENTARY_SWITCH_MULTI_PRESS);
 
     Switch1.SetChangeCallback(&HandleDeviceSwitchStatusChanged);
     Switch2.SetChangeCallback(&HandleDeviceSwitchStatusChanged);
@@ -746,40 +731,19 @@ int main(int argc, char * argv[])
     // supported clusters so that ZAP will generated the requisite code.
     emberAfEndpointEnableDisable(emberAfEndpointFromIndex(static_cast<uint16_t>(emberAfFixedEndpointCount() - 1)), false);
 
-    //
-    // By default, ZAP only supports specifying a single device type in the UI. However for bridges, they are both
-    // a Bridge and Matter Root Node device on EP0. Consequently, over-ride the generated value to correct this.
-    //
-    emberAfSetDeviceTypeList(0, Span<const EmberAfDeviceType>(gBridgedRootDeviceTypes));
-
-    // Add lights 1..3 --> will be mapped to ZCL endpoints 2, 3, 4
+    // Add light 1 -> will be mapped to ZCL endpoints 3
     AddDeviceEndpoint(&Light1, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
-                      Span<DataVersion>(gLight1DataVersions));
-    AddDeviceEndpoint(&Light2, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
-                      Span<DataVersion>(gLight2DataVersions));
-    AddDeviceEndpoint(&Light3, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
-                      Span<DataVersion>(gLight3DataVersions));
-
-    // Remove Light 2 -- Lights 1 & 3 will remain mapped to endpoints 2 & 4
-    RemoveDeviceEndpoint(&Light2);
-
-    // Add Light 4 -- > will be mapped to ZCL endpoint 5
-    AddDeviceEndpoint(&Light4, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
-                      Span<DataVersion>(gLight4DataVersions));
+                      Span<DataVersion>(gLight1DataVersions), 1);
 
-    // Re-add Light 2 -- > will be mapped to ZCL endpoint 6
-    AddDeviceEndpoint(&Light2, &bridgedLightEndpoint, Span<const EmberAfDeviceType>(gBridgedOnOffDeviceTypes),
-                      Span<DataVersion>(gLight2DataVersions));
-
-    // Add switch 1..2 --> will be mapped to ZCL endpoints 7,8
+    // Add switch 1..2 --> will be mapped to ZCL endpoints 4,5
     AddDeviceEndpoint(&Switch1, &bridgedSwitchEndpoint, Span<const EmberAfDeviceType>(gBridgedSwitchDeviceTypes),
-                      Span<DataVersion>(gSwitch1DataVersions));
+                      Span<DataVersion>(gSwitch1DataVersions), 1);
     AddDeviceEndpoint(&Switch2, &bridgedSwitchEndpoint, Span<const EmberAfDeviceType>(gBridgedSwitchDeviceTypes),
-                      Span<DataVersion>(gSwitch2DataVersions));
+                      Span<DataVersion>(gSwitch2DataVersions), 1);
 
     // Add composed Device with two buttons and a power source
     AddDeviceEndpoint(&ComposedDevice, &bridgedComposedDeviceEndpoint, Span<const EmberAfDeviceType>(gBridgedComposedDeviceTypes),
-                      Span<DataVersion>(gComposedDeviceDataVersions));
+                      Span<DataVersion>(gComposedDeviceDataVersions), 1);
     AddDeviceEndpoint(&ComposedSwitch1, &bridgedSwitchEndpoint, Span<const EmberAfDeviceType>(gComposedSwitchDeviceTypes),
                       Span<DataVersion>(gComposedSwitch1DataVersions), ComposedDevice.GetEndpointId());
     AddDeviceEndpoint(&ComposedSwitch2, &bridgedSwitchEndpoint, Span<const EmberAfDeviceType>(gComposedSwitchDeviceTypes),
@@ -788,6 +752,16 @@ int main(int argc, char * argv[])
                       Span<const EmberAfDeviceType>(gComposedPowerSourceDeviceTypes),
                       Span<DataVersion>(gComposedPowerSourceDataVersions), ComposedDevice.GetEndpointId());
 
+    {
+        pthread_t poll_thread;
+        int res = pthread_create(&poll_thread, nullptr, bridge_polling_thread, nullptr);
+        if (res)
+        {
+            printf("Error creating polling thread: %d\n", res);
+            exit(1);
+        }
+    }
+
     // Run CHIP
 
     chip::DeviceLayer::PlatformMgr().RunEventLoop();
diff --git a/examples/build_overrides/mbedtls.gni b/examples/build_overrides/mbedtls.gni
index fff24c4f29f01f..7b7bb7346759b4 100644
--- a/examples/build_overrides/mbedtls.gni
+++ b/examples/build_overrides/mbedtls.gni
@@ -15,4 +15,5 @@
 declare_args() {
   # Root directory for mbedTLS.
   mbedtls_root = "//third_party/connectedhomeip/third_party/mbedtls"
+  mbedtls_repo = "//third_party/connectedhomeip/third_party/mbedtls"
 }
diff --git a/examples/chef/BUILD.gn b/examples/chef/BUILD.gn
new file mode 100644
index 00000000000000..5c3280c903c485
--- /dev/null
+++ b/examples/chef/BUILD.gn
@@ -0,0 +1,43 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+import("//build_overrides/pigweed.gni")
+import("$dir_pw_build/python.gni")
+
+pw_python_package("chef") {
+  setup = [ "setup.py" ]
+
+  inputs = [
+    "sample_app_util/test_files/sample_zap_file.zap",
+    "sample_app_util/test_files/sample_zap_file_hashmeta.yaml",
+  ]
+
+  sources = [
+    "__init__.py",
+    "chef.py",
+    "constants.py",
+    "sample_app_util/__init__.py",
+    "sample_app_util/sample_app_util.py",
+    "sample_app_util/zap_file_parser.py",
+    "stateful_shell.py",
+  ]
+
+  tests = [
+    "test_stateful_shell.py",
+    "sample_app_util/test_zap_file_parser.py",
+  ]
+}
diff --git a/examples/chef/README.md b/examples/chef/README.md
index 0ccd51193bae73..91da0db5201682 100644
--- a/examples/chef/README.md
+++ b/examples/chef/README.md
@@ -58,3 +58,64 @@ Run `chef.py -h` to see the available commands
 3. Click on `Save As` and save the file with the name of your new device type
    into the `devices` folder. This device is now available for the script. See
    `chef.py -h` for a list of devices available.
+
+## CI
+
+### zzz_generated
+
+To eliminate a dependency on ZAP in CI jobs, all chef examples found in
+`examples/chef/devices` must have their output from the ZAP tool cached in
+`examples/chef/zzz_generated`.
+
+To generate the cache, one may execute chef with the option `--generate_zzz`.
+This will run ZAP for all devices in `examples/chef/devices` and place the
+output into the appropriate directory structure.
+
+Other than the output from the ZAP tool, the cache directory contains two
+additional files for each device:
+
+-   `INPUTMD5.txt` contains the md5 hex digest of the ZAP file used to generate
+    the directory.
+-   `ZAPSHA.txt` contains the commit of ZAP in the user's tree when the
+    directory was generated.
+
+```
+zzz_generated/
+└── lighting-app
+    ├── INPUTMD5.txt
+    ├── zap-generated
+    │   ├── access.h
+    │   ├── af-gen-event.h
+    │   └── ...
+    └── ZAPSHA.txt
+```
+
+These additional files will be used by the CI jobs to validate whether the cache
+must be regenerated i.e. regeneration is needed when ZAP or the input ZAP files
+change.
+
+### Workflow
+
+All CI jobs for chef can be found in `.github/workflows/chef.yaml`.
+
+#### Validate
+
+The workflow begins by calling chef with `--validate_zzz`.
+
+`--validate_zzz` will recalculate the current ZAP commit and the md5 of all
+example ZAP files and compare with what is committed to `zzz_generated`.
+
+If the validation job fails, it will provide instructions to repair
+`zzz_generated` and no builds will run.
+
+#### Build
+
+Once the validation job is complete, there is a separate job for each platform,
+which run in parallel.
+
+These jobs use a platform-specific image with base `chip-build`.
+
+The build jobs call chef with the options `--ci -t <PLATFORM>`. The `--ci`
+option will execute builds for all devices specified in `_CI_ALLOW_LIST` defined
+in `chef.py` (so long as these devices are also in `/devices`) on the specified
+platform.
diff --git a/examples/chef/__init__.py b/examples/chef/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/examples/chef/chef.py b/examples/chef/chef.py
index 299229e890a92f..22d821d05083ac 100755
--- a/examples/chef/chef.py
+++ b/examples/chef/chef.py
@@ -14,18 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
+import hashlib
+import json
 import optparse
 import os
+import shutil
 import sys
+import tarfile
 import textwrap
-from typing import Sequence
+from typing import Any, Dict, Sequence
+
 import yaml
 
 import constants
 import stateful_shell
 
-
 TermColors = constants.TermColors
 
 shell = stateful_shell.StatefulShell()
@@ -34,6 +37,11 @@
 _REPO_BASE_PATH = os.path.join(_CHEF_SCRIPT_PATH, "../../")
 _DEVICE_FOLDER = os.path.join(_CHEF_SCRIPT_PATH, "devices")
 _DEVICE_LIST = [file[:-4] for file in os.listdir(_DEVICE_FOLDER) if file.endswith(".zap")]
+_CHEF_ZZZ_ROOT = os.path.join(_CHEF_SCRIPT_PATH, "zzz_generated")
+_CI_DEVICE_MANIFEST_NAME = "INPUTMD5.txt"
+_CI_ZAP_MANIFEST_NAME = "ZAPSHA.txt"
+_CICD_CONFIG_FILE_NAME = os.path.join(_CHEF_SCRIPT_PATH, "cicd_meta.json")
+_CI_ALLOW_LIST = ["lighting-app"]
 
 gen_dir = ""  # Filled in after sample app type is read from args.
 
@@ -49,7 +57,7 @@ def splash() -> None:
         |  `----.|  |  |  | |  |____ |  |
          \\______||__|  |__| |_______||__|{TermColors.STRRESET}
         """)
-    print(splashText)
+    flush_print(splashText)
 
 
 def load_config() -> None:
@@ -57,16 +65,15 @@ def load_config() -> None:
     config["nrfconnect"] = dict()
     config["esp32"] = dict()
     config["silabs-thread"] = dict()
-
     configFile = f"{_CHEF_SCRIPT_PATH}/config.yaml"
     if (os.path.exists(configFile)):
         configStream = open(configFile, 'r')
         config = yaml.load(configStream, Loader=yaml.SafeLoader)
         configStream.close()
     else:
-        print("Running for the first time and configuring config.yaml. " +
-              "Change this configuration file to include correct configuration " +
-              "for the vendor's SDK")
+        flush_print("Running for the first time and configuring config.yaml. " +
+                    "Change this configuration file to include correct configuration " +
+                    "for the vendor's SDK")
         configStream = open(configFile, 'w')
         config["nrfconnect"]["ZEPHYR_BASE"] = os.environ.get('ZEPHYR_BASE')
         config["nrfconnect"]["TTY"] = None
@@ -76,7 +83,7 @@ def load_config() -> None:
         config["silabs-thread"]["TTY"] = None
         config["silabs-thread"]["CU"] = None
 
-        print(yaml.dump(config))
+        flush_print(yaml.dump(config))
         yaml.dump(config, configStream)
         configStream.close()
 
@@ -85,21 +92,98 @@ def load_config() -> None:
 
 def check_python_version() -> None:
     if sys.version_info[0] < 3:
-        print('Must use Python 3. Current version is ' +
-              str(sys.version_info[0]))
+        flush_print('Must use Python 3. Current version is ' +
+                    str(sys.version_info[0]))
         exit(1)
 
 
+def check_zap() -> str:
+    """Produces SHA of ZAP submodule for current HEAD.
+
+    Returns:
+      SHA of zap submodule.
+    """
+    shell.run_cmd(f"cd {_REPO_BASE_PATH}")
+    branch = shell.run_cmd("git rev-parse --abbrev-ref HEAD",
+                           return_cmd_output=True)
+    branch = branch.replace("\n", "")
+    command = f"git ls-tree {branch} third_party/zap/repo"
+    zap_commit = shell.run_cmd(command, return_cmd_output=True)
+    zap_commit = zap_commit.split(" ")[2]
+    zap_commit = zap_commit[:zap_commit.index("\t")]
+    flush_print(f"Found zap commit: {zap_commit}")
+    return zap_commit
+
+
+def generate_device_manifest(
+        write_manifest_file: bool = False) -> Dict[str, Any]:
+    """Produces dictionary containing md5 of device dir zap files.
+
+    Args:
+        write_manifest_file: Serialize manifest in tree.
+    Returns:
+        Dict containing MD5 of device dir zap files.
+    """
+    ci_manifest = {"devices": {}}
+    devices_manifest = ci_manifest["devices"]
+    zap_sha = check_zap()
+    ci_manifest["zap_commit"] = zap_sha
+    for device_name in _DEVICE_LIST:
+        device_file_path = os.path.join(_DEVICE_FOLDER, device_name + ".zap")
+        with open(device_file_path, "rb") as device_file:
+            device_file_data = device_file.read()
+        device_file_md5 = hashlib.md5(device_file_data).hexdigest()
+        devices_manifest[device_name] = device_file_md5
+        flush_print(f"Current digest for {device_name} : {device_file_md5}")
+        if write_manifest_file:
+            device_zzz_dir = os.path.join(_CHEF_ZZZ_ROOT, device_name)
+            device_zzz_md5_file = os.path.join(device_zzz_dir, _CI_DEVICE_MANIFEST_NAME)
+            with open(device_zzz_md5_file, "w+") as md5_file:
+                md5_file.write(device_file_md5)
+            device_zzz_zap_sha_file = os.path.join(device_zzz_dir, _CI_ZAP_MANIFEST_NAME)
+            with open(device_zzz_zap_sha_file, "w+") as zap_sha_file:
+                zap_sha_file.write(zap_sha)
+    return ci_manifest
+
+
+def load_cicd_config() -> Dict[str, Any]:
+    with open(_CICD_CONFIG_FILE_NAME) as config_file:
+        config = json.loads(config_file.read())
+    for platform_name, platform_config in config.items():
+        has_build_dir = "build_dir" in platform_config
+        has_plat_label = "platform_label" in platform_config
+        if not has_build_dir or not has_plat_label:
+            flush_print(f"{platform_name} CICD config missing build_dir or platform_label")
+            exit(1)
+    return config
+
+
+def flush_print(
+        to_print: str,
+        with_border: bool = False) -> None:
+    """Prints and flushes stdout buffer.
+
+    Args:
+        to_print: The string to print.
+        with_border: Add boarder above and below to_print.
+    """
+    if with_border:
+        border = ('-' * 64) + '\n'
+        to_print = f"{border}{to_print}\n{border}"
+    print(to_print, flush=True)
+
+
 def main(argv: Sequence[str]) -> None:
     check_python_version()
     config = load_config()
+    cicd_config = load_cicd_config()
 
     #
     # Build environment switches
     #
 
     if sys.platform == "win32":
-        print('Windows is currently not supported. Use Linux or MacOS platforms')
+        flush_print('Windows is currently not supported. Use Linux or MacOS platforms')
         exit(1)
 
     #
@@ -164,30 +248,178 @@ def main(argv: Sequence[str]) -> None:
                       action="store_true", dest="do_rpc_console")
     parser.add_option("-y", "--tty", help="Enumerated USB tty/serial interface enumerated for your physical device. E.g.: /dev/ACM0",
                       dest="tty", metavar="TTY", default=None)
+    parser.add_option("", "--generate_zzz", help="Populates zzz_generated/chef/<DEVICE_TYPE>/zap-generated with output of ZAP tool for every device in examples/chef/devices. If this flag is set, all other arguments are ignored except for --bootstrap_zap and --validate_zzz.",
+                      dest="generate_zzz", action="store_true")
+    parser.add_option("", "--validate_zzz", help="Checks if cached ZAP output needs to be regenrated, for use in CI. If this flag is set, all other arguments are ignored.",
+                      dest="validate_zzz", action="store_true")
+    parser.add_option("", "--use_zzz", help="Use pre generated output from the ZAP tool found in the zzz_generated folder. Used to decrease execution time of CI/CD jobs",
+                      dest="use_zzz", action="store_true")
+    parser.add_option("", "--build_all", help="For use in CD only. Builds and bundles all chef examples for the specified platform. Uses --use_zzz. Chef exits after completion.",
+                      dest="build_all", action="store_true")
+    parser.add_option(
+        "", "--ci", help="Builds Chef examples defined in _CI_ALLOW_LIST. Uses --use_zzz. Uses specified target from -t. Chef exits after completion.", dest="ci", action="store_true")
 
     options, _ = parser.parse_args(argv)
 
     splash()
 
+    #
+    # Validate zzz_generated
+    #
+
+    if options.validate_zzz:
+        flush_print(f"Validating\n{_CHEF_ZZZ_ROOT}\n",
+                    with_border=True)
+        fix_instructions = textwrap.dedent("""\
+        Cached files out of date!
+        Please:
+          ./scripts/bootstrap.sh
+          source ./scripts/activate.sh
+          cd ./third_party/zap/repo
+          npm install
+          cd ../../..
+          ./examples/chef/chef.py --generate_zzz
+          git add examples/chef/zzz_generated
+        Ensure you are running with the latest version of ZAP from master!""")
+        ci_manifest = generate_device_manifest()
+        current_zap = ci_manifest["zap_commit"]
+        for device, device_md5 in ci_manifest["devices"].items():
+            zzz_dir = os.path.join(_CHEF_ZZZ_ROOT, device)
+            device_zap_sha_file = os.path.join(zzz_dir, _CI_ZAP_MANIFEST_NAME)
+            device_md5_file = os.path.join(zzz_dir, _CI_DEVICE_MANIFEST_NAME)
+            help_msg = f"{device}: {fix_instructions}"
+            if not os.path.exists(device_zap_sha_file):
+                flush_print(f"ZAP VERSION MISSING {help_msg}")
+                exit(1)
+            else:
+                with open(device_zap_sha_file) as zap_file:
+                    output_cached_zap_sha = zap_file.read()
+                if output_cached_zap_sha != current_zap:
+                    flush_print(f"ZAP VERSION MISMATCH {help_msg}")
+                    exit(1)
+            if not os.path.exists(device_md5_file):
+                flush_print(f"INPUT MD5 MISSING {help_msg}")
+                exit(1)
+            else:
+                with open(device_md5_file) as md5_file:
+                    output_cached_md5 = md5_file.read()
+                if output_cached_md5 != device_md5:
+                    flush_print(f"INPUT MD5 MISMATCH {help_msg}")
+                    exit(1)
+        flush_print("Cached ZAP output is up to date!")
+        exit(0)
+
+    #
+    # ZAP bootstrapping
+    #
+
+    if options.do_bootstrap_zap:
+        if sys.platform == "linux" or sys.platform == "linux2":
+            flush_print("Installing ZAP OS package dependencies")
+            install_deps_cmd = textwrap.dedent("""\
+            sudo apt-get install node node-yargs npm
+            libpixman-1-dev libcairo2-dev libpango1.0-dev node-pre-gyp
+            libjpeg9-dev libgif-dev node-typescript""")
+            install_deps_cmd = install_deps_cmd.replace("\n", " ")
+            shell.run_cmd(install_deps_cmd)
+        if sys.platform == "darwin":
+            flush_print("Installation of ZAP OS packages not supported on MacOS")
+        if sys.platform == "win32":
+            flush_print(
+                "Installation of ZAP OS packages not supported on Windows")
+
+        flush_print("Running NPM to install ZAP Node.JS dependencies")
+        shell.run_cmd(
+            f"cd {_REPO_BASE_PATH}/third_party/zap/repo/ && npm install")
+
+    #
+    # Populate zzz_generated
+    #
+
+    if options.generate_zzz:
+        flush_print(f"Cleaning {_CHEF_ZZZ_ROOT}")
+        if not os.path.exists(_CHEF_ZZZ_ROOT):
+            flush_print(f"{_CHEF_ZZZ_ROOT} doesn't exist; creating")
+            os.mkdir(_CHEF_ZZZ_ROOT)
+        else:
+            flush_print(f"Deleting and recreating existing {_CHEF_ZZZ_ROOT}")
+            shutil.rmtree(_CHEF_ZZZ_ROOT)
+            os.mkdir(_CHEF_ZZZ_ROOT)
+        flush_print(f"Generating files in {_CHEF_ZZZ_ROOT} for all devices")
+        for device_name in _DEVICE_LIST:
+            flush_print(f"Generating files for {device_name}")
+            device_out_dir = os.path.join(_CHEF_ZZZ_ROOT,
+                                          device_name,
+                                          "zap-generated")
+            os.makedirs(device_out_dir)
+            shell.run_cmd(textwrap.dedent(f"""\
+            {_REPO_BASE_PATH}/scripts/tools/zap/generate.py \
+            {_CHEF_SCRIPT_PATH}/devices/{device_name}.zap -o {device_out_dir}"""))
+            shell.run_cmd(f"touch {device_out_dir}/af-gen-event.h")
+        generate_device_manifest(write_manifest_file=True)
+        exit(0)
+
+    #
+    # CI
+    #
+
+    if options.ci:
+        for device_name in [d for d in _DEVICE_LIST if d in _CI_ALLOW_LIST]:
+            if options.build_target == "nrfconnect":
+                shell.run_cmd("export GNUARMEMB_TOOLCHAIN_PATH=\"$PW_ARM_CIPD_INSTALL_DIR\"")
+            shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
+            command = f"./chef.py -cbr --use_zzz -d {device_name} -t {options.build_target}"
+            flush_print(f"Building {command}", with_border=True)
+            shell.run_cmd(command)
+            # TODO call per-platform bundle function for extra validation
+        exit(0)
+
+    #
+    # Build all
+    #
+
+    if options.build_all:
+        flush_print("Building all chef examples")
+        archive_prefix = "/workspace/artifacts/"
+        archive_suffix = ".tar.gz"
+        os.makedirs(archive_prefix, exist_ok=True)
+        for device_name in _DEVICE_LIST:
+            for platform, platform_meta in cicd_config.items():
+                directory = platform_meta['build_dir']
+                label = platform_meta['platform_label']
+                output_dir = os.path.join(_CHEF_SCRIPT_PATH, directory)
+                command = f"./chef.py -cbr --use_zzz -d {device_name} -t {platform}"
+                flush_print(f"Building {command}", with_border=True)
+                shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
+                shell.run_cmd("export GNUARMEMB_TOOLCHAIN_PATH=\"$PW_ARM_CIPD_INSTALL_DIR\"")
+                shell.run_cmd(command)
+                # TODO Needs to call per-platform bundle function
+                archive_name = f"{label}-{device_name}"
+                archive_full_name = archive_prefix + archive_name + archive_suffix
+                flush_print(f"Adding build output to archive {archive_full_name}")
+                with tarfile.open(archive_full_name, "w:gz") as tar:
+                    tar.add(output_dir, arcname=".")
+        exit(0)
+
     #
     # Platform Folder
     #
 
-    print(f"Target is set to {options.sample_device_type_name}")
+    flush_print(f"Target is set to {options.sample_device_type_name}")
     global gen_dir
     gen_dir = (
         f"{_CHEF_SCRIPT_PATH}/out/{options.sample_device_type_name}/zap-generated/")
 
-    print("Setting up environment...")
+    flush_print("Setting up environment...")
     if options.build_target == "esp32":
         if config['esp32']['IDF_PATH'] is None:
-            print('Path for esp32 SDK was not found. Make sure esp32.IDF_PATH is set on your config.yaml file')
+            flush_print('Path for esp32 SDK was not found. Make sure esp32.IDF_PATH is set on your config.yaml file')
             exit(1)
         plat_folder = os.path.normpath(f"{_CHEF_SCRIPT_PATH}/esp32")
         shell.run_cmd(f'source {config["esp32"]["IDF_PATH"]}/export.sh')
     elif options.build_target == "nrfconnect":
         if config['nrfconnect']['ZEPHYR_BASE'] is None:
-            print('Path for nrfconnect SDK was not found. Make sure nrfconnect.ZEPHYR_BASE is set on your config.yaml file')
+            flush_print('Path for nrfconnect SDK was not found. Make sure nrfconnect.ZEPHYR_BASE is set on your config.yaml file')
             exit(1)
         plat_folder = os.path.normpath(f"{_CHEF_SCRIPT_PATH}/nrfconnect")
         shell.run_cmd(f'source {config["nrfconnect"]["ZEPHYR_BASE"]}/zephyr-env.sh')
@@ -195,9 +427,9 @@ def main(argv: Sequence[str]) -> None:
     elif options.build_target == "linux":
         pass
     elif options.build_target == "silabs-thread":
-        print('Path to gecko sdk is configured within Matter.')
+        flush_print('Path to gecko sdk is configured within Matter.')
     else:
-        print(f"Target {options.build_target} not supported")
+        flush_print(f"Target {options.build_target} not supported")
 
     shell.run_cmd(f"source {_REPO_BASE_PATH}/scripts/activate.sh")
 
@@ -207,49 +439,30 @@ def main(argv: Sequence[str]) -> None:
 
     if options.do_update_toolchain:
         if options.build_target == "esp32":
-            print("ESP32 toolchain update not supported. Skipping")
+            flush_print("ESP32 toolchain update not supported. Skipping")
         elif options.build_target == "nrfconnect":
-            print("Updating toolchain")
+            flush_print("Updating toolchain")
             shell.run_cmd(
                 f"cd {_REPO_BASE_PATH} && python3 scripts/setup/nrfconnect/update_ncs.py --update")
         elif options.build_target == "silabs-thread":
-            print("Silabs-thread toolchain not supported. Skipping")
+            flush_print("Silabs-thread toolchain not supported. Skipping")
         elif options.build_target == "linux":
-            print("Linux toolchain update not supported. Skipping")
-
-    #
-    # ZAP bootstrapping
-    #
-
-    if options.do_bootstrap_zap:
-        if sys.platform == "linux" or sys.platform == "linux2":
-            print("Installing ZAP OS package dependencies")
-            shell.run_cmd(
-                f"sudo apt-get install sudo apt-get install node node-yargs npm libpixman-1-dev libcairo2-dev libpango1.0-dev node-pre-gyp libjpeg9-dev libgif-dev node-typescript")
-        if sys.platform == "darwin":
-            print("Installation of ZAP OS packages not supported on MacOS")
-        if sys.platform == "win32":
-            print(
-                "Installation of ZAP OS packages not supported on Windows")
-
-        print("Running NPM to install ZAP Node.JS dependencies")
-        shell.run_cmd(
-            f"cd {_REPO_BASE_PATH}/third_party/zap/repo/ && npm install")
+            flush_print("Linux toolchain update not supported. Skipping")
 
     #
     # Cluster customization
     #
 
     if options.do_run_gui:
-        print("Starting ZAP GUI editor")
+        flush_print("Starting ZAP GUI editor")
         shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/devices")
         shell.run_cmd(
             f"{_REPO_BASE_PATH}/scripts/tools/zap/run_zaptool.sh {options.sample_device_type_name}.zap")
 
     if options.do_run_zap:
-        print("Running ZAP script to generate artifacts")
-        shell.run_cmd(f"mkdir -p {gen_dir}/")
-        shell.run_cmd(f"rm {gen_dir}/*")
+        flush_print("Running ZAP script to generate artifacts")
+        shell.run_cmd(f"rm -rf {gen_dir}")
+        shell.run_cmd(f"mkdir -p {gen_dir}")
         shell.run_cmd(
             f"{_REPO_BASE_PATH}/scripts/tools/zap/generate.py {_CHEF_SCRIPT_PATH}/devices/{options.sample_device_type_name}.zap -o {gen_dir}")
         # af-gen-event.h is not generated
@@ -267,31 +480,50 @@ def main(argv: Sequence[str]) -> None:
             shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/nrfconnect")
             shell.run_cmd("west build -t menuconfig")
         elif (options.build_target == "silabs-thread") or (options.build_target == "silabs-wifi"):
-            print("Menuconfig not available on Silabs-thread target. Skipping")
+            flush_print("Menuconfig not available on Silabs-thread target. Skipping")
         elif options.build_target == "linux":
-            print("Menuconfig not available on Linux target. Skipping")
+            flush_print("Menuconfig not available on Linux target. Skipping")
 
     #
     # Build
     #
 
     if options.do_build:
-        print("Building...")
+        if options.use_zzz:
+            flush_print("Using pre-generated ZAP output")
+            zzz_dir = os.path.join(_CHEF_SCRIPT_PATH,
+                                   "zzz_generated",
+                                   options.sample_device_type_name,
+                                   "zap-generated")
+            if not os.path.exists(zzz_dir):
+                flush_print(textwrap.dedent(f"""\
+                You have specified --use_zzz
+                for device {options.sample_device_type_name}
+                which does not exist in the cached ZAP output.
+                To cache ZAP output for this device:
+                ensure {options.sample_device_type_name}.zap
+                is placed in {_DEVICE_FOLDER}
+                run chef with the option --generate_zzz
+                """))
+                exit(1)
+            shutil.rmtree(gen_dir, ignore_errors=True)
+            shutil.copytree(zzz_dir, gen_dir)
+        flush_print("Building...")
         if options.do_rpc:
-            print("RPC PW enabled")
+            flush_print("RPC PW enabled")
             if options.build_target == "esp32":
                 shell.run_cmd(
                     f"export SDKCONFIG_DEFAULTS={_CHEF_SCRIPT_PATH}/esp32/sdkconfig_rpc.defaults")
             else:
-                print(f"RPC PW on {options.build_target} not supported")
+                flush_print(f"RPC PW on {options.build_target} not supported")
 
         else:
-            print("RPC PW disabled")
+            flush_print("RPC PW disabled")
         if (options.build_target == "esp32"):
             shell.run_cmd(
                 f"export SDKCONFIG_DEFAULTS={_CHEF_SCRIPT_PATH}/esp32/sdkconfig.defaults")
 
-        print(
+        flush_print(
             f"Product ID 0x{options.pid:02X} / Vendor ID 0x{options.vid:02X}")
         shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
 
@@ -306,7 +538,7 @@ def main(argv: Sequence[str]) -> None:
         if options.build_target == "esp32":
             shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
             if options.do_clean:
-                shell.run_cmd(f"rm {_CHEF_SCRIPT_PATH}/esp32/sdkconfig")
+                shell.run_cmd(f"rm -f {_CHEF_SCRIPT_PATH}/esp32/sdkconfig")
                 shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
                 shell.run_cmd(f"rm -rf {_CHEF_SCRIPT_PATH}/esp32/build")
                 shell.run_cmd("idf.py fullclean")
@@ -333,7 +565,7 @@ def main(argv: Sequence[str]) -> None:
             with open(f"{_CHEF_SCRIPT_PATH}/linux/args.gni", "w") as f:
                 f.write(textwrap.dedent(f"""\
                         import("//build_overrides/chip.gni")
-                        import("\\${{chip_root}}/config/standalone/args.gni")
+                        import("${{chip_root}}/config/standalone/args.gni")
                         chip_shell_cmd_server = false
                         target_defines = ["CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID={options.vid}", "CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID={options.pid}", "CONFIG_ENABLE_PW_RPC={'1' if options.do_rpc else '0'}"]
                         """))
@@ -344,7 +576,10 @@ def main(argv: Sequence[str]) -> None:
                         """))
             if options.do_clean:
                 shell.run_cmd(f"rm -rf out")
-            shell.run_cmd("gn gen out")
+            if options.do_rpc:
+                shell.run_cmd("gn gen out --args='import(\"//with_pw_rpc.gni\")'")
+            else:
+                shell.run_cmd("gn gen out --args=''")
             shell.run_cmd("ninja -C out")
 
     #
@@ -356,10 +591,10 @@ def main(argv: Sequence[str]) -> None:
     #
 
     if options.do_flash:
-        print("Flashing target")
+        flush_print("Flashing target")
         if options.build_target == "esp32":
             if config['esp32']['TTY'] is None:
-                print('The path for the serial enumeration for esp32 is not set. Make sure esp32.TTY is set on your config.yaml file')
+                flush_print('The path for the serial enumeration for esp32 is not set. Make sure esp32.TTY is set on your config.yaml file')
                 exit(1)
             shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
             if options.do_erase:
@@ -383,28 +618,29 @@ def main(argv: Sequence[str]) -> None:
     #
 
     if options.do_interact:
-        print("Starting terminal...")
+        flush_print("Starting terminal...")
         if options.build_target == "esp32":
             if config['esp32']['TTY'] is None:
-                print('The path for the serial enumeration for esp32 is not set. Make sure esp32.TTY is set on your config.yaml file')
+                flush_print('The path for the serial enumeration for esp32 is not set. Make sure esp32.TTY is set on your config.yaml file')
                 exit(1)
             shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
             shell.run_cmd(f"idf.py -p {config['esp32']['TTY']} monitor")
         elif options.build_target == "nrfconnect":
             if config['nrfconnect']['TTY'] is None:
-                print('The path for the serial enumeration for nordic is not set. Make sure nrfconnect.TTY is set on your config.yaml file')
+                flush_print('The path for the serial enumeration for nordic is not set. Make sure nrfconnect.TTY is set on your config.yaml file')
                 exit(1)
             shell.run_cmd("killall screen")
             shell.run_cmd(f"screen {config['nrfconnect']['TTY']} 115200")
         elif (options.build_target == "silabs-thread"):
             if config['silabs-thread']['TTY'] is None:
-                print('The path for the serial enumeration for silabs-thread is not set. Make sure silabs-thread.TTY is set on your config.yaml file')
+                flush_print(
+                    'The path for the serial enumeration for silabs-thread is not set. Make sure silabs-thread.TTY is set on your config.yaml file')
                 exit(1)
 
             shell.run_cmd("killall screen")
             shell.run_cmd(f"screen {config['silabs-thread']['TTY']} 115200 8-N-1")
         elif options.build_target == "linux":
-            print(
+            flush_print(
                 f"{_CHEF_SCRIPT_PATH}/linux/out/{options.sample_device_type_name}")
             shell.run_cmd(
                 f"{_CHEF_SCRIPT_PATH}/linux/out/{options.sample_device_type_name}")
@@ -419,16 +655,18 @@ def main(argv: Sequence[str]) -> None:
         elif (options.build_target == "silabs-thread"):
             if (sys.platform == "linux") or (sys.platform == "linux2"):
                 if(config['silabs-thread']['TTY'] is None):
-                    print('The path for the serial enumeration for silabs-thread is not set. Make sure silabs-thread.TTY is set on your config.yaml file')
+                    flush_print(
+                        'The path for the serial enumeration for silabs-thread is not set. Make sure silabs-thread.TTY is set on your config.yaml file')
                     exit(1)
                 shell.run_cmd(f"python3 -m chip_rpc.console --device {config['silabs-thread']['TTY']} -b 115200")
             elif sys.platform == "darwin":
                 if(config['silabs-thread']['CU'] is None):
-                    print('The path for the serial enumeration for silabs-thread is not set. Make sure silabs-thread.CU is set on your config.yaml file')
+                    flush_print(
+                        'The path for the serial enumeration for silabs-thread is not set. Make sure silabs-thread.CU is set on your config.yaml file')
                     exit(1)
                 shell.run_cmd(f"python3 -m chip_rpc.console --device {config['silabs-thread']['CU']} -b 115200")
 
-    print("Done")
+    flush_print("Done")
 
 
 if __name__ == '__main__':
diff --git a/examples/chef/cicd_meta.json b/examples/chef/cicd_meta.json
new file mode 100644
index 00000000000000..34cabcb530a302
--- /dev/null
+++ b/examples/chef/cicd_meta.json
@@ -0,0 +1,14 @@
+{
+    "linux": {
+        "build_dir": "linux/out",
+        "platform_label": "linux_x86"
+    },
+    "esp32": {
+        "build_dir": "esp32/build",
+        "platform_label": "esp32-m5stack"
+    },
+    "nrfconnect": {
+        "build_dir": "nrfconnect/build",
+        "platform_label": "nrf-nrf52840dk"
+    }
+}
diff --git a/examples/chef/devices/lighting-app.zap b/examples/chef/devices/lighting-app.zap
index 2868176f0c6b6d..b3183cfc9ce59a 100644
--- a/examples/chef/devices/lighting-app.zap
+++ b/examples/chef/devices/lighting-app.zap
@@ -2613,7 +2613,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2743,6 +2752,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2972,7 +2997,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2986,9 +3011,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3004,7 +3029,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3020,7 +3045,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3036,7 +3061,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3052,7 +3077,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3068,7 +3093,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3116,7 +3141,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3132,7 +3157,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3148,7 +3173,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3164,7 +3189,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3180,7 +3205,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3196,7 +3221,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3212,7 +3237,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3228,7 +3253,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3244,7 +3269,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3260,7 +3285,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3276,7 +3301,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3292,7 +3317,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3308,7 +3333,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3324,7 +3349,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3340,7 +3365,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3356,7 +3381,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3372,7 +3397,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3388,7 +3413,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3404,7 +3429,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3420,7 +3445,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3436,7 +3461,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3452,7 +3477,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3468,7 +3493,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3484,7 +3509,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3500,7 +3525,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3516,7 +3541,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3532,7 +3557,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3548,7 +3573,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3564,7 +3589,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3580,7 +3605,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3596,7 +3621,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3612,7 +3637,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3628,7 +3653,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3644,7 +3669,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3660,7 +3685,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3676,7 +3701,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3692,7 +3717,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3708,7 +3733,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3724,7 +3749,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3740,7 +3765,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3756,7 +3781,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3772,7 +3797,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3788,7 +3813,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3804,7 +3829,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3820,7 +3845,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3836,7 +3861,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3852,7 +3877,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3868,7 +3893,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3884,7 +3909,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3900,7 +3925,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3914,7 +3939,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3932,7 +3957,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3946,7 +3971,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4784,14 +4809,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -6191,7 +6208,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7694,5 +7711,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 257
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/linux/BUILD.gn b/examples/chef/linux/BUILD.gn
index 32e8d05a6dee3a..9bd88e4b53c03d 100644
--- a/examples/chef/linux/BUILD.gn
+++ b/examples/chef/linux/BUILD.gn
@@ -12,15 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
+
 import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/app/chip_data_model.gni")
-import("sample.gni")
+import("${chip_root}/src/app/common_flags.gni")
 
 assert(chip_build_tools)
 
+import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
+
+if (chip_enable_pw_rpc) {
+  import("//build_overrides/pigweed.gni")
+  import("$dir_pw_build/target_types.gni")
+}
+
+import("sample.gni")
+
 project_dir = "./.."
 
 chip_data_model("chef-data-model") {
@@ -36,14 +44,60 @@ executable("${sample_name}") {
 
   deps = [
     ":chef-data-model",
-    "${chip_root}/src/controller",
-    "${chip_root}/src/credentials",
-    "${chip_root}/src/lib/shell",
-    "${chip_root}/src/platform",
+    "${chip_root}/examples/platform/linux:app-main",
+    "${chip_root}/src/lib",
     "${project_dir}/shell_common:shell_common",
   ]
 
-  cflags = [ "-Wconversion" ]
+  include_dirs = [ "include" ]
+
+  if (chip_enable_pw_rpc) {
+    defines = [
+      "PW_RPC_ENABLED",
+      "PW_RPC_ATTRIBUTE_SERVICE=1",
+      "PW_RPC_BUTTON_SERVICE=1",
+      "PW_RPC_DESCRIPTOR_SERVICE=1",
+      "PW_RPC_DEVICE_SERVICE=1",
+      "PW_RPC_LIGHTING_SERVICE=1",
+      "PW_RPC_TRACING_SERVICE=1",
+    ]
+
+    sources += [
+      "${chip_root}/examples/platform/linux/Rpc.cpp",
+      "${dir_pigweed}/targets/host/system_rpc_server.cc",
+    ]
+
+    deps += [
+      "$dir_pw_hdlc:pw_rpc",
+      "$dir_pw_hdlc:rpc_channel_output",
+      "$dir_pw_log",
+      "$dir_pw_rpc:server",
+      "$dir_pw_rpc/system_server:facade",
+      "$dir_pw_stream:socket_stream",
+      "$dir_pw_stream:sys_io_stream",
+      "$dir_pw_sync:mutex",
+      "$dir_pw_trace",
+      "$dir_pw_trace_tokenized",
+      "$dir_pw_trace_tokenized:trace_rpc_service",
+      "${chip_root}/config/linux/lib/pw_rpc:pw_rpc",
+      "${chip_root}/examples/common/pigweed:attributes_service.nanopb_rpc",
+      "${chip_root}/examples/common/pigweed:button_service.nanopb_rpc",
+      "${chip_root}/examples/common/pigweed:descriptor_service.nanopb_rpc",
+      "${chip_root}/examples/common/pigweed:device_service.nanopb_rpc",
+      "${chip_root}/examples/common/pigweed:lighting_service.nanopb_rpc",
+      "${chip_root}/examples/common/pigweed:rpc_services",
+    ]
+
+    deps += pw_build_LINK_DEPS
+
+    cflags = [ "-Wno-gnu-designator" ]
+
+    include_dirs += [ "${chip_root}/examples/common" ]
+  } else {
+    # The system_rpc_server.cc file is in pigweed and doesn't compile with
+    # -Wconversion, remove check for RPC build only.
+    cflags = [ "-Wconversion" ]
+  }
 
   output_dir = root_out_dir
 }
@@ -52,4 +106,6 @@ group("chef") {
   deps = [ ":${sample_name}" ]
 }
 
-import("//build_overrides/chip.gni")
+group("default") {
+  deps = [ ":chef" ]
+}
diff --git a/examples/chef/linux/main.cpp b/examples/chef/linux/main.cpp
index 0335bbb6e497e0..56b80dd313bdc4 100644
--- a/examples/chef/linux/main.cpp
+++ b/examples/chef/linux/main.cpp
@@ -1,6 +1,7 @@
 /*
  *
  *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,32 +16,29 @@
  *    limitations under the License.
  */
 
-#include <lib/shell/Engine.h>
+#include <AppMain.h>
 
-#include <lib/core/CHIPCore.h>
-#include <lib/support/Base64.h>
-#include <lib/support/CHIPArgParser.hpp>
-#include <lib/support/CodeUtils.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app/ConcreteAttributePath.h>
 #include <lib/support/logging/CHIPLogging.h>
 
+#include <lib/shell/Engine.h>
+
 #include <ChipShellCollection.h>
-#include <lib/support/CHIPMem.h>
-#include <platform/CHIPDeviceLayer.h>
 
 using namespace chip;
 using namespace chip::Shell;
 
-int main()
+void ApplicationInit() {}
+
+int main(int argc, char * argv[])
 {
-    chip::Platform::MemoryInit();
-    chip::DeviceLayer::PlatformMgr().InitChipStack();
-    chip::DeviceLayer::PlatformMgr().StartEventLoopTask();
-#if CHIP_DEVICE_CONFIG_ENABLE_WPA
-    chip::DeviceLayer::ConnectivityManagerImpl().StartWiFiManagement();
-#endif
+    if (ChipLinuxAppInit(argc, argv) != 0)
+    {
+        return -1;
+    }
 
     const int rc = Engine::Root().Init();
-
     if (rc != 0)
     {
         ChipLogError(Shell, "Streamer initialization failed: %d", rc);
@@ -55,6 +53,7 @@ int main()
     cmd_app_server_init();
 #endif
 
-    Engine::Root().RunMainLoop();
+    ChipLinuxAppMainLoop();
+
     return 0;
 }
diff --git a/examples/chef/linux/with_pw_rpc.gni b/examples/chef/linux/with_pw_rpc.gni
new file mode 100644
index 00000000000000..969b2b88c9b75b
--- /dev/null
+++ b/examples/chef/linux/with_pw_rpc.gni
@@ -0,0 +1,42 @@
+# 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.
+
+# add this gni as import in your build args to use pigweed in the example
+# 'import("//with_pw_rpc.gni")'
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/config/standalone/args.gni")
+
+import("//build_overrides/pigweed.gni")
+
+cpp_standard = "gnu++17"
+
+pw_log_BACKEND = "$dir_pw_log_basic"
+pw_assert_BACKEND = "$dir_pw_assert_log"
+pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
+pw_trace_BACKEND = "$dir_pw_trace_tokenized"
+pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
+pw_rpc_system_server_BACKEND = "${chip_root}/config/linux/lib/pw_rpc:pw_rpc"
+dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
+pw_chrono_SYSTEM_CLOCK_BACKEND = "$dir_pw_chrono_stl:system_clock"
+pw_sync_MUTEX_BACKEND = "$dir_pw_sync_stl:mutex_backend"
+
+pw_build_LINK_DEPS = [
+  "$dir_pw_assert:impl",
+  "$dir_pw_log:impl",
+]
+
+chip_enable_pw_rpc = true
+chip_build_pw_trace_lib = true
diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt
index 921458db215900..483f275bbdf2c8 100644
--- a/examples/chef/nrfconnect/CMakeLists.txt
+++ b/examples/chef/nrfconnect/CMakeLists.txt
@@ -122,6 +122,7 @@ set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.nrfconnect)
diff --git a/examples/chef/nrfconnect/main.cpp b/examples/chef/nrfconnect/main.cpp
index 4f427797c069d5..650a3664b975d2 100644
--- a/examples/chef/nrfconnect/main.cpp
+++ b/examples/chef/nrfconnect/main.cpp
@@ -33,7 +33,7 @@
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if CONFIG_ENABLE_CHIP_SHELL || CONFIG_CHIP_LIB_SHELL
 #include <ChipShellCollection.h>
diff --git a/examples/chef/sample_app_util/README.md b/examples/chef/sample_app_util/README.md
new file mode 100644
index 00000000000000..041f9462c4232c
--- /dev/null
+++ b/examples/chef/sample_app_util/README.md
@@ -0,0 +1,195 @@
+# Chef Build Conventions
+
+## Overview
+
+---
+
+It is convenient to follow some naming and build conventions for Chef tool due
+to the large volume of sample apps that may be created and the ambiguity that
+may result from arbitrary names.
+
+There are three components to the convention proposed here:
+
+1. The naming convention for the sample matter device and clusters (referred to
+   here as the `sample app`).
+2. The naming convention to use for the build files which will be flashed on the
+   devices.
+3. The usage of metadata files that shall accompany build files to provide more
+   detailed information about builds.
+
+The convention proposed here should be adopted by the zap files provided in
+`examples/chef/devices` and the builds generated from Chef tool in CI.
+
+## Limitations
+
+---
+
+The largest filename that can be used on MacOS and Linux is 255 characters. If a
+sample app name would exceed this limit by following this convention, then the
+sample app should be given an arbitrary name.
+
+This limitation is called out, but, with the given naming conventions, this
+should rarely happen.
+
+## Convention
+
+---
+
+### Sample App Naming Convention
+
+Sample apps should be named by concatenating the name of all endpoints in the
+order of their index. Endpoint names are separated by underscores (`_`) and a 10
+character hash[^hash_note] of the sample app metadata is appended to the end.
+
+Valid sample app names conform to the following format:
+
+```
+<endpoint_0>_<endpoint_1>_<hash>
+```
+
+For example, here are some valid names:
+
+```
+rootnode_extendedcolorlight_H1l9gnQDYl
+rootnode_speaker_8qRQaEj0Hy
+rootnode_lightsensor_L6dEbmVDah
+rootnode_dimmablelight_rWsDiwzw2t
+rootnode_pressuresensor_03quf7tPOL
+rootnode_flowsensor_ixbAboycie
+rootnode_windowcovering_b9QoiScjOq
+rootnode_doorlock_d5wtU7sjFR
+rootnode_thermostat_KuQYArmwl7
+rootnode_dimmablelight_7pNE3GVarn
+rootnode_temperaturesensor_i0wGnDVUAc
+rootnode_occupancysensor_wyGeQSokNp
+rootnode_humiditysensor_pv0comNKyT
+bridgednode_temperaturesensor_onofflight_onoffpluginunit_MI9DSdkH8H
+```
+
+[^hash_note]:
+
+    The 10 character hash is a base64 encoding of the md5 hash generated by
+    digesting the JSON string encoding of the metadata information. The code for
+    generating the hash can be found in `generate_hash` in
+    [zap_file_parser](zap_file_parser.py) There are some notable details
+    here: 1) The full base64 encoded hash is 16 characters, but only 10 are
+    used. This still gives us a sufficiently low probability of collision (~1.2
+    x 10^-8). 2) `_` and `-` are replaced in the base64 encoding because they
+    have other uses in the naming. 3) Platform specific information is omitted
+    from the hash. E.g. the networking_commissioning cluster is excluded. This
+    is to make the hashes platform agnostic.
+
+### Sample App Build Naming Convention
+
+The sample app builds formats will be named by pre-pending the zap file name
+(described above) with the platform and appending connectivity info.
+
+Valid build names conform to the following format:
+
+```
+<platform>_<sample_app_name>
+```
+
+Note that `<sample_app_name>` follows the convention:
+`<endpoint_0>_<endpoint_1>_<hash>`.
+
+Together that is:
+
+```
+<platform>_<endpoint_0>_<endpoint_1>_<hash>
+```
+
+The list of platforms supported here (as of writing this) are:
+
+```
+m5stack
+brd4161a
+nrf52840dk
+linux_x86
+```
+
+For example, here are some valid names:
+
+```
+m5stack_rootnode_humiditysensor_pv0comNKyT
+brd4161a_rootnode_humiditysensor_pv0comNKyT
+nrf52840dk_rootnode_humiditysensor_pv0comNKyT
+linux_x86_rootnode_humiditysensor_pv0comNKyT
+```
+
+### Metadata file convention
+
+Metadata files are `yaml` files that should accompany build files.
+
+The metadata files have a structure as follows:
+
+```
+- <endpoint_0_name>:
+      client_clusters:
+          <client_cluster_name>:
+              attributes:
+                  <attribute_name>: <attribute_value>
+                  ...
+              commands:
+                  - <command_name>
+                  - ...
+      server_clusters:
+          <server_cluster_name>:
+              attributes:
+                  <attribute_name>: <attribute_value>
+                  ...
+              commands:
+                  - <command_name>
+                  - ...
+- <endpoint_1_name>: ...
+```
+
+For an example, see [sample_zap_file.yaml](test_files/sample_zap_file.yaml)
+which was generated from [sample_zap_file.zap](test_files/sample_zap_file.zap).
+
+Note that it is more readable in `yaml` format. Since hashes are generated from
+the metadata info, additional conventions are needed to ensure consistency for
+the metadata structure.
+
+The following conventions are used:
+
+-   All lists are sorted alphabetically.
+-   If a list contains dictionaries, it will be sorted by the "name" key. If it
+    does not contain "name" key, it will be sorted by the first key common to
+    all dictionaries that comes first alphabetically.
+-   The list of endpoints is excluded from the above conventions. Endpoints are
+    ordered according to their endpoint number; here, the endpoint number is the
+    same as the order they are read from the zap file.
+
+As an example, take a look at
+[sample_zap_file.yaml](test_files/sample_zap_file.yaml)
+
+## Utility Usage
+
+---
+
+There are a few primary usage cases for the utility
+[sample_app_util.py](sample_app_util.py). Details are provided by using
+`python sample_app_util.py zap --help`. Below is a summary.
+
+| Command                                                                      | Description                                                                                                                                                                  |
+| ---------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `python sample_app_util.py zap <zap_file> --generate-name`                   | Generates the name for a zap file per the specified convention                                                                                                               |
+| `python sample_app_util.py zap <zap_file> --rename-file`                     | Renames the zap file per specified convention                                                                                                                                |
+| `python sample_app_util.py zap <zap_file> --generate-metadata [output_path]` | Generates the metadata file adjacent to the zap file with `.yaml` extension. If `[output_path]` is provided then the metadata file will be stored at the location specified. |
+
+## Running Tests
+
+---
+
+Navigate to the base directory of this README.
+
+```
+cd <project_root>/examples/chef/sample_app_util
+```
+
+Run unit tests.
+
+```
+python -m unittest
+```
diff --git a/examples/chef/sample_app_util/__init__.py b/examples/chef/sample_app_util/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/examples/chef/sample_app_util/matter_device_types.json b/examples/chef/sample_app_util/matter_device_types.json
new file mode 100644
index 00000000000000..a5dd0745b1e312
--- /dev/null
+++ b/examples/chef/sample_app_util/matter_device_types.json
@@ -0,0 +1,43 @@
+{
+    "Root Node": 22,
+    "Power Source": 17,
+    "OTA Requestor": 18,
+    "OTA Provider": 20,
+    "Aggregator": 14,
+    "Bridged Node": 19,
+    "On/Off Light": 256,
+    "Dimmable Light": 257,
+    "Color Temperature Light": 268,
+    "Extended Color Light": 269,
+    "On/Off Plug-in Unit": 266,
+    "Dimmable Plug-In Unit": 267,
+    "Pump": 771,
+    "On/Off Light Switch": 259,
+    "Dimmer Switch": 260,
+    "Color Dimmer Switch": 261,
+    "Control Bridge": 2112,
+    "Pump Controller": 772,
+    "Generic Switch": 15,
+    "Contact Sensor": 21,
+    "Light Sensor": 262,
+    "Occupancy Sensor": 263,
+    "Temperature Sensor": 770,
+    "Pressure Sensor": 773,
+    "Flow Sensor": 774,
+    "Humidity Sensor": 775,
+    "On/Off Sensor": 2128,
+    "Door Lock": 10,
+    "Door Lock Controller": 11,
+    "Window Covering": 514,
+    "Window Covering Controller": 515,
+    "Heating/Cooling Unit": 768,
+    "Thermostat": 769,
+    "Fan": 43,
+    "Casting Video Player": 35,
+    "Speaker": 34,
+    "Content App": 36,
+    "Basic Video Player": 40,
+    "Casting Video Client": 41,
+    "Video Remote Control": 42,
+    "Mode Select": 39
+}
diff --git a/examples/chef/sample_app_util/sample_app_util.py b/examples/chef/sample_app_util/sample_app_util.py
new file mode 100644
index 00000000000000..08cfc87de62eda
--- /dev/null
+++ b/examples/chef/sample_app_util/sample_app_util.py
@@ -0,0 +1,71 @@
+"""Utility to work with sample app device files.
+
+This utility helps with the following:
+- Parsing sample app device files.
+- Producing metadata files from sample app device files.
+- Generating names for sample app device files.
+
+Usage:
+  python sample_app_util.py zap <ZAP_FILE> [options]
+
+  python sample_app_util.py zap test_files/sample_zap_file.zap --generate-name
+  python sample_app_util.py zap test_files/sample_zap_file.zap --generate-metadata
+"""
+
+import argparse
+import os
+import shutil
+
+import zap_file_parser
+
+
+def zap_cmd_handler(args: argparse.Namespace) -> None:
+    """Handles args for zap_cmd_parser."""
+    zap_file_path = args.zap_file
+    if args.generate_name:
+        print(zap_file_parser.generate_name(zap_file_path))
+    elif args.rename_file:
+        name = zap_file_parser.generate_name(zap_file_path)
+        dirpath = os.path.dirname(zap_file_path)
+        hash_string = zap_file_parser.generate_hash(zap_file_path)
+        output_path = os.path.join(dirpath, f"{name}-{hash_string}.zap")
+        shutil.move(zap_file_path, output_path)
+        print(f"Renamed from: {zap_file_path} to {output_path}")
+    elif args.generate_hash_metadata:
+        created_file = zap_file_parser.generate_hash_metadata_file(zap_file_path)
+        print(f"Created {created_file}")
+
+
+parser = argparse.ArgumentParser()
+subparsers = parser.add_subparsers(dest="command")
+subparsers.required = True
+
+zap_cmd_parser = subparsers.add_parser("zap", help="Command to operate on zap files.")
+zap_cmd_parser.add_argument(
+    "zap_file", metavar="ZAP_FILE", type=str, help="Zap file to generate name for.")
+
+zap_cmd_group = zap_cmd_parser.add_mutually_exclusive_group()
+
+zap_cmd_group.add_argument(
+    "--generate-name", action="store_true",
+    help="Print the name file name according to the name convention"
+)
+
+zap_cmd_parser.add_argument(
+    "--generate-hash-metadata", action="store_true",
+    help=(
+        "Generate the hash metadata file which provide information about what was included in "
+        "the hash digest.")
+)
+
+zap_cmd_group.add_argument(
+    "--rename-file", action='store_true',
+    help="Rename the target zap file according to name convention."
+)
+
+zap_cmd_parser.set_defaults(func=zap_cmd_handler)
+
+
+if __name__ == "__main__":
+    args = parser.parse_args()
+    args.func(args)
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
new file mode 100644
index 00000000000000..2868176f0c6b6d
--- /dev/null
+++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap
@@ -0,0 +1,7698 @@
+{
+  "featureLevel": 71,
+  "creator": "zap",
+  "keyValuePairs": [
+    {
+      "key": "commandDiscovery",
+      "value": "1"
+    },
+    {
+      "key": "defaultResponsePolicy",
+      "value": "always"
+    },
+    {
+      "key": "manufacturerCodes",
+      "value": "0x1002"
+    }
+  ],
+  "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/zcl/zcl.json",
+      "version": "ZCL Test Data",
+      "type": "zcl-properties"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "version": "chip-v1",
+      "type": "gen-templates-json"
+    }
+  ],
+  "endpointTypes": [
+    {
+      "name": "MA-rootdevice",
+      "deviceTypeName": "MA-rootdevice",
+      "deviceTypeCode": 22,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "name support",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneValid",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NameSupport",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Off",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "On",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Toggle",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "OnOff",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/off Switch Configuration",
+          "code": 7,
+          "mfgCode": null,
+          "define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/off Switch Configuration",
+          "code": 7,
+          "mfgCode": null,
+          "define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "switch type",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "switch actions",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToLevel",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Move",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Step",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Stop",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveToLevelWithOnOff",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveWithOnOff",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StepWithOnOff",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StopWithOnOff",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "current level",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "device list",
+              "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": "server list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "client list",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "parts list",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ACL",
+              "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": "Extension",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SubjectsPerAccessControlEntry",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetsPerAccessControlEntry",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AccessControlEntriesPerFabric",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_PROVIDER_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "QueryImage",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ApplyUpdateRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "NotifyUpdateApplied",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Provider",
+          "code": 41,
+          "mfgCode": null,
+          "define": "OTA_PROVIDER_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "QueryImageResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ApplyUpdateResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_REQUESTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AnnounceOtaProvider",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "OTA Software Update Requestor",
+          "code": 42,
+          "mfgCode": null,
+          "define": "OTA_REQUESTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DefaultOtaProviders",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdatePossible",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdateState",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OTAUpdateStateEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpdateStateProgress",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Localization Configuration",
+          "code": 43,
+          "mfgCode": null,
+          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Localization Configuration",
+          "code": 43,
+          "mfgCode": null,
+          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ActiveLocale",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "en-US",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedLocales",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Time Format Localization",
+          "code": 44,
+          "mfgCode": null,
+          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Time Format Localization",
+          "code": 44,
+          "mfgCode": null,
+          "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "HourFormat",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "HourFormat",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveCalendarType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CalendarType",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedCalendarTypes",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Unit Localization",
+          "code": 45,
+          "mfgCode": null,
+          "define": "UNIT_LOCALIZATION_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Unit Localization",
+          "code": 45,
+          "mfgCode": null,
+          "define": "UNIT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "TemperatureUnit",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "TempUnit",
+              "included": 0,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ArmFailSafe",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "CommissioningComplete",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ArmFailSafeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "CommissioningCompleteResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Breadcrumb",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BasicCommissioningInfo",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BasicCommissioningInfo",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocationCapability",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "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": "6",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatus",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "included": 1,
+              "storageOption": "RAM",
+              "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": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Diagnostic Logs",
+          "code": 50,
+          "mfgCode": null,
+          "define": "DIAGNOSTIC_LOGS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "RetrieveLogsRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReasons",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Software Diagnostics",
+          "code": 52,
+          "mfgCode": null,
+          "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetWatermarks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Software Diagnostics",
+          "code": 52,
+          "mfgCode": null,
+          "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ThreadMetrics",
+              "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": "CurrentHeapFree",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentHeapUsed",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentHeapHighWatermark",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thread Network Diagnostics",
+          "code": 53,
+          "mfgCode": null,
+          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Thread Network Diagnostics",
+          "code": 53,
+          "mfgCode": null,
+          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "channel",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RoutingRole",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NetworkName",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PanId",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ExtendedPanId",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeshLocalPrefix",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NeighborTableList",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RouteTableList",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartitionId",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "weighting",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DataVersion",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StableDataVersion",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LeaderRouterId",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DetachedRoleCount",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChildRoleCount",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RouterRoleCount",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LeaderRoleCount",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttachAttemptCount",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartitionIdChangeCount",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BetterPartitionAttachAttemptCount",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ParentChangeCount",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxTotalCount",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxUnicastCount",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBroadcastCount",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxAckRequestedCount",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxAckedCount",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxNoAckRequestedCount",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDataCount",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDataPollCount",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBeaconCount",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBeaconRequestCount",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxOtherCount",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxRetryCount",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDirectMaxRetryExpiryCount",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxIndirectMaxRetryExpiryCount",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrCcaCount",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrAbortCount",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrBusyChannelCount",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxTotalCount",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxUnicastCount",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBroadcastCount",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDataCount",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDataPollCount",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBeaconCount",
+              "code": 44,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBeaconRequestCount",
+              "code": 45,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxOtherCount",
+              "code": 46,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxAddressFilteredCount",
+              "code": 47,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDestAddrFilteredCount",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDuplicatedCount",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrNoFrameCount",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrUnknownNeighborCount",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrInvalidSrcAddrCount",
+              "code": 52,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrSecCount",
+              "code": 53,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrFcsCount",
+              "code": 54,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrOtherCount",
+              "code": 55,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveTimestamp",
+              "code": 56,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PendingTimestamp",
+              "code": 57,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "delay",
+              "code": 58,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SecurityPolicy",
+              "code": 59,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChannelMask",
+              "code": 60,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperationalDatasetComponents",
+              "code": 61,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaultsList",
+              "code": 62,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x000F",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "WiFi Network Diagnostics",
+          "code": 54,
+          "mfgCode": null,
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "WiFi Network Diagnostics",
+          "code": 54,
+          "mfgCode": null,
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "bssid",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SecurityType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SecurityType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiFiVersion",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WiFiVersionType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChannelNumber",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Rssi",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BeaconLostCount",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BeaconRxCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketMulticastRxCount",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketMulticastTxCount",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketUnicastRxCount",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketUnicastTxCount",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentMaxRate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "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": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Ethernet Network Diagnostics",
+          "code": 55,
+          "mfgCode": null,
+          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Ethernet Network Diagnostics",
+          "code": 55,
+          "mfgCode": null,
+          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "PHYRate",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PHYRateType",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FullDuplex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketRxCount",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketTxCount",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrCount",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CollisionCount",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CarrierDetect",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TimeSinceReset",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "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": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Switch",
+          "code": 59,
+          "mfgCode": null,
+          "define": "SWITCH_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Switch",
+          "code": 59,
+          "mfgCode": null,
+          "define": "SWITCH_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "AdministratorCommissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "OpenBasicCommissioningWindow",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RevokeCommissioning",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "AdministratorCommissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminFabricIndex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminVendorId",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AttestationRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "CertificateChainRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "CSRRequest",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddNOC",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "UpdateFabricLabel",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveTrustedRootCertificate",
+              "code": 12,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "CertificateChainResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NOCs",
+              "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": "Fabrics",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedFabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CommissionedFabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TrustedRootCertificates",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentFabricIndex",
+              "code": 5,
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": []
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "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": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "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": "MaxGroupKeysPerFabric",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MA-dimmablelight",
+      "deviceTypeName": "MA-dimmablelight",
+      "deviceTypeCode": 257,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "identify type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "name support",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedAddScene",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedViewScene",
+              "code": 65,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "CopyScene",
+              "code": 66,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneValid",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NameSupport",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Off",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "On",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Toggle",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "OffWithEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "OnWithRecallGlobalScene",
+              "code": 65,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "OnWithTimedOff",
+              "code": 66,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "On/Off",
+          "code": 6,
+          "mfgCode": null,
+          "define": "ON_OFF_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "OnOff",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GlobalSceneControl",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OnTime",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OffWaitTime",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpOnOff",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OnOffStartUpOnOff",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToLevel",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Move",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Step",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "Stop",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveToLevelWithOnOff",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveWithOnOff",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StepWithOnOff",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StopWithOnOff",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Level Control",
+          "code": 8,
+          "mfgCode": null,
+          "define": "LEVEL_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "current level",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "remaining time",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "min level",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "max level",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFE",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "current frequency",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "min frequency",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "max frequency",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "options",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "on off transition time",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "on level",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "on transition time",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "off transition time",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "default move rate",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "start up current level",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "255",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 0,
+              "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": 0,
+              "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": 0,
+              "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": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "device list",
+              "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": "server list",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "client list",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "parts list",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Basic",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "MoveToHue",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveHue",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StepHue",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveToSaturation",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveSaturation",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StepSaturation",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveToHueAndSaturation",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveToColor",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveColor",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "StepColor",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
+            {
+              "name": "MoveToColorTemperature",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedMoveToHue",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedMoveHue",
+              "code": 65,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedStepHue",
+              "code": 66,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "EnhancedMoveToHueAndSaturation",
+              "code": 67,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ColorLoopSet",
+              "code": 68,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StopMoveStep",
+              "code": 71,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "MoveColorTemperature",
+              "code": 75,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "StepColorTemperature",
+              "code": 76,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Color Control",
+          "code": 768,
+          "mfgCode": null,
+          "define": "COLOR_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "CurrentHue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentSaturation",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentX",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x616B",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentY",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x607D",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DriftCompensation",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CompensationText",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 0,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTemperature",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00FA",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorMode",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Options",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfPrimaries",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedCurrentHue",
+              "code": 16384,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "EnhancedColorMode",
+              "code": 16385,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopActive",
+              "code": 16386,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopDirection",
+              "code": 16387,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopTime",
+              "code": 16388,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0019",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopStartEnhancedHue",
+              "code": 16389,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x2300",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorLoopStoredEnhancedHue",
+              "code": 16390,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorCapabilities",
+              "code": 16394,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap16",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMinMireds",
+              "code": 16395,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ColorTempPhysicalMaxMireds",
+              "code": 16396,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFEFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CoupleColorTempToLevelMinMireds",
+              "code": 16397,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StartUpColorTemperatureMireds",
+              "code": 16400,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Occupancy Sensing",
+          "code": 1030,
+          "mfgCode": null,
+          "define": "OCCUPANCY_SENSING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "occupancy",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "occupancy sensor type bitmap",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "endpoints": [
+    {
+      "endpointTypeName": "MA-rootdevice",
+      "endpointTypeIndex": 0,
+      "profileId": 259,
+      "endpointId": 0,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 22
+    },
+    {
+      "endpointTypeName": "MA-dimmablelight",
+      "endpointTypeIndex": 1,
+      "profileId": 259,
+      "endpointId": 1,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 257
+    }
+  ]
+}
\ No newline at end of file
diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file_hashmeta.yaml b/examples/chef/sample_app_util/test_files/sample_zap_file_hashmeta.yaml
new file mode 100644
index 00000000000000..b42a98e0d8943a
--- /dev/null
+++ b/examples/chef/sample_app_util/test_files/sample_zap_file_hashmeta.yaml
@@ -0,0 +1,90 @@
+-   RootNode/22:
+        client_clusters:
+            OtaSoftwareUpdateProvider/41:
+                attributes:
+                    FeatureMap/65532: '0'
+        server_clusters:
+            AccessControl/31:
+                attributes:
+                    FeatureMap/65532: '0'
+            AdministratorCommissioning/60:
+                attributes:
+                    FeatureMap/65532: '0'
+            Basic/40:
+                attributes:
+                    FeatureMap/65532: '0'
+            Descriptor/29:
+                attributes:
+                    FeatureMap/65532: '0'
+            DiagnosticLogs/50:
+                attributes:
+                    FeatureMap/65532: '0'
+            EthernetNetworkDiagnostics/55:
+                attributes:
+                    FeatureMap/65532: '3'
+            FixedLabel/64:
+                attributes:
+                    FeatureMap/65532: '0'
+            GeneralCommissioning/48:
+                attributes:
+                    FeatureMap/65532: '6'
+            GeneralDiagnostics/51:
+                attributes:
+                    FeatureMap/65532: '0'
+            GroupKeyManagement/63:
+                attributes:
+                    FeatureMap/65532: '0'
+            Groups/4:
+                attributes:
+                    FeatureMap/65532: '0'
+            LocalizationConfiguration/43:
+                attributes:
+                    FeatureMap/65532: '0'
+            OperationalCredentials/62:
+                attributes:
+                    FeatureMap/65532: '0'
+            OtaSoftwareUpdateRequestor/42:
+                attributes:
+                    FeatureMap/65532: '0'
+            SoftwareDiagnostics/52:
+                attributes:
+                    FeatureMap/65532: '1'
+            Switch/59:
+                attributes:
+                    FeatureMap/65532: '0'
+            ThreadNetworkDiagnostics/53:
+                attributes:
+                    FeatureMap/65532: '15'
+            TimeFormatLocalization/44:
+                attributes:
+                    FeatureMap/65532: '0'
+            UserLabel/65:
+                attributes:
+                    FeatureMap/65532: '0'
+            WiFiNetworkDiagnostics/54:
+                attributes:
+                    FeatureMap/65532: '3'
+-   DimmableLight/257:
+        client_clusters: {}
+        server_clusters:
+            ColorControl/768:
+                attributes:
+                    FeatureMap/65532: '0'
+            Descriptor/29:
+                attributes:
+                    FeatureMap/65532: '0'
+            Groups/4:
+                attributes:
+                    FeatureMap/65532: '0'
+            Identify/3:
+                attributes:
+                    FeatureMap/65532: '0'
+            LevelControl/8:
+                attributes:
+                    FeatureMap/65532: '3'
+            OccupancySensing/1030:
+                attributes:
+                    FeatureMap/65532: '0'
+            OnOff/6:
+                attributes:
+                    FeatureMap/65532: '1'
diff --git a/examples/chef/sample_app_util/test_zap_file_parser.py b/examples/chef/sample_app_util/test_zap_file_parser.py
new file mode 100644
index 00000000000000..a49345ad128eb1
--- /dev/null
+++ b/examples/chef/sample_app_util/test_zap_file_parser.py
@@ -0,0 +1,63 @@
+"""Tests for zap_file_parser.py
+
+Usage:
+python -m unittest
+"""
+
+import os
+import shutil
+import tempfile
+import unittest
+
+try:
+    import yaml
+except ImportError:
+    print("Missing yaml library. Install with:\npip install pyyaml")
+    exit(1)
+
+import zap_file_parser
+
+
+_HERE = os.path.abspath(os.path.dirname(__file__))
+_TEST_FILE = os.path.join(_HERE, "test_files", "sample_zap_file.zap")
+_TEST_METADATA = os.path.join(_HERE, "test_files", "sample_zap_file_hashmeta.yaml")
+
+
+class TestZapFileParser(unittest.TestCase):
+    """Testcases for zap_file_parser.py."""
+
+    def test_generate_hash(self):
+        """Tests generate_hash function."""
+        hash_string = zap_file_parser.generate_hash(_TEST_FILE)
+        self.assertEqual(hash_string, "Xir1gEfjij", "Hash is incorrectly generated.")
+
+    def test_generate_metadata(self):
+        """Tests generate_metadata."""
+        generated_metadata = zap_file_parser.generate_hash_metadata(_TEST_FILE)
+        with open(_TEST_METADATA) as f:
+            expected_metadata = yaml.load(f.read(), Loader=yaml.FullLoader)
+        self.assertEqual(
+            generated_metadata, expected_metadata, "Metadata not generated correctly.")
+
+    def test_generate_metadata_file(self):
+        """Tests generate_metadata_file."""
+        with tempfile.TemporaryDirectory(dir=os.path.dirname(_HERE)) as dir:
+            zap_file = os.path.join(dir, "test_file.zap")
+            hashmeta_file = os.path.join(dir, "test_file_hashmeta.yaml")
+            shutil.copy(_TEST_FILE, zap_file)
+            zap_file_parser.generate_hash_metadata_file(zap_file)
+            with open(hashmeta_file) as f:
+                generated_metadata = yaml.load(f.read(), Loader=yaml.FullLoader)
+            with open(_TEST_METADATA) as f:
+                expected_metadata = yaml.load(f.read(), Loader=yaml.FullLoader)
+            self.assertEqual(
+                generated_metadata, expected_metadata, "Metadata file not generated correctly.")
+
+    def test_generate_name(self):
+        """Tests generate_name."""
+        name = zap_file_parser.generate_name(_TEST_FILE)
+        self.assertEqual(name, "rootnode_dimmablelight_Xir1gEfjij", "Name incorrectly generated.")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/examples/chef/sample_app_util/zap_file_parser.py b/examples/chef/sample_app_util/zap_file_parser.py
new file mode 100644
index 00000000000000..66a09c0c70e27a
--- /dev/null
+++ b/examples/chef/sample_app_util/zap_file_parser.py
@@ -0,0 +1,353 @@
+"""Module for parsing zap files for use in sample_app_util.py.
+
+
+Note on generating the hash:
+  Care must be taken to produce a hash value which is not affected by updates to the zap file.
+  For this reason, it is necessary to ensure a consistent order for all lists. It is also
+  necessary to generate a minimum set of parameters that can be used to uniquely identify a
+  particular build. In this case, the hash is generated from the metadata file data.
+
+  The actual hash is generated by digesting the output from json.dumps() with `sort_keys=True`.
+  The json lib is a good choice here because it is a Python standard lib and the output is
+  unlikely to change. Additionally, using `sort_keys=True` provides us with a guaranteed output
+  for the ordering of dict keys.
+
+  After generating the hash, the hash is converted to base64 and the first 10 characters are used.
+  The probability of a collision (with 100,000 items) is 1-exp(-100000^2/62^10) ~= 1.2 x 10^-8.
+
+Conventions used for constructing the metadata file:
+  - All lists are sorted alphabetically.
+  - If a list contains dicts, it will be sorted by the "name" key. If it does not contain "name"
+    key, it will be sorted by the first key common to all dicts that comes first alphabetically.
+  - The list of endpoints is excluded from the above conventions. Endpoints are ordered according
+    to their endpoint number; here, the endpoint number is the same as the order they are read
+    from the zap file.
+
+Future work:
+  - _load_matter_device_types should be updated to get the mapping for device type ID and device
+    name from the matter spec directly. This should be done once the matter spec becomes publicly
+    available.
+  - Add support for .matter files.
+"""
+import copy
+import base64
+import hashlib
+import json
+import os
+import re
+
+from typing import Dict, List, Literal, Optional, Sequence, TypedDict, Union
+
+try:
+    import yaml
+except ImportError:
+    print("Missing yaml library. Install with:\npip install pyyaml")
+    exit(1)
+
+_NETWORK_COMMISSIONING_CODE = "49"
+_FEATURE_MAP_CODE = "65532"
+
+_ATTRIBUTE_ALLOW_LIST = (
+    _FEATURE_MAP_CODE,  # Feature Map
+)
+
+_HERE = os.path.abspath(os.path.dirname(__file__))
+_MATTER_DEVICE_LIST = os.path.join(_HERE, "matter_device_types.json")
+
+
+class ClusterType(TypedDict):
+    commands: List[str]
+    attributes: Dict[str, str]
+
+
+class EndpointType(TypedDict):
+    client_clusters: Dict[str, ClusterType]
+    server_clusters: Dict[str, ClusterType]
+
+
+def _b64encode(input_data: bytes) -> bytes:
+    """Returns urlsafe base64 encoded with padding removed."""
+    return base64.urlsafe_b64encode(input_data).strip(b"=")
+
+
+def _b64decode(input_data: bytes) -> bytes:
+    """Returns urlsafe base64 decoded with padding added."""
+    # "=" is padding character that doesn't carry info.
+    # Adding 2x "=" will handle all edge cases where there may be
+    # incorrect number of bytes.
+    return base64.urlsafe_b64decode(input_data + b"==")
+
+
+def _convert_metadata_name(name: str, code: Union[int, str]) -> str:
+    """Converts a name for use in a metadata file - CamelCaseName/ID."""
+    # Preserve camel case if it's already there
+    name = re.sub(r"([A-Z]+)", r" \1", name).title()
+    # Convert to camel case and append ID
+    return re.sub(r"[^a-zA-Z]+", "", name.title()) + f"/{int(code)}"
+
+
+def _convert_filename(name: str) -> str:
+    """Converts a pretty name into a file friendly one."""
+    return re.sub(r"[^a-zA-Z]+", "", name).lower()
+
+
+def _load_matter_device_types() -> Dict[Union[int, str], Union[int, str]]:
+    """Load matter device type reversible mapping.
+
+    This function should be updated to pull from the Matter spec once it is available publicly.
+
+    Returns:
+      A dictionary mapping Matter device type IDs to their proper name and vice versa.
+    """
+    with open(_MATTER_DEVICE_LIST) as f:
+        mapping = json.loads(f.read())
+        reverse_mapping = {}
+        for key, val in mapping.items():
+            reverse_mapping[val] = key
+        mapping.update(reverse_mapping)
+    return mapping
+
+
+def _read_value(input_string: str) -> str:
+    """Convert various numeric forms to regular decimal format if possible."""
+    ret_val = ""
+    if not input_string:
+        ret_val = ""
+    if "0x" in input_string:
+        ret_val = int(input_string, 16)
+    elif "." in input_string:
+        try:
+            ret_val = float(input_string)
+        except ValueError:
+            pass
+    else:
+        try:
+            ret_val = int(input_string)
+        except ValueError:
+            pass
+    return str(ret_val)
+
+
+def _convert_metadata_to_hashable_digest(metadata_input: Sequence[Dict[str, EndpointType]]) -> str:
+    """Converts metadata input into a hashable digest.
+
+    Note that the output produced here is consistent across runs. Lists are sorted and dictionaries
+    are sorted by their keys.
+
+    Args:
+      metadata_input: Metadata input produced from a zap file or read in from the hashable file.
+
+    Returns:
+      Hashable string for digest into a hash algorithm.
+    """
+    metadata = copy.deepcopy(metadata_input)
+
+    # Replace endpoint, cluster, attribute, and commands names with IDs
+
+    # Replace endpoint names
+    for endpoint in metadata:
+        endpoint_key = list(endpoint.keys())[0]
+        endpoint_id = _get_id(endpoint_key)
+        endpoint[endpoint_id] = endpoint.pop(endpoint_key)
+        endpoint_obj = endpoint[endpoint_id]
+
+        # Replace cluster names
+        for cluster_type in ["client_clusters", "server_clusters"]:
+            for cluster_key in list(endpoint_obj[cluster_type].keys()):
+                cluster_id = _get_id(cluster_key)
+                endpoint_obj[cluster_type][cluster_id] = endpoint_obj[cluster_type].pop(cluster_key)
+                cluster_obj = endpoint_obj[cluster_type][cluster_id]
+
+                # Replace attribute names
+                attribute_obj = cluster_obj["attributes"]
+                attribute_keys = list(cluster_obj["attributes"])
+                for attribute_key in attribute_keys:
+                    attribute_id = _get_id(attribute_key)
+                    attribute_obj[attribute_id] = attribute_obj.pop(attribute_key)
+
+                # Replace command names
+                if "commands" in cluster_obj:
+                    command_keys = cluster_obj["commands"]
+                    cluster_obj["commands"] = [_get_id(x) for x in command_keys]
+                    cluster_obj["commands"].sort()
+
+    return json.dumps(metadata, sort_keys=True)
+
+
+def _get_id(name):
+    """Gets id from a condensed name which is formatted like: name/id."""
+    return name.split("/")[-1]
+
+
+def generate_hash(zap_file_path: str) -> str:
+    """Generates a hash for a zap file.
+
+    Args:
+      zap_file_path: Path to the zap file.
+
+    Returns:
+      MD5 hash of the metadata generated from the zap file.
+      This is converted to base64 and then the first 10 characters are used.
+    """
+    parsed = generate_hash_metadata(zap_file_path)
+    # Use json.dumps to produce a consistent output for the object passed into it.
+    digestible_content = _convert_metadata_to_hashable_digest(parsed)
+    md5_hash = hashlib.md5(digestible_content.encode("utf-8")).digest()
+    output = str(_b64encode(md5_hash), encoding="utf-8")[:10]
+    # Replace "-" and "_" with "a" and "b".
+    # The reason for doing this is to allow the generated name to be parsed by splitting on "_".
+    # Replacing "-" makes the name easier to parse visually.
+    # This increases likelihood of hash collisions, but minimally so. See module docstring.
+    return output.replace("-", "a").replace("_", "b")
+
+
+def generate_hash_metadata(zap_file_path: str) -> List[Dict[str, EndpointType]]:
+    """Generates metadata for hash digest consumption."""
+    return generate_metadata(
+        zap_file_path=zap_file_path,
+        attribute_allow_list=_ATTRIBUTE_ALLOW_LIST,
+        include_commands=False,
+        include_platform_specific_info=False)
+
+
+def generate_metadata(
+        zap_file_path: str,
+        attribute_allow_list: Optional[Sequence[str]] = _ATTRIBUTE_ALLOW_LIST,
+        include_commands: bool = False,
+        include_platform_specific_info: bool = False) -> List[Dict[str, EndpointType]]:
+    """Parses a zap_file and returns structure containing minimal content.
+
+    The lists provided in the returned objects are sorted except for the top level list of endpoints.
+    Lists containing dicts will be sorted by the "name" key of the individual dicts.
+
+    Args:
+      zap_file_path: Path to the zap file.
+      attribute_allow_list: List of attribute IDs which are included in the metadata.
+        If set to None then all attributes will be included.
+      include_commands: Whether to include commands in the metadata.
+      include_platform_specific_info: Whether to include platform specific information.
+        Omitting this allows us to generate a hash that is agnostic of the platform.
+
+    Returns:
+      Dictionary containing information about endpoints and clusters. Format will be as follows:
+      [
+        {
+          <endpoint_0_name>/<endpoint_0_id>: {
+            "server_clusters": {
+              <cluster_name>/<cluster_id>: {
+                  "commands": [
+                    <command_name>/<command_id>
+                  ],
+                  "attributes": {
+                      <attribute_name>/<attribute_id>: <attribute_value>,
+                  }
+              }
+            }
+            "client_clusters": { ... }
+          }
+          <endpoint_1_name>/<endpoint_1_id>: { ... }
+        }
+      ]
+    """
+    endpoint_names = _load_matter_device_types()
+    with open(zap_file_path) as f:
+        app_data = json.loads(f.read())
+
+    return_obj: List[Dict[str, EndpointType]] = []
+
+    for endpoint in app_data["endpointTypes"]:
+        device_type_id = endpoint["deviceTypeCode"]
+        device_type_name = endpoint_names[device_type_id]
+
+        endpoint_ref = _convert_metadata_name(device_type_name, device_type_id)
+        endpoint_obj: Dict[str, EndpointType] = {endpoint_ref: {}}
+        return_obj.append(endpoint_obj)
+
+        client_clusters: Dict[str, ClusterType] = {}
+        server_clusters: Dict[str, ClusterType] = {}
+
+        endpoint_obj[endpoint_ref]["client_clusters"] = client_clusters
+        endpoint_obj[endpoint_ref]["server_clusters"] = server_clusters
+
+        for cluster in endpoint["clusters"]:
+            # The network commissioning cluster contains platform specific details
+            # such as how the platform will be commissioned to the matter fabric.
+            if (not include_platform_specific_info and
+                    str(cluster["code"]) == _NETWORK_COMMISSIONING_CODE):
+                continue
+            if not cluster["enabled"]:
+                continue
+
+            cluster_ref = _convert_metadata_name(cluster["name"], cluster["code"])
+
+            if include_commands:
+                cluster_obj: ClusterType = {"attributes": {}, "commands": []}
+            else:
+                cluster_obj: ClusterType = {"attributes": {}}
+
+            for attribute in cluster["attributes"]:
+                attribute_allowed = (
+                    attribute_allow_list is None or str(attribute["code"]) in attribute_allow_list)
+                if attribute["included"] and attribute_allowed:
+                    attribute_ref = _convert_metadata_name(attribute["name"], attribute["code"])
+                    value = _read_value(attribute["defaultValue"])
+                    cluster_obj["attributes"][attribute_ref] = value
+
+            # Add a default feature map if none is provided
+            if "FeatureMap/65532" not in cluster_obj["attributes"]:
+                cluster_obj["attributes"]["FeatureMap/65532"] = "0"
+
+            if include_commands:
+                for command in cluster["commands"]:
+                    command_ref = _convert_metadata_name(command["name"], command["code"])
+                    if cluster["side"] == "client" and command["outgoing"] == 1:
+                        cluster_obj["commands"].append(command_ref)
+                    elif cluster["side"] == "server" and command["incoming"] == 1:
+                        cluster_obj["commands"].append(command_ref)
+
+                cluster_obj["commands"] = sorted(cluster_obj["commands"])
+
+            if cluster["side"] == "client":
+                client_clusters[cluster_ref] = cluster_obj
+            else:
+                server_clusters[cluster_ref] = cluster_obj
+
+    return return_obj
+
+
+def generate_hash_metadata_file(zap_file_path: str) -> str:
+    """Generates hash metadata file for a zap file input.
+
+    The purpose of this file is to inform the user what data was included in the hash digest.
+
+    Args:
+      zap_file_path: Path to the zap file to parse for generating the metadata file.
+    """
+    parsed = generate_hash_metadata(zap_file_path)
+    output = yaml.dump(parsed, indent=4, sort_keys=True)
+
+    dirname, filename = os.path.split(zap_file_path)
+
+    filename = os.path.splitext(filename)[0]
+    output_file_path = os.path.join(dirname, f"{filename}_hashmeta.yaml")
+    with open(output_file_path, "w") as f:
+        f.write(output)
+    return output_file_path
+
+
+def generate_name(zap_file_path: str) -> str:
+    """Generates the name for a zap file following convention.
+
+    Args:
+      zap_file_path: Path to the zap file to parse for generating the metadata file.
+
+    Returns:
+      Name of the file generated by following convention.
+    """
+    parsed = generate_metadata(zap_file_path)
+    names = []
+    for endpoint in parsed:
+        name = next(iter(endpoint))
+        names.append(_convert_filename(name))
+    hash_string = generate_hash(zap_file_path)
+    return "_".join(names) + f"_{hash_string}"
diff --git a/examples/chef/setup.py b/examples/chef/setup.py
new file mode 100644
index 00000000000000..e80c86f465f238
--- /dev/null
+++ b/examples/chef/setup.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+"""The chef package."""
+
+import setuptools  # type: ignore
+
+setuptools.setup(
+    name='chef',
+    version='0.0.1',
+    author='Project CHIP Authors',
+    description='Build custom sample apps for supported platforms',
+    packages=setuptools.find_packages(),
+    package_data={'chef': ['py.typed']},
+    zip_safe=False,
+)
diff --git a/examples/chef/stateful_shell.py b/examples/chef/stateful_shell.py
index 56ba52bf493464..720b7107c79028 100644
--- a/examples/chef/stateful_shell.py
+++ b/examples/chef/stateful_shell.py
@@ -17,16 +17,26 @@
 import subprocess
 import sys
 import tempfile
-from typing import Dict
+import time
+from typing import Dict, Optional
 
 import constants
 
+_ENV_FILENAME = ".shell_env"
+_OUTPUT_FILENAME = ".shell_output"
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_TEE_WAIT_TIMEOUT = 3
 
 TermColors = constants.TermColors
 
 
 class StatefulShell:
-    """A Shell that tracks state changes of the environment."""
+    """A Shell that tracks state changes of the environment.
+
+    Attributes:
+        env: Env variables passed to command. It gets updated after every command.
+        cwd: Current working directory of shell.
+    """
 
     def __init__(self) -> None:
         if sys.platform == "linux" or sys.platform == "linux2":
@@ -40,10 +50,6 @@ def __init__(self) -> None:
         self.env: Dict[str, str] = os.environ.copy()
         self.cwd: str = self.env["PWD"]
 
-        # This file holds the env after running a command. This is a better approach
-        # than writing to stdout because commands could redirect the stdout.
-        self.envfile_path: str = os.path.join(tempfile.gettempdir(), "envfile")
-
     def print_env(self) -> None:
         """Print environment variables in commandline friendly format for export.
 
@@ -56,39 +62,91 @@ def print_env(self) -> None:
             if env_var:
                 print(f"export {env_var}={quoted_value}")
 
-    def run_cmd(self, cmd: str, *, raise_on_returncode=False) -> None:
+    def run_cmd(
+        self, cmd: str, *,
+        raise_on_returncode=True,
+        return_cmd_output=False,
+    ) -> Optional[str]:
         """Runs a command and updates environment.
 
         Args:
           cmd: Command to execute.
+            This does not support commands that run in the background e.g. `<cmd> &`
           raise_on_returncode: Whether to raise an error if the return code is nonzero.
+          return_cmd_output: Whether to return the command output.
+            If enabled, the text piped to screen won't be colorized due to output
+            being passed through `tee`.
 
         Raises:
           RuntimeError: If raise_on_returncode is set and nonzero return code is given.
+
+        Returns:
+          Output of command if return_cmd_output set to True.
         """
-        env_dict = {}
-
-        # Set OLDPWD at beginning because opening the shell clears this. This handles 'cd -'.
-        # env -0 prints the env variables separated by null characters for easy parsing.
-        command_with_state = f"OLDPWD={self.env.get('OLDPWD', '')}; {cmd}; env -0 > {self.envfile_path}"
-        with subprocess.Popen(
-            [command_with_state],
-            env=self.env, cwd=self.cwd,
-            shell=True, executable=self.shell_app
-        ) as proc:
-            returncode = proc.wait()
-
-        # Load env state from envfile.
-        with open(self.envfile_path) as f:
-            # Split on null char because we use env -0.
-            env_entries = f.read().split("\0")
-            for entry in env_entries:
-                parts = entry.split("=")
-                # Handle case where an env variable contains text with '='.
-                env_dict[parts[0]] = "=".join(parts[1:])
-            self.env = env_dict
-            self.cwd = self.env["PWD"]
-
-        if raise_on_returncode and returncode != 0:
-            raise RuntimeError(
-                f"Error. Return code is not 0. It is: {returncode}")
+        with tempfile.TemporaryDirectory(dir=os.path.dirname(_HERE)) as temp_dir:
+            envfile_path: str = os.path.join(temp_dir, _ENV_FILENAME)
+            cmd_output_path: str = os.path.join(temp_dir, _OUTPUT_FILENAME)
+
+            env_dict = {}
+            # Set OLDPWD at beginning because opening the shell clears this. This handles 'cd -'.
+            # env -0 prints the env variables separated by null characters for easy parsing.
+
+            if return_cmd_output:
+                # Piping won't work here because piping will affect how environment variables
+                # are propagated. This solution uses tee without piping to preserve env variables.
+                redirect = f" > >(tee \"{cmd_output_path}\") 2>&1 "  # include stderr
+            else:
+                redirect = ""
+
+            # TODO: Use env -0 when `macos-latest` refers to macos-12 in github actions.
+            # env -0 is ideal because it will support cases where an env variable that has newline
+            # characters. The flag "-0" is requires MacOS 12 which is still in beta in Github Actions.
+            # The less ideal `env` command is used by itself, with the caveat that newline chars
+            # are unsupported in env variables.
+            save_env_cmd = f"env > {envfile_path}"
+
+            command_with_state = (
+                f"OLDPWD={self.env.get('OLDPWD', '')}; {cmd} {redirect}; RETCODE=$?; "
+                f"{save_env_cmd}; exit $RETCODE")
+            with subprocess.Popen(
+                [command_with_state],
+                env=self.env, cwd=self.cwd,
+                shell=True, executable=self.shell_app
+            ) as proc:
+                returncode = proc.wait()
+
+            # Load env state from envfile.
+            with open(envfile_path, encoding="latin1") as f:
+                # TODO: Split on null char after updating to env -0 - requires MacOS 12.
+                env_entries = f.read().split("\n")
+                for entry in env_entries:
+                    parts = entry.split("=")
+                    # Handle case where an env variable contains text with '='.
+                    env_dict[parts[0]] = "=".join(parts[1:])
+                self.env = env_dict
+                self.cwd = self.env["PWD"]
+
+            if raise_on_returncode and returncode != 0:
+                raise RuntimeError(
+                    "Error. Nonzero return code."
+                    f"\nReturncode: {returncode}"
+                    f"\nCmd: {cmd}")
+
+            if return_cmd_output:
+                # Poll for file due to give 'tee' time to close.
+                # This is necessary because 'tee' waits for all subshells to finish before writing.
+                start_time = time.time()
+                while time.time() - start_time < _TEE_WAIT_TIMEOUT:
+                    if os.path.isfile(cmd_output_path):
+                        with open(cmd_output_path, encoding="latin1") as f:
+                            output = f.read()
+                            if output:  # Ensure that file has been written to.
+                                break
+                    time.sleep(0.1)
+                else:
+                    raise TimeoutError(
+                        f"Error. Output file: {cmd_output_path} not created within "
+                        f"the alloted time of: {_TEE_WAIT_TIMEOUT}s"
+                    )
+
+                return output
diff --git a/examples/chef/test_stateful_shell.py b/examples/chef/test_stateful_shell.py
new file mode 100644
index 00000000000000..b2e7d7cf564291
--- /dev/null
+++ b/examples/chef/test_stateful_shell.py
@@ -0,0 +1,48 @@
+"""Tests for stateful_shell.py
+
+Usage:
+python -m unittest
+"""
+
+import unittest
+
+import stateful_shell
+
+
+class TestStatefulShell(unittest.TestCase):
+    """Testcases for stateful_shell.py."""
+
+    def setUp(self):
+        """Prepares stateful shell instance for tests."""
+        self.shell = stateful_shell.StatefulShell()
+
+    def test_cmd_output(self):
+        """Tests shell command output."""
+        resp = self.shell.run_cmd("echo test123", return_cmd_output=True).strip()
+        self.assertEqual(resp, "test123")
+
+    def test_set_env_in_shell(self):
+        """Tests setting env variables in shell."""
+        self.shell.run_cmd("export TESTVAR=123")
+        self.assertEqual(self.shell.env["TESTVAR"], "123")
+
+    def test_set_env_outside_shell(self):
+        """Tests setting env variables outside shell call."""
+        self.shell.env["TESTVAR"] = "1234"
+        resp = self.shell.run_cmd("echo $TESTVAR", return_cmd_output=True).strip()
+        self.assertEqual(resp, "1234")
+
+    def test_env_var_set_get(self):
+        """Tests setting and getting env vars between calls."""
+        self.shell.run_cmd("export TESTVAR=123")
+        resp = self.shell.run_cmd("echo $TESTVAR", return_cmd_output=True).strip()
+        self.assertEqual(resp, "123")
+
+    def test_raise_on_returncode(self):
+        """Tests raising errors when returncode is nonzero."""
+        with self.assertRaises(RuntimeError):
+            self.shell.run_cmd("invalid_cmd > /dev/null 2>&1", raise_on_returncode=True)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/examples/chef/zzz_generated/lighting-app/INPUTMD5.txt b/examples/chef/zzz_generated/lighting-app/INPUTMD5.txt
new file mode 100644
index 00000000000000..a73223b32f281c
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/INPUTMD5.txt
@@ -0,0 +1 @@
+1e7c1687f9e61abc2eda4a689dfaabd4
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/lighting-app/ZAPSHA.txt b/examples/chef/zzz_generated/lighting-app/ZAPSHA.txt
new file mode 100644
index 00000000000000..37e00b022574e7
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/ZAPSHA.txt
@@ -0,0 +1 @@
+ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.h
new file mode 100644
index 00000000000000..4458f51745a59b
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.h
@@ -0,0 +1,32 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#pragma once
+
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/InteractionModelEngine.h>
+#include <app/data-model/DecodableList.h>
+#include <app/util/af-enums.h>
+#include <app/util/im-client-callbacks.h>
+#include <inttypes.h>
+#include <lib/support/FunctionTraits.h>
+#include <lib/support/Span.h>
+
+// List specific responses
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/lighting-app/zap-generated/CHIPClusters.h
new file mode 100644
index 00000000000000..15ec5aca34a215
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/CHIPClusters.h
@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+
+#include <controller/CHIPCluster.h>
+#include <lib/core/CHIPCallback.h>
+#include <lib/support/Span.h>
+
+namespace chip {
+namespace Controller {
+
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+{
+public:
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
+};
+
+} // namespace Controller
+} // namespace chip
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/examples/chef/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
new file mode 100644
index 00000000000000..adf2da73d06244
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
@@ -0,0 +1,1248 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#include <cinttypes>
+#include <cstdint>
+
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+#include <app/CommandHandler.h>
+#include <app/InteractionModelEngine.h>
+#include <app/util/util.h>
+#include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/TypeTraits.h>
+
+// Currently we need some work to keep compatible with ember lib.
+#include <app/util/ember-compatibility-functions.h>
+
+namespace chip {
+namespace app {
+
+// Cluster specific command parsing
+
+namespace Clusters {
+
+namespace AdministratorCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::OpenCommissioningWindow::Id: {
+            Commands::OpenCommissioningWindow::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath,
+                                                                                                     commandData);
+            }
+            break;
+        }
+        case Commands::OpenBasicCommissioningWindow::Id: {
+            Commands::OpenBasicCommissioningWindow::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(
+                    apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RevokeCommissioning::Id: {
+            Commands::RevokeCommissioning::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace AdministratorCommissioning
+
+namespace ColorControl {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::MoveToHue::Id: {
+            Commands::MoveToHue::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveToHueCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveHue::Id: {
+            Commands::MoveHue::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveHueCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StepHue::Id: {
+            Commands::StepHue::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterStepHueCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveToSaturation::Id: {
+            Commands::MoveToSaturation::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveSaturation::Id: {
+            Commands::MoveSaturation::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveSaturationCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StepSaturation::Id: {
+            Commands::StepSaturation::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterStepSaturationCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveToHueAndSaturation::Id: {
+            Commands::MoveToHueAndSaturation::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveToColor::Id: {
+            Commands::MoveToColor::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveColor::Id: {
+            Commands::MoveColor::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StepColor::Id: {
+            Commands::StepColor::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterStepColorCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveToColorTemperature::Id: {
+            Commands::MoveToColorTemperature::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::EnhancedMoveToHue::Id: {
+            Commands::EnhancedMoveToHue::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterEnhancedMoveToHueCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::EnhancedMoveHue::Id: {
+            Commands::EnhancedMoveHue::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterEnhancedMoveHueCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::EnhancedStepHue::Id: {
+            Commands::EnhancedStepHue::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterEnhancedStepHueCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::EnhancedMoveToHueAndSaturation::Id: {
+            Commands::EnhancedMoveToHueAndSaturation::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ColorLoopSet::Id: {
+            Commands::ColorLoopSet::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterColorLoopSetCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StopMoveStep::Id: {
+            Commands::StopMoveStep::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterStopMoveStepCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveColorTemperature::Id: {
+            Commands::MoveColorTemperature::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StepColorTemperature::Id: {
+            Commands::StepColorTemperature::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace ColorControl
+
+namespace DiagnosticLogs {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::RetrieveLogsRequest::Id: {
+            Commands::RetrieveLogsRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace DiagnosticLogs
+
+namespace EthernetNetworkDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetCounts::Id: {
+            Commands::ResetCounts::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace EthernetNetworkDiagnostics
+
+namespace GeneralCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ArmFailSafe::Id: {
+            Commands::ArmFailSafe::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralCommissioningClusterArmFailSafeCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::SetRegulatoryConfig::Id: {
+            Commands::SetRegulatoryConfig::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::CommissioningComplete::Id: {
+            Commands::CommissioningComplete::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralCommissioning
+
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
+namespace Groups {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AddGroup::Id: {
+            Commands::AddGroup::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterAddGroupCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ViewGroup::Id: {
+            Commands::ViewGroup::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::GetGroupMembership::Id: {
+            Commands::GetGroupMembership::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveGroup::Id: {
+            Commands::RemoveGroup::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveAllGroups::Id: {
+            Commands::RemoveAllGroups::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddGroupIfIdentifying::Id: {
+            Commands::AddGroupIfIdentifying::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Groups
+
+namespace Identify {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Identify::Id: {
+            Commands::Identify::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfIdentifyClusterIdentifyCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TriggerEffect::Id: {
+            Commands::TriggerEffect::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfIdentifyClusterTriggerEffectCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Identify
+
+namespace LevelControl {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::MoveToLevel::Id: {
+            Commands::MoveToLevel::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Move::Id: {
+            Commands::Move::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Step::Id: {
+            Commands::Step::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Stop::Id: {
+            Commands::Stop::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveToLevelWithOnOff::Id: {
+            Commands::MoveToLevelWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveWithOnOff::Id: {
+            Commands::MoveWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StepWithOnOff::Id: {
+            Commands::StepWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StopWithOnOff::Id: {
+            Commands::StopWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace LevelControl
+
+namespace NetworkCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ScanNetworks::Id: {
+            Commands::ScanNetworks::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddOrUpdateWiFiNetwork::Id: {
+            Commands::AddOrUpdateWiFiNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfNetworkCommissioningClusterAddOrUpdateWiFiNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddOrUpdateThreadNetwork::Id: {
+            Commands::AddOrUpdateThreadNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveNetwork::Id: {
+            Commands::RemoveNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ConnectNetwork::Id: {
+            Commands::ConnectNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ReorderNetwork::Id: {
+            Commands::ReorderNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace NetworkCommissioning
+
+namespace OtaSoftwareUpdateRequestor {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AnnounceOtaProvider::Id: {
+            Commands::AnnounceOtaProvider::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace OtaSoftwareUpdateRequestor
+
+namespace OnOff {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Off::Id: {
+            Commands::Off::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::On::Id: {
+            Commands::On::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Toggle::Id: {
+            Commands::Toggle::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::OffWithEffect::Id: {
+            Commands::OffWithEffect::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::OnWithRecallGlobalScene::Id: {
+            Commands::OnWithRecallGlobalScene::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::OnWithTimedOff::Id: {
+            Commands::OnWithTimedOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace OnOff
+
+namespace OperationalCredentials {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AttestationRequest::Id: {
+            Commands::AttestationRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::CertificateChainRequest::Id: {
+            Commands::CertificateChainRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::CSRRequest::Id: {
+            Commands::CSRRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddNOC::Id: {
+            Commands::AddNOC::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::UpdateNOC::Id: {
+            Commands::UpdateNOC::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::UpdateFabricLabel::Id: {
+            Commands::UpdateFabricLabel::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveFabric::Id: {
+            Commands::RemoveFabric::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddTrustedRootCertificate::Id: {
+            Commands::AddTrustedRootCertificate::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace OperationalCredentials
+
+namespace SoftwareDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetWatermarks::Id: {
+            Commands::ResetWatermarks::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace SoftwareDiagnostics
+
+namespace ThreadNetworkDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetCounts::Id: {
+            Commands::ResetCounts::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace ThreadNetworkDiagnostics
+
+namespace WiFiNetworkDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetCounts::Id: {
+            Commands::ResetCounts::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace WiFiNetworkDiagnostics
+
+} // namespace Clusters
+
+void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj)
+{
+    Compatibility::SetupEmberAfCommandHandler(apCommandObj, aCommandPath);
+
+    switch (aCommandPath.mClusterId)
+    {
+    case Clusters::AdministratorCommissioning::Id:
+        Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::ColorControl::Id:
+        Clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::DiagnosticLogs::Id:
+        Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::EthernetNetworkDiagnostics::Id:
+        Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GeneralCommissioning::Id:
+        Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Groups::Id:
+        Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Identify::Id:
+        Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::LevelControl::Id:
+        Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::NetworkCommissioning::Id:
+        Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::OtaSoftwareUpdateRequestor::Id:
+        Clusters::OtaSoftwareUpdateRequestor::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::OnOff::Id:
+        Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::OperationalCredentials::Id:
+        Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::SoftwareDiagnostics::Id:
+        Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::ThreadNetworkDiagnostics::Id:
+        Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::WiFiNetworkDiagnostics::Id:
+        Clusters::WiFiNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    default:
+        ChipLogError(Zcl, "Unknown cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mClusterId));
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCluster);
+        break;
+    }
+
+    Compatibility::ResetEmberAfObjects();
+}
+
+} // namespace app
+} // namespace chip
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
new file mode 100644
index 00000000000000..85154579b68824
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
@@ -0,0 +1,51 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#pragma once
+
+#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
+
+#define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
+    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
+    MatterOccupancySensingPluginServerInitCallback();                                                                              \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/access.h b/examples/chef/zzz_generated/lighting-app/zap-generated/access.h
new file mode 100644
index 00000000000000..2806b8d11356f8
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/access.h
@@ -0,0 +1,281 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+#include <app/util/privilege-storage.h>
+
+// Prevent changing generated format
+// clang-format off
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, attribute, privilege) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
+    49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+}
+
+// Parallel array data (cluster, *attribute*, privilege) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
+    0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+}
+
+// Parallel array data (cluster, attribute, *privilege*) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, attribute, privilege) for write attribute
+#define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
+    40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
+    40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
+    49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+}
+
+// Parallel array data (cluster, *attribute*, privilege) for write attribute
+#define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
+    6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
+    16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
+    4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+}
+
+// Parallel array data (cluster, attribute, *privilege*) for write attribute
+#define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, command, privilege) for invoke command
+#define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+}
+
+// Parallel array data (cluster, *command*, privilege) for invoke command
+#define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
+    3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
+    5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
+    2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
+    3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
+    4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
+    6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
+    8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
+    2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
+    4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
+    6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
+    9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
+    10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
+    11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+}
+
+// Parallel array data (cluster, command, *privilege*) for invoke command
+#define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, event, privilege) for read event
+#define GENERATED_ACCESS_READ_EVENT__CLUSTER { \
+    31, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
+    31, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
+}
+
+// Parallel array data (cluster, *event*, privilege) for read event
+#define GENERATED_ACCESS_READ_EVENT__EVENT { \
+    0, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
+    1, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
+}
+
+// Parallel array data (cluster, event, *privilege*) for read event
+#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// clang-format on
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/af-gen-event.h b/examples/chef/zzz_generated/lighting-app/zap-generated/af-gen-event.h
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/callback-stub.cpp b/examples/chef/zzz_generated/lighting-app/zap-generated/callback-stub.cpp
new file mode 100644
index 00000000000000..20850267856b32
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/callback-stub.cpp
@@ -0,0 +1,343 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <lib/support/Span.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+
+// Cluster Init Functions
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+{
+    switch (clusterId)
+    {
+    case ZCL_ACCESS_CONTROL_CLUSTER_ID:
+        emberAfAccessControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
+        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
+        break;
+    case ZCL_BASIC_CLUSTER_ID:
+        emberAfBasicClusterInitCallback(endpoint);
+        break;
+    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        emberAfColorControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_DESCRIPTOR_CLUSTER_ID:
+        emberAfDescriptorClusterInitCallback(endpoint);
+        break;
+    case ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID:
+        emberAfDiagnosticLogsClusterInitCallback(endpoint);
+        break;
+    case ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID:
+        emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_FIXED_LABEL_CLUSTER_ID:
+        emberAfFixedLabelClusterInitCallback(endpoint);
+        break;
+    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+        emberAfGeneralCommissioningClusterInitCallback(endpoint);
+        break;
+    case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID:
+        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
+    case ZCL_GROUPS_CLUSTER_ID:
+        emberAfGroupsClusterInitCallback(endpoint);
+        break;
+    case ZCL_IDENTIFY_CLUSTER_ID:
+        emberAfIdentifyClusterInitCallback(endpoint);
+        break;
+    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        emberAfLevelControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID:
+        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
+        break;
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        emberAfNetworkCommissioningClusterInitCallback(endpoint);
+        break;
+    case ZCL_OTA_PROVIDER_CLUSTER_ID:
+        emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint);
+        break;
+    case ZCL_OTA_REQUESTOR_CLUSTER_ID:
+        emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
+        break;
+    case ZCL_OCCUPANCY_SENSING_CLUSTER_ID:
+        emberAfOccupancySensingClusterInitCallback(endpoint);
+        break;
+    case ZCL_ON_OFF_CLUSTER_ID:
+        emberAfOnOffClusterInitCallback(endpoint);
+        break;
+    case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID:
+        emberAfOperationalCredentialsClusterInitCallback(endpoint);
+        break;
+    case ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID:
+        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_SWITCH_CLUSTER_ID:
+        emberAfSwitchClusterInitCallback(endpoint);
+        break;
+    case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID:
+        emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID:
+        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
+        break;
+    case ZCL_USER_LABEL_CLUSTER_ID:
+        emberAfUserLabelClusterInitCallback(endpoint);
+        break;
+    case ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID:
+        emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    default:
+        // Unrecognized cluster ID
+        break;
+    }
+}
+
+void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfColorControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfDiagnosticLogsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfEthernetNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfFixedLabelClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGroupsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfLevelControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOtaSoftwareUpdateProviderClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOtaSoftwareUpdateRequestorClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOccupancySensingClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOnOffClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOperationalCredentialsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfSoftwareDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfSwitchClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfTimeFormatLocalizationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfUserLabelClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+
+//
+// Non-Cluster Related Callbacks
+//
+
+void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
+
+void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
+
+EmberAfAttributeWritePermission __attribute__((weak))
+emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
+                                          uint8_t type)
+{
+    return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
+}
+
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
+{
+    return true;
+}
+
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
+{
+    return true;
+}
+
+bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+{
+    return false;
+}
+
+bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+{
+    return false;
+}
+
+bool __attribute__((weak)) emberAfMessageSentCallback(const MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                      uint16_t msgLen, uint8_t * message, EmberStatus status)
+{
+    return false;
+}
+
+EmberAfStatus __attribute__((weak))
+emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata,
+                                     uint8_t * buffer, uint16_t maxReadLength)
+{
+    return EMBER_ZCL_STATUS_FAILURE;
+}
+
+EmberAfStatus __attribute__((weak))
+emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata,
+                                      uint8_t * buffer)
+{
+    return EMBER_ZCL_STATUS_FAILURE;
+}
+
+uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
+{
+    return 0;
+}
+
+bool __attribute__((weak))
+emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+{
+    return false;
+}
+
+void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
+
+EmberStatus __attribute__((weak))
+emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+{
+    return EMBER_LIBRARY_NOT_PRESENT;
+}
+
+bool __attribute__((weak)) emberAfStartMoveCallback()
+{
+    return false;
+}
+
+chip::Protocols::InteractionModel::Status __attribute__((weak))
+MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                 uint8_t * value)
+{
+    return chip::Protocols::InteractionModel::Status::Success;
+}
+
+void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type,
+                                                             uint16_t size, uint8_t * value)
+{}
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/examples/chef/zzz_generated/lighting-app/zap-generated/endpoint_config.h
new file mode 100644
index 00000000000000..b693363305327f
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/endpoint_config.h
@@ -0,0 +1,1144 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+#include <lib/core/CHIPConfig.h>
+
+// Default values for the attributes longer than a pointer,
+// in a form of a binary blob
+// Separate block is generated for big-endian and little-endian cases.
+#if BIGENDIAN_CPU
+#define GENERATED_DEFAULTS                                                                                                         \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Localization Configuration (server), big-endian */                                                \
+                                                                                                                                   \
+        /* 0 - ActiveLocale, */                                                                                                    \
+        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                 \
+                                                                                                                                   \
+            /* 6 - Breadcrumb, */                                                                                                  \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+    }
+
+#else // !BIGENDIAN_CPU
+#define GENERATED_DEFAULTS                                                                                                         \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Localization Configuration (server), little-endian */                                             \
+                                                                                                                                   \
+        /* 0 - ActiveLocale, */                                                                                                    \
+        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                              \
+                                                                                                                                   \
+            /* 6 - Breadcrumb, */                                                                                                  \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+    }
+
+#endif // BIGENDIAN_CPU
+
+#define GENERATED_DEFAULTS_COUNT (2)
+
+#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
+    {                                                                                                                              \
+        &generatedDefaults[index]                                                                                                  \
+    }
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
+    {                                                                                                                              \
+        &minMaxDefaults[index]                                                                                                     \
+    }
+#define ZAP_EMPTY_DEFAULT()                                                                                                        \
+    {                                                                                                                              \
+        (uint32_t) 0                                                                                                               \
+    }
+#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
+    {                                                                                                                              \
+        (uint32_t) x                                                                                                               \
+    }
+
+// This is an array of EmberAfAttributeMinMaxValue structures.
+#define GENERATED_MIN_MAX_DEFAULT_COUNT 4
+#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                              \
+        { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */                                                       \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
+            { (uint16_t) 0xFF, (uint16_t) 0x0, (uint16_t) 0x2 }, /* StartUpOnOff */                                                \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 }, /* options */                                                      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Color Control (server) */                                                                         \
+        {                                                                                                                          \
+            (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFEFF                                                                      \
+        } /* StartUpColorTemperatureMireds */                                                                                      \
+    }
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+// This is an array of EmberAfAttributeMetadata structures.
+#define GENERATED_ATTRIBUTE_COUNT 270
+#define GENERATED_ATTRIBUTES                                                                                                       \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Groups (server) */                                                                                \
+        { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },        /* name support */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Descriptor (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
+            { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* parts list */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Access Control (server) */                                                                    \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* ACL */                                                                                     \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* Extension */                                                                               \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* SubjectsPerAccessControlEntry */                                                           \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TargetsPerAccessControlEntry */                                                            \
+            { 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* AccessControlEntriesPerFabric */                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Basic (server) */                                                                             \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* DataModelRevision */                                                                       \
+            { 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* VendorName */                                                                              \
+            { 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),            \
+              ZAP_EMPTY_DEFAULT() }, /* VendorID */                                                                                \
+            { 0x00000003, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* ProductName */                                                                             \
+            { 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* ProductID */                                                                               \
+            { 0x00000005, ZAP_TYPE(CHAR_STRING), 33,                                                                               \
+              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_EMPTY_DEFAULT() }, /* NodeLabel */                                                                               \
+            { 0x00000006, ZAP_TYPE(CHAR_STRING), 0,                                                                                \
+              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* Location */                                                                                \
+            { 0x00000007, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* HardwareVersion */                                                                         \
+            { 0x00000008, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* HardwareVersionString */                                                                   \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* SoftwareVersion */                                                                         \
+            { 0x0000000A, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* SoftwareVersionString */                                                                   \
+            { 0x0000000B, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* ManufacturingDate */                                                                       \
+            { 0x0000000C, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* PartNumber */                                                                              \
+            { 0x0000000D, ZAP_TYPE(LONG_CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),     \
+              ZAP_EMPTY_DEFAULT() }, /* ProductURL */                                                                              \
+            { 0x0000000E, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* ProductLabel */                                                                            \
+            { 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* SerialNumber */                                                                            \
+            { 0x00000010, ZAP_TYPE(BOOLEAN), 1,                                                                                    \
+              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0) },                                                                  /* LocalConfigDisabled */  \
+            { 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */            \
+            { 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* UniqueID */         \
+            { 0x00000013, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CapabilityMinima */ \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) },      /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                     \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                 /* DefaultOtaProviders */     \
+            { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* UpdatePossible */          \
+            { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },                            /* UpdateState */             \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                         /* FeatureMap */              \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                           /* ClusterRevision */         \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(CHAR_STRING), 36, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                  \
+              ZAP_LONG_DEFAULTS_INDEX(0) },                                                                /* ActiveLocale */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedLocales */  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                          \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(0) }, /* HourFormat */                                                                    \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0) }, /* ActiveCalendarType */                                                                    \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() },                                         /* SupportedCalendarTypes */                          \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Commissioning (server) */                                                             \
+            { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(6) }, /* Breadcrumb */        \
+            { 0x00000001, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BasicCommissioningInfo */                                                                  \
+            { 0x00000002, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RegulatoryConfig */  \
+            { 0x00000003, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() },                                         /* LocationCapability */                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(6) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                             \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* MaxNetworks */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Networks */          \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                              /* ScanMaxTimeSeconds */      \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                              /* ConnectMaxTimeSeconds */   \
+            { 0x00000004, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* InterfaceEnabled */        \
+            { 0x00000005, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },   /* LastNetworkingStatus */    \
+            { 0x00000006, ZAP_TYPE(OCTET_STRING), 33, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LastNetworkID */     \
+            { 0x00000007, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LastConnectErrorValue */    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(2) },                        /* FeatureMap */               \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* ClusterRevision */          \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \
+            { 0x00000001, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RebootCount */      \
+            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */           \
+            { 0x00000003, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */                                                                   \
+            { 0x00000004, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */       \
+            { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
+            { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* ThreadMetrics */    \
+            { 0x00000001, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CurrentHeapFree */  \
+            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CurrentHeapUsed */  \
+            { 0x00000003, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* CurrentHeapHighWatermark */                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
+            { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
+            { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000F) }, /* FeatureMap */                                 \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },        /* ClusterRevision */                            \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */                                                          \
+            { 0x00000000, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* bssid */                                                                                   \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityType */                                                                            \
+            { 0x00000002, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* WiFiVersion */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelNumber */                                                                           \
+            { 0x00000004, ZAP_TYPE(INT8S), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* Rssi */             \
+            { 0x00000005, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BeaconLostCount */  \
+            { 0x00000006, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BeaconRxCount */    \
+            { 0x00000007, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PacketMulticastRxCount */                                                                  \
+            { 0x00000008, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PacketMulticastTxCount */                                                                  \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PacketUnicastRxCount */                                                                    \
+            { 0x0000000A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PacketUnicastTxCount */                                                                    \
+            { 0x0000000B, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CurrentMaxRate */   \
+            { 0x0000000C, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(3) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */                                                      \
+            { 0x00000000, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* PHYRate */                                                                                 \
+            { 0x00000001, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),               \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* FullDuplex */       \
+            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* PacketRxCount */    \
+            { 0x00000003, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* PacketTxCount */    \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCount */       \
+            { 0x00000005, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CollisionCount */   \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
+            { 0x00000007, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),               \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* CarrierDetect */    \
+            { 0x00000008, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TimeSinceReset */   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(3) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Switch (server) */                                                                            \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* WindowStatus */      \
+            { 0x00000001, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* AdminFabricIndex */ \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AdminVendorId */    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                           \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NOCs */              \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Fabrics */           \
+            { 0x00000002, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedFabrics */  \
+            { 0x00000003, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */                                                                     \
+            { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */                                                                 \
+            { 0x00000005, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
+              ZAP_EMPTY_DEFAULT() },                                         /* CurrentFabricIndex */                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: User Label (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* label list */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Identify (server) */                                                                          \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* identify time */     \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x0) },                                /* identify type */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Groups (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */              \
+            { 0x00004000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                            /* GlobalSceneControl */ \
+            { 0x00004001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* OnTime */            \
+            { 0x00004002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* OffWaitTime */       \
+            { 0x00004003, ZAP_TYPE(ENUM8), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                          \
+                  ZAP_ATTRIBUTE_MASK(NULLABLE),                                                                                    \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(1) },                               /* StartUpOnOff */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x01) }, /* current level */        \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* remaining time */       \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                            /* min level */            \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xFE) },                            /* max level */            \
+            { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* current frequency */    \
+            { 0x00000005, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* min frequency */        \
+            { 0x00000006, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* max frequency */        \
+            { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                        \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(2) }, /* options */                                                                       \
+            { 0x00000010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* on off transition time */                                                           \
+            { 0x00000011, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0xFF) }, /* on level */                                                                           \
+            { 0x00000012, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_EMPTY_DEFAULT() }, /* on transition time */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_EMPTY_DEFAULT() }, /* off transition time */                                                                     \
+            { 0x00000014, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_EMPTY_DEFAULT() }, /* default move rate */                                                                       \
+            { 0x00004000, ZAP_TYPE(INT8U), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                          \
+              ZAP_SIMPLE_DEFAULT(255) },                                     /* start up current level */                          \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(3) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
+            { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* parts list */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Color Control (server) */                                                                     \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                              /* CurrentHue */         \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                              /* CurrentSaturation */  \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                           /* RemainingTime */      \
+            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) },                           /* CurrentX */           \
+            { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) },                           /* CurrentY */           \
+            { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) },                           /* ColorTemperature */   \
+            { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                              /* ColorMode */          \
+            { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Options */            \
+            { 0x00000010, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* NumberOfPrimaries */  \
+            { 0x00004000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                           /* EnhancedCurrentHue */ \
+            { 0x00004001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                              /* EnhancedColorMode */  \
+            { 0x00004002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                              /* ColorLoopActive */    \
+            { 0x00004003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                              /* ColorLoopDirection */ \
+            { 0x00004004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0019) },                           /* ColorLoopTime */      \
+            { 0x00004005, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x2300) },   /* ColorLoopStartEnhancedHue */                  \
+            { 0x00004006, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },   /* ColorLoopStoredEnhancedHue */                 \
+            { 0x0000400A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ColorCapabilities */                          \
+            { 0x0000400B, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },   /* ColorTempPhysicalMinMireds */                 \
+            { 0x0000400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) },   /* ColorTempPhysicalMaxMireds */                 \
+            { 0x0000400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },          /* CoupleColorTempToLevelMinMireds */            \
+            { 0x00004010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(3) },                               /* StartUpColorTemperatureMireds */                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Occupancy Sensing (server) */                                                                 \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* occupancy */                                       \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },      /* occupancy sensor type */                           \
+            { 0x00000002, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* occupancy sensor type bitmap */                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
+    }
+
+// This is an array of EmberAfCluster structures.
+#define ZAP_ATTRIBUTE_INDEX(index) (&generatedAttributes[index])
+
+#define ZAP_GENERATED_COMMANDS_INDEX(index) ((chip::CommandId *) (&generatedCommands[index]))
+
+// Cluster function static arrays
+#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
+    const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {                                                            \
+        (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,                                                    \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = {                                                             \
+        (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback,                                                     \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayLocalizationConfigurationServer[] = {                                         \
+        (EmberAfGenericClusterFunction) emberAfLocalizationConfigurationClusterServerInitCallback,                                 \
+        (EmberAfGenericClusterFunction) MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback,                   \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayTimeFormatLocalizationServer[] = {                                            \
+        (EmberAfGenericClusterFunction) emberAfTimeFormatLocalizationClusterServerInitCallback,                                    \
+        (EmberAfGenericClusterFunction) MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback,                      \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
+        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
+        (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback,                                       \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
+        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
+        (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayColorControlServer[] = {                                                      \
+        (EmberAfGenericClusterFunction) emberAfColorControlClusterServerInitCallback,                                              \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {                                                  \
+        (EmberAfGenericClusterFunction) emberAfOccupancySensingClusterServerInitCallback,                                          \
+    };
+
+// clang-format off
+#define GENERATED_COMMANDS { \
+  /* Endpoint: 0, Cluster: Groups (server) */\
+  /*   AcceptedCommandList (index=0) */ \
+  0x00000000 /* AddGroup */, \
+  0x00000001 /* ViewGroup */, \
+  0x00000002 /* GetGroupMembership */, \
+  0x00000003 /* RemoveGroup */, \
+  0x00000004 /* RemoveAllGroups */, \
+  0x00000005 /* AddGroupIfIdentifying */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=7)*/ \
+  0x00000000 /* AddGroupResponse */, \
+  0x00000001 /* ViewGroupResponse */, \
+  0x00000002 /* GetGroupMembershipResponse */, \
+  0x00000003 /* RemoveGroupResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\
+  /*   AcceptedCommandList (index=12) */ \
+  0x00000000 /* AnnounceOtaProvider */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: General Commissioning (server) */\
+  /*   AcceptedCommandList (index=14) */ \
+  0x00000000 /* ArmFailSafe */, \
+  0x00000002 /* SetRegulatoryConfig */, \
+  0x00000004 /* CommissioningComplete */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=18)*/ \
+  0x00000001 /* ArmFailSafeResponse */, \
+  0x00000003 /* SetRegulatoryConfigResponse */, \
+  0x00000005 /* CommissioningCompleteResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Network Commissioning (server) */\
+  /*   AcceptedCommandList (index=22) */ \
+  0x00000000 /* ScanNetworks */, \
+  0x00000002 /* AddOrUpdateWiFiNetwork */, \
+  0x00000003 /* AddOrUpdateThreadNetwork */, \
+  0x00000004 /* RemoveNetwork */, \
+  0x00000006 /* ConnectNetwork */, \
+  0x00000008 /* ReorderNetwork */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=29)*/ \
+  0x00000001 /* ScanNetworksResponse */, \
+  0x00000005 /* NetworkConfigResponse */, \
+  0x00000007 /* ConnectNetworkResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\
+  /*   AcceptedCommandList (index=33) */ \
+  0x00000000 /* RetrieveLogsRequest */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=35)*/ \
+  0x00000001 /* RetrieveLogsResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
+  /*   AcceptedCommandList (index=37) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=39) */ \
+  0x00000000 /* ResetWatermarks */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
+  /*   AcceptedCommandList (index=41) */ \
+  0x00000000 /* ResetCounts */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
+  /*   AcceptedCommandList (index=43) */ \
+  0x00000000 /* ResetCounts */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+  /*   AcceptedCommandList (index=45) */ \
+  0x00000000 /* ResetCounts */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /*   AcceptedCommandList (index=47) */ \
+  0x00000000 /* OpenCommissioningWindow */, \
+  0x00000001 /* OpenBasicCommissioningWindow */, \
+  0x00000002 /* RevokeCommissioning */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Operational Credentials (server) */\
+  /*   AcceptedCommandList (index=51) */ \
+  0x00000000 /* AttestationRequest */, \
+  0x00000002 /* CertificateChainRequest */, \
+  0x00000004 /* CSRRequest */, \
+  0x00000006 /* AddNOC */, \
+  0x00000007 /* UpdateNOC */, \
+  0x00000009 /* UpdateFabricLabel */, \
+  0x0000000A /* RemoveFabric */, \
+  0x0000000B /* AddTrustedRootCertificate */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=60)*/ \
+  0x00000001 /* AttestationResponse */, \
+  0x00000003 /* CertificateChainResponse */, \
+  0x00000005 /* CSRResponse */, \
+  0x00000008 /* NOCResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=65) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=70)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Identify (server) */\
+  /*   AcceptedCommandList (index=73) */ \
+  0x00000000 /* Identify */, \
+  0x00000040 /* TriggerEffect */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Groups (server) */\
+  /*   AcceptedCommandList (index=76) */ \
+  0x00000000 /* AddGroup */, \
+  0x00000001 /* ViewGroup */, \
+  0x00000002 /* GetGroupMembership */, \
+  0x00000003 /* RemoveGroup */, \
+  0x00000004 /* RemoveAllGroups */, \
+  0x00000005 /* AddGroupIfIdentifying */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=83)*/ \
+  0x00000000 /* AddGroupResponse */, \
+  0x00000001 /* ViewGroupResponse */, \
+  0x00000002 /* GetGroupMembershipResponse */, \
+  0x00000003 /* RemoveGroupResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: On/Off (server) */\
+  /*   AcceptedCommandList (index=88) */ \
+  0x00000000 /* Off */, \
+  0x00000001 /* On */, \
+  0x00000002 /* Toggle */, \
+  0x00000040 /* OffWithEffect */, \
+  0x00000041 /* OnWithRecallGlobalScene */, \
+  0x00000042 /* OnWithTimedOff */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Level Control (server) */\
+  /*   AcceptedCommandList (index=95) */ \
+  0x00000000 /* MoveToLevel */, \
+  0x00000001 /* Move */, \
+  0x00000002 /* Step */, \
+  0x00000003 /* Stop */, \
+  0x00000004 /* MoveToLevelWithOnOff */, \
+  0x00000005 /* MoveWithOnOff */, \
+  0x00000006 /* StepWithOnOff */, \
+  0x00000007 /* StopWithOnOff */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Color Control (server) */\
+  /*   AcceptedCommandList (index=104) */ \
+  0x00000000 /* MoveToHue */, \
+  0x00000001 /* MoveHue */, \
+  0x00000002 /* StepHue */, \
+  0x00000003 /* MoveToSaturation */, \
+  0x00000004 /* MoveSaturation */, \
+  0x00000005 /* StepSaturation */, \
+  0x00000006 /* MoveToHueAndSaturation */, \
+  0x00000007 /* MoveToColor */, \
+  0x00000008 /* MoveColor */, \
+  0x00000009 /* StepColor */, \
+  0x0000000A /* MoveToColorTemperature */, \
+  0x00000040 /* EnhancedMoveToHue */, \
+  0x00000041 /* EnhancedMoveHue */, \
+  0x00000042 /* EnhancedStepHue */, \
+  0x00000043 /* EnhancedMoveToHueAndSaturation */, \
+  0x00000044 /* ColorLoopSet */, \
+  0x00000047 /* StopMoveStep */, \
+  0x0000004B /* MoveColorTemperature */, \
+  0x0000004C /* StepColorTemperature */, \
+  chip::kInvalidCommandId /* end of list */, \
+}
+
+// clang-format on
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+#define GENERATED_CLUSTER_COUNT 29
+
+// clang-format off
+#define GENERATED_CLUSTERS { \
+  { \
+      /* Endpoint: 0, Cluster: Groups (server) */ \
+      .clusterId = 0x00000004,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(0), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayGroupsServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 7 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Descriptor (server) */ \
+      .clusterId = 0x0000001D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(3), \
+      .attributeCount = 6, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Access Control (server) */ \
+      .clusterId = 0x0000001F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(9), \
+      .attributeCount = 7, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Basic (server) */ \
+      .clusterId = 0x00000028,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(16), \
+      .attributeCount = 22, \
+      .clusterSize = 41, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayBasicServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \
+      .clusterId = 0x00000029,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(38), \
+      .attributeCount = 0, \
+      .clusterSize = 0, \
+      .mask = ZAP_CLUSTER_MASK(CLIENT), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \
+      .clusterId = 0x0000002A,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(38), \
+      .attributeCount = 6, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 12 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Localization Configuration (server) */ \
+      .clusterId = 0x0000002B,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(44), \
+      .attributeCount = 4, \
+      .clusterSize = 42, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayLocalizationConfigurationServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Time Format Localization (server) */ \
+      .clusterId = 0x0000002C,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(48), \
+      .attributeCount = 5, \
+      .clusterSize = 8, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayTimeFormatLocalizationServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: General Commissioning (server) */ \
+      .clusterId = 0x00000030,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(53), \
+      .attributeCount = 6, \
+      .clusterSize = 14, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 14 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Network Commissioning (server) */ \
+      .clusterId = 0x00000031,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(59), \
+      .attributeCount = 10, \
+      .clusterSize = 48, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \
+      .clusterId = 0x00000032,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(69), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
+      .clusterId = 0x00000033,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(71), \
+      .attributeCount = 11, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+      .clusterId = 0x00000034,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+      .clusterId = 0x00000035,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
+      .attributeCount = 65, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+      .clusterId = 0x00000036,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
+      .attributeCount = 15, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+      .clusterId = 0x00000037,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(168), \
+      .attributeCount = 11, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Switch (server) */ \
+      .clusterId = 0x0000003B,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+      .clusterId = 0x0000003C,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+      .attributeCount = 5, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
+      .clusterId = 0x0000003E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+      .attributeCount = 8, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Group Key Management (server) */ \
+      .clusterId = 0x0000003F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Fixed Label (server) */ \
+      .clusterId = 0x00000040,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: User Label (server) */ \
+      .clusterId = 0x00000041,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(203), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Identify (server) */ \
+      .clusterId = 0x00000003,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributeCount = 4, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayIdentifyServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Groups (server) */ \
+      .clusterId = 0x00000004,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayGroupsServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: On/Off (server) */ \
+      .clusterId = 0x00000006,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+      .attributeCount = 7, \
+      .clusterSize = 13, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayOnOffServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Level Control (server) */ \
+      .clusterId = 0x00000008,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(220), \
+      .attributeCount = 16, \
+      .clusterSize = 27, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayLevelControlServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Descriptor (server) */ \
+      .clusterId = 0x0000001D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(236), \
+      .attributeCount = 6, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Color Control (server) */ \
+      .clusterId = 0x00000300,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributeCount = 23, \
+      .clusterSize = 40, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayColorControlServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
+      .clusterId = 0x00000406,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+      .attributeCount = 5, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayOccupancySensingServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+}
+
+// clang-format on
+
+#define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
+
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 28
+
+// This is an array of EmberAfEndpointType structures.
+#define GENERATED_ENDPOINT_TYPES                                                                                                   \
+    {                                                                                                                              \
+        { ZAP_CLUSTER_INDEX(0), 22, 251 }, { ZAP_CLUSTER_INDEX(22), 7, 109 },                                                      \
+    }
+
+// Largest attribute size is needed for various buffers
+#define ATTRIBUTE_LARGEST (259)
+
+static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, "ATTRIBUTE_LARGEST larger than expected");
+
+// Total size of singleton attributes
+#define ATTRIBUTE_SINGLETONS_SIZE (37)
+
+// Total size of attribute storage
+#define ATTRIBUTE_MAX_SIZE (360)
+
+// Number of fixed endpoints
+#define FIXED_ENDPOINT_COUNT (2)
+
+// Array of endpoints that are supported, the data inside
+// the array is the endpoint number.
+#define FIXED_ENDPOINT_ARRAY                                                                                                       \
+    {                                                                                                                              \
+        0x0000, 0x0001                                                                                                             \
+    }
+
+// Array of profile ids
+#define FIXED_PROFILE_IDS                                                                                                          \
+    {                                                                                                                              \
+        0x0103, 0x0103                                                                                                             \
+    }
+
+// Array of device types
+#define FIXED_DEVICE_TYPES                                                                                                         \
+    {                                                                                                                              \
+        { 0x0016, 1 }, { 0x0101, 1 }                                                                                               \
+    }
+
+// Array of device type offsets
+#define FIXED_DEVICE_TYPE_OFFSETS                                                                                                  \
+    {                                                                                                                              \
+        0, 1                                                                                                                       \
+    }
+
+// Array of device type lengths
+#define FIXED_DEVICE_TYPE_LENGTHS                                                                                                  \
+    {                                                                                                                              \
+        1, 1                                                                                                                       \
+    }
+
+// Array of endpoint types supported on each endpoint
+#define FIXED_ENDPOINT_TYPES                                                                                                       \
+    {                                                                                                                              \
+        0, 1                                                                                                                       \
+    }
+
+// Array of networks supported on each endpoint
+#define FIXED_NETWORKS                                                                                                             \
+    {                                                                                                                              \
+        0, 0                                                                                                                       \
+    }
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/gen_config.h b/examples/chef/zzz_generated/lighting-app/zap-generated/gen_config.h
new file mode 100644
index 00000000000000..efc7a77b3d5c58
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/gen_config.h
@@ -0,0 +1,202 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+// User options for plugin Binding Table Library
+#define EMBER_BINDING_TABLE_SIZE 10
+
+/**** Network Section ****/
+#define EMBER_SUPPORTED_NETWORKS (1)
+
+#define EMBER_APS_UNICAST_MESSAGE_COUNT 10
+
+/**** Cluster endpoint counts ****/
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+
+/**** Cluster Plugins ****/
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
+
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
+
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
diff --git a/examples/chef/zzz_generated/lighting-app/zap-generated/gen_tokens.h b/examples/chef/zzz_generated/lighting-app/zap-generated/gen_tokens.h
new file mode 100644
index 00000000000000..dcc229f5b2c306
--- /dev/null
+++ b/examples/chef/zzz_generated/lighting-app/zap-generated/gen_tokens.h
@@ -0,0 +1,45 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+// This file contains the tokens for attributes stored in flash
+
+// Identifier tags for tokens
+
+// Types for the tokens
+#ifdef DEFINETYPES
+#endif // DEFINETYPES
+
+// Actual token definitions
+#ifdef DEFINETOKENS
+#endif // DEFINETOKENS
+
+// Macro snippet that loads all the attributes from tokens
+#define GENERATED_TOKEN_LOADER(endpoint)                                                                                           \
+    do                                                                                                                             \
+    {                                                                                                                              \
+    } while (false)
+
+// Macro snippet that saves the attribute to token
+#define GENERATED_TOKEN_SAVER                                                                                                      \
+    do                                                                                                                             \
+    {                                                                                                                              \
+    } while (false)
diff --git a/examples/chip-tool-darwin/templates/README.zapt b/examples/chip-tool-darwin/templates/README.zapt
deleted file mode 100644
index 00f85baa6ce77b..00000000000000
--- a/examples/chip-tool-darwin/templates/README.zapt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Command Details
-
-{{#chip_client_clusters includeAll=true}}
-{{#chip_cluster_commands}}
-{{#first}}
-<details><summary>{{parent.name}}</summary><p>
-
-```bash
-Usage:
-  ./chip-tool-darwin {{asType (asSpacedLowercase parent.name)}} command_name [param1 param2 ...]
-
-  +-------------------------------------------------------------------------------------+
-  | Commands:                                                                           |
-  +-------------------------------------------------------------------------------------+
-{{/first}}
-{{pad (concat "  | * " (asDelimitedCommand name)) 88 ' '}}|
-{{#last}}
-  +-------------------------------------------------------------------------------------+
-```
-
-</details>
-{{/last}}
-{{/chip_cluster_commands}}
-{{/chip_client_clusters}}
diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
index c820b4a7cd0899..2da0372fef7458 100644
--- a/examples/chip-tool/BUILD.gn
+++ b/examples/chip-tool/BUILD.gn
@@ -100,7 +100,8 @@ static_library("chip-tool-utils") {
   public_configs = [ ":config" ]
 
   if (chip_enable_transport_trace) {
-    public_deps += [ "${chip_root}/examples/common/tracing:trace_handlers" ]
+    public_deps +=
+        [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ]
   }
 
   output_dir = root_out_dir
diff --git a/examples/chip-tool/README.md b/examples/chip-tool/README.md
index 4b266923782653..3385e7c7c36cdc 100644
--- a/examples/chip-tool/README.md
+++ b/examples/chip-tool/README.md
@@ -67,9 +67,9 @@ remote device, as well as the network credentials to use.
 The command below uses the default values hard-coded into the debug versions of
 the ESP32 all-clusters-app to commission it onto a Wi-Fi network:
 
-    ```
-    $ chip-tool pairing ble-wifi ${NODE_ID_TO_ASSIGN} ${SSID} ${PASSWORD} 20202021 3840
-    ```
+```
+chip-tool pairing ble-wifi ${NODE_ID_TO_ASSIGN} ${SSID} ${PASSWORD} 20202021 3840
+```
 
 where:
 
@@ -81,38 +81,38 @@ where:
 
 For example:
 
-    ```
-    $ chip-tool pairing ble-wifi 0x11 xyz secret 20202021 3840
-    ```
+```
+chip-tool pairing ble-wifi 0x11 xyz secret 20202021 3840
+```
 
 or equivalently:
 
-    ```
-    $ chip-tool pairing ble-wifi 17 hex:787980 hex:736563726574 20202021 3840
-    ```
+```
+chip-tool pairing ble-wifi 17 hex:787980 hex:736563726574 20202021 3840
+```
 
 #### Pair a device over IP
 
 The command below will discover devices and try to pair with the first one it
 discovers using the provided setup code.
 
-    ```
-    $ chip-tool pairing onnetwork ${NODE_ID_TO_ASSIGN} 20202021
-    ```
+```
+chip-tool pairing onnetwork ${NODE_ID_TO_ASSIGN} 20202021
+```
 
 The command below will discover devices with long discriminator 3840 and try to
 pair with the first one it discovers using the provided setup code.
 
-    ```
-    $ chip-tool pairing onnetwork-long ${NODE_ID_TO_ASSIGN} 20202021 3840
-    ```
+```
+chip-tool pairing onnetwork-long ${NODE_ID_TO_ASSIGN} 20202021 3840
+```
 
 The command below will discover devices based on the given QR code (which
 devices log when they start up) and try to pair with the first one it discovers.
 
-    ```
-    $ chip-tool pairing code ${NODE_ID_TO_ASSIGN} MT:#######
-    ```
+```
+chip-tool pairing code ${NODE_ID_TO_ASSIGN} MT:#######
+```
 
 In all these cases, the device will be assigned node id `${NODE_ID_TO_ASSIGN}`
 (which must be a decimal number or a 0x-prefixed hex number).
@@ -129,15 +129,15 @@ Attestation Verification. It will also discover devices with long discriminator
 3840 and try to pair with the first one it discovers using the provided setup
 code.
 
-    ```
-    $ chip-tool pairing onnetwork-long ${NODE_ID_TO_ASSIGN} 20202021 3840 --paa-trust-store-path path/to/PAAs
-    ```
+```
+chip-tool pairing onnetwork-long ${NODE_ID_TO_ASSIGN} 20202021 3840 --paa-trust-store-path path/to/PAAs
+```
 
 ### Forget the currently-commissioned device
 
-    ```
-    $ chip-tool pairing unpair
-    ```
+```
+chip-tool pairing unpair
+```
 
 ## Using the Client to Send Matter Commands
 
@@ -146,9 +146,9 @@ the target cluster name, the target command name as well as an endpoint id.
 
 The endpoint id must be between 1 and 240.
 
-    ```
-    $ chip-tool onoff on 1
-    ```
+```
+chip-tool onoff on 1
+```
 
 The client will send a single command packet and then exit.
 
@@ -158,27 +158,28 @@ The client will send a single command packet and then exit.
 
 2. Add Group to device
 
-    ```
-    $ chip-tool groups add-group GroupId GroupName node-id endpoint-id
-    $ chip-tool groups add-group 0x4141 Light 1234 1
-    ```
+```
+chip-tool groups add-group GroupId GroupName node-id endpoint-id
+chip-tool groups add-group 0x4141 Light 1234 1
+```
 
 3. Add group Keyset to device
 
-    ```
-    $ chip-tool groupkeymanagement key-set-write GroupKeySet node-id endpoint-id
-    $ chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42,
-    "groupKeySecurityPolicy": 0, "epochKey0":
-    "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
-    "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
+```
+chip-tool groupkeymanagement key-set-write GroupKeySet node-id endpoint-id
+chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42, \
+    "groupKeySecurityPolicy": 0, "epochKey0": \
+    "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1": \
+    "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": \
     "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 1234 0
-    ```
+```
 
 4. Bind Key to group
-    ```
-    $ chip-tool groupkeymanagement write group-key-map attr-value node-id endpoint-id
-    $ chip-tool groupkeymanagement write group-key-map '[{"groupId": 16705, "groupKeySetID": 42}]' 1234 0
-    ```
+
+```
+chip-tool groupkeymanagement write group-key-map attr-value node-id endpoint-id
+chip-tool groupkeymanagement write group-key-map '[{"groupId": 16705, "groupKeySetID": 42}]' 1234 0
+```
 
 ## Configuring the client for Group Commands
 
@@ -187,35 +188,35 @@ must be configured appropriately.
 
 To configure the client please use the groupsettings option
 
-    ```
-    $ chip-tool groupsettings
-    ```
+```
+chip-tool groupsettings
+```
 
 A group with a valid encryption key needs to be set. The groupid and the
 encryption key must match the one configured on the end device.
 
 To add a group
 
-    ```
-    $ chip-tool groupsettings add-group groupName groupId
-    $ chip-tool groupsettings add-group TestName 0x4141
-    ```
+```
+chip-tool groupsettings add-group groupName groupId
+chip-tool groupsettings add-group TestName 0x4141
+```
 
 To add a keyset
 
-    ```
-    $ chip-tool groupsettings add-keysets keysetId keyPolicy validityTime EpochKey
-    $ chip-tool groupsettings add-keysets 0xAAAA 0 0x000000000021dfe0 hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
-    ```
+```
+chip-tool groupsettings add-keysets keysetId keyPolicy validityTime EpochKey
+chip-tool groupsettings add-keysets 0xAAAA 0 0x000000000021dfe0 hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
+```
 
 Take note that the epoch key must be in hex form with the 'hex:' prefix
 
 Finally to bind the keyset to the group
 
-    ```
-    $ chip-tool groupsettings bind-keyset groupId keysetId
-    $ chip-tool groupsettings bind-keyset 0x4141 0xAAAA
-    ```
+```
+chip-tool groupsettings bind-keyset groupId keysetId
+chip-tool groupsettings bind-keyset 0x4141 0xAAAA
+```
 
 ## Using the Client to Send Group (Multicast) Matter Commands
 
@@ -226,9 +227,9 @@ and attributes write can be send with Group Id.
 
 E.G. sending to group Id 0x4141
 
-    ```
-    $ chip-tool onoff on 0xffffffffffff4141 1
-    ```
+```
+chip-tool onoff on 0xffffffffffff4141 1
+```
 
 The client will send a single multicast command packet and then exit.
 
@@ -237,9 +238,9 @@ The client will send a single multicast command packet and then exit.
 To get the list of supported clusters, run the built executable without any
 arguments.
 
-    ```
-    $ chip-tool
-    ```
+```
+chip-tool
+```
 
 Example output:
 
@@ -271,33 +272,33 @@ Usage:
 To get the list of commands for a specific cluster, run the built executable
 with the target cluster name.
 
-    ```
-    $ chip-tool onoff
-    ```
+```
+chip-tool onoff
+```
 
 ### How to get the list of supported attributes for a specific cluster
 
 To the the list of attributes for a specific cluster, run the built executable
 with the target cluster name and the `read` command name.
 
-    ```
-    $ chip-tool onoff read
-    ```
+```
+chip-tool onoff read
+```
 
 ### How to get the list of parameters for a command
 
 To get the list of parameters for a specific command, run the built executable
 with the target cluster name and the target command name
 
-    ```
-    $ chip-tool onoff on
-    ```
+```
+chip-tool onoff on
+```
 
 ### Run a test suite against a paired peer device
 
-    ```
-    $ chip-tool tests Test_TC_OO_1_1
-    ```
+```
+chip-tool tests Test_TC_OO_1_1
+```
 
 ## Using the Client for Setup Payload
 
@@ -306,36 +307,36 @@ with the target cluster name and the target command name
 To parse a setup code, run the built executable with the `payload` cluster name
 and the `parse-setup-payload` command
 
-    ```
-    $ chip-tool payload parse-setup-payload code
-    ```
+```
+chip-tool payload parse-setup-payload code
+```
 
 #### QR Code
 
-    ```
-    $ chip-tool payload parse-setup-payload "MT:#####"
-    ```
+```
+chip-tool payload parse-setup-payload "MT:#####"
+```
 
 #### QR Code with optional Vendor Info
 
-    ```
-    $ chip-tool payload parse-setup-payload "MT:#####"
-    ```
+```
+chip-tool payload parse-setup-payload "MT:#####"
+```
 
 #### Manual Setup Code
 
-    ```
-    $ chip-tool payload parse-setup-payload "#####"
-    ```
+```
+chip-tool payload parse-setup-payload "#####"
+```
 
 # Using the Client for Additional Data Payload
 
 To parse an additional data payload, run the built executable with the `payload`
 cluster name and the `parse-additional-data-payload` command
 
-    ```
-    $ chip-tool payload parse-additional-data-payload "#####"
-    ```
+```
+chip-tool payload parse-additional-data-payload "#####"
+```
 
 # Command Reference
 
diff --git a/examples/chip-tool/commands/clusters/ComplexArgument.h b/examples/chip-tool/commands/clusters/ComplexArgument.h
index aafc18d68d7591..d02afd9ee98741 100644
--- a/examples/chip-tool/commands/clusters/ComplexArgument.h
+++ b/examples/chip-tool/commands/clusters/ComplexArgument.h
@@ -26,6 +26,8 @@
 #include <lib/support/BytesToHex.h>
 #include <lib/support/SafeInt.h>
 
+#include "JsonParser.h"
+
 constexpr uint8_t kMaxLabelLength = 100;
 
 class ComplexArgumentParser
@@ -102,6 +104,16 @@ class ComplexArgumentParser
         return CHIP_NO_ERROR;
     }
 
+    template <typename T>
+    static CHIP_ERROR Setup(const char * label, chip::BitMask<T> & request, Json::Value & value)
+    {
+        T requestValue;
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(label, requestValue, value));
+
+        request = chip::BitMask<T>(requestValue);
+        return CHIP_NO_ERROR;
+    }
+
     template <typename T>
     static CHIP_ERROR Setup(const char * label, chip::Optional<T> & request, Json::Value & value)
     {
@@ -304,57 +316,8 @@ class TypedComplexArgument : public ComplexArgument
     CHIP_ERROR Parse(const char * label, const char * json)
     {
         Json::Value value;
-        Json::Reader reader;
-        if (!reader.parse(json, value))
+        if (!JsonParser::ParseComplexArgument(label, json, value))
         {
-            std::vector<Json::Reader::StructuredError> errors = reader.getStructuredErrors();
-            ChipLogError(chipTool, "Error parsing JSON for %s:", label);
-            for (auto & error : errors)
-            {
-                ChipLogError(chipTool, "  %s", error.message.c_str());
-                ptrdiff_t error_start   = error.offset_start;
-                ptrdiff_t error_end     = error.offset_limit;
-                const char * sourceText = json;
-                // The whole JSON string might be too long to fit in our log
-                // messages.  Just include 30 chars before the error.
-                constexpr ptrdiff_t kMaxContext = 30;
-                std::string errorMsg;
-                if (error_start > kMaxContext)
-                {
-                    sourceText += (error_start - kMaxContext);
-                    error_end   = kMaxContext + (error_end - error_start);
-                    error_start = kMaxContext;
-                    ChipLogError(chipTool, "... %s", sourceText);
-                    // Add markers corresponding to the "... " above.
-                    errorMsg += "----";
-                }
-                else
-                {
-                    ChipLogError(chipTool, "%s", sourceText);
-                }
-                for (ptrdiff_t i = 0; i < error_start; ++i)
-                {
-                    errorMsg += "-";
-                }
-                errorMsg += "^";
-                if (error_start + 1 < error_end)
-                {
-                    for (ptrdiff_t i = error_start + 1; i < error_end; ++i)
-                    {
-                        errorMsg += "-";
-                    }
-                    errorMsg += "^";
-                }
-                ChipLogError(chipTool, "%s", errorMsg.c_str());
-
-                if (error.message == "Missing ',' or '}' in object declaration" && error.offset_start > 0 &&
-                    json[error.offset_start - 1] == '0' && (json[error.offset_start] == 'x' || json[error.offset_start] == 'X'))
-                {
-                    ChipLogError(chipTool,
-                                 "NOTE: JSON does not allow hex syntax beginning with 0x for numbers.  Try putting the hex number "
-                                 "in quotes (like {\"name\": \"0x100\"}).");
-                }
-            }
             return CHIP_ERROR_INVALID_ARGUMENT;
         }
 
diff --git a/examples/chip-tool/commands/clusters/CustomArgument.h b/examples/chip-tool/commands/clusters/CustomArgument.h
index 2362171aa06da9..6755703fa0b7d5 100644
--- a/examples/chip-tool/commands/clusters/CustomArgument.h
+++ b/examples/chip-tool/commands/clusters/CustomArgument.h
@@ -22,6 +22,8 @@
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/SafeInt.h>
 
+#include "JsonParser.h"
+
 namespace {
 static constexpr char kPayloadHexPrefix[]         = "hex:";
 static constexpr char kPayloadSignedPrefix[]      = "s:";
@@ -230,9 +232,30 @@ class CustomArgument
 
     CHIP_ERROR Parse(const char * label, const char * json)
     {
-        Json::Reader reader;
         Json::Value value;
-        reader.parse(json, value);
+        constexpr const char kHexNumPrefix[] = "0x";
+        constexpr size_t kHexNumPrefixLen    = ArraySize(kHexNumPrefix) - 1;
+        if (strncmp(json, kPayloadHexPrefix, kPayloadHexPrefixLen) == 0 ||
+            strncmp(json, kPayloadSignedPrefix, kPayloadSignedPrefixLen) == 0 ||
+            strncmp(json, kPayloadUnsignedPrefix, kPayloadUnsignedPrefixLen) == 0 ||
+            strncmp(json, kPayloadFloatPrefix, kPayloadFloatPrefixLen) == 0 ||
+            strncmp(json, kPayloadDoublePrefix, kPayloadDoublePrefixLen) == 0)
+        {
+            value = Json::Value(json);
+        }
+        else if (strncmp(json, kHexNumPrefix, kHexNumPrefixLen) == 0)
+        {
+            // Assume that hex numbers are unsigned.  Prepend
+            // kPayloadUnsignedPrefix and then let the rest of the logic handle
+            // things.
+            std::string str(kPayloadUnsignedPrefix);
+            str += json;
+            value = Json::Value(str);
+        }
+        else if (!JsonParser::ParseCustomArgument(label, json, value))
+        {
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        }
 
         mData = static_cast<uint8_t *>(chip::Platform::MemoryCalloc(sizeof(uint8_t), mDataMaxLen));
         VerifyOrReturnError(mData != nullptr, CHIP_ERROR_NO_MEMORY);
diff --git a/examples/chip-tool/commands/clusters/JsonParser.h b/examples/chip-tool/commands/clusters/JsonParser.h
new file mode 100644
index 00000000000000..2b74aee6fffb7c
--- /dev/null
+++ b/examples/chip-tool/commands/clusters/JsonParser.h
@@ -0,0 +1,162 @@
+/*
+ *   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 <json/json.h>
+#include <lib/core/Optional.h>
+
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
+class JsonParser
+{
+public:
+    // Returns whether the parse succeeded.
+    static bool ParseComplexArgument(const char * label, const char * json, Json::Value & value)
+    {
+        return Parse(label, json, /* strictRoot = */ true, value);
+    }
+
+    // Returns whether the parse succeeded.
+    static bool ParseCustomArgument(const char * label, const char * json, Json::Value & value)
+    {
+        return Parse(label, json, /* strictRoot = */ false, value);
+    }
+
+private:
+    static bool Parse(const char * label, const char * json, bool strictRoot, Json::Value & value)
+    {
+        Json::CharReaderBuilder readerBuilder;
+        readerBuilder.settings_["strictRoot"]        = strictRoot;
+        readerBuilder.settings_["allowSingleQuotes"] = true;
+        readerBuilder.settings_["failIfExtra"]       = true;
+        readerBuilder.settings_["rejectDupKeys"]     = true;
+
+        auto reader = std::unique_ptr<Json::CharReader>(readerBuilder.newCharReader());
+        std::string errors;
+        if (reader->parse(json, json + strlen(json), &value, &errors))
+        {
+            return true;
+        }
+
+        // The CharReader API allows us to set failIfExtra, unlike Reader, but does
+        // not allow us to get structured errors.  We get to try to manually undo
+        // the work it did to create a string from the structured errors it had.
+        ChipLogError(chipTool, "Error parsing JSON for %s:", label);
+
+        // For each error "errors" has the following:
+        //
+        // 1) A line starting with "* " that has line/column info
+        // 2) A line with the error message.
+        // 3) An optional line with some extra info.
+        //
+        // We keep track of the last error column, in case the error message
+        // reporting needs it.
+        std::istringstream stream(errors);
+        std::string error;
+        chip::Optional<unsigned> errorColumn;
+        while (getline(stream, error))
+        {
+            if (error.rfind("* ", 0) == 0)
+            {
+                // Flush out any pending error location.
+                LogErrorLocation(errorColumn, json);
+
+                // The format of this line is:
+                //
+                // * Line N, Column M
+                //
+                // Unfortunately it does not indicate end of error, so we can only
+                // show its start.
+                unsigned errorLine; // ignored in practice
+                if (sscanf(error.c_str(), "* Line %u, Column %u", &errorLine, &errorColumn.Emplace()) != 2)
+                {
+                    ChipLogError(chipTool, "Unexpected location string: %s\n", error.c_str());
+                    // We don't know how to make sense of this thing anymore.
+                    break;
+                }
+                if (errorColumn.Value() == 0)
+                {
+                    ChipLogError(chipTool, "Expected error column to be at least 1");
+                    // We don't know how to make sense of this thing anymore.
+                    break;
+                }
+                // We are using our column numbers as offsets, so want them to be
+                // 0-based.
+                --errorColumn.Value();
+            }
+            else
+            {
+                ChipLogError(chipTool, "  %s", error.c_str());
+                if (error == "  Missing ',' or '}' in object declaration" && errorColumn.HasValue() && errorColumn.Value() > 0 &&
+                    json[errorColumn.Value() - 1] == '0' && (json[errorColumn.Value()] == 'x' || json[errorColumn.Value()] == 'X'))
+                {
+                    // Log the error location marker before showing the NOTE
+                    // message.
+                    LogErrorLocation(errorColumn, json);
+                    ChipLogError(chipTool,
+                                 "NOTE: JSON does not allow hex syntax beginning with 0x for numbers.  Try putting the hex number "
+                                 "in quotes (like {\"name\": \"0x100\"}).");
+                }
+            }
+        }
+
+        // Write out the marker for our last error.
+        LogErrorLocation(errorColumn, json);
+
+        return false;
+    }
+
+private:
+    static void LogErrorLocation(chip::Optional<unsigned> & errorColumn, const char * json)
+    {
+        if (!errorColumn.HasValue())
+        {
+            return;
+        }
+
+        const char * sourceText = json;
+        unsigned error_start    = errorColumn.Value();
+        // The whole JSON string might be too long to fit in our log
+        // messages.  Just include 30 chars before the error.
+        constexpr ptrdiff_t kMaxContext = 30;
+        std::string errorMarker;
+        if (error_start > kMaxContext)
+        {
+            sourceText += (error_start - kMaxContext);
+            error_start = kMaxContext;
+            ChipLogError(chipTool, "... %s", sourceText);
+            // Add markers corresponding to the "... " above.
+            errorMarker += "----";
+        }
+        else
+        {
+            ChipLogError(chipTool, "%s", sourceText);
+        }
+        for (unsigned i = 0; i < error_start; ++i)
+        {
+            errorMarker += "-";
+        }
+        errorMarker += "^";
+        ChipLogError(chipTool, "%s", errorMarker.c_str());
+        errorColumn.ClearValue();
+    }
+};
diff --git a/examples/chip-tool/commands/clusters/ReportCommand.h b/examples/chip-tool/commands/clusters/ReportCommand.h
index dd533b2fb299d9..5a6bb4bf20c3b3 100644
--- a/examples/chip-tool/commands/clusters/ReportCommand.h
+++ b/examples/chip-tool/commands/clusters/ReportCommand.h
@@ -350,11 +350,7 @@ class SubscribeEvent : public SubscribeCommand
     {
         AddArgument("cluster-id", 0, UINT32_MAX, &mClusterIds);
         AddArgument("event-id", 0, UINT32_MAX, &mEventIds);
-        AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
-        AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
-        AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
-        AddArgument("event-min", 0, UINT64_MAX, &mEventNumber);
-        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
+        AddCommonArguments();
         SubscribeCommand::AddArguments();
     }
 
@@ -362,11 +358,7 @@ class SubscribeEvent : public SubscribeCommand
         SubscribeCommand("subscribe-event-by-id", credsIssuerConfig), mClusterIds(1, clusterId)
     {
         AddArgument("event-id", 0, UINT32_MAX, &mEventIds);
-        AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
-        AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
-        AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
-        AddArgument("event-min", 0, UINT64_MAX, &mEventNumber);
-        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
+        AddCommonArguments();
         SubscribeCommand::AddArguments();
     }
 
@@ -376,6 +368,12 @@ class SubscribeEvent : public SubscribeCommand
         mClusterIds(1, clusterId), mEventIds(1, eventId)
     {
         AddArgument("event-name", eventName, "Event name.");
+        AddCommonArguments();
+        SubscribeCommand::AddArguments();
+    }
+
+    void AddCommonArguments()
+    {
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval,
                     "The requested minimum interval between reports. Sets MinIntervalFloor in the Subscribe Request.");
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval,
@@ -384,7 +382,14 @@ class SubscribeEvent : public SubscribeCommand
         AddArgument("event-min", 0, UINT64_MAX, &mEventNumber);
         AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions,
                     "false - Terminate existing subscriptions from initiator.\n  true - Leave existing subscriptions in place.");
-        SubscribeCommand::AddArguments();
+        AddArgument(
+            "is-urgent", 0, 1, &mIsUrgents,
+            "Sets isUrgent in the Subscribe Request.\n"
+            "  The queueing of any urgent event SHALL force an immediate generation of reports containing all events queued "
+            "leading up to (and including) the urgent event in question.\n"
+            "  This argument takes a comma separated list of true/false values.\n"
+            "  If the number of paths exceeds the number of entries provided to is-urgent, then isUrgent will be false for the "
+            "extra paths.");
     }
 
     ~SubscribeEvent() {}
@@ -392,7 +397,7 @@ class SubscribeEvent : public SubscribeCommand
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
         return SubscribeCommand::SubscribeEvent(device, endpointIds, mClusterIds, mEventIds, mMinInterval, mMaxInterval,
-                                                mFabricFiltered, mEventNumber, mKeepSubscriptions);
+                                                mFabricFiltered, mEventNumber, mKeepSubscriptions, mIsUrgents);
     }
 
 private:
@@ -404,4 +409,5 @@ class SubscribeEvent : public SubscribeCommand
     chip::Optional<bool> mFabricFiltered;
     chip::Optional<chip::EventNumber> mEventNumber;
     chip::Optional<bool> mKeepSubscriptions;
+    chip::Optional<std::vector<bool>> mIsUrgents;
 };
diff --git a/examples/chip-tool/commands/clusters/WriteAttributeCommand.h b/examples/chip-tool/commands/clusters/WriteAttributeCommand.h
index 231526453775ed..93ca6d167fc41b 100644
--- a/examples/chip-tool/commands/clusters/WriteAttributeCommand.h
+++ b/examples/chip-tool/commands/clusters/WriteAttributeCommand.h
@@ -86,7 +86,7 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi
         ChipLogProgress(chipTool, "Sending WriteAttribute to cluster " ChipLogFormatMEI " on endpoint %u",
                         ChipLogValueMEI(clusterId), endpointId);
         return InteractionModelWriter::WriteAttribute(device, endpointId, clusterId, attributeId, value, mTimedInteractionTimeoutMs,
-                                                      mSuppressResponse, mDataVersion);
+                                                      mSuppressResponse, mDataVersion, mRepeatCount, mRepeatDelayInMs);
     }
 
     template <class T>
@@ -111,6 +111,8 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi
                     "If provided, do a timed write with the given timed interaction timeout.");
         AddArgument("data-version", 0, UINT32_MAX, &mDataVersion);
         AddArgument("suppressResponse", 0, 1, &mSuppressResponse);
+        AddArgument("repeat-count", 1, UINT16_MAX, &mRepeatCount);
+        AddArgument("repeat-delay-ms", 0, UINT16_MAX, &mRepeatDelayInMs);
         ModelCommand::AddArguments();
     }
 
@@ -122,4 +124,6 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi
     chip::Optional<chip::DataVersion> mDataVersion = chip::NullOptional;
     chip::Optional<bool> mSuppressResponse;
     CustomArgument mAttributeValue;
+    chip::Optional<uint16_t> mRepeatCount;
+    chip::Optional<uint16_t> mRepeatDelayInMs;
 };
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index 729c77e291a1a3..4e10e67e74b2e8 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -27,6 +27,7 @@
 #include <lib/support/TestGroupData.h>
 
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
+#include "TraceDecoder.h"
 #include "TraceHandlers.h"
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 
@@ -70,10 +71,12 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
 #endif
 
     ReturnLogErrorOnFailure(mDefaultStorage.Init());
+    ReturnLogErrorOnFailure(mOperationalKeystore.Init(&mDefaultStorage));
 
     chip::Controller::FactoryInitParams factoryInitParams;
 
     factoryInitParams.fabricIndependentStorage = &mDefaultStorage;
+    factoryInitParams.operationalKeystore      = &mOperationalKeystore;
 
     // Init group data provider that will be used for all group keys and IPKs for the
     // chip-tool-configured fabrics. This is OK to do once since the fabric tables
@@ -206,11 +209,21 @@ void CHIPCommand::StartTracing()
 
     if (mTraceFile.HasValue())
     {
-        chip::trace::SetTraceStream(new chip::trace::TraceStreamFile(mTraceFile.Value()));
+        chip::trace::AddTraceStream(new chip::trace::TraceStreamFile(mTraceFile.Value()));
     }
     else if (mTraceLog.HasValue() && mTraceLog.Value())
     {
-        chip::trace::SetTraceStream(new chip::trace::TraceStreamLog());
+        chip::trace::AddTraceStream(new chip::trace::TraceStreamLog());
+    }
+
+    if (mTraceDecode.HasValue() && mTraceDecode.Value())
+    {
+        chip::trace::TraceDecoderOptions options;
+        // The interaction model protocol is already logged, so just disable logging those.
+        options.mEnableProtocolInteractionModelResponse = false;
+        chip::trace::TraceDecoder * decoder             = new chip::trace::TraceDecoder();
+        decoder->SetOptions(options);
+        chip::trace::AddTraceStream(decoder);
     }
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 }
diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h
index c1ff2d1acad46d..1313fadeb1f664 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.h
+++ b/examples/chip-tool/commands/common/CHIPCommand.h
@@ -23,6 +23,7 @@
 #include <commands/common/CredentialIssuerCommands.h>
 #include <commands/example/ExampleCredentialIssuerCommands.h>
 #include <credentials/GroupDataProviderImpl.h>
+#include <crypto/PersistentStorageOperationalKeystore.h>
 
 #pragma once
 
@@ -69,6 +70,7 @@ class CHIPCommand : public Command
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
         AddArgument("trace_file", &mTraceFile);
         AddArgument("trace_log", 0, 1, &mTraceLog);
+        AddArgument("trace_decode", 0, 1, &mTraceDecode);
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
         AddArgument("ble-adapter", 0, UINT64_MAX, &mBleAdapterId);
     }
@@ -114,6 +116,8 @@ class CHIPCommand : public Command
 
     PersistentStorage mDefaultStorage;
     PersistentStorage mCommissionerStorage;
+    chip::PersistentStorageOperationalKeystore mOperationalKeystore;
+
     chip::Credentials::GroupDataProviderImpl mGroupDataProvider{ kMaxGroupsPerFabric, kMaxGroupKeysPerFabric };
     CredentialIssuerCommands * mCredIssuerCmds;
 
@@ -162,5 +166,6 @@ class CHIPCommand : public Command
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
     chip::Optional<char *> mTraceFile;
     chip::Optional<bool> mTraceLog;
+    chip::Optional<bool> mTraceDecode;
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 };
diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp
index a127f913ca8158..f5828f2b138326 100644
--- a/examples/chip-tool/commands/common/Command.cpp
+++ b/examples/chip-tool/commands/common/Command.cpp
@@ -215,6 +215,39 @@ bool Command::InitArgument(size_t argIndex, char * argValue)
         return CHIP_NO_ERROR == customArgument->Parse(arg.name, argValue);
     }
 
+    case ArgumentType::VectorBool: {
+        // Currently only chip::Optional<std::vector<bool>> is supported.
+        if (arg.flags != Argument::kOptional)
+        {
+            return false;
+        }
+
+        std::vector<bool> vectorArgument;
+        std::stringstream ss(argValue);
+        while (ss.good())
+        {
+            std::string valueAsString;
+            getline(ss, valueAsString, ',');
+
+            if (strcasecmp(valueAsString.c_str(), "true") == 0)
+            {
+                vectorArgument.push_back(true);
+            }
+            else if (strcasecmp(valueAsString.c_str(), "false") == 0)
+            {
+                vectorArgument.push_back(false);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        auto optionalArgument = static_cast<chip::Optional<std::vector<bool>> *>(arg.value);
+        optionalArgument->SetValue(vectorArgument);
+        return true;
+    }
+
     case ArgumentType::Vector16:
     case ArgumentType::Vector32: {
         std::vector<uint64_t> values;
@@ -623,6 +656,21 @@ size_t Command::AddArgument(const char * name, int64_t min, uint64_t max, chip::
     return AddArgumentToList(std::move(arg));
 }
 
+size_t Command::AddArgument(const char * name, int64_t min, uint64_t max, chip::Optional<std::vector<bool>> * value,
+                            const char * desc)
+{
+    Argument arg;
+    arg.type  = ArgumentType::VectorBool;
+    arg.name  = name;
+    arg.value = static_cast<void *>(value);
+    arg.min   = min;
+    arg.max   = max;
+    arg.flags = Argument::kOptional;
+    arg.desc  = desc;
+
+    return AddArgumentToList(std::move(arg));
+}
+
 size_t Command::AddArgument(const char * name, ComplexArgument * value, const char * desc)
 {
     Argument arg;
@@ -784,7 +832,12 @@ void Command::ResetArguments()
         const Argument arg      = mArgs[i];
         const ArgumentType type = arg.type;
         const uint8_t flags     = arg.flags;
-        if (type == ArgumentType::Vector16 && flags != Argument::kOptional)
+        if (type == ArgumentType::VectorBool && flags == Argument::kOptional)
+        {
+            auto vectorArgument = static_cast<std::vector<uint16_t> *>(arg.value);
+            vectorArgument->clear();
+        }
+        else if (type == ArgumentType::Vector16 && flags != Argument::kOptional)
         {
             auto vectorArgument = static_cast<std::vector<uint16_t> *>(arg.value);
             vectorArgument->clear();
diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
index 0973a9d4fec638..b9a1c2bc1cb972 100644
--- a/examples/chip-tool/commands/common/Command.h
+++ b/examples/chip-tool/commands/common/Command.h
@@ -70,6 +70,7 @@ enum ArgumentType
     Address,
     Complex,
     Custom,
+    VectorBool,
     Vector16,
     Vector32,
 };
@@ -178,6 +179,8 @@ class Command
 
     size_t AddArgument(const char * name, int64_t min, uint64_t max, std::vector<uint16_t> * value, const char * desc = "");
     size_t AddArgument(const char * name, int64_t min, uint64_t max, std::vector<uint32_t> * value, const char * desc = "");
+    size_t AddArgument(const char * name, int64_t min, uint64_t max, chip::Optional<std::vector<bool>> * value,
+                       const char * desc = "");
     size_t AddArgument(const char * name, int64_t min, uint64_t max, chip::Optional<std::vector<uint32_t>> * value,
                        const char * desc = "");
 
@@ -196,6 +199,15 @@ class Command
         return AddArgument(name, min, max, reinterpret_cast<T *>(out), desc, flags);
     }
 
+    template <typename T>
+    size_t AddArgument(const char * name, int64_t min, uint64_t max, chip::BitMask<T> * out, const char * desc = "",
+                       uint8_t flags = 0)
+    {
+        // This is a terrible hack that relies on BitMask only having the one
+        // mValue member.
+        return AddArgument(name, min, max, reinterpret_cast<T *>(out), desc, flags);
+    }
+
     template <typename T>
     size_t AddArgument(const char * name, chip::Optional<T> * value, const char * desc = "")
     {
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
index 10459305562b48..dbb3a6fbc1c5f0 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -18,8 +18,10 @@
 
 #include "InteractiveCommands.h"
 
+#include <iomanip>
 #include <readline/history.h>
 #include <readline/readline.h>
+#include <sstream>
 
 char kInteractiveModeName[]                            = "";
 constexpr const char * kInteractiveModePrompt          = ">>> ";
@@ -102,9 +104,10 @@ bool InteractiveStartCommand::ParseCommand(char * command)
     char * args[kInteractiveModeArgumentsMaxLength];
     args[0]       = kInteractiveModeName;
     int argsCount = 1;
+    std::string arg;
 
-    char * token = strtok(command, " ");
-    while (token != nullptr)
+    std::stringstream ss(command);
+    while (ss >> std::quoted(arg))
     {
         if (argsCount == kInteractiveModeArgumentsMaxLength)
         {
@@ -114,8 +117,9 @@ bool InteractiveStartCommand::ParseCommand(char * command)
             return true;
         }
 
-        args[argsCount++] = token;
-        token             = strtok(nullptr, " ");
+        char * carg = new char[arg.size() + 1];
+        strcpy(carg, arg.c_str());
+        args[argsCount++] = carg;
     }
 
     ClearLine();
@@ -123,5 +127,9 @@ bool InteractiveStartCommand::ParseCommand(char * command)
     mHandler->RunInteractive(argsCount, args);
     gIsCommandRunning = false;
 
+    // Do not delete arg[0]
+    while (--argsCount)
+        delete[] args[argsCount];
+
     return true;
 }
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
index 910940df8a2b06..1e092c51dcabd7 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.cpp
+++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -147,6 +147,7 @@ void PairingCommand::OnStatusUpdate(DevicePairingDelegate::Status status)
         break;
     case DevicePairingDelegate::Status::SecurePairingFailed:
         ChipLogError(chipTool, "Secure Pairing Failed");
+        SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE);
         break;
     }
 }
diff --git a/examples/chip-tool/config/PersistentStorage.cpp b/examples/chip-tool/config/PersistentStorage.cpp
index f0c3a8312b4c89..c2bf34349bccab 100644
--- a/examples/chip-tool/config/PersistentStorage.cpp
+++ b/examples/chip-tool/config/PersistentStorage.cpp
@@ -37,7 +37,7 @@ constexpr const char kPortKey[]             = "ListenPort";
 constexpr const char kLoggingKey[]          = "LoggingLevel";
 constexpr const char kLocalNodeIdKey[]      = "LocalNodeId";
 constexpr const char kCommissionerCATsKey[] = "CommissionerCATs";
-constexpr LogCategory kDefaultLoggingLevel  = kLogCategory_Detail;
+constexpr LogCategory kDefaultLoggingLevel  = kLogCategory_Automation;
 
 std::string GetFilename(const char * name)
 {
@@ -223,6 +223,10 @@ LogCategory PersistentStorage::GetLoggingLevel()
         {
             chipLogLevel = kLogCategory_Detail;
         }
+        else if (strcasecmp(value, "automation") == 0)
+        {
+            chipLogLevel = kLogCategory_Automation;
+        }
     }
 
     return chipLogLevel;
diff --git a/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt b/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
index 811f4f3a8d8fc3..b7a574e380173a 100644
--- a/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
+++ b/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
@@ -28,6 +28,18 @@
 
     {{~#if (hasProperty expectedConstraints "maxValue")}}VerifyOrReturn(CheckConstraintMaxValue("{{asPropertyValue}}", {{asPropertyValue}}, {{asTypedLiteral expectedConstraints.maxValue type}}));{{/if}}
 
+    {{~#if (hasProperty expectedConstraints "contains")}}
+        {{#chip_tests_iterate_expected_list expectedConstraints.contains}}
+    VerifyOrReturn(CheckConstraintContains("{{asPropertyValue}}", {{asPropertyValue}}, {{asTypedLiteral value type}}));
+        {{/chip_tests_iterate_expected_list}}
+    {{/if}}
+
+    {{~#if (hasProperty expectedConstraints "excludes")}}
+        {{#chip_tests_iterate_expected_list expectedConstraints.excludes}}
+    VerifyOrReturn(CheckConstraintExcludes("{{asPropertyValue}}", {{asPropertyValue}}, {{asTypedLiteral value type}}));
+        {{/chip_tests_iterate_expected_list}}
+    {{/if}}
+
     {{~#if (hasProperty expectedConstraints "notValue")}}
         {{#if (isLiteralNull expectedConstraints.notValue)}}
             VerifyOrReturn(CheckValueNonNull("{{asPropertyValue}}", {{asPropertyValue}}));
diff --git a/examples/chip-tool/templates/tests/partials/command_value.zapt b/examples/chip-tool/templates/tests/partials/command_value.zapt
index 7a5b9e0a23230e..d412478ac00796 100644
--- a/examples/chip-tool/templates/tests/partials/command_value.zapt
+++ b/examples/chip-tool/templates/tests/partials/command_value.zapt
@@ -60,7 +60,11 @@
       {{else if (isCharString type)}}
         chip::Span<const char>("{{definedValue}}garbage: not in length on purpose", {{utf8StringLength definedValue}});
       {{else if (isOctetString type)}}
-        chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringEscapedForCLiteral definedValue}}garbage: not in length on purpose"), {{definedValue.length}});
+        {{~#if (isHexString definedValue)}}
+          chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringFromHexString definedValue}}garbage: not in length on purpose"), {{octetStringLengthFromHexString definedValue}});
+        {{else}}
+          chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringEscapedForCLiteral definedValue}}garbage: not in length on purpose"), {{definedValue.length}});
+        {{/if}}
       {{else}}
         {{#if_is_strongly_typed_bitmap type}}
           static_cast<{{zapTypeToEncodableClusterObjectType type ns=ns}}>({{asTypedLiteral definedValue type}});
diff --git a/examples/chip-tool/templates/tests/partials/value_equals.zapt b/examples/chip-tool/templates/tests/partials/value_equals.zapt
index 2f934e60d0ca74..e387036b293662 100644
--- a/examples/chip-tool/templates/tests/partials/value_equals.zapt
+++ b/examples/chip-tool/templates/tests/partials/value_equals.zapt
@@ -52,7 +52,12 @@
     VerifyOrReturn(CheckValue{{#if (isString type)}}AsString{{/if}}("{{label}}", {{actual}}, 
       {{~#if (chip_tests_variables_has expected)}}{{expected}}
       {{else if keepAsExpected}}{{expected}}
-      {{else if (isOctetString type)}}chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringEscapedForCLiteral expected}}"), {{expected.length}})
+      {{else if (isOctetString type)}}
+        {{~#if (isHexString expected)}}
+          chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringFromHexString expected}}"), {{octetStringLengthFromHexString expected}})
+        {{else}}
+          chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringEscapedForCLiteral expected}}"), {{expected.length}})
+        {{/if}}
       {{else if (isCharString type)}}chip::CharSpan("{{expected}}", {{utf8StringLength expected}})
       {{else if (chip_tests_config_has expected)}}m{{asUpperCamelCase expected}}.HasValue() ? m{{asUpperCamelCase expected}}.Value() : {{asTypedLiteral (chip_tests_config_get_default_value expected) (chip_tests_config_get_type expected)}}
       {{else}}{{asTypedExpression expected type}}
diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto
index fd20ddbf6a5489..4ebb71508d586e 100644
--- a/examples/common/pigweed/protos/attributes_service.proto
+++ b/examples/common/pigweed/protos/attributes_service.proto
@@ -155,7 +155,6 @@ enum ClusterType {
     ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0427;
     ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0428;
     ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0429;
-    ZCL_IAS_ZONE_CLUSTER_ID = 0x0500;
     ZCL_IAS_ACE_CLUSTER_ID = 0x0501;
     ZCL_IAS_WD_CLUSTER_ID = 0x0502;
     ZCL_WAKE_ON_LAN_CLUSTER_ID = 0x0503;
@@ -170,7 +169,6 @@ enum ClusterType {
     ZCL_APPLICATION_LAUNCHER_CLUSTER_ID = 0x050C;
     ZCL_APPLICATION_BASIC_CLUSTER_ID = 0x050D;
     ZCL_ACCOUNT_LOGIN_CLUSTER_ID = 0x050E;
-    ZCL_TEST_CLUSTER_ID = 0x050F;
     ZCL_MESSAGING_CLUSTER_ID = 0x0703;
     ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID = 0x0B00;
     ZCL_METER_IDENTIFICATION_CLUSTER_ID = 0x0B01;
@@ -180,6 +178,13 @@ enum ClusterType {
     ZCL_BINDING_CLUSTER_ID = 0xF000;
     ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID = 0xF004;
     ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID = 0xFC00;
+
+    // NOTE: This is a large number that becomes negative as a 32-bit integer.
+    //
+    // Protobuf documentation states:
+    //   Enumerator constants must be in the range of a 32-bit integer. Since enum values
+    //   use varint encoding on the wire, negative values are inefficient and thus not recommended.
+    ZCL_TEST_CLUSTER_ID = -918523; // 0xFFF1FC05;
 }
 
 
diff --git a/examples/common/pigweed/protos/device_service.options b/examples/common/pigweed/protos/device_service.options
index 3f0c8f9375bb75..1435fa9208cd27 100644
--- a/examples/common/pigweed/protos/device_service.options
+++ b/examples/common/pigweed/protos/device_service.options
@@ -2,3 +2,5 @@ chip.rpc.DeviceInfo.serial_number max_size:32  // length defined in chip spec 8.
 chip.rpc.DeviceState.fabric_info max_count:2
 chip.rpc.PairingInfo.qr_code max_size:256
 chip.rpc.PairingInfo.qr_code_url max_size:256
+chip.rpc.SpakeInfo.verifier max_size:97  // kSpake2p_VerifierSerialized_Length
+chip.rpc.SpakeInfo.salt max_size:32      // kSpake2p_Max_PBKDF_Salt_Length
diff --git a/examples/common/pigweed/protos/device_service.proto b/examples/common/pigweed/protos/device_service.proto
index 771e4c82efdf4b..e926866e687147 100644
--- a/examples/common/pigweed/protos/device_service.proto
+++ b/examples/common/pigweed/protos/device_service.proto
@@ -11,6 +11,12 @@ message PairingInfo {
   string qr_code_url = 4;
 }
 
+message SpakeInfo {
+  optional bytes verifier = 1;
+  optional bytes salt = 2;
+  optional uint32 iteration_count = 3;
+}
+
 // type lengths defined in chip spec 8.2.3.1
 message DeviceInfo {
   uint32 vendor_id = 1;
@@ -43,4 +49,6 @@ service Device {
   rpc SetPairingState(PairingState) returns (pw.protobuf.Empty){}
   rpc GetPairingState(pw.protobuf.Empty) returns (PairingState){}
   rpc SetPairingInfo(PairingInfo) returns (pw.protobuf.Empty){}
+  rpc GetSpakeInfo(pw.protobuf.Empty) returns (SpakeInfo){}
+  rpc SetSpakeInfo(SpakeInfo) returns (pw.protobuf.Empty){}
 }
diff --git a/examples/common/pigweed/rpc_console/README.md b/examples/common/pigweed/rpc_console/README.md
index 09226c2eec1ceb..d433631b9e12d1 100644
--- a/examples/common/pigweed/rpc_console/README.md
+++ b/examples/common/pigweed/rpc_console/README.md
@@ -15,50 +15,50 @@ files required for CHIP.
 
 ## Building
 
-    If this is the first time using the checkout the environment must first be
-    bootstrapped to install all dependencies.
+If this is the first time using the checkout the environment must first be
+bootstrapped to install all dependencies.
 
-        ```
-        $ source <project_root>/scripts/bootstrap.sh
-        ```
+```
+$ source <project_root>/scripts/bootstrap.sh
+```
 
-    If bootstrap has previously been run, then simply activate.
+If bootstrap has previously been run, then simply activate.
 
-        ```
-        $ source <project_root>/scripts/activate.sh
-        ```
+```
+$ source <project_root>/scripts/activate.sh
+```
 
-    The python console is built and installed in the venv using gn:
+The python console is built and installed in the venv using gn:
 
-        ```
-        $ cd <project_root>/examples/common/pigweed/rpc_console
-        $ gn gen out/debug
-        $ ninja -C out/debug
-        ```
+```
+$ cd <project_root>/examples/common/pigweed/rpc_console
+$ gn gen out/debug
+$ ninja -C out/debug
+```
 
-    After building the output directory also contains a folder
-    (chip_rpc_console_wheels), with all the wheels required for the tool. These
-    can be used to install the console without needing the sdk. Simply install
-    all the wheels in the folder:
+After building the output directory also contains a folder
+(chip_rpc_console_wheels), with all the wheels required for the tool. These can
+be used to install the console without needing the sdk. Simply install all the
+wheels in the folder:
 
-        ```
-        $ cd <project_root>/examples/common/pigweed/rpc_console/out/debug
-        $ pip install chip_rpc_console_wheels/*.whl
-        ```
+```
+$ cd <project_root>/examples/common/pigweed/rpc_console/out/debug
+$ pip install chip_rpc_console_wheels/*.whl
+```
 
 ## Running
 
 To start the console provide the path to the device, for example:
 
-    ```
-    $ chip-console --device /dev/ttyUSB0
-    ```
+```
+$ chip-console --device /dev/ttyUSB0
+```
 
 Note that `chip-console` is an entry point for chip_rpc.console and could also
 be run with `python -m chip_rpc.console`.
 
 An example RPC command:
 
-    ```python
-    $ rpcs.chip.rpc.Device.GetDeviceInfo()
-    ```
+```python
+rpcs.chip.rpc.Device.GetDeviceInfo()
+```
diff --git a/examples/common/pigweed/rpc_services/Device.h b/examples/common/pigweed/rpc_services/Device.h
index d7d06d3bfc3842..56caee22d309f4 100644
--- a/examples/common/pigweed/rpc_services/Device.h
+++ b/examples/common/pigweed/rpc_services/Device.h
@@ -21,18 +21,190 @@
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/CommissionableDataProvider.h>
 
+#include "app/clusters/ota-requestor/OTARequestorInterface.h"
 #include "app/server/OnboardingCodesUtil.h"
 #include "app/server/Server.h"
 #include "credentials/FabricTable.h"
 #include "device_service/device_service.rpc.pb.h"
+#include "platform/CommissionableDataProvider.h"
 #include "platform/ConfigurationManager.h"
 #include "platform/DiagnosticDataProvider.h"
 #include "platform/PlatformManager.h"
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
 namespace chip {
 namespace rpc {
 
+namespace Internal {
+// This class supports changing the commissionable data provider values at
+// runtime using the RPCs.
+// This class is LazyInit after getting or setting any of it's values. After
+// this the class wraps the original CommissionableDataProvider, returning the
+// original values for anything which has not been overwritten.
+//
+// NOTE: Values written do not persist across a reboot.
+class CommissionableDataProviderRpcWrapper : public DeviceLayer::CommissionableDataProvider
+{
+public:
+    CHIP_ERROR GetSetupPasscode(uint32_t & setupPasscode) override
+    {
+        LazyInit();
+        if (mPasscodeOverride.has_value())
+        {
+            setupPasscode = mPasscodeOverride.value();
+            return CHIP_NO_ERROR;
+        }
+        if (mCommissionableDataProvider)
+        {
+            return mCommissionableDataProvider->GetSetupPasscode(setupPasscode);
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    // NOTE: Changing the passcode will not change the verifier or anything else
+    // this just changes the value returned from GetSetupPasscode.
+    // Using this is completely optional, and only really useful for test
+    // automation which can read the configured passcode for commissioning
+    // after it is changed.
+    CHIP_ERROR SetSetupPasscode(uint32_t setupPasscode) override
+    {
+        LazyInit();
+        mPasscodeOverride = setupPasscode;
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR GetSetupDiscriminator(uint16_t & setupDiscriminator) override
+    {
+        LazyInit();
+        if (mDiscriminatorOverride.has_value())
+        {
+            setupDiscriminator = mDiscriminatorOverride.value();
+            return CHIP_NO_ERROR;
+        }
+        if (mCommissionableDataProvider)
+        {
+            return mCommissionableDataProvider->GetSetupDiscriminator(setupDiscriminator);
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    CHIP_ERROR SetSetupDiscriminator(uint16_t setupDiscriminator) override
+    {
+        LazyInit();
+        mDiscriminatorOverride = setupDiscriminator;
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR GetSpake2pIterationCount(uint32_t & iterationCount) override
+    {
+        LazyInit();
+        if (mIterationCountOverride.has_value())
+        {
+            iterationCount = mIterationCountOverride.value();
+            return CHIP_NO_ERROR;
+        }
+        if (mCommissionableDataProvider)
+        {
+            return mCommissionableDataProvider->GetSpake2pIterationCount(iterationCount);
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    CHIP_ERROR SetSpake2pIterationCount(uint32_t iterationCount)
+    {
+        LazyInit();
+        mIterationCountOverride = iterationCount;
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR GetSpake2pSalt(MutableByteSpan & saltBuf) override
+    {
+        LazyInit();
+        if (mSaltOverride.has_value())
+        {
+            if (mSaltOverride.value().size() > saltBuf.size())
+            {
+                return CHIP_ERROR_BUFFER_TOO_SMALL;
+            }
+            std::copy(mSaltOverride.value().begin(), mSaltOverride.value().end(), saltBuf.begin());
+            saltBuf.reduce_size(mSaltOverride.value().size());
+            return CHIP_NO_ERROR;
+        }
+        if (mCommissionableDataProvider)
+        {
+            return mCommissionableDataProvider->GetSpake2pSalt(saltBuf);
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    CHIP_ERROR SetSpake2pSalt(ByteSpan saltBuf)
+    {
+        LazyInit();
+        if (sizeof(mSaltBuf) < saltBuf.size())
+        {
+            return CHIP_ERROR_BUFFER_TOO_SMALL;
+        }
+        std::copy(saltBuf.begin(), saltBuf.end(), mSaltBuf);
+        mSaltOverride = ByteSpan(mSaltBuf, saltBuf.size());
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR GetSpake2pVerifier(MutableByteSpan & verifierBuf, size_t & outVerifierLen) override
+    {
+        LazyInit();
+        if (mVerifierOverride.has_value())
+        {
+            outVerifierLen = mVerifierOverride.value().size();
+            if (mVerifierOverride.value().size() > verifierBuf.size())
+            {
+                return CHIP_ERROR_BUFFER_TOO_SMALL;
+            }
+            std::copy(mVerifierOverride.value().begin(), mVerifierOverride.value().end(), verifierBuf.begin());
+            verifierBuf.reduce_size(mVerifierOverride.value().size());
+            return CHIP_NO_ERROR;
+        }
+        if (mCommissionableDataProvider)
+        {
+            return mCommissionableDataProvider->GetSpake2pVerifier(verifierBuf, outVerifierLen);
+        }
+
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    CHIP_ERROR SetSpake2pVerifier(ByteSpan verifierBuf)
+    {
+        LazyInit();
+        if (sizeof(mVerifierBuf) < verifierBuf.size())
+        {
+            return CHIP_ERROR_BUFFER_TOO_SMALL;
+        }
+        std::copy(verifierBuf.begin(), verifierBuf.end(), mVerifierBuf);
+        mVerifierOverride = ByteSpan(mVerifierBuf, verifierBuf.size());
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    std::optional<uint16_t> mDiscriminatorOverride;
+    std::optional<uint32_t> mPasscodeOverride;
+    Spake2pVerifierSerialized mVerifierBuf;
+    std::optional<ByteSpan> mVerifierOverride;
+    uint8_t mSaltBuf[kSpake2p_Max_PBKDF_Salt_Length];
+    std::optional<ByteSpan> mSaltOverride;
+    std::optional<uint32_t> mIterationCountOverride;
+    DeviceLayer::CommissionableDataProvider * mCommissionableDataProvider = nullptr;
+
+    void LazyInit()
+    {
+        if (!mCommissionableDataProvider)
+        {
+            mCommissionableDataProvider = DeviceLayer::GetCommissionableDataProvider();
+            DeviceLayer::SetCommissionableDataProvider(this);
+        }
+    }
+};
+} // namespace Internal
+
 class Device : public pw_rpc::nanopb::Device::Service<Device>
 {
 public:
@@ -51,8 +223,20 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
 
     virtual pw::Status TriggerOta(const pw_protobuf_Empty & request, pw_protobuf_Empty & response)
     {
-        // TODO: auto err = DeviceLayer::SoftwareUpdateMgr().CheckNow();
-        return pw::Status::Unimplemented();
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(
+            [](intptr_t) {
+                chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+                if (requestor == nullptr)
+                {
+                    ChipLogError(SoftwareUpdate, "Can't get the CASESessionManager");
+                }
+                else
+                {
+                    requestor->TriggerImmediateQuery();
+                }
+            },
+            reinterpret_cast<intptr_t>(nullptr));
+        return pw::OkStatus();
     }
 
     virtual pw::Status SetPairingState(const chip_rpc_PairingState & request, pw_protobuf_Empty & response)
@@ -141,7 +325,7 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
             response.has_pairing_info           = true;
         }
 
-        if (DeviceLayer::ConfigurationMgr().GetSerialNumber(response.serial_number, sizeof(response.serial_number)) ==
+        if (DeviceLayer::GetDeviceInstanceInfoProvider()->GetSerialNumber(response.serial_number, sizeof(response.serial_number)) ==
             CHIP_NO_ERROR)
         {
             snprintf(response.serial_number, sizeof(response.serial_number), CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER);
@@ -160,15 +344,65 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
         return pw::OkStatus();
     }
 
+    virtual pw::Status GetSpakeInfo(const pw_protobuf_Empty & request, chip_rpc_SpakeInfo & response)
+    {
+        size_t serializedVerifierLen = 0;
+        MutableByteSpan verifierSpan{ response.verifier.bytes };
+        if (DeviceLayer::GetCommissionableDataProvider()->GetSpake2pVerifier(verifierSpan, serializedVerifierLen) == CHIP_NO_ERROR)
+        {
+            response.verifier.size = verifierSpan.size();
+            response.has_verifier  = true;
+        }
+
+        MutableByteSpan saltSpan{ response.salt.bytes };
+        if (DeviceLayer::GetCommissionableDataProvider()->GetSpake2pSalt(saltSpan) == CHIP_NO_ERROR)
+        {
+            response.salt.size = saltSpan.size();
+            response.has_salt  = true;
+        }
+
+        if (DeviceLayer::GetCommissionableDataProvider()->GetSpake2pIterationCount(response.iteration_count) == CHIP_NO_ERROR)
+        {
+            response.has_iteration_count = true;
+        }
+
+        return pw::OkStatus();
+    }
+
+    virtual pw::Status SetSpakeInfo(const chip_rpc_SpakeInfo & request, pw_protobuf_Empty & response)
+    {
+        if (request.has_salt)
+        {
+            mCommissionableDataProvider.SetSpake2pSalt(ByteSpan(request.salt.bytes, request.salt.size));
+        }
+        if (request.has_iteration_count)
+        {
+            mCommissionableDataProvider.SetSpake2pIterationCount(request.iteration_count);
+        }
+        if (request.has_verifier)
+        {
+            mCommissionableDataProvider.SetSpake2pVerifier(ByteSpan(request.verifier.bytes, request.verifier.size));
+        }
+        return pw::OkStatus();
+    }
+
+    // NOTE: Changing the passcode will not change the verifier or anything else
+    // this just changes the value returned from GetSetupPasscode.
+    // Using this is completely optional, and only really useful for test
+    // automation which can read the configured passcode for commissioning
+    // after it is changed.
     virtual pw::Status SetPairingInfo(const chip_rpc_PairingInfo & request, pw_protobuf_Empty & response)
     {
-        if (DeviceLayer::GetCommissionableDataProvider()->SetSetupPasscode(request.code) != CHIP_NO_ERROR ||
-            DeviceLayer::GetCommissionableDataProvider()->SetSetupDiscriminator(request.discriminator) != CHIP_NO_ERROR)
+        if (mCommissionableDataProvider.SetSetupPasscode(request.code) != CHIP_NO_ERROR ||
+            mCommissionableDataProvider.SetSetupDiscriminator(request.discriminator) != CHIP_NO_ERROR)
         {
             return pw::Status::Unknown();
         }
         return pw::OkStatus();
     }
+
+private:
+    Internal::CommissionableDataProviderRpcWrapper mCommissionableDataProvider;
 };
 
 } // namespace rpc
diff --git a/examples/common/tracing/.gn b/examples/common/tracing/.gn
new file mode 100644
index 00000000000000..5d1ce757507582
--- /dev/null
+++ b/examples/common/tracing/.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  import("//args.gni")
+}
diff --git a/examples/common/tracing/BUILD.gn b/examples/common/tracing/BUILD.gn
index 0ec67ae4e07a5e..0fe3e13b3f677a 100644
--- a/examples/common/tracing/BUILD.gn
+++ b/examples/common/tracing/BUILD.gn
@@ -27,3 +27,48 @@ source_set("trace_handlers") {
 
   public_configs = [ ":default_config" ]
 }
+
+source_set("trace_handlers_decoder") {
+  sources = [
+    "TraceDecoder.cpp",
+    "TraceHandlers.cpp",
+    "decoder/TraceDecoderProtocols.cpp",
+    "decoder/bdx/Decoder.cpp",
+    "decoder/echo/Decoder.cpp",
+    "decoder/interaction_model/Decoder.cpp",
+    "decoder/interaction_model/DecoderCustomLog.cpp",
+    "decoder/logging/Log.cpp",
+    "decoder/logging/ToCertificateString.cpp",
+    "decoder/secure_channel/Decoder.cpp",
+    "decoder/udc/Decoder.cpp",
+  ]
+
+  public_configs = [ ":default_config" ]
+
+  deps = [ "${chip_root}/src/lib" ]
+  public_deps = [ "${chip_root}/third_party/jsoncpp" ]
+}
+
+executable("chip-trace-decoder") {
+  sources = [
+    "TraceDecoder.cpp",
+    "TraceDecoderArgumentParser.cpp",
+    "decoder/TraceDecoderProtocols.cpp",
+    "decoder/bdx/Decoder.cpp",
+    "decoder/echo/Decoder.cpp",
+    "decoder/interaction_model/Decoder.cpp",
+    "decoder/interaction_model/DecoderCustomLog.cpp",
+    "decoder/logging/Log.cpp",
+    "decoder/logging/ToCertificateString.cpp",
+    "decoder/secure_channel/Decoder.cpp",
+    "decoder/udc/Decoder.cpp",
+    "main.cpp",
+  ]
+
+  output_dir = root_out_dir
+
+  public_deps = [
+    "${chip_root}/src/lib",
+    "${chip_root}/third_party/jsoncpp",
+  ]
+}
diff --git a/examples/common/tracing/TraceDecoder.cpp b/examples/common/tracing/TraceDecoder.cpp
new file mode 100644
index 00000000000000..00c9bb96d9d767
--- /dev/null
+++ b/examples/common/tracing/TraceDecoder.cpp
@@ -0,0 +1,399 @@
+/*
+ *   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 "TraceDecoder.h"
+#include "decoder/TraceDecoderProtocols.h"
+#include "decoder/logging/Log.h"
+
+#include <fstream>
+#include <lib/core/CHIPVendorIdentifiers.hpp>
+#include <lib/support/BytesToHex.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/StringBuilder.h>
+#include <transport/raw/MessageHeader.h>
+
+constexpr uint16_t kMaxLineLen    = 4096;
+constexpr const char * jsonPrefix = "    json\t";
+
+// Json keys
+constexpr const char * kProtocolIdKey                = "protocol_id";
+constexpr const char * kProtocolCodeKey              = "protocol_opcode";
+constexpr const char * kSessionIdKey                 = "session_id";
+constexpr const char * kExchangeIdKey                = "exchange_id";
+constexpr const char * kMessageCounterKey            = "msg_counter";
+constexpr const char * kSecurityFlagsKey             = "security_flags";
+constexpr const char * kMessageFlagsKey              = "msg_flags";
+constexpr const char * kSourceNodeIdKey              = "source_node_id";
+constexpr const char * kDestinationNodeIdKey         = "dest_node_id";
+constexpr const char * kDestinationGroupIdKey        = "group_id";
+constexpr const char * kExchangeFlagsKey             = "exchange_flags";
+constexpr const char * kIsInitiatorKey               = "is_initiator";
+constexpr const char * kNeedsAckKey                  = "is_ack_requested";
+constexpr const char * kAckMsgKey                    = "acknowledged_msg_counter";
+constexpr const char * kPayloadDataKey               = "payload_hex";
+constexpr const char * kPayloadSizeKey               = "payload_size";
+constexpr const char * kPayloadEncryptedDataKey      = "payload_hex_encrypted";
+constexpr const char * kPayloadEncryptedSizeKey      = "payload_size_encrypted";
+constexpr const char * kPayloadEncryptedBufferPtrKey = "buffer_ptr";
+constexpr const char * kSourceKey                    = "source";
+constexpr const char * kDestinationKey               = "destination";
+
+namespace chip {
+namespace trace {
+
+using namespace logging;
+
+CHIP_ERROR TraceDecoder::ReadFile(const char * fp)
+{
+    std::ifstream file(fp);
+    VerifyOrReturnError(file.is_open(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    char line[kMaxLineLen];
+    while (file.getline(line, sizeof(line)))
+    {
+        ReturnErrorOnFailure(ReadString(line));
+    }
+
+    file.close();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::ReadString(const char * str)
+{
+    if (strncmp(str, jsonPrefix, strlen(jsonPrefix)) != 0)
+    {
+        // Not a json string. Ignore it.
+        return CHIP_NO_ERROR;
+    }
+    str += strlen(jsonPrefix);
+
+    Json::Reader reader;
+
+    if (mJsonBuffer.empty())
+    {
+        VerifyOrReturnError(reader.parse(str, mJsonBuffer), CHIP_ERROR_INVALID_ARGUMENT);
+        VerifyOrReturnError(mJsonBuffer.isMember(kPayloadDataKey) && mJsonBuffer.isMember(kPayloadSizeKey),
+                            CHIP_ERROR_INCORRECT_STATE);
+        return CHIP_NO_ERROR;
+    }
+
+    Json::Value json;
+    VerifyOrReturnError(reader.parse(str, json), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // If there is a source, then it means the previously saved payload is an encrypted to decode, otherwise
+    // the previously saved payload is the non encrypted version, and the current decoded one is the encrypted version.
+    if (mJsonBuffer.isMember(kSourceKey))
+    {
+        json[kPayloadEncryptedDataKey] = mJsonBuffer[kPayloadDataKey];
+        json[kPayloadEncryptedSizeKey] = mJsonBuffer[kPayloadSizeKey];
+    }
+    else
+    {
+        auto data                      = json[kPayloadDataKey];
+        auto size                      = json[kPayloadSizeKey];
+        json[kPayloadDataKey]          = mJsonBuffer[kPayloadDataKey];
+        json[kPayloadSizeKey]          = mJsonBuffer[kPayloadSizeKey];
+        json[kPayloadEncryptedDataKey] = data;
+        json[kPayloadEncryptedSizeKey] = size;
+    }
+    mJsonBuffer.removeMember(kPayloadDataKey);
+    mJsonBuffer.removeMember(kPayloadSizeKey);
+
+    // If there is additional data in the previously saved json copy all of it.
+    for (const auto & key : mJsonBuffer.getMemberNames())
+    {
+        json[key] = mJsonBuffer[key];
+        mJsonBuffer.removeMember(key);
+    }
+
+    VerifyOrReturnError(json.isMember(kSourceKey) || json.isMember(kDestinationKey), CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(json.isMember(kProtocolIdKey), CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(json.isMember(kProtocolCodeKey), CHIP_ERROR_INCORRECT_STATE);
+
+    return LogJSON(json);
+}
+
+CHIP_ERROR TraceDecoder::LogJSON(Json::Value & json)
+{
+    uint32_t protocol   = json[kProtocolIdKey].asLargestUInt();
+    uint16_t vendorId   = protocol >> 16;
+    uint16_t protocolId = protocol & 0xFFFF;
+    if (!mOptions.IsProtocolEnabled(chip::Protocols::Id(chip::VendorId(vendorId), protocolId)))
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    if (!mOptions.mEnableMessageInitiator && json.isMember(kDestinationKey))
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    if (!mOptions.mEnableMessageResponder && json.isMember(kSourceKey))
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    bool isResponse = json.isMember(kSourceKey) ? true : false;
+    ReturnErrorOnFailure(LogAndConsumeProtocol(json));
+    ReturnErrorOnFailure(MaybeLogAndConsumeHeaderFlags(json));
+    ReturnErrorOnFailure(MaybeLogAndConsumeEncryptedPayload(json));
+    ReturnErrorOnFailure(MaybeLogAndConsumePayload(json, isResponse));
+    ReturnErrorOnFailure(MaybeLogAndConsumeOthers(json));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumeHeaderFlags(Json::Value & json)
+{
+    auto scopedIndent = ScopedLogIndent("Header Flags");
+    ReturnErrorOnFailure(MaybeLogAndConsumeSecurityFlags(json));
+    ReturnErrorOnFailure(MaybeLogAndConsumeMessageFlags(json));
+    ReturnErrorOnFailure(MaybeLogAndConsumeExchangeFlags(json));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumeEncryptedPayload(Json::Value & json)
+{
+    if (mOptions.mEnableDataEncryptedPayload)
+    {
+        size_t size = static_cast<uint16_t>(json[kPayloadEncryptedSizeKey].asLargestUInt());
+        if (size)
+        {
+            auto payload       = json[kPayloadEncryptedDataKey].asString();
+            auto bufferPtr     = json[kPayloadEncryptedBufferPtrKey].asString();
+            auto scoppedIndent = ScopedLogIndentWithSize("Encrypted Payload", size);
+            Log("data", payload.c_str());
+            Log("buffer_ptr", bufferPtr.c_str());
+        }
+    }
+    json.removeMember(kPayloadEncryptedSizeKey);
+    json.removeMember(kPayloadEncryptedDataKey);
+    json.removeMember(kPayloadEncryptedBufferPtrKey);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumeOthers(Json::Value & json)
+{
+    std::vector<std::string> keys = json.getMemberNames();
+    if (keys.size())
+    {
+        auto scopedIndent = ScopedLogIndent("Additional Fields");
+        for (std::vector<std::string>::const_iterator it = keys.begin(); it != keys.end(); ++it)
+        {
+            auto key   = (*it).c_str();
+            auto value = json[key].asString();
+            Log(key, value.c_str());
+        }
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::LogAndConsumeProtocol(Json::Value & json)
+{
+    char protocolInfo[256]  = {};
+    char protocolDetail[32] = {};
+
+    auto id     = json[kProtocolIdKey].asLargestUInt();
+    auto opcode = static_cast<uint8_t>(json[kProtocolCodeKey].asLargestUInt());
+
+    uint16_t vendorId   = (id >> 16);
+    uint16_t protocolId = (id & 0xFFFF);
+
+    chip::StringBuilderBase builder(protocolInfo, sizeof(protocolInfo));
+
+    builder.Add(json.isMember(kSourceKey) ? "<< from " : ">> to ");
+    builder.Add(json.isMember(kSourceKey) ? json[kSourceKey].asCString() : json[kDestinationKey].asCString());
+
+    builder.Add(" ");
+    auto msgCounter = static_cast<uint32_t>(json[kMessageCounterKey].asLargestUInt());
+    memset(protocolDetail, '\0', sizeof(protocolDetail));
+    snprintf(protocolDetail, sizeof(protocolDetail), "| %u |", msgCounter);
+    builder.Add(protocolDetail);
+
+    builder.Add(" [");
+    builder.Add(ToProtocolName(id));
+
+    builder.Add("  ");
+    memset(protocolDetail, '\0', sizeof(protocolDetail));
+    snprintf(protocolDetail, sizeof(protocolDetail), "(%u)", protocolId);
+    builder.Add(protocolDetail);
+
+    builder.Add(" / ");
+    builder.Add(ToProtocolMessageTypeName(id, opcode));
+
+    builder.Add(" ");
+    memset(protocolDetail, '\0', sizeof(protocolDetail));
+    snprintf(protocolDetail, sizeof(protocolDetail), "(0x%02x)", opcode);
+    builder.Add(protocolDetail);
+
+    if (vendorId != chip::VendorId::Common)
+    {
+        builder.Add(" / VendorId = ");
+        builder.Add(vendorId);
+    }
+
+    builder.Add(" / Session = ");
+    builder.Add(static_cast<uint16_t>(json[kSessionIdKey].asLargestUInt()));
+
+    builder.Add(" / Exchange = ");
+    builder.Add(static_cast<uint16_t>(json[kExchangeIdKey].asLargestUInt()));
+    builder.Add("]");
+
+    ChipLogProgress(DataManagement, "%s", builder.c_str());
+
+    json.removeMember(kSourceKey);
+    json.removeMember(kDestinationKey);
+    json.removeMember(kSessionIdKey);
+    json.removeMember(kExchangeIdKey);
+    json.removeMember(kMessageCounterKey);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumePayload(Json::Value & json, bool isResponse)
+{
+    auto size = static_cast<uint16_t>(json[kPayloadSizeKey].asLargestUInt());
+    if (size)
+    {
+        bool shouldDecode = !isResponse || mOptions.mEnableProtocolInteractionModelResponse;
+        auto payload      = json[kPayloadDataKey].asString();
+        auto protocolId   = json[kProtocolIdKey].asLargestUInt();
+        auto protocolCode = json[kProtocolCodeKey].asLargestUInt();
+        ReturnErrorOnFailure(LogAsProtocolMessage(protocolId, protocolCode, payload.c_str(), payload.size(), shouldDecode));
+        Log(" ");
+    }
+
+    json.removeMember(kPayloadDataKey);
+    json.removeMember(kPayloadSizeKey);
+    json.removeMember(kProtocolIdKey);
+    json.removeMember(kProtocolCodeKey);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumeSecurityFlags(Json::Value & json)
+{
+    VerifyOrReturnError(json.isMember(kSecurityFlagsKey), CHIP_NO_ERROR);
+
+    auto flags = static_cast<uint8_t>(json[kSecurityFlagsKey].asLargestUInt());
+    if (flags)
+    {
+        auto scopedIndent = ScopedLogIndentWithFlags("Security", flags);
+
+        if (flags & to_underlying(chip::Header::SecFlagValues::kPrivacyFlag))
+        {
+            Log("Privacy", "true");
+        }
+
+        if (flags & to_underlying(chip::Header::SecFlagValues::kControlMsgFlag))
+        {
+            Log("ControlMsg", "true");
+        }
+
+        if (flags & to_underlying(chip::Header::SecFlagValues::kMsgExtensionFlag))
+        {
+            Log("MsgExtension", "true");
+        }
+    }
+
+    json.removeMember(kSecurityFlagsKey);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumeMessageFlags(Json::Value & json)
+{
+    VerifyOrReturnError(json.isMember(kMessageFlagsKey), CHIP_NO_ERROR);
+
+    auto flags = static_cast<uint8_t>(json[kMessageFlagsKey].asLargestUInt());
+    if (flags)
+    {
+        auto scopedIndent = ScopedLogIndentWithFlags("Message", flags);
+
+        if (flags & to_underlying(chip::Header::MsgFlagValues::kSourceNodeIdPresent))
+        {
+            auto id = json[kSourceNodeIdKey].asLargestUInt();
+            LogAsHex("SourceNodeId", id);
+        }
+
+        if (flags & to_underlying(chip::Header::MsgFlagValues::kDestinationNodeIdPresent))
+        {
+            auto id = json[kDestinationNodeIdKey].asLargestUInt();
+            LogAsHex("DestinationNodeId", id);
+        }
+
+        if (flags & to_underlying(chip::Header::MsgFlagValues::kDestinationGroupIdPresent))
+        {
+            auto id = static_cast<uint16_t>(json[kDestinationGroupIdKey].asLargestUInt());
+            LogAsHex("DestinationGroupIdPresent", id);
+        }
+    }
+
+    json.removeMember(kMessageFlagsKey);
+    json.removeMember(kSourceNodeIdKey);
+    json.removeMember(kDestinationNodeIdKey);
+    json.removeMember(kDestinationGroupIdKey);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TraceDecoder::MaybeLogAndConsumeExchangeFlags(Json::Value & json)
+{
+    VerifyOrReturnError(json.isMember(kExchangeFlagsKey), CHIP_NO_ERROR);
+
+    auto flags = static_cast<uint8_t>(json[kExchangeFlagsKey].asLargestUInt());
+    if (flags)
+    {
+
+        auto scopedIndent = ScopedLogIndentWithFlags("Exchange", flags);
+
+        if (flags & to_underlying(chip::Header::ExFlagValues::kExchangeFlag_Initiator))
+        {
+            ChipLogDetail(DataManagement, "        Initiator = true");
+        }
+
+        if (flags & to_underlying(chip::Header::ExFlagValues::kExchangeFlag_AckMsg))
+        {
+            auto ackMsgCounter = static_cast<uint32_t>(json[kAckMsgKey].asLargestUInt());
+            Log("AckMsg", ackMsgCounter);
+        }
+
+        if (flags & to_underlying(chip::Header::ExFlagValues::kExchangeFlag_NeedsAck))
+        {
+            Log("NeedsAck", "true");
+        }
+
+        if (flags & to_underlying(chip::Header::ExFlagValues::kExchangeFlag_SecuredExtension))
+        {
+            Log("SecuredExtension", "true");
+        }
+
+        if (flags & to_underlying(chip::Header::ExFlagValues::kExchangeFlag_VendorIdPresent))
+        {
+            Log("VendorIdPresent", "true");
+        }
+    }
+
+    json.removeMember(kExchangeFlagsKey);
+    json.removeMember(kIsInitiatorKey);
+    json.removeMember(kAckMsgKey);
+    json.removeMember(kNeedsAckKey);
+    return CHIP_NO_ERROR;
+}
+
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/TraceDecoder.h b/examples/common/tracing/TraceDecoder.h
new file mode 100644
index 00000000000000..cc8dbd2374f9d5
--- /dev/null
+++ b/examples/common/tracing/TraceDecoder.h
@@ -0,0 +1,67 @@
+/*
+ *   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 "TraceDecoderOptions.h"
+#include "TraceHandlers.h"
+
+#include <json/json.h>
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace trace {
+
+class TraceDecoder : public TraceStream
+{
+public:
+    CHIP_ERROR ReadFile(const char * fp);
+    CHIP_ERROR ReadString(const char * str);
+
+    void SetOptions(TraceDecoderOptions options) { mOptions = options; }
+
+    // TraceStream Interface
+    void StartEvent(const std::string & label) override { ReadString(label.c_str()); }
+
+    void AddField(const std::string & tag, const std::string & data) override
+    {
+        char buffer[2048] = {};
+        snprintf(buffer, sizeof(buffer), "    %s\t %s", tag.c_str(), data.c_str());
+        ReadString(buffer);
+    }
+
+    void FinishEvent() override {}
+
+private:
+    CHIP_ERROR LogJSON(Json::Value & value);
+    CHIP_ERROR LogAndConsumeProtocol(Json::Value & value);
+    CHIP_ERROR MaybeLogAndConsumeHeaderFlags(Json::Value & value);
+    CHIP_ERROR MaybeLogAndConsumeSecurityFlags(Json::Value & value);
+    CHIP_ERROR MaybeLogAndConsumeMessageFlags(Json::Value & value);
+    CHIP_ERROR MaybeLogAndConsumeExchangeFlags(Json::Value & value);
+    CHIP_ERROR MaybeLogAndConsumePayload(Json::Value & value, bool isResponse);
+    CHIP_ERROR MaybeLogAndConsumeEncryptedPayload(Json::Value & value);
+    CHIP_ERROR MaybeLogAndConsumeOthers(Json::Value & value);
+
+private:
+    TraceDecoderOptions mOptions;
+    Json::Value mJsonBuffer;
+};
+
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/TraceDecoderArgumentParser.cpp b/examples/common/tracing/TraceDecoderArgumentParser.cpp
new file mode 100644
index 00000000000000..530cbe62c070a1
--- /dev/null
+++ b/examples/common/tracing/TraceDecoderArgumentParser.cpp
@@ -0,0 +1,150 @@
+/*
+ *   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 "TraceDecoderArgumentParser.h"
+
+using namespace chip::ArgParser;
+
+namespace {
+
+TraceDecoderArgumentParser gTraceDecoderArgumentParser;
+
+constexpr unsigned kAppUsageLength = 64;
+
+// Follow the code style of command line arguments in case we need to add more options in the future.
+enum
+{
+    kProgramOption_LogFile                                  = 0x1000,
+    kProgramOption_DisableProtocolSecureChannel             = 0x1001,
+    kProgramOption_DisableProtocolInteractionModel          = 0x1002,
+    kProgramOption_DisableProtocolBDX                       = 0x1003,
+    kProgramOption_DisableProtocolUserDirectedCommissioning = 0x1004,
+    kProgramOption_DisableProtocolEcho                      = 0x1005,
+    kProgramOption_DisableMessageInitiator                  = 0x1006,
+    kProgramOption_DisableMessageResponder                  = 0x1007,
+    kProgramOption_DisableDataEncryptedPayload              = 0x1008,
+};
+
+OptionDef sProgramOptionDefs[] = {
+    { "source", kArgumentRequired, kProgramOption_LogFile },
+    // Protocol
+    { "disable-protocol-secure-channel", kNoArgument, kProgramOption_DisableProtocolSecureChannel },
+    { "disable-protocol-interaction-model", kNoArgument, kProgramOption_DisableProtocolInteractionModel },
+    { "disable-protocol-bdx", kNoArgument, kProgramOption_DisableProtocolBDX },
+    { "disable-protocol-user-directed-commissioning", kNoArgument, kProgramOption_DisableProtocolUserDirectedCommissioning },
+    { "disable-protocol-echo", kNoArgument, kProgramOption_DisableProtocolEcho },
+    // Message
+    { "disable-message-initiator", kNoArgument, kProgramOption_DisableMessageInitiator },
+    { "disable-message-responder", kNoArgument, kProgramOption_DisableMessageResponder },
+    // Data
+    { "disable-data-encrypted-payload", kNoArgument, kProgramOption_DisableDataEncryptedPayload },
+    {}
+};
+
+const char * sProgramOptionHelp = "  --source <filepath>\n"
+                                  "       The log file to decode.\n"
+                                  // Protocol
+                                  "  --disable-protocol-secure-channel\n"
+                                  "       Disable Secure Channel protocol logging\n"
+                                  "  --disable-protocol-interaction-model\n"
+                                  "       Disable Interaction Model protocol logging\n"
+                                  "  --disable-protocol-bdx\n"
+                                  "       Disable BDX protocol logging\n"
+                                  "  --disable-protocol-user-directed-commissioning\n"
+                                  "       Disable User Directed Commissioning protocol logging\n"
+                                  "  --disable-protocol-echo\n"
+                                  "       Disable Echo protocol logging\n"
+                                  // Message
+                                  "  --disable-message-initiator\n"
+                                  "       Disable Initiator message logging\n"
+                                  "  --disable-message-responder\n"
+                                  "       Disable Responder message logging\n"
+                                  // Data
+                                  "  --disable-data-encrypted-payload\n"
+                                  "       Disable encrypted payload logging\n"
+                                  "\n";
+
+bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier, const char * aName, const char * aValue)
+{
+    bool retval = true;
+
+    switch (aIdentifier)
+    {
+    // Protocol
+    case kProgramOption_LogFile:
+        gTraceDecoderArgumentParser.logFile = aValue;
+        break;
+    case kProgramOption_DisableProtocolSecureChannel:
+        gTraceDecoderArgumentParser.options.mEnableProtocolSecureChannel = false;
+        break;
+    case kProgramOption_DisableProtocolInteractionModel:
+        gTraceDecoderArgumentParser.options.mEnableProtocolInteractionModel = false;
+        break;
+    case kProgramOption_DisableProtocolBDX:
+        gTraceDecoderArgumentParser.options.mEnableProtocolBDX = false;
+        break;
+    case kProgramOption_DisableProtocolUserDirectedCommissioning:
+        gTraceDecoderArgumentParser.options.mEnableProtocolUserDirectedCommissioning = false;
+        break;
+    case kProgramOption_DisableProtocolEcho:
+        gTraceDecoderArgumentParser.options.mEnableProtocolEcho = false;
+        break;
+    // Message
+    case kProgramOption_DisableMessageInitiator:
+        gTraceDecoderArgumentParser.options.mEnableMessageInitiator = false;
+        break;
+    case kProgramOption_DisableMessageResponder:
+        gTraceDecoderArgumentParser.options.mEnableMessageResponder = false;
+        break;
+    // Data
+    case kProgramOption_DisableDataEncryptedPayload:
+        gTraceDecoderArgumentParser.options.mEnableDataEncryptedPayload = false;
+        break;
+    default:
+        chip::ArgParser::PrintArgError("%s: INTERNAL ERROR: Unhandled option: %s\n", aProgram, aName);
+        retval = false;
+        break;
+    }
+
+    return (retval);
+}
+
+OptionSet sProgramOptions = { HandleOption, sProgramOptionDefs, "GENERAL OPTIONS", sProgramOptionHelp };
+
+OptionSet * sProgramOptionSets[] = { &sProgramOptions, nullptr, nullptr };
+} // namespace
+
+TraceDecoderArgumentParser & TraceDecoderArgumentParser::GetInstance()
+{
+    return gTraceDecoderArgumentParser;
+}
+
+CHIP_ERROR TraceDecoderArgumentParser::ParseArguments(int argc, char * const argv[])
+{
+    char usage[kAppUsageLength];
+    snprintf(usage, kAppUsageLength, "Usage: %s [options]", argv[0]);
+
+    HelpOptions helpOptions(argv[0], usage, "1.0");
+    sProgramOptionSets[1] = &helpOptions;
+
+    if (!ParseArgs(argv[0], argc, argv, sProgramOptionSets))
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/common/tracing/TraceDecoderArgumentParser.h b/examples/common/tracing/TraceDecoderArgumentParser.h
new file mode 100644
index 00000000000000..e620d95afde26d
--- /dev/null
+++ b/examples/common/tracing/TraceDecoderArgumentParser.h
@@ -0,0 +1,32 @@
+/*
+ *   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 "TraceDecoderOptions.h"
+
+#include <lib/support/CHIPArgParser.hpp>
+
+struct TraceDecoderArgumentParser
+{
+    chip::trace::TraceDecoderOptions options;
+    const char * logFile = nullptr;
+
+    static TraceDecoderArgumentParser & GetInstance();
+    CHIP_ERROR ParseArguments(int argc, char * const argv[]);
+};
diff --git a/examples/common/tracing/TraceDecoderOptions.h b/examples/common/tracing/TraceDecoderOptions.h
new file mode 100644
index 00000000000000..a2e12f4fc89d3f
--- /dev/null
+++ b/examples/common/tracing/TraceDecoderOptions.h
@@ -0,0 +1,66 @@
+/*
+ *   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 <protocols/Protocols.h>
+
+namespace chip {
+namespace trace {
+
+struct TraceDecoderOptions
+{
+    // Protocol
+    bool mEnableProtocolSecureChannel             = true;
+    bool mEnableProtocolInteractionModel          = true;
+    bool mEnableProtocolBDX                       = true;
+    bool mEnableProtocolUserDirectedCommissioning = true;
+    bool mEnableProtocolEcho                      = true;
+
+    // Disable the decoding of interaction model responses
+    bool mEnableProtocolInteractionModelResponse = true;
+
+    // Message
+    bool mEnableMessageInitiator = true;
+    bool mEnableMessageResponder = true;
+
+    // Data
+    bool mEnableDataEncryptedPayload = true;
+
+    bool IsProtocolEnabled(chip::Protocols::Id id)
+    {
+        switch (id.ToFullyQualifiedSpecForm())
+        {
+        case chip::Protocols::SecureChannel::Id.ToFullyQualifiedSpecForm():
+            return mEnableProtocolSecureChannel;
+        case chip::Protocols::InteractionModel::Id.ToFullyQualifiedSpecForm():
+            return mEnableProtocolInteractionModel;
+        case chip::Protocols::BDX::Id.ToFullyQualifiedSpecForm():
+            return mEnableProtocolBDX;
+        case chip::Protocols::UserDirectedCommissioning::Id.ToFullyQualifiedSpecForm():
+            return mEnableProtocolUserDirectedCommissioning;
+        case chip::Protocols::Echo::Id.ToFullyQualifiedSpecForm():
+            return mEnableProtocolEcho;
+        default:
+            return false;
+        }
+    }
+};
+
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/TraceHandlers.cpp b/examples/common/tracing/TraceHandlers.cpp
index 96be5808c65c54..1ffcb204882a0e 100644
--- a/examples/common/tracing/TraceHandlers.cpp
+++ b/examples/common/tracing/TraceHandlers.cpp
@@ -39,66 +39,62 @@ namespace {
 class TraceOutput
 {
 public:
-    ~TraceOutput() { DeleteStream(); }
+    ~TraceOutput() { UnregisterAllStreams(); }
 
-    void SetStream(TraceStream * stream)
+    void RegisterStream(TraceStream * stream)
     {
         std::lock_guard<std::mutex> guard(mLock);
-        if (mStream)
+        mStreams.push_back(stream);
+    }
+
+    void UnregisterAllStreams()
+    {
+        for (auto stream : mStreams)
         {
-            delete mStream;
-            mStream = nullptr;
+            delete stream;
         }
-        mStream = stream;
+        mStreams.clear();
     }
 
-    void DeleteStream() { SetStream(nullptr); }
-
     void StartEvent(const std::string & label)
     {
         std::lock_guard<std::mutex> guard(mLock);
-        if (mStream)
+        for (auto stream : mStreams)
         {
-            mStream->StartEvent(label);
+            stream->StartEvent(label);
         }
     }
 
     void AddField(const std::string & tag, const std::string & data)
     {
         std::lock_guard<std::mutex> guard(mLock);
-        if (mStream)
+        for (auto stream : mStreams)
         {
-            mStream->AddField(tag, data);
+            stream->AddField(tag, data);
         }
     }
 
     void FinishEvent()
     {
         std::lock_guard<std::mutex> guard(mLock);
-        if (mStream)
+        for (auto stream : mStreams)
         {
-            mStream->FinishEvent();
+            stream->FinishEvent();
         }
     }
 
     bool HasStreamAvailable() const
     {
         std::lock_guard<std::mutex> guard(mLock);
-        return (mStream != nullptr);
+        return (mStreams.size());
     }
 
 private:
     mutable std::mutex mLock;
-    TraceStream * mStream = nullptr;
-};
-
-struct TraceHandlerContext
-{
-    TraceOutput * sink;
+    std::vector<TraceStream *> mStreams;
 };
 
-TraceOutput gTraceOutput;
-TraceHandlerContext gTraceHandlerContext = { .sink = &gTraceOutput };
+TraceOutput gTraceOutputs;
 
 std::string AsJsonKey(const std::string & key, const std::string & value, bool prepend_comma)
 {
@@ -247,8 +243,7 @@ std::string PreparedSecureMessageDataToJson(const TracePreparedSecureMessageData
 
 void SecureMessageSentHandler(const TraceSecureMessageSentData * eventData)
 {
-    TraceOutput * sink = gTraceHandlerContext.sink;
-    if (!sink->HasStreamAvailable())
+    if (!gTraceOutputs.HasStreamAvailable())
     {
         return;
     }
@@ -263,15 +258,14 @@ void SecureMessageSentHandler(const TraceSecureMessageSentData * eventData)
     jsonBody += AsFirstJsonKey("payload_hex", AsJsonHexString(eventData->packetPayload, eventData->packetSize));
     jsonBody += "}";
 
-    sink->StartEvent(std::string{ kTraceMessageEvent } + "." + kTraceMessageSentDataFormat);
-    sink->AddField("json", jsonBody);
-    sink->FinishEvent();
+    gTraceOutputs.StartEvent(std::string{ kTraceMessageEvent } + "." + kTraceMessageSentDataFormat);
+    gTraceOutputs.AddField("json", jsonBody);
+    gTraceOutputs.FinishEvent();
 }
 
 void SecureMessageReceivedHandler(const TraceSecureMessageReceivedData * eventData)
 {
-    TraceOutput * sink = gTraceHandlerContext.sink;
-    if (!sink->HasStreamAvailable())
+    if (!gTraceOutputs.HasStreamAvailable())
     {
         return;
     }
@@ -288,37 +282,35 @@ void SecureMessageReceivedHandler(const TraceSecureMessageReceivedData * eventDa
     jsonBody += AsFirstJsonKey("payload_hex", AsJsonHexString(eventData->packetPayload, eventData->packetSize));
     jsonBody += "}";
 
-    sink->StartEvent(std::string{ kTraceMessageEvent } + "." + kTraceMessageReceivedDataFormat);
-    sink->AddField("json", jsonBody);
-    sink->FinishEvent();
+    gTraceOutputs.StartEvent(std::string{ kTraceMessageEvent } + "." + kTraceMessageReceivedDataFormat);
+    gTraceOutputs.AddField("json", jsonBody);
+    gTraceOutputs.FinishEvent();
 
     // Note that `eventData->session` is currently ignored.
 }
 
 void PreparedMessageSentHandler(const TracePreparedSecureMessageData * eventData)
 {
-    TraceOutput * sink = gTraceHandlerContext.sink;
-    if (!sink->HasStreamAvailable())
+    if (!gTraceOutputs.HasStreamAvailable())
     {
         return;
     }
 
-    sink->StartEvent(std::string{ kTraceMessageEvent } + "." + kTracePreparedMessageSentDataFormat);
-    sink->AddField("json", PreparedSecureMessageDataToJson(eventData, "destination"));
-    sink->FinishEvent();
+    gTraceOutputs.StartEvent(std::string{ kTraceMessageEvent } + "." + kTracePreparedMessageSentDataFormat);
+    gTraceOutputs.AddField("json", PreparedSecureMessageDataToJson(eventData, "destination"));
+    gTraceOutputs.FinishEvent();
 }
 
 void PreparedMessageReceivedHandler(const TracePreparedSecureMessageData * eventData)
 {
-    TraceOutput * sink = gTraceHandlerContext.sink;
-    if (!sink->HasStreamAvailable())
+    if (!gTraceOutputs.HasStreamAvailable())
     {
         return;
     }
 
-    sink->StartEvent(std::string{ kTraceMessageEvent } + "." + kTracePreparedMessageReceivedDataFormat);
-    sink->AddField("json", PreparedSecureMessageDataToJson(eventData, "source"));
-    sink->FinishEvent();
+    gTraceOutputs.StartEvent(std::string{ kTraceMessageEvent } + "." + kTracePreparedMessageReceivedDataFormat);
+    gTraceOutputs.AddField("json", PreparedSecureMessageDataToJson(eventData, "source"));
+    gTraceOutputs.FinishEvent();
 }
 
 void TraceHandler(const char * type, const void * data, size_t size)
@@ -343,9 +335,9 @@ void TraceHandler(const char * type, const void * data, size_t size)
 
 } // namespace
 
-void SetTraceStream(TraceStream * stream)
+void AddTraceStream(TraceStream * stream)
 {
-    gTraceOutput.SetStream(stream);
+    gTraceOutputs.RegisterStream(stream);
 }
 
 void InitTrace()
@@ -355,7 +347,7 @@ void InitTrace()
 
 void DeInitTrace()
 {
-    gTraceOutput.DeleteStream();
+    gTraceOutputs.UnregisterAllStreams();
 }
 
 } // namespace trace
diff --git a/examples/common/tracing/TraceHandlers.h b/examples/common/tracing/TraceHandlers.h
index fb60e3e4db316d..f84923490a17be 100644
--- a/examples/common/tracing/TraceHandlers.h
+++ b/examples/common/tracing/TraceHandlers.h
@@ -16,6 +16,8 @@
  *
  */
 
+#pragma once
+
 #include <fstream>
 #include <iostream>
 #include <lib/support/logging/CHIPLogging.h>
@@ -88,7 +90,7 @@ class TraceStreamFile : public TraceStream
     std::ofstream mFile;
 };
 
-void SetTraceStream(TraceStream * stream);
+void AddTraceStream(TraceStream * stream);
 void InitTrace();
 void DeInitTrace();
 
diff --git a/examples/common/tracing/args.gni b/examples/common/tracing/args.gni
new file mode 100644
index 00000000000000..a76f3e8996ce3c
--- /dev/null
+++ b/examples/common/tracing/args.gni
@@ -0,0 +1,24 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/config/standalone/args.gni")
+
+chip_device_project_config_include = "<CHIPProjectAppConfig.h>"
+chip_project_config_include = "<CHIPProjectAppConfig.h>"
+chip_system_project_config_include = "<SystemProjectConfig.h>"
+
+chip_project_config_include_dirs = [ "${chip_root}/examples/chip-tool/include" ]
+chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
diff --git a/examples/common/tracing/build_overrides b/examples/common/tracing/build_overrides
new file mode 120000
index 00000000000000..e578e73312ebd1
--- /dev/null
+++ b/examples/common/tracing/build_overrides
@@ -0,0 +1 @@
+../../build_overrides
\ No newline at end of file
diff --git a/examples/common/tracing/decoder/TraceDecoderProtocols.cpp b/examples/common/tracing/decoder/TraceDecoderProtocols.cpp
new file mode 100644
index 00000000000000..18da44d7578181
--- /dev/null
+++ b/examples/common/tracing/decoder/TraceDecoderProtocols.cpp
@@ -0,0 +1,166 @@
+/*
+ *   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 "TraceDecoderProtocols.h"
+
+#include "bdx/Decoder.h"
+#include "echo/Decoder.h"
+#include "interaction_model/Decoder.h"
+#include "secure_channel/Decoder.h"
+#include "udc/Decoder.h"
+
+#include <lib/core/CHIPTLVDebug.hpp>
+#include <lib/support/BytesToHex.h>
+#include <protocols/Protocols.h>
+
+namespace {
+
+constexpr const char * kUnknown = "Unknown";
+
+void ENFORCE_FORMAT(1, 2) TLVPrettyPrinter(const char * aFormat, ...)
+{
+    va_list args;
+    va_start(args, aFormat);
+    vprintf(aFormat, args);
+    va_end(args);
+}
+} // namespace
+
+namespace chip {
+namespace trace {
+
+const char * ToProtocolName(uint16_t protocolId)
+{
+    const char * name = nullptr;
+
+    auto protocol = Protocols::Id(VendorId::Common, protocolId);
+    if (protocol == Protocols::SecureChannel::Id)
+    {
+        name = secure_channel::ToProtocolName();
+    }
+    else if (protocol == Protocols::InteractionModel::Id)
+    {
+        name = interaction_model::ToProtocolName();
+    }
+    else if (protocol == Protocols::BDX::Id)
+    {
+        name = bdx::ToProtocolName();
+    }
+    else if (protocol == Protocols::UserDirectedCommissioning::Id)
+    {
+        name = udc::ToProtocolName();
+    }
+    else if (protocol == Protocols::Echo::Id)
+    {
+        name = echo::ToProtocolName();
+    }
+    else
+    {
+        name = kUnknown;
+    }
+
+    return name;
+}
+
+const char * ToProtocolMessageTypeName(uint16_t protocolId, uint8_t protocolCode)
+{
+    const char * name = nullptr;
+
+    auto protocol = Protocols::Id(VendorId::Common, protocolId);
+    if (protocol == Protocols::SecureChannel::Id)
+    {
+        name = secure_channel::ToProtocolMessageTypeName(protocolCode);
+    }
+    else if (protocol == Protocols::InteractionModel::Id)
+    {
+        name = interaction_model::ToProtocolMessageTypeName(protocolCode);
+    }
+    else if (protocol == Protocols::BDX::Id)
+    {
+        name = bdx::ToProtocolMessageTypeName(protocolCode);
+    }
+    else if (protocol == Protocols::UserDirectedCommissioning::Id)
+    {
+        name = udc::ToProtocolMessageTypeName(protocolCode);
+    }
+    else if (protocol == Protocols::Echo::Id)
+    {
+        name = echo::ToProtocolMessageTypeName(protocolCode);
+    }
+    else
+    {
+        name = kUnknown;
+    }
+
+    return name;
+}
+
+CHIP_ERROR LogAsProtocolMessage(uint16_t protocolId, uint8_t protocolCode, const char * payload, size_t len,
+                                bool interactionModelResponse)
+{
+    constexpr uint16_t kMaxPayloadLen = 2048;
+    uint8_t data[kMaxPayloadLen]      = {};
+    size_t dataLen                    = Encoding::HexToBytes(payload, len, data, sizeof(data));
+    VerifyOrReturnError(dataLen != 0, CHIP_ERROR_INVALID_ARGUMENT);
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    auto protocol = Protocols::Id(VendorId::Common, protocolId);
+    if (protocol == Protocols::SecureChannel::Id)
+    {
+        err = secure_channel::LogAsProtocolMessage(protocolCode, data, dataLen);
+    }
+    else if (protocol == Protocols::InteractionModel::Id)
+    {
+        err = interaction_model::LogAsProtocolMessage(protocolCode, data, dataLen, interactionModelResponse);
+    }
+    else if (protocol == Protocols::BDX::Id)
+    {
+        err = bdx::LogAsProtocolMessage(protocolCode, data, dataLen);
+    }
+    else if (protocol == Protocols::UserDirectedCommissioning::Id)
+    {
+        err = udc::LogAsProtocolMessage(protocolCode, data, dataLen);
+    }
+    else if (protocol == Protocols::Echo::Id)
+    {
+        err = echo::LogAsProtocolMessage(protocolCode, data, dataLen);
+    }
+    else
+    {
+        err = CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+
+    if (CHIP_NO_ERROR != err)
+    {
+        ChipLogError(DataManagement, "Error: %s", chip::ErrorStr(err));
+        TLV::TLVReader reader;
+        reader.Init(data, dataLen);
+        ReturnErrorOnFailure(reader.Next());
+        err = TLV::Debug::Dump(reader, TLVPrettyPrinter);
+        if (CHIP_END_OF_TLV == err)
+        {
+            err = CHIP_NO_ERROR;
+        }
+    }
+
+    return err;
+}
+
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/TraceDecoderProtocols.h b/examples/common/tracing/decoder/TraceDecoderProtocols.h
new file mode 100644
index 00000000000000..ae387c82e007df
--- /dev/null
+++ b/examples/common/tracing/decoder/TraceDecoderProtocols.h
@@ -0,0 +1,37 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+
+const char * ToProtocolName(uint16_t protocolId);
+
+const char * ToProtocolMessageTypeName(uint16_t protocolId, uint8_t protocolCode);
+
+CHIP_ERROR LogAsProtocolMessage(uint16_t protocolId, uint8_t protocolCode, const char * payload, size_t len,
+                                bool interactionModelResponse);
+
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/bdx/Decoder.cpp b/examples/common/tracing/decoder/bdx/Decoder.cpp
new file mode 100644
index 00000000000000..e3db318449668d
--- /dev/null
+++ b/examples/common/tracing/decoder/bdx/Decoder.cpp
@@ -0,0 +1,112 @@
+/*
+ *   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 "Decoder.h"
+
+#include <protocols/bdx/BdxMessages.h>
+
+namespace {
+constexpr const char * kProtocolName = "Bulk Data Exchange";
+
+constexpr const char * kUnknown            = "Unknown";
+constexpr const char * kSendInit           = "Send Init";
+constexpr const char * kSendAccept         = "Send Accept";
+constexpr const char * kReceiveInit        = "Receive Init";
+constexpr const char * kReceiveAccept      = "Receive Accept";
+constexpr const char * kBlockQuery         = "Block Query";
+constexpr const char * kBlock              = "Block";
+constexpr const char * kBlockEOF           = "Block End Of File";
+constexpr const char * kBlockAck           = "Block Ack";
+constexpr const char * kBlockAckEOF        = "Block Ack End Of File";
+constexpr const char * kBlockQueryWithSkip = "Block Query With Skip";
+} // namespace
+
+using MessageType = chip::bdx::MessageType;
+
+namespace chip {
+namespace trace {
+namespace bdx {
+
+const char * ToProtocolName()
+{
+    return kProtocolName;
+}
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode)
+{
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::SendInit):
+        return kSendInit;
+    case to_underlying(MessageType::SendAccept):
+        return kSendAccept;
+    case to_underlying(MessageType::ReceiveInit):
+        return kReceiveInit;
+    case to_underlying(MessageType::ReceiveAccept):
+        return kReceiveAccept;
+    case to_underlying(MessageType::BlockQuery):
+        return kBlockQuery;
+    case to_underlying(MessageType::Block):
+        return kBlock;
+    case to_underlying(MessageType::BlockEOF):
+        return kBlockEOF;
+    case to_underlying(MessageType::BlockAck):
+        return kBlockAck;
+    case to_underlying(MessageType::BlockAckEOF):
+        return kBlockAckEOF;
+    case to_underlying(MessageType::BlockQueryWithSkip):
+        return kBlockQueryWithSkip;
+    default:
+        return kUnknown;
+    }
+}
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len)
+{
+    // TODO Implement messages decoding
+
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::SendInit):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::SendAccept):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::ReceiveInit):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::ReceiveAccept):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::BlockQuery):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::Block):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::BlockEOF):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::BlockAck):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::BlockAckEOF):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::BlockQueryWithSkip):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    default:
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+}
+
+} // namespace bdx
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/bdx/Decoder.h b/examples/common/tracing/decoder/bdx/Decoder.h
new file mode 100644
index 00000000000000..ba93a73cf23819
--- /dev/null
+++ b/examples/common/tracing/decoder/bdx/Decoder.h
@@ -0,0 +1,38 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace bdx {
+
+const char * ToProtocolName();
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode);
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len);
+
+} // namespace bdx
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/echo/Decoder.cpp b/examples/common/tracing/decoder/echo/Decoder.cpp
new file mode 100644
index 00000000000000..0d3240e78456c0
--- /dev/null
+++ b/examples/common/tracing/decoder/echo/Decoder.cpp
@@ -0,0 +1,72 @@
+/*
+ *   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 "Decoder.h"
+
+#include <protocols/echo/Echo.h>
+
+namespace {
+constexpr const char * kProtocolName = "Echo";
+
+constexpr const char * kUnknown      = "Unknown";
+constexpr const char * kEchoRequest  = "Echo Request";
+constexpr const char * kEchoResponse = "Echo Response";
+} // namespace
+
+using MessageType = chip::Protocols::Echo::MsgType;
+
+namespace chip {
+namespace trace {
+namespace echo {
+
+const char * ToProtocolName()
+{
+    return kProtocolName;
+}
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode)
+{
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::EchoRequest):
+        return kEchoRequest;
+    case to_underlying(MessageType::EchoResponse):
+        return kEchoResponse;
+    default:
+        return kUnknown;
+    }
+}
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len)
+{
+    // TODO Implement messages decoding
+
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::EchoRequest):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case to_underlying(MessageType::EchoResponse):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    default:
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+}
+
+} // namespace echo
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/echo/Decoder.h b/examples/common/tracing/decoder/echo/Decoder.h
new file mode 100644
index 00000000000000..c0c040807d24dd
--- /dev/null
+++ b/examples/common/tracing/decoder/echo/Decoder.h
@@ -0,0 +1,38 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace echo {
+
+const char * ToProtocolName();
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode);
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len);
+
+} // namespace echo
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/interaction_model/Decoder.cpp b/examples/common/tracing/decoder/interaction_model/Decoder.cpp
new file mode 100644
index 00000000000000..5400b773418666
--- /dev/null
+++ b/examples/common/tracing/decoder/interaction_model/Decoder.cpp
@@ -0,0 +1,281 @@
+/*
+ *   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 "Decoder.h"
+#include "DecoderCustomLog.h"
+
+#include <app/MessageDef/InvokeRequestMessage.h>
+#include <app/MessageDef/InvokeResponseMessage.h>
+#include <app/MessageDef/ReadRequestMessage.h>
+#include <app/MessageDef/ReportDataMessage.h>
+#include <app/MessageDef/StatusResponseMessage.h>
+#include <app/MessageDef/SubscribeRequestMessage.h>
+#include <app/MessageDef/SubscribeResponseMessage.h>
+#include <app/MessageDef/TimedRequestMessage.h>
+#include <app/MessageDef/WriteRequestMessage.h>
+#include <app/MessageDef/WriteResponseMessage.h>
+
+namespace {
+constexpr const char * kProtocolName = "Interaction Model";
+
+constexpr const char * kUnknown               = "Unknown";
+constexpr const char * kStatusResponse        = "Status Response";
+constexpr const char * kReadRequest           = "Read Request";
+constexpr const char * kSubscribeRequest      = "Subscribe Request";
+constexpr const char * kSubscribeResponse     = "Subscribe Response";
+constexpr const char * kReportData            = "Report Data";
+constexpr const char * kWriteRequest          = "Write Request";
+constexpr const char * kWriteResponse         = "Write Response";
+constexpr const char * kInvokeCommandRequest  = "InvokeCommandRequest";
+constexpr const char * kInvokeCommandResponse = "InvokeCommandResponse";
+constexpr const char * kTimedRequest          = "Timed Request";
+
+} // namespace
+
+using MessageType = chip::Protocols::InteractionModel::MsgType;
+
+namespace chip {
+namespace trace {
+namespace interaction_model {
+
+CHIP_ERROR DecodeStatusResponse(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeReadRequest(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeSubscribeRequest(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeSubscribeResponse(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeReportData(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeWriteRequest(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeWriteResponse(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeInvokeCommandRequest(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeInvokeCommandResponse(TLV::TLVReader & reader, bool decode);
+CHIP_ERROR DecodeTimedRequest(TLV::TLVReader & reader, bool decode);
+
+const char * ToProtocolName()
+{
+    return kProtocolName;
+}
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode)
+{
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::StatusResponse):
+        return kStatusResponse;
+    case to_underlying(MessageType::ReadRequest):
+        return kReadRequest;
+    case to_underlying(MessageType::SubscribeRequest):
+        return kSubscribeRequest;
+    case to_underlying(MessageType::SubscribeResponse):
+        return kSubscribeResponse;
+    case to_underlying(MessageType::ReportData):
+        return kReportData;
+    case to_underlying(MessageType::WriteRequest):
+        return kWriteRequest;
+    case to_underlying(MessageType::WriteResponse):
+        return kWriteResponse;
+    case to_underlying(MessageType::InvokeCommandRequest):
+        return kInvokeCommandRequest;
+    case to_underlying(MessageType::InvokeCommandResponse):
+        return kInvokeCommandResponse;
+    case to_underlying(MessageType::TimedRequest):
+        return kTimedRequest;
+    default:
+        return kUnknown;
+    }
+}
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len, bool decodeResponse)
+{
+    TLV::TLVReader reader;
+    reader.Init(data, len);
+
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::StatusResponse):
+        return DecodeStatusResponse(reader, decodeResponse);
+    case to_underlying(MessageType::ReadRequest):
+        return DecodeReadRequest(reader, decodeResponse);
+    case to_underlying(MessageType::SubscribeRequest):
+        return DecodeSubscribeRequest(reader, decodeResponse);
+    case to_underlying(MessageType::SubscribeResponse):
+        return DecodeSubscribeResponse(reader, decodeResponse);
+    case to_underlying(MessageType::ReportData):
+        return DecodeReportData(reader, decodeResponse);
+    case to_underlying(MessageType::WriteRequest):
+        return DecodeWriteRequest(reader, decodeResponse);
+    case to_underlying(MessageType::WriteResponse):
+        return DecodeWriteResponse(reader, decodeResponse);
+    case to_underlying(MessageType::InvokeCommandRequest):
+        return DecodeInvokeCommandRequest(reader, decodeResponse);
+    case to_underlying(MessageType::InvokeCommandResponse):
+        return DecodeInvokeCommandResponse(reader, decodeResponse);
+    case to_underlying(MessageType::TimedRequest):
+        return DecodeTimedRequest(reader, decodeResponse);
+    default:
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+}
+
+CHIP_ERROR DecodeStatusResponse(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::StatusResponseMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeReadRequest(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::ReadRequestMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeSubscribeRequest(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::SubscribeRequestMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeSubscribeResponse(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::SubscribeResponseMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeReportData(TLV::TLVReader & reader, bool decode)
+{
+    ReturnErrorOnFailure(MaybeDecodeNestedReadResponse(reader.GetReadPoint(), reader.GetTotalLength()));
+
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::ReportDataMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeWriteRequest(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::WriteRequestMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeWriteResponse(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::WriteResponseMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeInvokeCommandRequest(TLV::TLVReader & reader, bool decode)
+{
+    ReturnErrorOnFailure(MaybeDecodeNestedCommandRequest(reader.GetReadPoint(), reader.GetTotalLength()));
+
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::InvokeRequestMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeInvokeCommandResponse(TLV::TLVReader & reader, bool decode)
+{
+    ReturnErrorOnFailure(MaybeDecodeNestedCommandResponse(reader.GetReadPoint(), reader.GetTotalLength()));
+
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::InvokeResponseMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeTimedRequest(TLV::TLVReader & reader, bool decode)
+{
+#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
+    if (decode)
+    {
+        app::TimedRequestMessage::Parser parser;
+        ReturnErrorOnFailure(parser.Init(reader));
+        return parser.CheckSchemaValidity();
+    }
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace interaction_model
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/interaction_model/Decoder.h b/examples/common/tracing/decoder/interaction_model/Decoder.h
new file mode 100644
index 00000000000000..d7f313d71c4286
--- /dev/null
+++ b/examples/common/tracing/decoder/interaction_model/Decoder.h
@@ -0,0 +1,38 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace interaction_model {
+
+const char * ToProtocolName();
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode);
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len, bool decodeResponse);
+
+} // namespace interaction_model
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp
new file mode 100644
index 00000000000000..e516a74c4ce93e
--- /dev/null
+++ b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp
@@ -0,0 +1,496 @@
+/*
+ *   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 "DecoderCustomLog.h"
+
+#include "../logging/Log.h"
+
+#include <app/AttributeAccessInterface.h>
+#include <app/MessageDef/InvokeRequestMessage.h>
+#include <app/MessageDef/InvokeResponseMessage.h>
+#include <app/MessageDef/ReportDataMessage.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+
+#include <credentials/CertificationDeclaration.h>
+#include <credentials/DeviceAttestationConstructor.h>
+#include <credentials/DeviceAttestationVendorReserved.h>
+
+#include <lib/core/CHIPTLV.h>
+#include <lib/support/TypeTraits.h>
+
+namespace {
+template <typename T>
+bool IsTag(const chip::TLV::TLVReader & reader, T tag)
+{
+    return chip::to_underlying(tag) == chip::TLV::TagNumFromTag(reader.GetTag());
+}
+} // namespace
+
+namespace chip {
+namespace trace {
+namespace interaction_model {
+
+using namespace logging;
+
+CHIP_ERROR LogCertificateChainResponse(TLV::TLVReader & reader)
+{
+    app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType value;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, value));
+
+    LogCertificate("DAC/PAI", value.certificate);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LogCertificationDeclaration(const ByteSpan & cd)
+{
+    auto scopedIndent = ScopedLogIndent("Certification Declaration");
+
+    // TODO Add an option to load a TrustStore so the subjectKeyId can be extracted from the CMS envelope in order
+    // to select the proper public key.
+    ByteSpan cdContentOut;
+    uint8_t pubKey[] = { 0x04, 0x3c, 0x39, 0x89, 0x22, 0x45, 0x2b, 0x55, 0xca, 0xf3, 0x89, 0xc2, 0x5b, 0xd1, 0xbc, 0xa4, 0x65,
+                         0x69, 0x52, 0xcc, 0xb9, 0x0e, 0x88, 0x69, 0x24, 0x9a, 0xd8, 0x47, 0x46, 0x53, 0x01, 0x4c, 0xbf, 0x95,
+                         0xd6, 0x87, 0x96, 0x5e, 0x03, 0x6b, 0x52, 0x1c, 0x51, 0x03, 0x7e, 0x6b, 0x8c, 0xed, 0xef, 0xca, 0x1e,
+                         0xb4, 0x40, 0x46, 0x69, 0x4f, 0xa0, 0x88, 0x82, 0xee, 0xd6, 0x51, 0x9d, 0xec, 0xba };
+
+    ReturnErrorOnFailure(Credentials::CMS_Verify(cd, Crypto::P256PublicKey(pubKey), cdContentOut));
+
+    constexpr uint8_t kTag_FormatVersion       = 0;  /**< [ unsigned int ] Format version. */
+    constexpr uint8_t kTag_VendorId            = 1;  /**< [ unsigned int ] Vedor identifier. */
+    constexpr uint8_t kTag_ProductIdArray      = 2;  /**< [ array ] Product identifiers (each is unsigned int). */
+    constexpr uint8_t kTag_DeviceTypeId        = 3;  /**< [ unsigned int ] Device Type identifier. */
+    constexpr uint8_t kTag_CertificateId       = 4;  /**< [ UTF-8 string, length 19 ] Certificate identifier. */
+    constexpr uint8_t kTag_SecurityLevel       = 5;  /**< [ unsigned int ] Security level. */
+    constexpr uint8_t kTag_SecurityInformation = 6;  /**< [ unsigned int ] Security information. */
+    constexpr uint8_t kTag_VersionNumber       = 7;  /**< [ unsigned int ] Version number. */
+    constexpr uint8_t kTag_CertificationType   = 8;  /**< [ unsigned int ] Certification Type. */
+    constexpr uint8_t kTag_DACOriginVendorId   = 9;  /**< [ unsigned int, optional ] DAC origin vendor identifier. */
+    constexpr uint8_t kTag_DACOriginProductId  = 10; /**< [ unsigned int, optional ] DAC origin product identifier. */
+    constexpr uint8_t kTag_AuthorizedPAAList   = 11; /**< [ array, optional ] Authorized PAA List. */
+
+    TLV::TLVReader reader;
+    reader.Init(cdContentOut);
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+
+    uint16_t value;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    while (CHIP_NO_ERROR == (err = reader.Next()))
+    {
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case kTag_FormatVersion:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Format Version", value);
+            break;
+        case kTag_VendorId:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Vendor Id", value);
+            break;
+        case kTag_ProductIdArray: {
+            TLV::TLVType arrayType = TLV::kTLVType_Array;
+            ReturnErrorOnFailure(reader.EnterContainer(arrayType));
+            auto scopedProductIndent = ScopedLogIndent("Product Ids");
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                ReturnErrorOnFailure(reader.Get(value));
+                Log("Product Id", value);
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(arrayType));
+            break;
+        }
+        case kTag_DeviceTypeId:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Device Type Id", value);
+            break;
+        case kTag_CertificateId: {
+            CharSpan str;
+            ReturnErrorOnFailure(reader.Get(str));
+            Log("Certificate Id", str);
+            break;
+        }
+        case kTag_SecurityLevel:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Security Level", value);
+            break;
+        case kTag_SecurityInformation:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Security Information", value);
+            break;
+        case kTag_VersionNumber:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Version Number", value);
+            break;
+        case kTag_CertificationType:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("Certification Type", value);
+            break;
+        case kTag_DACOriginVendorId:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("DAC Origin Vendor Id", value);
+            break;
+        case kTag_DACOriginProductId:
+            ReturnErrorOnFailure(reader.Get(value));
+            Log("DAC Origin Product Id", value);
+            break;
+        case kTag_AuthorizedPAAList: {
+            TLV::TLVType arrayType = TLV::kTLVType_Array;
+            ReturnErrorOnFailure(reader.EnterContainer(arrayType));
+            auto scopedAuthorizedPAAIndent = ScopedLogIndent("Authorized PAAs");
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                ByteSpan str;
+                ReturnErrorOnFailure(reader.Get(str));
+                Log("Product Id", str);
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(arrayType));
+            break;
+        }
+        default:
+            Log("<Unsupported Tag>");
+            break;
+        }
+    }
+
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LogAttestationResponse(TLV::TLVReader & reader)
+{
+    app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType value;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, value));
+
+    ByteSpan certificationDeclaration;
+    ByteSpan attestationNonce;
+    uint32_t timestamp;
+    ByteSpan firmwareInfo;
+    Credentials::DeviceAttestationVendorReservedDeconstructor vendorReserved;
+
+    ReturnErrorOnFailure(Credentials::DeconstructAttestationElements(value.attestationElements, certificationDeclaration,
+                                                                     attestationNonce, timestamp, firmwareInfo, vendorReserved));
+    auto scopedIndent = ScopedLogIndentWithSize("Attestation Elements", value.attestationElements.size());
+    ReturnErrorOnFailure(LogCertificationDeclaration(certificationDeclaration));
+    Log("Attestation Nonce", attestationNonce);
+    Log("Timestamp", timestamp);
+    Log("Firmware Info", firmwareInfo);
+    if (vendorReserved.GetNumberOfElements())
+    {
+        auto scopedVendorIndent = ScopedLogIndent("Vendors Reserved");
+        Credentials::VendorReservedElement element;
+        while (vendorReserved.GetNextVendorReservedElement(element) == CHIP_NO_ERROR)
+        {
+            auto scopedVendorReservedIndent = ScopedLogIndent("Vendor Reserved");
+            Log("Vendor Id", element.vendorId);
+            Log("Profile Number", element.profileNum);
+            Log("Profile Data", element.vendorReservedData);
+        }
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LogCSRResponse(TLV::TLVReader & reader)
+{
+    app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType value;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, value));
+
+    ByteSpan csr;
+    ByteSpan csrNonce;
+    ByteSpan vendorReserved1;
+    ByteSpan vendorReserved2;
+    ByteSpan vendorReserved3;
+
+    ReturnErrorOnFailure(Credentials::DeconstructNOCSRElements(value.NOCSRElements, csr, csrNonce, vendorReserved1, vendorReserved2,
+                                                               vendorReserved3));
+
+    {
+        auto scopedIndent = ScopedLogIndent("NOCSR Elements");
+        Log("CSR", csr);
+        Log("CSRNonce", csrNonce);
+        Log("Vendor Reserved 1", vendorReserved1);
+        Log("Vendor Reserved 2", vendorReserved2);
+        Log("Vendor Reserved 3", vendorReserved3);
+    }
+
+    LogCertificateRequest("CSR", csr);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LogAddNOC(TLV::TLVReader & reader)
+{
+    app::Clusters::OperationalCredentials::Commands::AddNOC::DecodableType value;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, value));
+
+    LogCertificate("NOCValue", value.NOCValue);
+
+    if (value.ICACValue.HasValue())
+    {
+        LogCertificate("ICACValue", value.ICACValue.Value());
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LogAddTrustedRootCertificateRequest(TLV::TLVReader & reader)
+{
+    app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::DecodableType value;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, value));
+
+    LogCertificate("RCACValue", value.rootCertificate);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LogNOCsAttribute(TLV::TLVReader & reader)
+{
+    if (reader.GetType() == TLV::kTLVType_Array)
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType value;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, value));
+
+    LogCertificate("NOC", value.noc);
+
+    if (!value.icac.IsNull())
+    {
+        LogCertificate("ICAC", value.icac.Value());
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR MaybeDecodeAttributeData(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    ClusterId clusterId;
+    AttributeId attributeId;
+
+    TLV::TLVType containerType;
+    while (CHIP_NO_ERROR == (err = reader.Next()))
+    {
+        if (IsTag(reader, app::AttributeDataIB::Tag::kPath))
+        {
+            ReturnErrorOnFailure(reader.EnterContainer(containerType));
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                if (to_underlying(app::AttributePathIB::Tag::kCluster) == TLV::TagNumFromTag(reader.GetTag()))
+                {
+                    reader.Get(clusterId);
+                }
+                else if (to_underlying(app::AttributePathIB::Tag::kAttribute) == TLV::TagNumFromTag(reader.GetTag()))
+                {
+                    reader.Get(attributeId);
+                }
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(containerType));
+        }
+        else if (IsTag(reader, app::AttributeDataIB::Tag::kData))
+        {
+            switch (clusterId)
+            {
+            case app::Clusters::OperationalCredentials::Id:
+                switch (attributeId)
+                {
+                case app::Clusters::OperationalCredentials::Attributes::NOCs::Id:
+                    return LogNOCsAttribute(reader);
+                default:
+                    return CHIP_NO_ERROR;
+                }
+            default:
+                return CHIP_NO_ERROR;
+            }
+        }
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR MaybeDecodeCommandData(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    ClusterId clusterId;
+    CommandId commandId;
+
+    TLV::TLVType containerType;
+    while (CHIP_NO_ERROR == (err = reader.Next()))
+    {
+        if (IsTag(reader, app::CommandDataIB::Tag::kPath))
+        {
+            ReturnErrorOnFailure(reader.EnterContainer(containerType));
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                if (to_underlying(app::CommandPathIB::Tag::kClusterId) == TLV::TagNumFromTag(reader.GetTag()))
+                {
+                    reader.Get(clusterId);
+                }
+                else if (to_underlying(app::CommandPathIB::Tag::kCommandId) == TLV::TagNumFromTag(reader.GetTag()))
+                {
+                    reader.Get(commandId);
+                }
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(containerType));
+        }
+        else if (IsTag(reader, app::CommandDataIB::Tag::kFields))
+        {
+            switch (clusterId)
+            {
+            case app::Clusters::OperationalCredentials::Id:
+                switch (commandId)
+                {
+                case app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id:
+                    return LogCertificateChainResponse(reader);
+                case app::Clusters::OperationalCredentials::Commands::AttestationResponse::Id:
+                    return LogAttestationResponse(reader);
+                case app::Clusters::OperationalCredentials::Commands::CSRResponse::Id:
+                    return LogCSRResponse(reader);
+                case app::Clusters::OperationalCredentials::Commands::AddNOC::Id:
+                    return LogAddNOC(reader);
+                case app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id:
+                    return LogAddTrustedRootCertificateRequest(reader);
+                default:
+                    return CHIP_NO_ERROR;
+                }
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR MaybeDecodeNestedReadResponse(const uint8_t * data, size_t dataLen)
+{
+    TLV::TLVReader reader;
+    reader.Init(data, dataLen);
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    while (CHIP_NO_ERROR == (err = reader.Next()))
+    {
+        if (IsTag(reader, app::ReportDataMessage::Tag::kAttributeReportIBs))
+        {
+            ReturnErrorOnFailure(reader.EnterContainer(containerType));
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                TLV::TLVType arrayType = TLV::kTLVType_Array;
+                ReturnErrorOnFailure(reader.EnterContainer(arrayType));
+                while (CHIP_NO_ERROR == (err = reader.Next()))
+                {
+                    if (IsTag(reader, app::AttributeReportIB::Tag::kAttributeData))
+                    {
+                        ReturnErrorOnFailure(reader.EnterContainer(containerType));
+                        ReturnErrorOnFailure(MaybeDecodeAttributeData(reader));
+                        ReturnErrorOnFailure(reader.ExitContainer(containerType));
+                    }
+                }
+                ReturnErrorOnFailure(reader.ExitContainer(arrayType));
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(containerType));
+        }
+    }
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR MaybeDecodeNestedCommandResponse(const uint8_t * data, size_t dataLen)
+{
+    TLV::TLVReader reader;
+    reader.Init(data, dataLen);
+
+    ReturnErrorOnFailure(reader.Next());
+
+    TLV::TLVType containerType;
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    while (CHIP_NO_ERROR == (err = reader.Next()))
+    {
+        if (IsTag(reader, app::InvokeResponseMessage::Tag::kInvokeResponses))
+        {
+            ReturnErrorOnFailure(reader.EnterContainer(containerType));
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                ReturnErrorOnFailure(reader.EnterContainer(containerType));
+                while (CHIP_NO_ERROR == (err = reader.Next()))
+                {
+                    if (IsTag(reader, app::InvokeResponseIB::Tag::kCommand))
+                    {
+                        ReturnErrorOnFailure(reader.EnterContainer(containerType));
+                        ReturnErrorOnFailure(MaybeDecodeCommandData(reader));
+                        ReturnErrorOnFailure(reader.ExitContainer(containerType));
+                    }
+                }
+                ReturnErrorOnFailure(reader.ExitContainer(containerType));
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(containerType));
+        }
+    }
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR MaybeDecodeNestedCommandRequest(const uint8_t * data, size_t dataLen)
+{
+    TLV::TLVReader reader;
+    reader.Init(data, dataLen);
+
+    ReturnErrorOnFailure(reader.Next());
+
+    TLV::TLVType containerType;
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    while (CHIP_NO_ERROR == (err = reader.Next()))
+    {
+        if (IsTag(reader, app::InvokeRequestMessage::Tag::kInvokeRequests))
+        {
+            ReturnErrorOnFailure(reader.EnterContainer(containerType));
+            while (CHIP_NO_ERROR == (err = reader.Next()))
+            {
+                ReturnErrorOnFailure(reader.EnterContainer(containerType));
+                ReturnErrorOnFailure(MaybeDecodeCommandData(reader));
+                ReturnErrorOnFailure(reader.ExitContainer(containerType));
+            }
+            ReturnErrorOnFailure(reader.ExitContainer(containerType));
+        }
+    }
+
+    return reader.ExitContainer(containerType);
+}
+
+} // namespace interaction_model
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.h b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.h
new file mode 100644
index 00000000000000..68e906e3d6c919
--- /dev/null
+++ b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.h
@@ -0,0 +1,38 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace interaction_model {
+
+CHIP_ERROR MaybeDecodeNestedReadResponse(const uint8_t * data, size_t dataLen);
+
+CHIP_ERROR MaybeDecodeNestedCommandResponse(const uint8_t * data, size_t dataLen);
+
+CHIP_ERROR MaybeDecodeNestedCommandRequest(const uint8_t * data, size_t dataLen);
+
+} // namespace interaction_model
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/logging/Log.cpp b/examples/common/tracing/decoder/logging/Log.cpp
new file mode 100644
index 00000000000000..bc3cb74d82f117
--- /dev/null
+++ b/examples/common/tracing/decoder/logging/Log.cpp
@@ -0,0 +1,206 @@
+/*
+ *   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 "Log.h"
+
+#include "ToCertificateString.h"
+
+#include <lib/support/BytesToHex.h>
+#include <lib/support/SafeInt.h>
+
+namespace chip {
+namespace trace {
+namespace logging {
+
+namespace {
+
+constexpr uint8_t kSpacePerIndent = 4;
+uint8_t gIndentLevel              = 0;
+
+void ENFORCE_FORMAT(1, 2) LogFormatted(const char * format, ...)
+{
+    char buffer[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE] = {};
+
+    uint8_t indentation = gIndentLevel * kSpacePerIndent;
+    snprintf(buffer, sizeof(buffer), "%*s", indentation, "");
+
+    va_list args;
+    va_start(args, format);
+    vsnprintf(&buffer[indentation], sizeof(buffer) - indentation, format, args);
+    va_end(args);
+
+    ChipLogDetail(DataManagement, "%s", buffer);
+}
+
+const char * ToHexString(chip::ByteSpan source, MutableCharSpan destination)
+{
+    memset(destination.data(), '\0', destination.size());
+
+    if (source.size() == 0)
+    {
+        return destination.data();
+    }
+
+    CHIP_ERROR err =
+        Encoding::BytesToHex(source.data(), source.size(), destination.data(), destination.size(), Encoding::HexFlags::kUppercase);
+    if (CHIP_NO_ERROR != err)
+    {
+        LogErrorOnFailure(err);
+        return destination.data();
+    }
+
+    return destination.data();
+}
+
+} // namespace
+
+void Log(const char * name, ByteSpan & data)
+{
+    if (data.empty())
+    {
+        return;
+    }
+
+    char buffer[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
+    chip::MutableCharSpan destination(buffer);
+
+    CanCastTo<uint16_t>(data.size())
+        ? LogFormatted("%s (%u) = %s", name, static_cast<uint16_t>(data.size()), ToHexString(data, destination))
+        : LogFormatted("%s (>UINT16_MAX) = %s", name, ToHexString(data, destination));
+}
+
+void Log(const char * name, CharSpan & data)
+{
+    if (data.empty())
+    {
+        return;
+    }
+
+    CanCastTo<uint16_t>(data.size())
+        ? LogFormatted("%s (%u) = %.*s", name, static_cast<uint16_t>(data.size()), static_cast<int>(data.size()), data.data())
+        : LogFormatted("%s (>UINT16_MAX) = %.*s", name, static_cast<int>(data.size()), data.data());
+}
+
+void Log(const char * name, uint16_t value)
+{
+    LogFormatted("%s = %u", name, value);
+}
+
+void Log(const char * name, uint32_t value)
+{
+    LogFormatted("%s = %u", name, value);
+}
+
+void Log(const char * name, const char * value)
+{
+    LogFormatted("%s = %s", name, value);
+}
+
+void Log(const char * name)
+{
+    LogFormatted("%s", name);
+}
+
+void LogAsHex(const char * name, uint16_t value)
+{
+    LogFormatted("%s = 0x%04x", name, value);
+}
+
+void LogAsHex(const char * name, uint64_t value)
+{
+    LogFormatted("%s = " ChipLogFormatX64, name, ChipLogValueX64(value));
+}
+
+void LogCertificate(const char * name, const ByteSpan & data)
+{
+    char buffer[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE] = {};
+    chip::MutableCharSpan destination(buffer);
+
+    CanCastTo<uint16_t>(data.size()) ? LogFormatted("%s (%u) =", name, static_cast<uint16_t>(data.size()))
+                                     : LogFormatted("%s (>UINT16_MAX) =", name);
+    LogFormatted("{\n%s", ToCertificateString(data, destination));
+    LogFormatted("}");
+    LogFormatted(" ");
+}
+
+void LogCertificateRequest(const char * name, const ByteSpan & data)
+{
+    char buffer[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE] = {};
+    chip::MutableCharSpan destination(buffer);
+
+    CanCastTo<uint16_t>(data.size()) ? LogFormatted("%s (%u) =", name, static_cast<uint16_t>(data.size()))
+                                     : LogFormatted("%s (>UINT16_MAX) =", name);
+    LogFormatted("{\n%s", ToCertificateRequestString(data, destination));
+    LogFormatted("}");
+    LogFormatted(" ");
+}
+
+void IncreaseLogIndent()
+{
+    LogFormatted("{");
+    gIndentLevel++;
+}
+
+void DecreaseLogIndent()
+{
+    gIndentLevel--;
+    LogFormatted("}");
+
+    if (gIndentLevel == 0)
+    {
+        LogFormatted(" ");
+    }
+}
+
+ScopedLogIndent::ScopedLogIndent(const char * name)
+{
+    LogFormatted("%s =", name);
+    IncreaseLogIndent();
+}
+
+ScopedLogIndent::~ScopedLogIndent()
+{
+    DecreaseLogIndent();
+}
+
+ScopedLogIndentWithFlags::ScopedLogIndentWithFlags(const char * name, uint8_t flags)
+{
+    LogFormatted("%s (0x%02x) =", name, flags);
+    IncreaseLogIndent();
+}
+
+ScopedLogIndentWithFlags::~ScopedLogIndentWithFlags()
+{
+    DecreaseLogIndent();
+}
+
+ScopedLogIndentWithSize::ScopedLogIndentWithSize(const char * name, size_t size)
+{
+    CanCastTo<uint16_t>(size) ? LogFormatted("%s (%u bytes) =", name, static_cast<uint16_t>(size))
+                              : LogFormatted("%s (>UINT16_MAX) =", name);
+    IncreaseLogIndent();
+}
+
+ScopedLogIndentWithSize::~ScopedLogIndentWithSize()
+{
+    DecreaseLogIndent();
+}
+
+} // namespace logging
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/logging/Log.h b/examples/common/tracing/decoder/logging/Log.h
new file mode 100644
index 00000000000000..b2ff6915eb4604
--- /dev/null
+++ b/examples/common/tracing/decoder/logging/Log.h
@@ -0,0 +1,73 @@
+/*
+ *   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 <lib/support/Span.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace logging {
+
+class ScopedLogIndent
+{
+public:
+    ScopedLogIndent(const char * name);
+    ~ScopedLogIndent();
+};
+
+class ScopedLogIndentWithFlags
+{
+public:
+    ScopedLogIndentWithFlags(const char * name, uint8_t flags);
+    ~ScopedLogIndentWithFlags();
+};
+
+class ScopedLogIndentWithSize
+{
+public:
+    ScopedLogIndentWithSize(const char * name, size_t size);
+    ~ScopedLogIndentWithSize();
+};
+
+void Log(const char * name, chip::ByteSpan & data);
+
+void Log(const char * name, chip::CharSpan & data);
+
+void Log(const char * name, uint16_t value);
+
+void Log(const char * name, uint32_t value);
+
+void Log(const char * name);
+
+void Log(const char * name, const char * value);
+
+void LogAsHex(const char * name, uint16_t value);
+
+void LogAsHex(const char * name, uint64_t value);
+
+void LogCertificate(const char * name, const chip::ByteSpan & data);
+
+void LogCertificateRequest(const char * name, const chip::ByteSpan & data);
+
+} // namespace logging
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/logging/ToCertificateString.cpp b/examples/common/tracing/decoder/logging/ToCertificateString.cpp
new file mode 100644
index 00000000000000..10649348fc8c1f
--- /dev/null
+++ b/examples/common/tracing/decoder/logging/ToCertificateString.cpp
@@ -0,0 +1,113 @@
+/*
+ *   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 "ToCertificateString.h"
+
+#include <lib/support/Base64.h>
+#include <lib/support/ScopedBuffer.h>
+
+namespace {
+constexpr const uint8_t kChipRawPrefix[] = { 0x15, 0x30, 0x01 };
+
+bool IsChipCertificate(const chip::ByteSpan & source)
+{
+    return (source.size() > sizeof(kChipRawPrefix)) && (memcmp(source.data(), kChipRawPrefix, sizeof(kChipRawPrefix)) == 0);
+}
+
+const char * ToCertificate(const chip::ByteSpan & source, chip::MutableCharSpan destination, const char * header = "",
+                           const char * footer = "")
+{
+    // Reset the buffer
+    memset(destination.data(), '\0', destination.size());
+
+    if (source.size() == 0)
+    {
+        return destination.data();
+    }
+
+    size_t base64DataLen = BASE64_ENCODED_LEN(source.size()) + 1;
+    if (base64DataLen + strlen(header) + strlen(footer) > destination.size())
+    {
+        ChipLogError(DataManagement, "The certificate buffer is too small to hold the base64 encoded certificate");
+        return destination.data();
+    }
+
+    chip::Platform::ScopedMemoryBuffer<char> str;
+    str.Alloc(base64DataLen);
+
+    auto encodedLen       = chip::Base64Encode(source.data(), source.size(), str.Get());
+    str.Get()[encodedLen] = '\0';
+
+    if (IsChipCertificate(source))
+    {
+        // Wherever Matter Operational Certificate Encoding representation is used, all certificates SHALL NOT be longer than 400
+        // bytes in their TLV form.
+        if (source.size() > 400)
+        {
+            ChipLogError(DataManagement, "Certificate size is greater than 400 bytes");
+        }
+
+        snprintf(destination.data(), destination.size(), "%s", str.Get());
+    }
+    else
+    {
+        // All certificates SHALL NOT be longer than 600 bytes in their uncompressed DER format.
+        if (source.size() > 600)
+        {
+            ChipLogError(DataManagement, "Certificate size is greater than 600 bytes");
+        }
+
+        size_t inIndex  = 0;
+        size_t outIndex = strlen(header) + 1;
+
+        snprintf(destination.data(), destination.size(), "%s\n", header);
+        for (; inIndex < base64DataLen; inIndex += 64)
+        {
+            outIndex += snprintf(&destination.data()[outIndex], destination.size() - outIndex, "%.64s\n", &str[inIndex]);
+        }
+        snprintf(&destination.data()[outIndex], destination.size() - outIndex, "%s", footer);
+    }
+
+    return destination.data();
+}
+
+} // namespace
+
+namespace chip {
+namespace trace {
+namespace logging {
+
+const char * ToCertificateString(const ByteSpan & source, MutableCharSpan destination)
+{
+    constexpr const char * kCertificateHeader = "-----BEGIN CERTIFICATE-----";
+    constexpr const char * kCertificateFooter = "-----END CERTIFICATE-----";
+
+    return ToCertificate(source, destination, kCertificateHeader, kCertificateFooter);
+}
+
+const char * ToCertificateRequestString(const ByteSpan & source, MutableCharSpan destination)
+{
+    constexpr const char * kCertificateHeader = "-----BEGIN CERTIFICATE REQUEST-----";
+    constexpr const char * kCertificateFooter = "-----END CERTIFICATE REQUEST-----";
+
+    return ToCertificate(source, destination, kCertificateHeader, kCertificateFooter);
+}
+
+} // namespace logging
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/logging/ToCertificateString.h b/examples/common/tracing/decoder/logging/ToCertificateString.h
new file mode 100644
index 00000000000000..4b49732316813f
--- /dev/null
+++ b/examples/common/tracing/decoder/logging/ToCertificateString.h
@@ -0,0 +1,52 @@
+/*
+ *   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 <lib/support/Span.h>
+
+#include <stddef.h>
+
+namespace chip {
+namespace trace {
+namespace logging {
+
+/**
+ * @brief This methods converts bytes representing a certificate to a printable string.
+ *        The certificate can be a X.509v3 certificate in DER format or a Matter Operational Certificate.
+ *
+ * @param source       The source buffer containing a certificate as bytes.
+ * @param destination  The destination buffer where the printable representation will be stored.
+ *
+ * @returns             A pointer to the destination buffer data.
+ */
+const char * ToCertificateString(const chip::ByteSpan & source, chip::MutableCharSpan destination);
+
+/**
+ * @brief This methods converts bytes representing a CMS envelope to a printable string.
+ *
+ * @param source       The source buffer containing a certificate as bytes.
+ * @param destination  The destination buffer where the printable representation will be stored.
+ *
+ * @returns             A pointer to the destination buffer data.
+ */
+const char * ToCertificateRequestString(const chip::ByteSpan & source, chip::MutableCharSpan destination);
+
+} // namespace logging
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/secure_channel/Decoder.cpp b/examples/common/tracing/decoder/secure_channel/Decoder.cpp
new file mode 100644
index 00000000000000..a1cf96ea187fc2
--- /dev/null
+++ b/examples/common/tracing/decoder/secure_channel/Decoder.cpp
@@ -0,0 +1,565 @@
+/*
+ *   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 "Decoder.h"
+#include "../logging/Log.h"
+
+#include <lib/support/BufferReader.h>
+#include <protocols/secure_channel/Constants.h>
+#include <protocols/secure_channel/PASESession.h>
+
+namespace {
+constexpr const char * kProtocolName = "Secure Channel";
+
+constexpr const char * kUnknown            = "Unknown";
+constexpr const char * kMsgCounterSyncReq  = "Message Counter Sync Request";
+constexpr const char * kMsgCounterSyncResp = "Message Counter Sync Response";
+constexpr const char * kStandaloneAck      = "Standalone Ack";
+constexpr const char * kPBKDFParamRequest  = "Password-Based Key Derivation Parameters Request";
+constexpr const char * kPBKDFParamResponse = "Password-Based Key Derivation Parameters Response";
+constexpr const char * kPASE_Pake1         = "Password Authenticated Session Establishment '1'";
+constexpr const char * kPASE_Pake2         = "Password Authenticated Session Establishment '2'";
+constexpr const char * kPASE_Pake3         = "Password Authenticated Session Establishment '3'";
+constexpr const char * kPASE_PakeError     = "Password-authenticated key exchange Error";
+constexpr const char * kCASE_Sigma1        = "Certificate Authenticated Session Establishment Sigma '1'";
+constexpr const char * kCASE_Sigma2        = "Certificate Authenticated Session Establishment Sigma '2'";
+constexpr const char * kCASE_Sigma3        = "Certificate Authenticated Session Establishment Sigma '3'";
+constexpr const char * kCASE_Sigma2Resume  = "Certificate Authenticated Session Establishment Sigma '2' Resume";
+constexpr const char * kStatusReport       = "Status Report";
+} // namespace
+
+using MessageType = chip::Protocols::SecureChannel::MsgType;
+
+namespace chip {
+namespace trace {
+namespace secure_channel {
+
+using namespace logging;
+
+CHIP_ERROR DecodeSEDParams(TLV::TLVReader & reader);
+CHIP_ERROR DecodeMessageCounterSyncRequest(TLV::TLVReader & reader);
+CHIP_ERROR DecodeMessageCounterSyncResponse(TLV::TLVReader & reader);
+CHIP_ERROR DecodeStandaloneAck(TLV::TLVReader & reader);
+CHIP_ERROR DecodePBDFKParamRequest(TLV::TLVReader & reader);
+CHIP_ERROR DecodePBDFKParamResponse(TLV::TLVReader & reader);
+CHIP_ERROR DecodePASEPake1(TLV::TLVReader & reader);
+CHIP_ERROR DecodePASEPake2(TLV::TLVReader & reader);
+CHIP_ERROR DecodePASEPake3(TLV::TLVReader & reader);
+CHIP_ERROR DecodePASEPakeError(TLV::TLVReader & reader);
+CHIP_ERROR DecodeCASESigma1(TLV::TLVReader & reader);
+CHIP_ERROR DecodeCASESigma2(TLV::TLVReader & reader);
+CHIP_ERROR DecodeCASESigma3(TLV::TLVReader & reader);
+CHIP_ERROR DecodeCASESigma2Resume(TLV::TLVReader & reader);
+CHIP_ERROR DecodeStatusReport(const uint8_t * data, size_t len); // TODO StatusReport does not use TLV Encoding
+
+const char * ToProtocolName()
+{
+    return kProtocolName;
+}
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode)
+{
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::MsgCounterSyncReq):
+        return kMsgCounterSyncReq;
+    case to_underlying(MessageType::MsgCounterSyncRsp):
+        return kMsgCounterSyncResp;
+    case to_underlying(MessageType::StandaloneAck):
+        return kStandaloneAck;
+    case to_underlying(MessageType::PBKDFParamRequest):
+        return kPBKDFParamRequest;
+    case to_underlying(MessageType::PBKDFParamResponse):
+        return kPBKDFParamResponse;
+    case to_underlying(MessageType::PASE_Pake1):
+        return kPASE_Pake1;
+    case to_underlying(MessageType::PASE_Pake2):
+        return kPASE_Pake2;
+    case to_underlying(MessageType::PASE_Pake3):
+        return kPASE_Pake3;
+    case to_underlying(MessageType::PASE_PakeError):
+        return kPASE_PakeError;
+    case to_underlying(MessageType::CASE_Sigma1):
+        return kCASE_Sigma1;
+    case to_underlying(MessageType::CASE_Sigma2):
+        return kCASE_Sigma2;
+    case to_underlying(MessageType::CASE_Sigma3):
+        return kCASE_Sigma3;
+    case to_underlying(MessageType::CASE_Sigma2Resume):
+        return kCASE_Sigma2Resume;
+    case to_underlying(MessageType::StatusReport):
+        return kStatusReport;
+    default:
+        return kUnknown;
+    }
+}
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len)
+{
+    TLV::TLVReader reader;
+    reader.Init(data, len);
+
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::MsgCounterSyncReq):
+        return DecodeMessageCounterSyncRequest(reader);
+    case to_underlying(MessageType::MsgCounterSyncRsp):
+        return DecodeMessageCounterSyncResponse(reader);
+    case to_underlying(MessageType::StandaloneAck):
+        return DecodeStandaloneAck(reader);
+    case to_underlying(MessageType::PBKDFParamRequest):
+        return DecodePBDFKParamRequest(reader);
+    case to_underlying(MessageType::PBKDFParamResponse):
+        return DecodePBDFKParamResponse(reader);
+    case to_underlying(MessageType::PASE_Pake1):
+        return DecodePASEPake1(reader);
+    case to_underlying(MessageType::PASE_Pake2):
+        return DecodePASEPake2(reader);
+    case to_underlying(MessageType::PASE_Pake3):
+        return DecodePASEPake3(reader);
+    case to_underlying(MessageType::PASE_PakeError):
+        return DecodePASEPakeError(reader);
+    case to_underlying(MessageType::CASE_Sigma1):
+        return DecodeCASESigma1(reader);
+    case to_underlying(MessageType::CASE_Sigma2):
+        return DecodeCASESigma2(reader);
+    case to_underlying(MessageType::CASE_Sigma3):
+        return DecodeCASESigma3(reader);
+    case to_underlying(MessageType::CASE_Sigma2Resume):
+        return DecodeCASESigma2Resume(reader);
+    case to_underlying(MessageType::StatusReport):
+        return DecodeStatusReport(data, len);
+    default:
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+}
+
+CHIP_ERROR DecodeMessageCounterSyncRequest(TLV::TLVReader & reader)
+{
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
+CHIP_ERROR DecodeMessageCounterSyncResponse(TLV::TLVReader & reader)
+{
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
+CHIP_ERROR DecodeStandaloneAck(TLV::TLVReader & reader)
+{
+    // Standalone Ack does not contains any data. Something wrong is ongoing if this code is reached.
+    return CHIP_ERROR_INCORRECT_STATE;
+}
+
+CHIP_ERROR DecodePBDFKParamRequest(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kInitiatorRandomTag    = 1;
+    constexpr uint8_t kInitiatorSessionIdTag = 2;
+    constexpr uint8_t kPasscodeIdTag         = 3;
+    constexpr uint8_t kHasPBKDFParametersTag = 4;
+    constexpr uint8_t kInitiatorSEDParamsTag = 5;
+
+    ByteSpan initiatorRandom;
+    uint16_t initiatorSessionId;
+    PasscodeId passcodeId;
+    bool hasPBKDFParameters;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kInitiatorRandomTag)));
+    ReturnErrorOnFailure(reader.Get(initiatorRandom));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kInitiatorSessionIdTag)));
+    ReturnErrorOnFailure(reader.Get(initiatorSessionId));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kPasscodeIdTag)));
+    ReturnErrorOnFailure(reader.Get(passcodeId));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kHasPBKDFParametersTag)));
+    ReturnErrorOnFailure(reader.Get(hasPBKDFParameters));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("Initiator Random", initiatorRandom);
+    Log("Initiator Session Id", initiatorSessionId);
+    Log("Passcode Id", passcodeId);
+    Log("hasPBKDFParameters", hasPBKDFParameters ? "true" : "false");
+
+    CHIP_ERROR err = reader.Next();
+    if (err == CHIP_END_OF_TLV)
+    {
+        return reader.ExitContainer(containerType);
+    }
+    ReturnErrorOnFailure(err);
+
+    VerifyOrReturnError(reader.GetTag() == TLV::ContextTag(kInitiatorSEDParamsTag), CHIP_ERROR_INVALID_TLV_TAG);
+    ReturnErrorOnFailure(DecodeSEDParams(reader));
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR DecodePBDFKParamResponse(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kInitiatorRandomTag    = 1;
+    constexpr uint8_t kResponderRandomTag    = 2;
+    constexpr uint8_t kResponderSessionIdTag = 3;
+    constexpr uint8_t kPBKDFParametersTag    = 4;
+    constexpr uint8_t kInitiatorSEDParamsTag = 5;
+
+    ByteSpan initiatorRandom;
+    ByteSpan responderRandom;
+    uint16_t responderSessionId;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kInitiatorRandomTag)));
+    ReturnErrorOnFailure(reader.Get(initiatorRandom));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResponderRandomTag)));
+    ReturnErrorOnFailure(reader.Get(responderRandom));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResponderSessionIdTag)));
+    ReturnErrorOnFailure(reader.Get(responderSessionId));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("Initiator Random", initiatorRandom);
+    Log("Responder Random", responderRandom);
+    Log("Responder Session Id", responderSessionId);
+
+    CHIP_ERROR err = reader.Next();
+    if (err == CHIP_END_OF_TLV)
+    {
+        return reader.ExitContainer(containerType);
+    }
+    ReturnErrorOnFailure(err);
+
+    if (TLV::TagNumFromTag(reader.GetTag()) == kPBKDFParametersTag)
+    {
+        uint32_t iterationCount;
+        ByteSpan salt;
+
+        ReturnErrorOnFailure(reader.EnterContainer(containerType));
+        ReturnErrorOnFailure(reader.Next());
+        ReturnErrorOnFailure(reader.Get(iterationCount));
+        Log("Iteration Count", iterationCount);
+        ReturnErrorOnFailure(reader.Next());
+        ReturnErrorOnFailure(reader.Get(salt));
+        Log("Salt", salt);
+        ReturnErrorOnFailure(reader.ExitContainer(containerType));
+        err = reader.Next();
+    }
+
+    if (err == CHIP_END_OF_TLV)
+    {
+        return reader.ExitContainer(containerType);
+    }
+    ReturnErrorOnFailure(err);
+
+    VerifyOrReturnError(reader.GetTag() == TLV::ContextTag(kInitiatorSEDParamsTag), CHIP_ERROR_INVALID_TLV_TAG);
+    ReturnErrorOnFailure(DecodeSEDParams(reader));
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR DecodePASEPake1(TLV::TLVReader & reader)
+{
+    ByteSpan pA;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next());
+    ReturnErrorOnFailure(reader.Get(pA));
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("pA", pA);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodePASEPake2(TLV::TLVReader & reader)
+{
+    ByteSpan pB;
+    ByteSpan cB;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next());
+    ReturnErrorOnFailure(reader.Get(pB));
+    ReturnErrorOnFailure(reader.Next());
+    ReturnErrorOnFailure(reader.Get(cB));
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("pB", pB);
+    Log("cB", cB);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodePASEPake3(TLV::TLVReader & reader)
+{
+    ByteSpan cA;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next());
+    ReturnErrorOnFailure(reader.Get(cA));
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("cA", cA);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodePASEPakeError(TLV::TLVReader & reader)
+{
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
+CHIP_ERROR DecodeCASESigma1(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kInitiatorRandomTag    = 1;
+    constexpr uint8_t kInitiatorSessionIdTag = 2;
+    constexpr uint8_t kDestinationIdTag      = 3;
+    constexpr uint8_t kInitiatorEphPubKeyTag = 4;
+    constexpr uint8_t kInitiatorSEDParamsTag = 5;
+    constexpr uint8_t kResumptionIDTag       = 6;
+    constexpr uint8_t kResume1MICTag         = 7;
+
+    ByteSpan initiatorRandom;
+    uint16_t initiatorSessionId;
+    ByteSpan destinationId;
+    ByteSpan initiatorEphPubKey;
+    ByteSpan resumptionId;
+    ByteSpan initiatorResumeMIC;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kInitiatorRandomTag)));
+    ReturnErrorOnFailure(reader.Get(initiatorRandom));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kInitiatorSessionIdTag)));
+    ReturnErrorOnFailure(reader.Get(initiatorSessionId));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kDestinationIdTag)));
+    ReturnErrorOnFailure(reader.Get(destinationId));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kInitiatorEphPubKeyTag)));
+    ReturnErrorOnFailure(reader.Get(initiatorEphPubKey));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("InitiatorRandom", initiatorRandom);
+    Log("InitiatorSessionId", initiatorSessionId);
+    Log("DestinationId", destinationId);
+    Log("InitiatorEphPubKey", initiatorEphPubKey);
+
+    CHIP_ERROR err = reader.Next();
+    if (err == CHIP_NO_ERROR && reader.GetTag() == TLV::ContextTag(kInitiatorSEDParamsTag))
+    {
+        ReturnErrorOnFailure(DecodeSEDParams(reader));
+        err = reader.Next();
+    }
+
+    if (err == CHIP_NO_ERROR && reader.GetTag() == TLV::ContextTag(kResumptionIDTag))
+    {
+        ReturnErrorOnFailure(reader.Get(resumptionId));
+        Log("ResumptionID", resumptionId);
+        err = reader.Next();
+    }
+
+    if (err == CHIP_NO_ERROR && reader.GetTag() == TLV::ContextTag(kResume1MICTag))
+    {
+        ReturnErrorOnFailure(reader.Get(initiatorResumeMIC));
+        Log("InitiatorResumeMIC", initiatorResumeMIC);
+        err = reader.Next();
+    }
+
+    if (err == CHIP_END_OF_TLV)
+    {
+        err = CHIP_NO_ERROR;
+    }
+    ReturnErrorOnFailure(err);
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR DecodeCASESigma2(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kResponderRandomTag    = 1;
+    constexpr uint8_t kResponderSessionIdTag = 2;
+    constexpr uint8_t kResponderEphPubKeyTag = 3;
+    constexpr uint8_t kEncrypted2Tag         = 4;
+    constexpr uint8_t kResponderSEDParamsTag = 5;
+
+    ByteSpan responderRandom;
+    uint16_t responderSessionId;
+    ByteSpan responderEphPubKey;
+    ByteSpan encrypted2;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResponderRandomTag)));
+    ReturnErrorOnFailure(reader.Get(responderRandom));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResponderSessionIdTag)));
+    ReturnErrorOnFailure(reader.Get(responderSessionId));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResponderEphPubKeyTag)));
+    ReturnErrorOnFailure(reader.Get(responderEphPubKey));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kEncrypted2Tag)));
+    ReturnErrorOnFailure(reader.Get(encrypted2));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("ResponderRandom", responderRandom);
+    Log("ResponderSessionId", responderSessionId);
+    Log("ResponderEphPubKey", responderEphPubKey);
+    Log("Encrypted2", encrypted2);
+
+    CHIP_ERROR err = reader.Next();
+    if (err == CHIP_NO_ERROR && reader.GetTag() == TLV::ContextTag(kResponderSEDParamsTag))
+    {
+        ReturnErrorOnFailure(DecodeSEDParams(reader));
+        err = reader.Next();
+    }
+
+    if (err == CHIP_END_OF_TLV)
+    {
+        err = CHIP_NO_ERROR;
+    }
+    ReturnErrorOnFailure(err);
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR DecodeCASESigma3(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kEncrypted3Tag = 1;
+
+    ByteSpan encrypted3;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kEncrypted3Tag)));
+    ReturnErrorOnFailure(reader.Get(encrypted3));
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("Encrypted3", encrypted3);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeCASESigma2Resume(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kResumptionIDTag       = 1;
+    constexpr uint8_t kSigma2ResumeMICTag    = 2;
+    constexpr uint8_t kResponderSessionIdTag = 3;
+    constexpr uint8_t kResponderSEDParamsTag = 4;
+
+    ByteSpan resumptionId;
+    ByteSpan sigma2ResumeMIC;
+    uint16_t responderSessionId;
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.Next(containerType, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResumptionIDTag)));
+    ReturnErrorOnFailure(reader.Get(resumptionId));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kSigma2ResumeMICTag)));
+    ReturnErrorOnFailure(reader.Get(sigma2ResumeMIC));
+    ReturnErrorOnFailure(reader.Next(TLV::ContextTag(kResponderSessionIdTag)));
+    ReturnErrorOnFailure(reader.Get(responderSessionId));
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("ResumptionID", resumptionId);
+    Log("Sigma2ResumeMIC", sigma2ResumeMIC);
+    Log("ResponderSessionId", responderSessionId);
+
+    CHIP_ERROR err = reader.Next();
+    if (err == CHIP_NO_ERROR && reader.GetTag() == TLV::ContextTag(kResponderSEDParamsTag))
+    {
+        ReturnErrorOnFailure(DecodeSEDParams(reader));
+        err = reader.Next();
+    }
+
+    if (err == CHIP_END_OF_TLV)
+    {
+        err = CHIP_NO_ERROR;
+    }
+    ReturnErrorOnFailure(err);
+
+    return reader.ExitContainer(containerType);
+}
+
+CHIP_ERROR DecodeStatusReport(const uint8_t * data, size_t len)
+{
+    uint16_t statusGeneralStatusCode;
+    uint32_t statusProtocolId;
+    uint16_t statusProtocolCode;
+
+    Encoding::LittleEndian::Reader bufReader(data, len);
+    ReturnErrorOnFailure(
+        bufReader.Read16(&statusGeneralStatusCode).Read32(&statusProtocolId).Read16(&statusProtocolCode).StatusCode());
+
+    auto scopedIndent = ScopedLogIndent("Parameters");
+    Log("GeneralStatusCode", statusGeneralStatusCode);
+    Log("ProtocolId", statusProtocolId);
+    Log("ProtocolCode", statusProtocolCode);
+
+    if (bufReader.Remaining())
+    {
+        ByteSpan statusProtocolData(data + bufReader.OctetsRead(), bufReader.Remaining());
+        Log("Data", statusProtocolData);
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodeSEDParams(TLV::TLVReader & reader)
+{
+    constexpr uint8_t kIdleRetransmitTimeoutTag   = 1;
+    constexpr uint8_t kActiveRetransmitTimeoutTag = 2;
+
+    auto scopedIndent = ScopedLogIndent("SED");
+
+    TLV::TLVType containerType = TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next());
+
+    if (TLV::TagNumFromTag(reader.GetTag()) == kIdleRetransmitTimeoutTag)
+    {
+        uint32_t idleRetransmitTimeout;
+        ReturnErrorOnFailure(reader.Get(idleRetransmitTimeout));
+        Log("Idle Retransmit Timeout", idleRetransmitTimeout);
+
+        CHIP_ERROR err = reader.Next();
+        if (err == CHIP_END_OF_TLV)
+        {
+            return reader.ExitContainer(containerType);
+        }
+        ReturnErrorOnFailure(err);
+    }
+
+    VerifyOrReturnError(TLV::TagNumFromTag(reader.GetTag()) == kActiveRetransmitTimeoutTag, CHIP_ERROR_INVALID_TLV_TAG);
+
+    uint32_t activeRetransmitTimeout;
+    ReturnErrorOnFailure(reader.Get(activeRetransmitTimeout));
+    Log("Active Retransmit Timeout", activeRetransmitTimeout);
+
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace secure_channel
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/secure_channel/Decoder.h b/examples/common/tracing/decoder/secure_channel/Decoder.h
new file mode 100644
index 00000000000000..3c369667b836e8
--- /dev/null
+++ b/examples/common/tracing/decoder/secure_channel/Decoder.h
@@ -0,0 +1,38 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace secure_channel {
+
+const char * ToProtocolName();
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode);
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len);
+
+} // namespace secure_channel
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/udc/Decoder.cpp b/examples/common/tracing/decoder/udc/Decoder.cpp
new file mode 100644
index 00000000000000..01fb75a2ab314e
--- /dev/null
+++ b/examples/common/tracing/decoder/udc/Decoder.cpp
@@ -0,0 +1,67 @@
+/*
+ *   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 "Decoder.h"
+
+#include <protocols/user_directed_commissioning/UserDirectedCommissioning.h>
+
+namespace {
+constexpr const char * kProtocolName = "User Directed Commissioning";
+
+constexpr const char * kUnknown                   = "Unknown";
+constexpr const char * kIdentificationDeclaration = "Identification Declaration";
+} // namespace
+
+using MessageType = chip::Protocols::UserDirectedCommissioning::MsgType;
+
+namespace chip {
+namespace trace {
+namespace udc {
+
+const char * ToProtocolName()
+{
+    return kProtocolName;
+}
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode)
+{
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::IdentificationDeclaration):
+        return kIdentificationDeclaration;
+    default:
+        return kUnknown;
+    }
+}
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len)
+{
+    // TODO Implement messages decoding
+
+    switch (protocolCode)
+    {
+    case to_underlying(MessageType::IdentificationDeclaration):
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    default:
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+}
+
+} // namespace udc
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/decoder/udc/Decoder.h b/examples/common/tracing/decoder/udc/Decoder.h
new file mode 100644
index 00000000000000..90801ecce2a231
--- /dev/null
+++ b/examples/common/tracing/decoder/udc/Decoder.h
@@ -0,0 +1,38 @@
+/*
+ *   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 <lib/core/CHIPError.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+namespace trace {
+namespace udc {
+
+const char * ToProtocolName();
+
+const char * ToProtocolMessageTypeName(uint8_t protocolCode);
+
+CHIP_ERROR LogAsProtocolMessage(uint8_t protocolCode, const uint8_t * data, size_t len);
+
+} // namespace udc
+} // namespace trace
+} // namespace chip
diff --git a/examples/common/tracing/main.cpp b/examples/common/tracing/main.cpp
new file mode 100644
index 00000000000000..1a4815b2d54387
--- /dev/null
+++ b/examples/common/tracing/main.cpp
@@ -0,0 +1,51 @@
+/*
+ *   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 "TraceDecoder.h"
+#include "TraceDecoderArgumentParser.h"
+
+#include <lib/support/CHIPPlatformMemory.h>
+#include <platform/CHIPDeviceLayer.h>
+
+int main(int argc, char * argv[])
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    err = chip::Platform::MemoryInit();
+    if (CHIP_NO_ERROR != err)
+    {
+        ChipLogError(NotSpecified, "Platform::MemoryInit() failure: %s", chip::ErrorStr(err));
+        return EXIT_FAILURE;
+    }
+
+    VerifyOrReturnError(CHIP_NO_ERROR == TraceDecoderArgumentParser::GetInstance().ParseArguments(argc, argv), EXIT_FAILURE);
+
+    auto decoder = chip::trace::TraceDecoder();
+    decoder.SetOptions(TraceDecoderArgumentParser::GetInstance().options);
+
+    err = decoder.ReadFile(TraceDecoderArgumentParser::GetInstance().logFile);
+    if (CHIP_NO_ERROR != err)
+    {
+        ChipLogError(NotSpecified, "Can not decode file: %s. Error: %s", TraceDecoderArgumentParser::GetInstance().logFile,
+                     chip::ErrorStr(err));
+        return EXIT_FAILURE;
+    }
+
+    chip::Platform::MemoryShutdown();
+    return EXIT_SUCCESS;
+}
diff --git a/examples/common/tracing/third_party/connectedhomeip b/examples/common/tracing/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/common/tracing/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ No newline at end of file
diff --git a/examples/chip-tool-darwin/.gn b/examples/darwin-framework-tool/.gn
similarity index 100%
rename from examples/chip-tool-darwin/.gn
rename to examples/darwin-framework-tool/.gn
diff --git a/examples/chip-tool-darwin/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn
similarity index 76%
rename from examples/chip-tool-darwin/BUILD.gn
rename to examples/darwin-framework-tool/BUILD.gn
index 890a97f43e42a7..f543b83c0c4690 100644
--- a/examples/chip-tool-darwin/BUILD.gn
+++ b/examples/darwin-framework-tool/BUILD.gn
@@ -23,19 +23,26 @@ assert(chip_build_tools)
 config("config") {
   include_dirs = [
     ".",
-    "${chip_root}/zzz_generated/chip-tool-darwin",
+    "${chip_root}/zzz_generated/darwin-framework-tool",
     "${chip_root}/examples/chip-tool/commands/clusters/ComplexArgument.h",
   ]
 
-  defines = [ "CONFIG_ENABLE_YAML_TESTS=${config_enable_yaml_tests}" ]
+  defines = [
+    "CONFIG_ENABLE_YAML_TESTS=${config_enable_yaml_tests}",
+    "CONFIG_USE_INTERACTIVE_MODE=${config_use_interactive_mode}",
+  ]
 
   cflags = [
     "-Wconversion",
     "-fobjc-arc",
   ]
+
+  if (config_use_interactive_mode) {
+    libs = [ "readline" ]
+  }
 }
 
-executable("chip-tool-darwin") {
+executable("darwin-framework-tool") {
   sources = [
     "${chip_root}/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp",
     "commands/clusters/ClusterCommandBridge.h",
@@ -46,6 +53,8 @@ executable("chip-tool-darwin") {
     "commands/common/CHIPCommandStorageDelegate.mm",
     "commands/common/CHIPToolKeypair.mm",
     "commands/pairing/Commands.h",
+    "commands/pairing/OpenCommissioningWindowCommand.h",
+    "commands/pairing/OpenCommissioningWindowCommand.mm",
     "commands/pairing/PairingCommandBridge.mm",
     "commands/pairing/PairingDelegateBridge.mm",
     "commands/storage/Commands.h",
@@ -53,8 +62,12 @@ executable("chip-tool-darwin") {
     "main.mm",
   ]
 
+  if (config_use_interactive_mode) {
+    sources += [ "commands/interactive/InteractiveCommands.mm" ]
+  }
+
   if (config_enable_yaml_tests) {
-    sources += [ "${chip_root}/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm" ]
+    sources += [ "${chip_root}/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm" ]
   }
 
   deps = [
diff --git a/examples/chip-tool-darwin/README.md b/examples/darwin-framework-tool/README.md
similarity index 85%
rename from examples/chip-tool-darwin/README.md
rename to examples/darwin-framework-tool/README.md
index be2e5d60c04f63..833749bea25a99 100644
--- a/examples/chip-tool-darwin/README.md
+++ b/examples/darwin-framework-tool/README.md
@@ -1,4 +1,4 @@
-# Matter chip-tool-darwin
+# Matter darwin-framework-tool
 
 An example application that uses Matter to send messages to a Matter server.
 
@@ -20,15 +20,15 @@ background on build prerequisites.
 Building the example application is quite straightforward.
 
 ```
-scripts/examples/gn_build_example.sh examples/chip-tool-darwin SOME-PATH/
+scripts/examples/gn_build_example.sh examples/darwin-framework-tool SOME-PATH/
 ```
 
-which puts the binary at `SOME-PATH/chip-tool-darwin`.
+which puts the binary at `SOME-PATH/darwin-framework-tool`.
 
 ## Using the Client to commission a device
 
 In order to send commands to a device, it must be commissioned with the client.
-chip-tool-darwin currently only supports commissioning and remembering one
+darwin-framework-tool currently only supports commissioning and remembering one
 device at a time. The configuration state is stored in
 `/tmp/chip_tool_config.ini`; deleting this and other `.ini` files in `/tmp` can
 sometimes resolve issues due to stale configuration.
@@ -43,14 +43,14 @@ and choose the pairing mode.
 The command below will pair devices with the provided IP, discriminator and
 setup code.
 
-    $ chip-tool-darwin pairing ethernet {NODE_ID_TO_ASSIGN} 20202021 3840 {IP_ADDRESS}
+    $ darwin-framework-tool pairing ethernet {NODE_ID_TO_ASSIGN} 20202021 3840 {IP_ADDRESS}
 
 In this case, the device will be assigned node id `${NODE_ID_TO_ASSIGN}` (which
 must be a decimal number or a 0x-prefixed hex number).
 
 ### Forget the currently-commissioned device
 
-    $ chip-tool-darwin pairing unpair
+    $ darwin-framework-tool pairing unpair
 
 ## Using the Client to Send Matter Commands
 
@@ -59,7 +59,7 @@ the target cluster name, the target command name as well as an endpoint id.
 
 The endpoint id must be between 1 and 240.
 
-    $ chip-tool-darwin onoff on 1
+    $ darwin-framework-tool onoff on 1
 
 The client will send a single command packet and then exit.
 
@@ -68,13 +68,13 @@ The client will send a single command packet and then exit.
 To get the list of supported clusters, run the built executable without any
 arguments.
 
-    $ chip-tool-darwin
+    $ darwin-framework-tool
 
 Example output:
 
 ```bash
 Usage:
-  ./chip-tool-darwin cluster_name command_name [param1 param2 ...]
+  ./darwin-framework-tool cluster_name command_name [param1 param2 ...]
 
   +-------------------------------------------------------------------------------------+
   | Clusters:                                                                           |
@@ -99,18 +99,18 @@ Usage:
 To get the list of commands for a specific cluster, run the built executable
 with the target cluster name.
 
-    $ chip-tool-darwin onoff
+    $ darwin-framework-tool onoff
 
 ### How to get the list of supported attributes for a specific cluster
 
 To the the list of attributes for a specific cluster, run the built executable
 with the target cluster name and the `read` command name.
 
-    $ chip-tool-darwin onoff read
+    $ darwin-framework-tool onoff read
 
 ### How to get the list of parameters for a command
 
 To get the list of parameters for a specific command, run the built executable
 with the target cluster name and the target command name
 
-    $ chip-tool-darwin onoff on
+    $ darwin-framework-tool onoff on
diff --git a/examples/chip-tool-darwin/args.gni b/examples/darwin-framework-tool/args.gni
similarity index 100%
rename from examples/chip-tool-darwin/args.gni
rename to examples/darwin-framework-tool/args.gni
diff --git a/examples/chip-tool-darwin/build_overrides b/examples/darwin-framework-tool/build_overrides
similarity index 100%
rename from examples/chip-tool-darwin/build_overrides
rename to examples/darwin-framework-tool/build_overrides
diff --git a/examples/chip-tool-darwin/commands/clusters/ClusterCommandBridge.h b/examples/darwin-framework-tool/commands/clusters/ClusterCommandBridge.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/clusters/ClusterCommandBridge.h
rename to examples/darwin-framework-tool/commands/clusters/ClusterCommandBridge.h
diff --git a/examples/chip-tool-darwin/commands/clusters/ModelCommandBridge.h b/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h
similarity index 94%
rename from examples/chip-tool-darwin/commands/clusters/ModelCommandBridge.h
rename to examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h
index 0f7a80f600ea94..adb1d21dece650 100644
--- a/examples/chip-tool-darwin/commands/clusters/ModelCommandBridge.h
+++ b/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h
@@ -34,6 +34,10 @@ class ModelCommand : public CHIPCommandBridge
         AddArgument("endpoint-id", 0, UINT16_MAX, &mEndPointId);
     }
 
+    void Shutdown() override;
+
+    void Cleanup() override { ModelCommand::Shutdown(); }
+
     /////////// CHIPCommand Interface /////////
     CHIP_ERROR RunCommand() override;
     chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(10); }
diff --git a/examples/chip-tool-darwin/commands/clusters/ModelCommandBridge.mm b/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.mm
similarity index 97%
rename from examples/chip-tool-darwin/commands/clusters/ModelCommandBridge.mm
rename to examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.mm
index 1838033f9f8732..8a27391324cdc5 100644
--- a/examples/chip-tool-darwin/commands/clusters/ModelCommandBridge.mm
+++ b/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.mm
@@ -49,3 +49,5 @@
                             }];
     return CHIP_NO_ERROR;
 }
+
+void ModelCommand::Shutdown() { ResetArguments(); }
diff --git a/examples/chip-tool-darwin/commands/clusters/ReportCommandBridge.h b/examples/darwin-framework-tool/commands/clusters/ReportCommandBridge.h
similarity index 85%
rename from examples/chip-tool-darwin/commands/clusters/ReportCommandBridge.h
rename to examples/darwin-framework-tool/commands/clusters/ReportCommandBridge.h
index ceb9a17642dbbd..17baa322ddc581 100644
--- a/examples/chip-tool-darwin/commands/clusters/ReportCommandBridge.h
+++ b/examples/darwin-framework-tool/commands/clusters/ReportCommandBridge.h
@@ -132,35 +132,50 @@ class SubscribeAttribute : public ModelCommand {
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         [device subscribeAttributeWithEndpointId:[NSNumber numberWithUnsignedShort:endpointId]
-                                       clusterId:[NSNumber numberWithUnsignedInteger:mClusterId]
-                                     attributeId:[NSNumber numberWithUnsignedInteger:mAttributeId]
-                                     minInterval:[NSNumber numberWithUnsignedInteger:mMinInterval]
-                                     maxInterval:[NSNumber numberWithUnsignedInteger:mMaxInterval]
-                                          params:params
-                                     clientQueue:callbackQueue
-                                   reportHandler:^(
-                                       NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
-                                       if (values) {
-                                           for (id item in values) {
-                                               NSLog(@"Response Item: %@", [item description]);
-                                           }
-                                       }
-                                       if (error || !mWait) {
-                                           SetCommandExitStatus(error);
-                                       }
-                                   }
-                         subscriptionEstablished:nil];
+            clusterId:[NSNumber numberWithUnsignedInteger:mClusterId]
+            attributeId:[NSNumber numberWithUnsignedInteger:mAttributeId]
+            minInterval:[NSNumber numberWithUnsignedInteger:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInteger:mMaxInterval]
+            params:params
+            clientQueue:callbackQueue
+            reportHandler:^(NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
+                if (values) {
+                    for (id item in values) {
+                        NSLog(@"Response Item: %@", [item description]);
+                    }
+                }
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }];
 
         return CHIP_NO_ERROR;
     }
 
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
+    }
+
 protected:
     chip::Optional<bool> mKeepSubscriptions;
     chip::Optional<bool> mFabricFiltered;
+    bool mSubscriptionEstablished = NO;
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     bool mWait;
 
+    void Shutdown() override
+    {
+        mSubscriptionEstablished = NO;
+        ModelCommand::Shutdown();
+    }
+
+    bool DeferInteractiveCleanup() override { return mSubscriptionEstablished; }
+
 private:
     chip::ClusterId mClusterId;
     chip::AttributeId mAttributeId;
@@ -211,6 +226,7 @@ class SubscribeEvent : public ModelCommand {
                 }
             }
             subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }];
 
         return CHIP_NO_ERROR;
@@ -224,6 +240,7 @@ class SubscribeEvent : public ModelCommand {
 protected:
     chip::Optional<bool> mKeepSubscriptions;
     chip::Optional<chip::EventNumber> mEventNumber;
+    bool mSubscriptionEstablished = NO;
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     bool mWait;
diff --git a/examples/chip-tool-darwin/commands/clusters/WriteAttributeCommandBridge.h b/examples/darwin-framework-tool/commands/clusters/WriteAttributeCommandBridge.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/clusters/WriteAttributeCommandBridge.h
rename to examples/darwin-framework-tool/commands/clusters/WriteAttributeCommandBridge.h
diff --git a/examples/chip-tool-darwin/commands/common/CHIPCommandBridge.h b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h
similarity index 79%
rename from examples/chip-tool-darwin/commands/common/CHIPCommandBridge.h
rename to examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h
index 5557cb66b7a0ca..632f67dfbe0f8f 100644
--- a/examples/chip-tool-darwin/commands/common/CHIPCommandBridge.h
+++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h
@@ -45,7 +45,6 @@ class CHIPCommandBridge : public Command
     void SetCommandExitStatus(CHIP_ERROR status)
     {
         mCommandExitStatus = status;
-        ShutdownCommissioner();
         StopWaiting();
     }
 
@@ -76,6 +75,22 @@ class CHIPCommandBridge : public Command
     // if failure).
     void LogNSError(const char * logString, NSError * error);
 
+    // Clean up any resources allocated by the command.  Some commands may hold
+    // on to resources after Shutdown(), but Cleanup() will guarantee those are
+    // cleaned up.
+    virtual void Cleanup() {}
+
+    // If true, skip calling Cleanup() when in interactive mode, so the command
+    // can keep doing work as needed.  Cleanup() will be called when quitting
+    // interactive mode.  This method will be called before Shutdown, so it can
+    // use member values that Shutdown will normally reset.
+    virtual bool DeferInteractiveCleanup() { return NO; }
+
+    // Execute any deferred cleanups.  Used when exiting interactive mode.
+    void ExecuteDeferredCleanups();
+
+    static std::set<CHIPCommandBridge *> sDeferredCleanups;
+
 private:
     CHIP_ERROR InitializeCommissioner(std::string key, chip::FabricId fabricId,
                                       const chip::Credentials::AttestationTrustStore * trustStore);
@@ -87,8 +102,11 @@ class CHIPCommandBridge : public Command
     CHIP_ERROR StartWaiting(chip::System::Clock::Timeout seconds);
     void StopWaiting();
 
+    CHIP_ERROR MaybeSetUpStack();
+    CHIP_ERROR MaybeTearDownStack();
+
     // Our three controllers: alpha, beta, gamma.
-    std::map<std::string, CHIPDeviceController *> mControllers;
+    static std::map<std::string, CHIPDeviceController *> mControllers;
 
     // The current controller; the one the current command should be using.
     CHIPDeviceController * mCurrentController;
diff --git a/examples/chip-tool-darwin/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
similarity index 84%
rename from examples/chip-tool-darwin/commands/common/CHIPCommandBridge.mm
rename to examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
index b5d8a6c1d0051b..551400c4f68bbf 100644
--- a/examples/chip-tool-darwin/commands/common/CHIPCommandBridge.mm
+++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
@@ -27,10 +27,36 @@
 
 const uint16_t kListenPort = 5541;
 static CHIPToolPersistentStorageDelegate * storage = nil;
+std::set<CHIPCommandBridge *> CHIPCommandBridge::sDeferredCleanups;
+std::map<std::string, CHIPDeviceController *> CHIPCommandBridge::mControllers;
 
 CHIP_ERROR CHIPCommandBridge::Run()
 {
     ChipLogProgress(chipTool, "Running Command");
+    ReturnErrorOnFailure(MaybeSetUpStack());
+    SetIdentity(mCommissionerName.HasValue() ? mCommissionerName.Value() : kIdentityAlpha);
+    ReturnLogErrorOnFailure(RunCommand());
+    ReturnLogErrorOnFailure(StartWaiting(GetWaitDuration()));
+
+    bool deferCleanup = (IsInteractive() && DeferInteractiveCleanup());
+
+    Shutdown();
+
+    if (deferCleanup) {
+        sDeferredCleanups.insert(this);
+    } else {
+        Cleanup();
+    }
+    ReturnErrorOnFailure(MaybeTearDownStack());
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR CHIPCommandBridge::MaybeSetUpStack()
+{
+    if (IsInteractive()) {
+        return CHIP_NO_ERROR;
+    }
     NSData * ipk;
     CHIPToolKeypair * nocSigner = [[CHIPToolKeypair alloc] init];
     storage = [[CHIPToolPersistentStorageDelegate alloc] init];
@@ -76,15 +102,19 @@
         mControllers[identities[i]] = controller;
     }
 
-    // If no commissioner name passed in, default to alpha.
-    SetIdentity(mCommissionerName.HasValue() ? mCommissionerName.Value() : kIdentityAlpha);
-
-    ReturnLogErrorOnFailure(RunCommand());
-    ReturnLogErrorOnFailure(StartWaiting(GetWaitDuration()));
-
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR CHIPCommandBridge::MaybeTearDownStack()
+{
+    CHIP_ERROR err;
+    if (IsInteractive()) {
+        return CHIP_NO_ERROR;
+    }
+    err = ShutdownCommissioner();
+    return err;
+}
+
 void CHIPCommandBridge::SetIdentity(const char * identity)
 {
     std::string name = std::string(identity);
@@ -116,7 +146,6 @@
 
 CHIP_ERROR CHIPCommandBridge::StartWaiting(chip::System::Clock::Timeout duration)
 {
-    chip::DeviceLayer::PlatformMgr().StartEventLoopTask();
     auto waitingUntil = std::chrono::system_clock::now() + std::chrono::duration_cast<std::chrono::seconds>(duration);
     {
         std::unique_lock<std::mutex> lk(cvWaitingForResponseMutex);
@@ -124,7 +153,6 @@
             mCommandExitStatus = CHIP_ERROR_TIMEOUT;
         }
     }
-    LogErrorOnFailure(chip::DeviceLayer::PlatformMgr().StopEventLoopTask());
 
     return mCommandExitStatus;
 }
@@ -133,7 +161,7 @@
 {
     {
         std::lock_guard<std::mutex> lk(cvWaitingForResponseMutex);
-        mWaitingForResponse = false;
+        mWaitingForResponse = NO;
     }
     cvWaitingForResponse.notify_all();
 }
@@ -156,3 +184,11 @@
         ChipLogError(chipTool, "%s: %s", logString, chip::ErrorStr(err));
     }
 }
+
+void CHIPCommandBridge::ExecuteDeferredCleanups()
+{
+    for (auto * cmd : sDeferredCleanups) {
+        cmd->Cleanup();
+    }
+    sDeferredCleanups.clear();
+}
diff --git a/examples/chip-tool-darwin/commands/common/CHIPCommandStorageDelegate.h b/examples/darwin-framework-tool/commands/common/CHIPCommandStorageDelegate.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/common/CHIPCommandStorageDelegate.h
rename to examples/darwin-framework-tool/commands/common/CHIPCommandStorageDelegate.h
diff --git a/examples/chip-tool-darwin/commands/common/CHIPCommandStorageDelegate.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandStorageDelegate.mm
similarity index 100%
rename from examples/chip-tool-darwin/commands/common/CHIPCommandStorageDelegate.mm
rename to examples/darwin-framework-tool/commands/common/CHIPCommandStorageDelegate.mm
diff --git a/examples/chip-tool-darwin/commands/common/CHIPToolKeypair.h b/examples/darwin-framework-tool/commands/common/CHIPToolKeypair.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/common/CHIPToolKeypair.h
rename to examples/darwin-framework-tool/commands/common/CHIPToolKeypair.h
diff --git a/examples/chip-tool-darwin/commands/common/CHIPToolKeypair.mm b/examples/darwin-framework-tool/commands/common/CHIPToolKeypair.mm
similarity index 100%
rename from examples/chip-tool-darwin/commands/common/CHIPToolKeypair.mm
rename to examples/darwin-framework-tool/commands/common/CHIPToolKeypair.mm
diff --git a/examples/darwin-framework-tool/commands/interactive/Commands.h b/examples/darwin-framework-tool/commands/interactive/Commands.h
new file mode 100644
index 00000000000000..59a06b6a60fe5b
--- /dev/null
+++ b/examples/darwin-framework-tool/commands/interactive/Commands.h
@@ -0,0 +1,37 @@
+/*
+ *   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 "../common/CHIPCommandBridge.h"
+#include <commands/common/Command.h>
+
+#include "InteractiveCommands.h"
+
+void registerCommandsInteractive(Commands & commands)
+{
+    const char * clusterName = "interactive";
+
+    commands_list clusterCommands = {
+#if CONFIG_USE_INTERACTIVE_MODE
+        make_unique<InteractiveStartCommand>(&commands),
+#endif // CONFIG_USE_INTERACTIVE_MODE
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.h b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.h
new file mode 100644
index 00000000000000..98347747f64fc6
--- /dev/null
+++ b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.h
@@ -0,0 +1,40 @@
+/*
+ *   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 "../common/CHIPCommandBridge.h"
+#include "commands/common/Commands.h"
+
+#include "InteractiveCommands.h"
+
+class Commands;
+
+class InteractiveStartCommand : public CHIPCommandBridge
+{
+public:
+    InteractiveStartCommand(Commands * commandsHandler) : CHIPCommandBridge("start"), mHandler(commandsHandler) {}
+
+    CHIP_ERROR RunCommand() override;
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(0); }
+
+private:
+    bool ParseCommand(char * command);
+    Commands * mHandler = nullptr;
+};
diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
new file mode 100644
index 00000000000000..3ffe41c7744f94
--- /dev/null
+++ b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
@@ -0,0 +1,127 @@
+/*
+ *   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 "InteractiveCommands.h"
+
+#include <iomanip>
+#include <readline/history.h>
+#include <readline/readline.h>
+#include <sstream>
+
+char kInteractiveModeName[] = "";
+constexpr const char * kInteractiveModePrompt = ">>> ";
+constexpr uint8_t kInteractiveModeArgumentsMaxLength = 32;
+constexpr const char * kInteractiveModeHistoryFilePath = "/tmp/darwin_framework_tool_history";
+constexpr const char * kInteractiveModeStopCommand = "quit()";
+
+namespace {
+
+bool gIsCommandRunning = NO;
+
+void ClearLine()
+{
+    printf("\r\x1B[0J"); // Move cursor to the beginning of the line and clear from cursor to end of the screen
+}
+
+void ENFORCE_FORMAT(3, 0) LoggingCallback(const char * module, uint8_t category, const char * msg, va_list args)
+{
+    ClearLine();
+    chip::Logging::Platform::LogV(module, category, msg, args);
+    ClearLine();
+
+    if (gIsCommandRunning == NO) {
+        rl_forced_update_display();
+    }
+}
+} // namespace
+
+char * GetCommand(char * command)
+{
+    if (command != nullptr) {
+        free(command);
+        command = nullptr;
+    }
+
+    command = readline(kInteractiveModePrompt);
+
+    // Do not save empty lines
+    if (command != nullptr && *command) {
+        add_history(command);
+        write_history(kInteractiveModeHistoryFilePath);
+    }
+
+    return command;
+}
+
+CHIP_ERROR InteractiveStartCommand::RunCommand()
+{
+    read_history(kInteractiveModeHistoryFilePath);
+
+    // Logs needs to be redirected in order to refresh the screen appropriately when something
+    // is dumped to stdout while the user is typing a command.
+    chip::Logging::SetLogRedirectCallback(LoggingCallback);
+
+    char * command = nullptr;
+    while (YES) {
+        command = GetCommand(command);
+        if (command != nullptr && !ParseCommand(command)) {
+            break;
+        }
+    }
+
+    SetCommandExitStatus(CHIP_NO_ERROR);
+    return CHIP_NO_ERROR;
+}
+
+bool InteractiveStartCommand::ParseCommand(char * command)
+{
+    if (strcmp(command, kInteractiveModeStopCommand) == 0) {
+        ExecuteDeferredCleanups();
+        return NO;
+    }
+
+    char * args[kInteractiveModeArgumentsMaxLength];
+    args[0] = kInteractiveModeName;
+    int argsCount = 1;
+    std::string arg;
+
+    std::stringstream ss(command);
+    while (ss >> std::quoted(arg)) {
+        if (argsCount == kInteractiveModeArgumentsMaxLength) {
+            gIsCommandRunning = YES;
+            ChipLogError(chipTool, "Too many arguments. Ignoring.");
+            gIsCommandRunning = NO;
+            return YES;
+        }
+
+        char * carg = new char[arg.size() + 1];
+        strcpy(carg, arg.c_str());
+        args[argsCount++] = carg;
+    }
+
+    ClearLine();
+    gIsCommandRunning = YES;
+    mHandler->RunInteractive(argsCount, args);
+    gIsCommandRunning = NO;
+
+    // Do not delete arg[0]
+    while (--argsCount)
+        delete[] args[argsCount];
+
+    return YES;
+}
diff --git a/examples/chip-tool-darwin/commands/pairing/Commands.h b/examples/darwin-framework-tool/commands/pairing/Commands.h
similarity index 71%
rename from examples/chip-tool-darwin/commands/pairing/Commands.h
rename to examples/darwin-framework-tool/commands/pairing/Commands.h
index 38f23e2a3e286f..1fed642addae64 100644
--- a/examples/chip-tool-darwin/commands/pairing/Commands.h
+++ b/examples/darwin-framework-tool/commands/pairing/Commands.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "OpenCommissioningWindowCommand.h"
 #include "PairingCommandBridge.h"
 
 class PairCode : public PairingCommandBridge
@@ -26,6 +27,18 @@ class PairCode : public PairingCommandBridge
     PairCode() : PairingCommandBridge("code", PairingMode::Code, PairingNetworkType::None) {}
 };
 
+class PairCodeWifi : public PairingCommandBridge
+{
+public:
+    PairCodeWifi() : PairingCommandBridge("code-wifi", PairingMode::Code, PairingNetworkType::WiFi) {}
+};
+
+class PairCodeThread : public PairingCommandBridge
+{
+public:
+    PairCodeThread() : PairingCommandBridge("code-thread", PairingMode::Code, PairingNetworkType::Thread) {}
+};
+
 class PairWithIPAddress : public PairingCommandBridge
 {
 public:
@@ -55,8 +68,10 @@ void registerCommandsPairing(Commands & commands)
     const char * clusterName = "Pairing";
 
     commands_list clusterCommands = {
-        make_unique<PairCode>(), make_unique<PairWithIPAddress>(), make_unique<PairBleWiFi>(), make_unique<PairBleThread>(),
-        make_unique<Unpair>(),
+        make_unique<PairCode>(),     make_unique<PairWithIPAddress>(),
+        make_unique<PairCodeWifi>(), make_unique<PairCodeThread>(),
+        make_unique<PairBleWiFi>(),  make_unique<PairBleThread>(),
+        make_unique<Unpair>(),       make_unique<OpenCommissioningWindowCommand>(),
     };
 
     commands.Register(clusterName, clusterCommands);
diff --git a/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h b/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h
new file mode 100644
index 00000000000000..c5af318e841f35
--- /dev/null
+++ b/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h
@@ -0,0 +1,57 @@
+/*
+ *   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 "../common/CHIPCommandBridge.h"
+
+class OpenCommissioningWindowCommand : public CHIPCommandBridge
+{
+public:
+    OpenCommissioningWindowCommand() : CHIPCommandBridge("open-commissioning-window")
+    {
+        AddArgument("node-id", 0, UINT64_MAX, &mNodeId, "Node to open a commissionging window on.");
+        AddArgument("option", 0, 1, &mCommissioningWindowOption,
+                    "1 to use Enhanced Commissioning Method.\n  0 to use Basic Commissioning Method.");
+        AddArgument("window-timeout", 0, UINT16_MAX, &mCommissioningWindowTimeoutMs,
+                    "Time, in seconds, before the commissioning window closes.");
+        AddArgument("iteration", chip::kSpake2p_Min_PBKDF_Iterations, chip::kSpake2p_Max_PBKDF_Iterations, &mIteration,
+                    "Number of PBKDF iterations to use to derive the verifier.  Ignored if 'option' is 0.");
+        AddArgument("discriminator", 0, 4096, &mDiscriminator, "Discriminator to use for advertising.  Ignored if 'option' is 0.");
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout, "Time, in seconds, before this command is considered to have timed out.");
+    }
+
+protected:
+    /////////// CHIPCommandBridge Interface /////////
+    CHIP_ERROR RunCommand() override;
+    // We issue multiple data model operations for this command, and the default
+    // timeout for those is 10 seconds, so default to 20 seconds.
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(20)); }
+
+    chip::NodeId mNodeId;
+    uint8_t mCommissioningWindowOption;
+    uint16_t mCommissioningWindowTimeoutMs;
+    uint32_t mIteration;
+    uint16_t mDiscriminator;
+
+    chip::Optional<uint16_t> mTimeout;
+
+    // TODO: We should not need these members if we got sane callbacks from the
+    // framework when the commissioning window is open.
+    dispatch_queue_t mWorkQueue;
+    dispatch_source_t mTimer;
+};
diff --git a/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.mm b/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.mm
new file mode 100644
index 00000000000000..e7f97bca379b0d
--- /dev/null
+++ b/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.mm
@@ -0,0 +1,63 @@
+/*
+ *   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.
+ */
+
+#import <CHIP/CHIP.h>
+
+#include "OpenCommissioningWindowCommand.h"
+
+CHIP_ERROR OpenCommissioningWindowCommand::RunCommand()
+{
+    auto * controller = CurrentCommissioner();
+    NSError * error;
+    __block NSString * pairingCode;
+    if (mCommissioningWindowOption == 0) {
+        [controller openPairingWindow:mNodeId duration:mCommissioningWindowTimeoutMs error:&error];
+    } else {
+        pairingCode = [controller openPairingWindowWithPIN:mNodeId
+                                                  duration:mCommissioningWindowTimeoutMs
+                                             discriminator:mDiscriminator
+                                                  setupPIN:arc4random()
+                                                     error:&error];
+    }
+
+    if (error != nil) {
+        SetCommandExitStatus(error);
+        return CHIP_NO_ERROR;
+    }
+
+    // TODO: Those should be async operations and we should not claim to
+    // be done until they complete.  As things stand, we have no idea
+    // how to tell when we're done, so just set a timer for slightly
+    // less than our command timeout to call SetCommandExitStatus.
+    mWorkQueue = dispatch_queue_create("com.chip.open_commissioning_window", DISPATCH_QUEUE_SERIAL);
+    mTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, mWorkQueue);
+    auto * self = this;
+    dispatch_source_set_event_handler(mTimer, ^{
+        dispatch_source_cancel(mTimer);
+        mTimer = nil;
+        mWorkQueue = nil;
+        if (pairingCode != nil) {
+            ChipLogProgress(chipTool, "Setup code: %s\n", [pairingCode UTF8String]);
+        }
+        self->SetCommandExitStatus(CHIP_NO_ERROR);
+    });
+    dispatch_source_set_timer(
+        mTimer, dispatch_time(DISPATCH_TIME_NOW, (GetWaitDuration().count() - 2000) * NSEC_PER_MSEC), DISPATCH_TIME_FOREVER, 0);
+    dispatch_resume(mTimer);
+
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.h b/examples/darwin-framework-tool/commands/pairing/PairingCommandBridge.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.h
rename to examples/darwin-framework-tool/commands/pairing/PairingCommandBridge.h
diff --git a/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.mm b/examples/darwin-framework-tool/commands/pairing/PairingCommandBridge.mm
similarity index 100%
rename from examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.mm
rename to examples/darwin-framework-tool/commands/pairing/PairingCommandBridge.mm
diff --git a/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.h b/examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.h
rename to examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.h
diff --git a/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.mm b/examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.mm
similarity index 100%
rename from examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.mm
rename to examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.mm
diff --git a/examples/chip-tool-darwin/commands/storage/Commands.h b/examples/darwin-framework-tool/commands/storage/Commands.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/storage/Commands.h
rename to examples/darwin-framework-tool/commands/storage/Commands.h
diff --git a/examples/chip-tool-darwin/commands/storage/StorageManagementCommand.h b/examples/darwin-framework-tool/commands/storage/StorageManagementCommand.h
similarity index 100%
rename from examples/chip-tool-darwin/commands/storage/StorageManagementCommand.h
rename to examples/darwin-framework-tool/commands/storage/StorageManagementCommand.h
diff --git a/examples/chip-tool-darwin/commands/storage/StorageManagementCommand.mm b/examples/darwin-framework-tool/commands/storage/StorageManagementCommand.mm
similarity index 100%
rename from examples/chip-tool-darwin/commands/storage/StorageManagementCommand.mm
rename to examples/darwin-framework-tool/commands/storage/StorageManagementCommand.mm
diff --git a/examples/chip-tool-darwin/commands/tests/TestCommandBridge.h b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
similarity index 79%
rename from examples/chip-tool-darwin/commands/tests/TestCommandBridge.h
rename to examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
index 42c15e097f048b..4e5c870225ae0e 100644
--- a/examples/chip-tool-darwin/commands/tests/TestCommandBridge.h
+++ b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
@@ -190,20 +190,14 @@ class TestCommandBridge : public CHIPCommandBridge,
         Exit("Unexpected deletion of pairing");
     }
 
-    void PairingComplete(chip::NodeId nodeId, NSError * _Nullable error)
+    void PairingComplete(chip::NodeId nodeId)
     {
-        CHIP_ERROR err = [CHIPError errorToCHIPErrorCode:error];
-        if (err != CHIP_NO_ERROR) {
-            Exit("Pairing completed with error", err);
-            return;
-        }
-
         CHIPDeviceController * controller = CurrentCommissioner();
         VerifyOrReturn(controller != nil, Exit("No current commissioner"));
 
         NSError * commissionError = nil;
         [controller commissionDevice:nodeId commissioningParams:[[CHIPCommissioningParameters alloc] init] error:&commissionError];
-        err = [CHIPError errorToCHIPErrorCode:commissionError];
+        CHIP_ERROR err = [CHIPError errorToCHIPErrorCode:commissionError];
         if (err != CHIP_NO_ERROR) {
             Exit("Failed to kick off commissioning", err);
             return;
@@ -256,16 +250,56 @@ class TestCommandBridge : public CHIPCommandBridge,
         return ConstraintsChecker::CheckConstraintIsHexString(itemName, value, expectHexString);
     }
 
+    template <typename T> bool CheckConstraintContains(const char * _Nonnull itemName, const NSArray * _Nonnull current, T expected)
+    {
+        for (id currentElement in current) {
+            if ([currentElement isEqualToNumber:@(expected)]) {
+                return true;
+            }
+        }
+
+        Exit(std::string(itemName) + " expect the value " + std::to_string(expected) + " but the list does not contains it.");
+        return false;
+    }
+
+    template <typename T> bool CheckConstraintExcludes(const char * _Nonnull itemName, const NSArray * _Nonnull current, T expected)
+    {
+        for (id currentElement in current) {
+            if ([currentElement isEqualToNumber:@(expected)]) {
+                Exit(std::string(itemName) + " does not expect the value " + std::to_string(expected)
+                    + " but the list contains it.");
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     bool CheckConstraintNotValue(
-        const char * _Nonnull itemName, const NSString * _Nonnull current, const NSString * _Nonnull expected)
+        const char * _Nonnull itemName, const NSString * _Nullable current, const NSString * _Nullable expected)
     {
+        if (current == nil && expected == nil) {
+            Exit(std::string(itemName) + " got unexpected value. Both values are nil.");
+            return false;
+        }
+        if ((current == nil) != (expected == nil)) {
+            return true;
+        }
         const chip::CharSpan currentValue([current UTF8String], [current lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
         const chip::CharSpan expectedValue([expected UTF8String], [expected lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
         return ConstraintsChecker::CheckConstraintNotValue(itemName, currentValue, expectedValue);
     }
 
-    bool CheckConstraintNotValue(const char * _Nonnull itemName, const NSData * _Nonnull current, const NSData * _Nonnull expected)
+    bool CheckConstraintNotValue(
+        const char * _Nonnull itemName, const NSData * _Nullable current, const NSData * _Nullable expected)
     {
+        if (current == nil && expected == nil) {
+            Exit(std::string(itemName) + " got unexpected value. Both values are nil.");
+            return false;
+        }
+        if ((current == nil) != (expected == nil)) {
+            return true;
+        }
         const chip::ByteSpan currentValue(static_cast<const uint8_t *>([current bytes]), [current length]);
         const chip::ByteSpan expectedValue(static_cast<const uint8_t *>([expected bytes]), [expected length]);
         return ConstraintsChecker::CheckConstraintNotValue(itemName, currentValue, expectedValue);
@@ -289,7 +323,7 @@ class TestCommandBridge : public CHIPCommandBridge,
     }
 
     template <typename T>
-    bool CheckConstraintNotValue(const char * _Nonnull itemName, const NSNumber * _Nonnull current, T expected)
+    bool CheckConstraintNotValue(const char * _Nonnull itemName, const NSNumber * _Nullable current, T expected)
     {
         return CheckConstraintNotValue(itemName, current, @(expected));
     }
@@ -300,6 +334,53 @@ class TestCommandBridge : public CHIPCommandBridge,
         return CheckConstraintNotValue(itemName, currentValue, @(expected));
     }
 
+    using ConstraintsChecker::CheckConstraintMinValue;
+
+    // Used when the minValue is a saved variable, since ConstraintsChecker does
+    // not expect Core Foundation types.
+    template <typename T, std::enable_if_t<std::is_signed<T>::value, int> = 0>
+    bool CheckConstraintMinValue(const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
+    {
+        return ConstraintsChecker::CheckConstraintMinValue(itemName, current, [expected longLongValue]);
+    }
+
+    template <typename T, std::enable_if_t<!std::is_signed<T>::value, int> = 0>
+    bool CheckConstraintMinValue(const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
+    {
+        return ConstraintsChecker::CheckConstraintMinValue(itemName, current, [expected unsignedLongLongValue]);
+    }
+
+    using ConstraintsChecker::CheckConstraintMaxValue;
+
+    // Used when the maxValue is a saved variable, since ConstraintsChecker does
+    // not expect Core Foundation types.
+    template <typename T, std::enable_if_t<std::is_signed<T>::value, int> = 0>
+    bool CheckConstraintMaxValue(const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
+    {
+        return ConstraintsChecker::CheckConstraintMaxValue(itemName, current, [expected longLongValue]);
+    }
+
+    template <typename T, std::enable_if_t<!std::is_signed<T>::value, int> = 0>
+    bool CheckConstraintMaxValue(const char * _Nonnull itemName, T current, const NSNumber * _Nonnull expected)
+    {
+        return ConstraintsChecker::CheckConstraintMaxValue(itemName, current, [expected unsignedLongLongValue]);
+    }
+
+    bool CheckConstraintHasValue(const char * _Nonnull itemName, id _Nullable current, bool shouldHaveValue)
+    {
+        if (shouldHaveValue && (current == nil)) {
+            Exit(std::string(itemName) + " expected to have a value but doesn't");
+            return false;
+        }
+
+        if (!shouldHaveValue && (current != nil)) {
+            Exit(std::string(itemName) + " not expected to have a value but does");
+            return false;
+        }
+
+        return true;
+    }
+
     bool CheckValueAsString(const char * _Nonnull itemName, const id _Nonnull current, const NSString * _Nonnull expected)
     {
         NSString * data = current;
@@ -403,7 +484,14 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)onPairingComplete:(NSError * _Nullable)error
 {
     if (_active) {
-        _commandBridge->PairingComplete(_deviceId, error);
+        if (error != nil) {
+            _active = NO;
+            NSLog(@"Pairing complete with error");
+            CHIP_ERROR err = [CHIPError errorToCHIPErrorCode:error];
+            _commandBridge->OnStatusUpdate([self convertToStatusIB:err]);
+        } else {
+            _commandBridge->PairingComplete(_deviceId);
+        }
     }
 }
 
diff --git a/examples/chip-tool-darwin/entitlements/codesign.py b/examples/darwin-framework-tool/entitlements/codesign.py
similarity index 89%
rename from examples/chip-tool-darwin/entitlements/codesign.py
rename to examples/darwin-framework-tool/entitlements/codesign.py
index 07a972212562d6..a23f9c39497cc5 100644
--- a/examples/chip-tool-darwin/entitlements/codesign.py
+++ b/examples/darwin-framework-tool/entitlements/codesign.py
@@ -34,7 +34,8 @@ def get_identity():
             "No valid identity has been found. Application will run without entitlements.")
         exit(0)
 
-    identity = re.search(r'\b[0-9a-fA-F]{40}\b', command_result)
+    command_result = command_result.replace("\\n", "\n")
+    identity = re.search(r'\b[0-9a-fA-F]{40}\b(?![^\n]*\(CSSMERR_TP_CERT_EXPIRED\))', command_result)
     if identity is None:
         print(
             "No valid identity has been found. Application will run without entitlements.")
@@ -57,8 +58,8 @@ def codesign(args):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
-        description='Codesign the chip-tool-darwin binary')
-    parser.add_argument('--entitlements_path', default='entitlements/chip-tool-darwin.entitlements',
+        description='Codesign the darwin-framework-tool binary')
+    parser.add_argument('--entitlements_path', default='entitlements/darwin-framework-tool.entitlements',
                         help='Set the entitlements for codesign', required=True)
     parser.add_argument(
         '--log_path', help='Output log file destination', required=True)
diff --git a/examples/chip-tool-darwin/entitlements/chip-tool-darwin.entitlements b/examples/darwin-framework-tool/entitlements/darwin-framework-tool.entitlements
similarity index 100%
rename from examples/chip-tool-darwin/entitlements/chip-tool-darwin.entitlements
rename to examples/darwin-framework-tool/entitlements/darwin-framework-tool.entitlements
diff --git a/examples/chip-tool-darwin/main.mm b/examples/darwin-framework-tool/main.mm
similarity index 92%
rename from examples/chip-tool-darwin/main.mm
rename to examples/darwin-framework-tool/main.mm
index 1d78c781596fe4..53d12e4b8d9032 100644
--- a/examples/chip-tool-darwin/main.mm
+++ b/examples/darwin-framework-tool/main.mm
@@ -17,9 +17,8 @@
  */
 
 #include "commands/common/Commands.h"
-
+#include "commands/interactive/Commands.h"
 #include "commands/pairing/Commands.h"
-
 #include "commands/storage/Commands.h"
 
 #include <zap-generated/cluster/Commands.h>
@@ -29,6 +28,7 @@ int main(int argc, const char * argv[])
 {
     Commands commands;
     registerCommandsPairing(commands);
+    registerCommandsInteractive(commands);
     registerCommandsStorage(commands);
     registerCommandsTests(commands);
     registerClusters(commands);
diff --git a/examples/chip-tool-darwin/templates/commands.zapt b/examples/darwin-framework-tool/templates/commands.zapt
similarity index 96%
rename from examples/chip-tool-darwin/templates/commands.zapt
rename to examples/darwin-framework-tool/templates/commands.zapt
index 6ad1b9f1bc3005..55eaf9e419546f 100644
--- a/examples/chip-tool-darwin/templates/commands.zapt
+++ b/examples/darwin-framework-tool/templates/commands.zapt
@@ -56,7 +56,7 @@ public:
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--)
         {
-            [cluster {{asLowerCamelCase name}}With{{#if (hasArguments)}}Params:params completionHandler:{{else}}CompletionHandler:{{/if}}
+            [cluster {{asLowerCamelCase name}}WithParams:params completionHandler:
             {{#if hasSpecificResponse}}
                 ^(CHIP{{asUpperCamelCase clusterName}}Cluster{{asUpperCamelCase responseName}}Params * _Nullable values, NSError * _Nullable error) {
                     NSLog(@"Values: %@", values);
@@ -221,8 +221,9 @@ public:
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribe{{>attribute}}WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] 
                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] 
-                                            params:params
-                                subscriptionEstablished: nullptr reportHandler:^({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable error) {
+                                                 params:params
+                                subscriptionEstablished:^(){ mSubscriptionEstablished=YES; }
+                                reportHandler:^({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable error) {
         NSLog(@"{{asUpperCamelCase parent.name}}.{{asUpperCamelCase name}} response %@", [value description]);
         if (error || !mWait){
             SetCommandExitStatus(error);
@@ -231,12 +232,6 @@ public:
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-
 };
 
 {{/if}}
diff --git a/examples/chip-tool-darwin/templates/helper.js b/examples/darwin-framework-tool/templates/helper.js
similarity index 100%
rename from examples/chip-tool-darwin/templates/helper.js
rename to examples/darwin-framework-tool/templates/helper.js
diff --git a/examples/chip-tool-darwin/templates/partials/decodable_value.zapt b/examples/darwin-framework-tool/templates/partials/decodable_value.zapt
similarity index 100%
rename from examples/chip-tool-darwin/templates/partials/decodable_value.zapt
rename to examples/darwin-framework-tool/templates/partials/decodable_value.zapt
diff --git a/examples/chip-tool-darwin/templates/templates.json b/examples/darwin-framework-tool/templates/templates.json
similarity index 100%
rename from examples/chip-tool-darwin/templates/templates.json
rename to examples/darwin-framework-tool/templates/templates.json
diff --git a/examples/chip-tool-darwin/templates/tests/CHIPTestClustersObjc-src.zapt b/examples/darwin-framework-tool/templates/tests/CHIPTestClustersObjc-src.zapt
similarity index 100%
rename from examples/chip-tool-darwin/templates/tests/CHIPTestClustersObjc-src.zapt
rename to examples/darwin-framework-tool/templates/tests/CHIPTestClustersObjc-src.zapt
diff --git a/examples/chip-tool-darwin/templates/tests/CHIPTestClustersObjc.zapt b/examples/darwin-framework-tool/templates/tests/CHIPTestClustersObjc.zapt
similarity index 100%
rename from examples/chip-tool-darwin/templates/tests/CHIPTestClustersObjc.zapt
rename to examples/darwin-framework-tool/templates/tests/CHIPTestClustersObjc.zapt
diff --git a/examples/chip-tool-darwin/templates/tests/commands.zapt b/examples/darwin-framework-tool/templates/tests/commands.zapt
similarity index 100%
rename from examples/chip-tool-darwin/templates/tests/commands.zapt
rename to examples/darwin-framework-tool/templates/tests/commands.zapt
diff --git a/examples/chip-tool-darwin/templates/tests/partials/check_test_value.zapt b/examples/darwin-framework-tool/templates/tests/partials/check_test_value.zapt
similarity index 87%
rename from examples/chip-tool-darwin/templates/tests/partials/check_test_value.zapt
rename to examples/darwin-framework-tool/templates/tests/partials/check_test_value.zapt
index dec8b888ff692c..16847487714118 100644
--- a/examples/chip-tool-darwin/templates/tests/partials/check_test_value.zapt
+++ b/examples/darwin-framework-tool/templates/tests/partials/check_test_value.zapt
@@ -38,7 +38,12 @@
   {{else}}
     VerifyOrReturn(CheckValue{{#if (isString type)}}AsString{{/if}}("{{label}}", {{actual}}, 
       {{~#if (chip_tests_variables_has expected)}}{{expected}}
-      {{~else if (isOctetString type)}}[[NSData alloc] initWithBytes:"{{octetStringEscapedForCLiteral expected}}" length:{{expected.length}}]
+      {{~else if (isOctetString type)}}
+        {{~#if (isHexString expected)}}
+        [[NSData alloc] initWithBytes:"{{octetStringFromHexString expected}}" length:{{octetStringLengthFromHexString expected}}]
+        {{else}}
+        [[NSData alloc] initWithBytes:"{{octetStringEscapedForCLiteral expected}}" length:{{expected.length}}]
+        {{/if}}
       {{~else if (isCharString type)}}@"{{expected}}"
       {{else if (chip_tests_config_has expected)}}m{{asUpperCamelCase expected}}.HasValue() ? m{{asUpperCamelCase expected}}.Value() : {{asTypedLiteral (chip_tests_config_get_default_value expected) (chip_tests_config_get_type expected)}}
       {{~else}}{{asTypedExpressionFromObjectiveC expected type}}
diff --git a/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt b/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
new file mode 100644
index 00000000000000..29a0930f90772b
--- /dev/null
+++ b/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
@@ -0,0 +1,62 @@
+{{#if hasExpectedConstraints}}
+    {{~#*inline "item"}}{{asLowerCamelCase name}}{{/inline}}
+
+    {{~#if isOptional}}
+        {{~#if (hasProperty expectedConstraints "hasValue")}}VerifyOrReturn(CheckConstraintHasValue("{{>item}}", {{>actualValue}}, {{expectedConstraints.hasValue}}));{{/if}}
+        if ({{>actualValue}} != nil) {
+    {{else if isNullable}}
+        if ({{>actualValue}} != nil) {
+    {{/if}}
+
+    {{#if (hasProperty expectedConstraints "type")}}VerifyOrReturn(CheckConstraintType("{{>item}}", "", "{{expectedConstraints.type}}"));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "format")}}VerifyOrReturn(CheckConstraintFormat("{{>item}}", "", "{{expectedConstraints.format}}"));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "startsWith")}}VerifyOrReturn(CheckConstraintStartsWith("{{>item}}", {{>actualValue}}, "{{expectedConstraints.startsWith}}"));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "endsWith")}}VerifyOrReturn(CheckConstraintEndsWith("{{>item}}", {{>actualValue}}, "{{expectedConstraints.endsWith}}"));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "isUpperCase")}}VerifyOrReturn(CheckConstraintIsUpperCase("{{>item}}", {{>actualValue}}, {{expectedConstraints.isUpperCase}}));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "isLowerCase")}}VerifyOrReturn(CheckConstraintIsLowerCase("{{>item}}", {{>actualValue}}, {{expectedConstraints.isLowerCase}}));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "isHexString")}}VerifyOrReturn(CheckConstraintIsHexString("{{>item}}", {{>actualValue}}, {{expectedConstraints.isHexString}}));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "minLength")}}VerifyOrReturn(CheckConstraintMinLength("{{>item}}", [{{>actualValue}} length], {{expectedConstraints.minLength}}));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "maxLength")}}VerifyOrReturn(CheckConstraintMaxLength("{{>item}}", [{{>actualValue}} length], {{expectedConstraints.maxLength}}));{{/if}}
+
+    {{~#if (hasProperty expectedConstraints "minValue")}}
+    VerifyOrReturn(CheckConstraintMinValue<{{chipType}}>("{{>item}}", [{{>actualValue}} {{asObjectiveCNumberType "" type true}}Value], {{asTypedLiteral expectedConstraints.minValue type}}));
+    {{/if}}
+
+    {{~#if (hasProperty expectedConstraints "maxValue")}}
+    VerifyOrReturn(CheckConstraintMaxValue<{{chipType}}>("{{>item}}", [{{>actualValue}} {{asObjectiveCNumberType "" type true}}Value], {{asTypedLiteral expectedConstraints.maxValue type}}));
+    {{/if}}
+
+    {{~#if (hasProperty expectedConstraints "contains")}}
+      {{#chip_tests_iterate_expected_list expectedConstraints.contains}}
+        VerifyOrReturn(CheckConstraintContains("{{asLowerCamelCase name}}", {{>actualValue}}, {{asTypedLiteral value type}}));
+      {{/chip_tests_iterate_expected_list}}
+    {{/if}}
+
+    {{~#if (hasProperty expectedConstraints "excludes")}}
+      {{#chip_tests_iterate_expected_list expectedConstraints.excludes}}
+        VerifyOrReturn(CheckConstraintExcludes("{{asLowerCamelCase name}}", {{>actualValue}}, {{asTypedLiteral value type}}));
+      {{/chip_tests_iterate_expected_list}}
+    {{/if}}
+
+    {{~#if isOptional}}
+      }
+    {{else if isNullable}}
+      }
+    {{/if}}
+
+    {{~#if (hasProperty expectedConstraints "notValue")}}
+        {{#if (isLiteralNull expectedConstraints.notValue)}}
+          VerifyOrReturn(CheckValueNonNull("{{>item}}", {{>actualValue}}));
+        {{else}}
+          VerifyOrReturn(CheckConstraintNotValue("{{>item}}", {{>actualValue}}, {{asTypedLiteral expectedConstraints.notValue type}}));
+        {{/if}}
+    {{/if}}
+{{/if}}
diff --git a/examples/chip-tool-darwin/templates/tests/partials/test_cluster.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
similarity index 75%
rename from examples/chip-tool-darwin/templates/tests/partials/test_cluster.zapt
rename to examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
index 67a76abd765afa..77abd2f0a024b2 100644
--- a/examples/chip-tool-darwin/templates/tests/partials/test_cluster.zapt
+++ b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
@@ -209,47 +209,13 @@ class {{filename}}: public TestCommandBridge
               {{>check_test_value actual="actualValue" expected=expectedValue cluster=../cluster}}
             }
             {{/if}}
-            {{#if hasExpectedConstraints}}
-            {{~#*inline "item"}}{{asLowerCamelCase name}}{{/inline}}
-            {{#if (hasProperty expectedConstraints "type")}}VerifyOrReturn(CheckConstraintType("{{>item}}", "", "{{expectedConstraints.type}}"));{{/if}}
-            {{~#if (hasProperty expectedConstraints "format")}}VerifyOrReturn(CheckConstraintFormat("{{>item}}", "", "{{expectedConstraints.format}}"));{{/if}}
-            {{~#if (hasProperty expectedConstraints "startsWith")}}VerifyOrReturn(CheckConstraintStartsWith("{{>item}}", {{>actualValue}}, "{{expectedConstraints.startsWith}}"));{{/if}}
-            {{~#if (hasProperty expectedConstraints "endsWith")}}VerifyOrReturn(CheckConstraintEndsWith("{{>item}}", {{>actualValue}}, "{{expectedConstraints.endsWith}}"));{{/if}}
-            {{~#if (hasProperty expectedConstraints "isUpperCase")}}VerifyOrReturn(CheckConstraintIsUpperCase("{{>item}}", {{>actualValue}}, {{expectedConstraints.isUpperCase}}));{{/if}}
-            {{~#if (hasProperty expectedConstraints "isLowerCase")}}VerifyOrReturn(CheckConstraintIsLowerCase("{{>item}}", {{>actualValue}}, {{expectedConstraints.isLowerCase}}));{{/if}}
-            {{~#if (hasProperty expectedConstraints "isHexString")}}VerifyOrReturn(CheckConstraintIsHexString("{{>item}}", {{>actualValue}}, {{expectedConstraints.isHexString}}));{{/if}}
-            {{~#if (hasProperty expectedConstraints "minLength")}}VerifyOrReturn(CheckConstraintMinLength("{{>item}}", [{{>actualValue}} length], {{expectedConstraints.minLength}}));{{/if}}
-            {{~#if (hasProperty expectedConstraints "maxLength")}}VerifyOrReturn(CheckConstraintMaxLength("{{>item}}", [{{>actualValue}} length], {{expectedConstraints.maxLength}}));{{/if}}
-            {{~#if (hasProperty expectedConstraints "minValue")}}
-              if ({{>actualValue}} != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<{{chipType}}>("{{>item}}", [{{>actualValue}} {{asObjectiveCNumberType "" type true}}Value], {{asTypedLiteral expectedConstraints.minValue type}}));
-              }
-            {{/if}}
-            {{~#if (hasProperty expectedConstraints "maxValue")}}
-              if ({{>actualValue}} != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<{{chipType}}>("{{>item}}", [{{>actualValue}} {{asObjectiveCNumberType "" type true}}Value], {{asTypedLiteral expectedConstraints.maxValue type}}));
-              }
-            {{/if}}
-            {{~#if (hasProperty expectedConstraints "notValue")}}
-              {{#if (isLiteralNull expectedConstraints.notValue)}}
-              VerifyOrReturn(CheckValueNonNull("{{>item}}", {{>actualValue}}));
-              {{else}}
-              if ({{>actualValue}} != nil) {
-                {{#if (isString type)}}
-                VerifyOrReturn(CheckConstraintNotValue("{{>item}}", {{>actualValue}}, {{asTypedLiteral expectedConstraints.notValue type}}));
-                {{else}}
-                VerifyOrReturn(CheckConstraintNotValue("{{>item}}", {{>actualValue}}, {{asTypedLiteral expectedConstraints.notValue type}}));
-                {{/if}}
-              }
-              {{/if}}
+            {{>maybeCheckExpectedConstraints}}
+            {{#if saveAs}}
+            {
+              {{saveAs}} = {{>actualValue}};
+            }
             {{/if}}
-        {{/if}}
-        {{#if saveAs}}
-        {
-          {{saveAs}} = {{>actualValue}};
-        }
-        {{/if}}
-        {{/chip_tests_item_response_parameters}}
+            {{/chip_tests_item_response_parameters}}
 
         {{#unless async}}
         NextTest();
diff --git a/examples/chip-tool-darwin/templates/tests/partials/test_value.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_value.zapt
similarity index 92%
rename from examples/chip-tool-darwin/templates/tests/partials/test_value.zapt
rename to examples/darwin-framework-tool/templates/tests/partials/test_value.zapt
index 846c75ac96a980..716e557f399221 100644
--- a/examples/chip-tool-darwin/templates/tests/partials/test_value.zapt
+++ b/examples/darwin-framework-tool/templates/tests/partials/test_value.zapt
@@ -46,7 +46,11 @@
       {{#if (isCharString type)}}
         @"{{definedValue}}";
       {{else if (isOctetString type)}}
+        {{~#if (isHexString definedValue)}}
+        [[NSData alloc] initWithBytes:"{{octetStringFromHexString definedValue}}" length:{{octetStringLengthFromHexString definedValue}}];
+        {{else}}
         [[NSData alloc] initWithBytes:"{{octetStringEscapedForCLiteral definedValue}}" length:{{definedValue.length}}];
+        {{/if}}
       {{else}}
         [NSNumber numberWith{{asObjectiveCNumberType definedValue type false}}:{{asTypedExpressionFromObjectiveC definedValue type}}];
       {{/if}}
diff --git a/examples/chip-tool-darwin/templates/tests/templates.json b/examples/darwin-framework-tool/templates/tests/templates.json
similarity index 93%
rename from examples/chip-tool-darwin/templates/tests/templates.json
rename to examples/darwin-framework-tool/templates/tests/templates.json
index aab4af5cd3f79f..9311d32dd66062 100644
--- a/examples/chip-tool-darwin/templates/tests/templates.json
+++ b/examples/darwin-framework-tool/templates/tests/templates.json
@@ -38,6 +38,10 @@
         {
             "name": "check_test_value",
             "path": "partials/check_test_value.zapt"
+        },
+        {
+            "name": "maybeCheckExpectedConstraints",
+            "path": "partials/checks/maybeCheckExpectedConstraints.zapt"
         }
     ],
     "templates": [
diff --git a/examples/chip-tool-darwin/templates/tests/tests.js b/examples/darwin-framework-tool/templates/tests/tests.js
similarity index 77%
rename from examples/chip-tool-darwin/templates/tests/tests.js
rename to examples/darwin-framework-tool/templates/tests/tests.js
index 35826ba3d3ff51..7e2defdcc22f02 100644
--- a/examples/chip-tool-darwin/templates/tests/tests.js
+++ b/examples/darwin-framework-tool/templates/tests/tests.js
@@ -45,6 +45,18 @@ function getTests() {
   // TODO: TestGroupMessaging does not work on Darwin for now.
   tests.disable('TestGroupMessaging');
 
+  // TODO: Test_TC_DIAG_TH_NW_1_1 does not work on Darwin for now.
+  tests.disable('Test_TC_DIAG_TH_NW_1_1');
+
+  // TODO: Test_TC_DIAG_TH_NW_1_2 does not work on Darwin for now.
+  tests.disable('Test_TC_DIAG_TH_NW_1_2');
+
+  // TODO: Test_TC_DIAG_TH_NW_2_2 does not work on Darwin for now.
+  tests.disable('Test_TC_DIAG_TH_NW_2_2');
+
+  // TODO: Test_TC_DIAG_TH_NW_2_3 does not work on Darwin for now.
+  tests.disable('Test_TC_DIAG_TH_NW_2_3');
+
   return tests;
 }
 
diff --git a/examples/chip-tool-darwin/third_party/connectedhomeip b/examples/darwin-framework-tool/third_party/connectedhomeip
similarity index 100%
rename from examples/chip-tool-darwin/third_party/connectedhomeip
rename to examples/darwin-framework-tool/third_party/connectedhomeip
diff --git a/examples/ipv6only-app/esp32/README.md b/examples/ipv6only-app/esp32/README.md
deleted file mode 100644
index 41c6d5f2ae3374..00000000000000
--- a/examples/ipv6only-app/esp32/README.md
+++ /dev/null
@@ -1,129 +0,0 @@
-# CHIP ESP32 IPV6 Only Example Application
-
-This application implements ESP32 wifi control to support IPV6 tests.
-
-Once connected the application acts as a UDP echo server and will echo udp
-messages it receives, this can be used to test for disconnect events.
-
--   [CHIP ESP32 IPV6 Only Example Application](#chip-esp32-ipv6-only-example-application)
-    -   [Building the Example Application](#building-the-example-application)
-        -   [To build the application, follow these steps:](#to-build-the-application-follow-these-steps)
-    -   [Testing the Example Application](#testing-the-example-application)
-
----
-
-## Building the Example Application
-
-Building the example application requires the use of the Espressif ESP32 IoT
-Development Framework and the xtensa-esp32-elf toolchain.
-
-The VSCode devcontainer has these components pre-installed, so you can skip this
-step. To install these components manually, follow these steps:
-
--   Clone the Espressif ESP-IDF and checkout
-    [v4.4.1 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.1)
-
-          ```
-          $ mkdir ${HOME}/tools
-          $ cd ${HOME}/tools
-          $ git clone https://github.com/espressif/esp-idf.git
-          $ cd esp-idf
-          $ git checkout v4.4.1
-          $ git submodule update --init
-          $ ./install.sh
-          ```
-
--   Install ninja-build
-
-          ```
-          $ sudo apt-get install ninja-build
-          ```
-
-### To build the application, follow these steps:
-
-Currently building in VSCode _and_ deploying from native is not supported, so
-make sure the IDF_PATH has been exported(See the manual setup steps above).
-
--   Setting up the environment
-
-        ```
-        $ cd ${HOME}/tools/esp-idf
-        $ ./install.sh
-        $ . ./export.sh
-        $ cd {path-to-connectedhomeip}
-        ```
-
-    To download and install packages.
-
-        ```
-        $ source ./scripts/bootstrap.sh
-        $ source ./scripts/activate.sh
-        ```
-
-    If packages are already installed then simply activate them.
-
-        ```
-        $ source ./scripts/activate.sh
-        ```
-
--   Select IDF Target
-
-        ```
-        $ idf.py set-target esp32(or esp32c3)
-        ```
-
--   Configuration Options
-
-        To choose from the different configuration options, run menuconfig
-
-          ```
-          $ idf.py menuconfig
-          ```
-
-        This example uses UART0 for serial communication. You can change this through
-        `PW RPC Example Configuration`. As a result, the console has been shifted to UART1
-        You can change this through `Component config` -> `Common ESP-related` ->
-        `UART for console output`
-
--   Build the demo application.
-
-          $ idf.py build
-
--   After building the application, to flash it outside of VSCode, connect your
-    device via USB. Then run the following command to flash the demo application
-    onto the device and then monitor its output. If necessary, replace
-    `/dev/tty.SLAB_USBtoUART`(MacOS) with the correct USB device name for your
-    system(like `/dev/ttyUSB0` on Linux). Note that sometimes you might have to
-    press and hold the `boot` button on the device while it's trying to connect
-    before flashing. For ESP32-DevKitC devices this is labeled in the
-    [functional description diagram](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/esp32/get-started-devkitc.html#functional-description).
-
-          ```
-          $ idf.py flash -p /dev/tty.SLAB_USBtoUART
-          ```
-
-    Note: Some users might have to install the
-    [VCP driver](https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers)
-    before the device shows up on `/dev/tty`.
-
-## Testing the Example Application
-
-Build or install the [rpc console](../../common/pigweed/rpc_console/README.md)
-
-Start the console:
-
-    ```
-    $ chip-console --device /dev/ttyUSB0 -b 115200
-    ```
-
-An example flow of performing a scan, connecting, and getting the IPv6 address:
-
-    ```
-    scan = rpcs.chip.rpc.WiFi.StartScan(pw_rpc_timeout_s=5)
-    ap = next(filter(lambda a: b"SSID\000" in a.ssid, next(scan.responses()).aps))
-
-    connect = protos.chip.rpc.ConnectionData(ssid=ap.ssid,security_type=ap.security_type,secret=b"PASSWORD")
-    rpcs.chip.rpc.WiFi.Connect(connect, pw_rpc_timeout_s=10)
-
-    rpcs.chip.rpc.WiFi.GetIP6Address()
-    ```
diff --git a/examples/ipv6only-app/esp32/include/wifi_service.h b/examples/ipv6only-app/esp32/include/wifi_service.h
deleted file mode 100644
index 12dc0e9a2d0f46..00000000000000
--- a/examples/ipv6only-app/esp32/include/wifi_service.h
+++ /dev/null
@@ -1,163 +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.
- */
-
-#pragma once
-
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_system.h"
-#include "esp_wifi.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/semphr.h"
-#include "pw_status/status.h"
-#include "pw_status/try.h"
-#include "wifi_service/wifi_service.rpc.pb.h"
-
-namespace chip {
-namespace rpc {
-
-class WiFi final : public pw_rpc::nanopb::WiFi::Service<WiFi>
-{
-public:
-    // Singleton
-    static WiFi & Instance() { return instance_; }
-
-    // Initalize the wifi station
-    pw::Status Init();
-
-    // Blocks the calling thread until wifi connection is completed successfully.
-    // NOTE: Currently only supports blocking a single thread.
-    void BlockUntilWiFiConnected() { xSemaphoreTake(wifi_connected_semaphore_, portMAX_DELAY); }
-
-    // The following functions are the RPC handlers
-
-    pw::Status GetChannel(const pw_protobuf_Empty & request, chip_rpc_Channel & response)
-    {
-        uint8_t channel = 0;
-        wifi_second_chan_t second;
-        PW_TRY(EspToPwStatus(esp_wifi_get_channel(&channel, &second)));
-        response.channel = channel;
-        return pw::OkStatus();
-    }
-
-    pw::Status GetSsid(const pw_protobuf_Empty & request, chip_rpc_Ssid & response)
-    {
-        wifi_config_t config;
-        PW_TRY(EspToPwStatus(esp_wifi_get_config(WIFI_IF_STA, &config)));
-        size_t size = std::min(sizeof(response.ssid.bytes), sizeof(config.sta.ssid));
-        memcpy(response.ssid.bytes, config.sta.ssid, sizeof(response.ssid.bytes));
-        response.ssid.size = size;
-        return pw::OkStatus();
-    }
-
-    pw::Status GetState(const pw_protobuf_Empty & request, chip_rpc_State & response)
-    {
-        wifi_ap_record_t ap_info;
-        esp_err_t err = esp_wifi_sta_get_ap_info(&ap_info);
-        PW_TRY(EspToPwStatus(err));
-        response.connected = (err != ESP_ERR_WIFI_NOT_CONNECT);
-        return pw::OkStatus();
-    }
-
-    pw::Status GetMacAddress(const pw_protobuf_Empty & request, chip_rpc_MacAddress & response)
-    {
-        uint8_t mac[6];
-        PW_TRY(EspToPwStatus(esp_wifi_get_mac(WIFI_IF_STA, mac)));
-        sprintf(response.mac_address, "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-        return pw::OkStatus();
-    }
-
-    pw::Status GetWiFiInterface(const pw_protobuf_Empty & request, chip_rpc_WiFiInterface & response)
-    {
-        wifi_ap_record_t ap_info;
-        PW_TRY(EspToPwStatus(esp_wifi_sta_get_ap_info(&ap_info)));
-        sprintf(response.interface, "STA");
-        return pw::OkStatus();
-    }
-
-    pw::Status GetIP4Address(const pw_protobuf_Empty & request, chip_rpc_IP4Address & response)
-    {
-        esp_netif_ip_info_t ip_info;
-        PW_TRY(EspToPwStatus(esp_netif_get_ip_info(esp_netif_, &ip_info)));
-        sprintf(response.address, IPSTR, IP2STR(&ip_info.ip));
-        return pw::OkStatus();
-    }
-
-    pw::Status GetIP6Address(const pw_protobuf_Empty & request, chip_rpc_IP6Address & response)
-    {
-        esp_ip6_addr_t ip6{ 0 };
-        PW_TRY(EspToPwStatus(esp_netif_get_ip6_linklocal(esp_netif_, &ip6)));
-        sprintf(response.address, IPV6STR, IPV62STR(ip6));
-        return pw::OkStatus();
-    }
-
-    // NOTE: Currently this is blocking, it can be made non-blocking if needed
-    //       but would require another worker thread to handle the scanning.
-    void StartScan(const chip_rpc_ScanConfig & request, ServerWriter<chip_rpc_ScanResults> & writer);
-
-    pw::Status StopScan(const pw_protobuf_Empty & request, pw_protobuf_Empty & response)
-    {
-        esp_wifi_scan_stop();
-        return pw::OkStatus();
-    }
-
-    pw::Status Connect(const chip_rpc_ConnectionData & request, chip_rpc_ConnectionResult & response);
-
-    pw::Status Disconnect(const pw_protobuf_Empty & request, pw_protobuf_Empty & response)
-    {
-        PW_TRY(EspToPwStatus(esp_wifi_disconnect()));
-        return pw::OkStatus();
-    }
-
-private:
-    static WiFi instance_;
-    esp_netif_t * esp_netif_ = nullptr;
-    SemaphoreHandle_t wifi_connected_semaphore_;
-
-    static constexpr pw::Status EspToPwStatus(esp_err_t err)
-    {
-        switch (err)
-        {
-        case ESP_OK:
-            return pw::OkStatus();
-        case ESP_ERR_WIFI_NOT_INIT:
-            return pw::Status::FailedPrecondition();
-        case ESP_ERR_INVALID_ARG:
-            return pw::Status::InvalidArgument();
-        case ESP_ERR_ESP_NETIF_INVALID_PARAMS:
-            return pw::Status::InvalidArgument();
-        case ESP_ERR_WIFI_IF:
-            return pw::Status::NotFound();
-        case ESP_ERR_WIFI_NOT_CONNECT:
-            return pw::Status::FailedPrecondition();
-        case ESP_ERR_WIFI_NOT_STARTED:
-            return pw::Status::FailedPrecondition();
-        case ESP_ERR_WIFI_CONN:
-            return pw::Status::Internal();
-        case ESP_FAIL:
-            return pw::Status::Internal();
-        default:
-            return pw::Status::Unknown();
-        }
-    }
-
-    static void WiFiEventHandler(void * arg, esp_event_base_t event_base, int32_t event_id, void * event_data);
-};
-
-} // namespace rpc
-} // namespace chip
diff --git a/examples/ipv6only-app/esp32/main/CMakeLists.txt b/examples/ipv6only-app/esp32/main/CMakeLists.txt
deleted file mode 100644
index 853edf5628e99c..00000000000000
--- a/examples/ipv6only-app/esp32/main/CMakeLists.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#    Copyright (c) 2021 Project CHIP Authors
-#    All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-idf_component_register(INCLUDE_DIRS
-                     "${CMAKE_CURRENT_LIST_DIR}"
-                     "${CMAKE_CURRENT_LIST_DIR}/../include"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
-                     "${IDF_PATH}/components/freertos/include/freertos"
-
-                      SRC_DIRS
-                     "${CMAKE_CURRENT_LIST_DIR}"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
-                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
-                      PRIV_REQUIRES bt chip)
-
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
-include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
-set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
-
-pw_proto_library(wifi_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.options
-  PREFIX
-    wifi_service
-  DEPS
-    pw_protobuf.common_protos
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-)
-
-target_link_libraries(${COMPONENT_LIB} PUBLIC
-  wifi_service.nanopb_rpc
-  pw_checksum
-  pw_hdlc
-  pw_log
-  pw_rpc.server
-)
diff --git a/examples/ipv6only-app/esp32/main/Kconfig.projbuild b/examples/ipv6only-app/esp32/main/Kconfig.projbuild
deleted file mode 100644
index eaa289dfc60e12..00000000000000
--- a/examples/ipv6only-app/esp32/main/Kconfig.projbuild
+++ /dev/null
@@ -1,39 +0,0 @@
-menu "PW RPC Example Configuration"
-
-depends on ENABLE_PW_RPC
-    config EXAMPLE_UART_PORT_NUM
-        int "UART port number"
-        range 0 2 if IDF_TARGET_ESP32
-        range 0 1 if IDF_TARGET_ESP32C3
-        default 0
-        help
-            UART communication port number for the example.
-            See UART documentation for available port numbers.
-
-    config EXAMPLE_UART_BAUD_RATE
-        int "UART communication speed"
-        range 1200 115200
-        default 115200
-        help
-            UART communication speed for Modbus example.
-
-    config EXAMPLE_UART_RXD
-        int "UART RXD pin number"
-        range 0 34 if IDF_TARGET_ESP32
-        range 0 19 if IDF_TARGET_ESP32C3
-        default 5
-        help
-            GPIO number for UART RX pin. See UART documentation for more information
-            about available pin numbers for UART.
-
-    config EXAMPLE_UART_TXD
-        int "UART TXD pin number"
-        range 0 34 if IDF_TARGET_ESP32
-        range 0 19 if IDF_TARGET_ESP32C3
-        default 4
-        help
-            GPIO number for UART TX pin. See UART documentation for more information
-            about available pin numbers for UART.
-
-
-endmenu
diff --git a/examples/ipv6only-app/esp32/main/main.cpp b/examples/ipv6only-app/esp32/main/main.cpp
deleted file mode 100644
index 608350a38ad053..00000000000000
--- a/examples/ipv6only-app/esp32/main/main.cpp
+++ /dev/null
@@ -1,152 +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.
- */
-
-#include "PigweedLoggerMutex.h"
-#include "RpcService.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "nvs_flash.h"
-#include "pw_rpc/server.h"
-#include "wifi_service.h"
-
-#include "lwip/err.h"
-#include "lwip/sockets.h"
-#include "lwip/sys.h"
-
-namespace {
-
-const char * TAG = "ipv6only";
-
-constexpr size_t kUdpBufferSize = 512;
-
-constexpr size_t kRpcStackSizeBytes  = (6 * 1024);
-constexpr uint8_t kRpcTaskPriority   = 5;
-constexpr size_t kTestStackSizeBytes = (8 * 1024);
-constexpr uint8_t kTestTaskPriority  = 5;
-
-TaskHandle_t rpcTaskHandle;
-TaskHandle_t testTaskHandle;
-
-void UdpReceiver(void * pvParameters)
-{
-    int portno;                     // port to listen on
-    struct sockaddr_in6 serveraddr; // server's addr
-    char buf[kUdpBufferSize];       // rx message buf
-    char * hostaddrp;               // dotted decimal host addr string
-    int optval;                     // flag value for setsockopt
-    int n;                          // message byte size
-    int sockfd = 0;
-    socklen_t clientlen;            // byte size of client's address
-    struct sockaddr_in6 clientaddr; // client addr
-
-    while (1)
-    {
-        // Start the udp server after the wifi is connectd.
-        chip::rpc::WiFi::Instance().BlockUntilWiFiConnected();
-        ESP_LOGI(TAG, "UDP server starting");
-
-        portno = 8765;
-        // socket: create the parent socket
-        sockfd = socket(AF_INET6, SOCK_DGRAM, 0);
-        if (sockfd < 0)
-        {
-            ESP_LOGE(TAG, "ERROR opening socket");
-            assert(0);
-            return;
-        }
-
-        // setsockopt: Handy debugging trick that lets
-        // us rerun the server immediately after we kill it;
-        // otherwise we have to wait about 20 secs.
-        // Eliminates "ERROR on binding: Address already in use" error.
-        optval = 1;
-        setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, static_cast<const void *>(&optval), sizeof(int));
-
-        // build the server's Internet address
-        memset(&serveraddr, 0, sizeof(serveraddr));
-        serveraddr.sin6_len    = sizeof(serveraddr);
-        serveraddr.sin6_family = AF_INET6;
-        serveraddr.sin6_addr   = in6addr_any;
-        serveraddr.sin6_port   = htons((unsigned short) portno);
-
-        //  bind: associate the parent socket with a port
-        if (bind(sockfd, reinterpret_cast<struct sockaddr *>(&serveraddr), sizeof(serveraddr)) < 0)
-        {
-            ESP_LOGE(TAG, "ERROR on binding");
-            assert(0);
-            vTaskDelete(NULL);
-        }
-
-        ESP_LOGI(TAG, "UDP server bound to port %d", portno);
-
-        // main loop: wait for a datagram, then respond
-        clientlen = sizeof(clientaddr);
-        wifi_ap_record_t ap_info;
-        fd_set readset;
-        while (ESP_OK == esp_wifi_sta_get_ap_info(&ap_info))
-        {
-            // recvfrom: receive a UDP datagram from a client
-            memset(buf, 0, sizeof(buf));
-
-            FD_ZERO(&readset);
-            FD_SET(sockfd, &readset);
-
-            int select_err = select(sockfd + 1, &readset, nullptr, nullptr, nullptr);
-            if (select_err < 0)
-                continue;
-
-            n = recvfrom(sockfd, buf, kUdpBufferSize, 0, reinterpret_cast<struct sockaddr *>(&clientaddr), &clientlen);
-            if (n < 0)
-                continue;
-            // Echo back
-            n = sendto(sockfd, buf, n, 0, reinterpret_cast<struct sockaddr *>(&clientaddr), clientlen);
-        }
-    }
-    // Never returns
-}
-
-void RegisterServices(pw::rpc::Server & server)
-{
-    server.RegisterService(chip::rpc::WiFi::Instance());
-}
-
-void RunRpcService(void *)
-{
-    ::chip::rpc::Start(RegisterServices, &::chip::rpc::logger_mutex);
-}
-
-} // namespace
-
-extern "C" void app_main()
-{
-    PigweedLogger::init();
-
-    // Initialize NVS
-    esp_err_t ret = nvs_flash_init();
-    if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND)
-    {
-        ESP_ERROR_CHECK(nvs_flash_erase());
-        ret = nvs_flash_init();
-    }
-    ESP_ERROR_CHECK(ret);
-
-    ESP_LOGI(TAG, "WiFi Init: %s", pw_StatusString(chip::rpc::WiFi::Instance().Init()));
-    ESP_LOGI(TAG, "----------- chip-esp32-ipv6-example starting -----------");
-
-    xTaskCreate(RunRpcService, "RPC", kRpcStackSizeBytes / sizeof(StackType_t), nullptr, kRpcTaskPriority, &rpcTaskHandle);
-    xTaskCreate(UdpReceiver, "TestTask", kTestStackSizeBytes / sizeof(StackType_t), nullptr, kTestTaskPriority, &testTaskHandle);
-}
diff --git a/examples/ipv6only-app/esp32/main/wifi_service.cpp b/examples/ipv6only-app/esp32/main/wifi_service.cpp
deleted file mode 100644
index 3b51c44eac891a..00000000000000
--- a/examples/ipv6only-app/esp32/main/wifi_service.cpp
+++ /dev/null
@@ -1,341 +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.
- */
-#include "wifi_service.h"
-
-#include "freertos/FreeRTOS.h"
-#include "freertos/event_groups.h"
-#include "pw_containers/flat_map.h"
-
-namespace chip {
-namespace rpc {
-
-namespace {
-
-const char * TAG = "ipv6only";
-
-constexpr pw::containers::FlatMap<uint8_t, uint32_t, 73> kChannelToFreqMap({ {
-    { 1, 2412 },   { 2, 2417 },   { 3, 2422 },   { 4, 2427 },   { 5, 2432 },   { 6, 2437 },   { 7, 2442 },   { 8, 2447 },
-    { 9, 2452 },   { 10, 2457 },  { 11, 2462 },  { 12, 2467 },  { 13, 2472 },  { 14, 2484 },  { 32, 5160 },  { 34, 5170 },
-    { 36, 5180 },  { 38, 5190 },  { 40, 5200 },  { 42, 5210 },  { 44, 5220 },  { 46, 5230 },  { 48, 5240 },  { 50, 5250 },
-    { 52, 5260 },  { 54, 5270 },  { 56, 5280 },  { 58, 5290 },  { 60, 5300 },  { 62, 5310 },  { 64, 5320 },  { 68, 5340 },
-    { 96, 5480 },  { 100, 5500 }, { 102, 5510 }, { 104, 5520 }, { 106, 5530 }, { 108, 5540 }, { 110, 5550 }, { 112, 5560 },
-    { 114, 5570 }, { 116, 5580 }, { 118, 5590 }, { 120, 5600 }, { 122, 5610 }, { 124, 5620 }, { 126, 5630 }, { 128, 5640 },
-    { 132, 5660 }, { 134, 5670 }, { 136, 5680 }, { 138, 5690 }, { 140, 5700 }, { 142, 5710 }, { 144, 5720 }, { 149, 5745 },
-    { 151, 5755 }, { 153, 5765 }, { 155, 5775 }, { 157, 5785 }, { 159, 5795 }, { 161, 5805 }, { 165, 5825 }, { 169, 5845 },
-    { 173, 5865 }, { 183, 4915 }, { 184, 4920 }, { 185, 4925 }, { 187, 4935 }, { 188, 4940 }, { 189, 4945 }, { 192, 4960 },
-    { 196, 4980 },
-} });
-
-// Class handles the event handlers needed for station startup.
-// Creating the object will register all handlers needed, destroying will
-// unregister. The object is only needed during initialization, after the station
-// is up it is safe to destroy this object.
-class WiFiInitStationEventHandler
-{
-public:
-    WiFiInitStationEventHandler()
-    {
-        handler_context_.event_group = xEventGroupCreate();
-        esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &EventHandler, &handler_context_);
-    }
-
-    ~WiFiInitStationEventHandler()
-    {
-        vEventGroupDelete(handler_context_.event_group);
-        esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &EventHandler);
-    }
-
-    pw::Status WaitForStationUp()
-    {
-        EventBits_t bits = xEventGroupWaitBits(handler_context_.event_group, kWiFiStationUpBit, pdFALSE, pdFALSE, portMAX_DELAY);
-        if (!(bits & kWiFiStationUpBit))
-        {
-            return pw::Status::Unknown();
-        }
-        return pw::OkStatus();
-    }
-
-private:
-    static constexpr uint8_t kWiFiStationUpBit = BIT0;
-    struct HandlerContext
-    {
-        size_t retry_count = 0;
-        uint8_t error_code = 0;
-        EventGroupHandle_t event_group;
-    } handler_context_;
-
-    static void EventHandler(void * arg, esp_event_base_t event_base, int32_t event_id, void * event_data)
-    {
-        HandlerContext * context = static_cast<HandlerContext *>(arg);
-        if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START)
-        {
-            ESP_LOGI(TAG, "EVENT: WIFI_EVENT_STATION_START");
-            xEventGroupSetBits(context->event_group, kWiFiStationUpBit);
-        }
-    }
-};
-
-// Class handles the event handlers needed for wifi connection.
-// Creating the object will register all handlers needed, destroying will
-// unregister. The object is only needed during connection, once connected
-// is up it is safe to destroy this object.
-class WiFiConnectionEventHandler
-{
-public:
-    WiFiConnectionEventHandler(esp_netif_t * esp_netif)
-    {
-        handler_context_.esp_netif   = esp_netif;
-        handler_context_.event_group = xEventGroupCreate();
-        esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &EventHandler, &handler_context_);
-        esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &EventHandler, &handler_context_);
-        esp_event_handler_register(IP_EVENT, IP_EVENT_GOT_IP6, &EventHandler, &handler_context_);
-    }
-
-    ~WiFiConnectionEventHandler()
-    {
-        esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &EventHandler);
-        esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &EventHandler);
-        esp_event_handler_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, &EventHandler);
-        esp_event_handler_unregister(IP_EVENT, IP_EVENT_GOT_IP6, &EventHandler);
-        vEventGroupDelete(handler_context_.event_group);
-    }
-
-    // Waits for the events to determine if connected successfully.
-    pw::Status WaitForConnection(chip_rpc_ConnectionResult * result)
-    {
-        EventBits_t bits = xEventGroupWaitBits(handler_context_.event_group, kWiFiFailBit | kWiFiIpv6ConnectedBit, pdFALSE, pdFALSE,
-                                               portMAX_DELAY);
-        if (bits & kWiFiIpv6ConnectedBit)
-        {
-            result->error = chip_rpc_CONNECTION_ERROR_OK;
-        }
-        else if (bits & kWiFiFailBit)
-        {
-            result->error = handler_context_.error_code;
-            return pw::Status::Unavailable();
-        }
-        else
-        {
-            ESP_LOGE(TAG, "UNEXPECTED EVENT");
-            return pw::Status::Unknown();
-        }
-        return pw::OkStatus();
-    }
-
-private:
-    static constexpr size_t kWiFiConnectRetryMax   = 5;
-    static constexpr uint8_t kWiFiIpv6ConnectedBit = BIT0;
-    static constexpr uint8_t kWiFiIpv4ConnectedBit = BIT1;
-    static constexpr uint8_t kWiFiFailBit          = BIT2;
-
-    struct HandlerContext
-    {
-        size_t retry_count = 0;
-        enum _chip_rpc_CONNECTION_ERROR error_code;
-        EventGroupHandle_t event_group;
-        esp_netif_t * esp_netif;
-    } handler_context_;
-
-    static void EventHandler(void * arg, esp_event_base_t event_base, int32_t event_id, void * event_data)
-    {
-        HandlerContext * context = static_cast<HandlerContext *>(arg);
-        if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED)
-        {
-            ESP_LOGI(TAG, "EVENT: WIFI_EVENT_STA_DISCONNECTED, reason: %d",
-                     (static_cast<system_event_sta_disconnected_t *>(event_data))->reason);
-            if (context->retry_count < kWiFiConnectRetryMax)
-            {
-                esp_wifi_connect();
-                context->retry_count++;
-                ESP_LOGI(TAG, "retry to connect to the AP");
-            }
-            else
-            {
-                context->error_code =
-                    static_cast<_chip_rpc_CONNECTION_ERROR>((static_cast<system_event_sta_disconnected_t *>(event_data))->reason);
-                xEventGroupSetBits(context->event_group, kWiFiFailBit);
-            }
-        }
-        else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_CONNECTED)
-        {
-            ESP_ERROR_CHECK(esp_netif_create_ip6_linklocal(context->esp_netif));
-            ESP_LOGI(TAG, "Connected, link local address created");
-        }
-        else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP)
-        {
-            auto * event = static_cast<ip_event_got_ip_t *>(event_data);
-            ESP_LOGI(TAG, "got ip4: " IPSTR, IP2STR(&event->ip_info.ip));
-            xEventGroupSetBits(context->event_group, kWiFiIpv4ConnectedBit);
-        }
-        else if (event_base == IP_EVENT && event_id == IP_EVENT_GOT_IP6)
-        {
-            auto * event = static_cast<ip_event_got_ip6_t *>(event_data);
-            ESP_LOGI(TAG, "got ip6: " IPV6STR, IPV62STR(event->ip6_info.ip));
-            xEventGroupSetBits(context->event_group, kWiFiIpv6ConnectedBit);
-        }
-    }
-};
-
-// These are potentially large objects for the scan results.
-constexpr size_t kScanRecordsMax = sizeof(chip_rpc_ScanResults().aps) / sizeof(chip_rpc_ScanResult);
-chip_rpc_ScanResults out_scan_records;
-wifi_ap_record_t scan_records[kScanRecordsMax] = { 0 };
-
-} // namespace
-
-WiFi WiFi::instance_;
-
-pw::Status WiFi::Init()
-{
-    wifi_connected_semaphore_ = xSemaphoreCreateBinary();
-    PW_TRY(EspToPwStatus(esp_netif_init()));
-    PW_TRY(EspToPwStatus(esp_event_loop_create_default()));
-    esp_netif_ = esp_netif_create_default_wifi_sta();
-    PW_TRY(EspToPwStatus(esp_netif_dhcpc_stop(esp_netif_)));
-
-    WiFiInitStationEventHandler event_handler;
-
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    PW_TRY(EspToPwStatus(esp_wifi_init(&cfg)));
-    PW_TRY(EspToPwStatus(esp_wifi_set_mode(WIFI_MODE_STA)));
-    PW_TRY(EspToPwStatus(esp_wifi_start()));
-
-    PW_TRY(event_handler.WaitForStationUp());
-    return pw::OkStatus();
-}
-
-pw::Status WiFi::Connect(const chip_rpc_ConnectionData & request, chip_rpc_ConnectionResult & response)
-{
-    wifi_config_t wifi_config {
-        .sta = {
-            /* Setting a password implies station will connect to all security modes including WEP/WPA.
-             * However these modes are deprecated and not advisable to be used. Incase your Access point
-             * doesn't support WPA2, these mode can be enabled by commenting below line */
-	        .threshold = {
-                .authmode = static_cast<wifi_auth_mode_t>(request.security_type),
-            },
-
-            .pmf_cfg = {
-                .capable = true,
-                .required = false
-            },
-        },
-        };
-    memcpy(wifi_config.sta.ssid, request.ssid.bytes,
-           std::min(sizeof(wifi_config.sta.ssid), static_cast<size_t>(request.ssid.size)));
-    memcpy(wifi_config.sta.password, request.secret.bytes,
-           std::min(sizeof(wifi_config.sta.password), static_cast<size_t>(request.secret.size)));
-
-    WiFiConnectionEventHandler event_handler(esp_netif_);
-    PW_TRY(EspToPwStatus(esp_wifi_set_config(WIFI_IF_STA, &wifi_config)));
-    esp_err_t err = esp_wifi_connect();
-
-    if (ESP_ERR_WIFI_SSID == err)
-    {
-        ESP_LOGI(TAG, "AP not found SSID:%s", wifi_config.sta.ssid);
-        response.error = chip_rpc_CONNECTION_ERROR_NO_AP_FOUND;
-        return pw::Status::NotFound();
-    }
-    if (pw::Status status = event_handler.WaitForConnection(&response); status.ok())
-    {
-        ESP_LOGI(TAG, "connected to ap SSID:%s password:%s", wifi_config.sta.ssid, wifi_config.sta.password);
-        xSemaphoreGive(wifi_connected_semaphore_);
-    }
-    else
-    {
-        ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s", wifi_config.sta.ssid, wifi_config.sta.password);
-        return status;
-    }
-    return pw::OkStatus();
-}
-
-void WiFi::StartScan(const chip_rpc_ScanConfig & request, ServerWriter<chip_rpc_ScanResults> & writer)
-{
-    wifi_scan_config_t scan_config{ 0 };
-    if (request.ssid_count != 0)
-    {
-        scan_config.ssid = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(request.ssid[0].bytes));
-    }
-    if (request.bssid_count != 0)
-    {
-        scan_config.bssid = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(request.bssid[0].bytes));
-    }
-    scan_config.channel     = request.channel;
-    scan_config.show_hidden = request.show_hidden;
-    scan_config.scan_type   = static_cast<wifi_scan_type_t>(request.active_scan);
-    if (request.active_scan)
-    {
-        scan_config.scan_time.active.min = request.scan_time_min_ms;
-        scan_config.scan_time.active.max = request.scan_time_max_ms;
-    }
-    else
-    {
-        scan_config.scan_time.passive = request.scan_time_min_ms;
-    }
-
-    auto err = esp_wifi_scan_start(&scan_config, true /* block */);
-    if (ESP_OK != err)
-    {
-        ESP_LOGI(TAG, "Error starting scan: %d", err);
-        return;
-    }
-
-    // Output scan results
-    uint16_t num_scan_records = kScanRecordsMax;
-    err                       = esp_wifi_scan_get_ap_records(&num_scan_records, scan_records);
-    if (ESP_OK != err)
-    {
-        ESP_LOGI(TAG, "Error getting scanned APs: %d", err);
-        num_scan_records = 0;
-    }
-    ESP_LOGI(TAG, "%d", num_scan_records);
-    out_scan_records.aps_count = num_scan_records;
-
-    for (size_t i = 0; i < num_scan_records; ++i)
-    {
-        memcpy(out_scan_records.aps[i].ssid.bytes, scan_records[i].ssid, sizeof(out_scan_records.aps[i].ssid.bytes));
-        out_scan_records.aps[i].ssid.size = sizeof(out_scan_records.aps[i].ssid.bytes);
-        memcpy(out_scan_records.aps[i].bssid.bytes, scan_records[i].bssid, sizeof(out_scan_records.aps[i].bssid.bytes));
-        out_scan_records.aps[i].bssid.size    = sizeof(out_scan_records.aps[i].bssid.bytes);
-        out_scan_records.aps[i].security_type = static_cast<chip_rpc_WIFI_SECURITY_TYPE>(scan_records[i].authmode);
-        out_scan_records.aps[i].channel       = scan_records[i].primary;
-        auto found_channel                    = kChannelToFreqMap.find(scan_records[i].primary);
-        out_scan_records.aps[i].frequency     = (found_channel ? found_channel->second : 0);
-        out_scan_records.aps[i].signal        = scan_records[i].rssi;
-    }
-    writer.Write(out_scan_records);
-    writer.Finish();
-}
-
-void WiFi::WiFiEventHandler(void * arg, esp_event_base_t event_base, int32_t event_id, void * event_data)
-{
-    if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED)
-    {
-        ESP_LOGI(TAG, "******** DISCONNECTED FROM AP *********");
-        esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &WiFiEventHandler);
-        esp_event_handler_unregister(IP_EVENT, IP_EVENT_GOT_IP6, &WiFiEventHandler);
-    }
-    else if (event_base == IP_EVENT && event_id == IP_EVENT_GOT_IP6)
-    {
-        // This is in case not only link-local address is provided
-        auto * event = static_cast<ip_event_got_ip6_t *>(event_data);
-        ESP_LOGI(TAG, "got ip6 :" IPV6STR, IPV62STR(event->ip6_info.ip));
-    }
-}
-
-} // namespace rpc
-} // namespace chip
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
index 0a1e68b0874082..402faaeca9a70c 100644
--- a/examples/light-switch-app/efr32/BUILD.gn
+++ b/examples/light-switch-app/efr32/BUILD.gn
@@ -60,6 +60,9 @@ declare_args() {
 
   # Disable LCD on supported devices
   disable_lcd = false
+
+  # Argument to Disable IPv4 for wifi(rs911)
+  chip_disable_wifi_ipv4 = false
 }
 
 declare_args() {
@@ -215,6 +218,10 @@ efr32_executable("light_switch_app") {
     sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
   }
 
+  if (chip_disable_wifi_ipv4) {
+    defines += [ "WIFI_IPV4_DISABLED" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {
diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni
index 96b6262f50b93e..348e8e012098ae 100644
--- a/examples/light-switch-app/efr32/args.gni
+++ b/examples/light-switch-app/efr32/args.gni
@@ -23,3 +23,4 @@ chip_enable_ota_requestor = true
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log"
 chip_enable_openthread = true
+pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
diff --git a/examples/light-switch-app/efr32/src/AppTask.cpp b/examples/light-switch-app/efr32/src/AppTask.cpp
index d7da5a17ea4d24..fe982497bd6245 100644
--- a/examples/light-switch-app/efr32/src/AppTask.cpp
+++ b/examples/light-switch-app/efr32/src/AppTask.cpp
@@ -240,7 +240,7 @@ CHIP_ERROR AppTask::Init()
     }
 
 // Print setup info on LCD if available
-#ifdef DISPLAY_ENABLED
+#ifdef QR_CODE_ENABLED
     // Create buffer for QR code that can fit max size and null terminator.
     char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
     chip::MutableCharSpan QRCode(qrCodeBuffer);
@@ -255,7 +255,7 @@ CHIP_ERROR AppTask::Init()
     }
 #else
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
-#endif
+#endif // QR_CODE_ENABLED
 
     return err;
 }
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 1c7012fd25b73f..5b089349467146 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
@@ -629,8 +629,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -1160,6 +1168,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1200,13 +1209,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1227,10 +1237,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1259,7 +1265,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 client cluster Scenes = 5 {
@@ -1371,12 +1376,16 @@ client cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1513,7 +1522,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1521,11 +1530,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1568,12 +1577,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1678,8 +1687,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Descriptor {
@@ -1794,6 +1803,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1808,67 +1818,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -1952,8 +1962,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type onofflightswitch = 259;
   binding cluster Identify;
   binding cluster Scenes;
   binding cluster OnOff;
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 e5b192c4b10850..70fe778341a154 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
@@ -2612,7 +2612,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2742,6 +2751,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2971,7 +2996,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2985,9 +3010,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3003,7 +3028,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3019,7 +3044,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3035,7 +3060,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3051,7 +3076,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3067,7 +3092,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3115,7 +3140,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3131,7 +3156,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3147,7 +3172,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3163,7 +3188,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3179,7 +3204,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3195,7 +3220,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3211,7 +3236,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3227,7 +3252,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3243,7 +3268,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3259,7 +3284,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3275,7 +3300,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3291,7 +3316,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3307,7 +3332,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3323,7 +3348,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3339,7 +3364,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3355,7 +3380,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3371,7 +3396,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3387,7 +3412,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3403,7 +3428,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3419,7 +3444,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3435,7 +3460,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3451,7 +3476,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3467,7 +3492,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3483,7 +3508,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3499,7 +3524,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3515,7 +3540,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3531,7 +3556,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3547,7 +3572,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3563,7 +3588,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3579,7 +3604,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3595,7 +3620,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3611,7 +3636,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3627,7 +3652,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3643,7 +3668,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3659,7 +3684,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3675,7 +3700,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3691,7 +3716,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3707,7 +3732,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3723,7 +3748,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3739,7 +3764,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3755,7 +3780,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3771,7 +3796,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3787,7 +3812,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3803,7 +3828,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3819,7 +3844,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3835,7 +3860,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3851,7 +3876,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3867,7 +3892,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3883,7 +3908,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3899,7 +3924,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3913,7 +3938,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3931,7 +3956,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3945,7 +3970,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4783,14 +4808,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -6382,7 +6399,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/light-switch-app/nrfconnect/main/AppTask.cpp b/examples/light-switch-app/nrfconnect/main/AppTask.cpp
index 5f2888bb156182..f8dfd2d63d4750 100644
--- a/examples/light-switch-app/nrfconnect/main/AppTask.cpp
+++ b/examples/light-switch-app/nrfconnect/main/AppTask.cpp
@@ -22,6 +22,7 @@
 #include "LightSwitch.h"
 #include "ThreadUtil.h"
 
+#include <DeviceInfoProviderImpl.h>
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
@@ -38,8 +39,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 using namespace ::chip;
 using namespace ::chip::app;
@@ -80,6 +81,8 @@ k_timer sFunctionTimer;
 k_timer sDimmerPressKeyTimer;
 k_timer sDimmerTimer;
 
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
 } /* namespace */
 
 AppTask AppTask::sAppTask;
@@ -153,10 +156,7 @@ CHIP_ERROR AppTask::Init()
     // Initialize DFU
 #ifdef CONFIG_MCUMGR_SMP_BT
     GetDFUOverSMP().Init(RequestSMPAdvertisingStart);
-#ifndef CONFIG_CHIP_OTA_REQUESTOR
-    // When OTA Requestor is enabled, it is responsible for confirming new images.
     GetDFUOverSMP().ConfirmNewImage();
-#endif
 #endif
 
     // Print initial configs
@@ -164,9 +164,10 @@ CHIP_ERROR AppTask::Init()
     static chip::CommonCaseDeviceServerInitParams initParams;
     ReturnErrorOnFailure(initParams.InitializeStaticResourcesBeforeServerInit());
     ReturnErrorOnFailure(Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
 
@@ -385,6 +386,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* arg *
         sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (aEvent->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         if ((ConnectivityMgr().NumBLEConnections() == 0) && (!sIsThreadProvisioned || !sIsThreadEnabled))
         {
diff --git a/examples/light-switch-app/nrfconnect/main/BindingHandler.cpp b/examples/light-switch-app/nrfconnect/main/BindingHandler.cpp
index 9cf98455d66ede..678e48df31b674 100644
--- a/examples/light-switch-app/nrfconnect/main/BindingHandler.cpp
+++ b/examples/light-switch-app/nrfconnect/main/BindingHandler.cpp
@@ -21,7 +21,7 @@
 #include "ShellCommands.h"
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
 using namespace chip;
diff --git a/examples/light-switch-app/nrfconnect/main/main.cpp b/examples/light-switch-app/nrfconnect/main/main.cpp
index 87098ff4b3e5d3..e463898978fb91 100644
--- a/examples/light-switch-app/nrfconnect/main/main.cpp
+++ b/examples/light-switch-app/nrfconnect/main/main.cpp
@@ -18,7 +18,7 @@
 
 #include "AppTask.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/light-switch-app/telink/CMakeLists.txt b/examples/light-switch-app/telink/CMakeLists.txt
index 3368eb6a9ac567..1b28131ca7b41c 100755
--- a/examples/light-switch-app/telink/CMakeLists.txt
+++ b/examples/light-switch-app/telink/CMakeLists.txt
@@ -65,7 +65,6 @@ target_sources(app PRIVATE
                ${CHIP_ROOT}/src/app/util/attribute-storage.cpp
                ${CHIP_ROOT}/src/app/util/attribute-table.cpp
                ${CHIP_ROOT}/src/app/util/binding-table.cpp
-               ${CHIP_ROOT}/src/app/util/client-api.cpp
                ${CHIP_ROOT}/src/app/util/ember-compatibility-functions.cpp
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
                ${CHIP_ROOT}/src/app/util/error-mapping.cpp
diff --git a/examples/light-switch-app/telink/include/AppTask.h b/examples/light-switch-app/telink/include/AppTask.h
index 70abb978d2cdc1..b682884b30155d 100755
--- a/examples/light-switch-app/telink/include/AppTask.h
+++ b/examples/light-switch-app/telink/include/AppTask.h
@@ -56,11 +56,14 @@ class AppTask
 
     void DispatchEvent(AppEvent * event);
 
+    static void UpdateStatusLED();
     static void SwitchActionButtonEventHandler(void);
     static void FactoryResetButtonEventHandler(void);
     static void StartThreadButtonEventHandler(void);
     static void StartBleAdvButtonEventHandler(void);
 
+    static void ChipEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
     static void FactoryResetHandler(AppEvent * aEvent);
     static void StartThreadHandler(AppEvent * aEvent);
     static void SwitchActionEventHandler(AppEvent * aEvent);
diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
index 1d55aabce7cdac..c7946f01819c34 100755
--- a/examples/light-switch-app/telink/prj.conf
+++ b/examples/light-switch-app/telink/prj.conf
@@ -24,6 +24,10 @@ CONFIG_GPIO=y
 # enable PWM
 CONFIG_PWM=y
 
+# OpenThread configs
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
 # Default OpenThread network settings
 CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15
diff --git a/examples/light-switch-app/telink/src/AppTask.cpp b/examples/light-switch-app/telink/src/AppTask.cpp
index 8078ac9fff1b6f..8b8bac4ed2d878 100755
--- a/examples/light-switch-app/telink/src/AppTask.cpp
+++ b/examples/light-switch-app/telink/src/AppTask.cpp
@@ -86,6 +86,8 @@ CHIP_ERROR AppTask::Init()
     LEDWidget::InitGpio(SYSTEM_STATE_LED_PORT);
     sStatusLED.Init(SYSTEM_STATE_LED_PIN);
 
+    UpdateStatusLED();
+
     InitButtons();
 
     // Init ZCL Data Model and start server
@@ -108,6 +110,11 @@ CHIP_ERROR AppTask::Init()
 
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
+    // Add CHIP event handler and start CHIP thread.
+    // Note that all the initialization code should happen prior to this point to avoid data races
+    // between the main and the CHIP threads.
+    PlatformMgr().AddEventHandler(ChipEventHandler, 0);
+
     ret = ConnectivityMgr().SetBLEDeviceName("TelinkSwitch");
     if (ret != CHIP_NO_ERROR)
     {
@@ -140,37 +147,6 @@ CHIP_ERROR AppTask::StartApp()
             ret = k_msgq_get(&sAppEventQueue, &event, K_NO_WAIT);
         }
 
-        // Collect connectivity and configuration state from the CHIP stack.  Because the
-        // CHIP event loop is being run in a separate task, the stack must be locked
-        // while these values are queried.  However we use a non-blocking lock request
-        // (TryLockChipStack()) to avoid blocking other UI activities when the CHIP
-        // task is busy (e.g. with a long crypto operation).
-
-        if (PlatformMgr().TryLockChipStack())
-        {
-            sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned();
-            sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
-            sIsThreadAttached    = ConnectivityMgr().IsThreadAttached();
-            sHaveBLEConnections  = (ConnectivityMgr().NumBLEConnections() != 0);
-            PlatformMgr().UnlockChipStack();
-        }
-
-        if (sIsThreadProvisioned && sIsThreadEnabled)
-        {
-            if (sIsThreadAttached)
-            {
-                sStatusLED.Blink(950, 50);
-            }
-            else
-            {
-                sStatusLED.Blink(100, 100);
-            }
-        }
-        else
-        {
-            sStatusLED.Blink(50, 950);
-        }
-
         sStatusLED.Animate();
     }
 }
@@ -273,6 +249,52 @@ void AppTask::StartBleAdvHandler(AppEvent * aEvent)
     }
 }
 
+void AppTask::UpdateStatusLED()
+{
+    if (sIsThreadProvisioned && sIsThreadEnabled)
+    {
+        if (sIsThreadAttached)
+        {
+            sStatusLED.Blink(950, 50);
+        }
+        else
+        {
+            sStatusLED.Blink(100, 100);
+        }
+    }
+    else
+    {
+        sStatusLED.Blink(50, 950);
+    }
+}
+
+void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kCHIPoBLEAdvertisingChange:
+        sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
+        UpdateStatusLED();
+        break;
+    case DeviceEventType::kThreadStateChange:
+        sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned();
+        sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
+        sIsThreadAttached    = ConnectivityMgr().IsThreadAttached();
+        UpdateStatusLED();
+        break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
+    default:
+        break;
+    }
+}
+
 void AppTask::ActionInitiated(AppTask::Action_t aAction, int32_t aActor) {}
 
 void AppTask::ActionCompleted(AppTask::Action_t aAction, int32_t aActor)
diff --git a/examples/light-switch-app/telink/src/main.cpp b/examples/light-switch-app/telink/src/main.cpp
index 24f15f95490503..9c61b313f87569 100755
--- a/examples/light-switch-app/telink/src/main.cpp
+++ b/examples/light-switch-app/telink/src/main.cpp
@@ -64,7 +64,13 @@ int main(void)
         goto exit;
     }
 
+#ifdef CONFIG_OPENTHREAD_MTD_SED
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#elif CONFIG_OPENTHREAD_MTD
     err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#else
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#endif
     if (err != CHIP_NO_ERROR)
     {
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake
index 6ba0531e97f357..ecdc70c49c25d2 100755
--- a/examples/lighting-app/ameba/chip_main.cmake
+++ b/examples/lighting-app/ameba/chip_main.cmake
@@ -19,6 +19,7 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
 )
 endif (matter_enable_ota_requestor)
 
@@ -36,6 +37,8 @@ list(
     ${chip_dir}/examples/lighting-app/ameba/main/Globals.cpp
     ${chip_dir}/examples/lighting-app/ameba/main/LEDWidget.cpp
     ${chip_dir}/examples/lighting-app/ameba/main/DsoHack.cpp
+
+    ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
 )
 
 add_library(
@@ -59,6 +62,8 @@ target_include_directories(
     ${chip_dir}/examples/lighting-app/lighting-common
     ${chip_dir}/examples/lighting-app/lighting-common/include
     ${chip_dir}/examples/lighting-app/ameba/main/include
+    ${chip_dir}/examples/platform/ameba
+    ${chip_dir}/examples/providers
     ${chip_dir_output}/gen/include
     ${chip_dir}/src/include/
     ${chip_dir}/src/lib/
@@ -84,14 +89,6 @@ list(
     -DMATTER_LIGHTING_APP=1
 )
 
-if (matter_enable_ota_requestor)
-list(
-    APPEND chip_main_flags
-
-    -DCONFIG_ENABLE_OTA_REQUESTOR=1
-)
-endif (matter_enable_ota_requestor)
-
 list(
     APPEND chip_main_cpp_flags
 
diff --git a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
index cb023f73b6ea87..754a79651b7063 100644
--- a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
@@ -37,6 +37,10 @@
 #include <support/logging/CHIPLogging.h>
 #include <support/logging/Constants.h>
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <ota/OTAInitializer.h>
+#endif
+
 static const char * TAG = "app-devicecallbacks";
 
 using namespace ::chip;
@@ -47,7 +51,15 @@ using namespace ::chip::DeviceManager;
 using namespace ::chip::Logging;
 
 uint32_t identifyTimerCount;
-constexpr uint32_t kIdentifyTimerDelayMS = 250;
+constexpr uint32_t kIdentifyTimerDelayMS     = 250;
+constexpr uint32_t kInitOTARequestorDelaySec = 3;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
+{
+    OTAInitializer::Instance().InitOTARequestor();
+}
+#endif
 
 void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
 {
@@ -76,6 +88,10 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_
 
 void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
 {
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    static bool isOTAInitialized = false;
+#endif
+
     if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
     {
         printf("IPv4 Server ready...");
@@ -89,6 +105,15 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
     {
         printf("IPv6 Server ready...");
         chip::app::DnssdServer::Instance().StartServer();
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+        // Init OTA requestor only when we have gotten IPv6 address
+        if (!isOTAInitialized)
+        {
+            chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds32(kInitOTARequestorDelaySec),
+                                                        InitOTARequestorHandler, nullptr);
+            isOTAInitialized = true;
+        }
+#endif
     }
     else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
     {
diff --git a/examples/lighting-app/ameba/main/chipinterface.cpp b/examples/lighting-app/ameba/main/chipinterface.cpp
index 6ef8940aaacfc3..6ba9aa4a21686c 100644
--- a/examples/lighting-app/ameba/main/chipinterface.cpp
+++ b/examples/lighting-app/ameba/main/chipinterface.cpp
@@ -22,6 +22,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 #include "Server.h"
+#include <DeviceInfoProviderImpl.h>
 
 #include "chip_porting.h"
 #include <credentials/DeviceAttestationCredsProvider.h>
@@ -42,16 +43,6 @@
 
 #include <lwip_netconf.h>
 
-#if CONFIG_ENABLE_OTA_REQUESTOR
-#include "app/clusters/ota-requestor/DefaultOTARequestorStorage.h"
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
-#include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
-#include <platform/Ameba/AmebaOTAImageProcessor.h>
-#endif
-
 using namespace ::chip;
 using namespace ::chip::Credentials;
 using namespace ::chip::DeviceManager;
@@ -84,55 +75,7 @@ void NetWorkCommissioningInstInit()
 #endif
 
 static DeviceCallbacks EchoCallbacks;
-
-#if CONFIG_ENABLE_OTA_REQUESTOR
-DefaultOTARequestor gRequestorCore;
-DefaultOTARequestorStorage gRequestorStorage;
-ExtendedOTARequestorDriver gRequestorUser;
-BDXDownloader gDownloader;
-AmebaOTAImageProcessor gImageProcessor;
-chip::ota::DefaultOTARequestorUserConsent gUserConsentProvider;
-static chip::ota::UserConsentState gUserConsentState = chip::ota::UserConsentState::kGranted;
-#endif
-
-#if CONFIG_ENABLE_OTA_REQUESTOR
-extern "C" void amebaQueryImageCmdHandler()
-{
-    ChipLogProgress(DeviceLayer, "Calling amebaQueryImageCmdHandler");
-    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->TriggerImmediateQuery(); });
-}
-
-extern "C" void amebaApplyUpdateCmdHandler()
-{
-    ChipLogProgress(DeviceLayer, "Calling amebaApplyUpdateCmdHandler");
-    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->ApplyUpdate(); });
-}
-
-static void InitOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects -- START
-    SetRequestorInstance(&gRequestorCore);
-
-    gRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-
-    // Set server instance used for session establishment
-    gRequestorCore.Init(Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
-
-    gImageProcessor.SetOTADownloader(&gDownloader);
-
-    // Connect the Downloader and Image Processor objects
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
-
-    if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
-    {
-        gUserConsentProvider.SetUserConsentState(gUserConsentState);
-        gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
-    }
-
-    // Initialize and interconnect the Requestor and Image Processor objects -- END
-}
-#endif // CONFIG_ENABLE_OTA_REQUESTOR
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
 void OnIdentifyStart(Identify *)
 {
@@ -176,15 +119,13 @@ static void InitServer(intptr_t context)
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     chip::Server::GetInstance().Init(initParams);
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
     NetWorkCommissioningInstInit();
 
-#if CONFIG_ENABLE_OTA_REQUESTOR
-    InitOTARequestor();
-#endif
-
     if (RTW_SUCCESS != wifi_is_connected_to_ap())
     {
         // QR code will be used with CHIP Tool
diff --git a/examples/lighting-app/bouffalolab/bl602/README.md b/examples/lighting-app/bouffalolab/bl602/README.md
index 8cb3295646a644..2810808d155393 100644
--- a/examples/lighting-app/bouffalolab/bl602/README.md
+++ b/examples/lighting-app/bouffalolab/bl602/README.md
@@ -1,73 +1,148 @@
-#CHIP BL602 Lighting Example
+# BL602
 
-## Build
+This example functions as a wifi light bulb device type, with on/off
+capabilities. The steps were verified on BL602-IoT-DVK-3S board.
 
--   Install some additional tools(likely already present for CHIP developers):
+BL602-IoT-DVK-3S
+<img src="../../../platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg" style="zoom:25%;" />
 
-    #Linux \$ sudo apt-get install git libwebkitgtk-1.0-0 ninja-build
+## Initial setup
 
-    #Mac OS X \$ brew install ninja
+-   Setting up the environment on ubuntu 20.04 or 18.04
 
-*   Build the example application:
+```
+$ sudo apt-get update
+$ sudo apt-get upgrade
+$ sudo apt-get install git gcc g++ python pkg-config 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 bluez avahi-daemon
+$ sudo apt-get install pi-bluetooth (if not raspberry pi, sudo apt-get install bluetooth)
+$ reboot
 
-    `connectedhomeip$ ./scripts/build/build_examples.py --target bl602-lighting build`
+```
 
-Generated files
+-   Clone and initialize the connectedhomeip repo
 
-         ```
-         connectedhomeip/out/lighting_app_bl602/chip-bl602-lighting-example.bin
-         ```
+```
+git clone https://github.com/project-chip/connectedhomeip.git
+cd connectedhomeip
+git submodule update --init --recursive
+```
 
--   To delete generated executable, libraries and object files use:
+-   Install packets
 
-         ```
-         $ cd ~/connectedhomeip/
-         $ rm -rf out/
-         ```
+```
+$ cd {path-to-connectedhomeip}
+connectedhomeip$ source ./scripts/bootstrap.sh
+connectedhomeip$ source ./scripts/activate.sh
 
-## Flash
+```
 
--   Download [FLASH_TOOL](https://dev.bouffalolab.com/download/).
+## Build the image
 
-### Setting up Python Controller
+-   Build the example application:
 
-Once BL602 is up and running, we need to set up a device controller to perform
-commissioning and cluster control.
+    `connectedhomeip$ ./scripts/build/build_examples.py --target bl602-light build`
 
--   Set up python controller.
+    Generated files
 
-           ```
-           $ cd {path-to-connectedhomeip}
-           $ ./scripts/build_python.sh -m platform
-           ```
+    `connectedhomeip/out/bl602-light/chip-bl602-lighting-example.bin`
 
--   Execute the controller.
+    -   To delete generated executable, libraries and object files use:
 
-           ```
-           $ source ./out/python_env/bin/activate
-           $ chip-device-ctrl
-           ```
+    ```
+    $ cd ~/connectedhomeip/
+    $ rm -rf out/
+    ```
 
-### Commissioning over BLE
+## Flash the board
 
--   Establish the secure session over BLE. BLE is the default mode in the
-    application and is configurable through menuconfig.
+-   Download [Bouffalo Lab Dev Cube](https://dev.bouffalolab.com/download/).
 
-         ```
-         - chip-device-ctrl > ble-scan
-         - chip-device-ctrl > set-pairing-wifi-credential TESTSSID P455W4RD
-         - chip-device-ctrl > connect -ble 3904 20202021 135246
+    Log in to the site as a guest.
 
-         Parameters:
-         1. Discriminator: 3904
-         2. Setup-pin-code: 20202021
-         3. Node ID: Optional.
-            If not passed in this command, then it is auto-generated by the controller and displayed in the output of connect.
-            The same value should be used in the next commands.
-            We have chosen a random node ID which is 135246.
-         4. TESTSSID : Wi-Fi SSID
-         5. P455W4RD : Wi-Fi Password
-         ```
+    <img src="../../../platform/bouffalolab/bl602/doc/images/image-web-login.png" style="zoom:30%;" align=left />
+
+    <img src="../../../platform/bouffalolab/bl602/doc/images/dev-cube.png" style="zoom:30%;" align=left />
+
+run the software :
+
+  <img src="../../../platform/bouffalolab/bl602/doc/images/dev-cube-home.png" style="zoom:70%;" align=left />
+
+  <img src="../../../platform/bouffalolab/bl602/doc/images/dev-cube-iot.png" style="zoom:70%;" />
+
+The following picture shows the burning interface. To download the firmware, you
+need to enter the download mode: press and hold the Boot (IO8) pin of the
+development board, press the **RST** button, and then release the Boot button to
+enter the burning and downloading mode.
+
+<img src="../../../platform/bouffalolab/bl602/doc/images/image-dev-cube.png" style="zoom:70%;" align=left />
+
+Notice: Latest version Bouffalolab dev cube is recommended.
+
+Factory Params:
+`BouffaloLabDevCube-1.7.2-linux-x86/chips/bl602/device_tree/bl_factory_params_IoTKitA_40M.dts`
+
+Partition Table:
+`BouffaloLabDevCube-1.7.2-linux-x86/chips/bl602/partition/partition_cfg_2M.toml`
+
+Boot2 Bin:
+`BouffaloLabDevCube-1.7.2-linux-x86/chips/bl602/builtin_imgs/boot2_iap_v5.5/boot2_iap_release.bin`
+
+Firmware Bin: `connectedhomeip/out/bl602-light/chip-bl602-lighting-example.bin`
+
+Partition Table：
+
+1. FW: The size of FW size0 must be larger than the bin size, we can do it by
+   reducing the size of FW size1 and media partition size0.
+
+COM Port:
+
+```
+   ls -la /dev/ttyUSB*
+```
+
+select the big one.
+
+## Validate the example
+
+1.The device should present itself as a USB serial device on your computer. You
+may look it up in `/dev/`:
+
+```
+ls -la /dev/tty*
+```
+
+You can open the serial console. For example, if the device is at `/dev/USB1`:
+
+```
+picocom -b 2000000 /dev/ttyUSB1
+```
+
+To reset the board, press the **RST** button. And you will see the log from the
+demo board.
+
+## Commission a device using chip-tool
+
+To initiate a client commissioning request to a device, run the built executable
+and choose the pairing mode.
+
+#### Commissioning over BLE
+
+Run the built executable and pass it the discriminator and pairing code of the
+remote device, as well as the network credentials to use.
+
+The command below uses the default values hard-coded into the debug versions of
+the BL602 lighting-app to commission it onto a Wi-Fi network:
+
+```
+$ sudo ./chip-tool pairing ble-wifi 1 ${SSID} ${PASSWORD} 20202021 3840
+
+ Parameters:
+ 1. Discriminator: 3840
+ 2. Setup-pin-code: 20202021
+ 3. Node ID: 1
+ 4. SSID : Wi-Fi SSID
+ 5. PASSWORD : Wi-Fi Password
+```
 
 ### Cluster control
 
@@ -75,16 +150,8 @@ commissioning and cluster control.
     the OnOff attribute. This allows you to toggle a parameter implemented by
     the device to be On or Off.
 
-    `chip-device-ctrl > zcl OnOff On 135246 1 1`
-    `chip-device-ctrl > zcl OnOff Off 135246 1 1`
-
--   Use the LevelControl cluster commands to control the CurrentLevel attribute.
-    This allows you to control the brightness of the led.
-
-    `chip-device-ctrl > zcl LevelControl MoveToLevel 135246 1 1 level=10 transitionTime=0 optionMask=0 optionOverride=0`
+    `$ sudo ./chip-tool onoff on 1 1`
 
--   Use the ColorControl cluster commands to control the CurrentHue and
-    CurrentSaturation attribute.
+-   Use ColorControl cluster command to control the color attributes:
 
-    `chip-device-ctrl > zcl ColorControl MoveToHue 135246 1 1 hue=100 direction=0 transitionTime=0 optionsMask=0 optionsOverride=0`
-    `chip-device-ctrl > zcl ColorControl MoveToSaturation 135245 1 1 saturation=200 transitionTime=0 optionsMask=0 optionsOverride=0`
+    `$ sudo ./chip-tool colorcontrol move-to-hue-and-saturation 240 100 0 0 0 1 1`
diff --git a/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h b/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h
index 432da6a471750a..2be12f7d113334 100644
--- a/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h
@@ -42,7 +42,7 @@
 #ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
 #endif
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF40
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
 
 // For convenience, Chip Security Test Mode can be enabled and the
 // requirement for authentication in various protocols can be disabled.
diff --git a/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp b/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp
index 905d6124f1bac2..a67ca012b56438 100644
--- a/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp
+++ b/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp
@@ -137,8 +137,26 @@ void AppTask::AppTaskMain(void * pvParameter)
 
     log_info("App Task entered\r\n");
 
-    sWiFiNetworkCommissioningInstance.Init();
-    chip::Server::GetInstance().Init();
+    err = sWiFiNetworkCommissioningInstance.Init();
+    if (CHIP_NO_ERROR != err)
+    {
+        log_error("Network commissioning failed, err:%d \r\n", err);
+    }
+
+    chip::CommonCaseDeviceServerInitParams initParams;
+    err = initParams.InitializeStaticResourcesBeforeServerInit();
+    if (CHIP_NO_ERROR != err)
+    {
+        log_error("Resources Init failed, err:%d \r\n", err);
+        return;
+    }
+
+    err = chip::Server::GetInstance().Init(initParams);
+    if (CHIP_NO_ERROR != err)
+    {
+        log_error("Server Init failed, err:%d \r\n", err);
+        return;
+    }
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
diff --git a/examples/lighting-app/bouffalolab/bl602/src/LEDWidget.cpp b/examples/lighting-app/bouffalolab/bl602/src/LEDWidget.cpp
index b79f5b64b6e400..0dab8b76bf7283 100644
--- a/examples/lighting-app/bouffalolab/bl602/src/LEDWidget.cpp
+++ b/examples/lighting-app/bouffalolab/bl602/src/LEDWidget.cpp
@@ -83,8 +83,9 @@ static void showRGB(uint8_t red, uint8_t green, uint8_t blue)
 
     level = (blue * 10000) / UINT8_MAX;
     log_info("blue level: %d\r\n", level);
-    pwmB.port              = 2;
-    pwmB.config.pin        = 17;
+    pwmB.port = 2;
+    // not use debug port
+    // pwmB.config.pin        = 17;
     pwmB.config.duty_cycle = level; // duty_cycle range is 0~10000 correspond to 0~100%
     pwmB.config.freq       = 1000;
     hosal_pwm_init(&pwmB);
diff --git a/examples/lighting-app/bouffalolab/bl602/src/main.cpp b/examples/lighting-app/bouffalolab/bl602/src/main.cpp
index 9f0cc914fb8095..eaa1e35821f298 100644
--- a/examples/lighting-app/bouffalolab/bl602/src/main.cpp
+++ b/examples/lighting-app/bouffalolab/bl602/src/main.cpp
@@ -68,16 +68,6 @@ app::Clusters::NetworkCommissioning::Instance
     sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::BLWiFiDriver::GetInstance()));
 } // namespace
 
-static void InitServer(intptr_t context)
-{
-    chip::Server::GetInstance().Init();
-
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
-    sWiFiNetworkCommissioningInstance.Init();
-}
-
 extern "C" int main()
 {
     InitPlatform();
diff --git a/examples/lighting-app/cyw30739/BUILD.gn b/examples/lighting-app/cyw30739/BUILD.gn
index e29a615a8ae7eb..86d7342430b378 100644
--- a/examples/lighting-app/cyw30739/BUILD.gn
+++ b/examples/lighting-app/cyw30739/BUILD.gn
@@ -20,6 +20,7 @@ import("${cyw30739_sdk_build_root}/cyw30739_executable.gni")
 import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni")
 
 cyw30739_project_dir = "${chip_root}/examples/lighting-app/cyw30739"
+examples_plat_dir = "${chip_root}/examples/platform/cyw30739"
 
 declare_args() {
   setupPinCode = 20202021
@@ -29,7 +30,10 @@ declare_args() {
 cyw30739_sdk("sdk") {
   sources = [ "${cyw30739_project_dir}/include/CHIPProjectConfig.h" ]
 
-  include_dirs = [ "${cyw30739_project_dir}/include" ]
+  include_dirs = [
+    "${cyw30739_project_dir}/include",
+    "${examples_plat_dir}",
+  ]
 
   defines = [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setupPinCode}",
@@ -51,11 +55,19 @@ cyw30739_executable("lighting_app") {
   deps = [
     ":sdk",
     "${chip_root}/examples/lighting-app/lighting-common",
+    "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/examples/shell/shell_common:shell_common",
     "${chip_root}/src/lib",
   ]
 
   include_dirs = [ "include" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${examples_plat_dir}/OTAConfig.cpp",
+      "${examples_plat_dir}/OTAConfig.h",
+    ]
+  }
 }
 
 group("cyw30739") {
diff --git a/examples/lighting-app/cyw30739/args.gni b/examples/lighting-app/cyw30739/args.gni
index 8361c808a27a37..267c1db9b56817 100644
--- a/examples/lighting-app/cyw30739/args.gni
+++ b/examples/lighting-app/cyw30739/args.gni
@@ -18,3 +18,10 @@ import("${chip_root}/src/platform/CYW30739/args.gni")
 cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_openthread_ftd = true
+
+chip_enable_ota_requestor = true
+
+chip_error_logging = false
+chip_progress_logging = false
+chip_detail_logging = false
+chip_automation_logging = false
diff --git a/examples/lighting-app/cyw30739/include/LightingManager.h b/examples/lighting-app/cyw30739/include/LightingManager.h
index 0ce5b5c4073bfa..917bb37c023c63 100644
--- a/examples/lighting-app/cyw30739/include/LightingManager.h
+++ b/examples/lighting-app/cyw30739/include/LightingManager.h
@@ -55,10 +55,10 @@ class LightingManager
     typedef void (*Callback_fn_initiated)(Actor_t, Action_t, uint8_t);
     typedef void (*Callback_fn_completed)(Action_t);
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
+    void WriteClusterLevel(uint8_t value);
 
 private:
     void WriteClusterState(uint8_t value);
-    void WriteClusterLevel(uint8_t value);
 
     friend LightingManager & LightMgr(void);
     State_t mState;
diff --git a/examples/lighting-app/cyw30739/src/ButtonHandler.cpp b/examples/lighting-app/cyw30739/src/ButtonHandler.cpp
index 10c24a4b785440..c8665dfe492797 100644
--- a/examples/lighting-app/cyw30739/src/ButtonHandler.cpp
+++ b/examples/lighting-app/cyw30739/src/ButtonHandler.cpp
@@ -20,11 +20,15 @@
 
 #include <ButtonHandler.h>
 #include <LightingManager.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <platform/CHIPDeviceLayer.h>
 #include <stdio.h>
 #include <wiced.h>
 #include <wiced_button_manager.h>
 #include <wiced_platform.h>
 
+using namespace chip::app::Clusters;
+
 /******************************************************
  *                      Macros
  ******************************************************/
@@ -56,7 +60,7 @@ wiced_result_t app_button_init(void)
     memset(app_buttons, 0, (sizeof(button_manager_button_t) * APP_MAX_BUTTON_DEF));
 
     app_button_configurations[ON_OFF_BUTTON].button            = PLATFORM_BUTTON_1;
-    app_button_configurations[ON_OFF_BUTTON].button_event_mask = BUTTON_CLICK_EVENT;
+    app_button_configurations[ON_OFF_BUTTON].button_event_mask = BUTTON_CLICK_EVENT | BUTTON_HOLDING_EVENT;
     app_buttons[ON_OFF_BUTTON].configuration                   = &app_button_configurations[ON_OFF_BUTTON];
 
     result = wiced_button_manager_init(&app_button_manager, &app_button_manager_configuration, app_buttons, 1);
@@ -71,7 +75,7 @@ wiced_result_t app_button_init(void)
 void app_button_event_handler(const button_manager_button_t * button_mgr, button_manager_event_t event,
                               button_manager_button_state_t state)
 {
-
+    uint8_t attributeValue;
     if (button_mgr[0].configuration->button == PLATFORM_BUTTON_1 && event == BUTTON_CLICK_EVENT && state == BUTTON_STATE_RELEASED)
     {
         if (LightMgr().IsLightOn())
@@ -85,4 +89,11 @@ void app_button_event_handler(const button_manager_button_t * button_mgr, button
             LightMgr().InitiateAction(LightingManager::ACTOR_BUTTON, LightingManager::ON_ACTION, 0);
         }
     }
+    else if (button_mgr[0].configuration->button == PLATFORM_BUTTON_1 && event == BUTTON_HOLDING_EVENT)
+    {
+        // update the current occupancy here for hardcoded endpoint 1
+        OccupancySensing::Attributes::Occupancy::Get(1, &attributeValue);
+        printf("Button Holding Toggle: %d -> %d\n", attributeValue, !attributeValue);
+        OccupancySensing::Attributes::Occupancy::Set(1, !attributeValue);
+    }
 }
diff --git a/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp b/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp
index bbb4e91ba68e3a..ba9eb4056d3b72 100644
--- a/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp
+++ b/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp
@@ -20,6 +20,7 @@
 #include "LightingManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;
@@ -32,7 +33,7 @@ void emberAfBasicClusterInitCallback(EndpointId endpoint)
     uint8_t dayOfMonth;
     char cString[16] = "00000000";
 
-    if (ConfigurationMgr().GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
+    if (GetDeviceInstanceInfoProvider()->GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
     {
         snprintf(cString, sizeof(cString), "%04u%02u%02u", year, month, dayOfMonth);
     }
@@ -62,6 +63,17 @@ void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attrib
             return;
         }
         break;
+    case Identify::Id:
+        if (attributePath.mAttributeId == Identify::Attributes::IdentifyTime::Id)
+        {
+            uint16_t identifyTime;
+            if (EMBER_ZCL_STATUS_SUCCESS == Identify::Attributes::IdentifyTime::Get(attributePath.mEndpointId, &identifyTime))
+            {
+                ChipLogProgress(Zcl, "IdentifyTime %u", identifyTime);
+                return;
+            }
+        }
+        break;
     default:
         printf("Unhandled cluster ID: 0x%04lx\n", attributePath.mClusterId);
         return;
diff --git a/examples/lighting-app/cyw30739/src/main.cpp b/examples/lighting-app/cyw30739/src/main.cpp
index 97fbd3ede97602..6c606e5c9dc1f2 100644
--- a/examples/lighting-app/cyw30739/src/main.cpp
+++ b/examples/lighting-app/cyw30739/src/main.cpp
@@ -16,16 +16,22 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include <platform/CHIPDeviceLayer.h>
+
 #include <AppShellCommands.h>
 #include <ButtonHandler.h>
 #include <ChipShellCollection.h>
+#include <DeviceInfoProviderImpl.h>
 #include <LightingManager.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <OTAConfig.h>
+#endif
+#include <app/clusters/identify-server/identify-server.h>
 #include <app/server/Server.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/shell/Engine.h>
 #include <lib/support/CHIPPlatformMemory.h>
 #include <mbedtls/platform.h>
-#include <platform/CHIPDeviceLayer.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <sparcommon.h>
 #include <stdio.h>
@@ -37,6 +43,7 @@ using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::Shell;
 
+static chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 static void InitApp(intptr_t args);
 static void EventHandler(const ChipDeviceEvent * event, intptr_t arg);
 static void HandleThreadStateChangeEvent(const ChipDeviceEvent * event);
@@ -47,6 +54,13 @@ static wiced_led_config_t chip_lighting_led_config = {
     .bright = 50,
 };
 
+static Identify gIdentify = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_VISIBLE_LED,
+};
+
 APPLICATION_START()
 {
     CHIP_ERROR err;
@@ -141,9 +155,16 @@ void InitApp(intptr_t args)
     chip::Server::GetInstance().Init(initParams);
 
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    gExampleDeviceInfoProvider.SetStorageDelegate(&chip::Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
     LightMgr().Init();
     LightMgr().SetCallbacks(LightManagerCallback, NULL);
+    LightMgr().WriteClusterLevel(254);
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    OTAConfig::Init();
+#endif
 }
 
 void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
index e82be7a6cb5a03..341582d0287321 100644
--- a/examples/lighting-app/efr32/BUILD.gn
+++ b/examples/lighting-app/efr32/BUILD.gn
@@ -60,6 +60,9 @@ declare_args() {
 
   # Disable LCD on supported devices
   disable_lcd = false
+
+  # Argument to Disable IPv4 for wifi(rs911)
+  chip_disable_wifi_ipv4 = false
 }
 
 declare_args() {
@@ -214,6 +217,10 @@ efr32_executable("lighting_app") {
     sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
   }
 
+  if (chip_disable_wifi_ipv4) {
+    defines += [ "WIFI_IPV4_DISABLED" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {
diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/efr32/args.gni
index 96b6262f50b93e..348e8e012098ae 100644
--- a/examples/lighting-app/efr32/args.gni
+++ b/examples/lighting-app/efr32/args.gni
@@ -23,3 +23,4 @@ chip_enable_ota_requestor = true
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log"
 chip_enable_openthread = true
+pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
diff --git a/examples/lighting-app/efr32/include/LightingManager.h b/examples/lighting-app/efr32/include/LightingManager.h
index 3aa9871e919074..6d286faa30ef96 100644
--- a/examples/lighting-app/efr32/include/LightingManager.h
+++ b/examples/lighting-app/efr32/include/LightingManager.h
@@ -25,6 +25,7 @@
 
 #include "FreeRTOS.h"
 #include "timers.h" // provides FreeRTOS timer support
+#include <app/clusters/on-off-server/on-off-server.h>
 
 #include <lib/core/CHIPError.h>
 
@@ -58,6 +59,8 @@ class LightingManager
     typedef void (*Callback_fn_completed)(Action_t);
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
 
+    static void OnTriggerOffWithEffect(OnOffEffect * effect);
+
 private:
     friend LightingManager & LightMgr(void);
     State_t mState;
@@ -68,6 +71,7 @@ class LightingManager
     bool mAutoTurnOff;
     uint32_t mAutoTurnOffDuration;
     bool mAutoTurnOffTimerArmed;
+    bool mOffEffectArmed;
 
     void CancelTimer(void);
     void StartTimer(uint32_t aTimeoutMs);
@@ -75,6 +79,7 @@ class LightingManager
     static void TimerEventHandler(TimerHandle_t xTimer);
     static void AutoTurnOffTimerEventHandler(AppEvent * aEvent);
     static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
+    static void OffEffectTimerEventHandler(AppEvent * aEvent);
 
     static LightingManager sLight;
 };
diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp
index 040f0c715cdf38..7e1e8d9a811e82 100644
--- a/examples/lighting-app/efr32/src/AppTask.cpp
+++ b/examples/lighting-app/efr32/src/AppTask.cpp
@@ -160,52 +160,6 @@ Identify gIdentify = {
     OnTriggerIdentifyEffect,
 };
 
-/**********************************************************
- * OffWithEffect Callbacks
- *********************************************************/
-
-void OnTriggerOffWithEffect(OnOffEffect * effect)
-{
-    chip::app::Clusters::OnOff::OnOffEffectIdentifier effectId = effect->mEffectIdentifier;
-    uint8_t effectVariant                                      = effect->mEffectVariant;
-
-    // Uses print outs until we can support the effects
-    if (effectId == EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF)
-    {
-        if (effectVariant == EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS)
-        {
-            ChipLogProgress(Zcl, "EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS");
-        }
-        else if (effectVariant == EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE)
-        {
-            ChipLogProgress(Zcl, "EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE");
-        }
-        else if (effectVariant ==
-                 EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS)
-        {
-            ChipLogProgress(Zcl,
-                            "EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_"
-                            "IN_12_SECONDS");
-        }
-    }
-    else if (effectId == EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT)
-    {
-        if (effectVariant ==
-            EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND)
-        {
-            ChipLogProgress(
-                Zcl, "EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND");
-        }
-    }
-}
-
-OnOffEffect gEffect = {
-    chip::EndpointId{ 1 },
-    OnTriggerOffWithEffect,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF,
-    static_cast<uint8_t>(EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS),
-};
-
 } // namespace
 
 using namespace chip::TLV;
@@ -284,7 +238,7 @@ CHIP_ERROR AppTask::Init()
     ConfigurationMgr().LogDeviceConfig();
 
 // Print setup info on LCD if available
-#ifdef DISPLAY_ENABLED
+#if QR_CODE_ENABLED
     // Create buffer for QR code that can fit max size and null terminator.
     char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
     chip::MutableCharSpan QRCode(qrCodeBuffer);
@@ -299,7 +253,7 @@ CHIP_ERROR AppTask::Init()
     }
 #else
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
-#endif
+#endif // QR_CODE_ENABLED
 
     return err;
 }
diff --git a/examples/lighting-app/efr32/src/LightingManager.cpp b/examples/lighting-app/efr32/src/LightingManager.cpp
index 3857a0d50e7fe5..47791911ea7308 100644
--- a/examples/lighting-app/efr32/src/LightingManager.cpp
+++ b/examples/lighting-app/efr32/src/LightingManager.cpp
@@ -23,8 +23,6 @@
 #include "AppTask.h"
 #include <FreeRTOS.h>
 
-#include <app/clusters/on-off-server/on-off-server.h>
-
 using namespace chip;
 using namespace ::chip::DeviceLayer;
 
@@ -32,6 +30,21 @@ LightingManager LightingManager::sLight;
 
 TimerHandle_t sLightTimer;
 
+namespace {
+
+/**********************************************************
+ * OffWithEffect Callbacks
+ *********************************************************/
+
+OnOffEffect gEffect = {
+    chip::EndpointId{ 1 },
+    LightMgr().OnTriggerOffWithEffect,
+    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF,
+    static_cast<uint8_t>(EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS),
+};
+
+} // namespace
+
 CHIP_ERROR LightingManager::Init()
 {
     // Create FreeRTOS sw timer for light timer.
@@ -58,6 +71,7 @@ CHIP_ERROR LightingManager::Init()
     mAutoTurnOffTimerArmed = false;
     mAutoTurnOff           = false;
     mAutoTurnOffDuration   = 0;
+    mOffEffectArmed        = false;
 
     return CHIP_NO_ERROR;
 }
@@ -94,13 +108,13 @@ bool LightingManager::InitiateAction(int32_t aActor, Action_t aAction)
     State_t new_state;
 
     // Initiate Turn On/Off Action only when the previous one is complete.
-    if (mState == kState_OffCompleted && aAction == ON_ACTION)
+    if (((mState == kState_OffCompleted) || mOffEffectArmed) && aAction == ON_ACTION)
     {
         action_initiated = true;
 
         new_state = kState_OnInitiated;
     }
-    else if (mState == kState_OnCompleted && aAction == OFF_ACTION)
+    else if (mState == kState_OnCompleted && aAction == OFF_ACTION && mOffEffectArmed == false)
     {
         action_initiated = true;
 
@@ -118,6 +132,12 @@ bool LightingManager::InitiateAction(int32_t aActor, Action_t aAction)
             CancelTimer();
         }
 
+        if (mOffEffectArmed && new_state == kState_OnInitiated)
+        {
+            CancelTimer();
+            mOffEffectArmed = false;
+        }
+
         StartTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
 
         // Since the timer started successfully, update the state and trigger callback
@@ -174,6 +194,10 @@ void LightingManager::TimerEventHandler(TimerHandle_t xTimer)
     {
         event.Handler = AutoTurnOffTimerEventHandler;
     }
+    else if (light->mOffEffectArmed)
+    {
+        event.Handler = OffEffectTimerEventHandler;
+    }
     else
     {
         event.Handler = ActuatorMovementTimerEventHandler;
@@ -184,7 +208,7 @@ void LightingManager::TimerEventHandler(TimerHandle_t xTimer)
 void LightingManager::AutoTurnOffTimerEventHandler(AppEvent * aEvent)
 {
     LightingManager * light = static_cast<LightingManager *>(aEvent->TimerEvent.Context);
-    int32_t actor           = 0;
+    int32_t actor           = AppEvent::kEventType_Timer;
 
     // Make sure auto turn off timer is still armed.
     if (!light->mAutoTurnOffTimerArmed)
@@ -199,6 +223,24 @@ void LightingManager::AutoTurnOffTimerEventHandler(AppEvent * aEvent)
     light->InitiateAction(actor, OFF_ACTION);
 }
 
+void LightingManager::OffEffectTimerEventHandler(AppEvent * aEvent)
+{
+    LightingManager * light = static_cast<LightingManager *>(aEvent->TimerEvent.Context);
+    int32_t actor           = AppEvent::kEventType_Timer;
+
+    // Make sure auto turn off timer is still armed.
+    if (!light->mOffEffectArmed)
+    {
+        return;
+    }
+
+    light->mOffEffectArmed = false;
+
+    EFR32_LOG("OffEffect completed");
+
+    light->InitiateAction(actor, OFF_ACTION);
+}
+
 void LightingManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
 {
     Action_t actionCompleted = INVALID_ACTION;
@@ -234,3 +276,47 @@ void LightingManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
         }
     }
 }
+
+void LightingManager::OnTriggerOffWithEffect(OnOffEffect * effect)
+{
+    chip::app::Clusters::OnOff::OnOffEffectIdentifier effectId = effect->mEffectIdentifier;
+    uint8_t effectVariant                                      = effect->mEffectVariant;
+    uint32_t offEffectDuration                                 = 0;
+
+    // Temporary print outs and delay to test OffEffect behaviour
+    // Until dimming is supported for dev boards.
+    if (effectId == EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF)
+    {
+        if (effectVariant == EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS)
+        {
+            offEffectDuration = 800;
+            ChipLogProgress(Zcl, "EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS");
+        }
+        else if (effectVariant == EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE)
+        {
+            offEffectDuration = 800;
+            ChipLogProgress(Zcl, "EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE");
+        }
+        else if (effectVariant ==
+                 EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS)
+        {
+            offEffectDuration = 12800;
+            ChipLogProgress(Zcl,
+                            "EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_"
+                            "IN_12_SECONDS");
+        }
+    }
+    else if (effectId == EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT)
+    {
+        if (effectVariant ==
+            EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND)
+        {
+            offEffectDuration = 1500;
+            ChipLogProgress(
+                Zcl, "EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND");
+        }
+    }
+
+    LightMgr().mOffEffectArmed = true;
+    LightMgr().StartTimer(offEffectDuration);
+}
diff --git a/examples/lighting-app/esp32/main/main.cpp b/examples/lighting-app/esp32/main/main.cpp
index 748ad7ea67588c..28a6f8bf9f75e8 100644
--- a/examples/lighting-app/esp32/main/main.cpp
+++ b/examples/lighting-app/esp32/main/main.cpp
@@ -32,6 +32,7 @@
 
 using namespace ::chip;
 using namespace ::chip::DeviceManager;
+using namespace ::chip::DeviceLayer;
 
 LEDWidget AppLED;
 
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
index ee5067a140571e..3a6d8da8ff4033 100644
--- a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
+++ b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
@@ -65,5 +65,9 @@ CONFIG_ESP32H2_RTC_CLK_CAL_CYCLES=576
 # FreeRTOS should use legacy API
 CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
+# Disable STA and AP for ESP32H2
+CONFIG_ENABLE_WIFI_STATION=n
+CONFIG_ENABLE_WIFI_AP=n
+
 # Enable OTA Requestor
 CONFIG_ENABLE_OTA_REQUESTOR=y
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index e9be0c6640002f..2d2773162d0210 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -642,8 +642,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -1250,6 +1258,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1290,13 +1299,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1317,10 +1327,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1349,16 +1355,19 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1495,7 +1504,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1503,11 +1512,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1550,12 +1559,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1660,8 +1669,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Groups {
@@ -1776,6 +1785,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1790,67 +1800,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -1934,8 +1944,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type dimmablelight = 257;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -1963,7 +1973,7 @@ endpoint 1 {
   server cluster LevelControl {
     persist  attribute currentLevel default = 0x01;
     ram      attribute remainingTime;
-    ram      attribute minLevel;
+    ram      attribute minLevel default = 0x01;
     ram      attribute maxLevel default = 0xFE;
     ram      attribute currentFrequency;
     ram      attribute minFrequency;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index 1032aac7eda48b..546409132af503 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -2629,7 +2629,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2759,6 +2768,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2988,7 +3013,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3002,9 +3027,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3020,7 +3045,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3036,7 +3061,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3052,7 +3077,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3068,7 +3093,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3084,7 +3109,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3132,7 +3157,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3148,7 +3173,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3164,7 +3189,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3180,7 +3205,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3196,7 +3221,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3212,7 +3237,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3228,7 +3253,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3244,7 +3269,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3260,7 +3285,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3276,7 +3301,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3292,7 +3317,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3308,7 +3333,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3324,7 +3349,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3340,7 +3365,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3356,7 +3381,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3372,7 +3397,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3388,7 +3413,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3404,7 +3429,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3420,7 +3445,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3436,7 +3461,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3452,7 +3477,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3468,7 +3493,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3484,7 +3509,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3500,7 +3525,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3516,7 +3541,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3532,7 +3557,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3548,7 +3573,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3564,7 +3589,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3580,7 +3605,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3596,7 +3621,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3612,7 +3637,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3628,7 +3653,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3644,7 +3669,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3660,7 +3685,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3676,7 +3701,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3692,7 +3717,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3708,7 +3733,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3724,7 +3749,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3740,7 +3765,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3756,7 +3781,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3772,7 +3797,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3788,7 +3813,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3804,7 +3829,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3820,7 +3845,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3836,7 +3861,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3852,7 +3877,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3868,7 +3893,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3884,7 +3909,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3900,7 +3925,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3916,7 +3941,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3930,7 +3955,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3948,7 +3973,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3962,7 +3987,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4800,14 +4825,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -6207,7 +6224,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
index 2fddf8e453a8d6..961ae6ff5afb86 100644
--- a/examples/lighting-app/nrfconnect/CMakeLists.txt
+++ b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -91,6 +91,7 @@ set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.nrfconnect)
diff --git a/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
index d8784e3714a921..96f955afe880cf 100644
--- a/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
+++ b/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
@@ -41,15 +41,31 @@
 
 	pwmleds {
 		pwm_led1: pwm_led_1 {
-			pwms = < &pwm0 0xe >;
+			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 	};
 
 };
 
 &pwm0 {
-	/delete-property/ ch0-pin;
-	/delete-property/ ch0-inverted;
-	ch1-pin = < 0xe >;
-	ch1-inverted;
+	pinctrl-0 = <&pwm0_default_alt>;
+	pinctrl-1 = <&pwm0_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+};
+
+&pinctrl {
+	pwm0_default_alt: pwm0_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 14)>;
+			nordic,invert;
+		};
+	};
+
+	pwm0_sleep_alt: pwm0_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 14)>;
+			low-power-enable;
+		};
+	};
+
 };
diff --git a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 01794dc6524a33..1e1fc11fa67052 100644
--- a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -31,7 +31,7 @@
 	pwmleds {
 		compatible = "pwm-leds";
 		pwm_led1: pwm_led_1 {
-			pwms = < &pwm0 0x1d >;
+			pwms = < &pwm0 1 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 	};
 
@@ -82,8 +82,24 @@
 };
 
 &pwm0 {
-	/delete-property/ ch0-pin;
-	/delete-property/ ch0-inverted;
-	ch1-pin = < 0x1d >;
-	ch1-inverted;
+	pinctrl-0 = <&pwm0_default_alt>;
+	pinctrl-1 = <&pwm0_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+};
+
+&pinctrl {
+	pwm0_default_alt: pwm0_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 29)>;
+			nordic,invert;
+		};
+	};
+
+	pwm0_sleep_alt: pwm0_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 29)>;
+			low-power-enable;
+		};
+	};
+
 };
diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
index 9301570459d4a7..a108dc1b4bf89b 100644
--- a/examples/lighting-app/nrfconnect/main/AppTask.cpp
+++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -45,8 +45,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
@@ -78,9 +78,10 @@ LEDWidget sStatusLED;
 LEDWidget sIdentifyLED;
 LEDWidget sUnusedLED;
 
-bool sIsThreadProvisioned = false;
-bool sIsThreadEnabled     = false;
-bool sHaveBLEConnections  = false;
+const struct pwm_dt_spec sLightPwmDevice = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led1));
+bool sIsThreadProvisioned                = false;
+bool sIsThreadEnabled                    = false;
+bool sHaveBLEConnections                 = false;
 
 chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
@@ -142,7 +143,7 @@ CHIP_ERROR AppTask::Init()
     uint8_t maxLightLevel = kDefaultMaxLevel;
     Clusters::LevelControl::Attributes::MaxLevel::Get(kLightEndpointId, &maxLightLevel);
 
-    int ret = mPWMDevice.Init(LIGHTING_PWM_DEVICE, LIGHTING_PWM_CHANNEL, minLightLevel, maxLightLevel, maxLightLevel);
+    int ret = mPWMDevice.Init(&sLightPwmDevice, minLightLevel, maxLightLevel, maxLightLevel);
     if (ret != 0)
     {
         return chip::System::MapErrorZephyr(ret);
@@ -164,10 +165,7 @@ CHIP_ERROR AppTask::Init()
 #ifdef CONFIG_MCUMGR_SMP_BT
     // Initialize DFU over SMP
     GetDFUOverSMP().Init(RequestSMPAdvertisingStart);
-#ifndef CONFIG_CHIP_OTA_REQUESTOR
-    // When OTA Requestor is enabled, it is responsible for confirming new images.
     GetDFUOverSMP().ConfirmNewImage();
-#endif
 #endif
 
     // Initialize CHIP server
@@ -176,13 +174,11 @@ CHIP_ERROR AppTask::Init()
 
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
+
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
@@ -492,6 +488,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
         sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/examples/lighting-app/nrfconnect/main/include/AppConfig.h b/examples/lighting-app/nrfconnect/main/include/AppConfig.h
index 31430a5609ac75..cf6c580dc8a81c 100644
--- a/examples/lighting-app/nrfconnect/main/include/AppConfig.h
+++ b/examples/lighting-app/nrfconnect/main/include/AppConfig.h
@@ -30,8 +30,6 @@
 #define BLE_ADVERTISEMENT_START_BUTTON_MASK DK_BTN4_MSK
 
 #define SYSTEM_STATE_LED DK_LED1 // led0 in device tree
-#define LIGHTING_PWM_DEVICE DEVICE_DT_GET(DT_PWMS_CTLR(DT_ALIAS(pwm_led1)))
-#define LIGHTING_PWM_CHANNEL DT_PWMS_CHANNEL(DT_ALIAS(pwm_led1))
 
 // Time it takes in ms for the simulated actuator to move from one state to another.
 #define ACTUATOR_MOVEMENT_PERIOS_MS 2000
diff --git a/examples/lighting-app/nrfconnect/main/main.cpp b/examples/lighting-app/nrfconnect/main/main.cpp
index 0b718e25fa2e84..9a487fcc8c2895 100644
--- a/examples/lighting-app/nrfconnect/main/main.cpp
+++ b/examples/lighting-app/nrfconnect/main/main.cpp
@@ -20,15 +20,15 @@
 
 #include <system/SystemError.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #ifdef CONFIG_CHIP_PW_RPC
 #include "Rpc.h"
 #endif
 
 #if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart)
-#include <drivers/uart.h>
-#include <usb/usb_device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/usb/usb_device.h>
 #endif
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
diff --git a/examples/lighting-app/nxp/k32w/k32w0/README.md b/examples/lighting-app/nxp/k32w/k32w0/README.md
index 0667e6ea940b7f..51385c7d0edba2 100644
--- a/examples/lighting-app/nxp/k32w/k32w0/README.md
+++ b/examples/lighting-app/nxp/k32w/k32w0/README.md
@@ -27,9 +27,16 @@ network.
     -   [Detokenizer script](#detokenizer)
     -   [Notes](#detokenizer-notes)
     -   [Known issues](#detokenizer-known-issues)
--   [OTA](#ota) - [Writing the SSBL](#ssbl) - [Writing the PSECT](#psect) -
-    [Writing the application](#appwrite) - [OTA Testing](#otatesting) -
-    [Known issues](#otaissues)
+-   [Tinycrypt ECC operations](#tinycrypt)
+    -   [Building steps](#tinycrypt-building-steps)
+-   [OTA](#ota)
+
+    -   [Writing the SSBL](#ssbl)
+    -   [Writing the PSECT](#psect)
+    -   [Writing the application](#appwrite)
+    -   [OTA Testing](#otatesting)
+    -   [Known issues](#otaissues)
+
     </hr>
 
 <a name="intro"></a>
@@ -182,18 +189,17 @@ user@ubuntu:~/Desktop/git/connectedhomeip$ export NXP_K32W061_SDK_ROOT=/home/use
 user@ubuntu:~/Desktop/git/connectedhomeip$ ./third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh
 user@ubuntu:~/Desktop/git/connectedhomeip$ source ./scripts/activate.sh
 user@ubuntu:~/Desktop/git/connectedhomeip$ cd examples/lighting-app/nxp/k32w/k32w0
-user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${NXP_K32W061_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=0"
+user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${NXP_K32W061_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=0 mbedtls_use_tinycrypt=true chip_pw_tokenizer_logging=true mbedtls_repo=\"//third_party/connectedhomeip/third_party/nxp/libs/mbedtls\""
 user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ ninja -C out/debug
 user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ $NXP_K32W061_SDK_ROOT/tools/imagetool/sign_images.sh out/debug/
 ```
 
     -   with Secure element
         Exactly the same steps as above but set chip_with_se05x=1 in the gn command
-        and add arguments chip_pw_tokenizer_logging=true chip_enable_ota_requestor=false
+        and add argument chip_enable_ota_requestor=false
 
-Note that options chip_pw_tokenizer_logging=true and
-chip_enable_ota_requestor=false are required for building with Secure Element.
-These can be changed if building without Secure Element
+Note that option chip_enable_ota_requestor=false are required for building with
+Secure Element. These can be changed if building without Secure Element
 
 Note that "patch_k32w_sdk.sh" script must be run for patching the K32W061 SDK
 2.6.4.
@@ -299,6 +305,25 @@ If run, closed and rerun with the serial option on the same serial port, the
 detokenization script will get stuck and not show any logs. The solution is to
 unplug and plug the board and then rerun the script.
 
+<a name="tinycrypt"></a>
+
+## Tinycrypt ECC operations
+
+<a name="tinycrypt-building-steps"></a>
+
+### Building steps
+
+Note: This solution is temporary.
+
+In order to use the tinycrypt ecc operations, use the following build arguments:
+
+-   Build without Secure element (_chip_with_se05x=0_), with tinycrypt enabled
+    (_mbedtls_use_tinycrypt=true_) and with the `NXPmicro/mbedtls` library
+    (_mbedtls_repo=`\"//third_party/connectedhomeip/third_party/nxp/libs/mbedtls\"`_).
+
+To disable tinycrypt ecc operations, simply build without
+_mbedtls_use_tinycrypt=true_ and without _mbedtls_repo_.
+
 <a name="ota"></a>
 
 ## OTA
diff --git a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp
index 4e8d5c5fb6cec4..8d120eb6c5abaa 100644
--- a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp
+++ b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp
@@ -28,6 +28,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
+#include <inet/EndPointStateOpenThread.h>
+
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-id.h>
@@ -95,8 +97,6 @@ static OTAImageProcessorImpl gImageProcessor;
 constexpr uint16_t requestedOtaBlockSize = 1024;
 #endif
 
-extern bool shouldReset;
-
 CHIP_ERROR AppTask::StartAppTask()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -184,12 +184,27 @@ CHIP_ERROR AppTask::Init()
     return err;
 }
 
+void LockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().LockThreadStack();
+}
+
+void UnlockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
+}
+
 void AppTask::InitServer(intptr_t arg)
 {
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
     // Init ZCL Data Model and start server
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = LockOpenThreadTask;
+    nativeParams.unlockCb              = UnlockOpenThreadTask;
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
     VerifyOrDie((chip::Server::GetInstance().Init(initParams)) == CHIP_NO_ERROR);
 }
 
@@ -690,13 +705,6 @@ void AppTask::OTAResumeEventHandler(AppEvent * aEvent)
     }
 }
 
-extern "C" void vApplicationIdleHook(void)
-{
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    OTA_TransactionResume();
-#endif
-}
-
 void AppTask::PostEvent(const AppEvent * aEvent)
 {
     if (sAppEventQueue != NULL)
@@ -753,3 +761,10 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg)
     /* set the device state */
     sLightLED.Set(onoffAttrValue);
 }
+
+extern "C" void OTAIdleActivities(void)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    OTA_TransactionResume();
+#endif
+}
diff --git a/examples/lighting-app/p6/BUILD.gn b/examples/lighting-app/p6/BUILD.gn
index 6af9db2bffd8b8..fddb3e14405e60 100644
--- a/examples/lighting-app/p6/BUILD.gn
+++ b/examples/lighting-app/p6/BUILD.gn
@@ -17,6 +17,7 @@ import("//build_overrides/chip.gni")
 import("//build_overrides/p6.gni")
 
 import("${build_root}/config/defaults.gni")
+import("${chip_root}/src/platform/device.gni")
 import("${p6_sdk_build_root}/p6_executable.gni")
 import("${p6_sdk_build_root}/p6_sdk.gni")
 
@@ -34,6 +35,50 @@ declare_args() {
 
   # Monitor & log memory usage at runtime.
   enable_heap_monitoring = false
+
+  # Build update app
+  build_update_image = false
+}
+
+config("p6_ota_config") {
+  ldflags = [ "-T/" + rebase_path(
+                  "${chip_root}/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld",
+                  "/",
+                  "${p6_project_dir}") ]
+
+  ldflags += [ "-Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,MCUBOOT_BOOTLOADER_SIZE=0x18000,--defsym,CY_BOOT_PRIMARY_1_SIZE=0x1C0000" ]
+
+  defines = [
+    "P6_OTA",
+    "OTA_SUPPORT ",
+    "OTA_USE_EXTERNAL_FLASH",
+    "CY_BOOT_USE_EXTERNAL_FLASH",
+    "MCUBOOT_HEADER_SIZE=0x400",
+    "MCUBOOT_MAX_IMG_SECTORS=3584",
+    "CY_BOOT_SCRATCH_SIZE=0x00004000",
+    "MCUBOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_PRIMARY_1_START=0x00018000",
+    "CY_BOOT_PRIMARY_1_SIZE=0x1C0000",
+    "CY_BOOT_SECONDARY_1_START=0x00000000",
+    "CY_BOOT_SECONDARY_1_SIZE=0x001C0000",
+    "CY_FLASH_ERASE_VALUE=0xFF",
+    "MCUBOOT_IMAGE_NUMBER=1",
+    "MCUBOOT_SLOT_SIZE=0x1C0000",
+    "MCUBOOT_SCRATCH_SIZE=0x4000",
+    "MCUBOOT_SECTOR_SIZE = 512",
+    "APP_VERSION_MAJOR=1",
+    "APP_VERSION_MINOR=0",
+    "APP_VERSION_BUILD=0",
+    "MCUBOOT_OVERWRITE_ONLY",
+    "CY_ENABLE_XIP_PROGRAM",
+  ]
+
+  if (build_update_image) {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=2" ]
+  } else {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=1" ]
+  }
 }
 
 p6_sdk_sources("lighting_app_sdk_sources") {
@@ -50,8 +95,28 @@ p6_sdk_sources("lighting_app_sdk_sources") {
   ]
 
   sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ]
-
   public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/src/bootutil_misc.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_map.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_smif_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/mem_config_sfdp.c",
+    ]
+    include_dirs += [
+      "${chip_root}/third_party/p6/p6_sdk/ota/config",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/flash_map_backend/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/sysflash/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/include",
+    ]
+    public_configs += [ ":p6_ota_config" ]
+  }
 }
 
 p6_executable("lighting_app") {
diff --git a/examples/lighting-app/p6/README.md b/examples/lighting-app/p6/README.md
index c7327703c346fb..45d536e0cc40a7 100644
--- a/examples/lighting-app/p6/README.md
+++ b/examples/lighting-app/p6/README.md
@@ -13,6 +13,7 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
         -   [Commissioning over BLE](#commissioning-over-ble)
             -   [Notes](#notes)
         -   [Cluster control](#cluster-control)
+    -   [OTA Software Update](#ota-software-update)
 
 <hr>
 
@@ -134,3 +135,9 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
     Press `USER_BTN1` on the board to toggle between Light ON and OFF states.
     Light ON and OFF can be observed with 'LED9' on the board. This LED is
     configured with `LIGHT_LED` in `include/AppConfig.h`.
+
+## OTA Software Update
+
+For the description of Software Update process with infineon P6 example
+applications see
+[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md)
diff --git a/examples/lighting-app/p6/include/AppTask.h b/examples/lighting-app/p6/include/AppTask.h
index cf8feffb2c7f08..54345a456d3beb 100644
--- a/examples/lighting-app/p6/include/AppTask.h
+++ b/examples/lighting-app/p6/include/AppTask.h
@@ -49,6 +49,7 @@ class AppTask
     void PostEvent(const AppEvent * event);
 
     void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
+    void InitOTARequestor();
 
 private:
     friend AppTask & GetAppTask(void);
diff --git a/examples/lighting-app/p6/include/CHIPProjectConfig.h b/examples/lighting-app/p6/include/CHIPProjectConfig.h
index 9e3dca035ea178..885a051297072e 100644
--- a/examples/lighting-app/p6/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/p6/include/CHIPProjectConfig.h
@@ -66,14 +66,14 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_REVISION 1
 
 /**
- * CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING
+ * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
  *
- * A string identifying the firmware revision running on the device.
- * CHIP service currently expects the firmware version to be in the format
+ * A string identifying the software version running on the device.
+ * CHIP service currently expects the software version to be in the format
  * {MAJOR_VERSION}.0d{MINOR_VERSION}
  */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING
-#define CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING "0.1ALPHA"
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA"
 #endif
 /**
  * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
diff --git a/examples/lighting-app/p6/ota_base_build.sh b/examples/lighting-app/p6/ota_base_build.sh
new file mode 100755
index 00000000000000..5cdaf4d274d11c
--- /dev/null
+++ b/examples/lighting-app/p6/ota_base_build.sh
@@ -0,0 +1,8 @@
+OUT_DIR=out/lighting-app/
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+scripts/examples/gn_p6_example.sh examples/lighting-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true
+
+mv "$OUT_DIR"/chip-p6-lighting-example.hex "$OUT_DIR"/chip-p6-lighting-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-lighting-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py create 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy ""
diff --git a/examples/lighting-app/p6/ota_update_build.sh b/examples/lighting-app/p6/ota_update_build.sh
new file mode 100755
index 00000000000000..1c5c301429b5e0
--- /dev/null
+++ b/examples/lighting-app/p6/ota_update_build.sh
@@ -0,0 +1,14 @@
+OUT_DIR=out/lighting-app-ota
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+./scripts/examples/gn_p6_example.sh examples/lighting-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true build_update_image=true
+
+mv "$OUT_DIR"/chip-p6-lighting-example.hex "$OUT_DIR"/chip-p6-lighting-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-lighting-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py sign 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy "-k $ANYCLOUD_DIR/source/mcuboot/keys/cypress-test-ec-p256.pem"
+
+if [ -f "$OUT_DIR"/chip-p6-lighting-example.ota ]; then
+    rm "$OUT_DIR"/chip-p6-lighting-example.ota
+fi
+
+src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8000 -vn 2 -vs "2.0" -da sha256 "$OUT_DIR"/chip-p6-lighting-example.bin "$OUT_DIR"/chip-p6-lighting-example.ota
diff --git a/examples/lighting-app/p6/src/AppTask.cpp b/examples/lighting-app/p6/src/AppTask.cpp
index 55e2aa3ee9cd29..7bbcf55019a710 100644
--- a/examples/lighting-app/p6/src/AppTask.cpp
+++ b/examples/lighting-app/p6/src/AppTask.cpp
@@ -41,6 +41,33 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/P6/NetworkCommissioningDriver.h>
 
+/* OTA related includes */
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+#include <platform/P6/OTAImageProcessorImpl.h>
+extern "C" {
+#include "cy_smif_psoc6.h"
+}
+using chip::BDXDownloader;
+using chip::CharSpan;
+using chip::DefaultOTARequestor;
+using chip::FabricIndex;
+using chip::GetRequestorInstance;
+using chip::NodeId;
+using chip::OTADownloader;
+using chip::OTAImageProcessorImpl;
+using chip::System::Layer;
+
+using namespace ::chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+#endif
 #define FACTORY_RESET_TRIGGER_TIMEOUT 3000
 #define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000
 #define APP_TASK_STACK_SIZE (4096)
@@ -66,6 +93,15 @@ StaticQueue_t sAppEventQueueStruct;
 
 StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)];
 StaticTask_t appTaskStruct;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+DefaultOTARequestor gRequestorCore;
+DefaultOTARequestorStorage gRequestorStorage;
+DefaultOTARequestorDriver gRequestorUser;
+BDXDownloader gDownloader;
+OTAImageProcessorImpl gImageProcessor;
+#endif
+
 } // namespace
 
 using namespace ::chip;
@@ -94,6 +130,9 @@ static void InitServer(intptr_t context)
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    GetAppTask().InitOTARequestor();
+#endif
 }
 
 CHIP_ERROR AppTask::StartAppTask()
@@ -113,7 +152,14 @@ CHIP_ERROR AppTask::StartAppTask()
 CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    int rc = boot_set_confirmed();
+    if (rc != 0)
+    {
+        P6_LOG("boot_set_confirmed failed");
+        appError(CHIP_ERROR_WELL_UNINITIALIZED);
+    }
+#endif
     // Register the callback to init the MDNS server when connectivity is available
     PlatformMgr().AddEventHandler(
         [](const ChipDeviceEvent * event, intptr_t arg) {
@@ -147,7 +193,7 @@ CHIP_ERROR AppTask::Init()
         appError(APP_ERROR_CREATE_TIMER_FAILED);
     }
     NetWorkCommissioningInstInit();
-    P6_LOG("Current Firmware Version: %s", CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING);
+    P6_LOG("Current Firmware Version: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
     err = LightMgr().Init();
     if (err != CHIP_NO_ERROR)
     {
@@ -523,3 +569,38 @@ void AppTask::UpdateClusterState(intptr_t context)
         P6_LOG("ERR: updating on/off %x", status);
     }
 }
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void AppTask::InitOTARequestor()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    SetRequestorInstance(&gRequestorCore);
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+    gImageProcessor.SetOTADownloader(&gDownloader);
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    uint32_t savedSoftwareVersion;
+    err = ConfigurationMgr().GetSoftwareVersion(savedSoftwareVersion);
+    if (err != CHIP_NO_ERROR)
+    {
+        P6_LOG("Can't get saved software version");
+        appError(err);
+    }
+
+    if (savedSoftwareVersion != CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION)
+    {
+        ConfigurationMgr().StoreSoftwareVersion(CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+
+        P6_LOG("Confirming update to version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+        chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+        if (requestor != nullptr)
+        {
+            requestor->NotifyUpdateApplied();
+        }
+    }
+
+    P6_LOG("Current Software Version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+    P6_LOG("Current Firmware Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+}
+#endif
diff --git a/examples/lighting-app/p6/src/main.cpp b/examples/lighting-app/p6/src/main.cpp
index a38d25811c2e1e..8e4105b8f79356 100644
--- a/examples/lighting-app/p6/src/main.cpp
+++ b/examples/lighting-app/p6/src/main.cpp
@@ -34,6 +34,7 @@
 #include <AppTask.h>
 
 #include "AppConfig.h"
+#include "cyhal_wdt.h"
 #include "init_p6Platform.h"
 #include <app/server/Server.h>
 
@@ -98,7 +99,14 @@ static void main_task(void * pvParameters)
         P6_LOG("PlatformMgr().InitChipStack() failed");
         appError(ret);
     }
-    chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("P6_LIGHT");
+
+    ret = chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("P6_LIGHT");
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("ConnectivityMgr().SetBLEDeviceName() failed");
+        appError(ret);
+    }
+
     P6_LOG("Starting Platform Manager Event Loop");
     ret = PlatformMgr().StartEventLoopTask();
     if (ret != CHIP_NO_ERROR)
@@ -123,7 +131,12 @@ static void main_task(void * pvParameters)
 int main(void)
 {
     init_p6Platform();
-
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    // Clear watchdog timer (started by bootloader) so that it doesn't trigger a reset
+    cyhal_wdt_t wdt_obj;
+    cyhal_wdt_init(&wdt_obj, cyhal_wdt_get_max_timeout_ms());
+    cyhal_wdt_free(&wdt_obj);
+#endif
 #ifdef HEAP_MONITORING
     MemMonitoring::startHeapMonitoring();
 #endif
diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt
index 8a0e97020e68fb..bea297558d59f5 100644
--- a/examples/lighting-app/telink/CMakeLists.txt
+++ b/examples/lighting-app/telink/CMakeLists.txt
@@ -65,7 +65,6 @@ target_sources(app PRIVATE
                ${CHIP_ROOT}/src/app/util/attribute-storage.cpp
                ${CHIP_ROOT}/src/app/util/attribute-table.cpp
                ${CHIP_ROOT}/src/app/util/binding-table.cpp
-               ${CHIP_ROOT}/src/app/util/client-api.cpp
                ${CHIP_ROOT}/src/app/util/ember-compatibility-functions.cpp
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
                ${CHIP_ROOT}/src/app/util/error-mapping.cpp
diff --git a/examples/lighting-app/telink/include/AppTask.h b/examples/lighting-app/telink/include/AppTask.h
index d660ea20fbe0c2..d926c5286f41f3 100644
--- a/examples/lighting-app/telink/include/AppTask.h
+++ b/examples/lighting-app/telink/include/AppTask.h
@@ -46,11 +46,14 @@ class AppTask
 
     void DispatchEvent(AppEvent * event);
 
+    static void UpdateStatusLED();
     static void LightingActionButtonEventHandler(void);
     static void FactoryResetButtonEventHandler(void);
     static void StartThreadButtonEventHandler(void);
     static void StartBleAdvButtonEventHandler(void);
 
+    static void ChipEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
     static void FactoryResetHandler(AppEvent * aEvent);
     static void StartThreadHandler(AppEvent * aEvent);
     static void LightingActionEventHandler(AppEvent * aEvent);
diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
index 8ed7a7bbea6d8c..93670fc50320f6 100644
--- a/examples/lighting-app/telink/prj.conf
+++ b/examples/lighting-app/telink/prj.conf
@@ -24,6 +24,10 @@ CONFIG_GPIO=y
 # enable PWM
 CONFIG_PWM=y
 
+# OpenThread configs
+CONFIG_OPENTHREAD_MTD=y
+CONFIG_OPENTHREAD_FTD=n
+
 # Default OpenThread network settings
 CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15
diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
index f2e370faae8f17..18a99610cdbab8 100644
--- a/examples/lighting-app/telink/src/AppTask.cpp
+++ b/examples/lighting-app/telink/src/AppTask.cpp
@@ -86,6 +86,8 @@ CHIP_ERROR AppTask::Init()
     LEDWidget::InitGpio(SYSTEM_STATE_LED_PORT);
     sStatusLED.Init(SYSTEM_STATE_LED_PIN);
 
+    UpdateStatusLED();
+
     InitButtons();
 
     // Init lighting manager
@@ -109,6 +111,11 @@ CHIP_ERROR AppTask::Init()
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
+    // Add CHIP event handler and start CHIP thread.
+    // Note that all the initialization code should happen prior to this point to avoid data races
+    // between the main and the CHIP threads.
+    PlatformMgr().AddEventHandler(ChipEventHandler, 0);
+
     ret = ConnectivityMgr().SetBLEDeviceName("TelinkLight");
     if (ret != CHIP_NO_ERROR)
     {
@@ -141,37 +148,6 @@ CHIP_ERROR AppTask::StartApp()
             ret = k_msgq_get(&sAppEventQueue, &event, K_NO_WAIT);
         }
 
-        // Collect connectivity and configuration state from the CHIP stack.  Because the
-        // CHIP event loop is being run in a separate task, the stack must be locked
-        // while these values are queried.  However we use a non-blocking lock request
-        // (TryLockChipStack()) to avoid blocking other UI activities when the CHIP
-        // task is busy (e.g. with a long crypto operation).
-
-        if (PlatformMgr().TryLockChipStack())
-        {
-            sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned();
-            sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
-            sIsThreadAttached    = ConnectivityMgr().IsThreadAttached();
-            sHaveBLEConnections  = (ConnectivityMgr().NumBLEConnections() != 0);
-            PlatformMgr().UnlockChipStack();
-        }
-
-        if (sIsThreadProvisioned && sIsThreadEnabled)
-        {
-            if (sIsThreadAttached)
-            {
-                sStatusLED.Blink(950, 50);
-            }
-            else
-            {
-                sStatusLED.Blink(100, 100);
-            }
-        }
-        else
-        {
-            sStatusLED.Blink(50, 950);
-        }
-
         sStatusLED.Animate();
     }
 }
@@ -282,6 +258,52 @@ void AppTask::StartBleAdvHandler(AppEvent * aEvent)
     }
 }
 
+void AppTask::UpdateStatusLED()
+{
+    if (sIsThreadProvisioned && sIsThreadEnabled)
+    {
+        if (sIsThreadAttached)
+        {
+            sStatusLED.Blink(950, 50);
+        }
+        else
+        {
+            sStatusLED.Blink(100, 100);
+        }
+    }
+    else
+    {
+        sStatusLED.Blink(50, 950);
+    }
+}
+
+void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kCHIPoBLEAdvertisingChange:
+        sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
+        UpdateStatusLED();
+        break;
+    case DeviceEventType::kThreadStateChange:
+        sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned();
+        sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
+        sIsThreadAttached    = ConnectivityMgr().IsThreadAttached();
+        UpdateStatusLED();
+        break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
+    default:
+        break;
+    }
+}
+
 void AppTask::ActionInitiated(LightingManager::Action_t aAction, int32_t aActor)
 {
     if (aAction == LightingManager::ON_ACTION)
diff --git a/examples/lighting-app/telink/src/main.cpp b/examples/lighting-app/telink/src/main.cpp
index 7be656e3ed355d..28c080dc0bdc0f 100644
--- a/examples/lighting-app/telink/src/main.cpp
+++ b/examples/lighting-app/telink/src/main.cpp
@@ -64,7 +64,11 @@ int main(void)
         goto exit;
     }
 
+#ifdef CONFIG_OPENTHREAD_MTD
     err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#else
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#endif
     if (err != CHIP_NO_ERROR)
     {
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
diff --git a/examples/lighting-app/tizen/README.md b/examples/lighting-app/tizen/README.md
index 29ac1c818da311..f2707b0e3f318f 100644
--- a/examples/lighting-app/tizen/README.md
+++ b/examples/lighting-app/tizen/README.md
@@ -1,5 +1,80 @@
 # CHIP Tizen Lighting Example
 
+## Building binary
+
+Activating environment
+
+```sh
+source ./scripts/activate.sh
+```
+
+Generating tizen-arm-light
+
+```sh
+gn gen --check \
+	--fail-on-unused-args \
+	--export-compile-commands \
+	--root=$PW_PROJECT_ROOT/examples/lighting-app/tizen \
+	"--args=target_os=\"tizen\" target_cpu=\"arm\" tizen_sdk_root=\"$TIZEN_SDK_ROOT\" tizen_sdk_sysroot=\"$TIZEN_SDK_SYSROOT\"" \
+	$PW_PROJECT_ROOT/out/tizen-arm-light
+```
+
+Building tizen-arm-light
+
+```sh
+ninja -C $PW_PROJECT_ROOT/out/tizen-arm-light
+```
+
+## Preparing Tizen SDK certificate
+
+For packaging the Tizen APP, there is a need to generate an author certificate
+and security profile using the commands described below. Change password and
+author data as needed.
+
+```sh
+$TIZEN_SDK_ROOT/tools/ide/bin/tizen certificate \
+	--alias=CHIP \
+	--name=CHIP \
+	--email=chip@tizen.org \
+	--password=chiptizen
+
+$TIZEN_SDK_ROOT/tools/ide/bin/tizen security-profiles add \
+	--active \
+	--name=CHIP \
+	--author=$HOME/tizen-sdk-data/keystore/author/author.p12 \
+	--password=chiptizen
+```
+
+This is only _one-time action_. To regenerate the author certificate and
+security profile, you have to remove files from the `$HOME` directory using
+specified commands:
+
+```sh
+rm -r \
+	$HOME/tizen-sdk-data \
+	$HOME/.tizen-cli-config \
+	$HOME/.secretsdb
+```
+
+After that, normally call scripts to generate the author certificate and
+security profile mentioned previously.
+
+### Important
+
+Regenerating the author certificate and security profile makes it necessary to
+remove the previously installed Tizen app. You can't reinstall an application on
+the Tizen device with a different certificate.
+
+```sh
+pkgcmd -u -n org.tizen.matter.example.lighting
+```
+
+## Packaging APP
+
+```sh
+ninja -C $PW_PROJECT_ROOT/out/tizen-arm-light chip-lighting-app:tpk
+```
+
 ## Installing TPK
 
 Upload TPK package to device under test (DUT). Install it with `pkgcmd` as
diff --git a/examples/lighting-app/tizen/tizen-manifest.xml b/examples/lighting-app/tizen/tizen-manifest.xml
index da0af28a2d254d..86aa047bba3390 100644
--- a/examples/lighting-app/tizen/tizen-manifest.xml
+++ b/examples/lighting-app/tizen/tizen-manifest.xml
@@ -7,6 +7,11 @@
     <privileges>
         <privilege>http://tizen.org/privilege/bluetooth</privilege>
         <privilege>http://tizen.org/privilege/internet</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
     </privileges>
+    <feature name="http://tizen.org/feature/network.bluetooth">true</feature>
+    <feature name="http://tizen.org/feature/network.bluetooth.le">true</feature>
     <feature name="http://tizen.org/feature/network.bluetooth.le.gatt.server">true</feature>
+    <feature name="http://tizen.org/feature/network.service_discovery.dnssd">true</feature>
+    <feature name="http://tizen.org/feature/network.wifi">true</feature>
 </manifest>
diff --git a/examples/lock-app/cyw30739/BUILD.gn b/examples/lock-app/cyw30739/BUILD.gn
index c08ce53069bbfb..87f0e15e92bff3 100644
--- a/examples/lock-app/cyw30739/BUILD.gn
+++ b/examples/lock-app/cyw30739/BUILD.gn
@@ -20,6 +20,7 @@ import("${cyw30739_sdk_build_root}/cyw30739_executable.gni")
 import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni")
 
 cyw30739_project_dir = "${chip_root}/examples/lock-app/cyw30739"
+examples_plat_dir = "${chip_root}/examples/platform/cyw30739"
 
 declare_args() {
   setupPinCode = 20202021
@@ -29,7 +30,10 @@ declare_args() {
 cyw30739_sdk("sdk") {
   sources = [ "${cyw30739_project_dir}/include/CHIPProjectConfig.h" ]
 
-  include_dirs = [ "${cyw30739_project_dir}/include" ]
+  include_dirs = [
+    "${cyw30739_project_dir}/include",
+    "${examples_plat_dir}",
+  ]
 
   defines = [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setupPinCode}",
@@ -42,8 +46,8 @@ cyw30739_executable("lock_app") {
 
   sources = [
     "src/AppShellCommands.cpp",
-    "src/BoltLockManager.cpp",
     "src/ButtonHandler.cpp",
+    "src/LockManager.cpp",
     "src/ZclCallbacks.cpp",
     "src/main.cpp",
   ]
@@ -51,12 +55,19 @@ cyw30739_executable("lock_app") {
   deps = [
     ":sdk",
     "${chip_root}/examples/lock-app/lock-common",
+    "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/examples/shell/shell_common:shell_common",
     "${chip_root}/src/lib",
-    "${chip_root}/third_party/openthread/repo:libopenthread-ftd",
   ]
 
   include_dirs = [ "include" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${examples_plat_dir}/OTAConfig.cpp",
+      "${examples_plat_dir}/OTAConfig.h",
+    ]
+  }
 }
 
 group("cyw30739") {
diff --git a/examples/lock-app/cyw30739/args.gni b/examples/lock-app/cyw30739/args.gni
index 149f7d42b18b5f..267c1db9b56817 100644
--- a/examples/lock-app/cyw30739/args.gni
+++ b/examples/lock-app/cyw30739/args.gni
@@ -16,3 +16,12 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/src/platform/CYW30739/args.gni")
 
 cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain")
+
+chip_openthread_ftd = true
+
+chip_enable_ota_requestor = true
+
+chip_error_logging = false
+chip_progress_logging = false
+chip_detail_logging = false
+chip_automation_logging = false
diff --git a/examples/lock-app/cyw30739/include/AppEvent.h b/examples/lock-app/cyw30739/include/AppEvent.h
new file mode 100644
index 00000000000000..60583eba2c2123
--- /dev/null
+++ b/examples/lock-app/cyw30739/include/AppEvent.h
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+struct AppEvent
+{
+    enum AppEventTypes
+    {
+        kEventType_Button = 0,
+        kEventType_Timer,
+        kEventType_Lock,
+        kEventType_Install,
+    };
+
+    uint16_t Type;
+
+    union
+    {
+        struct
+        {
+            uint8_t Action;
+        } ButtonEvent;
+        struct
+        {
+            void * Context;
+        } TimerEvent;
+        struct
+        {
+            uint8_t Action;
+            int32_t Actor;
+        } LockEvent;
+    };
+};
diff --git a/examples/lock-app/cyw30739/include/BoltLockManager.h b/examples/lock-app/cyw30739/include/BoltLockManager.h
deleted file mode 100644
index 08cf1ccf0488a1..00000000000000
--- a/examples/lock-app/cyw30739/include/BoltLockManager.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <chip_lock.h>
-#include <lib/core/CHIPError.h>
-#include <wiced_timer.h>
-
-class BoltLockManager
-{
-public:
-    enum Action_t
-    {
-        LOCK_ACTION = 0,
-        UNLOCK_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_LockingInitiated = 0,
-        kState_LockingCompleted,
-        kState_UnlockingInitiated,
-        kState_UnlockingCompleted,
-    } State;
-
-    enum Actor_t
-    {
-        ACTOR_ZCL_CMD = 0,
-        ACTOR_APP_CMD,
-        ACTOR_BUTTON,
-    } Actor;
-
-    CHIP_ERROR Init();
-    bool IsUnlocked();
-    void EnableAutoRelock(bool aOn);
-    void SetAutoLockDuration(uint32_t aDurationInSecs);
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-private:
-    friend BoltLockManager & BoltLockMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    bool mAutoRelock;
-    uint32_t mAutoLockDuration;
-    bool mAutoLockTimerArmed;
-
-    void CancelTimer(void);
-    void StartTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(WICED_TIMER_PARAM_TYPE cb_params);
-    static int AutoReLockTimerEventHandler(void * aEvent);
-    static int ActuatorMovementTimerEventHandler(void * aEvent);
-
-    static BoltLockManager sLock;
-};
-
-inline BoltLockManager & BoltLockMgr(void)
-{
-    return BoltLockManager::sLock;
-}
diff --git a/examples/lock-app/cyw30739/include/LockManager.h b/examples/lock-app/cyw30739/include/LockManager.h
new file mode 100644
index 00000000000000..596e5e9f42d035
--- /dev/null
+++ b/examples/lock-app/cyw30739/include/LockManager.h
@@ -0,0 +1,119 @@
+/*
+ *
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "AppEvent.h"
+#include <app/clusters/door-lock-server/door-lock-server.h>
+#include <chip_lock.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <stdint.h>
+#include <wiced_timer.h>
+
+using namespace ::chip;
+
+#define DOOR_LOCK_MAX_CREDENTIAL_SIZE 8
+
+static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE = 20;
+
+class LockManager
+{
+public:
+    enum Action_t
+    {
+        LOCK_ACTION = 0,
+        UNLOCK_ACTION,
+
+        INVALID_ACTION
+    } Action;
+
+    enum State_t
+    {
+        kState_LockInitiated = 0,
+        kState_LockCompleted,
+        kState_UnlockInitiated,
+        kState_UnlockCompleted,
+    } State;
+
+    enum Actor_t
+    {
+        ACTOR_ZCL_CMD = 0,
+        ACTOR_APP_CMD,
+        ACTOR_BUTTON,
+    } Actor;
+
+    CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
+                    uint8_t maxNumberOfCredentialsPerUser);
+    bool NextState();
+    bool IsActionInProgress();
+    bool InitiateAction(int32_t aActor, Action_t aAction);
+
+    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
+    typedef void (*Callback_fn_completed)(Action_t);
+    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
+
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+
+    bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
+    bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
+                 uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
+                 const DlCredential * credentials, size_t totalCredentials);
+
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+                       EmberAfPluginDoorLockCredentialInfo & credential) const;
+
+    bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus,
+                       DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+
+    bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
+                      DlOperationError & err);
+    const char * lockStateToString(DlLockState lockState) const;
+
+    bool ReadConfigValues();
+
+private:
+    friend LockManager & LockMgr();
+    chip::EndpointId mEndpointId;
+    State_t mState;
+
+    Callback_fn_initiated mActionInitiated_CB;
+    Callback_fn_completed mActionCompleted_CB;
+
+    void CancelTimer(void);
+    void StartTimer(uint32_t aTimeoutMs);
+
+    static void TimerEventHandler(WICED_TIMER_PARAM_TYPE cb_params);
+    static int ActuatorMovementTimerEventHandler(void * aEvent);
+
+    EmberAfPluginDoorLockUserInfo mLockUser;
+    EmberAfPluginDoorLockCredentialInfo mLockCredentials;
+
+    char mUserName[DOOR_LOCK_MAX_USER_NAME_SIZE];
+    uint8_t mCredentialData[DOOR_LOCK_MAX_CREDENTIAL_SIZE];
+    chip::Platform::ScopedMemoryBuffer<DlCredential> mCredentials;
+    uint8_t mMaxCredentialsPerUser;
+
+    static LockManager sLock;
+};
+
+inline LockManager & LockMgr()
+{
+    return LockManager::sLock;
+}
diff --git a/examples/lock-app/cyw30739/src/AppShellCommands.cpp b/examples/lock-app/cyw30739/src/AppShellCommands.cpp
index e086f0189637b7..beb21c26c4c023 100644
--- a/examples/lock-app/cyw30739/src/AppShellCommands.cpp
+++ b/examples/lock-app/cyw30739/src/AppShellCommands.cpp
@@ -17,7 +17,7 @@
  *    limitations under the License.
  */
 
-#include <BoltLockManager.h>
+#include <LockManager.h>
 #include <lib/shell/commands/Help.h>
 #include <platform/CHIPDeviceLayer.h>
 
@@ -65,25 +65,25 @@ CHIP_ERROR AppCommandLockHandler(int argc, char * argv[])
 {
     if (argc == 0)
     {
-        streamer_printf(streamer_get(), "The lock is %s\n", BoltLockMgr().IsUnlocked() ? "unlocked" : "locked");
+        streamer_printf(streamer_get(), "The lock is %s\n", LockMgr().NextState() ? "unlocked" : "locked");
     }
     else if (strcmp(argv[0], "on") == 0)
     {
         streamer_printf(streamer_get(), "Lock ...\n");
-        BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_APP_CMD, BoltLockManager::LOCK_ACTION);
+        LockMgr().InitiateAction(LockManager::ACTOR_APP_CMD, LockManager::LOCK_ACTION);
     }
     else if (strcmp(argv[0], "off") == 0)
     {
         streamer_printf(streamer_get(), "Unlock ...\n");
-        BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_BUTTON, BoltLockManager::UNLOCK_ACTION);
+        LockMgr().InitiateAction(LockManager::ACTOR_BUTTON, LockManager::UNLOCK_ACTION);
     }
     else if (strcmp(argv[0], "toggle") == 0)
     {
         streamer_printf(streamer_get(), "Toggling the lock ...\n");
-        if (BoltLockMgr().IsUnlocked())
-            BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_APP_CMD, BoltLockManager::LOCK_ACTION);
+        if (LockMgr().NextState())
+            LockMgr().InitiateAction(LockManager::ACTOR_APP_CMD, LockManager::LOCK_ACTION);
         else
-            BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_BUTTON, BoltLockManager::UNLOCK_ACTION);
+            LockMgr().InitiateAction(LockManager::ACTOR_BUTTON, LockManager::UNLOCK_ACTION);
     }
     else
     {
diff --git a/examples/lock-app/cyw30739/src/BoltLockManager.cpp b/examples/lock-app/cyw30739/src/BoltLockManager.cpp
deleted file mode 100644
index 7796fe64696166..00000000000000
--- a/examples/lock-app/cyw30739/src/BoltLockManager.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "BoltLockManager.h"
-#include "wiced_bt_event.h"
-
-BoltLockManager BoltLockManager::sLock;
-
-wiced_timer_t sLockTimer;
-
-CHIP_ERROR BoltLockManager::Init()
-{
-    wiced_result_t result;
-
-    // Create wiced timer for lock timer.
-    result = wiced_init_timer(&sLockTimer, TimerEventHandler, (WICED_TIMER_PARAM_TYPE) this, WICED_MILLI_SECONDS_TIMER);
-    if (result != WICED_BT_SUCCESS)
-    {
-        printf("sLockTimer timer create failed");
-        return APP_ERROR_INIT_TIMER_FAILED;
-    }
-
-    mState              = kState_UnlockingCompleted;
-    mAutoLockTimerArmed = false;
-    mAutoRelock         = false;
-    mAutoLockDuration   = 0;
-
-    return CHIP_NO_ERROR;
-}
-
-void BoltLockManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool BoltLockManager::IsActionInProgress()
-{
-    return (mState == kState_LockingInitiated || mState == kState_UnlockingInitiated);
-}
-
-bool BoltLockManager::IsUnlocked()
-{
-    return (mState == kState_UnlockingCompleted);
-}
-
-void BoltLockManager::EnableAutoRelock(bool aOn)
-{
-    mAutoRelock = aOn;
-}
-
-void BoltLockManager::SetAutoLockDuration(uint32_t aDurationInSecs)
-{
-    mAutoLockDuration = aDurationInSecs;
-}
-
-bool BoltLockManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Lock/Unlock Action only when the previous one is complete.
-    if (mState == kState_LockingCompleted && aAction == UNLOCK_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_UnlockingInitiated;
-    }
-    else if (mState == kState_UnlockingCompleted && aAction == LOCK_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_LockingInitiated;
-    }
-
-    if (action_initiated)
-    {
-        if (mAutoLockTimerArmed && new_state == kState_LockingInitiated)
-        {
-            // If auto lock timer has been armed and someone initiates locking,
-            // cancel the timer and continue as normal.
-            mAutoLockTimerArmed = false;
-
-            CancelTimer();
-        }
-
-        StartTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-
-    return action_initiated;
-}
-
-void BoltLockManager::StartTimer(uint32_t aTimeoutMs)
-{
-    if (wiced_is_timer_in_use(&sLockTimer))
-    {
-        printf("app timer already started!\n");
-        CancelTimer();
-    }
-
-    if (wiced_start_timer(&sLockTimer, aTimeoutMs) != WICED_BT_SUCCESS)
-    {
-        printf("sLockTimer timer start() failed\n");
-        return;
-    }
-}
-
-void BoltLockManager::CancelTimer(void)
-{
-    if (wiced_stop_timer(&sLockTimer) != WICED_BT_SUCCESS)
-    {
-        printf("Lock timer timer stop() failed\n");
-        return;
-    }
-}
-
-void BoltLockManager::TimerEventHandler(WICED_TIMER_PARAM_TYPE cb_params)
-{
-    BoltLockManager * lock = reinterpret_cast<BoltLockManager *>(cb_params);
-    int (*fn)(void *);
-
-    // The timer event handler will be called in the context of the timer task
-    // once sLockTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    if (lock->mAutoLockTimerArmed)
-    {
-        fn = AutoReLockTimerEventHandler;
-    }
-    else
-    {
-        fn = ActuatorMovementTimerEventHandler;
-    }
-
-    if (wiced_app_event_serialize(fn, (void *) lock) != WICED_TRUE)
-    {
-        printf("wiced_app_event_serialize failed\n");
-    }
-}
-
-int BoltLockManager::AutoReLockTimerEventHandler(void * data)
-{
-    BoltLockManager * lock = reinterpret_cast<BoltLockManager *>(data);
-    int32_t actor          = 0;
-
-    // Make sure auto lock timer is still armed.
-    if (!lock->mAutoLockTimerArmed)
-    {
-        return 0;
-    }
-
-    lock->mAutoLockTimerArmed = false;
-
-    printf("Auto Re-Lock has been triggered!\n");
-
-    lock->InitiateAction(actor, LOCK_ACTION);
-
-    return 0;
-}
-
-int BoltLockManager::ActuatorMovementTimerEventHandler(void * data)
-{
-    BoltLockManager * lock   = reinterpret_cast<BoltLockManager *>(data);
-    Action_t actionCompleted = INVALID_ACTION;
-
-    if (lock->mState == kState_LockingInitiated)
-    {
-        lock->mState    = kState_LockingCompleted;
-        actionCompleted = LOCK_ACTION;
-    }
-    else if (lock->mState == kState_UnlockingInitiated)
-    {
-        lock->mState    = kState_UnlockingCompleted;
-        actionCompleted = UNLOCK_ACTION;
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (lock->mActionCompleted_CB)
-        {
-            lock->mActionCompleted_CB(actionCompleted);
-        }
-
-        if (lock->mAutoRelock && actionCompleted == UNLOCK_ACTION)
-        {
-            // Start the timer for auto relock
-            lock->StartTimer(lock->mAutoLockDuration * 1000);
-
-            lock->mAutoLockTimerArmed = true;
-
-            printf("Auto Re-lock enabled. Will be triggered in %lu seconds\n", lock->mAutoLockDuration);
-        }
-    }
-
-    return 0;
-}
diff --git a/examples/lock-app/cyw30739/src/ButtonHandler.cpp b/examples/lock-app/cyw30739/src/ButtonHandler.cpp
index 47c37a7c2c65db..94f85a1b6259ab 100644
--- a/examples/lock-app/cyw30739/src/ButtonHandler.cpp
+++ b/examples/lock-app/cyw30739/src/ButtonHandler.cpp
@@ -18,8 +18,8 @@
  *    limitations under the License.
  */
 
-#include <BoltLockManager.h>
 #include <ButtonHandler.h>
+#include <LockManager.h>
 #include <stdio.h>
 #include <wiced.h>
 #include <wiced_button_manager.h>
@@ -73,18 +73,34 @@ void app_button_event_handler(const button_manager_button_t * button_mgr, button
 {
     // printf("app_button_event_handler. button=%d, event=%d, state=%d\n", button_mgr[ON_OFF_BUTTON].configuration->button, event,
     // state);
-
+    bool initiated = false;
+    LockManager::Action_t action;
+    int32_t actor;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     if (button_mgr[0].configuration->button == PLATFORM_BUTTON_1 && event == BUTTON_CLICK_EVENT && state == BUTTON_STATE_RELEASED)
     {
-        if (BoltLockMgr().IsUnlocked())
+        if (LockMgr().NextState() == true)
         {
-            printf("Button Toggle:Lock\n");
-            BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_BUTTON, BoltLockManager::LOCK_ACTION);
+            action = LockManager::LOCK_ACTION;
         }
         else
         {
-            printf("Button Toggle:Unlock\n");
-            BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_BUTTON, BoltLockManager::UNLOCK_ACTION);
+            action = LockManager::UNLOCK_ACTION;
+        }
+        actor = AppEvent::kEventType_Button;
+    }
+    else
+    {
+        err = CHIP_ERROR_UNEXPECTED_EVENT;
+    }
+
+    if (err == CHIP_NO_ERROR)
+    {
+        initiated = LockMgr().InitiateAction(LockManager::ACTOR_BUTTON, action);
+
+        if (!initiated)
+        {
+            printf("Action is already in progress or active.");
         }
     }
 }
diff --git a/examples/lock-app/cyw30739/src/LockManager.cpp b/examples/lock-app/cyw30739/src/LockManager.cpp
new file mode 100644
index 00000000000000..d5af8592543829
--- /dev/null
+++ b/examples/lock-app/cyw30739/src/LockManager.cpp
@@ -0,0 +1,423 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "LockManager.h"
+#include "wiced_bt_event.h"
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/CHIPDeviceLayer.h>
+
+using namespace chip::DeviceLayer::Internal;
+
+LockManager LockManager::sLock;
+
+wiced_timer_t sLockTimer;
+
+CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
+                             uint8_t maxNumberOfCredentialsPerUser)
+{
+    // Allocate buffer for credentials
+    if (!mCredentials.Alloc(maxNumberOfCredentialsPerUser))
+    {
+        printf("Failed to allocate array for lock credentials");
+        return CHIP_ERROR_NO_MEMORY;
+    }
+    mMaxCredentialsPerUser = maxNumberOfCredentialsPerUser;
+
+    wiced_result_t result;
+
+    // Create wiced timer for lock timer.
+    result = wiced_init_timer(&sLockTimer, TimerEventHandler, (WICED_TIMER_PARAM_TYPE) this, WICED_MILLI_SECONDS_TIMER);
+    if (result != WICED_BT_SUCCESS)
+    {
+        printf("sLockTimer timer create failed");
+        return APP_ERROR_INIT_TIMER_FAILED;
+    }
+
+    if (state.Value() == DlLockState::kUnlocked)
+        mState = kState_UnlockCompleted;
+    else
+        mState = kState_LockCompleted;
+
+    return CHIP_NO_ERROR;
+}
+
+bool LockManager::ReadConfigValues()
+{
+    size_t outLen;
+    CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_LockUser, reinterpret_cast<uint8_t *>(&mLockUser),
+                                       sizeof(EmberAfPluginDoorLockUserInfo), outLen);
+    CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
+                                       sizeof(EmberAfPluginDoorLockCredentialInfo), outLen);
+
+    CYW30739Config::ReadConfigValueStr(CYW30739Config::kConfigKey_LockUserName, mUserName, DOOR_LOCK_USER_NAME_BUFFER_SIZE, outLen);
+
+    CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_CredentialData, mCredentialData, sizeof(mCredentialData), outLen);
+
+    CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials.Get()),
+                                       sizeof(DlCredential), outLen);
+
+    return true;
+}
+
+void LockManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
+{
+    mActionInitiated_CB = aActionInitiated_CB;
+    mActionCompleted_CB = aActionCompleted_CB;
+}
+
+bool LockManager::IsActionInProgress()
+{
+    return (mState == kState_LockInitiated || mState == kState_UnlockInitiated);
+}
+
+bool LockManager::NextState()
+{
+    return (mState == kState_UnlockCompleted);
+}
+
+bool LockManager::InitiateAction(int32_t aActor, Action_t aAction)
+{
+    bool action_initiated = false;
+    State_t new_state;
+
+    // Initiate Lock/Unlock Action only when the previous one is complete.
+    if (mState == kState_LockCompleted && aAction == UNLOCK_ACTION)
+    {
+        action_initiated = true;
+
+        new_state = kState_UnlockInitiated;
+    }
+    else if (mState == kState_UnlockCompleted && aAction == LOCK_ACTION)
+    {
+        action_initiated = true;
+
+        new_state = kState_LockInitiated;
+    }
+
+    if (action_initiated)
+    {
+
+        StartTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
+
+        // Since the timer started successfully, update the state and trigger callback
+        mState = new_state;
+
+        if (mActionInitiated_CB)
+        {
+            mActionInitiated_CB(aAction, aActor);
+        }
+    }
+
+    return action_initiated;
+}
+
+void LockManager::StartTimer(uint32_t aTimeoutMs)
+{
+    if (wiced_is_timer_in_use(&sLockTimer))
+    {
+        printf("app timer already started!\n");
+        CancelTimer();
+    }
+
+    if (wiced_start_timer(&sLockTimer, aTimeoutMs) != WICED_BT_SUCCESS)
+    {
+        printf("sLockTimer timer start() failed\n");
+        return;
+    }
+}
+
+void LockManager::CancelTimer(void)
+{
+    if (wiced_stop_timer(&sLockTimer) != WICED_BT_SUCCESS)
+    {
+        printf("Lock timer timer stop() failed\n");
+        return;
+    }
+}
+
+void LockManager::TimerEventHandler(WICED_TIMER_PARAM_TYPE cb_params)
+{
+    LockManager * lock = reinterpret_cast<LockManager *>(cb_params);
+    int (*fn)(void *);
+
+    // The timer event handler will be called in the context of the timer task
+    // once sLockTimer expires. Post an event to apptask queue with the actual handler
+    // so that the event can be handled in the context of the apptask.
+    fn = ActuatorMovementTimerEventHandler;
+
+    if (wiced_app_event_serialize(fn, (void *) lock) != WICED_TRUE)
+    {
+        printf("wiced_app_event_serialize failed\n");
+    }
+}
+
+int LockManager::ActuatorMovementTimerEventHandler(void * data)
+{
+    Action_t actionCompleted = INVALID_ACTION;
+
+    LockManager * lock = reinterpret_cast<LockManager *>(data);
+
+    if (lock->mState == kState_LockInitiated)
+    {
+        lock->mState    = kState_LockCompleted;
+        actionCompleted = LOCK_ACTION;
+    }
+    else if (lock->mState == kState_UnlockInitiated)
+    {
+        lock->mState    = kState_UnlockCompleted;
+        actionCompleted = UNLOCK_ACTION;
+    }
+
+    if (actionCompleted != INVALID_ACTION)
+    {
+        if (lock->mActionCompleted_CB)
+        {
+            lock->mActionCompleted_CB(actionCompleted);
+        }
+    }
+
+    return 0;
+}
+
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+{
+    return setLockState(endpointId, DlLockState::kLocked, pin, err);
+}
+
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+{
+    return setLockState(endpointId, DlLockState::kUnlocked, pin, err);
+}
+
+bool LockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const
+{
+    // chip::ByteSpan credentialData(mLockCredentials.credentialData, mLockCredentials.credentialDataSize);
+    ChipLogProgress(Zcl, "Door Lock App: LockManager::GetUser [endpoint=%d,userIndex=%hu]", mEndpointId, userIndex);
+
+    const auto & userInDb = mLockUser;
+    user.userStatus       = userInDb.userStatus;
+    if (DlUserStatus::kAvailable == user.userStatus)
+    {
+        ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", mEndpointId);
+        return true;
+    }
+
+    user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
+    user.credentials    = chip::Span<const DlCredential>(userInDb.credentials.data(), userInDb.credentials.size());
+    user.userUniqueId   = userInDb.userUniqueId;
+    user.userType       = userInDb.userType;
+    user.credentialRule = userInDb.credentialRule;
+    user.createdBy      = userInDb.createdBy;
+    user.lastModifiedBy = userInDb.lastModifiedBy;
+
+    ChipLogDetail(Zcl,
+                  "Found occupied user "
+                  "[endpoint=%d,name=\"%.*s\",credentialsCount=%u,uniqueId=%lx,type=%u,credentialRule=%u,"
+                  "createdBy=%d,lastModifiedBy=%d]",
+                  mEndpointId, static_cast<int>(user.userName.size()), user.userName.data(), user.credentials.size(),
+                  user.userUniqueId, to_underlying(user.userType), to_underlying(user.credentialRule), user.createdBy,
+                  user.lastModifiedBy);
+
+    return true;
+}
+
+bool LockManager::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
+                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+{
+    ChipLogProgress(Zcl,
+                    "Door Lock App: LockManager::SetUser "
+                    "[endpoint=%d,userIndex=%d,creator=%d,modifier=%d,userName=%s,uniqueId=%ld "
+                    "userStatus=%u,userType=%u,credentialRule=%u,credentials=%p,totalCredentials=%u]",
+                    mEndpointId, userIndex, creator, modifier, userName.data(), uniqueId, to_underlying(userStatus),
+                    to_underlying(usertype), to_underlying(credentialRule), credentials, totalCredentials);
+
+    auto & userInStorage = mLockUser;
+
+    if (userName.size() > DOOR_LOCK_MAX_USER_NAME_SIZE)
+    {
+        ChipLogError(Zcl, "Cannot set user - user name is too long [endpoint=%d,index=%d]", mEndpointId, userIndex);
+        return false;
+    }
+
+    if (totalCredentials > mMaxCredentialsPerUser)
+    {
+        ChipLogError(Zcl, "Cannot set user - total number of credentials is too big [endpoint=%d,index=%d,totalCredentials=%u]",
+                     mEndpointId, userIndex, totalCredentials);
+        return false;
+    }
+
+    chip::Platform::CopyString(mUserName, userName);
+    mUserName[userName.size()]   = 0;
+    userInStorage.userName       = chip::CharSpan(mUserName, userName.size());
+    userInStorage.userUniqueId   = uniqueId;
+    userInStorage.userStatus     = userStatus;
+    userInStorage.userType       = usertype;
+    userInStorage.credentialRule = credentialRule;
+    userInStorage.lastModifiedBy = modifier;
+    userInStorage.createdBy      = creator;
+
+    for (size_t i = 0; i < totalCredentials; ++i)
+    {
+        mCredentials[i]                 = credentials[i];
+        mCredentials[i].CredentialType  = 1;
+        mCredentials[i].CredentialIndex = i + 1;
+    }
+
+    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials.Get(), totalCredentials);
+
+    // Save user information in NVM flash
+    CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&userInStorage),
+                                        sizeof(EmberAfPluginDoorLockUserInfo));
+
+    CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_UserCredentials,
+                                        reinterpret_cast<const uint8_t *>(mCredentials.Get()), sizeof(DlCredential));
+
+    CYW30739Config::WriteConfigValueStr(CYW30739Config::kConfigKey_LockUserName, mUserName, sizeof(userName.size()));
+
+    ChipLogProgress(Zcl, "Successfully set the user [mEndpointId=%d,index=%d]", mEndpointId, userIndex);
+
+    return true;
+}
+
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+                                EmberAfPluginDoorLockCredentialInfo & credential) const
+{
+    ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u]", to_underlying(credentialType));
+
+    const auto & credentialInStorage = mLockCredentials;
+
+    credential.status = credentialInStorage.status;
+    if (DlCredentialStatus::kAvailable == credential.status)
+    {
+        ChipLogDetail(Zcl, "Found unoccupied credential ");
+        return true;
+    }
+    credential.credentialType = credentialInStorage.credentialType;
+    credential.credentialData = credentialInStorage.credentialData;
+
+    ChipLogDetail(Zcl, "Found occupied credential [type=%u,dataSize=%u]", to_underlying(credential.credentialType),
+                  credential.credentialData.size());
+
+    return true;
+}
+
+bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus,
+                                DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+{
+    ChipLogProgress(Zcl,
+                    "Door Lock App: LockManager::SetCredential "
+                    "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u]",
+                    to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size());
+
+    auto & credentialInStorage = mLockCredentials;
+    if (credentialData.size() > DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE)
+    {
+        ChipLogError(Zcl,
+                     "Cannot get the credential - data size exceeds limit "
+                     "[dataSize=%u,maxDataSize=%u]",
+                     credentialData.size(), DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE);
+        return false;
+    }
+    credentialInStorage.status         = credentialStatus;
+    credentialInStorage.credentialType = credentialType;
+
+    memcpy(mCredentialData, credentialData.data(), credentialData.size());
+    mCredentialData[credentialData.size()] = 0;
+
+    credentialInStorage.credentialData = chip::ByteSpan{ mCredentialData, credentialData.size() };
+
+    // Save user information in NVM flash
+    CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_Credential,
+                                        reinterpret_cast<const uint8_t *>(&credentialInStorage),
+                                        sizeof(EmberAfPluginDoorLockCredentialInfo));
+
+    CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_CredentialData,
+                                        reinterpret_cast<const uint8_t *>(&mCredentialData), credentialData.size());
+
+    ChipLogProgress(Zcl, "Successfully set the credential [credentialType=%u]", to_underlying(credentialType));
+
+    return true;
+}
+
+const char * LockManager::lockStateToString(DlLockState lockState) const
+{
+    switch (lockState)
+    {
+    case DlLockState::kNotFullyLocked:
+        return "Not Fully Locked";
+    case DlLockState::kLocked:
+        return "Locked";
+    case DlLockState::kUnlocked:
+        return "Unlocked";
+    }
+
+    return "Unknown";
+}
+
+bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
+                               DlOperationError & err)
+{
+    DlLockState curState = DlLockState::kLocked;
+    if (mState == kState_UnlockCompleted)
+        curState = DlLockState::kUnlocked;
+
+    if (curState == lockState)
+    {
+        ChipLogDetail(Zcl, "Door Lock App: door is already locked, set lock state to \"%s\" [endpointId=%d]",
+                      lockStateToString(lockState), mEndpointId);
+    }
+
+    if (!pin.HasValue())
+    {
+        ChipLogDetail(Zcl, "Door Lock App: PIN code is not specified, setting door lock state to \"%s\" [endpointId=%d]",
+                      lockStateToString(lockState), mEndpointId);
+        curState = lockState;
+
+        return true;
+    }
+
+    // Check the PIN code
+    for (uint8_t i; i < 10; i++)
+    {
+        if (mLockCredentials.credentialType != DlCredentialType::kPin || mLockCredentials.status == DlCredentialStatus::kAvailable)
+        {
+            continue;
+        }
+
+        if (mLockCredentials.credentialData.data_equal(pin.Value()))
+        {
+            ChipLogDetail(Zcl,
+                          "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
+                          lockStateToString(lockState), mEndpointId);
+
+            curState = lockState;
+
+            return true;
+        }
+    }
+
+    ChipLogDetail(Zcl,
+                  "Door Lock App: specified PIN code was not found in the database, ignoring command to set lock state to \"%s\" "
+                  "[endpointId=%d]",
+                  lockStateToString(lockState), mEndpointId);
+
+    err = DlOperationError::kInvalidCredential;
+    return false;
+}
diff --git a/examples/lock-app/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/cyw30739/src/ZclCallbacks.cpp
index 35db42f3482d4a..ecbc2f78804b24 100644
--- a/examples/lock-app/cyw30739/src/ZclCallbacks.cpp
+++ b/examples/lock-app/cyw30739/src/ZclCallbacks.cpp
@@ -17,9 +17,11 @@
  *    limitations under the License.
  */
 
-#include <BoltLockManager.h>
+#include "LockManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <lib/support/logging/CHIPLogging.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;
@@ -32,7 +34,7 @@ void emberAfBasicClusterInitCallback(EndpointId endpoint)
     uint8_t dayOfMonth;
     char cString[16] = "00000000";
 
-    if (ConfigurationMgr().GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
+    if (GetDeviceInstanceInfoProvider()->GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
     {
         snprintf(cString, sizeof(cString), "%04u%02u%02u", year, month, dayOfMonth);
     }
@@ -45,12 +47,12 @@ void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attrib
 {
     switch (attributePath.mClusterId)
     {
-    case OnOff::Id:
-        if (attributePath.mAttributeId == OnOff::Attributes::OnOff::Id)
+    case DoorLock::Id:
+        if (attributePath.mAttributeId == DoorLock::Attributes::LockState::Id)
         {
+            ChipLogProgress(Zcl, "Door lock cluster: " ChipLogFormatMEI, ChipLogValueMEI(attributePath.mClusterId));
             printf("ZCL OnOff -> %u\n", *value);
-            BoltLockMgr().InitiateAction(BoltLockManager::ACTOR_ZCL_CMD,
-                                         (*value) ? BoltLockManager::LOCK_ACTION : BoltLockManager::UNLOCK_ACTION);
+            LockMgr().InitiateAction(LockManager::ACTOR_ZCL_CMD, (*value) ? LockManager::LOCK_ACTION : LockManager::UNLOCK_ACTION);
             return;
         }
         break;
@@ -61,3 +63,80 @@ void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attrib
 
     printf("ERROR clusterId: 0x%04lx, unknown attribute ID: 0x%04lx\n", attributePath.mClusterId, attributePath.mAttributeId);
 }
+
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+{
+    ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
+    bool status = LockMgr().Lock(endpointId, pinCode, err);
+    if (status == true)
+    {
+        LockMgr().InitiateAction(AppEvent::kEventType_Lock, LockManager::LOCK_ACTION);
+    }
+    return status;
+}
+
+bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                              DlOperationError & err)
+{
+    ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
+    bool status = LockMgr().Unlock(endpointId, pinCode, err);
+    if (status == true)
+    {
+        LockMgr().InitiateAction(AppEvent::kEventType_Lock, LockManager::UNLOCK_ACTION);
+    }
+
+    return status;
+}
+
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+                                        EmberAfPluginDoorLockCredentialInfo & credential)
+{
+    return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
+}
+
+bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus,
+                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+{
+    return LockMgr().SetCredential(endpointId, credentialIndex, credentialStatus, credentialType, credentialData);
+}
+
+bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
+{
+    return LockMgr().GetUser(userIndex, user);
+}
+
+bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
+                                  chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
+                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
+                                  const DlCredential * credentials, size_t totalCredentials)
+{
+
+    return LockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, credentials,
+                             totalCredentials);
+}
+
+// TODO: These functions will be supported by door-lock-server in the future. These are set to return failure until implemented.
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                          EmberAfPluginDoorLockWeekDaySchedule & schedule)
+{
+    return DlStatus::kFailure;
+}
+
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                          EmberAfPluginDoorLockYearDaySchedule & schedule)
+{
+    return DlStatus::kFailure;
+}
+
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
+                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          uint8_t endHour, uint8_t endMinute)
+{
+    return DlStatus::kFailure;
+}
+
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
+                                          DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
+{
+    return DlStatus::kFailure;
+}
diff --git a/examples/lock-app/cyw30739/src/main.cpp b/examples/lock-app/cyw30739/src/main.cpp
index e1681600146c69..61ec55e3ef35a3 100644
--- a/examples/lock-app/cyw30739/src/main.cpp
+++ b/examples/lock-app/cyw30739/src/main.cpp
@@ -16,17 +16,24 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include <platform/CHIPDeviceLayer.h>
+
 #include <AppShellCommands.h>
-#include <BoltLockManager.h>
 #include <ButtonHandler.h>
 #include <ChipShellCollection.h>
+#include <DeviceInfoProviderImpl.h>
+#include <LockManager.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <OTAConfig.h>
+#endif
+#include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/server/Server.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/shell/Engine.h>
 #include <lib/support/CHIPPlatformMemory.h>
 #include <mbedtls/platform.h>
-#include <platform/CHIPDeviceLayer.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <sparcommon.h>
 #include <stdio.h>
@@ -34,16 +41,25 @@
 #include <wiced_memory.h>
 #include <wiced_platform.h>
 
+using chip::app::Clusters::DoorLock::DlLockState;
+using chip::app::Clusters::DoorLock::DlOperationError;
+using chip::app::Clusters::DoorLock::DlOperationSource;
+
+using namespace chip;
+using namespace ::chip::DeviceLayer::Internal;
+
 using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::Shell;
 
 wiced_bool_t syncClusterToButtonAction = false;
 
+static chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+static void InitApp(intptr_t args);
 static void EventHandler(const ChipDeviceEvent * event, intptr_t arg);
 static void HandleThreadStateChangeEvent(const ChipDeviceEvent * event);
-static void ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor);
-static void ActionCompleted(BoltLockManager::Action_t aAction);
+static void ActionInitiated(LockManager::Action_t aAction, int32_t aActor);
+static void ActionCompleted(LockManager::Action_t aAction);
 static void WriteClusterState(uint8_t value);
 
 #ifndef _countof
@@ -129,6 +145,24 @@ APPLICATION_START()
     }
 #endif
 
+    PlatformMgr().ScheduleWork(InitApp, 0);
+
+    const int ret = Engine::Root().Init();
+    if (!chip::ChipError::IsSuccess(ret))
+    {
+        printf("ERROR Shell Init %d\n", ret);
+    }
+    cmd_ping_init();
+    RegisterAppShellCommands();
+    Engine::Root().RunMainLoop();
+
+    assert(!wiced_rtos_check_for_stack_overflow());
+}
+
+void InitApp(intptr_t args)
+{
+    ConfigurationMgr().LogDeviceConfig();
+
     PlatformMgrImpl().AddEventHandler(EventHandler, 0);
 
     /* Start CHIP datamodel server */
@@ -137,27 +171,37 @@ APPLICATION_START()
     chip::Server::GetInstance().Init(initParams);
 
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    gExampleDeviceInfoProvider.SetStorageDelegate(&chip::Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    err = BoltLockMgr().Init();
-    if (err != CHIP_NO_ERROR)
+    // Initial lock state
+    chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state;
+    chip::EndpointId endpointId{ 1 };
+    chip::DeviceLayer::PlatformMgr().LockChipStack();
+    chip::app::Clusters::DoorLock::Attributes::LockState::Get(endpointId, state);
+
+    uint8_t maxCredentialsPerUser = 0;
+    if (!DoorLockServer::Instance().GetNumberOfCredentialsSupportedPerUser(endpointId, maxCredentialsPerUser))
     {
-        printf("BoltLockMgr().Init() failed\n");
+        ChipLogError(Zcl,
+                     "Unable to get number of credentials supported per user when initializing lock endpoint, defaulting to 5 "
+                     "[endpointId=%d]",
+                     endpointId);
+        maxCredentialsPerUser = 5;
     }
+    chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
-    BoltLockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-    const int ret = streamer_init(streamer_get());
-    if (!chip::ChipError::IsSuccess(ret))
+    CHIP_ERROR err = LockMgr().Init(state, maxCredentialsPerUser);
+    if (err != CHIP_NO_ERROR)
     {
-        printf("ERROR streamer_init %d\n", ret);
+        printf("LockMgr().Init() failed\n");
     }
-    cmd_ping_init();
-    RegisterAppShellCommands();
-    Engine::Root().RunMainLoop();
 
-    assert(!wiced_rtos_check_for_stack_overflow());
+    LockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    OTAConfig::Init();
+#endif
 }
 
 void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
@@ -174,57 +218,71 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
 
 void HandleThreadStateChangeEvent(const ChipDeviceEvent * event) {}
 
-void ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
+void ActionInitiated(LockManager::Action_t aAction, int32_t aActor)
 {
     // If the action has been initiated by the lock, update the bolt lock trait
     // and start flashing the LEDs rapidly to indicate action initiation.
-    if (aAction == BoltLockManager::LOCK_ACTION)
+    if (aAction == LockManager::LOCK_ACTION)
     {
         printf("Lock Action has been initiated\n");
     }
-    else if (aAction == BoltLockManager::UNLOCK_ACTION)
+    else if (aAction == LockManager::UNLOCK_ACTION)
     {
         printf("Unlock Action has been initiated\n");
     }
 
-    if (aActor == BoltLockManager::ACTOR_BUTTON)
+    if (aActor == LockManager::ACTOR_BUTTON)
     {
         syncClusterToButtonAction = true;
     }
 
-    wiced_led_manager_enable_led(PLATFORM_LED_2);
+    // Action initiated, update the light led
+    if (aAction == LockManager::LOCK_ACTION)
+    {
+        printf("Lock Action has been initiated");
+        wiced_led_manager_disable_led(PLATFORM_LED_2);
+    }
+    else if (aAction == LockManager::UNLOCK_ACTION)
+    {
+        printf("Unlock Action has been initiated");
+        wiced_led_manager_enable_led(PLATFORM_LED_2);
+    }
+}
+
+void UpdateClusterState(intptr_t context)
+{
+    bool unlocked        = LockMgr().NextState();
+    DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked;
+
+    DlOperationSource source = DlOperationSource::kUnspecified;
+
+    // write the new lock value
+    EmberAfStatus status =
+        DoorLockServer::Instance().SetLockState(1, newState, source) ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
+
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        printf("ERR: updating lock state %x", status);
+    }
 }
 
-void ActionCompleted(BoltLockManager::Action_t aAction)
+void ActionCompleted(LockManager::Action_t aAction)
 {
     // if the action has been completed by the lock, update the bolt lock trait.
     // Turn on the lock LED if in a LOCKED state OR
     // Turn off the lock LED if in an UNLOCKED state.
-    if (aAction == BoltLockManager::LOCK_ACTION)
+    if (aAction == LockManager::LOCK_ACTION)
     {
         printf("Lock Action has been completed\n");
-        wiced_led_manager_enable_led(PLATFORM_LED_1);
     }
-    else if (aAction == BoltLockManager::UNLOCK_ACTION)
+    else if (aAction == LockManager::UNLOCK_ACTION)
     {
         printf("Unlock Action has been completed\n");
-        wiced_led_manager_disable_led(PLATFORM_LED_1);
     }
 
     if (syncClusterToButtonAction)
     {
-        WriteClusterState(!BoltLockMgr().IsUnlocked());
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateClusterState, reinterpret_cast<intptr_t>(nullptr));
         syncClusterToButtonAction = false;
     }
-
-    wiced_led_manager_disable_led(PLATFORM_LED_2);
-}
-
-void WriteClusterState(uint8_t value)
-{
-    const EmberAfStatus status = chip::app::Clusters::OnOff::Attributes::OnOff::Set(1, value);
-    if (status != EMBER_ZCL_STATUS_SUCCESS)
-    {
-        printf("Error WriteServerAttribute 0x%02x\n", status);
-    }
 }
diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
index b4f746235f262f..50ebd01f436152 100644
--- a/examples/lock-app/efr32/BUILD.gn
+++ b/examples/lock-app/efr32/BUILD.gn
@@ -60,6 +60,9 @@ declare_args() {
 
   # Disable LCD on supported devices
   disable_lcd = false
+
+  # Argument to Disable IPv4 for wifi(rs911)
+  chip_disable_wifi_ipv4 = false
 }
 
 declare_args() {
@@ -216,6 +219,10 @@ efr32_executable("lock_app") {
     sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
   }
 
+  if (chip_disable_wifi_ipv4) {
+    defines += [ "WIFI_IPV4_DISABLED" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {
diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni
index de1a2fd4f0e9f4..66670784404334 100644
--- a/examples/lock-app/efr32/args.gni
+++ b/examples/lock-app/efr32/args.gni
@@ -23,3 +23,4 @@ chip_enable_ota_requestor = true
 chip_enable_openthread = true
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log"
+pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
diff --git a/examples/lock-app/efr32/include/LockManager.h b/examples/lock-app/efr32/include/LockManager.h
index ba2deb7007ce04..a97d7f4bb3b8bf 100644
--- a/examples/lock-app/efr32/include/LockManager.h
+++ b/examples/lock-app/efr32/include/LockManager.h
@@ -31,7 +31,13 @@
 
 using namespace ::chip;
 
+// Currently up to 10 users are support on the EFR32 platform
+#define DOOR_LOCK_MAX_USERS 10
 #define DOOR_LOCK_MAX_CREDENTIAL_SIZE 8
+#define MININUM_USER_INDEX 1
+#define MINIMUM_CREDENTIAL_INDEX 1
+#define MAX_CREDENTIAL_PER_USER 10
+#define MAX_CREDENTIALS 50
 
 static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE = 20;
 
@@ -55,7 +61,7 @@ class LockManager
     } State;
 
     CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
-                    uint8_t maxNumberOfCredentialsPerUser);
+                    uint8_t maxNumberOfCredentialsPerUser, uint16_t numberOfSupportedUsers);
     bool NextState();
     bool IsActionInProgress();
     bool InitiateAction(int32_t aActor, Action_t aAction);
@@ -67,16 +73,16 @@ class LockManager
     bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
     bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
 
-    bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
-    bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
-                 uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                 const DlCredential * credentials, size_t totalCredentials);
+    bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
+    bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
+                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
 
     bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential) const;
 
-    bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus,
-                       DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+    bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
 
     bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
                       DlOperationError & err);
@@ -99,13 +105,15 @@ class LockManager
     static void AutoLockTimerEventHandler(AppEvent * aEvent);
     static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
 
-    EmberAfPluginDoorLockUserInfo mLockUser;
-    EmberAfPluginDoorLockCredentialInfo mLockCredentials;
+    EmberAfPluginDoorLockUserInfo mLockUsers[DOOR_LOCK_MAX_USERS];
+    EmberAfPluginDoorLockCredentialInfo mLockCredentials[MAX_CREDENTIALS];
 
-    char mUserName[DOOR_LOCK_MAX_USER_NAME_SIZE];
-    uint8_t mCredentialData[DOOR_LOCK_MAX_CREDENTIAL_SIZE];
-    chip::Platform::ScopedMemoryBuffer<DlCredential> mCredentials;
     uint8_t mMaxCredentialsPerUser;
+    uint16_t mMaxUsers;
+
+    char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
+    uint8_t mCredentialData[MAX_CREDENTIALS][DOOR_LOCK_MAX_CREDENTIAL_SIZE];
+    chip::Platform::ScopedMemoryBuffer<DlCredential> mCredentials[MAX_CREDENTIAL_PER_USER];
 
     static LockManager sLock;
 };
diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp
index 2df296d38e49fb..d3cc7e9a6f17d6 100644
--- a/examples/lock-app/efr32/src/AppTask.cpp
+++ b/examples/lock-app/efr32/src/AppTask.cpp
@@ -245,9 +245,18 @@ CHIP_ERROR AppTask::Init()
                      endpointId);
         maxCredentialsPerUser = 5;
     }
+
+    uint16_t numberOfSupportedUsers = 0;
+    if (!DoorLockServer::Instance().GetNumberOfUserSupported(endpointId, numberOfSupportedUsers))
+    {
+        ChipLogError(Zcl,
+                     "Unable to get number of supported users when initializing lock endpoint, defaulting to 10 [endpointId=%d]",
+                     endpointId);
+        numberOfSupportedUsers = 10;
+    }
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
-    err = LockMgr().Init(state, maxCredentialsPerUser);
+    err = LockMgr().Init(state, maxCredentialsPerUser, numberOfSupportedUsers);
     if (err != CHIP_NO_ERROR)
     {
         EFR32_LOG("LockMgr().Init() failed");
@@ -275,7 +284,7 @@ CHIP_ERROR AppTask::Init()
     ConfigurationMgr().LogDeviceConfig();
 
 // Print setup info on LCD if available
-#ifdef DISPLAY_ENABLED
+#ifdef QR_CODE_ENABLED
     // Create buffer for QR code that can fit max size and null terminator.
     char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
     chip::MutableCharSpan QRCode(qrCodeBuffer);
@@ -290,7 +299,7 @@ CHIP_ERROR AppTask::Init()
     }
 #else
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
-#endif
+#endif // QR_CODE_ENABLED
 
     return err;
 }
diff --git a/examples/lock-app/efr32/src/LockManager.cpp b/examples/lock-app/efr32/src/LockManager.cpp
index 1d2d30559a24d6..6398ff3f6f5483 100644
--- a/examples/lock-app/efr32/src/LockManager.cpp
+++ b/examples/lock-app/efr32/src/LockManager.cpp
@@ -22,6 +22,7 @@
 #include "AppConfig.h"
 #include "AppTask.h"
 #include <FreeRTOS.h>
+#include <app-common/zap-generated/attributes/Accessors.h>
 #include <cstring>
 #include <lib/support/logging/CHIPLogging.h>
 
@@ -32,16 +33,28 @@ TimerHandle_t sLockTimer;
 using namespace ::chip::DeviceLayer::Internal;
 
 CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
-                             uint8_t maxNumberOfCredentialsPerUser)
+                             uint8_t maxNumberOfCredentialsPerUser, uint16_t numberOfSupportedUsers)
 {
-    // Allocate buffer for credentials
-    if (!mCredentials.Alloc(maxNumberOfCredentialsPerUser))
+    for (uint8_t i = 0; i < ArraySize(mLockUsers); i++)
     {
-        EFR32_LOG("Failed to allocate array for lock credentials");
-        return APP_ERROR_ALLOCATION_FAILED;
+        // Allocate buffer for credentials
+        if (!mCredentials[i].Alloc(maxNumberOfCredentialsPerUser))
+        {
+            EFR32_LOG("Failed to allocate array for lock credentials");
+            return APP_ERROR_ALLOCATION_FAILED;
+        }
     }
+
     mMaxCredentialsPerUser = maxNumberOfCredentialsPerUser;
 
+    mMaxUsers = numberOfSupportedUsers;
+    if (mMaxUsers > DOOR_LOCK_MAX_USERS)
+    {
+        EFR32_LOG("Max number of users is greater than %d, the maximum amount of users currently supported on this platform",
+                  DOOR_LOCK_MAX_USERS);
+        return APP_ERROR_ALLOCATION_FAILED;
+    }
+
     // Create FreeRTOS sw timer for lock timer.
     sLockTimer = xTimerCreate("lockTmr",        // Just a text name, not used by the RTOS kernel
                               1,                // == default timer period (mS)
@@ -67,17 +80,20 @@ CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters:
 bool LockManager::ReadConfigValues()
 {
     size_t outLen;
-    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_LockUser, reinterpret_cast<uint8_t *>(&mLockUser),
-                                    sizeof(EmberAfPluginDoorLockUserInfo), outLen);
+    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_LockUser, reinterpret_cast<uint8_t *>(&mLockUsers),
+                                    sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), outLen);
+
     EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
-                                    sizeof(EmberAfPluginDoorLockCredentialInfo), outLen);
+                                    sizeof(EmberAfPluginDoorLockCredentialInfo) * ArraySize(mLockCredentials), outLen);
 
-    EFR32Config::ReadConfigValueStr(EFR32Config::kConfigKey_LockUserName, mUserName, DOOR_LOCK_USER_NAME_BUFFER_SIZE, outLen);
+    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_LockUserName, reinterpret_cast<uint8_t *>(mUserNames),
+                                    sizeof(mUserNames), outLen);
 
-    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_CredentialData, mCredentialData, sizeof(mCredentialData), outLen);
+    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_CredentialData, reinterpret_cast<uint8_t *>(mCredentialData),
+                                    sizeof(mCredentialData), outLen);
 
-    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials.Get()),
-                                    sizeof(DlCredential), outLen);
+    EFR32Config::ReadConfigValueBin(EFR32Config::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials[0].Get()),
+                                    sizeof(DlCredential) * mMaxUsers * mMaxCredentialsPerUser, outLen);
 
     return true;
 }
@@ -212,39 +228,46 @@ bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteS
     return setLockState(endpointId, DlLockState::kUnlocked, pin, err);
 }
 
-bool LockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const
+bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const
 {
-    // chip::ByteSpan credentialData(mLockCredentials.credentialData, mLockCredentials.credentialDataSize);
-    ChipLogProgress(Zcl, "Door Lock App: LockManager::GetUser [endpoint=%d,userIndex=%hu]", mEndpointId, userIndex);
+    uint16_t adjustedUserIndex = userIndex - 1;
+
+    ChipLogProgress(Zcl, "Door Lock App: LockManager::GetUser [endpoint=%d,userIndex=%hu]", endpointId, adjustedUserIndex);
 
-    const auto & userInDb = mLockUser;
-    user.userStatus       = userInDb.userStatus;
+    // door-lock-server checks for valid user index
+    const auto & userInDb = mLockUsers[adjustedUserIndex];
+
+    user.userStatus = userInDb.userStatus;
     if (DlUserStatus::kAvailable == user.userStatus)
     {
-        ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", mEndpointId);
+        ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const DlCredential>(userInDb.credentials.data(), userInDb.credentials.size());
+    user.credentials    = chip::Span<const DlCredential>(mCredentials[adjustedUserIndex].Get(), userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
-    user.createdBy      = userInDb.createdBy;
-    user.lastModifiedBy = userInDb.lastModifiedBy;
+    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
+    // source to Matter
+    user.creationSource     = DlAssetSource::kMatterIM;
+    user.createdBy          = userInDb.createdBy;
+    user.modificationSource = DlAssetSource::kMatterIM;
+    user.lastModifiedBy     = userInDb.lastModifiedBy;
 
     ChipLogDetail(Zcl,
                   "Found occupied user "
                   "[endpoint=%d,name=\"%.*s\",credentialsCount=%u,uniqueId=%lx,type=%u,credentialRule=%u,"
                   "createdBy=%d,lastModifiedBy=%d]",
-                  mEndpointId, static_cast<int>(user.userName.size()), user.userName.data(), user.credentials.size(),
+                  endpointId, static_cast<int>(user.userName.size()), user.userName.data(), user.credentials.size(),
                   user.userUniqueId, to_underlying(user.userType), to_underlying(user.credentialRule), user.createdBy,
                   user.lastModifiedBy);
 
     return true;
 }
 
-bool LockManager::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
+bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
                           const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
                           DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
 {
@@ -252,27 +275,29 @@ bool LockManager::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::F
                     "Door Lock App: LockManager::SetUser "
                     "[endpoint=%d,userIndex=%d,creator=%d,modifier=%d,userName=%s,uniqueId=%ld "
                     "userStatus=%u,userType=%u,credentialRule=%u,credentials=%p,totalCredentials=%u]",
-                    mEndpointId, userIndex, creator, modifier, userName.data(), uniqueId, to_underlying(userStatus),
+                    endpointId, userIndex, creator, modifier, userName.data(), uniqueId, to_underlying(userStatus),
                     to_underlying(usertype), to_underlying(credentialRule), credentials, totalCredentials);
 
-    auto & userInStorage = mLockUser;
+    uint16_t adjustedUserIndex = userIndex - 1;
+
+    // door-lock-server checks for valid user index
+    auto & userInStorage = mLockUsers[adjustedUserIndex];
 
     if (userName.size() > DOOR_LOCK_MAX_USER_NAME_SIZE)
     {
-        ChipLogError(Zcl, "Cannot set user - user name is too long [endpoint=%d,index=%d]", mEndpointId, userIndex);
+        ChipLogError(Zcl, "Cannot set user - user name is too long [endpoint=%d,index=%d]", endpointId, adjustedUserIndex);
         return false;
     }
 
     if (totalCredentials > mMaxCredentialsPerUser)
     {
         ChipLogError(Zcl, "Cannot set user - total number of credentials is too big [endpoint=%d,index=%d,totalCredentials=%u]",
-                     mEndpointId, userIndex, totalCredentials);
+                     endpointId, adjustedUserIndex, totalCredentials);
         return false;
     }
 
-    chip::Platform::CopyString(mUserName, userName);
-    mUserName[userName.size()]   = 0;
-    userInStorage.userName       = chip::CharSpan(mUserName, userName.size());
+    chip::Platform::CopyString(mUserNames[adjustedUserIndex], userName);
+    userInStorage.userName       = chip::CharSpan(mUserNames[adjustedUserIndex], userName.size());
     userInStorage.userUniqueId   = uniqueId;
     userInStorage.userStatus     = userStatus;
     userInStorage.userType       = usertype;
@@ -282,23 +307,25 @@ bool LockManager::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::F
 
     for (size_t i = 0; i < totalCredentials; ++i)
     {
-        mCredentials[i]                 = credentials[i];
-        mCredentials[i].CredentialType  = 1;
-        mCredentials[i].CredentialIndex = i + 1;
+        mCredentials[adjustedUserIndex][i]                 = credentials[i];
+        mCredentials[adjustedUserIndex][i].CredentialType  = 1;
+        mCredentials[adjustedUserIndex][i].CredentialIndex = i + 1;
     }
 
-    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials.Get(), totalCredentials);
+    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials[adjustedUserIndex].Get(), totalCredentials);
 
     // Save user information in NVM flash
-    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&userInStorage),
-                                     sizeof(EmberAfPluginDoorLockUserInfo));
+    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&mLockUsers),
+                                     sizeof(EmberAfPluginDoorLockUserInfo) * mMaxUsers);
 
-    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials.Get()),
-                                     sizeof(DlCredential));
+    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_UserCredentials,
+                                     reinterpret_cast<const uint8_t *>(mCredentials[adjustedUserIndex].Get()),
+                                     sizeof(DlCredential) * totalCredentials);
 
-    EFR32Config::WriteConfigValueStr(EFR32Config::kConfigKey_LockUserName, mUserName, sizeof(userName.size()));
+    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
+                                     sizeof(mUserNames));
 
-    ChipLogProgress(Zcl, "Successfully set the user [mEndpointId=%d,index=%d]", mEndpointId, userIndex);
+    ChipLogProgress(Zcl, "Successfully set the user [mEndpointId=%d,index=%d]", endpointId, adjustedUserIndex);
 
     return true;
 }
@@ -306,11 +333,18 @@ bool LockManager::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::F
 bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential) const
 {
-    ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u]", to_underlying(credentialType));
 
-    const auto & credentialInStorage = mLockCredentials;
+    uint16_t adjustedCredentialIndex = credentialIndex - 1;
+
+    ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
+                    to_underlying(credentialType), adjustedCredentialIndex);
+
+    // door-lock-server checks for valid credential index
+    const auto & credentialInStorage = mLockCredentials[adjustedCredentialIndex];
 
     credential.status = credentialInStorage.status;
+    ChipLogDetail(Zcl, "CredentialStatus: %d, CredentialIndex: %d ", (int) credential.status, adjustedCredentialIndex);
+
     if (DlCredentialStatus::kAvailable == credential.status)
     {
         ChipLogDetail(Zcl, "Found unoccupied credential ");
@@ -318,6 +352,12 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
     }
     credential.credentialType = credentialInStorage.credentialType;
     credential.credentialData = credentialInStorage.credentialData;
+    credential.createdBy      = credentialInStorage.createdBy;
+    credential.lastModifiedBy = credentialInStorage.lastModifiedBy;
+    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
+    // source to Matter
+    credential.creationSource     = DlAssetSource::kMatterIM;
+    credential.modificationSource = DlAssetSource::kMatterIM;
 
     ChipLogDetail(Zcl, "Found occupied credential [type=%u,dataSize=%u]", to_underlying(credential.credentialType),
                   credential.credentialData.size());
@@ -325,15 +365,20 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
     return true;
 }
 
-bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus,
-                                DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                const chip::ByteSpan & credentialData)
 {
     ChipLogProgress(Zcl,
                     "Door Lock App: LockManager::SetCredential "
-                    "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u]",
-                    to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size());
+                    "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u,creator=%d,modifier=%d]",
+                    to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size(), creator, modifier);
+
+    uint16_t adjustedCredentialIndex = credentialIndex - 1;
+
+    // door-lock-server checks for valid credential index
+    auto & credentialInStorage = mLockCredentials[adjustedCredentialIndex];
 
-    auto & credentialInStorage = mLockCredentials;
     if (credentialData.size() > DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE)
     {
         ChipLogError(Zcl,
@@ -344,18 +389,18 @@ bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credential
     }
     credentialInStorage.status         = credentialStatus;
     credentialInStorage.credentialType = credentialType;
+    credentialInStorage.createdBy      = creator;
+    credentialInStorage.lastModifiedBy = modifier;
 
-    memcpy(mCredentialData, credentialData.data(), credentialData.size());
-    mCredentialData[credentialData.size()] = 0;
-
-    credentialInStorage.credentialData = chip::ByteSpan{ mCredentialData, credentialData.size() };
+    memcpy(mCredentialData[adjustedCredentialIndex], credentialData.data(), credentialData.size());
+    credentialInStorage.credentialData = chip::ByteSpan{ mCredentialData[adjustedCredentialIndex], credentialData.size() };
 
-    // Save user information in NVM flash
-    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_Credential, reinterpret_cast<const uint8_t *>(&credentialInStorage),
-                                     sizeof(EmberAfPluginDoorLockCredentialInfo));
+    // Save credential information in NVM flash
+    EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_Credential, reinterpret_cast<const uint8_t *>(&mLockCredentials),
+                                     sizeof(EmberAfPluginDoorLockCredentialInfo) * mMaxCredentialsPerUser);
 
     EFR32Config::WriteConfigValueBin(EFR32Config::kConfigKey_CredentialData, reinterpret_cast<const uint8_t *>(&mCredentialData),
-                                     credentialData.size());
+                                     sizeof(mCredentialData));
 
     ChipLogProgress(Zcl, "Successfully set the credential [credentialType=%u]", to_underlying(credentialType));
 
@@ -384,31 +429,52 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     if (mState == kState_UnlockCompleted)
         curState = DlLockState::kUnlocked;
 
-    if (curState == lockState)
+    if ((curState == lockState) && (curState == DlLockState::kLocked))
     {
         ChipLogDetail(Zcl, "Door Lock App: door is already locked, ignoring command to set lock state to \"%s\" [endpointId=%d]",
-                      lockStateToString(lockState), mEndpointId);
-        return false;
+                      lockStateToString(lockState), endpointId);
+        return true;
+    }
+    else if ((curState == lockState) && (curState == DlLockState::kUnlocked))
+    {
+        ChipLogDetail(Zcl,
+                      "Door Lock App: door is already unlocked, ignoring command to set unlock state to \"%s\" [endpointId=%d]",
+                      lockStateToString(lockState), endpointId);
+        return true;
     }
 
+    // Check the RequirePINforRemoteOperation attribute
+    bool requirePin = false;
+    // chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::Get(endpointId, &requirePin);
+
+    // If a pin code is not given
     if (!pin.HasValue())
     {
-        ChipLogDetail(Zcl, "Door Lock App: PIN code is not specified, setting door lock state to \"%s\" [endpointId=%d]",
-                      lockStateToString(lockState), mEndpointId);
+        ChipLogDetail(Zcl, "Door Lock App: PIN code is not specified, but it is required [endpointId=%d]", mEndpointId);
         curState = lockState;
 
-        return true;
+        // If a pin code is not required
+        if (!requirePin)
+        {
+            ChipLogDetail(Zcl, "Door Lock App: setting door lock state to \"%s\" [endpointId=%d]", lockStateToString(lockState),
+                          endpointId);
+            curState = lockState;
+            return true;
+        }
+
+        return false;
     }
 
     // Check the PIN code
-    for (uint8_t i; i < 10; i++)
+    for (uint8_t i = 0; i < mMaxCredentialsPerUser; i++)
     {
-        if (mLockCredentials.credentialType != DlCredentialType::kPin || mLockCredentials.status == DlCredentialStatus::kAvailable)
+        if (mLockCredentials[i].credentialType != DlCredentialType::kPin ||
+            mLockCredentials[i].status == DlCredentialStatus::kAvailable)
         {
             continue;
         }
 
-        if (mLockCredentials.credentialData.data_equal(pin.Value()))
+        if (mLockCredentials[i].credentialData.data_equal(pin.Value()))
         {
             ChipLogDetail(Zcl,
                           "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
diff --git a/examples/lock-app/efr32/src/ZclCallbacks.cpp b/examples/lock-app/efr32/src/ZclCallbacks.cpp
index daf244afb477bf..8fb775956a4c30 100644
--- a/examples/lock-app/efr32/src/ZclCallbacks.cpp
+++ b/examples/lock-app/efr32/src/ZclCallbacks.cpp
@@ -90,15 +90,17 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
     return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
 }
 
-bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus,
+bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
+                                        chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
                                         DlCredentialType credentialType, const chip::ByteSpan & credentialData)
 {
-    return LockMgr().SetCredential(endpointId, credentialIndex, credentialStatus, credentialType, credentialData);
+    return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
+                                   credentialData);
 }
 
 bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
 {
-    return LockMgr().GetUser(userIndex, user);
+    return LockMgr().GetUser(endpointId, userIndex, user);
 }
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
@@ -107,8 +109,8 @@ bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userInde
                                   const DlCredential * credentials, size_t totalCredentials)
 {
 
-    return LockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, credentials,
-                             totalCredentials);
+    return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
+                             credentials, totalCredentials);
 }
 
 // TODO: These functions will be supported by door-lock-server in the future. These are set to return failure until implemented.
diff --git a/examples/lock-app/esp32/CMakeLists.txt b/examples/lock-app/esp32/CMakeLists.txt
index 19a85fb5c992d7..3bcab4dbab199e 100644
--- a/examples/lock-app/esp32/CMakeLists.txt
+++ b/examples/lock-app/esp32/CMakeLists.txt
@@ -42,6 +42,8 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 if (CONFIG_ENABLE_PW_RPC)
 get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
 include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.esp32)
diff --git a/examples/lock-app/linux/include/LockEndpoint.h b/examples/lock-app/linux/include/LockEndpoint.h
index bee91e7265239f..503d08fab6679c 100644
--- a/examples/lock-app/linux/include/LockEndpoint.h
+++ b/examples/lock-app/linux/include/LockEndpoint.h
@@ -36,6 +36,7 @@ struct LockUserInfo
 struct LockCredentialInfo;
 struct WeekDaysScheduleInfo;
 struct YearDayScheduleInfo;
+struct HolidayScheduleInfo;
 
 static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE = 20;
 
@@ -43,17 +44,21 @@ class LockEndpoint
 {
 public:
     LockEndpoint(chip::EndpointId endpointId, uint16_t numberOfLockUsersSupported, uint16_t numberOfCredentialsSupported,
-                 uint8_t weekDaySchedulesPerUser, uint8_t yearDaySchedulesPerUser, uint8_t numberOfCredentialsPerUser) :
+                 uint8_t weekDaySchedulesPerUser, uint8_t yearDaySchedulesPerUser, uint8_t numberOfCredentialsPerUser,
+                 uint8_t numberOfHolidaySchedules) :
         mEndpointId{ endpointId },
         mLockState{ DlLockState::kLocked }, mLockUsers(numberOfLockUsersSupported),
         mLockCredentials(numberOfCredentialsSupported + 1),
         mWeekDaySchedules(numberOfLockUsersSupported, std::vector<WeekDaysScheduleInfo>(weekDaySchedulesPerUser)),
-        mYearDaySchedules(numberOfLockUsersSupported, std::vector<YearDayScheduleInfo>(yearDaySchedulesPerUser))
+        mYearDaySchedules(numberOfLockUsersSupported, std::vector<YearDayScheduleInfo>(yearDaySchedulesPerUser)),
+        mHolidaySchedules(numberOfHolidaySchedules)
     {
         for (auto & lockUser : mLockUsers)
         {
             lockUser.credentials.reserve(numberOfCredentialsPerUser);
         }
+
+        DoorLockServer::Instance().SetLockState(endpointId, mLockState);
     }
 
     inline chip::EndpointId GetEndpointId() const { return mEndpointId; }
@@ -74,10 +79,14 @@ class LockEndpoint
 
     DlStatus GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule);
     DlStatus GetSchedule(uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule);
+    DlStatus GetSchedule(uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
+
     DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask,
                          uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
     DlStatus SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime,
                          uint32_t localEndTime);
+    DlStatus SetSchedule(uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime,
+                         DlOperatingMode operatingMode);
 
 private:
     bool setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
@@ -92,6 +101,7 @@ class LockEndpoint
     std::vector<LockCredentialInfo> mLockCredentials;
     std::vector<std::vector<WeekDaysScheduleInfo>> mWeekDaySchedules;
     std::vector<std::vector<YearDayScheduleInfo>> mYearDaySchedules;
+    std::vector<HolidayScheduleInfo> mHolidaySchedules;
 };
 
 struct LockCredentialInfo
@@ -115,3 +125,9 @@ struct YearDayScheduleInfo
     DlScheduleStatus status;
     EmberAfPluginDoorLockYearDaySchedule schedule;
 };
+
+struct HolidayScheduleInfo
+{
+    DlScheduleStatus status;
+    EmberAfPluginDoorLockHolidaySchedule schedule;
+};
diff --git a/examples/lock-app/linux/include/LockManager.h b/examples/lock-app/linux/include/LockManager.h
index 56c5535fee095b..9631796e2b7d82 100644
--- a/examples/lock-app/linux/include/LockManager.h
+++ b/examples/lock-app/linux/include/LockManager.h
@@ -49,10 +49,14 @@ class LockManager
                          EmberAfPluginDoorLockWeekDaySchedule & schedule);
     DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                          EmberAfPluginDoorLockYearDaySchedule & schedule);
+    DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
+
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status,
                          DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status,
                          uint32_t localStartTime, uint32_t localEndTime);
+    DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
+                         uint32_t localEndTime, DlOperatingMode operatingMode);
 
     static LockManager & Instance();
 
diff --git a/examples/lock-app/linux/src/LockEndpoint.cpp b/examples/lock-app/linux/src/LockEndpoint.cpp
index 404fecebff0913..605fb1dd2f5537 100644
--- a/examples/lock-app/linux/src/LockEndpoint.cpp
+++ b/examples/lock-app/linux/src/LockEndpoint.cpp
@@ -55,8 +55,12 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
-    user.createdBy      = userInDb.createdBy;
-    user.lastModifiedBy = userInDb.lastModifiedBy;
+    // So far there's no way to actually create the credential outside the matter, so here we always set the creation/modification
+    // source to Matter
+    user.creationSource     = DlAssetSource::kMatterIM;
+    user.createdBy          = userInDb.createdBy;
+    user.modificationSource = DlAssetSource::kMatterIM;
+    user.lastModifiedBy     = userInDb.lastModifiedBy;
 
     ChipLogDetail(Zcl,
                   "Found occupied user "
@@ -151,8 +155,12 @@ bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType cred
     }
     credential.credentialType = credentialInStorage.credentialType;
     credential.credentialData = chip::ByteSpan(credentialInStorage.credentialData, credentialInStorage.credentialDataSize);
-    credential.createdBy      = credentialInStorage.createdBy;
-    credential.lastModifiedBy = credentialInStorage.modifiedBy;
+    // So far there's no way to actually create the credential outside the matter, so here we always set the creation/modification
+    // source to Matter
+    credential.creationSource     = DlAssetSource::kMatterIM;
+    credential.createdBy          = credentialInStorage.createdBy;
+    credential.modificationSource = DlAssetSource::kMatterIM;
+    credential.lastModifiedBy     = credentialInStorage.modifiedBy;
 
     ChipLogDetail(Zcl, "Found occupied credential [endpoint=%d,index=%u,type=%u,dataSize=%u,createdBy=%u,modifiedBy=%u]",
                   mEndpointId, credentialIndex, to_underlying(credential.credentialType),
@@ -294,6 +302,40 @@ DlStatus LockEndpoint::SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlS
     return DlStatus::kSuccess;
 }
 
+DlStatus LockEndpoint::GetSchedule(uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule)
+{
+    if (0 == holidayIndex || holidayIndex > mHolidaySchedules.size())
+    {
+        return DlStatus::kFailure;
+    }
+
+    const auto & scheduleInStorage = mHolidaySchedules[holidayIndex - 1];
+    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
+    {
+        return DlStatus::kNotFound;
+    }
+
+    schedule = scheduleInStorage.schedule;
+    return DlStatus::kSuccess;
+}
+
+DlStatus LockEndpoint::SetSchedule(uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime,
+                                   DlOperatingMode operatingMode)
+{
+    if (0 == holidayIndex || holidayIndex > mHolidaySchedules.size())
+    {
+        return DlStatus::kFailure;
+    }
+
+    auto & scheduleInStorage                  = mHolidaySchedules[holidayIndex - 1];
+    scheduleInStorage.schedule.localStartTime = localStartTime;
+    scheduleInStorage.schedule.localEndTime   = localEndTime;
+    scheduleInStorage.schedule.operatingMode  = operatingMode;
+    scheduleInStorage.status                  = status;
+
+    return DlStatus::kSuccess;
+}
+
 bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
 {
     if (!pin.HasValue())
diff --git a/examples/lock-app/linux/src/LockManager.cpp b/examples/lock-app/linux/src/LockManager.cpp
index 2858be79db2f74..630738796a2b49 100644
--- a/examples/lock-app/linux/src/LockManager.cpp
+++ b/examples/lock-app/linux/src/LockManager.cpp
@@ -89,15 +89,25 @@ bool LockManager::InitEndpoint(chip::EndpointId endpointId)
         numberOfYearDaySchedulesPerUser = 10;
     }
 
+    uint8_t numberOfHolidaySchedules = 0;
+    if (!DoorLockServer::Instance().GetNumberOfHolidaySchedulesSupported(endpointId, numberOfHolidaySchedules))
+    {
+        ChipLogError(
+            Zcl,
+            "Unable to get number of supported holiday schedules when initializing lock endpoint, defaulting to 10 [endpointId=%d]",
+            endpointId);
+        numberOfHolidaySchedules = 10;
+    }
+
     mEndpoints.emplace_back(endpointId, numberOfSupportedUsers, numberOfSupportedCredentials, numberOfWeekDaySchedulesPerUser,
-                            numberOfYearDaySchedulesPerUser, numberOfCredentialsSupportedPerUser);
+                            numberOfYearDaySchedulesPerUser, numberOfCredentialsSupportedPerUser, numberOfHolidaySchedules);
 
     ChipLogProgress(Zcl,
                     "Initialized new lock door endpoint "
                     "[id=%d,users=%d,credentials=%d,weekDaySchedulesPerUser=%d,yearDaySchedulesPerUser=%d,"
-                    "numberOfCredentialsSupportedPerUser=%d]",
+                    "numberOfCredentialsSupportedPerUser=%d,holidaySchedules=%d]",
                     endpointId, numberOfSupportedUsers, numberOfSupportedCredentials, numberOfWeekDaySchedulesPerUser,
-                    numberOfYearDaySchedulesPerUser, numberOfCredentialsSupportedPerUser);
+                    numberOfYearDaySchedulesPerUser, numberOfCredentialsSupportedPerUser, numberOfHolidaySchedules);
 
     return true;
 }
@@ -227,6 +237,32 @@ DlStatus LockManager::SetSchedule(chip::EndpointId endpointId, uint8_t yearDayIn
     return lockEndpoint->SetSchedule(yearDayIndex, userIndex, status, localStartTime, localEndTime);
 }
 
+DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
+                                  EmberAfPluginDoorLockHolidaySchedule & schedule)
+{
+    auto lockEndpoint = getEndpoint(endpointId);
+    if (nullptr == lockEndpoint)
+    {
+        ChipLogError(Zcl, "Unable to get the holiday schedule - endpoint does not exist or not initialized [endpointId=%d]",
+                     endpointId);
+        return DlStatus::kFailure;
+    }
+    return lockEndpoint->GetSchedule(holidayIndex, schedule);
+}
+
+DlStatus LockManager::SetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
+                                  uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+{
+    auto lockEndpoint = getEndpoint(endpointId);
+    if (nullptr == lockEndpoint)
+    {
+        ChipLogError(Zcl, "Unable to set the holiday schedule - endpoint does not exist or not initialized [endpointId=%d]",
+                     endpointId);
+        return DlStatus::kFailure;
+    }
+    return lockEndpoint->SetSchedule(holidayIndex, status, localStartTime, localEndTime, operatingMode);
+}
+
 LockEndpoint * LockManager::getEndpoint(chip::EndpointId endpointId)
 {
     for (auto & mEndpoint : mEndpoints)
diff --git a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp
index ae696ef58c7d86..b5ef3a760d64dc 100644
--- a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp
+++ b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp
@@ -56,6 +56,12 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t w
     return LockManager::Instance().GetSchedule(endpointId, weekdayIndex, userIndex, schedule);
 }
 
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
+                                          EmberAfPluginDoorLockHolidaySchedule & schedule)
+{
+    return LockManager::Instance().GetSchedule(endpointId, holidayIndex, schedule);
+}
+
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
                                           DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
@@ -76,6 +82,12 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t y
     return LockManager::Instance().GetSchedule(endpointId, yearDayIndex, userIndex, schedule);
 }
 
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
+                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+{
+    return LockManager::Instance().SetSchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
+}
+
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 1fd3d998899224..5cd6c2ca19741e 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -388,16 +388,6 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlAlarmMask : BITMAP16 {
-    kLockingMechanismJammed = 0x1;
-    kLockResetToFactoryDefaults = 0x2;
-    kReserved = 0x4;
-    kRFModulePowerCycled = 0x8;
-    kWrongCodeEntryLimit = 0x10;
-    kFrontEscutcheonRemovedFromMain = 0x20;
-    kForcedDoorOpenUnderDoorLockedCondition = 0x40;
-  }
-
   bitmap DlCredentialRuleMask : BITMAP8 {
     kSingle = 0x1;
     kDual = 0x2;
@@ -587,6 +577,7 @@ server cluster DoorLock = 257 {
   readonly attribute int16u numberOfRFIDUsersSupported = 19;
   readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
   readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
+  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
   readonly attribute int8u maxPINCodeLength = 23;
   readonly attribute int8u minPINCodeLength = 24;
   readonly attribute int8u maxRFIDCodeLength = 25;
@@ -602,7 +593,6 @@ server cluster DoorLock = 257 {
   attribute access(write: manage) boolean enablePrivacyModeButton = 43;
   attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
   attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
-  attribute access(write: administer) boolean requirePINforRemoteOperation = 51;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
@@ -656,6 +646,21 @@ server cluster DoorLock = 257 {
     INT16U userIndex = 1;
   }
 
+  request struct SetHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
+    epoch_s localStartTime = 1;
+    epoch_s localEndTime = 2;
+    DlOperatingMode operatingMode = 3;
+  }
+
+  request struct GetHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
+  }
+
+  request struct ClearHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
+  }
+
   request struct SetUserRequest {
     DlDataOperationType operationType = 0;
     INT16U userIndex = 1;
@@ -710,6 +715,14 @@ server cluster DoorLock = 257 {
     optional epoch_s localEndTime = 4;
   }
 
+  response struct GetHolidayScheduleResponse = 18 {
+    INT8U holidayIndex = 0;
+    DlStatus status = 1;
+    optional epoch_s localStartTime = 2;
+    optional epoch_s localEndTime = 3;
+    optional DlOperatingMode operatingMode = 4;
+  }
+
   response struct GetUserResponse = 28 {
     INT16U userIndex = 0;
     nullable CHAR_STRING userName = 1;
@@ -746,6 +759,9 @@ server cluster DoorLock = 257 {
   command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
   command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
   command access(invoke: administer) ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16;
+  command access(invoke: administer) SetHolidaySchedule(SetHolidayScheduleRequest): DefaultSuccess = 17;
+  command access(invoke: administer) GetHolidaySchedule(GetHolidayScheduleRequest): GetHolidayScheduleResponse = 18;
+  command access(invoke: administer) ClearHolidaySchedule(ClearHolidayScheduleRequest): DefaultSuccess = 19;
   timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
   command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
   timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
@@ -935,8 +951,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster Groups = 4 {
@@ -1360,6 +1384,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1400,13 +1425,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1427,10 +1453,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1459,7 +1481,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster PowerSource = 47 {
@@ -1547,12 +1568,16 @@ server cluster PowerSourceConfiguration = 46 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1654,7 +1679,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1662,11 +1687,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1709,12 +1734,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1819,8 +1844,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Descriptor {
@@ -1944,6 +1969,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1958,67 +1984,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -2088,8 +2114,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type doorlock = 10;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -2144,6 +2170,7 @@ endpoint 1 {
     ram      attribute numberOfRFIDUsersSupported default = 10;
     ram      attribute numberOfWeekDaySchedulesSupportedPerUser default = 10;
     ram      attribute numberOfYearDaySchedulesSupportedPerUser default = 10;
+    ram      attribute numberOfHolidaySchedulesSupported default = 10;
     ram      attribute maxPINCodeLength default = 8;
     ram      attribute minPINCodeLength default = 6;
     ram      attribute maxRFIDCodeLength default = 20;
@@ -2159,8 +2186,7 @@ endpoint 1 {
     ram      attribute enablePrivacyModeButton;
     ram      attribute wrongCodeEntryLimit default = 3;
     ram      attribute userCodeTemporaryDisableTime default = 10;
-    ram      attribute requirePINforRemoteOperation;
-    ram      attribute featureMap default = 0x113;
+    ram      attribute featureMap default = 0x133;
     ram      attribute clusterRevision default = 6;
   }
 }
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 04a7905e06bf85..c4ce3db3e46ad9 100755
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -2797,7 +2797,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2927,6 +2936,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3156,7 +3181,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3170,9 +3195,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3188,7 +3213,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3204,7 +3229,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3220,7 +3245,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3236,7 +3261,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3252,7 +3277,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3300,7 +3325,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3316,7 +3341,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3332,7 +3357,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3348,7 +3373,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3364,7 +3389,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3380,7 +3405,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3396,7 +3421,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3412,7 +3437,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3428,7 +3453,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3444,7 +3469,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3460,7 +3485,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3476,7 +3501,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3492,7 +3517,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3508,7 +3533,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3524,7 +3549,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3540,7 +3565,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3556,7 +3581,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3572,7 +3597,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3588,7 +3613,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3604,7 +3629,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3620,7 +3645,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3636,7 +3661,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3652,7 +3677,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3668,7 +3693,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3684,7 +3709,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3700,7 +3725,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3716,7 +3741,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3732,7 +3757,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3748,7 +3773,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3764,7 +3789,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3780,7 +3805,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3796,7 +3821,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3812,7 +3837,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3828,7 +3853,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3844,7 +3869,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3860,7 +3885,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3876,7 +3901,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3892,7 +3917,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3908,7 +3933,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3924,7 +3949,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3940,7 +3965,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3956,7 +3981,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3972,7 +3997,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3988,7 +4013,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4004,7 +4029,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4020,7 +4045,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4036,7 +4061,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4052,7 +4077,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4068,7 +4093,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4084,7 +4109,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4098,7 +4123,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4116,7 +4141,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4130,7 +4155,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4915,14 +4940,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -7133,6 +7150,30 @@
               "incoming": 1,
               "outgoing": 0
             },
+            {
+              "name": "SetHolidaySchedule",
+              "code": 17,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "GetHolidaySchedule",
+              "code": 18,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ClearHolidaySchedule",
+              "code": 19,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
             {
               "name": "SetUser",
               "code": 26,
@@ -7225,6 +7266,14 @@
               "incoming": 0,
               "outgoing": 1
             },
+            {
+              "name": "GetHolidayScheduleResponse",
+              "code": 18,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
             {
               "name": "GetUserResponse",
               "code": 28,
@@ -7363,22 +7412,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "NumberOfLogRecordsSupported",
-              "code": 16,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NumberOfTotalUsersSupported",
               "code": 17,
@@ -7465,11 +7498,11 @@
               "mfgCode": null,
               "side": "server",
               "type": "int8u",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "10",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7571,22 +7604,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -7833,7 +7850,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "boolean",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -7859,134 +7876,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -8045,7 +7934,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x113",
+              "defaultValue": "0x133",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -8193,5 +8082,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 10
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
index 94d5c298913c2e..5917cfe34a8d95 100644
--- a/examples/lock-app/nrfconnect/main/AppTask.cpp
+++ b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -22,6 +22,7 @@
 #include "LEDWidget.h"
 #include "ThreadUtil.h"
 
+#include <DeviceInfoProviderImpl.h>
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
@@ -41,8 +42,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 using namespace ::chip;
 using namespace ::chip::app;
@@ -72,6 +73,8 @@ bool sIsThreadProvisioned = false;
 bool sIsThreadEnabled     = false;
 bool sHaveBLEConnections  = false;
 
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
 } // namespace
 
 AppTask AppTask::sAppTask;
@@ -145,10 +148,7 @@ CHIP_ERROR AppTask::Init()
 #ifdef CONFIG_MCUMGR_SMP_BT
     // Initialize DFU over SMP
     GetDFUOverSMP().Init(RequestSMPAdvertisingStart);
-#ifndef CONFIG_CHIP_OTA_REQUESTOR
-    // When OTA Requestor is enabled, it is responsible for confirming new images.
     GetDFUOverSMP().ConfirmNewImage();
-#endif
 #endif
 
     // Initialize CHIP server
@@ -157,9 +157,9 @@ CHIP_ERROR AppTask::Init()
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
@@ -458,6 +458,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
         sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
index feb320b4e70ae1..deeff6024de5a3 100644
--- a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
+++ b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
@@ -21,7 +21,7 @@
 
 #include <lib/core/ClusterEnums.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <cstdint>
 
diff --git a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
index 3a6d7ab9f27f28..bfa54151bad46d 100644
--- a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -31,4 +31,4 @@
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
 
-#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 2000_ms32
+#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 20000_ms32
diff --git a/examples/lock-app/nrfconnect/main/main.cpp b/examples/lock-app/nrfconnect/main/main.cpp
index 1867a549b5b005..a20f86082131a4 100644
--- a/examples/lock-app/nrfconnect/main/main.cpp
+++ b/examples/lock-app/nrfconnect/main/main.cpp
@@ -19,7 +19,7 @@
 
 #include "AppTask.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp
index 2572cdd35a2698..015784f6d6e8dd 100644
--- a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp
+++ b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp
@@ -28,6 +28,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
+#include <inet/EndPointStateOpenThread.h>
+
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-id.h>
@@ -162,12 +164,27 @@ CHIP_ERROR AppTask::Init()
     return err;
 }
 
+void LockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().LockThreadStack();
+}
+
+void UnlockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
+}
+
 void AppTask::InitServer(intptr_t arg)
 {
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
     // Init ZCL Data Model and start server
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = LockOpenThreadTask;
+    nativeParams.unlockCb              = UnlockOpenThreadTask;
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
     VerifyOrDie((chip::Server::GetInstance().Init(initParams)) == CHIP_NO_ERROR);
 }
 
@@ -739,3 +756,5 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
         ChipLogError(NotSpecified, "ERR: updating on/off %x", status);
     }
 }
+
+extern "C" void OTAIdleActivities(void) {}
diff --git a/examples/lock-app/nxp/k32w/k32w0/main/include/app_config.h b/examples/lock-app/nxp/k32w/k32w0/main/include/app_config.h
index 1d0ff5a16b17d2..cfed43e850c4bc 100644
--- a/examples/lock-app/nxp/k32w/k32w0/main/include/app_config.h
+++ b/examples/lock-app/nxp/k32w/k32w0/main/include/app_config.h
@@ -34,8 +34,8 @@
 
 #define APP_BUTTON_PUSH 1
 
-#define LOCK_STATE_LED LED1
-#define SYSTEM_STATE_LED LED2
+#define LOCK_STATE_LED LED2
+#define SYSTEM_STATE_LED LED1
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.
diff --git a/examples/lock-app/p6/BUILD.gn b/examples/lock-app/p6/BUILD.gn
index fe3caebba8fc3e..f7eb7fb05fe233 100644
--- a/examples/lock-app/p6/BUILD.gn
+++ b/examples/lock-app/p6/BUILD.gn
@@ -17,6 +17,7 @@ import("//build_overrides/chip.gni")
 import("//build_overrides/p6.gni")
 
 import("${build_root}/config/defaults.gni")
+import("${chip_root}/src/platform/device.gni")
 import("${p6_sdk_build_root}/p6_executable.gni")
 import("${p6_sdk_build_root}/p6_sdk.gni")
 
@@ -31,8 +32,51 @@ declare_args() {
 
   # PIN code for PASE session establishment.
   setup_pin_code = 20202021
+
+  # Build update app
+  build_update_image = false
 }
 
+config("p6_ota_config") {
+  ldflags = [ "-T/" + rebase_path(
+                  "${chip_root}/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld",
+                  "/",
+                  "${p6_project_dir}") ]
+
+  ldflags += [ "-Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,MCUBOOT_BOOTLOADER_SIZE=0x18000,--defsym,CY_BOOT_PRIMARY_1_SIZE=0x1C0000" ]
+
+  defines = [
+    "P6_OTA",
+    "OTA_SUPPORT ",
+    "OTA_USE_EXTERNAL_FLASH",
+    "CY_BOOT_USE_EXTERNAL_FLASH",
+    "MCUBOOT_HEADER_SIZE=0x400",
+    "MCUBOOT_MAX_IMG_SECTORS=3584",
+    "CY_BOOT_SCRATCH_SIZE=0x00004000",
+    "MCUBOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_BOOTLOADER_SIZE=0x00018000",
+    "CY_BOOT_PRIMARY_1_START=0x00018000",
+    "CY_BOOT_PRIMARY_1_SIZE=0x1C0000",
+    "CY_BOOT_SECONDARY_1_START=0x00000000",
+    "CY_BOOT_SECONDARY_1_SIZE=0x001C0000",
+    "CY_FLASH_ERASE_VALUE=0xFF",
+    "MCUBOOT_IMAGE_NUMBER=1",
+    "MCUBOOT_SLOT_SIZE=0x1C0000",
+    "MCUBOOT_SCRATCH_SIZE=0x4000",
+    "MCUBOOT_SECTOR_SIZE = 512",
+    "APP_VERSION_MAJOR=1",
+    "APP_VERSION_MINOR=0",
+    "APP_VERSION_BUILD=0",
+    "MCUBOOT_OVERWRITE_ONLY",
+    "CY_ENABLE_XIP_PROGRAM",
+  ]
+
+  if (build_update_image) {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=2" ]
+  } else {
+    defines += [ "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=1" ]
+  }
+}
 p6_sdk_sources("lock_app_sdk_sources") {
   include_dirs = [
     "${chip_root}/src/platform/P6",
@@ -49,6 +93,27 @@ p6_sdk_sources("lock_app_sdk_sources") {
   sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ]
 
   public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/src/bootutil_misc.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_map.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_flash_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/cy_smif_psoc6.c",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/mem_config_sfdp.c",
+    ]
+    include_dirs += [
+      "${chip_root}/third_party/p6/p6_sdk/ota/config",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/flash_map_backend/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/sysflash/",
+      "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/bootutil/include",
+    ]
+    public_configs += [ ":p6_ota_config" ]
+  }
 }
 
 p6_executable("lock_app") {
diff --git a/examples/lock-app/p6/README.md b/examples/lock-app/p6/README.md
index acfa2bb2a37e74..36b1ed1a158ed4 100644
--- a/examples/lock-app/p6/README.md
+++ b/examples/lock-app/p6/README.md
@@ -13,6 +13,7 @@ An example showing the use of Matter on the Infineon CY8CKIT-062S2-43012 board.
         -   [Commissioning over BLE](#commissioning-over-ble)
             -   [Notes](#notes)
         -   [Cluster control](#cluster-control)
+    -   [OTA Software Update](#ota-software-update)
 
 <hr>
 
@@ -134,3 +135,9 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
     Press `USER_BTN1` on the board to toggle between lock and unlock states. The
     Lock/Unlock status of door can be observed with 'LED9' on the board. This
     LED is configured with `LOCK_STATE_LED` in `include/AppConfig.h`.
+
+## OTA Software Update
+
+For the description of Software Update process with infineon P6 example
+applications see
+[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md)
diff --git a/examples/lock-app/p6/include/AppTask.h b/examples/lock-app/p6/include/AppTask.h
index 854d70efdb9744..3e50921a76cff2 100644
--- a/examples/lock-app/p6/include/AppTask.h
+++ b/examples/lock-app/p6/include/AppTask.h
@@ -50,6 +50,7 @@ class AppTask
 
     void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
     void UpdateClusterState(void);
+    void InitOTARequestor();
 
 private:
     friend AppTask & GetAppTask(void);
diff --git a/examples/lock-app/p6/ota_base_build.sh b/examples/lock-app/p6/ota_base_build.sh
new file mode 100755
index 00000000000000..7ab6e27ec17fab
--- /dev/null
+++ b/examples/lock-app/p6/ota_base_build.sh
@@ -0,0 +1,8 @@
+OUT_DIR=out/lock-app/
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+scripts/examples/gn_p6_example.sh examples/lock-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true
+
+mv "$OUT_DIR"/chip-p6-lock-example.hex "$OUT_DIR"/chip-p6-lock-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-lock-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py create 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy ""
diff --git a/examples/lock-app/p6/ota_update_build.sh b/examples/lock-app/p6/ota_update_build.sh
new file mode 100755
index 00000000000000..ac5d674cd67115
--- /dev/null
+++ b/examples/lock-app/p6/ota_update_build.sh
@@ -0,0 +1,14 @@
+OUT_DIR=out/lock-app-ota
+ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
+
+./scripts/examples/gn_p6_example.sh examples/lock-app/p6 "$OUT_DIR" chip_enable_ota_requestor=true build_update_image=true
+
+mv "$OUT_DIR"/chip-p6-lock-example.hex "$OUT_DIR"/chip-p6-lock-example.unsigned.hex
+
+./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR"/ chip-p6-lock-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py sign 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy "-k $ANYCLOUD_DIR/source/mcuboot/keys/cypress-test-ec-p256.pem"
+
+if [ -f "$OUT_DIR"/chip-p6-lock-example.ota ]; then
+    rm "$OUT_DIR"/chip-p6-lock-example.ota
+fi
+
+src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8000 -vn 2 -vs "2.0" -da sha256 "$OUT_DIR"/chip-p6-lock-example.bin "$OUT_DIR"/chip-p6-lock-example.ota
diff --git a/examples/lock-app/p6/src/AppTask.cpp b/examples/lock-app/p6/src/AppTask.cpp
index 3dbff0e7d47b03..fdd6052c39de59 100644
--- a/examples/lock-app/p6/src/AppTask.cpp
+++ b/examples/lock-app/p6/src/AppTask.cpp
@@ -40,6 +40,33 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/P6/NetworkCommissioningDriver.h>
 
+/* OTA related includes */
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+#include <platform/P6/OTAImageProcessorImpl.h>
+extern "C" {
+#include "cy_smif_psoc6.h"
+}
+using chip::BDXDownloader;
+using chip::CharSpan;
+using chip::DefaultOTARequestor;
+using chip::FabricIndex;
+using chip::GetRequestorInstance;
+using chip::NodeId;
+using chip::OTADownloader;
+using chip::OTAImageProcessorImpl;
+using chip::System::Layer;
+
+using namespace ::chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+#endif
 #define FACTORY_RESET_TRIGGER_TIMEOUT 3000
 #define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000
 #define APP_TASK_STACK_SIZE (4096)
@@ -63,6 +90,15 @@ bool sHaveBLEConnections       = false;
 
 StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)];
 StaticTask_t appTaskStruct;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+DefaultOTARequestor gRequestorCore;
+DefaultOTARequestorStorage gRequestorStorage;
+DefaultOTARequestorDriver gRequestorUser;
+BDXDownloader gDownloader;
+OTAImageProcessorImpl gImageProcessor;
+#endif
+
 } // namespace
 
 using namespace ::chip;
@@ -92,6 +128,9 @@ static void InitServer(intptr_t context)
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    GetAppTask().InitOTARequestor();
+#endif
 }
 
 CHIP_ERROR AppTask::StartAppTask()
@@ -111,7 +150,14 @@ CHIP_ERROR AppTask::StartAppTask()
 CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
-
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    int rc = boot_set_confirmed();
+    if (rc != 0)
+    {
+        P6_LOG("boot_set_confirmed failed");
+        appError(CHIP_ERROR_WELL_UNINITIALIZED);
+    }
+#endif
     // Register the callback to init the MDNS server when connectivity is available
     PlatformMgr().AddEventHandler(
         [](const ChipDeviceEvent * event, intptr_t arg) {
@@ -524,3 +570,39 @@ void vApplicationStackOverflowHook(TaskHandle_t pxTask, char * pcTaskName)
     function is called if a stack overflow is detected. */
     printf("ERROR: stack overflow with task %s\r\n", pcTaskName);
 }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void AppTask::InitOTARequestor()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    SetRequestorInstance(&gRequestorCore);
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+    gImageProcessor.SetOTADownloader(&gDownloader);
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    uint32_t savedSoftwareVersion;
+    err = ConfigurationMgr().GetSoftwareVersion(savedSoftwareVersion);
+    if (err != CHIP_NO_ERROR)
+    {
+        P6_LOG("Can't get saved software version");
+        appError(err);
+    }
+
+    if (savedSoftwareVersion != CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION)
+    {
+        ConfigurationMgr().StoreSoftwareVersion(CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+
+        P6_LOG("Confirming update to version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+        chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+        if (requestor != nullptr)
+        {
+            requestor->NotifyUpdateApplied();
+        }
+    }
+
+    P6_LOG("Current Software Version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+    P6_LOG("Current Software Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+}
+#endif
diff --git a/examples/lock-app/p6/src/main.cpp b/examples/lock-app/p6/src/main.cpp
index 9c213eeb8137fa..6b4e07c16b30c2 100644
--- a/examples/lock-app/p6/src/main.cpp
+++ b/examples/lock-app/p6/src/main.cpp
@@ -34,6 +34,7 @@
 #include <AppTask.h>
 
 #include "AppConfig.h"
+#include "cyhal_wdt.h"
 #include "init_p6Platform.h"
 #include <app/server/Server.h>
 
@@ -95,7 +96,14 @@ static void main_task(void * pvParameters)
         P6_LOG("PlatformMgr().InitChipStack() failed");
         appError(ret);
     }
-    chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("P6_LOCK");
+
+    ret = chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("P6_LOCK");
+    if (ret != CHIP_NO_ERROR)
+    {
+        P6_LOG("ConnectivityMgr().SetBLEDeviceName() failed");
+        appError(ret);
+    }
+
     P6_LOG("Starting Platform Manager Event Loop");
     ret = PlatformMgr().StartEventLoopTask();
     if (ret != CHIP_NO_ERROR)
@@ -120,6 +128,12 @@ static void main_task(void * pvParameters)
 int main(void)
 {
     init_p6Platform();
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    // Clear watchdog timer (started by bootloader) so that it doesn't trigger a reset
+    cyhal_wdt_t wdt_obj;
+    cyhal_wdt_init(&wdt_obj, cyhal_wdt_get_max_timeout_ms());
+    cyhal_wdt_free(&wdt_obj);
+#endif
 
     P6_LOG("==================================================\r\n");
     P6_LOG("chip-p6-lock-example starting\r\n");
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index 41e3b2295736da..27160f8d1f08c7 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -315,6 +315,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -347,13 +348,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -398,7 +400,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-
 endpoint 0 {
   binding cluster DiagnosticLogs;
 
diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap
index 73399a75a46d32..4da01a3120774b 100644
--- a/examples/log-source-app/log-source-common/log-source-app.zap
+++ b/examples/log-source-app/log-source-common/log-source-app.zap
@@ -1899,46 +1899,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetLogRecord",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetPINCode",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCode",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearPINCode",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllPINCodes",
-              "code": 8,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
             {
               "name": "SetWeekDaySchedule",
               "code": 11,
@@ -2010,54 +1970,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "SetUserType",
-              "code": 20,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetUserType",
-              "code": 21,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetRFIDCode",
-              "code": 22,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCode",
-              "code": 23,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearRFIDCode",
-              "code": 24,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllRFIDCodes",
-              "code": 25,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -2152,22 +2064,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -2392,134 +2288,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
index 2e7b9f35470834..28658b9578c28b 100644
--- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
+++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
@@ -296,9 +296,14 @@ void OTAProviderExample::SendQueryImageResponse(app::CommandHandler * commandObj
         }
     }
 
+    // Delay action time is only applicable when the provider is busy
+    if (mQueryImageStatus == OTAQueryStatus::kBusy)
+    {
+        response.delayedActionTime.Emplace(mDelayedQueryActionTimeSec);
+    }
+
     // Set remaining fields common to all status types
     response.status = mQueryImageStatus;
-    response.delayedActionTime.Emplace(mDelayedQueryActionTimeSec);
     if (mUserConsentNeeded && requestorCanConsent)
     {
         response.userConsentNeeded.Emplace(true);
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 848319ce2e7725..aafc6c5134704b 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
@@ -138,6 +138,42 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -246,6 +282,173 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
+  }
+
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
+  }
+
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
 server cluster LocalizationConfiguration = 43 {
   attribute char_string<35> activeLocale = 0;
   readonly attribute CHAR_STRING supportedLocales[] = 1;
@@ -461,6 +664,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -501,16 +705,22 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
   request struct UpdateFabricLabelRequest {
     CHAR_STRING label = 0;
   }
@@ -547,6 +757,7 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
   command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
   command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
@@ -586,8 +797,8 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster AccessControl;
 
   server cluster AccessControl {
@@ -669,6 +880,28 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster GeneralDiagnostics {
+    callback attribute networkInterfaces;
+    callback attribute rebootCount;
+    callback attribute upTime;
+    callback attribute totalOperationalHours;
+    callback attribute bootReasons;
+    callback attribute activeHardwareFaults;
+    callback attribute activeRadioFaults;
+    callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster AdministratorCommissioning {
+    callback attribute windowStatus;
+    callback attribute adminFabricIndex;
+    callback attribute adminVendorId;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster OperationalCredentials {
     callback attribute NOCs;
     callback attribute fabrics;
@@ -680,6 +913,15 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster FixedLabel {
     callback attribute labelList;
     ram      attribute featureMap;
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 ad244aaa64ecd0..d84c220ba91135 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
@@ -267,6 +267,539 @@
             }
           ]
         },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "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": "MaxGroupKeysPerFabric",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReasons",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "AdministratorCommissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "OpenBasicCommissioningWindow",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RevokeCommissioning",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": []
+        },
+        {
+          "name": "AdministratorCommissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminFabricIndex",
+              "code": 1,
+              "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": "AdminVendorId",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Scenes",
           "code": 5,
@@ -2226,6 +2759,14 @@
               "incoming": 1,
               "outgoing": 1
             },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 1
+            },
             {
               "name": "UpdateFabricLabel",
               "code": 9,
@@ -2612,46 +3153,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetLogRecord",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetPINCode",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCode",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearPINCode",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllPINCodes",
-              "code": 8,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
             {
               "name": "SetWeekDaySchedule",
               "code": 11,
@@ -2723,54 +3224,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "SetUserType",
-              "code": 20,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetUserType",
-              "code": 21,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetRFIDCode",
-              "code": 22,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCode",
-              "code": 23,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearRFIDCode",
-              "code": 24,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllRFIDCodes",
-              "code": 25,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -2865,22 +3318,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -3105,134 +3542,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -4629,4 +4938,4 @@
       "deviceIdentifier": 22
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake
index bebe861e8f8809..885eaa13f8ddca 100644
--- a/examples/ota-requestor-app/ameba/chip_main.cmake
+++ b/examples/ota-requestor-app/ameba/chip_main.cmake
@@ -27,6 +27,9 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
+
+    ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
 )
 
 add_library(
@@ -58,10 +61,10 @@ target_include_directories(
     ${chip_dir}/src/controller/data_model
     ${chip_dir}/third_party/nlio/repo/include/
     ${chip_dir}/third_party/nlunit-test/repo/src
-
     ${chip_dir}/src/app/clusters/ota-requestor
     ${chip_dir}/examples/ota-requestor-app/ameba/main/include
-
+    ${chip_dir}/examples/platform/ameba
+    ${chip_dir}/examples/providers
     ${sdk_root}/component/soc/realtek/amebad/fwlib/include
 )
 
diff --git a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
index 8f18f730999cde..2db5f21cee2c85 100644
--- a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
@@ -36,6 +36,9 @@
 #include <support/CodeUtils.h>
 #include <support/logging/CHIPLogging.h>
 #include <support/logging/Constants.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <ota/OTAInitializer.h>
+#endif
 
 #include "Globals.h"
 #include "LEDWidget.h"
@@ -50,7 +53,15 @@ using namespace ::chip::DeviceManager;
 using namespace ::chip::Logging;
 
 uint32_t identifyTimerCount;
-constexpr uint32_t kIdentifyTimerDelayMS = 250;
+constexpr uint32_t kIdentifyTimerDelayMS     = 250;
+constexpr uint32_t kInitOTARequestorDelaySec = 3;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
+{
+    OTAInitializer::Instance().InitOTARequestor();
+}
+#endif
 
 void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
 {
@@ -97,6 +108,9 @@ void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Cluster
 
 void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
 {
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    static bool isOTAInitialized = false;
+#endif
     if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
     {
         ChipLogProgress(DeviceLayer, "IPv4 Server ready...");
@@ -110,6 +124,15 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
     {
         ChipLogProgress(DeviceLayer, "IPv6 Server ready...");
         chip::app::DnssdServer::Instance().StartServer();
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+        // Init OTA requestor only when we have gotten IPv6 address
+        if (!isOTAInitialized)
+        {
+            chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds32(kInitOTARequestorDelaySec),
+                                                        InitOTARequestorHandler, nullptr);
+            isOTAInitialized = true;
+        }
+#endif
     }
     else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
     {
diff --git a/examples/ota-requestor-app/ameba/main/chipinterface.cpp b/examples/ota-requestor-app/ameba/main/chipinterface.cpp
index 983a340a5ebaef..76517f6866c976 100644
--- a/examples/ota-requestor-app/ameba/main/chipinterface.cpp
+++ b/examples/ota-requestor-app/ameba/main/chipinterface.cpp
@@ -20,6 +20,7 @@
 #include "CHIPDeviceManager.h"
 #include "DeviceCallbacks.h"
 #include "chip_porting.h"
+#include <DeviceInfoProviderImpl.h>
 
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/Server.h>
@@ -33,27 +34,14 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CHIPMem.h>
 
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
-#include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
-#include <platform/Ameba/AmebaOTAImageProcessor.h>
-
 void * __dso_handle = 0;
 
-using chip::AmebaOTAImageProcessor;
-using chip::BDXDownloader;
 using chip::ByteSpan;
-using chip::DefaultOTARequestor;
 using chip::EndpointId;
 using chip::FabricIndex;
-using chip::GetRequestorInstance;
 using chip::NodeId;
 using chip::OnDeviceConnected;
 using chip::OnDeviceConnectionFailure;
-using chip::OTADownloader;
 using chip::PeerId;
 using chip::Server;
 using chip::VendorId;
@@ -86,51 +74,7 @@ void NetWorkCommissioningInstInit()
 }
 
 static DeviceCallbacks EchoCallbacks;
-
-DefaultOTARequestor gRequestorCore;
-DefaultOTARequestorStorage gRequestorStorage;
-ExtendedOTARequestorDriver gRequestorUser;
-BDXDownloader gDownloader;
-AmebaOTAImageProcessor gImageProcessor;
-chip::ota::DefaultOTARequestorUserConsent gUserConsentProvider;
-static chip::ota::UserConsentState gUserConsentState = chip::ota::UserConsentState::kGranted;
-
-extern "C" void amebaQueryImageCmdHandler()
-{
-    ChipLogProgress(DeviceLayer, "Calling amebaQueryImageCmdHandler");
-    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->TriggerImmediateQuery(); });
-}
-
-extern "C" void amebaApplyUpdateCmdHandler()
-{
-    ChipLogProgress(DeviceLayer, "Calling amebaApplyUpdateCmdHandler");
-    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->ApplyUpdate(); });
-}
-
-static void InitOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects -- START
-    SetRequestorInstance(&gRequestorCore);
-
-    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-
-    // Set server instance used for session establishment
-    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
-
-    gImageProcessor.SetOTADownloader(&gDownloader);
-
-    // Connect the Downloader and Image Processor objects
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
-
-    if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
-    {
-        gUserConsentProvider.SetUserConsentState(gUserConsentState);
-        gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
-    }
-
-    // Initialize and interconnect the Requestor and Image Processor objects -- END
-}
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
 static void InitServer(intptr_t context)
 {
@@ -138,12 +82,12 @@ static void InitServer(intptr_t context)
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     chip::Server::GetInstance().Init(initParams);
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
     NetWorkCommissioningInstInit();
-
-    InitOTARequestor();
 }
 
 extern "C" void ChipTest(void)
diff --git a/examples/ota-requestor-app/cyw30739/BUILD.gn b/examples/ota-requestor-app/cyw30739/BUILD.gn
index c4154a12aa32e0..b1ea6fde6aa876 100644
--- a/examples/ota-requestor-app/cyw30739/BUILD.gn
+++ b/examples/ota-requestor-app/cyw30739/BUILD.gn
@@ -20,6 +20,7 @@ import("${cyw30739_sdk_build_root}/cyw30739_executable.gni")
 import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni")
 
 cyw30739_project_dir = "${chip_root}/examples/ota-requestor-app/cyw30739"
+examples_plat_dir = "${chip_root}/examples/platform/cyw30739"
 
 declare_args() {
   setupPinCode = 20202021
@@ -29,7 +30,10 @@ declare_args() {
 cyw30739_sdk("sdk") {
   sources = [ "${cyw30739_project_dir}/include/CHIPProjectConfig.h" ]
 
-  include_dirs = [ "${cyw30739_project_dir}/include" ]
+  include_dirs = [
+    "${cyw30739_project_dir}/include",
+    "${examples_plat_dir}",
+  ]
 
   defines = [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setupPinCode}",
@@ -50,6 +54,13 @@ cyw30739_executable("ota_requestor_app") {
   ]
 
   include_dirs = [ "include" ]
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${examples_plat_dir}/OTAConfig.cpp",
+      "${examples_plat_dir}/OTAConfig.h",
+    ]
+  }
 }
 
 group("cyw30739") {
diff --git a/examples/ota-requestor-app/cyw30739/args.gni b/examples/ota-requestor-app/cyw30739/args.gni
index 28971944353082..8eda8fb616b4aa 100644
--- a/examples/ota-requestor-app/cyw30739/args.gni
+++ b/examples/ota-requestor-app/cyw30739/args.gni
@@ -19,8 +19,4 @@ cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_openthread_ftd = true
 
-# Disable progress logging to fit in flash
-chip_progress_logging = false
-chip_error_logging = false
-
 chip_enable_ota_requestor = true
diff --git a/examples/ota-requestor-app/cyw30739/src/main.cpp b/examples/ota-requestor-app/cyw30739/src/main.cpp
index ca59a73f31cf7c..6dedd85ef62fe2 100644
--- a/examples/ota-requestor-app/cyw30739/src/main.cpp
+++ b/examples/ota-requestor-app/cyw30739/src/main.cpp
@@ -16,22 +16,18 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include <platform/CHIPDeviceLayer.h>
+
 #include <ChipShellCollection.h>
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+#include <OTAConfig.h>
 #include <app/server/Server.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/shell/Engine.h>
 #include <lib/support/CHIPPlatformMemory.h>
 #include <mbedtls/platform.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <platform/CYW30739/OTAImageProcessorImpl.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <sparcommon.h>
 #include <stdio.h>
-#include <wiced_bt_ota_firmware_upgrade.h>
 #include <wiced_memory.h>
 #include <wiced_platform.h>
 
@@ -42,12 +38,6 @@ using namespace chip::Shell;
 
 static void InitApp(intptr_t args);
 
-DefaultOTARequestor gRequestorCore;
-DefaultOTARequestorStorage gRequestorStorage;
-DeviceLayer::DefaultOTARequestorDriver gRequestorUser;
-BDXDownloader gDownloader;
-OTAImageProcessorImpl gImageProcessor;
-
 APPLICATION_START()
 {
     CHIP_ERROR err;
@@ -130,21 +120,5 @@ void InitApp(intptr_t args)
 
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 
-    // Initialize and interconnect the Requestor and Image Processor objects -- START
-    SetRequestorInstance(&gRequestorCore);
-
-    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
-
-    gImageProcessor.SetOTADownloader(&gDownloader);
-
-    // Connect the Downloader and Image Processor objects
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    // Initialize and interconnect the Requestor and Image Processor objects -- END
-
-    if (!wiced_ota_fw_upgrade_init(NULL, NULL, NULL))
-    {
-        ChipLogError(SoftwareUpdate, "wiced_ota_fw_upgrade_init");
-    }
+    OTAConfig::Init();
 }
diff --git a/examples/ota-requestor-app/efr32/src/AppTask.cpp b/examples/ota-requestor-app/efr32/src/AppTask.cpp
index 31f819f77e7540..6562e0bd43f0fe 100644
--- a/examples/ota-requestor-app/efr32/src/AppTask.cpp
+++ b/examples/ota-requestor-app/efr32/src/AppTask.cpp
@@ -171,7 +171,7 @@ CHIP_ERROR AppTask::Init()
     ConfigurationMgr().LogDeviceConfig();
 
 // Print setup info on LCD if available
-#ifdef DISPLAY_ENABLED
+#ifdef QR_CODE_ENABLED
     // Create buffer for QR code that can fit max size and null terminator.
     char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
     chip::MutableCharSpan QRCode(qrCodeBuffer);
@@ -186,7 +186,7 @@ CHIP_ERROR AppTask::Init()
     }
 #else
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
-#endif
+#endif // QR_CODE_ENABLED
 
     // Initialize OTA components
     InitOTARequestor();
diff --git a/examples/ota-requestor-app/esp32/CMakeLists.txt b/examples/ota-requestor-app/esp32/CMakeLists.txt
index 7edf64a69941d5..6768daa80b1651 100644
--- a/examples/ota-requestor-app/esp32/CMakeLists.txt
+++ b/examples/ota-requestor-app/esp32/CMakeLists.txt
@@ -27,7 +27,8 @@ set(EXTRA_COMPONENT_DIRS
 )
 
 project(chip-ota-requestor-app)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+# C++17 is required for RPC build.
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
 # For the C3, project_include.cmake sets -Wno-format, but does not clear various
 # flags that depend on -Wformat
@@ -39,4 +40,24 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-secur
 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 
+if (CONFIG_ENABLE_PW_RPC)
+get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
+include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
+pw_set_backend(pw_log pw_log_basic)
+pw_set_backend(pw_assert pw_assert_log)
+pw_set_backend(pw_sys_io pw_sys_io.esp32)
+
+add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
+add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
+add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
+
+get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS)
+list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
+list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
+set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
+endif(CONFIG_ENABLE_PW_RPC)
+
+
 flashing_script()
diff --git a/examples/ota-requestor-app/esp32/README.md b/examples/ota-requestor-app/esp32/README.md
index 513c070578a088..7c093cb6967a4e 100644
--- a/examples/ota-requestor-app/esp32/README.md
+++ b/examples/ota-requestor-app/esp32/README.md
@@ -78,3 +78,30 @@ config options for setting software version.
 Matter OTA image can also be generated using
 [ota_image_tool.py](https://github.com/project-chip/connectedhomeip/blob/master/src/app/ota_image_tool.py)
 script.
+
+## Using the RPC console
+
+Enable RPCs in the build using menuconfig:
+
+    $ idf.py menuconfig
+
+Enable the RPC library:
+
+    Component config → CHIP Core → General Options → Enable Pigweed PRC library
+
+After flashing a build with RPCs enabled you can use the rpc console to send
+commands to the device.
+
+Build or install the [rpc console](../../common/pigweed/rpc_console/README.md)
+
+-   Start the console
+
+```
+    chip-console --device /dev/ttyUSB0
+```
+
+-   From within the console you can then invoke rpcs:
+
+```
+    rpcs.chip.rpc.Device.TriggerOta()
+```
diff --git a/examples/ota-requestor-app/esp32/main/CMakeLists.txt b/examples/ota-requestor-app/esp32/main/CMakeLists.txt
index a21d42949bef0d..bd2ac14dfcdd3c 100644
--- a/examples/ota-requestor-app/esp32/main/CMakeLists.txt
+++ b/examples/ota-requestor-app/esp32/main/CMakeLists.txt
@@ -16,12 +16,14 @@
 #
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-idf_component_register(PRIV_INCLUDE_DIRS 
+set(PRIV_INCLUDE_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
-		      SRC_DIRS
+)
+
+set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/zap-generated"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated/attributes"
@@ -53,10 +55,135 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/ota"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/route_hook"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
-		      PRIV_REQUIRES chip QRCode bt console app_update)
+)
+
+set(PRIV_REQUIRES_LIST chip QRCode bt console app_update)
+
+if (CONFIG_ENABLE_PW_RPC)
+# Append additional directories for RPC build
+set(PRIV_INCLUDE_DIRS_LIST  "${PRIV_INCLUDE_DIRS_LIST}"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
+                     "${IDF_PATH}/components/freertos/include/freertos"
+)
+set(SRC_DIRS_LIST  "${SRC_DIRS_LIST}"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
+)
+endif (CONFIG_ENABLE_PW_RPC)
 
-set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
+idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
+                       SRC_DIRS ${SRC_DIRS_LIST}
+                       PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
+
+set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
            "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
 )
+
+if (CONFIG_ENABLE_PW_RPC)
+
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
+include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
+include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
+set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
+
+pw_proto_library(attributes_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
+  PREFIX
+    attributes_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(button_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
+  PREFIX
+    button_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(descriptor_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
+  PREFIX
+    descriptor_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(device_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
+  PREFIX
+    device_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_protos
+)
+
+pw_proto_library(wifi_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.options
+  PREFIX
+    wifi_service
+  DEPS
+    pw_protobuf.common_protos
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+)
+
+target_link_libraries(${COMPONENT_LIB} PUBLIC
+  attributes_service.nanopb_rpc
+  button_service.nanopb_rpc
+  descriptor_service.nanopb_rpc
+  device_service.nanopb_rpc
+  wifi_service.nanopb_rpc
+  pw_checksum
+  pw_hdlc
+  pw_log
+  pw_rpc.server
+  pw_trace_tokenized
+  pw_trace_tokenized.trace_buffer
+  pw_trace_tokenized.rpc_service
+  pw_trace_tokenized.protos.nanopb_rpc
+)
+
+target_link_options(${COMPONENT_LIB}
+  PUBLIC
+    "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld"
+)
+
+target_compile_options(${COMPONENT_LIB} PRIVATE
+                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
+                       "-DPW_RPC_BUTTON_SERVICE=1"
+                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
+                       "-DPW_RPC_DEVICE_SERVICE=1"
+                       "-DPW_RPC_TRACING_SERVICE=1"
+                       "-DPW_RPC_WIFI_SERVICE=1"
+                       "-DPW_TRACE_BACKEND_SET=1")
+
+endif (CONFIG_ENABLE_PW_RPC)
diff --git a/examples/ota-requestor-app/esp32/main/Kconfig.projbuild b/examples/ota-requestor-app/esp32/main/Kconfig.projbuild
index a563d7b2ae46ce..bd6973f4996cd2 100644
--- a/examples/ota-requestor-app/esp32/main/Kconfig.projbuild
+++ b/examples/ota-requestor-app/esp32/main/Kconfig.projbuild
@@ -45,3 +45,41 @@ menu "Demo"
        default 8 if RENDEZVOUS_MODE_ETHERNET
 
 endmenu
+
+menu "PW RPC Debug channel"
+depends on ENABLE_PW_RPC
+    config EXAMPLE_UART_PORT_NUM
+        int "UART port number"
+        range 0 2 if IDF_TARGET_ESP32
+        range 0 1 if IDF_TARGET_ESP32C3
+        default 0
+        help
+            UART communication port number for the example.
+            See UART documentation for available port numbers.
+
+    config EXAMPLE_UART_BAUD_RATE
+        int "UART communication speed"
+        range 1200 115200
+        default 115200
+        help
+            UART communication speed for Modbus example.
+
+    config EXAMPLE_UART_RXD
+        int "UART RXD pin number"
+        range 0 34 if IDF_TARGET_ESP32
+        range 0 19 if IDF_TARGET_ESP32C3
+        default 5
+        help
+            GPIO number for UART RX pin. See UART documentation for more information
+            about available pin numbers for UART.
+
+    config EXAMPLE_UART_TXD
+        int "UART TXD pin number"
+        range 0 34 if IDF_TARGET_ESP32
+        range 0 19 if IDF_TARGET_ESP32C3
+        default 4
+        help
+            GPIO number for UART TX pin. See UART documentation for more information
+            about available pin numbers for UART.
+
+endmenu
\ No newline at end of file
diff --git a/examples/ota-requestor-app/esp32/main/main.cpp b/examples/ota-requestor-app/esp32/main/main.cpp
index 4b04f6f499db23..26ccbcf25684ec 100644
--- a/examples/ota-requestor-app/esp32/main/main.cpp
+++ b/examples/ota-requestor-app/esp32/main/main.cpp
@@ -32,6 +32,12 @@
 
 #include <lib/support/ErrorStr.h>
 
+#include "OTAImageProcessorImpl.h"
+
+#if CONFIG_ENABLE_PW_RPC
+#include "Rpc.h"
+#endif
+
 using namespace ::chip;
 using namespace ::chip::System;
 using namespace ::chip::DeviceManager;
@@ -49,6 +55,10 @@ static void InitServer(intptr_t context)
 
 extern "C" void app_main()
 {
+#if CONFIG_ENABLE_PW_RPC
+    chip::rpc::Init();
+#endif
+
     ESP_LOGI(TAG, "OTA Requester!");
 
     /* Print chip information */
diff --git a/examples/ota-requestor-app/esp32/sdkconfig_rpc.defaults b/examples/ota-requestor-app/esp32/sdkconfig_rpc.defaults
new file mode 100644
index 00000000000000..350613d6118874
--- /dev/null
+++ b/examples/ota-requestor-app/esp32/sdkconfig_rpc.defaults
@@ -0,0 +1,65 @@
+#
+#    Copyright (c) 2020 Project CHIP Authors
+#    Copyright (c) 2018 Nest Labs, Inc.
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#    Description:
+#      Some useful defaults for the demo app configuration.
+#
+
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#enable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+
+# Add RTC memory to system heap
+CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
+
+# Product id
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8008
+
+# Main task needs a bit more stack than the default
+# default is 3584, bump this up to 4k.
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y
+CONFIG_DEVICE_SOFTWARE_VERSION_NUMBER=2
+
+# PW RPC Debug channel
+CONFIG_EXAMPLE_UART_PORT_NUM=0
+CONFIG_EXAMPLE_UART_BAUD_RATE=115200
+CONFIG_EXAMPLE_UART_RXD=3
+CONFIG_EXAMPLE_UART_TXD=1
+CONFIG_ENABLE_PW_RPC=y
\ No newline at end of file
diff --git a/examples/ota-requestor-app/linux/README.md b/examples/ota-requestor-app/linux/README.md
index a306eb1e3899dd..f14d5fa7cdf094 100644
--- a/examples/ota-requestor-app/linux/README.md
+++ b/examples/ota-requestor-app/linux/README.md
@@ -212,7 +212,7 @@ scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out chip_c
 **Run the OTA Provider application**
 
 ```
-out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin
+out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/ota-image.bin
 ```
 
 #### In terminal 2:
@@ -270,7 +270,7 @@ scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out chip_c
 **Run the OTA Provider application**
 
 ```
-out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin
+out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/ota-image.bin
 ```
 
 #### In terminal 2:
@@ -304,7 +304,7 @@ out/chip-tool pairing onnetwork-long 0x1234567890 20202021 18
 **Write to the DefaultOTAProviders attribute**
 
 ```
-out/chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+out/chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"providerNodeID": 3735928559, "endpoint": 0}]' 0x1234567890 0
 ```
 
 Every 60 seconds from when the OTA Requestor application has launched, the OTA
@@ -319,48 +319,108 @@ structs. Each entry in this list is a default OTA Provider per fabric. There can
 not be more than one entry containing the same fabric.
 
 To add more than one entry to the `DefaultOTAProviders` attribute, the OTA
-Requestor app must be commissioned on multiple fabrics. This can be done as
-specified below:
+Requestor app must be commissioned into multiple fabrics. At least one OTA
+Provider app should be commissioned into each corresponding fabric that the OTA
+Requestor app had been commissioned into.
 
-**Build and run the OTA Requestor application**
+The following example has two OTA Provider apps, each commissioned into a
+different fabric (alpha and beta) and one OTA Requestor app commissioned into
+both alpha and beta fabrics.
+
+### In terminal 1:
+
+**Build the OTA Provider application**
+
+```
+scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out chip_config_network_layer_ble=false
+```
+
+**Run the first OTA Provider application**
+
+```
+out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/ota-image.bin
+```
+
+### In terminal 2:
+
+**Run the second OTA Provider application**
+
+```
+out/chip-ota-provider-app --discriminator 23 --secured-device-port 5566 --KVS /tmp/chip_kvs_provider2 --filepath /tmp/ota-image2.bin
+```
+
+### In terminal 3:
+
+**Build the OTA Requestor application**
 
 ```
 scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux/ out chip_config_network_layer_ble=false
-out/chip-ota-requestor-app --discriminator 18 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor --otaDownloadPath /tmp/test.bin
 ```
 
-**Commission to the first fabric**
+**Run the OTA Requestor application**
 
 ```
-out/chip-tool pairing onnetwork-long 0x1234567890 20202021 18
+out/chip-ota-requestor-app --discriminator 18 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor --periodicQueryTimeout 10
 ```
 
-**Open Basic Commissioning Window**
+### In terminal 4:
+
+**Commission the first OTA Provider into the first fabric (alpha)**
 
 ```
-out/chip-tool administratorcommissioning open-basic-commissioning-window 600 0x1234567890 0 --timedInteractionTimeoutMs 600
+out/chip-tool pairing onnetwork-long 0xC0FFEE 20202021 22
 ```
 
-**Commission to the second fabric**
+**Commission the second OTA Provider into the second fabric (beta)**
 
 ```
-out/chip-tool pairing onnetwork-long 0x858 20202021 18 --commissioner-name beta
+out/chip-tool pairing onnetwork-long 0xB0BA 20202021 23 --commissioner-name beta
 ```
 
-For all operations, specify which fabric to use by passing in
-`--commissioner-name`. The supported values are alpha, beta, and gamma. By
-default, if none is supplied, alpha is used.
+**Commission the OTA Requestor application into the first fabric (alpha)**
+
+```
+out/chip-tool pairing onnetwork-long 0xDEB 20202021 18
+```
+
+**Open Basic Commissioning Window for the OTA Requestor application**
+
+```
+out/chip-tool administratorcommissioning open-basic-commissioning-window 600 0xDEB 0 --timedInteractionTimeoutMs 600
+```
+
+**Commission the OTA Requestor application into the second fabric (beta)**
+
+```
+out/chip-tool pairing onnetwork-long 0xB0B 20202021 18 --commissioner-name beta
+```
 
-**Write/Read DefaultOTAProviders on first fabric**
+**Write/Read DefaultOTAProviders on the first fabric (alpha)**
 
 ```
-out/chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
-out/chip-tool otasoftwareupdaterequestor read default-ota-providers 0x1234567890 0
+out/chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"providerNodeID": 12648430, "endpoint": 0}]' 0xDEB 0
+out/chip-tool otasoftwareupdaterequestor read default-ota-providers 0xDEB 0
 ```
 
-**Write/Read DefaultOTAProviders on second fabric**
+**Write/Read DefaultOTAProviders on second fabric (beta)**
 
 ```
-out/chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
-out/chip-tool otasoftwareupdaterequestor read default-ota-providers 0x858 0 --commissioner-name beta
+out/chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"providerNodeID": 45242, "endpoint": 0}]' 0xB0B 0 --commissioner-name beta
+out/chip-tool otasoftwareupdaterequestor read default-ota-providers 0xB0B 0 --commissioner-name beta
 ```
+
+**Write ACL for the first OTA Provider application**
+
+```
+out/chip-tool accesscontrol write acl '[{"privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"privilege": 3, "authMode": 2, "subjects": null, "targets": [{"cluster": 41, "endpoint": null, "deviceType": null}]}]' 0xC0FFEE 0
+```
+
+**Write ACL for the second OTA Provider application**
+
+```
+out/chip-tool accesscontrol write acl '[{"privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"privilege": 3, "authMode": 2, "subjects": null, "targets": [{"cluster": 41, "endpoint": null, "deviceType": null}]}]' 0xB0BA 0 --commissioner-name beta
+```
+
+NOTE: For all operations, specify which fabric to use by passing in
+`--commissioner-name`. The supported values are alpha, beta, and gamma. By
+default, if none is supplied, alpha is used.
diff --git a/examples/ota-requestor-app/linux/main.cpp b/examples/ota-requestor-app/linux/main.cpp
index 4aa4a96bb051c2..7507e201646da9 100644
--- a/examples/ota-requestor-app/linux/main.cpp
+++ b/examples/ota-requestor-app/linux/main.cpp
@@ -17,11 +17,13 @@
  */
 
 #include "AppMain.h"
+#include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/clusters/ota-requestor/BDXDownloader.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
 #include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
+#include <app/util/af.h>
 #include <platform/Linux/OTAImageProcessorImpl.h>
 
 using chip::BDXDownloader;
@@ -43,7 +45,9 @@ using chip::Callback::Callback;
 using chip::System::Layer;
 using chip::Transport::PeerAddress;
 using namespace chip;
+using namespace chip::app;
 using namespace chip::ArgParser;
+using namespace chip::DeviceLayer;
 using namespace chip::Messaging;
 using namespace chip::app::Clusters::OtaSoftwareUpdateProvider::Commands;
 
@@ -117,6 +121,33 @@ OptionSet cmdLineOptions = {
 
 OptionSet * allOptions[] = { &cmdLineOptions, nullptr };
 
+// Network commissioning
+namespace {
+constexpr EndpointId kNetworkCommissioningEndpointMain      = 0;
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+// This file is being used by platforms other than Linux, so we need this check to disable related features since we only
+// implemented them on linux.
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+NetworkCommissioning::LinuxThreadDriver sLinuxThreadDriver;
+Clusters::NetworkCommissioning::Instance sThreadNetworkCommissioningInstance(kNetworkCommissioningEndpointMain,
+                                                                             &sLinuxThreadDriver);
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+NetworkCommissioning::LinuxWiFiDriver sLinuxWiFiDriver;
+Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(kNetworkCommissioningEndpointSecondary,
+                                                                           &sLinuxWiFiDriver);
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+NetworkCommissioning::LinuxEthernetDriver sLinuxEthernetDriver;
+Clusters::NetworkCommissioning::Instance sEthernetNetworkCommissioningInstance(kNetworkCommissioningEndpointMain,
+                                                                               &sLinuxEthernetDriver);
+#else  // CHIP_DEVICE_LAYER_TARGET_LINUX
+Clusters::NetworkCommissioning::NullNetworkDriver sNullNetworkDriver;
+Clusters::NetworkCommissioning::Instance sNullNetworkCommissioningInstance(kNetworkCommissioningEndpointMain, &sNullNetworkDriver);
+#endif // CHIP_DEVICE_LAYER_TARGET_LINUX
+} // namespace
+
 bool CustomOTARequestorDriver::CanConsent()
 {
     return gRequestorCanConsent.ValueOr(DeviceLayer::ExtendedOTARequestorDriver::CanConsent());
@@ -126,11 +157,15 @@ void CustomOTARequestorDriver::UpdateDownloaded()
 {
     if (gAutoApplyImage)
     {
-        // Let the default driver take further action to apply the image
+        // Let the default driver take further action to apply the image.
+        // All member variables will be implicitly reset upon loading into the new image.
         DefaultOTARequestorDriver::UpdateDownloaded();
     }
     else
     {
+        // Download complete but we're not going to apply image, so reset provider retry counter.
+        mProviderRetryCount = 0;
+
         // Reset to put the state back to idle to allow the next OTA update to occur
         gRequestorCore.Reset();
     }
@@ -164,6 +199,68 @@ static void InitOTARequestor(void)
     }
 }
 
+static void InitNetworkCommissioning(void)
+{
+    (void) kNetworkCommissioningEndpointMain;
+    // Enable secondary endpoint only when we need it, this should be applied to all platforms.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+    const bool kThreadEnabled = {
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+        LinuxDeviceOptions::GetInstance().mThread
+#else
+        false
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    };
+
+    const bool kWiFiEnabled = {
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        LinuxDeviceOptions::GetInstance().mWiFi
+#else
+        false
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+    };
+
+    if (kThreadEnabled && kWiFiEnabled)
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+        sThreadNetworkCommissioningInstance.Init();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        sWiFiNetworkCommissioningInstance.Init();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+       // Only enable secondary endpoint for network commissioning cluster when both WiFi and Thread are enabled.
+        emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, true);
+    }
+    else if (kThreadEnabled)
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+        sThreadNetworkCommissioningInstance.Init();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    }
+    else if (kWiFiEnabled)
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        // If we only enable WiFi on this device, "move" WiFi instance to main NetworkCommissioning cluster endpoint.
+        sWiFiNetworkCommissioningInstance.~Instance();
+        new (&sWiFiNetworkCommissioningInstance)
+            Clusters::NetworkCommissioning::Instance(kNetworkCommissioningEndpointMain, &sLinuxWiFiDriver);
+        sWiFiNetworkCommissioningInstance.Init();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+    }
+    else
+#endif // CHIP_DEVICE_LAYER_TARGET_LINUX
+    {
+#if CHIP_DEVICE_LAYER_TARGET_LINUX
+        sEthernetNetworkCommissioningInstance.Init();
+#else
+        // Use NullNetworkCommissioningInstance to disable the network commissioning functions.
+        sNullNetworkCommissioningInstance.Init();
+#endif // CHIP_DEVICE_LAYER_TARGET_LINUX
+    }
+}
+
 bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier, const char * aName, const char * aValue)
 {
     bool retval = true;
@@ -229,6 +326,8 @@ void ApplicationInit()
 {
     // Initialize all OTA download components
     InitOTARequestor();
+    // Initialize Network Commissioning instances
+    InitNetworkCommissioning();
 }
 
 int main(int argc, char * argv[])
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 650331e4bcdb22..4364dd66e2926a 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
@@ -216,6 +216,173 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
+  }
+
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
+  }
+
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
 server cluster LocalizationConfiguration = 43 {
   attribute char_string<35> activeLocale = 0;
   readonly attribute CHAR_STRING supportedLocales[] = 1;
@@ -500,6 +667,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -540,13 +708,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -567,10 +736,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -599,7 +764,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster TimeFormatLocalization = 44 {
@@ -636,8 +800,8 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster AccessControl {
@@ -723,6 +887,20 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster GeneralDiagnostics {
+    callback attribute networkInterfaces;
+    callback attribute rebootCount;
+    callback attribute upTime;
+    callback attribute totalOperationalHours;
+    callback attribute bootReasons;
+    callback attribute activeHardwareFaults;
+    callback attribute activeRadioFaults;
+    callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster AdministratorCommissioning {
     callback attribute windowStatus;
     callback attribute adminFabricIndex;
@@ -742,6 +920,15 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster FixedLabel {
     callback attribute labelList;
     ram      attribute featureMap;
@@ -754,5 +941,21 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+endpoint 65534 {
+  device type anonymousEndpointType = 61442;
+
+  server cluster NetworkCommissioning {
+    callback attribute maxNetworks;
+    callback attribute networks;
+    callback attribute scanMaxTimeSeconds;
+    callback attribute connectMaxTimeSeconds;
+    callback attribute interfaceEnabled;
+    callback attribute lastNetworkingStatus;
+    callback attribute lastNetworkID;
+    callback attribute lastConnectErrorValue;
+    callback attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
+}
 
 
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 7a7b58fa9f1e25..0eb046b497c634 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
@@ -2241,6 +2241,229 @@
             }
           ]
         },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReasons",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "AdministratorCommissioning",
           "code": 60,
@@ -2438,14 +2661,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -2640,54 +2855,238 @@
           ]
         },
         {
-          "name": "Fixed Label",
-          "code": 64,
+          "name": "Group Key Management",
+          "code": 63,
           "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
           "side": "client",
           "enabled": 0,
-          "commands": [],
-          "attributes": []
-        },
-        {
-          "name": "Fixed Label",
-          "code": 64,
-          "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [],
-          "attributes": [
+          "commands": [
             {
-              "name": "label list",
+              "name": "KeySetWrite",
               "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
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "KeySetRead",
+              "code": 1,
               "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "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": "MaxGroupKeysPerFabric",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "label list",
+              "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": "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
             },
             {
@@ -2809,46 +3208,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetLogRecord",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetPINCode",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCode",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearPINCode",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllPINCodes",
-              "code": 8,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
             {
               "name": "SetWeekDaySchedule",
               "code": 11,
@@ -2920,60 +3279,12 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "SetUserType",
-              "code": 20,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
+            }
+          ],
+          "attributes": [
             {
-              "name": "GetUserType",
-              "code": 21,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetRFIDCode",
-              "code": 22,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCode",
-              "code": 23,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearRFIDCode",
-              "code": 24,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllRFIDCodes",
-              "code": 25,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "client",
               "type": "int16u",
@@ -3062,22 +3373,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -3302,134 +3597,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -4813,6 +4980,350 @@
           ]
         }
       ]
+    },
+    {
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeName": "MA-secondary-network-commissioning",
+      "deviceTypeCode": 61442,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "client",
+              "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": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatus",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "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": 0,
+              "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": 0,
+              "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": 0,
+              "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": "External",
+              "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": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
     }
   ],
   "endpoints": [
@@ -4824,6 +5335,16 @@
       "networkId": 0,
       "endpointVersion": 1,
       "deviceIdentifier": 22
+    },
+    {
+      "endpointTypeName": "Anonymous Endpoint Type",
+      "endpointTypeIndex": 1,
+      "profileId": 259,
+      "endpointId": 65534,
+      "networkId": 0,
+      "endpointVersion": 1,
+      "deviceIdentifier": 61442
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/ota-requestor-app/p6/BUILD.gn b/examples/ota-requestor-app/p6/BUILD.gn
index f628f7780c0748..7701ca1c5e8a41 100644
--- a/examples/ota-requestor-app/p6/BUILD.gn
+++ b/examples/ota-requestor-app/p6/BUILD.gn
@@ -40,9 +40,10 @@ declare_args() {
 }
 
 config("p6_ota_config") {
-  ldflags = [ "-T/" + rebase_path("src/cy8c6xxa_cm4_dual_ota_int.ld",
-                                  "/",
-                                  "${p6_project_dir}") ]
+  ldflags = [ "-T/" + rebase_path(
+                  "${chip_root}/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld",
+                  "/",
+                  "${p6_project_dir}") ]
 
   ldflags += [ "-Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,MCUBOOT_BOOTLOADER_SIZE=0x18000,--defsym,CY_BOOT_PRIMARY_1_SIZE=0x1C0000" ]
 
@@ -87,7 +88,7 @@ p6_sdk_sources("ota_requestor_app_sdk_sources") {
     "${chip_root}/src/platform/P6",
     "${p6_project_dir}/include",
     "${examples_plat_dir}",
-    "${p6_project_dir}/config",
+    "${chip_root}/third_party/p6/p6_sdk/ota/config",
     "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/",
     "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/mem_config/",
     "${chip_root}/third_party/p6/p6_sdk/libs/anycloud-ota/source/mcuboot/cy_flash_pal/include/",
diff --git a/examples/ota-requestor-app/p6/include/AppTask.h b/examples/ota-requestor-app/p6/include/AppTask.h
index 43d448ed06b51c..c460807f997c84 100644
--- a/examples/ota-requestor-app/p6/include/AppTask.h
+++ b/examples/ota-requestor-app/p6/include/AppTask.h
@@ -47,6 +47,7 @@ class AppTask
     void PostEvent(const AppEvent * event);
 
     void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
+    void InitOTARequestor();
 
 private:
     friend AppTask & GetAppTask(void);
diff --git a/examples/ota-requestor-app/p6/include/CHIPProjectConfig.h b/examples/ota-requestor-app/p6/include/CHIPProjectConfig.h
index 30140dc83620d7..c3ef134be2a110 100644
--- a/examples/ota-requestor-app/p6/include/CHIPProjectConfig.h
+++ b/examples/ota-requestor-app/p6/include/CHIPProjectConfig.h
@@ -66,14 +66,14 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_REVISION 1
 
 /**
- * CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING
+ * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
  *
- * A string identifying the firmware revision running on the device.
- * CHIP service currently expects the firmware version to be in the format
+ * A string identifying the software version running on the device.
+ * CHIP service currently expects the software version to be in the format
  * {MAJOR_VERSION}.0d{MINOR_VERSION}
  */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING
-#define CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING "0.1ALPHA"
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA"
 #endif
 /**
  * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
diff --git a/examples/ota-requestor-app/p6/matter-psoc6-mcuboot-bootloader.hex b/examples/ota-requestor-app/p6/matter-psoc6-mcuboot-bootloader.hex
deleted file mode 100644
index a8ae0bf328eb65..00000000000000
--- a/examples/ota-requestor-app/p6/matter-psoc6-mcuboot-bootloader.hex
+++ /dev/null
@@ -1,4099 +0,0 @@
-:020000041000EA
-:1000000000000208070500100D000000690500103F
-:1000100000000000000000000000000000000000E0
-:100020000000000000000000000000006505001056
-:1000300000000000000000006505001065050010CC
-:1000400065050010650500106505001065050010C8
-:1000500065050010650500106505001065050010B8
-:1000600065050010650500106505001065050010A8
-:100070006505001065050010650500106505001098
-:1000800010B5064C2378002B07D1054B002B02D06E
-:10009000044800E000BF0123237010BD740700086E
-:1000A00000000000DCF60010044B10B5002B03D05C
-:1000B0000349044800E000BF10BDC0460000000036
-:1000C00078070008DCF6001010B500F07DF800F0AD
-:1000D00007F800F069F800F01FF800F029F810BDEB
-:1000E00010B50021012007F059F94D22002101200F
-:1000F00007F092F80021012007F00EF900210020FE
-:1001000007F04CF900220021002007F085F80021BB
-:10011000002007F001F910BD10B5002200212F20AA
-:1001200007F0C0F800220121052007F0BBF810BD40
-:1001300010B5134C134A0021200004F0AFFD124A01
-:100140000121200004F0AAFD104C114A00212000DA
-:1001500004F0A4FD0F4A0121200004F09FFD0E4C85
-:100160000E4A0421200004F099FD0D4A06212000CA
-:1001700004F094FD0B4A0721200004F08FFD10BD10
-:1001800000003140FCDF001030E000108002314000
-:1001900094DF0010C8DF00100003314060DF001062
-:1001A0002CDF0010F8DE0010034B332203495A50B5
-:1001B00003495A507047C0460000304008200000F4
-:1001C00010200000FEE7000030B583B0962100202B
-:1001D00008F048F808F00CF800281BD1774AFF23F4
-:1001E0001B02D4583F231C4007F0F2FF002806D022
-:1001F000012007F0DBFF714B9B6C002B25DB6F4A66
-:10020000FF231B02D45007F07BFA07F06DFA0120A0
-:1002100007F08EFA012008F005FD08F0A1FC08F0B7
-:1002200087FD08F06FFD0021002007F0FFF9002096
-:1002300007F086F9012007F067F9002007F0E2F8DF
-:100240005F4B1A683F23D45C06E00620FFF7BAFF35
-:10025000200007F0BBFC013C002CF9D1002101205B
-:1002600007F09EFA002007F0CFF9002800D189E0BE
-:1002700007F054FB0021002007F092FA0021002033
-:1002800007F0A4F94F4C002500950023002200211F
-:10029000200004F055FC00950023002201212000DD
-:1002A00004F04EFC484807F0FFF9002800D075E044
-:1002B000012007F017F9002007F042F9012007F0AC
-:1002C00023F9002007F09EF80021012007F068FACA
-:1002D0000021002007F064FA0021022007F060FAF4
-:1002E0000021032007F05CFA0021042007F058FAEF
-:1002F0000021052007F054FA344807F02DFB0028B0
-:100300004FD1334807F0F6FB00284DD101210020E2
-:1003100007F05CF90021002007F088F92D49012041
-:1003200007F07AFC002842D12B49012007F00AFD92
-:1003300000283FD10021022007F048F901210220C6
-:1003400007F074F9022007F00DF907F0BFF800205C
-:1003500007F088F8002007F09DF807F0ABF80020C0
-:1003600008F0F4FC012007F06BF807F0BDF901205C
-:1003700007F0DEF99021002007F074FF00F01AF971
-:1003800003B030BD07F03AFA1223FF33984200D091
-:100390006EE70121002007F019F969E70520FFF752
-:1003A00011FF0420FFF70EFF0420FFF70BFF0320CF
-:1003B000FFF708FF0320FFF705FFC04600002740B6
-:1003C000D45F01080000314040420F00C0E100103E
-:1003D000400D0300D4E100101027000010B503F019
-:1003E00059F9054C200004F055FB200004F052FBA5
-:1003F000012002F04FFE10BD8002314010B584682C
-:1004000003681B89E418094B1B68DB68382201214B
-:1004100007480AF0B5F80A21064803F01DF9FFF76E
-:10042000DDFF200000F082F910BDC046EC0100089D
-:10043000DCE100100000654010B584B0FFF744FE19
-:1004400062B6E120400203F0E9F8264C2368DB683D
-:100450001022012124480AF093F82368DB68222245
-:10046000012122480AF08CF8012002F0C1FD041E8F
-:100470000DD11C4B1B68DB682E2201211C480AF0A1
-:100480007FF8002C0BD0002008F032FAFBE7154B68
-:100490001B68D8682200174909F0FEFFF1E701A8A0
-:1004A00000F086FF00280FD10E4B1B68DB682F225F
-:1004B000012111480AF064F8FA20000102F0BAFFA5
-:1004C00001A8FFF79BFFDEE7064B1B68DB683222C3
-:1004D00001210A480AF054F80A21094803F0BCF83F
-:1004E000D1E7C046EC01000818E200102CE2001031
-:1004F00050E2001080E20010C4E20010F4E20010AC
-:10050000000065407047FFF7FDFF72B60F4C104DBD
-:10051000AC4209DA21686268A368043B02DBC85870
-:10052000D050FAE70C34F3E70A490B4A0020521A7C
-:1005300002DD043A8850FCDC084809490860BFF332
-:100540004F8F00F075F8FFF777FFFEE7E8F6001031
-:1005500000F70010740700087C6001080000000824
-:1005600008ED00E0FEE7FEE700B504207146084212
-:1005700002D0EFF3098001E0EFF30880043007F0C8
-:1005800059FEFEE7000000000230800803D0013071
-:100590000238FCD1C046C0467047EFF3108072B6F7
-:1005A000704780F31088704710B5002004F0C2FD3A
-:1005B00010BD704710B5002007F0EAFC041E00D102
-:1005C00010BD144B186006F0AFFF411C200008F06E
-:1005D00035FC0400104B186006F026FF411C20007B
-:1005E00008F02CFC04000D4B1860013C0C49200065
-:1005F00008F024FC01300B4B1870FA218900200010
-:1006000008F01CFC0130084B1860C003074B186051
-:10061000D6E7C04684000008880000088000000873
-:1006200040420F0094000008900000088C00000871
-:1006300010B5234803F036F8224CB022D200A3585C
-:100640005B005B08A350E02189006358302083439E
-:10065000635080235B04A3501B4B1C4AE2500433BD
-:10066000A0229201E2501A4BFF22E25008F098FBC0
-:10067000C0225200A35801218B43A350FFF799FFDA
-:10068000FFF798FF134B1B68BA20195ACA00521A79
-:10069000196A8C4662440021D1601A6A185AC30054
-:1006A0001B1AD31859600C4A8031032004F09AFDBC
-:1006B0000A4804F0F3FB0A4804F048FC10BDC046A9
-:1006C000F8ED001000002640840500000100020043
-:1006D0008C050000D45F010820070008900700087F
-:1006E00028E30010034A90235B01D35803201840ED
-:1006F0007047C0460000204010B5FFF74EFF084C81
-:10070000902149016358074A1A40074B134363502D
-:10071000034B5B68DB06FBD5FFF743FF10BDC0460C
-:1007200000002040FCFF00000100FA0570B5040045
-:10073000830500D001BEFFF730FF0500FFF7D2FFB1
-:10074000032813D00B4B802292009C509020400134
-:100750001A5809491140094A0A431A50054B5B6867
-:10076000DB06FBD52800FFF71CFF70BDFFF7C4FFB9
-:10077000E8E7C04600002040FCFF00000300FA0547
-:1007800000B583B0130001AA1370012301F055FADC
-:1007900003B000BD10B509F00DFF10BD04280AD04C
-:1007A000052804D101394B1E994108007047401AB1
-:1007B00043425841FAE70120F8E710B582B00C0037
-:1007C000C0B201A901F07EFF002803D0012420005F
-:1007D00002B010BD2100019801F094FA04000198C4
-:1007E00001F084FFF3E710B5040001F015FA0100F1
-:1007F00001222000FFF7C4FF10BD10B5040001F076
-:1008000007FA010001222000FFF7BAFF10BD000027
-:1008100030B583B004000E2A10D80E2915D8120165
-:100820000A436B46DD1DDA7101F0FBF9010001237B
-:100830002A00200001F001FA03B030BD9C21064BD4
-:10084000064A8900064809F009FE9C21054B034A27
-:100850008900034809F002FE5CE30010CCE40010BC
-:1008600070E30010B8E3001010B582B004000191ED
-:1008700001F0DCF90100042301AA200001F0DDF9F8
-:1008800002B010BD30B589B006A90120FFF795FF71
-:10089000002800D08CE004A90230FFF78EFF04008E
-:1008A000444B1B68D86806AB1B78012B28D0032B60
-:1008B00024D0414B06AA51789578D27802920195BE
-:1008C00000913E4A3E4909F0E7FD3A4B1B68D86863
-:1008D00004AB1B78012B17D0032B13D0364B04AA83
-:1008E00051789578D278029201950091354A344931
-:1008F00009F0D2FD002C11D0FF2057E0324BD9E790
-:10090000324BD7E7304BEAE7304BE8E72B79042B43
-:1009100028D006AA9278934224D00134022C3CD8E5
-:1009200063001B195B002A4AD51806A90978D05C18
-:10093000FFF734FF0028F0D004AB19786878FFF790
-:100940002DFF0028E9D0AB78042B03D006AAD2787B
-:100950009342E2D1EB78042BD8D004AAD278934208
-:10096000DBD1D3E7134B1B68D8686B79022B07D018
-:10097000032B10D0042B01D0164A02E0164A00E0E7
-:10098000164A174909F088FD6879831EDBB2022BED
-:100990000CD9FF200AE0134AF3E7064B1B68DB681B
-:1009A00017220121104809F0EBFD012009B030BDEC
-:1009B000FF20FBE7EC010008CCE300100CE4001082
-:1009C00030E4001074E40010D8E30010D0E300100D
-:1009D000F4E40010F0E3001004E40010E0E3001081
-:1009E0009CE40010E8E30010B4E4001070B50500CA
-:1009F000002915D001235B422878584004090F22B2
-:100A00001040094E80008359634018091A40920033
-:100A100093594340013901350029EDD1D84370BDC8
-:100A200001235B42FAE7C04608E50010F0B5CE4668
-:100A3000474680B5A7B0140099462E9F2F9B984635
-:100A4000684602F0B9FC0021684602F0BAFC319B0E
-:100A5000002B02D0329B002B07DC2389E2689446EE
-:100A600063446689F618002513E01A003199684638
-:100A700002F0B5FCF1E723003A002900484601F0F6
-:100A800037FE002811D122003900684602F0A7FC89
-:100A90002D19B54204D2741B4445ECD94446EAE70B
-:100AA0003099684602F0A7FC002027B0C0BCB946C8
-:100AB000B046F0BDF0B59FB017001D002C4B1E686E
-:100AC000279B0493269B039306AB0293259B0193DC
-:100AD000249B00932B00FFF7A9FF041E3DD1289B08
-:100AE000002B04D0202206A9180009F071FD002374
-:100AF0000093204B2A00390016A801F00FFD041EB8
-:100B00002BD11CAB72226A441DA916A801F07CFDF2
-:100B1000002821DB1CDC1CA909881029F1D17223D3
-:100B20006B441B88202B20D10EAA1D99280001F0B0
-:100B3000DFFD071E17D120220EA906A8FFF72AFE07
-:100B400006000D4B1B6801248342DAD03C0004E010
-:100B500063425C41E4B200E00400002C00D13400A8
-:100B600020001FB0F0BD0400F7E701246442F7E75E
-:100B700098000008FFFF00001009000810B50B4B9B
-:100B800002689A420FD1C2680389D843824202D8D0
-:100B9000D418012000E00020002805D08B68A34273
-:100BA00002D8002000E0002010BDC0463DB8F396FA
-:100BB000F0B585B005000C000192002001F098FE10
-:100BC000C0B203A901F07EFD002806D001270398DA
-:100BD00001F08CFD380005B0F0BD2C236343EB1809
-:100BE0001A89DE689619042302AA3100039801F0DD
-:100BF0007FFD071E26D12C214C432D196C8902AB99
-:100C00001A88134B9A420DD0002C1DD102AB1A88C2
-:100C1000104B9A421AD1331902AA52889B18019A92
-:100C20001360D4E702AB59888C4201D00327CEE78A
-:100C30008919042302AA039801F05AFD0028E5D07F
-:100C40000127C4E70127C2E70327C0E70327BEE760
-:100C5000086900000769000010B582B004000800B0
-:100C6000E02212010192012906D002290FD00729A2
-:100C700010D1E26D603401E0626A283401A901F00C
-:100C800085FE002801D1019B236002B010BD226DBA
-:100C90005434F3E70120F8E710B5006A01F018FEBC
-:100CA00010BD70B504000121FFF7D6FF002802D067
-:100CB0000125280070BD02212000FFF7CDFF00288C
-:100CC00001D00125F5E707212000FFF7C5FF051E2C
-:100CD00001D00125EDE72000FFF7DEFFA066E8E781
-:100CE000F0B583B004000F00002001F001FEC0B297
-:100CF00001A901F0E7FC061E1AD1019801F008FED7
-:100D00000500019801F0F2FC2C21794361180023C1
-:100D1000032B05D8CA5C954208D10133DBB2F7E753
-:100D20000123002B07D0300003B0F0BD0023F8E70B
-:100D300001267642F7E701267642F4E700B587B050
-:100D4000130000220492039202920132FF320192B8
-:100D5000044A00920A0000210020FFF7ABFE07B012
-:100D600000BDC046805D0108F0B585B005000C00EF
-:100D70000192244B1F68002001F0BAFDC0B203A904
-:100D800001F0A0FC002802D0380005B0F0BD2C30E6
-:100D900060432E1821002800FFF7A2FF00282BD067
-:100DA0003369D90601D5012727E0019B039A310059
-:100DB0002800FFF7C3FF0700039D29003000FFF75D
-:100DC000DDFE002803D0104B1B68BB4215D0002C61
-:100DD0000AD10E4B1B68D868002C0BD10C4A0D4968
-:100DE00009F05AFB012708E0AA680021280001F059
-:100DF00015FDEEE7084AF2E70127039801F076FCBB
-:100E0000C2E7C0469800000810090008EC0100087D
-:100E100054E500105CE5001048E5001070B50500D1
-:100E20000E000020FFF72EFD0400022805D0042844
-:100E300003D0032801D0200070BD3200012128001A
-:100E4000FFF792FF044B1B688342F4D0012801D0C6
-:100E50000524F0E70400EEE710090008F8B50600E5
-:100E60000D0017000024012C11DC2C226243B21863
-:100E70003B002100300000F0D9FB002801D10134F3
-:100E8000F1E7002C04DD002D02D1002000E000205D
-:100E9000F8BD002383718360C36001334371036035
-:100EA0000371C37170474379012B01D00020704753
-:100EB0000368012B01D00020F9E70379012B01D051
-:100EC0000020F4E70120F2E730B583B005000C0004
-:100ED0000023009301930800FFF7E5FF002830D0BE
-:100EE000204B2A689A4212D01E4BEA6A9A421BD0C3
-:100EF000019B009A934200D90093009BA360009A43
-:100F00002100280000F0D2FD002003B030BD6A4669
-:100F100000212800FFF74CFE0028E5D0124B134AB1
-:100F20001349144809F09AFA01AA01212800FFF791
-:100F30003FFE0028DCD00C4B0C4A0F490D4809F04D
-:100F40008DFA21000831002001F000F8002802D1BC
-:100F5000A3680093D3E7044B044A0849054809F005
-:100F60007DFAC0463DB8F39688E50010C8E600104B
-:100F70003604000090E500104D0400006D040000F0
-:100F800070B504000D00FFF79FFF002812D1EB7928
-:100F90006422A354033BDBB2012B11D9EB79022B62
-:100FA00017D0042B15D0032B13D06423E35CFF2B45
-:100FB00018D070BD124B134A1349144809F04EFA69
-:100FC000002000F011FA0028E8D06423FF22E25448
-:100FD000E4E7002000F0F4F90028E6D06423FF22C3
-:100FE000E254E2E70A4B1B68DB680E220121094844
-:100FF00009F0C6FA084B034A0849044809F02EFADA
-:1010000088E50010D8E600109605000090E5001075
-:10101000EC010008D0E50010E0E50010AE0500008E
-:1010200070B50400FFF750FF002814D16423E55C7D
-:10103000EB1EDBB2012B14D9022D03D0042D01D0FD
-:10104000032D07D1002000F0BBF9002802D0642353
-:10105000FF22E25470BD084B084A0949094809F0CB
-:10106000FDF9002000F0C0F90028E5D06423FF223C
-:10107000E254FF25E2E7C04688E50010B4E6001020
-:101080005305000090E5001070B504000D00FFF757
-:1010900008FE00280FD1002200212000FFF7DEFE0D
-:1010A000002814D1200000F0CDFB00281AD16423C1
-:1010B0000122E2540AE0344B1B68D868E022120196
-:1010C000324909F0E9F964230122E25470BD2E4B44
-:1010D0001B68D86800222E4909F0DEF9642301223A
-:1010E000E254F3E72800FFF7D4FE2900200001F0C6
-:1010F00001F8002814D12800FFF7D5FE00281AD0E7
-:10110000EB79012B34D02A0001212000FFF72CFEBF
-:10111000204B1B68834232D064230522E254D5E77A
-:10112000194B1B68D86800221B4909F0B5F96423E4
-:101130000122E254CAE729002000FFF721FF00281E
-:101140000AD12A0000212000FFF788FE002809D1DB
-:1011500064230122E254B9E7104B114A11491248A5
-:1011600009F07CF90D4B0E4A10490F4809F076F949
-:1011700029002000FFF752FE6423E054A6E7EA7935
-:101180006423E254A2E7C046EC010008E4E5001045
-:101190002CE60010100900085CE6001088E500103D
-:1011A000F4E600105306000090E500105906000018
-:1011B00010B501F033FB10BDF8B5DE4657464E467C
-:1011C0004546E0B58946924698460A9B9B460B9E4B
-:1011D000002512E04346E9182300124A484601F070
-:1011E00087FA002819D15B46E91823000D4A5046BA
-:1011F00001F0BEFA002812D12D19B54206D2741B97
-:101200008023DB009C42E5D91C00E3E70020F0BC12
-:10121000BB46B246A946A046F8BD0120F7E701202B
-:10122000F5E7C04680090008F0B5C64600B584B0B1
-:1012300004000E004E4B1B6898466C22002109F0FA
-:10124000D0F94C4B63624C4B23654C4BE365012753
-:101250007F420025012D14D82900002001F048FB11
-:101260002C21694320316118C0B201F02BFA071E0E
-:1012700001D10135EEE7424B424A4349434809F068
-:10128000EDF869462000FFF7FFFE6423E35C6A4641
-:10129000D371042B18D8022B21D2012B2BD164231C
-:1012A000E35CFF2B2BD0012B37D1394B22689A42BC
-:1012B0003BD0384B1B68D86800232200364909F020
-:1012C000EBF80327002549E0052B14D1002000F09E
-:1012D0008BF8071EE3D06423FF22E254DFE7694660
-:1012E0002000FFF79DFE071ED9D0254B254A2B492C
-:1012F000264809F0B3F86423FF22E254CFE7254BD8
-:101300001B68DB680E220121254809F039F9254BBD
-:101310001C4A25491D4809F0A1F86A460021200011
-:10132000FFF79CFD071EC0D0CCE7102200216846C5
-:1013300009F057F9236A5B783371236A5B68B360FD
-:1013400034601A4B1B689846BCE70122521B2C23C1
-:101350005343E318186A01F0C9F90135012DF4D996
-:10136000002F00D14746380004B080BCB846F0BD1D
-:1013700098000008800D0008807D000880ED0008BE
-:1013800088E5001014E70010D406000090E5001076
-:101390003DB8F396EC0100088CE60010140700003D
-:1013A000D0E50010E0E500102B0700001009000850
-:1013B00010B501000148FFF737FF10BD1409000800
-:1013C00010B582B001A9012001F07CF9002803D0FA
-:1013D0000124200002B010BD0198FFF704FA0400B8
-:1013E000019801F083F9F4E710B584B003A9012056
-:1013F00001F068F9002803D00124200004B010BDDA
-:1014000001A9039800F07EFC041E0CD101ABDB782F
-:10141000032B03D0039801F069F9EEE70398FFF777
-:10142000ECF90400F6E70124F4E70000F0B5CE463D
-:1014300000B582B00C0016001D00526AC300D758D8
-:101440001368FF1A0138C0001258D31A99462B6846
-:10145000012B15D1EB68022B0CD00899300000F05D
-:101460008BFD00282AD12A000899300000F0EAFDFF
-:1014700000282AD10999300000F07EFD00282BD1E8
-:10148000220039000898FFF793FE00282BD1019421
-:1014900000974B46089A11003000FFF78DFE002898
-:1014A00028D12900300000F0E9FB2B6801332B60C4
-:1014B000002826D102B080BCB946F0BD5421144B9F
-:1014C000144AFF31144808F0C9FFAB21104B114AF0
-:1014D0004900114808F0C2FFAD210D4B0D4A4900EB
-:1014E0000D4808F0BBFFAF21094B0A4A49000A48E2
-:1014F00008F0B4FF6221064B064AFF31064808F0A7
-:10150000ADFFB321024B034A4900034808F0A6FF90
-:1015100088E50010CCE8001024E70010F0B5CE46B6
-:10152000474680B583B00F0015001C00566AC30003
-:10153000F2583368D21A90460138C0003658F61A6D
-:101540002A6D11581368CB1A99462279012A07D0BF
-:101550002379022B32D003B0C0BCB946B046F0BDEF
-:101560003A0031000A98FFF723FE002818D10197AE
-:1015700000964B460A9A0B992800FFF71DFE00289B
-:1015800015D12100280000F079FB022323710028E7
-:10159000DED08021224B234AFF31234808F05EFF32
-:1015A0007A211F4B1F4AFF311F4808F057FFBE2109
-:1015B0001B4B1C4A49001C4808F050FF3A004946A2
-:1015C0000B98FFF7F5FD00281CD101974B460093BF
-:1015D00043460B9A0A992800FFF7EEFD002818D120
-:1015E0002100280000F04AFB236801332360012317
-:1015F00023710028AFD08C21094B0A4AFF310A48D9
-:1016000008F02CFFC221064B064A4900064808F0A4
-:1016100025FF8821024B034AFF31034808F01EFFD3
-:1016200088E50010B8E8001024E7001070B582B01B
-:1016300016001C1E3AD0436A5D686379012B12D0F4
-:10164000022B19D00025002001F052F9C0B201A9E7
-:1016500001F038F8002830D00125019801F046F853
-:10166000280002B070BD002922D11D4B1B682268E2
-:101670009A42E8D80025E6E72368012B08D9184AE2
-:101680001268934204D8002914D100250131DAE709
-:10169000012B01D00025D6E7002900D00025012923
-:1016A000D1D12379022BCED10021CCE70025CAE786
-:1016B0000025C8E700250021C5E7202332002900C6
-:1016C000019801F015F8051E08D1002CC5D032682C
-:1016D000044B9A42C1D001256D42BEE70125BCE70B
-:1016E0009C0000083DB8F396F0B5DE4657464E46DE
-:1016F0004546E0B589B006000591049200230393A6
-:101700000378032B00D182E000F095FAE0252D014B
-:1017100000239A460133019300239B46013B9946DF
-:101720000023029380464F460BE06B1E9B460292BD
-:101730001AE0019BA34202D001239C46E244013DF2
-:101740000194002D1DDD30784346E918013901234D
-:1017500006AA073200F086FE041E5ADB06ABDA79D1
-:10176000531EDBB2012BE0D9300001F0D1F806ABFB
-:1017700007331B789842DCD07A1CE0D12F0003930A
-:10178000DDE7B9465346012B24DC049908310020DB
-:1017900000F0DCFB041E2BD1049B9E6805998F6E24
-:1017A0003900300007F04AFB05003900300007F02F
-:1017B000CBFB4B1E99416918484601302AD0894518
-:1017C0001CDA0123049A537113004A461A60039AE3
-:1017D0001A711FE0134B1B68DB6825220121124898
-:1017E00008F0CEFE114B124AC221124808F036FE14
-:1017F000114B0F4AC8210F4808F030FE0223049A0B
-:10180000537113005A461A60029A1A7102E00724B3
-:1018100000E00124200009B0F0BCBB46B246A94656
-:10182000A046F0BDEC0100086CE70010E0E50010F8
-:1018300010E9001024E7001088E500100068484314
-:101840007047000070B5856A446DAC4202D0631CDD
-:10185000AB4213D1E0231B019D4219D80023002184
-:10186000A34229D2DA00416A89184968066DB44654
-:10187000624452688A4215D10133F1E7194B1B6863
-:10188000DB683A220121184808F07AFE002012E0B5
-:10189000144B1B68DB6831220121144808F070FEEC
-:1018A000002008E00F4B1B68DB682E220121104846
-:1018B00008F066FE002070BDAC4211D2426ADB0027
-:1018C000D3185B68994201D10120F4E7054B1B68EE
-:1018D000DB682E220121064808F052FE0020EAE7CC
-:1018E0000120E8E7EC01000894E70010D0E70010C1
-:1018F00004E8001070B586B004A90120FEF75DFF72
-:10190000041E25D11D4B1B68D86804AB1B78012B26
-:1019100027D0032B23D01A4B04AD6A78A978EE7830
-:10192000029601910092174A174908F0B5FD2B78ED
-:10193000012B02D1AB78032B15D0104B1B68DB6851
-:1019400019220121114808F01BFE200006B070BDCD
-:1019500030210F4B0F4AFF310F4808F07FFD0F4B2E
-:10196000DAE70F4BD8E7054B1B68DB682122012122
-:101970000C4808F005FE0224E7E7C046EC01000829
-:10198000CCE3001034E8001030E400107CE80010D4
-:1019900088E50010FCE8001024E70010D8E30010F0
-:1019A000D0E3001058E80010F0B589B005900C00A5
-:1019B0001500334962681140324A914202D12268CF
-:1019C000012A01D009B0F0BD06A91800FEF7F5FE06
-:1019D000002834D12C4B1B68D86806AB1B78012B30
-:1019E00036D0032B32D0294B06AF7A78B978FE78FF
-:1019F000029601910092264A264908F04DFD3B7857
-:101A0000032BDFD12900059800F0B6FA002821D178
-:101A10002800FEF7F2FE002823D1A1682800FEF777
-:101A200023FF002824D1280000F010F90028C9D095
-:101A3000B821194B194AFF31194808F00FFDD4217C
-:101A4000154B164A4900164808F008FD154BCBE720
-:101A5000154BC9E7D721104B104A4900104808F030
-:101A6000FDFCB2210C4B0D4AFF310D4808F0F6FC8D
-:101A7000DA21094B094A4900094808F0EFFCC04641
-:101A800000FF00FF00010004EC010008CCE300109F
-:101A900098E8001030E4001088E50010ECE8001031
-:101AA00024E70010D8E30010D0E30010F0B5C646DC
-:101AB00000B584B080460E00354B00211960436AA2
-:101AC0005F680023DB19324D29684C1C2C6093425F
-:101AD000F8D303A9012000F0F5FD002812D102A9D6
-:101AE000022000F0EFFD002813D10223029A3100FA
-:101AF0004046FFF759FF7379012B11D00223737110
-:101B0000012429E0D821234B234AFF31234808F040
-:101B1000A5FCED211F4B204A4900204808F09EFCFF
-:101B20001B4B1C6800E0013C002C11D0184B1B68BB
-:101B300032689B1A0133A342F5D3029B0193039BA6
-:101B400000933300424639002000FFF76FFCEAE7BC
-:101B500001233360D2E701340D4B1B68A3420DD340
-:101B60003368A342F7D8029B0193039B0093330091
-:101B7000424639002000FFF7D1FCECE7039800F063
-:101B8000B5FD029800F0B2FD04B080BCB846F0BDCF
-:101B90009C00000888E50010E0E8001024E7001031
-:101BA000012800D170470220FCE7000010B5102288
-:101BB000044908F0FFFC002801D0022010BD0120DC
-:101BC000FCE7C046E4E4001030B585B00D0001200C
-:101BD00000F078FD041E02D0200005B030BD1023B7
-:101BE0006A460949012000F03DFC041E07D110227D
-:101BF0000649684608F0DEFC002800D10400286889
-:101C000000F074FDE8E7C04684110000E4E4001031
-:101C1000004870478311000010B5FFF7F9FF013845
-:101C200010BD10B5FFF7F8FF013810BD10B5FFF774
-:101C3000F8FF043810BD0020704710B5007800F0A0
-:101C40009FFB002800D110BD0120FCE710B50078F3
-:101C50001023044A044900F093FB002800D110BD72
-:101C60000120FCE7E4E400108411000010B5C36D0E
-:101C700059689020800107F0E1F810BD30B583B0BD
-:101C80000C0001A9012000F01DFD002806D0012450
-:101C9000019800F02BFD200003B030BD0198FFF744
-:101CA000CAFF050001212000FFF7C8FD291863794C
-:101CB000012B0ED023790133DBB26A460332137055
-:101CC000019B1878012300F05BFB041EE0D0012487
-:101CD000DEE72379F1E7F0B5C64600B580460F0090
-:101CE0001600002400E00134B44207D23D5D4046B6
-:101CF00000F00EFE8542F6D0002000E0012080BCFE
-:101D0000B846F0BDF0B5DE4657464E464546E0B50E
-:101D100089B004000E0002A9072000F0D3FC051EC4
-:101D200008D00127380009B0F0BCBB46B246A9462E
-:101D3000A046F0BD2078102304AA834900F092FB4E
-:101D4000002800DAEEE0102204A90298FFF7C3FF92
-:101D5000071E00DAE8E001286FD004A8FFF726FF8D
-:101D600030700023994698462000FFF75AFF010083
-:101D70002078012302AA073200F074FB002800DA61
-:101D8000D4E0012202ABD91D0298FFF7A4FF00287E
-:101D900000DACDE002AB07331B780F221A407270D5
-:101DA0001B093371012801D0042A03D90123737060
-:101DB000002333712000FFF72FFF01002078B71CAC
-:101DC00001233A0000F04EFB002800DAB2E00122C5
-:101DD00039000298FFF77FFF002800DAACE0012805
-:101DE00063D0B078FFF7DCFEB0702000FFF710FF83
-:101DF00082462078F31C9B4601235A46514600F048
-:101E000031FB002800DA99E0012259460298FFF7D9
-:101E100062FF071E00DA93E0012849D0F078FFF74F
-:101E2000BFFEF0704B46002B00D18BE010224146E4
-:101E3000200000F0F3FC070074E7032333702378DD
-:101E4000022B05D0062B03D00023994698468BE73A
-:101E5000A36810225242944663449846102304AA71
-:101E60004146200000F06EFD8146031E00DA59E76E
-:101E700001280DD004A8FFF799FEC0B230700128E8
-:101E80000BD04B46002B00DA4CE7012399466BE759
-:101E9000023333700023994666E72078102304AAA2
-:101EA000294900F06DFA8146EBE70323B3709CE704
-:101EB0000323F3702378052B25D021D8012B22D0C2
-:101EC000022B00D02EE7A3681822524294466344A6
-:101ED000984601235A464146200000F033FD031E78
-:101EE000019000DA1EE7012811D0F078FFF758FEC4
-:101EF000C0B2F07002280DD1019B002B96DA11E7D9
-:101F0000062BE0D00EE7B378012B8BD1DBE7023351
-:101F1000F37087E7207801235A46514600F030FAE3
-:101F20000190E9E70127FDE60127FBE60127F9E635
-:101F30000127F7E60127F5E60127F3E60127F1E699
-:101F40000127EFE62F00EDE68411000030B583B0E5
-:101F50000C0001A9FFF738FE002801D003B030BD06
-:101F6000019D2800FFF762FE01002878042322006B
-:101F700000F078FAF2E70000F0B5CE46474680B5AB
-:101F800083B007008946294B1B68D8680A7828491E
-:101F900008F082FA01A9072000F094FB002806D07F
-:101FA0000124200003B0C0BCB946B046F0BD0021FA
-:101FB00000F09EFC04000121002000F099FC4B463B
-:101FC0001B78A34201D083422ED1180000F048F9BB
-:101FD00080463800FFF74AFE441E0025FA6DE300F4
-:101FE000D3185E6819681368C91A41443200019811
-:101FF000FFF7DEF8002811D1013CAD1990239B01B9
-:102000009D42EBD34B46996840394022484600F048
-:1020100005FC0400019800F069FBC2E7054B064A85
-:102020000649074808F01AFA0124BAE7EC0100084B
-:1020300028E9001088E50010C0E90010190200002E
-:102040004CE9001030B583B00C0015006946022041
-:10205000FEF7B3FB002814D1E979012917D16B46AB
-:10206000DB78012B1FD0A9682000FEF7FDFB0028BC
-:1020700024D12000FFF7EAFD002825D1002003B07D
-:1020800030BD144B144A1549154808F0E7F90022F1
-:102090002000FEF7BDFB0028E1D00E4B0E4A11498F
-:1020A0000F4808F0DBF92000FEF7A7FB0028DAD084
-:1020B000084B094A0C490A4808F0D0F9054B064A72
-:1020C0000A49074808F0CAF9024B034A084904487C
-:1020D00008F0C4F988E50010ACE900103E020000E9
-:1020E0004CE9001042020000470200004B020000D1
-:1020F0005602000070B584B005000E00FFF7FAFB31
-:10210000041EF06008D0022809D103A9012000F0C4
-:10211000D9FA002809D00124200004B070BD1E4B5C
-:102120001E4A1F491F4808F099F902A9072000F02C
-:10213000C9FA002801D00124EEE7320029000398F3
-:10214000FFF7D2FA041E19D10398FFF76AFD0100C8
-:1021500001236A460732012000F084F901226B4610
-:10216000D91D0298FFF7B7FD002813DB01280CD01A
-:102170006B46DA790F231340F3710400039800F0E3
-:10218000B5FA029800F0B2FAC6E76B460122DA719E
-:102190002000EDE70124BFE7E0E5001098E900101A
-:1021A0006F0200004CE9001010B5FA21490006F05A
-:1021B00045FE10BD10B5FFF7F7FF400210BD10B58A
-:1021C000FEF714FC10BD000070B5204CA5440400BF
-:1021D0000E001D000132839201A9072000F072FA5F
-:1021E000002805D00124200084239B009D4470BD5D
-:1021F000FA225200290002A808F0EAF9839B809392
-:10220000134B1B687F93FE21490002A8FFF7D7FFFD
-:1022100082908190012E10D00136F1008919490277
-:10222000091980239B0002AA019800F0A1FA041E5C
-:1022300005D1019800F05AFAD5E70026EDE7054BE5
-:10224000054AE921054808F009F9C046F0FDFFFFFD
-:10225000C4EA001088E500107CEA0010DCE90010F8
-:10226000012804D0022804D190208001704700206A
-:10227000FCE701204042F9E7F0B5DE4657464E46FE
-:102280004546E0B5394CA54481460191029205A925
-:10229000072000F017FA061E63D100250023984698
-:1022A00000279A4603930CE0859B9B46FE2149003C
-:1022B00006A8FFF784FF584518D001239C46E24446
-:1022C0000135012D19D8EC00641964024C448023B7
-:1022D0009B0006AA2100059800F00AFA002842D1C6
-:1022E000234B839A9A42DFD00137E9E7849B9845D4
-:1022F000E6D82E0098460394E2E7022F11D0534609
-:10230000022B1CD101267642059800F0EFF930002F
-:1023100087239B009D44F0BCBB46B246A946A0461D
-:10232000F0BD0023029A1360059800F0F1FA010055
-:10233000FA225200019808F054F90126E4E7029BC2
-:1023400042461A60FA235B00019A0399059800F04F
-:10235000CFF90028D8D0074B074AAB21074808F02F
-:102360007DF80126D3E70126D1E7C046E4FDFFFF53
-:10237000AFBEADDE88E50010ACEA0010DCE900106D
-:10238000F0B5CE46474680B5FFB007000C00914639
-:102390001E00FA214900200006F0D6FD0D0032197A
-:1023A0002A4B9A420DD83800FFF75AFF071E0FDB61
-:1023B0002000FFF7FFFEC719002398460120404286
-:1023C00026E00E21224B234AFF31234808F046F82D
-:1023D0001221224B1F4AFF311F4808F03FF85A1BB9
-:1023E000280068444946414408F0F2F86B467D9A5B
-:1023F00021003800FFF7E8FE002818D1F53EFF3E27
-:1024000080239B009C4667440C3B9C46E04400258F
-:10241000002E15DD7DAA69463800FFF72DFF041E4A
-:102420000CDBFA235B009E42D9DC3200D8E72E2178
-:102430000B4B084AFF31084808F010F801204042D1
-:102440007FB0C0BCB946B046F0BDC0469411000094
-:1024500028EA001098EA0010DCE9001054EA0010A5
-:1024600088E50010F0B5C64600B5FEB005000E00C8
-:1024700090461C00FA214900300006F065FD0F006F
-:10248000A219214B9A420AD82800FFF7E9FE051E3F
-:102490000CDB3000FFF78EFE451900261DE0AA2157
-:1024A0001A4B1B4A49001B4807F0D8FFAC211A4BB6
-:1024B000174A4900174807F0D1FF22003900694444
-:1024C0004346981908F084F8F53CFF3C80239B00B4
-:1024D0009C466544F536FF360027002C0CDD7DAAAE
-:1024E00069462800FFF7C8FE00280ADBFA235B00D4
-:1024F0009C42E2DDDA1BE1E700207EB080BCB846FA
-:10250000F0BD01204042F8E79411000028EA0010D5
-:1025100064EA0010DCE9001054EA0010F0B5D64679
-:102520004F464646C0B582B004000D0017009946DC
-:102530000AAA13789A46002845D0002947D0002FD0
-:1025400049D00E89CB689C466644042301AA310019
-:10255000380000F0CDF88046002840D101AB1A8841
-:10256000274B9A421FD06B89002B40D101AB1A88B0
-:10257000244B9A423FD1256067604B4623815346E6
-:10258000A3726B899B19E3606B899B1901AA52881E
-:102590009B18636104362661404602B0E0BCBA462F
-:1025A000B146A846F0BD6B8901AA51888B421AD169
-:1025B00089190423380000F09BF80028D6D00123A5
-:1025C0005B429846E8E701235B429846E4E7012333
-:1025D0005B429846E0E701235B429846DCE7012333
-:1025E0005B429846D8E701235B429846D4E7012333
-:1025F0005B429846D0E701235B429846CCE7C04651
-:102600000869000007690000F0B583B004000F00FE
-:1026100016001D00002848D00368002B48D04368EE
-:10262000002B20D1012040423BE0042301AA216974
-:10263000606800F05DF800283DD1A37A002B03D03C
-:102640002369E268934239D223891D4A934218D004
-:1026500001AA1288934214D001AB5B882269944688
-:102660006344043323612369626993421BD2226865
-:102670005289002AD9D0E2689A42D6D10433236124
-:10268000D3E7002D02D001AB1B882B8023690433D4
-:102690003B6001AB5B88338022699446634404331A
-:1026A000236103B0F0BD0120FBE701204042F8E7C1
-:1026B00001204042F5E701204042F2E70120F0E727
-:1026C000FFFF000010B5002200E001329300064C2D
-:1026D0001B59002B05D01C788442F6D10B600020DA
-:1026E00001E00120404210BDA0000008704700003A
-:1026F00070B5150044688C4214D9CA18944218D990
-:10270000611842787F2A1BD052B2002A1EDB0124B6
-:102710006442114B1B68D8682200104907F0BCFEC8
-:10272000200070BD20210E4B0E4AFF310E4807F0ED
-:1027300095FE90210D4B0B4A49000B4807F08EFE89
-:102740001A00280007F044FF0024E9E72A0000F0FF
-:102750006FF9041EE4D0DCE7EC01000844EB001044
-:10276000C8EA001098EC0010DCEA00102CEB001016
-:10277000F8B5150044688C420CD9CA18944210D997
-:10278000641842787F2A13D052B2002A34DB012029
-:102790004042F8BDA3211B4B1B4A49001B4807F0D0
-:1027A0005DFE48211A4B184AFF31184807F056FEC3
-:1027B000DA0506D1E205D00D002A09D15F0A06002C
-:1027C00017E0A921134B104A4900104807F046FEB4
-:1027D0005421114B0C4AFF310C4807F03FFE2900F1
-:1027E000200002F017F980239B009C466444654456
-:1027F0000136BE42F3D3CCE72A00210000F040F9B5
-:10280000C7E7C046C8EA001084EC0010DCEA0010FC
-:102810002CEB00106CEB00108CEB001070B5836893
-:10282000934211D38B4216D9541845685B199C42C8
-:1028300018D26D18531941787F291AD049B200294E
-:1028400034DB0120404270BDBC211B4B1B4A4900B8
-:102850001B4807F003FE7A211A4B184AFF3118482B
-:1028600007F0FCFDBD21184B144A4900144807F03D
-:10287000F5FD6D0A6D025B0A5B029D4212D05B1B87
-:102880005C0A0020002CDED0013C6002401902F0FE
-:1028900087F80028F6D094210C4B084AFF310848ED
-:1028A00007F0DCFD280002F07BF8CCE711002800DF
-:1028B00000F00EF9C7E7C046B8EB001070EC00104E
-:1028C000DCEA0010CCEB0010E0EB001008EC00108C
-:1028D00010B543787F2B08D05BB2002B02DB0120C0
-:1028E000404210BD00F0C6FBFBE780208000F8E707
-:1028F000012908D0022908D0002902D00120404235
-:1029000070470120FCE70220FAE70320F8E7000007
-:1029100010B543787F2B0BD05BB2002B02DAFF207F
-:10292000C0B210BD034B044A0449054807F096FDA8
-:102930000020F5E724EC001058EC00101F02000006
-:10294000DCEA0010F8B5CE46474680B50700904651
-:102950001E00FFF7CDFE814600280FD10024B442AF
-:1029600009D243461D5D3800FFF7D2FF854208D1EA
-:102970000134E4B2F3E70123994602E001235B420C
-:1029800099464846C0BCB946B046F8BDF8B50E00F9
-:102990001500002200E00132930020495B58002B13
-:1029A00004D019788142F6D11C0000E01C00002BF5
-:1029B0002ED063787F2B11D05BB2002B2BDA00F086
-:1029C00061FB0700A368D8190138390006F036FA10
-:1029D000336883420BD36268002414E0072802D1D5
-:1029E0008027BF00EEE700F04DFB0700EAE70C4B45
-:1029F0000C4A0D490D4807F031FDE300EB185F600C
-:102A00001A60D21901348442F7D330600020F8BD37
-:102A100001204042FBE701204042F8E7A000000807
-:102A20002CEC001040EC001072020000DCEA0010F8
-:102A3000F0B5C64600B582B00E0017001C00437802
-:102A40007F20184000F0AEFA0500E8231B069C46E4
-:102A5000664400F0AFFA804600F0B0FA01900094AE
-:102A60003B0032002900404604F0F6F9002804D16A
-:102A7000002002B080BCB846F0BD01204042F8E71B
-:102A8000F0B5C64600B582B00E0017001C004378B2
-:102A90007F20184000F086FA0500E8231B069C46BC
-:102AA000664400F087FA804600F088FA01900094AE
-:102AB0003B0032002900404604F048FA002804D1C7
-:102AC000002002B080BCB846F0BD01204042F8E7CB
-:102AD000F0B583B00500002000F064FA0400E8239C
-:102AE0001B06E818A3699D696D42054000F062FA73
-:102AF0000600A3699F6900F061FA00903B002A007C
-:102B00002100300004F0C0FA002802D1002003B0F8
-:102B1000F0BD01204042FAE7F0B5C64600B58C682A
-:102B20000A688423C3580F252B40073DED1A230064
-:102B3000AC4226D92B0024E055782D021678354377
-:102B4000D678360697783F043E4335439827C551DB
-:102B500055792D0216793543A846D67936069579EA
-:102B60002D042E4345463543C551D218E41A84231B
-:102B7000C3580F252B40073DED1A2300AC4200D966
-:102B80002B00002B00D183E0082BD5D0012B24D0C3
-:102B9000022B26D0032B2BD0042B33D0052B3ED079
-:102BA000062B4CD0072B5DD053781B0215782B4396
-:102BB000D5782D069678360435432B4398268351D5
-:102BC00053791B0215792B43D5792D0697793F044C
-:102BD0003D432B4383510823C7E716789025465180
-:102BE000C3E755782D021678354394268551BCE706
-:102BF00055782D0216783543942685519678902580
-:102C00004651B2E755782D0216783543D678360608
-:102C100097783F043E43354398268551A5E755787C
-:102C20002D0216783543D678360697783F043E4312
-:102C300035439826855116799025465195E7557864
-:102C40002D0216783543D678360697783F043E43F2
-:102C500035439826855155792D02167935439426AA
-:102C6000855182E755782D0216783543D678360699
-:102C700097783F043E4335439826855155792D0278
-:102C800016793543942685519679902546516CE7FF
-:102C90000A608C60002C0CD1F924E4000359012255
-:102CA000934303518A61CB69002B02D0CB69012089
-:102CB000984780BCB846F0BDF8B50E004C69CA68AC
-:102CC000C423C3580F21194023008C421CD90B0088
-:102CD0001AE0D825415911700F0A57700F0C9770E0
-:102CE000090ED17045591571290A5171290C91713C
-:102CF0002D0ED571D218E41AC423C3580F251D40D8
-:102D00002300AC4200D92B00002B6DD0082BE0D063
-:102D1000012B1ED0022B20D0032B24D0042B2BD030
-:102D2000052B33D0062B3ED0072B4BD0D821435850
-:102D300013701D0A55701D0C95701B0ED3704358EF
-:102D40001371190A5171190C91711B0ED37108235B
-:102D5000D0E7D02141581170CCE7D42141581170EF
-:102D6000090A5170C6E7D42141581170090A5170FF
-:102D7000D02141589170BDE7D821415811700D0AFA
-:102D800055700D0C9570090ED170B3E7D8214158DC
-:102D900011700D0A55700D0C9570090ED170D0216F
-:102DA00041581171A6E7D821415811700D0A55708C
-:102DB0000D0C9570090ED170D42141581171090A7A
-:102DC000517197E7D821415811700D0A55700D0CBB
-:102DD0009570090ED170D42141581171090A5171B1
-:102DE000D0214158917185E7F2607461002C0DD1BA
-:102DF000F922D200835802218B4383500323B3610D
-:102E0000336A002B02D0336A032098477461F8BDFF
-:102E100010B5264A264BD358DA070DD49A0716D494
-:102E20005A071FD5234B05229A61204AF823DB005D
-:102E30000421D150D35809E01C4C1E492000FFF753
-:102E40006BFEF823DB000122E250E35810BD174C63
-:102E500018492000FFF730FFF823DB000222E25080
-:102E6000E358F3E71A0709D5124B06229A610F4A75
-:102E7000F823DB000821D150D358E7E7DA0609D55B
-:102E80000C4B07229A61094AF823DB001021D1502C
-:102E9000D358DBE79B06D9D5064B08229A61034A33
-:102EA000F823DB002021D150D358CFE70000424067
-:102EB000CC070000805E010810B52E4C2E4A03217D
-:102EC000200001F0EBFE11220321200001F00CFE96
-:102ED0002A4A0421200001F0E1FE112204212000F1
-:102EE00001F002FE264A0521200001F0D7FE112242
-:102EF0000521200001F0F8FD224A0621200001F002
-:102F0000CDFE11220621200001F0EEFD1E4A072110
-:102F1000200001F0C3FE11220721200001F0E4FD92
-:102F20000021022004F052FB0221022004F07EFB6B
-:102F3000022004F017FB1549154805F0BBF8FA22EA
-:102F4000144B92001449154802F040FD041E0FD1A5
-:102F50000F4B00229B5E002B06DB1F2213401E3A04
-:102F60009A4013000E4A13600A490C4802F00CFF05
-:102F7000200010BD8005314044ED001010ED001020
-:102F8000DCEC0010A8EC001078ED0010112E001001
-:102F9000E4010008805E0108ACED00100000424032
-:102FA00000E100E0024B1B685B688000C05870477E
-:102FB000385F0108004870470000424000487047F1
-:102FC000805E010810B50400FFF776FF002800D0EE
-:102FD00010BD044B1C60044A2100044803F02EFE7F
-:102FE000F6E7C046385F0108805E010800004240F5
-:102FF00070B51D4B5B68032831D00AD8012811D069
-:10300000022803D11B6802221A700EE00120404200
-:1030100024E0042803D11B6808221A7005E001206F
-:1030200040421BE01B6801221A7001380F4A43001E
-:10303000191889008C581918890051184D680E7A92
-:103040000B4A16722900200001F028FE32002900E8
-:10305000200001F049FD0448FFF7B4FF70BD1B6874
-:1030600004221A70E1E7C046D40100088C01000870
-:10307000E4000008024B5B681B689B69586A704754
-:10308000D4010008024B5B681B689B699869704714
-:10309000D401000870B504001D4D280003F040FB6A
-:1030A0002B685B005B082B60022004F073FA194B5D
-:1030B00000229B5E002B0BDB1F2213401E3A9A401E
-:1030C0001300154980228B50BFF34F8FBFF36F8FD2
-:1030D000104B59880020185E04F0BAFF013C6000D4
-:1030E000001980000D4BC05801F0D4FC0C4C20009E
-:1030F00001F0D0FC200001F0CDFC200001F0CAFC62
-:10310000200001F0C7FC200001F0C4FC70BDC046E7
-:1031100000004240E401000800E100E08C010008EA
-:1031200080053140074BC200D05A9B1859889A88B5
-:10313000DB88084310431843C0B2431E9841C0B215
-:103140007047C046845F010870B515000024002C4C
-:1031500002D0124C200070BDA3005B195B00104A26
-:103160009A5A6B000F4E9B5B9A4201D30134EEE7F3
-:1031700000230B704C700C4B03602000FFF7D2FF54
-:10318000002807D00649A20055196D006B5A01337B
-:103190006B52DFE7044800F0FDFBF3E7011000008D
-:1031A000845F0108BCED00100000104070B50600FF
-:1031B0000D004C78A3009B185B0010495B5A002B54
-:1031C00004D0A400A4186400013B63526878FFF7A0
-:1031D000A9FF002800D070BD094B1B68002B05D04B
-:1031E0003368002B05DB01232B70F4E700F026FB8E
-:1031F000F6E7300000F014FCF5E7C046845F0108F4
-:10320000D85F010870B504000D0000280BD0211D07
-:103210002A002000FFF798FF002800D1A571434243
-:103220005841C0B270BD01BEF1E710B5002803D00F
-:103230000379002B02D010BD01BEF9E782790100AD
-:1032400001C9FFF7B3FFF6E730B583B005000C0006
-:10325000002801D0002901D103B030BD0321684608
-:10326000FFF7D0FF002803D16846FFF7DEFFF3E742
-:103270000098A3B2074A11682D228A5C1F2A04D83D
-:103280000022290000F07AFCEEE70022290000F07D
-:1032900003FDE9E7D45F010810B5041E01D0002941
-:1032A00000D110BDFFF7D0FF03212000FFF7AAFFD8
-:1032B000F7E7000070B505000C1E22D0002B23D0CC
-:1032C000006816490E682D21715C1F2911D8210054
-:1032D00000F05EFD00281AD12868104B1A682D23D3
-:1032E000D35C1F2B09D8210000F008FE002811D163
-:1032F00070BD210000F0D6FEECE7210000F060FF79
-:10330000F4E701204042F3E701204042F0E70120CA
-:103310004042EDE701204042EAE7C046D45F0108A1
-:1033200070B5002913D0002A14D0CC68002C14D01A
-:1033300000680D4C25682D242C5D1F2C04D800F04E
-:10334000F3FD00280CD170BD00F050FFF9E701201B
-:103350004042F8E701204042F5E701204042F2E711
-:1033600001204042EFE7C046D45F010810B50029B4
-:1033700013D0002A14D0CB68002B14D000680D4B5A
-:103380001C682D23E35C1F2B04D800F019FE0028D5
-:103390000CD110BD01F0C6F8F9E701204042F8E772
-:1033A00001204042F5E701204042F2E7012040427F
-:1033B000EFE7C046D45F010810B59821FFF76CFF16
-:1033C00010BD10B50B0001000831002B05D1022201
-:1033D00003003833FFF76EFF10BD0122F8E710B588
-:1033E0000C00131E01D1002010BD01000831220085
-:1033F000FFF796FFF8E710B50A0001000831FFF764
-:10340000B5FF10BD10B50549C02252008B580120F0
-:1034100003438B5005F008FD10BDC0460000264058
-:103420000349C02252008B58012083438B507047C0
-:103430000000264070B50400421E304B9A4256D818
-:103440002F4B1B78002B55D12D4B01221A702D4B81
-:103450001B78002B0ED0FFF7E3FF2B4B1C800023C3
-:103460000C2B1FD89900294A52185288A24212D90F
-:103470000133F5E7264D8032FF32AB580126334346
-:10348000AB5005F0D1FCE122D200AB58B343AB50B6
-:103490001C4B1E70DFE70A001C49525AA24202D997
-:1034A000140000E00C231B4A1370FF251D40280068
-:1034B00005F0A0FC2004000C06F02CFE164A174B69
-:1034C00005F06AFF05F07EFE82B211235B1B01202E
-:1034D0009840101A80B20E4AC2235B00D358C0181D
-:1034E00080B205F06FFCFFF78DFF002070BD01205A
-:1034F0004042FBE701204042F8E7C0466F1700005A
-:10350000905F0108915F01088E5F0108C4ED001013
-:10351000000026408C5F010833DFC14F1C409F3FF5
-:10352000064AD0239B00D05803E0044AD0239B00D6
-:10353000D058431CF9D0C0B27047C0460000654067
-:1035400010B50400002003E02100034801F0E8FE6C
-:103550000028F9D010BDC0460000654070B50600D7
-:103560000D00002102F0AAF80021012003F016FF4F
-:10357000040004F01DFDE9004B08C01805F05EFCD6
-:10358000421E002C08D0002C0CD0326880231B0671
-:1035900013433360200070BD0021012003F03CFE86
-:1035A0000400F0E70021012003F0B6FE0400ECE780
-:1035B00070B50C001600002901D0002509E0002597
-:1035C000280070BD2078094B1870FFF7B9FF01344F
-:1035D0000135B542F4DA23780A2BF3D1034B1B787B
-:1035E0000D2BEFD00D20FFF7ABFFEBE7D05F01080D
-:1035F00070B50C001600002901D0002503E000255D
-:10360000280070BD0134B542FADAFFF789FF207057
-:1036100001350A28F4D00D28F4D1F1E710B50400E3
-:103620000A4A0B490B4801F08FFE002808D00028F9
-:1036300005D1084A116880231B060B43136010BD97
-:1036400021000448FFF78AFFF1E7C046945F0108B4
-:10365000B8DE00100000654070B505000C0007E002
-:103660000B4B1B689800C0184000FCF78DFF013C15
-:10367000002C0BD082229200AB58DB05DB0DA95841
-:10368000C90B01220A409B18002BE9D170BDC0462E
-:103690009000000810B5024801F0DEFF10BDC046E2
-:1036A00000006540014B18607047C046D45F0108B8
-:1036B000F0B51F001D4B1E68002E2DD0B36B1B18DC
-:1036C0001B68346D2418E41A631E9C41E3B29C46C7
-:1036D000B368C41825680F242C40062CF8D81306AC
-:1036E000F26882183B43136063460B4313D00F4BC1
-:1036F0001B689B68C3181B68DB03F8D50C4B1A6862
-:103700002D23D35C1F2B09D8084B1B681B681B1883
-:103710001B681B06F8D4F0BD3300D2E7034B1B68CF
-:103720001B681B181B68002BF8D1F4E7D85F010851
-:10373000D45F010810B50400E0239B05802200211E
-:10374000FFF7B6FFD0239B05802200212000FFF762
-:10375000AFFFC0239B05802200212000FFF7A8FFB8
-:10376000B0239B05802200212000FFF7A1FFA023AA
-:103770009B05802200212000FFF79AFF90239B05E4
-:10378000802200212000FFF793FF80239B058022E9
-:1037900000212000FFF78CFFE0235B058022002141
-:1037A0002000FFF785FFC0235B0580220021200059
-:1037B000FFF77EFFA0235B05802200212000FFF79A
-:1037C00077FF80235B05802200212000FFF770FF38
-:1037D000C0231B05802200212000FFF769FF802302
-:1037E0001B05802200212000FFF762FF8023DB04FD
-:1037F000802200212000FFF75BFF002380220021B0
-:103800002000FFF755FF0B4B1B689B080A4A116805
-:103810002D228A5C1F2A0AD80C229340F02292059E
-:103820001343802200212000FFF742FF10BD0D222C
-:10383000F3E7C046DC5F0108D45F0108054B1A6856
-:103840002D23D35C1F2B03D8034A044B1A60704707
-:10385000034AFAE7D45F0108B8EE0010D85F010808
-:103860000CEF0010F0B583B01400444B1B68002B24
-:1038700075D0002918D0002973D0002C73D0802275
-:103880001202944200D972E080225201944239D04F
-:1038900021D88022D200944236D00ED98022120143
-:1038A000944216D1782225E0002AE4D11A6D11182D
-:1038B000334A1268D46CA400DDE78022520094429F
-:1038C00024D00132FF32944201D17E2212E02D4DEC
-:1038D0004AE02C4D48E08022D201944218D0802248
-:1038E0001202944201D1002204E08022920194420B
-:1038F0003FD16022224D2E682D25765D1F2E09D9DD
-:10390000671E08E07022F5E77C22F3E77F22F1E7EB
-:103910004022EFE71C4F01910D003D4039422AD172
-:103920001F2E02D91202194942509B6B1B18019A93
-:103930001A60A308124A11682D228A5C1F2A0CD82B
-:103940000C2293401A00F0239B0513438022002190
-:10395000FFF7AEFE0E4B1C6006E00D22F1E7094DAD
-:1039600002E0084D00E0074D280003B0F0BD054D12
-:10397000FAE7044DF8E7034DF6E7C046D85F0108C3
-:10398000D45F01080B003200FF3F000088140000E4
-:10399000DC5F010810B50400FFF750FF1A4B1A68EE
-:1039A0002D23D35C1F2B10D8184B2360184B1B689A
-:1039B0005B6B1B1901221A60164B1B68002B16D07B
-:1039C0002000FFF7B7FE002010BD2368124A134005
-:1039D00023600F4B1B685B681B19104A1A60226832
-:1039E00080231B06134323600323A360DEE7084BF9
-:1039F0001B68196D6118044B1B68DA6C920020007B
-:103A0000FFF730FFDCE7C046D45F01080300008009
-:103A1000D85F0108DC5F0108FFFFFE7F01000200A4
-:103A2000084B1A682D23D35C1F2B06D80023036094
-:103A3000054B00221A60002070470023036083605A
-:103A4000F6E7C046D45F0108DC5F010870B50D4C95
-:103A50002568AC68241826680F243440042CF6D856
-:103A6000EC680419084D2560064C2568ED68451979
-:103A700029602168C96841180A602268D2688018E4
-:103A8000036070BDD85F01081002004270B50F4C92
-:103A90002568AC68241826680C242642F7D1EC6807
-:103AA00004190B4D2560094C2568ED6845192960FE
-:103AB0002168C96841180A602268D26882181360B8
-:103AC0002368DB68C018049B036070BDD85F0108E1
-:103AD0001032004370B51D0004AB1E78084A14680C
-:103AE000A3681A1812681307F8D409060223B34012
-:103AF00019430123AB40E26880181943016070BD8F
-:103B0000D85F010830B51D000B4A1468A3681A1865
-:103B100012681307F8D409060323049A9340194343
-:103B20000223039A934019430123AB40E2688018B3
-:103B30001943016030BDC046D85F010810B582B09E
-:103B4000040008001100002B01D102B010BD0200DA
-:103B50002000FFF77BFF08230093043B0022502145
-:103B60002000FFF7B7FF044B1B681B681B191B687D
-:103B7000DB06F8D4E9E7C046D85F010810B582B08B
-:103B8000040010001A1E01D102B010BD0300200075
-:103B9000FFF75CFF0C230093043B0022512120001F
-:103BA000FFF798FF034B1B681B681B191B68DB069C
-:103BB000F8D4E9E7D85F0108F0B5002B00D1F0BDDB
-:103BC0001E00314C2568AC68241827680F243C403F
-:103BD000042CF6D8862464010459002CFADBEC6826
-:103BE00004192A4D2560284D2C68E46804192260C8
-:103BF0002A68D26882181660234A1468A2681218CC
-:103C000015680F222A40042AF6D8E2688218204C50
-:103C100014601D4C2268D268821811602268D26834
-:103C2000821816600EE0184A11688A681218146823
-:103C30000F222240062AF6D8CA6882181549116058
-:103C4000103B9BB20F2BEED8002B07D10E4B1B68FD
-:103C50001B681B181B68002BF8D1B0E70A4A1168D3
-:103C60008A68121814680F222240062AF6D81B040C
-:103C7000C02212021343CA68821808210B43802114
-:103C8000C9050B431360E1E7D85F01080800007124
-:103C90000C00007008C01040F0B5002B00D1F0BD42
-:103CA0001F00264C2568AC68241826680F24344071
-:103CB000042CF6D8EC680419214D25601F4D2C68A2
-:103CC000E468041921602968C96841180F600F2B46
-:103CD00014D91A490C68A16809180D680F212940E8
-:103CE0000629F6D8E168411886256D03154384241A
-:103CF000E4052C430C60103B9BB2E8E7002B07D196
-:103D00000E4B1B681B681B181B68002BF8D1C6E7FD
-:103D10000A490C68A16809180D680F212940062975
-:103D2000F6D81B04C02109020B43E16841181A436D
-:103D30008423DB051A430A60E2E7C046D85F010826
-:103D40000C00007010B582B004000B0011000722B7
-:103D500058680240C020800022501A699B69009276
-:103D60002000FFF793FE0C230193043B0093043BD8
-:103D700000224C212000FFF7C5FE044B1B681B6886
-:103D80001B191B685B07F8D402B010BDD85F01088F
-:103D900010B5002B01D0002900D101BE062A00D9A0
-:103DA00098E090004C4C205887468B6018004030BB
-:103DB000086154338B610A6000234B60474BCB6230
-:103DC0004023CB602C3B4B614B622D33FF33CB61E7
-:103DD000002010BD8B6018004030086160338B619B
-:103DE0000A6001234B603E4BCB624023CB60203BFB
-:103DF0004B61043B4B62E433CB610020E9E78B600D
-:103E000018004030086160338B610A6001234B6009
-:103E1000344BCB624023CB60203B4B614B62E033A1
-:103E2000CB610020D5E78B60180080300861C0337B
-:103E30008B610A6002234B602B4BCB628023CB60EB
-:103E4000403B4B61103B4B62A0239B00CB610020A9
-:103E5000BFE78B60180080300861C0338B610A6057
-:103E600002234B60214BCB628023CB60403B4B61F4
-:103E70004B62A0239B00CB610020AAE78B60180057
-:103E800080300861C0338B610A6002234B60184B9D
-:103E9000CB628023CB60403B4B61243B4B62A02331
-:103EA0009B00CB61002094E78B6018008030086194
-:103EB000C0338B610A6002234B600E4BCB628023C0
-:103EC000CB60403B4B61203B4B62A0239B00CB610E
-:103ED00000207EE708487CE760EF00107CEF0010D0
-:103EE00090EF0010B0EF0010D0EF001010F00010B5
-:103EF00050F0001090F000100B00320010B50A1EB8
-:103F00000ED000238B620B624B69002B01D1054858
-:103F100010BD0969D26A9BB2FFF710FE0020F7E7D7
-:103F20000048F5E70B003200F0B5D6464F4646464E
-:103F3000C0B581460E001700002931D0002A31D0CB
-:103F4000CA689046002A2FD0002B34D00A6AD218B3
-:103F50000A628C6A1D0014E043461B1B9A46B36834
-:103F6000191953469BB23A004846FFF7E7FDB2687D
-:103F700031004846FFF7E6FE4346E41A2D19574440
-:103F800000242B199845E7D9B362002D0DD0B168F4
-:103F90000919ABB23A004846FFF7D0FD002504E00E
-:103FA000064D02E0054D00E0044D2800E0BCBA4695
-:103FB000B146A846F0BD1D00F7E7C0460B00320031
-:103FC000F0B5DE4657464E464546E0B583B0009014
-:103FD0000E00140000295FD0002A5FD00D698B68A5
-:103FE0009846CF688B6A9A460B6ADB009946802F09
-:103FF0002DD038230193802342465146535401313A
-:104000004144BBB29B4652469B1A9BB2013B9BB2BA
-:1040100000220098FFF7B2FD019B53451AD93B1FC0
-:104020004A46120E4146CA544B461A0CFB1ECA544D
-:104030004B461A0ABB1ECA54013F4A46CA5542465D
-:1040400031000098FFF77EFE706A80081BE0702345
-:104050000193D0E742463100009B9A461800FFF7D3
-:1040600071FE5B46002241465046FFF787FDD6E7CA
-:10407000EB782370AB7863706B78A3702B78E37068
-:104080000434043501380028F2D103B0F0BCBB463B
-:10409000B246A946A046F0BD0148F6E70048F4E75D
-:1040A0000B00320010B5002B01D0002900D101BE59
-:1040B000062A00D970E09000384C205887468B6063
-:1040C00040330B610A6069234B60354BCB62402360
-:1040D000CB602C3B4B614B62002010BD8B604033AA
-:1040E0000B610A606A234B602E4BCB624023CB608E
-:1040F000203B4B614B620020EFE78B6040330B614C
-:104100000A606A234B60284BCB624023CB60203B84
-:104110004B61043B4B620020DFE78B6080330B6117
-:104120000A606B234B60214BCB628023CB60403B0A
-:104130004B614B620020D0E78B6080330B610A60DB
-:104140006B234B601A4BCB628023CB60403B4B61AF
-:10415000103B4B620020C0E78B6080330B610A602C
-:104160006B234B60134BCB628023CB60403B4B6196
-:10417000203B4B620020B0E78B6080330B610A600C
-:104180006B234B600C4BCB628023CB60403B4B617D
-:10419000243B4B620020A0E708489EE7D0F00010C7
-:1041A000ECF0001020F1001000F1001080F1001080
-:1041B00040F1001000F20010C0F100100B003200BE
-:1041C00010B50A1E0ED000238B620B624B69002BC8
-:1041D00001D1054810BD0969D26A9BB2FFF7ECFC1A
-:1041E0000020F7E70048F5E70B003200F0B5D646AF
-:1041F0004F464646C0B504009146002900D180E1F3
-:10420000002A00D17FE1CE68002E00D17DE1002B95
-:1042100005D11800E0BCBA46B146A846F0BD0A6A0E
-:10422000D01808628D6ABA480768BA68101902681F
-:104230000F2010400628F6D8F8682018C827FF0578
-:104240000760B34800680068001900680028F8D1CA
-:104250000A6990464A699446AD480768BA681019D9
-:1042600002680F2010400428F6D8F8682018A94FDB
-:104270000760A74F3868C068201842460260386857
-:10428000C0682018624602604A699446A0480768E0
-:10429000BA68101902680F2010400628F6D8F8688E
-:1042A0002018CC27FF05624617430760984800682E
-:1042B0000068201802689246002AF7D194480268E4
-:1042C0009068001907680F2038400628F6D8D06893
-:1042D0002018CA22D2050260002D48D18C480268FD
-:1042E0009068001907680F2038400428F6D8862007
-:1042F000400120580028FADBD0682018864A026066
-:10430000834A94461068C06820184A460260624694
-:104310001268D268A21813605A19964257D8721BB5
-:1043200090467B4A10688268121917680F223A403B
-:10433000062AF6D82A02C068201847461743CC221E
-:10434000D2053A4302604A689046714A1068826812
-:10435000121917680F223A40062AF6D8C268A21826
-:10436000404600061060AD1B5B195546D4E78A68CD
-:104370009046674802689068001907680F20384027
-:104380000428F6D8D0682018624A0260604A106893
-:10439000C0682018474607601068C068201805608C
-:1043A0005B4802689068001907680F2038400628AB
-:1043B000F6D8D0682018CC22D2052A43026054488F
-:1043C00000680068201800680028F8D186E78A6233
-:1043D000002B4ED18D6A002D64D10E694D694C4B76
-:1043E0001A6893681B1918680F230340042BF6D82A
-:1043F000D368E318494A1A60454A1368DB68E31832
-:104400001E601368DB68E3181D60414B1A689368EF
-:104410001B1918680F230340062BF6D8D368E3183E
-:10442000CA22D2051A604869394B1A6893681B1969
-:1044300019680F230B40062BF6D8D368E318CE2259
-:10444000D20502431A60324B1B681B68E3181868D8
-:104450000028F8D12E4B1A6893681B1919680F238E
-:104460000B40062BF6D8D368E418CA23DB0523607B
-:10447000D0E6274A10688268121916680F22324067
-:10448000062AF6D82D02C268A2182B43CC25ED05CA
-:104490002B4313601E4B1B681B68E3181B68002B23
-:1044A000F8D197E78E681A4B1A6893681B19186839
-:1044B0000F230340042BF6D8D368E318174A1A6079
-:1044C000134A1368DB68E3181E601368DB68E3189F
-:1044D0001D608D6A0E4B1A6893681B1918680F23AC
-:1044E0000340062BF6D8D368E318CE22D2052A4320
-:1044F0001A60074B1B681B68E3181B68002BF8D178
-:104500006BE7074886E6064884E6054882E6C0462B
-:10451000D85F010808000070080000710C000070EE
-:104520000B003200F0B5DE4657464E464546E0B534
-:1045300083B003000192002900D198E1002A00D144
-:1045400097E1CC688E6A0D6A6A0F9346ED00802C65
-:1045500000D171E138229446C7480768BA68D0187C
-:1045600002680F2010400628F6D8F8681818C827E7
-:10457000FF050760C04800680068C0180068002890
-:10458000F8D10A6991464A699046BB480768BA68FB
-:10459000D01802680F2010400428F6D8F8681818C0
-:1045A000B64A0260B44A92461068C06818184A4673
-:1045B000026052461068C0681818424602604A6994
-:1045C0009146AD480768BA68D01802680F201040BD
-:1045D0000628F6D8F8681818CC22D2054F4617439B
-:1045E0000760A54800680068181800680028F8D11E
-:1045F000A1480768BA68D01802680F201040062842
-:10460000F6D8F8681818CA27FF0507608A68904628
-:1046100099480768BA68D01802680F20104004282B
-:10462000F6D8F8681818954F0760934F3868C06837
-:104630001818424602603868C068181806608E482C
-:104640000768BA68D01802680F2010400628F6D80C
-:10465000F8681818CC27FF053743076086480068BC
-:104660000068181800680028F8D183480768BA68FD
-:10467000D01802680F2010400628F6D83202914662
-:10468000F8681818802290464A4647463A439146B1
-:10469000D022D20590464A4647463A430260B44586
-:1046A00000D8CCE0621F94465A46D2B29046724877
-:1046B0000668B268D01807680F2038400628F6D878
-:1046C00062461702F068181842461743D026F605CE
-:1046D00037430760221F90462A0E944666480668B4
-:1046E000B268D01807680F2038400628F6D842462E
-:1046F0001002F6689E1962461043D027FF05384322
-:104700003060E21E9046280CC2B294465A480668B1
-:10471000B268D01807680F2038400628F6D84246FD
-:104720001002F6689E1962461043D027FF053843F1
-:104730003060A21E9046280AC2B294464E480668CF
-:10474000B268D01807680F2038400628F6D84246CD
-:104750001002F6689E1962461043D027FF053843C1
-:104760003060013CEAB2944643480668B268D0180B
-:1047700007680F2038400628F6D82502F068181878
-:1047800062461543D024E405254305604E683A4847
-:104790000468A268D01805680F2028400628F6D8BB
-:1047A000E068181836060660334800680068181874
-:1047B00000680028F8D14F6A2F4C2568AA68D418E1
-:1047C00026680F243440042CF6D8EC681C192C4DB4
-:1047D0002560294D2C68E4681C19019A22602A681A
-:1047E000D2689A181760244A1468A268D21815680B
-:1047F0000F222A40062AF6D8E2689A18CA24E4054D
-:1048000014604D6A1C4A11688A68D21814680F2215
-:104810002240062AF6D8CA689A18CE21C90529432B
-:104820001160184A9A58002AFBDB03B0F0BCBB4663
-:10483000B246A946A046F0BD702294468CE64A686E
-:1048400090460D480668B268D01807680F203840B7
-:104850000628F6D8F068181842461606066006487C
-:1048600000680068181800680028F8D11AE70648A0
-:10487000DBE70548D9E7C046D85F010808000070AB
-:104880000C000070F01000000B003200C005434225
-:104890005841C0B270470000A0231B0698422AD09E
-:1048A00014D8802829D008D980235B0098422AD0C8
-:1048B0001B4B984209D01B4807E010281FD0402806
-:1048C00001D1194801E000281BD17047174B9842CD
-:1048D0001BD007D9164B98421ED0164B98421DD1BB
-:1048E0001548F2E7154B984211D0154B984211D15B
-:1048F000A420C003E9E70020E7E71248E5E71248F3
-:10490000E3E70848E1E70648DFE71048DDE7A020D5
-:10491000C003DAE70348D8E70D48D6E70148D4E7F3
-:1049200006005200FF00520002005000030000F099
-:10493000040000F0050000F003005200090000A090
-:10494000010000F00500520001005000010052007B
-:104950000200520010B50F4B1A683323D35C002BB2
-:1049600000D101BE0B4B1C68BC23E358226A94465D
-:1049700063441B68002B0BDB074B1868FFF78CFFA9
-:10498000636801229A6063689B68002BFBD110BDAD
-:104990000248FCE7D45F0108E05F01080200500014
-:1049A00010B50400FFF772FF002801D1134810BDB5
-:1049B000FBF700FE124B134A1A605C6000229A60FB
-:1049C000DA60114B1A685423D35C002B10D003F02B
-:1049D000FCFAFA21890004F031FA01000B4804F0D6
-:1049E0002DFA0B4BC1188020400009F05DFADEE77C
-:1049F00080200021400009F057FAD8E70600520055
-:104A0000E05F01080001001CD45F010860F5900020
-:104A10009808000070B504000D00FFF737FF00286C
-:104A200027D0002D27D0FBF7C5FD144B144A1A6080
-:104A300000225A609C60DD60124B1A685223D35CDE
-:104A4000002B10D003F0C1FAFA21890004F0F6F926
-:104A500001000D4804F0F2F90C4BC1188020400011
-:104A600009F022FA06E080200021400009F01CFA3B
-:104A700000E0074870BD0648FCE7C046E05F01085B
-:104A800000010005D45F0108C0EA210148260000AA
-:104A90000600520030B5134A11688B69C31ADB094E
-:104AA00049691B01C91800230360812415682C5D26
-:104AB00004192360822415682C5D04192360832463
-:104AC00015682C5D04192360802415682C5D041979
-:104AD0002360836114688422A25C801803600B60E9
-:104AE0004B6030BDD45F010810B5072900D901BE65
-:104AF0001F2314009C4300D001BE104B1B689C690F
-:104B0000001BC0095B690001181803290AD8046852
-:104B1000C9001F238B409C431F231A408A40224315
-:104B2000026010BD04394468C9001F238B409C43B8
-:104B30001F231A408A4022434260F2E7D45F0108F3
-:104B4000F8B506000C0015001F0006AB1A780729FF
-:104B500000D901BE0F232900994303D1012D01D0B3
-:104B6000092D00D101BE012F00D901BE1F23110064
-:104B7000994300D001BE21003000FFF7B5FF336834
-:104B800001210A00A24093433940A14019433160FA
-:104B9000074B1A688123D05C86193268A400723BE7
-:104BA0001900A1408A432B40A34013433360F8BD52
-:104BB000D45F0108072900D901BE012A00D901BE2E
-:104BC00001238B40002A01D1436070478360FCE7DA
-:104BD00030B50400072900D901BE0F231000984307
-:104BE00003D1012A01D0092A00D101BE8900074B57
-:104BF00018688123C05C00190468723B1D008D4059
-:104C0000AC4313408B402343036030BDD45F0108A5
-:104C100030B50300072900D901BE012A00D901BE21
-:104C2000074804688220205CC018046801231D0026
-:104C30008D40AC4313408B402343036030BDC046DE
-:104C4000D45F010830B5082900D901BE012A00D976
-:104C500001BE846901231D008D40AC4313408B408D
-:104C60002343836130BD000030B50300082900D91B
-:104C700001BE032A00D901BE49000748046880200C
-:104C8000205CC018046803231D008D40AC43134012
-:104C90008B402343036030BDD45F0108F8B5CE4696
-:104CA000474680B507000E001400002800D1B1E08F
-:104CB000002A00D1B0E0072900D901BE2368012BEA
-:104CC00000D901BE63680F221900914303D1012B63
-:104CD00001D0092B00D101BE237A1F22934300D0BB
-:104CE00001BEE368032B00D901BE2369012B00D963
-:104CF00001BE6369012B00D901BE236A012B00D9D3
-:104D000001BE636A012B00D901BEA36A012B00D941
-:104D100001BEE36A032B00D901BE236B072B00D928
-:104D200001BEE369032B00D901BEA369012B00D9A1
-:104D300001BE01252B00B3407000103003229146C4
-:104D4000110081400B439C46344B984683234146D7
-:104D50000968C95CC9190B68624693439C46A369FC
-:104D60002B40B340624613439C46E2694B461340D6
-:104D70001A008240634613430B60626831003800BA
-:104D8000FFF726FF227A31003800FFF7ADFEE26818
-:104D900031003800FFF768FF226931003800FFF763
-:104DA00051FF626931003800FFF732FF43461A684D
-:104DB0008423D25CBA1810687B3398469843236AE0
-:104DC0001D40636A5B009C46022361460B401D4305
-:104DD000A36A9B009C46042361460B402B43E16A77
-:104DE000C90018250D402B43216B4D014146294038
-:104DF0000B43B100FE25AD0029408B4003431360F7
-:104E0000226831003800FFF7D5FE0020C0BCB9464B
-:104E1000B046F8BD0248F9E70148F7E7D45F01085A
-:104E200001005A00084B1A68BC23D3581B181B6892
-:104E3000002B07DA0B0C00D001BE0904090C4160FD
-:104E4000002070470148FCE7D45F010801008A0098
-:104E50000368002B08DAC2600B0C00D001BE090405
-:104E6000090C8160002070470048FCE701008A00BF
-:104E700000290BD0074B1A68BC23D3581B181B689A
-:104E8000002B05DAC3680B600020704701BEF1E714
-:104E90000148FAE7D45F010801008A00034B1B6850
-:104EA000002B00D07047014B1860FBE7046001083D
-:104EB00070B5040023480068002840D021480568E8
-:104EC0002C2060432818FF2425001D4005601E0A81
-:104ED000344044601B0C83601B4B1C683323E35C31
-:104EE0009D4200D301BE184B1C68BA23E35A6B43A2
-:104EF000256AAC466344036143683425645DA3427C
-:104F000000D301BE104C2468246A80335B01E4188E
-:104F1000446183681D0C00D001BE1D0C00D001BE91
-:104F20001B041D0C2B43A360C2610162002383613B
-:104F3000049B002B02D000229B5E838170BD01BECA
-:104F4000BCE7C04604600108D45F0108F0B58FB02B
-:104F5000041E44D06368032B00D901BEE36A002B12
-:104F60003FD0236B002B3ED007AA1300210061C95C
-:104F700061C321C921C302AE230014333100A1CB88
-:104F8000A1C121CB21C10821535E0CAD2B80174B51
-:104F90001B681B8F079989B25B186B80089B0D9368
-:104FA0000B9B0A980095A26AE16AFFF781FF069BB6
-:104FB0000598002200920021FFF77AFF216B28005C
-:104FC00003F078F80022AB5E002B06DB1F221340B3
-:104FD0001E3A9A401300064A13600FB0F0BD01BE9E
-:104FE000B8E701BEBDE701BEBEE7C046D45F010819
-:104FF00000E100E0F0B504000800002A2DD01C49B3
-:10500000096800292BD01A4909682C256C430C1912
-:105010004543491901263500486885402D046068DC
-:1050200086402769002F1CD0886900281BD13F6863
-:10503000002F1ADA17683F043F0C17603D431560D4
-:105040002569EA6001228A614B622369320C00D033
-:1050500001BE3604360C9E60F0BD01BECFE701BE36
-:10506000D1E70448F8E70448F6E70348F4E7C04608
-:105070000460010804028A0007028A0070B582B049
-:1050800004000023019300282BD02369002B2AD091
-:105090006369002B29D0236A002B28D06369DD685F
-:1050A0002A0C0BD012041A601B682069204B1A6866
-:1050B000BC23D3581B181B68002B1ADB2D042A0CA9
-:1050C000002D0AD063691A601B68636A002B2AD01E
-:1050D0009847002363620023A36163691B6802B0E1
-:1050E00070BD01BED1E701BED2E701BED3E701BE6C
-:1050F000D4E701A9FFF7BCFE00280ED10198026891
-:10510000160CFF231340E2699A4207D99B00226ADA
-:10511000D358002B02D0984700E0002631002069C8
-:10512000FFF780FECAE7A36A002BD4D09847D2E7E6
-:10513000D45F010810B50200064B1B68002B07D096
-:10514000044B18682C235343C018FFF797FF10BD7A
-:1051500001BEF5E70460010870B50C001D4B1A682C
-:105160003323D35C834230D9002930D00B68DB066F
-:1051700001D019482AE03323D35C984200D301BE02
-:10518000144B1B681D6ABA229B5A58432D18134EA4
-:1051900035602368DA080021606805F022FA0021F2
-:1051A0002800FFF73FFE306822000021FFF750FE85
-:1051B000002801D00A4809E0084B18680021FFF7D1
-:1051C00031FE002802D0064800E0034870BD0248C6
-:1051D000FCE7C046D45F010803018A0008600108AB
-:1051E00001018A0010B50B00002A05D0002A1DD04D
-:1051F000002B15D10E4810BD0029F7D10D4A1168BA
-:1052000033228A5C904200D301BE0A4A11680A6ABE
-:10521000BA24095B4843121807490A601800EAE7F4
-:1052200006490B604A60FFF797FFE4E70048E2E7B2
-:1052300003018A00D45F01080860010830070008F4
-:10524000F0B5C64600B50C00194B1B68DE68336824
-:1052500083422BD947091F23184001258540002987
-:1052600018D000239846124B18680368002B17DAF1
-:105270007368BF00DF193B681D420FD0AB433B6032
-:1052800000250021FFF7CEFD002C0BD0280080BCAC
-:10529000B846F0BDFBF781F98046E4E7054DF0E73D
-:1052A000054DF1E74046FBF77CF9EFE7034DEDE7ED
-:1052B00008600108020188000301880004018A00D7
-:1052C0000A4B1B68DB681A6882420BD941091F220E
-:1052D00010401E3A8240586889000B581A4203D089
-:1052E000034800E0034870470348FCE708600108F2
-:1052F0000101880004018A0000018800074B1B6837
-:105300009B6CC340DB0700D401BE044B1B681B69C8
-:1053100010308002C3580F2018407047D45F010836
-:1053200003681B050CD5802282239B00C358DB0534
-:10533000DB0D934206D090239B00C15001207047A3
-:105340004022F1E70020FAE7F0B5002800D16CE137
-:10535000002900D16BE10B78022B00D901BE4B7BF9
-:10536000023BDBB2062B00D901BE8B7B002B04D0A5
-:10537000022B02D0032B00D001BE2123CB5C012BDA
-:1053800000D901BE2823CB5C012B00D901BE0B78CC
-:10539000012B07D98B7F002B09D04B68013B062BD3
-:1053A00005D903E04B68083B082B00D901BE8B6888
-:1053B000053B042B00D901BE4B69FF2B00D901BE70
-:1053C0008B69FF2B00D901BE8B7C002B06D00B789C
-:1053D000002B02D18B68092B74D001BE964B4C6B0D
-:1053E0001C4200D001BE954BCC6B1C4200D001BECC
-:1053F0000B78022B6AD04B685D1E0B7F002B6AD0A6
-:1054000080235B028C68082C67D880242401234306
-:105410000F242C4023438024A404234303600C6BFB
-:1054200003681B055BD580239C4200D301BE8C6BB7
-:1054300003681B0555D580239C4200D301BE4C6AEE
-:1054400003681B054FD580239C4200D301BE0B7817
-:105450001B06C024A404234003644B7F002B44D0CC
-:1054600040238C7C002C42D08024E40023430C7C1D
-:10547000002C3ED08024640023434C7C002C3AD086
-:105480008024A4002343CC6A013C2404F0252D038E
-:105490002C4023434D7B013D07242C4023438D7B2F
-:1054A0002D0130242C40234383640B7B002B24D01C
-:1054B00080246400CB7B002B21D10B78022B46D0BB
-:1054C00000231EE08B7B002B88D086E78B7F002B90
-:1054D00091D1002591E7002394E7002497E740232A
-:1054E000A2E74023A8E74023AEE70023B9E7002462
-:1054F000BCE70024C0E70024C4E70024DAE78023E7
-:105500009B001C438B685D1E0F231D402C43C0264F
-:10551000B6008451FF244D692C408D692D04FF276E
-:105520003F043D402C43C425AD004451CC6A85590D
-:105530002B4003339C4201D3102C00D901BECB7FFA
-:10554000002B07D00B78012B5FD0002503E08023D0
-:105550009B00D6E700254C7B013C072323402B43CF
-:105560008D7B2D0130242C40234343640B7B002B87
-:105570004ED080256D008B685C1E0F2323402B438B
-:105580000C78012C46D0002423438024A40003512E
-:10559000FF230C6B2340C124A40003512023CB5CC8
-:1055A000002B3AD080239B0421240C5D012C36D0A3
-:1055B0000024234328240C5D012C33D000242343F2
-:1055C000FF244D6A25402B4303658B6B1C408123D0
-:1055D0009B00C4501A4B4C6B23401A4C03511A4B7E
-:1055E000CC6B2340194C0351002A22D00023536076
-:1055F00013609360D3601362D3625363897F303347
-:10560000D154134B93630020F0BD80256D00A2E7B9
-:105610000025B0E780246402B6E70023C4E78024B5
-:105620006404C6E780246402C9E70A48ECE7094835
-:10563000EAE70020E8E7C04692F4FFFF8CF8FFFF9E
-:105640006D0B0000C80F000073070000880F0000FA
-:10565000EFCDAB000160AA00114B03600F3B036468
-:10566000002383640822FF32C021890042500431A4
-:1056700043500C31435043641139FF394250FD32DD
-:1056800083500365074A8350074A8350074A835073
-:10569000074A8350074A8350074A83507047C046E1
-:1056A0000F000003C80E0000880E0000C80F0000A5
-:1056B000880F0000080F0000480F000003685B001F
-:1056C0005B080360002904D000234B600B600B6271
-:1056D000CB627047F0B5C64600B58C680A68842373
-:1056E000C3580F252B40073DED1A2300AC4226D9A5
-:1056F0002B0024E055782D0216783543D6783606EF
-:1057000097783F043E4335439827C55155792D027C
-:1057100016793543A846D679360695792D042E4359
-:1057200045463543C551D218E41A8423C3580F2582
-:105730002B40073DED1A2300AC4200D92B00002B73
-:1057400000D183E0082BD5D0012B24D0022B26D00A
-:10575000032B2BD0042B33D0052B3ED0062B4CD063
-:10576000072B5DD053781B0215782B43D5782D0677
-:105770009678360435432B439826835153791B0280
-:1057800015792B43D5792D0697793F043D432B435B
-:1057900083510823C7E7167890254651C3E755780B
-:1057A0002D021678354394268551BCE755782D0295
-:1057B0001678354394268551967890254651B2E760
-:1057C00055782D0216783543D678360697783F04FB
-:1057D0003E43354398268551A5E755782D02167826
-:1057E0003543D678360697783F043E4335439826AE
-:1057F000855116799025465195E755782D021678F2
-:105800003543D678360697783F043E43354398268D
-:10581000855155792D02167935439426855182E7B5
-:1058200055782D0216783543D678360697783F049A
-:105830003E4335439826855155792D0216793543D7
-:10584000942685519679902546516CE70A608C60C4
-:10585000002C0CD1F924E400035901229343035195
-:105860008A61CB69002B02D0CB690120984780BCAC
-:10587000B846F0BDF8B50E004C69CA68C423C358D9
-:105880000F21194023008C421CD90B001AE0D825A7
-:10589000415911700F0A57700F0C9770090ED17093
-:1058A00045591571290A5171290C91712D0ED57127
-:1058B000D218E41AC423C3580F251D402300AC425C
-:1058C00000D92B00002B6DD0082BE0D0012B1ED06F
-:1058D000022B20D0032B24D0042B2BD0052B33D02C
-:1058E000062B3ED0072B4BD0D821435813701D0AEE
-:1058F00055701D0C95701B0ED37043581371190A07
-:105900005171190C91711B0ED3710823D0E7D0216E
-:1059100041581170CCE7D42141581170090A5170D7
-:10592000C6E7D42141581170090A5170D02141585D
-:105930009170BDE7D821415811700D0A55700D0CBA
-:105940009570090ED170B3E7D821415811700D0A36
-:1059500055700D0C9570090ED170D0214158117100
-:10596000A6E7D821415811700D0A55700D0C95709D
-:10597000090ED170D42141581171090A517197E76C
-:10598000D821415811700D0A55700D0C9570090EF3
-:10599000D170D42141581171090A5171D021415857
-:1059A000917185E7F2607461002C0DD1F922D2006B
-:1059B000835802218B4383500323B361336A002B46
-:1059C00002D0336A032098477461F8BD10B50028EF
-:1059D00032D0002932D0002B32D05A62F922D200C4
-:1059E00083580324A34383500B78012B00D901BEB5
-:1059F0000B7A032B00D901BE4B68072B00D901BEDF
-:105A00000B7B012B00D901BE01230A6813408A6871
-:105A10001203C024A401224013434A681204E02464
-:105A2000E40222401343CA681206802149040A4056
-:105A300013430360002010BD0248FCE70148FAE769
-:105A40000048F8E70400B2004B1EDBB2012B04D97A
-:105A5000042902D0082900D001BE032A00D901BEC2
-:105A6000042920D008D801290DD002291AD1882371
-:105A70001B019C4660440AE0082913D198231B01AE
-:105A80009C46604403E080231B019C466044002840
-:105A900008D0036806490B401204C02189020A405D
-:105AA0001A430260704790231B019C466044EEE756
-:105AB000FFFFFCFFF8B5DE4657464E464546E0B5CB
-:105AC000070008009A460AAB40CB1B789B460CABFC
-:105AD0001B78111FC9B2FA2900D801BE59460439F2
-:105AE000C9B2FA2900D801BE591EC9B2012904D988
-:105AF000042B02D0082B00D001BE002E02D051464C
-:105B000000291CD0002E02D05946FF2919D01B02B3
-:105B1000F02109010B4099460E9B5D6A1104C022D9
-:105B2000920211404B4619430143002E0BD10D9BAD
-:105B3000DA07120C11433965002400200CE001BE85
-:105B4000E0E701BEE3E70022F4E703433B650134ED
-:105B5000E4B2002D1FD128002100B44225D2164BFB
-:105B6000984222D07B6C0422100018401A42F0D1D7
-:105B700053465B5C4A46134398465A461204C02378
-:105B80009B021A40434613430131B142DDD30D9AC3
-:105B9000D007000CD9E7012002F008FB013D002DE1
-:105BA00001D00020D8E70448D6E7F0BCBB46B24697
-:105BB000A946A046F8BDC0460200B20070B58AB042
-:105BC0000500181FC0B2FA2800D801BE002A34D040
-:105BD000686C042634000440064231D11B04C02006
-:105BE00080020340501E0004000C03438020C002CA
-:105BF00003432B65002925D00E9B5E6A009102921B
-:105C00000023079302330693200006E0012002F0F0
-:105C1000CDFA013E002E0ED02000069B022B0DD1A6
-:105C2000094B98420AD069462800FFF753FD002E21
-:105C3000ECD13000F1E70448EFE704480AB070BD4A
-:105C40000348FBE72000F9E70200B2000400B200BD
-:105C50000100B200F0B50400069D181FC0B2FA287A
-:105C600000D801BE002A21D0666C042738003040DD
-:105C700037421DD11B04C026B6023340561E3604DF
-:105C8000360C3343802636033343236500290ED078
-:105C9000E9602A616A61059B2B620423AB61F922EA
-:105CA000D200A35802210B43A35000E00148F0BDED
-:105CB0000148FCE70400B2000100B20070B58AB0F0
-:105CC0000500181FC0B2FA2800D801BE002A34D03F
-:105CD000686C042634000440064231D11B04C02005
-:105CE00080020340501E0004000C03438020000388
-:105CF00003432B65002925D00E9B5E6A0391059214
-:105D00000023089304330693200006E0012002F0EC
-:105D10004DFA013E002E0ED02000069B042B0DD123
-:105D2000094B98420AD069462800FFF7A3FD002ED0
-:105D3000ECD13000F1E70448EFE704480AB070BD49
-:105D40000348FBE72000F9E70200B2000400B200BC
-:105D50000100B20010B5030000290DD0426C0424EC
-:105D600020001040144209D101390904090CC02255
-:105D700012031143196510BD0148FCE70148FAE719
-:105D80000400B2000100B20000230B604B608B6086
-:105D9000CB600B614B618B61026880231B06134350
-:105DA0000360704770B58D69AA682B6AFF26CC68BE
-:105DB000B44384600C696442B443C4602D68013DFF
-:105DC00003242C404969002901D080214900214346
-:105DD0000162002A33D01468611C67D0FF21214082
-:105DE00014792404C025AD022C40214380242406CC
-:105DF0002143016451790904C024A4022140416473
-:105E00009468611C54D0FF212140147B2404C025D8
-:105E1000AD022C4021438024240621438164116972
-:105E2000002905D001391F240C4080210906214397
-:105E3000C164127D1204C02189020A400265002B50
-:105E400033D019684A1C35D0FF220A401979090459
-:105E5000C024A40221400A43802109060A430266A5
-:105E60005A791204C02189020A40426699684A1C84
-:105E700022D0FF220A40197B0904C024A402214039
-:105E80000A43802109060A4382661A69002A05D05E
-:105E9000013A1F211140802212060A43C2661B7D6F
-:105EA0001B04C02292021340036770BD0021A0E7CB
-:105EB0000021B3E70022D2E70022E5E770B5050034
-:105EC00008220026002000E008328B790133DB0035
-:105ED000934216D3FF232B408C5CA342F4D12C0AAF
-:105EE000FF2323408C18E479A342EDD18B185B7813
-:105EF000B342E9D38C18A478012CE5D11E00100020
-:105F0000E2E770BD70B50C0015001E00FFF7D6FF6C
-:105F100000280BD021180B79AB704B796B708B7903
-:105F20002B70CB789B003360002070BD0048FCE7ED
-:105F30008000B2008278520803231340012B07D05F
-:105F4000022B07D0002B01D0002070470320FCE774
-:105F50000420FAE70420F8E70200407900021379F0
-:105F60001843D3791B069279120413431843002B6C
-:105F700002DB0130C0087047033880231B0618433A
-:105F8000F9E7437A0B6000230B7102334B71037AFC
-:105F90005B0908D1013B8B60027A1F2313400B6120
-:105FA00002230B757047FF238B60FD3B0B73F3E7F8
-:105FB000C37A0B6000230B714B71837A5B0908D1A4
-:105FC000013B8B60827A1F2313400B6102230B7508
-:105FD0007047FF238B6000230B73F3E7C37B0B60D9
-:105FE00000230B7101334B71837B5B0908D1013BAB
-:105FF0008B60827B1F2313400B6101230B7570475D
-:10600000FF238B60FE3B0B73F3E7437B0B600023A6
-:106010000B714B71037B5B0908D1013B8B60027BE9
-:106020001F2313400B6101230B757047FF238B6007
-:1060300000230B73F3E703230B6000230B714B71F9
-:10604000012252428A600B610B75704710B50B003C
-:106050001100012B0DD0032B09D00123002B12D0EE
-:1060600083789A0607D45B0609D4FF2010BD00236D
-:10607000F4E70023F2E7FFF784FF0520F6E7FFF7D8
-:1060800097FF0420F2E78378DA0605D4DB0707D40C
-:10609000FFF7D1FF0120E9E7FFF7A0FF0320E5E7C5
-:1060A000FFF7B3FF0220E1E70068052907D8890060
-:1060B0000D4B5B589F46830601D5EC231360704758
-:1060C000C306FCD56C231360F9E70307F7D5BC239F
-:1060D0001360F4E74307F2D53C231360EFE783072F
-:1060E000EDD50C231360EAE740F200102823C35CCF
-:1060F0001B09012098407047F0B5C64600B54F6AAD
-:106100001B38430898460F263E400021002411E02A
-:10611000012800D11024701C013363434D00AC46AC
-:106120008C446546AD00AC46944443435B006046F6
-:1061300083600131032917D8CB005B1A3800D8409F
-:106140000509430A032018401F232B40022809D0C9
-:1061500003D80028DCD10124DDE70328DBD1FA24B1
-:10616000A400D8E78024D6E7434658004044850081
-:106170000C3D5219906880BCB846F0BD10B5446A19
-:10618000816A4A0F032313400A0E1F2111400F2278
-:106190002240022B11D00BD8002B11D0012B11D192
-:1061A00080204000531C013148435843400010BD3B
-:1061B000032B09D1FA200002F4E7FA200001F1E7ED
-:1061C0001020EFE70020EDE70020EBE7836A190AD3
-:1061D0001F2001400F221A409B0406D408230132DD
-:1061E000481C58435043400070474023F7E70623BC
-:1061F00003600023037170470423036000230371CD
-:10620000704702230360002303714371012252424D
-:1062100082600373036103757047122303600023D8
-:10622000037143710122524282600373036103755B
-:1062300070473423036000230371437101225242EB
-:106240008260037303610233037570473E2303606A
-:10625000002202713C3B437101214942816003737A
-:1062600002610375704710B50368042922D009D86C
-:106270000139C9B2022904D85B062BD51000FFF7FB
-:10628000CCFF10BD0529FCD1D90507D4190609D4C6
-:106290005B060BD51000FFF7C0FFF2E71000FFF719
-:1062A000D5FFEEE71000FFF7C4FFEAE71000FFF7A5
-:1062B000A8FFE6E7190605D45B0607D51000FFF72F
-:1062C000ACFFDEE71000FFF7B4FFDAE71000FFF7DE
-:1062D00098FFD6E71000FFF794FFD2E7052303608D
-:1062E0000023037170470000C36A002B10D0036BBA
-:1062F000002B0FD00023026B13713A33CA5C1209D2
-:10630000333B1340052B0ED89B00154AD3589F46AC
-:1063100001BEECE701BEEDE701235B42C363026B04
-:106320001360C26A136070470223C363036B0122C8
-:106330001A60C36A34321A60F5E74023C363036B03
-:1063400001221A60C36A04321A60ECE78023C36337
-:10635000036B3E221A60C36A01321A60E3E7C0464B
-:1063600058F2001060230360002303717047F0B5FA
-:1063700005000368042B07D01D200B5CFF2B2BD1DD
-:10638000222828D80230F8E74369012040421860EB
-:106390004B785B080F261E400023042B07D80124EE
-:1063A0009C4030002040844201D00133F5E7032BAC
-:1063B0001FD81F1D0020032807D8061D44002418DD
-:1063C000A4008E5D16550130F5E76A69C95D11605C
-:1063D00058001D3005E00020002802D06B690A5CDF
-:1063E0001A60002806D000236A6913716A69537124
-:1063F00003E000206B69FF221A71F0BD70B5002226
-:1064000000240FE023001C33C65C53009B189B0044
-:10641000CB180125B5405D6025001D35455D1D701B
-:1064200002340132032AEDD970BD10B5013B9C182E
-:106430000855000A002BF9D110BD10B50400002347
-:10644000002003E00002E25C104301338B42F9D3E9
-:1064500010BD000030B587B004001D004B062AD4E3
-:106460001648CB0725D58B0710D5D368002B0DD048
-:106470001A7919780A9B0493012303930295FE333A
-:106480000193002300932000FFF714FB0B4B98426D
-:1064900001D000280DD10A9B049301230393029598
-:1064A000FE330193002300930022B7212000FFF761
-:1064B00001FB07B030BD0020D3E7C0468000B2002A
-:1064C00030B587B004000800150019000C9B049338
-:1064D00000230393029001930B9B00930A9B0022DD
-:1064E0002000FFF7E7FA002801D007B030BD0C9B71
-:1064F00000930023012229002000FFF7DFFBF4E7CF
-:10650000F0B5DE4657464E464546E0B589B00590A3
-:106510000D0090469B4612AB1B789A4600230693CB
-:106520005D4E002400273000139B99462DE0032088
-:1065300000E00420002108E00020FBE72218521AA6
-:10654000AA18D67806AA565401318842F6D84A4687
-:106550000292019006AA0092172202A98C46624478
-:1065600051460598FFF7ACFF00280BD17F00FBB226
-:10657000172202A98C4662441778049A17407A1EA3
-:1065800097411F430834444531D82B5D9B0716D4EF
-:10659000631CEB5CE21CAA5C0492172202A98C46E5
-:1065A0006244002111702A1992789209012ABED002
-:1065B000022ABED0002ABFD05A461068BAE70600A9
-:1065C000002E16D0002E5CD12B199B780133DBB244
-:1065D00004935A46D364012B5BD93700B24600239B
-:1065E00005961E00A8462500149B994617E02B4EE1
-:1065F000E6E742462B195B78BB42E3D02B199B7828
-:1066000002339B00E418A242F4D2244EDAE7E3609E
-:106610005168380002F012FC60600136F6B2049B4B
-:106620009E422DD2BA440435434658195B5D0F2172
-:10663000194001220023114207D15200D2B2013386
-:10664000DBB2042BF7D9154A059207683F0A0137D8
-:106650003F02B2005946096D8C58524622605A00DA
-:10666000D3189B004A46D2184946CB5CA360936876
-:1066700023615368BB42CAD9E76001236360CCE75A
-:10668000059E300009B0F0BCBB46B246A946A04604
-:10669000F0BD014EF5E7C0460600B2000700B200AB
-:1066A000F0B587B006000D0010000E9C0A7909783D
-:1066B00004940027039702936B79019303230093BB
-:1066C00003003000FFF7F6F9002801D007B0F0BD55
-:1066D00029693000FFF73EFB0028F7D12B7D01949C
-:1066E000002200920C9A0D993000FFF7B3FA061EB3
-:1066F000ECD1656A06E0012001F058FD013D002D56
-:106700000AD03000A369032BE0D0044B9842DDD0BF
-:10671000002DF0D12800F5E70048F3E70200B200B1
-:1067200010B5002134E00B001033DB0100221A50B9
-:10673000CB01C318184C1C192260184C1C1922607C
-:10674000822424011C192260842424011C19226043
-:10675000134C1C192260134C1C192260124C1C197A
-:106760002260852424011C192260862424011C191E
-:1067700022600E4C1C1922600D4C1C1922600D4C1D
-:106780001C19226087242401A44663441A60013145
-:106790000329C8D910BDC046080800000C08000035
-:1067A00044080000480800004C080000640800008D
-:1067B000680800006C08000010B586B00B001400DB
-:1067C0008A69D16800290ED00A79097804940124D5
-:1067D00003941B780293FF23019300230093FFF798
-:1067E00069F906B010BD0148FBE7C0468000B20061
-:1067F00030B587B004000800150019000A9B049307
-:106800000023039302780292FF2201920093002258
-:106810002000FFF74FF9002801D007B030BD0A9BD8
-:1068200000930023012229002000FFF747FAF4E734
-:1068300010B584B00F236B4401241C708C69A36ACB
-:10684000002B0DD01B7800920F226A44FFF7D0FF77
-:10685000002805D1A36B0F226A4411780B401370F6
-:106860000F236B441878431E9841C0B204B010BD8A
-:10687000F0B5002808D085696B6893421DD92E6D4C
-:10688000002E03D0002004E001BEF4E70C4813E022
-:106890000130EB6C83420ED98300F458E3686768DB
-:1068A0007B432768BC466344BA42F1D39A42EFD295
-:1068B0000C60002000E00248F0BD0248FCE7C04642
-:1068C0000600B2000400B200F0B58BB006900C00D8
-:1068D00015000793002928D0002D30D0A6697769CC
-:1068E0000023099331682800FFF7A7FD020009A9DA
-:1068F0002000FFF7BDFF002F1BD03A79FF2A1AD0E6
-:10690000104B984219D0002811D1099B197A079B86
-:106910000493012303932378029301923368009335
-:106920002B000698FFF7C6F80AE001BED4E73978D5
-:10693000EDE7054804E0044802E0034800E00148B0
-:106940000BB0F0BD0400B2008000B200F0B5DE462E
-:1069500057464E464546E0B5C9B005000C00160046
-:106960009946002913D02EAAAE4B19881180997828
-:1069700091702DAA19881180997891702CAA198884
-:1069800011809B789370636B9846002305E001BEED
-:10699000E9E72FA90022CA540133632BF9D94A46EB
-:1069A00031002800FFF750F84346002B13D0529BCC
-:1069B00002932FAB01933823009333002EAA414654
-:1069C0002800FFF76DFE071E06D12FAB9B79062B23
-:1069D00002D9954F07E0944F002F04D12FAB1B78BD
-:1069E000532B08D0904F380049B0F0BCBB46B2469C
-:1069F000A946A046F0BD2FAB5B78462B01D08A4F4D
-:106A0000F1E72FAB9B78442B01D0874FEBE72FABFF
-:106A1000DB78502B01D0844FE5E72FAB1B79052B9A
-:106A200000D8FCE02FAB5B79012B01D07E4FDAE779
-:106A3000049704AB2DAA2FA97C48FFF763FA0597AA
-:106A400005AB2CAA2FA97A48FFF75CFA794B98423C
-:106A500000D1A0E000230693FF2006AB2EAA2FA9A9
-:106A60000002FFF74FFA071EBDD1A368002B00D12B
-:106A700095E0E368002B00D193E02369002B00D15F
-:106A800091E06369002B00D18FE0E369002B00D116
-:106A90008DE0236A002B00D18BE0A36A002B00D18C
-:106AA00089E0529B02932FAB9A460193069B009379
-:106AB00033002EAA41462800FFF7F2FD070020A967
-:106AC0005046FFF79BFC5046FFF734FA20605046D3
-:106AD000FFF742FA60605046FFF708FB6062E0682B
-:106AE000FFF785FB2069FFF787FB0123A363A06AFB
-:106AF000FFF7F4FB51462000FFF7F6FBE069FFF7D4
-:106B000031FC5046FFF73AFB60645046FFF75EFBEE
-:106B1000A064A3689B461A0049465046FFF796FAC0
-:106B200081462368042B48D0206AFFF76AFB20AA1D
-:106B30002FA92000FFF71BFC002809D0431E2FA916
-:106B4000CA5C01239340A36120AAFFF7D5FA206411
-:106B5000236D002B00D146E7529B02932FAB01938C
-:106B6000059B009333002CAA41462800FFF798FDAF
-:106B7000071E00D037E720AB0293529B019300968B
-:106B80002300059A2FA92800FFF7BAFC2A4B984248
-:106B900041D0070027E70023E36423655AE701BEDD
-:106BA00067E701BE69E701BE6BE701BE6DE701BEA5
-:106BB0006FE701BE71E701BE73E752463833D15C1F
-:106BC000529B0093330022002800FFF743FC071E6E
-:106BD00003D0002F0FD00120B0E7529B029307ABE8
-:106BE0000193049B009333002DAA41462800FFF730
-:106BF00057FD0700EDE75A46494607A8FFF754FA44
-:106C0000226A494607A8FFF72EFB20AA07A9200001
-:106C1000FFF7ADFB90E70023E3642365E3E6024F53
-:106C2000E1E6C04670F200100500B20084FF0000EB
-:106C300081FF00008000B2000600B200F0B5DE4621
-:106C400057464E464546E0B583B0061E904600D1F5
-:106C5000ACE0002900D1B1E04F68002F00D1AFE0D7
-:106C6000002A00D1AEE00B689946002B03D0002526
-:106C700000239A465DE0544899E001BE70E0524816
-:106C800007E0082B04D198231B019B46B3440CE07A
-:106C90004D485346002B00D189E0B2200004184330
-:106CA00085E080231B019B46B3445B46002B00D14B
-:106CB0007AE01B68454A1340227A1204C0218902F7
-:106CC0000A4013435A4613606368042210001840B8
-:106CD0001A4257D1A3691B68013B032B00D901BE9F
-:106CE000002825D163689B0722D52169E06802F05E
-:106CF0002BF9002900D001BE236980225202934261
-:106D000002D35A1E1A4200D001BE21005846FFF796
-:106D100049F80223FF3362681340227A1204C0212B
-:106D200089020A4013438022120613435A46136015
-:106D30000135A94536D9AB00FC58002CF8D0227893
-:106D4000531EDBB2012B04D9042A02D0082A00D03A
-:106D500001BE237A032B00D901BEA369002B8CD07E
-:106D60002378042B09D08CD8012B9AD0022B86D102
-:106D700088231B019B46B34497E790231B019B4646
-:106D8000B34492E7237A2278A1694046009030000C
-:106D9000FFF7DCFD00289DD00823AB4052461A4384
-:106DA000924697E7002074E7074872E7064803B069
-:106DB000F0BCBB46B246A946A046F0BD0248F6E785
-:106DC0000148F4E70048F2E70400B200FFFFFCFFCF
-:106DD000F0B5D6464F464646C0B507008846140073
-:106DE00099469608194B9A4203D8002E08D10126DD
-:106DF00006E0174E04E0A41B00281CD0002C1AD07B
-:106E0000FA218900300002F019F88246FA2189003F
-:106E1000300002F099F88DB2504601F0D1F9280007
-:106E200001F0D2F94A4641463800FFF701FDB4426D
-:106E3000E1D80024E0E7002805D10020E0BCBA46F4
-:106E4000B146A846F0BD0348F8E7C04603093D0037
-:106E500040420F000200B200F0B5DE4657464E46F3
-:106E60004546E0B589B082460F0090469946129C8F
-:106E7000139B9B460023079300290BD04B46002B06
-:106E80000AD0BA69956843461B195268934205D8DF
-:106E90002D4817E001BEF1E701BEF2E72A4809B02C
-:106EA000F0BCBB46B246A946A046F0BD002802D1C0
-:106EB000296900293AD100283CD00028EFD1A41B31
-:106EC000B044B144002CEAD0260080235B029C42EF
-:106ED00000D91E00BB691B68002207A94046FFF7C6
-:106EE000A4FABB692A7929785846049000200390B7
-:106EF00038780290687901901B68009307AB504680
-:106F0000FEF7D8FD0028D1D1A9684B1CCED02A7B32
-:106F1000C9B25B4604930023039338780290FF20A4
-:106F2000019000935046FEF7C5FDBFE75046FEF7BF
-:106F300011FFC0E72B7D5A46009232004946504669
-:106F4000FEF7BCFEB9E7C0460400B200F0B5DE466D
-:106F500057464E464546E0B589B082460F001600BA
-:106F60009846129D00230793002910D04346002B1A
-:106F70000FD0BA69536A9946136A9B4673195268CF
-:106F8000934208D83F483B004F46994618E001BE5F
-:106F9000ECE701BEEDE73B4809B0F0BCBB46B246AA
-:106FA000A946A046F0BD2C00139A49465046FFF76B
-:106FB00003FC00280FD00028EED1A04436192D1B69
-:106FC000002DE9D03900300001F0BEFF6B18BB4244
-:106FD000E9D37C1AE8E74B469B691B68002207A9A6
-:106FE0003000FFF722FA4B469B695A461279594600
-:106FF0000978139804900020039048460078029086
-:107000005846407901901B68009307AB5046FEF745
-:1070100051FD002803D15B4699684B1C12D1002812
-:1070200003D15B46196900291DD100281FD0002813
-:10703000C1D14B469B699A6C139B49465046FFF75A
-:10704000C7FEB8E75B461A7BC9B2139B04930023C3
-:107050000393484600780290FF2001900093504629
-:10706000FEF728FDDBE75046FEF774FEDDE75B46E2
-:107070001B7D139A0092220041465046FEF79EFD6A
-:10708000D5E7C0460400B200F0B5DE4657464E468E
-:107090004546E0B587B007000E0015000093109A32
-:1070A0009046EB18013B01930023059304930029BC
-:1070B00048D0B3699B469B699A465B461B6C02931A
-:1070C0005B465B68019A93423ED80023994603933E
-:1070D000504C504B9C4200D194E04B46E81A51462C
-:1070E00001F032FF002900D08BE0039B019A93420C
-:1070F00044D3484B9C4200D184E0019B4A46981AF5
-:107100000130514601F020FF002943D1009B002BA4
-:1071100078D02A0004A93000FFF7AAFB041E6AD128
-:10712000049A13690293D3689A46116853685246C9
-:1071300053435B18013B9946019B4B452ED2019B63
-:1071400099462BE001BEB4E72A0004A93000FFF7FE
-:107150008FFB041E0AD1049B1A689146DA68924696
-:107160005B6853434B44013B039302E00023994681
-:107170000393009B9A45ACD9264CAAE704A930009A
-:10718000FFF776FB041EB4D1049B1A689146DB68B6
-:107190009A46AEE71F4C35E0002CB7D14D45B5D22D
-:1071A000424631003800FFF707FB041EF4D15B466E
-:1071B0001B68002205A92800FFF737F9434605AAF6
-:1071C00031003800FFF780FB041EE5D1029B5A0115
-:1071D000D21A92009C466244D200434631003800E5
-:1071E000FFF7F6FD009B534508D9554452469B1ABC
-:1071F00000930400D0E7019B9946CFE70094040078
-:1072000084E7044C200007B0F0BCBB46B246A94658
-:10721000A046F0BD0400B20010B5002814D1072923
-:107220002ED8FF2A2ED81A4B186883687824005B62
-:107230001B188900C9180B68164803401206120C67
-:107240001A430A60002002E0012801D0124810BD54
-:107250000F2919D880235B029A4217D20C4B186869
-:1072600083687A24005B1B188900C9180B680B48D7
-:10727000034012020A4802401A430A600020E6E76F
-:107280000548E4E70448E2E70348E0E70248DEE7B0
-:10729000D45F0108FF00FFFF01004A00FF0000FF6C
-:1072A00000FFFF0030B51A4B1B6842241C5D84426E
-:1072B00028D9032928D8002901D1072A0FD9012963
-:1072C00005D0022906D0032907D012481BE00F2A57
-:1072D00005D9F6E7032A02D9F5E7002A16D1752465
-:1072E0001D5DA940723CAC40214074241C5D2240CD
-:1072F0009B680A43C02189008C4660448000C250CC
-:10730000002000E0034830BD0248FCE70148FAE7EE
-:10731000D45F010801004A00F0B5032835D80028E1
-:1073200001D107290FD9012805D0022806D003284A
-:1073300007D0184828E00F2905D9F6E7032902D914
-:10734000F5E7002923D1144B1C687723E35C032263
-:1073500015009D402B007425655D7626A65D2F00E7
-:10736000B7403B437526A65DB040B240104018437D
-:10737000294008438021090608438023DB00A268D6
-:10738000D050A268D3580020F0BD0248FCE7014865
-:10739000FAE7C04601004A00D45F010810B503288F
-:1073A00028D8002801D107290FD9012805D00228A3
-:1073B00006D0032807D011481BE00F2905D9F6E7AE
-:1073C000032902D9F5E7002916D10D4B1A68752358
-:1073D000D45CA040723BA34018407423D35C194096
-:1073E000926801438020C00501438023DB00D15017
-:1073F000002010BD0148FCE70048FAE701004A0000
-:10740000D45F0108064B1B681A6888215B58D218A4
-:10741000136804490B400002034313607047C046E1
-:10742000D45F0108FF00FFFF044B1A68136888212E
-:1074300052589B181868000AC0B27047D45F010800
-:10744000012800D901BE054A136805490B40000216
-:10745000C021890008401843106070470000274091
-:10746000FFFCFFFF10B5074B984200D901BE06494B
-:10747000064A8B58064C2340024C20401843885043
-:1074800010BDC046010300000000264004050000B6
-:10749000FEFCFFFF10B50449044A8B58044C2340FE
-:1074A000000403438B5010BD00002640040500007B
-:1074B000FFFF00FF0349044A885880231B0603434B
-:1074C0008B50704700002640040500000349044A21
-:1074D0008B585B005B088B507047C046000026400D
-:1074E0000405000010B50300032800D901BE054CB7
-:1074F000A021C900605803229043134018436050F4
-:1075000010BDC04600002640064B1B681A68882143
-:107510005B58D21813681B021B0A00060343136052
-:107520007047C046D45F0108044B1A68136888216D
-:1075300052589B181868000E7047C046D45F010867
-:10754000064B1B681A688C215B58D21813680449D3
-:107550000B400002034313607047C046D45F01082C
-:10756000FF00FFFF084B1A684023D35C834209D910
-:10757000064AE0308000815880231B060B4383506D
-:10758000002070470248FCE7D45F01080000264055
-:1075900001004A0000280ED0094B1A684023D35C32
-:1075A00083420AD9074AE030800083585B005B08B9
-:1075B0008350002070470448FCE70348FAE7C046C0
-:1075C000D45F01080000264001004A0010B50B4BB3
-:1075D0001A684023D35C83420CD90F290CD8084C7D
-:1075E000E030800003590F229343114019430151A9
-:1075F000002010BD0348FCE70248FAE7D45F010809
-:107600000000264001004A00064B1A684023D35C64
-:10761000834200D801BEE0308000034BC3580F20E6
-:1076200018407047D45F01080000264010B50C4B8D
-:107630001A684023D35C83420DD903290DD8094C25
-:10764000E03080000359302293430901114019436F
-:107650000151002010BD0448FCE70348FAE7C0468A
-:10766000D45F01080000264001004A00074B1A6859
-:107670004023D35C834200D801BEE0308000044B3D
-:10768000C3581B09032018407047C046D45F010847
-:1076900000002640034B1B6904201840431E9841FC
-:1076A000C0B270470000274010B504000A4A1368B2
-:1076B00008210B43136003E0012000F077FD013C3B
-:1076C000FFF7E8FF002801D1002CF5D1002C01D0F4
-:1076D000002010BD0148FCE70000274002004A00DE
-:1076E00000207047002070470349044A88588023CF
-:1076F0001B0603438B507047000026400C0500001A
-:10770000084AC0235B00D3580122100018401A42D7
-:1077100006D10449044A8B585B005B088B507047C4
-:107720000248FCE7000026400C05000003004A0068
-:10773000064A074BD35801229343002800D1002268
-:1077400013430249024A8B507047C046000026404E
-:107750000C050000014B18687047C0460C6001081A
-:10776000084AA623DB00D25803231340032B06D07C
-:10777000044AA623DB00D35801201840704702209A
-:10778000FCE7C0460000264010B5FFF7E9FF0228DD
-:1077900001D0002010BD014B1868FBE71060010804
-:1077A000134B1A683E23D35C83421DD9042904D9A4
-:1077B0004B1EFF3B9BB2132B18D8FF290CD91F235C
-:1077C00019400C4A0300C0339B009950D030800010
-:1077D00004238350002008E007231940D0308000A4
-:1077E000044BC150002000E0034870470248FCE70A
-:1077F000D45F01080000264001004A0003000C4A43
-:1078000011683E228A5C824200D801BE1A00D03242
-:1078100092000849505807221040042800D07047B1
-:10782000C0339B005B581B300340E1301843F6E740
-:10783000D45F01080000264010B52A4B1A683E2389
-:10784000D35C834200D801BEFFF7D8FF88235B00DA
-:10785000984231D012D802282BD004D903280BD15A
-:10786000FFF73EFF3CE0002839D0012802D1FFF7A6
-:1078700071FF35E0002033E0002031E089235B0018
-:10788000984229D01423FF33984206D1164A174B49
-:10789000D358002B1DDB002022E01223FF33984237
-:1078A00005D1FFF7F7FE002810D1002018E00020D6
-:1078B00016E0FFF769FF13E00B4A0D4BD358002B7E
-:1078C00001DB00200CE08020000209E080200002A3
-:1078D00006E08020000203E0FFF704FF00E0054817
-:1078E00010BDC046D45F0108000026403C050000E2
-:1078F0000C05000000127A00024AB023DB00D058C9
-:10790000C00F704700002640034AB223DB00D35863
-:10791000012018407047C046000026400B4BB120A4
-:10792000C0001A580A491140802292050A431A5091
-:10793000B021C9005A58520052085A5005495A58A5
-:10794000520052085A5000207047C046000026409E
-:10795000FFFFFFCF8C05000070B5041E00D175E05D
-:10796000FFF7CAFF002800D074E08023DB02226802
-:107970009A4200D301BE23689B039B0BE279002A45
-:1079800000D165E08022520413433349B022D20073
-:107990008B50A28880239B019A4200D301BE22898A
-:1079A00080239B009A4200D301BEA388DB04DB0C3A
-:1079B0002289120429490A4013432749284A8B5037
-:1079C000A37A0F2B00D901BEE37A0F2B00D901BE99
-:1079D000A28980239B019A4200D301BEA27A0F2381
-:1079E0001340E17A0901FF220A401343A2891202DF
-:1079F0001C490A401343A27B1207C02189050A4093
-:107A000013431549B122D2008B50A379042B00D91E
-:107A100001BE228A80239B009A4200D301BE0E48F9
-:107A200011494358114A1340A2791202E025ED0092
-:107A30002A401343435043580D4A1340228A1204EC
-:107A4000064C224013434350002070BD01BE87E71F
-:107A5000002299E70748F8E7000026400000FF01F0
-:107A60008405000000FF1F008C050000FFF8FFFFE9
-:107A7000FFFF00FE03004A0010B5002832D01A496B
-:107A8000B023DB00CB589A03920B02608022520491
-:107A900013405A1E9341C371144BCB58DA04D20CD5
-:107AA00082801B0CDB05DB0D0381B123DB00CB588F
-:107AB0000F2214001C4084721C092240C2721A0A50
-:107AC000D204D20C82811B0F032213408373084B14
-:107AD000CB58190A04320A4082711B0CDB05DB0DFE
-:107AE000038210BD01BECAE70000264084050000E5
-:107AF0008C05000070B505002649274A8858802368
-:107B00001B0603438B502C0003E0012000F04EFBCA
-:107B1000013C204AB223DB00D3585B0701D4002C80
-:107B2000F3D11C48B121C90043581C4A1A40802394
-:107B30009B0513434350002D01D0002C0CD0154958
-:107B4000B022D200885880231B0603438B5003E0E9
-:107B5000012000F02BFB013CFFF7D6FE002801D1ED
-:107B6000002CF5D1002D01D0002C0ED00949B122F6
-:107B7000D2008858C0239B0503438B50002D02D0B0
-:107B8000002C05D00025280070BDFFF7C7FEF5E7E3
-:107B9000034DF8E7000026408C050000FFFFFFCFF3
-:107BA00002004A000138074B1A683F23D35C834226
-:107BB00000D801BE8130FF308000034BC058C00F99
-:107BC0007047C046D45F01080000264070B50138F8
-:107BD0000D4B1A683F23D35C834201D80B4870BD1C
-:107BE0000B4D8130FF30840063590A4A1A408023CC
-:107BF0009B0513436351012000F0D8FA63595B00E1
-:107C00005B0863510020EAE7D45F010801004A00E5
-:107C100000002640FFFFFFCFF8B504000D002F4BFA
-:107C20001A683F23D35C834201D22D48F8BDFFF789
-:107C3000B9FF002845D1AA78931EDBB20E2B42D89B
-:107C40006B78002B41D0122B41D82F783E00E97879
-:107C5000002932D0133086423BD300292FD0382060
-:107C6000864238D8013C2879022816D07F20384037
-:107C70001B02F8267601334003431204F820400328
-:107C800002401A43C90680231B05194011432300F3
-:107C90008133FF339B00134A995012498134FF34DA
-:107CA000A4006358104A13402A791207C0208005A7
-:107CB0000240134363500020B8E71620CBE7702042
-:107CC000CEE70A48B2E70648B0E70548AEE7044801
-:107CD000ACE70348AAE70248A8E7C046D45F01081A
-:107CE00001004A0000002640FFFFFFCF03004A00CA
-:107CF0000138114B1A683F23D35C83421AD9813073
-:107D0000FF3080000D4BC3587F221A400A70180ABA
-:107D10001F2210404870180C02408A708022120501
-:107D20001A40501E8241CA701B0F032213400B7170
-:107D3000002070470248FCE7D45F0108000026409D
-:107D400001004A0070B50D00461E294B1A683F23FA
-:107D5000D35CB34249D9274933008133FF339B00B9
-:107D600058588022120602435A502C0003E001208A
-:107D700000F01CFA013C33009133FF339B001D4A95
-:107D80009B58DB0701D4002CF1D1002D01D0002C31
-:107D900017D033008133FF339B00164A9A58120FD5
-:107DA00003231340022B01D0002070BD114A8136FD
-:107DB000FF36B600B158C0239B050B43B3500020DB
-:107DC000F3E70C4C8136FF36B60033590A4A1A40A5
-:107DD00080239B0513433351012000F0E7F9335909
-:107DE0005B005B0833510548DFE70548DDE7C04627
-:107DF000D45F010800002640FFFFFFCF02004A00C9
-:107E000001004A00F0B587B01422002101A802F059
-:107E1000E8FB01A8FFF730FEFFF76EFD002807D052
-:107E200001AB9B7B022B01D0012302E0002300E089
-:107E3000002301AA019E94882000D279002A1FD035
-:107E40000225002B1ED000281DD00020FFF7F4FCD7
-:107E500032000023002101F087F906000F002A00FC
-:107E600000232000002101F07FF902000B00CC0765
-:107E70004008204349088019794101F055F902E092
-:107E80000125DEE7002007B0F0BD0000F0B585B0A9
-:107E900004002E4B1B683F229A5C002A53D0002816
-:107EA00052D03E229B5C834200D801BE274B1A6809
-:107EB0003F23D35CA34201D2002045E005220021EC
-:107EC00002A802F08EFB02A92000FFF711FF20009C
-:107ED000FFF768FE002807D002AB1B79022B01D008
-:107EE000012302E0002300E0002302AA167857785D
-:107EF00038009578002B24D0002F25D0002D01D1FB
-:107F0000280021E02000FFF797FC32000023002129
-:107F100001F02AF9009001912A0000233800002185
-:107F200001F022F902000B00CC0740082043490869
-:107F3000009C019D24184D412000290001F0F4F817
-:107F400002E0002000E0002005B0F0BDD45F010891
-:107F500010B504000D4B1A683E23D35C834200D851
-:107F600001BE002C09D0094B1A683F23D35CA34201
-:107F700008D22000FFF760FC10BDFFF743FF002888
-:107F8000FAD1F6E72000FFF781FFF8E7D45F010898
-:107F900070B50600FFF76AFB05000124844030003D
-:107FA000FFF732FBFFF7D4FF64082018E84070BDEC
-:107FB00010B50020FFF7ECFF0400FFF7B5FA411CF5
-:107FC0004808001900F03AFF10BD10B5FFF7F0FFA8
-:107FD0000400FFF729FA411C4808001900F02EFFA1
-:107FE00010BD000030B5194B1B682C229A5C1F2A6B
-:107FF00015D884080722250095432A1E22D1033272
-:108000001040C000FC3282401B682033A4001B19C2
-:108010001C688140614011406140196012E03C22BF
-:108020009A5E0BB29A420ED007230340074A1268A9
-:10803000126880200006184380239B019C466144FF
-:108040008900885030BD01BEEEE7C046D45F01080C
-:1080500010B50A4B1B682C229A5C1F2A0AD91A6891
-:1080600080239B019C46614489008B585B005B0820
-:108070008B5010BD998FFFF7B5FFFAE7D45F010869
-:10808000094B9A68094B9A4204D010308000084B83
-:10809000C0587047002905D01030044A8300985812
-:1080A0009950F6E701BEF7E700ED00E00000000898
-:1080B00000000010F0B5C64600B582B0041E019164
-:1080C0004FD04368032B00D901BE0023E05E002897
-:1080D00025DA254E0023E25E6168002A24DB93083E
-:1080E000224DC0339B005859804603273A40D200A6
-:1080F000FF208446070097404046B84307008901A7
-:1081000060460840904038435851194B9A68194BC3
-:108110009A4220D0300002B080BCB846F0BD6188E1
-:10812000FFF760FF0026D5E70F231340083B9B08AD
-:1081300006339B000E48844663445F680320024078
-:10814000D200FC3005009540AF43890108409040C3
-:1081500038435860D9E70023E05E0199FFF790FFAC
-:10816000D8E7014ED6E7C0460100560000E100E026
-:1081700000ED00E00000000810B5040006E0084B28
-:108180001868F8F701FA074B9C46644480231B02E9
-:108190009C42F4D8044B18686043F8F7F5F910BD19
-:1081A0008C0000080080FFFF9000000810B5034B12
-:1081B0001B785843F8F7E8F910BDC0469400000852
-:1081C00010B5FFF7D9FF10BD10B5FFF7EFFF10BDD9
-:1081D000054B802212069A649B6C002B01DB002069
-:1081E00070470248FCE7C0460000274003004600F5
-:1081F0000D4B8022120198585B68FF221A4202D070
-:108200008023DB021843084A084BD3581B0402D0D2
-:1082100080235B021843044A044BD3581B0C02D042
-:1082200080239B021843704700002640040800008A
-:10823000FEE7000010B50A4B0268DA6142681A6274
-:1082400082685A62C2689A620269DA6242691A6393
-:1082500082695A63C2699A63FFF7EAFF10BDC0469C
-:1082600038070008F0B5C64600B5002833D01923FA
-:108270008B429B415B42314C22681668AC27D25B33
-:10828000B61832680325AA432B401A433260266889
-:108290003268F65B92191768294E374017602768D5
-:1082A0003A689046AE229446BF5A3A004244176854
-:1082B000AF433B431360226813686446125B9B180C
-:1082C0001A6832401A60002807D010291DD92129C8
-:1082D00027D801221AE06423CAE7184B1B685522ED
-:1082E0009A5C8A421FD256229A5C8A421DD2572239
-:1082F0009A5C8A421BD258229A5C8A4219D259222D
-:108300009B5C8B4217D3553A00E000220B4B1B6855
-:1083100059680B680F20834313430B6080BCB84639
-:10832000F0BD0222F2E70022F0E70122EEE702228E
-:10833000ECE70322EAE70522E8E7C046D45F01083C
-:10834000FFFCFFFFB0235B055B78002B04D0B0235C
-:108350005B055878C0B270472120FCE7B0235B056D
-:108360009B899BB2002B04D0B0235B05988980B217
-:10837000704780204000FBE770B5FFF7EFFF8023D8
-:108380005B0098421AD0B0204005174BC358174ADB
-:108390001340174C21680A689C25495952181168E6
-:1083A000C025AD0029400B43136022681368A0214B
-:1083B00052589B180F4A82581A6070BD0C4B1A68AD
-:1083C00011689C20125889180A680F24A2439A3811
-:1083D00002430A601B681A68A0215B58D218136810
-:1083E000A34303431360E8E748180000FFFCFFFFC6
-:1083F000D45F01084418000070B5FFF7AFFF802379
-:108400005B0098421AD0B0204005134BC358134A62
-:108410001340134C21680A689C2549595218116869
-:10842000C025AD0029400B43136022681368A021CA
-:1084300052589B180B4A82581A6070BD084B1A6834
-:1084400013689C2152589B181A68074911408022D2
-:10845000D2010A431A60F0E750180000FFFCFFFF4A
-:10846000D45F01084C180000FF8FFFFF10B5FFF725
-:1084700075FF80235B00984212D0B02252050F4B4B
-:10848000D3580F4A13400F4A11680A689C200958B4
-:1084900052181168C020800001400B43136010BDCA
-:1084A000084B1A6813689C2152589B181A68064991
-:1084B0001140C022D2010A431A60F0E71C180000E4
-:1084C000FFFCFFFFD45F0108FF8FFFFF70B5FFF7D0
-:1084D00045FF80235B0098421BD0B0204005184B1D
-:1084E000C358184A1340184C21680A689C254959FA
-:1084F00052181168C025AD0029400B431360226853
-:108500001368A02152589B18C122520182581A6048
-:1085100070BD0D4B1A6811689C20125889180A68A2
-:108520000F24A243993802430A601B681A68A021ED
-:108530005B58D2181368A34303431360E8E7C046AF
-:1085400024180000FFFCFFFFD45F010870B5204B2A
-:108550001A6813689C2152589B181C68C02000019F
-:108560000440FFF7FBFE80235B0098421FD01849B0
-:10857000086803689C2280581B181868154D28400D
-:1085800018600868036880581B181D68C0263601EB
-:108590003000A04305431D6009680B688A589B188A
-:1085A00018683040001B431E9841C0B270BD0020C7
-:1085B000FCF7A4FE0400FFF7C5FE222803D8002C18
-:1085C00003D10120F2E70120F0E70020EEE7C046EA
-:1085D000D45F0108FFF3FFFF70B584B006000D0003
-:1085E000022804D9042802D0032800D001BE6B1E43
-:1085F000DBB2012B04D9042D02D0082D00D001BE1E
-:10860000B300294A9C58042D1FD0012D1FD0022DE4
-:1086100033D026006469002CFBD1002034E064696B
-:10862000002C18D0214B984213D0A3682B42F6D1CE
-:10863000E3681A6802925B6801930393290002A819
-:10864000236898471A4B1C60E9E70020E8E7002000
-:10865000E6E7012DE9D1012D01D004B070BD134B27
-:10866000984204D0B600134B0022F250F5E7B60052
-:108670000F4B1A680F4BF250EFE70D4B1E68002EA0
-:10868000CBD03669C9E73669002EE6D0B3682B42F5
-:10869000F9D1F3681A6802925B6801930393290089
-:1086A00002A833689847EEE754600108FF004200D3
-:1086B000506001083C600108F0B5C64600B50700EF
-:1086C000012800D901BEFFF73DFE85B2FFF746FE47
-:1086D00006000020FCF712FE041E17D180235B0069
-:1086E0009E4201D02A4C12E0222D42D8294B1B6811
-:1086F000586829494358294A134098463A06802326
-:108700005B041A4043461343435000E0204C80234F
-:108710005B009E422FD080235B009E4225D01D4BE4
-:108720001A683323D35C002B00D101BE194B1B68A0
-:108730001D6A80235B009E4220D0002F24D0184A5F
-:1087400001212800FCF784FB00280ED1114B1A6888
-:10875000BC23D3585B191B68002BF7DBEB681B0E9F
-:108760001B06A0221206934210D0200080BCB846FF
-:10877000F0BD074CCBE7222DD1D8CCE7002F01D09C
-:10878000084ADDE7084ADBE7084AD9E70400ECE7D6
-:1087900004004200D45F010818F00000FFFFFFFE54
-:1087A0000300000C01010030010000300100000C4A
-:1087B00000283DD01F4B1B6888229A5819688C46A8
-:1087C0006244126802628C229A5819688C4662448C
-:1087D0001268426246229A5C002A28D0E0229968F8
-:1087E0008A58D20623D5DA68F223DB01D358036016
-:1087F000104B1B68F022D201D9688A5842600E4A99
-:10880000D9688A5882600D4AD9688A58C2600C4A71
-:10881000D9688A5802610B4AD9688A5842610A4A63
-:10882000D9688A588261DA68084BD358C3617047A7
-:1088300001BEBFE7D45F010804780000087800009B
-:108840000C78000010780000147800001878000000
-:1088500010B500283BD01F4B19680A6888240959B5
-:108860005218016A116019680A68043409595218CB
-:10887000416A11601B6846229A5C002A26D0E022D9
-:1088800099688A58D20621D5F022D201D968446865
-:108890008C50114AD96884688C50104AD968C468D1
-:1088A0008C500F4AD96804698C500E4AD9684469C3
-:1088B0008C500D4AD96884698C500C4AD968C469B7
-:1088C0008C50DA680168F223DB01D15010BD01BE83
-:1088D000C1E7C046D45F01080478000008780000B2
-:1088E0000C78000010780000147800001878000060
-:1088F000F0B5C64600B50700FFF724FD0500012FBF
-:1089000000D901BE7E4B5B68002B00D187E00121BE
-:108910000120FFF761FE041E72D1F7F73EFE06004C
-:10892000774B5B68002B03D004210120FFF754FE36
-:10893000744B1A68136ABA21515ACA00521A9B180A
-:108940001A68002AF4DADB68DA0000D569E08020D2
-:10895000800518436B4B1B68BA215D5AEA00521B15
-:108960001D6AAC466244D060585AC200121A186A96
-:1089700084466244002050601A6A595ACB005B1A40
-:10898000D3185B68FFF7EAFC80235B00984200D1B4
-:108990007FE05C4B1A683323D35C002B00D101BE0F
-:1089A000584B1A68116ABC23D3585B181B68002BFC
-:1089B00000DB72E0544C534B1A68136ABA21515AC7
-:1089C000CA00521A9B181A68002AF4DADD68EB0014
-:1089D00000D581E04D4B1D404A4B1B68BA21585AC7
-:1089E000C200121A186A84466244D5601A6A595A3B
-:1089F000CB005B1AD31800225A603000F7F7D1FD84
-:108A0000002C00D06DE03E4B5B68002B03D00821AA
-:108A10000120FFF7E1FD200080BCB846F0BD002436
-:108A20007BE71B0F1B0798463948FFF7C1FE212D36
-:108A300018D0344D2B68196888229B58C9180B68C8
-:108A400034480340783213430B6029680B688C2547
-:108A500049595B18196801400A431A602C4B424679
-:108A6000134374E7274D2B68196888229B58C9184F
-:108A70000B68284803409022120113430B602968B9
-:108A80000B688C2549595B18196801400A431A6024
-:108A9000E4E7380005F000FA8DE73323D35C012BBF
-:108AA00000D801BE174B1968BA23CA5A0B6A9C46F4
-:108AB0006244BC23CB589B181B68002B0ADB164A68
-:108AC000136904210B431361012F01D030BF72E7FA
-:108AD00020BF70E70C4C6EE728010009FFF7B8FED5
-:108AE00078E7074B5B68002B03D002210120FFF7DA
-:108AF00073FD054B9C4200D18DE7084C8BE7C046C7
-:108B000054600108D45F010805004200FFFFFFDF49
-:108B100014600108FF00FFFF00ED00E0FF004200CD
-:108B2000074A084BD3581F200340B0214905E822CB
-:108B3000D200885CC01A431E9841C0B27047C0463C
-:108B4000000026401CFF0000044B186880231B0413
-:108B5000184043425841C0B27047C046000026400A
-:108B600010B5FFF7F1FF002810D01C4A13681C490C
-:108B70000B4013600820FFF719FB6423174A1268A3
-:108B8000002A09DB002B07D0013BF7E7134A1368E3
-:108B900014490B401360EDE7002B01D1124810BDC2
-:108BA0000E4A136811490B4013600120FFF7FEFACB
-:108BB000FFF7CAFF002801D10020F0E7FFF7B0FF60
-:108BC000012801D00020EAE7B0225205084BD15815
-:108BD000024A084BD1500020E1E7C0460000264081
-:108BE000FFFFFBACFFFFFBAD02004200FFFFFFFBFE
-:108BF00010180000307F000010B5FFF7A5FF002817
-:108C000008D0054B054A10681840C01A4342584125
-:108C1000C0B210BD024BF5E700000453000026402F
-:108C200000000452F8B50400012800D901BEFFF786
-:108C30008DFC002802D12D4D2800F8BDF7F7ADFCC2
-:108C40000600002C14D12A4A2A4B0021D150B02210
-:108C50005205E823DB00D75CFFB20120FFF72CFDB3
-:108C6000051E02D0002D2AD11DE0FFF785FBF9E794
-:108C7000FFF7C2FF002826D01D4A1E4B5021D150BD
-:108C8000B02252051C4BD75CFFB219491B4A8B58C6
-:108C90001F208343143803438B500838FFF786FAAC
-:108CA000FFF7AAFB00251248144943581F2293439B
-:108CB0003A4013434350002C0DD1FFF7D7FB30004F
-:108CC000F7F76FFCB8E7B02252050D4BD158084AB0
-:108CD000084BD150D4E70720FFF768FAFFF7F6FBFF
-:108CE0000020FFF7E9FC0500E9E7C0460300420069
-:108CF00000002640307F0000410700001CFF0000FC
-:108D000010180000084B5A6C120AFF2313403A2B2C
-:108D100000D0704704494B6C044A1A40E8239B0179
-:108D200013434B64F5E7C04600002740FFC5FFDF53
-:108D300004494B6C044A1A40E8239B0113434B64DB
-:108D40007047C04600002740FF00FFFF042810D0F6
-:108D500000060B4B1A681368A42152589B18C022B6
-:108D6000920410401860074A1368A0398B431360BF
-:108D70007047044A136804210B431360F8E7C046A8
-:108D8000D45F010810E000E0044AC0235B00D05823
-:108D9000800F431E9841C0B27047C0460000264075
-:108DA0000749C02252008B589B009B088020C005B9
-:108DB00003438B50885880231B0603438B50704716
-:108DC0000000264010B5040080235B02984200D3C7
-:108DD00001BEFFF7D9FF002809D1054AC4235B0073
-:108DE000D058000C00042404240C0443D45010BDBB
-:108DF0000000264010B504000F2800D901BEFFF77F
-:108E0000C3FF00280BD10649C42252008B580548E5
-:108E100003402404F020000304401C438C5010BD88
-:108E200000002640FFFFF0FF034AE023DB000121A2
-:108E3000D150D3587047C046000026400022430856
-:108E40008B4274D303098B425FD3030A8B4244D312
-:108E5000030B8B4228D3030C8B420DD3FF22090254
-:108E600012BA030C8B4202D31212090265D0030B13
-:108E70008B4219D300E0090AC30B8B4201D3CB0309
-:108E8000C01A5241830B8B4201D38B03C01A52414B
-:108E9000430B8B4201D34B03C01A5241030B8B424D
-:108EA00001D30B03C01A5241C30A8B4201D3CB0238
-:108EB000C01A5241830A8B4201D38B02C01A52411D
-:108EC000430A8B4201D34B02C01A5241030A8B4220
-:108ED00001D30B02C01A5241CDD2C3098B4201D338
-:108EE000CB01C01A524183098B4201D38B01C01AB6
-:108EF000524143098B4201D34B01C01A524103092D
-:108F00008B4201D30B01C01A5241C3088B4201D3DB
-:108F1000CB00C01A524183088B4201D38B00C01A88
-:108F2000524143088B4201D34B00C01A5241411AAF
-:108F300000D20146524110467047FFE701B50020BC
-:108F400000F0F0F802BDC0460029F7D076E7704780
-:108F500003460B437FD4002243088B4274D303099A
-:108F60008B425FD3030A8B4244D3030B8B4228D33B
-:108F7000030C8B420DD3FF22090212BA030C8B4261
-:108F800002D31212090265D0030B8B4219D300E001
-:108F9000090AC30B8B4201D3CB03C01A5241830B86
-:108FA0008B4201D38B03C01A5241430B8B4201D336
-:108FB0004B03C01A5241030B8B4201D30B03C01A5F
-:108FC0005241C30A8B4201D3CB02C01A5241830AD9
-:108FD0008B4201D38B02C01A5241430A8B4201D308
-:108FE0004B02C01A5241030A8B4201D30B02C01A32
-:108FF0005241CDD2C3098B4201D3CB01C01A524199
-:1090000083098B4201D38B01C01A524143098B4221
-:1090100001D34B01C01A524103098B4201D30B010A
-:10902000C01A5241C3088B4201D3CB00C01A52412F
-:1090300083088B4201D38B00C01A524143088B42F4
-:1090400001D34B00C01A5241411A00D2014652418D
-:10905000104670475DE0CA0F00D04942031000D3AC
-:109060004042534000229C4603098B422DD3030A01
-:109070008B4212D3FC22890112BA030A8B420CD311
-:10908000890192118B4208D3890192118B4204D33A
-:1090900089013AD0921100E08909C3098B4201D3BA
-:1090A000CB01C01A524183098B4201D38B01C01AF4
-:1090B000524143098B4201D34B01C01A524103096B
-:1090C0008B4201D30B01C01A5241C3088B4201D31A
-:1090D000CB00C01A524183088B4201D38B00C01AC7
-:1090E0005241D9D243088B4201D34B00C01A52419E
-:1090F000411A00D20146634652415B10104601D32B
-:109100004042002B00D54942704763465B1000D3B4
-:10911000404201B5002000F005F802BD0029F8D05A
-:1091200016E770477047C046002B11D1002A0FD1B7
-:10913000002900D1002802D00021C943080007B44B
-:10914000024802A14018029003BDC046D9FFFFFFAC
-:1091500003B4684601B5029800F052F8019B9E46A0
-:1091600002B00CBC7047C046F0B5CE46474680B54D
-:10917000070099463B0C9C4613041B0C1D000E0077
-:1091800061460004140C000C45434B4360436143AB
-:10919000C0182C0C20188C46834203D980235B0214
-:1091A0009846C444494679437243030C63442D04F2
-:1091B0002D0CC918000440198918C0BCB946B04626
-:1091C000F0BDC04670B500220C4B04000D0001F04C
-:1091D00005F8002804D12000290000F065FF70BDCB
-:1091E000064B00222000290000F0CCFB00F05CFFC1
-:1091F00080231B069C466044F1E7C0460000E04126
-:10920000F0B557464E464546DE46E0B504000D0033
-:109210009246994683B08B4230D82DD0494650466D
-:1092200001F004F829000600200000F0FFFF331AC7
-:109230009846203B9B4633D45A4653469340424679
-:109240001F00534693401E00AF423AD8AF4200D1B0
-:1092500078E05B46A41BBD41002B00DA75E00022DC
-:1092600000230092019301235A4693400193012366
-:1092700042469340009328E08242CFD90022002347
-:10928000009201930C9B002B01D01C605D60009844
-:10929000019903B0F0BCBB46B246A946A046F0BD5A
-:1092A000424620239B1A5246DA40414613004A4662
-:1092B0008A40170042461F43534693401E00AF4268
-:1092C000C4D900220023009201934346002BD9D039
-:1092D000FB0772081A4346467B080EE0AB4201D1F9
-:1092E000A2420CD8A41A9D41012024196D410021ED
-:1092F000013E24184D41002E06D0AB42EED9013E6E
-:1093000024196D41002EF8D1009801995B4600198F
-:109310006941002B24DB2B005A464446D3402A00E7
-:10932000E2401C005B461500002B2ADB26009E4015
-:10933000330026004746BE403200801A9941009013
-:1093400001919FE7A342BCD883E742462023002136
-:109350009B1A0022009101920122DA40019286E7D5
-:10936000424620239B1A2A0046469A402300F34097
-:10937000444613432A00E2401C005B461500002BC4
-:10938000D4DA42462F002023260097409B1ADE4065
-:109390003B003343CDE7C046F0B557464E46454601
-:1093A000DE46E0B5814605000C03480092461F00EA
-:1093B00085B0240B400DCE0F002800D156E1D44BD0
-:1093C000984200D172E16B0FE4001C4380231B0420
-:1093D00023439846CF4BED009B4600239946834498
-:1093E00000933C037B005046240B5B0DFF0F002BCA
-:1093F00000D11FE1C64A934200D162E1C549420F44
-:109400008C46E40059461443802263441204CB1A6C
-:1094100014439B46C200002033007B409A464B46D3
-:109420000F2B27D8BC499B00CB589F46B246009BC8
-:10943000022B16D0032B00D18EE2012B00D0D9E0F5
-:1094400000230024002552461B052343D207134363
-:109450002800190005B0F0BCBB46B246A946A0469C
-:10946000F0BD00240025AA4BEDE7BA46A046150042
-:109470000090DCE7444500D2C7E100D1C2E10123FE
-:109480005B429C462E0040460025E3442302140E16
-:109490001C431B0C994623041F0C120249460092E0
-:1094A0000197FFF751FD02007A430B04310C80460F
-:1094B00019438A4207D901235B429C460919E044BB
-:1094C0008C4200D807E2881A4946FFF73DFD09049F
-:1094D0008C4631046646019A090C4243030031432D
-:1094E0008A4204D90919013B8C4200D8EDE1881A5F
-:1094F000424612041A4390464146009B0E041B0C40
-:109500001F000293009B360C1B04190C0B007343C5
-:10951000120C7E43039151437A431F0CBC467618CC
-:109520006644B14203D9802149028C466244310C21
-:109530008A1831041E04360C8E19904202D312D1BF
-:10954000B54210D24346591E009B9C4665441F00FD
-:109550009D429B415B421B19C018844200D2A0E18E
-:1095600000D19BE18846AE1BB542AD41801A6D42E9
-:10957000401B844200D1D5E14946FFF7E5FC019A42
-:109580000B044243310C050019438A4200D96CE1B7
-:10959000881A4946FFF7D8FC019A36044243090469
-:1095A000360C03000E43B24200D953E10398B61AB9
-:1095B00002002D041D43029F2B041B0C5A437B43C6
-:1095C0009C46290C4843130C8444634479439842D5
-:1095D00003D98020400284466144180C12041B0405
-:1095E000120C41189B188E4200D2FFE000D1FAE025
-:1095F00001231D43494A5A44002A00DCAAE06B07B4
-:1096000000D03DE1ED084346DB0106D54246444B20
-:109610001A4090468022D2005A44424B9A4200DDC2
-:109620001FE743465B071D43434652055C02240B7C
-:10963000530D08E75246224300D17BE0002C00D1B5
-:10964000FAE0200000F0D4FD02000B3A1D230100D7
-:109650009B1A52460839DA408C40144352468A40DD
-:10966000314B58449B4683440020D5E64B46234368
-:10967000984644D0002C00D1CEE0200000F0B8FD88
-:10968000010002000B391D235B1A49461000D94026
-:10969000083884400B004D462343984685402348B4
-:1096A000831A9B460023994600939AE64B46234330
-:1096B00098461DD108239946063B00258346009312
-:1096C0008FE65246224309D1022349461943184BDB
-:1096D00089469C4600240220E3449DE603234A4633
-:1096E0001A43134B91469C4652460320E34493E6AB
-:1096F0000C239946093BA0468346009371E6042358
-:10970000994600239B4601330025009369E6C04635
-:10971000FF07000001FCFFFF74F20010FF030000D0
-:10972000FFFFFFFEFE070000F30300000DFCFFFF3C
-:1097300001F8FFFF4946012319438946002401200F
-:109740006AE6002380249A4600258A4B24037AE6A1
-:1097500001256D4201239B1A382B00DD70E61F2B7B
-:1097600000DCBFE01F2149428A1A4146D1400A006D
-:10977000202B04D04146804B5B4499400D436B1E27
-:109780009D4107232A431D0000241540134200D1A8
-:10979000D4E00F2100231140042900D1CBE0111D9A
-:1097A0009142924152429B180A00190200D4C2E031
-:1097B00001230024002546E6802341461B0319426D
-:1097C00008D01C4206D11C432403BA461500694B3D
-:1097D000240B38E68024434624031C432403B2466A
-:1097E000644B240B2FE6002B00D103E7A619681E5B
-:1097F000A64200D28DE08E4200D2A3E000D1B3E0B9
-:109800000500F5E6AA4200D939E64346DE075808C6
-:109810006B081E43ED0739E6484600F0E9FC0100FD
-:109820000200153120321C2900DC2CE74B46083899
-:1098300083400025984632E700F0DAFC03001A0066
-:10984000153220301C2A00DC00E75446083B002279
-:109850009C4005E73619013BB44200D9A6E6B24266
-:1098600000D8A3E6831E3619A0E60919013D8C42F3
-:1098700000D98DE68A4200D88AE6851E091987E656
-:109880000F232B40042B00D1BCE605235B42AB42E7
-:109890009B4104355B42ED089844B4E6AF4200D9E1
-:1098A00060E6824204D800D05CE6AE4200D859E6B9
-:1098B00002235B429C46009BE0449C4665449D42DB
-:1098C0009B415B421B19C0184DE68A4200D80EE648
-:1098D000831E09190BE68A4200D8F4E5831E9846D8
-:1098E0000919F0E52549280059448D4042468A402F
-:1098F000691E8D414146D840D94002432A430B009E
-:10990000510700D151E70F211140042900D046E74B
-:109910004BE705008E4200D06AE6009A934200D0E1
-:1099200066E667E6164A5A44002A00DC10E701237F
-:109930000025984467E65D075B021C0BD2080023F4
-:10994000154380E50098023D42008242BF417F42BC
-:109950003C1936190092DDE78024434624031C435A
-:109960002403044B240B6EE5009A9A42EAD30500C7
-:10997000D3E7C046FF0700003E0400001E040000BD
-:10998000FF030000F8B557464E464546DE46E0B5B3
-:109990001E0017004A000B03520D5B0A9046420F4F
-:1099A0001A43CD0FCD4C3103C300944670007A0F9B
-:1099B000490AFF009A46B946400DF60F1143A042EE
-:1099C00000D1B1E001225640B346B54200D188E053
-:1099D0004246121A002A00DCAEE0002800D1C1E0A5
-:1099E000BE48804500D151E1802000040143382A5F
-:1099F00000DD7BE11F2A00DDEEE120203E00801A21
-:109A00000C00D640D140874062468440521A781EEE
-:109A10008741944634432743DC1BA3429B41624663
-:109A20005B42D31A99464B461B0200D418E14B46C1
-:109A30005802430A99464B46002B00D137E148466D
-:109A400000F0D6FB010008392023220048465B1AAB
-:109A5000DA4088408C4043461043884500DD36E1BB
-:109A6000C91A4B1C1F2B00DDEAE020222600D21A67
-:109A700001009440DE40D84000239140621E944192
-:109A80008146984631430C43630709D00F23234096
-:109A9000042B05D0231DA342A4416442A1441C0011
-:109AA0004B461B0200D4DEE041468C4B013199420B
-:109AB00000D1E7E04B468A48E40803401800490516
-:109AC0005B07400223434A0D040B1205ED072243B6
-:109AD0002A4318001100F0BCBB46B246A946A04676
-:109AE000F8BD4246121A002A52DD002800D19CE03F
-:109AF000A04500D1CAE0802000040143382A00DDDF
-:109B000049E11F2A00DC97E110000E002038C64012
-:109B1000202A04D04020821A91400F43B9464C4677
-:109B2000621E944134433AE10A003A4328D0B346D6
-:109B3000B5422BD06B4A4244002A5DD0424644468F
-:109B4000821A002C00D0F5E065461D4300D19CE14F
-:109B5000551E012A00D1FBE1604CA24200D1BDE1BB
-:109B60002A00F0E00800384300D1C3E0501E012A6B
-:109B700000D1A8E1594CA24200D187E0020036E7AB
-:109B800001225640B346B54200D021E7554A42442F
-:109B9000002A00D1B5E042464446821A002C00D18A
-:109BA00038E14E4EB04200D1DEE1802664463604F4
-:109BB0003443A446382A00DD96E11F2A00DD24E262
-:109BC0002026B41AA24664465646B440A1461C005C
-:109BD0004E46D440264334005646B3405E1EB34141
-:109BE0001C436346D340C918E419BC42BF417F42BD
-:109BF000B94680468944D8E040463B4C013020427B
-:109C000000D0B4E04046002800D044E1604618434C
-:109C100000D190E10800384300D0AAE16146DB089A
-:109C200049070B436146CC0827E00800384361D060
-:109C3000501E012A00D139E1A24227D002005DE77F
-:109C400002001F39CA401100202B03D04022D31A32
-:109C500098400443631E9C410023994698460C4358
-:109C6000630700D012E74B464A46E4085B072343EC
-:109C7000D408424619498A420ED024035205240BC7
-:109C8000520D22E70A00002400231EE7DB0862468B
-:109C9000520713436246D4081A00224300D1FCE164
-:109CA00080221203144324030C4A240B0DE72000E6
-:109CB00000F09EFA010018311F2900DCC4E60838C4
-:109CC0008440434620000024884500DCC8E6044A5E
-:109CD0005B1A104098468146D6E6C046FF07000052
-:109CE000FFFF7FFF01F8FFFFFE0700000F437A1E12
-:109CF000974191E66146DB0849070B436146CC0872
-:109D0000B8E74046D34C0130204200D0A2E04046A4
-:109D1000002800D001E16046184300D15EE1080050
-:109D2000384300D05FE16146DB0849070B436146D9
-:109D3000CC08A2E7C84DA84200D1CFE080256446F8
-:109D40002D042C43A446382A56DC1F2A00DDD1E01E
-:109D500020251E00AD1A6446AB40AC40D6405D1EC7
-:109D6000AB41344323436446D440091B49E0604679
-:109D7000DC1B461AA34280414042814630004E46D9
-:109D8000801B8146000276D44B46234300D052E626
-:109D90000024002571E739430C00621E9441E41849
-:109DA0009C429B415B42634499464B461B0200D454
-:109DB00056E701239C46A84BE044984538D04B46D3
-:109DC000A648012203401800630814401C43C3073F
-:109DD0001C434308994657E610000E002038C64041
-:109DE000202A04D04020821A91400F43B9464F46A2
-:109DF0007A1E974137430FE662461A4313005A1EF4
-:109E00009341FC1AA742BF417F42CB1B99465D4656
-:109E1000804608E666461E4300D1BEE0561E012A73
-:109E200000D109E18C4CA24200D119E13200C1E617
-:109E300042460024002348E620200C00801A3E0001
-:109E400087408440D640781E8741D14034433C430C
-:109E50008C44A4E7804A904200D1E9E0DF199F4298
-:109E60009B4161445B42C918CC077F084B08994667
-:109E700080463C43F4E6FC1AA742BF4163467F425A
-:109E8000C91ACB1B99465D46D5E5FF084B075D46D1
-:109E90003B43CC08EEE662461A4300D082E00B005A
-:109EA0003B431BD1802400252403F9E6DC199C42A6
-:109EB0009B41614489465B4299444B461B0244D412
-:109EC00001239846CCE6DC1B6246A3429B41511A13
-:109ED0005B42CB1A994601239846A4E5FF084B073D
-:109EE0005D463B43CC08D7E662461A431400631E26
-:109EF0009C4179E615006446203DEC40A046202AAE
-:109F000005D040256446AA1A944023439A465446F5
-:109F1000631E9C414346234373E762461A4323D0A2
-:109F20000A003A4300D0A0E06246DB085207134320
-:109F30006246D408B0E60B003B4300D128E7FF0897
-:109F40004B075D463B43CC0897E60223984636E72D
-:109F5000FC1AA742BF4163467F42C91ACB1B9946F0
-:109F600001235D4698465EE54B07FF083B43CC085E
-:109F700092E6DC1B6046A342B641401A7642801B43
-:109F80008146000260D5FC1AA742BF4163467F426A
-:109F9000C91ACB1B99465D4676E5FF084B073B4344
-:109FA000CC0867E60A00DB083A4300D16FE6624658
-:109FB000520713436246D40880221203144207D08A
-:109FC000C808104204D15D460400FB0849070B4352
-:109FD0005A0FDB00DB08520713435DE64B07FF080F
-:109FE0003B43CC0849E6DC199C429B4161448946CD
-:109FF0005B4299444B461B0200D431E64A46174B5C
-:10A000001A400123914698462AE616006446203EEF
-:10A01000F440A046202A05D040266446B21A944057
-:10A0200023439A465446631E9C4143461C43DBE54A
-:10A0300002000024002348E5DC19BC42BF41614412
-:10A0400089467F42B94438E74B46234300D19FE617
-:10A0500006E6C046FE070000FF070000FFFF7FFF87
-:10A06000FF084B073B43CC0816E66246DB08520765
-:10A0700013436246D40880221203144207D0C80852
-:10A08000104204D15D460400FB0849070B435A0FF8
-:10A09000DB005207DB081343FEE50023014A1C00E6
-:10A0A00013E5C046FF0700000A0030B5134C53000B
-:10A0B00009030500090B00205B0DD20FA34204DD4C
-:10A0C0000F48834202DD0F4BD01830BD8020400383
-:10A0D00001430D48C01A1F2808DD0C48C31AD94097
-:10A0E0000B005842002AF0D11800EEE7084CC5409A
-:10A0F000A446634499400B002B43F2E7FE030000A3
-:10A100001D040000FFFFFF7F330400001304000064
-:10A11000EDFBFFFF70B5002816D0C317C5185D40D2
-:10A12000C40F280000F064F8114A121A0A2816DC3D
-:10A1300003002E0015339E400B23181AC54052050C
-:10A140002D032D0B530D03E00024002300250026D2
-:10A150001B052B43E40723433000190070BD0B3867
-:10A16000854052052D0300262D0B530DF0E7C04608
-:10A170001E0400008446100062468C4619006346A7
-:10A1800000E0C0461FB500F005F9002801D4002109
-:10A19000C8421FBD10B500F055F84042013010BD57
-:10A1A00010B500F0F7F8002801DB002010BD0120F9
-:10A1B00010BDC04610B500F0EDF8002801DD00200C
-:10A1C00010BD012010BDC04610B500F07DF800287C
-:10A1D00001DC002010BD012010BDC04610B500F00C
-:10A1E00073F8002801DA002010BD012010BDC04620
-:10A1F0001C2101231B04984201D3000C10391B0AB7
-:10A20000984201D3000A08391B09984201D300097A
-:10A21000043902A2105C40187047C04604030202D1
-:10A2200001010101000000000000000010B500293C
-:10A2300003D1FFF7DDFF203002E00800FFF7D8FF71
-:10A2400010BDC046F0B54E464546DE4657469046E0
-:10A25000E0B517001A03120B0500844619480E03D7
-:10A260004C0091465A00DB0F9B46360B640DC90F1C
-:10A27000520D844219D0824210D0012094420ED156
-:10A280004E450CD10120C44509D1594517D0002CA9
-:10A2900005D130002843431E984100E00120F0BC66
-:10A2A000BB46B246A946A046F0BD330001202B4371
-:10A2B000F5D1A242F3D14B463B43F0D1E2E7002077
-:10A2C000EDE7C046FF070000F0B54746CE46040064
-:10A2D000180016001B031B0B2D4D4A00994680B534
-:10A2E00043000F03A446B0463F0B520DC90F5B0D50
-:10A2F000C00FAA4221D0AB4213D0002A22D13C4346
-:10A30000002B02D14D462E4322D0002C10D081428A
-:10A3100022D00220013908400138C0BCB946B046FD
-:10A32000F0BD4D462E4329D1002AF0D13C43EED159
-:10A330000028F2D101204042EFE73D0025431DD126
-:10A340009342EED0002BE2D14C462643DFD1E0E72A
-:10A350000020002CE1D0DCE79A420ADCE8DB4F4524
-:10A36000D7D80ED000204F45D7D20029E2D0080020
-:10A37000D3E74342584140000138CEE70220404233
-:10A38000CBE7C445C5D80020C445C6D2EDE7C046DA
-:10A39000FF070000F0B54746CE460400180016003F
-:10A3A0001B031B0B2C4D4A00994680B543000F033D
-:10A3B000A446B0463F0B520DC90F5B0DC00FAA4219
-:10A3C0000DD0AB4210D0002A27D13C43002B11D135
-:10A3D0004D462E430ED10020002C15D00EE03D003E
-:10A3E000254310D1934218D14D462E430BD1002A5C
-:10A3F00002D13C43002C0BD0814214D00220013901
-:10A400000840013800E00220C0BCB946B046F0BDAB
-:10A410000028F9D101204042F6E7002BECD14C4650
-:10A420002643E9D1EAE79A4204DD4342584140001D
-:10A430000138E9E79A42EBDB4F45DFD806D0002030
-:10A440004F45E1D20029E5D00800DDE7C445D5D865
-:10A450000020C445D8D2F5E7FF07000030B514004E
-:10A460001A00094B05001B6885B0D868074B002C03
-:10A4700001D1074B1C00019300912B000549029468
-:10A4800000F00AF801F07CF8EC010008B4F20010CA
-:10A49000EFF20010C1F200100EB403B5010003ABDF
-:10A4A000044804CB0068019300F0DAF902B008BC5C
-:10A4B00003B01847EC010008F7B553430500170037
-:10A4C000089C01910093002804D08369002B01D1DE
-:10A4D00002F030F8274B9C4225D16C68636EDB0795
-:10A4E00005D4A3899B0502D4A06D00F057F8A38979
-:10A4F0001B0722D52369002B1FD00026009B9E42FC
-:10A5000022D0019B995DA368013BA360002B04DA74
-:10A51000A269934226DB0A2924D023685A1C2260B0
-:10A5200019700136EAE7144B9C4201D1AC68D5E7BB
-:10A53000124B9C42D2D1EC68D0E72100280000F0F9
-:10A54000A7FF0026B042D8D0636EDB0705D4A389ED
-:10A550009B0502D4A06D00F022F839003000FEF710
-:10A560006DFCFEBD2200280000F03CFF431CD8D14A
-:10A57000EAE7C046F0F4001010F50010D0F4001027
-:10A5800007B5009313000A00010002480068FFF7B6
-:10A5900093FF0EBDEC01000870477047704770478D
-:10A5A00010B5034B0100186800F0BCF810BDC046A0
-:10A5B000EC01000830B500240139A24201D100208D
-:10A5C00005E0035D01340D5DAB42F6D0581B30BD94
-:10A5D000002310B59A4200D110BDCC5CC4540133A5
-:10A5E000F8E703008218934200D1704719700133D5
-:10A5F000F9E770B5130C0D0C1ED1002B0CD189B2EC
-:10A6000094B24C43210000F08DF8051E1BD02200AF
-:10A610000021FFF7E6FF16E01D1C0B1C92B289B269
-:10A620009CB25143ABB263430C0C1C19220C07D1F2
-:10A63000240489B20C43E5E7002B01D1131CEDE79C
-:10A640000C2300250360280070BD000070B50500D4
-:10A65000002910D00C1F2368002B00DAE418280012
-:10A6600002F096F81D4A1368002B05D16360146050
-:10A67000280002F095F870BDA34208D9216860183F
-:10A680008342F3D118685B6841182160EEE71A0035
-:10A690005B68002B01D0A342F9D911685018A04281
-:10A6A0000BD120680918501811608342E0D1186856
-:10A6B0005B68411811605360DAE7A04202D90C23AD
-:10A6C0002B60D5E721686018834203D118685B6866
-:10A6D0004118216063605460CAE7C0466C6001089D
-:10A6E00070B50F4E0D0031680400002902D100F052
-:10A6F0005FFE30602900200000F05AFE431C0AD0A3
-:10A700000323C51C9D43A84207D0291A200000F04E
-:10A710004FFE431C01D101256D42280070BDC0468B
-:10A7200070600108F7B50322CB1C93430833060081
-:10A730001F000C2B32D20C27B94231D8300002F066
-:10A7400027F8324D2B681C00002C2ED13900300028
-:10A75000FFF7C6FF0400431C1ED12C682500002D06
-:10A760004AD123682900E3183000019300F020FE4D
-:10A77000019B834243D123680337FF1A03239F437E
-:10A7800008370C2F00D20C2739003000FFF7A8FF44
-:10A79000431C34D02368DF19276013E0002BCBDA89
-:10A7A0000C23002533602800FEBD2268D11B20D475
-:10A7B0000B2917D9E2192760A34211D12A606368D7
-:10A7C000116053603000250001F0EAFF07220B35CD
-:10A7D000231D9543EA1A9D42E5D05B1BA350E2E797
-:10A7E0005A60ECE76268A34201D12A60EAE75A6046
-:10A7F000E8E723006468A7E72C006D68AFE70C2347
-:10A800003000336001F0CCFFCDE7C0466C6001083A
-:10A81000936810B5013B9360002B04DA9469A3425E
-:10A8200007DB0A2905D01368581C1060197008004E
-:10A8300010BD00F0D7FD0100F9E7F8B506000F00E4
-:10A840001400D518AC4201D1002007E021783A006D
-:10A850003000FFF7DDFF0134431CF3D1F8BD0000E9
-:10A86000F0B5A1B006000C001F000392002804D030
-:10A870008369002B01D101F05DFE8E4B9C421CD1FF
-:10A880007468636EDB0705D4A3899B0502D4A06DB1
-:10A89000FFF784FEA3891B0702D52369002B1DD176
-:10A8A0002100300000F0F4FD002817D0636EDB07B4
-:10A8B0000DD50120404221B0F0BD7F4B9C4201D11B
-:10A8C000B468DEE77D4B9C42DBD1F468D9E7A3890D
-:10A8D0009B05EED4A06DFFF762FEEAE7002308AD0A
-:10A8E0006B6120336B761033AB760797039F3B7811
-:10A8F000002B01D0252B4ED1039BFB1A0593039B04
-:10A900009F420DD0059B21003000039AFFF795FF71
-:10A91000431C00D1B5E06A69059B944663446B61B2
-:10A920003B78002B00D1ACE001227B1C0393002379
-:10A9300052426A6004A9543252182B60EB60AB603B
-:10A940001370AB65039B052219785D4801F014FF75
-:10A95000039B5F1C002820D12A68D30604D553230B
-:10A9600004A95B1820211970130704D5532304A9E7
-:10A970005B182B211970039B1B782A2B16D0002102
-:10A98000EB68039F3A78781C303A8446092A4FD9FD
-:10A99000002911D117E00137A9E7494B2A68C01AED
-:10A9A0000123834013432B600397CBE7079B191DBB
-:10A9B0001B680791002B01DB0B9304E05B42EB600B
-:10A9C000022313432B603B782E2B0AD17B782A2B52
-:10A9D00037D1079B02371A1D1B680792002B2DDB0E
-:10A9E000099303223978374801F0C6FE002807D0C2
-:10A9F000344B2A68C01A40238340134301372B602D
-:10AA000039787B1C062230480393297601F0B4FE86
-:10AA1000002845D02D4B002B27D10722079B073359
-:10AA20009343083307936B69049A9B186B615DE746
-:10AA30000A214B4367469B180939A3E701235B4270
-:10AA4000CEE700231A0001376B603978781C303963
-:10AA50008446092903D9002BC3D00992C1E70A23F0
-:10AA60005A4367465218093BEFE707AB00932200B1
-:10AA700029003000164B00F0D7F80490049B0133F6
-:10AA8000D1D1636EDB0705D4A3899B0502D4A06DE9
-:10AA9000FFF785FDA3895B0600D50AE70D980AE755
-:10AAA00007AB0093220029003000094B00F06EFB39
-:10AAB000E3E7C046F0F4001010F50010D0F40010E9
-:10AAC000F4F20010FAF20010FEF2001029AC0010AF
-:10AAD0003BA80010F0B51E00002314008BB09E426E
-:10AAE00004DA8021090673181E002D23129A149F80
-:10AAF0001370202303229F43462F07D03B00453B82
-:10AB000059424B411099013ACB18109309AB049369
-:10AB100008AB0393139B00920293109B22000193B6
-:10AB2000330000F0BFFD0500472F02D1119BDB076A
-:10AB300028D5109BEB180793462F14D12B78302B78
-:10AB40000CD10022002320003100FFF723FB002856
-:10AB500004D10123109A9B1A139A1360139B079A2E
-:10AB60001B68D31807930022002320003100FFF751
-:10AB700011FB002801D0079B09933022099B0799FC
-:10AB80008B4206D32800099B159A5B1B13600BB000
-:10AB9000F0BD591C09911A70F0E7F0B5831C87B01D
-:10ABA000039305000C002B230270002901DA4C42AC
-:10ABB00002336B70092C31DD0A2704ABDE1D200047
-:10ABC00039000196FEF7AAFA013E303120003170BB
-:10ABD00039000294FEF7BCF9029B0400632BEEDC03
-:10ABE000019B30349A1E13000399147004A8073097
-:10ABF00098420ED804AB073300209A4204D804AB25
-:10AC00000930C018019BC01A039B1818401B07B0DD
-:10AC1000F0BD1878013308700131E7E73023E418FC
-:10AC2000AB70281DEC70F1E7F0B595B00C000992FF
-:10AC30001E001A9D070001F01DFD036818000C930B
-:10AC400000F0C8FB00231293237E07220A93236897
-:10AC50000E900D930D992B68C90547D59B1893430A
-:10AC60001A0008322A601A685B68A264E364012251
-:10AC7000A36CE56C0B936B005B080F930B98A74BD1
-:10AC80000F99524203F076F8002831D10122A34BEC
-:10AC90000B980F995242FFF78DFA002828D1002215
-:10ACA000002329000B98FFF77BFA002803D023002C
-:10ACB0002D2243331A700A9B994D472B00D9994D89
-:10ACC00003230D9A236101339A43002322600B93DF
-:10ACD000099B21003800009613AA00F0E7F9431CF5
-:10ACE00000D0A2E00120404215B0F0BD0733B6E726
-:10ACF0000B9A2B001000290003F03CF800280BD021
-:10AD0000002D03DA23002D2243331A700A9B864D4F
-:10AD1000472BD5D9854DD3E720220A996368914303
-:10AD20000F915A1C49D10733636080230D9ADB00D1
-:10AD300013430022069212AA05920A9A08A90492C5
-:10AD400011AA03922322236001936368521802928E
-:10AD5000009338002B000B9AFFF7BCFE0F9B0500F9
-:10AD60001199472B08D1CB1C02DB6368994248DD5F
-:10AD70000A9B023BDBB20A930A9B652B24D8200076
-:10AD80001A00013950301191FFF707FF129A0B900A
-:10AD900013182361012A02DC2268D20701D501338E
-:10ADA0002361232308AA9B181B78002B00D18FE76F
-:10ADB00023002D2243331A708AE70F9A472AB4D111
-:10ADC000002BB2D10133AFE70A9B662B1BD163681E
-:10ADD00000290DDD2161002B02D12268D20702D5A6
-:10ADE000013359182161119BA36500230B93D8E708
-:10ADF000002B03D101222168114200D09A1C22614C
-:10AE0000F1E767230A93119B129A934206DB2268AB
-:10AE10002361D207E7D501332361E4E70121002B49
-:10AE200001DC4918C91A5218E9E72268530507D40A
-:10AE300023692A0038000999B047431C28D151E7FB
-:10AE40000A9B652B00D8E1E0A06CE16C0022002396
-:10AE5000FFF7A0F9002831D001233800344A0999BE
-:10AE6000B047431C00D13DE7119B129A934202DB8D
-:10AE70002368DB070CD538000E9B0C9A0999B04764
-:10AE80000025431C00D12DE7129B013BAB420ADC9D
-:10AE900023689B0700D506E1139BE068984200DB1E
-:10AEA00022E7180020E722000123380009991A320E
-:10AEB000B047431C00D115E70135E5E7119B002B96
-:10AEC00038DC012338001A4A0999B047431C00D1E5
-:10AED00008E7119B129A134302D12368DB07D7D5E9
-:10AEE0000E9B38000C9A0999B047431C00D1F9E633
-:10AEF00000230A93119B0A9A5B42934201DC129B46
-:10AF000097E722000123380009991A32B047431C01
-:10AF100000D1E7E60A9B0133EBE7C046FFFFEF7F76
-:10AF200005F3001009F300100DF3001011F30010E9
-:10AF300015F30010129AA36D0A929A4200DD0A934B
-:10AF40000A9B002B3CDC00230D930A9BDB43DB17A1
-:10AF50000F93A36D0F9A0B930A9B13400B9AD31A6E
-:10AF60000D9A934234DC119B129A93423DDB236885
-:10AF7000DB073AD4129A0B9B1199D31A521A0A92F0
-:10AF80009A4200DD0A930A9B002B36DC0A9B0025BF
-:10AF9000DB43DB170B93119A129B0B999B1A0A9AAE
-:10AFA0000A409B1AAB4200DC72E722000123380002
-:10AFB00009991A32B047431C00D193E60135EAE7FC
-:10AFC0000A9B2A0038000999B047431CBBD189E687
-:10AFD00022000123380009991A32B047431C00D1DE
-:10AFE00080E60D9B01330D93B3E70E9B38000C9A5E
-:10AFF0000999B047431CBDD174E60B9B3800EA1891
-:10B0000009990A9BB047431CC0D16BE6129B012BE8
-:10B0100002DC01231A4234D001232A0038000999A6
-:10B02000B047431C00D15DE60E9B38000C9A09998D
-:10B03000B047431C00D155E6A06CE16C0022002310
-:10B04000FFF7A8F800281AD1129B6A1C013B3800B0
-:10B050000999B047431C0ED144E622000123380071
-:10B0600009991A32B047431C00D13BE60135129BC7
-:10B07000013BAB42F1DC22000B9B5032DAE60025AB
-:10B08000F5E72A00E3E72200012338000999193285
-:10B09000B047431C00D125E60135E368139A9B1A9B
-:10B0A000AB42F0DCF8E60025F7E7C046F7B515003F
-:10B0B00001938A680B690C000090934200DA130038
-:10B0C00022002B6043321278002A01D001332B601A
-:10B0D00023689B0602D52B6802332B602268062367
-:10B0E00017001F401A4227D0230043331B785A1EF3
-:10B0F00093412268920630D4220001990098089E5C
-:10B100004332B047431C25D0062320682A68E168F3
-:10B1100000250340042B03D18D1AEB43DB171D40A0
-:10B12000A3682269934201DD9B1AED180027BD42F6
-:10B1300020D1002010E00137E3682A689B1ABB4247
-:10B14000D2DD2200012301990098089E1932B047F0
-:10B15000431CF0D101204042FEBD3020E1184331B4
-:10B16000087021005A1C45310978A2184332023375
-:10B170001170C1E72200012301990098089E1A323C
-:10B18000B047431CE6D00137D1E70000F0B58BB0E3
-:10B1900006920A0043320793059004920A7E0C003F
-:10B1A000109B782A07D8622A09D8002A00D1C1E06A
-:10B1B000582A00D18CE026004236327022E010007E
-:10B1C00063381528F7D802F023F816001F00F6FFA1
-:10B1D000F6FFF6FFF6FF1F00F6FFF6FFF6FFF6FF9D
-:10B1E000A80036009A00F6FFF6FFB900F6FF360019
-:10B1F000F6FFF6FF9E0026001A684236111D196000
-:10B20000136833700123A7E0086819680A1D050652
-:10B210000BD50D681A60002D03DA2D23049A6D42B8
-:10B220001370614B0A2703931BE00D681A604106F7
-:10B23000F1D52DB2EFE70D681968081D18602E06CC
-:10B2400001D50D6803E06D06FBD50D68ADB2564B18
-:10B25000082703936F2A00D00237230000224333CC
-:10B260001A706368A360002B03DB042221689143FA
-:10B270002160002D02D1049E002B0CD0049E2800DA
-:10B280003900FDF761FE039B013E5B5C33702B00D0
-:10B2900005009F42F3D9082F09D12368DB0706D5A3
-:10B2A00063682269934202DC3023013E3370049BC1
-:10B2B0009B1B2361079B210000930598069B09AA0D
-:10B2C000FFF7F4FE431C4CD1012040420BB0F0BD0F
-:10B2D00045310A70344A03921A68216820CA1A60FC
-:10B2E000080616D5CB0702D5202319432160102765
-:10B2F000002DB2D1202322689A432260ADE720229C
-:10B3000009680A4322602200782145321170274AD9
-:10B31000E1E74806E6D5ADB2E4E71A680D68101D0E
-:10B320004969186013682E0601D5196002E06D06A0
-:10B33000FBD519800023049E2361BBE71A68111D09
-:10B340001960166800213000626801F015FA0028C3
-:10B3500001D0801B6060636823610023049A13702E
-:10B36000A8E72369320006990598079DA847431C62
-:10B37000AAD023689B0715D4099BE0689842A5DAF8
-:10B380001800A3E72200012306990598079E1932A9
-:10B39000B047431C98D00135E368099A9B1AAB4229
-:10B3A000F0DCE9E70025F7E717F3001028F30010B9
-:10B3B000002370B5064D040008002B6002F04EFD1E
-:10B3C000431C03D12B68002B00D0236070BDC04606
-:10B3D000746001080023C25C0133002AFBD1581EAF
-:10B3E00070470000F8B505000E001400002804D0D6
-:10B3F0008369002B01D101F09DF8224B9C422ED194
-:10B400006C68A369A360A3891B0732D52369002B4D
-:10B410002FD023682269F7B2981A6369F6B2834283
-:10B4200005DC2100280000F0E3FF002827D1A368F5
-:10B430000130013BA36023685A1C22601F706369BE
-:10B44000834204D0A389DB0707D50A2E05D121004A
-:10B45000280000F0CDFF002811D13000F8BD0A4BC4
-:10B460009C4201D1AC68CCE7084B9C42C9D1EC6846
-:10B47000C7E72100280000F00BF80028C9D00126FA
-:10B480007642EAE7F0F4001010F50010D0F4001056
-:10B49000374B70B51D6806000C00002D05D0AB6958
-:10B4A000002B02D1280001F045F8324B9C420FD10D
-:10B4B0006C680C23E25E93B211072DD4D90611D427
-:10B4C00009230120336037331343A381404270BD09
-:10B4D000294B9C4201D1AC68EBE7284B9C42E8D158
-:10B4E000EC68E6E75B0713D5616B002908D0230001
-:10B4F0004433994202D03000FFF7A8F80023636379
-:10B500002422A3899343A3810023636023692360DA
-:10B510000823A2891343A3812369002B0BD1A02107
-:10B520008022A389890092000B40934203D021001E
-:10B53000300001F0CBF80C22A35E01201A0099B272
-:10B54000024003420FD00022A26062695242A2610F
-:10B55000002022698242BAD10A06B8D5402213439C
-:10B56000A3810138B3E7880700D46269A260EFE7DE
-:10B57000EC010008F0F4001010F50010D0F40010F9
-:10B58000062010B501F0DAFC012002F075FCF0B5E0
-:10B5900006000B69326987B0002003919A4265DB8F
-:10B5A000013B9C0000930B00143305931B1904937B
-:10B5B0003300143302931C19049B27681B6838005E
-:10B5C0005D1C29000193FDF739FC0190AF4224D3A3
-:10B5D0000025AC460298059F08CF019A99B25143C5
-:10B5E0001B0C534349190A0C9B18026889B292B28A
-:10B5F0006244521A01681D0C090C9BB2CB1A11143B
-:10B600005B18191492B21B041A43049B8C4604C0A5
-:10B61000BB42E1D22368002B30D03000039901F007
-:10B620004BFB002821DB30000024019B03990133F0
-:10B63000019314301431036820C99AB21419AAB2C4
-:10B64000A21A1B0C2D0C14145B1B1B191C1492B298
-:10B650001B04134308C0049B8B42ECD2009B029A4C
-:10B660009B00D3181A68002A15D0019807B0F0BDC6
-:10B670002368002B06D1009B013B0093029B043CF6
-:10B68000A342F5D3009B3361C7E71A68002A06D1AD
-:10B69000009A013A0092029A043B9A42F5D3009B29
-:10B6A0003361E2E7F0B59DB002920393029B039CE5
-:10B6B00008930994446A0700259D002C0ED11020A0
-:10B6C000FEF76EFF021E786204D1EA21C74BC8481C
-:10B6D000FEF7C4FE446084600460C4607B6A19683D
-:10B6E00000290AD05A68012393404A608B603800D1
-:10B6F00001F0A2F800227B6A1A60039B002B20DA7B
-:10B7000001232B60039B5B005B080993099DB94BE8
-:10B71000B84A2B40934217D1B74B249A28031360A1
-:10B72000029B000B184301D100F0BFFDB348269BDC
-:10B730000690002B02D0B24B269A136006981DB0DB
-:10B74000F0BD00232B60E1E7089B099C1293139442
-:10B750001298139900220023FEF71CFD041E09D045
-:10B760000123249A1360A74B0693269B002BE5D058
-:10B77000A54BE1E71AAB01931BAB00933800129A7B
-:10B78000139B01F04DFB6E000590760D00D17CE01F
-:10B7900012981399139B9D4A1B031B0B1A4311000C
-:10B7A0009B4B1894F61800229A4BFEF7EBF89A4A36
-:10B7B0009A4B02F073F89A4A9A4B01F033FD040059
-:10B7C00030000D00FEF7A6FC974A984B02F066F891
-:10B7D00002000B002000290001F024FD04000D00F0
-:10B7E000FEF762FC00220290002320002900FEF7F1
-:10B7F000D7FC00280BD00298FEF78CFC2B0022000F
-:10B80000FEF7C8FC43425841029B1B1A02930123D6
-:10B810001693029B162B0FD812981399DA00844BBB
-:10B820009B181A685B68FEF7BBFC002849D0029B96
-:10B83000013B0293002316931A9B9E1B00230A933D
-:10B840003300013B0D9304D501239B1B0A93002376
-:10B850000D93029B002B36DB029A0D9B94466344AA
-:10B860000D93002315920E93229B0124092B64D87B
-:10B87000052B02DD0024043B2293229B981E032803
-:10B8800064D801F0BBFC293836581A9B1B9A9E18C5
-:10B89000684BF218202A0FDD40239B1A9D40664B0F
-:10B8A0000298F318D840284302F082FA0123634C2F
-:10B8B000013E0919189376E7202302989B1A9840B5
-:10B8C000F2E71690B8E70A9B029A9B1A0A93534232
-:10B8D0000E9300231593C7E700230F93239B0C932C
-:10B8E0000793002B13DC01231A000C930793239278
-:10B8F0000DE00123F1E70023239A0F939446029B66
-:10B9000063440C9301330793002B00DC01230022D6
-:10B91000786A426004321500143541689D4219D995
-:10B92000380000F045FF0690002817D1D52102000D
-:10B93000434B4900CBE60123DEE700230F9422931B
-:10B94000013B0C93079300221333D0E701230F939D
-:10B95000023BF6E7013141605200DCE77B6A069A60
-:10B960001A60079B0E2B00D9EBE0002C00D1E8E019
-:10B97000029B002B68DD1A000F212D4B0A40D200DC
-:10B980009B181D685E68029B1C1102231093029B8A
-:10B99000DB050BD52B4B0C401A6A5B6A1298139986
-:10B9A000FDF7FAFC0323089009911093254B14939B
-:10B9B000002C08D1089809992A003300FDF7ECFC07
-:10B9C000089009915CE001231C420BD0109B2800D9
-:10B9D00001331093149B31001A685B6801F05EFF1D
-:10B9E00005000E00149B64100833E0E747F40010D4
-:10B9F0005EF400100000F07F0F27000043F40010F9
-:10BA000046F4001015F3001016F300100000F03F8C
-:10BA100001FCFFFF0000F83F61436F63A787D23F3F
-:10BA2000B3C8608B288AC63FFB799F501344D33F2D
-:10BA3000C8F500103204000012040000000010FEDF
-:10BA4000BCF40010A0F5001002231093029B002B01
-:10BA500016D0129813995C420F23B64A2340DB009C
-:10BA6000D3181A685B6801F019FF012600230890BB
-:10BA70000991B14D2411002C00D094E0002B9FD1EE
-:10BA8000169B002B00D19BE0089C099D0022200002
-:10BA90002900AA4BFEF784FB002800D190E0079B09
-:10BAA000002B00D18CE00C9B002B46DD029B00227A
-:10BAB000200029005E1EA24B01F0F0FE109B0890B2
-:10BAC0000991013310930C9B1098089C099D1493C5
-:10BAD000FEF720FB22002B0001F0E0FE0022994B34
-:10BAE00001F0A0FB10901191109A119B08920993FC
-:10BAF000954A119B9446634417930993149B002B1A
-:10BB000061D1002220002900904BFDF73BFF089AED
-:10BB1000179B04000D00FEF757FB002800D0AFE292
-:10BB20008B481199844661440B0020002900089A33
-:10BB3000FEF736FB002800D09FE2129B139C08936F
-:10BB400009941B9B002B00DA72E1029A0E2A00DD99
-:10BB50006EE1784BD2009B185C681B680A930B94CB
-:10BB6000239B002B00DBF7E0079B002B00DDF3E0BD
-:10BB700000D082E20A980B990022744B01F08EFEED
-:10BB8000089A099BFEF72AFB079E3500002800D083
-:10BB900059E2069B069A0133089331231370029BE6
-:10BBA0000133029354E2344207D0109B01331093C7
-:10BBB0002A686B6801F072FE3300641008355AE79A
-:10BBC000029E079B80E7149B0F995A1E594BD20087
-:10BBD0009B181A685B68002951D000205D49FDF769
-:10BBE000DBFB089A099BFDF7CDFE069A069B94465F
-:10BBF0001793149B1090119163441993290020000E
-:10BC0000FEF752FA1490FEF785FA02000B002000AE
-:10BC10002900FDF7B7FE179B179A01330893149B71
-:10BC2000040030331370109A119B0D00FEF7B8FA20
-:10BC3000002875D122002B0000204049FDF7A2FE0C
-:10BC4000109A119BFEF7ACFA002800D0D2E0199BA5
-:10BC5000089A934200D170E7109811990022384B4E
-:10BC600001F01CFE364B109011910022200029009B
-:10BC700001F014FE089B04000D001793BEE708981E
-:10BC8000099901F00BFE069A069B94460893149BB3
-:10BC9000109011916344199329002000FEF704FAD3
-:10BCA0001790FEF737FA02000B0020002900FDF77D
-:10BCB00069FE179B089A303313701300199A0133E9
-:10BCC00004000D00089393422CD110981199069A04
-:10BCD000149B94466344002208931E4B01F0A2FA81
-:10BCE00002000B0020002900FEF76EFA002800D0A9
-:10BCF00080E0109A119B00201649FDF743FE0200D8
-:10BD00000B0020002900FEF74BFA002800D114E7B1
-:10BD1000089B1A00013A08921278302AF8D008934A
-:10BD2000029655E00022064B01F0B8FD04000D001C
-:10BD3000B2E7C046C8F50010A0F500100000F03FC3
-:10BD40000000244000001C400000C0FC0000144023
-:10BD50000000C07C0000E03F079B069E013B9B1952
-:10BD60000C93089C099D0A9A0B9B20002900FDF763
-:10BD700013FBFEF799F90790FEF7CCF90A9A0B9B93
-:10BD800001F08CFD02000B0020002900FDF7FAFDF8
-:10BD90003300079A013630321A700C9A08969A428C
-:10BDA00039D102000B0001F03DFA0A9A0B9B040006
-:10BDB0000D00FEF709FA00281BD10A9A0B9B200000
-:10BDC0002900FEF7E7F9002802D0079BDB0710D413
-:10BDD0003800059900F030FD0023089A029813708E
-:10BDE000249B01301860269B002B00D1A6E41A602A
-:10BDF000A4E4029E089B0893013B1A78392A06D1D5
-:10BE0000069A9A42F7D13022069901360A701A78BA
-:10BE100001321A7084E70022AA4B01F03FFD002294
-:10BE2000002304000D00FEF7B5F900289BD0CFE7F2
-:10BE30000F9D0E9E0A9C002D12D0229A012A66DCCC
-:10BE4000189A002A5DD0A04A9B180A9A0121D2189C
-:10BE50000A920D9A3800D3180D9300F09DFD05004D
-:10BE6000002C0EDD0D9B002B0BDD0D9A2300944260
-:10BE700000DD13000A9AE41AD21A0A920D9AD31A14
-:10BE80000D930E9B002B1FD00F9B002B54D0002E28
-:10BE900011DD29003200380000F044FE059A01004F
-:10BEA0000500380000F08EFD05991490380000F070
-:10BEB000C3FC149B05930E9B9A1BB34204D038001D
-:10BEC000059900F02FFE05900121380000F064FD77
-:10BED000159B0600002B31DD1A000100380000F030
-:10BEE00021FE229B0600012B2DDD00230E933369DA
-:10BEF00003339B00F318586800F006FD2023181A3E
-:10BF000039E036231A9A0E9E0A9C9B1A9DE7079BDE
-:10BF10005E1E0E9BB34207DB9E1B079B0A9C002BF9
-:10BF200093DAE41A002390E70E9B159AF31AD318BC
-:10BF30000E9615930026F0E70E9AC0E700230E93A5
-:10BF4000229B012B13DC00230E93089B002B0ED1A8
-:10BF5000099B1B030BD15D4B099A134207D00A9B27
-:10BF600001330A930D9B01330D9301230E93159B0F
-:10BF70000120002BBBD10D9B1F221818030013407A
-:10BF8000104246D00132D21A042A3FDD1C22D31AB5
-:10BF90000A9AE418D2180A920D9AD3180D930A9BA4
-:10BFA000002B05DD1A003800059900F017FE0590FA
-:10BFB0000D9B002B05DD31001A00380000F00EFE4D
-:10BFC0000600169B002B26D03100059800F074FE69
-:10BFD000002820DA029B0A22013B0293380000234A
-:10BFE000059900F04DFC0F9B0590002B00D166E1F8
-:10BFF000002329000A22380000F042FC0C9B0500B7
-:10C00000002B47DC229B022B0DDC43E0042AC6D028
-:10C0100013001C33BCE7079B002B35DC229B022B53
-:10C0200032DD079B0C930C9B002B0CD131000522B9
-:10C03000380000F025FC06000100059800F03CFEE9
-:10C04000002800DDA5E5239BDB430293069B0893B4
-:10C0500000243100380000F0EFFB002D00D1B7E6DE
-:10C06000002C05D0AC4203D02100380000F0E4FBE6
-:10C070002900380000F0E0FBAAE600263500E2E7E0
-:10C080000296149E350084E50F9B002B00D1CEE074
-:10C09000079B0C93002C05DD29002200380000F0DE
-:10C0A0009DFD05000E9B2800002B22D038006968FA
-:10C0B00000F07EFB041E0FD10200054B0549FFF77F
-:10C0C00006FBC04600002440330400000000F07F5F
-:10C0D000BCF40010EA02000029002B690C319A1C04
-:10C0E00092000C30FEF774FA01222100380000F0B3
-:10C0F00075FD069B0C9A0A93013B9B1801222C00AC
-:10C1000005001493089B13400F9331000598FFF727
-:10C110003EFA0300210030330D900598079300F09C
-:10C12000CBFD2A000E903100380000F0E1FDC3681D
-:10C130000890109301230C93109B002B04D1010055
-:10C14000059800F0B9FD0C903800089900F074FBD8
-:10C150000A9B0C9A01330893229B13430F9A1343B3
-:10C160000CD1079B392B26D00E9B002B02DD0D9B9B
-:10C17000313307930A9B079A1A706AE70E9B002BCC
-:10C1800004DB229A13430F9A13431FD10C9B002BFD
-:10C19000F0DD05990122380000F020FD3100059006
-:10C1A00000F08AFD002803DCE4D1079BDB07E1D522
-:10C1B000079B392BDBD139230A9A1370089B08930C
-:10C1C000013B1A78392A68D00132D5E70C9B002B45
-:10C1D00007DD079B392BEED0079B0A9A01331370BA
-:10C1E00037E70A9B079A1A70149B0A9A93423ED02B
-:10C1F00000230A220599380000F042FB0023059035
-:10C200000A2221003800AC4206D100F039FB0400BC
-:10C210000500089B0A9378E700F032FB2900040030
-:10C2200000230A22380000F02BFB0500F1E7079BF2
-:10C230000C93002431000598FFF7A9F9069B3030D4
-:10C2400018550C9B01340790A34207DD00230A22F6
-:10C250003800059900F014FB0590EBE70C9B0120DA
-:10C26000002B00DD18000024069B1B18089305997D
-:10C270000122380000F0B2FC3100059000F01CFDF6
-:10C2800000289BDC02D1079BDB0797D4089B08930F
-:10C29000013B1A78302AFAD0DBE6069A9A428ED110
-:10C2A000029B01330293312399E7094B269A0693A7
-:10C2B000084B002A01D0FFF73FFAFFF73FFA0C9B2B
-:10C2C000002BB6DC229B022B00DDACE6B1E7C046BA
-:10C2D0003AF4001042F40010F7B58B8905000C0009
-:10C2E0001A075FD44A68002A04DC0A6C002A01DCC1
-:10C2F0000020FEBDE76A002FFAD0002280212E68C0
-:10C300002A601A0049010A400B4234D0606DA389AB
-:10C310005B0706D56368C01A636B002B01D0236CE2
-:10C32000C01A0200216A00232800E76AB847A189E1
-:10C33000431C06D12B681D2B31D82C4ADA40D30779
-:10C340002DD50023636023692360CB0405D5431CEE
-:10C3500002D12B68002B00D16065616B2E60002933
-:10C36000C6D023004433994202D02800FEF76EF96C
-:10C3700000206063BDE701232800216AB847431C01
-:10C38000C5D12B68002BC2D01D2B01D0162B01D19B
-:10C390002E60ADE74023A2891343A381A9E7402380
-:10C3A0000B43FAE70F69002FA2D00A680F60D21B77
-:10C3B000019200229B0700D14A69A260019B002BD9
-:10C3C00000DC95E73A002800019B216AA66AB04785
-:10C3D000002806DC40230120A28940421343A381A8
-:10C3E00087E7019B3F181B1A0193E7E701004020F4
-:10C3F0000B6970B505000C00002B02D10025280048
-:10C4000070BD002804D08369002B01D100F092F8A0
-:10C41000144B9C421BD16C680C22A35E002BEDD008
-:10C42000626ED20704D49B0502D4A06DFEF7B6F865
-:10C4300028002100FFF750FF636E0500DB07DED404
-:10C44000A3899B05DBD4A06DFEF7A9F8D7E7064BBF
-:10C450009C4201D1AC68DFE7044B9C42DCD1EC6824
-:10C46000DAE7C046F0F4001010F50010D0F4001028
-:10C47000002310B50400036043608360818143663C
-:10C480001900C28103614361836108225C30FEF7B9
-:10C49000A8F8054B24626362044BA362044BE36279
-:10C4A000044B236310BDC0467DCF0010A5CF001004
-:10C4B000DDCF001009D0001010B5024900F0BAF825
-:10C4C00010BDC0467DD0001070B568254A1E55438A
-:10C4D0000E0029007431FEF725F9041E08D0002152
-:10C4E0002A00016046600C30A0606832FEF779F8DF
-:10C4F000200070BD10B50248FEF750F810BDC046D0
-:10C500006960010810B50248FEF749F810BDC04641
-:10C510006960010810B50248FEF740F810BDC0463A
-:10C520006A60010810B50248FEF739F810BDC04630
-:10C530006A60010813B50400FFF7ECFFA369002B44
-:10C5400002D0FFF7EFFF13BDA364E3642365134B31
-:10C55000134A1B68A2620193A34201D10123A36184
-:10C56000200000F01FF86060200000F01BF8A060C1
-:10C57000200000F017F800220421E0606068FFF757
-:10C5800077FF01220921A068FFF772FF0222122122
-:10C59000E068FFF76DFF0123A361D2E7F0F200101E
-:10C5A000B9C40010F8B50700FFF7A4FF1F4B1868C7
-:10C5B0008369002B01D1FFF7BDFF3E004836B46808
-:10C5C0007368013B04D53368002B22D03668F6E748
-:10C5D0000C22A55E002D1AD12000154B5830E360C7
-:10C5E0006566FDF7D9FFFFF78DFF200008222900BF
-:10C5F0002560A560656025616561A5615C30FDF71A
-:10C60000F0FF6563A563A564E5642000F8BD6834A8
-:10C61000D7E704213800FFF757FF041E3060D5D15B
-:10C62000FFF770FF0C233B60EFE7C046F0F200100D
-:10C630000100FFFFF7B50400060000270191483410
-:10C640006368A5680093009B013B009304D52468B0
-:10C65000002CF5D13800FEBDAB89012B08D90E2284
-:10C66000AB5E013304D029003000019B984707439B
-:10C670006835E8E7004870474003000870B50E00D1
-:10C680001D000E23C95E140096B0002908DA0C22A2
-:10C69000B35E00222A601B0611D48023DB000FE06A
-:10C6A0006A4600F05FFD0028F1DBF02301991B02D0
-:10C6B0001940054BC9184B4259412960EDE7402309
-:10C6C0000020236016B070BD00E0FFFFF7B5022622
-:10C6D0008B8905000C00334206D0230047332360CA
-:10C6E000236101236361F7BD6A4601ABFFF7C6FF13
-:10C6F000009907002800FEF715F8002808D10C2241
-:10C70000A35E9A05EFD4032293431E43A681E4E778
-:10C710000F4BAB628023A28920601343A381009B4F
-:10C7200020616361019B002B0DD028000E23E15E88
-:10C7300000F02AFD002806D00322A38993431A00A3
-:10C7400001231343A381A0890743A781CBE7C046F8
-:10C75000B9C4001082B0002900D101A9101E06D072
-:10C76000002B06D013780B601078431E984102B05E
-:10C77000704702204042FAE7C9B28218904201D1C4
-:10C780000020704703788B42FBD00130F6E70000B1
-:10C7900010B50248FDF702FF10BDC04668600108F1
-:10C7A00010B50248FDF7FBFE10BDC04668600108E9
-:10C7B00070B5456A06000C00002D0ED11020FDF763
-:10C7C000EFFE021E706204D16621194B1948FDF775
-:10C7D00045FE456085600560C560756AEB68002BA5
-:10C7E00013D0736AA200DB689B181868002818D160
-:10C7F00001210D00A5406A1D30009200FDF7F9FEF1
-:10C8000000280CD0446085600DE021220421300016
-:10C81000FDF7EFFE736AE860DB68002BE1D10020D2
-:10C8200070BD02681A6000230361C360F8E7C04668
-:10C8300047F400103AF5001070B5466A05000C0088
-:10C84000002E0ED11020FDF7ABFE021E686204D14F
-:10C850008A21094B0948FDF701FE466086600660A3
-:10C86000C660002C07D06B6A6268DB6892009B1878
-:10C870001A6822601C6070BD47F400103AF5001081
-:10C88000F7B50E0001900C001D0000200F69143652
-:10C890003368013099B251431B0C534349190D0CB5
-:10C8A0005B191D0C89B21B045B1808C68742EFDCBC
-:10C8B000002D22D0A368BB4219DC63680198591C83
-:10C8C000FFF776FF061E05D10200B5210C4B0D487F
-:10C8D000FDF7C4FD210023690C319A1C92000C3035
-:10C8E000FDF776FE21000198FFF7A6FF34003B1DFF
-:10C8F0009B00E3185D607B1C23612000FEBDC046E9
-:10C90000BCF400103AF500100300020C0020824233
-:10C9100001D11B0410301A0E01D108301B021A0F6E
-:10C9200001D104301B019A0F01D102309B00002B72
-:10C9300003DB01305B0000D4202070470368020055
-:10C940000721180008400B420DD0063900200B4289
-:10C9500005D10230034203D0CB400800136070477A
-:10C960009B081360FBE799B2002901D110201B0C32
-:10C97000D9B2002901D108301B0A190701D10430AE
-:10C980001B09990701D102309B08D907E9D401306E
-:10C990005B08E6D12020E2E710B50C000121FFF78B
-:10C9A00007FF002806D1A0210200044B04484900DB
-:10C9B000FDF754FD01234461036110BDBCF4001078
-:10C9C0003AF50010F0B50B69140012690D0089B03A
-:10C9D000934201DA25000C002F6926696968BB19AA
-:10C9E0000293AB68BA19934200DA0131FFF7E0FE17
-:10C9F0000190002806D15E210200484B4848FF31D3
-:10CA0000FDF72CFD019B002214339C46BB199B00B3
-:10CA100063440393634603998B422CD32B0022007B
-:10CA20001433BF0014320693B600DB190493931934
-:10CA30000793042305932B00049915330092994220
-:10CA400005D34B1B153B9B0801339B000593079BAC
-:10CA5000009A9A4211D3029B002B06DD039B043BF4
-:10CA600003931B680093002B53D0019B029A18007C
-:10CA70001A6109B0F0BD04C3CDE7009B1B6898B2F2
-:10CA800000281BD067460024069E02CE3A688BB26F
-:10CA9000434392B29B181B190C0C44433A68110C87
-:10CAA00061181C0C09190C0C9BB209040B4308C734
-:10CAB000049BB342E9D86346059A9C50009B1B68CF
-:10CAC0001E0C20D063462C00604600271B681434DF
-:10CAD00022689BB291B271430268120C8918CF1977
-:10CAE00039040B43036002CC4368090C71439BB2C9
-:10CAF0003F0CCB18049ADB191F0C0430A242E7D874
-:10CB0000624605995350009B0433009304239C44D0
-:10CB10009DE7029B013B02939DE7C046BCF40010D9
-:10CB20003AF50010F7B50323150007000E001A4070
-:10CB30001D4208D02549013A920052580023310085
-:10CB4000FFF79EFE0600AD103DD07C6A002C0FD191
-:10CB50001020FDF725FD021E786205D1D7211C4B60
-:10CB60001C484900FDF77AFC446084600460C4609E
-:10CB70007B6A9C680193002C08D138001649FFF7A6
-:10CB80000BFF019B040098600023036001231D42FA
-:10CB90000AD0310022003800FFF714FF3100019065
-:10CBA0003800FFF749FE019E6D100CD02068002868
-:10CBB00007D1220021003800FFF704FF0023206086
-:10CBC00003600400E2E73000FEBDC04690F60010AE
-:10CBD00047F400103AF5001071020000F0B50C00A7
-:10CBE00017002369551187B0EB18029301330193A5
-:10CBF0004968A3680490019A934210DB0498FFF7F8
-:10CC0000D7FD0023020006001900143298420CD10F
-:10CC1000DA210200264B2748FF31FDF71FFC0131C6
-:10CC20005B00E8E7980011500133AB42FADBEB43BD
-:10CC3000DB171D401F2123003800AD005519226964
-:10CC400014339200084084469A180F422AD00131CA
-:10CC5000091A05910021039567461868B8400143F9
-:10CC6000039802C002CB03900598C1409A42F3D8C2
-:10CC7000200015300423824204D3131B153B9B086C
-:10CC800001339B00E950002902D0029B023301933B
-:10CC9000019B0498013B21003361FFF7CDFD30007B
-:10CCA00007B0F0BD02CB02C59A42FBD8F0E7C04600
-:10CCB000BCF400103AF5001002690B6930B50400AD
-:10CCC000D01A9A420DD19B0014341431E218C918BD
-:10CCD000043A043915680B689D4203D001209D4237
-:10CCE00003D330BD9442F3D3FBE74042F9E70000A1
-:10CCF000F0B50E0007001100300087B01400FFF7F8
-:10CD0000DBFF051E10D101003800FFF751FD021EA8
-:10CD100004D1404B40494148FDF7A0FB0123456148
-:10CD20000361100007B0F0BD01230193002804DB6C
-:10CD3000230034001E000023019338006168FFF7D0
-:10CD400037FD021E03D19021324B8900E3E7019B9E
-:10CD50000027C360206914340194019B84001B19CF
-:10CD60003400029333691434990063180393130059
-:10CD700014339C460593019B0493049B02CC20CB67
-:10CD80000493ABB2DF198BB2FB1A090C2D0C6D1A90
-:10CD900019146D1861462F149BB22D042B4308C142
-:10CDA000039B8C46A342E8D83100039C1531042331
-:10CDB0008C4204D3A31B153B9B0801339B000199B4
-:10CDC000CC1805992600CB189C4602998E4210D3A8
-:10CDD000029EE11E00258E4204D3310003310C1B5C
-:10CDE000A408A5005B19043B196800290FD0106145
-:10CDF00097E702CE8DB2ED190F0C291479180F1494
-:10CE0000ADB209040D43614620C18C46DDE701380F
-:10CE1000E9E7C046BCF40010320200003AF5001009
-:10CE2000F7B5012114001E00089FFFF7C1FC051E85
-:10CE300005D10200264B27492748FDF70FFB330396
-:10CE400076001B0B760D24D10193002C27D0684669
-:10CE50000094FFF773FD009C00281ED0019B202149
-:10CE60001A00091A8A40C34022436A610193019C57
-:10CE7000AC61631E9C4101342C61002E18D0174B0D
-:10CE8000F61835233618181A099B3E6018602800DA
-:10CE9000FEBD802252031343D6E76C61E7E701A889
-:10CEA000FFF74CFD0124019B2C616B612030E4E70E
-:10CEB0000B4BC0180B4B3860E3189B00EB185869FC
-:10CEC000FFF722FD6401099B241A1C60DFE7C046BE
-:10CED000BCF400100A0300003AF50010CDFBFFFF80
-:10CEE000CEFBFFFFFFFFFF3F70B504000D001F29C1
-:10CEF00004D9162303600120404270BD436C002B0F
-:10CF000004D08A009B181A68002A08D1200000F07B
-:10CF100031F82A000100200000F01AF8EDE70020A7
-:10CF2000012AEAD0511C03D1162301302360E4E723
-:10CF3000002428001C6090472000DEE710B5034B5A
-:10CF400001001868FFF7D0FF10BDC046EC010008D3
-:10CF5000002370B5064D0400080011002B6000F09E
-:10CF60006DFF431C03D12B68002B00D0236070BDE4
-:10CF70007460010810B500F051FF10BD70B50C00D1
-:10CF80000E25495F00F026F9002803DB636D1B18AE
-:10CF9000636570BDA389024A1340A381F9E7C046C7
-:10CFA000FFEFFFFFF8B51F008B8905000C0016008E
-:10CFB000DB0505D50E23C95E0022022300F0F6F83A
-:10CFC000A389054A28001340A38132000E23E15EA5
-:10CFD0003B0000F02DF8F8BDFFEFFFFF70B50C002F
-:10CFE0000E25495F00F0E2F8A389421C03D1054AEF
-:10CFF0001340A38170BD802252011343A381606559
-:10D00000F8E7C046FFEFFFFF10B50E23C95E00F042
-:10D0100023F810BD0300081E05D0FF2A04D98A2278
-:10D0200001201A604042704701200A70FBE70000AF
-:10D0300070B50400080011001A000023054D2B6094
-:10D04000F6F7B6FA431C03D12B68002B00D02360FF
-:10D0500070BDC04674600108002370B5064D040021
-:10D0600008002B6000F0CAFE431C03D12B68002B84
-:10D0700000D0236070BDC0467460010870B5050023
-:10D080000C1E02D10026300070BD002804D0836938
-:10D09000002B01D1FFF74EFA2F4B9C4217D16C6841
-:10D0A000636EDB0705D4A3899B0502D4A06DFDF751
-:10D0B00075FA0C22A35E002B13D1626E01331600A9
-:10D0C0001E401A42DED1A06DFDF769FADBE7234B63
-:10D0D0009C4201D1AC68E3E7214B9C42E0D1EC6873
-:10D0E000DEE721002800FFF7F7F8236B0600002B8E
-:10D0F00006D02800216A9847002801DA01267642E6
-:10D10000A3891B0603D528002169FDF79FFA616BEF
-:10D11000002908D023004433994202D02800FDF7AB
-:10D1200095FA00236363A16C002904D02800FDF761
-:10D130008DFA0023A364FFF7DDF90023A381636E5A
-:10D14000DB0702D4A06DFDF72AFAA06DFDF725FAE2
-:10D15000FFF7D8F997E7C046F0F4001010F500107B
-:10D16000D0F40010002370B5064D04000800110033
-:10D170002B6000F04BFE431C03D12B68002B00D02A
-:10D18000236070BD74600108002370B5064D040073
-:10D1900008002B6000F04AFE431C03D12B68002BD3
-:10D1A00000D0236070BDC0467460010870B50400F3
-:10D1B000080011001A000023054D2B6000F046FE08
-:10D1C000431C03D12B68002B00D0236070BDC046E8
-:10D1D0007460010870B50400080011001A000023F3
-:10D1E000054D2B60F6F704FA431C03D12B68002B86
-:10D1F00000D0236070BDC0467460010802B471465F
-:10D2000049084900095C49008E4402BC7047C04689
-:10D2100003B47146490840004900095E49008E4444
-:10D2200003BC7047F0B54F464646D6460D00040095
-:10D23000C0B51F0011002803620F400A10437A0096
-:10D24000520DE3003C039146640AFA0F4F0F6E0043
-:10D2500027439246B846760DED0FC900954200D19E
-:10D2600099E04C46341BA446002C00DC7CE04A4686
-:10D27000002A00D1B8E0C54A964200D11CE18022C4
-:10D280003C0012041443A0466246382A00DD61E1E6
-:10D290001F2A00DDCCE164462022121B4446944044
-:10D2A0000F00A14664469140E7404C464A1E91411A
-:10D2B0003C43424621436446E240801A5C1AA34242
-:10D2C0009B415F42C71B3B0200D4D0E07F027F0A34
-:10D2D000002F00D1FFE03800FCF78AFF0100083979
-:10D2E000202322005B1A8F40DA408C401743B14262
-:10D2F00000DAFFE0891B4B1C1F2B00DDA8E0202279
-:10D300003900D21A200094409140D840621E9441C6
-:10D31000DF40002601430C43630709D00F2323405D
-:10D32000042B05D0231DA342A44164423F191C00D5
-:10D330003B0200D49EE0954B01369E4200D1B7E0FF
-:10D34000934AE40817407B0771057F0223433F0B94
-:10D350004A0D12053A43ED072A4318001100E0BCBC
-:10D36000BA46B146A846F0BD002C4BD04C46A41B93
-:10D37000A446002E00D023E104001C4300D1AFE1FD
-:10D380006246541E012A00D115E2804DAC4500D101
-:10D39000C8E1A4461BE14A46B21A9446002A00DCC2
-:10D3A000ACE04A46002A43D0784A964200D1AFE129
-:10D3B00080223C0012041443A0466246382A67DCEF
-:10D3C0001F2A00DC5FE14746203AD7406246202A08
-:10D3D00005D064464022121B4446944021434A1E15
-:10D3E00091410C003C4357E03A000A4300D105E16B
-:10D3F0002200013A012C00D182E1644CA4455BD0AB
-:10D40000944641E7634C771C274200D0C4E00400F7
-:10D410001C43002E00D069E1002C00D1BFE144463E
-:10D420000C4300D0D0E14207DB081343C00829E0D9
-:10D430003A000A4300D170E162466446013A012C89
-:10D4400000D1E0E0514CA44500D161E19446B4E73D
-:10D450003A001F39CA401100202B03D04022D31AB2
-:10D460009F403C43631E9C41002700260C436307FA
-:10D4700000D053E7B446E4087B072343F808434A47
-:10D4800094451DD06246070352053F0B520D60E7DD
-:10D4900044460C43621E9441E4189C429B415F4207
-:10D4A0003F183B02E3D5394B01369E4200D0B5E030
-:10D4B0003200002700234CE74207DB081343C00873
-:10D4C0001A00024300D1E1E180273F0307433F03F5
-:10D4D0002E4A3F0B3DE72000FCF78AFE0100183181
-:10D4E0001F2900DCFCE60838844027000024B142F4
-:10D4F00000DBFFE6264A761A17400DE7002A2FD0F8
-:10D500004A46921B9446002E00D1ADE01F4A914539
-:10D5100000D10FE18022120410436246382A00DD58
-:10D520000FE11F2A00DD80E1644620221E00121B4D
-:10D530006746040093409440FE405A1E9341F840D1
-:10D5400034431C43804464188C42BF417F424E46A2
-:10D550004744A6E742460A4311004A1E9141ADE600
-:10D560000C4C721C224200D0A1E002001A43002E93
-:10D5700000D0FAE0002A00D145E13A000A4300D089
-:10D5800046E14207DB081343C0087BE7FF070000C2
-:10D59000FFFF7FFFFE07000047465C1AC21BA34245
-:10D5A000BF417F42B94617004A46BF1A3A0200D52A
-:10D5B0008DE023003B4300D08AE60020002561E790
-:10D5C000B44CA14500D1ADE080242404204364463E
-:10D5D000382C3DDC62461F2C00DDB7E020251E0004
-:10D5E0002D1B0400AB40AC40D640D04042465D1EEF
-:10D5F000AB413443121A904623432CE04207DB0828
-:10D600001343C0083BE75C189C429B4140445B428B
-:10D61000C71801263B0200D429E702269E4A630868
-:10D620001740012214401C43FB071C437F0873E68C
-:10D630004446203AD4406246202A05D0674640221C
-:10D64000D21B4746974039434A1E9141214335E654
-:10D650000343581E8341CC1AA142BF4143467F4237
-:10D6600055464E46DF1B2EE602001A4300D1BDE0B0
-:10D6700062466446013A012C00D1E5E0854CA445A0
-:10D6800058D0944649E764462022121B44469440F1
-:10D690000F00A14664469140E7404C464A1E914126
-:10D6A0003C4342460C436146CA408018F4E6794C3C
-:10D6B000A24200D1FDE6591899429B4140445F4285
-:10D6C000C719FC07490816000C437F08CFE6CC1A9F
-:10D6D000A142BF4143467F42181A5546C71BF7E592
-:10D6E000C9087B0755460B43F808C8E6002C00D054
-:10D6F00081E043460B4315D1802000250003E3E67B
-:10D700005C1AA3429B41C71B5B420126FF1ADAE564
-:10D710004207DB081343C008D2E64207DB08134385
-:10D72000C008ACE643464246C9085B0755460B4372
-:10D73000D008C5E6434642465B07C9080B43D008FC
-:10D74000BEE603431C00631E9C41FCE60200203C35
-:10D75000E24014006246202A03D04025AD1AA840BA
-:10D760000343581E8341234375E7002AE2D03A0061
-:10D770000A43CDD04207DB0813438022C0081203BE
-:10D78000104206D0FC08144203D12000CB087A07CF
-:10D7900013435A0FDB005207DB08134390E643465E
-:10D7A0000B4300D109E743464246C9085B0755468B
-:10D7B0000B43D00866E6CC1AA14289413F1A494280
-:10D7C000554601267F1A7EE542465C1A871AA34217
-:10D7D00092415242BF1A3A023DD5CC1AA142894128
-:10D7E000434649421F1A55467F1A95E57B07C908EB
-:10D7F0000B43F80843E64446DB080C4330D14207AC
-:10D800001343C0085CE67B07C9080B43F80839E6F8
-:10D810005C189C429B4140445B42C7183B0200D4C9
-:10D8200025E61D4B01261F4021E60400203AD44086
-:10D830006246202A04D040226646921B9040034351
-:10D840005A1E93411C437EE65C188C428941404439
-:10D8500049424718DDE623003B4300D1ADE606E62A
-:10D86000440723438024C0082403204208D04246B2
-:10D87000D608264204D155463000CB0851070B4349
-:10D880005A0FDB00DB085207134319E60023014A55
-:10D890001F005EE5FF070000FFFF7FFFF0B5574662
-:10D8A0004E464546DE46E0B598460C034B00060062
-:10D8B000924687B0240B5B0DCF0F002B00D15CE1AB
-:10D8C000D94A934200D175E1420FE400144380220B
-:10D8D00012041443D54AC5009446634400930023C0
-:10D8E00099469B46434642461E03D20F5B00504674
-:10D8F0009046360B5B0D00D120E1CB4A934200D11C
-:10D9000062E1CA49420F8C4600996344F6008C4696
-:10D91000164380229C44120463461643C200002032
-:10D9200000930099434601318C4649467B40019360
-:10D930000F2926D8BE4B890059588F46434601937C
-:10D940003400150083465B46022B16D0032B00D112
-:10D9500003E2012B00D0CDE0002200240025019B32
-:10D9600012052243DB071A432800110007B0F0BC60
-:10D97000BB46B246A946A046F0BD00240025AA4AEF
-:10D98000EDE7280C2D042D0C2B00110C1204120CA9
-:10D990005343984613002F00434399464F434F4447
-:10D9A000BB4647460B003F0CBA464343DA4402935A
-:10D9B000D14504D980277F02B9464B440293534690
-:10D9C0001B0C9B4653461F0443461B041B0C9846E6
-:10D9D0003B0043440493330C3604360C9846330022
-:10D9E00043439946434643432F009A464346774371
-:10D9F0005D43380C4D444519A94503D980235B028A
-:10DA00009946CA443F04280C3F0C2D04ED19270CFD
-:10DA10002404240C0300200050437A4391463A002A
-:10DA200053440593030C9A464A4361434944514485
-:10DA3000AB44894503D980235B0299464A440004DC
-:10DA40000B0C000C0904091820009946434670434A
-:10DA50005C437E435F43030C9846A41944444A4404
-:10DA60000397A64204D980235B0298464744039754
-:10DA70002304029E9A46059B5E449846AE42AD4101
-:10DA800076188E4289410004000C504440446D4297
-:10DA90004719B846934649428946C344D9449842F7
-:10DAA0008041A845AD4193459241894589416D42E8
-:10DAB00040422843240C524249420A43039B001926
-:10DAC0008018C7184B46DC0D049B75021D436A1E67
-:10DAD00095414B46F60D7F0235435A023C431543B0
-:10DAE000FB0100D41CE101216A080D401543E20747
-:10DAF000154364084F496144002900DCB0E06B071E
-:10DB000009D00F222A40042A05D02A1DAA42AD417D
-:10DB10006D4264191500E30104D58021464AC9000D
-:10DB200014406144454A914200DD26E76207ED0852
-:10DB3000640249051543240B4A0D10E7524632434F
-:10DB400000D17FE0002E00D1DCE03000FCF750FB7C
-:10DB500002000B3A1D2301009B1A52460839DA4095
-:10DB60008E40164352468A40009B3549181A0300DE
-:10DB70008C46634400200093D3E6250005434AD039
-:10DB8000002C00D1B0E02000FCF732FB01000200C5
-:10DB90000B391D2310005B1A310035000838844012
-:10DBA000D94085400C432648831A009300239946A8
-:10DBB0009B4697E60500254326D1082200930223C1
-:10DBC000002491469B468DE65246009B324310D17D
-:10DBD000154900268C4663444946009302231943A5
-:10DBE000894602209DE65B460197022B00D0ADE6F8
-:10DBF000C3E60D4A0320944663444A460093032338
-:10DC00001A43914652468CE60C22009303230500EA
-:10DC100091469B4666E60423994600230093013310
-:10DC200000249B465EE6C046FF07000001FCFFFFA4
-:10DC30009CF60010FF030000FFFFFFFEFE07000040
-:10DC40000DFCFFFF494601231943894600260120A8
-:10DC500067E6002380240025434A019324037EE6DF
-:10DC60000120401A382800DD76E61F285BDD1F22E0
-:10DC700023005242511ACB401900202803D03B4ABE
-:10DC80006244944025436A1E95412A000A430721B5
-:10DC90000D000024154011425BD00F2100241140DB
-:10DCA000042953D0111D914292415242A4180A00F6
-:10DCB00023024BD501220024002550E680231B03BC
-:10DCC0001C4209D01E4207D133431C0343461500B2
-:10DCD000240B254A019342E68022120314432403B5
-:10DCE000214A240B01973AE6FCF782FA0100020070
-:10DCF000153120321C2900DC4BE7340008380025A0
-:10DD0000844050E7FCF774FA03001A001532203003
-:10DD10001C2A00DC1EE75646083B00229E4023E7F3
-:10DD2000009B9C46E6E61249220061442E008D408D
-:10DD30008A40C640691E8D4132432A43C44053077E
-:10DD4000B6D00F2111400429ACD1B1E765076402B8
-:10DD5000240BD2081543002201E68022120314434B
-:10DD60002403014A240BFAE5FF0700003E040000EB
-:10DD70001E04000070B505000C481C0316005B0073
-:10DD80000A034900120B490D240B5B0D814208D098
-:10DD9000064A0020934203D120003043431E98419D
-:10DDA00070BD01202A43FBD1F2E7C046FF07000007
-:10DDB00010B5041E10D0FCF71BFA0F4B1B1A0A28D3
-:10DDC00011DC0B222100121AD14015300A035B0529
-:10DDD0008440120B5B0D01E0002300221B0513435E
-:10DDE0002000190010BD22000B3882405B05120391
-:10DDF0000024120B5B0DF1E71E04000058220120E5
-:10DE0000014B40421A60704774600108582201209B
-:10DE1000014B40421A60704774600108582201208B
-:10DE2000014B40421A607047746001085822024B4F
-:10DE300000201A607047C046746001085822012013
-:10DE4000014B40421A60704774600108582201205B
-:10DE5000014B40421A60704774600108044A030095
-:10DE60001068002802D0C318136070470148FAE711
-:10DE70007860010880600108FEE7C046F8B5C0463A
-:10DE8000F8BC08BC9E467047F8B5C046F8BC08BC54
-:10DE90009E4670470000000001B40248844601BC61
-:10DEA000604700BF0906000801B40248844601BC6F
-:10DEB000604700BFA5040008000000000800000043
-:10DEC0000800000000020000000000000000000048
-:10DED0000000000000000000000000000000000042
-:10DEE000000000000B0000003F00000000000000E8
-:10DEF0003F00000000000000010000000B000000D7
-:10DF00001D000000000000000000000000000000F4
-:10DF10000000000001000000000000000000000000
-:10DF200000000000000000000000000001000000F0
-:10DF30000A0000001D0000000000000000000000BA
-:10DF400000000000000000000100000000000000D0
-:10DF500000000000000000000000000000000000C1
-:10DF600001000000060000001D000000000000008D
-:10DF700000000000000000000000000001000000A0
-:10DF80000000000000000000000000000000000091
-:10DF90000000000001000000080000001200000066
-:10DFA0000000000000000000000000000000000071
-:10DFB0000100000000000000000000000000000060
-:10DFC000000000000000000001000000060000004A
-:10DFD000120000000000000000000000000000002F
-:10DFE0000000000001000000000000000000000030
-:10DFF0000000000000000000000000000100000020
-:10E000000000000000000000000000000000000010
-:10E0100000000000000000000100000000000000FF
-:10E0200000000000000000000000000000000000F0
-:10E0300001000000000000000000000000000000DF
-:10E0400000000000000000000000000001000000CF
-:10E0500000000000000000000000000000000000C0
-:10E0600000000000010000000300000000000000AC
-:10E0700000000018000000040000000058E100103B
-:10E080006000000000000000FFFFFFFF0000000034
-:10E090000000000000000000DC00000000000000A4
-:10E0A000FFFFFFFF00000000000000000000000074
-:10E0B0003400000000000000FFFFFFFF020000002E
-:10E0C0000000000002000000EC0000000002000060
-:10E0D0000100000002000000040000000200000037
-:10E0E0003500000000000000FFFFFFFF00000000FF
-:10E0F000000000000000000005000000000000001B
-:10E10000FFFFFFFF00000000000000000000000013
-:10E110000400000000000000FFFFFFFF00000000FF
-:10E1200000000000000000000600000000000000E9
-:10E13000FFFFFFFF000000000000000000000000E3
-:10E140000100000000000000FFFFFFFF00000000D2
-:10E1500000000000000000000400000000000004B7
-:10E16000C8E0001028E1001010E1001098E0001055
-:10E170000000040080E00010B0E000100002000089
-:10E18000F8E00010E0E0001040E1001000000000A6
-:10E190000100000002000000280A0000E00407005F
-:10E1A0001405000000000000000000000100000055
-:10E1B000BCE10010020000001400000064E0001048
-:10E1C000F4010000140004010A000905080003001E
-:10E1D0006301000024010200000000005B494E467C
-:10E1E0005D205374617274696E6720557365722087
-:10E1F0004170706C69636174696F6E206F6E20434B
-:10E200004D342E20506C6561736520776169742EE2
-:10E210002E2E0A0D000000005B494E465D201B5B60
-:10E22000324A1B5B3B480A0D000000005B494E462A
-:10E230005D204D4355626F6F7420426F6F746C6F39
-:10E240006164657220537461727465640A0D000024
-:10E250005B494E465D2045787465726E616C204D59
-:10E26000656D6F727920696E697469616C697A6530
-:10E2700064207573696E6720534644500A0D000090
-:10E280005B4552525D2045787465726E616C204D1D
-:10E29000656D6F727920696E697469616C697A6104
-:10E2A00074696F6E207573696E6720534644502001
-:10E2B0004641494C45443A203078253032780A0DA1
-:10E2C000000000005B494E465D2055736572204199
-:10E2D00070706C69636174696F6E2076616C6964DB
-:10E2E00061746564207375636365737366756C6CC4
-:10E2F000790A0D005B494E465D204D4355626F6FB4
-:10E300007420426F6F746C6F6164657220666F7504
-:10E310006E64206E6F20626F6F7461626C6520693D
-:10E320006D6167650A0D0000030000000100000038
-:10E330000100000000000000050360000400000070
-:10E340000100000000000000010000000604600061
-:10E3500008000000F0080008A905001028696D6198
-:10E3600067655F6E756D29203C203078460000009F
-:10E370002E2E2F6D74625F7368617265642F6D63FA
-:10E3800075626F6F742F76312E372E302D63797052
-:10E39000726573732F626F6F742F626F6F74757411
-:10E3A000696C2F7372632F626F6F747574696C5F21
-:10E3B0006D6973632E63000028737761705F7479F1
-:10E3C000706529203C2030784600000062616400BE
-:10E3D000676F6F6400000000756E73657400000065
-:10E3E00074657374000000007065726D00000000B9
-:10E3F0004255473B2063616E2774206861707065E9
-:10E400006E0000007265766572740000626F6F7452
-:10E410005F737761705F747970655F6D756C746937
-:10E420003A205072696D61727920696D616765008B
-:10E430005B494E465D2025733A206D616769633DF7
-:10E4400025732C20737761705F747970653D307827
-:10E4500025782C20636F70795F646F6E653D30782E
-:10E4600025782C20696D6167655F6F6B3D3078257D
-:10E47000780A0D00626F6F745F737761705F7479F3
-:10E4800070655F6D756C74693A205365636F6E6477
-:10E4900061727920696D6167650000005B494E46D5
-:10E4A0005D205377617020747970653A2025730A76
-:10E4B0000D0000005B494E465D205377617020746B
-:10E4C0007970653A206E6F6E650A0D00626F6F7429
-:10E4D0005F77726974655F737761705F696E666F8D
-:10E4E0000000000077C295F360D2EF7F3552500FE5
-:10E4F0002CB679800401040304020401040104031E
-:10E500000103030401040000000000006FC75E1057
-:10E51000DE8EBD20B149E330BC1D7B41D3DA2551ED
-:10E520006293C6610D549871783BF68217FCA892ED
-:10E53000A6B54BA2C97215B2C4268DC3ABE1D3D325
-:10E540001AA830E3756F6EF37365636F6E64617262
-:10E55000790000007072696D617279005B455252FA
-:10E560005D20496D61676520696E207468652025AE
-:10E570007320736C6F74206973206E6F74207661E2
-:10E580006C6964210A0D00007263203D3D2030005B
-:10E590002E2E2F6D74625F7368617265642F6D63D8
-:10E5A00075626F6F742F76312E372E302D63797030
-:10E5B000726573732F626F6F742F626F6F747574EF
-:10E5C000696C2F7372632F6C6F616465722E6300C8
-:10E5D0005B4552525D2070616E6963210A0D000037
-:10E5E000300000005B57524E5D204661696C6564E7
-:10E5F0002072656164696E6720736563746F7273FE
-:10E600003B20424F4F545F4D41585F494D475F5348
-:10E610004543544F52533D2564202D20746F6F2085
-:10E62000736D616C6C3F0A0D000000005B57524E29
-:10E630005D204661696C65642072656164696E671E
-:10E6400020696D61676520686561646572733B2050
-:10E65000496D6167653D25750A0D00005B57524E97
-:10E660005D204661696C65642072656164696E67EE
-:10E6700020626F6F74207374617475733B20496DF1
-:10E680006167653D25750A0D000000005B4552522B
-:10E690005D2062616420696D616765206D616769F5
-:10E6A00063203078256C783B20496D6167653D2596
-:10E6B000750A0D00626F6F745F706572666F726DC0
-:10E6C0005F75706461746500626F6F745F7377610A
-:10E6D000705F696D61676500626F6F745F636F6D16
-:10E6E000706C6574655F7061727469616C5F73777B
-:10E6F00061700000626F6F745F7072657061726547
-:10E700005F696D6167655F666F725F757064617484
-:10E7100065000000636F6E746578745F626F6F747C
-:10E720005F676F002E2E2F6D74625F736861726574
-:10E73000642F6D6375626F6F742F76312E372E30B4
-:10E740002D637970726573732F626F6F742F626FB0
-:10E750006F747574696C2F7372632F737761705F58
-:10E760007374617475732E63000000005B45525230
-:10E770005D20446574656374656420696E636F6EC3
-:10E7800073697374656E7420737461747573210A90
-:10E790000D0000005B57524E5D2043616E6E6F743A
-:10E7A00020757067726164653A206E6F7420612015
-:10E7B000636F6D70617469626C6520616D6F756EF9
-:10E7C00074206F6620736563746F72730A0D0000A6
-:10E7D0005B57524E5D2043616E6E6F74207570679B
-:10E7E000726164653A206D6F726520736563746F42
-:10E7F0007273207468616E20616C6C6F7765640A57
-:10E800000D0000005B57524E5D2043616E6E6F74C9
-:10E8100020757067726164653A206E6F7420736151
-:10E820006D6520736563746F72206C61796F7574A8
-:10E830000A0D0000737761705F7374617475735FA4
-:10E84000736F757263653A205072696D61727920D9
-:10E85000696D6167650000005B494E465D20426F4F
-:10E860006F7420736F757263653A207072696D61A1
-:10E87000727920736C6F740A0D0000005B494E467C
-:10E880005D20426F6F7420736F757263653A206EFE
-:10E890006F6E650A0D00000066697875705F7265BD
-:10E8A000766572743A205365636F6E646172792085
-:10E8B000696D616765000000626F6F745F737761F7
-:10E8C000705F736563746F7273000000626F6F74C2
-:10E8D0005F6D6F76655F736563746F725F757000EF
-:10E8E000737761705F72756E0000000066697875FD
-:10E8F000705F7265766572740000000073776170F6
-:10E900005F7374617475735F736F75726365000014
-:10E91000737761705F726561645F7374617475733E
-:10E920005F627974657300005B494E465D204572F5
-:10E930006173696E6720747261696C65723B2066F1
-:10E94000615F69643D25640A0D0000002E2E2F6D65
-:10E9500074625F7368617265642F6D6375626F6F57
-:10E96000742F76312E372E302D6379707265737364
-:10E970002F626F6F742F626F6F747574696C2F7371
-:10E9800072632F737761705F7374617475735F6DF9
-:10E990006973632E63000000737761705F72656155
-:10E9A000645F737461747573000000007377617045
-:10E9B0005F7374617475735F696E69740000000041
-:10E9C000737761705F65726173655F747261696CA2
-:10E9D00065725F736563746F727300002E2E2F6D06
-:10E9E00074625F7368617265642F6D6375626F6FC7
-:10E9F000742F76312E372E302D63797072657373D4
-:10EA00002F626F6F742F626F6F747574696C2F73E0
-:10EA100072632F737761705F7374617475735F7065
-:10EA20006172742E63000000286F666673202B20CD
-:10EA30006C656E29203C3D20424F4F545F53574137
-:10EA4000505F5354415455535F445F53495A455F97
-:10EA500052415700696E69745F6F666673203E3D70
-:10EA600020300000737761705F7374617475735F39
-:10EA70007265747269657665000000007377617075
-:10EA80005F7374617475735F77726974655F7265C3
-:10EA9000636F726400000000737761705F7374616C
-:10EAA0007475735F7570646174650000737761706D
-:10EAB0005F7374617475735F726561645F726563BF
-:10EAC0006F726400AFBEADDE6F6666203C2066618B
-:10EAD0002D3E66615F6F6666000000002E2E2F6D72
-:10EAE00074625F7368617265642F6D6375626F6FC6
-:10EAF000742F76312E372E302D63797072657373D3
-:10EB00002F626F6F742F637970726573732F6379DF
-:10EB10005F666C6173685F70616C2F63795F666CB0
-:10EB20006173685F6D61702E630000006F66662020
-:10EB30002B206C656E203C2066612D3E66615F6F08
-:10EB4000666600005B4552525D20466C617368202A
-:10EB5000617265612072656164206572726F722CEA
-:10EB6000207263203D2025640A0D000021286C6579
-:10EB70006E20252043595F464C4153485F53495A04
-:10EB8000454F465F524F57290000000021287772F9
-:10EB90006974655F73746172745F61646472202567
-:10EBA0002043595F464C4153485F53495A454F46AD
-:10EBB0005F524F57290000006C656E203C3D206677
-:10EBC000612D3E66615F73697A6500006F6666203D
-:10EBD0003C2066612D3E66615F73697A65000000C6
-:10EBE0006F6666202B206C656E203C2066612D3E92
-:10EBF00066615F6F6666202B2066612D3E66615FF1
-:10EC000073697A65000000007263203D3D2043591E
-:10EC10005F464C4153485F4452565F53554343450A
-:10EC20005353000066616C73650000007365637484
-:10EC30006F72735F6E203C3D202A636E740000008B
-:10EC4000666C6173685F617265615F6765745F734D
-:10EC50006563746F72730000666C6173685F6172E4
-:10EC600065615F6572617365645F76616C00000069
-:10EC7000666C6173685F617265615F65726173651F
-:10EC800000000000666C6173685F617265615F77A8
-:10EC90007269746500000000666C6173685F617280
-:10ECA00065615F7265616400010000000E00000094
-:10ECB0001100000000000000000000000000000043
-:10ECC0000000000001000000000000000000000043
-:10ECD0000000000000000000000000000100000033
-:10ECE0000E00000011000000000000000000000005
-:10ECF0000000000000000000010000000000000013
-:10ED00000000000000000000000000000000000003
-:10ED1000010000000E0000001100000000000000D3
-:10ED200000000000000000000000000001000000E2
-:10ED300000000000000000000000000000000000D3
-:10ED400000000000010000000E00000011000000A3
-:10ED500000000000000000000000000000000000B3
-:10ED600001000000000000000000000000000000A2
-:10ED7000000000000000000001000000060000008C
-:10ED80001100000000000000000000000000000072
-:10ED90000000000001000000000000000000000072
-:10EDA0000000000000000000000000000000000063
-:10EDB000010000000100000000000000010001004F
-:10EDC00000010001A10FB90BD107DC05E903EE0238
-:10EDD000F5017701FB00BC007E005E003F002F00C4
-:10EDE0002000180010000C000800060004000300BA
-:10EDF0000200020001000100000020400000244049
-:10EE000000000040000000000000234000003040EF
-:10EE10000000314000009F400000224000001040F0
-:10EE200000009D402020202020101010101D1D806B
-:10EE300017007500FF0306020600360410200000CC
-:10EE40007FC0000000040000000000000019324BE9
-:10EE5000647D0000000000804000080B10000000EE
-:10EE60000000FF012002001F00800004FF081018AE
-:10EE7000001000140018001C4044484C50000000D2
-:10EE8000081000000800000004000000041000004A
-:10EE90000012000004210000002100000016000004
-:10EEA00040114002C41300138013A01340138813B1
-:10EEB000A81320001C000000040000004000000017
-:10EEC0004400000048000000800000000001000035
-:10EED000100200008802000000040000100400007E
-:10EEE00020040000400400004804000080040000EA
-:10EEF0008404000090040000C0070000C407000064
-:10EF0000C8070000CC07000000400000041000000B
-:10EF1000401000004410000048100000C014000021
-:10EF20000011000018020000980200000014000008
-:10EF300010140000201400004014000048140000C9
-:10EF400080140000841400009014000000010000F0
-:10EF500004010000080100000C0100000080000016
-:10EF6000AA3D0010D43D0010FE3D0010263E0010CA
-:10EF7000523E0010A83E00107C3E00100123456761
-:10EF800089ABCDEFFEDCBA9876543210F0E1D2C3F3
-:10EF9000D89E05C107D57C3617DD703039590EF77C
-:10EFA000310BC0FF11155868A78FF964A44FFABE42
-:10EFB00067E6096A85AE67BB72F36E3C3AF54FA50A
-:10EFC0007F520E518C68059BABD9831F19CDE05B36
-:10EFD0005D9DBBCBD89E05C12A299A6207D57C3698
-:10EFE0005A01599117DD7030D8EC2F1539590EF7A9
-:10EFF00067263367310BC0FF874AB48E11155868F6
-:10F000000D2E0CDBA78FF9641D48B547A44FFABE3F
-:10F0100067E6096A08C9BCF385AE67BB3BA7CA842B
-:10F0200072F36E3C2BF894FE3AF54FA5F1361D5F56
-:10F030007F520E51D182E6AD8C68059B1F6C3E2B32
-:10F04000ABD9831F6BBD41FB19CDE05B79217E13EA
-:10F05000C8373D8CA24D54196699E173D6D4DC892A
-:10F06000AEB7FA1D829CFF3214D59D67CF9F2F58F3
-:10F07000692B6D0FA84DD47B736FE3774289C4046D
-:10F08000A8859D3FC8361D6AADE61211A192D691A2
-:10F09000942131222CF72BFCA35F559FC2644CC8EE
-:10F0A0006BB8932351B1536F19773896BDEA405925
-:10F0B000E23E2896E3FF8EA8251E5EBE9239865357
-:10F0C000FC99012BAAB8852CDC2DB70EA22CC5818A
-:10F0D000BE400010FA400010DC4000103841001023
-:10F0E0001A41001058410010784100106745230173
-:10F0F000EFCDAB8998BADCFE10325476C3D2E1F082
-:10F10000C1059ED8367CD5073070DD17F70E59390A
-:10F11000FFC00B316858151164F98FA7BEFA4FA4D0
-:10F120006A09E667BB67AE853C6EF372A54FF53A98
-:10F13000510E527F9B05688C1F83D9AB5BE0CD19C4
-:10F14000CBBB9D5DC1059ED8629A292A367CD50726
-:10F150009159015A3070DD17152FECD8F70E593937
-:10F1600067332667FFC00B318EB44A876858151184
-:10F17000DB0C2E0D64F98FA747B5481DBEFA4FA4CE
-:10F180006A09E667F3BCC908BB67AE8584CAA73BBA
-:10F190003C6EF372FE94F82BA54FF53A5F1D36F1E5
-:10F1A000510E527FADE682D19B05688C2B3E6C1FC1
-:10F1B0001F83D9ABFB41BD6B5BE0CD19137E217979
-:10F1C0008C3D37C819544DA273E1996689DCD4D6B9
-:10F1D0001DFAB7AE32FF9C82679DD514582F9FCF82
-:10F1E0000F6D2B697BD44DA877E36F7304C48942FC
-:10F1F0003F9D85A86A1D36C81112E6AD91D692A131
-:10F2000022312194FC2BF72C9F555FA3C84C64C27C
-:10F210002393B86B6F53B151963877195940EABDB3
-:10F2200096283EE2A88EFFE3BE5E1E2553863992E5
-:10F230002B0199FC2C85B8AA0EB72DDC81C52CA218
-:10F24000BE600010DE600010D4600010CA600010C4
-:10F25000C0600010B6600010186300102863001032
-:10F260003A6300104C6300102863001028630010FC
-:10F27000000000007494001062940010409400108C
-:10F280006A940010409400104297001040940010BF
-:10F290006A9400106294001062940010429700106B
-:10F2A0006A9400102C9400102C9400102C940010E0
-:10F2B000B89700102C2066756E6374696F6E3A20E3
-:10F2C00000617373657274696F6E2022257322204A
-:10F2D0006661696C65643A2066696C6520222573F5
-:10F2E000222C206C696E65202564257325730A0025
-:10F2F000F0010008232D302B2000686C4C0065665F
-:10F300006745464700494E4600696E66004E414ECD
-:10F31000006E616E003000303132333435363738AC
-:10F320003941424344454600303132333435363773
-:10F330003839616263646566000020202020202047
-:10F340002020202828282828202020202020202095
-:10F350002020202020202020202088101010101095
-:10F3600010101010101010101010040404040404E5
-:10F3700004040404101010101010104141414141C8
-:10F38000410101010101010101010101010101012D
-:10F3900001010101011010101010104242424242BE
-:10F3A00042020202020202020202020202020202FD
-:10F3B00002020202021010101020000000000000E3
-:10F3C000000000000000000000000000000000003D
-:10F3D000000000000000000000000000000000002D
-:10F3E000000000000000000000000000000000001D
-:10F3F000000000000000000000000000000000000D
-:10F4000000000000000000000000000000000000FC
-:10F4100000000000000000000000000000000000EC
-:10F4200000000000000000000000000000000000DC
-:10F4300000000000000000000000496E66696E696F
-:10F440007479004E614E005245454E54206D616CFA
-:10F450006C6F6320737563636565646564002F6812
-:10F460006F6D652F706172616C6C656C732F746F5A
-:10F470006F6C636861696E2F6763632D61726D2DB8
-:10F480006E6F6E652D656162692D31302E332D32C0
-:10F490003032312E30372F7372632F6E65776C697F
-:10F4A000622F6E65776C69622F6C6962632F73746B
-:10F4B000646C69622F64746F612E630042616C6CCE
-:10F4C0006F632073756363656564656400000000A5
-:10F4D000000000000000000000000000000000002C
-:10F4E000000000000000000000000000000000001C
-:10F4F000000000000000000000000000000000000C
-:10F5000000000000000000000000000000000000FB
-:10F5100000000000000000000000000000000000EB
-:10F5200000000000000000000000000000000000DB
-:10F530004300504F534958002E002F686F6D652FC0
-:10F54000706172616C6C656C732F746F6F6C636843
-:10F5500061696E2F6763632D61726D2D6E6F6E65CD
-:10F560002D656162692D31302E332D323032312ECE
-:10F5700030372F7372632F6E65776C69622F6E65FB
-:10F58000776C69622F6C6962632F7374646C696253
-:10F590002F6D707265632E63000000000000000094
-:10F5A0000080E03779C34143176E05B5B5B893467F
-:10F5B000F5F93FE9034F384D321D30F94877825A4B
-:10F5C0003CBF737FDD4F1575000000000000F03F69
-:10F5D000000000000000244000000000000059402E
-:10F5E0000000000000408F40000000000088C34081
-:10F5F00000000000006AF8400000000080842E41F6
-:10F6000000000000D01263410000000084D7974141
-:10F610000000000065CDCD41000000205FA0024247
-:10F62000000000E876483742000000A2941A6D42BC
-:10F63000000040E59C30A2420000901EC4BCD642AF
-:10F6400000003426F56B0C430080E03779C341435A
-:10F6500000A0D8855734764300C84E676DC1AB43D0
-:10F66000003D9160E458E143408CB5781DAF1544EE
-:10F6700050EFE2D6E41A4B4492D54D06CFF08044C9
-:10F68000F64AE1C7022DB544B49DD9794378EA44DE
-:10F6900005000000190000007D00000082D9001064
-:10F6A00040D9001040D900103CD9001046D90010B4
-:10F6B00046D9001052DC00103CD9001046D9001089
-:10F6C00052DC001046D900103CD90010E6DB0010D7
-:10F6D000E6DB0010E6DB0010BCDC001000000000E0
-:08F6E000209BFF7F01000000E8
-:10F6E80000000010000000088000000008F700106B
-:08F6F80080000008A0060000DC
-:08F7000074070008085901001C
-:10F7080000093D0000127A0000093D000000D00702
-:10F71800A00F000004000000FFFFFFFFFFFFFFFF36
-:10F72800B4000008C0000008CC000008D800000899
-:10F7380000000000007F00000000001000800100B1
-:10F74800017F00000080011000001C000280000002
-:10F758000000001800001C00077F000000801D103A
-:10F768000048000001000000060000001100000031
-:10F778000000000000000000000000000000000081
-:10F788000100000000000000000000000000000070
-:10F79800000000000000000004000000000000005D
-:10F7A800F05E0108545F01083C5F0108C05E010873
-:10F7B80000000000A85E0108D85E010800000000F3
-:10F7C800085F0108205F01086C5F0108BC010008A0
-:10F7D8000000000000000000000000000000000021
-:10F7E8000000000000000000000000000100000010
-:10F7F80004000000000000000000001800000000E5
-:10F8080000000000180100086C0100088005314064
-:10F8180002000000110000008005314001000000D6
-:10F8280011000000800531400000000011000000B8
-:10F838000006314004000000110000005A000000DA
-:10F8480000000000FFFFFFFF0000000008000000AC
-:10F85800000000000100000088010008000000000E
-:10F86800000000000700A00001000000F0010008EF
-:10F8780000000000F0F4001010F50010D0F40010A3
-:10F888000000000000000000000000000000000070
-:10F898000000000000000000000000000000000060
-:10F8A8000000000000000000000000000000000050
-:10F8B8000000000000000000000000000000000040
-:10F8C8000000000000000000000000000000000030
-:10F8D80043000000000000000000000000000000DD
-:10F8E8000000000000000000000000000000000010
-:10F8F80043000000000000000000000000000000BD
-:10F9080000000000000000000000000000000000EF
-:10F91800430000000000000000000000000000009C
-:10F9280000000000000000000000000000000000CF
-:10F93800430000000000000000000000000000007C
-:10F9480000000000000000000000000000000000AF
-:10F95800430000000000000000000000000000005C
-:10F96800000000000000000000000000000000008F
-:10F97800430000000000000000000000000000003C
-:10F98800000000000000000000000000000000006F
-:10F99800430000000000000000000000000000001C
-:10F9A800000000000000000000000000000000004F
-:10F9B80015D0001055C700100000000039F30010E2
-:10F9C80038F50010EFF20010EFF20010EFF200101F
-:10F9D800EFF20010EFF20010EFF20010EFF200105B
-:10F9E800EFF20010EFF20010FFFFFFFFFFFFFFFF35
-:10F9F800FFFFFFFFFFFF000001004153434949009B
-:10FA080000000000000000000000000000000000EE
-:10FA18000000000000000000000041534349490075
-:10FA280000000000000000000000000000000000CE
-:10FA3800000000000000000000000000A900001005
-:10FA48008100001010B50004440B002827D0144B87
-:10FA58001A68136ABA21515ACA00521A9B181B68AD
-:10FA6800002BF4DA0F4B3E221A600F4B0F4A1A6034
-:10FA78000F4BA322D200062199500E4A9C509B5846
-:10FA8800074B1A68136AB431515ACA00521A9B18A4
-:10FA980000225A60064A074BD358002BFADA10BDE9
-:10FAA800D45F010804012640080126401E1F0000FB
-:10FAB800000026401C05000010B54378FF2B00D03D
-:10FAC80010BD00F035F9124B1A683323D35C032BB1
-:10FAD80000D801BE0E4B1A68136ABA21515A4A005F
-:10FAE80052189B18DB680B4A13600B4A00211160FF
-:10FAF80001310A4A11605A68094B1A6013680B43AE
-:10FB080013601368DB07FCD400F03AF9D8E7C04665
-:10FB1800D45F010800600108F45F0108F85F01087C
-:10FB2800FC5F0108F0B583B0009001914D4B1A6855
-:10FB38003323D35C002B00D101BE4A4B1B681F6ADC
-:10FB4800BC229C58E4196C3A9B5C002B69D000F0ED
-:10FB5800E7F8060003280ED000F0EAF80500424A4C
-:10FB6800424BD358002B3DDB414C032E52D028008A
-:10FB780000F006F96DE03B4B1A683323D35C062B83
-:10FB880000D801BE374B1968BA23CA5A53009A18CD
-:10FB980052000B6A9C466244BC23CB589B181B68D6
-:10FBA800002B5BDB002000F0DBF8324B984257D08B
-:10FBB800314B1A6800230021012000F0D9F8051EF6
-:10FBC80002D02B4C45E00135002000F0C9F8294B44
-:10FBD800984202D0294B9D42F5D9284B9D42BBD96A
-:10FBE800234C36E0264A0121380000F0A9F8002805
-:10FBF80001D01F4CB9E70198FFF724FF009B002BA9
-:10FC080006D02368002BFCDB00F0C2F80400ACE748
-:10FC18001C4CAAE70121002000F09AF80028F9D12D
-:10FC2800A5E700F085F80600154A0121380000F024
-:10FC380087F8002809D1009B002B0DD02368002BE2
-:10FC4800FCDB00F0A5F8040000E0094C300000F0EF
-:10FC580097F8200003B0F0BD0A4CF7E7044CF8E72A
-:10FC6800034CF6E7D45F0108000026401C0500009D
-:10FC78000500520001018800F05F0108EF49020009
-:10FC8800E05F010801005000F0B5C64600B51C4B06
-:10FC98001B6859681B4A136904242343136101280C
-:10FCA8002CD030BF86235B00CB58002B23D1164CB9
-:10FCB8002768164BA320C0001E58154A90461568A1
-:10FCC800144A226006241C503E2042461060124A04
-:10FCD800063098500D4A104BD358002BFADA862379
-:10FCE8005B000E4ACA50084B1F60084AA323DB007A
-:10FCF800D650074B1D6080BCB846F0BD20BFD1E789
-:10FD0800D45F010800ED00E008012640000026400D
-:10FD1800040126401E1F00001C050000AAAAAAAA6A
-:10FD280001B40248844601BC604700BFE5060010E4
-:10FD380001B40248844601BC604700BF9B0500101F
-:10FD480001B40248844601BC604700BF514E001010
-:10FD580001B40248844601BC604700BF415200100C
-:10FD680001B40248844601BC604700BFC15200107C
-:10FD780001B40248844601BC604700BFF54F00103B
-:10FD880001B40248844601BC604700BFA3050010C7
-:10FD980001B40248844601BC604700BF55490010C1
-:10FDA800000000000000000000000000000000004B
-:08FDB800000000000000000043
-:020000041600E4
-:08080000ACE100100000000053
-:107C0000FC01000020122101000000000008001605
-:107C10000000001000000000000000000000000054
-:107C20000000000000000000000000000000000054
-:107C30000000000000000000000000000000000044
-:107C40000000000000000000000000000000000034
-:107C50000000000000000000000000000000000024
-:107C60000000000000000000000000000000000014
-:107C70000000000000000000000000000000000004
-:107C800000000000000000000000000000000000F4
-:107C900000000000000000000000000000000000E4
-:107CA00000000000000000000000000000000000D4
-:107CB00000000000000000000000000000000000C4
-:107CC00000000000000000000000000000000000B4
-:107CD00000000000000000000000000000000000A4
-:107CE0000000000000000000000000000000000094
-:107CF0000000000000000000000000000000000084
-:107D00000000000000000000000000000000000073
-:107D10000000000000000000000000000000000063
-:107D20000000000000000000000000000000000053
-:107D30000000000000000000000000000000000043
-:107D40000000000000000000000000000000000033
-:107D50000000000000000000000000000000000023
-:107D60000000000000000000000000000000000013
-:107D70000000000000000000000000000000000003
-:107D800000000000000000000000000000000000F3
-:107D900000000000000000000000000000000000E3
-:107DA00000000000000000000000000000000000D3
-:107DB00000000000000000000000000000000000C3
-:107DC00000000000000000000000000000000000B3
-:107DD00000000000000000000000000000000000A3
-:107DE0000000000000000000000000000000000093
-:107DF0000000000000000000C20200000000B33BD1
-:0400000510000507DB
-:00000001FF
diff --git a/examples/ota-requestor-app/p6/ota_update_build.sh b/examples/ota-requestor-app/p6/ota_update_build.sh
index 8dbe33869b2ed8..825b1db6457318 100755
--- a/examples/ota-requestor-app/p6/ota_update_build.sh
+++ b/examples/ota-requestor-app/p6/ota_update_build.sh
@@ -6,3 +6,9 @@ ANYCLOUD_DIR=third_party/p6/p6_sdk/libs/anycloud-ota/
 mv "$OUT_DIR"/chip-p6-ota-requestor-example.hex "$OUT_DIR"/chip-p6-ota-requestor-example.unsigned.hex
 
 ./"$ANYCLOUD_DIR"/scripts/sign_script.bash "$OUT_DIR" chip-p6-ota-requestor-example python3 arm-none-eabi-objcopy "-O ihex" "" "$ANYCLOUD_DIR"/source/mcuboot/scripts/ imgtool_v1.7.0/imgtool.py sign 0xFF 0x400 3584 1.0.0 0x00018000 0x001C0000 arm-none-eabi-objcopy "-k $ANYCLOUD_DIR/source/mcuboot/keys/cypress-test-ec-p256.pem"
+
+if [ -f "$OUT_DIR"/chip-p6-ota-requestor-example.ota ]; then
+    rm "$OUT_DIR"/chip-p6-ota-requestor-example.ota
+fi
+
+src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8000 -vn 2 -vs "2.0" -da sha256 "$OUT_DIR"/chip-p6-ota-requestor-example.bin "$OUT_DIR"/chip-p6-ota-requestor-example.ota
diff --git a/examples/ota-requestor-app/p6/src/AppTask.cpp b/examples/ota-requestor-app/p6/src/AppTask.cpp
index 6eeb14cf3e10f5..a0507142cf0af4 100644
--- a/examples/ota-requestor-app/p6/src/AppTask.cpp
+++ b/examples/ota-requestor-app/p6/src/AppTask.cpp
@@ -121,6 +121,7 @@ static void InitServer(intptr_t context)
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    GetAppTask().InitOTARequestor();
 }
 
 CHIP_ERROR AppTask::StartAppTask()
@@ -188,36 +189,6 @@ CHIP_ERROR AppTask::Init()
 
     ConfigurationMgr().LogDeviceConfig();
 
-    SetRequestorInstance(&gRequestorCore);
-    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
-    gImageProcessor.SetOTADownloader(&gDownloader);
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
-
-    uint32_t savedSoftwareVersion;
-    err = ConfigurationMgr().GetSoftwareVersion(savedSoftwareVersion);
-    if (err != CHIP_NO_ERROR)
-    {
-        P6_LOG("Can't get saved software version");
-        appError(err);
-    }
-
-    if (savedSoftwareVersion != CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION)
-    {
-        ConfigurationMgr().StoreSoftwareVersion(CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
-
-        P6_LOG("Confirming update to version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
-        chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
-        if (requestor != nullptr)
-        {
-            requestor->NotifyUpdateApplied();
-        }
-    }
-
-    P6_LOG("Current Software Version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
-    P6_LOG("Current Firmware Version: %s", CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION_STRING);
-
     // Print setup info
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
 
@@ -473,3 +444,37 @@ void OnTriggerUpdateTimerHandler(Layer * systemLayer, void * appState)
     DefaultOTARequestor * req = static_cast<DefaultOTARequestor *>(GetRequestorInstance());
     req->TriggerImmediateQuery();
 }
+
+void AppTask::InitOTARequestor()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    SetRequestorInstance(&gRequestorCore);
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+    gImageProcessor.SetOTADownloader(&gDownloader);
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    uint32_t savedSoftwareVersion;
+    err = ConfigurationMgr().GetSoftwareVersion(savedSoftwareVersion);
+    if (err != CHIP_NO_ERROR)
+    {
+        P6_LOG("Can't get saved software version");
+        appError(err);
+    }
+
+    if (savedSoftwareVersion != CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION)
+    {
+        ConfigurationMgr().StoreSoftwareVersion(CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+
+        P6_LOG("Confirming update to version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+        chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+        if (requestor != nullptr)
+        {
+            requestor->NotifyUpdateApplied();
+        }
+    }
+
+    P6_LOG("Current Software Version: %u", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
+    P6_LOG("Current Firmware Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+}
diff --git a/examples/pigweed-app/ameba/chip_main.cmake b/examples/pigweed-app/ameba/chip_main.cmake
index 41761651d828a7..8ece704a50ae56 100644
--- a/examples/pigweed-app/ameba/chip_main.cmake
+++ b/examples/pigweed-app/ameba/chip_main.cmake
@@ -16,6 +16,7 @@ include(${pigweed_dir}/pw_protobuf_compiler/proto.cmake)
 
 set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING "" FORCE)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.ameba)
@@ -99,4 +100,3 @@ add_custom_command(
     POST_BUILD
     COMMAND cp lib${chip_main}.a ${CMAKE_CURRENT_SOURCE_DIR}/lib/application
 )
-
diff --git a/examples/pigweed-app/efr32/args.gni b/examples/pigweed-app/efr32/args.gni
index 3f19ce687e94f2..eb9d28234cc6eb 100644
--- a/examples/pigweed-app/efr32/args.gni
+++ b/examples/pigweed-app/efr32/args.gni
@@ -19,3 +19,4 @@ import("${chip_root}/src/platform/EFR32/args.gni")
 efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 cpp_standard = "gnu++17"
+pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
diff --git a/examples/pigweed-app/esp32/CMakeLists.txt b/examples/pigweed-app/esp32/CMakeLists.txt
index ad34f915f981d1..b28ce191bf3312 100644
--- a/examples/pigweed-app/esp32/CMakeLists.txt
+++ b/examples/pigweed-app/esp32/CMakeLists.txt
@@ -44,6 +44,7 @@ set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.esp32)
diff --git a/examples/pigweed-app/nrfconnect/CMakeLists.txt b/examples/pigweed-app/nrfconnect/CMakeLists.txt
index 20be593146793d..d3fd816033eb4f 100644
--- a/examples/pigweed-app/nrfconnect/CMakeLists.txt
+++ b/examples/pigweed-app/nrfconnect/CMakeLists.txt
@@ -50,6 +50,7 @@ link_libraries($<BUILD_INTERFACE:zephyr_interface>)
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.nrfconnect)
diff --git a/examples/pigweed-app/nrfconnect/main/main.cpp b/examples/pigweed-app/nrfconnect/main/main.cpp
index e74b61652641f2..78c6212929e8c7 100644
--- a/examples/pigweed-app/nrfconnect/main/main.cpp
+++ b/examples/pigweed-app/nrfconnect/main/main.cpp
@@ -26,7 +26,7 @@
 #include "pw_sys_io_nrfconnect/init.h"
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 4025109d541cf2..832f9ca426152c 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -786,8 +786,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster Groups = 4 {
@@ -1540,6 +1548,7 @@ client cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1573,13 +1582,14 @@ client cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1600,10 +1610,6 @@ client cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
   command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
   command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
@@ -1612,7 +1618,6 @@ client cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -1623,6 +1628,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1656,13 +1662,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1683,10 +1690,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1715,7 +1718,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster PowerSource = 47 {
@@ -2083,12 +2085,16 @@ server cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -2572,8 +2578,8 @@ server cluster WindowCovering = 258 {
   command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
-
 endpoint 0 {
+  device type anonymousEndpointType = 65280;
   binding cluster OnOff;
   binding cluster GeneralCommissioning;
   binding cluster Switch;
@@ -2716,6 +2722,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -2989,8 +2996,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type anonymousEndpointType = 258;
   binding cluster OnOff;
 
   server cluster Identify {
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 0239f84b9ba953..8ad332d5c6c6ab 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -2130,7 +2130,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2260,6 +2269,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3343,14 +3368,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -4729,14 +4746,6 @@
               "source": "client",
               "incoming": 0,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLog",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 0,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -4773,14 +4782,6 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 0
-            },
-            {
-              "name": "GetRelayStatusLogResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 4025109d541cf2..832f9ca426152c 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -786,8 +786,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster Groups = 4 {
@@ -1540,6 +1548,7 @@ client cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1573,13 +1582,14 @@ client cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1600,10 +1610,6 @@ client cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
   command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
   command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
@@ -1612,7 +1618,6 @@ client cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -1623,6 +1628,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1656,13 +1662,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1683,10 +1690,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1715,7 +1718,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster PowerSource = 47 {
@@ -2083,12 +2085,16 @@ server cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -2572,8 +2578,8 @@ server cluster WindowCovering = 258 {
   command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
-
 endpoint 0 {
+  device type anonymousEndpointType = 65280;
   binding cluster OnOff;
   binding cluster GeneralCommissioning;
   binding cluster Switch;
@@ -2716,6 +2722,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -2989,8 +2996,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type anonymousEndpointType = 258;
   binding cluster OnOff;
 
   server cluster Identify {
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 0239f84b9ba953..8ad332d5c6c6ab 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -2130,7 +2130,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2260,6 +2269,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3343,14 +3368,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -4729,14 +4746,6 @@
               "source": "client",
               "incoming": 0,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLog",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 0,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -4773,14 +4782,6 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 0
-            },
-            {
-              "name": "GetRelayStatusLogResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
diff --git a/examples/platform/ameba/ota/OTAInitializer.cpp b/examples/platform/ameba/ota/OTAInitializer.cpp
new file mode 100644
index 00000000000000..50dd3d050a7db2
--- /dev/null
+++ b/examples/platform/ameba/ota/OTAInitializer.cpp
@@ -0,0 +1,67 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "OTAInitializer.h"
+#include "app/clusters/ota-requestor/DefaultOTARequestorStorage.h"
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
+#include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
+#include <platform/Ameba/AmebaOTAImageProcessor.h>
+
+using namespace chip;
+using namespace chip::DeviceLayer;
+
+namespace {
+DefaultOTARequestor gRequestorCore;
+DefaultOTARequestorStorage gRequestorStorage;
+ExtendedOTARequestorDriver gRequestorUser;
+BDXDownloader gDownloader;
+AmebaOTAImageProcessor gImageProcessor;
+chip::ota::DefaultOTARequestorUserConsent gUserConsentProvider;
+static chip::ota::UserConsentState gUserConsentState = chip::ota::UserConsentState::kGranted;
+} // namespace
+
+extern "C" void amebaQueryImageCmdHandler()
+{
+    ChipLogProgress(DeviceLayer, "Calling amebaQueryImageCmdHandler");
+    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->TriggerImmediateQuery(); });
+}
+
+extern "C" void amebaApplyUpdateCmdHandler()
+{
+    ChipLogProgress(DeviceLayer, "Calling amebaApplyUpdateCmdHandler");
+    PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->ApplyUpdate(); });
+}
+
+void OTAInitializer::InitOTARequestor(void)
+{
+    SetRequestorInstance(&gRequestorCore);
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    // Set server instance used for session establishment
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+    gImageProcessor.SetOTADownloader(&gDownloader);
+    // Connect the Downloader and Image Processor objects
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+    if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
+    {
+        gUserConsentProvider.SetUserConsentState(gUserConsentState);
+        gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
+    }
+}
diff --git a/examples/platform/ameba/ota/OTAInitializer.h b/examples/platform/ameba/ota/OTAInitializer.h
new file mode 100644
index 00000000000000..f678c80a780c00
--- /dev/null
+++ b/examples/platform/ameba/ota/OTAInitializer.h
@@ -0,0 +1,27 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+class OTAInitializer
+{
+public:
+    static OTAInitializer & Instance(void)
+    {
+        static OTAInitializer sInitOTA;
+        return sInitOTA;
+    }
+    void InitOTARequestor(void);
+};
diff --git a/examples/platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg b/examples/platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg
new file mode 100755
index 00000000000000..2506a1e2aa3901
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg differ
diff --git a/examples/platform/bouffalolab/bl602/doc/images/dev-cube-home.png b/examples/platform/bouffalolab/bl602/doc/images/dev-cube-home.png
new file mode 100755
index 00000000000000..6988dc3dc050d0
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/dev-cube-home.png differ
diff --git a/examples/platform/bouffalolab/bl602/doc/images/dev-cube-iot.png b/examples/platform/bouffalolab/bl602/doc/images/dev-cube-iot.png
new file mode 100644
index 00000000000000..c7898b331d0bf9
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/dev-cube-iot.png differ
diff --git a/examples/platform/bouffalolab/bl602/doc/images/dev-cube.png b/examples/platform/bouffalolab/bl602/doc/images/dev-cube.png
new file mode 100755
index 00000000000000..518a972ddfc608
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/dev-cube.png differ
diff --git a/examples/platform/bouffalolab/bl602/doc/images/image-dev-cube.png b/examples/platform/bouffalolab/bl602/doc/images/image-dev-cube.png
new file mode 100755
index 00000000000000..2e7ceff5c2430f
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/image-dev-cube.png differ
diff --git a/examples/platform/bouffalolab/bl602/doc/images/image-web-login.png b/examples/platform/bouffalolab/bl602/doc/images/image-web-login.png
new file mode 100755
index 00000000000000..d8d610dd30549f
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/image-web-login.png differ
diff --git a/examples/platform/bouffalolab/bl602/doc/images/image-web.png b/examples/platform/bouffalolab/bl602/doc/images/image-web.png
new file mode 100755
index 00000000000000..02e07b2fffa3b3
Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/image-web.png differ
diff --git a/examples/platform/cyw30739/OTAConfig.cpp b/examples/platform/cyw30739/OTAConfig.cpp
new file mode 100644
index 00000000000000..cf3553d23a9850
--- /dev/null
+++ b/examples/platform/cyw30739/OTAConfig.cpp
@@ -0,0 +1,54 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "OTAConfig.h"
+
+#include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
+#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+#include <app/server/Server.h>
+#include <platform/CYW30739/OTAImageProcessorImpl.h>
+
+namespace OTAConfig {
+
+// Global OTA objects
+chip::DefaultOTARequestor gRequestorCore;
+chip::DefaultOTARequestorStorage gRequestorStorage;
+chip::DeviceLayer::DefaultOTARequestorDriver gRequestorUser;
+chip::BDXDownloader gDownloader;
+chip::OTAImageProcessorImpl gImageProcessor;
+
+void Init()
+{
+    // Initialize and interconnect the Requestor and Image Processor objects -- START
+    SetRequestorInstance(&gRequestorCore);
+
+    gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    gRequestorCore.Init(chip::Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+
+    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+    gImageProcessor.SetOTADownloader(&gDownloader);
+
+    // Connect the Downloader and Image Processor objects
+    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    // Initialize and interconnect the Requestor and Image Processor objects -- END
+}
+
+} // namespace OTAConfig
diff --git a/examples/platform/cyw30739/OTAConfig.h b/examples/platform/cyw30739/OTAConfig.h
new file mode 100644
index 00000000000000..220b50d35cbbe2
--- /dev/null
+++ b/examples/platform/cyw30739/OTAConfig.h
@@ -0,0 +1,25 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+namespace OTAConfig {
+
+void Init();
+
+} // namespace OTAConfig
diff --git a/examples/platform/cyw30739/project_include/OpenThreadConfig.h b/examples/platform/cyw30739/project_include/OpenThreadConfig.h
index eb6006f52d5cfe..a6d9c265a245f7 100644
--- a/examples/platform/cyw30739/project_include/OpenThreadConfig.h
+++ b/examples/platform/cyw30739/project_include/OpenThreadConfig.h
@@ -29,6 +29,7 @@
 #define OPENTHREAD_CONFIG_LOG_LEVEL OT_LOG_LEVEL_CRIT
 #endif
 
+#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1
 #define OPENTHREAD_CONFIG_PLATFORM_ASSERT_MANAGEMENT 1
 #define OPENTHREAD_CONFIG_SRP_CLIENT_BUFFERS_MAX_HOST_ADDRESSES 4
 #define OPENTHREAD_CONFIG_TCP_ENABLE 0
diff --git a/examples/platform/efr32/OTAConfig.cpp b/examples/platform/efr32/OTAConfig.cpp
index f3601247f4d2ee..8f42f6951e1cdc 100644
--- a/examples/platform/efr32/OTAConfig.cpp
+++ b/examples/platform/efr32/OTAConfig.cpp
@@ -21,19 +21,6 @@
 #include "platform/bootloader/api/application_properties.h"
 #include <app/server/Server.h>
 
-#define BOOTLOADER_SUPPORT_CERTIFICATES 1
-#define APPLICATION_CERTIFICATE_VERSION (1UL)
-
-#if defined(BOOTLOADER_SUPPORT_CERTIFICATES)
-const ApplicationCertificate_t sl_app_certificate = {
-    .structVersion = APPLICATION_CERTIFICATE_VERSION,
-    .flags         = { 0U },
-    .key           = { 0U },
-    .version       = 0,
-    .signature     = { 0U },
-};
-#endif
-
 // Header used for building the image GBL file
 #define APP_PROPERTIES_VERSION 1
 #define APP_PROPERTIES_ID                                                                                                          \
@@ -71,15 +58,11 @@ __attribute__((used)) ApplicationProperties_t sl_app_properties = {
       /// Unique ID (e.g. UUID/GUID) for the product this application is built for
       .productId = APP_PROPERTIES_ID,
     },
-#if defined(BOOTLOADER_SUPPORT_CERTIFICATES)
-  // If certificate based boot chain is enabled, the bootloader binary will be provided with
-  // a certificate that does not contain any key.
-  // A valid certificate needs to be injected to the bootloader images using Simplicity Commander.
-  // Simplicity Commander will replace this certificate.
-    .cert = (ApplicationCertificate_t *)&sl_app_certificate,
-#else
+
+    /// Pointer to information about the certificate
     .cert = NULL,
-#endif
+
+    /// Pointer to Long Token Data Section
     .longTokenSectionAddress = NULL,
 };
 
diff --git a/examples/platform/efr32/heap_4_silabs.c b/examples/platform/efr32/heap_4_silabs.c
index 98680cbeb296f6..03dddf4322519d 100644
--- a/examples/platform/efr32/heap_4_silabs.c
+++ b/examples/platform/efr32/heap_4_silabs.c
@@ -442,6 +442,16 @@ size_t xPortGetMinimumEverFreeHeapSize(void)
 {
     return xMinimumEverFreeBytesRemaining;
 }
+
+void xPortResetHeapMinimumEverFreeHeapSize(void)
+{
+    taskENTER_CRITICAL();
+    {
+        xMinimumEverFreeBytesRemaining = xFreeBytesRemaining;
+    }
+    taskEXIT_CRITICAL();
+}
+
 /*-----------------------------------------------------------*/
 
 void vPortInitialiseBlocks(void)
diff --git a/examples/platform/efr32/heap_4_silabs.h b/examples/platform/efr32/heap_4_silabs.h
index 7873db896297c4..ed773f59f0a33c 100644
--- a/examples/platform/efr32/heap_4_silabs.h
+++ b/examples/platform/efr32/heap_4_silabs.h
@@ -42,6 +42,8 @@ extern "C" {
 void * pvPortCalloc(size_t num, size_t size);
 void * pvPortRealloc(void * pv, size_t size);
 
+void xPortResetHeapMinimumEverFreeHeapSize(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/examples/platform/efr32/ldscripts/efr32mg12.ld b/examples/platform/efr32/ldscripts/efr32mg12.ld
index 9dba3e1ded84e2..0851b5ffdf6a60 100644
--- a/examples/platform/efr32/ldscripts/efr32mg12.ld
+++ b/examples/platform/efr32/ldscripts/efr32mg12.ld
@@ -255,6 +255,7 @@ SECTIONS
     KEEP(*(.simee*))
   } > FLASH
 
+  /* Last page of flash is reserved for the manufacturing token space */
   linker_nvm_end = __main_flash_end__ - 2048;
   linker_nvm_begin = linker_nvm_end - SIZEOF(.nvm);
   linker_nvm_size = SIZEOF(.nvm);
diff --git a/examples/platform/efr32/ldscripts/efr32mg24.ld b/examples/platform/efr32/ldscripts/efr32mg24.ld
index 06bfc7c1842170..7b19dbea1bc03f 100644
--- a/examples/platform/efr32/ldscripts/efr32mg24.ld
+++ b/examples/platform/efr32/ldscripts/efr32mg24.ld
@@ -255,7 +255,8 @@ SECTIONS
     KEEP(*(.simee*))
   } > FLASH
 
-  linker_nvm_end = __main_flash_end__;
+  /* Last page of flash is reserved for the manufacturing token space */
+  linker_nvm_end = __main_flash_end__ - 8192;
   linker_nvm_begin = linker_nvm_end - SIZEOF(.nvm);
   linker_nvm_size = SIZEOF(.nvm);
   __nvm3Base = linker_nvm_begin;
diff --git a/examples/platform/efr32/matter_config.cpp b/examples/platform/efr32/matter_config.cpp
index 6f5b0747cdabe2..b892620acf3b9f 100644
--- a/examples/platform/efr32/matter_config.cpp
+++ b/examples/platform/efr32/matter_config.cpp
@@ -25,7 +25,7 @@
 
 #include <mbedtls/platform.h>
 
-#if SILABS_WIFI
+#ifdef SL_WIFI
 #include "wfx_host_events.h"
 #endif /* RS911X_WIFI */
 
@@ -142,7 +142,7 @@ CHIP_ERROR EFR32MatterConfig::InitMatter(const char * appName)
     EFR32_LOG("Starting Platform Manager Event Loop");
     ReturnErrorOnFailure(PlatformMgr().StartEventLoopTask());
 
-#if SILABS_WIFI
+#ifdef SL_WIFI
     InitWiFi();
 #endif
     // Init Matter OTA
@@ -157,7 +157,7 @@ CHIP_ERROR EFR32MatterConfig::InitMatter(const char * appName)
     return CHIP_NO_ERROR;
 }
 
-#if SILABS_WIFI
+#ifdef SL_WIFI
 void EFR32MatterConfig::InitWiFi(void)
 {
 #ifdef WF200_WIFI
@@ -176,7 +176,7 @@ void EFR32MatterConfig::InitWiFi(void)
      */
 #endif
 }
-#endif // SILABS_WIFI
+#endif // SL_WIFI
 
 // ================================================================================
 // FreeRTOS Callbacks
diff --git a/examples/platform/esp32/PigweedLogger.cpp b/examples/platform/esp32/PigweedLogger.cpp
index 84140f580e90fb..39851850bfa34c 100644
--- a/examples/platform/esp32/PigweedLogger.cpp
+++ b/examples/platform/esp32/PigweedLogger.cpp
@@ -90,8 +90,9 @@ extern "C" void __wrap_esp_log_write(esp_log_level_t level, const char * tag, co
 {
     va_list v;
     va_start(v, format);
+
 #ifndef CONFIG_LOG_DEFAULT_LEVEL_NONE
-    if (uartInitialised)
+    if (uartInitialised && level <= CONFIG_LOG_MAXIMUM_LEVEL)
     {
         char formattedMsg[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
         size_t len = vsnprintf(formattedMsg, sizeof formattedMsg, format, v);
@@ -102,6 +103,7 @@ extern "C" void __wrap_esp_log_write(esp_log_level_t level, const char * tag, co
         PigweedLogger::putString(formattedMsg, len);
     }
 #endif
+
     va_end(v);
 }
 
diff --git a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
index d641fe7a9a6889..ddc25a14c90d07 100644
--- a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
+++ b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
@@ -17,12 +17,17 @@
  */
 #include "CommonDeviceCallbacks.h"
 
+#if CONFIG_BT_ENABLED
 #include "esp_bt.h"
+#if CONFIG_BT_NIMBLE_ENABLED
+#include "esp_nimble_hci.h"
+#include "nimble/nimble_port.h"
+#endif // CONFIG_BT_NIMBLE_ENABLED
+#endif // CONFIG_BT_ENABLED
+
 #include "esp_err.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
-#include "esp_nimble_hci.h"
-#include "nimble/nimble_port.h"
 #include "route_hook/esp_route_hook.h"
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/cluster-id.h>
diff --git a/examples/platform/esp32/common/Esp32AppServer.cpp b/examples/platform/esp32/common/Esp32AppServer.cpp
index 2d8e42dd603793..ee3dbdd31df218 100644
--- a/examples/platform/esp32/common/Esp32AppServer.cpp
+++ b/examples/platform/esp32/common/Esp32AppServer.cpp
@@ -19,6 +19,7 @@
 #include "Esp32AppServer.h"
 #include "CHIPDeviceManager.h"
 #include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/server/Dnssd.h>
 #include <app/server/Server.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
@@ -31,6 +32,7 @@
 using namespace chip;
 using namespace chip::Credentials;
 using namespace chip::DeviceLayer;
+
 namespace {
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 app::Clusters::NetworkCommissioning::Instance
@@ -67,7 +69,7 @@ void Esp32AppServer::Init(AppDelegate * sAppDelegate)
     if (chip::DeviceLayer::ConnectivityMgr().IsThreadProvisioned() &&
         (chip::Server::GetInstance().GetFabricTable().FabricCount() != 0))
     {
-        ESP_LOGI(TAG, "Thread has been provisioned, publish the dns service now");
+        ESP_LOGI("ESP32AppServer", "Thread has been provisioned, publish the dns service now");
         chip::app::DnssdServer::Instance().StartServer();
     }
 #endif
diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
index 7d50fd5e2a8501..c00a500c589423 100644
--- a/examples/platform/linux/AppMain.cpp
+++ b/examples/platform/linux/AppMain.cpp
@@ -63,6 +63,7 @@
 #endif
 
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
+#include "TraceDecoder.h"
 #include "TraceHandlers.h"
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 
@@ -100,10 +101,6 @@ LinuxCommissionableDataProvider gCommissionableDataProvider;
 
 chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
-#if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
-chip::trace::TraceStream * gTraceStream = nullptr;
-#endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
-
 void EventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
 {
     (void) arg;
@@ -113,69 +110,9 @@ void EventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
-// when the shell is enabled, don't intercept signals since it prevents the user from
-// using expected commands like CTRL-C to quit the application. (see issue #17845)
-#if !defined(ENABLE_CHIP_SHELL)
-void OnSignalHandler(int signum)
-{
-    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
-
-    // The BootReason attribute SHALL indicate the reason for the Node’s most recent boot, the real usecase
-    // for this attribute is embedded system. In Linux simulation, we use different signals to tell the current
-    // running process to terminate with different reasons.
-    BootReasonType bootReason = BootReasonType::kUnspecified;
-    switch (signum)
-    {
-    case SIGVTALRM:
-        bootReason = BootReasonType::kPowerOnReboot;
-        break;
-    case SIGALRM:
-        bootReason = BootReasonType::kBrownOutReset;
-        break;
-    case SIGILL:
-        bootReason = BootReasonType::kSoftwareWatchdogReset;
-        break;
-    case SIGTRAP:
-        bootReason = BootReasonType::kHardwareWatchdogReset;
-        break;
-    case SIGIO:
-        bootReason = BootReasonType::kSoftwareUpdateCompleted;
-        break;
-    case SIGINT:
-        bootReason = BootReasonType::kSoftwareReset;
-        break;
-    default:
-        IgnoreUnusedVariable(bootReason);
-        ChipLogError(NotSpecified, "Unhandled signal: Should never happens");
-        chipDie();
-        break;
-    }
-
-    Server::GetInstance().DispatchShutDownAndStopEventLoop();
-}
-
-void SetupSignalHandlers()
-{
-    // sigaction is not used here because Tsan interceptors seems to
-    // never dispatch the signals on darwin.
-    signal(SIGALRM, OnSignalHandler);
-    signal(SIGVTALRM, OnSignalHandler);
-    signal(SIGILL, OnSignalHandler);
-    signal(SIGTRAP, OnSignalHandler);
-    signal(SIGTERM, OnSignalHandler);
-    signal(SIGIO, OnSignalHandler);
-    signal(SIGINT, OnSignalHandler);
-}
-#endif // !defined(ENABLE_CHIP_SHELL)
-
 void Cleanup()
 {
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
-    if (gTraceStream != nullptr)
-    {
-        delete gTraceStream;
-        gTraceStream = nullptr;
-    }
     chip::trace::DeInitTrace();
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 
@@ -245,6 +182,11 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions)
                                                    LinuxDeviceOptions::GetInstance());
     SuccessOrExit(err);
 
+    if (LinuxDeviceOptions::GetInstance().payload.rendezvousInformation.HasAny())
+    {
+        rendezvousFlags = LinuxDeviceOptions::GetInstance().payload.rendezvousInformation;
+    }
+
     err = GetPayloadContents(LinuxDeviceOptions::GetInstance().payload, rendezvousFlags);
     SuccessOrExit(err);
 
@@ -277,17 +219,25 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions)
     if (LinuxDeviceOptions::GetInstance().traceStreamFilename.HasValue())
     {
         const char * traceFilename = LinuxDeviceOptions::GetInstance().traceStreamFilename.Value().c_str();
-        gTraceStream               = new chip::trace::TraceStreamFile(traceFilename);
+        auto traceStream           = new chip::trace::TraceStreamFile(traceFilename);
+        chip::trace::AddTraceStream(traceStream);
     }
     else if (LinuxDeviceOptions::GetInstance().traceStreamToLogEnabled)
     {
-        gTraceStream = new chip::trace::TraceStreamLog();
+        auto traceStream = new chip::trace::TraceStreamLog();
+        chip::trace::AddTraceStream(traceStream);
     }
-    chip::trace::InitTrace();
-    if (gTraceStream != nullptr)
+
+    if (LinuxDeviceOptions::GetInstance().traceStreamDecodeEnabled)
     {
-        chip::trace::SetTraceStream(gTraceStream);
+        chip::trace::TraceDecoderOptions options;
+        options.mEnableProtocolInteractionModelResponse = false;
+
+        chip::trace::TraceDecoder * decoder = new chip::trace::TraceDecoder();
+        decoder->SetOptions(options);
+        chip::trace::AddTraceStream(decoder);
     }
+    chip::trace::InitTrace();
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 
 #if CONFIG_NETWORK_LAYER_BLE
@@ -344,7 +294,6 @@ void ChipLinuxAppMainLoop()
     // use a different service port to make testing possible with other sample devices running on same host
     initParams.operationalServicePort        = LinuxDeviceOptions::GetInstance().securedDevicePort;
     initParams.userDirectedCommissioningPort = LinuxDeviceOptions::GetInstance().unsecuredCommissionerPort;
-    ;
 #endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
 
     initParams.interfaceId = LinuxDeviceOptions::GetInstance().interfaceId;
@@ -375,10 +324,6 @@ void ChipLinuxAppMainLoop()
 #endif // defined(ENABLE_CHIP_SHELL)
 #endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
 
-#if !defined(ENABLE_CHIP_SHELL)
-    SetupSignalHandlers();
-#endif // !defined(ENABLE_CHIP_SHELL)
-
     ApplicationInit();
 
     DeviceLayer::PlatformMgr().RunEventLoop();
diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn
index 71586b0e614ec7..640d5230b9e2cf 100644
--- a/examples/platform/linux/BUILD.gn
+++ b/examples/platform/linux/BUILD.gn
@@ -39,6 +39,8 @@ source_set("app-main") {
     "LinuxCommissionableDataProvider.h",
     "Options.cpp",
     "Options.h",
+    "testing/CustomCSRResponse.cpp",
+    "testing/CustomCSRResponse.h",
   ]
 
   defines = []
@@ -60,7 +62,8 @@ source_set("app-main") {
   ]
 
   if (chip_enable_transport_trace) {
-    public_deps += [ "${chip_root}/examples/common/tracing:trace_handlers" ]
+    public_deps +=
+        [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ]
   }
 
   public_configs = [ ":app-main-config" ]
diff --git a/examples/platform/linux/CommissionerMain.cpp b/examples/platform/linux/CommissionerMain.cpp
index f7b6ae73650e72..816c3563122e3d 100644
--- a/examples/platform/linux/CommissionerMain.cpp
+++ b/examples/platform/linux/CommissionerMain.cpp
@@ -136,6 +136,7 @@ CHIP_ERROR InitCommissioner(uint16_t commissionerPort, uint16_t udcListenPort)
     ReturnErrorOnFailure(gOpCredsIssuer.Initialize(gServerStorage));
 
     // No need to explicitly set the UDC port since we will use default
+    ChipLogProgress(Support, " ----- UDC listening on port %d", udcListenPort);
     ReturnErrorOnFailure(gCommissioner.SetUdcListenPort(udcListenPort));
 
     // Initialize device attestation verifier
@@ -223,8 +224,6 @@ class PairingCommand : public Controller::DevicePairingDelegate
     void OnPairingDeleted(CHIP_ERROR error) override;
     void OnCommissioningComplete(NodeId deviceId, CHIP_ERROR error) override;
 
-    CHIP_ERROR UpdateNetworkAddress();
-
 private:
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
     static void OnDeviceConnectedFn(void * context, chip::OperationalDeviceProxy * device);
@@ -238,12 +237,6 @@ class PairingCommand : public Controller::DevicePairingDelegate
 PairingCommand gPairingCommand;
 NodeId gRemoteId = kTestDeviceNodeId;
 
-CHIP_ERROR PairingCommand::UpdateNetworkAddress()
-{
-    ChipLogProgress(AppServer, "Mdns: Updating NodeId: %" PRIx64 " ...", gRemoteId);
-    return gCommissioner.UpdateDevice(gRemoteId);
-}
-
 void PairingCommand::OnStatusUpdate(DevicePairingDelegate::Status status)
 {
     switch (status)
@@ -266,11 +259,6 @@ void PairingCommand::OnPairingComplete(CHIP_ERROR err)
     else
     {
         ChipLogProgress(AppServer, "Pairing Failure: %s", ErrorStr(err));
-        // For some devices, it may take more time to appear on the network and become discoverable
-        // over DNS-SD, so don't give up on failure and restart the address update. Note that this
-        // will not be repeated endlessly as each chip-tool command has a timeout (in the case of
-        // the `pairing` command it equals 120s).
-        // UpdateNetworkAddress();
     }
 }
 
diff --git a/examples/platform/linux/Options.cpp b/examples/platform/linux/Options.cpp
index 08614a8f98d343..c8bae87c377e14 100644
--- a/examples/platform/linux/Options.cpp
+++ b/examples/platform/linux/Options.cpp
@@ -39,28 +39,36 @@ LinuxDeviceOptions gDeviceOptions;
 // Follow the code style of command line arguments in case we need to add more options in the future.
 enum
 {
-    kDeviceOption_BleDevice                 = 0x1000,
-    kDeviceOption_WiFi                      = 0x1001,
-    kDeviceOption_Thread                    = 0x1002,
-    kDeviceOption_Version                   = 0x1003,
-    kDeviceOption_VendorID                  = 0x1004,
-    kDeviceOption_ProductID                 = 0x1005,
-    kDeviceOption_CustomFlow                = 0x1006,
-    kDeviceOption_Capabilities              = 0x1007,
-    kDeviceOption_Discriminator             = 0x1008,
-    kDeviceOption_Passcode                  = 0x1009,
-    kDeviceOption_SecuredDevicePort         = 0x100a,
-    kDeviceOption_SecuredCommissionerPort   = 0x100b,
-    kDeviceOption_UnsecuredCommissionerPort = 0x100c,
-    kDeviceOption_Command                   = 0x100d,
-    kDeviceOption_PICS                      = 0x100e,
-    kDeviceOption_KVS                       = 0x100f,
-    kDeviceOption_InterfaceId               = 0x1010,
-    kDeviceOption_Spake2pVerifierBase64     = 0x1011,
-    kDeviceOption_Spake2pSaltBase64         = 0x1012,
-    kDeviceOption_Spake2pIterations         = 0x1013,
-    kDeviceOption_TraceFile                 = 0x1014,
-    kDeviceOption_TraceLog                  = 0x1015,
+    kDeviceOption_BleDevice                             = 0x1000,
+    kDeviceOption_WiFi                                  = 0x1001,
+    kDeviceOption_Thread                                = 0x1002,
+    kDeviceOption_Version                               = 0x1003,
+    kDeviceOption_VendorID                              = 0x1004,
+    kDeviceOption_ProductID                             = 0x1005,
+    kDeviceOption_CustomFlow                            = 0x1006,
+    kDeviceOption_Capabilities                          = 0x1007,
+    kDeviceOption_Discriminator                         = 0x1008,
+    kDeviceOption_Passcode                              = 0x1009,
+    kDeviceOption_SecuredDevicePort                     = 0x100a,
+    kDeviceOption_SecuredCommissionerPort               = 0x100b,
+    kDeviceOption_UnsecuredCommissionerPort             = 0x100c,
+    kDeviceOption_Command                               = 0x100d,
+    kDeviceOption_PICS                                  = 0x100e,
+    kDeviceOption_KVS                                   = 0x100f,
+    kDeviceOption_InterfaceId                           = 0x1010,
+    kDeviceOption_Spake2pVerifierBase64                 = 0x1011,
+    kDeviceOption_Spake2pSaltBase64                     = 0x1012,
+    kDeviceOption_Spake2pIterations                     = 0x1013,
+    kDeviceOption_TraceFile                             = 0x1014,
+    kDeviceOption_TraceLog                              = 0x1015,
+    kDeviceOption_TraceDecode                           = 0x1016,
+    kOptionCSRResponseCSRIncorrectType                  = 0x1017,
+    kOptionCSRResponseCSRNonceIncorrectType             = 0x1018,
+    kOptionCSRResponseCSRNonceTooLong                   = 0x1019,
+    kOptionCSRResponseCSRNonceInvalid                   = 0x101a,
+    kOptionCSRResponseNOCSRElementsTooLong              = 0x101b,
+    kOptionCSRResponseAttestationSignatureIncorrectType = 0x101c,
+    kOptionCSRResponseAttestationSignatureInvalid       = 0x101d,
 };
 
 constexpr unsigned kAppUsageLength = 64;
@@ -95,7 +103,15 @@ OptionDef sDeviceOptionDefs[] = {
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
     { "trace_file", kArgumentRequired, kDeviceOption_TraceFile },
     { "trace_log", kArgumentRequired, kDeviceOption_TraceLog },
+    { "trace_decode", kArgumentRequired, kDeviceOption_TraceDecode },
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
+    { "cert_error_csr_incorrect_type", kNoArgument, kOptionCSRResponseCSRIncorrectType },
+    { "cert_error_csr_nonce_incorrect_type", kNoArgument, kOptionCSRResponseCSRNonceIncorrectType },
+    { "cert_error_csr_nonce_too_long", kNoArgument, kOptionCSRResponseCSRNonceTooLong },
+    { "cert_error_csr_nonce_invalid", kNoArgument, kOptionCSRResponseCSRNonceInvalid },
+    { "cert_error_nocsrelements_too_long", kNoArgument, kOptionCSRResponseNOCSRElementsTooLong },
+    { "cert_error_attestation_signature_incorrect_type", kNoArgument, kOptionCSRResponseAttestationSignatureIncorrectType },
+    { "cert_error_attestation_signature_invalid", kNoArgument, kOptionCSRResponseAttestationSignatureInvalid },
     {}
 };
 
@@ -178,7 +194,23 @@ const char * sDeviceOptionHelp =
     "       Output trace data to the provided file.\n"
     "  --trace_log <1/0>\n"
     "       A value of 1 enables traces to go to the log, 0 disables this (default 0).\n"
+    "  --trace_decode <1/0>\n"
+    "       A value of 1 enables traces decoding, 0 disables this (default 0).\n"
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
+    "  --cert_error_csr_incorrect_type\n"
+    "       Configure the CSRResponse to be built with an invalid CSR type.\n"
+    "  --cert_error_csr_nonce_incorrect_type\n"
+    "       Configure the CSRResponse to be built with an invalid CSRNonce type.\n"
+    "  --cert_error_csr_nonce_too_long\n"
+    "       Configure the CSRResponse to be built with a CSRNonce that is longer than expected.\n"
+    "  --cert_error_csr_nonce_invalid\n"
+    "       Configure the CSRResponse to be built with a CSRNonce that does not match the CSRNonce from the CSRRequest.\n"
+    "  --cert_error_nocsrelements_too_long\n"
+    "       Configure the CSRResponse to contains an NOCSRElements larger than the allowed RESP_MAX.\n"
+    "  --cert_error_attestation_signature_incorrect_type\n"
+    "       Configure the CSRResponse to be build with an invalid AttestationSignature type.\n"
+    "  --cert_error_attestation_signature_invalid\n"
+    "       Configure the CSRResponse to be build with an AttestationSignature that does not match what is expected.\n"
     "\n";
 
 bool Base64ArgToVector(const char * arg, size_t maxSize, std::vector<uint8_t> & outVector)
@@ -374,8 +406,36 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
             LinuxDeviceOptions::GetInstance().traceStreamToLogEnabled = true;
         }
         break;
+    case kDeviceOption_TraceDecode:
+        if (atoi(aValue) != 0)
+        {
+            LinuxDeviceOptions::GetInstance().traceStreamDecodeEnabled = true;
+        }
+        break;
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 
+    case kOptionCSRResponseCSRIncorrectType:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.csrIncorrectType = true;
+        break;
+    case kOptionCSRResponseCSRNonceIncorrectType:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.csrNonceIncorrectType = true;
+        break;
+    case kOptionCSRResponseCSRNonceTooLong:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.csrNonceTooLong = true;
+        break;
+    case kOptionCSRResponseCSRNonceInvalid:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.csrNonceInvalid = true;
+        break;
+    case kOptionCSRResponseNOCSRElementsTooLong:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.nocsrElementsTooLong = true;
+        break;
+    case kOptionCSRResponseAttestationSignatureIncorrectType:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.attestationSignatureIncorrectType = true;
+        break;
+    case kOptionCSRResponseAttestationSignatureInvalid:
+        LinuxDeviceOptions::GetInstance().mCSRResponseOptions.attestationSignatureInvalid = true;
+        break;
+
     default:
         PrintArgError("%s: INTERNAL ERROR: Unhandled option: %s\n", aProgram, aName);
         retval = false;
diff --git a/examples/platform/linux/Options.h b/examples/platform/linux/Options.h
index 4f55f6f7f54e7a..56a95b772cafd8 100644
--- a/examples/platform/linux/Options.h
+++ b/examples/platform/linux/Options.h
@@ -35,6 +35,7 @@
 #include <setup_payload/SetupPayload.h>
 
 #include <credentials/DeviceAttestationCredsProvider.h>
+#include <testing/CustomCSRResponse.h>
 
 struct LinuxDeviceOptions
 {
@@ -53,9 +54,11 @@ struct LinuxDeviceOptions
     const char * PICS                   = nullptr;
     const char * KVS                    = nullptr;
     chip::Inet::InterfaceId interfaceId = chip::Inet::InterfaceId::Null();
+    bool traceStreamDecodeEnabled       = false;
     bool traceStreamToLogEnabled        = false;
     chip::Optional<std::string> traceStreamFilename;
     chip::Credentials::DeviceAttestationCredentialsProvider * dacProvider = nullptr;
+    chip::CSRResponseOptions mCSRResponseOptions;
 
     static LinuxDeviceOptions & GetInstance();
 };
diff --git a/examples/platform/linux/testing/CustomCSRResponse.cpp b/examples/platform/linux/testing/CustomCSRResponse.cpp
new file mode 100644
index 00000000000000..39f7e9d2cad6c7
--- /dev/null
+++ b/examples/platform/linux/testing/CustomCSRResponse.cpp
@@ -0,0 +1,165 @@
+/*
+ *
+ *    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 "Options.h"
+
+#include <algorithm>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/data-model/Encode.h>
+#include <credentials/DeviceAttestationConstructor.h>
+#include <crypto/CHIPCryptoPAL.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters::OperationalCredentials::Commands;
+
+constexpr size_t kMaxResponseLength = 900;
+constexpr size_t kCSRNonceLength    = 32;
+
+namespace {
+
+CHIP_ERROR ConstructCustomNOCSRElements(TLV::TLVWriter & writer, TLV::Tag tag, const ByteSpan & nocsrElements,
+                                        CSRResponseOptions & options)
+{
+    ByteSpan csr;
+    ByteSpan csrNonce;
+    ByteSpan vendorReserved1;
+    ByteSpan vendorReserved2;
+    ByteSpan vendorReserved3;
+    ReturnErrorOnFailure(
+        Credentials::DeconstructNOCSRElements(nocsrElements, csr, csrNonce, vendorReserved1, vendorReserved2, vendorReserved3));
+
+    // Add 10 bytes of possible overhead to allow the generation of content longer than the allowed maximum of RESP_MAX.
+    // 10 has been choosen to leave enough space for the possible TLV overhead when adding the additional data.
+    uint8_t nocsrElementsData[kMaxResponseLength + 10];
+    MutableByteSpan nocsrElementsSpan(nocsrElementsData);
+
+    TLV::TLVType outerContainerType = TLV::kTLVType_NotSpecified;
+    TLV::TLVWriter tlvWriter;
+    tlvWriter.Init(nocsrElementsSpan);
+
+    ReturnErrorOnFailure(tlvWriter.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerContainerType));
+
+    // Update CSR
+    if (options.csrIncorrectType)
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(1), true));
+    }
+    else
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(1), csr));
+    }
+
+    // Update CSRNonce
+    if (options.csrNonceIncorrectType)
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), true));
+    }
+    else if (options.csrNonceInvalid)
+    {
+        uint8_t csrNonceInvalid[kCSRNonceLength] = {};
+        memcpy(csrNonceInvalid, csrNonce.data(), csrNonce.size());
+        std::reverse(csrNonceInvalid, csrNonceInvalid + sizeof(csrNonceInvalid));
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), ByteSpan(csrNonceInvalid)));
+    }
+    else if (options.csrNonceTooLong)
+    {
+        uint8_t csrNonceTooLong[kCSRNonceLength + 1] = {};
+        memcpy(csrNonceTooLong, csrNonce.data(), csrNonce.size());
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), ByteSpan(csrNonceTooLong)));
+    }
+    else
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), csrNonce));
+    }
+
+    // Add vendorReserved1 if present
+    if (!vendorReserved1.empty())
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(3), vendorReserved1));
+    }
+
+    // Add vendorReserved2 if present
+    if (!vendorReserved2.empty())
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(4), vendorReserved2));
+    }
+
+    // Add vendorReserved3 if present
+    if (!vendorReserved3.empty())
+    {
+        ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(5), vendorReserved3));
+    }
+
+    // Add additional data
+    if (options.nocsrElementsTooLong)
+    {
+        size_t len = kMaxResponseLength - tlvWriter.GetLengthWritten();
+        ReturnLogErrorOnFailure(tlvWriter.Put(TLV::ContextTag(6), ByteSpan(nocsrElementsData, len)));
+    }
+
+    ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType));
+    ReturnErrorOnFailure(tlvWriter.Finalize());
+
+    return DataModel::Encode(writer, tag, nocsrElementsSpan.SubSpan(0, tlvWriter.GetLengthWritten()));
+}
+
+CHIP_ERROR ConstructCustomAttestationSignature(TLV::TLVWriter & writer, TLV::Tag tag, const ByteSpan & attestationSignature,
+                                               CSRResponseOptions & options)
+{
+    if (options.attestationSignatureIncorrectType)
+    {
+        return DataModel::Encode(writer, tag, true);
+    }
+
+    if (options.attestationSignatureInvalid)
+    {
+        uint8_t invalidAttestationSignature[Crypto::kP256_ECDSA_Signature_Length_Raw] = {};
+        memcpy(invalidAttestationSignature, attestationSignature.data(), attestationSignature.size());
+        std::reverse(invalidAttestationSignature, invalidAttestationSignature + sizeof(invalidAttestationSignature));
+        return DataModel::Encode(writer, tag, ByteSpan(invalidAttestationSignature));
+    }
+
+    return DataModel::Encode(writer, tag, attestationSignature);
+}
+
+} // namespace
+
+namespace chip {
+namespace app {
+namespace DataModel {
+
+template <>
+CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag, const CSRResponse::Type & responseData)
+{
+    auto tag1    = TLV::ContextTag(to_underlying(CSRResponse::Fields::kNOCSRElements));
+    auto tag2    = TLV::ContextTag(to_underlying(CSRResponse::Fields::kAttestationSignature));
+    auto options = LinuxDeviceOptions::GetInstance().mCSRResponseOptions;
+
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(ConstructCustomNOCSRElements(writer, tag1, responseData.NOCSRElements, options));
+    ReturnErrorOnFailure(ConstructCustomAttestationSignature(writer, tag2, responseData.attestationSignature, options));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace DataModel
+} // namespace app
+} // namespace chip
diff --git a/examples/platform/linux/testing/CustomCSRResponse.h b/examples/platform/linux/testing/CustomCSRResponse.h
new file mode 100644
index 00000000000000..5de00b0646ae6d
--- /dev/null
+++ b/examples/platform/linux/testing/CustomCSRResponse.h
@@ -0,0 +1,32 @@
+/*
+ *
+ *    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.
+ */
+
+namespace chip {
+
+struct CSRResponseOptions
+{
+    bool csrIncorrectType                  = false;
+    bool csrNonceIncorrectType             = false;
+    bool csrNonceTooLong                   = false;
+    bool csrNonceInvalid                   = false;
+    bool nocsrElementsTooLong              = false;
+    bool attestationSignatureIncorrectType = false;
+    bool attestationSignatureInvalid       = false;
+};
+
+} // namespace chip
diff --git a/examples/platform/nrfconnect/Rpc.cpp b/examples/platform/nrfconnect/Rpc.cpp
index b9e1ae666f8be7..14cced6d5b1062 100644
--- a/examples/platform/nrfconnect/Rpc.cpp
+++ b/examples/platform/nrfconnect/Rpc.cpp
@@ -22,9 +22,9 @@
 #include "PigweedLoggerMutex.h"
 #include "pigweed/RpcService.h"
 #include "pw_sys_io_nrfconnect/init.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/platform/nrfconnect/Rpc.h b/examples/platform/nrfconnect/Rpc.h
index e5375eeb17b31c..f0aeaf45b61fba 100644
--- a/examples/platform/nrfconnect/Rpc.h
+++ b/examples/platform/nrfconnect/Rpc.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 namespace chip {
 namespace rpc {
diff --git a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
index e23a006dd6359c..3781eaa738d45f 100644
--- a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
+++ b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
@@ -20,10 +20,10 @@
 #include "console/console.h"
 #include "pw_sys_io/sys_io.h"
 #include <cassert>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #ifdef CONFIG_USB
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #endif
 
 extern "C" void pw_sys_io_Init()
diff --git a/examples/platform/nrfconnect/util/DFUOverSMP.cpp b/examples/platform/nrfconnect/util/DFUOverSMP.cpp
index 03c491b3460bee..c4b496d575fc26 100644
--- a/examples/platform/nrfconnect/util/DFUOverSMP.cpp
+++ b/examples/platform/nrfconnect/util/DFUOverSMP.cpp
@@ -21,10 +21,10 @@
 #error "DFUOverSMP requires MCUMGR module configs enabled"
 #endif
 
-#include <dfu/mcuboot.h>
 #include <img_mgmt/img_mgmt.h>
-#include <mgmt/mcumgr/smp_bt.h>
 #include <os_mgmt/os_mgmt.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/mgmt/mcumgr/smp_bt.h>
 
 #include <platform/CHIPDeviceLayer.h>
 
diff --git a/examples/platform/nrfconnect/util/DFUTrigger.cpp b/examples/platform/nrfconnect/util/DFUTrigger.cpp
index b1c14bc792409c..c287e56097fd6b 100644
--- a/examples/platform/nrfconnect/util/DFUTrigger.cpp
+++ b/examples/platform/nrfconnect/util/DFUTrigger.cpp
@@ -20,8 +20,8 @@
 #error "The command for triggerring the DFU is available for nRF52840 Dongle only"
 #endif
 
-#include <drivers/gpio.h>
-#include <shell/shell.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/shell/shell.h>
 
 namespace {
 constexpr const char * kGPIOController = "GPIO_0";
diff --git a/examples/platform/nrfconnect/util/LEDWidget.cpp b/examples/platform/nrfconnect/util/LEDWidget.cpp
index 703460eb5bf7e4..eca7765ab0a0d9 100644
--- a/examples/platform/nrfconnect/util/LEDWidget.cpp
+++ b/examples/platform/nrfconnect/util/LEDWidget.cpp
@@ -20,7 +20,7 @@
 #include "LEDWidget.h"
 
 #include <dk_buttons_and_leds.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 static LEDWidget::LEDWidgetStateUpdateHandler sStateUpdateCallback;
 
diff --git a/examples/platform/nrfconnect/util/OTAUtil.cpp b/examples/platform/nrfconnect/util/OTAUtil.cpp
index ed7b2368ce098a..4addd5c30a7d30 100644
--- a/examples/platform/nrfconnect/util/OTAUtil.cpp
+++ b/examples/platform/nrfconnect/util/OTAUtil.cpp
@@ -52,6 +52,8 @@ OTAImageProcessorImpl & GetOTAImageProcessor()
 
 void InitBasicOTARequestor()
 {
+    VerifyOrReturn(GetRequestorInstance() == nullptr);
+
     OTAImageProcessorImpl & imageProcessor = GetOTAImageProcessor();
     imageProcessor.SetOTADownloader(&sBDXDownloader);
     sBDXDownloader.SetImageProcessorDelegate(&imageProcessor);
diff --git a/examples/platform/nrfconnect/util/PWMDevice.cpp b/examples/platform/nrfconnect/util/PWMDevice.cpp
index 929f538f792819..43e3600a15cec9 100644
--- a/examples/platform/nrfconnect/util/PWMDevice.cpp
+++ b/examples/platform/nrfconnect/util/PWMDevice.cpp
@@ -22,24 +22,23 @@
 
 #include <lib/support/CodeUtils.h>
 
-#include <drivers/pwm.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
-int PWMDevice::Init(const device * aPWMDevice, uint32_t aPWMChannel, uint8_t aMinLevel, uint8_t aMaxLevel, uint8_t aDefaultLevel)
+int PWMDevice::Init(const pwm_dt_spec * aPWMDevice, uint8_t aMinLevel, uint8_t aMaxLevel, uint8_t aDefaultLevel)
 {
-    mState      = kState_On;
-    mMinLevel   = aMinLevel;
-    mMaxLevel   = aMaxLevel;
-    mLevel      = aDefaultLevel;
-    mPwmDevice  = aPWMDevice;
-    mPwmChannel = aPWMChannel;
-
-    if (!device_is_ready(mPwmDevice))
+    mState     = kState_On;
+    mMinLevel  = aMinLevel;
+    mMaxLevel  = aMaxLevel;
+    mLevel     = aDefaultLevel;
+    mPwmDevice = aPWMDevice;
+
+    if (!device_is_ready(mPwmDevice->dev))
     {
-        LOG_ERR("PWM device %s is not ready", mPwmDevice->name);
+        LOG_ERR("PWM device %s is not ready", mPwmDevice->dev->name);
         return -ENODEV;
     }
 
@@ -124,9 +123,9 @@ void PWMDevice::Set(bool aOn)
 
 void PWMDevice::UpdateLight()
 {
-    constexpr uint32_t kPwmWidthUs  = 20000u;
     const uint8_t maxEffectiveLevel = mMaxLevel - mMinLevel;
     const uint8_t effectiveLevel    = mState == kState_On ? chip::min<uint8_t>(mLevel - mMinLevel, maxEffectiveLevel) : 0;
 
-    pwm_pin_set_usec(mPwmDevice, mPwmChannel, kPwmWidthUs, kPwmWidthUs * effectiveLevel / maxEffectiveLevel, 0);
+    pwm_set_pulse_dt(mPwmDevice,
+                     static_cast<uint32_t>(static_cast<const uint64_t>(mPwmDevice->period) * effectiveLevel / maxEffectiveLevel));
 }
diff --git a/examples/platform/nrfconnect/util/PigweedLogger.cpp b/examples/platform/nrfconnect/util/PigweedLogger.cpp
index ed08e7af12784d..6aae4a062a6f05 100644
--- a/examples/platform/nrfconnect/util/PigweedLogger.cpp
+++ b/examples/platform/nrfconnect/util/PigweedLogger.cpp
@@ -24,11 +24,11 @@
  * needs to use HDLC/UART for another purpose like the RPC server.
  */
 
-#include <logging/log.h>
-#include <logging/log_backend.h>
-#include <logging/log_backend_std.h>
-#include <logging/log_output.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/zephyr.h>
 
 #include <pw_hdlc/encoder.h>
 #include <pw_stream/sys_io_stream.h>
diff --git a/examples/platform/nrfconnect/util/ThreadUtil.cpp b/examples/platform/nrfconnect/util/ThreadUtil.cpp
index 5ca7b5874acaf2..b3564d8cbf80de 100644
--- a/examples/platform/nrfconnect/util/ThreadUtil.cpp
+++ b/examples/platform/nrfconnect/util/ThreadUtil.cpp
@@ -23,7 +23,7 @@
 #include <app/server/Dnssd.h>
 #include <lib/support/ThreadOperationalDataset.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <cstring>
 
diff --git a/examples/platform/nrfconnect/util/include/DFUOverSMP.h b/examples/platform/nrfconnect/util/include/DFUOverSMP.h
index 846a8a13394ee9..c6c04b474b8f68 100644
--- a/examples/platform/nrfconnect/util/include/DFUOverSMP.h
+++ b/examples/platform/nrfconnect/util/include/DFUOverSMP.h
@@ -25,7 +25,7 @@
 
 #include <platform/CHIPDeviceLayer.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 typedef void (*DFUOverSMPRestartAdvertisingHandler)(void);
 
diff --git a/examples/platform/nrfconnect/util/include/LEDWidget.h b/examples/platform/nrfconnect/util/include/LEDWidget.h
index 7c76c49810157f..4859bc9bf048df 100644
--- a/examples/platform/nrfconnect/util/include/LEDWidget.h
+++ b/examples/platform/nrfconnect/util/include/LEDWidget.h
@@ -20,7 +20,7 @@
 
 #include <cstdint>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 class LEDWidget
 {
diff --git a/examples/platform/nrfconnect/util/include/PWMDevice.h b/examples/platform/nrfconnect/util/include/PWMDevice.h
index d83a45d92e982b..250383efa93c0e 100644
--- a/examples/platform/nrfconnect/util/include/PWMDevice.h
+++ b/examples/platform/nrfconnect/util/include/PWMDevice.h
@@ -18,7 +18,8 @@
 #pragma once
 
 #include <cstdint>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pwm.h>
 
 class PWMDevice
 {
@@ -40,21 +41,21 @@ class PWMDevice
 
     using PWMCallback = void (*)(Action_t, int32_t);
 
-    int Init(const device * aPWMDevice, uint32_t aPWMChannel, uint8_t aMinLevel, uint8_t aMaxLevel, uint8_t aDefaultLevel = 0);
+    int Init(const pwm_dt_spec * aPWMDevice, uint8_t aMinLevel, uint8_t aMaxLevel, uint8_t aDefaultLevel = 0);
     bool IsTurnedOn() const { return mState == kState_On; }
     uint8_t GetLevel() const { return mLevel; }
     uint8_t GetMinLevel() const { return mMinLevel; }
     uint8_t GetMaxLevel() const { return mMaxLevel; }
     bool InitiateAction(Action_t aAction, int32_t aActor, uint8_t * aValue);
     void SetCallbacks(PWMCallback aActionInitiatedClb, PWMCallback aActionCompletedClb);
-    const device * GetDevice() { return mPwmDevice; }
+    const device * GetDevice() { return mPwmDevice->dev; }
 
 private:
     State_t mState;
     uint8_t mMinLevel;
     uint8_t mMaxLevel;
     uint8_t mLevel;
-    const device * mPwmDevice;
+    const pwm_dt_spec * mPwmDevice;
     uint32_t mPwmChannel;
 
     PWMCallback mActionInitiatedClb;
diff --git a/examples/platform/nrfconnect/util/include/PigweedLogger.h b/examples/platform/nrfconnect/util/include/PigweedLogger.h
index 69d011a0c4c8c2..ac106231802e50 100644
--- a/examples/platform/nrfconnect/util/include/PigweedLogger.h
+++ b/examples/platform/nrfconnect/util/include/PigweedLogger.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 namespace PigweedLogger {
 
diff --git a/examples/platform/nxp/k32w/k32w0/app/ldscripts/chip-k32w061-linker.ld b/examples/platform/nxp/k32w/k32w0/app/ldscripts/chip-k32w061-linker.ld
index 3bb149e142b48c..3bb028d183d9dd 100644
--- a/examples/platform/nxp/k32w/k32w0/app/ldscripts/chip-k32w061-linker.ld
+++ b/examples/platform/nxp/k32w/k32w0/app/ldscripts/chip-k32w061-linker.ld
@@ -211,9 +211,9 @@ SECTIONS
 
     _etext = .;
 
-    .heap_controller (COPY):
+    .heap_packet_buffer (COPY):
     {
-        *(.ll_exchange_mem)
+        *(.bss._ZN4chip6System12PacketBuffer11sBufferPoolE)
         __HeapBase = .;
          _heap = .;
         KEEP(*(.heap*))
diff --git a/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h b/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h
index f59258a294be03..667574786bb91e 100644
--- a/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h
+++ b/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h
@@ -22,40 +22,80 @@
  *
  */
 
+#include "openthread-core-k32w061-config.h"
+
 #pragma once
 
 // Disable the Nxp-supplied OpenThread logging facilities
 // and use the facilities provided by the Device Layer
 // (see src/platform/K32W/Logging.cpp).
+#undef OPENTHREAD_CONFIG_LOG_OUTPUT
 #define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
 
 // When operating in a less than ideal RF environment, having a more forgiving configuration
 // of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
+#undef OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY
+#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120 // default is 28800
+
+#undef OPENTHREAD_CONFIG_MAC__DEFAULT_MAX_FRAME_RETRIES_DIRECT
 #define OPENTHREAD_CONFIG_MAC__DEFAULT_MAX_FRAME_RETRIES_DIRECT 15 // default is 3
+
+#undef OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT
 #define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
+
+#undef OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS
+#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16 // default is 4
 
 // Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
+#undef OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE
+#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1 // default is 0
+
+#undef OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD
+#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45 // default is -65
+
+#undef OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH
 #define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
 
 // Use smaller maximum interval to speed up reattaching.
+#undef OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL
 #define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
 
 // disable unused features
+#undef OPENTHREAD_CONFIG_COAP_API_ENABLE
 #define OPENTHREAD_CONFIG_COAP_API_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_JOINER_ENABLE
 #define OPENTHREAD_CONFIG_JOINER_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
 #define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE
 #define OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE
 #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
 #define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE
 #define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_TCP_ENABLE
 #define OPENTHREAD_CONFIG_TCP_ENABLE 0
 
+#undef OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE
+#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE
+#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE 0
+
+#undef OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS
 #define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 44
 
+#undef OPENTHREAD_CONFIG_PLATFORM_CSL_UNCERT
+
 //#define OPENTHREAD_CONFIG_LOG_LEVEL                            OT_LOG_LEVEL_DEBG
 
 // Use the NXP-supplied default platform configuration for remainder
@@ -64,4 +104,3 @@
 // NB: This file gets included during the build of OpenThread.  Hence
 // it cannot use "openthread" in the path to the included file.
 //
-#include "openthread-core-k32w061-config.h"
diff --git a/examples/platform/nxp/k32w/k32w0/app/support/FreeRtosHooks.c b/examples/platform/nxp/k32w/k32w0/app/support/FreeRtosHooks.c
index 0884a8f261f226..5bdb70c6ee21fc 100644
--- a/examples/platform/nxp/k32w/k32w0/app/support/FreeRtosHooks.c
+++ b/examples/platform/nxp/k32w/k32w0/app/support/FreeRtosHooks.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "PDM.h"
 #include "PWR_Interface.h"
 #include "TimersManager.h"
 #include "board.h"
@@ -52,6 +53,8 @@
 #define APP_DBG_LOG(...)
 #endif
 
+#define PDM_MAX_WRITES_INFINITE 0xFF
+
 static inline void mutex_init(mbedtls_threading_mutex_t * p_mutex)
 {
     assert(p_mutex != NULL);
@@ -217,6 +220,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
 
     OSA_InterruptEnable();
 }
+#endif /*  (cPWR_UsePowerDownMode) && (configUSE_TICKLESS_IDLE != 0) */
 
 static void BOARD_ActionOnIdle(void)
 {
@@ -228,9 +232,11 @@ static void BOARD_ActionOnIdle(void)
 #endif
 }
 
+extern void OTAIdleActivities(void);
+
 void vApplicationIdleHook(void)
 {
+    PDM_vIdleTask(PDM_MAX_WRITES_INFINITE);
+    OTAIdleActivities();
     BOARD_ActionOnIdle();
 }
-
-#endif /*  (cPWR_UsePowerDownMode) && (configUSE_TICKLESS_IDLE != 0) */
diff --git a/examples/platform/nxp/k32w/k32w0/args.gni b/examples/platform/nxp/k32w/k32w0/args.gni
index 747d22ba2ad90e..954fad9a2faee2 100644
--- a/examples/platform/nxp/k32w/k32w0/args.gni
+++ b/examples/platform/nxp/k32w/k32w0/args.gni
@@ -32,3 +32,6 @@ chip_system_project_config_include = "<CHIPProjectConfig.h>"
 
 chip_system_config_provide_statistics = false
 chip_with_nlfaultinjection = true
+
+chip_system_config_use_open_thread_inet_endpoints = true
+chip_with_lwip = false
diff --git a/examples/platform/tizen/TizenServiceAppMain.cpp b/examples/platform/tizen/TizenServiceAppMain.cpp
index 4b5df762d8254e..06f90928b99c9a 100644
--- a/examples/platform/tizen/TizenServiceAppMain.cpp
+++ b/examples/platform/tizen/TizenServiceAppMain.cpp
@@ -84,13 +84,16 @@ void TizenServiceAppMain::AppTerminated()
 void TizenServiceAppMain::AppControl(app_control_h app_control)
 {
     ChipLogProgress(NotSpecified, "Tizen app control");
-
-    mLinuxArgs.Parse(mArgc > 0 ? mArgv[0] : nullptr, app_control);
-    if (ChipLinuxAppInit(mLinuxArgs.argc(), const_cast<char **>(mLinuxArgs.argv())) != 0)
+    if (!initialized)
     {
-        service_app_exit();
-        return;
+        mLinuxArgs.Parse(mArgc > 0 ? mArgv[0] : nullptr, app_control);
+        if (ChipLinuxAppInit(mLinuxArgs.argc(), const_cast<char **>(mLinuxArgs.argv())) != 0)
+        {
+            service_app_exit();
+            return;
+        }
+
+        mLinuxThread = std::thread(ChipLinuxAppMainLoop);
+        initialized  = true;
     }
-
-    mLinuxThread = std::thread(ChipLinuxAppMainLoop);
 }
diff --git a/examples/platform/tizen/TizenServiceAppMain.h b/examples/platform/tizen/TizenServiceAppMain.h
index 92846c109e73a9..20f889e94a8b63 100644
--- a/examples/platform/tizen/TizenServiceAppMain.h
+++ b/examples/platform/tizen/TizenServiceAppMain.h
@@ -44,4 +44,5 @@ class TizenServiceAppMain
     char ** mArgv = nullptr;
     OptionsProxy mLinuxArgs;
     std::thread mLinuxThread;
+    bool initialized = false;
 };
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
index c6b05762d495e5..4aed41ba0cb718 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -379,8 +379,10 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
     case AppEvent::kEventType_ButtonLeft:
         if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
         {
-            // Post event for demonstration purposes
-            sAppTask.PostEvents();
+            // Post event for demonstration purposes, we must ensure that the
+            // LogEvent is called in the right context which is the Matter mainloop
+            // thru ScheduleWork()
+            chip::DeviceLayer::PlatformMgr().ScheduleWork(sAppTask.PostEvents, reinterpret_cast<intptr_t>(nullptr));
 
             // Toggle BLE advertisements
             if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
@@ -467,7 +469,7 @@ void AppTask::UpdateClusterState(void)
 void AppTask::UpdateCluster(intptr_t context)
 {
     EmberStatus status;
-    BitFlags<PumpConfigurationAndControl::PumpStatus> pumpStatus;
+    BitMask<PumpConfigurationAndControl::PumpStatus> pumpStatus;
 
     ChipLogProgress(NotSpecified, "Update Cluster State");
 
@@ -608,7 +610,7 @@ void AppTask::UpdateCluster(intptr_t context)
     }
 }
 
-void AppTask::PostEvents()
+void AppTask::PostEvents(intptr_t context)
 {
     // Example on posting events - here we post the general fault event on endpoints with PCC Server enabled
     for (auto endpoint : EnabledEndpointsWithServerCluster(PumpConfigurationAndControl::Id))
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
index 82b2b0b1ba5567..9c1894abc0bd80 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
@@ -64,28 +64,27 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
 } // namespace DeviceManager
 } // namespace chip
 
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type,
-                                       uint16_t size, uint8_t * value)
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
 {
     chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
         chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
     if (cb != nullptr)
     {
-        cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, mask, type,
-                                        size, value);
+        cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type, size,
+                                        value);
     }
 }
 
 chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                           uint8_t mask, uint8_t type, uint16_t size,
-                                                                           uint8_t * value)
+                                                                           uint8_t type, uint16_t size, uint8_t * value)
 {
     chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
         chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
     if (cb != nullptr)
     {
-        return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, mask,
-                                              type, size, value);
+        return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type,
+                                              size, value);
     }
 
     return chip::Protocols::InteractionModel::Status::Success;
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
index b08e55033b74a6..f29ce063f5c8e4 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
@@ -73,8 +73,7 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_
         break;
 
     case DeviceEventType::kCommissioningComplete:
-        PLAT_LOG("Commissioning complete (%x,%d)", event->CommissioningComplete.PeerNodeId,
-                 event->CommissioningComplete.PeerFabricIndex);
+        PLAT_LOG("Commissioning complete for fabric 0x%x", event->CommissioningComplete.fabricIndex);
         break;
 
     case DeviceEventType::kOperationalNetworkEnabled:
@@ -106,8 +105,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_
 
 chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCallback(chip::EndpointId endpointId,
                                                                                       chip::ClusterId clusterId,
-                                                                                      chip::AttributeId attributeId, uint8_t mask,
-                                                                                      uint8_t type, uint16_t size, uint8_t * value)
+                                                                                      chip::AttributeId attributeId, uint8_t type,
+                                                                                      uint16_t size, uint8_t * value)
 {
     PLAT_LOG("PreAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
              endpointId, attributeId);
@@ -131,8 +130,8 @@ chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCal
     return chip::Protocols::InteractionModel::Status::Success;
 }
 
-void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                                  uint8_t type, uint16_t size, uint8_t * value)
+void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
+                                                  uint16_t size, uint8_t * value)
 {
     PLAT_LOG("PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
              endpointId, attributeId);
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
index 9e0d3e84d7071a..7fd3f38ff6f0d5 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
@@ -64,7 +64,7 @@ class AppTask
     static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
     static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
     static void TimerEventHandler(void * p_context);
-    static void PostEvents();
+    static void PostEvents(intptr_t context);
 
     enum Function_t
     {
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
index 343f10d68a62b2..01703fe335b6af 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
@@ -72,7 +72,7 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
      * @param value              pointer to the new value
      */
     virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t mask, uint8_t type, uint16_t size, uint8_t * value)
+                                             uint8_t type, uint16_t size, uint8_t * value)
     {}
     /**
      * @brief
@@ -91,8 +91,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
      */
     virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpoint,
                                                                                  chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t mask,
-                                                                                 uint8_t type, uint16_t size, uint8_t * value)
+                                                                                 chip::AttributeId attributeId, uint8_t type,
+                                                                                 uint16_t size, uint8_t * value)
     {
         return chip::Protocols::InteractionModel::Status::Success;
     }
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
index 1fab37b71313a3..c200460d0b46c6 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
@@ -35,10 +35,10 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
     virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
     virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpointId,
                                                                                  chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t mask,
-                                                                                 uint8_t type, uint16_t size, uint8_t * value);
+                                                                                 chip::AttributeId attributeId, uint8_t type,
+                                                                                 uint16_t size, uint8_t * value);
     virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t mask, uint8_t type, uint16_t size, uint8_t * value);
+                                             uint8_t type, uint16_t size, uint8_t * value);
 
 private:
     void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp
index abb9f8f2b65857..b101418cad4ebf 100644
--- a/examples/pump-app/nrfconnect/main/AppTask.cpp
+++ b/examples/pump-app/nrfconnect/main/AppTask.cpp
@@ -22,6 +22,7 @@
 #include "PumpManager.h"
 #include "ThreadUtil.h"
 
+#include <DeviceInfoProviderImpl.h>
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
@@ -41,8 +42,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 using namespace ::chip;
 using namespace ::chip::app::Clusters;
@@ -73,6 +74,8 @@ bool sIsThreadProvisioned = false;
 bool sIsThreadEnabled     = false;
 bool sHaveBLEConnections  = false;
 
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
 } // namespace
 
 AppTask AppTask::sAppTask;
@@ -141,10 +144,7 @@ CHIP_ERROR AppTask::Init()
 #ifdef CONFIG_MCUMGR_SMP_BT
     // Initialize DFU over SMP
     GetDFUOverSMP().Init(RequestSMPAdvertisingStart);
-#ifndef CONFIG_CHIP_OTA_REQUESTOR
-    // When OTA Requestor is enabled, it is responsible for confirming new images.
     GetDFUOverSMP().ConfirmNewImage();
-#endif
 #endif
 
     // Initialize CHIP server
@@ -153,9 +153,10 @@ CHIP_ERROR AppTask::Init()
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
@@ -467,6 +468,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
         sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/examples/pump-app/nrfconnect/main/PumpManager.cpp b/examples/pump-app/nrfconnect/main/PumpManager.cpp
index 0e13b861c23eca..e7c0b6240c554b 100644
--- a/examples/pump-app/nrfconnect/main/PumpManager.cpp
+++ b/examples/pump-app/nrfconnect/main/PumpManager.cpp
@@ -22,8 +22,8 @@
 #include "AppConfig.h"
 #include "AppTask.h"
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/pump-app/nrfconnect/main/main.cpp b/examples/pump-app/nrfconnect/main/main.cpp
index 1867a549b5b005..a20f86082131a4 100644
--- a/examples/pump-app/nrfconnect/main/main.cpp
+++ b/examples/pump-app/nrfconnect/main/main.cpp
@@ -19,7 +19,7 @@
 
 #include "AppTask.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 2f223d56cc141c..f9f71aafd60633 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -1,11 +1,6 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
-struct LabelStruct {
-    char_string<16> label = 0;
-    char_string<16> value = 1;
-}
-
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -67,6 +62,8 @@ server cluster AccessControl = 31 {
   readonly attribute int16u subjectsPerAccessControlEntry = 2;
   readonly attribute int16u targetsPerAccessControlEntry = 3;
   readonly attribute int16u accessControlEntriesPerFabric = 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;
@@ -88,6 +85,9 @@ server cluster AdministratorCommissioning = 60 {
   readonly attribute int8u windowStatus = 0;
   readonly attribute fabric_idx adminFabricIndex = 1;
   readonly attribute int16u adminVendorId = 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;
 
@@ -144,10 +144,27 @@ server cluster Basic = 40 {
   readonly attribute long_char_string<256> productURL = 13;
   readonly attribute char_string<64> productLabel = 14;
   readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  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;
+}
+
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  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;
 }
@@ -162,60 +179,9 @@ server cluster Descriptor = 29 {
   readonly attribute CLUSTER_ID serverList[] = 1;
   readonly attribute CLUSTER_ID clientList[] = 2;
   readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
-  }
-
-  response struct RetrieveLogsResponse = 1 {
-    LogsStatus status = 0;
-    OCTET_STRING content = 1;
-    epoch_s timeStamp = 2;
-    INT32U timeSinceBoot = 3;
-  }
-
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  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;
 }
@@ -225,6 +191,9 @@ server cluster FlowMeasurement = 1028 {
   readonly attribute nullable int16u minMeasuredValue = 1;
   readonly attribute nullable int16u maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
+  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;
 }
@@ -253,6 +222,9 @@ server cluster GeneralCommissioning = 48 {
   readonly attribute RegulatoryLocationType regulatoryConfig = 2;
   readonly attribute RegulatoryLocationType locationCapability = 3;
   readonly attribute boolean supportsConcurrentConnection = 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;
 
@@ -369,14 +341,19 @@ server cluster GeneralDiagnostics = 51 {
 
   readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
   readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -413,6 +390,9 @@ server cluster GroupKeyManagement = 63 {
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
   readonly attribute int16u maxGroupsPerFabric = 2;
   readonly attribute int16u maxGroupKeysPerFabric = 3;
+  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;
 
@@ -446,62 +426,6 @@ server cluster GroupKeyManagement = 63 {
   command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
-  }
-
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
-  }
-
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
 server cluster Identify = 3 {
   enum IdentifyEffectIdentifier : ENUM8 {
     kBlink = 0;
@@ -527,6 +451,9 @@ server cluster Identify = 3 {
 
   attribute int16u identifyTime = 0;
   readonly attribute enum8 identifyType = 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;
 
@@ -534,13 +461,7 @@ server cluster Identify = 3 {
     INT16U identifyTime = 0;
   }
 
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
-  }
-
   command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
 }
 
 server cluster LevelControl = 8 {
@@ -561,19 +482,13 @@ server cluster LevelControl = 8 {
   }
 
   readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
   readonly attribute int8u minLevel = 2;
   readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
   attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
   attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  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;
 
@@ -630,13 +545,6 @@ server cluster LevelControl = 8 {
   command StopWithOnOff(): DefaultSuccess = 7;
 }
 
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster NetworkCommissioning = 49 {
   enum NetworkCommissioningStatus : ENUM8 {
     kSuccess = 0;
@@ -709,6 +617,9 @@ server cluster NetworkCommissioning = 49 {
   readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
   readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
   readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  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;
 
@@ -717,12 +628,6 @@ server cluster NetworkCommissioning = 49 {
     optional INT64U breadcrumb = 1;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
   request struct AddOrUpdateThreadNetworkRequest {
     OCTET_STRING operationalDataset = 0;
     optional INT64U breadcrumb = 1;
@@ -764,7 +669,6 @@ server cluster NetworkCommissioning = 49 {
   }
 
   command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
   command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
   command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
   command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
@@ -862,6 +766,12 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayedOnUserConsent = 8;
   }
 
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
   info event StateTransition = 0 {
     OTAUpdateStateEnum previousState = 0;
     OTAUpdateStateEnum newState = 1;
@@ -881,9 +791,13 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     nullable INT64S platformCode = 3;
   }
 
+  attribute ProviderLocation defaultOtaProviders[] = 0;
   readonly attribute boolean updatePossible = 1;
   readonly attribute OTAUpdateStateEnum updateState = 2;
   readonly attribute nullable int8u updateStateProgress = 3;
+  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;
 
@@ -936,30 +850,15 @@ server cluster OnOff = 6 {
   }
 
   readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  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 OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
-  }
-
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
-  }
-
   command Off(): DefaultSuccess = 0;
   command On(): DefaultSuccess = 1;
   command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -970,6 +869,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -997,6 +897,9 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int8u commissionedFabrics = 3;
   readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
   readonly attribute fabric_idx currentFabricIndex = 5;
+  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;
 
@@ -1010,13 +913,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1037,10 +941,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1069,25 +969,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
-}
-
-client cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
-  }
-
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable int16s scaledValue = 16;
-  readonly attribute nullable int16s minScaledValue = 17;
-  readonly attribute nullable int16s maxScaledValue = 18;
-  readonly attribute int16u scaledTolerance = 19;
-  readonly attribute int8s scale = 20;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
 }
 
 server cluster PressureMeasurement = 1027 {
@@ -1104,6 +985,9 @@ server cluster PressureMeasurement = 1027 {
   readonly attribute nullable int16s maxScaledValue = 18;
   readonly attribute int16u scaledTolerance = 19;
   readonly attribute int8s scale = 20;
+  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;
 }
@@ -1211,146 +1095,9 @@ server cluster PumpConfigurationAndControl = 512 {
   attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
   attribute access(write: manage) PumpOperationMode operationMode = 32;
   attribute access(write: manage) PumpControlMode controlMode = 33;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
-
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  struct ThreadMetrics {
-    int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  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;
 }
@@ -1360,6 +1107,9 @@ server cluster TemperatureMeasurement = 1026 {
   readonly attribute nullable int16s minMeasuredValue = 1;
   readonly attribute nullable int16s maxMeasuredValue = 2;
   readonly attribute int16u tolerance = 3;
+  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;
 }
@@ -1449,156 +1199,43 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
   readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  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;
 
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : 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;
-  }
-
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
-  }
-
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
-  }
-
-  attribute TempUnit temperatureUnit = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-
 endpoint 0 {
+  device type pump = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
-  server cluster Identify {
-    ram      attribute identifyTime;
-    ram      attribute identifyType;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 4;
-  }
-
-  server cluster Groups {
-    ram      attribute nameSupport;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 4;
-  }
-
-  server cluster Scenes {
-    ram      attribute sceneCount;
-    ram      attribute currentScene;
-    ram      attribute currentGroup;
-    ram      attribute sceneValid;
-    ram      attribute nameSupport;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 4;
-  }
-
   server cluster Descriptor {
     callback attribute deviceList;
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     callback attribute clusterRevision default = 1;
   }
@@ -1609,6 +1246,8 @@ endpoint 0 {
     callback attribute subjectsPerAccessControlEntry default = 4;
     callback attribute targetsPerAccessControlEntry default = 3;
     callback attribute accessControlEntriesPerFabric default = 3;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
@@ -1631,49 +1270,35 @@ endpoint 0 {
     callback attribute productURL;
     callback attribute productLabel;
     callback attribute serialNumber;
-    persist  attribute localConfigDisabled;
-    ram      attribute reachable default = 1;
-    callback attribute uniqueID;
     callback attribute capabilityMinima;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
   server cluster OtaSoftwareUpdateRequestor {
+    callback attribute defaultOtaProviders;
     ram      attribute updatePossible default = 1;
     ram      attribute updateState;
     ram      attribute updateStateProgress;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster LocalizationConfiguration {
-    persist  attribute activeLocale default = "en-US";
-    callback attribute supportedLocales;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster TimeFormatLocalization {
-    persist  attribute hourFormat;
-    persist  attribute activeCalendarType;
-    callback attribute supportedCalendarTypes;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster UnitLocalization {
-    persist  attribute temperatureUnit;
-    ram      attribute featureMap default = 0x1;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster GeneralCommissioning {
     ram      attribute breadcrumb;
     callback attribute basicCommissioningInfo;
     callback attribute regulatoryConfig;
     callback attribute locationCapability;
     callback attribute supportsConcurrentConnection default = 1;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 6;
     ram      attribute clusterRevision default = 1;
   }
@@ -1687,102 +1312,46 @@ endpoint 0 {
     ram      attribute lastNetworkingStatus;
     ram      attribute lastNetworkID;
     ram      attribute lastConnectErrorValue;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 2;
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster DiagnosticLogs {
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster GeneralDiagnostics {
     callback attribute networkInterfaces;
     callback attribute rebootCount;
-    callback attribute upTime;
-    callback attribute totalOperationalHours;
-    callback attribute bootReasons;
-    callback attribute activeHardwareFaults;
-    callback attribute activeRadioFaults;
-    callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster SoftwareDiagnostics {
-    callback attribute threadMetrics;
-    callback attribute currentHeapFree;
-    callback attribute currentHeapUsed;
-    callback attribute currentHeapHighWatermark;
-    ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
-    ram      attribute featureMap default = 0x000F;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
@@ -1790,7 +1359,10 @@ endpoint 0 {
     callback attribute windowStatus;
     callback attribute adminFabricIndex default = 1;
     callback attribute adminVendorId;
-    ram      attribute featureMap;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
     ram      attribute clusterRevision default = 1;
   }
 
@@ -1801,6 +1373,9 @@ endpoint 0 {
     callback attribute commissionedFabrics;
     callback attribute trustedRootCertificates;
     callback attribute currentFabricIndex;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1810,55 +1385,46 @@ endpoint 0 {
     callback attribute groupTable;
     callback attribute maxGroupsPerFabric;
     callback attribute maxGroupKeysPerFabric;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster FixedLabel {
-    callback attribute labelList;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster UserLabel {
-    callback attribute labelList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
-  binding cluster TemperatureMeasurement;
-  binding cluster PressureMeasurement;
-  binding cluster FlowMeasurement;
+  device type pump = 771;
   binding cluster OccupancySensing;
 
+  server cluster Identify {
+    ram      attribute identifyTime;
+    ram      attribute identifyType default = 0x2;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 2;
+  }
+
   server cluster OnOff {
     ram      attribute onOff;
-    ram      attribute globalSceneControl default = 1;
-    ram      attribute onTime;
-    ram      attribute offWaitTime;
-    ram      attribute startUpOnOff;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 4;
   }
 
   server cluster LevelControl {
     ram      attribute currentLevel;
-    ram      attribute remainingTime;
     ram      attribute minLevel;
-    ram      attribute maxLevel default = 0xFE;
-    ram      attribute currentFrequency;
-    ram      attribute minFrequency;
-    ram      attribute maxFrequency;
+    ram      attribute maxLevel default = 0xC8;
     ram      attribute options;
-    ram      attribute onOffTransitionTime;
-    ram      attribute onLevel default = 0xFE;
-    ram      attribute onTransitionTime;
-    ram      attribute offTransitionTime;
-    ram      attribute defaultMoveRate;
-    ram      attribute startUpCurrentLevel;
-    ram      attribute featureMap;
+    ram      attribute onLevel;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
     ram      attribute clusterRevision default = 5;
   }
 
@@ -1867,10 +1433,22 @@ endpoint 1 {
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     callback attribute clusterRevision default = 1;
   }
 
+  server cluster Binding {
+    callback attribute binding;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster PumpConfigurationAndControl {
     ram      attribute maxPressure;
     ram      attribute maxSpeed;
@@ -1895,6 +1473,9 @@ endpoint 1 {
     ram      attribute lifetimeEnergyConsumed;
     ram      attribute operationMode;
     ram      attribute controlMode;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 3;
   }
@@ -1904,6 +1485,9 @@ endpoint 1 {
     ram      attribute minMeasuredValue default = 0x8000;
     ram      attribute maxMeasuredValue default = 0x8000;
     ram      attribute tolerance;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 4;
   }
@@ -1918,6 +1502,9 @@ endpoint 1 {
     ram      attribute maxScaledValue;
     ram      attribute scaledTolerance;
     ram      attribute scale;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 3;
   }
@@ -1927,6 +1514,9 @@ endpoint 1 {
     ram      attribute minMeasuredValue;
     ram      attribute maxMeasuredValue;
     ram      attribute tolerance;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 3;
   }
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 7116895e54a480..6e2e2d7e2f2630 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -69,7 +69,7 @@
           "mfgCode": null,
           "define": "IDENTIFY_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -251,7 +251,7 @@
           "mfgCode": null,
           "define": "GROUPS_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [
             {
               "name": "AddGroupResponse",
@@ -482,7 +482,7 @@
           "mfgCode": null,
           "define": "SCENES_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [
             {
               "name": "AddSceneResponse",
@@ -858,7 +858,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -874,7 +874,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -890,7 +890,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1072,7 +1072,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1088,7 +1088,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1471,7 +1471,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "boolean",
-              "included": 1,
+              "included": 0,
               "storageOption": "NVM",
               "singleton": 1,
               "bounded": 0,
@@ -1487,7 +1487,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "boolean",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
@@ -1503,7 +1503,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "char_string",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
@@ -1535,7 +1535,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
@@ -1551,7 +1551,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
@@ -1567,7 +1567,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 1,
               "bounded": 0,
@@ -1740,7 +1740,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1804,7 +1804,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1820,7 +1820,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1836,7 +1836,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -1896,7 +1896,7 @@
           "mfgCode": null,
           "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -2029,7 +2029,7 @@
           "mfgCode": null,
           "define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -2178,7 +2178,7 @@
           "mfgCode": null,
           "define": "UNIT_LOCALIZATION_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -2467,7 +2467,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2483,7 +2483,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2499,7 +2499,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2564,7 +2564,7 @@
               "code": 2,
               "mfgCode": null,
               "source": "client",
-              "incoming": 1,
+              "incoming": 0,
               "outgoing": 0
             },
             {
@@ -2803,7 +2803,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2819,7 +2819,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2835,7 +2835,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2879,13 +2879,23 @@
             }
           ]
         },
+        {
+          "name": "Diagnostic Logs",
+          "code": 50,
+          "mfgCode": null,
+          "define": "DIAGNOSTIC_LOGS_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
         {
           "name": "Diagnostic Logs",
           "code": 50,
           "mfgCode": null,
           "define": "DIAGNOSTIC_LOGS_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [
             {
               "name": "RetrieveLogsRequest",
@@ -3037,7 +3047,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -3077,7 +3096,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int64u",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3093,7 +3112,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3109,7 +3128,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "enum8",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3125,7 +3144,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3141,7 +3160,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3157,7 +3176,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3167,13 +3186,29 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3189,7 +3224,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3205,7 +3240,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -3291,7 +3326,7 @@
           "mfgCode": null,
           "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -3492,7 +3527,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3506,9 +3541,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3524,7 +3559,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3540,7 +3575,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3556,7 +3591,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3572,7 +3607,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3587,8 +3622,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int64u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3636,7 +3671,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3652,7 +3687,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3668,7 +3703,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3684,7 +3719,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3700,7 +3735,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3715,8 +3750,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3731,8 +3766,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3747,8 +3782,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3763,8 +3798,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3779,8 +3814,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3795,8 +3830,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3811,8 +3846,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3827,8 +3862,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3843,8 +3878,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3859,8 +3894,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3875,8 +3910,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3891,8 +3926,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3907,8 +3942,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3923,8 +3958,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3939,8 +3974,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3955,8 +3990,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3971,8 +4006,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3987,8 +4022,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4003,8 +4038,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4019,8 +4054,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4035,8 +4070,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4051,8 +4086,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4067,8 +4102,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4083,8 +4118,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4099,8 +4134,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4115,8 +4150,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4131,8 +4166,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4147,8 +4182,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4163,8 +4198,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4179,8 +4214,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4195,8 +4230,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4211,8 +4246,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4227,8 +4262,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4243,8 +4278,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4259,8 +4294,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4275,8 +4310,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4291,8 +4326,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4307,8 +4342,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4323,8 +4358,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4339,8 +4374,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4355,8 +4390,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4371,8 +4406,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4387,8 +4422,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int64u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4403,8 +4438,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int64u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4419,8 +4454,8 @@
               "mfgCode": null,
               "side": "server",
               "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4434,7 +4469,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4452,7 +4487,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4466,7 +4501,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4499,7 +4534,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -4515,7 +4550,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -4531,7 +4566,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -4551,7 +4586,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x000F",
+              "defaultValue": "0x0000",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4706,7 +4741,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -4722,7 +4757,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -4738,7 +4773,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -4758,7 +4793,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4853,14 +4888,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -5042,7 +5069,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5058,7 +5085,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5074,7 +5101,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5290,7 +5317,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5306,7 +5333,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5322,7 +5349,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5382,7 +5409,7 @@
           "mfgCode": null,
           "define": "FIXED_LABEL_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -5499,7 +5526,7 @@
           "mfgCode": null,
           "define": "USER_LABEL_CLUSTER",
           "side": "server",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -5608,6 +5635,148 @@
       "deviceTypeCode": 771,
       "deviceTypeProfileId": 2457,
       "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": []
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "identify time",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "identify type",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x2",
+              "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": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "On/Off",
           "code": 6,
@@ -5645,7 +5814,7 @@
               "code": 64,
               "mfgCode": null,
               "source": "client",
-              "incoming": 1,
+              "incoming": 0,
               "outgoing": 0
             },
             {
@@ -5653,7 +5822,7 @@
               "code": 65,
               "mfgCode": null,
               "source": "client",
-              "incoming": 1,
+              "incoming": 0,
               "outgoing": 0
             },
             {
@@ -5661,7 +5830,7 @@
               "code": 66,
               "mfgCode": null,
               "source": "client",
-              "incoming": 1,
+              "incoming": 0,
               "outgoing": 0
             }
           ],
@@ -5715,7 +5884,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "boolean",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -5731,7 +5900,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -5747,7 +5916,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -5763,7 +5932,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "OnOffStartUpOnOff",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -5779,7 +5948,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5795,7 +5964,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5811,7 +5980,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -5978,7 +6147,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6014,7 +6183,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0xFE",
+              "defaultValue": "0xC8",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6026,7 +6195,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6042,7 +6211,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6058,7 +6227,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6090,7 +6259,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6110,7 +6279,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0xFE",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6122,7 +6291,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6138,7 +6307,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6154,7 +6323,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int8u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6170,7 +6339,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int8u",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -6186,7 +6355,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6202,7 +6371,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6218,7 +6387,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6238,7 +6407,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6368,7 +6537,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6384,7 +6553,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6400,7 +6569,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6444,6 +6613,123 @@
             }
           ]
         },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [],
+          "attributes": []
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [],
+          "attributes": [
+            {
+              "name": "Binding",
+              "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": "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": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Pump Configuration and Control",
           "code": 512,
@@ -6698,7 +6984,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -6714,7 +7000,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -6730,7 +7016,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -6854,7 +7140,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6870,7 +7156,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6886,7 +7172,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -6936,7 +7222,7 @@
           "mfgCode": null,
           "define": "TEMP_MEASUREMENT_CLUSTER",
           "side": "client",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -7040,7 +7326,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7052,7 +7338,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7068,7 +7354,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7084,7 +7370,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7134,7 +7420,7 @@
           "mfgCode": null,
           "define": "PRESSURE_MEASUREMENT_CLUSTER",
           "side": "client",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -7238,7 +7524,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7302,7 +7588,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7330,7 +7616,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7346,7 +7632,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7362,7 +7648,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7412,7 +7698,7 @@
           "mfgCode": null,
           "define": "FLOW_MEASUREMENT_CLUSTER",
           "side": "client",
-          "enabled": 1,
+          "enabled": 0,
           "commands": [],
           "attributes": [
             {
@@ -7516,7 +7802,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7528,7 +7814,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7544,7 +7830,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -7560,7 +7846,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
index 923c9001f4389a..1a0aa8202bbdfd 100644
--- a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
+++ b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
@@ -22,6 +22,7 @@
 #include "PumpManager.h"
 #include "ThreadUtil.h"
 
+#include <DeviceInfoProviderImpl.h>
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
@@ -41,8 +42,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 using namespace ::chip;
 using namespace ::chip::app;
@@ -70,6 +71,8 @@ bool sIsThreadProvisioned = false;
 bool sIsThreadEnabled     = false;
 bool sHaveBLEConnections  = false;
 
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
 } // namespace
 
 AppTask AppTask::sAppTask;
@@ -138,10 +141,7 @@ CHIP_ERROR AppTask::Init()
 #ifdef CONFIG_MCUMGR_SMP_BT
     // Initialize DFU over SMP
     GetDFUOverSMP().Init(RequestSMPAdvertisingStart);
-#ifndef CONFIG_CHIP_OTA_REQUESTOR
-    // When OTA Requestor is enabled, it is responsible for confirming new images.
     GetDFUOverSMP().ConfirmNewImage();
-#endif
 #endif
 
     // Initialize CHIP server
@@ -150,9 +150,9 @@ CHIP_ERROR AppTask::Init()
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
@@ -464,6 +464,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
         sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/examples/pump-controller-app/nrfconnect/main/PumpManager.cpp b/examples/pump-controller-app/nrfconnect/main/PumpManager.cpp
index c61a2a4a56e4aa..a7f654baeeead6 100644
--- a/examples/pump-controller-app/nrfconnect/main/PumpManager.cpp
+++ b/examples/pump-controller-app/nrfconnect/main/PumpManager.cpp
@@ -22,8 +22,8 @@
 #include "AppConfig.h"
 #include "AppTask.h"
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/examples/pump-controller-app/nrfconnect/main/main.cpp b/examples/pump-controller-app/nrfconnect/main/main.cpp
index 1867a549b5b005..a20f86082131a4 100644
--- a/examples/pump-controller-app/nrfconnect/main/main.cpp
+++ b/examples/pump-controller-app/nrfconnect/main/main.cpp
@@ -19,7 +19,7 @@
 
 #include "AppTask.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
 
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 80bd05ca663bc1..bd4f0b6618d76a 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
@@ -367,11 +367,19 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -856,6 +864,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -896,13 +905,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -923,10 +933,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -955,7 +961,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 client cluster PressureMeasurement = 1027 {
@@ -1060,12 +1065,16 @@ client cluster PumpConfigurationAndControl = 512 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1174,7 +1183,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1182,11 +1191,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1229,12 +1238,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1292,8 +1301,8 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Identify {
@@ -1423,6 +1432,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1440,67 +1450,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -1547,8 +1557,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type pumpcontroller = 772;
   binding cluster OnOff;
   binding cluster PumpConfigurationAndControl;
   binding cluster TemperatureMeasurement;
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 ef6444dfa09193..bba5c5c3e46aef 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
@@ -2983,7 +2983,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -3113,6 +3122,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3438,7 +3463,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3452,9 +3477,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3470,7 +3495,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3486,7 +3511,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3502,7 +3527,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3518,7 +3543,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3534,7 +3559,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3582,7 +3607,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3598,7 +3623,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3614,7 +3639,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3630,7 +3655,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3646,7 +3671,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3662,7 +3687,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3678,7 +3703,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3694,7 +3719,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3710,7 +3735,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3726,7 +3751,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3742,7 +3767,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3758,7 +3783,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3774,7 +3799,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3790,7 +3815,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3806,7 +3831,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3822,7 +3847,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3838,7 +3863,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3854,7 +3879,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3870,7 +3895,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3886,7 +3911,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3902,7 +3927,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3918,7 +3943,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3934,7 +3959,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3950,7 +3975,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3966,7 +3991,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3982,7 +4007,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3998,7 +4023,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4014,7 +4039,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4030,7 +4055,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4046,7 +4071,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4062,7 +4087,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4078,7 +4103,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4094,7 +4119,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4110,7 +4135,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4126,7 +4151,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4142,7 +4167,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4158,7 +4183,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4174,7 +4199,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4190,7 +4215,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4206,7 +4231,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4222,7 +4247,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4238,7 +4263,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4254,7 +4279,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4270,7 +4295,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4286,7 +4311,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4302,7 +4327,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4318,7 +4343,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4334,7 +4359,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4350,7 +4375,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4366,7 +4391,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4380,7 +4405,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4398,7 +4423,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4412,7 +4437,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4799,14 +4824,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
diff --git a/examples/shell/cc13x2x7_26x2x7/BUILD.gn b/examples/shell/cc13x2x7_26x2x7/BUILD.gn
index 6f2a97d401f582..1b4716017365b7 100644
--- a/examples/shell/cc13x2x7_26x2x7/BUILD.gn
+++ b/examples/shell/cc13x2x7_26x2x7/BUILD.gn
@@ -36,6 +36,7 @@ ti_sysconfig("sysconfig") {
   sources = [ "chip.syscfg" ]
 
   outputs = [
+    "ti_devices_config.c",
     "ti_radio_config.c",
     "ti_radio_config.h",
     "ti_drivers_config.c",
diff --git a/examples/shell/cc13x2x7_26x2x7/args.gni b/examples/shell/cc13x2x7_26x2x7/args.gni
index 2966155edeb06a..ecf4ca2ff281c9 100644
--- a/examples/shell/cc13x2x7_26x2x7/args.gni
+++ b/examples/shell/cc13x2x7_26x2x7/args.gni
@@ -31,7 +31,7 @@ chip_enable_ota_requestor = false
 chip_openthread_ftd = false
 
 # Disable CHIP Logging
-chip_progress_logging = false
+#chip_progress_logging = false
 chip_detail_logging = false
 chip_automation_logging = false
 
diff --git a/examples/shell/cc13x2x7_26x2x7/chip.syscfg b/examples/shell/cc13x2x7_26x2x7/chip.syscfg
index 32701817cf1a0c..4523f5456f7531 100644
--- a/examples/shell/cc13x2x7_26x2x7/chip.syscfg
+++ b/examples/shell/cc13x2x7_26x2x7/chip.syscfg
@@ -69,8 +69,7 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
+CCFG.enableCodeGeneration = true;
 
 /* NVS */
 NVS1.$name                      = "CONFIG_NVSINTERNAL";
diff --git a/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
index 7f5e892f6dfa84..b1411b6b6707da 100644
--- a/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
+++ b/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -96,7 +96,7 @@ CHIP_ERROR AppTask::Init()
             ;
     }
 
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
     if (ret != CHIP_NO_ERROR)
     {
         while (1)
diff --git a/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp b/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp
index 89b0e14eb59717..efb0ccdadeaaf5 100644
--- a/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp
+++ b/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp
@@ -28,6 +28,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
+#include <inet/EndPointStateOpenThread.h>
+
 #include "Keyboard.h"
 #include "LED.h"
 #include "LEDWidget.h"
@@ -69,6 +71,16 @@ CHIP_ERROR AppTask::StartAppTask()
     return err;
 }
 
+void LockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().LockThreadStack();
+}
+
+void UnlockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
+}
+
 CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -76,6 +88,11 @@ CHIP_ERROR AppTask::Init()
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = LockOpenThreadTask;
+    nativeParams.unlockCb              = UnlockOpenThreadTask;
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
     chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
@@ -434,3 +451,5 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
         K32W_LOG("Event received with no handler. Dropping event.");
     }
 }
+
+extern "C" void OTAIdleActivities(void) {}
diff --git a/examples/shell/nxp/k32w/k32w0/main/main.cpp b/examples/shell/nxp/k32w/k32w0/main/main.cpp
index 196623359aaffd..2cb58a3b34f660 100644
--- a/examples/shell/nxp/k32w/k32w0/main/main.cpp
+++ b/examples/shell/nxp/k32w/k32w0/main/main.cpp
@@ -50,7 +50,7 @@ extern InitFunc __init_array_start;
 extern InitFunc __init_array_end;
 
 /* needed for FreeRtos Heap 4 */
-uint8_t __attribute__((section(".heap"))) ucHeap[0xF000];
+uint8_t __attribute__((section(".heap"))) ucHeap[HEAP_SIZE];
 
 extern "C" unsigned int sleep(unsigned int seconds)
 {
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
index d0c19c463b3cdf..5a5c5da7c76e32 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -223,6 +223,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 server cluster FixedLabel = 64 {
@@ -377,8 +379,83 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
 server cluster LocalizationConfiguration = 43 {
@@ -524,6 +601,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -564,13 +642,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -591,10 +670,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -623,10 +698,13 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   info event SoftwareFault = 0 {
     SoftwareFaultStruct softwareFault = 0;
   }
@@ -755,8 +833,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
 
   server cluster Descriptor {
     callback attribute deviceList;
@@ -861,6 +939,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -922,6 +1001,15 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    ram      attribute featureMap;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster FixedLabel {
     callback attribute labelList;
     ram      attribute featureMap;
@@ -934,8 +1022,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type tempsensor = 770;
 
   server cluster Descriptor {
     callback attribute deviceList;
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
index 3a584a7f7d78df..eb56cfbf3dfac0 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -1919,7 +1919,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2049,6 +2058,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2469,7 +2494,7 @@
               "code": 0,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             }
           ],
@@ -2893,14 +2918,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -3094,6 +3111,190 @@
             }
           ]
         },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "client",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": [
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "client",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "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": "MaxGroupKeysPerFabric",
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Fixed Label",
           "code": 64,
@@ -4372,4 +4573,4 @@
       "deviceIdentifier": 770
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/examples/thermostat/linux/main.cpp b/examples/thermostat/linux/main.cpp
index e5d92f58448819..1816ec7bb9be9f 100644
--- a/examples/thermostat/linux/main.cpp
+++ b/examples/thermostat/linux/main.cpp
@@ -42,20 +42,6 @@ bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * comm
     return true;
 }
 
-// MatterPreAttributeChangeCallback() is called for every cluster.
-// As of 8/17/21 cluster specific PreAttributeChangeCalbacks are not yet implemented.
-
-Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const ConcreteAttributePath & attributePath, uint8_t mask,
-                                                                     uint8_t type, uint16_t size, uint8_t * value)
-{
-    Protocols::InteractionModel::Status status = Protocols::InteractionModel::Status::Success;
-    if (attributePath.mClusterId == chip::app::Clusters::Thermostat::Id)
-    {
-        status = MatterThermostatClusterServerPreAttributeChangedCallback(attributePath, type, size, value);
-    }
-    return status;
-}
-
 void OnIdentifyStart(Identify *)
 {
     ChipLogProgress(Zcl, "OnIdentifyStart");
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index cc59feb3e0aea7..6dcea48abc753b 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -391,8 +391,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -761,6 +769,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -801,13 +810,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -828,10 +838,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -860,7 +866,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster Scenes = 5 {
@@ -972,12 +977,16 @@ server cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1099,20 +1108,10 @@ server cluster Thermostat = 513 {
     ThermostatScheduleTransition transitions[] = 3;
   }
 
-  response struct GetRelayStatusLogResponse = 1 {
-    INT16U timeOfDay = 0;
-    BITMAP8 relayStatus = 1;
-    INT16S localTemperature = 2;
-    INT8U humidityInPercentage = 3;
-    INT16S setpoint = 4;
-    INT16U unreadEntries = 5;
-  }
-
   command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
   command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
   command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
   command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
-  command GetRelayStatusLog(): GetRelayStatusLogResponse = 4;
 }
 
 server cluster ThreadNetworkDiagnostics = 53 {
@@ -1200,7 +1199,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1208,11 +1207,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1255,12 +1254,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1377,8 +1376,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -1500,6 +1499,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -1514,67 +1514,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -1651,8 +1651,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type thermostat = 769;
   binding cluster Identify;
 
   server cluster Identify {
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index d7b13ba55eb57c..5ea5c518e31326 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -2437,7 +2437,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2567,6 +2576,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2760,7 +2785,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2774,9 +2799,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2792,7 +2817,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -2808,7 +2833,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2824,7 +2849,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2840,7 +2865,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2856,7 +2881,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2904,7 +2929,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2920,7 +2945,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2936,7 +2961,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2952,7 +2977,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2968,7 +2993,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2984,7 +3009,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3000,7 +3025,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3016,7 +3041,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3032,7 +3057,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3048,7 +3073,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3064,7 +3089,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3080,7 +3105,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3096,7 +3121,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3112,7 +3137,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3128,7 +3153,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3144,7 +3169,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3160,7 +3185,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3176,7 +3201,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3192,7 +3217,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3208,7 +3233,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3224,7 +3249,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3240,7 +3265,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3256,7 +3281,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3272,7 +3297,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3288,7 +3313,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3304,7 +3329,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3320,7 +3345,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3336,7 +3361,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3352,7 +3377,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3368,7 +3393,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3384,7 +3409,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3400,7 +3425,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3416,7 +3441,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3432,7 +3457,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3448,7 +3473,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3464,7 +3489,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3480,7 +3505,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3496,7 +3521,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3512,7 +3537,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3528,7 +3553,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3544,7 +3569,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3560,7 +3585,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3576,7 +3601,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3592,7 +3617,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3608,7 +3633,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3624,7 +3649,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3640,7 +3665,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3656,7 +3681,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3672,7 +3697,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3688,7 +3713,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3702,7 +3727,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3720,7 +3745,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3734,7 +3759,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4612,14 +4637,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -5085,46 +5102,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetLogRecord",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetPINCode",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCode",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearPINCode",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllPINCodes",
-              "code": 8,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
             {
               "name": "SetWeekDaySchedule",
               "code": 11,
@@ -5196,54 +5173,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "SetUserType",
-              "code": 20,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetUserType",
-              "code": 21,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetRFIDCode",
-              "code": 22,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCode",
-              "code": 23,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearRFIDCode",
-              "code": 24,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllRFIDCodes",
-              "code": 25,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -5338,22 +5267,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -5435,139 +5348,11 @@
               "reportableChange": 0
             },
             {
-              "name": "DefaultConfigurationRegister",
-              "code": 39,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlDefaultConfigurationRegister",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "EnableLocalProgramming",
-              "code": 40,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x01",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "EnableOneTouchLocking",
-              "code": 41,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "EnableInsideStatusLED",
-              "code": 42,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "EnablePrivacyModeButton",
-              "code": 43,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "WrongCodeEntryLimit",
-              "code": 48,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "UserCodeTemporaryDisableTime",
-              "code": 49,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SendPINOverTheAir",
-              "code": 50,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RequirePINforRemoteOperation",
-              "code": 51,
+              "name": "DefaultConfigurationRegister",
+              "code": 39,
               "mfgCode": null,
               "side": "server",
-              "type": "boolean",
+              "type": "DlDefaultConfigurationRegister",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5579,128 +5364,128 @@
               "reportableChange": 0
             },
             {
-              "name": "AlarmMask",
-              "code": 64,
+              "name": "EnableLocalProgramming",
+              "code": 40,
               "mfgCode": null,
               "side": "server",
-              "type": "DlAlarmMask",
+              "type": "boolean",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
+              "name": "EnableOneTouchLocking",
+              "code": 41,
               "mfgCode": null,
               "side": "server",
-              "type": "DlKeypadOperationEventMask",
+              "type": "boolean",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
+              "name": "EnableInsideStatusLED",
+              "code": 42,
               "mfgCode": null,
               "side": "server",
-              "type": "DlRemoteOperationEventMask",
+              "type": "boolean",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "ManualOperationEventMask",
-              "code": 67,
+              "name": "EnablePrivacyModeButton",
+              "code": 43,
               "mfgCode": null,
               "side": "server",
-              "type": "DlManualOperationEventMask",
+              "type": "boolean",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
+              "name": "WrongCodeEntryLimit",
+              "code": 48,
               "mfgCode": null,
               "side": "server",
-              "type": "DlRFIDOperationEventMask",
+              "type": "int8u",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
+              "name": "UserCodeTemporaryDisableTime",
+              "code": 49,
               "mfgCode": null,
               "side": "server",
-              "type": "DlKeypadOperationEventMask",
+              "type": "int8u",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
+              "name": "SendPINOverTheAir",
+              "code": 50,
               "mfgCode": null,
               "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
+              "type": "boolean",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
+              "name": "RequirePINforRemoteOperation",
+              "code": 51,
               "mfgCode": null,
               "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
+              "type": "boolean",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0x00",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7224,7 +7009,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -7276,7 +7061,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -10035,46 +9820,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetLogRecord",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetPINCode",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCode",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearPINCode",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllPINCodes",
-              "code": 8,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
             {
               "name": "SetWeekDaySchedule",
               "code": 11,
@@ -10146,54 +9891,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "SetUserType",
-              "code": 20,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetUserType",
-              "code": 21,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetRFIDCode",
-              "code": 22,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCode",
-              "code": 23,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearRFIDCode",
-              "code": 24,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllRFIDCodes",
-              "code": 25,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -10288,22 +9985,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -10528,134 +10209,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -11429,14 +10982,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLog",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -11473,14 +11018,6 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLogResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -14553,7 +14090,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -14597,7 +14134,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -14974,4 +14511,4 @@
       "deviceIdentifier": 769
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/MatterIntentConstants.java b/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/MatterIntentConstants.java
index 4ee15e4a84c496..d5e95061b6f6c5 100644
--- a/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/MatterIntentConstants.java
+++ b/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/MatterIntentConstants.java
@@ -17,4 +17,7 @@ public class MatterIntentConstants {
 
   public static final String EXTRA_DIRECTIVE_RESPONSE_PENDING_INTENT =
       "EXTRA_DIRECTIVE_RESPONSE_PENDING_INTENT";
+
+  public static final String EXTRA_COMMAND_ID = "EXTRA_COMMAND_ID";
+  public static final String EXTRA_CLUSTER_ID = "EXTRA_CLUSTER_ID";
 }
diff --git a/examples/tv-app/android/App/content-app/src/main/AndroidManifest.xml b/examples/tv-app/android/App/content-app/src/main/AndroidManifest.xml
index 9ba74639750d1d..e9fa3b028f6f58 100644
--- a/examples/tv-app/android/App/content-app/src/main/AndroidManifest.xml
+++ b/examples/tv-app/android/App/content-app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:theme="@style/Theme.ContentApp">
         <meta-data android:name="com.matter.tv.app.api.clusters" android:resource="@raw/static_matter_clusters" />
         <meta-data android:name="com.matter.tv.app.api.vendor_name" android:value="CSA" />
-        <meta-data android:name="com.matter.tv.app.api.vendor_id" android:value="1234" />
+        <meta-data android:name="com.matter.tv.app.api.vendor_id" android:value="65521" />
         <meta-data android:name="com.matter.tv.app.api.product_id" android:value="5678" />
         <activity
             android:name="com.example.contentapp.MainActivity"
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
index a5c6a2c9d9807e..5ac11d4b741dae 100644
--- a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
@@ -23,12 +23,16 @@ public void onReceive(Context context, Intent intent) {
       case MatterIntentConstants.ACTION_MATTER_COMMAND:
         byte[] commandPayload =
             intent.getByteArrayExtra(MatterIntentConstants.EXTRA_COMMAND_PAYLOAD);
+        int commandId = intent.getIntExtra(MatterIntentConstants.EXTRA_COMMAND_ID, -1);
+        int clusterId = intent.getIntExtra(MatterIntentConstants.EXTRA_CLUSTER_ID, -1);
         Log.d(
             TAG,
             new StringBuilder()
-                .append("Received matter command: ")
-                .append(intent.getAction())
-                .append(". Payload : ")
+                .append("Received matter command ")
+                .append(commandId)
+                .append(" on cluster ")
+                .append(clusterId)
+                .append(" with payload : ")
                 .append(new String(commandPayload))
                 .toString());
 
@@ -38,7 +42,10 @@ public void onReceive(Context context, Intent intent) {
         if (pendingIntent != null) {
           final Intent responseIntent =
               new Intent()
-                  .putExtra(MatterIntentConstants.EXTRA_RESPONSE_PAYLOAD, "Success".getBytes());
+                  .putExtra(
+                      MatterIntentConstants.EXTRA_RESPONSE_PAYLOAD,
+                      "{\"value\":{\"0\":1, \"1\":\"custom response from content app\"}}"
+                          .getBytes());
           try {
             pendingIntent.send(context, 0, responseIntent);
           } catch (final PendingIntent.CanceledException ex) {
diff --git a/examples/tv-app/android/App/content-app/src/main/res/raw/static_matter_clusters b/examples/tv-app/android/App/content-app/src/main/res/raw/static_matter_clusters
index 626a145b863f7a..57c28acf0dddb1 100644
--- a/examples/tv-app/android/App/content-app/src/main/res/raw/static_matter_clusters
+++ b/examples/tv-app/android/App/content-app/src/main/res/raw/static_matter_clusters
@@ -2,15 +2,23 @@
   "clusters": [
     {
       "identifier": 1289,
-      "features": ["NV", "LK", "NK"]
+      "features": [
+        "NV",
+        "LK",
+        "NK"
+      ]
     },
     {
       "identifier": 1290,
-      "features": ["CS"],
+      "features": [
+        "CS"
+      ]
     },
     {
       "identifier": 1286,
-      "features": ["AS"],
+      "features": [
+        "AS"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml b/examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml
index 1d1445480beab7..cfa74283d71759 100644
--- a/examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java
index fbeed33502a439..2fb375dbed5c93 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java
@@ -7,6 +7,7 @@
 import com.matter.tv.server.fragments.ContentAppFragment;
 import com.matter.tv.server.fragments.QrCodeFragment;
 import com.matter.tv.server.fragments.TerminalFragment;
+import com.matter.tv.server.service.MatterServant;
 import java.util.LinkedHashMap;
 
 public class MainActivity extends AppCompatActivity {
@@ -18,13 +19,13 @@ public class MainActivity extends AppCompatActivity {
         Fragment selectedFragment = null;
         switch (item.getItemId()) {
           case R.id.content_app:
-            selectedFragment = new ContentAppFragment();
+            selectedFragment = ContentAppFragment.newInstance();
             break;
           case R.id.qr_code:
-            selectedFragment = new QrCodeFragment();
+            selectedFragment = QrCodeFragment.newInstance();
             break;
           case R.id.terminal:
-            selectedFragment = new TerminalFragment();
+            selectedFragment = TerminalFragment.newInstance();
             break;
         }
 
@@ -40,6 +41,10 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
 
+    // MainActivity is needed to launch dialog prompt
+    // in UserPrompter
+    MatterServant.get().setActivity(this);
+
     BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation);
     bottomNavigationView.setOnItemSelectedListener(navListener);
 
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
new file mode 100644
index 00000000000000..2e9c36a3dafb81
--- /dev/null
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
@@ -0,0 +1,141 @@
+package com.matter.tv.server;
+
+import static androidx.core.content.ContextCompat.getSystemService;
+
+import android.app.Activity;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.os.Build;
+import android.util.Log;
+import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.NotificationCompat;
+import com.tcl.chip.tvapp.UserPrompter;
+import com.tcl.chip.tvapp.UserPrompterResolver;
+
+public class MatterCommissioningPrompter extends UserPrompterResolver implements UserPrompter {
+
+  private Activity activity;
+  private NotificationManager notificationManager;
+  private final String CHANNEL_ID = "MatterCommissioningPrompter.CHANNEL";
+  private final int SUCCESS_ID = 0;
+  private final int FAIL_ID = 1;
+
+  public MatterCommissioningPrompter(Activity activity) {
+    this.activity = activity;
+    this.createNotificationChannel();
+  }
+
+  public void promptForCommissionOkPermission(
+      int vendorId, int productId, String commissioneeName) {
+    // TODO: find app by vendorId and productId
+    Log.d(
+        TAG,
+        "Received prompt for OK permission vendor id:"
+            + vendorId
+            + " productId:"
+            + productId
+            + ". Commissionee: "
+            + commissioneeName);
+    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+
+    builder
+        .setMessage(commissioneeName + " is requesting permission to cast to this device, approve?")
+        .setTitle("Allow access to " + commissioneeName)
+        .setPositiveButton(
+            "Ok",
+            (dialog, which) -> {
+              OnPromptAccepted();
+            })
+        .setNegativeButton(
+            "Cancel",
+            (dialog, which) -> {
+              OnPromptDeclined();
+            })
+        .create()
+        .show();
+  }
+
+  @Override
+  public void promptForCommissionPinCode(int vendorId, int productId, String commissioneeName) {
+    // TODO: find app by vendorId and productId
+    Log.d(
+        TAG,
+        "Received prompt for PIN code vendor id:"
+            + vendorId
+            + " productId:"
+            + productId
+            + ". Commissionee: "
+            + commissioneeName);
+    EditText editText = new EditText(activity);
+    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+
+    builder
+        .setMessage("Please enter PIN displayed in casting app.")
+        .setTitle("Allow access to " + commissioneeName)
+        .setView(editText)
+        .setPositiveButton(
+            "Ok",
+            (dialog, which) -> {
+              String pinCode = editText.getText().toString();
+              OnPinCodeEntered(Integer.parseInt(pinCode));
+            })
+        .setNegativeButton(
+            "Cancel",
+            (dialog, which) -> {
+              OnPinCodeDeclined();
+            })
+        .create()
+        .show();
+  }
+
+  public void promptCommissioningSucceeded(int vendorId, int productId, String commissioneeName) {
+    Log.d(
+        TAG,
+        "Received prompt for success vendor id:"
+            + vendorId
+            + " productId:"
+            + productId
+            + ". Commissionee: "
+            + commissioneeName);
+    NotificationCompat.Builder builder =
+        new NotificationCompat.Builder(activity, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_baseline_check_24)
+            .setContentTitle("Connection Complete")
+            .setContentText(
+                "Success. "
+                    + commissioneeName
+                    + " can now cast to this device. Visit settings to manage access control for casting.")
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT);
+
+    notificationManager.notify(SUCCESS_ID, builder.build());
+  }
+
+  public void promptCommissioningFailed(String commissioneeName, String error) {
+    Log.d(TAG, "Received prompt for failure Commissionee: " + commissioneeName);
+    NotificationCompat.Builder builder =
+        new NotificationCompat.Builder(activity, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_baseline_clear_24)
+            .setContentTitle("Connection Failed")
+            .setContentText("Failed. " + commissioneeName + " experienced error: " + error + ".")
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT);
+
+    notificationManager.notify(FAIL_ID, builder.build());
+  }
+
+  private void createNotificationChannel() {
+    // Create the NotificationChannel, but only on API 26+ because
+    // the NotificationChannel class is new and not in the support library
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      CharSequence name = "MatterPromptNotificationChannel";
+      String description = "Matter Channel for sending notifications";
+      int importance = NotificationManager.IMPORTANCE_DEFAULT;
+      NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
+      channel.setDescription(description);
+      // Register the channel with the system; you can't change the importance
+      // or other notification behaviors after this
+      this.notificationManager = getSystemService(activity, NotificationManager.class);
+      notificationManager.createNotificationChannel(channel);
+    }
+  }
+}
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java
index 89b8804af3677d..c99045fc3ddc28 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java
@@ -40,12 +40,9 @@ public ContentAppFragment() {
    * Use this factory method to create a new instance of this fragment using the provided
    * parameters.
    *
-   * @param param1 Parameter 1.
-   * @param param2 Parameter 2.
    * @return A new instance of fragment SettingsFragment.
    */
-  // TODO: Rename and change types and number of parameters
-  public static ContentAppFragment newInstance(String param1, String param2) {
+  public static ContentAppFragment newInstance() {
     ContentAppFragment fragment = new ContentAppFragment();
     Bundle args = new Bundle();
     fragment.setArguments(args);
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java
index 8ab6e03a0fa542..04b17bd322e955 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java
@@ -35,12 +35,9 @@ public QrCodeFragment() {
    * Use this factory method to create a new instance of this fragment using the provided
    * parameters.
    *
-   * @param param1 Parameter 1.
-   * @param param2 Parameter 2.
    * @return A new instance of fragment QrCodeFragment.
    */
-  // TODO: Rename and change types and number of parameters
-  public static QrCodeFragment newInstance(String param1, String param2) {
+  public static QrCodeFragment newInstance() {
     QrCodeFragment fragment = new QrCodeFragment();
     Bundle args = new Bundle();
     fragment.setArguments(args);
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/TerminalFragment.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/TerminalFragment.java
index 2962e5ce04c890..24045ce6f8c46f 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/TerminalFragment.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/TerminalFragment.java
@@ -25,12 +25,9 @@ public TerminalFragment() {
    * Use this factory method to create a new instance of this fragment using the provided
    * parameters.
    *
-   * @param param1 Parameter 1.
-   * @param param2 Parameter 2.
    * @return A new instance of fragment CommssionerFragment.
    */
-  // TODO: Rename and change types and number of parameters
-  public static TerminalFragment newInstance(String param1, String param2) {
+  public static TerminalFragment newInstance() {
     TerminalFragment fragment = new TerminalFragment();
     Bundle args = new Bundle();
     fragment.setArguments(args);
@@ -63,10 +60,7 @@ public void onResume() {
 
               AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
-              builder.setMessage(message).setTitle("Command response:");
-
-              AlertDialog dialog = builder.create();
-              dialog.show();
+              builder.setMessage(message).setTitle("Response").create().show();
             });
   }
 }
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/handlers/ContentAppEndpointManagerImpl.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/handlers/ContentAppEndpointManagerImpl.java
index 035e7cd84e8c44..56575545883a32 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/handlers/ContentAppEndpointManagerImpl.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/handlers/ContentAppEndpointManagerImpl.java
@@ -16,14 +16,15 @@ public ContentAppEndpointManagerImpl(Context context) {
     this.context = context;
   }
 
-  public String sendCommand(int endpointId, String commandPayload) {
+  public String sendCommand(int endpointId, int clusterId, int commandId, String commandPayload) {
     Log.d(TAG, "Received a command for endpointId " + endpointId + ". Message " + commandPayload);
     for (ContentApp app :
         ContentAppDiscoveryService.getReceiverInstance().getDiscoveredContentApps().values()) {
       if (app.getEndpointId() == endpointId) {
         Log.d(
             TAG, "Sending a command for endpointId " + endpointId + ". Message " + commandPayload);
-        ContentAppAgentService.sendCommand(context, app.getAppName(), commandPayload);
+        return ContentAppAgentService.sendCommand(
+            context, app.getAppName(), clusterId, commandId, commandPayload);
       }
     }
     return "Success";
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java
index b1799990f99575..ccc72e4a9221b2 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java
@@ -11,6 +11,7 @@
 import androidx.annotation.Nullable;
 import com.matter.tv.app.api.IMatterAppAgent;
 import com.matter.tv.app.api.MatterIntentConstants;
+import java.util.concurrent.TimeUnit;
 
 public class ContentAppAgentService extends Service {
 
@@ -20,6 +21,8 @@ public class ContentAppAgentService extends Service {
   public static final String EXTRA_RESPONSE_RECEIVING_PACKAGE = "EXTRA_RESPONSE_RECEIVING_PACKAGE";
   public static final String EXTRA_RESPONSE_ID = "EXTRA_RESPONSE_ID";
 
+  private static ResponseRegistry responseRegistry = new ResponseRegistry();
+
   private final IBinder appAgentBinder =
       new IMatterAppAgent.Stub() {
         @Override
@@ -51,23 +54,34 @@ public IBinder onBind(final Intent intent) {
     return null;
   }
 
-  public static void sendCommand(Context context, String packageName, String payload) {
+  public static String sendCommand(
+      Context context, String packageName, int clusterId, int commandId, String payload) {
     Intent in = new Intent(MatterIntentConstants.ACTION_MATTER_COMMAND);
     Bundle extras = new Bundle();
     extras.putByteArray(MatterIntentConstants.EXTRA_COMMAND_PAYLOAD, payload.getBytes());
+    extras.putInt(MatterIntentConstants.EXTRA_COMMAND_ID, commandId);
+    extras.putInt(MatterIntentConstants.EXTRA_CLUSTER_ID, clusterId);
     in.putExtras(extras);
     in.setPackage(packageName);
     int flags = Intent.FLAG_INCLUDE_STOPPED_PACKAGES;
     flags |= Intent.FLAG_RECEIVER_FOREGROUND;
     in.setFlags(flags);
+    int messageId = responseRegistry.getNextMessageCounter();
     in.putExtra(
         MatterIntentConstants.EXTRA_DIRECTIVE_RESPONSE_PENDING_INTENT,
-        getPendingIntentForResponse(context, packageName, "0"));
+        getPendingIntentForResponse(context, packageName, messageId));
     context.sendBroadcast(in);
+    responseRegistry.waitForMessage(messageId, 10, TimeUnit.SECONDS);
+    String response = responseRegistry.readAndRemoveResponse(messageId);
+    if (response == null) {
+      response = "";
+    }
+    Log.d(TAG, "Response " + response + " being returned for message " + messageId);
+    return response;
   }
 
   private static PendingIntent getPendingIntentForResponse(
-      final Context context, final String targetPackage, final String responseId) {
+      final Context context, final String targetPackage, final int responseId) {
     Intent ackBackIntent = new Intent(ACTION_MATTER_RESPONSE);
     ackBackIntent.setClass(context, ContentAppAgentService.class);
     ackBackIntent.putExtra(EXTRA_RESPONSE_RECEIVING_PACKAGE, targetPackage);
@@ -78,16 +92,13 @@ private static PendingIntent getPendingIntentForResponse(
 
   @Override
   public int onStartCommand(final Intent intent, final int flags, final int startId) {
-    Log.d(TAG, "onStartCommand");
-
     if (intent != null && ACTION_MATTER_RESPONSE.equals(intent.getAction())) {
-      Log.d(
-          TAG,
-          "Command response "
-              + new String(intent.getByteArrayExtra(MatterIntentConstants.EXTRA_RESPONSE_PAYLOAD)));
-      // Send the response back to the client.
+      String response =
+          new String(intent.getByteArrayExtra(MatterIntentConstants.EXTRA_RESPONSE_PAYLOAD));
+      int messageId = intent.getIntExtra(EXTRA_RESPONSE_ID, Integer.MAX_VALUE);
+      Log.d(TAG, "Response " + response + " received for message " + messageId);
+      responseRegistry.receivedMessageResponse(messageId, response);
     }
-
     return START_NOT_STICKY;
   }
 }
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
index 574aadb0313ca4..bd11cb5c525d8f 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
@@ -17,6 +17,7 @@
  */
 package com.matter.tv.server.service;
 
+import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
@@ -25,15 +26,18 @@
 import chip.platform.AndroidChipPlatform;
 import chip.platform.ChipMdnsCallbackImpl;
 import chip.platform.DiagnosticDataProviderImpl;
+import chip.platform.NsdManagerServiceBrowser;
 import chip.platform.NsdManagerServiceResolver;
 import chip.platform.PreferencesConfigurationManager;
 import chip.platform.PreferencesKeyValueStoreManager;
+import com.matter.tv.server.MatterCommissioningPrompter;
 import com.matter.tv.server.handlers.ContentAppEndpointManagerImpl;
 import com.matter.tv.server.model.ContentApp;
 import com.tcl.chip.tvapp.ChannelManagerStub;
 import com.tcl.chip.tvapp.Clusters;
 import com.tcl.chip.tvapp.ContentLaunchManagerStub;
 import com.tcl.chip.tvapp.DACProviderStub;
+import com.tcl.chip.tvapp.DeviceEventProvider;
 import com.tcl.chip.tvapp.KeypadInputManagerStub;
 import com.tcl.chip.tvapp.LevelManagerStub;
 import com.tcl.chip.tvapp.LowPowerManagerStub;
@@ -65,6 +69,7 @@ public static MatterServant get() {
   }
 
   private Context context;
+  private Activity activity;
 
   public void init(@NonNull Context context) {
 
@@ -112,7 +117,15 @@ public void init(@NonNull Context context) {
               }
             });
     mTvApp.setDACProvider(new DACProviderStub());
-
+    mTvApp.setUserPrompter(new MatterCommissioningPrompter(activity));
+
+    mTvApp.setChipDeviceEventProvider(
+        new DeviceEventProvider() {
+          @Override
+          public void onCommissioningComplete() {
+            Log.d("lz", "onCommissioningComplete: ");
+          }
+        });
     Context applicationContext = context.getApplicationContext();
     AndroidChipPlatform chipPlatform =
         new AndroidChipPlatform(
@@ -120,6 +133,7 @@ public void init(@NonNull Context context) {
             new PreferencesKeyValueStoreManager(applicationContext),
             new PreferencesConfigurationManager(applicationContext),
             new NsdManagerServiceResolver(applicationContext),
+            new NsdManagerServiceBrowser(applicationContext),
             new ChipMdnsCallbackImpl(),
             new DiagnosticDataProviderImpl(applicationContext));
 
@@ -131,7 +145,7 @@ public void init(@NonNull Context context) {
     chipAppServer = new ChipAppServer();
     chipAppServer.startApp();
 
-    mTvApp.postServerInit();
+    mTvApp.postServerInit(new ContentAppEndpointManagerImpl(context));
   }
 
   public void restart() {
@@ -144,6 +158,10 @@ public void toggleOnOff() {
     mIsOn = !mIsOn;
   }
 
+  public void setActivity(Activity activity) {
+    this.activity = activity;
+  }
+
   public void sendCustomCommand(String customCommand) {
     Log.i(MatterServant.class.getName(), customCommand);
     // TODO: insert logic ot send custom command here
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ResponseRegistry.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ResponseRegistry.java
new file mode 100644
index 00000000000000..9c1ebc0c0b6031
--- /dev/null
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ResponseRegistry.java
@@ -0,0 +1,58 @@
+package com.matter.tv.server.service;
+
+import android.util.Log;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ResponseRegistry {
+
+  private static final String TAG = "ResponseRegistry";
+
+  private AtomicInteger messageCounter = new AtomicInteger();
+
+  private Map<Integer, String> responses = new ConcurrentHashMap<>();
+
+  private Map<Integer, CountDownLatch> latches = new ConcurrentHashMap<>();
+
+  public int getNextMessageCounter() {
+    int counter = messageCounter.incrementAndGet();
+    // MAX_VALUE used for error scenarios
+    if (counter == Integer.MAX_VALUE) {
+      counter = messageCounter.incrementAndGet();
+    }
+    latches.put(counter, new CountDownLatch(1));
+    return counter;
+  }
+
+  public void waitForMessage(int counter, long timeout, TimeUnit unit) {
+    CountDownLatch latch = latches.get(counter);
+    if (latch == null) {
+      return;
+    }
+    try {
+      if (!latch.await(timeout, unit)) {
+        Log.i(TAG, "Timed out while waiting for response for message " + counter);
+      }
+    } catch (InterruptedException e) {
+      Log.i(TAG, "Interrupted while waiting for response for message " + counter);
+    }
+  }
+
+  public void receivedMessageResponse(int counter, String response) {
+    CountDownLatch latch = latches.remove(counter);
+    if (latch == null) {
+      // no point adding response to memory if no one is going to read it.
+      return;
+    }
+    responses.put(counter, response);
+    latch.countDown();
+  }
+
+  public String readAndRemoveResponse(int counter) {
+    // caller should manage null values
+    return responses.remove(counter);
+  }
+}
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_baseline_check_24.xml b/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_baseline_check_24.xml
new file mode 100644
index 00000000000000..0432fa69bb7908
--- /dev/null
+++ b/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_baseline_check_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_baseline_clear_24.xml b/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_baseline_clear_24.xml
new file mode 100644
index 00000000000000..16d6d37dd9f765
--- /dev/null
+++ b/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_baseline_clear_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/examples/tv-app/android/BUILD.gn b/examples/tv-app/android/BUILD.gn
index 5267c38cb0f217..e478c946d3b9d7 100644
--- a/examples/tv-app/android/BUILD.gn
+++ b/examples/tv-app/android/BUILD.gn
@@ -48,6 +48,8 @@ shared_library("jni") {
     "java/ContentAppCommandDelegate.h",
     "java/ContentLauncherManager.cpp",
     "java/ContentLauncherManager.h",
+    "java/DeviceCallbacks.cpp",
+    "java/DeviceCallbacks.h",
     "java/JNIDACProvider.cpp",
     "java/JNIDACProvider.h",
     "java/KeypadInputManager.cpp",
@@ -60,6 +62,10 @@ shared_library("jni") {
     "java/MediaInputManager.h",
     "java/MediaPlaybackManager.cpp",
     "java/MediaPlaybackManager.h",
+    "java/MyUserPrompter-JNI.cpp",
+    "java/MyUserPrompter-JNI.h",
+    "java/MyUserPrompterResolver-JNI.cpp",
+    "java/MyUserPrompterResolver-JNI.h",
     "java/OnOffManager.cpp",
     "java/OnOffManager.h",
     "java/TVApp-JNI.cpp",
@@ -72,6 +78,7 @@ shared_library("jni") {
     "${chip_root}/examples/tv-app/tv-common",
     "${chip_root}/src/app/server/java:jni",
     "${chip_root}/src/lib",
+    "${chip_root}/src/lib/support/jsontlv",
     "${chip_root}/third_party/inipp",
   ]
 
@@ -102,7 +109,6 @@ android_library("java") {
     "java/src/com/tcl/chip/tvapp/ChannelManagerStub.java",
     "java/src/com/tcl/chip/tvapp/Clusters.java",
     "java/src/com/tcl/chip/tvapp/ContentAppEndpointManager.java",
-    "java/src/com/tcl/chip/tvapp/ContentAppEndpointManagerStub.java",
     "java/src/com/tcl/chip/tvapp/ContentLaunchBrandingInformation.java",
     "java/src/com/tcl/chip/tvapp/ContentLaunchManager.java",
     "java/src/com/tcl/chip/tvapp/ContentLaunchManagerStub.java",
@@ -110,6 +116,7 @@ android_library("java") {
     "java/src/com/tcl/chip/tvapp/ContentLaunchSearchParameter.java",
     "java/src/com/tcl/chip/tvapp/DACProvider.java",
     "java/src/com/tcl/chip/tvapp/DACProviderStub.java",
+    "java/src/com/tcl/chip/tvapp/DeviceEventProvider.java",
     "java/src/com/tcl/chip/tvapp/KeypadInputManager.java",
     "java/src/com/tcl/chip/tvapp/KeypadInputManagerStub.java",
     "java/src/com/tcl/chip/tvapp/LevelManager.java",
@@ -126,6 +133,8 @@ android_library("java") {
     "java/src/com/tcl/chip/tvapp/OnOffManagerStub.java",
     "java/src/com/tcl/chip/tvapp/TvApp.java",
     "java/src/com/tcl/chip/tvapp/TvAppCallback.java",
+    "java/src/com/tcl/chip/tvapp/UserPrompter.java",
+    "java/src/com/tcl/chip/tvapp/UserPrompterResolver.java",
     "java/src/com/tcl/chip/tvapp/WakeOnLanManager.java",
     "java/src/com/tcl/chip/tvapp/WakeOnLanManagerStub.java",
   ]
diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp
index e1bed97c35296c..a0564d2efc3832 100644
--- a/examples/tv-app/android/java/AppImpl.cpp
+++ b/examples/tv-app/android/java/AppImpl.cpp
@@ -21,11 +21,13 @@
 
 #include "AppImpl.h"
 
+#include "ContentAppCommandDelegate.h"
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/cluster-id.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
+#include <app/InteractionModelEngine.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
 #include <app/util/af.h>
@@ -46,60 +48,6 @@
 using namespace chip;
 using namespace chip::AppPlatform;
 
-#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
-class MyUserPrompter : public UserPrompter
-{
-    // tv should override this with a dialog prompt
-    inline void PromptForCommissionOKPermission(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override
-    {
-        /*
-         *   Called to prompt the user for consent to allow the given commissioneeName/vendorId/productId to be commissioned.
-         * For example "[commissioneeName] is requesting permission to cast to this TV, approve?"
-         *
-         * If user responds with OK then implementor should call CommissionerRespondOk();
-         * If user responds with Cancel then implementor should call CommissionerRespondCancel();
-         *
-         */
-        GetCommissionerDiscoveryController()->Ok();
-
-        /**
-         * For Demo: Launch Prime Video App
-         */
-        return;
-    }
-
-    // tv should override this with a dialog prompt
-    inline void PromptForCommissionPincode(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override
-    {
-        /*
-         *   Called to prompt the user to enter the setup pincode displayed by the given commissioneeName/vendorId/productId to be
-         * commissioned. For example "Please enter pin displayed in casting app."
-         *
-         * If user enters with pin then implementor should call CommissionerRespondPincode(uint32_t pincode);
-         * If user responds with Cancel then implementor should call CommissionerRespondCancel();
-         */
-
-        GetCommissionerDiscoveryController()->CommissionWithPincode(20202021); // dummy pin code
-
-        /**
-         * For Demo: Launch Prime Video App
-         */
-        return;
-    }
-
-    // tv should override this with a dialog prompt
-    inline void PromptCommissioningSucceeded(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override
-    {
-        return;
-    }
-
-    // tv should override this with a dialog prompt
-    inline void PromptCommissioningFailed(const char * commissioneeName, CHIP_ERROR error) override { return; }
-};
-
-MyUserPrompter gMyUserPrompter;
-#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
-
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 class MyPincodeService : public PincodeService
 {
@@ -382,12 +330,12 @@ ContentApp * ContentAppFactoryImpl::LoadContentApp(const CatalogVendorApp & vend
     {
         auto & app = mContentApps.at(i);
 
-        ChipLogProgress(DeviceLayer, " Looking next=%s ", app.GetApplicationBasicDelegate()->GetCatalogVendorApp()->applicationId);
-        if (app.GetApplicationBasicDelegate()->GetCatalogVendorApp()->Matches(vendorApp))
+        ChipLogProgress(DeviceLayer, " Looking next=%s ", app->GetApplicationBasicDelegate()->GetCatalogVendorApp()->applicationId);
+        if (app->GetApplicationBasicDelegate()->GetCatalogVendorApp()->Matches(vendorApp))
         {
-            ContentAppPlatform::GetInstance().AddContentApp(&app, &contentAppEndpoint, Span<DataVersion>(gDataVersions[i]),
+            ContentAppPlatform::GetInstance().AddContentApp(app, &contentAppEndpoint, Span<DataVersion>(gDataVersions[i]),
                                                             Span<const EmberAfDeviceType>(gContentAppDeviceType));
-            return &app;
+            return app;
         }
     }
     ChipLogProgress(DeviceLayer, "LoadContentAppByAppId NOT FOUND catalogVendorId=%d applicationId=%s ", vendorApp.catalogVendorId,
@@ -396,13 +344,13 @@ ContentApp * ContentAppFactoryImpl::LoadContentApp(const CatalogVendorApp & vend
     return nullptr;
 }
 
-EndpointId ContentAppFactoryImpl::AddContentApp(ContentAppImpl & app)
+EndpointId ContentAppFactoryImpl::AddContentApp(ContentAppImpl * app)
 {
     DataVersion dataVersionBuf[ArraySize(contentAppClusters)];
-    EndpointId epId = ContentAppPlatform::GetInstance().AddContentApp(&app, &contentAppEndpoint, Span<DataVersion>(dataVersionBuf),
+    EndpointId epId = ContentAppPlatform::GetInstance().AddContentApp(app, &contentAppEndpoint, Span<DataVersion>(dataVersionBuf),
                                                                       Span<const EmberAfDeviceType>(gContentAppDeviceType));
     ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl AddContentApp endpoint returned %d. Endpoint set %d", epId,
-                    app.GetEndpointId());
+                    app->GetEndpointId());
     mContentApps.push_back(app);
     return epId;
 }
@@ -434,9 +382,9 @@ void ContentAppFactoryImpl::SendTestMessage(EndpointId epId, const char * messag
     ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl SendTestMessage called with message %s & endpointId %d", message, epId);
     for (size_t i = 0; i < mContentApps.size(); ++i)
     {
-        ContentAppImpl app = mContentApps.at(i);
-        ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl checking app with endpointId %d", app.ContentApp::GetEndpointId());
-        if (app.GetEndpointId() == epId)
+        ContentAppImpl * app = mContentApps.at(i);
+        ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl checking app with endpointId %d", app->GetEndpointId());
+        if (app->GetEndpointId() == epId)
         {
             ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl SendTestMessage endpoint found");
             app::ConcreteCommandPath commandPath(epId, app::Clusters::ContentLauncher::Id,
@@ -445,8 +393,8 @@ void ContentAppFactoryImpl::SendTestMessage(EndpointId epId, const char * messag
             app::CommandHandler commandHandler(&callback);
             CommandResponseHelper<LaunchResponseType> helper(&commandHandler, commandPath);
             chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type branding;
-            app.GetContentLauncherDelegate()->HandleLaunchUrl(helper, CharSpan::fromCharString(message),
-                                                              CharSpan::fromCharString("Temp Display"), branding);
+            app->GetContentLauncherDelegate()->HandleLaunchUrl(helper, CharSpan::fromCharString(message),
+                                                               CharSpan::fromCharString("Temp Display"), branding);
         }
     }
 }
@@ -456,19 +404,29 @@ void ContentAppFactoryImpl::SendTestMessage(EndpointId epId, const char * messag
 
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
-CHIP_ERROR InitVideoPlayerPlatform()
+CHIP_ERROR InitVideoPlayerPlatform(JNIMyUserPrompter * userPrompter, jobject contentAppEndpointManager)
 {
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
     ContentAppPlatform::GetInstance().SetupAppPlatform();
     ContentAppPlatform::GetInstance().SetContentAppFactory(&gFactory);
+
+    ChipLogProgress(AppServer, "Starting registration of command handler delegates");
+    for (size_t i = 0; i < ArraySize(contentAppClusters); i++)
+    {
+        ContentAppCommandDelegate * delegate =
+            new ContentAppCommandDelegate(contentAppEndpointManager, contentAppClusters[i].clusterId);
+        chip::app::InteractionModelEngine::GetInstance()->RegisterCommandHandler(delegate);
+        ChipLogProgress(AppServer, "Registered command handler delegate for cluster %d", contentAppClusters[i].clusterId);
+    }
+
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
     CommissionerDiscoveryController * cdc = GetCommissionerDiscoveryController();
-    if (cdc != nullptr)
+    if (cdc != nullptr && userPrompter != nullptr)
     {
         cdc->SetPincodeService(&gMyPincodeService);
-        cdc->SetUserPrompter(&gMyUserPrompter);
+        cdc->SetUserPrompter(userPrompter);
         cdc->SetPostCommissioningListener(&gMyPostCommissioningListener);
     }
 
@@ -496,13 +454,18 @@ CHIP_ERROR PreServerInit()
 EndpointId AddContentApp(const char * szVendorName, uint16_t vendorId, const char * szApplicationName, uint16_t productId,
                          const char * szApplicationVersion, jobject manager)
 {
-    ContentAppImpl app =
-        ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion, "34567890", manager);
+#if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+    ContentAppImpl * app =
+        new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion, "20202021", manager);
     ChipLogProgress(DeviceLayer, "AppImpl: AddContentApp vendorId=%d applicationName=%s ", vendorId, szApplicationName);
     return gFactory.AddContentApp(app);
+#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+    return 0;
 }
 
 void SendTestMessage(EndpointId epID, const char * message)
 {
+#if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
     gFactory.SendTestMessage(epID, message);
+#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 }
diff --git a/examples/tv-app/android/java/AppImpl.h b/examples/tv-app/android/java/AppImpl.h
index c1631bd80673fa..98a6d61798bc07 100644
--- a/examples/tv-app/android/java/AppImpl.h
+++ b/examples/tv-app/android/java/AppImpl.h
@@ -42,6 +42,7 @@
 #include "ContentAppCommandDelegate.h"
 #include "KeypadInputManager.h"
 #include "MediaPlaybackManager.h"
+#include "MyUserPrompter-JNI.h"
 #include <app/clusters/account-login-server/account-login-delegate.h>
 #include <app/clusters/application-basic-server/application-basic-delegate.h>
 #include <app/clusters/application-launcher-server/application-launcher-delegate.h>
@@ -51,7 +52,7 @@
 #include <app/clusters/media-playback-server/media-playback-delegate.h>
 #include <app/clusters/target-navigator-server/target-navigator-delegate.h>
 
-CHIP_ERROR InitVideoPlayerPlatform();
+CHIP_ERROR InitVideoPlayerPlatform(JNIMyUserPrompter * userPrompter, jobject contentAppEndpointManager);
 CHIP_ERROR PreServerInit();
 EndpointId AddContentApp(const char * szVendorName, uint16_t vendorId, const char * szApplicationName, uint16_t productId,
                          const char * szApplicationVersion, jobject manager);
@@ -130,7 +131,7 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
     // Lookup ContentApp for this catalog id / app id and load it
     ContentApp * LoadContentApp(const CatalogVendorApp & vendorApp) override;
 
-    EndpointId AddContentApp(ContentAppImpl & app);
+    EndpointId AddContentApp(ContentAppImpl * app);
 
     void SendTestMessage(EndpointId epID, const char * message);
 
@@ -142,11 +143,11 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
     CHIP_ERROR ConvertToPlatformCatalogVendorApp(const CatalogVendorApp & sourceApp, CatalogVendorApp * destinationApp) override;
 
 protected:
-    std::vector<ContentAppImpl> mContentApps{
-        ContentAppImpl("Vendor1", 1, "exampleid", 11, "Version1", "34567890", nullptr),
-        ContentAppImpl("Vendor2", 65521, "exampleString", 32768, "Version2", "20202021", nullptr),
-        ContentAppImpl("Vendor3", 9050, "App3", 22, "Version3", "20202021", nullptr),
-        ContentAppImpl("TestSuiteVendor", 1111, "applicationId", 22, "v2", "20202021", nullptr)
+    std::vector<ContentAppImpl *> mContentApps{
+        new ContentAppImpl("Vendor1", 1, "exampleid", 11, "Version1", "20202021", nullptr),
+        new ContentAppImpl("Vendor2", 65520, "exampleString", 32768, "Version2", "20202021", nullptr),
+        new ContentAppImpl("Vendor3", 9050, "App3", 22, "Version3", "20202021", nullptr),
+        new ContentAppImpl("TestSuiteVendor", 1111, "applicationId", 22, "v2", "20202021", nullptr)
     };
 };
 
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
index a4d23881b6be3f..1cc25f57ee6098 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -22,14 +22,21 @@
 
 #include "ContentAppCommandDelegate.h"
 
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/CommandHandlerInterface.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
+#include <lib/support/jsontlv/TlvJson.h>
+#include <zap-generated/endpoint_config.h>
 
 namespace chip {
 namespace AppPlatform {
 
+using CommandHandlerInterface = chip::app::CommandHandlerInterface;
+using LaunchResponseType      = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
+
 const char * ContentAppCommandDelegate::sendCommand(chip::EndpointId epID, std::string commandPayload)
 {
     // to support the hardcoded sample apps.
@@ -55,5 +62,91 @@ const char * ContentAppCommandDelegate::sendCommand(chip::EndpointId epID, std::
     return ret;
 }
 
+void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerContext & handlerContext)
+{
+    if (handlerContext.mRequestPath.mEndpointId >= FIXED_ENDPOINT_COUNT)
+    {
+        TLV::TLVReader readerForJson;
+        readerForJson.Init(handlerContext.mPayload);
+
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        Json::Value json;
+        err = TlvToJson(readerForJson, json);
+        if (err != CHIP_NO_ERROR)
+        {
+            // TODO : Add an interface to let the apps know a message came but there was a serialization error.
+            handlerContext.SetCommandNotHandled();
+            return;
+        }
+
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        UtfString jsonString(env, JsonToString(json).c_str());
+
+        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand send command being called with payload %s",
+                        JsonToString(json).c_str());
+
+        jstring resp = (jstring) env->CallObjectMethod(
+            mContentAppEndpointManager, mSendCommandMethod, static_cast<jint>(handlerContext.mRequestPath.mEndpointId),
+            static_cast<jint>(handlerContext.mRequestPath.mClusterId), static_cast<jint>(handlerContext.mRequestPath.mCommandId),
+            jsonString.jniValue());
+        if (env->ExceptionCheck())
+        {
+            ChipLogError(Zcl, "Java exception in ContentAppCommandDelegate::sendCommand");
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+            FormatResponseData(handlerContext, "{\"value\":{}}");
+            return;
+        }
+        const char * respStr = env->GetStringUTFChars(resp, 0);
+        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand got response %s", respStr);
+        FormatResponseData(handlerContext, respStr);
+    }
+    else
+    {
+        handlerContext.SetCommandNotHandled();
+    }
+}
+
+void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::HandlerContext & handlerContext, const char * response)
+{
+    Json::Reader reader;
+    Json::Value resJson;
+    reader.parse(response, resJson);
+    Json::Value value = resJson["value"];
+
+    switch (handlerContext.mRequestPath.mClusterId)
+    {
+    case app::Clusters::ContentLauncher::Id: {
+        LaunchResponseType launchResponse;
+        if (value["0"].empty())
+        {
+            launchResponse.status = chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum::kAuthFailed;
+        }
+        else
+        {
+            launchResponse.status = static_cast<chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value["0"].asInt());
+            if (!value["1"].empty())
+            {
+                launchResponse.data = chip::MakeOptional(CharSpan::fromCharString(value["1"].asCString()));
+            }
+        }
+        handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, launchResponse);
+        handlerContext.SetCommandHandled();
+        break;
+    }
+
+    // case app::Clusters::TargetNavigator::Id:
+    //     break;
+
+    // case app::Clusters::MediaPlayback::Id:
+    //     break;
+
+    // case app::Clusters::AccountLogin::Id:
+    //     break;
+    default:
+        handlerContext.SetCommandNotHandled();
+    }
+}
+
 } // namespace AppPlatform
 } // namespace chip
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.h b/examples/tv-app/android/java/ContentAppCommandDelegate.h
index 2d45906c51049b..908b2e4d1cc0e9 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.h
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/CommandHandlerInterface.h>
 #include <jni.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/JniReferences.h>
@@ -29,10 +31,22 @@
 namespace chip {
 namespace AppPlatform {
 
-class ContentAppCommandDelegate
+using CommandHandlerInterface = chip::app::CommandHandlerInterface;
+
+class ContentAppCommandDelegate : public CommandHandlerInterface
 {
 public:
-    ContentAppCommandDelegate(jobject manager)
+    ContentAppCommandDelegate(jobject manager, ClusterId aClusterId) : CommandHandlerInterface(Optional<EndpointId>(), aClusterId)
+    {
+        if (manager == nullptr)
+        {
+            // To support the existing hardcoded sample apps.
+            return;
+        }
+        InitializeJNIObjects(manager);
+    };
+
+    ContentAppCommandDelegate(jobject manager) : CommandHandlerInterface(Optional<EndpointId>(), app::Clusters::ContentLauncher::Id)
     {
 
         if (manager == nullptr)
@@ -40,7 +54,16 @@ class ContentAppCommandDelegate
             // To support the existing hardcoded sample apps.
             return;
         }
+        InitializeJNIObjects(manager);
+    };
+
+    void InvokeCommand(CommandHandlerInterface::HandlerContext & handlerContext) override;
 
+    const char * sendCommand(chip::EndpointId epID, std::string commandPayload);
+
+private:
+    void InitializeJNIObjects(jobject manager)
+    {
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
         VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Failed to GetEnvForCurrentThread for ContentAppEndpointManager"));
 
@@ -53,17 +76,16 @@ class ContentAppCommandDelegate
                        ChipLogError(Zcl, "Failed to get ContentAppEndpointManager Java class"));
 
         mSendCommandMethod =
-            env->GetMethodID(ContentAppEndpointManagerClass, "sendCommand", "(ILjava/lang/String;)Ljava/lang/String;");
+            env->GetMethodID(ContentAppEndpointManagerClass, "sendCommand", "(IIILjava/lang/String;)Ljava/lang/String;");
         if (mSendCommandMethod == nullptr)
         {
             ChipLogError(Zcl, "Failed to access ContentAppEndpointManager 'sendCommand' method");
             env->ExceptionClear();
         }
-    };
+    }
 
-    const char * sendCommand(chip::EndpointId epID, std::string commandPayload);
+    void FormatResponseData(CommandHandlerInterface::HandlerContext & handlerContext, const char * response);
 
-private:
     jobject mContentAppEndpointManager = nullptr;
     jmethodID mSendCommandMethod       = nullptr;
 };
diff --git a/examples/tv-app/android/java/DeviceCallbacks.cpp b/examples/tv-app/android/java/DeviceCallbacks.cpp
new file mode 100644
index 00000000000000..3388d216c60d67
--- /dev/null
+++ b/examples/tv-app/android/java/DeviceCallbacks.cpp
@@ -0,0 +1,107 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ * @file DeviceCallbacks.cpp
+ *
+ * Implements all the callbacks to the application from the CHIP Stack
+ *
+ **/
+#include "DeviceCallbacks.h"
+
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <app/CommandHandler.h>
+#include <app/server/Dnssd.h>
+#include <app/util/af.h>
+#include <app/util/basic-types.h>
+#include <app/util/util.h>
+#include <jni.h>
+#include <lib/dnssd/Advertiser.h>
+#include <lib/support/JniReferences.h>
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::Logging;
+namespace {
+void OnPlatformEventWrapper(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
+{
+    DeviceCallbacks * commissionMgr = reinterpret_cast<DeviceCallbacks *>(arg);
+    commissionMgr->OnPlatformEvent(event);
+}
+} // namespace
+void DeviceCallbacks::NewManager(jobject manager)
+{
+    ChipLogProgress(AppServer, "TV Android App: set ChipDeviceEvent delegate");
+    DeviceCallbacks * mgr = new DeviceCallbacks();
+    PlatformMgr().AddEventHandler(OnPlatformEventWrapper, reinterpret_cast<intptr_t>(mgr));
+    mgr->InitializeWithObjects(manager);
+}
+
+void DeviceCallbacks::InitializeWithObjects(jobject provider)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    VerifyOrReturn(env != nullptr, ChipLogError(AppServer, "Failed to GetEnvForCurrentThread for DeviceEventProvider"));
+
+    mProvider = env->NewGlobalRef(provider);
+    VerifyOrReturn(mProvider != nullptr, ChipLogError(AppServer, "Failed to NewGlobalRef DeviceEventProvider"));
+    jclass deviceEventProviderCls = env->GetObjectClass(mProvider);
+    VerifyOrReturn(deviceEventProviderCls != nullptr, ChipLogError(AppServer, "Failed to get KeypadInputManager Java class"));
+
+    mCommissioningCompleteMethod = env->GetMethodID(deviceEventProviderCls, "onCommissioningComplete", "()V");
+    if (mCommissioningCompleteMethod == nullptr)
+    {
+        ChipLogError(AppServer, "Failed to access DeviceEventProvider 'onCommissioningComplete' method");
+        env->ExceptionClear();
+    }
+}
+
+void DeviceCallbacks::OnPlatformEvent(const ChipDeviceEvent * event)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kCommissioningComplete:
+        OnCommissioningComplete(event);
+        break;
+    case DeviceEventType::kSessionEstablished:
+        OnSessionEstablished(event);
+        break;
+    }
+}
+
+void DeviceCallbacks::OnSessionEstablished(const ChipDeviceEvent * event)
+{
+    if (event->SessionEstablished.IsCommissioner)
+    {
+        ChipLogProgress(AppServer, "Commissioner detected!");
+    }
+}
+void DeviceCallbacks::OnCommissioningComplete(const ChipDeviceEvent * event)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Failed to GetEnvForCurrentThread for DeviceEventProvider"));
+    env->CallVoidMethod(mProvider, mCommissioningCompleteMethod);
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(AppServer, "Java exception in DeviceEventProvider::onCommissioningComplete");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+}
diff --git a/examples/tv-app/android/java/DeviceCallbacks.h b/examples/tv-app/android/java/DeviceCallbacks.h
new file mode 100644
index 00000000000000..15c336a10a9156
--- /dev/null
+++ b/examples/tv-app/android/java/DeviceCallbacks.h
@@ -0,0 +1,35 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include "lib/support/logging/CHIPLogging.h"
+#include <jni.h>
+
+class DeviceCallbacks
+{
+
+public:
+    static void NewManager(jobject manager);
+    void OnPlatformEvent(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void InitializeWithObjects(jobject manager);
+
+private:
+    jobject mProvider                      = nullptr;
+    jmethodID mCommissioningCompleteMethod = nullptr;
+    void OnSessionEstablished(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnCommissioningComplete(const chip::DeviceLayer::ChipDeviceEvent * event);
+};
diff --git a/examples/tv-app/android/java/MyUserPrompter-JNI.cpp b/examples/tv-app/android/java/MyUserPrompter-JNI.cpp
new file mode 100644
index 00000000000000..29fff989fdff57
--- /dev/null
+++ b/examples/tv-app/android/java/MyUserPrompter-JNI.cpp
@@ -0,0 +1,223 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "MyUserPrompter-JNI.h"
+#include <jni.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPJNIError.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+
+using namespace chip;
+
+JNIMyUserPrompter::JNIMyUserPrompter(jobject provider)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Failed to GetEnvForCurrentThread for JNIMyUserPrompter"));
+
+    mJNIMyUserPrompterObject = env->NewGlobalRef(provider);
+    VerifyOrReturn(mJNIMyUserPrompterObject != nullptr, ChipLogError(Zcl, "Failed to NewGlobalRef JNIMyUserPrompter"));
+
+    jclass JNIMyUserPrompterClass = env->GetObjectClass(provider);
+    VerifyOrReturn(JNIMyUserPrompterClass != nullptr, ChipLogError(Zcl, "Failed to get JNIMyUserPrompter Java class"));
+
+    mPromptForCommissionOKPermissionMethod =
+        env->GetMethodID(JNIMyUserPrompterClass, "promptForCommissionOkPermission", "(IILjava/lang/String;)V");
+    if (mPromptForCommissionOKPermissionMethod == nullptr)
+    {
+        ChipLogError(Zcl, "Failed to access JNIMyUserPrompter 'promptForCommissionOkPermission' method");
+        env->ExceptionClear();
+    }
+
+    mPromptForCommissionPincodeMethod =
+        env->GetMethodID(JNIMyUserPrompterClass, "promptForCommissionPinCode", "(IILjava/lang/String;)V");
+    if (mPromptForCommissionPincodeMethod == nullptr)
+    {
+        ChipLogError(Zcl, "Failed to access JNIMyUserPrompter 'promptForCommissionPinCode' method");
+        env->ExceptionClear();
+    }
+
+    mPromptCommissioningSucceededMethod =
+        env->GetMethodID(JNIMyUserPrompterClass, "promptCommissioningSucceeded", "(IILjava/lang/String;)V");
+    if (mPromptCommissioningSucceededMethod == nullptr)
+    {
+        ChipLogError(Zcl, "Failed to access JNIMyUserPrompter 'promptCommissioningSucceeded' method");
+        env->ExceptionClear();
+    }
+
+    mPromptCommissioningFailedMethod =
+        env->GetMethodID(JNIMyUserPrompterClass, "promptCommissioningFailed", "(Ljava/lang/String;Ljava/lang/String;)V");
+    if (mPromptCommissioningFailedMethod == nullptr)
+    {
+        ChipLogError(Zcl, "Failed to access JNIMyUserPrompter 'promptCommissioningFailed' method");
+        env->ExceptionClear();
+    }
+}
+
+/*
+ *  Called to prompt the user for consent to allow the given commissioneeName/vendorId/productId to be commissioned.
+ * For example "[commissioneeName] is requesting permission to cast to this TV, approve?"
+ *
+ * If user responds with OK then implementor calls UserPrompterResolver.OnPromptAccepted;
+ * If user responds with Cancel then implementor calls calls UserPrompterResolver.OnPromptDeclined();
+ *
+ */
+void JNIMyUserPrompter::PromptForCommissionOKPermission(uint16_t vendorId, uint16_t productId, const char * commissioneeName)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    std::string stringCommissioneeName(commissioneeName);
+
+    VerifyOrExit(mJNIMyUserPrompterObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(mPromptForCommissionOKPermissionMethod != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+    {
+        UtfString jniCommissioneeName(env, stringCommissioneeName.data());
+        env->ExceptionClear();
+        env->CallVoidMethod(mJNIMyUserPrompterObject, mPromptForCommissionOKPermissionMethod, static_cast<jint>(vendorId),
+                            static_cast<jint>(productId), jniCommissioneeName.jniValue());
+        if (env->ExceptionCheck())
+        {
+            ChipLogError(DeviceLayer, "Java exception in PromptForCommissionOKPermission");
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+            err = CHIP_ERROR_INCORRECT_STATE;
+            goto exit;
+        }
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "PromptForCommissionOKPermission error: %s", err.AsString());
+    }
+}
+
+/*
+ *  Called to prompt the user to enter the setup pincode displayed by the given commissioneeName/vendorId/productId to be
+ * commissioned. For example "Please enter pin displayed in casting app."
+ *
+ * If user responds with OK then implementor calls UserPrompterResolver.OnPinCodeEntered();
+ * If user responds with Cancel then implementor calls UserPrompterResolver.OnPinCodeDeclined();
+ *
+ */
+void JNIMyUserPrompter::PromptForCommissionPincode(uint16_t vendorId, uint16_t productId, const char * commissioneeName)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    std::string stringCommissioneeName(commissioneeName);
+
+    VerifyOrExit(mJNIMyUserPrompterObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(mPromptForCommissionPincodeMethod != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+    {
+        UtfString jniCommissioneeName(env, stringCommissioneeName.data());
+        env->ExceptionClear();
+        env->CallVoidMethod(mJNIMyUserPrompterObject, mPromptForCommissionPincodeMethod, static_cast<jint>(vendorId),
+                            static_cast<jint>(productId), jniCommissioneeName.jniValue());
+        if (env->ExceptionCheck())
+        {
+            ChipLogError(Zcl, "Java exception in PromptForCommissionPincode");
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+            err = CHIP_ERROR_INCORRECT_STATE;
+            goto exit;
+        }
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "PromptForCommissionPincode error: %s", err.AsString());
+    }
+}
+
+/*
+ *   Called to notify the user that commissioning succeeded. It can be in form of UI Notification.
+ */
+void JNIMyUserPrompter::PromptCommissioningSucceeded(uint16_t vendorId, uint16_t productId, const char * commissioneeName)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    std::string stringCommissioneeName(commissioneeName);
+
+    VerifyOrExit(mJNIMyUserPrompterObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(mPromptCommissioningSucceededMethod != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+    {
+        UtfString jniCommissioneeName(env, stringCommissioneeName.data());
+        env->ExceptionClear();
+        env->CallVoidMethod(mJNIMyUserPrompterObject, mPromptCommissioningSucceededMethod, static_cast<jint>(vendorId),
+                            static_cast<jint>(productId), jniCommissioneeName.jniValue());
+
+        if (env->ExceptionCheck())
+        {
+            ChipLogError(Zcl, "Java exception in PromptCommissioningSucceeded");
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+            err = CHIP_ERROR_INCORRECT_STATE;
+            goto exit;
+        }
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "PromptCommissioningSucceeded error: %s", err.AsString());
+    }
+}
+
+/*
+ *   Called to notify the user that commissioning failed. It can be in form of UI Notification.
+ */
+void JNIMyUserPrompter::PromptCommissioningFailed(const char * commissioneeName, CHIP_ERROR error)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    std::string stringCommissioneeName(commissioneeName);
+
+    VerifyOrExit(mJNIMyUserPrompterObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(mPromptCommissioningFailedMethod != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+    {
+        std::string stringError(error.AsString());
+        UtfString jniCommissioneeName(env, stringCommissioneeName.data());
+        UtfString jniCommissioneeError(env, stringError.data());
+        env->ExceptionClear();
+        env->CallVoidMethod(mJNIMyUserPrompterObject, mPromptCommissioningFailedMethod, jniCommissioneeName.jniValue(),
+                            jniCommissioneeError.jniValue());
+
+        if (env->ExceptionCheck())
+        {
+            ChipLogError(Zcl, "Java exception in PromptCommissioningFailed");
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+            err = CHIP_ERROR_INCORRECT_STATE;
+            goto exit;
+        }
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "PromptCommissioningFailed error: %s", err.AsString());
+    }
+}
diff --git a/examples/tv-app/android/java/MyUserPrompter-JNI.h b/examples/tv-app/android/java/MyUserPrompter-JNI.h
new file mode 100644
index 00000000000000..cecdcb305643d2
--- /dev/null
+++ b/examples/tv-app/android/java/MyUserPrompter-JNI.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include "CommissionerMain.h"
+#include "lib/support/logging/CHIPLogging.h"
+#include <jni.h>
+
+class JNIMyUserPrompter : public UserPrompter
+{
+public:
+    JNIMyUserPrompter(jobject prompter);
+    void PromptForCommissionOKPermission(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override;
+    void PromptForCommissionPincode(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override;
+    void PromptCommissioningSucceeded(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override;
+    void PromptCommissioningFailed(const char * commissioneeName, CHIP_ERROR error) override;
+
+private:
+    jobject mJNIMyUserPrompterObject                 = nullptr;
+    jmethodID mPromptForCommissionOKPermissionMethod = nullptr;
+    jmethodID mPromptForCommissionPincodeMethod      = nullptr;
+    jmethodID mPromptCommissioningSucceededMethod    = nullptr;
+    jmethodID mPromptCommissioningFailedMethod       = nullptr;
+};
diff --git a/examples/tv-app/android/java/MyUserPrompterResolver-JNI.cpp b/examples/tv-app/android/java/MyUserPrompterResolver-JNI.cpp
new file mode 100644
index 00000000000000..3c9315d1bae618
--- /dev/null
+++ b/examples/tv-app/android/java/MyUserPrompterResolver-JNI.cpp
@@ -0,0 +1,62 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "MyUserPrompterResolver-JNI.h"
+#include "TvApp-JNI.h"
+#include <jni.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPJNIError.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+
+using namespace chip;
+
+#define JNI_METHOD(RETURN, METHOD_NAME)                                                                                            \
+    extern "C" JNIEXPORT RETURN JNICALL Java_com_tcl_chip_tvapp_UserPrompterResolver_##METHOD_NAME
+
+JNI_METHOD(void, OnPinCodeEntered)(JNIEnv *, jobject, jint jPinCode)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+    uint32_t pinCode = (uint32_t) jPinCode;
+    ChipLogProgress(Zcl, "OnPinCodeEntered %d", pinCode);
+    GetCommissionerDiscoveryController()->CommissionWithPincode(pinCode);
+#endif
+}
+
+JNI_METHOD(void, OnPinCodeDeclined)(JNIEnv *, jobject)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+    ChipLogProgress(Zcl, "OnPinCodeDeclined");
+    GetCommissionerDiscoveryController()->Cancel();
+#endif
+}
+
+JNI_METHOD(void, OnPromptAccepted)(JNIEnv *, jobject)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+    ChipLogProgress(Zcl, "OnPromptAccepted");
+    GetCommissionerDiscoveryController()->Ok();
+#endif
+}
+
+JNI_METHOD(void, OnPromptDeclined)(JNIEnv *, jobject)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+    ChipLogProgress(Zcl, "OnPromptDeclined");
+    GetCommissionerDiscoveryController()->Cancel();
+#endif
+}
diff --git a/examples/tv-app/android/java/MyUserPrompterResolver-JNI.h b/examples/tv-app/android/java/MyUserPrompterResolver-JNI.h
new file mode 100644
index 00000000000000..2b14ca35873683
--- /dev/null
+++ b/examples/tv-app/android/java/MyUserPrompterResolver-JNI.h
@@ -0,0 +1,25 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include "CommissionerMain.h"
+#include "lib/support/logging/CHIPLogging.h"
+#include <jni.h>
+
+class JNIMyUserPrompterResolver
+{
+};
diff --git a/examples/tv-app/android/java/TVApp-JNI.cpp b/examples/tv-app/android/java/TVApp-JNI.cpp
index 2c02e5f24f98c1..455f1d9da19eab 100644
--- a/examples/tv-app/android/java/TVApp-JNI.cpp
+++ b/examples/tv-app/android/java/TVApp-JNI.cpp
@@ -20,12 +20,14 @@
 #include "AppImpl.h"
 #include "ChannelManager.h"
 #include "ContentLauncherManager.h"
+#include "DeviceCallbacks.h"
 #include "JNIDACProvider.h"
 #include "KeypadInputManager.h"
 #include "LevelManager.h"
 #include "LowPowerManager.h"
 #include "MediaInputManager.h"
 #include "MediaPlaybackManager.h"
+#include "MyUserPrompter-JNI.h"
 #include "OnOffManager.h"
 #include "WakeOnLanManager.h"
 #include "credentials/DeviceAttestationCredsProvider.h"
@@ -47,6 +49,7 @@ using namespace chip::Credentials;
 #define JNI_METHOD(RETURN, METHOD_NAME) extern "C" JNIEXPORT RETURN JNICALL Java_com_tcl_chip_tvapp_TvApp_##METHOD_NAME
 
 TvAppJNI TvAppJNI::sInstance;
+JNIMyUserPrompter * userPrompter = nullptr;
 
 void TvAppJNI::InitializeWithObjects(jobject app)
 {
@@ -132,6 +135,11 @@ JNI_METHOD(void, setChannelManager)(JNIEnv *, jobject, jint endpoint, jobject ma
     ChannelManager::NewManager(endpoint, manager);
 }
 
+JNI_METHOD(void, setUserPrompter)(JNIEnv *, jobject, jobject prompter)
+{
+    userPrompter = new JNIMyUserPrompter(prompter);
+}
+
 JNI_METHOD(void, setDACProvider)(JNIEnv *, jobject, jobject provider)
 {
     if (!chip::Credentials::IsDeviceAttestationCredentialsProviderSet())
@@ -149,12 +157,12 @@ JNI_METHOD(void, preServerInit)(JNIEnv *, jobject app)
     PreServerInit();
 }
 
-JNI_METHOD(void, postServerInit)(JNIEnv *, jobject app)
+JNI_METHOD(void, postServerInit)(JNIEnv *, jobject app, jobject contentAppEndpointManager)
 {
     chip::DeviceLayer::StackLock lock;
     ChipLogProgress(Zcl, "TvAppJNI::postServerInit");
 
-    InitVideoPlayerPlatform();
+    InitVideoPlayerPlatform(userPrompter, contentAppEndpointManager);
 }
 
 JNI_METHOD(void, setOnOffManager)(JNIEnv *, jobject, jint endpoint, jobject manager)
@@ -177,6 +185,11 @@ JNI_METHOD(jboolean, setCurrentLevel)(JNIEnv *, jobject, jint endpoint, jboolean
     return LevelManager::SetLevel(endpoint, value);
 }
 
+JNI_METHOD(void, setChipDeviceEventProvider)(JNIEnv *, jobject, jobject provider)
+{
+    DeviceCallbacks::NewManager(provider);
+}
+
 JNI_METHOD(jint, addContentApp)
 (JNIEnv *, jobject, jstring vendorName, jint vendorId, jstring appName, jint productId, jstring appVersion, jobject manager)
 {
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/Clusters.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/Clusters.java
index 37fd495fcff7e6..e32cff9fb29f90 100644
--- a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/Clusters.java
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/Clusters.java
@@ -128,7 +128,7 @@ public class Clusters {
   public static final int ClusterId_ApplicationLauncher = 0x0000050C;
   public static final int ClusterId_ApplicationBasic = 0x0000050D;
   public static final int ClusterId_AccountLogin = 0x0000050E;
-  public static final int ClusterId_TestCluster = 0x0000050F;
+  public static final int ClusterId_TestCluster = 0xFFF1FC05;
   public static final int ClusterId_Messaging = 0x00000703;
   public static final int ClusterId_ApplianceIdentification = 0x00000B00;
   public static final int ClusterId_MeterIdentification = 0x00000B01;
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManager.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManager.java
index 09bf1f0a0f8b54..119ff8bd231f5f 100644
--- a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManager.java
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManager.java
@@ -2,5 +2,5 @@
 
 public interface ContentAppEndpointManager {
 
-  public String sendCommand(int endpointId, String commandPayload);
+  public String sendCommand(int endpointId, int clusterId, int commandId, String commandPayload);
 }
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManagerStub.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManagerStub.java
deleted file mode 100644
index 3de920ef95f938..00000000000000
--- a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ContentAppEndpointManagerStub.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.tcl.chip.tvapp;
-
-public class ContentAppEndpointManagerStub implements ContentAppEndpointManager {
-
-  ContentAppEndpointManager delegate;
-
-  public ContentAppEndpointManagerStub(ContentAppEndpointManager delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public String sendCommand(int endpointId, String commandPayload) {
-    return delegate.sendCommand(endpointId, commandPayload);
-  }
-}
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/DeviceEventProvider.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/DeviceEventProvider.java
new file mode 100644
index 00000000000000..d4e4fd8efff121
--- /dev/null
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/DeviceEventProvider.java
@@ -0,0 +1,22 @@
+/*
+ *   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.
+ *
+ */
+package com.tcl.chip.tvapp;
+
+public interface DeviceEventProvider {
+  void onCommissioningComplete();
+}
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/MediaPlaybackManagerStub.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/MediaPlaybackManagerStub.java
index 9e7c1d7bdca3ba..1c6a003c31d72e 100755
--- a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/MediaPlaybackManagerStub.java
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/MediaPlaybackManagerStub.java
@@ -26,6 +26,11 @@ public class MediaPlaybackManagerStub implements MediaPlaybackManager {
   private final String TAG = MediaPlaybackManagerStub.class.getSimpleName();
 
   private int endpoint;
+  private int playbackState = PLAYBACK_STATE_PLAYING;
+  private int playbackSpeed = 1;
+  private long playbackPosition = 0;
+  private long playbackDuration = 5 * 60 * 1000;
+  private long startTime = 100;
 
   public MediaPlaybackManagerStub(int endpoint) {
     this.endpoint = endpoint;
@@ -36,27 +41,27 @@ public long getAttributes(int attributesId) {
     switch (attributesId) {
       case ATTRIBUTE_PLAYBACK_STATE:
         Log.d(TAG, "getAttributes CurrentState at " + endpoint);
-        return PLAYBACK_STATE_PLAYING;
+        return playbackState;
 
       case ATTRIBUTE_PLAYBACK_START_TIME:
         Log.d(TAG, "getAttributes StartTime at " + endpoint);
-        return 100;
+        return startTime;
 
       case ATTRIBUTE_PLAYBACK_DURATION:
         Log.d(TAG, "getAttributes Duration at " + endpoint);
-        return 5 * 60 * 1000;
+        return playbackDuration;
 
       case ATTRIBUTE_PLAYBACK_SPEED:
         Log.d(TAG, "getAttributes SampledPosition PlaybackSpeed at " + endpoint);
-        return 10000;
+        return playbackSpeed;
 
       case ATTRIBUTE_PLAYBACK_SEEK_RANGE_END:
         Log.d(TAG, "getAttributes SampledPosition SeekRangeEnd at " + endpoint);
-        return 5 * 60 * 1000;
+        return playbackDuration;
 
       case ATTRIBUTE_PLAYBACK_SEEK_RANGE_START:
         Log.d(TAG, "getAttributes SampledPosition SeekRangeStart at " + endpoint);
-        return 200;
+        return startTime;
     }
 
     return -1;
@@ -64,49 +69,94 @@ public long getAttributes(int attributesId) {
 
   @Override
   public int request(int cmd, long parameter) {
+    long newPosition;
     switch (cmd) {
       case REQUEST_PLAY:
         Log.d(TAG, "request Play at " + endpoint);
+        playbackState = PLAYBACK_STATE_PLAYING;
+        playbackSpeed = 1;
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_PAUSE:
         Log.d(TAG, "request pause at " + endpoint);
+        playbackState = PLAYBACK_STATE_PAUSED;
+        playbackSpeed = 0;
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_STOP:
         Log.d(TAG, "request stop at " + endpoint);
+        playbackState = PLAYBACK_STATE_NOT_PLAYING;
+        playbackSpeed = 0;
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_START_OVER:
         Log.d(TAG, "request start over at " + endpoint);
+        playbackPosition = 0;
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_PREVIOUS:
         Log.d(TAG, "request previous at " + endpoint);
+        playbackState = PLAYBACK_STATE_PLAYING;
+        playbackSpeed = 1;
+        playbackPosition = 0;
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_NEXT:
         Log.d(TAG, "request next at " + endpoint);
+        playbackState = PLAYBACK_STATE_PLAYING;
+        playbackSpeed = 1;
+        playbackPosition = 0;
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_REWIND:
         Log.d(TAG, "request rewind at " + endpoint);
+        playbackState = PLAYBACK_STATE_PLAYING;
+        playbackSpeed = (playbackSpeed >= 0 ? -1 : playbackSpeed * 2);
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_FAST_FORWARD:
         Log.d(TAG, "request fast forward at " + endpoint);
+        playbackState = PLAYBACK_STATE_PLAYING;
+        playbackSpeed = (playbackSpeed <= 0 ? 1 : playbackSpeed * 2);
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_SKIP_FORWARD:
         Log.d(TAG, "request skip forward " + parameter + " milliseconds at " + endpoint);
+        newPosition = playbackPosition + parameter;
+        playbackPosition =
+            (newPosition > playbackDuration)
+                ? playbackDuration
+                : (newPosition >= 0 ? newPosition : 0);
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_SKIP_BACKWARD:
         Log.d(TAG, "request skip backward " + parameter + " milliseconds at " + endpoint);
+        newPosition = playbackPosition - parameter;
+        playbackPosition =
+            (newPosition > playbackDuration)
+                ? playbackDuration
+                : (newPosition >= 0 ? newPosition : 0);
+
         return RESPONSE_STATUS_SUCCESS;
 
       case REQUEST_SEEK:
         Log.d(TAG, "request seek to " + parameter + " milliseconds at " + endpoint);
+
+        if (parameter > playbackDuration) {
+          return RESPONSE_STATUS_SEEK_OUT_OF_RANGE;
+        } else {
+          playbackPosition = parameter;
+        }
+
         return RESPONSE_STATUS_SUCCESS;
     }
 
@@ -115,6 +165,6 @@ public int request(int cmd, long parameter) {
 
   @Override
   public MediaPlaybackPosition getPosition() {
-    return new MediaPlaybackPosition(3 * 60 * 1000);
+    return new MediaPlaybackPosition(playbackPosition);
   }
 }
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/TvApp.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/TvApp.java
index 3b341a2a3ce8af..a7cf235ca46265 100644
--- a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/TvApp.java
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/TvApp.java
@@ -41,7 +41,7 @@ private void postClusterInit(int clusterId, int endpoint) {
   public native void preServerInit();
 
   // called after Matter server is inited
-  public native void postServerInit();
+  public native void postServerInit(ContentAppEndpointManager manager);
 
   public native void setKeypadInputManager(int endpoint, KeypadInputManager manager);
 
@@ -67,6 +67,8 @@ private void postClusterInit(int clusterId, int endpoint) {
 
   public native void setDACProvider(DACProvider provider);
 
+  public native void setChipDeviceEventProvider(DeviceEventProvider provider);
+
   public native int addContentApp(
       String vendorName,
       int vendorId,
@@ -77,6 +79,8 @@ public native int addContentApp(
 
   public native void sendTestMessage(int endpoint, String message);
 
+  public native void setUserPrompter(UserPrompter userPrompter);
+
   static {
     System.loadLibrary("TvApp");
   }
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/UserPrompter.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/UserPrompter.java
new file mode 100644
index 00000000000000..2eef058de45886
--- /dev/null
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/UserPrompter.java
@@ -0,0 +1,51 @@
+/*
+ *   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.
+ *
+ */
+package com.tcl.chip.tvapp;
+
+public interface UserPrompter {
+
+  /*
+   *  Called to prompt the user for consent to allow the given commissioneeName/vendorId/productId to be commissioned.
+   * For example "[commissioneeName] is requesting permission to cast to this TV, approve?"
+   *
+   * If user responds with OK then implementor calls UserPrompterResolver.OnPromptAccepted;
+   * If user responds with Cancel then implementor calls calls UserPrompterResolver.OnPromptDeclined();
+   *
+   */
+  void promptForCommissionOkPermission(int vendorId, int productId, String commissioneeName);
+
+  /*
+   *  Called to prompt the user to enter the setup pincode displayed by the given commissioneeName/vendorId/productId to be
+   * commissioned. For example "Please enter pin displayed in casting app."
+   *
+   * If user responds with OK then implementor calls UserPrompterResolver.OnPinCodeEntered();
+   * If user responds with Cancel then implementor calls UserPrompterResolver.OnPinCodeDeclined();
+   *
+   */
+  void promptForCommissionPinCode(int vendorId, int productId, String commissioneeName);
+
+  /*
+   *   Called to notify the user that commissioning succeeded. It can be in form of UI Notification.
+   */
+  void promptCommissioningSucceeded(int vendorId, int productId, String commissioneeName);
+
+  /*
+   *   Called to notify the user that commissioning succeeded. It can be in form of UI Notification.
+   */
+  void promptCommissioningFailed(String commissioneeName, String error);
+}
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/UserPrompterResolver.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/UserPrompterResolver.java
new file mode 100644
index 00000000000000..b3a0ca5f6ed77f
--- /dev/null
+++ b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/UserPrompterResolver.java
@@ -0,0 +1,35 @@
+/*
+ *   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.
+ *
+ */
+package com.tcl.chip.tvapp;
+
+public class UserPrompterResolver {
+
+  protected static final String TAG = "UserPrompterResolver";
+
+  public native void OnPinCodeEntered(int pinCode);
+
+  public native void OnPinCodeDeclined();
+
+  public native void OnPromptAccepted();
+
+  public native void OnPromptDeclined();
+
+  static {
+    System.loadLibrary("TvApp");
+  }
+}
diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
index 64f1960a8476e2..cac5c4c846cd04 100644
--- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
+++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
@@ -50,18 +50,20 @@ float MediaPlaybackManager::HandleGetPlaybackSpeed()
 
 uint64_t MediaPlaybackManager::HandleGetSeekRangeStart()
 {
-    return mPlaybackPosition.position.Value();
+    return mStartTime;
 }
 
 uint64_t MediaPlaybackManager::HandleGetSeekRangeEnd()
 {
-    return mDuration - mPlaybackPosition.position.Value();
+    return mDuration;
 }
 
 void MediaPlaybackManager::HandlePlay(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
-    mCurrentState = PlaybackStateEnum::kPlaying;
+    mCurrentState  = PlaybackStateEnum::kPlaying;
+    mPlaybackSpeed = 1;
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -71,7 +73,9 @@ void MediaPlaybackManager::HandlePlay(CommandResponseHelper<Commands::PlaybackRe
 void MediaPlaybackManager::HandlePause(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
-    mCurrentState = PlaybackStateEnum::kPaused;
+    mCurrentState  = PlaybackStateEnum::kPaused;
+    mPlaybackSpeed = 0;
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -81,7 +85,10 @@ void MediaPlaybackManager::HandlePause(CommandResponseHelper<Commands::PlaybackR
 void MediaPlaybackManager::HandleStop(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
-    mCurrentState = PlaybackStateEnum::kNotPlaying;
+    mCurrentState     = PlaybackStateEnum::kNotPlaying;
+    mPlaybackSpeed    = 0;
+    mPlaybackPosition = { 0, chip::app::DataModel::Nullable<uint64_t>(0) };
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -91,6 +98,9 @@ void MediaPlaybackManager::HandleStop(CommandResponseHelper<Commands::PlaybackRe
 void MediaPlaybackManager::HandleFastForward(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
+    mCurrentState  = PlaybackStateEnum::kPlaying;
+    mPlaybackSpeed = (mPlaybackSpeed <= 0 ? 1 : mPlaybackSpeed * 2);
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -100,7 +110,10 @@ void MediaPlaybackManager::HandleFastForward(CommandResponseHelper<Commands::Pla
 void MediaPlaybackManager::HandlePrevious(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
+    mCurrentState     = PlaybackStateEnum::kPlaying;
+    mPlaybackSpeed    = 1;
     mPlaybackPosition = { 0, chip::app::DataModel::Nullable<uint64_t>(0) };
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -110,7 +123,9 @@ void MediaPlaybackManager::HandlePrevious(CommandResponseHelper<Commands::Playba
 void MediaPlaybackManager::HandleRewind(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
-    mPlaybackPosition = { 0, chip::app::DataModel::Nullable<uint64_t>(0) };
+    mCurrentState  = PlaybackStateEnum::kPlaying;
+    mPlaybackSpeed = (mPlaybackSpeed >= 0 ? -1 : mPlaybackSpeed * 2);
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -121,7 +136,9 @@ void MediaPlaybackManager::HandleSkipBackward(CommandResponseHelper<Commands::Pl
                                               const uint64_t & deltaPositionMilliseconds)
 {
     // TODO: Insert code here
-    uint64_t newPosition = mPlaybackPosition.position.Value() - deltaPositionMilliseconds;
+    uint64_t newPosition = (mPlaybackPosition.position.Value() > deltaPositionMilliseconds
+                                ? mPlaybackPosition.position.Value() - deltaPositionMilliseconds
+                                : 0);
     mPlaybackPosition    = { 0, chip::app::DataModel::Nullable<uint64_t>(newPosition) };
 
     Commands::PlaybackResponse::Type response;
@@ -169,6 +186,10 @@ void MediaPlaybackManager::HandleSeek(CommandResponseHelper<Commands::PlaybackRe
 void MediaPlaybackManager::HandleNext(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
 {
     // TODO: Insert code here
+    mCurrentState     = PlaybackStateEnum::kPlaying;
+    mPlaybackSpeed    = 1;
+    mPlaybackPosition = { 0, chip::app::DataModel::Nullable<uint64_t>(0) };
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
@@ -179,6 +200,7 @@ void MediaPlaybackManager::HandleStartOver(CommandResponseHelper<Commands::Playb
 {
     // TODO: Insert code here
     mPlaybackPosition = { 0, chip::app::DataModel::Nullable<uint64_t>(0) };
+
     Commands::PlaybackResponse::Type response;
     response.data   = chip::MakeOptional(CharSpan::fromCharString("data response"));
     response.status = MediaPlaybackStatusEnum::kSuccess;
diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h
index 3d583ac837dd0d..78bfb127c72e7a 100644
--- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h
+++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h
@@ -52,7 +52,10 @@ class MediaPlaybackManager : public MediaPlaybackDelegate
     void HandleStartOver(CommandResponseHelper<PlaybackResponseType> & helper) override;
 
 protected:
-    chip::app::Clusters::MediaPlayback::PlaybackStateEnum mCurrentState;
+    // NOTE: it does not make sense to have default state of playing with a speed of 0, but
+    // the CI test cases expect these values, and need to be fixed.
+    chip::app::Clusters::MediaPlayback::PlaybackStateEnum mCurrentState =
+        chip::app::Clusters::MediaPlayback::PlaybackStateEnum::kPlaying;
     PlaybackPositionType mPlaybackPosition = { 0, chip::app::DataModel::Nullable<uint64_t>(0) };
     float mPlaybackSpeed                   = 0;
     uint64_t mStartTime                    = 0;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 73da3b4d128990..4759b9fbe1cfd9 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -548,6 +548,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 server cluster FixedLabel = 64 {
@@ -760,8 +762,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -783,10 +793,52 @@ server cluster GroupKeyManagement = 63 {
     fabric_idx fabricIndex = 254;
   }
 
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
   attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
   readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
 server cluster KeypadInput = 1289 {
@@ -1499,6 +1551,7 @@ client cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1539,13 +1592,14 @@ client cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1598,6 +1652,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1638,13 +1693,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1665,10 +1721,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1697,7 +1749,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster RelativeHumidityMeasurement = 1029 {
@@ -1709,12 +1760,16 @@ server cluster RelativeHumidityMeasurement = 1029 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1844,7 +1899,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1852,11 +1907,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1899,12 +1954,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -2027,8 +2082,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
   binding cluster Binding;
   binding cluster GeneralCommissioning;
   binding cluster NetworkCommissioning;
@@ -2148,6 +2203,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -2162,67 +2218,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -2283,6 +2339,8 @@ endpoint 0 {
   server cluster GroupKeyManagement {
     callback attribute groupKeyMap;
     callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -2307,8 +2365,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 3;
   }
 }
-
 endpoint 1 {
+  device type videoplayer = 35;
 
   server cluster OnOff {
     ram      attribute onOff;
@@ -2342,7 +2400,7 @@ endpoint 1 {
   server cluster TargetNavigator {
     callback attribute targetList;
     ram      attribute currentTarget;
-    ram      attribute featureMap default = 0x0001;
+    ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
 
@@ -2402,8 +2460,8 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 2 {
+  device type speaker = 34;
 
   server cluster OnOff {
     ram      attribute onOff;
@@ -2439,8 +2497,8 @@ endpoint 2 {
     callback attribute clusterRevision default = 1;
   }
 }
-
 endpoint 3 {
+  device type contentapplication = 36;
 
   server cluster Descriptor {
     callback attribute deviceList;
@@ -2488,8 +2546,8 @@ endpoint 3 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 4 {
+  device type contentapplication = 36;
 
   server cluster Descriptor {
     callback attribute deviceList;
@@ -2520,8 +2578,8 @@ endpoint 4 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 5 {
+  device type contentapplication = 36;
 
   server cluster Descriptor {
     callback attribute deviceList;
@@ -2540,6 +2598,7 @@ endpoint 5 {
     callback attribute application;
     ram      attribute status;
     ram      attribute applicationVersion;
+    callback attribute allowedVendorList;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index ec34cc5fad87b8..b1165bbd5c5524 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -2453,7 +2453,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2583,6 +2592,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2776,7 +2801,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2790,9 +2815,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2808,7 +2833,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -2824,7 +2849,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2840,7 +2865,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2856,7 +2881,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2872,7 +2897,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2920,7 +2945,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2936,7 +2961,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2952,7 +2977,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2968,7 +2993,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2984,7 +3009,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3000,7 +3025,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3016,7 +3041,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3032,7 +3057,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3048,7 +3073,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3064,7 +3089,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3080,7 +3105,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3096,7 +3121,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3112,7 +3137,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3128,7 +3153,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3144,7 +3169,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3160,7 +3185,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3176,7 +3201,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3192,7 +3217,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3208,7 +3233,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3224,7 +3249,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3240,7 +3265,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3256,7 +3281,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3272,7 +3297,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3288,7 +3313,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3304,7 +3329,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3320,7 +3345,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3336,7 +3361,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3352,7 +3377,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3368,7 +3393,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3384,7 +3409,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3400,7 +3425,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3416,7 +3441,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3432,7 +3457,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3448,7 +3473,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3464,7 +3489,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3480,7 +3505,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3496,7 +3521,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3512,7 +3537,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3528,7 +3553,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3544,7 +3569,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3560,7 +3585,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3576,7 +3601,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3592,7 +3617,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3608,7 +3633,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3624,7 +3649,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3640,7 +3665,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3656,7 +3681,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3672,7 +3697,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3688,7 +3713,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3704,7 +3729,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3718,7 +3743,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3736,7 +3761,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3750,7 +3775,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4102,7 +4127,7 @@
               "code": 0,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             }
           ],
@@ -4628,14 +4653,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -4836,7 +4853,40 @@
           "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
           "side": "client",
           "enabled": 0,
-          "commands": [],
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "ClusterRevision",
@@ -4863,7 +4913,24 @@
           "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
           "attributes": [
             {
               "name": "GroupKeyMap",
@@ -4897,6 +4964,38 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "MaxGroupsPerFabric",
+              "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": "MaxGroupKeysPerFabric",
+              "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": "FeatureMap",
               "code": 65532,
@@ -5101,46 +5200,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetLogRecord",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetPINCode",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCode",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearPINCode",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllPINCodes",
-              "code": 8,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
             {
               "name": "SetWeekDaySchedule",
               "code": 11,
@@ -5212,54 +5271,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "SetUserType",
-              "code": 20,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetUserType",
-              "code": 21,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "SetRFIDCode",
-              "code": 22,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCode",
-              "code": 23,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearRFIDCode",
-              "code": 24,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "ClearAllRFIDCodes",
-              "code": 25,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -5354,22 +5365,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -5594,134 +5589,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -7256,7 +7123,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -7308,7 +7175,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -8329,7 +8196,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0001",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -9565,7 +9432,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -9617,7 +9484,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -12542,7 +12409,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "array",
-              "included": 0,
+              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -12660,5 +12527,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 36
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "log": []
+}
diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java
index 55f3d9b4e2b7b6..afd768a1a20679 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java
@@ -11,6 +11,7 @@
 import chip.platform.AndroidChipPlatform;
 import chip.platform.ChipMdnsCallbackImpl;
 import chip.platform.DiagnosticDataProviderImpl;
+import chip.platform.NsdManagerServiceBrowser;
 import chip.platform.NsdManagerServiceResolver;
 import chip.platform.PreferencesConfigurationManager;
 import chip.platform.PreferencesKeyValueStoreManager;
@@ -67,6 +68,7 @@ private void initJni() {
             new PreferencesKeyValueStoreManager(applicationContext),
             new PreferencesConfigurationManager(applicationContext),
             new NsdManagerServiceResolver(applicationContext),
+            new NsdManagerServiceBrowser(applicationContext),
             new ChipMdnsCallbackImpl(),
             new DiagnosticDataProviderImpl(applicationContext));
 
diff --git a/examples/tv-casting-app/darwin/.gitignore b/examples/tv-casting-app/darwin/.gitignore
new file mode 100644
index 00000000000000..7648468d4949b3
--- /dev/null
+++ b/examples/tv-casting-app/darwin/.gitignore
@@ -0,0 +1,166 @@
+### C++ ###
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+### Objective-C ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+build/
+DerivedData/
+*.moved-aside
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+
+## Obj-C/Swift specific
+*.hmap
+
+## App packaging
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# fastlane
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Objective-C Patch ###
+
+### Swift ###
+# Xcode
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+
+
+
+
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
+.build/
+
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+
+# Accio dependency management
+Dependencies/
+.accio/
+
+# fastlane
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+
+### Xcode ###
+
+## Xcode 8 and earlier
+
+### Xcode Patch ###
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+**/xcshareddata/WorkspaceSettings.xcsettings
+
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/ViewController.m b/examples/tv-casting-app/darwin/TvCasting/MatterBridge/CastingServerBridge.h
similarity index 67%
rename from examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/ViewController.m
rename to examples/tv-casting-app/darwin/TvCasting/MatterBridge/CastingServerBridge.h
index 8d070158ac42e7..712128353db3cb 100644
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/ViewController.m
+++ b/examples/tv-casting-app/darwin/TvCasting/MatterBridge/CastingServerBridge.h
@@ -15,18 +15,18 @@
  *    limitations under the License.
  */
 
-#import "ViewController.h"
+#import <Foundation/Foundation.h>
 
-@interface ViewController ()
+#ifndef CastingServerBridge_h
+#define CastingServerBridge_h
 
-@end
+@interface CastingServerBridge : NSObject
 
-@implementation ViewController
++ (CastingServerBridge *)getSharedInstance;
 
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
+// TBD: placeholder will be replaced with true CastingServer functions
+- (int)add:(int)a secondNum:(int)b;
 
 @end
+
+#endif /* CastingServerBridge_h */
diff --git a/examples/tv-casting-app/darwin/TvCasting/MatterBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/TvCasting/MatterBridge/CastingServerBridge.mm
new file mode 100644
index 00000000000000..05635ac19caf26
--- /dev/null
+++ b/examples/tv-casting-app/darwin/TvCasting/MatterBridge/CastingServerBridge.mm
@@ -0,0 +1,62 @@
+/**
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#import "CastingServerBridge.h"
+#import "CastingServer.h"
+
+#include <lib/support/CHIPMem.h>
+#include <platform/PlatformManager.h>
+
+@implementation CastingServerBridge
+
++ (CastingServerBridge *)getSharedInstance
+{
+    static CastingServerBridge * instance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[self alloc] init];
+    });
+    return instance;
+}
+
+- (instancetype)init
+{
+    if (self = [super init]) {
+        CHIP_ERROR err = chip::Platform::MemoryInit();
+        if (err != CHIP_NO_ERROR) {
+            ChipLogError(AppServer, "MemoryInit failed: %s", ErrorStr(err));
+            return nil;
+        }
+
+        err = chip::DeviceLayer::PlatformMgr().InitChipStack();
+        if (err != CHIP_NO_ERROR) {
+            ChipLogError(AppServer, "InitChipStack failed: %s", ErrorStr(err));
+            return nil;
+        }
+
+        CastingServer::GetInstance()->Init();
+    }
+    return self;
+}
+
+// TBD: placeholder will be replaced with true CastingServer functions
+- (int)add:(int)a secondNum:(int)b
+{
+    return a + b;
+}
+
+@end
diff --git a/examples/tv-casting-app/darwin/darwin/ViewController.h b/examples/tv-casting-app/darwin/TvCasting/MatterBridge/TvCasting-Bridging-Header.h
similarity index 88%
rename from examples/tv-casting-app/darwin/darwin/ViewController.h
rename to examples/tv-casting-app/darwin/TvCasting/MatterBridge/TvCasting-Bridging-Header.h
index e122b5c9ad9c0c..ed7fd614f2beae 100644
--- a/examples/tv-casting-app/darwin/darwin/ViewController.h
+++ b/examples/tv-casting-app/darwin/TvCasting/MatterBridge/TvCasting-Bridging-Header.h
@@ -15,8 +15,8 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
+//
+//  TvCasting's Public headers exposed to Swift
+//
 
-@interface ViewController : UIViewController
-
-@end
+#import "CastingServerBridge.h"
diff --git a/examples/tv-casting-app/darwin/TvCasting/README.md b/examples/tv-casting-app/darwin/TvCasting/README.md
new file mode 100644
index 00000000000000..4b4d44fdc40133
--- /dev/null
+++ b/examples/tv-casting-app/darwin/TvCasting/README.md
@@ -0,0 +1,80 @@
+# Matter TV Casting iOS App Example
+
+This is a Matter TV Casting iOS app that can be used to cast content to a TV.
+This app discovers TVs on the local network that act as commissioners, lets the
+user select one, sends the TV a User Directed Commissioning request, enters
+commissioning mode, advertises itself as a Commissionable Node and gets
+commissioned. Then it allows the user to send Matter ContentLauncher commands to
+the TV.
+
+---
+
+-   [Matter TV Casting iOS App Example](#matter-tv-casting-ios-app-example)
+    -   [Building the Application](#building-the-application)
+        -   [Compilation Fixes](#compilation-fixes)
+    -   [Installing the Application](#installing-the-application)
+
+---
+
+## Building the Application
+
+Matter TV Casting iOS App Example can be built with the latest Xcode releases.
+
+-   Open the `TvCastingDarwin.xcworkspace` file located in
+    `examples/tv-casting-app/darwin` with Xcode.
+
+-   Then select the `TvCasting` scheme at the top.
+
+-   Running the `TvCasting` scheme in Xcode (select the scheme and then hit the
+    "play button" to "run" the scheme) will attempt to compile the application
+    and then install it to the connected iOS device selected in the scheme.
+
+Because we do not share a developer group, directly running this scheme will
+fail with missing signing configuration errors.
+
+You need to update the Project configuration for TvCasting app to use your
+Personal Developer account and a unique Bundle ID.
+
+### Compilation Fixes
+
+Before you can run the `TvCasting` scheme, you need to amend the
+`project.pbxproj` file for the TvCasting app project. The file is located here
+`examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/project.pbxproj`.
+
+You can choose to amend this file via Xcode directly or manually with any text
+editor. This Readme will focus on doing it via Xcode.
+
+-   With the `TvCastingDarwin.xcworkspace` loaded, you should see 1 project on
+    the left side pane in Xcode. `TvCasting`
+
+-   Selecting `TvCasting` should bring up the project configuration view in
+    Xcode. Next, select the `Signing & Capabilities` tab.
+
+-   Perform the following steps to enable building TvCasting app:
+
+    1. Ensure "Automatically manage signing" is checked
+
+    2. Select your Personal Team in the "Team" dropdown.
+
+    3. Change the bundle identifier from `com.matter.TvCasting` to something
+       unique, like `com.matter.TvCasting-username`. These bundle IDs get
+       reserved for a short amount of time and so it's best to use something
+       only you might think of to avoid conflicts (you'll see that the default
+       bundle ID does not work if you skip this step).
+
+    4. Confirm that the Signing Certificate now says "Apple Development:
+       <your personal account>"
+
+Now you can install TvCasting app to your connected iOS device by clicking on
+the "Play"/Run icon.
+
+## Installing the Application
+
+The first time you install this application to your iOS device, Xcode will not
+be able to launch it. This is because iOS prevents arbitrary developer apps from
+running prior to user consent. To give this application consent, navigate to
+`Settings->General->VPN & Device Management` and give TvCasting app permission
+to run.
+
+Now you can launch the application from the Home screen or from Xcode by hitting
+the run button once more.
diff --git a/examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/project.pbxproj b/examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/project.pbxproj
new file mode 100644
index 00000000000000..a417f366f7203f
--- /dev/null
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/project.pbxproj
@@ -0,0 +1,513 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 55;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		3C75075C284B080900D7DB3A /* libmbedtls.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C75075B284B07E800D7DB3A /* libmbedtls.a */; settings = {ATTRIBUTES = (Required, ); }; };
+		3C9ACC05284ABF4000718B2D /* libTvCastingCommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C9ACC04284ABF2F00718B2D /* libTvCastingCommon.a */; };
+		3CC0E8FA2841DD3400EC6A18 /* TvCastingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CC0E8F92841DD3400EC6A18 /* TvCastingApp.swift */; };
+		3CC0E8FC2841DD3400EC6A18 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CC0E8FB2841DD3400EC6A18 /* ContentView.swift */; };
+		3CC0E8FE2841DD3500EC6A18 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3CC0E8FD2841DD3500EC6A18 /* Assets.xcassets */; };
+		3CC0E9012841DD3500EC6A18 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3CC0E9002841DD3500EC6A18 /* Preview Assets.xcassets */; };
+		3CC0E90A2841DD7000EC6A18 /* CastingServerBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CC0E9092841DD7000EC6A18 /* CastingServerBridge.mm */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		3C75075B284B07E800D7DB3A /* libmbedtls.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmbedtls.a; path = lib/libmbedtls.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		3C75075E284C1DF800D7DB3A /* TvCasting.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TvCasting.entitlements; sourceTree = "<group>"; };
+		3C9ACC04284ABF2F00718B2D /* libTvCastingCommon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTvCastingCommon.a; path = lib/libTvCastingCommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		3CC0E8F62841DD3400EC6A18 /* TvCasting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TvCasting.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		3CC0E8F92841DD3400EC6A18 /* TvCastingApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TvCastingApp.swift; sourceTree = "<group>"; };
+		3CC0E8FB2841DD3400EC6A18 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		3CC0E8FD2841DD3500EC6A18 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		3CC0E9002841DD3500EC6A18 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		3CC0E9082841DD6F00EC6A18 /* TvCasting-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TvCasting-Bridging-Header.h"; sourceTree = "<group>"; };
+		3CC0E9092841DD7000EC6A18 /* CastingServerBridge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CastingServerBridge.mm; sourceTree = "<group>"; };
+		3CC0E90B2841DD8500EC6A18 /* CastingServerBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CastingServerBridge.h; sourceTree = "<group>"; };
+		3CC0E90C2841DECC00EC6A18 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		3CC0E8F32841DD3400EC6A18 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3C9ACC05284ABF4000718B2D /* libTvCastingCommon.a in Frameworks */,
+				3C75075C284B080900D7DB3A /* libmbedtls.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		3C9ACC02284ABBD600718B2D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				3C75075B284B07E800D7DB3A /* libmbedtls.a */,
+				3C9ACC04284ABF2F00718B2D /* libTvCastingCommon.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		3CC0E8ED2841DD3400EC6A18 = {
+			isa = PBXGroup;
+			children = (
+				3CC0E90C2841DECC00EC6A18 /* README.md */,
+				3CC0E8F82841DD3400EC6A18 /* TvCasting */,
+				3CC0E9072841DD4B00EC6A18 /* MatterBridge */,
+				3CC0E8F72841DD3400EC6A18 /* Products */,
+				3C9ACC02284ABBD600718B2D /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		3CC0E8F72841DD3400EC6A18 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				3CC0E8F62841DD3400EC6A18 /* TvCasting.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		3CC0E8F82841DD3400EC6A18 /* TvCasting */ = {
+			isa = PBXGroup;
+			children = (
+				3C75075E284C1DF800D7DB3A /* TvCasting.entitlements */,
+				3CC0E8F92841DD3400EC6A18 /* TvCastingApp.swift */,
+				3CC0E8FB2841DD3400EC6A18 /* ContentView.swift */,
+				3CC0E8FD2841DD3500EC6A18 /* Assets.xcassets */,
+				3CC0E8FF2841DD3500EC6A18 /* Preview Content */,
+			);
+			path = TvCasting;
+			sourceTree = "<group>";
+		};
+		3CC0E8FF2841DD3500EC6A18 /* Preview Content */ = {
+			isa = PBXGroup;
+			children = (
+				3CC0E9002841DD3500EC6A18 /* Preview Assets.xcassets */,
+			);
+			path = "Preview Content";
+			sourceTree = "<group>";
+		};
+		3CC0E9072841DD4B00EC6A18 /* MatterBridge */ = {
+			isa = PBXGroup;
+			children = (
+				3CC0E9092841DD7000EC6A18 /* CastingServerBridge.mm */,
+				3CC0E9082841DD6F00EC6A18 /* TvCasting-Bridging-Header.h */,
+				3CC0E90B2841DD8500EC6A18 /* CastingServerBridge.h */,
+			);
+			path = MatterBridge;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		3C75075D284BD20000D7DB3A /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		3CC0E8F52841DD3400EC6A18 /* TvCasting */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 3CC0E9042841DD3500EC6A18 /* Build configuration list for PBXNativeTarget "TvCasting" */;
+			buildPhases = (
+				3C9ACC012849D55B00718B2D /* Run Script */,
+				3C75075D284BD20000D7DB3A /* Headers */,
+				3CC0E8F22841DD3400EC6A18 /* Sources */,
+				3CC0E8F32841DD3400EC6A18 /* Frameworks */,
+				3CC0E8F42841DD3400EC6A18 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = TvCasting;
+			productName = TvCasting;
+			productReference = 3CC0E8F62841DD3400EC6A18 /* TvCasting.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		3CC0E8EE2841DD3400EC6A18 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = 1;
+				LastSwiftUpdateCheck = 1320;
+				LastUpgradeCheck = 1320;
+				TargetAttributes = {
+					3CC0E8F52841DD3400EC6A18 = {
+						CreatedOnToolsVersion = 13.2.1;
+						LastSwiftMigration = 1320;
+					};
+				};
+			};
+			buildConfigurationList = 3CC0E8F12841DD3400EC6A18 /* Build configuration list for PBXProject "TvCasting" */;
+			compatibilityVersion = "Xcode 13.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 3CC0E8ED2841DD3400EC6A18;
+			productRefGroup = 3CC0E8F72841DD3400EC6A18 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				3CC0E8F52841DD3400EC6A18 /* TvCasting */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		3CC0E8F42841DD3400EC6A18 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3CC0E9012841DD3500EC6A18 /* Preview Assets.xcassets in Resources */,
+				3CC0E8FE2841DD3500EC6A18 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3C9ACC012849D55B00718B2D /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "./chip_xcode_build_connector.sh\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		3CC0E8F22841DD3400EC6A18 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3CC0E90A2841DD7000EC6A18 /* CastingServerBridge.mm in Sources */,
+				3CC0E8FC2841DD3400EC6A18 /* ContentView.swift in Sources */,
+				3CC0E8FA2841DD3400EC6A18 /* TvCastingApp.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3CC0E9022841DD3500EC6A18 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					CHIP_HAVE_CONFIG_H,
+					"DEBUG=1",
+					"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		3CC0E9032841DD3500EC6A18 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = CHIP_HAVE_CONFIG_H;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		3CC0E9052841DD3500EC6A18 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CHIP_ROOT = "$(PROJECT_DIR)/../../../..";
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = TvCasting/TvCasting.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_ASSET_PATHS = "\"TvCasting/Preview Content\"";
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_PREVIEWS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					CHIP_HAVE_CONFIG_H,
+					"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GENERATE_INFOPLIST_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					"${CHIP_ROOT}/examples/tv-casting-app/tv-casting-common/include",
+					"$(CHIP_ROOT)/src",
+					"$(CHIP_ROOT)/src/include",
+					"$(CHIP_ROOT)/src/lib",
+					"$(CHIP_ROOT)/src/app",
+					"$(CHIP_ROOT)/config/ios",
+					"$(CHIP_ROOT)/src/darwin/Framework/CHIP/",
+					"$(CHIP_ROOT)/src/app/util",
+					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
+					"$(CHIP_ROOT)/third_party/nlio/repo/include",
+					"$(TEMP_DIR)/out/gen/include",
+					"$(CHIP_ROOT)/zzz_generated/",
+					"$(CHIP_ROOT)/zzz_generated/app-common",
+					"$(CHIP_ROOT)/zzz_generated/controller-clusters",
+				);
+				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
+				MARKETING_VERSION = 1.0;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"-Wformat",
+					"-Wformat-nonliteral",
+					"-Wformat-security",
+				);
+				"OTHER_LDFLAGS[arch=*]" = (
+					"-framework",
+					CoreData,
+					"-framework",
+					Foundation,
+					"-framework",
+					CoreBluetooth,
+					"-lnetwork",
+					"-Wl,-unexported_symbol,\"__Z*\"",
+				);
+				"OTHER_LDFLAGS[sdk=macosx*]" = (
+					"-framework",
+					IOKit,
+					"-lnetwork",
+					"-framework",
+					CoreBluetooth,
+					"-framework",
+					CoreData,
+					"-Wl,-unexported_symbol,\"__Z*\"",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.matter.TvCasting;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "MatterBridge/TvCasting-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		3CC0E9062841DD3500EC6A18 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CHIP_ROOT = "$(PROJECT_DIR)/../../../..";
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = TvCasting/TvCasting.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_ASSET_PATHS = "\"TvCasting/Preview Content\"";
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_PREVIEWS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					CHIP_HAVE_CONFIG_H,
+					"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
+					"$(inherited)",
+				);
+				GENERATE_INFOPLIST_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					"${CHIP_ROOT}/examples/tv-casting-app/tv-casting-common/include",
+					"$(CHIP_ROOT)/src",
+					"$(CHIP_ROOT)/src/include",
+					"$(CHIP_ROOT)/src/lib",
+					"$(CHIP_ROOT)/src/app",
+					"$(CHIP_ROOT)/config/ios",
+					"$(CHIP_ROOT)/src/darwin/Framework/CHIP/",
+					"$(CHIP_ROOT)/src/app/util",
+					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
+					"$(CHIP_ROOT)/third_party/nlio/repo/include",
+					"$(TEMP_DIR)/out/gen/include",
+					"$(CHIP_ROOT)/zzz_generated/",
+					"$(CHIP_ROOT)/zzz_generated/app-common",
+					"$(CHIP_ROOT)/zzz_generated/controller-clusters",
+				);
+				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
+				MARKETING_VERSION = 1.0;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"-Wformat",
+					"-Wformat-nonliteral",
+					"-Wformat-security",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.matter.TvCasting;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "MatterBridge/TvCasting-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		3CC0E8F12841DD3400EC6A18 /* Build configuration list for PBXProject "TvCasting" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3CC0E9022841DD3500EC6A18 /* Debug */,
+				3CC0E9032841DD3500EC6A18 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		3CC0E9042841DD3500EC6A18 /* Build configuration list for PBXNativeTarget "TvCasting" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3CC0E9052841DD3500EC6A18 /* Debug */,
+				3CC0E9062841DD3500EC6A18 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 3CC0E8EE2841DD3400EC6A18 /* Project object */;
+}
diff --git a/examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/xcshareddata/xcschemes/TvCasting.xcscheme b/examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/xcshareddata/xcschemes/TvCasting.xcscheme
new file mode 100644
index 00000000000000..d09946d0f6a346
--- /dev/null
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting.xcodeproj/xcshareddata/xcschemes/TvCasting.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3CC0E8F52841DD3400EC6A18"
+               BuildableName = "TvCasting.app"
+               BlueprintName = "TvCasting"
+               ReferencedContainer = "container:TvCasting.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3CC0E8F52841DD3400EC6A18"
+            BuildableName = "TvCasting.app"
+            BlueprintName = "TvCasting"
+            ReferencedContainer = "container:TvCasting.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3CC0E8F52841DD3400EC6A18"
+            BuildableName = "TvCasting.app"
+            BlueprintName = "TvCasting"
+            ReferencedContainer = "container:TvCasting.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/examples/tv-casting-app/darwin/darwin/Assets.xcassets/AccentColor.colorset/Contents.json b/examples/tv-casting-app/darwin/TvCasting/TvCasting/Assets.xcassets/AccentColor.colorset/Contents.json
similarity index 100%
rename from examples/tv-casting-app/darwin/darwin/Assets.xcassets/AccentColor.colorset/Contents.json
rename to examples/tv-casting-app/darwin/TvCasting/TvCasting/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/examples/tv-casting-app/darwin/darwin/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/tv-casting-app/darwin/TvCasting/TvCasting/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from examples/tv-casting-app/darwin/darwin/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to examples/tv-casting-app/darwin/TvCasting/TvCasting/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/examples/tv-casting-app/darwin/darwin/Assets.xcassets/Contents.json b/examples/tv-casting-app/darwin/TvCasting/TvCasting/Assets.xcassets/Contents.json
similarity index 100%
rename from examples/tv-casting-app/darwin/darwin/Assets.xcassets/Contents.json
rename to examples/tv-casting-app/darwin/TvCasting/TvCasting/Assets.xcassets/Contents.json
diff --git a/examples/tv-casting-app/darwin/darwin/main.m b/examples/tv-casting-app/darwin/TvCasting/TvCasting/ContentView.swift
similarity index 64%
rename from examples/tv-casting-app/darwin/darwin/main.m
rename to examples/tv-casting-app/darwin/TvCasting/TvCasting/ContentView.swift
index 17c6551eaa5408..737ea26a856383 100644
--- a/examples/tv-casting-app/darwin/darwin/main.m
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting/ContentView.swift
@@ -15,15 +15,17 @@
  *    limitations under the License.
  */
 
-#import "AppDelegate.h"
-#import <UIKit/UIKit.h>
+import SwiftUI
 
-int main(int argc, char * argv[])
-{
-    NSString * appDelegateClassName;
-    @autoreleasepool {
-        // Setup code that might create autoreleased objects goes here.
-        appDelegateClassName = NSStringFromClass([AppDelegate class]);
+struct ContentView: View {
+    var body: some View {
+        Text("Hello tv-casting-common C++, from Objective-C, from Swift! Sum: " + String(CastingServerBridge.getSharedInstance().add(5, secondNum: 6)))
+            .padding()
+    }
+}
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
     }
-    return UIApplicationMain(argc, argv, nil, appDelegateClassName);
 }
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/Contents.json b/examples/tv-casting-app/darwin/TvCasting/TvCasting/Preview Content/Preview Assets.xcassets/Contents.json
similarity index 100%
rename from examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/Contents.json
rename to examples/tv-casting-app/darwin/TvCasting/TvCasting/Preview Content/Preview Assets.xcassets/Contents.json
diff --git a/examples/tv-casting-app/darwin/TvCasting/TvCasting/TvCasting.entitlements b/examples/tv-casting-app/darwin/TvCasting/TvCasting/TvCasting.entitlements
new file mode 100644
index 00000000000000..7a2230dc331daf
--- /dev/null
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting/TvCasting.entitlements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/ViewController.h b/examples/tv-casting-app/darwin/TvCasting/TvCasting/TvCastingApp.swift
similarity index 82%
rename from examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/ViewController.h
rename to examples/tv-casting-app/darwin/TvCasting/TvCasting/TvCastingApp.swift
index e122b5c9ad9c0c..27dce5b63f55f1 100644
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/ViewController.h
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting/TvCastingApp.swift
@@ -15,8 +15,13 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
+import SwiftUI
 
-@interface ViewController : UIViewController
-
-@end
+@main
+struct TvCastingApp: App {
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+        }
+    }
+}
diff --git a/examples/tv-casting-app/darwin/TvCasting/chip_xcode_build_connector.sh b/examples/tv-casting-app/darwin/TvCasting/chip_xcode_build_connector.sh
new file mode 100755
index 00000000000000..d5ec1edcb4c206
--- /dev/null
+++ b/examples/tv-casting-app/darwin/TvCasting/chip_xcode_build_connector.sh
@@ -0,0 +1,162 @@
+#!/usr/bin/env bash
+
+#
+#    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.
+#
+
+# This script connects Xcode's "Run Script" build phase to a build of CHIP for Apple's environments.
+#
+# Conventions used in this script:
+#  * Variables in upper case supplied by Xcode (or other executor), are exported to subprocesses, or
+#      are upper-case elsewhere in CHIP scripts (e.g. CHIP_ROOT is only used locally,
+#      but is all uppper). Variables defined herein and used locally are lower-case
+#
+
+here=$(cd "${0%/*}" && pwd)
+me=${0##*/}
+
+CHIP_ROOT=$(cd "$here/../../../.." && pwd)
+
+die() {
+    echo "$me: *** ERROR: $*"
+    exit 1
+}
+
+# lotsa debug output :-)
+set -ex
+
+# helpful debugging, save off environment that Xcode gives us, can source it to
+#  retry/repro failures from a bash terminal
+mkdir -p "$TEMP_DIR"
+export >"$TEMP_DIR/env.sh"
+
+declare -a defines=()
+# lots of environment variables passed by Xcode to this script
+read -r -a defines <<<"$GCC_PREPROCESSOR_DEFINITIONS"
+
+declare target_defines=
+for define in "${defines[@]}"; do
+
+    # skip over those that GN does for us
+    case "$define" in
+        CHIP_HAVE_CONFIG_H)
+            continue
+            ;;
+    esac
+    target_defines+=,\"${define//\"/\\\"}\"
+done
+target_defines=[${target_defines:1}]
+
+declare target_cpu=
+case $PLATFORM_PREFERRED_ARCH in
+    i386)
+        target_cpu=x86
+        ;;
+    x86_64)
+        target_cpu=x64
+        ;;
+    armv7)
+        target_cpu=arm
+        ;;
+    arm64)
+        target_cpu=arm64
+        ;;
+    *)
+        echo >&2
+        ;;
+esac
+
+declare target_cflags='"-target","'"$PLATFORM_PREFERRED_ARCH"'-'"$LLVM_TARGET_TRIPLE_VENDOR"'-'"$LLVM_TARGET_TRIPLE_OS_VERSION"'"'
+
+read -r -a archs <<<"$ARCHS"
+
+for arch in "${archs[@]}"; do
+    target_cflags+=',"-arch","'"$arch"'"'
+done
+
+[[ $ENABLE_BITCODE == YES ]] && {
+    target_cflags+=',"-flto"'
+}
+
+declare -a args=(
+    'default_configs_cosmetic=[]' # suppress colorization
+    'chip_crypto="mbedtls"'
+    'chip_build_tools=false'
+    'chip_build_tests=false'
+    'target_cpu="'"$target_cpu"'"'
+    'target_defines='"$target_defines"
+    'target_cflags=['"$target_cflags"']'
+    'build_tv_casting_common_a=true'
+)
+
+[[ $CONFIGURATION != Debug* ]] && args+='is_debug=true'
+
+[[ $PLATFORM_FAMILY_NAME != macOS ]] && {
+    args+=(
+        'target_os="ios"'
+        'import("//config/ios/args.gni")'
+    )
+}
+
+[[ $PLATFORM_FAMILY_NAME == macOS ]] && {
+    args+=(
+        'target_os="mac"'
+    )
+}
+
+# search current (or $2) and its parent directories until
+#  a name match is found, which is output on stdout
+find_in_ancestors() {
+    declare to_find="${1}"
+    declare dir="${2:-$(pwd)}"
+
+    while [[ ! -e ${dir}/${to_find} && -n ${dir} ]]; do
+        dir=${dir%/*}
+    done
+
+    if [[ ! -e ${dir}/${to_find} ]]; then
+        printf 'error: find_in_ancestors: %s not found\n' "$to_find" >&2
+        return 1
+    fi
+    printf '%s\n' "$dir/$to_find"
+}
+
+# actual build stuff
+(
+    cd "$CHIP_ROOT" # pushd and popd because we need the env vars from activate
+
+    if ENV=$(find_in_ancestors chip_xcode_build_connector_env.sh 2>/dev/null); then
+        . "$ENV"
+    fi
+
+    # there are environments where these bits are unwanted, unnecessary, or impossible
+    [[ -n $CHIP_NO_SUBMODULES ]] || git submodule update --init
+    if [[ -z $CHIP_NO_ACTIVATE ]]; then
+        # first run bootstrap/activate in an external env to build everything
+        env -i PW_ENVSETUP_NO_BANNER=1 PW_ENVSETUP_QUIET=1 bash -c '. scripts/activate.sh'
+        set +ex
+        # now source activate for env vars
+        PW_ENVSETUP_NO_BANNER=1 PW_ENVSETUP_QUIET=1 . scripts/activate.sh
+        set -ex
+    fi
+
+    # put build intermediates in TEMP_DIR
+    cd "$TEMP_DIR"
+
+    # gnerate and build
+    gn --root="$CHIP_ROOT" gen --check out --args="${args[*]}"
+    ninja -v -C out
+)
diff --git a/examples/tv-casting-app/darwin/Darwin.xcworkspace/contents.xcworkspacedata b/examples/tv-casting-app/darwin/TvCastingDarwin.xcworkspace/contents.xcworkspacedata
similarity index 61%
rename from examples/tv-casting-app/darwin/Darwin.xcworkspace/contents.xcworkspacedata
rename to examples/tv-casting-app/darwin/TvCastingDarwin.xcworkspace/contents.xcworkspacedata
index 084bb6822bc300..b38c76bf17c560 100644
--- a/examples/tv-casting-app/darwin/Darwin.xcworkspace/contents.xcworkspacedata
+++ b/examples/tv-casting-app/darwin/TvCastingDarwin.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:iOSTVCastingApp/iOSTVCastingApp.xcodeproj">
+      location = "group:TvCasting/TvCasting.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/examples/tv-casting-app/darwin/Darwin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/examples/tv-casting-app/darwin/TvCastingDarwin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from examples/tv-casting-app/darwin/Darwin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to examples/tv-casting-app/darwin/TvCastingDarwin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/examples/tv-casting-app/darwin/darwin.xcodeproj/project.pbxproj b/examples/tv-casting-app/darwin/darwin.xcodeproj/project.pbxproj
deleted file mode 100644
index f2027a6b29c9a2..00000000000000
--- a/examples/tv-casting-app/darwin/darwin.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,587 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 50;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		3CB8D82227962E3E00BA4D5D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D82127962E3E00BA4D5D /* AppDelegate.m */; };
-		3CB8D82527962E3E00BA4D5D /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D82427962E3E00BA4D5D /* SceneDelegate.m */; };
-		3CB8D82827962E3E00BA4D5D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D82727962E3E00BA4D5D /* ViewController.m */; };
-		3CB8D82B27962E3E00BA4D5D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CB8D82927962E3E00BA4D5D /* Main.storyboard */; };
-		3CB8D82D27962E4800BA4D5D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3CB8D82C27962E4800BA4D5D /* Assets.xcassets */; };
-		3CB8D83027962E4800BA4D5D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CB8D82E27962E4800BA4D5D /* LaunchScreen.storyboard */; };
-		3CB8D83327962E4800BA4D5D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D83227962E4800BA4D5D /* main.m */; };
-		3CB8D83D27962E4900BA4D5D /* darwinTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D83C27962E4900BA4D5D /* darwinTests.m */; };
-		3CB8D84827962E4900BA4D5D /* darwinUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D84727962E4900BA4D5D /* darwinUITests.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		3CB8D83927962E4900BA4D5D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3CB8D81527962E3E00BA4D5D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3CB8D81C27962E3E00BA4D5D;
-			remoteInfo = darwin;
-		};
-		3CB8D84427962E4900BA4D5D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3CB8D81527962E3E00BA4D5D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3CB8D81C27962E3E00BA4D5D;
-			remoteInfo = darwin;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		3CB8D81D27962E3E00BA4D5D /* darwin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = darwin.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		3CB8D82027962E3E00BA4D5D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		3CB8D82127962E3E00BA4D5D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		3CB8D82327962E3E00BA4D5D /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
-		3CB8D82427962E3E00BA4D5D /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
-		3CB8D82627962E3E00BA4D5D /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		3CB8D82727962E3E00BA4D5D /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		3CB8D82A27962E3E00BA4D5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		3CB8D82C27962E4800BA4D5D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		3CB8D82F27962E4800BA4D5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		3CB8D83127962E4800BA4D5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3CB8D83227962E4800BA4D5D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		3CB8D83827962E4900BA4D5D /* darwinTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = darwinTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		3CB8D83C27962E4900BA4D5D /* darwinTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = darwinTests.m; sourceTree = "<group>"; };
-		3CB8D83E27962E4900BA4D5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3CB8D84327962E4900BA4D5D /* darwinUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = darwinUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		3CB8D84727962E4900BA4D5D /* darwinUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = darwinUITests.m; sourceTree = "<group>"; };
-		3CB8D84927962E4900BA4D5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		3CB8D81A27962E3E00BA4D5D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D83527962E4900BA4D5D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D84027962E4900BA4D5D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		3CB8D81427962E3E00BA4D5D = {
-			isa = PBXGroup;
-			children = (
-				3CB8D81F27962E3E00BA4D5D /* darwin */,
-				3CB8D83B27962E4900BA4D5D /* darwinTests */,
-				3CB8D84627962E4900BA4D5D /* darwinUITests */,
-				3CB8D81E27962E3E00BA4D5D /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		3CB8D81E27962E3E00BA4D5D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D81D27962E3E00BA4D5D /* darwin.app */,
-				3CB8D83827962E4900BA4D5D /* darwinTests.xctest */,
-				3CB8D84327962E4900BA4D5D /* darwinUITests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		3CB8D81F27962E3E00BA4D5D /* darwin */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D82027962E3E00BA4D5D /* AppDelegate.h */,
-				3CB8D82127962E3E00BA4D5D /* AppDelegate.m */,
-				3CB8D82327962E3E00BA4D5D /* SceneDelegate.h */,
-				3CB8D82427962E3E00BA4D5D /* SceneDelegate.m */,
-				3CB8D82627962E3E00BA4D5D /* ViewController.h */,
-				3CB8D82727962E3E00BA4D5D /* ViewController.m */,
-				3CB8D82927962E3E00BA4D5D /* Main.storyboard */,
-				3CB8D82C27962E4800BA4D5D /* Assets.xcassets */,
-				3CB8D82E27962E4800BA4D5D /* LaunchScreen.storyboard */,
-				3CB8D83127962E4800BA4D5D /* Info.plist */,
-				3CB8D83227962E4800BA4D5D /* main.m */,
-			);
-			path = darwin;
-			sourceTree = "<group>";
-		};
-		3CB8D83B27962E4900BA4D5D /* darwinTests */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D83C27962E4900BA4D5D /* darwinTests.m */,
-				3CB8D83E27962E4900BA4D5D /* Info.plist */,
-			);
-			path = darwinTests;
-			sourceTree = "<group>";
-		};
-		3CB8D84627962E4900BA4D5D /* darwinUITests */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D84727962E4900BA4D5D /* darwinUITests.m */,
-				3CB8D84927962E4900BA4D5D /* Info.plist */,
-			);
-			path = darwinUITests;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		3CB8D81C27962E3E00BA4D5D /* darwin */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3CB8D84C27962E4900BA4D5D /* Build configuration list for PBXNativeTarget "darwin" */;
-			buildPhases = (
-				3CB8D81927962E3E00BA4D5D /* Sources */,
-				3CB8D81A27962E3E00BA4D5D /* Frameworks */,
-				3CB8D81B27962E3E00BA4D5D /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = darwin;
-			productName = darwin;
-			productReference = 3CB8D81D27962E3E00BA4D5D /* darwin.app */;
-			productType = "com.apple.product-type.application";
-		};
-		3CB8D83727962E4900BA4D5D /* darwinTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3CB8D84F27962E4900BA4D5D /* Build configuration list for PBXNativeTarget "darwinTests" */;
-			buildPhases = (
-				3CB8D83427962E4900BA4D5D /* Sources */,
-				3CB8D83527962E4900BA4D5D /* Frameworks */,
-				3CB8D83627962E4900BA4D5D /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				3CB8D83A27962E4900BA4D5D /* PBXTargetDependency */,
-			);
-			name = darwinTests;
-			productName = darwinTests;
-			productReference = 3CB8D83827962E4900BA4D5D /* darwinTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		3CB8D84227962E4900BA4D5D /* darwinUITests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3CB8D85227962E4900BA4D5D /* Build configuration list for PBXNativeTarget "darwinUITests" */;
-			buildPhases = (
-				3CB8D83F27962E4900BA4D5D /* Sources */,
-				3CB8D84027962E4900BA4D5D /* Frameworks */,
-				3CB8D84127962E4900BA4D5D /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				3CB8D84527962E4900BA4D5D /* PBXTargetDependency */,
-			);
-			name = darwinUITests;
-			productName = darwinUITests;
-			productReference = 3CB8D84327962E4900BA4D5D /* darwinUITests.xctest */;
-			productType = "com.apple.product-type.bundle.ui-testing";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		3CB8D81527962E3E00BA4D5D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1240;
-				TargetAttributes = {
-					3CB8D81C27962E3E00BA4D5D = {
-						CreatedOnToolsVersion = 12.4;
-					};
-					3CB8D83727962E4900BA4D5D = {
-						CreatedOnToolsVersion = 12.4;
-						TestTargetID = 3CB8D81C27962E3E00BA4D5D;
-					};
-					3CB8D84227962E4900BA4D5D = {
-						CreatedOnToolsVersion = 12.4;
-						TestTargetID = 3CB8D81C27962E3E00BA4D5D;
-					};
-				};
-			};
-			buildConfigurationList = 3CB8D81827962E3E00BA4D5D /* Build configuration list for PBXProject "darwin" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 3CB8D81427962E3E00BA4D5D;
-			productRefGroup = 3CB8D81E27962E3E00BA4D5D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				3CB8D81C27962E3E00BA4D5D /* darwin */,
-				3CB8D83727962E4900BA4D5D /* darwinTests */,
-				3CB8D84227962E4900BA4D5D /* darwinUITests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		3CB8D81B27962E3E00BA4D5D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D83027962E4800BA4D5D /* LaunchScreen.storyboard in Resources */,
-				3CB8D82D27962E4800BA4D5D /* Assets.xcassets in Resources */,
-				3CB8D82B27962E3E00BA4D5D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D83627962E4900BA4D5D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D84127962E4900BA4D5D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		3CB8D81927962E3E00BA4D5D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D82827962E3E00BA4D5D /* ViewController.m in Sources */,
-				3CB8D82227962E3E00BA4D5D /* AppDelegate.m in Sources */,
-				3CB8D83327962E4800BA4D5D /* main.m in Sources */,
-				3CB8D82527962E3E00BA4D5D /* SceneDelegate.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D83427962E4900BA4D5D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D83D27962E4900BA4D5D /* darwinTests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D83F27962E4900BA4D5D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D84827962E4900BA4D5D /* darwinUITests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		3CB8D83A27962E4900BA4D5D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3CB8D81C27962E3E00BA4D5D /* darwin */;
-			targetProxy = 3CB8D83927962E4900BA4D5D /* PBXContainerItemProxy */;
-		};
-		3CB8D84527962E4900BA4D5D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3CB8D81C27962E3E00BA4D5D /* darwin */;
-			targetProxy = 3CB8D84427962E4900BA4D5D /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		3CB8D82927962E3E00BA4D5D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				3CB8D82A27962E3E00BA4D5D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		3CB8D82E27962E4800BA4D5D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				3CB8D82F27962E4800BA4D5D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		3CB8D84A27962E4900BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		3CB8D84B27962E4900BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		3CB8D84D27962E4900BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = darwin/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.darwin;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		3CB8D84E27962E4900BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = darwin/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.darwin;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-		3CB8D85027962E4900BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = darwinTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.darwinTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/darwin.app/darwin";
-			};
-			name = Debug;
-		};
-		3CB8D85127962E4900BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = darwinTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.darwinTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/darwin.app/darwin";
-			};
-			name = Release;
-		};
-		3CB8D85327962E4900BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = darwinUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.darwinUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = darwin;
-			};
-			name = Debug;
-		};
-		3CB8D85427962E4900BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = darwinUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.darwinUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = darwin;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		3CB8D81827962E3E00BA4D5D /* Build configuration list for PBXProject "darwin" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D84A27962E4900BA4D5D /* Debug */,
-				3CB8D84B27962E4900BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3CB8D84C27962E4900BA4D5D /* Build configuration list for PBXNativeTarget "darwin" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D84D27962E4900BA4D5D /* Debug */,
-				3CB8D84E27962E4900BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3CB8D84F27962E4900BA4D5D /* Build configuration list for PBXNativeTarget "darwinTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D85027962E4900BA4D5D /* Debug */,
-				3CB8D85127962E4900BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3CB8D85227962E4900BA4D5D /* Build configuration list for PBXNativeTarget "darwinUITests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D85327962E4900BA4D5D /* Debug */,
-				3CB8D85427962E4900BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 3CB8D81527962E3E00BA4D5D /* Project object */;
-}
diff --git a/examples/tv-casting-app/darwin/darwin/AppDelegate.m b/examples/tv-casting-app/darwin/darwin/AppDelegate.m
deleted file mode 100644
index 2c2c939aa49403..00000000000000
--- a/examples/tv-casting-app/darwin/darwin/AppDelegate.m
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import "AppDelegate.h"
-
-@interface AppDelegate ()
-
-@end
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    // Override point for customization after application launch.
-    return YES;
-}
-
-#pragma mark - UISceneSession lifecycle
-
-- (UISceneConfiguration *)application:(UIApplication *)application
-    configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession
-                                   options:(UISceneConnectionOptions *)options
-{
-    // Called when a new scene session is being created.
-    // Use this method to select a configuration to create the new scene with.
-    return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role];
-}
-
-- (void)application:(UIApplication *)application didDiscardSceneSessions:(NSSet<UISceneSession *> *)sceneSessions
-{
-    // Called when the user discards a scene session.
-    // If any sessions were discarded while the application was not running, this will be called shortly after
-    // application:didFinishLaunchingWithOptions. Use this method to release any resources that were specific to the discarded
-    // scenes, as they will not return.
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/darwin/Base.lproj/LaunchScreen.storyboard b/examples/tv-casting-app/darwin/darwin/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index 865e9329f3767a..00000000000000
--- a/examples/tv-casting-app/darwin/darwin/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/examples/tv-casting-app/darwin/darwin/Base.lproj/Main.storyboard b/examples/tv-casting-app/darwin/darwin/Base.lproj/Main.storyboard
deleted file mode 100644
index 808a21ce779bae..00000000000000
--- a/examples/tv-casting-app/darwin/darwin/Base.lproj/Main.storyboard
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>
diff --git a/examples/tv-casting-app/darwin/darwin/Info.plist b/examples/tv-casting-app/darwin/darwin/Info.plist
deleted file mode 100644
index 72bf2c4f5985f3..00000000000000
--- a/examples/tv-casting-app/darwin/darwin/Info.plist
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneConfigurationName</key>
-					<string>Default Configuration</string>
-					<key>UISceneDelegateClassName</key>
-					<string>SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/examples/tv-casting-app/darwin/darwin/SceneDelegate.m b/examples/tv-casting-app/darwin/darwin/SceneDelegate.m
deleted file mode 100644
index 9a34646685879c..00000000000000
--- a/examples/tv-casting-app/darwin/darwin/SceneDelegate.m
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import "SceneDelegate.h"
-
-@interface SceneDelegate ()
-
-@end
-
-@implementation SceneDelegate
-
-- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
-{
-    // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
-    // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
-    // This delegate does not imply the connecting scene or session are new (see
-    // `application:configurationForConnectingSceneSession` instead).
-}
-
-- (void)sceneDidDisconnect:(UIScene *)scene
-{
-    // Called as the scene is being released by the system.
-    // This occurs shortly after the scene enters the background, or when its session is discarded.
-    // Release any resources associated with this scene that can be re-created the next time the scene connects.
-    // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions`
-    // instead).
-}
-
-- (void)sceneDidBecomeActive:(UIScene *)scene
-{
-    // Called when the scene has moved from an inactive state to an active state.
-    // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
-}
-
-- (void)sceneWillResignActive:(UIScene *)scene
-{
-    // Called when the scene will move from an active state to an inactive state.
-    // This may occur due to temporary interruptions (ex. an incoming phone call).
-}
-
-- (void)sceneWillEnterForeground:(UIScene *)scene
-{
-    // Called as the scene transitions from the background to the foreground.
-    // Use this method to undo the changes made on entering the background.
-}
-
-- (void)sceneDidEnterBackground:(UIScene *)scene
-{
-    // Called as the scene transitions from the foreground to the background.
-    // Use this method to save data, release shared resources, and store enough scene-specific state information
-    // to restore the scene back to its current state.
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/darwinTests/Info.plist b/examples/tv-casting-app/darwin/darwinTests/Info.plist
deleted file mode 100644
index 64d65ca495770b..00000000000000
--- a/examples/tv-casting-app/darwin/darwinTests/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/examples/tv-casting-app/darwin/darwinTests/darwinTests.m b/examples/tv-casting-app/darwin/darwinTests/darwinTests.m
deleted file mode 100644
index 81f43c1ecb8eca..00000000000000
--- a/examples/tv-casting-app/darwin/darwinTests/darwinTests.m
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import <XCTest/XCTest.h>
-
-@interface darwinTests : XCTestCase
-
-@end
-
-@implementation darwinTests
-
-- (void)setUp
-{
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-}
-
-- (void)testExample
-{
-    // This is an example of a functional test case.
-    // Use XCTAssert and related functions to verify your tests produce the correct results.
-}
-
-- (void)testPerformanceExample
-{
-    // This is an example of a performance test case.
-    [self measureBlock:^ {
-        // Put the code you want to measure the time of here.
-    }];
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/darwinUITests/Info.plist b/examples/tv-casting-app/darwin/darwinUITests/Info.plist
deleted file mode 100644
index 64d65ca495770b..00000000000000
--- a/examples/tv-casting-app/darwin/darwinUITests/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/examples/tv-casting-app/darwin/darwinUITests/darwinUITests.m b/examples/tv-casting-app/darwin/darwinUITests/darwinUITests.m
deleted file mode 100644
index 2f127dda433ad7..00000000000000
--- a/examples/tv-casting-app/darwin/darwinUITests/darwinUITests.m
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import <XCTest/XCTest.h>
-
-@interface darwinUITests : XCTestCase
-
-@end
-
-@implementation darwinUITests
-
-- (void)setUp
-{
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-
-    // In UI tests it is usually best to stop immediately when a failure occurs.
-    self.continueAfterFailure = NO;
-
-    // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they
-    // run. The setUp method is a good place to do this.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-}
-
-- (void)testExample
-{
-    // UI tests must launch the application that they test.
-    XCUIApplication * app = [[XCUIApplication alloc] init];
-    [app launch];
-
-    // Use recording to get started writing UI tests.
-    // Use XCTAssert and related functions to verify your tests produce the correct results.
-}
-
-- (void)testLaunchPerformance
-{
-    if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
-        // This measures how long it takes to launch your application.
-        [self measureWithMetrics:@[ [[XCTApplicationLaunchMetric alloc] init] ]
-                           block:^{
-                               [[[XCUIApplication alloc] init] launch];
-                           }];
-    }
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp.xcodeproj/project.pbxproj b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp.xcodeproj/project.pbxproj
deleted file mode 100644
index 755ed4003980f6..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,587 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 50;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		3CB8D86627962FD100BA4D5D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D86527962FD100BA4D5D /* AppDelegate.m */; };
-		3CB8D86927962FD100BA4D5D /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D86827962FD100BA4D5D /* SceneDelegate.m */; };
-		3CB8D86C27962FD100BA4D5D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D86B27962FD100BA4D5D /* ViewController.m */; };
-		3CB8D86F27962FD100BA4D5D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CB8D86D27962FD100BA4D5D /* Main.storyboard */; };
-		3CB8D87127962FDA00BA4D5D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3CB8D87027962FDA00BA4D5D /* Assets.xcassets */; };
-		3CB8D87427962FDA00BA4D5D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CB8D87227962FDA00BA4D5D /* LaunchScreen.storyboard */; };
-		3CB8D87727962FDA00BA4D5D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D87627962FDA00BA4D5D /* main.m */; };
-		3CB8D88127962FDA00BA4D5D /* iOSTVCastingAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D88027962FDA00BA4D5D /* iOSTVCastingAppTests.m */; };
-		3CB8D88C27962FDB00BA4D5D /* iOSTVCastingAppUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB8D88B27962FDB00BA4D5D /* iOSTVCastingAppUITests.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		3CB8D87D27962FDA00BA4D5D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3CB8D85927962FD100BA4D5D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3CB8D86027962FD100BA4D5D;
-			remoteInfo = iOSTVCastingApp;
-		};
-		3CB8D88827962FDB00BA4D5D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3CB8D85927962FD100BA4D5D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3CB8D86027962FD100BA4D5D;
-			remoteInfo = iOSTVCastingApp;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		3CB8D86127962FD100BA4D5D /* iOSTVCastingApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSTVCastingApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		3CB8D86427962FD100BA4D5D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		3CB8D86527962FD100BA4D5D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		3CB8D86727962FD100BA4D5D /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
-		3CB8D86827962FD100BA4D5D /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
-		3CB8D86A27962FD100BA4D5D /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		3CB8D86B27962FD100BA4D5D /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		3CB8D86E27962FD100BA4D5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		3CB8D87027962FDA00BA4D5D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		3CB8D87327962FDA00BA4D5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		3CB8D87527962FDA00BA4D5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3CB8D87627962FDA00BA4D5D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		3CB8D87C27962FDA00BA4D5D /* iOSTVCastingAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOSTVCastingAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		3CB8D88027962FDA00BA4D5D /* iOSTVCastingAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iOSTVCastingAppTests.m; sourceTree = "<group>"; };
-		3CB8D88227962FDA00BA4D5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3CB8D88727962FDB00BA4D5D /* iOSTVCastingAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOSTVCastingAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		3CB8D88B27962FDB00BA4D5D /* iOSTVCastingAppUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iOSTVCastingAppUITests.m; sourceTree = "<group>"; };
-		3CB8D88D27962FDB00BA4D5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		3CB8D85E27962FD100BA4D5D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D87927962FDA00BA4D5D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D88427962FDB00BA4D5D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		3CB8D85827962FD100BA4D5D = {
-			isa = PBXGroup;
-			children = (
-				3CB8D86327962FD100BA4D5D /* iOSTVCastingApp */,
-				3CB8D87F27962FDA00BA4D5D /* iOSTVCastingAppTests */,
-				3CB8D88A27962FDB00BA4D5D /* iOSTVCastingAppUITests */,
-				3CB8D86227962FD100BA4D5D /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		3CB8D86227962FD100BA4D5D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D86127962FD100BA4D5D /* iOSTVCastingApp.app */,
-				3CB8D87C27962FDA00BA4D5D /* iOSTVCastingAppTests.xctest */,
-				3CB8D88727962FDB00BA4D5D /* iOSTVCastingAppUITests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		3CB8D86327962FD100BA4D5D /* iOSTVCastingApp */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D86427962FD100BA4D5D /* AppDelegate.h */,
-				3CB8D86527962FD100BA4D5D /* AppDelegate.m */,
-				3CB8D86727962FD100BA4D5D /* SceneDelegate.h */,
-				3CB8D86827962FD100BA4D5D /* SceneDelegate.m */,
-				3CB8D86A27962FD100BA4D5D /* ViewController.h */,
-				3CB8D86B27962FD100BA4D5D /* ViewController.m */,
-				3CB8D86D27962FD100BA4D5D /* Main.storyboard */,
-				3CB8D87027962FDA00BA4D5D /* Assets.xcassets */,
-				3CB8D87227962FDA00BA4D5D /* LaunchScreen.storyboard */,
-				3CB8D87527962FDA00BA4D5D /* Info.plist */,
-				3CB8D87627962FDA00BA4D5D /* main.m */,
-			);
-			path = iOSTVCastingApp;
-			sourceTree = "<group>";
-		};
-		3CB8D87F27962FDA00BA4D5D /* iOSTVCastingAppTests */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D88027962FDA00BA4D5D /* iOSTVCastingAppTests.m */,
-				3CB8D88227962FDA00BA4D5D /* Info.plist */,
-			);
-			path = iOSTVCastingAppTests;
-			sourceTree = "<group>";
-		};
-		3CB8D88A27962FDB00BA4D5D /* iOSTVCastingAppUITests */ = {
-			isa = PBXGroup;
-			children = (
-				3CB8D88B27962FDB00BA4D5D /* iOSTVCastingAppUITests.m */,
-				3CB8D88D27962FDB00BA4D5D /* Info.plist */,
-			);
-			path = iOSTVCastingAppUITests;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		3CB8D86027962FD100BA4D5D /* iOSTVCastingApp */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3CB8D89027962FDB00BA4D5D /* Build configuration list for PBXNativeTarget "iOSTVCastingApp" */;
-			buildPhases = (
-				3CB8D85D27962FD100BA4D5D /* Sources */,
-				3CB8D85E27962FD100BA4D5D /* Frameworks */,
-				3CB8D85F27962FD100BA4D5D /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = iOSTVCastingApp;
-			productName = iOSTVCastingApp;
-			productReference = 3CB8D86127962FD100BA4D5D /* iOSTVCastingApp.app */;
-			productType = "com.apple.product-type.application";
-		};
-		3CB8D87B27962FDA00BA4D5D /* iOSTVCastingAppTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3CB8D89327962FDB00BA4D5D /* Build configuration list for PBXNativeTarget "iOSTVCastingAppTests" */;
-			buildPhases = (
-				3CB8D87827962FDA00BA4D5D /* Sources */,
-				3CB8D87927962FDA00BA4D5D /* Frameworks */,
-				3CB8D87A27962FDA00BA4D5D /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				3CB8D87E27962FDA00BA4D5D /* PBXTargetDependency */,
-			);
-			name = iOSTVCastingAppTests;
-			productName = iOSTVCastingAppTests;
-			productReference = 3CB8D87C27962FDA00BA4D5D /* iOSTVCastingAppTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		3CB8D88627962FDB00BA4D5D /* iOSTVCastingAppUITests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3CB8D89627962FDB00BA4D5D /* Build configuration list for PBXNativeTarget "iOSTVCastingAppUITests" */;
-			buildPhases = (
-				3CB8D88327962FDB00BA4D5D /* Sources */,
-				3CB8D88427962FDB00BA4D5D /* Frameworks */,
-				3CB8D88527962FDB00BA4D5D /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				3CB8D88927962FDB00BA4D5D /* PBXTargetDependency */,
-			);
-			name = iOSTVCastingAppUITests;
-			productName = iOSTVCastingAppUITests;
-			productReference = 3CB8D88727962FDB00BA4D5D /* iOSTVCastingAppUITests.xctest */;
-			productType = "com.apple.product-type.bundle.ui-testing";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		3CB8D85927962FD100BA4D5D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1240;
-				TargetAttributes = {
-					3CB8D86027962FD100BA4D5D = {
-						CreatedOnToolsVersion = 12.4;
-					};
-					3CB8D87B27962FDA00BA4D5D = {
-						CreatedOnToolsVersion = 12.4;
-						TestTargetID = 3CB8D86027962FD100BA4D5D;
-					};
-					3CB8D88627962FDB00BA4D5D = {
-						CreatedOnToolsVersion = 12.4;
-						TestTargetID = 3CB8D86027962FD100BA4D5D;
-					};
-				};
-			};
-			buildConfigurationList = 3CB8D85C27962FD100BA4D5D /* Build configuration list for PBXProject "iOSTVCastingApp" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 3CB8D85827962FD100BA4D5D;
-			productRefGroup = 3CB8D86227962FD100BA4D5D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				3CB8D86027962FD100BA4D5D /* iOSTVCastingApp */,
-				3CB8D87B27962FDA00BA4D5D /* iOSTVCastingAppTests */,
-				3CB8D88627962FDB00BA4D5D /* iOSTVCastingAppUITests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		3CB8D85F27962FD100BA4D5D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D87427962FDA00BA4D5D /* LaunchScreen.storyboard in Resources */,
-				3CB8D87127962FDA00BA4D5D /* Assets.xcassets in Resources */,
-				3CB8D86F27962FD100BA4D5D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D87A27962FDA00BA4D5D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D88527962FDB00BA4D5D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		3CB8D85D27962FD100BA4D5D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D86C27962FD100BA4D5D /* ViewController.m in Sources */,
-				3CB8D86627962FD100BA4D5D /* AppDelegate.m in Sources */,
-				3CB8D87727962FDA00BA4D5D /* main.m in Sources */,
-				3CB8D86927962FD100BA4D5D /* SceneDelegate.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D87827962FDA00BA4D5D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D88127962FDA00BA4D5D /* iOSTVCastingAppTests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3CB8D88327962FDB00BA4D5D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3CB8D88C27962FDB00BA4D5D /* iOSTVCastingAppUITests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		3CB8D87E27962FDA00BA4D5D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3CB8D86027962FD100BA4D5D /* iOSTVCastingApp */;
-			targetProxy = 3CB8D87D27962FDA00BA4D5D /* PBXContainerItemProxy */;
-		};
-		3CB8D88927962FDB00BA4D5D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3CB8D86027962FD100BA4D5D /* iOSTVCastingApp */;
-			targetProxy = 3CB8D88827962FDB00BA4D5D /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		3CB8D86D27962FD100BA4D5D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				3CB8D86E27962FD100BA4D5D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		3CB8D87227962FDA00BA4D5D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				3CB8D87327962FDA00BA4D5D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		3CB8D88E27962FDB00BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		3CB8D88F27962FDB00BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		3CB8D89127962FDB00BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = iOSTVCastingApp/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.iOSTVCastingApp;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		3CB8D89227962FDB00BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = iOSTVCastingApp/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.iOSTVCastingApp;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-		3CB8D89427962FDB00BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = iOSTVCastingAppTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.iOSTVCastingAppTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTVCastingApp.app/iOSTVCastingApp";
-			};
-			name = Debug;
-		};
-		3CB8D89527962FDB00BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = iOSTVCastingAppTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.iOSTVCastingAppTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTVCastingApp.app/iOSTVCastingApp";
-			};
-			name = Release;
-		};
-		3CB8D89727962FDB00BA4D5D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = iOSTVCastingAppUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.iOSTVCastingAppUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = iOSTVCastingApp;
-			};
-			name = Debug;
-		};
-		3CB8D89827962FDB00BA4D5D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = iOSTVCastingAppUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = darwin.iOSTVCastingAppUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = iOSTVCastingApp;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		3CB8D85C27962FD100BA4D5D /* Build configuration list for PBXProject "iOSTVCastingApp" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D88E27962FDB00BA4D5D /* Debug */,
-				3CB8D88F27962FDB00BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3CB8D89027962FDB00BA4D5D /* Build configuration list for PBXNativeTarget "iOSTVCastingApp" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D89127962FDB00BA4D5D /* Debug */,
-				3CB8D89227962FDB00BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3CB8D89327962FDB00BA4D5D /* Build configuration list for PBXNativeTarget "iOSTVCastingAppTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D89427962FDB00BA4D5D /* Debug */,
-				3CB8D89527962FDB00BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3CB8D89627962FDB00BA4D5D /* Build configuration list for PBXNativeTarget "iOSTVCastingAppUITests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3CB8D89727962FDB00BA4D5D /* Debug */,
-				3CB8D89827962FDB00BA4D5D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 3CB8D85927962FD100BA4D5D /* Project object */;
-}
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/AppDelegate.m b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/AppDelegate.m
deleted file mode 100644
index 2c2c939aa49403..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/AppDelegate.m
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import "AppDelegate.h"
-
-@interface AppDelegate ()
-
-@end
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    // Override point for customization after application launch.
-    return YES;
-}
-
-#pragma mark - UISceneSession lifecycle
-
-- (UISceneConfiguration *)application:(UIApplication *)application
-    configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession
-                                   options:(UISceneConnectionOptions *)options
-{
-    // Called when a new scene session is being created.
-    // Use this method to select a configuration to create the new scene with.
-    return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role];
-}
-
-- (void)application:(UIApplication *)application didDiscardSceneSessions:(NSSet<UISceneSession *> *)sceneSessions
-{
-    // Called when the user discards a scene session.
-    // If any sessions were discarded while the application was not running, this will be called shortly after
-    // application:didFinishLaunchingWithOptions. Use this method to release any resources that were specific to the discarded
-    // scenes, as they will not return.
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/AccentColor.colorset/Contents.json b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/AccentColor.colorset/Contents.json
deleted file mode 100644
index b246f6b1e23f13..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/AccentColor.colorset/Contents.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "colors": [
-        {
-            "idiom": "universal"
-        }
-    ],
-    "info": {
-        "author": "xcode",
-        "version": 1
-    }
-}
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 1cfd7dc1e5d63d..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "images": [
-        {
-            "idiom": "iphone",
-            "scale": "2x",
-            "size": "20x20"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "3x",
-            "size": "20x20"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "2x",
-            "size": "29x29"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "3x",
-            "size": "29x29"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "2x",
-            "size": "40x40"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "3x",
-            "size": "40x40"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "2x",
-            "size": "60x60"
-        },
-        {
-            "idiom": "iphone",
-            "scale": "3x",
-            "size": "60x60"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "1x",
-            "size": "20x20"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "2x",
-            "size": "20x20"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "1x",
-            "size": "29x29"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "2x",
-            "size": "29x29"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "1x",
-            "size": "40x40"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "2x",
-            "size": "40x40"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "1x",
-            "size": "76x76"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "2x",
-            "size": "76x76"
-        },
-        {
-            "idiom": "ipad",
-            "scale": "2x",
-            "size": "83.5x83.5"
-        },
-        {
-            "idiom": "ios-marketing",
-            "scale": "1x",
-            "size": "1024x1024"
-        }
-    ],
-    "info": {
-        "author": "xcode",
-        "version": 1
-    }
-}
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Base.lproj/LaunchScreen.storyboard b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index 865e9329f3767a..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Base.lproj/Main.storyboard b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Base.lproj/Main.storyboard
deleted file mode 100644
index 808a21ce779bae..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Base.lproj/Main.storyboard
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Info.plist b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Info.plist
deleted file mode 100644
index 72bf2c4f5985f3..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/Info.plist
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneConfigurationName</key>
-					<string>Default Configuration</string>
-					<key>UISceneDelegateClassName</key>
-					<string>SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/SceneDelegate.m b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/SceneDelegate.m
deleted file mode 100644
index 9a34646685879c..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingApp/SceneDelegate.m
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import "SceneDelegate.h"
-
-@interface SceneDelegate ()
-
-@end
-
-@implementation SceneDelegate
-
-- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
-{
-    // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
-    // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
-    // This delegate does not imply the connecting scene or session are new (see
-    // `application:configurationForConnectingSceneSession` instead).
-}
-
-- (void)sceneDidDisconnect:(UIScene *)scene
-{
-    // Called as the scene is being released by the system.
-    // This occurs shortly after the scene enters the background, or when its session is discarded.
-    // Release any resources associated with this scene that can be re-created the next time the scene connects.
-    // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions`
-    // instead).
-}
-
-- (void)sceneDidBecomeActive:(UIScene *)scene
-{
-    // Called when the scene has moved from an inactive state to an active state.
-    // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
-}
-
-- (void)sceneWillResignActive:(UIScene *)scene
-{
-    // Called when the scene will move from an active state to an inactive state.
-    // This may occur due to temporary interruptions (ex. an incoming phone call).
-}
-
-- (void)sceneWillEnterForeground:(UIScene *)scene
-{
-    // Called as the scene transitions from the background to the foreground.
-    // Use this method to undo the changes made on entering the background.
-}
-
-- (void)sceneDidEnterBackground:(UIScene *)scene
-{
-    // Called as the scene transitions from the foreground to the background.
-    // Use this method to save data, release shared resources, and store enough scene-specific state information
-    // to restore the scene back to its current state.
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppTests/Info.plist b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppTests/Info.plist
deleted file mode 100644
index 64d65ca495770b..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppTests/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppTests/iOSTVCastingAppTests.m b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppTests/iOSTVCastingAppTests.m
deleted file mode 100644
index 5c352f79ccfce1..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppTests/iOSTVCastingAppTests.m
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import <XCTest/XCTest.h>
-
-@interface iOSTVCastingAppTests : XCTestCase
-
-@end
-
-@implementation iOSTVCastingAppTests
-
-- (void)setUp
-{
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-}
-
-- (void)testExample
-{
-    // This is an example of a functional test case.
-    // Use XCTAssert and related functions to verify your tests produce the correct results.
-}
-
-- (void)testPerformanceExample
-{
-    // This is an example of a performance test case.
-    [self measureBlock:^ {
-        // Put the code you want to measure the time of here.
-    }];
-}
-
-@end
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppUITests/Info.plist b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppUITests/Info.plist
deleted file mode 100644
index 64d65ca495770b..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppUITests/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppUITests/iOSTVCastingAppUITests.m b/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppUITests/iOSTVCastingAppUITests.m
deleted file mode 100644
index 1c5cbeeb8b12a3..00000000000000
--- a/examples/tv-casting-app/darwin/iOSTVCastingApp/iOSTVCastingAppUITests/iOSTVCastingAppUITests.m
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#import <XCTest/XCTest.h>
-
-@interface iOSTVCastingAppUITests : XCTestCase
-
-@end
-
-@implementation iOSTVCastingAppUITests
-
-- (void)setUp
-{
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-
-    // In UI tests it is usually best to stop immediately when a failure occurs.
-    self.continueAfterFailure = NO;
-
-    // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they
-    // run. The setUp method is a good place to do this.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-}
-
-- (void)testExample
-{
-    // UI tests must launch the application that they test.
-    XCUIApplication * app = [[XCUIApplication alloc] init];
-    [app launch];
-
-    // Use recording to get started writing UI tests.
-    // Use XCTAssert and related functions to verify your tests produce the correct results.
-}
-
-- (void)testLaunchPerformance
-{
-    if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
-        // This measures how long it takes to launch your application.
-        [self measureWithMetrics:@[ [[XCTApplicationLaunchMetric alloc] init] ]
-                           block:^{
-                               [[[XCUIApplication alloc] init] launch];
-                           }];
-    }
-}
-
-@end
diff --git a/examples/tv-casting-app/tv-casting-common/BUILD.gn b/examples/tv-casting-app/tv-casting-common/BUILD.gn
index 55b523dcd705d5..10ef81c9104434 100644
--- a/examples/tv-casting-app/tv-casting-common/BUILD.gn
+++ b/examples/tv-casting-app/tv-casting-common/BUILD.gn
@@ -15,6 +15,7 @@
 import("//build_overrides/chip.gni")
 
 import("${chip_root}/src/app/chip_data_model.gni")
+import("${chip_root}/src/lib/lib.gni")
 
 config("config") {
   include_dirs = [
@@ -53,7 +54,8 @@ chip_data_model("tv-casting-common") {
   deps = [ "${chip_root}/third_party/jsoncpp" ]
 
   if (chip_enable_transport_trace) {
-    public_deps = [ "${chip_root}/examples/common/tracing:trace_handlers" ]
+    public_deps =
+        [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ]
   }
 
   public_configs = [ ":config" ]
@@ -63,3 +65,15 @@ chip_data_model("tv-casting-common") {
 
   is_server = true
 }
+
+static_library("tvCastingCommon") {
+  public_deps = [ "${chip_root}/examples/tv-casting-app/tv-casting-common" ]
+
+  cflags = [ "-Wconversion" ]
+
+  output_name = "libTvCastingCommon"
+
+  output_dir = "${root_out_dir}/lib"
+
+  complete_static_lib = true
+}
diff --git a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
index 78f6066ae3b68c..a6034cb1969686 100644
--- a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
+++ b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
@@ -41,11 +41,11 @@ void CHIPCommand::StartTracing()
 
     if (mTraceFile.HasValue())
     {
-        chip::trace::SetTraceStream(new chip::trace::TraceStreamFile(mTraceFile.Value()));
+        chip::trace::AddTraceStream(new chip::trace::TraceStreamFile(mTraceFile.Value()));
     }
     else if (mTraceLog.HasValue() && mTraceLog.Value())
     {
-        chip::trace::SetTraceStream(new chip::trace::TraceStreamLog());
+        chip::trace::AddTraceStream(new chip::trace::TraceStreamLog());
     }
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 }
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 111a8101d81d27..7b97d976ad3831 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -233,7 +233,7 @@ void CastingServer::DeviceEventCallback(const DeviceLayer::ChipDeviceEvent * eve
     else if (event->Type == DeviceLayer::DeviceEventType::kCommissioningComplete)
     {
         CHIP_ERROR err = CastingServer::GetInstance()->GetTargetVideoPlayerInfo()->Initialize(
-            event->CommissioningComplete.PeerNodeId, event->CommissioningComplete.PeerFabricIndex);
+            event->CommissioningComplete.nodeId, event->CommissioningComplete.fabricIndex);
 
         CastingServer::GetInstance()->mCommissioningCompleteCallback(err);
     }
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 acd364b3e8f50c..f3dd20e6668137 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
@@ -684,8 +684,16 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -769,74 +777,6 @@ server cluster Groups = 4 {
   command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster IasZone = 1280 {
-  enum IasEnrollResponseCode : ENUM8 {
-    kSuccess = 0;
-    kNotSupported = 1;
-    kNoEnrollPermit = 2;
-    kTooManyZones = 3;
-  }
-
-  enum IasZoneType : ENUM16 {
-    kStandardCie = 0;
-    kMotionSensor = 13;
-    kContactSwitch = 21;
-    kFireSensor = 40;
-    kWaterSensor = 42;
-    kGasSensor = 43;
-    kPersonalEmergencyDevice = 44;
-    kVibrationMovementSensor = 45;
-    kRemoteControl = 271;
-    kKeyFob = 277;
-    kKeypad = 541;
-    kStandardWarningDevice = 549;
-    kGlassBreakSensor = 550;
-    kCarbonMonoxideSensor = 551;
-    kSecurityRepeater = 553;
-    kInvalidZoneType = 65535;
-  }
-
-  bitmap IasZoneStatus : BITMAP16 {
-    kAlarm1 = 0x1;
-    kAlarm2 = 0x2;
-    kTamper = 0x4;
-    kBattery = 0x8;
-    kSupervisionReports = 0x10;
-    kRestoreReports = 0x20;
-    kTrouble = 0x40;
-    kAc = 0x80;
-    kTest = 0x100;
-    kBatteryDefect = 0x200;
-  }
-
-  readonly attribute enum8 zoneState = 0;
-  readonly attribute enum16 zoneType = 1;
-  readonly attribute bitmap16 zoneStatus = 2;
-  attribute node_id iasCieAddress = 16;
-  readonly attribute int8u zoneId = 17;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ZoneEnrollResponseRequest {
-    IasEnrollResponseCode enrollResponseCode = 0;
-    INT8U zoneId = 1;
-  }
-
-  response struct ZoneStatusChangeNotification = 0 {
-    IasZoneStatus zoneStatus = 0;
-    BITMAP8 extendedStatus = 1;
-    INT8U zoneId = 2;
-    INT16U delay = 3;
-  }
-
-  response struct ZoneEnrollRequest = 1 {
-    IasZoneType zoneType = 0;
-    INT16U manufacturerCode = 1;
-  }
-
-  command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0;
-}
-
 server cluster Identify = 3 {
   enum IdentifyEffectIdentifier : ENUM8 {
     kBlink = 0;
@@ -1554,6 +1494,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -1594,13 +1535,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -1621,10 +1563,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -1653,7 +1591,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster Scenes = 5 {
@@ -1765,12 +1702,16 @@ server cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1845,7 +1786,7 @@ client cluster TargetNavigator = 1285 {
   command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
 }
 
-server cluster TestCluster = 1295 {
+server cluster TestCluster = 4294048773 {
   enum SimpleEnum : ENUM8 {
     kUnspecified = 0;
     kValueA = 1;
@@ -1888,8 +1829,8 @@ server cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   info event TestEvent = 1 {
@@ -2021,7 +1962,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -2029,11 +1970,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -2076,12 +2017,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -2204,8 +2145,8 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-
 endpoint 0 {
+  device type rootdevice = 22;
 
   server cluster Descriptor {
     callback attribute deviceList;
@@ -2321,6 +2262,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
@@ -2335,67 +2277,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -2472,8 +2414,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type videoplayer = 35;
   binding cluster OnOff;
   binding cluster LevelControl;
   binding cluster Descriptor;
@@ -2584,16 +2526,6 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster IasZone {
-    ram      attribute zoneState;
-    ram      attribute zoneType;
-    ram      attribute zoneStatus;
-    ram      attribute iasCieAddress;
-    ram      attribute zoneId default = 0xff;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 2;
-  }
-
   server cluster WakeOnLan {
     ram      attribute MACAddress;
     ram      attribute featureMap;
@@ -2625,8 +2557,8 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 2 {
+  device type occupancysensor = 263;
 
   server cluster OnOff {
     ram      attribute onOff;
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 f8d4f6162b4119..165f9758427177 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
@@ -2404,7 +2404,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -2534,6 +2543,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -2727,7 +2752,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2741,9 +2766,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2759,7 +2784,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -2775,7 +2800,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2791,7 +2816,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2807,7 +2832,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2823,7 +2848,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -2871,7 +2896,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2887,7 +2912,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2903,7 +2928,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2919,7 +2944,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2935,7 +2960,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -2951,7 +2976,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2967,7 +2992,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2983,7 +3008,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -2999,7 +3024,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3015,7 +3040,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3031,7 +3056,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3047,7 +3072,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3063,7 +3088,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3079,7 +3104,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3095,7 +3120,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3111,7 +3136,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3127,7 +3152,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3143,7 +3168,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3159,7 +3184,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3175,7 +3200,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3191,7 +3216,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3207,7 +3232,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3223,7 +3248,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3239,7 +3264,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3255,7 +3280,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3271,7 +3296,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3287,7 +3312,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3303,7 +3328,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3319,7 +3344,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3335,7 +3360,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3351,7 +3376,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3367,7 +3392,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3383,7 +3408,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3399,7 +3424,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3415,7 +3440,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3431,7 +3456,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3447,7 +3472,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3463,7 +3488,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3479,7 +3504,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3495,7 +3520,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3511,7 +3536,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3527,7 +3552,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3543,7 +3568,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3559,7 +3584,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3575,7 +3600,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3591,7 +3616,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3607,7 +3632,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3623,7 +3648,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3639,7 +3664,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3655,7 +3680,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3669,7 +3694,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3687,7 +3712,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3701,7 +3726,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4579,14 +4604,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -5137,22 +5154,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -5377,134 +5378,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -7023,7 +6896,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -7075,7 +6948,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -11213,14 +11086,6 @@
               "source": "client",
               "incoming": 0,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLog",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 0,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -11257,14 +11122,6 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLogResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -14370,7 +14227,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -14414,7 +14271,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -16134,22 +15991,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -16374,134 +16215,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "AlarmMask",
-              "code": 64,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -18034,4 +17747,4 @@
       "deviceIdentifier": 263
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/examples/window-app/common/src/WindowApp.cpp b/examples/window-app/common/src/WindowApp.cpp
index a9d357eea42e6c..0cada84b7b046c 100644
--- a/examples/window-app/common/src/WindowApp.cpp
+++ b/examples/window-app/common/src/WindowApp.cpp
@@ -294,8 +294,8 @@ void WindowApp::DispatchEvent(const WindowApp::Event & event)
 void WindowApp::DispatchEventAttributeChange(chip::EndpointId endpoint, chip::AttributeId attribute)
 {
     Cover * cover = GetCover(endpoint);
-    chip::BitFlags<Mode> mode;
-    chip::BitFlags<ConfigStatus> configStatus;
+    chip::BitMask<Mode> mode;
+    chip::BitMask<ConfigStatus> configStatus;
 
     if (nullptr == cover)
     {
@@ -426,7 +426,7 @@ void WindowApp::Cover::Init(chip::EndpointId endpoint)
     TypeSet(endpoint, Type::kTiltBlindLiftAndTilt);
 
     // Attribute: Id  7 ConfigStatus
-    chip::BitFlags<ConfigStatus> configStatus = ConfigStatusGet(endpoint);
+    chip::BitMask<ConfigStatus> configStatus = ConfigStatusGet(endpoint);
     configStatus.Set(ConfigStatus::kLiftEncoderControlled);
     configStatus.Set(ConfigStatus::kTiltEncoderControlled);
     configStatus.Set(ConfigStatus::kOnlineReserved);
@@ -438,7 +438,7 @@ void WindowApp::Cover::Init(chip::EndpointId endpoint)
     EndProductTypeSet(endpoint, EndProductType::kInteriorBlind);
 
     // Attribute: Id 24 Mode
-    chip::BitFlags<Mode> mode;
+    chip::BitMask<Mode> mode;
     mode.Clear(Mode::kMotorDirectionReversed);
     mode.Clear(Mode::kMaintenanceMode);
     mode.Clear(Mode::kCalibrationMode);
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 28166b8d99580e..e60eb56acf245a 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -358,11 +358,19 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster GroupKeyManagement = 63 {
@@ -822,6 +830,7 @@ server cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -865,13 +874,14 @@ server cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -892,10 +902,6 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -924,7 +930,6 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 server cluster PowerSource = 47 {
@@ -1115,12 +1120,16 @@ client cluster Scenes = 5 {
 }
 
 server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -1222,7 +1231,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -1230,11 +1239,11 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -1277,12 +1286,12 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1496,8 +1505,12 @@ server cluster WindowCovering = 258 {
   }
 
   readonly attribute Type type = 0;
+  readonly attribute int16u physicalClosedLimitLift = 1;
+  readonly attribute int16u physicalClosedLimitTilt = 2;
   readonly attribute nullable int16u currentPositionLift = 3;
   readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute int16u numberOfActuationsLift = 5;
+  readonly attribute int16u numberOfActuationsTilt = 6;
   readonly attribute ConfigStatus configStatus = 7;
   readonly attribute nullable Percent currentPositionLiftPercentage = 8;
   readonly attribute nullable Percent currentPositionTiltPercentage = 9;
@@ -1541,8 +1554,8 @@ server cluster WindowCovering = 258 {
   command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
-
 endpoint 0 {
+  device type windowcovering = 22;
   binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Descriptor {
@@ -1687,6 +1700,7 @@ endpoint 0 {
     callback attribute activeHardwareFaults;
     callback attribute activeRadioFaults;
     callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -1704,67 +1718,67 @@ endpoint 0 {
   }
 
   server cluster ThreadNetworkDiagnostics {
-    ram      attribute channel;
-    ram      attribute routingRole;
-    ram      attribute networkName;
-    ram      attribute panId;
-    ram      attribute extendedPanId;
-    ram      attribute meshLocalPrefix;
-    ram      attribute overrunCount;
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount;
     callback attribute neighborTableList;
     callback attribute routeTableList;
-    ram      attribute partitionId;
-    ram      attribute weighting;
-    ram      attribute dataVersion;
-    ram      attribute stableDataVersion;
-    ram      attribute leaderRouterId;
-    ram      attribute detachedRoleCount;
-    ram      attribute childRoleCount;
-    ram      attribute routerRoleCount;
-    ram      attribute leaderRoleCount;
-    ram      attribute attachAttemptCount;
-    ram      attribute partitionIdChangeCount;
-    ram      attribute betterPartitionAttachAttemptCount;
-    ram      attribute parentChangeCount;
-    ram      attribute txTotalCount;
-    ram      attribute txUnicastCount;
-    ram      attribute txBroadcastCount;
-    ram      attribute txAckRequestedCount;
-    ram      attribute txAckedCount;
-    ram      attribute txNoAckRequestedCount;
-    ram      attribute txDataCount;
-    ram      attribute txDataPollCount;
-    ram      attribute txBeaconCount;
-    ram      attribute txBeaconRequestCount;
-    ram      attribute txOtherCount;
-    ram      attribute txRetryCount;
-    ram      attribute txDirectMaxRetryExpiryCount;
-    ram      attribute txIndirectMaxRetryExpiryCount;
-    ram      attribute txErrCcaCount;
-    ram      attribute txErrAbortCount;
-    ram      attribute txErrBusyChannelCount;
-    ram      attribute rxTotalCount;
-    ram      attribute rxUnicastCount;
-    ram      attribute rxBroadcastCount;
-    ram      attribute rxDataCount;
-    ram      attribute rxDataPollCount;
-    ram      attribute rxBeaconCount;
-    ram      attribute rxBeaconRequestCount;
-    ram      attribute rxOtherCount;
-    ram      attribute rxAddressFilteredCount;
-    ram      attribute rxDestAddrFilteredCount;
-    ram      attribute rxDuplicatedCount;
-    ram      attribute rxErrNoFrameCount;
-    ram      attribute rxErrUnknownNeighborCount;
-    ram      attribute rxErrInvalidSrcAddrCount;
-    ram      attribute rxErrSecCount;
-    ram      attribute rxErrFcsCount;
-    ram      attribute rxErrOtherCount;
-    ram      attribute activeTimestamp;
-    ram      attribute pendingTimestamp;
-    ram      attribute delay;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount;
+    callback attribute childRoleCount;
+    callback attribute routerRoleCount;
+    callback attribute leaderRoleCount;
+    callback attribute attachAttemptCount;
+    callback attribute partitionIdChangeCount;
+    callback attribute betterPartitionAttachAttemptCount;
+    callback attribute parentChangeCount;
+    callback attribute txTotalCount;
+    callback attribute txUnicastCount;
+    callback attribute txBroadcastCount;
+    callback attribute txAckRequestedCount;
+    callback attribute txAckedCount;
+    callback attribute txNoAckRequestedCount;
+    callback attribute txDataCount;
+    callback attribute txDataPollCount;
+    callback attribute txBeaconCount;
+    callback attribute txBeaconRequestCount;
+    callback attribute txOtherCount;
+    callback attribute txRetryCount;
+    callback attribute txDirectMaxRetryExpiryCount;
+    callback attribute txIndirectMaxRetryExpiryCount;
+    callback attribute txErrCcaCount;
+    callback attribute txErrAbortCount;
+    callback attribute txErrBusyChannelCount;
+    callback attribute rxTotalCount;
+    callback attribute rxUnicastCount;
+    callback attribute rxBroadcastCount;
+    callback attribute rxDataCount;
+    callback attribute rxDataPollCount;
+    callback attribute rxBeaconCount;
+    callback attribute rxBeaconRequestCount;
+    callback attribute rxOtherCount;
+    callback attribute rxAddressFilteredCount;
+    callback attribute rxDestAddrFilteredCount;
+    callback attribute rxDuplicatedCount;
+    callback attribute rxErrNoFrameCount;
+    callback attribute rxErrUnknownNeighborCount;
+    callback attribute rxErrInvalidSrcAddrCount;
+    callback attribute rxErrSecCount;
+    callback attribute rxErrFcsCount;
+    callback attribute rxErrOtherCount;
+    callback attribute activeTimestamp;
+    callback attribute pendingTimestamp;
+    callback attribute delay;
     callback attribute securityPolicy;
-    ram      attribute channelMask;
+    callback attribute channelMask;
     callback attribute operationalDatasetComponents;
     callback attribute activeNetworkFaultsList;
     ram      attribute featureMap default = 0x000F;
@@ -1852,8 +1866,8 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
-
 endpoint 1 {
+  device type windowcovering = 514;
   binding cluster Scenes;
 
   server cluster Identify {
@@ -1879,9 +1893,13 @@ endpoint 1 {
   }
 
   server cluster WindowCovering {
-    ram      attribute type;
+    ram      attribute type default = 0x08;
+    ram      attribute physicalClosedLimitLift default = 0xFFFF;
+    ram      attribute physicalClosedLimitTilt default = 0xFFFF;
     persist  attribute currentPositionLift;
     persist  attribute currentPositionTilt;
+    persist  attribute numberOfActuationsLift;
+    persist  attribute numberOfActuationsTilt;
     persist  attribute configStatus default = 0x03;
     persist  attribute currentPositionLiftPercentage;
     persist  attribute currentPositionTiltPercentage;
@@ -1901,8 +1919,8 @@ endpoint 1 {
     ram      attribute clusterRevision default = 5;
   }
 }
-
 endpoint 2 {
+  device type windowcovering = 514;
   binding cluster Scenes;
 
   server cluster Groups {
@@ -1921,9 +1939,13 @@ endpoint 2 {
   }
 
   server cluster WindowCovering {
-    ram      attribute type;
+    ram      attribute type default = 0x08;
+    ram      attribute physicalClosedLimitLift default = 0xFFFF;
+    ram      attribute physicalClosedLimitTilt default = 0xFFFF;
     persist  attribute currentPositionLift;
     persist  attribute currentPositionTilt;
+    persist  attribute numberOfActuationsLift;
+    persist  attribute numberOfActuationsTilt;
     persist  attribute configStatus default = 0x03;
     persist  attribute currentPositionLiftPercentage;
     persist  attribute currentPositionTiltPercentage;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 5a13ecd1eb7706..adaaac10092916 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -2979,7 +2979,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
           "attributes": [
             {
               "name": "NetworkInterfaces",
@@ -3109,6 +3118,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -3386,7 +3411,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3400,9 +3425,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3418,7 +3443,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -3434,7 +3459,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3450,7 +3475,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3466,7 +3491,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3482,7 +3507,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -3530,7 +3555,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3546,7 +3571,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3562,7 +3587,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3578,7 +3603,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3594,7 +3619,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -3610,7 +3635,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3626,7 +3651,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3642,7 +3667,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3658,7 +3683,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3674,7 +3699,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3690,7 +3715,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3706,7 +3731,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3722,7 +3747,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3738,7 +3763,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3754,7 +3779,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3770,7 +3795,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3786,7 +3811,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3802,7 +3827,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3818,7 +3843,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3834,7 +3859,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3850,7 +3875,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3866,7 +3891,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3882,7 +3907,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3898,7 +3923,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3914,7 +3939,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3930,7 +3955,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3946,7 +3971,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3962,7 +3987,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3978,7 +4003,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -3994,7 +4019,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4010,7 +4035,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4026,7 +4051,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4042,7 +4067,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4058,7 +4083,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4074,7 +4099,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4090,7 +4115,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4106,7 +4131,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4122,7 +4147,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4138,7 +4163,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4154,7 +4179,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4170,7 +4195,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4186,7 +4211,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4202,7 +4227,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4218,7 +4243,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4234,7 +4259,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4250,7 +4275,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4266,7 +4291,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4282,7 +4307,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4298,7 +4323,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -4314,7 +4339,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4328,7 +4353,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4346,7 +4371,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -4360,7 +4385,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5248,14 +5273,6 @@
               "source": "client",
               "incoming": 1,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -7448,7 +7465,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7462,9 +7479,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7480,7 +7497,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -7496,7 +7513,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7512,7 +7529,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -7528,7 +7545,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7544,7 +7561,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -7592,7 +7609,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7608,7 +7625,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7624,7 +7641,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7640,7 +7657,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7656,7 +7673,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -7672,7 +7689,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7688,7 +7705,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7704,7 +7721,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7720,7 +7737,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7736,7 +7753,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7752,7 +7769,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7768,7 +7785,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7784,7 +7801,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7800,7 +7817,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7816,7 +7833,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7832,7 +7849,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7848,7 +7865,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7864,7 +7881,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7880,7 +7897,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7896,7 +7913,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7912,7 +7929,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7928,7 +7945,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7944,7 +7961,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7960,7 +7977,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7976,7 +7993,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -7992,7 +8009,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8008,7 +8025,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8024,7 +8041,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8040,7 +8057,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8056,7 +8073,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8072,7 +8089,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8088,7 +8105,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8104,7 +8121,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8120,7 +8137,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8136,7 +8153,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8152,7 +8169,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8168,7 +8185,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8184,7 +8201,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8200,7 +8217,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8216,7 +8233,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8232,7 +8249,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8248,7 +8265,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8264,7 +8281,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8280,7 +8297,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8296,7 +8313,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8312,7 +8329,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "NVM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8328,7 +8345,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "NVM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8342,7 +8359,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -8360,7 +8377,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -8374,7 +8391,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -8538,7 +8555,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x08",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -8550,14 +8567,30 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x0000",
+              "defaultValue": "0xFFFF",
               "reportable": 1,
               "minInterval": 0,
-              "maxInterval": 65344,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
+            {
+              "name": "PhysicalClosedLimitTilt",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
               "reportableChange": 0
             },
             {
@@ -8592,6 +8625,38 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "NumberOfActuationsLift",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfActuationsTilt",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
             {
               "name": "ConfigStatus",
               "code": 7,
@@ -10124,12 +10189,44 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x08",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "PhysicalClosedLimitLift",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
+            {
+              "name": "PhysicalClosedLimitTilt",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
             {
               "name": "CurrentPositionLift",
               "code": 3,
@@ -10162,6 +10259,38 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "NumberOfActuationsLift",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfActuationsTilt",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65535,
+              "reportableChange": 0
+            },
             {
               "name": "ConfigStatus",
               "code": 7,
@@ -10469,4 +10598,4 @@
     }
   ],
   "log": []
-}
+}
\ No newline at end of file
diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
index 221838c0a14ffc..33ea182d5316a7 100644
--- a/examples/window-app/efr32/BUILD.gn
+++ b/examples/window-app/efr32/BUILD.gn
@@ -53,6 +53,9 @@ declare_args() {
 
   # Disable LCD on supported devices
   disable_lcd = false
+
+  # Argument to Disable IPv4 for wifi(rs911)
+  chip_disable_wifi_ipv4 = false
 }
 
 declare_args() {
@@ -203,6 +206,10 @@ efr32_executable("window_app") {
     sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
   }
 
+  if (chip_disable_wifi_ipv4) {
+    defines += [ "WIFI_IPV4_DISABLED" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {
diff --git a/examples/window-app/nrfconnect/README.md b/examples/window-app/nrfconnect/README.md
index 526a19004bf8bd..4f6ce47c8f74cb 100644
--- a/examples/window-app/nrfconnect/README.md
+++ b/examples/window-app/nrfconnect/README.md
@@ -111,6 +111,20 @@ requests to start sending the update packages.
 An OTA Requestor is a node that wants to download a new firmware image and sends
 requests to an OTA Provider to start the update process.
 
+#### Simple Management Protocol
+
+Simple Management Protocol (SMP) is a basic transfer encoding that is used for
+device management purposes, including application image management. SMP supports
+using different transports, such as Bluetooth LE, UDP, or serial USB/UART.
+
+In this example, the Matter device runs the SMP Server to download the
+application update image using the Bluetooth LE transport.
+
+See the
+[Building with Device Firmware Upgrade support](#building-with-device-firmware-upgrade-support)
+section to learn how to enable SMP and use it for the DFU purpose in this
+example.
+
 #### Bootloader
 
 MCUboot is a secure bootloader used for swapping firmware images of different
@@ -394,6 +408,14 @@ For example, use the following command for `nrf52840dk_nrf52840`:
 
 Support for DFU using Matter OTA is enabled by default.
 
+To enable DFU over Bluetooth LE, run the following command with _build-target_
+replaced with the build target name of the Nordic Semiconductor kit you are
+using (for example `nrf52840dk_nrf52840`):
+
+    ```
+    $ west build -b build-target -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y
+    ```
+
 To completely disable support for DFU, run the following command with
 _build-target_ replaced with the build target name of the Nordic Semiconductor
 kit you are using (for example `nrf52840dk_nrf52840`):
diff --git a/examples/window-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/window-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
index b16a44113b8aef..00c7b57a192e28 100644
--- a/examples/window-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
+++ b/examples/window-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
@@ -18,7 +18,10 @@
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
+};
+
 
+/ {
 	/*
 	* In some default configurations within the nRF Connect SDK,
 	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
@@ -30,9 +33,8 @@
 	};
 
 	/*
-	* By default, PWM module is only configured for led0 (LED1 on the board).
-	* The window-app, however, uses LED2 to show the state of the window cover,
-	* by using the LED's brightness level.
+	* Configure LED2 and LED3 to show the state of the
+	* window cover,by using the LED's brightness level.
 	*/
 	aliases {
 		pwm-led1 = &pwm_led1;
@@ -41,10 +43,10 @@
 
 	pwmleds {
 		pwm_led1: pwm_led_1 {
-			pwms = < &pwm0 0xe >;
+			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 		pwm_led2: pwm_led_2 {
-			pwms = < &pwm1 0xf >;
+			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 	};
 };
@@ -73,14 +75,23 @@
 };
 
 &pwm0 {
-	/delete-property/ ch0-pin;
-	/delete-property/ ch0-inverted;
-	ch1-pin = < 0xe >;
-	ch1-inverted;
+	pinctrl-0 = <&pwm0_default_alt>;
+	pinctrl-1 = <&pwm0_sleep_alt>;
+	pinctrl-names = "default", "sleep";
 };
 
-&pwm1 {
-	status = "okay";
-	ch1-pin = < 0xf >;
-	ch1-inverted;
+&pinctrl {
+	pwm0_default_alt: pwm0_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 14)>, <NRF_PSEL(PWM_OUT2, 0, 15)>;
+			nordic,invert;
+		};
+	};
+
+	pwm0_sleep_alt: pwm0_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 14)>, <NRF_PSEL(PWM_OUT2, 0, 15)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 88368b93afe890..4b450586a3baa5 100644
--- a/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -20,9 +20,8 @@
 	};
 
 	/*
-	* By default, PWM module is only configured for led0 (LED1 on the board).
-	* The lighting-app, however, uses LED2 to show the state of the lighting,
-	* including its brightness level.
+	* Configure LED2 and LED3 to show the state of the
+	* window cover,by using the LED's brightness level.
 	*/
 	aliases {
 		pwm-led1 = &pwm_led1;
@@ -32,10 +31,10 @@
 	pwmleds {
 		compatible = "pwm-leds";
 		pwm_led1: pwm_led_1 {
-			pwms = < &pwm0 0x1d >;
+			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 		pwm_led2: pwm_led_2 {
-			pwms = < &pwm1 0x1e >;
+			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 	};
 
@@ -82,9 +81,9 @@
 			};
 		};
 	};
-
 };
 
+
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
@@ -103,14 +102,23 @@
 };
 
 &pwm0 {
-	/delete-property/ ch0-pin;
-	/delete-property/ ch0-inverted;
-	ch1-pin = < 0x1d >;
-	ch1-inverted;
+	pinctrl-0 = <&pwm0_default_alt>;
+	pinctrl-1 = <&pwm0_sleep_alt>;
+	pinctrl-names = "default", "sleep";
 };
 
-&pwm1 {
-	status = "okay";
-	ch1-pin = < 0x1e >;
-	ch1-inverted;
+&pinctrl {
+	pwm0_default_alt: pwm0_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 29)>, <NRF_PSEL(PWM_OUT2, 0, 30)>;
+			nordic,invert;
+		};
+	};
+
+	pwm0_sleep_alt: pwm0_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT1, 0, 29)>, <NRF_PSEL(PWM_OUT2, 0, 30)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/examples/window-app/nrfconnect/main/AppTask.cpp b/examples/window-app/nrfconnect/main/AppTask.cpp
index 7f186f635bf315..01055a4935f54d 100644
--- a/examples/window-app/nrfconnect/main/AppTask.cpp
+++ b/examples/window-app/nrfconnect/main/AppTask.cpp
@@ -21,6 +21,8 @@
 #include "LEDUtil.h"
 #include "WindowCovering.h"
 
+#include <DeviceInfoProviderImpl.h>
+
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 
@@ -37,8 +39,8 @@
 #endif
 
 #include <dk_buttons_and_leds.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 #define FACTORY_RESET_TRIGGER_TIMEOUT 3000
 #define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000
@@ -50,9 +52,16 @@
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), APP_EVENT_QUEUE_SIZE, alignof(AppEvent));
 
-static LEDWidget sStatusLED;
-static UnusedLedsWrapper<1> sUnusedLeds{ { DK_LED4 } };
-static k_timer sFunctionTimer;
+namespace {
+
+LEDWidget sStatusLED;
+UnusedLedsWrapper<1> sUnusedLeds{ { DK_LED4 } };
+k_timer sFunctionTimer;
+
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
+} // namespace
+
 namespace LedConsts {
 constexpr uint32_t kBlinkRate_ms{ 500 };
 namespace StatusLed {
@@ -132,15 +141,22 @@ CHIP_ERROR AppTask::Init()
     k_timer_init(&sFunctionTimer, &AppTask::FunctionTimerTimeoutCallback, nullptr);
     k_timer_user_data_set(&sFunctionTimer, this);
 
+#ifdef CONFIG_MCUMGR_SMP_BT
+    /* Initialize DFU over SMP */
+    GetDFUOverSMP().Init(RequestSMPAdvertisingStart);
+    GetDFUOverSMP().ConfirmNewImage();
+#endif
+
     // Initialize CHIP server
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
-#if CONFIG_CHIP_OTA_REQUESTOR
-    InitBasicOTARequestor();
-#endif
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
 
@@ -214,6 +230,16 @@ void AppTask::ButtonEventHandler(uint32_t aButtonState, uint32_t aHasChanged)
     }
 }
 
+#ifdef CONFIG_MCUMGR_SMP_BT
+void AppTask::RequestSMPAdvertisingStart(void)
+{
+    AppEvent event;
+    event.Type    = AppEvent::Type::StartSMPAdvertising;
+    event.Handler = [](AppEvent *) { GetDFUOverSMP().StartBLEAdvertising(); };
+    PostEvent(&event);
+}
+#endif
+
 void AppTask::FunctionTimerTimeoutCallback(k_timer * aTimer)
 {
     if (!aTimer)
@@ -285,7 +311,11 @@ void AppTask::FunctionHandler(AppEvent * aEvent)
 
             UpdateStatusLED();
             CancelTimer();
-
+#ifdef CONFIG_MCUMGR_SMP_BT
+            GetDFUOverSMP().StartServer();
+#else
+            LOG_INF("Software update is disabled");
+#endif
             // Change the function to none selected since factory reset has been canceled.
             Instance().mMode = OperatingMode::Normal;
 
@@ -475,6 +505,14 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t)
         Instance().mIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
         UpdateStatusLED();
         break;
+    case DeviceEventType::kThreadConnectivityChange:
+#if CONFIG_CHIP_OTA_REQUESTOR
+        if (aEvent->ThreadConnectivityChange.Result == kConnectivity_Established)
+        {
+            InitBasicOTARequestor();
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/examples/window-app/nrfconnect/main/WindowCovering.cpp b/examples/window-app/nrfconnect/main/WindowCovering.cpp
index f1667045390384..cd4dc07fc127eb 100644
--- a/examples/window-app/nrfconnect/main/WindowCovering.cpp
+++ b/examples/window-app/nrfconnect/main/WindowCovering.cpp
@@ -23,9 +23,9 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/util/af.h>
-#include <logging/log.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
@@ -33,8 +33,9 @@ using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 using namespace chip::app::Clusters::WindowCovering;
 
-static k_timer sLiftTimer;
-static k_timer sTiltTimer;
+static const struct pwm_dt_spec sLiftPwmDevice = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led1));
+static const struct pwm_dt_spec sTiltPwmDevice = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led2));
+
 static constexpr uint32_t sMoveTimeoutMs{ 200 };
 
 WindowCovering::WindowCovering()
@@ -42,32 +43,14 @@ WindowCovering::WindowCovering()
     mLiftLED.Init(LIFT_STATE_LED);
     mTiltLED.Init(TILT_STATE_LED);
 
-    if (mLiftIndicator.Init(LIFT_PWM_DEVICE, LIFT_PWM_CHANNEL, 0, 255) != 0)
+    if (mLiftIndicator.Init(&sLiftPwmDevice, 0, 255) != 0)
     {
         LOG_ERR("Cannot initialize the lift indicator");
     }
-    if (mTiltIndicator.Init(TILT_PWM_DEVICE, TILT_PWM_CHANNEL, 0, 255) != 0)
+    if (mTiltIndicator.Init(&sTiltPwmDevice, 0, 255) != 0)
     {
         LOG_ERR("Cannot initialize the tilt indicator");
     }
-
-    k_timer_init(&sLiftTimer, MoveTimerTimeoutCallback, nullptr);
-    k_timer_init(&sTiltTimer, MoveTimerTimeoutCallback, nullptr);
-}
-
-void WindowCovering::MoveTimerTimeoutCallback(k_timer * aTimer)
-{
-    if (!aTimer)
-        return;
-
-    if (aTimer == &sLiftTimer)
-    {
-        chip::DeviceLayer::PlatformMgr().ScheduleWork(DriveCurrentLiftPosition);
-    }
-    else if (aTimer == &sTiltTimer)
-    {
-        chip::DeviceLayer::PlatformMgr().ScheduleWork(DriveCurrentTiltPosition);
-    }
 }
 
 void WindowCovering::DriveCurrentLiftPosition(intptr_t)
@@ -160,14 +143,29 @@ bool WindowCovering::TargetCompleted(MoveType aMoveType, NPercent100ths aCurrent
 
 void WindowCovering::StartTimer(MoveType aMoveType, uint32_t aTimeoutMs)
 {
-    if (aMoveType == MoveType::LIFT)
+    MoveType * moveType = chip::Platform::New<MoveType>();
+    VerifyOrReturn(moveType != nullptr);
+
+    *moveType = aMoveType;
+    (void) chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Milliseconds32(aTimeoutMs), MoveTimerTimeoutCallback,
+                                                       reinterpret_cast<void *>(moveType));
+}
+
+void WindowCovering::MoveTimerTimeoutCallback(chip::System::Layer * systemLayer, void * appState)
+{
+    MoveType * moveType = reinterpret_cast<MoveType *>(appState);
+    VerifyOrReturn(moveType != nullptr);
+
+    if (*moveType == MoveType::LIFT)
     {
-        k_timer_start(&sLiftTimer, K_MSEC(sMoveTimeoutMs), K_NO_WAIT);
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(WindowCovering::DriveCurrentLiftPosition);
     }
-    else if (aMoveType == MoveType::TILT)
+    else if (*moveType == MoveType::TILT)
     {
-        k_timer_start(&sTiltTimer, K_MSEC(sMoveTimeoutMs), K_NO_WAIT);
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(WindowCovering::DriveCurrentTiltPosition);
     }
+
+    chip::Platform::Delete(moveType);
 }
 
 void WindowCovering::DriveCurrentTiltPosition(intptr_t)
diff --git a/examples/window-app/nrfconnect/main/ZclCallbacks.cpp b/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
index f8407af3ffb07c..d4a1c541c93bbc 100644
--- a/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
+++ b/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
@@ -73,7 +73,9 @@ void MatterWindowCoveringClusterServerAttributeChangedCallback(const app::Concre
         case Attributes::CurrentPositionTiltPercent100ths::Id:
             WindowCovering::Instance().PositionLEDUpdate(WindowCovering::MoveType::TILT);
             break;
+        default:
+            WindowCovering::Instance().SchedulePostAttributeChange(attributePath.mEndpointId, attributePath.mAttributeId);
+            break;
         };
     }
-    WindowCovering::Instance().SchedulePostAttributeChange(attributePath.mEndpointId, attributePath.mAttributeId);
 }
diff --git a/examples/window-app/nrfconnect/main/include/AppConfig.h b/examples/window-app/nrfconnect/main/include/AppConfig.h
index 46770401c0e2eb..7dadc1bc572667 100644
--- a/examples/window-app/nrfconnect/main/include/AppConfig.h
+++ b/examples/window-app/nrfconnect/main/include/AppConfig.h
@@ -29,9 +29,3 @@
 #define SYSTEM_STATE_LED DK_LED1
 #define LIFT_STATE_LED DK_LED2
 #define TILT_STATE_LED DK_LED3
-
-#define LIFT_PWM_DEVICE DEVICE_DT_GET(DT_PWMS_CTLR(DT_ALIAS(pwm_led1)))
-#define LIFT_PWM_CHANNEL DT_PWMS_CHANNEL(DT_ALIAS(pwm_led1))
-
-#define TILT_PWM_DEVICE DEVICE_DT_GET(DT_PWMS_CTLR(DT_ALIAS(pwm_led2)))
-#define TILT_PWM_CHANNEL DT_PWMS_CHANNEL(DT_ALIAS(pwm_led2))
diff --git a/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h
index df571c7319dd07..de64851584ba9d 100644
--- a/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/window-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -31,8 +31,8 @@
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
 
 #ifdef CONFIG_CHIP_THREAD_SSED
-#define CHIP_DEVICE_CONFIG_SED_ACTIVE_INTERVAL 1000_ms32
-#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 1000_ms32
+#define CHIP_DEVICE_CONFIG_SED_ACTIVE_INTERVAL 500_ms32
+#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 500_ms32
 #else
 #define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 2000_ms32
 #endif
diff --git a/examples/window-app/nrfconnect/main/include/WindowCovering.h b/examples/window-app/nrfconnect/main/include/WindowCovering.h
index 2b5b6ef792d9fd..99868a9fe41bfb 100644
--- a/examples/window-app/nrfconnect/main/include/WindowCovering.h
+++ b/examples/window-app/nrfconnect/main/include/WindowCovering.h
@@ -69,7 +69,7 @@ class WindowCovering
     static chip::Percent100ths CalculateSingleStep(MoveType aMoveType);
     static void DriveCurrentLiftPosition(intptr_t);
     static void DriveCurrentTiltPosition(intptr_t);
-    static void MoveTimerTimeoutCallback(k_timer * aTimer);
+    static void MoveTimerTimeoutCallback(chip::System::Layer * systemLayer, void * appState);
     static void DoPostAttributeChange(intptr_t aArg);
 
     MoveType mCurrentUIMoveType;
diff --git a/examples/window-app/nrfconnect/main/main.cpp b/examples/window-app/nrfconnect/main/main.cpp
index bb67947911cad1..40233508ccc702 100644
--- a/examples/window-app/nrfconnect/main/main.cpp
+++ b/examples/window-app/nrfconnect/main/main.cpp
@@ -17,7 +17,7 @@
 
 #include "AppTask.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_MATTER_LOG_LEVEL);
 
diff --git a/gn_build.sh b/gn_build.sh
index 35fbb41cf23f5b..86e2ff6889c6d3 100755
--- a/gn_build.sh
+++ b/gn_build.sh
@@ -192,6 +192,20 @@ fi
 
 echo
 
+tizen_sdk_args=""
+
+if [[ -d "${TIZEN_SDK_ROOT}" && -d "${TIZEN_SDK_SYSROOT}" ]]; then
+    tizen_sdk_args+="tizen_sdk_root=\"$TIZEN_SDK_ROOT\" tizen_sdk_sysroot=\"$TIZEN_SDK_SYSROOT\""
+    extra_args+=" $tizen_sdk_args enable_tizen_builds=true"
+else
+    echo
+    echo "Hint: Set \$TIZEN_SDK_ROOT and \$TIZEN_SDK_SYSROOT to enable building for Tizen"
+    echo "      Required Tizen SDK can be obtained from"
+    echo "      https://developer.tizen.org/development/tizen-studio/download"
+fi
+
+echo
+
 _chip_banner "Build: GN configure"
 
 gn --root="$CHIP_ROOT" gen --check --fail-on-unused-args "$CHIP_ROOT/out/debug" --args='target_os="all"'"$extra_args$user_args"
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index b83748bea2db46..c54c43d642fe76 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,13 +12,13 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
           - >-
               ./scripts/build/build_examples.py --enable-flashbundle
-              --target-glob '*' --skip-target-glob '*-tests' build
+              --target-glob '*' --skip-target-glob '{tizen-*,*-tests}' build
               --create-archives /workspace/artifacts/
       id: CompileAll
       waitFor:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
new file mode 100644
index 00000000000000..f70c63976217dd
--- /dev/null
+++ b/integrations/cloudbuild/chef.yaml
@@ -0,0 +1,42 @@
+steps:
+    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+      env:
+          - PW_ENVIRONMENT_ROOT=/pwenv
+      args:
+          - "-c"
+          - source ./scripts/bootstrap.sh
+      id: Bootstrap
+      entrypoint: /usr/bin/bash
+      volumes:
+          - name: pwenv
+            path: /pwenv
+      timeout: 900s
+
+    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+      env:
+          - PW_ENVIRONMENT_ROOT=/pwenv
+      args:
+          - >-
+              ./examples/chef/chef.py --build_all
+      id: CompileAll
+      waitFor:
+          - Bootstrap
+      entrypoint: ./scripts/run_in_build_env.sh
+      volumes:
+          - name: pwenv
+            path: /pwenv
+
+logsBucket: matter-build-automation-build-logs
+
+# Global timeout for all steps
+timeout: 14400s
+
+artifacts:
+    objects:
+        location: "gs://matter-build-automation-artifacts/$PROJECT_ID/$COMMIT_SHA/"
+        paths: ["/workspace/artifacts/*.tar.gz"]
+# Using higher CPU machines generally speeds up builds, except bootstrap is always
+# slow.
+options:
+    machineType: "E2_HIGHCPU_32"
+    diskSizeGb: 200
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 4b3717b825b905..12325b791124cf 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -28,7 +28,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -45,7 +45,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -62,7 +62,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -79,7 +79,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.75"
+    - name: "connectedhomeip/chip-build-vscode:0.5.77"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile b/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile
index 1f92ab22b68aa5..d3e330d3d6e388 100644
--- a/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile
+++ b/integrations/docker/ci-only-images/chip-cirque-device-base/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update \
   && apt-get install --no-install-recommends -y \
   avahi-daemon=0.7-4ubuntu7.1 \
   avahi-utils=0.7-4ubuntu7.1 \
-  ca-certificates=20210119~20.04.2 \
+  ca-certificates=20211016~20.04.1 \
   dhcpcd5=7.1.0-2build1 \
   gdb=9.2-0ubuntu1~20.04.1 \
   git=1:2.25.1-1ubuntu3.4 \
diff --git a/integrations/docker/images/chip-build-ameba/Dockerfile b/integrations/docker/images/chip-build-ameba/Dockerfile
index 0539b55a1007d7..edf73bd120c59d 100644
--- a/integrations/docker/images/chip-build-ameba/Dockerfile
+++ b/integrations/docker/images/chip-build-ameba/Dockerfile
@@ -3,7 +3,7 @@ FROM connectedhomeip/chip-build:${VERSION}
 
 # Setup Ameba
 ARG AMEBA_DIR=/opt/ameba
-ARG TAG_NAME=ameba_update_2022_05_20
+ARG TAG_NAME=ameba_update_2022_06_06
 RUN set -x \
     && apt-get update \
     && mkdir ${AMEBA_DIR} \
diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/chip-build-nrf-platform/Dockerfile
index 7b7101e6115cd0..4c8009bbb11cc1 100644
--- a/integrations/docker/images/chip-build-nrf-platform/Dockerfile
+++ b/integrations/docker/images/chip-build-nrf-platform/Dockerfile
@@ -2,7 +2,7 @@ ARG VERSION=latest
 FROM connectedhomeip/chip-build:${VERSION} as build
 
 # Compatible Nordic Connect SDK revision.
-ARG NCS_REVISION=5ea8f7fa91d7315fcc6cd9eb3aa74f9640d0abac
+ARG NCS_REVISION=fd5905aa6b04febd99d00dba6c482ac25eb15222
 
 RUN set -x \
     && apt-get update \
diff --git a/integrations/docker/images/chip-build-tizen/Dockerfile b/integrations/docker/images/chip-build-tizen/Dockerfile
index ba2452b675412c..cd3915b3b0e5d3 100644
--- a/integrations/docker/images/chip-build-tizen/Dockerfile
+++ b/integrations/docker/images/chip-build-tizen/Dockerfile
@@ -147,13 +147,3 @@ RUN set -x \
 # Switch to the non-root user
 USER $USER_NAME
 WORKDIR $USER_HOME
-
-# ------------------------------------------------------------------------------
-# Setup tizen studio CLI
-RUN set -x \
-    # Generate author certificate
-    && tizen certificate --alias=CHIP --name=CHIP --email=chip@tizen.org --password=chiptizen \
-    # Add new security profile
-    && tizen security-profiles add --active --name=CHIP --author=$HOME/tizen-sdk-data/keystore/author/author.p12 --password=chiptizen \
-    # Cleanup
-    && : # last line
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index 5feb2ed7bae54c..5bbad09fa8a521 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -57,6 +57,15 @@ RUN set -x \
     && chmod -R a+w /opt/android/sdk/licenses \
     && : # last line
 
+# Required for the Tizen SDK
+RUN set -x \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
+    zip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && : # last line
+
 ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
 ENV ANDROID_HOME=/opt/android/sdk
 ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r21b
@@ -75,8 +84,9 @@ ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
 ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
 ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.13.2
 ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.11.0
-ENV TIZEN_SDK_ROOT /opt/tizen-sdk
-ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core
-ENV TIZEN_VERSION 6.0
 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
+
+ENV TIZEN_VERSION 6.0
+ENV TIZEN_SDK_ROOT /opt/tizen-sdk
+ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index c2bc2a700ccca7..db9cb06c063642 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.76 Version bump reason: [Ameba] Save wifi information in persistent storage for autoconnect
+0.5.79 Version bump reason: [Ameba] Update ameba SDK to expose xPortResetHeapMinimumEverFreeHeapSize API
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 7c272bc2beff83..60d66b0b7784f7 100644
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -232,19 +232,17 @@ def HostTargets():
     # Don't cross  compile some builds
     app_targets.append(
         target_native.Extend('rpc-console', app=HostApp.RPC_CONSOLE))
-    app_targets.append(
-        target_native.Extend('tv-app', app=HostApp.TV_APP))
-    app_targets.append(
-        target_native.Extend('tv-casting-app', app=HostApp.TV_CASTING_APP))
     app_targets.append(
         target_native.Extend('nl-test-runner', app=HostApp.NL_TEST_RUNNER))
 
     for target in targets:
         app_targets.append(target.Extend(
             'all-clusters', app=HostApp.ALL_CLUSTERS))
+        app_targets.append(target.Extend(
+            'all-clusters-minimal', app=HostApp.ALL_CLUSTERS_MINIMAL))
         if (HostBoard.NATIVE.PlatformName() == 'darwin'):
             app_targets.append(target.Extend(
-                'chip-tool-darwin', app=HostApp.CHIP_TOOL_DARWIN))
+                'darwin-framework-tool', app=HostApp.CHIP_TOOL_DARWIN))
         app_targets.append(target.Extend('chip-tool', app=HostApp.CHIP_TOOL))
         app_targets.append(target.Extend('thermostat', app=HostApp.THERMOSTAT))
         app_targets.append(target.Extend('minmdns', app=HostApp.MIN_MDNS))
@@ -256,13 +254,16 @@ def HostTargets():
         app_targets.append(target.Extend(
             'ota-requestor', app=HostApp.OTA_REQUESTOR, enable_ble=False))
         app_targets.append(target.Extend('python-bindings', app=HostApp.PYTHON_BINDINGS))
+        app_targets.append(target.Extend('tv-app', app=HostApp.TV_APP))
+        app_targets.append(target.Extend('tv-casting-app', app=HostApp.TV_CASTING))
+        app_targets.append(target.Extend('bridge', app=HostApp.BRIDGE))
 
     builder = VariantBuilder()
 
     # Possible build variants. Note that number of potential
     # builds is exponential here
     builder.AppendVariant(name="same-event-loop", validator=AcceptNameWithSubstrings(
-        ['-chip-tool', '-chip-tool-darwin']), separate_event_loop=False),
+        ['-chip-tool', '-darwin-framework-tool']), separate_event_loop=False),
     builder.AppendVariant(name="no-interactive", validator=AcceptNameWithSubstrings(
         ['-chip-tool']), interactive_mode=False),
     builder.AppendVariant(name="ipv6only", enable_ipv4=False),
@@ -321,16 +322,30 @@ def Esp32Targets():
 
     yield esp32_target.Extend('c3devkit-all-clusters', board=Esp32Board.C3DevKit, app=Esp32App.ALL_CLUSTERS)
 
+    yield esp32_target.Extend('m5stack-all-clusters-minimal', board=Esp32Board.M5Stack, app=Esp32App.ALL_CLUSTERS_MINIMAL)
+    yield esp32_target.Extend('m5stack-all-clusters-minimal-ipv6only', board=Esp32Board.M5Stack, app=Esp32App.ALL_CLUSTERS_MINIMAL,
+                              enable_ipv4=False)
+    yield esp32_target.Extend('m5stack-all-clusters-minimal-rpc', board=Esp32Board.M5Stack, app=Esp32App.ALL_CLUSTERS_MINIMAL,
+                              enable_rpcs=True)
+    yield esp32_target.Extend('m5stack-all-clusters-minimal-rpc-ipv6only', board=Esp32Board.M5Stack, app=Esp32App.ALL_CLUSTERS_MINIMAL,
+                              enable_rpcs=True, enable_ipv4=False)
+
+    yield esp32_target.Extend('c3devkit-all-clusters-minimal', board=Esp32Board.C3DevKit, app=Esp32App.ALL_CLUSTERS_MINIMAL)
+
     devkitc = esp32_target.Extend('devkitc', board=Esp32Board.DevKitC)
 
     yield devkitc.Extend('all-clusters', app=Esp32App.ALL_CLUSTERS)
     yield devkitc.Extend('all-clusters-ipv6only', app=Esp32App.ALL_CLUSTERS, enable_ipv4=False)
+    yield devkitc.Extend('all-clusters-minimal', app=Esp32App.ALL_CLUSTERS_MINIMAL)
+    yield devkitc.Extend('all-clusters-minimal-ipv6only', app=Esp32App.ALL_CLUSTERS_MINIMAL, enable_ipv4=False)
     yield devkitc.Extend('shell', app=Esp32App.SHELL)
     yield devkitc.Extend('light', app=Esp32App.LIGHT)
     yield devkitc.Extend('lock', app=Esp32App.LOCK)
     yield devkitc.Extend('bridge', app=Esp32App.BRIDGE)
     yield devkitc.Extend('temperature-measurement', app=Esp32App.TEMPERATURE_MEASUREMENT)
     yield devkitc.Extend('temperature-measurement-rpc', app=Esp32App.TEMPERATURE_MEASUREMENT, enable_rpcs=True)
+    yield devkitc.Extend('ota-requestor', app=Esp32App.OTA_REQUESTOR)
+    yield devkitc.Extend('ota-requestor-rpc', app=Esp32App.OTA_REQUESTOR, enable_rpcs=True)
 
     yield esp32_target.Extend('qemu-tests', board=Esp32Board.QEMU, app=Esp32App.TESTS)
 
@@ -393,10 +408,12 @@ def NrfTargets():
 
     # Enable nrf52840dongle for all-clusters and lighting app only
     yield target.Extend('nrf52840dongle-all-clusters', board=NrfBoard.NRF52840DONGLE, app=NrfApp.ALL_CLUSTERS)
+    yield target.Extend('nrf52840dongle-all-clusters-minimal', board=NrfBoard.NRF52840DONGLE, app=NrfApp.ALL_CLUSTERS_MINIMAL)
     yield target.Extend('nrf52840dongle-light', board=NrfBoard.NRF52840DONGLE, app=NrfApp.LIGHT)
 
     for target in targets:
         yield target.Extend('all-clusters', app=NrfApp.ALL_CLUSTERS)
+        yield target.Extend('all-clusters-minimal', app=NrfApp.ALL_CLUSTERS_MINIMAL)
         yield target.Extend('lock', app=NrfApp.LOCK)
         yield target.Extend('light', app=NrfApp.LIGHT)
         yield target.Extend('shell', app=NrfApp.SHELL)
@@ -447,6 +464,8 @@ def MbedTargets():
         app_targets.append(target.Extend('light', app=MbedApp.LIGHT))
         app_targets.append(target.Extend(
             'all-clusters', app=MbedApp.ALL_CLUSTERS))
+        app_targets.append(target.Extend(
+            'all-clusters-minimal', app=MbedApp.ALL_CLUSTERS_MINIMAL))
         app_targets.append(target.Extend('pigweed', app=MbedApp.PIGWEED))
         app_targets.append(target.Extend('shell', app=MbedApp.SHELL))
 
@@ -465,6 +484,7 @@ def InfineonTargets():
 
     yield target.Extend('p6-lock', board=InfineonBoard.P6BOARD, app=InfineonApp.LOCK)
     yield target.Extend('p6-all-clusters', board=InfineonBoard.P6BOARD, app=InfineonApp.ALL_CLUSTERS)
+    yield target.Extend('p6-all-clusters-minimal', board=InfineonBoard.P6BOARD, app=InfineonApp.ALL_CLUSTERS_MINIMAL)
     yield target.Extend('p6-light', board=InfineonBoard.P6BOARD, app=InfineonApp.LIGHT)
 
 
@@ -472,6 +492,7 @@ def AmebaTargets():
     ameba_target = Target('ameba', AmebaBuilder)
 
     yield ameba_target.Extend('amebad-all-clusters', board=AmebaBoard.AMEBAD, app=AmebaApp.ALL_CLUSTERS)
+    yield ameba_target.Extend('amebad-all-clusters-minimal', board=AmebaBoard.AMEBAD, app=AmebaApp.ALL_CLUSTERS_MINIMAL)
     yield ameba_target.Extend('amebad-light', board=AmebaBoard.AMEBAD, app=AmebaApp.LIGHT)
     yield ameba_target.Extend('amebad-pigweed', board=AmebaBoard.AMEBAD, app=AmebaApp.PIGWEED)
 
@@ -495,6 +516,7 @@ def cc13x2x7_26x2x7Targets():
     yield target.Extend('pump', app=cc13x2x7_26x2x7App.PUMP)
     yield target.Extend('pump-controller', app=cc13x2x7_26x2x7App.PUMP_CONTROLLER)
     yield target.Extend('all-clusters', app=cc13x2x7_26x2x7App.ALL_CLUSTERS)
+    yield target.Extend('all-clusters-minimal', app=cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL)
     yield target.Extend('shell', app=cc13x2x7_26x2x7App.SHELL)
 
 
@@ -549,11 +571,13 @@ def IMXTargets():
     yield target.Extend('lighting-app', app=IMXApp.LIGHT)
     yield target.Extend('thermostat', app=IMXApp.THERMOSTAT)
     yield target.Extend('all-clusters-app', app=IMXApp.ALL_CLUSTERS)
+    yield target.Extend('all-clusters-minimal-app', app=IMXApp.ALL_CLUSTERS_MINIMAL)
     yield target.Extend('ota-provider-app', app=IMXApp.OTA_PROVIDER)
     yield target.Extend('chip-tool-release', app=IMXApp.CHIP_TOOL, release=True)
     yield target.Extend('lighting-app-release', app=IMXApp.LIGHT, release=True)
     yield target.Extend('thermostat-release', app=IMXApp.THERMOSTAT, release=True)
     yield target.Extend('all-clusters-app-release', app=IMXApp.ALL_CLUSTERS, release=True)
+    yield target.Extend('all-clusters-minimal-app-release', app=IMXApp.ALL_CLUSTERS_MINIMAL, release=True)
     yield target.Extend('ota-provider-app-release', app=IMXApp.OTA_PROVIDER, release=True)
 
 
diff --git a/scripts/build/builders/ameba.py b/scripts/build/builders/ameba.py
index a961ca71df5377..bb743407bada4e 100644
--- a/scripts/build/builders/ameba.py
+++ b/scripts/build/builders/ameba.py
@@ -24,6 +24,7 @@ class AmebaBoard(Enum):
 
 class AmebaApp(Enum):
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     LIGHT = auto()
     PIGWEED = auto()
 
@@ -31,6 +32,8 @@ class AmebaApp(Enum):
     def ExampleName(self):
         if self == AmebaApp.ALL_CLUSTERS:
             return 'all-clusters-app'
+        elif self == AmebaApp.ALL_CLUSTERS_MINIMAL:
+            return 'all-clusters-minimal-app'
         elif self == AmebaApp.LIGHT:
             return 'lighting-app'
         elif self == AmebaApp.PIGWEED:
@@ -42,6 +45,8 @@ def ExampleName(self):
     def AppNamePrefix(self):
         if self == AmebaApp.ALL_CLUSTERS:
             return 'chip-ameba-all-clusters-app'
+        elif self == AmebaApp.ALL_CLUSTERS_MINIMAL:
+            return 'chip-ameba-all-clusters-minimal-app'
         elif self == AmebaApp.LIGHT:
             return 'chip-ameba-lighting-app'
         elif self == AmebaApp.PIGWEED:
diff --git a/scripts/build/builders/cc13x2x7_26x2x7.py b/scripts/build/builders/cc13x2x7_26x2x7.py
index 9565b5500f6738..99e3ae1d6da320 100644
--- a/scripts/build/builders/cc13x2x7_26x2x7.py
+++ b/scripts/build/builders/cc13x2x7_26x2x7.py
@@ -23,6 +23,7 @@ class cc13x2x7_26x2x7App(Enum):
     PUMP = auto()
     PUMP_CONTROLLER = auto()
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     SHELL = auto()
 
     def ExampleName(self):
@@ -34,6 +35,8 @@ def ExampleName(self):
             return 'pump-controller-app'
         elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS:
             return 'all-clusters-app'
+        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL:
+            return 'all-clusters-minimal-app'
         elif self == cc13x2x7_26x2x7App.SHELL:
             return 'shell'
         else:
@@ -48,6 +51,8 @@ def AppNamePrefix(self):
             return 'chip-LP_CC2652R7-pump-controller-example'
         elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS:
             return 'chip-LP_CC2652R7-all-clusters-example'
+        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL:
+            return 'chip-LP_CC2652R7-all-clusters-minimal-example'
         elif self == cc13x2x7_26x2x7App.SHELL:
             return 'chip-LP_CC2652R7-shell-example'
         else:
@@ -92,7 +97,7 @@ def build_outputs(self):
                 or self.app == cc13x2x7_26x2x7App.PUMP_CONTROLLER):
             extensions = [".out", ".bin", ".out.map", "-bim.hex"]
 
-        elif self.app == cc13x2x7_26x2x7App.ALL_CLUSTERS or self.app == cc13x2x7_26x2x7App.SHELL:
+        elif self.app == cc13x2x7_26x2x7App.ALL_CLUSTERS or cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL or self.app == cc13x2x7_26x2x7App.SHELL:
             extensions = [".out", ".out.map"]
 
         else:
diff --git a/scripts/build/builders/esp32.py b/scripts/build/builders/esp32.py
index 8f3f43393d0f2e..053384a3a4273e 100644
--- a/scripts/build/builders/esp32.py
+++ b/scripts/build/builders/esp32.py
@@ -29,17 +29,21 @@ class Esp32Board(Enum):
 
 class Esp32App(Enum):
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     LIGHT = auto()
     LOCK = auto()
     SHELL = auto()
     BRIDGE = auto()
     TEMPERATURE_MEASUREMENT = auto()
     TESTS = auto()
+    OTA_REQUESTOR = auto()
 
     @property
     def ExamplePath(self):
         if self == Esp32App.ALL_CLUSTERS:
             return 'examples/all-clusters-app'
+        elif self == Esp32App.ALL_CLUSTERS_MINIMAL:
+            return 'examples/all-clusters-minimal-app'
         elif self == Esp32App.LIGHT:
             return 'examples/lighting-app'
         elif self == Esp32App.LOCK:
@@ -50,6 +54,8 @@ def ExamplePath(self):
             return 'examples/bridge-app'
         elif self == Esp32App.TEMPERATURE_MEASUREMENT:
             return 'examples/temperature-measurement-app'
+        elif self == Esp32App.OTA_REQUESTOR:
+            return 'examples/ota-requestor-app'
         elif self == Esp32App.TESTS:
             return 'src/test_driver'
         else:
@@ -59,6 +65,8 @@ def ExamplePath(self):
     def AppNamePrefix(self):
         if self == Esp32App.ALL_CLUSTERS:
             return 'chip-all-clusters-app'
+        elif self == Esp32App.ALL_CLUSTERS_MINIMAL:
+            return 'chip-all-clusters-minimal-app'
         elif self == Esp32App.LIGHT:
             return 'chip-lighting-app'
         elif self == Esp32App.LOCK:
@@ -69,6 +77,8 @@ def AppNamePrefix(self):
             return 'chip-bridge-app'
         elif self == Esp32App.TEMPERATURE_MEASUREMENT:
             return 'chip-temperature-measurement-app'
+        elif self == Esp32App.OTA_REQUESTOR:
+            return 'chip-ota-requestor-app'
         elif self == Esp32App.TESTS:
             return None
         else:
@@ -85,17 +95,21 @@ def IsCompatible(self, board: Esp32Board):
         if board == Esp32Board.QEMU:
             return self == Esp32App.TESTS
         elif board == Esp32Board.M5Stack:
-            return self == Esp32App.ALL_CLUSTERS
+            return self == Esp32App.ALL_CLUSTERS or self == Esp32App.ALL_CLUSTERS_MINIMAL
         elif board == Esp32Board.C3DevKit:
-            return self == Esp32App.ALL_CLUSTERS
+            return self == Esp32App.ALL_CLUSTERS or self == Esp32App.ALL_CLUSTERS_MINIMAL
         else:
             return (board == Esp32Board.DevKitC) and (self != Esp32App.TESTS)
 
 
 def DefaultsFileName(board: Esp32Board, app: Esp32App, enable_rpcs: bool):
+    rpc_enabled_apps = [Esp32App.ALL_CLUSTERS,
+                        Esp32App.ALL_CLUSTERS_MINIMAL,
+                        Esp32App.OTA_REQUESTOR,
+                        Esp32App.TEMPERATURE_MEASUREMENT]
     if app == Esp32App.TESTS:
         return 'sdkconfig_qemu.defaults'
-    elif app != Esp32App.ALL_CLUSTERS and app != Esp32App.TEMPERATURE_MEASUREMENT:
+    elif app not in rpc_enabled_apps:
         return 'sdkconfig.defaults'
 
     rpc = "_rpc" if enable_rpcs else ""
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
index 44e1ed244008cb..3baf39e387e291 100644
--- a/scripts/build/builders/host.py
+++ b/scripts/build/builders/host.py
@@ -21,6 +21,7 @@
 
 class HostApp(Enum):
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     CHIP_TOOL = auto()
     CHIP_TOOL_DARWIN = auto()
     THERMOSTAT = auto()
@@ -38,14 +39,18 @@ class HostApp(Enum):
     OTA_REQUESTOR = auto()
     PYTHON_BINDINGS = auto()
     NL_TEST_RUNNER = auto()
+    TV_CASTING = auto()
+    BRIDGE = auto()
 
     def ExamplePath(self):
         if self == HostApp.ALL_CLUSTERS:
             return 'all-clusters-app/linux'
+        elif self == HostApp.ALL_CLUSTERS_MINIMAL:
+            return 'all-clusters-minimal-app/linux'
         elif self == HostApp.CHIP_TOOL:
             return 'chip-tool'
         elif self == HostApp.CHIP_TOOL_DARWIN:
-            return 'chip-tool-darwin'
+            return 'darwin-framework-tool'
         elif self == HostApp.THERMOSTAT:
             return 'thermostat/linux'
         elif self == HostApp.RPC_CONSOLE:
@@ -70,6 +75,10 @@ def ExamplePath(self):
             return '../'
         elif self == HostApp.NL_TEST_RUNNER:
             return '../src/test_driver/efr32'
+        elif self == HostApp.TV_CASTING:
+            return 'tv-casting-app/linux'
+        elif self == HostApp.BRIDGE:
+            return 'bridge-app/linux'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -77,12 +86,15 @@ def OutputNames(self):
         if self == HostApp.ALL_CLUSTERS:
             yield 'chip-all-clusters-app'
             yield 'chip-all-clusters-app.map'
+        elif self == HostApp.ALL_CLUSTERS_MINIMAL:
+            yield 'chip-all-clusters-minimal-app'
+            yield 'chip-all-clusters-minimal-app.map'
         elif self == HostApp.CHIP_TOOL:
             yield 'chip-tool'
             yield 'chip-tool.map'
         elif self == HostApp.CHIP_TOOL_DARWIN:
-            yield 'chip-tool-darwin'
-            yield 'chip-tool-darwin.map'
+            yield 'darwin-framework-tool'
+            yield 'darwin-framework-tool.map'
         elif self == HostApp.THERMOSTAT:
             yield 'thermostat-app'
             yield 'thermostat-app.map'
@@ -128,6 +140,12 @@ def OutputNames(self):
             yield 'controller/python'  # Directory containing WHL files
         elif self == HostApp.NL_TEST_RUNNER:
             yield 'chip_nl_test_runner_wheels'
+        elif self == HostApp.TV_CASTING:
+            yield 'chip-tv-casting-app'
+            yield 'chip-tv-casting-app.map'
+        elif self == HostApp.BRIDGE:
+            yield 'chip-bridge-app'
+            yield 'chip-bridge-app.map'
         else:
             raise Exception('Unknown app type: %r' % self)
 
diff --git a/scripts/build/builders/imx.py b/scripts/build/builders/imx.py
index d920d32bb59e64..9118066f5d0d05 100644
--- a/scripts/build/builders/imx.py
+++ b/scripts/build/builders/imx.py
@@ -23,6 +23,7 @@ class IMXApp(Enum):
     LIGHT = auto()
     THERMOSTAT = auto()
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     OTA_PROVIDER = auto()
 
     def ExamplePath(self):
@@ -34,6 +35,8 @@ def ExamplePath(self):
             return 'thermostat/linux'
         if self == IMXApp.ALL_CLUSTERS:
             return 'all-clusters-app/linux'
+        if self == IMXApp.ALL_CLUSTERS_MINIMAL:
+            return 'all-clusters-minimal-app/linux'
         if self == IMXApp.OTA_PROVIDER:
             return 'ota-provider-app/linux'
 
@@ -50,6 +53,9 @@ def OutputNames(self):
         if self == IMXApp.ALL_CLUSTERS:
             yield 'chip-all-clusters-app'
             yield 'chip-all-clusters-app.map'
+        if self == IMXApp.ALL_CLUSTERS_MINIMAL:
+            yield 'chip-all-clusters-minimal-app'
+            yield 'chip-all-clusters-minimal-app.map'
         if self == IMXApp.OTA_PROVIDER:
             yield 'chip-ota-provider-app'
             yield 'chip-ota-provider-app.map'
diff --git a/scripts/build/builders/infineon.py b/scripts/build/builders/infineon.py
index 3324525c6ae3a6..a46cec1a0fa44a 100644
--- a/scripts/build/builders/infineon.py
+++ b/scripts/build/builders/infineon.py
@@ -22,6 +22,7 @@ class InfineonApp(Enum):
     LOCK = auto()
     LIGHT = auto()
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
 
     def ExampleName(self):
         if self == InfineonApp.LOCK:
@@ -30,6 +31,8 @@ def ExampleName(self):
             return 'lighting-app'
         elif self == InfineonApp.ALL_CLUSTERS:
             return 'all-clusters-app'
+        elif self == InfineonApp.ALL_CLUSTERS_MINIMAL:
+            return 'all-clusters-minimal-app'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -40,6 +43,8 @@ def AppNamePrefix(self):
             return 'chip-p6-lighting-example'
         elif self == InfineonApp.ALL_CLUSTERS:
             return 'chip-p6-clusters-example'
+        elif self == InfineonApp.ALL_CLUSTERS_MINIMAL:
+            return 'chip-p6-clusters-minimal-example'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -48,6 +53,8 @@ def FlashBundleName(self):
             return 'lock_app.flashbundle.txt'
         elif self == InfineonApp.ALL_CLUSTERS:
             return 'clusters_app.flashbundle.txt'
+        elif self == InfineonApp.ALL_CLUSTERS_MINIMAL:
+            return 'clusters_minimal_app.flashbundle.txt'
         elif self == InfineonApp.LIGHT:
             return 'lighting_app.flashbundle.txt'
         else:
diff --git a/scripts/build/builders/mbed.py b/scripts/build/builders/mbed.py
index cc1d999f71eec7..73fc802386207f 100644
--- a/scripts/build/builders/mbed.py
+++ b/scripts/build/builders/mbed.py
@@ -23,6 +23,7 @@ class MbedApp(Enum):
     LOCK = auto()
     LIGHT = auto()
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     PIGWEED = auto()
     SHELL = auto()
 
@@ -34,6 +35,8 @@ def ExampleName(self):
             return 'lighting-app'
         elif self == MbedApp.ALL_CLUSTERS:
             return 'all-clusters-app'
+        elif self == MbedApp.ALL_CLUSTERS_MINIMAL:
+            return 'all-clusters-minimal-app'
         elif self == MbedApp.PIGWEED:
             return 'pigweed-app'
         elif self == MbedApp.SHELL:
@@ -49,6 +52,8 @@ def AppNamePrefix(self):
             return 'chip-mbed-lighting-app-example'
         elif self == MbedApp.ALL_CLUSTERS:
             return 'chip-mbed-all-clusters-app-example'
+        elif self == MbedApp.ALL_CLUSTERS_MINIMAL:
+            return 'chip-mbed-all-clusters-minimal-app-example'
         elif self == MbedApp.PIGWEED:
             return 'chip-mbed-pigweed-app-example'
         elif self == MbedApp.SHELL:
diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py
index a5a05a2c58abe9..d6e92114cd2540 100644
--- a/scripts/build/builders/nrf.py
+++ b/scripts/build/builders/nrf.py
@@ -22,6 +22,7 @@
 
 class NrfApp(Enum):
     ALL_CLUSTERS = auto()
+    ALL_CLUSTERS_MINIMAL = auto()
     LIGHT = auto()
     LOCK = auto()
     SHELL = auto()
@@ -32,6 +33,8 @@ class NrfApp(Enum):
     def AppPath(self):
         if self == NrfApp.ALL_CLUSTERS:
             return 'examples/all-clusters-app'
+        elif self == NrfApp.ALL_CLUSTERS_MINIMAL:
+            return 'examples/all-clusters-minimal-app'
         elif self == NrfApp.LIGHT:
             return 'examples/lighting-app'
         elif self == NrfApp.LOCK:
@@ -50,6 +53,8 @@ def AppPath(self):
     def AppNamePrefix(self):
         if self == NrfApp.ALL_CLUSTERS:
             return 'chip-nrf-all-clusters-example'
+        elif self == NrfApp.ALL_CLUSTERS_MINIMAL:
+            return 'chip-nrf-all-clusters-minimal-example'
         elif self == NrfApp.LIGHT:
             return 'chip-nrf-lighting-example'
         elif self == NrfApp.LOCK:
@@ -68,6 +73,8 @@ def AppNamePrefix(self):
     def _FlashBundlePrefix(self):
         if self == NrfApp.ALL_CLUSTERS:
             return 'chip-nrfconnect-all-clusters-example'
+        elif self == NrfApp.ALL_CLUSTERS_MINIMAL:
+            return 'chip-nrfconnect-all-clusters-minimal-example'
         elif self == NrfApp.LIGHT:
             return 'chip-nrfconnect-lighting-example'
         elif self == NrfApp.LOCK:
@@ -155,7 +162,7 @@ def generate(self):
             if self.enable_rpcs:
                 flags.append("-DOVERLAY_CONFIG=rpc.overlay")
 
-            if self.board == NrfBoard.NRF52840DONGLE and self.app != NrfApp.ALL_CLUSTERS:
+            if self.board == NrfBoard.NRF52840DONGLE and self.app != NrfApp.ALL_CLUSTERS and self.app != NrfApp.ALL_CLUSTERS_MINIMAL:
                 flags.append("-DCONF_FILE=prj_no_dfu.conf")
 
             build_flags = " -- " + " ".join(flags) if len(flags) > 0 else ""
diff --git a/scripts/build/builders/tizen.py b/scripts/build/builders/tizen.py
index efaf444a8568a4..29d6672ccc19d6 100644
--- a/scripts/build/builders/tizen.py
+++ b/scripts/build/builders/tizen.py
@@ -105,7 +105,7 @@ def GnBuildArgs(self):
             'target_os="tizen"',
             'target_cpu="%s"' % self.board.TargetCpuName(),
             'tizen_sdk_root="%s"' % os.environ['TIZEN_SDK_ROOT'],
-            'sysroot="%s"' % os.environ['TIZEN_SDK_SYSROOT'],
+            'tizen_sdk_sysroot="%s"' % os.environ['TIZEN_SDK_SYSROOT'],
         ]
 
     def _generate_flashbundle(self):
diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt
index 3c610bccc78734..77fa5aace8da74 100644
--- a/scripts/build/testdata/all_targets_except_host.txt
+++ b/scripts/build/testdata/all_targets_except_host.txt
@@ -1,4 +1,5 @@
 ameba-amebad-all-clusters
+ameba-amebad-all-clusters-minimal
 ameba-amebad-light
 ameba-amebad-pigweed
 android-androidstudio-arm-chip-tool
@@ -18,6 +19,7 @@ android-x86-chip-tool
 android-x86-chip-tvserver
 bl602-light
 cc13x2x7_26x2x7-all-clusters
+cc13x2x7_26x2x7-all-clusters-minimal
 cc13x2x7_26x2x7-lock-ftd
 cc13x2x7_26x2x7-lock-mtd
 cc13x2x7_26x2x7-pump
@@ -140,21 +142,32 @@ efr32-brd4304a-unit-test-with-ota-requestor (NOGLOB: only user requested)
 efr32-brd4304a-window-covering (NOGLOB: only user requested)
 efr32-brd4304a-window-covering-with-ota-requestor (NOGLOB: only user requested)
 esp32-c3devkit-all-clusters
+esp32-c3devkit-all-clusters-minimal
 esp32-devkitc-all-clusters
 esp32-devkitc-all-clusters-ipv6only
+esp32-devkitc-all-clusters-minimal
+esp32-devkitc-all-clusters-minimal-ipv6only
 esp32-devkitc-bridge
 esp32-devkitc-light
 esp32-devkitc-lock
+esp32-devkitc-ota-requestor
+esp32-devkitc-ota-requestor-rpc
 esp32-devkitc-shell
 esp32-devkitc-temperature-measurement
 esp32-devkitc-temperature-measurement-rpc
 esp32-m5stack-all-clusters
 esp32-m5stack-all-clusters-ipv6only
+esp32-m5stack-all-clusters-minimal
+esp32-m5stack-all-clusters-minimal-ipv6only
+esp32-m5stack-all-clusters-minimal-rpc
+esp32-m5stack-all-clusters-minimal-rpc-ipv6only
 esp32-m5stack-all-clusters-rpc
 esp32-m5stack-all-clusters-rpc-ipv6only
 esp32-qemu-tests
 imx-all-clusters-app
 imx-all-clusters-app-release
+imx-all-clusters-minimal-app
+imx-all-clusters-minimal-app-release
 imx-chip-tool
 imx-chip-tool-release
 imx-lighting-app
@@ -164,6 +177,7 @@ imx-ota-provider-app-release
 imx-thermostat
 imx-thermostat-release
 infineon-p6-all-clusters
+infineon-p6-all-clusters-minimal
 infineon-p6-light
 infineon-p6-lock
 k32w-light-ota-se (NOGLOB: Only on demand build)
@@ -173,6 +187,9 @@ k32w-lock-release
 k32w-shell-release
 mbed-CY8CPROTO_062_4343W-all-clusters-debug (NOGLOB: Compile only for debugging purpose - https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html)
 mbed-CY8CPROTO_062_4343W-all-clusters-develop (NOGLOB: Compile only for debugging purpose - https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html)
+mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug (NOGLOB: Compile only for debugging purpose - https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html)
+mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop (NOGLOB: Compile only for debugging purpose - https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html)
+mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
 mbed-CY8CPROTO_062_4343W-all-clusters-release
 mbed-CY8CPROTO_062_4343W-light-debug (NOGLOB: Compile only for debugging purpose - https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html)
 mbed-CY8CPROTO_062_4343W-light-develop (NOGLOB: Compile only for debugging purpose - https://os.mbed.com/docs/mbed-os/latest/program-setup/build-profiles-and-rules.html)
@@ -188,6 +205,7 @@ mbed-CY8CPROTO_062_4343W-shell-develop (NOGLOB: Compile only for debugging purpo
 mbed-CY8CPROTO_062_4343W-shell-release
 nrf-native-posix-64-tests
 nrf-nrf52840dk-all-clusters
+nrf-nrf52840dk-all-clusters-minimal
 nrf-nrf52840dk-light
 nrf-nrf52840dk-light-rpc
 nrf-nrf52840dk-lock
@@ -195,8 +213,10 @@ nrf-nrf52840dk-pump
 nrf-nrf52840dk-pump-controller
 nrf-nrf52840dk-shell
 nrf-nrf52840dongle-all-clusters
+nrf-nrf52840dongle-all-clusters-minimal
 nrf-nrf52840dongle-light
 nrf-nrf5340dk-all-clusters
+nrf-nrf5340dk-all-clusters-minimal
 nrf-nrf5340dk-light
 nrf-nrf5340dk-light-rpc (NOGLOB: Compile failure due to pw_build args not forwarded to proto compiler. https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/66760)
 nrf-nrf5340dk-lock
diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt
index 58651d5ab3a641..12ee5aa27f27f5 100644
--- a/scripts/build/testdata/build_all_except_host.txt
+++ b/scripts/build/testdata/build_all_except_host.txt
@@ -4,6 +4,9 @@ cd "{root}"
 # Generating ameba-amebad-all-clusters
 bash -c '$AMEBA_PATH/project/realtek_amebaD_va0_example/GCC-RELEASE/build.sh {root} ninja {out}/ameba-amebad-all-clusters all-clusters-app'
 
+# Generating ameba-amebad-all-clusters-minimal
+bash -c '$AMEBA_PATH/project/realtek_amebaD_va0_example/GCC-RELEASE/build.sh {root} ninja {out}/ameba-amebad-all-clusters-minimal all-clusters-minimal-app'
+
 # Generating ameba-amebad-light
 bash -c '$AMEBA_PATH/project/realtek_amebaD_va0_example/GCC-RELEASE/build.sh {root} ninja {out}/ameba-amebad-light lighting-app'
 
@@ -151,6 +154,9 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa
 # Generating cc13x2x7_26x2x7-all-clusters
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT"' {out}/cc13x2x7_26x2x7-all-clusters
 
+# Generating cc13x2x7_26x2x7-all-clusters-minimal
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT"' {out}/cc13x2x7_26x2x7-all-clusters-minimal
+
 # Generating cc13x2x7_26x2x7-lock-ftd
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT" chip_openthread_ftd=true' {out}/cc13x2x7_26x2x7-lock-ftd
 
@@ -525,6 +531,17 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-c3devkit-all-clusters/sdkconfig.defaults
 idf.py -C examples/all-clusters-app/esp32 -B {out}/esp32-c3devkit-all-clusters reconfigure'
 
+# Generating esp32-c3devkit-all-clusters-minimal
+mkdir -p {out}/esp32-c3devkit-all-clusters-minimal
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig_c3devkit.defaults {out}/esp32-c3devkit-all-clusters-minimal/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-c3devkit-all-clusters-minimal/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-c3devkit-all-clusters-minimal reconfigure'
+
 # Generating esp32-devkitc-all-clusters
 mkdir -p {out}/esp32-devkitc-all-clusters
 
@@ -549,6 +566,30 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-all-clusters-ipv6only/sdkconfig.defaults
 idf.py -C examples/all-clusters-app/esp32 -B {out}/esp32-devkitc-all-clusters-ipv6only reconfigure'
 
+# Generating esp32-devkitc-all-clusters-minimal
+mkdir -p {out}/esp32-devkitc-all-clusters-minimal
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig.defaults {out}/esp32-devkitc-all-clusters-minimal/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-all-clusters-minimal/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-devkitc-all-clusters-minimal reconfigure'
+
+# Generating esp32-devkitc-all-clusters-minimal-ipv6only
+mkdir -p {out}/esp32-devkitc-all-clusters-minimal-ipv6only
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig.defaults {out}/esp32-devkitc-all-clusters-minimal-ipv6only/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'echo -e "\nCONFIG_DISABLE_IPV4=y\n" >>{out}/esp32-devkitc-all-clusters-minimal-ipv6only/sdkconfig.defaults'
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-all-clusters-minimal-ipv6only/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-devkitc-all-clusters-minimal-ipv6only reconfigure'
+
 # Generating esp32-devkitc-bridge
 mkdir -p {out}/esp32-devkitc-bridge
 
@@ -582,6 +623,28 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-lock/sdkconfig.defaults
 idf.py -C examples/lock-app/esp32 -B {out}/esp32-devkitc-lock reconfigure'
 
+# Generating esp32-devkitc-ota-requestor
+mkdir -p {out}/esp32-devkitc-ota-requestor
+
+cp examples/ota-requestor-app/esp32/sdkconfig.defaults {out}/esp32-devkitc-ota-requestor/sdkconfig.defaults
+
+rm -f examples/ota-requestor-app/esp32/sdkconfig
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-ota-requestor/sdkconfig.defaults
+idf.py -C examples/ota-requestor-app/esp32 -B {out}/esp32-devkitc-ota-requestor reconfigure'
+
+# Generating esp32-devkitc-ota-requestor-rpc
+mkdir -p {out}/esp32-devkitc-ota-requestor-rpc
+
+cp examples/ota-requestor-app/esp32/sdkconfig_rpc.defaults {out}/esp32-devkitc-ota-requestor-rpc/sdkconfig.defaults
+
+rm -f examples/ota-requestor-app/esp32/sdkconfig
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-ota-requestor-rpc/sdkconfig.defaults
+idf.py -C examples/ota-requestor-app/esp32 -B {out}/esp32-devkitc-ota-requestor-rpc reconfigure'
+
 # Generating esp32-devkitc-shell
 mkdir -p {out}/esp32-devkitc-shell
 
@@ -639,6 +702,54 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-ipv6only/sdkconfig.defaults
 idf.py -C examples/all-clusters-app/esp32 -B {out}/esp32-m5stack-all-clusters-ipv6only reconfigure'
 
+# Generating esp32-m5stack-all-clusters-minimal
+mkdir -p {out}/esp32-m5stack-all-clusters-minimal
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults {out}/esp32-m5stack-all-clusters-minimal/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal reconfigure'
+
+# Generating esp32-m5stack-all-clusters-minimal-ipv6only
+mkdir -p {out}/esp32-m5stack-all-clusters-minimal-ipv6only
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults {out}/esp32-m5stack-all-clusters-minimal-ipv6only/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'echo -e "\nCONFIG_DISABLE_IPV4=y\n" >>{out}/esp32-m5stack-all-clusters-minimal-ipv6only/sdkconfig.defaults'
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal-ipv6only/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal-ipv6only reconfigure'
+
+# Generating esp32-m5stack-all-clusters-minimal-rpc
+mkdir -p {out}/esp32-m5stack-all-clusters-minimal-rpc
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults {out}/esp32-m5stack-all-clusters-minimal-rpc/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal-rpc/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal-rpc reconfigure'
+
+# Generating esp32-m5stack-all-clusters-minimal-rpc-ipv6only
+mkdir -p {out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only
+
+cp examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults {out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+bash -c 'echo -e "\nCONFIG_DISABLE_IPV4=y\n" >>{out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults'
+
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only reconfigure'
+
 # Generating esp32-m5stack-all-clusters-rpc
 mkdir -p {out}/esp32-m5stack-all-clusters-rpc
 
@@ -684,6 +795,16 @@ bash -c '
 PKG_CONFIG_PATH="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux/lib/aarch64-linux-gnu/pkgconfig" \
  gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux '"'"'--args=target_os="linux" target_cpu="arm64" arm_arch="armv8-a" import("//build_overrides/build.gni") custom_toolchain="${build_root}/toolchain/custom" sysroot="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux" target_cflags=[ "-DCHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME=\"mlan0\"", "-DCHIP_DEVICE_CONFIG_LINUX_DHCPC_CMD=\"udhcpc -b -i %s \"" ] target_cc="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-gcc" target_cxx="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-g++" target_ar="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-ar" is_debug=false'"'"' {out}/imx-all-clusters-app-release'
 
+# Generating imx-all-clusters-minimal-app
+bash -c '
+PKG_CONFIG_PATH="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/linux '"'"'--args=target_os="linux" target_cpu="arm64" arm_arch="armv8-a" import("//build_overrides/build.gni") custom_toolchain="${build_root}/toolchain/custom" sysroot="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux" target_cflags=[ "-DCHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME=\"mlan0\"", "-DCHIP_DEVICE_CONFIG_LINUX_DHCPC_CMD=\"udhcpc -b -i %s \"" ] target_cc="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-gcc" target_cxx="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-g++" target_ar="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-ar"'"'"' {out}/imx-all-clusters-minimal-app'
+
+# Generating imx-all-clusters-minimal-app-release
+bash -c '
+PKG_CONFIG_PATH="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/linux '"'"'--args=target_os="linux" target_cpu="arm64" arm_arch="armv8-a" import("//build_overrides/build.gni") custom_toolchain="${build_root}/toolchain/custom" sysroot="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux" target_cflags=[ "-DCHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME=\"mlan0\"", "-DCHIP_DEVICE_CONFIG_LINUX_DHCPC_CMD=\"udhcpc -b -i %s \"" ] target_cc="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-gcc" target_cxx="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-g++" target_ar="IMX_SDK_ROOT/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-ar" is_debug=false'"'"' {out}/imx-all-clusters-minimal-app-release'
+
 # Generating imx-chip-tool
 bash -c '
 PKG_CONFIG_PATH="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux/lib/aarch64-linux-gnu/pkgconfig" \
@@ -727,6 +848,9 @@ PKG_CONFIG_PATH="IMX_SDK_ROOT/sysroots/cortexa53-crypto-poky-linux/lib/aarch64-l
 # Generating infineon-p6-all-clusters
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-all-clusters
 
+# Generating infineon-p6-all-clusters-minimal
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-all-clusters-minimal
+
 # Generating infineon-p6-light
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/p6 '--args=p6_board="CY8CKIT-062S2-43012"' {out}/infineon-p6-light
 
@@ -770,6 +894,24 @@ mbed-tools configure -t GCC_ARM -m CY8CPROTO_062_4343W -p {root}/examples/all-cl
 # Generating mbed-CY8CPROTO_062_4343W-all-clusters-develop
 cmake -S {root}/examples/all-clusters-app/mbed -B {out}/mbed-CY8CPROTO_062_4343W-all-clusters-develop -GNinja -DCMAKE_BUILD_TYPE=develop -DMBED_OS_PATH={root}/third_party/mbed-os/repo -DMBED_OS_POSIX_SOCKET_PATH={root}/third_party/mbed-os-posix-socket/repo
 
+# Generating config mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug
+mbed-tools configure -t GCC_ARM -m CY8CPROTO_062_4343W -p {root}/examples/all-clusters-minimal-app/mbed -o {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug --mbed-os-path {root}/third_party/mbed-os/repo
+
+# Generating mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug
+cmake -S {root}/examples/all-clusters-minimal-app/mbed -B {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug -GNinja -DCMAKE_BUILD_TYPE=debug -DMBED_OS_PATH={root}/third_party/mbed-os/repo -DMBED_OS_POSIX_SOCKET_PATH={root}/third_party/mbed-os-posix-socket/repo
+
+# Generating config mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop
+mbed-tools configure -t GCC_ARM -m CY8CPROTO_062_4343W -p {root}/examples/all-clusters-minimal-app/mbed -o {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop --mbed-os-path {root}/third_party/mbed-os/repo
+
+# Generating mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop
+cmake -S {root}/examples/all-clusters-minimal-app/mbed -B {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop -GNinja -DCMAKE_BUILD_TYPE=develop -DMBED_OS_PATH={root}/third_party/mbed-os/repo -DMBED_OS_POSIX_SOCKET_PATH={root}/third_party/mbed-os-posix-socket/repo
+
+# Generating config mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
+mbed-tools configure -t GCC_ARM -m CY8CPROTO_062_4343W -p {root}/examples/all-clusters-minimal-app/mbed -o {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release --mbed-os-path {root}/third_party/mbed-os/repo
+
+# Generating mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
+cmake -S {root}/examples/all-clusters-minimal-app/mbed -B {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release -GNinja -DCMAKE_BUILD_TYPE=release -DMBED_OS_PATH={root}/third_party/mbed-os/repo -DMBED_OS_POSIX_SOCKET_PATH={root}/third_party/mbed-os-posix-socket/repo
+
 # Generating config mbed-CY8CPROTO_062_4343W-all-clusters-release
 mbed-tools configure -t GCC_ARM -m CY8CPROTO_062_4343W -p {root}/examples/all-clusters-app/mbed -o {out}/mbed-CY8CPROTO_062_4343W-all-clusters-release --mbed-os-path {root}/third_party/mbed-os/repo
 
@@ -858,6 +1000,11 @@ bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
 west build --cmake-only -d {out}/nrf-nrf52840dk-all-clusters -b nrf52840dk_nrf52840 {root}/examples/all-clusters-app/nrfconnect'
 
+# Generating nrf-nrf52840dk-all-clusters-minimal
+bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
+export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
+west build --cmake-only -d {out}/nrf-nrf52840dk-all-clusters-minimal -b nrf52840dk_nrf52840 {root}/examples/all-clusters-minimal-app/nrfconnect'
+
 # Generating nrf-nrf52840dk-light
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
@@ -893,6 +1040,11 @@ bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
 west build --cmake-only -d {out}/nrf-nrf52840dongle-all-clusters -b nrf52840dongle_nrf52840 {root}/examples/all-clusters-app/nrfconnect'
 
+# Generating nrf-nrf52840dongle-all-clusters-minimal
+bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
+export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
+west build --cmake-only -d {out}/nrf-nrf52840dongle-all-clusters-minimal -b nrf52840dongle_nrf52840 {root}/examples/all-clusters-minimal-app/nrfconnect'
+
 # Generating nrf-nrf52840dongle-light
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
@@ -903,6 +1055,11 @@ bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
 west build --cmake-only -d {out}/nrf-nrf5340dk-all-clusters -b nrf5340dk_nrf5340_cpuapp {root}/examples/all-clusters-app/nrfconnect'
 
+# Generating nrf-nrf5340dk-all-clusters-minimal
+bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
+export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
+west build --cmake-only -d {out}/nrf-nrf5340dk-all-clusters-minimal -b nrf5340dk_nrf5340_cpuapp {root}/examples/all-clusters-minimal-app/nrfconnect'
+
 # Generating nrf-nrf5340dk-light
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
@@ -960,32 +1117,35 @@ source "$ZEPHYR_BASE/zephyr-env.sh";
 west build --cmake-only -d {out}/telink-tlsr9518adk80d-light-switch -b tlsr9518adk80d {root}/examples/light-switch-app/telink'
 
 # Generating tizen-arm-light
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light
 
 # Generating tizen-arm-light-asan
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-asan
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-asan
 
 # Generating tizen-arm-light-no-ble
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble
 
 # Generating tizen-arm-light-no-ble-asan
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble-asan
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble-asan
 
 # Generating tizen-arm-light-no-ble-no-wifi
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false chip_enable_wifi=false target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble-no-wifi
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false chip_enable_wifi=false target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble-no-wifi
 
 # Generating tizen-arm-light-no-ble-no-wifi-asan
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false chip_enable_wifi=false is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble-no-wifi-asan
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_config_network_layer_ble=false chip_enable_wifi=false is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-ble-no-wifi-asan
 
 # Generating tizen-arm-light-no-wifi
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_enable_wifi=false target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-wifi
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_enable_wifi=false target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-wifi
 
 # Generating tizen-arm-light-no-wifi-asan
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_enable_wifi=false is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-wifi-asan
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/tizen '--args=chip_enable_wifi=false is_asan=true target_os="tizen" target_cpu="arm" tizen_sdk_root="TEST_TIZEN_SDK_ROOT" tizen_sdk_sysroot="TEST_TIZEN_SDK_SYSROOT"' {out}/tizen-arm-light-no-wifi-asan
 
 # Building ameba-amebad-all-clusters
 ninja -C {out}/ameba-amebad-all-clusters
 
+# Building ameba-amebad-all-clusters-minimal
+ninja -C {out}/ameba-amebad-all-clusters-minimal
+
 # Building ameba-amebad-light
 ninja -C {out}/ameba-amebad-light
 
@@ -1257,6 +1417,9 @@ ninja -C {out}/bl602-light
 # Building cc13x2x7_26x2x7-all-clusters
 ninja -C {out}/cc13x2x7_26x2x7-all-clusters
 
+# Building cc13x2x7_26x2x7-all-clusters-minimal
+ninja -C {out}/cc13x2x7_26x2x7-all-clusters-minimal
+
 # Building cc13x2x7_26x2x7-lock-ftd
 ninja -C {out}/cc13x2x7_26x2x7-lock-ftd
 
@@ -1627,6 +1790,13 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-c3devkit-all-clusters/sdkconfig.defaults
 idf.py -C examples/all-clusters-app/esp32 -B {out}/esp32-c3devkit-all-clusters build'
 
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-c3devkit-all-clusters-minimal
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-c3devkit-all-clusters-minimal/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-c3devkit-all-clusters-minimal build'
+
 rm -f examples/all-clusters-app/esp32/sdkconfig
 
 # Building esp32-devkitc-all-clusters
@@ -1641,6 +1811,20 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-all-clusters-ipv6only/sdkconfig.defaults
 idf.py -C examples/all-clusters-app/esp32 -B {out}/esp32-devkitc-all-clusters-ipv6only build'
 
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-devkitc-all-clusters-minimal
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-all-clusters-minimal/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-devkitc-all-clusters-minimal build'
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-devkitc-all-clusters-minimal-ipv6only
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-all-clusters-minimal-ipv6only/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-devkitc-all-clusters-minimal-ipv6only build'
+
 rm -f examples/bridge-app/esp32/sdkconfig
 
 # Building esp32-devkitc-bridge
@@ -1662,6 +1846,20 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-lock/sdkconfig.defaults
 idf.py -C examples/lock-app/esp32 -B {out}/esp32-devkitc-lock build'
 
+rm -f examples/ota-requestor-app/esp32/sdkconfig
+
+# Building esp32-devkitc-ota-requestor
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-ota-requestor/sdkconfig.defaults
+idf.py -C examples/ota-requestor-app/esp32 -B {out}/esp32-devkitc-ota-requestor build'
+
+rm -f examples/ota-requestor-app/esp32/sdkconfig
+
+# Building esp32-devkitc-ota-requestor-rpc
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-devkitc-ota-requestor-rpc/sdkconfig.defaults
+idf.py -C examples/ota-requestor-app/esp32 -B {out}/esp32-devkitc-ota-requestor-rpc build'
+
 rm -f examples/shell/esp32/sdkconfig
 
 # Building esp32-devkitc-shell
@@ -1697,6 +1895,34 @@ bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh;
 export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-ipv6only/sdkconfig.defaults
 idf.py -C examples/all-clusters-app/esp32 -B {out}/esp32-m5stack-all-clusters-ipv6only build'
 
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-m5stack-all-clusters-minimal
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal build'
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-m5stack-all-clusters-minimal-ipv6only
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal-ipv6only/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal-ipv6only build'
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-m5stack-all-clusters-minimal-rpc
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal-rpc/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal-rpc build'
+
+rm -f examples/all-clusters-minimal-app/esp32/sdkconfig
+
+# Building esp32-m5stack-all-clusters-minimal-rpc-ipv6only
+bash -c 'source $IDF_PATH/export.sh; source scripts/activate.sh; 
+export SDKCONFIG_DEFAULTS={out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only/sdkconfig.defaults
+idf.py -C examples/all-clusters-minimal-app/esp32 -B {out}/esp32-m5stack-all-clusters-minimal-rpc-ipv6only build'
+
 rm -f examples/all-clusters-app/esp32/sdkconfig
 
 # Building esp32-m5stack-all-clusters-rpc
@@ -1724,6 +1950,12 @@ ninja -C {out}/imx-all-clusters-app
 # Building imx-all-clusters-app-release
 ninja -C {out}/imx-all-clusters-app-release
 
+# Building imx-all-clusters-minimal-app
+ninja -C {out}/imx-all-clusters-minimal-app
+
+# Building imx-all-clusters-minimal-app-release
+ninja -C {out}/imx-all-clusters-minimal-app-release
+
 # Building imx-chip-tool
 ninja -C {out}/imx-chip-tool
 
@@ -1751,6 +1983,9 @@ ninja -C {out}/imx-thermostat-release
 # Building infineon-p6-all-clusters
 ninja -C {out}/infineon-p6-all-clusters
 
+# Building infineon-p6-all-clusters-minimal
+ninja -C {out}/infineon-p6-all-clusters-minimal
+
 # Building infineon-p6-light
 ninja -C {out}/infineon-p6-light
 
@@ -1784,6 +2019,24 @@ bash -c 'rm -rf {out}/mbed-CY8CPROTO_062_4343W-all-clusters-develop/chip-*'
 # Building mbed-CY8CPROTO_062_4343W-all-clusters-develop
 cmake --build {out}/mbed-CY8CPROTO_062_4343W-all-clusters-develop
 
+# Remove old artifacts mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug
+bash -c 'rm -rf {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug/chip-*'
+
+# Building mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug
+cmake --build {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-debug
+
+# Remove old artifacts mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop
+bash -c 'rm -rf {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop/chip-*'
+
+# Building mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop
+cmake --build {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-develop
+
+# Remove old artifacts mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
+bash -c 'rm -rf {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release/chip-*'
+
+# Building mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
+cmake --build {out}/mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
+
 # Remove old artifacts mbed-CY8CPROTO_062_4343W-all-clusters-release
 bash -c 'rm -rf {out}/mbed-CY8CPROTO_062_4343W-all-clusters-release/chip-*'
 
@@ -1871,6 +2124,9 @@ ctest --build-nocmake -V --output-on-failure --test-dir {out}/nrf-native-posix-6
 # Building nrf-nrf52840dk-all-clusters
 ninja -C {out}/nrf-nrf52840dk-all-clusters
 
+# Building nrf-nrf52840dk-all-clusters-minimal
+ninja -C {out}/nrf-nrf52840dk-all-clusters-minimal
+
 # Building nrf-nrf52840dk-light
 ninja -C {out}/nrf-nrf52840dk-light
 
@@ -1892,12 +2148,18 @@ ninja -C {out}/nrf-nrf52840dk-shell
 # Building nrf-nrf52840dongle-all-clusters
 ninja -C {out}/nrf-nrf52840dongle-all-clusters
 
+# Building nrf-nrf52840dongle-all-clusters-minimal
+ninja -C {out}/nrf-nrf52840dongle-all-clusters-minimal
+
 # Building nrf-nrf52840dongle-light
 ninja -C {out}/nrf-nrf52840dongle-light
 
 # Building nrf-nrf5340dk-all-clusters
 ninja -C {out}/nrf-nrf5340dk-all-clusters
 
+# Building nrf-nrf5340dk-all-clusters-minimal
+ninja -C {out}/nrf-nrf5340dk-all-clusters-minimal
+
 # Building nrf-nrf5340dk-light
 ninja -C {out}/nrf-nrf5340dk-light
 
diff --git a/scripts/build/testdata/build_linux_on_x64.txt b/scripts/build/testdata/build_linux_on_x64.txt
index 1c78a75b1f434d..b59e03b064805d 100644
--- a/scripts/build/testdata/build_linux_on_x64.txt
+++ b/scripts/build/testdata/build_linux_on_x64.txt
@@ -11,6 +11,26 @@ bash -c '
 PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
  gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-all-clusters-ipv6only'
 
+# Generating linux-arm64-all-clusters-minimal
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-all-clusters-minimal'
+
+# Generating linux-arm64-all-clusters-minimal-ipv6only
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-all-clusters-minimal-ipv6only'
+
+# Generating linux-arm64-bridge
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/bridge-app/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-bridge'
+
+# Generating linux-arm64-bridge-ipv6only
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/bridge-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-bridge-ipv6only'
+
 # Generating linux-arm64-chip-tool-no-interactive-ipv6only
 bash -c '
 PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
@@ -91,6 +111,26 @@ bash -c '
 PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
  gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/thermostat/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-thermostat-ipv6only'
 
+# Generating linux-arm64-tv-app
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-app/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-tv-app'
+
+# Generating linux-arm64-tv-app-ipv6only
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-tv-app-ipv6only'
+
+# Generating linux-arm64-tv-casting-app
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-casting-app/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-tv-casting-app'
+
+# Generating linux-arm64-tv-casting-app-ipv6only
+bash -c '
+PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
+ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-casting-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-tv-casting-app-ipv6only'
+
 # Generating linux-fake-tests
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=chip_build_tests=true custom_toolchain="//build/toolchain/fake:fake_x64_gcc" chip_link_tests=true chip_device_platform="fake"' {out}/linux-fake-tests
 
@@ -103,6 +143,18 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa
 # Generating linux-x64-all-clusters-ipv6only
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-all-clusters-ipv6only
 
+# Generating linux-x64-all-clusters-minimal
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/linux {out}/linux-x64-all-clusters-minimal
+
+# Generating linux-x64-all-clusters-minimal-ipv6only
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/linux --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-all-clusters-minimal-ipv6only
+
+# Generating linux-x64-bridge
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/bridge-app/linux {out}/linux-x64-bridge
+
+# Generating linux-x64-bridge-ipv6only
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/bridge-app/linux --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-bridge-ipv6only
+
 # Generating linux-x64-chip-cert
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=chip_crypto="openssl"' {out}/linux-x64-chip-cert
 
@@ -187,6 +239,18 @@ ninja -C {out}/linux-arm64-all-clusters
 # Building linux-arm64-all-clusters-ipv6only
 ninja -C {out}/linux-arm64-all-clusters-ipv6only
 
+# Building linux-arm64-all-clusters-minimal
+ninja -C {out}/linux-arm64-all-clusters-minimal
+
+# Building linux-arm64-all-clusters-minimal-ipv6only
+ninja -C {out}/linux-arm64-all-clusters-minimal-ipv6only
+
+# Building linux-arm64-bridge
+ninja -C {out}/linux-arm64-bridge
+
+# Building linux-arm64-bridge-ipv6only
+ninja -C {out}/linux-arm64-bridge-ipv6only
+
 # Building linux-arm64-chip-tool-no-interactive-ipv6only
 ninja -C {out}/linux-arm64-chip-tool-no-interactive-ipv6only
 
@@ -235,6 +299,18 @@ ninja -C {out}/linux-arm64-thermostat
 # Building linux-arm64-thermostat-ipv6only
 ninja -C {out}/linux-arm64-thermostat-ipv6only
 
+# Building linux-arm64-tv-app
+ninja -C {out}/linux-arm64-tv-app
+
+# Building linux-arm64-tv-app-ipv6only
+ninja -C {out}/linux-arm64-tv-app-ipv6only
+
+# Building linux-arm64-tv-casting-app
+ninja -C {out}/linux-arm64-tv-casting-app
+
+# Building linux-arm64-tv-casting-app-ipv6only
+ninja -C {out}/linux-arm64-tv-casting-app-ipv6only
+
 # Building linux-fake-tests
 ninja -C {out}/linux-fake-tests check
 
@@ -247,6 +323,18 @@ ninja -C {out}/linux-x64-all-clusters
 # Building linux-x64-all-clusters-ipv6only
 ninja -C {out}/linux-x64-all-clusters-ipv6only
 
+# Building linux-x64-all-clusters-minimal
+ninja -C {out}/linux-x64-all-clusters-minimal
+
+# Building linux-x64-all-clusters-minimal-ipv6only
+ninja -C {out}/linux-x64-all-clusters-minimal-ipv6only
+
+# Building linux-x64-bridge
+ninja -C {out}/linux-x64-bridge
+
+# Building linux-x64-bridge-ipv6only
+ninja -C {out}/linux-x64-bridge-ipv6only
+
 # Building linux-x64-chip-cert
 ninja -C {out}/linux-x64-chip-cert src/tools/chip-cert
 
diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt
index e64fd1576b1e61..ea0ca162443490 100644
--- a/scripts/build/testdata/glob_star_targets_except_host.txt
+++ b/scripts/build/testdata/glob_star_targets_except_host.txt
@@ -1,4 +1,5 @@
 ameba-amebad-all-clusters
+ameba-amebad-all-clusters-minimal
 ameba-amebad-light
 ameba-amebad-pigweed
 android-androidstudio-arm-chip-tool
@@ -18,6 +19,7 @@ android-x86-chip-tool
 android-x86-chip-tvserver
 bl602-light
 cc13x2x7_26x2x7-all-clusters
+cc13x2x7_26x2x7-all-clusters-minimal
 cc13x2x7_26x2x7-lock-ftd
 cc13x2x7_26x2x7-lock-mtd
 cc13x2x7_26x2x7-pump
@@ -34,21 +36,32 @@ efr32-brd4161a-switch
 efr32-brd4161a-unit-test
 efr32-brd4161a-window-covering
 esp32-c3devkit-all-clusters
+esp32-c3devkit-all-clusters-minimal
 esp32-devkitc-all-clusters
 esp32-devkitc-all-clusters-ipv6only
+esp32-devkitc-all-clusters-minimal
+esp32-devkitc-all-clusters-minimal-ipv6only
 esp32-devkitc-bridge
 esp32-devkitc-light
 esp32-devkitc-lock
+esp32-devkitc-ota-requestor
+esp32-devkitc-ota-requestor-rpc
 esp32-devkitc-shell
 esp32-devkitc-temperature-measurement
 esp32-devkitc-temperature-measurement-rpc
 esp32-m5stack-all-clusters
 esp32-m5stack-all-clusters-ipv6only
+esp32-m5stack-all-clusters-minimal
+esp32-m5stack-all-clusters-minimal-ipv6only
+esp32-m5stack-all-clusters-minimal-rpc
+esp32-m5stack-all-clusters-minimal-rpc-ipv6only
 esp32-m5stack-all-clusters-rpc
 esp32-m5stack-all-clusters-rpc-ipv6only
 esp32-qemu-tests
 imx-all-clusters-app
 imx-all-clusters-app-release
+imx-all-clusters-minimal-app
+imx-all-clusters-minimal-app-release
 imx-chip-tool
 imx-chip-tool-release
 imx-lighting-app
@@ -58,11 +71,13 @@ imx-ota-provider-app-release
 imx-thermostat
 imx-thermostat-release
 infineon-p6-all-clusters
+infineon-p6-all-clusters-minimal
 infineon-p6-light
 infineon-p6-lock
 k32w-light-release-no-ota
 k32w-lock-release
 k32w-shell-release
+mbed-CY8CPROTO_062_4343W-all-clusters-minimal-release
 mbed-CY8CPROTO_062_4343W-all-clusters-release
 mbed-CY8CPROTO_062_4343W-light-release
 mbed-CY8CPROTO_062_4343W-lock-release
@@ -70,6 +85,7 @@ mbed-CY8CPROTO_062_4343W-pigweed-release
 mbed-CY8CPROTO_062_4343W-shell-release
 nrf-native-posix-64-tests
 nrf-nrf52840dk-all-clusters
+nrf-nrf52840dk-all-clusters-minimal
 nrf-nrf52840dk-light
 nrf-nrf52840dk-light-rpc
 nrf-nrf52840dk-lock
@@ -77,8 +93,10 @@ nrf-nrf52840dk-pump
 nrf-nrf52840dk-pump-controller
 nrf-nrf52840dk-shell
 nrf-nrf52840dongle-all-clusters
+nrf-nrf52840dongle-all-clusters-minimal
 nrf-nrf52840dongle-light
 nrf-nrf5340dk-all-clusters
+nrf-nrf5340dk-all-clusters-minimal
 nrf-nrf5340dk-light
 nrf-nrf5340dk-lock
 nrf-nrf5340dk-pump
diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
index 5b59d796aa3bb0..1c5d3567f9d097 100755
--- a/scripts/examples/gn_efr32_example.sh
+++ b/scripts/examples/gn_efr32_example.sh
@@ -19,12 +19,21 @@
 # Build script for GN EFT32 examples GitHub workflow.
 
 set -e
-source "$(dirname "$0")/../../scripts/activate.sh"
+
+if [[ -z "${MATTER_ROOT}" ]]; then
+    echo "Using default path for Matter root"
+    CHIP_ROOT="$(dirname "$0")/../.."
+else
+    echo "Using ENV path for Matter root"
+    CHIP_ROOT="$MATTER_ROOT"
+fi
+
+source "$CHIP_ROOT/scripts/activate.sh"
 
 set -x
 env
 USE_WIFI=false
-CHIP_ROOT="$(dirname "$0")/../.."
+
 USAGE="./scripts/examples/gn_efr32_example.sh <AppRootFolder> <outputFolder> <efr32_board_name> [<Build options>]"
 
 if [ "$#" == "0" ]; then
@@ -128,6 +137,10 @@ else
                 optArgs+="enable_sleepy_device=true chip_openthread_ftd=false "
                 shift
                 ;;
+            --chip_disable_wifi_ipv4)
+                optArgs+="chip_disable_wifi_ipv4=true "
+                shift
+                ;;
             *)
                 if [ "$1" =~ *"use_rs911x=true"* ] || [ "$1" =~ *"use_wf200=true"* ]; then
                     USE_WIFI=true
diff --git a/scripts/examples/mbed_example.sh b/scripts/examples/mbed_example.sh
index c7d6f0adfd19bc..e2120b6bfda17f 100755
--- a/scripts/examples/mbed_example.sh
+++ b/scripts/examples/mbed_example.sh
@@ -21,7 +21,7 @@ CHIP_ROOT=$PWD
 
 SUPPORTED_TOOLCHAIN=(GCC_ARM ARM)
 SUPPORTED_TARGET_BOARD=(CY8CPROTO_062_4343W)
-SUPPORTED_APP=(lock-app lighting-app pigweed-app all-clusters-app shell ota-requestor-app)
+SUPPORTED_APP=(lock-app lighting-app pigweed-app all-clusters-app all-clusters-minimal-app shell ota-requestor-app)
 SUPPORTED_PROFILES=(release develop debug)
 SUPPORTED_COMMAND=(build flash build-flash)
 SUPPORTED_TYPE=(simple boot upgrade)
diff --git a/scripts/helpers/update_compile_commands.sh b/scripts/helpers/update_compile_commands.sh
index 0c07af40ac6c5c..15b03c1799a0d7 100755
--- a/scripts/helpers/update_compile_commands.sh
+++ b/scripts/helpers/update_compile_commands.sh
@@ -40,3 +40,6 @@ mv "$CHIP_ROOT/out/debug/compile_commands.json" "$CHIP_ROOT/out/debug/compile_co
 
 gn --root="$CHIP_ROOT" gen "$CHIP_ROOT/out/debug" --export-compile-commands=efr32_lock_app
 mv "$CHIP_ROOT/out/debug/compile_commands.json" "$CHIP_ROOT/out/debug/compile_commands.efr32.json"
+
+gn --root="$CHIP_ROOT" gen "$CHIP_ROOT/out/debug" --export-compile-commands=tizen_lighting_app
+mv "$CHIP_ROOT/out/debug/compile_commands.json" "$CHIP_ROOT/out/debug/compile_commands.tizen_arm.json"
diff --git a/scripts/idl/BUILD.gn b/scripts/idl/BUILD.gn
index 16393d939c59e8..d17697ffb40f1b 100644
--- a/scripts/idl/BUILD.gn
+++ b/scripts/idl/BUILD.gn
@@ -32,12 +32,15 @@ pw_python_package("idl") {
     "tests/available_tests.yaml",
     "tests/inputs/cluster_struct_attribute.matter",
     "tests/inputs/global_struct_attribute.matter",
+    "tests/inputs/optional_argument.matter",
     "tests/inputs/several_clusters.matter",
     "tests/inputs/simple_attribute.matter",
     "tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/global_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
+    "tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp",
+    "tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/several_clusters/jni/FirstClient-ReadImpl.cpp",
     "tests/outputs/several_clusters/jni/SecondClient-ReadImpl.cpp",
     "tests/outputs/several_clusters/jni/ThirdClient-ReadImpl.cpp",
diff --git a/scripts/idl/generators/java/ChipClustersCpp.jinja b/scripts/idl/generators/java/ChipClustersCpp.jinja
index 22c8bb7f0b91fa..d32f20c9f40c4d 100644
--- a/scripts/idl/generators/java/ChipClustersCpp.jinja
+++ b/scripts/idl/generators/java/ChipClustersCpp.jinja
@@ -1,14 +1,16 @@
 {%- macro encode_optional(target, source, depth, encodable) -%}
-  if ({{source}} != nullptr) {
-    jobject optionalValue_{{depth}};
+  {
+    jobject optionalValue_{{depth}} = nullptr;
     chip::JniReferences::GetInstance().GetOptionalValue({{source}}, optionalValue_{{depth}});
-    auto & definedValue_{{depth}} = {{target}}.Emplace();
-    {{ encode_value(
-       "definedValue_{}".format(depth),
-       "optionalValue_{}".format(depth),
-       depth+1,
-       encodable.without_optional()
-    )}}
+    if (optionalValue_{{depth}}) {
+      auto & definedValue_{{depth}} = {{target}}.Emplace();
+      {{ encode_value(
+          "definedValue_{}".format(depth),
+          "optionalValue_{}".format(depth),
+          depth+1,
+          encodable.without_optional()
+      )}}
+    }
   }
 {%- endmacro %}
 
diff --git a/scripts/idl/lint/__init__.py b/scripts/idl/lint/__init__.py
new file mode 100644
index 00000000000000..503bdf4086f77e
--- /dev/null
+++ b/scripts/idl/lint/__init__.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from .lint_rules_parser import CreateParser
diff --git a/scripts/idl/lint/lint_rules_grammar.lark b/scripts/idl/lint/lint_rules_grammar.lark
new file mode 100644
index 00000000000000..55a0b61a32994c
--- /dev/null
+++ b/scripts/idl/lint/lint_rules_grammar.lark
@@ -0,0 +1,32 @@
+start: instruction*
+
+instruction: load_xml|all_endpoint_rule|specific_endpoint_rule
+
+load_xml: "load" ESCAPED_STRING ";"
+
+all_endpoint_rule: "all" "endpoints" "{" required_global_attribute* "}"
+
+specific_endpoint_rule: "endpoint" integer "{" required_server_cluster* "}"
+
+required_global_attribute: "require" "global" "attribute" id "=" integer ";"
+
+required_server_cluster: "require" "server" "cluster" (id|POSITIVE_INTEGER|HEX_INTEGER) ";"
+
+integer: positive_integer | negative_integer
+
+positive_integer: POSITIVE_INTEGER | HEX_INTEGER
+negative_integer: "-" positive_integer
+
+id: ID
+
+POSITIVE_INTEGER: /\d+/ 
+HEX_INTEGER: /0x[A-Fa-f0-9]+/ 
+ID: /[a-zA-Z_][a-zA-Z0-9_]*/
+
+%import common.ESCAPED_STRING
+%import common.WS
+%import common.C_COMMENT
+%import common.CPP_COMMENT
+%ignore WS
+%ignore C_COMMENT
+%ignore CPP_COMMENT
diff --git a/scripts/idl/lint/lint_rules_parser.py b/scripts/idl/lint/lint_rules_parser.py
new file mode 100755
index 00000000000000..9af6b8c0f05724
--- /dev/null
+++ b/scripts/idl/lint/lint_rules_parser.py
@@ -0,0 +1,309 @@
+#!/usr/bin/env python
+
+import logging
+import os
+import xml.etree.ElementTree
+
+from dataclasses import dataclass, field
+from typing import List, Optional, Mapping
+from lark import Lark
+from lark.visitors import Transformer, v_args, Discard
+import stringcase
+import traceback
+
+try:
+    from .types import RequiredAttributesRule, AttributeRequirement, ClusterRequirement, RequiredCommandsRule, ClusterCommandRequirement
+except:
+    import sys
+
+    sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", ".."))
+    from idl.lint.types import RequiredAttributesRule, AttributeRequirement, ClusterRequirement, RequiredCommandsRule, ClusterCommandRequirement
+
+
+def parseNumberString(n):
+    if n.startswith('0x'):
+        return int(n[2:], 16)
+    else:
+        return int(n)
+
+
+@dataclass
+class RequiredAttribute:
+    name: str
+    code: int
+
+
+@dataclass
+class RequiredCommand:
+    name: str
+    code: int
+
+
+@dataclass
+class DecodedCluster:
+    name: str
+    code: int
+    required_attributes: List[RequiredAttribute]
+    required_commands: List[RequiredCommand]
+
+
+def DecodeClusterFromXml(element: xml.etree.ElementTree.Element):
+    if element.tag != 'cluster':
+        logging.error("Not a cluster element: %r" % element)
+        return None
+
+    # cluster elements contain among other children
+    #  - name (general name for this cluster)
+    #  - code (unique identifier, may be hex or numeric)
+    #  - attribute with side, code and optional attributes
+
+    try:
+        name = element.find('name').text.replace(' ', '')
+        required_attributes = []
+        required_commands = []
+
+        for attr in element.findall('attribute'):
+            if attr.attrib['side'] != 'server':
+                continue
+
+            if 'optional' in attr.attrib and attr.attrib['optional'] == 'true':
+                continue
+
+            # when introducing access controls, the content of attributes may either be:
+            # <attribute ...>myName</attribute>
+            # or
+            # <attribute ...><description>myName</description><access .../>...</attribute>
+            attr_name = attr.text
+            if attr.find('description') is not None:
+                attr_name = attr.find('description').text
+
+            required_attributes.append(
+                RequiredAttribute(
+                    name=attr_name,
+                    code=parseNumberString(attr.attrib['code'])
+                ))
+
+        for cmd in element.findall('command'):
+            if cmd.attrib['source'] != 'client':
+                continue
+
+            if 'optional' in cmd.attrib and cmd.attrib['optional'] == 'true':
+                continue
+
+            required_commands.append(RequiredCommand(name=cmd.attrib["name"], code=parseNumberString(cmd.attrib['code'])))
+
+        return DecodedCluster(
+            name=name,
+            code=parseNumberString(element.find('code').text),
+            required_attributes=required_attributes,
+            required_commands=required_commands
+        )
+    except Exception as e:
+        logging.exception("Failed to decode cluster %r" % element)
+        return None
+
+
+def ClustersInXmlFile(path: str):
+    logging.info("Loading XML from %s" % path)
+
+    # root is expected to be just a "configurator" object
+    configurator = xml.etree.ElementTree.parse(path).getroot()
+    for child in configurator:
+        if child.tag != 'cluster':
+            continue
+        yield child
+
+
+class LintRulesContext:
+    """Represents a context for loadint lint rules.
+
+    Handles:
+       - loading referenced files (matter xml definitions)
+       - adding linter rules as data is parsed
+       - Looking up identifiers for various rules
+    """
+
+    def __init__(self):
+        self._required_attributes_rule = RequiredAttributesRule("Required attributes")
+        self._required_commands_rule = RequiredCommandsRule("Required commands")
+
+        # Map cluster names to the underlying code
+        self._cluster_codes: Mapping[str, int] = {}
+
+    def GetLinterRules(self):
+        return [self._required_attributes_rule, self._required_commands_rule]
+
+    def RequireAttribute(self, r: AttributeRequirement):
+        self._required_attributes_rule.RequireAttribute(r)
+
+    def RequireClusterInEndpoint(self, name: str, code: int):
+        """Mark that a specific cluster is always required in the given endpoint
+        """
+        if name not in self._cluster_codes:
+            # Name may be a number. If this can be parsed as a number, accept it anyway
+            try:
+                cluster_code = parseNumberString(name)
+                name = "ID_%s" % name
+            except ValueError:
+                logging.error("UNKNOWN cluster name %s" % name)
+                logging.error("Known names: %s" % (",".join(self._cluster_codes.keys()), ))
+                return
+        else:
+            cluster_code = self._cluster_codes[name]
+
+        self._required_attributes_rule.RequireClusterInEndpoint(ClusterRequirement(
+            endpoint_id=code,
+            cluster_code=cluster_code,
+            cluster_name=name,
+        ))
+
+    def LoadXml(self, path: str):
+        """Load XML data from the given path and add it to
+           internal processing. Adds attribute requirement rules
+           as needed.
+        """
+        for cluster in ClustersInXmlFile(path):
+            decoded = DecodeClusterFromXml(cluster)
+
+            if not decoded:
+                continue
+
+            self._cluster_codes[decoded.name] = decoded.code
+
+            for attr in decoded.required_attributes:
+                self._required_attributes_rule.RequireAttribute(AttributeRequirement(
+                    code=attr.code, name=attr.name, filter_cluster=decoded.code))
+
+            for cmd in decoded.required_commands:
+                self._required_commands_rule.RequireCommand(
+                    ClusterCommandRequirement(
+                        cluster_code=decoded.code,
+                        command_code=cmd.code,
+                        command_name=cmd.name
+                    ))
+
+
+class LintRulesTransformer(Transformer):
+    """
+    A transformer capable to transform data parsed by Lark according to
+    lint_rules_grammar.lark.
+    """
+
+    def __init__(self, file_name: str):
+        self.context = LintRulesContext()
+        self.file_name = file_name
+
+    def positive_integer(self, tokens):
+        """Numbers in the grammar are integers or hex numbers.
+        """
+        if len(tokens) != 1:
+            raise Error("Unexpected argument counts")
+
+        return parseNumberString(tokens[0].value)
+
+    @v_args(inline=True)
+    def negative_integer(self, value):
+        return -value
+
+    @v_args(inline=True)
+    def integer(self, value):
+        return value
+
+    def id(self, tokens):
+        """An id is a string containing an identifier
+        """
+        if len(tokens) != 1:
+            raise Error("Unexpected argument counts")
+        return tokens[0].value
+
+    def ESCAPED_STRING(self, s):
+        # handle escapes, skip the start and end quotes
+        return s.value[1:-1].encode('utf-8').decode('unicode-escape')
+
+    def start(self, instructions):
+        # At this point processing is considered done, return all
+        # linter rules that were found
+        return self.context.GetLinterRules()
+
+    def instruction(self, instruction):
+        return Discard
+
+    def all_endpoint_rule(self, attributes):
+        for attribute in attributes:
+            self.context.RequireAttribute(attribute)
+
+        return Discard
+
+    @v_args(inline=True)
+    def load_xml(self, path):
+        if not os.path.isabs(path):
+            path = os.path.abspath(os.path.join(os.path.dirname(self.file_name), path))
+
+        self.context.LoadXml(path)
+
+    @v_args(inline=True)
+    def required_global_attribute(self, name, code):
+        return AttributeRequirement(code=code, name=name)
+
+    @v_args(inline=True)
+    def specific_endpoint_rule(self, code, *names):
+        for name in names:
+            self.context.RequireClusterInEndpoint(name, code)
+        return Discard
+
+    @v_args(inline=True)
+    def required_server_cluster(self, id):
+        return id
+
+
+class Parser:
+    def __init__(self, parser, file_name: str):
+        self.parser = parser
+        self.file_name = file_name
+
+    def parse(self):
+        data = LintRulesTransformer(self.file_name).transform(self.parser.parse(open(self.file_name, "rt").read()))
+        return data
+
+
+def CreateParser(file_name: str):
+    """
+    Generates a parser that will process a ".matter" file into a IDL
+    """
+    return Parser(Lark.open('lint_rules_grammar.lark', rel_to=__file__, parser='lalr', propagate_positions=True), file_name=file_name)
+
+
+if __name__ == '__main__':
+    # This Parser is generally not intended to be run as a stand-alone binary.
+    # The ability to run is for debug and to print out the parsed AST.
+    import click
+    import coloredlogs
+
+    # Supported log levels, mapping string values required for argument
+    # parsing into logging constants
+    __LOG_LEVELS__ = {
+        'debug': logging.DEBUG,
+        'info': logging.INFO,
+        'warn': logging.WARN,
+        'fatal': logging.FATAL,
+    }
+
+    @click.command()
+    @click.option(
+        '--log-level',
+        default='INFO',
+        type=click.Choice(__LOG_LEVELS__.keys(), case_sensitive=False),
+        help='Determines the verbosity of script output.')
+    @click.argument('filename')
+    def main(log_level, filename=None):
+        coloredlogs.install(level=__LOG_LEVELS__[
+                            log_level], fmt='%(asctime)s %(levelname)-7s %(message)s')
+
+        logging.info("Starting to parse ...")
+        data = CreateParser(filename).parse()
+        logging.info("Parse completed")
+
+        logging.info("Data:")
+        logging.info("%r" % data)
+
+    main()
diff --git a/scripts/idl/lint/types.py b/scripts/idl/lint/types.py
new file mode 100644
index 00000000000000..85dfbdeacd0bc3
--- /dev/null
+++ b/scripts/idl/lint/types.py
@@ -0,0 +1,259 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from idl.matter_idl_types import Idl, ParseMetaData, ClusterSide
+from abc import ABC, abstractmethod
+from typing import List, Optional
+from dataclasses import dataclass, field
+
+
+@dataclass
+class LocationInFile:
+    file_name: str
+    line: int
+    column: int
+
+    def __init__(self, file_name: str, meta: ParseMetaData):
+        self.file_name = file_name
+        self.line = meta.line
+        self.column = meta.column
+
+
+@dataclass
+class LintError:
+    """Represents a lint error, potentially at a specific location in a file"""
+
+    message: str
+    location: Optional[LocationInFile] = field(default=None)
+
+    def __init__(self, text: str, location: Optional[LocationInFile] = None):
+        self.message = text
+        if location:
+            self.message += " at %s:%d:%d" % (location.file_name, location.line, location.column)
+
+    def __str__(self):
+        return self.message
+
+
+class LintRule(ABC):
+    """Validates a linter rule on an idl"""
+
+    def __init__(self, name):
+        self.name = name
+
+    @abstractmethod
+    def LintIdl(self, idl: Idl) -> List[LintError]:
+        """Runs the linter on the given IDL and returns back any errors it may find"""
+        pass
+
+
+@dataclass
+class AttributeRequirement:
+    """Contains information about a required attribute"""
+    code: int  # required attributes are searched by codes
+    name: str  # the name of this attribute. Expect it to be exposed properly
+
+    # Optional filters to apply to specific locations
+    filter_cluster: Optional[int] = field(default=None)
+
+
+@dataclass
+class ClusterRequirement:
+    endpoint_id: int
+    cluster_code: int
+    cluster_name: str
+
+
+class ErrorAccumulatingRule(LintRule):
+    """Contains a lint error list and helps helpers to add to such a list of rules."""
+
+    def __init__(self, name):
+        super(ErrorAccumulatingRule, self).__init__(name)
+        self._lint_errors = []
+        self._idl = None
+
+    def _AddLintError(self, text, location):
+        self._lint_errors.append(LintError("%s: %s" % (self.name, text), location))
+
+    def _ParseLocation(self, meta: Optional[ParseMetaData]) -> Optional[LocationInFile]:
+        """Create a location in the current file that is being parsed. """
+        if not meta or not self._idl.parse_file_name:
+            return None
+        return LocationInFile(self._idl.parse_file_name, meta)
+
+    def LintIdl(self, idl: Idl) -> List[LintError]:
+        self._idl = idl
+        self._lint_errors = []
+        self._LintImpl()
+        return self._lint_errors
+
+    @abstractmethod
+    def _LintImpl(self):
+        """Implements actual linting of the IDL.
+
+        Uses the underlying _idl for validation.
+        """
+        pass
+
+
+class RequiredAttributesRule(ErrorAccumulatingRule):
+    def __init__(self, name):
+        super(RequiredAttributesRule, self).__init__(name)
+        # Map attribute code to name
+        self._mandatory_attributes: List[AttributeRequirement] = []
+        self._mandatory_clusters: List[ClusterRequirement] = []
+
+    def __repr__(self):
+        result = "RequiredAttributesRule{\n"
+
+        if self._mandatory_attributes:
+            result += "  mandatory_attributes:\n"
+            for attr in self._mandatory_attributes:
+                result += "    - %r\n" % attr
+
+        if self._mandatory_clusters:
+            result += "  mandatory_clusters:\n"
+            for cluster in self._mandatory_clusters:
+                result += "    - %r\n" % cluster
+
+        result += "}"
+        return result
+
+    def RequireAttribute(self, attr: AttributeRequirement):
+        """Mark an attribute required"""
+        self._mandatory_attributes.append(attr)
+
+    def RequireClusterInEndpoint(self, requirement: ClusterRequirement):
+        self._mandatory_clusters.append(requirement)
+
+    def _ServerClusterDefinition(self, name: str, location: Optional[LocationInFile]):
+        """Finds the server cluster definition with the given name.
+
+        On error returns None and _lint_errors is updated internlly
+        """
+        cluster_definition = [
+            c for c in self._idl.clusters if c.name == name and c.side == ClusterSide.SERVER
+        ]
+        if not cluster_definition:
+            self._AddLintError("Cluster definition for %s not found" % cluster.name, location)
+            return None
+
+        if len(cluster_definition) > 1:
+            self._AddLintError("Multiple cluster definitions found for %s" % cluster.name, location)
+            return None
+
+        return cluster_definition[0]
+
+    def _LintImpl(self):
+        for endpoint in self._idl.endpoints:
+
+            cluster_codes = set()
+
+            for cluster in endpoint.server_clusters:
+                cluster_definition = self._ServerClusterDefinition(cluster.name, self._ParseLocation(cluster.parse_meta))
+                if not cluster_definition:
+                    continue
+
+                cluster_codes.add(cluster_definition.code)
+
+                # Cluster contains enabled attributes by name
+                # cluster_definition contains the definition of the attributes themseves
+                #
+                # Join the two to receive attribute codes
+                name_to_code_map = {}
+                for attr in cluster_definition.attributes:
+                    name_to_code_map[attr.definition.name] = attr.definition.code
+
+                attribute_codes = set()
+                # For all the instantiated attributes, figure out their code
+                for attr in cluster.attributes:
+                    if attr.name not in name_to_code_map:
+                        self._AddLintError("Could not find attribute defintion (no code) for %s:%s" %
+                                           (cluster.name, attr.name), self._ParseLocation(cluster.parse_meta))
+                        continue
+
+                    attribute_codes.add(name_to_code_map[attr.name])
+
+                # Linting codes now
+                for check in self._mandatory_attributes:
+                    if check.filter_cluster is not None and check.filter_cluster != cluster_definition.code:
+                        continue
+
+                    if check.code not in attribute_codes:
+                        self._AddLintError("EP%d:%s does not expose %s(%d) attribute" %
+                                           (endpoint.number, cluster.name, check.name, check.code), self._ParseLocation(cluster.parse_meta))
+
+            for requirement in self._mandatory_clusters:
+                if requirement.endpoint_id != endpoint.number:
+                    continue
+
+                if requirement.cluster_code not in cluster_codes:
+                    self._AddLintError("Endpoint %d does not expose cluster %s (%d)" %
+                                       (requirement.endpoint_id, requirement.cluster_name, requirement.cluster_code), location=None)
+
+
+@dataclass
+class ClusterCommandRequirement:
+    cluster_code: int
+    command_code: int
+    command_name: str
+
+
+class RequiredCommandsRule(ErrorAccumulatingRule):
+    def __init__(self, name):
+        super(RequiredCommandsRule, self).__init__(name)
+
+        # Maps cluster id to mandatory cluster requirement
+        self._mandatory_commands: Maping[int, List[ClusterCommandRequirement]] = {}
+
+    def __repr__(self):
+        result = "RequiredCommandsRule{\n"
+
+        if self._mandatory_commands:
+            result += "  mandatory_commands:\n"
+            for key, value in self._mandatory_commands.items():
+                result += "    - cluster %d:\n" % key
+                for requirement in value:
+                    result += "        - %r\n" % requirement
+
+        result += "}"
+        return result
+
+    def RequireCommand(self, cmd: ClusterCommandRequirement):
+        """Mark a command required"""
+
+        if cmd.cluster_code in self._mandatory_commands:
+            self._mandatory_commands[cmd.cluster_code].append(cmd)
+        else:
+            self._mandatory_commands[cmd.cluster_code] = [cmd]
+
+    def _LintImpl(self):
+        for cluster in self._idl.clusters:
+            if cluster.side != ClusterSide.SERVER:
+                continue  # only validate server-side:
+
+            if cluster.code not in self._mandatory_commands:
+                continue  # no known mandatory commands
+
+            defined_commands = set([c.code for c in cluster.commands])
+
+            for requirement in self._mandatory_commands[cluster.code]:
+                if requirement.command_code in defined_commands:
+                    continue  # command exists
+
+                self._AddLintError(
+                    "Cluster %s does not define mandatory command %s(%d)" % (
+                        cluster.name, requirement.command_name, requirement.command_code),
+                    self._ParseLocation(cluster.parse_meta)
+                )
diff --git a/scripts/idl/matter_grammar.lark b/scripts/idl/matter_grammar.lark
index 41db12546dc59a..3a31d6df0ece60 100644
--- a/scripts/idl/matter_grammar.lark
+++ b/scripts/idl/matter_grammar.lark
@@ -49,9 +49,10 @@ cluster: cluster_side "cluster"i id "=" positive_integer "{" (enum|bitmap|event|
 ?cluster_side: "server"i -> server_cluster
              | "client"i -> client_cluster
 
-endpoint: "endpoint"i positive_integer "{" endpoint_cluster* "}"
-?endpoint_cluster: endpoint_cluster_binding | endpoint_server_cluster
+endpoint: "endpoint"i positive_integer "{" endpoint_content* "}"
+?endpoint_content: endpoint_cluster_binding | endpoint_server_cluster | endpoint_device_type
 
+endpoint_device_type: "device" "type" id "=" positive_integer ";"
 endpoint_cluster_binding: "binding"i "cluster"i id ";"
 endpoint_server_cluster: "server"i "cluster"i id "{" endpoint_attribute_instantiation* "}"
 
diff --git a/scripts/idl/matter_idl_parser.py b/scripts/idl/matter_idl_parser.py
index 3531c94495de2c..89c73d76966dd8 100755
--- a/scripts/idl/matter_idl_parser.py
+++ b/scripts/idl/matter_idl_parser.py
@@ -39,6 +39,18 @@ def apply(self, endpoint):
         endpoint.client_bindings.append(self.name)
 
 
+class AddDeviceTypeToEndpointTransform:
+    """Provides an 'apply' method that can be run on endpoints
+       to add a device type to it
+    """
+
+    def __init__(self, device_type: DeviceType):
+        self.device_type = device_type
+
+    def apply(self, endpoint):
+        endpoint.device_types.append(self.device_type)
+
+
 class MatterIdlTransformer(Transformer):
     """
     A transformer capable to transform data parsed by Lark according to 
@@ -62,9 +74,11 @@ class MatterIdlTransformer(Transformer):
 
       Actual parametes to the methods depend on the rules multiplicity and/or
       optionality.
-
     """
 
+    def __init__(self, skip_meta):
+        self.skip_meta = skip_meta
+
     def positive_integer(self, tokens):
         """Numbers in the grammar are integers or hex numbers.
         """
@@ -268,9 +282,10 @@ def persist_attribute(self, _):
     def callback_attribute(self, _):
         return AttributeStorage.CALLBACK
 
-    @v_args(inline=True)
-    def endpoint_attribute_instantiation(self, storage, id, default=None):
-        return AttributeInstantiation(name=id, storage=storage, default=default)
+    @v_args(meta=True, inline=True)
+    def endpoint_attribute_instantiation(self, meta, storage, id, default=None):
+        meta = None if self.skip_meta else ParseMetaData(meta)
+        return AttributeInstantiation(parse_meta=meta, name=id, storage=storage, default=default)
 
     def ESCAPED_STRING(self, s):
         # handle escapes, skip the start and end quotes
@@ -311,17 +326,24 @@ def endpoint(self, number, *transforms):
 
         return endpoint
 
+    @v_args(inline=True)
+    def endpoint_device_type(self, name, code):
+        return AddDeviceTypeToEndpointTransform(DeviceType(name=name, code=code))
+
     @v_args(inline=True)
     def endpoint_cluster_binding(self, id):
         return AddBindingToEndpointTransform(id)
 
-    @v_args(inline=True)
-    def endpoint_server_cluster(self, id, *attributes):
-        return AddServerClusterToEndpointTransform(ServerClusterInstantiation(name=id, attributes=list(attributes)))
+    @v_args(meta=True, inline=True)
+    def endpoint_server_cluster(self, meta, id, *attributes):
+        meta = None if self.skip_meta else ParseMetaData(meta)
+        return AddServerClusterToEndpointTransform(ServerClusterInstantiation(parse_meta=meta, name=id, attributes=list(attributes)))
 
-    @v_args(inline=True)
-    def cluster(self, side, name, code, *content):
-        result = Cluster(side=side, name=name, code=code)
+    @v_args(inline=True, meta=True)
+    def cluster(self, meta, side, name, code, *content):
+        meta = None if self.skip_meta else ParseMetaData(meta)
+
+        result = Cluster(parse_meta=meta, side=side, name=name, code=code)
 
         for item in content:
             if type(item) == Enum:
@@ -359,11 +381,22 @@ def idl(self, items):
         return idl
 
 
-def CreateParser():
+class ParserWithLines:
+    def __init__(self, parser, skip_meta: bool):
+        self.parser = parser
+        self.skip_meta = skip_meta
+
+    def parse(self, file, file_name: str = None):
+        idl = MatterIdlTransformer(self.skip_meta).transform(self.parser.parse(file))
+        idl.parse_file_name = file_name
+        return idl
+
+
+def CreateParser(skip_meta: bool = False):
     """
     Generates a parser that will process a ".matter" file into a IDL
     """
-    return Lark.open('matter_grammar.lark', rel_to=__file__, start='idl', parser='lalr', transformer=MatterIdlTransformer())
+    return ParserWithLines(Lark.open('matter_grammar.lark', rel_to=__file__, start='idl', parser='lalr', propagate_positions=True), skip_meta)
 
 
 if __name__ == '__main__':
@@ -394,7 +427,7 @@ def main(log_level, filename=None):
                             log_level], fmt='%(asctime)s %(levelname)-7s %(message)s')
 
         logging.info("Starting to parse ...")
-        data = CreateParser().parse(open(filename).read())
+        data = CreateParser().parse(open(filename).read(), file_name=filename)
         logging.info("Parse completed")
 
         logging.info("Data:")
diff --git a/scripts/idl/matter_idl_types.py b/scripts/idl/matter_idl_types.py
index f56bd5e225f1e8..b2d0e1cfda71d1 100644
--- a/scripts/idl/matter_idl_types.py
+++ b/scripts/idl/matter_idl_types.py
@@ -1,9 +1,26 @@
 import enum
+from lark.tree import Meta
 
 from dataclasses import dataclass, field
 from typing import List, Set, Optional, Union
 
 
+# Information about parsing location for specific items
+# Helpful when referencing data items in logs when processing
+@dataclass
+class ParseMetaData:
+    line: int
+    column: int
+
+    def __init__(self, meta: Meta = None, line: int = None, column: int = None):
+        if meta:
+            self.line = meta.line
+            self.column = meta.column
+        else:
+            self.line = line
+            self.column = column
+
+
 class FieldAttribute(enum.Enum):
     OPTIONAL = enum.auto()
     NULLABLE = enum.auto()
@@ -167,6 +184,9 @@ class Cluster:
     structs: List[Struct] = field(default_factory=list)
     commands: List[Command] = field(default_factory=list)
 
+    # Parsing meta data missing only when skip meta data is requested
+    parse_meta: Optional[ParseMetaData] = field(default=None)
+
 
 @dataclass
 class AttributeInstantiation:
@@ -174,16 +194,29 @@ class AttributeInstantiation:
     storage: AttributeStorage
     default: Optional[Union[str, int, bool]] = None
 
+    # Parsing meta data missing only when skip meta data is requested
+    parse_meta: Optional[ParseMetaData] = field(default=None)
+
 
 @dataclass
 class ServerClusterInstantiation:
     name: str
     attributes: List[AttributeInstantiation] = field(default_factory=list)
 
+    # Parsing meta data missing only when skip meta data is requested
+    parse_meta: Optional[ParseMetaData] = field(default=None)
+
+
+@dataclass
+class DeviceType:
+    name: str
+    code: int
+
 
 @dataclass
 class Endpoint:
     number: int
+    device_types: List[DeviceType] = field(default_factory=list)
     server_clusters: List[ServerClusterInstantiation] = field(default_factory=list)
     client_bindings: List[str] = field(default_factory=list)
 
@@ -195,3 +228,6 @@ class Idl:
     structs: List[Struct] = field(default_factory=list)
     clusters: List[Cluster] = field(default_factory=list)
     endpoints: List[Endpoint] = field(default_factory=list)
+
+    # IDL file name is available only if parsing provides a file name
+    parse_file_name: Optional[str] = field(default=None)
diff --git a/scripts/idl/test_matter_idl_parser.py b/scripts/idl/test_matter_idl_parser.py
index 273da932ae8c4f..90cfa4da46c6ee 100755
--- a/scripts/idl/test_matter_idl_parser.py
+++ b/scripts/idl/test_matter_idl_parser.py
@@ -29,7 +29,7 @@
 
 
 def parseText(txt):
-    return CreateParser().parse(txt)
+    return CreateParser(skip_meta=True).parse(txt)
 
 
 class TestParser(unittest.TestCase):
@@ -342,6 +342,20 @@ def test_cluster_event_acl(self):
                     ])])
         self.assertEqual(actual, expected)
 
+    def test_parsing_metadata_for_cluster(self):
+        actual = CreateParser(skip_meta=False).parse("""
+server cluster A = 1 { /* Test comment */ }
+
+// some empty lines and then indented
+   client cluster B = 2 { }
+        """)
+
+        expected = Idl(clusters=[
+            Cluster(parse_meta=ParseMetaData(line=2, column=1), side=ClusterSide.SERVER, name="A", code=1),
+            Cluster(parse_meta=ParseMetaData(line=5, column=4), side=ClusterSide.CLIENT, name="B", code=2),
+        ])
+        self.assertEqual(actual, expected)
+
     def test_multiple_clusters(self):
         actual = parseText("""
             server cluster A = 1 { /* Test comment */ }
@@ -359,6 +373,9 @@ def test_multiple_clusters(self):
     def test_endpoints(self):
         actual = parseText("""
             endpoint 12 {
+                device type foo = 123;
+                device type bar = 0xFF;
+
                 server cluster Foo { }
                 server cluster Bar { }
                 binding cluster Bar;
@@ -367,6 +384,10 @@ def test_endpoints(self):
         """)
 
         expected = Idl(endpoints=[Endpoint(number=12,
+                                           device_types=[
+                                               DeviceType(name="foo", code=123),
+                                               DeviceType(name="bar", code=0xFF),
+                                           ],
                                            server_clusters=[
                                                ServerClusterInstantiation(name="Foo"),
                                                ServerClusterInstantiation(name="Bar"),
diff --git a/scripts/idl/tests/available_tests.yaml b/scripts/idl/tests/available_tests.yaml
index e0a6c39dc5b88e..107eb0ad4fb42a 100644
--- a/scripts/idl/tests/available_tests.yaml
+++ b/scripts/idl/tests/available_tests.yaml
@@ -30,3 +30,7 @@ java:
         jni/FirstClient-InvokeSubscribeImpl.cpp: outputs/several_clusters/jni/FirstClient-InvokeSubscribeImpl.cpp
         jni/SecondClient-InvokeSubscribeImpl.cpp: outputs/several_clusters/jni/SecondClient-InvokeSubscribeImpl.cpp
         jni/ThirdClient-InvokeSubscribeImpl.cpp: outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp
+
+    inputs/optional_argument.matter:
+        jni/MyClusterClient-ReadImpl.cpp: outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp
+        jni/MyClusterClient-InvokeSubscribeImpl.cpp: outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
diff --git a/scripts/idl/tests/inputs/optional_argument.matter b/scripts/idl/tests/inputs/optional_argument.matter
new file mode 100644
index 00000000000000..2b14f9a5987b7c
--- /dev/null
+++ b/scripts/idl/tests/inputs/optional_argument.matter
@@ -0,0 +1,7 @@
+client cluster MyCluster = 1 {
+  request struct FooRequest {
+    optional OCTET_STRING argument = 0;
+  }
+
+  command Foo(FooRequest): DefaultSuccess = 0;
+}
\ No newline at end of file
diff --git a/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
new file mode 100644
index 00000000000000..7c63c12f242f00
--- /dev/null
+++ b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
@@ -0,0 +1,79 @@
+#include <controller/java/zap-generated/CHIPCallbackTypes.h>
+#include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
+#include <controller/java/zap-generated/CHIPReadCallbacks.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <zap-generated/CHIPClientCallbacks.h>
+#include <zap-generated/CHIPClusters.h>
+
+#include <controller/java/AndroidCallbacks.h>
+#include <controller/java/AndroidClusterExceptions.h>
+#include <controller/java/CHIPDefaultCallbacks.h>
+#include <jni.h>
+#include <lib/support/CHIPListUtils.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+#include <lib/support/Span.h>
+#include <platform/PlatformManager.h>
+#include <vector>
+
+#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
+    extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
+
+using namespace chip;
+using namespace chip::Controller;
+
+JNI_METHOD(jlong, MyClusterCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
+{
+    chip::DeviceLayer::StackLock lock;
+    MyClusterCluster * cppCluster = new MyClusterCluster();
+
+    cppCluster->Associate(reinterpret_cast<DeviceProxy *>(devicePtr), endpointId);
+    return reinterpret_cast<jlong>(cppCluster);
+}
+
+JNI_METHOD(void, MyClusterCluster, 
+  foo)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback,jobject argument,jobject timedInvokeTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    MyClusterCluster * cppCluster;
+    
+    ListFreer listFreer;
+    chip::app::Clusters::MyCluster::Commands::Foo::Type request;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;{
+    jobject optionalValue_0 = nullptr;
+    chip::JniReferences::GetInstance().GetOptionalValue(argument, optionalValue_0);
+    if (optionalValue_0) {
+      auto & definedValue_0 = request.argument.Emplace();
+      cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(optionalValue_0)));
+        definedValue_0 = cleanupByteArrays.back()->byteSpan();
+    }
+  }
+
+  
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+    VerifyOrReturn(onFailure.get() != nullptr, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+
+    cppCluster = reinterpret_cast<MyClusterCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+  if (timedInvokeTimeoutMs == nullptr) {
+        err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    } else {
+        err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall, chip::JniReferences::GetInstance().IntegerToPrimitive(timedInvokeTimeoutMs));
+    }
+    VerifyOrReturn(err == CHIP_NO_ERROR, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command", CHIP_ERROR_INCORRECT_STATE));
+
+    onSuccess.release();
+    onFailure.release();
+}
diff --git a/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp
new file mode 100644
index 00000000000000..6293b92540a107
--- /dev/null
+++ b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp
@@ -0,0 +1,14 @@
+
+#include <controller/java/zap-generated/CHIPReadCallbacks.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <zap-generated/CHIPClusters.h>
+
+#include <controller/java/AndroidClusterExceptions.h>
+#include <controller/java/CHIPDefaultCallbacks.h>
+#include <jni.h>
+#include <lib/support/CodeUtils.h>
+#include <platform/PlatformManager.h>
+
+#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
+    extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
\ No newline at end of file
diff --git a/scripts/idl_lint.py b/scripts/idl_lint.py
new file mode 100755
index 00000000000000..01b8413d8c9fd6
--- /dev/null
+++ b/scripts/idl_lint.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import click
+import coloredlogs
+import enum
+import logging
+import os
+import sys
+
+from typing import List, Optional
+
+try:
+    from idl import matter_idl_parser
+except:
+    sys.path.append(os.path.abspath(os.path.dirname(__file__)))
+    from idl import matter_idl_parser
+
+import idl.lint
+
+# Supported log levels, mapping string values required for argument
+# parsing into logging constants
+__LOG_LEVELS__ = {
+    "debug": logging.DEBUG,
+    "info": logging.INFO,
+    "warn": logging.WARN,
+    "fatal": logging.FATAL,
+}
+
+
+@click.command()
+@click.option(
+    "--log-level",
+    default="INFO",
+    type=click.Choice(__LOG_LEVELS__.keys(), case_sensitive=False),
+    help="Determines the verbosity of script output",
+)
+@click.option(
+    "--rules",
+    default=os.path.abspath(os.path.join(os.path.dirname(__file__), "rules.matterlint")),
+    type=click.Path(exists=True),
+    help="Rules file to use",
+)
+@click.argument("idl_path", type=click.Path(exists=True))
+def main(log_level, rules, idl_path):
+    """
+    Lints MATTER IDL files (.matter) using given RULES
+    """
+    coloredlogs.install(
+        level=__LOG_LEVELS__[log_level], fmt="%(asctime)s %(levelname)-7s %(message)s"
+    )
+
+    lint_rules = []
+    logging.info("Loading rules from %s" % rules)
+    lint_rules.extend(idl.lint.CreateParser(rules).parse())
+
+    logging.info("Parsing idl from %s" % idl_path)
+    idl_tree = matter_idl_parser.CreateParser().parse(open(idl_path, "rt").read(), file_name=idl_path)
+
+    logging.info("Running %d lint rules" % len(lint_rules))
+
+    errors = []
+    for rule in lint_rules:
+        logging.info("   Running %s" % rule.name)
+        errors.extend(rule.LintIdl(idl_tree))
+    logging.info("Done")
+
+    for e in errors:
+        logging.error("ERROR: %s" % e)
+
+    if errors:
+        logging.error("Found %d lint errors" % len(errors))
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
new file mode 100644
index 00000000000000..3c93551496148f
--- /dev/null
+++ b/scripts/rules.matterlint
@@ -0,0 +1,103 @@
+// These are global .matter idl linter rules
+// First load data from XML definitions
+
+load "../src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/global-attributes.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/matter-devices.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/proxy-configuration-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/proxy-discovery-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/scene.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/test-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/window-covering.xml";
+
+all endpoints {
+    // These attributes follow a different code path and do not have to be
+    // present in the .matter file
+    //
+    // require global attribute generatedCommandList = 65528;
+    // require global attribute acceptedCommandList = 65529;
+    // require global attribute attributeList = 65531;
+
+    require global attribute featureMap = 65532;
+    require global attribute clusterRevision = 65533;
+}
+
+endpoint 0 {
+  // Identifiers for clusters are loaded from XML files
+  // The required clusters are from the spec for RootNode (section 2.1.5 at the moment):
+
+  require server cluster Basic;
+  require server cluster AccessControl;
+  require server cluster GroupKeyManagement;
+  require server cluster GeneralCommissioning;
+  require server cluster AdministratorCommissioning;
+  require server cluster OperationalCredentials;
+  require server cluster GeneralDiagnostics;
+
+  // Required only if !CustomNetworkConfig. 
+  // require server cluster NetworkCommissioning;
+
+  // If Ethernet
+  // require server cluster EthernetNetworkDiagnostics;
+
+  // If WiFi
+  // require server cluster WiFiNetworkDiagnostics;
+
+  // If Thread
+  // require server cluster ThreadNetworkDiagnostics;
+}
diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
index 0b32c373f70ecf..fbf3fcac09f8ea 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -30,7 +30,7 @@ def AllTests(chip_tool: str):
         if not name:
             continue
 
-        if name.startswith('TV_'):
+        if name.startswith('TV_') or name.startswith('Test_TC_MC_'):
             target = TestTarget.TV
         elif name.startswith('DL_'):
             target = TestTarget.LOCK
diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py
index 2883b331a72be7..e672f0787cf7a7 100644
--- a/scripts/tests/chiptest/test_definition.py
+++ b/scripts/tests/chiptest/test_definition.py
@@ -25,7 +25,6 @@
 from random import randrange
 
 TEST_NODE_ID = '0x12344321'
-DEVELOPMENT_PAA_LIST = './credentials/development/paa-root-certs'
 
 
 class App:
@@ -264,16 +263,10 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str):
             app = apps_register.get('default')
             app.start()
             pairing_cmd = tool_cmd + ['pairing', 'code', TEST_NODE_ID, app.setupCode]
-            if sys.platform != 'darwin':
-                pairing_cmd.append('--paa-trust-store-path')
-                pairing_cmd.append(DEVELOPMENT_PAA_LIST)
             runner.RunSubprocess(pairing_cmd,
                                  name='PAIR', dependencies=[apps_register])
 
             test_cmd = tool_cmd + ['tests', self.run_name] + ['--PICS', pics_file]
-            if sys.platform != 'darwin':
-                test_cmd.append('--paa-trust-store-path')
-                test_cmd.append(DEVELOPMENT_PAA_LIST)
             runner.RunSubprocess(
                 test_cmd,
                 name='TEST', dependencies=[apps_register])
diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py
index 4d0c640be1a244..5f74d1e64adce8 100644
--- a/scripts/tools/check_includes_config.py
+++ b/scripts/tools/check_includes_config.py
@@ -111,9 +111,6 @@
     'src/lib/support/CHIPListUtils.h': {'set'},
     'src/platform/DeviceSafeQueue.h': {'queue'},
 
-    # libevent itself is unsuitable for small platforms.
-    'src/system/SystemLayerImplLibevent.h': {'list', 'vector'},
-
     # Only uses <chrono> for zero-cost types.
     'src/system/SystemClock.h': {'chrono'},
     'src/platform/mbed/MbedEventTimeout.h': {'chrono'},
@@ -147,4 +144,8 @@
 
     # Uses platform-define to switch between list and array
     'src/lib/dnssd/minimal_mdns/ResponseSender.h': {'list'},
+
+    # Not really for embedded consumers; uses std::queue to keep track
+    # of a list of discovered things.
+    'src/controller/SetUpCodePairer.h': {'queue'},
 }
diff --git a/scripts/tools/check_test_pics.py b/scripts/tools/check_test_pics.py
index 87dc57628fef8b..facc3dc4478001 100755
--- a/scripts/tools/check_test_pics.py
+++ b/scripts/tools/check_test_pics.py
@@ -39,6 +39,10 @@ def main():
     with open(value_defs, "r") as stream:
         defined_values = set(map(lambda item: re.sub(
             value_regexp, "", item.rstrip()), stream.readlines()))
+        # Remove Comments w/ # and empty lines
+        for elem in list(defined_values):
+            if elem.startswith('#') or (elem == ""):
+                defined_values.discard(elem)
 
     with open(pics_yaml, "r") as stream:
         try:
diff --git a/scripts/tools/check_zcl_file_sync.py b/scripts/tools/check_zcl_file_sync.py
new file mode 100755
index 00000000000000..50c520a84f0fce
--- /dev/null
+++ b/scripts/tools/check_zcl_file_sync.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+"""
+Validates that the json zcl files that are used by the app are in sync.
+
+Current rule:
+  - all-clusters app uses an extension on top of the "standard" zcl file.
+    Ensure that the two fies are in sync EXCEPT the extension.
+"""
+
+import json
+import sys
+import os
+import difflib
+
+
+def main():
+    if len(sys.argv) != 2:
+        print('Please pass CHIP_ROOT as an argument (and only chip root)')
+        return 1
+
+    base_name = os.path.join(sys.argv[1], "src", "app", "zap-templates", "zcl", "zcl.json")
+    ext_name = os.path.join(sys.argv[1], "src", "app", "zap-templates", "zcl", "zcl-with-test-extensions.json")
+
+    base_data = json.load(open(base_name))
+    ext_data = json.load(open(ext_name))
+
+    # ext should be IDENTICAL with base if we add a few things to base:
+    base_data["xmlRoot"].append("./data-model/test")
+    base_data["xmlFile"].append("mode-select-extensions.xml")
+
+    # do not care about sorting. mainly do not check if extension xml
+    # is at the end or in the middle
+    base_data["xmlFile"].sort()
+    ext_data["xmlFile"].sort()
+
+    if base_data == ext_data:
+        return 0
+
+    print("%s and %s have unexpected differences." % (base_name, ext_name))
+    print("Differences between expected and actual:")
+
+    for l in difflib.unified_diff(
+        json.dumps(ext_data, indent=2).split('\n'),
+        json.dumps(base_data, indent=2).split('\n'),
+        fromfile=ext_name,
+        tofile="<Expected extension file content>",
+    ):
+        if l.endswith('\n'):
+            l = l[:-1]
+        print(l)
+
+    return 1
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py b/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
index 007ae9cb3d92a9..eea02e7f98e0e0 100644
--- a/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
+++ b/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
@@ -15,23 +15,61 @@
 #    limitations under the License.
 #
 
+from os.path import exists
 import sys
 import json
 import jsonschema
 import secrets
-from random import randint
 import argparse
 import subprocess
 import logging as log
 import base64
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives.serialization import load_der_private_key
 
 HEX_PREFIX = "hex:"
+PUB_KEY_PREFIX = b'\x04'
 INVALID_PASSCODES = [00000000, 11111111, 22222222, 33333333, 44444444,
                      55555555, 66666666, 77777777, 88888888, 99999999, 12345678, 87654321]
 
 
-def gen_spake2p_params(spake2p_path: str, passcode: int, it: int, salt: str):
-    """ Generate spake2 params using external spake2p script"""
+def get_raw_private_key_der(der_file: str, password: str):
+    """ Split given der file to get separated key pair consisting of public and private keys.
+
+    Args:
+        der_file (str): Path to .der file containing public and private keys
+        password (str): Password to decrypt Keys. It can be None, and then KEY is not encrypted.
+
+    Returns:
+        hex string: return a hex string containing extracted and decrypted private KEY from given .der file.
+    """
+    try:
+        with open(der_file, 'rb') as file:
+            key_data = file.read()
+            if password is None:
+                log.warning("KEY password has not been provided. It means that DAC key is not encrypted.")
+            keys = load_der_private_key(key_data, password, backend=default_backend())
+            private_key = keys.private_numbers().private_value.to_bytes(32, byteorder='big')
+
+            return private_key
+
+    except IOError or ValueError:
+        return None
+
+
+def gen_spake2p_params(spake2p_path: str, passcode: int, it: int, salt: str) -> dict:
+    """ Generate spake2 params using external spake2p script
+
+    Args:
+        spake2p_path (str): path to spake2 executable
+        passcode (int): Pairing passcode using in SPAKE 2
+        it (int): Iteration counter for SPAKE2 Verifier generation
+        salt (str): Salt used to generate SPAKE2 password
+
+    Returns:
+        dict: dictionary containing passcode, it, salt, and generated Verifier
+    """
+
     cmd = [
         spake2p_path, 'gen-verifier',
         '--iteration-count', str(it),
@@ -52,8 +90,8 @@ class FactoryDataGenerator:
 
     def __init__(self, arguments) -> None:
         """
-        :param arguments: All input arguments parsed using ArgParse
-
+        Args:
+            arguments (any):All input arguments parsed using ArgParse
         """
         self._args = arguments
         self._factory_data = list()
@@ -71,10 +109,10 @@ def _validate_args(self):
                 self._user_data = json.loads(self._args.user)
             except json.decoder.JSONDecodeError as e:
                 raise AssertionError("Provided wrong user data, this is not a Json format! {}".format(e))
-        assert (not self._args.spake2_verifier or (self._args.passcode and self._args.spake2p_path)), \
+        assert (self._args.spake2_verifier or (self._args.passcode and self._args.spake2p_path)), \
             "Can not find spake2 verifier, to generate a new one please provide passcode (--passcode) and path to spake2p script (--spake2p_path)"
-        if not self._args.rd_uid:
-            log.warning("Can not find rotating device UID in provided arguments list. A new one will be generated.")
+        assert (self._args.chip_cert_path or (self._args.dac_cert and self._args.pai_cert and self._args.dac_key)), \
+            "Can not find paths to DAC or PAI certificates .der files. To generate a new ones please provide a path to chip-cert executable (--chip_cert_path)"
         assert self._args.output.endswith(".json"), \
             "Output path doesn't contain .json file path. ({})".format(self._args.output)
         assert not (self._args.passcode in INVALID_PASSCODES), \
@@ -96,13 +134,26 @@ def generate_json(self):
         """
         # generate missing data if needed
         if not self._args.rd_uid:
-            rd_uid = self._generate_rotating_device_uid()
+            if self._args.generate_rd_uid:
+                rd_uid = self._generate_rotating_device_uid()
+            else:
+                # rotating device ID unique ID was not provided, so do not store it in factory data.
+                rd_uid = None
         else:
             rd_uid = self._args.rd_uid
         if not self._args.spake2_verifier:
-            spake_2_verifier = base64.b64decode(self._generate_spake2_verifier()).hex()
+            spake_2_verifier = base64.b64decode(self._generate_spake2_verifier())
         else:
-            spake_2_verifier = self._args.spake2_verifier.hex()
+            spake_2_verifier = base64.b64decode(self._args.spake2_verifier)
+
+        # convert salt to bytestring to be coherent with spake2 verifier type
+        spake_2_salt = base64.b64decode(self._args.spake2_salt)
+
+        # try to read DAC public and private keys
+        dac_priv_key = get_raw_private_key_der(self._args.dac_key, self._args.dac_key_password)
+        if dac_priv_key is None:
+            log.error("Can not read DAC keys from : {}".format(self._args.dac_key))
+            sys.exit(-1)
 
         try:
             json_file = open(self._args.output, "w+")
@@ -110,26 +161,30 @@ def generate_json(self):
             print("Can not create JSON file in this location: {}".format(self._args.output))
             sys.exit(-1)
         with json_file:
-            # serialize mandatory data
+            # serialize data
             self._add_entry("sn", self._args.sn)
+            self._add_entry("vendor_id", self._args.vendor_id)
+            self._add_entry("product_id", self._args.product_id)
+            self._add_entry("vendor_name", self._args.vendor_name)
+            self._add_entry("product_name", self._args.product_name)
             self._add_entry("date", self._args.date)
             self._add_entry("hw_ver", self._args.hw_ver)
             self._add_entry("hw_ver_str", self._args.hw_ver_str)
-            self._add_entry("rd_uid", HEX_PREFIX + rd_uid)
             self._add_entry("dac_cert", self._process_der(self._args.dac_cert))
-            self._add_entry("dac_key", self._process_der(self._args.dac_key))
+            self._add_entry("dac_key", dac_priv_key)
             self._add_entry("pai_cert", self._process_der(self._args.pai_cert))
-            self._add_entry("cd", self._process_der(self._args.cd))
             if self._args.include_passcode:
                 self._add_entry("passcode", self._args.passcode)
             self._add_entry("spake2_it", self._args.spake2_it)
-            self._add_entry("spake2_salt", self._args.spake2_salt)
-            self._add_entry("spake2_verifier", HEX_PREFIX + spake_2_verifier)
+            self._add_entry("spake2_salt", spake_2_salt)
+            self._add_entry("spake2_verifier", spake_2_verifier)
             self._add_entry("discriminator", self._args.discriminator)
+            if rd_uid:
+                self._add_entry("rd_uid", rd_uid)
+            # add user-specific data
+            self._add_entry("user", self._args.user)
 
             factory_data_dict = dict(self._factory_data)
-            # add user-specific data
-            factory_data_dict["user"] = self._user_data
 
             json_object = json.dumps(factory_data_dict)
             is_json_valid = True
@@ -146,7 +201,9 @@ def generate_json(self):
 
     def _add_entry(self, name: str, value: any):
         """ Add single entry to list of tuples ("key", "value") """
-        if value:
+        if(isinstance(value, bytes) or isinstance(value, bytearray)):
+            value = HEX_PREFIX + value.hex()
+        if value or (isinstance(value, int) and value == 0):
             log.debug("Adding entry '{}' with size {} and type {}".format(name, sys.getsizeof(value), type(value)))
             self._factory_data.append((name, value))
 
@@ -158,9 +215,10 @@ def _generate_spake2_verifier(self):
 
     def _generate_rotating_device_uid(self):
         """ If rotating device unique ID has not been provided it should be generated """
+        log.warning("Can not find rotating device UID in provided arguments list. A new one will be generated.")
         rdu = secrets.token_bytes(16)
-        log.info("\n\nThe new rotate device UID: {}\n".format(rdu.hex()))
-        return rdu.hex()
+        log.info("\n\nThe new rotate device UID: {}\n".format(rdu).hex())
+        return rdu
 
     def _validate_output_json(self, output_json: str):
         """
@@ -185,7 +243,7 @@ def _process_der(self, path: str):
         log.debug("Processing der file...")
         try:
             with open(path, 'rb') as f:
-                data = HEX_PREFIX + f.read().hex()
+                data = f.read()
                 return data
         except IOError as e:
             log.error(e)
@@ -208,47 +266,82 @@ def allow_any_int(i): return int(i, 0)
                         help="Run this script with DEBUG logging level")
     parser.add_argument("--include_passcode", action="store_true",
                         help="passcode is used only for generating Spake2 Verifier to include it in factory data add this argument")
+    parser.add_argument("--overwrite", action="store_true",
+                        help="If output JSON file exist this argument allows to generate new factory data and overwrite it.")
     # Json known-keys values
     # mandatory keys
     mandatory_arguments.add_argument("--sn", type=str, required=True,
-                                     help="[ascii string] Provide serial number.")
+                                     help="[ascii string] Serial number of a device which can be used to identify \
+	                                        the serial number field in the Matter certificate structure. \
+	                                        Maximum length of serial number is 20 bytes. \
+	                                        Strings longer than 20 bytes will be declined in script")
+    mandatory_arguments.add_argument("--vendor_id", type=allow_any_int,
+                                     help="[int | hex int] Provide Vendor Identification Number")
+    mandatory_arguments.add_argument("--product_id", type=allow_any_int,
+                                     help="[int | hex int] Provide Product Identification Number")
+    mandatory_arguments.add_argument("--vendor_name", type=str,
+                                     help="[string] provide human-readable vendor name")
+    mandatory_arguments.add_argument("--product_name", type=str,
+                                     help="[string] provide human-readable product name")
     mandatory_arguments.add_argument("--date", type=str, required=True,
-                                     help="[ascii string] Provide manufacturing date in format MM.DD.YYYY_GG:MM .")
+                                     help="[ascii string] Provide manufacturing date \
+                                            A manufacturing date specifies the date that the Node was manufactured. \
+	                                        Used format for providing a manufacturing date is ISO 8601 e.g. YYYY-MM-DD.")
     mandatory_arguments.add_argument("--hw_ver", type=allow_any_int, required=True,
                                      help="[int | hex int] Provide hardware version in int format.")
     mandatory_arguments.add_argument("--hw_ver_str", type=str, required=True,
                                      help="[ascii string] Provide hardware version in string format.")
-    mandatory_arguments.add_argument("--dac_cert", type=str, required=True,
-                                     help="[.der] Provide the path to .der file containing DAC certificate.")
-    mandatory_arguments.add_argument("--dac_key", type=str, required=True,
-                                     help="[.der] Provide the path to .der file containing DAC keys.")
-    mandatory_arguments.add_argument("--pai_cert", type=str, required=True,
-                                     help="[.der] Provide the path to .der file containing PAI certificate.")
-    mandatory_arguments.add_argument("--cd", type=str, required=True,
-                                     help="[.der] Provide the path to .der file containing Certificate Declaration.")
-    mandatory_arguments.add_argument("--spake2_it", type=allow_any_int,
-                                     help="[int | hex int] Provide Spake2 Iteraction Counter.")
+    mandatory_arguments.add_argument("--spake2_it", type=allow_any_int, required=True,
+                                     help="[int | hex int] Provide Spake2 Iteration Counter.")
     mandatory_arguments.add_argument("--spake2_salt", type=str, required=True,
                                      help="[ascii string] Provide Spake2 Salt.")
-    optional_arguments.add_argument("--discriminator", type=allow_any_int, required=True,
-                                    help="[int] Provide BLE pairing discriminator.")
+    mandatory_arguments.add_argument("--discriminator", type=allow_any_int, required=True,
+                                     help="[int] Provide BLE pairing discriminator. \
+                                     A 12-bit value matching the field of the same name in \
+                                     the setup code. Discriminator is used during a discovery process.")
+
     # optional keys
+    optional_arguments.add_argument("--chip_cert_path", type=str,
+                                    help="Generate DAC and PAI certificates instead giving a path to .der files. This option requires a path to chip-cert executable."
+                                    "By default You can find spake2p in connectedhomeip/src/tools/chip-cert directory and build it there.")
+    optional_arguments.add_argument("--dac_cert", type=str,
+                                    help="[.der] Provide the path to .der file containing DAC certificate.")
+    optional_arguments.add_argument("--dac_key", type=str,
+                                    help="[.der] Provide the path to .der file containing DAC keys.")
+    optional_arguments.add_argument("--generate_rd_uid", action="store_true",
+                                    help="Generate a new rotating device unique ID, print it out to console output and store it in factory data.")
+    optional_arguments.add_argument("--dac_key_password", type=str,
+                                    help="Provide a password to decode dac key. If dac key is not encrypted do not provide this argument.")
+    optional_arguments.add_argument("--pai_cert", type=str,
+                                    help="[.der] Provide the path to .der file containing PAI certificate.")
     optional_arguments.add_argument("--rd_uid", type=str,
-                                    help="[hex string] Provide the rotating device unique ID. To generate the new rotate device unique ID use --rd_uid_gen.")
+                                    help="[hex string] Provide the rotating device unique ID. If this argument is not provided a new rotating device id unique id will be generated.")
     optional_arguments.add_argument("--passcode", type=allow_any_int,
                                     help="[int | hex] Default PASE session passcode. (This is mandatory to generate Spake2 Verifier).")
     optional_arguments.add_argument("--spake2p_path", type=str,
                                     help="[string] Provide a path to spake2p. By default You can find spake2p in connectedhomeip/src/tools/spake2p directory and build it there.")
     optional_arguments.add_argument("--spake2_verifier", type=str,
-                                    help="[hex string] Provide Spake2 Verifier without generating it.")
+                                    help="[ascii string] Provide Spake2 Verifier without generating it.")
     optional_arguments.add_argument("--user", type=str,
                                     help="[string] Provide additional user-specific keys in Json format: {'name_1': 'value_1', 'name_2': 'value_2', ... 'name_n', 'value_n'}.")
     args = parser.parse_args()
 
+    if(args.chip_cert_path):
+        print("Generating DAC and PAI certificates is not supported yet")
+
     if args.verbose:
         log.basicConfig(format='[%(asctime)s][%(levelname)s] %(message)s', level=log.DEBUG)
     else:
-        log.basicConfig(format='[%(asctime)s] %(message)s', level=log.INFO)
+        log.basicConfig(format='[%(levelname)s] %(message)s', level=log.INFO)
+
+    if(args.chip_cert_path):
+        log.error("Generating DAC and PAI certificates is not supported yet")
+        return
+
+    # check if json file already exist
+    if(exists(args.output) and not args.overwrite):
+        log.error("Output file: {} already exist, to create a new one add argument '--overwrite'. By default overwriting is disabled".format(args.output))
+        return
 
     generator = FactoryDataGenerator(args)
     generator.generate_json()
diff --git a/scripts/tools/nrfconnect/nrfconnect_factory_data.schema b/scripts/tools/nrfconnect/nrfconnect_factory_data.schema
index 7ec7804d746b84..6d61795f0bc9e1 100644
--- a/scripts/tools/nrfconnect/nrfconnect_factory_data.schema
+++ b/scripts/tools/nrfconnect/nrfconnect_factory_data.schema
@@ -5,17 +5,20 @@
     "type": "object",
     "required": [
         "sn",
+        "vendor_id",
+        "product_id",
+        "vendor_name",
+        "product_name",
         "date",
         "hw_ver",
         "hw_ver_str",
-        "rd_uid",
         "dac_cert",
         "dac_key",
         "pai_cert",
-        "cd",
         "spake2_it",
         "spake2_salt",
-        "spake2_verifier"
+        "spake2_verifier",
+        "discriminator"
     ],
     "properties": {
         "sn": {
@@ -23,12 +26,32 @@
             "type": "string",
             "maxLength": 32
         },
+        "vendor_id": {
+            "description": "Vendor Identifier",
+            "type": "integer",
+            "minimum": 0,
+            "maximum":  65524
+        },
+        "product_id": {
+            "description": "Product Identifier",
+            "type": "integer",
+            "minimum": 1, 
+            "maximum":  65535
+        },
+        "vendor_name": {
+            "description": "human-readable vendor name",
+            "type": "string",
+            "maxLength": 32
+        },
+        "product_name": {
+            "description": "human-readable product name",
+            "type": "string",
+            "maxLength": 32
+        },
         "date": {
-            "description": "Manufacturing date according to ISO 8601 in notation YYYYMMDD",
+            "description": "Manufacturing date according to ISO 8601 in notation YYYY-MM-DD",
             "type": "string",
-            "minLength": 8,
-            "maxLength": 8,
-            "pattern": "[0-9]{4}[0-1]{1}[0-9]{1}[0-3]{1}[0-9]{1}"
+            "format": "date"
         },
         "hw_ver": {
             "description": "Hardware version - integer",
@@ -50,19 +73,19 @@
         },
         "dac_cert": {
             "description": "DAC certificate in hex-string format",
-            "type": "string"
+            "type": "string",
+            "maxLength": 1204
         },
         "dac_key": {
             "description": "DAC Private Key in hex-string format",
-            "type": "string"
+            "type": "string",
+            "minLength": 68,
+            "maxLength": 68
         },
         "pai_cert": {
             "description": "PAI certificate in hex-string format",
-            "type": "string"
-        },
-        "cd": {
-            "description": "Certificate Declaration in hex-string format",
-            "type": "string"
+            "type": "string",
+            "maxLength": 1204
         },
         "passcode": {
             "description": "A default PASE session passcode",
@@ -79,8 +102,8 @@
         "spake2_salt": {
             "description": "A key-derivation function for the Symmetric Password-Authenticated Key Exchange.",
             "type": "string",
-            "minLength": 16,
-            "maxLength": 32
+            "minLength": 36,
+            "maxLength": 68
         },
         "spake2_verifier": {
             "description": "A verifier for the Symmetric Password-Authenticated Key Exchange",
@@ -93,10 +116,6 @@
             "minimum": 0,
             "maximum": 4095
         },
-        "fw_info": {
-            "description": "Information about programmed firmware in TLV format",
-            "type": "string"
-        },
         "user": {
             "description": "A user-specific additional data which should be added to factory data. This should be a Json format.",
             "type": "object"
diff --git a/scripts/tools/nrfconnect/nrfconnect_generate_partition.py b/scripts/tools/nrfconnect/nrfconnect_generate_partition.py
index e18805400bec08..bb267406427a6d 100644
--- a/scripts/tools/nrfconnect/nrfconnect_generate_partition.py
+++ b/scripts/tools/nrfconnect/nrfconnect_generate_partition.py
@@ -58,8 +58,6 @@ def generate_cbor(self):
         if self.__data_to_save:
             # prepare raw data from Json
             cbor_data = cbor.dumps(self.__data_to_save)
-            with open(self._output + "/output.cbor", "w+b") as cbor_output:
-                cbor.dump(cbor.loads(cbor_data), cbor_output)
             return cbor_data
 
     def create_hex(self, data: bytes):
@@ -71,7 +69,7 @@ def create_hex(self, data: bytes):
         if len(data) > self._length:
             raise ValueError("generated CBOR file exceeds declared maximum partition size! {} > {}".format(len(data), self._length))
         self._ih.putsz(self._offset, data)
-        self._ih.write_hex_file(self._output + "/output.hex", True)
+        self._ih.write_hex_file(self._output + ".hex", True)
         self._data_ready = True
         return True
 
@@ -83,7 +81,7 @@ def create_bin(self):
         if not self._data_ready:
             log.error("Please create hex file first!")
             return False
-        self._ih.tobinfile(self._output + "/output.bin")
+        self._ih.tobinfile(self._output + ".bin")
         return True
 
     @staticmethod
@@ -144,25 +142,32 @@ def allow_any_int(i): return int(i, 0)
     parser.add_argument("-i", "--input", type=str, required=True,
                         help="Path to input .json file")
     parser.add_argument("-o", "--output", type=str, required=True,
-                        help="Path to DIRECTORY, where .hex, .cbor and .bin files will be stored")
+                        help="Prefix for output file paths, e.g. setting dir/output causes creation of the following files: dir/output.hex, and dir/output.bin")
     parser.add_argument("--offset", type=allow_any_int, required=True,
-                        help="Partiton offset - a place in device's flash memory, where factory data will be stored")
+                        help="Partition offset - an address in device's NVM memory, where factory data will be stored")
     parser.add_argument("--size", type=allow_any_int, required=True,
                         help="The maximum partition size")
     parser.add_argument("-v", "--verbose", action="store_true",
                         help="Run this script with DEBUG logging level")
+    parser.add_argument("-r", "--raw", action="store_true",
+                        help="Do not print flashing help and other logs, only generate a .hex file. It can be useful when the script is used by other script.")
     args = parser.parse_args()
 
     if args.verbose:
         log.basicConfig(format='[%(asctime)s][%(levelname)s] %(message)s', level=log.DEBUG)
+    elif args.raw:
+        log.basicConfig(format='%(message)s', level=log.ERROR)
     else:
         log.basicConfig(format='[%(asctime)s] %(message)s', level=log.INFO)
 
     partition_creator = PartitionCreator(args.offset, args.size, args.input, args.output)
     cbor_data = partition_creator.generate_cbor()
     try:
+        if not args.raw:
+            print("Generating .hex file: {}.hex with offset: {} and size: {}".format(args.output, hex(args.offset), hex(args.size)))
         if partition_creator.create_hex(cbor_data) and partition_creator.create_bin():
-            print_flashing_help()
+            if not args.raw:
+                print_flashing_help()
     except ValueError as e:
         log.error(e)
         sys.exit(-1)
diff --git a/scripts/tools/zap/convert.py b/scripts/tools/zap/convert.py
index 143bd104d91ea1..1181ebe17d989f 100755
--- a/scripts/tools/zap/convert.py
+++ b/scripts/tools/zap/convert.py
@@ -16,6 +16,7 @@
 #
 
 import argparse
+import json
 import os
 import subprocess
 import sys
@@ -66,9 +67,28 @@ def runArgumentsParser():
     return zap_file
 
 
+def detectZclFile(zapFile):
+    print(f"Searching for zcl file from {zapFile}")
+
+    path = 'src/app/zap-templates/zcl/zcl.json'
+
+    data = json.load(open(zapFile))
+    for package in data["package"]:
+        if package["type"] != "zcl-properties":
+            continue
+
+        # found the right path, try to figure out the actual path
+        if package["pathRelativity"] == "relativeToZap":
+            path = os.path.abspath(os.path.join(os.path.dirname(zapFile), package["path"]))
+        else:
+            path = package["path"]
+
+    return getFilePath(path)
+
+
 def runConversion(zap_file):
     templates_file = getFilePath('src/app/zap-templates/app-templates.json')
-    zcl_file = getFilePath('src/app/zap-templates/zcl/zcl.json')
+    zcl_file = detectZclFile(zap_file)
 
     generator_dir = getDirPath('third_party/zap/repo')
     os.chdir(generator_dir)
diff --git a/scripts/tools/zap/generate.py b/scripts/tools/zap/generate.py
index 6d6b0848e3d1ed..72b63a1c7fbb6c 100755
--- a/scripts/tools/zap/generate.py
+++ b/scripts/tools/zap/generate.py
@@ -58,9 +58,27 @@ def getDirPath(name):
     return fullpath
 
 
+def detectZclFile(zapFile):
+    print(f"Searching for zcl file from {zapFile}")
+
+    path = 'src/app/zap-templates/zcl/zcl.json'
+
+    data = json.load(open(zapFile))
+    for package in data["package"]:
+        if package["type"] != "zcl-properties":
+            continue
+
+        # found the right path, try to figure out the actual path
+        if package["pathRelativity"] == "relativeToZap":
+            path = os.path.abspath(os.path.join(os.path.dirname(zapFile), package["path"]))
+        else:
+            path = package["path"]
+
+    return getFilePath(path)
+
+
 def runArgumentsParser():
     default_templates = 'src/app/zap-templates/app-templates.json'
-    default_zcl = 'src/app/zap-templates/zcl/zcl.json'
     default_output_dir = 'zap-generated/'
 
     parser = argparse.ArgumentParser(
@@ -68,8 +86,8 @@ def runArgumentsParser():
     parser.add_argument('zap', help='Path to the application .zap file')
     parser.add_argument('-t', '--templates', default=default_templates,
                         help='Path to the .zapt templates records to use for generating artifacts (default: "' + default_templates + '")')
-    parser.add_argument('-z', '--zcl', default=default_zcl,
-                        help='Path to the zcl templates records to use for generating artifacts (default: "' + default_zcl + '")')
+    parser.add_argument('-z', '--zcl',
+                        help='Path to the zcl templates records to use for generating artifacts (default: autodetect read from zap file)')
     parser.add_argument('-o', '--output-dir', default=None,
                         help='Output directory for the generated files (default: automatically selected)')
     args = parser.parse_args()
@@ -86,7 +104,12 @@ def runArgumentsParser():
         output_dir = ''
 
     zap_file = getFilePath(args.zap)
-    zcl_file = getFilePath(args.zcl)
+
+    if args.zcl:
+        zcl_file = getFilePath(args.zcl)
+    else:
+        zcl_file = detectZclFile(zap_file)
+
     templates_file = getFilePath(args.templates)
     output_dir = getDirPath(output_dir)
 
diff --git a/scripts/tools/zap/run_zaptool.sh b/scripts/tools/zap/run_zaptool.sh
index c219a6cc560339..62a9d3de514bca 100755
--- a/scripts/tools/zap/run_zaptool.sh
+++ b/scripts/tools/zap/run_zaptool.sh
@@ -45,9 +45,16 @@ CHIP_ROOT="${SCRIPT_PATH%/scripts/tools/zap/run_zaptool.sh}"
         npm install
     fi
 
+    echo "ARGS: ${ZAP_ARGS[@]}"
+
+    if [[ "${ZAP_ARGS[@]}" == *"/all-clusters-app.zap"* ]]; then
+        ZCL_FILE="$CHIP_ROOT/src/app/zap-templates/zcl/zcl-with-test-extensions.json"
+    else
+        ZCL_FILE="$CHIP_ROOT/src/app/zap-templates/zcl/zcl.json"
+    fi
+
     node src-script/zap-start.js --logToStdout \
         --gen "$CHIP_ROOT/src/app/zap-templates/app-templates.json" \
-        --zcl "$CHIP_ROOT/src/app/zap-templates/zcl/zcl.json" \
+        --zcl "$ZCL_FILE" \
         "${ZAP_ARGS[@]}"
-
 )
diff --git a/scripts/tools/zap/zapfile_formatter.py b/scripts/tools/zap/zapfile_formatter.py
index 4240cd284a1c3a..a6a9508aa90d97 100755
--- a/scripts/tools/zap/zapfile_formatter.py
+++ b/scripts/tools/zap/zapfile_formatter.py
@@ -20,37 +20,83 @@
 from typing import List
 
 _DEFAULT_CLUSTER_REVISION_ATTRIBUTE = {
-    "name": "ClusterRevision",
-    "code": 0xFFFD,
-    "mfgCode": None,
-    "side": "server",
-    "type": "int16u",
-    "included": 1,
-    "storageOption": "RAM",
-    "singleton": 0,
-    "bounded": 0,
-    "defaultValue": "1",
-    "reportable": 1,
-    "minInterval": 1,
-    "maxInterval": 65534,
-    "reportableChange": 0
+    "entry": {
+        "name": "ClusterRevision",
+        "code": 0xFFFD,
+        "mfgCode": None,
+        "side": "server",
+        "type": "int16u",
+        "included": 1,
+        "storageOption": "RAM",
+        "singleton": 0,
+        "bounded": 0,
+        "defaultValue": "1",
+        "reportable": 1,
+        "minInterval": 1,
+        "maxInterval": 65534,
+        "reportableChange": 0
+    },
+    "clusterCode": None,
+    "clusterParamKey": "attributes",
+    "side": "server"
 }
 
 _DEFAULT_FEATURE_MAP_ATTRIBUTE = {
-    "name": "FeatureMap",
-    "code": 0xFFFC,
-    "mfgCode": None,
-    "side": "server",
-    "type": "bitmap32",
-    "included": 1,
-    "storageOption": "RAM",
-    "singleton": 0,
-    "bounded": 0,
-    "defaultValue": "0",
-    "reportable": 1,
-    "minInterval": 1,
-    "maxInterval": 65534,
-    "reportableChange": 0
+    "entry": {
+        "name": "FeatureMap",
+        "code": 0xFFFC,
+        "mfgCode": None,
+        "side": "server",
+        "type": "bitmap32",
+        "included": 1,
+        "storageOption": "RAM",
+        "singleton": 0,
+        "bounded": 0,
+        "defaultValue": "0",
+        "reportable": 1,
+        "minInterval": 1,
+        "maxInterval": 65534,
+        "reportableChange": 0
+    },
+    "clusterCode": None,
+    "clusterParamKey": "attributes",
+    "side": "server"
+}
+
+_TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE = {
+    "entry": {
+        "name": "TestEventTriggersEnabled",
+        "code": 8,
+        "mfgCode": None,
+        "side": "server",
+        "type": "boolean",
+        "included": 1,
+        "storageOption": "External",
+        "singleton": 0,
+        "bounded": 0,
+        "defaultValue": "false",
+        "reportable": 1,
+        "minInterval": 1,
+        "maxInterval": 65534,
+        "reportableChange": 0
+    },
+    "clusterCode": 51,
+    "clusterParamKey": "attributes",
+    "side": "server"
+}
+
+_TEST_EVENT_TRIGGERS_CLIENT_COMMAND = {
+    "entry": {
+        "name": "TestEventTrigger",
+        "code": 0,
+        "mfgCode": None,
+        "source": "client",
+        "incoming": 1,
+        "outgoing": 0
+    },
+    "clusterCode": 51,
+    "clusterParamKey": "commands",
+    "side": "server"
 }
 
 
@@ -62,76 +108,111 @@ def handle(self, candidate: object):
         pass
 
 
-class ValidateMandatoryServerClusterAttributes(Mutator):
-    def __init__(self, attribute_entry, add_if_missing, forces_include, replace_if_storage_nvm):
-        self._attribute_entry = attribute_entry
-        self._add_if_missing = add_if_missing
-        self._forces_include = forces_include
-        self._replace_if_storage_nvm = replace_if_storage_nvm
+class ValidateMandatoryClusterParam(Mutator):
+    def __init__(self, param_details, args):
+        self._param_entry = param_details["entry"]
+        self._cluster_specific_code = param_details["clusterCode"]
+        self._param_key = param_details["clusterParamKey"]
+        self._cluster_side = param_details["side"]
+        self._add_if_missing = args.add_missing_cluster_param
+        self._forces_enable = args.force_enable_cluster_param
+        self._replace_if_storage_nvm = args.mandatory_attributes_replace_if_storage_nvm
         super().__init__()
 
-    def _addMissingMandatoryAttribute(self, candidate: object):
-        attributes = candidate.get("attributes", [])
+    def _addEntry(self, candidate: object):
+        param_list = candidate.get(self._param_key, [])
         insert_index = 0
-        for attribute in attributes:
-            attribute_code = attribute.get("code")
-            if attribute_code is not None and attribute_code > self._attribute_entry[
-                    "code"]:
+        for entry in param_list:
+            code = entry.get("code")
+            if code is not None and code > self._param_entry["code"]:
                 break
 
             insert_index += 1
 
-        # Insert the new attribute in the right place, WITH NO RENUMBERING
-        new_attrib_list = attributes[0:insert_index]
-        new_attrib_list.append(self._attribute_entry)
-        new_attrib_list.extend(attributes[insert_index:])
+        # Insert the new entry in the right place, with no renumbering
+        new_param_list = param_list[0:insert_index]
+        new_param_list.append(self._param_entry)
+        new_param_list.extend(param_list[insert_index:])
 
-        # Replace the attribute list with the augmented item
-        candidate["attributes"] = new_attrib_list
+        # Replace the param list with the augmented item
+        candidate[self._param_key] = new_param_list
 
-    def handle(self, candidate: object):
+    def _isCandidateValidCluster(self, candidate: object):
         if not isinstance(candidate, dict):
-            return
+            return False
 
-        # We only care about adding mandatory attributes.
-        if "attributes" not in candidate:
-            return
+        # We only care about adding mandatory entires to .
+        if self._param_key not in candidate:
+            return False
 
-        # If the cluster is not a server or is not enabled we do not enforce adding manidory attribute.
+        # Valid clusters must have enabled and side.
         if (("enabled" not in candidate) or ("side" not in candidate)):
-            return
-        if (not candidate.get("enabled")) or ("server"
-                                              not in candidate.get("side")):
+            return False
+
+        if self._cluster_side not in candidate.get("side"):
+            return False
+
+        # Command clusters do not need to be enabled for it to have an effect on auto generated
+        # files based off of the zap file.
+        if (self._param_key != "commands") and (not candidate.get("enabled")):
+            return False
+
+        if self._cluster_specific_code is not None and self._cluster_specific_code != candidate["code"]:
+            return False
+
+        return True
+
+    def _attributeSpecificChecks(self, param: object, cluster_name):
+        if not param["included"]:
+            print("WARNING: param 0x%X(%s) in cluster %s found, but included is false" %
+                  (self._param_entry["code"], self._param_entry["name"], cluster_name))
+            if self._forces_enable:
+                param["included"] = self._param_entry["included"]
+
+        if param["storageOption"] == "NVM":
+            print("WARNING: param 0x%X(%s) in cluster %s found, but storageOption was NVM" %
+                  (self._param_entry["code"], self._param_entry["name"], cluster_name))
+            if self._replace_if_storage_nvm:
+                param["storageOption"] = self._param_entry["storageOption"]
+
+    def _commandSpecificChecks(self, param: object, cluster_name):
+        if param["incoming"] != self._param_entry["incoming"]:
+            print("WARNING: param 0x%X(%s) in cluster %s found, but incoming field isn't correct" %
+                  (self._param_entry["code"], self._param_entry["name"], cluster_name))
+            if self._forces_enable:
+                param["incoming"] = self._param_entry["incoming"]
+
+        if param["outgoing"] != self._param_entry["outgoing"]:
+            print("WARNING: param 0x%X(%s) in cluster %s found, but outgoing field isn't correct" %
+                  (self._param_entry["code"], self._param_entry["name"], cluster_name))
+            if self._forces_enable:
+                param["outgoing"] = self._param_entry["outgoing"]
+
+    def handle(self, candidate: object):
+        if not self._isCandidateValidCluster(candidate):
             return
 
-        for attribute in candidate.get("attributes", []):
-            if attribute["code"] != self._attribute_entry["code"]:
+        for param in candidate.get(self._param_key, []):
+            if param["code"] != self._param_entry["code"]:
                 continue
 
-            if attribute["name"] != self._attribute_entry["name"]:
+            if param["name"] != self._param_entry["name"]:
                 print(
-                    "WARNING: attribute 0x%X has mismatching name %s (should be %s)" %
-                    (self._attribute_entry["code"], attribute["name"],
-                     self._attribute_entry["name"]))
-
-            if not attribute["included"]:
-                print("WARNING: attribute 0x%X(%s) in cluster %s found, but included is false" %
-                      (self._attribute_entry["code"], self._attribute_entry["name"], candidate["name"]))
-                if self._forces_include:
-                    attribute["included"] = self._attribute_entry["included"]
-
-            if attribute["storageOption"] == "NVM":
-                print("WARNING: attribute 0x%X(%s) in cluster %s found, but storageOption was NVM" %
-                      (self._attribute_entry["code"], self._attribute_entry["name"], candidate["name"]))
-                if self._replace_if_storage_nvm:
-                    attribute["storageOption"] = self._attribute_entry["storageOption"]
+                    "WARNING: param 0x%X has mismatching name %s (should be %s)" %
+                    (self._param_entry["code"], param["name"],
+                     self._param_entry["name"]))
+
+            if self._param_key == "attributes":
+                self._attributeSpecificChecks(param, candidate["name"])
+            elif self._param_key == "commands":
+                self._commandSpecificChecks(param, candidate["name"])
             break
         else:
             print(
-                "WARNING: Did not find mandatory attribute %s in cluster %s (0x%X)" %
-                (self._attribute_entry["name"], candidate["name"], candidate["code"]))
+                "WARNING: Did not find mandatory param %s in cluster %s (0x%X)" %
+                (self._param_entry["name"], candidate["name"], candidate["code"]))
             if self._add_if_missing:
-                self._addMissingMandatoryAttribute(candidate)
+                self._addEntry(candidate)
 
 
 def loadZapfile(filename: str):
@@ -164,10 +245,10 @@ def setupArgumentsParser():
     parser = argparse.ArgumentParser(description='Mutate ZAP files')
     parser.add_argument('zap_filenames', metavar='zap-filename', type=str, nargs='+',
                         help='zapfiles that need mutating')
-    parser.add_argument('--mandatory-attributes-add-missing', default=False, action='store_true',
-                        help="Add missing mandatory attributes to server clusters (default: False)")
-    parser.add_argument('--mandatory-attributes-force-included', default=False, action='store_true',
-                        help="If mandatory attribute is not included, include it (default: False)")
+    parser.add_argument('--add-missing-cluster-param', default=False, action='store_true',
+                        help="Add missing mandatory cluster parameters (default: False)")
+    parser.add_argument('--force-enable-cluster-param', default=False, action='store_true',
+                        help="If mandatory cluster paramater is not missing and not enabled, enable it (default: False)")
     parser.add_argument('--mandatory-attributes-replace-if-storage-nvm', default=False, action='store_true',
                         help="Enforce mandatory attribute use default storage type (default: False)")
     return parser.parse_args()
@@ -177,14 +258,17 @@ def main():
     args = setupArgumentsParser()
 
     mutators = []
-    add_missing_cluster_revision = ValidateMandatoryServerClusterAttributes(
-        _DEFAULT_CLUSTER_REVISION_ATTRIBUTE, args.mandatory_attributes_add_missing,
-        args.mandatory_attributes_force_included, args.mandatory_attributes_replace_if_storage_nvm)
-    add_missing_feature_map = ValidateMandatoryServerClusterAttributes(
-        _DEFAULT_FEATURE_MAP_ATTRIBUTE, args.mandatory_attributes_add_missing,
-        args.mandatory_attributes_force_included, args.mandatory_attributes_replace_if_storage_nvm)
-
-    mutators.extend([add_missing_cluster_revision, add_missing_feature_map])
+    add_missing_cluster_revision = ValidateMandatoryClusterParam(
+        _DEFAULT_CLUSTER_REVISION_ATTRIBUTE, args)
+    add_missing_feature_map = ValidateMandatoryClusterParam(
+        _DEFAULT_FEATURE_MAP_ATTRIBUTE, args)
+    add_general_diagnostic_test_event_trigger_enabled = ValidateMandatoryClusterParam(
+        _TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE, args)
+    add_general_diagnostic_test_event_trigger_command = ValidateMandatoryClusterParam(
+        _TEST_EVENT_TRIGGERS_CLIENT_COMMAND, args)
+
+    mutators.extend([add_missing_cluster_revision, add_missing_feature_map,
+                    add_general_diagnostic_test_event_trigger_enabled, add_general_diagnostic_test_event_trigger_command])
 
     for zap_filename in args.zap_filenames:
         body = loadZapfile(zap_filename)
diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py
index 894849adf460ed..4fee975ddb6dbc 100755
--- a/scripts/tools/zap_regen_all.py
+++ b/scripts/tools/zap_regen_all.py
@@ -80,7 +80,7 @@ def setupArgumentsParser():
         description='Generate content from ZAP files')
     parser.add_argument('--type', default='all', choices=['all', 'tests'],
                         help='Choose which content type to generate (default: all)')
-    parser.add_argument('--tests', default='all', choices=['all', 'chip-tool', 'chip-tool-darwin', 'app1', 'app2'],
+    parser.add_argument('--tests', default='all', choices=['all', 'chip-tool', 'darwin-framework-tool', 'app1', 'app2'],
                         help='When generating tests only target, Choose which tests to generate (default: all)')
     parser.add_argument('--dry-run', default=False, action='store_true',
                         help="Don't do any generationl just log what targets would be generated (default: False)")
@@ -141,10 +141,10 @@ def getTestsTemplatesTargets(test_target):
             'template': 'examples/chip-tool/templates/tests/templates.json',
             'output_dir': 'zzz_generated/chip-tool/zap-generated'
         },
-        'chip-tool-darwin': {
+        'darwin-framework-tool': {
             'zap': 'src/controller/data_model/controller-clusters.zap',
-            'template': 'examples/chip-tool-darwin/templates/tests/templates.json',
-            'output_dir': 'zzz_generated/chip-tool-darwin/zap-generated'
+            'template': 'examples/darwin-framework-tool/templates/tests/templates.json',
+            'output_dir': 'zzz_generated/darwin-framework-tool/zap-generated'
         }
     }
 
@@ -180,7 +180,7 @@ def getSpecificTemplatesTargets():
         'src/app/common/templates/templates.json': 'zzz_generated/app-common/app-common/zap-generated',
         'src/app/tests/suites/templates/templates.json': 'zzz_generated/app-common/app-common/zap-generated',
         'examples/chip-tool/templates/templates.json': 'zzz_generated/chip-tool/zap-generated',
-        'examples/chip-tool-darwin/templates/templates.json': 'zzz_generated/chip-tool-darwin/zap-generated',
+        'examples/darwin-framework-tool/templates/templates.json': 'zzz_generated/darwin-framework-tool/zap-generated',
         'src/controller/python/templates/templates.json': None,
         'src/darwin/Framework/CHIP/templates/templates.json': None,
         'src/controller/java/templates/templates.json': None,
diff --git a/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt b/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt
index b969cb9fce1eac..0b914a1745fe99 100644
--- a/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt
+++ b/src/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt
@@ -53,6 +53,6 @@ class MainActivity : AppCompatActivity() {
             }.start()
         }
 
-        AndroidChipPlatform(AndroidBleManager(), PreferencesKeyValueStoreManager(this), PreferencesConfigurationManager(this), NsdManagerServiceResolver(this), ChipMdnsCallbackImpl(), DiagnosticDataProviderImpl(this))
+        AndroidChipPlatform(AndroidBleManager(), PreferencesKeyValueStoreManager(this), PreferencesConfigurationManager(this), NsdManagerServiceResolver(this), NsdManagerServiceBrowser(this), ChipMdnsCallbackImpl(), DiagnosticDataProviderImpl(this))
     }
 }
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
index d4ed41a5347f66..53d62c1b4f39e3 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
@@ -25,6 +25,7 @@ import chip.platform.AndroidBleManager
 import chip.platform.AndroidChipPlatform
 import chip.platform.ChipMdnsCallbackImpl
 import chip.platform.DiagnosticDataProviderImpl
+import chip.platform.NsdManagerServiceBrowser
 import chip.platform.NsdManagerServiceResolver
 import chip.platform.PreferencesConfigurationManager
 import chip.platform.PreferencesKeyValueStoreManager
@@ -51,7 +52,7 @@ object ChipClient {
     if (!this::androidPlatform.isInitialized && context != null) {
       //force ChipDeviceController load jni
       ChipDeviceController.loadJni()
-      androidPlatform = AndroidChipPlatform(AndroidBleManager(), PreferencesKeyValueStoreManager(context), PreferencesConfigurationManager(context), NsdManagerServiceResolver(context), ChipMdnsCallbackImpl(), DiagnosticDataProviderImpl(context))
+      androidPlatform = AndroidChipPlatform(AndroidBleManager(), PreferencesKeyValueStoreManager(context), PreferencesConfigurationManager(context), NsdManagerServiceResolver(context), NsdManagerServiceBrowser(context), ChipMdnsCallbackImpl(), DiagnosticDataProviderImpl(context))
     }
     return androidPlatform
   }
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/MultiAdminClientFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/MultiAdminClientFragment.kt
index 240553514740ff..ff61638b9bac0b 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/MultiAdminClientFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/MultiAdminClientFragment.kt
@@ -9,16 +9,17 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import chip.devicecontroller.ChipClusters
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.OpenCommissioningCallback
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.GenericChipDeviceListener
 import com.google.chip.chiptool.R
 import kotlinx.android.synthetic.main.multi_admin_client_fragment.discriminatorEd
+import kotlinx.android.synthetic.main.multi_admin_client_fragment.timeoutEd
 import kotlinx.android.synthetic.main.multi_admin_client_fragment.multiAdminClusterCommandStatus
 import kotlinx.android.synthetic.main.multi_admin_client_fragment.setupPinCodeEd
 import kotlinx.android.synthetic.main.multi_admin_client_fragment.view.basicCommissioningMethodBtn
 import kotlinx.android.synthetic.main.multi_admin_client_fragment.view.enhancedCommissioningMethodBtn
 import kotlinx.android.synthetic.main.multi_admin_client_fragment.view.revokeBtn
-import kotlinx.android.synthetic.main.on_off_client_fragment.*
 import kotlinx.coroutines.*
 
 class MultiAdminClientFragment : Fragment() {
@@ -53,8 +54,10 @@ class MultiAdminClientFragment : Fragment() {
     // TODO: use the discriminator and setupPinCode that was used to commission the device
     val testDiscriminator = "3840"
     val testSetupPinCode = 20202021L
+    val testDuration = 180
     discriminatorEd.setText(testDiscriminator)
     setupPinCodeEd.setText(testSetupPinCode.toString())
+    timeoutEd.setText(testDuration.toString())
   }
 
   inner class ChipControllerCallback : GenericChipDeviceListener() {
@@ -78,23 +81,41 @@ class MultiAdminClientFragment : Fragment() {
   }
 
   private suspend fun sendBasicCommissioningCommandClick() {
-    val testDuration = 100
-    deviceController.openPairingWindow(
+    val testDuration = timeoutEd.text.toString().toInt()
+    deviceController.openPairingWindowCallback(
       ChipClient.getConnectedDevicePointer(
         requireContext(),
         addressUpdateFragment.deviceId
-      ), testDuration
+      ), testDuration,
+      object:OpenCommissioningCallback {
+        override fun onError(status: Int, deviceId: Long) {
+          showMessage("OpenBasicCommissioning Fail! \nDevice ID : $deviceId\nErrorCode : $status")
+        }
+
+        override fun onSuccess(deviceId: Long, manualPairingCode: String?, qrCode: String?) {
+          showMessage("OpenBasicCommissioning Success! \n Node ID: $deviceId")
+        }
+      }
     )
   }
 
   private suspend fun sendEnhancedCommissioningCommandClick() {
-    val testDuration = 100
+    val testDuration = timeoutEd.text.toString().toInt()
     val testIteration = 1000
     val devicePointer =
       ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
-    deviceController.openPairingWindowWithPIN(
+    deviceController.openPairingWindowWithPINCallback(
       devicePointer, testDuration, testIteration.toLong(),
-      discriminatorEd.text.toString().toInt(), setupPinCodeEd.text.toString().toULong().toLong()
+      discriminatorEd.text.toString().toInt(), setupPinCodeEd.text.toString().toULong().toLong(),
+      object:OpenCommissioningCallback {
+        override fun onError(status: Int, deviceId: Long) {
+          showMessage("OpenCommissioning Fail! \nDevice ID : $deviceId\nErrorCode : $status")
+        }
+
+        override fun onSuccess(deviceId: Long, manualPairingCode: String?, qrCode: String?) {
+          showMessage("OpenCommissioning Success! \n Node ID: $deviceId\n\tManual : $manualPairingCode\n\tQRCode : $qrCode")
+        }
+      }
     )
   }
 
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
index 87321a93c40211..5e9769764a5cdc 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -45,6 +45,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import java.util.*
+import kotlin.collections.HashMap
 
 /**
  * ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
@@ -135,15 +137,15 @@ class ClusterDetailFragment : Fragment() {
       )
       parameterList.forEach {
         val parameterName = it.clusterParameterNameTv.text.toString()
-        val castType =
-          selectedInteractionInfo.commandParameters[parameterName]!!.type
-        val data = castStringToType(it.clusterParameterData.text.toString(), castType)!!
+        val parameterType = selectedInteractionInfo.commandParameters[parameterName]!!.type
+        val parameterUnderlyingType = selectedInteractionInfo.commandParameters[parameterName]!!.underlyingType
+        val data = castStringToType(it.clusterParameterData.text.toString(), parameterType, parameterUnderlyingType)!!
         commandArguments[it.clusterParameterNameTv.text.toString()] = data
         clusterInteractionHistoryList[0].parameterList.add(
           HistoryParameterInfo(
             parameterName,
             data.toString(),
-            castType
+            parameterUnderlyingType
           )
         )
       }
@@ -185,12 +187,13 @@ class ClusterDetailFragment : Fragment() {
     }
   }
 
-  private fun castStringToType(data: String, type: Class<*>): Any? {
+  private fun castStringToType(data: String, type: Class<*>, underlyingType: Class<*>): Any? {
     return when (type) {
       Int::class.java -> data.toInt()
       Boolean::class.java -> data.toBoolean()
       ByteArray::class.java -> data.encodeToByteArray()
       Long::class.java -> data.toLong()
+      Optional::class.java -> if (data.isEmpty()) Optional.empty() else Optional.of(castStringToType(data, underlyingType, underlyingType)!!)
       else -> data
     }
   }
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt
index 23232bd8b15fc1..9bac357a8900c3 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt
@@ -5,17 +5,30 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
+import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.R
 import com.google.chip.chiptool.setuppayloadscanner.BarcodeFragment
 import com.google.chip.chiptool.setuppayloadscanner.CHIPDeviceInfo
 import com.google.chip.chiptool.util.FragmentUtil
 import kotlinx.android.synthetic.main.address_commissioning_fragment.addressEditText
 import kotlinx.android.synthetic.main.address_commissioning_fragment.commissionBtn
+import kotlinx.android.synthetic.main.address_commissioning_fragment.discoverBtn
+import kotlinx.android.synthetic.main.address_commissioning_fragment.discoverListSpinner
 import kotlinx.android.synthetic.main.address_commissioning_fragment.discriminatorEditText
 import kotlinx.android.synthetic.main.address_commissioning_fragment.pincodeEditText
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 class AddressCommissioningFragment : Fragment() {
+  private val ipAddressList = ArrayList<String>()
+  private val scope = CoroutineScope(Dispatchers.Main + Job())
+
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -45,6 +58,39 @@ class AddressCommissioningFragment : Fragment() {
         )
       )
     }
+
+    discoverBtn.setOnClickListener { _ ->
+      discoverBtn.isEnabled = false
+      val deviceController = ChipClient.getDeviceController(requireContext())
+      deviceController.discoverCommissionableNodes()
+      scope.launch {
+        delay(7000)
+        updateSpinner()
+        discoverBtn.isEnabled = true
+      }
+    }
+  }
+
+  private fun updateSpinner() {
+    val deviceController = ChipClient.getDeviceController(requireContext())
+    for(i in 0..10) {
+      val device = deviceController.getDiscoveredDevice(i) ?: break
+      ipAddressList.add("${device.ipAddress}, ${device.discriminator}")
+    }
+    requireActivity().runOnUiThread {
+      discoverListSpinner.adapter =
+        ArrayAdapter(requireContext(), android.R.layout.simple_spinner_dropdown_item, ipAddressList)
+      discoverListSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+          val address = ipAddressList[position].split(",")[0].trim()
+          val discriminator = ipAddressList[position].split(",")[1].trim()
+          addressEditText.setText(address)
+          discriminatorEditText.setText(discriminator)
+        }
+
+        override fun onNothingSelected(parent: AdapterView<*>) {}
+      }
+    }
   }
 
   companion object {
diff --git a/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml
index 21fafbd3ff9edf..4ff57d1767d7ed 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml
@@ -16,6 +16,7 @@
       app:layout_constraintTop_toTopOf="parent" />
 
   <androidx.constraintlayout.helper.widget.Flow
+      android:id="@+id/address_commissioning_fragment_flow"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       app:constraint_referenced_ids="addressLabel,addressEditText,discriminatorLabel,discriminatorEditText,pincodeLabel,pincodeEditText"
@@ -74,6 +75,28 @@
       android:inputType="number"
       android:text="@string/default_pincode" />
 
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:layout_margin="16dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/address_commissioning_fragment_flow">
+
+    <Button
+        android:id="@+id/discoverBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dns_discover_btn_text"/>
+
+    <Spinner
+        android:id="@+id/discoverListSpinner"
+        android:padding="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+  </LinearLayout>
   <Button
       android:id="@+id/commissionBtn"
       android:layout_width="wrap_content"
diff --git a/src/android/CHIPTool/app/src/main/res/layout/multi_admin_client_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/multi_admin_client_fragment.xml
index fb872bd9b8022f..95e5458f8164b0 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/multi_admin_client_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/multi_admin_client_fragment.xml
@@ -14,6 +14,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
+    <EditText
+        android:id="@+id/timeoutEd"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/addressUpdateFragment"
+        android:inputType="number"
+        android:textSize="20sp"
+        android:hint="@string/enter_commissioning_timeout_hint_text"/>
+
     <Button
         android:id="@+id/basicCommissioningMethodBtn"
         android:layout_width="0dp"
@@ -22,7 +34,7 @@
         android:text="@string/basic_commissioning_method_btn_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/addressUpdateFragment"/>
+        app:layout_constraintTop_toBottomOf="@id/timeoutEd"/>
 
     <EditText
         android:id="@+id/discriminatorEd"
diff --git a/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
index 89b4ea62e2316b..3098a324158270 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
@@ -1,103 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/scanQrBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/scan_qr_code_btn_text" />
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <Button
-        android:id="@+id/provisionWiFiCredentialsBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/provision_wifi_credentials_btn_text" />
+        <Button
+            android:id="@+id/scanQrBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/scan_qr_code_btn_text" />
 
-    <Button
-        android:id="@+id/provisionThreadCredentialsBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/provision_thread_credentials_btn_text" />
+        <Button
+            android:id="@+id/provisionWiFiCredentialsBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/provision_wifi_credentials_btn_text" />
 
-    <Button
-        android:id="@+id/provisionCustomFlowBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/provision_custom_flow_btn_text" />
+        <Button
+            android:id="@+id/provisionThreadCredentialsBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/provision_thread_credentials_btn_text" />
 
-    <Button
-        android:id="@+id/onOffClusterBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/on_off_level_btn_text" />
+        <Button
+            android:id="@+id/provisionCustomFlowBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/provision_custom_flow_btn_text" />
 
-    <Button
-        android:id="@+id/sensorClustersBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/sensor_client_btn_text" />
+        <Button
+            android:id="@+id/onOffClusterBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/on_off_level_btn_text" />
 
-    <Button
-        android:id="@+id/multiAdminClusterBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/multi_admin_client_btn_text" />
+        <Button
+            android:id="@+id/sensorClustersBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/sensor_client_btn_text" />
 
-    <Button
-        android:id="@+id/opCredClustersBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/op_cred_client_btn_text" />
+        <Button
+            android:id="@+id/multiAdminClusterBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/multi_admin_client_btn_text" />
 
-    <Button
-        android:id="@+id/basicClusterBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/basic_cluster_btn_text" />
+        <Button
+            android:id="@+id/opCredClustersBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/op_cred_client_btn_text" />
 
-    <Button
-        android:id="@+id/attestationTestBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:visibility="gone"
-        android:text="@string/attestation_test_btn_text" />
+        <Button
+            android:id="@+id/basicClusterBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/basic_cluster_btn_text" />
 
-    <Button
-        android:id="@+id/wildcardBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/wildcard_btn_text" />
+        <Button
+            android:id="@+id/attestationTestBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="gone"
+            android:text="@string/attestation_test_btn_text" />
 
-    <Button
-        android:id="@+id/clusterInteractionBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/cluster_interaction_tool" />
+        <Button
+            android:id="@+id/wildcardBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/wildcard_btn_text" />
 
-</LinearLayout>
+        <Button
+            android:id="@+id/clusterInteractionBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/cluster_interaction_tool" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/src/android/CHIPTool/app/src/main/res/values/strings.xml b/src/android/CHIPTool/app/src/main/res/values/strings.xml
index 657b22dc46a9e1..ada15249f6dca6 100644
--- a/src/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/src/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="enter_discriminator_label_text">Discriminator</string>
     <string name="enter_pincode_label_text">Pincode</string>
     <string name="commission_btn_text">Commission</string>
+    <string name="dns_discover_btn_text">Discover</string>
 
     <string name="send_command_on_btn_text">On</string>
     <string name="send_command_off_btn_text">Off</string>
@@ -94,6 +95,7 @@
     <string name="wildcard_btn_text">Wildcard</string>
 
     <string name="multi_admin_client_btn_text">Multi-admin cluster</string>
+    <string name="enter_commissioning_timeout_hint_text">Enter Commissioning timeout</string>
     <string name="basic_commissioning_method_btn_text">Basic Commissioning Method</string>
     <string name="enter_discriminator_hint_text">Enter Discriminator</string>
     <string name="enter_setup_pin_code_hint_text">Enter Setup PIN Code</string>
diff --git a/src/app/AttributeAccessInterface.h b/src/app/AttributeAccessInterface.h
index 1670c35ba75dd1..fb308263e40c18 100644
--- a/src/app/AttributeAccessInterface.h
+++ b/src/app/AttributeAccessInterface.h
@@ -264,7 +264,7 @@ class AttributeValueEncoder
         CHIP_ERROR err = EncodeAttributeReportIB(std::forward<Ts>(aArgs)...);
         if (err != CHIP_NO_ERROR)
         {
-            // For list chunking, ReportEngine should not rollback the buffer when CHIP_NO_MEMORY or similar error occurred.
+            // For list chunking, ReportEngine should not rollback the buffer when CHIP_ERROR_NO_MEMORY or similar error occurred.
             // However, the error might be raised in the middle of encoding procedure, then the buffer may contain partial data,
             // unclosed containers etc. This line clears all possible partial data and makes EncodeListItem is atomic.
             mAttributeReportIBsBuilder.Rollback(backup);
diff --git a/src/app/BufferedReadCallback.h b/src/app/BufferedReadCallback.h
index 77159d7aece042..98ff1c6d3709bf 100644
--- a/src/app/BufferedReadCallback.h
+++ b/src/app/BufferedReadCallback.h
@@ -81,6 +81,11 @@ class BufferedReadCallback : public ReadClient::Callback
         mCallback.OnSubscriptionEstablished(aSubscriptionId);
     }
 
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override
+    {
+        mCallback.OnResubscriptionAttempt(aTerminationCause, aNextResubscribeIntervalMsec);
+    }
+
     void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override
     {
         return mCallback.OnDeallocatePaths(std::move(aReadPrepareParams));
diff --git a/src/app/CASEClient.cpp b/src/app/CASEClient.cpp
index de0f3da6380b4d..31564a43d904d4 100644
--- a/src/app/CASEClient.cpp
+++ b/src/app/CASEClient.cpp
@@ -30,6 +30,8 @@ CHIP_ERROR CASEClient::EstablishSession(PeerId peer, const Transport::PeerAddres
                                         const ReliableMessageProtocolConfig & remoteMRPConfig,
                                         SessionEstablishmentDelegate * delegate)
 {
+    VerifyOrReturnError(mInitParams.fabricTable != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
     // Create a UnauthenticatedSession for CASE pairing.
     Optional<SessionHandle> session = mInitParams.sessionManager->CreateUnauthenticatedSession(peerAddress, remoteMRPConfig);
     VerifyOrReturnError(session.HasValue(), CHIP_ERROR_NO_MEMORY);
@@ -44,9 +46,9 @@ CHIP_ERROR CASEClient::EstablishSession(PeerId peer, const Transport::PeerAddres
     VerifyOrReturnError(exchange != nullptr, CHIP_ERROR_INTERNAL);
 
     mCASESession.SetGroupDataProvider(mInitParams.groupDataProvider);
-    ReturnErrorOnFailure(mCASESession.EstablishSession(*mInitParams.sessionManager, mInitParams.fabricInfo, peer.GetNodeId(),
-                                                       exchange, mInitParams.sessionResumptionStorage, delegate,
-                                                       mInitParams.mrpLocalConfig));
+    ReturnErrorOnFailure(mCASESession.EstablishSession(
+        *mInitParams.sessionManager, mInitParams.fabricTable, ScopedNodeId{ peer.GetNodeId(), mInitParams.fabricIndex }, exchange,
+        mInitParams.sessionResumptionStorage, mInitParams.certificateValidityPolicy, delegate, mInitParams.mrpLocalConfig));
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/app/CASEClient.h b/src/app/CASEClient.h
index e47f664a635805..42fd3192343e5e 100644
--- a/src/app/CASEClient.h
+++ b/src/app/CASEClient.h
@@ -28,11 +28,13 @@ class CASEClient;
 
 struct CASEClientInitParams
 {
-    SessionManager * sessionManager                     = nullptr;
-    SessionResumptionStorage * sessionResumptionStorage = nullptr;
-    Messaging::ExchangeManager * exchangeMgr            = nullptr;
-    FabricInfo * fabricInfo                             = nullptr;
-    Credentials::GroupDataProvider * groupDataProvider  = nullptr;
+    SessionManager * sessionManager                                    = nullptr;
+    SessionResumptionStorage * sessionResumptionStorage                = nullptr;
+    Credentials::CertificateValidityPolicy * certificateValidityPolicy = nullptr;
+    Messaging::ExchangeManager * exchangeMgr                           = nullptr;
+    FabricTable * fabricTable                                          = nullptr;
+    FabricIndex fabricIndex                                            = kUndefinedFabricIndex;
+    Credentials::GroupDataProvider * groupDataProvider                 = nullptr;
 
     Optional<ReliableMessageProtocolConfig> mrpLocalConfig = Optional<ReliableMessageProtocolConfig>::Missing();
 };
diff --git a/src/app/ClusterStateCache.cpp b/src/app/ClusterStateCache.cpp
index e7aaca424055fe..d6cd9645667b6d 100644
--- a/src/app/ClusterStateCache.cpp
+++ b/src/app/ClusterStateCache.cpp
@@ -209,7 +209,7 @@ void ClusterStateCache::OnReportEnd()
     mCallback.OnReportEnd();
 }
 
-CHIP_ERROR ClusterStateCache::Get(const ConcreteAttributePath & path, TLV::TLVReader & reader)
+CHIP_ERROR ClusterStateCache::Get(const ConcreteAttributePath & path, TLV::TLVReader & reader) const
 {
     CHIP_ERROR err;
     auto attributeState = GetAttributeState(path.mEndpointId, path.mClusterId, path.mAttributeId, err);
@@ -224,7 +224,7 @@ CHIP_ERROR ClusterStateCache::Get(const ConcreteAttributePath & path, TLV::TLVRe
     return reader.Next();
 }
 
-CHIP_ERROR ClusterStateCache::Get(EventNumber eventNumber, TLV::TLVReader & reader)
+CHIP_ERROR ClusterStateCache::Get(EventNumber eventNumber, TLV::TLVReader & reader) const
 {
     CHIP_ERROR err;
 
@@ -240,7 +240,7 @@ CHIP_ERROR ClusterStateCache::Get(EventNumber eventNumber, TLV::TLVReader & read
     return CHIP_NO_ERROR;
 }
 
-ClusterStateCache::EndpointState * ClusterStateCache::GetEndpointState(EndpointId endpointId, CHIP_ERROR & err)
+const ClusterStateCache::EndpointState * ClusterStateCache::GetEndpointState(EndpointId endpointId, CHIP_ERROR & err) const
 {
     auto endpointIter = mCache.find(endpointId);
     if (endpointIter == mCache.end())
@@ -253,7 +253,8 @@ ClusterStateCache::EndpointState * ClusterStateCache::GetEndpointState(EndpointI
     return &endpointIter->second;
 }
 
-ClusterStateCache::ClusterState * ClusterStateCache::GetClusterState(EndpointId endpointId, ClusterId clusterId, CHIP_ERROR & err)
+const ClusterStateCache::ClusterState * ClusterStateCache::GetClusterState(EndpointId endpointId, ClusterId clusterId,
+                                                                           CHIP_ERROR & err) const
 {
     auto endpointState = GetEndpointState(endpointId, err);
     if (err != CHIP_NO_ERROR)
@@ -273,7 +274,7 @@ ClusterStateCache::ClusterState * ClusterStateCache::GetClusterState(EndpointId
 }
 
 const ClusterStateCache::AttributeState * ClusterStateCache::GetAttributeState(EndpointId endpointId, ClusterId clusterId,
-                                                                               AttributeId attributeId, CHIP_ERROR & err)
+                                                                               AttributeId attributeId, CHIP_ERROR & err) const
 {
     auto clusterState = GetClusterState(endpointId, clusterId, err);
     if (err != CHIP_NO_ERROR)
@@ -292,7 +293,7 @@ const ClusterStateCache::AttributeState * ClusterStateCache::GetAttributeState(E
     return &attributeState->second;
 }
 
-const ClusterStateCache::EventData * ClusterStateCache::GetEventData(EventNumber eventNumber, CHIP_ERROR & err)
+const ClusterStateCache::EventData * ClusterStateCache::GetEventData(EventNumber eventNumber, CHIP_ERROR & err) const
 {
     EventData compareKey;
 
@@ -338,7 +339,7 @@ void ClusterStateCache::OnAttributeData(const ConcreteDataAttributePath & aPath,
     mCallback.OnAttributeData(aPath, apData ? &dataSnapshot : nullptr, aStatus);
 }
 
-CHIP_ERROR ClusterStateCache::GetVersion(const ConcreteClusterPath & aPath, Optional<DataVersion> & aVersion)
+CHIP_ERROR ClusterStateCache::GetVersion(const ConcreteClusterPath & aPath, Optional<DataVersion> & aVersion) const
 {
     VerifyOrReturnError(aPath.IsValidConcreteClusterPath(), CHIP_ERROR_INVALID_ARGUMENT);
     CHIP_ERROR err;
@@ -362,7 +363,7 @@ void ClusterStateCache::OnEventData(const EventHeader & aEventHeader, TLV::TLVRe
     mCallback.OnEventData(aEventHeader, apData ? &dataSnapshot : nullptr, apStatus);
 }
 
-CHIP_ERROR ClusterStateCache::GetStatus(const ConcreteAttributePath & path, StatusIB & status)
+CHIP_ERROR ClusterStateCache::GetStatus(const ConcreteAttributePath & path, StatusIB & status) const
 {
     CHIP_ERROR err;
 
@@ -378,7 +379,7 @@ CHIP_ERROR ClusterStateCache::GetStatus(const ConcreteAttributePath & path, Stat
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ClusterStateCache::GetStatus(const ConcreteEventPath & path, StatusIB & status)
+CHIP_ERROR ClusterStateCache::GetStatus(const ConcreteEventPath & path, StatusIB & status) const
 {
     auto statusIter = mEventStatusCache.find(path);
     if (statusIter == mEventStatusCache.end())
@@ -390,7 +391,7 @@ CHIP_ERROR ClusterStateCache::GetStatus(const ConcreteEventPath & path, StatusIB
     return CHIP_NO_ERROR;
 }
 
-void ClusterStateCache::GetSortedFilters(std::vector<std::pair<DataVersionFilter, size_t>> & aVector)
+void ClusterStateCache::GetSortedFilters(std::vector<std::pair<DataVersionFilter, size_t>> & aVector) const
 {
     for (auto const & endpointIter : mCache)
     {
diff --git a/src/app/ClusterStateCache.h b/src/app/ClusterStateCache.h
index be6308aee1dadd..b16fd58b1ee012 100644
--- a/src/app/ClusterStateCache.h
+++ b/src/app/ClusterStateCache.h
@@ -129,7 +129,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *
      */
     template <typename AttributeObjectTypeT>
-    CHIP_ERROR Get(const ConcreteAttributePath & path, typename AttributeObjectTypeT::DecodableType & value)
+    CHIP_ERROR Get(const ConcreteAttributePath & path, typename AttributeObjectTypeT::DecodableType & value) const
     {
         TLV::TLVReader reader;
 
@@ -152,7 +152,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *      - If data exists in the cache instead of status, CHIP_ERROR_INVALID_ARGUMENT shall be returned.
      *
      */
-    CHIP_ERROR GetStatus(const ConcreteAttributePath & path, StatusIB & status);
+    CHIP_ERROR GetStatus(const ConcreteAttributePath & path, StatusIB & status) const;
 
     /*
      * Encapsulates a StatusIB and a ConcreteAttributePath pair.
@@ -184,7 +184,8 @@ class ClusterStateCache : protected ReadClient::Callback
      *
      */
     template <typename ClusterObjectTypeT>
-    CHIP_ERROR Get(EndpointId endpointId, ClusterId clusterId, ClusterObjectTypeT & value, std::list<AttributeStatus> & statusList)
+    CHIP_ERROR Get(EndpointId endpointId, ClusterId clusterId, ClusterObjectTypeT & value,
+                   std::list<AttributeStatus> & statusList) const
     {
         statusList.clear();
 
@@ -228,7 +229,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *        shall be returned from this call instead. The actual StatusIB can be retrieved using the GetStatus() API above.
      *
      */
-    CHIP_ERROR Get(const ConcreteAttributePath & path, TLV::TLVReader & reader);
+    CHIP_ERROR Get(const ConcreteAttributePath & path, TLV::TLVReader & reader) const;
 
     /*
      * Retrieve the data version for the given cluster.  If there is no data for the specified path in the cache,
@@ -236,7 +237,7 @@ class ClusterStateCache : protected ReadClient::Callback
      * current data version for the cluster (which may have no value if we don't have a known data version
      * for it, for example because none of our paths were wildcards that covered the whole cluster).
      */
-    CHIP_ERROR GetVersion(const ConcreteClusterPath & path, Optional<DataVersion> & aVersion);
+    CHIP_ERROR GetVersion(const ConcreteClusterPath & path, Optional<DataVersion> & aVersion) const;
 
     /*
      * Get highest received event number.
@@ -271,7 +272,7 @@ class ClusterStateCache : protected ReadClient::Callback
      */
 
     template <typename EventObjectTypeT>
-    CHIP_ERROR Get(EventNumber eventNumber, EventObjectTypeT & value)
+    CHIP_ERROR Get(EventNumber eventNumber, EventObjectTypeT & value) const
     {
         TLV::TLVReader reader;
         CHIP_ERROR err;
@@ -297,7 +298,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *        shall be returned.
      *
      */
-    CHIP_ERROR Get(EventNumber eventNumber, TLV::TLVReader & reader);
+    CHIP_ERROR Get(EventNumber eventNumber, TLV::TLVReader & reader) const;
 
     /*
      * Retrieve the StatusIB for a specific event from the event status cache (if one exists).
@@ -308,7 +309,7 @@ class ClusterStateCache : protected ReadClient::Callback
      * NOTE: Receipt of a StatusIB does not affect any pre-existing or future event data entries in the cache (and vice-versa).
      *
      */
-    CHIP_ERROR GetStatus(const ConcreteEventPath & path, StatusIB & status);
+    CHIP_ERROR GetStatus(const ConcreteEventPath & path, StatusIB & status) const;
 
     /*
      * Execute an iterator function that is called for every attribute
@@ -327,7 +328,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *
      */
     template <typename IteratorFunc>
-    CHIP_ERROR ForEachAttribute(EndpointId endpointId, ClusterId clusterId, IteratorFunc func)
+    CHIP_ERROR ForEachAttribute(EndpointId endpointId, ClusterId clusterId, IteratorFunc func) const
     {
         CHIP_ERROR err;
 
@@ -357,7 +358,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *
      */
     template <typename IteratorFunc>
-    CHIP_ERROR ForEachAttribute(ClusterId clusterId, IteratorFunc func)
+    CHIP_ERROR ForEachAttribute(ClusterId clusterId, IteratorFunc func) const
     {
         for (auto & endpointIter : mCache)
         {
@@ -390,7 +391,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *
      */
     template <typename IteratorFunc>
-    CHIP_ERROR ForEachCluster(EndpointId endpointId, IteratorFunc func)
+    CHIP_ERROR ForEachCluster(EndpointId endpointId, IteratorFunc func) const
     {
         auto endpointIter = mCache.find(endpointId);
         if (endpointIter->first == endpointId)
@@ -426,7 +427,7 @@ class ClusterStateCache : protected ReadClient::Callback
      */
     template <typename IteratorFunc>
     CHIP_ERROR ForEachEventData(IteratorFunc func, EventPathParams pathFilter = EventPathParams(),
-                                EventNumber minEventNumberFilter = 0)
+                                EventNumber minEventNumberFilter = 0) const
     {
         for (const auto & item : mEventDataCache)
         {
@@ -453,7 +454,7 @@ class ClusterStateCache : protected ReadClient::Callback
      *
      */
     template <typename IteratorFunc>
-    CHIP_ERROR ForEachEventStatus(IteratorFunc func)
+    CHIP_ERROR ForEachEventStatus(IteratorFunc func) const
     {
         for (const auto & item : mEventStatusCache)
         {
@@ -532,11 +533,12 @@ class ClusterStateCache : protected ReadClient::Callback
      *        CHIP_ERROR_KEY_NOT_FOUND shall be returned.
      *
      */
-    EndpointState * GetEndpointState(EndpointId endpointId, CHIP_ERROR & err);
-    ClusterState * GetClusterState(EndpointId endpointId, ClusterId clusterId, CHIP_ERROR & err);
-    const AttributeState * GetAttributeState(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, CHIP_ERROR & err);
+    const EndpointState * GetEndpointState(EndpointId endpointId, CHIP_ERROR & err) const;
+    const ClusterState * GetClusterState(EndpointId endpointId, ClusterId clusterId, CHIP_ERROR & err) const;
+    const AttributeState * GetAttributeState(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId,
+                                             CHIP_ERROR & err) const;
 
-    const EventData * GetEventData(EventNumber number, CHIP_ERROR & err);
+    const EventData * GetEventData(EventNumber number, CHIP_ERROR & err) const;
 
     /*
      * Updates the state of an attribute in the cache given a reader. If the reader is null, the state is updated
@@ -574,6 +576,11 @@ class ClusterStateCache : protected ReadClient::Callback
         mCallback.OnSubscriptionEstablished(aSubscriptionId);
     }
 
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override
+    {
+        mCallback.OnResubscriptionAttempt(aTerminationCause, aNextResubscribeIntervalMsec);
+    }
+
     void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override
     {
         mCallback.OnDeallocatePaths(std::move(aReadPrepareParams));
@@ -589,7 +596,7 @@ class ClusterStateCache : protected ReadClient::Callback
     // Get our list of data version filters, sorted from larges to smallest by the total size of the TLV
     // payload for the filter's cluster.  Applying filters in this order should maximize space savings
     // on the wire if not all filters can be applied.
-    void GetSortedFilters(std::vector<std::pair<DataVersionFilter, size_t>> & aVector);
+    void GetSortedFilters(std::vector<std::pair<DataVersionFilter, size_t>> & aVector) const;
 
     CHIP_ERROR GetElementTLVSize(TLV::TLVReader * apData, size_t & aSize);
 
diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp
index ea5ee0068646b8..306cd854bc2489 100644
--- a/src/app/CommandHandler.cpp
+++ b/src/app/CommandHandler.cpp
@@ -302,7 +302,7 @@ CHIP_ERROR CommandHandler::ProcessCommandDataIB(CommandDataIB::Parser & aCommand
         return AddStatus(concretePath, Protocols::InteractionModel::Status::NeedsTimedInteraction);
     }
 
-    err = aCommandElement.GetData(&commandDataReader);
+    err = aCommandElement.GetFields(&commandDataReader);
     if (CHIP_END_OF_TLV == err)
     {
         ChipLogDetail(DataManagement,
@@ -359,7 +359,7 @@ CHIP_ERROR CommandHandler::ProcessGroupCommandDataIB(CommandDataIB::Parser & aCo
     ChipLogDetail(DataManagement, "Received group command for Group=%u Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI,
                   groupId, ChipLogValueMEI(clusterId), ChipLogValueMEI(commandId));
 
-    err = aCommandElement.GetData(&commandDataReader);
+    err = aCommandElement.GetFields(&commandDataReader);
     if (CHIP_END_OF_TLV == err)
     {
         ChipLogDetail(DataManagement,
@@ -488,7 +488,7 @@ CHIP_ERROR CommandHandler::PrepareCommand(const ConcreteCommandPath & aCommandPa
     ReturnErrorOnFailure(path.Encode(aCommandPath));
     if (aStartDataStruct)
     {
-        ReturnErrorOnFailure(commandData.GetWriter()->StartContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kData)),
+        ReturnErrorOnFailure(commandData.GetWriter()->StartContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kFields)),
                                                                      TLV::kTLVType_Structure, mDataElementContainerType));
     }
     MoveToState(State::AddingCommand);
diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h
index 3c5a4c45616c11..e983e15a2feee9 100644
--- a/src/app/CommandHandler.h
+++ b/src/app/CommandHandler.h
@@ -319,7 +319,7 @@ class CommandHandler
         ReturnErrorOnFailure(PrepareCommand(path, false));
         TLV::TLVWriter * writer = GetCommandDataIBTLVWriter();
         VerifyOrReturnError(writer != nullptr, CHIP_ERROR_INCORRECT_STATE);
-        ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(to_underlying(CommandDataIB::Tag::kData)), aData));
+        ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(to_underlying(CommandDataIB::Tag::kFields)), aData));
 
         return FinishCommand(/* aEndDataStruct = */ false);
     }
diff --git a/src/app/CommandSender.cpp b/src/app/CommandSender.cpp
index 94f1ac28e96b40..1e04fb58bc75db 100644
--- a/src/app/CommandSender.cpp
+++ b/src/app/CommandSender.cpp
@@ -71,7 +71,7 @@ CHIP_ERROR CommandSender::SendCommandRequest(const SessionHandle & session, Opti
     VerifyOrReturnError(mpExchangeCtx != nullptr, CHIP_ERROR_NO_MEMORY);
     VerifyOrReturnError(!mpExchangeCtx->IsGroupExchangeContext(), CHIP_ERROR_INVALID_MESSAGE_TYPE);
 
-    mpExchangeCtx->SetResponseTimeout(timeout.ValueOr(kImMessageTimeout));
+    mpExchangeCtx->SetResponseTimeout(timeout.ValueOr(session->ComputeRoundTripTimeout(app::kExpectedIMProcessingTime)));
 
     if (mTimedInvokeTimeoutMs.HasValue())
     {
@@ -274,7 +274,7 @@ CHIP_ERROR CommandSender::ProcessInvokeResponseIB(InvokeResponseIB::Parser & aIn
             ReturnErrorOnFailure(commandPath.GetEndpointId(&endpointId));
             ReturnErrorOnFailure(commandPath.GetClusterId(&clusterId));
             ReturnErrorOnFailure(commandPath.GetCommandId(&commandId));
-            commandData.GetData(&commandDataReader);
+            commandData.GetFields(&commandDataReader);
             err             = CHIP_NO_ERROR;
             hasDataResponse = true;
         }
@@ -336,7 +336,7 @@ CHIP_ERROR CommandSender::PrepareCommand(const CommandPathParams & aCommandPathP
 
     if (aStartDataStruct)
     {
-        ReturnErrorOnFailure(invokeRequest.GetWriter()->StartContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kData)),
+        ReturnErrorOnFailure(invokeRequest.GetWriter()->StartContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kFields)),
                                                                        TLV::kTLVType_Structure, mDataElementContainerType));
     }
 
diff --git a/src/app/CommandSender.h b/src/app/CommandSender.h
index 1e9985eaf8338a..4f5ab9ac0a06de 100644
--- a/src/app/CommandSender.h
+++ b/src/app/CommandSender.h
@@ -196,7 +196,7 @@ class CommandSender final : public Messaging::ExchangeDelegate
         ReturnErrorOnFailure(PrepareCommand(aCommandPath, /* aStartDataStruct = */ false));
         TLV::TLVWriter * writer = GetCommandDataIBTLVWriter();
         VerifyOrReturnError(writer != nullptr, CHIP_ERROR_INCORRECT_STATE);
-        ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(to_underlying(CommandDataIB::Tag::kData)), aData));
+        ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(to_underlying(CommandDataIB::Tag::kFields)), aData));
         return FinishCommand(aTimedInvokeTimeoutMs);
     }
 
diff --git a/src/app/DeviceProxy.cpp b/src/app/DeviceProxy.cpp
index 8488e78f24f9f5..b3618742a55961 100644
--- a/src/app/DeviceProxy.cpp
+++ b/src/app/DeviceProxy.cpp
@@ -46,4 +46,15 @@ CHIP_ERROR DeviceProxy::SendCommands(app::CommandSender * commandObj, Optional<S
     return commandObj->SendCommandRequest(GetSecureSession().Value(), timeout);
 }
 
+CHIP_ERROR DeviceProxy::GetAttestationChallenge(ByteSpan & attestationChallenge)
+{
+    Optional<SessionHandle> secureSessionHandle;
+
+    secureSessionHandle = GetSecureSession();
+    VerifyOrReturnError(secureSessionHandle.HasValue(), CHIP_ERROR_INCORRECT_STATE);
+
+    attestationChallenge = secureSessionHandle.Value()->AsSecureSession()->GetCryptoContext().GetAttestationChallenge();
+    return CHIP_NO_ERROR;
+}
+
 } // namespace chip
diff --git a/src/app/DeviceProxy.h b/src/app/DeviceProxy.h
index 2b9bd0e67b24a7..3f4bdb89649cc7 100644
--- a/src/app/DeviceProxy.h
+++ b/src/app/DeviceProxy.h
@@ -59,6 +59,16 @@ class DLL_EXPORT DeviceProxy
 
     const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const { return mRemoteMRPConfig; }
 
+    /**
+     * @brief
+     *   This function returns the attestation challenge for the secure session.
+     *
+     * @param[out] attestationChallenge The output for the attestationChallenge
+     *
+     * @return CHIP_ERROR               CHIP_NO_ERROR on success, or CHIP_ERROR_INVALID_ARGUMENT if no secure session is active
+     */
+    virtual CHIP_ERROR GetAttestationChallenge(ByteSpan & attestationChallenge);
+
 protected:
     virtual bool IsSecureConnected() const = 0;
 
diff --git a/src/app/EventManagement.cpp b/src/app/EventManagement.cpp
index e0d4cd877cb1ec..f8bddaa83bdaf8 100644
--- a/src/app/EventManagement.cpp
+++ b/src/app/EventManagement.cpp
@@ -123,14 +123,6 @@ void EventManagement::Init(Messaging::ExchangeManager * apExchangeManager, uint3
     mpEventBuffer = apCircularEventBuffer;
     mState        = EventManagementStates::Idle;
     mBytesWritten = 0;
-
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    CHIP_ERROR err = chip::System::Mutex::Init(mAccessLock);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(EventLogging, "mutex init fails with error %s", ErrorStr(err));
-    }
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
 }
 
 CHIP_ERROR EventManagement::CopyToNextBuffer(CircularEventBuffer * apEventBuffer)
@@ -347,9 +339,6 @@ void EventManagement::CreateEventManagement(Messaging::ExchangeManager * apExcha
  */
 void EventManagement::DestroyEventManagement()
 {
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
     sInstance.mState        = EventManagementStates::Shutdown;
     sInstance.mpEventBuffer = nullptr;
     sInstance.mpExchangeMgr = nullptr;
@@ -408,17 +397,8 @@ void EventManagement::VendEventNumber()
 CHIP_ERROR EventManagement::LogEvent(EventLoggingDelegate * apDelegate, const EventOptions & aEventOptions,
                                      EventNumber & aEventNumber)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    {
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-        ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
-        VerifyOrExit(mState != EventManagementStates::Shutdown, err = CHIP_ERROR_INCORRECT_STATE);
-        err = LogEventPrivate(apDelegate, aEventOptions, aEventNumber);
-    }
-exit:
-    return err;
+    VerifyOrReturnError(mState != EventManagementStates::Shutdown, CHIP_ERROR_INCORRECT_STATE);
+    return LogEventPrivate(apDelegate, aEventOptions, aEventNumber);
 }
 
 CHIP_ERROR EventManagement::LogEventPrivate(EventLoggingDelegate * apDelegate, const EventOptions & aEventOptions,
@@ -721,10 +701,6 @@ CHIP_ERROR EventManagement::FetchEventsSince(TLVWriter & aWriter, const ObjectLi
     CircularEventBufferWrapper bufWrapper;
     EventLoadOutContext context(aWriter, PriorityLevel::Invalid, aEventMin);
 
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
     context.mSubjectDescriptor     = aSubjectDescriptor;
     context.mpInterestedEventPaths = apEventPathList;
     err                            = GetEventReader(reader, PriorityLevel::Critical, &bufWrapper);
@@ -801,10 +777,6 @@ CHIP_ERROR EventManagement::FabricRemoved(FabricIndex aFabricIndex)
     TLVReader reader;
     CircularEventBufferWrapper bufWrapper;
 
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
     ReturnErrorOnFailure(GetEventReader(reader, PriorityLevel::Critical, &bufWrapper));
     CHIP_ERROR err = TLV::Utilities::Iterate(reader, FabricRemovedCB, &aFabricIndex, recurse);
     if (err == CHIP_END_OF_TLV)
@@ -925,10 +897,6 @@ CHIP_ERROR EventManagement::EvictEvent(CHIPCircularTLVBuffer & apBuffer, void *
 
 void EventManagement::SetScheduledEventInfo(EventNumber & aEventNumber, uint32_t & aInitialWrittenEventBytes) const
 {
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
     aEventNumber              = mLastEventNumber;
     aInitialWrittenEventBytes = mBytesWritten;
 }
diff --git a/src/app/EventManagement.h b/src/app/EventManagement.h
index 235fdfe48d402c..580435ea9f770c 100644
--- a/src/app/EventManagement.h
+++ b/src/app/EventManagement.h
@@ -36,7 +36,6 @@
 #include <lib/core/CHIPCircularTLVBuffer.h>
 #include <lib/support/CHIPCounter.h>
 #include <messaging/ExchangeMgr.h>
-#include <system/SystemMutex.h>
 
 #define CHIP_CONFIG_EVENT_GLOBAL_PRIORITY PriorityLevel::Debug
 
@@ -229,18 +228,6 @@ class EventManagement
 
     static void DestroyEventManagement();
 
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    class ScopedLock
-    {
-    public:
-        ScopedLock(EventManagement & aEventManagement) : mEventManagement(aEventManagement) { mEventManagement.mAccessLock.Lock(); }
-        ~ScopedLock() { mEventManagement.mAccessLock.Unlock(); }
-
-    private:
-        EventManagement & mEventManagement;
-    };
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
     /**
      * @brief
      *   Log an event via a EventLoggingDelegate, with options.
@@ -523,9 +510,6 @@ class EventManagement
     Messaging::ExchangeManager * mpExchangeMgr = nullptr;
     EventManagementStates mState               = EventManagementStates::Shutdown;
     uint32_t mBytesWritten                     = 0;
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
-    System::Mutex mAccessLock;
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
 
     // The counter we're going to use for event numbers.
     MonotonicallyIncreasingCounter<EventNumber> * mpEventNumberCounter = nullptr;
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
index e781a7831edb03..f18f6c9e3efb95 100644
--- a/src/app/InteractionModelEngine.cpp
+++ b/src/app/InteractionModelEngine.cpp
@@ -507,7 +507,7 @@ CHIP_ERROR InteractionModelEngine::OnUnsolicitedReportData(Messaging::ExchangeCo
 
     for (auto * readClient = mpActiveReadClientList; readClient != nullptr; readClient = readClient->GetNextClient())
     {
-        if (!readClient->IsSubscriptionIdle())
+        if (!readClient->IsSubscriptionActive())
         {
             continue;
         }
diff --git a/src/app/InteractionModelTimeout.h b/src/app/InteractionModelTimeout.h
index d903c7ef37fa65..d2b1e2b567a554 100644
--- a/src/app/InteractionModelTimeout.h
+++ b/src/app/InteractionModelTimeout.h
@@ -18,11 +18,15 @@
 #pragma once
 
 #include <system/SystemClock.h>
+#include <transport/Session.h>
+#include <transport/SessionHandle.h>
 
 namespace chip {
 namespace app {
 
-static constexpr System::Clock::Timeout kImMessageTimeout = System::Clock::Seconds16(12);
+// This is an expected upper bound of time-to-first-byte for IM transactions, the actual processing time should never exceed this
+// value unless specified elsewhere (e.g. async command handling for some clusters).
+static constexpr System::Clock::Timeout kExpectedIMProcessingTime = System::Clock::Seconds16(2);
 
 } // namespace app
 } // namespace chip
diff --git a/src/app/MessageDef/ArrayParser.cpp b/src/app/MessageDef/ArrayParser.cpp
index e7356c20a6eb02..8f5980afc43e34 100644
--- a/src/app/MessageDef/ArrayParser.cpp
+++ b/src/app/MessageDef/ArrayParser.cpp
@@ -24,8 +24,7 @@ CHIP_ERROR ArrayParser::Init(const TLV::TLVReader & aReader)
 {
     mReader.Init(aReader);
     VerifyOrReturnError(TLV::kTLVType_Array == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return mReader.EnterContainer(mOuterContainerType);
 }
 } // namespace app
 } // namespace chip
diff --git a/src/app/MessageDef/AttributeDataIB.cpp b/src/app/MessageDef/AttributeDataIB.cpp
index 072b5671ad5059..e2699285ec02db 100644
--- a/src/app/MessageDef/AttributeDataIB.cpp
+++ b/src/app/MessageDef/AttributeDataIB.cpp
@@ -35,7 +35,7 @@ AttributeDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
 
     if (aDepth == 0)
     {
-        PRETTY_PRINT("\tData = ");
+        PRETTY_PRINT("Data = ");
     }
     else
     {
@@ -93,7 +93,7 @@ AttributeDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
     }
 
     case TLV::kTLVType_UTF8String: {
-        char value_s[256];
+        char value_s[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
 
         err = aReader.GetString(value_s, sizeof(value_s));
         VerifyOrReturnError(err == CHIP_NO_ERROR || err == CHIP_ERROR_BUFFER_TOO_SMALL, err);
@@ -111,7 +111,7 @@ AttributeDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
     }
 
     case TLV::kTLVType_ByteString: {
-        uint8_t value_b[256];
+        uint8_t value_b[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
         uint32_t len, readerLen;
 
         readerLen = aReader.GetLength();
@@ -187,7 +187,7 @@ AttributeDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
 CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("AttributeDataIB =");
@@ -207,8 +207,8 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kDataVersion):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kDataVersion))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kDataVersion));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kDataVersion))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kDataVersion));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -221,8 +221,8 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kPath):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPath));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPath));
             {
                 AttributePathIB::Parser path;
                 ReturnErrorOnFailure(path.Init(reader));
@@ -234,8 +234,8 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kData):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kData));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kData));
 
             PRETTY_PRINT_INCDEPTH();
             ReturnErrorOnFailure(ParseData(reader, 0));
@@ -247,26 +247,18 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const
         }
     }
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
         // check for required fields:
-        const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kData));
+        const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kData));
 
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT;
-        }
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -274,8 +266,7 @@ CHIP_ERROR AttributeDataIB::Parser::GetPath(AttributePathIB::Parser * const apPa
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kPath)), reader));
-    ReturnErrorOnFailure(apPath->Init(reader));
-    return CHIP_NO_ERROR;
+    return apPath->Init(reader);
 }
 
 CHIP_ERROR AttributeDataIB::Parser::GetDataVersion(chip::DataVersion * const apVersion) const
diff --git a/src/app/MessageDef/AttributeDataIBs.cpp b/src/app/MessageDef/AttributeDataIBs.cpp
index 53dba2d517a38b..fdb9f57f6b948b 100644
--- a/src/app/MessageDef/AttributeDataIBs.cpp
+++ b/src/app/MessageDef/AttributeDataIBs.cpp
@@ -40,7 +40,7 @@ namespace app {
 CHIP_ERROR AttributeDataIBs::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err        = CHIP_NO_ERROR;
-    size_t NumDataElement = 0;
+    size_t numDataElement = 0;
     chip::TLV::TLVReader reader;
 
     PRETTY_PRINT("AttributeDataIBs =");
@@ -51,41 +51,35 @@ CHIP_ERROR AttributeDataIBs::Parser::CheckSchemaValidity() const
 
     while (CHIP_NO_ERROR == (err = reader.Next()))
     {
-        VerifyOrExit(chip::TLV::AnonymousTag() == reader.GetTag(), err = CHIP_ERROR_INVALID_TLV_TAG);
-        VerifyOrExit(chip::TLV::kTLVType_Structure == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
+        VerifyOrReturnError(TLV::AnonymousTag() == reader.GetTag(), CHIP_ERROR_INVALID_TLV_TAG);
+        VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
         {
             AttributeDataIB::Parser data;
-            err = data.Init(reader);
-            SuccessOrExit(err);
+            ReturnErrorOnFailure(data.Init(reader));
 
             PRETTY_PRINT_INCDEPTH();
-            err = data.CheckSchemaValidity();
-            SuccessOrExit(err);
+            ReturnErrorOnFailure(data.CheckSchemaValidity());
             PRETTY_PRINT_DECDEPTH();
         }
 
-        ++NumDataElement;
+        ++numDataElement;
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
         // if we have at least one data element
-        if (NumDataElement > 0)
+        if (numDataElement > 0)
         {
             err = CHIP_NO_ERROR;
         }
     }
-    SuccessOrExit(err);
-    err = reader.ExitContainer(mOuterContainerType);
-
-exit:
-
-    return err;
+    ReturnErrorOnFailure(err);
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/AttributePathIB.cpp b/src/app/MessageDef/AttributePathIB.cpp
index c8fbb03e67a7a2..6750471d849a0e 100644
--- a/src/app/MessageDef/AttributePathIB.cpp
+++ b/src/app/MessageDef/AttributePathIB.cpp
@@ -33,7 +33,7 @@ namespace app {
 CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("AttributePathIB =");
@@ -53,8 +53,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kEnableTagCompression):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEnableTagCompression))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEnableTagCompression));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEnableTagCompression))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEnableTagCompression));
 #if CHIP_DETAIL_LOGGING
             {
                 bool enableTagCompression;
@@ -66,8 +66,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
         case to_underlying(Tag::kNode):
             // check if this tag has appeared before
 
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kNode))), err = CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kNode));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kNode))), err = CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kNode));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -80,8 +80,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEndpoint):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEndpoint));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEndpoint));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
@@ -93,8 +93,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kCluster):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCluster))), err = CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kCluster));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCluster))), err = CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kCluster));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -107,8 +107,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kAttribute):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kAttribute))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kAttribute));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kAttribute))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kAttribute));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
@@ -120,8 +120,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kListIndex):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kListIndex))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kListIndex));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kListIndex))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kListIndex));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType() || TLV::kTLVType_Null == reader.GetType(),
                                 CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
@@ -149,10 +149,10 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
-        if ((TagPresenceMask & (1 << to_underlying(Tag::kAttribute))) == 0 &&
-            (TagPresenceMask & (1 << to_underlying(Tag::kListIndex))) != 0)
+        if ((tagPresenceMask & (1 << to_underlying(Tag::kAttribute))) == 0 &&
+            (tagPresenceMask & (1 << to_underlying(Tag::kListIndex))) != 0)
         {
-            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
         }
         else
         {
@@ -161,8 +161,7 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -215,7 +214,7 @@ CHIP_ERROR AttributePathIB::Parser::GetListIndex(ConcreteDataAttributePath & aAt
         else
         {
             // TODO: Add ListOperation::ReplaceItem support. (Attribute path with valid list index)
-            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
         }
     }
     else if (CHIP_END_OF_TLV == err)
diff --git a/src/app/MessageDef/AttributePathIBs.cpp b/src/app/MessageDef/AttributePathIBs.cpp
index b3f824d6ca25c7..4a04dc0e47be0e 100644
--- a/src/app/MessageDef/AttributePathIBs.cpp
+++ b/src/app/MessageDef/AttributePathIBs.cpp
@@ -68,8 +68,7 @@ CHIP_ERROR AttributePathIBs::Parser::CheckSchemaValidity() const
         }
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/AttributeReportIB.cpp b/src/app/MessageDef/AttributeReportIB.cpp
index 40add8b660cdea..cf8671bc19c07e 100644
--- a/src/app/MessageDef/AttributeReportIB.cpp
+++ b/src/app/MessageDef/AttributeReportIB.cpp
@@ -32,7 +32,7 @@ namespace app {
 CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("AttributeReportIB =");
@@ -52,8 +52,8 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kAttributeStatus):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kAttributeStatus))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kAttributeStatus));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kAttributeStatus))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kAttributeStatus));
             {
                 AttributeStatusIB::Parser attributeStatus;
                 ReturnErrorOnFailure(attributeStatus.Init(reader));
@@ -65,8 +65,8 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kAttributeData):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kAttributeData))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kAttributeData));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kAttributeData))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kAttributeData));
             {
                 AttributeDataIB::Parser attributeData;
                 ReturnErrorOnFailure(attributeData.Init(reader));
@@ -83,7 +83,7 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
@@ -91,15 +91,15 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const
         const int CheckDataField   = 1 << to_underlying(Tag::kAttributeData);
         const int CheckStatusField = (1 << to_underlying(Tag::kAttributeStatus));
 
-        if ((TagPresenceMask & CheckDataField) == CheckDataField && (TagPresenceMask & CheckStatusField) == CheckStatusField)
+        if ((tagPresenceMask & CheckDataField) == CheckDataField && (tagPresenceMask & CheckStatusField) == CheckStatusField)
         {
             // kAttributeData and kAttributeStatus both exist
-            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE;
+            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB;
         }
-        else if ((TagPresenceMask & CheckDataField) != CheckDataField && (TagPresenceMask & CheckStatusField) != CheckStatusField)
+        else if ((tagPresenceMask & CheckDataField) != CheckDataField && (tagPresenceMask & CheckStatusField) != CheckStatusField)
         {
             // kPath and kErrorStatus not exist
-            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE;
+            err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB;
         }
         else
         {
@@ -108,8 +108,7 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -117,16 +116,14 @@ CHIP_ERROR AttributeReportIB::Parser::GetAttributeStatus(AttributeStatusIB::Pars
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kAttributeStatus)), reader));
-    ReturnErrorOnFailure(apAttributeStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apAttributeStatus->Init(reader);
 }
 
 CHIP_ERROR AttributeReportIB::Parser::GetAttributeData(AttributeDataIB::Parser * const apAttributeData) const
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kAttributeData)), reader));
-    ReturnErrorOnFailure(apAttributeData->Init(reader));
-    return CHIP_NO_ERROR;
+    return apAttributeData->Init(reader);
 }
 
 AttributeStatusIB::Builder & AttributeReportIB::Builder::CreateAttributeStatus()
diff --git a/src/app/MessageDef/AttributeReportIBs.cpp b/src/app/MessageDef/AttributeReportIBs.cpp
index 2d231b8e004968..83b7b634416b50 100644
--- a/src/app/MessageDef/AttributeReportIBs.cpp
+++ b/src/app/MessageDef/AttributeReportIBs.cpp
@@ -57,7 +57,7 @@ CHIP_ERROR AttributeReportIBs::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
@@ -65,8 +65,7 @@ CHIP_ERROR AttributeReportIBs::Parser::CheckSchemaValidity() const
         err = CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/AttributeStatusIB.cpp b/src/app/MessageDef/AttributeStatusIB.cpp
index 9a3bf1ee980dc0..8b8fa5d87b45b2 100644
--- a/src/app/MessageDef/AttributeStatusIB.cpp
+++ b/src/app/MessageDef/AttributeStatusIB.cpp
@@ -31,7 +31,7 @@ namespace app {
 CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("AttributeStatusIB =");
@@ -51,8 +51,8 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kPath):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPath));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPath));
             {
                 AttributePathIB::Parser path;
                 ReturnErrorOnFailure(path.Init(reader));
@@ -64,8 +64,8 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kErrorStatus):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus));
             {
                 StatusIB::Parser errorStatus;
                 ReturnErrorOnFailure(errorStatus.Init(reader));
@@ -82,21 +82,16 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus));
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -104,16 +99,14 @@ CHIP_ERROR AttributeStatusIB::Parser::GetPath(AttributePathIB::Parser * const ap
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kPath)), reader));
-    ReturnErrorOnFailure(apPath->Init(reader));
-    return CHIP_NO_ERROR;
+    return apPath->Init(reader);
 }
 
 CHIP_ERROR AttributeStatusIB::Parser::GetErrorStatus(StatusIB::Parser * const apErrorStatus) const
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kErrorStatus)), reader));
-    ReturnErrorOnFailure(apErrorStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apErrorStatus->Init(reader);
 }
 
 AttributePathIB::Builder & AttributeStatusIB::Builder::CreatePath()
diff --git a/src/app/MessageDef/AttributeStatusIBs.cpp b/src/app/MessageDef/AttributeStatusIBs.cpp
index f9d4de4ed1b223..e07e277f899c36 100644
--- a/src/app/MessageDef/AttributeStatusIBs.cpp
+++ b/src/app/MessageDef/AttributeStatusIBs.cpp
@@ -73,25 +73,14 @@ CHIP_ERROR AttributeStatusIBs::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
-        // if we have at least one data element
-        if (NumAttributeStatus > 0)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        // NOTE: temporarily disable this check, to allow test to continue
-        else
-        {
-            ChipLogError(DataManagement, "PROTOCOL ERROR: Empty attribute statuses");
-            err = CHIP_NO_ERROR;
-        }
+        err = CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif
 }; // namespace app
diff --git a/src/app/MessageDef/ClusterPathIB.cpp b/src/app/MessageDef/ClusterPathIB.cpp
index a7105263dc5e9b..d92efbb7decce6 100644
--- a/src/app/MessageDef/ClusterPathIB.cpp
+++ b/src/app/MessageDef/ClusterPathIB.cpp
@@ -101,16 +101,9 @@ CHIP_ERROR ClusterPathIB::Parser::CheckSchemaValidity() const
     if (CHIP_END_OF_TLV == err)
     {
         // check for required fields:
-        const int RequiredFields = (1 << to_underlying(Tag::kCluster));
+        const int requiredFields = (1 << to_underlying(Tag::kCluster));
 
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB;
-        }
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB;
     }
 
     ReturnErrorOnFailure(err);
diff --git a/src/app/MessageDef/CommandDataIB.cpp b/src/app/MessageDef/CommandDataIB.cpp
index 5f24d1c828da2a..84b7c7bec9ae6e 100644
--- a/src/app/MessageDef/CommandDataIB.cpp
+++ b/src/app/MessageDef/CommandDataIB.cpp
@@ -29,13 +29,13 @@
 namespace chip {
 namespace app {
 CHIP_ERROR
-CommandDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
+CommandDataIB::Parser::ParseFields(TLV::TLVReader & aReader, int aDepth) const
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     if (aDepth == 0)
     {
-        PRETTY_PRINT("\tCommandData = ");
+        PRETTY_PRINT("\tCommandFields = ");
     }
     else
     {
@@ -105,7 +105,7 @@ CommandDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
     }
 
     case TLV::kTLVType_UTF8String: {
-        char value_s[256];
+        char value_s[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
 
         err = aReader.GetString(value_s, sizeof(value_s));
         VerifyOrExit(err == CHIP_NO_ERROR || err == CHIP_ERROR_BUFFER_TOO_SMALL, );
@@ -123,7 +123,7 @@ CommandDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
     }
 
     case TLV::kTLVType_ByteString: {
-        uint8_t value_b[256];
+        uint8_t value_b[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
         uint32_t len, readerLen;
 
         readerLen = aReader.GetLength();
@@ -183,7 +183,7 @@ CommandDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
         {
             PRETTY_PRINT_INCDEPTH();
 
-            err = ParseData(aReader, aDepth + 1);
+            err = ParseFields(aReader, aDepth + 1);
             SuccessOrExit(err);
 
             PRETTY_PRINT_DECDEPTH();
@@ -203,7 +203,7 @@ CommandDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
 CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("CommandDataIB =");
@@ -224,8 +224,8 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kPath):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPath));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPath));
             {
                 CommandPathIB::Parser path;
                 ReturnErrorOnFailure(path.Init(reader));
@@ -235,11 +235,11 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const
             }
 
             break;
-        case to_underlying(Tag::kData):
+        case to_underlying(Tag::kFields):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kData));
-            ReturnErrorOnFailure(ParseData(reader, 0));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kFields))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kFields));
+            ReturnErrorOnFailure(ParseFields(reader, 0));
             break;
         default:
             PRETTY_PRINT("Unknown tag num %" PRIu32, tagNum);
@@ -248,25 +248,16 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = 1 << to_underlying(Tag::kPath);
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE;
-        }
+        const int requiredFields = 1 << to_underlying(Tag::kPath);
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -274,13 +265,12 @@ CHIP_ERROR CommandDataIB::Parser::GetPath(CommandPathIB::Parser * const apPath)
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kPath)), reader));
-    ReturnErrorOnFailure(apPath->Init(reader));
-    return CHIP_NO_ERROR;
+    return apPath->Init(reader);
 }
 
-CHIP_ERROR CommandDataIB::Parser::GetData(TLV::TLVReader * const apReader) const
+CHIP_ERROR CommandDataIB::Parser::GetFields(TLV::TLVReader * const apReader) const
 {
-    ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kData)), *apReader));
+    ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kFields)), *apReader));
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/app/MessageDef/CommandDataIB.h b/src/app/MessageDef/CommandDataIB.h
index 3b1eca9f91e623..0ff0cc576fa9e0 100644
--- a/src/app/MessageDef/CommandDataIB.h
+++ b/src/app/MessageDef/CommandDataIB.h
@@ -35,8 +35,8 @@ namespace app {
 namespace CommandDataIB {
 enum class Tag : uint8_t
 {
-    kPath = 0,
-    kData = 1,
+    kPath   = 0,
+    kFields = 1,
 };
 
 class Parser : public StructParser
@@ -71,18 +71,18 @@ class Parser : public StructParser
     CHIP_ERROR GetPath(CommandPathIB::Parser * const apPath) const;
 
     /**
-     *  @brief Get a TLVReader for the Data. Next() must be called before accessing them.
+     *  @brief Get a TLVReader for the Fields. Next() must be called before accessing them.
      *
      *  @param [in] apReader    A pointer to apReader
      *
      *  @return #CHIP_NO_ERROR on success
      *          #CHIP_END_OF_TLV if there is no such element
      */
-    CHIP_ERROR GetData(TLV::TLVReader * const apReader) const;
+    CHIP_ERROR GetFields(TLV::TLVReader * const apReader) const;
 
 protected:
     // A recursively callable function to parse a data element and pretty-print it.
-    CHIP_ERROR ParseData(TLV::TLVReader & aReader, int aDepth) const;
+    CHIP_ERROR ParseFields(TLV::TLVReader & aReader, int aDepth) const;
 };
 
 class Builder : public StructBuilder
diff --git a/src/app/MessageDef/CommandPathIB.cpp b/src/app/MessageDef/CommandPathIB.cpp
index f947b221083812..c944b7fcb78cd4 100644
--- a/src/app/MessageDef/CommandPathIB.cpp
+++ b/src/app/MessageDef/CommandPathIB.cpp
@@ -35,8 +35,8 @@ namespace app {
 CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
-    chip::TLV::TLVReader reader;
+    int tagPresenceMask = 0;
+    TLV::TLVReader reader;
     PRETTY_PRINT("CommandPathIB =");
     PRETTY_PRINT("{");
 
@@ -49,91 +49,82 @@ CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const
         {
             continue;
         }
-        switch (chip::TLV::TagNumFromTag(reader.GetTag()))
+        uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag());
+        switch (tagNum)
         {
-        case kCsTag_EndpointId:
+        case to_underlying(Tag::kEndpointId):
             // check if this tag has appeared before
-            VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_EndpointId)), err = CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << kCsTag_EndpointId);
-            VerifyOrExit(chip::TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEndpointId))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEndpointId));
+            VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
             {
                 uint16_t endpointId;
-                reader.Get(endpointId);
+                ReturnErrorOnFailure(reader.Get(endpointId));
                 PRETTY_PRINT("\tEndpointId = 0x%x,", endpointId);
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
-        case kCsTag_ClusterId:
+        case to_underlying(Tag::kClusterId):
             // check if this tag has appeared before
-            VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_ClusterId)), err = CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << kCsTag_ClusterId);
-            VerifyOrExit(chip::TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kClusterId))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kClusterId));
+            VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
                 chip::ClusterId clusterId;
-                reader.Get(clusterId);
+                ReturnErrorOnFailure(reader.Get(clusterId));
                 PRETTY_PRINT("\tClusterId = 0x%" PRIx32 ",", clusterId);
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
-        case kCsTag_CommandId:
+        case to_underlying(Tag::kCommandId):
             // check if this tag has appeared before
-            VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_CommandId)), err = CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << kCsTag_CommandId);
-            VerifyOrExit(chip::TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCommandId))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kCommandId));
+            VerifyOrReturnError(chip::TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
                 chip::CommandId commandId;
-                reader.Get(commandId);
+                ReturnErrorOnFailure(reader.Get(commandId));
                 PRETTY_PRINT("\tCommandId = 0x%x,", commandId);
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
         default:
-            ExitNow(err = CHIP_ERROR_INVALID_TLV_TAG);
+            PRETTY_PRINT("Unknown tag num %" PRIu32, tagNum);
+            break;
         }
     }
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
         // check for required fields:
-        const uint16_t RequiredFields = (1 << kCsTag_CommandId) | (1 << kCsTag_ClusterId);
+        const uint16_t requiredFields = (1 << to_underlying(Tag::kCommandId)) | (1 << to_underlying(Tag::kClusterId));
 
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_COMMAND_PATH;
-        }
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB;
     }
-    SuccessOrExit(err);
-    err = reader.ExitContainer(mOuterContainerType);
-
-exit:
-
-    return err;
+    ReturnErrorOnFailure(err);
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
 CHIP_ERROR CommandPathIB::Parser::GetEndpointId(chip::EndpointId * const apEndpointID) const
 {
-    return GetUnsignedInteger(kCsTag_EndpointId, apEndpointID);
+    return GetUnsignedInteger(to_underlying(Tag::kEndpointId), apEndpointID);
 }
 
 CHIP_ERROR CommandPathIB::Parser::GetClusterId(chip::ClusterId * const apClusterId) const
 {
-    return GetUnsignedInteger(kCsTag_ClusterId, apClusterId);
+    return GetUnsignedInteger(to_underlying(Tag::kClusterId), apClusterId);
 }
 
 CHIP_ERROR CommandPathIB::Parser::GetCommandId(chip::CommandId * const apCommandId) const
 {
-    return GetUnsignedInteger(kCsTag_CommandId, apCommandId);
+    return GetUnsignedInteger(to_underlying(Tag::kCommandId), apCommandId);
 }
 
 CommandPathIB::Builder & CommandPathIB::Builder::EndpointId(const chip::EndpointId aEndpointId)
@@ -141,7 +132,7 @@ CommandPathIB::Builder & CommandPathIB::Builder::EndpointId(const chip::Endpoint
     // skip if error has already been set
     if (mError == CHIP_NO_ERROR)
     {
-        mError = mpWriter->Put(chip::TLV::ContextTag(kCsTag_EndpointId), aEndpointId);
+        mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kEndpointId)), aEndpointId);
     }
     return *this;
 }
@@ -151,7 +142,7 @@ CommandPathIB::Builder & CommandPathIB::Builder::ClusterId(const chip::ClusterId
     // skip if error has already been set
     if (mError == CHIP_NO_ERROR)
     {
-        mError = mpWriter->Put(chip::TLV::ContextTag(kCsTag_ClusterId), aClusterId);
+        mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kClusterId)), aClusterId);
     }
     return *this;
 }
@@ -161,7 +152,7 @@ CommandPathIB::Builder & CommandPathIB::Builder::CommandId(const chip::CommandId
     // skip if error has already been set
     if (mError == CHIP_NO_ERROR)
     {
-        mError = mpWriter->Put(chip::TLV::ContextTag(kCsTag_CommandId), aCommandId);
+        mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kCommandId)), aCommandId);
     }
     return *this;
 }
diff --git a/src/app/MessageDef/CommandPathIB.h b/src/app/MessageDef/CommandPathIB.h
index 35d0bad6f94451..1b823efb65e67b 100644
--- a/src/app/MessageDef/CommandPathIB.h
+++ b/src/app/MessageDef/CommandPathIB.h
@@ -33,11 +33,11 @@
 namespace chip {
 namespace app {
 namespace CommandPathIB {
-enum
+enum class Tag : uint8_t
 {
-    kCsTag_EndpointId = 0,
-    kCsTag_ClusterId  = 1,
-    kCsTag_CommandId  = 2,
+    kEndpointId = 0,
+    kClusterId  = 1,
+    kCommandId  = 2,
 };
 
 class Parser : public ListParser
diff --git a/src/app/MessageDef/CommandStatusIB.cpp b/src/app/MessageDef/CommandStatusIB.cpp
index 8be31797735ef6..f7ccce23bc774b 100644
--- a/src/app/MessageDef/CommandStatusIB.cpp
+++ b/src/app/MessageDef/CommandStatusIB.cpp
@@ -31,7 +31,7 @@ namespace app {
 CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("CommandStatusIB =");
@@ -51,8 +51,8 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kPath):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPath));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPath));
             {
                 CommandPathIB::Parser path;
                 ReturnErrorOnFailure(path.Init(reader));
@@ -64,8 +64,8 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kErrorStatus):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus));
             {
                 StatusIB::Parser errorStatus;
                 ReturnErrorOnFailure(errorStatus.Init(reader));
@@ -82,25 +82,16 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus));
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -108,16 +99,14 @@ CHIP_ERROR CommandStatusIB::Parser::GetPath(CommandPathIB::Parser * const apPath
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kPath)), reader));
-    ReturnErrorOnFailure(apPath->Init(reader));
-    return CHIP_NO_ERROR;
+    return apPath->Init(reader);
 }
 
 CHIP_ERROR CommandStatusIB::Parser::GetErrorStatus(StatusIB::Parser * const apErrorStatus) const
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kErrorStatus)), reader));
-    ReturnErrorOnFailure(apErrorStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apErrorStatus->Init(reader);
 }
 
 CommandPathIB::Builder & CommandStatusIB::Builder::CreatePath()
diff --git a/src/app/MessageDef/DataVersionFilterIB.cpp b/src/app/MessageDef/DataVersionFilterIB.cpp
index c68db041297d8e..9416fb0b6d04d6 100644
--- a/src/app/MessageDef/DataVersionFilterIB.cpp
+++ b/src/app/MessageDef/DataVersionFilterIB.cpp
@@ -80,25 +80,20 @@ CHIP_ERROR DataVersionFilterIB::Parser::CheckSchemaValidity() const
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
+        default:
+            PRETTY_PRINT("Unknown tag num %" PRIu32, tagNum);
+            break;
         }
     }
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
         // check for required fields:
-        const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kDataVersion));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kDataVersion));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB;
     }
     ReturnErrorOnFailure(err);
     return reader.ExitContainer(mOuterContainerType);
diff --git a/src/app/MessageDef/DataVersionFilterIBs.cpp b/src/app/MessageDef/DataVersionFilterIBs.cpp
index efbc00e29e6cc8..ee646584d95f14 100644
--- a/src/app/MessageDef/DataVersionFilterIBs.cpp
+++ b/src/app/MessageDef/DataVersionFilterIBs.cpp
@@ -29,8 +29,7 @@ namespace app {
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 CHIP_ERROR DataVersionFilterIBs::Parser::CheckSchemaValidity() const
 {
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    size_t numDataVersionFilters = 0;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("DataVersionFilterIBs =");
@@ -49,21 +48,15 @@ CHIP_ERROR DataVersionFilterIBs::Parser::CheckSchemaValidity() const
             ReturnErrorOnFailure(DataVersionFilter.CheckSchemaValidity());
             PRETTY_PRINT_DECDEPTH();
         }
-
-        ++numDataVersionFilters;
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
-        // if we have at least one event filter
-        if (numDataVersionFilters > 0)
-        {
-            err = CHIP_NO_ERROR;
-        }
+        err = CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(err);
     return reader.ExitContainer(mOuterContainerType);
diff --git a/src/app/MessageDef/EventDataIB.cpp b/src/app/MessageDef/EventDataIB.cpp
index 5e8a076b69b4e0..7b78cb8aadfebb 100644
--- a/src/app/MessageDef/EventDataIB.cpp
+++ b/src/app/MessageDef/EventDataIB.cpp
@@ -92,7 +92,7 @@ EventDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
     }
 
     case TLV::kTLVType_UTF8String: {
-        char value_s[256];
+        char value_s[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
 
         err = aReader.GetString(value_s, sizeof(value_s));
         VerifyOrReturnError(err == CHIP_NO_ERROR || err == CHIP_ERROR_BUFFER_TOO_SMALL, err);
@@ -110,7 +110,7 @@ EventDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
     }
 
     case TLV::kTLVType_ByteString: {
-        uint8_t value_b[256];
+        uint8_t value_b[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
         uint32_t len, readerLen;
 
         readerLen = aReader.GetLength();
@@ -182,7 +182,7 @@ EventDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const
 CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("EventDataIB =");
@@ -202,8 +202,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kPath):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPath));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPath));
             {
                 EventPathIB::Parser path;
                 ReturnErrorOnFailure(path.Init(reader));
@@ -215,8 +215,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEventNumber):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventNumber))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEventNumber));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventNumber))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEventNumber));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -229,8 +229,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kPriority):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPriority))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPriority));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPriority))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPriority));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -243,8 +243,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEpochTimestamp):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEpochTimestamp));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEpochTimestamp));
 
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
@@ -259,8 +259,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
 
         case to_underlying(Tag::kSystemTimestamp):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kSystemTimestamp));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kSystemTimestamp));
 
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
@@ -274,8 +274,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kDeltaEpochTimestamp):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kDeltaEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kDeltaEpochTimestamp));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kDeltaEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kDeltaEpochTimestamp));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -288,8 +288,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kDeltaSystemTimestamp):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kDeltaSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kDeltaSystemTimestamp));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kDeltaSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kDeltaSystemTimestamp));
 
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
@@ -303,8 +303,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kData):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kData));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kData));
 
             PRETTY_PRINT_INCDEPTH();
             ReturnErrorOnFailure(ParseData(reader, 0));
@@ -316,27 +316,18 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const
         }
     }
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
         // check for required fields:
-        const int RequiredFields =
+        const int requiredFields =
             (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kPriority)) | (1 << to_underlying(Tag::kData));
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT;
-        }
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -387,13 +378,13 @@ CHIP_ERROR EventDataIB::Parser::ProcessEventPath(EventPathIB::Parser & aEventPat
 {
     // The ReportData must contain a concrete event path
     CHIP_ERROR err = aEventPath.GetEndpoint(&(aConcreteEventPath.mEndpointId));
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
 
     err = aEventPath.GetCluster(&(aConcreteEventPath.mClusterId));
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
 
     err = aEventPath.GetEvent(&(aConcreteEventPath.mEventId));
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
 
     return CHIP_NO_ERROR;
 }
@@ -414,7 +405,7 @@ CHIP_ERROR EventDataIB::Parser::ProcessEventTimestamp(EventHeader & aEventHeader
     }
     else if (err == CHIP_NO_ERROR)
     {
-        VerifyOrReturnError(aEventHeader.mTimestamp.IsSystem(), CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT);
+        VerifyOrReturnError(aEventHeader.mTimestamp.IsSystem(), CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB);
         aEventHeader.mTimestamp.mValue += timeStampVal;
         hasDeltaSystemTimestamp = true;
     }
@@ -427,7 +418,7 @@ CHIP_ERROR EventDataIB::Parser::ProcessEventTimestamp(EventHeader & aEventHeader
     }
     else if (err == CHIP_NO_ERROR)
     {
-        VerifyOrReturnError(aEventHeader.mTimestamp.IsEpoch(), CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT);
+        VerifyOrReturnError(aEventHeader.mTimestamp.IsEpoch(), CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB);
         aEventHeader.mTimestamp.mValue += timeStampVal;
         hasDeltaEpochTimestamp = true;
     }
@@ -462,7 +453,7 @@ CHIP_ERROR EventDataIB::Parser::ProcessEventTimestamp(EventHeader & aEventHeader
     {
         return CHIP_NO_ERROR;
     }
-    return CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT;
+    return CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB;
 }
 
 CHIP_ERROR EventDataIB::Parser::DecodeEventHeader(EventHeader & aEventHeader)
diff --git a/src/app/MessageDef/EventFilterIB.cpp b/src/app/MessageDef/EventFilterIB.cpp
index 5fc1824d7a7d07..86aebf3c64c575 100644
--- a/src/app/MessageDef/EventFilterIB.cpp
+++ b/src/app/MessageDef/EventFilterIB.cpp
@@ -35,7 +35,7 @@ namespace app {
 CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("EventFilterIB =");
@@ -55,8 +55,8 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kNode):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kNode));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kNode));
 #if CHIP_DETAIL_LOGGING
             {
                 NodeId node;
@@ -67,8 +67,8 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEventMin):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventMin))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEventMin));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventMin))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEventMin));
 #if CHIP_DETAIL_LOGGING
             {
                 uint64_t eventMin;
@@ -84,21 +84,16 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kEventMin));
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kEventMin));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/EventFilterIBs.cpp b/src/app/MessageDef/EventFilterIBs.cpp
index cff764eff356e9..4c97fc1c5ff743 100644
--- a/src/app/MessageDef/EventFilterIBs.cpp
+++ b/src/app/MessageDef/EventFilterIBs.cpp
@@ -29,8 +29,7 @@ namespace app {
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 CHIP_ERROR EventFilterIBs::Parser::CheckSchemaValidity() const
 {
-    CHIP_ERROR err         = CHIP_NO_ERROR;
-    size_t numEventFilters = 0;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("EventFilterIBs =");
@@ -49,25 +48,18 @@ CHIP_ERROR EventFilterIBs::Parser::CheckSchemaValidity() const
             ReturnErrorOnFailure(eventFilter.CheckSchemaValidity());
             PRETTY_PRINT_DECDEPTH();
         }
-
-        ++numEventFilters;
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
-        // if we have at least one event filter
-        if (numEventFilters > 0)
-        {
-            err = CHIP_NO_ERROR;
-        }
+        err = CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/EventPathIB.cpp b/src/app/MessageDef/EventPathIB.cpp
index 3a2e13b1d84eda..ff1478b12a7bcb 100644
--- a/src/app/MessageDef/EventPathIB.cpp
+++ b/src/app/MessageDef/EventPathIB.cpp
@@ -32,7 +32,7 @@ namespace app {
 CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("EventPath =");
@@ -52,8 +52,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kNode):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kNode));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kNode));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
@@ -65,8 +65,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEndpoint):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEndpoint));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEndpoint));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
@@ -78,8 +78,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kCluster):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCluster))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kCluster));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCluster))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kCluster));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -92,8 +92,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEvent):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEvent))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEvent));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEvent))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEvent));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -106,8 +106,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kIsUrgent):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kIsUrgent))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kIsUrgent));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kIsUrgent))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kIsUrgent));
             VerifyOrReturnError(TLV::kTLVType_Boolean == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 
 #if CHIP_DETAIL_LOGGING
@@ -125,7 +125,7 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
@@ -134,8 +134,7 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return err;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -161,9 +160,9 @@ CHIP_ERROR EventPathIB::Parser::GetEvent(EventId * const apEvent) const
 
 CHIP_ERROR EventPathIB::Parser::GetEventPath(ConcreteEventPath * const apPath) const
 {
-    VerifyOrReturnError(GetEndpoint(&(apPath->mEndpointId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
-    VerifyOrReturnError(GetCluster(&(apPath->mClusterId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
-    VerifyOrReturnError(GetEvent(&(apPath->mEventId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+    VerifyOrReturnError(GetEndpoint(&(apPath->mEndpointId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
+    VerifyOrReturnError(GetCluster(&(apPath->mClusterId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
+    VerifyOrReturnError(GetEvent(&(apPath->mEventId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/app/MessageDef/EventPathIB.h b/src/app/MessageDef/EventPathIB.h
index 9d6e3787de61d4..32b7948dfc6d54 100644
--- a/src/app/MessageDef/EventPathIB.h
+++ b/src/app/MessageDef/EventPathIB.h
@@ -124,7 +124,7 @@ class Parser : public ListParser
      *  @param [in] apPath    A pointer to the path to fill in.
      *
      *  @return #CHIP_NO_ERROR on success
-     *          #CHIP_ERROR_IM_MALFORMED_EVENT_PATH if the path from the reader is not a valid concrere event path.
+     *          #CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB if the path from the reader is not a valid concrere event path.
      */
     CHIP_ERROR GetEventPath(ConcreteEventPath * const apPath) const;
 };
diff --git a/src/app/MessageDef/EventPathIBs.cpp b/src/app/MessageDef/EventPathIBs.cpp
index fc541ad4610ac6..b3fd026d41e4f9 100644
--- a/src/app/MessageDef/EventPathIBs.cpp
+++ b/src/app/MessageDef/EventPathIBs.cpp
@@ -59,7 +59,7 @@ CHIP_ERROR EventPathIBs::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
@@ -67,8 +67,7 @@ CHIP_ERROR EventPathIBs::Parser::CheckSchemaValidity() const
         err = CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/EventReportIB.cpp b/src/app/MessageDef/EventReportIB.cpp
index b9ac47d75da332..6c3311f9a54397 100644
--- a/src/app/MessageDef/EventReportIB.cpp
+++ b/src/app/MessageDef/EventReportIB.cpp
@@ -32,7 +32,7 @@ namespace app {
 CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("EventReportIB =");
@@ -52,8 +52,8 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kEventStatus):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventStatus))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEventStatus));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventStatus))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEventStatus));
             {
                 EventStatusIB::Parser eventStatus;
                 ReturnErrorOnFailure(eventStatus.Init(reader));
@@ -65,8 +65,8 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kEventData):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventData))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kEventData));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventData))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kEventData));
             {
                 EventDataIB::Parser eventData;
                 ReturnErrorOnFailure(eventData.Init(reader));
@@ -83,7 +83,7 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
@@ -91,12 +91,12 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const
         const int CheckDataField   = 1 << to_underlying(Tag::kEventData);
         const int CheckStatusField = (1 << to_underlying(Tag::kEventStatus));
 
-        if ((TagPresenceMask & CheckDataField) == CheckDataField && (TagPresenceMask & CheckStatusField) == CheckStatusField)
+        if ((tagPresenceMask & CheckDataField) == CheckDataField && (tagPresenceMask & CheckStatusField) == CheckStatusField)
         {
             // kEventData and kEventStatus both exist
             err = CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB;
         }
-        else if ((TagPresenceMask & CheckDataField) != CheckDataField && (TagPresenceMask & CheckStatusField) != CheckStatusField)
+        else if ((tagPresenceMask & CheckDataField) != CheckDataField && (tagPresenceMask & CheckStatusField) != CheckStatusField)
         {
             // kEventData and kErrorStatus not exist
             err = CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB;
@@ -108,8 +108,7 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -117,16 +116,14 @@ CHIP_ERROR EventReportIB::Parser::GetEventStatus(EventStatusIB::Parser * const a
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kEventStatus)), reader));
-    ReturnErrorOnFailure(apEventStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apEventStatus->Init(reader);
 }
 
 CHIP_ERROR EventReportIB::Parser::GetEventData(EventDataIB::Parser * const apEventData) const
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kEventData)), reader));
-    ReturnErrorOnFailure(apEventData->Init(reader));
-    return CHIP_NO_ERROR;
+    return apEventData->Init(reader);
 }
 
 EventStatusIB::Builder & EventReportIB::Builder::CreateEventStatus()
diff --git a/src/app/MessageDef/EventReportIBs.cpp b/src/app/MessageDef/EventReportIBs.cpp
index 027af6f69476a4..6229be6b664d83 100644
--- a/src/app/MessageDef/EventReportIBs.cpp
+++ b/src/app/MessageDef/EventReportIBs.cpp
@@ -57,7 +57,7 @@ CHIP_ERROR EventReportIBs::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
@@ -65,8 +65,7 @@ CHIP_ERROR EventReportIBs::Parser::CheckSchemaValidity() const
         err = CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/EventStatusIB.cpp b/src/app/MessageDef/EventStatusIB.cpp
index 84188a16370f9d..449fe7103c6828 100644
--- a/src/app/MessageDef/EventStatusIB.cpp
+++ b/src/app/MessageDef/EventStatusIB.cpp
@@ -31,7 +31,7 @@ namespace app {
 CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("EventStatusIB =");
@@ -51,8 +51,8 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kPath):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kPath));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kPath));
             {
                 EventPathIB::Parser path;
                 ReturnErrorOnFailure(path.Init(reader));
@@ -64,8 +64,8 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kErrorStatus):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus));
             {
                 StatusIB::Parser errorStatus;
                 ReturnErrorOnFailure(errorStatus.Init(reader));
@@ -82,21 +82,16 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus));
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -104,16 +99,14 @@ CHIP_ERROR EventStatusIB::Parser::GetPath(EventPathIB::Parser * const apPath) co
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kPath)), reader));
-    ReturnErrorOnFailure(apPath->Init(reader));
-    return CHIP_NO_ERROR;
+    return apPath->Init(reader);
 }
 
 CHIP_ERROR EventStatusIB::Parser::GetErrorStatus(StatusIB::Parser * const apErrorStatus) const
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kErrorStatus)), reader));
-    ReturnErrorOnFailure(apErrorStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apErrorStatus->Init(reader);
 }
 
 EventPathIB::Builder & EventStatusIB::Builder::CreatePath()
diff --git a/src/app/MessageDef/InvokeRequestMessage.cpp b/src/app/MessageDef/InvokeRequestMessage.cpp
index 2610a4d4e7ca5a..3d0a28f9fc500a 100644
--- a/src/app/MessageDef/InvokeRequestMessage.cpp
+++ b/src/app/MessageDef/InvokeRequestMessage.cpp
@@ -95,26 +95,17 @@ CHIP_ERROR InvokeRequestMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kTimedRequest)) |
+        const int requiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kTimedRequest)) |
             (1 << to_underlying(Tag::kInvokeRequests));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE;
-        }
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -132,8 +123,7 @@ CHIP_ERROR InvokeRequestMessage::Parser::GetInvokeRequests(InvokeRequests::Parse
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kInvokeRequests)), reader));
-    ReturnErrorOnFailure(apInvokeRequests->Init(reader));
-    return CHIP_NO_ERROR;
+    return apInvokeRequests->Init(reader);
 }
 
 InvokeRequestMessage::Builder & InvokeRequestMessage::Builder::SuppressResponse(const bool aSuppressResponse)
diff --git a/src/app/MessageDef/InvokeRequests.cpp b/src/app/MessageDef/InvokeRequests.cpp
index 2e74397fecaa19..89c50e65e26e23 100644
--- a/src/app/MessageDef/InvokeRequests.cpp
+++ b/src/app/MessageDef/InvokeRequests.cpp
@@ -54,7 +54,7 @@ CHIP_ERROR InvokeRequests::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
@@ -66,8 +66,7 @@ CHIP_ERROR InvokeRequests::Parser::CheckSchemaValidity() const
         }
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/InvokeResponseIB.cpp b/src/app/MessageDef/InvokeResponseIB.cpp
index d28dc49ccad6e3..e140072918dd0b 100644
--- a/src/app/MessageDef/InvokeResponseIB.cpp
+++ b/src/app/MessageDef/InvokeResponseIB.cpp
@@ -29,7 +29,7 @@ namespace app {
 CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("InvokeResponseIB =");
@@ -49,8 +49,8 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const
         {
         case to_underlying(Tag::kCommand):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCommand))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kCommand));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCommand))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kCommand));
             {
                 CommandDataIB::Parser command;
                 ReturnErrorOnFailure(command.Init(reader));
@@ -62,8 +62,8 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const
             break;
         case to_underlying(Tag::kStatus):
             // check if this tag has appeared before
-            VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kStatus))), CHIP_ERROR_INVALID_TLV_TAG);
-            TagPresenceMask |= (1 << to_underlying(Tag::kStatus));
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kStatus))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kStatus));
             {
                 CommandStatusIB::Parser status;
                 ReturnErrorOnFailure(status.Init(reader));
@@ -80,7 +80,7 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
@@ -89,13 +89,13 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const
         const int CheckCommandField = 1 << to_underlying(Tag::kCommand);
         const int CheckStatusField  = (1 << to_underlying(Tag::kStatus));
 
-        if ((TagPresenceMask & CheckCommandField) == CheckCommandField && (TagPresenceMask & CheckStatusField) == CheckStatusField)
+        if ((tagPresenceMask & CheckCommandField) == CheckCommandField && (tagPresenceMask & CheckStatusField) == CheckStatusField)
         {
             // kPath and kErrorStatus both exist
             err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB;
         }
-        else if ((TagPresenceMask & CheckCommandField) != CheckCommandField &&
-                 (TagPresenceMask & CheckStatusField) != CheckStatusField)
+        else if ((tagPresenceMask & CheckCommandField) != CheckCommandField &&
+                 (tagPresenceMask & CheckStatusField) != CheckStatusField)
         {
             // kPath and kErrorStatus not exist
             err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB;
@@ -106,8 +106,7 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const
         }
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -115,16 +114,14 @@ CHIP_ERROR InvokeResponseIB::Parser::GetCommand(CommandDataIB::Parser * const ap
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kCommand)), reader));
-    ReturnErrorOnFailure(apCommand->Init(reader));
-    return CHIP_NO_ERROR;
+    return apCommand->Init(reader);
 }
 
 CHIP_ERROR InvokeResponseIB::Parser::GetStatus(CommandStatusIB::Parser * const apStatus) const
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kStatus)), reader));
-    ReturnErrorOnFailure(apStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apStatus->Init(reader);
 }
 
 CommandDataIB::Builder & InvokeResponseIB::Builder::CreateCommand()
diff --git a/src/app/MessageDef/InvokeResponseIBs.cpp b/src/app/MessageDef/InvokeResponseIBs.cpp
index 4a148b889ae500..3404599c9bbdf2 100644
--- a/src/app/MessageDef/InvokeResponseIBs.cpp
+++ b/src/app/MessageDef/InvokeResponseIBs.cpp
@@ -54,20 +54,19 @@ CHIP_ERROR InvokeResponseIBs::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("],");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
-        // if we have at least one data element
+        // if we have at least one response
         if (numInvokeResponses > 0)
         {
             err = CHIP_NO_ERROR;
         }
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/InvokeResponseMessage.cpp b/src/app/MessageDef/InvokeResponseMessage.cpp
index 80c22a960a5f91..1aec93b611907f 100644
--- a/src/app/MessageDef/InvokeResponseMessage.cpp
+++ b/src/app/MessageDef/InvokeResponseMessage.cpp
@@ -82,25 +82,17 @@ CHIP_ERROR InvokeResponseMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kInvokeResponses));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kInvokeResponses));
+        err =
+            (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE;
     }
 
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
@@ -113,8 +105,7 @@ CHIP_ERROR InvokeResponseMessage::Parser::GetInvokeResponses(InvokeResponseIBs::
 {
     TLV::TLVReader reader;
     ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kInvokeResponses)), reader));
-    ReturnErrorOnFailure(apStatus->Init(reader));
-    return CHIP_NO_ERROR;
+    return apStatus->Init(reader);
 }
 
 InvokeResponseMessage::Builder & InvokeResponseMessage::Builder::SuppressResponse(const bool aSuppressResponse)
diff --git a/src/app/MessageDef/ListParser.cpp b/src/app/MessageDef/ListParser.cpp
index fce62c3143a6d9..09ab78d2228d4c 100644
--- a/src/app/MessageDef/ListParser.cpp
+++ b/src/app/MessageDef/ListParser.cpp
@@ -24,8 +24,7 @@ CHIP_ERROR ListParser::Init(const TLV::TLVReader & aReader)
 {
     mReader.Init(aReader);
     VerifyOrReturnError(TLV::kTLVType_List == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return mReader.EnterContainer(mOuterContainerType);
 }
 } // namespace app
 } // namespace chip
diff --git a/src/app/MessageDef/MessageBuilder.cpp b/src/app/MessageDef/MessageBuilder.cpp
index 4ea0e418bbf24e..b9ad0e58968d23 100644
--- a/src/app/MessageDef/MessageBuilder.cpp
+++ b/src/app/MessageDef/MessageBuilder.cpp
@@ -24,9 +24,8 @@ namespace chip {
 namespace app {
 CHIP_ERROR MessageBuilder::EncodeInteractionModelRevision()
 {
-    ReturnErrorOnFailure(mpWriter->Put(TLV::ContextTag(kInteractionModelRevisionTag),
-                                       static_cast<InteractionModelRevision>(CHIP_DEVICE_INTERACTION_MODEL_REVISION)));
-    return CHIP_NO_ERROR;
+    return mpWriter->Put(TLV::ContextTag(kInteractionModelRevisionTag),
+                         static_cast<InteractionModelRevision>(CHIP_DEVICE_INTERACTION_MODEL_REVISION));
 }
 } // namespace app
 } // namespace chip
diff --git a/src/app/MessageDef/MessageDefHelper.cpp b/src/app/MessageDef/MessageDefHelper.cpp
index 6bb137c2401e0d..4c19ec7abb3454 100644
--- a/src/app/MessageDef/MessageDefHelper.cpp
+++ b/src/app/MessageDef/MessageDefHelper.cpp
@@ -37,45 +37,48 @@ namespace app {
 // this is used to run in signle thread for IM message debug purpose
 namespace {
 uint32_t gPrettyPrintingDepthLevel = 0;
-char gLineBuffer[256];
+char gLineBuffer[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
 size_t gCurLineBufferSize = 0;
 } // namespace
 
-void ENFORCE_FORMAT(2, 3) PrettyPrintIM(bool aIsNewLine, const char * aFmt, ...)
+void PrettyPrintIMBlankLine()
 {
-    va_list args;
-    size_t ret;
-    size_t sizeLeft;
-    va_start(args, aFmt);
-
-    if (aIsNewLine)
+    if (gCurLineBufferSize)
     {
-        if (gCurLineBufferSize)
-        {
-            // Don't need to explicitly NULL-terminate the string because
-            // snprintf takes care of that.
-            ChipLogDetail(DataManagement, "%s", gLineBuffer);
-            gCurLineBufferSize = 0;
-        }
+        // Don't need to explicitly NULL-terminate the string because
+        // snprintf takes care of that.
+        ChipLogDetail(DataManagement, "%s", gLineBuffer);
+        gCurLineBufferSize = 0;
+    }
 
-        for (uint32_t i = 0; i < gPrettyPrintingDepthLevel; i++)
+    for (uint32_t i = 0; i < gPrettyPrintingDepthLevel; i++)
+    {
+        if (sizeof(gLineBuffer) > gCurLineBufferSize)
         {
-            if (sizeof(gLineBuffer) > gCurLineBufferSize)
+            size_t sizeLeft = sizeof(gLineBuffer) - gCurLineBufferSize;
+            size_t ret      = (size_t)(snprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, "\t"));
+            if (ret > 0)
             {
-                sizeLeft = sizeof(gLineBuffer) - gCurLineBufferSize;
-                ret      = (size_t)(snprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, "\t"));
-                if (ret > 0)
-                {
-                    gCurLineBufferSize += std::min(ret, sizeLeft);
-                }
+                gCurLineBufferSize += std::min(ret, sizeLeft);
             }
         }
     }
+}
+
+void PrettyPrintIM(bool aIsNewLine, const char * aFmt, ...)
+{
+    va_list args;
+    va_start(args, aFmt);
+
+    if (aIsNewLine)
+    {
+        PrettyPrintIMBlankLine();
+    }
 
     if (sizeof(gLineBuffer) > gCurLineBufferSize)
     {
-        sizeLeft = sizeof(gLineBuffer) - gCurLineBufferSize;
-        ret      = (size_t)(vsnprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, aFmt, args));
+        size_t sizeLeft = sizeof(gLineBuffer) - gCurLineBufferSize;
+        size_t ret      = (size_t)(vsnprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, aFmt, args));
         if (ret > 0)
         {
             gCurLineBufferSize += std::min(ret, sizeLeft);
diff --git a/src/app/MessageDef/MessageDefHelper.h b/src/app/MessageDef/MessageDefHelper.h
index 625492621132e6..354085cacade0e 100644
--- a/src/app/MessageDef/MessageDefHelper.h
+++ b/src/app/MessageDef/MessageDefHelper.h
@@ -30,12 +30,25 @@
 
 #include <app/AppBuildConfig.h>
 
+// We need CHIPLogging.h to get the right value for CHIP_DETAIL_LOGGING here.
+#include <lib/support/logging/CHIPLogging.h>
+
 namespace chip {
 namespace app {
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK && CHIP_DETAIL_LOGGING
-void PrettyPrintIM(bool aIsNewLine, const char * aFmt, ...);
+/**
+ * Start a new "blank" line.  This will actually print out whitespace to the
+ * current indent level, which can be followed with PRETTY_PRINT_SAMELINE calls.
+ */
+void PrettyPrintIMBlankLine();
+void PrettyPrintIM(bool aIsNewLine, const char * aFmt, ...) ENFORCE_FORMAT(2, 3);
 void IncreaseDepth();
 void DecreaseDepth();
+#define PRETTY_PRINT_BLANK_LINE()                                                                                                  \
+    do                                                                                                                             \
+    {                                                                                                                              \
+        PrettyPrintIMBlankLine();                                                                                                  \
+    } while (0)
 #define PRETTY_PRINT(fmt, ...)                                                                                                     \
     do                                                                                                                             \
     {                                                                                                                              \
@@ -57,6 +70,7 @@ void DecreaseDepth();
         DecreaseDepth();                                                                                                           \
     } while (0)
 #else
+#define PRETTY_PRINT_BLANK_LINE()
 #define PRETTY_PRINT(fmt, ...)
 #define PRETTY_PRINT(fmt, ...)
 #define PRETTY_PRINT_SAMELINE(fmt, ...)
diff --git a/src/app/MessageDef/ReadRequestMessage.cpp b/src/app/MessageDef/ReadRequestMessage.cpp
index 0f25328584e7f6..d5837db6684f58 100644
--- a/src/app/MessageDef/ReadRequestMessage.cpp
+++ b/src/app/MessageDef/ReadRequestMessage.cpp
@@ -121,20 +121,12 @@ CHIP_ERROR ReadRequestMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kIsFabricFiltered));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kIsFabricFiltered));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE;
     }
 
     ReturnErrorOnFailure(err);
diff --git a/src/app/MessageDef/ReportDataMessage.cpp b/src/app/MessageDef/ReportDataMessage.cpp
index dab916db5aa5c8..ee32ec1a024c60 100644
--- a/src/app/MessageDef/ReportDataMessage.cpp
+++ b/src/app/MessageDef/ReportDataMessage.cpp
@@ -79,7 +79,7 @@ CHIP_ERROR ReportDataMessage::Parser::CheckSchemaValidity() const
             {
                 SubscriptionId subscriptionId;
                 ReturnErrorOnFailure(reader.Get(subscriptionId));
-                PRETTY_PRINT("\tSubscriptionId = 0x%" PRIx64 ",", subscriptionId);
+                PRETTY_PRINT("\tSubscriptionId = 0x%" PRIx32 ",", subscriptionId);
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -135,7 +135,7 @@ CHIP_ERROR ReportDataMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("}");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
diff --git a/src/app/MessageDef/StatusIB.cpp b/src/app/MessageDef/StatusIB.cpp
index 7707011dfb017e..38b961beafc5c8 100644
--- a/src/app/MessageDef/StatusIB.cpp
+++ b/src/app/MessageDef/StatusIB.cpp
@@ -68,7 +68,7 @@ CHIP_ERROR StatusIB::Parser::DecodeStatusIB(StatusIB & aStatusIB) const
 CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
-    int TagPresenceMask = 0;
+    int tagPresenceMask = 0;
     TLV::TLVReader reader;
 
     PRETTY_PRINT("StatusIB =");
@@ -82,9 +82,9 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const
         {
             continue;
         }
-        if (!(TagPresenceMask & (1 << to_underlying(Tag::kStatus))))
+        if (!(tagPresenceMask & (1 << to_underlying(Tag::kStatus))))
         {
-            TagPresenceMask |= (1 << to_underlying(Tag::kStatus));
+            tagPresenceMask |= (1 << to_underlying(Tag::kStatus));
 
 #if CHIP_DETAIL_LOGGING
             {
@@ -94,9 +94,9 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const
             }
 #endif // CHIP_DETAIL_LOGGING
         }
-        else if (!(TagPresenceMask & (1 << to_underlying(Tag::kClusterStatus))))
+        else if (!(tagPresenceMask & (1 << to_underlying(Tag::kClusterStatus))))
         {
-            TagPresenceMask |= (1 << to_underlying(Tag::kClusterStatus));
+            tagPresenceMask |= (1 << to_underlying(Tag::kClusterStatus));
 
 #if CHIP_DETAIL_LOGGING
             {
@@ -113,25 +113,16 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
     // if we have exhausted this container
     if (CHIP_END_OF_TLV == err)
     {
         // check for required fields:
-        const int RequiredFields = (1 << to_underlying(Tag::kStatus));
-
-        if ((TagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_STATUS_CODE;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kStatus));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_STATUS_IB;
     }
     ReturnErrorOnFailure(err);
-    ReturnErrorOnFailure(reader.ExitContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
+    return reader.ExitContainer(mOuterContainerType);
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
diff --git a/src/app/MessageDef/StatusResponseMessage.cpp b/src/app/MessageDef/StatusResponseMessage.cpp
index 0b09592f015bb6..758147df71bbb7 100644
--- a/src/app/MessageDef/StatusResponseMessage.cpp
+++ b/src/app/MessageDef/StatusResponseMessage.cpp
@@ -40,7 +40,8 @@ CHIP_ERROR StatusResponseMessage::Parser::CheckSchemaValidity() const
         {
             continue;
         }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
+        uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag());
+        switch (tagNum)
         {
         case to_underlying(Tag::kStatus):
             VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kStatus))), CHIP_ERROR_INVALID_TLV_TAG);
@@ -58,24 +59,18 @@ CHIP_ERROR StatusResponseMessage::Parser::CheckSchemaValidity() const
             ReturnErrorOnFailure(MessageParser::CheckInteractionModelRevision(reader));
             break;
         default:
-            ReturnErrorOnFailure(CHIP_ERROR_INVALID_TLV_TAG);
+            PRETTY_PRINT("Unknown tag num %" PRIu32, tagNum);
+            break;
         }
     }
     PRETTY_PRINT("}");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
         const int requiredFields = (1 << to_underlying(Tag::kStatus));
-
-        if ((tagPresenceMask & requiredFields) == requiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE;
-        }
+        err =
+            (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE;
     }
     ReturnErrorOnFailure(err);
     return reader.ExitContainer(mOuterContainerType);
diff --git a/src/app/MessageDef/StructParser.cpp b/src/app/MessageDef/StructParser.cpp
index b6150b677efe25..daf2156437557a 100644
--- a/src/app/MessageDef/StructParser.cpp
+++ b/src/app/MessageDef/StructParser.cpp
@@ -23,8 +23,7 @@ CHIP_ERROR StructParser::Init(const TLV::TLVReader & aReader)
     mReader.Init(aReader);
     VerifyOrReturnError(TLV::kTLVType_Structure == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
     ReturnErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
-    ReturnErrorOnFailure(CheckSchemaOrdering());
-    return CHIP_NO_ERROR;
+    return CheckSchemaOrdering();
 }
 
 CHIP_ERROR StructParser::CheckSchemaOrdering() const
diff --git a/src/app/MessageDef/SubscribeRequestMessage.cpp b/src/app/MessageDef/SubscribeRequestMessage.cpp
index a30f577a3ad61b..69b5b4841ef9dc 100644
--- a/src/app/MessageDef/SubscribeRequestMessage.cpp
+++ b/src/app/MessageDef/SubscribeRequestMessage.cpp
@@ -131,18 +131,6 @@ CHIP_ERROR SubscribeRequestMessage::Parser::CheckSchemaValidity() const
                 PRETTY_PRINT_DECDEPTH();
             }
             break;
-        case to_underlying(Tag::kIsProxy):
-            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kIsProxy))), CHIP_ERROR_INVALID_TLV_TAG);
-            tagPresenceMask |= (1 << to_underlying(Tag::kIsProxy));
-            VerifyOrReturnError(TLV::kTLVType_Boolean == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-#if CHIP_DETAIL_LOGGING
-            {
-                bool isProxy;
-                ReturnErrorOnFailure(reader.Get(isProxy));
-                PRETTY_PRINT("\tIsProxy = %s, ", isProxy ? "true" : "false");
-            }
-#endif // CHIP_DETAIL_LOGGING
-            break;
         case to_underlying(Tag::kIsFabricFiltered):
             // check if this tag has appeared before
             VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kIsFabricFiltered))), CHIP_ERROR_INVALID_TLV_TAG);
@@ -165,21 +153,15 @@ CHIP_ERROR SubscribeRequestMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kIsFabricFiltered)) |
+        const int requiredFields = (1 << to_underlying(Tag::kIsFabricFiltered)) | (1 << to_underlying(Tag::kKeepSubscriptions)) |
             (1 << to_underlying(Tag::kMinIntervalFloorSeconds)) | (1 << to_underlying(Tag::kMaxIntervalCeilingSeconds));
 
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE;
-        }
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR
+                                                                   : CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE;
     }
 
     ReturnErrorOnFailure(err);
@@ -230,11 +212,6 @@ CHIP_ERROR SubscribeRequestMessage::Parser::GetEventFilters(EventFilterIBs::Pars
     return apEventFilters->Init(reader);
 }
 
-CHIP_ERROR SubscribeRequestMessage::Parser::GetIsProxy(bool * const apIsProxy) const
-{
-    return GetSimpleValue(to_underlying(Tag::kIsProxy), TLV::kTLVType_Boolean, apIsProxy);
-}
-
 CHIP_ERROR SubscribeRequestMessage::Parser::GetIsFabricFiltered(bool * const apIsFabricFiltered) const
 {
     return GetSimpleValue(to_underlying(Tag::kIsFabricFiltered), TLV::kTLVType_Boolean, apIsFabricFiltered);
@@ -306,15 +283,6 @@ EventFilterIBs::Builder & SubscribeRequestMessage::Builder::CreateEventFilters()
     return mEventFilters;
 }
 
-SubscribeRequestMessage::Builder & SubscribeRequestMessage::Builder::IsProxy(const bool aIsProxy)
-{
-    if (mError == CHIP_NO_ERROR)
-    {
-        mError = mpWriter->PutBoolean(TLV::ContextTag(to_underlying(Tag::kIsProxy)), aIsProxy);
-    }
-    return *this;
-}
-
 SubscribeRequestMessage::Builder & SubscribeRequestMessage::Builder::IsFabricFiltered(const bool aIsFabricFiltered)
 {
     // skip if error has already been set
diff --git a/src/app/MessageDef/SubscribeRequestMessage.h b/src/app/MessageDef/SubscribeRequestMessage.h
index d70451e5677da4..25529cc3870c69 100644
--- a/src/app/MessageDef/SubscribeRequestMessage.h
+++ b/src/app/MessageDef/SubscribeRequestMessage.h
@@ -41,7 +41,6 @@ enum class Tag : uint8_t
     kAttributeRequests         = 3,
     kEventRequests             = 4,
     kEventFilters              = 5,
-    kIsProxy                   = 6,
     kIsFabricFiltered          = 7,
     kDataVersionFilters        = 8,
 };
@@ -118,13 +117,6 @@ class Parser : public MessageParser
      */
     CHIP_ERROR GetEventFilters(EventFilterIBs::Parser * const apEventFilters) const;
 
-    /**
-     *  @brief Get GetIsProxy boolean .
-     *  @return #CHIP_NO_ERROR on success
-     *          #CHIP_END_OF_TLV if there is no such element
-     */
-    CHIP_ERROR GetIsProxy(bool * const apIsProxy) const;
-
     /**
      *  @brief Get IsFabricFiltered boolean
      *
@@ -151,13 +143,6 @@ class Builder : public MessageBuilder
     EventPathIBs::Builder & CreateEventRequests();
     EventFilterIBs::Builder & CreateEventFilters();
 
-    /**
-     *  @brief This is set to true by the subscriber if it is a proxy-type device proxying for another client. This
-     *  confers it special privileges on the publisher that might result in evictions of other non-proxy subscriptions
-     *  to make way for the proxy.
-     */
-    SubscribeRequestMessage::Builder & IsProxy(const bool aIsProxy);
-
     /**
      *  @brief  limits the data written within fabric-scoped lists to the accessing fabric
      *  @return A reference to *this
diff --git a/src/app/MessageDef/SubscribeResponseMessage.cpp b/src/app/MessageDef/SubscribeResponseMessage.cpp
index d857f5c13c5264..97e7100c4e5670 100644
--- a/src/app/MessageDef/SubscribeResponseMessage.cpp
+++ b/src/app/MessageDef/SubscribeResponseMessage.cpp
@@ -48,33 +48,19 @@ CHIP_ERROR SubscribeResponseMessage::Parser::CheckSchemaValidity() const
             {
                 SubscriptionId subscriptionId;
                 ReturnErrorOnFailure(reader.Get(subscriptionId));
-                PRETTY_PRINT("\tSubscriptionId = 0x%" PRIx64 ",", subscriptionId);
+                PRETTY_PRINT("\tSubscriptionId = 0x%" PRIx32 ",", subscriptionId);
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
-        case to_underlying(Tag::kMinIntervalFloorSeconds):
-            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kMinIntervalFloorSeconds))),
-                                CHIP_ERROR_INVALID_TLV_TAG);
-            tagPresenceMask |= (1 << to_underlying(Tag::kMinIntervalFloorSeconds));
+        case to_underlying(Tag::kMaxInterval):
+            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kMaxInterval))), CHIP_ERROR_INVALID_TLV_TAG);
+            tagPresenceMask |= (1 << to_underlying(Tag::kMaxInterval));
             VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
 #if CHIP_DETAIL_LOGGING
             {
-                uint16_t minIntervalFloorSeconds;
-                ReturnErrorOnFailure(reader.Get(minIntervalFloorSeconds));
-                PRETTY_PRINT("\tMinIntervalFloorSeconds = 0x%x,", minIntervalFloorSeconds);
-            }
-#endif // CHIP_DETAIL_LOGGING
-            break;
-        case to_underlying(Tag::kMaxIntervalCeilingSeconds):
-            VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kMaxIntervalCeilingSeconds))),
-                                CHIP_ERROR_INVALID_TLV_TAG);
-            tagPresenceMask |= (1 << to_underlying(Tag::kMaxIntervalCeilingSeconds));
-            VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-#if CHIP_DETAIL_LOGGING
-            {
-                uint16_t maxIntervalCeilingSeconds;
-                ReturnErrorOnFailure(reader.Get(maxIntervalCeilingSeconds));
-                PRETTY_PRINT("\tMaxIntervalCeilingSeconds = 0x%x,", maxIntervalCeilingSeconds);
+                uint16_t maxInterval;
+                ReturnErrorOnFailure(reader.Get(maxInterval));
+                PRETTY_PRINT("\tMaxInterval = 0x%x,", maxInterval);
             }
 #endif // CHIP_DETAIL_LOGGING
             break;
@@ -87,21 +73,13 @@ CHIP_ERROR SubscribeResponseMessage::Parser::CheckSchemaValidity() const
         }
     }
     PRETTY_PRINT("}");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const uint16_t RequiredFields = (1 << to_underlying(Tag::kSubscriptionId)) |
-            (1 << to_underlying(Tag::kMinIntervalFloorSeconds)) | (1 << to_underlying(Tag::kMaxIntervalCeilingSeconds));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE;
-        }
+        const uint16_t requiredFields = (1 << to_underlying(Tag::kSubscriptionId)) | (1 << to_underlying(Tag::kMaxInterval));
+        err                           = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR
+                                                                   : CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE;
     }
     ReturnErrorOnFailure(err);
     return reader.ExitContainer(mOuterContainerType);
@@ -113,14 +91,9 @@ CHIP_ERROR SubscribeResponseMessage::Parser::GetSubscriptionId(SubscriptionId *
     return GetUnsignedInteger(to_underlying(Tag::kSubscriptionId), apSubscribeId);
 }
 
-CHIP_ERROR SubscribeResponseMessage::Parser::GetMinIntervalFloorSeconds(uint16_t * const apMinIntervalFloorSeconds) const
+CHIP_ERROR SubscribeResponseMessage::Parser::GetMaxInterval(uint16_t * const apMaxInterval) const
 {
-    return GetUnsignedInteger(to_underlying(Tag::kMinIntervalFloorSeconds), apMinIntervalFloorSeconds);
-}
-
-CHIP_ERROR SubscribeResponseMessage::Parser::GetMaxIntervalCeilingSeconds(uint16_t * const apMaxIntervalCeilingSeconds) const
-{
-    return GetUnsignedInteger(to_underlying(Tag::kMaxIntervalCeilingSeconds), apMaxIntervalCeilingSeconds);
+    return GetUnsignedInteger(to_underlying(Tag::kMaxInterval), apMaxInterval);
 }
 
 SubscribeResponseMessage::Builder & SubscribeResponseMessage::Builder::SubscriptionId(const chip::SubscriptionId aSubscribeId)
@@ -132,22 +105,11 @@ SubscribeResponseMessage::Builder & SubscribeResponseMessage::Builder::Subscript
     return *this;
 }
 
-SubscribeResponseMessage::Builder &
-SubscribeResponseMessage::Builder::MinIntervalFloorSeconds(const uint16_t aMinIntervalFloorSeconds)
-{
-    if (mError == CHIP_NO_ERROR)
-    {
-        mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kMinIntervalFloorSeconds)), aMinIntervalFloorSeconds);
-    }
-    return *this;
-}
-
-SubscribeResponseMessage::Builder &
-SubscribeResponseMessage::Builder::MaxIntervalCeilingSeconds(const uint16_t aMaxIntervalCeilingSeconds)
+SubscribeResponseMessage::Builder & SubscribeResponseMessage::Builder::MaxInterval(const uint16_t aMaxInterval)
 {
     if (mError == CHIP_NO_ERROR)
     {
-        mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kMaxIntervalCeilingSeconds)), aMaxIntervalCeilingSeconds);
+        mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kMaxInterval)), aMaxInterval);
     }
     return *this;
 }
diff --git a/src/app/MessageDef/SubscribeResponseMessage.h b/src/app/MessageDef/SubscribeResponseMessage.h
index 7c4b3a0e5dd5b1..19a44e6c0f2f74 100644
--- a/src/app/MessageDef/SubscribeResponseMessage.h
+++ b/src/app/MessageDef/SubscribeResponseMessage.h
@@ -31,9 +31,8 @@ namespace app {
 namespace SubscribeResponseMessage {
 enum class Tag : uint8_t
 {
-    kSubscriptionId            = 0,
-    kMinIntervalFloorSeconds   = 1,
-    kMaxIntervalCeilingSeconds = 2,
+    kSubscriptionId = 0,
+    kMaxInterval    = 2,
 };
 
 class Parser : public MessageParser
@@ -62,21 +61,13 @@ class Parser : public MessageParser
      */
     CHIP_ERROR GetSubscriptionId(SubscriptionId * const apSubscriptionId) const;
 
-    /**
-     *  @brief Get Final MinIntervalFloorSeconds. Next() must be called before accessing them.
-     *
-     *  @return #CHIP_NO_ERROR on success
-     *          #CHIP_END_OF_TLV if there is no such element
-     */
-    CHIP_ERROR GetMinIntervalFloorSeconds(uint16_t * const apMinIntervalFloorSeconds) const;
-
     /**
      *  @brief Get Final MaxIntervalCeilingSeconds. Next() must be called before accessing them.
      *
      *  @return #CHIP_NO_ERROR on success
      *          #CHIP_END_OF_TLV if there is no such element
      */
-    CHIP_ERROR GetMaxIntervalCeilingSeconds(uint16_t * const apMaxIntervalCeilingSeconds) const;
+    CHIP_ERROR GetMaxInterval(uint16_t * const apMaxInterval) const;
 };
 
 class Builder : public MessageBuilder
@@ -87,15 +78,10 @@ class Builder : public MessageBuilder
      */
     SubscribeResponseMessage::Builder & SubscriptionId(const chip::SubscriptionId SubscriptionId);
 
-    /**
-     *  @brief Final Min Interval for the subscription back to the clients.
-     */
-    SubscribeResponseMessage::Builder & MinIntervalFloorSeconds(const uint16_t aMinIntervalFloorSeconds);
-
     /**
      *  @brief Final Max Interval for the subscription back to the clients.
      */
-    SubscribeResponseMessage::Builder & MaxIntervalCeilingSeconds(const uint16_t aMaxIntervalCeilingSeconds);
+    SubscribeResponseMessage::Builder & MaxInterval(const uint16_t aMaxInterval);
 
     /**
      *  @brief Mark the end of this SubscribeResponseMessage
diff --git a/src/app/MessageDef/TimedRequestMessage.cpp b/src/app/MessageDef/TimedRequestMessage.cpp
index 957cd5e4d6c905..15440b9edd32b0 100644
--- a/src/app/MessageDef/TimedRequestMessage.cpp
+++ b/src/app/MessageDef/TimedRequestMessage.cpp
@@ -61,19 +61,11 @@ CHIP_ERROR TimedRequestMessage::Parser::CheckSchemaValidity() const
         }
     }
     PRETTY_PRINT("}");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kTimeoutMs));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE;
-        }
+        const int requiredFields = (1 << to_underlying(Tag::kTimeoutMs));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE;
     }
     ReturnErrorOnFailure(err);
     return reader.ExitContainer(mOuterContainerType);
diff --git a/src/app/MessageDef/WriteRequestMessage.cpp b/src/app/MessageDef/WriteRequestMessage.cpp
index b367530711d097..c315231c661fcb 100644
--- a/src/app/MessageDef/WriteRequestMessage.cpp
+++ b/src/app/MessageDef/WriteRequestMessage.cpp
@@ -112,20 +112,12 @@ CHIP_ERROR WriteRequestMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("},");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = ((1 << to_underlying(Tag::kTimedRequest)) | (1 << to_underlying(Tag::kWriteRequests)));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE;
-        }
+        const int requiredFields = ((1 << to_underlying(Tag::kTimedRequest)) | (1 << to_underlying(Tag::kWriteRequests)));
+        err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE;
     }
 
     ReturnErrorOnFailure(err);
diff --git a/src/app/MessageDef/WriteResponseMessage.cpp b/src/app/MessageDef/WriteResponseMessage.cpp
index 5beaed04e87a11..ea7b7bbc5d15c8 100644
--- a/src/app/MessageDef/WriteResponseMessage.cpp
+++ b/src/app/MessageDef/WriteResponseMessage.cpp
@@ -67,20 +67,11 @@ CHIP_ERROR WriteResponseMessage::Parser::CheckSchemaValidity() const
     }
 
     PRETTY_PRINT("}");
-    PRETTY_PRINT("");
+    PRETTY_PRINT_BLANK_LINE();
 
     if (CHIP_END_OF_TLV == err)
     {
-        const int RequiredFields = (1 << to_underlying(Tag::kWriteResponses));
-
-        if ((tagPresenceMask & RequiredFields) == RequiredFields)
-        {
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_IM_MALFORMED_WRITE_RESPONSE_MESSAGE;
-        }
+        err = CHIP_NO_ERROR;
     }
 
     ReturnErrorOnFailure(err);
diff --git a/src/app/OperationalDeviceProxy.cpp b/src/app/OperationalDeviceProxy.cpp
index b8b5e83806a28a..7d248901680c14 100644
--- a/src/app/OperationalDeviceProxy.cpp
+++ b/src/app/OperationalDeviceProxy.cpp
@@ -67,7 +67,7 @@ bool OperationalDeviceProxy::AttachToExistingSecureSession()
 {
     VerifyOrReturnError(mState == State::NeedsAddress || mState == State::ResolvingAddress || mState == State::HasAddress, false);
 
-    ScopedNodeId peerNodeId(mPeerId.GetNodeId(), mFabricInfo->GetFabricIndex());
+    ScopedNodeId peerNodeId(mPeerId.GetNodeId(), mFabricIndex);
     auto sessionHandle =
         mInitParams.sessionManager->FindSecureSessionForNode(peerNodeId, MakeOptional(Transport::SecureSession::Type::kCASE));
     if (!sessionHandle.HasValue())
@@ -211,9 +211,9 @@ void OperationalDeviceProxy::UpdateDeviceData(const Transport::PeerAddress & add
 
 CHIP_ERROR OperationalDeviceProxy::EstablishConnection()
 {
-    mCASEClient = mInitParams.clientPool->Allocate(
-        CASEClientInitParams{ mInitParams.sessionManager, mInitParams.sessionResumptionStorage, mInitParams.exchangeMgr,
-                              mFabricInfo, mInitParams.groupDataProvider, mInitParams.mrpLocalConfig });
+    mCASEClient = mInitParams.clientPool->Allocate(CASEClientInitParams{
+        mInitParams.sessionManager, mInitParams.sessionResumptionStorage, mInitParams.certificateValidityPolicy,
+        mInitParams.exchangeMgr, mFabricTable, mFabricIndex, mInitParams.groupDataProvider, mInitParams.mrpLocalConfig });
     ReturnErrorCodeIf(mCASEClient == nullptr, CHIP_ERROR_NO_MEMORY);
 
     CHIP_ERROR err = mCASEClient->EstablishSession(mPeerId, mDeviceAddress, mRemoteMRPConfig, this);
@@ -340,9 +340,19 @@ void OperationalDeviceProxy::OnSessionReleased()
     MoveToState(State::HasAddress);
 }
 
+void OperationalDeviceProxy::OnFirstMessageDeliveryFailed()
+{
+    LookupPeerAddress();
+}
+
+void OperationalDeviceProxy::OnSessionHang()
+{
+    // TODO: establish a new session
+}
+
 CHIP_ERROR OperationalDeviceProxy::ShutdownSubscriptions()
 {
-    return app::InteractionModelEngine::GetInstance()->ShutdownSubscriptions(mFabricInfo->GetFabricIndex(), GetDeviceId());
+    return app::InteractionModelEngine::GetInstance()->ShutdownSubscriptions(mFabricIndex, GetDeviceId());
 }
 
 OperationalDeviceProxy::~OperationalDeviceProxy()
diff --git a/src/app/OperationalDeviceProxy.h b/src/app/OperationalDeviceProxy.h
index 3afc0a2bbc4420..168181673c39cc 100644
--- a/src/app/OperationalDeviceProxy.h
+++ b/src/app/OperationalDeviceProxy.h
@@ -47,12 +47,13 @@ namespace chip {
 
 struct DeviceProxyInitParams
 {
-    SessionManager * sessionManager                     = nullptr;
-    SessionResumptionStorage * sessionResumptionStorage = nullptr;
-    Messaging::ExchangeManager * exchangeMgr            = nullptr;
-    FabricTable * fabricTable                           = nullptr;
-    CASEClientPoolDelegate * clientPool                 = nullptr;
-    Credentials::GroupDataProvider * groupDataProvider  = nullptr;
+    SessionManager * sessionManager                                    = nullptr;
+    SessionResumptionStorage * sessionResumptionStorage                = nullptr;
+    Credentials::CertificateValidityPolicy * certificateValidityPolicy = nullptr;
+    Messaging::ExchangeManager * exchangeMgr                           = nullptr;
+    FabricTable * fabricTable                                          = nullptr;
+    CASEClientPoolDelegate * clientPool                                = nullptr;
+    Credentials::GroupDataProvider * groupDataProvider                 = nullptr;
 
     Optional<ReliableMessageProtocolConfig> mrpLocalConfig = Optional<ReliableMessageProtocolConfig>::Missing();
 
@@ -105,8 +106,16 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy,
 
         mSystemLayer = params.exchangeMgr->GetSessionManager()->SystemLayer();
         mPeerId      = peerId;
-        mFabricInfo  = params.fabricTable->FindFabricWithCompressedId(peerId.GetCompressedFabricId());
-        mState       = State::NeedsAddress;
+        mFabricTable = params.fabricTable;
+        if (mFabricTable != nullptr)
+        {
+            auto fabricInfo = params.fabricTable->FindFabricWithCompressedId(peerId.GetCompressedFabricId());
+            if (fabricInfo != nullptr)
+            {
+                mFabricIndex = fabricInfo->GetFabricIndex();
+            }
+        }
+        mState = State::NeedsAddress;
         mAddressLookupHandle.SetListener(this);
     }
 
@@ -145,11 +154,15 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy,
     void OnSessionEstablished(const SessionHandle & session) override;
     void OnSessionEstablishmentError(CHIP_ERROR error) override;
 
-    /**
-     *   Called when a connection is closing.
-     *   The object releases all resources associated with the connection.
-     */
+    //////////// SessionDelegate Implementation ///////////////
+
+    // Called when a connection is closing. The object releases all resources associated with the connection.
     void OnSessionReleased() override;
+    // Called when a message is not acked within first retrans timer, try to refresh the peer address
+    void OnFirstMessageDeliveryFailed() override;
+    // Called when a connection is hanging. Try to re-establish another session, and shift to the new session when done, the
+    // original session won't be touched during the period.
+    void OnSessionHang() override;
 
     /**
      *  Mark any open session with the device as expired.
@@ -186,16 +199,9 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy,
     }
 
     /**
-     * @brief Get the raw Fabric ID assigned to the device.
+     * @brief Get the fabricIndex
      */
-    FabricIndex GetFabricIndex() const
-    {
-        if (mFabricInfo != nullptr)
-        {
-            return mFabricInfo->GetFabricIndex();
-        }
-        return kUndefinedFabricIndex;
-    }
+    FabricIndex GetFabricIndex() const { return mFabricIndex; }
 
     /**
      * Triggers a DNSSD lookup to find a usable peer address for this operational device.
@@ -218,7 +224,8 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy,
     };
 
     DeviceProxyInitParams mInitParams;
-    FabricInfo * mFabricInfo;
+    FabricTable * mFabricTable = nullptr;
+    FabricIndex mFabricIndex   = kUndefinedFabricIndex;
     System::Layer * mSystemLayer;
 
     // mCASEClient is only non-null if we are in State::Connecting or just
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
index 6ff7801934d0dd..01db106995905b 100644
--- a/src/app/ReadClient.cpp
+++ b/src/app/ReadClient.cpp
@@ -91,12 +91,12 @@ ReadClient::ReadClient(InteractionModelEngine * apImEngine, Messaging::ExchangeM
 
 void ReadClient::ClearActiveSubscriptionState()
 {
-    mIsInitialReport           = true;
-    mIsPrimingReports          = true;
-    mPendingMoreChunks         = false;
-    mMinIntervalFloorSeconds   = 0;
-    mMaxIntervalCeilingSeconds = 0;
-    mSubscriptionId            = 0;
+    mIsInitialReport         = true;
+    mIsPrimingReports        = true;
+    mPendingMoreChunks       = false;
+    mMinIntervalFloorSeconds = 0;
+    mMaxInterval             = 0;
+    mSubscriptionId          = 0;
     MoveToState(ClientState::Idle);
 }
 
@@ -141,18 +141,31 @@ void ReadClient::Close(CHIP_ERROR aError)
 
     mpExchangeCtx = nullptr;
 
-    if (aError != CHIP_NO_ERROR)
+    if (IsReadType())
     {
-        if (ResubscribeIfNeeded())
+        if (aError != CHIP_NO_ERROR)
         {
-            ClearActiveSubscriptionState();
-            return;
+            mpCallback.OnError(aError);
         }
-        mpCallback.OnError(aError);
     }
-
-    if (mReadPrepareParams.mResubscribePolicy != nullptr)
+    else
     {
+        if (aError != CHIP_NO_ERROR)
+        {
+            uint32_t nextResubscribeMsec = 0;
+
+            if (ResubscribeIfNeeded(nextResubscribeMsec))
+            {
+                ChipLogProgress(DataManagement,
+                                "Will try to resubscribe to %02x:" ChipLogFormatX64 " at retry index %" PRIu32 " after %" PRIu32
+                                "ms due to error %" CHIP_ERROR_FORMAT,
+                                mFabricIndex, ChipLogValueX64(mPeerNodeId), mNumRetries, nextResubscribeMsec, aError.Format());
+                mpCallback.OnResubscriptionAttempt(aError, nextResubscribeMsec);
+                ClearActiveSubscriptionState();
+                return;
+            }
+            mpCallback.OnError(aError);
+        }
         StopResubscription();
     }
 
@@ -274,7 +287,14 @@ CHIP_ERROR ReadClient::SendReadRequest(ReadPrepareParams & aReadPrepareParams)
     mpExchangeCtx = mpExchangeMgr->NewContext(aReadPrepareParams.mSessionHolder.Get().Value(), this);
     VerifyOrReturnError(mpExchangeCtx != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
-    mpExchangeCtx->SetResponseTimeout(aReadPrepareParams.mTimeout);
+    if (aReadPrepareParams.mTimeout == System::Clock::kZero)
+    {
+        mpExchangeCtx->UseSuggestedResponseTimeout(app::kExpectedIMProcessingTime);
+    }
+    else
+    {
+        mpExchangeCtx->SetResponseTimeout(aReadPrepareParams.mTimeout);
+    }
 
     ReturnErrorOnFailure(mpExchangeCtx->SendMessage(Protocols::InteractionModel::MsgType::ReadRequest, std::move(msgBuf),
                                                     Messaging::SendFlags(Messaging::SendMessageFlags::kExpectResponse)));
@@ -291,7 +311,7 @@ CHIP_ERROR ReadClient::GenerateEventPaths(EventPathIBs::Builder & aEventPathsBui
 {
     for (auto & event : aEventPaths)
     {
-        VerifyOrReturnError(event.IsValidEventPath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+        VerifyOrReturnError(event.IsValidEventPath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
         EventPathIB::Builder & path = aEventPathsBuilder.CreatePath();
         ReturnErrorOnFailure(aEventPathsBuilder.GetError());
         ReturnErrorOnFailure(path.Encode(event));
@@ -306,7 +326,7 @@ CHIP_ERROR ReadClient::GenerateAttributePaths(AttributePathIBs::Builder & aAttri
 {
     for (auto & attribute : aAttributePaths)
     {
-        VerifyOrReturnError(attribute.IsValidAttributePath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+        VerifyOrReturnError(attribute.IsValidAttributePath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
         AttributePathIB::Builder & path = aAttributePathIBsBuilder.CreatePath();
         ReturnErrorOnFailure(aAttributePathIBsBuilder.GetError());
         ReturnErrorOnFailure(path.Encode(attribute));
@@ -575,7 +595,7 @@ CHIP_ERROR ReadClient::ProcessReportData(System::PacketBufferHandle && aPayload)
 
     if (!suppressResponse)
     {
-        bool noResponseExpected = IsSubscriptionIdle() && !mPendingMoreChunks;
+        bool noResponseExpected = IsSubscriptionActive() && !mPendingMoreChunks;
         err                     = StatusResponse::Send(err == CHIP_NO_ERROR ? Protocols::InteractionModel::Status::Success
                                                         : Protocols::InteractionModel::Status::InvalidSubscription,
                                    mpExchangeCtx, !noResponseExpected);
@@ -603,13 +623,13 @@ CHIP_ERROR ReadClient::ProcessAttributePath(AttributePathIB::Parser & aAttribute
     CHIP_ERROR err = CHIP_NO_ERROR;
     // The ReportData must contain a concrete attribute path
     err = aAttributePathParser.GetEndpoint(&(aAttributePath.mEndpointId));
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
     err = aAttributePathParser.GetCluster(&(aAttributePath.mClusterId));
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
     err = aAttributePathParser.GetAttribute(&(aAttributePath.mAttributeId));
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
     err = aAttributePathParser.GetListIndex(aAttributePath);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
     return CHIP_NO_ERROR;
 }
 
@@ -734,8 +754,7 @@ CHIP_ERROR ReadClient::RefreshLivenessCheckTimer()
     VerifyOrReturnError(mpExchangeCtx != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrReturnError(mpExchangeCtx->HasSessionHandle(), err = CHIP_ERROR_INCORRECT_STATE);
 
-    System::Clock::Timeout timeout =
-        System::Clock::Seconds16(mMaxIntervalCeilingSeconds) + mpExchangeCtx->GetSessionHandle()->GetAckTimeout();
+    System::Clock::Timeout timeout = System::Clock::Seconds16(mMaxInterval) + mpExchangeCtx->GetSessionHandle()->GetAckTimeout();
     // EFR32/MBED/INFINION/K32W's chrono count return long unsinged, but other platform returns unsigned
     ChipLogProgress(DataManagement,
                     "Refresh LivenessCheckTime for %lu milliseconds with SubscriptionId = 0x%08" PRIx32
@@ -799,14 +818,12 @@ CHIP_ERROR ReadClient::ProcessSubscribeResponse(System::PacketBufferHandle && aP
     SubscriptionId subscriptionId = 0;
     ReturnErrorOnFailure(subscribeResponse.GetSubscriptionId(&subscriptionId));
     VerifyOrReturnError(IsMatchingClient(subscriptionId), CHIP_ERROR_INVALID_ARGUMENT);
-    ReturnErrorOnFailure(subscribeResponse.GetMinIntervalFloorSeconds(&mMinIntervalFloorSeconds));
-    ReturnErrorOnFailure(subscribeResponse.GetMaxIntervalCeilingSeconds(&mMaxIntervalCeilingSeconds));
+    ReturnErrorOnFailure(subscribeResponse.GetMaxInterval(&mMaxInterval));
 
     ChipLogProgress(DataManagement,
                     "Subscription established with SubscriptionID = 0x%08" PRIx32 " MinInterval = %u"
                     "s MaxInterval = %us Peer = %02x:" ChipLogFormatX64,
-                    mSubscriptionId, mMinIntervalFloorSeconds, mMaxIntervalCeilingSeconds, mFabricIndex,
-                    ChipLogValueX64(mPeerNodeId));
+                    mSubscriptionId, mMinIntervalFloorSeconds, mMaxInterval, mFabricIndex, ChipLogValueX64(mPeerNodeId));
 
     ReturnErrorOnFailure(subscribeResponse.ExitContainer());
 
@@ -840,11 +857,17 @@ CHIP_ERROR ReadClient::SendAutoResubscribeRequest(ReadPrepareParams && aReadPrep
     return err;
 }
 
-CHIP_ERROR ReadClient::SendSubscribeRequest(ReadPrepareParams & aReadPrepareParams)
+CHIP_ERROR ReadClient::SendSubscribeRequest(const ReadPrepareParams & aReadPrepareParams)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    VerifyOrReturnError(aReadPrepareParams.mMinIntervalFloorSeconds <= aReadPrepareParams.mMaxIntervalCeilingSeconds,
+                        CHIP_ERROR_INVALID_ARGUMENT);
+    mMinIntervalFloorSeconds = aReadPrepareParams.mMinIntervalFloorSeconds;
+    return SendSubscribeRequestImpl(aReadPrepareParams);
+}
 
-    VerifyOrReturnError(ClientState::Idle == mState, err = CHIP_ERROR_INCORRECT_STATE);
+CHIP_ERROR ReadClient::SendSubscribeRequestImpl(const ReadPrepareParams & aReadPrepareParams)
+{
+    VerifyOrReturnError(ClientState::Idle == mState, CHIP_ERROR_INCORRECT_STATE);
 
     // Todo: Remove the below, Update span in ReadPrepareParams
     Span<AttributePathParams> attributePaths(aReadPrepareParams.mpAttributePathParamsList,
@@ -853,9 +876,6 @@ CHIP_ERROR ReadClient::SendSubscribeRequest(ReadPrepareParams & aReadPreparePara
     Span<DataVersionFilter> dataVersionFilters(aReadPrepareParams.mpDataVersionFilterList,
                                                aReadPrepareParams.mDataVersionFilterListSize);
 
-    VerifyOrReturnError(aReadPrepareParams.mMinIntervalFloorSeconds <= aReadPrepareParams.mMaxIntervalCeilingSeconds,
-                        err = CHIP_ERROR_INVALID_ARGUMENT);
-
     System::PacketBufferHandle msgBuf;
     System::PacketBufferTLVWriter writer;
     SubscribeRequestMessage::Builder request;
@@ -870,14 +890,14 @@ CHIP_ERROR ReadClient::SendSubscribeRequest(ReadPrepareParams & aReadPreparePara
     if (!attributePaths.empty())
     {
         AttributePathIBs::Builder & attributePathListBuilder = request.CreateAttributeRequests();
-        ReturnErrorOnFailure(err = attributePathListBuilder.GetError());
+        ReturnErrorOnFailure(attributePathListBuilder.GetError());
         ReturnErrorOnFailure(GenerateAttributePaths(attributePathListBuilder, attributePaths));
     }
 
     if (!eventPaths.empty())
     {
         EventPathIBs::Builder & eventPathListBuilder = request.CreateEventRequests();
-        ReturnErrorOnFailure(err = eventPathListBuilder.GetError());
+        ReturnErrorOnFailure(eventPathListBuilder.GetError());
         ReturnErrorOnFailure(GenerateEventPaths(eventPathListBuilder, eventPaths));
 
         Optional<EventNumber> eventMin;
@@ -885,12 +905,12 @@ CHIP_ERROR ReadClient::SendSubscribeRequest(ReadPrepareParams & aReadPreparePara
         if (eventMin.HasValue())
         {
             EventFilterIBs::Builder & eventFilters = request.CreateEventFilters();
-            ReturnErrorOnFailure(err = request.GetError());
+            ReturnErrorOnFailure(request.GetError());
             ReturnErrorOnFailure(eventFilters.GenerateEventFilter(eventMin.Value()));
         }
     }
 
-    ReturnErrorOnFailure(err = request.IsFabricFiltered(aReadPrepareParams.mIsFabricFiltered).GetError());
+    ReturnErrorOnFailure(request.IsFabricFiltered(aReadPrepareParams.mIsFabricFiltered).GetError());
 
     bool encodedDataVersionList = false;
     TLV::TLVWriter backup;
@@ -912,14 +932,22 @@ CHIP_ERROR ReadClient::SendSubscribeRequest(ReadPrepareParams & aReadPreparePara
         request.Rollback(backup);
     }
 
-    ReturnErrorOnFailure(err = request.EndOfSubscribeRequestMessage().GetError());
+    ReturnErrorOnFailure(request.EndOfSubscribeRequestMessage().GetError());
     ReturnErrorOnFailure(writer.Finalize(&msgBuf));
 
     VerifyOrReturnError(aReadPrepareParams.mSessionHolder, CHIP_ERROR_MISSING_SECURE_SESSION);
 
     mpExchangeCtx = mpExchangeMgr->NewContext(aReadPrepareParams.mSessionHolder.Get().Value(), this);
-    VerifyOrReturnError(mpExchangeCtx != nullptr, err = CHIP_ERROR_NO_MEMORY);
-    mpExchangeCtx->SetResponseTimeout(kImMessageTimeout);
+    VerifyOrReturnError(mpExchangeCtx != nullptr, CHIP_ERROR_NO_MEMORY);
+
+    if (aReadPrepareParams.mTimeout == System::Clock::kZero)
+    {
+        mpExchangeCtx->UseSuggestedResponseTimeout(app::kExpectedIMProcessingTime);
+    }
+    else
+    {
+        mpExchangeCtx->SetResponseTimeout(aReadPrepareParams.mTimeout);
+    }
 
     ReturnErrorOnFailure(mpExchangeCtx->SendMessage(Protocols::InteractionModel::MsgType::SubscribeRequest, std::move(msgBuf),
                                                     Messaging::SendFlags(Messaging::SendMessageFlags::kExpectResponse)));
@@ -940,10 +968,11 @@ void ReadClient::OnResubscribeTimerCallback(System::Layer * apSystemLayer, void
     _this->mNumRetries++;
 }
 
-bool ReadClient::ResubscribeIfNeeded()
+bool ReadClient::ResubscribeIfNeeded(uint32_t & aNextResubscribeIntervalMsec)
 {
-    bool shouldResubscribe = true;
-    uint32_t intervalMsec  = 0;
+    bool shouldResubscribe       = true;
+    uint32_t intervalMsec        = 0;
+    aNextResubscribeIntervalMsec = 0;
     if (mReadPrepareParams.mResubscribePolicy == nullptr)
     {
         ChipLogDetail(DataManagement, "mResubscribePolicy is null");
@@ -963,10 +992,7 @@ bool ReadClient::ResubscribeIfNeeded()
         return false;
     }
 
-    ChipLogProgress(DataManagement,
-                    "Will try to Resubscribe to %02x:" ChipLogFormatX64 " at retry index %" PRIu32 " after %" PRIu32 "ms",
-                    mFabricIndex, ChipLogValueX64(mPeerNodeId), mNumRetries, intervalMsec);
-
+    aNextResubscribeIntervalMsec = intervalMsec;
     return true;
 }
 
diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h
index 68b2f63b1ab815..e79bab6e867dd0 100644
--- a/src/app/ReadClient.h
+++ b/src/app/ReadClient.h
@@ -118,6 +118,7 @@ class ReadClient : public Messaging::ExchangeDelegate
 
         /**
          * OnSubscriptionEstablished will be called when a subscription is established for the given subscription transaction.
+         * If using auto resubscription, OnSubscriptionEstablished will be called whenever resubscription is established.
          *
          * This object MUST continue to exist after this call is completed. The application shall wait until it
          * receives an OnDone call to destroy the object.
@@ -126,6 +127,16 @@ class ReadClient : public Messaging::ExchangeDelegate
          */
         virtual void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) {}
 
+        /**
+         * OnResubscriptionAttempt will be called when a re-subscription has been scheduled as a result of the termination of an
+         * in-progress or previously active subscription. This object MUST continue to exist after this call is completed. The
+         * application shall wait until it receives an OnDone call to destroy the object.
+         *
+         * @param[in] aTerminationCause The cause of failure of the subscription that just terminated.
+         * @param[in] aNextResubscribeIntervalMsec How long we will wait before trying to auto-resubscribe.
+         */
+        virtual void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) {}
+
         /**
          * OnError will be called when an error occurs *after* a successful call to SendRequest(). The following
          * errors will be delivered through this call in the aError field:
@@ -276,10 +287,10 @@ class ReadClient : public Messaging::ExchangeDelegate
     CHIP_ERROR GetReportingIntervals(uint16_t & aMinIntervalFloorSeconds, uint16_t & aMaxIntervalCeilingSeconds) const
     {
         VerifyOrReturnError(IsSubscriptionType(), CHIP_ERROR_INCORRECT_STATE);
-        VerifyOrReturnError(IsSubscriptionIdle(), CHIP_ERROR_INCORRECT_STATE);
+        VerifyOrReturnError(IsSubscriptionActive(), CHIP_ERROR_INCORRECT_STATE);
 
         aMinIntervalFloorSeconds   = mMinIntervalFloorSeconds;
-        aMaxIntervalCeilingSeconds = mMaxIntervalCeilingSeconds;
+        aMaxIntervalCeilingSeconds = mMaxInterval;
 
         return CHIP_NO_ERROR;
     }
@@ -302,6 +313,16 @@ class ReadClient : public Messaging::ExchangeDelegate
     // that's the only case when the consumer moved a ReadParams into the client.
     CHIP_ERROR SendAutoResubscribeRequest(ReadPrepareParams && aReadPrepareParams);
 
+    // Like SendSubscribeRequest, but allows sending certain forms of invalid
+    // subscribe requests that servers are expected to reject, for testing
+    // purposes.  Should only be called from tests.
+#if CONFIG_IM_BUILD_FOR_UNIT_TEST
+    CHIP_ERROR SendSubscribeRequestWithoutValidation(const ReadPrepareParams & aReadPrepareParams)
+    {
+        return SendSubscribeRequestImpl(aReadPrepareParams);
+    }
+#endif // CONFIG_IM_BUILD_FOR_UNIT_TEST
+
 private:
     friend class TestReadInteraction;
     friend class InteractionModelEngine;
@@ -328,7 +349,7 @@ class ReadClient : public Messaging::ExchangeDelegate
      *
      */
     bool IsIdle() const { return mState == ClientState::Idle; }
-    bool IsSubscriptionIdle() const { return mState == ClientState::SubscriptionActive; }
+    bool IsSubscriptionActive() const { return mState == ClientState::SubscriptionActive; }
     bool IsAwaitingInitialReport() const { return mState == ClientState::AwaitingInitialReport; }
     bool IsAwaitingSubscribeResponse() const { return mState == ClientState::AwaitingSubscribeResponse; }
 
@@ -355,10 +376,23 @@ class ReadClient : public Messaging::ExchangeDelegate
     CHIP_ERROR ProcessAttributePath(AttributePathIB::Parser & aAttributePath, ConcreteDataAttributePath & aClusterInfo);
     CHIP_ERROR ProcessReportData(System::PacketBufferHandle && aPayload);
     const char * GetStateStr() const;
-    bool ResubscribeIfNeeded();
+
+    /*
+     * Checks if we should re-subscribe based on the specified re-subscription policy. If we should, re-subscription is scheduled
+     * aNextResubscribeIntervalMsec is updated accordingly, and true is returned.
+     *
+     * If we should not resubscribe, false is returned.
+     *
+     *  @param[out]    aNextResubscribeIntervalMsec    How long we will wait before trying to auto-resubscribe.
+     */
+    bool ResubscribeIfNeeded(uint32_t & aNextResubscribeIntervalMsec);
+
     // Specialized request-sending functions.
     CHIP_ERROR SendReadRequest(ReadPrepareParams & aReadPrepareParams);
-    CHIP_ERROR SendSubscribeRequest(ReadPrepareParams & aSubscribePrepareParams);
+    // SendSubscribeRequest performs som validation on aSubscribePrepareParams
+    // and then calls SendSubscribeRequestImpl.
+    CHIP_ERROR SendSubscribeRequest(const ReadPrepareParams & aSubscribePrepareParams);
+    CHIP_ERROR SendSubscribeRequestImpl(const ReadPrepareParams & aSubscribePrepareParams);
     void UpdateDataVersionFilters(const ConcreteDataAttributePath & aPath);
     static void OnResubscribeTimerCallback(System::Layer * apSystemLayer, void * apAppState);
 
@@ -379,16 +413,16 @@ class ReadClient : public Messaging::ExchangeDelegate
     Messaging::ExchangeManager * mpExchangeMgr = nullptr;
     Messaging::ExchangeContext * mpExchangeCtx = nullptr;
     Callback & mpCallback;
-    ClientState mState                  = ClientState::Idle;
-    bool mIsInitialReport               = true;
-    bool mIsPrimingReports              = true;
-    bool mPendingMoreChunks             = false;
-    uint16_t mMinIntervalFloorSeconds   = 0;
-    uint16_t mMaxIntervalCeilingSeconds = 0;
-    SubscriptionId mSubscriptionId      = 0;
-    NodeId mPeerNodeId                  = kUndefinedNodeId;
-    FabricIndex mFabricIndex            = kUndefinedFabricIndex;
-    InteractionType mInteractionType    = InteractionType::Read;
+    ClientState mState                = ClientState::Idle;
+    bool mIsInitialReport             = true;
+    bool mIsPrimingReports            = true;
+    bool mPendingMoreChunks           = false;
+    uint16_t mMinIntervalFloorSeconds = 0;
+    uint16_t mMaxInterval             = 0;
+    SubscriptionId mSubscriptionId    = 0;
+    NodeId mPeerNodeId                = kUndefinedNodeId;
+    FabricIndex mFabricIndex          = kUndefinedFabricIndex;
+    InteractionType mInteractionType  = InteractionType::Read;
     Timestamp mEventTimestamp;
     bool mSawAttributeReportsInCurrentReport = false;
 
diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp
index 0693eb0bed5129..d80292233fdcd8 100644
--- a/src/app/ReadHandler.cpp
+++ b/src/app/ReadHandler.cpp
@@ -254,7 +254,8 @@ CHIP_ERROR ReadHandler::SendReportData(System::PacketBufferHandle && aPayload, b
     {
         MoveToState(HandlerState::AwaitingReportResponse);
     }
-    mpExchangeCtx->SetResponseTimeout(kImMessageTimeout);
+
+    mpExchangeCtx->UseSuggestedResponseTimeout(app::kExpectedIMProcessingTime);
     CHIP_ERROR err =
         mpExchangeCtx->SendMessage(Protocols::InteractionModel::MsgType::ReportData, std::move(aPayload),
                                    Messaging::SendFlags(noResponseExpected ? Messaging::SendMessageFlags::kNone
@@ -526,7 +527,7 @@ CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsPars
         err = path.GetEndpoint(&(event.mEndpointId));
         if (err == CHIP_NO_ERROR)
         {
-            VerifyOrReturnError(!event.HasWildcardEndpointId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+            VerifyOrReturnError(!event.HasWildcardEndpointId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
         }
         else if (err == CHIP_END_OF_TLV)
         {
@@ -537,7 +538,7 @@ CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsPars
         err = path.GetCluster(&(event.mClusterId));
         if (err == CHIP_NO_ERROR)
         {
-            VerifyOrReturnError(!event.HasWildcardClusterId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+            VerifyOrReturnError(!event.HasWildcardClusterId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
         }
         else if (err == CHIP_END_OF_TLV)
         {
@@ -552,7 +553,7 @@ CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsPars
         }
         else if (err == CHIP_NO_ERROR)
         {
-            VerifyOrReturnError(!event.HasWildcardEventId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH);
+            VerifyOrReturnError(!event.HasWildcardEventId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
         }
         ReturnErrorOnFailure(err);
 
@@ -671,10 +672,7 @@ CHIP_ERROR ReadHandler::SendSubscribeResponse()
 
     SubscribeResponseMessage::Builder response;
     ReturnErrorOnFailure(response.Init(&writer));
-    response.SubscriptionId(mSubscriptionId)
-        .MinIntervalFloorSeconds(mMinIntervalFloorSeconds)
-        .MaxIntervalCeilingSeconds(mMaxIntervalCeilingSeconds)
-        .EndOfSubscribeResponseMessage();
+    response.SubscriptionId(mSubscriptionId).MaxInterval(mMaxInterval).EndOfSubscribeResponseMessage();
     ReturnErrorOnFailure(response.GetError());
 
     ReturnErrorOnFailure(writer.Finalize(&packet));
@@ -742,8 +740,8 @@ CHIP_ERROR ReadHandler::ProcessSubscribeRequest(System::PacketBufferHandle && aP
     ReturnErrorOnFailure(err);
 
     ReturnErrorOnFailure(subscribeRequestParser.GetMinIntervalFloorSeconds(&mMinIntervalFloorSeconds));
-    ReturnErrorOnFailure(subscribeRequestParser.GetMaxIntervalCeilingSeconds(&mMaxIntervalCeilingSeconds));
-    VerifyOrReturnError(mMinIntervalFloorSeconds <= mMaxIntervalCeilingSeconds, CHIP_ERROR_INVALID_ARGUMENT);
+    ReturnErrorOnFailure(subscribeRequestParser.GetMaxIntervalCeilingSeconds(&mMaxInterval));
+    VerifyOrReturnError(mMinIntervalFloorSeconds <= mMaxInterval, CHIP_ERROR_INVALID_ARGUMENT);
 
     //
     // Notify the application (if requested) of the impending subscription and check whether we should still proceed to set it up.
@@ -759,7 +757,7 @@ CHIP_ERROR ReadHandler::ProcessSubscribeRequest(System::PacketBufferHandle && aP
     }
 
     ChipLogProgress(DataManagement, "Final negotiated min/max parameters: Min = %ds, Max = %ds", mMinIntervalFloorSeconds,
-                    mMaxIntervalCeilingSeconds);
+                    mMaxInterval);
 
     bool isFabricFiltered;
     ReturnErrorOnFailure(subscribeRequestParser.GetIsFabricFiltered(&isFabricFiltered));
@@ -784,7 +782,7 @@ void ReadHandler::OnUnblockHoldReportCallback(System::Layer * apSystemLayer, voi
         InteractionModelEngine::GetInstance()->GetReportingEngine().ScheduleRun();
     }
     InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->StartTimer(
-        System::Clock::Seconds16(readHandler->mMaxIntervalCeilingSeconds - readHandler->mMinIntervalFloorSeconds),
+        System::Clock::Seconds16(readHandler->mMaxInterval - readHandler->mMinIntervalFloorSeconds),
         OnRefreshSubscribeTimerSyncCallback, readHandler);
 }
 
@@ -794,13 +792,13 @@ void ReadHandler::OnRefreshSubscribeTimerSyncCallback(System::Layer * apSystemLa
     ReadHandler * readHandler = static_cast<ReadHandler *>(apAppState);
     readHandler->mFlags.Set(ReadHandlerFlags::HoldSync, false);
     ChipLogDetail(DataManagement, "Refresh subscribe timer sync after %d seconds",
-                  readHandler->mMaxIntervalCeilingSeconds - readHandler->mMinIntervalFloorSeconds);
+                  readHandler->mMaxInterval - readHandler->mMinIntervalFloorSeconds);
     InteractionModelEngine::GetInstance()->GetReportingEngine().ScheduleRun();
 }
 
 CHIP_ERROR ReadHandler::RefreshSubscribeSyncTimer()
 {
-    ChipLogDetail(DataManagement, "Refresh Subscribe Sync Timer with max %d seconds", mMaxIntervalCeilingSeconds);
+    ChipLogDetail(DataManagement, "Refresh Subscribe Sync Timer with max %d seconds", mMaxInterval);
     InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->CancelTimer(
         OnUnblockHoldReportCallback, this);
     InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->CancelTimer(
diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h
index 87d2c425b954e1..b3191760a5ae4c 100644
--- a/src/app/ReadHandler.h
+++ b/src/app/ReadHandler.h
@@ -45,6 +45,9 @@
 #include <protocols/Protocols.h>
 #include <system/SystemPacketBuffer.h>
 
+// https://github.com/CHIP-Specifications/connectedhomeip-spec/blob/61a9d19e6af12fdfb0872bcff26d19de6c680a1a/src/Ch02_Architecture.adoc#1122-subscribe-interaction-limits
+constexpr uint16_t kSubscriptionMaxIntervalPublisherLimit = 3600; // 3600 seconds
+
 namespace chip {
 namespace app {
 
@@ -167,20 +170,22 @@ class ReadHandler : public Messaging::ExchangeDelegate
     void GetReportingIntervals(uint16_t & aMinInterval, uint16_t & aMaxInterval) const
     {
         aMinInterval = mMinIntervalFloorSeconds;
-        aMaxInterval = mMaxIntervalCeilingSeconds;
+        aMaxInterval = mMaxInterval;
     }
 
     /*
      * Set the reporting intervals for the subscription. This SHALL only be called
-     * from the OnSubscriptionRequested callback above.
+     * from the OnSubscriptionRequested callback above. The restriction is as below
+     * MinIntervalFloor ≤ MaxInterval ≤ MAX(SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT, MaxIntervalCeiling)
+     * Where SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT is set to 60m in the spec.
      */
-    CHIP_ERROR SetReportingIntervals(uint16_t aMinInterval, uint16_t aMaxInterval)
+    CHIP_ERROR SetReportingIntervals(uint16_t aMaxInterval)
     {
         VerifyOrReturnError(IsIdle(), CHIP_ERROR_INCORRECT_STATE);
-        VerifyOrReturnError(aMinInterval <= aMaxInterval, CHIP_ERROR_INVALID_ARGUMENT);
-
-        mMinIntervalFloorSeconds   = aMinInterval;
-        mMaxIntervalCeilingSeconds = aMaxInterval;
+        VerifyOrReturnError(mMinIntervalFloorSeconds <= aMaxInterval, CHIP_ERROR_INVALID_ARGUMENT);
+        VerifyOrReturnError(aMaxInterval <= std::max(kSubscriptionMaxIntervalPublisherLimit, mMaxInterval),
+                            CHIP_ERROR_INVALID_ARGUMENT);
+        mMaxInterval = aMaxInterval;
         return CHIP_NO_ERROR;
     }
 
@@ -428,9 +433,9 @@ class ReadHandler : public Messaging::ExchangeDelegate
     // engine, the "oldest" subscription is the subscription with the smallest generation.
     uint64_t mTransactionStartGeneration = 0;
 
-    SubscriptionId mSubscriptionId      = 0;
-    uint16_t mMinIntervalFloorSeconds   = 0;
-    uint16_t mMaxIntervalCeilingSeconds = 0;
+    SubscriptionId mSubscriptionId    = 0;
+    uint16_t mMinIntervalFloorSeconds = 0;
+    uint16_t mMaxInterval             = 0;
 
     EventNumber mEventMin = 0;
 
diff --git a/src/app/ReadPrepareParams.h b/src/app/ReadPrepareParams.h
index 0633f870b0d4aa..6d95b8b0b48a17 100644
--- a/src/app/ReadPrepareParams.h
+++ b/src/app/ReadPrepareParams.h
@@ -49,7 +49,9 @@ struct ReadPrepareParams
     DataVersionFilter * mpDataVersionFilterList     = nullptr;
     size_t mDataVersionFilterListSize               = 0;
     Optional<EventNumber> mEventNumber;
-    System::Clock::Timeout mTimeout          = kImMessageTimeout;
+    // The timeout for waiting for the response or System::Clock::kZero to let the interaction model decide the timeout based on the
+    // MRP timeouts of the session.
+    System::Clock::Timeout mTimeout          = System::Clock::kZero;
     uint16_t mMinIntervalFloorSeconds        = 0;
     uint16_t mMaxIntervalCeilingSeconds      = 0;
     bool mKeepSubscriptions                  = false;
diff --git a/src/app/StatusResponse.cpp b/src/app/StatusResponse.cpp
index 19042ce06762c3..e9e8af70a5f656 100644
--- a/src/app/StatusResponse.cpp
+++ b/src/app/StatusResponse.cpp
@@ -37,7 +37,7 @@ CHIP_ERROR StatusResponse::Send(Protocols::InteractionModel::Status aStatus, Mes
     response.Status(aStatus);
     ReturnErrorOnFailure(response.GetError());
     ReturnErrorOnFailure(writer.Finalize(&msgBuf));
-    apExchangeContext->SetResponseTimeout(kImMessageTimeout);
+    apExchangeContext->UseSuggestedResponseTimeout(app::kExpectedIMProcessingTime);
     ReturnErrorOnFailure(apExchangeContext->SendMessage(Protocols::InteractionModel::MsgType::StatusResponse, std::move(msgBuf),
                                                         aExpectResponse ? Messaging::SendMessageFlags::kExpectResponse
                                                                         : Messaging::SendMessageFlags::kNone));
diff --git a/src/app/TestEventTriggerDelegate.h b/src/app/TestEventTriggerDelegate.h
new file mode 100644
index 00000000000000..5186fc473fd0cc
--- /dev/null
+++ b/src/app/TestEventTriggerDelegate.h
@@ -0,0 +1,52 @@
+/*
+ *    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 <lib/core/CHIPError.h>
+#include <lib/support/Span.h>
+#include <stddef.h>
+#include <stdint.h>
+
+namespace chip {
+
+class TestEventTriggerDelegate
+{
+public:
+    /* Expected byte size of the EnableKey */
+    static constexpr size_t kEnableKeyLength = 16;
+
+    virtual ~TestEventTriggerDelegate() {}
+    /**
+     * Checks to see if `enableKey` provided matches value chosen by the manufacturer.
+     *
+     * @param[in] enableKey Buffer of the key to verify.
+     */
+    virtual bool DoesEnableKeyMatch(const ByteSpan & enableKey) const = 0;
+
+    /**
+     * Expectation is that the caller has already validated the enable key before calling this.
+     * Handles the test event trigger based on `eventTrigger` provided.
+     *
+     * @param[in] eventTrigger Event trigger to handle.
+     *
+     * @return CHIP_ERROR_INVALID_ARGUMENT when eventTrigger is not a valid test event trigger.
+     */
+    virtual CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) = 0;
+};
+
+} // namespace chip
diff --git a/src/app/TimedHandler.cpp b/src/app/TimedHandler.cpp
index 13ef75ca4eabaf..b62d835f2ace8e 100644
--- a/src/app/TimedHandler.cpp
+++ b/src/app/TimedHandler.cpp
@@ -130,7 +130,8 @@ CHIP_ERROR TimedHandler::HandleTimedRequestAction(Messaging::ExchangeContext * a
     // will send nothing and the other side will have to time out to realize
     // it's missed its window).
     auto delay = System::Clock::Milliseconds32(timeoutMs);
-    aExchangeContext->SetResponseTimeout(std::max(delay, kImMessageTimeout));
+    aExchangeContext->SetResponseTimeout(
+        std::max(delay, aExchangeContext->GetSessionHandle()->ComputeRoundTripTimeout(app::kExpectedIMProcessingTime)));
     ReturnErrorOnFailure(StatusResponse::Send(Status::Success, aExchangeContext, /* aExpectResponse = */ true));
 
     // Now just wait for the client.
diff --git a/src/app/WriteClient.cpp b/src/app/WriteClient.cpp
index 56969167c8ca63..f5f84e847f824a 100644
--- a/src/app/WriteClient.cpp
+++ b/src/app/WriteClient.cpp
@@ -85,29 +85,29 @@ CHIP_ERROR WriteClient::ProcessWriteResponseMessage(System::PacketBufferHandle &
 
     reader.Init(std::move(payload));
 
-    err = writeResponse.Init(reader);
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(writeResponse.Init(reader));
 
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-    err = writeResponse.CheckSchemaValidity();
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(writeResponse.CheckSchemaValidity());
 #endif
+
     err = writeResponse.GetWriteResponses(&attributeStatusesParser);
-    SuccessOrExit(err);
+    if (err == CHIP_END_OF_TLV)
+    {
+        return CHIP_NO_ERROR;
+    }
+    ReturnErrorOnFailure(err);
 
     attributeStatusesParser.GetReader(&attributeStatusesReader);
 
     while (CHIP_NO_ERROR == (err = attributeStatusesReader.Next()))
     {
-        VerifyOrExit(TLV::AnonymousTag() == attributeStatusesReader.GetTag(), err = CHIP_ERROR_INVALID_TLV_TAG);
+        VerifyOrReturnError(TLV::AnonymousTag() == attributeStatusesReader.GetTag(), err = CHIP_ERROR_INVALID_TLV_TAG);
 
         AttributeStatusIB::Parser element;
 
-        err = element.Init(attributeStatusesReader);
-        SuccessOrExit(err);
-
-        err = ProcessAttributeStatusIB(element);
-        SuccessOrExit(err);
+        ReturnErrorOnFailure(element.Init(attributeStatusesReader));
+        ReturnErrorOnFailure(ProcessAttributeStatusIB(element));
     }
 
     // if we have exhausted this container
@@ -115,11 +115,8 @@ CHIP_ERROR WriteClient::ProcessWriteResponseMessage(System::PacketBufferHandle &
     {
         err = CHIP_NO_ERROR;
     }
-    SuccessOrExit(err);
-    ReturnErrorOnFailure(writeResponse.ExitContainer());
-
-exit:
-    return err;
+    ReturnErrorOnFailure(err);
+    return writeResponse.ExitContainer();
 }
 
 CHIP_ERROR WriteClient::PrepareAttributeIB(const ConcreteDataAttributePath & aPath)
@@ -372,7 +369,15 @@ CHIP_ERROR WriteClient::SendWriteRequest(const SessionHandle & session, System::
     mpExchangeCtx = mpExchangeMgr->NewContext(session, this);
     VerifyOrExit(mpExchangeCtx != nullptr, err = CHIP_ERROR_NO_MEMORY);
     VerifyOrReturnError(!(mpExchangeCtx->IsGroupExchangeContext() && mHasDataVersion), CHIP_ERROR_INVALID_MESSAGE_TYPE);
-    mpExchangeCtx->SetResponseTimeout(timeout);
+
+    if (timeout == System::Clock::kZero)
+    {
+        mpExchangeCtx->UseSuggestedResponseTimeout(app::kExpectedIMProcessingTime);
+    }
+    else
+    {
+        mpExchangeCtx->SetResponseTimeout(timeout);
+    }
 
     if (mTimedWriteTimeoutMs.HasValue())
     {
diff --git a/src/app/WriteClient.h b/src/app/WriteClient.h
index 7360d4566f23eb..5e8d4660a4558f 100644
--- a/src/app/WriteClient.h
+++ b/src/app/WriteClient.h
@@ -214,11 +214,11 @@ class WriteClient : public Messaging::ExchangeDelegate
      *  handle calling Shutdown on itself once it decides it's done with waiting
      *  for a response (i.e. times out or gets a response). Client can specify
      *  the maximum time to wait for response (in milliseconds) via timeout parameter.
-     *  Default timeout value will be used otherwise.
+     *  If the timeout is missing or is set to System::Clock::kZero, a value based on the MRP timeouts of the session will be used.
      *  If SendWriteRequest is never called, or the call fails, the API
      *  consumer is responsible for calling Shutdown on the WriteClient.
      */
-    CHIP_ERROR SendWriteRequest(const SessionHandle & session, System::Clock::Timeout timeout = kImMessageTimeout);
+    CHIP_ERROR SendWriteRequest(const SessionHandle & session, System::Clock::Timeout timeout = System::Clock::kZero);
 
     /**
      *  Shutdown the WriteClient. This terminates this instance
diff --git a/src/app/WriteHandler.cpp b/src/app/WriteHandler.cpp
index e00ea35fa81dcf..ba52461882abe9 100644
--- a/src/app/WriteHandler.cpp
+++ b/src/app/WriteHandler.cpp
@@ -192,7 +192,7 @@ CHIP_ERROR WriteHandler::SendWriteResponse(System::PacketBufferTLVWriter && aMes
     SuccessOrExit(err);
 
     VerifyOrExit(mpExchangeCtx != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
-    mpExchangeCtx->SetResponseTimeout(kImMessageTimeout);
+    mpExchangeCtx->UseSuggestedResponseTimeout(app::kExpectedIMProcessingTime);
     err = mpExchangeCtx->SendMessage(Protocols::InteractionModel::MsgType::WriteResponse, std::move(packet),
                                      mHasMoreChunks ? Messaging::SendMessageFlags::kExpectResponse
                                                     : Messaging::SendMessageFlags::kNone);
diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake
index a96999b4565f86..72a62b3b2d9e26 100644
--- a/src/app/chip_data_model.cmake
+++ b/src/app/chip_data_model.cmake
@@ -82,7 +82,6 @@ function(chip_configure_data_model APP_TARGET)
         ${CHIP_APP_BASE_DIR}/util/attribute-storage.cpp
         ${CHIP_APP_BASE_DIR}/util/attribute-table.cpp
         ${CHIP_APP_BASE_DIR}/util/binding-table.cpp
-        ${CHIP_APP_BASE_DIR}/util/client-api.cpp
         ${CHIP_APP_BASE_DIR}/util/DataModelHandler.cpp
         ${CHIP_APP_BASE_DIR}/util/ember-compatibility-functions.cpp
         ${CHIP_APP_BASE_DIR}/util/ember-print.cpp
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index c3de9548455050..1c08a5e433e4f1 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -71,9 +71,6 @@ template("chip_data_model") {
       "${_app_root}/clusters/color-control-server/color-control-server.h",
       "${_app_root}/clusters/door-lock-server/door-lock-server.h",
       "${_app_root}/clusters/groups-server/groups-server.h",
-      "${_app_root}/clusters/ias-zone-client/ias-zone-client.h",
-      "${_app_root}/clusters/ias-zone-server/ias-zone-server-tokens.h",
-      "${_app_root}/clusters/ias-zone-server/ias-zone-server.h",
       "${_app_root}/clusters/identify-server/identify-server.h",
       "${_app_root}/clusters/level-control/level-control.h",
       "${_app_root}/clusters/on-off-server/on-off-server.h",
@@ -87,7 +84,6 @@ template("chip_data_model") {
       "${_app_root}/util/attribute-table.cpp",
       "${_app_root}/util/binding-table.cpp",
       "${_app_root}/util/binding-table.h",
-      "${_app_root}/util/client-api.cpp",
       "${_app_root}/util/ember-compatibility-functions.cpp",
       "${_app_root}/util/ember-print.cpp",
       "${_app_root}/util/error-mapping.cpp",
diff --git a/src/app/clusters/basic/basic.cpp b/src/app/clusters/basic/basic.cpp
index 0d5b9a91a812b3..c12a0c7bf72c88 100644
--- a/src/app/clusters/basic/basic.cpp
+++ b/src/app/clusters/basic/basic.cpp
@@ -26,6 +26,7 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/ConfigurationManager.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/PlatformManager.h>
 
 #include <cstddef>
@@ -125,7 +126,7 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
 
     case HardwareVersion::Id: {
         uint16_t hardwareVersion = 0;
-        status                   = ConfigurationMgr().GetHardwareVersion(hardwareVersion);
+        status                   = GetDeviceInstanceInfoProvider()->GetHardwareVersion(hardwareVersion);
         if (status == CHIP_NO_ERROR)
         {
             status = aEncoder.Encode(hardwareVersion);
@@ -136,7 +137,7 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
     case HardwareVersionString::Id: {
         constexpr size_t kMaxLen                = DeviceLayer::ConfigurationManager::kMaxHardwareVersionStringLength;
         char hardwareVersionString[kMaxLen + 1] = { 0 };
-        status = ConfigurationMgr().GetHardwareVersionString(hardwareVersionString, sizeof(hardwareVersionString));
+        status = GetDeviceInstanceInfoProvider()->GetHardwareVersionString(hardwareVersionString, sizeof(hardwareVersionString));
         status = EncodeStringOnSuccess(status, aEncoder, hardwareVersionString, kMaxLen);
         break;
     }
@@ -165,7 +166,8 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
         uint16_t manufacturingYear;
         uint8_t manufacturingMonth;
         uint8_t manufacturingDayOfMonth;
-        status = ConfigurationMgr().GetManufacturingDate(manufacturingYear, manufacturingMonth, manufacturingDayOfMonth);
+        status =
+            GetDeviceInstanceInfoProvider()->GetManufacturingDate(manufacturingYear, manufacturingMonth, manufacturingDayOfMonth);
 
         // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
         if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
@@ -237,7 +239,7 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib
     case SerialNumber::Id: {
         constexpr size_t kMaxLen             = DeviceLayer::ConfigurationManager::kMaxSerialNumberLength;
         char serialNumberString[kMaxLen + 1] = { 0 };
-        status                               = ConfigurationMgr().GetSerialNumber(serialNumberString, sizeof(serialNumberString));
+        status = GetDeviceInstanceInfoProvider()->GetSerialNumber(serialNumberString, sizeof(serialNumberString));
 
         // TODO: Remove defaulting once proper runtime defaulting of unimplemented factory data is done
         if (status == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND || status == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
index 939d4a3baf7a40..93f83a529953b5 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -27,6 +27,7 @@
 #include <app-common/zap-generated/cluster-id.h>
 #include <app-common/zap-generated/command-id.h>
 #include <app/EventLogging.h>
+#include <app/server/Server.h>
 #include <app/util/af-event.h>
 #include <app/util/af.h>
 #include <cinttypes>
@@ -52,6 +53,29 @@ static constexpr uint32_t DOOR_LOCK_MAX_LOCK_TIMEOUT_SEC = MAX_INT32U_VALUE / (2
 
 DoorLockServer DoorLockServer::instance;
 
+class DoorLockClusterFabricDelegate : public chip::FabricTable::Delegate
+{
+    void OnFabricDeletedFromStorage(FabricTable & fabricTable, FabricIndex fabricIndex) override
+    {
+        for (auto endpointId : EnabledEndpointsWithServerCluster(chip::app::Clusters::DoorLock::Id))
+        {
+            if (!DoorLockServer::Instance().OnFabricRemoved(endpointId, fabricIndex))
+            {
+                ChipLogError(Zcl,
+                             "Unable to handle fabric removal from the Door Lock Server instance [endpointId=%d,fabricIndex=%d]",
+                             endpointId, fabricIndex);
+            }
+        }
+    }
+
+    // Intentionally left blank
+    void OnFabricRetrievedFromStorage(FabricTable & fabricTable, FabricIndex fabricIndex) override {}
+
+    // Intentionally left blank
+    void OnFabricPersistedToStorage(FabricTable & fabricTable, FabricIndex fabricIndex) override {}
+};
+static DoorLockClusterFabricDelegate gFabricDelegate;
+
 void emberAfPluginDoorLockOnAutoRelock(chip::EndpointId endpointId);
 
 /**********************************************************
@@ -72,13 +96,22 @@ void DoorLockServer::InitServer(chip::EndpointId endpointId)
 {
     emberAfDoorLockClusterPrintln("Door Lock cluster initialized at endpoint #%u", endpointId);
 
-    SetLockState(endpointId, DlLockState::kLocked, DlOperationSource::kUnspecified);
+    auto status = Attributes::LockState::SetNull(endpointId);
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        ChipLogError(Zcl, "[InitDoorLockServer] Unable to set the Lock State attribute to null [status=%d]", status);
+    }
     SetActuatorEnabled(endpointId, true);
 }
 
+bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLockState)
+{
+    return SetAttribute(endpointId, Attributes::LockState::Id, Attributes::LockState::Set, newLockState);
+}
+
 bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLockState, DlOperationSource opSource)
 {
-    bool success = SetAttribute(endpointId, Attributes::LockState::Id, Attributes::LockState::Set, newLockState);
+    bool success = SetLockState(endpointId, newLockState);
 
     // Remote operations are handled separately as they use more data unavailable here
     VerifyOrReturnError(DlOperationSource::kRemote != opSource, success);
@@ -197,6 +230,12 @@ bool DoorLockServer::GetNumberOfCredentialsSupportedPerUser(chip::EndpointId end
                         Attributes::NumberOfCredentialsSupportedPerUser::Get, numberOfCredentialsSupportedPerUser);
 }
 
+bool DoorLockServer::GetNumberOfHolidaySchedulesSupported(chip::EndpointId endpointId, uint8_t & numberOfHolidaySchedules)
+{
+    return GetAttribute(endpointId, Attributes::NumberOfHolidaySchedulesSupported::Id,
+                        Attributes::NumberOfHolidaySchedulesSupported::Get, numberOfHolidaySchedules);
+}
+
 void DoorLockServer::SetUserCommandHandler(chip::app::CommandHandler * commandObj,
                                            const chip::app::ConcreteCommandPath & commandPath,
                                            const chip::app::Clusters::DoorLock::Commands::SetUser::DecodableType & commandData)
@@ -343,18 +382,26 @@ void DoorLockServer::GetUserCommandHandler(chip::app::CommandHandler * commandOb
                 }
                 SuccessOrExit(err = writer->EndContainer(credentialsContainer));
             }
-            SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kCreatorFabricIndex)), user.createdBy));
-            SuccessOrExit(
-                err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kLastModifiedFabricIndex)), user.lastModifiedBy));
+            // Append fabric IDs only if the user was created/modified by matter
+            if (user.creationSource == DlAssetSource::kMatterIM)
+            {
+                SuccessOrExit(err =
+                                  writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kCreatorFabricIndex)), user.createdBy));
+            }
+            if (user.modificationSource == DlAssetSource::kMatterIM)
+            {
+                SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kLastModifiedFabricIndex)),
+                                                user.lastModifiedBy));
+            }
         }
         else
         {
             emberAfDoorLockClusterPrintln("[GetUser] User not found [userIndex=%d]", userIndex);
         }
 
-        // appclusters, 5.2.4.36.1: We need to add next available user after userIndex if any.
+        // appclusters, 5.2.4.36.1: We need to add next occupied user after userIndex if any.
         uint16_t nextAvailableUserIndex = 0;
-        if (findUnoccupiedUserSlot(commandPath.mEndpointId, static_cast<uint16_t>(userIndex + 1), nextAvailableUserIndex))
+        if (findOccupiedUserSlot(commandPath.mEndpointId, static_cast<uint16_t>(userIndex + 1), nextAvailableUserIndex))
         {
             SuccessOrExit(err =
                               writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kNextUserIndex)), nextAvailableUserIndex));
@@ -655,54 +702,34 @@ void DoorLockServer::GetCredentialStatusCommandHandler(
         }
     }
 
-    uint16_t nextCredentialIndex = 0;
-
-    CHIP_ERROR err                = CHIP_NO_ERROR;
-    using ResponseFields          = Commands::GetCredentialStatusResponse::Fields;
-    app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ::Id, Commands::GetCredentialStatusResponse::Id };
-    TLV::TLVWriter * writer       = nullptr;
-    SuccessOrExit(err = commandObj->PrepareCommand(path));
-    VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
-    SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kCredentialExists)), credentialExists));
+    Commands::GetCredentialStatusResponse::Type response{ .credentialExists = credentialExists };
     if (credentialExists)
     {
         if (0 != userIndexWithCredential)
         {
-            SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserIndex)), userIndexWithCredential));
+            response.userIndex.SetNonNull(userIndexWithCredential);
         }
-        if (kUndefinedFabricIndex != credentialInfo.createdBy)
+        if (credentialInfo.creationSource == DlAssetSource::kMatterIM)
         {
-            SuccessOrExit(
-                err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kCreatorFabricIndex)), credentialInfo.createdBy));
+            response.creatorFabricIndex.SetNonNull(credentialInfo.createdBy);
         }
-        if (kUndefinedFabricIndex != credentialInfo.lastModifiedBy)
+        if (credentialInfo.modificationSource == DlAssetSource::kMatterIM)
         {
-            SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kLastModifiedFabricIndex)),
-                                            credentialInfo.lastModifiedBy));
+            response.lastModifiedFabricIndex.SetNonNull(credentialInfo.lastModifiedBy);
         }
     }
-    if (findUnoccupiedCredentialSlot(commandPath.mEndpointId, credentialType, static_cast<uint16_t>(credentialIndex + 1),
-                                     nextCredentialIndex))
+    uint16_t nextCredentialIndex = 0;
+    if (findOccupiedCredentialSlot(commandPath.mEndpointId, credentialType, static_cast<uint16_t>(credentialIndex + 1),
+                                   nextCredentialIndex))
     {
-        SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kNextCredentialIndex)), nextCredentialIndex));
+        response.nextCredentialIndex.SetNonNull(nextCredentialIndex);
     }
-    SuccessOrExit(err = commandObj->FinishCommand());
+    commandObj->AddResponse(commandPath, response);
 
     emberAfDoorLockClusterPrintln("[GetCredentialStatus] Prepared credential status "
                                   "[endpointId=%d,credentialType=%u,credentialIndex=%d,userIndex=%d,nextCredentialIndex=%d]",
                                   commandPath.mEndpointId, to_underlying(credentialType), credentialIndex, userIndexWithCredential,
                                   nextCredentialIndex);
-
-exit:
-    if (CHIP_NO_ERROR != err)
-    {
-        ChipLogError(Zcl,
-                     "[GetCredentialStatus] Error occurred when preparing response: %s "
-                     "[endpointId=%d,credentialType=%u,credentialIndex=%d,userIndex=%d,nextCredentialIndex=%d]",
-                     err.AsString(), commandPath.mEndpointId, to_underlying(credentialType), credentialIndex,
-                     userIndexWithCredential, nextCredentialIndex);
-        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
-    }
 }
 
 void DoorLockServer::ClearCredentialCommandHandler(
@@ -1204,6 +1231,32 @@ bool DoorLockServer::HasFeature(chip::EndpointId endpointId, DoorLockFeature fea
     return success && ((featureMap & to_underlying(feature)) != 0);
 }
 
+bool DoorLockServer::OnFabricRemoved(chip::EndpointId endpointId, chip::FabricIndex fabricIndex)
+{
+    emberAfDoorLockClusterPrintln(
+        "[OnFabricRemoved] Handling a fabric removal from the door lock server [endpointId=%d,fabricIndex=%d]", endpointId,
+        fabricIndex);
+
+    // Iterate over all the users and clean up the deleted fabric
+    if (!clearFabricFromUsers(endpointId, fabricIndex))
+    {
+        ChipLogError(Zcl, "[OnFabricRemoved] Unable to cleanup fabric from users - internal error [endpointId=%d,fabricIndex=%d]",
+                     endpointId, fabricIndex);
+        return false;
+    }
+
+    // Iterate over all the credentials and clean up the fabrics
+    if (!clearFabricFromCredentials(endpointId, fabricIndex))
+    {
+        ChipLogError(Zcl,
+                     "[OnFabricRemoved] Unable to cleanup fabric from credentials - internal error [endpointId=%d,fabricIndex=%d]",
+                     endpointId, fabricIndex);
+        return false;
+    }
+
+    return true;
+}
+
 /**********************************************************
  * DoorLockServer private methods
  *********************************************************/
@@ -1353,6 +1406,32 @@ bool DoorLockServer::getMaxNumberOfCredentials(chip::EndpointId endpointId, DlCr
     return status;
 }
 
+bool DoorLockServer::findOccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex)
+{
+    uint16_t maxNumberOfUsers;
+    VerifyOrReturnError(GetAttribute(endpointId, Attributes::NumberOfTotalUsersSupported::Id,
+                                     Attributes::NumberOfTotalUsersSupported::Get, maxNumberOfUsers),
+                        false);
+
+    userIndex = 0;
+    for (uint16_t i = startIndex; i <= maxNumberOfUsers; ++i)
+    {
+        EmberAfPluginDoorLockUserInfo user;
+        if (!emberAfPluginDoorLockGetUser(endpointId, i, user))
+        {
+            ChipLogError(Zcl, "Unable to get user to check if slot is occupied: app error [userIndex=%d]", i);
+            return false;
+        }
+
+        if (DlUserStatus::kAvailable != user.userStatus)
+        {
+            userIndex = i;
+            return true;
+        }
+    }
+    return false;
+}
+
 bool DoorLockServer::findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t & userIndex)
 {
     return findUnoccupiedUserSlot(endpointId, 1, userIndex);
@@ -1384,6 +1463,42 @@ bool DoorLockServer::findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_
     return false;
 }
 
+bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
+                                                uint16_t & credentialIndex)
+{
+    uint16_t maxNumberOfCredentials = 0;
+    if (!getMaxNumberOfCredentials(endpointId, credentialType, maxNumberOfCredentials))
+    {
+        return false;
+    }
+
+    // Programming PIN index starts with 0, and it is assumed that it is unique. Therefore different bounds checking for that
+    // credential type
+    if (DlCredentialType::kProgrammingPIN == credentialType)
+    {
+        maxNumberOfCredentials--;
+    }
+
+    for (uint16_t i = startIndex; i <= maxNumberOfCredentials; ++i)
+    {
+        EmberAfPluginDoorLockCredentialInfo info;
+        if (!emberAfPluginDoorLockGetCredential(endpointId, i, credentialType, info))
+        {
+            ChipLogError(Zcl, "Unable to get credential: app error [endpointId=%d,credentialType=%u,credentialIndex=%d]",
+                         endpointId, to_underlying(credentialType), i);
+            return false;
+        }
+
+        if (DlCredentialStatus::kAvailable != info.status)
+        {
+            credentialIndex = i;
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
                                                   uint16_t & credentialIndex)
 {
@@ -1714,6 +1829,53 @@ EmberAfStatus DoorLockServer::clearUser(chip::EndpointId endpointId, chip::Fabri
     return EMBER_ZCL_STATUS_SUCCESS;
 }
 
+bool DoorLockServer::clearFabricFromUsers(chip::EndpointId endpointId, chip::FabricIndex fabricIndex)
+{
+    uint16_t maxNumberOfUsers;
+    VerifyOrReturnError(GetAttribute(endpointId, Attributes::NumberOfTotalUsersSupported::Id,
+                                     Attributes::NumberOfTotalUsersSupported::Get, maxNumberOfUsers),
+                        false);
+
+    for (uint16_t userIndex = 1; userIndex <= maxNumberOfUsers; ++userIndex)
+    {
+        EmberAfPluginDoorLockUserInfo user;
+        if (!emberAfPluginDoorLockGetUser(endpointId, userIndex, user))
+        {
+            ChipLogError(Zcl,
+                         "[OnFabricRemoved] Unable to get the user - internal error [endpointId=%d,fabricIndex=%d,userIndex=%d]",
+                         endpointId, fabricIndex, userIndex);
+            continue;
+        }
+
+        // Filter out unoccupied slots and users that don't have corresponding fabricIndex in the created/modified fields
+        if (DlUserStatus::kAvailable == user.userStatus || (fabricIndex != user.createdBy && fabricIndex != user.lastModifiedBy))
+        {
+            continue;
+        }
+
+        if (user.createdBy == fabricIndex)
+        {
+            user.createdBy = kUndefinedFabricIndex;
+        }
+
+        if (user.lastModifiedBy == fabricIndex)
+        {
+            user.lastModifiedBy = kUndefinedFabricIndex;
+        }
+
+        if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, user.createdBy, user.lastModifiedBy, user.userName,
+                                          user.userUniqueId, user.userStatus, user.userType, user.credentialRule,
+                                          user.credentials.data(), user.credentials.size()))
+        {
+            ChipLogError(
+                Zcl,
+                "[OnFabricRemoved] Unable to update the user fabrics - internal error [endpointId=%d,fabricIndex=%d,userIndex=%d]",
+                endpointId, fabricIndex, userIndex);
+        }
+    }
+    return true;
+}
+
 DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx,
                                                     chip::NodeId sourceNodeId, const Nullable<DlUserStatus> & userStatus,
                                                     const Nullable<DlUserType> & userType, const DlCredential & credential,
@@ -2137,7 +2299,7 @@ bool DoorLockServer::credentialTypeSupported(chip::EndpointId endpointId, DlCred
     case DlCredentialType::kPin:
         return SupportsPIN(endpointId);
     case DlCredentialType::kRfid:
-        return SupportsPFID(endpointId);
+        return SupportsRFID(endpointId);
     default:
         return false;
     }
@@ -2233,7 +2395,7 @@ void DoorLockServer::sendGetWeekDayScheduleResponse(chip::app::CommandHandler *
     response.status       = status;
     if (DlStatus::kSuccess == status)
     {
-        response.daysMask    = Optional<chip::BitFlags<DlDaysMaskMap>>(daysMask);
+        response.daysMask    = Optional<chip::BitMask<DlDaysMaskMap>>(daysMask);
         response.startHour   = Optional<uint8_t>(startHour);
         response.startMinute = Optional<uint8_t>(startMinute);
         response.endHour     = Optional<uint8_t>(endHour);
@@ -2275,13 +2437,13 @@ DlStatus DoorLockServer::clearYearDaySchedule(chip::EndpointId endpointId, uint1
 
 DlStatus DoorLockServer::clearYearDaySchedules(chip::EndpointId endpointId, uint16_t userIndex)
 {
-    uint8_t weekDaySchedulesPerUser = 0;
-    if (!GetNumberOfYearDaySchedulesPerUserSupported(endpointId, weekDaySchedulesPerUser))
+    uint8_t yearDaySchedulesPerUser = 0;
+    if (!GetNumberOfYearDaySchedulesPerUserSupported(endpointId, yearDaySchedulesPerUser))
     {
         return DlStatus::kFailure;
     }
 
-    for (uint8_t i = 1; i <= weekDaySchedulesPerUser; ++i)
+    for (uint8_t i = 1; i <= yearDaySchedulesPerUser; ++i)
     {
         auto status = clearYearDaySchedule(endpointId, userIndex, i);
         if (DlStatus::kSuccess != status)
@@ -2312,6 +2474,72 @@ void DoorLockServer::sendGetYearDayScheduleResponse(chip::app::CommandHandler *
     commandObj->AddResponse(commandPath, response);
 }
 
+bool DoorLockServer::holidayIndexValid(chip::EndpointId endpointId, uint8_t holidayIndex)
+{
+    uint8_t holidaysSupported;
+    if (!GetNumberOfHolidaySchedulesSupported(endpointId, holidaysSupported))
+    {
+        return false;
+    }
+
+    // appclusters, 5.2.4.22-25: year day index changes from 1 to maxNumberOfHolidaySchedules
+    if (0 == holidayIndex || holidayIndex > holidaysSupported)
+    {
+        return false;
+    }
+    return true;
+}
+
+DlStatus DoorLockServer::clearHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex)
+{
+    auto status =
+        emberAfPluginDoorLockSetSchedule(endpointId, holidayIndex, DlScheduleStatus::kAvailable, 0, 0, DlOperatingMode::kNormal);
+    if (DlStatus::kSuccess != status && DlStatus::kNotFound != status)
+    {
+        ChipLogError(
+            Zcl, "[ClearHolidaySchedule] Unable to clear the schedule - internal error [endpointId=%d,scheduleIndex=%d,status=%u]",
+            endpointId, holidayIndex, to_underlying(status));
+        return status;
+    }
+    return DlStatus::kSuccess;
+}
+
+DlStatus DoorLockServer::clearHolidaySchedules(chip::EndpointId endpointId)
+{
+    uint8_t totalHolidaySchedules = 0;
+    if (!GetNumberOfHolidaySchedulesSupported(endpointId, totalHolidaySchedules))
+    {
+        return DlStatus::kFailure;
+    }
+
+    for (uint8_t i = 1; i <= totalHolidaySchedules; ++i)
+    {
+        auto status = clearHolidaySchedule(endpointId, i);
+        if (DlStatus::kSuccess != status)
+        {
+            return status;
+        }
+    }
+    return DlStatus::kSuccess;
+}
+
+void DoorLockServer::sendHolidayScheduleResponse(chip::app::CommandHandler * commandObj,
+                                                 const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex,
+                                                 DlStatus status, uint32_t localStartTime, uint32_t localEndTime,
+                                                 DlOperatingMode operatingMode)
+{
+    VerifyOrDie(nullptr != commandObj);
+
+    auto response = Commands::GetHolidayScheduleResponse::Type{ holidayIndex, status };
+    if (DlStatus::kSuccess == status)
+    {
+        response.localStartTime = Optional<uint32_t>(localStartTime);
+        response.localEndTime   = Optional<uint32_t>(localEndTime);
+        response.operatingMode  = Optional<DlOperatingMode>(operatingMode);
+    }
+    commandObj->AddResponse(commandPath, response);
+}
+
 EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId,
                                               DlCredentialType credentialType, uint16_t credentialIndex, bool sendUserChangeEvent)
 {
@@ -2498,7 +2726,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
         emberAfDoorLockClusterPrintln("[clearCredentials] All PIN credentials were cleared [endpointId=%d]", endpointId);
     }
 
-    if (SupportsPFID(endpointId))
+    if (SupportsRFID(endpointId))
     {
         auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kRfid);
         if (EMBER_ZCL_STATUS_SUCCESS != status)
@@ -2578,6 +2806,101 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
     return EMBER_ZCL_STATUS_SUCCESS;
 }
 
+bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, DlCredentialType credentialType,
+                                                chip::FabricIndex fabricToRemove)
+{
+    uint16_t maxNumberOfCredentials = 0;
+    if (!getMaxNumberOfCredentials(endpointId, credentialType, maxNumberOfCredentials))
+    {
+        ChipLogError(
+            Zcl,
+            "[clearFabricFromCredentials] Unable to get max number of credentials to clear - can't get max number of credentials "
+            "[endpointId=%d,credentialType=%u]",
+            endpointId, to_underlying(credentialType));
+        return false;
+    }
+
+    uint16_t startIndex = 1;
+    // Programming PIN is a special case -- it is unique and its index assumed to be 0.
+    if (DlCredentialType::kProgrammingPIN == credentialType)
+    {
+        startIndex = 0;
+        maxNumberOfCredentials--;
+    }
+
+    for (uint16_t credentialIndex = startIndex; credentialIndex <= maxNumberOfCredentials; ++credentialIndex)
+    {
+        EmberAfPluginDoorLockCredentialInfo credential;
+        if (!emberAfPluginDoorLockGetCredential(endpointId, credentialIndex, credentialType, credential))
+        {
+            ChipLogError(
+                Zcl,
+                "[clearFabricFromCredentials] Unable to clear fabric from credential - couldn't read credential from database "
+                "[endpointId=%d,credentialType=%u,credentialIndex=%d,fabricIdToRemove=%d]",
+                endpointId, to_underlying(credentialType), credentialIndex, fabricToRemove);
+
+            // Go on and try to clear all the remaining credentials
+            continue;
+        }
+
+        if (DlCredentialStatus::kAvailable == credential.status ||
+            (credential.createdBy != fabricToRemove && credential.lastModifiedBy != fabricToRemove))
+        {
+            continue;
+        }
+
+        if (credential.createdBy == fabricToRemove)
+        {
+            credential.createdBy = kUndefinedFabricIndex;
+        }
+
+        if (credential.lastModifiedBy == fabricToRemove)
+        {
+            credential.lastModifiedBy = kUndefinedFabricIndex;
+        }
+
+        if (!emberAfPluginDoorLockSetCredential(endpointId, credentialIndex, credential.createdBy, credential.lastModifiedBy,
+                                                credential.status, credential.credentialType, credential.credentialData))
+        {
+            ChipLogError(Zcl,
+                         "[clearFabricFromCredentials] Unable to clear fabric from credential - internal error "
+                         "[endpointId=%d,credentialType=%u,credentialIndex=%d,fabricIdToRemove=%d]",
+                         endpointId, to_underlying(credentialType), credentialIndex, fabricToRemove);
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, chip::FabricIndex fabricToRemove)
+{
+    if (SupportsRFID(endpointId))
+    {
+        clearFabricFromCredentials(endpointId, DlCredentialType::kRfid, fabricToRemove);
+    }
+
+    if (SupportsPIN(endpointId))
+    {
+        clearFabricFromCredentials(endpointId, DlCredentialType::kPin, fabricToRemove);
+    }
+
+    if (SupportsFingers(endpointId))
+    {
+        clearFabricFromCredentials(endpointId, DlCredentialType::kFingerprint, fabricToRemove);
+        clearFabricFromCredentials(endpointId, DlCredentialType::kFingerVein, fabricToRemove);
+    }
+
+    if (SupportsFace(endpointId))
+    {
+        clearFabricFromCredentials(endpointId, DlCredentialType::kFace, fabricToRemove);
+    }
+
+    clearFabricFromCredentials(endpointId, DlCredentialType::kProgrammingPIN, fabricToRemove);
+
+    return true;
+}
+
 bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, DlLockDataType dataType, DlDataOperationType operation,
                                               chip::NodeId nodeId, chip::FabricIndex fabricIndex, uint16_t userIndex,
                                               uint16_t dataIndex)
@@ -2588,13 +2911,13 @@ bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, DlLoc
     event.operationSource   = DlOperationSource::kRemote;
     if (0 != userIndex)
     {
-        event.userIndex = Nullable<uint16_t>(userIndex);
+        event.userIndex.SetNonNull(userIndex);
     }
-    event.fabricIndex = Nullable<chip::FabricIndex>(fabricIndex);
-    event.sourceNode  = Nullable<chip::NodeId>(nodeId);
+    event.fabricIndex.SetNonNull(fabricIndex);
+    event.sourceNode.SetNonNull(nodeId);
     if (0 != dataIndex)
     {
-        event.dataIndex = Nullable<uint16_t>(dataIndex);
+        event.dataIndex.SetNonNull(dataIndex);
     }
 
     EventNumber eventNumber;
@@ -2634,6 +2957,149 @@ DlLockDataType DoorLockServer::credentialTypeToLockDataType(DlCredentialType cre
     return DlLockDataType::kUnspecified;
 }
 
+void DoorLockServer::setHolidaySchedule(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                                        uint8_t holidayIndex, uint32_t localStartTime, uint32_t localEndTime,
+                                        DlOperatingMode operatingMode)
+{
+    VerifyOrDie(nullptr != commandObj);
+
+    auto endpointId = commandPath.mEndpointId;
+    if (!SupportsSchedules(endpointId))
+    {
+        emberAfDoorLockClusterPrintln("[SetHolidaySchedule] Ignore command (not supported) [endpointId=%d]", endpointId);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_COMMAND);
+        return;
+    }
+
+    emberAfDoorLockClusterPrintln("[SetHolidaySchedule] incoming command [endpointId=%d]", endpointId);
+
+    if (!holidayIndexValid(endpointId, holidayIndex))
+    {
+        emberAfDoorLockClusterPrintln(
+            "[SetHolidaySchedule] Unable to add schedule - index out of range [endpointId=%d,scheduleIndex=%d]", endpointId,
+            holidayIndex);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_FIELD);
+        return;
+    }
+
+    if (localEndTime <= localStartTime)
+    {
+        emberAfDoorLockClusterPrintln("[SetHolidaySchedule] Unable to add schedule - schedule ends earlier than starts"
+                                      "[endpointId=%d,scheduleIndex=%d,localStarTime=%" PRIu32 ",localEndTime=%" PRIu32 "]",
+                                      endpointId, holidayIndex, localStartTime, localEndTime);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_FIELD);
+        return;
+    }
+
+    if (operatingMode > DlOperatingMode::kPassage)
+    {
+        emberAfDoorLockClusterPrintln("[SetHolidaySchedule] Unable to add schedule - operating mode is out of range"
+                                      "[endpointId=%d,scheduleIndex=%d,localStarTime=%" PRIu32 ",localEndTime=%" PRIu32
+                                      ", operatingMode=%d]",
+                                      endpointId, holidayIndex, localStartTime, localEndTime, to_underlying(operatingMode));
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_FIELD);
+        return;
+    }
+
+    auto status = emberAfPluginDoorLockSetSchedule(endpointId, holidayIndex, DlScheduleStatus::kOccupied, localStartTime,
+                                                   localEndTime, operatingMode);
+    if (DlStatus::kSuccess != status)
+    {
+        ChipLogError(Zcl, "[SetHolidaySchedule] Unable to add schedule - internal error [endpointId=%d,scheduleIndex=%d,status=%u]",
+                     endpointId, holidayIndex, to_underlying(status));
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
+        return;
+    }
+
+    emberAfDoorLockClusterPrintln("[SetHolidaySchedule] Successfully created new schedule "
+                                  "[endpointId=%d,scheduleIndex=%d,localStartTime=%" PRIu32 ",endTime=%" PRIu32
+                                  ",operatingMode=%d]",
+                                  endpointId, holidayIndex, localStartTime, localEndTime, to_underlying(operatingMode));
+
+    emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
+}
+
+void DoorLockServer::getHolidaySchedule(chip::app::CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                        uint8_t holidayIndex)
+{
+    auto endpointId = commandPath.mEndpointId;
+    if (!SupportsSchedules(endpointId))
+    {
+        emberAfDoorLockClusterPrintln("[GetHolidaySchedule] Ignore command (not supported) [endpointId=%d,scheduleIndex=%d]",
+                                      endpointId, holidayIndex);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_COMMAND);
+        return;
+    }
+    emberAfDoorLockClusterPrintln("[GetHolidaySchedule] incoming command [endpointId=%d,scheduleIndex=%d]", endpointId,
+                                  holidayIndex);
+
+    if (!holidayIndexValid(endpointId, holidayIndex))
+    {
+        emberAfDoorLockClusterPrintln(
+            "[GetYearDaySchedule] Unable to get schedule - index out of range [endpointId=%d,scheduleIndex=%d]", endpointId,
+            holidayIndex);
+        sendHolidayScheduleResponse(commandObj, commandPath, holidayIndex, DlStatus::kInvalidField);
+        return;
+    }
+
+    EmberAfPluginDoorLockHolidaySchedule scheduleInfo{};
+    auto status = emberAfPluginDoorLockGetSchedule(endpointId, holidayIndex, scheduleInfo);
+    if (DlStatus::kSuccess != status)
+    {
+        sendHolidayScheduleResponse(commandObj, commandPath, holidayIndex, status);
+        return;
+    }
+    sendHolidayScheduleResponse(commandObj, commandPath, holidayIndex, DlStatus::kSuccess, scheduleInfo.localStartTime,
+                                scheduleInfo.localEndTime, scheduleInfo.operatingMode);
+}
+
+void DoorLockServer::clearHolidaySchedule(chip::app::CommandHandler * commandObj,
+                                          const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex)
+{
+    auto endpointId = commandPath.mEndpointId;
+    if (!SupportsSchedules(endpointId))
+    {
+        emberAfDoorLockClusterPrintln("[ClearHolidaySchedule] Ignore command (not supported) [endpointId=%d]", endpointId);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_COMMAND);
+        return;
+    }
+    emberAfDoorLockClusterPrintln("[ClearHolidaySchedule] incoming command [endpointId=%d,scheduleIndex=%d]", endpointId,
+                                  holidayIndex);
+
+    if (!holidayIndexValid(endpointId, holidayIndex) && 0xFE != holidayIndex)
+    {
+        emberAfDoorLockClusterPrintln("[ClearHolidaySchedule] Holiday index is out of range [endpointId=%d,scheduleIndex=%d]",
+                                      endpointId, holidayIndex);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_COMMAND);
+        return;
+    }
+
+    DlStatus clearStatus = DlStatus::kSuccess;
+    if (0xFE == holidayIndex)
+    {
+        emberAfDoorLockClusterPrintln(
+            "[ClearHolidaySchedule] Clearing all holiday schedules for a single user [endpointId=%d,scheduleIndex=%d]", endpointId,
+            holidayIndex);
+        clearStatus = clearHolidaySchedules(endpointId);
+    }
+    else
+    {
+        emberAfDoorLockClusterPrintln("[ClearHolidaySchedule] Clearing a single schedule [endpointId=%d,scheduleIndex=%d]",
+                                      endpointId, holidayIndex);
+        clearStatus = clearHolidaySchedule(endpointId, holidayIndex);
+    }
+
+    if (DlStatus::kSuccess != clearStatus)
+    {
+        emberAfDoorLockClusterPrintln(
+            "[ClearHolidaySchedule] Unable to clear the user schedules - app error [endpointId=%d,scheduleIndex=%d,status=%u]",
+            endpointId, holidayIndex, to_underlying(clearStatus));
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
+        return;
+    }
+    emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
+}
+
 bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * commandObj,
                                                const chip::app::ConcreteCommandPath & commandPath, DlLockOperationType opType,
                                                RemoteLockOpHandler opHandler, const Optional<ByteSpan> & pinCode)
@@ -2677,13 +3143,19 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
     }
     else
     {
-        // appclusters.pdf 5.3.4.1:
-        // If the RequirePINforRemoteOperation attribute is True then PINCode field SHALL be provided and the door lock SHALL NOT
-        // grant access if it is not provided.
         bool requirePin = false;
-        VerifyOrExit(GetAttribute(endpoint, Attributes::RequirePINforRemoteOperation::Id,
-                                  Attributes::RequirePINforRemoteOperation::Get, requirePin),
-                     /* credentialsOk is false here */);
+
+        // appclusters.pdf 5.3.4.1:
+        // If the RequirePINForRemoteOperation attribute is True then PINCode field SHALL be provided and the door lock SHALL NOT
+        // grant access if it is not provided. This attribute exists when COTA and PIN features are both enabled. Otherwise we
+        // assume PIN to be OK.
+        if (SupportsCredentialsOTA(endpoint) && SupportsPIN(endpoint))
+        {
+            auto status = Attributes::RequirePINforRemoteOperation::Get(endpoint, &requirePin);
+            VerifyOrExit(
+                EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE == status || EMBER_ZCL_STATUS_SUCCESS == status,
+                ChipLogError(Zcl, "Failed to read Require PIN For Remote Operation attribute, status=0x%x", to_underlying(status)));
+        }
         credentialsOk = !requirePin;
     }
 
@@ -2976,10 +3448,8 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::DecodableType & commandData)
 {
-    emberAfDoorLockClusterPrintln("SetHolidaySchedule: command not implemented");
-
-    // TODO: Implement setting holiday schedule
-    emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
+    DoorLockServer::Instance().setHolidaySchedule(commandObj, commandPath, commandData.holidayIndex, commandData.localStartTime,
+                                                  commandData.localEndTime, commandData.operatingMode);
     return true;
 }
 
@@ -2987,10 +3457,7 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::DecodableType & commandData)
 {
-    emberAfDoorLockClusterPrintln("GetHolidaySchedule: command not implemented");
-
-    // TODO: Implement getting holiday schedule
-    emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
+    DoorLockServer::Instance().getHolidaySchedule(commandObj, commandPath, commandData.holidayIndex);
     return true;
 }
 
@@ -2998,10 +3465,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::DecodableType & commandData)
 {
-    emberAfDoorLockClusterPrintln("ClearHolidaySchedule: command not implemented");
-
-    // TODO: Implement clearing holiday schedule
-    emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
+    DoorLockServer::Instance().clearHolidaySchedule(commandObj, commandPath, commandData.holidayIndex);
     return true;
 }
 
@@ -3124,6 +3588,7 @@ void emberAfPluginDoorLockServerRelockEventHandler(void) {}
 void MatterDoorLockPluginServerInitCallback()
 {
     emberAfDoorLockClusterPrintln("Door Lock server initialized");
+    Server::GetInstance().GetFabricTable().AddFabricDelegate(&gFabricDelegate);
 }
 
 void MatterDoorLockClusterServerAttributeChangedCallback(const app::ConcreteAttributePath & attributePath) {}
@@ -3250,6 +3715,12 @@ DlStatus __attribute__((weak)) emberAfPluginDoorLockGetSchedule(chip::EndpointId
     return DlStatus::kFailure;
 }
 
+DlStatus __attribute__((weak))
+emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule)
+{
+    return DlStatus::kFailure;
+}
+
 DlStatus __attribute__((weak))
 emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
                                  DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
@@ -3264,6 +3735,13 @@ emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayInd
     return DlStatus::kFailure;
 }
 
+DlStatus __attribute__((weak))
+emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
+                                 uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+{
+    return DlStatus::kFailure;
+}
+
 // =============================================================================
 // Timer callbacks
 // =============================================================================
diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h
index bf982cc8d6b8f4..efe8a0ace57ae3 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.h
+++ b/src/app/clusters/door-lock-server/door-lock-server.h
@@ -43,6 +43,7 @@ using chip::app::Clusters::DoorLock::DlDoorState;
 using chip::app::Clusters::DoorLock::DlLockDataType;
 using chip::app::Clusters::DoorLock::DlLockOperationType;
 using chip::app::Clusters::DoorLock::DlLockState;
+using chip::app::Clusters::DoorLock::DlOperatingMode;
 using chip::app::Clusters::DoorLock::DlOperationError;
 using chip::app::Clusters::DoorLock::DlOperationSource;
 using chip::app::Clusters::DoorLock::DlStatus;
@@ -73,7 +74,30 @@ class DoorLockServer
 
     void InitServer(chip::EndpointId endpointId);
 
+    /**
+     * Updates the LockState attribute with new value and sends LockOperation event.
+     *
+     * @note Does not send an event of opSource is kRemote.
+     *
+     * @param endpointId ID of the endpoint to the lock state
+     * @param newLockState new lock state
+     * @param opSource source of the operation (will be used in the event).
+     *
+     * @return true on success, false on failure.
+     */
     bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState, DlOperationSource opSource);
+
+    /**
+     * Updates the LockState attribute with new value.
+     *
+     * @note Does not generate Lock Operation event
+     *
+     * @param endpointId ID of the endpoint to the lock state
+     * @param newLockState new lock state
+     *
+     * @return true on success, false on failure.
+     */
+    bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState);
     bool SetActuatorEnabled(chip::EndpointId endpointId, bool newActuatorState);
     bool SetDoorState(chip::EndpointId endpointId, DlDoorState newDoorState);
 
@@ -91,6 +115,7 @@ class DoorLockServer
     bool GetNumberOfWeekDaySchedulesPerUserSupported(chip::EndpointId endpointId, uint8_t & numberOfWeekDaySchedulesPerUser);
     bool GetNumberOfYearDaySchedulesPerUserSupported(chip::EndpointId endpointId, uint8_t & numberOfYearDaySchedulesPerUser);
     bool GetNumberOfCredentialsSupportedPerUser(chip::EndpointId endpointId, uint8_t & numberOfCredentialsSupportedPerUser);
+    bool GetNumberOfHolidaySchedulesSupported(chip::EndpointId endpointId, uint8_t & numberOfHolidaySchedules);
 
     void SetUserCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                const chip::app::Clusters::DoorLock::Commands::SetUser::DecodableType & commandData);
@@ -111,9 +136,6 @@ class DoorLockServer
     void ClearCredentialCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                        const chip::app::Clusters::DoorLock::Commands::ClearCredential::DecodableType & commandData);
 
-    void LockUnlockDoorCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                      DlLockOperationType operationType, const chip::Optional<chip::ByteSpan> & pinCode);
-
     void SetWeekDayScheduleCommandHandler(
         chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
         const chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::DecodableType & commandData);
@@ -138,7 +160,7 @@ class DoorLockServer
 
     inline bool SupportsPIN(chip::EndpointId endpointId) { return HasFeature(endpointId, DoorLockFeature::kPINCredentials); }
 
-    inline bool SupportsPFID(chip::EndpointId endpointId) { return HasFeature(endpointId, DoorLockFeature::kRFIDCredentials); }
+    inline bool SupportsRFID(chip::EndpointId endpointId) { return HasFeature(endpointId, DoorLockFeature::kRFIDCredentials); }
 
     inline bool SupportsFingers(chip::EndpointId endpointId) { return HasFeature(endpointId, DoorLockFeature::kFingerCredentials); }
 
@@ -146,6 +168,11 @@ class DoorLockServer
 
     inline bool SupportsSchedules(chip::EndpointId endpointId) { return HasFeature(endpointId, DoorLockFeature::kAccessSchedules); }
 
+    inline bool SupportsCredentialsOTA(chip::EndpointId endpointId)
+    {
+        return HasFeature(endpointId, DoorLockFeature::kCredentialsOTA);
+    }
+
     inline bool SupportsUSR(chip::EndpointId endpointId)
     {
         // appclusters, 5.2.2: USR feature has conformance [PIN | RID | FGP | FACE]
@@ -153,6 +180,8 @@ class DoorLockServer
         return HasFeature(endpointId, DoorLockFeature::kUsersManagement) && SupportsPIN(endpointId);
     }
 
+    bool OnFabricRemoved(chip::EndpointId endpointId, chip::FabricIndex fabricIndex);
+
 private:
     chip::FabricIndex getFabricIndex(const chip::app::CommandHandler * commandObj);
     chip::NodeId getNodeId(const chip::app::CommandHandler * commandObj);
@@ -167,9 +196,13 @@ class DoorLockServer
     bool getCredentialRange(chip::EndpointId endpointId, DlCredentialType type, size_t & minSize, size_t & maxSize);
     bool getMaxNumberOfCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t & maxNumberOfCredentials);
 
+    bool findOccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex);
+
     bool findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t & userIndex);
     bool findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex);
 
+    bool findOccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
+                                    uint16_t & credentialIndex);
     bool findUnoccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
                                       uint16_t & credentialIndex);
 
@@ -193,6 +226,8 @@ class DoorLockServer
     EmberAfStatus clearUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricId, chip::NodeId sourceNodeId,
                             uint16_t userIndex, const EmberAfPluginDoorLockUserInfo & user, bool sendUserChangeEvent);
 
+    bool clearFabricFromUsers(chip::EndpointId endpointId, chip::FabricIndex fabricIndex);
+
     DlStatus createNewCredentialAndUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId,
                                         const Nullable<DlUserStatus> & userStatus, const Nullable<DlUserType> & userType,
                                         const DlCredential & credential, const chip::ByteSpan & credentialData,
@@ -225,6 +260,9 @@ class DoorLockServer
     EmberAfStatus clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId,
                                    DlCredentialType credentialType);
 
+    bool clearFabricFromCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, chip::FabricIndex fabricToRemove);
+    bool clearFabricFromCredentials(chip::EndpointId endpointId, chip::FabricIndex fabricToRemove);
+
     CHIP_ERROR sendSetCredentialResponse(chip::app::CommandHandler * commandObj, DlStatus status, uint16_t userIndex,
                                          uint16_t nextCredentialIndex);
 
@@ -251,12 +289,30 @@ class DoorLockServer
                                         uint8_t yearDayIndex, uint16_t userIndex, DlStatus status, uint32_t localStartTime = 0,
                                         uint32_t localEndTime = 0);
 
+    bool holidayIndexValid(chip::EndpointId endpointId, uint8_t holidayIndex);
+
+    DlStatus clearHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex);
+    DlStatus clearHolidaySchedules(chip::EndpointId endpointId);
+
+    void sendHolidayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                                     uint8_t holidayIndex, DlStatus status, uint32_t localStartTime = 0, uint32_t localEndTime = 0,
+                                     DlOperatingMode operatingMode = DlOperatingMode::kNormal);
+
     bool sendRemoteLockUserChange(chip::EndpointId endpointId, DlLockDataType dataType, DlDataOperationType operation,
                                   chip::NodeId nodeId, chip::FabricIndex fabricIndex, uint16_t userIndex = 0,
                                   uint16_t dataIndex = 0);
 
     DlLockDataType credentialTypeToLockDataType(DlCredentialType credentialType);
 
+    void setHolidaySchedule(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                            uint8_t holidayIndex, uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode);
+
+    void getHolidaySchedule(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                            uint8_t holidayIndex);
+
+    void clearHolidaySchedule(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                              uint8_t holidayIndex);
+
     /**
      * @brief Common handler for LockDoor, UnlockDoor, UnlockWithTimeout commands
      *
@@ -354,6 +410,18 @@ class DoorLockServer
 
     friend void emberAfPluginDoorLockOnAutoRelock(chip::EndpointId endpointId);
 
+    friend bool emberAfDoorLockClusterSetHolidayScheduleCallback(
+        chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+        const chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::DecodableType & commandData);
+
+    friend bool emberAfDoorLockClusterGetHolidayScheduleCallback(
+        chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+        const chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::DecodableType & commandData);
+
+    friend bool emberAfDoorLockClusterClearHolidayScheduleCallback(
+        chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+        const chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::DecodableType & commandData);
+
     EmberEventControl AutolockEvent; /**< for automatic relock scheduling */
 
     static DoorLockServer instance;
@@ -368,15 +436,25 @@ enum class DlCredentialStatus : uint8_t
     kOccupied  = 0x01, /**< Indicates if credential slot is already occupied. */
 };
 
+enum class DlAssetSource : uint8_t
+{
+    kUnspecified = 0x00,
+    kMatterIM    = 0x01,
+};
+
 /**
  * @brief Structure that holds the credential information.
  */
 struct EmberAfPluginDoorLockCredentialInfo
 {
-    DlCredentialStatus status;        /**< Indicates if credential slot is occupied or not. */
-    DlCredentialType credentialType;  /**< Specifies the type of the credential (PIN, RFID, etc.). */
-    chip::ByteSpan credentialData;    /**< Credential data bytes. */
-    chip::FabricIndex createdBy;      /**< ID of the fabric that created the user. */
+    DlCredentialStatus status;       /**< Indicates if credential slot is occupied or not. */
+    DlCredentialType credentialType; /**< Specifies the type of the credential (PIN, RFID, etc.). */
+    chip::ByteSpan credentialData;   /**< Credential data bytes. */
+
+    DlAssetSource creationSource;
+    chip::FabricIndex createdBy; /**< Index of the fabric that created the user. */
+
+    DlAssetSource modificationSource;
     chip::FabricIndex lastModifiedBy; /**< ID of the fabric that modified the user. */
 };
 
@@ -391,8 +469,12 @@ struct EmberAfPluginDoorLockUserInfo
     DlUserStatus userStatus;                    /**< Status of the user slot (available/occupied). */
     DlUserType userType;                        /**< Type of the user. */
     DlCredentialRule credentialRule;            /**< Number of supported credentials. */
-    chip::FabricIndex createdBy;                /**< ID of the fabric that created the user. */
-    chip::FabricIndex lastModifiedBy;           /**< ID of the fabric that modified the user. */
+
+    DlAssetSource creationSource;
+    chip::FabricIndex createdBy; /**< ID of the fabric that created the user. */
+
+    DlAssetSource modificationSource;
+    chip::FabricIndex lastModifiedBy; /**< ID of the fabric that modified the user. */
 };
 
 /**
@@ -427,6 +509,18 @@ struct EmberAfPluginDoorLockYearDaySchedule
                               * the local timezone and DST offset on the day represented by the value. */
 };
 
+/**
+ * @brief Structure that holds holiday schedule information.
+ */
+struct EmberAfPluginDoorLockHolidaySchedule
+{
+    uint32_t localStartTime; /** The starting time for the Holiday schedule in Epoch Time in Seconds with local time offset based
+                            on the local timezone and DST offset on the day represented by the value. */
+    uint32_t localEndTime;   /** The ending time for the Holiday schedule in Epoch Time in Seconds with local time offset based on
+                              * the local timezone and DST offset on the day represented by the value. */
+    DlOperatingMode operatingMode; /** Operating mode during the schedule. */
+};
+
 /**
  * @brief This callback is called when Door Lock cluster needs to access the Week Day schedule in the schedules database.
  *
@@ -460,6 +554,21 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t w
 DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                                           EmberAfPluginDoorLockYearDaySchedule & schedule);
 
+/**
+ * @brief This callback is called when Door Lock cluster needs to access the Holiday schedule in the schedules database.
+ *
+ * @param endpointId ID of the endpoint which contains the lock.
+ * @param holidayIndex Index of the holiday schedule to access. It is guaranteed to be within limits declared in the spec for
+ *                     holiday schedule (from 1 up to NumberOfHolidaySchedulesSupported)
+ * @param[out] schedule Resulting holiday schedule.
+ *
+ * @retval DlStatus::kSuccess if schedule was retrieved successfully
+ * @retval DlStatus::kNotFound if the schedule or user does not exist
+ * @retval DlStatus::kFailure in case of any other failure
+ */
+DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
+                                          EmberAfPluginDoorLockHolidaySchedule & schedule);
+
 /**
  * @brief This callback is called when Door Lock cluster needs to create, modify or clear the week day schedule in schedules
  * database.
@@ -509,6 +618,29 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t w
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                                           DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime);
 
+/**
+ * @brief This callback is called when Door Lock cluster needs to create, modify or clear the holiday schedule in schedules
+ * database.
+ *
+ * @param endpointId ID of the endpoint which contains the lock.
+ * @param holidayIndex Index of the holiday schedule to access. It is guaranteed to be within limits declared in the spec for
+ *                     holiday schedule (from 1 up to NumberOfHolidaySchedulesSupported).
+ * @param status New status of the schedule slot (occupied/available). DlScheduleStatus::kAvailable means that the
+ *               schedules must be deleted.
+ * @param localStartTime The starting time for the Year Day schedule in Epoch Time in Seconds with local time offset based on the
+ *                       local timezone and DST offset on the day represented by the value.
+ * @param localEndTime The ending time for the Year Day schedule in Epoch Time in Seconds with local time offset based on the local
+ *                     timezone and DST offset on the day represented by the value. \p localEndTime is guaranteed to be greater than
+ *                     \p localStartTime.
+ * @param operatingMode The operating mode to use during this Holiday schedule start/end time.
+ *
+ * @retval DlStatus::kSuccess if schedule was successfully modified
+ * @retval DlStatus::kNotFound if the schedule or user does not exist
+ * @retval DlStatus::kFailure in case of any other failure
+ */
+DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
+                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode);
+
 // =============================================================================
 // Pre-change callbacks for cluster attributes
 // =============================================================================
diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
index fa8d755fc23467..64aa0c9520954b 100644
--- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
+++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
@@ -155,6 +155,9 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler *
     FailSafeContext & failSafeContext = DeviceLayer::DeviceControlServer::DeviceControlSvr().GetFailSafeContext();
     Commands::ArmFailSafeResponse::Type response;
 
+    ChipLogProgress(FailSafe, "GeneralCommissioning: Received ArmFailSafe (%us)",
+                    static_cast<unsigned>(commandData.expiryLengthSeconds));
+
     /*
      * If the fail-safe timer is not fully disarmed, don't allow arming a new fail-safe.
      * If the fail-safe timer was not currently armed, then the fail-safe timer SHALL be armed.
@@ -214,7 +217,10 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(
     MATTER_TRACE_EVENT_SCOPE("CommissioningComplete", "GeneralCommissioning");
 
     DeviceControlServer * server = &DeviceLayer::DeviceControlServer::DeviceControlSvr();
-    const auto & failSafe        = server->GetFailSafeContext();
+    auto & failSafe              = server->GetFailSafeContext();
+    auto & fabricTable           = Server::GetInstance().GetFabricTable();
+
+    ChipLogProgress(FailSafe, "GeneralCommissioning: Received CommissioningComplete");
 
     Commands::CommissioningCompleteResponse::Type response;
     if (!failSafe.IsFailSafeArmed())
@@ -231,16 +237,34 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(
             !failSafe.MatchesFabricIndex(commandObj->GetAccessingFabricIndex()))
         {
             response.errorCode = CommissioningError::kInvalidAuthentication;
+            ChipLogError(FailSafe, "GeneralCommissioning: Got commissioning complete in invalid security context");
         }
         else
         {
+            if (failSafe.NocCommandHasBeenInvoked())
+            {
+                CHIP_ERROR err = fabricTable.CommitPendingFabricData();
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(FailSafe, "GeneralCommissioning: Failed to commit pending fabric data: %" CHIP_ERROR_FORMAT,
+                                 err.Format());
+                }
+                else
+                {
+                    ChipLogProgress(FailSafe, "GeneralCommissioning: Successfully commited pending fabric data");
+                }
+                CheckSuccess(err, Failure);
+            }
+
             /*
              * Pass fabric of commissioner to DeviceControlSvr.
              * This allows device to send messages back to commissioner.
              * Once bindings are implemented, this may no longer be needed.
              */
-            CheckSuccess(server->CommissioningComplete(handle->AsSecureSession()->GetPeerNodeId(), handle->GetFabricIndex()),
-                         Failure);
+            failSafe.DisarmFailSafe();
+            CheckSuccess(
+                server->PostCommissioningCompleteEvent(handle->AsSecureSession()->GetPeerNodeId(), handle->GetFabricIndex()),
+                Failure);
 
             Breadcrumb::Set(commandPath.mEndpointId, 0);
             response.errorCode = CommissioningError::kOk;
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index cc6ec9d355f2ad..0ab14a94540115 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+#include "general-diagnostics-server.h"
+#include "app/server/Server.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>
@@ -35,9 +37,45 @@ using namespace chip::DeviceLayer;
 using chip::DeviceLayer::ConnectivityMgr;
 using chip::DeviceLayer::DiagnosticDataProvider;
 using chip::DeviceLayer::GetDiagnosticDataProvider;
+using chip::Protocols::InteractionModel::Status;
 
 namespace {
 
+bool IsTestEventTriggerEnabled()
+{
+    auto * triggerDelegate = chip::Server::GetInstance().GetTestEventTriggerDelegate();
+    if (triggerDelegate == nullptr)
+    {
+        return false;
+    }
+    uint8_t zeroByteSpanData[TestEventTriggerDelegate::kEnableKeyLength] = { 0 };
+    if (triggerDelegate->DoesEnableKeyMatch(ByteSpan(zeroByteSpanData)))
+    {
+        return false;
+    }
+    return true;
+}
+
+bool IsByteSpanAllZeros(const ByteSpan & byteSpan)
+{
+    for (auto * it = byteSpan.begin(); it != byteSpan.end(); ++it)
+    {
+        if (*it != 0)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+void ReportAttributeOnAllEndpoints(AttributeId attribute)
+{
+    for (auto endpoint : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
+    {
+        MatterReportingAttributeChangeCallback(endpoint, GeneralDiagnostics::Id, attribute);
+    }
+}
+
 class GeneralDiagosticsAttrAccess : public AttributeAccessInterface
 {
 public:
@@ -162,6 +200,10 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & a
     case BootReasons::Id: {
         return ReadIfSupported(&DiagnosticDataProvider::GetBootReason, aEncoder);
     }
+    case TestEventTriggersEnabled::Id: {
+        bool isTestEventTriggersEnabled = IsTestEventTriggerEnabled();
+        return aEncoder.Encode(isTestEventTriggersEnabled);
+    }
     default: {
         break;
     }
@@ -169,16 +211,8 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & a
     return CHIP_NO_ERROR;
 }
 
-class GeneralDiagnosticsDelegate : public DeviceLayer::ConnectivityManagerDelegate, public DeviceLayer::GeneralDiagnosticsDelegate
+class GeneralDiagnosticsDelegate : public DeviceLayer::ConnectivityManagerDelegate
 {
-    static void ReportAttributeOnAllEndpoints(AttributeId attribute)
-    {
-        for (auto endpoint : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
-        {
-            MatterReportingAttributeChangeCallback(endpoint, GeneralDiagnostics::Id, attribute);
-        }
-    }
-
     // Gets called when any network interface on the Node is updated.
     void OnNetworkInfoChanged() override
     {
@@ -186,114 +220,179 @@ class GeneralDiagnosticsDelegate : public DeviceLayer::ConnectivityManagerDelega
 
         ReportAttributeOnAllEndpoints(GeneralDiagnostics::Attributes::NetworkInterfaces::Id);
     }
+};
 
-    // Gets called when the device has been rebooted.
-    void OnDeviceRebooted(BootReasonType bootReason) override
-    {
-        ChipLogDetail(Zcl, "GeneralDiagnosticsDelegate: OnDeviceRebooted");
+GeneralDiagnosticsDelegate gDiagnosticDelegate;
 
-        ReportAttributeOnAllEndpoints(GeneralDiagnostics::Attributes::BootReasons::Id);
+} // anonymous namespace
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+GeneralDiagnosticsServer GeneralDiagnosticsServer::instance;
 
-        // GeneralDiagnostics cluster should exist only for endpoint 0.
+/**********************************************************
+ * GeneralDiagnosticsServer Implementation
+ *********************************************************/
 
+GeneralDiagnosticsServer & GeneralDiagnosticsServer::Instance()
+{
+    return instance;
+}
+
+// Gets called when the device has been rebooted.
+void GeneralDiagnosticsServer::OnDeviceReboot(BootReasonType bootReason)
+{
+    ChipLogDetail(Zcl, "GeneralDiagnostics: OnDeviceReboot");
+
+    ReportAttributeOnAllEndpoints(GeneralDiagnostics::Attributes::BootReasons::Id);
+
+    // GeneralDiagnostics cluster should exist only for endpoint 0.
+    if (emberAfContainsServer(0, GeneralDiagnostics::Id))
+    {
         Events::BootReason::Type event{ bootReason };
         EventNumber eventNumber;
 
         CHIP_ERROR err = LogEvent(event, 0, eventNumber);
         if (CHIP_NO_ERROR != err)
         {
-            ChipLogError(Zcl, "GeneralDiagnosticsDelegate: Failed to record BootReason event: %" CHIP_ERROR_FORMAT, err.Format());
+            ChipLogError(Zcl, "GeneralDiagnostics: Failed to record BootReason event: %" CHIP_ERROR_FORMAT, err.Format());
         }
     }
+}
+
+// Get called when the Node detects a hardware fault has been raised.
+void GeneralDiagnosticsServer::OnHardwareFaultsDetect(const GeneralFaults<kMaxHardwareFaults> & previous,
+                                                      const GeneralFaults<kMaxHardwareFaults> & current)
+{
+    ChipLogDetail(Zcl, "GeneralDiagnostics: OnHardwareFaultsDetect");
 
-    // Get called when the Node detects a hardware fault has been raised.
-    void OnHardwareFaultsDetected(GeneralFaults<kMaxHardwareFaults> & previous,
-                                  GeneralFaults<kMaxHardwareFaults> & current) override
+    for (auto endpointId : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
     {
-        ChipLogDetail(Zcl, "GeneralDiagnosticsDelegate: OnHardwareFaultsDetected");
+        // If General Diagnostics cluster is implemented on this endpoint
+        MatterReportingAttributeChangeCallback(endpointId, GeneralDiagnostics::Id,
+                                               GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id);
+
+        // Record HardwareFault event
+        EventNumber eventNumber;
+        DataModel::List<const HardwareFaultType> currentList(reinterpret_cast<const HardwareFaultType *>(current.data()),
+                                                             current.size());
+        DataModel::List<const HardwareFaultType> previousList(reinterpret_cast<const HardwareFaultType *>(previous.data()),
+                                                              previous.size());
+        Events::HardwareFaultChange::Type event{ currentList, previousList };
 
-        for (auto endpointId : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
+        if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
         {
-            // If General Diagnostics cluster is implemented on this endpoint
-            MatterReportingAttributeChangeCallback(endpointId, GeneralDiagnostics::Id,
-                                                   GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id);
-
-            // Record HardwareFault event
-            EventNumber eventNumber;
-            DataModel::List<const HardwareFaultType> currentList = DataModel::List<const HardwareFaultType>(
-                reinterpret_cast<const HardwareFaultType *>(current.data()), current.size());
-            DataModel::List<const HardwareFaultType> previousList = DataModel::List<const HardwareFaultType>(
-                reinterpret_cast<const HardwareFaultType *>(previous.data()), previous.size());
-            Events::HardwareFaultChange::Type event{ currentList, previousList };
-
-            if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
-            {
-                ChipLogError(Zcl, "GeneralDiagnosticsDelegate: Failed to record HardwareFault event");
-            }
+            ChipLogError(Zcl, "GeneralDiagnostics: Failed to record HardwareFault event");
         }
     }
+}
 
-    // Get called when the Node detects a radio fault has been raised.
-    void OnRadioFaultsDetected(GeneralFaults<kMaxRadioFaults> & previous, GeneralFaults<kMaxRadioFaults> & current) override
+// Get called when the Node detects a radio fault has been raised.
+void GeneralDiagnosticsServer::OnRadioFaultsDetect(const GeneralFaults<kMaxRadioFaults> & previous,
+                                                   const GeneralFaults<kMaxRadioFaults> & current)
+{
+    ChipLogDetail(Zcl, "GeneralDiagnostics: OnRadioFaultsDetect");
+
+    for (auto endpointId : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
     {
-        ChipLogDetail(Zcl, "GeneralDiagnosticsDelegate: OnRadioFaultsDetected");
+        // If General Diagnostics cluster is implemented on this endpoint
+        MatterReportingAttributeChangeCallback(endpointId, GeneralDiagnostics::Id,
+                                               GeneralDiagnostics::Attributes::ActiveRadioFaults::Id);
 
-        for (auto endpointId : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
+        // Record RadioFault event
+        EventNumber eventNumber;
+        DataModel::List<const RadioFaultType> currentList(reinterpret_cast<const RadioFaultType *>(current.data()), current.size());
+        DataModel::List<const RadioFaultType> previousList(reinterpret_cast<const RadioFaultType *>(previous.data()),
+                                                           previous.size());
+        Events::RadioFaultChange::Type event{ currentList, previousList };
+
+        if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
         {
-            // If General Diagnostics cluster is implemented on this endpoint
-            MatterReportingAttributeChangeCallback(endpointId, GeneralDiagnostics::Id,
-                                                   GeneralDiagnostics::Attributes::ActiveRadioFaults::Id);
-
-            // Record RadioFault event
-            EventNumber eventNumber;
-            DataModel::List<const RadioFaultType> currentList =
-                DataModel::List<const RadioFaultType>(reinterpret_cast<const RadioFaultType *>(current.data()), current.size());
-            DataModel::List<const RadioFaultType> previousList =
-                DataModel::List<const RadioFaultType>(reinterpret_cast<const RadioFaultType *>(previous.data()), previous.size());
-            Events::RadioFaultChange::Type event{ currentList, previousList };
-
-            if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
-            {
-                ChipLogError(Zcl, "GeneralDiagnosticsDelegate: Failed to record RadioFault event");
-            }
+            ChipLogError(Zcl, "GeneralDiagnostics: Failed to record RadioFault event");
         }
     }
+}
 
-    // Get called when the Node detects a network fault has been raised.
-    void OnNetworkFaultsDetected(GeneralFaults<kMaxNetworkFaults> & previous, GeneralFaults<kMaxNetworkFaults> & current) override
+// Get called when the Node detects a network fault has been raised.
+void GeneralDiagnosticsServer::OnNetworkFaultsDetect(const GeneralFaults<kMaxNetworkFaults> & previous,
+                                                     const GeneralFaults<kMaxNetworkFaults> & current)
+{
+    ChipLogDetail(Zcl, "GeneralDiagnostics: OnNetworkFaultsDetect");
+
+    for (auto endpointId : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
     {
-        ChipLogDetail(Zcl, "GeneralDiagnosticsDelegate: OnNetworkFaultsDetected");
+        // If General Diagnostics cluster is implemented on this endpoint
+        MatterReportingAttributeChangeCallback(endpointId, GeneralDiagnostics::Id,
+                                               GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id);
+
+        // Record NetworkFault event
+        EventNumber eventNumber;
+        DataModel::List<const NetworkFaultType> currentList(reinterpret_cast<const NetworkFaultType *>(current.data()),
+                                                            current.size());
+        DataModel::List<const NetworkFaultType> previousList(reinterpret_cast<const NetworkFaultType *>(previous.data()),
+                                                             previous.size());
+        Events::NetworkFaultChange::Type event{ currentList, previousList };
 
-        for (auto endpointId : EnabledEndpointsWithServerCluster(GeneralDiagnostics::Id))
+        if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
         {
-            // If General Diagnostics cluster is implemented on this endpoint
-            MatterReportingAttributeChangeCallback(endpointId, GeneralDiagnostics::Id,
-                                                   GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id);
-
-            // Record NetworkFault event
-            EventNumber eventNumber;
-            DataModel::List<const NetworkFaultType> currentList =
-                DataModel::List<const NetworkFaultType>(reinterpret_cast<const NetworkFaultType *>(current.data()), current.size());
-            DataModel::List<const NetworkFaultType> previousList = DataModel::List<const NetworkFaultType>(
-                reinterpret_cast<const NetworkFaultType *>(previous.data()), previous.size());
-            Events::NetworkFaultChange::Type event{ currentList, previousList };
-
-            if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
-            {
-                ChipLogError(Zcl, "GeneralDiagnosticsDelegate: Failed to record NetworkFault event");
-            }
+            ChipLogError(Zcl, "GeneralDiagnostics: Failed to record NetworkFault event");
         }
     }
-};
+}
 
-GeneralDiagnosticsDelegate gDiagnosticDelegate;
+} // namespace Clusters
+} // namespace app
+} // namespace chip
 
-} // anonymous namespace
+bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                              const Commands::TestEventTrigger::DecodableType & commandData)
+{
+
+    if (commandData.enableKey.size() != TestEventTriggerDelegate::kEnableKeyLength)
+    {
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
+        return true;
+    }
+
+    if (IsByteSpanAllZeros(commandData.enableKey))
+    {
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
+        return true;
+    }
+
+    auto * triggerDelegate = chip::Server::GetInstance().GetTestEventTriggerDelegate();
+
+    if (triggerDelegate == nullptr || !triggerDelegate->DoesEnableKeyMatch(commandData.enableKey))
+    {
+        commandObj->AddStatus(commandPath, Status::UnsupportedAccess);
+        return true;
+    }
+
+    CHIP_ERROR handleEventTriggerResult = triggerDelegate->HandleEventTrigger(commandData.eventTrigger);
+    Status returnStatus                 = StatusIB(handleEventTriggerResult).mStatus;
+
+    // When HandleEventTrigger returns INVALID_ARGUMENT we convert that into InvalidCommand to be spec
+    // compliant.
+    if (handleEventTriggerResult == CHIP_ERROR_INVALID_ARGUMENT)
+    {
+        returnStatus = Status::InvalidCommand;
+    }
+
+    commandObj->AddStatus(commandPath, returnStatus);
+    return true;
+}
 
 void MatterGeneralDiagnosticsPluginServerInitCallback()
 {
-    registerAttributeAccessOverride(&gAttrAccess);
+    BootReasonType bootReason;
 
+    registerAttributeAccessOverride(&gAttrAccess);
     ConnectivityMgr().SetDelegate(&gDiagnosticDelegate);
-    GetDiagnosticDataProvider().SetGeneralDiagnosticsDelegate(&gDiagnosticDelegate);
+
+    if (GetDiagnosticDataProvider().GetBootReason(bootReason) == CHIP_NO_ERROR)
+    {
+        GeneralDiagnosticsServer::Instance().OnDeviceReboot(bootReason);
+    }
 }
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h
new file mode 100644
index 00000000000000..ee0ac70b3473a8
--- /dev/null
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h
@@ -0,0 +1,72 @@
+/*
+ *
+ *    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 <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterface.h>
+#include <app/CommandResponseHelper.h>
+#include <app/util/af.h>
+#include <platform/GeneralFaults.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+/**
+ * @brief general-diagnostics-server class
+ */
+class GeneralDiagnosticsServer
+{
+public:
+    static GeneralDiagnosticsServer & Instance();
+
+    /**
+     * @brief
+     *   Called after the current device is rebooted.
+     */
+    void OnDeviceReboot(GeneralDiagnostics::BootReasonType bootReason);
+
+    /**
+     * @brief
+     *   Called when the Node detects a hardware fault has been raised.
+     */
+    void OnHardwareFaultsDetect(const DeviceLayer::GeneralFaults<DeviceLayer::kMaxHardwareFaults> & previous,
+                                const DeviceLayer::GeneralFaults<DeviceLayer::kMaxHardwareFaults> & current);
+
+    /**
+     * @brief
+     *   Called when the Node detects a radio fault has been raised.
+     */
+    void OnRadioFaultsDetect(const DeviceLayer::GeneralFaults<DeviceLayer::kMaxRadioFaults> & previous,
+                             const DeviceLayer::GeneralFaults<DeviceLayer::kMaxRadioFaults> & current);
+
+    /**
+     * @brief
+     *   Called when the Node detects a network fault has been raised.
+     */
+    void OnNetworkFaultsDetect(const DeviceLayer::GeneralFaults<DeviceLayer::kMaxNetworkFaults> & previous,
+                               const DeviceLayer::GeneralFaults<DeviceLayer::kMaxNetworkFaults> & current);
+
+private:
+    static GeneralDiagnosticsServer instance;
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index 3f561f986d3951..71d565f8e02bb1 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -78,7 +78,7 @@ static bool GroupExists(FabricIndex fabricIndex, EndpointId endpointId, GroupId
 
 static EmberAfStatus GroupAdd(FabricIndex fabricIndex, EndpointId endpointId, GroupId groupId, const CharSpan & groupName)
 {
-    VerifyOrReturnError(IsFabricGroupId(groupId), EMBER_ZCL_STATUS_INVALID_VALUE);
+    VerifyOrReturnError(IsFabricGroupId(groupId), EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
 
     GroupDataProvider * provider = GetGroupDataProvider();
     VerifyOrReturnError(nullptr != provider, EMBER_ZCL_STATUS_NOT_FOUND);
@@ -95,12 +95,12 @@ static EmberAfStatus GroupAdd(FabricIndex fabricIndex, EndpointId endpointId, Gr
 
     ChipLogDetail(Zcl, "ERR: Failed to add mapping (end:%d, group:0x%x), err:%" CHIP_ERROR_FORMAT, endpointId, groupId,
                   err.Format());
-    return EMBER_ZCL_STATUS_INSUFFICIENT_SPACE;
+    return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED;
 }
 
 static EmberAfStatus GroupRemove(FabricIndex fabricIndex, EndpointId endpointId, GroupId groupId)
 {
-    VerifyOrReturnError(IsFabricGroupId(groupId), EMBER_ZCL_STATUS_INVALID_VALUE);
+    VerifyOrReturnError(IsFabricGroupId(groupId), EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
     VerifyOrReturnError(GroupExists(fabricIndex, endpointId, groupId), EMBER_ZCL_STATUS_NOT_FOUND);
 
     GroupDataProvider * provider = GetGroupDataProvider();
@@ -134,13 +134,6 @@ bool emberAfGroupsClusterAddGroupCallback(app::CommandHandler * commandObj, cons
     auto fabricIndex = commandObj->GetAccessingFabricIndex();
     Groups::Commands::AddGroupResponse::Type response;
 
-    // For all networks, Add Group commands are only responded to when
-    // they are addressed to a single device.
-    if (emberAfCurrentCommand()->type != EMBER_INCOMING_UNICAST && emberAfCurrentCommand()->type != EMBER_INCOMING_UNICAST_REPLY)
-    {
-        return true;
-    }
-
     response.groupId = commandData.groupId;
     response.status  = GroupAdd(fabricIndex, commandPath.mEndpointId, commandData.groupId, commandData.groupName);
     commandObj->AddResponse(commandPath, response);
@@ -158,11 +151,6 @@ bool emberAfGroupsClusterViewGroupCallback(app::CommandHandler * commandObj, con
     CHIP_ERROR err       = CHIP_NO_ERROR;
     EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND;
 
-    if (emberAfCurrentCommand()->type != EMBER_INCOMING_UNICAST && emberAfCurrentCommand()->type != EMBER_INCOMING_UNICAST_REPLY)
-    {
-        return true;
-    }
-
     VerifyOrExit(IsFabricGroupId(groupId), status = EMBER_ZCL_STATUS_INVALID_VALUE);
     VerifyOrExit(nullptr != provider, status = EMBER_ZCL_STATUS_FAILURE);
     VerifyOrExit(provider->HasEndpoint(fabricIndex, groupId, commandPath.mEndpointId), status = EMBER_ZCL_STATUS_NOT_FOUND);
@@ -293,13 +281,6 @@ bool emberAfGroupsClusterRemoveGroupCallback(app::CommandHandler * commandObj, c
     auto fabricIndex = commandObj->GetAccessingFabricIndex();
     Groups::Commands::RemoveGroupResponse::Type response;
 
-    // For all networks, Remove Group commands are only responded to when
-    // they are addressed to a single device.
-    if (emberAfCurrentCommand()->type != EMBER_INCOMING_UNICAST && emberAfCurrentCommand()->type != EMBER_INCOMING_UNICAST_REPLY)
-    {
-        return true;
-    }
-
 #ifdef EMBER_AF_PLUGIN_SCENES
     // If a group is, removed the scenes associated with that group SHOULD be removed.
     emberAfScenesClusterRemoveScenesInGroupCallback(commandPath.mEndpointId, commandData.groupId);
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index af820270fe4864..9993df02984a1f 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -520,6 +520,11 @@ static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId
         return EMBER_ZCL_STATUS_FAILURE;
     }
 
+    if (level > EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL)
+    {
+        return EMBER_ZCL_STATUS_INVALID_COMMAND;
+    }
+
     if (!shouldExecuteIfOff(endpoint, commandId, optionMask, optionOverride))
     {
         return EMBER_ZCL_STATUS_SUCCESS;
diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp
index 17cb40c549b425..f7233651943365 100644
--- a/src/app/clusters/low-power-server/low-power-server.cpp
+++ b/src/app/clusters/low-power-server/low-power-server.cpp
@@ -29,6 +29,7 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/util/af.h>
 #include <platform/CHIPDeviceConfig.h>
+#include <protocols/interaction_model/StatusCode.h>
 
 using namespace chip;
 using namespace chip::app::Clusters::LowPower;
@@ -87,22 +88,23 @@ void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate)
 bool emberAfLowPowerClusterSleepCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                          const Commands::Sleep::DecodableType & commandData)
 {
-    CHIP_ERROR err      = CHIP_NO_ERROR;
+    using Protocols::InteractionModel::Status;
+
     EndpointId endpoint = commandPath.mEndpointId;
 
     Delegate * delegate = GetDelegate(endpoint);
-    VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE);
-
-exit:
-    if (err != CHIP_NO_ERROR)
+    Status status;
+    if (isDelegateNull(delegate, endpoint))
     {
-        ChipLogError(Zcl, "emberAfLowPowerClusterSleepCallback error: %s", err.AsString());
-        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
+        ChipLogError(Zcl, "emberAfLowPowerClusterSleepCallback: no delegate");
+        status = Status::Failure;
     }
-
-    bool success         = delegate->HandleSleep();
-    EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
-    emberAfSendImmediateDefaultResponse(status);
+    else
+    {
+        bool success = delegate->HandleSleep();
+        status       = success ? Status::Success : Status::Failure;
+    }
+    command->AddStatus(commandPath, status);
     return true;
 }
 
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
index 99c586f9c99678..b00ddc0bc08788 100644
--- a/src/app/clusters/network-commissioning/network-commissioning.cpp
+++ b/src/app/clusters/network-commissioning/network-commissioning.cpp
@@ -486,7 +486,7 @@ void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t i
     }
     if (commissioningError == Status::kSuccess)
     {
-        DeviceLayer::DeviceControlServer::DeviceControlSvr().ConnectNetworkForOperational(
+        DeviceLayer::DeviceControlServer::DeviceControlSvr().PostConnectedToOperationalNetworkEvent(
             ByteSpan(mLastNetworkID, mLastNetworkIDLen));
         mLastConnectErrorValue.SetNull();
     }
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
index 305da0bafff1e3..12299050929586 100644
--- a/src/app/clusters/on-off-server/on-off-server.cpp
+++ b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -383,14 +383,8 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a
 #endif // EMBER_AF_PLUGIN_SCENES
 
             OnOff::Attributes::GlobalSceneControl::Set(endpoint, false);
-
-            status = setOnOffValue(endpoint, Commands::Off::Id, false);
             Attributes::OnTime::Set(endpoint, 0);
         }
-        else
-        {
-            status = setOnOffValue(endpoint, Commands::Off::Id, false);
-        }
 
         // Only apply effect if OnOff is on
         if (isOnBeforeCommand)
@@ -405,6 +399,8 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a
                 effect->mOffWithEffectTrigger(effect);
             }
         }
+
+        status = setOnOffValue(endpoint, Commands::Off::Id, false);
     }
     else
     {
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
index ca2a005ea89079..3c361a020ba9a0 100644
--- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
+++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -61,6 +61,7 @@ using namespace ::chip::Transport;
 using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::OperationalCredentials;
+using namespace chip::Credentials;
 using namespace chip::Protocols::InteractionModel;
 
 namespace {
@@ -73,8 +74,15 @@ constexpr uint8_t kDACCertificate = 1;
 constexpr uint8_t kPAICertificate = 2;
 
 CHIP_ERROR CreateAccessControlEntryForNewFabricAdministrator(const Access::SubjectDescriptor & subjectDescriptor,
-                                                             FabricIndex fabricIndex, NodeId subject)
+                                                             FabricIndex fabricIndex, uint64_t subject)
 {
+    NodeId subjectAsNodeID = static_cast<NodeId>(subject);
+
+    if (!IsOperationalNodeId(subjectAsNodeID) && !IsCASEAuthTag(subjectAsNodeID))
+    {
+        return CHIP_ERROR_INVALID_ADMIN_SUBJECT;
+    }
+
     Access::AccessControl::Entry entry;
     ReturnErrorOnFailure(Access::GetAccessControl().PrepareEntry(entry));
     ReturnErrorOnFailure(entry.SetFabricIndex(fabricIndex));
@@ -118,22 +126,28 @@ CHIP_ERROR OperationalCredentialsAttrAccess::ReadNOCs(EndpointId endpoint, Attri
     auto accessingFabricIndex = aEncoder.AccessingFabricIndex();
 
     return aEncoder.EncodeList([accessingFabricIndex](const auto & encoder) -> CHIP_ERROR {
-        for (auto & fabricInfo : Server::GetInstance().GetFabricTable())
+        const auto & fabricTable = Server::GetInstance().GetFabricTable();
+        for (auto & fabricInfo : fabricTable)
         {
             Clusters::OperationalCredentials::Structs::NOCStruct::Type noc;
+            uint8_t nocBuf[kMaxCHIPCertLength];
+            uint8_t icacBuf[kMaxCHIPCertLength];
+            MutableByteSpan nocSpan{ nocBuf };
+            MutableByteSpan icacSpan{ icacBuf };
+            FabricIndex fabricIndex = fabricInfo.GetFabricIndex();
 
-            noc.fabricIndex = fabricInfo.GetFabricIndex();
+            noc.fabricIndex = fabricIndex;
 
-            if (accessingFabricIndex == fabricInfo.GetFabricIndex())
+            if (accessingFabricIndex == fabricIndex)
             {
-                ByteSpan icac;
 
-                ReturnErrorOnFailure(fabricInfo.GetNOCCert(noc.noc));
-                ReturnErrorOnFailure(fabricInfo.GetICACert(icac));
+                ReturnErrorOnFailure(fabricTable.FetchNOCCert(fabricIndex, nocSpan));
+                ReturnErrorOnFailure(fabricTable.FetchICACert(fabricIndex, icacSpan));
 
-                if (!icac.empty())
+                noc.noc = nocSpan;
+                if (!icacSpan.empty())
                 {
-                    noc.icac.SetNonNull(icac);
+                    noc.icac.SetNonNull(icacSpan);
                 }
             }
 
@@ -159,20 +173,23 @@ CHIP_ERROR OperationalCredentialsAttrAccess::ReadCommissionedFabrics(EndpointId
 CHIP_ERROR OperationalCredentialsAttrAccess::ReadFabricsList(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
     return aEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR {
-        for (auto & fabricInfo : Server::GetInstance().GetFabricTable())
+        const auto & fabricTable = Server::GetInstance().GetFabricTable();
+
+        for (auto & fabricInfo : fabricTable)
         {
             Clusters::OperationalCredentials::Structs::FabricDescriptor::Type fabricDescriptor;
+            FabricIndex fabricIndex = fabricInfo.GetFabricIndex();
 
-            fabricDescriptor.fabricIndex = fabricInfo.GetFabricIndex();
+            fabricDescriptor.fabricIndex = fabricIndex;
             fabricDescriptor.nodeId      = fabricInfo.GetPeerId().GetNodeId();
             fabricDescriptor.vendorId    = static_cast<chip::VendorId>(fabricInfo.GetVendorId());
             fabricDescriptor.fabricId    = fabricInfo.GetFabricId();
 
             fabricDescriptor.label = fabricInfo.GetFabricLabel();
 
-            Credentials::P256PublicKeySpan pubKey;
-            ReturnErrorOnFailure(fabricInfo.GetRootPubkey(pubKey));
-            fabricDescriptor.rootPublicKey = pubKey;
+            Crypto::P256PublicKey pubKey;
+            ReturnErrorOnFailure(fabricTable.FetchRootPubkey(fabricIndex, pubKey));
+            fabricDescriptor.rootPublicKey = ByteSpan{ pubKey.ConstBytes(), pubKey.Length() };
 
             ReturnErrorOnFailure(encoder.Encode(fabricDescriptor));
         }
@@ -183,12 +200,16 @@ CHIP_ERROR OperationalCredentialsAttrAccess::ReadFabricsList(EndpointId endpoint
 
 CHIP_ERROR OperationalCredentialsAttrAccess::ReadRootCertificates(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
+    // It is OK to have duplicates.
     return aEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR {
-        for (auto & fabricInfo : Server::GetInstance().GetFabricTable())
+        const auto & fabricTable = Server::GetInstance().GetFabricTable();
+
+        for (auto & fabricInfo : fabricTable)
         {
-            ByteSpan cert;
-            ReturnErrorOnFailure(fabricInfo.GetRootCert(cert));
-            ReturnErrorOnFailure(encoder.Encode(cert));
+            uint8_t certBuf[kMaxCHIPCertLength];
+            MutableByteSpan cert{ certBuf };
+            ReturnErrorOnFailure(fabricTable.FetchRootCert(fabricInfo.GetFabricIndex(), cert));
+            ReturnErrorOnFailure(encoder.Encode(ByteSpan{ cert }));
         }
 
         return CHIP_NO_ERROR;
@@ -273,7 +294,7 @@ CHIP_ERROR DeleteFabricFromTable(FabricIndex fabricIndex)
     return CHIP_NO_ERROR;
 }
 
-void CleanupFabricContext(SessionManager & sessionMgr, FabricIndex fabricIndex)
+void CleanupSessionsForFabric(SessionManager & sessionMgr, FabricIndex fabricIndex)
 {
     InteractionModelEngine::GetInstance()->CloseTransactionsFromFabricIndex(fabricIndex);
     sessionMgr.ExpireAllPairingsForFabric(fabricIndex);
@@ -283,12 +304,12 @@ void FailSafeCleanup(const chip::DeviceLayer::ChipDeviceEvent * event)
 {
     ChipLogError(Zcl, "OpCreds: Proceeding to FailSafeCleanup on fail-safe expiry!");
 
-    FabricIndex fabricIndex = event->FailSafeTimerExpired.PeerFabricIndex;
+    FabricIndex fabricIndex = event->FailSafeTimerExpired.fabricIndex;
 
     // If an AddNOC or UpdateNOC command has been successfully invoked, terminate all CASE sessions associated with the Fabric
     // whose Fabric Index is recorded in the Fail-Safe context (see ArmFailSafe Command) by clearing any associated Secure
     // Session Context at the Server.
-    if (event->FailSafeTimerExpired.AddNocCommandHasBeenInvoked || event->FailSafeTimerExpired.UpdateNocCommandHasBeenInvoked)
+    if (event->FailSafeTimerExpired.addNocCommandHasBeenInvoked || event->FailSafeTimerExpired.updateNocCommandHasBeenInvoked)
     {
         CASESessionManager * caseSessionManager = Server::GetInstance().GetCASESessionManager();
         if (caseSessionManager)
@@ -300,23 +321,41 @@ void FailSafeCleanup(const chip::DeviceLayer::ChipDeviceEvent * event)
         }
 
         SessionManager & sessionMgr = Server::GetInstance().GetSecureSessionManager();
-        CleanupFabricContext(sessionMgr, fabricIndex);
+        CleanupSessionsForFabric(sessionMgr, fabricIndex);
     }
 
+    auto & fabricTable = Server::GetInstance().GetFabricTable();
+    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 (event->FailSafeTimerExpired.AddNocCommandHasBeenInvoked)
+    if (event->FailSafeTimerExpired.addNocCommandHasBeenInvoked)
     {
-        DeleteFabricFromTable(fabricIndex);
+        CHIP_ERROR err;
+        err = DeleteFabricFromTable(fabricIndex);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "OpCreds: failed to delete fabric at index %u: %" CHIP_ERROR_FORMAT, fabricIndex, err.Format());
+        }
+        err = Server::GetInstance().GetFabricTable().RevertLastKnownGoodChipEpochTime();
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "OpCreds: failed to revert Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+        }
     }
 
     // If an UpdateNOC command had been successfully invoked, revert the state of operational key pair, NOC and ICAC for that
     // Fabric to the state prior to the Fail-Safe timer being armed, for the Fabric Index that was the subject of the UpdateNOC
     // command.
-    if (event->FailSafeTimerExpired.UpdateNocCommandHasBeenInvoked)
+    if (event->FailSafeTimerExpired.updateNocCommandHasBeenInvoked)
     {
         // TODO: Revert the state of operational key pair, NOC and ICAC
+        CHIP_ERROR err = Server::GetInstance().GetFabricTable().RevertLastKnownGoodChipEpochTime();
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "OpCreds: failed to revert Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+        }
     }
 }
 
@@ -324,6 +363,7 @@ void OnPlatformEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, in
 {
     if (event->Type == DeviceLayer::DeviceEventType::kFailSafeTimerExpired)
     {
+        ChipLogError(Zcl, "OpCreds: Got FailSafeTimerExpired");
         FailSafeCleanup(event);
     }
 }
@@ -447,7 +487,7 @@ class FabricCleanupExchangeDelegate : public chip::Messaging::ExchangeDelegate
     {
         SessionManager * sessionManager = ec->GetExchangeMgr()->GetSessionManager();
         FabricIndex currentFabricIndex  = ec->GetSessionHandle()->GetFabricIndex();
-        CleanupFabricContext(*sessionManager, currentFabricIndex);
+        CleanupSessionsForFabric(*sessionManager, currentFabricIndex);
     }
 };
 
@@ -462,7 +502,15 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(app::CommandHandle
     MATTER_TRACE_EVENT_SCOPE("RemoveFabric", "OperationalCredentials");
     auto & fabricBeingRemoved = commandData.fabricIndex;
 
-    ChipLogProgress(Zcl, "OpCreds: Received a RemoveFabric Command");
+    ChipLogProgress(Zcl, "OpCreds: Received a RemoveFabric Command for FabricIndex 0x%x",
+                    static_cast<unsigned>(fabricBeingRemoved));
+
+    if (!IsValidFabricIndex(fabricBeingRemoved))
+    {
+        ChipLogError(Zcl, "OpCreds: Failed RemoveFabric due to invalid FabricIndex");
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
 
     CHIP_ERROR err = DeleteFabricFromTable(fabricBeingRemoved);
     SuccessOrExit(err);
@@ -473,16 +521,19 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(app::CommandHandle
     // AddNOC/UpdateNOC specific.
     if (err == CHIP_ERROR_NOT_FOUND)
     {
+        ChipLogError(Zcl, "OpCreds: Failed RemoveFabric due to FabricIndex not found locally");
         SendNOCResponse(commandObj, commandPath, OperationalCertStatus::kInvalidFabricIndex, fabricBeingRemoved, CharSpan());
     }
     else if (err != CHIP_NO_ERROR)
     {
         // We have no idea what happened; just report failure.
+        ChipLogError(Zcl, "OpCreds: Failed RemoveFabric due to internal error (err = %" CHIP_ERROR_FORMAT ")", err.Format());
         StatusIB status(err);
         commandObj->AddStatus(commandPath, status.mStatus);
     }
     else
     {
+        ChipLogProgress(Zcl, "OpCreds: RemoveFabric successful");
         SendNOCResponse(commandObj, commandPath, OperationalCertStatus::kSuccess, fabricBeingRemoved, CharSpan());
 
         chip::Messaging::ExchangeContext * ec = commandObj->GetExchangeContext();
@@ -502,7 +553,7 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(app::CommandHandle
         else
         {
             SessionManager * sessionManager = ec->GetExchangeMgr()->GetSessionManager();
-            CleanupFabricContext(*sessionManager, fabricBeingRemoved);
+            CleanupSessionsForFabric(*sessionManager, fabricBeingRemoved);
         }
     }
     return true;
@@ -513,14 +564,21 @@ bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(app::CommandH
                                                                    const Commands::UpdateFabricLabel::DecodableType & commandData)
 {
     MATTER_TRACE_EVENT_SCOPE("UpdateFabricLabel", "OperationalCredentials");
-    auto & Label        = commandData.label;
+    auto & label        = commandData.label;
     auto ourFabricIndex = commandObj->GetAccessingFabricIndex();
 
     ChipLogProgress(Zcl, "OpCreds: Received an UpdateFabricLabel command");
 
+    if (label.size() > 32)
+    {
+        ChipLogError(Zcl, "OpCreds: Failed UpdateFabricLabel due to invalid label size %u", static_cast<unsigned>(label.size()));
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     for (auto & fabricInfo : Server::GetInstance().GetFabricTable())
     {
-        if (fabricInfo.GetFabricLabel().data_equal(Label) && fabricInfo.GetFabricIndex() != ourFabricIndex)
+        if (fabricInfo.GetFabricLabel().data_equal(label) && fabricInfo.GetFabricIndex() != ourFabricIndex)
         {
             ChipLogError(Zcl, "Fabric label already in use");
             SendNOCResponse(commandObj, commandPath, OperationalCertStatus::kLabelConflict, ourFabricIndex, CharSpan());
@@ -528,14 +586,14 @@ bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(app::CommandH
         }
     }
 
-    CHIP_ERROR err;
+    CHIP_ERROR err = CHIP_ERROR_INTERNAL;
 
     // Fetch current fabric
     FabricInfo * fabric = RetrieveCurrentFabric(commandObj);
     VerifyOrExit(fabric != nullptr, err = CHIP_ERROR_INVALID_FABRIC_INDEX);
 
     // Set Label on fabric
-    err = fabric->SetFabricLabel(Label);
+    err = fabric->SetFabricLabel(label);
     SuccessOrExit(err);
 
     // Persist updated fabric
@@ -607,6 +665,14 @@ OperationalCertStatus ConvertToNOCResponseStatus(CHIP_ERROR err)
     {
         return OperationalCertStatus::kInvalidFabricIndex;
     }
+    if (err == CHIP_ERROR_INVALID_ADMIN_SUBJECT)
+    {
+        return OperationalCertStatus::kInvalidAdminSubject;
+    }
+    if (err == CHIP_ERROR_INSUFFICIENT_PRIVILEGE)
+    {
+        return OperationalCertStatus::kInsufficientPrivilege;
+    }
 
     return OperationalCertStatus::kInvalidNOC;
 }
@@ -624,38 +690,44 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
     auto & ipkValue          = commandData.IPKValue;
     auto * groupDataProvider = Credentials::GetGroupDataProvider();
     auto nocResponse         = OperationalCertStatus::kSuccess;
+    auto nonDefaultStatus    = Status::Success;
 
     CHIP_ERROR err          = CHIP_NO_ERROR;
     FabricIndex fabricIndex = 0;
     Credentials::GroupDataProvider::KeySet keyset;
     FabricInfo * newFabricInfo = nullptr;
+    auto & fabricTable         = Server::GetInstance().GetFabricTable();
 
-    auto * secureSession = commandObj->GetExchangeContext()->GetSessionHandle()->AsSecureSession();
+    auto * secureSession              = commandObj->GetExchangeContext()->GetSessionHandle()->AsSecureSession();
+    FailSafeContext & failSafeContext = DeviceControlServer::DeviceControlSvr().GetFailSafeContext();
 
     uint8_t compressed_fabric_id_buffer[sizeof(uint64_t)];
     MutableByteSpan compressed_fabric_id(compressed_fabric_id_buffer);
 
     ChipLogProgress(Zcl, "OpCreds: Received an AddNOC command");
 
-    if (nullptr == groupDataProvider)
-    {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::Failure));
-        return true;
-    }
+    VerifyOrExit(NOCValue.size() <= Credentials::kMaxCHIPCertLength, nonDefaultStatus = Status::InvalidCommand);
+    VerifyOrExit(!ICACValue.HasValue() || ICACValue.Value().size() <= Credentials::kMaxCHIPCertLength,
+                 nonDefaultStatus = Status::InvalidCommand);
+    VerifyOrExit(ipkValue.size() == Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES, nonDefaultStatus = Status::InvalidCommand);
+    VerifyOrExit(IsVendorIdValidOperationally(adminVendorId), nonDefaultStatus = Status::InvalidCommand);
 
-    FailSafeContext & failSafeContext = DeviceControlServer::DeviceControlSvr().GetFailSafeContext();
+    VerifyOrExit(failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()),
+                 nonDefaultStatus = Status::FailsafeRequired);
 
-    if (!failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()))
-    {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::UnsupportedAccess));
-        return true;
-    }
+    VerifyOrExit(!failSafeContext.NocCommandHasBeenInvoked(), nonDefaultStatus = Status::ConstraintError);
 
-    if (failSafeContext.NocCommandHasBeenInvoked())
-    {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::ConstraintError));
-        return true;
-    }
+    // Must have had a previous CSR request, not tagged for UpdateNOC
+    VerifyOrExit(fabricTable.HasPendingOperationalKey(), nocResponse = OperationalCertStatus::kMissingCsr);
+    VerifyOrExit(!failSafeContext.IsCsrRequestForUpdateNoc(), nonDefaultStatus = Status::ConstraintError);
+
+    // Internal error that would prevent IPK from being added
+    VerifyOrExit(groupDataProvider != nullptr, nonDefaultStatus = 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.
+    VerifyOrExit(failSafeContext.AddTrustedRootCertHasBeenInvoked(), nocResponse = OperationalCertStatus::kInvalidNOC);
 
     err = gFabricBeingCommissioned.SetNOCCert(NOCValue);
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
@@ -665,29 +737,34 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
 
     gFabricBeingCommissioned.SetVendorId(adminVendorId);
 
-    err = Server::GetInstance().GetFabricTable().AddNewFabric(gFabricBeingCommissioned, &fabricIndex);
+    // TODO(#16443): Stop committing fabric table right away, only do it on commissioning complete
+    err = fabricTable.AddNewFabric(gFabricBeingCommissioned, &fabricIndex);
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
 
-    // The Fabric Index associated with the armed fail-safe context SHALL be updated to match the Fabric
-    // Index just allocated.
-    err = failSafeContext.SetAddNocCommandInvoked(fabricIndex);
-    if (err != CHIP_NO_ERROR)
+    // Activate the operational key previously generated
     {
-        Server::GetInstance().GetFabricTable().Delete(fabricIndex);
-        nocResponse = ConvertToNOCResponseStatus(err);
-        SuccessOrExit(err);
+        Crypto::P256PublicKey nocSubjectPublicKey;
+        Credentials::P256PublicKeySpan nocSubjectPublicKeySpan;
+
+        err = Credentials::ExtractPublicKeyFromChipCert(NOCValue, nocSubjectPublicKeySpan);
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = OperationalCertStatus::kInvalidNOC);
+        nocSubjectPublicKey = Crypto::P256PublicKey(nocSubjectPublicKeySpan);
+
+        err = fabricTable.ActivatePendingOperationalKey(nocSubjectPublicKey);
+        VerifyOrExit(err != CHIP_ERROR_INVALID_PUBLIC_KEY, nocResponse = OperationalCertStatus::kInvalidPublicKey);
+
+        // Other errors that are not CHIP_ERROR_INVALID_PUBLIC_KEY are internal failures
+        VerifyOrExit(err == CHIP_NO_ERROR, nonDefaultStatus = Status::Failure);
     }
 
     // Set the Identity Protection Key (IPK)
-    VerifyOrExit(ipkValue.size() == Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES,
-                 nocResponse = ConvertToNOCResponseStatus(CHIP_ERROR_INVALID_ARGUMENT));
     // The IPK SHALL be the operational group key under GroupKeySetID of 0
     keyset.keyset_id     = Credentials::GroupDataProvider::kIdentityProtectionKeySetId;
     keyset.policy        = GroupKeyManagement::GroupKeySecurityPolicy::kTrustFirst;
     keyset.num_keys_used = 1;
     memcpy(keyset.epoch_keys[0].key, ipkValue.data(), Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES);
 
-    newFabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
+    newFabricInfo = fabricTable.FindFabricWithIndex(fabricIndex);
     VerifyOrExit(newFabricInfo != nullptr, nocResponse = ConvertToNOCResponseStatus(CHIP_ERROR_INTERNAL));
     err = newFabricInfo->GetCompressedId(compressed_fabric_id);
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
@@ -704,7 +781,7 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
      * . If the current secure session was established with CASE, subsequent configuration
      *   of the newly installed Fabric requires the opening of a new CASE session from the
      *   Administrator from the Fabric just installed. This Administrator is the one listed
-     *   in the `CaseAdminNode` argument.
+     *   in the `caseAdminSubject` argument.
      *
      */
     if (secureSession->GetSecureSessionType() == SecureSession::Type::kPASE)
@@ -716,25 +793,45 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
     // 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(), fabricIndex,
-                                                            commandData.caseAdminNode);
+                                                            commandData.caseAdminSubject);
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
 
+    // The Fabric Index associated with the armed fail-safe context SHALL be updated to match the Fabric
+    // Index just allocated.
+    err = failSafeContext.SetAddNocCommandInvoked(fabricIndex);
+    if (err != CHIP_NO_ERROR)
+    {
+        fabricTable.Delete(fabricIndex);
+        nocResponse = ConvertToNOCResponseStatus(err);
+        SuccessOrExit(err);
+    }
+
     // We might have a new operational identity, so we should start advertising it right away.
     app::DnssdServer::Instance().AdvertiseOperational();
 
 exit:
-
     gFabricBeingCommissioned.Reset();
-    SendNOCResponse(commandObj, commandPath, nocResponse, fabricIndex, CharSpan());
-
-    if (nocResponse != OperationalCertStatus::kSuccess)
+    // We have an NOC response
+    if (nonDefaultStatus == Status::Success)
     {
-        ChipLogError(Zcl, "OpCreds: Failed AddNOC request (err=%" CHIP_ERROR_FORMAT "). Status %d", err.Format(),
-                     to_underlying(nocResponse));
+        SendNOCResponse(commandObj, commandPath, nocResponse, fabricIndex, CharSpan());
+        // Failed to add NOC
+        if (nocResponse != OperationalCertStatus::kSuccess)
+        {
+            ChipLogError(Zcl, "OpCreds: Failed AddNOC request (err=%" CHIP_ERROR_FORMAT ") with OperationalCert error %d",
+                         err.Format(), to_underlying(nocResponse));
+        }
+        // Success
+        else
+        {
+            ChipLogProgress(Zcl, "OpCreds: successfully created fabric index 0x%x via AddNOC", static_cast<unsigned>(fabricIndex));
+        }
     }
+    // No NOC response - Failed constraints
     else
     {
-        ChipLogProgress(Zcl, "OpCreds: successfully created fabric index 0x%x via AddNOC", static_cast<unsigned>(fabricIndex));
+        commandObj->AddStatus(commandPath, nonDefaultStatus);
+        ChipLogError(Zcl, "OpCreds: Failed AddNOC request with IM error 0x%02u", to_underlying(nonDefaultStatus));
     }
 
     return true;
@@ -748,60 +845,114 @@ bool emberAfOperationalCredentialsClusterUpdateNOCCallback(app::CommandHandler *
     auto & NOCValue  = commandData.NOCValue;
     auto & ICACValue = commandData.ICACValue;
 
-    auto nocResponse = OperationalCertStatus::kSuccess;
+    auto nocResponse      = OperationalCertStatus::kSuccess;
+    auto nonDefaultStatus = Status::Success;
 
     CHIP_ERROR err          = CHIP_NO_ERROR;
     FabricIndex fabricIndex = 0;
 
     ChipLogProgress(Zcl, "OpCreds: Received an UpdateNOC command");
 
+    auto & fabricTable                = Server::GetInstance().GetFabricTable();
     FailSafeContext & failSafeContext = DeviceControlServer::DeviceControlSvr().GetFailSafeContext();
-
-    if (!failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()))
+    FabricInfo * fabricInfo           = RetrieveCurrentFabric(commandObj);
+
+    VerifyOrExit(NOCValue.size() <= Credentials::kMaxCHIPCertLength, nonDefaultStatus = Status::InvalidCommand);
+    VerifyOrExit(!ICACValue.HasValue() || ICACValue.Value().size() <= Credentials::kMaxCHIPCertLength,
+                 nonDefaultStatus = Status::InvalidCommand);
+    VerifyOrExit(failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()),
+                 nonDefaultStatus = Status::FailsafeRequired);
+
+    VerifyOrExit(!failSafeContext.NocCommandHasBeenInvoked(), nonDefaultStatus = Status::ConstraintError);
+
+    // Must have had a previous CSR request, tagged for UpdateNOC
+    VerifyOrExit(fabricTable.HasPendingOperationalKey(), nocResponse = OperationalCertStatus::kMissingCsr);
+    VerifyOrExit(failSafeContext.IsCsrRequestForUpdateNoc(), nonDefaultStatus = Status::ConstraintError);
+
+    // If current fabric is not available, command was invoked over PASE which is not legal
+    VerifyOrExit(fabricInfo != nullptr, nocResponse = ConvertToNOCResponseStatus(CHIP_ERROR_INSUFFICIENT_PRIVILEGE));
+    fabricIndex = fabricInfo->GetFabricIndex();
+
+    // Initialize fields of gFabricBeingCommissioned:
+    //  - the root certificate, fabric label, and vendor id are copied from the existing fabric record
+    //  - the NOC and ICAC certificates are taken from the UpdateNOC command
+    // Note that the operational keypair was set at the preceding CSRRequest step.
+    // The remaining operation id and fabric id fields will be extracted from the new operational
+    // credentials and set by following SetFabricInfo() call.
     {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::UnsupportedAccess));
-        return true;
+        uint8_t rcacBuf[kMaxCHIPCertLength];
+        MutableByteSpan rcac{ rcacBuf };
+
+        err = fabricTable.FetchRootCert(fabricIndex, rcac);
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+
+        err = gFabricBeingCommissioned.SetRootCert(rcac);
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+
+        err = gFabricBeingCommissioned.SetFabricLabel(fabricInfo->GetFabricLabel());
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+
+        gFabricBeingCommissioned.SetVendorId(fabricInfo->GetVendorId());
+
+        err = gFabricBeingCommissioned.SetNOCCert(NOCValue);
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+
+        err = gFabricBeingCommissioned.SetICACert(ICACValue);
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
     }
 
-    if (failSafeContext.NocCommandHasBeenInvoked())
+    // TODO(#18633): Stop committing fabric table right away, only do it on commissioning complete
+    err = fabricTable.UpdateFabric(fabricIndex, gFabricBeingCommissioned);
+    VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+
+    // Activate the operational key previously generated
     {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::ConstraintError));
-        return true;
-    }
+        Crypto::P256PublicKey nocSubjectPublicKey;
+        Credentials::P256PublicKeySpan nocSubjectPublicKeySpan;
 
-    // Fetch current fabric
-    FabricInfo * fabric = RetrieveCurrentFabric(commandObj);
-    VerifyOrExit(fabric != nullptr, nocResponse = ConvertToNOCResponseStatus(CHIP_ERROR_INVALID_FABRIC_INDEX));
+        err = Credentials::ExtractPublicKeyFromChipCert(NOCValue, nocSubjectPublicKeySpan);
+        VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = OperationalCertStatus::kInvalidNOC);
+        nocSubjectPublicKey = Crypto::P256PublicKey(nocSubjectPublicKeySpan);
 
-    // Flag on the fail-safe context that the UpdateNOC command was invoked.
-    err = failSafeContext.SetUpdateNocCommandInvoked();
-    VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+        err = fabricTable.ActivatePendingOperationalKey(nocSubjectPublicKey);
+        VerifyOrExit(err != CHIP_ERROR_INVALID_PUBLIC_KEY, nocResponse = OperationalCertStatus::kInvalidPublicKey);
 
-    err = fabric->SetNOCCert(NOCValue);
-    VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
+        // Other errors that are not CHIP_ERROR_INVALID_PUBLIC_KEY are internal failures
+        VerifyOrExit(err == CHIP_NO_ERROR, nonDefaultStatus = Status::Failure);
+    }
 
-    err = fabric->SetICACert(ICACValue);
+    // Flag on the fail-safe context that the UpdateNOC command was invoked.
+    err = failSafeContext.SetUpdateNocCommandInvoked();
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));
 
-    fabricIndex = fabric->GetFabricIndex();
-
     // We might have a new operational identity, so we should start advertising
     // it right away.  Also, we need to withdraw our old operational identity.
     // So we need to StartServer() here.
     app::DnssdServer::Instance().StartServer();
 
 exit:
-
-    SendNOCResponse(commandObj, commandPath, nocResponse, fabricIndex, CharSpan());
-
-    if (nocResponse != OperationalCertStatus::kSuccess)
+    gFabricBeingCommissioned.Reset();
+    // We have an NOC response
+    if (nonDefaultStatus == Status::Success)
     {
-        ChipLogError(Zcl, "OpCreds: Failed UpdateNOC request (err=%" CHIP_ERROR_FORMAT "). Sending Status %d", err.Format(),
-                     to_underlying(nocResponse));
+        SendNOCResponse(commandObj, commandPath, nocResponse, fabricIndex, CharSpan());
+        // Failed to update NOC
+        if (nocResponse != OperationalCertStatus::kSuccess)
+        {
+            ChipLogError(Zcl, "OpCreds: Failed UpdateNOC request (err=%" CHIP_ERROR_FORMAT ") with OperationalCert error %d",
+                         err.Format(), to_underlying(nocResponse));
+        }
+        // Success
+        else
+        {
+            ChipLogProgress(Zcl, "OpCreds: UpdateNOC successful.");
+        }
     }
+    // No NOC response - Failed constraints
     else
     {
-        ChipLogProgress(Zcl, "OpCreds: UpdateNOC successful.");
+        commandObj->AddStatus(commandPath, nonDefaultStatus);
+        ChipLogError(Zcl, "OpCreds: Failed AddNOC request with IM error 0x%02u", to_underlying(nonDefaultStatus));
     }
 
     return true;
@@ -838,7 +989,8 @@ bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(
     else
     {
         ChipLogError(Zcl, "OpCreds: Certificate Chain request received for unknown type: %d", static_cast<int>(certificateType));
-        SuccessOrExit(err = CHIP_ERROR_INVALID_ARGUMENT);
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
     }
 
     response.certificate = derBufSpan;
@@ -848,7 +1000,7 @@ bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Zcl, "OpCreds: Failed CertificateChainRequest: %" CHIP_ERROR_FORMAT, err.Format());
-        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
+        commandObj->AddStatus(commandPath, Status::Failure);
     }
 
     return true;
@@ -861,36 +1013,49 @@ bool emberAfOperationalCredentialsClusterAttestationRequestCallback(app::Command
     MATTER_TRACE_EVENT_SCOPE("AttestationRequest", "OperationalCredentials");
     auto & attestationNonce = commandData.attestationNonce;
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    auto finalStatus = Status::Failure;
+    CHIP_ERROR err   = CHIP_ERROR_INVALID_ARGUMENT;
+
     Platform::ScopedMemoryBuffer<uint8_t> attestationElements;
     size_t attestationElementsLen = 0;
     MutableByteSpan attestationElementsSpan;
     uint8_t certDeclBuf[Credentials::kMaxCMSSignedCDMessage]; // Sized to hold the example certificate declaration with 100 PIDs.
                                                               // See DeviceAttestationCredsExample
     MutableByteSpan certDeclSpan(certDeclBuf);
-    Credentials::DeviceAttestationCredentialsProvider * dacProvider = Credentials::GetDeviceAttestationCredentialsProvider();
 
-    ChipLogProgress(Zcl, "OpCreds: Received an AttestationRequest command");
-
-    // TODO: retrieve vendor information to populate the fields below.
+    // TODO: in future versions, retrieve vendor information to populate the fields below.
     uint32_t timestamp = 0;
-    // TODO: Also retrieve and use firmware Information
-    const ByteSpan kEmptyFirmwareInfo;
     Credentials::DeviceAttestationVendorReservedConstructor emptyVendorReserved(nullptr, 0);
 
-    VerifyOrExit(commandObj != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
-    VerifyOrExit(attestationNonce.size() == Credentials::kExpectedAttestationNonceSize, err = CHIP_ERROR_INVALID_ARGUMENT);
+    // TODO: in future versions, also retrieve and use firmware Information
+    const ByteSpan kEmptyFirmwareInfo;
+
+    ChipLogProgress(Zcl, "OpCreds: Received an AttestationRequest command");
+    Credentials::DeviceAttestationCredentialsProvider * dacProvider = Credentials::GetDeviceAttestationCredentialsProvider();
 
-    SuccessOrExit(err = dacProvider->GetCertificationDeclaration(certDeclSpan));
+    VerifyOrExit(attestationNonce.size() == Credentials::kExpectedAttestationNonceSize, finalStatus = Status::InvalidCommand);
+
+    if (dacProvider == nullptr)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        VerifyOrExit(dacProvider != nullptr, finalStatus = Status::Failure);
+    }
+
+    err = dacProvider->GetCertificationDeclaration(certDeclSpan);
+    VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure);
 
     attestationElementsLen = TLV::EstimateStructOverhead(certDeclSpan.size(), attestationNonce.size(), sizeof(uint64_t) * 8);
 
-    VerifyOrExit(attestationElements.Alloc(attestationElementsLen), err = CHIP_ERROR_NO_MEMORY);
-    attestationElementsSpan = MutableByteSpan{ attestationElements.Get(), attestationElementsLen };
-    SuccessOrExit(err = Credentials::ConstructAttestationElements(certDeclSpan, attestationNonce, timestamp, kEmptyFirmwareInfo,
-                                                                  emptyVendorReserved, attestationElementsSpan));
+    if (!attestationElements.Alloc(attestationElementsLen))
+    {
+        err = CHIP_ERROR_NO_MEMORY;
+        VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::ResourceExhausted);
+    }
 
-    VerifyOrExit(attestationElementsSpan.size() <= kMaxRspLen, err = CHIP_ERROR_INTERNAL);
+    attestationElementsSpan = MutableByteSpan{ attestationElements.Get(), attestationElementsLen };
+    err = Credentials::ConstructAttestationElements(certDeclSpan, attestationNonce, timestamp, kEmptyFirmwareInfo,
+                                                    emptyVendorReserved, attestationElementsSpan);
+    VerifyOrExit((err == CHIP_NO_ERROR) && (attestationElementsSpan.size() <= kMaxRspLen), finalStatus = Status::Failure);
 
     // Prepare response payload with signature
     {
@@ -898,18 +1063,23 @@ bool emberAfOperationalCredentialsClusterAttestationRequestCallback(app::Command
 
         Crypto::P256ECDSASignature signature;
         MutableByteSpan signatureSpan{ signature.Bytes(), signature.Capacity() };
-        SuccessOrExit(err = ComputeAttestationSignature(commandObj, dacProvider, attestationElementsSpan, signatureSpan));
+        err = ComputeAttestationSignature(commandObj, dacProvider, attestationElementsSpan, signatureSpan);
+        VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure);
 
         response.attestationElements = attestationElementsSpan;
         response.signature           = signatureSpan;
+
+        ChipLogProgress(Zcl, "OpCreds: AttestationRequest successful.");
+        finalStatus = Status::Success;
         commandObj->AddResponse(commandPath, response);
     }
 
 exit:
-    if (err != CHIP_NO_ERROR)
+    if (finalStatus != Status::Success)
     {
-        ChipLogError(Zcl, "OpCreds: Failed AttestationRequest: %" CHIP_ERROR_FORMAT, err.Format());
-        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
+        commandObj->AddStatus(commandPath, finalStatus);
+        ChipLogError(Zcl, "OpCreds: Failed AttestationRequest request with IM error 0x%02u (err = %" CHIP_ERROR_FORMAT ")",
+                     to_underlying(finalStatus), err.Format());
     }
 
     return true;
@@ -922,73 +1092,85 @@ bool emberAfOperationalCredentialsClusterCSRRequestCallback(app::CommandHandler
     MATTER_TRACE_EVENT_SCOPE("CSRRequest", "OperationalCredentials");
     ChipLogProgress(Zcl, "OpCreds: Received a CSRRequest command");
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    Platform::ScopedMemoryBuffer<uint8_t> csr;
     chip::Platform::ScopedMemoryBuffer<uint8_t> nocsrElements;
     MutableByteSpan nocsrElementsSpan;
+    auto finalStatus = Status::Failure;
 
+    // Start with CHIP_ERROR_INVALID_ARGUMENT so that cascading errors yield correct
+    // logs by the end. We use finalStatus as our overall success marker, not error
+    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+
+    auto & fabricTable                = Server::GetInstance().GetFabricTable();
     FailSafeContext & failSafeContext = DeviceControlServer::DeviceControlSvr().GetFailSafeContext();
 
-    if (!failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()))
-    {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::UnsupportedAccess));
-        return true;
-    }
+    auto & CSRNonce     = commandData.CSRNonce;
+    bool isForUpdateNoc = commandData.isForUpdateNOC.ValueOr(false);
 
-    auto & CSRNonce = commandData.CSRNonce;
+    failSafeContext.SetCsrRequestForUpdateNoc(isForUpdateNoc);
+    FabricInfo * fabricInfo = RetrieveCurrentFabric(commandObj);
 
-    VerifyOrExit(commandObj != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
-    VerifyOrExit(CSRNonce.size() == Credentials::kExpectedAttestationNonceSize, err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit(CSRNonce.size() == Credentials::kExpectedAttestationNonceSize, finalStatus = Status::InvalidCommand);
+
+    // If current fabric is not available, command was invoked over PASE which is not legal if IsForUpdateNOC is true.
+    VerifyOrExit(!isForUpdateNoc || (fabricInfo != nullptr), finalStatus = Status::InvalidCommand);
+
+    VerifyOrExit(failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()), finalStatus = Status::FailsafeRequired);
+    VerifyOrExit(!failSafeContext.NocCommandHasBeenInvoked(), finalStatus = Status::ConstraintError);
 
     // Prepare NOCSRElements structure
     {
-#ifdef ENABLE_HSM_CASE_OPS_KEY
-        Crypto::P256KeypairHSM keypair;
-#else
-        Crypto::P256Keypair keypair;
-#endif
-        size_t csrLength           = Crypto::kMAX_CSR_Length;
+        constexpr size_t csrLength = Crypto::kMAX_CSR_Length;
         size_t nocsrLengthEstimate = 0;
         ByteSpan kNoVendorReserved;
+        Platform::ScopedMemoryBuffer<uint8_t> csr;
+        MutableByteSpan csrSpan;
 
-        // Always generate a new operational keypair for any new CSRRequest
-        if (gFabricBeingCommissioned.GetOperationalKey() != nullptr)
+        // Generate the actual CSR from the ephemeral key
+        if (!csr.Alloc(csrLength))
         {
-            gFabricBeingCommissioned.GetOperationalKey()->Clear();
+            err = CHIP_ERROR_NO_MEMORY;
+            VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::ResourceExhausted);
         }
+        csrSpan = MutableByteSpan{ csr.Get(), csrLength };
 
-#ifdef ENABLE_HSM_CASE_OPS_KEY
-        keypair.CreateOperationalKey(gFabricBeingCommissioned.GetFabricIndex());
-#else
-        keypair.Initialize();
-#endif
-        SuccessOrExit(err = gFabricBeingCommissioned.SetOperationalKeypair(&keypair));
+        Optional<FabricIndex> fabricIndexForCsr;
+        if (isForUpdateNoc)
+        {
+            fabricIndexForCsr.SetValue(commandObj->GetAccessingFabricIndex());
+        }
 
-        // Generate the actual CSR from the ephemeral key
-        VerifyOrExit(csr.Alloc(csrLength), err = CHIP_ERROR_NO_MEMORY);
+        err = fabricTable.AllocatePendingOperationalKey(fabricIndexForCsr, csrSpan);
+
+        if (csrSpan.size() > Crypto::kMAX_CSR_Length)
+        {
+            err = CHIP_ERROR_INTERNAL;
+        }
 
-        err = gFabricBeingCommissioned.GetOperationalKey()->NewCertificateSigningRequest(csr.Get(), csrLength);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "OpCreds: NewCertificateSigningRequest returned %" CHIP_ERROR_FORMAT, err.Format());
-            SuccessOrExit(err);
+            ChipLogError(Zcl, "OpCreds: AllocatePendingOperationalKey returned %" CHIP_ERROR_FORMAT, err.Format());
+            VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure);
         }
-        ChipLogProgress(Zcl, "OpCreds: NewCertificateSigningRequest succeeded");
 
-        VerifyOrExit(csrLength <= Crypto::kMAX_CSR_Length, err = CHIP_ERROR_INTERNAL);
+        ChipLogProgress(Zcl, "OpCreds: AllocatePendingOperationalKey succeeded");
 
         // Encode the NOCSR elements with the CSR and Nonce
-        nocsrLengthEstimate = TLV::EstimateStructOverhead(csrLength,       // CSR buffer
+        nocsrLengthEstimate = TLV::EstimateStructOverhead(csrSpan.size(),  // CSR buffer
                                                           CSRNonce.size(), // CSR Nonce
                                                           0u               // no vendor reserved data
         );
 
-        VerifyOrExit(nocsrElements.Alloc(nocsrLengthEstimate), err = CHIP_ERROR_NO_MEMORY);
+        if (!nocsrElements.Alloc(nocsrLengthEstimate))
+        {
+            err = CHIP_ERROR_NO_MEMORY;
+            VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::ResourceExhausted);
+        }
 
         nocsrElementsSpan = MutableByteSpan{ nocsrElements.Get(), nocsrLengthEstimate };
-        SuccessOrExit(err = Credentials::ConstructNOCSRElements(ByteSpan{ csr.Get(), csrLength }, CSRNonce, kNoVendorReserved,
-                                                                kNoVendorReserved, kNoVendorReserved, nocsrElementsSpan));
-        VerifyOrExit(nocsrElementsSpan.size() <= kMaxRspLen, err = CHIP_ERROR_INTERNAL);
+
+        err = Credentials::ConstructNOCSRElements(ByteSpan{ csrSpan.data(), csrSpan.size() }, CSRNonce, kNoVendorReserved,
+                                                  kNoVendorReserved, kNoVendorReserved, nocsrElementsSpan);
+        VerifyOrExit((err == CHIP_NO_ERROR) && (nocsrElementsSpan.size() <= kMaxRspLen), finalStatus = Status::Failure);
     }
 
     // Prepare response payload with signature
@@ -999,20 +1181,25 @@ bool emberAfOperationalCredentialsClusterCSRRequestCallback(app::CommandHandler
 
         Crypto::P256ECDSASignature signature;
         MutableByteSpan signatureSpan{ signature.Bytes(), signature.Capacity() };
-        SuccessOrExit(err = ComputeAttestationSignature(commandObj, dacProvider, nocsrElementsSpan, signatureSpan));
+
+        err = ComputeAttestationSignature(commandObj, dacProvider, nocsrElementsSpan, signatureSpan);
+        VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure);
 
         response.NOCSRElements        = nocsrElementsSpan;
         response.attestationSignature = signatureSpan;
+
+        ChipLogProgress(Zcl, "OpCreds: CSRRequest successful.");
+        finalStatus = Status::Success;
         commandObj->AddResponse(commandPath, response);
     }
 
 exit:
-    if (err != CHIP_NO_ERROR)
+    // If failed constraints or internal errors, send a status report instead of the response sent above
+    if (finalStatus != Status::Success)
     {
-        // TODO: Replace this error handling with fail-safe since it's not transactional against root certs
-        gFabricBeingCommissioned.Reset();
-        ChipLogError(Zcl, "OpCreds: Failed CSRRequest: %" CHIP_ERROR_FORMAT, err.Format());
-        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE);
+        commandObj->AddStatus(commandPath, finalStatus);
+        ChipLogError(Zcl, "OpCreds: Failed CSRRequest request with IM error 0x%02u (err = %" CHIP_ERROR_FORMAT ")",
+                     to_underlying(finalStatus), err.Format());
     }
 
     return true;
@@ -1023,51 +1210,56 @@ bool emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(
     const Commands::AddTrustedRootCertificate::DecodableType & commandData)
 {
     MATTER_TRACE_EVENT_SCOPE("AddTrustedRootCertificate", "OperationalCredentials");
-    auto & RootCertificate = commandData.rootCertificate;
 
-    EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
+    auto finalStatus = Status::Failure;
 
-    ChipLogProgress(Zcl, "OpCreds: Received an AddTrustedRootCertificate command");
+    // Start with CHIP_ERROR_INVALID_ARGUMENT so that cascading errors yield correct
+    // logs by the end. We use finalStatus as our overall success marker, not error
+    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
 
+    auto & rootCertificate            = commandData.rootCertificate;
     FailSafeContext & failSafeContext = DeviceControlServer::DeviceControlSvr().GetFailSafeContext();
 
-    if (!failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()))
-    {
-        LogErrorOnFailure(commandObj->AddStatus(commandPath, Status::UnsupportedAccess));
-        return true;
-    }
+    ChipLogProgress(Zcl, "OpCreds: Received an AddTrustedRootCertificate command");
+
+    VerifyOrExit(rootCertificate.size() <= Credentials::kMaxCHIPCertLength, finalStatus = Status::InvalidCommand);
+
+    VerifyOrExit(failSafeContext.IsFailSafeArmed(commandObj->GetAccessingFabricIndex()), finalStatus = Status::FailsafeRequired);
+
+    // Can only add a single trusted root cert per fail-safe
+    VerifyOrExit(!failSafeContext.AddTrustedRootCertHasBeenInvoked(), finalStatus = Status::ConstraintError);
+
+    // If we successfully invoked AddNOC/UpdateNOC, this command cannot possibly
+    // be useful in the context.
+    VerifyOrExit(!failSafeContext.NocCommandHasBeenInvoked(), finalStatus = Status::ConstraintError);
 
-    // TODO: Ensure we do not duplicate roots in storage, and detect "same key, different cert" errors
     // TODO: Validate cert signature prior to setting.
-    VerifyOrExit(gFabricBeingCommissioned.SetRootCert(RootCertificate) == CHIP_NO_ERROR, status = EMBER_ZCL_STATUS_INVALID_FIELD);
+    err = gFabricBeingCommissioned.SetRootCert(rootCertificate);
 
-exit:
-    emberAfSendImmediateDefaultResponse(status);
-    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    // CHIP_ERROR_INVALID_ARGUMENT by the time we reach here means bad format
+    VerifyOrExit(err != CHIP_ERROR_INVALID_ARGUMENT, finalStatus = Status::InvalidCommand);
+
+    // Other unexpected errors
+    if (err != CHIP_NO_ERROR)
     {
         gFabricBeingCommissioned.Reset();
-        ChipLogProgress(Zcl, "OpCreds: Failed AddTrustedRootCertificate request");
-    }
-    else
-    {
-        MatterReportingAttributeChangeCallback(commandPath.mEndpointId, OperationalCredentials::Id,
-                                               OperationalCredentials::Attributes::TrustedRootCertificates::Id);
+        finalStatus = Status::Failure;
     }
 
-    return true;
-}
-
-bool emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(
-    app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-    const Commands::RemoveTrustedRootCertificate::DecodableType & commandData)
-{
-    MATTER_TRACE_EVENT_SCOPE("RemoveTrustedRootCertificate", "OperationalCredentials");
-    // TODO: Implement the logic for RemoveTrustedRootCertificate
-    EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE;
-    emberAfSendImmediateDefaultResponse(status);
-
+    // Got here, so we succeeded, mark AddTrustedRootCert has having been invoked.
+    ChipLogProgress(Zcl, "OpCreds: AddTrustedRootCertificate successful.");
+    finalStatus = Status::Success;
+    failSafeContext.SetAddTrustedRootCertInvoked();
     MatterReportingAttributeChangeCallback(commandPath.mEndpointId, OperationalCredentials::Id,
                                            OperationalCredentials::Attributes::TrustedRootCertificates::Id);
 
+exit:
+    if (finalStatus != Status::Success)
+    {
+        ChipLogError(Zcl, "OpCreds: Failed AddTrustedRootCertificate request with IM error 0x%02u (err = %" CHIP_ERROR_FORMAT ")",
+                     to_underlying(finalStatus), err.Format());
+    }
+
+    commandObj->AddStatus(commandPath, finalStatus);
     return true;
 }
diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
index e7647d768b1bd5..39aa512596305d 100644
--- a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
+++ b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
@@ -24,6 +24,7 @@
 #include <app/clusters/ota-requestor/ota-requestor-server.h>
 #include <lib/core/CHIPEncoding.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/OTAImageProcessor.h>
 #include <protocols/bdx/BdxUri.h>
 #include <zap-generated/CHIPClusters.h>
@@ -620,7 +621,6 @@ void DefaultOTARequestor::OnDownloadStateChanged(OTADownloader::State state, OTA
         {
             RecordErrorUpdateState(CHIP_ERROR_CONNECTION_ABORTED, reason);
         }
-
         break;
     default:
         break;
@@ -668,19 +668,19 @@ void DefaultOTARequestor::RecordNewUpdateState(OTAUpdateStateEnum newState, OTAC
     }
     OtaRequestorServerOnStateTransition(mCurrentUpdateState, newState, reason, targetSoftwareVersion);
 
-    if ((newState == OTAUpdateStateEnum::kIdle) && (mCurrentUpdateState != OTAUpdateStateEnum::kIdle))
+    OTAUpdateStateEnum prevState = mCurrentUpdateState;
+    // Update the new state before handling the state transition
+    mCurrentUpdateState = newState;
+
+    if ((newState == OTAUpdateStateEnum::kIdle) && (prevState != OTAUpdateStateEnum::kIdle))
     {
         IdleStateReason idleStateReason = MapErrorToIdleStateReason(error);
-
-        // Inform the driver that the core logic has entered the Idle state
         mOtaRequestorDriver->HandleIdleStateEnter(idleStateReason);
     }
-    else if ((mCurrentUpdateState == OTAUpdateStateEnum::kIdle) && (newState != OTAUpdateStateEnum::kIdle))
+    else if ((prevState == OTAUpdateStateEnum::kIdle) && (newState != OTAUpdateStateEnum::kIdle))
     {
         mOtaRequestorDriver->HandleIdleStateExit();
     }
-
-    mCurrentUpdateState = newState;
 }
 
 void DefaultOTARequestor::RecordErrorUpdateState(CHIP_ERROR error, OTAChangeReasonEnum reason)
@@ -733,7 +733,7 @@ CHIP_ERROR DefaultOTARequestor::SendQueryImageRequest(OperationalDeviceProxy & d
     args.requestorCanConsent.SetValue(!Basic::IsLocalConfigDisabled() && mOtaRequestorDriver->CanConsent());
 
     uint16_t hardwareVersion;
-    if (DeviceLayer::ConfigurationMgr().GetHardwareVersion(hardwareVersion) == CHIP_NO_ERROR)
+    if (DeviceLayer::GetDeviceInstanceInfoProvider()->GetHardwareVersion(hardwareVersion) == CHIP_NO_ERROR)
     {
         args.hardwareVersion.SetValue(hardwareVersion);
     }
diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
index 85de14f13d0958..b3d8544e85198d 100644
--- a/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
+++ b/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
@@ -45,6 +45,7 @@ namespace {
 using namespace app::Clusters::OtaSoftwareUpdateRequestor;
 using namespace app::Clusters::OtaSoftwareUpdateRequestor::Structs;
 
+constexpr uint8_t kMaxInvalidSessionRetries        = 1;  // Max # of query image retries to perform on invalid session error
 constexpr uint32_t kDelayQueryUponCommissioningSec = 30; // Delay before sending the initial image query after commissioning
 constexpr uint32_t kImmediateStartDelaySec         = 1;  // Delay before sending a query in response to UrgentUpdateAvailable
 constexpr System::Clock::Seconds32 kDefaultDelayedActionTime = System::Clock::Seconds32(120);
@@ -58,9 +59,10 @@ DefaultOTARequestorDriver * ToDriver(void * context)
 
 void DefaultOTARequestorDriver::Init(OTARequestorInterface * requestor, OTAImageProcessorInterface * processor)
 {
-    mRequestor          = requestor;
-    mImageProcessor     = processor;
-    mProviderRetryCount = 0;
+    mRequestor                = requestor;
+    mImageProcessor           = processor;
+    mProviderRetryCount       = 0;
+    mInvalidSessionRetryCount = 0;
 
     if (mImageProcessor->IsFirstImageRun())
     {
@@ -127,6 +129,11 @@ void DefaultOTARequestorDriver::HandleIdleStateExit()
 
 void DefaultOTARequestorDriver::HandleIdleStateEnter(IdleStateReason reason)
 {
+    if (reason != IdleStateReason::kInvalidSession)
+    {
+        mInvalidSessionRetryCount = 0;
+    }
+
     switch (reason)
     {
     case IdleStateReason::kUnknown:
@@ -138,8 +145,20 @@ void DefaultOTARequestorDriver::HandleIdleStateEnter(IdleStateReason reason)
         StartSelectedTimer(SelectedTimer::kPeriodicQueryTimer);
         break;
     case IdleStateReason::kInvalidSession:
-        // An invalid session is detected which may be temporary so try to query the same provider again
-        SendQueryImage();
+        if (mInvalidSessionRetryCount < kMaxInvalidSessionRetries)
+        {
+            // An invalid session is detected which may be temporary (such as provider being restarted)
+            // so try to query the same provider again. Since the session has already been disconnected prior to
+            // getting here, this new query should trigger an attempt to re-establish CASE. If that subsequently fails,
+            // we conclusively know the provider is not available, and will fall into the else clause below on that attempt.
+            SendQueryImage();
+            mInvalidSessionRetryCount++;
+        }
+        else
+        {
+            mInvalidSessionRetryCount = 0;
+            StartSelectedTimer(SelectedTimer::kPeriodicQueryTimer);
+        }
         break;
     }
 }
@@ -186,17 +205,17 @@ CHIP_ERROR DefaultOTARequestorDriver::UpdateNotFound(UpdateNotFoundReason reason
     case UpdateNotFoundReason::kUpToDate:
         break;
     case UpdateNotFoundReason::kBusy: {
-        status = ScheduleQueryRetry(true);
+        status = ScheduleQueryRetry(true, chip::max(kDefaultDelayedActionTime, delay));
         if (status == CHIP_ERROR_MAX_RETRY_EXCEEDED)
         {
             // If max retry exceeded with current provider, try a different provider
-            status = ScheduleQueryRetry(false);
+            status = ScheduleQueryRetry(false, chip::max(kDefaultDelayedActionTime, delay));
         }
         break;
     }
     case UpdateNotFoundReason::kNotAvailable: {
         // Schedule a query only if a different provider is available
-        status = ScheduleQueryRetry(false);
+        status = ScheduleQueryRetry(false, chip::max(kDefaultDelayedActionTime, delay));
         break;
     }
     }
@@ -449,7 +468,7 @@ bool DefaultOTARequestorDriver::GetNextProviderLocation(ProviderLocationType & p
     return false;
 }
 
-CHIP_ERROR DefaultOTARequestorDriver::ScheduleQueryRetry(bool trySameProvider)
+CHIP_ERROR DefaultOTARequestorDriver::ScheduleQueryRetry(bool trySameProvider, System::Clock::Seconds32 delay)
 {
     CHIP_ERROR status = CHIP_NO_ERROR;
 
@@ -483,7 +502,7 @@ CHIP_ERROR DefaultOTARequestorDriver::ScheduleQueryRetry(bool trySameProvider)
     if (status == CHIP_NO_ERROR)
     {
         ChipLogProgress(SoftwareUpdate, "Scheduling a retry");
-        ScheduleDelayedAction(kDefaultDelayedActionTime, StartDelayTimerHandler, this);
+        ScheduleDelayedAction(delay, StartDelayTimerHandler, this);
     }
 
     return status;
diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h b/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h
index 2ff7e5d3526f26..0d76af626d6dc6 100644
--- a/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h
+++ b/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h
@@ -97,7 +97,7 @@ class DefaultOTARequestorDriver : public OTARequestorDriver
     void CancelDelayedAction(System::TimerCompleteCallback action, void * aAppState);
     bool ProviderLocationsEqual(const ProviderLocationType & a, const ProviderLocationType & b);
     // Return value of CHIP_NO_ERROR indicates a query retry has been successfully scheduled.
-    CHIP_ERROR ScheduleQueryRetry(bool trySameProvider);
+    CHIP_ERROR ScheduleQueryRetry(bool trySameProvider, System::Clock::Seconds32 delay);
 
     OTARequestorInterface * mRequestor           = nullptr;
     OTAImageProcessorInterface * mImageProcessor = nullptr;
@@ -109,7 +109,10 @@ class DefaultOTARequestorDriver : public OTARequestorDriver
     uint16_t maxDownloadBlockSize  = 1024;
     // Maximum number of times to retry a BUSY OTA provider before moving to the next available one
     static constexpr uint8_t kMaxBusyProviderRetryCount = 3;
-    uint8_t mProviderRetryCount; // Track retry count for the current provider
+    // Track retry count for the current provider
+    uint8_t mProviderRetryCount = 0;
+    // Track query image retry count on invalid session error
+    uint8_t mInvalidSessionRetryCount = 0;
 };
 
 } // namespace DeviceLayer
diff --git a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
index 19ceac89be8f70..1e4e4fb69d881d 100644
--- a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
+++ b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
@@ -16,14 +16,15 @@
  */
 
 #include <app/util/af.h>
+#include <app/util/util.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/AttributeAccessInterface.h>
-//#include <app/CommandHandler.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
+#include <app/InteractionModelEngine.h>
 #include <app/util/af-event.h>
 #include <app/util/attribute-storage.h>
 
@@ -71,12 +72,36 @@ static void updateAttributeLinks(EndpointId endpoint)
 {
     PumpControlMode controlMode;
     PumpOperationMode operationMode;
-    BitFlags<PumpStatus> pumpStatus;
+    BitMask<PumpStatus> pumpStatus;
+    bool isControlModeAvailable = true;
+    bool isPumpStatusAvailable  = true;
+
+    isControlModeAvailable = emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::ControlMode::Id);
+    isPumpStatusAvailable  = emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::PumpStatus::Id);
 
     // Get the current control- and operation modes
-    Attributes::ControlMode::Get(endpoint, &controlMode);
     Attributes::OperationMode::Get(endpoint, &operationMode);
-    Attributes::PumpStatus::Get(endpoint, &pumpStatus);
+
+    if (isControlModeAvailable)
+    {
+        Attributes::ControlMode::Get(endpoint, &controlMode);
+    }
+    else
+    {
+        // If controlMode attribute is not available, then use the default value
+        // of the effectiveControlMode attribute as the effectiveControlMode
+        // if this is not suitable, the application should override this value in
+        // the post attribute change callback for the operation mode attribute
+        const EmberAfAttributeMetadata * effectiveControlModeMetaData;
+        effectiveControlModeMetaData = GetAttributeMetadata(
+            app::ConcreteAttributePath(endpoint, PumpConfigurationAndControl::Id, Attributes::EffectiveControlMode::Id));
+        controlMode = static_cast<PumpControlMode>(effectiveControlModeMetaData->defaultValue.defaultValue);
+    }
+
+    if (isPumpStatusAvailable)
+    {
+        Attributes::PumpStatus::Get(endpoint, &pumpStatus);
+    }
 
     switch (operationMode)
     {
@@ -93,21 +118,30 @@ static void updateAttributeLinks(EndpointId endpoint)
         {
         case RemoteSensorType::kFlowSensor:
             Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantFlow);
-            pumpStatus.Set(PumpStatus::kRemoteFlow);
-            pumpStatus.Clear(PumpStatus::kRemotePressure);
-            pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+            if (isPumpStatusAvailable)
+            {
+                pumpStatus.Set(PumpStatus::kRemoteFlow);
+                pumpStatus.Clear(PumpStatus::kRemotePressure);
+                pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+            }
             break;
         case RemoteSensorType::kPressureSensor:
             Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantPressure);
-            pumpStatus.Clear(PumpStatus::kRemoteFlow);
-            pumpStatus.Set(PumpStatus::kRemotePressure);
-            pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+            if (isPumpStatusAvailable)
+            {
+                pumpStatus.Clear(PumpStatus::kRemoteFlow);
+                pumpStatus.Set(PumpStatus::kRemotePressure);
+                pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+            }
             break;
         case RemoteSensorType::kTemperatureSensor:
             Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantTemperature);
-            pumpStatus.Clear(PumpStatus::kRemoteFlow);
-            pumpStatus.Clear(PumpStatus::kRemotePressure);
-            pumpStatus.Set(PumpStatus::kRemoteTemperature);
+            if (isPumpStatusAvailable)
+            {
+                pumpStatus.Clear(PumpStatus::kRemoteFlow);
+                pumpStatus.Clear(PumpStatus::kRemotePressure);
+                pumpStatus.Set(PumpStatus::kRemoteTemperature);
+            }
             break;
         case RemoteSensorType::kNoSensor:
             // The pump is controlled by a setpoint, as defined by
@@ -119,23 +153,11 @@ static void updateAttributeLinks(EndpointId endpoint)
             // which would be the EffectiveControlMode is dependant on the actual
             // physical pump application running "on-top" of this cluster server.
             Attributes::EffectiveControlMode::Set(endpoint, controlMode);
-            pumpStatus.Clear(PumpStatus::kRemoteFlow);
-            pumpStatus.Clear(PumpStatus::kRemotePressure);
-            pumpStatus.Clear(PumpStatus::kRemoteTemperature);
-            switch (controlMode)
+            if (isPumpStatusAvailable)
             {
-            case PumpControlMode::kConstantFlow:
-                pumpStatus.Set(PumpStatus::kRemoteFlow);
-                break;
-            case PumpControlMode::kConstantPressure:
-                pumpStatus.Set(PumpStatus::kRemotePressure);
-                break;
-            case PumpControlMode::kConstantTemperature:
-                pumpStatus.Set(PumpStatus::kRemoteTemperature);
-                break;
-            default:
-                // Intentionally left out
-                break;
+                pumpStatus.Clear(PumpStatus::kRemoteFlow);
+                pumpStatus.Clear(PumpStatus::kRemotePressure);
+                pumpStatus.Clear(PumpStatus::kRemoteTemperature);
             }
             break;
         }
@@ -157,9 +179,12 @@ static void updateAttributeLinks(EndpointId endpoint)
         LevelControl::Attributes::MaxLevel::Get(endpoint, &maxLevel);
         LevelControl::Attributes::CurrentLevel::Set(endpoint, maxLevel);
 #endif
-        pumpStatus.Clear(PumpStatus::kRemoteFlow);
-        pumpStatus.Clear(PumpStatus::kRemotePressure);
-        pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+        if (isPumpStatusAvailable)
+        {
+            pumpStatus.Clear(PumpStatus::kRemoteFlow);
+            pumpStatus.Clear(PumpStatus::kRemotePressure);
+            pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+        }
     }
     break;
 
@@ -178,9 +203,12 @@ static void updateAttributeLinks(EndpointId endpoint)
         }
         LevelControl::Attributes::CurrentLevel::Set(endpoint, minLevel);
 #endif
-        pumpStatus.Clear(PumpStatus::kRemoteFlow);
-        pumpStatus.Clear(PumpStatus::kRemotePressure);
-        pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+        if (isPumpStatusAvailable)
+        {
+            pumpStatus.Clear(PumpStatus::kRemoteFlow);
+            pumpStatus.Clear(PumpStatus::kRemotePressure);
+            pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+        }
     }
     break;
 
@@ -193,13 +221,20 @@ static void updateAttributeLinks(EndpointId endpoint)
         // Set the current ControlMode for now. Perhaps the application will set the EffectiveControlMode to something else.
         Attributes::EffectiveControlMode::Set(endpoint, controlMode);
         // Clear out the remote sensors from the PumpStatus flags.
-        pumpStatus.Clear(PumpStatus::kRemoteFlow);
-        pumpStatus.Clear(PumpStatus::kRemotePressure);
-        pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+        if (isPumpStatusAvailable)
+        {
+            pumpStatus.Clear(PumpStatus::kRemoteFlow);
+            pumpStatus.Clear(PumpStatus::kRemotePressure);
+            pumpStatus.Clear(PumpStatus::kRemoteTemperature);
+        }
     }
     break;
     }
-    Attributes::PumpStatus::Set(endpoint, pumpStatus);
+
+    if (isPumpStatusAvailable)
+    {
+        Attributes::PumpStatus::Set(endpoint, pumpStatus);
+    }
 }
 
 CHIP_ERROR PumpConfigurationAndControlAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
@@ -261,14 +296,15 @@ bool IsFeatureSupported(EndpointId endpoint, EmberAfStatus (*getFn1)(chip::Endpo
     return false;
 }
 
-void emberAfPumpConfigurationAndControlClusterServerInitCallback(EndpointId endpoint)
+template <typename T1, typename T2>
+const char * FeatureSupportedDebugString(EndpointId endpoint, EmberAfStatus (*getFn1)(chip::EndpointId endpointId, T1 & value),
+                                         EmberAfStatus (*getFn2)(chip::EndpointId endpointId, T2 & value))
 {
-    bool constPressureSupported     = false;
-    bool constPropPressureSupported = false;
-    bool constFlowSupported         = false;
-    bool constTemperatureSupported  = false;
-    bool constSpeedSupported        = false;
+    return IsFeatureSupported(endpoint, getFn1, getFn2) ? "Supported" : "Not Supported";
+}
 
+void emberAfPumpConfigurationAndControlClusterServerInitCallback(EndpointId endpoint)
+{
     emberAfDebugPrintln("Initialize PCC Server Cluster [EP:%d]", endpoint);
 
     // Determine the internal feature set of the pump, depending on the pump
@@ -283,16 +319,27 @@ void emberAfPumpConfigurationAndControlClusterServerInitCallback(EndpointId endp
     // has finished its init process, it might setup these attributevalues
     // to something NonNull, and then we must re-calcualte the feature set.
 
-    constPressureSupported = IsFeatureSupported(endpoint, Attributes::MinConstPressure::Get, Attributes::MaxConstPressure::Get);
-    emberAfDebugPrintln("Constant Pressure %s", constPressureSupported ? "Supported" : "Not Supported");
-    constPropPressureSupported = IsFeatureSupported(endpoint, Attributes::MinCompPressure::Get, Attributes::MaxCompPressure::Get);
-    emberAfDebugPrintln("Constant Proportional Pressure %s", constPropPressureSupported ? "Supported" : "Not Supported");
-    constFlowSupported = IsFeatureSupported(endpoint, Attributes::MinConstFlow::Get, Attributes::MaxConstFlow::Get);
-    emberAfDebugPrintln("Constant Flow %s", constFlowSupported ? "Supported" : "Not Supported");
-    constTemperatureSupported = IsFeatureSupported(endpoint, Attributes::MinConstTemp::Get, Attributes::MaxConstTemp::Get);
-    emberAfDebugPrintln("Constant Temperature %s", constTemperatureSupported ? "Supported" : "Not Supported");
-    constSpeedSupported = IsFeatureSupported(endpoint, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get);
-    emberAfDebugPrintln("Constant Speed %s", constSpeedSupported ? "Supported" : "Not Supported");
+    emberAfDebugPrintln(
+        "Constant Pressure %s",
+        FeatureSupportedDebugString(endpoint, Attributes::MinConstPressure::Get, Attributes::MaxConstPressure::Get));
+    emberAfDebugPrintln("PCC Server: Constant Proportional Pressure %s",
+                        FeatureSupportedDebugString(endpoint, Attributes::MinCompPressure::Get, Attributes::MaxCompPressure::Get));
+    emberAfDebugPrintln("PCC Server: Constant Flow %s",
+                        FeatureSupportedDebugString(endpoint, Attributes::MinConstFlow::Get, Attributes::MaxConstFlow::Get));
+    emberAfDebugPrintln("PCC Server: Constant Temperature %s",
+                        FeatureSupportedDebugString(endpoint, Attributes::MinConstTemp::Get, Attributes::MaxConstTemp::Get));
+    emberAfDebugPrintln("PCC Server: Constant Speed %s",
+                        FeatureSupportedDebugString(endpoint, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get));
+
+    if (!emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::ControlMode::Id))
+    {
+        emberAfDebugPrintln("PCC Server: ControlMode attribute not available");
+    }
+
+    if (!emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::PumpStatus::Id))
+    {
+        emberAfDebugPrintln("PCC Server: PumpStatus attribute not available");
+    }
 }
 
 chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClusterServerPreAttributeChangedCallback(
diff --git a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
index 5639622f99fe6d..433201422b2e5d 100644
--- a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
+++ b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
@@ -15,14 +15,17 @@
  *    limitations under the License.
  */
 
+#include "software-diagnostics-server.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-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandHandler.h>
+#include <app/CommandHandlerInterface.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
+#include <app/InteractionModelEngine.h>
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/Optional.h>
@@ -51,8 +54,21 @@ class SoftwareDiagosticsAttrAccess : public AttributeAccessInterface
     CHIP_ERROR ReadThreadMetrics(AttributeValueEncoder & aEncoder);
 };
 
+class SoftwareDiagnosticsCommandHandler : public CommandHandlerInterface
+{
+public:
+    // Register for the SoftwareDiagnostics cluster on all endpoints.
+    SoftwareDiagnosticsCommandHandler() : CommandHandlerInterface(Optional<EndpointId>::Missing(), SoftwareDiagnostics::Id) {}
+
+    void InvokeCommand(HandlerContext & handlerContext) override;
+
+    CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context) override;
+};
+
 SoftwareDiagosticsAttrAccess gAttrAccess;
 
+SoftwareDiagnosticsCommandHandler gCommandHandler;
+
 CHIP_ERROR SoftwareDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
     if (aPath.mClusterId != SoftwareDiagnostics::Id)
@@ -63,22 +79,27 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::Read(const ConcreteReadAttributePath &
 
     switch (aPath.mAttributeId)
     {
-    case CurrentHeapFree::Id: {
+    case CurrentHeapFree::Id:
         return ReadIfSupported(&DiagnosticDataProvider::GetCurrentHeapFree, aEncoder);
-    }
-    case CurrentHeapUsed::Id: {
+    case CurrentHeapUsed::Id:
         return ReadIfSupported(&DiagnosticDataProvider::GetCurrentHeapUsed, aEncoder);
-    }
-    case CurrentHeapHighWatermark::Id: {
+    case CurrentHeapHighWatermark::Id:
         return ReadIfSupported(&DiagnosticDataProvider::GetCurrentHeapHighWatermark, aEncoder);
-    }
-    case ThreadMetrics::Id: {
+    case ThreadMetrics::Id:
         return ReadThreadMetrics(aEncoder);
+    case Clusters::Globals::Attributes::FeatureMap::Id: {
+        BitFlags<SoftwareDiagnosticsFeature> features;
+
+        if (DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks())
+        {
+            features.Set(SoftwareDiagnosticsFeature::kWaterMarks);
+        }
+
+        return aEncoder.Encode(features);
     }
-    default: {
+    default:
         break;
     }
-    }
     return CHIP_NO_ERROR;
 }
 
@@ -125,51 +146,91 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::ReadThreadMetrics(AttributeValueEncoder
     return err;
 }
 
-class SoftwareDiagnosticsDelegate : public DeviceLayer::SoftwareDiagnosticsDelegate
+void SoftwareDiagnosticsCommandHandler::InvokeCommand(HandlerContext & handlerContext)
 {
-    // Gets called when a software fault that has taken place on the Node.
-    void OnSoftwareFaultDetected(SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type & softwareFault) override
+    using Protocols::InteractionModel::Status;
+    if (handlerContext.mRequestPath.mCommandId != Commands::ResetWatermarks::Id)
     {
-        ChipLogDetail(Zcl, "SoftwareDiagnosticsDelegate: OnSoftwareFaultDetected");
+        // Normal error handling
+        return;
+    }
 
-        for (auto endpoint : EnabledEndpointsWithServerCluster(SoftwareDiagnostics::Id))
-        {
-            // If Software Diagnostics cluster is implemented on this endpoint
-            EventNumber eventNumber;
-            Events::SoftwareFault::Type event{ softwareFault };
+    handlerContext.SetCommandHandled();
+    Status status = Status::Success;
+    if (!DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks())
+    {
+        status = Status::UnsupportedCommand;
+    }
+    else if (DeviceLayer::GetDiagnosticDataProvider().ResetWatermarks() != CHIP_NO_ERROR)
+    {
+        status = Status::Failure;
+    }
+    handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, status);
+}
 
-            if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
-            {
-                ChipLogError(Zcl, "SoftwareDiagnosticsDelegate: Failed to record SoftwareFault event");
-            }
-        }
+CHIP_ERROR SoftwareDiagnosticsCommandHandler::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
+                                                                        CommandIdCallback callback, void * context)
+{
+    if (!DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks())
+    {
+        // No commmands.
+        return CHIP_NO_ERROR;
     }
-};
 
-SoftwareDiagnosticsDelegate gDiagnosticDelegate;
+    callback(Commands::ResetWatermarks::Id, context);
+
+    return CHIP_NO_ERROR;
+}
 
 } // anonymous namespace
 
-bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandler * commandObj,
-                                                              const app::ConcreteCommandPath & commandPath,
-                                                              const Commands::ResetWatermarks::DecodableType & commandData)
+namespace chip {
+namespace app {
+namespace Clusters {
+
+SoftwareDiagnosticsServer SoftwareDiagnosticsServer::instance;
+
+/**********************************************************
+ * SoftwareDiagnosticsServer Implementation
+ *********************************************************/
+
+SoftwareDiagnosticsServer & SoftwareDiagnosticsServer::Instance()
+{
+    return instance;
+}
+
+// Gets called when a software fault that has taken place on the Node.
+void SoftwareDiagnosticsServer::OnSoftwareFaultDetect(const SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type & softwareFault)
 {
-    EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
+    ChipLogDetail(Zcl, "SoftwareDiagnosticsDelegate: OnSoftwareFaultDetected");
 
-    // If implemented, the server SHALL set the value of the CurrentHeapHighWatermark attribute to the
-    // value of the CurrentHeapUsed.
-    if (DeviceLayer::GetDiagnosticDataProvider().ResetWatermarks() != CHIP_NO_ERROR)
+    for (auto endpoint : EnabledEndpointsWithServerCluster(SoftwareDiagnostics::Id))
     {
-        status = EMBER_ZCL_STATUS_FAILURE;
+        // If Software Diagnostics cluster is implemented on this endpoint
+        EventNumber eventNumber;
+        Events::SoftwareFault::Type event{ softwareFault };
+
+        if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
+        {
+            ChipLogError(Zcl, "SoftwareDiagnosticsDelegate: Failed to record SoftwareFault event");
+        }
     }
+}
 
-    emberAfSendImmediateDefaultResponse(status);
+} // namespace Clusters
+} // namespace app
+} // namespace chip
 
-    return true;
+bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandler * commandObj,
+                                                              const app::ConcreteCommandPath & commandPath,
+                                                              const Commands::ResetWatermarks::DecodableType & commandData)
+{
+    // Shouldn't be called at all.
+    return false;
 }
 
 void MatterSoftwareDiagnosticsPluginServerInitCallback()
 {
     registerAttributeAccessOverride(&gAttrAccess);
-    GetDiagnosticDataProvider().SetSoftwareDiagnosticsDelegate(&gDiagnosticDelegate);
+    InteractionModelEngine::GetInstance()->RegisterCommandHandler(&gCommandHandler);
 }
diff --git a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.h b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.h
new file mode 100644
index 00000000000000..95fa51c03aed4b
--- /dev/null
+++ b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.h
@@ -0,0 +1,50 @@
+/*
+ *
+ *    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 <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterface.h>
+#include <app/CommandResponseHelper.h>
+#include <platform/GeneralFaults.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+/**
+ * @brief software-diagnostics-server class
+ */
+class SoftwareDiagnosticsServer
+{
+public:
+    static SoftwareDiagnosticsServer & Instance();
+
+    /**
+     * @brief
+     *   Called when a software fault that has taken place on the Node.
+     */
+    void OnSoftwareFaultDetect(const chip::app::Clusters::SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type & softwareFault);
+
+private:
+    static SoftwareDiagnosticsServer instance;
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/app/clusters/switch-server/switch-server.cpp b/src/app/clusters/switch-server/switch-server.cpp
index 6829f20de449a2..f74677edf24533 100644
--- a/src/app/clusters/switch-server/switch-server.cpp
+++ b/src/app/clusters/switch-server/switch-server.cpp
@@ -39,22 +39,21 @@ using chip::DeviceLayer::DeviceControlServer;
 namespace chip {
 namespace app {
 namespace Clusters {
-namespace Switch {
 
-Server Server::instance;
+SwitchServer SwitchServer::instance;
 
 /**********************************************************
- * Server Implementation
+ * SwitchServer Implementation
  *********************************************************/
 
-Server & Server::Instance()
+SwitchServer & SwitchServer::Instance()
 {
     return instance;
 }
 
-void Server::OnSwitchLatch(EndpointId endpoint, uint8_t newPosition)
+void SwitchServer::OnSwitchLatch(EndpointId endpoint, uint8_t newPosition)
 {
-    ChipLogProgress(Zcl, "Server: OnSwitchLatch");
+    ChipLogProgress(Zcl, "SwitchServer: OnSwitchLatch");
 
     // Record SwitchLatched event
     EventNumber eventNumber;
@@ -62,13 +61,13 @@ void Server::OnSwitchLatch(EndpointId endpoint, uint8_t newPosition)
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record SwitchLatched event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record SwitchLatched event");
     }
 }
 
-void Server::OnInitialPress(EndpointId endpoint, uint8_t newPosition)
+void SwitchServer::OnInitialPress(EndpointId endpoint, uint8_t newPosition)
 {
-    ChipLogProgress(Zcl, "Server: OnInitialPress");
+    ChipLogProgress(Zcl, "SwitchServer: OnInitialPress");
 
     // Record InitialPress event
     EventNumber eventNumber;
@@ -76,13 +75,13 @@ void Server::OnInitialPress(EndpointId endpoint, uint8_t newPosition)
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record InitialPress event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record InitialPress event");
     }
 }
 
-void Server::OnLongPress(EndpointId endpoint, uint8_t newPosition)
+void SwitchServer::OnLongPress(EndpointId endpoint, uint8_t newPosition)
 {
-    ChipLogProgress(Zcl, "Server: OnLongPress");
+    ChipLogProgress(Zcl, "SwitchServer: OnLongPress");
 
     // Record LongPress event
     EventNumber eventNumber;
@@ -90,13 +89,13 @@ void Server::OnLongPress(EndpointId endpoint, uint8_t newPosition)
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record LongPress event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record LongPress event");
     }
 }
 
-void Server::OnShortRelease(EndpointId endpoint, uint8_t previousPosition)
+void SwitchServer::OnShortRelease(EndpointId endpoint, uint8_t previousPosition)
 {
-    ChipLogProgress(Zcl, "Server: OnShortRelease");
+    ChipLogProgress(Zcl, "SwitchServer: OnShortRelease");
 
     // Record ShortRelease event
     EventNumber eventNumber;
@@ -104,13 +103,13 @@ void Server::OnShortRelease(EndpointId endpoint, uint8_t previousPosition)
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record ShortRelease event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record ShortRelease event");
     }
 }
 
-void Server::OnLongRelease(EndpointId endpoint, uint8_t previousPosition)
+void SwitchServer::OnLongRelease(EndpointId endpoint, uint8_t previousPosition)
 {
-    ChipLogProgress(Zcl, "Server: OnLongRelease");
+    ChipLogProgress(Zcl, "SwitchServer: OnLongRelease");
 
     // Record LongRelease event
     EventNumber eventNumber;
@@ -118,13 +117,13 @@ void Server::OnLongRelease(EndpointId endpoint, uint8_t previousPosition)
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record LongRelease event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record LongRelease event");
     }
 }
 
-void Server::OnMultiPressOngoing(EndpointId endpoint, uint8_t newPosition, uint8_t count)
+void SwitchServer::OnMultiPressOngoing(EndpointId endpoint, uint8_t newPosition, uint8_t count)
 {
-    ChipLogProgress(Zcl, "Server: OnMultiPressOngoing");
+    ChipLogProgress(Zcl, "SwitchServer: OnMultiPressOngoing");
 
     // Record MultiPressOngoing event
     EventNumber eventNumber;
@@ -132,13 +131,13 @@ void Server::OnMultiPressOngoing(EndpointId endpoint, uint8_t newPosition, uint8
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record MultiPressOngoing event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record MultiPressOngoing event");
     }
 }
 
-void Server::OnMultiPressComplete(EndpointId endpoint, uint8_t newPosition, uint8_t count)
+void SwitchServer::OnMultiPressComplete(EndpointId endpoint, uint8_t newPosition, uint8_t count)
 {
-    ChipLogProgress(Zcl, "Server: OnMultiPressComplete");
+    ChipLogProgress(Zcl, "SwitchServer: OnMultiPressComplete");
 
     // Record MultiPressComplete event
     EventNumber eventNumber;
@@ -146,11 +145,10 @@ void Server::OnMultiPressComplete(EndpointId endpoint, uint8_t newPosition, uint
 
     if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
     {
-        ChipLogError(Zcl, "Server: Failed to record MultiPressComplete event");
+        ChipLogError(Zcl, "SwitchServer: Failed to record MultiPressComplete event");
     }
 }
 
-} // namespace Switch
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/src/app/clusters/switch-server/switch-server.h b/src/app/clusters/switch-server/switch-server.h
index 3724f1f6cd056f..c88701620740b2 100644
--- a/src/app/clusters/switch-server/switch-server.h
+++ b/src/app/clusters/switch-server/switch-server.h
@@ -26,15 +26,14 @@
 namespace chip {
 namespace app {
 namespace Clusters {
-namespace Switch {
 
 /**
  * @brief switch-server class
  */
-class Server
+class SwitchServer
 {
 public:
-    static Server & Instance();
+    static SwitchServer & Instance();
 
     /**
      * @brief
@@ -82,10 +81,9 @@ class Server
     void OnMultiPressComplete(EndpointId endpoint, uint8_t newPosition, uint8_t count);
 
 private:
-    static Server instance;
+    static SwitchServer instance;
 };
 
-} // namespace Switch
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
index fded78cf224ef4..320bce3f34ad24 100644
--- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp
+++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -384,8 +384,8 @@ CHIP_ERROR TestAttrAccess::ReadListStructOctetStringAttribute(AttributeValueEnco
         for (size_t index = 0; index < gListOperationalCertLen; index++)
         {
             Structs::TestListStructOctet::Type structOctet;
-            structOctet.fabricIndex     = listStructOctetStringData[index].fabricIndex;
-            structOctet.operationalCert = listStructOctetStringData[index].operationalCert;
+            structOctet.member1 = listStructOctetStringData[index].member1;
+            structOctet.member2 = listStructOctetStringData[index].member2;
             ReturnErrorOnFailure(encoder.Encode(structOctet));
         }
 
@@ -409,12 +409,12 @@ CHIP_ERROR TestAttrAccess::WriteListStructOctetStringAttribute(const ConcreteDat
             const auto & entry = iter.GetValue();
 
             VerifyOrReturnError(index < kAttributeListLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-            VerifyOrReturnError(entry.operationalCert.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-            memcpy(gListOperationalCert[index].Data(), entry.operationalCert.data(), entry.operationalCert.size());
-            gListOperationalCert[index].SetLength(entry.operationalCert.size());
+            VerifyOrReturnError(entry.member2.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
+            memcpy(gListOperationalCert[index].Data(), entry.member2.data(), entry.member2.size());
+            gListOperationalCert[index].SetLength(entry.member2.size());
 
-            listStructOctetStringData[index].fabricIndex     = entry.fabricIndex;
-            listStructOctetStringData[index].operationalCert = gListOperationalCert[index].AsSpan();
+            listStructOctetStringData[index].member1 = entry.member1;
+            listStructOctetStringData[index].member2 = gListOperationalCert[index].AsSpan();
 
             index++;
         }
@@ -435,12 +435,12 @@ CHIP_ERROR TestAttrAccess::WriteListStructOctetStringAttribute(const ConcreteDat
         size_t index = gListOperationalCertLen;
 
         VerifyOrReturnError(index < kAttributeListLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-        VerifyOrReturnError(entry.operationalCert.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-        memcpy(gListOperationalCert[index].Data(), entry.operationalCert.data(), entry.operationalCert.size());
-        gListOperationalCert[index].SetLength(entry.operationalCert.size());
+        VerifyOrReturnError(entry.member2.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
+        memcpy(gListOperationalCert[index].Data(), entry.member2.data(), entry.member2.size());
+        gListOperationalCert[index].SetLength(entry.member2.size());
 
-        listStructOctetStringData[index].fabricIndex     = entry.fabricIndex;
-        listStructOctetStringData[index].operationalCert = gListOperationalCert[index].AsSpan();
+        listStructOctetStringData[index].member1 = entry.member1;
+        listStructOctetStringData[index].member2 = gListOperationalCert[index].AsSpan();
 
         gListOperationalCertLen++;
         return CHIP_NO_ERROR;
@@ -681,9 +681,9 @@ bool emberAfTestClusterClusterTestCallback(app::CommandHandler *, const app::Con
         gListUint8Data[i] = 0;
         gListOctetStringData[i].SetLength(0);
         gListOperationalCert[i].SetLength(0);
-        listStructOctetStringData[i].fabricIndex     = 0;
-        listStructOctetStringData[i].operationalCert = ByteSpan();
-        gSimpleEnums[i]                              = SimpleEnum::kUnspecified;
+        listStructOctetStringData[i].member1 = 0;
+        listStructOctetStringData[i].member2 = ByteSpan();
+        gSimpleEnums[i]                      = SimpleEnum::kUnspecified;
     }
     gSimpleEnumCount = 0;
 
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index b8c5cccbf314b2..c133e1514ca7de 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -127,15 +127,16 @@ MatterThermostatClusterServerPreAttributeChangedCallback(const app::ConcreteAttr
         CoolSupported = true;
 
     if (OurFeatureMap & 1 << 2)
+        OccupancySupported = true;
 
-        if (AutoSupported)
+    if (AutoSupported)
+    {
+        if (MinSetpointDeadBand::Get(endpoint, &DeadBand) != EMBER_ZCL_STATUS_SUCCESS)
         {
-            if (MinSetpointDeadBand::Get(endpoint, &DeadBand) != EMBER_ZCL_STATUS_SUCCESS)
-            {
-                DeadBand = kDefaultDeadBand;
-            }
-            DeadBandTemp = static_cast<int16_t>(DeadBand * 10);
+            DeadBand = kDefaultDeadBand;
         }
+        DeadBandTemp = static_cast<int16_t>(DeadBand * 10);
+    }
 
     if (AbsMinCoolSetpointLimit::Get(endpoint, &AbsMinCoolSetpointLimit) != EMBER_ZCL_STATUS_SUCCESS)
         AbsMinCoolSetpointLimit = kDefaultAbsMinCoolSetpointLimit;
@@ -365,13 +366,6 @@ bool emberAfThermostatClusterClearWeeklyScheduleCallback(app::CommandHandler * c
     // TODO
     return false;
 }
-bool emberAfThermostatClusterGetRelayStatusLogCallback(app::CommandHandler * commandObj,
-                                                       const app::ConcreteCommandPath & commandPath,
-                                                       const Commands::GetRelayStatusLog::DecodableType & commandData)
-{
-    // TODO
-    return false;
-}
 
 bool emberAfThermostatClusterGetWeeklyScheduleCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath,
diff --git a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
index 8e5ff031f72d16..8ab1b7af58a478 100644
--- a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
+++ b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
@@ -59,23 +59,79 @@ CHIP_ERROR ThreadDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & aP
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
 
-    CHIP_ERROR err = ConnectivityMgr().WriteThreadNetworkDiagnosticAttributeToTlv(aPath.mAttributeId, aEncoder);
-
-    // If it isn't a run time assigned attribute, e.g. ClusterRevision, or if
-    // not implemented, clear the error so we fall back to the standard read
-    // path.
-    //
-    // TODO: This is probably broken in practice.  The standard read path is not
-    // going to produce useful values for these things.  We need to either have
-    // fallbacks in the connectivity manager that encode some sort of default
-    // values or error out on reads we can't actually handle.
-    if (err == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE || err == CHIP_ERROR_NOT_IMPLEMENTED)
+    switch (aPath.mAttributeId)
     {
-        err = CHIP_NO_ERROR;
+    case ThreadNetworkDiagnostics::Attributes::NeighborTableList::Id:
+    case ThreadNetworkDiagnostics::Attributes::RouteTableList::Id:
+    case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id:
+    case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id:
+    case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id:
+    case ThreadNetworkDiagnostics::Attributes::Channel::Id:
+    case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id:
+    case ThreadNetworkDiagnostics::Attributes::NetworkName::Id:
+    case ThreadNetworkDiagnostics::Attributes::PanId::Id:
+    case ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id:
+    case ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::Id:
+    case ThreadNetworkDiagnostics::Attributes::PartitionId::Id:
+    case ThreadNetworkDiagnostics::Attributes::Weighting::Id:
+    case ThreadNetworkDiagnostics::Attributes::DataVersion::Id:
+    case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id:
+    case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id:
+    case ThreadNetworkDiagnostics::Attributes::OverrunCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxAckedCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxDataCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxDataCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id:
+    case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id:
+    case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id:
+    case ThreadNetworkDiagnostics::Attributes::Delay::Id:
+    case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id:
+        return ConnectivityMgr().WriteThreadNetworkDiagnosticAttributeToTlv(aPath.mAttributeId, aEncoder);
+    default:
+        break;
     }
 
-    return err;
+    return CHIP_NO_ERROR;
 }
+
 } // anonymous namespace
 
 bool emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj,
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
index 0474a1f961d049..251118cc542a7c 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.cpp
+++ b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -165,7 +165,7 @@ Type TypeGet(chip::EndpointId endpoint)
     return value;
 }
 
-void ConfigStatusPrint(const chip::BitFlags<ConfigStatus> & configStatus)
+void ConfigStatusPrint(const chip::BitMask<ConfigStatus> & configStatus)
 {
     emberAfWindowCoveringClusterPrint("ConfigStatus 0x%02X Operational=%u OnlineReserved=%u", configStatus.Raw(),
                                       configStatus.Has(ConfigStatus::kOperational),
@@ -177,14 +177,14 @@ void ConfigStatusPrint(const chip::BitFlags<ConfigStatus> & configStatus)
         configStatus.Has(ConfigStatus::kTiltPositionAware), configStatus.Has(ConfigStatus::kTiltEncoderControlled));
 }
 
-void ConfigStatusSet(chip::EndpointId endpoint, const chip::BitFlags<ConfigStatus> & configStatus)
+void ConfigStatusSet(chip::EndpointId endpoint, const chip::BitMask<ConfigStatus> & configStatus)
 {
     Attributes::ConfigStatus::Set(endpoint, configStatus);
 }
 
-chip::BitFlags<ConfigStatus> ConfigStatusGet(chip::EndpointId endpoint)
+chip::BitMask<ConfigStatus> ConfigStatusGet(chip::EndpointId endpoint)
 {
-    chip::BitFlags<ConfigStatus> configStatus;
+    chip::BitMask<ConfigStatus> configStatus;
     Attributes::ConfigStatus::Get(endpoint, &configStatus);
 
     return configStatus;
@@ -192,7 +192,7 @@ chip::BitFlags<ConfigStatus> ConfigStatusGet(chip::EndpointId endpoint)
 
 void ConfigStatusUpdateFeatures(chip::EndpointId endpoint)
 {
-    chip::BitFlags<ConfigStatus> configStatus = ConfigStatusGet(endpoint);
+    chip::BitMask<ConfigStatus> configStatus = ConfigStatusGet(endpoint);
 
     configStatus.Set(ConfigStatus::kLiftPositionAware, HasFeaturePaLift(endpoint));
     configStatus.Set(ConfigStatus::kTiltPositionAware, HasFeaturePaTilt(endpoint));
@@ -255,19 +255,19 @@ EndProductType EndProductTypeGet(chip::EndpointId endpoint)
     return value;
 }
 
-void ModePrint(const chip::BitFlags<Mode> & mode)
+void ModePrint(const chip::BitMask<Mode> & mode)
 {
     emberAfWindowCoveringClusterPrint("Mode 0x%02X MotorDirReversed=%u LedFeedback=%u Maintenance=%u Calibration=%u", mode.Raw(),
                                       mode.Has(Mode::kMotorDirectionReversed), mode.Has(Mode::kLedFeedback),
                                       mode.Has(Mode::kMaintenanceMode), mode.Has(Mode::kCalibrationMode));
 }
 
-void ModeSet(chip::EndpointId endpoint, chip::BitFlags<Mode> & newMode)
+void ModeSet(chip::EndpointId endpoint, chip::BitMask<Mode> & newMode)
 {
-    chip::BitFlags<ConfigStatus> newStatus;
+    chip::BitMask<ConfigStatus> newStatus;
 
-    chip::BitFlags<ConfigStatus> oldStatus = ConfigStatusGet(endpoint);
-    chip::BitFlags<Mode> oldMode           = ModeGet(endpoint);
+    chip::BitMask<ConfigStatus> oldStatus = ConfigStatusGet(endpoint);
+    chip::BitMask<Mode> oldMode           = ModeGet(endpoint);
 
     newStatus = oldStatus;
 
@@ -288,9 +288,9 @@ void ModeSet(chip::EndpointId endpoint, chip::BitFlags<Mode> & newMode)
         ConfigStatusSet(endpoint, newStatus);
 }
 
-chip::BitFlags<Mode> ModeGet(chip::EndpointId endpoint)
+chip::BitMask<Mode> ModeGet(chip::EndpointId endpoint)
 {
-    chip::BitFlags<Mode> mode;
+    chip::BitMask<Mode> mode;
 
     Attributes::Mode::Get(endpoint, &mode);
     return mode;
@@ -591,8 +591,8 @@ void PostAttributeChange(chip::EndpointId endpoint, chip::AttributeId attributeI
 {
     // all-cluster-app: simulation for the CI testing
     // otherwise it is defined for manufacturer specific implementation */
-    BitFlags<Mode> mode;
-    BitFlags<ConfigStatus> configStatus;
+    BitMask<Mode> mode;
+    BitMask<ConfigStatus> configStatus;
     NPercent100ths current, target;
     OperationalStatus prevOpStatus = OperationalStatusGet(endpoint);
     OperationalStatus opStatus     = prevOpStatus;
@@ -659,8 +659,8 @@ void PostAttributeChange(chip::EndpointId endpoint, chip::AttributeId attributeI
 
 EmberAfStatus GetMotionLockStatus(chip::EndpointId endpoint)
 {
-    BitFlags<Mode> mode                 = ModeGet(endpoint);
-    BitFlags<ConfigStatus> configStatus = ConfigStatusGet(endpoint);
+    BitMask<Mode> mode                 = ModeGet(endpoint);
+    BitMask<ConfigStatus> configStatus = ConfigStatusGet(endpoint);
 
     // Is the device locked?
     if (!configStatus.Has(ConfigStatus::kOperational))
@@ -947,6 +947,11 @@ bool emberAfWindowCoveringClusterGoToTiltPercentageCallback(app::CommandHandler
 
 /**
  * @brief Cluster Attribute Changed Callback
+ *
+ * The method is implemented by default as a weak function and it takes care of updating
+ * the server attribute values by calling the PostAttributeChange method. If the application overrides
+ * this method, it needs to handle updating attributes (ideally by calling PostAttributeChange).
+ *
  */
 void __attribute__((weak))
 MatterWindowCoveringClusterServerAttributeChangedCallback(const app::ConcreteAttributePath & attributePath)
diff --git a/src/app/clusters/window-covering-server/window-covering-server.h b/src/app/clusters/window-covering-server/window-covering-server.h
index 7c8eb49d771cde..a0703a05917c64 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.h
+++ b/src/app/clusters/window-covering-server/window-covering-server.h
@@ -99,9 +99,9 @@ bool HasFeaturePaTilt(chip::EndpointId endpoint);
 void TypeSet(chip::EndpointId endpoint, Type type);
 Type TypeGet(chip::EndpointId endpoint);
 
-void ConfigStatusPrint(const chip::BitFlags<ConfigStatus> & configStatus);
-void ConfigStatusSet(chip::EndpointId endpoint, const chip::BitFlags<ConfigStatus> & status);
-chip::BitFlags<ConfigStatus> ConfigStatusGet(chip::EndpointId endpoint);
+void ConfigStatusPrint(const chip::BitMask<ConfigStatus> & configStatus);
+void ConfigStatusSet(chip::EndpointId endpoint, const chip::BitMask<ConfigStatus> & status);
+chip::BitMask<ConfigStatus> ConfigStatusGet(chip::EndpointId endpoint);
 void ConfigStatusUpdateFeatures(chip::EndpointId endpoint);
 
 void OperationalStatusSet(chip::EndpointId endpoint, const OperationalStatus & status);
@@ -115,9 +115,9 @@ Percent100ths ComputePercent100thsStep(OperationalState direction, Percent100ths
 void EndProductTypeSet(chip::EndpointId endpoint, EndProductType type);
 EndProductType EndProductTypeGet(chip::EndpointId endpoint);
 
-void ModePrint(const chip::BitFlags<Mode> & mode);
-void ModeSet(chip::EndpointId endpoint, chip::BitFlags<Mode> & mode);
-chip::BitFlags<Mode> ModeGet(chip::EndpointId endpoint);
+void ModePrint(const chip::BitMask<Mode> & mode);
+void ModeSet(chip::EndpointId endpoint, chip::BitMask<Mode> & mode);
+chip::BitMask<Mode> ModeGet(chip::EndpointId endpoint);
 
 void SafetyStatusSet(chip::EndpointId endpoint, SafetyStatus & status);
 const SafetyStatus SafetyStatusGet(chip::EndpointId endpoint);
@@ -140,7 +140,11 @@ void TiltPositionSet(chip::EndpointId endpoint, NPercent100ths position);
 EmberAfStatus GetMotionLockStatus(chip::EndpointId endpoint);
 
 /**
- * @brief PostAttributeChange is called when an Attribute is modified
+ * @brief PostAttributeChange is called when an Attribute is modified.
+ *
+ * The method is called by MatterWindowCoveringClusterServerAttributeChangedCallback
+ * to update cluster attributes values. If the application overrides MatterWindowCoveringClusterServerAttributeChangedCallback,
+ * it should call the PostAttributeChange on its own.
  *
  * @param[in] endpoint
  * @param[in] attributeId
diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
index ef9c1ba7a6fde3..b21737864ca180 100644
--- a/src/app/common/templates/templates.json
+++ b/src/app/common/templates/templates.json
@@ -21,6 +21,10 @@
         {
             "name": "cluster_objects_field_init",
             "path": "../../zap-templates/partials/cluster-objects-field-init.zapt"
+        },
+        {
+            "name": "cluster_objects_attribute_typeinfo",
+            "path": "../../zap-templates/partials/cluster-objects-attribute-typeinfo.zapt"
         }
     ],
     "templates": [
diff --git a/src/app/data-model/BasicTypes.h b/src/app/data-model/BasicTypes.h
index f2a732153dd946..6bc1c967d18423 100644
--- a/src/app/data-model/BasicTypes.h
+++ b/src/app/data-model/BasicTypes.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <lib/support/BitFlags.h>
+#include <lib/support/BitMask.h>
 #include <lib/support/Span.h>
 
 #include <type_traits>
@@ -43,6 +44,12 @@ struct IsBasicType<BitFlags<X>>
     static constexpr bool value = true;
 };
 
+template <typename X>
+struct IsBasicType<BitMask<X>>
+{
+    static constexpr bool value = true;
+};
+
 template <>
 struct IsBasicType<ByteSpan>
 {
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
index 98f59cbb2ae1bd..63528b8aaceb4f 100644
--- a/src/app/server/CommissioningWindowManager.cpp
+++ b/src/app/server/CommissioningWindowManager.cpp
@@ -354,7 +354,15 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement()
 #if CONFIG_NETWORK_LAYER_BLE
     if (mIsBLE)
     {
-        ReturnErrorOnFailure(chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true));
+        CHIP_ERROR err = chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true);
+        // BLE advertising may just not be supported.  That should not prevent
+        // us from opening a commissioning window and advertising over IP.
+        if (err == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE)
+        {
+            ChipLogProgress(AppServer, "BLE networking available but BLE advertising is not supported");
+            err = CHIP_NO_ERROR;
+        }
+        ReturnErrorOnFailure(err);
     }
 #endif // CONFIG_NETWORK_LAYER_BLE
 
@@ -405,7 +413,10 @@ CHIP_ERROR CommissioningWindowManager::StopAdvertisement(bool aShuttingDown)
 #if CONFIG_NETWORK_LAYER_BLE
     if (mIsBLE)
     {
-        ReturnErrorOnFailure(chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(false));
+        // Ignore errors from SetBLEAdvertisingEnabled (which could be due to
+        // BLE advertising not being supported at all).  Our commissioning
+        // window is now closed and we need to notify our delegate of that.
+        (void) chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(false);
     }
 #endif // CONFIG_NETWORK_LAYER_BLE
 
diff --git a/src/app/server/Dnssd.cpp b/src/app/server/Dnssd.cpp
index 6423c1c8f0704c..664bda2f878fed 100644
--- a/src/app/server/Dnssd.cpp
+++ b/src/app/server/Dnssd.cpp
@@ -31,6 +31,7 @@
 #include <platform/ConfigurationManager.h>
 #include <protocols/secure_channel/PASESession.h>
 #if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 #endif
 #include <credentials/FabricTable.h>
@@ -498,7 +499,8 @@ CHIP_ERROR DnssdServer::GenerateRotatingDeviceId(char rotatingDeviceIdHexBuffer[
     MutableByteSpan rotatingDeviceIdUniqueIdSpan(rotatingDeviceIdUniqueId);
     size_t rotatingDeviceIdValueOutputSize = 0;
 
-    ReturnErrorOnFailure(chip::DeviceLayer::ConfigurationMgr().GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan));
+    ReturnErrorOnFailure(
+        chip::DeviceLayer::GetDeviceInstanceInfoProvider()->GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan));
     ReturnErrorOnFailure(
         chip::DeviceLayer::ConfigurationMgr().GetLifetimeCounter(additionalDataPayloadParams.rotatingDeviceIdLifetimeCounter));
     additionalDataPayloadParams.rotatingDeviceIdUniqueId = rotatingDeviceIdUniqueIdSpan;
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index 968e3f43ff8467..f57e1f89363ed2 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -41,6 +41,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <messaging/ExchangeMgr.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceControlServer.h>
 #include <platform/DeviceInfoProvider.h>
 #include <platform/KeyValueStoreManager.h>
 #include <protocols/secure_channel/CASEServer.h>
@@ -124,13 +125,16 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     // Initialize PersistentStorageDelegate-based storage
     mDeviceStorage            = initParams.persistentStorageDelegate;
     mSessionResumptionStorage = initParams.sessionResumptionStorage;
+    mOperationalKeystore      = initParams.operationalKeystore;
+
+    mCertificateValidityPolicy = initParams.certificateValidityPolicy;
 
     // Set up attribute persistence before we try to bring up the data model
     // handler.
     SuccessOrExit(mAttributePersister.Init(mDeviceStorage));
     SetAttributePersistenceProvider(&mAttributePersister);
 
-    err = mFabrics.Init(mDeviceStorage);
+    err = mFabrics.Init(mDeviceStorage, mOperationalKeystore);
     SuccessOrExit(err);
 
     SuccessOrExit(err = mAccessControl.Init(initParams.accessDelegate, sDeviceTypeResolver));
@@ -145,6 +149,8 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     mGroupsProvider = initParams.groupDataProvider;
     SetGroupDataProvider(mGroupsProvider);
 
+    mTestEventTriggerDelegate = initParams.testEventTriggerDelegate;
+
     deviceInfoprovider = DeviceLayer::GetDeviceInfoProvider();
     if (deviceInfoprovider)
     {
@@ -154,6 +160,9 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     // This initializes clusters, so should come after lower level initialization.
     InitDataModelHandler(&mExchangeMgr);
 
+    // Clean-up previously standing fail-safes
+    InitFailSafe();
+
     // Init transport before operations with secure session mgr.
     err = mTransports.Init(UdpListenParameters(DeviceLayer::UDPEndPointManager())
                                .SetAddressType(IPAddressType::kIPv6)
@@ -172,7 +181,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 #endif
     );
 
-    err = mListener.Init(&mTransports);
+    err = mListener.Init(this);
     SuccessOrExit(err);
     mGroupsProvider->SetListener(&mListener);
 
@@ -253,6 +262,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
         .sessionInitParams =  {
             .sessionManager    = &mSessions,
             .sessionResumptionStorage = mSessionResumptionStorage,
+            .certificateValidityPolicy = mCertificateValidityPolicy,
             .exchangeMgr       = &mExchangeMgr,
             .fabricTable       = &mFabrics,
             .clientPool        = &mCASEClientPool,
@@ -264,8 +274,8 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     err = mCASESessionManager.Init(&DeviceLayer::SystemLayer(), caseSessionManagerConfig);
     SuccessOrExit(err);
 
-    err =
-        mCASEServer.ListenForSessionEstablishment(&mExchangeMgr, &mSessions, &mFabrics, mSessionResumptionStorage, mGroupsProvider);
+    err = mCASEServer.ListenForSessionEstablishment(&mExchangeMgr, &mSessions, &mFabrics, mSessionResumptionStorage,
+                                                    mCertificateValidityPolicy, mGroupsProvider);
     SuccessOrExit(err);
 
     // This code is necessary to restart listening to existing groups after a reboot
@@ -292,6 +302,39 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     return err;
 }
 
+void Server::InitFailSafe()
+{
+    bool failSafeArmed = false;
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    // If the fail-safe was armed when the device last shutdown, initiate cleanup based on the pending Fail Safe Context with
+    // which the fail-safe timer was armed.
+    if (DeviceLayer::ConfigurationMgr().GetFailSafeArmed(failSafeArmed) == CHIP_NO_ERROR && failSafeArmed)
+    {
+        FabricIndex fabricIndex;
+        bool addNocCommandInvoked;
+        bool updateNocCommandInvoked;
+
+        ChipLogProgress(AppServer, "Detected fail-safe armed on reboot");
+
+        err = DeviceLayer::FailSafeContext::LoadFromStorage(fabricIndex, addNocCommandInvoked, updateNocCommandInvoked);
+        if (err == CHIP_NO_ERROR)
+        {
+            DeviceLayer::DeviceControlServer::DeviceControlSvr().GetFailSafeContext().ScheduleFailSafeCleanup(
+                fabricIndex, addNocCommandInvoked, updateNocCommandInvoked);
+        }
+        else
+        {
+            // This should not happen, but we should not fail system init based on it!
+            ChipLogError(DeviceLayer, "Failed to load fail-safe context from storage (err= %" CHIP_ERROR_FORMAT "), cleaning-up!",
+                         err.Format());
+            (void) DeviceLayer::ConfigurationMgr().SetFailSafeArmed(false);
+            err = CHIP_NO_ERROR;
+        }
+    }
+}
+
 void Server::RejoinExistingMulticastGroups()
 {
     ChipLogProgress(AppServer, "Joining Multicast groups");
@@ -307,7 +350,7 @@ void Server::RejoinExistingMulticastGroups()
             while (iterator->Next(groupInfo))
             {
                 err = mTransports.MulticastGroupJoinLeave(
-                    Transport::PeerAddress::Multicast(fabric.GetFabricIndex(), groupInfo.group_id), true);
+                    Transport::PeerAddress::Multicast(fabric.GetFabricId(), groupInfo.group_id), true);
                 if (err != CHIP_NO_ERROR)
                 {
                     ChipLogError(AppServer, "Error when trying to join Group %u of fabric index %u : %" CHIP_ERROR_FORMAT,
@@ -343,9 +386,14 @@ void Server::ScheduleFactoryReset()
 
 void Server::Shutdown()
 {
+    mCASEServer.Shutdown();
+    mCASESessionManager.Shutdown();
     app::DnssdServer::Instance().SetCommissioningModeProvider(nullptr);
     chip::Dnssd::ServiceAdvertiser::Instance().Shutdown();
+
+    chip::Dnssd::Resolver::Instance().Shutdown();
     chip::app::InteractionModelEngine::GetInstance()->Shutdown();
+    mMessageCounterManager.Shutdown();
     CHIP_ERROR err = mExchangeMgr.Shutdown();
     if (err != CHIP_NO_ERROR)
     {
@@ -353,11 +401,10 @@ void Server::Shutdown()
     }
     mSessions.Shutdown();
     mTransports.Close();
-
+    mAccessControl.Finish();
+    Credentials::SetGroupDataProvider(nullptr);
     mAttributePersister.Shutdown();
     mCommissioningWindowManager.Shutdown();
-    mCASESessionManager.Shutdown();
-
     // TODO(16969): Remove chip::Platform::MemoryInit() call from Server class, it belongs to outer code
     chip::Platform::MemoryShutdown();
 }
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index 68b8cc92a8f303..e8604f875ecd62 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -25,13 +25,17 @@
 #include <app/CASESessionManager.h>
 #include <app/DefaultAttributePersistenceProvider.h>
 #include <app/OperationalDeviceProxyPool.h>
+#include <app/TestEventTriggerDelegate.h>
 #include <app/server/AclStorage.h>
 #include <app/server/AppDelegate.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/DefaultAclStorage.h>
+#include <credentials/CertificateValidityPolicy.h>
 #include <credentials/FabricTable.h>
 #include <credentials/GroupDataProvider.h>
 #include <credentials/GroupDataProviderImpl.h>
+#include <crypto/OperationalKeystore.h>
+#include <crypto/PersistentStorageOperationalKeystore.h>
 #include <inet/InetConfig.h>
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/SafeInt.h>
@@ -93,6 +97,9 @@ struct ServerInitParams
     // Session resumption storage: Optional. Support session resumption when provided.
     // Must be initialized before being provided.
     SessionResumptionStorage * sessionResumptionStorage = nullptr;
+    // Certificate validity policy: Optional. If none is injected, CHIPCert
+    // enforces a default policy.
+    Credentials::CertificateValidityPolicy * certificateValidityPolicy = nullptr;
     // Group data provider: MUST be injected. Used to maintain critical keys such as the Identity
     // Protection Key (IPK) for CASE. Must be initialized before being provided.
     Credentials::GroupDataProvider * groupDataProvider = nullptr;
@@ -105,6 +112,47 @@ struct ServerInitParams
     // Network native params can be injected depending on the
     // selected Endpoint implementation
     void * endpointNativeParams = nullptr;
+    // Optional. Support test event triggers when provided. Must be initialized before being
+    // provided.
+    TestEventTriggerDelegate * testEventTriggerDelegate = nullptr;
+    // Operational keystore with access to the operational keys: MUST be injected.
+    Crypto::OperationalKeystore * operationalKeystore = nullptr;
+};
+
+class IgnoreCertificateValidityPolicy : public Credentials::CertificateValidityPolicy
+{
+public:
+    IgnoreCertificateValidityPolicy() {}
+
+    /**
+     * @brief
+     *
+     * This certificate validity policy does not validate NotBefore or
+     * NotAfter to accommodate platforms that may have wall clock time, but
+     * where it is unreliable.
+     *
+     * Last Known Good Time is also not considered in this policy.
+     *
+     * @param cert CHIP Certificate for which we are evaluating validity
+     * @param depth the depth of the certificate in the chain, where the leaf is at depth 0
+     * @return CHIP_NO_ERROR if CHIPCert should accept the certificate; an appropriate CHIP_ERROR if it should be rejected
+     */
+    CHIP_ERROR ApplyCertificateValidityPolicy(const Credentials::ChipCertificateData * cert, uint8_t depth,
+                                              Credentials::CertificateValidityResult result) override
+    {
+        switch (result)
+        {
+        case Credentials::CertificateValidityResult::kValid:
+        case Credentials::CertificateValidityResult::kNotYetValid:
+        case Credentials::CertificateValidityResult::kExpired:
+        case Credentials::CertificateValidityResult::kNotExpiredAtLastKnownGoodTime:
+        case Credentials::CertificateValidityResult::kExpiredAtLastKnownGoodTime:
+        case Credentials::CertificateValidityResult::kTimeUnknown:
+            return CHIP_NO_ERROR;
+        default:
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        }
+    }
 };
 
 /**
@@ -154,24 +202,40 @@ struct CommonCaseDeviceServerInitParams : public ServerInitParams
     virtual CHIP_ERROR InitializeStaticResourcesBeforeServerInit()
     {
         static chip::KvsPersistentStorageDelegate sKvsPersistenStorageDelegate;
+        static chip::PersistentStorageOperationalKeystore sPersistentStorageOperationalKeystore;
         static chip::Credentials::GroupDataProviderImpl sGroupDataProvider;
+        static IgnoreCertificateValidityPolicy sDefaultCertValidityPolicy;
+
 #if CHIP_CONFIG_ENABLE_SESSION_RESUMPTION
         static chip::SimpleSessionResumptionStorage sSessionResumptionStorage;
 #endif
         static chip::app::DefaultAclStorage sAclStorage;
 
         // KVS-based persistent storage delegate injection
-        chip::DeviceLayer::PersistedStorage::KeyValueStoreManager & kvsManager = DeviceLayer::PersistedStorage::KeyValueStoreMgr();
-        ReturnErrorOnFailure(sKvsPersistenStorageDelegate.Init(&kvsManager));
-        this->persistentStorageDelegate = &sKvsPersistenStorageDelegate;
+        if (persistentStorageDelegate == nullptr)
+        {
+            chip::DeviceLayer::PersistedStorage::KeyValueStoreManager & kvsManager =
+                DeviceLayer::PersistedStorage::KeyValueStoreMgr();
+            ReturnErrorOnFailure(sKvsPersistenStorageDelegate.Init(&kvsManager));
+            this->persistentStorageDelegate = &sKvsPersistenStorageDelegate;
+        }
+
+        // PersistentStorageDelegate "software-based" operational key access injection
+        if (this->operationalKeystore == nullptr)
+        {
+            // WARNING: PersistentStorageOperationalKeystore::Finish() is never called. It's fine for
+            //          for examples and for now.
+            ReturnErrorOnFailure(sPersistentStorageOperationalKeystore.Init(this->persistentStorageDelegate));
+            this->operationalKeystore = &sPersistentStorageOperationalKeystore;
+        }
 
         // Group Data provider injection
-        sGroupDataProvider.SetStorageDelegate(&sKvsPersistenStorageDelegate);
+        sGroupDataProvider.SetStorageDelegate(this->persistentStorageDelegate);
         ReturnErrorOnFailure(sGroupDataProvider.Init());
         this->groupDataProvider = &sGroupDataProvider;
 
 #if CHIP_CONFIG_ENABLE_SESSION_RESUMPTION
-        ReturnErrorOnFailure(sSessionResumptionStorage.Init(&sKvsPersistenStorageDelegate));
+        ReturnErrorOnFailure(sSessionResumptionStorage.Init(this->persistentStorageDelegate));
         this->sessionResumptionStorage = &sSessionResumptionStorage;
 #else
         this->sessionResumptionStorage = nullptr;
@@ -183,6 +247,10 @@ struct CommonCaseDeviceServerInitParams : public ServerInitParams
         // Inject ACL storage. (Don't initialize it.)
         this->aclStorage = &sAclStorage;
 
+        // Inject certificate validation policy compatible with non-wall-clock-time-synced
+        // embedded systems.
+        this->certificateValidityPolicy = &sDefaultCertValidityPolicy;
+
         return CHIP_NO_ERROR;
     }
 };
@@ -242,6 +310,10 @@ class Server
 
     PersistentStorageDelegate & GetPersistentStorage() { return *mDeviceStorage; }
 
+    TestEventTriggerDelegate * GetTestEventTriggerDelegate() { return mTestEventTriggerDelegate; }
+
+    Crypto::OperationalKeystore * GetOperationalKeystore() { return mOperationalKeystore; }
+
     /**
      * This function send the ShutDown event before stopping
      * the event loop.
@@ -259,23 +331,32 @@ class Server
 
     static Server sServer;
 
+    void InitFailSafe();
+
     class GroupDataProviderListener final : public Credentials::GroupDataProvider::GroupListener
     {
     public:
         GroupDataProviderListener() {}
 
-        CHIP_ERROR Init(ServerTransportMgr * transports)
+        CHIP_ERROR Init(Server * server)
         {
-            VerifyOrReturnError(transports != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+            VerifyOrReturnError(server != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-            mTransports = transports;
+            mServer = server;
             return CHIP_NO_ERROR;
         };
 
         void OnGroupAdded(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & new_group) override
         {
-            if (mTransports->MulticastGroupJoinLeave(Transport::PeerAddress::Multicast(fabric_index, new_group.group_id), true) !=
-                CHIP_NO_ERROR)
+            FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
+            if (fabric == nullptr)
+            {
+                ChipLogError(AppServer, "Group added to nonexistent fabric?");
+                return;
+            }
+
+            if (mServer->GetTransportManager().MulticastGroupJoinLeave(
+                    Transport::PeerAddress::Multicast(fabric->GetFabricId(), new_group.group_id), true) != CHIP_NO_ERROR)
             {
                 ChipLogError(AppServer, "Unable to listen to group");
             }
@@ -283,11 +364,19 @@ class Server
 
         void OnGroupRemoved(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & old_group) override
         {
-            mTransports->MulticastGroupJoinLeave(Transport::PeerAddress::Multicast(fabric_index, old_group.group_id), false);
+            FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
+            if (fabric == nullptr)
+            {
+                ChipLogError(AppServer, "Group added to nonexistent fabric?");
+                return;
+            }
+
+            mServer->GetTransportManager().MulticastGroupJoinLeave(
+                Transport::PeerAddress::Multicast(fabric->GetFabricId(), old_group.group_id), false);
         };
 
     private:
-        ServerTransportMgr * mTransports;
+        Server * mServer;
     };
 
     class ServerFabricDelegate final : public chip::FabricTable::Delegate
@@ -373,6 +462,7 @@ class Server
 
     PersistentStorageDelegate * mDeviceStorage;
     SessionResumptionStorage * mSessionResumptionStorage;
+    Credentials::CertificateValidityPolicy * mCertificateValidityPolicy;
     Credentials::GroupDataProvider * mGroupsProvider;
     app::DefaultAttributePersistenceProvider mAttributePersister;
     GroupDataProviderListener mListener;
@@ -381,6 +471,9 @@ class Server
     Access::AccessControl mAccessControl;
     app::AclStorage * mAclStorage;
 
+    TestEventTriggerDelegate * mTestEventTriggerDelegate;
+    Crypto::OperationalKeystore * mOperationalKeystore;
+
     uint16_t mOperationalServicePort;
     uint16_t mUserDirectedCommissioningPort;
     Inet::InterfaceId mInterfaceId;
diff --git a/src/app/tests/TestBufferedReadCallback.cpp b/src/app/tests/TestBufferedReadCallback.cpp
index a4b57152259acb..7b509d6e81267f 100644
--- a/src/app/tests/TestBufferedReadCallback.cpp
+++ b/src/app/tests/TestBufferedReadCallback.cpp
@@ -185,7 +185,7 @@ void DataSeriesValidator::OnAttributeData(const ConcreteDataAttributePath & aPat
         while (iter.Next() && index < expectedListLength)
         {
             auto & iterValue = iter.GetValue();
-            NL_TEST_ASSERT(gSuite, iterValue.fabricIndex == (index));
+            NL_TEST_ASSERT(gSuite, iterValue.member1 == (index));
             index++;
         }
 
@@ -353,7 +353,7 @@ void DataSeriesGenerator::Generate()
             uint8_t index2 = 0;
             for (auto & item : listData)
             {
-                item.fabricIndex = index2;
+                item.member1 = index2;
                 index2++;
             }
 
@@ -446,7 +446,7 @@ void DataSeriesGenerator::Generate()
                 path.mAttributeId = Clusters::TestCluster::Attributes::ListStructOctetString::Id;
                 path.mListOp      = ConcreteDataAttributePath::ListOperation::AppendItem;
 
-                listItem.fabricIndex = (uint64_t) i;
+                listItem.member1 = (uint64_t) i;
 
                 NL_TEST_ASSERT(gSuite, DataModel::Encode(writer, TLV::AnonymousTag(), listItem) == CHIP_NO_ERROR);
 
diff --git a/src/app/tests/TestClusterStateCache.cpp b/src/app/tests/TestClusterStateCache.cpp
index c8abf32cf4dfaa..652e0ac6ba11dd 100644
--- a/src/app/tests/TestClusterStateCache.cpp
+++ b/src/app/tests/TestClusterStateCache.cpp
@@ -235,7 +235,7 @@ void DataSeriesGenerator::Generate(ForwardedDataCallbackValidator & dataCallback
 
                 for (auto & i : buf)
                 {
-                    i.fabricIndex = instruction.mInstructionId;
+                    i.member1 = instruction.mInstructionId;
                 }
 
                 Clusters::TestCluster::Attributes::ListStructOctetString::TypeInfo::Type value;
@@ -384,7 +384,7 @@ class CacheValidator : public ClusterStateCache::Callback
                 auto listIter = v.begin();
                 while (listIter.Next())
                 {
-                    NL_TEST_ASSERT(gSuite, listIter.GetValue().fabricIndex == instruction.mInstructionId);
+                    NL_TEST_ASSERT(gSuite, listIter.GetValue().member1 == instruction.mInstructionId);
                 }
 
                 NL_TEST_ASSERT(gSuite, listIter.GetStatus() == CHIP_NO_ERROR);
@@ -438,7 +438,7 @@ class CacheValidator : public ClusterStateCache::Callback
                 auto listIter = clusterValue.listStructOctetString.begin();
                 while (listIter.Next())
                 {
-                    NL_TEST_ASSERT(gSuite, listIter.GetValue().fabricIndex == instruction.mInstructionId);
+                    NL_TEST_ASSERT(gSuite, listIter.GetValue().member1 == instruction.mInstructionId);
                 }
 
                 NL_TEST_ASSERT(gSuite, listIter.GetStatus() == CHIP_NO_ERROR);
diff --git a/src/app/tests/TestCommandInteraction.cpp b/src/app/tests/TestCommandInteraction.cpp
index 298896ac3d69ff..9077345d234305 100644
--- a/src/app/tests/TestCommandInteraction.cpp
+++ b/src/app/tests/TestCommandInteraction.cpp
@@ -258,7 +258,7 @@ void TestCommandInteraction::GenerateInvokeRequest(nlTestSuite * apSuite, void *
     {
         chip::TLV::TLVWriter * pWriter = commandDataIBBuilder.GetWriter();
         chip::TLV::TLVType dummyType   = chip::TLV::kTLVType_NotSpecified;
-        err = pWriter->StartContainer(chip::TLV::ContextTag(chip::to_underlying(CommandDataIB::Tag::kData)),
+        err = pWriter->StartContainer(chip::TLV::ContextTag(chip::to_underlying(CommandDataIB::Tag::kFields)),
                                       chip::TLV::kTLVType_Structure, dummyType);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
@@ -315,7 +315,7 @@ void TestCommandInteraction::GenerateInvokeResponse(nlTestSuite * apSuite, void
     {
         chip::TLV::TLVWriter * pWriter = commandDataIBBuilder.GetWriter();
         chip::TLV::TLVType dummyType   = chip::TLV::kTLVType_NotSpecified;
-        err = pWriter->StartContainer(chip::TLV::ContextTag(chip::to_underlying(CommandDataIB::Tag::kData)),
+        err = pWriter->StartContainer(chip::TLV::ContextTag(chip::to_underlying(CommandDataIB::Tag::kFields)),
                                       chip::TLV::kTLVType_Structure, dummyType);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
@@ -855,11 +855,11 @@ void TestCommandInteraction::TestCommandHandlerRejectMultipleCommands(nlTestSuit
             CommandPathIB::Builder & path = invokeRequest.CreatePath();
             NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == invokeRequest.GetError());
             NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == path.Encode(commandPathParams));
-            NL_TEST_ASSERT(apSuite,
-                           CHIP_NO_ERROR ==
-                               invokeRequest.GetWriter()->StartContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kData)),
-                                                                         TLV::kTLVType_Structure,
-                                                                         commandSender.mDataElementContainerType));
+            NL_TEST_ASSERT(
+                apSuite,
+                CHIP_NO_ERROR ==
+                    invokeRequest.GetWriter()->StartContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kFields)),
+                                                              TLV::kTLVType_Structure, commandSender.mDataElementContainerType));
             NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == invokeRequest.GetWriter()->PutBoolean(chip::TLV::ContextTag(1), true));
             NL_TEST_ASSERT(apSuite,
                            CHIP_NO_ERROR == invokeRequest.GetWriter()->EndContainer(commandSender.mDataElementContainerType));
diff --git a/src/app/tests/TestMessageDef.cpp b/src/app/tests/TestMessageDef.cpp
index 745e167e5032a7..fbd40af24d4ee1 100644
--- a/src/app/tests/TestMessageDef.cpp
+++ b/src/app/tests/TestMessageDef.cpp
@@ -763,7 +763,7 @@ void BuildCommandDataIB(nlTestSuite * apSuite, CommandDataIB::Builder & aCommand
     {
         chip::TLV::TLVWriter * pWriter = aCommandDataIBBuilder.GetWriter();
         chip::TLV::TLVType dummyType   = chip::TLV::kTLVType_NotSpecified;
-        err = pWriter->StartContainer(chip::TLV::ContextTag(chip::to_underlying(CommandDataIB::Tag::kData)),
+        err = pWriter->StartContainer(chip::TLV::ContextTag(chip::to_underlying(CommandDataIB::Tag::kFields)),
                                       chip::TLV::kTLVType_Structure, dummyType);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
@@ -793,7 +793,7 @@ void ParseCommandDataIB(nlTestSuite * apSuite, CommandDataIB::Parser & aCommandD
         chip::TLV::TLVReader reader;
         bool val = false;
         chip::TLV::TLVType container;
-        aCommandDataIBParser.GetData(&reader);
+        aCommandDataIBParser.GetFields(&reader);
         err = reader.EnterContainer(container);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
@@ -1262,9 +1262,6 @@ void BuildSubscribeRequestMessage(nlTestSuite * apSuite, chip::TLV::TLVWriter &
     NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
     BuildEventFilters(apSuite, eventFilters);
 
-    subscribeRequestBuilder.IsProxy(true);
-    NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
-
     subscribeRequestBuilder.IsFabricFiltered(true);
     NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
 
@@ -1285,10 +1282,9 @@ void ParseSubscribeRequestMessage(nlTestSuite * apSuite, chip::TLV::TLVReader &
     DataVersionFilterIBs::Parser dataVersionFilterIBsParser;
     EventPathIBs::Parser eventPathListParser;
     EventFilterIBs::Parser eventFiltersParser;
-    uint16_t MinIntervalFloorSeconds   = 0;
-    uint16_t MaxIntervalCeilingSeconds = 0;
+    uint16_t minIntervalFloorSeconds   = 0;
+    uint16_t maxIntervalCeilingSeconds = 0;
     bool keepExistingSubscription      = false;
-    bool isProxy                       = false;
     bool isFabricFiltered              = false;
 
     err = subscribeRequestParser.Init(aReader);
@@ -1309,18 +1305,15 @@ void ParseSubscribeRequestMessage(nlTestSuite * apSuite, chip::TLV::TLVReader &
     err = subscribeRequestParser.GetEventFilters(&eventFiltersParser);
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-    err = subscribeRequestParser.GetMinIntervalFloorSeconds(&MinIntervalFloorSeconds);
-    NL_TEST_ASSERT(apSuite, MinIntervalFloorSeconds == 2 && err == CHIP_NO_ERROR);
+    err = subscribeRequestParser.GetMinIntervalFloorSeconds(&minIntervalFloorSeconds);
+    NL_TEST_ASSERT(apSuite, minIntervalFloorSeconds == 2 && err == CHIP_NO_ERROR);
 
-    err = subscribeRequestParser.GetMaxIntervalCeilingSeconds(&MaxIntervalCeilingSeconds);
-    NL_TEST_ASSERT(apSuite, MaxIntervalCeilingSeconds == 3 && err == CHIP_NO_ERROR);
+    err = subscribeRequestParser.GetMaxIntervalCeilingSeconds(&maxIntervalCeilingSeconds);
+    NL_TEST_ASSERT(apSuite, maxIntervalCeilingSeconds == 3 && err == CHIP_NO_ERROR);
 
     err = subscribeRequestParser.GetKeepSubscriptions(&keepExistingSubscription);
     NL_TEST_ASSERT(apSuite, keepExistingSubscription && err == CHIP_NO_ERROR);
 
-    err = subscribeRequestParser.GetIsProxy(&isProxy);
-    NL_TEST_ASSERT(apSuite, isProxy && err == CHIP_NO_ERROR);
-
     err = subscribeRequestParser.GetIsFabricFiltered(&isFabricFiltered);
     NL_TEST_ASSERT(apSuite, isFabricFiltered && err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(apSuite, subscribeRequestParser.ExitContainer() == CHIP_NO_ERROR);
@@ -1337,10 +1330,7 @@ void BuildSubscribeResponseMessage(nlTestSuite * apSuite, chip::TLV::TLVWriter &
     subscribeResponseBuilder.SubscriptionId(1);
     NL_TEST_ASSERT(apSuite, subscribeResponseBuilder.GetError() == CHIP_NO_ERROR);
 
-    subscribeResponseBuilder.MinIntervalFloorSeconds(1);
-    NL_TEST_ASSERT(apSuite, subscribeResponseBuilder.GetError() == CHIP_NO_ERROR);
-
-    subscribeResponseBuilder.MaxIntervalCeilingSeconds(2);
+    subscribeResponseBuilder.MaxInterval(2);
     NL_TEST_ASSERT(apSuite, subscribeResponseBuilder.GetError() == CHIP_NO_ERROR);
 
     subscribeResponseBuilder.EndOfSubscribeResponseMessage();
@@ -1353,8 +1343,7 @@ void ParseSubscribeResponseMessage(nlTestSuite * apSuite, chip::TLV::TLVReader &
 
     SubscribeResponseMessage::Parser subscribeResponseParser;
     chip::SubscriptionId subscriptionId = 0;
-    uint16_t minIntervalFloorSeconds    = 0;
-    uint16_t maxIntervalCeilingSeconds  = 0;
+    uint16_t maxInterval                = 0;
     err                                 = subscribeResponseParser.Init(aReader);
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -1364,11 +1353,8 @@ void ParseSubscribeResponseMessage(nlTestSuite * apSuite, chip::TLV::TLVReader &
     err = subscribeResponseParser.GetSubscriptionId(&subscriptionId);
     NL_TEST_ASSERT(apSuite, subscriptionId == 1 && err == CHIP_NO_ERROR);
 
-    err = subscribeResponseParser.GetMinIntervalFloorSeconds(&minIntervalFloorSeconds);
-    NL_TEST_ASSERT(apSuite, minIntervalFloorSeconds == 1 && err == CHIP_NO_ERROR);
-
-    err = subscribeResponseParser.GetMaxIntervalCeilingSeconds(&maxIntervalCeilingSeconds);
-    NL_TEST_ASSERT(apSuite, maxIntervalCeilingSeconds == 2 && err == CHIP_NO_ERROR);
+    err = subscribeResponseParser.GetMaxInterval(&maxInterval);
+    NL_TEST_ASSERT(apSuite, maxInterval == 2 && err == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(apSuite, subscribeResponseParser.ExitContainer() == CHIP_NO_ERROR);
 }
diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp
index ee10fb4e68e4c4..2d261b86db7e54 100644
--- a/src/app/tests/TestReadInteraction.cpp
+++ b/src/app/tests/TestReadInteraction.cpp
@@ -537,7 +537,7 @@ void TestReadInteraction::TestReadClientGenerateInvalidAttributePathList(nlTestS
 
     AttributePathIBs::Builder & attributePathListBuilder = request.CreateAttributeRequests();
     err = readClient.GenerateAttributePaths(attributePathListBuilder, attributePaths);
-    NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
 }
 
 void TestReadInteraction::TestReadClientInvalidReport(nlTestSuite * apSuite, void * apContext)
@@ -564,7 +564,7 @@ void TestReadInteraction::TestReadClientInvalidReport(nlTestSuite * apSuite, voi
     GenerateReportData(apSuite, apContext, buf, true /*aNeedInvalidReport*/, true /* aSuppressResponse*/);
 
     err = readClient.ProcessReportData(std::move(buf));
-    NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
 }
 
 void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSuite, void * apContext)
@@ -1458,9 +1458,6 @@ void TestReadInteraction::TestProcessSubscribeRequest(nlTestSuite * apSuite, voi
         err = attributePathListBuilder.GetError();
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-        subscribeRequestBuilder.IsProxy(true);
-        NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
-
         subscribeRequestBuilder.IsFabricFiltered(false).EndOfSubscribeRequestMessage();
         NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
 
diff --git a/src/app/tests/integration/chip_im_initiator.cpp b/src/app/tests/integration/chip_im_initiator.cpp
index 46008c216e7b93..7686e64ded9add 100644
--- a/src/app/tests/integration/chip_im_initiator.cpp
+++ b/src/app/tests/integration/chip_im_initiator.cpp
@@ -145,6 +145,8 @@ class MockInteractionModelApp : public ::chip::app::CommandSender::Callback,
             }
         }
     }
+
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override {}
     void OnAttributeData(const chip::app::ConcreteDataAttributePath & aPath, chip::TLV::TLVReader * aData,
                          const chip::app::StatusIB & status) override
     {}
diff --git a/src/app/tests/suites/DL_LockUnlock.yaml b/src/app/tests/suites/DL_LockUnlock.yaml
index 0cf5e6f9f94c0b..4ddaee939b4254 100644
--- a/src/app/tests/suites/DL_LockUnlock.yaml
+++ b/src/app/tests/suites/DL_LockUnlock.yaml
@@ -28,6 +28,26 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Try to unlock the door without PIN"
+      command: "UnlockDoor"
+      timedInteractionTimeoutMs: 10000
+
+    - label: "Verify that lock state attribute value is set to Unlocked"
+      command: "readAttribute"
+      attribute: "LockState"
+      response:
+          value: 2
+
+    - label: "Try to unlock the door without a PIN"
+      command: "LockDoor"
+      timedInteractionTimeoutMs: 10000
+
+    - label: "Verify that lock state attribute value is set to Locked"
+      command: "readAttribute"
+      attribute: "LockState"
+      response:
+          value: 1
+
     - label: "Create new PIN credential and lock/unlock user"
       command: "SetCredential"
       timedInteractionTimeoutMs: 10000
diff --git a/src/app/tests/suites/DL_Schedules.yaml b/src/app/tests/suites/DL_Schedules.yaml
index 9ae6efb6bd7337..4c2d23875d33f5 100644
--- a/src/app/tests/suites/DL_Schedules.yaml
+++ b/src/app/tests/suites/DL_Schedules.yaml
@@ -79,6 +79,13 @@ tests:
           saveAs: NumberOfYearDaySchedulesSupportedPerUser
           value: 10
 
+    - label: "Get Max number of Holiday schedules and verify default value"
+      command: "readAttribute"
+      attribute: "NumberOfHolidaySchedulesSupported"
+      response:
+          saveAs: NumberOfHolidaySchedulesSupported
+          value: 10
+
     #
     # Excercise SetWeekDay schedules with invalid parameters
     #
@@ -592,8 +599,9 @@ tests:
                 value: 1
               - name: "status"
                 value: 0x8B
+
     #
-    # Excercise GetWeekDay schedules with invalid parameters
+    # Excercise GetYearDay schedules with invalid parameters
     #
     - label: "Get Year Day schedule with 0 index"
       command: "GetYearDaySchedule"
@@ -680,6 +688,144 @@ tests:
               - name: "status"
                 value: 0x8B
 
+    #
+    # Excercise Set Holiday schedules with invalid parameters
+    #
+    - label: "Create Holiday schedule with 0 index"
+      command: "SetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+      response:
+          error: INVALID_FIELD
+
+    - label: "Create Holiday schedule with out-of-bounds index"
+      command: "SetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported + 1
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+      response:
+          error: INVALID_FIELD
+
+    - label: "Create Holiday schedule with start hour later that end hour"
+      command: "SetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "localStartTime"
+                value: 12345689
+              - name: "localEndTime"
+                value: 12345688
+              - name: "operatingMode"
+                value: 0
+      response:
+          error: INVALID_FIELD
+
+    - label: "Create Holiday schedule with invalid operating mode"
+      command: "SetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 5
+      response:
+          error: INVALID_FIELD
+
+    - label: "Make sure that previous operations did not create a schedule"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x8B
+
+    #
+    # Excercise Get Holiday schedules with invalid parameters
+    #
+    - label: "Get Holiday schedule with 0 index"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 0
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 0
+              - name: "status"
+                value: 0x85
+
+    - label: "Get Holiday schedule with out-of-bounds index"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported + 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported + 1
+              - name: "status"
+                value: 0x85
+
+    # Verify that schedule creation works
+    - label: "Create Holiday schedule with valid parameters"
+      command: "SetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
+    - label: "Verify created schedule"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
     - label: "Create Week Day schedule with valid parameters"
       command: "SetWeekDaySchedule"
       arguments:
@@ -818,6 +964,73 @@ tests:
       response:
           error: NOT_FOUND
 
+    - label: "Make sure that week day schedule was not deleted"
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "daysMask"
+                value: 0x01
+              - name: "startHour"
+                value: 15
+              - name: "startMinute"
+                value: 16
+              - name: "endHour"
+                value: 18
+              - name: "endMinute"
+                value: 00
+
+    - label: "Make sure that year day schedule was not deleted"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+
+    - label: "Make sure that holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
     #
     # Excercise ClearYearDay schedules with invalid parameters
     #
@@ -924,6 +1137,112 @@ tests:
               - name: "localEndTime"
                 value: 12345689
 
+    - label: "Make sure that holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
+    # Excercise ClearHolidaySchedule with invalid parameters
+    - label: "Clear Holiday schedule with 0 index"
+      command: "ClearHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 0
+      response:
+          error: INVALID_FIELD
+
+    - label: "Clear Holiday schedule with out-of-bounds index"
+      command: "ClearHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfYearDaySchedulesSupportedPerUser + 1
+      response:
+          error: INVALID_FIELD
+
+    - label: "Make sure that week day schedule was not deleted"
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "daysMask"
+                value: 0x01
+              - name: "startHour"
+                value: 15
+              - name: "startMinute"
+                value: 16
+              - name: "endHour"
+                value: 18
+              - name: "endMinute"
+                value: 00
+
+    - label: "Make sure that year day schedule was not deleted"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+
+    - label: "Make sure that holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
+    # Verify that clearing schedules works
     - label: "Create another Week Day schedule with valid parameters"
       command: "SetWeekDaySchedule"
       arguments:
@@ -1004,12 +1323,44 @@ tests:
               - name: "localEndTime"
                 value: 888888888
 
-    - label: "Clear a single week day schedule for the first user"
-      command: "ClearWeekDaySchedule"
+    - label: "Create another Holiday schedule with valid parameters"
+      command: "SetHolidaySchedule"
       arguments:
           values:
-              - name: "weekDayIndex"
-                value: 1
+              - name: "holidayIndex"
+                value: 2
+              - name: "localStartTime"
+                value: 123456
+              - name: "localEndTime"
+                value: 1234567
+              - name: "operatingMode"
+                value: 1
+
+    - label: "Verify created holiday schedule"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 2
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 2
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 123456
+              - name: "localEndTime"
+                value: 1234567
+              - name: "operatingMode"
+                value: 1
+
+    - label: "Clear a single week day schedule for the first user"
+      command: "ClearWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
               - name: "userIndex"
                 value: 1
 
@@ -1098,6 +1449,44 @@ tests:
               - name: "localEndTime"
                 value: 888888888
 
+    - label: "Make sure that first holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
+    - label: "Make sure that second holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 2
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 2
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 123456
+              - name: "localEndTime"
+                value: 1234567
+              - name: "operatingMode"
+                value: 1
+
     # We create it to test that clearing year day schedules does not delete week day schedules
     - label: "Create another Week Day schedule with valid parameters"
       command: "SetWeekDaySchedule"
@@ -1387,7 +1776,7 @@ tests:
               - name: "localEndTime"
                 value: 7777777
 
-    - label: "Cleanup"
+    - label: "Cleanup the user"
       command: "ClearUser"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -1462,3 +1851,346 @@ tests:
                 value: 2
               - name: "status"
                 value: 0x8B
+
+    # Make sure that all the manipulations did not affect the holiday schedules
+    - label: "Make sure that first holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
+    - label: "Make sure that second holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 2
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 2
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 123456
+              - name: "localEndTime"
+                value: 1234567
+              - name: "operatingMode"
+                value: 1
+
+    - label: "Create another Holiday schedule at the last slot"
+      command: "SetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+              - name: "localStartTime"
+                value: 1
+              - name: "localEndTime"
+                value: 100
+              - name: "operatingMode"
+                value: 4
+
+    - label: "Verify Created Holiday Schedule"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+      response:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 1
+              - name: "localEndTime"
+                value: 100
+              - name: "operatingMode"
+                value: 4
+
+    # Those steps are required to validate that clearing holiday schedules does not delete weekday and year day schedules
+    - label: "Create new PIN credential and schedule user"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: null
+              - name: "userStatus"
+                value: null
+              - name: "userType"
+                value: null
+      response:
+          values:
+              - name: "status"
+                value: 0x00
+              - name: "userIndex"
+                value: 1
+              - name: "nextCredentialIndex"
+                value: 2
+
+    - label: "Create Week Day schedule for first user"
+      command: "SetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "daysMask"
+                value: 0x01
+              - name: "startHour"
+                value: 0
+              - name: "startMinute"
+                value: 0
+              - name: "endHour"
+                value: 23
+              - name: "endMinute"
+                value: 59
+
+    - label: "Create Year Day schedule for first user"
+      command: "SetYearDaySchedule"
+      arguments:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "localStartTime"
+                value: 9000
+              - name: "localEndTime"
+                value: 888888888
+
+    # Start clearing holiday schedules
+    - label: "Clear a single holiday schedule"
+      command: "ClearHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 2
+
+    - label: "Make sure that first holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 12345
+              - name: "localEndTime"
+                value: 12345689
+              - name: "operatingMode"
+                value: 0
+
+    - label: "Make sure that second holiday schedule was deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 2
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 2
+              - name: "status"
+                value: 0x8B
+
+    - label: "Make sure that third holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+      response:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 1
+              - name: "localEndTime"
+                value: 100
+              - name: "operatingMode"
+                value: 4
+
+    - label:
+          "Make sure clearing holiday schedule did not clear week day schedule"
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "daysMask"
+                value: 0x01
+              - name: "startHour"
+                value: 0
+              - name: "startMinute"
+                value: 0
+              - name: "endHour"
+                value: 23
+              - name: "endMinute"
+                value: 59
+
+    - label:
+          "Make sure clearing holiday schedule did not clear year day schedule"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 9000
+              - name: "localEndTime"
+                value: 888888888
+
+    - label: "Clear all remaining holiday schedules"
+      command: "ClearHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 0xFE
+
+    - label: "Make sure that first holiday is still deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 1
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 1
+              - name: "status"
+                value: 0x8B
+
+    - label: "Make sure that second holiday schedule was deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: 2
+      response:
+          values:
+              - name: "holidayIndex"
+                value: 2
+              - name: "status"
+                value: 0x8B
+
+    - label: "Make sure that third holiday schedule was not deleted"
+      command: "GetHolidaySchedule"
+      arguments:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+      response:
+          values:
+              - name: "holidayIndex"
+                value: NumberOfHolidaySchedulesSupported
+              - name: "status"
+                value: 0x8B
+
+    - label:
+          "Make sure clearing holiday schedule did not clear week day schedule"
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "daysMask"
+                value: 0x01
+              - name: "startHour"
+                value: 0
+              - name: "startMinute"
+                value: 0
+              - name: "endHour"
+                value: 23
+              - name: "endMinute"
+                value: 59
+
+    - label:
+          "Make sure clearing holiday schedule did not clear year day schedule"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "yearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x0
+              - name: "localStartTime"
+                value: 9000
+              - name: "localEndTime"
+                value: 888888888
+
+    - label: "Final Cleanup"
+      command: "ClearUser"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "userIndex"
+                value: 0xFFFE
diff --git a/src/app/tests/suites/DL_UsersAndCredentials.yaml b/src/app/tests/suites/DL_UsersAndCredentials.yaml
index 8c4058d5793744..34f28bfd95cf28 100644
--- a/src/app/tests/suites/DL_UsersAndCredentials.yaml
+++ b/src/app/tests/suites/DL_UsersAndCredentials.yaml
@@ -55,7 +55,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Get number of supported users and verify default value"
       command: "readAttribute"
@@ -130,7 +130,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Set user at the occupied index fails with appropriate response"
       command: "SetUser"
@@ -202,7 +202,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Modify userUniqueId for existing user"
       command: "SetUser"
@@ -251,7 +251,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Modify userStatus for existing user"
       command: "SetUser"
@@ -300,7 +300,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Modify userType for existing user"
       command: "SetUser"
@@ -349,7 +349,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Modify credentialRule for existing user"
       command: "SetUser"
@@ -398,7 +398,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Modify all fields for existing user"
       command: "SetUser"
@@ -447,7 +447,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Add another user with non-default fields"
       command: "SetUser"
@@ -496,7 +496,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 3
+                value: null
 
     - label: "Create user in the last slot"
       command: "SetUser"
@@ -626,7 +626,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 3 # Slot 2 is still occupied
+                value: 2 # Slot 2 is still occupied
 
     - label: "Create new user in the cleared slot"
       command: "SetUser"
@@ -676,7 +676,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 3 # Slot 2 is still occupied
+                value: 2 # Slot 2 is still occupied
 
     - label: "Clear user with index 0 fails"
       command: "ClearUser"
@@ -733,7 +733,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 3
+                value: null
 
     - label: "Read last cleared user and verify it is available"
       command: "GetUser"
@@ -792,7 +792,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 2
+                value: null
 
     - label: "Reading PIN credential with index 0 fails"
       command: "GetCredentialStatus"
@@ -869,7 +869,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Verify created PIN credential"
       command: "GetCredentialStatus"
@@ -888,7 +888,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextCredentialIndex"
-                value: 2
+                value: null
 
     - label: "Create new PIN credential and user with index 0 fails"
       command: "SetCredential"
@@ -992,7 +992,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 3
+                value: null
 
     - label: "Create new RFID credential and add it to existing user"
       command: "SetCredential"
@@ -1051,7 +1051,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Verify created credential"
       command: "GetCredentialStatus"
@@ -1070,7 +1070,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextCredentialIndex"
-                value: 3
+                value: null
 
     - label: "Create new RFID credential and user with index 0 fails"
       command: "SetCredential"
@@ -1510,7 +1510,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 3
+                value: 2
 
     - label: "Create new RFID credential and add it to existing user"
       command: "SetCredential"
@@ -1571,7 +1571,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 3
+                value: 2
 
     - label: "Clear first PIN credential"
       command: "ClearCredential"
@@ -1598,7 +1598,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 6
+                value: 2
 
     - label: "Read the user back and make sure PIN credential is deleted"
       command: "GetUser"
@@ -1632,7 +1632,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 3
+                value: 2
 
     - label: "Clear the second PIN credential"
       command: "ClearCredential"
@@ -1659,7 +1659,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 6
+                value: 4
 
     - label: "Read the user back and make sure related user is deleted"
       command: "GetUser"
@@ -1688,7 +1688,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 3
+                value: null
 
     - label: "Create new RFID credential with user"
       command: "SetCredential"
@@ -1741,7 +1741,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 2
+                value: 5
 
     - label: "Read back the second RFID credential and make sure it is deleted"
       command: "GetCredentialStatus"
@@ -1760,7 +1760,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 3
+                value: 5
 
     - label: "Read back the third RFID credential and make sure it is deleted"
       command: "GetCredentialStatus"
@@ -1779,7 +1779,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 6
+                value: 5
 
     - label:
           "Read the user related with first RFID back and make sure it has only
@@ -1810,7 +1810,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label:
           "Read the user related with second RFID back and make sure it is
@@ -1841,7 +1841,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 3
+                value: null
 
     - label: "Create new PIN credential with user"
       command: "SetCredential"
@@ -1948,7 +1948,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 2
+                value: null
 
     - label: "Read back the first RFID credential and make sure it is deleted"
       command: "GetCredentialStatus"
@@ -1967,7 +1967,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 3
+                value: null
 
     - label: "Read back the second PIN credential and make sure it is deleted"
       command: "GetCredentialStatus"
@@ -1986,7 +1986,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextCredentialIndex"
-                value: 7
+                value: null
 
     - label:
           "Read the user related with first PIN back and make sure it is deleted"
@@ -2016,7 +2016,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label:
           "Read the user related with first RFID back and make sure it is
@@ -2047,7 +2047,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 3
+                value: null
 
     - label:
           "Read the user related with second PIN back and make sure it is
@@ -2078,7 +2078,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 4
+                value: null
 
     - label:
           "Read the user related with last RFID back and make sure it is deleted"
@@ -2108,7 +2108,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 5
+                value: null
 
     - label: "Create new Programming PIN credential with invalid index"
       command: "SetCredential"
@@ -2189,7 +2189,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: 1
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Verify created programming PIN credential"
       command: "GetCredentialStatus"
@@ -2340,7 +2340,7 @@ tests:
               - name: "lastModifiedFabricIndex"
                 value: null
               - name: "nextUserIndex"
-                value: 2
+                value: null
 
     - label: "Make sure programming PIN credential is deleted"
       command: "GetCredentialStatus"
@@ -2517,3 +2517,11 @@ tests:
                 value: null
               - name: "nextCredentialIndex"
                 value: 7
+
+    - label: "Final clean-up"
+      command: "ClearUser"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "userIndex"
+                value: 1
diff --git a/src/app/tests/suites/README.md b/src/app/tests/suites/README.md
index 876da42ed503af..2f2808d44aa55b 100644
--- a/src/app/tests/suites/README.md
+++ b/src/app/tests/suites/README.md
@@ -56,13 +56,13 @@ The process of automatic conversion of test files depends on the
 Each of the CHIP device controller implementations uses a dedicated template
 translating the tests into an appropriate format.
 
-| Controllers | Template                                                                                                                                     |
-| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
-| POSIX CLI   | [examples/chip-tool/templates/partials/test_cluster.zapt](../../../../examples/chip-tool/templates/partials/test_cluster.zapt)               |
-| Darwin CLI  | [examples/chip-tool-darwin/templates/partials/test_cluster.zapt](../../../../examples/chip-tool-darwin/templates/partials/test_cluster.zapt) |
-| iOS         | [src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt](../../../../src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt) |
-| Python      |                                                                                                                                              |
-| Android     |                                                                                                                                              |
+| Controllers | Template                                                                                                                                               |
+| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| POSIX CLI   | [examples/chip-tool/templates/partials/test_cluster.zapt](../../../../examples/chip-tool/templates/partials/test_cluster.zapt)                         |
+| Darwin CLI  | [examples/darwin-framework-tool/templates/partials/test_cluster.zapt](../../../../examples/darwin-framework-tool/templates/partials/test_cluster.zapt) |
+| iOS         | [src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt](../../../../src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt)           |
+| Python      |                                                                                                                                                        |
+| Android     |                                                                                                                                                        |
 
 These dedicated templates share a common
 [script](../../zap-templates/common/ClusterTestGeneration.js) which augments the
@@ -250,7 +250,7 @@ Top level key to define a YAML test: [test](#property-test)
     [tests.js](../../../../examples/placeholder/linux/apps/app1/tests.js)
 
 -   chip-tool(darwin) tests:
-    [tests.js](../../../../examples/chip-tool-darwin/templates/tests/tests.js)
+    [tests.js](../../../../examples/darwin-framework-tool/templates/tests/tests.js)
 
 -   chip-tool tests:
     [tests.js](../../../../examples/chip-tool/templates/tests/tests.js)
diff --git a/src/app/tests/suites/TestArmFailSafe.yaml b/src/app/tests/suites/TestArmFailSafe.yaml
index 7937fe2f690f81..eb4ee25544d971 100644
--- a/src/app/tests/suites/TestArmFailSafe.yaml
+++ b/src/app/tests/suites/TestArmFailSafe.yaml
@@ -60,3 +60,50 @@ tests:
       attribute: "NodeLabel"
       response:
           value: ""
+
+    - label: "Invoke AddTrustedRootCertificate without fail-safe"
+      command: "AddTrustedRootCertificate"
+      cluster: "Operational Credentials"
+      arguments:
+          values:
+              - name: RootCertificate
+                value: "00000000"
+
+      response:
+          error: FAILSAFE_REQUIRED
+
+    - label: "Invoke AddNOC without fail-safe"
+      command: "AddNOC"
+      cluster: "Operational Credentials"
+      arguments:
+          values:
+              - name: NOCValue
+                value: "00112233"
+              - name: IPKValue
+                value: "\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07"
+              - name: CaseAdminSubject
+                value: 1234
+              - name: AdminVendorId
+                value: 65521
+      response:
+          error: FAILSAFE_REQUIRED
+
+    - label: "Invoke UpdateNOC without fail-safe"
+      command: "UpdateNOC"
+      cluster: "Operational Credentials"
+      arguments:
+          values:
+              - name: NOCValue
+                value: "00112233"
+      response:
+          error: FAILSAFE_REQUIRED
+
+    - label: "Invoke CSRRequest without fail-safe"
+      command: "CSRRequest"
+      cluster: "Operational Credentials"
+      arguments:
+          values:
+              - name: CSRNonce
+                value: "\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07"
+      response:
+          error: FAILSAFE_REQUIRED
diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
index 47086856538f35..85b33b6525d9a0 100644
--- a/src/app/tests/suites/TestCluster.yaml
+++ b/src/app/tests/suites/TestCluster.yaml
@@ -727,6 +727,18 @@ tests:
       response:
           value: "Tes\x00ti\x00ng"
 
+    - label: "Write attribute OCTET_STRING with hex: format"
+      command: "writeAttribute"
+      attribute: "octet_string"
+      arguments:
+          value: "hex:000102030405"
+
+    - label: "Read attribute OCTET_STRING with hex: format"
+      command: "readAttribute"
+      attribute: "octet_string"
+      response:
+          value: "hex:000102030405"
+
     - label: "Write attribute OCTET_STRING with weird chars"
       command: "writeAttribute"
       attribute: "octet_string"
@@ -1550,10 +1562,10 @@ tests:
       arguments:
           value:
               [
-                  { fabricIndex: 0, operationalCert: "Test0" },
-                  { fabricIndex: 1, operationalCert: "Test1" },
-                  { fabricIndex: 2, operationalCert: "Test2" },
-                  { fabricIndex: 3, operationalCert: "Test3" },
+                  { member1: 0, member2: "Test0" },
+                  { member1: 1, member2: "Test1" },
+                  { member1: 2, member2: "Test2" },
+                  { member1: 3, member2: "Test3" },
               ]
 
     - label: "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING"
@@ -1562,10 +1574,10 @@ tests:
       response:
           value:
               [
-                  { fabricIndex: 0, operationalCert: "Test0" },
-                  { fabricIndex: 1, operationalCert: "Test1" },
-                  { fabricIndex: 2, operationalCert: "Test2" },
-                  { fabricIndex: 3, operationalCert: "Test3" },
+                  { member1: 0, member2: "Test0" },
+                  { member1: 1, member2: "Test1" },
+                  { member1: 2, member2: "Test2" },
+                  { member1: 3, member2: "Test3" },
               ]
 
     # Tests for Nullables and Optionals
diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml
index 9e09a1bb25255f..9c36134c1cbb9d 100644
--- a/src/app/tests/suites/TestConstraints.yaml
+++ b/src/app/tests/suites/TestConstraints.yaml
@@ -28,6 +28,36 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    # Tests for List of INT8U attribute
+    - label: "Write attribute LIST With List of INT8U"
+      command: "writeAttribute"
+      attribute: "list_int8u"
+      arguments:
+          value: [1, 2, 3, 4]
+
+    - label:
+          "Read attribute LIST With Partial List of INT8U that should be in it"
+      command: "readAttribute"
+      attribute: "list_int8u"
+      response:
+          constraints:
+              contains: [2, 3, 4]
+
+    - label:
+          "Read attribute LIST With Partial List of INT8U that should not be
+          included"
+      command: "readAttribute"
+      attribute: "list_int8u"
+      response:
+          constraints:
+              excludes: [0, 5]
+
+    - label: "Write attribute LIST Back to Default Value"
+      command: "writeAttribute"
+      attribute: "list_int8u"
+      arguments:
+          value: []
+
     # Tests for INT32U attribute
 
     - label: "Write attribute INT32U Value"
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
index 2c8f97e754aa6e..2562004cbf86aa 100644
--- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
+++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -223,6 +223,35 @@ tests:
                         EpochStartTime2: 2110002,
                     }
 
+    - label: "Remove Group 1"
+      cluster: "Groups"
+      endpoint: 1
+      command: "RemoveGroup"
+      arguments:
+          values:
+              - name: "groupId"
+                value: 0x0101
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "groupId"
+                value: 0x0101
+
+    - label: "Read GroupTable 2"
+      command: "readAttribute"
+      attribute: "GroupTable"
+      response:
+          value:
+              [
+                  {
+                      FabricIndex: 1,
+                      GroupId: 0x0102,
+                      endpoints: [1],
+                      GroupName: "Group #2",
+                  },
+              ]
+
     - label: "Remove All"
       cluster: "Groups"
       endpoint: 1
diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml
index 54f6e5d2343a21..10bf56f48cdac8 100644
--- a/src/app/tests/suites/TestGroupMessaging.yaml
+++ b/src/app/tests/suites/TestGroupMessaging.yaml
@@ -22,6 +22,15 @@ config:
     nodeId: 0x12344321
     cluster: "Basic"
     endpoint: 0
+    nodeId2:
+        type: NODE_ID
+        defaultValue: 0x43211234
+    discriminator:
+        type: INT16U
+        defaultValue: 3840
+    payload:
+        type: CHAR_STRING
+        defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -109,8 +118,8 @@ tests:
       arguments:
           value:
               [
-                  { FabricIndex: 1, GroupId: 0x0101, GroupKeySetID: 0x01a1 },
-                  { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a2 },
+                  { FabricIndex: 0, GroupId: 0x0101, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 0, GroupId: 0x0102, GroupKeySetID: 0x01a2 },
               ]
 
     - label: "Install ACLs"
@@ -152,6 +161,16 @@ tests:
       arguments:
           value: "xyzzy"
 
+    # Give the group write time to actually happen; unicast delivery can outrace
+    # multicast if the unicast packet is sent immediately after the multicast one.
+    - label: "Wait for write 1"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
       # Test Pair 2 : Validates previous group write attribute with a unicast to read
     - label: "Read back Attribute"
       command: "readAttribute"
@@ -167,6 +186,16 @@ tests:
       arguments:
           value: ""
 
+    # Give the group write time to actually happen; unicast delivery can outrace
+    # multicast if the unicast packet is sent immediately after the multicast one.
+    - label: "Wait for write 2"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
     # Test Pair 3 : Validates previous group write attribute with a unicast to read
     - label: "Read back Attribute"
       command: "readAttribute"
@@ -175,11 +204,29 @@ tests:
           value: ""
 
     # Test Pair 4 : Sends a Group command
+    - label: "Check on/off attribute value is false for endpoint 1"
+      cluster: "On/Off"
+      command: "readAttribute"
+      attribute: "OnOff"
+      endpoint: 1
+      response:
+          value: 0
+
     - label: "Turn On the light to see attribute change"
       cluster: "On/Off"
       command: "On"
       groupId: 0x0101
 
+    # Give the group invoke time to actually happen; unicast delivery can outrace
+    # multicast if the unicast packet is sent immediately after the multicast one.
+    - label: "Wait for command 3"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
     # Test Pair 4 : Validates previous group command with a unicast to read
     - label:
           "Check on/off attribute value is true after on command for endpoint 1"
@@ -190,6 +237,11 @@ tests:
       response:
           value: 1
 
+    - label: "Turn off the light to get ready for the next test"
+      cluster: "On/Off"
+      command: "Off"
+      endpoint: 1
+
     - label: "Cleanup ACLs"
       cluster: "Access Control"
       command: "writeAttribute"
@@ -205,3 +257,264 @@ tests:
                       Targets: null,
                   },
               ]
+
+    - label: "Open Commissioning Window from alpha"
+      cluster: "AdministratorCommissioning"
+      command: "OpenBasicCommissioningWindow"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "CommissioningTimeout"
+                value: 180
+
+    # We want to repeat all that from the "gamma" fabric, where our fabric
+    # index is 3 but the device's will be 2, so we have different fabric
+    # indices for the same fabric id.
+    - label: "Commission from gamma"
+      identity: "gamma"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload
+
+    - label: "Wait for the commissioned device to be retrieved for gamma"
+      identity: "gamma"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+
+    - label: "Add Group 1 (endpoint 1) for gamma"
+      identity: "gamma"
+      cluster: "Groups"
+      command: "AddGroup"
+      endpoint: 1
+      arguments:
+          values:
+              - name: "groupId"
+                value: 0x0101
+              - name: "groupName"
+                value: "Group #1"
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "groupId"
+                value: 0x0101
+
+    - label: "Add Group 2 (endpoint 0) for gamma"
+      identity: "gamma"
+      cluster: "Groups"
+      command: "AddGroup"
+      endpoint: 0
+      arguments:
+          values:
+              - name: "groupId"
+                value: 0x0102
+              - name: "groupName"
+                value: "Group #2"
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "groupId"
+                value: 0x0102
+
+    - label: "KeySet Write 1 for gamma"
+      identity: "gamma"
+      cluster: "Group Key Management"
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value: {
+                        GroupKeySetID: 0x01a1,
+                        #  TODO Revert this once MCSP is implemented
+                        # GroupKeySecurityPolicy: 1,
+                        GroupKeySecurityPolicy: 0, # 0 => TrustFirst
+                        EpochKey0: "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+                        EpochStartTime0: 1110000,
+                        EpochKey1: "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
+                        EpochStartTime1: 1110001,
+                        EpochKey2: "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+                        EpochStartTime2: 1110002,
+                    }
+
+    - label: "KeySet Write 2 for gamma"
+      identity: "gamma"
+      cluster: "Group Key Management"
+      command: "KeySetWrite"
+      arguments:
+          values:
+              - name: "GroupKeySet"
+                value: {
+                        GroupKeySetID: 0x01a2,
+                        GroupKeySecurityPolicy: 0, # TrustFirst
+                        EpochKey0: "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
+                        EpochStartTime0: 2220000,
+                        EpochKey1: "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef",
+                        EpochStartTime1: 2220001,
+                        EpochKey2: "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+                        EpochStartTime2: 2220002,
+                    }
+
+    - label: "Write Group Keys for gamma"
+      identity: "gamma"
+      cluster: "Group Key Management"
+      command: "writeAttribute"
+      attribute: "GroupKeyMap"
+      arguments:
+          value:
+              [
+                  { FabricIndex: 0, GroupId: 0x0101, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 0, GroupId: 0x0102, GroupKeySetID: 0x01a2 },
+              ]
+
+    - label: "Install ACLs for gamma"
+      identity: "gamma"
+      cluster: "Access Control"
+      command: "writeAttribute"
+      attribute: "ACL"
+      arguments:
+          value: [
+                  # Any CASE can administer
+                  {
+                      FabricIndex: 0,
+                      Privilege: 5, # administer
+                      AuthMode: 2, # case
+                      Subjects: null,
+                      Targets: null,
+                  },
+                  # Any group can manage
+                  {
+                      FabricIndex: 0,
+                      Privilege: 4, # manage
+                      AuthMode: 3, # group
+                      Subjects: null,
+                      Targets: null,
+                  },
+              ]
+
+    # Test Pair 1 : Check initial value (ensure it's not the test value)
+    - label: "Read initial Attribute value for gamma"
+      identity: "gamma"
+      command: "readAttribute"
+      attribute: "nodeLabel"
+      response:
+          value: ""
+
+    # Test Pair 2 : Sends a Group Write Attribute
+    - label: "Group Write Attribute for gamma"
+      identity: "gamma"
+      command: "writeAttribute"
+      attribute: "nodeLabel"
+      groupId: 0x0102
+      arguments:
+          value: "xyzzy"
+
+    # Give the group write time to actually happen; unicast delivery can outrace
+    # multicast if the unicast packet is sent immediately after the multicast one.
+    - label: "Wait for write 1 for gamma"
+      identity: "gamma"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+      # Test Pair 2 : Validates previous group write attribute with a unicast to read
+    - label: "Read back Attribute for gamma"
+      identity: "gamma"
+      command: "readAttribute"
+      attribute: "nodeLabel"
+      response:
+          value: "xyzzy"
+
+    # Test Pair 3 : Sends a Group Write Attribute
+    - label: "Restore initial Attribute value for gamma"
+      identity: "gamma"
+      command: "writeAttribute"
+      attribute: "nodeLabel"
+      groupId: 0x0102
+      arguments:
+          value: ""
+
+    # Give the group write time to actually happen; unicast delivery can outrace
+    # multicast if the unicast packet is sent immediately after the multicast one.
+    - label: "Wait for write 2 for gamma"
+      identity: "gamma"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+    # Test Pair 3 : Validates previous group write attribute with a unicast to read
+    - label: "Read back Attribute for gamma"
+      identity: "gamma"
+      command: "readAttribute"
+      attribute: "nodeLabel"
+      response:
+          value: ""
+
+    # Test Pair 4 : Sends a Group command
+    - label: "Check on/off attribute value is false for endpoint 1 for gamma"
+      cluster: "On/Off"
+      command: "readAttribute"
+      attribute: "OnOff"
+      endpoint: 1
+      response:
+          value: 0
+
+    - label: "Turn On the light to see attribute change for gamma"
+      identity: "gamma"
+      cluster: "On/Off"
+      command: "On"
+      groupId: 0x0101
+
+    # Give the group invoke time to actually happen; unicast delivery can outrace
+    # multicast if the unicast packet is sent immediately after the multicast one.
+    - label: "Wait for command 3 for gamma"
+      identity: "gamma"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+    # Test Pair 4 : Validates previous group command with a unicast to read
+    - label:
+          "Check on/off attribute value is true after on command for endpoint 1
+          for gamma"
+      cluster: "On/Off"
+      command: "readAttribute"
+      attribute: "OnOff"
+      endpoint: 1
+      response:
+          value: 1
+
+    - label: "Cleanup ACLs for gamma"
+      identity: "gamma"
+      cluster: "Access Control"
+      command: "writeAttribute"
+      attribute: "ACL"
+      arguments:
+          value: [
+                  # Any CASE can administer
+                  {
+                      FabricIndex: 0,
+                      Privilege: 5, # administer
+                      AuthMode: 2, # case
+                      Subjects: null,
+                      Targets: null,
+                  },
+              ]
diff --git a/src/app/tests/suites/TestGroupsCluster.yaml b/src/app/tests/suites/TestGroupsCluster.yaml
index 473eaeb4cf0701..98a45437fd0b78 100644
--- a/src/app/tests/suites/TestGroupsCluster.yaml
+++ b/src/app/tests/suites/TestGroupsCluster.yaml
@@ -41,7 +41,7 @@ tests:
               - name: "groupId"
                 value: 0
 
-    - label: "View Group 1 (not found)"
+    - label: "View First Group (not found)"
       command: "ViewGroup"
       arguments:
           values:
@@ -54,7 +54,7 @@ tests:
               - name: "groupId"
                 value: 0x0001
 
-    - label: "Add Group 1 (new)"
+    - label: "Add First Group (new)"
       command: "AddGroup"
       arguments:
           values:
@@ -69,7 +69,7 @@ tests:
               - name: "groupId"
                 value: 0x0001
 
-    - label: "View Group 1 (new)"
+    - label: "View First Group (new)"
       command: "ViewGroup"
       arguments:
           values:
@@ -84,7 +84,7 @@ tests:
               - name: "groupName"
                 value: "Group #1"
 
-    - label: "View Group 2 (not found)"
+    - label: "View Second Group (not found)"
       command: "ViewGroup"
       arguments:
           values:
@@ -110,7 +110,7 @@ tests:
               - name: "groupList"
                 value: [0x01]
 
-    - label: "Add Group 2 (new)"
+    - label: "Add Second Group (new)"
       # https://github.com/project-chip/connectedhomeip/issues/11312
       disabled: true
       command: "AddGroup"
@@ -127,7 +127,7 @@ tests:
               - name: "groupId"
                 value: 0x1111
 
-    - label: "View Group 2 (new)"
+    - label: "View Second Group (new)"
       # https://github.com/project-chip/connectedhomeip/issues/11312
       disabled: true
       command: "ViewGroup"
@@ -174,7 +174,7 @@ tests:
               - name: "groupId"
                 value: 0x7fff
 
-    - label: "View Group 1 (existing)"
+    - label: "View First Group (existing)"
       command: "ViewGroup"
       arguments:
           values:
@@ -189,7 +189,7 @@ tests:
               - name: "groupName"
                 value: "Group #1"
 
-    - label: "View Group 2 (existing)"
+    - label: "View Second Group (existing)"
       # https://github.com/project-chip/connectedhomeip/issues/11312
       disabled: true
       command: "ViewGroup"
@@ -264,7 +264,7 @@ tests:
               - name: "groupId"
                 value: 0x04
 
-    - label: "Remove Group 2 (existing)"
+    - label: "Remove Second Group (existing)"
       # https://github.com/project-chip/connectedhomeip/issues/11312
       disabled: true
       command: "RemoveGroup"
@@ -279,7 +279,7 @@ tests:
               - name: "groupId"
                 value: 0x1111
 
-    - label: "View Group 1 (not removed)"
+    - label: "View First Group (not removed)"
       command: "ViewGroup"
       arguments:
           values:
@@ -294,7 +294,7 @@ tests:
               - name: "groupName"
                 value: "Group #1"
 
-    - label: "View Group 2 (removed)"
+    - label: "View Second Group (removed)"
       command: "ViewGroup"
       arguments:
           values:
@@ -340,7 +340,7 @@ tests:
     - label: "Remove All"
       command: "RemoveAllGroups"
 
-    - label: "View Group 1 (removed)"
+    - label: "View First Group (removed)"
       command: "ViewGroup"
       arguments:
           values:
@@ -353,7 +353,7 @@ tests:
               - name: "groupId"
                 value: 0x0001
 
-    - label: "View Group 2 (still removed)"
+    - label: "View Second Group (still removed)"
       command: "ViewGroup"
       arguments:
           values:
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index da79250fd26d1e..b5a22962aa8ea5 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -180,6 +180,17 @@ PICS:
           "Does the device implement receiving the SetpointRaiseLower command?"
       id: CR_SetpointRaiseLower
 
+    - label:
+          "Does the device implement the UnoccupiedCoolingSetpoint attribute?"
+      id: A_UNOCCUPIEDCOOLINGSETPOINT
+
+    - label:
+          "Does the device implement the UnoccupiedHeatingSetpoint attribute?"
+      id: A_UNOCCUPIEDHEATINGSETPOINT
+
+    - label: "Does the device implement the MinSetpointDeadBand attribute?"
+      id: A_MINSETPOINTDEADBAND
+
       # Occupency sensing cluster
     - label: "Does the device implement the Occupancy attribute?"
       id: A_OCCUPANCY
@@ -213,6 +224,29 @@ PICS:
     - label: "Does the device implement the EndProductType attribute?"
       id: A_ENDPRODUCTTYPE
 
+    - label: "Does the device implement the OperationalStatus attribute?"
+      id: A_OPERATIONALSTATUS
+
+    - label:
+          "Does the device implement the TargetPositionLiftPercent100ths
+          attribute?"
+      id: A_TARGETPOSITIONLIFTPERCENT100THS
+
+    - label:
+          "Does the device implement the TargetPositionTiltPercent100ths
+          attribute?"
+      id: A_TARGETPOSITIONTILTPERCENT100THS
+
+    - label:
+          "Does the device implement the CurrentPositionLiftPercent100ths
+          attribute?"
+      id: A_CURRENTPOSITIONLIFTPERCENT100THS
+
+    - label:
+          "Does the device implement the CurrentPositionTiltPercent100ths
+          attribute?"
+      id: A_CURRENTPOSITIONTILTPERCENT100THS
+
     - label:
           "Does the device implement the CurrentPositionLiftPercentage
           attribute?"
@@ -223,6 +257,42 @@ PICS:
           attribute?"
       id: A_CURRENTPOSITIONTILTPERCENTAGE
 
+    - label: "Does the device implement the CurrentPositionLift attribute?"
+      id: A_CURRENTPOSITIONLIFT
+
+    - label: "Does the device implement the CurrentPositionTilt attribute?"
+      id: A_CURRENTPOSITIONTILT
+
+    - label: "Does the device implement the NumberOfActuationsLift attribute?"
+      id: A_NUMBEROFACTUATIONSLIFT
+
+    - label: "Does the device implement the NumberOfActuationsTilt attribute?"
+      id: A_NUMBEROFACTUATIONSTILT
+
+    - label: "Does the device implement the PhysicalClosedLimitLift attribute?"
+      id: A_PHYSICALCLOSEDLIMITLIFT
+
+    - label: "Does the device implement the PhysicalClosedLimitTilt attribute?"
+      id: A_PHYSICALCLOSEDLIMITTILT
+
+    - label: "Does the device implement the InstalledOpenLimitLift attribute?"
+      id: A_INSTALLEDOPENLIMITLIFT
+
+    - label: "Does the device implement the InstalledOpenLimitTilt attribute?"
+      id: A_INSTALLEDOPENLIMITTILT
+
+    - label: "Does the device implement the InstalledClosedLimitLift attribute?"
+      id: A_INSTALLEDCLOSEDLIMITLIFT
+
+    - label: "Does the device implement the InstalledClosedLimitTilt attribute?"
+      id: A_INSTALLEDCLOSEDLIMITTILT
+
+    - label: "Does the device implement the Mode attribute?"
+      id: A_MODE
+
+    - label: "Does the device implement the SafetyStatus attribute?"
+      id: A_SAFETYSTATUS
+
       ## WC-Commands received
     - label:
           "Does the device implement receiving the GoToLiftPercentage command?"
@@ -310,6 +380,7 @@ PICS:
           "The optional key PI MAY provide additional information for pairing."
       id: PI_KEY
 
+    #Prompt
     - label: "Prompts user for input. Unable to run in CI"
       id: PICS_USER_PROMPT
 
@@ -318,3 +389,9 @@ PICS:
 
     - label: "Level Control for Lighting"
       id: OO_LT
+
+    #Flow measurement
+    - label:
+          "Can the MeasuredValue attribute changed by physical control at the
+          device?"
+      id: MANUAL_FLOW_CHANGE
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
new file mode 100644
index 00000000000000..f2c753bd5e021c
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
@@ -0,0 +1,84 @@
+# 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.1.1. [TC-ACT-1.1] Global attributes with server as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH (can be skipped if done in a preceding test)"
+      verification: |
+
+      disabled: true
+
+    - label: "Read ClusterRevision (global attribute 65533)"
+      verification: |
+          ./chip-tool bridgedactions read cluster-revision 1 1
+
+          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0025 Attribute 0x0000_FFFD DataVersion: 3573360937
+          [1649664569.312693][8655:8660] CHIP:TOO:   ClusterRevision: 1
+      disabled: true
+
+    - label: "Read FeatureMap (global attribute 65532)"
+      verification: |
+          ./chip-tool bridgedactions read feature-map 1 1
+
+          Need to implement in SDK
+      disabled: true
+
+    - label: "Read AttributeList (global attribute 65531)"
+      verification: |
+          ./chip-tool bridgedactions read attribute-list 1 1
+
+          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0025 Attribute 0x0000_FFFB DataVersion: 3573360937
+          [1649664685.946524][8671:8676] CHIP:TOO:   AttributeList: 7 entries
+          [1649664685.946600][8671:8676] CHIP:TOO:     [1]: 0
+          [1649664685.946649][8671:8676] CHIP:TOO:     [2]: 1
+          [1649664685.946696][8671:8676] CHIP:TOO:     [3]: 2
+          [1649664685.946744][8671:8676] CHIP:TOO:     [4]: 65528
+          [1649664685.946790][8671:8676] CHIP:TOO:     [5]: 65529
+          [1649664685.946836][8671:8676] CHIP:TOO:     [6]: 65531
+          [1649664685.946901][8671:8676] CHIP:TOO:     [7]: 65533
+      disabled: true
+
+    - label: "Read EventList (global attribute 65530)"
+      verification: |
+          ./chip-tool bridgedactions read event-list 1 1
+
+          Need to implement in chip-tool
+      disabled: true
+
+    - label:
+          "Read AcceptedCommandList (global attribute 65529) ; retain this list
+          for reference in test [TC-ACT-2.2] step 4d"
+      verification: |
+          ./chip-tool bridgedactions read accepted-command-list 1 1
+
+          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0025 Attribute 0x0000_FFF9 DataVersion: 2809940331
+          CHIP:TOO:   AcceptedCommandList: 0 entries
+          CHIP:EM: Sending Standalone Ack for MessageCounter:3357407 on exchange 13031i
+      disabled: true
+
+    - label: "Read GeneratedCommandList (global attribute 65528)"
+      verification: |
+          ./chip-tool bridgedactions read generated-command-list 1 1
+
+          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0025 Attribute 0x0000_FFF8 DataVersion: 2809940331
+          CHIP:TOO:   GeneratedCommandList: 0 entries
+          CHIP:EM: Sending Standalone Ack for MessageCounter:14920557 on exchange 16149i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml
new file mode 100644
index 00000000000000..08520ebf2bbe95
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml
@@ -0,0 +1,177 @@
+# 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.2.1. [TC-ACT-2.1] Attributes with server as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH (can be skipped if done in a preceding test)"
+      verification: |
+
+      disabled: true
+
+    - label:
+          "Use manufacturer provided means (e.g. app) to define groups of
+          endpoints that can be exposed using the Actions server cluster (NOTE
+          if this is not provided, it is assumed the DUT automagically creates
+          these)"
+      verification: |
+          no Matter messages, result will be used in steps 4a and beyond
+      disabled: true
+
+    - label:
+          "Use manufacturer provided means (e.g. app) to define available
+          actions that can be exposed using the Actions server cluster (NOTE if
+          this is not provided, it is assumed the DUT automagically creates
+          these)"
+      verification: |
+          no Matter messages, result will be used in steps 5a and beyond
+      disabled: true
+
+    - label:
+          "Read PartsList attribute of Descriptor cluster on all endpoints of
+          the DUT"
+      verification: |
+          Read PartsList attribute of Descriptor cluster on all endpoints of the DUT (start with EP 0 and recursively handle all the EP found in the PartsList)
+      disabled: true
+
+    - label: "Compile a list of all endpoints on the server"
+      verification: |
+          internal TH: create list of all EP on this server
+      disabled: true
+
+    - label:
+          "Read EndpointLists attribute of Actions server and validate the
+          EndpointListStructs using the following steps"
+      verification: |
+          Read EndpointLists attribute
+      disabled: true
+
+    - label:
+          "For each EndpointListStruct, verify that the endpoints in the
+          Endpoints field are in the list of endpoints of the DUT"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label: "For each EndpointListStruct, verify that the Name is present"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "For each EndpointListStruct, verify that the Type is present and
+          valid"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "Verify that the EndPointListIDs of all EndpointListStruct are unique
+          (no duplicates)"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "For each EndpointListStruct, verify Name and Type against the
+          name/type of each group of endpoints provided by the manufacturers
+          means"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "Read ActionList attribute of Actions server and validate the
+          ActionStructs using the following steps"
+      verification: |
+          Read ActionList attribute
+      disabled: true
+
+    - label: "For each ActionStruct, verify the Name is present"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label: "For each ActionStruct, verify the Type is present and valid"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "For each ActionStruct, verify the EndpointListID is present in one of
+          the EndpointListStructs (see step 4a)"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "For each ActionStruct, verify the SupportedCommands field is present
+          and valid (at least one bit is set)"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "For each ActionStruct, verify the State field is present and valid"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "Verify that the ActionIDs of all ActionStructs are unique (no
+          duplicates)"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "For each ActionStruct, verify Name, Type and State against the
+          name/type/state info for the action provided by the manufacturers
+          means"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label: "Read SetupURL attribute"
+      verification: |
+          Read SetupURL attribute
+      disabled: true
+
+    - label:
+          "Verify that its syntax follows the syntax as specified in RFC 3986,
+          max. 512 ASCII characters"
+      verification: |
+          no Matter messages, but TH internal checking
+      disabled: true
+
+    - label:
+          "Verify SetupURL points to a site providing information about the
+          actions"
+      verification: |
+          no Matter messages, but TH internal checking + accessing the URL on the internet
+      disabled: true
+
+    - label:
+          'Verify SetupURL appended by "?/a=" and the decimal numeric value of
+          one of the exposed ActionIDs (see step 5a) points to a site providing
+          information about the action'
+      verification: |
+          no Matter messages, but TH internal checking + accessing the URL on the internet
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml
new file mode 100644
index 00000000000000..125bbd7e564c5f
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml
@@ -0,0 +1,196 @@
+# 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.2.2. [TC-ACT-2.2] Primary functionality with server as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH (can be skipped if done in a preceding test)"
+      verification: |
+
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, create multiple groups with
+          each multiple bridged devices (endpoints)"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read EndpointLists attribute"
+      verification: |
+          Read EndpointLists attribute
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, update the name of one of the
+          groups"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read EndpointLists attribute again"
+      verification: |
+          Read EndpointLists attribute
+      disabled: true
+
+    - label: "compare result of step 2d to what was read in step 2b"
+      verification: |
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2c
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, move one of the bridged
+          devices (one endpoint) from one group to another group"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read EndpointLists attribute again"
+      verification: |
+          Read EndpointLists attribute
+      disabled: true
+
+    - label: "compare result of step 2g to what was read in step 2e"
+      verification: |
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2f
+      disabled: true
+
+    - label: "Using the manufacturer provided means, remove one of the groups"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read EndpointLists attribute again"
+      verification: |
+          Read EndpointLists attribute
+      disabled: true
+
+    - label: "compare result of step 2j to what was read in step 2h"
+      verification: |
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2i
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, create a new group, which
+          includes one of the bridged devices also present in another group"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read EndpointLists attribute again"
+      verification: |
+          Read EndpointLists attribute
+      disabled: true
+
+    - label: "compare result of step 2m to what was read in step 2k"
+      verification: |
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2l
+      disabled: true
+
+    - label: "Using the manufacturer provided means, create multiple actions"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read ActionList attribute"
+      verification: |
+          Read ActionList attribute
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, update the name of one of the
+          actions"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read ActionList attribute again"
+      verification: |
+          Read ActionList attribute
+      disabled: true
+
+    - label: "compare result of step 3d to what was read in step 3b"
+      verification: |
+          TH internal checking of changes to ActionList attribute matching what was changed in 3c
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, remove one of the exposed
+          actions"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read ActionList attribute again"
+      verification: |
+          Read ActionList attribute
+      disabled: true
+
+    - label: "compare result of step 3g to what was read in step 3e"
+      verification: |
+          TH internal checking of changes to ActionList attribute matching what was changed in 3f
+      disabled: true
+
+    - label: "Using the manufacturer provided means, add a new exposed action"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read ActionList attribute again"
+      verification: |
+          Read ActionList attribute
+      disabled: true
+
+    - label: "compare result of step 3j to what was read in step 3h"
+      verification: |
+          TH internal checking of changes to ActionList attribute matching what was changed in 3i
+      disabled: true
+
+    - label:
+          "Using the manufacturer provided means, create multiple actions (NOTE
+          if this is not provided, it is assumed the DUT automagically creates
+          these)"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Read ActionList attribute"
+      verification: |
+          Read ActionList attribute
+      disabled: true
+
+    - label: "subscribe to StateChanged and ActionFailed events"
+      verification: |
+          subscribe to events
+      disabled: true
+
+    - label:
+          "For each of the ActionStructs provided by DUT (see list read in step
+          4b), perform one of the actions supported (see SupportedCommands in
+          this ActionStruct) by sending the command with this particular
+          ActionID and a random value for InvokeID"
+      verification: |
+          sequence of Matter messages as described
+      disabled: true
+
+    - label: "repeat 4d for the other SupportedCommands of each ActionStruct"
+      verification: |
+          sequence of Matter messages as described
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
new file mode 100644
index 00000000000000..5d389fef09934c
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
@@ -0,0 +1,74 @@
+# 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.2.3. [TC-ACT-3.1] GLobal attributes with client as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "DUT reads all supported mandatory attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          ./chip-tool bridgedactions  read action-list 1 1
+          ./chip-tool bridgedactions  read endpoint-list   1 1
+      disabled: true
+
+    - label:
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          ./chip-tool bridgedactions  read  setup-url  1 1
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported mandatory attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          No writeable attribute
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported optional attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          No writeable attribute
+      disabled: true
+
+    - label:
+          "Configure TH such that it implements mandatory and none of the
+          optional attributes of the server-side of the cluster, and that it
+          also reflects this in global attributes such as FeatureMap and
+          AttributeList. Commission DUT to TH again"
+      verification: |
+          https://github.com/project-chip/connectedhomeip/issues/16851
+      disabled: true
+
+    - label:
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          https://github.com/project-chip/connectedhomeip/issues/16851
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported optional attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          https://github.com/project-chip/connectedhomeip/issues/16851
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml
deleted file mode 100644
index 817cf3bb82e613..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    28.1.5. [TC-BDX-1.5] Response to Sender Initiated BDX Transfer session -
-    Negative scenario
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH sends a SendInit message to DUT with a file designator not
-          supported by DUT"
-      disabled: true
-
-    - label:
-          "TH sends a SendInit message to DUT with an invalid start offset or
-          one that is not supported by DUT"
-      disabled: true
-
-    - label:
-          "TH sends a SendInit message to DUT with definite length field too
-          large for DUT"
-      disabled: true
-
-    - label:
-          "TH sends a SendInit message to DUT with definite length field too
-          short for DUT"
-      disabled: true
-
-    - label:
-          "TH sends a SendInit message to DUT with a missing definite length
-          field"
-      disabled: true
-
-    - label:
-          "TH sends a SendInit message to DUT with proposed transfer control
-          method not supported by DUT"
-      disabled: true
-
-    - label:
-          "TH sends a SendInit message to DUT when the DUT is too busy to
-          process another transfer"
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml
deleted file mode 100644
index 1a8f3a4e9aea5b..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    28.1.6. [TC-BDX-1.6] Response to Receiver Initiated BDX Transfer session -
-    Negative scenario
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH sends a ReceiveInit message to DUT with a file designator not
-          supported by DUT"
-      disabled: true
-
-    - label:
-          "TH sends a ReceiveInit message to DUT with an invalid start offset or
-          one that is not supported by DUT"
-      disabled: true
-
-    - label:
-          "TH sends a ReceiveInit message to DUT with definite length field too
-          large for DUT"
-      disabled: true
-
-    - label:
-          "TH sends a ReceiveInit message to DUT with a missing definite length
-          field"
-      disabled: true
-
-    - label:
-          "TH sends a ReceiveInit message to DUT with proposed transfer control
-          method not supported by DUT"
-      disabled: true
-
-    - label:
-          "TH sends a ReceiveInit message to DUT when the DUT is too busy to
-          process another transfer"
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml
deleted file mode 100644
index 2f65c3cfce4ea2..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 28.2.3. [TC-BDX-2.3] Restart Synchronous file receiving
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "IF (PICS_DT_Receiver_Driver) TH sends a SendInit message to DUT + DUT
-          sends a SendAccept message back to TH + DUT sends a BlockQuery message
-          to TH + TH sends a Block message back to DUT"
-      verification: |
-          1. Verify that the OTA Reference Provider App logs show BlockQuery message from DUT
-
-          [1636410922974] [59203:62969336] CHIP: [ATM] Handling received BDX Message
-          [1636410922974] [59203:62969336] CHIP: [ATM] BlockQuery
-          [1636410922974] [59203:62969336] CHIP: [ATM]   Block Counter: 0
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml
deleted file mode 100644
index 14e431aac017cb..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 28.2.4. [TC-BDX-2.4] Asynchronous file sending
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "DUT sends a SendInit message to TH + TH sends a SendAccept message
-          back to DUT + DUT sends a Block message to TH"
-      disabled: true
-
-    - label: "DUT sends a Block message to TH"
-      disabled: true
-
-    - label:
-          "DUT sends a BlockEOF message to TH + TH sends a BlockAckEOF message
-          back to DUT"
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
new file mode 100644
index 00000000000000..5ee85e3d7f9981
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
@@ -0,0 +1,79 @@
+# 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: 117.1.1. [TC-BIND-1.1] Global Attributes [DUT-Controller]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH1"
+      verification: |
+
+      disabled: true
+
+    - label: "TH1 reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool binding read cluster-revision 1 0
+
+          [1649417989.863435][3040:3045] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFFD DataVersion: 1411817517
+          [1649417989.863557][3040:3045] CHIP:TOO:   ClusterRevision: 1
+          [1649417989.863691][3040:3045] CHIP:EM: Sending Standalone Ack for MessageCounter:2888019 on exchange 4263i
+      disabled: true
+
+    - label: "TH1 reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool binding read feature-map 1 0
+
+          [1653560808.265422][3439:3444] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFFC DataVersion: 2519252823
+          [1653560808.265507][3439:3444] CHIP:TOO:   FeatureMap: 0
+      disabled: true
+
+    - label: "TH1 reads AttributeList from DUT"
+      verification: |
+          ./chip-tool binding read attribute-list 1 0
+
+          [1653560826.815841][3445:3450] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFFB DataVersion: 2519252823
+          [1653560826.816170][3445:3450] CHIP:TOO:   AttributeList: 6 entries
+          [1653560826.816239][3445:3450] CHIP:TOO:     [1]: 0
+          [1653560826.816279][3445:3450] CHIP:TOO:     [2]: 65528
+          [1653560826.816316][3445:3450] CHIP:TOO:     [3]: 65529
+          [1653560826.816352][3445:3450] CHIP:TOO:     [4]: 65531
+          [1653560826.816388][3445:3450] CHIP:TOO:     [5]: 65532
+          [1653560826.816424][3445:3450] CHIP:TOO:     [6]: 65533
+      disabled: true
+
+    - label: "TH1 reads EventList from DUT"
+      verification: |
+          No Event-list is on attributes list
+      disabled: true
+
+    - label: "TH1 reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool binding read accepted-command-list 1 0
+
+          [1653560851.890988][3451:3456] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFF9 DataVersion: 2519252823
+          [1653560851.891077][3451:3456] CHIP:TOO:   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH1 reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool binding read generated-command-list 1 0
+
+          [1653560872.884952][3458:3463] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFF8 DataVersion: 2519252823
+          [1653560872.885073][3458:3463] CHIP:TOO:   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml
new file mode 100644
index 00000000000000..ce54fc7d7fc75d
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml
@@ -0,0 +1,140 @@
+# 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: 117.2.1. [TC-BIND-2.1] Binding Cluster Attributes [DUT-Controller]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Factory Reset DUT"
+      verification: |
+
+      disabled: true
+
+    - label:
+          "TH1 writes Binding cluster entries into DUT as per precondition TH1
+          enables DUT as Controller"
+      verification: |
+          ./chip-tool binding write binding '[{"node" : 1 , "cluster" : "0x0006" , "endpoint" : 1 }, { "group" : "0x0001" }]' 1 0
+
+          [1652941260.571580][5157:5162] CHIP:DMG:                        StatusIB =
+          [1652941260.571625][5157:5162] CHIP:DMG:                        {
+          [1652941260.571670][5157:5162] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1652941260.571720][5157:5162] CHIP:DMG:                        },
+      disabled: true
+
+    - label: "DUT and TH2 are commissioned"
+      verification: |
+
+      disabled: true
+
+    - label: "TH1 reads the Binding entries from DUT"
+      verification: |
+          ./chip-tool binding read binding 1 0
+
+          [1653895089.593475][5416:5421] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_0000 DataVersion: 3570434286
+          [1653895089.593580][5416:5421] CHIP:TOO:   Binding: 2 entries
+          [1653895089.593781][5416:5421] CHIP:TOO:     [1]: {
+          [1653895089.593839][5416:5421] CHIP:TOO:       Node: 1
+          [1653895089.593908][5416:5421] CHIP:TOO:       Endpoint: 1
+          [1653895089.593954][5416:5421] CHIP:TOO:       Cluster: 6
+          [1653895089.593987][5416:5421] CHIP:TOO:       FabricIndex: 1
+          [1653895089.594019][5416:5421] CHIP:TOO:      }
+          [1653895089.594073][5416:5421] CHIP:TOO:     [2]: {
+          [1653895089.594108][5416:5421] CHIP:TOO:       Group: 1
+          [1653895089.594152][5416:5421] CHIP:TOO:       FabricIndex: 1
+          [1653895089.594183][5416:5421] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "If Node Field is readable, DUT sends On command for the Node and
+          Endpoint1"
+      verification: |
+          ./chip-tool onoff on 1 1
+
+          [1653045100.385974][2688:2693] CHIP:DMG:                                StatusIB =
+          [1653045100.386048][2688:2693] CHIP:DMG:                                {
+          [1653045100.386125][2688:2693] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1653045100.386200][2688:2693] CHIP:DMG:                                },
+      disabled: true
+
+    - label: "DUT reads OnOff attribute on the respective Endpoint1"
+      verification: |
+          ./chip-tool onoff read on-off 1 1
+
+          [1653045143.391779][2698:2703] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 4174089266
+          [1653045143.393401][2698:2703] CHIP:TOO:   OnOff: TRUE
+      disabled: true
+
+    - label:
+          "If Group field is readable,DUT sends a multicast On command to Node
+          and Endpoint1"
+      verification: |
+          ./chip-tool onoff on 0x0001 1
+
+          [1653045301.383221][2725:2730] CHIP:DMG:                                StatusIB =
+          [1653045301.383280][2725:2730] CHIP:DMG:                                {
+          [1653045301.383335][2725:2730] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1653045301.383393][2725:2730] CHIP:DMG:                                },
+      disabled: true
+
+    - label: "DUT reads OnOff attribute on the above Endpoint1"
+      verification: |
+          ./chip-tool onoff read on-off 1 1
+
+          [1653045340.155414][2734:2739] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 4174089266
+          [1653045340.155481][2734:2739] CHIP:TOO:   OnOff: TRUE
+      disabled: true
+
+    - label: "DUT removes entry from the Binding for the Node and EndPoint1"
+      verification: |
+          ./chip-tool binding write binding [] 1 0
+
+          [1653567762.886755][4839:4844] CHIP:DMG:                        StatusIB =
+          [1653567762.886829][4839:4844] CHIP:DMG:                        {
+          [1653567762.886888][4839:4844] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653567762.886966][4839:4844] CHIP:DMG:                        },
+      disabled: true
+
+    - label:
+          "If Node Field is readable, DUT sends On command for the above Node
+          and Endpoint 1"
+      verification: |
+          ./chip-tool onoff on 1 1
+
+          [1653567890.077539][4867:4872] CHIP:DMG:                                StatusIB =
+          [1653567890.077584][4867:4872] CHIP:DMG:                                {
+          [1653567890.077626][4867:4872] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1653567890.077670][4867:4872] CHIP:DMG:                                },
+      disabled: true
+
+    - label: "Read SupportedFabrics from the DUT."
+      verification: |
+          ./chip-tool operationalcredentials read supported-fabrics 1 0
+
+          [1653045735.101037][2767:2772] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0002 DataVersion: 38458521
+          [1653045735.101214][2767:2772] CHIP:TOO:   SupportedFabrics: 16
+      disabled: true
+
+    - label:
+          "TH1 writes Binding entries into DUT for all the clusters that support
+          Binding Run TC-BC-1.1 to make sure all mandatory attributes/commands
+          are implemented for all the binding clusters"
+      verification: |
+
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
index e997fae45f22b5..93f8b42124b2e5 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
@@ -33,10 +33,5 @@ tests:
       attribute: "StateValue"
       response:
           value: 0
-
-    - label: "Read mandatory non-global attribute constraints: StateValue"
-      command: "readAttribute"
-      attribute: "StateValue"
-      response:
           constraints:
               type: bool
diff --git a/src/app/tests/suites/certification/Test_TC_GC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
similarity index 98%
rename from src/app/tests/suites/certification/Test_TC_GC_1_1.yaml
rename to src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
index de881ef17a48dc..8d1dc42cdaee00 100644
--- a/src/app/tests/suites/certification/Test_TC_GC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 88.1. [TC-GC-1.1] Global Attributes [DUT-Server]
+name: 90.1. [TC-CGEN-1.1] Global Attributes [DUT-Server]
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_GC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
similarity index 92%
rename from src/app/tests/suites/certification/Test_TC_GC_2_1.yaml
rename to src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
index ad5c2cbb0b9688..97ce7e6e23a017 100644
--- a/src/app/tests/suites/certification/Test_TC_GC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 name:
-    88.2. [TC-GC-2.1] Breadcrumb, BasicCommissioningInfo, RegulatoryConfig and
-    LocationCapability attributes [DUT - Commissionee]
+    90.2. [TC-CGEN-2.1] Breadcrumb, BasicCommissioningInfo, RegulatoryConfig,
+    LocationCapability and SupportsConcurrentConnection attributes [DUT -
+    Server]
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_GC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
similarity index 98%
rename from src/app/tests/suites/certification/Test_TC_GC_2_2.yaml
rename to src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
index 846833fe7522f4..2a454bb6290ad3 100644
--- a/src/app/tests/suites/certification/Test_TC_GC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
@@ -13,7 +13,7 @@
 # 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: 88.3. [TC-GC-2.2] ArmFailSafe command verification [DUT - Commissionee]
+name: 90.3. [TC-CGEN-2.2] ArmFailSafe command verification [DUT - Server]
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_GC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_3.yaml
similarity index 98%
rename from src/app/tests/suites/certification/Test_TC_GC_2_3.yaml
rename to src/app/tests/suites/certification/Test_TC_CGEN_2_3.yaml
index 2948982b79972b..a07c9715508cd9 100644
--- a/src/app/tests/suites/certification/Test_TC_GC_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_3.yaml
@@ -13,7 +13,9 @@
 # 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: 88.4. [TC-GC-2.3] BUSY Status code verification [DUT - Commissionee]
+name:
+    90.4. [TC-CGEN-2.3] BusyWithOtherAdmin Status code verification [DUT -
+    Server]
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_GC_2_4.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
similarity index 98%
rename from src/app/tests/suites/certification/Test_TC_GC_2_4.yaml
rename to src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
index dc1f900eea9063..8e61b66ccf1aee 100644
--- a/src/app/tests/suites/certification/Test_TC_GC_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
@@ -13,7 +13,9 @@
 # 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: 88.5. [TC-GC-2.4] Verification For ErrorCode message [DUT - Commissionee]
+name:
+    90.5. [TC-CGEN-2.4] Verification For CommissioningError on response message
+    [DUT - Server]
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml
index cd87b917babb76..9014add6256612 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    7.1.10. [TC-DD-1.10] NFC Onboarding Payload Verification [DUT -
+    3.1.10. [TC-DD-1.10] NFC Onboarding Payload Verification [DUT -
     Commissioner]
 
 config:
@@ -23,11 +23,10 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Power up the Device and put the Device in pairing mode"
+    - label: "Power up the TH Device and put the TH Device in pairing mode"
       verification: |
           sudo ./chip-all-clusters-app
 
-
           [1646286638.375844][11651:11651] CHIP:DL: Device Configuration:
           [1646286638.375960][11651:11651] CHIP:DL:   Serial Number: TEST_SN
           [1646286638.376016][11651:11651] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
@@ -44,7 +43,7 @@ tests:
           [1646286638.378089][11651:11651] CHIP:SVR: Long manual pairing code: [749701123365521327694]
       disabled: true
 
-    - label: "Bring the DUT close to the NFC code on the Device"
+    - label: "Bring the DUT close to the NFC tag for the TH Device"
       verification: |
           Vendor specific field testcase
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml
new file mode 100644
index 00000000000000..7e3257491440e0
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml
@@ -0,0 +1,80 @@
+# 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.1.13. [TC-DD-1.13] Onboarding Payload Verification - Custom Flow = 1 [DUT
+    - Commissionee]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Power on the DUT device."
+      verification: |
+          1. Verify DUT is NOT advertising in commissioning mode. On DUT, the DUT should not show up
+
+          $  ./out/chip-tool/chip-tool discover commissionables
+      disabled: true
+
+    - label: "Scan the DUTs QR code from the previous step using the TH."
+      verification: |
+          1. Run DUT. Example for DUT=all-clusters app
+          $ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 0 --capabilities 4 --discriminator 3840 --passcode 20202021
+
+          2. Parse onboarding payload using TH=chip-tool
+          $  ./out/chip-tool/chip-tool payload parse-setup-payload MT:-24J0AFN00KA0648G00
+          [1651193251086] [15494:447566] CHIP: [SPL] Parsing base38Representation: MT:-24J0AFN00KA0648G00
+          [1651193251087] [15494:447566] CHIP: [SPL] CommissioningFlow: 1
+          [1651193251087] [15494:447566] CHIP: [SPL] VendorID: 65521
+          [1651193251087] [15494:447566] CHIP: [SPL] Version: 0
+          [1651193251087] [15494:447566] CHIP: [SPL] ProductID: 32769
+          [1651193251087] [15494:447566] CHIP: [SPL] Discriminator: 3840
+          [1651193251087] [15494:447566] CHIP: [SPL] SetUpPINCode: 20202021
+          [1651193251087] [15494:447566] CHIP: [SPL] RendezvousInformation: 4
+      disabled: true
+
+    - label:
+          "Verify that the TH presents the user with a pairing hint in the
+          CommissioningModeInitialStepsHint field of the DCL. Verify that the
+          CommissioningCustomFlow field is set to a value = 1"
+      verification: |
+          1. Verify CommissioningCustomFlow=1
+          2. Verify CommissioningModeInitialStepsHint contains a valid, non-zero integer
+      disabled: true
+
+    - label:
+          "Follow any steps from the resources provided by the pairing hint for
+          putting the DUT Commissionee into commissioning mode"
+      verification: |
+          1. Follow vendor-specific steps from the pairing hint to put DUT into commissioning mode
+
+          2. Verify DUT is advertising in commissioning mode. On DUT,
+
+          $  ./out/chip-tool/chip-tool discover commissionables
+          [1651192893436] [15304:442604] CHIP: [DL] Mdns: OnNewAddress interface: 24 ip:fe80::dea6:32ff:fe8d:6e32
+          [1651192893436] [15304:442604] CHIP: [DIS]         Vendor ID: 65521
+          [1651192893436] [15304:442604] CHIP: [DIS]         Product ID: 32769
+          [1651192893436] [15304:442604] CHIP: [DIS]         Long Discriminator: 3840
+          [1651192893436] [15304:442604] CHIP: [DIS]         Pairing Hint: 33
+          [1651192893436] [15304:442604] CHIP: [DIS]         Hostname: DCA6328D6E320000
+          [1651192893436] [15304:442604] CHIP: [DIS]         Instance Name: 914762134DA8E7D1
+          [1651192893436] [15304:442604] CHIP: [DIS]         IP Address #1: fe80::dea6:32ff:fe8d:6e32
+          [1651192893436] [15304:442604] CHIP: [DIS]         Port: 5540
+          [1651192893436] [15304:442604] CHIP: [DIS]         Commissioning Mode: 1
+          [1651192893436] [15304:442604] CHIP: [DIS]         Mrp Interval idle: 5000 ms
+          [1651192893436] [15304:442604] CHIP: [DIS]         Mrp Interval active: 300 ms
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml
new file mode 100644
index 00000000000000..ac7ae83602bec6
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml
@@ -0,0 +1,80 @@
+# 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.1.14. [TC-DD-1.14] Onboarding Payload Verification - Custom Flow = 2 [DUT
+    - Commissionee]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Power on the DUT device."
+      verification: |
+          1. Verify DUT is NOT advertising in commissioning mode. On DUT, the DUT should not show up
+
+          $  ./out/chip-tool/chip-tool discover commissionables
+      disabled: true
+
+    - label: "Scan the DUTs QR code from the previous step using the TH."
+      verification: |
+          1. Run DUT. Example for DUT=all-clusters app
+          $ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 0 --capabilities 4 --discriminator 3840 --passcode 20202021
+
+          2. Parse onboarding payload using TH=chip-tool
+          $  ./out/chip-tool/chip-tool payload parse-setup-payload MT:-24J0AFN00KA0648G00
+          [1651193251086] [15494:447566] CHIP: [SPL] Parsing base38Representation: MT:-24J0AFN00KA0648G00
+          [1651193251087] [15494:447566] CHIP: [SPL] CommissioningFlow: 2
+          [1651193251087] [15494:447566] CHIP: [SPL] VendorID: 65521
+          [1651193251087] [15494:447566] CHIP: [SPL] Version: 0
+          [1651193251087] [15494:447566] CHIP: [SPL] ProductID: 32769
+          [1651193251087] [15494:447566] CHIP: [SPL] Discriminator: 3840
+          [1651193251087] [15494:447566] CHIP: [SPL] SetUpPINCode: 20202021
+          [1651193251087] [15494:447566] CHIP: [SPL] RendezvousInformation: 4
+      disabled: true
+
+    - label:
+          "Verify that the TH presents User with a URL in the
+          CommissioningCustomFlowUrl field of the DCL. Verify that the
+          CommissioningCustomFlow field is set to a value = 2"
+      verification: |
+          1. Verify CommissioningCustomFlow=1
+          2. Verify CommissioningModeInitialStepsHint contains a valid, non-zero integer
+      disabled: true
+
+    - label:
+          "Follow any steps from the URL provided by the pairing hint in the DCL
+          for putting the DUT Commissionee into commissioning mode"
+      verification: |
+          1. Follow vendor-specific steps from the pairing hint to put DUT into commissioning mode
+
+          2. Verify DUT is advertising in commissioning mode. On DUT,
+
+          $  ./out/chip-tool/chip-tool discover commissionables
+          [1651192893436] [15304:442604] CHIP: [DL] Mdns: OnNewAddress interface: 24 ip:fe80::dea6:32ff:fe8d:6e32
+          [1651192893436] [15304:442604] CHIP: [DIS]         Vendor ID: 65521
+          [1651192893436] [15304:442604] CHIP: [DIS]         Product ID: 32769
+          [1651192893436] [15304:442604] CHIP: [DIS]         Long Discriminator: 3840
+          [1651192893436] [15304:442604] CHIP: [DIS]         Pairing Hint: 33
+          [1651192893436] [15304:442604] CHIP: [DIS]         Hostname: DCA6328D6E320000
+          [1651192893436] [15304:442604] CHIP: [DIS]         Instance Name: 914762134DA8E7D1
+          [1651192893436] [15304:442604] CHIP: [DIS]         IP Address #1: fe80::dea6:32ff:fe8d:6e32
+          [1651192893436] [15304:442604] CHIP: [DIS]         Port: 5540
+          [1651192893436] [15304:442604] CHIP: [DIS]         Commissioning Mode: 1
+          [1651192893436] [15304:442604] CHIP: [DIS]         Mrp Interval idle: 5000 ms
+          [1651192893436] [15304:442604] CHIP: [DIS]         Mrp Interval active: 300 ms
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml
new file mode 100644
index 00000000000000..7b141c0887ce64
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml
@@ -0,0 +1,87 @@
+# 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.1.15. [TC-DD-1.15] Onboarding Payload Verification - Unique Discriminator
+    and Passcode Values [DUT - Commissionee]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Using the TH Onboarding payload reader, scan or read the Onboarding
+          payload from DUT1"
+      verification: |
+          1. Parse payload for DUT1
+
+          $  ./out/chip-tool/chip-tool payload parse-setup-payload MT:-24J0AFN00KA0648G00
+          [1651194471211] [16050:465158] CHIP: [SPL] Parsing base38Representation: MT:-24J0AFN00KA0648G00
+          [1651194471211] [16050:465158] CHIP: [SPL] CommissioningFlow: 0
+          [1651194471211] [16050:465158] CHIP: [SPL] VendorID: 65521
+          [1651194471211] [16050:465158] CHIP: [SPL] Version: 0
+          [1651194471211] [16050:465158] CHIP: [SPL] ProductID: 32769
+          [1651194471211] [16050:465158] CHIP: [SPL] Discriminator: 3840
+          [1651194471211] [16050:465158] CHIP: [SPL] SetUpPINCode: 20202021
+          [1651194471211] [16050:465158] CHIP: [SPL] RendezvousInformation: 4
+      disabled: true
+
+    - label:
+          "Using the TH, parse the Onboarding payload from previous step and
+          verify that the Descriminator and Passcode for DUT1 are present."
+      verification: |
+          DUT1 Descriminator: 3840
+          DUT1 Passcode: 20202021
+      disabled: true
+
+    - label:
+          "Using the TH Onboarding payload reader, scan or read the Onboarding
+          payload from DUT2"
+      verification: |
+          1. Parse payload for DUT2
+
+          $  ./out/chip-tool/chip-tool payload parse-setup-payload MT:-24J0IRV01WCCN68G00
+          [1651194577916] [16053:466154] CHIP: [SPL] Parsing base38Representation: MT:-24J0IRV01WCCN68G00
+          [1651194577916] [16053:466154] CHIP: [SPL] CommissioningFlow: 0
+          [1651194577916] [16053:466154] CHIP: [SPL] VendorID: 65521
+          [1651194577916] [16053:466154] CHIP: [SPL] Version: 0
+          [1651194577916] [16053:466154] CHIP: [SPL] ProductID: 32769
+          [1651194577916] [16053:466154] CHIP: [SPL] Discriminator: 3841
+          [1651194577916] [16053:466154] CHIP: [SPL] SetUpPINCode: 20212022
+          [1651194577916] [16053:466154] CHIP: [SPL] RendezvousInformation: 4
+      disabled: true
+
+    - label:
+          "Using the TH, parse the Onboarding payload from previous step and
+          verify that the Descriminator and Passcode for DUT2 are present."
+      verification: |
+          DUT2 Descriminator: 3841
+          DUT2 Passcode: 20212022
+      disabled: true
+
+    - label:
+          "Compare the Descriminator values for DUT1 (Step 1.b) and DUT2 (Step
+          2.b)"
+      verification: |
+          1. Verify DUT1 Descriminator does not equal DUT2 Descriminator
+      disabled: true
+
+    - label:
+          "Compare the Passcode values for DUT1 (Step 1.b) and DUT2 (Step 2.b)"
+      verification: |
+          1. Verify DUT1 Passcode does not equal DUT2 Passcode
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
index b3fa56f316c5b6..c4560af4571d61 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
@@ -13,7 +13,9 @@
 # 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: 7.1.5. [TC-DD-1.5] NFC Rules of advertisement and Onboarding
+name:
+    3.1.5. [TC-DD-1.5] NFC Rules of Advertisement and Onboarding [DUT -
+    Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -21,13 +23,76 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Step 1"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify that the onboarding payload for NFC tags SHALL use
-                    NDEF URI Record Type Definition as defined by NFC Forum in
-                    URI Record Type Definition RTD URI"
+    - label:
+          "If (PICS_SCAN_NFC), Keep the DUT in packaging and bring in TH NFC
+          scanner close to the DUT packaging."
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "If (PICS_SCAN_NFC), Unpack DUT from its packaging, make sure DUT is
+          not powered on and do not put the DUT in pairing mode. Bring in TH NFC
+          scanner close to the DUTs NFC tag"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "If (PICS_PHYSICAL_TEMPERING, PICS_SCAN_NFC) Power on DUT and do not
+          put the DUT in pairing mode. Bring in TH NFC scanner close to the DUTs
+          NFC tag"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "If (PICS_PHYSICAL_TEMPERING) DUT must have an explicit trigger of the
+          the NFC pairing mode"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "If (PICS_PHYSICAL_TEMPERING, PICS_SCAN_NFC) Power on DUT and put the
+          DUT in pairing mode. Bring in TH NFC scanner close to NFC tag"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "If !(PICS_PHYSICAL_TEMPERING, PICS_SCAN_NFC) Power on DUT. Bring in
+          NFC scanner close to NFC tag"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label: "Wait for the pairing mode to expire on device"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label: "For Read only Tags, try to write using NFC tool a payload to DUT"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "For Programmable Tag, NFC tag must be read only OTA. Try to write a
+          payload to DUT using NFC tool"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "Optional  For Programmable Tag, NFC tag may be reconfigured using
+          wired means"
+      verification: |
+          Vendor specific field verification
+      disabled: true
+
+    - label:
+          "If (PICS_SCAN_NFC), Using TH NFC scanner - read NFC tag Reader type"
+      verification: |
+          Vendor specific field verification
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml
index 5d808f119ee260..940aa0b30061ec 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml
@@ -13,7 +13,7 @@
 # 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: 7.1.6. [TC-DD-1.6] QR Code Format and Label
+name: 3.1.6. [TC-DD-1.6] QR Code Format and Label [DUT - Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -21,30 +21,12 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Step 1"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value: "Scan the DUTs QR code using a QR code reader"
+    - label: "Scan the DUTs QR code using the TH QR code reader"
+      verification: |
+          Vendor specific field testcase
+      disabled: true
 
-    - label: "Step 1 verification"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify the QR code gets scanned successfully and the QR
-                    code must be of sufficient size and contrast respective to
-                    surface material as to be readable with standard readers
-                    such as smartphones in normal lighting conditions"
-
-    - label: "Step 2 verificaiton"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value: "Verify QR code version is 1 or higher"
+    - label: "Verify QR code version"
+      verification: |
+          Vendor specific field verification
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml
index e542d336186649..5b628f19550f9d 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml
@@ -13,7 +13,7 @@
 # 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: 7.1.7. [TC-DD-1.7] Setup Code Format and Label
+name: 3.1.7. [TC-DD-1.7] Setup Code Format and Label [DUT - Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -21,23 +21,7 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Precondition"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify manual pairing code is printed on the device or in
-                    additional provided materials"
-
-    - label: "Step 1"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify that the Manual Pairing Code should be printed using
-                    a minimum font size of 6 points typically producing a
-                    typeface height of 2.1 mm"
+    - label: "Verify using instruments"
+      verification: |
+          Vendor specific field testcase
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
index 7ac218f2d3e103..dabfdb05ea765d 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    7.1.8. [TC-DD-1.8] QR Code Onboarding Payload Verification [DUT -
+    3.1.8. [TC-DD-1.8] QR Code Onboarding Payload Verification [DUT -
     Commissioner]
 
 config:
@@ -23,20 +23,46 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Step 1"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value: "Scan the device QR code using DUT"
+    - label: "If (PICS_SCAN_QR_CODE), Scan the TH Devices QR code using DUT"
+      verification: |
+          1. Get the QR code from the TH
+          ubuntu@matter-7:~/Apr18_dut/connectedhomeip/examples/all-clusters-app/linux/out/all-clusters-app$ sudo ./chip-all-clusters-app --wifi --discriminator 3841
 
-    - label: "Step 1 verification"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify the DUT is able to scan and parse the QR code
-                    successfully to onboard the device onto the CHIP network"
+          CHIP:SPT: PASE PBKDF iterations set to 1000
+          CHIP:SPT: LinuxCommissionableDataProvider didn't get a PASE salt, generating one.
+          CHIP:DL: Device Configuration:
+          CHIP:DL:   Serial Number: TEST_SN
+          CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          CHIP:DL:   Product Id: 32769 (0x8001)
+          CHIP:DL:   Hardware Version: 0
+          CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3841 (0xF01)
+          CHIP:DL:   Manufacturing Date: (not set)
+          CHIP:DL:   Device Type: 65535 (0xFFFF)
+          CHIP:SVR: SetupQRCode: [MT:-24J0CEK01KA0648G00]
+          CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0CEK01KA0648G00
+          CHIP:SVR: Manual pairing code: [34970112332]
+          CHIP:SVR: SetupQRCode: [MT:-24J048N01KA0648G00]
+          CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J048N01KA0648G00
+
+          2. Parse the DUT's QR Code using the TH commissioner: chip-tool
+          ubuntu@matter-7:~/Apr18_cntrl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool payload parse-setup-payload MT:-24J048N01KA0648G00
+
+          [1650266365.939678][10146:10146] CHIP:SPL: CommissioningFlow: 2
+          [1650266365.939704][10146:10146] CHIP:SPL: VendorID: 65521
+          [1650266365.939724][10146:10146] CHIP:SPL: Version: 0
+          [1650266365.939744][10146:10146] CHIP:SPL: ProductID: 32769
+          [1650266365.939763][10146:10146] CHIP:SPL: Discriminator: 3841
+          [1650266365.939782][10146:10146] CHIP:SPL: SetUpPINCode: 20202021
+          [1650266365.939801][10146:10146] CHIP:SPL: RendezvousInformation: 2
+      disabled: true
+
+    - label:
+          "Using the DUT, parse the THs QR code to onboard the TH Device onto
+          the Matter network."
+      verification: |
+          1. With chip-tool as DUT, observe this in the logs to signal the end of parsing when commissioning the TH
+          [1651190089249] [14497:411165] CHIP: [CTL] Successfully finished commissioning step 'ReadCommissioningInfo'
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
index 2faafb4c9659d6..f83e5caaca9f2a 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    7.1.9. [TC-DD-1.9] Manual Pairing Code Payload Verification [DUT -
+    3.1.9. [TC-DD-1.9] Manual Pairing Code Payload Verification [DUT -
     Commissioner]
 
 config:
@@ -23,32 +23,51 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Precondition"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify that the manual pairing code is printed on the
-                    device or in additional provided materials"
-
-    - label: "Step 1"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Provide the 11 digit or 21 digit pairing code from the
-                    Device in text speech or any format supported by DUT"
-
-    - label: "Step 1 verification"
-      cluster: "LogCommands"
-      command: "Log"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Verify that the manual pairing code can be provided to DUT
-                    and parsed to onboard the device onto the CHIP network"
+    - label:
+          "Provide the 11-digit/21-digit Manual Pairing Code from the TH Device
+          in text, speech or any format supported by DUT"
+      verification: |
+          1. Launch all-clusters-app on the raspi , get the Manual Pairing code from the log, Controller should be able to parse the Manual Pairing code
+
+          ubuntu@matter-7:~/Apr18_dut/connectedhomeip/examples/all-clusters-app/linux/out/all-clusters-app$ sudo ./chip-all-clusters-app --wifi --discriminator 3841
+
+          CHIP:SPT: PASE PBKDF iterations set to 1000
+          CHIP:SPT: LinuxCommissionableDataProvider didn't get a PASE salt, generating one.
+          CHIP:DL: Device Configuration:
+          CHIP:DL:   Serial Number: TEST_SN
+          CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          CHIP:DL:   Product Id: 32769 (0x8001)
+          CHIP:DL:   Hardware Version: 0
+          CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3841 (0xF01)
+          CHIP:DL:   Manufacturing Date: (not set)
+          CHIP:DL:   Device Type: 65535 (0xFFFF)
+          CHIP:SVR: SetupQRCode: [MT:-24J0CEK01KA0648G00]
+          CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0CEK01KA0648G00
+          CHIP:SVR: Manual pairing code: [34970112332]
+          CHIP:SVR: SetupQRCode: [MT:-24J048N01KA0648G00]
+           CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+           CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J048N01KA0648G00
+
+
+          ubuntu@matter-7:~/Apr18_cntrl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool payload parse-setup-payload 34970112332
+          CHIP:SPL: Parsing decimalRepresentation: 34970112332
+          CHIP:SPL: CommissioningFlow: 0
+          CHIP:SPL: VendorID: 0
+          CHIP:SPL: Version: 0
+          CHIP:SPL: ProductID: 0
+          CHIP:SPL: Discriminator: 3840
+          CHIP:SPL: SetUpPINCode: 20202021
+          CHIP:SPL: RendezvousInformation: 0
+
+          ubuntu@matter-7:~/Apr18_cntrl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool payload parse-setup-payload 749701123365521327694
+          CHIP:SPL: Parsing decimalRepresentation: 749701123365521327694
+          CHIP:SPL: CommissioningFlow: 2
+          CHIP:SPL: VendorID: 65521
+          CHIP:SPL: Version: 0
+          CHIP:SPL: ProductID: 32769
+          CHIP:SPL: Discriminator: 3840
+          CHIP:SPL: SetUpPINCode: 20202021
+          CHIP:SPL: RendezvousInformation: 0
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
index da97a89439f93d..3edd1c31b9539d 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
@@ -13,7 +13,7 @@
 # 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: 7.3.1. [TC-DD-3.1] Commissioning Flow - Concurrent
+name: 3.3.1. [TC-DD-3.1] Commissioning Flow - Concurrent [DUT - Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -186,8 +186,6 @@ tests:
 
           Output of this command in cell number I6 and J6 due to cell constraint of maximum size.
 
-
-
           controller> sudo ./chip-tool basic read product-name 0x000000000001B669 0
 
           ,,
@@ -198,99 +196,188 @@ tests:
           Establishment on the commissioning channel"
       verification: |
           Verify that the responder receives the PBKDFParamRequest message
+          Check on DUT:
+          CHIP:SC: Received PBKDF param request
+          CHIP:SC: Peer assigned session ID 18450
+          CHIP:SC: Found MRP parameters in the message
+          CHIP:SC: Including MRP parameters in PBKDF param response
+          CHIP:EM: Piggybacking Ack for MessageCounter:850320430 on exchange: 63762r
+          CHIP:IN: Prepared unauthenticated message 0xaaaaad340560 to 0x0000000000000000 (0)  of type 0x21 and protocolId (0, 0) on exchange 63762r with MessageCounter:1341084110.
+          CHIP:IN: Sending unauthenticated msg 0xaaaaad340560 with MessageCounter:1341084110 to 0x0000000000000000 at monotonic time: 0000000000FBA380 msec
+          CHIP:SC: Sent PBKDF param response
       disabled: true
 
     - label:
-          "Commissioner arms Fail-safe timer on the Commissionee using
-          ArmFailSafe command"
-      verification: |
-          Verify you get Received ArmFailSafe response on TH
-      disabled: true
-
-    - label:
-          "Commissioner SHALL configure at the Commissionee UTC time, timezone,
-          DST offset, and regulatory information at the Commissionee."
+          "Commissioner SHALL re-arm Fail-safe timer on Commissionee within 60s
+          (the autonomously Fail-safe timer length set by Commissionee)"
       verification: |
+          Verify on DUT:
 
+          CHIP:DL: NVS set: chip-config/fail-safe-armed = true
       disabled: true
 
     - label:
-          "Commissioner establishes the authenticity of the Commissionee as a
-          certified CHIP device."
+          "If (PICS_WIFI) or (PICS_THREAD), Commissioner SHALL configure
+          regulatory information in the Commissionee."
       verification: |
-
-      disabled: true
-
-    - label:
-          "Commissioner configures Fabric information using SetFabric command."
-      verification: |
-
+          Need chip-tool implementation
       disabled: true
 
     - label:
           "Commissioner requests operational CSR from Commissionee with
           OperationalCSRRequest command"
       verification: |
+          Verify the following on TH after commissioning
 
-      disabled: true
-
-    - label:
-          "Commissioner generates or otherwise obtains an Operational
-          Certificate containing Operational ID in response
-          OperationalCSRRequest command using ecosystem-specific means"
-      verification: |
-
-      disabled: true
-
-    - label: "Commissioner configures operational credentials"
-      verification: |
+          [1646909537.102263][3145:3150] CHIP:CTL: Received Attestation Information from the device
+          [1646909537.102418][3145:3150] CHIP:CTL: Verifying attestation
+          [1646909537.115081][3145:3150] CHIP:CTL: Successfully validated 'Attestation Information' command received from the device.
 
+          Verify on DUT:
+          CHIP:ZCL: OpCreds: commissioner has requested a CSR
+          CHIP:ZCL: OpCreds: NewCertificateSigningRequest returned ../../third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1114: Success
       disabled: true
 
-    - label: "Commissioner configures ACL."
+    - label:
+          "Commissioner configures operational credentials on DUT if not
+          previously installed"
       verification: |
-
+          Verify on DUT:
+
+          CHIP:CTL: Performing next commissioning step 'SendTrustedRootCert'
+          CHIP:CTL: Sending root certificate to the device
+          CHIP:DMG: ICR moving to [AddingComm]
+          CHIP:DMG: ICR moving to [AddedComma]
+          CHIP:IN: Prepared secure message 0xaaaafc0d5be8 to 0x000000000001B669 (1)  of type 0x8 and protocolId (0, 1) on exchange 63770i with MessageCounter:695615.
+          CHIP:IN: Sending encrypted msg 0xaaaafc0d5be8 with MessageCounter:695615 to 0x000000000001B669 (1) at monotonic time: 0000000000FBA3DE msec
+          CHIP:DMG: ICR moving to [CommandSen]
+          CHIP:CTL: Sent root certificate to the device
       disabled: true
 
     - label:
-          "Commissioner configures the operational network at the Commissionee."
+          "Commissioner configures itself as administrator in ACL on DUT if
+          needed"
       verification: |
-
+          Verify the following on TH after commissioning
+
+          [1646909537.115328][3145:3150] CHIP:CTL: Sending CSR request to 0xffffac001730 device
+          [1646909537.115512][3145:3150] CHIP:DMG: ICR moving to [AddingComm]
+          [1646909537.115589][3145:3150] CHIP:DMG: ICR moving to [AddedComma]
+          [1646909537.115861][3145:3150] CHIP:IN: Prepared secure message 0xffffb67cbd98 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 7731i with MessageCounter:8191681.
+          [1646909537.115959][3145:3150] CHIP:IN: Sending encrypted msg 0xffffb67cbd98 with MessageCounter:8191681 to 0x0000000000000001 (1) at monotonic time: 10877964 msec
+          [1646909537.116173][3145:3150] CHIP:DMG: ICR moving to [CommandSen]
+          [1646909537.116242][3145:3150] CHIP:CTL: Sent CSR request, waiting for the CSR
+          [1646909537.116356][3145:3150] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1646909537.193355][3145:3150] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1646909537.241579][3145:3148] CHIP:DL: Indication received, conn = 0xffffa803b310
+          [1646909537.241838][3145:3150] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1646909537.341266][3145:3148] CHIP:DL: Indication received, conn = 0xffffa803b310
+          [1646909537.341523][3145:3150] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1646909537.341903][3145:3150] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:2304337 on exchange 7731i
+          [1646909537.341988][3145:3150] CHIP:EM: Found matching exchange: 7731i, Delegate: 0xffffa8026ab0
+          [1646909537.342086][3145:3150] CHIP:DMG: ICR moving to [ResponseRe]
+          [1646909537.342191][3145:3150] CHIP:DMG: InvokeResponseMessage =
+          [1646909537.342251][3145:3150] CHIP:DMG: {
+          [1646909537.342310][3145:3150] CHIP:DMG:         suppressResponse = false,
+          [1646909537.342370][3145:3150] CHIP:DMG:         InvokeResponseIBs =
+          [1646909537.342450][3145:3150] CHIP:DMG:         [
+          [1646909537.342511][3145:3150] CHIP:DMG:                 InvokeResponseIB =
+          [1646909537.342598][3145:3150] CHIP:DMG:                 {
+          [1646909537.342662][3145:3150] CHIP:DMG:                         CommandDataIB =
+          [1646909537.342749][3145:3150] CHIP:DMG:                         {
+          [1646909537.342832][3145:3150] CHIP:DMG:                                 CommandPathIB =
+          [1646909537.342915][3145:3150] CHIP:DMG:                                 {
+          [1646909537.342998][3145:3150] CHIP:DMG:                                         EndpointId = 0x0,
+          [1646909537.343091][3145:3150] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1646909537.343177][3145:3150] CHIP:DMG:                                         CommandId = 0x5,
+          [1646909537.343262][3145:3150] CHIP:DMG:                                 },
+          [1646909537.343346][3145:3150] CHIP:DMG:
+          [1646909537.343420][3145:3150] CHIP:DMG:                                 CommandData =
+          [1646909537.343548][3145:3150] CHIP:DMG:                                 {
+          [1646909537.343632][3145:3150] CHIP:DMG:                                         0x0 = [
+          [1646909537.343772][3145:3150] CHIP:DMG:                                                 0x15, 0x30, 0x1, 0xcb, 0x30, 0x81, 0xc8, 0x30, 0x70, 0x2, 0x1, 0x0, 0x30, 0xe, 0x31, 0xc, 0x30, 0xa, 0x6, 0x3, 0x55, 0x4, 0xa, 0xc, 0x3, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86
+          [1646909537.343880][3145:3150] CHIP:DMG:                                 ]
+          [1646909537.343968][3145:3150] CHIP:DMG:                                         0x1 = [
+          [1646909537.344094][3145:3150] CHIP:DMG:                                                 0xbd, 0xef, 0xb7, 0x8c, 0x5, 0x95, 0x9b, 0x60, 0xf4, 0xb1, 0xf7, 0x9c, 0x24, 0x50, 0x51, 0x9c, 0x59, 0x46, 0x97, 0x5e, 0x89, 0xe8, 0x7d, 0x29, 0x88, 0xac, 0x45, 0xed, 0xa6, 0xca, 0xac, 0x55, 0x2a, 0x7e, 0x11, 0x71, 0xe9, 0x68, 0x0, 0x91, 0xe, 0x23,
+          [1646909537.344193][3145:3150] CHIP:DMG:                                 ]
+          [1646909537.344274][3145:3150] CHIP:DMG:                                 },
+          [1646909537.344349][3145:3150] CHIP:DMG:                         },
+          [1646909537.344442][3145:3150] CHIP:DMG:
+          [1646909537.344508][3145:3150] CHIP:DMG:                 },
+          [1646909537.344588][3145:3150] CHIP:DMG:
+          [1646909537.344646][3145:3150] CHIP:DMG:         ],
+          [1646909537.344721][3145:3150] CHIP:DMG:
+          [1646909537.344779][3145:3150] CHIP:DMG:         InteractionModelRevision = 1
+          [1646909537.344837][3145:3150] CHIP:DMG: },
+          [1646909537.344985][3145:3150] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
+          [1646909537.345068][3145:3150] CHIP:CTL: Received certificate signing request from the device
+          [1646909537.345139][3145:3150] CHIP:CTL: Getting certificate chain for the device from the issuer
+          [1646909537.347800][3145:3150] CHIP:CTL: Verifying Certificate Signing Request
+          [1646909537.349300][3145:3150] CHIP:CTL: Generating NOC
+          [1646909537.350268][3145:3150] CHIP:CTL: Providing certificate chain to the commissioner
+          [1646909537.350347][3145:3150] CHIP:CTL: Received callback from the CA for NOC Chain generation. Status ../../third_party/connectedhomeip/src/controller/ExampleOperationalCredentialsIssuer.cpp:225: Success
       disabled: true
 
     - label:
-          "Commissioner triggers the Commissionee to connect to the operational
-          network"
+          "Commissioner configures operational network on DUT if DUT both
+          supports and requires"
       verification: |
-
+          see above
       disabled: true
 
     - label:
-          "Commissioner and Commissionee discover each other on the operational
-          network using operational discovery"
+          "Commissioner instructs Commissionee to connect to operational network
+          if not already connected"
       verification: |
+          Verify the following on TH after commissioning
 
+          [1646909537.976592][3145:3150] CHIP:CTL: Operational credentials provisioned on device 0xffffac001730
+          [1646909537.976664][3145:3150] CHIP:TOO: Secure Pairing Success
       disabled: true
 
-    - label: "Commissioner and Commissionee establish encryption keys with CASE"
+    - label: "Commissioner starts discovery of DUT using Operational Discovery"
       verification: |
-
+          Verify the following on TH:
+
+          CHIP:DIS: Resolving BFCBED670D527591:000000000001B669 ...
+          CHIP:DIS: Operational node lookup already in progress. Will NOT start a new one.
+          CHIP:DMG: ICR moving to [AwaitingDe]
+          CHIP:EM: Sending Standalone Ack for MessageCounter:9439913 on exchange 63771i
+          CHIP:IN: Prepared secure message 0xffffa1c07938 to 0x000000000001B669 (1)  of type 0x10 and protocolId (0, 0) on exchange 63771i with MessageCounter:695619.
+          CHIP:IN: Sending encrypted msg 0xffffa1c07938 with MessageCounter:695619 to 0x000000000001B669 (1) at monotonic time: 0000000000FBA446 msec
+          CHIP:EM: Flushed pending ack for MessageCounter:9439913 on exchange 63771i
+          CHIP:DL: Avahi resolve found
+          CHIP:DIS: Node ID resolved for BFCBED670D527591:000000000001B669
+          CHIP:DIS:     Addr 0: [fe80::dea6:32ff:feba:b3f7]:5540
       disabled: true
 
     - label:
-          "Commissioner and Commissionee perform commissioning complete message
-          exchange using CommissioningComplete command and
-          CommissioningCompleteResponse command"
+          "Commissioner opens a CASE session with DUT over operational network"
       verification: |
+          Verify the following on DUT:
 
+          CHIP:IN: CASE Session established. Setting up the secure channel.
+          CHIP:IN: New secure session created for device 0x000000000001B669, LSID:25250 PSID:18451!
+          CHIP:IN: CASE secure channel is available now.
+          CHIP:IN: CASE Server enabling CASE session setups
       disabled: true
 
-    - label: "Same steps as 1.a-1.o. Force Fail any step between 1.a and 1.j."
+    - label: "Commissioner sends CommissioningComplete command"
       verification: |
+          Verify the following on TH:
 
+          CHIP:CTL: Received CommissioningComplete response
       disabled: true
 
-    - label: "Same steps as 1.a. Force Fail any step between 1.k and 1.o"
+    - label:
+          "Commissioning channel between the Commissioner and Commissionee is
+          terminated."
       verification: |
+          Verify the following on TH:
 
+          CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          CHIP:CTL: Performing next commissioning step 'Cleanup'
+          CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          CHIP:TOO: Device commissioning completed with success
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
index 25afdc206a11b1..d48c8709a9d935 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
@@ -13,7 +13,9 @@
 # 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: 7.3.11. [TC-DD-3.11] Commissioning Flow - QR Code [DUT - Commissioner]
+name:
+    3.3.11. [TC-DD-3.11] Commissioning Flow = 0 (Standard Flow) - QR Code [DUT -
+    Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -22,223 +24,126 @@ config:
 
 tests:
     - label:
-          "Version: Use a QR code from a commissionee that has their QR code
-          Version bit string set to 000"
+          "If (PICS_DT_BLE), Standard Commissioning Flow: Use a Commissionee
+          with a QR code that has the Custom Flow field set to 0 and supports
+          BLE for its Discovery Capability. Ensure the Version bit string
+          follows the current Matter spec. documentation."
       verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 2 -dv 3840 -ps 20202021
-          2022-02-25 23:28:06 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-25 23:28:06 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J042C00KA0648G00]
-      disabled: true
-
-    - label:
-          "Scan the QR code from the previous step using the DUT. Follow any
-          manufacturer-specific steps needed for the Commissioner/Commissionee
-          to complete the commissioning process."
-      verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-
+          $ ./out/ble/all-clusters-app/chip-all-clusters-app --capabilities 2
           ...
-
-          [1645836234938] [9239:26087760] CHIP: [DMG] Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1645836234938] [9239:26087760] CHIP: [CTL] Received CommissioningComplete response
-          [1645836234938] [9239:26087760] CHIP: [CTL] Rendezvous cleanup
-          [1645836234938] [9239:26087760] CHIP: [TOO] Device commissioning completed with success
-
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-
-          [1645836235.102593][8174:8174] CHIP:EM: Piggybacking Ack for MessageCounter:9602810 on exchange: 9753r
-          [1645836235.102654][8174:8174] CHIP:IN: Prepared secure message 0xaaaae5bbed98 to 0x000000000001B669 (1)  of type 0x9 and protocolId (0, 1) on exchange 9753r with MessageCounter:12855769.
-          [1645836235.102698][8174:8174] CHIP:IN: Sending encrypted msg 0xaaaae5bbed98 with MessageCounter:12855769 to 0x000000000001B669 (1) at monotonic time: 25637371 msec
-          [1645836235.102836][8174:8174] CHIP:DMG: ICR moving to [CommandSen]
-          [1645836235.102863][8174:8174] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1645836235.102906][8174:8174] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1645836235.102932][8174:8174] CHIP:SVR: Commissioning completed successfully
+          [1651101335.714230][22353:22353] CHIP:DL: Device Configuration:
+          [1651101335.722064][22353:22353] CHIP:DL:   Serial Number: TEST_SN
+          [1651101335.722638][22353:22353] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651101335.723167][22353:22353] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651101335.723712][22353:22353] CHIP:DL:   Hardware Version: 0
+          [1651101335.724228][22353:22353] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651101335.724756][22353:22353] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651101335.725226][22353:22353] CHIP:DL:   Manufacturing Date: (not set)
+          [1651101335.725721][22353:22353] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651101335.733693][22353:22353] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651101335.734598][22353:22353] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
+          [1651101335.735182][22353:22353] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          [1651101335.735618][22353:22353] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
       disabled: true
 
     - label:
-          "If (PICS_DT_THREAD), Standard Commissioning Flow: Use a QR code from
-          a commissionee that has their Custom Flow bit set to 0 and supports
-          BLE for its Discovery Capability."
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 2 -dv 3840 -ps 20202021
-          2022-02-25 23:28:06 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-25 23:28:06 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J042C00KA0648G00]
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_DT_THREAD), Scan the QR code from the previous step using
-          the DUT. Follow any steps needed for the Commissioner/Commissionee to
-          complete the commissioning process using BLE"
-      verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-
-          ...
-
-          [1645836234938] [9239:26087760] CHIP: [DMG] Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1645836234938] [9239:26087760] CHIP: [CTL] Received CommissioningComplete response
-          [1645836234938] [9239:26087760] CHIP: [CTL] Rendezvous cleanup
-          [1645836234938] [9239:26087760] CHIP: [TOO] Device commissioning completed with success
-
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-
-          [1645836235.102593][8174:8174] CHIP:EM: Piggybacking Ack for MessageCounter:9602810 on exchange: 9753r
-          [1645836235.102654][8174:8174] CHIP:IN: Prepared secure message 0xaaaae5bbed98 to 0x000000000001B669 (1)  of type 0x9 and protocolId (0, 1) on exchange 9753r with MessageCounter:12855769.
-          [1645836235.102698][8174:8174] CHIP:IN: Sending encrypted msg 0xaaaae5bbed98 with MessageCounter:12855769 to 0x000000000001B669 (1) at monotonic time: 25637371 msec
-          [1645836235.102836][8174:8174] CHIP:DMG: ICR moving to [CommandSen]
-          [1645836235.102863][8174:8174] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1645836235.102906][8174:8174] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1645836235.102932][8174:8174] CHIP:SVR: Commissioning completed successfully
-      disabled: true
-
-    - label:
-          "Standard Commissioning Flow: Use a QR code from a commissionee that
-          has their Custom Flow bit set to 0 and supports IP Network for its
-          Discovery Capability."
-      verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:07:29 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:07:29 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J0AFN00KA0648G00]
-      disabled: true
-
-    - label:
-          "Scan the QR code from the previous step using the DUT. Follow any
-          steps needed for the Commissioner/Commissionee to complete the
-          commissioning process using IP Network"
-      verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-
-          ...
-
-          [1646261423084] [53218:29382487] CHIP: [CTL] Received CommissioningComplete response
-          [1646261423084] [53218:29382487] CHIP: [CTL] Rendezvous cleanup
-          [1646261423084] [53218:29382487] CHIP: [TOO] Device commissioning completed with success
-
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-
-          [1646261423.249620][28366:28366] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1646261423.249687][28366:28366] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1646261423.249738][28366:28366] CHIP:SVR: Commissioning completed successfully
-      disabled: true
-
-    - label:
-          "User-Intent Commissioning Flow: Use a QR code from a commissionee
-          that has their Custom Flow bit set to 1 and supports BLE for its
-          Discovery Capability. Place the commissionee into commissioning mode
-          according to the devices specified instructions in its pairing hint."
-      verification: |
-          BLOCKED
-
-          chip-all-clusters-app does not currently support User-Intent commissioning flow
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 1 -dc 2 -dv 3840 -ps 20202021
-          2022-02-26 03:17:50 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:17:50 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J00ID00KA0648G00]
-      disabled: true
-
-    - label:
-          "Scan the QR code from the previous step using the DUT. Follow any
+          "If (PICS_DT_BLE), Using the DUT, parse the THs QR code and follow any
           steps needed for the Commissioner/Commissionee to complete the
           commissioning process using BLE"
       verification: |
-          BLOCKED
+          TH Commissionee:
+
+          [1651101510.975272][22353:22353] CHIP:SVR: Commissioning completed successfully
+          [1651101510.975318][22353:22353] CHIP:DIS: Updating services using commissioning mode 0
 
-          chip-all-clusters-app does not currently support User-Intent commissioning flow
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1  MT:-24J042C00KA0648G00
+
+          [1651101510810] [94338:65557180] CHIP: [CTL] Received CommissioningComplete response
+          [1651101510810] [94338:65557180] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651101510810] [94338:65557180] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651101510810] [94338:65557180] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651101510810] [94338:65557180] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651101510810] [94338:65557180] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
     - label:
-          "User-Intent Commissioning Flow: Use a QR code from a commissionee
-          that has their Custom Flow bit set to 1 and supports IP Network for
-          its Discovery Capability. Place the commissionee into Commissioning
-          Mode according to the devices specified instructions in its pairing
-          hint."
+          "If (PICS_DT_IP), Standard Commissioning Flow: Use a Commissionee with
+          a QR code that has the Custom Flow field set to 0, supports IP Network
+          for its Discovery Capability and is already on the same IP network as
+          the DUT commissioner. Ensure the Version bit string follows the
+          current Matter spec. documentation."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app does not currently support User-Intent commissioning flow
+          $ ./out/all-clusters-app/chip-all-clusters-app --custom-flow 0 --capabilities 4
+
+          [1651105420.610637][27312:27312] CHIP:DL: Device Configuration:
+          [1651105420.610695][27312:27312] CHIP:DL:   Serial Number: TEST_SN
+          [1651105420.610727][27312:27312] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651105420.610761][27312:27312] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651105420.610792][27312:27312] CHIP:DL:   Hardware Version: 0
+          [1651105420.610815][27312:27312] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651105420.610836][27312:27312] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651105420.610864][27312:27312] CHIP:DL:   Manufacturing Date: (not set)
+          [1651105420.610886][27312:27312] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651105420.610907][27312:27312] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651105420.610962][27312:27312] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
       disabled: true
 
     - label:
-          "Scan the QR code from the previous step using the DUT. Follow any
-          manufacturer-specific steps needed for the Commissioner/Commissionee
-          to complete the commissioning process using IP Network"
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app does not currently support User-Intent commissioning flow
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 1 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:19:10 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:19:10 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J06VO00KA0648G00]
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_DT_THREAD), Custom Commissioning Flow: Use a QR code from a
-          commissionee that has their Custom Flow bit set to 2 and supports BLE
-          for its Discovery Capability. Place the commissionee into
-          commissioning mode according to the devices specified instructions in
-          the given URL."
+          "If (PICS_DT_IP), Using the DUT, parse the THs QR code and follow any
+          steps needed for the Commissioner/Commissionee to complete the
+          commissioning process using IP Network"
       verification: |
-          BLOCKED
+          TH Commissionee:
 
-          chip-all-clusters-app does not currently support Custom Commissioning Flow
+          [1651105530.973166][27371:27371] CHIP:SVR: Commissioning completed successfully
+          [1651105530.973215][27371:27371] CHIP:DIS: Updating services using commissioning mode 0
 
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 2 -dc 2 -dv 3840 -ps 20202021
-          2022-02-26 03:20:27 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [749701123365521327694]
-          2022-02-26 03:20:27 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J0YXE00KA0648G00]
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0AFN00KA0648G00
+
+          [1651105530854] [95067:65607294] CHIP: [CTL] Received CommissioningComplete response
+          [1651105530854] [95067:65607294] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651105530854] [95067:65607294] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651105530854] [95067:65607294] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651105530854] [95067:65607294] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651105530854] [95067:65607294] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
     - label:
-          "If (PICS_DT_THREAD), Scan the QR code from the previous step using
-          the DUT. Follow any manufacturer-specific steps needed for the
-          Commissioner/Commissionee to complete the commissioning process using
-          BLE"
+          "If (PICS_DT_SOFTAP), Standard Commissioning Flow: Use a Commissionee
+          with a QR code that has the Custom Flow field set to 0 and supports
+          SoftAP for its Discovery Capability. Ensure the Version bit string
+          follows the current Matter spec. documentation."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app does not currently support Custom Commissioning Flow
+          BLOCKED: SoftAP commissioning not currently supported
       disabled: true
 
     - label:
-          "If (PICS_DT_THREAD), Custom Commissioning Flow: Use a QR code from a
-          commissionee that has their Custom Flow bit set to 2 and supports IP
-          Network for its Discovery Capability. Place the commissionee into
-          commissioning mode according to the devices specified instructions in
-          the given URL."
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app does not currently support Custom Commissioning Flow
-
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 2 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:22:27 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [749701123365521327694]
-          2022-02-26 03:22:27 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J029Q00KA0648G00]
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_DT_THREAD), Scan the QR code from the previous step using
-          the DUT. Follow any manufacturer-specific steps needed for the
-          Commissioner/Commissionee to complete the commissioning process using
-          IP Network"
+          "If (PICS_DT_SOFTAP), Using the DUT, parse the THs QR code and follow
+          any steps needed for the Commissioner/Commissionee to complete the
+          commissioning process using SoftAP"
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app does not currently support Custom Commissioning Flow
+          BLOCKED: SoftAP commissioning not currently supported
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
index 6be2ba4feeb538..cca0fe070a3ef5 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
@@ -14,8 +14,8 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    7.3.12. [TC-DD-3.12] Commissioning Flow - QR Code - Negative scenario [DUT -
-    Commissioner]
+    3.3.12. [TC-DD-3.12] Commissioning Flow = 1 (User-Intent Flow) - QR Code
+    [DUT - Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -23,338 +23,145 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Locate and scan the Commissionees QR code using DUT"
-      verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...[1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
-      disabled: true
-
     - label:
-          "Version String: Using the QR code from Step 1, generate a new QR code
-          but substituting out the current Version String with an invalid
-          Version String (i.e. ''001'' or any non-zero 3-bit value)"
-      verification: |
-          chip-device-ctrl > setup-payload generate -vr 001 -vi 65521 -pi 32769 -cf 0 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:40:59 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:40:59 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:.24J0AFN00KA0648G00]
-      disabled: true
-
-    - label: "Scan the QR code, generated in the previous step, using the DUT"
+          "If (PICS_DT_BLE), User-Intent Commissioning Flow: Use a Commissionee
+          with a QR code that has the Custom Flow field set to 1 and supports
+          BLE for its Discovery Capability. Commissionee is NOT in commissioning
+          mode. Ensure the Version bit string follows the current Matter spec.
+          documentation."
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:.24J0AFN00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
+          $ ./out/ble/all-clusters-app/chip-all-clusters-app --capabilities 2 --custom-flow 1
           ...
-          DUT has not commissioned the TH to the Matter network
+          [1651101726.415743][23212:23212] CHIP:DL: Device Configuration:
+          [1651101726.415810][23212:23212] CHIP:DL:   Serial Number: TEST_SN
+          [1651101726.415845][23212:23212] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651101726.415880][23212:23212] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651101726.415911][23212:23212] CHIP:DL:   Hardware Version: 0
+          [1651101726.415933][23212:23212] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651101726.415954][23212:23212] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651101726.415983][23212:23212] CHIP:DL:   Manufacturing Date: (not set)
+          [1651101726.416004][23212:23212] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651101726.416046][23212:23212] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651101726.416115][23212:23212] CHIP:SVR: SetupQRCode: [MT:-24J00ID00KA0648G00]
       disabled: true
 
     - label:
-          "VID/PID: Using the QR code from Step 1, generate a new QR code but
-          substituting out the current VID/PID with an invalid VID/PID (i.e. add
-          1 to each of the VID and PID values so that they are different from
-          the valid 16-bit values)"
-      verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65522 -pi 32770 -cf 1 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:42:39 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:42:39 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:86PS06VO00KA0648G00]
-      disabled: true
-
-    - label: "Scan the QR code, generated in the previous step, using the DUT"
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          chip-tool does not prevent commissioning because of invalid VID/PID values. This is handled after the commissioning process.
-          This test step is not valid and is addressed in PR#893
-
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:86PS06VO00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_DT_STANDARD_COMM_FLOW), Using the QR code from Step 1,
-          generate a new QR code using all the same Onboarding Payload
-          components except for the Custom Flow bit, set it to 0: Standard
-          Commissioning Flow"
+          "If (PICS_DT_BLE), DUT parses QR code and DUT presents User with a
+          pairing hint."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over BLE when the discovery capability should not be advertising with capabilites set to '0'
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 2 -dv 3840 -ps 20202021
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J042C00KA0648G00]
+          1. Follow the steps given in the TH's pairing hint to allow for commissioning to happen. TH should not be commissioned until these steps were followed and indicate DUT can proceed with commissioning the TH to the Matter network
       disabled: true
 
     - label:
-          "If (PICS_DT_STANDARD_COMM_FLOW), Scan the QR code, generated in the
-          previous step, using the DUT"
+          "If (PICS_DT_BLE), Follow any steps from the resources provided by the
+          pairing hint for putting the TH Commissionee into commissioning mode
+          and to complete the commissioning process using BLE."
       verification: |
-          BLOCKED
+          TH Commissionee:
+          [1651101988.943015][23212:23212] CHIP:SVR: Commissioning completed successfully
+          [1651101988.943058][23212:23212] CHIP:DIS: Updating services using commissioning mode 0
 
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over BLE when the discovery capability should not be advertising with capabilites set to '0'
 
           DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
-      disabled: true
-
-    - label:
-          "If (PICS_DT_USER_INTENT_COMM_FLOW), Using the QR code from Step 1,
-          generate a new QR code using all the same Onboarding Payload
-          components except for the Custom Flow bit, set it to 1: User-Intent
-          Commissioning Flow"
-      verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 1 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:42:39 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:42:39 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J06VO00KA0648G00]
-      disabled: true
-
-    - label:
-          "If (PICS_DT_USER_INTENT_COMM_FLOW), Scan the QR code, generated in
-          the previous step, using the DUT"
-      verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J06VO00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
-      disabled: true
-
-    - label:
-          "If (PICS_DT_CUSTOM_COMM_FLOW), Using the QR code from Step 1,
-          generate a new QR code using all the same Onboarding Payload
-          components except for the Custom Flow bit, set it to 2: Custom
-          Commissioning Flow"
-      verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 2 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:46:32 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [749701123365521327694]
-          2022-02-26 03:46:32 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J029Q00KA0648G00]
-      disabled: true
-
-    - label:
-          "If (PICS_DT_CUSTOM_COMM_FLOW), Scan the QR code, generated in the
-          previous step, using the DUT"
-      verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J029Q00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
-      disabled: true
-
-    - label:
-          "Custom Flow - Reserved: Using the QR code from Step 1, generate a new
-          QR code using all the same Onboarding Payload components except for
-          the Custom Flow bit, set it to 3: Reserved"
-      verification: |
-          NEED SUPPORT: Unable to generate invalid QR code
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 3 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:48:59 matter-te-6 chip.SPL[22108] ERROR Invalid Custom Flow
-          Chip Stack Error 47
-      disabled: true
+          $ ./out/chip-tool/chip-tool pairing qrcode 1  MT:-24J00ID00KA0648G00
 
-    - label: "Scan the QR code, generated in the previous step, using the DUT"
-      verification: |
-          NEED SUPPORT: Unable to generate invalid QR code in previous step
+          [1651101988809] [94439:65564515] CHIP: [CTL] Received CommissioningComplete response
+          [1651101988809] [94439:65564515] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651101988809] [94439:65564515] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651101988809] [94439:65564515] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651101988809] [94439:65564515] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651101988809] [94439:65564515] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
     - label:
-          "If (PICS_DT_BLE), Using the QR code from Step 1, generate a new QR
-          code using all the same Onboarding Payload components except for the
-          Discovery Capability bit string, set it to BLE for discovery"
+          "If (PICS_DT_IP), User-Intent Commissioning Flow: Use a Commissionee
+          with a QR code that has the Custom Flow field set to 1 and supports IP
+          Network for its Discovery Capability. Commissionee is NOT in
+          commissioning mode. Ensure the Version bit string follows the current
+          Matter spec. documentation."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over BLE when the discovery capability should not be advertising with capabilites set to '0'
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 2 -dv 3840 -ps 20202021
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J042C00KA0648G00]
+          $ ./out/all-clusters-app/chip-all-clusters-app --custom-flow 1 --capabilities 4
+          [1651105004.718882][27096:27096] CHIP:DL: Device Configuration:
+          [1651105004.718943][27096:27096] CHIP:DL:   Serial Number: TEST_SN
+          [1651105004.718975][27096:27096] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651105004.719010][27096:27096] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651105004.719040][27096:27096] CHIP:DL:   Hardware Version: 0
+          [1651105004.719062][27096:27096] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651105004.719083][27096:27096] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651105004.719111][27096:27096] CHIP:DL:   Manufacturing Date: (not set)
+          [1651105004.719133][27096:27096] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651105004.719153][27096:27096] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651105004.719209][27096:27096] CHIP:SVR: SetupQRCode: [MT:-24J06VO00KA0648G00]
       disabled: true
 
     - label:
-          "If (PICS_DT_BLE), Scan the QR code, generated in the previous step,
-          using the DUT"
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over BLE when the discovery capability should not be advertising with capabilites set to '0'
-
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_DT_IP), Using the QR code from Step 1, generate a new QR
-          code using all the same Onboarding Payload components except for the
-          Discovery Capability bit string, set it to IP Network for discovery"
+          "If (PICS_DT_IP), DUT parses QR code and DUT presents User with a
+          pairing hint."
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over IP when the discovery capability should not be advertising with capabilites set to '0'
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:58:28 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:58:28 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J0AFN00KA0648G00]
-      disabled: true
-
-    - label: "If (PICS_DT_IP), Repeat Step 5.b"
-      verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over IP when the discovery capability should not be advertising with capabilites set to '0'
-
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J0AFN00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          1. Follow the steps given in the TH's pairing hint to allow for commissioning to happen. TH should not be commissioned until these steps were followed and indicate DUT can proceed with commissioning the TH to the Matter network
       disabled: true
 
     - label:
-          "Discovery Capability - Reserved: Using the QR code from Step 1,
-          generate a new QR code using all the same Onboarding Payload
-          components except for the Discovery Capability bit string, set it to
-          non-zeros"
-      verification: |
-          NEED SUPPORT
-
-          Unable to generate fals QR codes with discovery capability set to an invalid number (i.e. 8 or above for chip-device-ctrl)
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 8 -dv 3840 -ps 20202021
-          2022-03-05 00:31:33 matter-te-6 chip.SPL[394173] INFO Manual pairing code: [34970112332]
-          Chip Stack Error 47
-      disabled: true
-
-    - label: "Scan the QR code, generated in the previous step, using the DUT"
+          "If (PICS_DT_IP), Follow any steps from the resources provided by the
+          pairing hint for putting the TH Commissionee into commissioning mode
+          and to complete the commissioning process using IP Network."
       verification: |
-          NEED SUPPORT
-
-          Unable to generate false QR codes with discovery capability set to an invalid number (i.e. 8 or above for chip-device-ctrl)
+          TH all-clusters-app:
+          [1651105158.168056][27096:27096] CHIP:SVR: Commissioning completed successfully
+          [1651105158.168100][27096:27096] CHIP:DIS: Updating services using commissioning mode 0
 
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          DUT chip-tool:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1  MT:-24J06VO00KA0648G00
+          [1651105158065] [95045:65602272] CHIP: [CTL] Received CommissioningComplete response
+          [1651105158065] [95045:65602272] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651105158065] [95045:65602272] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651105158065] [95045:65602272] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651105158065] [95045:65602272] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651105158065] [95045:65602272] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
     - label:
-          "Passcode: Using the QR code from Step 1, generate a new QR code using
-          all the same Onboarding Payload components except for the Passcode.
-          For each passcode in the following list, set the Passcode component to
-          one of the invalid Passcodes and generate a new QR code using all the
-          same Onboarding Payload components and one Passcode from the list:
-          00000000, 11111111, 22222222, 33333333, 44444444, 55555555, 66666666,
-          77777777, 88888888, 99999999, 12345678, 87654321"
+          "If (PICS_DT_SOFTAP), User-Intent Commissioning Flow: Use a
+          Commissionee with a QR code that has the Custom Flow field set to 1
+          and supports SoftAP for its Discovery Capability. Commissionee is NOT
+          in commissioning mode. Ensure the Version bit string follows the
+          current Matter spec. documentation."
       verification: |
-          NEED SUPPORT: Unable to generate false QR codes with chip-device-ctrl
-          chip-device-ctrl >  setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 1 -dc 4 -dv 3840 -ps 00000000
-          2022-03-03 00:11:58 matter-te-6 chip.SPL[22108] ERROR Failed encoding invalid payload
-          Chip Stack Error 47
-
-          00000000:
-          11111111:
-          22222222:
-          33333333:
-          44444444:
-          55555555:
-          66666666:
-          77777777:
-          88888888:
-          99999999:
-          12345678:
-          87654321
+          BLOCKED: SoftAP commissioning not currently supported
       disabled: true
 
     - label:
-          "Scan each of the generated QR codes from the previous step using DUT"
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          NEED SUPPORT: Unable to generate false QR codes with chip-device-ctrl in previous step
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "Prefix: Using the QR code from Step 1, generate a new QR code but
-          substituting out the current Prefix with an invalid Prefix that is not
-          ''MT:'' (i.e. Prefix=''AB:'')"
+          "If (PICS_DT_SOFTAP), DUT parses QR code and DUT presents User with a
+          pairing hint."
       verification: |
-          AB:-24J0W2T00KA0648G00
-      disabled: true
-
-    - label: "Scan the QR code, generated in the previous step, using the DUT"
-      verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 AB:-24J0W2T00KA0648G00
-          ...
-          [1646266501236] [53666:29430483] CHIP: [IN] TransportMgr initialized
-          [1646266501236] [53666:29430485] CHIP: [DL] _OnPlatformEvent
-          [1646266501236] [53666:29430483] CHIP: [-] ../../third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:49: CHIP Error 0x00000013: Integrity check failed at ../../commands/common/CHIPCommand.cpp:62
-          [1646266501236] [53666:29430483] CHIP: [TOO] Run command failure: ../../third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:49: CHIP Error 0x00000013: Integrity check failed
-          [1646266501243] [53666:29430483] CHIP: [SPT] VerifyOrDie failure at ../../third_party/connectedhomeip/src/lib/support/Pool.h:311: Allocated() == 0
-          Abort trap: 6
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          1. Follow the steps given in the TH's pairing hint to allow for commissioning to happen. TH should not be commissioned until these steps were followed and indicate DUT can proceed with commissioning the TH to the Matter network
       disabled: true
 
     - label:
-          "Variable length TLV: Using the QR code from Step 1, generate a new QR
-          code but substituting out the correct length TLV with an invalid
-          length TLV according to the manufacturers specifications. (i.e. if the
-          manufacturer specifies a TLV length=8, substitute in a TVL length=4,
-          or any other TLV length not equal to 8)"
-      verification: |
-          NEED SUPPORT: Unable to generate false QR codes with chip-device-ctrl
-      disabled: true
-
-    - label: "Scan the QR code, generated in the previous step, using the DUT"
+          "If (PICS_DT_SOFTAP), Follow any steps from the resources provided by
+          the pairing hint for putting the TH Commissionee into commissioning
+          mode and to complete the commissioning process using SoftAP."
       verification: |
-          NEED SUPPORT: Unable to generate false QR codes with chip-device-ctrl in previous step
+          BLOCKED: SoftAP commissioning not currently supported
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
index d6afc816999be6..b5d359aeb20384 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    7.3.13.[TC-DD-3.13] Commissioning Flow - Manual Pairing Code [DUT -
+    3.3.13. [TC-DD-3.13] Commissioning Flow = 2 (Custom Flow) - QR Code [DUT -
     Commissioner]
 
 config:
@@ -24,217 +24,146 @@ config:
 
 tests:
     - label:
-          "If (PICS_11_MANUAL_PC), VERSION: Use an 11 digit Manual pairing code
-          from a commissionee that has their Manual pairing code VERSION bit
-          string set to 0"
+          "If (PICS_DT_BLE), Custom Commissioning Flow: Use a Commissionee with
+          a QR code that has the Custom Flow field set to 2 and supports BLE for
+          its Discovery Capability. Commissionee is NOT in commissioning mode.
+          Ensure the Version bit string follows the current Matter spec.
+          documentation."
       verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-          [1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
+          $ ./out/ble/all-clusters-app/chip-all-clusters-app --custom-flow 2 --capabilities 2
+
+          [1651103874.314141][26507:26507] CHIP:DL: Device Configuration:
+          [1651103874.314196][26507:26507] CHIP:DL:   Serial Number: TEST_SN
+          [1651103874.314264][26507:26507] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651103874.314305][26507:26507] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651103874.314337][26507:26507] CHIP:DL:   Hardware Version: 0
+          [1651103874.314362][26507:26507] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651103874.314383][26507:26507] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651103874.314412][26507:26507] CHIP:DL:   Manufacturing Date: (not set)
+          [1651103874.314434][26507:26507] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651103874.314502][26507:26507] CHIP:SVR: SetupQRCode: [MT:-24J0YXE00KA0648G00]
       disabled: true
 
     - label:
-          "If (PICS_11_MANUAL_PC), Provide the manual pairing code, generated in
-          the previous step, to the DUT in any format supported by the DUT.
-          Follow any steps needed for the Commissioner/Commissionee to complete
-          the commissioning process."
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 34970112332
-          ...
-          [1646267353060] [53689:29437234] CHIP: [TOO] Device commissioning completed with success
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          [1646267353.273560][28656:28656] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1646267353.273586][28656:28656] CHIP:SVR: Commissioning completed successfully
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_21_MANUAL_PC), VERSION: Use a 21 digit Manual pairing code
-          from a commissionee that has their Manual pairing code VERSION bit
-          string set to 0"
+          "If (PICS_DT_BLE), DUT parses QR code and DUT presents User with a URL
+          in the pairing hint."
       verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-          [1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
+          1. Follow the steps given in the TH's URL to allow for commissioning to happen. TH should not be commissioned until these steps were followed and indicate DUT can proceed with commissioning the TH to the Matter network
       disabled: true
 
     - label:
-          "If (PICS_21_MANUAL_PC), Provide the manual pairing code, generated in
-          the previous step, to the DUT in any format supported by the DUT.
-          Follow any steps needed for the Commissioner/Commissionee to complete
-          the commissioning process."
+          "If (PICS_DT_BLE), Follow any steps from the URL provided by the
+          pairing hint for putting the TH Commissionee into commissioning mode,
+          for triggering the DUT Commissioner for commissioning, and for
+          completing the commissioning process using BLE."
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 34970112332
-          ...
-          [1646267665776] [53714:29441244] CHIP: [TOO] Device commissioning completed with success
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          [1646267665.929519][28709:28709] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1646267665.929545][28709:28709] CHIP:SVR: Commissioning completed successfully
+          TH all-clusters-app:
+          [1651104141.533461][26507:26507] CHIP:SVR: Commissioning completed successfully
+          [1651104141.533498][26507:26507] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT chip-tool: $ ./out/chip-tool/chip-tool pairing qrcode 1  MT:-24J0YXE00KA0648G00
+
+          [1651104141454] [94607:65586111] CHIP: [CTL] Received CommissioningComplete response
+          [1651104141454] [94607:65586111] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651104141454] [94607:65586111] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651104141454] [94607:65586111] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651104141454] [94607:65586111] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651104141454] [94607:65586111] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
     - label:
-          "If (PICS_11_MANUAL_PC), VID_PID_PRESENT: Use an 11 digit Manual
-          pairing code from a commissionee that has their VID_PID_PRESENT bit
-          string set to 0"
+          "If (PICS_DT_IP), Custom Commissioning Flow: Use a Commissionee with a
+          QR code that has the Custom Flow field set to 2 and supports IP
+          Network for its Discovery Capability. Commissionee is NOT in
+          commissioning mode. Ensure the Version bit string follows the current
+          Matter spec. documentation."
       verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-          [1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
+          $ ./out/all-clusters-app/chip-all-clusters-app --custom-flow 2 --capabilities 4
+
+          [1651103447.175705][8940:8940] CHIP:DL: Device Configuration:
+          [1651103447.175762][8940:8940] CHIP:DL:   Serial Number: TEST_SN
+          [1651103447.175804][8940:8940] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651103447.175846][8940:8940] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651103447.175883][8940:8940] CHIP:DL:   Hardware Version: 0
+          [1651103447.175911][8940:8940] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651103447.175937][8940:8940] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651103447.175971][8940:8940] CHIP:DL:   Manufacturing Date: (not set)
+          [1651103447.175998][8940:8940] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651103447.176023][8940:8940] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651103447.176084][8940:8940] CHIP:SVR: SetupQRCode: [MT:-24J029Q00KA0648G00]
       disabled: true
 
     - label:
-          "If (PICS_11_MANUAL_PC), Provide the manual pairing code, generated in
-          the previous step, to the DUT in any format supported by the DUT.
-          Follow any steps needed for the Commissioner/Commissionee to complete
-          the commissioning process."
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 34970112332
-          ...
-          [1646267353060] [53689:29437234] CHIP: [TOO] Device commissioning completed with success
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          [1646267353.273560][28656:28656] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1646267353.273586][28656:28656] CHIP:SVR: Commissioning completed successfully
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
       disabled: true
 
     - label:
-          "If (PICS_21_MANUAL_PC), VID_PID_PRESENT: Use a 21 digit Manual
-          pairing code from a commissionee that has their VID_PID_PRESENT bit
-          string set to 1"
+          "If (PICS_DT_IP), DUT parses QR code and DUT presents User with a URL
+          in the pairing hint."
       verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-          [1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
+          1. Follow the steps given in the TH's URL to allow for commissioning to happen. TH should not be commissioned until these steps were followed and indicate DUT can proceed with commissioning the TH to the Matter network
       disabled: true
 
     - label:
-          "If (PICS_21_MANUAL_PC), Provide the manual pairing code, generated in
-          the previous step, to the DUT in any format supported by the DUT.
-          Follow any steps needed for the Commissioner/Commissionee to complete
-          the commissioning process."
+          "If (PICS_DT_IP), Follow any steps from the URL provided by the
+          pairing hint for putting the TH Commissionee into commissioning mode,
+          for triggering the DUT Commissioner for commissioning, and for
+          completing the commissioning process using IP Network."
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 34970112332
-          ...
-          [1646267665776] [53714:29441244] CHIP: [TOO] Device commissioning completed with success
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          [1646267665.929519][28709:28709] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1646267665.929545][28709:28709] CHIP:SVR: Commissioning completed successfully
+          TH all-clusters-app:
+          [1651103591.176135][8940:8940] CHIP:SVR: Commissioning completed successfully
+          [1651103591.176179][8940:8940] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT chip-tool:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1  MT:-24J029Q00KA0648G00
+
+          [1651103591085] [94586:65580481] CHIP: [CTL] Received CommissioningComplete response
+          [1651103591085] [94586:65580481] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651103591085] [94586:65580481] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651103591085] [94586:65580481] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651103591085] [94586:65580481] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651103591085] [94586:65580481] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
     - label:
-          "If (PICS_21_MANUAL_PC), VENDOR_ID and PRODUCT_ID: Use a 21 digit
-          Manual pairing code from a commissionee that has a valid VENDOR_ID (as
-          defined in section 2.5.2. 'Vendor Identifier') and PRODUCT_ID (as
-          defined in section 2.5.3. 'Product Identifier')"
+          "If (PICS_DT_SOFTAP), Custom Commissioning Flow: Use a Commissionee
+          with a QR code that has the Custom Flow field set to 2 and supports
+          SoftAP for its Discovery Capability. Commissionee is NOT in
+          commissioning mode. Ensure the Version bit string follows the current
+          Matter spec. documentation."
       verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...
-          [1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
+          BLOCKED: SoftAP commissioning not currently supported
       disabled: true
 
     - label:
-          "Provide the manual pairing code, generated in the previous step, to
-          the DUT in any format supported by the DUT. Follow any steps needed
-          for the Commissioner/Commissionee to complete the commissioning
-          process."
+          "If (PICS_SCAN_QR_CODE), Scan the QR code from the previous step using
+          the DUT."
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 34970112332
-          ...
-          [1646267665776] [53714:29441244] CHIP: [TOO] Device commissioning completed with success
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          [1646267665.929519][28709:28709] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1646267665.929545][28709:28709] CHIP:SVR: Commissioning completed successfully
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
+      disabled: true
+
+    - label:
+          "If (PICS_DT_SOFTAP), DUT parses QR code and DUT presents User with a
+          URL in the pairing hint."
+      verification: |
+          1. Follow the steps given in the TH's URL to allow for commissioning to happen. TH should not be commissioned until these steps were followed and indicate DUT can proceed with commissioning the TH to the Matter network
+      disabled: true
+
+    - label:
+          "If (PICS_DT_SOFTAP), Follow any steps from the URL provided by the
+          pairing hint for putting the TH Commissionee into commissioning mode,
+          for triggering the DUT Commissioner for commissioning, and for
+          completing the commissioning process using SoftAP."
+      verification: |
+          BLOCKED: SoftAP commissioning not currently supported
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
index 437385e6756906..1b95bfc75a982d 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
@@ -25,23 +25,18 @@ config:
 tests:
     - label: "Locate and scan/read the Commissionees QR code using DUT"
       verification: |
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-
-          ...[1645845935.798806][8925:8925] CHIP:DL: Device Configuration:
-          [1645845935.798853][8925:8925] CHIP:DL:   Serial Number: TEST_SN
-          [1645845935.798875][8925:8925] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
-          [1645845935.798904][8925:8925] CHIP:DL:   Product Id: 32769 (0x8001)
-          [1645845935.798929][8925:8925] CHIP:DL:   Hardware Version: 0
-          [1645845935.798960][8925:8925] CHIP:DL:   Setup Pin Code: 20202021
-          [1645845935.798984][8925:8925] CHIP:DL:   Setup Discriminator: 3840 (0xF00)
-          [1645845935.799008][8925:8925] CHIP:DL:   Manufacturing Date: (not set)
-          [1645845935.799038][8925:8925] CHIP:DL:   Device Type: 65535 (0xFFFF)
-          [1645845935.799106][8925:8925] CHIP:SVR: SetupQRCode: [MT:-24J042C00KA0648G00]
-          [1645845935.799135][8925:8925] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
-          [1645845935.799164][8925:8925] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J042C00KA0648G00
-          [1645845935.799195][8925:8925] CHIP:SVR: Manual pairing code: [34970112332]
-          [1645845935.799236][8925:8925] CHIP:SVR: Long manual pairing code: [749701123365521327694]
+          $ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 2 --capabilities 4 --discriminator 3840 --passcode 20202021
+
+          [1651165486.365306][4112:4112] CHIP:DL: Device Configuration:
+          [1651165486.365374][4112:4112] CHIP:DL:   Serial Number: TEST_SN
+          [1651165486.365415][4112:4112] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651165486.365449][4112:4112] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651165486.365479][4112:4112] CHIP:DL:   Hardware Version: 0
+          [1651165486.365502][4112:4112] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651165486.365522][4112:4112] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651165486.365549][4112:4112] CHIP:DL:   Manufacturing Date: (not set)
+          [1651165486.365570][4112:4112] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651165486.365646][4112:4112] CHIP:SVR: SetupQRCode: [MT:-24J029Q00KA0648G00]
       disabled: true
 
     - label:
@@ -49,21 +44,15 @@ tests:
           but substituting out the current Version String with an invalid
           Version String (i.e. '010' or any non-zero 3-bit value)"
       verification: |
-          ./chip-tool payload generate-qrcode --discriminator 3841 --setup-pin-code 20202021 --version 001 --vendor-id 65521 --product-id 0x8001 --commissioning-mode 2 --rendezvous 2
-          [1649826848.599869][3121:3121] CHIP:TOO: QR Code: MT:.24J048N01KA0648G00
+          MT:034J029Q00KA0648G00
       disabled: true
 
     - label:
           "Scan/read the QR code, generated in the previous step, using the DUT"
       verification: |
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:.24J0AFN00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          ERROR: chip-tool allows pairing to all-clusters-app when QR code contains invalid version string=2 (spec says it should be 000)
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:034J029Q00KA0648G00
       disabled: true
 
     - label:
@@ -72,26 +61,16 @@ tests:
           components except for the Custom Flow field, set it to 1: User-Intent
           Commissioning Flow"
       verification: |
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65522 -pi 32770 -cf 1 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:42:39 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:42:39 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:86PS06VO00KA0648G00]
+          MT:-24J06VO00KA0648G00
       disabled: true
 
     - label:
           "If (PICS_USER_INTENT_COMM_FLOW), Scan/read the QR code, generated in
           the previous step, using the DUT"
       verification: |
-          chip-tool does not prevent commissioning because of invalid VID/PID values. This is handled after the commissioning process.
-          This test step is not valid and is addressed in PR#893
-
-          DUT Commissioner:
-          '' ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:86PS06VO00KA0648G00
-          ...
+          ERROR: chip-tool allows pairing to all-clusters-app when QR code contains user-intent flow but device uses custom commissioning flow
 
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J06VO00KA0648G00
       disabled: true
 
     - label:
@@ -99,32 +78,16 @@ tests:
           new QR code using all the same Onboarding Payload components except
           for the Custom Flow field, set it to 2: Custom Commissioning Flow"
       verification: |
-          INVALID TEST STEP
-
-          This test step is not valid because the scenario here should always be supported for standard commissioning flow. This is addressed in PR#893
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 2 -dv 3840 -ps 20202021
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J042C00KA0648G00]
+          MT:-24J029Q00KA0648G00
       disabled: true
 
     - label:
           "If (PICS_CUSTOM_COMM_FLOW), Scan/read the QR code, generated in the
           previous step, using the DUT"
       verification: |
-          INVALID TEST STEP
-
-          This test step is not valid because the scenario here should always be supported for standard commissioning flow. This is addressed in PR#893
+          ERROR: chip-tool allows pairing to all-clusters-app when QR code contains custom commissioning flow but device uses standard commissioning flow
 
-          DUT Commissioner:
-          '' ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00KA0648G00
       disabled: true
 
     - label:
@@ -132,21 +95,15 @@ tests:
           generate a new QR code using all the same Onboarding Payload
           components except for the Custom Flow field, set it to 3: Reserved"
       verification: |
-          ./chip-tool payload generate-qrcode --discriminator 3841 --setup-pin-code 20202021 --version 000 --vendor-id 65521 --product-id 0x8001 --commissioning-mode 1 --rendezvous 2
-          [1649827720.845213][3171:3171] CHIP:TOO: QR Code: MT:-24J08UL01KA0648G00
+          MT:-24J0-OR00KA0648G00
       disabled: true
 
     - label:
           "Scan/read the QR code, generated in the previous step, using the DUT"
       verification: |
-          DUT Commissioner:
-          '' ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J08UL01KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          ERROR: chip-tool allows pairing to all-clusters-app when QR code contains Reserved commissioning flow but device uses custom commissioning flow
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0-OR00KA0648G00
       disabled: true
 
     - label:
@@ -154,22 +111,16 @@ tests:
           code using all the same Onboarding Payload components except for the
           Discovery Capability bit string, set it to BLE for discovery"
       verification: |
-          ./chip-tool payload generate-qrcode --discriminator 3841 --setup-pin-code 20202021 --version 000 --vendor-id 65521 --product-id 0x8001 --commissioning-mode 2 --rendezvous 2
-          [1649827755.759091][3173:3173] CHIP:TOO: QR Code: MT:-24J048N01KA0648G00
+          MT:-24J0YXE00KA0648G00
       disabled: true
 
     - label:
           "If (PICS_DT_BLE), Scan/read the QR code, generated in the previous
           step, using the DUT"
       verification: |
-          DUT Commissioner:
-          '' ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J048N01KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          ERROR: chip-tool allows pairing to all-clusters-app when QR code contains BLE device discovery but device uses IP device discovery
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0YXE00KA0648G00
       disabled: true
 
     - label:
@@ -177,22 +128,14 @@ tests:
           code using all the same Onboarding Payload components except for the
           Discovery Capability bit string, set it to IP Network for discovery"
       verification: |
-          ./chip-tool payload generate-qrcode --discriminator 3841 --setup-pin-code 20202021 --version 000 --vendor-id 65521 --product-id 0x8001 --commissioning-mode 3 --rendezvous 2
-          [1649827827.266780][3178:3178] CHIP:TOO: QR Code: MT:-24J00OO01KA0648G00
+          MT:-24J029Q00KA0648G00
       disabled: true
 
     - label:
           "If (PICS_DT_IP), Scan/read the QR code, generated in the previous
           step, using the DUT"
       verification: |
-          DUT Commissioner:
-          '' ./examples/chip-tool/out/debug/chip-tool pairing code 1234  MT:-24J00OO01KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00KA0648G00
       disabled: true
 
     - label:
@@ -201,31 +144,15 @@ tests:
           components except for the Discovery Capability bit string, set it to
           non-zeros"
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over BLE when the discovery capability should not be advertising with capabilites set to '0'
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 2 -dv 3840 -ps 20202021
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:50:13 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J042C00KA0648G00]
+          MT:-24J0EZA10KA0648G00
       disabled: true
 
     - label:
           "Scan/read the QR code, generated in the previous step, using the DUT"
       verification: |
-          BLOCKED
+          ERROR: chip-tool allows pairing to all-clusters-app when QR code contains the Reserved discovery capability but device supports IP discovery
 
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over BLE when the discovery capability should not be advertising with capabilites set to '0'
-
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J042C00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0EZA10KA0648G00
       disabled: true
 
     - label:
@@ -237,31 +164,92 @@ tests:
           00000000, 11111111, 22222222, 33333333, 44444444, 55555555, 66666666,
           77777777, 88888888, 99999999, 12345678, 87654321"
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over IP when the discovery capability should not be advertising with capabilites set to '0'
-
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 4 -dv 3840 -ps 20202021
-          2022-02-26 03:58:28 matter-te-6 chip.SPL[22108] INFO Manual pairing code: [34970112332]
-          2022-02-26 03:58:28 matter-te-6 chip.SPL[22108] INFO SetupQRCode: [MT:-24J0AFN00KA0648G00]
+          "MT:-24J029Q00OC0000000" (00000000),
+          "MT:-24J029Q00KMSP0Z800" (11111111),
+          "MT:-24J029Q00GWID1WH00" (22222222),
+          "MT:-24J029Q00C4912TQ00" (33333333),
+          "MT:-24J029Q008E.Q2QZ00" (44444444),
+          "MT:-24J029Q004ORE3N610" (55555555),
+          "MT:-24J029Q000YH24KF10" (66666666),
+          "MT:-24J029Q00Y58S4HO10" (77777777),
+          "MT:-24J029Q00UF-F5EX10" (88888888),
+          "MT:-24J029Q00QPQ36B420" (99999999),
+          "MT:-24J029Q004QG46Y900" (12345678),
+          "MT:-24J029Q00YX018EW10" (87654321)
       disabled: true
 
     - label:
           "Scan each of the generated QR codes from the previous step using DUT"
       verification: |
-          BLOCKED
-
-          chip-all-clusters-app BUG: chip-all-clusters-app advertises over IP when the discovery capability should not be advertising with capabilites set to '0'
-
-          DUT Commissioner:
-          sudo ./examples/chip-tool/out/debug/chip-tool pairing code 1234 MT:-24J0AFN00KA0648G00
-          ...
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          TH chip-all-clusters-app Commissionee:
+          [1651179082.761318][12346:12346] CHIP:SC: Received error (protocol code 2) during PASE process. ../../examples/all-clusters-app/linux/third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:784: CHIP Error 0x00000038: Invalid PASE parameter
+          [1651179082.761425][12346:12346] CHIP:SC: Failed during PASE session setup. ../../examples/all-clusters-app/linux/third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:784: CHIP Error 0x00000038: Invalid PASE parameter
+          [1651179082.761479][12346:12346] CHIP:SVR: Commissioning failed (attempt 1): ../../examples/all-clusters-app/linux/third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:784: CHIP Error 0x00000038: Invalid PASE parameter
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00OC0000000
+          [1651179082655] [10999:245999] CHIP: [SC] Failed to verify peer's MAC. This can happen when setup code is incorrect.
+          [1651179082655] [10999:245999] CHIP: [SC] Sending status report. Protocol code 2, exchange 65469
+          [1651179082655] [10999:245999] CHIP: [EM] Piggybacking Ack for MessageCounter:380681523 on exchange: 65469i
+          [1651179082655] [10999:245999] CHIP: [IN] Prepared unauthenticated message 0x7fcc93820a68 to 0x0000000000000000 (0)  of type 0x40 and protocolId (0, 0) on exchange 65469i with MessageCounter:515375235.
+          [1651179082655] [10999:245999] CHIP: [IN] Sending unauthenticated msg 0x7fcc93820a68 with MessageCounter:515375235 to 0x0000000000000000 at monotonic time: 0000000001094FBF msec
+          [1651179082655] [10999:245999] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179082655] [10999:245999] CHIP: [TOO] Secure Pairing Failed
+          [1651179082655] [10999:245999] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00KMSP0Z800
+          [1651179338231] [11042:248762] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179338231] [11042:248762] CHIP: [TOO] Secure Pairing Failed
+          [1651179338231] [11042:248762] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00GWID1WH00
+          [1651179360470] [11053:249083] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179360470] [11053:249083] CHIP: [TOO] Secure Pairing Failed
+          [1651179360470] [11053:249083] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00C4912TQ00
+          [1651179360470] [11053:249083] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179360470] [11053:249083] CHIP: [TOO] Secure Pairing Failed
+          [1651179360470] [11053:249083] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q008E.Q2QZ00
+          [1651179528926] [11097:251129] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179528926] [11097:251129] CHIP: [TOO] Secure Pairing Failed
+          [1651179528926] [11097:251129] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q004ORE3N610
+          [1651179553222] [11099:251475] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179553222] [11099:251475] CHIP: [TOO] Secure Pairing Failed
+          [1651179553222] [11099:251475] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q000YH24KF10
+          [1651179566539] [11100:251638] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179566539] [11100:251638] CHIP: [TOO] Secure Pairing Failed
+          [1651179566539] [11100:251638] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00Y58S4HO10
+          [1651179578818] [11110:251820] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179578818] [11110:251820] CHIP: [TOO] Secure Pairing Failed
+          [1651179578818] [11110:251820] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00UF-F5EX10
+          [1651179592485] [11111:251958] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179592485] [11111:251958] CHIP: [TOO] Secure Pairing Failed
+          [1651179592485] [11111:251958] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00QPQ36B420
+          [1651179606579] [11112:252148] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179606579] [11112:252148] CHIP: [TOO] Secure Pairing Failed
+          [1651179606579] [11112:252148] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q004QG46Y900
+          [1651179619185] [11114:252273] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179619185] [11114:252273] CHIP: [TOO] Secure Pairing Failed
+          [1651179619185] [11114:252273] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J029Q00YX018EW10
+          [1651179633201] [11129:252492] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651179633201] [11129:252492] CHIP: [TOO] Secure Pairing Failed
+          [1651179633201] [11129:252492] CHIP: [TOO] Pairing Failure: ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
       disabled: true
 
     - label:
@@ -269,24 +257,12 @@ tests:
           substituting out the current Prefix with an invalid Prefix that is not
           'MT:' (i.e. Prefix='AB:')"
       verification: |
-          NEED SUPPORT
-
-          Unable to generate fals QR codes with discovery capability set to an invalid number (i.e. 8 or above for chip-device-ctrl)
-
-          chip-device-ctrl > setup-payload generate -vr 0 -vi 65521 -pi 32769 -cf 0 -dc 8 -dv 3840 -ps 20202021
-          2022-03-05 00:31:33 matter-te-6 chip.SPL[394173] INFO Manual pairing code: [34970112332]
-          Chip Stack Error 47
+          AB:-24J029Q00KA0648G00
       disabled: true
 
     - label:
           "Scan/read the QR code, generated in the previous step, using the DUT"
       verification: |
-          NEED SUPPORT
-
-          Unable to generate false QR codes with discovery capability set to an invalid number (i.e. 8 or above for chip-device-ctrl)
-
-          Device TH:
-          ./out/all-clusters-app/chip-all-clusters-app
-          ...
-          DUT has not commissioned the TH to the Matter network
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 AB:-24J029Q00KA0648G00
+          [1651179728083] [11173:253719] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:50: CHIP Error 0x00000013: Integrity check failed
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml
new file mode 100644
index 00000000000000..aa4f13e1626f4d
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml
@@ -0,0 +1,120 @@
+# 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.3.15. [TC-DD-3.15] Commissioning Flow - Manual Pairing Code [DUT -
+    Commissioner]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "If (PICS_11_MANUAL_PC), Verify the THs 11-digit Manual Pairing Code
+          meets the following criteria: - VERSION bit string string up to date
+          with the current Matter spec. documentation - VID_PID_PRESENT bit
+          string set to 0"
+      verification: |
+          $ ./out/ble/all-clusters-app/chip-all-clusters-app
+          [1651108891.390266][30833:30833] CHIP:DL: Device Configuration:
+          [1651108891.390455][30833:30833] CHIP:DL:   Serial Number: TEST_SN
+          [1651108891.390505][30833:30833] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651108891.390551][30833:30833] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651108891.390592][30833:30833] CHIP:DL:   Hardware Version: 0
+          [1651108891.390623][30833:30833] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651108891.390650][30833:30833] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651108891.390687][30833:30833] CHIP:DL:   Manufacturing Date: (not set)
+          [1651108891.390717][30833:30833] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651108891.390744][30833:30833] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651108891.390809][30833:30833] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
+          [1651108891.390848][30833:30833] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          [1651108891.390876][30833:30833] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0AFN00KA0648G00
+          [1651108891.390917][30833:30833] CHIP:SVR: Manual pairing code: [34970112332]
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT.
+          Follow any steps needed for the Commissioner/Commissionee to complete
+          the commissioning process."
+      verification: |
+          TH Commissionee:
+          [1651109112.909458][30833:30833] CHIP:SVR: Commissioning completed successfully
+          [1651109112.909503][30833:30833] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing manualcode 1 34970112332
+
+          [1651109112823] [95528:65650355] CHIP: [CTL] Received CommissioningComplete response
+          [1651109112823] [95528:65650355] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651109112823] [95528:65650355] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651109112823] [95528:65650355] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651109112823] [95528:65650355] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651109112823] [95528:65650355] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
+
+    - label:
+          'If (PICS_21_MANUAL_PC), Verify the THs 21-digit Manual Pairing Code
+          meets the following criteria: - A VERSION bit string string up-to-date
+          with the current Matter spec. documentation - A VID_PID_PRESENT bit
+          string set to 1 - A VENDOR_ID present (as defined in section 2.5.2.
+          "Vendor Identifier") - A PRODUCT_ID present (as defined in section
+          2.5.3. "Product Identifier")'
+      verification: |
+          $ ./out/ble/all-clusters-app/chip-all-clusters-app
+
+          [1651109167.022364][30980:30980] CHIP:DL: Device Configuration:
+          [1651109167.022443][30980:30980] CHIP:DL:   Serial Number: TEST_SN
+          [1651109167.022492][30980:30980] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651109167.022542][30980:30980] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651109167.022586][30980:30980] CHIP:DL:   Hardware Version: 0
+          [1651109167.022619][30980:30980] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651109167.022650][30980:30980] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651109167.022691][30980:30980] CHIP:DL:   Manufacturing Date: (not set)
+          [1651109167.022723][30980:30980] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651109167.022753][30980:30980] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651109167.022825][30980:30980] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
+          [1651109167.022868][30980:30980] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          [1651109167.022898][30980:30980] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0AFN00KA0648G00
+          [1651109167.022942][30980:30980] CHIP:SVR: Manual pairing code: [34970112332]
+          [1651109167.022974][30980:30980] CHIP:-: ==== Onboarding payload for Custom Commissioning Flows ====
+          [1651109167.023050][30980:30980] CHIP:SVR: SetupQRCode: [MT:-24J029Q00KA0648G00]
+          [1651109167.023090][30980:30980] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          [1651109167.023120][30980:30980] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J029Q00KA0648G00
+          [1651109167.023167][30980:30980] CHIP:SVR: Manual pairing code: [749701123365521327694]
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT.
+          Follow any steps needed for the Commissioner/Commissionee to complete
+          the commissioning process."
+      verification: |
+          TH Commissionee:
+          [1651109219.100167][30980:30980] CHIP:SVR: Commissioning completed successfully
+          [1651109219.100213][30980:30980] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing manualcode 1 749701123365521327694
+
+          [1651109219028] [95536:65652322] CHIP: [CTL] Received CommissioningComplete response
+          [1651109219028] [95536:65652322] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651109219028] [95536:65652322] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651109219028] [95536:65652322] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651109219028] [95536:65652322] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651109219028] [95536:65652322] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml
new file mode 100644
index 00000000000000..8d8854841bfeb0
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml
@@ -0,0 +1,265 @@
+# 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.3.16. [TC-DD-3.16] Commissioning Flow - 11-digit Manual Pairing Code -
+    Negative Scenario [DUT - Commissioner]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide the 11-digit Manual Pairing Code from
+          the Commissionee to the DUT in any format supported by DUT"
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 0 --capabilities 4 --discriminator 3840 --passcode 20202021
+
+          [1651180718.960383][13218:13218] CHIP:DL: Device Configuration:
+          [1651180718.960441][13218:13218] CHIP:DL:   Serial Number: TEST_SN
+          [1651180718.960477][13218:13218] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651180718.960512][13218:13218] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651180718.960546][13218:13218] CHIP:DL:   Hardware Version: 0
+          [1651180718.960569][13218:13218] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651180718.960597][13218:13218] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651180718.960627][13218:13218] CHIP:DL:   Manufacturing Date: (not set)
+          [1651180718.960650][13218:13218] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651180718.960671][13218:13218] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651180718.960729][13218:13218] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
+          [1651180718.960760][13218:13218] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
+          [1651180718.960781][13218:13218] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0AFN00KA0648G00
+          [1651180718.960814][13218:13218] CHIP:SVR: Manual pairing code: [34970112332]
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), VERSION: Using the manual code from Step 1,
+          generate a new manual code but substituting out the current VERSION
+          with an invalid VERSION: 2"
+      verification: |
+          $ ./out/chip-tool/chip-tool payload verhoeff-generate 8497011233
+          [1651186243492] [13415:349553] CHIP: [SPL] Generating Character for: 84970112331
+          [1651186243492] [13415:349553] CHIP: [SPL] Generated Char: 1
+          Manual Code: 84970112331
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 84970112331
+
+          [1651186653578] [13468:355000] CHIP: [DL] Mdns: OnNewAddress interface: 24 ip:fe80::dea6:32ff:fe8d:6e32
+          [1651186653600] [13468:354997] CHIP: [BLE] CBManagerState: ON
+          [1651186653601] [13468:354997] CHIP: [BLE] CBManagerState: RESETTING
+          [1651186655771] [13468:354997] CHIP: [BLE] CBManagerState: ON
+          Illegal instruction: 4
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), VID_PID_PRESENT: Using the manual code from
+          Step 1, generate a new manual code but substituting out the current
+          VID_PID_PRESENT with an invalid VID_PID_PRESENT set to 1"
+      verification: |
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 0xF00 --setup-pin-code 20202021 --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 2 --force-short-code 1
+          [1651181048462] [11611:269469] CHIP: [TOO] Manual Code: 74970112334
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 74970112334
+
+          [1651184274318] [12512:321250] CHIP: [SPL] Failed decoding base10. Input length 10 was not expected length 20
+          ...
+          [1651184274321] [12512:321244] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:63: CHIP Error 0x0000001E: Invalid string length
+      disabled: true
+
+    - label:
+          'If (PICS_11_MANUAL_PC), SHORT DISCRIMINATOR: Using the manual code
+          from Step 1, generate a new manual code but substituting out the
+          current SHORT DISCRIMINATOR string with a discriminator value that
+          makes the generated manual code differ from Step 1s manual code (i.e.
+          Choose a discriminator value that changes any of the 4
+          most-significant bits of Step 1s 12-bit discriminator value and
+          adheres to rules of section 5.1.1.5. "Discriminator value")'
+      verification: |
+          $ ./out/chip-tool/chip-tool payload verhoeff-generate 8497011233
+          [1651186243492] [13415:349553] CHIP: [SPL] Generating Character for: 8497011233
+          [1651186243492] [13415:349553] CHIP: [SPL] Generated Char: 1
+          Manual Code: 84970112331
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 33331712336
+
+          [1651184172578] [12458:318862] CHIP: [DL] Mdns: OnNewAddress interface: 24 ip:fe80::dea6:32ff:fe8d:6e32
+          [1651184172578] [12458:318862] CHIP: [DL] Mdns: OnNewAddress interface: 24 ip:fe80::dea6:32ff:fe8d:6e32
+          [1651184172603] [12458:318861] CHIP: [BLE] CBManagerState: ON
+          [1651184172605] [12458:318862] CHIP: [BLE] CBManagerState: RESETTING
+          [1651184174769] [12458:318861] CHIP: [BLE] CBManagerState: ON
+          Illegal instruction: 4
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Passcode: Using the manual code from Step 1,
+          generate a new manual code using all the same Onboarding Payload
+          components except for the Passcode. For each Passcode in the following
+          list, set the Passcode component to one of the invalid Passcode and
+          generate a new manual code using all the same Onboarding Payload
+          components and one Passcode from the list: 00000000, 11111111,
+          22222222, 33333333, 44444444, 55555555, 66666666, 77777777, 88888888,
+          99999999, 12345678, 87654321"
+      verification: |
+          1. Use these as examples of how to generate manual codes with invalid passcodes
+
+          "34915200008" (00000000),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 00000000
+          [1651182185732] [11790:282099] CHIP: [TOO] Manual Code: 34915200008
+
+          "35191106788" (11111111),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 11111111
+          [1651182284292] [11799:283222] CHIP: [TOO] Manual Code: 35191106788
+
+          "35467013565" (22222222),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 22222222
+          [1651182331458] [11817:283904] CHIP: [TOO] Manual Code: 35467013565
+
+          "35742920344" (33333333),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 33333333
+          [1651182345419] [11876:284294] CHIP: [TOO] Manual Code: 35742920344
+
+          "36018827124" (44444444),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 44444444
+          [1651182362963] [11944:284816] CHIP: [TOO] Manual Code: 36018827124
+
+          "36294733900" (55555555),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 55555555
+          [1651182375363] [11945:284938] CHIP: [TOO] Manual Code: 36294733900
+
+          "34932240691" (66666666),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 66666666
+          [1651182395140] [11958:285261] CHIP: [TOO] Manual Code: 34932240691
+
+          "35208147474" (77777777),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 77777777
+          [1651182411341] [11966:285478] CHIP: [TOO] Manual Code: 35208147474
+
+          "35484054250" (88888888),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 88888888
+          [1651182422264] [11967:285581] CHIP: [TOO] Manual Code: 35484054250
+
+          "35759961037" (99999999),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 99999999
+          [1651182431755] [11968:285672] CHIP: [TOO] Manual Code: 35759961037
+
+          "35767807533" (12345678),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 12345678
+          [1651182443511] [11969:285786] CHIP: [TOO] Manual Code: 35767807533
+
+          "36545753496" (87654321),
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 0 --allow-invalid-payload 1 --setup-pin-code 87654321
+          [1651182459737] [11970:285960] CHIP: [TOO] Manual Code: 36545753496
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide each of the Manual Pairing Codes,
+          generated in the previous step, to the DUT in any format supported by
+          the DUT"
+      verification: |
+          (00000000)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 34915200008
+          [1651182596491] [12006:288954] CHIP: [SPL] Failed decoding base10. SetUpPINCode was 0.
+
+          (11111111)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35191106788
+          [1651182622501] [12009:289307] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182622501] [12009:289307] CHIP: [TOO] Secure Pairing Failed
+
+          (22222222)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35467013565
+          [1651182688251] [12026:292039] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182688251] [12026:292039] CHIP: [TOO] Secure Pairing Failed
+
+          (33333333)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35742920344
+          [1651182749249] [12037:293713] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182749249] [12037:293713] CHIP: [TOO] Secure Pairing Failed
+
+          (44444444)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 36018827124
+          [1651182769619] [12045:294912] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182769619] [12045:294912] CHIP: [TOO] Secure Pairing Failed
+
+          (55555555)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 36294733900
+          [1651182788383] [12053:296042] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182788383] [12053:296042] CHIP: [TOO] Secure Pairing Failed
+
+          (66666666)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 34932240691
+          [1651182816133] [12067:297210] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182816133] [12067:297210] CHIP: [TOO] Secure Pairing Failed
+
+          (77777777)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35208147474
+          [1651182833101] [12080:298444] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182833101] [12080:298444] CHIP: [TOO] Secure Pairing Failed
+
+          (88888888)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35484054250
+          [1651182850431] [12086:299484] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182850431] [12086:299484] CHIP: [TOO] Secure Pairing Failed
+
+          (99999999)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35759961037
+          [1651182873582] [12092:300725] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182873582] [12092:300725] CHIP: [TOO] Secure Pairing Failed
+
+          (12345678)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 35767807533
+          [1651182902418] [12113:302157] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182902418] [12113:302157] CHIP: [TOO] Secure Pairing Failed
+
+          (87654321)
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 36545753496
+          [1651182919123] [12125:303345] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651182919123] [12125:303345] CHIP: [TOO] Secure Pairing Failed
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), CHECK_DIGIT: Using the manual code from Step
+          1, generate a new manual code but substituting out the current
+          CHECK_DIGIT with an invalid CHECK_DIGIT (i.e. Any different
+          CHECK_DIGIT than the commissionees CHECK_DIGIT while following Table
+          38. Encoding Method without Vendor and Product IDs (VID_PID_Present ==
+          0))"
+      verification: |
+          Manual Code: 34970112331
+      disabled: true
+
+    - label:
+          "If (PICS_11_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 34970112331
+
+          [1651184084907] [12271:316118] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:50: CHIP Error 0x00000013: Integrity check failed
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
new file mode 100644
index 00000000000000..9c5c868f58413d
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
@@ -0,0 +1,278 @@
+# 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.3.17. [TC-DD-3.17] Commissioning Flow - 21-digit Manual Pairing Code -
+    Negative Scenario [DUT - Commissioner]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the 21-digit Manual Pairing Code from
+          the Commissionee to the DUT in any format supported by DUT"
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 2 --capabilities 4 --discriminator 3840 --passcode 20202021
+
+          [1651165486.365306][4112:4112] CHIP:DL: Device Configuration:
+          [1651165486.365374][4112:4112] CHIP:DL:   Serial Number: TEST_SN
+          [1651165486.365415][4112:4112] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651165486.365449][4112:4112] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651165486.365479][4112:4112] CHIP:DL:   Hardware Version: 0
+          [1651165486.365502][4112:4112] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651165486.365522][4112:4112] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651165486.365549][4112:4112] CHIP:DL:   Manufacturing Date: (not set)
+          [1651165486.365570][4112:4112] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651165486.365646][4112:4112] CHIP:SVR: SetupQRCode: [MT:-24J029Q00KA0648G00]
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), VERSION: Using the manual code from Step 1,
+          generate a new manual code but substituting out the current VERSION
+          with an invalid VERSION: 2"
+      verification: |
+          $ chip-tool/out/debug$ ./chip-tool payload verhoeff-generate  849701123365521327693
+          [1652423715.746979][23816:23816] CHIP:SPL: Generating Character for: 849701123365521327693
+          [1652423715.747112][23816:23816] CHIP:SPL: Generated Char: 0
+          $ chip-tool/out/debug$
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 849701123365521327693
+
+          [1651186987544] [13533:359998] CHIP: [SPL] Failed decoding base10. Input length 20 was not expected length 10
+          ...
+
+          [1651186987544] [13533:359996] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:63: CHIP Error 0x0000001E: Invalid string length
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), VID_PID_PRESENT: Using the manual code from
+          Step 1, generate a new manual code but substituting out the current
+          VID_PID_PRESENT with an invalid VID_PID_PRESENT set to 0"
+      verification: |
+          $ ./out/chip-tool/chip-tool payload verhoeff-generate 34970112336552132769
+          [1651186492744] [13434:353094] CHIP: [SPL] Generating Character for: 34970112336552132769
+          [1651186492744] [13434:353094] CHIP: [SPL] Generated Char: 6
+
+          Manual code: 349701123365521327696
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 349701123365521327696
+
+          [1651187185899] [13557:362337] CHIP: [SPL] Failed decoding base10. Input length 20 was not expected length 10
+          ...
+          [1651187185900] [13557:362333] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:63: CHIP Error 0x0000001E: Invalid string length
+      disabled: true
+
+    - label:
+          'If (PICS_21_MANUAL_PC), SHORT DISCRIMINATOR: Using the manual code
+          from Step 1, generate a new manual code but substituting out the
+          current SHORT DISCRIMINATOR string with a discriminator value that
+          makes the generated manual code differ from Step 1s manual code (i.e.
+          Choose a discriminator value that changes any of the 4
+          most-significant bits of Step 1s 12-bit discriminator value and
+          adheres to rules of section 5.1.1.5. "Discriminator value")'
+      verification: |
+          $ ./out/chip-tool/chip-tool payload verhoeff-generate 8497011233
+          [1651186243492] [13415:349553] CHIP: [SPL] Generating Character for: 8497011233
+          [1651186243492] [13415:349553] CHIP: [SPL] Generated Char: 1
+          Manual Code: 84970112331
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 733317123365521327692
+
+          [1651187326154] [13574:364188] CHIP: [DL] Mdns: OnBrowseAdd  name: 5303D3B066C915A8, type: _matterc._udp., domain: local., interface: 24
+          [1651187326155] [13574:364188] CHIP: [DL] Resolve type=_matterc._udp name=5303D3B066C915A8 interface=24
+          [1651187326155] [13574:364188] CHIP: [DL] Mdns : OnNewInterface hostname:DCA6328D6E320000.local. fullname:5303D3B066C915A8._matterc._udp.local. interface: 24
+          [1651187326157] [13574:364188] CHIP: [DL] Mdns: OnNewAddress interface: 24 ip:fe80::dea6:32ff:fe8d:6e32
+          [1651187328222] [13574:364187] CHIP: [BLE] CBManagerState: ON
+          Illegal instruction: 4
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Passcode: Using the manual code from Step 1,
+          generate a new manual code using all the same Onboarding Payload
+          components except for the Passcode. For each Passcode in the following
+          list, set the Passcode component to one of the invalid Passcode and
+          generate a new manual code using all the same Onboarding Payload
+          components and one Passcode from the list: 00000000, 11111111,
+          22222222, 33333333, 44444444, 55555555, 66666666, 77777777, 88888888,
+          99999999, 12345678, 87654321"
+      verification: |
+          1. Use this as an example of how to generate a manual code with an invalid passcode
+
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840  --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 1 --allow-invalid-payload 1 --setup-pin-code 00000000
+          [1651188323732] [14068:388953] CHIP: [TOO] Manual Code: 749152000065521327698
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide each of the Manual Pairing Codes,
+          generated in the previous step, to the DUT in any format supported by
+          the DUT"
+      verification: |
+          (00000000)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 749152000065521327698
+          [1651187937232] [13896:372977] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:161: CHIP Error 0x0000002F: Invalid argument
+
+           (11111111)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 751911067865521327698
+          [1651187951631] [13904:373170] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651187951631] [13904:373170] CHIP: [TOO] Secure Pairing Failed
+
+           (22222222)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 754670135665521327694
+          [1651187975776] [13921:374525] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651187975776] [13921:374525] CHIP: [TOO] Secure Pairing Failed
+
+           (33333333)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 757429203465521327699
+          [1651187993465] [13945:375674] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651187993465] [13945:375674] CHIP: [TOO] Secure Pairing Failed
+
+           (44444444)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 760188271265521327697
+          [1651188008800] [13951:376725] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188008800] [13951:376725] CHIP: [TOO] Secure Pairing Failed
+
+           (55555555)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 762947339065521327695
+          [1651188029330] [13957:377885] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188029330] [13957:377885] CHIP: [TOO] Secure Pairing Failed
+
+           (66666666)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 749322406965521327695
+          [1651188054160] [13994:379681] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188054160] [13994:379681] CHIP: [TOO] Secure Pairing Failed
+
+           (77777777)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 752081474765521327697
+          [1651188073770] [14000:380949] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188073770] [14000:380949] CHIP: [TOO] Secure Pairing Failed
+
+           (88888888)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 754840542565521327693
+          [1651188090958] [14006:382023] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188090958] [14006:382023] CHIP: [TOO] Secure Pairing Failed
+
+           (99999999)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 757599610365521327695
+          [1651188107232] [14013:383046] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188107232] [14013:383046] CHIP: [TOO] Secure Pairing Failed
+
+           (12345678)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 757678075365521327695
+          [1651188124928] [14019:384164] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188124928] [14019:384164] CHIP: [TOO] Secure Pairing Failed
+
+           (87654321)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 765457534965521327696
+          [1651188157157] [14043:386017] CHIP: [SC] Failed during PASE session setup. ../../examples/chip-tool/third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1352: CHIP Error 0x000000AC: Internal error
+          [1651188157157] [14043:386017] CHIP: [TOO] Secure Pairing Failed
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), VENDOR_ID: Using the manual code from Step 1,
+          generate a new manual code using all the same Onboarding Payload
+          components except for the VENDOR_ID. For each VENDOR_ID in the
+          following list, set the VENDOR_ID component to one of the invalid Test
+          VENDOR_IDs and generate a new manual code using all the same
+          Onboarding Payload components and one Test VENDOR_ID from the list:
+          0xFFF1, 0xFFF2, 0xFFF3, 0xFFF4"
+      verification: |
+          1. Use this as an example of how to generate a manual code with an invalid vendor IDs
+
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840 --setup-pin-code 20202021 --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 1
+          [1651189120686] [14218:398626] CHIP: [TOO] Manual Code: 749701123365521327694
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide each of the Manual Pairing Codes,
+          generated in the previous step, to the DUT in any format supported by
+          the DUT"
+      verification: |
+          (0xFFF1)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 749701123365521327694
+          Error: chip-tool pairs to chip-all-clusters-app with this invalid vendor ID but that is expected of chip-tool
+
+           (0xFFF2)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 749701123365522327692
+          Error: chip-tool pairs to chip-all-clusters-app with this invalid vendor ID but that is expected of chip-tool
+
+
+           (0xFFF3)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 749701123365523327697
+          Error: chip-tool pairs to chip-all-clusters-app with this invalid vendor ID but that is expected of chip-tool
+
+
+           (0xFFF4)
+           $  ./out/chip-tool/chip-tool pairing manualcode 1 749701123365524327693
+          Error: chip-tool pairs to chip-all-clusters-app with this invalid vendor ID but that is expected of chip-tool
+      disabled: true
+
+    - label:
+          'If (PICS_21_MANUAL_PC), PRODUCT_ID: Using the manual code from Step
+          1, generate a new manual code but substituting out the current
+          PRODUCT_ID with an invalid PRODUCT_ID of 0x0000(i.e. While following
+          section 2.5.3. "Product Identifier")'
+      verification: |
+          $ ./out/chip-tool/chip-tool payload generate-manualcode --discriminator 3840 --setup-pin-code 20202021 --version 0 --vendor-id 0xFFF1 --product-id 0x0000 --commissioning-mode 1 --allow-invalid-payload 1
+          [1651187401077] [13610:366251] CHIP: [TOO] Manual Code: 749701123365521000006
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          Error: chip-tool pairs to chip-all-clusters-app with this invalid Product ID of 0x0000
+
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 749701123365521000006
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Check Digit: Using the manual code from Step
+          1, generate a new manual code but substituting out the current
+          CHECK_DIGIT with an invalid CHECK_DIGIT (i.e. Any different
+          CHECK_DIGIT than the commissionees CHECK_DIGIT while following Table
+          39. Encoding Method with Vendor and Product IDs included
+          (VID_PID_Present == 1))"
+      verification: |
+          $ ./out/chip-tool/chip-tool payload verhoeff-verify 749701123365521327693 20
+          [1651187504088] [13629:367627] CHIP: [SPL] Verifying Manual Code: 74970112336552132769
+          [1651187504088] [13629:367627] CHIP: [SPL] 749701123365521327693 is INVALID at position 20
+      disabled: true
+
+    - label:
+          "If (PICS_21_MANUAL_PC), Provide the Manual Pairing Code, generated in
+          the previous step, to the DUT in any format supported by the DUT"
+      verification: |
+          $  ./out/chip-tool/chip-tool pairing manualcode 1 749701123365521327693
+
+          [1651187528666] [13631:367920] CHIP: [TOO] Run command failure: ../../examples/chip-tool/third_party/connectedhomeip/src/setup_payload/ManualSetupPayloadParser.cpp:50: CHIP Error 0x00000013: Integrity check failed
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml
new file mode 100644
index 00000000000000..39d9c4759d7da3
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml
@@ -0,0 +1,132 @@
+# 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.3.18. [TC-DD-3.18] Commissioning Flow - Commissioning Multiple Devices
+    [DUT - Commissioner]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Place TH1 into commissioning mode using the TH manufacturers means to
+          be discovered by a commissioner"
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app --discriminator 3840
+
+          [1651109580.413197][31207:31207] CHIP:DL: Device Configuration:
+          [1651109580.413259][31207:31207] CHIP:DL:   Serial Number: TEST_SN
+          [1651109580.413294][31207:31207] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651109580.413327][31207:31207] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651109580.413358][31207:31207] CHIP:DL:   Hardware Version: 0
+          [1651109580.413380][31207:31207] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651109580.413401][31207:31207] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651109580.413428][31207:31207] CHIP:DL:   Manufacturing Date: (not set)
+          [1651109580.413450][31207:31207] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651109580.413470][31207:31207] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651109580.413525][31207:31207] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
+      disabled: true
+
+    - label:
+          "Place TH2 into commissioning mode using the TH manufacturers means to
+          be discovered by a commissioner"
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app --discriminator 3844
+
+          [1651109859.015727][11588:11588] CHIP:DL: Device Configuration:
+          [1651109859.015789][11588:11588] CHIP:DL:   Serial Number: TEST_SN
+          [1651109859.015834][11588:11588] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651109859.015879][11588:11588] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651109859.015920][11588:11588] CHIP:DL:   Hardware Version: 0
+          [1651109859.015957][11588:11588] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651109859.015986][11588:11588] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3844 (0xF04)
+          [1651109859.016024][11588:11588] CHIP:DL:   Manufacturing Date: (not set)
+          [1651109859.016054][11588:11588] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651109859.016082][11588:11588] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651109859.016147][11588:11588] CHIP:SVR: SetupQRCode: [MT:-24J04QI14KA0648G00]
+      disabled: true
+
+    - label:
+          "If (PICS_SCAN_QR_CODE), Scan TH1s QR code using the DUT Commissioner."
+      verification: |
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
+      disabled: true
+
+    - label:
+          "DUT parses TH1s QR code. Follow any steps needed for the
+          Commissioner/Commissionee to complete the commissioning process over
+          the TH Commissionees method of device discovery"
+      verification: |
+          TH1 Commissionee:
+          [1651109784.452770][31207:31207] CHIP:SVR: Commissioning completed successfully
+          [1651109784.452813][31207:31207] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0AFN00KA0648G00
+
+          [1651109784376] [95553:65657838] CHIP: [CTL] Received CommissioningComplete response
+          [1651109784376] [95553:65657838] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651109784376] [95553:65657838] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651109784376] [95553:65657838] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651109784376] [95553:65657838] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651109784376] [95553:65657838] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "If (PICS_SCAN_QR_CODE), Scan TH2s QR code using the DUT Commissioner."
+      verification: |
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
+      disabled: true
+
+    - label:
+          "DUT parses TH2s QR code. Follow any steps needed for the
+          Commissioner/Commissionee to complete the commissioning process over
+          the TH Commissionees method of device discovery"
+      verification: |
+          TH2 Commissionee:
+          [1651109919.159014][11588:11588] CHIP:SVR: Commissioning completed successfully
+          [1651109919.159067][11588:11588] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 2 MT:-24J04QI14KA0648G00
+
+          [1651109919079] [95563:65659558] CHIP: [CTL] Received CommissioningComplete response
+          [1651109919079] [95563:65659558] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651109919079] [95563:65659558] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651109919079] [95563:65659558] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651109919079] [95563:65659558] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651109919079] [95563:65659558] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "Verify the Commissioner can still interact with TH1 (ex: Read any
+          clusters attribute from TH1)"
+      verification: |
+          $ ./out/chip-tool/chip-tool basic read reachable 1 0
+          [1651110057235] [95634:65662038] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0011 DataVersion: 3647361086
+          [1651110057235] [95634:65662038] CHIP: [TOO]   Reachable: TRUE
+      disabled: true
+
+    - label:
+          "Verify the Commissioner can still interact with TH2 (ex: Read any
+          clusters attribute from TH2)"
+      verification: |
+          $ ./out/chip-tool/chip-tool basic read reachable 2 0
+          [1651110080978] [95636:65662333] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0011 DataVersion: 3234420698
+          [1651110080978] [95636:65662333] CHIP: [TOO]   Reachable: TRUE
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml
new file mode 100644
index 00000000000000..e6f6446a536696
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml
@@ -0,0 +1,141 @@
+# 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.3.19. [TC-DD-3.19] Commissioning Flow - Commission, Unpair and
+    Re-commission Device [DUT - Commissionee]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Place DUT into commissioning mode using the DUTs manufacturers means
+          to be discovered by the TH Commissioner"
+      verification: |
+          DUT Commissionee:
+          $ ./out/all-clusters-app/chip-all-clusters-app --discriminator 3841
+
+          [1651111142.369356][32024:32024] CHIP:DL: Device Configuration:
+          [1651111142.369395][32024:32024] CHIP:DL:   Serial Number: TEST_SN
+          [1651111142.369438][32024:32024] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651111142.369470][32024:32024] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651111142.369496][32024:32024] CHIP:DL:   Hardware Version: 0
+          [1651111142.369514][32024:32024] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651111142.369531][32024:32024] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3841 (0xF01)
+          [1651111142.369555][32024:32024] CHIP:DL:   Manufacturing Date: (not set)
+          [1651111142.369573][32024:32024] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651111142.370760][32024:32024] CHIP:SVR: SetupQRCode: [MT:-24J0ALY01KA0648G00]
+
+          TH Commissioner:
+          $ ./out/chip-tool/chip-tool discover commissionables
+
+          [1651111150395] [95835:65674062] CHIP: [DL] Mdns: OnNewAddress interface: 7 ip:192.168.1.2
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Vendor ID: 65521
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Product ID: 32769
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Long Discriminator: 3841
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Pairing Hint: 33
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Hostname: DCA6328D2B9F0000
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Instance Name: B4B6B83476500D4A
+          [1651111150395] [95835:65674062] CHIP: [DIS]         IP Address #1: fe80::dea6:32ff:fe8d:2b9f
+          [1651111150395] [95835:65674062] CHIP: [DIS]         IP Address #2: fe80::dea6:32ff:fe8d:2ba0
+          [1651111150395] [95835:65674062] CHIP: [DIS]         IP Address #3: 192.168.1.2
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Port: 5540
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Commissioning Mode: 1
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Mrp Interval idle: 5000 ms
+          [1651111150395] [95835:65674062] CHIP: [DIS]         Mrp Interval active: 300 ms
+      disabled: true
+
+    - label:
+          "Scan DUTs QR code using the TH Commissioner. Follow any steps needed
+          for the Commissioner/Commissionee to complete the commissioning
+          process over the DUT Commissionees method of device discovery"
+      verification: |
+          DUT Commissionee:
+          [1651111335.475159][32130:32130] CHIP:SVR: Commissioning completed successfully
+          [1651111335.475204][32130:32130] CHIP:DIS: Updating services using commissioning mode 0
+
+          TH Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0ALY01KA0648G00
+
+          [1651111335378] [95843:65675989] CHIP: [CTL] Received CommissioningComplete response
+          [1651111335378] [95843:65675989] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651111335378] [95843:65675989] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651111335378] [95843:65675989] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651111335378] [95843:65675989] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651111335378] [95843:65675989] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "Using TH Commissioner, unpair the DUT Commissionee from the Matter
+          network."
+      verification: |
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          CHIP:TOO:   NOCResponse: {
+          CHIP:TOO:     statusCode: 0
+          CHIP:TOO:     fabricIndex: 2
+          CHIP:TOO:    }
+          CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "Place DUT Commissionee back into commissioning mode using the DUT
+          manufacturers means to be discovered by the TH Commissioner"
+      verification: |
+          1. On RasPi DUT $ rm -rf /tmp/chip*
+          2. On RasPi DUT $ ./out/all-clusters-app/chip-all-clusters-app --discriminator 3841
+
+          On TH chip-tool:
+          $ ./out/chip-tool/chip-tool discover commissionables
+          [1651111576350] [95850:65678872] CHIP: [DL] Mdns: OnNewAddress interface: 7 ip:192.168.1.2
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Vendor ID: 65521
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Product ID: 32769
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Long Discriminator: 3841
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Pairing Hint: 33
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Hostname: DCA6328D2B9F0000
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Instance Name: F17CF4C2DECCDA4B
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	IP Address #1: fe80::dea6:32ff:fe8d:2ba0
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	IP Address #2: fe80::dea6:32ff:fe8d:2b9f
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	IP Address #3: 192.168.1.2
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Port: 5540
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Commissioning Mode: 1
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Mrp Interval idle: 5000 ms
+          [1651111576350] [95850:65678872] CHIP: [DIS] 	Mrp Interval active: 300 ms
+      disabled: true
+
+    - label:
+          "Scan DUTs QR code using the TH Commissioner. Follow any steps needed
+          for the Commissioner/Commissionee to complete the commissioning
+          process over the DUT Commissionees method of device discovery"
+      verification: |
+          DUT Commissionee:
+          [1651111614.006849][32259:32259] CHIP:SVR: Commissioning completed successfully
+          [1651111614.006893][32259:32259] CHIP:DIS: Updating services using commissioning mode 0
+
+          TH Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0ALY01KA0648G00
+
+          [1651111613912] [95856:65679504] CHIP: [CTL] Received CommissioningComplete response
+          [1651111613912] [95856:65679504] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651111613912] [95856:65679504] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651111613912] [95856:65679504] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651111613912] [95856:65679504] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651111613912] [95856:65679504] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml
index bda5b17f99900c..0e1d4b9d1c6628 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml
@@ -13,7 +13,8 @@
 # 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: 7.3.2. [TC-DD-3.2] Commissioning Flow - Non-concurrent
+name:
+    3.3.2. [TC-DD-3.2] Commissioning Flow - Non-concurrent [DUT - Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -25,171 +26,11 @@ tests:
           "Commissioner and Commissionee discover each other and connect via the
           discovery mode applicable for the DUT."
       verification: |
-          On DUT: sudo ./chip-all-clusters-app
+          On DUT: start BLE Advertising by specific DUT implementation
 
+          On TH: start commissioning process(need to obtain the Thread dataset first)
 
-          On Controller: ./chip-tool discover commissionables
-
-          1. Connect the device to Ethernet
-          2. Disover the device using CHIP Tool . ./chip-tool discover commissionables
-          3. connect -ip <IPaddress discovered above> <Passcode> <node ID> ,
-          4. Once device is provisioned, read 'Product Name' attribute from the Basic cluster. Example:./chip-tool basic read product-name 1 0
-
-          Reference : below Full log for the above commands (click on this cell if you like to see complete log)
-
-
-          controller >  ./chip-tool discover commissionables
-          Waiting for device responses...
-          CHIP:CTL: Generating ICAC
-          CHIP:DL: AUDIT: ===== RANDOM NUMBER GENERATOR AUDIT START ====
-          CHIP:DL: AUDIT: * Validate buf1 and buf2 are <<<different every run/boot!>>>
-          CHIP:DL: AUDIT: * Validate r1 and r2 are <<<different every run/boot!>>>
-          CHIP:DL: AUDIT: * buf1: 3BE3E264C0A0A053248E93609D22044A
-          CHIP:DL: AUDIT: * buf2: E69C8767AD6B60907AD3633E774F38EB
-          CHIP:DL: AUDIT: * r1: 0x2A0E6454 r2: 0x16315893
-          CHIP:DL: AUDIT: ===== RANDOM NUMBER GENERATOR AUDIT END ====
-          CHIP:DL: writing settings to file (/tmp/chip_counters.ini-9yXPat)
-          CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          CHIP:DL: NVS set: chip-counters/reboot-count = 23 (0x17)
-          CHIP:DL: Got Ethernet interface: eth0
-          CHIP:DL: Found the primary Ethernet interface:eth0
-          CHIP:DL: Got WiFi interface: wlan0
-          CHIP:DL: Failed to reset WiFi statistic counts
-          CHIP:IN: UDP::Init bind&listen port=5541
-          CHIP:IN: UDP::Init bound to port=5541
-          CHIP:IN: UDP::Init bind&listen port=5541
-          CHIP:IN: UDP::Init bound to port=5541
-          CHIP:IN: TransportMgr initialized
-          CHIP:DIS: Init fabric pairing table with server storage
-          CHIP:DL: writing settings to file (/tmp/chip_counters.ini-zgCtZd)
-          CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          CHIP:DL: NVS set: chip-counters/GlobalMCTR = 25000 (0x61A8)
-          CHIP:CTL: System State Initialized...
-          CHIP:DL: MDNS failed to join multicast group on veth5731933 for address type IPv4: ../th
-          CHIP:DL: MDNS failed to join multicast group on vethbf7bfa6 for address type IPv4: ../th
-          CHIP:DL: MDNS failed to join multicast group on vethcf434e5 for address type IPv4: ../th
-          CHIP:ZCL: Using ZAP configuration...
-          CHIP:DIS: Verifying the received credentials
-          CHIP:IN: Generating compressed fabric ID using uncompressed fabric ID 0x0000000000000000
-          CHIP:IN: 0x04, 0x66, 0xd6, 0xcf, 0x4c, 0x1e, 0x11, 0xc3,
-          CHIP:IN: 0x52, 0x4f, 0xa6, 0x8c, 0x6e, 0x65, 0x46, 0xdc,
-          CHIP:IN: 0x90, 0x1b, 0x5f, 0x42, 0x9f, 0x69, 0xd1, 0xb7,
-          CHIP:IN: 0x7d, 0xf3, 0x6b, 0x54, 0x12, 0x6c, 0x12, 0x59,
-          CHIP:IN: 0x5b, 0xc3, 0x07, 0x1c, 0x5c, 0xf4, 0x4e, 0x5f,
-          CHIP:IN: 0x71, 0x06, 0x9a, 0xbb, 0x2f, 0xef, 0x20, 0x0d,
-          CHIP:IN: 0x0e, 0x9b, 0x26, 0x3e, 0x8d, 0x46, 0x09, 0xd8,
-          CHIP:IN: 0xfd, 0xa1, 0xc0, 0x10, 0x4f, 0x05, 0x14, 0x99,
-          CHIP:IN: 0x22,
-          CHIP:IN: Generated compressed fabric ID
-          CHIP:IN: 0x4a, 0x53, 0x1e, 0x52, 0x06, 0xed, 0x06, 0xda,
-          CHIP:DIS: Added new fabric at index: 1, Initialized: 1
-          CHIP:DIS: Assigned compressed fabric ID: 0x4A531E5206ED06DA, node ID: 0x000000000001B669
-          CHIP:CTL: Joined the fabric at index 1. Compressed fabric ID is: 0x4A531E5206ED06DA
-          CHIP:DL: CHIP task running
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-
-
-          controller> sudo ./chip-tool pairing ethernet 112233 20202021 3840 192.168.1.12 5540
-
-          Output of this command in cell number I6 and J6 due to cell constraint of maximum size.
-
-
-
-          controller> sudo ./chip-tool basic read product-name 0x000000000001B669 0
-
+          ./chip-tool pairing ble-thread 1 hex:0e080000000000010000000300000f35060004001fffe0020811111111222222220708fd27e57b1b1e22d9051000112233445566778899aabbccddeeff030e4f70656e54687265616444656d6f01021234041061e1206d2c2b46e079eb775f41fc72190c0402a0fff8 20202021 3840
           ,,
       disabled: true
 
@@ -197,95 +38,359 @@ tests:
           "Establish encryption keys with Password Authenticated Session
           Establishment on the commissioning channel"
       verification: |
-
-      disabled: true
-
-    - label:
-          "Commissioner arms Fail-safe timer on the Commissionee using
-          ArmFailSafe command"
-      verification: |
-
+          On TH:
+          CHIP:SC: Received PBKDF param response
       disabled: true
 
     - label:
-          "Commissioner configures the Commissionee UTC time, timezone, DST
-          offset, and regulatory information at the Commissionee."
+          "Commissioner SHALL re-arm Fail-safe timer on Commissionee within 60s
+          (the autonomously Fail-safe timer length set by Commissionee)"
       verification: |
-
+          On TH:
+          CHIP:CTL: Arming failsafe (60 seconds)
       disabled: true
 
     - label:
-          "Commissioner establishes the authenticity of the Commissionee as a
-          certified CHIP device."
+          "If (PICS_WIFI) or (PICS_THREAD), Commissioner SHALL configure
+          regulatory information in the Commissionee."
       verification: |
-
-      disabled: true
-
-    - label:
-          "Commissioner configures Fabric information using SetFabric command."
-      verification: |
-
+          On TH:
+          CHIP:CTL: Setting Regulatory Config
       disabled: true
 
     - label:
           "Commissioner requests operational CSR from Commissionee with
           OperationalCSRRequest command"
       verification: |
-
+          On TH:
+          CHIP:CTL: Sending CSR request to 0xffffa4001730 device
+          CHIP:DMG: ICR moving to [AddingComm]
+          CHIP:DMG: ICR moving to [AddedComma]
+          CHIP:IN: Prepared secure message 0xffffb9ba6db8 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45042i with MessageCounter:12011388.
+          CHIP:IN: Sending encrypted msg 0xffffb9ba6db8 with MessageCounter:12011388 to 0x0000000000000001 (1) at monotonic time: 304120 msec
+          CHIP:DMG: ICR moving to [CommandSen]
+          CHIP:CTL: Sent CSR request, waiting for the CSR
+          CHIP:DMG: ICR moving to [AwaitingDe]
+          CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          CHIP:DL: Indication received, conn = 0xffffb0044210
+          CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:DL: Indication received, conn = 0xffffb0044210
+          CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508040 on exchange 45042i
+          CHIP:EM: Found matching exchange: 45042i, Delegate: 0xffffb0040000
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x3e,
+          CHIP:DMG:                                        CommandId = 0x5,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = [
+          CHIP:DMG:                                                0x15, 0x30, 0x1, 0xcd, 0x30, 0x81, 0xca, 0x30, 0x70, 0x2, 0x1, 0x0, 0x30, 0xe, 0x31, 0xc, 0x30, 0xa, 0x6, 0x3, 0x55, 0x4, 0xa, 0xc, 0x3, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86
+          CHIP:DMG:                                ]
+          CHIP:DMG:                                        0x1 = [
+          CHIP:DMG:                                                0xea, 0xd6, 0x96, 0x53, 0x4d, 0x46, 0x1d, 0xd6, 0xcc, 0x7f, 0x25, 0x50, 0x80, 0x4c, 0x2a, 0xe9, 0xc8, 0xb8, 0x1b, 0x34, 0xca, 0x98, 0x38, 0x42, 0x74, 0xc2, 0x13, 0xf4, 0x10, 0x4d, 0xa2, 0x44, 0x38, 0x98, 0x28, 0xb6, 0xb1, 0x94, 0x6b, 0xd, 0x29, 0x1b
+          CHIP:DMG:                                ]
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
+          CHIP:CTL: Received certificate signing request from the device
+          CHIP:CTL: Getting certificate chain for the device from the issuer
+          CHIP:CTL: Verifying Certificate Signing Request
+          CHIP:CTL: Generating NOC
+          CHIP:CTL: Providing certificate chain to the commissioner
+          CHIP:CTL: Received callback from the CA for NOC Chain generation. Status ../../src/controller/ExampleOperationalCredentialsIssuer.cpp:225: Success
       disabled: true
 
     - label:
-          "Commissioner generates or otherwise obtains an Operational
-          Certificate containing Operational ID in response
-          OperationalCSRRequest command using ecosystem-specific means"
+          "Commissioner configures operational credentials on DUT if not
+          previously installed"
       verification: |
-
+          On TH:
+          [1651218829.220063][3273:3278] CHIP:CTL: Sending root certificate to the device
+          [1651218829.220201][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218829.222415][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218829.222549][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba6b98 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45043i with MessageCounter:12011389.
+          [1651218829.222616][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba6b98 with MessageCounter:12011389 to 0x0000000000000001 (1) at monotonic time: 305872 msec
+          [1651218829.222746][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218829.222789][3273:3278] CHIP:CTL: Sent root certificate to the device
+          [1651218829.223121][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218829.306861][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.404144][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.454121][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218829.454352][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508041 on exchange 45043i
+          CHIP:EM: Found matching exchange: 45043i, Delegate: 0xffffa400def0
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandStatusIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x3e,
+          CHIP:DMG:                                        CommandId = 0xb,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                StatusIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        status = 0x0,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003E Command=0x0000_000B Status=0x0
+          CHIP:CTL: Device confirmed that it has received the root certificate
       disabled: true
 
-    - label: "Commissioner configures operational credentials"
-      verification: |
-
-      disabled: true
-
-    - label: "Commissioner configures ACL."
+    - label:
+          "Commissioner configures itself as administrator in ACL on DUT if
+          needed"
       verification: |
-
+          On TH:
+          [1651218829.457248][3273:3278] CHIP:CTL: Sending operational certificate chain to the device
+          [1651218829.457372][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218829.460013][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218829.460273][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba7828 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45044i with MessageCounter:12011390.
+          [1651218829.460374][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba7828 with MessageCounter:12011390 to 0x0000000000000001 (1) at monotonic time: 306110 msec
+          [1651218829.460602][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218829.460684][3273:3278] CHIP:CTL: Sent operational certificate to the device
+          [1651218829.460778][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218829.550574][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.648065][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.745594][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218833.988087][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218833.988336][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1651218833.988598][3273:3278] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508042 on exchange 45044i
+          CHIP:EM: Found matching exchange: 45044i, Delegate: 0xffffb0040000
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x3e,
+          CHIP:DMG:                                        CommandId = 0x8,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = 0,
+          CHIP:DMG:                                        0x1 = 1,
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          CHIP:CTL: Device returned status 0 on receiving the NOC
+          CHIP:CTL: Operational credentials provisioned on device 0xffffa4001730
       disabled: true
 
     - label:
-          "Commissioner configures the operational network at the Commissionee."
+          "Commissioner configures operational network on DUT if DUT both
+          supports and requires"
       verification: |
-
+          On TH:
+          [1651218833.995054][3273:3278] CHIP:CTL: Adding thread network
+          [1651218833.995176][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218833.995253][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218833.995431][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba7848 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45045i with MessageCounter:12011391.
+          [1651218833.995523][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba7848 with MessageCounter:12011391 to 0x0000000000000001 (1) at monotonic time: 310645 msec
+          [1651218833.995723][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218833.995823][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218834.084548][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218834.134690][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218834.134918][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508043 on exchange 45045i
+          CHIP:EM: Found matching exchange: 45045i, Delegate: 0xffffa400def0
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x31,
+          CHIP:DMG:                                        CommandId = 0x5,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = 0,
+          CHIP:DMG:                                        0x1 = "",
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          CHIP:CTL: Received NetworkConfig response
       disabled: true
 
     - label:
-          "Commissioner triggers the Commissionee to connect to the operational
-          network"
+          "Commissioner instructs Commissionee to connect to operational network
+          if not already connected"
       verification: |
-
+          On TH:
+          [1651218834.137891][3273:3278] CHIP:CTL: Enabling thread network
+          [1651218834.138014][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218834.138086][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218834.138236][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba7938 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45046i with MessageCounter:12011392.
+          [1651218834.138325][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba7938 with MessageCounter:12011392 to 0x0000000000000001 (1) at monotonic time: 310788 msec
+          [1651218834.138522][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218834.138628][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218834.231701][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218834.426948][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218834.427186][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1651218834.427443][3273:3278] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508044 on exchange 45046i
+          CHIP:EM: Found matching exchange: 45046i, Delegate: 0xffffb0040000
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x31,
+          CHIP:DMG:                                        CommandId = 0x7,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = 0,
+          CHIP:DMG:                                        0x1 = "",
+          CHIP:DMG:                                        0x2 = 0,
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
+          CHIP:CTL: Received ConnectNetwork response
       disabled: true
 
     - label:
-          "Commissioner and Commissionee discover each other on the operational
-          network using operational discovery"
+          "Commissioning channel between the Commissioner and Commissionee is
+          terminated."
       verification: |
 
       disabled: true
 
-    - label: "Commissioner and Commissionee establish encryption keys with CASE"
+    - label: "Commissioner starts discovery of DUT using Operational Discovery"
       verification: |
-
+          On TH:
+          CHIP:DL: Avahi resolve found
+          CHIP:DIS: Node ID resolved for 0x0000000000000001
+          CHIP:DIS:     Addr 0: [fd11:22::9d96:8fcf:10cf:799e]:5540
+          CHIP:CTL: OperationalDiscoveryComplete for device ID 0x0000000000000001
       disabled: true
 
     - label:
-          "Commissioner and Commissionee perform commissioning complete message
-          exchange using CommissioningComplete command and
-          CommissioningCompleteResponse command"
+          "Commissioner opens a CASE session with DUT over operational network"
       verification: |
-
+          On TH:
+          CHIP:SC: Sent Sigma1 msg
+          CHIP:CTL: Address resolved for node: 0x0000000000000001
+          CHIP:EM: Received message of type 0x31 with protocolId (0, 0) and MessageCounter:1066460336 on exchange 45047i
+          CHIP:EM: Found matching exchange: 45047i, Delegate: 0xffffa400f7f8
+          CHIP:EM: Rxd Ack; Removing MessageCounter:2352378411 from Retrans Table on exchange 45047i
+          CHIP:EM: Removed CHIP MessageCounter:2352378411 from RetransTable on exchange 45047i
+          CHIP:SC: Received Sigma2 msg
+          CHIP:SC: Peer assigned session session ID 2
+          CHIP:SC: The device does not support GetClock_RealTimeMS() API. This will eventually result in CASE session setup failures.
+          CHIP:IN: Generating compressed fabric ID using uncompressed fabric ID 0x0000000000000001 and root pubkey
+          CHIP:IN: 0x04, 0x6e, 0x3e, 0x58, 0x9d, 0x08, 0xd6, 0xae,
+          CHIP:IN: 0xe9, 0xff, 0x9b, 0x8f, 0xba, 0x6f, 0x57, 0x73,
+          CHIP:IN: 0x21, 0xc4, 0xe2, 0x7b, 0x09, 0xe4, 0x24, 0x7f,
+          CHIP:IN: 0x55, 0x44, 0x3b, 0xf2, 0x7c, 0x13, 0x45, 0x3b,
+          CHIP:IN: 0x82, 0xa8, 0x42, 0x96, 0xb4, 0x36, 0x78, 0x20,
+          CHIP:IN: 0xa1, 0x37, 0x69, 0xf0, 0x20, 0xc9, 0x20, 0x7e,
+          CHIP:IN: 0x66, 0x45, 0x84, 0x53, 0x1b, 0x3e, 0xd2, 0x61,
+          CHIP:IN: 0xb6, 0x89, 0x27, 0xfd, 0xe8, 0x23, 0x69, 0x6d,
+          CHIP:IN: 0x93,
+          CHIP:IN: Generated compressed fabric ID
+          CHIP:IN: 0xa3, 0x54, 0xab, 0x2a, 0xa2, 0x1f, 0x8e, 0x48,
+          CHIP:SC: Found MRP parameters in the message
+          CHIP:SC: Sending Sigma3
+          CHIP:EM: Piggybacking Ack for MessageCounter:1066460336 on exchange: 45047i
+          CHIP:IN: Prepared unauthenticated message 0xaaaad7ce1bf8 to 0x0000000000000000 (0)  of type 0x32 and protocolId (0, 0) on exchange 45047i with MessageCounter:2352378412.
+          CHIP:IN: Sending unauthenticated msg 0xaaaad7ce1bf8 with MessageCounter:2352378412 to 0x0000000000000000 at monotonic time: 315803 msec
+          CHIP:SC: Sent Sigma3 msg
+          CHIP:EM: Received message of type 0x40 with protocolId (0, 0) and MessageCounter:1066460337 on exchange 45047i
+          CHIP:EM: Found matching exchange: 45047i, Delegate: 0xffffa400f7f8
+          CHIP:EM: Rxd Ack; Removing MessageCounter:2352378412 from Retrans Table on exchange 45047i
+          CHIP:EM: Removed CHIP MessageCounter:2352378412 from RetransTable on exchange 45047i
+          CHIP:SC: Success status report received. Session was established
+          CHIP:IN: New secure session created for device 0x0000000000000001, LSID:2 PSID:2!
       disabled: true
 
-    - label: "Same steps as 1.a. Force exit any step in 1.."
+    - label: "Commissioner sends CommissioningComplete command"
       verification: |
-
+          On TH:
+          CHIP:CTL: Received CommissioningComplete response
+          CHIP:CTL: Rendezvous cleanup
+          CHIP:TOO: Device commissioning completed with success
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml
new file mode 100644
index 00000000000000..db4d868d6c4f2e
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml
@@ -0,0 +1,129 @@
+# 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.3.20. [TC-DD-3.20] Commissioning Flow - Commission, Unpair and
+    Re-commission Device [DUT - Commissioner]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Place TH into commissioning mode using the TH manufacturers means to
+          be discovered by the DUT Commissioner"
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app --discriminator 3840
+
+          [1651109580.413197][31207:31207] CHIP:DL: Device Configuration:
+          [1651109580.413259][31207:31207] CHIP:DL:   Serial Number: TEST_SN
+          [1651109580.413294][31207:31207] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651109580.413327][31207:31207] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651109580.413358][31207:31207] CHIP:DL:   Hardware Version: 0
+          [1651109580.413380][31207:31207] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651109580.413401][31207:31207] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651109580.413428][31207:31207] CHIP:DL:   Manufacturing Date: (not set)
+          [1651109580.413450][31207:31207] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651109580.413470][31207:31207] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651109580.413525][31207:31207] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
+      disabled: true
+
+    - label:
+          "If (PICS_SCAN_QR_CODE), Scan THs QR code using the DUT Commissioner."
+      verification: |
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
+      disabled: true
+
+    - label:
+          "DUT parses THs QR code. Follow any steps needed for the
+          Commissioner/Commissionee to complete the commissioning process over
+          the TH Commissionees method of device discovery"
+      verification: |
+          TH Commissionee:
+          [1651109784.452770][31207:31207] CHIP:SVR: Commissioning completed successfully
+          [1651109784.452813][31207:31207] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0AFN00KA0648G00
+
+          [1651109784376] [95553:65657838] CHIP: [CTL] Received CommissioningComplete response
+          [1651109784376] [95553:65657838] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651109784376] [95553:65657838] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651109784376] [95553:65657838] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651109784376] [95553:65657838] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651109784376] [95553:65657838] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "Using DUT Commissioner, unpair the TH Commissionee from the Matter
+          network."
+      verification: |
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          CHIP:TOO:   NOCResponse: {
+          CHIP:TOO:     statusCode: 0
+          CHIP:TOO:     fabricIndex: 2
+          CHIP:TOO:    }
+          CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "Place TH Commissionee back into commissioning mode using the TH
+          manufacturers means to be discovered by the DUT Commissioner"
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app --discriminator 3840
+
+          [1651110721.112368][31791:31791] CHIP:DL: Device Configuration:
+          [1651110721.112448][31791:31791] CHIP:DL:   Serial Number: TEST_SN
+          [1651110721.112501][31791:31791] CHIP:DL:   Vendor Id: 65521 (0xFFF1)
+          [1651110721.112552][31791:31791] CHIP:DL:   Product Id: 32769 (0x8001)
+          [1651110721.112597][31791:31791] CHIP:DL:   Hardware Version: 0
+          [1651110721.112630][31791:31791] CHIP:DL:   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1651110721.112662][31791:31791] CHIP:DL:   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
+          [1651110721.112703][31791:31791] CHIP:DL:   Manufacturing Date: (not set)
+          [1651110721.112737][31791:31791] CHIP:DL:   Device Type: 65535 (0xFFFF)
+          [1651110721.112767][31791:31791] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
+          [1651110721.112838][31791:31791] CHIP:SVR: SetupQRCode: [MT:-24J0AFN00KA0648G00]
+      disabled: true
+
+    - label:
+          "If (PICS_SCAN_QR_CODE), Scan THs QR code using the DUT Commissioner."
+      verification: |
+          1. Verify the QR code is scanned by DUT, chip-tool does not support physically scanning QR codes
+      disabled: true
+
+    - label:
+          "DUT parses THs QR code. Follow any steps needed for the
+          Commissioner/Commissionee to complete the commissioning process over
+          the TH Commissionees method of device discovery"
+      verification: |
+          TH Commissionee:
+          [1651110724.759825][31791:31791] CHIP:SVR: Commissioning completed successfully
+          [1651110724.759869][31791:31791] CHIP:DIS: Updating services using commissioning mode 0
+
+          DUT Commissioner:
+          $ ./out/chip-tool/chip-tool pairing qrcode 1 MT:-24J0AFN00KA0648G00
+
+          [1651110724689] [95810:65669790] CHIP: [CTL] Received CommissioningComplete response
+          [1651110724689] [95810:65669790] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651110724689] [95810:65669790] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651110724689] [95810:65669790] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651110724689] [95810:65669790] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651110724689] [95810:65669790] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
index da7331f6f84756..5400614725304a 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
@@ -13,7 +13,7 @@
 # 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: 7.3.5. [TC-DD-3.5] Commissioning Flow - Concurrent [DUT - Commissioner]
+name: 3.3.5. [TC-DD-3.5] Commissioning Flow - Concurrent [DUT - Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -22,8 +22,8 @@ config:
 
 tests:
     - label:
-          "Commissioner and Commissionee discover each other and connect via the
-          discovery mode applicable for the DUT."
+          "Commissioner has regulatory and fabric information available and has
+          accurate date, time and timezone"
       verification: |
           On DUT: sudo ./chip-all-clusters-app
 
@@ -194,93 +194,343 @@ tests:
       disabled: true
 
     - label:
-          "Establish encryption keys with Password Authenticated Session
-          Establishment on the commissioning channel"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "Commissioner arms Fail-safe timer on the Commissionee using
-          ArmFailSafe command"
+          "Commissioner and Commissionee discover each other and connect via the
+          discovery mode applicable for the DUT. If (PICS_DT_IP), TH device is
+          advertising over IP Network using DNS-based Service Discovery (DNS-SD)"
       verification: |
+          Verify on DUT:
 
+          ./chip-tool discover commissionables
+          Waiting for device responses...
+          CHIP:CTL: Generating ICAC
+          CHIP:DL: AUDIT: ===== RANDOM NUMBER GENERATOR AUDIT START ====
+          CHIP:DL: AUDIT: * Validate buf1 and buf2 are <<<different every run/boot!>>>
+          CHIP:DL: AUDIT: * Validate r1 and r2 are <<<different every run/boot!>>>
+          CHIP:DL: AUDIT: * buf1: 3BE3E264C0A0A053248E93609D22044A
+          CHIP:DL: AUDIT: * buf2: E69C8767AD6B60907AD3633E774F38EB
+          CHIP:DL: AUDIT: * r1: 0x2A0E6454 r2: 0x16315893
+          CHIP:DL: AUDIT: ===== RANDOM NUMBER GENERATOR AUDIT END ====
+          CHIP:DL: writing settings to file (/tmp/chip_counters.ini-9yXPat)
+          CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
+          CHIP:DL: NVS set: chip-counters/reboot-count = 23 (0x17)
+          CHIP:DL: Got Ethernet interface: eth0
+          CHIP:DL: Found the primary Ethernet interface:eth0
+          CHIP:DL: Got WiFi interface: wlan0
+          CHIP:DL: Failed to reset WiFi statistic counts
+          CHIP:IN: UDP::Init bind&listen port=5541
+          CHIP:IN: UDP::Init bound to port=5541
+          CHIP:IN: UDP::Init bind&listen port=5541
+          CHIP:IN: UDP::Init bound to port=5541
+          CHIP:IN: TransportMgr initialized
+          CHIP:DIS: Init fabric pairing table with server storage
+          CHIP:DL: writing settings to file (/tmp/chip_counters.ini-zgCtZd)
+          CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
+          CHIP:DL: NVS set: chip-counters/GlobalMCTR = 25000 (0x61A8)
+          CHIP:CTL: System State Initialized...
+          CHIP:DL: MDNS failed to join multicast group on veth5731933 for address type IPv4: ../th
+          CHIP:DL: MDNS failed to join multicast group on vethbf7bfa6 for address type IPv4: ../th
+          CHIP:DL: MDNS failed to join multicast group on vethcf434e5 for address type IPv4: ../th
+          CHIP:ZCL: Using ZAP configuration...
+          CHIP:DIS: Verifying the received credentials
+          CHIP:IN: Generating compressed fabric ID using uncompressed fabric ID 0x0000000000000000
+          CHIP:IN: 0x04, 0x66, 0xd6, 0xcf, 0x4c, 0x1e, 0x11, 0xc3,
+          CHIP:IN: 0x52, 0x4f, 0xa6, 0x8c, 0x6e, 0x65, 0x46, 0xdc,
+          CHIP:IN: 0x90, 0x1b, 0x5f, 0x42, 0x9f, 0x69, 0xd1, 0xb7,
+          CHIP:IN: 0x7d, 0xf3, 0x6b, 0x54, 0x12, 0x6c, 0x12, 0x59,
+          CHIP:IN: 0x5b, 0xc3, 0x07, 0x1c, 0x5c, 0xf4, 0x4e, 0x5f,
+          CHIP:IN: 0x71, 0x06, 0x9a, 0xbb, 0x2f, 0xef, 0x20, 0x0d,
+          CHIP:IN: 0x0e, 0x9b, 0x26, 0x3e, 0x8d, 0x46, 0x09, 0xd8,
+          CHIP:IN: 0xfd, 0xa1, 0xc0, 0x10, 0x4f, 0x05, 0x14, 0x99,
+          CHIP:IN: 0x22,
+          CHIP:IN: Generated compressed fabric ID
+          CHIP:IN: 0x4a, 0x53, 0x1e, 0x52, 0x06, 0xed, 0x06, 0xda,
+          CHIP:DIS: Added new fabric at index: 1, Initialized: 1
+          CHIP:DIS: Assigned compressed fabric ID: 0x4A531E5206ED06DA, node ID: 0x000000000001B669
+          CHIP:CTL: Joined the fabric at index 1. Compressed fabric ID is: 0x4A531E5206ED06DA
+          CHIP:DL: CHIP task running
+          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
+          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
+          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
+          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
+          CHIP:DIS: Discovered Node:
+          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
+          CHIP:DIS:      Port:                   5540
+          CHIP:DIS:      Long discriminator:     3840
+          CHIP:DIS:      Vendor ID:              9050
+          CHIP:DIS:      Product ID:             65279
+          CHIP:DIS:      Commissioning Mode      1
+          CHIP:DIS:      Device Type             0
+          CHIP:DIS:      Device Name
+          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
+          CHIP:DIS:      Pairing Instruction
+          CHIP:DIS:      Pairing Hint            0x21
+          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 2:              192.168.1.12
+          CHIP:DIS: Discovered Node:
+          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
+          CHIP:DIS:      Port:                   5540
+          CHIP:DIS:      Long discriminator:     3840
+          CHIP:DIS:      Vendor ID:              9050
+          CHIP:DIS:      Product ID:             65279
+          CHIP:DIS:      Commissioning Mode      1
+          CHIP:DIS:      Device Type             0
+          CHIP:DIS:      Device Name
+          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
+          CHIP:DIS:      Pairing Instruction
+          CHIP:DIS:      Pairing Hint            0x21
+          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 2:              192.168.1.12
+          CHIP:DIS: Discovered Node:
+          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
+          CHIP:DIS:      Port:                   5540
+          CHIP:DIS:      Long discriminator:     3840
+          CHIP:DIS:      Vendor ID:              9050
+          CHIP:DIS:      Product ID:             65279
+          CHIP:DIS:      Commissioning Mode      1
+          CHIP:DIS:      Device Type             0
+          CHIP:DIS:      Device Name
+          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
+          CHIP:DIS:      Pairing Instruction
+          CHIP:DIS:      Pairing Hint            0x21
+          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 2:              192.168.1.12
+          CHIP:DIS: Discovered Node:
+          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
+          CHIP:DIS:      Port:                   5540
+          CHIP:DIS:      Long discriminator:     3840
+          CHIP:DIS:      Vendor ID:              9050
+          CHIP:DIS:      Product ID:             65279
+          CHIP:DIS:      Commissioning Mode      1
+          CHIP:DIS:      Device Type             0
+          CHIP:DIS:      Device Name
+          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
+          CHIP:DIS:      Pairing Instruction
+          CHIP:DIS:      Pairing Hint            0x21
+          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 2:              192.168.1.12
+          CHIP:DIS: Discovered Node:
+          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
+          CHIP:DIS:      Port:                   5540
+          CHIP:DIS:      Long discriminator:     3840
+          CHIP:DIS:      Vendor ID:              9050
+          CHIP:DIS:      Product ID:             65279
+          CHIP:DIS:      Commissioning Mode      1
+          CHIP:DIS:      Device Type             0
+          CHIP:DIS:      Device Name
+          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
+          CHIP:DIS:      Pairing Instruction
+          CHIP:DIS:      Pairing Hint            0x21
+          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 2:              192.168.1.12
+          CHIP:DIS: Discovered Node:
+          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
+          CHIP:DIS:      Port:                   5540
+          CHIP:DIS:      Long discriminator:     3840
+          CHIP:DIS:      Vendor ID:              9050
+          CHIP:DIS:      Product ID:             65279
+          CHIP:DIS:      Commissioning Mode      1
+          CHIP:DIS:      Device Type             0
+          CHIP:DIS:      Device Name
+          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
+          CHIP:DIS:      Pairing Instruction
+          CHIP:DIS:      Pairing Hint            0x21
+          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
+          CHIP:DIS:      Address 2:              192.168.1.12
       disabled: true
 
     - label:
-          "Commissioner SHALL configure at the Commissionee UTC time, timezone,
-          DST offset, and regulatory information at the Commissionee."
+          "Establish encryption keys with Password Authenticated Session
+          Establishment on the commissioning channel"
       verification: |
-
+          Verify on DUT:
+
+          CHIP:SC: Sent PBKDF param request
+          CHIP:CTL: Setting attestation nonce to random value
+          CHIP:CTL: Setting CSR nonce to random value
+          CHIP:CTL: Commission called for node ID 0x000000000001B669
+          CHIP:EM: Received message of type 0x21 with protocolId (0, 0) and MessageCounter:1341084110 on exchange 63762i
+          CHIP:EM: Found matching exchange: 63762i, Delegate: 0xffff8c000bc0
+          CHIP:EM: Rxd Ack; Removing MessageCounter:850320430 from Retrans Table on exchange 63762i
+          CHIP:EM: Removed CHIP MessageCounter:850320430 from RetransTable on exchange 63762i
+          CHIP:SC: Received PBKDF param response
       disabled: true
 
     - label:
-          "Commissioner establishes the authenticity of the Commissionee as a
-          certified CHIP device."
+          "Commissioner SHALL re-arm Fail-safe timer on Commissionee within 60s
+          (the autonomously Fail-safe timer length set by Commissionee)"
       verification: |
+          Verify on DUT:
 
+          CHIP:CTL: Commissioning stage next step: 'ReadCommissioningInfo' -> 'ArmFailSafe'
+          CHIP:CTL: Performing next commissioning step 'ArmFailSafe'
+          CHIP:CTL: Arming failsafe (60 seconds)
       disabled: true
 
     - label:
-          "Commissioner configures Fabric information using SetFabric command."
+          "If (PICS_WIFI) or (PICS_THREAD), Commissioner SHALL configure
+          regulatory information in the Commissionee."
       verification: |
-
+          Need chip-tool implementation
       disabled: true
 
     - label:
           "Commissioner requests operational CSR from Commissionee with
           OperationalCSRRequest command"
       verification: |
+          Verify on TH:
 
+          CHIP:ZCL: OpCreds: commissioner has requested a CSR
+          CHIP:ZCL: OpCreds: NewCertificateSigningRequest returned ../../third_party/connectedhomeip/src/crypto/CHIPCryptoPALOpenSSL.cpp:1114: Success
       disabled: true
 
     - label:
-          "Commissioner generates or otherwise obtains an Operational
-          Certificate containing Operational ID in response
-          OperationalCSRRequest command using ecosystem-specific means"
+          "Commissioner configures operational credentials on DUT if not
+          previously installed"
       verification: |
-
+          Verify on DUT:
+
+          CHIP:CTL: Performing next commissioning step 'SendTrustedRootCert'
+          CHIP:CTL: Sending root certificate to the device
+          CHIP:DMG: ICR moving to [AddingComm]
+          CHIP:DMG: ICR moving to [AddedComma]
+          CHIP:IN: Prepared secure message 0xaaaafc0d5be8 to 0x000000000001B669 (1)  of type 0x8 and protocolId (0, 1) on exchange 63770i with MessageCounter:695615.
+          CHIP:IN: Sending encrypted msg 0xaaaafc0d5be8 with MessageCounter:695615 to 0x000000000001B669 (1) at monotonic time: 0000000000FBA3DE msec
+          CHIP:DMG: ICR moving to [CommandSen]
+          CHIP:CTL: Sent root certificate to the device
       disabled: true
 
-    - label: "Commissioner configures operational credentials"
+    - label:
+          "Commissioner configures itself as administrator in ACL on TH if
+          needed"
       verification: |
-
+          Verify the following on TH after commissioning
+
+          [1646909537.115328][3145:3150] CHIP:CTL: Sending CSR request to 0xffffac001730 device
+          [1646909537.115512][3145:3150] CHIP:DMG: ICR moving to [AddingComm]
+          [1646909537.115589][3145:3150] CHIP:DMG: ICR moving to [AddedComma]
+          [1646909537.115861][3145:3150] CHIP:IN: Prepared secure message 0xffffb67cbd98 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 7731i with MessageCounter:8191681.
+          [1646909537.115959][3145:3150] CHIP:IN: Sending encrypted msg 0xffffb67cbd98 with MessageCounter:8191681 to 0x0000000000000001 (1) at monotonic time: 10877964 msec
+          [1646909537.116173][3145:3150] CHIP:DMG: ICR moving to [CommandSen]
+          [1646909537.116242][3145:3150] CHIP:CTL: Sent CSR request, waiting for the CSR
+          [1646909537.116356][3145:3150] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1646909537.193355][3145:3150] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1646909537.241579][3145:3148] CHIP:DL: Indication received, conn = 0xffffa803b310
+          [1646909537.241838][3145:3150] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1646909537.341266][3145:3148] CHIP:DL: Indication received, conn = 0xffffa803b310
+          [1646909537.341523][3145:3150] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1646909537.341903][3145:3150] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:2304337 on exchange 7731i
+          [1646909537.341988][3145:3150] CHIP:EM: Found matching exchange: 7731i, Delegate: 0xffffa8026ab0
+          [1646909537.342086][3145:3150] CHIP:DMG: ICR moving to [ResponseRe]
+          [1646909537.342191][3145:3150] CHIP:DMG: InvokeResponseMessage =
+          [1646909537.342251][3145:3150] CHIP:DMG: {
+          [1646909537.342310][3145:3150] CHIP:DMG:         suppressResponse = false,
+          [1646909537.342370][3145:3150] CHIP:DMG:         InvokeResponseIBs =
+          [1646909537.342450][3145:3150] CHIP:DMG:         [
+          [1646909537.342511][3145:3150] CHIP:DMG:                 InvokeResponseIB =
+          [1646909537.342598][3145:3150] CHIP:DMG:                 {
+          [1646909537.342662][3145:3150] CHIP:DMG:                         CommandDataIB =
+          [1646909537.342749][3145:3150] CHIP:DMG:                         {
+          [1646909537.342832][3145:3150] CHIP:DMG:                                 CommandPathIB =
+          [1646909537.342915][3145:3150] CHIP:DMG:                                 {
+          [1646909537.342998][3145:3150] CHIP:DMG:                                         EndpointId = 0x0,
+          [1646909537.343091][3145:3150] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1646909537.343177][3145:3150] CHIP:DMG:                                         CommandId = 0x5,
+          [1646909537.343262][3145:3150] CHIP:DMG:                                 },
+          [1646909537.343346][3145:3150] CHIP:DMG:
+          [1646909537.343420][3145:3150] CHIP:DMG:                                 CommandData =
+          [1646909537.343548][3145:3150] CHIP:DMG:                                 {
+          [1646909537.343632][3145:3150] CHIP:DMG:                                         0x0 = [
+          [1646909537.343772][3145:3150] CHIP:DMG:                                                 0x15, 0x30, 0x1, 0xcb, 0x30, 0x81, 0xc8, 0x30, 0x70, 0x2, 0x1, 0x0, 0x30, 0xe, 0x31, 0xc, 0x30, 0xa, 0x6, 0x3, 0x55, 0x4, 0xa, 0xc, 0x3, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86
+          [1646909537.343880][3145:3150] CHIP:DMG:                                 ]
+          [1646909537.343968][3145:3150] CHIP:DMG:                                         0x1 = [
+          [1646909537.344094][3145:3150] CHIP:DMG:                                                 0xbd, 0xef, 0xb7, 0x8c, 0x5, 0x95, 0x9b, 0x60, 0xf4, 0xb1, 0xf7, 0x9c, 0x24, 0x50, 0x51, 0x9c, 0x59, 0x46, 0x97, 0x5e, 0x89, 0xe8, 0x7d, 0x29, 0x88, 0xac, 0x45, 0xed, 0xa6, 0xca, 0xac, 0x55, 0x2a, 0x7e, 0x11, 0x71, 0xe9, 0x68, 0x0, 0x91, 0xe, 0x23,
+          [1646909537.344193][3145:3150] CHIP:DMG:                                 ]
+          [1646909537.344274][3145:3150] CHIP:DMG:                                 },
+          [1646909537.344349][3145:3150] CHIP:DMG:                         },
+          [1646909537.344442][3145:3150] CHIP:DMG:
+          [1646909537.344508][3145:3150] CHIP:DMG:                 },
+          [1646909537.344588][3145:3150] CHIP:DMG:
+          [1646909537.344646][3145:3150] CHIP:DMG:         ],
+          [1646909537.344721][3145:3150] CHIP:DMG:
+          [1646909537.344779][3145:3150] CHIP:DMG:         InteractionModelRevision = 1
+          [1646909537.344837][3145:3150] CHIP:DMG: },
+          [1646909537.344985][3145:3150] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
+          [1646909537.345068][3145:3150] CHIP:CTL: Received certificate signing request from the device
+          [1646909537.345139][3145:3150] CHIP:CTL: Getting certificate chain for the device from the issuer
+          [1646909537.347800][3145:3150] CHIP:CTL: Verifying Certificate Signing Request
+          [1646909537.349300][3145:3150] CHIP:CTL: Generating NOC
+          [1646909537.350268][3145:3150] CHIP:CTL: Providing certificate chain to the commissioner
+          [1646909537.350347][3145:3150] CHIP:CTL: Received callback from the CA for NOC Chain generation. Status ../../third_party/connectedhomeip/src/controller/ExampleOperationalCredentialsIssuer.cpp:225: Success
       disabled: true
 
-    - label: "Commissioner configures ACL."
+    - label:
+          "Commissioner configures operational network on TH if TH both supports
+          and requires"
       verification: |
+          Verifiy on DUT:
 
+          CHIP:CTL: Operational credentials provisioned on device 0xffff8c000b60
+          CHIP:TOO: Secure Pairing Success
       disabled: true
 
     - label:
-          "Commissioner configures the operational network at the Commissionee."
+          "Commissioner instructs Commissionee to connect to operational network
+          if not already connected"
       verification: |
+          Verify on DUT:
 
+          CHIP:CTL: Performing next commissioning step 'FindOperational'
+          CHIP:CSM: FindOrEstablishSession: PeerId = BFCBED670D527591:000000000001B669
+          CHIP:CSM: FindOrEstablishSession: No existing OperationalDeviceProxy instance found
       disabled: true
 
-    - label:
-          "Commissioner triggers the Commissionee to connect to the operational
-          network"
+    - label: "Commissioner starts discovery of TH using Operational Discovery"
       verification: |
-
+          Verify on DUT:
+
+          CHIP:DIS: Resolving BFCBED670D527591:000000000001B669 ...
+          CHIP:DIS: Operational node lookup already in progress. Will NOT start a new one.
+          CHIP:DMG: ICR moving to [AwaitingDe]
+          CHIP:EM: Sending Standalone Ack for MessageCounter:9439913 on exchange 63771i
+          CHIP:IN: Prepared secure message 0xffffa1c07938 to 0x000000000001B669 (1)  of type 0x10 and protocolId (0, 0) on exchange 63771i with MessageCounter:695619.
+          CHIP:IN: Sending encrypted msg 0xffffa1c07938 with MessageCounter:695619 to 0x000000000001B669 (1) at monotonic time: 0000000000FBA446 msec
+          CHIP:EM: Flushed pending ack for MessageCounter:9439913 on exchange 63771i
+          CHIP:DL: Avahi resolve found
+          CHIP:DIS: Node ID resolved for BFCBED670D527591:000000000001B669
+          CHIP:DIS:     Addr 0: [fe80::dea6:32ff:feba:b3f7]:5540
       disabled: true
 
     - label:
-          "Commissioner and Commissionee discover each other on the operational
-          network using operational discovery"
+          "Commissioner opens a CASE session with TH over operational network"
       verification: |
+          Verifiy on DUT:
 
+          CHIP:SC: Establishing CASE session
       disabled: true
 
-    - label: "Commissioner and Commissionee establish encryption keys with CASE"
+    - label: "Commissioner sends CommissioningComplete command"
       verification: |
+          Verifiy on DUT:
 
+          CHIP:CTL: Received CommissioningComplete response
+          CHIP:CTL: Successfully finished commissioning step 'SendComplete'
       disabled: true
 
     - label:
-          "Commissioner and Commissionee perform commissioning complete message
-          exchange using CommissioningComplete command and
-          CommissioningCompleteResponse command"
+          "Commissioning channel between the Commissioner and Commissionee is
+          terminated."
       verification: |
+          Verify the following on DUT:
 
+          CHIP:CTL: Successfully finished commissioning step 'SendComplete'
+          CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          CHIP:CTL: Performing next commissioning step 'Cleanup'
+          CHIP:CTL: Successfully finished commissioning step 'Cleanup'
+          CHIP:TOO: Device commissioning completed with success
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml
index fbf0f2ddbe71bf..dfc4efa8cdad97 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    7.3.6. [TC-DD-3.6] Commissioning Flow - Non-concurrent [DUT - Commissioner]
+    3.3.6. [TC-DD-3.6] Commissioning Flow - Non-concurrent [DUT - Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -23,265 +23,386 @@ config:
 
 tests:
     - label:
-          "Commissioner and Commissionee discover each other and connect via the
-          discovery mode applicable for the DUT."
+          "Commissioner has regulatory and fabric information available and has
+          accurate date, time and timezone"
       verification: |
-          On DUT: sudo ./chip-all-clusters-app
-
-
-          On Controller: ./chip-tool discover commissionables
-
-          1. Connect the device to Ethernet
-          2. Disover the device using CHIP Tool . ./chip-tool discover commissionables
-          3. connect -ip <IPaddress discovered above> <Passcode> <node ID> ,
-          4. Once device is provisioned, read 'Product Name' attribute from the Basic cluster. Example:./chip-tool basic read product-name 1 0
-
-          Reference : below Full log for the above commands (click on this cell if you like to see complete log)
-
-
-          controller >  ./chip-tool discover commissionables
-          Waiting for device responses...
-          CHIP:CTL: Generating ICAC
-          CHIP:DL: AUDIT: ===== RANDOM NUMBER GENERATOR AUDIT START ====
-          CHIP:DL: AUDIT: * Validate buf1 and buf2 are <<<different every run/boot!>>>
-          CHIP:DL: AUDIT: * Validate r1 and r2 are <<<different every run/boot!>>>
-          CHIP:DL: AUDIT: * buf1: 3BE3E264C0A0A053248E93609D22044A
-          CHIP:DL: AUDIT: * buf2: E69C8767AD6B60907AD3633E774F38EB
-          CHIP:DL: AUDIT: * r1: 0x2A0E6454 r2: 0x16315893
-          CHIP:DL: AUDIT: ===== RANDOM NUMBER GENERATOR AUDIT END ====
-          CHIP:DL: writing settings to file (/tmp/chip_counters.ini-9yXPat)
-          CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          CHIP:DL: NVS set: chip-counters/reboot-count = 23 (0x17)
-          CHIP:DL: Got Ethernet interface: eth0
-          CHIP:DL: Found the primary Ethernet interface:eth0
-          CHIP:DL: Got WiFi interface: wlan0
-          CHIP:DL: Failed to reset WiFi statistic counts
-          CHIP:IN: UDP::Init bind&listen port=5541
-          CHIP:IN: UDP::Init bound to port=5541
-          CHIP:IN: UDP::Init bind&listen port=5541
-          CHIP:IN: UDP::Init bound to port=5541
-          CHIP:IN: TransportMgr initialized
-          CHIP:DIS: Init fabric pairing table with server storage
-          CHIP:DL: writing settings to file (/tmp/chip_counters.ini-zgCtZd)
-          CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          CHIP:DL: NVS set: chip-counters/GlobalMCTR = 25000 (0x61A8)
-          CHIP:CTL: System State Initialized...
-          CHIP:DL: MDNS failed to join multicast group on veth5731933 for address type IPv4: ../th
-          CHIP:DL: MDNS failed to join multicast group on vethbf7bfa6 for address type IPv4: ../th
-          CHIP:DL: MDNS failed to join multicast group on vethcf434e5 for address type IPv4: ../th
-          CHIP:ZCL: Using ZAP configuration...
-          CHIP:DIS: Verifying the received credentials
-          CHIP:IN: Generating compressed fabric ID using uncompressed fabric ID 0x0000000000000000
-          CHIP:IN: 0x04, 0x66, 0xd6, 0xcf, 0x4c, 0x1e, 0x11, 0xc3,
-          CHIP:IN: 0x52, 0x4f, 0xa6, 0x8c, 0x6e, 0x65, 0x46, 0xdc,
-          CHIP:IN: 0x90, 0x1b, 0x5f, 0x42, 0x9f, 0x69, 0xd1, 0xb7,
-          CHIP:IN: 0x7d, 0xf3, 0x6b, 0x54, 0x12, 0x6c, 0x12, 0x59,
-          CHIP:IN: 0x5b, 0xc3, 0x07, 0x1c, 0x5c, 0xf4, 0x4e, 0x5f,
-          CHIP:IN: 0x71, 0x06, 0x9a, 0xbb, 0x2f, 0xef, 0x20, 0x0d,
-          CHIP:IN: 0x0e, 0x9b, 0x26, 0x3e, 0x8d, 0x46, 0x09, 0xd8,
-          CHIP:IN: 0xfd, 0xa1, 0xc0, 0x10, 0x4f, 0x05, 0x14, 0x99,
-          CHIP:IN: 0x22,
-          CHIP:IN: Generated compressed fabric ID
-          CHIP:IN: 0x4a, 0x53, 0x1e, 0x52, 0x06, 0xed, 0x06, 0xda,
-          CHIP:DIS: Added new fabric at index: 1, Initialized: 1
-          CHIP:DIS: Assigned compressed fabric ID: 0x4A531E5206ED06DA, node ID: 0x000000000001B669
-          CHIP:CTL: Joined the fabric at index 1. Compressed fabric ID is: 0x4A531E5206ED06DA
-          CHIP:DL: CHIP task running
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Attempt to mDNS broadcast failed:  ../third_party/connectedhomeip/src/inet/UDP
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-          CHIP:DIS: Discovered Node:
-          CHIP:DIS:      Host name:              EEAABADABAD0DDCA
-          CHIP:DIS:      Port:                   5540
-          CHIP:DIS:      Long discriminator:     3840
-          CHIP:DIS:      Vendor ID:              9050
-          CHIP:DIS:      Product ID:             65279
-          CHIP:DIS:      Commissioning Mode      1
-          CHIP:DIS:      Device Type             0
-          CHIP:DIS:      Device Name
-          CHIP:DIS:      Rotating Id             00007C5F6E176CD40F68685D100A1CF8A98B
-          CHIP:DIS:      Pairing Instruction
-          CHIP:DIS:      Pairing Hint            0x21
-          CHIP:DIS:      Address 0:              2402:e280:2108:181:dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 1:              fe80::dea6:32ff:fef9:f0a1
-          CHIP:DIS:      Address 2:              192.168.1.12
-
-
-          controller> sudo ./chip-tool pairing ethernet 112233 20202021 3840 192.168.1.12 5540
-
-          Output of this command in cell number I6 and J6 due to cell constraint of maximum size.
 
-
-
-          controller> sudo ./chip-tool basic read product-name 0x000000000001B669 0
-
-          ,,
       disabled: true
 
     - label:
-          "Establish encryption keys with Password Authenticated Session
-          Establishment on the commissioning channel"
+          "Commissioner and Commissionee discover each other and connect via the
+          discovery mode applicable for the DUT."
       verification: |
+          On TH: start BLE Advertising by specific DUT implementation
 
-      disabled: true
-
-    - label:
-          "Commissioner arms Fail-safe timer on the Commissionee using
-          ArmFailSafe command"
-      verification: |
+          On DUT: start commissioning process(need to obtain the Thread dataset first)
 
+          ./chip-tool pairing ble-thread 1 hex:0e080000000000010000000300000f35060004001fffe0020811111111222222220708fd27e57b1b1e22d9051000112233445566778899aabbccddeeff030e4f70656e54687265616444656d6f01021234041061e1206d2c2b46e079eb775f41fc72190c0402a0fff8 20202021 3840
+          ,,
       disabled: true
 
     - label:
-          "Commissioner configures the Commissionee UTC time, timezone, DST
-          offset, and regulatory information at the Commissionee."
+          "Establish encryption keys with Password Authenticated Session
+          Establishment on the commissioning channel"
       verification: |
-
+          On DUT:
+          CHIP:SC: Received PBKDF param response
       disabled: true
 
     - label:
-          "Commissioner establishes the authenticity of the Commissionee as a
-          certified CHIP device."
+          "Commissioner SHALL re-arm Fail-safe timer on Commissionee within 60s
+          (the autonomously Fail-safe timer length set by Commissionee)"
       verification: |
-
+          On DUT:
+          CHIP:CTL: Arming failsafe (60 seconds)
       disabled: true
 
     - label:
-          "Commissioner configures Fabric information using SetFabric command."
+          "If (PICS_WIFI) or (PICS_THREAD), Commissioner SHALL configure
+          regulatory information in the Commissionee."
       verification: |
-
+          Need chip-tool implementation
       disabled: true
 
     - label:
           "Commissioner requests operational CSR from Commissionee with
           OperationalCSRRequest command"
       verification: |
-
+          On DUT:
+          CHIP:CTL: Sending CSR request to 0xffffa4001730 device
+          CHIP:DMG: ICR moving to [AddingComm]
+          CHIP:DMG: ICR moving to [AddedComma]
+          CHIP:IN: Prepared secure message 0xffffb9ba6db8 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45042i with MessageCounter:12011388.
+          CHIP:IN: Sending encrypted msg 0xffffb9ba6db8 with MessageCounter:12011388 to 0x0000000000000001 (1) at monotonic time: 304120 msec
+          CHIP:DMG: ICR moving to [CommandSen]
+          CHIP:CTL: Sent CSR request, waiting for the CSR
+          CHIP:DMG: ICR moving to [AwaitingDe]
+          CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          CHIP:DL: Indication received, conn = 0xffffb0044210
+          CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:DL: Indication received, conn = 0xffffb0044210
+          CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508040 on exchange 45042i
+          CHIP:EM: Found matching exchange: 45042i, Delegate: 0xffffb0040000
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x3e,
+          CHIP:DMG:                                        CommandId = 0x5,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = [
+          CHIP:DMG:                                                0x15, 0x30, 0x1, 0xcd, 0x30, 0x81, 0xca, 0x30, 0x70, 0x2, 0x1, 0x0, 0x30, 0xe, 0x31, 0xc, 0x30, 0xa, 0x6, 0x3, 0x55, 0x4, 0xa, 0xc, 0x3, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86
+          CHIP:DMG:                                ]
+          CHIP:DMG:                                        0x1 = [
+          CHIP:DMG:                                                0xea, 0xd6, 0x96, 0x53, 0x4d, 0x46, 0x1d, 0xd6, 0xcc, 0x7f, 0x25, 0x50, 0x80, 0x4c, 0x2a, 0xe9, 0xc8, 0xb8, 0x1b, 0x34, 0xca, 0x98, 0x38, 0x42, 0x74, 0xc2, 0x13, 0xf4, 0x10, 0x4d, 0xa2, 0x44, 0x38, 0x98, 0x28, 0xb6, 0xb1, 0x94, 0x6b, 0xd, 0x29, 0x1b
+          CHIP:DMG:                                ]
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
+          CHIP:CTL: Received certificate signing request from the device
+          CHIP:CTL: Getting certificate chain for the device from the issuer
+          CHIP:CTL: Verifying Certificate Signing Request
+          CHIP:CTL: Generating NOC
+          CHIP:CTL: Providing certificate chain to the commissioner
+          CHIP:CTL: Received callback from the CA for NOC Chain generation. Status ../../src/controller/ExampleOperationalCredentialsIssuer.cpp:225: Success
       disabled: true
 
     - label:
-          "Commissioner generates or otherwise obtains an Operational
-          Certificate containing Operational ID in response
-          OperationalCSRRequest command using ecosystem-specific means"
-      verification: |
-
-      disabled: true
-
-    - label: "Commissioner configures operational credentials"
+          "Commissioner configures operational credentials on DUT if not
+          previously installed"
       verification: |
-
+          On DUT:
+          [1651218829.220063][3273:3278] CHIP:CTL: Sending root certificate to the device
+          [1651218829.220201][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218829.222415][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218829.222549][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba6b98 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45043i with MessageCounter:12011389.
+          [1651218829.222616][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba6b98 with MessageCounter:12011389 to 0x0000000000000001 (1) at monotonic time: 305872 msec
+          [1651218829.222746][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218829.222789][3273:3278] CHIP:CTL: Sent root certificate to the device
+          [1651218829.223121][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218829.306861][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.404144][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.454121][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218829.454352][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508041 on exchange 45043i
+          CHIP:EM: Found matching exchange: 45043i, Delegate: 0xffffa400def0
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandStatusIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x3e,
+          CHIP:DMG:                                        CommandId = 0xb,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                StatusIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        status = 0x0,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003E Command=0x0000_000B Status=0x0
+          CHIP:CTL: Device confirmed that it has received the root certificate
       disabled: true
 
-    - label: "Commissioner configures ACL."
+    - label:
+          "Commissioner configures itself as administrator in ACL on TH if
+          needed"
       verification: |
-
+          On DUT:
+          [1651218829.457248][3273:3278] CHIP:CTL: Sending operational certificate chain to the device
+          [1651218829.457372][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218829.460013][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218829.460273][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba7828 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45044i with MessageCounter:12011390.
+          [1651218829.460374][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba7828 with MessageCounter:12011390 to 0x0000000000000001 (1) at monotonic time: 306110 msec
+          [1651218829.460602][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218829.460684][3273:3278] CHIP:CTL: Sent operational certificate to the device
+          [1651218829.460778][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218829.550574][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.648065][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218829.745594][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218833.988087][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218833.988336][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1651218833.988598][3273:3278] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508042 on exchange 45044i
+          CHIP:EM: Found matching exchange: 45044i, Delegate: 0xffffb0040000
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x3e,
+          CHIP:DMG:                                        CommandId = 0x8,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = 0,
+          CHIP:DMG:                                        0x1 = 1,
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          CHIP:CTL: Device returned status 0 on receiving the NOC
+          CHIP:CTL: Operational credentials provisioned on device 0xffffa4001730
       disabled: true
 
     - label:
-          "Commissioner configures the operational network at the Commissionee."
+          "Commissioner configures operational network on TH if TH both supports
+          and requires"
       verification: |
-
+          On DUT:
+          [1651218833.995054][3273:3278] CHIP:CTL: Adding thread network
+          [1651218833.995176][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218833.995253][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218833.995431][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba7848 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45045i with MessageCounter:12011391.
+          [1651218833.995523][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba7848 with MessageCounter:12011391 to 0x0000000000000001 (1) at monotonic time: 310645 msec
+          [1651218833.995723][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218833.995823][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218834.084548][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218834.134690][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218834.134918][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508043 on exchange 45045i
+          CHIP:EM: Found matching exchange: 45045i, Delegate: 0xffffa400def0
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x31,
+          CHIP:DMG:                                        CommandId = 0x5,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = 0,
+          CHIP:DMG:                                        0x1 = "",
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          CHIP:CTL: Received NetworkConfig response
       disabled: true
 
     - label:
-          "Commissioner triggers the Commissionee to connect to the operational
-          network"
+          "Commissioner instructs Commissionee to connect to operational network
+          if not already connected"
       verification: |
-
+          On DUT:
+          [1651218834.137891][3273:3278] CHIP:CTL: Enabling thread network
+          [1651218834.138014][3273:3278] CHIP:DMG: ICR moving to [AddingComm]
+          [1651218834.138086][3273:3278] CHIP:DMG: ICR moving to [AddedComma]
+          [1651218834.138236][3273:3278] CHIP:IN: Prepared secure message 0xffffb9ba7938 to 0x0000000000000001 (1)  of type 0x8 and protocolId (0, 1) on exchange 45046i with MessageCounter:12011392.
+          [1651218834.138325][3273:3278] CHIP:IN: Sending encrypted msg 0xffffb9ba7938 with MessageCounter:12011392 to 0x0000000000000001 (1) at monotonic time: 310788 msec
+          [1651218834.138522][3273:3278] CHIP:DMG: ICR moving to [CommandSen]
+          [1651218834.138628][3273:3278] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1651218834.231701][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1651218834.426948][3273:3276] CHIP:DL: Indication received, conn = 0xffffb0044210
+          [1651218834.427186][3273:3278] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1651218834.427443][3273:3278] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:8508044 on exchange 45046i
+          CHIP:EM: Found matching exchange: 45046i, Delegate: 0xffffb0040000
+          CHIP:DMG: ICR moving to [ResponseRe]
+          CHIP:DMG: InvokeResponseMessage =
+          CHIP:DMG: {
+          CHIP:DMG:        suppressResponse = false,
+          CHIP:DMG:        InvokeResponseIBs =
+          CHIP:DMG:        [
+          CHIP:DMG:                InvokeResponseIB =
+          CHIP:DMG:                {
+          CHIP:DMG:                        CommandDataIB =
+          CHIP:DMG:                        {
+          CHIP:DMG:                                CommandPathIB =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        EndpointId = 0x0,
+          CHIP:DMG:                                        ClusterId = 0x31,
+          CHIP:DMG:                                        CommandId = 0x7,
+          CHIP:DMG:                                },
+          CHIP:DMG:
+          CHIP:DMG:                                CommandData =
+          CHIP:DMG:                                {
+          CHIP:DMG:                                        0x0 = 0,
+          CHIP:DMG:                                        0x1 = "",
+          CHIP:DMG:                                        0x2 = 0,
+          CHIP:DMG:                                },
+          CHIP:DMG:                        },
+          CHIP:DMG:
+          CHIP:DMG:                },
+          CHIP:DMG:
+          CHIP:DMG:        ],
+          CHIP:DMG:
+          CHIP:DMG:        InteractionModelRevision = 1
+          CHIP:DMG: },
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
+          CHIP:CTL: Received ConnectNetwork response
       disabled: true
 
     - label:
-          "Commissioner and Commissionee discover each other on the operational
-          network using operational discovery"
+          "Commissioning channel between the Commissioner and Commissionee is
+          terminated."
       verification: |
-
+          1. Verify the channel was terminated on DUT=chip-tool
+          [1651271753284] [23287:743790] CHIP: [CTL] Received CommissioningComplete response
+          [1651271753284] [23287:743790] CHIP: [CTL] Successfully finished commissioning step 'SendComplete'
+          [1651271753284] [23287:743790] CHIP: [CTL] Commissioning stage next step: 'SendComplete' -> 'Cleanup'
+          [1651271753284] [23287:743790] CHIP: [CTL] Performing next commissioning step 'Cleanup'
+          [1651271753284] [23287:743790] CHIP: [CTL] Successfully finished commissioning step 'Cleanup'
+          [1651271753284] [23287:743790] CHIP: [TOO] Device commissioning completed with success
       disabled: true
 
-    - label: "Commissioner and Commissionee establish encryption keys with CASE"
+    - label: "Commissioner starts discovery of TH using Operational Discovery"
       verification: |
-
+          On DUT:
+          CHIP:DL: Avahi resolve found
+          CHIP:DIS: Node ID resolved for 0x0000000000000001
+          CHIP:DIS:     Addr 0: [fd11:22::9d96:8fcf:10cf:799e]:5540
+          CHIP:CTL: OperationalDiscoveryComplete for device ID 0x0000000000000001
       disabled: true
 
     - label:
-          "Commissioner and Commissionee perform commissioning complete message
-          exchange using CommissioningComplete command and
-          CommissioningCompleteResponse command"
+          "Commissioner opens a CASE session with TH over operational network"
       verification: |
+          On DUT:
+          CHIP:SC: Sent Sigma1 msg
+          CHIP:CTL: Address resolved for node: 0x0000000000000001
+          CHIP:EM: Received message of type 0x31 with protocolId (0, 0) and MessageCounter:1066460336 on exchange 45047i
+          CHIP:EM: Found matching exchange: 45047i, Delegate: 0xffffa400f7f8
+          CHIP:EM: Rxd Ack; Removing MessageCounter:2352378411 from Retrans Table on exchange 45047i
+          CHIP:EM: Removed CHIP MessageCounter:2352378411 from RetransTable on exchange 45047i
+          CHIP:SC: Received Sigma2 msg
+          CHIP:SC: Peer assigned session session ID 2
+          CHIP:SC: The device does not support GetClock_RealTimeMS() API. This will eventually result in CASE session setup failures.
+          CHIP:IN: Generating compressed fabric ID using uncompressed fabric ID 0x0000000000000001 and root pubkey
+          CHIP:IN: 0x04, 0x6e, 0x3e, 0x58, 0x9d, 0x08, 0xd6, 0xae,
+          CHIP:IN: 0xe9, 0xff, 0x9b, 0x8f, 0xba, 0x6f, 0x57, 0x73,
+          CHIP:IN: 0x21, 0xc4, 0xe2, 0x7b, 0x09, 0xe4, 0x24, 0x7f,
+          CHIP:IN: 0x55, 0x44, 0x3b, 0xf2, 0x7c, 0x13, 0x45, 0x3b,
+          CHIP:IN: 0x82, 0xa8, 0x42, 0x96, 0xb4, 0x36, 0x78, 0x20,
+          CHIP:IN: 0xa1, 0x37, 0x69, 0xf0, 0x20, 0xc9, 0x20, 0x7e,
+          CHIP:IN: 0x66, 0x45, 0x84, 0x53, 0x1b, 0x3e, 0xd2, 0x61,
+          CHIP:IN: 0xb6, 0x89, 0x27, 0xfd, 0xe8, 0x23, 0x69, 0x6d,
+          CHIP:IN: 0x93,
+          CHIP:IN: Generated compressed fabric ID
+          CHIP:IN: 0xa3, 0x54, 0xab, 0x2a, 0xa2, 0x1f, 0x8e, 0x48,
+          CHIP:SC: Found MRP parameters in the message
+          CHIP:SC: Sending Sigma3
+          CHIP:EM: Piggybacking Ack for MessageCounter:1066460336 on exchange: 45047i
+          CHIP:IN: Prepared unauthenticated message 0xaaaad7ce1bf8 to 0x0000000000000000 (0)  of type 0x32 and protocolId (0, 0) on exchange 45047i with MessageCounter:2352378412.
+          CHIP:IN: Sending unauthenticated msg 0xaaaad7ce1bf8 with MessageCounter:2352378412 to 0x0000000000000000 at monotonic time: 315803 msec
+          CHIP:SC: Sent Sigma3 msg
+          CHIP:EM: Received message of type 0x40 with protocolId (0, 0) and MessageCounter:1066460337 on exchange 45047i
+          CHIP:EM: Found matching exchange: 45047i, Delegate: 0xffffa400f7f8
+          CHIP:EM: Rxd Ack; Removing MessageCounter:2352378412 from Retrans Table on exchange 45047i
+          CHIP:EM: Removed CHIP MessageCounter:2352378412 from RetransTable on exchange 45047i
+          CHIP:SC: Success status report received. Session was established
+          CHIP:IN: New secure session created for device 0x0000000000000001, LSID:2 PSID:2!
+      disabled: true
 
+    - label: "Commissioner sends CommissioningComplete command"
+      verification: |
+          On DUT:
+          CHIP:CTL: Received CommissioningComplete response
+          CHIP:CTL: Rendezvous cleanup
+          CHIP:TOO: Device commissioning completed with success
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_4_1.yaml b/src/app/tests/suites/certification/Test_TC_DD_4_1.yaml
deleted file mode 100644
index 08c5bd3effbb08..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DD_4_1.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 7.4.1. [TC-DD-4.1] Operational Certificate Authority Verification
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH starts the commissioning process"
-      disabled: true
-
-    - label: "DUT creates an Onboarding Payload"
-      disabled: true
-
-    - label: "DUT begins to advertise"
-      disabled: true
-
-    - label:
-          "TH performs the Attestation procedure and include the Commissioning
-          Certification"
-      disabled: true
-
-    - label:
-          "TH selects an Operational Certificate Authority to use <to specify
-          which one> TH generates Operational Credential for the DUT TH sends
-          relevant Fabric information, Operational Certificate and Root CA
-          Certificate to DUT"
-      disabled: true
-
-    - label:
-          "TH does not create an ACL (Access Control List) entry for the DUT
-          (authorized Node)"
-      disabled: true
-
-    - label:
-          "TH creates an ACL (Access Control List) entry for the DUT (authorized
-          Node)"
-      disabled: true
-
-    - label:
-          "TH does not give to DUT enough privileges to delete the used
-          operational CA in the process"
-      disabled: true
-
-    - label:
-          "TH gives to DUT enough privileges to delete the used operational CA
-          in the process"
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
new file mode 100644
index 00000000000000..6751b292a96e2b
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
@@ -0,0 +1,87 @@
+# 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: 81.2. [TC-DESC-2.1] Descriptor Cluster Attributes with DUT as Server
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "TH reads DeviceTypeList attribute from DUT."
+      verification: |
+          ./chip-tool descriptor read device-list 1 0
+
+          [1641454498.809603][16120:16125] CHIP:TOO: Descriptor.DeviceList response: 1 entries
+          [1641454498.809737][16120:16125] CHIP:TOO:   [1]: {
+          [1641454498.809780][16120:16125] CHIP:TOO:     Type: 22
+          [1641454498.809817][16120:16125] CHIP:TOO:     Revision: 1
+          [1641454498.809852][16120:16125] CHIP:TOO:   }
+          [1641454498.809938][16120:16125] CHIP:EM: Sending Standalone Ack for MessageCounter:52943 on exchange 24061i
+      disabled: true
+
+    - label: "TH reads 'ServerList' attribute. Refer to Precondition "
+      verification: |
+          ./chip-tool descriptor read server-list 1 0
+
+          [1650281763.417848][9672:9678] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1976976904
+          [1650281763.417958][9672:9678] CHIP:TOO:   server list: 25 entries
+          [1650281763.418002][9672:9678] CHIP:TOO:     [1]: 3
+          [1650281763.418028][9672:9678] CHIP:TOO:     [2]: 4
+          [1650281763.418053][9672:9678] CHIP:TOO:     [3]: 29
+          [1650281763.418077][9672:9678] CHIP:TOO:     [4]: 30
+          [1650281763.418101][9672:9678] CHIP:TOO:     [5]: 31
+          [1650281763.418125][9672:9678] CHIP:TOO:     [6]: 40
+          [1650281763.418149][9672:9678] CHIP:TOO:     [7]: 42
+          [1650281763.418173][9672:9678] CHIP:TOO:     [8]: 43
+          [1650281763.418197][9672:9678] CHIP:TOO:     [9]: 44
+          [1650281763.418218][9672:9678] CHIP:TOO:     [10]: 45
+          [1650281763.418238][9672:9678] CHIP:TOO:     [11]: 46
+          [1650281763.418257][9672:9678] CHIP:TOO:     [12]: 48
+          [1650281763.418277][9672:9678] CHIP:TOO:     [13]: 49
+          [1650281763.418297][9672:9678] CHIP:TOO:     [14]: 50
+          [1650281763.418316][9672:9678] CHIP:TOO:     [15]: 51
+          [1650281763.418336][9672:9678] CHIP:TOO:     [16]: 52
+          [1650281763.418356][9672:9678] CHIP:TOO:     [17]: 53
+          [1650281763.418382][9672:9678] CHIP:TOO:     [18]: 54
+          [1650281763.418406][9672:9678] CHIP:TOO:     [19]: 55
+          [1650281763.418430][9672:9678] CHIP:TOO:     [20]: 60
+          [1650281763.418454][9672:9678] CHIP:TOO:     [21]: 62
+          [1650281763.418478][9672:9678] CHIP:TOO:     [22]: 63
+          [1650281763.418502][9672:9678] CHIP:TOO:     [23]: 64
+          [1650281763.418526][9672:9678] CHIP:TOO:     [24]: 65
+          [1650281763.418550][9672:9678] CHIP:TOO:     [25]: 1029
+      disabled: true
+
+    - label: "TH reads 'ClientList' attribute"
+      verification: |
+          ./chip-tool descriptor read client-list 1 0
+          [1650281818.533446][9679:9684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1976976904
+          [1650281818.533514][9679:9684] CHIP:TOO:   client list: 1 entries
+          [1650281818.533563][9679:9684] CHIP:TOO:     [1]: 41
+      disabled: true
+
+    - label: "TH reads 'PartsList' attribute."
+      verification: |
+          ./chip-tool descriptor read  parts-list 1 0
+
+          [1641456769.777217][16238:16244] CHIP:DMG:      SuppressResponse = true,
+          [1641456769.777267][16238:16244] CHIP:DMG: }
+          [1641456769.777839][16238:16244] CHIP:TOO: Descriptor.PartsList response: 2 entries
+          [1641456769.777925][16238:16244] CHIP:TOO:   [1]: 1
+          [1641456769.777978][16238:16244] CHIP:TOO:   [2]: 2
+          [1641456769.778080][16238:16244] CHIP:EM: Sending Standalone Ack for MessageCounter:2830202 on exchange 38042i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
new file mode 100644
index 00000000000000..8850b14bd322d5
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
@@ -0,0 +1,116 @@
+# 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: 81.3. [TC-DESC-2.2] Descriptor Cluster Attributes with DUT as Client
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT reads DeviceTypeList from TH."
+      verification: |
+          ./chip-tool descriptor read device-list 1 0
+
+          [1651220525.982478][11001:11001] CHIP:EM: Handling via exchange: 13340r, Delegate: 0xaaaaacdc5098
+          [1651220525.982545][11001:11001] CHIP:IM: Received Read request
+          [1651220525.982624][11001:11001] CHIP:DMG: ReadRequestMessage =
+          [1651220525.982667][11001:11001] CHIP:DMG: {
+          [1651220525.982703][11001:11001] CHIP:DMG:         AttributePathIBs =
+          [1651220525.982745][11001:11001] CHIP:DMG:         [
+          [1651220525.982784][11001:11001] CHIP:DMG:                 AttributePathIB =
+          [1651220525.982840][11001:11001] CHIP:DMG:                 {
+          [1651220525.982892][11001:11001] CHIP:DMG:                         Endpoint = 0x0,
+          [1651220525.982948][11001:11001] CHIP:DMG:                         Cluster = 0x1d,
+          [1651220525.983005][11001:11001] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651220525.983054][11001:11001] CHIP:DMG:                 }
+          [1651220525.983104][11001:11001] CHIP:DMG:
+          [1651220525.983149][11001:11001] CHIP:DMG:         ],
+          [1651220525.983195][11001:11001] CHIP:DMG:
+          [1651220525.983238][11001:11001] CHIP:DMG:         isFabricFiltered = true,
+          [1651220525.983279][11001:11001] CHIP:DMG:         InteractionModelRevision = 1
+          [1651220525.983318][11001:11001] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ServerList from the TH"
+      verification: |
+          ./chip-tool descriptor read server-list 1 0
+
+          [1651220576.025574][11001:11001] CHIP:IM: Received Read request
+          [1651220576.025629][11001:11001] CHIP:DMG: ReadRequestMessage =
+          [1651220576.025655][11001:11001] CHIP:DMG: {
+          [1651220576.025677][11001:11001] CHIP:DMG:         AttributePathIBs =
+          [1651220576.025703][11001:11001] CHIP:DMG:         [
+          [1651220576.025728][11001:11001] CHIP:DMG:                 AttributePathIB =
+          [1651220576.025763][11001:11001] CHIP:DMG:                 {
+          [1651220576.025792][11001:11001] CHIP:DMG:                         Endpoint = 0x0,
+          [1651220576.025823][11001:11001] CHIP:DMG:                         Cluster = 0x1d,
+          [1651220576.025856][11001:11001] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651220576.025882][11001:11001] CHIP:DMG:                 }
+          [1651220576.025910][11001:11001] CHIP:DMG:
+          [1651220576.025936][11001:11001] CHIP:DMG:         ],
+          [1651220576.025964][11001:11001] CHIP:DMG:
+          [1651220576.025990][11001:11001] CHIP:DMG:         isFabricFiltered = true,
+          [1651220576.026015][11001:11001] CHIP:DMG:         InteractionModelRevision = 1
+          [1651220576.026039][11001:11001] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ClientList from the TH"
+      verification: |
+          ./chip-tool descriptor read client-list 1 0
+
+          [1651220639.440188][11001:11001] CHIP:IM: Received Read request
+          [1651220639.440259][11001:11001] CHIP:DMG: ReadRequestMessage =
+          [1651220639.440298][11001:11001] CHIP:DMG: {
+          [1651220639.440330][11001:11001] CHIP:DMG:         AttributePathIBs =
+          [1651220639.440367][11001:11001] CHIP:DMG:         [
+          [1651220639.440402][11001:11001] CHIP:DMG:                 AttributePathIB =
+          [1651220639.440447][11001:11001] CHIP:DMG:                 {
+          [1651220639.440491][11001:11001] CHIP:DMG:                         Endpoint = 0x0,
+          [1651220639.440539][11001:11001] CHIP:DMG:                         Cluster = 0x1d,
+          [1651220639.440589][11001:11001] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1651220639.440634][11001:11001] CHIP:DMG:                 }
+          [1651220639.440675][11001:11001] CHIP:DMG:
+          [1651220639.440715][11001:11001] CHIP:DMG:         ],
+          [1651220639.440756][11001:11001] CHIP:DMG:
+          [1651220639.440794][11001:11001] CHIP:DMG:         isFabricFiltered = true,
+          [1651220639.440830][11001:11001] CHIP:DMG:         InteractionModelRevision = 1
+          [1651220639.440864][11001:11001] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads PartsList from the TH"
+      verification: |
+          ./chip-tool descriptor read  parts-list 1 0
+
+          [1651220678.308560][11001:11001] CHIP:EM: Handling via exchange: 30507r, Delegate: 0xaaaaacdc5098
+          [1651220678.308658][11001:11001] CHIP:IM: Received Read request
+          [1651220678.308766][11001:11001] CHIP:DMG: ReadRequestMessage =
+          [1651220678.308828][11001:11001] CHIP:DMG: {
+          [1651220678.308882][11001:11001] CHIP:DMG:         AttributePathIBs =
+          [1651220678.308945][11001:11001] CHIP:DMG:         [
+          [1651220678.309053][11001:11001] CHIP:DMG:                 AttributePathIB =
+          [1651220678.309137][11001:11001] CHIP:DMG:                 {
+          [1651220678.309210][11001:11001] CHIP:DMG:                         Endpoint = 0x0,
+          [1651220678.309284][11001:11001] CHIP:DMG:                         Cluster = 0x1d,
+          [1651220678.309355][11001:11001] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1651220678.309422][11001:11001] CHIP:DMG:                 }
+          [1651220678.309485][11001:11001] CHIP:DMG:
+          [1651220678.309558][11001:11001] CHIP:DMG:         ],
+          [1651220678.309629][11001:11001] CHIP:DMG:
+          [1651220678.309693][11001:11001] CHIP:DMG:         isFabricFiltered = true,
+          [1651220678.309755][11001:11001] CHIP:DMG:         InteractionModelRevision = 1
+          [1651220678.309810][11001:11001] CHIP:DMG: },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
new file mode 100644
index 00000000000000..b9a1d573d4d064
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
@@ -0,0 +1,161 @@
+# 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.1.1. [TC-DGETH-1.1] Global attributes with server as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+          ./chip-tool pairing ble-wifi NODEID SSID PASSWD 20202021 3840 (commissioner side)
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read cluster-revision 1 0
+          [1651786680.895436][240893:240898] CHIP:DMG: ReportDataMessage =
+          [1651786680.895449][240893:240898] CHIP:DMG: {
+          [1651786680.895459][240893:240898] CHIP:DMG:         AttributeReportIBs =
+          [1651786680.895476][240893:240898] CHIP:DMG:         [
+          [1651786680.895487][240893:240898] CHIP:DMG:                 AttributeReportIB =
+          [1651786680.895505][240893:240898] CHIP:DMG:                 {
+          [1651786680.895515][240893:240898] CHIP:DMG:                         AttributeDataIB =
+          [1651786680.895527][240893:240898] CHIP:DMG:                         {
+          [1651786680.895538][240893:240898] CHIP:DMG:                                 DataVersion = 0xb89e4c30,
+          [1651786680.895548][240893:240898] CHIP:DMG:                                 AttributePathIB =
+          [1651786680.895559][240893:240898] CHIP:DMG:                                 {
+          [1651786680.895572][240893:240898] CHIP:DMG:                                         Endpoint = 0x0,
+          [1651786680.895585][240893:240898] CHIP:DMG:                                         Cluster = 0x36,
+          [1651786680.895603][240893:240898] CHIP:DMG:                                         Attribute = 0x0000_FFFD,
+          [1651786680.895615][240893:240898] CHIP:DMG:                                 }
+          [1651786680.895630][240893:240898] CHIP:DMG:
+          [1651786680.895644][240893:240898] CHIP:DMG:                                         Data = 1,
+          [1651786680.895657][240893:240898] CHIP:DMG:                         },
+          [1651786680.895672][240893:240898] CHIP:DMG:
+          [1651786680.895684][240893:240898] CHIP:DMG:                 },
+          [1651786680.895701][240893:240898] CHIP:DMG:
+          [1651786680.895711][240893:240898] CHIP:DMG:         ],
+          [1651786680.895727][240893:240898] CHIP:DMG:
+          [1651786680.895739][240893:240898] CHIP:DMG:         SuppressResponse = true,
+          [1651786680.895751][240893:240898] CHIP:DMG:         InteractionModelRevision = 1
+          [1651786680.895762][240893:240898] CHIP:DMG: }
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read feature-map 1 0
+          [1651786827.581901][240914:240920] CHIP:DMG: ReportDataMessage =
+          [1651786827.581920][240914:240920] CHIP:DMG: {
+          [1651786827.581933][240914:240920] CHIP:DMG:         AttributeReportIBs =
+          [1651786827.581959][240914:240920] CHIP:DMG:         [
+          [1651786827.581977][240914:240920] CHIP:DMG:                 AttributeReportIB =
+          [1651786827.582002][240914:240920] CHIP:DMG:                 {
+          [1651786827.582020][240914:240920] CHIP:DMG:                         AttributeDataIB =
+          [1651786827.582040][240914:240920] CHIP:DMG:                         {
+          [1651786827.582060][240914:240920] CHIP:DMG:                                 DataVersion = 0xa7929b20,
+          [1651786827.582078][240914:240920] CHIP:DMG:                                 AttributePathIB =
+          [1651786827.582099][240914:240920] CHIP:DMG:                                 {
+          [1651786827.582121][240914:240920] CHIP:DMG:                                         Endpoint = 0x0,
+          [1651786827.582144][240914:240920] CHIP:DMG:                                         Cluster = 0x37,
+          [1651786827.582168][240914:240920] CHIP:DMG:                                         Attribute = 0x0000_FFFC,
+          [1651786827.582189][240914:240920] CHIP:DMG:                                 }
+          [1651786827.582213][240914:240920] CHIP:DMG:
+          [1651786827.582234][240914:240920] CHIP:DMG:                                         Data = 3,
+          [1651786827.582255][240914:240920] CHIP:DMG:                         },
+          [1651786827.582278][240914:240920] CHIP:DMG:
+          [1651786827.582294][240914:240920] CHIP:DMG:                 },
+          [1651786827.582319][240914:240920] CHIP:DMG:
+          [1651786827.582334][240914:240920] CHIP:DMG:         ],
+          [1651786827.582358][240914:240920] CHIP:DMG:
+          [1651786827.582376][240914:240920] CHIP:DMG:         SuppressResponse = true,
+          [1651786827.582393][240914:240920] CHIP:DMG:         InteractionModelRevision = 1
+          [1651786827.582407][240914:240920] CHIP:DMG: }
+          [1651786827.582555][240914:240920] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFFC DataVersion: 2811403040
+          [1651786827.582608][240914:240920] CHIP:TOO:   FeatureMap: 3
+      disabled: true
+
+    - label: "TH reads AttribubteList from DUT"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read attribute-list 1 0
+          [1651786900.043572][240929:240934] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFFB DataVersion: 2811403040
+          [1651786900.043655][240929:240934] CHIP:TOO:   AttributeList: 14 entries
+          [1651786900.043689][240929:240934] CHIP:TOO:     [1]: 0
+          [1651786900.043710][240929:240934] CHIP:TOO:     [2]: 1
+          [1651786900.043730][240929:240934] CHIP:TOO:     [3]: 2
+          [1651786900.043744][240929:240934] CHIP:TOO:     [4]: 3
+          [1651786900.043757][240929:240934] CHIP:TOO:     [5]: 4
+          [1651786900.043775][240929:240934] CHIP:TOO:     [6]: 5
+          [1651786900.043796][240929:240934] CHIP:TOO:     [7]: 6
+          [1651786900.043817][240929:240934] CHIP:TOO:     [8]: 7
+          [1651786900.043838][240929:240934] CHIP:TOO:     [9]: 8
+          [1651786900.043862][240929:240934] CHIP:TOO:     [10]: 65528
+          [1651786900.043884][240929:240934] CHIP:TOO:     [11]: 65529
+          [1651786900.043907][240929:240934] CHIP:TOO:     [12]: 65531
+          [1651786900.043930][240929:240934] CHIP:TOO:     [13]: 65532
+          [1651786900.043952][240929:240934] CHIP:TOO:     [14]: 65533
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read accepted-command-list 1 0
+
+          [1651786971.201258][240944:240949] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFF9 DataVersion: 2811403040
+          [1651786971.201322][240944:240949] CHIP:TOO:   AcceptedCommandList: 1 entries
+          [1651786971.201347][240944:240949] CHIP:TOO:     [1]: 0
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read generated-command-list 1 0
+          [1651787190.402854][240971:240976] CHIP:DMG: ReportDataMessage =
+          [1651787190.402875][240971:240976] CHIP:DMG: {
+          [1651787190.402891][240971:240976] CHIP:DMG:         AttributeReportIBs =
+          [1651787190.402917][240971:240976] CHIP:DMG:         [
+          [1651787190.402933][240971:240976] CHIP:DMG:                 AttributeReportIB =
+          [1651787190.402956][240971:240976] CHIP:DMG:                 {
+          [1651787190.402970][240971:240976] CHIP:DMG:                         AttributeDataIB =
+          [1651787190.402987][240971:240976] CHIP:DMG:                         {
+          [1651787190.403007][240971:240976] CHIP:DMG:                                 DataVersion = 0xa7929b20,
+          [1651787190.403025][240971:240976] CHIP:DMG:                                 AttributePathIB =
+          [1651787190.403045][240971:240976] CHIP:DMG:                                 {
+          [1651787190.403065][240971:240976] CHIP:DMG:                                         Endpoint = 0x0,
+          [1651787190.403089][240971:240976] CHIP:DMG:                                         Cluster = 0x37,
+          [1651787190.403111][240971:240976] CHIP:DMG:                                         Attribute = 0x0000_FFF8,
+          [1651787190.403136][240971:240976] CHIP:DMG:                                 }
+          [1651787190.403158][240971:240976] CHIP:DMG:
+          [1651787190.403177][240971:240976] CHIP:DMG:                                         Data = [
+          [1651787190.403197][240971:240976] CHIP:DMG:
+          [1651787190.403220][240971:240976] CHIP:DMG:                                         ],
+          [1651787190.403240][240971:240976] CHIP:DMG:                         },
+          [1651787190.403264][240971:240976] CHIP:DMG:
+          [1651787190.403282][240971:240976] CHIP:DMG:                 },
+          [1651787190.403326][240971:240976] CHIP:DMG:
+          [1651787190.403342][240971:240976] CHIP:DMG:         ],
+          [1651787190.403366][240971:240976] CHIP:DMG:
+          [1651787190.403382][240971:240976] CHIP:DMG:         SuppressResponse = true,
+          [1651787190.403399][240971:240976] CHIP:DMG:         InteractionModelRevision = 1
+          [1651787190.403420][240971:240976] CHIP:DMG: }
+          [1651787190.403639][240971:240976] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFF8 DataVersion: 2811403040
+          [1651787190.403729][240971:240976] CHIP:TOO:   GeneratedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          Out of scope v1.0
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml
new file mode 100644
index 00000000000000..25739999b1f84b
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml
@@ -0,0 +1,230 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 45.2.1. [TC-DGETH-2.1] Attributes with server as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Ethernet Network Diagnostics"
+    endpoint: 0
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Read PHYRate attribute constraints"
+      command: "readAttribute"
+      attribute: "PHYRate"
+      response:
+          constraints:
+              type: enum8
+              minValue: 0
+              maxValue: 9
+
+    - label: "Read FullDuplex attribute constraints"
+      command: "readAttribute"
+      attribute: "FullDuplex"
+      response:
+          constraints:
+              type: bool
+
+    #issue #13648
+    - label: "Read PacketRxCount attribute constraints"
+      command: "readAttribute"
+      attribute: "PacketRxCount"
+      response:
+          constraints:
+              type: uint64
+
+    - label:
+          "Read PacketRxCount value from DUT and verify the number of packets
+          received on ethernet network interface"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read packet-rx-count 1 0
+          Verify the value of PacketRxCount is in range uint64
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0002 DataVersion: 3872576452
+          [1649663623.009973][8103:8108] CHIP:TOO:   PacketRxCount: 3322
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Read PacketTxCount attribute constraints"
+      command: "readAttribute"
+      attribute: "PacketTxCount"
+      response:
+          constraints:
+              type: uint64
+
+    - label:
+          "Read PacketTxCount value from DUT and verify the number of packets
+          received on ethernet network interface"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read packet-tx-count 1 0
+          Verify the value of PacketTxCount is in range uint64
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0003 DataVersion: 3872576452
+          [1649663793.192934][8117:8122] CHIP:TOO:   PacketTxCount: 3220
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Read TxErrCount attribute constraints"
+      command: "readAttribute"
+      attribute: "TxErrCount"
+      response:
+          constraints:
+              type: uint64
+
+    - label:
+          "Read TxErrCount value from DUT and verify value indicates the number
+          of failed packet transmission on ethernet network interface"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read tx-err-count 1 1
+          Verify the value of TxErrCount is in range uint64
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0004 DataVersion: 3872576452
+          [1649663843.295395][8123:8128] CHIP:TOO:   TxErrCount: 0
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Read CollisionCount attribute constraints"
+      command: "readAttribute"
+      attribute: "CollisionCount"
+      response:
+          constraints:
+              type: uint64
+
+    - label:
+          "Read CollisionCount value from DUT and verify value indicates the
+          number of collision occurred while transmitting packets on ethernet
+          network interface"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read collision-count 1 1
+          Verify the value of  CollisionCount is in range uint64
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0005 DataVersion: 3872576452
+          [1649663870.221742][8133:8138] CHIP:TOO:   CollisionCount: 0
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Read OverrunCount attribute constraints"
+      command: "readAttribute"
+      attribute: "OverrunCount"
+      response:
+          constraints:
+              type: uint64
+
+    - label:
+          "Read OverrunCount value from DUT and verify value indicates the
+          number of packets dropped due to lack of buffer memory on ethernet
+          network interface"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read overrun-count 1 1
+
+           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0006 DataVersion: 3872576452
+          [1649663948.738274][8142:8147] CHIP:TOO:   OverrunCount: 0
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Read CarrierDetect attribute constraints"
+      command: "readAttribute"
+      attribute: "CarrierDetect"
+      response:
+          constraints:
+              type: bool
+
+    - label:
+          "Read CarrierDetect value from DUT and verify value indicates the
+          presence of carrier detect control signal on ethernet network
+          interface"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read carrier-detect 1 1
+          Verify the value of CarrierDetect is either bool or null
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0007 DataVersion: 3872576452
+          [1649663972.829304][8149:8154] CHIP:TOO:   CarrierDetect: null
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Read TimeSinceReset attribute constraints"
+      command: "readAttribute"
+      attribute: "TimeSinceReset"
+      response:
+          constraints:
+              type: uint64
+
+    - label:
+          "Read TimeSinceReset value from DUT and verify the value indicates the
+          duration of time, in minutes"
+      verification: |
+          ./chip-tool ethernetnetworkdiagnostics read  time-since-reset 1 1
+          Verify the value of TimeSinceReset is in range uint64
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0008 DataVersion: 3872576452
+          [1649664046.010810][8158:8163] CHIP:TOO:   TimeSinceReset: 5219
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
diff --git a/src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml
similarity index 95%
rename from src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml
rename to src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml
index 1e6a1b284d27e5..0c9dcc20d59c28 100644
--- a/src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 48.1.3. [TC-ETHDIAG-2.1] Command received functionality with server as DUT
+name: 45.2.2. [TC-DGETH-2.2] Command received functionality with server as DUT
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
similarity index 99%
rename from src/app/tests/suites/certification/Test_TC_ETHDIAG_1_2.yaml
rename to src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
index 0decc448e3eb2d..03c2b7056eee43 100644
--- a/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
@@ -13,7 +13,7 @@
 # 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: 45.1.2. [TC-ETHDIAG-1.2] Attributes with client as DUT
+name: 45.3.1. [TC-DGETH-3.1] Attributes with client as DUT
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
new file mode 100644
index 00000000000000..da71687fe184df
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
@@ -0,0 +1,65 @@
+# 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.3.2. [TC-DGETH-3.2] Command generated functionality with client as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "TH sends ResetCounts to DUT"
+      verification: |
+          Verify Command data recieved from running the below command is a success
+
+          ./chip-tool ethernetnetworkdiagnostics reset-counts 1 1
+          CHIP:DMG: InvokeResponseMessage =
+          [1649664146.639743][8173:8178] CHIP:DMG: {
+          [1649664146.639789][8173:8178] CHIP:DMG:         suppressResponse = false,
+          [1649664146.639836][8173:8178] CHIP:DMG:         InvokeResponseIBs =
+          [1649664146.639895][8173:8178] CHIP:DMG:         [
+          [1649664146.639941][8173:8178] CHIP:DMG:                 InvokeResponseIB =
+          [1649664146.640006][8173:8178] CHIP:DMG:                 {
+          [1649664146.640059][8173:8178] CHIP:DMG:                         CommandStatusIB =
+          [1649664146.640119][8173:8178] CHIP:DMG:                         {
+          [1649664146.640175][8173:8178] CHIP:DMG:                                 CommandPathIB =
+          [1649664146.640238][8173:8178] CHIP:DMG:                                 {
+          [1649664146.640302][8173:8178] CHIP:DMG:                                         EndpointId = 0x0,
+          [1649664146.640373][8173:8178] CHIP:DMG:                                         ClusterId = 0x37,
+          [1649664146.640438][8173:8178] CHIP:DMG:                                         CommandId = 0x0,
+          [1649664146.640500][8173:8178] CHIP:DMG:                                 },
+          [1649664146.640574][8173:8178] CHIP:DMG:
+          [1649664146.640632][8173:8178] CHIP:DMG:                                 StatusIB =
+          [1649664146.640693][8173:8178] CHIP:DMG:                                 {
+          [1649664146.640762][8173:8178] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1649664146.640824][8173:8178] CHIP:DMG:                                 },
+          [1649664146.640886][8173:8178] CHIP:DMG:
+          [1649664146.640943][8173:8178] CHIP:DMG:                         },
+          [1649664146.641007][8173:8178] CHIP:DMG:
+          [1649664146.641058][8173:8178] CHIP:DMG:                 },
+          [1649664146.641126][8173:8178] CHIP:DMG:
+          [1649664146.641174][8173:8178] CHIP:DMG:         ],
+          [1649664146.641230][8173:8178] CHIP:DMG:
+          [1649664146.641275][8173:8178] CHIP:DMG:         InteractionModelRevision = 1
+          [1649664146.641318][8173:8178] CHIP:DMG: },
+          [1649664146.641424][8173:8178] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0037 Command=0x0000_0000 Status=0x0
+          [1649664146.641499][8173:8178] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
new file mode 100644
index 00000000000000..bcdb38a1aa3f2e
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
@@ -0,0 +1,93 @@
+# 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.1.1. [TC-DGWIFI-1.1] Global attributes with server as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+          ./chip-tool pairing ble-wifi NODEID SSID PASSWD 20202021 3840 (commissioner side)
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read cluster-revision 1 0
+
+
+          [1651834623.658618][3910:3916] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFFD DataVersion: 2858283115
+          [1651834623.658776][3910:3916] CHIP:TOO:   ClusterRevision: 1
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read feature-map 1 0
+
+
+          [1651834671.432383][3919:3924] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFFC DataVersion: 2858283115
+          [1651834671.432466][3919:3924] CHIP:TOO:   FeatureMap: 3
+      disabled: true
+
+    - label: "TH reads AttribubteList from DUT"
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read attribute-list 1 0
+
+          [1651834734.844051][3928:3933] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFFB DataVersion: 2858283115
+          [1651834734.844159][3928:3933] CHIP:TOO:   AttributeList: 18 entries
+          [1651834734.844193][3928:3933] CHIP:TOO:     [1]: 0
+          [1651834734.844218][3928:3933] CHIP:TOO:     [2]: 1
+          [1651834734.844240][3928:3933] CHIP:TOO:     [3]: 2
+          [1651834734.844264][3928:3933] CHIP:TOO:     [4]: 3
+          [1651834734.844287][3928:3933] CHIP:TOO:     [5]: 4
+          [1651834734.844311][3928:3933] CHIP:TOO:     [6]: 5
+          [1651834734.844335][3928:3933] CHIP:TOO:     [7]: 6
+          [1651834734.844358][3928:3933] CHIP:TOO:     [8]: 7
+          [1651834734.844382][3928:3933] CHIP:TOO:     [9]: 8
+          [1651834734.844403][3928:3933] CHIP:TOO:     [10]: 9
+          [1651834734.844427][3928:3933] CHIP:TOO:     [11]: 10
+          [1651834734.844451][3928:3933] CHIP:TOO:     [12]: 11
+          [1651834734.844475][3928:3933] CHIP:TOO:     [13]: 12
+          [1651834734.844499][3928:3933] CHIP:TOO:     [14]: 65528
+          [1651834734.844523][3928:3933] CHIP:TOO:     [15]: 65529
+          [1651834734.844548][3928:3933] CHIP:TOO:     [16]: 65531
+          [1651834734.844571][3928:3933] CHIP:TOO:     [17]: 65532
+          [1651834734.844596][3928:3933] CHIP:TOO:     [18]: 65533
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read accepted-command-list 1 0
+
+          [1651788161.332422][241228:241233] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFF9 DataVersion: 3097381936
+          [1651788161.332475][241228:241233] CHIP:TOO:   AcceptedCommandList: 1 entries
+          [1651788161.332500][241228:241233] CHIP:TOO:     [1]: 0
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read generated-command-list 1 0
+
+          [1651788208.608429][241239:241244] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFF8 DataVersion: 3097381936
+          [1651788208.608490][241239:241244] CHIP:TOO:   GeneratedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          (Out of scope for v1.0)
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
similarity index 58%
rename from src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml
rename to src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
index 6d90c74fdb2b50..99009cd96db468 100644
--- a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 54.1.1. [TC-WIFIDIAG-1.1] Attributes with server as DUT
+name: 51.2.1. [TC-DGWIFI-2.1] Attributes with server as DUT
 
 config:
     nodeId: 0x12344321
@@ -36,16 +36,7 @@ tests:
           constraints:
               type: list
 
-    # issue: 16654 and 13645
-    # Various tests disabled for now until
-    # https://github.com/project-chip/connectedhomeip/pull/14755 is
-    # fixed and the SDK has the right types.
-    - label: "Reads SecurityType attribute from DUT"
-      command: "readAttribute"
-      attribute: "SecurityType"
-      response:
-          value: null
-
+    #issue #13645
     - label: "Reads SecurityType attribute constraints"
       command: "readAttribute"
       attribute: "SecurityType"
@@ -62,13 +53,6 @@ tests:
               minValue: 0
               maxValue: 5
 
-    - label: "Reads ChannelNumber attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "ChannelNumber"
-      response:
-          value: null
-
     - label: "Reads ChannelNumber attribute constraints"
       command: "readAttribute"
       attribute: "ChannelNumber"
@@ -76,13 +60,6 @@ tests:
           constraints:
               type: uint16
 
-    - label: "Reads RSSI attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "RSSI"
-      response:
-          value: null
-
     - label: "Reads RSSI attribute constraints"
       command: "readAttribute"
       attribute: "RSSI"
@@ -92,122 +69,63 @@ tests:
               minValue: -120
               maxValue: 0
 
-    - label: "Reads BeaconLostCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "BeaconLostCount"
-      response:
-          value: 0
-
     - label: "Reads BeaconLostCount attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "BeaconLostCount"
       response:
           constraints:
               type: uint32
 
-    - label: "Reads BeaconRxCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "BeaconRxCount"
-      response:
-          value: 0
-
     - label: "Reads BeaconRxCount attribute constraints"
-      disabled: true
       command: "readAttribute"
       attribute: "BeaconRxCount"
       response:
           constraints:
               type: uint32
 
-    - label: "Reads PacketMulticastRxCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PacketMulticastRxCount"
-      response:
-          value: 0
-
     - label: "Reads PacketMulticastRxCount attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "PacketMulticastRxCount"
       response:
           constraints:
               type: uint32
 
-    - label: "Reads PacketMulticastTxCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PacketMulticastTxCount"
-      response:
-          value: 0
-
     - label: "Reads PacketMulticastTxCount attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "PacketMulticastTxCount"
       response:
           constraints:
               type: uint32
 
-    - label: "Reads PacketUnicastRxCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PacketUnicastRxCount"
-      response:
-          value: 0
-
     - label: "Reads PacketUnicastRxCount attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "PacketUnicastRxCount"
       response:
           constraints:
               type: uint32
 
-    - label: "Reads PacketUnicastTxCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PacketUnicastTxCount"
-      response:
-          value: 0
-
     - label: "Reads PacketUnicastTxCount attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "PacketUnicastTxCount"
       response:
           constraints:
               type: uint32
 
-    # Disabled because this fails on Linux because we have no Wi-Fi interface.
-    - label: "Reads CurrentMaxRate attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "CurrentMaxRate"
-      response:
-          value: 0
-
-    # Disabled because this fails on Linux because we have no Wi-Fi interface.
     - label: "Reads CurrentMaxRate attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "CurrentMaxRate"
       response:
           constraints:
               type: uint64
 
-    - label: "Reads OverrunCount attribute from DUT"
-      disabled: true
-      command: "readAttribute"
-      attribute: "OverrunCount"
-      response:
-          value: 0
-
     - label: "Reads OverrunCount attribute constraints"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "OverrunCount"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
similarity index 95%
rename from src/app/tests/suites/certification/Test_TC_WIFIDIAG_2_1.yaml
rename to src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
index a6829aaed7cbe2..5b22bf5d467348 100644
--- a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
@@ -13,7 +13,7 @@
 # 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: 51.2.2. [TC-WIFIDIAG-2.1] Event functionality with server as DUT
+name: 51.2.2. [TC-DGWIFI-2.2] Event functionality with server as DUT
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml
similarity index 97%
rename from src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml
rename to src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml
index 1920e7f7724a47..6cf1873005ab72 100644
--- a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml
@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name:
-    54.2.3. [TC-WIFIDIAG-3.1] Command received functionality with server as DUT
+name: 51.2.3. [TC-DGWIFI-2.3] Command received functionality with server as DUT
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
new file mode 100644
index 00000000000000..046ad728cc69e4
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
@@ -0,0 +1,147 @@
+# 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.3.1. [TC-DGWIFI-3.1] Attributes with client as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission TH to DUT"
+      verification: |
+
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute value is non-zero and the value data type matches
+
+          ./chip-tool wifinetworkdiagnostics read bssid 1 0
+          [1650451782.025188][9063:9068] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0000 DataVersion: 1028539580
+          [1650451782.025262][9063:9068] CHIP:TOO:   bssid: 210200000000
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute value is non-zero and the value data type matches
+
+          ./chip-tool wifinetworkdiagnostics read security-type 1 0
+          [1650451927.587236][9086:9091] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0001 DataVersion: 1028539580
+          [1650451927.587329][9086:9091] CHIP:TOO:   SecurityType: 0
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read wi-fi-version 1 0
+
+          [1650451948.677197][9092:9097] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0002 DataVersion: 1028539580
+          [1650451948.677299][9092:9097] CHIP:TOO:   WiFiVersion: 3
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          ./chip-tool wifinetworkdiagnostics read channel-number 1 0
+
+          [1650451989.021486][9112:9117] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0003 DataVersion: 1028539580
+          [1650451989.021547][9112:9117] CHIP:TOO:   ChannelNumber: null
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read rssi 1 0
+          [1650452156.130334][9132:9137] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0004 DataVersion: 1028539580
+          [1650452156.130405][9132:9137] CHIP:TOO:   Rssi: null
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read beacon-lost-count 1 0
+
+          [1650450239.341208][5252:5257] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0005 DataVersion: 1626643502
+          [1650450239.341280][5252:5257] CHIP:TOO:   BeaconLostCount: 0
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read beacon-rx-count 1 0
+          [1650454625.960728][9290:9295] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0006 DataVersion: 1028539580
+          [1650454625.960813][9290:9295] CHIP:TOO:   BeaconRxCount: 0
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read packet-multicast-rx-count 1 0
+          [1650454695.550436][9303:9308] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0007 DataVersion: 1028539580
+          [1650454695.550515][9303:9308] CHIP:TOO:   PacketMulticastRxCount: 401028
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read packet-multicast-tx-count 1 0
+
+          [1650454724.371654][9311:9316] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0008 DataVersion: 1028539580
+          [1650454724.371740][9311:9316] CHIP:TOO:   PacketMulticastTxCount: 0
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read packet-unicast-rx-count 1 0
+
+          [1650454751.954086][9317:9322] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0009 DataVersion: 1028539580
+          [1650454751.954174][9317:9322] CHIP:TOO:   PacketUnicastRxCount: 653833
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read packet-unicast-tx-count 1 0
+          [1650454782.789340][9323:9328] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_000A DataVersion: 1028539580
+          [1650454782.789426][9323:9328] CHIP:TOO:   PacketUnicastTxCount: 1123
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read current-max-rate 1 0
+
+          [1650451685.092993][5470:5475] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_000B DataVersion: 1626643502
+          [1650451685.093078][5470:5475] CHIP:TOO:   CurrentMaxRate: 24000000
+      disabled: true
+
+    - label: "DUT reads a attribute value from TH."
+      verification: |
+          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+
+          ./chip-tool wifinetworkdiagnostics read overrun-count 1 0
+
+          [1650451635.634814][9056:9061] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_000C DataVersion: 1028539580
+          [1650451635.634882][9056:9061] CHIP:TOO:   OverrunCount: 0
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
new file mode 100644
index 00000000000000..a9a2fe4d52544d
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
@@ -0,0 +1,65 @@
+# 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.2.2. [TC-DGWIFI-3.2] Commands with client as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "DUT sends ResetCounts command to TH"
+      verification: |
+          Verify Command data recieved from running the below command is a success
+
+          ./chip-tool wifinetworkdiagnostics reset-counts 1 1
+          CHIP:DMG: InvokeResponseMessage =
+          [1649664146.639743][8173:8178] CHIP:DMG: {
+          [1649664146.639789][8173:8178] CHIP:DMG:         suppressResponse = false,
+          [1649664146.639836][8173:8178] CHIP:DMG:         InvokeResponseIBs =
+          [1649664146.639895][8173:8178] CHIP:DMG:         [
+          [1649664146.639941][8173:8178] CHIP:DMG:                 InvokeResponseIB =
+          [1649664146.640006][8173:8178] CHIP:DMG:                 {
+          [1649664146.640059][8173:8178] CHIP:DMG:                         CommandStatusIB =
+          [1649664146.640119][8173:8178] CHIP:DMG:                         {
+          [1649664146.640175][8173:8178] CHIP:DMG:                                 CommandPathIB =
+          [1649664146.640238][8173:8178] CHIP:DMG:                                 {
+          [1649664146.640302][8173:8178] CHIP:DMG:                                         EndpointId = 0x0,
+          [1649664146.640373][8173:8178] CHIP:DMG:                                         ClusterId = 0x36,
+          [1649664146.640438][8173:8178] CHIP:DMG:                                         CommandId = 0x0,
+          [1649664146.640500][8173:8178] CHIP:DMG:                                 },
+          [1649664146.640574][8173:8178] CHIP:DMG:
+          [1649664146.640632][8173:8178] CHIP:DMG:                                 StatusIB =
+          [1649664146.640693][8173:8178] CHIP:DMG:                                 {
+          [1649664146.640762][8173:8178] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1649664146.640824][8173:8178] CHIP:DMG:                                 },
+          [1649664146.640886][8173:8178] CHIP:DMG:
+          [1649664146.640943][8173:8178] CHIP:DMG:                         },
+          [1649664146.641007][8173:8178] CHIP:DMG:
+          [1649664146.641058][8173:8178] CHIP:DMG:                 },
+          [1649664146.641126][8173:8178] CHIP:DMG:
+          [1649664146.641174][8173:8178] CHIP:DMG:         ],
+          [1649664146.641230][8173:8178] CHIP:DMG:
+          [1649664146.641275][8173:8178] CHIP:DMG:         InteractionModelRevision = 1
+          [1649664146.641318][8173:8178] CHIP:DMG: },
+          [1649664146.641424][8173:8178] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0036 Command=0x0000_0000 Status=0x0
+          [1649664146.641499][8173:8178] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_2.yaml
index d5d24dab7d6754..974f3524402a34 100644
--- a/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_2.yaml
@@ -28,13 +28,11 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    #disabled due to this issue #18244
     - label: "read configured Channel attribute value"
-      disabled: true
       command: "readAttribute"
       attribute: "channel"
       response:
-          value: 0
+          value: null
 
     - label: "Validate constraints of attribute: Channel"
       command: "readAttribute"
@@ -44,6 +42,12 @@ tests:
               type: uint16
 
     - label: "read RoutingRole atribute from DUT"
+      command: "readAttribute"
+      attribute: "RoutingRole"
+      response:
+          value: null
+
+    - label: "Validate constraints of attribute: RoutingRole"
       command: "readAttribute"
       attribute: "RoutingRole"
       response:
@@ -52,12 +56,11 @@ tests:
               minValue: 0
               maxValue: 6
 
-    #Issue #18135
     - label: "read NetworkName attribute from DUT"
       command: "readAttribute"
       attribute: "NetworkName"
       response:
-          value: ""
+          value: null
 
     - label:
           "read NetworkName attribute from DUT and verify response value, If
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
new file mode 100644
index 00000000000000..fc2202c77cc3db
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
@@ -0,0 +1,99 @@
+# 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: 55.1.1. [TC-DLOG-1.1] Global Attributes [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs read cluster-revision 1 0
+
+
+          [1649670811.424717][3655:3660] CHIP:DMG:
+          [1649670811.424750][3655:3660] CHIP:DMG:        SuppressResponse = true,
+          [1649670811.424783][3655:3660] CHIP:DMG:        InteractionModelRevision = 1
+          [1649670811.424814][3655:3660] CHIP:DMG: }
+          [1649670811.424949][3655:3660] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs read feature-map 1 0
+
+
+          [1649670512.997198][3591:3596] CHIP:DMG:
+          [1649670512.997231][3591:3596] CHIP:DMG:        SuppressResponse = true,
+          [1649670512.997265][3591:3596] CHIP:DMG:        InteractionModelRevision = 1
+          [1649670512.997329][3591:3596] CHIP:DMG: }
+          [1649670512.997468][3591:3596] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads AttributeList from DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs read attribute-list 1 0
+
+
+          [1649670392.536999][3576:3581] CHIP:DMG:
+          [1649670392.537040][3576:3581] CHIP:DMG:        SuppressResponse = true,
+          [1649670392.537081][3576:3581] CHIP:DMG:        InteractionModelRevision = 1
+          [1649670392.537119][3576:3581] CHIP:DMG: }
+          [1649670392.537695][3576:3581] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0032 Attribute 0x0000_FFFB DataVersion: 1216963889
+          [1649670392.537917][3576:3581] CHIP:TOO:   AttributeList: 3 entries
+          [1649670392.537985][3576:3581] CHIP:TOO:     [1]: 65528
+          [1649670392.538030][3576:3581] CHIP:TOO:     [2]: 65529
+          [1649670392.538071][3576:3581] CHIP:TOO:     [3]: 65531
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs read accepted-command-list 1 0
+
+
+          [1649670700.139000][3624:3629] CHIP:DMG:
+          [1649670700.139033][3624:3629] CHIP:DMG:        SuppressResponse = true,
+          [1649670700.139066][3624:3629] CHIP:DMG:        InteractionModelRevision = 1
+          [1649670700.139097][3624:3629] CHIP:DMG: }
+          [1649670700.139387][3624:3629] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0032 Attribute 0x0000_FFF9 DataVersion: 1216963889
+          [1649670700.139473][3624:3629] CHIP:TOO:   AcceptedCommandList: 1 entries
+          [1649670700.139528][3624:3629] CHIP:TOO:     [1]: 0
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs read generated-command-list 1 0
+
+
+          [1649670576.965898][3602:3607] CHIP:DMG:
+          [1649670576.965927][3602:3607] CHIP:DMG:        SuppressResponse = true,
+          [1649670576.965955][3602:3607] CHIP:DMG:        InteractionModelRevision = 1
+          [1649670576.965987][3602:3607] CHIP:DMG: }
+          [1649670576.966225][3602:3607] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0032 Attribute 0x0000_FFF8 DataVersion: 1216963889
+          [1649670576.966330][3602:3607] CHIP:TOO:   GeneratedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          Event-list is not implemented
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
new file mode 100644
index 00000000000000..c7182d642fe234
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
@@ -0,0 +1,86 @@
+# 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:
+    55.2.1. [TC-DLOG-2.1] Diagnostic Logs Cluster Commands Checks with BDX
+    [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Reboot DUT"
+      verification: |
+
+      disabled: true
+
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label:
+          "TH sends RetrieveLogsRequest Command (Intent =
+          EndUserSupport,TransferFileDesignator = 'test.txt', RequestedProtocol=
+          BDX) to DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 1 "test.txt" 1 0
+
+
+          [1651207333.385887][2441:2446] CHIP:DMG:                                StatusIB =
+          [1651207333.385937][2441:2446] CHIP:DMG:                                {
+          [1651207333.385985][2441:2446] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1651207333.386037][2441:2446] CHIP:DMG:                                },
+      disabled: true
+
+    - label: "TH Sends BDX SendAccept message"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH sends RetrieveLogsRequest Command (Intent =
+          EndUserSupport,TransferFileDesignator = 'test.txt', RequestedProtocol=
+          BDX) to DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 1 "test.txt" 1 0
+
+          [1651207386.883337][2457:2462] CHIP:DMG:
+          [1651207386.883383][2457:2462] CHIP:DMG:                                StatusIB =
+          [1651207386.883443][2457:2462] CHIP:DMG:                                {
+          [1651207386.883498][2457:2462] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1651207386.883563][2457:2462] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH Sends StatusReport(GeneralCode: FAILURE, ProtocolId: BDX,
+          ProtocolCode: TRANSFER_METHOD_NOT_SUPPORTED)"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH sends RetrieveLogsRequest Command (Intent = EndUserSupport,
+          RequestedProtocol = ResponsePayload) to DUT"
+      verification: |
+          sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
+
+          [1651207416.783607][2465:2470] CHIP:DMG:                                StatusIB =
+          [1651207416.783676][2465:2470] CHIP:DMG:                                {
+          [1651207416.783722][2465:2470] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1651207416.783766][2465:2470] CHIP:DMG:                                },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_Diag_Log_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml
similarity index 90%
rename from src/app/tests/suites/certification/Test_TC_Diag_Log_2_2.yaml
rename to src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml
index 8540ed0e917ba4..6fd03bb8ce9b37 100644
--- a/src/app/tests/suites/certification/Test_TC_Diag_Log_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml
@@ -14,8 +14,8 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    54.3. [TC-Diag Log-2.2] Diagnostic Logs Cluster Commands Checks without BDX
-    [DUT Server]
+    55.2.2. [TC-DLOG-2.2] Diagnostic Logs Cluster Commands Checks without BDX
+    [DUT-Server]
 
 config:
     nodeId: 0x12344321
@@ -29,10 +29,11 @@ tests:
       disabled: true
 
     - label:
-          "TH sends RetrieveLogsRequest Command (Intent = EndUserSupport,
-          TransferFileDesignator = ''test.txt'',RequestedProtocol= BDX) to DUT"
+          "TH sends RetrieveLogsRequest Command (Intent =
+          EndUserSupport,TransferFileDesignator = 'test.txt',RequestedProtocol=
+          BDX) to DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
+          sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
 
           [1646209207.288823][3223:3228] CHIP:DMG: InvokeResponseMessage =
           [1646209207.288859][3223:3228] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
new file mode 100644
index 00000000000000..b5f0d55fabc6aa
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
@@ -0,0 +1,93 @@
+# 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: 55.3.1. [TC-DLOG-3.1] Diagnostic Logs Cluster Commands Checks[DUT-Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "DUT sends RetrieveLogsRequest Command to TH"
+      verification: |
+          ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
+
+
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                 StatusIB =
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                 {
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                         status = 0x0,
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                 },
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]                         },
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]                 },
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]         ],
+          [1646215088532] [15387:2221674] CHIP: [DMG]
+          [1646215088532] [15387:2221674] CHIP: [DMG]         InteractionModelRevision = 1
+          [1646215088532] [15387:2221674] CHIP: [DMG] },
+          [1646215088532] [15387:2221674] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
+      disabled: true
+
+    - label: "In case TH initiates a BDX Transfer"
+      verification: |
+          grl_matter@GRL-Matters-MacBook-Air debug % sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 1 "test.txt" 1 0
+
+
+          [1646208340.192138][3171:3176] CHIP:DMG:
+          [1646208340.192177][3171:3176] CHIP:DMG:                                StatusIB =
+          [1646208340.192224][3171:3176] CHIP:DMG:                                {
+          [1646208340.192271][3171:3176] CHIP:DMG:                                   status = 0x0,
+          [1646208340.192319][3171:3176] CHIP:DMG:                                },
+          [1646208340.192362][3171:3176] CHIP:DMG:
+          [1646208340.192401][3171:3176] CHIP:DMG:                        },
+          [1646208340.192450][3171:3176] CHIP:DMG:
+          [1646208340.192486][3171:3176] CHIP:DMG:                },
+          [1646208340.192530][3171:3176] CHIP:DMG:
+          [1646208340.192562][3171:3176] CHIP:DMG:        ],
+          [1646208340.192602][3171:3176] CHIP:DMG:
+          [1646208340.192634][3171:3176] CHIP:DMG:        InteractionModelRevision = 1
+          [1646208340.192665][3171:3176] CHIP:DMG: },
+          [1646208340.192744][3171:3176] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
+      disabled: true
+
+    - label: "In case TH does not initiate BDX Transfer"
+      verification: |
+          ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
+
+
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                 StatusIB =
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                 {
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                         status = 0x0,
+          [1646215088531] [15387:2221674] CHIP: [DMG]                                 },
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]                         },
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]                 },
+          [1646215088531] [15387:2221674] CHIP: [DMG]
+          [1646215088531] [15387:2221674] CHIP: [DMG]         ],
+          [1646215088532] [15387:2221674] CHIP: [DMG]
+          [1646215088532] [15387:2221674] CHIP: [DMG]         InteractionModelRevision = 1
+          [1646215088532] [15387:2221674] CHIP: [DMG] },
+          [1646215088532] [15387:2221674] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DL_1_1.yaml
new file mode 100644
index 00000000000000..eb2fc772ae1fa2
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DL_1_1.yaml
@@ -0,0 +1,115 @@
+# 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: 113.1.1. [TC-DL-1.1] Global Attributes [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool doorlock read cluster-revision 1 1
+
+          [1653373723.118856][2592:2597] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_FFFD DataVersion: 4018252607
+          [1653373723.121404][2592:2597] CHIP:TOO:   ClusterRevision: 6
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool doorlock read feature-map 1 1
+
+          [1653373812.820370][2602:2607] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_FFFC DataVersion: 4018252607
+          [1653373812.820429][2602:2607] CHIP:TOO:   FeatureMap: 275
+      disabled: true
+
+    - label: "TH reads AttributeList from DUT"
+      verification: |
+          ./chip-tool doorlock read attribute-list 1 1
+
+          [1653373860.712540][2696:2701] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_FFFB DataVersion: 4018252607
+          [1653373860.712642][2696:2701] CHIP:TOO:   AttributeList: 29 entries
+          [1653373860.712676][2696:2701] CHIP:TOO:     [1]: 0
+          [1653373860.712702][2696:2701] CHIP:TOO:     [2]: 1
+          [1653373860.712727][2696:2701] CHIP:TOO:     [3]: 2
+          [1653373860.712751][2696:2701] CHIP:TOO:     [4]: 3
+          [1653373860.712775][2696:2701] CHIP:TOO:     [5]: 17
+          [1653373860.712800][2696:2701] CHIP:TOO:     [6]: 18
+          [1653373860.712824][2696:2701] CHIP:TOO:     [7]: 19
+          [1653373860.712848][2696:2701] CHIP:TOO:     [8]: 20
+          [1653373860.712872][2696:2701] CHIP:TOO:     [9]: 21
+          [1653373860.712895][2696:2701] CHIP:TOO:     [10]: 23
+          [1653373860.712919][2696:2701] CHIP:TOO:     [11]: 24
+          [1653373860.712943][2696:2701] CHIP:TOO:     [12]: 25
+          [1653373860.712967][2696:2701] CHIP:TOO:     [13]: 26
+          [1653373860.712991][2696:2701] CHIP:TOO:     [14]: 27
+          [1653373860.713014][2696:2701] CHIP:TOO:     [15]: 33
+          [1653373860.713038][2696:2701] CHIP:TOO:     [16]: 35
+          [1653373860.713060][2696:2701] CHIP:TOO:     [17]: 36
+          [1653373860.713083][2696:2701] CHIP:TOO:     [18]: 37
+          [1653373860.713107][2696:2701] CHIP:TOO:     [19]: 38
+          [1653373860.713131][2696:2701] CHIP:TOO:     [20]: 41
+          [1653373860.713155][2696:2701] CHIP:TOO:     [21]: 43
+          [1653373860.713178][2696:2701] CHIP:TOO:     [22]: 48
+          [1653373860.713202][2696:2701] CHIP:TOO:     [23]: 49
+          [1653373860.713226][2696:2701] CHIP:TOO:     [24]: 51
+          [1653373860.713248][2696:2701] CHIP:TOO:     [25]: 65528
+          [1653373860.713272][2696:2701] CHIP:TOO:     [26]: 65529
+          [1653373860.713296][2696:2701] CHIP:TOO:     [27]: 65531
+          [1653373860.713320][2696:2701] CHIP:TOO:     [28]: 65532
+          [1653373860.713344][2696:2701] CHIP:TOO:     [29]: 65533
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          out of scope for V1.0
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool doorlock read accepted-command-list 1 1
+
+          [1653373949.890221][2715:2720] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_FFF9 DataVersion: 4018252607
+          [1653373949.890312][2715:2720] CHIP:TOO:   AcceptedCommandList: 14 entries
+          [1653373949.890347][2715:2720] CHIP:TOO:     [1]: 0
+          [1653373949.890373][2715:2720] CHIP:TOO:     [2]: 1
+          [1653373949.890398][2715:2720] CHIP:TOO:     [3]: 11
+          [1653373949.890423][2715:2720] CHIP:TOO:     [4]: 12
+          [1653373949.890448][2715:2720] CHIP:TOO:     [5]: 13
+          [1653373949.890472][2715:2720] CHIP:TOO:     [6]: 14
+          [1653373949.890496][2715:2720] CHIP:TOO:     [7]: 15
+          [1653373949.890521][2715:2720] CHIP:TOO:     [8]: 16
+          [1653373949.890545][2715:2720] CHIP:TOO:     [9]: 26
+          [1653373949.890569][2715:2720] CHIP:TOO:     [10]: 27
+          [1653373949.890593][2715:2720] CHIP:TOO:     [11]: 29
+          [1653373949.890617][2715:2720] CHIP:TOO:     [12]: 34
+          [1653373949.890642][2715:2720] CHIP:TOO:     [13]: 36
+          [1653373949.890666][2715:2720] CHIP:TOO:     [14]: 38
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool doorlock read generated-command-list 1 1
+
+          [1653374054.494879][2725:2730] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_FFF8 DataVersion: 4018252607
+          [1653374054.494967][2725:2730] CHIP:TOO:   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_1.yaml
index da0d604699fc0e..bbc8fd53b58d72 100644
--- a/src/app/tests/suites/certification/Test_TC_DL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_1.yaml
@@ -13,7 +13,7 @@
 # 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: 100.2.1. [TC-DL-2.1] Attributes check [DUT - Server]
+name: 112.2.1. [TC-DL-2.1] Attributes check [DUT - Server]
 
 config:
     nodeId: 0x12344321
@@ -23,242 +23,1231 @@ config:
 tests:
     - label: "TH reads LockState attribute from DUT"
       verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
+          ./chip-tool doorlock read lock-state 1 1
+          [1653374351.373518][2749:2755] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0000 DataVersion: 4018252607
+          [1653374351.373589][2749:2755] CHIP:TOO:   LockState: 1
+      disabled: true
+
+    - label: "TH writes LockState attribute as 1"
+      verification: |
+          ./chip-tool doorlock write lock-state 1 1
+          [1653385331.682442][3714:3714] CHIP:TOO: Unknown attribute: lock-state
+      disabled: true
+
+    - label: "TH reads LockState attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read lock-state 1 1
+          [1653374351.373518][2749:2755] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0000 DataVersion: 4018252607
+          [1653374351.373589][2749:2755] CHIP:TOO:   LockState: 1
+      disabled: true
+
+    - label: "TH reads LockType attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read lock-type 1 1
+
+          [1653374556.200310][2776:2781] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0001 DataVersion: 4018252607
+          [1653374556.200362][2776:2781] CHIP:TOO:   LockType: 0
+      disabled: true
+
+    - label: "TH writes LockType attribute as 10"
+      verification: |
+          ./chip-tool doorlock write lock-type 1 1
+          [1653385390.925430][3717:3717] CHIP:TOO: Unknown attribute: lock-type
       disabled: true
 
     - label: "TH reads LockType attribute from DUT"
       verification: |
+          ./chip-tool doorlock read lock-type 1 1
+
+          [1653374556.200310][2776:2781] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0001 DataVersion: 4018252607
+          [1653374556.200362][2776:2781] CHIP:TOO:   LockType: 0
+      disabled: true
+
+    - label: "TH reads ActuatorEnabled attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read actuator-enabled 1 1
+
+          [1653374617.287332][2785:2790] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0002 DataVersion: 4018252607
+          [1653374617.287368][2785:2790] CHIP:TOO:   ActuatorEnabled: TRUE
+      disabled: true
 
+    - label: "TH writes ActuatorEnabled attribute as 0"
+      verification: |
+          ./chip-tool doorlock write actuator-enabled  1 1
+          [1653385453.845278][3722:3722] CHIP:TOO: Unknown attribute: actuator-enabled
       disabled: true
 
     - label: "TH reads ActuatorEnabled attribute from DUT"
       verification: |
+          ./chip-tool doorlock read actuator-enabled 1 1
+
+          [1653374617.287332][2785:2790] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0002 DataVersion: 4018252607
+          [1653374617.287368][2785:2790] CHIP:TOO:   ActuatorEnabled: TRUE
+      disabled: true
+
+    - label: "TH reads DoorState attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read door-state 1 1
 
+          [1653374729.692396][2798:2803] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0003 DataVersion: 4018252607
+          [1653374729.692467][2798:2803] CHIP:TOO:   DoorState: 0
+      disabled: true
+
+    - label: "TH writes DoorState attribute as 1"
+      verification: |
+          ./chip-tool doorlock write door-state 1 1
+          [1653385494.200848][3724:3724] CHIP:TOO: Unknown attribute: door-state
       disabled: true
 
     - label: "TH reads DoorState attribute from DUT"
       verification: |
+          ./chip-tool doorlock read door-state 1 1
 
+          [1653374729.692396][2798:2803] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0003 DataVersion: 4018252607
+          [1653374729.692467][2798:2803] CHIP:TOO:   DoorState: 0
       disabled: true
 
     - label: "TH reads DoorOpenEvents attribute from DUT"
       verification: |
+          ./chip-tool doorlock read door-open-events 1 1
+
+          [1653376656.280445][2920:2925] CHIP:DMG:                                StatusIB =
+          [1653376656.280493][2920:2925] CHIP:DMG:                                {
+          [1653376656.280533][2920:2925] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653376656.280577][2920:2925] CHIP:DMG:                                },
+          [1653376656.280618][2920:2925] CHIP:DMG:
+          [1653376656.280656][2920:2925] CHIP:DMG:                        },
+          [1653376656.280702][2920:2925] CHIP:DMG:
+          [1653376656.280739][2920:2925] CHIP:DMG:                },
+          [1653376656.280781][2920:2925] CHIP:DMG:
+          [1653376656.280813][2920:2925] CHIP:DMG:        ],
+          [1653376656.280852][2920:2925] CHIP:DMG:
+          [1653376656.280886][2920:2925] CHIP:DMG:        SuppressResponse = true,
+          [1653376656.280920][2920:2925] CHIP:DMG:        InteractionModelRevision = 1
+          [1653376656.280951][2920:2925] CHIP:DMG: }
+          [1653376656.281089][2920:2925] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH writes DoorOpenEvents attribute as 10"
+      verification: |
+          ./chip-tool doorlock write door-open-events 4 1 1
+
+          [1653376891.000044][2941:2946] CHIP:DMG:                        }
+          [1653376891.000211][2941:2946] CHIP:DMG:
+          [1653376891.000265][2941:2946] CHIP:DMG:                        StatusIB =
+          [1653376891.000315][2941:2946] CHIP:DMG:                        {
+          [1653376891.000367][2941:2946] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653376891.000415][2941:2946] CHIP:DMG:                        },
+          [1653376891.000463][2941:2946] CHIP:DMG:
+          [1653376891.000505][2941:2946] CHIP:DMG:                },
+          [1653376891.000552][2941:2946] CHIP:DMG:
+          [1653376891.000587][2941:2946] CHIP:DMG:        ],
+          [1653376891.000632][2941:2946] CHIP:DMG:
+          [1653376891.000669][2941:2946] CHIP:DMG:        InteractionModelRevision = 1
+          [1653376891.000703][2941:2946] CHIP:DMG: }
+          [1653376891.000795][2941:2946] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH reads DoorOpenEvents attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read door-open-events 1 1
+
+          [1653376656.280445][2920:2925] CHIP:DMG:                                StatusIB =
+          [1653376656.280493][2920:2925] CHIP:DMG:                                {
+          [1653376656.280533][2920:2925] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653376656.280577][2920:2925] CHIP:DMG:                                },
+          [1653376656.280618][2920:2925] CHIP:DMG:
+          [1653376656.280656][2920:2925] CHIP:DMG:                        },
+          [1653376656.280702][2920:2925] CHIP:DMG:
+          [1653376656.280739][2920:2925] CHIP:DMG:                },
+          [1653376656.280781][2920:2925] CHIP:DMG:
+          [1653376656.280813][2920:2925] CHIP:DMG:        ],
+          [1653376656.280852][2920:2925] CHIP:DMG:
+          [1653376656.280886][2920:2925] CHIP:DMG:        SuppressResponse = true,
+          [1653376656.280920][2920:2925] CHIP:DMG:        InteractionModelRevision = 1
+          [1653376656.280951][2920:2925] CHIP:DMG: }
+          [1653376656.281089][2920:2925] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
     - label: "TH reads DoorClosedEvents attribute from DUT"
       verification: |
+          ./chip-tool doorlock read door-closed-events 1 1
+
+          [1653376963.392967][2960:2965] CHIP:DMG:                                StatusIB =
+          [1653376963.393009][2960:2965] CHIP:DMG:                                {
+          [1653376963.393051][2960:2965] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653376963.393093][2960:2965] CHIP:DMG:                                },
+          [1653376963.393132][2960:2965] CHIP:DMG:
+          [1653376963.393168][2960:2965] CHIP:DMG:                        },
+          [1653376963.393207][2960:2965] CHIP:DMG:
+          [1653376963.393239][2960:2965] CHIP:DMG:                },
+          [1653376963.393276][2960:2965] CHIP:DMG:
+          [1653376963.393303][2960:2965] CHIP:DMG:        ],
+          [1653376963.393338][2960:2965] CHIP:DMG:
+          [1653376963.393368][2960:2965] CHIP:DMG:        SuppressResponse = true,
+          [1653376963.393397][2960:2965] CHIP:DMG:        InteractionModelRevision = 1
+          [1653376963.393424][2960:2965] CHIP:DMG: }
+          [1653376963.393547][2960:2965] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH writes DoorClosedEvents attribute as 11"
+      verification: |
+          ./chip-tool doorlock write door-closed-events 5 1 1
+
+          [1653377032.809221][2969:2974] CHIP:DMG:                        StatusIB =
+          [1653377032.809271][2969:2974] CHIP:DMG:                        {
+          [1653377032.809318][2969:2974] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653377032.809364][2969:2974] CHIP:DMG:                        },
+          [1653377032.809412][2969:2974] CHIP:DMG:
+          [1653377032.809452][2969:2974] CHIP:DMG:                },
+          [1653377032.809500][2969:2974] CHIP:DMG:
+          [1653377032.809535][2969:2974] CHIP:DMG:        ],
+          [1653377032.809579][2969:2974] CHIP:DMG:
+          [1653377032.809613][2969:2974] CHIP:DMG:        InteractionModelRevision = 1
+          [1653377032.809648][2969:2974] CHIP:DMG: }
+          [1653377032.809736][2969:2974] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads DoorClosedEvents attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read door-closed-events 1 1
+
+          [1653376963.392967][2960:2965] CHIP:DMG:                                StatusIB =
+          [1653376963.393009][2960:2965] CHIP:DMG:                                {
+          [1653376963.393051][2960:2965] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653376963.393093][2960:2965] CHIP:DMG:                                },
+          [1653376963.393132][2960:2965] CHIP:DMG:
+          [1653376963.393168][2960:2965] CHIP:DMG:                        },
+          [1653376963.393207][2960:2965] CHIP:DMG:
+          [1653376963.393239][2960:2965] CHIP:DMG:                },
+          [1653376963.393276][2960:2965] CHIP:DMG:
+          [1653376963.393303][2960:2965] CHIP:DMG:        ],
+          [1653376963.393338][2960:2965] CHIP:DMG:
+          [1653376963.393368][2960:2965] CHIP:DMG:        SuppressResponse = true,
+          [1653376963.393397][2960:2965] CHIP:DMG:        InteractionModelRevision = 1
+          [1653376963.393424][2960:2965] CHIP:DMG: }
+          [1653376963.393547][2960:2965] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
     - label: "TH reads OpenPeriod attribute from DUT"
       verification: |
+          ./chip-tool doorlock read open-period 1 1
+
+          [1653377163.004837][3008:3013] CHIP:DMG:                                StatusIB =
+          [1653377163.004887][3008:3013] CHIP:DMG:                                {
+          [1653377163.004932][3008:3013] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653377163.004983][3008:3013] CHIP:DMG:                                },
+          [1653377163.005028][3008:3013] CHIP:DMG:
+          [1653377163.005072][3008:3013] CHIP:DMG:                        },
+          [1653377163.005123][3008:3013] CHIP:DMG:
+          [1653377163.005165][3008:3013] CHIP:DMG:                },
+          [1653377163.005210][3008:3013] CHIP:DMG:
+          [1653377163.005246][3008:3013] CHIP:DMG:        ],
+          [1653377163.005291][3008:3013] CHIP:DMG:
+          [1653377163.005329][3008:3013] CHIP:DMG:        SuppressResponse = true,
+          [1653377163.005367][3008:3013] CHIP:DMG:        InteractionModelRevision = 1
+          [1653377163.005402][3008:3013] CHIP:DMG: }
+          [1653377163.005558][3008:3013] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH writes OpenPeriod attribute as 2 minutes"
+      verification: |
+          ./chip-tool doorlock write open-period 6 1 1
+
+          [1653377214.714315][3016:3021] CHIP:DMG:
+          [1653377214.714349][3016:3021] CHIP:DMG:                        StatusIB =
+          [1653377214.714385][3016:3021] CHIP:DMG:                        {
+          [1653377214.714420][3016:3021] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653377214.714455][3016:3021] CHIP:DMG:                        },
+          [1653377214.714495][3016:3021] CHIP:DMG:
+          [1653377214.714525][3016:3021] CHIP:DMG:                },
+          [1653377214.714561][3016:3021] CHIP:DMG:
+          [1653377214.714588][3016:3021] CHIP:DMG:        ],
+          [1653377214.714621][3016:3021] CHIP:DMG:
+          [1653377214.714648][3016:3021] CHIP:DMG:        InteractionModelRevision = 1
+          [1653377214.714674][3016:3021] CHIP:DMG: }
+          [1653377214.714746][3016:3021] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads OpenPeriod attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read open-period 1 1
+
+          [1653377163.004837][3008:3013] CHIP:DMG:                                StatusIB =
+          [1653377163.004887][3008:3013] CHIP:DMG:                                {
+          [1653377163.004932][3008:3013] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653377163.004983][3008:3013] CHIP:DMG:                                },
+          [1653377163.005028][3008:3013] CHIP:DMG:
+          [1653377163.005072][3008:3013] CHIP:DMG:                        },
+          [1653377163.005123][3008:3013] CHIP:DMG:
+          [1653377163.005165][3008:3013] CHIP:DMG:                },
+          [1653377163.005210][3008:3013] CHIP:DMG:
+          [1653377163.005246][3008:3013] CHIP:DMG:        ],
+          [1653377163.005291][3008:3013] CHIP:DMG:
+          [1653377163.005329][3008:3013] CHIP:DMG:        SuppressResponse = true,
+          [1653377163.005367][3008:3013] CHIP:DMG:        InteractionModelRevision = 1
+          [1653377163.005402][3008:3013] CHIP:DMG: }
+          [1653377163.005558][3008:3013] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
-    - label: "TH reads NumberOfLogRecordsSupported attribute from DUT"
+    - label: "TH reads NumberOfTotalUsersSupported attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  number-of-total-users-supported 1 1
+
+          [1653377365.748742][3031:3036] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0011 DataVersion: 4018252607
+          [1653377365.748814][3031:3036] CHIP:TOO:   NumberOfTotalUsersSupported: 10
+      disabled: true
 
+    - label: "TH writes NumberOfTotalUsersSupported attribute as 20"
+      verification: |
+          ./chip-tool doorlock write number-of-total-users-supported 1 1
+          [1653385575.613595][3729:3729] CHIP:TOO: Unknown attribute: number-of-total-users-supported
       disabled: true
 
     - label: "TH reads NumberOfTotalUsersSupported attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  number-of-total-users-supported 1 1
+
+          [1653377365.748742][3031:3036] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0011 DataVersion: 4018252607
+          [1653377365.748814][3031:3036] CHIP:TOO:   NumberOfTotalUsersSupported: 10
+      disabled: true
+
+    - label: "TH reads NumberOfPINUsersSupported attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read number-of-pinusers-supported 1 1
 
+          [1653377447.965392][3040:3045] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0012 DataVersion: 4018252607
+          [1653377447.965462][3040:3045] CHIP:TOO:   NumberOfPINUsersSupported: 10
+      disabled: true
+
+    - label: "TH writes NumberOfPINUsersSupported attribute as 25"
+      verification: |
+          ./chip-tool doorlock write number-of-pinusers-supported 1 1
+          [1653385619.471653][3733:3733] CHIP:TOO: Unknown attribute: number-of-pinusers-supported
       disabled: true
 
     - label: "TH reads NumberOfPINUsersSupported attribute from DUT"
       verification: |
+          ./chip-tool doorlock read number-of-pinusers-supported 1 1
+
+          [1653377447.965392][3040:3045] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0012 DataVersion: 4018252607
+          [1653377447.965462][3040:3045] CHIP:TOO:   NumberOfPINUsersSupported: 10
+      disabled: true
+
+    - label: "TH reads NumberOfRFIDUsersSupported attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read number-of-rfidusers-supported 1 1
 
+          [1653377521.865643][3049:3054] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0013 DataVersion: 4018252607
+          [1653377521.865722][3049:3054] CHIP:TOO:   NumberOfRFIDUsersSupported: 10
+      disabled: true
+
+    - label: "TH writes NumberOfRFIDUsersSupported attribute as 30"
+      verification: |
+          ./chip-tool doorlock write  number-of-rfidusers-supported 1 1
+          [1653385665.709545][3737:3737] CHIP:TOO: Unknown attribute: number-of-rfidusers-supported
       disabled: true
 
     - label: "TH reads NumberOfRFIDUsersSupported attribute from DUT"
       verification: |
+          ./chip-tool doorlock read number-of-rfidusers-supported 1 1
 
+          [1653377521.865643][3049:3054] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0013 DataVersion: 4018252607
+          [1653377521.865722][3049:3054] CHIP:TOO:   NumberOfRFIDUsersSupported: 10
       disabled: true
 
     - label:
           "TH reads NumberOfWeekDaysSchedulesSupporterUser attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  number-of-week-day-schedules-supported-per-user 1 1
+
+          [1653377589.378532][3060:3065] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0014 DataVersion: 4018252607
+          [1653377589.378611][3060:3065] CHIP:TOO:   NumberOfWeekDaySchedulesSupportedPerUser: 10
+      disabled: true
+
+    - label:
+          "TH writes NumberOfWeekDaySchedulesSupportedPerUser attribute as 31"
+      verification: |
+          ./chip-tool doorlock write number-of-week-day-schedules-supported-per-user 1 1
+          [1653385709.789383][3739:3739] CHIP:TOO: Unknown attribute: number-of-week-day-schedules-supported-per-user
+      disabled: true
+
+    - label:
+          "TH reads NumberOfWeekDaySchedulesSupportedPerUser attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read  number-of-week-day-schedules-supported-per-user 1 1
+
+          [1653377589.378532][3060:3065] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0014 DataVersion: 4018252607
+          [1653377589.378611][3060:3065] CHIP:TOO:   NumberOfWeekDaySchedulesSupportedPerUser: 10
+      disabled: true
+
+    - label:
+          "TH reads NumberOfYearDaySchedulesSupportedPeruser attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read number-of-year-day-schedules-supported-per-user 1 1
+
+          [1653377647.458495][3070:3075] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0015 DataVersion: 4018252607
+          [1653377647.458580][3070:3075] CHIP:TOO:   NumberOfYearDaySchedulesSupportedPerUser: 10
+      disabled: true
 
+    - label:
+          "TH writes NumberOfYearDaySchedulesSupportedPerUser attribute as 35"
+      verification: |
+          ./chip-tool doorlock write number-of-year-day-schedules-supported-per-user 1 1
+          [1653385752.463713][3740:3740] CHIP:TOO: Unknown attribute: number-of-year-day-schedules-supported-per-user
       disabled: true
 
     - label:
-          "TH reads NumberOf YearDaySchedulesSupportedPeruserattribute from DUT"
+          "TH reads NumberOfYearDaySchedulesSupportedPerUser attribute from DUT"
       verification: |
+          ./chip-tool doorlock read number-of-year-day-schedules-supported-per-user 1 1
 
+          [1653377647.458495][3070:3075] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0015 DataVersion: 4018252607
+          [1653377647.458580][3070:3075] CHIP:TOO:   NumberOfYearDaySchedulesSupportedPerUser: 10
       disabled: true
 
     - label: "TH reads NumberOfHoliDaySchedulesSupported attribute from DUT"
       verification: |
+          ./chip-tool doorlock read number-of-holiday-schedules-supported 1 1
+
+          [1653377768.408467][3088:3093] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+          [1653377768.408590][3088:3093] CHIP:EM: Sending Standalone Ack for MessageCounter:11722054 on exchange 62013i
+      disabled: true
+
+    - label: "TH writes NumberOfHolidaySchedulesSupported attribute as 36"
+      verification: |
+          ./chip-tool doorlock write  number-of-holiday-schedules-supported 1 1
+          [1653385816.916485][3743:3743] CHIP:TOO: Unknown attribute: number-of-holiday-schedules-supported
+      disabled: true
+
+    - label: "TH reads NumberOfHolidaySchedulesSupported attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read number-of-holiday-schedules-supported 1 1
+
+          [1653377768.408467][3088:3093] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+          [1653377768.408590][3088:3093] CHIP:EM: Sending Standalone Ack for MessageCounter:11722054 on exchange 62013i
+      disabled: true
+
+    - label: "TH reads MaxPINCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read  max-pincode-length 1 1
 
+          [1653377837.090591][3097:3102] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0017 DataVersion: 4018252607
+          [1653377837.090667][3097:3102] CHIP:TOO:   MaxPINCodeLength: 8
       disabled: true
 
-    - label: "TH reads MaxPINCodedLength attribute from DUT"
+    - label: "TH writes MaxPINCodeLength attribute as 85"
       verification: |
+          ./chip-tool doorlock write  max-pincode-length 1 1
+          [1653385871.706688][3746:3746] CHIP:TOO: Unknown attribute: max-pincode-length
+      disabled: true
+
+    - label: "TH reads MaxPINCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read  max-pincode-length 1 1
+
+          [1653377837.090591][3097:3102] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0017 DataVersion: 4018252607
+          [1653377837.090667][3097:3102] CHIP:TOO:   MaxPINCodeLength: 8
+      disabled: true
+
+    - label: "TH reads MinPINCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read min-pincode-length 1 1
 
+          [1653378027.583455][3119:3124] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0018 DataVersion: 4018252607
+          [1653378027.583519][3119:3124] CHIP:TOO:   MinPINCodeLength: 6
       disabled: true
 
-    - label: "TH reads MinPINCodedLength attribute from DUT"
+    - label: "TH writes MinPINCodeLength attribute as 63"
       verification: |
+          ./chip-tool doorlock write  min-pincode-length 1 1
+          [1653385909.076429][3750:3750] CHIP:TOO: Unknown attribute: min-pincode-length
+      disabled: true
+
+    - label: "TH reads MinPINCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read min-pincode-length 1 1
 
+          [1653378027.583455][3119:3124] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0018 DataVersion: 4018252607
+          [1653378027.583519][3119:3124] CHIP:TOO:   MinPINCodeLength: 6
       disabled: true
 
-    - label: "TH reads MaxRFIDCodedLegth attribute from DUT"
+    - label: "TH reads MaxRFIDCodeLength attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  max-rfidcode-length 1 1
 
+          [1653378082.693436][3127:3132] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0019 DataVersion: 4018252607
+          [1653378082.693520][3127:3132] CHIP:TOO:   MaxRFIDCodeLength: 20
       disabled: true
 
-    - label: "TH reads MinRFIDCodedLength attribute from DUT"
+    - label: "TH writes MaxRFIDCodeLength attribute as 46"
       verification: |
+          ./chip-tool doorlock write  max-rfidcode-length 1 1
+          [1653385943.981181][3752:3752] CHIP:TOO: Unknown attribute: max-rfidcode-length
+      disabled: true
 
+    - label: "TH reads MaxRFIDCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read  max-rfidcode-length 1 1
+
+          [1653378082.693436][3127:3132] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0019 DataVersion: 4018252607
+          [1653378082.693520][3127:3132] CHIP:TOO:   MaxRFIDCodeLength: 20
+      disabled: true
+
+    - label: "TH reads MinRFIDCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read max-rfidcode-length 1 1
+
+          [1653378146.085179][3137:3142] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0019 DataVersion: 4018252607
+          [1653378146.085262][3137:3142] CHIP:TOO:   MaxRFIDCodeLength: 20
+      disabled: true
+
+    - label: "TH writes MinRFIDCodeLength attribute as 17"
+      verification: |
+          ./chip-tool doorlock write  min-rfidcode-length 1 1
+          [1653385975.104136][3754:3754] CHIP:TOO: Unknown attribute: min-rfidcode-length
+      disabled: true
+
+    - label: "TH reads MinRFIDCodeLength attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read max-rfidcode-length 1 1
+
+          [1653378146.085179][3137:3142] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0019 DataVersion: 4018252607
+          [1653378146.085262][3137:3142] CHIP:TOO:   MaxRFIDCodeLength: 20
+      disabled: true
+
+    - label: "TH reads CredentialRulesSupport attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read credential-rules-support 1 1
+
+          [1653378223.909172][3148:3154] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_001B DataVersion: 4018252607
+          [1653378223.909238][3148:3154] CHIP:TOO:   CredentialRulesSupport: 1
+      disabled: true
+
+    - label: "TH writes CredentialRulesSupport attribute as bit 0 is set to 1"
+      verification: |
+          ./chip-tool doorlock write  credential-rules-support 1 1
+          [1653386016.121955][3760:3760] CHIP:TOO: Unknown attribute: credential-rules-support
       disabled: true
 
     - label: "TH reads CredentialRulesSupport attribute from DUT"
       verification: |
+          ./chip-tool doorlock read credential-rules-support 1 1
 
+          [1653378223.909172][3148:3154] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_001B DataVersion: 4018252607
+          [1653378223.909238][3148:3154] CHIP:TOO:   CredentialRulesSupport: 1
       disabled: true
 
-    - label: "TH reads EnableLogging attribute from DUT"
+    - label: "TH reads Language attribute from DUT"
       verification: |
+          ./chip-tool doorlock read language 1 1
+
+          [1653378282.133557][3157:3162] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0021 DataVersion: 4018252607
+          [1653378282.133617][3157:3162] CHIP:TOO:   Language: en
+      disabled: true
 
+    - label: "TH writes Language attribute as en"
+      verification: |
+          ./chip-tool doorlock write language fr 1 1
+
+          [1653378359.414345][3168:3173] CHIP:DMG:                        StatusIB =
+          [1653378359.414378][3168:3173] CHIP:DMG:                        {
+          [1653378359.414423][3168:3173] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653378359.414456][3168:3173] CHIP:DMG:                        },
+          [1653378359.414500][3168:3173] CHIP:DMG:
+          [1653378359.414529][3168:3173] CHIP:DMG:                },
+          [1653378359.414571][3168:3173] CHIP:DMG:
+          [1653378359.414598][3168:3173] CHIP:DMG:        ],
+          [1653378359.414629][3168:3173] CHIP:DMG:
+          [1653378359.414653][3168:3173] CHIP:DMG:        InteractionModelRevision = 1
+          [1653378359.414680][3168:3173] CHIP:DMG: }
       disabled: true
 
     - label: "TH reads Language attribute from DUT"
       verification: |
+          ./chip-tool doorlock read language 1 1
 
+          [1653378742.294717][3201:3206] CHIP:DMG: }
+          [1653378742.294914][3201:3206] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0021 DataVersion: 4018252609
+          [1653378742.294976][3201:3206] CHIP:TOO:   Language: fr
       disabled: true
 
     - label: "TH reads LEDSettings attribute from DUT"
       verification: |
+          ./chip-tool doorlock read ledsettings 1 1
 
+          [1653378830.341099][3210:3215] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+          [1653378830.341193][3210:3215] CHIP:EM: Sending Standalone Ack for MessageCounter:7931728 on exchange 57945i
       disabled: true
 
-    - label: "TH reads AutoRelockTime attribute from DUT"
+    - label: "TH writes LEDSettings attribute as 2"
       verification: |
+          ./chip-tool doorlock write ledsettings 2 1 1
+
+          [1653386095.961549][3764:3769] CHIP:DMG:                        StatusIB =
+          [1653386095.961592][3764:3769] CHIP:DMG:                        {
+          [1653386095.961638][3764:3769] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653386095.961681][3764:3769] CHIP:DMG:                        },
+          [1653386095.961727][3764:3769] CHIP:DMG:
+          [1653386095.961764][3764:3769] CHIP:DMG:                },
+          [1653386095.961807][3764:3769] CHIP:DMG:
+          [1653386095.961840][3764:3769] CHIP:DMG:        ],
+          [1653386095.961880][3764:3769] CHIP:DMG:
+          [1653386095.961912][3764:3769] CHIP:DMG:        InteractionModelRevision = 1
+          [1653386095.961943][3764:3769] CHIP:DMG: }
+          [1653386095.962023][3764:3769] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH reads LEDSettings attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read ledsettings 1 1
+
+          [1653378830.341099][3210:3215] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+          [1653378830.341193][3210:3215] CHIP:EM: Sending Standalone Ack for MessageCounter:7931728 on exchange 57945i
       disabled: true
 
-    - label: "TH reads SoundVolume attribute from DUT"
+    - label: "TH reads AutoRelockTime attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  auto-relock-time 1 1
 
+          [1653383232.087140][3422:3427] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0023 DataVersion: 4018252610
+          [1653383232.087199][3422:3427] CHIP:TOO:   AutoRelockTime: 120
       disabled: true
 
-    - label: "TH reads OperatingMode attribute from DUT"
+    - label: "TH writes AutoRelockTime attribute as 180 seconds"
       verification: |
+          ./chip-tool doorlock write auto-relock-time 180 1 1
+
+          [1653379055.149602][3237:3242] CHIP:DMG:                        StatusIB =
+          [1653379055.149649][3237:3242] CHIP:DMG:                        {
+          [1653379055.149695][3237:3242] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653379055.149742][3237:3242] CHIP:DMG:                        },
+          [1653379055.149793][3237:3242] CHIP:DMG:
+          [1653379055.149836][3237:3242] CHIP:DMG:                },
+          [1653379055.149883][3237:3242] CHIP:DMG:
+          [1653379055.149919][3237:3242] CHIP:DMG:        ],
+          [1653379055.149964][3237:3242] CHIP:DMG:
+          [1653379055.150000][3237:3242] CHIP:DMG:        InteractionModelRevision = 1
+          [1653379055.150035][3237:3242] CHIP:DMG: }
+          [1653379055.150135][3237:3242] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
 
+    - label: "TH reads AutoRelockTime attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read  auto-relock-time 1 1
+
+          [1653383232.087140][3422:3427] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0023 DataVersion: 4018252610
+          [1653383232.087199][3422:3427] CHIP:TOO:   AutoRelockTime: 180
       disabled: true
 
-    - label: "TH reads SupportedOperating Mode attribute from DUT"
+    - label: "TH reads SoundVolume attribute from DUT"
       verification: |
+          ./chip-tool doorlock read sound-volume 1 1
 
+          [1653383394.027969][3436:3441] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0024 DataVersion: 4018252610
+          [1653383394.028050][3436:3441] CHIP:TOO:   SoundVolume: 0
       disabled: true
 
-    - label: "TH reads DefualtConfigurationRegister attribute from DUT"
+    - label: "TH writes SoundVolume attribute as 3"
       verification: |
+          ./chip-tool doorlock write sound-volume 3 1 1
+
+          [1653383474.526474][3446:3451] CHIP:DMG:                        StatusIB =
+          [1653383474.526518][3446:3451] CHIP:DMG:                        {
+          [1653383474.526560][3446:3451] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653383474.526603][3446:3451] CHIP:DMG:                        },
+          [1653383474.526645][3446:3451] CHIP:DMG:
+          [1653383474.526683][3446:3451] CHIP:DMG:                },
+          [1653383474.526726][3446:3451] CHIP:DMG:
+          [1653383474.526758][3446:3451] CHIP:DMG:        ],
+          [1653383474.526798][3446:3451] CHIP:DMG:
+          [1653383474.526830][3446:3451] CHIP:DMG:        InteractionModelRevision = 1
+          [1653383474.526862][3446:3451] CHIP:DMG: }
+          [1653383474.526956][3446:3451] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
 
+    - label: "TH reads SoundVolume attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read sound-volume 1 1
+
+          [1653383520.565486][3454:3459] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0024 DataVersion: 4018252611
+          [1653383520.565576][3454:3459] CHIP:TOO:   SoundVolume: 3
       disabled: true
 
-    - label: "TH reads EnableLocalProgramming attribute from DUT"
+    - label: "TH reads OperatingMode attribute from DUT"
       verification: |
+          ./chip-tool doorlock read operating-mode 1 1
 
+          [1653383566.993923][3464:3469] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0025 DataVersion: 4018252611
+          [1653383566.993997][3464:3469] CHIP:TOO:   OperatingMode: 0
       disabled: true
 
-    - label: "TH reads EnableOneTouchLocking attribute from DUT"
+    - label: "TH writes OperatingMode attribute as 3"
       verification: |
+          ./chip-tool doorlock write operating-mode 3 1 1
+
+          [1653383624.719526][3473:3478] CHIP:DMG:                        StatusIB =
+          [1653383624.719561][3473:3478] CHIP:DMG:                        {
+          [1653383624.719597][3473:3478] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653383624.719629][3473:3478] CHIP:DMG:                        },
+          [1653383624.719665][3473:3478] CHIP:DMG:
+          [1653383624.719693][3473:3478] CHIP:DMG:                },
+          [1653383624.719726][3473:3478] CHIP:DMG:
+          [1653383624.719750][3473:3478] CHIP:DMG:        ],
+          [1653383624.719780][3473:3478] CHIP:DMG:
+          [1653383624.719804][3473:3478] CHIP:DMG:        InteractionModelRevision = 1
+          [1653383624.719830][3473:3478] CHIP:DMG: }
+          [1653383624.719907][3473:3478] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
 
+    - label: "TH reads OperatingMode attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read operating-mode 1 1
+
+          [1653383659.560687][3480:3485] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0025 DataVersion: 4018252612
+          [1653383659.560749][3480:3485] CHIP:TOO:   OperatingMode: 3
       disabled: true
 
-    - label: "TH reads EnableInsideStatusLED attribute from DUT"
+    - label: "TH reads SupportedOperatingModes attribute from DUT"
       verification: |
+          ./chip-tool doorlock read supported-operating-modes 1 1
+
+          [1653383704.998404][3488:3493] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0026 DataVersion: 4018252612
+          [1653383704.998523][3488:3493] CHIP:TOO:   SupportedOperatingModes: 65526
+      disabled: true
 
+    - label: "TH writes SupportedOperatingModes attribute as bit 0 is set to 0"
+      verification: |
+          ./chip-tool doorlock write supported-operating-modes  1 1
+          [1653386184.298481][3773:3773] CHIP:TOO: Unknown attribute: supported-operating-modes
       disabled: true
 
-    - label: "TH reads EnablePrivacyMode attribute from DUT"
+    - label: "TH reads SupportedOperatingModes attribute from DUT"
       verification: |
+          ./chip-tool doorlock read supported-operating-modes 1 1
 
+          [1653383704.998404][3488:3493] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0026 DataVersion: 4018252612
+          [1653383704.998523][3488:3493] CHIP:TOO:   SupportedOperatingModes: 65526
       disabled: true
 
-    - label: "TH reads LocalProgrammingFeatures attribute from DUT"
+    - label: "TH reads DefualtConfigurationRegister attribute from DUT"
       verification: |
+          ./chip-tool doorlock read default-configuration-register 1 1
+
+          [1653383781.079096][3500:3505] CHIP:DMG:                                StatusIB =
+          [1653383781.079167][3500:3505] CHIP:DMG:                                {
+          [1653383781.079239][3500:3505] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653383781.079300][3500:3505] CHIP:DMG:                                },
+          [1653383781.079376][3500:3505] CHIP:DMG:
+          [1653383781.079437][3500:3505] CHIP:DMG:                        },
+          [1653383781.079496][3500:3505] CHIP:DMG:
+          [1653383781.079557][3500:3505] CHIP:DMG:                },
+          [1653383781.079626][3500:3505] CHIP:DMG:
+          [1653383781.079668][3500:3505] CHIP:DMG:        ],
+          [1653383781.079732][3500:3505] CHIP:DMG:
+          [1653383781.079775][3500:3505] CHIP:DMG:        SuppressResponse = true,
+          [1653383781.079830][3500:3505] CHIP:DMG:        InteractionModelRevision = 1
+          [1653383781.079871][3500:3505] CHIP:DMG: }
+          [1653383781.080039][3500:3505] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label:
+          "TH writes DefaultConfigurationRegister attribute as bit 0 is set to 1"
+      verification: |
+          ./chip-tool doorlock write default-configuration-register  1 1
+          [1653386246.611681][3780:3780] CHIP:TOO: Unknown attribute: default-configuration-register
       disabled: true
 
-    - label: "TH reads WrongCodeEntryLimit attribute from DUT"
+    - label: "TH reads DefaultConfigurationRegister attribute from DUT"
       verification: |
+          ./chip-tool doorlock read default-configuration-register 1 1
+
+          [1653383781.079096][3500:3505] CHIP:DMG:                                StatusIB =
+          [1653383781.079167][3500:3505] CHIP:DMG:                                {
+          [1653383781.079239][3500:3505] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653383781.079300][3500:3505] CHIP:DMG:                                },
+          [1653383781.079376][3500:3505] CHIP:DMG:
+          [1653383781.079437][3500:3505] CHIP:DMG:                        },
+          [1653383781.079496][3500:3505] CHIP:DMG:
+          [1653383781.079557][3500:3505] CHIP:DMG:                },
+          [1653383781.079626][3500:3505] CHIP:DMG:
+          [1653383781.079668][3500:3505] CHIP:DMG:        ],
+          [1653383781.079732][3500:3505] CHIP:DMG:
+          [1653383781.079775][3500:3505] CHIP:DMG:        SuppressResponse = true,
+          [1653383781.079830][3500:3505] CHIP:DMG:        InteractionModelRevision = 1
+          [1653383781.079871][3500:3505] CHIP:DMG: }
+          [1653383781.080039][3500:3505] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH reads EnableLocalProgramming attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read enable-local-programming 1 1
+
+          [1653383840.783784][3512:3517] CHIP:DMG:                                StatusIB =
+          [1653383840.783838][3512:3517] CHIP:DMG:                                {
+          [1653383840.783892][3512:3517] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653383840.783946][3512:3517] CHIP:DMG:                                },
+          [1653383840.783996][3512:3517] CHIP:DMG:
+          [1653383840.784041][3512:3517] CHIP:DMG:                        },
+          [1653383840.784139][3512:3517] CHIP:DMG:
+          [1653383840.784182][3512:3517] CHIP:DMG:                },
+          [1653383840.784227][3512:3517] CHIP:DMG:
+          [1653383840.784263][3512:3517] CHIP:DMG:        ],
+          [1653383840.784307][3512:3517] CHIP:DMG:
+          [1653383840.784344][3512:3517] CHIP:DMG:        SuppressResponse = true,
+          [1653383840.784382][3512:3517] CHIP:DMG:        InteractionModelRevision = 1
+          [1653383840.784417][3512:3517] CHIP:DMG: }
+          [1653383840.784571][3512:3517] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
-    - label: "TH writes 0 to WrongCodeEntryLimit"
+    - label: "TH writes EnableLocalProgramming attribute as false"
       verification: |
+          ./chip-tool doorlock write enable-local-programming 0 1 1
+
+          [1653386311.509961][3789:3794] CHIP:DMG:                        StatusIB =
+          [1653386311.510012][3789:3794] CHIP:DMG:                        {
+          [1653386311.510058][3789:3794] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653386311.510104][3789:3794] CHIP:DMG:                        },
+          [1653386311.510149][3789:3794] CHIP:DMG:
+          [1653386311.510190][3789:3794] CHIP:DMG:                },
+          [1653386311.510237][3789:3794] CHIP:DMG:
+          [1653386311.510272][3789:3794] CHIP:DMG:        ],
+          [1653386311.510316][3789:3794] CHIP:DMG:
+          [1653386311.510351][3789:3794] CHIP:DMG:        InteractionModelRevision = 1
+          [1653386311.510385][3789:3794] CHIP:DMG: }
+          [1653386311.510472][3789:3794] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH reads EnableLocalProgramming attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read enable-local-programming 1 1
+
+          [1653383840.783784][3512:3517] CHIP:DMG:                                StatusIB =
+          [1653383840.783838][3512:3517] CHIP:DMG:                                {
+          [1653383840.783892][3512:3517] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653383840.783946][3512:3517] CHIP:DMG:                                },
+          [1653383840.783996][3512:3517] CHIP:DMG:
+          [1653383840.784041][3512:3517] CHIP:DMG:                        },
+          [1653383840.784139][3512:3517] CHIP:DMG:
+          [1653383840.784182][3512:3517] CHIP:DMG:                },
+          [1653383840.784227][3512:3517] CHIP:DMG:
+          [1653383840.784263][3512:3517] CHIP:DMG:        ],
+          [1653383840.784307][3512:3517] CHIP:DMG:
+          [1653383840.784344][3512:3517] CHIP:DMG:        SuppressResponse = true,
+          [1653383840.784382][3512:3517] CHIP:DMG:        InteractionModelRevision = 1
+          [1653383840.784417][3512:3517] CHIP:DMG: }
+          [1653383840.784571][3512:3517] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
-    - label: "TH readsUserCodedTemporaryDisableTime attribute from DUT"
+    - label: "TH reads EnableOneTouchLocking attribute from DUT"
       verification: |
+          ./chip-tool doorlock read enable-one-touch-locking 1 1
 
+          [1653383925.371145][3523:3528] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0029 DataVersion: 4018252612
+          [1653383925.371209][3523:3528] CHIP:TOO:   EnableOneTouchLocking: FALSE
       disabled: true
 
-    - label: "TH writes 0 to UserCodedTemporaryDisableTime"
+    - label: "TH writes EnableOneTouchLocking attribute as true"
       verification: |
+          ./chip-tool doorlock write enable-one-touch-locking 1 1 1
+
+          [1653384034.118850][3539:3544] CHIP:DMG:                        StatusIB =
+          [1653384034.118901][3539:3544] CHIP:DMG:                        {
+          [1653384034.118948][3539:3544] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653384034.119000][3539:3544] CHIP:DMG:                        },
+          [1653384034.119046][3539:3544] CHIP:DMG:
+          [1653384034.119086][3539:3544] CHIP:DMG:                },
+          [1653384034.119132][3539:3544] CHIP:DMG:
+          [1653384034.119168][3539:3544] CHIP:DMG:        ],
+          [1653384034.119211][3539:3544] CHIP:DMG:
+          [1653384034.119247][3539:3544] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384034.119281][3539:3544] CHIP:DMG: }
+          [1653384034.119380][3539:3544] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
 
+    - label: "TH reads EnableOneTouchLocking attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read enable-one-touch-locking 1 1
+
+          [1653384078.751021][3545:3550] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0029 DataVersion: 4018252613
+          [1653384078.751098][3545:3550] CHIP:TOO:   EnableOneTouchLocking: TRUE
       disabled: true
 
-    - label: "TH reads SendPINOverTheAir attribute from DUT"
+    - label: "TH reads EnableInsideStatusLED attribute from DUT"
       verification: |
+          ./chip-tool doorlock read enable-inside-status-led 1 1
+
+          [1653384124.652526][3554:3559] CHIP:DMG:                                StatusIB =
+          [1653384124.652564][3554:3559] CHIP:DMG:                                {
+          [1653384124.652599][3554:3559] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384124.652629][3554:3559] CHIP:DMG:                                },
+          [1653384124.652668][3554:3559] CHIP:DMG:
+          [1653384124.652702][3554:3559] CHIP:DMG:                        },
+          [1653384124.652744][3554:3559] CHIP:DMG:
+          [1653384124.652775][3554:3559] CHIP:DMG:                },
+          [1653384124.652812][3554:3559] CHIP:DMG:
+          [1653384124.652839][3554:3559] CHIP:DMG:        ],
+          [1653384124.652874][3554:3559] CHIP:DMG:
+          [1653384124.652899][3554:3559] CHIP:DMG:        SuppressResponse = true,
+          [1653384124.652930][3554:3559] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384124.652957][3554:3559] CHIP:DMG: }
+          [1653384124.653079][3554:3559] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH writes EnableInsideStatusLED attribute as true"
+      verification: |
+          ./chip-tool doorlock write enable-inside-status-led 1 1 1
+
+
+          [1653386385.348368][3801:3806] CHIP:DMG:                        StatusIB =
+          [1653386385.348419][3801:3806] CHIP:DMG:                        {
+          [1653386385.348465][3801:3806] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653386385.348512][3801:3806] CHIP:DMG:                        },
+          [1653386385.348559][3801:3806] CHIP:DMG:
+          [1653386385.348599][3801:3806] CHIP:DMG:                },
+          [1653386385.348645][3801:3806] CHIP:DMG:
+          [1653386385.348681][3801:3806] CHIP:DMG:        ],
+          [1653386385.348724][3801:3806] CHIP:DMG:
+          [1653386385.348759][3801:3806] CHIP:DMG:        InteractionModelRevision = 1
+          [1653386385.348793][3801:3806] CHIP:DMG: }
+          [1653386385.348881][3801:3806] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
-    - label: "TH reads RequirePINforRemoteOperation attribute from DUT"
+    - label: "TH reads EnableInsideStatusLED attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read enable-inside-status-led 1 1
+
+          [1653384124.652526][3554:3559] CHIP:DMG:                                StatusIB =
+          [1653384124.652564][3554:3559] CHIP:DMG:                                {
+          [1653384124.652599][3554:3559] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384124.652629][3554:3559] CHIP:DMG:                                },
+          [1653384124.652668][3554:3559] CHIP:DMG:
+          [1653384124.652702][3554:3559] CHIP:DMG:                        },
+          [1653384124.652744][3554:3559] CHIP:DMG:
+          [1653384124.652775][3554:3559] CHIP:DMG:                },
+          [1653384124.652812][3554:3559] CHIP:DMG:
+          [1653384124.652839][3554:3559] CHIP:DMG:        ],
+          [1653384124.652874][3554:3559] CHIP:DMG:
+          [1653384124.652899][3554:3559] CHIP:DMG:        SuppressResponse = true,
+          [1653384124.652930][3554:3559] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384124.652957][3554:3559] CHIP:DMG: }
+          [1653384124.653079][3554:3559] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads EnablePrivacyModeButton attribute from DUT"
       verification: |
+          ./chip-tool doorlock read enable-privacy-mode-button 1 1
 
+          [1653384191.590530][3563:3568] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_002B DataVersion: 4018252613
+          [1653384191.590583][3563:3568] CHIP:TOO:   EnablePrivacyModeButton: FALSE
       disabled: true
 
-    - label: "TH reads SecurityLevel from DUT"
+    - label: "TH writes EnablePrivacyModeButton attribute as true"
       verification: |
+          ./chip-tool doorlock write enable-privacy-mode-button 1 1 1
+
+
+          [1653384253.489923][3574:3579] CHIP:DMG:                        StatusIB =
+          [1653384253.489965][3574:3579] CHIP:DMG:                        {
+          [1653384253.490008][3574:3579] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653384253.490050][3574:3579] CHIP:DMG:                        },
+          [1653384253.490089][3574:3579] CHIP:DMG:
+          [1653384253.490123][3574:3579] CHIP:DMG:                },
+          [1653384253.490163][3574:3579] CHIP:DMG:
+          [1653384253.490192][3574:3579] CHIP:DMG:        ],
+          [1653384253.490228][3574:3579] CHIP:DMG:
+          [1653384253.490258][3574:3579] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384253.490287][3574:3579] CHIP:DMG: }
+          [1653384253.490372][3574:3579] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
+
+    - label: "TH reads EnablePrivacyModeButton attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read enable-privacy-mode-button 1 1
 
+          [1653384297.319696][3583:3588] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_002B DataVersion: 4018252614
+          [1653384297.319752][3583:3588] CHIP:TOO:   EnablePrivacyModeButton: TRUE
       disabled: true
 
-    - label: "TH reads ExpiringUserTimeOut attribute from DUT"
+    - label: "TH reads LocalProgrammingFeatures attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  local-programming-features 1 1
+
+          [1653384349.240275][3593:3598] CHIP:DMG:                                StatusIB =
+          [1653384349.240322][3593:3598] CHIP:DMG:                                {
+          [1653384349.240360][3593:3598] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384349.240400][3593:3598] CHIP:DMG:                                },
+          [1653384349.240438][3593:3598] CHIP:DMG:
+          [1653384349.240475][3593:3598] CHIP:DMG:                        },
+          [1653384349.240515][3593:3598] CHIP:DMG:
+          [1653384349.240547][3593:3598] CHIP:DMG:                },
+          [1653384349.240584][3593:3598] CHIP:DMG:
+          [1653384349.240611][3593:3598] CHIP:DMG:        ],
+          [1653384349.240647][3593:3598] CHIP:DMG:
+          [1653384349.240675][3593:3598] CHIP:DMG:        SuppressResponse = true,
+          [1653384349.240705][3593:3598] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384349.240731][3593:3598] CHIP:DMG: }
+          [1653384349.240852][3593:3598] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH writes LocalProgrammingFeatures attribute as true"
+      verification: |
+          ./chip-tool doorlock write local-programming-features 1 1 1
+
+          [1653386492.777835][3811:3816] CHIP:DMG:                        StatusIB =
+          [1653386492.777886][3811:3816] CHIP:DMG:                        {
+          [1653386492.777933][3811:3816] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653386492.777981][3811:3816] CHIP:DMG:                        },
+          [1653386492.778032][3811:3816] CHIP:DMG:
+          [1653386492.778072][3811:3816] CHIP:DMG:                },
+          [1653386492.778120][3811:3816] CHIP:DMG:
+          [1653386492.778156][3811:3816] CHIP:DMG:        ],
+          [1653386492.778199][3811:3816] CHIP:DMG:
+          [1653386492.778235][3811:3816] CHIP:DMG:        InteractionModelRevision = 1
+          [1653386492.778269][3811:3816] CHIP:DMG: }
+          [1653386492.778358][3811:3816] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
-    - label: "TH reads AlarmMask attribute from DUT"
+    - label: "TH reads LocalProgrammingFeatures attribute from DUT"
       verification: |
+          ./chip-tool doorlock read  local-programming-features 1 1
+
+          [1653384349.240275][3593:3598] CHIP:DMG:                                StatusIB =
+          [1653384349.240322][3593:3598] CHIP:DMG:                                {
+          [1653384349.240360][3593:3598] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384349.240400][3593:3598] CHIP:DMG:                                },
+          [1653384349.240438][3593:3598] CHIP:DMG:
+          [1653384349.240475][3593:3598] CHIP:DMG:                        },
+          [1653384349.240515][3593:3598] CHIP:DMG:
+          [1653384349.240547][3593:3598] CHIP:DMG:                },
+          [1653384349.240584][3593:3598] CHIP:DMG:
+          [1653384349.240611][3593:3598] CHIP:DMG:        ],
+          [1653384349.240647][3593:3598] CHIP:DMG:
+          [1653384349.240675][3593:3598] CHIP:DMG:        SuppressResponse = true,
+          [1653384349.240705][3593:3598] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384349.240731][3593:3598] CHIP:DMG: }
+          [1653384349.240852][3593:3598] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads WrongCodeEntryLimit attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read   wrong-code-entry-limit 1 1
+
+          [1653384423.016163][3602:3607] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0030 DataVersion: 4018252614
+          [1653384423.016255][3602:3607] CHIP:TOO:   WrongCodeEntryLimit: 3
+      disabled: true
 
+    - label: "TH writes WrongCodeEntryLimit attribute as 8"
+      verification: |
+          ./chip-tool doorlock write wrong-code-entry-limit 8 1 1
+
+          [1653384480.608388][3612:3617] CHIP:DMG:                        StatusIB =
+          [1653384480.608434][3612:3617] CHIP:DMG:                        {
+          [1653384480.608477][3612:3617] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653384480.608520][3612:3617] CHIP:DMG:                        },
+          [1653384480.608562][3612:3617] CHIP:DMG:
+          [1653384480.608599][3612:3617] CHIP:DMG:                },
+          [1653384480.608642][3612:3617] CHIP:DMG:
+          [1653384480.608674][3612:3617] CHIP:DMG:        ],
+          [1653384480.608714][3612:3617] CHIP:DMG:
+          [1653384480.608746][3612:3617] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384480.608777][3612:3617] CHIP:DMG: }
+          [1653384480.608869][3612:3617] CHIP:DMG: WriteClient moving to [AwaitingDe]
       disabled: true
 
-    - label: "TH reads KeypadOperationEventMask attribute from DUT"
+    - label: "TH reads WrongCodeEntryLimit attribute"
       verification: |
+          ./chip-tool doorlock read   wrong-code-entry-limit 1 1
 
+          [1653384525.012985][3620:3625] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0030 DataVersion: 4018252615
+          [1653384525.013075][3620:3625] CHIP:TOO:   WrongCodeEntryLimit: 8
       disabled: true
 
-    - label: "TH reads RemoteOperationEventMask attribute from DUT"
+    - label: "TH reads UserCodeTemporaryDisableTime attribute from DUT"
       verification: |
+          ./chip-tool doorlock read user-code-temporary-disable-time 1 1
+
+          [1653384571.138260][3629:3634] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0031 DataVersion: 4018252615
+          [1653384571.138355][3629:3634] CHIP:TOO:   UserCodeTemporaryDisableTime: 10
+      disabled: true
 
+    - label: "TH writes UserCodeTemporaryDisableTime attribute as 34"
+      verification: |
+          ./chip-tool doorlock write user-code-temporary-disable-time 34 1 1
+
+
+          [1653384618.028164][3636:3641] CHIP:DMG:                        StatusIB =
+          [1653384618.028207][3636:3641] CHIP:DMG:                        {
+          [1653384618.028250][3636:3641] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653384618.028298][3636:3641] CHIP:DMG:                        },
+          [1653384618.028344][3636:3641] CHIP:DMG:
+          [1653384618.028381][3636:3641] CHIP:DMG:                },
+          [1653384618.028424][3636:3641] CHIP:DMG:
+          [1653384618.028456][3636:3641] CHIP:DMG:        ],
+          [1653384618.028496][3636:3641] CHIP:DMG:
+          [1653384618.028528][3636:3641] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384618.028560][3636:3641] CHIP:DMG: }
       disabled: true
 
-    - label: "TH reads ManualOperationEventMask attribute from DUT"
+    - label: "TH reads UserCodeTemporaryDisableTime attribute"
       verification: |
+          ./chip-tool doorlock read user-code-temporary-disable-time 1 1
 
+          [1653384662.484042][3645:3650] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0031 DataVersion: 4018252616
+          [1653384662.484152][3645:3650] CHIP:TOO:   UserCodeTemporaryDisableTime: 34
       disabled: true
 
-    - label: "TH reads RFIDOperationEventMask attribute from DUT"
+    - label: "TH reads SendPINOverTheAir attribute from DUT"
       verification: |
+          ./chip-tool doorlock read send-pinover-the-air 1 1
+
+          [1653384719.659620][3654:3659] CHIP:DMG:                                StatusIB =
+          [1653384719.659669][3654:3659] CHIP:DMG:                                {
+          [1653384719.659717][3654:3659] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384719.659762][3654:3659] CHIP:DMG:                                },
+          [1653384719.659810][3654:3659] CHIP:DMG:
+          [1653384719.659851][3654:3659] CHIP:DMG:                        },
+          [1653384719.659893][3654:3659] CHIP:DMG:
+          [1653384719.659930][3654:3659] CHIP:DMG:                },
+          [1653384719.659973][3654:3659] CHIP:DMG:
+          [1653384719.660004][3654:3659] CHIP:DMG:        ],
+          [1653384719.660045][3654:3659] CHIP:DMG:
+          [1653384719.660078][3654:3659] CHIP:DMG:        SuppressResponse = true,
+          [1653384719.660140][3654:3659] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384719.660172][3654:3659] CHIP:DMG: }
+          [1653384719.660313][3654:3659] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH writes SendPINOverTheAir attribute as true"
+      verification: |
+          ./chip-tool doorlock write  send-pinover-the-air 1 1 1
+
+
+          [1653386559.030446][3821:3826] CHIP:DMG:                        StatusIB =
+          [1653386559.030508][3821:3826] CHIP:DMG:                        {
+          [1653386559.030571][3821:3826] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653386559.030630][3821:3826] CHIP:DMG:                        },
+          [1653386559.030689][3821:3826] CHIP:DMG:
+          [1653386559.030740][3821:3826] CHIP:DMG:                },
+          [1653386559.030799][3821:3826] CHIP:DMG:
+          [1653386559.030843][3821:3826] CHIP:DMG:        ],
+          [1653386559.030898][3821:3826] CHIP:DMG:
+          [1653386559.030942][3821:3826] CHIP:DMG:        InteractionModelRevision = 1
+          [1653386559.030985][3821:3826] CHIP:DMG: }
+          [1653386559.031093][3821:3826] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
-    - label: "TH reads KeypadProgrammingEventMask attribute from DUT"
+    - label: "TH reads SendPINOverTheAir attribute"
       verification: |
+          ./chip-tool doorlock read send-pinover-the-air 1 1
+
+          [1653384719.659620][3654:3659] CHIP:DMG:                                StatusIB =
+          [1653384719.659669][3654:3659] CHIP:DMG:                                {
+          [1653384719.659717][3654:3659] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384719.659762][3654:3659] CHIP:DMG:                                },
+          [1653384719.659810][3654:3659] CHIP:DMG:
+          [1653384719.659851][3654:3659] CHIP:DMG:                        },
+          [1653384719.659893][3654:3659] CHIP:DMG:
+          [1653384719.659930][3654:3659] CHIP:DMG:                },
+          [1653384719.659973][3654:3659] CHIP:DMG:
+          [1653384719.660004][3654:3659] CHIP:DMG:        ],
+          [1653384719.660045][3654:3659] CHIP:DMG:
+          [1653384719.660078][3654:3659] CHIP:DMG:        SuppressResponse = true,
+          [1653384719.660140][3654:3659] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384719.660172][3654:3659] CHIP:DMG: }
+          [1653384719.660313][3654:3659] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads RequirePINforRemoteOperation attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read require-pinfor-remote-operation 1 1
 
+          [1653384781.487040][3664:3669] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0033 DataVersion: 4018252616
+          [1653384781.487104][3664:3669] CHIP:TOO:   RequirePINforRemoteOperation: FALSE
+      disabled: true
+
+    - label: "TH writes RequirePINforRemoteOperation attribute as true"
+      verification: |
+          ./chip-tool doorlock write require-pinfor-remote-operation 1 1 1
+
+          [1653384859.410988][3672:3677] CHIP:DMG:                        StatusIB =
+          [1653384859.411046][3672:3677] CHIP:DMG:                        {
+          [1653384859.411090][3672:3677] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1653384859.411146][3672:3677] CHIP:DMG:                        },
+          [1653384859.411189][3672:3677] CHIP:DMG:
+          [1653384859.411225][3672:3677] CHIP:DMG:                },
+          [1653384859.411268][3672:3677] CHIP:DMG:
+          [1653384859.411301][3672:3677] CHIP:DMG:        ],
+          [1653384859.411341][3672:3677] CHIP:DMG:
+          [1653384859.411374][3672:3677] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384859.411405][3672:3677] CHIP:DMG: }
+          [1653384859.411498][3672:3677] CHIP:DMG: WriteClient moving to [AwaitingDe]
       disabled: true
 
-    - label: "TH reads RemoteProgrammingEventMask attribute from DUT"
+    - label: "TH reads RequirePINforRemoteOperation attribute"
       verification: |
+          ./chip-tool doorlock read require-pinfor-remote-operation 1 1
 
+          [1653384910.952801][3680:3685] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0033 DataVersion: 4018252617
+          [1653384910.952861][3680:3685] CHIP:TOO:   RequirePINforRemoteOperation: TRUE
       disabled: true
 
-    - label: "TH reads RFIDProgrammingEventMask attribute from DUT"
+    - label: "TH reads ExpiringUserTimeOut attribute from DUT"
+      verification: |
+          ./chip-tool doorlock read expiring-user-timeout 1 1
+
+          [1653384957.031067][3692:3697] CHIP:DMG:                                StatusIB =
+          [1653384957.031120][3692:3697] CHIP:DMG:                                {
+          [1653384957.031175][3692:3697] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384957.031229][3692:3697] CHIP:DMG:                                },
+          [1653384957.031282][3692:3697] CHIP:DMG:
+          [1653384957.031326][3692:3697] CHIP:DMG:                        },
+          [1653384957.031375][3692:3697] CHIP:DMG:
+          [1653384957.031417][3692:3697] CHIP:DMG:                },
+          [1653384957.031461][3692:3697] CHIP:DMG:
+          [1653384957.031496][3692:3697] CHIP:DMG:        ],
+          [1653384957.031541][3692:3697] CHIP:DMG:
+          [1653384957.031578][3692:3697] CHIP:DMG:        SuppressResponse = true,
+          [1653384957.031615][3692:3697] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384957.031650][3692:3697] CHIP:DMG: }
+          [1653384957.031802][3692:3697] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH writes ExpiringUserTimeout attribute as 10 minutes"
       verification: |
+          ./chip-tool doorlock write expiring-user-timeout 1 1 1
+
+          [1653386652.024354][3831:3836] CHIP:DMG:                        StatusIB =
+          [1653386652.024390][3831:3836] CHIP:DMG:                        {
+          [1653386652.024424][3831:3836] CHIP:DMG:                                status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653386652.024460][3831:3836] CHIP:DMG:                        },
+          [1653386652.024495][3831:3836] CHIP:DMG:
+          [1653386652.024525][3831:3836] CHIP:DMG:                },
+          [1653386652.024561][3831:3836] CHIP:DMG:
+          [1653386652.024588][3831:3836] CHIP:DMG:        ],
+          [1653386652.024622][3831:3836] CHIP:DMG:
+          [1653386652.024649][3831:3836] CHIP:DMG:        InteractionModelRevision = 1
+          [1653386652.024675][3831:3836] CHIP:DMG: }
+          [1653386652.024748][3831:3836] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
 
+    - label: "TH reads ExpiringUserTimeout attribute"
+      verification: |
+          ./chip-tool doorlock read expiring-user-timeout 1 1
+
+          [1653384957.031067][3692:3697] CHIP:DMG:                                StatusIB =
+          [1653384957.031120][3692:3697] CHIP:DMG:                                {
+          [1653384957.031175][3692:3697] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1653384957.031229][3692:3697] CHIP:DMG:                                },
+          [1653384957.031282][3692:3697] CHIP:DMG:
+          [1653384957.031326][3692:3697] CHIP:DMG:                        },
+          [1653384957.031375][3692:3697] CHIP:DMG:
+          [1653384957.031417][3692:3697] CHIP:DMG:                },
+          [1653384957.031461][3692:3697] CHIP:DMG:
+          [1653384957.031496][3692:3697] CHIP:DMG:        ],
+          [1653384957.031541][3692:3697] CHIP:DMG:
+          [1653384957.031578][3692:3697] CHIP:DMG:        SuppressResponse = true,
+          [1653384957.031615][3692:3697] CHIP:DMG:        InteractionModelRevision = 1
+          [1653384957.031650][3692:3697] CHIP:DMG: }
+          [1653384957.031802][3692:3697] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_10.yaml
index 94e24e79547ec8..3be10079689d3d 100644
--- a/src/app/tests/suites/certification/Test_TC_DL_2_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_10.yaml
@@ -13,9 +13,7 @@
 # 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:
-    100.2.10. [TC-DL-2.10] Verification for the following Commands - Set User
-    Type, Get User Type ,Get User Type Response [DUT-Server]
+name: 112.2.10. [TC-DL-2.10] Verification for the Door Lock Events [DUT-Server]
 
 config:
     nodeId: 0x12344321
@@ -23,50 +21,359 @@ config:
     endpoint: 0
 
 tests:
-    - label:
-          "TH sends Set User Type Command to DUT with the following values: User
-          ID as 6 User Type as 0"
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 0"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 1"
+      verification: |
+          "sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }"
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 3"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 4"
+      verification: |
+          "sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }"
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 5"
+      verification: |
+          "sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }"
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 6"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 7"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 8"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-lock-alarm 1 1
+
+          [1651216572.325926][3144:3149] CHIP:DMG: ReportDataMessage =
+          [1651216572.325964][3144:3149] CHIP:DMG: {
+          [1651216572.325998][3144:3149] CHIP:DMG:        SuppressResponse = true,
+          [1651216572.326035][3144:3149] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216572.326070][3144:3149] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorStateChange event by setting the DoorState to 0"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-state-change 1 1
+
+          [1651216905.027689][3169:3174] CHIP:DMG: ReportDataMessage =
+          [1651216905.027744][3169:3174] CHIP:DMG: {
+          [1651216905.027781][3169:3174] CHIP:DMG:        SuppressResponse = true,
+          [1651216905.027820][3169:3174] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216905.027868][3169:3174] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorStateChange event by setting the DoorState to 1"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-state-change 1 1
+
+          [1651216905.027689][3169:3174] CHIP:DMG: ReportDataMessage =
+          [1651216905.027744][3169:3174] CHIP:DMG: {
+          [1651216905.027781][3169:3174] CHIP:DMG:        SuppressResponse = true,
+          [1651216905.027820][3169:3174] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216905.027868][3169:3174] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorStateChange event by setting the DoorState to 2"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-state-change 1 1
+
+          [1651216905.027689][3169:3174] CHIP:DMG: ReportDataMessage =
+          [1651216905.027744][3169:3174] CHIP:DMG: {
+          [1651216905.027781][3169:3174] CHIP:DMG:        SuppressResponse = true,
+          [1651216905.027820][3169:3174] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216905.027868][3169:3174] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorStateChange event by setting the DoorState to 3"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-state-change 1 1
+
+          [1651216905.027689][3169:3174] CHIP:DMG: ReportDataMessage =
+          [1651216905.027744][3169:3174] CHIP:DMG: {
+          [1651216905.027781][3169:3174] CHIP:DMG:        SuppressResponse = true,
+          [1651216905.027820][3169:3174] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216905.027868][3169:3174] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorStateChange event by setting the DoorState to 4"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-state-change 1 1
+
+          [1651216905.027689][3169:3174] CHIP:DMG: ReportDataMessage =
+          [1651216905.027744][3169:3174] CHIP:DMG: {
+          [1651216905.027781][3169:3174] CHIP:DMG:        SuppressResponse = true,
+          [1651216905.027820][3169:3174] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216905.027868][3169:3174] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a DoorStateChange event by setting the DoorState to 5"
+      verification: |
+          sudo  ./chip-tool doorlock read-event door-state-change 1 1
+
+          [1651216905.027689][3169:3174] CHIP:DMG: ReportDataMessage =
+          [1651216905.027744][3169:3174] CHIP:DMG: {
+          [1651216905.027781][3169:3174] CHIP:DMG:        SuppressResponse = true,
+          [1651216905.027820][3169:3174] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216905.027868][3169:3174] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 0"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 1"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 2"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 3"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 4"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 5"
       verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 6"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
       disabled: true
 
-    - label: "TH sends Get User Type Command to DUT"
+    - label: "Initiate a LockOperation event by setting OperationSource to 7"
       verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
 
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 8"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockOperation event by setting OperationSource to 9"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-operation 1 1
+
+          [1651217002.308668][3182:3187] CHIP:DMG: ReportDataMessage =
+          [1651217002.308697][3182:3187] CHIP:DMG: {
+          [1651217002.308731][3182:3187] CHIP:DMG:        SuppressResponse = true,
+          [1651217002.308758][3182:3187] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217002.308782][3182:3187] CHIP:DMG: }
       disabled: true
 
     - label:
-          "TH sends Set User Type Command to DUT with the following values: User
-          ID as 6 User Type as 0"
+          "Initiate a LockOperationError Event by setting OperationError as 0"
       verification: |
+          ./chip-tool doorlock read-event lock-operation-error 1 1
 
+          [1651217184.203091][3201:3206] CHIP:DMG: ReportDataMessage =
+          [1651217184.203127][3201:3206] CHIP:DMG: {
+          [1651217184.203159][3201:3206] CHIP:DMG:        SuppressResponse = true,
+          [1651217184.203193][3201:3206] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217184.203225][3201:3206] CHIP:DMG: }
       disabled: true
 
-    - label: "TH sends Get User Type Command to DUT"
+    - label:
+          "Initiate a LockOperationError Event by setting OperationError as 1"
       verification: |
+          ./chip-tool doorlock read-event lock-operation-error 1 1
 
+          [1651217184.203091][3201:3206] CHIP:DMG: ReportDataMessage =
+          [1651217184.203127][3201:3206] CHIP:DMG: {
+          [1651217184.203159][3201:3206] CHIP:DMG:        SuppressResponse = true,
+          [1651217184.203193][3201:3206] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217184.203225][3201:3206] CHIP:DMG: }
       disabled: true
 
     - label:
-          "TH sends Set User Type Command to DUT with the following values: User
-          ID as 6 User Type as 8"
+          "Initiate a LockOperationError Event by setting OperationError as 2"
       verification: |
+          ./chip-tool doorlock read-event lock-operation-error 1 1
 
+          [1651217184.203091][3201:3206] CHIP:DMG: ReportDataMessage =
+          [1651217184.203127][3201:3206] CHIP:DMG: {
+          [1651217184.203159][3201:3206] CHIP:DMG:        SuppressResponse = true,
+          [1651217184.203193][3201:3206] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217184.203225][3201:3206] CHIP:DMG: }
       disabled: true
 
-    - label: "TH sends Get User Type Command to DUT"
+    - label:
+          "Initiate a LockOperationError Event by setting OperationError as 3"
       verification: |
+          ./chip-tool doorlock read-event lock-operation-error 1 1
 
+          [1651217184.203091][3201:3206] CHIP:DMG: ReportDataMessage =
+          [1651217184.203127][3201:3206] CHIP:DMG: {
+          [1651217184.203159][3201:3206] CHIP:DMG:        SuppressResponse = true,
+          [1651217184.203193][3201:3206] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217184.203225][3201:3206] CHIP:DMG: }
       disabled: true
 
     - label:
-          "TH sends Set User Type Command to DUT with the following values: User
-          ID as 6 User Type as 10"
+          "Initiate a LockOperationError Event by setting OperationError as 4"
+      verification: |
+          ./chip-tool doorlock read-event lock-operation-error 1 1
+
+          [1651217184.203091][3201:3206] CHIP:DMG: ReportDataMessage =
+          [1651217184.203127][3201:3206] CHIP:DMG: {
+          [1651217184.203159][3201:3206] CHIP:DMG:        SuppressResponse = true,
+          [1651217184.203193][3201:3206] CHIP:DMG:        InteractionModelRevision = 1
+          [1651217184.203225][3201:3206] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockUserChange event by changing the Lock User"
+      verification: |
+          sudo  ./chip-tool doorlock read-event lock-user-change 1 1
+
+          [1651836874.631472][6648:6653] CHIP:DMG: ReportDataMessage =
+          [1651836874.631520][6648:6653] CHIP:DMG: {
+          [1651836874.631563][6648:6653] CHIP:DMG:        SuppressResponse = true,
+          [1651836874.631610][6648:6653] CHIP:DMG:        InteractionModelRevision = 1
+          [1651836874.631653][6648:6653] CHIP:DMG: }
+      disabled: true
+
+    - label: "Initiate a LockUserChange event by changing the Schedule"
       verification: |
+          sudo  ./chip-tool doorlock read-event lock-user-change 1 1
 
+          [1651836874.631472][6648:6653] CHIP:DMG: ReportDataMessage =
+          [1651836874.631520][6648:6653] CHIP:DMG: {
+          [1651836874.631563][6648:6653] CHIP:DMG:        SuppressResponse = true,
+          [1651836874.631610][6648:6653] CHIP:DMG:        InteractionModelRevision = 1
+          [1651836874.631653][6648:6653] CHIP:DMG: }
       disabled: true
 
-    - label: "TH sends Get User Type Command to DUT"
+    - label: "Initiate a LockUserChange event by changing the Credential"
       verification: |
+          sudo  ./chip-tool doorlock read-event lock-user-change 1 1
 
+          [1651836874.631472][6648:6653] CHIP:DMG: ReportDataMessage =
+          [1651836874.631520][6648:6653] CHIP:DMG: {
+          [1651836874.631563][6648:6653] CHIP:DMG:        SuppressResponse = true,
+          [1651836874.631610][6648:6653] CHIP:DMG:        InteractionModelRevision = 1
+          [1651836874.631653][6648:6653] CHIP:DMG: }
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_11.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_11.yaml
deleted file mode 100644
index 6bd06875f8fee6..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DL_2_11.yaml
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name:
-    108.2.11. [TC-DL-2.11] Verification for the following Commands - Set Year
-    Schedule, Get Year Schedule, Get Year Day Schedule Response and Clear Year
-    Day Schedule[DUT-Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Door Lock"
-    endpoint: 1
-
-tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    - label: "Create new PIN credential and lock/unlock user"
-      command: "SetCredential"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "operationType"
-                value: 0
-              - name: "credential"
-                value: { CredentialType: 1, CredentialIndex: 1 }
-              - name: "credentialData"
-                value: "123456"
-              - name: "userIndex"
-                value: null
-              - name: "userStatus"
-                value: null
-              - name: "userType"
-                value: null
-      response:
-          values:
-              - name: "status"
-                value: 0
-              - name: "userIndex"
-                value: 1
-              - name: "nextCredentialIndex"
-                value: 2
-
-    - label: "Create new PIN credential and lock/unlock for second user"
-      command: "SetCredential"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "operationType"
-                value: 0
-              - name: "credential"
-                value: { CredentialType: 1, CredentialIndex: 2 }
-              - name: "credentialData"
-                value: "123457"
-              - name: "userIndex"
-                value: null
-              - name: "userStatus"
-                value: null
-              - name: "userType"
-                value: null
-      response:
-          values:
-              - name: "status"
-                value: 0
-              - name: "userIndex"
-                value: 2
-              - name: "nextCredentialIndex"
-                value: 3
-
-    - label: "Get Max number of year Day schedules for user"
-      command: "readAttribute"
-      attribute: "NumberOfYearDaySchedulesSupportedPerUser"
-      response:
-          saveAs: NumberOfYearDaySchedulesSupportedPerUser
-          value: 10
-
-    - label: "Get number of supported users"
-      command: "readAttribute"
-      attribute: "NumberOfTotalUsersSupported"
-      response:
-          saveAs: NumberOfTotalUsersSupported
-          value: 10
-
-    - label: "Send Set Year Day Schedule Command to DUT"
-      command: "SetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 1
-              - name: "userIndex"
-                value: 1
-              - name: "LocalStartTime"
-                value: 10
-              - name: "LocalEndTime"
-                value: 20
-
-    #issue #18591 and #18590
-    - label: "send Get Year Day Schedule Command"
-      command: "GetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 1
-              - name: "userIndex"
-                value: 1
-      response:
-          values:
-              - name: "YearDayIndex"
-                constraints:
-                    minValue: 1
-              - name: "userIndex"
-                constraints:
-                    minValue: 1
-              - name: "status"
-                value: 0x0
-              - name: "LocalStartTime"
-                constraints:
-                    hasValue: true
-                    type: epoch-s
-              - name: "LocalEndTime"
-                constraints:
-                    hasValue: true
-                    type: epoch-s
-
-    - label:
-          "Send Set Year Day Schedule Command to DUT and verify INVALID_COMMAND
-          response"
-      command: "SetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 0
-              - name: "userIndex"
-                value: 10
-              - name: "LocalStartTime"
-                value: 30
-              - name: "LocalEndTime"
-                value: 10
-      response:
-          error: INVALID_COMMAND
-
-    - label:
-          "send Get Year Day Schedule Command to DUT and Verify INVALID_FIELD
-          response"
-      command: "GetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 21
-      response:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 21
-              - name: "status"
-                value: 0x85
-              - name: "LocalStartTime"
-                constraints:
-                    hasValue: false
-              - name: "LocalEndTime"
-                constraints:
-                    hasValue: false
-
-    - label:
-          "send Get Year Day Schedule Command to DUT and verify NOT_FOUND
-          response"
-      command: "GetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 10
-              - name: "userIndex"
-                value: 5
-      response:
-          values:
-              - name: "YearDayIndex"
-                value: 10
-              - name: "userIndex"
-                value: 5
-              - name: "status"
-                value: 0x8B
-              - name: "LocalStartTime"
-                constraints:
-                    hasValue: false
-              - name: "LocalEndTime"
-                constraints:
-                    hasValue: false
-
-    - label:
-          "send Get Year Day Schedule Command  to DUT and verify NOT_FOUND
-          response "
-      command: "GetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 2
-      response:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 2
-              - name: "status"
-                value: 0x8B
-              - name: "LocalStartTime"
-                constraints:
-                    hasValue: false
-              - name: "LocalEndTime"
-                constraints:
-                    hasValue: false
-
-    - label: "Send Set Year Day Schedule Command to DUT"
-      command: "SetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 2
-              - name: "LocalStartTime"
-                value: 10
-              - name: "LocalEndTime"
-                value: 20
-
-    - label: "send Get Year Day Schedule Command "
-      command: "GetYearDaySchedule"
-      arguments:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 2
-      response:
-          values:
-              - name: "YearDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 2
-              - name: "status"
-                value: 0x0
-              - name: "LocalStartTime"
-                value: 10
-              - name: "LocalEndTime"
-                value: 20
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_13.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_13.yaml
deleted file mode 100644
index 75b10389614edf..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DL_2_13.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    100.2.13. [TC-DL-2.13] Verification for the following Commands - Set User,
-    Get User, Get User Response, Clear User [DUT-Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH reads NumberOfTotalUsersSupported attribute and saves for future
-          use."
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
-
-    - label:
-          "TH sends Set User Command to DUT with the following values:
-          OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 6452
-          UserStatus as 1 UserType as 0 CredentialRule as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set User Command to DUT with the following values:
-          OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 6452
-          UserStatus as 1 UserType as 10 CredentialRule as 3"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set User Command to DUT with the following values:
-          OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 8965
-          UserStatus as 1 UserType as 0 CredentialRule as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set User Command to DUT with the following values:
-          OperationType as 0 UserIndex as 26 UserName as xxx UserUniqueID as
-          6452 UserStatus as 1 UserType as 1 CredentialRule as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set User Command to DUT with the following values:
-          OperationType as 0 UserIndex as 2 UserName as NULL UserUniqueID as
-          NULL UserStatus as NULL UserType as NULL CredentialRule as NULL"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set User Command to DUT with the following values:
-          OperationType as 2 UserIndex as 2 UserName as NULL UserUniqueID as
-          NULL UserStatus as NULL UserType as NULL CredentialRule as NULL"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get User Command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Clear User Command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get User Command to DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_14.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_14.yaml
deleted file mode 100644
index c724bbbd875c64..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DL_2_14.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    100.2.14. [TC-DL-2.14] Verification for the following Commands - Set
-    Credential , Set Credential Response, Get Credential Status, Get Credential
-    Status Response, Clear Credential [DUT-Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH reads NumberOfTotalUsersSupported attribute and saves for future
-          use."
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 5 UserType as 10"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 2 CredentialData as xxxx UserIndex
-          as 3 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 2 Credential as 1 3 CredentialData as xxxx UserIndex
-          as 3 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get Credential Status Command"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Clear Credential Command to DUT with the following fields:
-          CredentialType as 1 CredentialIndex as 2"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Clear Credential Command to DUT with the following fields:
-          CredentialType as 1 CredentialIndex as 0xFFFE"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Clear Credential Command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get Credential Status Command"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Set Credential Command to DUT with the following fields:
-          OperationType as 0 Credential as 1 1 CredentialData as xxxx UserIndex
-          as 2 UserStatus as 0 UserType as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Clear Credential Command to DUT with the following fields:
-          CredentialType as 8 CredentialIndex as 2"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_15.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_15.yaml
deleted file mode 100644
index f24a42295ed1ba..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DL_2_15.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    100.2.15. [TC-DL-2.15] Verification for the Operation Event Notification
-    Command [DUT-Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH sends Get User Status Command to DUT"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
-
-    - label:
-          "From the Get User Status Response extract UserID and save for future
-          use"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get PIN Code Command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "From the Get PIN Code Response extract PIN Code for the above User ID
-          and save for future use"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads KeypadOperationEventMask Attribute from DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads Remote Operation Event Mask attribute from DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads Manual Operation Event Mask attribute from DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads RFID Operation Event Mask attribute from DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_16.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_16.yaml
deleted file mode 100644
index 0db620b3d41735..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DL_2_16.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    100.2.16. [TC-DL-2.16] Verification for the Programming Event Notification
-    Command [DUT-Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH sends Get User Status Command to DUT"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
-
-    - label:
-          "From the Get User Status Response extract UserID and save for future
-          use"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get PIN Code Command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "From the Get PIN Code Response extract PIN Code for the above User ID
-          and save for future use"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get User Type command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "From the Get User Type Response extract User Type for the above User
-          ID and save for future use"
-      verification: |
-
-      disabled: true
-
-    - label: "TH sends Get User Status command to DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "From the Get User Status Response extract the User Status for the
-          above User ID and saves for future use"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads Keypad Programming Event Mask attribute from DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads Remote Programming Event Mask attribute from DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads RFID Programming Event Mask attribute from DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_17.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_17.yaml
deleted file mode 100644
index d2848122bb68ad..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DL_2_17.yaml
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 100.2.17. [TC-DL-2.17] Verification for the Door Lock Events [DUT-Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 1"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 3"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 4"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 5"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 6"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 7"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorLockAlarm Event by setting the AlarmCode to 8"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorStateChange event by setting the DoorState to 0"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorStateChange event by setting the DoorState to 1"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorStateChange event by setting the DoorState to 2"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorStateChange event by setting the DoorState to 3"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorStateChange event by setting the DoorState to 4"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a DoorStateChange event by setting the DoorState to 5"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 0"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 1"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 2"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 3"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 4"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 5"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 6"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 7"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 8"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockOperation event by setting OperationSource to 9"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "Initiate a LockOperationError Event by setting OperationError as 0"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "Initiate a LockOperationError Event by setting OperationError as 1"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "Initiate a LockOperationError Event by setting OperationError as 2"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "Initiate a LockOperationError Event by setting OperationError as 3"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "Initiate a LockOperationError Event by setting OperationError as 4"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockUserChange event by changing the Lock User"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockUserChange event by changing the Schedule"
-      verification: |
-
-      disabled: true
-
-    - label: "Initiate a LockUserChange event by changing the Credential"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_5.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_5.yaml
index 40e3558972c302..ba2ac69428a0d8 100644
--- a/src/app/tests/suites/certification/Test_TC_DL_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_5.yaml
@@ -11,64 +11,224 @@
 # 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:
-    107.5. [TC-DL-1.5] Verification for Get Log Record, Get Log Record Response
-    Command [DUT-Server]
+    112.2.5. [TC-DL-2.5] Verification for the following Commands - Set Week Day
+    Schedule, Get Week Day Schedule , Get Week Day Schedule Response, Clear Week
+    Day Schedule [DUT-Server]
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
+    cluster: "Door Lock"
+    endpoint: 1
 
 tests:
-    - label:
-          "TH saves the NumberOfLogRecordsSupported attribute value as logcount
-          for the future use"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Create new PIN credential and lock/unlock user"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: null
+              - name: "userStatus"
+                value: null
+              - name: "userType"
+                value: null
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "userIndex"
+                value: 1
+              - name: "nextCredentialIndex"
+                value: 2
+
+    - label: "Get Max number of Week Day schedules for user"
+      command: "readAttribute"
+      attribute: "NumberOfWeekDaySchedulesSupportedPerUser"
+      response:
+          saveAs: NumberOfWeekDaySchedulesSupportedPerUser
+          value: 10
+
+    - label: "Get number of supported users"
+      command: "readAttribute"
+      attribute: "NumberOfTotalUsersSupported"
+      response:
+          saveAs: NumberOfTotalUsersSupported
+          value: 10
+
+    - label: "Send Set Week Day Schedule Command to DUT"
+      command: "SetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "daysMask"
+                value: 2
+              - name: "startHour"
+                value: 15
+              - name: "startMinute"
+                value: 45
+              - name: "endHour"
+                value: 16
+              - name: "endMinute"
+                value: 55
+
+    #issue #18591
+    - label: "send GetWeekDay Schedule Command "
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                constraints:
+                    minValue: 1
+              - name: "userIndex"
+                constraints:
+                    minValue: 1
+              - name: "status"
+                value: 0x0
+              - name: "daysMask"
+                constraints:
+                    hasValue: true
+                    minValue: 0
+                    maxValue: 6
+              - name: "startHour"
+                constraints:
+                    hasValue: true
+                    minValue: 0
+                    maxValue: 23
+              - name: "startMinute"
+                constraints:
+                    hasValue: true
+                    minValue: 0
+                    maxValue: 59
+              - name: "endHour"
+                constraints:
+                    hasValue: true
+                    minValue: 0
+                    maxValue: 23
+              - name: "endMinute"
+                constraints:
+                    hasValue: true
+                    minValue: 0
+                    maxValue: 59
 
     - label:
-          "TH sends Door lock command to the DUT with PINCode argument value as
-          'xxxxxxxx' for 5 times"
-      verification: |
-
-      disabled: true
-
-    - label: "Increment the logcount by 5."
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads NumberOfLogRecordsSupported attribute from the DUT"
-      verification: |
-
-      disabled: true
+          "Send Set Week Day Schedule Command to DUT and verify INVALID_COMMAND
+          response"
+      command: "SetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 0
+              - name: "userIndex"
+                value: 1
+              - name: "daysMask"
+                value: 7
+              - name: "startHour"
+                value: 15
+              - name: "startMinute"
+                value: 45
+              - name: "endHour"
+                value: 16
+              - name: "endMinute"
+                value: 55
+      response:
+          error: INVALID_COMMAND
 
     - label:
-          "TH sends Get Log Record Command to the DUT with argument Log Index
-          value as 2"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Door lock command to the DUT with PINCode argument value as
-          'xxxxxxxx'"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads NumberOfLogRecordsSupported attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends Get Log Record Command to the DUT with argument Log Index
-          value as 0"
-      verification: |
-
-      disabled: true
+          "send GetWeekDay Schedule Command to DUT and verify INVALID_COMMAND
+          response"
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 0
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                value: 0
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x85
+              - name: "daysMask"
+                constraints:
+                    hasValue: false
+              - name: "startHour"
+                constraints:
+                    hasValue: false
+              - name: "startMinute"
+                constraints:
+                    hasValue: false
+              - name: "endHour"
+                constraints:
+                    hasValue: false
+              - name: "endMinute"
+                constraints:
+                    hasValue: false
+
+    - label: "Clear all week day schedules for the first user"
+      command: "ClearWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 0xFE
+              - name: "userIndex"
+                value: 1
+
+    - label: "send GetWeekDay Schedule Command "
+      command: "GetWeekDaySchedule"
+      arguments:
+          values:
+              - name: "weekDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "weekDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 1
+              - name: "status"
+                value: 0x8B
+              - name: "daysMask"
+                constraints:
+                    hasValue: false
+              - name: "startHour"
+                constraints:
+                    hasValue: false
+              - name: "startMinute"
+                constraints:
+                    hasValue: false
+              - name: "endHour"
+                constraints:
+                    hasValue: false
+              - name: "endMinute"
+                constraints:
+                    hasValue: false
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_6.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_6.yaml
index 272ec4df2e7e09..b74e96d588cee4 100644
--- a/src/app/tests/suites/certification/Test_TC_DL_2_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_6.yaml
@@ -14,9 +14,9 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    100.2.6. [TC-DL-2.6] Verification for the following Commands - Set PIN Code,
-    Get PIN Code, Get PIN Code Response, Clear PIN Code, Clear All PIN Codes
-    [DUT-Server]
+    112.2.6. [TC-DL-2.6] Verification for the following Commands - Set Holiday
+    Schedule, Get Holiday Schedule, Get Holiday Schedule Response , Clear
+    Holiday Schedule [DUT-Server]
 
 config:
     nodeId: 0x12344321
@@ -25,79 +25,111 @@ config:
 
 tests:
     - label:
-          "TH saves the NumberOfPINUsersSupported attribute value as idvalue for
-          the future use"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
-
-    - label:
-          "TH sends Set PIN Code Command to the DUT with the following argument
-          values: User ID value as 3 User Status value as 1 'OccupiedEnabled'
-          User Type value as 0 'UnrestrictedUser' PIN value as 'xxxxxxxx'"
+          "TH reads NumberOfHolidaySchedulesSupported and saves for future use."
       verification: |
+          ./chip-tool doorlock read number-of-holiday-schedules-supported 1 1
 
+          [1651752699.633117][3671:3676] CHIP:DMG:                                StatusIB =
+          [1651752699.633165][3671:3676] CHIP:DMG:                                {
+          [1651752699.633213][3671:3676] CHIP:DMG:                                        status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1651752699.633262][3671:3676] CHIP:DMG:                                },
       disabled: true
 
     - label:
-          "TH sends Set PIN Code Command to the DUT with the following argument
-          values: User ID value as idvalue+1 User Status value as 1
-          'OccupiedEnabled' User Type value as 0 'UnrestrictedUser' PIN value as
-          'xxxxxxxx'"
+          "TH sends Set Holiday Schedule Command to DUT with the following
+          values: HolidayIndex as 1 LocalStartTime as 20 LocalEndTime as 30
+          OperatingMode as 0"
       verification: |
+          ./chip-tool doorlock set-holiday-schedule 1 20 30 0 1 1
 
+          [1651158181.346750][6202:6207] CHIP:DMG: },
+          [1651158181.346857][6202:6207] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_0011 Status=0x81
+          [1651158181.346916][6202:6207] CHIP:TOO: Error: IM Error 0x00000581: General error: 0x81 (UNSUPPORTED_COMMAND)
       disabled: true
 
     - label:
-          "TH sends Get PIN Code Command to the DUT with argument User ID value
-          as 3"
+          "TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 1"
       verification: |
+          ./chip-tool doorlock get-holiday-schedule 1 1 1
 
+          [1651158836.053711][6244:6249] CHIP:DMG: },
+          [1651158836.053780][6244:6249] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_0012 Status=0x81
+          [1651158836.053817][6244:6249] CHIP:TOO: Error: IM Error 0x00000581: General error: 0x81 (UNSUPPORTED_COMMAND)
       disabled: true
 
     - label:
-          "TH sends Get PIN Code Command to the DUT with argument User ID value
-          as idvalue +1"
+          "TH sends Set Holiday Schedule Command to DUT with the following
+          values: HolidayIndex as 1 LocalStartTime as 20 LocalEndTime as 30
+          OperatingMode as 5"
       verification: |
+          ./chip-tool doorlock set-holiday-schedule 1 20 30 5 1 1
 
+          [1651160907.922634][6407:6412] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_0011 Status=0x81
+          [1651160907.922677][6407:6412] CHIP:TOO: Error: IM Error 0x00000581: General error: 0x81 (UNSUPPORTED_COMMAND)
       disabled: true
 
     - label:
-          "TH sends Get PIN Code Command to the DUT with argument User ID value
-          as '5a3'"
+          "TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 1"
       verification: |
+          ./chip-tool doorlock get-holiday-schedule 1 1 1
 
+          [1651753075.971000][3714:3719] CHIP:DMG:                                StatusIB =
+          [1651753075.971049][3714:3719] CHIP:DMG:                                {
+          [1651753075.971098][3714:3719] CHIP:DMG:                                        status = 0x81 (UNSUPPORTED_COMMAND),
+          [1651753075.971148][3714:3719] CHIP:DMG:                                },
       disabled: true
 
     - label:
-          "TH sends Clear PIN Code Command to the DUT with argument PINSlotIndex
-          value as 3"
+          "TH sends Set Holiday Schedule Command to DUT with the following
+          values: HolidayIndex as 1 LocalStartTime as 20 LocalEndTime as 30
+          OperatingMode as 3"
       verification: |
+          ./chip-tool doorlock set-holiday-schedule 1 20 30 3 1 1
 
+          [1651753121.844770][3721:3726] CHIP:DMG:                                StatusIB =
+          [1651753121.844810][3721:3726] CHIP:DMG:                                {
+          [1651753121.844852][3721:3726] CHIP:DMG:                                        status = 0x81 (UNSUPPORTED_COMMAND),
+          [1651753121.844895][3721:3726] CHIP:DMG:                                },
       disabled: true
 
     - label:
-          "TH sends Get PIN Code Response Command to DUT with the User ID as 3"
+          "TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 10"
       verification: |
+          ./chip-tool doorlock get-holiday-schedule 10 1 1
 
+          [1651159091.759202][6270:6275] CHIP:DMG: },
+          [1651159091.759283][6270:6275] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_0012 Status=0x81
+          [1651159091.759327][6270:6275] CHIP:TOO: Error: IM Error 0x00000581: General error: 0x81 (UNSUPPORTED_COMMAND)
       disabled: true
 
     - label:
-          "TH sends clear PIN Code Command to the DUT with argument User ID
-          value as idvlaue +1"
+          "TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 6"
       verification: |
+          ./chip-tool doorlock get-holiday-schedule 6 1 1
 
+          [1651753204.977947][3745:3750] CHIP:DMG:                                StatusIB =
+          [1651753204.977985][3745:3750] CHIP:DMG:                                {
+          [1651753204.978022][3745:3750] CHIP:DMG:                                        status = 0x81 (UNSUPPORTED_COMMAND),
+          [1651753204.978063][3745:3750] CHIP:DMG:                                },
       disabled: true
 
     - label:
-          "TH sends clear PIN Code Command to the DUT with argument PINSlotIndex
-          value as 0xFFFE"
+          "TH send Clear Holiday Schedule Command to DUT with HolidayIndex as 1"
       verification: |
+          ./chip-tool doorlock clear-holiday-schedule 1 1 1
 
+          [1651753246.493952][3753:3758] CHIP:DMG:                                StatusIB =
+          [1651753246.493984][3753:3758] CHIP:DMG:                                {
+          [1651753246.494020][3753:3758] CHIP:DMG:                                        status = 0x81 (UNSUPPORTED_COMMAND),
+          [1651753246.494054][3753:3758] CHIP:DMG:                                },
       disabled: true
 
     - label:
-          "TH sends Get PIN Code Response Command to DUT with the User ID as 8"
+          "TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 2"
       verification: |
+          ./chip-tool doorlock get-holiday-schedule 2 1 1
 
+          [1651159091.759202][6270:6275] CHIP:DMG: },
+          [1651159091.759283][6270:6275] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_0012 Status=0x81
+          [1651159091.759327][6270:6275] CHIP:TOO: Error: IM Error 0x00000581: General error: 0x81 (UNSUPPORTED_COMMAND)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_7.yaml
index 93f608d8226b36..494880db149e72 100644
--- a/src/app/tests/suites/certification/Test_TC_DL_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_7.yaml
@@ -11,41 +11,255 @@
 # 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:
-    100.2.7. [TC-DL-2.7] Verification for the following Commands - Set User
-    Status, Get User Status , Get User Status Response [DUT-Server]
+    112.2.7. [TC-DL-2.7] Verification for the following Commands - Set Year
+    Schedule, Get Year Schedule, Get Year Day Schedule Response and Clear Year
+    Day Schedule[DUT-Server]
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
+    cluster: "Door Lock"
+    endpoint: 1
 
 tests:
-    - label: "Verify that DUT sends a SUCCESS response"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15776
-      disabled: true
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
-    - label: "TH send Get User Status command to DUT with User ID as 3"
-      verification: |
+    - label: "Create new PIN credential and lock/unlock user"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: null
+              - name: "userStatus"
+                value: null
+              - name: "userType"
+                value: null
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "userIndex"
+                value: 1
+              - name: "nextCredentialIndex"
+                value: 2
 
-      disabled: true
+    - label: "Create new PIN credential and lock/unlock for second user"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 2 }
+              - name: "credentialData"
+                value: "123457"
+              - name: "userIndex"
+                value: null
+              - name: "userStatus"
+                value: null
+              - name: "userType"
+                value: null
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "userIndex"
+                value: 2
+              - name: "nextCredentialIndex"
+                value: 3
+
+    - label: "Get Max number of year Day schedules for user"
+      command: "readAttribute"
+      attribute: "NumberOfYearDaySchedulesSupportedPerUser"
+      response:
+          saveAs: NumberOfYearDaySchedulesSupportedPerUser
+          value: 10
+
+    - label: "Get number of supported users"
+      command: "readAttribute"
+      attribute: "NumberOfTotalUsersSupported"
+      response:
+          saveAs: NumberOfTotalUsersSupported
+          value: 10
+
+    - label: "Send Set Year Day Schedule Command to DUT"
+      command: "SetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+              - name: "LocalStartTime"
+                value: 10
+              - name: "LocalEndTime"
+                value: 20
+
+    #issue #18591 and #18590
+    - label: "send Get Year Day Schedule Command"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 1
+              - name: "userIndex"
+                value: 1
+      response:
+          values:
+              - name: "YearDayIndex"
+                constraints:
+                    minValue: 1
+              - name: "userIndex"
+                constraints:
+                    minValue: 1
+              - name: "status"
+                value: 0x0
+              - name: "LocalStartTime"
+                constraints:
+                    hasValue: true
+                    type: epoch-s
+              - name: "LocalEndTime"
+                constraints:
+                    hasValue: true
+                    type: epoch-s
 
     - label:
-          "TH send Set User Status command to DUT for setting the User Status as
-          3 for User ID as 3"
-      verification: |
+          "Send Set Year Day Schedule Command to DUT and verify INVALID_COMMAND
+          response"
+      command: "SetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 0
+              - name: "userIndex"
+                value: 10
+              - name: "LocalStartTime"
+                value: 30
+              - name: "LocalEndTime"
+                value: 10
+      response:
+          error: INVALID_COMMAND
 
-      disabled: true
+    - label:
+          "send Get Year Day Schedule Command to DUT and Verify INVALID_FIELD
+          response"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 21
+      response:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 21
+              - name: "status"
+                value: 0x85
+              - name: "LocalStartTime"
+                constraints:
+                    hasValue: false
+              - name: "LocalEndTime"
+                constraints:
+                    hasValue: false
 
-    - label: "TH sends Get User Status command to DUT"
-      verification: |
+    - label:
+          "send Get Year Day Schedule Command to DUT and verify NOT_FOUND
+          response"
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 10
+              - name: "userIndex"
+                value: 5
+      response:
+          values:
+              - name: "YearDayIndex"
+                value: 10
+              - name: "userIndex"
+                value: 5
+              - name: "status"
+                value: 0x8B
+              - name: "LocalStartTime"
+                constraints:
+                    hasValue: false
+              - name: "LocalEndTime"
+                constraints:
+                    hasValue: false
 
-      disabled: true
+    - label:
+          "send Get Year Day Schedule Command  to DUT and verify NOT_FOUND
+          response "
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 2
+      response:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 2
+              - name: "status"
+                value: 0x8B
+              - name: "LocalStartTime"
+                constraints:
+                    hasValue: false
+              - name: "LocalEndTime"
+                constraints:
+                    hasValue: false
 
-    - label: "TH sends Get User Status command to DUT with the User ID as '3f4'"
-      verification: |
+    - label: "Send Set Year Day Schedule Command to DUT"
+      command: "SetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 2
+              - name: "LocalStartTime"
+                value: 10
+              - name: "LocalEndTime"
+                value: 20
 
-      disabled: true
+    - label: "send Get Year Day Schedule Command "
+      command: "GetYearDaySchedule"
+      arguments:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 2
+      response:
+          values:
+              - name: "YearDayIndex"
+                value: 2
+              - name: "userIndex"
+                value: 2
+              - name: "status"
+                value: 0x0
+              - name: "LocalStartTime"
+                value: 10
+              - name: "LocalEndTime"
+                value: 20
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_8.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_8.yaml
index 2b26022014dbf8..9aadd347ac1b3e 100644
--- a/src/app/tests/suites/certification/Test_TC_DL_2_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_8.yaml
@@ -11,224 +11,212 @@
 # 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:
-    108.2.8. [TC-DL-2.8] Verification for the following Commands - Set Week Day
-    Schedule, Get Week Day Schedule , Get Week Day Schedule Response, Clear Week
-    Day Schedule [DUT-Server]
+    112.2.8. [TC-DL-2.8] Verification for the following Commands - Set User, Get
+    User, Get User Response, Clear User [DUT-Server]
 
 config:
     nodeId: 0x12344321
-    cluster: "Door Lock"
-    endpoint: 1
+    cluster: "Basic"
+    endpoint: 0
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    - label: "Create new PIN credential and lock/unlock user"
-      command: "SetCredential"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "operationType"
-                value: 0
-              - name: "credential"
-                value: { CredentialType: 1, CredentialIndex: 1 }
-              - name: "credentialData"
-                value: "123456"
-              - name: "userIndex"
-                value: null
-              - name: "userStatus"
-                value: null
-              - name: "userType"
-                value: null
-      response:
-          values:
-              - name: "status"
-                value: 0
-              - name: "userIndex"
-                value: 1
-              - name: "nextCredentialIndex"
-                value: 2
-
-    - label: "Get Max number of Week Day schedules for user"
-      command: "readAttribute"
-      attribute: "NumberOfWeekDaySchedulesSupportedPerUser"
-      response:
-          saveAs: NumberOfWeekDaySchedulesSupportedPerUser
-          value: 10
-
-    - label: "Get number of supported users"
-      command: "readAttribute"
-      attribute: "NumberOfTotalUsersSupported"
-      response:
-          saveAs: NumberOfTotalUsersSupported
-          value: 10
-
-    - label: "Send Set Week Day Schedule Command to DUT"
-      command: "SetWeekDaySchedule"
-      arguments:
-          values:
-              - name: "weekDayIndex"
-                value: 1
-              - name: "userIndex"
-                value: 1
-              - name: "daysMask"
-                value: 2
-              - name: "startHour"
-                value: 15
-              - name: "startMinute"
-                value: 45
-              - name: "endHour"
-                value: 16
-              - name: "endMinute"
-                value: 55
-
-    #issue #18591
-    - label: "send GetWeekDay Schedule Command "
-      command: "GetWeekDaySchedule"
-      arguments:
-          values:
-              - name: "weekDayIndex"
-                value: 1
-              - name: "userIndex"
-                value: 1
-      response:
-          values:
-              - name: "weekDayIndex"
-                constraints:
-                    minValue: 1
-              - name: "userIndex"
-                constraints:
-                    minValue: 1
-              - name: "status"
-                value: 0x0
-              - name: "daysMask"
-                constraints:
-                    hasValue: true
-                    minValue: 0
-                    maxValue: 6
-              - name: "startHour"
-                constraints:
-                    hasValue: true
-                    minValue: 0
-                    maxValue: 23
-              - name: "startMinute"
-                constraints:
-                    hasValue: true
-                    minValue: 0
-                    maxValue: 59
-              - name: "endHour"
-                constraints:
-                    hasValue: true
-                    minValue: 0
-                    maxValue: 23
-              - name: "endMinute"
-                constraints:
-                    hasValue: true
-                    minValue: 0
-                    maxValue: 59
+    - label:
+          "TH reads NumberOfTotalUsersSupported attribute and saves for future
+          use."
+      verification: |
+          ./chip-tool doorlock read number-of-total-users-supported 1 1
+
+
+          [1649927485.980884][4704:4709] CHIP:DMG: SuppressResponse = true,
+          [1649927485.980918][4704:4709] CHIP:DMG: InteractionModelRevision = 1
+          [1649927485.980949][4704:4709] CHIP:DMG: }
+          [1649927485.981156][4704:4709] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0011 DataVersion: 343041314 [1649927485.981254][4704:4709] CHIP:TOO: NumberOfTotalUsersSupported: 10
+      disabled: true
+
+    - label:
+          "TH sends Set User Command to DUT with the following values:
+          OperationType as 0 UserIndex as 1 UserName as xxx UserUniqueID as 6452
+          UserStatus as 1 UserType as 0 CredentialRule as 0"
+      verification: |
+          ./chip-tool doorlock set-user 0 1 xxx 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
+
+
+          [1649330663.191417][4425:4430] CHIP:DMG:                                {
+          [1649330663.191461][4425:4430] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1649330663.191510][4425:4430] CHIP:DMG:                                },
+          [1649330663.191554][4425:4430] CHIP:DMG:
+          [1649330663.191594][4425:4430] CHIP:DMG:                        },
+          [1649330663.191641][4425:4430] CHIP:DMG:
+          [1649330663.191677][4425:4430] CHIP:DMG:                },
+          [1649330663.191720][4425:4430] CHIP:DMG:
+          [1649330663.191752][4425:4430] CHIP:DMG:        ],
+          [1649330663.191792][4425:4430] CHIP:DMG:
+          [1649330663.191823][4425:4430] CHIP:DMG:        InteractionModelRevision = 1
+          [1649330663.191854][4425:4430] CHIP:DMG: },
+          [1649330663.191929][4425:4430] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001A Status=0x0
+      disabled: true
+
+    - label: "TH sends Get User Command to DUT with UserIndex as 1"
+      verification: |
+          ./chip-tool doorlock get-user 1 1 1
+          [1651755914.731371][2384:2389] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001C
+          [1651755914.731437][2384:2389] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Command 0x0000_001C
+          [1651755914.731654][2384:2389] CHIP:TOO:   GetUserResponse: {
+          [1651755914.731700][2384:2389] CHIP:TOO:     userIndex: 1
+          [1651755914.731732][2384:2389] CHIP:TOO:     userName: 1
+          [1651755914.731763][2384:2389] CHIP:TOO:     userUniqueId: 6452
+          [1651755914.731794][2384:2389] CHIP:TOO:     userStatus: 1
+          [1651755914.731825][2384:2389] CHIP:TOO:     userType: 0
+          [1651755914.731870][2384:2389] CHIP:TOO:     credentialRule: 0
+          [1651755914.731900][2384:2389] CHIP:TOO:     credentials: null
+          [1651755914.731930][2384:2389] CHIP:TOO:     creatorFabricIndex: 1
+          [1651755914.731960][2384:2389] CHIP:TOO:     lastModifiedFabricIndex: 1
+          [1651755914.731990][2384:2389] CHIP:TOO:     nextUserIndex: 2
+          [1651755914.732054][2384:2389] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH sends Set User Command to DUT with the following values:
+          OperationType as 0 UserIndex as 2 UserName as xxx UserUniqueID as 6452
+          UserStatus as 1 UserType as 10 CredentialRule as 3"
+      verification: |
+          ./chip-tool doorlock set-user 0 2 xxx 6451 1 10 3 1 1 --timedInteractionTimeoutMs 1000
+
+          [1651756268.794269][2435:2440] CHIP:DMG:                                StatusIB =
+          [1651756268.794302][2435:2440] CHIP:DMG:                                {
+          [1651756268.794343][2435:2440] CHIP:DMG:                                        status = 0x01 (FAILURE),
+          [1651756268.794470][2435:2440] CHIP:DMG:                                },
+          [1651756268.794516][2435:2440] CHIP:DMG:
+          [1651756268.794548][2435:2440] CHIP:DMG:                        },
+          [1651756268.794593][2435:2440] CHIP:DMG:
+          [1651756268.794620][2435:2440] CHIP:DMG:                },
+          [1651756268.794661][2435:2440] CHIP:DMG:
+          [1651756268.794685][2435:2440] CHIP:DMG:        ],
+          [1651756268.794725][2435:2440] CHIP:DMG:
+          [1651756268.794748][2435:2440] CHIP:DMG:        InteractionModelRevision = 1
+          [1651756268.794781][2435:2440] CHIP:DMG: },
+          [1651756268.794852][2435:2440] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001A Status=0x1
+      disabled: true
 
     - label:
-          "Send Set Week Day Schedule Command to DUT and verify INVALID_COMMAND
-          response"
-      command: "SetWeekDaySchedule"
-      arguments:
-          values:
-              - name: "weekDayIndex"
-                value: 0
-              - name: "userIndex"
-                value: 1
-              - name: "daysMask"
-                value: 7
-              - name: "startHour"
-                value: 15
-              - name: "startMinute"
-                value: 45
-              - name: "endHour"
-                value: 16
-              - name: "endMinute"
-                value: 55
-      response:
-          error: INVALID_COMMAND
+          "TH sends Set User Command to DUT with the following values:
+          OperationType as 0 UserIndex as 1 UserName as xxx UserUniqueID as 8965
+          UserStatus as 1 UserType as 0 CredentialRule as 0"
+      verification: |
+          ./chip-tool doorlock set-user 0 1 xxx 8965 1 0 0 1 1 --timedInteractionTimeoutMs 1000
+
+          [1651756354.433573][2443:2448] CHIP:DMG:                                StatusIB =
+          [1651756354.433621][2443:2448] CHIP:DMG:                                {
+          [1651756354.433684][2443:2448] CHIP:DMG:                                        status = 0x01 (FAILURE),
+          [1651756354.433744][2443:2448] CHIP:DMG:                                },
+          [1651756354.433794][2443:2448] CHIP:DMG:
+          [1651756354.433849][2443:2448] CHIP:DMG:                        },
+          [1651756354.433899][2443:2448] CHIP:DMG:
+          [1651756354.433951][2443:2448] CHIP:DMG:                },
+          [1651756354.434094][2443:2448] CHIP:DMG:
+          [1651756354.434144][2443:2448] CHIP:DMG:        ],
+          [1651756354.434202][2443:2448] CHIP:DMG:
+          [1651756354.434238][2443:2448] CHIP:DMG:        InteractionModelRevision = 1
+          [1651756354.434272][2443:2448] CHIP:DMG: },
+          [1651756354.434383][2443:2448] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001A Status=0x1
+      disabled: true
+
+    - label:
+          "TH sends Set User Command to DUT with the following values:
+          OperationType as 0 UserIndex as 2 UserName as NULL UserUniqueID as
+          NULL UserStatus as NULL UserType as NULL CredentialRule as NULL"
+      verification: |
+          ./chip-tool doorlock set-user 0 2 null null null null null 1 1 --timedInteractionTimeoutMs 1000
+
+          [1651756546.072661][2464:2469] CHIP:DMG:                                StatusIB =
+          [1651756546.072706][2464:2469] CHIP:DMG:                                {
+          [1651756546.072746][2464:2469] CHIP:DMG:                                        status = 0x01 (FAILURE),
+          [1651756546.072789][2464:2469] CHIP:DMG:                                },
+      disabled: true
 
     - label:
-          "send GetWeekDay Schedule Command to DUT and verify INVALID_COMMAND
-          response"
-      command: "GetWeekDaySchedule"
-      arguments:
-          values:
-              - name: "weekDayIndex"
-                value: 0
-              - name: "userIndex"
-                value: 1
-      response:
-          values:
-              - name: "weekDayIndex"
-                value: 0
-              - name: "userIndex"
-                value: 1
-              - name: "status"
-                value: 0x85
-              - name: "daysMask"
-                constraints:
-                    hasValue: false
-              - name: "startHour"
-                constraints:
-                    hasValue: false
-              - name: "startMinute"
-                constraints:
-                    hasValue: false
-              - name: "endHour"
-                constraints:
-                    hasValue: false
-              - name: "endMinute"
-                constraints:
-                    hasValue: false
-
-    - label: "Clear all week day schedules for the first user"
-      command: "ClearWeekDaySchedule"
-      arguments:
-          values:
-              - name: "weekDayIndex"
-                value: 0xFE
-              - name: "userIndex"
-                value: 1
-
-    - label: "send GetWeekDay Schedule Command "
-      command: "GetWeekDaySchedule"
-      arguments:
-          values:
-              - name: "weekDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 1
-      response:
-          values:
-              - name: "weekDayIndex"
-                value: 2
-              - name: "userIndex"
-                value: 1
-              - name: "status"
-                value: 0x8B
-              - name: "daysMask"
-                constraints:
-                    hasValue: false
-              - name: "startHour"
-                constraints:
-                    hasValue: false
-              - name: "startMinute"
-                constraints:
-                    hasValue: false
-              - name: "endHour"
-                constraints:
-                    hasValue: false
-              - name: "endMinute"
-                constraints:
-                    hasValue: false
+          "TH sends Set User Command to DUT with the following values:
+          OperationType as 2 UserIndex as 2 UserName as NULL UserUniqueID as
+          NULL UserStatus as NULL UserType as NULL CredentialRule as NULL"
+      verification: |
+          ./chip-tool doorlock set-user 2 2 null null null null null 1 1 --timedInteractionTimeoutMs 1000
+
+          [1651756471.799684][2456:2461] CHIP:DMG:                                StatusIB =
+          [1651756471.799733][2456:2461] CHIP:DMG:                                {
+          [1651756471.799782][2456:2461] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1651756471.799826][2456:2461] CHIP:DMG:                                },
+          [1651756471.799875][2456:2461] CHIP:DMG:
+          [1651756471.799915][2456:2461] CHIP:DMG:                        },
+          [1651756471.799963][2456:2461] CHIP:DMG:
+          [1651756471.800003][2456:2461] CHIP:DMG:                },
+          [1651756471.800050][2456:2461] CHIP:DMG:
+          [1651756471.800085][2456:2461] CHIP:DMG:        ],
+          [1651756471.800128][2456:2461] CHIP:DMG:
+          [1651756471.800162][2456:2461] CHIP:DMG:        InteractionModelRevision = 1
+          [1651756471.800196][2456:2461] CHIP:DMG: },
+          [1651756471.800305][2456:2461] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001A Status=0x0
+      disabled: true
+
+    - label: "TH sends Get User Command to DUT with the UserIndex as 2"
+      verification: |
+          ./chip-tool doorlock get-user 2 1 1
+
+          [1651756763.195996][2504:2509] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001C
+          [1651756763.196060][2504:2509] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Command 0x0000_001C
+          [1651756763.196223][2504:2509] CHIP:TOO:   GetUserResponse: {
+          [1651756763.196301][2504:2509] CHIP:TOO:     userIndex: 2
+          [1651756763.196336][2504:2509] CHIP:TOO:     userName: 7
+          [1651756763.196371][2504:2509] CHIP:TOO:     userUniqueId: 6451
+          [1651756763.196405][2504:2509] CHIP:TOO:     userStatus: 1
+          [1651756763.196437][2504:2509] CHIP:TOO:     userType: 0
+          [1651756763.196487][2504:2509] CHIP:TOO:     credentialRule: 0
+          [1651756763.196521][2504:2509] CHIP:TOO:     credentials: null
+          [1651756763.196554][2504:2509] CHIP:TOO:     creatorFabricIndex: 1
+          [1651756763.196587][2504:2509] CHIP:TOO:     lastModifiedFabricIndex: 1
+          [1651756763.196620][2504:2509] CHIP:TOO:     nextUserIndex: 3
+          [1651756763.196654][2504:2509] CHIP:TOO:    }
+      disabled: true
+
+    - label: "TH sends Clear User Command to DUT with the UserIndex as 1"
+      verification: |
+          ./chip-tool doorlock clear-user 1 1 1  --timedInteractionTimeoutMs 1000
+
+          [1651213439.807034][2738:2743] CHIP:DMG:                                StatusIB =
+          [1651213439.807087][2738:2743] CHIP:DMG:                                {
+          [1651213439.807141][2738:2743] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1651213439.807195][2738:2743] CHIP:DMG:                                },
+          [1651213439.807255][2738:2743] CHIP:DMG:
+          [1651213439.807302][2738:2743] CHIP:DMG:                        },
+          [1651213439.807366][2738:2743] CHIP:DMG:
+          [1651213439.807409][2738:2743] CHIP:DMG:                },
+          [1651213439.807459][2738:2743] CHIP:DMG:
+          [1651213439.807499][2738:2743] CHIP:DMG:        ],
+          [1651213439.807550][2738:2743] CHIP:DMG:
+          [1651213439.807589][2738:2743] CHIP:DMG:        InteractionModelRevision = 1
+          [1651213439.807627][2738:2743] CHIP:DMG: },
+          [1651213439.807724][2738:2743] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001D Status=0x0
+      disabled: true
+
+    - label: "TH sends Get User Command to DUT with the UserIndex as 1"
+      verification: |
+          ./chip-tool doorlock get-user 1 1 1  --timedInteractionTimeoutMs 1000
+
+          [1651213485.994766][2747:2752] CHIP:DMG: },
+          [1651213485.994863][2747:2752] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001C
+          [1651213485.994936][2747:2752] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Command 0x0000_001C
+          [1651213485.995056][2747:2752] CHIP:TOO:   GetUserResponse: {
+          [1651213485.995115][2747:2752] CHIP:TOO:     userIndex: 1
+          [1651213485.995147][2747:2752] CHIP:TOO:     userName: null
+          [1651213485.995177][2747:2752] CHIP:TOO:     userUniqueId: null
+          [1651213485.995206][2747:2752] CHIP:TOO:     userStatus: null
+          [1651213485.995236][2747:2752] CHIP:TOO:     userType: null
+          [1651213485.995279][2747:2752] CHIP:TOO:     credentialRule: null
+          [1651213485.995309][2747:2752] CHIP:TOO:     credentials: null
+          [1651213485.995353][2747:2752] CHIP:TOO:     creatorFabricIndex: null
+          [1651213485.995385][2747:2752] CHIP:TOO:     lastModifiedFabricIndex: null
+          [1651213485.995428][2747:2752] CHIP:TOO:     nextUserIndex: 3
+          [1651213485.995461][2747:2752] CHIP:TOO:    }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DL_2_9.yaml b/src/app/tests/suites/certification/Test_TC_DL_2_9.yaml
new file mode 100644
index 00000000000000..b5fcbf1a42ef47
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DL_2_9.yaml
@@ -0,0 +1,271 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name:
+    112.2.9. [TC-DL-2.9] Verification for the following Commands - Set
+    Credential , Set Credential Response, Get Credential Status, Get Credential
+    Status Response, Clear Credential [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Door Lock"
+    endpoint: 1
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label:
+          "TH reads NumberOfTotalUsersSupported attribute and saves for future
+          use."
+      command: "readAttribute"
+      attribute: "NumberOfTotalUsersSupported"
+      response:
+          saveAs: NumberOfTotalUsersSupported
+          value: 10
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 1
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Get Credential Status Command"
+      command: "GetCredentialStatus"
+      arguments:
+          values:
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+      response:
+          values:
+              - name: "CredentialType"
+                constraints:
+                    minValue: 0
+                    maxValue: 5
+              - name: "CredentialIndex"
+                constraints:
+                    minValue: 0
+                    maxValue: 65534
+              - name: "CredentialExists"
+                constraints:
+                    type: boolean
+              - name: "UserIndex"
+                constraints:
+                    minValue: 1
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "1234"
+              - name: "userIndex"
+                value: 2
+              - name: "userStatus"
+                value: 5
+              - name: "userType"
+                value: 10
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 2
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 2
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 2 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 3
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 2
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 3 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 3
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Clear Credential Command to DUT"
+      command: "ClearCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 2
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Clear Credential Command to DUT"
+      command: "ClearCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 0xFFFE }
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 2
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Clear Credential Command to DUT"
+      command: "ClearCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 0xFFFE }
+
+    - label: "TH sends Get Credential Status Command"
+      command: "GetCredentialStatus"
+      arguments:
+          values:
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+      response:
+          values:
+              - name: "UserIndex"
+                value: null
+
+    - label: "TH sends Set Credential Command to DUT"
+      command: "SetCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "operationType"
+                value: 0
+              - name: "credential"
+                value: { CredentialType: 1, CredentialIndex: 1 }
+              - name: "credentialData"
+                value: "123456"
+              - name: "userIndex"
+                value: 2
+              - name: "userStatus"
+                value: 0
+              - name: "userType"
+                value: 0
+
+    - label: "TH sends Clear Credential Command to DUT"
+      command: "ClearCredential"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "credential"
+                value: { CredentialType: 8, CredentialIndex: 2 }
+      response:
+          error: INVALID_COMMAND
diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml
index 3b1f6f53de78de..6151bf5c8d09b4 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml
@@ -13,7 +13,9 @@
 # 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: 10.1.1. [TC-DM-1.1] Basic Cluster Server Attributes
+name:
+    10.1.1. [TC-DM-1.1] Global Attributes for Basic Information Cluster
+    [DUT-Server]
 
 config:
     nodeId: 0x12344321
@@ -21,172 +23,80 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    - label: "Query Data Model Revision"
-      command: "readAttribute"
-      attribute: "DataModelRevision"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "Query Vendor Name"
-      command: "readAttribute"
-      attribute: "VendorName"
-      response:
-          constraints:
-              type: string
-              maxLength: 32
-
-    - label: "Query VendorID"
-      command: "readAttribute"
-      attribute: "VendorID"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "Query Product Name"
-      command: "readAttribute"
-      attribute: "ProductName"
-      response:
-          constraints:
-              type: string
-              maxLength: 32
-
-    - label: "Query ProductID"
-      command: "readAttribute"
-      attribute: "ProductID"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "Query Node Label"
-      command: "readAttribute"
-      attribute: "NodeLabel"
-      response:
-          constraints:
-              type: string
-              maxLength: 32
-
-    - label: "Query User Location"
-      command: "readAttribute"
-      attribute: "Location"
-      response:
-          constraints:
-              type: string
-              maxLength: 2
-              format: "ISO 3166-1 alpha-2" # Step 6 11.2.3.1-6 Verify it follows ISO 3166-1 alpha-2 code / or it is empty, since it is user-defined
-
-    - label: "Query HardwareVersion"
-      command: "readAttribute"
-      attribute: "HardwareVersion"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "Query HardwareVersionString"
-      command: "readAttribute"
-      attribute: "HardwareVersionString"
-      response:
-          constraints:
-              type: string
-              minLength: 1
-              maxLength: 64
-
-    - label: "Query SoftwareVersion"
-      command: "readAttribute"
-      attribute: "SoftwareVersion"
-      response:
-          constraints:
-              type: uint32
-
-    - label: "Query SoftwareVersionString"
-      command: "readAttribute"
-      attribute: "SoftwareVersionString"
-      response:
-          constraints:
-              type: string
-              minLength: 1
-              maxLength: 64
-              format: "ASCII" # Step 10 11.2.3.1-10 Verify it uses 7-bit ASCII alphanumeric and punctuation characters
-
-    - label: "Query ManufacturingDate"
-      command: "readAttribute"
-      attribute: "ManufacturingDate"
-      PICS: MANF_DATE
-      optional: true
-      response:
-          constraints:
-              type: string
-              minLength: 8
-              maxLength: 16
-              format: "ISO 8601" # Step 11  11.2.3.1-11 Verify if the first 8 characters specify date according to ISO 8601, i.e, YYYYMMDD
-
-    - label: "Query PartNumber"
-      command: "readAttribute"
-      attribute: "PartNumber"
-      PICS: PART_NUM
-      optional: true
-      response:
-          constraints:
-              type: string
-              maxLength: 32
-
-    - label: "Query ProductURL"
-      command: "readAttribute"
-      attribute: "ProductURL"
-      optional: true
-      response:
-          constraints:
-              type: string
-              maxLength: 256
-              format: "RFC3986" # Step 13 11.2.3.1-13 Verify that it follows the syntax rules specified in RFC 3986
-
-    - label: "Query ProductLabel"
-      command: "readAttribute"
-      attribute: "ProductLabel"
-      optional: true
-      response:
-          constraints:
-              type: string
-              maxLength: 64
-
-    - label: "Query SerialNumber"
-      command: "readAttribute"
-      attribute: "SerialNumber"
-      optional: true
-      response:
-          constraints:
-              type: string
-              maxLength: 32
-
-    - label: "Query LocalConfigDisabled"
-      command: "readAttribute"
-      attribute: "LocalConfigDisabled"
-      optional: true
-      response:
-          constraints:
-              type: boolean
-
-    - label: "Query Reachable"
-      command: "readAttribute"
-      attribute: "Reachable"
-      optional: true
-      response:
-          constraints:
-              type: boolean
-
-    - label: "Query UniqueID"
-      command: "readAttribute"
-      attribute: "UniqueID"
-      optional: true
-      response:
-          constraints:
-              type: string
-              maxLength: 32
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool basic read cluster-revision 1 0
+
+
+          [1651214669.313397][2666:2671] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_FFFD DataVersion: 158558310
+          [1651214669.313472][2666:2671] CHIP:TOO:   ClusterRevision: 1
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool basic read feature-map 1 0
+
+          [1653459580.065669][29174:29179] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_FFFC DataVersion: 46104872
+          [1653459580.065758][29174:29179] CHIP:TOO:   FeatureMap: 0
+          [1653459580.065936][29174:29179] CHIP:EM: Sending Standalone Ack for MessageCounter:14961519 on exchange 31457i
+      disabled: true
+
+    - label: "TH reads AttributeList from DUT"
+      verification: |
+          ./chip-tool basic read attribute-list 1 0
+
+          [1651214730.462010][2685:2690] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_FFFB DataVersion: 158558310
+          [1651214730.462091][2685:2690] CHIP:TOO:   AttributeList: 24 entries
+          [1651214730.462123][2685:2690] CHIP:TOO:     [1]: 0
+          [1651214730.462158][2685:2690] CHIP:TOO:     [2]: 1
+          [1651214730.462183][2685:2690] CHIP:TOO:     [3]: 2
+          [1651214730.462207][2685:2690] CHIP:TOO:     [4]: 3
+          [1651214730.462241][2685:2690] CHIP:TOO:     [5]: 4
+          [1651214730.462266][2685:2690] CHIP:TOO:     [6]: 5
+          [1651214730.462300][2685:2690] CHIP:TOO:     [7]: 6
+          [1651214730.462325][2685:2690] CHIP:TOO:     [8]: 7
+          [1651214730.462349][2685:2690] CHIP:TOO:     [9]: 8
+          [1651214730.462383][2685:2690] CHIP:TOO:     [10]: 9
+          [1651214730.462407][2685:2690] CHIP:TOO:     [11]: 10
+          [1651214730.462441][2685:2690] CHIP:TOO:     [12]: 11
+          [1651214730.462465][2685:2690] CHIP:TOO:     [13]: 12
+          [1651214730.462499][2685:2690] CHIP:TOO:     [14]: 13
+          [1651214730.462523][2685:2690] CHIP:TOO:     [15]: 14
+          [1651214730.462556][2685:2690] CHIP:TOO:     [16]: 15
+          [1651214730.462580][2685:2690] CHIP:TOO:     [17]: 16
+          [1651214730.462615][2685:2690] CHIP:TOO:     [18]: 17
+          [1651214730.462640][2685:2690] CHIP:TOO:     [19]: 18
+          [1651214730.462676][2685:2690] CHIP:TOO:     [20]: 19
+          [1651214730.462700][2685:2690] CHIP:TOO:     [21]: 65528
+          [1651214730.462736][2685:2690] CHIP:TOO:     [22]: 65529
+          [1651214730.462761][2685:2690] CHIP:TOO:     [23]: 65531
+          [1651214730.462799][2685:2690] CHIP:TOO:     [24]: 65533
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          out of scope for V1.0
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool basic read accepted-command-list 1 0
+
+
+          [1651214820.355561][2695:2700] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_FFF9 DataVersion: 158558310
+          [1651214820.355673][2695:2700] CHIP:TOO:   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool basic read generated-command-list 1 0
+
+
+          [1651214861.208575][2702:2707] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_FFF8 DataVersion: 158558310
+          [1651214861.208682][2702:2707] CHIP:TOO:   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_2.yaml
index e4f4c86f822396..2e66c83c99b59e 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_1_2.yaml
@@ -21,78 +21,78 @@ config:
     nodeId: 0x12344321
     cluster: "Basic"
     endpoint: 0
+
 tests:
-    - label: "Test Step"
-      verification: |
-          chip-tool verification steps
-      disabled: true
     - label: "Commission DUT to TH"
-      verification: |4+
+      verification: |
 
       disabled: true
+
     - label: "TH reads the ClusterRevision from DUT"
       verification: |
-          ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool operationalcredentials read cluster-revision 1 0
+          ./chip-tool operationalcredentials read cluster-revision 1 0
+
 
-          [1649422711.953376][3312:3317] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFFD DataVersion: 698307857
-          [1649422711.953487][3312:3317] CHIP:TOO:   ClusterRevision: 1
-          [1649422711.953574][3312:3317] CHIP:EM: Sending Standalone Ack for MessageCounter:9018855 on exchange 29017i
+          [1651215068.211617][3121:3134] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFFD DataVersion: 3662641304
+          [1651215068.211771][3121:3134] CHIP:TOO:   ClusterRevision: 1
       disabled: true
+
     - label: "TH reads the FeatureMap from DUT"
       verification: |
-          ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool operationalcredentials read feature-map 1 0
+          ./chip-tool operationalcredentials read feature-map 1 0
 
-          [1649423105.884270][3334:3339] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-          [1649423105.884373][3334:3339] CHIP:EM: Sending Standalone Ack for MessageCounter:5943193 on exchange 30408i
+          [1653459610.168569][29181:29186] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFFC DataVersion: 760966542
+          [1653459610.168681][29181:29186] CHIP:TOO:   FeatureMap: 0
+          [1653459610.168856][29181:29186] CHIP:EM: Sending Standalone Ack for MessageCounter:15955740 on exchange 48874i
       disabled: true
+
     - label: "TH reads AttributeList from DUT"
       verification: |
-          ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool operationalcredentials read attribute-list 1 0
+          ./chip-tool operationalcredentials read attribute-list 1 0
 
-          [1649423226.138143][3345:3350] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFFB DataVersion: 698307857
-          [1649423226.138237][3345:3350] CHIP:TOO:   AttributeList: 10 entries
-          [1649423226.138287][3345:3350] CHIP:TOO:     [1]: 0
-          [1649423226.138317][3345:3350] CHIP:TOO:     [2]: 1
-          [1649423226.138345][3345:3350] CHIP:TOO:     [3]: 2
-          [1649423226.138373][3345:3350] CHIP:TOO:     [4]: 3
-          [1649423226.138401][3345:3350] CHIP:TOO:     [5]: 4
-          [1649423226.138429][3345:3350] CHIP:TOO:     [6]: 5
-          [1649423226.138457][3345:3350] CHIP:TOO:     [7]: 65528
-          [1649423226.138485][3345:3350] CHIP:TOO:     [8]: 65529
-          [1649423226.138513][3345:3350] CHIP:TOO:     [9]: 65531
-          [1649423226.138541][3345:3350] CHIP:TOO:     [10]: 65533
-          [1649423226.138683][3345:3350] CHIP:EM: Sending Standalone Ack for MessageCounter:185027 on exchange 31246i
+          [1651215134.318088][3238:3243] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFFB DataVersion: 3662641304
+          [1651215134.318171][3238:3243] CHIP:TOO:   AttributeList: 10 entries
+          [1651215134.318204][3238:3243] CHIP:TOO:     [1]: 0
+          [1651215134.318231][3238:3243] CHIP:TOO:     [2]: 1
+          [1651215134.318256][3238:3243] CHIP:TOO:     [3]: 2
+          [1651215134.318278][3238:3243] CHIP:TOO:     [4]: 3
+          [1651215134.318303][3238:3243] CHIP:TOO:     [5]: 4
+          [1651215134.318328][3238:3243] CHIP:TOO:     [6]: 5
+          [1651215134.318355][3238:3243] CHIP:TOO:     [7]: 65528
+          [1651215134.318381][3238:3243] CHIP:TOO:     [8]: 65529
+          [1651215134.318407][3238:3243] CHIP:TOO:     [9]: 65531
+          [1651215134.318432][3238:3243] CHIP:TOO:     [10]: 65533
       disabled: true
+
     - label: "TH reads EventList from DUT"
       verification: |
-          No Event-list is on attributes list
+          out of scope for V1.0
       disabled: true
+
     - label: "TH reads AcceptedCommandList from DUT"
       verification: |
-          ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool operationalcredentials read  accepted-command-list 1 0
-
-          [1649423499.262187][3365:3370] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFF9 DataVersion: 698307857
-          [1649423499.262316][3365:3370] CHIP:TOO:   AcceptedCommandList: 9 entries
-          [1649423499.262386][3365:3370] CHIP:TOO:     [1]: 0
-          [1649423499.262430][3365:3370] CHIP:TOO:     [2]: 2
-          [1649423499.262472][3365:3370] CHIP:TOO:     [3]: 4
-          [1649423499.262513][3365:3370] CHIP:TOO:     [4]: 6
-          [1649423499.262553][3365:3370] CHIP:TOO:     [5]: 7
-          [1649423499.262593][3365:3370] CHIP:TOO:     [6]: 9
-          [1649423499.262635][3365:3370] CHIP:TOO:     [7]: 10
-          [1649423499.262676][3365:3370] CHIP:TOO:     [8]: 11
-          [1649423499.262717][3365:3370] CHIP:TOO:     [9]: 12
-          [1649423499.262866][3365:3370] CHIP:EM: Sending Standalone Ack for MessageCounter:8288254 on exchange 44255i
+          ./chip-tool operationalcredentials read  accepted-command-list 1 0
+          [1651215195.652771][3248:3253] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFF9 DataVersion: 3662641304
+          [1651215195.652861][3248:3253] CHIP:TOO:   AcceptedCommandList: 9 entries
+          [1651215195.652900][3248:3253] CHIP:TOO:     [1]: 0
+          [1651215195.652931][3248:3253] CHIP:TOO:     [2]: 2
+          [1651215195.652962][3248:3253] CHIP:TOO:     [3]: 4
+          [1651215195.652992][3248:3253] CHIP:TOO:     [4]: 6
+          [1651215195.653022][3248:3253] CHIP:TOO:     [5]: 7
+          [1651215195.653051][3248:3253] CHIP:TOO:     [6]: 9
+          [1651215195.653082][3248:3253] CHIP:TOO:     [7]: 10
+          [1651215195.653112][3248:3253] CHIP:TOO:     [8]: 11
+          [1651215195.653142][3248:3253] CHIP:TOO:     [9]: 12
       disabled: true
+
     - label: "TH reads GeneratedCommandList from DUT"
       verification: |
-          ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool operationalcredentials read generated-command-list 1 0
+          ./chip-tool operationalcredentials read generated-command-list 1 0
 
-          [1649423586.012638][3376:3381] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFF8 DataVersion: 698307857
-          [1649423586.012746][3376:3381] CHIP:TOO:   GeneratedCommandList: 4 entries
-          [1649423586.012809][3376:3381] CHIP:TOO:     [1]: 1
-          [1649423586.012848][3376:3381] CHIP:TOO:     [2]: 3
-          [1649423586.012884][3376:3381] CHIP:TOO:     [3]: 5
-          [1649423586.012919][3376:3381] CHIP:TOO:     [4]: 8
-          [1649423586.013057][3376:3381] CHIP:EM: Sending Standalone Ack for MessageCounter:4917669 on exchange 24524i
+          [1651215270.028855][3260:3265] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_FFF8 DataVersion: 3662641304
+          [1651215270.028955][3260:3265] CHIP:TOO:   GeneratedCommandList: 4 entries
+          [1651215270.029001][3260:3265] CHIP:TOO:     [1]: 1
+          [1651215270.029039][3260:3265] CHIP:TOO:     [2]: 3
+          [1651215270.029076][3260:3265] CHIP:TOO:     [3]: 5
+          [1651215270.029112][3260:3265] CHIP:TOO:     [4]: 8
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_3.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_3.yaml
new file mode 100644
index 00000000000000..0c0905ff2cd7a4
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DM_1_3.yaml
@@ -0,0 +1,113 @@
+# 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:
+    10.1.3. [TC-DM-1.3] Global Attributes for Networking commissioning cluster
+    [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool networkcommissioning read cluster-revision  1 0
+
+          [1649244866.275684][30440:30446] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFD DataVersion: 2702518944
+          [1649244866.277721][30440:30446] CHIP:TOO:   ClusterRevision: 1
+          [1649244866.277827][30440:30446] CHIP:EM: Sending Standalone Ack for MessageCounter:10092551 on exchange 64234i
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool networkcommissioning read feature-map 1 0
+
+          [1651215443.195852][3285:3290] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 2584224280
+          [1651215443.195939][3285:3290] CHIP:TOO:   FeatureMap: 4
+      disabled: true
+
+    - label: "TH reads AttributeList from DUT"
+      verification: |
+          ./chip-tool networkcommissioning read attribute-list 1 0
+
+          [1651215479.539148][3293:3298] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFB DataVersion: 2584224280
+          [1651215479.539230][3293:3298] CHIP:TOO:   AttributeList: 13 entries
+          [1651215479.539262][3293:3298] CHIP:TOO:     [1]: 0
+          [1651215479.539288][3293:3298] CHIP:TOO:     [2]: 1
+          [1651215479.539323][3293:3298] CHIP:TOO:     [3]: 2
+          [1651215479.539348][3293:3298] CHIP:TOO:     [4]: 3
+          [1651215479.539373][3293:3298] CHIP:TOO:     [5]: 4
+          [1651215479.539397][3293:3298] CHIP:TOO:     [6]: 5
+          [1651215479.539420][3293:3298] CHIP:TOO:     [7]: 6
+          [1651215479.539444][3293:3298] CHIP:TOO:     [8]: 7
+          [1651215479.539468][3293:3298] CHIP:TOO:     [9]: 65528
+          [1651215479.539493][3293:3298] CHIP:TOO:     [10]: 65529
+          [1651215479.539517][3293:3298] CHIP:TOO:     [11]: 65531
+          [1651215479.539541][3293:3298] CHIP:TOO:     [12]: 65532
+          [1651215479.539564][3293:3298] CHIP:TOO:     [13]: 65533
+      disabled: true
+
+    - label: "TH reads EventList from the DUT"
+      verification: |
+          out of scope for V1.0
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          In case of chip tool, here is an example command to use
+
+          ./chip-tool networkcommissioning read generated-command-list 1 0
+
+          [1652255227.644007][7509:7514] CHIP:DMG:         SuppressResponse = true,
+          [1652255227.644083][7509:7514] CHIP:DMG:         InteractionModelRevision = 1
+          [1652255227.644139][7509:7514] CHIP:DMG: }
+          [1652255227.644480][7509:7514] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9 DataVersion: 2580824733
+          [1652255227.644609][7509:7514] CHIP:TOO:   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ( WiFi) ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read generated-command-list 1 0
+
+          [1650370123.417759][42418:42423] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 3182776035
+          [1650370123.417866][42418:42423] CHIP:TOO:   GeneratedCommandList: 3 entries
+          [1650370123.417938][42418:42423] CHIP:TOO:     [1]: 1
+          [1650370123.417977][42418:42423] CHIP:TOO:     [2]: 5
+          [1650370123.418013][42418:42423] CHIP:TOO:     [3]: 7
+          [1650370123.418143][42418:42423] CHIP:EM: Sending Standalone Ack for MessageCounter:759910 on exchange 25409i
+
+           ( Thread ) ./chip-tool networkcommissioning read generated-command-list 51 0
+
+          [1650370342.693373][7450:7455] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 1032683896
+          [1650370342.693536][7450:7455] CHIP:TOO:   GeneratedCommandList: 2 entries
+          1650370123.417938][42418:42423] CHIP:TOO:     [1]: 1
+          [1650370123.417977][42418:42423] CHIP:TOO:     [2]: 5
+          [1650370123.418013][42418:42423] CHIP:TOO:     [3]: 7
+          [1650370342.693995][7450:7455] CHIP:EM: Sending Standalone Ack for MessageCounter:2345375 on exchange 25146i
+      disabled: true
+
+    - label:
+          "NOTE: Repeat the test case by Commission DUT to TH on the Thread and
+          Ethernet setups"
+      verification: |
+
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_4.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_4.yaml
deleted file mode 100644
index bba40c0640b062..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DM_1_4.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 3.1.4. [TC-DM-1.4] Basic Information Cluster Events [DUT - Controller]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Simulate a reboot on the TH"
-      verification: |
-          ./chip-tool basic read-event-by-id 0x0 1 0
-      disabled: true
-
-    - label: "Simulate a Shut down on the TH"
-      verification: |
-          ./chip-tool basic read-event-by-id 0x01 1 0
-      disabled: true
-
-    - label: "Simulate a reboot on the TH"
-      verification: |
-
-      disabled: true
-
-    - label: "Simulate a Factory Reset the TH"
-      verification: |
-          ./chip-tool basic read-event-by-id 0x0 1 0
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_2_1.yaml
index 09d68ad2422ee8..a4b344e1f38870 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_2_1.yaml
@@ -13,7 +13,7 @@
 # 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.2.1. [TC-DM-2.1] Operational Credential Commands
+name: 10.2.1. [TC-DM-2.1] Basic Information Cluster Server Attributes
 
 config:
     nodeId: 0x12344321
@@ -21,83 +21,193 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission DUT to TH"
-      verification: |
-
-      disabled: true
-
-    - label: "TH Sends Attestation Request to DUT"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/14395
-      disabled: true
-
-    - label: "TH Sends Attestation Certificate Chain Request to DUT"
-      verification: |
-          ./chip-tool operationalcredentials certificate-chain-request 1 1 0
-      disabled: true
-
-    - label: "TH Sends CSR Request to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH Sends Add Trusted Root Certificate Request to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH Sends Add Op Cert Request to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "Verify DUT and TH are on the same Fabric"
-      verification: |
-
-      disabled: true
-
-    - label: "TH Sends Update Op Cert Request to DUT"
-      verification: |
-
-      disabled: true
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Query Data Model Revision"
+      command: "readAttribute"
+      attribute: "DataModelRevision"
+      response:
+          constraints:
+              type: uint16
+
+    - label: "Query Vendor Name"
+      command: "readAttribute"
+      attribute: "VendorName"
+      response:
+          constraints:
+              type: string
+              maxLength: 32
+
+    - label: "Query VendorID"
+      command: "readAttribute"
+      attribute: "VendorID"
+      response:
+          constraints:
+              type: uint16
+
+    - label: "Query Product Name"
+      command: "readAttribute"
+      attribute: "ProductName"
+      response:
+          constraints:
+              type: string
+              maxLength: 32
+
+    - label: "Query ProductID"
+      command: "readAttribute"
+      attribute: "ProductID"
+      response:
+          constraints:
+              type: uint16
+
+    - label: "Query Node Label"
+      command: "readAttribute"
+      attribute: "NodeLabel"
+      response:
+          constraints:
+              type: string
+              maxLength: 32
+
+    - label: "Query User Location"
+      command: "readAttribute"
+      attribute: "Location"
+      response:
+          constraints:
+              type: string
+              maxLength: 16
+
+    - label: "Query HardwareVersion"
+      command: "readAttribute"
+      attribute: "HardwareVersion"
+      response:
+          constraints:
+              type: uint16
+
+    - label: "Query HardwareVersionString"
+      command: "readAttribute"
+      attribute: "HardwareVersionString"
+      response:
+          constraints:
+              type: string
+              minLength: 1
+              maxLength: 64
 
     - label:
-          "TH Sends Update Op Cert Request to DUT with a Fabric Label not
-          already in use"
+          "TH reads SoftwareVersionString from the DUT and Verify it is of type
+          string and verify the format"
       verification: |
-
-      disabled: true
+          ./chip-tool basic read  software-version 1 0
+
+          [1654069233.033848][11164:11169] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0009 DataVersion: 2079473958
+          [1654069233.033880][11164:11169] CHIP:TOO:   SoftwareVersion: 1
+          [1654069233.033902][11164:11169] CHIP:EM: Sending Standalone Ack for MessageCounter:3270959 on exchange 29106i
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label:
-          "TH Sends Update Op Cert Request to DUT with a Fabric label already in
-          use"
+          "TH reads ManufacturingDate from the DUT and Verify it is of type
+          string and verify the format"
       verification: |
-
-      disabled: true
+          ./chip-tool basic read manufacturing-date 1 0
+
+
+          [1640336849.202099][14335:14340] CHIP:DMG:
+          [1640336849.202186][14335:14340] CHIP:DMG:      SuppressResponse = true,
+          [1640336849.202239][14335:14340] CHIP:DMG: }
+          [1640336849.202479][14335:14340] CHIP:TOO: Basic.ManufacturingDate response: 20210614123456ZZ
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Query PartNumber"
+      command: "readAttribute"
+      attribute: "PartNumber"
+      PICS: PART_NUM
+      optional: true
+      response:
+          constraints:
+              type: string
+              maxLength: 32
 
     - label:
-          "TH Sends Remove Fabric Request to DUT with a non-Valid Fabric index"
-      verification: |
-          ./chip-tool operationalcredentials remove-fabric 2 1 0
-
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          [1646390608.860327][6336:6341] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          [1646390608.860465][6336:6341] CHIP:TOO:   NOCResponse: {
-          [1646390608.860548][6336:6341] CHIP:TOO:     statusCode: 11
-          [1646390608.860611][6336:6341] CHIP:TOO:    }
-          [1646390608.860695][6336:6341] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1646390608.860801][6336:6341] CHIP:EM: Sending Standalone Ack for MessageCounter:1477607 on exchange 51257i
-      disabled: true
-
-    - label: "TH Sends Remove Fabric Request to DUT with a valid Fabric ID"
+          "TH reads ProductURL from the DUT and Verify it is of type string and
+          verify the format"
       verification: |
-          ./chip-tool operationalcredentials remove-fabric 1 1 0
-
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          [1646390764.134501][6347:6352] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          [1646390764.134673][6347:6352] CHIP:TOO:   NOCResponse: {
-          [1646390764.134894][6347:6352] CHIP:TOO:     statusCode: 0
-          [1646390764.134985][6347:6352] CHIP:TOO:     fabricIndex: 1
-          [1646390764.135047][6347:6352] CHIP:TOO:    }
-          [1646390764.135157][6347:6352] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
+          ./chip-tool basic read product-url 1 0
+
+
+          [1640337847.187590][14399:14404] CHIP:DMG:
+          [1640337847.187633][14399:14404] CHIP:DMG:      SuppressResponse = true,
+          [1640337847.187676][14399:14404] CHIP:DMG: }
+          [1640337847.187868][14399:14404] CHIP:TOO: Basic.ProductURL response:
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Query ProductLabel"
+      command: "readAttribute"
+      attribute: "ProductLabel"
+      optional: true
+      response:
+          constraints:
+              type: string
+              maxLength: 64
+
+    - label: "Query SerialNumber"
+      command: "readAttribute"
+      attribute: "SerialNumber"
+      optional: true
+      response:
+          constraints:
+              type: string
+              maxLength: 32
+
+    - label: "Query LocalConfigDisabled"
+      command: "readAttribute"
+      attribute: "LocalConfigDisabled"
+      optional: true
+      response:
+          constraints:
+              type: boolean
+
+    - label: "Query Reachable"
+      command: "readAttribute"
+      attribute: "Reachable"
+      optional: true
+      response:
+          constraints:
+              type: boolean
+
+    - label: "Query UniqueID"
+      command: "readAttribute"
+      attribute: "UniqueID"
+      optional: true
+      response:
+          constraints:
+              type: string
+              maxLength: 32
diff --git a/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml
index 625417b1fad81d..92777da7006dd4 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 3.2.2. [TC-DM-2.2] Operational Credential Attributes
+name: 10.2.2. [TC-DM-2.2] Basic Information Cluster Events
 
 config:
     nodeId: 0x12344321
-    cluster: "Operational Credentials"
+    cluster: "Basic"
     endpoint: 0
 
 tests:
@@ -28,65 +28,80 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Query NOCs"
+    - label: "Query SoftwareVersion"
       command: "readAttribute"
-      # TODO: Enabled and update value when SDK supports this.
-      disabled: true
-      attribute: "NOCs"
-      PICS: DM_ICACERT
+      attribute: "SoftwareVersion"
       response:
-          value: [{ NOC: 0 }]
+          saveAs: SoftwareVersionValue
           constraints:
-              type: list
-
-    - label: "Query NOCs"
-      command:
-          "readAttribute"
-          # TODO: Enabled and update value when SDK supports this.
-      disabled: true
-      attribute: "NOCs"
-      PICS: DM_ICACERT
-      response:
-          value: [{ NOC: 0, ICAC: 0 }]
-          constraints:
-              type: list
+              type: uint8
 
-    - label: "Query fabrics list"
+    - label: "Query Reachable Fabrics"
       command: "readAttribute"
-      attribute: "Fabrics"
+      attribute: "Reachable"
       response:
-          value: [
-                  {
-                      # We really don't know what values to expect for any of
-                      # the fields, except Label.
-                      Label: "",
-                  },
-              ]
           constraints:
-              type: list
+              type: bool
 
-    - label: "Query Supported Fabrics"
-      command: "readAttribute"
-      attribute: "SupportedFabrics"
-      response:
-          value: 16
-          constraints:
-              type: uint8
+    - label: "Reboot target device"
+      cluster: "SystemCommands"
+      command: "Reboot"
 
-    - label: "Query Commissioned Fabrics"
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Query SoftwareVersion"
       command: "readAttribute"
-      attribute: "CommissionedFabrics"
+      attribute: "SoftwareVersion"
       response:
-          value: 1
-          constraints:
-              type: uint8
+          value: SoftwareVersionValue
+
+    ##Event 11343 implementation not done
+    - label: "Reboot target device"
+      cluster: "SystemCommands"
+      command: "Reboot"
+
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Factory Reset the accessory"
+      cluster: "SystemCommands"
+      command: "FactoryReset"
+
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Reboot target device"
+      cluster: "SystemCommands"
+      command: "Reboot"
+
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
-    - label: "Query User Trusted Root Certificates"
+    ###Event 11343 implementation not done
+    - label: "Query Reachable Fabrics"
       command: "readAttribute"
-      attribute: "TrustedRootCertificates"
+      attribute: "Reachable"
       response:
-          # Can't check for the expected value here, since we don't know it.
-          # TODO: Check the length, at least?
-          # value: [237]
           constraints:
-              type: list
+              type: bool
diff --git a/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml
index e31f0ff97c9d7e..2f50455b8bb285 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml
@@ -12,48 +12,100 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 10.2.3. [TC-DM-2.3] Operational Credential Commands [DUT - Commissioner]
+name:
+    10.2.3. [TC-DM-2.3] Basic Information Cluster Server Attributes [DUT -
+    Controller]
 
 config:
     nodeId: 0x12344321
-    cluster: "Operational Credentials"
+    cluster: "Basic"
     endpoint: 0
 
 tests:
-    - label: "Wait for Arm Fail Safe"
-      wait: "ArmFailSafe"
-      cluster: "General Commissioning"
+    - label: "Wait for the device to be commissioned"
+      cluster: "DelayCommands"
+      command: "WaitForCommissioning"
 
-    - label: "Wait for Set Regulatory Config"
-      wait: "SetRegulatoryConfig"
-      cluster: "General Commissioning"
+    - label: "Log OnOff Test Startup"
+      cluster: "LogCommands"
+      command: "Log"
+      arguments:
+          values:
+              - name: "message"
+                value: "*** Basic Cluster Tests Ready"
 
-    - label: "Wait for Attestation Certificate Chain Request"
-      wait: "CertificateChainRequest"
+    - label: "Query Data Model Revision"
+      wait: "readAttribute"
+      attribute: "DataModelRevision"
 
-    - label: "Wait for Attestation Certificate Chain Request"
-      wait: "CertificateChainRequest"
+    - label: "Query Vendor Name"
+      wait: "readAttribute"
+      attribute: "VendorName"
 
-    - label: "Wait for Attestation Request"
-      wait: "AttestationRequest"
+    - label: "Query VendorID"
+      wait: "readAttribute"
+      attribute: "VendorID"
 
-    - label: "Wait for CSR Request"
-      wait: "CSRRequest"
+    - label: "Query Product Name"
+      wait: "readAttribute"
+      attribute: "ProductName"
 
-    - label: "Wait for Add Trusted Root Certificate Request"
-      wait: "AddTrustedRootCertificate"
+    - label: "Query ProductID"
+      wait: "readAttribute"
+      attribute: "ProductID"
 
-    - label: "Wait for Add Op NOC"
-      wait: "AddNOC"
+    - label: "Query Node Label"
+      wait: "readAttribute"
+      attribute: "NodeLabel"
 
-    - label: "Wait for Commissioning Complete"
-      wait: "CommissioningComplete"
-      cluster: "General Commissioning"
+    - label: "Query User Location"
+      wait: "readAttribute"
+      attribute: "Location"
 
-    - label: "Wait 3000ms"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 3000
+    - label: "Query HardwareVersion"
+      wait: "readAttribute"
+      attribute: "HardwareVersion"
+
+    - label: "Query HardwareVersionString"
+      wait: "readAttribute"
+      attribute: "HardwareVersionString"
+
+    - label: "Query SoftwareVersion"
+      wait: "readAttribute"
+      attribute: "SoftwareVersion"
+
+    - label: "Query SoftwareVersionString"
+      wait: "readAttribute"
+      attribute: "SoftwareVersionString"
+
+    - label: "Query ManufacturingDate"
+      wait: "readAttribute"
+      attribute: "ManufacturingDate"
+
+    - label: "Query PartNumber"
+      wait: "readAttribute"
+      attribute: "PartNumber"
+
+    - label: "Query ProductURL"
+      wait: "readAttribute"
+      attribute: "ProductURL"
+
+    - label: "Query ProductLabel"
+      wait: "readAttribute"
+      attribute: "ProductLabel"
+
+    - label: "Query SerialNumber"
+      wait: "readAttribute"
+      attribute: "SerialNumber"
+
+    - label: "Query LocalConfigDisabled"
+      wait: "readAttribute"
+      attribute: "LocalConfigDisabled"
+
+    - label: "Query Reachable"
+      wait: "readAttribute"
+      attribute: "Reachable"
+
+    - label: "Query UniqueID"
+      wait: "readAttribute"
+      attribute: "UniqueID"
diff --git a/src/app/tests/suites/certification/Test_TC_DM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_DM_2_4.yaml
index 59e4b7239bc44e..c53bc44662b465 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_2_4.yaml
@@ -13,7 +13,7 @@
 # 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: 10.2.4. [TC-DM-2.4] Operational Credential Attributes [DUT - Commissioner]
+name: 3.1.4. [TC-DM-2.4] Basic Information Cluster Events [DUT - Controller]
 
 config:
     nodeId: 0x12344321
@@ -21,27 +21,101 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH to DUT"
+    - label: "Simulate a reboot on the TH"
       verification: |
+          ./chip-tool basic read-event start-up 1 0
 
+
+          [1651229405.704017][2825:2825] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:11744980 on exchange 35983r
+          [1651229405.704064][2825:2825] CHIP:EM: Handling via exchange: 35983r, Delegate: 0xaaaae659a088
+          [1651229405.704208][2825:2825] CHIP:IM: Received Read request
+          [1651229405.704271][2825:2825] CHIP:DMG: ReadRequestMessage =
+          [1651229405.704303][2825:2825] CHIP:DMG: {
+          [1651229405.704329][2825:2825] CHIP:DMG:        EventPathIBs =
+          [1651229405.704362][2825:2825] CHIP:DMG:        [
+          [1651229405.704392][2825:2825] CHIP:DMG:                EventPath =
+          [1651229405.704428][2825:2825] CHIP:DMG:                {
+          [1651229405.704463][2825:2825] CHIP:DMG:                        Endpoint = 0x0,
+          [1651229405.704501][2825:2825] CHIP:DMG:                        Cluster = 0x28,
+          [1651229405.704539][2825:2825] CHIP:DMG:                        Event = 0x0,
+          [1651229405.704575][2825:2825] CHIP:DMG:                },
+          [1651229405.704613][2825:2825] CHIP:DMG:
+          [1651229405.704641][2825:2825] CHIP:DMG:        ],
+          [1651229405.704676][2825:2825] CHIP:DMG:
+          [1651229405.704707][2825:2825] CHIP:DMG:        isFabricFiltered = true,
+          [1651229405.704737][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651229405.704766][2825:2825] CHIP:DMG: },
+      disabled: true
+
+    - label: "Simulate a Shut down on the TH"
+      verification: |
+          1. Launch chip-tool into interactive mode with the command ./chip-tool interactive start
+
+          2. Turn down the DUT and run below command in interactive mode shell
+          basic subscribe-event shut-down 1 3 1 0
+
+          CHIP:ZCL: Emitting ShutDown event
+          [1653392378.033015][19010:19010] CHIP:EVL: LogEvent event number: 0x0000000000000005 priority: 2, endpoint id:  0x0 cluster id: 0x0000_0028 event id: 0x1 Sys timestamp: 0x0000000006AD1297
       disabled: true
 
-    - label: "DUT reads the NOCs attribute from TH"
+    - label: "Simulate a reboot on the TH"
       verification: |
-          ./chip-tool operationalcredentials read nocs 1 0
+          ./chip-tool basic read-event start-up 1 0
+
+
+          [1651229405.704017][2825:2825] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:11744980 on exchange 35983r
+          [1651229405.704064][2825:2825] CHIP:EM: Handling via exchange: 35983r, Delegate: 0xaaaae659a088
+          [1651229405.704208][2825:2825] CHIP:IM: Received Read request
+          [1651229405.704271][2825:2825] CHIP:DMG: ReadRequestMessage =
+          [1651229405.704303][2825:2825] CHIP:DMG: {
+          [1651229405.704329][2825:2825] CHIP:DMG:        EventPathIBs =
+          [1651229405.704362][2825:2825] CHIP:DMG:        [
+          [1651229405.704392][2825:2825] CHIP:DMG:                EventPath =
+          [1651229405.704428][2825:2825] CHIP:DMG:                {
+          [1651229405.704463][2825:2825] CHIP:DMG:                        Endpoint = 0x0,
+          [1651229405.704501][2825:2825] CHIP:DMG:                        Cluster = 0x28,
+          [1651229405.704539][2825:2825] CHIP:DMG:                        Event = 0x0,
+          [1651229405.704575][2825:2825] CHIP:DMG:                },
+          [1651229405.704613][2825:2825] CHIP:DMG:
+          [1651229405.704641][2825:2825] CHIP:DMG:        ],
+          [1651229405.704676][2825:2825] CHIP:DMG:
+          [1651229405.704707][2825:2825] CHIP:DMG:        isFabricFiltered = true,
+          [1651229405.704737][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651229405.704766][2825:2825] CHIP:DMG: },
       disabled: true
 
-    - label: "DUT reads the Fabrics attribute from TH"
+    - label: "Simulate a Factory Reset the TH"
       verification: |
-          ./chip-tool operationalcredentials read fabrics 1 0
+          ./chip-tool basic read-event  leave 1 0
       disabled: true
 
-    - label: "DUT reads the SupportedFabrics attribute from TH"
+    - label: "Simulate a reboot on the TH"
       verification: |
-          ./chip-tool operationalcredentials read supported-fabrics 1 0
+          ./chip-tool basic read-event start-up 1 0
+
+
+          [1651229405.704017][2825:2825] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:11744980 on exchange 35983r
+          [1651229405.704064][2825:2825] CHIP:EM: Handling via exchange: 35983r, Delegate: 0xaaaae659a088
+          [1651229405.704208][2825:2825] CHIP:IM: Received Read request
+          [1651229405.704271][2825:2825] CHIP:DMG: ReadRequestMessage =
+          [1651229405.704303][2825:2825] CHIP:DMG: {
+          [1651229405.704329][2825:2825] CHIP:DMG:        EventPathIBs =
+          [1651229405.704362][2825:2825] CHIP:DMG:        [
+          [1651229405.704392][2825:2825] CHIP:DMG:                EventPath =
+          [1651229405.704428][2825:2825] CHIP:DMG:                {
+          [1651229405.704463][2825:2825] CHIP:DMG:                        Endpoint = 0x0,
+          [1651229405.704501][2825:2825] CHIP:DMG:                        Cluster = 0x28,
+          [1651229405.704539][2825:2825] CHIP:DMG:                        Event = 0x0,
+          [1651229405.704575][2825:2825] CHIP:DMG:                },
+          [1651229405.704613][2825:2825] CHIP:DMG:
+          [1651229405.704641][2825:2825] CHIP:DMG:        ],
+          [1651229405.704676][2825:2825] CHIP:DMG:
+          [1651229405.704707][2825:2825] CHIP:DMG:        isFabricFiltered = true,
+          [1651229405.704737][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651229405.704766][2825:2825] CHIP:DMG: },
       disabled: true
 
-    - label: "DUT reads the CommissionedFabrics attribute from TH"
+    - label: "Simulate a Reachable attribute change on the TH"
       verification: |
-          ./chip-tool operationalcredentials read commissioned-fabrics 1 0
+          ./chip-tool basic read-event reachable-changed 1 0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml
index eb83e45c5553b6..0cb43fa8f9785a 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml
@@ -11,35 +11,358 @@
 # 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: 10.3.1. [TC-DM-3.1] Network Commissioning Attributes
+name:
+    3.2.1. [TC-DM-3.1] Attribute-NOCs, TrustedRootCertificates list validation
+    [DUT-Commissionee]
 
 config:
     nodeId: 0x12344321
-    cluster: "Network Commissioning"
+    cluster: "Basic"
     endpoint: 0
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    - label: "Query MaxNetworks"
-      command: "readAttribute"
-      attribute: "MaxNetworks"
-      optional: true
-      response:
-          constraints:
-              type: uint8
-
-    - label: "Query Networks"
-      command: "readAttribute"
-      attribute: "Networks"
-      optional: true
-      response:
-          constraints:
-              type: list
+    - label:
+          "Factory Reset DUT (to ensure NOC list is empty at the beginning of
+          the following steps)"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "Start the commissioning process DUT by TH1 on a first Fabric"
+      verification: |
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841
+
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "TH sends CertificateChainRequest Command to DUT for both PAI and DAC"
+      verification: |
+          ./chip-tool operationalcredentials certificate-chain-request 1 1 0
+
+          [1651570197.289787][3689:3694] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
+          [1651570197.289857][3689:3694] CHIP:TOO:   CertificateChainResponse: {
+          [1651570197.289898][3689:3694] CHIP:TOO:     certificate: Elided value too large of size 491
+          [1651570197.289954][3689:3694] CHIP:TOO:    }
+      disabled: true
+
+    - label: "TH saves DAC and the PAI certificates."
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH completes the Device Attestation Procedures validation using the
+          DAC and PAI certificates"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "TH Sends CSRRequest command"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH validates the attestation response, obtains the NOC, the Root CA
+          Certificate and ICAC (optional) and also allocates the FabricID and
+          NodeID. Save RCAC certificate as Root_CA_Certificate_Original_TH1"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH sends AddTrustedRootCertificate command to DUT to install the Root
+          CA Certificate to the trust store"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH sends AddTrustedRootCertificate command to DUT for the
+          installation of the same Root_CA_Certificate_Original_TH1"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "Read the TrustedRootCertificates list from DUT"
+      verification: |
+          ./chip-tool operationalcredentials read trusted-root-certificates 1 0
+
+          [1651570587.562845][3714:3719] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 2018783037
+          [1651570587.562960][3714:3719] CHIP:TOO:   TrustedRootCertificates: 2 entries
+          [1651570587.565701][3714:3719] CHIP:TOO:     [1]: Elided value too large of size 231
+          [1651570587.565758][3714:3719] CHIP:TOO:     [2]: Elided value too large of size 231
+      disabled: true
+
+    - label:
+          "TH sends AddTrustedRootCertificate command to DUT to install the Root
+          CA Certificate which differs from Root_CA_Certificate_Original_TH1 by
+          one byte in the Subject field"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "Read the TrustedRootCertificates list from DUT"
+      verification: |
+          ./chip-tool operationalcredentials read trusted-root-certificates 1 0
+
+          [1651570587.562845][3714:3719] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 2018783037
+          [1651570587.562960][3714:3719] CHIP:TOO:   TrustedRootCertificates: 2 entries
+          [1651570587.565701][3714:3719] CHIP:TOO:     [1]: Elided value too large of size 231
+          [1651570587.565758][3714:3719] CHIP:TOO:     [2]: Elided value too large of size 231
+      disabled: true
+
+    - label:
+          "TH sends AddTrustedRootCertificate command to DUT to install a
+          malformed Root CA Certificate where the signature does not match the
+          public key"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "TH1 sends the AddNOC Command to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "Save the FabricIndex as FabricIndex_Test for future use"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "Read the NOCs (NOCStruct) list from DUT"
+      verification: |
+          ./chip-tool operationalcredentials read nocs 1 0
+
+          [1651570741.707935][3729:3734] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2018783037
+          [1651570741.708034][3729:3734] CHIP:TOO:   NOCs: 1 entries
+          [1651570741.708122][3729:3734] CHIP:TOO:     [1]: {
+          [1651570741.708163][3729:3734] CHIP:TOO:       Noc: Elided value too large of size 241
+          [1651570741.708202][3729:3734] CHIP:TOO:       Icac: Elided value too large of size 231
+          [1651570741.708238][3729:3734] CHIP:TOO:       FabricIndex: 1
+          [1651570741.708272][3729:3734] CHIP:TOO:      }
+      disabled: true
+
+    - label: "Read the first NOCStruct element from the list"
+      verification: |
+          ./chip-tool operationalcredentials read nocs 1 0
+
+          [1651570741.707935][3729:3734] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2018783037
+          [1651570741.708034][3729:3734] CHIP:TOO:   NOCs: 1 entries
+          [1651570741.708122][3729:3734] CHIP:TOO:     [1]: {
+          [1651570741.708163][3729:3734] CHIP:TOO:       Noc: Elided value too large of size 241
+          [1651570741.708202][3729:3734] CHIP:TOO:       Icac: Elided value too large of size 231
+          [1651570741.708238][3729:3734] CHIP:TOO:       FabricIndex: 1
+          [1651570741.708272][3729:3734] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends UpdateFabricLabel command with 'Node Ope Credits 1' as Label
+          field to DUT"
+      verification: |
+          ./chip-tool operationalcredentials update-fabric-label NodeOpeCredits1 1 0
+
+          [1651571821.028022][3803:3808] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651571821.028086][3803:3808] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1651571821.028181][3803:3808] CHIP:TOO:   NOCResponse: {
+          [1651571821.028226][3803:3808] CHIP:TOO:     statusCode: 0
+          [1651571821.028259][3803:3808] CHIP:TOO:     fabricIndex: 1
+          [1651571821.028292][3803:3808] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Read the Fabrics List from DUT and get the FabricDescriptorStruct for
+          which FabricIndex = fabric-id field from the operational certificate"
+      verification: |
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
+
+          [1651572032.170920][3815:3820] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2018783041
+          [1651572032.171031][3815:3820] CHIP:TOO:   Fabrics: 2 entries
+          [1651572032.171179][3815:3820] CHIP:TOO:     [1]: {
+          [1651572032.171223][3815:3820] CHIP:TOO:       RootPublicKey: 0412894491026CDACAC117D232D252EF827691D378BCCC9E8E717E6C70B3D36E4C5430FDF26B783EC579506D3E748BABFBC6D400302C72CD5BD40B152AA303724B
+          [1651572032.171262][3815:3820] CHIP:TOO:       VendorId: 65521
+          [1651572032.171296][3815:3820] CHIP:TOO:       FabricId: 1
+          [1651572032.171328][3815:3820] CHIP:TOO:       NodeId: 1
+          [1651572032.171360][3815:3820] CHIP:TOO:       Label: NodeOpeCredits1
+          [1651572032.171393][3815:3820] CHIP:TOO:       FabricIndex: 1
+          [1651572032.171427][3815:3820] CHIP:TOO:      }
+          [1651572032.171472][3815:3820] CHIP:TOO:     [2]: {
+          [1651572032.171511][3815:3820] CHIP:TOO:       RootPublicKey: 040983D9AC57DBF8DA04F818B1A15B2BD2821AD2BA1807099EAE1A52C62B404767972D4D7AB6B583395769881A666DCA8776EBC662EA1DE19B1DDDD9306A5DCB91
+          [1651572032.171547][3815:3820] CHIP:TOO:       VendorId: 65521
+          [1651572032.171579][3815:3820] CHIP:TOO:       FabricId: 1
+          [1651572032.171610][3815:3820] CHIP:TOO:       NodeId: 2
+          [1651572032.171641][3815:3820] CHIP:TOO:       Label:
+          [1651572032.171673][3815:3820] CHIP:TOO:       FabricIndex: 2
+          [1651572032.171705][3815:3820] CHIP:TOO:      }
+      disabled: true
+
+    - label: "Read the TrustedRootCertificates list from DUT"
+      verification: |
+          "./chip-tool operationalcredentials read trusted-root-certificates 1 0
+
+          [1651570587.562845][3714:3719] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 2018783037
+          [1651570587.562960][3714:3719] CHIP:TOO:   TrustedRootCertificates: 2 entries
+          [1651570587.565701][3714:3719] CHIP:TOO:     [1]: Elided value too large of size 231
+          [1651570587.565758][3714:3719] CHIP:TOO:     [2]: Elided value too large of size 231"
+      disabled: true
+
+    - label:
+          'TH sends UpdateFabricLabel command with "Node Ope Credits 1" as Label
+          field to DUT'
+      verification: |
+          ./chip-tool operationalcredentials update-fabric-label  2 1 0
+
+          [1650455515.088785][4397:4402] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1650455515.088888][4397:4402] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1650455515.089107][4397:4402] CHIP:TOO:   NOCResponse: {
+          [1650455515.089208][4397:4402] CHIP:TOO:     statusCode: 0
+          [1650455515.089268][4397:4402] CHIP:TOO:     fabricIndex: 1
+          [1650455515.089326][4397:4402] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Start the commissioning process DUT by TH2 on a second Fabric Repeat
+          steps 3 to 38 for TH2 For UpdateFabricLabel command set the label
+          value as 'Node Ope Credits 2' Save RCAC certificate as
+          Root_CA_Certificate_Original_TH2"
+      verification: |
+          ./chip-tool operationalcredentials update-fabric-label NodeOpeCredits2 2 0
+
+          [1651574223.789186][4176:4181] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651574223.789322][4176:4181] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1651574223.789490][4176:4181] CHIP:TOO:   NOCResponse: {
+          [1651574223.789565][4176:4181] CHIP:TOO:     statusCode: 0
+          [1651574223.789622][4176:4181] CHIP:TOO:     fabricIndex: 2
+          [1651574223.789681][4176:4181] CHIP:TOO:    }
+      disabled: true
+
+    - label: "Read the TrustedRootCertificates list from DUT"
+      verification: |
+          ./chip-tool operationalcredentials read trusted-root-certificates 2 0
+
+          [1651574260.271930][4183:4188] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 2018783045
+          [1651574260.272108][4183:4188] CHIP:TOO:   TrustedRootCertificates: 2 entries
+          [1651574260.275506][4183:4188] CHIP:TOO:     [1]: Elided value too large of size 231
+          [1651574260.275672][4183:4188] CHIP:TOO:     [2]: Elided value too large of size 231
+      disabled: true
+
+    - label:
+          "TH2 sends UpdateFabricLabel command with 'Node Ope Credits 1' as
+          Label field to DUT"
+      verification: |
+          ./chip-tool operationalcredentials update-fabric-label NodeOpeCredits1 2 0
+
+          [1651574185.259939][4167:4172] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651574185.260038][4167:4172] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1651574185.260186][4167:4172] CHIP:TOO:   NOCResponse: {
+          [1651574185.260394][4167:4172] CHIP:TOO:     statusCode: 10
+          [1651574185.260464][4167:4172] CHIP:TOO:    }
+      disabled: true
+
+    - label: "Read the Fabrics List from DUT"
+      verification: |
+          ./chip-tool operationalcredentials read fabrics 1 0
+
+          [1651239584.030782][2559:2564] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 693340809
+          [1651239584.032687][2559:2564] CHIP:TOO:   Fabrics: 1 entries
+          [1651239584.033091][2559:2564] CHIP:TOO:     [1]: {
+          [1651239584.033165][2559:2564] CHIP:TOO:       RootPublicKey: 048661B0C0D119C7636D1ADC7EBE1D26A374FFA6C944F7457DF1DDD1163677D4D00AF9FF1A620E73066F326118124D7C2521CFF2B4EDE69E87AF364D1CAD1D2C0A
+          [1651239584.033207][2559:2564] CHIP:TOO:       VendorId: 65521
+          [1651239584.033240][2559:2564] CHIP:TOO:       FabricId: 1
+          [1651239584.033272][2559:2564] CHIP:TOO:       NodeId: 1
+          [1651239584.033304][2559:2564] CHIP:TOO:       Label:
+          [1651239584.033336][2559:2564] CHIP:TOO:       FabricIndex: 1
+          [1651239584.033370][2559:2564] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "Read the Fabrics List from DUT and get the FabricDescriptorStruct for
+          which FabricIndex = fabric-id field from the operational certificate"
+      verification: |
+          ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0
+
+          [1651575635.120166][4259:4264] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2018783045
+          [1651575635.120365][4259:4264] CHIP:TOO:   Fabrics: 2 entries
+          [1651575635.120654][4259:4264] CHIP:TOO:     [1]: {
+          [1651575635.120726][4259:4264] CHIP:TOO:       RootPublicKey: 0412894491026CDACAC117D232D252EF827691D378BCCC9E8E717E6C70B3D36E4C5430FDF26B783EC579506D3E748BABFBC6D400302C72CD5BD40B152AA303724B
+          [1651575635.120789][4259:4264] CHIP:TOO:       VendorId: 65521
+          [1651575635.120844][4259:4264] CHIP:TOO:       FabricId: 1
+          [1651575635.120896][4259:4264] CHIP:TOO:       NodeId: 1
+          [1651575635.120948][4259:4264] CHIP:TOO:       Label: NodeOpeCredits1
+          [1651575635.121002][4259:4264] CHIP:TOO:       FabricIndex: 1
+          [1651575635.121057][4259:4264] CHIP:TOO:      }
+          [1651575635.121134][4259:4264] CHIP:TOO:     [2]: {
+          [1651575635.121224][4259:4264] CHIP:TOO:       RootPublicKey: 040983D9AC57DBF8DA04F818B1A15B2BD2821AD2BA1807099EAE1A52C62B404767972D4D7AB6B583395769881A666DCA8776EBC662EA1DE19B1DDDD9306A5DCB91
+          [1651575635.121287][4259:4264] CHIP:TOO:       VendorId: 65521
+          [1651575635.121341][4259:4264] CHIP:TOO:       FabricId: 1
+          [1651575635.121394][4259:4264] CHIP:TOO:       NodeId: 2
+          [1651575635.121446][4259:4264] CHIP:TOO:       Label: NodeOpeCredits2
+          [1651575635.121499][4259:4264] CHIP:TOO:       FabricIndex: 2
+          [1651575635.121552][4259:4264] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "From TH2 send RemoveFabric command with Fabric Index as
+          FabricIndex_Test + 5 (Invalid Fabric Index)to DUT"
+      verification: |
+          ./chip-tool operationalcredentials remove-fabric 25 1 0
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1646390608.860327][6336:6341] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1646390608.860465][6336:6341] CHIP:TOO:   NOCResponse: {
+          [1646390608.860548][6336:6341] CHIP:TOO:     statusCode: 11
+          [1646390608.860611][6336:6341] CHIP:TOO:    }
+          [1646390608.860695][6336:6341] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1646390608.860801][6336:6341] CHIP:EM: Sending Standalone Ack for MessageCounter:1477607 on exchange 51257i
+      disabled: true
+
+    - label:
+          "From TH2 sends RemoveFabric command with Fabric Index as
+          FabricIndex_Test (Valid Fabric Index)to DUT"
+      verification: |
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          CHIP:TOO:   NOCResponse: {
+          CHIP:TOO:     statusCode: 0
+          CHIP:TOO:     fabricIndex: 2
+          CHIP:TOO:    }
+          CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "From TH2 send RemoveTrustedRootCertificate command with certificate
+          value as Root_CA_Certificate_Original_TH2 to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "From TH Read the TrustedRootCertificates list from DUT."
+      verification: |
+          ./chip-tool operationalcredentials read  trusted-root-certificates 2 0
+
+          [1651577039.219545][4506:4511] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 2998576972
+          [1651577039.219645][4506:4511] CHIP:TOO:   TrustedRootCertificates: 2 entries
+          [1651577039.219727][4506:4511] CHIP:TOO:     [1]: Elided value too large of size 231
+          [1651577039.219771][4506:4511] CHIP:TOO:     [2]: Elided value too large of size 231
+      disabled: true
+
+    - label: "From TH Read the Fabrics list from DUT."
+      verification: |
+          ./chip-tool operationalcredentials read fabrics 2 0
+
+          [1651577163.247975][4519:4524] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2998576972
+          [1651577163.248161][4519:4524] CHIP:TOO:   Fabrics: 1 entries
+          [1651577163.248349][4519:4524] CHIP:TOO:     [1]: {
+          [1651577163.248425][4519:4524] CHIP:TOO:       RootPublicKey: 040983D9AC57DBF8DA04F818B1A15B2BD2821AD2BA1807099EAE1A52C62B404767972D4D7AB6B583395769881A666DCA8776EBC662EA1DE19B1DDDD9306A5DCB91
+          [1651577163.248489][4519:4524] CHIP:TOO:       VendorId: 65521
+          [1651577163.248545][4519:4524] CHIP:TOO:       FabricId: 1
+          [1651577163.248599][4519:4524] CHIP:TOO:       NodeId: 2
+          [1651577163.248653][4519:4524] CHIP:TOO:       Label:
+          [1651577163.248706][4519:4524] CHIP:TOO:       FabricIndex: 2
+          [1651577163.248763][4519:4524] CHIP:TOO:      }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DM_3_2.yaml
index 7e3051f784a390..aa9eab9a5b1ed0 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_3_2.yaml
@@ -13,7 +13,9 @@
 # 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: 10.3.2. [TC-DM-3.2] Network Commissioning Commands [DUT - Commissionee]
+name:
+    10.3.2. [TC-DM-3.2] Attribute-CurrentFabricIndex validation
+    [DUT-Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -21,37 +23,139 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Factory Reset DUT"
+      verification: |
+
+      disabled: true
+
     - label:
-          "if PICS_WIFI) OR (PICS_THREAD then DUT issues a ScanNetworks command"
+          "Commission DUT to TH1s Fabric When DUT sends NOC response save
+          fabricindex as fabindex1"
       verification: |
-          ./chip-tool  networkcommissioning scan-networks null 0 1 0
+          ./chip-tool operationalcredentials read   current-fabric-index   1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 2445178920
+          CHIP:TOO:   CurrentFabricIndex: 1
+          CHIP:EM: Sending Standalone Ack for MessageCounter:7141893 on exchange 26909i"
       disabled: true
 
-    - label: "if (PICS_WIFI) then DUT issues an AddOrUpdateWiFiNetwork command"
+    - label: "Save TH1s Fabric ID as FabricID1"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning add-or-update-wi-fi-network GRLPrivate_EXT matter123 0 1 0
+          Take the CurrentFabricIndex as fabindex1
       disabled: true
 
     - label:
-          "if (PICS_THREAD) then DUT issues an AddOrUpdateThreadNetwork command"
+          "Commission DUT to TH2s Fabric When DUT sends NOC response save
+          fabricindex as fabindex2"
+      verification: |
+          ./chip-tool operationalcredentials read   current-fabric-index 2 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 2445178920
+          CHIP:TOO:   CurrentFabricIndex: 2
+          CHIP:EM: Sending Standalone Ack for MessageCounter:8900122 on exchange 26519i
+      disabled: true
+
+    - label: "Save TH2s Fabric ID as FabricID2"
+      verification: |
+          Take the CurrentFabricIndex as fabindex2
+      disabled: true
+
+    - label: "From TH1 read the CurrentFabricIndex"
       verification: |
-          ./chip-tool networkcommissioning add-or-update-thread-network 1111161622222211 0 1 0
+          ./chip-tool operationalcredentials read   current-fabric-index   1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 2445178920
+          CHIP:TOO:   CurrentFabricIndex: 1
+          CHIP:EM: Sending Standalone Ack for MessageCounter:7141893 on exchange 26909i
       disabled: true
 
     - label:
-          "if PICS_WIFI) OR (PICS_THREAD then DUT issues a RemoveNetwork command"
+          "From TH1 read the NOCs List attribute having entry index 0 and entry
+          index 1"
       verification: |
-          ./chip-tool networkcommissioning remove-network 1111161622222211 0 1 0
+          ./chip-tool operationalcredentials read nocs 1 0
+
+          [1651577468.074462][4512:4517] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2998576972
+          [1651577468.074533][4512:4517] CHIP:TOO:   NOCs: 1 entries
+          [1651577468.074596][4512:4517] CHIP:TOO:     [1]: {
+          [1651577468.074626][4512:4517] CHIP:TOO:       Noc: Elided value too large of size 241
+          [1651577468.074652][4512:4517] CHIP:TOO:       Icac: Elided value too large of size 231
+          [1651577468.074676][4512:4517] CHIP:TOO:       FabricIndex: 1
+          [1651577468.074699][4512:4517] CHIP:TOO:      }
       disabled: true
 
-    - label: "DUT issues a ConnectNetwork command"
+    - label: "Read NOCStruct values from entry at index 0"
       verification: |
-          ./chip-tool networkcommissioning connect-network 1111161622222211 0 1 0
+          ./chip-tool operationalcredentials read nocs 1 0
+
+          [1651577468.074462][4512:4517] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2998576972
+          [1651577468.074533][4512:4517] CHIP:TOO:   NOCs: 1 entries
+          [1651577468.074596][4512:4517] CHIP:TOO:     [1]: {
+          [1651577468.074626][4512:4517] CHIP:TOO:       Noc: Elided value too large of size 241
+          [1651577468.074652][4512:4517] CHIP:TOO:       Icac: Elided value too large of size 231
+          [1651577468.074676][4512:4517] CHIP:TOO:       FabricIndex: 1
+          [1651577468.074699][4512:4517] CHIP:TOO:      }
       disabled: true
 
     - label:
-          "if PICS_WIFI) OR (PICS_THREAD then DUT issues a ReorderNetwork
-          command"
+          "Read the FabricDescriptorStruct from Fabrics list for FabricID =
+          FabricID1 from DUT"
+      verification: |
+          ./chip-tool operationalcredentials read fabrics 1 0
+
+          [1651578337.008417][4553:4558] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2998576972
+          [1651578337.008501][4553:4558] CHIP:TOO:   Fabrics: 1 entries
+          [1651578337.008588][4553:4558] CHIP:TOO:     [1]: {
+          [1651578337.008787][4553:4558] CHIP:TOO:       RootPublicKey: 04807D3A8F50C29C29D10352FEC75DC2E9965E86A64FEBDCF4CF671C8A77A3EBA96AC62B4615BA857297AE9D22656BC1076457E2CC46C5E864F6D03B8AC811F938
+          [1651578337.008826][4553:4558] CHIP:TOO:       VendorId: 65521
+          [1651578337.008849][4553:4558] CHIP:TOO:       FabricId: 1
+          [1651578337.008873][4553:4558] CHIP:TOO:       NodeId: 1
+          [1651578337.008896][4553:4558] CHIP:TOO:       Label:
+          [1651578337.008918][4553:4558] CHIP:TOO:       FabricIndex: 1
+          [1651578337.008941][4553:4558] CHIP:TOO:      }
+      disabled: true
+
+    - label: "From TH2 read the CurrentFabricIndex"
+      verification: |
+          ./chip-tool operationalcredentials read   current-fabric-index 2 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 2445178920
+          CHIP:TOO:   CurrentFabricIndex: 2
+          CHIP:EM: Sending Standalone Ack for MessageCounter:8900122 on exchange 26519i
+      disabled: true
+
+    - label: "From TH2 read the NOCs List attribute having two entries"
+      verification: |
+          ./chip-tool operationalcredentials read nocs 2 0
+
+          [1651578024.197989][4573:4578] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2998576972
+          [1651578024.198153][4573:4578] CHIP:TOO:   NOCs: 1 entries
+          [1651578024.198294][4573:4578] CHIP:TOO:     [1]: {
+          [1651578024.198363][4573:4578] CHIP:TOO:       Noc: Elided value too large of size 241
+          [1651578024.198425][4573:4578] CHIP:TOO:       Icac: Elided value too large of size 231
+          [1651578024.198485][4573:4578] CHIP:TOO:       FabricIndex: 2
+          [1651578024.198542][4573:4578] CHIP:TOO:      }
+      disabled: true
+
+    - label: "Read NOCStruct values from entry at index 1"
+      verification: |
+          ./chip-tool operationalcredentials read nocs 2 0
+
+          [1651578024.197989][4573:4578] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2998576972
+          [1651578024.198153][4573:4578] CHIP:TOO:   NOCs: 1 entries
+          [1651578024.198294][4573:4578] CHIP:TOO:     [1]: {
+          [1651578024.198363][4573:4578] CHIP:TOO:       Noc: Elided value too large of size 241
+          [1651578024.198425][4573:4578] CHIP:TOO:       Icac: Elided value too large of size 231
+          [1651578024.198485][4573:4578] CHIP:TOO:       FabricIndex: 2
+          [1651578024.198542][4573:4578] CHIP:TOO:      }
+      disabled: true
+
+    - label: "From TH2 Read the TrustedRootCertificates list from DUT"
       verification: |
+          ./chip-tool operationalcredentials read trusted-root-certificates 2 0
 
+          [1651578083.266945][4581:4586] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 2998576972
+          [1651578083.267107][4581:4586] CHIP:TOO:   TrustedRootCertificates: 2 entries
+          [1651578083.267238][4581:4586] CHIP:TOO:     [1]: Elided value too large of size 231
+          [1651578083.267311][4581:4586] CHIP:TOO:     [2]: Elided value too large of size 231
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DM_3_3.yaml
new file mode 100644
index 00000000000000..f3be978230a6aa
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DM_3_3.yaml
@@ -0,0 +1,259 @@
+# 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: 10.3.3. [TC-DM-3.3] Attribute-NOCs, Commands [DUT-Commissioner]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Factory Reset DUT (to ensure NOC list is empty at the beginning of
+          the following steps)"
+      verification: |
+
+      disabled: true
+
+    - label: "Start the commissioning process of TH1 with DUT"
+      verification: |
+
+      disabled: true
+
+    - label:
+          "TH saves the following values as: NOCValue as nocvalue1 ICACValue as
+          icacvalue1 IpkValue as ipkvalue1 CaseAdminNode as caseadmin1
+          AdminVendorId as adminvendorid1"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "DUT reads the NOCs (NOCStruct) list from TH1"
+      verification: |
+          ./chip-tool operationalcredentials read nocs 1 0
+
+          [1651578833.213718][4404:4404] CHIP:IM: Received Read request
+          [1651578833.213786][4404:4404] CHIP:DMG: ReadRequestMessage =
+          [1651578833.213824][4404:4404] CHIP:DMG: {
+          [1651578833.213855][4404:4404] CHIP:DMG:        AttributePathIBs =
+          [1651578833.213893][4404:4404] CHIP:DMG:        [
+          [1651578833.213927][4404:4404] CHIP:DMG:                AttributePathIB =
+          [1651578833.213977][4404:4404] CHIP:DMG:                {
+          [1651578833.214018][4404:4404] CHIP:DMG:                        Endpoint = 0x0,
+          [1651578833.214064][4404:4404] CHIP:DMG:                        Cluster = 0x3e,
+          [1651578833.214110][4404:4404] CHIP:DMG:                        Attribute = 0x0000_0000,
+          [1651578833.214152][4404:4404] CHIP:DMG:                }
+          [1651578833.214196][4404:4404] CHIP:DMG:
+          [1651578833.214235][4404:4404] CHIP:DMG:        ],
+          [1651578833.214275][4404:4404] CHIP:DMG:
+          [1651578833.214313][4404:4404] CHIP:DMG:        isFabricFiltered = true,
+          [1651578833.214350][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651578833.214385][4404:4404] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "Extract the following FabricDescriptorStruct values from TH1
+          RootPublicKey VendorID FabricID NodeID Label"
+      verification: |
+          "./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
+
+          [1651572032.170920][3815:3820] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2018783041
+          [1651572032.171031][3815:3820] CHIP:TOO:   Fabrics: 2 entries
+          [1651572032.171179][3815:3820] CHIP:TOO:     [1]: {
+          [1651572032.171223][3815:3820] CHIP:TOO:       RootPublicKey: 0412894491026CDACAC117D232D252EF827691D378BCCC9E8E717E6C70B3D36E4C5430FDF26B783EC579506D3E748BABFBC6D400302C72CD5BD40B152AA303724B
+          [1651572032.171262][3815:3820] CHIP:TOO:       VendorId: 65521
+          [1651572032.171296][3815:3820] CHIP:TOO:       FabricId: 1
+          [1651572032.171328][3815:3820] CHIP:TOO:       NodeId: 1
+          [1651572032.171360][3815:3820] CHIP:TOO:       Label: NodeOpeCredits1
+          [1651572032.171393][3815:3820] CHIP:TOO:       FabricIndex: 1
+          [1651572032.171427][3815:3820] CHIP:TOO:      }
+          [1651572032.171472][3815:3820] CHIP:TOO:     [2]: {
+          [1651572032.171511][3815:3820] CHIP:TOO:       RootPublicKey: 040983D9AC57DBF8DA04F818B1A15B2BD2821AD2BA1807099EAE1A52C62B404767972D4D7AB6B583395769881A666DCA8776EBC662EA1DE19B1DDDD9306A5DCB91
+          [1651572032.171547][3815:3820] CHIP:TOO:       VendorId: 65521
+          [1651572032.171579][3815:3820] CHIP:TOO:       FabricId: 1
+          [1651572032.171610][3815:3820] CHIP:TOO:       NodeId: 2
+          [1651572032.171641][3815:3820] CHIP:TOO:       Label:
+          [1651572032.171673][3815:3820] CHIP:TOO:       FabricIndex: 2
+          [1651572032.171705][3815:3820] CHIP:TOO:      }"
+      disabled: true
+
+    - label: "DUT sends UpdateNOC to TH1"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label: "DUT sends UpdateFabricLabel to TH1"
+      verification: |
+          ./chip-tool operationalcredentials update-fabric-label node1 1 0
+
+          [1651579074.158732][4404:4404] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:2322191 on exchange 64215r
+          [1651579074.158787][4404:4404] CHIP:EM: Handling via exchange: 64215r, Delegate: 0xaaaaae69a088
+          [1651579074.158905][4404:4404] CHIP:DMG: InvokeRequestMessage =
+          [1651579074.158945][4404:4404] CHIP:DMG: {
+          [1651579074.158979][4404:4404] CHIP:DMG:        suppressResponse = false,
+          [1651579074.159019][4404:4404] CHIP:DMG:        timedRequest = false,
+          [1651579074.159055][4404:4404] CHIP:DMG:        InvokeRequests =
+          [1651579074.159100][4404:4404] CHIP:DMG:        [
+          [1651579074.159135][4404:4404] CHIP:DMG:                CommandDataIB =
+          [1651579074.159207][4404:4404] CHIP:DMG:                {
+          [1651579074.159249][4404:4404] CHIP:DMG:                        CommandPathIB =
+          [1651579074.159289][4404:4404] CHIP:DMG:                        {
+          [1651579074.159335][4404:4404] CHIP:DMG:                                EndpointId = 0x0,
+          [1651579074.159384][4404:4404] CHIP:DMG:                                ClusterId = 0x3e,
+          [1651579074.159433][4404:4404] CHIP:DMG:                                CommandId = 0x9,
+          [1651579074.159477][4404:4404] CHIP:DMG:                        },
+          [1651579074.159525][4404:4404] CHIP:DMG:
+          [1651579074.159563][4404:4404] CHIP:DMG:                        CommandData =
+          [1651579074.159608][4404:4404] CHIP:DMG:                        {
+          [1651579074.159656][4404:4404] CHIP:DMG:                                0x0 = "node1",
+          [1651579074.159707][4404:4404] CHIP:DMG:                        },
+          [1651579074.159748][4404:4404] CHIP:DMG:                },
+          [1651579074.159793][4404:4404] CHIP:DMG:
+          [1651579074.159829][4404:4404] CHIP:DMG:        ],
+          [1651579074.159872][4404:4404] CHIP:DMG:
+          [1651579074.159907][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651579074.159947][4404:4404] CHIP:DMG: },
+          [1651579074.160036][4404:4404] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_003E e=0 p=a
+          [1651579074.160085][4404:4404] CHIP:DMG: AccessControl: allowed
+      disabled: true
+
+    - label: "DUT reads SupportedFabrics from TH1"
+      verification: |
+          ./chip-tool operationalcredentials read supported-fabrics 1 0
+          [1651579155.243425][4404:4404] CHIP:IM: Received Read request
+          [1651579155.243484][4404:4404] CHIP:DMG: ReadRequestMessage =
+          [1651579155.243516][4404:4404] CHIP:DMG: {
+          [1651579155.243542][4404:4404] CHIP:DMG:        AttributePathIBs =
+          [1651579155.243575][4404:4404] CHIP:DMG:        [
+          [1651579155.243604][4404:4404] CHIP:DMG:                AttributePathIB =
+          [1651579155.243648][4404:4404] CHIP:DMG:                {
+          [1651579155.243683][4404:4404] CHIP:DMG:                        Endpoint = 0x0,
+          [1651579155.243724][4404:4404] CHIP:DMG:                        Cluster = 0x3e,
+          [1651579155.243762][4404:4404] CHIP:DMG:                        Attribute = 0x0000_0002,
+          [1651579155.243798][4404:4404] CHIP:DMG:                }
+          [1651579155.243834][4404:4404] CHIP:DMG:
+          [1651579155.243867][4404:4404] CHIP:DMG:        ],
+          [1651579155.243901][4404:4404] CHIP:DMG:
+          [1651579155.243933][4404:4404] CHIP:DMG:        isFabricFiltered = true,
+          [1651579155.243964][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651579155.243992][4404:4404] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads CommissionedFabrics attribute from TH1"
+      verification: |
+          ./chip-tool operationalcredentials read commissioned-fabrics 1 0
+          [1651579198.627299][4404:4404] CHIP:IM: Received Read request
+          [1651579198.627363][4404:4404] CHIP:DMG: ReadRequestMessage =
+          [1651579198.627398][4404:4404] CHIP:DMG: {
+          [1651579198.627427][4404:4404] CHIP:DMG:        AttributePathIBs =
+          [1651579198.627462][4404:4404] CHIP:DMG:        [
+          [1651579198.627494][4404:4404] CHIP:DMG:                AttributePathIB =
+          [1651579198.627535][4404:4404] CHIP:DMG:                {
+          [1651579198.627573][4404:4404] CHIP:DMG:                        Endpoint = 0x0,
+          [1651579198.627614][4404:4404] CHIP:DMG:                        Cluster = 0x3e,
+          [1651579198.627657][4404:4404] CHIP:DMG:                        Attribute = 0x0000_0003,
+          [1651579198.627696][4404:4404] CHIP:DMG:                }
+          [1651579198.627734][4404:4404] CHIP:DMG:
+          [1651579198.627769][4404:4404] CHIP:DMG:        ],
+          [1651579198.627807][4404:4404] CHIP:DMG:
+          [1651579198.627842][4404:4404] CHIP:DMG:        isFabricFiltered = true,
+          [1651579198.627875][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651579198.627906][4404:4404] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads TrustedRootCertificates attribute from TH1"
+      verification: |
+          ./chip-tool operationalcredentials read trusted-root-certificates 1 0
+          [1651579224.947817][4404:4404] CHIP:IM: Received Read request
+          [1651579224.947879][4404:4404] CHIP:DMG: ReadRequestMessage =
+          [1651579224.947911][4404:4404] CHIP:DMG: {
+          [1651579224.947937][4404:4404] CHIP:DMG:        AttributePathIBs =
+          [1651579224.947970][4404:4404] CHIP:DMG:        [
+          [1651579224.947999][4404:4404] CHIP:DMG:                AttributePathIB =
+          [1651579224.948067][4404:4404] CHIP:DMG:                {
+          [1651579224.948108][4404:4404] CHIP:DMG:                        Endpoint = 0x0,
+          [1651579224.948150][4404:4404] CHIP:DMG:                        Cluster = 0x3e,
+          [1651579224.948195][4404:4404] CHIP:DMG:                        Attribute = 0x0000_0004,
+          [1651579224.948236][4404:4404] CHIP:DMG:                }
+          [1651579224.948274][4404:4404] CHIP:DMG:
+          [1651579224.948308][4404:4404] CHIP:DMG:        ],
+          [1651579224.948343][4404:4404] CHIP:DMG:
+          [1651579224.948376][4404:4404] CHIP:DMG:        isFabricFiltered = true,
+          [1651579224.948407][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651579224.948438][4404:4404] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads CurrentFabricIndex attribute from TH1"
+      verification: |
+          ./chip-tool operationalcredentials read   current-fabric-index   1 0
+          [1651579270.634540][4404:4404] CHIP:DMG: ReadRequestMessage =
+          [1651579270.634587][4404:4404] CHIP:DMG: {
+          [1651579270.634627][4404:4404] CHIP:DMG:        AttributePathIBs =
+          [1651579270.634675][4404:4404] CHIP:DMG:        [
+          [1651579270.634719][4404:4404] CHIP:DMG:                AttributePathIB =
+          [1651579270.634774][4404:4404] CHIP:DMG:                {
+          [1651579270.634826][4404:4404] CHIP:DMG:                        Endpoint = 0x0,
+          [1651579270.634883][4404:4404] CHIP:DMG:                        Cluster = 0x3e,
+          [1651579270.634946][4404:4404] CHIP:DMG:                        Attribute = 0x0000_0005,
+          [1651579270.635001][4404:4404] CHIP:DMG:                }
+          [1651579270.635056][4404:4404] CHIP:DMG:
+          [1651579270.635105][4404:4404] CHIP:DMG:        ],
+          [1651579270.635188][4404:4404] CHIP:DMG:
+          [1651579270.635239][4404:4404] CHIP:DMG:        isFabricFiltered = true,
+          [1651579270.635286][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651579270.635329][4404:4404] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT sends RemoveFabric command to TH1"
+      verification: |
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
+
+
+          [1651579316.916807][4404:4404] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:13617524 on exchange 52666r
+          [1651579316.916893][4404:4404] CHIP:EM: Handling via exchange: 52666r, Delegate: 0xaaaaae69a088
+          [1651579316.917074][4404:4404] CHIP:DMG: InvokeRequestMessage =
+          [1651579316.917139][4404:4404] CHIP:DMG: {
+          [1651579316.917194][4404:4404] CHIP:DMG:        suppressResponse = false,
+          [1651579316.917258][4404:4404] CHIP:DMG:        timedRequest = false,
+          [1651579316.917317][4404:4404] CHIP:DMG:        InvokeRequests =
+          [1651579316.917390][4404:4404] CHIP:DMG:        [
+          [1651579316.917449][4404:4404] CHIP:DMG:                CommandDataIB =
+          [1651579316.917520][4404:4404] CHIP:DMG:                {
+          [1651579316.917583][4404:4404] CHIP:DMG:                        CommandPathIB =
+          [1651579316.917656][4404:4404] CHIP:DMG:                        {
+          [1651579316.917731][4404:4404] CHIP:DMG:                                EndpointId = 0x0,
+          [1651579316.917813][4404:4404] CHIP:DMG:                                ClusterId = 0x3e,
+          [1651579316.917892][4404:4404] CHIP:DMG:                                CommandId = 0xa,
+          [1651579316.917965][4404:4404] CHIP:DMG:                        },
+          [1651579316.918043][4404:4404] CHIP:DMG:
+          [1651579316.918111][4404:4404] CHIP:DMG:                        CommandData =
+          [1651579316.918185][4404:4404] CHIP:DMG:                        {
+          [1651579316.918261][4404:4404] CHIP:DMG:                                0x0 = 1,
+          [1651579316.918339][4404:4404] CHIP:DMG:                        },
+          [1651579316.918408][4404:4404] CHIP:DMG:                },
+          [1651579316.918484][4404:4404] CHIP:DMG:
+          [1651579316.918541][4404:4404] CHIP:DMG:        ],
+          [1651579316.918612][4404:4404] CHIP:DMG:
+          [1651579316.918669][4404:4404] CHIP:DMG:        InteractionModelRevision = 1
+          [1651579316.918726][4404:4404] CHIP:DMG: },
+          [1651579316.918863][4404:4404] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_003E e=0 p=a
+          [1651579316.918939][4404:4404] CHIP:DMG: AccessControl: allowed
+      disabled: true
+
+    - label: "Commission TH1 with DUT"
+      verification: |
+
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_3_4.yaml b/src/app/tests/suites/certification/Test_TC_DM_3_4.yaml
index ddbf2c34ff2b88..d7d3890ef1029b 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_3_4.yaml
@@ -13,7 +13,7 @@
 # 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.3.4. [TC-DM-3.4] Network Commissioning Attributes [DUT - Commissioner]
+name: 10.3.4. [TC-DM-3.4] UpdateNOC-Error Condition [DUT-Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -21,12 +21,74 @@ config:
     endpoint: 0
 
 tests:
-    - label: "if (PICS_WIFI) DUT reads MaxNetworks attribute on TH"
+    - label:
+          "Modify the contents of NOC_Tests Subject and save the certificate TH1
+          sends UpdateNOC Command with NOC_Test to DUT"
       verification: |
-          ./chip-tool networkcommissioning read max-networks 1 0
+          Not Verifiable
       disabled: true
 
-    - label: "if (PICS_WIFI) DUT reads Networks attribute on TH"
+    - label:
+          "From TH1 Read the NOCs (NOCStruct) list from DUT Extract the NOC from
+          NOCStruct"
       verification: |
-          ./chip-tool networkcommissioning read networks 1 0
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Modify the public key to a value different from Key 1 in the NOC_Test
+          and save the certificate TH1 sends UpdateNOC Command with NOC_Test to
+          DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Modify the Node Operational ID in the NOC_Test and save the
+          certificate TH1 sends UpdateNOC Command with NOC_Test to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Extract a NOC that is not in the TrustedRootCertificates of DUT and
+          save the certificate as NOC_Test TH1 sends UpdateNOC Command with
+          NOC_Test to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Modify the NOC_Test certificate with corrupt CSR value and save the
+          certificate TH1 sends UpdateNOC Command with NOC_Test to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Start the Commissioning process of TH on DUT TH1 sends ADDNOC Command
+          with missing CaseAdminNode field to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Start the Commissioning process of TH on DUT TH1 sends ADDNOC Command
+          with missing IpkValue field to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "Start the Commissioning process of TH on DUT TH1 sends ADDNOC Command
+          with valid fields to DUT"
+      verification: |
+          Not Verifiable
+      disabled: true
+
+    - label:
+          "TH1 sends ADDNOC Command with valid fields same as previous step to
+          DUT"
+      verification: |
+          Not Verifiable
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_1.yaml
index 415a2184425a42..c51a3503268236 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.1. [TC-DM-4.1][WiFi] Verification for attributes check [DUT -
+    10.4.1. [TC-DM-4.1] [WiFi] Verification for attributes check [DUT -
     Commissionee]
 
 config:
@@ -28,16 +28,16 @@ tests:
 
       disabled: true
 
-    - label: "TH1 is commissioned with DUT"
+    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
 
       disabled: true
 
     - label:
-          "TH1 reads Descriptor Cluster from the DUT with EP0 TH1 reads
-          ServerList from the DUT"
+          "TH reads Descriptor Cluster from the DUT with EP0 TH reads ServerList
+          from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool descriptor read server-list 1 0
+          ./chip-tool descriptor read server-list 1 0
 
           [1646214614.113925][6900:6905] CHIP:DMG:        SuppressResponse = true,
           [1646214614.113950][6900:6905] CHIP:DMG:        InteractionModelRevision = 1
@@ -72,7 +72,7 @@ tests:
           [1646214614.116434][6900:6905] CHIP:EM: Sending Standalone Ack for MessageCounter:1857540 on exchange 31492i
       disabled: true
 
-    - label: "TH1 reads FeatureMap attribute from the DUT"
+    - label: "TH reads FeatureMap attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read feature-map 1 0
 
@@ -81,9 +81,9 @@ tests:
           [1649244936.458371][30450:30455] CHIP:EM: Sending Standalone Ack for MessageCounter:12082532 on exchange 64223i
       disabled: true
 
-    - label: "TH1 reads the MaxNetworks attribute from the DUT"
+    - label: "TH reads the MaxNetworks attribute from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read max-networks 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read max-networks 1 0
 
           [1646216356.472036][7021:7026] CHIP:DMG:        SuppressResponse = true,
           [1646216356.472088][7021:7026] CHIP:DMG:        InteractionModelRevision = 1
@@ -94,13 +94,13 @@ tests:
       disabled: true
 
     - label:
-          "TH1 saves the MaxNetworks attribute value as 'maxvalue' for furture
-          use"
+          "TH saves the MaxNetworks attribute value as 'MaxNetworksValue' for
+          future use"
       verification: |
-
+          TH1 saves the MaxNetworks attribute value
       disabled: true
 
-    - label: "TH1 reads the Networks attribute list from the DUT"
+    - label: "TH reads the Networks attribute list from the DUT"
       verification: |
           ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
 
@@ -113,7 +113,7 @@ tests:
           [1649249212.073266][30681:30686] CHIP:EM: Sending Standalone Ack for MessageCounter:8988360 on exchange 58610i
       disabled: true
 
-    - label: "TH1 reads ScanMaxTimeSeconds attribute from the DUT"
+    - label: "TH reads ScanMaxTimeSeconds attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning read scan-max-time-seconds 1 0  --paa-trust-store-path ./credentials/development/paa-root-certs
 
@@ -122,7 +122,7 @@ tests:
           [1648122894.380642][8770:8775] CHIP:EM: Sending Standalone Ack for MessageCounter:12629308 on exchange 33084i
       disabled: true
 
-    - label: "TH1 reads ConnectMaxTimeSeconds Attribute from the DUT"
+    - label: "TH reads ConnectMaxTimeSeconds Attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning read connect-max-time-seconds 1 0  --paa-trust-store-path ./credentials/development/paa-root-certs
 
@@ -131,7 +131,7 @@ tests:
           [1648122935.626539][8780:8785] CHIP:EM: Sending Standalone Ack for MessageCounter:11607262 on exchange 19306i
       disabled: true
 
-    - label: "TH1 reads InterfaceEnabled attribute from the DUT"
+    - label: "TH reads InterfaceEnabled attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read interface-enabled 1 0
 
@@ -140,7 +140,7 @@ tests:
           [1649250241.092852][30726:30731] CHIP:EM: Sending Standalone Ack for MessageCounter:3120276 on exchange 4316i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning read last-networking-status 1 0  --paa-trust-store-path ./credentials/development/paa-root-certs
 
@@ -150,7 +150,7 @@ tests:
       disabled: true
 
     - label:
-          "TH1 reads the LastNetworkID attribute from the DUT TH1 reads the
+          "TH reads the LastNetworkID attribute from the DUT TH reads the
           Networks attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning read last-network-id 1 0  --paa-trust-store-path ./credentials/development/paa-root-certs
@@ -160,7 +160,7 @@ tests:
           [1648123296.959180][8824:8829] CHIP:EM: Sending Standalone Ack for MessageCounter:7786733 on exchange 2835i
       disabled: true
 
-    - label: "TH1 reads the LastConnectErrorValue attribute from the DUT"
+    - label: "TH reads the LastConnectErrorValue attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning read last-connect-error-value 1 0  --paa-trust-store-path ./credentials/development/paa-root-certs
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_10.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_10.yaml
index 4f46c00418286e..a4ad9e8e51edc7 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_10.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.10. [TC-DM-4.10][Thread] Verification for RemoveNetwork Command
+    10.4.10. [TC-DM-4.10] [Thread] Verification for RemoveNetwork Command
     [DUT-Commissionee]
 
 config:
@@ -23,7 +23,7 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 900 0 62 0
 
@@ -37,8 +37,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
+          "TH sends RemoveNetwork Command to the DUT with NetworkID argument
+          value as 'Userth_op' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning  remove-network 0119100899082022 62 0
 
@@ -50,7 +50,7 @@ tests:
           [1650391420.469902][10048:10053] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
+    - label: "TH reads MaxNetworks attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read max-networks 62 0
 
@@ -59,7 +59,7 @@ tests:
           [1650391430.631837][10054:10059] CHIP:EM: Sending Standalone Ack for MessageCounter:6413170 on exchange 3154i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 62 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_11.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_11.yaml
index c2b20008d5a334..b22a0e4502fb0b 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_11.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.11. [TC-DM-4.11][WiFi] Verification for ConnectNetwork Command
+    10.4.11. [TC-DM-4.11] [WiFi] Verification for ConnectNetwork Command
     [DUT-Commissionee]
 
 config:
@@ -23,87 +23,83 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
 
-          [1650376197.742950][42857:42862] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650376197.743013][42857:42862] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650376197.743113][42857:42862] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650376197.743172][42857:42862] CHIP:TOO:     errorCode: 0
-          [1650376197.743208][42857:42862] CHIP:TOO:     debugText:
-          [1650376197.743242][42857:42862] CHIP:TOO:    }
-          [1650376197.743296][42857:42862] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650376197.743367][42857:42862] CHIP:EM: Sending Standalone Ack for MessageCounter:11807454 on exchange 55345i
+          [1653480530.006012][27845:27850] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
+          [1653480530.006109][27845:27850] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
+          [1653480530.006209][27845:27850] CHIP:TOO:   ArmFailSafeResponse: {
+          [1653480530.006278][27845:27850] CHIP:TOO:     errorCode: 0
+          [1653480530.006328][27845:27850] CHIP:TOO:     debugText:
+          [1653480530.006374][27845:27850] CHIP:TOO:    }
       disabled: true
 
     - label:
           "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
           argument value as 'Userwifi_ssid', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
+          'Userwifi_Credentials' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
 
-          [1650376203.648598][42863:42868] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650376203.648659][42863:42868] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650376203.648761][42863:42868] CHIP:TOO:   NetworkConfigResponse: {
-          [1650376203.648822][42863:42868] CHIP:TOO:     networkingStatus: 0
-          [1650376203.648860][42863:42868] CHIP:TOO:     networkIndex: 0
-          [1650376203.648894][42863:42868] CHIP:TOO:    }
-          [1650376203.648948][42863:42868] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650376203.649015][42863:42868] CHIP:EM: Sending Standalone Ack for MessageCounter:1508553 on exchange 44250i
+          Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          [1653480530.517643][27851:27856] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
+          [165
+          3480530.517748][27851:27856] CHIP:TOO:   NetworkConfigResponse: {
+          [1653480530.517808][27851:27856] CHIP:TOO:     networkingStatus: 0
+          [1653480530.517854][27851:27856] CHIP:TOO:     networkIndex: 0
+          [1653480530.517894][27851:27856] CHIP:TOO:    }
       disabled: true
 
     - label: "TH1 reads Networks attribute from the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
 
-          [1650376210.400416][42869:42874] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3182776035
-          [1650376210.400521][42869:42874] CHIP:TOO:   Networks: 1 entries
-          [1650376210.400580][42869:42874] CHIP:TOO:     [1]: {
-          [1650376210.400615][42869:42874] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1650376210.400646][42869:42874] CHIP:TOO:       Connected: FALSE
-          [1650376210.400677][42869:42874] CHIP:TOO:      }
-          [1650376210.400786][42869:42874] CHIP:EM: Sending Standalone Ack for MessageCounter:3301439 on exchange 38417i
+          [1653480531.027668][27857:27863] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3424382863
+          [1653480531.027835][27857:27863] CHIP:TOO:   Networks: 1 entries
+          [1653480531.027946][27857:27863] CHIP:TOO:     [1]: {
+          [1653480531.028015][27857:27863] CHIP:TOO:       NetworkID: 47524C50726976617465
+          [1653480531.028073][27857:27863] CHIP:TOO:       Connected: TRUE
+          [1653480531.028128][27857:27863] CHIP:TOO:      }
       disabled: true
 
-    - label: "TH1 saves the timestamp as CT1"
+    - label:
+          "TH saves record current wall clock time with seconds resolution as
+          CT1"
       verification: |
-
+          TH1 saves the timestamp as CT1
       disabled: true
 
     - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid1' and Breadcrumb argument value as 0"
+          "TH sends ConnectNetwork command to the DUT with NetworkID argument
+          value as 'Userwifi_ssid1' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
 
-          [1650376217.124606][42876:42881] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1650376217.124707][42876:42881] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1650376217.124870][42876:42881] CHIP:TOO:   ConnectNetworkResponse: {
-          [1650376217.124968][42876:42881] CHIP:TOO:     networkingStatus: 0
-          [1650376217.125030][42876:42881] CHIP:TOO:     errorValue: null
-          [1650376217.125087][42876:42881] CHIP:TOO:    }
-          [1650376217.125179][42876:42881] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650376217.125282][42876:42881] CHIP:EM: Sending Standalone Ack for MessageCounter:7901929 on exchange 1050i
+          Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
+          [1653480537.209041][27864:27869] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
+          [1653480537.209113][27864:27869] CHIP:TOO:   ConnectNetworkResponse: {
+          [1653480537.209154][27864:27869] CHIP:TOO:     networkingStatus: 0
+          [1653480537.209179][27864:27869] CHIP:TOO:     errorValue: null
+          [1653480537.209201][27864:27869] CHIP:TOO:    }
+          [1653480537.209240][27864:27869] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
-    - label: "TH1 saves the timestamp as CT2"
+    - label:
+          "TH saves record current wall clock time with seconds resolution as
+          CT2"
       verification: |
-
+          TH1 saves the timestamp as CT2
       disabled: true
 
-    - label: "TH1 reads Networks attribute from the DUT"
+    - label: "TH reads Networks attribute from the DUT"
       verification: |
-          https://github.com/project-chip/connectedhomeip/issues/17106
-
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
 
-          [1650376224.551341][42882:42887] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3182776035
-          [1650376224.551440][42882:42887] CHIP:TOO:   Networks: 1 entries
-          [1650376224.551501][42882:42887] CHIP:TOO:     [1]: {
-          [1650376224.551535][42882:42887] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1650376224.551565][42882:42887] CHIP:TOO:       Connected: FALSE
-          [1650376224.551596][42882:42887] CHIP:TOO:      }
-          [1650376224.551703][42882:42887] CHIP:EM: Sending Standalone Ack for MessageCounter:16427109 on exchange 14955i
+          [1653481261.622658][27982:27987] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3424382863
+          [1653481261.622821][27982:27987] CHIP:TOO:   Networks: 1 entries
+          [1653481261.622927][27982:27987] CHIP:TOO:     [1]: {
+          [1653481261.622996][27982:27987] CHIP:TOO:       NetworkID: 47524C50726976617465
+          [1653481261.623056][27982:27987] CHIP:TOO:       Connected: TRUE
+          [1653481261.623112][27982:27987] CHIP:TOO:      }
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_12.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_12.yaml
index 1690bd3e566c6a..21673517513655 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_12.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.12. [TC-DM-4.12][Thread]Verification for ConnectNetwork Command
+    10.4.12. [TC-DM-4.12] [Thread]Verification for ConnectNetwork Command
     [DUT-Commissionee]
 
 config:
@@ -23,7 +23,9 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label:
+          "During the commissioning process, TH and DUT, TH sends ArmFailSafe
+          command to the DUT"
       verification: |
           Executed during the commissioning
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool pairing ble-thread 62 hex:0e080000000000010000000300001035060004001fffe0020801191008990820220708fd067fa7635e1066051009116253045736078899aabbccddeeff030e4f70656e686b72657069446f6e6f01021234041029282c49503302ea4536648015d1ff180c0402a0fff8 20202021 3840
@@ -37,14 +39,36 @@ tests:
           [1650388635.103426][9682:9687] CHIP:CTL: Successfully finished commissioning step 'ArmFailSafe'
       disabled: true
 
-    - label: "TH1 saves the timestamp as CT1"
+    - label:
+          "During the commissioning process, TH sends AddOrUpdateThreadNetwork
+          command to the DUT with OperationalDataset argument value as
+          'Userth_op' and Breadcrumb argument value as 1"
       verification: |
+          Executed during the commissioning
+          ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool pairing ble-thread 62 hex:0e080000000000010000000300001035060004001fffe0020801191008990820220708fd067fa7635e1066051009116253045736078899aabbccddeeff030e4f70656e686b72657069446f6e6f01021234041029282c49503302ea4536648015d1ff180c0402a0fff8 20202021 3840
+          [1650388629.653868][9682:9682] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_kvs
+
 
+          [1650388638.775935][9682:9687] CHIP:CTL: Successfully finished commissioning step 'SendNOC'
+          [1650388638.775991][9682:9687] CHIP:CTL: Commissioning stage next step: 'SendNOC' -> 'ThreadNetworkSetup'
+          [1650388638.776048][9682:9687] CHIP:CTL: Performing next commissioning step 'ThreadNetworkSetup'
+          [1650388639.091089][9682:9687] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          [1650388639.091215][9682:9687] CHIP:CTL: Received NetworkConfig response
+          [1650388639.091281][9682:9687] CHIP:CTL: Successfully finished commissioning step 'ThreadNetworkSetup'
+          [1650388639.091336][9682:9687] CHIP:CTL: Commissioning stage next step: 'ThreadNetworkSetup' -> 'ThreadNetworkEnable'
+          [1650388639.091393][9682:9687] CHIP:CTL: Performing next commissioning step 'ThreadNetworkEnable'
       disabled: true
 
     - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
+          "TH saves record current wall clock time with seconds resolution as
+          CT1"
+      verification: |
+          TH1 saves the timestamp as CT1
+      disabled: true
+
+    - label:
+          "TH sends ConnectNetwork command to the DUT with NetworkID argument
+          value as 'Userth_op' and Breadcrumb argument value as 1"
       verification: |
           Executed during the commissioning
 
@@ -53,12 +77,16 @@ tests:
           [1650388642.195614][9682:9687] CHIP:CTL: Successfully finished commissioning step 'ThreadNetworkEnable'
       disabled: true
 
-    - label: "TH1 saves the timestamp as CT2"
+    - label:
+          "TH saves record current wall clock time with seconds resolution as
+          CT2"
       verification: |
-
+          TH1 saves the timestamp as CT2
       disabled: true
 
-    - label: "TH1 reads Networks attribute from the DUT"
+    - label:
+          "After commissioning completes, TH reads Networks attribute from the
+          DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_13.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_13.yaml
index 0399b0343a00be..5cba69fd7257c7 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_13.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.13. [TC-DM-4.13][WiFi] Verification for ReorderNetwork command
+    10.4.13. [TC-DM-4.13] [WiFi] Verification for ReorderNetwork command
     [DUT-Commissionee]
 
 config:
@@ -23,95 +23,56 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
-
-          [1650381469.290921][44062:44067] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650381469.290983][44062:44067] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650381469.291087][44062:44067] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650381469.291148][44062:44067] CHIP:TOO:     errorCode: 0
-          [1650381469.291184][44062:44067] CHIP:TOO:     debugText:
-          [1650381469.291218][44062:44067] CHIP:TOO:    }
-          [1650381469.291273][44062:44067] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650381469.291343][44062:44067] CHIP:EM: Sending Standalone Ack for MessageCounter:7893211 on exchange 64557i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
     - label:
           "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
           argument value as 'Userwifi_ssid1', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
+          'Userwifi_Credentials' and Breadcrumb argument value as 1"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
+      disabled: true
 
-          [1650381475.218029][44068:44073] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650381475.218092][44068:44073] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650381475.218190][44068:44073] CHIP:TOO:   NetworkConfigResponse: {
-          [1650381475.218252][44068:44073] CHIP:TOO:     networkingStatus: 0
-          [1650381475.218289][44068:44073] CHIP:TOO:     networkIndex: 0
-          [1650381475.218323][44068:44073] CHIP:TOO:    }
-          [1650381475.218376][44068:44073] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650381475.218447][44068:44073] CHIP:EM: Sending Standalone Ack for MessageCounter:7658401 on exchange 620i
+    - label: "TH reads MaxNetworks attribute from the DUT"
+      verification: |
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
     - label:
           "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
           argument value as 'Userwifi_ssid2', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
+          'Userwifi_Credentials' and Breadcrumb argument value as 1"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C507269766174655F455854 matter123 1 0
-
-          [1650381481.251038][44074:44079] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650381481.251102][44074:44079] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650381481.251189][44074:44079] CHIP:TOO:   NetworkConfigResponse: {
-          [1650381481.251250][44074:44079] CHIP:TOO:     networkingStatus: 2
-          [1650381481.251289][44074:44079] CHIP:TOO:    }
-          [1650381481.251342][44074:44079] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650381481.251412][44074:44079] CHIP:EM: Sending Standalone Ack for MessageCounter:11373968 on exchange 55916i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
     - label:
           "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
           argument value as 'Userwifi_ssid3', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
+          'Userwifi_Credentials' and Breadcrumb argument value as 1"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:7369766172616D2773206950686F6E65 maskmask 1 0
-
-          [1650381487.889851][44081:44086] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650381487.889909][44081:44086] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650381487.889987][44081:44086] CHIP:TOO:   NetworkConfigResponse: {
-          [1650381487.890043][44081:44086] CHIP:TOO:     networkingStatus: 2
-          [1650381487.890079][44081:44086] CHIP:TOO:    }
-          [1650381487.890127][44081:44086] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650381487.890188][44081:44086] CHIP:EM: Sending Standalone Ack for MessageCounter:3375326 on exchange 62297i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
     - label:
-          "TH1 sends ReorderNetwork Command to the DUT with the following
+          "TH sends ReorderNetwork Command to the DUT with the following
           arguments: NetworkID argument value as 'Userwifi_ssid1' NetworkIndex
-          argument value as 'Wifinet_idx3' Breadcrumb argument value as 0"
+          argument value as 'Userwifi_netidx3' Breadcrumb argument value as 1"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning reorder-network hex:47524C50726976617465 3 1 0
-
-          [1650381494.820649][44087:44092] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650381494.820749][44087:44092] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650381494.820860][44087:44092] CHIP:TOO:   NetworkConfigResponse: {
-          [1650381494.820940][44087:44092] CHIP:TOO:     networkingStatus: 0
-          [1650381494.820979][44087:44092] CHIP:TOO:     networkIndex: 3
-          [1650381494.821016][44087:44092] CHIP:TOO:    }
-          [1650381494.821087][44087:44092] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650381494.821174][44087:44092] CHIP:EM: Sending Standalone Ack for MessageCounter:5656346 on exchange 4849i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
-    - label: "TH1 reads Networks attribute list from the DUT"
+    - label: "TH reads Networks attribute list from the DUT"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
-
-          [1650381501.447787][44093:44098] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3182776035
-          [1650381501.447899][44093:44098] CHIP:TOO:   Networks: 1 entries
-          [1650381501.447965][44093:44098] CHIP:TOO:     [1]: {
-          [1650381501.448003][44093:44098] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1650381501.448037][44093:44098] CHIP:TOO:       Connected: FALSE
-          [1650381501.448071][44093:44098] CHIP:TOO:      }
-          [1650381501.448221][44093:44098] CHIP:EM: Sending Standalone Ack for MessageCounter:10492805 on exchange 43057i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_14.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_14.yaml
index d5bd40a2fb13aa..de94eff81de9df 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_14.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.14. [TC-DM-4.14][Thread] Verification for ReorderNetwork command
+    10.4.14. [TC-DM-4.14] [Thread] Verification for ReorderNetwork command
     [DUT-Commissionee]
 
 config:
@@ -23,47 +23,23 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
-          ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 900 0 62 0
-
-          [1650392597.976230][10152:10157] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650392597.976363][10152:10157] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650392597.976539][10152:10157] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650392597.976665][10152:10157] CHIP:TOO:     errorCode: 0
-          [1650392597.976729][10152:10157] CHIP:TOO:     debugText:
-          [1650392597.976785][10152:10157] CHIP:TOO:    }
-          [1650392597.976874][10152:10157] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650392597.976987][10152:10157] CHIP:EM: Sending Standalone Ack for MessageCounter:10494017 on exchange 14665i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
     - label:
-          "TH1 sends ReorderNetwork Command to the DUT with the following
+          "TH sends ReorderNetwork Command to the DUT with the following
           arguments: NetworkID argument value as 'Userth_op1' NetworkIndex
-          argument value as 'Thnet_idx2' Breadcrumb argument value as 0"
+          argument value as 'Userth_netidx2' Breadcrumb argument value as 1"
       verification: |
-          ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning reorder-network 0119100899082022 3 62 0
-
-          [1650392602.379377][10158:10163] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650392602.379490][10158:10163] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650392602.379618][10158:10163] CHIP:TOO:   NetworkConfigResponse: {
-          [1650392602.379725][10158:10163] CHIP:TOO:     networkingStatus: 3
-          [1650392602.379792][10158:10163] CHIP:TOO:    }
-          [1650392602.379882][10158:10163] CHIP:DMG: ICR moving to [AwaitingDe]
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
 
-    - label: "TH1 reads Networks attribute list from the DUT"
+    - label: "TH reads Networks attribute list from the DUT"
       verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
-
-          [1645772651.445097][3856:3861] CHIP:DMG:         SuppressResponse = true,
-          [1645772651.445149][3856:3861] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772651.445209][3856:3861] CHIP:DMG: }
-          [1645772651.445754][3856:3861] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 92121563
-          [1645772651.445875][3856:3861] CHIP:TOO:   Networks: 1 entries
-          [1645772651.446057][3856:3861] CHIP:TOO:     [1]: {
-          [1645772651.446120][3856:3861] CHIP:TOO:       NetworkID: 0119100899082022
-          [1650389742.394958][9809:9814] CHIP:TOO:       Connected: TRUE
-          [1645772651.446228][3856:3861] CHIP:TOO:      }
-          [1645772651.446431][3856:3861] CHIP:EM: Sending Standalone Ack for MessageCounter:12695576 on exchange 11133i
+          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
+          ( Pre-Condition)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_15.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_15.yaml
index 6bed8548a1aa9d..83d8bbf5b18578 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_15.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.15. [TC-DM-4.15][WiFi] NetworkIDNotFound value as LastNetworkingStatus
+    10.4.15. [TC-DM-4.15] [WiFi] NetworkIDNotFound value as LastNetworkingStatus
     argument validation [DUT-Commissionee]
 
 config:
@@ -23,7 +23,25 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label:
+          "TH reads Network attribute from the DUT * TH saves the single entrys
+          NetworkID value as 'userwifi_ssid' value for the future use"
+      verification: |
+          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
+
+          [1645772651.445097][3856:3861] CHIP:DMG:         SuppressResponse = true,
+          [1645772651.445149][3856:3861] CHIP:DMG:         InteractionModelRevision = 1
+          [1645772651.445209][3856:3861] CHIP:DMG: }
+          [1645772651.445754][3856:3861] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 92121563
+          [1645772651.445875][3856:3861] CHIP:TOO:   Networks: 1 entries
+          [1645772651.446057][3856:3861] CHIP:TOO:     [1]: {
+          [1645772651.446120][3856:3861] CHIP:TOO:       NetworkID: 0119100899082022
+          [1650389742.394958][9809:9814] CHIP:TOO:       Connected: TRUE
+          [1645772651.446228][3856:3861] CHIP:TOO:      }
+          [1645772651.446431][3856:3861] CHIP:EM: Sending Standalone Ack for MessageCounter:12695576 on exchange 11133i
+      disabled: true
+
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
 
@@ -38,8 +56,9 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid1' and Breadcrumb argument value as 0"
+          "TH sends RemoveNetwork Command to the DUT with NetworkID argument
+          value as 'Userwifi_ssid1' that not matches 'userwifi_ssid' value and
+          Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
@@ -53,8 +72,9 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends ConnectNetwork Command to the DUT with NetworkID value as
-          'Userwifi_ssid1' and Breadcrumb value as 0"
+          "TH sends ConnectNetwork Command to the DUT with NetworkID value as
+          'Userwifi_ssid1' that not matches 'userwifi_ssid' value and Breadcrumb
+          argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_16.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_16.yaml
index 259ba14c19a815..6926e14de28ee9 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_16.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.16. [TC-DM-4.16][Thread] NetworkIDNotFound value as
+    10.4.16. [TC-DM-4.16] [Thread] NetworkIDNotFound value as
     LastNetworkingStatus argument validation [DUT-Commissionee]
 
 config:
@@ -23,7 +23,25 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label:
+          "TH reads Network attribute from the DUT TH saves the single entrys
+          NetworkID value as 'Userth_op' value for the future use"
+      verification: |
+          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
+
+          [1645772651.445097][3856:3861] CHIP:DMG:         SuppressResponse = true,
+          [1645772651.445149][3856:3861] CHIP:DMG:         InteractionModelRevision = 1
+          [1645772651.445209][3856:3861] CHIP:DMG: }
+          [1645772651.445754][3856:3861] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 92121563
+          [1645772651.445875][3856:3861] CHIP:TOO:   Networks: 1 entries
+          [1645772651.446057][3856:3861] CHIP:TOO:     [1]: {
+          [1645772651.446120][3856:3861] CHIP:TOO:       NetworkID: 47524C50726976617465
+          [1650389742.394958][9809:9814] CHIP:TOO:       Connected: TRUE
+          [1645772651.446228][3856:3861] CHIP:TOO:      }
+          [1645772651.446431][3856:3861] CHIP:EM: Sending Standalone Ack for MessageCounter:12695576 on exchange 11133i
+      disabled: true
+
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 900 0 62 0
 
@@ -38,8 +56,9 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userth_op1' and Breadcrumb argument value as 0"
+          "TH sends RemoveNetwork Command to the DUT with NetworkID argument
+          value as 'Userth_op1' that not matches 'Userth_op' value and
+          Breadcrumb argument value as 1"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network 0119100899082022 62 0
 
@@ -53,8 +72,9 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends ConnectNetwork Command to the DUT with NetworkID value as
-          'Userth_op1' and Breadcrumb value as 0"
+          "TH sends ConnectNetwork Command to the DUT with NetworkID value as
+          'Userth_op1' that not matches 'Userth_op' value and Breadcrumb
+          argument value as 1"
       verification: |
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning connect-network 0119100899082022 62 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_17.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_17.yaml
index 74808c6f28b797..b3526be525b11a 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_17.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.17. [TC-DM-4.17][WiFi] Verification for attributes check
+    10.4.17. [TC-DM-4.17] [WiFi] Verification for attributes check
     [DUT-Commissioner]
 
 config:
@@ -25,7 +25,7 @@ config:
 tests:
     - label: "DUT reads the MaxNetworks attribute from the TH"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read max-networks 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read max-networks 1 0
 
           [1646216356.472036][7021:7026] CHIP:DMG:        SuppressResponse = true,
           [1646216356.472088][7021:7026] CHIP:DMG:        InteractionModelRevision = 1
@@ -77,7 +77,7 @@ tests:
           [1649250241.092852][30726:30731] CHIP:EM: Sending Standalone Ack for MessageCounter:3120276 on exchange 4316i
       disabled: true
 
-    - label: "DUT reads LastNetowrkingStatus attribute from the TH"
+    - label: "DUT reads LastNetworkingStatus attribute from the TH"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning read last-networking-status 1 0  --paa-trust-store-path ./credentials/development/paa-root-certs
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_18.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_18.yaml
index e3893f207f0992..5ce962852935df 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_18.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.18. [TC-DM-4.18][Thread] Verification for attributes check
+    10.4.18. [TC-DM-4.18] [Thread] Verification for attributes check
     [DUT-Commissioner]
 
 config:
@@ -88,7 +88,7 @@ tests:
           [1645772984.654530][3895:3900] CHIP:EM: Sending Standalone Ack for MessageCounter:14026610 on exchange 33717i
       disabled: true
 
-    - label: "DUT reads LastNetowrkingStatus attribute from the TH"
+    - label: "DUT reads LastNetworkingStatus attribute from the TH"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 162 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_19.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_19.yaml
index 85fef99d3d1cf9..644b6ba9f1be77 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_19.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_19.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.19. [TC-DM-4.19][Ethernet] Verification for attributes check
+    10.4.19. [TC-DM-4.19] [Ethernet] Verification for attributes check
     [DUT-Commissioner]
 
 config:
@@ -25,7 +25,7 @@ config:
 tests:
     - label: "DUT reads the MaxNetworks attribute from the TH"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read max-networks 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read max-networks 1 0
 
           [1646226441.815782][2475:2480] CHIP:DMG:        SuppressResponse = true,
           [1646226441.815849][2475:2480] CHIP:DMG:        InteractionModelRevision = 1
@@ -37,18 +37,20 @@ tests:
 
     - label: "DUT reads the Networks attribute from the TH"
       verification: |
-          Expected 1 entire
-
           ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
 
-          [1649310351.178908][2677:2682] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3138976789
-          [1649310351.178985][2677:2682] CHIP:TOO:   Networks: 0 entries
-          [1649310351.179103][2677:2682] CHIP:EM: Sending Standalone Ack for MessageCounter:8390931 on exchange 1768i
+          [1653483289.382372][28210:28215] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3189790698
+          [1653483289.382458][28210:28215] CHIP:TOO:   Networks: 1 entries
+          [1653483289.382507][28210:28215] CHIP:TOO:     [1]: {
+          [1653483289.382537][28210:28215] CHIP:TOO:       NetworkID: 65746830
+          [1653483289.382561][28210:28215] CHIP:TOO:       Connected: TRUE
+          [1653483289.382584][28210:28215] CHIP:TOO:      }
+          [1653483289.382684][28210:28215] CHIP:EM: Sending Standalone Ack for MessageCounter:13711908 on exchange 32535i
       disabled: true
 
     - label: "DUT reads InterfaceEnabled attribute from the TH"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read interface-enabled 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read interface-enabled 1 0
 
           [1646226615.428003][2502:2507] CHIP:DMG:
           [1646226615.428035][2502:2507] CHIP:DMG:        SuppressResponse = true,
@@ -59,9 +61,9 @@ tests:
           [1646226615.428415][2502:2507] CHIP:EM: Sending Standalone Ack for MessageCounter:3894401 on exchange 55691i
       disabled: true
 
-    - label: "DUT reads LastNetowrkingStatus attribute from the TH"
+    - label: "DUT reads LastNetworkingStatus attribute from the TH"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-networking-status 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read last-networking-status 1 0
 
           [1646227167.614060][2533:2538] CHIP:DMG:        SuppressResponse = true,
           [1646227167.614095][2533:2538] CHIP:DMG:        InteractionModelRevision = 1
@@ -73,7 +75,7 @@ tests:
 
     - label: "DUT reads LastNetworkID attribute from the TH"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-network-id 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read last-network-id 1 0
 
           [1646227218.543427][2545:2550] CHIP:DMG:
           [1646227218.543462][2545:2550] CHIP:DMG:        SuppressResponse = true,
@@ -86,13 +88,9 @@ tests:
 
     - label: "DUT reads LastConnectErrorValue attribute from the TH"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-connect-error-value 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read last-connect-error-value 1 0
 
-          [1646227266.753206][2560:2565] CHIP:DMG:
-          [1646227266.753239][2560:2565] CHIP:DMG:        SuppressResponse = true,
-          [1646227266.753272][2560:2565] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227266.753303][2560:2565] CHIP:DMG: }
-          [1646227266.753472][2560:2565] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007DataVersion: 3622667250
-          [1646227266.753556][2560:2565] CHIP:TOO:   LastConnectErrorValue: 0
-          [1646227266.753632][2560:2565] CHIP:EM: Sending Standalone Ack for MessageCounter:7911198 on exchange 43970i
+          [1653483224.839873][28189:28194] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 3189790698
+          [1653483224.839927][28189:28194] CHIP:TOO:   LastConnectErrorValue: null
+          [1653483224.840028][28189:28194] CHIP:EM: Sending Standalone Ack for MessageCounter:289132 on exchange 60682i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_2.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_2.yaml
index 70250ac5c3b1cd..6302d2cfc7926e 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_2.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.2. [TC-DM-4.2][Thread] Verification for attributes check [DUT -
+    10.4.2. [TC-DM-4.2] [Thread] Verification for attributes check [DUT -
     Commissionee]
 
 config:
@@ -28,14 +28,14 @@ tests:
 
       disabled: true
 
-    - label: "TH1 is commissioned with DUT"
+    - label: "Commmission TH and DUT on Thread setup"
       verification: |
 
       disabled: true
 
     - label:
-          "TH1 reads Descriptor Cluster from the DUT with EP0 TH1 reads
-          ServerList from the DUT"
+          "TH reads Descriptor Cluster from the DUT with EP0 TH reads ServerList
+          from the DUT"
       verification: |
           buntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool descriptor read server-list 162 0
 
@@ -68,7 +68,7 @@ tests:
           [1645772414.102925][3827:3832] CHIP:EM: Sending Standalone Ack for MessageCounter:15329672 on exchange 6140i
       disabled: true
 
-    - label: "TH1 reads FeatureMap attribute from the DUT"
+    - label: "TH reads FeatureMap attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read feature-map 162 0
 
@@ -81,7 +81,7 @@ tests:
           [1645772204.503556][3809:3814] CHIP:EM: Sending Standalone Ack for MessageCounter:5988746 on exchange 46140i
       disabled: true
 
-    - label: "TH1 reads the MaxNetworks attribute from the DUT"
+    - label: "TH reads the MaxNetworks attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read max-networks 162 0
 
@@ -95,13 +95,13 @@ tests:
       disabled: true
 
     - label:
-          "TH1 saves the MaxNetworks attribute value as 'maxvalue' for furture
-          use"
+          "TH saves the MaxNetworks attribute value as 'MaxNetworksValue' for
+          future use"
       verification: |
-
+          TH1 saves the MaxNetworks attribute value
       disabled: true
 
-    - label: "TH1 reads the Networks attribute list from the DUT"
+    - label: "TH reads the Networks attribute list from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
 
@@ -117,7 +117,7 @@ tests:
           [1645772651.446431][3856:3861] CHIP:EM: Sending Standalone Ack for MessageCounter:12695576 on exchange 11133i
       disabled: true
 
-    - label: "TH1 reads ScanMaxTimeSeconds attribute from the DUT"
+    - label: "TH reads ScanMaxTimeSeconds attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read scan-max-time-seconds 162 0
 
@@ -129,7 +129,7 @@ tests:
           [1645772820.741512][3867:3872] CHIP:EM: Sending Standalone Ack for MessageCounter:10309775 on exchange 55305i
       disabled: true
 
-    - label: "TH1 reads ConnectMaxTimeSeconds Attribute from the DUT"
+    - label: "TH reads ConnectMaxTimeSeconds Attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read connect-max-time-seconds 162 0
 
@@ -141,7 +141,7 @@ tests:
           [1645772901.120100][3879:3884] CHIP:EM: Sending Standalone Ack for MessageCounter:11917538 on exchange 4188
       disabled: true
 
-    - label: "TH1 reads InterfaceEnabled attribute from the DUT"
+    - label: "TH reads InterfaceEnabled attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read interface-enabled 162 0
 
@@ -153,7 +153,7 @@ tests:
           [1645772984.654530][3895:3900] CHIP:EM: Sending Standalone Ack for MessageCounter:14026610 on exchange 33717i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 162 0
 
@@ -166,7 +166,7 @@ tests:
       disabled: true
 
     - label:
-          "TH1 reads the LastNetworkID attribute from the DUT TH1 reads the
+          "TH reads the LastNetworkID attribute from the DUT TH reads the
           Networks attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-network-id 162 0
@@ -179,7 +179,7 @@ tests:
           [1645773167.182422][3913:3918] CHIP:EM: Sending Standalone Ack for MessageCounter:2029571 on exchange 18566i
       disabled: true
 
-    - label: "TH1 reads the LastConnectErrorValue attribute from the DUT"
+    - label: "TH reads the LastConnectErrorValue attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-connect-error-value 162 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_20.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_20.yaml
index fb450ff5647182..c50477e78e0334 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_20.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.20. [TC-DM-4.20][WiFi] Verification for commands check
+    10.4.20. [TC-DM-4.20] [WiFi] Verification for commands check
     [DUT-Commissioner]
 
 config:
@@ -25,12 +25,135 @@ config:
 tests:
     - label: "DUT sends the ScanNetwork command to the TH"
       verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning scan-networks 1 0
+          ./chip-tool networkcommissioning scan-networks 1 0 --Ssid null --Breadcrumb 1
 
-          [1650388358.049099][44522:44527] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0000 Status=0x85
-          [1650388358.049146][44522:44527] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
-          [1650388358.049196][44522:44527] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650388358.049270][44522:44527] CHIP:EM: Sending Standalone Ack for MessageCounter:9254237 on exchange 22295i
+          [1653475026.012811][29937:29942] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
+          [1653475026.012942][29937:29942] CHIP:TOO:   ScanNetworksResponse: {
+          [1653475026.012983][29937:29942] CHIP:TOO:     networkingStatus: 0
+          [1653475026.013075][29937:29942] CHIP:TOO:     wiFiScanResults: 15 entries
+          [1653475026.013143][29937:29942] CHIP:TOO:       [1]: {
+          [1653475026.013169][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.013195][29937:29942] CHIP:TOO:         Ssid: 47524C507269766174655F455854
+          [1653475026.013219][29937:29942] CHIP:TOO:         Bssid: E01CFCE4B236
+          [1653475026.013242][29937:29942] CHIP:TOO:         Channel: 11
+          [1653475026.013264][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.013286][29937:29942] CHIP:TOO:         Rssi: -9
+          [1653475026.013310][29937:29942] CHIP:TOO:        }
+          [1653475026.013344][29937:29942] CHIP:TOO:       [2]: {
+          [1653475026.013368][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.013390][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.013414][29937:29942] CHIP:TOO:         Bssid: C006C3F95EEB
+          [1653475026.013436][29937:29942] CHIP:TOO:         Channel: 153
+          [1653475026.013458][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.013479][29937:29942] CHIP:TOO:         Rssi: -52
+          [1653475026.013500][29937:29942] CHIP:TOO:        }
+          [1653475026.013531][29937:29942] CHIP:TOO:       [3]: {
+          [1653475026.013556][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.013578][29937:29942] CHIP:TOO:         Ssid:
+          [1653475026.013599][29937:29942] CHIP:TOO:         Bssid: C606C3F95EEB
+          [1653475026.013621][29937:29942] CHIP:TOO:         Channel: 153
+          [1653475026.013642][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.013663][29937:29942] CHIP:TOO:         Rssi: -52
+          [1653475026.013684][29937:29942] CHIP:TOO:        }
+          [1653475026.013715][29937:29942] CHIP:TOO:       [4]: {
+          [1653475026.013738][29937:29942] CHIP:TOO:         Security: 12
+          [1653475026.013762][29937:29942] CHIP:TOO:         Ssid: 7A69676265652D7468726561642D3547487A
+          [1653475026.013784][29937:29942] CHIP:TOO:         Bssid: 6C198FC83ABE
+          [1653475026.013806][29937:29942] CHIP:TOO:         Channel: 44
+          [1653475026.013827][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.013848][29937:29942] CHIP:TOO:         Rssi: -55
+          [1653475026.013869][29937:29942] CHIP:TOO:        }
+          [1653475026.013900][29937:29942] CHIP:TOO:       [5]: {
+          [1653475026.013923][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.013945][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.013967][29937:29942] CHIP:TOO:         Bssid: C006C3F95F31
+          [1653475026.013988][29937:29942] CHIP:TOO:         Channel: 48
+          [1653475026.014029][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.014051][29937:29942] CHIP:TOO:         Rssi: -65
+          [1653475026.014073][29937:29942] CHIP:TOO:        }
+          [1653475026.014106][29937:29942] CHIP:TOO:       [6]: {
+          [1653475026.014129][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.014151][29937:29942] CHIP:TOO:         Ssid:
+          [1653475026.014172][29937:29942] CHIP:TOO:         Bssid: C606C3F95F31
+          [1653475026.014194][29937:29942] CHIP:TOO:         Channel: 48
+          [1653475026.014215][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.014236][29937:29942] CHIP:TOO:         Rssi: -65
+          [1653475026.014257][29937:29942] CHIP:TOO:        }
+          [1653475026.014288][29937:29942] CHIP:TOO:       [7]: {
+          [1653475026.014311][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.014335][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.014357][29937:29942] CHIP:TOO:         Bssid: C006C3F95ECF
+          [1653475026.014379][29937:29942] CHIP:TOO:         Channel: 153
+          [1653475026.014400][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.014421][29937:29942] CHIP:TOO:         Rssi: -68
+          [1653475026.014442][29937:29942] CHIP:TOO:        }
+          [1653475026.014473][29937:29942] CHIP:TOO:       [8]: {
+          [1653475026.014496][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.014518][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.014540][29937:29942] CHIP:TOO:         Bssid: 1027F5374EC7
+          [1653475026.014561][29937:29942] CHIP:TOO:         Channel: 153
+          [1653475026.014582][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.014603][29937:29942] CHIP:TOO:         Rssi: -73
+          [1653475026.014624][29937:29942] CHIP:TOO:        }
+          [1653475026.014654][29937:29942] CHIP:TOO:       [9]: {
+          [1653475026.014677][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.014698][29937:29942] CHIP:TOO:         Ssid:
+          [1653475026.014720][29937:29942] CHIP:TOO:         Bssid: 1627F5374EC7
+          [1653475026.014741][29937:29942] CHIP:TOO:         Channel: 153
+          [1653475026.014762][29937:29942] CHIP:TOO:         WiFiBand: 2
+          [1653475026.014783][29937:29942] CHIP:TOO:         Rssi: -72
+          [1653475026.014804][29937:29942] CHIP:TOO:        }
+          [1653475026.014834][29937:29942] CHIP:TOO:       [10]: {
+          [1653475026.014858][29937:29942] CHIP:TOO:         Security: 12
+          [1653475026.014880][29937:29942] CHIP:TOO:         Ssid: 4368697031
+          [1653475026.014902][29937:29942] CHIP:TOO:         Bssid: 0C0E764EF1C8
+          [1653475026.014923][29937:29942] CHIP:TOO:         Channel: 11
+          [1653475026.014944][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.014965][29937:29942] CHIP:TOO:         Rssi: -38
+          [1653475026.014986][29937:29942] CHIP:TOO:        }
+          [1653475026.015017][29937:29942] CHIP:TOO:       [11]: {
+          [1653475026.015039][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.015061][29937:29942] CHIP:TOO:         Ssid: 4368697073657475703442
+          [1653475026.015083][29937:29942] CHIP:TOO:         Bssid: E01CFCEA2A46
+          [1653475026.015105][29937:29942] CHIP:TOO:         Channel: 11
+          [1653475026.015126][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.015147][29937:29942] CHIP:TOO:         Rssi: -34
+          [1653475026.015168][29937:29942] CHIP:TOO:        }
+          [1653475026.015198][29937:29942] CHIP:TOO:       [12]: {
+          [1653475026.015221][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.015244][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.015266][29937:29942] CHIP:TOO:         Bssid: 6032B197B89E
+          [1653475026.015288][29937:29942] CHIP:TOO:         Channel: 11
+          [1653475026.015309][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.015330][29937:29942] CHIP:TOO:         Rssi: -37
+          [1653475026.015351][29937:29942] CHIP:TOO:        }
+          [1653475026.015381][29937:29942] CHIP:TOO:       [13]: {
+          [1653475026.015404][29937:29942] CHIP:TOO:         Security: 12
+          [1653475026.015427][29937:29942] CHIP:TOO:         Ssid: 7A69676265652D746872656164
+          [1653475026.015449][29937:29942] CHIP:TOO:         Bssid: 6C198FC83ABC
+          [1653475026.015470][29937:29942] CHIP:TOO:         Channel: 2
+          [1653475026.015491][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.015512][29937:29942] CHIP:TOO:         Rssi: -40
+          [1653475026.015533][29937:29942] CHIP:TOO:        }
+          [1653475026.015563][29937:29942] CHIP:TOO:       [14]: {
+          [1653475026.015587][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.015609][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.015631][29937:29942] CHIP:TOO:         Bssid: 1027F5374EC6
+          [1653475026.015652][29937:29942] CHIP:TOO:         Channel: 6
+          [1653475026.015673][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.015694][29937:29942] CHIP:TOO:         Rssi: -53
+          [1653475026.015714][29937:29942] CHIP:TOO:        }
+          [1653475026.015745][29937:29942] CHIP:TOO:       [15]: {
+          [1653475026.015768][29937:29942] CHIP:TOO:         Security: 8
+          [1653475026.015789][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
+          [1653475026.015811][29937:29942] CHIP:TOO:         Bssid: C006C3F95ECE
+          [1653475026.015832][29937:29942] CHIP:TOO:         Channel: 6
+          [1653475026.015853][29937:29942] CHIP:TOO:         WiFiBand: 0
+          [1653475026.015874][29937:29942] CHIP:TOO:         Rssi: -50
+          [1653475026.015896][29937:29942] CHIP:TOO:        }
+          [1653475026.015920][29937:29942] CHIP:TOO:    }
+          [1653475026.016050][29937:29942] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1653475026.016114][29937:29942] CHIP:EM: Sending Standalone Ack for MessageCounter:14684023 on exchange 35456i
       disabled: true
 
     - label: "DUT sends the ArmFailSafe command to the TH"
@@ -61,20 +184,6 @@ tests:
           [1650371276.622728][42488:42493] CHIP:EM: Sending Standalone Ack for MessageCounter:9593846 on exchange 33754i
       disabled: true
 
-    - label: "DUT sends the RemoveNetwork command to the TH"
-      verification: |
-          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
-
-          [1650373300.704806][42697:42702] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650373300.704864][42697:42702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650373300.704957][42697:42702] CHIP:TOO:   NetworkConfigResponse: {
-          [1650373300.705012][42697:42702] CHIP:TOO:     networkingStatus: 0
-          [1650373300.705044][42697:42702] CHIP:TOO:     networkIndex: 0
-          [1650373300.705073][42697:42702] CHIP:TOO:    }
-          [1650373300.705120][42697:42702] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650373300.705181][42697:42702] CHIP:EM: Sending Standalone Ack for MessageCounter:9924068 on exchange 3557i
-      disabled: true
-
     - label: "DUT sends the ConnectNetwork command to the TH"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
@@ -102,3 +211,17 @@ tests:
           [1650381494.821087][44087:44092] CHIP:DMG: ICR moving to [AwaitingDe]
           [1650381494.821174][44087:44092] CHIP:EM: Sending Standalone Ack for MessageCounter:5656346 on exchange 4849i
       disabled: true
+
+    - label: "DUT sends the RemoveNetwork command to the TH"
+      verification: |
+          ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
+
+          [1650373300.704806][42697:42702] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          [1650373300.704864][42697:42702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
+          [1650373300.704957][42697:42702] CHIP:TOO:   NetworkConfigResponse: {
+          [1650373300.705012][42697:42702] CHIP:TOO:     networkingStatus: 0
+          [1650373300.705044][42697:42702] CHIP:TOO:     networkIndex: 0
+          [1650373300.705073][42697:42702] CHIP:TOO:    }
+          [1650373300.705120][42697:42702] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1650373300.705181][42697:42702] CHIP:EM: Sending Standalone Ack for MessageCounter:9924068 on exchange 3557i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_21.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_21.yaml
index 65e9587e3578f0..01b958e5247a99 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_21.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.21. [TC-DM-4.21][Thread] Verification for commands check
+    10.4.21. [TC-DM-4.21] [Thread] Verification for commands check
     [DUT-Commissioner]
 
 config:
@@ -105,18 +105,6 @@ tests:
           [1650388639.091393][9682:9687] CHIP:CTL: Performing next commissioning step 'ThreadNetworkEnable'
       disabled: true
 
-    - label: "DUT sends the RemoveNetwork command to the TH"
-      verification: |
-          ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning  remove-network 0119100899082022 62 0
-
-          [1650391420.469341][10048:10053] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650391420.469452][10048:10053] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650391420.469634][10048:10053] CHIP:TOO:   NetworkConfigResponse: {
-          [1650391420.469746][10048:10053] CHIP:TOO:     networkingStatus: 3
-          [1650391420.469812][10048:10053] CHIP:TOO:    }
-          [1650391420.469902][10048:10053] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
-
     - label: "DUT sends the ConnectNetwork command to the TH"
       verification: |
           Executed during the commissioning
@@ -137,3 +125,15 @@ tests:
           [1650392602.379792][10158:10163] CHIP:TOO:    }
           [1650392602.379882][10158:10163] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
+
+    - label: "DUT sends the RemoveNetwork command to the TH"
+      verification: |
+          ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning  remove-network 0119100899082022 62 0
+
+          [1650391420.469341][10048:10053] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          [1650391420.469452][10048:10053] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
+          [1650391420.469634][10048:10053] CHIP:TOO:   NetworkConfigResponse: {
+          [1650391420.469746][10048:10053] CHIP:TOO:     networkingStatus: 3
+          [1650391420.469812][10048:10053] CHIP:TOO:    }
+          [1650391420.469902][10048:10053] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_3.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_3.yaml
index 07e4403383c21d..0b457cb5934d26 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_3.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.3. [TC-DM-4.3][Ethernet] Verification for attributes check [DUT -
+    10.4.3. [TC-DM-4.3] [Ethernet] Verification for attributes check [DUT -
     Commissionee]
 
 config:
@@ -28,16 +28,16 @@ tests:
 
       disabled: true
 
-    - label: "TH1 is commissioned with DUT"
+    - label: "Commmission TH and DUT on Ethernet setup"
       verification: |
 
       disabled: true
 
     - label:
-          "TH1 reads Descriptor Cluster from the DUT with EP0 TH1 reads
-          ServerList from the DUT"
+          "TH reads Descriptor Cluster from the DUT with EP0 TH reads ServerList
+          from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool descriptor read server-list 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool descriptor read server-list 1 0
 
 
           [1646226258.250313][2446:2451] CHIP:DMG:        SuppressResponse = true,
@@ -73,7 +73,7 @@ tests:
           [1646226258.255517][2446:2451] CHIP:EM: Sending Standalone Ack for MessageCounter:10627940 on exchange 21443i
       disabled: true
 
-    - label: "TH1 reads FeatureMap attribute from the DUT"
+    - label: "TH reads FeatureMap attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read feature-map 1 0
 
@@ -84,9 +84,9 @@ tests:
           [1649309323.278863][2611:2617] CHIP:EM: Sending Standalone Ack for MessageCounter:532597 on exchange 51560i
       disabled: true
 
-    - label: "TH1 reads the MaxNetworks attribute from the DUT"
+    - label: "TH reads the MaxNetworks attribute from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read max-networks 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read max-networks 1 0
 
           [1646226441.815782][2475:2480] CHIP:DMG:        SuppressResponse = true,
           [1646226441.815849][2475:2480] CHIP:DMG:        InteractionModelRevision = 1
@@ -97,26 +97,28 @@ tests:
       disabled: true
 
     - label:
-          "TH1 saves the MaxNetworks attribute value as 'maxvalue' for furture
-          use"
+          "TH saves the MaxNetworks attribute value as 'MaxNetworksValue' for
+          future use"
       verification: |
-
+          TH saves MaxNetworks attribute value
       disabled: true
 
-    - label: "TH1 reads the Networks attribute list from the DUT"
+    - label: "TH reads the Networks attribute list from the DUT"
       verification: |
-          Expected 1 entires
-
-          ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
-
-          [1649310351.178908][2677:2682] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3138976789
-          [1649310351.178985][2677:2682] CHIP:TOO:   Networks: 0 entries
-          [1649310351.179103][2677:2682] CHIP:EM: Sending Standalone Ack for MessageCounter:8390931 on exchange 1768i
+          ./chip-tool networkcommissioning read networks 1 0
+
+          [1653483289.382372][28210:28215] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3189790698
+          [1653483289.382458][28210:28215] CHIP:TOO:   Networks: 1 entries
+          [1653483289.382507][28210:28215] CHIP:TOO:     [1]: {
+          [1653483289.382537][28210:28215] CHIP:TOO:       NetworkID: 65746830
+          [1653483289.382561][28210:28215] CHIP:TOO:       Connected: TRUE
+          [1653483289.382584][28210:28215] CHIP:TOO:      }
+          [1653483289.382684][28210:28215] CHIP:EM: Sending Standalone Ack for MessageCounter:13711908 on exchange 32535i
       disabled: true
 
-    - label: "TH1 reads InterfaceEnabled attribute from the DUT"
+    - label: "TH reads InterfaceEnabled attribute from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read interface-enabled 1 0
+          ./chip-tool networkcommissioning read interface-enabled 1 0
 
           [1646226615.428003][2502:2507] CHIP:DMG:
           [1646226615.428035][2502:2507] CHIP:DMG:        SuppressResponse = true,
@@ -127,9 +129,9 @@ tests:
           [1646226615.428415][2502:2507] CHIP:EM: Sending Standalone Ack for MessageCounter:3894401 on exchange 55691i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-networking-status 1 0
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read last-networking-status 1 0
 
           [1646227167.614060][2533:2538] CHIP:DMG:        SuppressResponse = true,
           [1646227167.614095][2533:2538] CHIP:DMG:        InteractionModelRevision = 1
@@ -140,29 +142,21 @@ tests:
       disabled: true
 
     - label:
-          "TH1 reads the LastNetworkID attribute from the DUT TH1 reads the
+          "TH reads the LastNetworkID attribute from the DUT TH reads the
           Networks attribute from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-network-id 1 0
-
-          [1646227218.543427][2545:2550] CHIP:DMG:
-          [1646227218.543462][2545:2550] CHIP:DMG:        SuppressResponse = true,
-          [1646227218.543506][2545:2550] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227218.543538][2545:2550] CHIP:DMG: }
-          [1646227218.543748][2545:2550] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006DataVersion: 3622667250
-          [1646227218.543836][2545:2550] CHIP:TOO:   LastNetworkID:
-          [1646227218.543924][2545:2550] CHIP:EM: Sending Standalone Ack for MessageCounter:9758721 on exchange 15256i
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read last-network-id 1 0
+
+          [1653483162.950672][28180:28185] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 3189790698
+          [1653483162.950726][28180:28185] CHIP:TOO:   LastNetworkID: null
+          [1653483162.950827][28180:28185] CHIP:EM: Sending Standalone Ack for MessageCounter:13275609 on exchange 15586i
       disabled: true
 
-    - label: "TH1 reads the LastConnectErrorValue attribute from the DUT"
+    - label: "TH reads the LastConnectErrorValue attribute from the DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-connect-error-value 1 0
-
-          [1646227266.753206][2560:2565] CHIP:DMG:
-          [1646227266.753239][2560:2565] CHIP:DMG:        SuppressResponse = true,
-          [1646227266.753272][2560:2565] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227266.753303][2560:2565] CHIP:DMG: }
-          [1646227266.753472][2560:2565] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007DataVersion: 3622667250
-          [1646227266.753556][2560:2565] CHIP:TOO:   LastConnectErrorValue: 0
-          [1646227266.753632][2560:2565] CHIP:EM: Sending Standalone Ack for MessageCounter:7911198 on exchange 43970i
+          ubuntu@ubuntu:~/apps$ ./chip-tool networkcommissioning read last-connect-error-value 1 0
+
+          [1653483224.839873][28189:28194] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 3189790698
+          [1653483224.839927][28189:28194] CHIP:TOO:   LastConnectErrorValue: null
+          [1653483224.840028][28189:28194] CHIP:EM: Sending Standalone Ack for MessageCounter:289132 on exchange 60682i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_4.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_4.yaml
index b75aea60b2bfec..db23be3e48f84d 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_4.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.4. [TC-DM-4.4][WiFi]Verification for ScanNetworks command
+    10.4.4. [TC-DM-4.4] [WiFi]Verification for ScanNetworks command
     [DUT-Commissionee]
 
 config:
@@ -24,8 +24,8 @@ config:
 
 tests:
     - label:
-          "TH1 sends ScanNetworks command to the DUT with the SSID argument
-          value as null and Breadcrumb argument value as 0"
+          "TH sends ScanNetworks command to the DUT with the SSID argument value
+          as 'null' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip$ sudo ./examples/chip-tool/out/debug/chip-tool networkcommissioning scan-networks null 0 1 0 --paa-trust-store-path ./credentials/development/paa-root-certs
 
@@ -160,8 +160,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends ScanNetworks Command to the DUT with SSID argument value as
-          'Userwifi_ssid' and Breadcrumb argument value 0"
+          "TH sends ScanNetworks Command to the DUT with SSID argument value as
+          'Userwifi_ssid' and Breadcrumb argument value 1"
       verification: |
           ubuntu@ubuntu:~/sethu-apr1/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning scan-networks 47524C507269766174655F455854 0 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_5.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_5.yaml
index 0b269c572dd68e..22cc50794822da 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_5.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.5. [TC-DM-4.5][WiFi] UNSUPPORTED_ACCESS message Validation
+    10.4.5. [TC-DM-4.5] [WiFi] UNSUPPORTED_ACCESS message Validation
     [DUT-Commissionee]
 
 config:
@@ -24,9 +24,10 @@ config:
 
 tests:
     - label:
-          "TH1 sends the AddOrUpdateWiFiNetwork command to the DUT with the
+          "TH sends the AddOrUpdateWiFiNetwork command to the DUT with the
           following argument: SSID argument value as 'Userwifi_ssid' Credentials
-          argument value as 'xxxxx' Breadcrumb argument value as 0"
+          argument value as 'Userwifi_Credentials' Breadcrumb argument value as
+          1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
 
@@ -37,8 +38,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends RemoveNetwork command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid' and Breadcrumb argument value as 0"
+          "TH sends RemoveNetwork command to the DUT with NetworkID argument
+          value as 'Userwifi_ssid' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
@@ -49,8 +50,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid' and Breadcrumb argument value as 0"
+          "TH sends ConnectNetwork command to the DUT with NetworkID argument
+          value as 'Userwifi_ssid' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_6.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_6.yaml
index 5e3794d153ffff..1d58f4faa54a63 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_6.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.6. [TC-DM-4.6][Thread] UNSUPPORTED_ACCESS message Validation
+    10.4.6. [TC-DM-4.6] [Thread] UNSUPPORTED_ACCESS message Validation
     [DUT-Commissionee]
 
 config:
@@ -24,9 +24,9 @@ config:
 
 tests:
     - label:
-          "TH1 sends the AddOrUpdateThreadNetwork command to the DUT with the
+          "TH sends the AddOrUpdateThreadNetwork command to the DUT with the
           following argument: OperationalDataset argument value as 'Userth_op'
-          Breadcrumb argument value as 0"
+          Breadcrumb argument value as 1"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-thread-network 1232034768527434274  51 0
 
@@ -37,8 +37,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends RemoveNetwork command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
+          "TH sends RemoveNetwork command to the DUT with NetworkID argument
+          value as 'Userth_op' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network 1232034768527434274 51 0
 
@@ -49,8 +49,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
+          "TH sends ConnectNetwork command to the DUT with NetworkID argument
+          value as 'Userth_op' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning connect-network 1232034768527434274 51 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_7.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_7.yaml
index 474eaf73912efb..b2e500498edc92 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_7.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.7. [TC-DM-4.7][WiFi] Verification for AddOrUpdateWiFiNetwork command
+    10.4.7. [TC-DM-4.7] [WiFi] Verification for AddOrUpdateWiFiNetwork command
     [DUT-Commissionee]
 
 config:
@@ -23,7 +23,7 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label: "Verify that DUT sends ArmFailSafeResponse command to the TH"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
 
@@ -38,9 +38,9 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
-          argument value as 'Userwifi_ssid', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
+          "TH sends AddOrUpdateWiFiNetwork command to the DUT with SSID argument
+          value as 'Userwifi_ssid', Credentials argument value as
+          'Userwifi_Credentials' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
 
@@ -54,7 +54,7 @@ tests:
           [1650371276.622728][42488:42493] CHIP:EM: Sending Standalone Ack for MessageCounter:9593846 on exchange 33754i
       disabled: true
 
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
+    - label: "TH reads MaxNetworks attribute from the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read max-networks 1 0
 
@@ -63,7 +63,7 @@ tests:
           [1650371283.620939][42495:42500] CHIP:EM: Sending Standalone Ack for MessageCounter:8017442 on exchange 15049i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 1 0
 
@@ -72,7 +72,7 @@ tests:
           [1650371290.738335][42502:42507] CHIP:EM: Sending Standalone Ack for MessageCounter:4381870 on exchange 56044i
       disabled: true
 
-    - label: "TH1 reads Networks attribute from the DUT"
+    - label: "TH reads Networks attribute from the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_8.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_8.yaml
index 1474aaea5cdd73..ee3679aae370dd 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_8.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.8. [TC-DM-4.8][Thread] Verification for AddOrUpdateThreadNetwork
+    10.4.8. [TC-DM-4.8] [Thread] Verification for AddOrUpdateThreadNetwork
     command [DUT-Commissionee]
 
 config:
@@ -23,7 +23,9 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label:
+          "During the commissioning process, TH sends ArmFailSafe command to the
+          DUT"
       verification: |
           Executed during the commissioning
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool pairing ble-thread 62 hex:0e080000000000010000000300001035060004001fffe0020801191008990820220708fd067fa7635e1066051009116253045736078899aabbccddeeff030e4f70656e686b72657069446f6e6f01021234041029282c49503302ea4536648015d1ff180c0402a0fff8 20202021 3840
@@ -38,9 +40,9 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends AddOrUpdateThreadNetwork command to the DUT with
-          OperationalDataset argument value as 'Userth_op' and Breadcrumb
-          argument value as 0"
+          "During the commissioning process, TH sends AddOrUpdateThreadNetwork
+          command to the DUT with OperationalDataset argument value as
+          'Userth_op' and Breadcrumb argument value as 1"
       verification: |
           Executed during the commissioning
           ubuntu@ubuntu:~/cntl/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool pairing ble-thread 62 hex:0e080000000000010000000300001035060004001fffe0020801191008990820220708fd067fa7635e1066051009116253045736078899aabbccddeeff030e4f70656e686b72657069446f6e6f01021234041029282c49503302ea4536648015d1ff180c0402a0fff8 20202021 3840
@@ -57,7 +59,9 @@ tests:
           [1650388639.091393][9682:9687] CHIP:CTL: Performing next commissioning step 'ThreadNetworkEnable'
       disabled: true
 
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
+    - label:
+          "After commissioning completes, TH reads MaxNetworks attribute from
+          the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read max-networks 162 0
 
@@ -70,7 +74,7 @@ tests:
           [1645772548.258032][3837:3842] CHIP:EM: Sending Standalone Ack for MessageCounter:7388528 on exchange 41499i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
           ./chip-tool networkcommissioning read last-networking-status 51 0
 
@@ -79,7 +83,7 @@ tests:
           [1650371954.334942][7548:7553] CHIP:EM: Sending Standalone Ack for MessageCounter:4654405 on exchange 45344i
       disabled: true
 
-    - label: "TH1 reads Networks attribute from the DUT"
+    - label: "TH reads Networks attribute from the DUT"
       verification: |
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_DM_4_9.yaml b/src/app/tests/suites/certification/Test_TC_DM_4_9.yaml
index 3750369acbc5f7..84ef9ae662a150 100644
--- a/src/app/tests/suites/certification/Test_TC_DM_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DM_4_9.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    10.4.9. [TC-DM-4.9][WiFi] Verification for RemoveNetwork Command
+    10.4.9. [TC-DM-4.9] [WiFi] Verification for RemoveNetwork Command
     [DUT-Commissionee]
 
 config:
@@ -23,7 +23,7 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
+    - label: "TH sends ArmFailSafe command to the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
 
@@ -39,7 +39,7 @@ tests:
     - label:
           "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
           argument value as 'Userwifi_ssid', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
+          'Userwifi_Credentials' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
 
@@ -67,8 +67,8 @@ tests:
       disabled: true
 
     - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid' and Breadcrumb argument value as 0"
+          "TH sends RemoveNetwork Command to the DUT with NetworkID argument
+          value as 'Userwifi_ssid' and Breadcrumb argument value as 1"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
@@ -91,7 +91,7 @@ tests:
           [1650373307.420120][42703:42708] CHIP:EM: Sending Standalone Ack for MessageCounter:11050013 on exchange 13049i
       disabled: true
 
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
+    - label: "TH reads LastNetworkingStatus attribute from the DUT"
       verification: |
           ubuntu@TE-8:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_Diag_Log_2_1.yaml b/src/app/tests/suites/certification/Test_TC_Diag_Log_2_1.yaml
deleted file mode 100644
index 579d1f19fea7f9..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_Diag_Log_2_1.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    54.2. [TC-Diag Log-2.1] Diagnostic Logs Cluster Commands Checks with BDX
-    [DUT Server]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Reboot DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "Commission DUT to TH"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends RetrieveLogsRequest Command (Intent =
-          EndUserSupport,TransferFileDesignator = ''test.txt'',
-          RequestedProtocol= BDX) to DUT"
-      verification: |
-          sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 1 "test.txt" 1 0
-
-          [1646208340.191466][3171:3176] CHIP:DMG: ICR moving to [ResponseRe]
-          [1646208340.191525][3171:3176] CHIP:DMG: InvokeResponseMessage =
-          [1646208340.191558][3171:3176] CHIP:DMG: {
-          [1646208340.191589][3171:3176] CHIP:DMG:        suppressResponse = false,
-          [1646208340.191622][3171:3176] CHIP:DMG:        InvokeResponseIBs =
-          [1646208340.191663][3171:3176] CHIP:DMG:        [
-          [1646208340.191696][3171:3176] CHIP:DMG:                InvokeResponseIB =
-          [1646208340.191743][3171:3176] CHIP:DMG:                {
-          [1646208340.191778][3171:3176] CHIP:DMG:                        CommandStatusIB =
-          [1646208340.191819][3171:3176] CHIP:DMG:                        {
-          [1646208340.191862][3171:3176] CHIP:DMG:                                CommandPathIB =
-          [1646208340.191907][3171:3176] CHIP:DMG:                                {
-          [1646208340.191953][3171:3176] CHIP:DMG:                                   EndpointId = 0x0,
-          [1646208340.192004][3171:3176] CHIP:DMG:                                   ClusterId = 0x32,
-          [1646208340.192049][3171:3176] CHIP:DMG:                                   CommandId = 0x0,
-          [1646208340.192093][3171:3176] CHIP:DMG:                                },
-          [1646208340.192138][3171:3176] CHIP:DMG:
-          [1646208340.192177][3171:3176] CHIP:DMG:                                StatusIB =
-          [1646208340.192224][3171:3176] CHIP:DMG:                                {
-          [1646208340.192271][3171:3176] CHIP:DMG:                                   status = 0x0,
-          [1646208340.192319][3171:3176] CHIP:DMG:                                },
-          [1646208340.192362][3171:3176] CHIP:DMG:
-          [1646208340.192401][3171:3176] CHIP:DMG:                        },
-          [1646208340.192450][3171:3176] CHIP:DMG:
-          [1646208340.192486][3171:3176] CHIP:DMG:                },
-          [1646208340.192530][3171:3176] CHIP:DMG:
-          [1646208340.192562][3171:3176] CHIP:DMG:        ],
-          [1646208340.192602][3171:3176] CHIP:DMG:
-          [1646208340.192634][3171:3176] CHIP:DMG:        InteractionModelRevision = 1
-          [1646208340.192665][3171:3176] CHIP:DMG: },
-          [1646208340.192744][3171:3176] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
-      disabled: true
-
-    - label: "TH Sends BDX SendAccept message"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends RetrieveLogsRequest Command (Intent =
-          EndUserSupport,TransferFileDesignator = ''test.txt'',
-          RequestedProtocol= BDX) to DUT"
-      verification: |
-          sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 1 "test.txt" 1 0
-
-          [1646208340.191466][3171:3176] CHIP:DMG: ICR moving to [ResponseRe]
-          [1646208340.191525][3171:3176] CHIP:DMG: InvokeResponseMessage =
-          [1646208340.191558][3171:3176] CHIP:DMG: {
-          [1646208340.191589][3171:3176] CHIP:DMG:        suppressResponse = false,
-          [1646208340.191622][3171:3176] CHIP:DMG:        InvokeResponseIBs =
-          [1646208340.191663][3171:3176] CHIP:DMG:        [
-          [1646208340.191696][3171:3176] CHIP:DMG:                InvokeResponseIB =
-          [1646208340.191743][3171:3176] CHIP:DMG:                {
-          [1646208340.191778][3171:3176] CHIP:DMG:                        CommandStatusIB =
-          [1646208340.191819][3171:3176] CHIP:DMG:                        {
-          [1646208340.191862][3171:3176] CHIP:DMG:                                CommandPathIB =
-          [1646208340.191907][3171:3176] CHIP:DMG:                                {
-          [1646208340.191953][3171:3176] CHIP:DMG:                                   EndpointId = 0x0,
-          [1646208340.192004][3171:3176] CHIP:DMG:                                   ClusterId = 0x32,
-          [1646208340.192049][3171:3176] CHIP:DMG:                                   CommandId = 0x0,
-          [1646208340.192093][3171:3176] CHIP:DMG:                                },
-          [1646208340.192138][3171:3176] CHIP:DMG:
-          [1646208340.192177][3171:3176] CHIP:DMG:                                StatusIB =
-          [1646208340.192224][3171:3176] CHIP:DMG:                                {
-          [1646208340.192271][3171:3176] CHIP:DMG:                                   status = 0x0,
-          [1646208340.192319][3171:3176] CHIP:DMG:                                },
-          [1646208340.192362][3171:3176] CHIP:DMG:
-          [1646208340.192401][3171:3176] CHIP:DMG:                        },
-          [1646208340.192450][3171:3176] CHIP:DMG:
-          [1646208340.192486][3171:3176] CHIP:DMG:                },
-          [1646208340.192530][3171:3176] CHIP:DMG:
-          [1646208340.192562][3171:3176] CHIP:DMG:        ],
-          [1646208340.192602][3171:3176] CHIP:DMG:
-          [1646208340.192634][3171:3176] CHIP:DMG:        InteractionModelRevision = 1
-          [1646208340.192665][3171:3176] CHIP:DMG: },
-          [1646208340.192744][3171:3176] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
-      disabled: true
-
-    - label:
-          "TH Sends StatusReport(GeneralCode: FAILURE, ProtocolId: BDX,
-          ProtocolCode: TRANSFER_METHOD_NOT_SUPPORTED"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH sends RetrieveLogsRequest Command (Intent = EndUserSupport,
-          RequestedProtocol = ResponsePayload) to DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
-
-          [1646209207.288760][3223:3228] CHIP:DMG: ICR moving to [ResponseRe]
-          [1646209207.288823][3223:3228] CHIP:DMG: InvokeResponseMessage =
-          [1646209207.288859][3223:3228] CHIP:DMG: {
-          [1646209207.288893][3223:3228] CHIP:DMG:        suppressResponse = false,
-          [1646209207.288928][3223:3228] CHIP:DMG:        InvokeResponseIBs =
-          [1646209207.288972][3223:3228] CHIP:DMG:        [
-          [1646209207.289006][3223:3228] CHIP:DMG:                InvokeResponseIB =
-          [1646209207.289056][3223:3228] CHIP:DMG:                {
-          [1646209207.289096][3223:3228] CHIP:DMG:                        CommandStatusIB =
-          [1646209207.289146][3223:3228] CHIP:DMG:                        {
-          [1646209207.289189][3223:3228] CHIP:DMG:                                CommandPathIB =
-          [1646209207.289237][3223:3228] CHIP:DMG:                                {
-          [1646209207.289285][3223:3228] CHIP:DMG:                                   EndpointId = 0x0,
-          [1646209207.289338][3223:3228] CHIP:DMG:                                   ClusterId = 0x32,
-          [1646209207.289391][3223:3228] CHIP:DMG:                                   CommandId = 0x0,
-          [1646209207.289434][3223:3228] CHIP:DMG:                                },
-          [1646209207.289479][3223:3228] CHIP:DMG:
-          [1646209207.289521][3223:3228] CHIP:DMG:                                StatusIB =
-          [1646209207.289573][3223:3228] CHIP:DMG:                                {
-          [1646209207.289619][3223:3228] CHIP:DMG:                                   status = 0x0,
-          [1646209207.289666][3223:3228] CHIP:DMG:                                },
-          [1646209207.289715][3223:3228] CHIP:DMG:
-          [1646209207.289756][3223:3228] CHIP:DMG:                        },
-          [1646209207.289804][3223:3228] CHIP:DMG:
-          [1646209207.289842][3223:3228] CHIP:DMG:                },
-          [1646209207.289889][3223:3228] CHIP:DMG:
-          [1646209207.289923][3223:3228] CHIP:DMG:        ],
-          [1646209207.289966][3223:3228] CHIP:DMG:
-          [1646209207.289999][3223:3228] CHIP:DMG:        InteractionModelRevision = 1
-          [1646209207.290032][3223:3228] CHIP:DMG: },
-          [1646209207.290116][3223:3228] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_Diag_Log_2_3.yaml b/src/app/tests/suites/certification/Test_TC_Diag_Log_2_3.yaml
deleted file mode 100644
index d57c3a3aa10dd7..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_Diag_Log_2_3.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    54.4. [TC-Diag Log-2.3] Diagnostic Logs Cluster Commands Checks[DUT Client]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Commission DUT to TH"
-      verification: |
-
-      disabled: true
-
-    - label: "DUT sends RetrieveLogsRequest Command to TH"
-      verification: |
-          grl_matter@GRL-Matters-MacBook-Air debug % ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
-
-          [1646215088531] [15387:2221674] CHIP: [DMG] InvokeResponseMessage =
-          [1646215088531] [15387:2221674] CHIP: [DMG] {
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	suppressResponse = false,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	InvokeResponseIBs =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	[
-          [1646215088531] [15387:2221674] CHIP: [DMG] 		InvokeResponseIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 		{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 			CommandStatusIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 			{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				CommandPathIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					EndpointId = 0x0,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					ClusterId = 0x32,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					CommandId = 0x0,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				StatusIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					status = 0x0,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 			},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 		},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	],
-          [1646215088532] [15387:2221674] CHIP: [DMG]
-          [1646215088532] [15387:2221674] CHIP: [DMG] 	InteractionModelRevision = 1
-          [1646215088532] [15387:2221674] CHIP: [DMG] },
-          [1646215088532] [15387:2221674] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
-      disabled: true
-
-    - label: "In case TH initiates a BDX Transfer"
-      verification: |
-
-      disabled: true
-
-    - label: "In case TH does not initiate BDX Transfer"
-      verification: |
-          grl_matter@GRL-Matters-MacBook-Air debug % ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
-
-          [1646215088531] [15387:2221674] CHIP: [DMG] InvokeResponseMessage =
-          [1646215088531] [15387:2221674] CHIP: [DMG] {
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	suppressResponse = false,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	InvokeResponseIBs =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	[
-          [1646215088531] [15387:2221674] CHIP: [DMG] 		InvokeResponseIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 		{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 			CommandStatusIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 			{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				CommandPathIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					EndpointId = 0x0,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					ClusterId = 0x32,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					CommandId = 0x0,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				StatusIB =
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				{
-          [1646215088531] [15387:2221674] CHIP: [DMG] 					status = 0x0,
-          [1646215088531] [15387:2221674] CHIP: [DMG] 				},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 			},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 		},
-          [1646215088531] [15387:2221674] CHIP: [DMG]
-          [1646215088531] [15387:2221674] CHIP: [DMG] 	],
-          [1646215088532] [15387:2221674] CHIP: [DMG]
-          [1646215088532] [15387:2221674] CHIP: [DMG] 	InteractionModelRevision = 1
-          [1646215088532] [15387:2221674] CHIP: [DMG] },
-          [1646215088532] [15387:2221674] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_0032 Command=0x0000_0000 Status=0x0
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml
deleted file mode 100644
index b3669266f0f28b..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: 48.1.1. [TC-ETHDIAG-1.1] Attributes with server as DUT
-
-config:
-    nodeId: 0x12344321
-    cluster: "Ethernet Network Diagnostics"
-    endpoint: 0
-
-tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    #Disabled due to issue #16552 and #13648
-    - label: "Read PHYRate attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PHYRate"
-      response:
-          value: null
-
-    - label: "Read PHYRate attribute constraints"
-      command: "readAttribute"
-      attribute: "PHYRate"
-      response:
-          constraints:
-              type: enum8
-              minValue: 0
-              maxValue: 9
-
-    - label: "Read FullDuplex attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "FullDuplex"
-      response:
-          value: null
-
-    - label: "Read FullDuplex attribute constraints"
-      command: "readAttribute"
-      attribute: "FullDuplex"
-      response:
-          constraints:
-              type: bool
-
-    - label: "Read PacketRxCount attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PacketRxCount"
-      response:
-          value: 0
-
-    - label: "Read PacketRxCount attribute constraints"
-      command: "readAttribute"
-      attribute: "PacketRxCount"
-      response:
-          constraints:
-              type: uint64
-
-    - label: "Read PacketTxCount attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PacketTxCount"
-      response:
-          value: 0
-
-    - label: "Read PacketTxCount attribute constraints"
-      command: "readAttribute"
-      attribute: "PacketTxCount"
-      response:
-          constraints:
-              type: uint64
-
-    - label: "Read TxErrCount attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "TxErrCount"
-      response:
-          value: 0
-
-    - label: "Read TxErrCount attribute constraints"
-      command: "readAttribute"
-      attribute: "TxErrCount"
-      response:
-          constraints:
-              type: uint64
-
-    - label: "Read CollisionCount attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "CollisionCount"
-      response:
-          value: 0
-
-    - label: "Read CollisionCount attribute constraints"
-      command: "readAttribute"
-      attribute: "CollisionCount"
-      response:
-          constraints:
-              type: uint64
-
-    - label: "Read OverrunCount attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "OverrunCount"
-      response:
-          value: 0
-
-    - label: "Read OverrunCount attribute constraints"
-      command: "readAttribute"
-      attribute: "OverrunCount"
-      response:
-          constraints:
-              type: uint64
-
-    - label: "Read CarrierDetect attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "CarrierDetect"
-      response:
-          value: null
-
-    - label: "Read CarrierDetect attribute constraints"
-      command: "readAttribute"
-      attribute: "CarrierDetect"
-      response:
-          constraints:
-              type: bool
-
-    - label: "Read TimeSinceReset attribute"
-      disabled: true
-      command: "readAttribute"
-      attribute: "TimeSinceReset"
-      response:
-          value: 0
-
-    - label: "Read TimeSinceReset attribute constraints"
-      command: "readAttribute"
-      attribute: "TimeSinceReset"
-      response:
-          constraints:
-              type: uint64
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
new file mode 100644
index 00000000000000..2b5a8bd27bc68e
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
@@ -0,0 +1,83 @@
+# 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: 98.1. [TC-FLABEL-1.1] Global Attributes [DUT-server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool fixedlabel read cluster-revision 1 0
+
+          [1651124058.497301][2367:2372] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFFD DataVersion: 3688229931
+          [1651124058.498753][2367:2372] CHIP:TOO:   ClusterRevision: 1
+          [1651124058.498906][2367:2372] CHIP:EM: Sending Standalone Ack for MessageCounter:8872582 on exchange 60871i
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool fixedlabel read feature-map 1 0
+
+          [1653459204.749193][24610:24615] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFFC DataVersion: 4022759920
+          [1653459204.749266][24610:24615] CHIP:TOO:   FeatureMap: 0
+          [1653459204.749410][24610:24615] CHIP:EM: Sending Standalone Ack for MessageCounter:7681110 on exchange 50174i
+      disabled: true
+
+    - label: "TH reads AttributeList from DUT"
+      verification: |
+          ./chip-tool fixedlabel read attribute-list 1 0
+
+
+          [1651124128.610488][2381:2386] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFFB DataVersion: 3688229931
+          [1651124128.610670][2381:2386] CHIP:TOO:   AttributeList: 5 entries
+          [1651124128.610719][2381:2386] CHIP:TOO:     [1]: 0
+          [1651124128.610758][2381:2386] CHIP:TOO:     [2]: 65528
+          [1651124128.610794][2381:2386] CHIP:TOO:     [3]: 65529
+          [1651124128.610831][2381:2386] CHIP:TOO:     [4]: 65531
+          [1651124128.610867][2381:2386] CHIP:TOO:     [5]: 65533
+          [1651124128.611068][2381:2386] CHIP:EM: Sending Standalone Ack for MessageCounter:12258956 on exchange 48899i
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool fixedlabel read accepted-command-list 1 0
+
+          [1651124239.450485][2392:2397] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFF9 DataVersion: 3688229931
+          [1651124239.450576][2392:2397] CHIP:TOO:   AcceptedCommandList: 0 entries
+          [1651124239.450713][2392:2397] CHIP:EM: Sending Standalone Ack for MessageCounter:5032784 on exchange 23524i
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool fixedlabel read generated-command-list 1 0
+
+          [1651124266.980698][2527:2532] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFF8 DataVersion: 3688229931
+          [1651124266.980776][2527:2532] CHIP:TOO:   GeneratedCommandList: 0 entries
+          [1651124266.980897][2527:2532] CHIP:EM: Sending Standalone Ack for MessageCounter:11345894 on exchange 5110i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
new file mode 100644
index 00000000000000..fbf9ddfb2b8155
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
@@ -0,0 +1,58 @@
+# 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: 98.2. [TC-FLABEL-2.1] Fixed Label cluster [DUT-server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH tries to write LabelList attribute of the DUT by setting Label =
+          'Test_Label', Value= 'Test_Value'"
+      verification: |
+          ./chip-tool fixedlabel write-by-id  0x00 '["label":"Testlabel", "value":"testvalue"]' 1 0
+
+          [1654000813.726531][7713:7718] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1654000813.726603][7713:7718] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
+          [1654000813.726707][7713:7718] CHIP:EM: Sending Standalone Ack for MessageCounter:11245962 on exchange 35967i
+      disabled: true
+
+    - label: "TH reads LabelList from the DUT"
+      verification: |
+          ./chip-tool fixedlabel read label-list 1 0
+
+          [1651124649.820293][2819:2824] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_0000 DataVersion: 3688229931
+          [1651124649.820478][2819:2824] CHIP:TOO:   label list: 4 entries
+          [1651124649.820534][2819:2824] CHIP:TOO:     [1]: {
+          [1651124649.820570][2819:2824] CHIP:TOO:       Label: room
+          [1651124649.820602][2819:2824] CHIP:TOO:       Value: bedroom 2
+          [1651124649.820636][2819:2824] CHIP:TOO:      }
+          [1651124649.820676][2819:2824] CHIP:TOO:     [2]: {
+          [1651124649.820709][2819:2824] CHIP:TOO:       Label: orientation
+          [1651124649.820741][2819:2824] CHIP:TOO:       Value: North
+          [1651124649.820773][2819:2824] CHIP:TOO:      }
+          [1651124649.820812][2819:2824] CHIP:TOO:     [3]: {
+          [1651124649.820845][2819:2824] CHIP:TOO:       Label: floor
+          [1651124649.820875][2819:2824] CHIP:TOO:       Value: 2
+          [1651124649.820906][2819:2824] CHIP:TOO:      }
+          [1651124649.820945][2819:2824] CHIP:TOO:     [4]: {
+          [1651124649.820977][2819:2824] CHIP:TOO:       Label: direction
+          [1651124649.821008][2819:2824] CHIP:TOO:       Value: up
+          [1651124649.821039][2819:2824] CHIP:TOO:      }
+          [1651124649.821193][2819:2824] CHIP:EM: Sending Standalone Ack for MessageCounter:2439070 on exchange 10798i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_2_2.yaml
new file mode 100644
index 00000000000000..52571a678cae6c
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_2_2.yaml
@@ -0,0 +1,47 @@
+# 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: 98.3. [TC-FLABEL-2.2] Fixed Label cluster [DUT-client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT reads LabelList from the TH"
+      verification: |
+          ./chip-tool fixedlabel read label-list 1 0
+
+          [1651124649.820293][2819:2824] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_0000 DataVersion: 3688229931
+          [1651124649.820478][2819:2824] CHIP:TOO:   label list: 4 entries
+          [1651124649.820534][2819:2824] CHIP:TOO:     [1]: {
+          [1651124649.820570][2819:2824] CHIP:TOO:       Label: room
+          [1651124649.820602][2819:2824] CHIP:TOO:       Value: bedroom 2
+          [1651124649.820636][2819:2824] CHIP:TOO:      }
+          [1651124649.820676][2819:2824] CHIP:TOO:     [2]: {
+          [1651124649.820709][2819:2824] CHIP:TOO:       Label: orientation
+          [1651124649.820741][2819:2824] CHIP:TOO:       Value: North
+          [1651124649.820773][2819:2824] CHIP:TOO:      }
+          [1651124649.820812][2819:2824] CHIP:TOO:     [3]: {
+          [1651124649.820845][2819:2824] CHIP:TOO:       Label: floor
+          [1651124649.820875][2819:2824] CHIP:TOO:       Value: 2
+          [1651124649.820906][2819:2824] CHIP:TOO:      }
+          [1651124649.820945][2819:2824] CHIP:TOO:     [4]: {
+          [1651124649.820977][2819:2824] CHIP:TOO:       Label: direction
+          [1651124649.821008][2819:2824] CHIP:TOO:       Value: up
+          [1651124649.821039][2819:2824] CHIP:TOO:      }
+          [1651124649.821193][2819:2824] CHIP:EM: Sending Standalone Ack for MessageCounter:2439070 on exchange 10798i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
index 069ae11b303dac..2cd6e9863ec0f8 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
@@ -32,11 +32,18 @@ tests:
       command: "readAttribute"
       attribute: "MeasuredValue"
       response:
+          saveAs: ValueBeforeChange
           constraints:
               type: uint16
 
     - label: "operate on DUT to change the flow significantly"
-      disabled: true
+      PICS: MANUAL_FLOW_CHANGE
+      cluster: "LogCommands"
+      command: "Log"
+      arguments:
+          values:
+              - name: "message"
+                value: "Operate on device to change the flow significantly"
 
     - label: "read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
@@ -44,3 +51,4 @@ tests:
       response:
           constraints:
               type: uint16
+              notValue: ValueBeforeChange
diff --git a/src/app/tests/suites/certification/Test_TC_GR_1_1.yaml b/src/app/tests/suites/certification/Test_TC_GR_1_1.yaml
new file mode 100644
index 00000000000000..a8c4468b85433f
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_GR_1_1.yaml
@@ -0,0 +1,88 @@
+# 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: 120.1.1. [TC-GR-1.1] Global Attributes [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool groups read cluster-revision 1 0
+
+          [1651216621.203474][2391:2396] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFD DataVersion: 745654550
+          [1651216621.204919][2391:2396] CHIP:TOO:   ClusterRevision: 4
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool groups read feature-map 1 0
+
+          [1651216952.185475][2414:2419] CHIP:DMG:
+          [1651216952.185500][2414:2419] CHIP:DMG:        SuppressResponse = true,
+          [1651216952.185525][2414:2419] CHIP:DMG:        InteractionModelRevision = 1
+          [1651216952.185548][2414:2419] CHIP:DMG: }
+          [1651216952.185658][2414:2419] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "TH reads AttribubteList from DUT"
+      verification: |
+          ./chip-tool groups read attribute-list 1 0
+
+          [1651217016.772370][2424:2429] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFB DataVersion: 745654550
+          [1651217016.772471][2424:2429] CHIP:TOO:   AttributeList: 5 entries
+          [1651217016.772519][2424:2429] CHIP:TOO:     [1]: 0
+          [1651217016.772558][2424:2429] CHIP:TOO:     [2]: 65528
+          [1651217016.772595][2424:2429] CHIP:TOO:     [3]: 65529
+          [1651217016.772632][2424:2429] CHIP:TOO:     [4]: 65531
+          [1651217016.772667][2424:2429] CHIP:TOO:     [5]: 65533
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          Event List is not implemented
+      disabled: true
+
+    - label: "TH reads AcceptedCommandList from DUT"
+      verification: |
+          ./chip-tool groups read accepted-command-list 1 0
+
+          [1651217107.034926][2435:2440] CHIP:TOO:   AcceptedCommandList: 6 entries
+          [1651217107.034984][2435:2440] CHIP:TOO:     [1]: 0
+          [1651217107.035028][2435:2440] CHIP:TOO:     [2]: 1
+          [1651217107.035070][2435:2440] CHIP:TOO:     [3]: 2
+          [1651217107.035112][2435:2440] CHIP:TOO:     [4]: 3
+          [1651217107.035153][2435:2440] CHIP:TOO:     [5]: 4
+          [1651217107.035194][2435:2440] CHIP:TOO:     [6]: 5
+      disabled: true
+
+    - label: "TH reads GeneratedCommandList from DUT"
+      verification: |
+          ./chip-tool groups read generated-command-list 1 0
+
+          [1651217152.020233][2444:2449] CHIP:TOO:   GeneratedCommandList: 4 entries
+          [1651217152.020276][2444:2449] CHIP:TOO:     [1]: 0
+          [1651217152.020312][2444:2449] CHIP:TOO:     [2]: 1
+          [1651217152.020346][2444:2449] CHIP:TOO:     [3]: 2
+          [1651217152.020380][2444:2449] CHIP:TOO:     [4]: 3
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_GR_2_1.yaml b/src/app/tests/suites/certification/Test_TC_GR_2_1.yaml
new file mode 100644
index 00000000000000..d18fbe21449373
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_GR_2_1.yaml
@@ -0,0 +1,51 @@
+# 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: 120.2.1. [TC-GR-2.1] Groups Cluster Attributes [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "TH reads NameSupport attribute from DUT"
+      verification: |
+          ./chip-tool groups read name-support 1 0
+
+          [1651217306.461810][2457:2462] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 745654550
+          [1651217306.461894][2457:2462] CHIP:TOO:   name support: 128
+      disabled: true
+
+    - label: "TH writes NameSupport attribute as 1"
+      verification: |
+          ./chip-tool groups write-by-id 0x0000 1 1 0
+
+          [1651217949.041814][2514:2519] CHIP:DMG: }
+          [1651217949.041889][2514:2519] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
+      disabled: true
+
+    - label: "TH reads NameSupport attribute from DUT"
+      verification: |
+          ./chip-tool groups read name-support 1 0
+
+          [1651217306.461810][2457:2462] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 745654550
+          [1651217306.461894][2457:2462] CHIP:TOO:   name support: 128
+      disabled: true
+
+    - label: "TH reads Group Names from DUT"
+      verification: |
+          FeatureMap is not Implemented
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_GR_2_2.yaml b/src/app/tests/suites/certification/Test_TC_GR_2_2.yaml
new file mode 100644
index 00000000000000..a7d3caa2278263
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_GR_2_2.yaml
@@ -0,0 +1,438 @@
+# 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: 120.2.2. [TC-GR-2.2] Groups Cluster Commands [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH sends AddGroup command to DUT as unicast with the following fields
+          : GroupID as 0x0001 GroupName as Gp1 TH reads GroupTable attribute
+          from the GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups add-group 0x0001 grp1 1 0
+
+          [1651218084.427102][2526:2531] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1651218084.427203][2526:2531] CHIP:TOO:   AddGroupResponse: {
+          [1651218084.427241][2526:2531] CHIP:TOO:     status: 0
+          [1651218084.427264][2526:2531] CHIP:TOO:     groupId: 1
+          [1651218084.427314][2526:2531] CHIP:TOO:    }
+
+           ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651218198.062850][2538:2543] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
+          [1651218198.062980][2538:2543] CHIP:TOO:   GroupTable: 1 entries
+          [1651218198.067019][2538:2543] CHIP:TOO:     [1]: {
+          [1651218198.067076][2538:2543] CHIP:TOO:       GroupId: 1
+          [1651218198.067123][2538:2543] CHIP:TOO:       Endpoints: 1 entries
+          [1651218198.067192][2538:2543] CHIP:TOO:         [1]: 0
+          [1651218198.067241][2538:2543] CHIP:TOO:       GroupName: grp1
+          [1651218198.067284][2538:2543] CHIP:TOO:       FabricIndex: 1
+          [1651218198.067327][2538:2543] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends AddGroup command to DUT as unicast with the following fields
+          : GroupID as 0x0002 GroupName as Gp2 TH reads GroupTable attribute
+          from the GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups add-group 0x0002 gp2 1 0
+
+          [1651218295.126708][2549:2554] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1651218295.126880][2549:2554] CHIP:TOO:   AddGroupResponse: {
+          [1651218295.126955][2549:2554] CHIP:TOO:     status: 0
+          [1651218295.127009][2549:2554] CHIP:TOO:     groupId: 2
+          [1651218295.127065][2549:2554] CHIP:TOO:    }
+
+           ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651218330.067438][2555:2560] CHIP:TOO:   GroupTable: 2 entries
+          [1651218330.067549][2555:2560] CHIP:TOO:     [1]: {
+          [1651218330.067584][2555:2560] CHIP:TOO:       GroupId: 1
+          [1651218330.067618][2555:2560] CHIP:TOO:       Endpoints: 1 entries
+          [1651218330.067671][2555:2560] CHIP:TOO:         [1]: 0
+          [1651218330.067708][2555:2560] CHIP:TOO:       GroupName: grp1
+          [1651218330.067739][2555:2560] CHIP:TOO:       FabricIndex: 1
+          [1651218330.067771][2555:2560] CHIP:TOO:      }
+          [1651218330.067814][2555:2560] CHIP:TOO:     [2]: {
+          [1651218330.067845][2555:2560] CHIP:TOO:       GroupId: 2
+          [1651218330.067877][2555:2560] CHIP:TOO:       Endpoints: 1 entries
+          [1651218330.067912][2555:2560] CHIP:TOO:         [1]: 0
+          [1651218330.067945][2555:2560] CHIP:TOO:       GroupName: gp2
+          [1651218330.067975][2555:2560] CHIP:TOO:       FabricIndex: 1
+          [1651218330.068004][2555:2560] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends AddGroup command to DUT as unicast with the following fields
+          : GroupID as 0xffff1 GroupName as Gp1"
+      verification: |
+          ./chip-tool any command-by-id 0x0004 0x00 '{ "0": 65536, "1": "my-group-name"}' 1 0
+
+          [1652694139.686651][3527:3532] CHIP:DMG:                                StatusIB =
+          [1652694139.686694][3527:3532] CHIP:DMG:                                {
+          [1652694139.686739][3527:3532] CHIP:DMG:                                        status = 0x85 (INVALID_COMMAND),
+          [1652694139.686805][3527:3532] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH sends AddGroup command to DUT as unicast with the following fields
+          : GroupID as 0x0001 GroupName as Gp1"
+      verification: |
+          ./chip-tool groups add-group 0x0001 grp1 1 0
+
+          [1651218468.562070][2571:2576] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1651218468.562159][2571:2576] CHIP:TOO:   AddGroupResponse: {
+          [1651218468.562200][2571:2576] CHIP:TOO:     status: 0
+          [1651218468.562228][2571:2576] CHIP:TOO:     groupId: 1
+          [1651218468.562256][2571:2576] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH sends AddGroup command to DUT as groupcast with the following
+          fields : GroupID as 0x0001 GroupName as Gp1"
+      verification: |
+          Not Verifiable - Groupcast is not implemented
+      disabled: true
+
+    - label:
+          "TH sends ViewGroup command to DUT as unicast with the following
+          fields: GroupID as 0x0001 TH reads GroupTable attribute from the
+          GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups view-group 0x0001 1 0
+
+          [1651218576.149152][2635:2640] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
+          [1651218576.149231][2635:2640] CHIP:TOO:   ViewGroupResponse: {
+          [1651218576.149265][2635:2640] CHIP:TOO:     status: 0
+          [1651218576.149289][2635:2640] CHIP:TOO:     groupId: 1
+          [1651218576.149311][2635:2640] CHIP:TOO:     groupName: grp1
+          [1651218576.149335][2635:2640] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH sends ViewGroup command to DUT as unicast with the following
+          fields: GroupID as 0xffff1 TH reads GroupTable attribute from the
+          GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool any command-by-id 0x0004 0x01 '{ "0": 65536}' 1 0
+
+          [1652694208.352334][3535:3540] CHIP:DMG:                                StatusIB =
+          [1652694208.352389][3535:3540] CHIP:DMG:                                {
+          [1652694208.352444][3535:3540] CHIP:DMG:                                        status = 0x85 (INVALID_COMMAND),
+          [1652694208.352499][3535:3540] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH sends ViewGroup command to DUT as unicast with the following
+          fields: GroupID as 0x0021 TH reads GroupTable attribute from the
+          GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups view-group 0x0021 1 0
+
+          [1651218681.672376][2670:2675] CHIP:TOO:   ViewGroupResponse: {
+          [1651218681.672425][2670:2675] CHIP:TOO:     status: 139
+          [1651218681.672459][2670:2675] CHIP:TOO:     groupId: 33
+          [1651218681.672491][2670:2675] CHIP:TOO:     groupName:
+          [1651218681.672525][2670:2675] CHIP:TOO:    }
+
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651218720.422085][2679:2684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
+          [1651218720.422183][2679:2684] CHIP:TOO:   GroupTable: 2 entries
+          [1651218720.422287][2679:2684] CHIP:TOO:     [1]: {
+          [1651218720.422319][2679:2684] CHIP:TOO:       GroupId: 1
+          [1651218720.422350][2679:2684] CHIP:TOO:       Endpoints: 1 entries
+          [1651218720.422397][2679:2684] CHIP:TOO:         [1]: 0
+          [1651218720.422430][2679:2684] CHIP:TOO:       GroupName: grp1
+          [1651218720.422458][2679:2684] CHIP:TOO:       FabricIndex: 1
+          [1651218720.422487][2679:2684] CHIP:TOO:      }
+          [1651218720.422525][2679:2684] CHIP:TOO:     [2]: {
+          [1651218720.422554][2679:2684] CHIP:TOO:       GroupId: 2
+          [1651218720.422583][2679:2684] CHIP:TOO:       Endpoints: 1 entries
+          [1651218720.422614][2679:2684] CHIP:TOO:         [1]: 0
+          [1651218720.422644][2679:2684] CHIP:TOO:       GroupName: gp2
+          [1651218720.422671][2679:2684] CHIP:TOO:       FabricIndex: 1
+          [1651218720.422697][2679:2684] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends ViewGroup command to DUT as groupcast with the following
+          fields: GroupID as 0x0001"
+      verification: |
+          Not Verifiable - Groupcast is not implemented
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as NULL"
+      verification: |
+          ./chip-tool groups get-group-membership null 1 0
+          [1651225366.576335][3070:3070] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as 0x0087"
+      verification: |
+          ./chip-tool groups get-group-membership 0x0087 1 0
+          [1651223496.759731][2878:2878] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT as unicast with the
+          following fields : GroupList as 0x0087, 0x0059"
+      verification: |
+          ./chip-tool groups get-group-membership 0x0087 0x0059 1 0
+          [1651223591.798819][2884:2884] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as 0x0087"
+      verification: |
+          ./chip-tool groups get-group-membership 0x0087 1 0
+          [1651223496.759731][2878:2878] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as 0x0087"
+      verification: |
+          ./chip-tool groups get-group-membership 0x0087 1 0
+          [1651223496.759731][2878:2878] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as 0x0087"
+      verification: |
+          ./chip-tool groups get-group-membership 0x0087 1 0
+          [1651223496.759731][2878:2878] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as 0x0087"
+      verification: |
+          ./chip-tool groups get-group-membership 0x0087 1 0
+          [1651223496.759731][2878:2878] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label:
+          "TH sends RemoveGroup command to DUT as unicast with the following
+          field : GroupID as 0x0001"
+      verification: |
+          ./chip-tool groups remove-group 0x0001 1 0
+
+          [1651224005.648529][2908:2913] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
+          [1651224005.648605][2908:2913] CHIP:TOO:   RemoveGroupResponse: {
+          [1651224005.648641][2908:2913] CHIP:TOO:     status: 0
+          [1651224005.648664][2908:2913] CHIP:TOO:     groupId: 1
+          [1651224005.648688][2908:2913] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH sends ViewGroup command to DUT as unicast with the following field
+          : GroupID as 0x0001 TH reads GroupTable attribute from the
+          GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups remove-group 0x0001 1 0
+
+
+          [1651224045.228384][2914:2919] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
+          [1651224045.228459][2914:2919] CHIP:TOO:   RemoveGroupResponse: {
+          [1651224045.228494][2914:2919] CHIP:TOO:     status: 139
+          [1651224045.228517][2914:2919] CHIP:TOO:     groupId: 1
+          [1651224045.228540][2914:2919] CHIP:TOO:    }
+
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651224212.774362][2968:2973] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
+          [1651224212.774556][2968:2973] CHIP:TOO:   GroupTable: 2 entries
+          [1651224212.774677][2968:2973] CHIP:TOO:     [1]: {
+          [1651224212.774714][2968:2973] CHIP:TOO:       GroupId: 1
+          [1651224212.774749][2968:2973] CHIP:TOO:       Endpoints: 0 entries
+          [1651224212.774805][2968:2973] CHIP:TOO:       GroupName: grp1
+          [1651224212.774840][2968:2973] CHIP:TOO:       FabricIndex: 1
+          [1651224212.774874][2968:2973] CHIP:TOO:      }
+          [1651224212.774921][2968:2973] CHIP:TOO:     [2]: {
+          [1651224212.774955][2968:2973] CHIP:TOO:       GroupId: 2
+          [1651224212.774990][2968:2973] CHIP:TOO:       Endpoints: 1 entries
+          [1651224212.775027][2968:2973] CHIP:TOO:         [1]: 0
+          [1651224212.775063][2968:2973] CHIP:TOO:       GroupName: gp2
+          [1651224212.775096][2968:2973] CHIP:TOO:       FabricIndex: 1
+          [1651224212.775128][2968:2973] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends RemoveGroup command to DUT as unicast with the following
+          field : GroupID as 0xfffd1"
+      verification: |
+          ./chip-tool any command-by-id 0x0004 0x03 '{ "0": 65536}' 1 0
+
+          [1652694249.934023][3542:3547] CHIP:DMG:                                StatusIB =
+          [1652694249.934061][3542:3547] CHIP:DMG:                                {
+          [1652694249.934099][3542:3547] CHIP:DMG:                                        status = 0x85 (INVALID_COMMAND),
+          [1652694249.934137][3542:3547] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH sends RemoveGroup command to DUT as unicast with the following
+          field : GroupID as 0x0034"
+      verification: |
+          ./chip-tool groups remove-group 0x0034 1 0
+
+          [1651224136.480197][2924:2929] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
+          [1651224136.480339][2924:2929] CHIP:TOO:   RemoveGroupResponse: {
+          [1651224136.480403][2924:2929] CHIP:TOO:     status: 139
+          [1651224136.480452][2924:2929] CHIP:TOO:     groupId: 52
+          [1651224136.480501][2924:2929] CHIP:TOO:    }
+      disabled: true
+
+    - label: "TH sends RemoveAllGroup command to DUT as unicast method"
+      verification: |
+          ./chip-tool groups remove-all-groups 1 0
+
+          [1651224377.831704][2989:2994] CHIP:DMG:                                StatusIB =
+          [1651224377.831757][2989:2994] CHIP:DMG:                                {
+          [1651224377.831812][2989:2994] CHIP:DMG:                                      status = 0x00 (SUCCESS),
+          [1651224377.831866][2989:2994] CHIP:DMG:                                },
+          [1651224377.832439][2989:2994] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0004 Status=0x0
+      disabled: true
+
+    - label:
+          "TH sends ViewGroup command to DUT as unicast with the following
+          fields: GroupID as 0x0021 TH reads GroupTable attribute from the
+          GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups view-group 0x0021 1 0
+
+          [1651224444.124557][2996:3001] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
+          [1651224444.124663][2996:3001] CHIP:TOO:   ViewGroupResponse: {
+          [1651224444.124712][2996:3001] CHIP:TOO:     status: 139
+          [1651224444.124745][2996:3001] CHIP:TOO:     groupId: 33
+          [1651224444.124778][2996:3001] CHIP:TOO:     groupName:
+          [1651224444.124811][2996:3001] CHIP:TOO:    }
+
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651224488.427512][3006:3011] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
+          [1651224488.427617][3006:3011] CHIP:TOO:   GroupTable: 2 entries
+          [1651224488.427728][3006:3011] CHIP:TOO:     [1]: {
+          [1651224488.427763][3006:3011] CHIP:TOO:       GroupId: 1
+          [1651224488.427797][3006:3011] CHIP:TOO:       Endpoints: 0 entries
+          [1651224488.427848][3006:3011] CHIP:TOO:       GroupName: grp1
+          [1651224488.427881][3006:3011] CHIP:TOO:       FabricIndex: 1
+          [1651224488.427912][3006:3011] CHIP:TOO:      }
+          [1651224488.427954][3006:3011] CHIP:TOO:     [2]: {
+          [1651224488.427987][3006:3011] CHIP:TOO:       GroupId: 2
+          [1651224488.428019][3006:3011] CHIP:TOO:       Endpoints: 0 entries
+          [1651224488.428053][3006:3011] CHIP:TOO:       GroupName: gp2
+          [1651224488.428083][3006:3011] CHIP:TOO:       FabricIndex: 1
+          [1651224488.428113][3006:3011] CHIP:TOO:      }
+          [1651224488.428226][3006:3011] CHIP:EM: Sending Sta
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT as unicast method with
+          the following fields: GroupID as 0x0025 GroupName as Gp37 TH reads
+          GroupTable attribute from the GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0025 gp37 1 0
+
+          [1651224553.023824][3016:3021] CHIP:DMG:                                StatusIB =
+          [1651224553.023865][3016:3021] CHIP:DMG:                                {
+          [1651224553.023910][3016:3021] CHIP:DMG:                                      status = 0x00 (SUCCESS),
+          [1651224553.023954][3016:3021] CHIP:DMG:                                },
+
+          [1651224553.024349][3016:3021] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0005 Status=0x0
+
+           ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651224613.251309][3026:3031] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
+          [1651224613.251399][3026:3031] CHIP:TOO:   GroupTable: 2 entries
+          [1651224613.251489][3026:3031] CHIP:TOO:     [1]: {
+          [1651224613.251515][3026:3031] CHIP:TOO:       GroupId: 1
+          [1651224613.251539][3026:3031] CHIP:TOO:       Endpoints: 0 entries
+          [1651224613.251579][3026:3031] CHIP:TOO:       GroupName: grp1
+          [1651224613.251603][3026:3031] CHIP:TOO:       FabricIndex: 1
+          [1651224613.251627][3026:3031] CHIP:TOO:      }
+          [1651224613.251658][3026:3031] CHIP:TOO:     [2]: {
+          [1651224613.251682][3026:3031] CHIP:TOO:       GroupId: 2
+          [1651224613.251705][3026:3031] CHIP:TOO:       Endpoints: 0 entries
+          [1651224613.251729][3026:3031] CHIP:TOO:       GroupName: gp2
+          [1651224613.251751][3026:3031] CHIP:TOO:       FabricIndex: 1
+          [1651224613.251772][3026:3031] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT as unicast method with
+          the following fields: GroupID as 0xffff5 GroupName as Gp45"
+      verification: |
+          ./chip-tool any command-by-id 0x0004 0x05 '{ "0": 65536, "1": "my-group-name"}' 1 0
+
+
+          [1652694344.895200][3560:3565] CHIP:DMG:                                StatusIB =
+          [1652694344.895245][3560:3565] CHIP:DMG:                                {
+          [1652694344.895298][3560:3565] CHIP:DMG:                                        status = 0x85 (INVALID_COMMAND),
+          [1652694344.895347][3560:3565] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT as unicast method with
+          the following fields: GroupID as 0x0067 GroupName as Gp31"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0067 gp31 1 0
+
+          [1651224746.146005][3038:3043] CHIP:DMG:                                StatusIB =
+          [1651224746.146038][3038:3043] CHIP:DMG:                                {
+          [1651224746.146073][3038:3043] CHIP:DMG:                                      status = 0x00 (SUCCESS),
+          [1651224746.146106][3038:3043] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT as unicast method with
+          the following fields: GroupID as 0x0052 GroupName as Gp54 TH reads
+          GroupTable attribute from the GroupKeyManagement cluster from DUT"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0052 gp54 1 0
+
+          [1651225850.524282][3091:3096] CHIP:DMG:                                StatusIB =
+          [1651225850.524314][3091:3096] CHIP:DMG:                                {
+          [1651225850.524347][3091:3096] CHIP:DMG:                                      status = 0x00 (SUCCESS),
+          [1651225850.524379][3091:3096] CHIP:DMG:                                },
+
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1651225880.217707][3099:3104] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
+          [1651225880.217848][3099:3104] CHIP:TOO:   GroupTable: 2 entries
+          [1651225880.217995][3099:3104] CHIP:TOO:     [1]: {
+          [1651225880.218042][3099:3104] CHIP:TOO:       GroupId: 1
+          [1651225880.218087][3099:3104] CHIP:TOO:       Endpoints: 0 entries
+          [1651225880.218156][3099:3104] CHIP:TOO:       GroupName: grp1
+          [1651225880.218200][3099:3104] CHIP:TOO:       FabricIndex: 1
+          [1651225880.218243][3099:3104] CHIP:TOO:      }
+          [1651225880.218299][3099:3104] CHIP:TOO:     [2]: {
+          [1651225880.218342][3099:3104] CHIP:TOO:       GroupId: 2
+          [1651225880.218384][3099:3104] CHIP:TOO:       Endpoints: 0 entries
+          [1651225880.218429][3099:3104] CHIP:TOO:       GroupName: gp2
+          [1651225880.218470][3099:3104] CHIP:TOO:       FabricIndex: 1
+          [1651225880.218509][3099:3104] CHIP:TOO:      }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_GR_2_3.yaml b/src/app/tests/suites/certification/Test_TC_GR_2_3.yaml
new file mode 100644
index 00000000000000..637999bf9eb4e7
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_GR_2_3.yaml
@@ -0,0 +1,225 @@
+# 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:
+    121.2.3. [TC-GR-2.3] Commands - GetGroupMembership, AddGroupIfIdentifying
+    [DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH sends AddGroup command to DUT as unicast with the following fields
+          : GroupID as 0x0002 GroupName as Gp2"
+      verification: |
+          ./chip-tool groups add-group 0x0002 gp2 1 0
+
+          [1653552285.195099][2464:2469] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1653552285.197783][2464:2469] CHIP:TOO:   AddGroupResponse: {
+          [1653552285.197849][2464:2469] CHIP:TOO:     status: 0
+          [1653552285.197877][2464:2469] CHIP:TOO:     groupId: 2
+          [1653552285.197933][2464:2469] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH reads GroupTable attribute from the GroupKeyManagement cluster
+          from DUT"
+      verification: |
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1653552351.250570][2474:2479] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1424397362
+          [1653552351.253012][2474:2479] CHIP:TOO:   GroupTable: 1 entries
+          [1653552351.255507][2474:2479] CHIP:TOO:     [1]: {
+          [1653552351.255546][2474:2479] CHIP:TOO:       GroupId: 2
+          [1653552351.255579][2474:2479] CHIP:TOO:       Endpoints: 1 entries
+          [1653552351.255628][2474:2479] CHIP:TOO:         [1]: 0
+          [1653552351.255664][2474:2479] CHIP:TOO:       GroupName: gp2
+          [1653552351.255695][2474:2479] CHIP:TOO:       FabricIndex: 1
+          [1653552351.255725][2474:2479] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends AddGroup command to DUT as unicast with the following fields
+          : GroupID as 0x0003 GroupName as Gp3"
+      verification: |
+          ./chip-tool groups add-group 0x0003 gp3 1 0
+
+          [1653552417.870291][2482:2487] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1653552417.870407][2482:2487] CHIP:TOO:   AddGroupResponse: {
+          [1653552417.870462][2482:2487] CHIP:TOO:     status: 0
+          [1653552417.870500][2482:2487] CHIP:TOO:     groupId: 3
+          [1653552417.870539][2482:2487] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH reads GroupTable attribute from the GroupKeyManagement cluster
+          from DUT"
+      verification: |
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1653552448.373558][2491:2496] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1424397362
+          [1653552448.373710][2491:2496] CHIP:TOO:   GroupTable: 2 entries
+          [1653552448.373856][2491:2496] CHIP:TOO:     [1]: {
+          [1653552448.373905][2491:2496] CHIP:TOO:       GroupId: 2
+          [1653552448.373951][2491:2496] CHIP:TOO:       Endpoints: 1 entries
+          [1653552448.374022][2491:2496] CHIP:TOO:         [1]: 0
+          [1653552448.374141][2491:2496] CHIP:TOO:       GroupName: gp2
+          [1653552448.374186][2491:2496] CHIP:TOO:       FabricIndex: 1
+          [1653552448.374228][2491:2496] CHIP:TOO:      }
+          [1653552448.374287][2491:2496] CHIP:TOO:     [2]: {
+          [1653552448.374331][2491:2496] CHIP:TOO:       GroupId: 3
+          [1653552448.374374][2491:2496] CHIP:TOO:       Endpoints: 1 entries
+          [1653552448.374421][2491:2496] CHIP:TOO:         [1]: 0
+          [1653552448.374467][2491:2496] CHIP:TOO:       GroupName: gp3
+          [1653552448.374508][2491:2496] CHIP:TOO:       FabricIndex: 1
+          [1653552448.374547][2491:2496] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as NULL"
+      verification: |
+          ./chip-tool groups get-group-membership [] 1 0
+
+          [1653552493.052711][2501:2506] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0002
+          [1653552493.052792][2501:2506] CHIP:TOO:   GetGroupMembershipResponse: {
+          [1653552493.052819][2501:2506] CHIP:TOO:     capacity: null
+          [1653552493.052870][2501:2506] CHIP:TOO:     groupList: 2 entries
+          [1653552493.052922][2501:2506] CHIP:TOO:       [1]: 2
+          [1653552493.052950][2501:2506] CHIP:TOO:       [2]: 3
+          [1653552493.052978][2501:2506] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT with the following fields
+          : GroupList as [0x0002]"
+      verification: |
+          ./chip-tool groups get-group-membership [0002] 1 0
+
+          [1653294426.515523][3638:3643] CHIP:TOO:   GetGroupMembershipResponse: {
+          [1653294426.515571][3638:3643] CHIP:TOO:     capacity: null
+          [1653294426.515649][3638:3643] CHIP:TOO:     groupList: 1 entries
+          [1653294426.515737][3638:3643] CHIP:TOO:       [1]: 2
+          [1653294426.515916][3638:3643] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH sends GetGroupMembership command to DUT as unicast with the
+          following fields : GroupList as [0x0002, 0x0003]"
+      verification: |
+          ./chip-tool groups get-group-membership [0002,0003] 1 0
+
+          [1653294490.030740][3646:3651] CHIP:TOO:   GetGroupMembershipResponse: {
+          [1653294490.030775][3646:3651] CHIP:TOO:     capacity: null
+          [1653294490.030838][3646:3651] CHIP:TOO:     groupList: 2 entries
+          [1653294490.030907][3646:3651] CHIP:TOO:       [1]: 2
+          [1653294490.030943][3646:3651] CHIP:TOO:       [2]: 3
+          [1653294490.030979][3646:3651] CHIP:TOO:    }
+      disabled: true
+
+    - label: "TH sends RemoveAllGroups command to DUT as unicast method"
+      verification: |
+          ./chip-tool groups remove-all-groups 1 0
+
+          [1651224377.831704][2989:2994] CHIP:DMG:                                StatusIB =
+          [1651224377.831757][2989:2994] CHIP:DMG:                                {
+          [1651224377.831812][2989:2994] CHIP:DMG:                                      status = 0x00 (SUCCESS),
+          [1651224377.831866][2989:2994] CHIP:DMG:                                },
+          [1651224377.832439][2989:2994] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0004 Status=0x0
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT as unicast method with
+          the following fields: GroupID as 0x0006 GroupName as Gp6"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0006 gp6 1 0
+
+          [1653552667.307794][2571:2576] CHIP:DMG:                                StatusIB =
+          [1653552667.307831][2571:2576] CHIP:DMG:                                {
+          [1653552667.307881][2571:2576] CHIP:DMG:                                   status = 0x00 (SUCCESS),
+          [1653552667.307922][2571:2576] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH reads GroupTable attribute from the GroupKeyManagement cluster
+          from DUT"
+      verification: |
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1653560429.549196][3373:3378] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 55663962
+          [1653560429.549335][3373:3378] CHIP:TOO:   GroupTable: 2 entries
+          [1653560429.549432][3373:3378] CHIP:TOO:     [1]: {
+          [1653560429.549484][3373:3378] CHIP:TOO:       GroupId: 2
+          [1653560429.549522][3373:3378] CHIP:TOO:       Endpoints: 0 entries
+          [1653560429.549562][3373:3378] CHIP:TOO:       GroupName: gp2
+          [1653560429.549598][3373:3378] CHIP:TOO:       FabricIndex: 1
+          [1653560429.549632][3373:3378] CHIP:TOO:      }
+          [1653560429.549678][3373:3378] CHIP:TOO:     [2]: {
+          [1653560429.549712][3373:3378] CHIP:TOO:       GroupId: 3
+          [1653560429.549746][3373:3378] CHIP:TOO:       Endpoints: 0 entries
+          [1653560429.549783][3373:3378] CHIP:TOO:       GroupName: gp3
+          [1653560429.549817][3373:3378] CHIP:TOO:       FabricIndex: 1
+          [1653560429.549849][3373:3378] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT as unicast method with
+          the following fields: GroupID as 0x0000 GroupName as Gp45"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0000 gp45 1 0
+
+
+          [1653552769.643278][2589:2594] CHIP:DMG:                                StatusIB =
+          [1653552769.643330][2589:2594] CHIP:DMG:                                {
+          [1653552769.643400][2589:2594] CHIP:DMG:                                   status = 0x00 (SUCCESS),
+          [1653552769.643459][2589:2594] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH sends AddGroupIfIdentifying command to DUT n+1 times as unicast
+          method with the following fields: GroupID as 0x0007 GroupName as Gp54"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0067 gp31 1 0
+
+          [1651224746.146005][3038:3043] CHIP:DMG:                                StatusIB =
+          [1651224746.146038][3038:3043] CHIP:DMG:                                {
+          [1651224746.146073][3038:3043] CHIP:DMG:                                      status = 0x00 (SUCCESS),
+          [1651224746.146106][3038:3043] CHIP:DMG:                                },
+      disabled: true
+
+    - label:
+          "TH reads GroupTable attribute from the GroupKeyManagement cluster
+          from DUT"
+      verification: |
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          [1653552886.221667][2625:2630] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1424397362
+          [1653552886.221787][2625:2630] CHIP:TOO:   GroupTable: 2 entries
+          [1653552886.221925][2625:2630] CHIP:TOO:     [1]: {
+          [1653552886.221966][2625:2630] CHIP:TOO:       GroupId: 2
+          [1653552886.222002][2625:2630] CHIP:TOO:       Endpoints: 0 entries
+          [1653552886.222057][2625:2630] CHIP:TOO:       GroupName: gp2
+          [1653552886.222103][2625:2630] CHIP:TOO:       FabricIndex: 1
+          [1653552886.222135][2625:2630] CHIP:TOO:      }
+          [1653552886.222177][2625:2630] CHIP:TOO:     [2]: {
+          [1653552886.222222][2625:2630] CHIP:TOO:       GroupId: 3
+          [1653552886.222255][2625:2630] CHIP:TOO:       Endpoints: 0 entries
+          [1653552886.222288][2625:2630] CHIP:TOO:       GroupName: gp3
+          [1653552886.222330][2625:2630] CHIP:TOO:       FabricIndex: 1
+          [1653552886.222361][2625:2630] CHIP:TOO:      }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_GR_3_1.yaml b/src/app/tests/suites/certification/Test_TC_GR_3_1.yaml
new file mode 100644
index 00000000000000..c05374dc1072e3
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_GR_3_1.yaml
@@ -0,0 +1,37 @@
+# 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: 120.3.1. [TC-GR-3.1] Groups Cluster Attributes [DUT-Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT reads NameSupport attribute from TH"
+      verification: |
+          [1651217683.754603][2825:2825] CHIP:IM: Received Read request
+          [1651217683.754677][2825:2825] CHIP:DMG: ReadRequestMessage =
+          [1651217683.754708][2825:2825] CHIP:DMG: {
+          [1651217683.754733][2825:2825] CHIP:DMG:        AttributePathIBs =
+          [1651217683.754764][2825:2825] CHIP:DMG:        [
+          [1651217683.754795][2825:2825] CHIP:DMG:                AttributePathIB =
+          [1651217683.754837][2825:2825] CHIP:DMG:                {
+          [1651217683.754891][2825:2825] CHIP:DMG:                        Endpoint = 0x0,
+          [1651217683.754934][2825:2825] CHIP:DMG:                        Cluster = 0x4,
+          [1651217683.754975][2825:2825] CHIP:DMG:                        Attribute = 0x0000_0000,
+          [1651217683.755014][2825:2825] CHIP:DMG:                }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_GR_3_2.yaml b/src/app/tests/suites/certification/Test_TC_GR_3_2.yaml
new file mode 100644
index 00000000000000..16135033b43667
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_GR_3_2.yaml
@@ -0,0 +1,216 @@
+# 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: 120.3.2. [TC-GR-3.2] Groups Cluster Commands [DUT-Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends AddGroup command to TH"
+      verification: |
+          ./chip-tool groups add-group 0x0021 gp1 1 0
+
+          [1651225952.475511][2825:2825] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:1704882 on exchange 15154r
+          [1651225952.475578][2825:2825] CHIP:EM: Handling via exchange: 15154r, Delegate: 0xaaaae659a088
+          [1651225952.475751][2825:2825] CHIP:DMG: InvokeRequestMessage =
+          [1651225952.475801][2825:2825] CHIP:DMG: {
+          [1651225952.475843][2825:2825] CHIP:DMG:        suppressResponse = false,
+
+          [1651225952.475892][2825:2825] CHIP:DMG:        timedRequest = false,
+          [1651225952.475937][2825:2825] CHIP:DMG:        InvokeRequests =
+          [1651225952.475993][2825:2825] CHIP:DMG:        [
+          [1651225952.476039][2825:2825] CHIP:DMG:                CommandDataIB =
+          [1651225952.476101][2825:2825] CHIP:DMG:                {
+          [1651225952.476182][2825:2825] CHIP:DMG:                        CommandPathIB =
+          [1651225952.476242][2825:2825] CHIP:DMG:                        {
+          [1651225952.476306][2825:2825] CHIP:DMG:                                EndpointId = 0x0,
+          [1651225952.476367][2825:2825] CHIP:DMG:                                ClusterId = 0x4,
+          [1651225952.476432][2825:2825] CHIP:DMG:                                CommandId = 0x0,
+          [1651225952.476488][2825:2825] CHIP:DMG:                        },
+          [1651225952.476548][2825:2825] CHIP:DMG:
+          [1651225952.476600][2825:2825] CHIP:DMG:                        CommandData =
+          [1651225952.476656][2825:2825] CHIP:DMG:                        {
+          [1651225952.476712][2825:2825] CHIP:DMG:                                0x0 = 33,
+          [1651225952.476783][2825:2825] CHIP:DMG:                                0x1 = "gp1",
+          [1651225952.476843][2825:2825] CHIP:DMG:                        },
+          [1651225952.476895][2825:2825] CHIP:DMG:                },
+          [1651225952.476954][2825:2825] CHIP:DMG:
+          [1651225952.476998][2825:2825] CHIP:DMG:        ],
+          [1651225952.477053][2825:2825] CHIP:DMG:
+          [1651225952.477097][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651225952.477140][2825:2825] CHIP:DMG: },
+          [1651225952.477247][2825:2825] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=0 p=m
+          [1651225952.477307][2825:2825] CHIP:DMG: AccessControl: allowed
+          [1651225952.477356][2825:2825] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0000
+      disabled: true
+
+    - label: "DUT sends ViewGroup command to TH"
+      verification: |
+          ./chip-tool groups view-group 0x0021 1 0
+
+
+          [1651226101.768577][2825:2825] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:3930774 on exchange 43755r
+          [1651226101.768631][2825:2825] CHIP:EM: Handling via exchange: 43755r, Delegate: 0xaaaae659a088
+          [1651226101.768775][2825:2825] CHIP:DMG: InvokeRequestMessage =
+          [1651226101.768817][2825:2825] CHIP:DMG: {
+          [1651226101.768851][2825:2825] CHIP:DMG:        suppressResponse = false,
+
+          [1651226101.768890][2825:2825] CHIP:DMG:        timedRequest = false,
+          [1651226101.768926][2825:2825] CHIP:DMG:        InvokeRequests =
+          [1651226101.768970][2825:2825] CHIP:DMG:        [
+          [1651226101.769006][2825:2825] CHIP:DMG:                CommandDataIB =
+          [1651226101.769056][2825:2825] CHIP:DMG:                {
+          [1651226101.769095][2825:2825] CHIP:DMG:                        CommandPathIB =
+          [1651226101.769142][2825:2825] CHIP:DMG:                        {
+          [1651226101.769187][2825:2825] CHIP:DMG:                                EndpointId = 0x0,
+          [1651226101.769236][2825:2825] CHIP:DMG:                                ClusterId = 0x4,
+          [1651226101.769288][2825:2825] CHIP:DMG:                                CommandId = 0x1,
+          [1651226101.769334][2825:2825] CHIP:DMG:                        },
+          [1651226101.769382][2825:2825] CHIP:DMG:
+          [1651226101.769423][2825:2825] CHIP:DMG:                        CommandData =
+          [1651226101.769467][2825:2825] CHIP:DMG:                        {
+          [1651226101.769514][2825:2825] CHIP:DMG:                                0x0 = 33,
+          [1651226101.769563][2825:2825] CHIP:DMG:                        },
+          [1651226101.769605][2825:2825] CHIP:DMG:                },
+          [1651226101.769651][2825:2825] CHIP:DMG:
+          [1651226101.769686][2825:2825] CHIP:DMG:        ],
+          [1651226101.769730][2825:2825] CHIP:DMG:
+          [1651226101.769764][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651226101.769797][2825:2825] CHIP:DMG: },
+          [1651226101.769884][2825:2825] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=0 p=o
+          [1651226101.769934][2825:2825] CHIP:DMG: AccessControl: allowed
+          [1651226101.769972][2825:2825] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0001
+      disabled: true
+
+    - label: "DUT sends GetGroupMembership command to TH"
+      verification: |
+          ./chip-tool groups get-group-membership 0x23 1 0
+          [1651226161.642052][3143:3143] CHIP:TOO: Error while encoding GroupList as an array.
+      disabled: true
+
+    - label: "DUT sends RemoveGroup command to TH"
+      verification: |
+          ./chip-tool groups remove-group 0x0021 1 0
+
+          [1651226210.554644][2825:2825] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:10617431 on exchange 56325r
+          [1651226210.554714][2825:2825] CHIP:EM: Handling via exchange: 56325r, Delegate: 0xaaaae659a088
+          [1651226210.554850][2825:2825] CHIP:DMG: InvokeRequestMessage =
+          [1651226210.554886][2825:2825] CHIP:DMG: {
+          [1651226210.554915][2825:2825] CHIP:DMG:        suppressResponse = false,
+
+          [1651226210.554958][2825:2825] CHIP:DMG:        timedRequest = false,
+          [1651226210.554988][2825:2825] CHIP:DMG:        InvokeRequests =
+          [1651226210.555026][2825:2825] CHIP:DMG:        [
+          [1651226210.555055][2825:2825] CHIP:DMG:                CommandDataIB =
+          [1651226210.555091][2825:2825] CHIP:DMG:                {
+          [1651226210.555125][2825:2825] CHIP:DMG:                        CommandPathIB =
+          [1651226210.555164][2825:2825] CHIP:DMG:                        {
+          [1651226210.555203][2825:2825] CHIP:DMG:                                EndpointId = 0x0,
+          [1651226210.555248][2825:2825] CHIP:DMG:                                ClusterId = 0x4,
+          [1651226210.555291][2825:2825] CHIP:DMG:                                CommandId = 0x3,
+          [1651226210.555333][2825:2825] CHIP:DMG:                        },
+          [1651226210.555376][2825:2825] CHIP:DMG:
+          [1651226210.555410][2825:2825] CHIP:DMG:                        CommandData =
+          [1651226210.555451][2825:2825] CHIP:DMG:                        {
+          [1651226210.555490][2825:2825] CHIP:DMG:                                0x0 = 33,
+          [1651226210.555530][2825:2825] CHIP:DMG:                        },
+          [1651226210.555566][2825:2825] CHIP:DMG:                },
+          [1651226210.555604][2825:2825] CHIP:DMG:
+          [1651226210.555633][2825:2825] CHIP:DMG:        ],
+          [1651226210.555669][2825:2825] CHIP:DMG:
+          [1651226210.555698][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651226210.555727][2825:2825] CHIP:DMG: },
+          [1651226210.555799][2825:2825] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=0 p=m
+          [1651226210.555842][2825:2825] CHIP:DMG: AccessControl: allowed
+          [1651226210.555875][2825:2825] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0003
+      disabled: true
+
+    - label: "DUT sends RemoveAllGroup command to TH"
+      verification: |
+          ./chip-tool groups  remove-all-groups 1 0
+
+
+          [1651226278.482008][2825:2825] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:14699736 on exchange 29554r
+          [1651226278.482058][2825:2825] CHIP:EM: Handling via exchange: 29554r, Delegate: 0xaaaae659a088
+          [1651226278.482191][2825:2825] CHIP:DMG: InvokeRequestMessage =
+          [1651226278.482225][2825:2825] CHIP:DMG: {
+          [1651226278.482254][2825:2825] CHIP:DMG:        suppressResponse = false,
+
+          [1651226278.482288][2825:2825] CHIP:DMG:        timedRequest = false,
+          [1651226278.482317][2825:2825] CHIP:DMG:        InvokeRequests =
+          [1651226278.482354][2825:2825] CHIP:DMG:        [
+          [1651226278.482384][2825:2825] CHIP:DMG:                CommandDataIB =
+          [1651226278.482421][2825:2825] CHIP:DMG:                {
+          [1651226278.482453][2825:2825] CHIP:DMG:                        CommandPathIB =
+          [1651226278.482492][2825:2825] CHIP:DMG:                        {
+          [1651226278.482532][2825:2825] CHIP:DMG:                                EndpointId = 0x0,
+          [1651226278.482572][2825:2825] CHIP:DMG:                                ClusterId = 0x4,
+          [1651226278.482615][2825:2825] CHIP:DMG:                                CommandId = 0x4,
+          [1651226278.482654][2825:2825] CHIP:DMG:                        },
+          [1651226278.482694][2825:2825] CHIP:DMG:
+          [1651226278.482728][2825:2825] CHIP:DMG:                        CommandData =
+          [1651226278.482765][2825:2825] CHIP:DMG:                        {
+          [1651226278.482803][2825:2825] CHIP:DMG:                        },
+          [1651226278.482839][2825:2825] CHIP:DMG:                },
+          [1651226278.482877][2825:2825] CHIP:DMG:
+          [1651226278.482906][2825:2825] CHIP:DMG:        ],
+          [1651226278.482942][2825:2825] CHIP:DMG:
+          [1651226278.482971][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651226278.483000][2825:2825] CHIP:DMG: },
+          [1651226278.483074][2825:2825] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=0 p=m
+          [1651226278.483118][2825:2825] CHIP:DMG: AccessControl: allowed
+          [1651226278.483150][2825:2825] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0004
+      disabled: true
+
+    - label: "DUT sends AddGroupIfIdentifying command to TH"
+      verification: |
+          ./chip-tool groups  add-group-if-identifying 0x0052 gp54 1 0
+
+          [1651226736.660973][2825:2825] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:4794753 on exchange 24526r
+          [1651226736.661024][2825:2825] CHIP:EM: Handling via exchange: 24526r, Delegate: 0xaaaae659a088
+          [1651226736.661171][2825:2825] CHIP:DMG: InvokeRequestMessage =
+          [1651226736.661204][2825:2825] CHIP:DMG: {
+          [1651226736.661228][2825:2825] CHIP:DMG:        suppressResponse = false,
+
+          [1651226736.661264][2825:2825] CHIP:DMG:        timedRequest = false,
+          [1651226736.661293][2825:2825] CHIP:DMG:        InvokeRequests =
+          [1651226736.661328][2825:2825] CHIP:DMG:        [
+          [1651226736.661352][2825:2825] CHIP:DMG:                CommandDataIB =
+          [1651226736.661383][2825:2825] CHIP:DMG:                {
+          [1651226736.661413][2825:2825] CHIP:DMG:                        CommandPathIB =
+          [1651226736.661450][2825:2825] CHIP:DMG:                        {
+          [1651226736.661487][2825:2825] CHIP:DMG:                                EndpointId = 0x0,
+          [1651226736.661525][2825:2825] CHIP:DMG:                                ClusterId = 0x4,
+          [1651226736.661561][2825:2825] CHIP:DMG:                                CommandId = 0x5,
+          [1651226736.661596][2825:2825] CHIP:DMG:                        },
+          [1651226736.661633][2825:2825] CHIP:DMG:
+          [1651226736.661661][2825:2825] CHIP:DMG:                        CommandData =
+          [1651226736.661697][2825:2825] CHIP:DMG:                        {
+          [1651226736.661734][2825:2825] CHIP:DMG:                                0x0 = 82,
+          [1651226736.661776][2825:2825] CHIP:DMG:                                0x1 = "gp54",
+          [1651226736.661809][2825:2825] CHIP:DMG:                        },
+          [1651226736.661843][2825:2825] CHIP:DMG:                },
+          [1651226736.661877][2825:2825] CHIP:DMG:
+          [1651226736.661904][2825:2825] CHIP:DMG:        ],
+          [1651226736.661935][2825:2825] CHIP:DMG:
+          [1651226736.661959][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651226736.661984][2825:2825] CHIP:DMG: },
+          [1651226736.662052][2825:2825] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=0 p=m
+          [1651226736.662093][2825:2825] CHIP:DMG: AccessControl: allowed
+          [1651226736.662121][2825:2825] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0005
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
new file mode 100644
index 00000000000000..ecf0ce24a00dc0
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
@@ -0,0 +1,1136 @@
+# 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:
+    19.4.3. [TC-IDM-4.3] Report Data Messages post Subscription Activation from
+    DUT Test Cases
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "DUT and TH activate the subscription. Change the value of the
+          attribute which has been subscribed on the DUT by manually changing
+          some settings on the device. Example: Temperature sensor may update
+          the value of the room temperature. Turning on/off on a light bulb."
+      verification: |
+          Use interactive mode to verify this
+          ./chip-tool start interactive mood
+
+           onoff subscribe on-time 100 1000 1 1
+
+          [1653473717.457459][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473717.457490][21558:21563] CHIP:DMG: {
+          [1653473717.457512][21558:21563] CHIP:DMG:         SubscriptionId = 0x864c6467,
+          [1653473717.457531][21558:21563] CHIP:DMG:         AttributeReportIBs =
+          [1653473717.457561][21558:21563] CHIP:DMG:         [
+          [1653473717.457579][21558:21563] CHIP:DMG:                 AttributeReportIB =
+          [1653473717.457608][21558:21563] CHIP:DMG:                 {
+          [1653473717.457627][21558:21563] CHIP:DMG:                         AttributeDataIB =
+          [1653473717.457648][21558:21563] CHIP:DMG:                         {
+          [1653473717.457670][21558:21563] CHIP:DMG:                                 DataVersion = 0xbf2fc271,
+          [1653473717.457690][21558:21563] CHIP:DMG:                                 AttributePathIB =
+          [1653473717.457712][21558:21563] CHIP:DMG:                                 {
+          [1653473717.457733][21558:21563] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653473717.457755][21558:21563] CHIP:DMG:                                         Cluster = 0x6,
+          [1653473717.457779][21558:21563] CHIP:DMG:                                         Attribute = 0x0000_4001,
+          [1653473717.457799][21558:21563] CHIP:DMG:                                 }
+          [1653473717.457823][21558:21563] CHIP:DMG:
+          [1653473717.457846][21558:21563] CHIP:DMG:                                         Data = 2,
+          [1653473717.457865][21558:21563] CHIP:DMG:                         },
+          [1653473717.457892][21558:21563] CHIP:DMG:
+          [1653473717.457910][21558:21563] CHIP:DMG:                 },
+          [1653473717.457937][21558:21563] CHIP:DMG:
+          [1653473717.457955][21558:21563] CHIP:DMG:         ],
+          [1653473717.457982][21558:21563] CHIP:DMG:
+          [1653473717.458000][21558:21563] CHIP:DMG:         InteractionModelRevision = 1
+          [1653473717.458018][21558:21563] CHIP:DMG: }
+          [1653473717.458135][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 3207578225
+          [1653473717.458170][21558:21563] CHIP:TOO:   OnTime: 2
+
+          >>> onoff write on-time 1 1 1
+          [1653473911.947884][21558:21563] CHIP:TOO: Sending command to node 0x1
+          [1653473911.947942][21558:21563] CHIP:CSM: FindOrEstablishSession: PeerId = 082901BE3B352248:0000000000000001
+          [1653473911.947976][21558:21563] CHIP:TOO: Sending WriteAttribute to cluster 0x0000_0006 on endpoint 1
+          [1653473911.948045][21558:21563] CHIP:DMG: WriteClient moving to [AddAttribu]
+          [1653473911.948173][21558:21563] CHIP:IN: Prepared secure message 0x5604e6136648 to 0x0000000000000001 (1)  of type 0x6 and protocolId (0, 1) on exchange 43234i with MessageCounter:16478590.
+          [1653473911.948225][21558:21563] CHIP:IN: Sending encrypted msg 0x5604e6136648 with MessageCounter:16478590 to 0x0000000000000001 (1) at monotonic time: 000000000128B780 msec
+          [1653473911.948423][21558:21563] CHIP:DMG: WriteClient moving to [AwaitingRe]
+          [1653473911.954883][21558:21563] CHIP:EM: Received message of type 0x7 with protocolId (0, 1) and MessageCounter:15912632 on exchange 43234i
+          [1653473911.954954][21558:21563] CHIP:EM: Found matching exchange: 43234i, Delegate: 0x5604e6164250
+          [1653473911.955011][21558:21563] CHIP:EM: Rxd Ack; Removing MessageCounter:16478590 from Retrans Table on exchange 43234i
+          [1653473911.955044][21558:21563] CHIP:EM: Removed CHIP MessageCounter:16478590 from RetransTable on exchange 43234i
+          [1653473911.955084][21558:21563] CHIP:DMG: WriteClient moving to [ResponseRe]
+          [1653473911.955144][21558:21563] CHIP:DMG: WriteResponseMessage =
+          [1653473911.955170][21558:21563] CHIP:DMG: {
+          [1653473911.955192][21558:21563] CHIP:DMG:         AttributeStatusIBs =
+          [1653473911.955231][21558:21563] CHIP:DMG:         [
+          [1653473911.955253][21558:21563] CHIP:DMG:                 AttributeStatusIB =
+          [1653473911.955281][21558:21563] CHIP:DMG:                 {
+          [1653473911.955309][21558:21563] CHIP:DMG:                         AttributePathIB =
+          [1653473911.955332][21558:21563] CHIP:DMG:                         {
+          [1653473911.955353][21558:21563] CHIP:DMG:                                 Endpoint = 0x1,
+          [1653473911.955370][21558:21563] CHIP:DMG:                                 Cluster = 0x6,
+          [1653473911.955393][21558:21563] CHIP:DMG:                                 Attribute = 0x0000_4001,
+          [1653473911.955413][21558:21563] CHIP:DMG:                         }
+          [1653473911.955440][21558:21563] CHIP:DMG:
+          [1653473911.955472][21558:21563] CHIP:DMG:                         StatusIB =
+          [1653473911.955504][21558:21563] CHIP:DMG:                         {
+          [1653473911.955532][21558:21563] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653473911.955559][21558:21563] CHIP:DMG:                         },
+          [1653473911.955588][21558:21563] CHIP:DMG:
+          [1653473911.955614][21558:21563] CHIP:DMG:                 },
+          [1653473911.955648][21558:21563] CHIP:DMG:
+          [1653473911.955673][21558:21563] CHIP:DMG:         ],
+          [1653473911.955708][21558:21563] CHIP:DMG:
+          [1653473911.955735][21558:21563] CHIP:DMG:         InteractionModelRevision = 1
+          [1653473911.955758][21558:21563] CHIP:DMG: }
+          [1653473911.955872][21558:21563] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1653473911.955952][21558:21563] CHIP:EM: Sending Standalone Ack for MessageCounter:15912632 on exchange 43234i
+          [1653473911.956039][21558:21563] CHIP:IN: Prepared secure message 0x7f35c3ffe000 to 0x0000000000000001 (1)  of type 0x10 and protocolId (0, 0) on exchange 43234i with MessageCounter:16478591.
+          [1653473911.956175][21558:21563] CHIP:IN: Sending encrypted msg 0x7f35c3ffe000 with MessageCounter:16478591 to 0x0000000000000001 (1) at monotonic time: 000000000128B788 msec
+          [1653473911.956354][21558:21563] CHIP:EM: Flushed pending ack for MessageCounter:15912632 on exchange 43234i
+          [1653473911.956547][21558:21563] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:15912633 on exchange 59626r
+          [1653473911.956610][21558:21563] CHIP:EM: Handling via exchange: 59626r, Delegate: 0x5604e4374c88
+          [1653473911.956724][21558:21563] CHIP:EM: Sending Standalone Ack for MessageCounter:15912633 on exchange 59626r
+          [1653473911.956818][21558:21563] CHIP:IN: Prepared secure message 0x7f35c3ffe150 to 0x0000000000000001 (1)  of type 0x10 and protocolId (0, 0) on exchange 59626r with MessageCounter:16478592.
+          [1653473911.956932][21558:21563] CHIP:IN: Sending encrypted msg 0x7f35c3ffe150 with MessageCounter:16478592 to 0x0000000000000001 (1) at monotonic time: 000000000128B789 msec
+          [1653473911.957060][21558:21563] CHIP:EM: Flushed pending ack for MessageCounter:15912633 on exchange 59626r
+          [1653473911.957196][21558:21563] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:15912634 on exchange 59627r
+          [1653473911.957253][21558:21563] CHIP:EM: Handling via exchange: 59627r, Delegate: 0x5604e4374c88
+          [1653473911.957349][21558:21563] CHIP:EM: Sending Standalone Ack for MessageCounter:15912634 on exchange 59627r
+          [1653473911.957436][21558:21563] CHIP:IN: Prepared secure message 0x7f35c3ffe150 to 0x0000000000000001 (1)  of type 0x10 and protocolId (0, 0) on exchange 59627r with MessageCounter:16478593.
+          [1653473911.957507][21558:21563] CHIP:IN: Sending encrypted msg 0x7f35c3ffe150 with MessageCounter:16478593 to 0x0000000000000001 (1) at monotonic time: 000000000128B78A msec
+          [1653473911.957622][21558:21563] CHIP:EM: Flushed pending ack for MessageCounter:15912634 on exchange 59627r
+          [1653473911.957945][21558:21563] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:15912635 on exchange 59628r
+          [1653473911.958021][21558:21563] CHIP:EM: Handling via exchange: 59628r, Delegate: 0x5604e4374c88
+          [1653473911.958134][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473911.958178][21558:21563] CHIP:DMG: {
+          [1653473911.958212][21558:21563] CHIP:DMG:         SubscriptionId = 0x864c6467,
+          [1653473911.958242][21558:21563] CHIP:DMG:         AttributeReportIBs =
+          [1653473911.958320][21558:21563] CHIP:DMG:         [
+          [1653473911.958350][21558:21563] CHIP:DMG:                 AttributeReportIB =
+          [1653473911.958389][21558:21563] CHIP:DMG:                 {
+          [1653473911.958413][21558:21563] CHIP:DMG:                         AttributeDataIB =
+          [1653473911.958454][21558:21563] CHIP:DMG:                         {
+          [1653473911.958505][21558:21563] CHIP:DMG:                                 DataVersion = 0xbf2fc272,
+          [1653473911.958541][21558:21563] CHIP:DMG:                                 AttributePathIB =
+          [1653473911.958581][21558:21563] CHIP:DMG:                                 {
+          [1653473911.958611][21558:21563] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653473911.958635][21558:21563] CHIP:DMG:                                         Cluster = 0x6,
+          [1653473911.958663][21558:21563] CHIP:DMG:                                         Attribute = 0x0000_4001,
+          [1653473911.958689][21558:21563] CHIP:DMG:                                 }
+          [1653473911.958717][21558:21563] CHIP:DMG:
+          [1653473911.958744][21558:21563] CHIP:DMG:                                         Data = 1,
+          [1653473911.958770][21558:21563] CHIP:DMG:                         },
+          [1653473911.958800][21558:21563] CHIP:DMG:
+          [1653473911.958822][21558:21563] CHIP:DMG:                 },
+          [1653473911.958853][21558:21563] CHIP:DMG:
+          [1653473911.958874][21558:21563] CHIP:DMG:         ],
+          [1653473911.958905][21558:21563] CHIP:DMG:
+          [1653473911.958928][21558:21563] CHIP:DMG:         InteractionModelRevision = 1
+          [1653473911.958952][21558:21563] CHIP:DMG: }
+          [1653473911.959066][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 3207578226
+          [1653473911.959104][21558:21563] CHIP:TOO:   OnTime: 1
+          [1653473911.959156][21558:21563] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x864c6467 Peer = 01:0000000000000001
+          [1653473911.959205][21558:21563] CHIP:EM: Piggybacking Ack for MessageCounter:15912635 on exchange: 59628r
+          [1653473911.959257][21558:21563] CHIP:IN: Prepared secure message 0x5604e6136648 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 59628r with MessageCounter:16478594.
+          [1653473911.959296][21558:21563] CHIP:IN: Sending encrypted msg 0x5604e6136648 with MessageCounter:16478594 to 0x0000000000000001 (1) at monotonic time: 000000000128B78B msec
+          [1653473911.964417][21558:21563] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:15912636 on exchange 59628r
+          [1653473911.964441][21558:21563] CHIP:EM: Found matching exchange: 59628r, Delegate: (nil)
+          [1653473911.964457][21558:21563] CHIP:EM: Rxd Ack; Removing MessageCounter:16478594 from Retrans Table on exchange 59628r
+          [1653473911.964466][21558:21563] CHIP:EM: Removed CHIP MessageCounter:16478594 from RetransTable on ex
+      disabled: true
+
+    - label:
+          "DUT and TH activate the subscription. Change the value of the
+          attribute which has been subscribed on the DUT by sending an IMWrite
+          or Invoke message to the DUT from the TH."
+      verification: |
+          In case of chip tool, here is an example command to use
+          sudo ./chip-tool levelcontrol subscribe  on-level 0 100  1 1
+          [1651581090.101913][2548:2553] CHIP:DMG: ReportDataMessage =
+          [1651581090.101952][2548:2553] CHIP:DMG: {
+          [1651581090.101986][2548:2553] CHIP:DMG:         SubscriptionId = 0xe5f261cdbbd208ad,
+          [1651581090.102023][2548:2553] CHIP:DMG:         AttributeReportIBs =
+          [1651581090.102067][2548:2553] CHIP:DMG:         [
+          [1651581090.102104][2548:2553] CHIP:DMG:                 AttributeReportIB =
+          [1651581090.102159][2548:2553] CHIP:DMG:                 {
+          [1651581090.102201][2548:2553] CHIP:DMG:                         AttributeDataIB =
+          [1651581090.102252][2548:2553] CHIP:DMG:                         {
+          [1651581090.102301][2548:2553] CHIP:DMG:                                 DataVersion = 0x2c5d1f48,
+          [1651581090.102348][2548:2553] CHIP:DMG:                                 AttributePathIB =
+          [1651581090.102401][2548:2553] CHIP:DMG:                                 {
+          [1651581090.102453][2548:2553] CHIP:DMG:                                         Endpoint = 0x1,
+          [1651581090.102510][2548:2553] CHIP:DMG:                                         Cluster = 0x8,
+          [1651581090.102562][2548:2553] CHIP:DMG:                                         Attribute = 0x0000_0011,
+          [1651581090.102611][2548:2553] CHIP:DMG:                                 }
+          [1651581090.102663][2548:2553] CHIP:DMG:
+          [1651581090.102713][2548:2553] CHIP:DMG:                                         Data = 2,
+          [1651581090.102765][2548:2553] CHIP:DMG:                         },
+          [1651581090.102814][2548:2553] CHIP:DMG:
+          [1651581090.102882][2548:2553] CHIP:DMG:                 },
+          [1651581090.102932][2548:2553] CHIP:DMG:
+          [1651581090.102967][2548:2553] CHIP:DMG:         ],
+          [1651581090.103012][2548:2553] CHIP:DMG:
+          [1651581090.103047][2548:2553] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581090.103081][2548:2553] CHIP:DMG: }
+          [1651581090.103251][2548:2553] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 744300360
+          [1651581090.103346][2548:2553] CHIP:TOO:   on level: 2
+          [1651581090.103404][2548:2553] CHIP:DMG: MoveToState ReadClient[0xffff9c005350]: Moving to [AwaitingSu]
+          [1651581090.103469][2548:2553] CHIP:EM: Piggybacking Ack for MessageCounter:16486934 on exchange: 56780i
+          [1651581090.103551][2548:2553] CHIP:IN: Prepared secure message 0xaaaaff7fcb38 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 56780i with MessageCounter:12926057.
+          [1651581090.103602][2548:2553] CHIP:IN: Sending encrypted msg 0xaaaaff7fcb38 with MessageCounter:12926057 to 0x0000000000000001 (1) at monotonic time: 0000000000191604 msec
+          [1651581090.104831][2548:2553] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:16486935 on exchange 56780i
+          [1651581090.104878][2548:2553] CHIP:EM: Found matching exchange: 56780i, Delegate: 0xffff9c005350
+          [1651581090.104923][2548:2553] CHIP:EM: Rxd Ack; Removing MessageCounter:12926057 from Retrans Table on exchange 56780i
+          [1651581090.104958][2548:2553] CHIP:EM: Removed CHIP MessageCounter:12926057 from RetransTable on exchange 56780i
+          [1651581090.105015][2548:2553] CHIP:DMG: SubscribeResponseMessage =
+          [1651581090.105054][2548:2553] CHIP:DMG: {
+          [1651581090.105089][2548:2553] CHIP:DMG:         SubscriptionId = 0xe5f261cdbbd208ad,
+          [1651581090.105128][2548:2553] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1651581090.105166][2548:2553] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1651581090.105203][2548:2553] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581090.105238][2548:2553] CHIP:DMG: }
+
+
+
+          sudo ./chip-tool levelcontrol write on-level 2 1 1
+          [1651581060.982048][2541:2546] CHIP:DMG: WriteResponseMessage =
+          [1651581060.982078][2541:2546] CHIP:DMG: {
+          [1651581060.982103][2541:2546] CHIP:DMG:         AttributeStatusIBs =
+          [1651581060.982138][2541:2546] CHIP:DMG:         [
+          [1651581060.982166][2541:2546] CHIP:DMG:                 AttributeStatusIB =
+          [1651581060.982206][2541:2546] CHIP:DMG:                 {
+          [1651581060.982238][2541:2546] CHIP:DMG:                         AttributePathIB =
+          [1651581060.982275][2541:2546] CHIP:DMG:                         {
+          [1651581060.982316][2541:2546] CHIP:DMG:                                 Endpoint = 0x1,
+          [1651581060.982358][2541:2546] CHIP:DMG:                                 Cluster = 0x8,
+          [1651581060.982397][2541:2546] CHIP:DMG:                                 Attribute = 0x0000_0011,
+          [1651581060.982432][2541:2546] CHIP:DMG:                         }
+          [1651581060.982472][2541:2546] CHIP:DMG:
+          [1651581060.982506][2541:2546] CHIP:DMG:                         StatusIB =
+          [1651581060.982540][2541:2546] CHIP:DMG:                         {
+          [1651581060.982576][2541:2546] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1651581060.982608][2541:2546] CHIP:DMG:                         },
+          [1651581060.982644][2541:2546] CHIP:DMG:
+          [1651581060.982672][2541:2546] CHIP:DMG:                 },
+          [1651581060.982706][2541:2546] CHIP:DMG:
+          [1651581060.982732][2541:2546] CHIP:DMG:         ],
+          [1651581060.982766][2541:2546] CHIP:DMG:
+          [1651581060.982793][2541:2546] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581060.982820][2541:2546] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "DUT and TH activate the subscription for an attribute. Dont change
+          the value of the attribute which has been subscribed."
+      verification: |
+          In case of chip tool, here is an example command to use
+          sudo ./chip-tool levelcontrol subscribe  on-level 0 100  1 1
+          [1651581090.101913][2548:2553] CHIP:DMG: ReportDataMessage =
+          [1651581090.101952][2548:2553] CHIP:DMG: {
+          [1651581090.101986][2548:2553] CHIP:DMG:         SubscriptionId = 0xe5f261cdbbd208ad,
+          [1651581090.102023][2548:2553] CHIP:DMG:         AttributeReportIBs =
+          [1651581090.102067][2548:2553] CHIP:DMG:         [
+          [1651581090.102104][2548:2553] CHIP:DMG:                 AttributeReportIB =
+          [1651581090.102159][2548:2553] CHIP:DMG:                 {
+          [1651581090.102201][2548:2553] CHIP:DMG:                         AttributeDataIB =
+          [1651581090.102252][2548:2553] CHIP:DMG:                         {
+          [1651581090.102301][2548:2553] CHIP:DMG:                                 DataVersion = 0x2c5d1f48,
+          [1651581090.102348][2548:2553] CHIP:DMG:                                 AttributePathIB =
+          [1651581090.102401][2548:2553] CHIP:DMG:                                 {
+          [1651581090.102453][2548:2553] CHIP:DMG:                                         Endpoint = 0x1,
+          [1651581090.102510][2548:2553] CHIP:DMG:                                         Cluster = 0x8,
+          [1651581090.102562][2548:2553] CHIP:DMG:                                         Attribute = 0x0000_0011,
+          [1651581090.102611][2548:2553] CHIP:DMG:                                 }
+          [1651581090.102663][2548:2553] CHIP:DMG:
+          [1651581090.102713][2548:2553] CHIP:DMG:                                         Data = 2,
+          [1651581090.102765][2548:2553] CHIP:DMG:                         },
+          [1651581090.102814][2548:2553] CHIP:DMG:
+          [1651581090.102882][2548:2553] CHIP:DMG:                 },
+          [1651581090.102932][2548:2553] CHIP:DMG:
+          [1651581090.102967][2548:2553] CHIP:DMG:         ],
+          [1651581090.103012][2548:2553] CHIP:DMG:
+          [1651581090.103047][2548:2553] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581090.103081][2548:2553] CHIP:DMG: }
+          [1651581090.103251][2548:2553] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 744300360
+          [1651581090.103346][2548:2553] CHIP:TOO:   on level: 2
+          [1651581090.103404][2548:2553] CHIP:DMG: MoveToState ReadClient[0xffff9c005350]: Moving to [AwaitingSu]
+          [1651581090.103469][2548:2553] CHIP:EM: Piggybacking Ack for MessageCounter:16486934 on exchange: 56780i
+          [1651581090.103551][2548:2553] CHIP:IN: Prepared secure message 0xaaaaff7fcb38 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 56780i with MessageCounter:12926057.
+          [1651581090.103602][2548:2553] CHIP:IN: Sending encrypted msg 0xaaaaff7fcb38 with MessageCounter:12926057 to 0x0000000000000001 (1) at monotonic time: 0000000000191604 msec
+          [1651581090.104831][2548:2553] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:16486935 on exchange 56780i
+          [1651581090.104878][2548:2553] CHIP:EM: Found matching exchange: 56780i, Delegate: 0xffff9c005350
+          [1651581090.104923][2548:2553] CHIP:EM: Rxd Ack; Removing MessageCounter:12926057 from Retrans Table on exchange 56780i
+          [1651581090.104958][2548:2553] CHIP:EM: Removed CHIP MessageCounter:12926057 from RetransTable on exchange 56780i
+          [1651581090.105015][2548:2553] CHIP:DMG: SubscribeResponseMessage =
+          [1651581090.105054][2548:2553] CHIP:DMG: {
+          [1651581090.105089][2548:2553] CHIP:DMG:         SubscriptionId = 0xe5f261cdbbd208ad,
+          [1651581090.105128][2548:2553] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1651581090.105166][2548:2553] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1651581090.105203][2548:2553] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581090.105238][2548:2553] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          'DUT and TH activate the subscription. Change the value of the
+          attribute which has been subscribed on the DUT. TH force sends a
+          status response with an "inactive subscription". Change the value of
+          the attribute which has been subscribed on the DUT.'
+      verification: |
+          This testr needs to be tested by changing the controls available in the DUT and then read the value.  And can't be tested with Soft DUT & has dependency of Vendor specific DUT support.
+      disabled: true
+
+    - label:
+          "[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type bool. Modify that attribute on the DUT. DUT
+          should send the report data with the modified attribute value. Modify
+          the attribute multiple times (3 times) before the max interval time
+          specified during the subscription activation."
+      verification: |
+          In case of chip tool, here is an example command to use
+
+          sudo ./chip-tool basic write local-config-disabled 1 1 0
+          [1651581143.935028][2560:2565] CHIP:DMG: WriteResponseMessage =
+          [1651581143.935074][2560:2565] CHIP:DMG: {
+          [1651581143.935114][2560:2565] CHIP:DMG:         AttributeStatusIBs =
+          [1651581143.935171][2560:2565] CHIP:DMG:         [
+          [1651581143.935217][2560:2565] CHIP:DMG:                 AttributeStatusIB =
+          [1651581143.935268][2560:2565] CHIP:DMG:                 {
+          [1651581143.935327][2560:2565] CHIP:DMG:                         AttributePathIB =
+          [1651581143.935386][2560:2565] CHIP:DMG:                         {
+          [1651581143.935445][2560:2565] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651581143.935508][2560:2565] CHIP:DMG:                                 Cluster = 0x28,
+          [1651581143.935570][2560:2565] CHIP:DMG:                                 Attribute = 0x0000_0010,
+          [1651581143.935623][2560:2565] CHIP:DMG:                         }
+          [1651581143.935686][2560:2565] CHIP:DMG:
+          [1651581143.935741][2560:2565] CHIP:DMG:                         StatusIB =
+          [1651581143.935801][2560:2565] CHIP:DMG:                         {
+          [1651581143.935854][2560:2565] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1651581143.935913][2560:2565] CHIP:DMG:                         },
+          [1651581143.935966][2560:2565] CHIP:DMG:
+          [1651581143.936016][2560:2565] CHIP:DMG:                 },
+          [1651581143.936076][2560:2565] CHIP:DMG:
+          [1651581143.936120][2560:2565] CHIP:DMG:         ],
+          [1651581143.936175][2560:2565] CHIP:DMG:
+          [1651581143.936220][2560:2565] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581143.936264][2560:2565] CHIP:DMG: }
+
+
+
+          sudo ./chip-tool basic subscribe local-config-disabled 0 100 1 0
+          [1651581168.305387][2569:2574] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2272149882
+          [1651581168.305439][2569:2574] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1651581168.305493][2569:2574] CHIP:DMG: MoveToState ReadClient[0xffffa0004790]: Moving to [AwaitingSu]
+          [1651581168.305557][2569:2574] CHIP:EM: Piggybacking Ack for MessageCounter:3216298 on exchange: 59996i
+          [1651581168.305718][2569:2574] CHIP:IN: Prepared secure message 0xaaaaea061c98 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 59996i with MessageCounter:13929590.
+          [1651581168.305776][2569:2574] CHIP:IN: Sending encrypted msg 0xaaaaea061c98 with MessageCounter:13929590 to 0x0000000000000001 (1) at monotonic time: 00000000001A477E msec
+          [1651581168.307099][2569:2574] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:3216299 on exchange 59996i
+          [1651581168.307148][2569:2574] CHIP:EM: Found matching exchange: 59996i, Delegate: 0xffffa0004790
+          [1651581168.307196][2569:2574] CHIP:EM: Rxd Ack; Removing MessageCounter:13929590 from Retrans Table on exchange 59996i
+          [1651581168.307232][2569:2574] CHIP:EM: Removed CHIP MessageCounter:13929590 from RetransTable on exchange 59996i
+          [1651581168.307292][2569:2574] CHIP:DMG: SubscribeResponseMessage =
+          [1651581168.307330][2569:2574] CHIP:DMG: {
+          [1651581168.307365][2569:2574] CHIP:DMG:         SubscriptionId = 0xfd55400dbe72f1cb,
+          [1651581168.307405][2569:2574] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1651581168.307444][2569:2574] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1651581168.307481][2569:2574] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581168.307516][2569:2574] CHIP:DMG: }
+
+
+
+          Verify the above command multiple times(3 times)
+      disabled: true
+
+    - label:
+          "[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type string. Modify that attribute on the DUT.
+          DUT should send the report data with the modified attribute value
+          Modify the attribute multiple times (3 times) before the max interval
+          time specified during the subscription activation."
+      verification: |
+          In case of chip tool, here is an example command to use
+
+          sudo ./chip-tool basic write  node-label new 1 0
+
+          On TH--
+          [1653463495.068961][19463:19468] CHIP:DMG: WriteResponseMessage =
+          [1653463495.068977][19463:19468] CHIP:DMG: {
+          [1653463495.068992][19463:19468] CHIP:DMG:         AttributeStatusIBs =
+          [1653463495.069017][19463:19468] CHIP:DMG:         [
+          [1653463495.069032][19463:19468] CHIP:DMG:                 AttributeStatusIB =
+          [1653463495.069048][19463:19468] CHIP:DMG:                 {
+          [1653463495.069061][19463:19468] CHIP:DMG:                         AttributePathIB =
+          [1653463495.069075][19463:19468] CHIP:DMG:                         {
+          [1653463495.069090][19463:19468] CHIP:DMG:                                 Endpoint = 0x0,
+          [1653463495.069106][19463:19468] CHIP:DMG:                                 Cluster = 0x28,
+          [1653463495.069127][19463:19468] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1653463495.069141][19463:19468] CHIP:DMG:                         }
+          [1653463495.069161][19463:19468] CHIP:DMG:
+          [1653463495.069175][19463:19468] CHIP:DMG:                         StatusIB =
+          [1653463495.069193][19463:19468] CHIP:DMG:                         {
+          [1653463495.069209][19463:19468] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653463495.069227][19463:19468] CHIP:DMG:                         },
+          [1653463495.069244][19463:19468] CHIP:DMG:
+          [1653463495.069257][19463:19468] CHIP:DMG:                 },
+          [1653463495.069276][19463:19468] CHIP:DMG:
+          [1653463495.069289][19463:19468] CHIP:DMG:         ],
+          [1653463495.069309][19463:19468] CHIP:DMG:
+          [1653463495.069322][19463:19468] CHIP:DMG:         InteractionModelRevision = 1
+          [1653463495.069335][19463:19468] CHIP:DMG: }
+
+
+
+
+          sudo ./chip-tool basic subscribe node-label 0 100  1 0
+
+          ON TH--
+          [1653463505.771898][19471:19476] CHIP:DMG: ReportDataMessage =
+          [1653463505.771918][19471:19476] CHIP:DMG: {
+          [1653463505.771935][19471:19476] CHIP:DMG:         SubscriptionId = 0xc242f057,
+          [1653463505.771953][19471:19476] CHIP:DMG:         AttributeReportIBs =
+          [1653463505.771985][19471:19476] CHIP:DMG:         [
+          [1653463505.772001][19471:19476] CHIP:DMG:                 AttributeReportIB =
+          [1653463505.772027][19471:19476] CHIP:DMG:                 {
+          [1653463505.772043][19471:19476] CHIP:DMG:                         AttributeDataIB =
+          [1653463505.772061][19471:19476] CHIP:DMG:                         {
+          [1653463505.772081][19471:19476] CHIP:DMG:                                 DataVersion = 0x8a93859e,
+          [1653463505.772098][19471:19476] CHIP:DMG:                                 AttributePathIB =
+          [1653463505.772117][19471:19476] CHIP:DMG:                                 {
+          [1653463505.772137][19471:19476] CHIP:DMG:                                         Endpoint = 0x0,
+          [1653463505.772157][19471:19476] CHIP:DMG:                                         Cluster = 0x28,
+          [1653463505.772177][19471:19476] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1653463505.772194][19471:19476] CHIP:DMG:                                 }
+          [1653463505.772215][19471:19476] CHIP:DMG:
+          [1653463505.772237][19471:19476] CHIP:DMG:                                         Data = "new",
+          [1653463505.772255][19471:19476] CHIP:DMG:                         },
+          [1653463505.772277][19471:19476] CHIP:DMG:
+          [1653463505.772294][19471:19476] CHIP:DMG:                 },
+          [1653463505.772316][19471:19476] CHIP:DMG:
+          [1653463505.772331][19471:19476] CHIP:DMG:         ],
+          [1653463505.772362][19471:19476] CHIP:DMG:
+          [1653463505.772388][19471:19476] CHIP:DMG:         InteractionModelRevision = 1
+          [1653463505.772408][19471:19476] CHIP:DMG: }
+          [1653463505.772555][19471:19476] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2324923806
+          [1653463505.772583][19471:19476] CHIP:TOO:   NodeLabel: new
+
+
+
+          Verify the above command multiple times(3 times)
+      disabled: true
+
+    - label:
+          '[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type "unsigned integer". Modify that attribute on
+          the DUT. DUT should send the report data with the modified attribute
+          value. Modify the attribute multiple times (3 times) before the max
+          interval time specified during the subscription activation.'
+      verification: |
+          In case of chip tool, here is an example command to use
+
+          sudo ./chip-tool any write-by-id  0x0008 0x0010 1 1 1
+          [1651581271.466102][2595:2600] CHIP:DMG: WriteResponseMessage =
+          [1651581271.466135][2595:2600] CHIP:DMG: {
+          [1651581271.466173][2595:2600] CHIP:DMG:         AttributeStatusIBs =
+          [1651581271.466212][2595:2600] CHIP:DMG:         [
+          [1651581271.466254][2595:2600] CHIP:DMG:                 AttributeStatusIB =
+          [1651581271.466293][2595:2600] CHIP:DMG:                 {
+          [1651581271.466339][2595:2600] CHIP:DMG:                         AttributePathIB =
+          [1651581271.466390][2595:2600] CHIP:DMG:                         {
+          [1651581271.466431][2595:2600] CHIP:DMG:                                 Endpoint = 0x1,
+          [1651581271.466482][2595:2600] CHIP:DMG:                                 Cluster = 0x8,
+          [1651581271.466539][2595:2600] CHIP:DMG:                                 Attribute = 0x0000_0010,
+          [1651581271.466579][2595:2600] CHIP:DMG:                         }
+          [1651581271.466633][2595:2600] CHIP:DMG:
+          [1651581271.466671][2595:2600] CHIP:DMG:                         StatusIB =
+          [1651581271.466725][2595:2600] CHIP:DMG:                         {
+          [1651581271.466780][2595:2600] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1651581271.466824][2595:2600] CHIP:DMG:                         },
+          [1651581271.466918][2595:2600] CHIP:DMG:
+          [1651581271.466954][2595:2600] CHIP:DMG:                 },
+          [1651581271.467007][2595:2600] CHIP:DMG:
+          [1651581271.467047][2595:2600] CHIP:DMG:         ],
+          [1651581271.467086][2595:2600] CHIP:DMG:
+          [1651581271.467115][2595:2600] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581271.467157][2595:2600] CHIP:DMG: }
+
+          sudo ./chip-tool any subscribe-by-id  0x0008 0x0010 0 100 0 1  1
+          [1651581311.929391][2605:2611] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0010 DataVersion: 744300361
+          [1651581311.929466][2605:2611] CHIP:TOO:   on off transition time: 1
+          [1651581311.929510][2605:2611] CHIP:DMG: MoveToState ReadClient[0xffff80003530]: Moving to [AwaitingSu]
+          [1651581311.929570][2605:2611] CHIP:EM: Piggybacking Ack for MessageCounter:1109661 on exchange: 21136i
+          [1651581311.929645][2605:2611] CHIP:IN: Prepared secure message 0xaaaaeb4dbc98 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 21136i with MessageCounter:3315113.
+          [1651581311.929689][2605:2611] CHIP:IN: Sending encrypted msg 0xaaaaeb4dbc98 with MessageCounter:3315113 to 0x0000000000000001 (1) at monotonic time: 00000000001C7886 msec
+          [1651581311.930981][2605:2611] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:1109662 on exchange 21136i
+          [1651581311.931029][2605:2611] CHIP:EM: Found matching exchange: 21136i, Delegate: 0xffff80003530
+          [1651581311.931067][2605:2611] CHIP:EM: Rxd Ack; Removing MessageCounter:3315113 from Retrans Table on exchange 21136i
+          [1651581311.931090][2605:2611] CHIP:EM: Removed CHIP MessageCounter:3315113 from RetransTable on exchange 21136i
+          [1651581311.931140][2605:2611] CHIP:DMG: SubscribeResponseMessage =
+          [1651581311.931168][2605:2611] CHIP:DMG: {
+          [1651581311.931193][2605:2611] CHIP:DMG:         SubscriptionId = 0x54d8451e9c60ea8,
+          [1651581311.931226][2605:2611] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1651581311.931254][2605:2611] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1651581311.931279][2605:2611] CHIP:DMG:         InteractionModelRevision = 1
+          [1651581311.931303][2605:2611] CHIP:DMG: }
+
+
+          Verify the above command multiple times(3 times)
+      disabled: true
+
+    - label:
+          '[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type "signed integer". Modify that attribute on
+          the DUT. DUT should send the report data with the modified attribute
+          value. Modify the attribute multiple times (3 times)before the max
+          interval time specified during the subscription activation.'
+      verification: |
+          subscribe to an attribute of type signed integer to the Harness
+      disabled: true
+
+    - label:
+          '[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type "floating point". Modify that attribute on
+          the DUT. DUT should send the report data with the modified attribute
+          value. Modify the attribute multiple times (3 times) before the max
+          interval time specified during the subscription activation.'
+      verification: |
+          subscribe to an attribute of type floating point to the Harness
+      disabled: true
+
+    - label:
+          "[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type list. Modify that attribute on the DUT. DUT
+          should send the report data with the modified attribute value. Modify
+          the attribute multiple times (3 times) before the max interval time
+          specified during the subscription activation."
+      verification: |
+          sudo ./chip-tool modeselect subscribe supported-modes 0 100  1 1
+          sudo ./chip-tool modeselect subscribe supported-modes 0 100  1 1
+          sudo ./chip-tool modeselect subscribe supported-modes 0 100  1 1
+          [1651582224.233708][2800:2805] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 208325786
+          [1651582224.233839][2800:2805] CHIP:TOO:   SupportedModes: 3 entries
+          [1651582224.233928][2800:2805] CHIP:TOO:     [1]: {
+          [1651582224.233967][2800:2805] CHIP:TOO:       Label: Black
+          [1651582224.234022][2800:2805] CHIP:TOO:       Mode: 0
+          [1651582224.234059][2800:2805] CHIP:TOO:       SemanticTag: 0
+          [1651582224.234096][2800:2805] CHIP:TOO:      }
+          [1651582224.234141][2800:2805] CHIP:TOO:     [2]: {
+          [1651582224.234178][2800:2805] CHIP:TOO:       Label: Cappuccino
+          [1651582224.234212][2800:2805] CHIP:TOO:       Mode: 4
+          [1651582224.234246][2800:2805] CHIP:TOO:       SemanticTag: 0
+          [1651582224.234281][2800:2805] CHIP:TOO:      }
+          [1651582224.234325][2800:2805] CHIP:TOO:     [3]: {
+          [1651582224.234361][2800:2805] CHIP:TOO:       Label: Espresso
+          [1651582224.234395][2800:2805] CHIP:TOO:       Mode: 7
+          [1651582224.234428][2800:2805] CHIP:TOO:       SemanticTag: 0
+          [1651582224.234463][2800:2805] CHIP:TOO:      }
+          [1651582224.234534][2800:2805] CHIP:DMG: MoveToState ReadClient[0xffff88002d90]: Moving to [AwaitingSu]
+          [1651582224.234588][2800:2805] CHIP:EM: Piggybacking Ack for MessageCounter:12155993 on exchange: 59569i
+          [1651582224.234665][2800:2805] CHIP:IN: Prepared secure message 0xaaaaf2f076b8 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 59569i with MessageCounter:7049664.
+          [1651582224.234711][2800:2805] CHIP:IN: Sending encrypted msg 0xaaaaf2f076b8 with MessageCounter:7049664 to 0x0000000000000001 (1) at monotonic time: 00000000002A6437 msec
+          [1651582224.236774][2800:2805] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:12155994 on exchange 59569i
+          [1651582224.236817][2800:2805] CHIP:EM: Found matching exchange: 59569i, Delegate: 0xffff88002d90
+          [1651582224.236858][2800:2805] CHIP:EM: Rxd Ack; Removing MessageCounter:7049664 from Retrans Table on exchange 59569i
+          [1651582224.236887][2800:2805] CHIP:EM: Removed CHIP MessageCounter:7049664 from RetransTable on exchange 59569i
+          [1651582224.236941][2800:2805] CHIP:DMG: SubscribeResponseMessage =
+          [1651582224.236974][2800:2805] CHIP:DMG: {
+          [1651582224.237002][2800:2805] CHIP:DMG:         SubscriptionId = 0xe2b3f2defbc9ad8d,
+          [1651582224.237037][2800:2805] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1651582224.237069][2800:2805] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1651582224.237099][2800:2805] CHIP:DMG:         InteractionModelRevision = 1
+          [1651582224.237127][2800:2805] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "Activate the subscription between the DUT and the TH for any
+          attribute. KeepSubsriptions flag should be set to False After the
+          Maximum interval time is elapsed, TH should send another subscription
+          request message with different parameters than before.
+          KeepSubsriptions flag should be set to False Change the value of the
+          attribute requested on the DUT."
+      verification: |
+          sudo ./chip-tool basic subscribe local-config-disabled 0 100  1 0 --keepSubscriptions 0
+
+          [1653464485.355192][19712:19717] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2324923808
+          [1653464485.355221][19712:19717] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1653464485.355280][19712:19717] CHIP:DMG: MoveToState ReadClient[0x7f1bd0005590]: Moving to [AwaitingSu]
+          [1653464485.355334][19712:19717] CHIP:EM: Piggybacking Ack for MessageCounter:9045781 on exchange: 63930i
+          [1653464485.355393][19712:19717] CHIP:IN: Prepared secure message 0x55aac7ba5188 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 63930i with MessageCounter:13974682.
+          [1653464485.355424][19712:19717] CHIP:IN: Sending encrypted msg 0x55aac7ba5188 with MessageCounter:13974682 to 0x0000000000000001 (1) at monotonic time: 000000000098E0DF msec
+          [1653464485.376990][19712:19717] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:9045782 on exchange 63930i
+          [1653464485.377041][19712:19717] CHIP:EM: Found matching exchange: 63930i, Delegate: 0x7f1bd0005590
+          [1653464485.377073][19712:19717] CHIP:EM: Rxd Ack; Removing MessageCounter:13974682 from Retrans Table on exchange 63930i
+          [1653464485.377093][19712:19717] CHIP:EM: Removed CHIP MessageCounter:13974682 from RetransTable on exchange 63930i
+          [1653464485.377140][19712:19717] CHIP:DMG: SubscribeResponseMessage =
+          [1653464485.377158][19712:19717] CHIP:DMG: {
+          [1653464485.377175][19712:19717] CHIP:DMG:         SubscriptionId = 0x1941a0fd,
+          [1653464485.377192][19712:19717] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1653464485.377210][19712:19717] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1653464485.377227][19712:19717] CHIP:DMG:         InteractionModelRevision = 1
+          [1653464485.377242][19712:19717] CHIP:DMG: }
+
+           sudo ./chip-tool basic subscribe local-config-disabled 200 1000  1 0 --keepSubscriptions 0
+
+          [1653464502.663445][19724:19729] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2324923808
+          [1653464502.663458][19724:19729] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1653464502.663480][19724:19729] CHIP:DMG: MoveToState ReadClient[0x7f8c880057c0]: Moving to [AwaitingSu]
+          [1653464502.663504][19724:19729] CHIP:EM: Piggybacking Ack for MessageCounter:2192862 on exchange: 20981i
+          [1653464502.663527][19724:19729] CHIP:IN: Prepared secure message 0x55a9fb3310d8 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 20981i with MessageCounter:3779317.
+          [1653464502.663542][19724:19729] CHIP:IN: Sending encrypted msg 0x55a9fb3310d8 with MessageCounter:3779317 to 0x0000000000000001 (1) at monotonic time: 000000000099247C msec
+          [1653464502.676940][19724:19729] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:2192863 on exchange 20981i
+          [1653464502.676976][19724:19729] CHIP:EM: Found matching exchange: 20981i, Delegate: 0x7f8c880057c0
+          [1653464502.676997][19724:19729] CHIP:EM: Rxd Ack; Removing MessageCounter:3779317 from Retrans Table on exchange 20981i
+          [1653464502.677005][19724:19729] CHIP:EM: Removed CHIP MessageCounter:3779317 from RetransTable on exchange 20981i
+          [1653464502.677036][19724:19729] CHIP:DMG: SubscribeResponseMessage =
+          [1653464502.677047][19724:19729] CHIP:DMG: {
+          [1653464502.677057][19724:19729] CHIP:DMG:         SubscriptionId = 0x3d593b10,
+          [1653464502.677068][19724:19729] CHIP:DMG:         MinIntervalFloorSeconds = 0xc8,
+          [1653464502.677078][19724:19729] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x3e8,
+          [1653464502.677087][19724:19729] CHIP:DMG:         InteractionModelRevision = 1
+          [1653464502.677096][19724:19729] CHIP:DMG: }
+
+
+          sudo ./chip-tool basic write local-config-disabled 1 1 0
+          [1653464565.244478][19736:19741] CHIP:DMG:                                 Endpoint = 0x0,
+          [1653464565.244506][19736:19741] CHIP:DMG:                                 Cluster = 0x28,
+          [1653464565.244536][19736:19741] CHIP:DMG:                                 Attribute = 0x0000_0010,
+          [1653464565.244563][19736:19741] CHIP:DMG:                         }
+          [1653464565.244602][19736:19741] CHIP:DMG:
+          [1653464565.244629][19736:19741] CHIP:DMG:                         StatusIB =
+          [1653464565.244659][19736:19741] CHIP:DMG:                         {
+          [1653464565.244685][19736:19741] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653464565.244710][19736:19741] CHIP:DMG:                         },
+          [1653464565.244738][19736:19741] CHIP:DMG:
+
+
+           sudo ./chip-tool basic subscribe local-config-disabled 0 100  1 0 --keepSubscriptions 0
+
+          [1653464583.855119][19746:19751] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2324923809
+          [1653464583.855160][19746:19751] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1653464583.855212][19746:19751] CHIP:DMG: MoveToState ReadClient[0x7f7130005ab0]: Moving to [AwaitingSu]
+          [1653464583.855256][19746:19751] CHIP:EM: Piggybacking Ack for MessageCounter:7563414 on exchange: 10588i
+          [1653464583.855305][19746:19751] CHIP:IN: Prepared secure message 0x55f470930a48 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 10588i with MessageCounter:6505897.
+          [1653464583.855337][19746:19751] CHIP:IN: Sending encrypted msg 0x55f470930a48 with MessageCounter:6505897 to 0x0000000000000001 (1) at monotonic time: 00000000009A61A3 msec
+          [1653464583.859578][19746:19751] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:7563415 on exchange 10588i
+          [1653464583.859625][19746:19751] CHIP:EM: Found matching exchange: 10588i, Delegate: 0x7f7130005ab0
+          [1653464583.859661][19746:19751] CHIP:EM: Rxd Ack; Removing MessageCounter:6505897 from Retrans Table on exchange 10588i
+          [1653464583.859689][19746:19751] CHIP:EM: Removed CHIP MessageCounter:6505897 from RetransTable on exchange 10588i
+          [1653464583.859734][19746:19751] CHIP:DMG: SubscribeResponseMessage =
+          [1653464583.859749][19746:19751] CHIP:DMG: {
+          [1653464583.859762][19746:19751] CHIP:DMG:         SubscriptionId = 0x2d5a25e3,
+          [1653464583.859781][19746:19751] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1653464583.859806][19746:19751] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1653464583.859828][19746:19751] CHIP:DMG:         InteractionModelRevision = 1
+          [1653464583.859847][19746:19751] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "Activate the subscription between the DUT and the TH for any
+          attribute After the Maximum interval time is elapsed, change the value
+          of the attribute requested on the DUT."
+      verification: |
+          sudo ./chip-tool basic write local-config-disabled 1 1 0
+
+          [1653464647.615920][19758:19763] CHIP:DMG:                         StatusIB =
+          [1653464647.615940][19758:19763] CHIP:DMG:                         {
+          [1653464647.615959][19758:19763] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653464647.615976][19758:19763] CHIP:DMG:                         },
+
+          sudo ./chip-tool basic subscribe local-config-disabled 0 100  1 0
+
+          [1653464677.814495][19798:19803] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2324923810
+          [1653464677.814522][19798:19803] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1653464677.814571][19798:19803] CHIP:DMG: MoveToState ReadClient[0x7fe884006cd0]: Moving to [AwaitingSu]
+          [1653464677.814616][19798:19803] CHIP:EM: Piggybacking Ack for MessageCounter:13698510 on exchange: 51112i
+          [1653464677.814667][19798:19803] CHIP:IN: Prepared secure message 0x5602c0b7aaf8 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 51112i with MessageCounter:575272.
+          [1653464677.814698][19798:19803] CHIP:IN: Sending encrypted msg 0x5602c0b7aaf8 with MessageCounter:575272 to 0x0000000000000001 (1) at monotonic time: 00000000009BD0AB msec
+          [1653464677.821795][19798:19803] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:13698511 on exchange 51112i
+          [1653464677.821832][19798:19803] CHIP:EM: Found matching exchange: 51112i, Delegate: 0x7fe884006cd0
+          [1653464677.821859][19798:19803] CHIP:EM: Rxd Ack; Removing MessageCounter:575272 from Retrans Table on exchange 51112i
+          [1653464677.821877][19798:19803] CHIP:EM: Removed CHIP MessageCounter:575272 from RetransTable on exchange 51112i
+          [1653464677.821926][19798:19803] CHIP:DMG: SubscribeResponseMessage =
+          [1653464677.821943][19798:19803] CHIP:DMG: {
+          [1653464677.821956][19798:19803] CHIP:DMG:         SubscriptionId = 0x7d224f31,
+          [1653464677.821970][19798:19803] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1653464677.821983][19798:19803] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1653464677.821996][19798:19803] CHIP:DMG:         InteractionModelRevision = 1
+          [1653464677.822007][19798:19803] CHIP:DMG: }
+
+          sudo ./chip-tool basic write local-config-disabled 0 1 0
+
+          [1653464719.762143][19924:19929] CHIP:DMG:                         StatusIB =
+          [1653464719.762166][19924:19929] CHIP:DMG:                         {
+          [1653464719.762186][19924:19929] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653464719.762210][19924:19929] CHIP:DMG:                         },
+
+
+           sudo ./chip-tool basic subscribe local-config-disabled 0 100  1 0
+
+
+          [1653464757.024706][19936:19941] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2324923811
+          [1653464757.024735][19936:19941] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1653464757.024769][19936:19941] CHIP:DMG: MoveToState ReadClient[0x7efe28007700]: Moving to [AwaitingSu]
+          [1653464757.024799][19936:19941] CHIP:EM: Piggybacking Ack for MessageCounter:5206161 on exchange: 26375i
+          [1653464757.024859][19936:19941] CHIP:IN: Prepared secure message 0x5590ceb1e6b8 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 26375i with MessageCounter:557407.
+          [1653464757.024886][19936:19941] CHIP:IN: Sending encrypted msg 0x5590ceb1e6b8 with MessageCounter:557407 to 0x0000000000000001 (1) at monotonic time: 00000000009D0615 msec
+          [1653464757.034562][19936:19941] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:5206162 on exchange 26375i
+          [1653464757.034598][19936:19941] CHIP:EM: Found matching exchange: 26375i, Delegate: 0x7efe28007700
+          [1653464757.034622][19936:19941] CHIP:EM: Rxd Ack; Removing MessageCounter:557407 from Retrans Table on exchange 26375i
+          [1653464757.034634][19936:19941] CHIP:EM: Removed CHIP MessageCounter:557407 from RetransTable on exchange 26375i
+          [1653464757.034699][19936:19941] CHIP:DMG: SubscribeResponseMessage =
+          [1653464757.034722][19936:19941] CHIP:DMG: {
+          [1653464757.034739][19936:19941] CHIP:DMG:         SubscriptionId = 0x7bb8ea47,
+          [1653464757.034756][19936:19941] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1653464757.034773][19936:19941] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1653464757.034789][19936:19941] CHIP:DMG:         InteractionModelRevision = 1
+          [1653464757.034806][19936:19941] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "Activate the subscription between the DUT and the TH for an attribute
+          Reboot the DUT. Change the value of the attribute on the DUT."
+      verification: |
+          sudo ./chip-tool basic subscribe local-config-disabled 0 100  1 0
+
+          [1653464677.814495][19798:19803] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 2324923810
+          [1653464677.814522][19798:19803] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1653464677.814571][19798:19803] CHIP:DMG: MoveToState ReadClient[0x7fe884006cd0]: Moving to [AwaitingSu]
+          [1653464677.814616][19798:19803] CHIP:EM: Piggybacking Ack for MessageCounter:13698510 on exchange: 51112i
+          [1653464677.814667][19798:19803] CHIP:IN: Prepared secure message 0x5602c0b7aaf8 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 51112i with MessageCounter:575272.
+          [1653464677.814698][19798:19803] CHIP:IN: Sending encrypted msg 0x5602c0b7aaf8 with MessageCounter:575272 to 0x0000000000000001 (1) at monotonic time: 00000000009BD0AB msec
+          [1653464677.821795][19798:19803] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:13698511 on exchange 51112i
+          [1653464677.821832][19798:19803] CHIP:EM: Found matching exchange: 51112i, Delegate: 0x7fe884006cd0
+          [1653464677.821859][19798:19803] CHIP:EM: Rxd Ack; Removing MessageCounter:575272 from Retrans Table on exchange 51112i
+          [1653464677.821877][19798:19803] CHIP:EM: Removed CHIP MessageCounter:575272 from RetransTable on exchange 51112i
+          [1653464677.821926][19798:19803] CHIP:DMG: SubscribeResponseMessage =
+          [1653464677.821943][19798:19803] CHIP:DMG: {
+          [1653464677.821956][19798:19803] CHIP:DMG:         SubscriptionId = 0x7d224f31,
+          [1653464677.821970][19798:19803] CHIP:DMG:         MinIntervalFloorSeconds = 0x0,
+          [1653464677.821983][19798:19803] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x64,
+          [1653464677.821996][19798:19803] CHIP:DMG:         InteractionModelRevision = 1
+          [1653464677.822007][19798:19803] CHIP:DMG: }
+
+          reboot the DUT using factory reset method
+
+          Change the attribute value by sending attribute value  and  verify DUT fails to send changed attribute value.
+      disabled: true
+
+    - label:
+          "Activate the subscription between the DUT and the TH for an attribute
+          There are no attribute value changes before MaxInterval elapses."
+      verification: |
+          ./chip-tool interactive start
+           onoff subscribe on-time 100 1000 1 1
+          [1653473717.457459][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473717.457490][21558:21563] CHIP:DMG: {
+          [1653473717.457512][21558:21563] CHIP:DMG:         SubscriptionId = 0x864c6467,
+          [1653473717.457531][21558:21563] CHIP:DMG:         AttributeReportIBs =
+          [1653473717.457561][21558:21563] CHIP:DMG:         [
+          [1653473717.457579][21558:21563] CHIP:DMG:                 AttributeReportIB =
+          [1653473717.457608][21558:21563] CHIP:DMG:                 {
+          [1653473717.457627][21558:21563] CHIP:DMG:                         AttributeDataIB =
+          [1653473717.457648][21558:21563] CHIP:DMG:                         {
+          [1653473717.457670][21558:21563] CHIP:DMG:                                 DataVersion = 0xbf2fc271,
+          [1653473717.457690][21558:21563] CHIP:DMG:                                 AttributePathIB =
+          [1653473717.457712][21558:21563] CHIP:DMG:                                 {
+          [1653473717.457733][21558:21563] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653473717.457755][21558:21563] CHIP:DMG:                                         Cluster = 0x6,
+          [1653473717.457779][21558:21563] CHIP:DMG:                                         Attribute = 0x0000_4001,
+          [1653473717.457799][21558:21563] CHIP:DMG:                                 }
+          [1653473717.457823][21558:21563] CHIP:DMG:
+          [1653473717.457846][21558:21563] CHIP:DMG:                                         Data = 2,
+          [1653473717.457865][21558:21563] CHIP:DMG:                         },
+          [1653473717.457892][21558:21563] CHIP:DMG:
+          [1653473717.457910][21558:21563] CHIP:DMG:                 },
+          [1653473717.457937][21558:21563] CHIP:DMG:
+          [1653473717.457955][21558:21563] CHIP:DMG:         ],
+          [1653473717.457982][21558:21563] CHIP:DMG:
+          [1653473717.458000][21558:21563] CHIP:DMG:         InteractionModelRevision = 1
+          [1653473717.458018][21558:21563] CHIP:DMG: }
+          [1653473717.458135][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 3207578225
+          [1653473717.458170][21558:21563] CHIP:TOO:   OnTime: 2
+          [1653473717.458211][21558:21563] CHIP:DMG: MoveToState ReadClient[0x7f35bc003d90]: Moving to [AwaitingSu]
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for an attribute to the DUT
+          with the KeepSubscriptions flag set to True. Activate the subscription
+          between DUT and the TH. Initiate another subscription request action
+          to the DUT for another attribute with the KeepSubscriptions flag set
+          to True. Change both the attribute values on the DUT."
+      verification: |
+          Use interactive mode to verify this
+          ./chip-tool start interactive mood
+
+          onoff subscribe off-wait-time 100 1000 1 1 --keepSubscriptions 1
+
+          [1653473183.208514][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473183.208542][21558:21563] CHIP:DMG: {
+          [1653473183.208571][21558:21563] CHIP:DMG: SubscriptionId = 0x75817f8c,
+          [1653473183.208595][21558:21563] CHIP:DMG: AttributeReportIBs =
+          [1653473183.208634][21558:21563] CHIP:DMG: [
+          [1653473183.208655][21558:21563] CHIP:DMG: AttributeReportIB =
+          [1653473183.208692][21558:21563] CHIP:DMG: {
+          [1653473183.208715][21558:21563] CHIP:DMG: AttributeDataIB =
+          [1653473183.208743][21558:21563] CHIP:DMG: {
+          [1653473183.208770][21558:21563] CHIP:DMG: DataVersion = 0xbf2fc26e,
+          [1653473183.208794][21558:21563] CHIP:DMG: AttributePathIB =
+          [1653473183.208863][21558:21563] CHIP:DMG: {
+          [1653473183.208902][21558:21563] CHIP:DMG: Endpoint = 0x1,
+          [1653473183.208931][21558:21563] CHIP:DMG: Cluster = 0x6,
+          [1653473183.208960][21558:21563] CHIP:DMG: Attribute = 0x0000_4002,
+          [1653473183.208988][21558:21563] CHIP:DMG: }
+          [1653473183.209021][21558:21563] CHIP:DMG:
+          [1653473183.209050][21558:21563] CHIP:DMG: Data = 0,
+          [1653473183.209073][21558:21563] CHIP:DMG: },
+          [1653473183.209107][21558:21563] CHIP:DMG:
+          [1653473183.209127][21558:21563] CHIP:DMG: },
+          [1653473183.209160][21558:21563] CHIP:DMG:
+          [1653473183.209180][21558:21563] CHIP:DMG: ],
+          [1653473183.209215][21558:21563] CHIP:DMG:
+          [1653473183.209236][21558:21563] CHIP:DMG: InteractionModelRevision = 1
+          [1653473183.209257][21558:21563] CHIP:DMG: }
+          [1653473183.209384][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4002 DataVersion: 3207578222
+          [1653473183.209421][21558:21563] CHIP:TOO: OffWaitTime: 0
+
+          onoff subscribe on-time 100 1000 1 1 --keepSubscriptions 1
+
+          [1653473048.980181][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473048.980202][21558:21563] CHIP:DMG: {
+          [1653473048.980219][21558:21563] CHIP:DMG: SubscriptionId = 0x29adb83a,
+          [1653473048.980233][21558:21563] CHIP:DMG: AttributeReportIBs =
+          [1653473048.980258][21558:21563] CHIP:DMG: [
+          [1653473048.980276][21558:21563] CHIP:DMG: AttributeReportIB =
+          [1653473048.980305][21558:21563] CHIP:DMG: {
+          [1653473048.980323][21558:21563] CHIP:DMG: AttributeDataIB =
+          [1653473048.980354][21558:21563] CHIP:DMG: {
+          [1653473048.980376][21558:21563] CHIP:DMG: DataVersion = 0xbf2fc26d,
+          [1653473048.980392][21558:21563] CHIP:DMG: AttributePathIB =
+          [1653473048.980411][21558:21563] CHIP:DMG: {
+          [1653473048.980440][21558:21563] CHIP:DMG: Endpoint = 0x1,
+          [1653473048.980463][21558:21563] CHIP:DMG: Cluster = 0x6,
+          [1653473048.980487][21558:21563] CHIP:DMG: Attribute = 0x0000_4001,
+          [1653473048.980507][21558:21563] CHIP:DMG: }
+          [1653473048.980532][21558:21563] CHIP:DMG:
+          [1653473048.980556][21558:21563] CHIP:DMG: Data = 0,
+          [1653473048.980576][21558:21563] CHIP:DMG: },
+          [1653473048.980598][21558:21563] CHIP:DMG:
+          [1653473048.980617][21558:21563] CHIP:DMG: },
+          [1653473048.980644][21558:21563] CHIP:DMG:
+          [1653473048.980661][21558:21563] CHIP:DMG: ],
+          [1653473048.980690][21558:21563] CHIP:DMG:
+          [1653473048.980708][21558:21563] CHIP:DMG: InteractionModelRevision = 1
+          [1653473048.980726][21558:21563] CHIP:DMG: }
+          [1653473048.980887][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 3207578221
+          [1653473048.980930][21558:21563] CHIP:TOO: OnTime: 0
+          [1653473048.980994][21558:21563] CHIP:DMG: MoveToState ReadClient[0x7f35bc003d90]: Moving to [AwaitingSu]
+
+          onoff write on-time 2 1 1
+          [1654239682.807602][3235:3240] CHIP:DMG: WriteResponseMessage =
+          [1654239682.807629][3235:3240] CHIP:DMG: {
+          [1654239682.807651][3235:3240] CHIP:DMG: AttributeStatusIBs =
+          [1654239682.807682][3235:3240] CHIP:DMG: [
+          [1654239682.807707][3235:3240] CHIP:DMG: AttributeStatusIB =
+          [1654239682.807735][3235:3240] CHIP:DMG: {
+          [1654239682.807760][3235:3240] CHIP:DMG: AttributePathIB =
+          [1654239682.807797][3235:3240] CHIP:DMG: {
+          [1654239682.807833][3235:3240] CHIP:DMG: Endpoint = 0x1,
+          [1654239682.807872][3235:3240] CHIP:DMG: Cluster = 0x6,
+          [1654239682.807909][3235:3240] CHIP:DMG: Attribute = 0x0000_4001,
+          [1654239682.807943][3235:3240] CHIP:DMG: }
+          [1654239682.807979][3235:3240] CHIP:DMG:
+          [1654239682.808010][3235:3240] CHIP:DMG: StatusIB =
+          [1654239682.808042][3235:3240] CHIP:DMG: {
+          [1654239682.808073][3235:3240] CHIP:DMG: status = 0x00 (SUCCESS),
+          [1654239682.808107][3235:3240] CHIP:DMG: },
+          [1654239682.808139][3235:3240] CHIP:DMG:
+          [1654239682.808165][3235:3240] CHIP:DMG: },
+          [1654239682.808194][3235:3240] CHIP:DMG:
+          [1654239682.808218][3235:3240] CHIP:DMG: ],
+          [1654239682.808247][3235:3240] CHIP:DMG:
+          [1654239682.808271][3235:3240] CHIP:DMG: InteractionModelRevision = 1
+          [1654239682.808294][3235:3240] CHIP:DMG: }
+
+          onoff write off-wait-time 3 1 1
+          [1653473207.686171][1507:1507] CHIP:DMG: WriteRequestMessage =
+          [1653473207.686233][1507:1507] CHIP:DMG: {
+          [1653473207.686290][1507:1507] CHIP:DMG: suppressResponse = false,
+          [1653473207.686394][1507:1507] CHIP:DMG: timedRequest = false,
+          [1653473207.686454][1507:1507] CHIP:DMG: AttributeDataIBs =
+          [1653473207.686550][1507:1507] CHIP:DMG: [
+          [1653473207.686611][1507:1507] CHIP:DMG: AttributeDataIB =
+          [1653473207.686710][1507:1507] CHIP:DMG: {
+          [1653473207.686775][1507:1507] CHIP:DMG: AttributePathIB =
+          [1653473207.686872][1507:1507] CHIP:DMG: {
+          [1653473207.686973][1507:1507] CHIP:DMG: Endpoint = 0x1,
+          [1653473207.687057][1507:1507] CHIP:DMG: Cluster = 0x6,
+          [1653473207.687163][1507:1507] CHIP:DMG: Attribute = 0x0000_4002,
+          [1653473207.687267][1507:1507] CHIP:DMG: }
+          [1653473207.687358][1507:1507] CHIP:DMG:
+          [1653473207.687460][1507:1507] CHIP:DMG: Data = 3,
+          [1653473207.687558][1507:1507] CHIP:DMG: },
+          [1653473207.687638][1507:1507] CHIP:DMG:
+          [1653473207.687722][1507:1507] CHIP:DMG: ],
+          [1653473207.687795][1507:1507] CHIP:DMG:
+          [1653473207.687855][1507:1507] CHIP:DMG: moreChunkedMessages = false,
+          [1653473207.687916][1507:1507] CHIP:DMG: InteractionModelRevision = 1
+          [1653473207.687974][1507:1507] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for an attribute to the DUT
+          with the KeepSubscriptions flag set to True. Activate the subscription
+          between DUT and the TH. Initiate another subscription request action
+          to the DUT for another attribute with the KeepSubscriptions flag set
+          to False. Change both the attribute values on the DUT."
+      verification: |
+          Use interactive mode to verify this
+          ./chip-tool start interactive mood
+
+          onoff subscribe on-time 100 1000 1 1 --keepSubscriptions 1
+
+          [1653473413.660423][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473413.660448][21558:21563] CHIP:DMG: {
+          [1653473413.660471][21558:21563] CHIP:DMG:         SubscriptionId = 0x35e946cb,
+          [1653473413.660492][21558:21563] CHIP:DMG:         AttributeReportIBs =
+          [1653473413.660521][21558:21563] CHIP:DMG:         [
+          [1653473413.660540][21558:21563] CHIP:DMG:                 AttributeReportIB =
+          [1653473413.660570][21558:21563] CHIP:DMG:                 {
+          [1653473413.660590][21558:21563] CHIP:DMG:                         AttributeDataIB =
+          [1653473413.660612][21558:21563] CHIP:DMG:                         {
+          [1653473413.660636][21558:21563] CHIP:DMG:                                 DataVersion = 0xbf2fc26f,
+          [1653473413.660656][21558:21563] CHIP:DMG:                                 AttributePathIB =
+          [1653473413.660681][21558:21563] CHIP:DMG:                                 {
+          [1653473413.660704][21558:21563] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653473413.660733][21558:21563] CHIP:DMG:                                         Cluster = 0x6,
+          [1653473413.660759][21558:21563] CHIP:DMG:                                         Attribute = 0x0000_4001,
+          [1653473413.660782][21558:21563] CHIP:DMG:                                 }
+          [1653473413.660808][21558:21563] CHIP:DMG:
+          [1653473413.660874][21558:21563] CHIP:DMG:                                         Data = 2,
+          [1653473413.660910][21558:21563] CHIP:DMG:                         },
+          [1653473413.660968][21558:21563] CHIP:DMG:
+          [1653473413.660990][21558:21563] CHIP:DMG:                 },
+          [1653473413.661017][21558:21563] CHIP:DMG:
+          [1653473413.661035][21558:21563] CHIP:DMG:         ],
+          [1653473413.661063][21558:21563] CHIP:DMG:
+          [1653473413.661081][21558:21563] CHIP:DMG:         InteractionModelRevision = 1
+          [1653473413.661098][21558:21563] CHIP:DMG: }
+          [1653473413.661214][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 3207578223
+          [1653473413.661246][21558:21563] CHIP:TOO:   OnTime: 2
+
+          onoff subscribe off-wait-time 100 1000 1 1 --keepSubscriptions 0
+          [1653473420.739901][21558:21563] CHIP:DMG: ReportDataMessage =
+          [1653473420.739928][21558:21563] CHIP:DMG: {
+          [1653473420.739945][21558:21563] CHIP:DMG:         SubscriptionId = 0x2293d74e,
+          [1653473420.739959][21558:21563] CHIP:DMG:         AttributeReportIBs =
+          [1653473420.739984][21558:21563] CHIP:DMG:         [
+          [1653473420.740005][21558:21563] CHIP:DMG:                 AttributeReportIB =
+          [1653473420.740034][21558:21563] CHIP:DMG:                 {
+          [1653473420.740049][21558:21563] CHIP:DMG:                         AttributeDataIB =
+          [1653473420.740072][21558:21563] CHIP:DMG:                         {
+          [1653473420.740095][21558:21563] CHIP:DMG:                                 DataVersion = 0xbf2fc26f,
+          [1653473420.740116][21558:21563] CHIP:DMG:                                 AttributePathIB =
+          [1653473420.740138][21558:21563] CHIP:DMG:                                 {
+          [1653473420.740161][21558:21563] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653473420.740183][21558:21563] CHIP:DMG:                                         Cluster = 0x6,
+          [1653473420.740207][21558:21563] CHIP:DMG:                                         Attribute = 0x0000_4002,
+          [1653473420.740228][21558:21563] CHIP:DMG:                                 }
+          [1653473420.740253][21558:21563] CHIP:DMG:
+          [1653473420.740277][21558:21563] CHIP:DMG:                                         Data = 3,
+          [1653473420.740297][21558:21563] CHIP:DMG:                         },
+          [1653473420.740323][21558:21563] CHIP:DMG:
+          [1653473420.740342][21558:21563] CHIP:DMG:                 },
+          [1653473420.740368][21558:21563] CHIP:DMG:
+          [1653473420.740386][21558:21563] CHIP:DMG:         ],
+          [1653473420.740414][21558:21563] CHIP:DMG:
+          [1653473420.740433][21558:21563] CHIP:DMG:         InteractionModelRevision = 1
+          [1653473420.740450][21558:21563] CHIP:DMG: }
+          [1653473420.740566][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4002 DataVersion: 3207578223
+          [1653473420.740601][21558:21563] CHIP:TOO:   OffWaitTime: 3
+
+          onoff write on-time 2 1 1
+          [1653473446.598647][21558:21563] CHIP:DMG:                         StatusIB =
+          [1653473446.598668][21558:21563] CHIP:DMG:                         {
+          [1653473446.598689][21558:21563] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653473446.598708][21558:21563] CHIP:DMG:                         },
+
+           onoff write off-wait-time 3 1 1
+          [1653473455.212291][21558:21563] CHIP:DMG:                         StatusIB =
+          [1653473455.212313][21558:21563] CHIP:DMG:                         {
+          [1653473455.212335][21558:21563] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653473455.212354][21558:21563] CHIP:DMG:                         },
+          [1653473455.212376][21558:21563] CHIP:DMG:
+
+
+           onoff subscribe on-time 100 1000 1 1
+          [1653473471.271631][21558:21563] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 3207578225
+          [1653473471.271692][21558:21563] CHIP:TOO:   OnTime: 2
+          [1653473471.271749][21558:21563] CHIP:DMG: MoveToState ReadClient[0x7f35bc003d90]: Moving to [AwaitingSu]
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for multiple
+          attributes/events. (1 attribute, 1 event). Change the value of the
+          attribute and trigger an action on the DUT to trigger the event."
+      verification: |
+
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for attribute wildcard -
+          AttributePath = [[Endpoint = EndpointID, Cluster = ClusterID]]. Change
+          all or few of the attributes on the DUT"
+      verification: |
+          out of scope for V1.0
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for an attribute without the
+          DataVersionFilters field set to the version of the cluster instance.
+          DUT sends a report data action with the data of the attribute along
+          with the data version. Tear down the subscription for that attribute.
+          Start another subscription with the DataVersionFilter field set to the
+          data version received above."
+      verification: |
+          Use interactive mode to verify this
+          ./chip-tool start interactive mood
+
+          onoff subscribe on-off 100 1000 1 1
+
+          [1653471711.843070][21032:21037] CHIP:DMG: ReportDataMessage =
+          [1653471711.843103][21032:21037] CHIP:DMG: {
+          [1653471711.843136][21032:21037] CHIP:DMG:         SubscriptionId = 0x352176f5,
+          [1653471711.843166][21032:21037] CHIP:DMG:         AttributeReportIBs =
+          [1653471711.843212][21032:21037] CHIP:DMG:         [
+          [1653471711.843239][21032:21037] CHIP:DMG:                 AttributeReportIB =
+          [1653471711.843284][21032:21037] CHIP:DMG:                 {
+          [1653471711.843310][21032:21037] CHIP:DMG:                         AttributeDataIB =
+          [1653471711.843344][21032:21037] CHIP:DMG:                         {
+          [1653471711.843372][21032:21037] CHIP:DMG:                                 DataVersion = 0xbf2fc26d,
+          [1653471711.843404][21032:21037] CHIP:DMG:                                 AttributePathIB =
+          [1653471711.843437][21032:21037] CHIP:DMG:                                 {
+          [1653471711.843464][21032:21037] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653471711.843505][21032:21037] CHIP:DMG:                                         Cluster = 0x6,
+          [1653471711.843536][21032:21037] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1653471711.843560][21032:21037] CHIP:DMG:                                 }
+          [1653471711.843589][21032:21037] CHIP:DMG:
+          [1653471711.843615][21032:21037] CHIP:DMG:                                         Data = false,
+          [1653471711.843647][21032:21037] CHIP:DMG:                         },
+          [1653471711.843686][21032:21037] CHIP:DMG:
+          [1653471711.843710][21032:21037] CHIP:DMG:                 },
+          [1653471711.843748][21032:21037] CHIP:DMG:
+          [1653471711.843771][21032:21037] CHIP:DMG:         ],
+          [1653471711.843831][21032:21037] CHIP:DMG:
+          [1653471711.843852][21032:21037] CHIP:DMG:         InteractionModelRevision = 1
+          [1653471711.843873][21032:21037] CHIP:DMG: }
+          [1653471711.844008][21032:21037] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3207578221
+          [1653471711.844042][21032:21037] CHIP:TOO:   OnOff: FALSE
+
+
+           onoff subscribe on-off 100 1000 1 1 --data-version  0xbf2fc26d
+          [1653471816.642239][21032:21037] CHIP:DMG: ReportDataMessage =
+          [1653471816.642244][21032:21037] CHIP:DMG: {
+          [1653471816.642250][21032:21037] CHIP:DMG:         SubscriptionId = 0xe9e61b04,
+          [1653471816.642256][21032:21037] CHIP:DMG:         InteractionModelRevision = 1
+          [1653471816.642261][21032:21037] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for attribute and sets the
+          MinIntervalFloor value to be same as MaxIntervalCeiling. Activate the
+          Subscription between TH and DUT. Modify the attribute which has been
+          subscribed to on the DUT."
+      verification: |
+          Use interactive mode to verify this
+          ./chip-tool start interactive mood
+           identify subscribe-by-id  0x00 800 800 3 1
+
+          [1653656592.465788][14560:14565] CHIP:DMG: ReportDataMessage =
+          [1653656592.465817][14560:14565] CHIP:DMG: {
+          [1653656592.465834][14560:14565] CHIP:DMG:         SubscriptionId = 0xc657316f,
+          [1653656592.465848][14560:14565] CHIP:DMG:         AttributeReportIBs =
+          [1653656592.465872][14560:14565] CHIP:DMG:         [
+          [1653656592.465886][14560:14565] CHIP:DMG:                 AttributeReportIB =
+          [1653656592.465910][14560:14565] CHIP:DMG:                 {
+          [1653656592.465924][14560:14565] CHIP:DMG:                         AttributeDataIB =
+          [1653656592.465941][14560:14565] CHIP:DMG:                         {
+          [1653656592.465959][14560:14565] CHIP:DMG:                                 DataVersion = 0xb45ba0b9,
+          [1653656592.465975][14560:14565] CHIP:DMG:                                 AttributePathIB =
+          [1653656592.465998][14560:14565] CHIP:DMG:                                 {
+          [1653656592.466031][14560:14565] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653656592.466054][14560:14565] CHIP:DMG:                                         Cluster = 0x3,
+          [1653656592.466077][14560:14565] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1653656592.466097][14560:14565] CHIP:DMG:                                 }
+          [1653656592.466122][14560:14565] CHIP:DMG:
+          [1653656592.466146][14560:14565] CHIP:DMG:                                         Data = 0,
+          [1653656592.466166][14560:14565] CHIP:DMG:                         },
+          [1653656592.466192][14560:14565] CHIP:DMG:
+          [1653656592.466210][14560:14565] CHIP:DMG:                 },
+          [1653656592.466236][14560:14565] CHIP:DMG:
+          [1653656592.466253][14560:14565] CHIP:DMG:         ],
+          [1653656592.466281][14560:14565] CHIP:DMG:
+          [1653656592.466300][14560:14565] CHIP:DMG:         InteractionModelRevision = 1
+          [1653656592.466318][14560:14565] CHIP:DMG: }
+          [1653656592.466465][14560:14565] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3025903801
+          [1653656592.466516][14560:14565] CHIP:TOO:   identify time: 0
+
+          identify write-by-id  0x00 2 3 1
+          [1653656682.729852][14560:14565] CHIP:DMG:                         StatusIB =
+          [1653656682.729863][14560:14565] CHIP:DMG:                         {
+          [1653656682.729873][14560:14565] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1653656682.729881][14560:14565] CHIP:DMG:                         },
+
+          identify subscribe-by-id  0x01 800 800 3 1
+          [1653656754.979929][14560:14565] CHIP:DMG: ReportDataMessage =
+          [1653656754.979956][14560:14565] CHIP:DMG: {
+          [1653656754.979985][14560:14565] CHIP:DMG:         SubscriptionId = 0x5d21ef91,
+          [1653656754.980010][14560:14565] CHIP:DMG:         AttributeReportIBs =
+          [1653656754.980048][14560:14565] CHIP:DMG:         [
+          [1653656754.980068][14560:14565] CHIP:DMG:                 AttributeReportIB =
+          [1653656754.980103][14560:14565] CHIP:DMG:                 {
+          [1653656754.980125][14560:14565] CHIP:DMG:                         AttributeDataIB =
+          [1653656754.980154][14560:14565] CHIP:DMG:                         {
+          [1653656754.980180][14560:14565] CHIP:DMG:                                 DataVersion = 0xb45ba0c0,
+          [1653656754.980207][14560:14565] CHIP:DMG:                                 AttributePathIB =
+          [1653656754.980235][14560:14565] CHIP:DMG:                                 {
+          [1653656754.980262][14560:14565] CHIP:DMG:                                         Endpoint = 0x1,
+          [1653656754.980287][14560:14565] CHIP:DMG:                                         Cluster = 0x3,
+          [1653656754.980310][14560:14565] CHIP:DMG:                                         Attribute = 0x0000_0001,
+          [1653656754.980339][14560:14565] CHIP:DMG:                                 }
+          [1653656754.980367][14560:14565] CHIP:DMG:
+          [1653656754.980390][14560:14565] CHIP:DMG:                                         Data = 2,
+          [1653656754.980417][14560:14565] CHIP:DMG:                         },
+          [1653656754.980450][14560:14565] CHIP:DMG:
+          [1653656754.980471][14560:14565] CHIP:DMG:                 },
+          [1653656754.980504][14560:14565] CHIP:DMG:
+          [1653656754.980524][14560:14565] CHIP:DMG:         ],
+          [1653656754.980558][14560:14565] CHIP:DMG:
+          [1653656754.980579][14560:14565] CHIP:DMG:         InteractionModelRevision = 1
+          [1653656754.980601][14560:14565] CHIP:DMG: }
+          [1653656754.980720][14560:14565] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0001 DataVersion: 3025903808
+          [1653656754.980755][14560:14565] CHIP:TOO:   identify type: 2
+          [1653656754.980799][14560:14565] CHIP:DMG: MoveToState ReadClient[0x7fda00004f10]: Moving to [AwaitingSu]
+      disabled: true
+
+    - label:
+          "TH sends a subscription request action for attribute and set the
+          MinIntervalFloor value to be greater than MaxIntervalCeiling."
+      verification: |
+
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
similarity index 99%
rename from src/app/tests/suites/certification/Test_TC_LO_1_1.yaml
rename to src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
index 8ca13596aaeddb..4ddf845555dbc2 100644
--- a/src/app/tests/suites/certification/Test_TC_LO_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
@@ -13,7 +13,7 @@
 # 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.1. [TC-LO-1.1] Localization Configuration Cluster Attributes
+name: 101.1.1. [TC-LCFG-1.1] Global Attributes [DUT-Server]
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
new file mode 100644
index 00000000000000..a2f01aecea8ea0
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
@@ -0,0 +1,145 @@
+# 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:
+    101.2.1. [TC-LCFG-2.1] Localization Configuration Cluster
+    Attributes[DUT-Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "TH reads SupportedLocales attribute from DUT"
+      verification: |
+          ./chip-tool localizationconfiguration read supported-locales 1 0
+
+          [1651129546.170573][174082:174087] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0002 DataVersion: 3111654481
+          [1651129546.170622][174082:174087] CHIP:TOO:   SupportedLocales: 8 entries
+          [1651129546.170636][174082:174087] CHIP:TOO:     [1]: en-US
+          [1651129546.170647][174082:174087] CHIP:TOO:     [2]: de-DE
+          [1651129546.170656][174082:174087] CHIP:TOO:     [3]: fr-FR
+          [1651129546.170664][174082:174087] CHIP:TOO:     [4]: en-GB
+          [1651129546.170672][174082:174087] CHIP:TOO:     [5]: es-ES
+          [1651129546.170681][174082:174087] CHIP:TOO:     [6]: zh-CN
+          [1651129546.170689][174082:174087] CHIP:TOO:     [7]: it-IT
+          [1651129546.170697][174082:174087] CHIP:TOO:     [8]: ja-JP
+      disabled: true
+
+    - label: "TH writes 'newsupportedlocales' to SupportedLocales attribute"
+      verification: |
+          ./chip-tool any write-by-id 0x002B 1 newsupportedlocales 1 0
+
+          [1651035119.852381][2747:2752] CHIP:DMG:        InteractionModelRevision = 1
+          [1651035119.852415][2747:2752] CHIP:DMG: }
+          [1651035119.852510][2747:2752] CHIP:TOO: Response Failure: IM Error 0x00000587: General error: 0x87 (CONSTRAINT_ERROR)
+          [1651035119.852576][2747:2752] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
+
+    - label: "TH reads SupportedLocales attribute"
+      verification: |
+          ./chip-tool localizationconfiguration read supported-locales 1 0
+          [1645772065.848431][3762:3767] CHIP:TOO:   SupportedLocales: 8 entries
+          [1645772065.850249][3762:3767] CHIP:TOO:     [1]: en-US
+          [1645772065.850298][3762:3767] CHIP:TOO:     [2]: de-DE
+          [1645772065.850333][3762:3767] CHIP:TOO:     [3]: fr-FR
+          [1645772065.850368][3762:3767] CHIP:TOO:     [4]: en-GB
+          [1645772065.850402][3762:3767] CHIP:TOO:     [5]: es-ES
+          [1645772065.850435][3762:3767] CHIP:TOO:     [6]: zh-CN
+          [1645772065.850469][3762:3767] CHIP:TOO:     [7]: it-IT
+          [1645772065.850502][3762:3767] CHIP:TOO:     [8]: ja-JP
+          [1645772065.851668][3762:3767] CHIP:EM: Sending Standalone Ack for MessageCounter:4927804 on exchange 64827i
+      disabled: true
+
+    - label: "TH reads ActiveLocale Attribute from the DUT"
+      verification: |
+          ./chip-tool localizationconfiguration read active-locale 1 0
+
+
+          [1651035208.064278][2761:2766] CHIP:DMG:        SuppressResponse = true,
+          [1651035208.064316][2761:2766] CHIP:DMG:        InteractionModelRevision = 1
+          [1651035208.064350][2761:2766] CHIP:DMG: }
+          [1651035208.064552][2761:2766] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001 DataVersion: 1509240084
+          [1651035208.064613][2761:2766] CHIP:TOO:   ActiveLocale: en-US
+      disabled: true
+
+    - label:
+          "TH writes new string not present in SupportedLocale attribute to
+          ActiveLocale Attribute."
+      verification: |
+          ./chip-tool localizationconfiguration write active-locale fw-GB 1 0
+
+
+          [[1651130076.882814][174458:174463] CHIP:DMG: WriteResponseMessage =
+          [1651130076.882819][174458:174463] CHIP:DMG: {
+          [1651130076.882824][174458:174463] CHIP:DMG:         AttributeStatusIBs =
+          [1651130076.882832][174458:174463] CHIP:DMG:         [
+          [1651130076.882835][174458:174463] CHIP:DMG:                 AttributeStatusIB =
+          [1651130076.882842][174458:174463] CHIP:DMG:                 {
+          [1651130076.882846][174458:174463] CHIP:DMG:                         AttributePathIB =
+          [1651130076.882850][174458:174463] CHIP:DMG:                         {
+          [1651130076.882855][174458:174463] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651130076.882861][174458:174463] CHIP:DMG:                                 Cluster = 0x2b,
+          [1651130076.882867][174458:174463] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651130076.882871][174458:174463] CHIP:DMG:                         }
+          [1651130076.882877][174458:174463] CHIP:DMG:
+          [1651130076.882881][174458:174463] CHIP:DMG:                         StatusIB =
+          [1651130076.882885][174458:174463] CHIP:DMG:                         {
+          [1651130076.882889][174458:174463] CHIP:DMG:                                 status = 0x87 (CONSTRAINT_ERROR),
+          [1651130076.882893][174458:174463] CHIP:DMG:                         },
+          [1651130076.882899][174458:174463] CHIP:DMG:
+          [1651130076.882903][174458:174463] CHIP:DMG:                 },
+          [1651130076.882908][174458:174463] CHIP:DMG:
+          [1651130076.882911][174458:174463] CHIP:DMG:         ],
+          [1651130076.882916][174458:174463] CHIP:DMG:
+          [1651130076.882920][174458:174463] CHIP:DMG:         InteractionModelRevision = 1
+          [1651130076.882923][174458:174463] CHIP:DMG: }
+          [1651130076.882938][174458:174463] CHIP:TOO: Response Failure: IM Error 0x00000587: General error: 0x87 (CONSTRAINT_ERROR)
+          [1651130076.882946][174458:174463] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1651130076.882957][174458:174463] CHIP:EM: Sending Standalone Ack for MessageCounter
+      disabled: true
+
+    - label:
+          "TH writes new string present in SupportedLocale attribute to
+          ActiveLocale Attribute"
+      verification: |
+          ./chip-tool localizationconfiguration write active-locale fr-FR 1 0
+
+          [1651035259.959116][2776:2781] CHIP:DMG:                        StatusIB =
+          [1651035259.959158][2776:2781] CHIP:DMG:                        {
+          [1651035259.959195][2776:2781] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1651035259.959234][2776:2781] CHIP:DMG:                        },
+          [1651035259.959271][2776:2781] CHIP:DMG:
+          [1651035259.959304][2776:2781] CHIP:DMG:                },
+          [1651035259.959343][2776:2781] CHIP:DMG:
+          [1651035259.959372][2776:2781] CHIP:DMG:        ],
+          [1651035259.959409][2776:2781] CHIP:DMG:
+          [1651035259.959438][2776:2781] CHIP:DMG:        InteractionModelRevision = 1
+          [1651035259.959466][2776:2781] CHIP:DMG: }
+          [1651035259.959552][2776:2781] CHIP:DMG: WriteClient moving to [AwaitingDe]
+      disabled: true
+
+    - label: "TH Reads ActiveLocale"
+      verification: |
+          ./chip-tool localizationconfiguration read active-locale 1 0
+
+          [1645772597.252904][3816:3821] CHIP:DMG:
+          [1645772597.252948][3816:3821] CHIP:DMG:        SuppressResponse = true,
+          [1645772597.252981][3816:3821] CHIP:DMG:        InteractionModelRevision = 1
+          [1645772597.253024][3816:3821] CHIP:DMG: }
+          [1645772597.253230][3816:3821] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001DataVersion: 3479138639
+          [1645772597.253293][3816:3821] CHIP:TOO:   ActiveLocale: fr-FR
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
new file mode 100644
index 00000000000000..0450af15046dae
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
@@ -0,0 +1,83 @@
+# 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:
+    101.3.1. [TC-LCFG-3.1] Localization Configuration Cluster
+    Attributes[DUT-Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT reads SupportedLocales attribute from TH"
+      verification: |
+          ./chip-tool localizationconfiguration read supported-locales 1 0
+
+          [1651227647.876273][2825:2825] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:15793025 on exchange 646r
+          [1651227647.876333][2825:2825] CHIP:EM: Handling via exchange: 646r, Delegate: 0xaaaae659a088
+          [1651227647.876468][2825:2825] CHIP:IM: Received Read request
+          [1651227647.876540][2825:2825] CHIP:DMG: ReadRequestMessage =
+          [1651227647.876583][2825:2825] CHIP:DMG: {
+          [1651227647.876617][2825:2825] CHIP:DMG:        AttributePathIBs =
+          [1651227647.876660][2825:2825] CHIP:DMG:        [
+          [1651227647.876699][2825:2825] CHIP:DMG:                AttributePathIB =
+          [1651227647.876754][2825:2825] CHIP:DMG:                {
+          [1651227647.876801][2825:2825] CHIP:DMG:                        Endpoint = 0x0,
+          [1651227647.876854][2825:2825] CHIP:DMG:                        Cluster = 0x2b,
+          [1651227647.876906][2825:2825] CHIP:DMG:                        Attribute = 0x0000_0002,
+          [1651227647.876954][2825:2825] CHIP:DMG:                }
+          [1651227647.877002][2825:2825] CHIP:DMG:
+          [1651227647.877046][2825:2825] CHIP:DMG:        ],
+          [1651227647.877091][2825:2825] CHIP:DMG:
+          [1651227647.877134][2825:2825] CHIP:DMG:        isFabricFiltered = true,
+          [1651227647.877175][2825:2825] CHIP:DMG:        InteractionModelRevision = 1
+          [1651227647.877214][2825:2825] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveLocale attribute from the TH"
+      verification: |
+          ./chip-tool localizationconfiguration read active-locale 1 0
+
+          [1651564394.279517][8392:8397] CHIP:DMG: ReportDataMessage =
+          [1651564394.279566][8392:8397] CHIP:DMG: {
+          [1651564394.279606][8392:8397] CHIP:DMG:         AttributeReportIBs =
+          [1651564394.279662][8392:8397] CHIP:DMG:         [
+          [1651564394.279706][8392:8397] CHIP:DMG:                 AttributeReportIB =
+          [1651564394.279771][8392:8397] CHIP:DMG:                 {
+          [1651564394.279821][8392:8397] CHIP:DMG:                         AttributeDataIB =
+          [1651564394.279884][8392:8397] CHIP:DMG:                         {
+          [1651564394.279944][8392:8397] CHIP:DMG:                                 DataVersion = 0x66e5e842,
+          [1651564394.280008][8392:8397] CHIP:DMG:                                 AttributePathIB =
+          [1651564394.280069][8392:8397] CHIP:DMG:                                 {
+          [1651564394.280176][8392:8397] CHIP:DMG:                                         Endpoint = 0x0,
+          [1651564394.280245][8392:8397] CHIP:DMG:                                         Cluster = 0x2b,
+          [1651564394.280314][8392:8397] CHIP:DMG:                                         Attribute = 0x0000_0001,
+          [1651564394.280376][8392:8397] CHIP:DMG:                                 }
+          [1651564394.280440][8392:8397] CHIP:DMG:
+          [1651564394.280509][8392:8397] CHIP:DMG:                                         Data = "en-US",
+          [1651564394.280574][8392:8397] CHIP:DMG:                         },
+          [1651564394.280641][8392:8397] CHIP:DMG:
+          [1651564394.280691][8392:8397] CHIP:DMG:                 },
+          [1651564394.280750][8392:8397] CHIP:DMG:
+          [1651564394.280797][8392:8397] CHIP:DMG:         ],
+          [1651564394.280853][8392:8397] CHIP:DMG:
+          [1651564394.280898][8392:8397] CHIP:DMG:         SuppressResponse = true,
+          [1651564394.280944][8392:8397] CHIP:DMG:         InteractionModelRevision = 1
+          [1651564394.280986][8392:8397] CHIP:DMG: }
+          [1651564394.281211][8392:8397] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001 DataVersion: 1726343234
+          [1651564394.281289][8392:8397] CHIP:TOO:   ActiveLocale: en-US
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
index 8a3de458560a26..c48f553ea60789 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
@@ -66,13 +66,16 @@ tests:
           constraints:
               type: uint16
 
+    # For lighting Device type current level minimal value is 1
     - label: "Reads the MinLevel attribute"
       command: "readAttribute"
       attribute: "min level"
       response:
-          value: 0
+          value: 1
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 1
 
     - label: "Reads the MaxLevel attribute"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
new file mode 100644
index 00000000000000..c81ffdb55d6f59
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
@@ -0,0 +1,49 @@
+# 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: 21.6.3. [TC-LVL-8.1] Verification of commands (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH prompts the operator to make the DUT send one or more supported
+          commands from the Level Control cluster"
+      verification: |
+          ./chip-tool levelcontrol  move-to-level-with-on-off  1 0 1 1
+
+          [1653376388.152776][6857:6862] CHIP:DMG:                                 StatusIB =
+          [1653376388.152787][6857:6862] CHIP:DMG:                                 {
+          [1653376388.152798][6857:6862] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1653376388.152807][6857:6862] CHIP:DMG:                                 },
+
+
+
+          "./chip-tool levelcontrol move 0 5 1 1 1 1
+
+          [1653376475.749496][6881:6886] CHIP:DMG:                                 StatusIB =
+          [1653376475.749514][6881:6886] CHIP:DMG:                                 {
+          [1653376475.749535][6881:6886] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1653376475.749552][6881:6886] CHIP:DMG:                                 },
+
+          ./chip-tool levelcontrol move 0 5 1 1 1 1
+          [1653376996.997615][6985:6990] CHIP:DMG:                                 StatusIB =
+          [1653376996.997626][6985:6990] CHIP:DMG:                                 {
+          [1653376996.997639][6985:6990] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1653376996.997649][6985:6990] CHIP:DMG:                                 },"
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_10_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_10_2.yaml
deleted file mode 100644
index 627861154de51d..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_MC_10_2.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 18.12.2. [TC-MC-10.1] Read Content Launcher Attributes (DUT as Client)
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "DUT reads the AcceptHeader attribute from the TH"
-      verification: |
-          ./chip-tool contentlauncher read accept-header-list 1 1
-          [1642143310.771536][4307:4312] CHIP:DMG: ReportDataMessage =
-          [1642143310.771560][4307:4312] CHIP:DMG: {
-          [1642143310.771578][4307:4312] CHIP:DMG:        AttributeReportIBs =
-          [1642143310.771607][4307:4312] CHIP:DMG:        [
-          [1642143310.771669][4307:4312] CHIP:DMG:                AttributeReportIB =
-          [1642143310.771706][4307:4312] CHIP:DMG:                {
-          [1642143310.771733][4307:4312] CHIP:DMG:                        AttributeDataIB =
-          [1642143310.771761][4307:4312] CHIP:DMG:                        {
-          [1642143310.771787][4307:4312] CHIP:DMG:                                DataVersion = 0x0,
-          [1642143310.771815][4307:4312] CHIP:DMG:                                AttributePathIB =
-          [1642143310.771875][4307:4312] CHIP:DMG:                                {
-          [1642143310.771921][4307:4312] CHIP:DMG:                                        Endpoint = 0x1,
-          [1642143310.771968][4307:4312] CHIP:DMG:                                        Cluster = 0x50a,
-          [1642143310.772015][4307:4312] CHIP:DMG:                                        Attribute = 0x0000_0000,
-          [1642143310.772059][4307:4312] CHIP:DMG:                                }
-          [1642143310.772107][4307:4312] CHIP:DMG:
-          [1642143310.772150][4307:4312] CHIP:DMG:                                        Data = [
-          [1642143310.772195][4307:4312] CHIP:DMG:
-          [1642143310.772240][4307:4312] CHIP:DMG:                                        ],
-          [1642143310.772283][4307:4312] CHIP:DMG:                        },
-          [1642143310.772327][4307:4312] CHIP:DMG:
-          [1642143310.772354][4307:4312] CHIP:DMG:                },
-          [1642143310.772385][4307:4312] CHIP:DMG:
-          [1642143310.772409][4307:4312] CHIP:DMG:        ],
-          [1642143310.772440][4307:4312] CHIP:DMG:
-          [1642143310.772464][4307:4312] CHIP:DMG:        SuppressResponse = true,
-          [1642143310.772487][4307:4312] CHIP:DMG: }
-          [1642143310.772653][4307:4312] CHIP:TOO: ContentLauncher.AcceptHeaderList response: 0 entries
-      disabled: true
-
-    - label: "DUT reads the SupportedStreamingProtocols attribute from the TH"
-      verification: |
-          ./chip-tool contentlauncher read supported-streaming-protocols 1 1
-          [1642143572.943704][4325:4330] CHIP:DMG: ReportDataMessage =
-          [1642143572.943750][4325:4330] CHIP:DMG: {
-          [1642143572.943798][4325:4330] CHIP:DMG:        AttributeReportIBs =
-          [1642143572.943844][4325:4330] CHIP:DMG:        [
-          [1642143572.943881][4325:4330] CHIP:DMG:                AttributeReportIB =
-          [1642143572.943940][4325:4330] CHIP:DMG:                {
-          [1642143572.943967][4325:4330] CHIP:DMG:                        AttributeDataIB =
-          [1642143572.944014][4325:4330] CHIP:DMG:                        {
-          [1642143572.944069][4325:4330] CHIP:DMG:                                DataVersion = 0x0,
-          [1642143572.944095][4325:4330] CHIP:DMG:                                AttributePathIB =
-          [1642143572.944141][4325:4330] CHIP:DMG:                                {
-          [1642143572.944230][4325:4330] CHIP:DMG:                                        Endpoint = 0x1,
-          [1642143572.944274][4325:4330] CHIP:DMG:                                        Cluster = 0x50a,
-          [1642143572.944320][4325:4330] CHIP:DMG:                                        Attribute = 0x0000_0001,
-          [1642143572.944382][4325:4330] CHIP:DMG:                                }
-          [1642143572.944415][4325:4330] CHIP:DMG:
-          [1642143572.944462][4325:4330] CHIP:DMG:                                        Data = 0,
-          [1642143572.944493][4325:4330] CHIP:DMG:                        },
-          [1642143572.944522][4325:4330] CHIP:DMG:
-          [1642143572.944547][4325:4330] CHIP:DMG:                },
-          [1642143572.944578][4325:4330] CHIP:DMG:
-          [1642143572.944598][4325:4330] CHIP:DMG:        ],
-          [1642143572.944625][4325:4330] CHIP:DMG:
-          [1642143572.944649][4325:4330] CHIP:DMG:        SuppressResponse = true,
-          [1642143572.944670][4325:4330] CHIP:DMG: }
-          [1642143572.944820][4325:4330] CHIP:TOO: ContentLauncher.SupportedStreamingProtocols response: 0
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_10_4.yaml b/src/app/tests/suites/certification/Test_TC_MC_10_4.yaml
deleted file mode 100644
index a0039a1ebfcfe1..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_MC_10_4.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 18.12.4. [TC-MC-10.4] Launch Content Verification (DUT as Client)
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "DUT sends a LaunchContent command to the TH with a search parameter
-          and string, and AutoPlay flag set to false"
-      verification: |
-          ./chip-tool contentlauncher launch-content-request 0 'Star Wars' 1 1
-      disabled: true
-
-    - label:
-          "DUT sends a LaunchContent command to the TH with a search parameter
-          and string, and AutoPlay flag set to true"
-      verification: |
-          ./chip-tool contentlauncher launch-content-request 1 'Star Wars' 1 1
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_10_6.yaml b/src/app/tests/suites/certification/Test_TC_MC_10_6.yaml
deleted file mode 100644
index 4772408983919b..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_MC_10_6.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 18.12.6. [TC-MC-10.6] Launch URL Verification (DUT as Client)
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "DUT sends a LaunchURL command to the TH with a known good content URL
-          string"
-      verification: |
-          ./chip-tool contentlauncher launch-urlrequest https://csa-iot.org/ 1 1
-      disabled: true
-
-    - label:
-          "DUT sends a LaunchURL command to the TH with a known good content URL
-          string and a display string"
-      verification: |
-          ./chip-tool contentlauncher launch-urlrequest  https://csa-iot.org/  'Test content' 1 1
-      disabled: true
-
-    - label:
-          "DUT sends a LaunchURL command to the TH with a known good content URL
-          string and a brand information object."
-      verification: |
-          Not supported by chip-tool
-      disabled: true
-
-    - label:
-          "DUT sends a LaunchURL command to the DUT with a known unreachable
-          content URL string."
-      verification: |
-          ./chip-tool contentlauncher launch-urlrequest  https://badurl 1 1
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
new file mode 100644
index 00000000000000..21fe3a05fb9b49
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
@@ -0,0 +1,126 @@
+# 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.13.1. [TC-MC-11.1] Casting Video Player via User-Directed Commissioning
+    Verification (DUT as Server)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH start scanning for available commissioners using Commissioner
+          Discovery"
+      verification: |
+          ./chip-tv-casting-app
+
+          The shell should show a discovered commissioner, similar to the following:
+
+          [1653089767279] [88361:1149415] CHIP: [SVR] Discovered Commissioner #0
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Hostname: 147dda9ac00a
+          [1653089767279] [88361:1149415] CHIP: [DIS]         IP Address #1: 169.254.81.148
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Port: 5650
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Mrp Interval idle: 5000 ms
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Mrp Interval active: 2000 ms
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Device Name: Test TV
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Vendor ID: 65521
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Product ID: 32769
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Device Type: 35
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Instance Name: 3DC86F5236D636CB
+          [1653089767279] [88361:1149415] CHIP: [DIS]         Commissioning Mode: 0
+          [1653089767279] [88361:1149415] CHIP: [SVR] 1 commissioner(s) discovered. Select one (by number# above) to request commissioning from:
+          [1653089767279] [88361:1149415] CHIP: [SVR] Example: cast request 0
+      disabled: true
+
+    - label: "TH is instructed to select the commissioner found in step 1"
+      verification: |
+          Into the shell, enter "cast request 0" to send a user-directed-commissioning request to the DUT
+
+          > cast request 0
+          [1653179218011] [47890:1899175] CHIP: [DL] request
+          [1653179218011] [47890:1899175] CHIP: [SVR]   ------- PrepareForCommissioning
+          [1653179218011] [47890:1899175] CHIP: [SVR] Server initializing...
+      disabled: true
+
+    - label:
+          "DUT prompt user for onboarding by giving an option to accept or
+          reject the commissioning of TH"
+      verification: |
+          UX will vary by product maker. The following is the tv-app shell output:
+
+          [1653179219087] [89108:1898759] CHIP: [CTL] ------PROMPT USER: Test TV casting app is requesting permission to cast to this TV, approve? [0x0000_FFF1,0x0000_8001,E0707BB1AFFA6F23,020096D16895275F1B49A07221F0E588E06B]
+
+          [1653179219087] [89108:1898759] CHIP: [CTL] ------Via Shell Enter: controller ux ok|cancel
+      disabled: true
+
+    - label:
+          "DUT start the commissioning procedure with TH, when user accepts the
+          commissioning"
+      verification: |
+          Into the DUT UX, accept request for commissioning. Manufacturer may utilize a custom method for obtaining user consent other than an on-screen prompt.
+
+          The following is the tv-app shell command to accept the request
+
+          > controller ux ok
+
+          The commissioning success completion is indicated in the TH with the following shell output:
+
+          [1653088463910] [86837:1122544] CHIP: [SVR] Commissioning completed successfully
+      disabled: true
+
+    - label: "TH reads the endpoints from the DUT"
+      verification: |
+          Into the shell, enter "cast cluster descriptor read device-list 0 1" to read the device list of the descriptor cluster on endpoint 1
+
+          > cast cluster descriptor read device-list 0 1
+          ....
+          [1653180010083] [48426:1914389] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2009082322
+          [1653180010083] [48426:1914389] CHIP: [TOO]   device list: 1 entries
+          [1653180010083] [48426:1914389] CHIP: [TOO]     [1]: {
+          [1653180010083] [48426:1914389] CHIP: [TOO]       Type: 35
+          [1653180010083] [48426:1914389] CHIP: [TOO]       Revision: 1
+          [1653180010083] [48426:1914389] CHIP: [TOO]      }
+      disabled: true
+
+    - label: "TH reads the endpoints from the DUT"
+      verification: |
+          Into the shell, enter "cast cluster descriptor read device-list 0 2" to read the device list of the descriptor cluster on endpoint 2
+
+          > cast cluster descriptor read device-list 0 2
+          ....
+          [1653180162379] [48426:1917385] CHIP: [TOO] Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 631462374
+          [1653180162379] [48426:1917385] CHIP: [TOO]   device list: 1 entries
+          [1653180162379] [48426:1917385] CHIP: [TOO]     [1]: {
+          [1653180162379] [48426:1917385] CHIP: [TOO]       Type: 34
+          [1653180162379] [48426:1917385] CHIP: [TOO]       Revision: 1
+          [1653180162379] [48426:1917385] CHIP: [TOO]      }
+      disabled: true
+
+    - label: "TH reads the endpoints from the DUT"
+      verification: |
+          Into the shell, enter "cast cluster descriptor read device-list 0 6" to read the device list of the descriptor cluster on endpoint 6
+
+          > cast cluster descriptor read device-list 0 6
+          ....
+          [1653180214397] [48426:1919098] CHIP: [TOO] Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4094146641
+          [1653180214397] [48426:1919098] CHIP: [TOO]   device list: 1 entries
+          [1653180214397] [48426:1919098] CHIP: [TOO]     [1]: {
+          [1653180214397] [48426:1919098] CHIP: [TOO]       Type: 36
+          [1653180214397] [48426:1919098] CHIP: [TOO]       Revision: 1
+          [1653180214397] [48426:1919098] CHIP: [TOO]      }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml
new file mode 100644
index 00000000000000..ba22ac66d96fc9
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml
@@ -0,0 +1,131 @@
+# 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.13.2. [TC-MC-11.2] Casting Video Player via UX Screen with PIN
+    Verification (DUT as Server)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH start scanning for available commissioners using Commissioner
+          Discovery"
+      verification: |
+          ./chip-tv-casting-app
+
+          The shell should show a discovered commissioner, similar to the following:
+
+          [1653089767279] [88361:1149415] CHIP: [SVR] Discovered Commissioner #0
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Hostname: 147dda9ac00a
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	IP Address #1: 169.254.81.148
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Port: 5650
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Mrp Interval idle: 5000 ms
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Mrp Interval active: 2000 ms
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Device Name: Test TV
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Vendor ID: 65521
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Product ID: 32769
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Device Type: 35
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Instance Name: 3DC86F5236D636CB
+          [1653089767279] [88361:1149415] CHIP: [DIS] 	Commissioning Mode: 0
+          [1653089767279] [88361:1149415] CHIP: [SVR] 1 commissioner(s) discovered. Select one (by number# above) to request commissioning from:
+          [1653089767279] [88361:1149415] CHIP: [SVR] Example: cast request 0
+      disabled: true
+
+    - label: "TH is instructed to select the commissioner found in step 1"
+      verification: |
+          Into the shell, enter "cast request 0" to send a user-directed-commissioning request to the DUT
+
+          > cast request 0
+          [1653179218011] [47890:1899175] CHIP: [DL] request
+          [1653179218011] [47890:1899175] CHIP: [SVR]   ------- PrepareForCommissioning
+          [1653179218011] [47890:1899175] CHIP: [SVR] Server initializing...
+      disabled: true
+
+    - label: "TH provides 11/21 digit manual pairing code or setup passcode."
+      verification: |
+          The TH should display the setup passcode in the shell output (20202021 is the passcode below):
+
+          [1653179750840] [48426:1909867] CHIP: [DL] Device Configuration:
+          [1653179750840] [48426:1909867] CHIP: [DL]   Serial Number: TEST_SN
+          [1653179750840] [48426:1909867] CHIP: [DL]   Vendor Id: 65521 (0xFFF1)
+          [1653179750841] [48426:1909867] CHIP: [DL]   Product Id: 32769 (0x8001)
+          [1653179750841] [48426:1909867] CHIP: [DL]   Hardware Version: 0
+          [1653179750841] [48426:1909867] CHIP: [DL]   Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
+          [1653179750841] [48426:1909867] CHIP: [DL]   Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 0 (0x0)
+          [1653179750841] [48426:1909867] CHIP: [DL]   Manufacturing Date: (not set)
+          [1653179750841] [48426:1909867] CHIP: [DL]   Device Type: 35 (0x23)
+          Done
+      disabled: true
+
+    - label:
+          "DUT Prompts user to enter the pairing code (provided by TH in
+          previous step)."
+      verification: |
+          Into the DUT UX, accept request for commissioning. Manufacturer may utilize a custom method for obtaining user consent other than an on-screen prompt.
+
+          The following is the tv-app shell command to accept the request
+
+          > controller ux ok 20202021
+
+          The commissioning success completion is indicated in the TH with the following shell output:
+
+          [1653088463910] [86837:1122544] CHIP: [SVR] Commissioning completed successfully
+      disabled: true
+
+    - label: "TH reads the endpoints from the DUT"
+      verification: |
+          Into the shell, enter "cast cluster descriptor read device-list 0 1" to read the device list of the descriptor cluster on endpoint 1
+
+          > cast cluster descriptor read device-list 0 1
+          ....
+          [1653180010083] [48426:1914389] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2009082322
+          [1653180010083] [48426:1914389] CHIP: [TOO]   device list: 1 entries
+          [1653180010083] [48426:1914389] CHIP: [TOO]     [1]: {
+          [1653180010083] [48426:1914389] CHIP: [TOO]       Type: 35
+          [1653180010083] [48426:1914389] CHIP: [TOO]       Revision: 1
+          [1653180010083] [48426:1914389] CHIP: [TOO]      }
+      disabled: true
+
+    - label: "TH reads the endpoints from the DUT"
+      verification: |
+          Into the shell, enter "cast cluster descriptor read device-list 0 2" to read the device list of the descriptor cluster on endpoint 2
+
+          > cast cluster descriptor read device-list 0 2
+          ....
+          [1653180162379] [48426:1917385] CHIP: [TOO] Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 631462374
+          [1653180162379] [48426:1917385] CHIP: [TOO]   device list: 1 entries
+          [1653180162379] [48426:1917385] CHIP: [TOO]     [1]: {
+          [1653180162379] [48426:1917385] CHIP: [TOO]       Type: 34
+          [1653180162379] [48426:1917385] CHIP: [TOO]       Revision: 1
+          [1653180162379] [48426:1917385] CHIP: [TOO]      }
+      disabled: true
+
+    - label: "TH reads the endpoints from the DUT"
+      verification: |
+          Into the shell, enter "cast cluster descriptor read device-list 0 6" to read the device list of the descriptor cluster on endpoint 6
+
+          > cast cluster descriptor read device-list 0 6
+          ....
+          [1653180214397] [48426:1919098] CHIP: [TOO] Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4094146641
+          [1653180214397] [48426:1919098] CHIP: [TOO]   device list: 1 entries
+          [1653180214397] [48426:1919098] CHIP: [TOO]     [1]: {
+          [1653180214397] [48426:1919098] CHIP: [TOO]       Type: 36
+          [1653180214397] [48426:1919098] CHIP: [TOO]       Revision: 1
+          [1653180214397] [48426:1919098] CHIP: [TOO]      }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_12_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_12_1.yaml
new file mode 100644
index 00000000000000..f8492bbdc3ed51
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_12_1.yaml
@@ -0,0 +1,69 @@
+# 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: 18.14.1. [TC-MC-12.1] Account Login Verification
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Make sure there is a Content App endpoint implementing the Account
+          Login cluster. Product maker may provide pre-setup steps"
+      verification: |
+          The following command on the example tv-app will launch a content app on endpoint 6:
+           ./chip-tool applicationlauncher launch-app '{"catalogVendorId": 123, "applicationId": "exampleid"}' 1 1
+
+          [1654004240716] [9799:7814889] CHIP: [DMG] Received Command Response Data, Endpoint=1 Cluster=0x0000_050C Command=0x0000_0003
+          [1654004240717] [9799:7814889] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_050C Command 0x0000_0003
+          [1654004240717] [9799:7814889] CHIP: [TOO]   LauncherResponse: {
+          [1654004240717] [9799:7814889] CHIP: [TOO]     status: 0
+          [1654004240717] [9799:7814889] CHIP: [TOO]     data: 64617461
+          [1654004240717] [9799:7814889] CHIP: [TOO]    }
+      disabled: true
+
+    - label:
+          "TH sends a GetSetupPIN command to the DUT with test values provided
+          by the product maker."
+      verification: |
+          ./chip-tool accountlogin get-setup-pin 1111 1 6 --timedInteractionTimeoutMs 1000
+
+          [1654004273684] [9851:7821178] CHIP: [DMG] Received Command Response Data, Endpoint=6 Cluster=0x0000_050E Command=0x0000_0001
+          [1654004273684] [9851:7821178] CHIP: [TOO] Endpoint: 6 Cluster: 0x0000_050E Command 0x0000_0001
+          [1654004273684] [9851:7821178] CHIP: [TOO]   GetSetupPINResponse: {
+          [1654004273684] [9851:7821178] CHIP: [TOO]     setupPIN: 34567890
+          [1654004273684] [9851:7821178] CHIP: [TOO]    }
+      disabled: true
+
+    - label:
+          "TH sends a Login command to the DUT with test values provided by the
+          product maker."
+      verification: |
+          ./chip-tool accountlogin login 11111 34567890 1 6 --timedInteractionTimeoutMs 1000
+
+          [1654004350009] [9951:7836487] CHIP: [DMG] Received Command Response Status for Endpoint=6 Cluster=0x0000_050E Command=0x0000_0002 Status=0x0
+      disabled: true
+
+    - label:
+          "TH sends a Logout command to the DUT with test values provided by the
+          product maker."
+      verification: |
+          ./chip-tool accountlogin logout  2 6 --timedInteractionTimeoutMs 1000
+
+
+          [1654004400892] [9988:7841997] CHIP: [DMG] Received Command Response Status for Endpoint=6 Cluster=0x0000_050E Command=0x0000_0003 Status=0x0
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_12_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_12_2.yaml
new file mode 100644
index 00000000000000..08a3ebcbaedb16
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_12_2.yaml
@@ -0,0 +1,68 @@
+# 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: 18.14.2. [TC-MC-12.2] Account Login Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Make sure there is a Content App endpoint implementing the Account
+          Login cluster. Product maker may provide pre-setup steps"
+      verification: |
+          The following command on the example tv-app will launch a content app on endpoint 6:
+           ./chip-tool applicationlauncher launch-app '{"catalogVendorId": 123, "applicationId": "exampleid"}' 1 1
+
+          [1654004240716] [9799:7814889] CHIP: [DMG] Received Command Response Data, Endpoint=1 Cluster=0x0000_050C Command=0x0000_0003
+          [1654004240717] [9799:7814889] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_050C Command 0x0000_0003
+          [1654004240717] [9799:7814889] CHIP: [TOO]   LauncherResponse: {
+          [1654004240717] [9799:7814889] CHIP: [TOO]     status: 0
+          [1654004240717] [9799:7814889] CHIP: [TOO]     data: 64617461
+          [1654004240717] [9799:7814889] CHIP: [TOO]    }
+      disabled: true
+
+    - label: "DUT sends GetSetupPIN command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool accountlogin get-setup-pin 1111 1 6 --timedInteractionTimeoutMs 1000
+
+          [1654004273684] [9851:7821178] CHIP: [DMG] Received Command Response Data, Endpoint=6 Cluster=0x0000_050E Command=0x0000_0001
+          [1654004273684] [9851:7821178] CHIP: [TOO] Endpoint: 6 Cluster: 0x0000_050E Command 0x0000_0001
+          [1654004273684] [9851:7821178] CHIP: [TOO]   GetSetupPINResponse: {
+          [1654004273684] [9851:7821178] CHIP: [TOO]     setupPIN: 34567890
+          [1654004273684] [9851:7821178] CHIP: [TOO]    }
+      disabled: true
+
+    - label: "DUT sends Login command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool accountlogin login 11111 34567890 1 6 --timedInteractionTimeoutMs 1000
+
+          [1654004350009] [9951:7836487] CHIP: [DMG] Received Command Response Status for Endpoint=6 Cluster=0x0000_050E Command=0x0000_0002 Status=0x0
+      disabled: true
+
+    - label: "DUT sends Logout command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+           ./chip-tool accountlogin logout 11111 34567890 1 6 --timedInteractionTimeoutMs 1000
+
+          [1654004400892] [9988:7841997] CHIP: [DMG] Received Command Response Status for Endpoint=6 Cluster=0x0000_050E Command=0x0000_0003 Status=0x0
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_1_10.yaml b/src/app/tests/suites/certification/Test_TC_MC_1_10.yaml
index 7ce9159a902219..0570d9549a8f8c 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_1_10.yaml
@@ -19,7 +19,8 @@ name:
 config:
     nodeId: 0x12344321
     cluster: "Application Basic"
-    endpoint: 1
+    # Default endpoint is 3, since that's where tv-app has this cluster.
+    endpoint: 3
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
diff --git a/src/app/tests/suites/certification/Test_TC_MC_1_12.yaml b/src/app/tests/suites/certification/Test_TC_MC_1_12.yaml
index 30fbca15bd4796..67f89129746fd1 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_1_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_1_12.yaml
@@ -19,7 +19,8 @@ name:
 config:
     nodeId: 0x12344321
     cluster: "Account Login"
-    endpoint: 1
+    # Default endpoint is 3, since that's where tv-app has this cluster.
+    endpoint: 3
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
diff --git a/src/app/tests/suites/certification/Test_TC_MC_1_5.yaml b/src/app/tests/suites/certification/Test_TC_MC_1_5.yaml
index d97fb7d95fa7f7..02e9eea35c8909 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_1_5.yaml
@@ -34,11 +34,6 @@ tests:
       attribute: "ClusterRevision"
       response:
           value: 1
-
-    - label: "Read the global attribute constraints: ClusterRevision"
-      command: "readAttribute"
-      attribute: "ClusterRevision"
-      response:
           constraints:
               type: uint16
 
@@ -48,7 +43,7 @@ tests:
       command: "readAttribute"
       attribute: "AttributeList"
       response:
-          value: [0, 1, 65528, 65529, 65531, 65532, 65533]
+          value: [0, 1, 65528, 65529, 65531, 65533]
           constraints:
               type: list
 
diff --git a/src/app/tests/suites/certification/Test_TC_MC_1_7.yaml b/src/app/tests/suites/certification/Test_TC_MC_1_7.yaml
index f20a12dde38604..688fc9a3654e04 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_1_7.yaml
@@ -35,11 +35,6 @@ tests:
       attribute: "ClusterRevision"
       response:
           value: 1
-
-    - label: "Read the global attribute constraints: ClusterRevision"
-      command: "readAttribute"
-      attribute: "ClusterRevision"
-      response:
           constraints:
               type: uint16
 
diff --git a/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml
index 46d524d1aa1e06..8d7950b9a6a399 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml
@@ -28,5 +28,5 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Put the device into low power mode"
+    - label: "TH sends Sleep command to DUT"
       command: "Sleep"
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml
deleted file mode 100644
index 10d0cb590c549c..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: 21.3.1. [TC-MC-3.1] Navigation Keycode Verification
-
-config:
-    nodeId: 0x12344321
-    cluster: "Keypad Input"
-    endpoint: 1
-
-tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    #Issue 17510
-    - label: "Send Select"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x00
-
-    - label: "Send Up"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x01
-
-    - label: "Send Down"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x02
-
-    - label: "Send Left"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x03
-    - label: "Send Right"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x04
-
-    - label: "Send RightUp"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x05
-
-    - label: "Send RightDown"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x06
-
-    - label: "Send LeftUp"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x07
-
-    - label: "Send LeftDown"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x08
-
-    - label: "Send RootMenu"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x09
-
-    - label: "Send SetupMenu"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x0A
-
-    - label: "Send ContentsMenu"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x0B
-
-    - label: "Send FavoriteMenu"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x0C
-
-    - label: "Send Exit"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0x0D
-
-    - label: "Send Invalid"
-      PICS: PICS_SKIP_SAMPLE_APP
-      command: "SendKey"
-      arguments:
-          values:
-              - name: "keyCode"
-                value: 0xFF
-      response:
-          error: UNSUPPORTED_WRITE
-    # TODO: Add Step 10 (TH sends <Any Navigation> Keycode to DUT, when DUT in a processing state)
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_14.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_14.yaml
new file mode 100644
index 00000000000000..cfec077f6bc660
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_14.yaml
@@ -0,0 +1,63 @@
+# 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: 18.5.5. [TC-MC-3.14] Select Input Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends SelectInput command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+          If the DUT knows the Index value, then those can be sent as the argument.
+          Else User needs to execute the following command to know the index InputList
+              ./chip-tool mediainput read  input-list 1 1
+
+
+          ./chip-tool mediainput select-input 0 1 1
+
+          [1653155506860] [89108:1723790] CHIP: [DMG] InvokeRequestMessage =
+          [1653155506860] [89108:1723790] CHIP: [DMG] {
+          [1653155506860] [89108:1723790] CHIP: [DMG]         suppressResponse = false,
+          [1653155506860] [89108:1723790] CHIP: [DMG]         timedRequest = false,
+          [1653155506860] [89108:1723790] CHIP: [DMG]         InvokeRequests =
+          [1653155506860] [89108:1723790] CHIP: [DMG]         [
+          [1653155506860] [89108:1723790] CHIP: [DMG]                 CommandDataIB =
+          [1653155506860] [89108:1723790] CHIP: [DMG]                 {
+          [1653155506860] [89108:1723790] CHIP: [DMG]                         CommandPathIB =
+          [1653155506860] [89108:1723790] CHIP: [DMG]                         {
+          [1653155506860] [89108:1723790] CHIP: [DMG]                                 EndpointId = 0x1,
+          [1653155506860] [89108:1723790] CHIP: [DMG]                                 ClusterId = 0x507,
+          [1653155506860] [89108:1723790] CHIP: [DMG]                                 CommandId = 0x0,
+          [1653155506860] [89108:1723790] CHIP: [DMG]                         },
+          [1653155506860] [89108:1723790] CHIP: [DMG]
+          [1653155506860] [89108:1723790] CHIP: [DMG]                         CommandData =
+          [1653155506860] [89108:1723790] CHIP: [DMG]                         {
+          [1653155506860] [89108:1723790] CHIP: [DMG]                                 0x0 = 1,
+          [1653155506860] [89108:1723790] CHIP: [DMG]                         },
+          [1653155506860] [89108:1723790] CHIP: [DMG]                 },
+          [1653155506860] [89108:1723790] CHIP: [DMG]
+          [1653155506860] [89108:1723790] CHIP: [DMG]         ],
+          [1653155506860] [89108:1723790] CHIP: [DMG]
+          [1653155506860] [89108:1723790] CHIP: [DMG]         InteractionModelRevision = 1
+          [1653155506860] [89108:1723790] CHIP: [DMG] },
+
+
+          Enter the below command to read the current input.
+          ./chip-tool mediainput read currentinput 1 1
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_15.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_15.yaml
new file mode 100644
index 00000000000000..0938909a234313
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_15.yaml
@@ -0,0 +1,59 @@
+# 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: 18.5.6. [TC-MC-3.15] Show Input Status Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Show Input Status command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediainput show-input-status 1 1
+
+          [1653155393583] [37369:1721684] CHIP: [DMG] InvokeResponseMessage =
+          [1653155393583] [37369:1721684] CHIP: [DMG] {
+          [1653155393583] [37369:1721684] CHIP: [DMG] 	suppressResponse = false,
+          [1653155393583] [37369:1721684] CHIP: [DMG] 	InvokeResponseIBs =
+          [1653155393583] [37369:1721684] CHIP: [DMG] 	[
+          [1653155393583] [37369:1721684] CHIP: [DMG] 		InvokeResponseIB =
+          [1653155393583] [37369:1721684] CHIP: [DMG] 		{
+          [1653155393583] [37369:1721684] CHIP: [DMG] 			CommandStatusIB =
+          [1653155393583] [37369:1721684] CHIP: [DMG] 			{
+          [1653155393583] [37369:1721684] CHIP: [DMG] 				CommandPathIB =
+          [1653155393583] [37369:1721684] CHIP: [DMG] 				{
+          [1653155393583] [37369:1721684] CHIP: [DMG] 					EndpointId = 0x1,
+          [1653155393583] [37369:1721684] CHIP: [DMG] 					ClusterId = 0x507,
+          [1653155393583] [37369:1721684] CHIP: [DMG] 					CommandId = 0x1,
+          [1653155393583] [37369:1721684] CHIP: [DMG] 				},
+          [1653155393583] [37369:1721684] CHIP: [DMG]
+          [1653155393583] [37369:1721684] CHIP: [DMG] 				StatusIB =
+          [1653155393583] [37369:1721684] CHIP: [DMG] 				{
+          [1653155393583] [37369:1721684] CHIP: [DMG] 					status = 0x00 (SUCCESS),
+          [1653155393583] [37369:1721684] CHIP: [DMG] 				},
+          [1653155393583] [37369:1721684] CHIP: [DMG]
+          [1653155393583] [37369:1721684] CHIP: [DMG] 			},
+          [1653155393583] [37369:1721684] CHIP: [DMG]
+          [1653155393583] [37369:1721684] CHIP: [DMG] 		},
+          [1653155393583] [37369:1721684] CHIP: [DMG]
+          [1653155393583] [37369:1721684] CHIP: [DMG] 	],
+          [1653155393583] [37369:1721684] CHIP: [DMG]
+          [1653155393583] [37369:1721684] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155393583] [37369:1721684] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_16.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_16.yaml
new file mode 100644
index 00000000000000..1f6e6fa904cc6a
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_16.yaml
@@ -0,0 +1,54 @@
+# 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: 18.5.7. [TC-MC-3.16] Hide Input Status Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Hide Input Status command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediainput hide-input-status 1 1
+
+          [1653155441000] [89108:1722216] CHIP: [DMG] InvokeRequestMessage =
+          [1653155441000] [89108:1722216] CHIP: [DMG] {
+          [1653155441000] [89108:1722216] CHIP: [DMG] 	suppressResponse = false,
+          [1653155441000] [89108:1722216] CHIP: [DMG] 	timedRequest = false,
+          [1653155441000] [89108:1722216] CHIP: [DMG] 	InvokeRequests =
+          [1653155441000] [89108:1722216] CHIP: [DMG] 	[
+          [1653155441000] [89108:1722216] CHIP: [DMG] 		CommandDataIB =
+          [1653155441000] [89108:1722216] CHIP: [DMG] 		{
+          [1653155441000] [89108:1722216] CHIP: [DMG] 			CommandPathIB =
+          [1653155441000] [89108:1722216] CHIP: [DMG] 			{
+          [1653155441000] [89108:1722216] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155441000] [89108:1722216] CHIP: [DMG] 				ClusterId = 0x507,
+          [1653155441000] [89108:1722216] CHIP: [DMG] 				CommandId = 0x2,
+          [1653155441000] [89108:1722216] CHIP: [DMG] 			},
+          [1653155441000] [89108:1722216] CHIP: [DMG]
+          [1653155441000] [89108:1722216] CHIP: [DMG] 			CommandData =
+          [1653155441000] [89108:1722216] CHIP: [DMG] 			{
+          [1653155441000] [89108:1722216] CHIP: [DMG] 			},
+          [1653155441000] [89108:1722216] CHIP: [DMG] 		},
+          [1653155441000] [89108:1722216] CHIP: [DMG]
+          [1653155441000] [89108:1722216] CHIP: [DMG] 	],
+          [1653155441000] [89108:1722216] CHIP: [DMG]
+          [1653155441000] [89108:1722216] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155441000] [89108:1722216] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_17.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_17.yaml
new file mode 100644
index 00000000000000..36665300b8bf79
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_17.yaml
@@ -0,0 +1,56 @@
+# 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: 18.5.8. [TC-MC-3.17] Rename Input Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Rename Input command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediainput rename-input 1 'DVD' 1 1
+
+          [1653155471413] [89108:1722216] CHIP: [DMG] InvokeRequestMessage =
+          [1653155471413] [89108:1722216] CHIP: [DMG] {
+          [1653155471413] [89108:1722216] CHIP: [DMG] 	suppressResponse = false,
+          [1653155471413] [89108:1722216] CHIP: [DMG] 	timedRequest = false,
+          [1653155471413] [89108:1722216] CHIP: [DMG] 	InvokeRequests =
+          [1653155471413] [89108:1722216] CHIP: [DMG] 	[
+          [1653155471413] [89108:1722216] CHIP: [DMG] 		CommandDataIB =
+          [1653155471413] [89108:1722216] CHIP: [DMG] 		{
+          [1653155471413] [89108:1722216] CHIP: [DMG] 			CommandPathIB =
+          [1653155471413] [89108:1722216] CHIP: [DMG] 			{
+          [1653155471413] [89108:1722216] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155471413] [89108:1722216] CHIP: [DMG] 				ClusterId = 0x507,
+          [1653155471413] [89108:1722216] CHIP: [DMG] 				CommandId = 0x3,
+          [1653155471413] [89108:1722216] CHIP: [DMG] 			},
+          [1653155471413] [89108:1722216] CHIP: [DMG]
+          [1653155471413] [89108:1722216] CHIP: [DMG] 			CommandData =
+          [1653155471413] [89108:1722216] CHIP: [DMG] 			{
+          [1653155471413] [89108:1722216] CHIP: [DMG] 				0x0 = 1,
+          [1653155471413] [89108:1722216] CHIP: [DMG] 				0x1 = "DVD",
+          [1653155471413] [89108:1722216] CHIP: [DMG] 			},
+          [1653155471413] [89108:1722216] CHIP: [DMG] 		},
+          [1653155471413] [89108:1722216] CHIP: [DMG]
+          [1653155471413] [89108:1722216] CHIP: [DMG] 	],
+          [1653155471413] [89108:1722216] CHIP: [DMG]
+          [1653155471413] [89108:1722216] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155471413] [89108:1722216] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml
index c7ace0bd551a06..cfda8f5224bc35 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml
@@ -29,18 +29,18 @@ tests:
                 value: nodeId
 
     #Issue 17510
-    - label: "Send RootMenu"
+    - label: "TH sends CEC Settings Keys(0x0A) to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
           values:
               - name: "keyCode"
-                value: 0x09
+                value: 0x0A
 
-    - label: "Send SetupMenu"
+    - label: "TH sends CEC Home Keys(0x09) to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
           values:
               - name: "keyCode"
-                value: 0x0A
+                value: 0x09
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml
index c9bd6d3a02d8b1..e846576ac631c6 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml
@@ -29,7 +29,7 @@ tests:
                 value: nodeId
 
     #Issue 17510
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -37,7 +37,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -45,7 +45,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -53,7 +53,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -61,7 +61,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -69,7 +69,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -77,7 +77,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -85,7 +85,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -93,7 +93,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
@@ -101,7 +101,7 @@ tests:
               - name: "keyCode"
                 value: 0x09
 
-    - label: "Send RootMenu"
+    - label: "TH sends same KeyPad input codes to DUT"
       PICS: PICS_SKIP_SAMPLE_APP
       command: "SendKey"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_7_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_7_1.yaml
new file mode 100644
index 00000000000000..2d00e930a15d8e
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_7_1.yaml
@@ -0,0 +1,59 @@
+# 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: 18.4.4. [TC-MC-3.7.1] Launch Application Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends LaunchApp command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool applicationlauncher launch-app '{"catalogVendorId": 123, "applicationId": "exampleid"}' 1 1
+
+          [1653155295288] [89108:1719688] CHIP: [DMG] InvokeRequestMessage =
+          [1653155295288] [89108:1719688] CHIP: [DMG] {
+          [1653155295288] [89108:1719688] CHIP: [DMG] 	suppressResponse = false,
+          [1653155295288] [89108:1719688] CHIP: [DMG] 	timedRequest = false,
+          [1653155295288] [89108:1719688] CHIP: [DMG] 	InvokeRequests =
+          [1653155295289] [89108:1719688] CHIP: [DMG] 	[
+          [1653155295289] [89108:1719688] CHIP: [DMG] 		CommandDataIB =
+          [1653155295289] [89108:1719688] CHIP: [DMG] 		{
+          [1653155295289] [89108:1719688] CHIP: [DMG] 			CommandPathIB =
+          [1653155295289] [89108:1719688] CHIP: [DMG] 			{
+          [1653155295289] [89108:1719688] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155295289] [89108:1719688] CHIP: [DMG] 				ClusterId = 0x50c,
+          [1653155295289] [89108:1719688] CHIP: [DMG] 				CommandId = 0x0,
+          [1653155295289] [89108:1719688] CHIP: [DMG] 			},
+          [1653155295289] [89108:1719688] CHIP: [DMG]
+          [1653155295289] [89108:1719688] CHIP: [DMG] 			CommandData =
+          [1653155295289] [89108:1719688] CHIP: [DMG] 			{
+          [1653155295289] [89108:1719688] CHIP: [DMG] 				0x0 =
+          [1653155295289] [89108:1719688] CHIP: [DMG] 				{
+          [1653155295289] [89108:1719688] CHIP: [DMG] 					0x0 = 123,
+          [1653155295289] [89108:1719688] CHIP: [DMG] 					0x1 = "exampleid",
+          [1653155295289] [89108:1719688] CHIP: [DMG] 				},
+          [1653155295289] [89108:1719688] CHIP: [DMG] 			},
+          [1653155295289] [89108:1719688] CHIP: [DMG] 		},
+          [1653155295289] [89108:1719688] CHIP: [DMG]
+          [1653155295289] [89108:1719688] CHIP: [DMG] 	],
+          [1653155295289] [89108:1719688] CHIP: [DMG]
+          [1653155295289] [89108:1719688] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155295289] [89108:1719688] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_8_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_8_1.yaml
new file mode 100644
index 00000000000000..62f255462ef530
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_8_1.yaml
@@ -0,0 +1,59 @@
+# 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: 18.4.6. [TC-MC-3.8.1] Stop Application Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends StopApp command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool applicationlauncher stop-app '{"catalogVendorId": 123, "applicationId": "exampleid"}' 1 1
+
+          [1653155332047] [89108:1720505] CHIP: [DMG] InvokeRequestMessage =
+          [1653155332047] [89108:1720505] CHIP: [DMG] {
+          [1653155332047] [89108:1720505] CHIP: [DMG] 	suppressResponse = false,
+          [1653155332047] [89108:1720505] CHIP: [DMG] 	timedRequest = false,
+          [1653155332047] [89108:1720505] CHIP: [DMG] 	InvokeRequests =
+          [1653155332047] [89108:1720505] CHIP: [DMG] 	[
+          [1653155332047] [89108:1720505] CHIP: [DMG] 		CommandDataIB =
+          [1653155332047] [89108:1720505] CHIP: [DMG] 		{
+          [1653155332047] [89108:1720505] CHIP: [DMG] 			CommandPathIB =
+          [1653155332047] [89108:1720505] CHIP: [DMG] 			{
+          [1653155332047] [89108:1720505] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155332047] [89108:1720505] CHIP: [DMG] 				ClusterId = 0x50c,
+          [1653155332047] [89108:1720505] CHIP: [DMG] 				CommandId = 0x1,
+          [1653155332047] [89108:1720505] CHIP: [DMG] 			},
+          [1653155332047] [89108:1720505] CHIP: [DMG]
+          [1653155332047] [89108:1720505] CHIP: [DMG] 			CommandData =
+          [1653155332047] [89108:1720505] CHIP: [DMG] 			{
+          [1653155332047] [89108:1720505] CHIP: [DMG] 				0x0 =
+          [1653155332047] [89108:1720505] CHIP: [DMG] 				{
+          [1653155332047] [89108:1720505] CHIP: [DMG] 					0x0 = 123,
+          [1653155332047] [89108:1720505] CHIP: [DMG] 					0x1 = "exampleid",
+          [1653155332047] [89108:1720505] CHIP: [DMG] 				},
+          [1653155332047] [89108:1720505] CHIP: [DMG] 			},
+          [1653155332047] [89108:1720505] CHIP: [DMG] 		},
+          [1653155332047] [89108:1720505] CHIP: [DMG]
+          [1653155332047] [89108:1720505] CHIP: [DMG] 	],
+          [1653155332047] [89108:1720505] CHIP: [DMG]
+          [1653155332047] [89108:1720505] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155332047] [89108:1720505] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_9_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_9_1.yaml
new file mode 100644
index 00000000000000..b5d30a89a54a39
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_3_9_1.yaml
@@ -0,0 +1,59 @@
+# 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: 18.4.8. [TC-MC-3.9.1] Hide Application Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends HideApp command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool applicationlauncher hide-app '{"catalogVendorId": 123, "applicationId": "exampleid"}' 1 1
+
+          [1653155357497] [89108:1720718] CHIP: [DMG] InvokeRequestMessage =
+          [1653155357497] [89108:1720718] CHIP: [DMG] {
+          [1653155357497] [89108:1720718] CHIP: [DMG] 	suppressResponse = false,
+          [1653155357497] [89108:1720718] CHIP: [DMG] 	timedRequest = false,
+          [1653155357497] [89108:1720718] CHIP: [DMG] 	InvokeRequests =
+          [1653155357497] [89108:1720718] CHIP: [DMG] 	[
+          [1653155357497] [89108:1720718] CHIP: [DMG] 		CommandDataIB =
+          [1653155357497] [89108:1720718] CHIP: [DMG] 		{
+          [1653155357497] [89108:1720718] CHIP: [DMG] 			CommandPathIB =
+          [1653155357497] [89108:1720718] CHIP: [DMG] 			{
+          [1653155357497] [89108:1720718] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155357497] [89108:1720718] CHIP: [DMG] 				ClusterId = 0x50c,
+          [1653155357497] [89108:1720718] CHIP: [DMG] 				CommandId = 0x2,
+          [1653155357497] [89108:1720718] CHIP: [DMG] 			},
+          [1653155357497] [89108:1720718] CHIP: [DMG]
+          [1653155357497] [89108:1720718] CHIP: [DMG] 			CommandData =
+          [1653155357497] [89108:1720718] CHIP: [DMG] 			{
+          [1653155357497] [89108:1720718] CHIP: [DMG] 				0x0 =
+          [1653155357497] [89108:1720718] CHIP: [DMG] 				{
+          [1653155357497] [89108:1720718] CHIP: [DMG] 					0x0 = 123,
+          [1653155357497] [89108:1720718] CHIP: [DMG] 					0x1 = "exampleid",
+          [1653155357497] [89108:1720718] CHIP: [DMG] 				},
+          [1653155357497] [89108:1720718] CHIP: [DMG] 			},
+          [1653155357497] [89108:1720718] CHIP: [DMG] 		},
+          [1653155357497] [89108:1720718] CHIP: [DMG]
+          [1653155357497] [89108:1720718] CHIP: [DMG] 	],
+          [1653155357497] [89108:1720718] CHIP: [DMG]
+          [1653155357497] [89108:1720718] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155357497] [89108:1720718] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_5_4.yaml b/src/app/tests/suites/certification/Test_TC_MC_5_4.yaml
new file mode 100644
index 00000000000000..b5157a60f07fbe
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_5_4.yaml
@@ -0,0 +1,55 @@
+# 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: 18.7.4. [TC-MC-5.4] Change Channel Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Change Channel command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool channel change-channel 33 1 1
+
+          [1653155583606] [89108:1725354] CHIP: [DMG] InvokeRequestMessage =
+          [1653155583606] [89108:1725354] CHIP: [DMG] {
+          [1653155583606] [89108:1725354] CHIP: [DMG]         suppressResponse = false,
+          [1653155583606] [89108:1725354] CHIP: [DMG]         timedRequest = false,
+          [1653155583606] [89108:1725354] CHIP: [DMG]         InvokeRequests =
+          [1653155583606] [89108:1725354] CHIP: [DMG]         [
+          [1653155583606] [89108:1725354] CHIP: [DMG]                 CommandDataIB =
+          [1653155583606] [89108:1725354] CHIP: [DMG]                 {
+          [1653155583606] [89108:1725354] CHIP: [DMG]                         CommandPathIB =
+          [1653155583606] [89108:1725354] CHIP: [DMG]                         {
+          [1653155583606] [89108:1725354] CHIP: [DMG]                                 EndpointId = 0x1,
+          [1653155583606] [89108:1725354] CHIP: [DMG]                                 ClusterId = 0x504,
+          [1653155583606] [89108:1725354] CHIP: [DMG]                                 CommandId = 0x0,
+          [1653155583606] [89108:1725354] CHIP: [DMG]                         },
+          [1653155583606] [89108:1725354] CHIP: [DMG]
+          [1653155583606] [89108:1725354] CHIP: [DMG]                         CommandData =
+          [1653155583606] [89108:1725354] CHIP: [DMG]                         {
+          [1653155583606] [89108:1725354] CHIP: [DMG]                                 0x0 = "33",
+          [1653155583606] [89108:1725354] CHIP: [DMG]                         },
+          [1653155583606] [89108:1725354] CHIP: [DMG]                 },
+          [1653155583606] [89108:1725354] CHIP: [DMG]
+          [1653155583606] [89108:1725354] CHIP: [DMG]         ],
+          [1653155583606] [89108:1725354] CHIP: [DMG]
+          [1653155583606] [89108:1725354] CHIP: [DMG]         InteractionModelRevision = 1
+          [1653155583606] [89108:1725354] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_5_5.yaml b/src/app/tests/suites/certification/Test_TC_MC_5_5.yaml
new file mode 100644
index 00000000000000..287737dfc0e402
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_5_5.yaml
@@ -0,0 +1,56 @@
+# 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: 18.7.5. [TC-MC-5.5] Change Channel By Number Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Change Channel by Number command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool channel change-channel-by-number 33 22 1 1
+
+          [1653155619571] [89108:1725828] CHIP: [DMG] InvokeRequestMessage =
+          [1653155619571] [89108:1725828] CHIP: [DMG] {
+          [1653155619571] [89108:1725828] CHIP: [DMG] 	suppressResponse = false,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 	timedRequest = false,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 	InvokeRequests =
+          [1653155619571] [89108:1725828] CHIP: [DMG] 	[
+          [1653155619571] [89108:1725828] CHIP: [DMG] 		CommandDataIB =
+          [1653155619571] [89108:1725828] CHIP: [DMG] 		{
+          [1653155619571] [89108:1725828] CHIP: [DMG] 			CommandPathIB =
+          [1653155619571] [89108:1725828] CHIP: [DMG] 			{
+          [1653155619571] [89108:1725828] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 				ClusterId = 0x504,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 				CommandId = 0x2,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 			},
+          [1653155619571] [89108:1725828] CHIP: [DMG]
+          [1653155619571] [89108:1725828] CHIP: [DMG] 			CommandData =
+          [1653155619571] [89108:1725828] CHIP: [DMG] 			{
+          [1653155619571] [89108:1725828] CHIP: [DMG] 				0x0 = 33,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 				0x1 = 22,
+          [1653155619571] [89108:1725828] CHIP: [DMG] 			},
+          [1653155619571] [89108:1725828] CHIP: [DMG] 		},
+          [1653155619571] [89108:1725828] CHIP: [DMG]
+          [1653155619571] [89108:1725828] CHIP: [DMG] 	],
+          [1653155619571] [89108:1725828] CHIP: [DMG]
+          [1653155619571] [89108:1725828] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155619571] [89108:1725828] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_5_6.yaml b/src/app/tests/suites/certification/Test_TC_MC_5_6.yaml
new file mode 100644
index 00000000000000..22f4bc7b2e4016
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_5_6.yaml
@@ -0,0 +1,55 @@
+# 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: 18.7.6. [TC-MC-5.6] Skip Channel Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Skip Channel command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool channel skip-channel 33 1 1
+
+          [1653155699325] [89108:1726874] CHIP: [DMG] InvokeRequestMessage =
+          [1653155699325] [89108:1726874] CHIP: [DMG] {
+          [1653155699325] [89108:1726874] CHIP: [DMG] 	suppressResponse = false,
+          [1653155699325] [89108:1726874] CHIP: [DMG] 	timedRequest = false,
+          [1653155699325] [89108:1726874] CHIP: [DMG] 	InvokeRequests =
+          [1653155699325] [89108:1726874] CHIP: [DMG] 	[
+          [1653155699325] [89108:1726874] CHIP: [DMG] 		CommandDataIB =
+          [1653155699325] [89108:1726874] CHIP: [DMG] 		{
+          [1653155699325] [89108:1726874] CHIP: [DMG] 			CommandPathIB =
+          [1653155699325] [89108:1726874] CHIP: [DMG] 			{
+          [1653155699325] [89108:1726874] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155699325] [89108:1726874] CHIP: [DMG] 				ClusterId = 0x504,
+          [1653155699325] [89108:1726874] CHIP: [DMG] 				CommandId = 0x3,
+          [1653155699325] [89108:1726874] CHIP: [DMG] 			},
+          [1653155699325] [89108:1726874] CHIP: [DMG]
+          [1653155699325] [89108:1726874] CHIP: [DMG] 			CommandData =
+          [1653155699325] [89108:1726874] CHIP: [DMG] 			{
+          [1653155699325] [89108:1726874] CHIP: [DMG] 				0x0 = 33,
+          [1653155699325] [89108:1726874] CHIP: [DMG] 			},
+          [1653155699325] [89108:1726874] CHIP: [DMG] 		},
+          [1653155699325] [89108:1726874] CHIP: [DMG]
+          [1653155699325] [89108:1726874] CHIP: [DMG] 	],
+          [1653155699325] [89108:1726874] CHIP: [DMG]
+          [1653155699325] [89108:1726874] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155699325] [89108:1726874] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_6_5.yaml b/src/app/tests/suites/certification/Test_TC_MC_6_5.yaml
new file mode 100644
index 00000000000000..bf6140d09e2abd
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_6_5.yaml
@@ -0,0 +1,118 @@
+# 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: 18.8.5. [TC-MC-6.5] Mandatory Media Playback Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Play command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback play 1 1
+
+          [1653155763765] [89108:1728729] CHIP: [DMG] InvokeRequestMessage =
+          [1653155763765] [89108:1728729] CHIP: [DMG] {
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	suppressResponse = false,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	timedRequest = false,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	InvokeRequests =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	[
+          [1653155763765] [89108:1728729] CHIP: [DMG] 		CommandDataIB =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 		{
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			CommandPathIB =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			{
+          [1653155763765] [89108:1728729] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 				CommandId = 0x0,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			},
+          [1653155763765] [89108:1728729] CHIP: [DMG]
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			CommandData =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			{
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			},
+          [1653155763765] [89108:1728729] CHIP: [DMG] 		},
+          [1653155763765] [89108:1728729] CHIP: [DMG]
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	],
+          [1653155763765] [89108:1728729] CHIP: [DMG]
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155763765] [89108:1728729] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Pause command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback pause 1 1
+
+          [1653155793657] [89108:1728972] CHIP: [DMG] InvokeRequestMessage =
+          [1653155793657] [89108:1728972] CHIP: [DMG] {
+          [1653155793657] [89108:1728972] CHIP: [DMG] 	suppressResponse = false,
+          [1653155793657] [89108:1728972] CHIP: [DMG] 	timedRequest = false,
+          [1653155793657] [89108:1728972] CHIP: [DMG] 	InvokeRequests =
+          [1653155793657] [89108:1728972] CHIP: [DMG] 	[
+          [1653155793657] [89108:1728972] CHIP: [DMG] 		CommandDataIB =
+          [1653155793657] [89108:1728972] CHIP: [DMG] 		{
+          [1653155793657] [89108:1728972] CHIP: [DMG] 			CommandPathIB =
+          [1653155793657] [89108:1728972] CHIP: [DMG] 			{
+          [1653155793657] [89108:1728972] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155793657] [89108:1728972] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155793657] [89108:1728972] CHIP: [DMG] 				CommandId = 0x1,
+          [1653155793657] [89108:1728972] CHIP: [DMG] 			},
+          [1653155793657] [89108:1728972] CHIP: [DMG]
+          [1653155793657] [89108:1728972] CHIP: [DMG] 			CommandData =
+          [1653155793657] [89108:1728972] CHIP: [DMG] 			{
+          [1653155793657] [89108:1728972] CHIP: [DMG] 			},
+          [1653155793657] [89108:1728972] CHIP: [DMG] 		},
+          [1653155793657] [89108:1728972] CHIP: [DMG]
+          [1653155793657] [89108:1728972] CHIP: [DMG] 	],
+          [1653155793657] [89108:1728972] CHIP: [DMG]
+          [1653155793657] [89108:1728972] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155793657] [89108:1728972] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Stop command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback stop-playback 1 1
+
+          [1653155821639] [89108:1730227] CHIP: [DMG] InvokeRequestMessage =
+          [1653155821639] [89108:1730227] CHIP: [DMG] {
+          [1653155821639] [89108:1730227] CHIP: [DMG] 	suppressResponse = false,
+          [1653155821639] [89108:1730227] CHIP: [DMG] 	timedRequest = false,
+          [1653155821639] [89108:1730227] CHIP: [DMG] 	InvokeRequests =
+          [1653155821639] [89108:1730227] CHIP: [DMG] 	[
+          [1653155821639] [89108:1730227] CHIP: [DMG] 		CommandDataIB =
+          [1653155821639] [89108:1730227] CHIP: [DMG] 		{
+          [1653155821639] [89108:1730227] CHIP: [DMG] 			CommandPathIB =
+          [1653155821639] [89108:1730227] CHIP: [DMG] 			{
+          [1653155821639] [89108:1730227] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155821639] [89108:1730227] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155821639] [89108:1730227] CHIP: [DMG] 				CommandId = 0x2,
+          [1653155821639] [89108:1730227] CHIP: [DMG] 			},
+          [1653155821639] [89108:1730227] CHIP: [DMG]
+          [1653155821639] [89108:1730227] CHIP: [DMG] 			CommandData =
+          [1653155821639] [89108:1730227] CHIP: [DMG] 			{
+          [1653155821639] [89108:1730227] CHIP: [DMG] 			},
+          [1653155821639] [89108:1730227] CHIP: [DMG] 		},
+          [1653155821639] [89108:1730227] CHIP: [DMG]
+          [1653155821639] [89108:1730227] CHIP: [DMG] 	],
+          [1653155821639] [89108:1730227] CHIP: [DMG]
+          [1653155821639] [89108:1730227] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155821639] [89108:1730227] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_6_7.yaml b/src/app/tests/suites/certification/Test_TC_MC_6_7.yaml
new file mode 100644
index 00000000000000..91a2976c11781e
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_6_7.yaml
@@ -0,0 +1,216 @@
+# 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: 18.8.6. [TC-MC-6.7] Optional Media Playback Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Play command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback play 1 1
+
+          [1653155763765] [89108:1728729] CHIP: [DMG] InvokeRequestMessage =
+          [1653155763765] [89108:1728729] CHIP: [DMG] {
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	suppressResponse = false,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	timedRequest = false,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	InvokeRequests =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	[
+          [1653155763765] [89108:1728729] CHIP: [DMG] 		CommandDataIB =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 		{
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			CommandPathIB =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			{
+          [1653155763765] [89108:1728729] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 				CommandId = 0x0,
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			},
+          [1653155763765] [89108:1728729] CHIP: [DMG]
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			CommandData =
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			{
+          [1653155763765] [89108:1728729] CHIP: [DMG] 			},
+          [1653155763765] [89108:1728729] CHIP: [DMG] 		},
+          [1653155763765] [89108:1728729] CHIP: [DMG]
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	],
+          [1653155763765] [89108:1728729] CHIP: [DMG]
+          [1653155763765] [89108:1728729] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155763765] [89108:1728729] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Start Over command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback start-over 1 1
+
+          [1653155863805] [89108:1730610] CHIP: [DMG] InvokeRequestMessage =
+          [1653155863805] [89108:1730610] CHIP: [DMG] {
+          [1653155863805] [89108:1730610] CHIP: [DMG] 	suppressResponse = false,
+          [1653155863805] [89108:1730610] CHIP: [DMG] 	timedRequest = false,
+          [1653155863805] [89108:1730610] CHIP: [DMG] 	InvokeRequests =
+          [1653155863805] [89108:1730610] CHIP: [DMG] 	[
+          [1653155863805] [89108:1730610] CHIP: [DMG] 		CommandDataIB =
+          [1653155863805] [89108:1730610] CHIP: [DMG] 		{
+          [1653155863805] [89108:1730610] CHIP: [DMG] 			CommandPathIB =
+          [1653155863805] [89108:1730610] CHIP: [DMG] 			{
+          [1653155863805] [89108:1730610] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155863805] [89108:1730610] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155863805] [89108:1730610] CHIP: [DMG] 				CommandId = 0x3,
+          [1653155863805] [89108:1730610] CHIP: [DMG] 			},
+          [1653155863805] [89108:1730610] CHIP: [DMG]
+          [1653155863805] [89108:1730610] CHIP: [DMG] 			CommandData =
+          [1653155863805] [89108:1730610] CHIP: [DMG] 			{
+          [1653155863805] [89108:1730610] CHIP: [DMG] 			},
+          [1653155863805] [89108:1730610] CHIP: [DMG] 		},
+          [1653155863805] [89108:1730610] CHIP: [DMG]
+          [1653155863805] [89108:1730610] CHIP: [DMG] 	],
+          [1653155863805] [89108:1730610] CHIP: [DMG]
+          [1653155863805] [89108:1730610] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155863805] [89108:1730610] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Next command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback next 1 1
+
+          [1653155883955] [89108:1731475] CHIP: [DMG] InvokeRequestMessage =
+          [1653155883955] [89108:1731475] CHIP: [DMG] {
+          [1653155883955] [89108:1731475] CHIP: [DMG] 	suppressResponse = false,
+          [1653155883955] [89108:1731475] CHIP: [DMG] 	timedRequest = false,
+          [1653155883955] [89108:1731475] CHIP: [DMG] 	InvokeRequests =
+          [1653155883955] [89108:1731475] CHIP: [DMG] 	[
+          [1653155883955] [89108:1731475] CHIP: [DMG] 		CommandDataIB =
+          [1653155883955] [89108:1731475] CHIP: [DMG] 		{
+          [1653155883955] [89108:1731475] CHIP: [DMG] 			CommandPathIB =
+          [1653155883955] [89108:1731475] CHIP: [DMG] 			{
+          [1653155883955] [89108:1731475] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155883956] [89108:1731475] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155883956] [89108:1731475] CHIP: [DMG] 				CommandId = 0x5,
+          [1653155883956] [89108:1731475] CHIP: [DMG] 			},
+          [1653155883956] [89108:1731475] CHIP: [DMG]
+          [1653155883956] [89108:1731475] CHIP: [DMG] 			CommandData =
+          [1653155883956] [89108:1731475] CHIP: [DMG] 			{
+          [1653155883956] [89108:1731475] CHIP: [DMG] 			},
+          [1653155883956] [89108:1731475] CHIP: [DMG] 		},
+          [1653155883956] [89108:1731475] CHIP: [DMG]
+          [1653155883956] [89108:1731475] CHIP: [DMG] 	],
+          [1653155883956] [89108:1731475] CHIP: [DMG]
+          [1653155883956] [89108:1731475] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155883956] [89108:1731475] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Previous command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback previous 1 1
+
+          [1653155908464] [89108:1731410] CHIP: [DMG] InvokeRequestMessage =
+          [1653155908464] [89108:1731410] CHIP: [DMG] {
+          [1653155908464] [89108:1731410] CHIP: [DMG] 	suppressResponse = false,
+          [1653155908464] [89108:1731410] CHIP: [DMG] 	timedRequest = false,
+          [1653155908464] [89108:1731410] CHIP: [DMG] 	InvokeRequests =
+          [1653155908464] [89108:1731410] CHIP: [DMG] 	[
+          [1653155908464] [89108:1731410] CHIP: [DMG] 		CommandDataIB =
+          [1653155908464] [89108:1731410] CHIP: [DMG] 		{
+          [1653155908464] [89108:1731410] CHIP: [DMG] 			CommandPathIB =
+          [1653155908464] [89108:1731410] CHIP: [DMG] 			{
+          [1653155908464] [89108:1731410] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155908464] [89108:1731410] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155908464] [89108:1731410] CHIP: [DMG] 				CommandId = 0x4,
+          [1653155908464] [89108:1731410] CHIP: [DMG] 			},
+          [1653155908464] [89108:1731410] CHIP: [DMG]
+          [1653155908464] [89108:1731410] CHIP: [DMG] 			CommandData =
+          [1653155908464] [89108:1731410] CHIP: [DMG] 			{
+          [1653155908464] [89108:1731410] CHIP: [DMG] 			},
+          [1653155908464] [89108:1731410] CHIP: [DMG] 		},
+          [1653155908464] [89108:1731410] CHIP: [DMG]
+          [1653155908464] [89108:1731410] CHIP: [DMG] 	],
+          [1653155908464] [89108:1731410] CHIP: [DMG]
+          [1653155908464] [89108:1731410] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155908464] [89108:1731410] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Skip Forward command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback skip-forward 2000 1 1
+
+          [1653155942341] [89108:1732693] CHIP: [DMG] InvokeRequestMessage =
+          [1653155942341] [89108:1732693] CHIP: [DMG] {
+          [1653155942341] [89108:1732693] CHIP: [DMG] 	suppressResponse = false,
+          [1653155942341] [89108:1732693] CHIP: [DMG] 	timedRequest = false,
+          [1653155942341] [89108:1732693] CHIP: [DMG] 	InvokeRequests =
+          [1653155942341] [89108:1732693] CHIP: [DMG] 	[
+          [1653155942341] [89108:1732693] CHIP: [DMG] 		CommandDataIB =
+          [1653155942341] [89108:1732693] CHIP: [DMG] 		{
+          [1653155942341] [89108:1732693] CHIP: [DMG] 			CommandPathIB =
+          [1653155942341] [89108:1732693] CHIP: [DMG] 			{
+          [1653155942341] [89108:1732693] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155942341] [89108:1732693] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155942341] [89108:1732693] CHIP: [DMG] 				CommandId = 0x8,
+          [1653155942342] [89108:1732693] CHIP: [DMG] 			},
+          [1653155942342] [89108:1732693] CHIP: [DMG]
+          [1653155942342] [89108:1732693] CHIP: [DMG] 			CommandData =
+          [1653155942342] [89108:1732693] CHIP: [DMG] 			{
+          [1653155942342] [89108:1732693] CHIP: [DMG] 				0x0 = 2000,
+          [1653155942342] [89108:1732693] CHIP: [DMG] 			},
+          [1653155942342] [89108:1732693] CHIP: [DMG] 		},
+          [1653155942342] [89108:1732693] CHIP: [DMG]
+          [1653155942342] [89108:1732693] CHIP: [DMG] 	],
+          [1653155942342] [89108:1732693] CHIP: [DMG]
+          [1653155942342] [89108:1732693] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155942342] [89108:1732693] CHIP: [DMG] },
+      disabled: true
+
+    - label: "DUT sends Skip Backward command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool mediaplayback skip-backward 2000 1 1
+
+          [1653155967344] [89108:1733002] CHIP: [DMG] InvokeRequestMessage =
+          [1653155967344] [89108:1733002] CHIP: [DMG] {
+          [1653155967344] [89108:1733002] CHIP: [DMG] 	suppressResponse = false,
+          [1653155967344] [89108:1733002] CHIP: [DMG] 	timedRequest = false,
+          [1653155967344] [89108:1733002] CHIP: [DMG] 	InvokeRequests =
+          [1653155967344] [89108:1733002] CHIP: [DMG] 	[
+          [1653155967344] [89108:1733002] CHIP: [DMG] 		CommandDataIB =
+          [1653155967344] [89108:1733002] CHIP: [DMG] 		{
+          [1653155967344] [89108:1733002] CHIP: [DMG] 			CommandPathIB =
+          [1653155967344] [89108:1733002] CHIP: [DMG] 			{
+          [1653155967344] [89108:1733002] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653155967344] [89108:1733002] CHIP: [DMG] 				ClusterId = 0x506,
+          [1653155967344] [89108:1733002] CHIP: [DMG] 				CommandId = 0x9,
+          [1653155967344] [89108:1733002] CHIP: [DMG] 			},
+          [1653155967344] [89108:1733002] CHIP: [DMG]
+          [1653155967344] [89108:1733002] CHIP: [DMG] 			CommandData =
+          [1653155967344] [89108:1733002] CHIP: [DMG] 			{
+          [1653155967344] [89108:1733002] CHIP: [DMG] 				0x0 = 2000,
+          [1653155967344] [89108:1733002] CHIP: [DMG] 			},
+          [1653155967344] [89108:1733002] CHIP: [DMG] 		},
+          [1653155967344] [89108:1733002] CHIP: [DMG]
+          [1653155967344] [89108:1733002] CHIP: [DMG] 	],
+          [1653155967344] [89108:1733002] CHIP: [DMG]
+          [1653155967344] [89108:1733002] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653155967344] [89108:1733002] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_7_3.yaml b/src/app/tests/suites/certification/Test_TC_MC_7_3.yaml
new file mode 100644
index 00000000000000..4f80646d456bdb
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_7_3.yaml
@@ -0,0 +1,55 @@
+# 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: 18.9.3. [TC-MC-7.3] Select Output Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Select Output command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool audiooutput select-output 1 1 1
+
+          [1653156016245] [89108:1733165] CHIP: [DMG] InvokeRequestMessage =
+          [1653156016245] [89108:1733165] CHIP: [DMG] {
+          [1653156016245] [89108:1733165] CHIP: [DMG] 	suppressResponse = false,
+          [1653156016245] [89108:1733165] CHIP: [DMG] 	timedRequest = false,
+          [1653156016245] [89108:1733165] CHIP: [DMG] 	InvokeRequests =
+          [1653156016245] [89108:1733165] CHIP: [DMG] 	[
+          [1653156016245] [89108:1733165] CHIP: [DMG] 		CommandDataIB =
+          [1653156016245] [89108:1733165] CHIP: [DMG] 		{
+          [1653156016245] [89108:1733165] CHIP: [DMG] 			CommandPathIB =
+          [1653156016245] [89108:1733165] CHIP: [DMG] 			{
+          [1653156016245] [89108:1733165] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653156016245] [89108:1733165] CHIP: [DMG] 				ClusterId = 0x50b,
+          [1653156016245] [89108:1733165] CHIP: [DMG] 				CommandId = 0x0,
+          [1653156016245] [89108:1733165] CHIP: [DMG] 			},
+          [1653156016245] [89108:1733165] CHIP: [DMG]
+          [1653156016245] [89108:1733165] CHIP: [DMG] 			CommandData =
+          [1653156016245] [89108:1733165] CHIP: [DMG] 			{
+          [1653156016245] [89108:1733165] CHIP: [DMG] 				0x0 = 1,
+          [1653156016245] [89108:1733165] CHIP: [DMG] 			},
+          [1653156016245] [89108:1733165] CHIP: [DMG] 		},
+          [1653156016245] [89108:1733165] CHIP: [DMG]
+          [1653156016245] [89108:1733165] CHIP: [DMG] 	],
+          [1653156016245] [89108:1733165] CHIP: [DMG]
+          [1653156016245] [89108:1733165] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653156016245] [89108:1733165] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_7_4.yaml b/src/app/tests/suites/certification/Test_TC_MC_7_4.yaml
new file mode 100644
index 00000000000000..6197b702151516
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_MC_7_4.yaml
@@ -0,0 +1,56 @@
+# 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: 18.9.4. [TC-MC-7.4] Rename Output Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends Rename Output command to TH"
+      verification: |
+          The following chip-tool command simulates the interaction of the DUT and the log below shows the resulting log on the TH.
+
+          ./chip-tool audiooutput rename-output 1 'Kitchen Speakers' 1 1
+
+          [1653156045562] [89108:1734332] CHIP: [DMG] InvokeRequestMessage =
+          [1653156045562] [89108:1734332] CHIP: [DMG] {
+          [1653156045562] [89108:1734332] CHIP: [DMG] 	suppressResponse = false,
+          [1653156045562] [89108:1734332] CHIP: [DMG] 	timedRequest = false,
+          [1653156045562] [89108:1734332] CHIP: [DMG] 	InvokeRequests =
+          [1653156045562] [89108:1734332] CHIP: [DMG] 	[
+          [1653156045562] [89108:1734332] CHIP: [DMG] 		CommandDataIB =
+          [1653156045562] [89108:1734332] CHIP: [DMG] 		{
+          [1653156045562] [89108:1734332] CHIP: [DMG] 			CommandPathIB =
+          [1653156045562] [89108:1734332] CHIP: [DMG] 			{
+          [1653156045562] [89108:1734332] CHIP: [DMG] 				EndpointId = 0x1,
+          [1653156045562] [89108:1734332] CHIP: [DMG] 				ClusterId = 0x50b,
+          [1653156045562] [89108:1734332] CHIP: [DMG] 				CommandId = 0x1,
+          [1653156045562] [89108:1734332] CHIP: [DMG] 			},
+          [1653156045562] [89108:1734332] CHIP: [DMG]
+          [1653156045562] [89108:1734332] CHIP: [DMG] 			CommandData =
+          [1653156045562] [89108:1734332] CHIP: [DMG] 			{
+          [1653156045562] [89108:1734332] CHIP: [DMG] 				0x0 = 1,
+          [1653156045562] [89108:1734332] CHIP: [DMG] 				0x1 = "Kitchen Speakers",
+          [1653156045562] [89108:1734332] CHIP: [DMG] 			},
+          [1653156045562] [89108:1734332] CHIP: [DMG] 		},
+          [1653156045562] [89108:1734332] CHIP: [DMG]
+          [1653156045562] [89108:1734332] CHIP: [DMG] 	],
+          [1653156045562] [89108:1734332] CHIP: [DMG]
+          [1653156045562] [89108:1734332] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1653156045562] [89108:1734332] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml
index 706a8994f5a800..c01cd9948c8b9c 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml
@@ -18,6 +18,12 @@ config:
     nodeId: 0x12344321
     cluster: "Target Navigator"
     endpoint: 1
+    targetvalue1:
+        type: INT8U
+        defaultValue: 1
+    targetvalue2:
+        type: INT8U
+        defaultValue: 2
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -28,9 +34,6 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Precondition: one or more navigation targets available"
-      disabled: true
-
     - label: "Reads the CurrentTarget attribute"
       command: "readAttribute"
       attribute: "CurrentTarget"
@@ -38,65 +41,59 @@ tests:
           constraints:
               type: uint8
 
-    - label: "Reads the TargetList attribute"
-      command: "readAttribute"
-      attribute: "TargetList"
-      response:
-          constraints:
-              type: list
-
     #Below steps disabled due to issue- #13029
     #Disabled due to issue - #13087
     - label: "Reads the TargetList attribute"
-      disabled: true
       command: "readAttribute"
-      attribute: "target navigator list"
+      attribute: "TargetList"
       response:
-          saveAs: TargetListValue
+          saveAs: TargetListValues
           constraints:
               type: list
 
+    #Issue 18205
     - label: "Sends a NavigateTarget command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "NavigateTarget"
       arguments:
           values:
               - name: "Target"
-                value: TargetListValue
-                saveAs: targetValue
-              - name: "Data"
-                value: TargetListvalue
+                value: targetvalue1
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Reads the CurrentTarget attribute"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
-      attribute: "current navigator target"
+      attribute: "CurrentTarget"
       response:
-          value: targetValue
+          value: targetvalue1
 
     - label: "Reads the TargetList attribute"
-      disabled: true
       command: "readAttribute"
-      attribute: "target navigator list"
+      attribute: "TargetList"
       response:
-          saveAs: TargetListvalue
           constraints:
               type: list
 
+    #Issue 18205
     - label: "Sends a NavigateTarget command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "NavigateTarget"
       arguments:
           values:
               - name: "Target"
-                value: TargetListvalue
-                saveAs: targetvalue
-              - name: "Data"
-                value: TargetListvalue
+                value: targetvalue2
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Reads the CurrentTarget attribute"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
-      attribute: "current navigator target"
+      attribute: "CurrentTarget"
       response:
-          value: targetvalue
+          value: targetvalue2
diff --git a/src/app/tests/suites/certification/Test_TC_MC_8_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_8_2.yaml
deleted file mode 100644
index e555444b0be7f4..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_MC_8_2.yaml
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 18.10.2. [TC-MC-8.2] Navigate Target Verification (DUT as Client)
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "DUT reads the CurrentTarget attribute from the TH"
-      verification: |
-
-      disabled: true
-
-    - label: "DUT reads the TargetList attribute from the TH"
-      verification: |
-          ./chip-tool targetnavigator read target-navigator-list 1 0
-
-          CHIP:IN: CASE Session established. Setting up the secure channel.
-          [1635844031.242605][3216:3216] CHIP:IN: Marking old secure session for device 0x000000000001B669 as expired
-          [1635844031.242643][3216:3216] CHIP:IN: New secure session created for device 0x000000000001B669, key 4!!
-          [1635844031.242715][3216:3216] CHIP:IN: CASE secure channel is available now.
-          [1635844031.242744][3216:3216] CHIP:IN: CASE Server enabling CASE session setups
-          [1635844031.243571][3216:3216] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:0 on exchange 37125r
-          [1635844031.243615][3216:3216] CHIP:EM: Handling via exchange: 37125r, Delegate: 0x0xaaaae48831b8
-          [1635844031.243660][3216:3216] CHIP:IM: Received Read request
-          [1635844031.243691][3216:3216] CHIP:DMG: IM RH moving to [Initialized]
-          [1635844031.243728][3216:3216] CHIP:DMG: ReadRequest =
-          [1635844031.243758][3216:3216] CHIP:DMG: {
-          [1635844031.243785][3216:3216] CHIP:DMG:         AttributePathList =
-          [1635844031.243817][3216:3216] CHIP:DMG:         [
-          [1635844031.243847][3216:3216] CHIP:DMG:                 AttributePath =
-          [1635844031.243879][3216:3216] CHIP:DMG:                 {
-          [1635844031.243918][3216:3216] CHIP:DMG:                         NodeId = 0x1,
-          [1635844031.243957][3216:3216] CHIP:DMG:                         EndpointId = 0x0,
-          [1635844031.244000][3216:3216] CHIP:DMG:                         ClusterId = 0x505,
-          [1635844031.244041][3216:3216] CHIP:DMG:                         FieldTag = 0x0000_0000,
-          [1635844031.244078][3216:3216] CHIP:DMG:                 }
-          [1635844031.244117][3216:3216] CHIP:DMG:
-          [1635844031.244151][3216:3216] CHIP:DMG:         ],
-          [1635844031.244185][3216:3216] CHIP:DMG:
-          [1635844031.244214][3216:3216] CHIP:DMG: }
-          [1635844031.244275][3216:3216] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1635844031.244419][3216:3216] CHIP:DMG: <RE:Run> Cluster 505, Field 0 is dirty
-          [1635844031.244452][3216:3216] CHIP:DMG: Reading attribute: Cluster=0x0000_0505 Endpoint=0 AttributeId=0x0000_0000
-          [1635844031.244495][3216:3216] CHIP:DMG: <RE> Dumping report data...
-          [1635844031.244526][3216:3216] CHIP:DMG: ReportData =
-          [1635844031.244555][3216:3216] CHIP:DMG: {
-          [1635844031.244581][3216:3216] CHIP:DMG:         AttributeDataList =
-          [1635844031.244612][3216:3216] CHIP:DMG:         [
-          [1635844031.244642][3216:3216] CHIP:DMG:                 AttributeDataElement =
-          [1635844031.244678][3216:3216] CHIP:DMG:                 {
-          [1635844031.244710][3216:3216] CHIP:DMG:                         AttributePath =
-          [1635844031.244746][3216:3216] CHIP:DMG:                         {
-          [1635844031.244788][3216:3216] CHIP:DMG:                                 NodeId = 0x1,
-          [1635844031.244829][3216:3216] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635844031.244870][3216:3216] CHIP:DMG:                                 ClusterId = 0x505,
-          [1635844031.244913][3216:3216] CHIP:DMG:                                 FieldTag = 0x0000_0000,
-          [1635844031.244951][3216:3216] CHIP:DMG:                         }
-          [1635844031.244992][3216:3216] CHIP:DMG:
-          [1635844031.245030][3216:3216] CHIP:DMG:                         Status = 0x86,
-          [1635844031.245069][3216:3216] CHIP:DMG:                 },
-          [1635844031.245106][3216:3216] CHIP:DMG:
-          [1635844031.245135][3216:3216] CHIP:DMG:         ],
-          [1635844031.245169][3216:3216] CHIP:DMG:
-          [1635844031.245197][3216:3216] CHIP:DMG: }
-          [1635844031.245222][3216:3216] CHIP:DMG: <RE> Sending report...
-          [1635844031.245251][3216:3216] CHIP:DMG: IM RH moving to [AwaitingReportResponse]
-          [1635844031.245284][3216:3216] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 37125r
-          [1635844031.245349][3216:3216] CHIP:IN: Prepared encrypted message 0xaaaae4887858 to 0x000000000001B669 of type 0x5 and protocolId (0, 1) on exchange 37125r with MessageCounter:1.
-          [1635844031.245393][3216:3216] CHIP:IN: Sending encrypted msg 0xaaaae4887858 with MessageCounter:1 to 0x000000000001B669 at monotonic time: 3109679 msec
-          [1635844031.245501][3216:3216] CHIP:DMG: <RE> ReportsInFlight = 1 with readHandler 0, RE has no more messages
-          [1635844031.245594][3216:3216] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:3861075869 on exchange 37124r
-          [1635844031.245639][3216:3216] CHIP:EM: Rxd Ack; Removing MessageCounter:2841322247 from Retrans Table on exchange 37124r
-          [1635844031.245670][3216:3216] CHIP:EM: Removed CHIP MessageCounter:2841322247 from RetransTable on exchange 37124r
-          [1635844031.248229][3216:3216] CHIP:EM: Received message of type 0x1 with protocolId (0, 1) and MessageCounter:1 on exchange 37125r
-          [1635844031.248279][3216:3216] CHIP:EM: Rxd Ack; Removing MessageCounter:1 from Retrans Table on exchange 37125r
-          [1635844031.248309][3216:3216] CHIP:EM: Removed CHIP MessageCounter:1 from RetransTable on exchange 37125r
-          [1635844031.248352][3216:3216] CHIP:DMG: StatusResponse =
-          [1635844031.248383][3216:3216] CHIP:DMG: {
-          [1635844031.248411][3216:3216] CHIP:DMG:         Status = 0x0,
-          [1635844031.248440][3216:3216] CHIP:DMG: }
-          [1635844031.248469][3216:3216] CHIP:DMG: In state AwaitingReportResponse, receive status response, status code is 0
-          [1635844031.248497][3216:3216] CHIP:DMG: <RE> OnReportConfirm: NumReports = 0
-          [1635844031.248523][3216:3216] CHIP:DMG: IM RH moving to [Uninitialized]
-          [1635844031.248551][3216:3216] CHIP:EM: Sending Standalone Ack for MessageCounter:1 on exchange 37125r
-      disabled: true
-
-    - label:
-          "DUT sends a NavigateTarget command to the TH with the identifier from
-          step 1b"
-      verification: |
-          ./chip-tool targetnavigator navigate-target 1 nav 1 0
-
-
-          CHIP:IN: CASE Session established. Setting up the secure channel.
-          [1635844324.044404][3216:3216] CHIP:IN: Marking old secure session for device 0x000000000001B669 as expired
-          [1635844324.044451][3216:3216] CHIP:IN: New secure session created for device 0x000000000001B669, key 4!!
-          [1635844324.044536][3216:3216] CHIP:IN: CASE secure channel is available now.
-          [1635844324.044571][3216:3216] CHIP:IN: CASE Server enabling CASE session setups
-          [1635844324.047550][3216:3216] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:0 on exchange 44163r
-          [1635844324.047601][3216:3216] CHIP:EM: Handling via exchange: 44163r, Delegate: 0x0xaaaae48831b8
-          [1635844324.047667][3216:3216] CHIP:DMG: InvokeCommand =
-          [1635844324.047707][3216:3216] CHIP:DMG: {
-          [1635844324.047739][3216:3216] CHIP:DMG:         CommandList =
-          [1635844324.047777][3216:3216] CHIP:DMG:         [
-          [1635844324.047813][3216:3216] CHIP:DMG:                 CommandDataIB =
-          [1635844324.047858][3216:3216] CHIP:DMG:                 {
-          [1635844324.047896][3216:3216] CHIP:DMG:                         CommandPathIB =
-          [1635844324.047936][3216:3216] CHIP:DMG:                         {
-          [1635844324.047983][3216:3216] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635844324.048033][3216:3216] CHIP:DMG:                                 ClusterId = 0x505,
-          [1635844324.048089][3216:3216] CHIP:DMG:                                 CommandId = 0x0,
-          [1635844324.048136][3216:3216] CHIP:DMG:                         },
-          [1635844324.048187][3216:3216] CHIP:DMG:
-          [1635844324.048226][3216:3216] CHIP:DMG:                         CommandData =
-          [1635844324.048276][3216:3216] CHIP:DMG:                         {
-          [1635844324.048325][3216:3216] CHIP:DMG:                                 0x0 = 1,
-          [1635844324.048383][3216:3216] CHIP:DMG:                                 0x1 = "nav",
-          [1635844324.048433][3216:3216] CHIP:DMG:                         },
-          [1635844324.048472][3216:3216] CHIP:DMG:                 },
-          [1635844324.048518][3216:3216] CHIP:DMG:
-          [1635844324.048554][3216:3216] CHIP:DMG:         ],
-          [1635844324.048595][3216:3216] CHIP:DMG:
-          [1635844324.048629][3216:3216] CHIP:DMG: }
-          [1635844324.048683][3216:3216] CHIP:DMG: No Cluster 0x0000_0505 on Endpoint 0x0
-          [1635844324.048737][3216:3216] CHIP:DMG: ICR moving to [AddingComm]
-          [1635844324.048779][3216:3216] CHIP:DMG: ICR moving to [AddedComma]
-          [1635844324.048830][3216:3216] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 44163r
-      disabled: true
-
-    - label: "DUT reads the CurrentTarget attribute from the TH"
-      verification: |
-
-      disabled: true
-
-    - label: "DUT reads the TargetList attribute from the TH"
-      verification: |
-          ./chip-tool targetnavigator read target-navigator-list 1 0
-
-
-          CHIP:IN: CASE Session established. Setting up the secure channel.
-          [1635844541.724866][3216:3216] CHIP:IN: Marking old secure session for device 0x000000000001B669 as expired
-          [1635844541.724903][3216:3216] CHIP:IN: New secure session created for device 0x000000000001B669, key 4!!
-          [1635844541.724975][3216:3216] CHIP:IN: CASE secure channel is available now.
-          [1635844541.725004][3216:3216] CHIP:IN: CASE Server enabling CASE session setups
-          [1635844541.725874][3216:3216] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:0 on exchange 49188r
-          [1635844541.725918][3216:3216] CHIP:EM: Handling via exchange: 49188r, Delegate: 0x0xaaaae48831b8
-          [1635844541.725962][3216:3216] CHIP:IM: Received Read request
-          [1635844541.725993][3216:3216] CHIP:DMG: IM RH moving to [Initialized]
-          [1635844541.726058][3216:3216] CHIP:DMG: ReadRequest =
-          [1635844541.726088][3216:3216] CHIP:DMG: {
-          [1635844541.726115][3216:3216] CHIP:DMG:         AttributePathList =
-          [1635844541.726147][3216:3216] CHIP:DMG:         [
-          [1635844541.726176][3216:3216] CHIP:DMG:                 AttributePath =
-          [1635844541.726209][3216:3216] CHIP:DMG:                 {
-          [1635844541.726244][3216:3216] CHIP:DMG:                         NodeId = 0x1,
-          [1635844541.726280][3216:3216] CHIP:DMG:                         EndpointId = 0x0,
-          [1635844541.726320][3216:3216] CHIP:DMG:                         ClusterId = 0x505,
-          [1635844541.726358][3216:3216] CHIP:DMG:                         FieldTag = 0x0000_0000,
-          [1635844541.726391][3216:3216] CHIP:DMG:                 }
-          [1635844541.726427][3216:3216] CHIP:DMG:
-          [1635844541.726461][3216:3216] CHIP:DMG:         ],
-          [1635844541.726495][3216:3216] CHIP:DMG:
-          [1635844541.726524][3216:3216] CHIP:DMG: }
-          [1635844541.726585][3216:3216] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1635844541.726683][3216:3216] CHIP:DMG: <RE:Run> Cluster 505, Field 0 is dirty
-          [1635844541.726715][3216:3216] CHIP:DMG: Reading attribute: Cluster=0x0000_0505 Endpoint=0 AttributeId=0x0000_0000
-          [1635844541.726757][3216:3216] CHIP:DMG: <RE> Dumping report data...
-          [1635844541.726788][3216:3216] CHIP:DMG: ReportData =
-          [1635844541.726817][3216:3216] CHIP:DMG: {
-          [1635844541.726843][3216:3216] CHIP:DMG:         AttributeDataList =
-          [1635844541.726874][3216:3216] CHIP:DMG:         [
-          [1635844541.726904][3216:3216] CHIP:DMG:                 AttributeDataElement =
-          [1635844541.726941][3216:3216] CHIP:DMG:                 {
-          [1635844541.726972][3216:3216] CHIP:DMG:                         AttributePath =
-          [1635844541.727006][3216:3216] CHIP:DMG:                         {
-          [1635844541.727043][3216:3216] CHIP:DMG:                                 NodeId = 0x1,
-          [1635844541.727085][3216:3216] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635844541.727129][3216:3216] CHIP:DMG:                                 ClusterId = 0x505,
-          [1635844541.727170][3216:3216] CHIP:DMG:                                 FieldTag = 0x0000_0000,
-          [1635844541.727208][3216:3216] CHIP:DMG:                         }
-          [1635844541.727248][3216:3216] CHIP:DMG:
-          [1635844541.727285][3216:3216] CHIP:DMG:                         Status = 0x86,
-          [1635844541.727325][3216:3216] CHIP:DMG:                 },
-          [1635844541.727360][3216:3216] CHIP:DMG:
-          [1635844541.727390][3216:3216] CHIP:DMG:         ],
-          [1635844541.727425][3216:3216] CHIP:DMG:
-          [1635844541.727452][3216:3216] CHIP:DMG: }
-          [1635844541.727478][3216:3216] CHIP:DMG: <RE> Sending report...
-          [1635844541.727506][3216:3216] CHIP:DMG: IM RH moving to [AwaitingReportResponse]
-          [1635844541.727539][3216:3216] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 49188r
-          [1635844541.727606][3216:3216] CHIP:IN: Prepared encrypted message 0xaaaae4887858 to 0x000000000001B669 of type 0x5 and protocolId (0, 1) on exchange 49188r with MessageCounter:1.
-          [1635844541.727650][3216:3216] CHIP:IN: Sending encrypted msg 0xaaaae4887858 with MessageCounter:1 to 0x000000000001B669 at monotonic time: 3620161 msec
-          [1635844541.727756][3216:3216] CHIP:DMG: <RE> ReportsInFlight = 1 with readHandler 0, RE has no more messages
-          [1635844541.727849][3216:3216] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:3414294172 on exchange 49187r
-          [1635844541.727895][3216:3216] CHIP:EM: Rxd Ack; Removing MessageCounter:2841322251 from Retrans Table on exchange 49187r
-          [1635844541.727926][3216:3216] CHIP:EM: Removed CHIP MessageCounter:2841322251 from RetransTable on exchange 49187r
-          [1635844541.729955][3216:3216] CHIP:EM: Received message of type 0x1 with protocolId (0, 1) and MessageCounter:1 on exchange 49188r
-          [1635844541.730024][3216:3216] CHIP:EM: Rxd Ack; Removing MessageCounter:1 from Retrans Table on exchange 49188r
-          [1635844541.730056][3216:3216] CHIP:EM: Removed CHIP MessageCounter:1 from RetransTable on exchange 49188r
-          [1635844541.730099][3216:3216] CHIP:DMG: StatusResponse =
-          [1635844541.730131][3216:3216] CHIP:DMG: {
-          [1635844541.730158][3216:3216] CHIP:DMG:         Status = 0x0,
-          [1635844541.730187][3216:3216] CHIP:DMG: }
-          [1635844541.730217][3216:3216] CHIP:DMG: In state AwaitingReportResponse, receive status response, status code is 0
-          [1635844541.730245][3216:3216] CHIP:DMG: <RE> OnReportConfirm: NumReports = 0
-          [1635844541.730271][3216:3216] CHIP:DMG: IM RH moving to [Uninitialized]
-          [1635844541.730300][3216:3216] CHIP:EM: Sending Standalone Ack for MessageCounter:1 on exchange 49188r
-      disabled: true
-
-    - label:
-          "DUT sends a NavigateTarget command to the TH with the identifier from
-          step 3b and manufacturer provided app-specific data (string format)."
-      verification: |
-          ./chip-tool targetnavigator navigate-target 2 another 1 0
-
-
-          CHIP:IN: CASE Session established. Setting up the secure channel.
-          [1635844631.704944][3216:3216] CHIP:IN: Marking old secure session for device 0x000000000001B669 as expired
-          [1635844631.704984][3216:3216] CHIP:IN: New secure session created for device 0x000000000001B669, key 4!!
-          [1635844631.705059][3216:3216] CHIP:IN: CASE secure channel is available now.
-          [1635844631.705092][3216:3216] CHIP:IN: CASE Server enabling CASE session setups
-          [1635844631.706226][3216:3216] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:0 on exchange 26803r
-          [1635844631.706273][3216:3216] CHIP:EM: Handling via exchange: 26803r, Delegate: 0x0xaaaae48831b8
-          [1635844631.706334][3216:3216] CHIP:DMG: InvokeCommand =
-          [1635844631.706369][3216:3216] CHIP:DMG: {
-          [1635844631.706399][3216:3216] CHIP:DMG:         CommandList =
-          [1635844631.706434][3216:3216] CHIP:DMG:         [
-          [1635844631.706466][3216:3216] CHIP:DMG:                 CommandDataIB =
-          [1635844631.706508][3216:3216] CHIP:DMG:                 {
-          [1635844631.706542][3216:3216] CHIP:DMG:                         CommandPathIB =
-          [1635844631.706588][3216:3216] CHIP:DMG:                         {
-          [1635844631.706630][3216:3216] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635844631.706678][3216:3216] CHIP:DMG:                                 ClusterId = 0x505,
-          [1635844631.706718][3216:3216] CHIP:DMG:                                 CommandId = 0x0,
-          [1635844631.706766][3216:3216] CHIP:DMG:                         },
-          [1635844631.706808][3216:3216] CHIP:DMG:
-          [1635844631.706844][3216:3216] CHIP:DMG:                         CommandData =
-          [1635844631.706882][3216:3216] CHIP:DMG:                         {
-          [1635844631.706924][3216:3216] CHIP:DMG:                                 0x0 = 2,
-          [1635844631.706971][3216:3216] CHIP:DMG:                                 0x1 = "another",
-          [1635844631.707014][3216:3216] CHIP:DMG:                         },
-          [1635844631.707050][3216:3216] CHIP:DMG:                 },
-          [1635844631.707097][3216:3216] CHIP:DMG:
-          [1635844631.707130][3216:3216] CHIP:DMG:         ],
-          [1635844631.707169][3216:3216] CHIP:DMG:
-          [1635844631.707200][3216:3216] CHIP:DMG: }
-          [1635844631.707249][3216:3216] CHIP:DMG: No Cluster 0x0000_0505 on Endpoint 0x0
-          [1635844631.707300][3216:3216] CHIP:DMG: ICR moving to [AddingComm]
-          [1635844631.707337][3216:3216] CHIP:DMG: ICR moving to [AddedComma]
-          [1635844631.707384][3216:3216] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 26803r
-      disabled: true
-
-    - label: "DUT reads the CurrentTarget attribute from the TH"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml
index f2d5eeca83dfe2..cdd224c9d7744b 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml
@@ -19,7 +19,8 @@ name:
 config:
     nodeId: 0x12344321
     cluster: "Application Basic"
-    endpoint: 1
+    # Default endpoint is 3, since that's where tv-app has this cluster.
+    endpoint: 3
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -69,9 +70,7 @@ tests:
           constraints:
               type: uint16
 
-    #Issue 18103
     - label: "Reads the Application attribute"
-      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "Application"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_MC_9_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_9_2.yaml
deleted file mode 100644
index baafb2675698a1..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_MC_9_2.yaml
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    18.11.2. [TC-MC-9.2] Application Basic Attribute Verification (DUT as
-    Client)
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH reads the VendorName attribute from the DUT"
-      verification: |
-          ./chip-tool applicationbasic read vendor-name 1 1
-
-          CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:0 on exchange 47792r
-          [1635669394.984912][4641:4641] CHIP:EM: Handling via exchange: 47792r, Delegate: 0x0xaaaada70fd80
-          [1635669394.984996][4641:4641] CHIP:IM: Received Read request
-          [1635669394.985055][4641:4641] CHIP:DMG: IM RH moving to [Initialized]
-          [1635669394.985120][4641:4641] CHIP:DMG: ReadRequest =
-          [1635669394.985179][4641:4641] CHIP:DMG: {
-          [1635669394.985232][4641:4641] CHIP:DMG:         AttributePathList =
-          [1635669394.985295][4641:4641] CHIP:DMG:         [
-          [1635669394.985355][4641:4641] CHIP:DMG:                 AttributePath =
-          [1635669394.985420][4641:4641] CHIP:DMG:                 {
-          [1635669394.985490][4641:4641] CHIP:DMG:                         NodeId = 0x1,
-          [1635669394.985566][4641:4641] CHIP:DMG:                         EndpointId = 0x1,
-          [1635669394.985652][4641:4641] CHIP:DMG:                         ClusterId = 0x50d,
-          [1635669394.985730][4641:4641] CHIP:DMG:                         FieldTag = 0x0000_0000,
-          [1635669394.985791][4641:4641] CHIP:DMG:                 }
-          [1635669394.985825][4641:4641] CHIP:DMG:
-          [1635669394.985854][4641:4641] CHIP:DMG:         ],
-          [1635669394.985886][4641:4641] CHIP:DMG:
-          [1635669394.985979][4641:4641] CHIP:DMG: }
-          [1635669394.986037][4641:4641] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1635669394.986134][4641:4641] CHIP:DMG: <RE:Run> Cluster 50d, Field 0 is dirty
-          [1635669394.986164][4641:4641] CHIP:DMG: Reading attribute: Cluster=0x0000_050D Endpoint=1 AttributeId=0x0000_0000
-          [1635669394.986208][4641:4641] CHIP:DMG: <RE> Dumping report data...
-          [1635669394.986237][4641:4641] CHIP:DMG: ReportData =./chip-tool applicationbasic read vendor-name 1 1
-          [1635669394.986264][4641:4641] CHIP:DMG: {
-          [1635669394.986289][4641:4641] CHIP:DMG:         AttributeDataList =
-          [1635669394.986319][4641:4641] CHIP:DMG:         [
-          [1635669394.986347][4641:4641] CHIP:DMG:                 AttributeDataElement =
-          [1635669394.986381][4641:4641] CHIP:DMG:                 {
-          [1635669394.986411][4641:4641] CHIP:DMG:                         AttributePath =
-          [1635669394.986445][4641:4641] CHIP:DMG:                         {
-          [1635669394.986481][4641:4641] CHIP:DMG:                                 NodeId = 0x1,
-          [1635669394.986516][4641:4641] CHIP:DMG:                                 EndpointId = 0x1,
-          [1635669394.986559][4641:4641] CHIP:DMG:                                 ClusterId = 0x50d,
-          [1635669394.986595][4641:4641] CHIP:DMG:                                 FieldTag = 0x0000_0000,
-          [1635669394.986627][4641:4641] CHIP:DMG:                         }
-          [1635669394.986667][4641:4641] CHIP:DMG:
-          [1635669394.986706][4641:4641] CHIP:DMG:                         Data = "",
-          [1635669394.986742][4641:4641] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635669394.986776][4641:4641] CHIP:DMG:                 },
-          [1635669394.986810][4641:4641] CHIP:DMG:
-          [1635669394.986837][4641:4641] CHIP:DMG:         ],
-          [1635669394.986871][4641:4641] CHIP:DMG:
-          [1635669394.986896][4641:4641] CHIP:DMG: }
-          [1635669394.986920][4641:4641] CHIP:DMG: <RE> Sending report...
-          [1635669394.986946][4641:4641] CHIP:DMG: IM RH moving to [AwaitingReportResponse]
-          [1635669394.986973][4641:4641] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 47792r
-          [1635669394.987032][4641:4641] CHIP:IN: Prepared encrypted message 0xaaaada714448 to 0x000000000001B669 of type 0x5 and protocolId (0, 1) on exchange 47792r with MessageCounter:1.
-          [1635669394.987074][4641:4641] CHIP:IN: Sending encrypted msg 0xaaaada714448 with MessageCounter:1 to 0x000000000001B669 at monotonic time: 7893783 msec
-          [1635669394.987195][4641:4641] CHIP:DMG: <RE> ReportsInFlight = 1 with readHandler 0, RE has no more messages
-          [1635669394.987286][4641:4641] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:466709192 on exchange 47791r
-          [1635669394.987328][4641:4641] CHIP:EM: Rxd Ack; Removing MessageCounter:1572049851 from Retrans Table on exchange 47791r
-          [1635669394.987357][4641:4641] CHIP:EM: Removed CHIP MessageCounter:1572049851 from RetransTable on exchange 47791r
-          [1635669394.989332][4641:4641] CHIP:EM: Received message of type 0x1 with protocolId (0, 1) and MessageCounter:1 on exchange 47792r
-          [1635669394.989373][4641:4641] CHIP:EM: Rxd Ack; Removing MessageCounter:1 from Retrans Table on exchange 47792r
-      disabled: true
-
-    - label: "TH reads the VendorID attribute from the DUT"
-      verification: |
-          ./chip-tool applicationbasic read vendor-id 1 1
-
-          CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:0 on exchange 10649r
-          [1635669532.932419][4641:4641] CHIP:EM: Handling via exchange: 10649r, Delegate: 0x0xaaaada70fd80
-          [1635669532.932476][4641:4641] CHIP:IM: Received Read request
-          [1635669532.932506][4641:4641] CHIP:DMG: IM RH moving to [Initialized]
-          [1635669532.932545][4641:4641] CHIP:DMG: ReadRequest =
-          [1635669532.932575][4641:4641] CHIP:DMG: {
-          [1635669532.932601][4641:4641] CHIP:DMG:         AttributePathList =
-          [1635669532.932633][4641:4641] CHIP:DMG:         [
-          [1635669532.932663][4641:4641] CHIP:DMG:                 AttributePath =
-          [1635669532.932696][4641:4641] CHIP:DMG:                 {
-          [1635669532.932731][4641:4641] CHIP:DMG:                         NodeId = 0x1,
-          [1635669532.932767][4641:4641] CHIP:DMG:                         EndpointId = 0x1,
-          [1635669532.932810][4641:4641] CHIP:DMG:                         ClusterId = 0x50d,
-          [1635669532.932849][4641:4641] CHIP:DMG:                         FieldTag = 0x0000_0001,
-          [1635669532.932889][4641:4641] CHIP:DMG:                 }
-          [1635669532.932928][4641:4641] CHIP:DMG:
-          [1635669532.932962][4641:4641] CHIP:DMG:         ],
-          [1635669532.932995][4641:4641] CHIP:DMG:
-          [1635669532.933025][4641:4641] CHIP:DMG: }
-          [1635669532.933092][4641:4641] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1635669532.933194][4641:4641] CHIP:DMG: <RE:Run> Cluster 50d, Field 1 is dirty
-          [1635669532.933226][4641:4641] CHIP:DMG: Reading attribute: Cluster=0x0000_050D Endpoint=1 AttributeId=0x0000_0001
-          [1635669532.933273][4641:4641] CHIP:DMG: <RE> Dumping report data...
-          [1635669532.933305][4641:4641] CHIP:DMG: ReportData =
-          [1635669532.933334][4641:4641] CHIP:DMG: {
-          [1635669532.933357][4641:4641] CHIP:DMG:         AttributeDataList =
-          [1635669532.933388][4641:4641] CHIP:DMG:         [
-          [1635669532.933418][4641:4641] CHIP:DMG:                 AttributeDataElement =
-          [1635669532.933448][4641:4641] CHIP:DMG:                 {
-          [1635669532.933479][4641:4641] CHIP:DMG:                         AttributePath =
-          [1635669532.933520][4641:4641] CHIP:DMG:                         {
-          [1635669532.933559][4641:4641] CHIP:DMG:                                 NodeId = 0x1,
-          [1635669532.933600][4641:4641] CHIP:DMG:                                 EndpointId = 0x1,
-          [1635669532.933644][4641:4641] CHIP:DMG:                                 ClusterId = 0x50d,
-          [1635669532.933684][4641:4641] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635669532.933726][4641:4641] CHIP:DMG:                         }
-          [1635669532.933767][4641:4641] CHIP:DMG:
-          [1635669532.933809][4641:4641] CHIP:DMG:                         Data = 0,
-          [1635669532.933847][4641:4641] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635669532.933882][4641:4641] CHIP:DMG:                 },
-          [1635669532.933915][4641:4641] CHIP:DMG:
-          [1635669532.933945][4641:4641] CHIP:DMG:         ],
-          [1635669532.933984][4641:4641] CHIP:DMG:
-          [1635669532.934011][4641:4641] CHIP:DMG: }
-          [1635669532.934040][4641:4641] CHIP:DMG: <RE> Sending report...
-          [1635669532.934082][4641:4641] CHIP:DMG: IM RH moving to [AwaitingReportResponse]
-          [1635669532.934129][4641:4641] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 10649r
-          [1635669532.934194][4641:4641] CHIP:IN: Prepared encrypted message 0xaaaada714448 to 0x000000000001B669 of type 0x5 and protocolId (0, 1) on exchange 10649r with MessageCounter:1.
-          [1635669532.934243][4641:4641] CHIP:IN: Sending encrypted msg 0xaaaada714448 with MessageCounter:1 to 0x000000000001B669 at monotonic time: 8031730 msec
-          [1635669532.934363][4641:4641] CHIP:DMG: <RE> ReportsInFlight = 1 with readHandler 0, RE has no more messages
-          [1635669532.934463][4641:4641] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:229251686 on exchange 10648r
-          [1635669532.934517][4641:4641] CHIP:EM: Rxd Ack; Removing MessageCounter:1572049853 from Retrans Table on exchange 10648r
-          [1635669532.934550][4641:4641] CHIP:EM: Removed CHIP MessageCounter:1572049853 from RetransTable on exchange 10648r
-      disabled: true
-
-    - label: "TH reads the ApplicationName attribute from the DUT"
-      verification: |
-          ./chip-tool applicationbasic read application-name 1 1
-
-           CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:0 on exchange 3361r
-          [1635669651.324865][4641:4641] CHIP:EM: Handling via exchange: 3361r, Delegate: 0x0xaaaada70fd80
-          [1635669651.324915][4641:4641] CHIP:IM: Received Read request
-          [1635669651.324948][4641:4641] CHIP:DMG: IM RH moving to [Initialized]
-          [1635669651.324987][4641:4641] CHIP:DMG: ReadRequest =
-          [1635669651.325019][4641:4641] CHIP:DMG: {
-          [1635669651.325049][4641:4641] CHIP:DMG:         AttributePathList =
-          [1635669651.325083][4641:4641] CHIP:DMG:         [
-          [1635669651.325117][4641:4641] CHIP:DMG:                 AttributePath =
-          [1635669651.325153][4641:4641] CHIP:DMG:                 {
-          [1635669651.325197][4641:4641] CHIP:DMG:                         NodeId = 0x1,
-          [1635669651.325242][4641:4641] CHIP:DMG:                         EndpointId = 0x1,
-          [1635669651.325285][4641:4641] CHIP:DMG:                         ClusterId = 0x50d,
-          [1635669651.325328][4641:4641] CHIP:DMG:                         FieldTag = 0x0000_0002,
-          [1635669651.325369][4641:4641] CHIP:DMG:                 }
-          [1635669651.325408][4641:4641] CHIP:DMG:
-          [1635669651.325442][4641:4641] CHIP:DMG:         ],
-          [1635669651.325480][4641:4641] CHIP:DMG:
-          [1635669651.325512][4641:4641] CHIP:DMG: }
-          [1635669651.325578][4641:4641] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1635669651.325684][4641:4641] CHIP:DMG: <RE:Run> Cluster 50d, Field 2 is dirty
-          [1635669651.325719][4641:4641] CHIP:DMG: Reading attribute: Cluster=0x0000_050D Endpoint=1 AttributeId=0x0000_0002
-          [1635669651.325773][4641:4641] CHIP:DMG: <RE> Dumping report data...
-          [1635669651.325807][4641:4641] CHIP:DMG: ReportData =
-          [1635669651.325840][4641:4641] CHIP:DMG: {
-          [1635669651.325869][4641:4641] CHIP:DMG:         AttributeDataList =
-          [1635669651.325903][4641:4641] CHIP:DMG:         [
-          [1635669651.325936][4641:4641] CHIP:DMG:                 AttributeDataElement =
-          [1635669651.325973][4641:4641] CHIP:DMG:                 {
-          [1635669651.326008][4641:4641] CHIP:DMG:                         AttributePath =
-          [1635669651.326048][4641:4641] CHIP:DMG:                         {
-          [1635669651.326090][4641:4641] CHIP:DMG:                                 NodeId = 0x1,
-          [1635669651.326139][4641:4641] CHIP:DMG:                                 EndpointId = 0x1,
-          [1635669651.326181][4641:4641] CHIP:DMG:                                 ClusterId = 0x50d,
-          [1635669651.326230][4641:4641] CHIP:DMG:                                 FieldTag = 0x0000_0002,
-          [1635669651.326268][4641:4641] CHIP:DMG:                         }
-          [1635669651.326311][4641:4641] CHIP:DMG:
-          [1635669651.326358][4641:4641] CHIP:DMG:                         Data = "",
-          [1635669651.326397][4641:4641] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635669651.326439][4641:4641] CHIP:DMG:                 },
-          [1635669651.326480][4641:4641] CHIP:DMG:
-          [1635669651.326513][4641:4641] CHIP:DMG:         ],
-          [1635669651.326552][4641:4641] CHIP:DMG:
-          [1635669651.326583][4641:4641] CHIP:DMG: }
-          [1635669651.326611][4641:4641] CHIP:DMG: <RE> Sending report...
-          [1635669651.326642][4641:4641] CHIP:DMG: IM RH moving to [AwaitingReportResponse]
-          [1635669651.326677][4641:4641] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 3361r
-      disabled: true
-
-    - label: "TH reads the ProductID attribute from the DUT"
-      verification: |
-          ./chip-tool applicationbasic read product-id 1 1
-
-          CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:0 on exchange 12029r
-          [1635669782.991396][4641:4641] CHIP:EM: Handling via exchange: 12029r, Delegate: 0x0xaaaada70fd80
-          [1635669782.991444][4641:4641] CHIP:IM: Received Read request
-          [1635669782.991477][4641:4641] CHIP:DMG: IM RH moving to [Initialized]
-          [1635669782.991517][4641:4641] CHIP:DMG: ReadRequest =
-          [1635669782.991550][4641:4641] CHIP:DMG: {
-          [1635669782.991579][4641:4641] CHIP:DMG:         AttributePathList =
-          [1635669782.991614][4641:4641] CHIP:DMG:         [
-          [1635669782.991646][4641:4641] CHIP:DMG:                 AttributePath =
-          [1635669782.991686][4641:4641] CHIP:DMG:                 {
-          [1635669782.991724][4641:4641] CHIP:DMG:                         NodeId = 0x1,
-          [1635669782.991766][4641:4641] CHIP:DMG:                         EndpointId = 0x1,
-          [1635669782.991813][4641:4641] CHIP:DMG:                         ClusterId = 0x50d,
-          [1635669782.991857][4641:4641] CHIP:DMG:                         FieldTag = 0x0000_0003,
-          [1635669782.991923][4641:4641] CHIP:DMG:                 }
-          [1635669782.991969][4641:4641] CHIP:DMG:
-          [1635669782.992003][4641:4641] CHIP:DMG:         ],
-          [1635669782.992040][4641:4641] CHIP:DMG:
-          [1635669782.992073][4641:4641] CHIP:DMG: }
-          [1635669782.992137][4641:4641] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1635669782.992249][4641:4641] CHIP:DMG: <RE:Run> Cluster 50d, Field 3 is dirty
-          [1635669782.992284][4641:4641] CHIP:DMG: Reading attribute: Cluster=0x0000_050D Endpoint=1 AttributeId=0x0000_0003
-          [1635669782.992335][4641:4641] CHIP:DMG: <RE> Dumping report data...
-          [1635669782.992369][4641:4641] CHIP:DMG: ReportData =
-          [1635669782.992401][4641:4641] CHIP:DMG: {
-          [1635669782.992470][4641:4641] CHIP:DMG:         AttributeDataList =
-          [1635669782.992506][4641:4641] CHIP:DMG:         [
-          [1635669782.992539][4641:4641] CHIP:DMG:                 AttributeDataElement =
-          [1635669782.992576][4641:4641] CHIP:DMG:                 {
-          [1635669782.992617][4641:4641] CHIP:DMG:                         AttributePath =
-          [1635669782.992658][4641:4641] CHIP:DMG:                         {
-          [1635669782.992701][4641:4641] CHIP:DMG:                                 NodeId = 0x1,
-          [1635669782.992750][4641:4641] CHIP:DMG:                                 EndpointId = 0x1,
-          [1635669782.992800][4641:4641] CHIP:DMG:                                 ClusterId = 0x50d,
-          [1635669782.992845][4641:4641] CHIP:DMG:                                 FieldTag = 0x0000_0003,
-          [1635669782.992891][4641:4641] CHIP:DMG:                         }
-          [1635669782.992932][4641:4641] CHIP:DMG:
-          [1635669782.992976][4641:4641] CHIP:DMG:                         Data = 0,
-          [1635669782.993022][4641:4641] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635669782.993065][4641:4641] CHIP:DMG:                 },
-          [1635669782.993108][4641:4641] CHIP:DMG:
-          [1635669782.993140][4641:4641] CHIP:DMG:         ],
-          [1635669782.993179][4641:4641] CHIP:DMG:
-          [1635669782.993210][4641:4641] CHIP:DMG: }
-          [1635669782.993238][4641:4641] CHIP:DMG: <RE> Sending report...
-          [1635669782.993269][4641:4641] CHIP:DMG: IM RH moving to [AwaitingReportResponse]
-          [1635669782.993305][4641:4641] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 12029r
-      disabled: true
-
-    - label: "TH reads the Status attribute from the DUT"
-      verification: |
-          ./chip-tool applicationbasic change-status 2 1 0
-
-
-           CHIP:IN: CASE Session established. Setting up the secure channel.
-          [1635849338.804317][3216:3216] CHIP:IN: Marking old secure session for device 0x000000000001B669 as expired
-          [1635849338.804591][3216:3216] CHIP:IN: New secure session created for device 0x000000000001B669, key 4!!
-          [1635849338.804767][3216:3216] CHIP:IN: CASE secure channel is available now.
-          [1635849338.804821][3216:3216] CHIP:IN: CASE Server enabling CASE session setups
-          [1635849338.805449][3216:3216] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:0 on exchange 15761r
-          [1635849338.805523][3216:3216] CHIP:EM: Handling via exchange: 15761r, Delegate: 0x0xaaaae48831b8
-          [1635849338.805614][3216:3216] CHIP:DMG: InvokeCommand =
-          [1635849338.805669][3216:3216] CHIP:DMG: {
-          [1635849338.805715][3216:3216] CHIP:DMG:         CommandList =
-          [1635849338.805769][3216:3216] CHIP:DMG:         [
-          [1635849338.805819][3216:3216] CHIP:DMG:                 CommandDataIB =
-          [1635849338.805881][3216:3216] CHIP:DMG:                 {
-          [1635849338.805974][3216:3216] CHIP:DMG:                         CommandPathIB =
-          [1635849338.806032][3216:3216] CHIP:DMG:                         {
-          [1635849338.806148][3216:3216] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635849338.806213][3216:3216] CHIP:DMG:                                 ClusterId = 0x50d,
-          [1635849338.806253][3216:3216] CHIP:DMG:                                 CommandId = 0x0,
-          [1635849338.806290][3216:3216] CHIP:DMG:                         },
-          [1635849338.806356][3216:3216] CHIP:DMG:
-          [1635849338.806389][3216:3216] CHIP:DMG:                         CommandData =
-          [1635849338.806425][3216:3216] CHIP:DMG:                         {
-          [1635849338.806458][3216:3216] CHIP:DMG:                                 0x0 = 2,
-          [1635849338.806525][3216:3216] CHIP:DMG:                         },
-          [1635849338.806560][3216:3216] CHIP:DMG:                 },
-          [1635849338.806622][3216:3216] CHIP:DMG:
-          [1635849338.806671][3216:3216] CHIP:DMG:         ],
-          [1635849338.806722][3216:3216] CHIP:DMG:
-          [1635849338.806775][3216:3216] CHIP:DMG: }
-          [1635849338.806822][3216:3216] CHIP:DMG: No Cluster 0x0000_050D on Endpoint 0x0
-          [1635849338.806867][3216:3216] CHIP:DMG: ICR moving to [AddingComm]
-          [1635849338.806899][3216:3216] CHIP:DMG: ICR moving to [AddedComma]
-          [1635849338.806939][3216:3216] CHIP:EM: Piggybacking Ack for MessageCounter:0 on exchange: 15761r
-          [1635849338.807002][3216:3216] CHIP:IN: Prepared encrypted message 0xaaaae4887858 to 0x000000000001B669 of type 0x9 and protocolId (0, 1) on exchange 15761r with MessageCounter:1.
-          [1635849338.807073][3216:3216] CHIP:IN: Sending encrypted msg 0xaaaae4887858 with MessageCounter:1 to 0x000000000001B669 at monotonic time: 8417241 msec
-          [1635849338.807226][3216:3216] CHIP:DMG: ICR moving to [CommandSen]
-          [1635849338.807256][3216:3216] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1635849338.807452][3216:3216] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1459595048 on exchange 15760r
-          [1635849338.807521][3216:3216] CHIP:EM: Rxd Ack; Removing MessageCounter:2841322265 from Retrans Table on exchange 15760r
-          [1635849338.807551][3216:3216] CHIP:EM: Removed CHIP MessageCounter:2841322265 from RetransTable on exchange 15760r
-          [1635849338.809288][3216:3216] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 15761r
-          [1635849338.809333][3216:3216] CHIP:EM: Rxd Ack; Removing MessageCounter:1 from Retrans Table on exchange 15761r
-          [1635849338.809361][3216:3216] CHIP:EM: Removed CHIP MessageCounter:1 from RetransTable on exchange 15761r
-      disabled: true
-
-    - label: "TH reads the ApplicationVersion attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH reads the AllowedVendorList attribute from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_1.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_1.yaml
index 158d9e2dcaa907..0776af6ddfa918 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_1.yaml
@@ -23,13 +23,14 @@ config:
 tests:
     - label: "TH_CR1 starts a commissioning process with TH_CE"
       verification: |
-          1. Provision the device using 1st controller chip-tool  on the raspi (use above instructions)
+          "1. Provision the device using 1st controller chip-tool  on the raspi (use above instructions)
+          "
       disabled: true
 
     - label:
           "TH_CR1 opens a commissioning window on TH_CE using a commissioning
           timeout of PIXIT_COMM_WIN seconds using ECM (Enhanced Commissioning
-          Method)"
+          Method)."
       verification: |
           On 1st controller using chip tool, open commissioning window using ECM
 
@@ -62,80 +63,30 @@ tests:
       verification: |
           On 1st controller using chip tool read fabricList
 
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-
-          CHIP:DMG: ReportData =
-          [1635690007.805198][3613:3618] CHIP:DMG: {
-          [1635690007.805247][3613:3618] CHIP:DMG:         AttributeDataList =
-          [1635690007.805286][3613:3618] CHIP:DMG:         [
-          [1635690007.805334][3613:3618] CHIP:DMG:                 AttributeDataElement =
-          [1635690007.805500][3613:3618] CHIP:DMG:                 {
-          [1635690007.805541][3613:3618] CHIP:DMG:                         AttributePath =
-          [1635690007.805599][3613:3618] CHIP:DMG:                         {
-          [1635690007.805648][3613:3618] CHIP:DMG:                                 NodeId = 0x1,
-          [1635690007.805712][3613:3618] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635690007.805763][3613:3618] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635690007.805826][3613:3618] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635690007.805881][3613:3618] CHIP:DMG:                         }
-          [1635690007.805931][3613:3618] CHIP:DMG:
-          [1635690007.805987][3613:3618] CHIP:DMG:                         Data = [
-          [1635690007.806032][3613:3618] CHIP:DMG:
-          [1635690007.806085][3613:3618] CHIP:DMG:                                 {
-          [1635690007.806136][3613:3618] CHIP:DMG:                                         0x0 = 1,
-          [1635690007.806201][3613:3618] CHIP:DMG:                                         0x1 = [
-          [1635690007.806283][3613:3618] CHIP:DMG:                                                 0x4, 0x5d, 0x4, 0xcb, 0xc5, 0xe2, 0x30, 0xb2, 0x3b, 0xee, 0x54, 0xc7, 0xff, 0x3d, 0xdc, 0x65, 0x31, 0x67, 0x69, 0xa8, 0x90, 0x58, 0x5b, 0x83, 0x19, 0x85, 0x8d, 0x1d, 0x3a, 0x63, 0xba, 0x62, 0x54, 0xf8, 0x30, 0x18, 0xb3, 0x68, 0x7b, 0x66, 0x9, 0x94,
-          [1635690007.806359][3613:3618] CHIP:DMG:                                         ]
-          [1635690007.806412][3613:3618] CHIP:DMG:                                         0x2 = 54600,
-          [1635690007.806474][3613:3618] CHIP:DMG:                                         0x3 = 0,
-          [1635690007.806530][3613:3618] CHIP:DMG:                                         0x4 = 1,
-          [1635690007.806597][3613:3618] CHIP:DMG:                                         0x5 = "",
-          [1635690007.806661][3613:3618] CHIP:DMG:                                 },
-          [1635690007.806706][3613:3618] CHIP:DMG:                                 {
-          [1635690007.806763][3613:3618] CHIP:DMG:                                         0x0 = 2,
-          [1635690007.806817][3613:3618] CHIP:DMG:                                         0x1 = [
-          [1635690007.806902][3613:3618] CHIP:DMG:                                                 0x4, 0xc1, 0x79, 0xcc, 0x1d, 0xc3, 0xdc, 0x71, 0x74, 0xd8, 0x99, 0xcb, 0xef, 0x54, 0xa0, 0xb6, 0xb9, 0x91, 0x37, 0x6d, 0x5d, 0xf1, 0x80, 0x12, 0xa6, 0x4e, 0xc9, 0x7e, 0x34, 0x6a, 0x8d, 0x6b, 0x7a, 0x8e, 0xe2, 0xee, 0x7c, 0xd0, 0x24, 0xa2, 0x62, 0x1d
-          [1635690007.806980][3613:3618] CHIP:DMG:                                         ]
-          [1635690007.807131][3613:3618] CHIP:DMG:                                         0x2 = 0,
-          [1635690007.807222][3613:3618] CHIP:DMG:                                         0x3 = 0,
-          [1635690007.807287][3613:3618] CHIP:DMG:                                         0x4 = 1,
-          [1635690007.807361][3613:3618] CHIP:DMG:                                         0x5 = "",
-          [1635690007.807437][3613:3618] CHIP:DMG:                                 },
-          [1635690007.807503][3613:3618] CHIP:DMG:                         ],
-          [1635690007.807586][3613:3618] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635690007.807636][3613:3618] CHIP:DMG:                 },
-          [1635690007.807720][3613:3618] CHIP:DMG:
-          [1635690007.807765][3613:3618] CHIP:DMG:         ],
-          [1635690007.807846][3613:3618] CHIP:DMG:
-          [1635690007.807887][3613:3618] CHIP:DMG: }
-          [1635690007.808091][3613:3618] CHIP:ZCL: ReadAttributesResponse:
-          [1635690007.808148][3613:3618] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635690007.808193][3613:3618] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635690007.808234][3613:3618] CHIP:ZCL:   status: Success                (0x0000)
-          [1635690007.808266][3613:3618] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635690007.808338][3613:3618] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635690007.808661][3613:3618] CHIP:TOO: FabricDescriptor[1]:
-          [1635690007.808711][3613:3618] CHIP:TOO:   fabricIndex: 1
-          [1635690007.808768][3613:3618] CHIP:ZCL:   RootPublicKey: 65
-          [1635690007.808805][3613:3618] CHIP:TOO:   vendorId: 54600
-          [1635690007.808843][3613:3618] CHIP:TOO:   fabricId: 0
-          [1635690007.808879][3613:3618] CHIP:TOO:   nodeId: 1
-          [1635690007.808930][3613:3618] CHIP:ZCL:   Label:
-          [1635690007.808984][3613:3618] CHIP:TOO: FabricDescriptor[2]:
-          [1635690007.809040][3613:3618] CHIP:TOO:   fabricIndex: 2
-          [1635690007.809078][3613:3618] CHIP:ZCL:   RootPublicKey: 65
-          [1635690007.809115][3613:3618] CHIP:TOO:   vendorId: 0
-          [1635690007.809168][3613:3618] CHIP:TOO:   fabricId: 0
-          [1635690007.809206][3613:3618] CHIP:TOO:   nodeId: 1
-          [1635690007.809242][3613:3618] CHIP:ZCL:   Label:
-          [1635690007.809382][3613:3618] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 8901i
-          [1635690007.809494][3613:3618] CHIP:IN: Prepared encrypted message 0xaaaae7c60d10 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 8901i with MessageCounter:1.
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
+
+           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507058
+          [1649245801.244173][10091:10096] CHIP:TOO:   Fabrics: 1 entries
+          [1649245801.244305][10091:10096] CHIP:TOO:     [1]: {
+          [1649245801.244348][10091:10096] CHIP:TOO:       RootPublicKey: 045541017FCEFD0D83963C9ED7F21380C6B789EB989B5D20DC318FAE92D60D0F685666505E9C4F86C49ADC71AB3A8B9B44FD43214CF9BE2B6D47DE01F28FE1544F
+          [1649245801.244400][10091:10096] CHIP:TOO:       VendorId: 65521
+          [1649245801.244431][10091:10096] CHIP:TOO:       FabricId: 1
+          [1649245801.244461][10091:10096] CHIP:TOO:       NodeId: 1
+          [1649245801.244491][10091:10096] CHIP:TOO:       Label:
+          [1649245801.244521][10091:10096] CHIP:TOO:       FabricIndex: 1
+          [1649245801.244552][10091:10096] CHIP:TOO:      }
+          [1649245801.244671][10091:10096] CHIP:EM: Sending Standalone Ack for MessageCounter:8407998 on exchange 12989i
       disabled: true
 
     - label: "DUT_CR2 starts a commissioning process with TH_CE"
       verification: |
           On 2nd controller, using chip-tool connect using manual code.
           Below is the example when using chip tool as controller (considering 35998938564 as the manual code generated by 1st controller)
-          ./chip-tool pairing code 2 35998938564
+          ./chip-tool pairing manualcode 2 35998938564
+
+           Verify whether you got below message in the log of TH
+
+          Device commissioning completed with success
       disabled: true
 
     - label:
@@ -147,74 +98,69 @@ tests:
           Below is the example when using chip tool as controller
           ./chip-tool basic write node-label te5new 2 0
 
-          CHIP: [EM] Received message of type 0x7 with protocolId (0, 1) and MessageCounter:1 on exchange 44858i
-          [1635692170347] [30464:4576577] CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 44858i
-          [1635692170347] [30464:4576577] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 44858i
-          [1635692170347] [30464:4576577] CHIP: [DMG] WriteResponse =
-          [1635692170347] [30464:4576577] CHIP: [DMG] {
-          [1635692170347] [30464:4576577] CHIP: [DMG]         AttributeStatusList =
-          [1635692170347] [30464:4576577] CHIP: [DMG]         [
-          [1635692170347] [30464:4576577] CHIP: [DMG]                 AttributeStatusIB =
-          [1635692170347] [30464:4576577] CHIP: [DMG]                 {
-          [1635692170347] [30464:4576577] CHIP: [DMG]                         AttributePath =
-          [1635692170347] [30464:4576577] CHIP: [DMG]                         {
-          [1635692170347] [30464:4576577] CHIP: [DMG]                                 FieldTag = 0x0000_0005,
-          [1635692170347] [30464:4576577] CHIP: [DMG]                                 NodeId = 0x0,
-          [1635692170347] [30464:4576577] CHIP: [DMG]                                 ClusterId = 0x28,
-          [1635692170347] [30464:4576577] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635692170347] [30464:4576577] CHIP: [DMG]                         }
-          [1635692170347] [30464:4576577] CHIP: [DMG]
-          [1635692170347] [30464:4576577] CHIP: [DMG]                         StatusIB =
-          [1635692170347] [30464:4576577] CHIP: [DMG]                         {
-          [1635692170347] [30464:4576577] CHIP: [DMG]                                 status = 0x0,
-          [1635692170347] [30464:4576577] CHIP: [DMG]                         },
-          [1635692170347] [30464:4576577] CHIP: [DMG]
-          [1635692170347] [30464:4576577] CHIP: [DMG]                 },
-          [1635692170347] [30464:4576577] CHIP: [DMG]
-          [1635692170347] [30464:4576577] CHIP: [DMG]         ],
-          [1635692170347] [30464:4576577] CHIP: [DMG]
-          [1635692170347] [30464:4576577] CHIP: [DMG] }
-          [1635692170347] [30464:4576577] CHIP: [ZCL] WriteResponse:
-          [1635692170347] [30464:4576577] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635692170347] [30464:4576577] CHIP: [TOO] Default Success Response
-          [1635692170347] [30464:4576577] CHIP: [DMG] WriteClient moving to [Uninitiali]
-          [1635692170347] [30464:4576577] CHIP: [EM] Sending Standalone Ack for MessageCounter:1 on exchange 44858i
+          CHIP:DMG: WriteClient moving to [ResponseRe]
+          [1649671460.431199][20958:20963] CHIP:DMG: WriteResponseMessage =
+          [1649671460.431217][20958:20963] CHIP:DMG: {
+          [1649671460.431230][20958:20963] CHIP:DMG:         AttributeStatusIBs =
+          [1649671460.431252][20958:20963] CHIP:DMG:         [
+          [1649671460.431266][20958:20963] CHIP:DMG:                 AttributeStatusIB =
+          [1649671460.431282][20958:20963] CHIP:DMG:                 {
+          [1649671460.431297][20958:20963] CHIP:DMG:                         AttributePathIB =
+          [1649671460.431314][20958:20963] CHIP:DMG:                         {
+          [1649671460.431331][20958:20963] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649671460.431347][20958:20963] CHIP:DMG:                                 Cluster = 0x28,
+          [1649671460.431364][20958:20963] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649671460.431380][20958:20963] CHIP:DMG:                         }
+          [1649671460.431403][20958:20963] CHIP:DMG:
+          [1649671460.431422][20958:20963] CHIP:DMG:                         StatusIB =
+          [1649671460.431445][20958:20963] CHIP:DMG:                         {
+          [1649671460.431467][20958:20963] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649671460.431488][20958:20963] CHIP:DMG:                         },
+          [1649671460.431511][20958:20963] CHIP:DMG:
+          [1649671460.431530][20958:20963] CHIP:DMG:                 },
+          [1649671460.431556][20958:20963] CHIP:DMG:
+          [1649671460.431570][20958:20963] CHIP:DMG:         ],
+          [1649671460.431593][20958:20963] CHIP:DMG:
+          [1649671460.431607][20958:20963] CHIP:DMG:         InteractionModelRevision = 1
+          [1649671460.431620][20958:20963] CHIP:DMG: }
+          [1649671460.431685][20958:20963] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1649671460.431729][20958:20963] CHIP:EM: Sending Standalone Ack for MessageCounter:11088724 on exchange 41848i
+
+
 
           Verify read attribute returns the updated value written
 
           ./chip-tool basic read node-label 1 0
 
-          CHIP: [EM] Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 52334i
-          [1635692600286] [30469:4578600] CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 52334i
-          [1635692600286] [30469:4578600] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 52334i
-          [1635692600286] [30469:4578600] CHIP: [DMG] ReportData =
-          [1635692600286] [30469:4578600] CHIP: [DMG] {
-          [1635692600286] [30469:4578600] CHIP: [DMG]         AttributeDataList =
-          [1635692600286] [30469:4578600] CHIP: [DMG]         [
-          [1635692600286] [30469:4578600] CHIP: [DMG]                 AttributeDataElement =
-          [1635692600286] [30469:4578600] CHIP: [DMG]                 {
-          [1635692600286] [30469:4578600] CHIP: [DMG]                         AttributePath =
-          [1635692600286] [30469:4578600] CHIP: [DMG]                         {
-          [1635692600286] [30469:4578600] CHIP: [DMG]                                 NodeId = 0x1,
-          [1635692600286] [30469:4578600] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635692600286] [30469:4578600] CHIP: [DMG]                                 ClusterId = 0x28,
-          [1635692600286] [30469:4578600] CHIP: [DMG]                                 FieldTag = 0x0000_0005,
-          [1635692600286] [30469:4578600] CHIP: [DMG]                         }
-          [1635692600286] [30469:4578600] CHIP: [DMG]
-          [1635692600286] [30469:4578600] CHIP: [DMG]                         Data = "te5new",
-          [1635692600286] [30469:4578600] CHIP: [DMG]                         DataElementVersion = 0x0,
-          [1635692600286] [30469:4578600] CHIP: [DMG]                 },
-          [1635692600286] [30469:4578600] CHIP: [DMG]
-          [1635692600286] [30469:4578600] CHIP: [DMG]         ],
-          [1635692600286] [30469:4578600] CHIP: [DMG]
-          [1635692600286] [30469:4578600] CHIP: [DMG] }
-          [1635692600286] [30469:4578600] CHIP: [ZCL] ReadAttributesResponse:
-          [1635692600286] [30469:4578600] CHIP: [ZCL]   ClusterId: 0x0000_0028
-          [1635692600286] [30469:4578600] CHIP: [ZCL]   attributeId: 0x0000_0005
-          [1635692600286] [30469:4578600] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635692600286] [30469:4578600] CHIP: [ZCL]   attribute TLV Type: 0x0c
-          [1635692600286] [30469:4578600] CHIP: [TOO] CharString attribute Response: te5new
-          [1635692600286] [30469:4578600] CHIP: [EM] Piggybacking Ack for MessageCounter:1 on exchange: 52334i
+          CHIP:DMG: ReportDataMessage =
+          [1649671466.310233][20969:20974] CHIP:DMG: {
+          [1649671466.310241][20969:20974] CHIP:DMG:         AttributeReportIBs =
+          [1649671466.310256][20969:20974] CHIP:DMG:         [
+          [1649671466.310265][20969:20974] CHIP:DMG:                 AttributeReportIB =
+          [1649671466.310281][20969:20974] CHIP:DMG:                 {
+          [1649671466.310292][20969:20974] CHIP:DMG:                         AttributeDataIB =
+          [1649671466.310304][20969:20974] CHIP:DMG:                         {
+          [1649671466.310317][20969:20974] CHIP:DMG:                                 DataVersion = 0xd581a5e8,
+          [1649671466.310328][20969:20974] CHIP:DMG:                                 AttributePathIB =
+          [1649671466.310342][20969:20974] CHIP:DMG:                                 {
+          [1649671466.310355][20969:20974] CHIP:DMG:                                         Endpoint = 0x0,
+          [1649671466.310367][20969:20974] CHIP:DMG:                                         Cluster = 0x28,
+          [1649671466.310380][20969:20974] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1649671466.310391][20969:20974] CHIP:DMG:                                 }
+          [1649671466.310405][20969:20974] CHIP:DMG:
+          [1649671466.310420][20969:20974] CHIP:DMG:                                         Data = "te8",
+          [1649671466.310432][20969:20974] CHIP:DMG:                         },
+          [1649671466.310446][20969:20974] CHIP:DMG:
+          [1649671466.310457][20969:20974] CHIP:DMG:                 },
+          [1649671466.310471][20969:20974] CHIP:DMG:
+          [1649671466.310481][20969:20974] CHIP:DMG:         ],
+          [1649671466.310497][20969:20974] CHIP:DMG:
+          [1649671466.310508][20969:20974] CHIP:DMG:         SuppressResponse = true,
+          [1649671466.310518][20969:20974] CHIP:DMG:         InteractionModelRevision = 1
+          [1649671466.310528][20969:20974] CHIP:DMG: }
+          [1649671466.310629][20969:20974] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3582043624
+          [1649671466.310646][20969:20974] CHIP:TOO:   NodeLabel: te8
+          [1649671466.310704][20969:20974] CHIP:EM: Sending Standalone Ack for MessageCounter:15357338 on exchange 20724i
       disabled: true
 
     - label: "DUT_CR2 reads the list of Fabrics on TH_CE"
@@ -223,30 +169,27 @@ tests:
 
           Below is the example using chip tool as controller
 
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-
-          CHIP: [DMG] }
-          [1635692672664] [30472:4578967] CHIP: [ZCL] ReadAttributesResponse:
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   ClusterId: 0x0000_003E
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   attributeId: 0x0000_0001
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   attribute TLV Type: 0x16
-          [1635692672664] [30472:4578967] CHIP: [TOO] OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635692672664] [30472:4578967] CHIP: [TOO] FabricDescriptor[1]:
-          [1635692672664] [30472:4578967] CHIP: [TOO]   fabricIndex: 1
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   RootPublicKey: 65
-          [1635692672664] [30472:4578967] CHIP: [TOO]   vendorId: 62792
-          [1635692672664] [30472:4578967] CHIP: [TOO]   fabricId: 0
-          [1635692672664] [30472:4578967] CHIP: [TOO]   nodeId: 1
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   Label:
-          [1635692672664] [30472:4578967] CHIP: [TOO] FabricDescriptor[2]:
-          [1635692672664] [30472:4578967] CHIP: [TOO]   fabricIndex: 2
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   RootPublicKey: 65
-          [1635692672664] [30472:4578967] CHIP: [TOO]   vendorId: 0
-          [1635692672664] [30472:4578967] CHIP: [TOO]   fabricId: 0
-          [1635692672664] [30472:4578967] CHIP: [TOO]   nodeId: 1
-          [1635692672664] [30472:4578967] CHIP: [ZCL]   Label:
-          [1635692672664] [30472:4578967] CHIP: [EM] Piggybacking Ack for MessageCounter:1 on exchange: 42395i
+           sudo ./chip-tool operationalcredentials read fabrics 2 0  --fabric-filtered 0
+
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507063
+          [1649245825.315152][10098:10103] CHIP:TOO:   Fabrics: 2 entries
+          [1649245825.315316][10098:10103] CHIP:TOO:     [1]: {
+          [1649245825.315370][10098:10103] CHIP:TOO:       RootPublicKey: 045541017FCEFD0D83963C9ED7F21380C6B789EB989B5D20DC318FAE92D60D0F685666505E9C4F86C49ADC71AB3A8B9B44FD43214CF9BE2B6D47DE01F28FE1544F
+          [1649245825.315436][10098:10103] CHIP:TOO:       VendorId: 65521
+          [1649245825.315479][10098:10103] CHIP:TOO:       FabricId: 1
+          [1649245825.315518][10098:10103] CHIP:TOO:       NodeId: 1
+          [1649245825.315557][10098:10103] CHIP:TOO:       Label:
+          [1649245825.315596][10098:10103] CHIP:TOO:       FabricIndex: 1
+          [1649245825.315637][10098:10103] CHIP:TOO:      }
+          [1649245825.315697][10098:10103] CHIP:TOO:     [2]: {
+          [1649245825.315747][10098:10103] CHIP:TOO:       RootPublicKey: 047D75BF7D91FCFFB29DAD375D09790FEBE9205227C44D4FF8EB70ADAD02E416E08269B9F77E86FE14270525B64C41417CEA3E9FDE0552AE8DF05F8D98B6B6E2E2
+          [1649245825.315789][10098:10103] CHIP:TOO:       VendorId: 65521
+          [1649245825.315830][10098:10103] CHIP:TOO:       FabricId: 1
+          [1649245825.315870][10098:10103] CHIP:TOO:       NodeId: 2
+          [1649245825.315908][10098:10103] CHIP:TOO:       Label:
+          [1649245825.315947][10098:10103] CHIP:TOO:       FabricIndex: 2
+          [1649245825.315986][10098:10103] CHIP:TOO:      }
       disabled: true
 
     - label:
@@ -255,147 +198,94 @@ tests:
       verification: |
           On 1st controller using chip tool, write attribute and read attribute
 
-          ./chip-tool basic write node-label te5new 1 0
+          ./chip-tool basic write node-label te8 1 0
 
           CHIP:DMG: WriteResponse =
-          [1635693016.169157][3871:3876] CHIP:DMG: {
-          [1635693016.169189][3871:3876] CHIP:DMG:         AttributeStatusList =
-          [1635693016.169227][3871:3876] CHIP:DMG:         [
-          [1635693016.169263][3871:3876] CHIP:DMG:                 AttributeStatusIB =
-          [1635693016.169312][3871:3876] CHIP:DMG:                 {
-          [1635693016.169351][3871:3876] CHIP:DMG:                         AttributePath =
-          [1635693016.169397][3871:3876] CHIP:DMG:                         {
-          [1635693016.169444][3871:3876] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635693016.169499][3871:3876] CHIP:DMG:                                 NodeId = 0x0,
-          [1635693016.169549][3871:3876] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635693016.169596][3871:3876] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635693016.169646][3871:3876] CHIP:DMG:                         }
-          [1635693016.169695][3871:3876] CHIP:DMG:
-          [1635693016.169736][3871:3876] CHIP:DMG:                         StatusIB =
-          [1635693016.169787][3871:3876] CHIP:DMG:                         {
-          [1635693016.169831][3871:3876] CHIP:DMG:                                 status = 0x0,
-          [1635693016.169877][3871:3876] CHIP:DMG:                         },
-          [1635693016.169928][3871:3876] CHIP:DMG:
-          [1635693016.169967][3871:3876] CHIP:DMG:                 },
-          [1635693016.170014][3871:3876] CHIP:DMG:
-          [1635693016.170049][3871:3876] CHIP:DMG:         ],
-          [1635693016.170092][3871:3876] CHIP:DMG:
-          [1635693016.170125][3871:3876] CHIP:DMG: }
-          [1635693016.170199][3871:3876] CHIP:ZCL: WriteResponse:
-          [1635693016.170232][3871:3876] CHIP:ZCL:   status: Success                (0x0000)
-          [1635693016.170267][3871:3876] CHIP:TOO: Default Success Response
-          [1635693016.170333][3871:3876] CHIP:DMG: WriteClient moving to [Uninitiali]
-          [1635693016.170370][3871:3876] CHIP:EM: Sending Standalone Ack for MessageCounter:1 on exchange 11798i
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
+
 
           Verify read attribute returns the updated value written
           ./chip-tool basic read node-label 1 0
 
-          CHIP:DMG: ReportData =
-          [1635693045.341772][3879:3884] CHIP:DMG: {
-          [1635693045.341805][3879:3884] CHIP:DMG:         AttributeDataList =
-          [1635693045.341843][3879:3884] CHIP:DMG:         [
-          [1635693045.341880][3879:3884] CHIP:DMG:                 AttributeDataElement =
-          [1635693045.341925][3879:3884] CHIP:DMG:                 {
-          [1635693045.341963][3879:3884] CHIP:DMG:                         AttributePath =
-          [1635693045.342006][3879:3884] CHIP:DMG:                         {
-          [1635693045.342046][3879:3884] CHIP:DMG:                                 NodeId = 0x1,
-          [1635693045.342092][3879:3884] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635693045.342142][3879:3884] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635693045.342187][3879:3884] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635693045.342238][3879:3884] CHIP:DMG:                         }
-          [1635693045.342289][3879:3884] CHIP:DMG:
-          [1635693045.342339][3879:3884] CHIP:DMG:                         Data = "te5new",
-          [1635693045.342386][3879:3884] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635693045.342429][3879:3884] CHIP:DMG:                 },
-          [1635693045.342473][3879:3884] CHIP:DMG:
-          [1635693045.342509][3879:3884] CHIP:DMG:         ],
-          [1635693045.342551][3879:3884] CHIP:DMG:
-          [1635693045.342584][3879:3884] CHIP:DMG: }
-          [1635693045.342688][3879:3884] CHIP:ZCL: ReadAttributesResponse:
-          [1635693045.342720][3879:3884] CHIP:ZCL:   ClusterId: 0x0000_0028
-          [1635693045.342756][3879:3884] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1635693045.342786][3879:3884] CHIP:ZCL:   status: Success                (0x0000)
-          [1635693045.342816][3879:3884] CHIP:ZCL:   attribute TLV Type: 0x0c
-          [1635693045.342851][3879:3884] CHIP:TOO: CharString attribute Response: te5new
-          [1635693045.343045][3879:3884] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 49307i
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
     - label:
-          "DUT_CR2 writes and reads the Basic Information Clusters NodeLabel
-          mandatory attribute of TH_CE"
+          "DUT_CR2 reads, writes and then reads the Basic Information Clusters
+          NodeLabel mandatory attribute of TH_CE"
       verification: |
-          Using your DUT controller, write attribute and read attribute to and from TH_CE
+          Using your DUT controller, read, write attribute and then read attribute to and from TH_CE
 
           Below is an example of using chip tool as controller
 
+          ./chip-tool basic read node-label 2 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
+
+
           ./chip-tool basic write node-label te5new 2 0
 
-          CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 51363i
-          [1635693100458] [30494:4580771] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 51363i
-          [1635693100458] [30494:4580771] CHIP: [DMG] WriteResponse =
-          [1635693100458] [30494:4580771] CHIP: [DMG] {
-          [1635693100458] [30494:4580771] CHIP: [DMG]         AttributeStatusList =
-          [1635693100458] [30494:4580771] CHIP: [DMG]         [
-          [1635693100458] [30494:4580771] CHIP: [DMG]                 AttributeStatusIB =
-          [1635693100458] [30494:4580771] CHIP: [DMG]                 {
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         AttributePath =
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         {
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 FieldTag = 0x0000_0005,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 NodeId = 0x0,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 ClusterId = 0x28,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         }
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         StatusIB =
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         {
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 status = 0x0,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         },
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG]                 },
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG]         ],
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG] }
-          [1635693100458] [30494:4580771] CHIP: [ZCL] WriteResponse:
-          [1635693100458] [30494:4580771] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635693100458] [30494:4580771] CHIP: [TOO] Default Success Response
-          [1635693100458] [30494:4580771] CHIP: [DMG] WriteClient moving to [Uninitiali]
-          [1635693100458] [30494:4580771] CHIP: [EM] Sending Standalone Ack for MessageCounter:1 on exchange 51363i
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
 
           Verify read attribute returns the updated value written
 
           ./chip-tool basic read node-label 2 0
 
-          CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 6848i
-          [1635693130217] [30496:4581003] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 6848i
-          [1635693130217] [30496:4581003] CHIP: [DMG] ReportData =
-          [1635693130217] [30496:4581003] CHIP: [DMG] {
-          [1635693130217] [30496:4581003] CHIP: [DMG]         AttributeDataList =
-          [1635693130217] [30496:4581003] CHIP: [DMG]         [
-          [1635693130217] [30496:4581003] CHIP: [DMG]                 AttributeDataElement =
-          [1635693130217] [30496:4581003] CHIP: [DMG]                 {
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         AttributePath =
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         {
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 NodeId = 0x1,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 ClusterId = 0x28,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 FieldTag = 0x0000_0005,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         }
-          [1635693130217] [30496:4581003] CHIP: [DMG]
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         Data = "te5new",
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         DataElementVersion = 0x0,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                 },
-          [1635693130217] [30496:4581003] CHIP: [DMG]
-          [1635693130217] [30496:4581003] CHIP: [DMG]         ],
-          [1635693130217] [30496:4581003] CHIP: [DMG]
-          [1635693130217] [30496:4581003] CHIP: [DMG] }
-          [1635693130217] [30496:4581003] CHIP: [ZCL] ReadAttributesResponse:
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   ClusterId: 0x0000_0028
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   attributeId: 0x0000_0005
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   attribute TLV Type: 0x0c
-          [1635693130218] [30496:4581003] CHIP: [TOO] CharString attribute Response: te5new
-          [1635693130218] [30496:4581003] CHIP: [EM] Piggybacking Ack for MessageCounter:1 on exchange: 6848i
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
     - label: "Turn off TH_CR1"
@@ -431,38 +321,39 @@ tests:
 
           Below is an example when using chip tool as controller
 
-          ./chip-tool administratorcommissioning revoke-commissioning 2 0
-
-          CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 55209i
-          [1635693494790] [30525:4583596] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 55209i
-          [1635693494790] [30525:4583596] CHIP: [DMG] InvokeCommand =
-          [1635693494791] [30525:4583596] CHIP: [DMG] {
-          [1635693494791] [30525:4583596] CHIP: [DMG]         CommandList =
-          [1635693494791] [30525:4583596] CHIP: [DMG]         [
-          [1635693494791] [30525:4583596] CHIP: [DMG]                 CommandDataIB =
-          [1635693494791] [30525:4583596] CHIP: [DMG]                 {
-          [1635693494791] [30525:4583596] CHIP: [DMG]                         CommandPathIB =
-          [1635693494791] [30525:4583596] CHIP: [DMG]                         {
-          [1635693494791] [30525:4583596] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635693494791] [30525:4583596] CHIP: [DMG]                                 ClusterId = 0x3c,
-          [1635693494791] [30525:4583596] CHIP: [DMG]                                 CommandId = 0x2,
-          [1635693494791] [30525:4583596] CHIP: [DMG]                         },
-          [1635693494791] [30525:4583596] CHIP: [DMG]
-          [1635693494791] [30525:4583596] CHIP: [DMG]                         StatusIB =
-          [1635693494791] [30525:4583596] CHIP: [DMG]                         {
-          [1635693494791] [30525:4583596] CHIP: [DMG]                                 status = 0x0,
-          [1635693494791] [30525:4583596] CHIP: [DMG]                         },
-          [1635693494791] [30525:4583596] CHIP: [DMG]
-          [1635693494791] [30525:4583596] CHIP: [DMG]                 },
-          [1635693494791] [30525:4583596] CHIP: [DMG]
-          [1635693494791] [30525:4583596] CHIP: [DMG]         ],
-          [1635693494791] [30525:4583596] CHIP: [DMG]
-          [1635693494791] [30525:4583596] CHIP: [DMG] }
-          [1635693494791] [30525:4583596] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0002 Status=0x0
-          [1635693494791] [30525:4583596] CHIP: [TOO] Default Success Response
-          [1635693494791] [30525:4583596] CHIP: [DMG] ICR moving to [AwaitingDe]
-          [1635693494791] [30525:4583596] CHIP: [EM] Sending Standalone Ack for MessageCounter:1 on exchange 55209i
-          [1635693494791] [30525:4583596] CHIP: [IN] Prepared encrypted message 0x16f21d008 to 0x0000000000000001 of type 0x10 and protocolId (0, 0) on exchange 55209i with MessageCounter:1.
+          /chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP: [DMG] InvokeResponseMessage =
+          [1648115245106] [6681:3894448] CHIP: [DMG] {
+          [1648115245106] [6681:3894448] CHIP: [DMG]         suppressResponse = false,
+          [1648115245106] [6681:3894448] CHIP: [DMG]         InvokeResponseIBs =
+          [1648115245106] [6681:3894448] CHIP: [DMG]         [
+          [1648115245106] [6681:3894448] CHIP: [DMG]                 InvokeResponseIB =
+          [1648115245106] [6681:3894448] CHIP: [DMG]                 {
+          [1648115245106] [6681:3894448] CHIP: [DMG]                         CommandStatusIB =
+          [1648115245106] [6681:3894448] CHIP: [DMG]                         {
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                 CommandPathIB =
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                 {
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                         EndpointId = 0x0,
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                         ClusterId = 0x3c,
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                         CommandId = 0x2,
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                 },
+          [1648115245106] [6681:3894448] CHIP: [DMG]
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                 StatusIB =
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                 {
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                         status = 0x0,
+          [1648115245106] [6681:3894448] CHIP: [DMG]                                 },
+          [1648115245106] [6681:3894448] CHIP: [DMG]
+          [1648115245106] [6681:3894448] CHIP: [DMG]                         },
+          [1648115245106] [6681:3894448] CHIP: [DMG]
+          [1648115245106] [6681:3894448] CHIP: [DMG]                 },
+          [1648115245106] [6681:3894448] CHIP: [DMG]
+          [1648115245106] [6681:3894448] CHIP: [DMG]         ],
+          [1648115245107] [6681:3894448] CHIP: [DMG]
+          [1648115245107] [6681:3894448] CHIP: [DMG]         InteractionModelRevision = 1
+          [1648115245107] [6681:3894448] CHIP: [DMG] },
+          [1648115245107] [6681:3894448] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0002 Status=0x0
       disabled: true
 
     - label:
@@ -470,7 +361,12 @@ tests:
           with TH_CE"
       verification: |
           On 3rd controller using chip-tool connect using manual code generated from 1st controller. This attempt should fail, i.e
-          ./chip-tool pairing code 1  34995354639
+          ./chip-tool pairing manualcode 1  34995354639
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label:
@@ -483,70 +379,93 @@ tests:
 
           ./chip-tool basic write node-label te5new 2 0
 
-          CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 51363i
-          [1635693100458] [30494:4580771] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 51363i
-          [1635693100458] [30494:4580771] CHIP: [DMG] WriteResponse =
-          [1635693100458] [30494:4580771] CHIP: [DMG] {
-          [1635693100458] [30494:4580771] CHIP: [DMG]         AttributeStatusList =
-          [1635693100458] [30494:4580771] CHIP: [DMG]         [
-          [1635693100458] [30494:4580771] CHIP: [DMG]                 AttributeStatusIB =
-          [1635693100458] [30494:4580771] CHIP: [DMG]                 {
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         AttributePath =
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         {
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 FieldTag = 0x0000_0005,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 NodeId = 0x0,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 ClusterId = 0x28,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         }
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         StatusIB =
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         {
-          [1635693100458] [30494:4580771] CHIP: [DMG]                                 status = 0x0,
-          [1635693100458] [30494:4580771] CHIP: [DMG]                         },
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG]                 },
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG]         ],
-          [1635693100458] [30494:4580771] CHIP: [DMG]
-          [1635693100458] [30494:4580771] CHIP: [DMG] }
-          [1635693100458] [30494:4580771] CHIP: [ZCL] WriteResponse:
-          [1635693100458] [30494:4580771] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635693100458] [30494:4580771] CHIP: [TOO] Default Success Response
-          [1635693100458] [30494:4580771] CHIP: [DMG] WriteClient moving to [Uninitiali]
-          [1635693100458] [30494:4580771] CHIP: [EM] Sending Standalone Ack for MessageCounter:1 on exchange 51363i
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
 
           Verify read attribute returns the updated value written
 
-          ./chip-tool basic read user-label 2 0
-
-          CHIP: [EM] Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 6848i
-          [1635693130217] [30496:4581003] CHIP: [EM] Removed CHIP MessageCounter:0 from RetransTable on exchange 6848i
-          [1635693130217] [30496:4581003] CHIP: [DMG] ReportData =
-          [1635693130217] [30496:4581003] CHIP: [DMG] {
-          [1635693130217] [30496:4581003] CHIP: [DMG]         AttributeDataList =
-          [1635693130217] [30496:4581003] CHIP: [DMG]         [
-          [1635693130217] [30496:4581003] CHIP: [DMG]                 AttributeDataElement =
-          [1635693130217] [30496:4581003] CHIP: [DMG]                 {
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         AttributePath =
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         {
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 NodeId = 0x1,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 EndpointId = 0x0,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 ClusterId = 0x28,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                                 FieldTag = 0x0000_0005,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         }
-          [1635693130217] [30496:4581003] CHIP: [DMG]
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         Data = "te5new",
-          [1635693130217] [30496:4581003] CHIP: [DMG]                         DataElementVersion = 0x0,
-          [1635693130217] [30496:4581003] CHIP: [DMG]                 },
-          [1635693130217] [30496:4581003] CHIP: [DMG]
-          [1635693130217] [30496:4581003] CHIP: [DMG]         ],
-          [1635693130217] [30496:4581003] CHIP: [DMG]
-          [1635693130217] [30496:4581003] CHIP: [DMG] }
-          [1635693130217] [30496:4581003] CHIP: [ZCL] ReadAttributesResponse:
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   ClusterId: 0x0000_0028
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   attributeId: 0x0000_0005
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   status: Success                (0x0000)
-          [1635693130217] [30496:4581003] CHIP: [ZCL]   attribute TLV Type: 0x0c
-          [1635693130218] [30496:4581003] CHIP: [TOO] CharString attribute Response: te5new
-          [1635693130218] [30496:4581003] CHIP: [EM] Piggybacking Ack for MessageCounter:1 on exchange: 6848i
+          ./chip-tool basic read node-label 2 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
+      disabled: true
+
+    - label: "DUT_CR2 opens a commissioning window on TH_CE using ECM"
+      verification: |
+          1. Using your DUT controller open commissioning window using ECM
+
+          Below is an example when using chip tool as controller
+          ./chip-tool pairing open-commissionig-window 2 1 300 1000 3840
+
+          CHIP: [IN] Prepared encrypted message 0x124012e80 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 50829i with MessageCounter:0.
+          [1635693418549] [30519:4583024] CHIP: [IN] Sending encrypted msg 0x124012e80 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5995099243 msec
+          [1635693418549] [30519:4583024] CHIP: [DMG] ICR moving to [CommandSen]
+          [1635693418549] [30519:4583024] CHIP: [CTL] Manual pairing code: [34995354639]
+          [1635693418550] [30519:4583024] CHIP: [CTL] SetupQRCode: [MT:00000CQM00YND84XX10]
+          [1635693418550] [30519:4583024] CHIP: [EM] Sending Standalone Ack for MessageCounter:3441918415 on exchange 50828i
+          [1635693418550] [30519:4583024] CHIP: [IN] Prepared plaintext message 0x16b92d198 to 0x0000000000000000 of type 0x10 and protocolId (0, 0) on exchange 50828i with MessageCounter:3727034150.
+          [1635693418550] [30519:4583024] CHIP: [IN] Sending plaintext msg 0x16b92d198 with Mes
+      disabled: true
+
+    - label:
+          "Wait for commissioning window that was opened in step 13 to timeout"
+      verification: |
+          Wait for the timeout of commissioning window in the above step
+      disabled: true
+
+    - label: "DUT_CR2 opens a commissioning window on TH_CE using ECM"
+      verification: |
+          1. Using your DUT controller open commissioning window using ECM
+
+          Below is an example when using chip tool as controller
+          ./chip-tool pairing open-commissionig-window 2 1 300 1000 3840
+
+          CHIP: [IN] Prepared encrypted message 0x124012e80 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 50829i with MessageCounter:0.
+          [1635693418549] [30519:4583024] CHIP: [IN] Sending encrypted msg 0x124012e80 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5995099243 msec
+          [1635693418549] [30519:4583024] CHIP: [DMG] ICR moving to [CommandSen]
+          [1635693418549] [30519:4583024] CHIP: [CTL] Manual pairing code: [34995354639]
+          [1635693418550] [30519:4583024] CHIP: [CTL] SetupQRCode: [MT:00000CQM00YND84XX10]
+          [1635693418550] [30519:4583024] CHIP: [EM] Sending Standalone Ack for MessageCounter:3441918415 on exchange 50828i
+          [1635693418550] [30519:4583024] CHIP: [IN] Prepared plaintext message 0x16b92d198 to 0x0000000000000000 of type 0x10 and protocolId (0, 0) on exchange 50828i with MessageCounter:3727034150.
+          [1635693418550] [30519:4583024] CHIP: [IN] Sending plaintext msg 0x16b92d198 with Mes
+      disabled: true
+
+    - label:
+          "TH_CR1 starts a commissioning process with TH_CE before the timeout
+          from step 15"
+      verification: |
+          On 1st controller, using chip-tool connect using manual code.
+          Below is the example when using chip tool as controller (considering 34995354639 as the manual code generated by DUT)
+          ./chip-tool pairing manualcode 2 34995354639
+
+          [1651786200275] [36301:315544] CHIP: [DMG] Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651786200275] [36301:315544] CHIP: [CTL] Device returned status 9 on receiving the NOC
+          [1651786200275] [36301:315544] CHIP: [CTL] Add NOC failed with error ../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists
+          [1651786200275] [36301:315544] CHIP: [CTL] Error on commissioning step 'SendNOC': '../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists'
+
+          Verify that the commissioning process fails as TH_CE was already commissioned by TH_CR1 in step 1
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_10.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_10.yaml
index af86c1cb5ed809..a951ea5f4e3d42 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_10.yaml
@@ -18,63 +18,377 @@ name:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic"
+    timeout: 700
+    nodeIdForDuplicateCommissioning:
+        type: NODE_ID
+        defaultValue: 0x11
+    nodeId2:
+        type: NODE_ID
+        defaultValue: 0xCAFE
+    nodeId3:
+        type: NODE_ID
+        defaultValue: 0xC00FEE
     endpoint: 0
+    discriminator:
+        type: INT16U
+        defaultValue: 3840
+    payload:
+        type: CHAR_STRING
+        defaultValue: "MT:0000000000I31506010"
+    payload2:
+        type: CHAR_STRING
+        defaultValue: "MT:0000000000I.0648G00"
 
 tests:
+    - label: "Reboot target device"
+      cluster: "SystemCommands"
+      command: "Reboot"
+      arguments:
+          values:
+              - name: "discriminator"
+                value: discriminator
+
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
-      verification: |
-          1. Provision the device using 1st python controller on the raspi (use above instructions)
-      disabled: true
-
-    - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT_COMM_WIN seconds using BCM"
-      verification: |
-          On 1st controller using chip tool, open commissioning window using BCM
-
-          ./chip-tool administratorcommissioning  open-basic-commissioning-window 500 1 0
-
-
-          [1635871562.958905][4336:4341] CHIP:DMG: InvokeCommand =
-          [1635871562.958976][4336:4341] CHIP:DMG: {
-          [1635871562.959031][4336:4341] CHIP:DMG:         CommandList =
-          [1635871562.959095][4336:4341] CHIP:DMG:         [
-          [1635871562.959161][4336:4341] CHIP:DMG:                 CommandDataIB =
-          [1635871562.959225][4336:4341] CHIP:DMG:                 {
-          [1635871562.959290][4336:4341] CHIP:DMG:                         CommandPathIB =
-          [1635871562.959368][4336:4341] CHIP:DMG:                         {
-          [1635871562.959434][4336:4341] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635871562.959530][4336:4341] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635871562.959625][4336:4341] CHIP:DMG:                                 CommandId = 0x1,
-          [1635871562.959698][4336:4341] CHIP:DMG:                         },
-          [1635871562.959776][4336:4341] CHIP:DMG:
-          [1635871562.959841][4336:4341] CHIP:DMG:                         StatusIB =
-          [1635871562.959911][4336:4341] CHIP:DMG:                         {
-          [1635871562.959980][4336:4341] CHIP:DMG:                                 status = 0x0,
-          [1635871562.960064][4336:4341] CHIP:DMG:                         },
-          [1635871562.960313][4336:4341] CHIP:DMG:
-          [1635871562.960459][4336:4341] CHIP:DMG:                 },
-          [1635871562.960544][4336:4341] CHIP:DMG:
-          [1635871562.960604][4336:4341] CHIP:DMG:         ],
-          [1635871562.960668][4336:4341] CHIP:DMG:
-          [1635871562.960723][4336:4341] CHIP:DMG: }
-          [1635871562.960824][4336:4341] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1635871562.960894][4336:4341] CHIP:TOO: Default Success Response
-      disabled: true
-
-    - label:
-          "Set up a TH_CR2 to start attempting to do PASE to DUT_CE and failing
-          20 times. This can be done using an invalid passcode"
-      verification: |
-          On 2nd controller, using chip-tool connect using wrong passcode. Repeat the step for 20 times.
-
-          ./chip-tool pairing onnetwork 1 20202019  (With wrong passcode)
-      disabled: true
-
-    - label: "TH_CR2 starts a 21st commissioning process"
-      verification: |
-          On 2nd controller, using chip tool connect using correct passcode.
-
-          ./chip-tool pairing onnetwork 1 20202021 (correct passcode)
-      disabled: true
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH_CR1 opens a commissioning window on DUT_CE"
+      cluster: "AdministratorCommissioning"
+      command: "OpenBasicCommissioningWindow"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "CommissioningTimeout"
+                value: 180
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label: "TH_CR3 starts a commissioning process with DUT_CE"
+      identity: "gamma"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId3
+              - name: "payload"
+                value: payload
+      response:
+          error: FAILURE
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_11.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_11.yaml
index d3fabd00c6f5fc..2859225e130e9b 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_11.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    22.1.11. [TC-MF-1.11] Device exits commissioning mode after 20 failed
+    3.1.11. [TC-MF-1.11] Device exits commissioning mode after 20 failed
     commission attempts [ECM] [DUT - Commissioner]
 
 config:
@@ -25,7 +25,7 @@ config:
 tests:
     - label: "TH_CR2 starts a commissioning process with TH_CE"
       verification: |
-          1. Provision the device using 2nd controller chip tool on the raspi (use above instructions) ,
+          "1. Provision the device using 2nd controller chip tool on the raspi (use above instructions) ,  "
       disabled: true
 
     - label:
@@ -66,17 +66,40 @@ tests:
           "Set up a DUT_CR1 to start attempting to do PASE to TH_CE and failing
           20 times. This can be done using an invalid passcode"
       verification: |
-          1. On your DUT controller connect using wrong manual code. Repeat the step for 20 times.
+          1. On 2nd controller using chip-tool connect using wrong manual code. Repeat the step for 20 times.
 
-          Below the example when using chip tool as controller
-          ./chip-tool pairing code 1 36177160937  (With wrong passcode)
+          ./chip-tool pairing manualcode 1 36177160938  (With wrong manual code)
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
 
-    - label: "DUT_CR1 starts a 21st commissioning process with a valid passcode"
+    - label:
+          "DUT_CR1 starts a 21st commissioning process using a commissioning
+          timeout of PIXIT_COMM_WIN seconds using ECM"
+      verification: |
+          1. On 2nd controller using chip tool connect using correct passcode.
+
+          ./chip-tool pairing manualcode 1 36177160937 (correct passcode)
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
+      disabled: true
+
+    - label:
+          "TH_CR3 starts a commissioning process with TH_CE using the correct
+          PAKEVerifier"
       verification: |
-          1. On your DUT controller  connect using correct manual code
+          1. On 3rdd controller using chip-tool connect using correct passcode
 
-          Below the example when using chip tool as controller
+          ./chip-tool pairing manualcode 1 36177160938  (With wrong manual code)
 
-          ./chip-tool pairing code 1 35407541839 (correct passcode)
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_12.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_12.yaml
index cd78f991167c22..4b7f00242f2dc3 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_12.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    22.1.12. [TC-MF-1.12] Device exits commissioning mode after 20 failed
+    3.1.12. [TC-MF-1.12] Device exits commissioning mode after 20 failed
     commission attempts [BCM] [DUT - Commissioner]
 
 config:
@@ -25,7 +25,7 @@ config:
 tests:
     - label: "TH_CR2 starts a commissioning process with TH_CE"
       verification: |
-          1. Provision the device using 2nd controller chip tool on the raspi (use above instructions)
+          "1. Provision the device using 2nd controller chip tool on the raspi (use above instructions)
       disabled: true
 
     - label:
@@ -34,51 +34,80 @@ tests:
       verification: |
           On the 2nd controller using chip tool, open commissioning window using BCM
 
-          ./chip-tool  administratorcommissioning open-basic-commissioning-window 500 2 0
-
-          [1635871562.958905][4336:4341] CHIP:DMG: InvokeCommand =
-          [1635871562.958976][4336:4341] CHIP:DMG: {
-          [1635871562.959031][4336:4341] CHIP:DMG:         CommandList =
-          [1635871562.959095][4336:4341] CHIP:DMG:         [
-          [1635871562.959161][4336:4341] CHIP:DMG:                 CommandDataIB =
-          [1635871562.959225][4336:4341] CHIP:DMG:                 {
-          [1635871562.959290][4336:4341] CHIP:DMG:                         CommandPathIB =
-          [1635871562.959368][4336:4341] CHIP:DMG:                         {
-          [1635871562.959434][4336:4341] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635871562.959530][4336:4341] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635871562.959625][4336:4341] CHIP:DMG:                                 CommandId = 0x1,
-          [1635871562.959698][4336:4341] CHIP:DMG:                         },
-          [1635871562.959776][4336:4341] CHIP:DMG:
-          [1635871562.959841][4336:4341] CHIP:DMG:                         StatusIB =
-          [1635871562.959911][4336:4341] CHIP:DMG:                         {
-          [1635871562.959980][4336:4341] CHIP:DMG:                                 status = 0x0,
-          [1635871562.960064][4336:4341] CHIP:DMG:                         },
-          [1635871562.960313][4336:4341] CHIP:DMG:
-          [1635871562.960459][4336:4341] CHIP:DMG:                 },
-          [1635871562.960544][4336:4341] CHIP:DMG:
-          [1635871562.960604][4336:4341] CHIP:DMG:         ],
-          [1635871562.960668][4336:4341] CHIP:DMG:
-          [1635871562.960723][4336:4341] CHIP:DMG: }
-          [1635871562.960824][4336:4341] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1635871562.960894][4336:4341] CHIP:TOO: Default Success Response
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
           "Set up a DUT_CR1 to start attempting to do PASE to TH_CE and failing
           20 times. This can be done using an invalid passcode"
       verification: |
-          1. On your DUT controller connect using wrong passcode. Repeat the step for 20 times.
+          On 2nd controller, using chip-tool connect using wrong passcode. Repeat the step for 20 times.
 
-          Below the example when using chip tool as controller
+          ./chip-tool pairing onnetwork 1 20202019  (With wrong passcode)
 
-          ./chip-tool pairing onnetwork 1 20202019 (With wrong passcode)
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
 
-    - label: "DUT_CR1 starts a 21st commissioning process with a valid passcode"
+    - label:
+          "DUT_CR1 starts a 21st commissioning process using a commissioning
+          timeout of PIXIT_COMM_WIN seconds using BCM"
       verification: |
-          1. On your DUT controller  connect using IP address and correct passcode.
-
-          Below the example when using chip tool as controller
+          On 2nd controller, using chip tool connect using correct passcode.
 
           ./chip-tool pairing onnetwork 1 20202021 (correct passcode)
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
+      disabled: true
+
+    - label:
+          "TH_CR3 starts a commissioning process with TH_CE using the correct
+          PAKEVerifier"
+      verification: |
+          1. On 3rd controller using chip-tool connect using correct passcode
+
+          ./chip-tool pairing onnetwork 1 20202021
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_13.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_13.yaml
index 324f777a9043db..0e5831bc92f664 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_13.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    22.1.13. [TC-MF-1.13] Open commissioning window on DUT twice using ECM then
+    3.1.13. [TC-MF-1.13] Open commissioning window on DUT twice using ECM then
     BCM [DUT - Commissionee]
 
 config:
@@ -25,12 +25,14 @@ config:
 tests:
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
       verification: |
-          1. Provision the device using 1st controller chip tool on the raspi (use above instructions) ,
+          "1. Provision the device using 1st controller chip tool on the raspi (use above instructions) ,
+          "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using ECM and TH_CR3
-          Commissions with DUT_CE"
+          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
+          timeout of PIXIT_COMM_WIN seconds using ECM and TH_CR3 Commissions
+          with DUT_CE"
       verification: |
           On the 1st controller using chip tool, open commissioning window using ECM
 
@@ -51,12 +53,34 @@ tests:
 
           1. On 3rd controller using chip tool connect using manual code
 
-          ./chip-tool pairing code 1 35484132896
+          ./chip-tool pairing manualcode 1 35484132896
+
+          Verify you got below message
+          Device commissioning completed with success
+      disabled: true
+
+    - label: "DNS-SD records shows DUT_CE advertising"
+      verification: |
+          grl@grl-ThinkPad-L480:~/2nd_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
+          + wlp5s0 IPv6 C326228BDB082BF4                              _matterc._udp        local
+          + wlp5s0 IPv6 7B6545A75C5330BE                              _matterc._udp        local
+          = wlp5s0 IPv6 7B6545A75C5330BE                              _matterc._udp        local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2755]
+             port = [5540]
+             txt = ["PI=" "PH=33" "CM=1" "D=3841" "T=1" "CRA=300" "CRI=5000" "VP=65521+32769"]
+          = wlp5s0 IPv6 C326228BDB082BF4                              _matterc._udp        local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2755]
+             port = [5540]
+             txt = ["PI=" "PH=36" "CM=2" "D=3840" "T=1" "CRA=300" "CRI=5000" "VP=65521+32769"]
+          grl@grl-ThinkPad-L480:~/2nd_cntrl/connectedhomeip/examples/chip-tool/out/debug$
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using ECM and TH_CR2
-          Commissions with DUT_CE"
+          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
+          timeout of PIXIT_COMM_WIN seconds using ECM and TH_CR2 Commissions
+          with DUT_CE"
       verification: |
           On the 1st controller using chip tool, open commissioning window using ECM
 
@@ -77,7 +101,10 @@ tests:
 
           1. On 2nd controller using chip tool connect using manual code
 
-          ./chip-tool pairing code 1 35484132896
+          ./chip-tool pairing manualcode 1 35484132896
+
+          Verify you got below message
+          Device commissioning completed with success
       disabled: true
 
     - label:
@@ -102,87 +129,86 @@ tests:
       disabled: true
 
     - label:
-          "Before the expiration of PIXIT_COMM_WIN seconds, TH_CR1 opens a 2nd
-          commissioning window on DUT_CE using a commissioning timeout of
-          PIXIT_COMM_WIN seconds using ECM"
+          "Before the expiration of PIXIT_COMM_WIN seconds which was set in step
+          5, TH_CR1 opens a 2nd commissioning window on DUT_CE using a
+          commissioning timeout of PIXIT_COMM_WIN seconds using ECM"
       verification: |
           Before the timer expiry, on the 1st controller using chip tool, open commissioning window using ECM. Verify the General code return error 1
 
 
           ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650527291.952055][8566:8571] CHIP:DMG: {
+          [1650527291.952074][8566:8571] CHIP:DMG: 	suppressResponse = false,
+          [1650527291.952091][8566:8571] CHIP:DMG: 	InvokeResponseIBs =
+          [1650527291.952116][8566:8571] CHIP:DMG: 	[
+          [1650527291.952134][8566:8571] CHIP:DMG: 		InvokeResponseIB =
+          [1650527291.952172][8566:8571] CHIP:DMG: 		{
+          [1650527291.952195][8566:8571] CHIP:DMG: 			CommandStatusIB =
+          [1650527291.952220][8566:8571] CHIP:DMG: 			{
+          [1650527291.952245][8566:8571] CHIP:DMG: 				CommandPathIB =
+          [1650527291.952276][8566:8571] CHIP:DMG: 				{
+          [1650527291.952303][8566:8571] CHIP:DMG: 					EndpointId = 0x0,
+          [1650527291.952334][8566:8571] CHIP:DMG: 					ClusterId = 0x3c,
+          [1650527291.952369][8566:8571] CHIP:DMG: 					CommandId = 0x0,
+          [1650527291.952394][8566:8571] CHIP:DMG: 				},
+          [1650527291.952431][8566:8571] CHIP:DMG:
+          [1650527291.952458][8566:8571] CHIP:DMG: 				StatusIB =
+          [1650527291.952488][8566:8571] CHIP:DMG: 				{
+          [1650527291.952519][8566:8571] CHIP:DMG: 					status = 0x01 (FAILURE),
+          [1650527291.952555][8566:8571] CHIP:DMG: 					cluster-status = 0x1,
+          [1650527291.952578][8566:8571] CHIP:DMG: 				},
+          [1650527291.952612][8566:8571] CHIP:DMG:
+          [1650527291.952634][8566:8571] CHIP:DMG: 			},
+          [1650527291.952671][8566:8571] CHIP:DMG:
+          [1650527291.952694][8566:8571] CHIP:DMG: 		},
+          [1650527291.952731][8566:8571] CHIP:DMG:
+          [1650527291.952751][8566:8571] CHIP:DMG: 	],
+          [1650527291.952781][8566:8571] CHIP:DMG:
+          [1650527291.952795][8566:8571] CHIP:DMG: 	InteractionModelRevision = 1
+          [1650527291.952807][8566:8571] CHIP:DMG: },
+          [1650527291.952886][8566:8571] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0000 Status=0x1
+          [1650527291.952931][8566:8571] CHIP:CTL: Failed to open pairing window on the device. Status IM Error 0x00000601: Cluster-specific error: 0x01
       disabled: true
 
     - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
       verification: |
           On 1st controller using chip tool, read fabrics list
 
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-
-          [1635874880.498519][4577:4582] CHIP:DMG: ReportData =
-          [1635874880.498558][4577:4582] CHIP:DMG: {
-          [1635874880.498587][4577:4582] CHIP:DMG:         AttributeDataList =
-          [1635874880.498622][4577:4582] CHIP:DMG:         [
-          [1635874880.498654][4577:4582] CHIP:DMG:                 AttributeDataElement =
-          [1635874880.498695][4577:4582] CHIP:DMG:                 {
-          [1635874880.498734][4577:4582] CHIP:DMG:                         AttributePath =
-          [1635874880.498783][4577:4582] CHIP:DMG:                         {
-          [1635874880.498827][4577:4582] CHIP:DMG:                                 NodeId = 0x1,
-          [1635874880.498874][4577:4582] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635874880.498923][4577:4582] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635874880.498995][4577:4582] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635874880.499070][4577:4582] CHIP:DMG:                         }
-          [1635874880.499148][4577:4582] CHIP:DMG:
-          [1635874880.499200][4577:4582] CHIP:DMG:                         Data = [
-          [1635874880.499252][4577:4582] CHIP:DMG:
-          [1635874880.499305][4577:4582] CHIP:DMG:                                 {
-          [1635874880.499369][4577:4582] CHIP:DMG:                                         0x0 = 1,
-          [1635874880.499429][4577:4582] CHIP:DMG:                                         0x1 = [
-          [1635874880.499514][4577:4582] CHIP:DMG:                                                 0x4, 0x9e, 0x26, 0x54, 0x2, 0x45, 0x18, 0xca, 0x68, 0x9c, 0xa0, 0x77, 0xef, 0xb4, 0x37, 0x0, 0xce, 0xb7, 0x15, 0x8d, 0x4a, 0xc7, 0x6a, 0x67, 0x31, 0xf2, 0xba, 0x52, 0x8f, 0xb9, 0xfd, 0x93, 0xed, 0xc0, 0xdc, 0xce, 0xf7, 0x9d, 0x3, 0x3b, 0xc8, 0x63, 0
-          [1635874880.499583][4577:4582] CHIP:DMG:                                         ]
-          [1635874880.499656][4577:4582] CHIP:DMG:                                         0x2 = 30024,
-          [1635874880.499726][4577:4582] CHIP:DMG:                                         0x3 = 0,
-          [1635874880.499798][4577:4582] CHIP:DMG:                                         0x4 = 1,
-          [1635874880.499854][4577:4582] CHIP:DMG:                                         0x5 = "",
-          [1635874880.499912][4577:4582] CHIP:DMG:                                 },
-          [1635874880.499967][4577:4582] CHIP:DMG:                                 {
-          [1635874880.500024][4577:4582] CHIP:DMG:                                         0x0 = 2,
-          [1635874880.500082][4577:4582] CHIP:DMG:                                         0x1 = [
-          [1635874880.500165][4577:4582] CHIP:DMG:                                                 0x4, 0x5b, 0x93, 0x38, 0xab, 0x50, 0x6, 0x85, 0xc0, 0x50, 0xfe, 0x7d, 0x6c, 0xeb, 0x9d, 0xbd, 0x55, 0x90, 0x5e, 0x4f, 0x54, 0xed, 0x94, 0x21, 0xc0, 0x8d, 0x9d, 0x4f, 0x60, 0x48, 0xdb, 0x38, 0x4a, 0xf4, 0xe2, 0xa3, 0xf9, 0xd0, 0x55, 0xd5, 0x63, 0xd0,
-          [1635874880.500243][4577:4582] CHIP:DMG:                                         ]
-          [1635874880.500315][4577:4582] CHIP:DMG:                                         0x2 = 45896,
-          [1635874880.500384][4577:4582] CHIP:DMG:                                         0x3 = 0,
-          [1635874880.500450][4577:4582] CHIP:DMG:                                         0x4 = 2,
-          [1635874880.500504][4577:4582] CHIP:DMG:                                         0x5 = "",
-          [1635874880.500562][4577:4582] CHIP:DMG:                                 },
-          [1635874880.500619][4577:4582] CHIP:DMG:                         ],
-          [1635874880.500671][4577:4582] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635874880.500722][4577:4582] CHIP:DMG:                 },
-          [1635874880.500794][4577:4582] CHIP:DMG:
-          [1635874880.500838][4577:4582] CHIP:DMG:         ],
-          [1635874880.500902][4577:4582] CHIP:DMG:
-          [1635874880.500945][4577:4582] CHIP:DMG: }
-          [1635874880.501124][4577:4582] CHIP:ZCL: ReadAttributesResponse:
-          [1635874880.501165][4577:4582] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635874880.501209][4577:4582] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635874880.501250][4577:4582] CHIP:ZCL:   status: Success                (0x0000)
-          [1635874880.501285][4577:4582] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635874880.501348][4577:4582] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635874880.501510][4577:4582] CHIP:TOO: FabricDescriptor[1]:
-          [1635874880.501556][4577:4582] CHIP:TOO:   fabricIndex: 1
-          [1635874880.501594][4577:4582] CHIP:ZCL:   RootPublicKey: 65
-          [1635874880.501632][4577:4582] CHIP:TOO:   vendorId: 30024
-          [1635874880.501666][4577:4582] CHIP:TOO:   fabricId: 0
-          [1635874880.501703][4577:4582] CHIP:TOO:   nodeId: 1
-          [1635874880.501739][4577:4582] CHIP:ZCL:   Label:
-          [1635874880.501792][4577:4582] CHIP:TOO: FabricDescriptor[2]:
-          [1635874880.501832][4577:4582] CHIP:TOO:   fabricIndex: 2
-          [1635874880.501865][4577:4582] CHIP:ZCL:   RootPublicKey: 65
-          [1635874880.501902][4577:4582] CHIP:TOO:   vendorId: 45896
-          [1635874880.501943][4577:4582] CHIP:TOO:   fabricId: 0
-          [1635874880.501980][4577:4582] CHIP:TOO:   nodeId: 2
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 268962768
+          [1650527361.425870][15792:15797] CHIP:TOO:   Fabrics: 3 entries
+          [1650527361.426777][15792:15797] CHIP:TOO:     [1]: {
+          [1650527361.426859][15792:15797] CHIP:TOO:       RootPublicKey: 0429A71383F336D80918C9EC655112513E428C073AF7FB44820EC793535302C6E3825C56EE6DD1A683EAA7B59E3F261B46FFA24A6D911E8D88839F4C1B3C84BA01
+          [1650527361.426923][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.426979][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427033][15792:15797] CHIP:TOO:       NodeId: 1
+          [1650527361.427088][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427166][15792:15797] CHIP:TOO:       FabricIndex: 1
+          [1650527361.427376][15792:15797] CHIP:TOO:      }
+          [1650527361.427464][15792:15797] CHIP:TOO:     [2]: {
+          [1650527361.427532][15792:15797] CHIP:TOO:       RootPublicKey: 04781BCEE70118049ED61DD5B4E401CF1A09D2F78AE7F5770BE5506AD24238E5E0777277DABAFD062659651C95CC2CA7DEAACE40DB579A946CC07CADB141BE05D7
+          [1650527361.427595][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.427649][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427703][15792:15797] CHIP:TOO:       NodeId: 3
+          [1650527361.427756][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427811][15792:15797] CHIP:TOO:       FabricIndex: 2
+          [1650527361.427868][15792:15797] CHIP:TOO:      }
+          [1650527361.427943][15792:15797] CHIP:TOO:     [3]: {
+          [1650527361.428008][15792:15797] CHIP:TOO:       RootPublicKey: 0403EDB5B461030A34EF7EA2F9DB0D46A36185E4755C365AF9344C4959F049EF21D55EAB903A2C7FBFC305EEFA42989250D7517A73E6156062390A60C0D4C41EBD
+          [1650527361.428067][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.428122][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.428176][15792:15797] CHIP:TOO:       NodeId: 2
+          [1650527361.428229][15792:15797] CHIP:TOO:       Label:
+          [1650527361.428282][15792:15797] CHIP:TOO:       FabricIndex: 3
+          [1650527361.428335][15792:15797] CHIP:TOO:      }
       disabled: true
 
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
+    - label:
+          "Wait for the expiration of PIXIT_COMM_WIN seconds that was set in
+          step 6"
       verification: |
           Wait for the expiration of PIXIT_COMM_WIN seconds
       disabled: true
@@ -193,20 +219,99 @@ tests:
       verification: |
           On the 1st controller using chip tool, open commissioning window using BCM
 
-          ./chip-tool  administratorcommissioning open-basic-commissioning-window 500 1 0
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label: "DNS-SD records shows DUT_CE advertising"
+      verification: |
+          ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
+          +   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
+          =   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
+          ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$
       disabled: true
 
     - label:
-          "Before the expiration of PIXIT_COMM_WIN seconds, TH_CR3 opens a 2nd
-          commissioning window on DUT_CE using a commissioning timeout of
-          PIXIT_COMM_WIN seconds using BCM"
+          "Before the expiration of PIXIT_COMM_WIN seconds that was set in step
+          9, TH_CR3 opens a 2nd commissioning window on DUT_CE using a
+          commissioning timeout of PIXIT_COMM_WIN seconds using BCM"
       verification: |
           On the 3rd controller using chip tool, open commissioning window using BCM before the timer expiry of the above step
 
-          ./chip-tool pairing administratorcommissioning open-basic-commissioning-window 500 1 0
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 3 0 --timedInteractionTimeoutMs 1000
+
+           CHIP:DMG: InvokeResponseMessage =
+          [1650527565.990404][24618:24623] CHIP:DMG: {
+          [1650527565.990476][24618:24623] CHIP:DMG:         suppressResponse = false,
+          [1650527565.990528][24618:24623] CHIP:DMG:         InvokeResponseIBs =
+          [1650527565.990615][24618:24623] CHIP:DMG:         [
+          [1650527565.990667][24618:24623] CHIP:DMG:                 InvokeResponseIB =
+          [1650527565.990755][24618:24623] CHIP:DMG:                 {
+          [1650527565.990816][24618:24623] CHIP:DMG:                         CommandStatusIB =
+          [1650527565.990900][24618:24623] CHIP:DMG:                         {
+          [1650527565.990967][24618:24623] CHIP:DMG:                                 CommandPathIB =
+          [1650527565.991042][24618:24623] CHIP:DMG:                                 {
+          [1650527565.991112][24618:24623] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650527565.991186][24618:24623] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650527565.991257][24618:24623] CHIP:DMG:                                         CommandId = 0x1,
+          [1650527565.991332][24618:24623] CHIP:DMG:                                 },
+          [1650527565.991441][24618:24623] CHIP:DMG:
+          [1650527565.991505][24618:24623] CHIP:DMG:                                 StatusIB =
+          [1650527565.991574][24618:24623] CHIP:DMG:                                 {
+          [1650527565.991645][24618:24623] CHIP:DMG:                                         status = 0x01 (FAILURE),
+          [1650527565.991743][24618:24623] CHIP:DMG:                                         cluster-status = 0x1,
+          [1650527565.991830][24618:24623] CHIP:DMG:                                 },
+          [1650527565.991918][24618:24623] CHIP:DMG:
+          [1650527565.991976][24618:24623] CHIP:DMG:                         },
+          [1650527565.992061][24618:24623] CHIP:DMG:
+          [1650527565.992116][24618:24623] CHIP:DMG:                 },
+          [1650527565.992202][24618:24623] CHIP:DMG:
+          [1650527565.992253][24618:24623] CHIP:DMG:         ],
+          [1650527565.992316][24618:24623] CHIP:DMG:
+          [1650527565.992365][24618:24623] CHIP:DMG:         InteractionModelRevision = 1
+          [1650527565.992414][24618:24623] CHIP:DMG: },
+          [1650527565.992535][24618:24623] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x1
+          [1650527565.992601][24618:24623] CHIP:TOO: Error: IM Error 0x00000601: Cluster-specific error: 0x01
       disabled: true
 
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
+    - label:
+          "Wait for the expiration of PIXIT_COMM_WIN seconds that was set in
+          step 11"
       verification: |
           Wait for the expiration of PIXIT_COMM_WIN seconds
       disabled: true
@@ -215,70 +320,34 @@ tests:
       verification: |
           On 1st controller using chip tool, read fabrics list
 
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-
-          [1635875084.555953][4590:4595] CHIP:DMG: ReportData =
-          [1635875084.555986][4590:4595] CHIP:DMG: {
-          [1635875084.556021][4590:4595] CHIP:DMG:         AttributeDataList =
-          [1635875084.556059][4590:4595] CHIP:DMG:         [
-          [1635875084.556105][4590:4595] CHIP:DMG:                 AttributeDataElement =
-          [1635875084.556141][4590:4595] CHIP:DMG:                 {
-          [1635875084.556179][4590:4595] CHIP:DMG:                         AttributePath =
-          [1635875084.556216][4590:4595] CHIP:DMG:                         {
-          [1635875084.556263][4590:4595] CHIP:DMG:                                 NodeId = 0x1,
-          [1635875084.556304][4590:4595] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635875084.556359][4590:4595] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635875084.556408][4590:4595] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635875084.556457][4590:4595] CHIP:DMG:                         }
-          [1635875084.556509][4590:4595] CHIP:DMG:
-          [1635875084.556553][4590:4595] CHIP:DMG:                         Data = [
-          [1635875084.556597][4590:4595] CHIP:DMG:
-          [1635875084.556642][4590:4595] CHIP:DMG:                                 {
-          [1635875084.556698][4590:4595] CHIP:DMG:                                         0x0 = 1,
-          [1635875084.556752][4590:4595] CHIP:DMG:                                         0x1 = [
-          [1635875084.556819][4590:4595] CHIP:DMG:                                                 0x4, 0x9e, 0x26, 0x54, 0x2, 0x45, 0x18, 0xca, 0x68, 0x9c, 0xa0, 0x77, 0xef, 0xb4, 0x37, 0x0, 0xce, 0xb7, 0x15, 0x8d, 0x4a, 0xc7, 0x6a, 0x67, 0x31, 0xf2, 0xba, 0x52, 0x8f, 0xb9, 0xfd, 0x93, 0xed, 0xc0, 0xdc, 0xce, 0xf7, 0x9d, 0x3, 0x3b, 0xc8, 0x63, 0
-          [1635875084.556875][4590:4595] CHIP:DMG:                                         ]
-          [1635875084.556933][4590:4595] CHIP:DMG:                                         0x2 = 30024,
-          [1635875084.556975][4590:4595] CHIP:DMG:                                         0x3 = 0,
-          [1635875084.557022][4590:4595] CHIP:DMG:                                         0x4 = 1,
-          [1635875084.557070][4590:4595] CHIP:DMG:                                         0x5 = "",
-          [1635875084.557116][4590:4595] CHIP:DMG:                                 },
-          [1635875084.557168][4590:4595] CHIP:DMG:                                 {
-          [1635875084.557237][4590:4595] CHIP:DMG:                                         0x0 = 2,
-          [1635875084.557295][4590:4595] CHIP:DMG:                                         0x1 = [
-          [1635875084.557371][4590:4595] CHIP:DMG:                                                 0x4, 0x5b, 0x93, 0x38, 0xab, 0x50, 0x6, 0x85, 0xc0, 0x50, 0xfe, 0x7d, 0x6c, 0xeb, 0x9d, 0xbd, 0x55, 0x90, 0x5e, 0x4f, 0x54, 0xed, 0x94, 0x21, 0xc0, 0x8d, 0x9d, 0x4f, 0x60, 0x48, 0xdb, 0x38, 0x4a, 0xf4, 0xe2, 0xa3, 0xf9, 0xd0, 0x55, 0xd5, 0x63, 0xd0,
-          [1635875084.557477][4590:4595] CHIP:DMG:                                         ]
-          [1635875084.557555][4590:4595] CHIP:DMG:                                         0x2 = 45896,
-          [1635875084.557629][4590:4595] CHIP:DMG:                                         0x3 = 0,
-          [1635875084.557701][4590:4595] CHIP:DMG:                                         0x4 = 2,
-          [1635875084.557757][4590:4595] CHIP:DMG:                                         0x5 = "",
-          [1635875084.557828][4590:4595] CHIP:DMG:                                 },
-          [1635875084.557888][4590:4595] CHIP:DMG:                         ],
-          [1635875084.557948][4590:4595] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635875084.558002][4590:4595] CHIP:DMG:                 },
-          [1635875084.558070][4590:4595] CHIP:DMG:
-          [1635875084.558115][4590:4595] CHIP:DMG:         ],
-          [1635875084.558179][4590:4595] CHIP:DMG:
-          [1635875084.558222][4590:4595] CHIP:DMG: }
-          [1635875084.558385][4590:4595] CHIP:ZCL: ReadAttributesResponse:
-          [1635875084.558426][4590:4595] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635875084.558469][4590:4595] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635875084.558508][4590:4595] CHIP:ZCL:   status: Success                (0x0000)
-          [1635875084.558543][4590:4595] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635875084.558609][4590:4595] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635875084.558730][4590:4595] CHIP:TOO: FabricDescriptor[1]:
-          [1635875084.558772][4590:4595] CHIP:TOO:   fabricIndex: 1
-          [1635875084.558808][4590:4595] CHIP:ZCL:   RootPublicKey: 65
-          [1635875084.558844][4590:4595] CHIP:TOO:   vendorId: 30024
-          [1635875084.558887][4590:4595] CHIP:TOO:   fabricId: 0
-          [1635875084.558923][4590:4595] CHIP:TOO:   nodeId: 1
-          [1635875084.558954][4590:4595] CHIP:ZCL:   Label:
-          [1635875084.559004][4590:4595] CHIP:TOO: FabricDescriptor[2]:
-          [1635875084.559044][4590:4595] CHIP:TOO:   fabricIndex: 2
-          [1635875084.559076][4590:4595] CHIP:ZCL:   RootPublicKey: 65
-          [1635875084.559111][4590:4595] CHIP:TOO:   vendorId: 45896
-          [1635875084.559143][4590:4595] CHIP:TOO:   fabricId: 0
-          [1635875084.559178][4590:4595] CHIP:TOO:   nodeId: 2
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 268962768
+          [1650527361.425870][15792:15797] CHIP:TOO:   Fabrics: 3 entries
+          [1650527361.426777][15792:15797] CHIP:TOO:     [1]: {
+          [1650527361.426859][15792:15797] CHIP:TOO:       RootPublicKey: 0429A71383F336D80918C9EC655112513E428C073AF7FB44820EC793535302C6E3825C56EE6DD1A683EAA7B59E3F261B46FFA24A6D911E8D88839F4C1B3C84BA01
+          [1650527361.426923][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.426979][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427033][15792:15797] CHIP:TOO:       NodeId: 1
+          [1650527361.427088][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427166][15792:15797] CHIP:TOO:       FabricIndex: 1
+          [1650527361.427376][15792:15797] CHIP:TOO:      }
+          [1650527361.427464][15792:15797] CHIP:TOO:     [2]: {
+          [1650527361.427532][15792:15797] CHIP:TOO:       RootPublicKey: 04781BCEE70118049ED61DD5B4E401CF1A09D2F78AE7F5770BE5506AD24238E5E0777277DABAFD062659651C95CC2CA7DEAACE40DB579A946CC07CADB141BE05D7
+          [1650527361.427595][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.427649][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427703][15792:15797] CHIP:TOO:       NodeId: 3
+          [1650527361.427756][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427811][15792:15797] CHIP:TOO:       FabricIndex: 2
+          [1650527361.427868][15792:15797] CHIP:TOO:      }
+          [1650527361.427943][15792:15797] CHIP:TOO:     [3]: {
+          [1650527361.428008][15792:15797] CHIP:TOO:       RootPublicKey: 0403EDB5B461030A34EF7EA2F9DB0D46A36185E4755C365AF9344C4959F049EF21D55EAB903A2C7FBFC305EEFA42989250D7517A73E6156062390A60C0D4C41EBD
+          [1650527361.428067][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.428122][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.428176][15792:15797] CHIP:TOO:       NodeId: 2
+          [1650527361.428229][15792:15797] CHIP:TOO:       Label:
+          [1650527361.428282][15792:15797] CHIP:TOO:       FabricIndex: 3
+          [1650527361.428335][15792:15797] CHIP:TOO:      }
       disabled: true
 
     - label:
@@ -288,42 +357,81 @@ tests:
           On the 1st controller using chip tool, open commissioning window using BCM
 
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0
-
-          [1635922853.458816][9456:9461] CHIP:DMG: InvokeCommand =
-          [1635922853.458865][9456:9461] CHIP:DMG: {
-          [1635922853.458903][9456:9461] CHIP:DMG:         CommandList =
-          [1635922853.458951][9456:9461] CHIP:DMG:         [
-          [1635922853.459031][9456:9461] CHIP:DMG:                 CommandDataIB =
-          [1635922853.459086][9456:9461] CHIP:DMG:                 {
-          [1635922853.459130][9456:9461] CHIP:DMG:                         CommandPathIB =
-          [1635922853.459184][9456:9461] CHIP:DMG:                         {
-          [1635922853.459235][9456:9461] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635922853.459291][9456:9461] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635922853.459348][9456:9461] CHIP:DMG:                                 CommandId = 0x1,
-          [1635922853.459400][9456:9461] CHIP:DMG:                         },
-          [1635922853.459458][9456:9461] CHIP:DMG:
-          [1635922853.459507][9456:9461] CHIP:DMG:                         StatusIB =
-          [1635922853.459560][9456:9461] CHIP:DMG:                         {
-          [1635922853.459612][9456:9461] CHIP:DMG:                                 status = 0x0,
-          [1635922853.459664][9456:9461] CHIP:DMG:                         },
-          [1635922853.459718][9456:9461] CHIP:DMG:
-          [1635922853.459766][9456:9461] CHIP:DMG:                 },
-          [1635922853.459831][9456:9461] CHIP:DMG:
-          [1635922853.459889][9456:9461] CHIP:DMG:         ],
-          [1635922853.459951][9456:9461] CHIP:DMG:
-          [1635922853.460004][9456:9461] CHIP:DMG: }
-          [1635922853.460101][9456:9461] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1635922853.460166][9456:9461] CHIP:TOO: Default Success Response
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
-          "Before the expiration of PIXIT_COMM_WIN seconds, TH_CR2 opens a
-          second commissioning window on DUT_CE using a commissioning timeout of
-          PIXIT_COMM_WIN seconds using BCM"
+          "Before the expiration of PIXIT_COMM_WIN seconds that was set in step
+          14, TH_CR2 opens a second commissioning window on DUT_CE using a
+          commissioning timeout of PIXIT_COMM_WIN seconds using BCM"
       verification: |
           On the 2nd controller using chip tool, open commissioning window using BCM before timer expiry from above step
 
-
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 100 1 0
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650527622.373450][15824:15829] CHIP:DMG: {
+          [1650527622.373531][15824:15829] CHIP:DMG:         suppressResponse = false,
+          [1650527622.373628][15824:15829] CHIP:DMG:         InvokeResponseIBs =
+          [1650527622.373734][15824:15829] CHIP:DMG:         [
+          [1650527622.373817][15824:15829] CHIP:DMG:                 InvokeResponseIB =
+          [1650527622.373913][15824:15829] CHIP:DMG:                 {
+          [1650527622.374001][15824:15829] CHIP:DMG:                         CommandStatusIB =
+          [1650527622.374087][15824:15829] CHIP:DMG:                         {
+          [1650527622.374182][15824:15829] CHIP:DMG:                                 CommandPathIB =
+          [1650527622.374296][15824:15829] CHIP:DMG:                                 {
+          [1650527622.374382][15824:15829] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650527622.374490][15824:15829] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650527622.374593][15824:15829] CHIP:DMG:                                         CommandId = 0x1,
+          [1650527622.374682][15824:15829] CHIP:DMG:                                 },
+          [1650527622.374799][15824:15829] CHIP:DMG:
+          [1650527622.374896][15824:15829] CHIP:DMG:                                 StatusIB =
+          [1650527622.374979][15824:15829] CHIP:DMG:                                 {
+          [1650527622.375086][15824:15829] CHIP:DMG:                                         status = 0x01 (FAILURE),
+          [1650527622.375236][15824:15829] CHIP:DMG:                                         cluster-status = 0x1,
+          [1650527622.375320][15824:15829] CHIP:DMG:                                 },
+          [1650527622.375426][15824:15829] CHIP:DMG:
+          [1650527622.375527][15824:15829] CHIP:DMG:                         },
+          [1650527622.375616][15824:15829] CHIP:DMG:
+          [1650527622.375704][15824:15829] CHIP:DMG:                 },
+          [1650527622.375786][15824:15829] CHIP:DMG:
+          [1650527622.375864][15824:15829] CHIP:DMG:         ],
+          [1650527622.375940][15824:15829] CHIP:DMG:
+          [1650527622.376000][15824:15829] CHIP:DMG:         InteractionModelRevision = 1
+          [1650527622.376058][15824:15829] CHIP:DMG: },
+          [1650527622.376202][15824:15829] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x1
+          [1650527622.376278][15824:15829] CHIP:TOO: Error: IM Error 0x00000601: Cluster-specific error: 0x01
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_15.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_15.yaml
index 966145dea3b4ab..d0f4bf1728d29c 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_15.yaml
@@ -167,31 +167,7 @@ tests:
       arguments:
           values:
               - name: "ms"
-                value: 54000
-
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 18000
+                value: 180000
 
     - label: "TH_CR1 re-opens new commissioning window on DUT_CE"
       identity: "alpha"
@@ -253,31 +229,7 @@ tests:
       arguments:
           values:
               - name: "ms"
-                value: 54000
-
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 18000
+                value: 180000
 
     - label: "TH_CR1 opens a new commissioning window on DUT_CE"
       identity: "alpha"
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_16.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_16.yaml
index 5e248daf1cf93e..81a7ad65c36f3e 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_16.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    22.1.16. [TC-MF-1.16] Open commissioning window twice on DUT using BCM then
+    3.1.16. [TC-MF-1.16] Open commissioning window twice on DUT using BCM then
     ECM [DUT - Commissioner]
 
 config:
@@ -25,12 +25,14 @@ config:
 tests:
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
       verification: |
-          1. Provision the device using your DUT controller (use above instructions) ,
+          "1. Provision the device using your DUT controller (use above instructions) ,
+          "
       disabled: true
 
     - label:
-          "DUT_CR1 opens a commissioning window on TH_CE using BCM and TH_CR3
-          Commissions with TH_CE"
+          "DUT_CR1 opens a commissioning window on TH_CE using a commissioning
+          timeout of PIXIT_COMM_WIN seconds using BCM and TH_CR3 Commissions
+          with TH_CE"
       verification: |
           On your DUT controller, open commissioning window using ECM
 
@@ -51,12 +53,16 @@ tests:
 
           On 3rd controller using chip tool connect using manual code
 
-          ./chip-tool pairing code 1 35484132896
+          ./chip-tool pairing manualcode 1 35484132896
+
+          Verify you got below message
+          Device commissioning completed with success
       disabled: true
 
     - label:
-          "DUT_CR1 opens a commissioning window on TH_CE using BCM and TH_CR2
-          Commissions with TH_CE"
+          "DUT_CR1 opens a commissioning window on TH_CE using a commissioning
+          timeout of PIXIT_COMM_WIN seconds using BCM and TH_CR2 Commissions
+          with TH_CE"
       verification: |
           On your DUT controller, open commissioning window using ECM
 
@@ -75,7 +81,10 @@ tests:
           [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
 
           On 2nd controller using chip tool connect using manual code
-          ./chip-tool pairing code 1 35484132896
+          ./chip-tool pairing manualcode 1 35484132896
+
+          Verify you got below message
+          Device commissioning completed with success
       disabled: true
 
     - label:
@@ -85,40 +94,45 @@ tests:
           On your DUT controller, open commissioning window using BCM
 
           Below is the example while using chip tool as controller
-
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0
-
-          [1635924941.016801][9606:9611] CHIP:DMG: InvokeCommand =
-          [1635924941.016871][9606:9611] CHIP:DMG: {
-          [1635924941.016926][9606:9611] CHIP:DMG:         CommandList =
-          [1635924941.016987][9606:9611] CHIP:DMG:         [
-          [1635924941.017047][9606:9611] CHIP:DMG:                 CommandDataIB =
-          [1635924941.017115][9606:9611] CHIP:DMG:                 {
-          [1635924941.017181][9606:9611] CHIP:DMG:                         CommandPathIB =
-          [1635924941.017262][9606:9611] CHIP:DMG:                         {
-          [1635924941.017342][9606:9611] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635924941.017465][9606:9611] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635924941.017544][9606:9611] CHIP:DMG:                                 CommandId = 0x1,
-          [1635924941.017615][9606:9611] CHIP:DMG:                         },
-          [1635924941.017693][9606:9611] CHIP:DMG:
-          [1635924941.017758][9606:9611] CHIP:DMG:                         StatusIB =
-          [1635924941.017834][9606:9611] CHIP:DMG:                         {
-          [1635924941.017912][9606:9611] CHIP:DMG:                                 status = 0x0,
-          [1635924941.017992][9606:9611] CHIP:DMG:                         },
-          [1635924941.018071][9606:9611] CHIP:DMG:
-          [1635924941.018141][9606:9611] CHIP:DMG:                 },
-          [1635924941.018224][9606:9611] CHIP:DMG:
-          [1635924941.018283][9606:9611] CHIP:DMG:         ],
-          [1635924941.018354][9606:9611] CHIP:DMG:
-          [1635924941.018408][9606:9611] CHIP:DMG: }
-          [1635924941.018506][9606:9611] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1635924941.018574][9606:9611] CHIP:TOO: Default Success Response
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
-          "Before the expiration of PIXIT_COMM_WIN seconds, DUT_CR1 opens a 2nd
-          commissioning window on TH_CE using a commissioning timeout of
-          PIXIT_COMM_WIN seconds using ECM"
+          "Before the expiration of PIXIT_COMM_WIN seconds that is set in step
+          4, DUT_CR1 opens a 2nd commissioning window on TH_CE using a
+          commissioning timeout of PIXIT_COMM_WIN seconds using ECM"
       verification: |
           On your DUT controller, open commissioning window using ECM before the timer expiry of the above step
 
@@ -126,93 +140,77 @@ tests:
 
           ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
 
-
-
-          [1635925972.865369][9735:9740] CHIP:SC: Success status report received. Session was established
-          [1635925972.865469][9735:9740] CHIP:IN: New secure session created for device 0x0000000000000001, key 40!!
-          [1635925972.865568][9735:9740] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635925972.872960][9735:9740] CHIP:DMG: ICR moving to [AddingComm]
-          [1635925972.873019][9735:9740] CHIP:DMG: ICR moving to [AddedComma]
-          [1635925972.873146][9735:9740] CHIP:IN: Prepared encrypted message 0xaaaafda39d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 60358i with MessageCounter:0.
-          [1635925972.873205][9735:9740] CHIP:IN: Sending encrypted msg 0xaaaafda39d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13708359 msec
-          [1635925972.873332][9735:9740] CHIP:DMG: ICR moving to [CommandSen]
-          [1635925972.873391][9735:9740] CHIP:CTL: Manual pairing code: [35092514987]
-          [1635925972.873482][9735:9740] CHIP:CTL: SetupQRCode: [MT:00000CQM00I.KG0RJ00]
-          [1635925972.873554][9735:9740] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916552 on exchange 60357i
+          CHIP:DMG: InvokeResponseMessage =
+          [1650527622.373450][15824:15829] CHIP:DMG: {
+          [1650527622.373531][15824:15829] CHIP:DMG: 	suppressResponse = false,
+          [1650527622.373628][15824:15829] CHIP:DMG: 	InvokeResponseIBs =
+          [1650527622.373734][15824:15829] CHIP:DMG: 	[
+          [1650527622.373817][15824:15829] CHIP:DMG: 		InvokeResponseIB =
+          [1650527622.373913][15824:15829] CHIP:DMG: 		{
+          [1650527622.374001][15824:15829] CHIP:DMG: 			CommandStatusIB =
+          [1650527622.374087][15824:15829] CHIP:DMG: 			{
+          [1650527622.374182][15824:15829] CHIP:DMG: 				CommandPathIB =
+          [1650527622.374296][15824:15829] CHIP:DMG: 				{
+          [1650527622.374382][15824:15829] CHIP:DMG: 					EndpointId = 0x0,
+          [1650527622.374490][15824:15829] CHIP:DMG: 					ClusterId = 0x3c,
+          [1650527622.374593][15824:15829] CHIP:DMG: 					CommandId = 0x1,
+          [1650527622.374682][15824:15829] CHIP:DMG: 				},
+          [1650527622.374799][15824:15829] CHIP:DMG:
+          [1650527622.374896][15824:15829] CHIP:DMG: 				StatusIB =
+          [1650527622.374979][15824:15829] CHIP:DMG: 				{
+          [1650527622.375086][15824:15829] CHIP:DMG: 					status = 0x01 (FAILURE),
+          [1650527622.375236][15824:15829] CHIP:DMG: 					cluster-status = 0x1,
+          [1650527622.375320][15824:15829] CHIP:DMG: 				},
+          [1650527622.375426][15824:15829] CHIP:DMG:
+          [1650527622.375527][15824:15829] CHIP:DMG: 			},
+          [1650527622.375616][15824:15829] CHIP:DMG:
+          [1650527622.375704][15824:15829] CHIP:DMG: 		},
+          [1650527622.375786][15824:15829] CHIP:DMG:
+          [1650527622.375864][15824:15829] CHIP:DMG: 	],
+          [1650527622.375940][15824:15829] CHIP:DMG:
+          [1650527622.376000][15824:15829] CHIP:DMG: 	InteractionModelRevision = 1
+          [1650527622.376058][15824:15829] CHIP:DMG: },
+          [1650527622.376202][15824:15829] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x1
+          [1650527622.376278][15824:15829] CHIP:TOO: Error: IM Error 0x00000601: Cluster-specific error: 0x01
       disabled: true
 
     - label: "DUT_CR1 reads the list of Fabrics on TH_CE"
       verification: |
-          On your DUT controller, read fabrics list
-
-          Below is the command using chip tool as controller
-
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-          [1635926055.539463][10129:10134] CHIP:DMG: ReportData =
-          [1635926055.539502][10129:10134] CHIP:DMG: {
-          [1635926055.539535][10129:10134] CHIP:DMG:         AttributeDataList =
-          [1635926055.539575][10129:10134] CHIP:DMG:         [
-          [1635926055.539625][10129:10134] CHIP:DMG:                 AttributeDataElement =
-          [1635926055.539673][10129:10134] CHIP:DMG:                 {
-          [1635926055.539745][10129:10134] CHIP:DMG:                         AttributePath =
-          [1635926055.539800][10129:10134] CHIP:DMG:                         {
-          [1635926055.539849][10129:10134] CHIP:DMG:                                 NodeId = 0x1,
-          [1635926055.539917][10129:10134] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635926055.539969][10129:10134] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635926055.540085][10129:10134] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635926055.540187][10129:10134] CHIP:DMG:                         }
-          [1635926055.540258][10129:10134] CHIP:DMG:
-          [1635926055.540305][10129:10134] CHIP:DMG:                         Data = [
-          [1635926055.540375][10129:10134] CHIP:DMG:
-          [1635926055.540423][10129:10134] CHIP:DMG:                                 {
-          [1635926055.540490][10129:10134] CHIP:DMG:                                         0x0 = 1,
-          [1635926055.540546][10129:10134] CHIP:DMG:                                         0x1 = [
-          [1635926055.540639][10129:10134] CHIP:DMG:                                                 0x4, 0xd6, 0x7d, 0xf1, 0x70, 0x4, 0x8, 0xb0, 0x4b, 0x2b, 0x86, 0xc, 0xe4, 0x28, 0xfa, 0xaa, 0xd5, 0x61, 0x92, 0xf4, 0x53, 0x2, 0xe9, 0xa2, 0x91, 0x17, 0x67, 0x89, 0xe7, 0xdc, 0x81, 0x18, 0x11, 0xe4, 0x41, 0x88, 0xbd, 0xdc, 0x6, 0xee, 0x1, 0x53, 0x63
-          [1635926055.540729][10129:10134] CHIP:DMG:                                         ]
-          [1635926055.540790][10129:10134] CHIP:DMG:                                         0x2 = 50504,
-          [1635926055.540862][10129:10134] CHIP:DMG:                                         0x3 = 0,
-          [1635926055.540916][10129:10134] CHIP:DMG:                                         0x4 = 1,
-          [1635926055.541001][10129:10134] CHIP:DMG:                                         0x5 = "",
-          [1635926055.541085][10129:10134] CHIP:DMG:                                 },
-          [1635926055.541159][10129:10134] CHIP:DMG:                                 {
-          [1635926055.541233][10129:10134] CHIP:DMG:                                         0x0 = 2,
-          [1635926055.541292][10129:10134] CHIP:DMG:                                         0x1 = [
-          [1635926055.541373][10129:10134] CHIP:DMG:                                                 0x4, 0x79, 0x31, 0x7e, 0x45, 0x90, 0x63, 0xd2, 0x1e, 0x54, 0x63, 0x38, 0x11, 0x6b, 0xb4, 0xd0, 0xcc, 0x5e, 0xad, 0x1d, 0xfe, 0xbb, 0xa6, 0xb3, 0xbf, 0x41, 0x25, 0x47, 0x1f, 0x26, 0x0, 0x5a, 0x80, 0xed, 0xdf, 0x98, 0xcc, 0xe7, 0xf3, 0xac, 0x81, 0x92,
-          [1635926055.541472][10129:10134] CHIP:DMG:                                         ]
-          [1635926055.541535][10129:10134] CHIP:DMG:                                         0x2 = 33608,
-          [1635926055.541588][10129:10134] CHIP:DMG:                                         0x3 = 0,
-          [1635926055.541657][10129:10134] CHIP:DMG:                                         0x4 = 2,
-          [1635926055.541719][10129:10134] CHIP:DMG:                                         0x5 = "",
-          [1635926055.541781][10129:10134] CHIP:DMG:                                 },
-          [1635926055.541852][10129:10134] CHIP:DMG:                         ],
-          [1635926055.541909][10129:10134] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635926055.541963][10129:10134] CHIP:DMG:                 },
-          [1635926055.542032][10129:10134] CHIP:DMG:
-          [1635926055.542074][10129:10134] CHIP:DMG:         ],
-          [1635926055.542137][10129:10134] CHIP:DMG:
-          [1635926055.542175][10129:10134] CHIP:DMG: }
-          [1635926055.542385][10129:10134] CHIP:ZCL: ReadAttributesResponse:
-          [1635926055.542427][10129:10134] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635926055.542484][10129:10134] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635926055.542521][10129:10134] CHIP:ZCL:   status: Success                (0x0000)
-          [1635926055.542556][10129:10134] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635926055.542626][10129:10134] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635926055.542774][10129:10134] CHIP:TOO: FabricDescriptor[1]:
-          [1635926055.542816][10129:10134] CHIP:TOO:   fabricIndex: 1
-          [1635926055.542853][10129:10134] CHIP:ZCL:   RootPublicKey: 65
-          [1635926055.542906][10129:10134] CHIP:TOO:   vendorId: 50504
-          [1635926055.542938][10129:10134] CHIP:TOO:   fabricId: 0
-          [1635926055.542973][10129:10134] CHIP:TOO:   nodeId: 1
-          [1635926055.543010][10129:10134] CHIP:ZCL:   Label:
-          [1635926055.543077][10129:10134] CHIP:TOO: FabricDescriptor[2]:
-          [1635926055.543117][10129:10134] CHIP:TOO:   fabricIndex: 2
-          [1635926055.543165][10129:10134] CHIP:ZCL:   RootPublicKey: 65
-          [1635926055.543228][10129:10134] CHIP:TOO:   vendorId: 33608
-          [1635926055.543263][10129:10134] CHIP:TOO:   fabricId: 0
-          [1635926055.543293][10129:10134] CHIP:TOO:   nodeId: 2
+          On 1st controller using chip tool, read fabrics list
+
+          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 268962768
+          [1650527361.425870][15792:15797] CHIP:TOO:   Fabrics: 3 entries
+          [1650527361.426777][15792:15797] CHIP:TOO:     [1]: {
+          [1650527361.426859][15792:15797] CHIP:TOO:       RootPublicKey: 0429A71383F336D80918C9EC655112513E428C073AF7FB44820EC793535302C6E3825C56EE6DD1A683EAA7B59E3F261B46FFA24A6D911E8D88839F4C1B3C84BA01
+          [1650527361.426923][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.426979][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427033][15792:15797] CHIP:TOO:       NodeId: 1
+          [1650527361.427088][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427166][15792:15797] CHIP:TOO:       FabricIndex: 1
+          [1650527361.427376][15792:15797] CHIP:TOO:      }
+          [1650527361.427464][15792:15797] CHIP:TOO:     [2]: {
+          [1650527361.427532][15792:15797] CHIP:TOO:       RootPublicKey: 04781BCEE70118049ED61DD5B4E401CF1A09D2F78AE7F5770BE5506AD24238E5E0777277DABAFD062659651C95CC2CA7DEAACE40DB579A946CC07CADB141BE05D7
+          [1650527361.427595][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.427649][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427703][15792:15797] CHIP:TOO:       NodeId: 3
+          [1650527361.427756][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427811][15792:15797] CHIP:TOO:       FabricIndex: 2
+          [1650527361.427868][15792:15797] CHIP:TOO:      }
+          [1650527361.427943][15792:15797] CHIP:TOO:     [3]: {
+          [1650527361.428008][15792:15797] CHIP:TOO:       RootPublicKey: 0403EDB5B461030A34EF7EA2F9DB0D46A36185E4755C365AF9344C4959F049EF21D55EAB903A2C7FBFC305EEFA42989250D7517A73E6156062390A60C0D4C41EBD
+          [1650527361.428067][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.428122][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.428176][15792:15797] CHIP:TOO:       NodeId: 2
+          [1650527361.428229][15792:15797] CHIP:TOO:       Label:
+          [1650527361.428282][15792:15797] CHIP:TOO:       FabricIndex: 3
+          [1650527361.428335][15792:15797] CHIP:TOO:      }
       disabled: true
 
-    - label: "Wait for the expiration of PIXIT_COMM_WIN seconds"
+    - label:
+          "Wait for the expiration of PIXIT_COMM_WIN seconds that is set in step
+          5"
       verification: |
           Wait for the expiration of PIXIT_COMM_WIN seconds
       disabled: true
@@ -240,97 +238,88 @@ tests:
       disabled: true
 
     - label:
-          "Before the expiration of PIXIT_COMM_WIN seconds, TH_CR3 opens a 2nd
-          commissioning window on TH_CE using a commissioning timeout of
-          PIXIT_COMM_WIN seconds using ECM"
+          "Before the expiration of PIXIT_COMM_WIN seconds that is set in step
+          8, TH_CR3 opens a 2nd commissioning window on TH_CE using a
+          commissioning timeout of PIXIT_COMM_WIN seconds using ECM"
       verification: |
           On the 3rd controller using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
 
-          [1635926152.609542][10140:10145] CHIP:SC: Success status report received. Session was established
-          [1635926152.609582][10140:10145] CHIP:IN: New secure session created for device 0x0000000000000001, key 42!!
-          [1635926152.609695][10140:10145] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635926152.617050][10140:10145] CHIP:DMG: ICR moving to [AddingComm]
-          [1635926152.617103][10140:10145] CHIP:DMG: ICR moving to [AddedComma]
-          [1635926152.617228][10140:10145] CHIP:IN: Prepared encrypted message 0xaaab02ca7d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 6544i with MessageCounter:0.
-          [1635926152.617286][10140:10145] CHIP:IN: Sending encrypted msg 0xaaab02ca7d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13888103 msec
-          [1635926152.617454][10140:10145] CHIP:DMG: ICR moving to [CommandSen]
-          [1635926152.617523][10140:10145] CHIP:CTL: Manual pairing code: [35484132896]
-          [1635926152.617611][10140:10145] CHIP:CTL: SetupQRCode: [MT:00000CQM00QHQP0JG00]
+          CHIP:DMG: InvokeResponseMessage =
+          [1650527622.373450][15824:15829] CHIP:DMG: {
+          [1650527622.373531][15824:15829] CHIP:DMG: 	suppressResponse = false,
+          [1650527622.373628][15824:15829] CHIP:DMG: 	InvokeResponseIBs =
+          [1650527622.373734][15824:15829] CHIP:DMG: 	[
+          [1650527622.373817][15824:15829] CHIP:DMG: 		InvokeResponseIB =
+          [1650527622.373913][15824:15829] CHIP:DMG: 		{
+          [1650527622.374001][15824:15829] CHIP:DMG: 			CommandStatusIB =
+          [1650527622.374087][15824:15829] CHIP:DMG: 			{
+          [1650527622.374182][15824:15829] CHIP:DMG: 				CommandPathIB =
+          [1650527622.374296][15824:15829] CHIP:DMG: 				{
+          [1650527622.374382][15824:15829] CHIP:DMG: 					EndpointId = 0x0,
+          [1650527622.374490][15824:15829] CHIP:DMG: 					ClusterId = 0x3c,
+          [1650527622.374593][15824:15829] CHIP:DMG: 					CommandId = 0x1,
+          [1650527622.374682][15824:15829] CHIP:DMG: 				},
+          [1650527622.374799][15824:15829] CHIP:DMG:
+          [1650527622.374896][15824:15829] CHIP:DMG: 				StatusIB =
+          [1650527622.374979][15824:15829] CHIP:DMG: 				{
+          [1650527622.375086][15824:15829] CHIP:DMG: 					status = 0x01 (FAILURE),
+          [1650527622.375236][15824:15829] CHIP:DMG: 					cluster-status = 0x1,
+          [1650527622.375320][15824:15829] CHIP:DMG: 				},
+          [1650527622.375426][15824:15829] CHIP:DMG:
+          [1650527622.375527][15824:15829] CHIP:DMG: 			},
+          [1650527622.375616][15824:15829] CHIP:DMG:
+          [1650527622.375704][15824:15829] CHIP:DMG: 		},
+          [1650527622.375786][15824:15829] CHIP:DMG:
+          [1650527622.375864][15824:15829] CHIP:DMG: 	],
+          [1650527622.375940][15824:15829] CHIP:DMG:
+          [1650527622.376000][15824:15829] CHIP:DMG: 	InteractionModelRevision = 1
+          [1650527622.376058][15824:15829] CHIP:DMG: },
+          [1650527622.376202][15824:15829] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x1
+          [1650527622.376278][15824:15829] CHIP:TOO: Error: IM Error 0x00000601: Cluster-specific error: 0x01
       disabled: true
 
     - label: "DUT_CR1 reads the list of Fabrics on TH_CE"
       verification: |
-          On your DUT controller, read fabrics list
-
-          Below is the command when using chip tool controller
-
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-
-          [1635926361.458197][10154:10159] CHIP:DMG: ReportData =
-          [1635926361.458231][10154:10159] CHIP:DMG: {
-          [1635926361.458285][10154:10159] CHIP:DMG:         AttributeDataList =
-          [1635926361.458319][10154:10159] CHIP:DMG:         [
-          [1635926361.458352][10154:10159] CHIP:DMG:                 AttributeDataElement =
-          [1635926361.458386][10154:10159] CHIP:DMG:                 {
-          [1635926361.458421][10154:10159] CHIP:DMG:                         AttributePath =
-          [1635926361.458464][10154:10159] CHIP:DMG:                         {
-          [1635926361.458523][10154:10159] CHIP:DMG:                                 NodeId = 0x1,
-          [1635926361.458600][10154:10159] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635926361.458662][10154:10159] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635926361.458734][10154:10159] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635926361.458779][10154:10159] CHIP:DMG:                         }
-          [1635926361.458839][10154:10159] CHIP:DMG:
-          [1635926361.458896][10154:10159] CHIP:DMG:                         Data = [
-          [1635926361.458951][10154:10159] CHIP:DMG:
-          [1635926361.458992][10154:10159] CHIP:DMG:                                 {
-          [1635926361.459054][10154:10159] CHIP:DMG:                                         0x0 = 1,
-          [1635926361.459100][10154:10159] CHIP:DMG:                                         0x1 = [
-          [1635926361.459161][10154:10159] CHIP:DMG:                                                 0x4, 0xd6, 0x7d, 0xf1, 0x70, 0x4, 0x8, 0xb0, 0x4b, 0x2b, 0x86, 0xc, 0xe4, 0x28, 0xfa, 0xaa, 0xd5, 0x61, 0x92, 0xf4, 0x53, 0x2, 0xe9, 0xa2, 0x91, 0x17, 0x67, 0x89, 0xe7, 0xdc, 0x81, 0x18, 0x11, 0xe4, 0x41, 0x88, 0xbd, 0xdc, 0x6, 0xee, 0x1, 0x53, 0x63
-          [1635926361.459229][10154:10159] CHIP:DMG:                                         ]
-          [1635926361.459302][10154:10159] CHIP:DMG:                                         0x2 = 50504,
-          [1635926361.459341][10154:10159] CHIP:DMG:                                         0x3 = 0,
-          [1635926361.459405][10154:10159] CHIP:DMG:                                         0x4 = 1,
-          [1635926361.459451][10154:10159] CHIP:DMG:                                         0x5 = "",
-          [1635926361.459492][10154:10159] CHIP:DMG:                                 },
-          [1635926361.459552][10154:10159] CHIP:DMG:                                 {
-          [1635926361.459626][10154:10159] CHIP:DMG:                                         0x0 = 2,
-          [1635926361.459690][10154:10159] CHIP:DMG:                                         0x1 = [
-          [1635926361.459751][10154:10159] CHIP:DMG:                                                 0x4, 0x79, 0x31, 0x7e, 0x45, 0x90, 0x63, 0xd2, 0x1e, 0x54, 0x63, 0x38, 0x11, 0x6b, 0xb4, 0xd0, 0xcc, 0x5e, 0xad, 0x1d, 0xfe, 0xbb, 0xa6, 0xb3, 0xbf, 0x41, 0x25, 0x47, 0x1f, 0x26, 0x0, 0x5a, 0x80, 0xed, 0xdf, 0x98, 0xcc, 0xe7, 0xf3, 0xac, 0x81, 0x92,
-          [1635926361.459797][10154:10159] CHIP:DMG:                                         ]
-          [1635926361.459860][10154:10159] CHIP:DMG:                                         0x2 = 33608,
-          [1635926361.459924][10154:10159] CHIP:DMG:                                         0x3 = 0,
-          [1635926361.459968][10154:10159] CHIP:DMG:                                         0x4 = 2,
-          [1635926361.460011][10154:10159] CHIP:DMG:                                         0x5 = "",
-          [1635926361.460054][10154:10159] CHIP:DMG:                                 },
-          [1635926361.460114][10154:10159] CHIP:DMG:                         ],
-          [1635926361.460169][10154:10159] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635926361.460207][10154:10159] CHIP:DMG:                 },
-          [1635926361.460257][10154:10159] CHIP:DMG:
-          [1635926361.460289][10154:10159] CHIP:DMG:         ],
-          [1635926361.460357][10154:10159] CHIP:DMG:
-          [1635926361.460388][10154:10159] CHIP:DMG: }
-          [1635926361.460535][10154:10159] CHIP:ZCL: ReadAttributesResponse:
-          [1635926361.460566][10154:10159] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635926361.460599][10154:10159] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635926361.460625][10154:10159] CHIP:ZCL:   status: Success                (0x0000)
-          [1635926361.460648][10154:10159] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635926361.460694][10154:10159] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635926361.460788][10154:10159] CHIP:TOO: FabricDescriptor[1]:
-          [1635926361.460821][10154:10159] CHIP:TOO:   fabricIndex: 1
-          [1635926361.460844][10154:10159] CHIP:ZCL:   RootPublicKey: 65
-          [1635926361.460866][10154:10159] CHIP:TOO:   vendorId: 50504
-          [1635926361.460888][10154:10159] CHIP:TOO:   fabricId: 0
-          [1635926361.460910][10154:10159] CHIP:TOO:   nodeId: 1
-          [1635926361.460961][10154:10159] CHIP:ZCL:   Label:
-          [1635926361.461002][10154:10159] CHIP:TOO: FabricDescriptor[2]:
-          [1635926361.461031][10154:10159] CHIP:TOO:   fabricIndex: 2
-          [1635926361.461059][10154:10159] CHIP:ZCL:   RootPublicKey: 65
-          [1635926361.461092][10154:10159] CHIP:TOO:   vendorId: 33608
-          [1635926361.461119][10154:10159] CHIP:TOO:   fabricId: 0
-          [1635926361.461143][10154:10159] CHIP:TOO:   nodeId: 2
+          On 1st controller using chip tool, read fabrics list
+
+          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 268962768
+          [1650527361.425870][15792:15797] CHIP:TOO:   Fabrics: 3 entries
+          [1650527361.426777][15792:15797] CHIP:TOO:     [1]: {
+          [1650527361.426859][15792:15797] CHIP:TOO:       RootPublicKey: 0429A71383F336D80918C9EC655112513E428C073AF7FB44820EC793535302C6E3825C56EE6DD1A683EAA7B59E3F261B46FFA24A6D911E8D88839F4C1B3C84BA01
+          [1650527361.426923][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.426979][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427033][15792:15797] CHIP:TOO:       NodeId: 1
+          [1650527361.427088][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427166][15792:15797] CHIP:TOO:       FabricIndex: 1
+          [1650527361.427376][15792:15797] CHIP:TOO:      }
+          [1650527361.427464][15792:15797] CHIP:TOO:     [2]: {
+          [1650527361.427532][15792:15797] CHIP:TOO:       RootPublicKey: 04781BCEE70118049ED61DD5B4E401CF1A09D2F78AE7F5770BE5506AD24238E5E0777277DABAFD062659651C95CC2CA7DEAACE40DB579A946CC07CADB141BE05D7
+          [1650527361.427595][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.427649][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.427703][15792:15797] CHIP:TOO:       NodeId: 3
+          [1650527361.427756][15792:15797] CHIP:TOO:       Label:
+          [1650527361.427811][15792:15797] CHIP:TOO:       FabricIndex: 2
+          [1650527361.427868][15792:15797] CHIP:TOO:      }
+          [1650527361.427943][15792:15797] CHIP:TOO:     [3]: {
+          [1650527361.428008][15792:15797] CHIP:TOO:       RootPublicKey: 0403EDB5B461030A34EF7EA2F9DB0D46A36185E4755C365AF9344C4959F049EF21D55EAB903A2C7FBFC305EEFA42989250D7517A73E6156062390A60C0D4C41EBD
+          [1650527361.428067][15792:15797] CHIP:TOO:       VendorId: 65521
+          [1650527361.428122][15792:15797] CHIP:TOO:       FabricId: 1
+          [1650527361.428176][15792:15797] CHIP:TOO:       NodeId: 2
+          [1650527361.428229][15792:15797] CHIP:TOO:       Label:
+          [1650527361.428282][15792:15797] CHIP:TOO:       FabricIndex: 3
+          [1650527361.428335][15792:15797] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "Wait for the expiration of PIXIT_COMM_WIN seconds that is set in step
+          9"
+      verification: |
+
       disabled: true
 
     - label:
@@ -356,22 +345,44 @@ tests:
       disabled: true
 
     - label:
-          "Before the expiration of PIXIT_COMM_WIN seconds, TH_CR2 opens a
-          second commissioning window on TH_CE using a commissioning timeout of
-          PIXIT_COMM_WIN seconds using ECM"
+          "Before the expiration of PIXIT_COMM_WIN seconds that is set in step
+          12, TH_CR2 opens a second commissioning window on TH_CE using a
+          commissioning timeout of PIXIT_COMM_WIN seconds using ECM"
       verification: |
           On the 2nd controller using chip tool, open commissioning window using ECM
 
           ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
 
-          [1635926434.941379][10165:10170] CHIP:SC: Success status report received. Session was established
-          [1635926434.941428][10165:10170] CHIP:IN: New secure session created for device 0x0000000000000001, key 44!!
-          [1635926434.941515][10165:10170] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635926434.949324][10165:10170] CHIP:DMG: ICR moving to [AddingComm]
-          [1635926434.949381][10165:10170] CHIP:DMG: ICR moving to [AddedComma]
-          [1635926434.949532][10165:10170] CHIP:IN: Prepared encrypted message 0xaaaad95dbd10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 19421i with MessageCounter:0.
-          [1635926434.949592][10165:10170] CHIP:IN: Sending encrypted msg 0xaaaad95dbd10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 14170436 msec
-          [1635926434.949727][10165:10170] CHIP:DMG: ICR moving to [CommandSen]
-          [1635926434.949788][10165:10170] CHIP:CTL: Manual pairing code: [35484132896]
-          [1635926434.949865][10165:10170] CHIP:CTL: SetupQRCode: [MT:00000CQM00OAX.7RA00]
+          CHIP:DMG: InvokeResponseMessage =
+          [1650527622.373450][15824:15829] CHIP:DMG: {
+          [1650527622.373531][15824:15829] CHIP:DMG: 	suppressResponse = false,
+          [1650527622.373628][15824:15829] CHIP:DMG: 	InvokeResponseIBs =
+          [1650527622.373734][15824:15829] CHIP:DMG: 	[
+          [1650527622.373817][15824:15829] CHIP:DMG: 		InvokeResponseIB =
+          [1650527622.373913][15824:15829] CHIP:DMG: 		{
+          [1650527622.374001][15824:15829] CHIP:DMG: 			CommandStatusIB =
+          [1650527622.374087][15824:15829] CHIP:DMG: 			{
+          [1650527622.374182][15824:15829] CHIP:DMG: 				CommandPathIB =
+          [1650527622.374296][15824:15829] CHIP:DMG: 				{
+          [1650527622.374382][15824:15829] CHIP:DMG: 					EndpointId = 0x0,
+          [1650527622.374490][15824:15829] CHIP:DMG: 					ClusterId = 0x3c,
+          [1650527622.374593][15824:15829] CHIP:DMG: 					CommandId = 0x1,
+          [1650527622.374682][15824:15829] CHIP:DMG: 				},
+          [1650527622.374799][15824:15829] CHIP:DMG:
+          [1650527622.374896][15824:15829] CHIP:DMG: 				StatusIB =
+          [1650527622.374979][15824:15829] CHIP:DMG: 				{
+          [1650527622.375086][15824:15829] CHIP:DMG: 					status = 0x01 (FAILURE),
+          [1650527622.375236][15824:15829] CHIP:DMG: 					cluster-status = 0x1,
+          [1650527622.375320][15824:15829] CHIP:DMG: 				},
+          [1650527622.375426][15824:15829] CHIP:DMG:
+          [1650527622.375527][15824:15829] CHIP:DMG: 			},
+          [1650527622.375616][15824:15829] CHIP:DMG:
+          [1650527622.375704][15824:15829] CHIP:DMG: 		},
+          [1650527622.375786][15824:15829] CHIP:DMG:
+          [1650527622.375864][15824:15829] CHIP:DMG: 	],
+          [1650527622.375940][15824:15829] CHIP:DMG:
+          [1650527622.376000][15824:15829] CHIP:DMG: 	InteractionModelRevision = 1
+          [1650527622.376058][15824:15829] CHIP:DMG: },
+          [1650527622.376202][15824:15829] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x1
+          [1650527622.376278][15824:15829] CHIP:TOO: Error: IM Error 0x00000601: Cluster-specific error: 0x01
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_2.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_2.yaml
index 45aec18f3dd977..2462fc88390483 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_2.yaml
@@ -33,98 +33,61 @@ tests:
       verification: |
           On first controller, usinadministratorcommissioningg chip tool open commissioning window.
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0
-
-          CHIP:DMG: InvokeCommand =
-          [1635694087.587121][3208:3213] CHIP:DMG: {
-          [1635694087.587168][3208:3213] CHIP:DMG:         CommandList =
-          [1635694087.587221][3208:3213] CHIP:DMG:         [
-          [1635694087.587272][3208:3213] CHIP:DMG:                 CommandDataIB =
-          [1635694087.587329][3208:3213] CHIP:DMG:                 {
-          [1635694087.587392][3208:3213] CHIP:DMG:                         CommandPathIB =
-          [1635694087.587458][3208:3213] CHIP:DMG:                         {
-          [1635694087.587524][3208:3213] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635694087.587596][3208:3213] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635694087.587666][3208:3213] CHIP:DMG:                                 CommandId = 0x1,
-          [1635694087.587731][3208:3213] CHIP:DMG:                         },
-          [1635694087.587803][3208:3213] CHIP:DMG:
-          [1635694087.587861][3208:3213] CHIP:DMG:                         StatusIB =
-          [1635694087.587933][3208:3213] CHIP:DMG:                         {
-          [1635694087.587997][3208:3213] CHIP:DMG:                                 status = 0x0,
-          [1635694087.588067][3208:3213] CHIP:DMG:                         },
-          [1635694087.588134][3208:3213] CHIP:DMG:
-          [1635694087.588193][3208:3213] CHIP:DMG:                 },
-          [1635694087.588256][3208:3213] CHIP:DMG:
-          [1635694087.588306][3208:3213] CHIP:DMG:         ],
-          [1635694087.588366][3208:3213] CHIP:DMG:
-          [1635694087.588412][3208:3213] CHIP:DMG: }
-          [1635694087.588497][3208:3213] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1635694087.588555][3208:3213] CHIP:TOO: Default Success Response
-          [1635694087.588642][3208:3213] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1635694087.588707][3208:3213] CHIP:EM: Sending Standalone Ack for MessageCounter:1 on exchange 54781i
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
+
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label: "TH_CR1 reads the list of Fabrics on TH_CE"
       verification: |
           On first controller, using chip tool read fabricList
 
-          ./chip-tool operationalcredentials read fabrics-list 1 0
-
-          CHIP:DMG: ReportData =
-          [1635694137.957373][3218:3223] CHIP:DMG: {
-          [1635694137.957420][3218:3223] CHIP:DMG:         AttributeDataList =
-          [1635694137.957460][3218:3223] CHIP:DMG:         [
-          [1635694137.957510][3218:3223] CHIP:DMG:                 AttributeDataElement =
-          [1635694137.957561][3218:3223] CHIP:DMG:                 {
-          [1635694137.957615][3218:3223] CHIP:DMG:                         AttributePath =
-          [1635694137.957681][3218:3223] CHIP:DMG:                         {
-          [1635694137.957727][3218:3223] CHIP:DMG:                                 NodeId = 0x1,
-          [1635694137.957786][3218:3223] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635694137.957834][3218:3223] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635694137.957895][3218:3223] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635694137.957939][3218:3223] CHIP:DMG:                         }
-          [1635694137.957998][3218:3223] CHIP:DMG:
-          [1635694137.958040][3218:3223] CHIP:DMG:                         Data = [
-          [1635694137.958096][3218:3223] CHIP:DMG:
-          [1635694137.958132][3218:3223] CHIP:DMG:                                 {
-          [1635694137.958201][3218:3223] CHIP:DMG:                                         0x0 = 1,
-          [1635694137.958276][3218:3223] CHIP:DMG:                                         0x1 = [
-          [1635694137.958356][3218:3223] CHIP:DMG:                                                 0x4, 0x67, 0x23, 0x35, 0x8d, 0xdf, 0x2, 0xdc, 0xe6, 0xe4, 0x3e, 0xfa, 0x1a, 0xb5, 0x99, 0xb8, 0x10, 0x8b, 0x8c, 0x4d, 0x67, 0xa8, 0x4e, 0x6, 0x3e, 0x15, 0xa5, 0xf4, 0x37, 0x99, 0xd2, 0x2e, 0x39, 0x4a, 0x6c, 0xd0, 0xc5, 0xd, 0xea, 0x46, 0x3, 0x62, 0x
-          [1635694137.958411][3218:3223] CHIP:DMG:                                         ]
-          [1635694137.958481][3218:3223] CHIP:DMG:                                         0x2 = 30024,
-          [1635694137.958549][3218:3223] CHIP:DMG:                                         0x3 = 0,
-          [1635694137.958602][3218:3223] CHIP:DMG:                                         0x4 = 1,
-          [1635694137.958666][3218:3223] CHIP:DMG:                                         0x5 = "",
-          [1635694137.958736][3218:3223] CHIP:DMG:                                 },
-          [1635694137.958783][3218:3223] CHIP:DMG:                         ],
-          [1635694137.958839][3218:3223] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635694137.958896][3218:3223] CHIP:DMG:                 },
-          [1635694137.958959][3218:3223] CHIP:DMG:
-          [1635694137.959020][3218:3223] CHIP:DMG:         ],
-          [1635694137.959084][3218:3223] CHIP:DMG:
-          [1635694137.959118][3218:3223] CHIP:DMG: }
-          [1635694137.959266][3218:3223] CHIP:ZCL: ReadAttributesResponse:
-          [1635694137.959313][3218:3223] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635694137.959349][3218:3223] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635694137.959380][3218:3223] CHIP:ZCL:   status: Success                (0x0000)
-          [1635694137.959410][3218:3223] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635694137.959467][3218:3223] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 1 entries
-          [1635694137.959654][3218:3223] CHIP:TOO: FabricDescriptor[1]:
-          [1635694137.959707][3218:3223] CHIP:TOO:   fabricIndex: 1
-          [1635694137.959740][3218:3223] CHIP:ZCL:   RootPublicKey: 65
-          [1635694137.959772][3218:3223] CHIP:TOO:   vendorId: 30024
-          [1635694137.959803][3218:3223] CHIP:TOO:   fabricId: 0
-          [1635694137.959835][3218:3223] CHIP:TOO:   nodeId: 1
-          [1635694137.959866][3218:3223] CHIP:ZCL:   Label:
-          [1635694137.960006][3218:3223] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 46522i
-      disabled: true
+          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
 
-    - label: "DUT_CR2 starts a commissioning process with TH_CE"
-      verification: |
-          Using your DUT Controller connect to the accessory.
 
-          Below is the example when using chip tool as controller
-          ./chip-tool pairing onnetwork 1 20202021
+           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507058
+          [1649245801.244173][10091:10096] CHIP:TOO:   Fabrics: 1 entries
+          [1649245801.244305][10091:10096] CHIP:TOO:     [1]: {
+          [1649245801.244348][10091:10096] CHIP:TOO:       RootPublicKey: 045541017FCEFD0D83963C9ED7F21380C6B789EB989B5D20DC318FAE92D60D0F685666505E9C4F86C49ADC71AB3A8B9B44FD43214CF9BE2B6D47DE01F28FE1544F
+          [1649245801.244400][10091:10096] CHIP:TOO:       VendorId: 65521
+          [1649245801.244431][10091:10096] CHIP:TOO:       FabricId: 1
+          [1649245801.244461][10091:10096] CHIP:TOO:       NodeId: 1
+          [1649245801.244491][10091:10096] CHIP:TOO:       Label:
+          [1649245801.244521][10091:10096] CHIP:TOO:       FabricIndex: 1
+          [1649245801.244552][10091:10096] CHIP:TOO:      }
+          [1649245801.244671][10091:10096] CHIP:EM: Sending Standalone Ack for MessageCounter:8407998 on exchange 12989i
       disabled: true
 
     - label:
@@ -134,64 +97,39 @@ tests:
           Using your DUT controller write attribute and read attribute to and from TH_CE
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool basic write  user-label te5new 2 0
-          [1635861872.956332][5788:5793] CHIP:DMG: WriteResponse =
-          [1635861872.956373][5788:5793] CHIP:DMG: {
-          [1635861872.956407][5788:5793] CHIP:DMG:         AttributeStatusList =
-          [1635861872.956443][5788:5793] CHIP:DMG:         [
-          [1635861872.956511][5788:5793] CHIP:DMG:                 AttributeStatusIB =
-          [1635861872.956561][5788:5793] CHIP:DMG:                 {
-          [1635861872.956604][5788:5793] CHIP:DMG:                         AttributePath =
-          [1635861872.956653][5788:5793] CHIP:DMG:                         {
-          [1635861872.956704][5788:5793] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635861872.956753][5788:5793] CHIP:DMG:                                 NodeId = 0x0,
-          [1635861872.956801][5788:5793] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635861872.956847][5788:5793] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635861872.956891][5788:5793] CHIP:DMG:                         }
-          [1635861872.956940][5788:5793] CHIP:DMG:
-          [1635861872.956981][5788:5793] CHIP:DMG:                         StatusIB =
-          [1635861872.957034][5788:5793] CHIP:DMG:                         {
-          [1635861872.957079][5788:5793] CHIP:DMG:                                 status = 0x0,
-          [1635861872.957119][5788:5793] CHIP:DMG:                         },
-          [1635861872.957172][5788:5793] CHIP:DMG:
-          [1635861872.957215][5788:5793] CHIP:DMG:                 },
-          [1635861872.957265][5788:5793] CHIP:DMG:
-          [1635861872.957302][5788:5793] CHIP:DMG:         ],
-          [1635861872.957349][5788:5793] CHIP:DMG:
-          [1635861872.957379][5788:5793] CHIP:DMG: }
-          [1635861872.957451][5788:5793] CHIP:ZCL: WriteResponse:
-          [1635861872.957485][5788:5793] CHIP:ZCL:   status: Success                (0x0000)
-          [1635861872.957523][5788:5793] CHIP:TOO: Default Success Response
-
-
-          ./chip-tool basic read user-label 1 0
-          [1635861971.232185][5799:5804] CHIP:DMG: ReportData =
-          [1635861971.232222][5799:5804] CHIP:DMG: {
-          [1635861971.232255][5799:5804] CHIP:DMG:         AttributeDataList =
-          [1635861971.232296][5799:5804] CHIP:DMG:         [
-          [1635861971.232335][5799:5804] CHIP:DMG:                 AttributeDataElement =
-          [1635861971.232378][5799:5804] CHIP:DMG:                 {
-          [1635861971.232417][5799:5804] CHIP:DMG:                         AttributePath =
-          [1635861971.232508][5799:5804] CHIP:DMG:                         {
-          [1635861971.232555][5799:5804] CHIP:DMG:                                 NodeId = 0x1,
-          [1635861971.232627][5799:5804] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635861971.232680][5799:5804] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635861971.232857][5799:5804] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635861971.232907][5799:5804] CHIP:DMG:                         }
-          [1635861971.232960][5799:5804] CHIP:DMG:
-          [1635861971.233009][5799:5804] CHIP:DMG:                         Data = "te5new",
-          [1635861971.233097][5799:5804] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635861971.233135][5799:5804] CHIP:DMG:                 },
-          [1635861971.233180][5799:5804] CHIP:DMG:
-          [1635861971.233217][5799:5804] CHIP:DMG:         ],
-          [1635861971.233260][5799:5804] CHIP:DMG:
-          [1635861971.233290][5799:5804] CHIP:DMG: }
-          [1635861971.233414][5799:5804] CHIP:ZCL: ReadAttributesResponse:
-          [1635861971.233449][5799:5804] CHIP:ZCL:   ClusterId: 0x0000_0028
-          [1635861971.233484][5799:5804] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1635861971.233517][5799:5804] CHIP:ZCL:   status: Success                (0x0000)
-          [1635861971.233551][5799:5804] CHIP:ZCL:   attribute TLV Type: 0x0c
-          [1635861971.233587][5799:5804] CHIP:TOO: CharString attribute Response: te5new
+          ./chip-tool basic write  node-label te5new 2 0
+
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
+
+
+          ./chip-tool basic read node-label 1 0
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
     - label: "DUT_CR2 reads the list of Fabrics on TH_CE"
@@ -199,69 +137,27 @@ tests:
           On your DUT controller read fabricList
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool operationalcredentials read fabrics-list 2 0
-          [1635862039.896395][5808:5813] CHIP:DMG: ReportData =
-          [1635862039.896430][5808:5813] CHIP:DMG: {
-          [1635862039.896490][5808:5813] CHIP:DMG:         AttributeDataList =
-          [1635862039.896532][5808:5813] CHIP:DMG:         [
-          [1635862039.896574][5808:5813] CHIP:DMG:                 AttributeDataElement =
-          [1635862039.896636][5808:5813] CHIP:DMG:                 {
-          [1635862039.896676][5808:5813] CHIP:DMG:                         AttributePath =
-          [1635862039.896740][5808:5813] CHIP:DMG:                         {
-          [1635862039.896803][5808:5813] CHIP:DMG:                                 NodeId = 0x1,
-          [1635862039.896851][5808:5813] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862039.896907][5808:5813] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1635862039.896977][5808:5813] CHIP:DMG:                                 FieldTag = 0x0000_0001,
-          [1635862039.897021][5808:5813] CHIP:DMG:                         }
-          [1635862039.897084][5808:5813] CHIP:DMG:
-          [1635862039.897131][5808:5813] CHIP:DMG:                         Data = [
-          [1635862039.897190][5808:5813] CHIP:DMG:
-          [1635862039.897248][5808:5813] CHIP:DMG:                                 {
-          [1635862039.897292][5808:5813] CHIP:DMG:                                         0x0 = 1,
-          [1635862039.897337][5808:5813] CHIP:DMG:                                         0x1 = [
-          [1635862039.897426][5808:5813] CHIP:DMG:                                                 0x4, 0x6f, 0x9b, 0xb2, 0xcb, 0xc2, 0x9b, 0x9c, 0x23, 0xed, 0xb5, 0xde, 0x91, 0xa7, 0xb2, 0x53, 0xd, 0x0, 0x4, 0x80, 0xe3, 0x6c, 0xa6, 0x2e, 0x1e, 0x9a, 0x24, 0x62, 0xcb, 0xf, 0x9a, 0x58, 0x8b, 0x96, 0xab, 0x3f, 0x59, 0xfd, 0x92, 0x83, 0xf0, 0x42, 0x
-          [1635862039.897499][5808:5813] CHIP:DMG:                                         ]
-          [1635862039.897677][5808:5813] CHIP:DMG:                                         0x2 = 13640,
-          [1635862039.897837][5808:5813] CHIP:DMG:                                         0x3 = 0,
-          [1635862039.897964][5808:5813] CHIP:DMG:                                         0x4 = 1,
-          [1635862039.898041][5808:5813] CHIP:DMG:                                         0x5 = "",
-          [1635862039.898102][5808:5813] CHIP:DMG:                                 },
-          [1635862039.898159][5808:5813] CHIP:DMG:                                 {
-          [1635862039.898235][5808:5813] CHIP:DMG:                                         0x0 = 2,
-          [1635862039.898289][5808:5813] CHIP:DMG:                                         0x1 = [
-          [1635862039.898388][5808:5813] CHIP:DMG:                                                 0x4, 0x83, 0xb3, 0x39, 0xe3, 0x71, 0xc2, 0xd4, 0x5d, 0x6d, 0xc9, 0x86, 0xba, 0x66, 0xba, 0x6e, 0x4e, 0x85, 0x3f, 0xd5, 0xbc, 0x26, 0x8b, 0x6, 0xc6, 0x3c, 0xb2, 0x6f, 0xc0, 0xd1, 0x37, 0xb4, 0xb7, 0x6c, 0x80, 0x81, 0x73, 0x2c, 0xd0, 0x16, 0xfc, 0x34,
-          [1635862039.898592][5808:5813] CHIP:DMG:                                         ]
-          [1635862039.898705][5808:5813] CHIP:DMG:                                         0x2 = 58184,
-          [1635862039.898783][5808:5813] CHIP:DMG:                                         0x3 = 0,
-          [1635862039.898864][5808:5813] CHIP:DMG:                                         0x4 = 1,
-          [1635862039.898921][5808:5813] CHIP:DMG:                                         0x5 = "",
-          [1635862039.898997][5808:5813] CHIP:DMG:                                 },
-          [1635862039.899113][5808:5813] CHIP:DMG:                         ],
-          [1635862039.899195][5808:5813] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635862039.899254][5808:5813] CHIP:DMG:                 },
-          [1635862039.899340][5808:5813] CHIP:DMG:
-          [1635862039.899385][5808:5813] CHIP:DMG:         ],
-          [1635862039.899478][5808:5813] CHIP:DMG:
-          [1635862039.899521][5808:5813] CHIP:DMG: }
-          [1635862039.899811][5808:5813] CHIP:ZCL: ReadAttributesResponse:
-          [1635862039.899873][5808:5813] CHIP:ZCL:   ClusterId: 0x0000_003E
-          [1635862039.899918][5808:5813] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1635862039.899958][5808:5813] CHIP:ZCL:   status: Success                (0x0000)
-          [1635862039.899994][5808:5813] CHIP:ZCL:   attribute TLV Type: 0x16
-          [1635862039.900060][5808:5813] CHIP:TOO: OnOperationalCredentialsFabricsListListAttributeResponse: 2 entries
-          [1635862039.900357][5808:5813] CHIP:TOO: FabricDescriptor[1]:
-          [1635862039.900420][5808:5813] CHIP:TOO:   fabricIndex: 1
-          [1635862039.900480][5808:5813] CHIP:ZCL:   RootPublicKey: 65
-          [1635862039.900532][5808:5813] CHIP:TOO:   vendorId: 13640
-          [1635862039.900564][5808:5813] CHIP:TOO:   fabricId: 0
-          [1635862039.900602][5808:5813] CHIP:TOO:   nodeId: 1
-          [1635862039.900639][5808:5813] CHIP:ZCL:   Label:
-          [1635862039.900697][5808:5813] CHIP:TOO: FabricDescriptor[2]:
-          [1635862039.900739][5808:5813] CHIP:TOO:   fabricIndex: 2
-          [1635862039.900793][5808:5813] CHIP:ZCL:   RootPublicKey: 65
-          [1635862039.900826][5808:5813] CHIP:TOO:   vendorId: 58184
-          [1635862039.900879][5808:5813] CHIP:TOO:   fabricId: 0
-          [1635862039.900953][5808:5813] CHIP:TOO:   nodeId: 1
+          ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3229397217
+          [1650277071.834099][40790:40795] CHIP:TOO:   Fabrics: 2 entries
+          [1650277071.834120][40790:40795] CHIP:TOO:     [1]: {
+          [1650277071.834126][40790:40795] CHIP:TOO:       RootPublicKey: 0426F120BC098B3BDBA37807F6C2F7F396F5CD89F81F4AF4C80C1089B9B856F1FCDC10AA8A0CF30F629FA9E13E131330C3C53D917C3048456D73E943DB63910823
+          [1650277071.834134][40790:40795] CHIP:TOO:       VendorId: 65521
+          [1650277071.834137][40790:40795] CHIP:TOO:       FabricId: 1
+          [1650277071.834141][40790:40795] CHIP:TOO:       NodeId: 1
+          [1650277071.834147][40790:40795] CHIP:TOO:       Label:
+          [1650277071.834151][40790:40795] CHIP:TOO:       FabricIndex: 1
+          [1650277071.834155][40790:40795] CHIP:TOO:      }
+          [1650277071.834161][40790:40795] CHIP:TOO:     [2]: {
+          [1650277071.834165][40790:40795] CHIP:TOO:       RootPublicKey: 045B7C9F80F17A0D5B2EA727562424A0AC978C2F4A7BBE659C9076978A6630771166AB1506D714279AFDF2A3B33A643025E0194A376A520B1F6773DB2E4993B5CF
+          [1650277071.834169][40790:40795] CHIP:TOO:       VendorId: 65521
+          [1650277071.834173][40790:40795] CHIP:TOO:       FabricId: 1
+          [1650277071.834176][40790:40795] CHIP:TOO:       NodeId: 2
+          [1650277071.834179][40790:40795] CHIP:TOO:       Label:
+          [1650277071.834182][40790:40795] CHIP:TOO:       FabricIndex: 2
+          [1650277071.834186][40790:40795] CHIP:TOO:      }
+          [1650277071.834215][40790:40795] CHIP:EM: Sending Standalone Ack for MessageCounter:15057119 on exchange 50631i
       disabled: true
 
     - label:
@@ -270,131 +166,82 @@ tests:
       verification: |
           On first controller, using chip-tool write attribute, Verify read attribute returns the updated value written.
 
-          ./chip-tool basic write user-label te5new 1 0
-
-          [1635862117.716433][3691:3696] CHIP:DMG: WriteResponse =
-          [1635862117.716467][3691:3696] CHIP:DMG: {
-          [1635862117.716497][3691:3696] CHIP:DMG:         AttributeStatusList =
-          [1635862117.716535][3691:3696] CHIP:DMG:         [
-          [1635862117.716567][3691:3696] CHIP:DMG:                 AttributeStatusIB =
-          [1635862117.716608][3691:3696] CHIP:DMG:                 {
-          [1635862117.716647][3691:3696] CHIP:DMG:                         AttributePath =
-          [1635862117.716689][3691:3696] CHIP:DMG:                         {
-          [1635862117.716734][3691:3696] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635862117.716781][3691:3696] CHIP:DMG:                                 NodeId = 0x0,
-          [1635862117.716827][3691:3696] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635862117.716871][3691:3696] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862117.716914][3691:3696] CHIP:DMG:                         }
-          [1635862117.716962][3691:3696] CHIP:DMG:
-          [1635862117.717002][3691:3696] CHIP:DMG:                         StatusIB =
-          [1635862117.717044][3691:3696] CHIP:DMG:                         {
-          [1635862117.717087][3691:3696] CHIP:DMG:                                 status = 0x0,
-          [1635862117.717130][3691:3696] CHIP:DMG:                         },
-          [1635862117.717173][3691:3696] CHIP:DMG:
-          [1635862117.717212][3691:3696] CHIP:DMG:                 },
-          [1635862117.717256][3691:3696] CHIP:DMG:
-          [1635862117.717288][3691:3696] CHIP:DMG:         ],
-          [1635862117.717330][3691:3696] CHIP:DMG:
-          [1635862117.717362][3691:3696] CHIP:DMG: }
-          [1635862117.717462][3691:3696] CHIP:ZCL: WriteResponse:
-          [1635862117.717493][3691:3696] CHIP:ZCL:   status: Success                (0x0000)
-          [1635862117.717525][3691:3696] CHIP:TOO: Default Success Response
-
-          ./chip-tool basic read user-label 1 0
-          [1635862186.734626][3701:3706] CHIP:DMG: ReportData =
-          [1635862186.734664][3701:3706] CHIP:DMG: {
-          [1635862186.734694][3701:3706] CHIP:DMG:         AttributeDataList =
-          [1635862186.734735][3701:3706] CHIP:DMG:         [
-          [1635862186.734771][3701:3706] CHIP:DMG:                 AttributeDataElement =
-          [1635862186.734809][3701:3706] CHIP:DMG:                 {
-          [1635862186.734847][3701:3706] CHIP:DMG:                         AttributePath =
-          [1635862186.734895][3701:3706] CHIP:DMG:                         {
-          [1635862186.735070][3701:3706] CHIP:DMG:                                 NodeId = 0x1,
-          [1635862186.735150][3701:3706] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862186.735220][3701:3706] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635862186.735291][3701:3706] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635862186.735335][3701:3706] CHIP:DMG:                         }
-          [1635862186.735383][3701:3706] CHIP:DMG:
-          [1635862186.735431][3701:3706] CHIP:DMG:                         Data = "te5new",
-          [1635862186.735473][3701:3706] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635862186.735533][3701:3706] CHIP:DMG:                 },
-          [1635862186.735581][3701:3706] CHIP:DMG:
-          [1635862186.735617][3701:3706] CHIP:DMG:         ],
-          [1635862186.735657][3701:3706] CHIP:DMG:
-          [1635862186.735691][3701:3706] CHIP:DMG: }
-          [1635862186.735799][3701:3706] CHIP:ZCL: ReadAttributesResponse:
-          [1635862186.735832][3701:3706] CHIP:ZCL:   ClusterId: 0x0000_0028
-          [1635862186.735868][3701:3706] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1635862186.735901][3701:3706] CHIP:ZCL:   status: Success                (0x0000)
-          [1635862186.735932][3701:3706] CHIP:ZCL:   attribute TLV Type: 0x0c
-          [1635862186.735967][3701:3706] CHIP:TOO: CharString attribute Response: te5new
+          ./chip-tool basic write node-label te8 1 0
+
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
+
+          ./chip-tool basic read node-label 1 0
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
     - label:
-          "DUT_CR2 writes and reads the Basic Information Clusters NodeLabel
-          mandatory attribute of TH_CE"
+          "DUT_CR2 reads, writes and then reads the Basic Information Clusters
+          NodeLabel mandatory attribute of TH_CE"
       verification: |
-          Using your DUT controller write attribute and read attribute to and from TH_CE
+          Using your DUT controller read, write attribute and then read attribute to and from TH_CE
+
+
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool basic write user-label te5new 2 0
-          1635862254.426741][5821:5826] CHIP:DMG: WriteResponse =
-          [1635862254.426777][5821:5826] CHIP:DMG: {
-          [1635862254.426807][5821:5826] CHIP:DMG:         AttributeStatusList =
-          [1635862254.426842][5821:5826] CHIP:DMG:         [
-          [1635862254.426876][5821:5826] CHIP:DMG:                 AttributeStatusIB =
-          [1635862254.426919][5821:5826] CHIP:DMG:                 {
-          [1635862254.426953][5821:5826] CHIP:DMG:                         AttributePath =
-          [1635862254.427002][5821:5826] CHIP:DMG:                         {
-          [1635862254.427047][5821:5826] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635862254.427085][5821:5826] CHIP:DMG:                                 NodeId = 0x0,
-          [1635862254.427138][5821:5826] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635862254.427185][5821:5826] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862254.427234][5821:5826] CHIP:DMG:                         }
-          [1635862254.427283][5821:5826] CHIP:DMG:
-          [1635862254.427321][5821:5826] CHIP:DMG:                         StatusIB =
-          [1635862254.427360][5821:5826] CHIP:DMG:                         {
-          [1635862254.427400][5821:5826] CHIP:DMG:                                 status = 0x0,
-          [1635862254.427440][5821:5826] CHIP:DMG:                         },
-          [1635862254.427481][5821:5826] CHIP:DMG:
-          [1635862254.427516][5821:5826] CHIP:DMG:                 },
-          [1635862254.427563][5821:5826] CHIP:DMG:
-          [1635862254.427597][5821:5826] CHIP:DMG:         ],
-          [1635862254.427640][5821:5826] CHIP:DMG:
-          [1635862254.427666][5821:5826] CHIP:DMG: }
-          [1635862254.427733][5821:5826] CHIP:ZCL: WriteResponse:
-          [1635862254.427764][5821:5826] CHIP:ZCL:   status: Success                (0x0000)
-          [1635862254.427798][5821:5826] CHIP:TOO: Default Success Response
-
-
-          ./chip-tool basic read user-label 1 0
-          [1635862295.008057][5829:5834] CHIP:DMG: ReportData =
-          [1635862295.008128][5829:5834] CHIP:DMG: {
-          [1635862295.008167][5829:5834] CHIP:DMG:         AttributeDataList =
-          [1635862295.008214][5829:5834] CHIP:DMG:         [
-          [1635862295.008256][5829:5834] CHIP:DMG:                 AttributeDataElement =
-          [1635862295.008310][5829:5834] CHIP:DMG:                 {
-          [1635862295.008402][5829:5834] CHIP:DMG:                         AttributePath =
-          [1635862295.008493][5829:5834] CHIP:DMG:                         {
-          [1635862295.008547][5829:5834] CHIP:DMG:                                 NodeId = 0x1,
-          [1635862295.008601][5829:5834] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862295.008654][5829:5834] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635862295.008706][5829:5834] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635862295.008755][5829:5834] CHIP:DMG:                         }
-          [1635862295.008810][5829:5834] CHIP:DMG:
-          [1635862295.008864][5829:5834] CHIP:DMG:                         Data = "te5new",
-          [1635862295.008964][5829:5834] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635862295.009035][5829:5834] CHIP:DMG:                 },
-          [1635862295.009088][5829:5834] CHIP:DMG:
-          [1635862295.009130][5829:5834] CHIP:DMG:         ],
-          [1635862295.009179][5829:5834] CHIP:DMG:
-          [1635862295.009218][5829:5834] CHIP:DMG: }
-          [1635862295.009334][5829:5834] CHIP:ZCL: ReadAttributesResponse:
-          [1635862295.009372][5829:5834] CHIP:ZCL:   ClusterId: 0x0000_0028
-          [1635862295.009412][5829:5834] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1635862295.009449][5829:5834] CHIP:ZCL:   status: Success                (0x0000)
-          [1635862295.009484][5829:5834] CHIP:ZCL:   attribute TLV Type: 0x0c
-          [1635862295.009545][5829:5834] CHIP:TOO: CharString attribute Response: te5new
+          ./chip-tool basic write node-label te5new 2 0
+
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
+
+
+          ./chip-tool basic read node-label 1 0
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
     - label: "Turn off TH_CR1"
@@ -410,32 +257,40 @@ tests:
           On your DUT controller using chip-tool open commissioning widow using BCM.
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0
-          [1635862360.234653][5838:5843] CHIP:DMG: InvokeCommand =
-          [1635862360.234697][5838:5843] CHIP:DMG: {
-          [1635862360.234728][5838:5843] CHIP:DMG:         CommandList =
-          [1635862360.234765][5838:5843] CHIP:DMG:         [
-          [1635862360.234801][5838:5843] CHIP:DMG:                 CommandDataIB =
-          [1635862360.234845][5838:5843] CHIP:DMG:                 {
-          [1635862360.234889][5838:5843] CHIP:DMG:                         CommandPathIB =
-          [1635862360.234935][5838:5843] CHIP:DMG:                         {
-          [1635862360.234978][5838:5843] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862360.235022][5838:5843] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635862360.235066][5838:5843] CHIP:DMG:                                 CommandId = 0x1,
-          [1635862360.235106][5838:5843] CHIP:DMG:                         },
-          [1635862360.235151][5838:5843] CHIP:DMG:
-          [1635862360.235186][5838:5843] CHIP:DMG:                         StatusIB =
-          [1635862360.235242][5838:5843] CHIP:DMG:                         {
-          [1635862360.235282][5838:5843] CHIP:DMG:                                 status = 0x0,
-          [1635862360.235334][5838:5843] CHIP:DMG:                         },
-          [1635862360.235386][5838:5843] CHIP:DMG:
-          [1635862360.235419][5838:5843] CHIP:DMG:                 },
-          [1635862360.235461][5838:5843] CHIP:DMG:
-          [1635862360.235495][5838:5843] CHIP:DMG:         ],
-          [1635862360.235536][5838:5843] CHIP:DMG:
-          [1635862360.235571][5838:5843] CHIP:DMG: }
-          [1635862360.235630][5838:5843] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1635862360.235666][5838:5843] CHIP:TOO: Default Success Response
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG: 	suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG: 	InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG: 	[
+          [1650278416.248630][11064:11069] CHIP:DMG: 		InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG: 		{
+          [1650278416.248783][11064:11069] CHIP:DMG: 			CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG: 			{
+          [1650278416.248931][11064:11069] CHIP:DMG: 				CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG: 				{
+          [1650278416.249100][11064:11069] CHIP:DMG: 					EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG: 					ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG: 					CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG: 				},
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG: 				StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG: 				{
+          [1650278416.249664][11064:11069] CHIP:DMG: 					status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG: 				},
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG: 			},
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG: 		},
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG: 	],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG: 	InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
@@ -445,32 +300,40 @@ tests:
           On your DUT controller using chip-tool run revoke command
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool administratorcommissioning revoke-commissioning 2 0
-          [1635862419.049107][5846:5851] CHIP:DMG: InvokeCommand =
-          [1635862419.049166][5846:5851] CHIP:DMG: {
-          [1635862419.049212][5846:5851] CHIP:DMG:         CommandList =
-          [1635862419.049266][5846:5851] CHIP:DMG:         [
-          [1635862419.049317][5846:5851] CHIP:DMG:                 CommandDataIB =
-          [1635862419.049374][5846:5851] CHIP:DMG:                 {
-          [1635862419.049438][5846:5851] CHIP:DMG:                         CommandPathIB =
-          [1635862419.049517][5846:5851] CHIP:DMG:                         {
-          [1635862419.049596][5846:5851] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635862419.049679][5846:5851] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635862419.049757][5846:5851] CHIP:DMG:                                 CommandId = 0x2,
-          [1635862419.049829][5846:5851] CHIP:DMG:                         },
-          [1635862419.049908][5846:5851] CHIP:DMG:
-          [1635862419.049974][5846:5851] CHIP:DMG:                         StatusIB =
-          [1635862419.050045][5846:5851] CHIP:DMG:                         {
-          [1635862419.050116][5846:5851] CHIP:DMG:                                 status = 0x0,
-          [1635862419.050197][5846:5851] CHIP:DMG:                         },
-          [1635862419.050277][5846:5851] CHIP:DMG:
-          [1635862419.050347][5846:5851] CHIP:DMG:                 },
-          [1635862419.050427][5846:5851] CHIP:DMG:
-          [1635862419.050488][5846:5851] CHIP:DMG:         ],
-          [1635862419.050559][5846:5851] CHIP:DMG:
-          [1635862419.050619][5846:5851] CHIP:DMG: }
-          [1635862419.050716][5846:5851] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0002 Status=0x0
-          [1635862419.050785][5846:5851] CHIP:TOO: Default Success Response
+          ./chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
@@ -479,6 +342,11 @@ tests:
       verification: |
           1. On third controller, using chip-tool connect to the accessory. Connect attempt should fail, i.e
           ./chip-tool pairing onnetwork 1 20202021
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label:
@@ -488,61 +356,141 @@ tests:
           Using your DUT controller, write attribute and read attribute to and from TH_CE
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool basic write user-label te5new 2 0
-          [1635864351.666441][5980:5985] CHIP:DMG: WriteResponse =
-          [1635864351.666480][5980:5985] CHIP:DMG: {
-          [1635864351.666513][5980:5985] CHIP:DMG:         AttributeStatusList =
-          [1635864351.666555][5980:5985] CHIP:DMG:         [
-          [1635864351.666588][5980:5985] CHIP:DMG:                 AttributeStatusIB =
-          [1635864351.666627][5980:5985] CHIP:DMG:                 {
-          [1635864351.666665][5980:5985] CHIP:DMG:                         AttributePath =
-          [1635864351.666714][5980:5985] CHIP:DMG:                         {
-          [1635864351.666764][5980:5985] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635864351.666815][5980:5985] CHIP:DMG:                                 NodeId = 0x0,
-          [1635864351.666862][5980:5985] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635864351.666908][5980:5985] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635864351.666951][5980:5985] CHIP:DMG:                         }
-          [1635864351.666999][5980:5985] CHIP:DMG:
-          [1635864351.667040][5980:5985] CHIP:DMG:                         StatusIB =
-          [1635864351.667082][5980:5985] CHIP:DMG:                         {
-          [1635864351.667125][5980:5985] CHIP:DMG:                                 status = 0x0,
-          [1635864351.667171][5980:5985] CHIP:DMG:                         },
-          [1635864351.667218][5980:5985] CHIP:DMG:
-          [1635864351.667261][5980:5985] CHIP:DMG:                 },
-          [1635864351.667307][5980:5985] CHIP:DMG:
-          [1635864351.667343][5980:5985] CHIP:DMG:         ],
-          [1635864351.667388][5980:5985] CHIP:DMG:
-          [1635864351.667418][5980:5985] CHIP:DMG: }
-          [1635864351.667490][5980:5985] CHIP:ZCL: WriteResponse:
-          [1635864351.667524][5980:5985] CHIP:ZCL:   status: Success                (0x0000)
-          [1635864351.667561][5980:5985] CHIP:TOO: Default Success Response
-
-          ./chip-tool basic read user-label 2 0
-          [1635864420.313679][5988:5993] CHIP:DMG: ReportData =
-          [1635864420.313742][5988:5993] CHIP:DMG: {
-          [1635864420.313777][5988:5993] CHIP:DMG:         AttributeDataList =
-          [1635864420.313812][5988:5993] CHIP:DMG:         [
-          [1635864420.313849][5988:5993] CHIP:DMG:                 AttributeDataElement =
-          [1635864420.313911][5988:5993] CHIP:DMG:                 {
-          [1635864420.313970][5988:5993] CHIP:DMG:                         AttributePath =
-          [1635864420.314024][5988:5993] CHIP:DMG:                         {
-          [1635864420.314071][5988:5993] CHIP:DMG:                                 NodeId = 0x2,
-          [1635864420.314114][5988:5993] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635864420.314166][5988:5993] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635864420.314215][5988:5993] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635864420.314264][5988:5993] CHIP:DMG:                         }
-          [1635864420.314339][5988:5993] CHIP:DMG:
-          [1635864420.314417][5988:5993] CHIP:DMG:                         Data = "te5new",
-          [1635864420.314480][5988:5993] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635864420.314542][5988:5993] CHIP:DMG:                 },
-          [1635864420.314589][5988:5993] CHIP:DMG:
-          [1635864420.314627][5988:5993] CHIP:DMG:         ],
-          [1635864420.314669][5988:5993] CHIP:DMG:
-          [1635864420.314703][5988:5993] CHIP:DMG: }
-          [1635864420.314807][5988:5993] CHIP:ZCL: ReadAttributesResponse:
-          [1635864420.314841][5988:5993] CHIP:ZCL:   ClusterId: 0x0000_0028
-          [1635864420.314876][5988:5993] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1635864420.314908][5988:5993] CHIP:ZCL:   status: Success                (0x0000)
-          [1635864420.314940][5988:5993] CHIP:ZCL:   attribute TLV Type: 0x0c
-          [1635864420.314975][5988:5993] CHIP:TOO: CharString attribute Response: te5new
+          ./chip-tool basic write node-label te5new 2 0
+
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
+
+          ./chip-tool basic read node-label 2 0
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
+      disabled: true
+
+    - label: "DUT_CR2 opens a commissioning window on TH_CE using BCM"
+      verification: |
+          On your DUT controller using chip-tool open commissioning widow using BCM.
+
+          Below is the example while using chip tool on second controller,
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "Wait for commissioning window that was opened in step 13 to timeout"
+      verification: |
+          Wait for the timeout of commissioning window in the above step
+      disabled: true
+
+    - label: "DUT_CR2 opens a commissioning window on TH_CE using BCM"
+      verification: |
+          On your DUT controller using chip-tool open commissioning widow using BCM.
+
+          Below is the example while using chip tool on second controller,
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "TH_CR1 starts a commissioning process with TH_CE before the timeout
+          from step 15"
+      verification: |
+          Using your 1st Controller connect to the accessory.
+
+          Below is the example when using chip tool as controller
+          ./chip-tool pairing onnetwork 1 20202021
+
+          [1651786200275] [36301:315544] CHIP: [DMG] Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651786200275] [36301:315544] CHIP: [CTL] Device returned status 9 on receiving the NOC
+          [1651786200275] [36301:315544] CHIP: [CTL] Add NOC failed with error ../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists
+          [1651786200275] [36301:315544] CHIP: [CTL] Error on commissioning step 'SendNOC': '../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists'
+
+          Verify that the commissioning process fails as TH_CE was already commissioned by TH_CR1 in step 1
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_25.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_25.yaml
index 4a54f6fcc76911..df6700eff33abf 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_25.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_25.yaml
@@ -30,24 +30,70 @@ tests:
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE using BCM"
       verification: |
-          1. Provision the device using 1st controller chip tool(use above instructions) ,
+          "1. Provision the device using 1st controller chip tool(use above instructions) ,
+          "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE with a value of 15
-          minutes"
+          "TH_CR1 opens a commissioning window on DUT_CE with a value of 900
+          seconds"
       verification: |
           On 1st controller chip tool, open commissioning window
 
           For BCM,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 900 1 0
+
+
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 900 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
-    - label: "Wait for commissioning Window to Timeout"
+    - label: "Wait for commissioning Window to 901 seconds"
       verification: |
           Wait for commissioning Window to Timeout
       disabled: true
 
+    - label:
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
+      verification: |
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
+      disabled: true
+
     - label:
           "TH_CR1 opens a commissioning window on DUT_CE with a value of 901
           seconds"
@@ -55,10 +101,21 @@ tests:
           On 1st controller chip tool, open commissioning window
 
           For BCM,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 901 1 0
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 901 2 0 --timedInteractionTimeoutMs 1000
+
+          CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x85
+          [1652860801.225084][9512:9517] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
+          [1652860801.225173][9512:9517] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1652860801.225294][9512:9517] CHIP:EM: Sending Standalone Ack for MessageCounter:4191961 on exchange 37827i
       disabled: true
 
-    - label: "Wait for commissioning Window to Timeout"
+    - label:
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
       verification: |
-          Wait for commissioning Window to Timeout
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_26.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_26.yaml
index 4dc01d3d2d5b63..39fbc3f1c26f2f 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_26.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_26.yaml
@@ -23,14 +23,20 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Reset DUT_CE to factory defaults"
+      verification: |
+
+      disabled: true
+
     - label: "TH_CR1 starts a commissioning process with DUT_CE using ECM"
       verification: |
-          1. Provision the device using 1st controller chip tool(use above instructions) ,
+          "1. Provision the device using 1st controller chip tool(use above instructions) ,
+          "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE with a value of 15
-          minutes"
+          "TH_CR1 opens a commissioning window on DUT_CE with a value of 900
+          seconds"
       verification: |
           On 1st controller chip tool, open commissioning window
 
@@ -38,7 +44,7 @@ tests:
 
 
           For ECM,
-          ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
+          ./chip-tool pairing open-commissioning-window 1 1 900 1000 3840
 
           [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
           [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
@@ -53,11 +59,21 @@ tests:
           [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
-    - label: "Wait for commissioning Window to Timeout"
+    - label: "Wait for commissioning Window to 901 seconds"
       verification: |
           Wait for commissioning Window to Timeout
       disabled: true
 
+    - label:
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
+      verification: |
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
+      disabled: true
+
     - label:
           "TH_CR1 opens a commissioning window on DUT_CE with a value of 901
           seconds"
@@ -68,22 +84,20 @@ tests:
 
 
           For ECM,
-          ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
+          ./chip-tool pairing open-commissioning-window 1 1 901 1000 3840
 
-          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
-          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
-          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
-          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
-          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
-          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
-          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
-          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [36217551633]
-          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
-          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
+          CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x85
+          [1652860801.225084][9512:9517] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
+          [1652860801.225173][9512:9517] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1652860801.225294][9512:9517] CHIP:EM: Sending Standalone Ack for MessageCounter:4191961 on exchange 37827i
       disabled: true
 
-    - label: "Wait for commissioning Window to Timeout"
+    - label:
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
       verification: |
-          Wait for commissioning Window to Timeout
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_5.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_5.yaml
index e3eee90b82d022..e04f931bcce9bf 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_5.yaml
@@ -76,31 +76,7 @@ tests:
       arguments:
           values:
               - name: "ms"
-                value: 54000
-
-    - label: "Wait for PIXIT_COMM_WIN(180) + 10 seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for PIXIT_COMM_WIN(180) + 10 seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for PIXIT_COMM_WIN(180) + 10 seconds"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 28000
+                value: 190000
 
     - label: "TH_CR2 starts a commissioning process with DUT_CE"
       identity: "beta"
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_6.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_6.yaml
index c749c95dc5c958..2fb15ce3b7dbed 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_6.yaml
@@ -75,31 +75,7 @@ tests:
       arguments:
           values:
               - name: "ms"
-                value: 54000
-
-    - label: "Wait for PIXIT_COMM_WIN(180) + 10"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for PIXIT_COMM_WIN(180) + 10"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 54000
-
-    - label: "Wait for PIXIT_COMM_WIN(180) + 10"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 28000
+                value: 190000
 
     - label: "Commission from beta"
       identity: "beta"
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_7.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_7.yaml
index b5bd853c17b15f..6864e406edd5e3 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_7.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    22.1.7. [TC-MF-1.7] Commissioning window handling timeout and revocation
+    3.1.7. [TC-MF-1.7] Commissioning window handling timeout and revocation
     using ECM [DUT - Commissioner]
 
 config:
@@ -51,15 +51,41 @@ tests:
           [1635871058.916745][4273:4278] CHIP:EM: Sending Standalone Ack for MessageCounter:2599714279 on exchange 21936i
       disabled: true
 
+    - label:
+          "If (PICS_User Interface Display) A User Consent screen pops up asking
+          for Users permission to allow second commissioner to control TH_CE"
+      verification: |
+          Verify the User Consent pop up screen. Verify that the pop up closes after user gives permission
+      disabled: true
+
+    - label:
+          "If (PICS_User Interface Display) 11 digit Manual Code is displayed on
+          the screen in textual format for User to see"
+      verification: |
+          Verify that the displayed Manual Code is 11 digits long and doesn’t contain Vendor_ID or Product_ID.
+      disabled: true
+
+    - label:
+          "If (PICS_Audio Interface) A voice prompt of the Manual Code format
+          should be heard"
+      verification: |
+          Verify voice prompt saying the manual code. Verify the voice prompt repeats if user asks.
+      disabled: true
+
     - label:
           "TH_CR2 starts a commissioning process with TH_CE after PIXIT_COMM_WIN
-          + 10 seconds"
+          (that was given in step 2) + 10 seconds"
       verification: |
           On the 2nd controller using chip-tool , connect using manual code generated by DUT Controller
 
 
           Below is the example when using chip tool as controller (considering 36366524220 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 36366524220
+          ./chip-tool pairing manualcode 1 36366524220
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label:
@@ -70,7 +96,7 @@ tests:
 
           Below is the example while using chip tool as controller,
 
-          ./chip-tool pairing open-commissioning-window 1 1 100 1000 3840
+          ./chip-tool pairing open-commissioning-window 1 1 200 1000 3840
 
 
           [1635871112.112515][4282:4287] CHIP:SC: Success status report received. Session was established
@@ -94,32 +120,39 @@ tests:
 
           Below is the example while using chip tool as controller,
 
-          ./chip-tool administratorcommissioning revoke-commissioning 1 0
-          [1635871162.467911][4291:4296] CHIP:DMG: InvokeCommand =
-          [1635871162.467970][4291:4296] CHIP:DMG: {
-          [1635871162.468019][4291:4296] CHIP:DMG:         CommandList =
-          [1635871162.468085][4291:4296] CHIP:DMG:         [
-          [1635871162.468151][4291:4296] CHIP:DMG:                 CommandDataIB =
-          [1635871162.468221][4291:4296] CHIP:DMG:                 {
-          [1635871162.468287][4291:4296] CHIP:DMG:                         CommandPathIB =
-          [1635871162.468367][4291:4296] CHIP:DMG:                         {
-          [1635871162.468447][4291:4296] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635871162.468541][4291:4296] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635871162.468620][4291:4296] CHIP:DMG:                                 CommandId = 0x2,
-          [1635871162.468708][4291:4296] CHIP:DMG:                         },
-          [1635871162.468793][4291:4296] CHIP:DMG:
-          [1635871162.468861][4291:4296] CHIP:DMG:                         StatusIB =
-          [1635871162.468938][4291:4296] CHIP:DMG:                         {
-          [1635871162.469002][4291:4296] CHIP:DMG:                                 status = 0x0,
-          [1635871162.469088][4291:4296] CHIP:DMG:                         },
-          [1635871162.469160][4291:4296] CHIP:DMG:
-          [1635871162.469222][4291:4296] CHIP:DMG:                 },
-          [1635871162.469297][4291:4296] CHIP:DMG:
-          [1635871162.469350][4291:4296] CHIP:DMG:         ],
-          [1635871162.469478][4291:4296] CHIP:DMG:
-          [1635871162.469535][4291:4296] CHIP:DMG: }
-          [1635871162.469634][4291:4296] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0002 Status=0x0
-          [1635871162.469704][4291:4296] CHIP:TOO: Default Success Response
+          ./chip-tool administratorcommissioning revoke-commissioning 1 0 --timedInteractionTimeoutMs 1000
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label: "TH_CR2 starts a commissioning process with TH_CE"
@@ -128,7 +161,12 @@ tests:
 
 
           Below is the example when using chip tool as controller (considering 34921141778 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 34921141778
+          ./chip-tool pairing manualcode 1 34921141778
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label:
@@ -139,100 +177,81 @@ tests:
 
           Below is the example while using chip tool as controller,
 
-          ./chip-tool administratorcommissioning revoke-commissioning 1 0
-
-          [1635871227.659965][4299:4304] CHIP:DMG: InvokeCommand =
-          [1635871227.659996][4299:4304] CHIP:DMG: {
-          [1635871227.660024][4299:4304] CHIP:DMG:         CommandList =
-          [1635871227.660059][4299:4304] CHIP:DMG:         [
-          [1635871227.660091][4299:4304] CHIP:DMG:                 CommandDataIB =
-          [1635871227.660129][4299:4304] CHIP:DMG:                 {
-          [1635871227.660164][4299:4304] CHIP:DMG:                         CommandPathIB =
-          [1635871227.660236][4299:4304] CHIP:DMG:                         {
-          [1635871227.660317][4299:4304] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635871227.660382][4299:4304] CHIP:DMG:                                 ClusterId = 0x3c,
-          [1635871227.660424][4299:4304] CHIP:DMG:                                 CommandId = 0x2,
-          [1635871227.660483][4299:4304] CHIP:DMG:                         },
-          [1635871227.660550][4299:4304] CHIP:DMG:
-          [1635871227.660587][4299:4304] CHIP:DMG:                         StatusIB =
-          [1635871227.660648][4299:4304] CHIP:DMG:                         {
-          [1635871227.660708][4299:4304] CHIP:DMG:                                 status = 0x0,
-          [1635871227.660744][4299:4304] CHIP:DMG:                         },
-          [1635871227.660803][4299:4304] CHIP:DMG:
-          [1635871227.660852][4299:4304] CHIP:DMG:                 },
-          [1635871227.660937][4299:4304] CHIP:DMG:
-          [1635871227.660976][4299:4304] CHIP:DMG:         ],
-          [1635871227.661015][4299:4304] CHIP:DMG:
-          [1635871227.661046][4299:4304] CHIP:DMG: }
-          [1635871227.661104][4299:4304] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0002 Status=0x0
-          [1635871227.661181][4299:4304] CHIP:TOO: Default Success Response
+          /chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650524034.111241][15422:15427] CHIP:DMG: {
+          [1650524034.111316][15422:15427] CHIP:DMG:         suppressResponse = false,
+          [1650524034.111383][15422:15427] CHIP:DMG:         InvokeResponseIBs =
+          [1650524034.111464][15422:15427] CHIP:DMG:         [
+          [1650524034.111531][15422:15427] CHIP:DMG:                 InvokeResponseIB =
+          [1650524034.111643][15422:15427] CHIP:DMG:                 {
+          [1650524034.111714][15422:15427] CHIP:DMG:                         CommandStatusIB =
+          [1650524034.111803][15422:15427] CHIP:DMG:                         {
+          [1650524034.111886][15422:15427] CHIP:DMG:                                 CommandPathIB =
+          [1650524034.111979][15422:15427] CHIP:DMG:                                 {
+          [1650524034.112072][15422:15427] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650524034.112167][15422:15427] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650524034.112257][15422:15427] CHIP:DMG:                                         CommandId = 0x2,
+          [1650524034.112345][15422:15427] CHIP:DMG:                                 },
+          [1650524034.112456][15422:15427] CHIP:DMG:
+          [1650524034.112543][15422:15427] CHIP:DMG:                                 StatusIB =
+          [1650524034.112632][15422:15427] CHIP:DMG:                                 {
+          [1650524034.112727][15422:15427] CHIP:DMG:                                         status = 0x01 (FAILURE),
+          [1650524034.112825][15422:15427] CHIP:DMG:                                         cluster-status = 0x3,
+          [1650524034.112914][15422:15427] CHIP:DMG:                                 },
+          [1650524034.113005][15422:15427] CHIP:DMG:
+          [1650524034.113084][15422:15427] CHIP:DMG:                         },
+          [1650524034.113176][15422:15427] CHIP:DMG:
+          [1650524034.113245][15422:15427] CHIP:DMG:                 },
+          [1650524034.113328][15422:15427] CHIP:DMG:
+          [1650524034.113392][15422:15427] CHIP:DMG:         ],
+          [1650524034.113477][15422:15427] CHIP:DMG:
+          [1650524034.113545][15422:15427] CHIP:DMG:         InteractionModelRevision = 1
+          [1650524034.113610][15422:15427] CHIP:DMG: },
+          [1650524034.113780][15422:15427] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0002 Status=0x1
+          [1650524034.113892][15422:15427] CHIP:TOO: Error: IM Error 0x00000603: Cluster-specific error: 0x03
       disabled: true
 
     - label:
           "DUT_CR1 writes and reads the Basic Information Clusters NodeLabel
           mandatory attribute of TH_CE"
       verification: |
-          On your DUT controller write and read Basic Information Cluster NodeLabel mandatory attribute of TH_CE
-
-          Below is the example while using chip tool as controller,
+          Using your DUT controller, write attribute and read attribute to and from TH_CE
 
+          Below is the example while using chip tool on second controller,
           ./chip-tool basic write node-label te5new 1 0
-          [1635871273.030352][4308:4313] CHIP:DMG: {
-          [1635871273.030381][4308:4313] CHIP:DMG:         AttributeStatusList =
-          [1635871273.030446][4308:4313] CHIP:DMG:         [
-          [1635871273.030516][4308:4313] CHIP:DMG:                 AttributeStatusIB =
-          [1635871273.030590][4308:4313] CHIP:DMG:                 {
-          [1635871273.030639][4308:4313] CHIP:DMG:                         AttributePath =
-          [1635871273.030709][4308:4313] CHIP:DMG:                         {
-          [1635871273.030778][4308:4313] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635871273.030832][4308:4313] CHIP:DMG:                                 NodeId = 0x0,
-          [1635871273.030903][4308:4313] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635871273.031010][4308:4313] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635871273.031055][4308:4313] CHIP:DMG:                         }
-          [1635871273.031103][4308:4313] CHIP:DMG:
-          [1635871273.031145][4308:4313] CHIP:DMG:                         StatusIB =
-          [1635871273.031187][4308:4313] CHIP:DMG:                         {
-          [1635871273.031230][4308:4313] CHIP:DMG:                                 status = 0x0,
-          [1635871273.031272][4308:4313] CHIP:DMG:                         },
-          [1635871273.031322][4308:4313] CHIP:DMG:
-          [1635871273.031476][4308:4313] CHIP:DMG:                 },
-          [1635871273.031529][4308:4313] CHIP:DMG:
-          [1635871273.031565][4308:4313] CHIP:DMG:         ],
-          [1635871273.031608][4308:4313] CHIP:DMG:
-          [1635871273.031642][4308:4313] CHIP:DMG: }
-          [1635871273.031716][4308:4313] CHIP:ZCL: WriteResponse:
-          [1635871273.031745][4308:4313] CHIP:ZCL:   status: Success                (0x0000)
-          [1635871273.031780][4308:4313] CHIP:TOO: Default Success Response
-
-
-          ./chip-tool basic read node-label 1 0
-          [1635871312.835941][4314:4319] CHIP:DMG: ReportData =
-          [1635871312.835978][4314:4319] CHIP:DMG: {
-          [1635871312.836007][4314:4319] CHIP:DMG:         AttributeDataList =
-          [1635871312.836045][4314:4319] CHIP:DMG:         [
-          [1635871312.836085][4314:4319] CHIP:DMG:                 AttributeDataElement =
-          [1635871312.836126][4314:4319] CHIP:DMG:                 {
-          [1635871312.836164][4314:4319] CHIP:DMG:                         AttributePath =
-          [1635871312.836204][4314:4319] CHIP:DMG:                         {
-          [1635871312.836246][4314:4319] CHIP:DMG:                                 NodeId = 0x1,
-          [1635871312.836296][4314:4319] CHIP:DMG:                                 EndpointId = 0x0,
-          [1635871312.836345][4314:4319] CHIP:DMG:                                 ClusterId = 0x28,
-          [1635871312.836395][4314:4319] CHIP:DMG:                                 FieldTag = 0x0000_0005,
-          [1635871312.836440][4314:4319] CHIP:DMG:                         }
-          [1635871312.836491][4314:4319] CHIP:DMG:
-          [1635871312.836543][4314:4319] CHIP:DMG:                         Data = "te5new",
-          [1635871312.836588][4314:4319] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1635871312.836632][4314:4319] CHIP:DMG:                 },
-          [1635871312.836678][4314:4319] CHIP:DMG:
-          [1635871312.836709][4314:4319] CHIP:DMG:         ],
-          [1635871312.836752][4314:4319] CHIP:DMG:
-          [1635871312.836785][4314:4319] CHIP:DMG: }
-          [1635871312.836891][4314:4319] CHIP:ZCL: ReadAttributesResponse:
-          [1635871312.836923][4314:4319] CHIP:ZCL:   ClusterId: 0x0000_0028
-          [1635871312.836958][4314:4319] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1635871312.836990][4314:4319] CHIP:ZCL:   status: Success                (0x0000)
-          [1635871312.837017][4314:4319] CHIP:ZCL:   attribute TLV Type: 0x0c
-          [1635871312.837050][4314:4319] CHIP:TOO: CharString attribute Response: te5new
+
+          CHIP:DMG: WriteResponseMessage =
+          [1649245940.788522][10110:10115] CHIP:DMG: {
+          [1649245940.788577][10110:10115] CHIP:DMG:         AttributeStatusIBs =
+          [1649245940.788653][10110:10115] CHIP:DMG:         [
+          [1649245940.788713][10110:10115] CHIP:DMG:                 AttributeStatusIB =
+          [1649245940.788787][10110:10115] CHIP:DMG:                 {
+          [1649245940.788852][10110:10115] CHIP:DMG:                         AttributePathIB =
+          [1649245940.788931][10110:10115] CHIP:DMG:                         {
+          [1649245940.789009][10110:10115] CHIP:DMG:                                 Endpoint = 0x0,
+          [1649245940.789143][10110:10115] CHIP:DMG:                                 Cluster = 0x28,
+          [1649245940.789228][10110:10115] CHIP:DMG:                                 Attribute = 0x0000_0005,
+          [1649245940.789313][10110:10115] CHIP:DMG:                         }
+          [1649245940.789388][10110:10115] CHIP:DMG:
+          [1649245940.789454][10110:10115] CHIP:DMG:                         StatusIB =
+          [1649245940.789519][10110:10115] CHIP:DMG:                         {
+          [1649245940.789588][10110:10115] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1649245940.789654][10110:10115] CHIP:DMG:                         },
+          [1649245940.789719][10110:10115] CHIP:DMG:
+          [1649245940.789778][10110:10115] CHIP:DMG:                 },
+          [1649245940.789841][10110:10115] CHIP:DMG:
+          [1649245940.789885][10110:10115] CHIP:DMG:         ],
+          [1649245940.789941][10110:10115] CHIP:DMG:
+          [1649245940.789984][10110:10115] CHIP:DMG:         InteractionModelRevision = 1
+          [1649245940.790033][10110:10115] CHIP:DMG: }
+          [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
+
+          ./chip-tool basic read node-label 2 0
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
     - label:
@@ -264,7 +283,10 @@ tests:
 
 
           Below is the example when using chip tool as controller (considering 35256543344 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 35256543344
+          ./chip-tool pairing manualcode 1 35256543344
+
+          Verify you got below message
+          Device commissioning completed with success
       disabled: true
 
     - label: "TH_CR3 starts a commissioning process with TH_CE"
@@ -273,5 +295,10 @@ tests:
 
 
           Below is the example when using chip tool as controller (considering 35256543344 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 35256543344
+          ./chip-tool pairing manualcode 1 35256543344
+
+          verify you got the following message in the TH log
+          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
+          CHIP:TOO: Secure Pairing Failed
+          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_9.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_9.yaml
index 4022bf84d2996e..ad3116782d7c7a 100644
--- a/src/app/tests/suites/certification/Test_TC_MF_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MF_1_9.yaml
@@ -18,46 +18,385 @@ name:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic"
+    timeout: 700
+    nodeIdForDuplicateCommissioning:
+        type: NODE_ID
+        defaultValue: 0x11
+    nodeId2:
+        type: NODE_ID
+        defaultValue: 0xCAFE
+    nodeId3:
+        type: NODE_ID
+        defaultValue: 0xC00FEE
     endpoint: 0
+    discriminator:
+        type: INT16U
+        defaultValue: 3840
+    payload:
+        type: CHAR_STRING
+        defaultValue: "MT:-24J0AFN00KA0648G00"
+    payload2:
+        type: CHAR_STRING
+        defaultValue: "MT:0000000000I.0648G00"
 
 tests:
+    - label: "Reboot target device"
+      cluster: "SystemCommands"
+      command: "Reboot"
+      arguments:
+          values:
+              - name: "discriminator"
+                value: discriminator
+
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
-      verification: |
-          1. Provision the device using 1st python controller on the raspi (use above instructions)
-      disabled: true
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH_CR1 opens a new commissioning window on DUT_CE"
+      cluster: "AdministratorCommissioning"
+      command: "OpenCommissioningWindow"
+      timedInteractionTimeoutMs: 10000
+      arguments:
+          values:
+              - name: "CommissioningTimeout"
+                value: 180
+              - name: "PAKEVerifier"
+                value: "\x06\xc7\x56\xdf\xfc\xd7\x22\x65\x34\x52\xa1\x2d\xcd\x94\x5d\x8c\x54\xda\x2b\x0f\x3c\xbd\x1b\x4d\xc3\xf1\xad\xb2\x23\xae\xb2\x6b\x04\x7c\xd2\x4c\x96\x86\x6f\x97\x9b\x1d\x83\xec\x50\xe2\xb4\xae\x30\xcd\xf2\xfd\xb3\x2b\xd8\xa2\x11\xb8\x37\xdc\x94\xed\xcd\x56\xf4\xd1\x43\x77\x19\x10\x76\xbf\xc5\x9d\x99\xb7\xdd\x30\x53\xef\xd6\xf0\x2c\x44\x34\xf2\xbd\xd2\x7a\xa4\xf9\xce\xa7\x0d\x73\x8e\x4c"
+              - name: "discriminator"
+                value: discriminator
+              - name: "iterations"
+                value: 1000
+              - name: "salt"
+                value: "SPAKE2P Key Salt"
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT_COMM_WIN seconds using ECM"
-      verification: |
-          On 1st controller, using chip-tool, send the open-commissioning-window CMD for ECM. -t stands for timeout value, -o for OriginalSetupCode/TokenWithRandomPIN/TokenWithProvidedPIN , -d for descriminator -i for iteration count. Ref to cmd help.
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
-          ./chip-tool pairing open-commissioning-window 1 1 200 1000 3840
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
-          [1635864513.699433][3850:3855] CHIP:DMG: ICR moving to [CommandSen]
-          [1635864513.699489][3850:3855] CHIP:CTL: Manual pairing code: [36177160937]
-          [1635864513.699566][3850:3855] CHIP:CTL: SetupQRCode: [MT:00000CQM00YZN476420]
-          [1635864513.699636][3850:3855] CHIP:EM: Sending Standalone Ack for MessageCounter:2599714227 on exchange 60688i
-          [1635864513.699685][3850:3855] CHIP:IN: Prepared plaintext message 0xffff8a7cd960 to 0x0000000000000000 of type 0x10 and protocolId (0, 0) on exchange 60688i with MessageCounter:3019982536.
-          [1635864513.699737][3850:3855] CHIP:IN: Sending plaintext msg 0xffff8a7cd960 with MessageCounter:3019982536 to 0x0000000000000000 at monotonic time: 6085358 msec
-          [1635864513.699834][3850:3855] CHIP:EM: Flushed pending ack for MessageCounter:2599714227 on exchange 60688i
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
-          The setup pin code is extracted from the manual pairing code in the log and that will be used when pairing the 2nd admin controller.
-      disabled: true
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
     - label:
-          "Set up a TH_CR2 to start attempting to do PASE to DUT_CE and failing
-          20 times. This can be done using an invalid passcode"
-      verification: |
-          1. On 2nd controller using chip-tool connect using wrong manual code. Repeat the step for 20 times.
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
-          ./chip-tool pairing code 1 36177160938  (With wrong manual code)
-      disabled: true
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
-    - label: "TH_CR2 starts a 21st commissioning process"
-      verification: |
-          1. On 2nd controller using chip tool connect using correct passcode.
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
+
+    - label:
+          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          code"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId2
+              - name: "payload"
+                value: payload2
+      response:
+          error: FAILURE
 
-          ./chip-tool pairing code 1 36177160937 (correct passcode)
-      disabled: true
+    - label: "TH_CR3 starts a commissioning process with DUT_CE"
+      identity: "gamma"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId3
+              - name: "payload"
+                value: payload
+      response:
+          error: FAILURE
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_1.yaml
deleted file mode 100644
index 5d043e77d0f566..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_1.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.1. [TC-NC-1.1] Verification on wifi connection and attributes check [DUT -
-    Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Factory reset the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 is commissioned with DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 reads Descriptor Cluster from the DUT with EP0 TH1 reads
-          ServerList from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool descriptor read server-list 1 0
-
-          [1646214614.113925][6900:6905] CHIP:DMG:        SuppressResponse = true,
-          [1646214614.113950][6900:6905] CHIP:DMG:        InteractionModelRevision = 1
-          [1646214614.113972][6900:6905] CHIP:DMG: }
-          [1646214614.115636][6900:6905] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001DataVersion: 3460417267
-          [1646214614.115731][6900:6905] CHIP:TOO:   server list: 25 entries
-          [1646214614.115784][6900:6905] CHIP:TOO:     [1]: 3
-          [1646214614.115810][6900:6905] CHIP:TOO:     [2]: 4
-          [1646214614.115834][6900:6905] CHIP:TOO:     [3]: 29
-          [1646214614.115858][6900:6905] CHIP:TOO:     [4]: 30
-          [1646214614.115882][6900:6905] CHIP:TOO:     [5]: 31
-          [1646214614.115906][6900:6905] CHIP:TOO:     [6]: 40
-          [1646214614.115930][6900:6905] CHIP:TOO:     [7]: 42
-          [1646214614.115954][6900:6905] CHIP:TOO:     [8]: 43
-          [1646214614.115978][6900:6905] CHIP:TOO:     [9]: 44
-          [1646214614.116002][6900:6905] CHIP:TOO:     [10]: 45
-          [1646214614.116025][6900:6905] CHIP:TOO:     [11]: 46
-          [1646214614.116049][6900:6905] CHIP:TOO:     [12]: 48
-          [1646214614.116073][6900:6905] CHIP:TOO:     [13]: 49
-          [1646214614.116096][6900:6905] CHIP:TOO:     [14]: 50
-          [1646214614.116120][6900:6905] CHIP:TOO:     [15]: 51
-          [1646214614.116144][6900:6905] CHIP:TOO:     [16]: 52
-          [1646214614.116168][6900:6905] CHIP:TOO:     [17]: 53
-          [1646214614.116192][6900:6905] CHIP:TOO:     [18]: 54
-          [1646214614.116215][6900:6905] CHIP:TOO:     [19]: 55
-          [1646214614.116239][6900:6905] CHIP:TOO:     [20]: 60
-          [1646214614.116263][6900:6905] CHIP:TOO:     [21]: 62
-          [1646214614.116287][6900:6905] CHIP:TOO:     [22]: 63
-          [1646214614.116310][6900:6905] CHIP:TOO:     [23]: 64
-          [1646214614.116334][6900:6905] CHIP:TOO:     [24]: 65
-          [1646214614.116358][6900:6905] CHIP:TOO:     [25]: 1029
-          [1646214614.116434][6900:6905] CHIP:EM: Sending Standalone Ack for MessageCounter:1857540 on exchange 31492i
-      disabled: true
-
-    - label: "TH1 reads FeatureMap attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read feature-map 1 0
-
-          [1646216292.917209][7008:7013] CHIP:DMG:        SuppressResponse = true,
-          [1646216292.917233][7008:7013] CHIP:DMG:        InteractionModelRevision = 1
-          [1646216292.917255][7008:7013] CHIP:DMG: }
-          [1646216292.917396][7008:7013] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFCDataVersion: 1979781767
-          [1646216292.917463][7008:7013] CHIP:TOO:   FeatureMap: 2
-          [1646216292.917535][7008:7013] CHIP:EM: Sending Standalone Ack for MessageCounter:182244 on exchange 2996i
-      disabled: true
-
-    - label: "TH1 reads the MaxNetworks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read max-networks 1 0
-
-          [1646216356.472036][7021:7026] CHIP:DMG:        SuppressResponse = true,
-          [1646216356.472088][7021:7026] CHIP:DMG:        InteractionModelRevision = 1
-          [1646216356.472136][7021:7026] CHIP:DMG: }
-          [1646216356.472388][7021:7026] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 1979781767
-          [1646216356.472511][7021:7026] CHIP:TOO:   MaxNetworks: 1
-          [1646216356.472624][7021:7026] CHIP:EM: Sending Standalone Ack for MessageCounter:4914191 on exchange 38527i
-      disabled: true
-
-    - label: "TH1 reads the Networks attribute list from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read networks 1 0
-
-          [1646216660.523645][7061:7066] CHIP:DMG:        SuppressResponse = true,
-          [1646216660.523697][7061:7066] CHIP:DMG:        InteractionModelRevision = 1
-          [1646216660.523748][7061:7066] CHIP:DMG: }
-          [1646216660.524025][7061:7066] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 1979781767
-          [1646216660.524156][7061:7066] CHIP:TOO:   Networks: 0 entries
-          [1646216660.524291][7061:7066] CHIP:EM: Sending Standalone Ack for MessageCounter:14276450 on exchange 28012i
-      disabled: true
-
-    - label: "TH1 reads ScanMaxTimeSeconds attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read connect-max-time-seconds 1 0
-
-          [1646216949.280140][7091:7096] CHIP:DMG:        SuppressResponse = true,
-          [1646216949.280193][7091:7096] CHIP:DMG:        InteractionModelRevision = 1
-          [1646216949.280240][7091:7096] CHIP:DMG: }
-          [1646216949.280501][7091:7096] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0003DataVersion: 1979781767
-          [1646216949.280624][7091:7096] CHIP:TOO:   ConnectMaxTimeSeconds: 20
-          [1646216949.280737][7091:7096] CHIP:EM: Sending Standalone Ack for MessageCounter:8269595 on exchange 2666i
-      disabled: true
-
-    - label: "TH1 reads ConnectMaxTimeSeconds Attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read scan-max-time-seconds 1 0
-
-          [1646216873.504483][7078:7083] CHIP:DMG:        SuppressResponse = true,
-          [1646216873.504519][7078:7083] CHIP:DMG:        InteractionModelRevision = 1
-          [1646216873.504552][7078:7083] CHIP:DMG: }
-          [1646216873.504741][7078:7083] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0002DataVersion: 1979781767
-          [1646216873.504833][7078:7083] CHIP:TOO:   ScanMaxTimeSeconds: 10
-          [1646216873.504917][7078:7083] CHIP:EM: Sending Standalone Ack for MessageCounter:6708918 on exchange 13997i
-      disabled: true
-
-    - label: "TH1 reads InterfaceEnabled attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read interface-enabled 1 0
-
-          [1646217021.862336][7106:7111] CHIP:DMG:        SuppressResponse = true,
-          [1646217021.862397][7106:7111] CHIP:DMG:        InteractionModelRevision = 1
-          [1646217021.862452][7106:7111] CHIP:DMG: }
-          [1646217021.862746][7106:7111] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004DataVersion: 1979781767
-          [1646217021.862850][7106:7111] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1646217021.863094][7106:7111] CHIP:EM: Sending Standalone Ack for MessageCounter:3161135 on exchange 55787i
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read  last-networking-status 1 0
-
-
-          [1646217109.850089][7117:7122] CHIP:DMG:        SuppressResponse = true,
-          [1646217109.850135][7117:7122] CHIP:DMG:        InteractionModelRevision = 1
-          [1646217109.850177][7117:7122] CHIP:DMG: }
-          [1646217109.850450][7117:7122] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 1979781767
-          [1646217109.850562][7117:7122] CHIP:TOO:   LastNetworkingStatus: 0
-          [1646217109.850669][7117:7122] CHIP:EM: Sending Standalone Ack for MessageCounter:4481761 on exchange 38865i
-      disabled: true
-
-    - label:
-          "TH1 reads the LastNetworkID attribute from the DUT TH1 reads the
-          Networks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read last-network-id 1 0
-
-          [1646217207.932462][7127:7132] CHIP:DMG:        SuppressResponse = true,
-          [1646217207.932516][7127:7132] CHIP:DMG:        InteractionModelRevision = 1
-          [1646217207.932565][7127:7132] CHIP:DMG: }
-          [1646217207.932823][7127:7132] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006DataVersion: 1979781767
-          [1646217207.932919][7127:7132] CHIP:TOO:   LastNetworkID:
-          [1646217207.933048][7127:7132] CHIP:EM: Sending Standalone Ack for MessageCounter:3865700 on exchange 5677i
-      disabled: true
-
-    - label: "TH1 reads the LastConnectErrorValue attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read last-connect-error-value 1 0
-
-
-          [1646217256.305530][7140:7145] CHIP:DMG:        SuppressResponse = true,
-          [1646217256.305592][7140:7145] CHIP:DMG:        InteractionModelRevision = 1
-          [1646217256.305649][7140:7145] CHIP:DMG: }
-          [1646217256.306032][7140:7145] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007DataVersion: 1979781767
-          [1646217256.306161][7140:7145] CHIP:TOO:   LastConnectErrorValue: 0
-          [1646217256.306279][7140:7145] CHIP:EM: Sending Standalone Ack for MessageCounter:9268313 on exchange 31123
-      disabled: true
-
-    - label: "TH1 reads ClientGeneratedCommandList attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool networkcommissioning read client-generated-command-list 1 0
-
-
-          [1646218469.473647][7198:7203] CHIP:DMG:        SuppressResponse = true,
-          [1646218469.473694][7198:7203] CHIP:DMG:        InteractionModelRevision = 1
-          [1646218469.473736][7198:7203] CHIP:DMG: }
-          [1646218469.474480][7198:7203] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9DataVersion: 1979781767
-          [1646218469.474561][7198:7203] CHIP:TOO:   ClientGeneratedCommandList: 7 entries
-          [1646218469.474615][7198:7203] CHIP:TOO:     [1]: 0
-          [1646218469.474642][7198:7203] CHIP:TOO:     [2]: 2
-          [1646218469.474666][7198:7203] CHIP:TOO:     [3]: 3
-          [1646218469.474690][7198:7203] CHIP:TOO:     [4]: 4
-          [1646218469.474713][7198:7203] CHIP:TOO:     [5]: 5
-          [1646218469.474736][7198:7203] CHIP:TOO:     [6]: 6
-          [1646218469.474760][7198:7203] CHIP:TOO:     [7]: 8
-          [1646218469.474830][7198:7203] CHIP:EM: Sending Standalone Ack for MessageCounter:4858130 on exchange 48356i
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_10.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_10.yaml
deleted file mode 100644
index 150cf1490a85f1..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_10.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.10. [TC-NC-1.10] Verification for RemoveNetwork Command for Thread
-    interface[DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-
-           ./chip-tool networkcommissioning remove-network 1111161622222211 0 162 0
-          [1645774313.858714][4045:4050] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1645774313.858893][4045:4050] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1645774313.859065][4045:4050] CHIP:TOO:   NetworkConfigResponse: {
-          [1645774313.859124][4045:4050] CHIP:TOO:     networkingStatus: 5
-          [1645774313.859164][4045:4050] CHIP:TOO:     debugText:
-          [1645774313.859203][4045:4050] CHIP:TOO:    }
-          [1645774313.859262][4045:4050] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
-
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_11.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_11.yaml
deleted file mode 100644
index 85d6ab3ec307e5..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_11.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.11. [TC-NC-1.11] Verificatrion for ConnectNetwork Command for Wifi
-    interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 saves the timestamp as CT1"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid1' and Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-      disabled: true
-
-    - label: "TH1 saves the timestamp as CT2"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads Networks attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 sends CommissioningComplete Command from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_12.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_12.yaml
deleted file mode 100644
index d16afafef40409..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_12.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.12. [TC-NC-1.12] Verificatrion for ConnectNetwork Command for Thread
-    interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 saves the timestamp as CT1"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-
-          ./chip-tool networkcommissioning connect-network 1111161622222211 0 162 0
-
-          [1645774700.721104][4113:4118] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1645774700.721204][4113:4118] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1645774700.721335][4113:4118] CHIP:TOO:   ConnectNetworkResponse: {
-          [1645774700.721398][4113:4118] CHIP:TOO:     networkingStatus: 5
-          [1645774700.721453][4113:4118] CHIP:TOO:     debugText:
-          [1645774700.721505][4113:4118] CHIP:TOO:     errorValue: 0
-          [1645774700.721559][4113:4118] CHIP:TOO:    }
-      disabled: true
-
-    - label: "TH1 saves the timestamp as CT2"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads Networks attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 sends CommissioningComplete Command from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_13.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_13.yaml
deleted file mode 100644
index b99604d85db496..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_13.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.13. [TC-NC-1.13] Verificatrion for ConnectNetwork Command for Ethernet
-    interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 saves the timestamp as CT1"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Ethnet_id' and Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-      disabled: true
-
-    - label: "TH1 saves the timestamp as CT2"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads Networks attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 sends CommissioningComplete Command from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_14.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_14.yaml
deleted file mode 100644
index 7f84236a5e5546..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_14.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.14. [TC-NC-1.14] Verification for ReorderNetwork command for Wifi
-    interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends ReorderNetwork Command to the DUT with the following
-          arguments: NetworkID argument value as 'Userwifi_ssid1' NetworkIndex
-          argument value as 'Wifinet_idx3' Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-      disabled: true
-
-    - label: "TH1 reads Networks attribute list from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_15.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_15.yaml
deleted file mode 100644
index 2c78b3a65e3723..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_15.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.15. [TC-NC-1.15] Verification for ReorderNetwork command for Thread
-    interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends ReorderNetwork Command to the DUT with the following
-          arguments: NetworkID argument value as 'Userth_op1' NetworkIndex
-          argument value as 'Thnet_idx2' Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-      disabled: true
-
-    - label: "TH1 reads Networks attribute list from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_16.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_16.yaml
deleted file mode 100644
index fb8d6d1b13e90e..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_16.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.16. [TC-NC-1.16] NetworkNotFound value as LastNetworkingstatus argument
-    validation for wifi interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid1' and Breadcrumb argument value as 0"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning remove-network GRLPrivate_EXT 0 1 0
-
-          [1646296227.059289][3118:3123] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1646296227.059353][3118:3123] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1646296227.059438][3118:3123] CHIP:TOO:   NetworkConfigResponse: {
-          [1646296227.059487][3118:3123] CHIP:TOO:     networkingStatus: 5
-          [1646296227.059522][3118:3123] CHIP:TOO:     debugText:
-          [1646296227.059556][3118:3123] CHIP:TOO:    }
-          [1646296227.059598][3118:3123] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1646296227.059667][3118:3123] CHIP:EM: Sending Standalone Ack for MessageCounter:15895540 on exchange 28900i
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork Command to the DUT with NetworkID value as
-          'Userwifi_ssid1' and Breadcrumb value as 0"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning connect-network GRLPrivate_EXT 0 1 0
-
-          [1646297689.443117][3209:3214] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1646297689.443168][3209:3214] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1646297689.443244][3209:3214] CHIP:TOO:   ConnectNetworkResponse: {
-          [1646297689.443286][3209:3214] CHIP:TOO:     networkingStatus: 5
-          [1646297689.443315][3209:3214] CHIP:TOO:     debugText:
-          [1646297689.443342][3209:3214] CHIP:TOO:     errorValue: 0
-          [1646297689.443371][3209:3214] CHIP:TOO:    }
-          [1646297689.443407][3209:3214] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1646297689.443461][3209:3214] CHIP:EM: Sending Standalone Ack for MessageCounter:16011443 on exchange 34839i
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_17.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_17.yaml
deleted file mode 100644
index 81b4580bb3baa8..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_17.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.17. [TC-NC-1.17] NetworkNotFound value as LastNetworkingstatus argument
-    validation for Thread interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userth_op1' and Breadcrumb argument value as 0"
-      verification: |
-          ./chip-tool networkcommissioning remove-network 1 0 162 0
-
-          [1645774811.423681][4127:4132] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1645774811.423787][4127:4132] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1645774811.423978][4127:4132] CHIP:TOO:   NetworkConfigResponse: {
-          [1645774811.424046][4127:4132] CHIP:TOO:     networkingStatus: 5
-          [1645774811.424105][4127:4132] CHIP:TOO:     debugText:
-          [1645774811.424165][4127:4132] CHIP:TOO:    }
-          [1645774811.424256][4127:4132] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1645774811.424362][4127:4132] CHIP:EM: Sending Standalone Ack for MessageCounter:5388547 on exchange 23393i
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork Command to the DUT with NetworkID value as
-          'Userth_op1' and Breadcrumb value as 0"
-      verification: |
-          ./chip-tool networkcommissioning connect-network 1 0 162 0
-
-          [1645774599.313109][4096:4101] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1645774599.313202][4096:4101] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1645774599.313317][4096:4101] CHIP:TOO:   ConnectNetworkResponse: {
-          [1645774599.313372][4096:4101] CHIP:TOO:     networkingStatus: 5
-          [1645774599.313420][4096:4101] CHIP:TOO:     debugText:
-          [1645774599.313469][4096:4101] CHIP:TOO:     errorValue: 0
-          [1645774599.313519][4096:4101] CHIP:TOO:    }
-          [1645774599.313597][4096:4101] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_18.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_18.yaml
deleted file mode 100644
index 4b8a303fdeafef..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_18.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.18. [TC-NC-1.18] NetworkNotFound value as LastNetworkingstatus argument
-    validation for Ethernet interface [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork Command to the DUT with NetworkID value as
-          'Usereth_id' and Breadcrumb value as 0"
-      verification: |
-          '' ./chip-tool networkcommissioning connect-network GRLPrivate_EXT 0 1 0
-
-          [1646298622.867316][3284:3289] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1646298622.867375][3284:3289] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1646298622.867457][3284:3289] CHIP:TOO:   ConnectNetworkResponse: {
-          [1646298622.867502][3284:3289] CHIP:TOO:     networkingStatus: 5
-          [1646298622.867535][3284:3289] CHIP:TOO:     debugText:
-          [1646298622.867565][3284:3289] CHIP:TOO:     errorValue: 0
-          [1646298622.867597][3284:3289] CHIP:TOO:    }
-          [1646298622.867635][3284:3289] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_2.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_2.yaml
deleted file mode 100644
index 4c83676e71b102..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_2.yaml
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.2. [TC-NC-1.2] Verification on thread connection and attributes check [DUT
-    - Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Factory reset the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 is commissioned with DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 reads Descriptor Cluster from the DUT with EP0 TH1 reads
-          ServerList from the DUT"
-      verification: |
-          buntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool descriptor read server-list 162 0
-
-          [1645772414.100694][3827:3832] CHIP:DMG:         SuppressResponse = true,
-          [1645772414.100718][3827:3832] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772414.100740][3827:3832] CHIP:DMG: }
-          [1645772414.102134][3827:3832] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001DataVersion: 3883095917
-          [1645772414.102248][3827:3832] CHIP:TOO:   server list: 21 entries
-          [1645772414.102291][3827:3832] CHIP:TOO:     [1]: 4
-          [1645772414.102317][3827:3832] CHIP:TOO:     [2]: 29
-          [1645772414.102341][3827:3832] CHIP:TOO:     [3]: 31
-          [1645772414.102366][3827:3832] CHIP:TOO:     [4]: 40
-          [1645772414.102389][3827:3832] CHIP:TOO:     [5]: 42
-          [1645772414.102413][3827:3832] CHIP:TOO:     [6]: 43
-          [1645772414.102436][3827:3832] CHIP:TOO:     [7]: 44
-          [1645772414.102459][3827:3832] CHIP:TOO:     [8]: 48
-          [1645772414.102482][3827:3832] CHIP:TOO:     [9]: 49
-          [1645772414.102506][3827:3832] CHIP:TOO:     [10]: 50
-          [1645772414.102529][3827:3832] CHIP:TOO:     [11]: 51
-          [1645772414.102552][3827:3832] CHIP:TOO:     [12]: 52
-          [1645772414.102575][3827:3832] CHIP:TOO:     [13]: 53
-          [1645772414.102598][3827:3832] CHIP:TOO:     [14]: 54
-          [1645772414.102622][3827:3832] CHIP:TOO:     [15]: 55
-          [1645772414.102645][3827:3832] CHIP:TOO:     [16]: 59
-          [1645772414.102669][3827:3832] CHIP:TOO:     [17]: 60
-          [1645772414.102692][3827:3832] CHIP:TOO:     [18]: 62
-          [1645772414.102715][3827:3832] CHIP:TOO:     [19]: 63
-          [1645772414.102738][3827:3832] CHIP:TOO:     [20]: 64
-          [1645772414.102761][3827:3832] CHIP:TOO:     [21]: 65
-          [1645772414.102925][3827:3832] CHIP:EM: Sending Standalone Ack for MessageCounter:15329672 on exchange 6140i
-      disabled: true
-
-    - label: "TH1 reads FeatureMap attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read feature-map 162 0
-
-
-          [1645772204.502545][3809:3814] CHIP:DMG:         SuppressResponse = true,
-          [1645772204.502608][3809:3814] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772204.502683][3809:3814] CHIP:DMG: }
-          [1645772204.503195][3809:3814] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFCDataVersion: 92121563
-          [1645772204.503398][3809:3814] CHIP:TOO:   FeatureMap: 2
-          [1645772204.503556][3809:3814] CHIP:EM: Sending Standalone Ack for MessageCounter:5988746 on exchange 46140i
-      disabled: true
-
-    - label: "TH1 reads the MaxNetworks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read max-networks 162 0
-
-
-          [1645772548.257320][3837:3842] CHIP:DMG:         SuppressResponse = true,
-          [1645772548.257381][3837:3842] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772548.257437][3837:3842] CHIP:DMG: }
-          [1645772548.257735][3837:3842] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 92121563
-          [1645772548.257878][3837:3842] CHIP:TOO:   MaxNetworks: 1
-          [1645772548.258032][3837:3842] CHIP:EM: Sending Standalone Ack for MessageCounter:7388528 on exchange 41499i
-      disabled: true
-
-    - label: "TH1 reads the Networks attribute list from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read networks 162 0
-
-          [1645772651.445097][3856:3861] CHIP:DMG:         SuppressResponse = true,
-          [1645772651.445149][3856:3861] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772651.445209][3856:3861] CHIP:DMG: }
-          [1645772651.445754][3856:3861] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 92121563
-          [1645772651.445875][3856:3861] CHIP:TOO:   Networks: 1 entries
-          [1645772651.446057][3856:3861] CHIP:TOO:     [1]: {
-          [1645772651.446120][3856:3861] CHIP:TOO:       NetworkID: 1111161622222211
-          [1645772651.446173][3856:3861] CHIP:TOO:       Connected: TRUE
-          [1645772651.446228][3856:3861] CHIP:TOO:      }
-          [1645772651.446431][3856:3861] CHIP:EM: Sending Standalone Ack for MessageCounter:12695576 on exchange 11133i
-      disabled: true
-
-    - label: "TH1 reads ScanMaxTimeSeconds attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read scan-max-time-seconds 162 0
-
-          [1645772820.740795][3867:3872] CHIP:DMG:         SuppressResponse = true,
-          [1645772820.740855][3867:3872] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772820.740903][3867:3872] CHIP:DMG: }
-          [1645772820.741209][3867:3872] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0002DataVersion: 92121563
-          [1645772820.741357][3867:3872] CHIP:TOO:   ScanMaxTimeSeconds: 10
-          [1645772820.741512][3867:3872] CHIP:EM: Sending Standalone Ack for MessageCounter:10309775 on exchange 55305i
-      disabled: true
-
-    - label: "TH1 reads ConnectMaxTimeSeconds Attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read connect-max-time-seconds 162 0
-
-          [1645772901.118880][3879:3884] CHIP:DMG:         SuppressResponse = true,
-          [1645772901.119008][3879:3884] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772901.119141][3879:3884] CHIP:DMG: }
-          [1645772901.119684][3879:3884] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0003DataVersion: 92121563
-          [1645772901.119885][3879:3884] CHIP:TOO:   ConnectMaxTimeSeconds: 20
-          [1645772901.120100][3879:3884] CHIP:EM: Sending Standalone Ack for MessageCounter:11917538 on exchange 4188
-      disabled: true
-
-    - label: "TH1 reads InterfaceEnabled attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read interface-enabled 162 0
-
-          [1645772984.653996][3895:3900] CHIP:DMG:         SuppressResponse = true,
-          [1645772984.654043][3895:3900] CHIP:DMG:         InteractionModelRevision = 1
-          [1645772984.654084][3895:3900] CHIP:DMG: }
-          [1645772984.654310][3895:3900] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004DataVersion: 92121563
-          [1645772984.654388][3895:3900] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1645772984.654530][3895:3900] CHIP:EM: Sending Standalone Ack for MessageCounter:14026610 on exchange 33717i
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 162 0
-
-          [1645773078.930516][3905:3910] CHIP:DMG:         SuppressResponse = true,
-          [1645773078.930579][3905:3910] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773078.930635][3905:3910] CHIP:DMG: }
-          [1645773078.930943][3905:3910] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 92121563
-          [1645773078.931067][3905:3910] CHIP:TOO:   LastNetworkingStatus: 0
-          [1645773078.931217][3905:3910] CHIP:EM: Sending Standalone Ack for MessageCounter:16576011 on exchange 44187i
-      disabled: true
-
-    - label:
-          "TH1 reads the LastNetworkID attribute from the DUT TH1 reads the
-          Networks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-network-id 162 0
-
-          [1645773167.178501][3913:3918] CHIP:DMG:         SuppressResponse = true,
-          [1645773167.178561][3913:3918] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773167.178618][3913:3918] CHIP:DMG: }
-          [1645773167.178919][3913:3918] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006DataVersion: 92121563
-          [1645773167.182241][3913:3918] CHIP:TOO:   LastNetworkID: 1111161622222211
-          [1645773167.182422][3913:3918] CHIP:EM: Sending Standalone Ack for MessageCounter:2029571 on exchange 18566i
-      disabled: true
-
-    - label: "TH1 reads the LastConnectErrorValue attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-connect-error-value 162 0
-
-          [1645773318.752774][3938:3943] CHIP:DMG:         SuppressResponse = true,
-          [1645773318.752861][3938:3943] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773318.753043][3938:3943] CHIP:DMG: }
-          [1645773318.753543][3938:3943] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007DataVersion: 92121563
-          [1645773318.753724][3938:3943] CHIP:TOO:   LastConnectErrorValue: 0
-          [1645773318.753985][3938:3943] CHIP:EM: Sending Standalone Ack for MessageCounter:15303417 on exchange 41937i
-      disabled: true
-
-    - label: "TH1 reads ClientGeneratedCommandList attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read client-generated-command-list 162 0
-
-          [1645773402.037043][3947:3952] CHIP:DMG:         SuppressResponse = true,
-          [1645773402.037070][3947:3952] CHIP:DMG:         InteractionModelRevision = 1
-          [1645773402.037127][3947:3952] CHIP:DMG: }
-          [1645773402.037764][3947:3952] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9DataVersion: 92121563
-          [1645773402.037831][3947:3952] CHIP:TOO:   ClientGeneratedCommandList: 6 entries
-          [1645773402.037872][3947:3952] CHIP:TOO:     [1]: 0
-          [1645773402.037898][3947:3952] CHIP:TOO:     [2]: 2
-          [1645773402.037935][3947:3952] CHIP:TOO:     [3]: 3
-          [1645773402.037959][3947:3952] CHIP:TOO:     [4]: 4
-          [1645773402.037992][3947:3952] CHIP:TOO:     [5]: 6
-          [1645773402.038016][3947:3952] CHIP:TOO:     [6]: 8
-          [1645773402.038151][3947:3952] CHIP:EM: Sending Standalone Ack for MessageCounter:10505378 on exchange 51792i
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_3.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_3.yaml
deleted file mode 100644
index d0f28e4c940209..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_3.yaml
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.3. [TC-NC-1.3] Verification on Ethernet connection and attributes check
-    [DUT - Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Factory reset the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 is commissioned with DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 reads Descriptor Cluster from the DUT with EP0 TH1 reads
-          ServerList from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool descriptor read server-list 1 0
-
-
-          [1646226258.250313][2446:2451] CHIP:DMG:        SuppressResponse = true,
-          [1646226258.250337][2446:2451] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226258.250359][2446:2451] CHIP:DMG: }
-          [1646226258.252027][2446:2451] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001DataVersion: 3582931896
-          [1646226258.252128][2446:2451] CHIP:TOO:   server list: 25 entries
-          [1646226258.252183][2446:2451] CHIP:TOO:     [1]: 3
-          [1646226258.252208][2446:2451] CHIP:TOO:     [2]: 4
-          [1646226258.252232][2446:2451] CHIP:TOO:     [3]: 29
-          [1646226258.252256][2446:2451] CHIP:TOO:     [4]: 30
-          [1646226258.252280][2446:2451] CHIP:TOO:     [5]: 31
-          [1646226258.252303][2446:2451] CHIP:TOO:     [6]: 40
-          [1646226258.252326][2446:2451] CHIP:TOO:     [7]: 42
-          [1646226258.252349][2446:2451] CHIP:TOO:     [8]: 43
-          [1646226258.252373][2446:2451] CHIP:TOO:     [9]: 44
-          [1646226258.252396][2446:2451] CHIP:TOO:     [10]: 45
-          [1646226258.252420][2446:2451] CHIP:TOO:     [11]: 46
-          [1646226258.252443][2446:2451] CHIP:TOO:     [12]: 48
-          [1646226258.252466][2446:2451] CHIP:TOO:     [13]: 49
-          [1646226258.252489][2446:2451] CHIP:TOO:     [14]: 50
-          [1646226258.252512][2446:2451] CHIP:TOO:     [15]: 51
-          [1646226258.252536][2446:2451] CHIP:TOO:     [16]: 52
-          [1646226258.252559][2446:2451] CHIP:TOO:     [17]: 53
-          [1646226258.252582][2446:2451] CHIP:TOO:     [18]: 54
-          [1646226258.252605][2446:2451] CHIP:TOO:     [19]: 55
-          [1646226258.252629][2446:2451] CHIP:TOO:     [20]: 60
-          [1646226258.252652][2446:2451] CHIP:TOO:     [21]: 62
-          [1646226258.252675][2446:2451] CHIP:TOO:     [22]: 63
-          [1646226258.252698][2446:2451] CHIP:TOO:     [23]: 64
-          [1646226258.252721][2446:2451] CHIP:TOO:     [24]: 65
-          [1646226258.252745][2446:2451] CHIP:TOO:     [25]: 1029
-          [1646226258.255517][2446:2451] CHIP:EM: Sending Standalone Ack for MessageCounter:10627940 on exchange 21443i
-      disabled: true
-
-    - label: "TH1 reads FeatureMap attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read feature-map 1 0
-
-          [1646226326.733918][2460:2465] CHIP:DMG:
-          [1646226326.733950][2460:2465] CHIP:DMG:        SuppressResponse = true,
-          [1646226326.733984][2460:2465] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226326.734014][2460:2465] CHIP:DMG: }
-          [1646226326.734188][2460:2465] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFCDataVersion: 3622667250
-          [1646226326.736250][2460:2465] CHIP:TOO:   FeatureMap: 2
-          [1646226326.736362][2460:2465] CHIP:EM: Sending Standalone Ack for MessageCounter:9135736 on exchange 51231i
-      disabled: true
-
-    - label: "TH1 reads the MaxNetworks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read max-networks 1 0
-
-          [1646226441.815782][2475:2480] CHIP:DMG:        SuppressResponse = true,
-          [1646226441.815849][2475:2480] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226441.815889][2475:2480] CHIP:DMG: }
-          [1646226441.816092][2475:2480] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 3622667250
-          [1646226441.816191][2475:2480] CHIP:TOO:   MaxNetworks: 1
-          [1646226441.816288][2475:2480] CHIP:EM: Sending Standalone Ack for MessageCounter:14864333 on exchange 39473i
-      disabled: true
-
-    - label: "TH1 reads the Networks attribute list from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read networks 1 0
-
-          [1646226488.740009][2488:2493] CHIP:DMG:
-          [1646226488.740041][2488:2493] CHIP:DMG:        SuppressResponse = true,
-          [1646226488.740074][2488:2493] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226488.740113][2488:2493] CHIP:DMG: }
-          [1646226488.740320][2488:2493] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 3622667250
-          [1646226488.740409][2488:2493] CHIP:TOO:   Networks: 0 entries
-          [1646226488.740501][2488:2493] CHIP:EM: Sending Standalone Ack for MessageCounter:9725190 on exchange 29852i
-      disabled: true
-
-    - label: "TH1 reads InterfaceEnabled attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read interface-enabled 1 0
-
-          [1646226615.428003][2502:2507] CHIP:DMG:
-          [1646226615.428035][2502:2507] CHIP:DMG:        SuppressResponse = true,
-          [1646226615.428064][2502:2507] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226615.428094][2502:2507] CHIP:DMG: }
-          [1646226615.428270][2502:2507] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004DataVersion: 3622667250
-          [1646226615.428331][2502:2507] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1646226615.428415][2502:2507] CHIP:EM: Sending Standalone Ack for MessageCounter:3894401 on exchange 55691i
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-networking-status 1 0
-
-          [1646227167.614060][2533:2538] CHIP:DMG:        SuppressResponse = true,
-          [1646227167.614095][2533:2538] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227167.614126][2533:2538] CHIP:DMG: }
-          [1646227167.614299][2533:2538] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 3622667250
-          [1646227167.614385][2533:2538] CHIP:TOO:   LastNetworkingStatus: 0
-          [1646227167.614468][2533:2538] CHIP:EM: Sending Standalone Ack for MessageCounter:8947540 on exchange 12532i
-      disabled: true
-
-    - label:
-          "TH1 reads the LastNetworkID attribute from the DUT TH1 reads the
-          Networks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-network-id 1 0
-
-          [1646227218.543427][2545:2550] CHIP:DMG:
-          [1646227218.543462][2545:2550] CHIP:DMG:        SuppressResponse = true,
-          [1646227218.543506][2545:2550] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227218.543538][2545:2550] CHIP:DMG: }
-          [1646227218.543748][2545:2550] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006DataVersion: 3622667250
-          [1646227218.543836][2545:2550] CHIP:TOO:   LastNetworkID:
-          [1646227218.543924][2545:2550] CHIP:EM: Sending Standalone Ack for MessageCounter:9758721 on exchange 15256i
-      disabled: true
-
-    - label: "TH1 reads the LastConnectErrorValue attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read last-connect-error-value 1 0
-
-          [1646227266.753206][2560:2565] CHIP:DMG:
-          [1646227266.753239][2560:2565] CHIP:DMG:        SuppressResponse = true,
-          [1646227266.753272][2560:2565] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227266.753303][2560:2565] CHIP:DMG: }
-          [1646227266.753472][2560:2565] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007DataVersion: 3622667250
-          [1646227266.753556][2560:2565] CHIP:TOO:   LastConnectErrorValue: 0
-          [1646227266.753632][2560:2565] CHIP:EM: Sending Standalone Ack for MessageCounter:7911198 on exchange 43970i
-      disabled: true
-
-    - label: "TH1 reads ClientGeneratedCommandList attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool networkcommissioning read client-generated-command-list 1 0
-
-          [1646227303.224981][2570:2575] CHIP:DMG:        SuppressResponse = true,
-          [1646227303.225017][2570:2575] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227303.225050][2570:2575] CHIP:DMG: }
-          [1646227303.225902][2570:2575] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9DataVersion: 3622667250
-          [1646227303.226014][2570:2575] CHIP:TOO:   ClientGeneratedCommandList: 7 entries
-          [1646227303.226093][2570:2575] CHIP:TOO:     [1]: 0
-          [1646227303.226131][2570:2575] CHIP:TOO:     [2]: 2
-          [1646227303.226167][2570:2575] CHIP:TOO:     [3]: 3
-          [1646227303.226195][2570:2575] CHIP:TOO:     [4]: 4
-          [1646227303.226223][2570:2575] CHIP:TOO:     [5]: 5
-          [1646227303.226251][2570:2575] CHIP:TOO:     [6]: 6
-          [1646227303.226333][2570:2575] CHIP:TOO:     [7]: 8
-          [1646227303.226419][2570:2575] CHIP:EM: Sending Standalone Ack for MessageCounter:15891447 on exchange 61063i
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_4.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_4.yaml
deleted file mode 100644
index 57daab0088e7fd..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_4.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.4. [TC-NC-1.4] Verification for ScanNetworks command for Wifi interface
-    [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH1 sends ScanNetworks command to the DUT with the SSID argument
-          value as null and Breadcrumb argument value as 0"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool  networkcommissioning scan-networks null 0 1 0
-
-          [1646293689.990014][2928:2933] CHIP:CTL: Device connected callback with null pairing delegate. Ignoring
-          [1646293689.990067][2928:2933] CHIP:EM: Sending Standalone Ack for MessageCounter:1871595063 on exchange 3459i
-          [1646293689.990110][2928:2933] CHIP:IN: Prepared unauthenticated message 0xffffa1bcb938 to 0x0000000000000000 (0) of type 0x10 and protocolId (0, 0) on exchange 3459i with MessageCounter:525156546.
-          [1646293689.990157][2928:2933] CHIP:IN: Sending unauthenticated msg 0xffffa1bcb938 with MessageCounter:525156546 to 0x0000000000000000 at monotonic time: 5262853 msec
-          [1646293689.990248][2928:2933] CHIP:EM: Flushed pending ack for MessageCounter:1871595063 on exchange 3459i
-          [1646293690.190932][2928:2933] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:13758687 on exchange 3460i
-          [1646293690.191036][2928:2933] CHIP:EM: Found matching exchange: 3460i, Delegate: 0xffff8c003aa0
-          [1646293690.191120][2928:2933] CHIP:EM: Rxd Ack; Removing MessageCounter:11356051 from Retrans Table on exchange 3460i
-          [1646293690.191180][2928:2933] CHIP:EM: Removed CHIP MessageCounter:11356051 from RetransTable on exchange 3460i
-          [1646293699.967781][2928:2928] CHIP:-: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:249: CHIP Error 0x00000032: Timeout at ../../examples/chip-tool/commands/common/CHIPCommand.cpp:62
-          [1646293699.967832][2928:2928] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:249: CHIP Error 0x00000032: Timeout
-          [1646293699.976755][2928:2928] CHIP:SPT: VerifyOrDie failure at ../../src/lib/support/Pool.h:304: Allocated() == 0
-          Aborted
-      disabled: true
-
-    - label:
-          "TH1 sends ScanNetworks Command to the DUT with SSID argument value as
-          'Userwifi_ssid' and Breadcrumb argument value 0"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool  networkcommissioning scan-networks GRLPrivate_EXT 0 1 0
-
-          [1646289182.010873][2486:2491] CHIP:DMG:        InteractionModelRevision = 1
-          [1646289182.010903][2486:2491] CHIP:DMG: },
-          [1646289182.010981][2486:2491] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0000 Status=0x9c
-          [1646289182.011022][2486:2491] CHIP:TOO: Error: IM Error 0x0000059C: General error: 0x9c
-          [1646289182.011094][2486:2491] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1646289182.011133][2486:2491] CHIP:EM: Sending Standalone Ack for MessageCounter:3499711 on exchange 3366i
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_5.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_5.yaml
deleted file mode 100644
index ba0b97fda75c37..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_5.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.5. [TC-NC-1.5] UNSPPUORTED_ACCESS message Validation for Wifi interface
-    [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH1 sends the AddOrUpdateWiFiNetwork command to the DUT with the
-          following argument: SSID argument value as 'Userwifi_ssid' Credentials
-          argument value as 'xxxxx' Breadcrumb argument value as 0"
-      verification: |
-          Can't verify the test case as it need to be executed before the commissioning.
-          Which is not possiable with the CHIP tool step
-      disabled: true
-
-    - label:
-          "TH1 sends RemoveNetwork command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid' and Breadcrumb argument value as 0"
-      verification: |
-          Can't verify the test case as it need to be executed before the commissioning.
-          Which is not possiable with the CHIP tool step
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid' and Breadcrumb argument value as 0"
-      verification: |
-          Can't verify the test case as it need to be executed before the commissioning.
-          Which is not possiable with the CHIP tool step
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_6.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_6.yaml
deleted file mode 100644
index 052c8c839b15f1..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_6.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.6. [TC-NC-1.6] UNSPPUORTED_ACCESS message Validation for Thread interface
-    [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH1 sends the AddOrUpdateThreadNetwork command to the DUT with the
-          following argument: OperationalDataset argument value as 'Userth_op'
-          Breadcrumb argument value as 0"
-      verification: |
-          Can't verify the test case as it need to be executed before the commissioning.
-          Which is not possiable with the CHIP tool step
-      disabled: true
-
-    - label:
-          "TH1 sends RemoveNetwork command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
-      verification: |
-          Can't verify the test case as it need to be executed before the commissioning.
-          Which is not possiable with the CHIP tool step
-      disabled: true
-
-    - label:
-          "TH1 sends ConnectNetwork command to the DUT with NetworkID argument
-          value as 'Userth_op' and Breadcrumb argument value as 0"
-      verification: |
-          Can't verify the test case as it need to be executed before the commissioning.
-          Which is not possiable with the CHIP tool step
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_7.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_7.yaml
deleted file mode 100644
index 4f16e88a944383..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_7.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.7. [TC-NC-1.7] Verification for AddOrUpdateWiFiNetwork command
-    [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
-          argument value as 'Userwifi_ssid', Credentials argument value as
-          'xxxxx' and Breadcrumb argument value as 0"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool  networkcommissioning add-or-update-wi-fi-network GRLPrivate_EXT matter123 0 1 0
-
-
-          [1646289754.056172][2573:2578] CHIP:DMG:
-          [1646289754.056240][2573:2578] CHIP:DMG:        InteractionModelRevision = 1
-          [1646289754.056278][2573:2578] CHIP:DMG: },
-          [1646289754.056375][2573:2578] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1646289754.056445][2573:2578] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1646289754.056535][2573:2578] CHIP:TOO:   NetworkConfigResponse: {
-          [1646289754.056590][2573:2578] CHIP:TOO:     networkingStatus: 0
-          [1646289754.056628][2573:2578] CHIP:TOO:     debugText:
-          [1646289754.056666][2573:2578] CHIP:TOO:    }
-          [1646289754.056712][2573:2578] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1646289754.056787][2573:2578] CHIP:EM: Sending Standalone Ack for MessageCounter:11569822 on exchange 38244i
-      disabled: true
-
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool  networkcommissioning read max-networks 1 0
-
-          [1646290259.940728][2681:2686] CHIP:DMG:
-          [1646290259.940760][2681:2686] CHIP:DMG:        SuppressResponse = true,
-          [1646290259.940793][2681:2686] CHIP:DMG:        InteractionModelRevision = 1
-          [1646290259.940824][2681:2686] CHIP:DMG: }
-          [1646290259.941000][2681:2686] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 2391702431
-          [1646290259.943230][2681:2686] CHIP:TOO:   MaxNetworks: 1
-          [1646290259.943345][2681:2686] CHIP:EM: Sending Standalone Ack for MessageCounter:5523057 on exchange 61782i
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool  networkcommissioning read last-networking-status 1 0
-
-          [1646290420.281009][2697:2702] CHIP:DMG:
-          [1646290420.281042][2697:2702] CHIP:DMG:        SuppressResponse = true,
-          [1646290420.281075][2697:2702] CHIP:DMG:        InteractionModelRevision = 1
-          [1646290420.281106][2697:2702] CHIP:DMG: }
-          [1646290420.281281][2697:2702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 2391702431
-          [1646290420.281367][2697:2702] CHIP:TOO:   LastNetworkingStatus: 0
-          [1646290420.281448][2697:2702] CHIP:EM: Sending Standalone Ack for MessageCounter:4395284 on exchange 47160i
-      disabled: true
-
-    - label: "TH1 reads Networks attribute from the DUT"
-      verification: |
-          ubuntu@ubuntu:~/apps$ sudo ./chip-tool  networkcommissioning read networks 1 0
-
-          [1646290474.427405][2708:2713] CHIP:DMG:
-          [1646290474.427438][2708:2713] CHIP:DMG:        SuppressResponse = true,
-          [1646290474.427471][2708:2713] CHIP:DMG:        InteractionModelRevision = 1
-          [1646290474.427502][2708:2713] CHIP:DMG: }
-          [1646290474.427705][2708:2713] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001DataVersion: 2391702431
-          [1646290474.427798][2708:2713] CHIP:TOO:   Networks: 0 entries
-          [1646290474.427897][2708:2713] CHIP:EM: Sending Standalone Ack for MessageCounter:9385469 on exchange 48753i
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_8.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_8.yaml
deleted file mode 100644
index 88b41acd6792b2..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_8.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.8. [TC-NC-1.8] Verification for AddOrUpdateThreadNetwork command
-    [DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends AddOrUpdateThreadNetwork command to the DUT with
-          OperationalDataset argument value as 'Userth_op' and Breadcrumb
-          argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-
-          ./chip-tool networkcommissioning add-or-update-thread-network 1111161622222211 0 162 0
-
-          [1645774062.824543][4020:4025] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1645774062.824650][4020:4025] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1645774062.824775][4020:4025] CHIP:TOO:   NetworkConfigResponse: {
-          [1645774062.824838][4020:4025] CHIP:TOO:     networkingStatus: 2
-          [1645774062.824891][4020:4025] CHIP:TOO:     debugText:
-          [1645774062.824945][4020:4025] CHIP:TOO:    }
-          [1645774062.825030][4020:4025] CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
-
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads Networks attribute from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_NC_1_9.yaml b/src/app/tests/suites/certification/Test_TC_NC_1_9.yaml
deleted file mode 100644
index d80fa50572c8e9..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_NC_1_9.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    3.9. [TC-NC-1.9] Verification for RemoveNetwork Command for Wifi
-    interface[DUT-Commissionee]
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "TH1 sends ArmFailSafe command to the DUT"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "TH1 sends RemoveNetwork Command to the DUT with NetworkID argument
-          value as 'Userwifi_ssid1' and Breadcrumb argument value as 0"
-      verification: |
-          https://github.com/project-chip/connectedhomeip/issues/15782
-      disabled: true
-
-    - label: "TH1 reads MaxNetworks attribute from the DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "TH1 reads LastNetworkingStatus attribute from the DUT"
-      verification: |
-
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
index 4296b71a5b3e11..098cf14f53b807 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
@@ -28,13 +28,6 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Reads mandatory attribute: Occupancy"
-      disabled: true
-      command: "readAttribute"
-      attribute: "occupancy"
-      response:
-          value: 0
-
     - label: "Reads mandatory attribute constrains: Occupancy"
       command: "readAttribute"
       attribute: "occupancy"
@@ -60,7 +53,6 @@ tests:
           value: 0
 
     - label: "Reads mandatory attribute: OccupancySensorType"
-      disabled: true
       command: "readAttribute"
       attribute: "occupancy sensor type"
       response:
@@ -89,14 +81,10 @@ tests:
       command: "readAttribute"
       attribute: "occupancy sensor type"
       response:
-          value: 0
-
-    - label: "Reads mandatory attribute: OccupancySensorTypeBitmap"
-      disabled: true
-      command: "readAttribute"
-      attribute: "occupancy sensor type bitmap"
-      response:
-          value: 0
+          constraints:
+              type: enum8
+              minValue: 0
+              maxValue: 3
 
     - label: "Reads mandatory attribute constrains: OccupancySensorTypeBitmap"
       command: "readAttribute"
@@ -105,7 +93,7 @@ tests:
           constraints:
               type: map8
               minValue: 1
-              maxValue: 7
+              maxValue: 273
 
     - label:
           "Writes the respective default value to mandatory attribute:
@@ -121,51 +109,48 @@ tests:
       command: "readAttribute"
       attribute: "occupancy sensor type bitmap"
       response:
-          value: 1
+          constraints:
+              type: map8
+              minValue: 1
+              maxValue: 273
 
     #disabled due to issue #15377
     - label: "Reads optional attribute: PIROccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIROccupiedToUnoccupiedDelay"
+      attribute: "PIR occupied to unoccupied delay"
       response:
           value: 0
-
-    - label: "Reads optional attribute constrains: PIROccupiedToUnoccupiedDelay"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PIROccupiedToUnoccupiedDelay"
-      response:
           constraints:
               type: uint16
 
     - label:
           "Writes the respective default value to optional attribute:
           PIROccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "PIROccupiedToUnoccupiedDelay"
+      attribute: "PIR occupied to unoccupied delay"
       arguments:
           value: 0
 
     - label: "Reads back optional attribute: PIROccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIROccupiedToUnoccupiedDelay"
+      attribute: "PIR occupied to unoccupied delay"
       response:
           value: 0
 
     - label: "Reads optional attribute: PIRUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIRUnoccupiedToOccupiedDelay"
+      attribute: "PIR unoccupied to occupied delay"
       response:
           value: 0
 
     - label: "Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIRUnoccupiedToOccupiedDelay"
+      attribute: "PIR unoccupied to occupied delay"
       response:
           constraints:
               type: uint16
@@ -173,31 +158,31 @@ tests:
     - label:
           "Writes the respective default value to optional attribute:
           PIRUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "PIRUnoccupiedToOccupiedDelay"
+      attribute: "PIR unoccupied to occupied delay"
       arguments:
           value: 0
 
     - label: "Reads back optional attribute: PIRUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIRUnoccupiedToOccupiedDelay"
+      attribute: "PIR unoccupied to occupied delay"
       response:
           value: 0
 
     - label: "Reads optional attribute: PIRUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIRUnoccupiedToOccupiedThreshold"
+      attribute: "PIR unoccupied to occupied threshold"
       response:
           value: 1
 
     - label:
           "Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PIRUnoccupiedToOccupiedThreshold"
+      attribute: "PIR unoccupied to occupied threshold"
       response:
           constraints:
               type: uint8
@@ -207,33 +192,110 @@ tests:
     - label:
           "Writes the respective default value to optional attribute:
           PIRUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "PIRUnoccupiedToOccupiedThreshold"
+      attribute: "PIR unoccupied to occupied threshold"
       arguments:
           value: 1
 
     - label: "Reads back optional attribute: PIRUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
+      command: "readAttribute"
+      attribute: "PIR unoccupied to occupied threshold"
+      response:
+          value: 1
+
+    - label: "Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay"
+      optional: true
+      command: "readAttribute"
+      attribute: "ultrasonic occupied to unoccupied delay"
+      response:
+          value: 0
+          constraints:
+              type: uint16
+
+    - label:
+          "Writes the respective default value to optional attribute:
+          UltrasonicOccupiedToUnoccupiedDelay"
+      optional: true
+      command: "writeAttribute"
+      attribute: "ultrasonic occupied to unoccupied delay"
+      arguments:
+          value: 0
+
+    - label: "Read back optional attribute: UltrasonicOccupiedToUnoccupiedDelay"
+      optional: true
+      command: "readAttribute"
+      attribute: "ultrasonic occupied to unoccupied delay"
+      response:
+          value: 0
+
+    - label: "Read attribute: UltrasonicUnoccupiedToOccupiedDelay"
+      optional: true
+      command: "readAttribute"
+      attribute: "ultrasonic unoccupied to occupied delay"
+      response:
+          value: 0
+          constraints:
+              type: uint16
+
+    - label:
+          "Writes the respective default value to optional attribute:
+          UltrasonicUnoccupiedToOccupiedDelay"
+      optional: true
+      command: "writeAttribute"
+      attribute: "ultrasonic unoccupied to occupied delay"
+      arguments:
+          value: 0
+
+    - label: "Read back attribute: UltrasonicUnoccupiedToOccupiedDelay"
+      optional: true
+      command: "readAttribute"
+      attribute: "ultrasonic unoccupied to occupied delay"
+      response:
+          value: 0
+
+    - label: "Read attribute: UltrasonicUnoccupiedToOccupiedThreshold"
+      optional: true
+      command: "readAttribute"
+      attribute: "ultrasonic unoccupied to occupied threshold"
+      response:
+          value: 1
+          constraints:
+              type: uint16
+              minValue: 1
+              maxValue: 254
+
+    - label:
+          "Writes the respective default value to optional attribute:
+          UltrasonicUnoccupiedToOccupiedThreshold"
+      optional: true
+      command: "writeAttribute"
+      attribute: "ultrasonic unoccupied to occupied threshold"
+      arguments:
+          value: 1
+
+    - label: "Read back attribute: UltrasonicUnoccupiedToOccupiedThreshold"
+      optional: true
       command: "readAttribute"
-      attribute: "PIRUnoccupiedToOccupiedThreshold"
+      attribute: "ultrasonic unoccupied to occupied threshold"
       response:
           value: 1
 
     - label:
           "Reads optional attribute: PhysicalContactOccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactOccupiedToUnoccupiedDelay"
+      attribute: "physical contact occupied to unoccupied delay"
       response:
           value: 0
 
     - label:
           "Reads optional attribute constrains:
           PhysicalContactOccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactOccupiedToUnoccupiedDelay"
+      attribute: "physical contact occupied to unoccupied delay"
       response:
           constraints:
               type: uint16
@@ -241,35 +303,35 @@ tests:
     - label:
           "Writes the respective default value to optional attribute:
           PhysicalContactOccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "PhysicalContactOccupiedToUnoccupiedDelay"
+      attribute: "physical contact occupied to unoccupied delay"
       arguments:
           value: 0
 
     - label:
           "Reads back optional attribute:
           PhysicalContactOccupiedToUnoccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactOccupiedToUnoccupiedDelay"
+      attribute: "physical contact occupied to unoccupied delay"
       response:
           value: 0
 
     - label:
           "Reads optional attribute: PhysicalContactUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedDelay"
+      attribute: "physical contact unoccupied to occupied delay"
       response:
           value: 0
 
     - label:
           "Reads optional attribute constrains:
           PhysicalContactUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedDelay"
+      attribute: "physical contact unoccupied to occupied delay"
       response:
           constraints:
               type: uint16
@@ -277,36 +339,36 @@ tests:
     - label:
           "Writes the respective default value to optional attribute:
           PhysicalContactUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedDelay"
+      attribute: "physical contact unoccupied to occupied delay"
       arguments:
           value: 0
 
     - label:
           "Reads back optional attribute:
           PhysicalContactUnoccupiedToOccupiedDelay"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedDelay"
+      attribute: "physical contact unoccupied to occupied delay"
       response:
           value: 0
 
     - label:
           "Reads optional attribute:
           PhysicalContactUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedThreshold"
+      attribute: "physical contact unoccupied to occupied threshold"
       response:
           value: 1
 
     - label:
           "Reads optional attribute constrains:
           PhysicalContactUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedThreshold"
+      attribute: "physical contact unoccupied to occupied threshold"
       response:
           constraints:
               type: uint8
@@ -316,17 +378,17 @@ tests:
     - label:
           "Writes the respective default value to optional attribute:
           PhysicalContactUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedThreshold"
+      attribute: "physical contact unoccupied to occupied threshold"
       arguments:
           value: 1
 
     - label:
           "Reads back optional attribute:
           PhysicalContactUnoccupiedToOccupiedThreshold"
-      disabled: true
+      optional: true
       command: "readAttribute"
-      attribute: "PhysicalContactUnoccupiedToOccupiedThreshold"
+      attribute: "physical contact unoccupied to occupied threshold"
       response:
           value: 1
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml
index 5e7095b3aa34ab..b22915d4ba5754 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml
@@ -28,769 +28,225 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "read the mandatory attribute: MaxPressure"
+    - label: "Read the mandatory attribute: MaxPressure"
       command: "readAttribute"
       attribute: "MaxPressure"
       response:
           constraints:
               type: int16
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the mandatory attribute: MaxSpeed"
-      command: "readAttribute"
-      attribute: "MaxSpeed"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "read the mandatory attribute: MaxFlow"
-      command: "readAttribute"
-      attribute: "MaxFlow"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "read the mandatory attribute: EffectiveOperationMode"
-      command: "readAttribute"
-      attribute: "EffectiveOperationMode"
-      response:
-          constraints:
-              type: enum8
-
-    - label: "read the mandatory attribute: EffectiveControlMode"
-      command: "readAttribute"
-      attribute: "EffectiveControlMode"
-      response:
-          constraints:
-              type: enum8
-
-    - label: "read the mandatory attribute: Capacity"
-      command: "readAttribute"
-      attribute: "Capacity"
-      response:
-          constraints:
-              type: int16
-
-    - label: "write to the mandatory attribute: MaxPressure"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxPressure"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the mandatory attribute: MaxSpeed"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxSpeed"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the mandatory attribute: MaxFlow"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxFlow"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the mandatory attribute: EffectiveOperationMode"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "EffectiveOperationMode"
-      arguments:
-          value: desc
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the mandatory attribute: EffectiveControlMode"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "EffectiveControlMode"
-      arguments:
-          value: desc
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the mandatory attribute: Capacity"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "Capacity"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "read the mandatory attribute: MaxPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxPressure"
-      response:
-          value: null
-
-    - label: "read the mandatory attribute: MaxPressure"
-      command: "readAttribute"
-      attribute: "MaxPressure"
-      response:
-          constraints:
-              type: int16
-
-    - label: "read the mandatory attribute: MaxSpeed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxSpeed"
-      response:
-          value: null
-
-    - label: "read the mandatory attribute: MaxSpeed"
+    - label: "Read the mandatory attribute: MaxSpeed"
       command: "readAttribute"
       attribute: "MaxSpeed"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the mandatory attribute: MaxFlow"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxFlow"
-      response:
-          value: null
-
-    - label: "read the mandatory attribute: MaxFlow"
+    - label: "Read the mandatory attribute: MaxFlow"
       command: "readAttribute"
       attribute: "MaxFlow"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the mandatory attribute: EffectiveOperationMode"
-      disabled: true
-      command: "readAttribute"
-      attribute: "EffectiveOperationMode"
-      response:
-          value: desc
-
-    - label: "read the mandatory attribute: EffectiveOperationMode"
-      command: "readAttribute"
-      attribute: "EffectiveOperationMode"
-      response:
-          constraints:
-              type: enum8
-
-    - label: "read the mandatory attribute: EffectiveControlMode"
-      disabled: true
-      command: "readAttribute"
-      attribute: "EffectiveControlMode"
-      response:
-          value: desc
-
-    - label: "read the mandatory attribute: EffectiveControlMode"
-      command: "readAttribute"
-      attribute: "EffectiveControlMode"
-      response:
-          constraints:
-              type: enum8
-
-    - label: "read the mandatory attribute: Capacity"
-      disabled: true
-      command: "readAttribute"
-      attribute: "Capacity"
-      response:
-          value: null
-
-    - label: "read the mandatory attribute: Capacity"
-      command: "readAttribute"
-      attribute: "Capacity"
-      response:
-          constraints:
-              type: int16
-
-    #issue #16650
-    - label: "read the optional attribute: MinConstPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstPressure"
+    - label: "Read the optional attribute: MinConstPressure"
       optional: true
       command: "readAttribute"
       attribute: "MinConstPressure"
       response:
           constraints:
               type: int16
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the optional attribute: MaxConstPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxConstPressure"
+    - label: "Read the optional attribute: MaxConstPressure"
       optional: true
       command: "readAttribute"
       attribute: "MaxConstPressure"
       response:
           constraints:
               type: int16
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the optional attribute: MinCompPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinCompPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinCompPressure"
+    - label: "Read the optional attribute: MinCompPressure"
       optional: true
       command: "readAttribute"
       attribute: "MinCompPressure"
       response:
           constraints:
               type: int16
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the optional attribute: MaxCompPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxCompPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxCompPressure"
+    - label: "Read the optional attribute: MaxCompPressure"
       optional: true
       command: "readAttribute"
       attribute: "MaxCompPressure"
       response:
           constraints:
               type: int16
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the optional attribute: MinConstSpeed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstSpeed"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstSpeed"
+    - label: "Read the optional attribute: MinConstSpeed"
       optional: true
       command: "readAttribute"
       attribute: "MinConstSpeed"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the optional attribute: MaxConstSpeed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstSpeed"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxConstSpeed"
+    - label: "Read the optional attribute: MaxConstSpeed"
       optional: true
       command: "readAttribute"
       attribute: "MaxConstSpeed"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the optional attribute: MinConstFlow"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstFlow"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstFlow"
+    - label: "Read the optional attribute: MinConstFlow"
       optional: true
       command: "readAttribute"
       attribute: "MinConstFlow"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the optional attribute: MaxConstFlow"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstFlow"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxConstFlow"
+    - label: "Read the optional attribute: MaxConstFlow"
       optional: true
       command: "readAttribute"
       attribute: "MaxConstFlow"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the optional attribute: MinConstTemp"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstTemp"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstTemp"
+    - label: "Read the optional attribute: MinConstTemp"
       optional: true
       command: "readAttribute"
       attribute: "MinConstTemp"
       response:
           constraints:
               type: int16
-              minValue: -27315
-
-    - label: "read the optional attribute: MaxConstTemp"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstTemp"
-      response:
-          value: null
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the optional attribute: MaxConstTemp"
+    - label: "Read the optional attribute: MaxConstTemp"
       optional: true
       command: "readAttribute"
       attribute: "MaxConstTemp"
       response:
           constraints:
               type: int16
-              minValue: -27315
-
-    - label: "read the optional attribute: PumpStatus"
-      optional: true
-      command: "readAttribute"
-      attribute: "PumpStatus"
-      response:
-          value: 0
+              minValue: -32768
+              maxValue: 32767
 
-    - label: "read the optional attribute: PumpStatus"
+    - label: "Read the optional attribute: PumpStatus"
       optional: true
       command: "readAttribute"
       attribute: "PumpStatus"
       response:
           constraints:
               type: map16
+              minValue: 0
+              maxValue: 8
 
-    - label: "read the optional attribute: Speed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "Speed"
-      response:
-          value: null
-
-    - label: "read the optional attribute: Speed"
-      optional: true
-      command: "readAttribute"
-      attribute: "Speed"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "read the optional attribute: LifetimeRunningHours"
-      optional: true
-      command: "readAttribute"
-      attribute: "LifetimeRunningHours"
-      response:
-          value: 0
-
-    - label: "read the optional attribute: LifetimeRunningHours"
-      optional: true
-      command: "readAttribute"
-      attribute: "LifetimeRunningHours"
-      response:
-          constraints:
-              type: uint24
-
-    - label: "read the optional attribute: Power"
-      disabled: true
-      command: "readAttribute"
-      attribute: "Power"
-      response:
-          value: null
-
-    - label: "read the optional attribute: Power"
-      optional: true
-      command: "readAttribute"
-      attribute: "Power"
-      response:
-          constraints:
-              type: uint24
-
-    - label: "read the optional attribute: LifetimeEnergyConsumed"
-      optional: true
-      command: "readAttribute"
-      attribute: "LifetimeEnergyConsumed"
-      response:
-          value: 0
-
-    - label: "read the optional attribute: LifetimeEnergyConsumed"
-      optional: true
-      command: "readAttribute"
-      attribute: "LifetimeEnergyConsumed"
-      response:
-          constraints:
-              type: uint32
-
-    - label: "write to the optional attribute: MinConstPressure"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MinConstPressure"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MaxConstPressure"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxConstPressure"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MinCompPressure"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MinCompPressure"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MaxCompPressure"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxCompPressure"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MinConstSpeed"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MinConstSpeed"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MaxConstSpeed"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxConstSpeed"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MinConstFlow"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MinConstFlow"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MaxConstFlow"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxConstFlow"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MinConstTemp"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MinConstTemp"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: MaxConstTemp"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "MaxConstTemp"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: PumpStatus"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "PumpStatus"
-      arguments:
-          value: 0
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: Speed"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "Speed"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: LifetimeRunningHours"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "LifetimeRunningHours"
-      arguments:
-          value: 0
-
-    - label: "write to the optional attribute: Power"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "Power"
-      arguments:
-          value: null
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "write to the optional attribute: LifetimeEnergyConsumed"
-      optional: true
-      command: "writeAttribute"
-      attribute: "LifetimeEnergyConsumed"
-      arguments:
-          value: 0
-
-    - label: "read the optional attribute: MinConstPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstPressure"
-      optional: true
-      command: "readAttribute"
-      attribute: "MinConstPressure"
-      response:
-          constraints:
-              type: int16
-
-    - label: "read the optional attribute: MaxConstPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxConstPressure"
-      optional: true
-      command: "readAttribute"
-      attribute: "MaxConstPressure"
-      response:
-          constraints:
-              type: int16
-
-    - label: "read the optional attribute: MinCompPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinCompPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinCompPressure"
-      optional: true
-      command: "readAttribute"
-      attribute: "MinCompPressure"
-      response:
-          constraints:
-              type: int16
-
-    - label: "read the optional attribute: MaxCompPressure"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxCompPressure"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxCompPressure"
-      optional: true
-      command: "readAttribute"
-      attribute: "MaxCompPressure"
-      response:
-          constraints:
-              type: int16
-
-    - label: "read the optional attribute: MinConstSpeed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstSpeed"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstSpeed"
-      optional: true
-      command: "readAttribute"
-      attribute: "MinConstSpeed"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "read the optional attribute: MaxConstSpeed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstSpeed"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxConstSpeed"
-      optional: true
-      command: "readAttribute"
-      attribute: "MaxConstSpeed"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "read the optional attribute: MinConstFlow"
-      disabled: true
+    - label: "Read attribute: EffectiveOperationMode"
       command: "readAttribute"
-      attribute: "MinConstFlow"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MinConstFlow"
-      optional: true
-      command: "readAttribute"
-      attribute: "MinConstFlow"
-      response:
-          constraints:
-              type: uint16
-
-    - label: "read the optional attribute: MaxConstFlow"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstFlow"
-      response:
-          value: null
-
-    - label: "read the optional attribute: MaxConstFlow"
-      optional: true
-      command: "readAttribute"
-      attribute: "MaxConstFlow"
+      attribute: "EffectiveOperationMode"
       response:
           constraints:
-              type: uint16
-
-    - label: "read the optional attribute: MinConstTemp"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MinConstTemp"
-      response:
-          value: null
+              type: enum8
+              minValue: 0
+              maxValue: 3
 
-    - label: "read the optional attribute: MinConstTemp"
-      optional: true
+    - label: "Read attribute: EffectiveControlMode"
       command: "readAttribute"
-      attribute: "MinConstTemp"
+      attribute: "EffectiveControlMode"
       response:
           constraints:
-              type: int16
-              minValue: -27315
-              maxValue: 32767
-
-    - label: "read the optional attribute: MaxConstTemp"
-      disabled: true
-      command: "readAttribute"
-      attribute: "MaxConstTemp"
-      response:
-          value: null
+              type: enum8
+              minValue: 0
+              maxValue: 7
 
-    - label: "read the optional attribute: MaxConstTemp"
-      optional: true
+    - label: "Read attribute: Capacity"
       command: "readAttribute"
-      attribute: "MaxConstTemp"
+      attribute: "Capacity"
       response:
           constraints:
               type: int16
-              minValue: -27315
+              minValue: -32768
               maxValue: 32767
 
-    - label: "read the optional attribute: PumpStatus"
-      optional: true
-      command: "readAttribute"
-      attribute: "PumpStatus"
-      response:
-          value: 0
-
-    - label: "read the optional attribute: PumpStatus"
-      optional: true
-      command: "readAttribute"
-      attribute: "PumpStatus"
-      response:
-          constraints:
-              type: map16
-
-    - label: "read the optional attribute: Speed"
-      disabled: true
-      command: "readAttribute"
-      attribute: "Speed"
-      response:
-          value: null
-
-    - label: "read the optional attribute: Speed"
+    - label: "Read the optional attribute: Speed"
       optional: true
       command: "readAttribute"
       attribute: "Speed"
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
-    - label: "read the optional attribute: LifetimeRunningHours"
-      command: "readAttribute"
-      attribute: "LifetimeRunningHours"
-      response:
-          value: 0
-
-    - label: "read the optional attribute: LifetimeRunningHours"
+    - label: "Read the optional attribute: LifetimeRunningHours"
       optional: true
       command: "readAttribute"
       attribute: "LifetimeRunningHours"
       response:
           constraints:
               type: uint24
+              minValue: 0
+              maxValue: 16777215
 
-    - label: "read the optional attribute: Power"
-      disabled: true
-      command: "readAttribute"
-      attribute: "Power"
-      response:
-          value: null
-
-    - label: "read the optional attribute: Power"
+    - label: "Read the optional attribute: Power"
       optional: true
       command: "readAttribute"
       attribute: "Power"
       response:
           constraints:
               type: uint24
+              minValue: 0
+              maxValue: 16777215
 
-    - label: "read the optional attribute: LifetimeEnergyConsumed"
+    - label: "Read the optional attribute: LifetimeEnergyConsumed"
       optional: true
       command: "readAttribute"
       attribute: "LifetimeEnergyConsumed"
       response:
-          value: 0
+          constraints:
+              type: uint32
+              minValue: 0
+              maxValue: 4294967295
+
+    - label: "Read optional attribute: OperationMode"
+      command: "readAttribute"
+      attribute: "OperationMode"
+      response:
+          constraints:
+              type: enum8
+              minValue: 0
+              maxValue: 3
 
-    - label: "read the optional attribute: LifetimeEnergyConsumed"
+    - label: "Read optional attribute: ControlMode"
       optional: true
       command: "readAttribute"
-      attribute: "LifetimeEnergyConsumed"
+      attribute: "ControlMode"
       response:
           constraints:
-              type: uint32
+              type: enum8
+              minValue: 0
+              maxValue: 7
diff --git a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml
index 3193674b5f3401..a7f03021e2d417 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml
@@ -33,11 +33,6 @@ tests:
       attribute: "ClusterRevision"
       response:
           value: 1
-
-    - label: "Read the global attribute constraints: ClusterRevision"
-      command: "readAttribute"
-      attribute: "ClusterRevision"
-      response:
           constraints:
               type: uint16
 
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
index bae47dc7d5e16f..8d79ec706b3420 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
@@ -38,7 +38,7 @@ tests:
               maxValue: 9999
 
     - label: "Reads constraints of attribute: MaxMeasuredValue"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP
       command: "readAttribute"
       attribute: "max measured value"
       response:
@@ -52,15 +52,22 @@ tests:
       attribute: "measured value"
       PICS: A_RELATIVEHUMIDITY
       response:
+          saveAs: ValueBeforeChange
           constraints:
               type: int16
               minValue: 0
               maxValue: 10000
 
-    #Disabled as UI prompts required for user action
     - label: "Operate on device to change the relative humidity significantly"
-      disabled: true
       PICS: MANUAL_RELATIVEHUMIDITY_CHANGE
+      cluster: "LogCommands"
+      command: "Log"
+      arguments:
+          values:
+              - name: "message"
+                value:
+                    "Operate on device to change the relative humidity
+                    significantly"
 
     - label: "Read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
@@ -69,3 +76,4 @@ tests:
       response:
           constraints:
               type: uint16
+              notValue: ValueBeforeChange
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml
index f9c95cfedd5808..e3c20211297faf 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml
@@ -84,8 +84,6 @@ tests:
     #validate the service type and the service domain not implemented in CI
 
     - label: "Check Hostname"
-      # On macOS the hostname is the device name and because of it this test is disabled for now.
-      disabled: true
       PICS: "(WIFI || ETH) && !THREAD"
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -99,9 +97,7 @@ tests:
                     isHexString: true
 
     - label: "Check Hostname"
-      # On macOS the hostname is the device name and because of it this test is disabled for now.
-      disabled: true
-      PICS: "(!WIFI && !ETH) && THREAD"
+      PICS: "PICS_SKIP_SAMPLE_APP && (!WIFI && !ETH) && THREAD"
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -140,8 +136,7 @@ tests:
                 value: vendorId
 
     - label: "Check Device Type ID (_T)"
-      disabled: true
-      PICS: DEVTYPE_SUBTYPE
+      PICS: PICS_SKIP_SAMPLE_APP && DEVTYPE_SUBTYPE
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByDeviceType"
       arguments:
@@ -201,8 +196,7 @@ tests:
                 value: 1
 
     - label: "Optional TXT key for device type (DT)"
-      disabled: true
-      PICS: DT_KEY
+      PICS: PICS_SKIP_SAMPLE_APP && DT_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -261,7 +255,6 @@ tests:
                 constraints:
                     minValue: 1
 
-    # The testplan needs TH needs to be Rebooted so below steps disabled for now
     - label: "Stop target device"
       cluster: "SystemCommands"
       command: "Stop"
@@ -276,8 +269,15 @@ tests:
               - name: "discriminator"
                 value: discriminator
 
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
     - label: "Open Commissioning Window"
-      disabled: true
       cluster: "AdministratorCommissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
@@ -287,7 +287,6 @@ tests:
                 value: 180
 
     - label: "Check Instance Name"
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -303,8 +302,6 @@ tests:
     #validate the service type and the service domain not implemented in CI
 
     - label: "Check Hostname"
-      # On macOS the hostname is the device name and because of it this test is disabled for now.
-      disabled: true
       PICS: "(WIFI || ETH) && !THREAD"
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -318,9 +315,7 @@ tests:
                     isHexString: true
 
     - label: "Check Hostname"
-      # On macOS the hostname is the device name and because of it this test is disabled for now.
-      disabled: true
-      PICS: "(!WIFI && !ETH) && THREAD"
+      PICS: "PICS_SKIP_SAMPLE_APP && (!WIFI && !ETH) && THREAD"
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -333,7 +328,6 @@ tests:
                     isHexString: true
 
     - label: "Check Long Discriminator _L"
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByLongDiscriminator"
       arguments:
@@ -342,7 +336,6 @@ tests:
                 value: discriminator
 
     - label: "Check Short Discriminator (_S)"
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByShortDiscriminator"
       arguments:
@@ -351,7 +344,6 @@ tests:
                 value: discriminator
 
     - label: "Check Vendor ID (_V)"
-      disabled: true
       PICS: VENDOR_SUBTYPE
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByVendorId"
@@ -361,9 +353,7 @@ tests:
                 value: vendorId
 
     - label: "Check Device Type ID (_T)"
-      # The device type is not broadcasted by the accessory under CI.
-      disabled: true
-      PICS: DEVTYPE_SUBTYPE
+      PICS: PICS_SKIP_SAMPLE_APP && DEVTYPE_SUBTYPE
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByDeviceType"
       arguments:
@@ -372,13 +362,11 @@ tests:
                 value: deviceType
 
     - label: "Check Commissioning Mode (_CM)"
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByCommissioningMode"
 
     - label: "TXT key for Vendor ID and Product ID (VP)"
       PICS: VP_KEY
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -388,7 +376,6 @@ tests:
 
     - label: "TXT key for Vendor ID and Product ID (VP)"
       PICS: VP_KEY
-      disabled: true
       optional: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -398,7 +385,6 @@ tests:
                 value: productId
 
     - label: "Optional TXT key for MRP Retry Interval Idle (CRI)"
-      disabled: true
       PICS: CRI_COMM_DISCOVERY_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -409,7 +395,6 @@ tests:
                     maxValue: 3600000
 
     - label: "Optional TXT key for MRP Retry Interval Active (CRA)"
-      disabled: true
       PICS: CRA_COMM_DISCOVERY_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -420,7 +405,6 @@ tests:
                     maxValue: 3600000
 
     - label: "TXT key for commissioning mode (CM)"
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -429,8 +413,7 @@ tests:
                 value: 1
 
     - label: "Optional TXT key for device type (DT)"
-      disabled: true
-      PICS: DT_KEY
+      PICS: PICS_SKIP_SAMPLE_APP && DT_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -438,10 +421,9 @@ tests:
               - name: "deviceType"
                 value: deviceType
                 constraints:
-                    maxValue: 49151
+                    maxValue: 999
 
     - label: "Optional TXT key for device name (DN)"
-      disabled: true
       PICS: DN_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -452,7 +434,6 @@ tests:
                     maxLength: 32
 
     - label: "Optional TXT key for rotating device identifier (RI)"
-      disabled: true
       PICS: RI_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -463,7 +444,6 @@ tests:
                     maxValue: 100
 
     - label: "Optional TXT key for pairing hint (PH)"
-      disabled: true
       PICS: PH_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -474,7 +454,6 @@ tests:
                     notValue: 0
 
     - label: "Optional TXT key for pairing instructions (PI)"
-      disabled: true
       PICS: PI_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
@@ -485,7 +464,6 @@ tests:
                     maxLength: 128
 
     - label: "Check IPs"
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
index 30617ce1b0c30e..2f4320881166fc 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
@@ -15,7 +15,7 @@
 
 name:
     3.4.8. [TC-SC-4.8] Compressed Fabric ID remains the same for Nodes
-    commissioned to the same fabric [DUT Commissionee, TH2 Commissionee]
+    commissioned to the same fabric [DUT - Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -23,47 +23,47 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH1 creates a Fabric"
+    - label: "Commission TH1 to DUTs Fabric"
       verification: |
+          1. Provision the device using 1st controller chip-tool  on the raspi (use above instructions)
 
-      disabled: true
-
-    - label: "Commission DUT to TH1s Fabric"
-      verification: |
-          ./chip-tool pairing ble-wifi 1 zigbeehome mater123 20202021 3840  (./chip-tool pairing ble-wifi {NODE ID} {SSID} {PASSWORD} {SETUPPINCODE} {DISCRIMINATOR})
-      disabled: true
 
-    - label: "Commission TH2 to TH1s Fabric"
-      verification: |
+          " On first controller, using administratorcommissioningg chip tool open commissioning window.
 
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
       disabled: true
 
-    - label: "Scan for DNS-SD advertising from DUT"
+    - label: "Commission TH2 to DUTs Fabric"
       verification: |
-          ./chip-tool operationalcredentials read fabrics 1 1
-      disabled: true
+          Using your DUT Controller connect to the accessory.
 
-    - label: "Scan for DNS-SD advertising from TH2"
-      verification: |
-          ./chip-tool operationalcredentials read fabrics 2 1
-      disabled: true
+          Below is the example when using chip tool as controller
+          ./chip-tool pairing onnetwork 1 20202021
 
-    - label: "Remove DUT from TH1s fabric using Remove Fabric method"
-      verification: |
-          ./chip-tool operationalcredentials remove-fabrics 1 0
+          Verify you got below message
+          Device commissioning completed with success
       disabled: true
 
-    - label: "Commission DUT to TH1s Fabric again"
+    - label: "Send RemoveFabric from DUT to TH1 and comission DUT to TH1 again"
       verification: |
-          ./chip-tool pairing ble-wifi 1 zigbeehome mater123 20202021 3840 (./chip-tool pairing ble-wifi {NODE ID} {SSID} {PASSWORD} {SETUPPINCODE} {DISCRIMINATOR})
-      disabled: true
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
 
-    - label: "Scan for DNS-SD advertising from DUT"
-      verification: |
-          verify fabric ID value is exactly same as what we got in step 4
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651571274.154864][10562:10567] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1651571274.155030][10562:10567] CHIP:TOO:   NOCResponse: {
+          [1651571274.155102][10562:10567] CHIP:TOO:     statusCode: 0
+          [1651571274.155159][10562:10567] CHIP:TOO:     fabricIndex: 1
+          [1651571274.155215][10562:10567] CHIP:TOO:    }
       disabled: true
 
-    - label: "Repeat step 7 to 9 for DUT using Factory Reset Method"
+    - label: "Send RemoveFabric from DUT to TH2 and comission DUT to TH2 again"
       verification: |
-          DUT vendor has to provide a way to put the device in factory reset
+          ./chip-tool operationalcredentials remove-fabrics 2 2 0
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1651571274.154864][10562:10567] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
+          [1651571274.155030][10562:10567] CHIP:TOO:   NOCResponse: {
+          [1651571274.155102][10562:10567] CHIP:TOO:     statusCode: 0
+          [1651571274.155159][10562:10567] CHIP:TOO:     fabricIndex: 2
+          [1651571274.155215][10562:10567] CHIP:TOO:    }
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
index 7f5ba9b0a89c83..4b6999ad73c09a 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
@@ -14,8 +14,8 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    31.2.1. [TC-SU-2.1] DUT will send a QueryImage Command to OTA-P to check for
-    software update.
+    3.2.1. [TC-SU-2.1] DUT will send a QueryImage Command to OTA-P to check for
+    software update
 
 config:
     nodeId: 0x12344321
@@ -23,6 +23,39 @@ config:
     endpoint: 0
 
 tests:
+    - label: "DUT sends a QueryImage command to the TH/OTA-P"
+      verification: |
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify on the OTA Provider logs:
+
+          [1645743053317] [97806:20280749] CHIP: [ZCL] OTA Provider received QueryImage
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   VendorID: 0xfff1
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   ProductID: 32769
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   SoftwareVersion: 0
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   ProtocolsSupported: [
+          [1645743053317] [97806:20280749] CHIP: [ZCL]     0
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   ]
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   HardwareVersion: 0
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   Location: XX
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   RequestorCanConsent: 0
+      disabled: true
+
+    - label:
+          "DUT sends a QueryImage command to the TH/OTA-P. Wait for 1 minute."
+      verification: |
+          Run the OTA Provider App using the command:
+          chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -q busy
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 1 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify on the OTA Provider logs that the QueryImage command is sent only once in that 1 minute interval.
+      disabled: true
+
     - label:
           "TH2/Administrator sends an AnnounceOTAProvider command to the DUT."
       verification: |
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
index 3ef493c8d4942c..ea1274bb4733f0 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    31.3.1. [TC-SU-2.2] Tests the DUT behavior on different scenarios of the
+    3.3.1. [TC-SU-2.2] Tests the DUT behavior on different scenarios of the
     QueryImageResponse sent by the TH/OTA-P
 
 config:
@@ -29,6 +29,10 @@ tests:
           is set to 'UpdateAvailable'. Set ImageURI to the location where the
           image is located."
       verification: |
+          Run the OTA Provider App using the command:
+
+          chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -q updateAvailable
+
           chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
@@ -39,48 +43,114 @@ tests:
           [1645748688025] [99779:20370762] CHIP: [BDX] Transfer completed, got AckEOF
       disabled: true
 
+    - label:
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to 'Busy',
+          DelayedActionTime is set to 60 seconds."
+      verification: |
+          Run the OTA Provider App using the command:
+
+          chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -q busy -t 60
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify that the DUT does not send a QueryImage command before the minimum interval defined by spec which is 2 minutes (120 seconds) from the last QueryImage command.
+      disabled: true
+
+    - label:
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to 'NotAvailable',
+          DelayedActionTime is set to 60 seconds."
+      verification: |
+          Run the OTA Provider App using the command:
+
+
+          chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -q updateNotAvailable -t 60
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify that the DUT does not send a QueryImage command before the minimum interval defined by spec which is 2 minutes (120 seconds) from the last QueryImage command.
+      disabled: true
+
     - label:
           "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
           QueryImageResponse back to DUT. QueryStatus is set to Available, Set
-          DelayedActionTime to 10 minutes"
+          DelayedActionTime to 3 minutes"
       verification: |
           Run the OTA Provider App using the command:
-          ./chip-ota-provider-app -f sw_image.txt -t 600
 
-          Check on the OTA-P/TH that the transfer of file/image to DUT starts after 600 seconds.
+          chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -q updateAvailable -t 180
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify that the DUT waits for the time mentioned in the DelayedActionTime (3 minutes) before transferring the image.
       disabled: true
 
     - label:
           "DUT sends a QueryImage command to the TH/OTA-P.+ TH/OTA-P sends a
           QueryImageResponse back to DUT. QueryStatus is set to Busy/Not
-          Available, Set DelayedActionTime to 10 minutes"
+          Available, Set DelayedActionTime to 3 minutes. . On the subsequent
+          QueryImage command, TH/OTA-P sends a QueryImageResponse back to DUT.
+          QueryStatus is set to 'UpdateAvailable'."
       verification: |
           Run the OTA Provider App using the command:
-          ./chip-ota-provider-app -q updateNotAvailable -t 600
 
-          Check on the OTA-P/TH that another QueryImage command is not sent by the DUT before 600 seconds.
+          ./chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -q busy -t 180
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify that the DUT waits for the time mentioned in the DelayedActionTime (3 minutes) before issuing another QueryImage command to the TH/OTA-P.
+          Verify there is a transfer of the software image after the second QueryImageResponse with UpdateAvailable status from the TH/OTA-P to the DUT.
+      disabled: true
+
+    - label:
+          "IF (PICS_DT_HTTPS_Supported), DUT sends a QueryImage command to the
+          TH/OTA-P. TH/OTA-P sends a QueryImageResponse back to DUT. QueryStatus
+          is set to 'UpdateAvailable', ImageURI should have the https url from
+          where the image can be downloaded."
+      verification: |
+          Out of scope for V1.0
       disabled: true
 
     - label:
           "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
           QueryImageResponse back to DUT. QueryStatus is set to Available,
-          Software Version should be set to an incorrect value."
+          Software Version should be set to the same or an older (numerically
+          lower) version."
       verification: |
           Run the OTA Provider App using the command:
-          ./chip-ota-provider-app -f sw_image.txt -s 0
 
-          Use any value for software image that is older or same as the current version.
+          ./chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE}
+
+          Software Version of the SW_IMAGE_FILE used in above command should be the same or an older (numerically lower) version than the DUT.
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Check on the OTA-P/TH that the DUT does not start transferring the software image.
+          Verify that the DUT does not start transferring the software image.
       disabled: true
 
     - label:
-          "IF (PICS_DT_RequestorCanConsent_True) DUT sends a QueryImage command
-          to the TH/OTA-P. TH/OTA-P sends a QueryImageResponse back to DUT.
-          QueryStatus is set to Available, UserConsentNeeded is set to True"
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to
+          'UpdateAvailable', ImageURI field contains an invalid BDX ImageURI."
       verification: |
           Run the OTA Provider App using the command:
-          ./chip-ota-provider-app -f sw_image.txt -c
 
-          Verify that the DUT obtains user consent before transferring the image. This step is vendor specific.
+          ./chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -i bdx://0000000000000001
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify that the DUT does not start transferring the software image.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
index 350f29a2bc6b9a..2056995f30eb72 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
-name: 31.4.1. [TC-SU-2.3] Tests the transfer of images between DUT and TH/OTA-P
+name: 3.4.1. [TC-SU-2.3] Tests the transfer of images between DUT and TH/OTA-P
 
 config:
     nodeId: 0x12344321
@@ -26,7 +26,14 @@ tests:
           to the TH/OTA-P. TH/OTA-P sends a QueryImageResponse back to DUT.
           QueryStatus is set to Available, UserConsentNeeded is set to True"
       verification: |
-          Same as 3.3.1. [TC-SU-2.2]  #8
+          Run the OTA Provider App using the command:
+          ./chip-ota-provider-app --discriminator ${PROVIDER_LONG_DISCRIMINATOR} --secured-device-port ${PROVIDER_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --filepath ${SW_IMAGE_FILE} -c
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify that the DUT obtains user consent before transferring the image. This step is vendor specific.
       disabled: true
 
     - label:
@@ -38,6 +45,84 @@ tests:
           Same as 3.3.1. [TC-SU-2.2]  #1
       disabled: true
 
+    - label:
+          'IF (PICS_DT_HTTPS_Supported) DUT sends a QueryImage command to the
+          TH/OTA-P. TH/OTA-P sends a QueryImageResponse back to DUT. QueryStatus
+          is set to "UpdateAvailable". Set ImageURI with the https url of the
+          software image.'
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
+    - label:
+          "During the transfer of the image to the DUT, force fail the transfer
+          before it completely transfers the image. Wait for the Idle timeout so
+          that reading the UpdateState Attribute of the OTA Requestor returns
+          the value as Idle. Initiate another QueryImage Command from DUT to the
+          TH/OTA-P."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Kill the OTA Provider App during the transfer of the image to the DUT before it completely transfers the image.
+
+          Wait for atleast 5 minutes or more until reading the UpdateState Attribute of the OTA Requestor returns the value as Idle (Value 1)
+          chip-tool otasoftwareupdaterequestor read update-state 0x1234567890 0
+
+          [1651259701990] [18726:35135506] CHIP: [DMG] ReportDataMessage =
+          [1651259701990] [18726:35135506] CHIP: [DMG] {
+          [1651259701990] [18726:35135506] CHIP: [DMG]         AttributeReportIBs =
+          [1651259701990] [18726:35135506] CHIP: [DMG]         [
+          [1651259701990] [18726:35135506] CHIP: [DMG]                 AttributeReportIB =
+          [1651259701990] [18726:35135506] CHIP: [DMG]                 {
+          [1651259701990] [18726:35135506] CHIP: [DMG]                         AttributeDataIB =
+          [1651259701990] [18726:35135506] CHIP: [DMG]                         {
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                 DataVersion = 0xa8a08a2a,
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                 AttributePathIB =
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                 {
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                         Cluster = 0x2a,
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                         Attribute = 0x0000_0002,
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                 }
+          [1651259701990] [18726:35135506] CHIP: [DMG]
+          [1651259701990] [18726:35135506] CHIP: [DMG]                                         Data = 1,
+          [1651259701990] [18726:35135506] CHIP: [DMG]                         },
+          [1651259701990] [18726:35135506] CHIP: [DMG]
+          [1651259701990] [18726:35135506] CHIP: [DMG]                 },
+          [1651259701990] [18726:35135506] CHIP: [DMG]
+          [1651259701990] [18726:35135506] CHIP: [DMG]         ],
+          [1651259701990] [18726:35135506] CHIP: [DMG]
+          [1651259701990] [18726:35135506] CHIP: [DMG]         SuppressResponse = true,
+          [1651259701990] [18726:35135506] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651259701990] [18726:35135506] CHIP: [DMG] }
+
+          Relaunch the OTA Provider App and initiate another query
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          Verify that the DUT starts a new transfer of software image when sending another QueryImage request i.e. Start Offset field in ReceiveInit message received on OTA Provider side is 0
+
+          [1651260350133] [18661:35147439] CHIP: [ATM] ReceiveInit
+          [1651260350133] [18661:35147439] CHIP: [ATM]   Proposed Transfer Control: 0x20
+          [1651260350133] [18661:35147439] CHIP: [ATM]   Range Control: 0x0
+          [1651260350133] [18661:35147439] CHIP: [ATM]   Proposed Max Block Size: 1024
+          [1651260350133] [18661:35147439] CHIP: [ATM]   Start Offset: 0x0000000000000000
+          [1651260350133] [18661:35147439] CHIP: [ATM]   Proposed Max Length: 0x0000000000000000
+          [1651260350133] [18661:35147439] CHIP: [ATM]   File Designator Length: 8
+          [1651260350133] [18661:35147439] CHIP: [ATM]   File Designator: test.ota
+      disabled: true
+
+    - label:
+          "IF (PICS_DT_RC_STARTOFS_BIT_SET) During the transfer of the image to
+          the DUT, force fail the transfer before it completely transfers the
+          image. Initiate another QueryImage Command from DUT to the TH/OTA-P.
+          Set the RC[STARTOFS] bit and associated STARTOFS field in the
+          ReceiveInit Message to indicate the resumption of a transfer
+          previously aborted."
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
     - label:
           "IF (PICS_DT_Vendor_Specific) Perform the OTA Update on DUT using
           vendor specific mechanism."
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
index 27d91802fd016b..7d567b921b9f69 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    31.6.1. [TC-SU-2.5] Tests the different scenarios on the DUT based on the
+    3.6.1. [TC-SU-2.5] Tests the different scenarios on the DUT based on the
     ApplyUpdateResponse response sent by the OTA-P
 
 config:
@@ -29,17 +29,67 @@ tests:
       verification: |
           Verify that the DUT starts updating its software.
           Once the update is finished verify the software version on the DUT to match the version downloaded for the software update.
+
+          ./chip-tool basic read software-version-string 0x1234567890 0
+
           Verify on the OTA-P/TH that there is no other ApplyUpdateRequest from the DUT.
       disabled: true
 
     - label:
           "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
-          field is set to 'Proceed' DelayedActionTime is set to 5 minutes"
+          field is set to 'Proceed' DelayedActionTime is set to 3 minutes"
+      verification: |
+          Run the OTA Provider App using the command:
+          chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -p 180
+
+          Verify that the DUT starts updating its software after 3 minutes. Once the update is finished verify the software version on the DUT to match the version downloaded for the software update.
+
+          ./chip-tool basic read software-version-string 0x1234567890 0
+      disabled: true
+
+    - label:
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to 'AwaitNextAction', DelayedActionTime is set to 1
+          minute."
+      verification: |
+          Run the OTA Provider App using the command:
+          chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a awaitNextAction -p 60
+
+          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.
+      disabled: true
+
+    - label:
+          "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'"
+      verification: |
+          Run the OTA Provider App using the command:
+          chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a awaitNextAction -p 180
+
+          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 software version from the Basic Information cluster on the DUT to match the version downloaded for the software update.
+
+          chip-tool basic read software-version-string 0x1234567890 0
+      disabled: true
+
+    - label:
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to 'Discontinue'."
       verification: |
           Run the OTA Provider App using the command:
-          ./chip-ota-provider-app -f sw_image.txt -t 300
+          chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a  discontinue
+
+          Verify that the DUT clears its previously downloaded software image and resets the UpdateState Attribute to Idle (Value 1)
+          chip-tool otasoftwareupdaterequestor read update-state 0x1234567890 0
+
+          Verify that the DUT does not send the NotifyUpdateApplied within a reasonable time.
+          Verify the software version from the Basic Information cluster of the DUT to be the same as it was previously.
+
 
-          Verify that the DUT starts updating its software after 5 minutes. Once the update is finished verify the software version on the DUT to match the version downloaded for the software update.
+          chip-tool basic read software-version-string 0x1234567890 0
       disabled: true
 
     - label:
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
index ab36e2042029b3..e0ca7ba8633967 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
-name: 31.8.1. [TC-SU-2.7] Tests Events generated by OTA-R(DUT)
+name: 3.8.1. [TC-SU-2.7] Tests Events generated by OTA-R(DUT)
 
 config:
     nodeId: 0x12344321
@@ -21,14 +21,14 @@ config:
     endpoint: 0
 
 tests:
-    - label: "DUT sends a software update Query to the OTA-P."
+    - label: "Perform a software update on the DUT."
       verification: |
-          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+          ./chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
           Subscribe to StateTransition event right away after this using command
-          chip-tool otasoftwareupdaterequestor subscribe-event state-transition 5 10 1 2 0
+          ./chip-tool otasoftwareupdaterequestor subscribe-event state-transition 5 10 0x1234567890 0 --timeout 65535
 
           Verify that the chip-tool receives below StateTransition event notifications
 
@@ -61,6 +61,144 @@ tests:
           [1644017080776] [33044:1032131] CHIP: [TOO]    }
       disabled: true
 
+    - label:
+          "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-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Subscribe to StateTransition event right away after this using command
+          ./chip-tool otasoftwareupdaterequestor subscribe-event state-transition 5 10 0x1234567890 0 --timeout 65535
+
+          Verify that the chip-tool receives below StateTransition event notification
+
+          [1651282443727] [28764:35514810] CHIP: [TOO]   StateTransition: {
+          [1651282443727] [28764:35514810] CHIP: [TOO]     PreviousState: 1
+          [1651282443727] [28764:35514810] CHIP: [TOO]     NewState: 2
+          [1651282443727] [28764:35514810] CHIP: [TOO]     Reason: 1
+          [1651282443727] [28764:35514810] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1651282443727] [28764:35514810] CHIP: [TOO]    }
+
+          [1651282443727] [28764:35514810] CHIP: [TOO]   StateTransition: {
+          [1651282443727] [28764:35514810] CHIP: [TOO]     PreviousState: 2
+          [1651282443727] [28764:35514810] CHIP: [TOO]     NewState: 3
+          [1651282443727] [28764:35514810] CHIP: [TOO]     Reason: 4
+          [1651282443727] [28764:35514810] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1651282443727] [28764:35514810] CHIP: [TOO]    }
+      disabled: true
+
+    - label:
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P does not
+          respond back to DUT."
+      verification: |
+          Kill OTA Provider App before issuing query using
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Subscribe to StateTransition event right away after this using command
+          ./chip-tool otasoftwareupdaterequestor subscribe-event state-transition 5 10 0x1234567890 0 --timeout 65535
+
+          Verify that the chip-tool receives below StateTransition event notification
+
+          [1651282794539] [28929:35519901] CHIP: [TOO]   StateTransition: {
+          [1651282794539] [28929:35519901] CHIP: [TOO]     PreviousState: 1
+          [1651282794539] [28929:35519901] CHIP: [TOO]     NewState: 2
+          [1651282794539] [28929:35519901] CHIP: [TOO]     Reason: 1
+          [1651282794539] [28929:35519901] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1651282794539] [28929:35519901] CHIP: [TOO]    }
+
+          [1651282804542] [28929:35519900] CHIP: [TOO]   StateTransition: {
+          [1651282804542] [28929:35519900] CHIP: [TOO]     PreviousState: 2
+          [1651282804542] [28929:35519900] CHIP: [TOO]     NewState: 1
+          [1651282804542] [28929:35519900] CHIP: [TOO]     Reason: 2
+          [1651282804542] [28929:35519900] CHIP: [TOO]     TargetSoftwareVersion: null
+          [1651282804542] [28929:35519900] CHIP: [TOO]    }
+      disabled: true
+
+    - label:
+          "IF (PICS_DT_RequestorCanConsent_True) 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."
+      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-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Subscribe to StateTransition event right away after this using command
+          ./chip-tool otasoftwareupdaterequestor subscribe-event state-transition 5 10 0x1234567890 0 --timeout 65535
+
+          Verify that the OTA-Subscriber receives a StateTransition event notification for the state change to DelayedOnUserConsent.
+      disabled: true
+
+    - label:
+          "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-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Subscribe to StateTransition event right away after this using command
+          ./chip-tool otasoftwareupdaterequestor subscribe-event download-error 5 10 0x1234567890 0 --timeout 65535
+
+          Verify that the chip-tool receives a DownloadError event notification on BDX Idle timeout which should be no less than 5 minutes.
+
+          [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]    }
+      disabled: true
+
+    - label:
+          "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-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Subscribe to StateTransition event right away after this using command
+          ./chip-tool otasoftwareupdaterequestor subscribe-event state-transition 5 10 0x1234567890 0 --timeout 65535
+
+          [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:
           "DUT successfully finishes applying a software update and the new
           software image version is being executed on the DUT."
@@ -70,7 +208,7 @@ tests:
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
           Subscribe to VersionApplied event right away after this using command
-          chip-tool otasoftwareupdaterequestor subscribe-event version-applied 5 10 1 2 0
+          ./chip-tool otasoftwareupdaterequestor subscribe-event version-applied 5 10 1 2 0
 
           Verify that the chip-tool receives below VersionApplied event notification
 
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
new file mode 100644
index 00000000000000..429771980d2020
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
@@ -0,0 +1,64 @@
+# 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.6.1. [TC-SU-2.8] OTA functionality in Multi Fabric scenario
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends a QueryImage command to the TH1/OTA-P"
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify on the OTA Provider logs:
+
+          [1645743053317] [97806:20280749] CHIP: [ZCL] OTA Provider received QueryImage
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   VendorID: 0xfff1
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   ProductID: 32769
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   SoftwareVersion: 0
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   ProtocolsSupported: [
+          [1645743053317] [97806:20280749] CHIP: [ZCL]     0
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   ]
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   HardwareVersion: 0
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   Location: XX
+          [1645743053317] [97806:20280749] CHIP: [ZCL]   RequestorCanConsent: 0
+      disabled: true
+
+    - label:
+          "DUT sends a QueryImage command to TH1/OTA-P. TH1/OTA-P does not
+          respond with QueryImageResponse."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
+
+          Kill Default OTA Provider for fabric index 1 before DUT sends a query
+
+          Verify that the DUT sends a QueryImage command to TH2/OTA-P when failing to reach out to TH1/OTA-P after a finite number of unsuccessful attempts.
+      disabled: true
+
+    - label:
+          "DUT sends a QueryImage command to TH2/OTA-P. TH2/OTA-P sends a
+          QueryImageResponse back to the DUT. Status is set to UpdateAvailable."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
+
+          Verify there is a transfer of the software image from TH2/OTA-P to the DUT
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
index 1383f3d1fd1ada..d1b733439e9fd2 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    31.10.1. [TC-SU-3.2] Tests if the DUT is sending the correct
+    3.11.1. [TC-SU-3.2] Tests if the DUT is sending the correct
     QueryImageResponse to the OTA-R
 
 config:
@@ -34,16 +34,16 @@ tests:
 
           Verify on the OTA Requestor logs
 
-          [1645743053319] [97809:20280821] CHIP: [SWU] QueryImageResponse:
-          [1645743053319] [97809:20280821] CHIP: [SWU]   status: 0
-          [1645743053319] [97809:20280821] CHIP: [SWU]   delayedActionTime: 0 seconds
-          [1645743053319] [97809:20280821] CHIP: [SWU]   imageURI: bdx://0000000000000001/test.ota
-          [1645743053319] [97809:20280821] CHIP: [SWU]   softwareVersion: 1
-          [1645743053319] [97809:20280821] CHIP: [SWU]   softwareVersionString: Example-Image-V0.1
-          [1645743053319] [97809:20280821] CHIP: [SWU]   updateToken: 32
-          [1645743053319] [97809:20280821] CHIP: [SWU]   userConsentNeeded: 0
-          [1645743053319] [97809:20280821] CHIP: [SWU]   metadataForRequestor: 0
-          [1645743053319] [97809:20280821] CHIP: [SWU] Update available from 0 to 1 version
+          [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
+          [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   delayedActionTime: 0 seconds
+          [1651265462659] [21768:35233106] CHIP: [SWU]   imageURI: bdx://0000000000000001/test.ota
+          [1651265462659] [21768:35233106] CHIP: [SWU]   softwareVersion: 2
+          [1651265462659] [21768:35233106] CHIP: [SWU]   softwareVersionString: 2.0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   updateToken: 32
+          [1651265462659] [21768:35233106] CHIP: [SWU]   userConsentNeeded: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   metadataForRequestor: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU] Update available from version 1 to 2
       disabled: true
 
     - label:
@@ -51,6 +51,8 @@ tests:
           OTA-R/TH. OTA-R/TH sends a QueryImage Command to the DUT. DUT responds
           with the QueryImageResponse to the OTA-R/TH."
       verification: |
+          out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -q updateNotAvailable
+
           chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
@@ -75,14 +77,59 @@ tests:
 
           Verify on the OTA Requestor logs
 
-          [1645743053319] [97809:20280821] CHIP: [SWU] QueryImageResponse:
-          [1645743053319] [97809:20280821] CHIP: [SWU]   status: 0
-          [1645743053319] [97809:20280821] CHIP: [SWU]   delayedActionTime: 0 seconds
-          [1645743053319] [97809:20280821] CHIP: [SWU]   imageURI: bdx://0000000000000001/test.ota
-          [1645743053319] [97809:20280821] CHIP: [SWU]   softwareVersion: 1
-          [1645743053319] [97809:20280821] CHIP: [SWU]   softwareVersionString: Example-Image-V0.1
-          [1645743053319] [97809:20280821] CHIP: [SWU]   updateToken: 32
-          [1645743053319] [97809:20280821] CHIP: [SWU]   userConsentNeeded: 0
-          [1645743053319] [97809:20280821] CHIP: [SWU]   metadataForRequestor: 0
-          [1645743053319] [97809:20280821] CHIP: [SWU] Update available from 0 to 1 version
+          [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
+          [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   delayedActionTime: 0 seconds
+          [1651265462659] [21768:35233106] CHIP: [SWU]   imageURI: bdx://0000000000000001/test.ota
+          [1651265462659] [21768:35233106] CHIP: [SWU]   softwareVersion: 2
+          [1651265462659] [21768:35233106] CHIP: [SWU]   softwareVersionString: 2.0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   updateToken: 32
+          [1651265462659] [21768:35233106] CHIP: [SWU]   userConsentNeeded: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   metadataForRequestor: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU] Update available from version 1 to 2
+
+          Verify all the image URI field requirements.
+      disabled: true
+
+    - label:
+          "OTA-R/TH sends a QueryImage Command to the DUT. ProtocolSupported
+          field should list 'https'. DUT responds with a QueryImageResponse to
+          the OTA-R/TH."
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
+    - label:
+          "OTA-R/TH sends a QueryImage Command to the DUT. DUT responds with the
+          QueryImageResponse with QueryStatus set to 'Busy', DelayedActionTime
+          set to 3 minutes. On the subsequent QueryImage command, DUT sends a
+          QueryImageResponse back to OTA-R/TH. QueryStatus is set to
+          'UpdateAvailable'."
+      verification: |
+          out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -q busy
+
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Verify on the OTA Requestor logs
+          [1651265271074] [21764:35230537] CHIP: [SWU] QueryImageResponse:
+          [1651265271074] [21764:35230537] CHIP: [SWU]   status: 1
+          [1651265271074] [21764:35230537] CHIP: [SWU]   delayedActionTime: 180 seconds
+          [1651265271074] [21764:35230537] CHIP: [SWU]   userConsentNeeded: 0
+          [1651265271074] [21764:35230537] CHIP: [SWU]   metadataForRequestor: 0
+
+          Verify that the OTA-R/TH starts the download from the DUT after the second QueryImageResponse with UpdateAvailable status.
+          [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
+          [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   delayedActionTime: 0 seconds
+          [1651265462659] [21768:35233106] CHIP: [SWU]   imageURI: bdx://0000000000000001/test.ota
+          [1651265462659] [21768:35233106] CHIP: [SWU]   softwareVersion: 2
+          [1651265462659] [21768:35233106] CHIP: [SWU]   softwareVersionString: 2.0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   updateToken: 32
+          [1651265462659] [21768:35233106] CHIP: [SWU]   userConsentNeeded: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU]   metadataForRequestor: 0
+          [1651265462659] [21768:35233106] CHIP: [SWU] Update available from version 1 to 2
+
+          Verify that the Image downloaded by the OTA-R/TH is valid and is the same image that was supposed to be downloaded.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
index 6317a8e4f50137..d1eac0de5ef329 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
@@ -13,8 +13,7 @@
 # limitations under the License.
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
-name:
-    31.11.1. [TC-SU-3.3] Tests the transfer of Images between the DUT and OTA-R
+name: 3.12.1. [TC-SU-3.3] Tests the transfer of Images between the DUT and OTA-R
 
 config:
     nodeId: 0x12344321
@@ -44,7 +43,7 @@ tests:
           [1645743053319] [97809:20280821] CHIP: [SWU]   metadataForRequestor: 0
           [1645743053319] [97809:20280821] CHIP: [SWU] Update available from 0 to 1 version
 
-          Verifyon the OTA Requestor logs after image downloaded
+          Verify on the OTA Requestor logs after image downloaded
 
           [1645743059327] [97809:20280957] CHIP: [SWU] OTA image downloaded to test.txt
       disabled: true
@@ -63,8 +62,9 @@ tests:
           UserConsentNeeded field set to True."
       verification: |
           Run the OTA Requestor App using command
+          chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --periodicQueryTimeout ${TIME_IN_SECONDS} -c
 
-          chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --delayQuery ${TIME_IN_SECONDS} -c
+          out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -c
 
           Verify that the DUT does not try to obtain User Consent from the user prior to transfer of software update image.
       disabled: true
@@ -76,11 +76,43 @@ tests:
       verification: |
           Run the OTA Requestor App using command
 
-          chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --delayQuery ${TIME_IN_SECONDS} -c
+          chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --periodicQueryTimeout ${TIME_IN_SECONDS} -c
+
+          out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin
 
           Verify that the DUT tries to obtain User Consent from the user prior to transfer of software update image.
       disabled: true
 
+    - label:
+          "During the transfer of the image from the DUT, force fail the
+          transfer before it completely transfers the image. Wait for the Idle
+          timeout. Initiate another QueryImage Command from OTA-R/TH to the DUT."
+      verification: |
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
+
+          Kill the OTA Requestor App during the transfer of the image to the DUT before it completely transfers the image.
+
+          Verify that the BDX Idle timeout on DUT should be no less than 5 minutes.
+          [1651269360125] [23256:35291938] CHIP: [BDX] Transfer timed out
+
+          Relaunch the OTA Requestor App and initiate another query
+          chip-tool otasoftwareupdaterequestor announce-ota-provider 0xDEADBEEF 0 0 0 0x1234567890 0
+
+          Verify that a new transfer of software image is started from DUT when sending another QueryImage request
+      disabled: true
+
+    - label:
+          "During the transfer of the image from the DUT, force fail the
+          transfer before it completely transfers the image. Initiate another
+          QueryImage Command from OTA-R/TH to the DUT. Set the RC[STARTOFS] bit
+          and associated STARTOFS field in the ReceiveInit Message sent from the
+          TH to indicate the resumption of a transfer previously aborted."
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
     - label:
           "IF (PICS_DT_Vendor_Specific) Perform the OTA Update from DUT using
           vendor specific mechanism."
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
index 802827c2fd6ff6..65ce64be9558b4 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    31.12.1. [TC-SU-3.4] Tests the scenarios on when a software update should be
+    3.13.1. [TC-SU-3.4] Tests the scenarios on when a software update should be
     applied by the OTA-R
 
 config:
@@ -33,3 +33,56 @@ tests:
           [1645743059328] [97809:20280957] CHIP: [SWU]   action: 0
           [1645743059328] [97809:20280957] CHIP: [SWU]   delayedActionTime: 0 seconds
       disabled: true
+
+    - label:
+          "OTA-R/TH on completion of image download sends an ApplyUpdateRequest
+          command to the DUT. DUT responds with the ApplyUpdateResponse with
+          Action set to 'AwaitNextAction', DelayedActionTime set to 3 minutes.
+          On the subsequent ApplyUpdateRequest command, DUT sends a
+          ApplyUpdateResponse back to DUT. Action is set to Proceed."
+      verification: |
+          Run the OTA Requestor App using command
+
+          chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --periodicQueryTimeout ${TIME_IN_SECONDS} --autoApplyImage
+
+          chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a awaitNextAction -p 180
+
+          Verify on the OTA Requestor logs:
+
+          [1651273867647] [25752:35374182] CHIP: [SWU] ApplyUpdateResponse:
+          [1651273867647] [25752:35374182] CHIP: [SWU]   action: 1
+          [1651273867647] [25752:35374182] CHIP: [SWU]   delayedActionTime: 180 seconds
+
+          Verify on the OTA Requestor logs after subsequent ApplyUpdateRequest:
+
+          [1651274047655] [25752:35376683] CHIP: [SWU] ApplyUpdateResponse:
+          [1651274047655] [25752:35376683] CHIP: [SWU]   action: 0
+          [1651274047655] [25752:35376683] CHIP: [SWU]   delayedActionTime: 0 seconds
+      disabled: true
+
+    - label:
+          "OTA-R/TH on completion of image download sends an ApplyUpdateRequest
+          command to the DUT. DUT responds with the ApplyUpdateResponse with
+          Action set to 'Discontinue'. Initiate another QueryImage Command from
+          OTA-R/TH to the DUT."
+      verification: |
+          Run the OTA Requestor App using command
+
+          chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --periodicQueryTimeout ${TIME_IN_SECONDS}
+
+          chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a discontinue
+
+          Verify on the OTA Requestor logs:
+
+          [1651275906536] [26578:35409308] CHIP: [SWU] ApplyUpdateResponse:
+          [1651275906536] [26578:35409308] CHIP: [SWU]   action: 2
+          [1651275906536] [26578:35409308] CHIP: [SWU]   delayedActionTime: 0 seconds
+
+          Verify on the OTA Requestor logs after subsequent ApplyUpdateRequest:
+
+          [1651274047655] [25752:35376683] CHIP: [SWU] ApplyUpdateResponse:
+          [1651274047655] [25752:35376683] CHIP: [SWU]   action: 0
+          [1651274047655] [25752:35376683] CHIP: [SWU]   delayedActionTime: 0 seconds
+
+          Initiate another QueryImage Command from OTA-R/TH to the DUT and verify that the entire OTA process is restarted on DUT when OTA-R/TH sends another QueryImage Request.
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
index b280a1dc55eab6..2b6a37fe8b7fb8 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
@@ -21,11 +21,121 @@ config:
     endpoint: 0
 
 tests:
+    - label:
+          "TH sends a write request for the DefaultOTAProviders Attribute on the
+          first fabric to the DUT. TH2 is set as the default Provider for the
+          fabric."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+
+          status = 0x00 (SUCCESS),
+      disabled: true
+
+    - label:
+          "TH sends a read request to read the DefaultOTAProviders Attribute on
+          the first fabric to the DUT."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor read default-ota-providers 0x1234567890 0
+
+          [1651277342848] [26860:35431852] CHIP: [TOO]   DefaultOtaProviders: 1 entries
+          [1651277342848] [26860:35431852] CHIP: [TOO]     [1]: {
+          [1651277342848] [26860:35431852] CHIP: [TOO]       ProviderNodeID: 1
+          [1651277342848] [26860:35431852] CHIP: [TOO]       Endpoint: 0
+          [1651277342848] [26860:35431852] CHIP: [TOO]       FabricIndex: 1
+          [1651277342848] [26860:35431852] CHIP: [TOO]      }
+      disabled: true
+
+    - label:
+          "TH sends a write request for the DefaultOTAProviders Attribute on the
+          second fabric to the DUT. TH3 is set as the default Provider for the
+          fabric."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
+      disabled: true
+
+    - label:
+          "TH sends a read request to read the DefaultOTAProviders Attribute on
+          the first and second fabric to the DUT."
+      verification: |
+          ./chip-tool otasoftwareupdaterequestor read default-ota-providers 0x1234567890 0
+
+          [1651277342848] [26860:35431852] CHIP: [TOO]   DefaultOtaProviders: 1 entries
+          [1651277342848] [26860:35431852] CHIP: [TOO]     [1]: {
+          [1651277342848] [26860:35431852] CHIP: [TOO]       ProviderNodeID: 1
+          [1651277342848] [26860:35431852] CHIP: [TOO]       Endpoint: 0
+          [1651277342848] [26860:35431852] CHIP: [TOO]       FabricIndex: 1
+          [1651277342848] [26860:35431852] CHIP: [TOO]      }
+
+          ./chip-tool otasoftwareupdaterequestor read default-ota-providers 0x858 0 --commissioner-name beta
+
+          [1651277543492] [26864:35434761] CHIP: [TOO]   DefaultOtaProviders: 1 entries
+          [1651277543492] [26864:35434761] CHIP: [TOO]     [1]: {
+          [1651277543492] [26864:35434761] CHIP: [TOO]       ProviderNodeID: 5
+          [1651277543492] [26864:35434761] CHIP: [TOO]       Endpoint: 0
+          [1651277543492] [26864:35434761] CHIP: [TOO]       FabricIndex: 2
+          [1651277543492] [26864:35434761] CHIP: [TOO]      }
+      disabled: true
+
+    - label:
+          "TH sends a write request for the DefaultOTAProviders Attribute on the
+          first fabric to the DUT. TH4 is the first Provider location and TH2 is
+          the second Provider location in the same write request on the first
+          fabric. TH sends a read request to read the DefaultOTAProviders
+          Attribute on the first and second fabric to the DUT."
+      verification: |
+          chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 10, "endpoint": 0}, {"fabricIndex": 1, "providerNodeID": 20, "endpoint": 0}]' 0x0000001234567890 0
+
+          [1651278243153] [27005:35448520] CHIP: [TOO] Response Failure: IM Error 0x00000587: General error: 0x87 (CONSTRAINT_ERROR)
+
+          chip-tool otasoftwareupdaterequestor read default-ota-providers 0x1234567890 0
+
+          [1651277342848] [26860:35431852] CHIP: [TOO]   DefaultOtaProviders: 1 entries
+          [1651277342848] [26860:35431852] CHIP: [TOO]     [1]: {
+          [1651277342848] [26860:35431852] CHIP: [TOO]       ProviderNodeID: 10
+          [1651277342848] [26860:35431852] CHIP: [TOO]       Endpoint: 0
+          [1651277342848] [26860:35431852] CHIP: [TOO]       FabricIndex: 1
+          [1651277342848] [26860:35431852] CHIP: [TOO]      }
+
+          chip-tool otasoftwareupdaterequestor read default-ota-providers 0x858 0 --commissioner-name beta
+
+          [1651277543492] [26864:35434761] CHIP: [TOO]   DefaultOtaProviders: 1 entries
+          [1651277543492] [26864:35434761] CHIP: [TOO]     [1]: {
+          [1651277543492] [26864:35434761] CHIP: [TOO]       ProviderNodeID: 5
+          [1651277543492] [26864:35434761] CHIP: [TOO]       Endpoint: 0
+          [1651277543492] [26864:35434761] CHIP: [TOO]       FabricIndex: 2
+          [1651277543492] [26864:35434761] CHIP: [TOO]      }
+      disabled: true
+
+    - label:
+          "TH sends a write request for the DefaultOTAProviders Attribute with
+          an empty provider list on the second fabric to the DUT. TH sends a
+          read request to read the DefaultOTAProviders Attribute on the first
+          and second fabric to the DUT."
+      verification: |
+          chip-tool otasoftwareupdaterequestor write default-ota-providers '[]' 0x858 0 --commissioner-name beta
+
+          status = 0x00 (SUCCESS),
+
+
+          chip-tool otasoftwareupdaterequestor read default-ota-providers 0x1234567890 0
+
+          [1651277342848] [26860:35431852] CHIP: [TOO]   DefaultOtaProviders: 1 entries
+          [1651277342848] [26860:35431852] CHIP: [TOO]     [1]: {
+          [1651277342848] [26860:35431852] CHIP: [TOO]       ProviderNodeID: 10
+          [1651277342848] [26860:35431852] CHIP: [TOO]       Endpoint: 0
+          [1651277342848] [26860:35431852] CHIP: [TOO]       FabricIndex: 1
+          [1651277342848] [26860:35431852] CHIP: [TOO]      }
+
+          chip-tool otasoftwareupdaterequestor read default-ota-providers 0x858 0 --commissioner-name beta
+
+          [1651280268033] [27804:35481732] CHIP: [TOO]   DefaultOtaProviders: 0 entries
+      disabled: true
+
     - label:
           "TH sends a read request to read the UpdatePossible attribute from the
           DUT."
       verification: |
-          chip-tool otasoftwareupdaterequestor read update-possible 0x1234567890 0
+          ./chip-tool otasoftwareupdaterequestor read update-possible 0x1234567890 0
 
           where 0x1234567890 is OTA Requestor node ID
 
@@ -63,7 +173,7 @@ tests:
           "TH sends a read request to read the UpdateState attribute from the
           DUT"
       verification: |
-          chip-tool otasoftwareupdaterequestor read update-state 0x1234567890 0
+          ./chip-tool otasoftwareupdaterequestor read update-state 0x1234567890 0
 
           where 0x1234567890 is OTA Requestor node ID
 
@@ -102,7 +212,7 @@ tests:
           DUT is downloading the image, TH sends a read request to read the
           UpdateStateProgress attribute from the DUT"
       verification: |
-          chip-tool otasoftwareupdaterequestor read update-state-progress 0x1234567890 0
+          ./chip-tool otasoftwareupdaterequestor read update-state-progress 0x1234567890 0
 
           where 0x1234567890 is OTA Requestor node ID
 
@@ -110,57 +220,57 @@ tests:
 
           [1645823750592] [22938:21245247] CHIP: [DMG] ReportDataMessage =
           [1645823750592] [22938:21245247] CHIP: [DMG] {
-          [1645823750592] [22938:21245247] CHIP: [DMG] 	AttributeReportIBs =
-          [1645823750592] [22938:21245247] CHIP: [DMG] 	[
-          [1645823750592] [22938:21245247] CHIP: [DMG] 		AttributeReportIB =
-          [1645823750592] [22938:21245247] CHIP: [DMG] 		{
-          [1645823750592] [22938:21245247] CHIP: [DMG] 			AttributeDataIB =
-          [1645823750592] [22938:21245247] CHIP: [DMG] 			{
-          [1645823750592] [22938:21245247] CHIP: [DMG] 				DataVersion = 0x3873a963,
-          [1645823750592] [22938:21245247] CHIP: [DMG] 				AttributePathIB =
-          [1645823750592] [22938:21245247] CHIP: [DMG] 				{
-          [1645823750592] [22938:21245247] CHIP: [DMG] 					Endpoint = 0x0,
-          [1645823750592] [22938:21245247] CHIP: [DMG] 					Cluster = 0x2a,
-          [1645823750592] [22938:21245247] CHIP: [DMG] 					Attribute = 0x0000_0003,
-          [1645823750592] [22938:21245247] CHIP: [DMG] 				}
+          [1645823750592] [22938:21245247] CHIP: [DMG]         AttributeReportIBs =
+          [1645823750592] [22938:21245247] CHIP: [DMG]         [
+          [1645823750592] [22938:21245247] CHIP: [DMG]                 AttributeReportIB =
+          [1645823750592] [22938:21245247] CHIP: [DMG]                 {
+          [1645823750592] [22938:21245247] CHIP: [DMG]                         AttributeDataIB =
+          [1645823750592] [22938:21245247] CHIP: [DMG]                         {
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                 DataVersion = 0x3873a963,
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                 AttributePathIB =
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                 {
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                         Cluster = 0x2a,
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                         Attribute = 0x0000_0003,
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                 }
           [1645823750592] [22938:21245247] CHIP: [DMG]
-          [1645823750592] [22938:21245247] CHIP: [DMG] 					Data = NULL
-          [1645823750592] [22938:21245247] CHIP: [DMG] 			},
+          [1645823750592] [22938:21245247] CHIP: [DMG]                                         Data = NULL
+          [1645823750592] [22938:21245247] CHIP: [DMG]                         },
           [1645823750592] [22938:21245247] CHIP: [DMG]
-          [1645823750592] [22938:21245247] CHIP: [DMG] 		},
+          [1645823750592] [22938:21245247] CHIP: [DMG]                 },
           [1645823750592] [22938:21245247] CHIP: [DMG]
-          [1645823750592] [22938:21245247] CHIP: [DMG] 	],
+          [1645823750592] [22938:21245247] CHIP: [DMG]         ],
           [1645823750592] [22938:21245247] CHIP: [DMG]
-          [1645823750592] [22938:21245247] CHIP: [DMG] 	SuppressResponse = true,
-          [1645823750592] [22938:21245247] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1645823750592] [22938:21245247] CHIP: [DMG]         SuppressResponse = true,
+          [1645823750592] [22938:21245247] CHIP: [DMG]         InteractionModelRevision = 1
           [1645823750592] [22938:21245247] CHIP: [DMG] }
 
           Verify that the field value is anything between 1 to 100 for an ongoing update on the chip-tool logs
 
           [1645823829292] [22944:21246546] CHIP: [DMG] ReportDataMessage =
           [1645823829292] [22944:21246546] CHIP: [DMG] {
-          [1645823829292] [22944:21246546] CHIP: [DMG] 	AttributeReportIBs =
-          [1645823829292] [22944:21246546] CHIP: [DMG] 	[
-          [1645823829292] [22944:21246546] CHIP: [DMG] 		AttributeReportIB =
-          [1645823829292] [22944:21246546] CHIP: [DMG] 		{
-          [1645823829292] [22944:21246546] CHIP: [DMG] 			AttributeDataIB =
-          [1645823829292] [22944:21246546] CHIP: [DMG] 			{
-          [1645823829292] [22944:21246546] CHIP: [DMG] 				DataVersion = 0x3873a966,
-          [1645823829292] [22944:21246546] CHIP: [DMG] 				AttributePathIB =
-          [1645823829292] [22944:21246546] CHIP: [DMG] 				{
-          [1645823829292] [22944:21246546] CHIP: [DMG] 					Endpoint = 0x0,
-          [1645823829292] [22944:21246546] CHIP: [DMG] 					Cluster = 0x2a,
-          [1645823829292] [22944:21246546] CHIP: [DMG] 					Attribute = 0x0000_0003,
-          [1645823829292] [22944:21246546] CHIP: [DMG] 				}
+          [1645823829292] [22944:21246546] CHIP: [DMG]         AttributeReportIBs =
+          [1645823829292] [22944:21246546] CHIP: [DMG]         [
+          [1645823829292] [22944:21246546] CHIP: [DMG]                 AttributeReportIB =
+          [1645823829292] [22944:21246546] CHIP: [DMG]                 {
+          [1645823829292] [22944:21246546] CHIP: [DMG]                         AttributeDataIB =
+          [1645823829292] [22944:21246546] CHIP: [DMG]                         {
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                 DataVersion = 0x3873a966,
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                 AttributePathIB =
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                 {
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                         Cluster = 0x2a,
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                         Attribute = 0x0000_0003,
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                 }
           [1645823829292] [22944:21246546] CHIP: [DMG]
-          [1645823829292] [22944:21246546] CHIP: [DMG] 					Data = 20,
-          [1645823829292] [22944:21246546] CHIP: [DMG] 			},
+          [1645823829292] [22944:21246546] CHIP: [DMG]                                         Data = 20,
+          [1645823829292] [22944:21246546] CHIP: [DMG]                         },
           [1645823829292] [22944:21246546] CHIP: [DMG]
-          [1645823829292] [22944:21246546] CHIP: [DMG] 		},
+          [1645823829292] [22944:21246546] CHIP: [DMG]                 },
           [1645823829292] [22944:21246546] CHIP: [DMG]
-          [1645823829292] [22944:21246546] CHIP: [DMG] 	],
+          [1645823829292] [22944:21246546] CHIP: [DMG]         ],
           [1645823829292] [22944:21246546] CHIP: [DMG]
-          [1645823829292] [22944:21246546] CHIP: [DMG] 	SuppressResponse = true,
-          [1645823829292] [22944:21246546] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1645823829292] [22944:21246546] CHIP: [DMG]         SuppressResponse = true,
+          [1645823829292] [22944:21246546] CHIP: [DMG]         InteractionModelRevision = 1
           [1645823829292] [22944:21246546] CHIP: [DMG] }
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
index fd772fd5529ecc..9837321c24f013 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
@@ -22,6 +22,20 @@ config:
     endpoint: 0
 
 tests:
+    - label:
+          "DUT sends a write request for the DefaultOTAProviders Attribute to
+          the TH."
+      verification: |
+          Verify that the OTA Requestor App receives the write command and does not reject the value as invalid.
+      disabled: true
+
+    - label:
+          "DUT sends a read request to read the DefaultOTAProviders Attribute to
+          the TH."
+      verification: |
+          Verify that the OTA Requestor App responds to the read command
+      disabled: true
+
     - label:
           "DUT sends a read request to read the UpdatePossible attribute from
           the TH."
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
index 0c509a450c8ee6..c59c42321e21a6 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
@@ -33,11 +33,6 @@ tests:
       attribute: "number of positions"
       response:
           value: 2
-
-    - label: "Read NumberOfPositions attribute"
-      command: "readAttribute"
-      attribute: "number of positions"
-      response:
           constraints:
               type: uint8
               minValue: 2
@@ -47,11 +42,6 @@ tests:
       attribute: "current position"
       response:
           value: 0
-
-    - label: "Read CurrentPosition attribute"
-      command: "readAttribute"
-      attribute: "current position"
-      response:
           constraints:
               type: uint8
               minValue: 0
@@ -61,11 +51,6 @@ tests:
       attribute: "multi press max"
       response:
           value: 2
-
-    - label: "Read MultiPressMax attribute"
-      command: "readAttribute"
-      attribute: "multi press max"
-      response:
           constraints:
               type: uint8
               minValue: 2
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
index d5a9772e47fd58..90a0207cd07359 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
@@ -11,509 +11,289 @@
 # 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: 74.2.2. [TC-SWTCH-2.2] Primary functionality with server as DUT
-
+name: "[TC-SWTCH-2.2] Primary functionality with server as DUT"
 config:
-    nodeId: 0x12344321
-    cluster: "Switch"
-    endpoint: 1
-
+    nodeId: "0x12344321"
+    cluster: "Basic"
+    endpoint: 0
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    #### 2: tests for Latching Switch
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Set up subscription to SwitchLatched event"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator sets switch to first position"
+    - label: "Commission DUT to TH (can be skipped if done in a preceding test)"
+      verification: |
 
-    - label: "Read CurrentPosition attribute"
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 0
+      disabled: true
+
+    - label: "Set up subscription to SwitchLatched event"
+      verification: |
+          ./chip-tool switch subscribe-event switch-latched 1 100 1 1
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator sets switch to second position"
+          [1646209067.917157][2496:2501] CHIP:DMG: SubscribeResponseMessage =
+          [1646209067.917184][2496:2501] CHIP:DMG: {
+          [1646209067.917208][2496:2501] CHIP:DMG:        SubscriptionId = 0xe1d5f4339dd88873,
+          [1646209067.917233][2496:2501] CHIP:DMG:        MinIntervalFloorSeconds = 0x1,
+          [1646209067.917259][2496:2501] CHIP:DMG:        MaxIntervalCeilingSeconds = 0x64,
+          [1646209067.917283][2496:2501] CHIP:DMG:        InteractionModelRevision = 1
+          [1646209067.917306][2496:2501] CHIP:DMG: }
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "SwitchLatched event with NewPosition set to 1"
+    - label: "Operator sets switch to first position"
+      verification: |
+          no Matter messages
       disabled: true
 
     - label: "Read CurrentPosition attribute"
+      verification: |
+          ./chip-tool switch read current-position 1 1
+          [1646209289.746157][2617:2622] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001DataVersion: 1206711661
+          [1646209289.746228][2617:2622] CHIP:TOO:   current position: 0
       disabled: true
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 1
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label:
-          "SwitchLatched event with NewPosition set to 1 higher than in previous
-          event"
+    - label: "Operator sets switch to second position"
+      verification: |
+          no Matter messages
       disabled: true
 
     - label: "Read CurrentPosition attribute"
+      verification: |
+          ./chip-tool switch read current-position 1 1
+          [1646209289.746157][2617:2622] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001DataVersion: 1206711661
+          [1646209289.746228][2617:2622] CHIP:TOO:   current position: 1
       disabled: true
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 2
 
-    #Disabled due to issue #11343 -- Event verification not implemented
     - label:
-          "SwitchLatched event with NewPosition set to 1 higher than in previous
-          event"
-      disabled: true
+          "If NumberOfPositions>2 (see 2c of TC-SWTCH-2.1) : - Operator sets
+          switch to next position - Read CurrentPosition attribute"
+      verification: |
+          ./chip-tool switch read current-position 1 1
 
-    - label: "Read CurrentPosition attribute"
+          Event (content will vary on the device)
+          [1646209167.923346][2190:2190] CHIP:DMG: StatusResponseMessage =
+          [1646209167.923415][2190:2190] CHIP:DMG: {
+          [1646209167.923472][2190:2190] CHIP:DMG:        Status = 0x0,
+          [1646209167.923533][2190:2190] CHIP:DMG:        InteractionModelRevision = 1
+          [1646209167.923583][2190:2190] CHIP:DMG: }
+          [1646209167.923640][2190:2190] CHIP:IM: Received status response, status is 0
       disabled: true
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 3
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "SwitchLatched event with NewPosition set to 0"
+    - label:
+          "If NumberOfPositions>3 : - Repeat step 2f for NumberOfPositions-3
+          times - After each time Operator has set switch to next position, -
+          Read CurrentPosition attribute"
+      verification: |
+          ./chip-tool switch read current-position 1 1
+          [1646209289.746157][2617:2622] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001DataVersion: 1206711661
+          [1646209289.746228][2617:2622] CHIP:TOO:   current position: 0
       disabled: true
 
-    - label: "Read CurrentPosition attribute"
+    - label: "Operator returns switch to first position"
+      verification: |
+          Event (content will vary on the device) [1646209167.923346][2190:2190] CHIP:DMG: StatusResponseMessage = [1646209167.923415][2190:2190] CHIP:DMG: { [1646209167.923472][2190:2190] CHIP:DMG: Status = 0x0, [1646209167.923533][2190:2190] CHIP:DMG: InteractionModelRevision = 1 [1646209167.923583][2190:2190] CHIP:DMG: } [1646209167.923640][2190:2190] CHIP:IM: Received status response, status is 0
       disabled: true
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 0
-
-    ### 3: tests for Momentary Switch
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Set up subscription to InitialPress event"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator does not operate switch"
 
     - label: "Read CurrentPosition attribute"
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 0
+      verification: |+
+          ./chip-tool switch read current-position 1 1
+          [1646209289.746157][2617:2622] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001DataVersion: 1206711661
+          [1646209289.746228][2617:2622] CHIP:TOO:   current position: 0
+      disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator sets switch to second position"
+    - label: "Set up subscription to InitialPress event"
+      verification: |
+          ./chip-tool switch subscribe-event initial-press 1 100 1 1
+          [1646209546.313236][2641:2646] CHIP:DMG: SubscribeResponseMessage =
+          [1646209546.313263][2641:2646] CHIP:DMG: {
+          [1646209546.313285][2641:2646] CHIP:DMG:        SubscriptionId = 0x463c015025bd6b74,
+          [1646209546.313314][2641:2646] CHIP:DMG:        MinIntervalFloorSeconds = 0x1,
+          [1646209546.313342][2641:2646] CHIP:DMG:        MaxIntervalCeilingSeconds = 0x2,
+          [1646209546.313367][2641:2646] CHIP:DMG:        InteractionModelRevision = 1
+          [1646209546.313389][2641:2646] CHIP:DMG: }
+          [1646209546.313421][2641:2646] CHIP:DMG: MoveToState ReadClient[0xffff700030b0]: Moving to [Subscripti]
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
+    - label: "Operator does not operate switch"
+      verification: |
+          no Matter messages
       disabled: true
 
     - label: "Read CurrentPosition attribute"
+      verification: |+
+          ./chip-tool switch read current-position 1 1
+          [1646209289.746157][2617:2622] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_003B Attribute 0x0000_0001DataVersion: 1206711661
+          [1646209289.746228][2617:2622] CHIP:TOO:   current position: 0
       disabled: true
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 1
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator does not operate switch (release switch)"
+    - label: "Operator operates switch (keep it pressed)"
+      verification: |
+          receive event
+      disabled: true
 
     - label: "Read CurrentPosition attribute"
+      verification: |
+          Read attrbute
       disabled: true
-      command: "readAttribute"
-      attribute: "current position"
-      response:
-          value: 0
-
-    ## 4: tests for Momentary Switch with release capability but not long press capabilities
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Set up subscription to InitialPress and ShortRelease events"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator does not operate switch"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch (press briefly)"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch for 5 seconds"
-
-    - label: "Wait 3000ms"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 3000
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
-      disabled: true
-
-    ## 5: tests for Momentary Switch with release and long press capabilitie
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Set up subscription to InitialPress, LongPress,
-                    ShortRelease, LongRelease events"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator does not operate switch"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch (press briefly)"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch for 5 seconds"
-
-    - label: "Wait 3000ms"
-      cluster: "DelayCommands"
-      command: "WaitForMs"
-      arguments:
-          values:
-              - name: "ms"
-                value: 3000
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
-      disabled: true
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "LongPress event with NewPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "LongRelease event with PreviousPosition set to 1"
-      disabled: true
-
-    ## 6: tests for Momentary Switch with multi-press capabilities
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value:
-                    "Set up subscription to InitialPress, ShortRelease,
-                    MultiPressOngoing, MultiPressComplete events"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator does not operate switch"
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch (press briefly)"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
-      disabled: true
-
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
-      disabled: true
-
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label:
-          "MultiPressComplete event with PreviousPosition set to 1 and
-          TotalNumberOfPressesCounted set to 1"
+
+    - label: "Operator does not operate switch (release switch)"
+      verification: |
+          no Matter messages
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch (press briefly)"
+    - label: "Read CurrentPosition attribute"
+      verification: |
+          Read attrbute
+      disabled: true
+
+    - label: "Set up subscription to InitialPress and ShortRelease events"
+      verification: |
+          ./chip-tool switch subscribe-event initial-press 1 100 1 1 1
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
+          ./chip-tool switch subscribe-event short-release 1 100 1 1 1
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
+    - label: "Operator does not operate switch"
+      verification: |
+          no Matter messages
+      disabled: true
+
+    - label: "Operator operates switch (press briefly)"
+      verification: |
+          Event (content will vary on the device) [1646209167.923346][2190:2190] CHIP:DMG: StatusResponseMessage = [1646209167.923415][2190:2190] CHIP:DMG: { [1646209167.923472][2190:2190] CHIP:DMG: Status = 0x0, [1646209167.923533][2190:2190] CHIP:DMG: InteractionModelRevision = 1 [1646209167.923583][2190:2190] CHIP:DMG: } [1646209167.923640][2190:2190] CHIP:IM: Received status response, status is 0
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
+    - label: "Operator releases switch"
+      verification: |
+          Event (content will vary on the device) [1646209167.923346][2190:2190] CHIP:DMG: StatusResponseMessage = [1646209167.923415][2190:2190] CHIP:DMG: { [1646209167.923472][2190:2190] CHIP:DMG: Status = 0x0, [1646209167.923533][2190:2190] CHIP:DMG: InteractionModelRevision = 1 [1646209167.923583][2190:2190] CHIP:DMG: } [1646209167.923640][2190:2190] CHIP:IM: Received status response, status is 0
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch again (press briefly)"
+    - label:
+          "Operator operates switch (keep pressed for long time, e.g. 5 seconds)"
+      verification: |
+          Event (content will vary on the device) [1646209167.923346][2190:2190] CHIP:DMG: StatusResponseMessage = [1646209167.923415][2190:2190] CHIP:DMG: { [1646209167.923472][2190:2190] CHIP:DMG: Status = 0x0, [1646209167.923533][2190:2190] CHIP:DMG: InteractionModelRevision = 1 [1646209167.923583][2190:2190] CHIP:DMG: } [1646209167.923640][2190:2190] CHIP:IM: Received status response, status is 0
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
+    - label: "Operator releases switch"
+      verification: |
+          Event (content will vary on the device) [1646209167.923346][2190:2190] CHIP:DMG: StatusResponseMessage = [1646209167.923415][2190:2190] CHIP:DMG: { [1646209167.923472][2190:2190] CHIP:DMG: Status = 0x0, [1646209167.923533][2190:2190] CHIP:DMG: InteractionModelRevision = 1 [1646209167.923583][2190:2190] CHIP:DMG: } [1646209167.923640][2190:2190] CHIP:IM: Received status response, status is 0
       disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
     - label:
-          "MultiPressComplete event with PreviousPosition set to 1 and
-          TotalNumberOfPressesCounted set to 2"
+          "Set up subscription to InitialPress, LongPress, ShortRelease,
+          LongRelease events"
+      verification: |
+          ./chip-tool switch subscribe-event initial-press 1 100 1 1 1
+
+          ./chip-tool switch subscribe-event short-release 1 100 1 1 1
+
+          ./chip-tool switch subscribe-event long-press 1 100 1 1 1
+
+          ./chip-tool switch subscribe-event long-release 1 100 1 1 1
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
+    - label: "Operator does not operate switch"
+      verification: |
+          no Matter messages
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
+    - label: "Operator operates switch (press briefly)"
+      verification: |
+          receive event
+      disabled: true
+
+    - label: "Operator releases switch"
+      verification: |
+          receive event
       disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
     - label:
-          "MultiPressComplete event with PreviousPosition set to 1 and
-          TotalNumberOfPressesCounted set to 1"
+          "Operator operates switch (keep pressed for long time, e.g. 5 seconds)"
+      verification: |
+          receive 2 events
       disabled: true
 
-    # 6i
+    - label: "Operator releases switch"
+      verification: |
+          receive event
+      disabled: true
+
+    - label:
+          "Set up subscription to InitialPress, ShortRelease, MultiPressOngoing,
+          MultiPressComplete events"
+      verification: |
+          ./chip-tool switch subscribe-event initial-press 1 100 1 1 1
+
+          ./chip-tool switch subscribe-event short-release 1 100 1 1 1
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch again (press briefly)"
+          ./chip-tool switch subscribe-event multi-press-ongoing 1 100 1 1 1
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
+          ./chip-tool switch subscribe-event multi-presscomplete 1 100 1 1 1
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
+    - label: "Operator does not operate switch"
+      verification: |
+          no Matter messages for this step
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
+    - label: "Operator operates switch (press briefly)"
+      verification: |
+          receive event
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch again (press briefly)"
+    - label: "Operator releases switch"
+      verification: |
+          receive 2 events
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
+    - label: "Operator operates switch (press briefly)"
+      verification: |
+          receive event
       disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label:
-          "MultiPressOngoing event with NewPosition set to 1 and
-          CurrentNumberOfPressesCounted set to 2"
+    - label: "Operator releases switch"
+      verification: |
+          receive event
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
+    - label: "Briefly after 6f, operator operates switch again (press briefly)"
+      verification: |
+          receive 2 events
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
+    - label: "Operator releases switch"
+      verification: |
+          receive 2 events
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator operates switch again (press briefly)"
+    - label: "If MultiPressMax == 2, skip steps 6j .. 6o"
+      verification: |
+          no Matter messages for this step
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "InitialPress event with NewPosition set to 1"
+    - label: "Operator operates switch (press briefly)"
+      verification: |
+          receive event
       disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label:
-          "MultiPressOngoing event with NewPosition set to 1 and
-          CurrentNumberOfPressesCounted set to 3"
+    - label: "Operator releases switch"
+      verification: |
+          receive event
       disabled: true
 
-    - label: "User interaction needed"
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Operator releases switch"
+    - label: "Briefly after 6k, operator operates switch again (press briefly)"
+      verification: |
+          receive 2 events
+      disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label: "ShortRelease event with PreviousPosition set to 1"
+    - label: "Operator releases switch"
+      verification: |
+          receive event
       disabled: true
 
-    #Disabled due to issue #11343 -- Event verification not implemented
-    - label:
-          "MultiPressComplete event with PreviousPosition set to 1 and
-          TotalNumberOfPressesCounted set to 3"
+    - label: "Briefly after 6m, operator operates switch again (press briefly)"
+      verification: |
+          receive 2 events
+      disabled: true
+
+    - label: "Operator releases switch"
+      verification: |
+          receive 2 events
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TFL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TFL_1_1.yaml
new file mode 100644
index 00000000000000..139b00484ea735
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TFL_1_1.yaml
@@ -0,0 +1,103 @@
+# 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.1. [TC-TFL-1.1]Global Attributes [DUT as Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "DUT reads the ClusterRevision from TH"
+      verification: |
+          ./chip-tool timeformatlocalization read  cluster-revision 1 0
+
+          [1651185991606] [10988:109915] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFD DataVersion: 3316530441
+          [1651185991606] [10988:109915] CHIP: [TOO]   ClusterRevision: 1
+      disabled: true
+
+    - label: "DUT reads the FeatureMap from TH"
+      verification: |
+          ./chip-tool timeformatlocalization read feature-map 1 0
+          [1651558695.673395][7718:7723] CHIP:DMG: ReportDataMessage =
+          [1651558695.673439][7718:7723] CHIP:DMG: {
+          [1651558695.673474][7718:7723] CHIP:DMG:         AttributeReportIBs =
+          [1651558695.673524][7718:7723] CHIP:DMG:         [
+          [1651558695.673564][7718:7723] CHIP:DMG:                 AttributeReportIB =
+          [1651558695.673619][7718:7723] CHIP:DMG:                 {
+          [1651558695.673662][7718:7723] CHIP:DMG:                         AttributeStatusIB =
+          [1651558695.673714][7718:7723] CHIP:DMG:                         {
+          [1651558695.673762][7718:7723] CHIP:DMG:                                 AttributePathIB =
+          [1651558695.673816][7718:7723] CHIP:DMG:                                 {
+          [1651558695.673873][7718:7723] CHIP:DMG:                                         Endpoint = 0x0,
+          [1651558695.673930][7718:7723] CHIP:DMG:                                         Cluster = 0x2c,
+          [1651558695.674049][7718:7723] CHIP:DMG:                                         Attribute = 0x0000_FFFC,
+          [1651558695.674104][7718:7723] CHIP:DMG:                                 }
+          [1651558695.674166][7718:7723] CHIP:DMG:
+          [1651558695.674220][7718:7723] CHIP:DMG:                                 StatusIB =
+          [1651558695.674279][7718:7723] CHIP:DMG:                                 {
+          [1651558695.674333][7718:7723] CHIP:DMG:                                         status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1651558695.674391][7718:7723] CHIP:DMG:                                 },
+          [1651558695.674446][7718:7723] CHIP:DMG:
+          [1651558695.674499][7718:7723] CHIP:DMG:                         },
+          [1651558695.674555][7718:7723] CHIP:DMG:
+          [1651558695.674599][7718:7723] CHIP:DMG:                 },
+          [1651558695.674651][7718:7723] CHIP:DMG:
+          [1651558695.674691][7718:7723] CHIP:DMG:         ],
+          [1651558695.674740][7718:7723] CHIP:DMG:
+          [1651558695.674779][7718:7723] CHIP:DMG:         SuppressResponse = true,
+          [1651558695.674820][7718:7723] CHIP:DMG:         InteractionModelRevision = 1
+          [1651558695.674857][7718:7723] CHIP:DMG: }
+          [1651558695.675021][7718:7723] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+      disabled: true
+
+    - label: "DUT reads AttributeList from TH"
+      verification: |
+          ./chip-tool timeformatlocalization read attribute-list 1 0
+          [1651186148313] [11054:111653] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFB DataVersion: 3316530441
+          [1651186148314] [11054:111653] CHIP: [TOO]   AttributeList: 7 entries
+          [1651186148314] [11054:111653] CHIP: [TOO]     [1]: 0
+          [1651186148314] [11054:111653] CHIP: [TOO]     [2]: 1
+          [1651186148314] [11054:111653] CHIP: [TOO]     [3]: 2
+          [1651186148314] [11054:111653] CHIP: [TOO]     [4]: 65528
+          [1651186148314] [11054:111653] CHIP: [TOO]     [5]: 65529
+          [1651186148314] [11054:111653] CHIP: [TOO]     [6]: 65531
+          [1651186148314] [11054:111653] CHIP: [TOO]     [7]: 65533
+      disabled: true
+
+    - label: "DUT reads EventList from TH"
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
+    - label: "DUT reads the AcceptedCommandList from the TH"
+      verification: |
+          ./chip-tool timeformatlocalization read accepted-command-list 1 0
+          [1651186189564] [11076:112595] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF9 DataVersion: 3316530441
+          [1651186189564] [11076:112595] CHIP: [TOO]   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "DUT reads the GeneratedCommandList from the TH"
+      verification: |
+          ./chip-tool timeformatlocalization read generated-command-list 1 0
+          [1651191789962] [13591:180646] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF8 DataVersion: 3316530441
+          [1651191789963] [13591:180646] CHIP: [TOO]   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TFL_1_2.yaml b/src/app/tests/suites/certification/Test_TC_TFL_1_2.yaml
new file mode 100644
index 00000000000000..32676f0611a983
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TFL_1_2.yaml
@@ -0,0 +1,104 @@
+# 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.2. [TC-TFL-1.2|]Global Attributes [DUT as Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission TH to DUT"
+      verification: |
+
+      disabled: true
+
+    - label: "TH reads the ClusterRevision from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read  cluster-revision 1 0
+
+          [1651185991606] [10988:109915] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFD DataVersion: 3316530441
+          [1651185991606] [10988:109915] CHIP: [TOO]   ClusterRevision: 1
+      disabled: true
+
+    - label: "TH reads the FeatureMap from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read feature-map 1 0
+
+          [1651558695.673395][7718:7723] CHIP:DMG: ReportDataMessage =
+          [1651558695.673439][7718:7723] CHIP:DMG: {
+          [1651558695.673474][7718:7723] CHIP:DMG:         AttributeReportIBs =
+          [1651558695.673524][7718:7723] CHIP:DMG:         [
+          [1651558695.673564][7718:7723] CHIP:DMG:                 AttributeReportIB =
+          [1651558695.673619][7718:7723] CHIP:DMG:                 {
+          [1651558695.673662][7718:7723] CHIP:DMG:                         AttributeStatusIB =
+          [1651558695.673714][7718:7723] CHIP:DMG:                         {
+          [1651558695.673762][7718:7723] CHIP:DMG:                                 AttributePathIB =
+          [1651558695.673816][7718:7723] CHIP:DMG:                                 {
+          [1651558695.673873][7718:7723] CHIP:DMG:                                         Endpoint = 0x0,
+          [1651558695.673930][7718:7723] CHIP:DMG:                                         Cluster = 0x2c,
+          [1651558695.674049][7718:7723] CHIP:DMG:                                         Attribute = 0x0000_FFFC,
+          [1651558695.674104][7718:7723] CHIP:DMG:                                 }
+          [1651558695.674166][7718:7723] CHIP:DMG:
+          [1651558695.674220][7718:7723] CHIP:DMG:                                 StatusIB =
+          [1651558695.674279][7718:7723] CHIP:DMG:                                 {
+          [1651558695.674333][7718:7723] CHIP:DMG:                                         status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1651558695.674391][7718:7723] CHIP:DMG:                                 },
+          [1651558695.674446][7718:7723] CHIP:DMG:
+          [1651558695.674499][7718:7723] CHIP:DMG:                         },
+          [1651558695.674555][7718:7723] CHIP:DMG:
+          [1651558695.674599][7718:7723] CHIP:DMG:                 },
+          [1651558695.674651][7718:7723] CHIP:DMG:
+          [1651558695.674691][7718:7723] CHIP:DMG:         ],
+          [1651558695.674740][7718:7723] CHIP:DMG:
+          [1651558695.674779][7718:7723] CHIP:DMG:         SuppressResponse = true,
+          [1651558695.674820][7718:7723] CHIP:DMG:         InteractionModelRevision = 1
+          [1651558695.674857][7718:7723] CHIP:DMG: }
+          [1651558695.675021][7718:7723] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)"
+      disabled: true
+
+    - label: "TH reads AttributeList from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read attribute-list 1 0
+          [1651186148313] [11054:111653] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFB DataVersion: 3316530441
+          [1651186148314] [11054:111653] CHIP: [TOO]   AttributeList: 7 entries
+          [1651186148314] [11054:111653] CHIP: [TOO]     [1]: 0
+          [1651186148314] [11054:111653] CHIP: [TOO]     [2]: 1
+          [1651186148314] [11054:111653] CHIP: [TOO]     [3]: 2
+          [1651186148314] [11054:111653] CHIP: [TOO]     [4]: 65528
+          [1651186148314] [11054:111653] CHIP: [TOO]     [5]: 65529
+          [1651186148314] [11054:111653] CHIP: [TOO]     [6]: 65531
+          [1651186148314] [11054:111653] CHIP: [TOO]     [7]: 65533
+      disabled: true
+
+    - label: "TH reads EventList from DUT"
+      verification: |
+          Out of scope for V1.0
+      disabled: true
+
+    - label: "TH reads the AcceptedCommandList from the DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read accepted-command-list 1 0
+          [1651186189564] [11076:112595] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF9 DataVersion: 3316530441
+          [1651186189564] [11076:112595] CHIP: [TOO]   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "TH reads the GeneratedCommandList from the DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read generated-command-list 1 0
+          [1651191789962] [13591:180646] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF8 DataVersion: 3316530441
+          [1651191789963] [13591:180646] CHIP: [TOO]   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TFL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TFL_2_1.yaml
new file mode 100644
index 00000000000000..f5a3c9dd33f242
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TFL_2_1.yaml
@@ -0,0 +1,788 @@
+# 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.3. [TC-TFL-2.1]Read and Write Time Format Localization Cluster Attributes
+    [DUT as Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT reads HourFormat attribute from TH"
+      verification: |
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          [1651194182.833570][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194182.833598][4306:4306] CHIP:DMG: {
+          [1651194182.833620][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194182.833654][4306:4306] CHIP:DMG:         [
+          [1651194182.833679][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194182.833704][4306:4306] CHIP:DMG:                 {
+          [1651194182.833736][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194182.833774][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194182.833806][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651194182.833837][4306:4306] CHIP:DMG:                 }
+          [1651194182.833869][4306:4306] CHIP:DMG:
+          [1651194182.833901][4306:4306] CHIP:DMG:         ],
+          [1651194182.833929][4306:4306] CHIP:DMG:
+          [1651194182.833959][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194182.833985][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194182.834010][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_12HR) DUT writes 0 to HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write hour-format 0 1 0
+          [1651192743.617047][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651192743.617082][4306:4306] CHIP:DMG: {
+          [1651192743.617114][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651192743.617149][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651192743.617183][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651192743.617223][4306:4306] CHIP:DMG:         [
+          [1651192743.617256][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651192743.617304][4306:4306] CHIP:DMG:                 {
+          [1651192743.617342][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651192743.617385][4306:4306] CHIP:DMG:                         {
+          [1651192743.617429][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651192743.617475][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651192743.617517][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1651192743.617551][4306:4306] CHIP:DMG:                         }
+          [1651192743.617594][4306:4306] CHIP:DMG:
+          [1651192743.617639][4306:4306] CHIP:DMG:                                 Data = 0,
+          [1651192743.617682][4306:4306] CHIP:DMG:                 },
+          [1651192743.617722][4306:4306] CHIP:DMG:
+          [1651192743.617755][4306:4306] CHIP:DMG:         ],
+          [1651192743.617795][4306:4306] CHIP:DMG:
+          [1651192743.617829][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651192743.617863][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651192743.617894][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          [1651194182.833570][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194182.833598][4306:4306] CHIP:DMG: {
+          [1651194182.833620][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194182.833654][4306:4306] CHIP:DMG:         [
+          [1651194182.833679][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194182.833704][4306:4306] CHIP:DMG:                 {
+          [1651194182.833736][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194182.833774][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194182.833806][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651194182.833837][4306:4306] CHIP:DMG:                 }
+          [1651194182.833869][4306:4306] CHIP:DMG:
+          [1651194182.833901][4306:4306] CHIP:DMG:         ],
+          [1651194182.833929][4306:4306] CHIP:DMG:
+          [1651194182.833959][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194182.833985][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194182.834010][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_24HR) DUT writes 1 to HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write hour-format 1 1 0
+          [1651193043.068804][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651193043.068854][4306:4306] CHIP:DMG: {
+          [1651193043.068881][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651193043.068909][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651193043.068934][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651193043.068964][4306:4306] CHIP:DMG:         [
+          [1651193043.068989][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651193043.069021][4306:4306] CHIP:DMG:                 {
+          [1651193043.069050][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651193043.069087][4306:4306] CHIP:DMG:                         {
+          [1651193043.069124][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651193043.069163][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651193043.069200][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1651193043.069231][4306:4306] CHIP:DMG:                         }
+          [1651193043.069264][4306:4306] CHIP:DMG:
+          [1651193043.069300][4306:4306] CHIP:DMG:                                 Data = 1,
+          [1651193043.069335][4306:4306] CHIP:DMG:                 },
+          [1651193043.069367][4306:4306] CHIP:DMG:
+          [1651193043.069391][4306:4306] CHIP:DMG:         ],
+          [1651193043.069421][4306:4306] CHIP:DMG:
+          [1651193043.069447][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651193043.069472][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651193043.069495][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          [1651194182.833570][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194182.833598][4306:4306] CHIP:DMG: {
+          [1651194182.833620][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194182.833654][4306:4306] CHIP:DMG:         [
+          [1651194182.833679][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194182.833704][4306:4306] CHIP:DMG:                 {
+          [1651194182.833736][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194182.833774][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194182.833806][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651194182.833837][4306:4306] CHIP:DMG:                 }
+          [1651194182.833869][4306:4306] CHIP:DMG:
+          [1651194182.833901][4306:4306] CHIP:DMG:         ],
+          [1651194182.833929][4306:4306] CHIP:DMG:
+          [1651194182.833959][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194182.833985][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194182.834010][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194266.987675][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194266.987702][4306:4306] CHIP:DMG: {
+          [1651194266.987725][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194266.987752][4306:4306] CHIP:DMG:         [
+          [1651194266.987776][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194266.987831][4306:4306] CHIP:DMG:                 {
+          [1651194266.987863][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194266.987895][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194266.987927][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194266.987962][4306:4306] CHIP:DMG:                 }
+          [1651194266.987992][4306:4306] CHIP:DMG:
+          [1651194266.988025][4306:4306] CHIP:DMG:         ],
+          [1651194266.988054][4306:4306] CHIP:DMG:
+          [1651194266.988082][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194266.988108][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194266.988131][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads SupportedCalendarTypes attribute from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read supported-calendar-types 1 0
+          [1651194334.847912][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194334.847958][4306:4306] CHIP:DMG: {
+          [1651194334.848009][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194334.848086][4306:4306] CHIP:DMG:         [
+          [1651194334.848133][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194334.848222][4306:4306] CHIP:DMG:                 {
+          [1651194334.848271][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194334.848325][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194334.848399][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1651194334.848460][4306:4306] CHIP:DMG:                 }
+          [1651194334.848504][4306:4306] CHIP:DMG:
+          [1651194334.848580][4306:4306] CHIP:DMG:         ],
+          [1651194334.848646][4306:4306] CHIP:DMG:
+          [1651194334.848761][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194334.848897][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194334.848952][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Buddhist) DUT writes 0 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 0 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 0,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Chinese) DUT writes 1 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 1 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 1,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Coptic) DUT writes 2 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 2 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 2,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "If (PICS_A_Ethiopian) DUT writes 3 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 3 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 3,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "If (PICS_A_Gregorian) DUT writes 4 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 4 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 4,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Hebrew) DUT writes 5 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 5 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 5,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Indian) DUT writes 6 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 6 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 6,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Islamic) DUT writes 7 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 7 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 7,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Japanese) DUT writes 8 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 8 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 8,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Korean) DUT writes 9 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 9 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 9,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "If (PICS_A_Persian) DUT writes 10 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 10 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 10,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "If (PICS_A_Taiwanese) DUT writes 11 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 11 1 0
+
+          [1651194449.331014][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651194449.331042][4306:4306] CHIP:DMG: {
+          [1651194449.331077][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651194449.331106][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651194449.331133][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651194449.331174][4306:4306] CHIP:DMG:         [
+          [1651194449.331201][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651194449.331250][4306:4306] CHIP:DMG:                 {
+          [1651194449.331279][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651194449.331320][4306:4306] CHIP:DMG:                         {
+          [1651194449.331355][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651194449.331402][4306:4306] CHIP:DMG:                                 Cluster = 0x2c,
+          [1651194449.331438][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1651194449.331479][4306:4306] CHIP:DMG:                         }
+          [1651194449.331524][4306:4306] CHIP:DMG:
+          [1651194449.331560][4306:4306] CHIP:DMG:                                 Data = 11,
+          [1651194449.331604][4306:4306] CHIP:DMG:                 },
+          [1651194449.331638][4306:4306] CHIP:DMG:
+          [1651194449.331674][4306:4306] CHIP:DMG:         ],
+          [1651194449.331705][4306:4306] CHIP:DMG:
+          [1651194449.331742][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651194449.331770][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194449.331804][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544.718348][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651194544.718378][4306:4306] CHIP:DMG: {
+          [1651194544.718403][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651194544.718447][4306:4306] CHIP:DMG:         [
+          [1651194544.718476][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651194544.718521][4306:4306] CHIP:DMG:                 {
+          [1651194544.718563][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651194544.718607][4306:4306] CHIP:DMG:                         Cluster = 0x2c,
+          [1651194544.718654][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651194544.718689][4306:4306] CHIP:DMG:                 }
+          [1651194544.718735][4306:4306] CHIP:DMG:
+          [1651194544.718767][4306:4306] CHIP:DMG:         ],
+          [1651194544.718812][4306:4306] CHIP:DMG:
+          [1651194544.718844][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651194544.718884][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651194544.718911][4306:4306] CHIP:DMG: },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TFL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TFL_2_2.yaml
new file mode 100644
index 00000000000000..7a09739f1b80b4
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TFL_2_2.yaml
@@ -0,0 +1,852 @@
+# 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.4. [TC-TFL-2.2]Read and Write Time Format Localization Cluster Attributes
+    [DUT as Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "TH reads HourFormat attribute from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          [1651191944157] [13649:182326] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3316530441
+          [1651191944158] [13649:182326] CHIP: [TOO]   HourFormat: 0
+      disabled: true
+
+    - label: "If (PICS_A_12HR) TH writes 0 to HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write hour-format 0 1 0
+          [1651192743588] [14026:192208] CHIP: [DMG] WriteResponseMessage =
+          [1651192743588] [14026:192208] CHIP: [DMG] {
+          [1651192743588] [14026:192208] CHIP: [DMG]         AttributeStatusIBs =
+          [1651192743588] [14026:192208] CHIP: [DMG]         [
+          [1651192743588] [14026:192208] CHIP: [DMG]                 AttributeStatusIB =
+          [1651192743588] [14026:192208] CHIP: [DMG]                 {
+          [1651192743588] [14026:192208] CHIP: [DMG]                         AttributePathIB =
+          [1651192743588] [14026:192208] CHIP: [DMG]                         {
+          [1651192743588] [14026:192208] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651192743588] [14026:192208] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651192743588] [14026:192208] CHIP: [DMG]                                 Attribute = 0x0000_0000,
+          [1651192743588] [14026:192208] CHIP: [DMG]                         }
+          [1651192743588] [14026:192208] CHIP: [DMG]
+          [1651192743588] [14026:192208] CHIP: [DMG]                         StatusIB =
+          [1651192743588] [14026:192208] CHIP: [DMG]                         {
+          [1651192743588] [14026:192208] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651192743588] [14026:192208] CHIP: [DMG]                         },
+          [1651192743588] [14026:192208] CHIP: [DMG]
+          [1651192743588] [14026:192208] CHIP: [DMG]                 },
+          [1651192743588] [14026:192208] CHIP: [DMG]
+          [1651192743588] [14026:192208] CHIP: [DMG]         ],
+          [1651192743588] [14026:192208] CHIP: [DMG]
+          [1651192743588] [14026:192208] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651192743588] [14026:192208] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          [1651193120969] [14169:196901] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3316530443
+          [1651193120969] [14169:196901] CHIP: [TOO]   HourFormat: 0
+      disabled: true
+
+    - label: "If (PICS_A_24HR) TH writes 1 to HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write hour-format 1 1 0
+          [1651193043035] [14140:195730] CHIP: [DMG] WriteResponseMessage =
+          [1651193043035] [14140:195730] CHIP: [DMG] {
+          [1651193043035] [14140:195730] CHIP: [DMG]         AttributeStatusIBs =
+          [1651193043035] [14140:195730] CHIP: [DMG]         [
+          [1651193043035] [14140:195730] CHIP: [DMG]                 AttributeStatusIB =
+          [1651193043035] [14140:195730] CHIP: [DMG]                 {
+          [1651193043035] [14140:195730] CHIP: [DMG]                         AttributePathIB =
+          [1651193043035] [14140:195730] CHIP: [DMG]                         {
+          [1651193043035] [14140:195730] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651193043035] [14140:195730] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651193043035] [14140:195730] CHIP: [DMG]                                 Attribute = 0x0000_0000,
+          [1651193043035] [14140:195730] CHIP: [DMG]                         }
+          [1651193043035] [14140:195730] CHIP: [DMG]
+          [1651193043035] [14140:195730] CHIP: [DMG]                         StatusIB =
+          [1651193043035] [14140:195730] CHIP: [DMG]                         {
+          [1651193043035] [14140:195730] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651193043035] [14140:195730] CHIP: [DMG]                         },
+          [1651193043035] [14140:195730] CHIP: [DMG]
+          [1651193043035] [14140:195730] CHIP: [DMG]                 },
+          [1651193043035] [14140:195730] CHIP: [DMG]
+          [1651193043035] [14140:195730] CHIP: [DMG]         ],
+          [1651193043035] [14140:195730] CHIP: [DMG]
+          [1651193043036] [14140:195730] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651193043036] [14140:195730] CHIP: [DMG] }
+          [1651193043036] [14140:195730] CHIP: [DMG] WriteClient moving to [AwaitingDe]
+      disabled: true
+
+    - label: "TH reads HourFormat attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          [1651193120969] [14169:196901] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3316530443
+          [1651193120969] [14169:196901] CHIP: [TOO]   HourFormat: 1
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651193250602] [14215:198406] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0001 DataVersion: 3316530443
+          [1651193250602] [14215:198406] CHIP: [TOO]   ActiveCalendarType: 0
+      disabled: true
+
+    - label: "TH reads SupportedCalendarTypes attribute from DUT"
+      verification: |
+          ./chip-tool timeformatlocalization read supported-calendar-types 1 0
+          [1651194334793] [14653:210647] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0002 DataVersion: 3316530443
+          [1651194334794] [14653:210647] CHIP: [TOO]   SupportedCalendarTypes: 12 entries
+          [1651194334794] [14653:210647] CHIP: [TOO]     [1]: 0
+          [1651194334794] [14653:210647] CHIP: [TOO]     [2]: 1
+          [1651194334794] [14653:210647] CHIP: [TOO]     [3]: 2
+          [1651194334794] [14653:210647] CHIP: [TOO]     [4]: 3
+          [1651194334794] [14653:210647] CHIP: [TOO]     [5]: 4
+          [1651194334794] [14653:210647] CHIP: [TOO]     [6]: 5
+          [1651194334794] [14653:210647] CHIP: [TOO]     [7]: 6
+          [1651194334794] [14653:210647] CHIP: [TOO]     [8]: 7
+          [1651194334794] [14653:210647] CHIP: [TOO]     [9]: 8
+          [1651194334794] [14653:210647] CHIP: [TOO]     [10]: 9
+          [1651194334794] [14653:210647] CHIP: [TOO]     [11]: 10
+          [1651194334794] [14653:210647] CHIP: [TOO]     [12]: 11
+      disabled: true
+
+    - label: "If (PICS_A_Buddhist) TH writes 0 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 0 1 0
+          [1651194449245] [14699:212201] CHIP: [DMG] WriteResponseMessage =
+          [1651194449245] [14699:212201] CHIP: [DMG] {
+          [1651194449245] [14699:212201] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194449245] [14699:212201] CHIP: [DMG]         [
+          [1651194449245] [14699:212201] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194449246] [14699:212201] CHIP: [DMG]                 {
+          [1651194449246] [14699:212201] CHIP: [DMG]                         AttributePathIB =
+          [1651194449246] [14699:212201] CHIP: [DMG]                         {
+          [1651194449246] [14699:212201] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194449246] [14699:212201] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194449246] [14699:212201] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194449246] [14699:212201] CHIP: [DMG]                         }
+          [1651194449246] [14699:212201] CHIP: [DMG]
+          [1651194449246] [14699:212201] CHIP: [DMG]                         StatusIB =
+          [1651194449246] [14699:212201] CHIP: [DMG]                         {
+          [1651194449246] [14699:212201] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194449246] [14699:212201] CHIP: [DMG]                         },
+          [1651194449246] [14699:212201] CHIP: [DMG]
+          [1651194449246] [14699:212201] CHIP: [DMG]                 },
+          [1651194449246] [14699:212201] CHIP: [DMG]
+          [1651194449246] [14699:212201] CHIP: [DMG]         ],
+          [1651194449246] [14699:212201] CHIP: [DMG]
+          [1651194449246] [14699:212201] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194449246] [14699:212201] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Chinese) TH writes 1 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 1 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 1,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Coptic) TH writes 2 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 2 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 2,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Ethiopian) TH writes 3 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 3 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 3,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Gregorian) TH writes 4 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 4 1 0
+
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 4,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Hebrew) TH writes 5 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 5 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 5,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Indian) TH writes 6 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 6 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 6,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Islamic) TH writes 7 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 7 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 7,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Japanese) TH writes 8 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 8 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 8,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Korean) TH writes 9 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 9 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 9,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label: "If (PICS_A_Persian) TH writes 10 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 10 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 10,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
+
+    - label:
+          "If (PICS_A_Taiwanese) TH writes 11 to ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization write active-calendar-type 11 1 0
+          [1651194780019] [14823:216414] CHIP: [DMG] WriteResponseMessage =
+          [1651194780019] [14823:216414] CHIP: [DMG] {
+          [1651194780019] [14823:216414] CHIP: [DMG]         AttributeStatusIBs =
+          [1651194780019] [14823:216414] CHIP: [DMG]         [
+          [1651194780019] [14823:216414] CHIP: [DMG]                 AttributeStatusIB =
+          [1651194780019] [14823:216414] CHIP: [DMG]                 {
+          [1651194780020] [14823:216414] CHIP: [DMG]                         AttributePathIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Cluster = 0x2c,
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 Attribute = 0x0000_0001,
+          [1651194780020] [14823:216414] CHIP: [DMG]                         }
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                         StatusIB =
+          [1651194780020] [14823:216414] CHIP: [DMG]                         {
+          [1651194780020] [14823:216414] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651194780020] [14823:216414] CHIP: [DMG]                         },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]                 },
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         ],
+          [1651194780020] [14823:216414] CHIP: [DMG]
+          [1651194780020] [14823:216414] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194780020] [14823:216414] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads ActiveCalendarType attribute"
+      verification: |
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          [1651194544627] [14736:213553] CHIP: [DMG] ReportDataMessage =
+          [1651194544627] [14736:213553] CHIP: [DMG] {
+          [1651194544627] [14736:213553] CHIP: [DMG]         AttributeReportIBs =
+          [1651194544627] [14736:213553] CHIP: [DMG]         [
+          [1651194544627] [14736:213553] CHIP: [DMG]                 AttributeReportIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                         AttributeDataIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                         {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 DataVersion = 0xc5ae3d0c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 AttributePathIB =
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 {
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Endpoint = 0x0,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Cluster = 0x2c,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Attribute = 0x0000_0001,
+          [1651194544627] [14736:213553] CHIP: [DMG]                                 }
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                                         Data = 11,
+          [1651194544627] [14736:213553] CHIP: [DMG]                         },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]                 },
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         ],
+          [1651194544627] [14736:213553] CHIP: [DMG]
+          [1651194544627] [14736:213553] CHIP: [DMG]         SuppressResponse = true,
+          [1651194544627] [14736:213553] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651194544627] [14736:213553] CHIP: [DMG] }
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
index d19221203d01cc..afb5382e5042ba 100644
--- a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
@@ -51,13 +51,19 @@ tests:
       attribute: "MeasuredValue"
       PICS: A_TEMPERATURE
       response:
+          saveAs: valueBeforeChange
           constraints:
               type: uint16
 
-    #Disabled as UI prompts required for user action
     - label: "Operate on device to change the temperature significantly"
-      disabled: true
       PICS: MANUAL_TEMPERATURE_CHANGE
+      cluster: "LogCommands"
+      command: "Log"
+      arguments:
+          values:
+              - name: "message"
+                value:
+                    "Operate on device to change the temperature significantly"
 
     - label: "Read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
@@ -66,3 +72,4 @@ tests:
       response:
           constraints:
               type: uint16
+              notValue: valueBeforeChange
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
index 9012c5e373725f..752468f829e576 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
@@ -50,7 +50,7 @@ tests:
       attribute: "OccupiedCoolingSetpoint"
       PICS: A_OCCUPIEDCOOLINGSETPOINT
       arguments:
-          value: 2000
+          value: 2250
 
     - label:
           "Reads it back again to confirm the successful write of
@@ -60,33 +60,39 @@ tests:
       attribute: "OccupiedCoolingSetpoint"
       PICS: A_OCCUPIEDCOOLINGSETPOINT
       response:
-          value: 2000
+          value: 2250
 
-    #issue #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes OccupiedCoolingSetpoint to value below the
           MinCoolSetpointLimit"
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
       PICS: A_OCCUPIEDCOOLINGSETPOINT
       arguments:
           value: 30
+      response:
+          error: CONSTRAINT_ERROR
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes OccupiedCoolingSetpoint to value above the
           MaxCoolSetpointLimit"
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
       PICS: A_OCCUPIEDCOOLINGSETPOINT
       arguments:
           value: 4000
+      response:
+          error: CONSTRAINT_ERROR
 
+    # Disabled: This test makes no sense: It's setting OccupiedCoolingSetpoint
+    # to below OccupiedHeatingSetpoint.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint
           attribute"
+      disabled: true
       optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
@@ -107,6 +113,7 @@ tests:
     - label:
           "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies
           that the value is within range"
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
@@ -120,6 +127,7 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           OccupiedHeatingSetpoint attribute"
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
@@ -129,55 +137,221 @@ tests:
     - label:
           "Reads it back again to confirm the successful write of
           OccupiedHeatingSetpoint attribute"
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       response:
           value: 2100
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes OccupiedHeatingSetpoint to value below the
           MinHeatSetpointLimit"
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
-          value: 1002
+          value: 600
+      response:
+          error: CONSTRAINT_ERROR
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes OccupiedHeatingSetpoint to value above the
           MaxHeatSetpointLimit"
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 4010
+      response:
+          error: CONSTRAINT_ERROR
 
     - label:
           "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint
           attribute"
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 700
 
+    # Disabled: This test makes no sense: It's setting OccupiedHeatingSetpoint
+    # to above OccupiedCoolingSetpoint.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint
           attribute"
+      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 3000
 
+    - label:
+          "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and
+          verifies that the value is within range"
+      optional: true
+      command: "readAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      response:
+          value: 2600
+          constraints:
+              type: int16
+              minValue: 1600
+              maxValue: 3200
+
+    - label:
+          "Writes a value back that is different but valid for
+          UnoccupiedCoolingSetpoint attribute"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      arguments:
+          value: 2500
+
+    - label:
+          "Reads it back again to confirm the successful write of
+          UnoccupiedCoolingSetpoint attribute"
+      optional: true
+      command: "readAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      response:
+          value: 2500
+
+    - label:
+          "Writes UnoccupiedCoolingSetpoint to value below the
+          MinHeatSetpointLimit"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      arguments:
+          value: 1002
+      response:
+          error: CONSTRAINT_ERROR
+
+    - label:
+          "Writes UnoccupiedCoolingSetpoint to value above the
+          MaxHeatSetpointLimit"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      arguments:
+          value: 4010
+      response:
+          error: CONSTRAINT_ERROR
+
+    - label:
+          "Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint
+          attribute"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      arguments:
+          value: 1800
+
+    - label:
+          "Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint
+          attribute"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedCoolingSetpoint"
+      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      arguments:
+          value: 3000
+
+    - label:
+          "Reads UnoccupiedHeatingSetpoint attribute from Server DUT and
+          verifies that the value is within range"
+      optional: true
+      command: "readAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      response:
+          value: 2000
+          constraints:
+              type: int16
+              minValue: 700
+              maxValue: 3000
+
+    - label:
+          "Writes a value back that is different but valid for
+          UnoccupiedHeatingSetpoint attribute"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      arguments:
+          value: 2500
+
+    - label:
+          "Reads it back again to confirm the successful write of
+          UnoccupiedHeatingSetpoint attribute"
+      optional: true
+      command: "readAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      response:
+          value: 2500
+
+    - label:
+          "Writes UnoccupiedHeatingSetpoint to value below the
+          MinHeatSetpointLimit"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      arguments:
+          value: 500
+      response:
+          error: CONSTRAINT_ERROR
+
+    - label:
+          "Writes UnoccupiedHeatingSetpoint to value above the
+          MaxHeatSetpointLimit"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      arguments:
+          value: 4010
+      response:
+          error: CONSTRAINT_ERROR
+
+    - label:
+          "Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint
+          attribute"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      arguments:
+          value: 1800
+
+    - label:
+          "Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint
+          attribute"
+      optional: true
+      command: "writeAttribute"
+      attribute: "UnoccupiedHeatingSetpoint"
+      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      arguments:
+          value: 3000
+
     - label:
           "Reads MinHeatSetpointLimit attribute from Server DUT and verifies
           that the value is within range"
+      optional: true
       command: "readAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
@@ -188,67 +362,88 @@ tests:
               minValue: 700
               maxValue: 3000
 
+    # Disabled: This test makes no sense: It's setting MinHeatSetpointLimit
+    # to above MinCoolSetpointLimit when AUTO is supported, which is not
+    # allowed.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes a value back that is different but valid for
           MinHeatSetpointLimit attribute"
+      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 2000
 
+    # Disabled: Because the previous set is disabled.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Reads it back again to confirm the successful write of
           MinHeatSetpointLimit attribute"
+      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       response:
           value: 2000
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MinHeatSetpointLimit to value below the
           AbsMinHeatSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 650
+      response:
+          error: CONSTRAINT_ERROR
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MinHeatSetpointLimit to value above the
           AbsMaxHeatSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 4050
+      response:
+          error: CONSTRAINT_ERROR
 
     - label:
           "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit
           attribute"
+      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 700
 
+    # Disabled: This test makes no sense: It's setting MinHeatSetpointLimit
+    # to higher than what we have various cooling limits set to.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit
           attribute"
+      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 3000
 
+    # Disabled: Because the preceding write is disabled.
     - label:
           "Reads MaxHeatSetpointLimit attribute from Server DUT and verifies
           that the value is within range"
+      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
@@ -262,6 +457,7 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           MaxHeatSetpointLimit attribute"
+      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
@@ -271,46 +467,55 @@ tests:
     - label:
           "Reads it back again to confirm the successful write of
           MaxHeatSetpointLimit attribute"
+      optional: true
       command: "readAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
       response:
           value: 2000
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MaxHeatSetpointLimit to value below the
           AbsMinHeatSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
       arguments:
           value: 500
+      response:
+          error: CONSTRAINT_ERROR
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MaxHeatSetpointLimit to value above the
           AbsMaxHeatSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
       arguments:
           value: 4000
+      response:
+          error: CONSTRAINT_ERROR
 
     - label:
           "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit
           attribute"
+      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
       arguments:
           value: 700
 
+    # Disabled: This test makes no sense: It's setting MaxHeatSetpointLimit to
+    # a value too close to MaxCoolSetpointLimit, ignoring deadband.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit
           attribute"
+      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
       PICS: A_MAXHEATSETPOINTLIMIT
@@ -351,26 +556,28 @@ tests:
       response:
           value: 2000
 
-    #issue #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MinCoolSetpointLimit to value below the
           AbsMinCoolSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
       PICS: A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 1000
+      response:
+          error: CONSTRAINT_ERROR
 
-    #issue #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
       PICS: A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 4000
+      response:
+          error: CONSTRAINT_ERROR
 
     - label:
           "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit
@@ -406,9 +613,13 @@ tests:
               minValue: 1600
               maxValue: 3200
 
+    # Disabled: This test makes no sense: It's setting MaxCoolSetpointLimit to
+    # below what we just set MinCoolSetpointLimit to.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes a value back that is different but valid for
           MaxCoolSetpointLimit attribute"
+      disabled: true
       optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
@@ -416,9 +627,12 @@ tests:
       arguments:
           value: 2000
 
+    # Disabled: Because the previous set is disabled.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Reads it back again to confirm the successful write of
           MaxCoolSetpointLimit attribute"
+      disabled: true
       optional: true
       command: "readAttribute"
       attribute: "MaxCoolSetpointLimit"
@@ -426,30 +640,36 @@ tests:
       response:
           value: 2000
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MaxCoolSetpointLimit to value below the
           AbsMinCoolSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
       PICS: A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 1000
+      response:
+          error: CONSTRAINT_ERROR
 
-    #issue  #11718 Write command above max and below min value returns Success Response
     - label:
           "Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit "
-      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
       PICS: A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 4000
+      response:
+          error: CONSTRAINT_ERROR
 
+    # Disabled: This test makes no sense: It's setting MaxCoolSetpointLimit
+    # to below various heating setpoints.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit
           attribute"
+      disabled: true
       optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
@@ -467,81 +687,111 @@ tests:
       arguments:
           value: 3200
 
-    - label:
-          "Writes (sets back) the limit of MinHeatSetpointLimit to
-          MinHeatSetpointLimit attribute"
+    - label: "Writes (sets back) default value of MinHeatSetpointLimit"
+      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 700
 
-    - label:
-          "Writes (sets back) the limit of MaxHeatSetpointLimit to
-          MinHeatSetpointLimit attribute"
+    # Disabled: This test makes no sense: It's setting MaxHeatSetpointLimit to
+    # a value too close to MaxCoolSetpointLimit, ignoring deadband.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
+    - label: "Writes (sets back)default value of MaxHeatSetpointLimit"
+      disabled: true
+      optional: true
       command: "writeAttribute"
-      attribute: "MinHeatSetpointLimit"
+      attribute: "MaxHeatSetpointLimit"
       PICS: A_MINHEATSETPOINTLIMIT
       arguments:
           value: 3000
 
-    - label:
-          "Writes (sets back) the limit of MinHeatSetpointLimit to
-          MaxHeatSetpointLimit attribute"
+    - label: "Writes (sets back) default value of MinCoolSetpointLimit"
+      optional: true
       command: "writeAttribute"
-      attribute: "MaxHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      attribute: "MinCoolSetpointLimit"
+      PICS: A_MINCOOLSETPOINTLIMIT
       arguments:
-          value: 700
+          value: 1600
 
-    - label:
-          "Writes (sets back) the limit of MaxHeatSetpointLimit to
-          MaxHeatSetpointLimit attribute"
+    - label: "Writes (sets back) default value of MaxCoolSetpointLimit"
+      optional: true
       command: "writeAttribute"
-      attribute: "MaxHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      attribute: "MaxCoolSetpointLimit"
+      PICS: A_MAXCOOLSETPOINTLIMIT
       arguments:
-          value: 3000
+          value: 3200
 
     - label:
-          "Writes (sets back) the limit of MinCoolSetpointLimit to
-          MinCoolSetpointLimit attribute"
+          "Reads MinSetpointDeadBand attribute from Server DUT and verifies that
+          the value is within range"
+      optional: true
+      command: "readAttribute"
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
+      response:
+          value: 25
+          constraints:
+              type: temp-s8
+              minValue: 0
+              maxValue: 25
+
+    - label:
+          "Writes a value back that is different but valid for
+          MinSetpointDeadBand attribute"
       optional: true
       command: "writeAttribute"
-      attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
       arguments:
-          value: 1600
+          value: 5
 
     - label:
-          "Writes (sets back) the limit of MaxCoolSetpointLimit to
-          MinCoolSetpointLimit attribute"
+          "Reads it back again to confirm the successful write of
+          MinSetpointDeadBand attribute"
+      optional: true
+      command: "readAttribute"
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
+      response:
+          value: 5
+
+    - label: "Writes the value below MinSetpointDeadBand"
       optional: true
       command: "writeAttribute"
-      attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
       arguments:
-          value: 3200
+          value: -1
+      response:
+          error: CONSTRAINT_ERROR
 
-    - label:
-          "Writes (sets back) the limit of MinCoolSetpointLimit to
-          MaxCoolSetpointLimit attribute"
+    - label: "Writes the value above MinSetpointDeadBand "
       optional: true
       command: "writeAttribute"
-      attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
       arguments:
-          value: 1600
+          value: 30
+      response:
+          error: CONSTRAINT_ERROR
 
-    - label:
-          "Writes (sets back) the limit of MaxCoolSetpointLimit to
-          MaxCoolSetpointLimit attribute"
+    - label: "Writes the min limit of MinSetpointDeadBand"
       optional: true
       command: "writeAttribute"
-      attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
       arguments:
-          value: 3200
+          value: 0
+
+    - label: "Writes the max limit of MinSetpointDeadBand"
+      optional: true
+      command: "writeAttribute"
+      attribute: "MinSetpointDeadBand"
+      PICS: A_MINSETPOINTDEADBAND
+      arguments:
+          value: 25
 
     - label:
           "Reads ControlSequenceOfOperation from Server DUT and verifies that
@@ -572,18 +822,21 @@ tests:
       response:
           value: 2
 
+    # Disabled: This test can't work because our setpoint limits are all messed up.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
+      optional: true
+      disabled: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 2000
 
-    #issue #11714 SetpointRaise command is failing
+    #issue #18545 SetpointRaise command is failing
     - label: "Sends SetpointRaise Command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
       command: "SetpointRaiseLower"
-      PICS: CR_SetpointRaiseLower
       arguments:
           values:
               - name: "Mode"
@@ -594,25 +847,28 @@ tests:
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT
       response:
           value: -30
 
+    # Disabled: This test can't work because our setpoint limits are all messed up.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
+      optional: true
+      disabled: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 2000
 
-    #issue #11714 SetpointRaise command is failing
+    #issue #18545 SetpointRaise command is failing
     - label: "Sends SetpointRaise Command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
       command: "SetpointRaiseLower"
-      PICS: CR_SetpointRaiseLower
       arguments:
           values:
               - name: "Mode"
@@ -623,10 +879,10 @@ tests:
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
       response:
           value: 30
 
@@ -638,11 +894,10 @@ tests:
       arguments:
           value: 2600
 
-    #issue #11714 SetpointRaise command is failing
+    #issue #18545 SetpointRaise command is failing
     - label: "Sends SetpointRaise Command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
       command: "SetpointRaiseLower"
-      PICS: CR_SetpointRaiseLower
       arguments:
           values:
               - name: "Mode"
@@ -653,10 +908,10 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
       response:
           value: -30
 
@@ -668,11 +923,10 @@ tests:
       arguments:
           value: 2600
 
-    #issue #11714 SetpointRaise command is failing
+    #issue #18545 SetpointRaise command is failing
     - label: "Sends SetpointRaise Command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
       command: "SetpointRaiseLower"
-      PICS: CR_SetpointRaiseLower
       arguments:
           values:
               - name: "Mode"
@@ -683,10 +937,10 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
       response:
           value: 30
 
@@ -698,18 +952,21 @@ tests:
       arguments:
           value: 2600
 
+    # Disabled: This test can't work because our setpoint limits are all messed up.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
+      disabled: true
+      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 2000
 
-    #issue #11714 SetpointRaise command is failing
+    #issue #18545 SetpointRaise command is failing
     - label: "Sends SetpointRaise Command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
       command: "SetpointRaiseLower"
-      PICS: CR_SetpointRaiseLower
       arguments:
           values:
               - name: "Mode"
@@ -720,20 +977,20 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP
       response:
           value: -30
 
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT
       response:
           value: -30
 
@@ -745,18 +1002,21 @@ tests:
       arguments:
           value: 2600
 
+    # Disabled: This test can't work because our setpoint limits are all messed up.
+    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
+      optional: true
+      disabled: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
       PICS: A_OCCUPIEDHEATINGSETPOINT
       arguments:
           value: 2000
 
-    #issue #11714 SetpointRaise command is failing
+    #issue #18545 SetpointRaise command is failing
     - label: "Sends SetpointRaise Command"
-      disabled: true
+      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
       command: "SetpointRaiseLower"
-      PICS: CR_SetpointRaiseLower
       arguments:
           values:
               - name: "Mode"
@@ -767,19 +1027,19 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
       response:
           value: 30
 
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      disabled: true
+      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT
       response:
           value: 30
diff --git a/src/app/tests/suites/certification/Test_TC_UL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_UL_1_1.yaml
new file mode 100644
index 00000000000000..eb6ed66c1030f3
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_UL_1_1.yaml
@@ -0,0 +1,74 @@
+# 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.1. [TC-UL-1.1|]Global Attributes [DUT as Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission DUT to TH"
+      verification: |
+
+      disabled: true
+
+    - label: "{DUTread} (0xFFFD) ClusterRevision attribute"
+      verification: |
+          ./chip-tool unitlocalization read  cluster-revision 1 0
+          [1651186310867] [11123:114108] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFD DataVersion: 486381485
+          [1651186310867] [11123:114108] CHIP: [TOO]   ClusterRevision: 1
+      disabled: true
+
+    - label: "{DUTread} (0xFFFC) FeatureMap attribute"
+      verification: |
+          ./chip-tool unitlocalization read  feature-map 1 0
+          [1651186357789] [11140:114768] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFC DataVersion: 486381485
+          [1651186357789] [11140:114768] CHIP: [TOO]   FeatureMap: 1
+      disabled: true
+
+    - label: "{DUTread} (0xFFFB) AttributeList attribute"
+      verification: |
+          ./chip-tool unitlocalization read attribute-list 1 0
+          [1652335691.917681][3124:3129] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFB DataVersion: 3157629909
+          [1652335691.917762][3124:3129] CHIP:TOO:   AttributeList: 6 entries
+          [1652335691.917802][3124:3129] CHIP:TOO:     [1]: 0
+          [1652335691.917834][3124:3129] CHIP:TOO:     [2]: 65528
+          [1652335691.917865][3124:3129] CHIP:TOO:     [3]: 65529
+          [1652335691.917895][3124:3129] CHIP:TOO:     [4]: 65531
+          [1652335691.917924][3124:3129] CHIP:TOO:     [5]: 65532
+          [1652335691.917957][3124:3129] CHIP:TOO:     [6]: 65533
+      disabled: true
+
+    - label: "{DUTread} (0xFFFA) EventList attribute"
+      verification: |
+          out of scope for V1.0
+      disabled: true
+
+    - label: "{DUTread} (0xFFF9) AcceptedCommandList attribute"
+      verification: |
+          ./chip-tool unitlocalization read accepted-command-list 1 0
+
+          [1651186469211] [11184:116328] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFF9 DataVersion: 486381485
+          [1651186469211] [11184:116328] CHIP: [TOO]   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "{DUTread} (0xFFF8) GeneratedCommandList attribute"
+      verification: |
+          ./chip-tool unitlocalization read generated-command-list 1 0
+          [1651191485645] [13481:177154] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFF8 DataVersion: 486381492
+          [1651191485646] [13481:177154] CHIP: [TOO]   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_UL_1_2.yaml b/src/app/tests/suites/certification/Test_TC_UL_1_2.yaml
new file mode 100644
index 00000000000000..3d7292c227f465
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_UL_1_2.yaml
@@ -0,0 +1,74 @@
+# 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.2. [TC-UL-1.2|]Global Attributes [DUT as Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Commission TH to DUT"
+      verification: |
+
+      disabled: true
+
+    - label: "{THread} (0xFFFD) ClusterRevision attribute"
+      verification: |
+          ./chip-tool unitlocalization read  cluster-revision 1 0
+          [1651186310867] [11123:114108] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFD DataVersion: 486381485
+          [1651186310867] [11123:114108] CHIP: [TOO]   ClusterRevision: 1
+      disabled: true
+
+    - label: "{THread} (0xFFFC) FeatureMap attribute"
+      verification: |
+          ./chip-tool unitlocalization read  feature-map 1 0
+          [1651186357789] [11140:114768] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFC DataVersion: 486381485
+          [1651186357789] [11140:114768] CHIP: [TOO]   FeatureMap: 1
+      disabled: true
+
+    - label: "{THread} (0xFFFB) AttributeList attribute"
+      verification: |
+          ./chip-tool unitlocalization read attribute-list 1 0
+          [1652335691.917681][3124:3129] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFB DataVersion: 3157629909
+          [1652335691.917762][3124:3129] CHIP:TOO:   AttributeList: 6 entries
+          [1652335691.917802][3124:3129] CHIP:TOO:     [1]: 0
+          [1652335691.917834][3124:3129] CHIP:TOO:     [2]: 65528
+          [1652335691.917865][3124:3129] CHIP:TOO:     [3]: 65529
+          [1652335691.917895][3124:3129] CHIP:TOO:     [4]: 65531
+          [1652335691.917924][3124:3129] CHIP:TOO:     [5]: 65532
+          [1652335691.917957][3124:3129] CHIP:TOO:     [6]: 65533
+      disabled: true
+
+    - label: "{THread} (0xFFFA) EventList attribute"
+      verification: |
+          out of scope for V1.0
+      disabled: true
+
+    - label: "{THread} (0xFFF9) AcceptedCommandList attribute"
+      verification: |
+          ./chip-tool unitlocalization read accepted-command-list 1 0
+
+          [1651186469211] [11184:116328] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFF9 DataVersion: 486381485
+          [1651186469211] [11184:116328] CHIP: [TOO]   AcceptedCommandList: 0 entries
+      disabled: true
+
+    - label: "{THread} (0xFFF8) GeneratedCommandList attribute"
+      verification: |
+          ./chip-tool unitlocalization read generated-command-list 1 0
+          [1651191485645] [13481:177154] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFF8 DataVersion: 486381492
+          [1651191485646] [13481:177154] CHIP: [TOO]   GeneratedCommandList: 0 entries
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_UL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_UL_2_1.yaml
new file mode 100644
index 00000000000000..cdeec9a6caa2a6
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_UL_2_1.yaml
@@ -0,0 +1,195 @@
+# 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.3. [TC-UL-2.1]Read and Write Unit Localization Cluster Attributes [DUT as
+    Client]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT reads TemperatureUnit attribute from TH"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651195354.966370][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651195354.966398][4306:4306] CHIP:DMG: {
+          [1651195354.966420][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651195354.966446][4306:4306] CHIP:DMG:         [
+          [1651195354.966508][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651195354.966544][4306:4306] CHIP:DMG:                 {
+          [1651195354.966574][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651195354.966626][4306:4306] CHIP:DMG:                         Cluster = 0x2d,
+          [1651195354.966657][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651195354.966685][4306:4306] CHIP:DMG:                 }
+          [1651195354.966714][4306:4306] CHIP:DMG:
+          [1651195354.966766][4306:4306] CHIP:DMG:         ],
+          [1651195354.966799][4306:4306] CHIP:DMG:
+          [1651195354.966845][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651195354.966872][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651195354.966896][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT writes 0 to TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization write temperature-unit 0 1 0
+
+          [1651186603.330367][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651186603.330394][4306:4306] CHIP:DMG: {
+          [1651186603.330482][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651186603.330515][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651186603.330542][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651186603.330574][4306:4306] CHIP:DMG:         [
+          [1651186603.330601][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651186603.330631][4306:4306] CHIP:DMG:                 {
+          [1651186603.330662][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651186603.330691][4306:4306] CHIP:DMG:                         {
+          [1651186603.330725][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651186603.330762][4306:4306] CHIP:DMG:                                 Cluster = 0x2d,
+          [1651186603.330797][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1651186603.330829][4306:4306] CHIP:DMG:                         }
+          [1651186603.330863][4306:4306] CHIP:DMG:
+          [1651186603.330899][4306:4306] CHIP:DMG:                                 Data = 0,
+          [1651186603.330932][4306:4306] CHIP:DMG:                 },
+          [1651186603.330963][4306:4306] CHIP:DMG:
+          [1651186603.330989][4306:4306] CHIP:DMG:         ],
+          [1651186603.331020][4306:4306] CHIP:DMG:
+          [1651186603.331047][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651186603.331074][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651186603.331099][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads TemperatureUnit attribute from TH"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651195354.966370][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651195354.966398][4306:4306] CHIP:DMG: {
+          [1651195354.966420][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651195354.966446][4306:4306] CHIP:DMG:         [
+          [1651195354.966508][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651195354.966544][4306:4306] CHIP:DMG:                 {
+          [1651195354.966574][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651195354.966626][4306:4306] CHIP:DMG:                         Cluster = 0x2d,
+          [1651195354.966657][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651195354.966685][4306:4306] CHIP:DMG:                 }
+          [1651195354.966714][4306:4306] CHIP:DMG:
+          [1651195354.966766][4306:4306] CHIP:DMG:         ],
+          [1651195354.966799][4306:4306] CHIP:DMG:
+          [1651195354.966845][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651195354.966872][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651195354.966896][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT writes 1 to TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization write temperature-unit 1 1 0
+          [1651190221.098512][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651190221.098539][4306:4306] CHIP:DMG: {
+          [1651190221.098563][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651190221.098590][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651190221.098615][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651190221.098645][4306:4306] CHIP:DMG:         [
+          [1651190221.098671][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651190221.098743][4306:4306] CHIP:DMG:                 {
+          [1651190221.098806][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651190221.098838][4306:4306] CHIP:DMG:                         {
+          [1651190221.098872][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651190221.098903][4306:4306] CHIP:DMG:                                 Cluster = 0x2d,
+          [1651190221.098940][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1651190221.099043][4306:4306] CHIP:DMG:                         }
+          [1651190221.099080][4306:4306] CHIP:DMG:
+          [1651190221.099117][4306:4306] CHIP:DMG:                                 Data = 1,
+          [1651190221.099202][4306:4306] CHIP:DMG:                 },
+          [1651190221.099271][4306:4306] CHIP:DMG:
+          [1651190221.099296][4306:4306] CHIP:DMG:         ],
+          [1651190221.099326][4306:4306] CHIP:DMG:
+          [1651190221.099352][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651190221.099378][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651190221.099448][4306:4306] CHIP:DMG: },
+          [1651190221.099532][4306:4306] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_002D e=0 p=o
+          [1651190221.099596][4306:4306] CHIP:DMG: AccessControl: allowed
+      disabled: true
+
+    - label: "DUT reads TemperatureUnit attribute from TH"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651195354.966370][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651195354.966398][4306:4306] CHIP:DMG: {
+          [1651195354.966420][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651195354.966446][4306:4306] CHIP:DMG:         [
+          [1651195354.966508][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651195354.966544][4306:4306] CHIP:DMG:                 {
+          [1651195354.966574][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651195354.966626][4306:4306] CHIP:DMG:                         Cluster = 0x2d,
+          [1651195354.966657][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651195354.966685][4306:4306] CHIP:DMG:                 }
+          [1651195354.966714][4306:4306] CHIP:DMG:
+          [1651195354.966766][4306:4306] CHIP:DMG:         ],
+          [1651195354.966799][4306:4306] CHIP:DMG:
+          [1651195354.966845][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651195354.966872][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651195354.966896][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT writes 2 to TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization write temperature-unit 2 1 0
+          [1651190829.683764][4306:4306] CHIP:DMG: WriteRequestMessage =
+          [1651190829.683792][4306:4306] CHIP:DMG: {
+          [1651190829.683827][4306:4306] CHIP:DMG:         suppressResponse = false,
+          [1651190829.683884][4306:4306] CHIP:DMG:         timedRequest = false,
+          [1651190829.683921][4306:4306] CHIP:DMG:         AttributeDataIBs =
+          [1651190829.683956][4306:4306] CHIP:DMG:         [
+          [1651190829.683991][4306:4306] CHIP:DMG:                 AttributeDataIB =
+          [1651190829.684017][4306:4306] CHIP:DMG:                 {
+          [1651190829.684045][4306:4306] CHIP:DMG:                         AttributePathIB =
+          [1651190829.684083][4306:4306] CHIP:DMG:                         {
+          [1651190829.684124][4306:4306] CHIP:DMG:                                 Endpoint = 0x0,
+          [1651190829.684163][4306:4306] CHIP:DMG:                                 Cluster = 0x2d,
+          [1651190829.684209][4306:4306] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1651190829.684238][4306:4306] CHIP:DMG:                         }
+          [1651190829.684289][4306:4306] CHIP:DMG:
+          [1651190829.684335][4306:4306] CHIP:DMG:                                 Data = 2,
+          [1651190829.684371][4306:4306] CHIP:DMG:                 },
+          [1651190829.684410][4306:4306] CHIP:DMG:
+          [1651190829.684435][4306:4306] CHIP:DMG:         ],
+          [1651190829.684474][4306:4306] CHIP:DMG:
+          [1651190829.684501][4306:4306] CHIP:DMG:         moreChunkedMessages = false,
+          [1651190829.684535][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651190829.684556][4306:4306] CHIP:DMG: },
+      disabled: true
+
+    - label: "DUT reads TemperatureUnit attribute from TH"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651195354.966370][4306:4306] CHIP:DMG: ReadRequestMessage =
+          [1651195354.966398][4306:4306] CHIP:DMG: {
+          [1651195354.966420][4306:4306] CHIP:DMG:         AttributePathIBs =
+          [1651195354.966446][4306:4306] CHIP:DMG:         [
+          [1651195354.966508][4306:4306] CHIP:DMG:                 AttributePathIB =
+          [1651195354.966544][4306:4306] CHIP:DMG:                 {
+          [1651195354.966574][4306:4306] CHIP:DMG:                         Endpoint = 0x0,
+          [1651195354.966626][4306:4306] CHIP:DMG:                         Cluster = 0x2d,
+          [1651195354.966657][4306:4306] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651195354.966685][4306:4306] CHIP:DMG:                 }
+          [1651195354.966714][4306:4306] CHIP:DMG:
+          [1651195354.966766][4306:4306] CHIP:DMG:         ],
+          [1651195354.966799][4306:4306] CHIP:DMG:
+          [1651195354.966845][4306:4306] CHIP:DMG:         isFabricFiltered = true,
+          [1651195354.966872][4306:4306] CHIP:DMG:         InteractionModelRevision = 1
+          [1651195354.966896][4306:4306] CHIP:DMG: },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_UL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_UL_2_2.yaml
new file mode 100644
index 00000000000000..0d5caec3f7b247
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_UL_2_2.yaml
@@ -0,0 +1,139 @@
+# 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.4. [TC-UL-2.2]Read and Write Unit Localization Cluster Attributes [DUT as
+    Server]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "TH reads TemperatureUnit attribute from DUT"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651186538224] [11210:117238] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_0000 DataVersion: 486381485
+          [1651186538224] [11210:117238] CHIP: [TOO]   TemperatureUnit: 0
+      disabled: true
+
+    - label: "TH writes 0 to TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization write temperature-unit 0 1 0
+          [1651191017267] [13215:170815] CHIP: [DMG] WriteResponseMessage =
+          [1651191017267] [13215:170815] CHIP: [DMG] {
+          [1651191017267] [13215:170815] CHIP: [DMG]         AttributeStatusIBs =
+          [1651191017267] [13215:170815] CHIP: [DMG]         [
+          [1651191017267] [13215:170815] CHIP: [DMG]                 AttributeStatusIB =
+          [1651191017267] [13215:170815] CHIP: [DMG]                 {
+          [1651191017267] [13215:170815] CHIP: [DMG]                         AttributePathIB =
+          [1651191017267] [13215:170815] CHIP: [DMG]                         {
+          [1651191017267] [13215:170815] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651191017267] [13215:170815] CHIP: [DMG]                                 Cluster = 0x2d,
+          [1651191017267] [13215:170815] CHIP: [DMG]                                 Attribute = 0x0000_0000,
+          [1651191017267] [13215:170815] CHIP: [DMG]                         }
+          [1651191017267] [13215:170815] CHIP: [DMG]
+          [1651191017267] [13215:170815] CHIP: [DMG]                         StatusIB =
+          [1651191017267] [13215:170815] CHIP: [DMG]                         {
+          [1651191017267] [13215:170815] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651191017267] [13215:170815] CHIP: [DMG]                         },
+          [1651191017267] [13215:170815] CHIP: [DMG]
+          [1651191017267] [13215:170815] CHIP: [DMG]                 },
+          [1651191017267] [13215:170815] CHIP: [DMG]
+          [1651191017267] [13215:170815] CHIP: [DMG]         ],
+          [1651191017267] [13215:170815] CHIP: [DMG]
+          [1651191017267] [13215:170815] CHIP: [DMG]         InteractionModelRevision = 1
+      disabled: true
+
+    - label: "TH reads TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651190135534] [12868:159849] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_0000 DataVersion: 486381486
+          [1651190135534] [12868:159849] CHIP: [TOO]   TemperatureUnit: 0
+      disabled: true
+
+    - label: "TH writes 1 to TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization write temperature-unit 1 1 0
+
+          [1651190221003] [12900:161139] CHIP: [DMG] WriteResponseMessage =
+          [1651190221003] [12900:161139] CHIP: [DMG] {
+          [1651190221003] [12900:161139] CHIP: [DMG]         AttributeStatusIBs =
+          [1651190221003] [12900:161139] CHIP: [DMG]         [
+          [1651190221003] [12900:161139] CHIP: [DMG]                 AttributeStatusIB =
+          [1651190221003] [12900:161139] CHIP: [DMG]                 {
+          [1651190221003] [12900:161139] CHIP: [DMG]                         AttributePathIB =
+          [1651190221003] [12900:161139] CHIP: [DMG]                         {
+          [1651190221003] [12900:161139] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651190221003] [12900:161139] CHIP: [DMG]                                 Cluster = 0x2d,
+          [1651190221003] [12900:161139] CHIP: [DMG]                                 Attribute = 0x0000_0000,
+          [1651190221003] [12900:161139] CHIP: [DMG]                         }
+          [1651190221003] [12900:161139] CHIP: [DMG]
+          [1651190221003] [12900:161139] CHIP: [DMG]                         StatusIB =
+          [1651190221003] [12900:161139] CHIP: [DMG]                         {
+          [1651190221003] [12900:161139] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651190221003] [12900:161139] CHIP: [DMG]                         },
+          [1651190221003] [12900:161139] CHIP: [DMG]
+          [1651190221003] [12900:161139] CHIP: [DMG]                 },
+          [1651190221003] [12900:161139] CHIP: [DMG]
+          [1651190221003] [12900:161139] CHIP: [DMG]         ],
+          [1651190221003] [12900:161139] CHIP: [DMG]
+          [1651190221003] [12900:161139] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651190221003] [12900:161139] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651190800434] [13122:167909] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_0000 DataVersion: 486381489
+          [1651190800434] [13122:167909] CHIP: [TOO]   TemperatureUnit: 1
+      disabled: true
+
+    - label: "TH writes 2 to TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization write temperature-unit 2 1 0
+          [1651190829573] [13133:168303] CHIP: [DMG] WriteResponseMessage =
+          [1651190829573] [13133:168303] CHIP: [DMG] {
+          [1651190829573] [13133:168303] CHIP: [DMG]         AttributeStatusIBs =
+          [1651190829573] [13133:168303] CHIP: [DMG]         [
+          [1651190829573] [13133:168303] CHIP: [DMG]                 AttributeStatusIB =
+          [1651190829573] [13133:168303] CHIP: [DMG]                 {
+          [1651190829573] [13133:168303] CHIP: [DMG]                         AttributePathIB =
+          [1651190829573] [13133:168303] CHIP: [DMG]                         {
+          [1651190829573] [13133:168303] CHIP: [DMG]                                 Endpoint = 0x0,
+          [1651190829573] [13133:168303] CHIP: [DMG]                                 Cluster = 0x2d,
+          [1651190829573] [13133:168303] CHIP: [DMG]                                 Attribute = 0x0000_0000,
+          [1651190829573] [13133:168303] CHIP: [DMG]                         }
+          [1651190829573] [13133:168303] CHIP: [DMG]
+          [1651190829573] [13133:168303] CHIP: [DMG]                         StatusIB =
+          [1651190829573] [13133:168303] CHIP: [DMG]                         {
+          [1651190829573] [13133:168303] CHIP: [DMG]                                 status = 0x00 (SUCCESS),
+          [1651190829573] [13133:168303] CHIP: [DMG]                         },
+          [1651190829573] [13133:168303] CHIP: [DMG]
+          [1651190829573] [13133:168303] CHIP: [DMG]                 },
+          [1651190829573] [13133:168303] CHIP: [DMG]
+          [1651190829573] [13133:168303] CHIP: [DMG]         ],
+          [1651190829573] [13133:168303] CHIP: [DMG]
+          [1651190829573] [13133:168303] CHIP: [DMG]         InteractionModelRevision = 1
+          [1651190829573] [13133:168303] CHIP: [DMG] }
+      disabled: true
+
+    - label: "TH reads TemperatureUnit attribute"
+      verification: |
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          [1651190908005] [13164:169492] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_0000 DataVersion: 486381490
+          [1651190908005] [13164:169492] CHIP: [TOO]   TemperatureUnit: 2
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_2.yaml b/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_2.yaml
deleted file mode 100644
index 0fa2befbe08b09..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_2.yaml
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name: 51.2.1. [TC-WIFIDIAG-1.2] Attributes observation at client as DUT
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Commission TH to DUT"
-      verification: |
-
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute value is non-zero and the value data type matches
-
-          ./chip-tool wifinetworkdiagnostics read bssid 1 0
-
-          [1636556333.275352][2710:2716] CHIP:EM: Flushed pending ack for MessageCounter:1532129240 on exchange 51129i
-          [1636556333.312883][2710:2716] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 51130i
-          [1636556333.312930][2710:2716] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 51130i
-          [1636556333.312955][2710:2716] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 51130i
-          [1636556333.346401][2710:2716] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 51130i
-          [1636556333.346467][2710:2716] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 51130i
-          [1636556333.346553][2710:2716] CHIP:DMG: ReportDataMessage =
-          [1636556333.346606][2710:2716] CHIP:DMG: {
-          [1636556333.346652][2710:2716] CHIP:DMG:         AttributeDataList =
-          [1636556333.346706][2710:2716] CHIP:DMG:         [
-          [1636556333.346756][2710:2716] CHIP:DMG:                 AttributeDataElement =
-          [1636556333.346821][2710:2716] CHIP:DMG:                 {
-          [1636556333.346880][2710:2716] CHIP:DMG:                         AttributePathIB =
-          [1636556333.346953][2710:2716] CHIP:DMG:                         {
-          [1636556333.347028][2710:2716] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556333.347107][2710:2716] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556333.347184][2710:2716] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1636556333.347257][2710:2716] CHIP:DMG:                         }
-          [1636556333.347337][2710:2716] CHIP:DMG:
-          [1636556333.347410][2710:2716] CHIP:DMG:                         Status = 0x86,
-          [1636556333.347472][2710:2716] CHIP:DMG:                 },
-          [1636556333.347538][2710:2716] CHIP:DMG:
-          [1636556333.347588][2710:2716] CHIP:DMG:         ],
-          [1636556333.347647][2710:2716] CHIP:DMG:
-          [1636556333.347693][2710:2716] CHIP:DMG: }
-          [1636556333.347851][2710:2716] CHIP:ZCL: ReadAttributesResponse:
-          [1636556333.347897][2710:2716] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556333.347944][2710:2716] CHIP:ZCL:   attributeId: 0x0000_0000
-          [1636556333.347987][2710:2716] CHIP:ZCL:   status: UnsupportedAttribute   (0x0086)
-          [1636556333.348031][2710:2716] CHIP:TOO: Default Failure Response: 0x86
-          [1636556333.348146][2710:2716] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 51130i
-          [1636556333.348247][2710:2716] CHIP:IN: Prepared encrypted message 0xaaaac60edf00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 51130i with MessageC
-          ounter:1.
-          [1636556333.348369][2710:2716] CHIP:IN: Sending encrypted msg 0xaaaac60edf00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2038624 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute value is non-zero and the value data type matches
-
-          ./chip-tool wifinetworkdiagnostics read security-type 1 0
-
-          [1636556458.315715][2739:2744] CHIP:EM: Flushed pending ack for MessageCounter:1532129242 on exchange 43784i
-          [1636556458.379931][2739:2744] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 43785i
-          [1636556458.379992][2739:2744] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 43785i
-          [1636556458.380024][2739:2744] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 43785i
-          [1636556458.380077][2739:2744] CHIP:DMG: ReportDataMessage =
-          [1636556458.380111][2739:2744] CHIP:DMG: {
-          [1636556458.380137][2739:2744] CHIP:DMG:         AttributeDataList =
-          [1636556458.380170][2739:2744] CHIP:DMG:         [
-          [1636556458.380199][2739:2744] CHIP:DMG:                 AttributeDataElement =
-          [1636556458.380238][2739:2744] CHIP:DMG:                 {
-          [1636556458.380298][2739:2744] CHIP:DMG:                         AttributePathIB =
-          [1636556458.380344][2739:2744] CHIP:DMG:                         {
-          [1636556458.380388][2739:2744] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556458.380435][2739:2744] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556458.380484][2739:2744] CHIP:DMG:                                 Attribute = 0x0000_0001,
-          [1636556458.380527][2739:2744] CHIP:DMG:                         }
-          [1636556458.380574][2739:2744] CHIP:DMG:
-          [1636556458.380620][2739:2744] CHIP:DMG:                         Data = 0,
-          [1636556458.380662][2739:2744] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556458.380702][2739:2744] CHIP:DMG:                 },
-          [1636556458.380742][2739:2744] CHIP:DMG:
-          [1636556458.380771][2739:2744] CHIP:DMG:         ],
-          [1636556458.380806][2739:2744] CHIP:DMG:
-          [1636556458.380833][2739:2744] CHIP:DMG: }
-          [1636556458.380945][2739:2744] CHIP:ZCL: ReadAttributesResponse:
-          [1636556458.380990][2739:2744] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556458.381035][2739:2744] CHIP:ZCL:   attributeId: 0x0000_0001
-          [1636556458.381078][2739:2744] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556458.381119][2739:2744] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556458.381163][2739:2744] CHIP:TOO: Int8u attribute Response: 0
-          [1636556458.381279][2739:2744] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 43785i
-          [1636556458.381472][2739:2744] CHIP:IN: Prepared encrypted message 0xaaab16775f00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 43785i with MessageC
-          ounter:1.
-          [1636556458.381548][2739:2744] CHIP:IN: Sending encrypted msg 0xaaab16775f00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2163657 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          ./chip-tool wifinetworkdiagnostics read wi-fi-version 1 0
-
-          [1636556683.277405][2749:2755] CHIP:EM: Flushed pending ack for MessageCounter:1532129244 on exchange 38911i
-          [1636556683.344547][2749:2755] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 38912i
-          [1636556683.344652][2749:2755] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 38912i
-          [1636556683.344702][2749:2755] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 38912i
-          [1636556683.344784][2749:2755] CHIP:DMG: ReportDataMessage =
-          [1636556683.344838][2749:2755] CHIP:DMG: {
-          [1636556683.344881][2749:2755] CHIP:DMG:         AttributeDataList =
-          [1636556683.344933][2749:2755] CHIP:DMG:         [
-          [1636556683.344982][2749:2755] CHIP:DMG:                 AttributeDataElement =
-          [1636556683.345044][2749:2755] CHIP:DMG:                 {
-          [1636556683.345102][2749:2755] CHIP:DMG:                         AttributePathIB =
-          [1636556683.345174][2749:2755] CHIP:DMG:                         {
-          [1636556683.345247][2749:2755] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556683.345325][2749:2755] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556683.345403][2749:2755] CHIP:DMG:                                 Attribute = 0x0000_0002,
-          [1636556683.345475][2749:2755] CHIP:DMG:                         }
-          [1636556683.345552][2749:2755] CHIP:DMG:
-          [1636556683.345627][2749:2755] CHIP:DMG:                         Data = 0,
-          [1636556683.345697][2749:2755] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556683.345764][2749:2755] CHIP:DMG:                 },
-          [1636556683.345830][2749:2755] CHIP:DMG:
-          [1636556683.345878][2749:2755] CHIP:DMG:         ],
-          [1636556683.345938][2749:2755] CHIP:DMG:
-          [1636556683.345982][2749:2755] CHIP:DMG: }
-          [1636556683.346132][2749:2755] CHIP:ZCL: ReadAttributesResponse:
-          [1636556683.346176][2749:2755] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556683.346222][2749:2755] CHIP:ZCL:   attributeId: 0x0000_0002
-          [1636556683.346265][2749:2755] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556683.346307][2749:2755] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556683.346351][2749:2755] CHIP:TOO: Int8u attribute Response: 0
-          [1636556683.346467][2749:2755] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 38912i
-          [1636556683.346567][2749:2755] CHIP:IN: Prepared encrypted message 0xaaab0050df00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 38912i with MessageC
-          ounter:1.
-          [1636556683.346638][2749:2755] CHIP:IN: Sending encrypted msg 0xaaab0050df00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2388622 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          ./chip-tool wifinetworkdiagnostics read channel-number 1 0
-
-          [1636556726.175879][2759:2764] CHIP:EM: Flushed pending ack for MessageCounter:1532129246 on exchange 3811i
-          [1636556726.213528][2759:2764] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 3812i
-          [1636556726.213572][2759:2764] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 3812i
-          [1636556726.213594][2759:2764] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 3812i
-          [1636556726.249929][2759:2764] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 3812i
-          [1636556726.249996][2759:2764] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 3812i
-          [1636556726.250083][2759:2764] CHIP:DMG: ReportDataMessage =
-          [1636556726.250139][2759:2764] CHIP:DMG: {
-          [1636556726.250183][2759:2764] CHIP:DMG:         AttributeDataList =
-          [1636556726.250236][2759:2764] CHIP:DMG:         [
-          [1636556726.250285][2759:2764] CHIP:DMG:                 AttributeDataElement =
-          [1636556726.250350][2759:2764] CHIP:DMG:                 {
-          [1636556726.250408][2759:2764] CHIP:DMG:                         AttributePathIB =
-          [1636556726.250481][2759:2764] CHIP:DMG:                         {
-          [1636556726.250555][2759:2764] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556726.250634][2759:2764] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556726.250711][2759:2764] CHIP:DMG:                                 Attribute = 0x0000_0003,
-          [1636556726.250783][2759:2764] CHIP:DMG:                         }
-          [1636556726.250860][2759:2764] CHIP:DMG:
-          [1636556726.250935][2759:2764] CHIP:DMG:                         Data = 11,
-          [1636556726.251007][2759:2764] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556726.251075][2759:2764] CHIP:DMG:                 },
-          [1636556726.251141][2759:2764] CHIP:DMG:
-          [1636556726.251189][2759:2764] CHIP:DMG:         ],
-          [1636556726.251249][2759:2764] CHIP:DMG:
-          [1636556726.251294][2759:2764] CHIP:DMG: }
-          [1636556726.251446][2759:2764] CHIP:ZCL: ReadAttributesResponse:
-          [1636556726.251490][2759:2764] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556726.251536][2759:2764] CHIP:ZCL:   attributeId: 0x0000_0003
-          [1636556726.251579][2759:2764] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556726.251623][2759:2764] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556726.251665][2759:2764] CHIP:TOO: Int16u attribute Response: 11
-          [1636556726.251780][2759:2764] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 3812i
-          [1636556726.251880][2759:2764] CHIP:IN: Prepared encrypted message 0xaaab0bb74f00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 3812i with MessageCo
-          unter:1.
-          [1636556726.251951][2759:2764] CHIP:IN: Sending encrypted msg 0xaaab0bb74f00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2431527 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read rssi 1 0
-
-          [1636556744.306378][2766:2771] CHIP:EM: Flushed pending ack for MessageCounter:1532129248 on exchange 63266i
-          [1636556744.375649][2766:2771] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 63267i
-          [1636556744.375739][2766:2771] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 63267i
-          [1636556744.375789][2766:2771] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 63267i
-          [1636556744.375868][2766:2771] CHIP:DMG: ReportDataMessage =
-          [1636556744.375921][2766:2771] CHIP:DMG: {
-          [1636556744.375963][2766:2771] CHIP:DMG:         AttributeDataList =
-          [1636556744.376015][2766:2771] CHIP:DMG:         [
-          [1636556744.376064][2766:2771] CHIP:DMG:                 AttributeDataElement =
-          [1636556744.376130][2766:2771] CHIP:DMG:                 {
-          [1636556744.376188][2766:2771] CHIP:DMG:                         AttributePathIB =
-          [1636556744.376262][2766:2771] CHIP:DMG:                         {
-          [1636556744.376374][2766:2771] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556744.376451][2766:2771] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556744.376528][2766:2771] CHIP:DMG:                                 Attribute = 0x0000_0004,
-          [1636556744.376599][2766:2771] CHIP:DMG:                         }
-          [1636556744.376676][2766:2771] CHIP:DMG:
-          [1636556744.376753][2766:2771] CHIP:DMG:                         Data = -42,
-          [1636556744.376817][2766:2771] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556744.376879][2766:2771] CHIP:DMG:                 },
-          [1636556744.376945][2766:2771] CHIP:DMG:
-          [1636556744.376994][2766:2771] CHIP:DMG:         ],
-          [1636556744.377052][2766:2771] CHIP:DMG:
-          [1636556744.377096][2766:2771] CHIP:DMG: }
-          [1636556744.377245][2766:2771] CHIP:ZCL: ReadAttributesResponse:
-          [1636556744.377289][2766:2771] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556744.377334][2766:2771] CHIP:ZCL:   attributeId: 0x0000_0004
-          [1636556744.377376][2766:2771] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556744.377417][2766:2771] CHIP:ZCL:   attribute TLV Type: 0x00
-          [1636556744.377460][2766:2771] CHIP:TOO: Int8s attribute Response: -42
-          [1636556744.377581][2766:2771] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 63267i
-          [1636556744.377683][2766:2771] CHIP:IN: Prepared encrypted message 0xaaaaec3cef00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 63267i with MessageC
-          ounter:1.
-          [1636556744.377755][2766:2771] CHIP:IN: Sending encrypted msg 0xaaaaec3cef00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2449653 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read beacon-lost-count 1 0
-
-          [1636556771.334558][2776:2782] CHIP:EM: Flushed pending ack for MessageCounter:1532129250 on exchange 19931i
-          [1636556771.404558][2776:2782] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 19932i
-          [1636556771.404657][2776:2782] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 19932i
-          [1636556771.404710][2776:2782] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 19932i
-          [1636556771.404793][2776:2782] CHIP:DMG: ReportDataMessage =
-          [1636556771.404846][2776:2782] CHIP:DMG: {
-          [1636556771.404889][2776:2782] CHIP:DMG:         AttributeDataList =
-          [1636556771.404941][2776:2782] CHIP:DMG:         [
-          [1636556771.404990][2776:2782] CHIP:DMG:                 AttributeDataElement =
-          [1636556771.405057][2776:2782] CHIP:DMG:                 {
-          [1636556771.405110][2776:2782] CHIP:DMG:                         AttributePathIB =
-          [1636556771.405184][2776:2782] CHIP:DMG:                         {
-          [1636556771.405258][2776:2782] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556771.405335][2776:2782] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556771.405413][2776:2782] CHIP:DMG:                                 Attribute = 0x0000_0005,
-          [1636556771.405484][2776:2782] CHIP:DMG:                         }
-          [1636556771.405562][2776:2782] CHIP:DMG:
-          [1636556771.405637][2776:2782] CHIP:DMG:                         Data = 0,
-          [1636556771.405707][2776:2782] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556771.405773][2776:2782] CHIP:DMG:                 },
-          [1636556771.405840][2776:2782] CHIP:DMG:
-          [1636556771.405887][2776:2782] CHIP:DMG:         ],
-          [1636556771.405947][2776:2782] CHIP:DMG:
-          [1636556771.405991][2776:2782] CHIP:DMG: }
-          [1636556771.406141][2776:2782] CHIP:ZCL: ReadAttributesResponse:
-          [1636556771.406185][2776:2782] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556771.406231][2776:2782] CHIP:ZCL:   attributeId: 0x0000_0005
-          [1636556771.406274][2776:2782] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556771.406315][2776:2782] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556771.406358][2776:2782] CHIP:TOO: Int32u attribute Response: 0
-          [1636556771.406478][2776:2782] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 19932i
-          [1636556771.406577][2776:2782] CHIP:IN: Prepared encrypted message 0xaaaaf69c8f00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 19932i with MessageC
-          ounter:1.
-          [1636556771.406649][2776:2782] CHIP:IN: Sending encrypted msg 0xaaaaf69c8f00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2476682 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read beacon-rx-count 1 0
-
-          [1636556782.701773][2784:2789] CHIP:EM: Flushed pending ack for MessageCounter:1532129252 on exchange 18818i
-          [1636556782.740898][2784:2789] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 18819i
-          [1636556782.740978][2784:2789] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 18819i
-          [1636556782.741017][2784:2789] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 18819i
-          [1636556782.775213][2784:2789] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 18819i
-          [1636556782.775278][2784:2789] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 18819i
-          [1636556782.775365][2784:2789] CHIP:DMG: ReportDataMessage =
-          [1636556782.775420][2784:2789] CHIP:DMG: {
-          [1636556782.775464][2784:2789] CHIP:DMG:         AttributeDataList =
-          [1636556782.775517][2784:2789] CHIP:DMG:         [
-          [1636556782.775567][2784:2789] CHIP:DMG:                 AttributeDataElement =
-          [1636556782.775630][2784:2789] CHIP:DMG:                 {
-          [1636556782.775688][2784:2789] CHIP:DMG:                         AttributePathIB =
-          [1636556782.775761][2784:2789] CHIP:DMG:                         {
-          [1636556782.775836][2784:2789] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556782.775915][2784:2789] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556782.775992][2784:2789] CHIP:DMG:                                 Attribute = 0x0000_0006,
-          [1636556782.776062][2784:2789] CHIP:DMG:                         }
-          [1636556782.776139][2784:2789] CHIP:DMG:
-          [1636556782.776214][2784:2789] CHIP:DMG:                         Data = 0,
-          [1636556782.776324][2784:2789] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556782.776395][2784:2789] CHIP:DMG:                 },
-          [1636556782.776462][2784:2789] CHIP:DMG:
-          [1636556782.776511][2784:2789] CHIP:DMG:         ],
-          [1636556782.776571][2784:2789] CHIP:DMG:
-          [1636556782.776614][2784:2789] CHIP:DMG: }
-          [1636556782.776766][2784:2789] CHIP:ZCL: ReadAttributesResponse:
-          [1636556782.776810][2784:2789] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556782.776856][2784:2789] CHIP:ZCL:   attributeId: 0x0000_0006
-          [1636556782.776899][2784:2789] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556782.776942][2784:2789] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556782.776985][2784:2789] CHIP:TOO: Int32u attribute Response: 0
-          [1636556782.777102][2784:2789] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 18819i
-          [1636556782.777205][2784:2789] CHIP:IN: Prepared encrypted message 0xaaaad609af00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 18819i with MessageC
-          ounter:1.
-          [1636556782.777278][2784:2789] CHIP:IN: Sending encrypted msg 0xaaaad609af00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2488053 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read packet-multicast-rx-count 1 0
-
-          [1636556817.733490][2792:2798] CHIP:EM: Flushed pending ack for MessageCounter:1532129254 on exchange 51755i
-          [1636556817.802518][2792:2798] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 51756i
-          [1636556817.802626][2792:2798] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 51756i
-          [1636556817.802684][2792:2798] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 51756i
-          [1636556817.802770][2792:2798] CHIP:DMG: ReportDataMessage =
-          [1636556817.802824][2792:2798] CHIP:DMG: {
-          [1636556817.802866][2792:2798] CHIP:DMG:         AttributeDataList =
-          [1636556817.802918][2792:2798] CHIP:DMG:         [
-          [1636556817.802967][2792:2798] CHIP:DMG:                 AttributeDataElement =
-          [1636556817.803030][2792:2798] CHIP:DMG:                 {
-          [1636556817.803087][2792:2798] CHIP:DMG:                         AttributePathIB =
-          [1636556817.803159][2792:2798] CHIP:DMG:                         {
-          [1636556817.803231][2792:2798] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556817.803307][2792:2798] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556817.803384][2792:2798] CHIP:DMG:                                 Attribute = 0x0000_0007,
-          [1636556817.803455][2792:2798] CHIP:DMG:                         }
-          [1636556817.803532][2792:2798] CHIP:DMG:
-          [1636556817.803606][2792:2798] CHIP:DMG:                         Data = 77,
-          [1636556817.803676][2792:2798] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556817.803742][2792:2798] CHIP:DMG:                 },
-          [1636556817.803808][2792:2798] CHIP:DMG:
-          [1636556817.803856][2792:2798] CHIP:DMG:         ],
-          [1636556817.803915][2792:2798] CHIP:DMG:
-          [1636556817.803979][2792:2798] CHIP:DMG: }
-          [1636556817.804129][2792:2798] CHIP:ZCL: ReadAttributesResponse:
-          [1636556817.804173][2792:2798] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556817.804220][2792:2798] CHIP:ZCL:   attributeId: 0x0000_0007
-          [1636556817.804261][2792:2798] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556817.804349][2792:2798] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556817.804391][2792:2798] CHIP:TOO: Int32u attribute Response: 77
-          [1636556817.804515][2792:2798] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 51756i
-          [1636556817.804624][2792:2798] CHIP:IN: Prepared encrypted message 0xaaaae917ef00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 51756i with MessageC
-          ounter:1.
-          [1636556817.804696][2792:2798] CHIP:IN: Sending encrypted msg 0xaaaae917ef00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2523080 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read packet-multicast-tx-count 1 0
-
-          [1636556830.624321][2800:2805] CHIP:EM: Flushed pending ack for MessageCounter:1532129256 on exchange 37953i
-          [1636556830.662515][2800:2805] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 37954i
-          [1636556830.662557][2800:2805] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 37954i
-          [1636556830.662578][2800:2805] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 37954i
-          [1636556830.706220][2800:2805] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 37954i
-          [1636556830.706287][2800:2805] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 37954i
-          [1636556830.706372][2800:2805] CHIP:DMG: ReportDataMessage =
-          [1636556830.706427][2800:2805] CHIP:DMG: {
-          [1636556830.706471][2800:2805] CHIP:DMG:         AttributeDataList =
-          [1636556830.706524][2800:2805] CHIP:DMG:         [
-          [1636556830.706574][2800:2805] CHIP:DMG:                 AttributeDataElement =
-          [1636556830.706638][2800:2805] CHIP:DMG:                 {
-          [1636556830.706696][2800:2805] CHIP:DMG:                         AttributePathIB =
-          [1636556830.706769][2800:2805] CHIP:DMG:                         {
-          [1636556830.706842][2800:2805] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556830.706919][2800:2805] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556830.706997][2800:2805] CHIP:DMG:                                 Attribute = 0x0000_0008,
-          [1636556830.707069][2800:2805] CHIP:DMG:                         }
-          [1636556830.707147][2800:2805] CHIP:DMG:
-          [1636556830.707222][2800:2805] CHIP:DMG:                         Data = 0,
-          [1636556830.707294][2800:2805] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556830.707357][2800:2805] CHIP:DMG:                 },
-          [1636556830.707424][2800:2805] CHIP:DMG:
-          [1636556830.707474][2800:2805] CHIP:DMG:         ],
-          [1636556830.707535][2800:2805] CHIP:DMG:
-          [1636556830.707580][2800:2805] CHIP:DMG: }
-          [1636556830.707730][2800:2805] CHIP:ZCL: ReadAttributesResponse:
-          [1636556830.707776][2800:2805] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556830.707823][2800:2805] CHIP:ZCL:   attributeId: 0x0000_0008
-          [1636556830.707866][2800:2805] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556830.707908][2800:2805] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556830.707952][2800:2805] CHIP:TOO: Int32u attribute Response: 0
-          [1636556830.708069][2800:2805] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 37954i
-          [1636556830.708170][2800:2805] CHIP:IN: Prepared encrypted message 0xaaaacbbddf00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 37954i with MessageC
-          ounter:1.
-          [1636556830.708244][2800:2805] CHIP:IN: Sending encrypted msg 0xaaaacbbddf00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2535983 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read packet-unicast-rx-count 1 0
-
-          [1636556853.356740][2807:2812] CHIP:EM: Flushed pending ack for MessageCounter:1532129258 on exchange 32805i
-          [1636556853.395380][2807:2812] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 32806i
-          [1636556853.395421][2807:2812] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 32806i
-          [1636556853.395442][2807:2812] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 32806i
-          [1636556853.431526][2807:2812] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 32806i
-          [1636556853.431594][2807:2812] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 32806i
-          [1636556853.431680][2807:2812] CHIP:DMG: ReportDataMessage =
-          [1636556853.431735][2807:2812] CHIP:DMG: {
-          [1636556853.431780][2807:2812] CHIP:DMG:         AttributeDataList =
-          [1636556853.431833][2807:2812] CHIP:DMG:         [
-          [1636556853.431883][2807:2812] CHIP:DMG:                 AttributeDataElement =
-          [1636556853.431948][2807:2812] CHIP:DMG:                 {
-          [1636556853.432007][2807:2812] CHIP:DMG:                         AttributePathIB =
-          [1636556853.432080][2807:2812] CHIP:DMG:                         {
-          [1636556853.432155][2807:2812] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556853.432234][2807:2812] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556853.432344][2807:2812] CHIP:DMG:                                 Attribute = 0x0000_0009,
-          [1636556853.432418][2807:2812] CHIP:DMG:                         }
-          [1636556853.432497][2807:2812] CHIP:DMG:
-          [1636556853.432574][2807:2812] CHIP:DMG:                         Data = 180,
-          [1636556853.432648][2807:2812] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556853.432711][2807:2812] CHIP:DMG:                 },
-          [1636556853.432780][2807:2812] CHIP:DMG:
-          [1636556853.432830][2807:2812] CHIP:DMG:         ],
-          [1636556853.432890][2807:2812] CHIP:DMG:
-          [1636556853.432935][2807:2812] CHIP:DMG: }
-          [1636556853.433086][2807:2812] CHIP:ZCL: ReadAttributesResponse:
-          [1636556853.433132][2807:2812] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556853.433179][2807:2812] CHIP:ZCL:   attributeId: 0x0000_0009
-          [1636556853.433224][2807:2812] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556853.433267][2807:2812] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556853.433310][2807:2812] CHIP:TOO: Int32u attribute Response: 180
-          [1636556853.433430][2807:2812] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 32806i
-          [1636556853.433528][2807:2812] CHIP:IN: Prepared encrypted message 0xaaaae5b8af00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 32806i with MessageCounter:1.
-          [1636556853.433603][2807:2812] CHIP:IN: Sending encrypted msg 0xaaaae5b8af00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2558709 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read packet-unicast-tx-count 1 0
-
-          [1636556862.885173][2816:2821] CHIP:EM: Flushed pending ack for MessageCounter:1532129260 on exchange 14944i
-          [1636556862.925849][2816:2821] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 14945i
-          [1636556862.925937][2816:2821] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 14945i
-          [1636556862.925964][2816:2821] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 14945i
-          [1636556862.960034][2816:2821] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 14945i
-          [1636556862.960076][2816:2821] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 14945i
-          [1636556862.960135][2816:2821] CHIP:DMG: ReportDataMessage =
-          [1636556862.960167][2816:2821] CHIP:DMG: {
-          [1636556862.960191][2816:2821] CHIP:DMG:         AttributeDataList =
-          [1636556862.960221][2816:2821] CHIP:DMG:         [
-          [1636556862.960248][2816:2821] CHIP:DMG:                 AttributeDataElement =
-          [1636556862.960307][2816:2821] CHIP:DMG:                 {
-          [1636556862.960342][2816:2821] CHIP:DMG:                         AttributePathIB =
-          [1636556862.960380][2816:2821] CHIP:DMG:                         {
-          [1636556862.960422][2816:2821] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556862.960465][2816:2821] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556862.960508][2816:2821] CHIP:DMG:                                 Attribute = 0x0000_000A,
-          [1636556862.960547][2816:2821] CHIP:DMG:                         }
-          [1636556862.960590][2816:2821] CHIP:DMG:
-          [1636556862.960634][2816:2821] CHIP:DMG:                         Data = 106,
-          [1636556862.960673][2816:2821] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556862.960710][2816:2821] CHIP:DMG:                 },
-          [1636556862.960747][2816:2821] CHIP:DMG:
-          [1636556862.960773][2816:2821] CHIP:DMG:         ],
-          [1636556862.960806][2816:2821] CHIP:DMG:
-          [1636556862.960831][2816:2821] CHIP:DMG: }
-          [1636556862.960922][2816:2821] CHIP:ZCL: ReadAttributesResponse:
-          [1636556862.960948][2816:2821] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556862.960976][2816:2821] CHIP:ZCL:   attributeId: 0x0000_000A
-          [1636556862.961000][2816:2821] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556862.961023][2816:2821] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556862.961048][2816:2821] CHIP:TOO: Int32u attribute Response: 106
-          [1636556862.961132][2816:2821] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 14945i
-          [1636556862.961245][2816:2821] CHIP:IN: Prepared encrypted message 0xaaaaf59b5f00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 14945i with MessageCounter:1.
-          [1636556862.961321][2816:2821] CHIP:IN: Sending encrypted msg 0xaaaaf59b5f00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2568237 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read current-max-rate 1 0
-
-          [1636556892.070815][2824:2829] CHIP:EM: Flushed pending ack for MessageCounter:1532129262 on exchange 5373i
-          [1636556892.107682][2824:2829] CHIP:EM: Received message of type 0x10 with protocolId (0, 0) and MessageCounter:1 on exchange 5374i
-          [1636556892.107723][2824:2829] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 5374i
-          [1636556892.107744][2824:2829] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 5374i
-          [1636556892.145391][2824:2829] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:2 on exchange 5374i
-          [1636556892.145456][2824:2829] CHIP:EM: CHIP MessageCounter:0 not in RetransTable on exchange 5374i
-          [1636556892.145543][2824:2829] CHIP:DMG: ReportDataMessage =
-          [1636556892.145595][2824:2829] CHIP:DMG: {
-          [1636556892.145638][2824:2829] CHIP:DMG:         AttributeDataList =
-          [1636556892.145698][2824:2829] CHIP:DMG:         [
-          [1636556892.145746][2824:2829] CHIP:DMG:                 AttributeDataElement =
-          [1636556892.145808][2824:2829] CHIP:DMG:                 {
-          [1636556892.145863][2824:2829] CHIP:DMG:                         AttributePathIB =
-          [1636556892.145935][2824:2829] CHIP:DMG:                         {
-          [1636556892.146008][2824:2829] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556892.146086][2824:2829] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556892.146163][2824:2829] CHIP:DMG:                                 Attribute = 0x0000_000B,
-          [1636556892.146235][2824:2829] CHIP:DMG:                         }
-          [1636556892.146312][2824:2829] CHIP:DMG:
-          [1636556892.146388][2824:2829] CHIP:DMG:                         Data = 65000000,
-          [1636556892.146457][2824:2829] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556892.146524][2824:2829] CHIP:DMG:                 },
-          [1636556892.146595][2824:2829] CHIP:DMG:
-          [1636556892.146648][2824:2829] CHIP:DMG:         ],
-          [1636556892.146707][2824:2829] CHIP:DMG:
-          [1636556892.146752][2824:2829] CHIP:DMG: }
-          [1636556892.146905][2824:2829] CHIP:ZCL: ReadAttributesResponse:
-          [1636556892.146949][2824:2829] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556892.146995][2824:2829] CHIP:ZCL:   attributeId: 0x0000_000B
-          [1636556892.147037][2824:2829] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556892.147079][2824:2829] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556892.147121][2824:2829] CHIP:TOO: Int64u attribute Response: 65000000
-          [1636556892.147239][2824:2829] CHIP:EM: Piggybacking Ack for MessageCounter:2 on exchange: 5374i
-          [1636556892.147337][2824:2829] CHIP:IN: Prepared encrypted message 0xaaab1b740f00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 5374i with MessageCounter:1.
-          [1636556892.147409][2824:2829] CHIP:IN: Sending encrypted msg 0xaaab1b740f00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2597423 msec
-      disabled: true
-
-    - label: "DUT reads a attribute value from TH."
-      verification: |
-          Verify that the attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          ./chip-tool wifinetworkdiagnostics read overrun-count 1 0
-
-          [1636556912.342416][2831:2836] CHIP:EM: Flushed pending ack for MessageCounter:1532129264 on exchange 23278i
-          [1636556912.415911][2831:2836] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:1 on exchange 23279i
-          [1636556912.416004][2831:2836] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 23279i
-          [1636556912.416055][2831:2836] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 23279i
-          [1636556912.416136][2831:2836] CHIP:DMG: ReportDataMessage =
-          [1636556912.416190][2831:2836] CHIP:DMG: {
-          [1636556912.416235][2831:2836] CHIP:DMG:         AttributeDataList =
-          [1636556912.416336][2831:2836] CHIP:DMG:         [
-          [1636556912.416389][2831:2836] CHIP:DMG:                 AttributeDataElement =
-          [1636556912.416453][2831:2836] CHIP:DMG:                 {
-          [1636556912.416511][2831:2836] CHIP:DMG:                         AttributePathIB =
-          [1636556912.416583][2831:2836] CHIP:DMG:                         {
-          [1636556912.416658][2831:2836] CHIP:DMG:                                 Endpoint = 0x1,
-          [1636556912.416736][2831:2836] CHIP:DMG:                                 Cluster = 0x36,
-          [1636556912.416814][2831:2836] CHIP:DMG:                                 Attribute = 0x0000_000C,
-          [1636556912.416885][2831:2836] CHIP:DMG:                         }
-          [1636556912.416962][2831:2836] CHIP:DMG:
-          [1636556912.417037][2831:2836] CHIP:DMG:                         Data = 0,
-          [1636556912.417108][2831:2836] CHIP:DMG:                         DataElementVersion = 0x0,
-          [1636556912.417174][2831:2836] CHIP:DMG:                 },
-          [1636556912.417242][2831:2836] CHIP:DMG:
-          [1636556912.417290][2831:2836] CHIP:DMG:         ],
-          [1636556912.417350][2831:2836] CHIP:DMG:
-          [1636556912.417395][2831:2836] CHIP:DMG: }
-          [1636556912.417546][2831:2836] CHIP:ZCL: ReadAttributesResponse:
-          [1636556912.417590][2831:2836] CHIP:ZCL:   ClusterId: 0x0000_0036
-          [1636556912.417637][2831:2836] CHIP:ZCL:   attributeId: 0x0000_000C
-          [1636556912.417679][2831:2836] CHIP:ZCL:   status: Success                (0x0000)
-          [1636556912.417721][2831:2836] CHIP:ZCL:   attribute TLV Type: 0x04
-          [1636556912.417763][2831:2836] CHIP:TOO: Int64u attribute Response: 0
-          [1636556912.417878][2831:2836] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 23279i
-          [1636556912.417982][2831:2836] CHIP:IN: Prepared encrypted message 0xaaaaece01f00 to 0x0000000000000001 of type 0x1 and protocolId (0, 1) on exchange 23279i with MessageCounter:1.
-          [1636556912.418055][2831:2836] CHIP:IN: Sending encrypted msg 0xaaaaece01f00 with MessageCounter:1 to 0x0000000000000001 at monotonic time: 2617693 msec
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
index 79c536df640f74..37e7c86b630532 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
@@ -31,285 +31,128 @@ tests:
                 value: nodeId
 
     ### MANDATORY Attributes
+    ### 1 MANDATORY Attributes
     ### Attribute[  0]: Type  =======================================
-    - label: "2: read the RO mandatory attribute default: Type"
+    - label: "1a: read the RO mandatory attribute default: Type"
       command: "readAttribute"
       attribute: "Type"
+      PICS: A_TYPE
       response:
           constraints:
               type: enum8
               minValue: 0
               maxValue: 9
 
-    - label: "3a: write a value into the RO mandatory attribute: Type"
-      command: "writeAttribute"
-      attribute: "Type"
-      arguments:
-          value: 250
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "3b: reads back the RO mandatory attribute: Type"
-      command: "readAttribute"
-      attribute: "Type"
-      response:
-          constraints:
-              type: enum8
-              notValue: 250
-
     ### Attribute[  7]: ConfigStatus  ===============================
-    - label: "2: read the RO mandatory attribute default: ConfigStatus"
+    - label: "1b: read the RO mandatory attribute default: ConfigStatus"
       command: "readAttribute"
       attribute: "ConfigStatus"
+      PICS: A_CONFIGSTATUS
       response:
           constraints:
               type: map8
               minValue: 0
               maxValue: 63
 
-    - label: "3a: write a value into the RO mandatory attribute: ConfigStatus"
-      command: "writeAttribute"
-      attribute: "ConfigStatus"
-      arguments:
-          value: 128
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "3b: reads back the RO mandatory attribute: ConfigStatus"
-      command: "readAttribute"
-      attribute: "ConfigStatus"
-      response:
-          constraints:
-              type: map8
-              notValue: 128
-
     ### Attribute[ 10]: OperationalStatus  ==========================
-    - label: "2: read the RO mandatory attribute default: OperationalStatus"
+    - label: "1c: read the RO mandatory attribute default: OperationalStatus"
       command: "readAttribute"
       attribute: "OperationalStatus"
+      PICS: A_OPERATIONALSTATUS
       response:
           constraints:
               type: map8
               minValue: 0
               maxValue: 63
 
-    - label:
-          "3a: write a value into the RO mandatory attribute: OperationalStatus"
-      command: "writeAttribute"
-      attribute: "OperationalStatus"
-      arguments:
-          value: 128
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "3b: reads back the RO mandatory attribute: OperationalStatus"
-      command: "readAttribute"
-      attribute: "OperationalStatus"
-      response:
-          constraints:
-              type: map8
-              notValue: 128
-
     ### Attribute[ 13]: EndProductType ==============================
-    - label: "2: read the RO mandatory attribute default: EndProductType"
+    - label: "1d: read the RO mandatory attribute default: EndProductType"
       command: "readAttribute"
       attribute: "EndProductType"
+      PICS: A_ENDPRODUCTTYPE
       response:
           constraints:
               type: enum8
               minValue: 0
               maxValue: 23
 
-    - label: "3a: write a value into the RO mandatory attribute: EndProductType"
-      command: "writeAttribute"
-      attribute: "EndProductType"
-      arguments:
-          value: 250
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "3b: reads back the RO mandatory attribute: EndProductType"
-      command: "readAttribute"
-      attribute: "EndProductType"
-      response:
-          constraints:
-              type: enum8
-              notValue: 250
-
     ### Attribute[ 23]: Mode ========================================
-    - label: "2: read the RW mandatory attribute default: Mode"
+    - label: "1e: read the RW mandatory attribute default: Mode"
       command: "readAttribute"
       attribute: "Mode"
+      PICS: A_MODE
       response:
           constraints:
               type: map8
               minValue: 0
               maxValue: 15
 
-    - label: "3a: write a value into the RW mandatory attribute:: Mode"
+    - label: "1f: write a value into the RW mandatory attribute:: Mode"
       command: "writeAttribute"
       attribute: "Mode"
+      PICS: A_MODE
       arguments:
-          value: 8
-
-    - label: "3b: reads back the RW mandatory attribute: Mode"
-      command: "readAttribute"
-      attribute: "Mode"
-      response:
-          value: 8
+          value: 0
 
-    ### CONDITIONALLY MANDATORY Attributes
+    ### 2 CONDITIONALLY MANDATORY Attributes
     ### Attribute[ 11]: TargetPositionLiftPercent100ths  ====================
     - label:
-          "2: read the RO optional attribute default:
+          "2a: read the RO optional attribute default:
           TargetPositionLiftPercent100ths"
       command: "readAttribute"
       attribute: "TargetPositionLiftPercent100ths"
+      PICS: A_TARGETPOSITIONLIFTPERCENT100THS
       response:
           constraints:
               type: Percent100ths
               minValue: 0
               maxValue: 10000
 
-    - label:
-          "3a: write a value into the RO optional attribute:
-          TargetPositionLiftPercent100ths"
-      command: "writeAttribute"
-      attribute: "TargetPositionLiftPercent100ths"
-      arguments:
-          value: 20000
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "3b: reads back the RO optional attribute:
-          TargetPositionLiftPercent100ths"
-      command: "readAttribute"
-      attribute: "TargetPositionLiftPercent100ths"
-      response:
-          constraints:
-              type: Percent100ths
-              notValue: 20000
-
     ### Attribute[ 12]: TargetPositionTiltPercent100ths  ====================
     - label:
-          "2: read the RO optional attribute default:
+          "2b: read the RO optional attribute default:
           TargetPositionTiltPercent100ths"
       command: "readAttribute"
       attribute: "TargetPositionTiltPercent100ths"
+      PICS: A_TARGETPOSITIONTILTPERCENT100THS
       response:
           constraints:
               type: Percent100ths
               minValue: 0
               maxValue: 10000
 
-    - label:
-          "3a: write a value into the RO optional attribute:
-          TargetPositionTiltPercent100ths"
-      command: "writeAttribute"
-      attribute: "TargetPositionTiltPercent100ths"
-      arguments:
-          value: 20000
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "3b: reads back the RO optional attribute:
-          TargetPositionTiltPercent100ths"
-      command: "readAttribute"
-      attribute: "TargetPositionTiltPercent100ths"
-      response:
-          constraints:
-              type: Percent100ths
-              notValue: 20000
-
     ### Attribute[ 14]: CurrentPositionLiftPercent100ths  ====================
     - label:
-          "2: read the RO optional attribute default:
+          "2c: read the RO optional attribute default:
           CurrentPositionLiftPercent100ths"
       command: "readAttribute"
       attribute: "CurrentPositionLiftPercent100ths"
+      PICS: A_CURRENTPOSITIONLIFTPERCENT100THS
       response:
           constraints:
               type: Percent100ths
               minValue: 0
               maxValue: 10000
 
-    - label:
-          "3a: write a value into the RO optional attribute:
-          CurrentPositionLiftPercent100ths"
-      command: "writeAttribute"
-      attribute: "CurrentPositionLiftPercent100ths"
-      arguments:
-          value: 20000
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "3b: reads back the RO optional attribute:
-          CurrentPositionLiftPercent100ths"
-      command: "readAttribute"
-      attribute: "CurrentPositionLiftPercent100ths"
-      response:
-          constraints:
-              type: Percent100ths
-              notValue: 20000
-
     ### Attribute[ 15]: CurrentPositionTiltPercent100ths  ====================
     - label:
-          "2: read the RO optional attribute default:
+          "2d: read the RO optional attribute default:
           CurrentPositionTiltPercent100ths"
       command: "readAttribute"
       attribute: "CurrentPositionTiltPercent100ths"
+      PICS: A_CURRENTPOSITIONTILTPERCENT100THS
       response:
           constraints:
               type: Percent100ths
               minValue: 0
               maxValue: 10000
 
-    - label:
-          "3a: write a value into the RO optional attribute:
-          CurrentPositionTiltPercent100ths"
-      command: "writeAttribute"
-      attribute: "CurrentPositionTiltPercent100ths"
-      arguments:
-          value: 20000
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "3b: reads back the RO optional attribute:
-          CurrentPositionTiltPercent100ths"
-      command: "readAttribute"
-      attribute: "CurrentPositionTiltPercent100ths"
-      response:
-          constraints:
-              type: Percent100ths
-              notValue: 20000
-
     ### Attribute[ 16]: InstalledOpenLimitLift  ====================
-    - label: "2: read the RO optional attribute default: InstalledOpenLimitLift"
-      command: "readAttribute"
-      attribute: "InstalledOpenLimitLift"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
     - label:
-          "3a: write a value into the RO optional attribute:
-          InstalledOpenLimitLift"
-      command: "writeAttribute"
-      attribute: "InstalledOpenLimitLift"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "3b: reads back the RO optional attribute: InstalledOpenLimitLift"
+          "2e: read the RO optional attribute default: InstalledOpenLimitLift"
       command: "readAttribute"
       attribute: "InstalledOpenLimitLift"
+      PICS: A_INSTALLEDOPENLIMITLIFT
       response:
           constraints:
               type: uint16
@@ -318,29 +161,10 @@ tests:
 
     ### Attribute[ 17]: InstalledClosedLimitLift  ====================
     - label:
-          "2: read the RO optional attribute default: InstalledClosedLimitLift"
-      command: "readAttribute"
-      attribute: "InstalledClosedLimitLift"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
-    - label:
-          "3a: write a value into the RO optional attribute:
-          InstalledClosedLimitLift"
-      command: "writeAttribute"
-      attribute: "InstalledClosedLimitLift"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "3b: reads back the RO optional attribute: InstalledClosedLimitLift"
+          "2f: read the RO optional attribute default: InstalledClosedLimitLift"
       command: "readAttribute"
       attribute: "InstalledClosedLimitLift"
+      PICS: A_INSTALLEDCLOSEDLIMITLIFT
       response:
           constraints:
               type: uint16
@@ -348,28 +172,11 @@ tests:
               maxValue: 65535
 
     ### Attribute[ 18]: InstalledOpenLimitTilt  ====================
-    - label: "2: read the RO optional attribute default: InstalledOpenLimitTilt"
-      command: "readAttribute"
-      attribute: "InstalledOpenLimitTilt"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
     - label:
-          "3a: write a value into the RO optional attribute:
-          InstalledOpenLimitTilt"
-      command: "writeAttribute"
-      attribute: "InstalledOpenLimitTilt"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "3b: reads back the RO optional attribute: InstalledOpenLimitTilt"
+          "2g: read the RO optional attribute default: InstalledOpenLimitTilt"
       command: "readAttribute"
       attribute: "InstalledOpenLimitTilt"
+      PICS: A_INSTALLEDOPENLIMITTILT
       response:
           constraints:
               type: uint16
@@ -378,57 +185,41 @@ tests:
 
     ### Attribute[ 19]: InstalledClosedLimitTilt  ====================
     - label:
-          "2: read the RO optional attribute default: InstalledClosedLimitTilt"
+          "2h: read the RO optional attribute default: InstalledClosedLimitTilt"
       command: "readAttribute"
       attribute: "InstalledClosedLimitTilt"
+      PICS: A_INSTALLEDCLOSEDLIMITTILT
       response:
           constraints:
               type: uint16
               minValue: 0
               maxValue: 65535
 
-    - label:
-          "3a: write a value into the RO optional attribute:
-          InstalledClosedLimitTilt"
-      command: "writeAttribute"
-      attribute: "InstalledClosedLimitTilt"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "3b: reads back the RO optional attribute: InstalledClosedLimitTilt"
-      command: "readAttribute"
-      attribute: "InstalledClosedLimitTilt"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
-    ### CONDITIONALLY and PURELY OPTIONAL Attributes
+    ### 3 CONDITIONALLY and PURELY OPTIONAL Attributes
     ### Attribute[ 26]: SafetyStatus  ==========================
-    - label: "4: read the RO mandatory attribute default: SafetyStatus"
+    - label: "3a: read the RO mandatory attribute default: SafetyStatus"
       command: "readAttribute"
       attribute: "SafetyStatus"
+      PICS: A_SAFETYSTATUS
       response:
           constraints:
               type: map16
               minValue: 0
               maxValue: 2047
 
-    - label: "5a: write a value into the RO mandatory attribute: SafetyStatus"
+    - label: "3a.2: write a value into the RO mandatory attribute: SafetyStatus"
       command: "writeAttribute"
       attribute: "SafetyStatus"
+      PICS: A_SAFETYSTATUS
       arguments:
           value: 4096
       response:
           error: UNSUPPORTED_WRITE
 
-    - label: "5b: reads back the RO mandatory attribute: SafetyStatus"
+    - label: "3a.3: reads back the RO mandatory attribute: SafetyStatus"
       command: "readAttribute"
       attribute: "SafetyStatus"
+      PICS: A_SAFETYSTATUS
       response:
           constraints:
               type: map16
@@ -436,31 +227,10 @@ tests:
 
     ### Attribute[  1]: PhysicalClosedLimitLift  ====================
     - label:
-          "4: read the RO optional attribute default: PhysicalClosedLimitLift"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PhysicalClosedLimitLift"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
-    - label:
-          "5a: write a value into the RO optional attribute:
-          PhysicalClosedLimitLift"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "PhysicalClosedLimitLift"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "5b: reads back the RO optional attribute: PhysicalClosedLimitLift"
-      disabled: true
+          "3b: read the RO optional attribute default: PhysicalClosedLimitLift"
       command: "readAttribute"
       attribute: "PhysicalClosedLimitLift"
+      PICS: A_PHYSICALCLOSEDLIMITLIFT
       response:
           constraints:
               type: uint16
@@ -469,31 +239,10 @@ tests:
 
     ### Attribute[  2]: PhysicalClosedLimitTilt  ====================
     - label:
-          "4: read the RO optional attribute default: PhysicalClosedLimitTilt"
-      disabled: true
-      command: "readAttribute"
-      attribute: "PhysicalClosedLimitTilt"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
-    - label:
-          "5a: write a value into the RO optional attribute:
-          PhysicalClosedLimitTilt"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "PhysicalClosedLimitTilt"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "5b: reads back the RO optional attribute: PhysicalClosedLimitTilt"
-      disabled: true
+          "3c: read the RO optional attribute default: PhysicalClosedLimitTilt"
       command: "readAttribute"
       attribute: "PhysicalClosedLimitTilt"
+      PICS: A_PHYSICALCLOSEDLIMITTILT
       response:
           constraints:
               type: uint16
@@ -501,27 +250,10 @@ tests:
               maxValue: 65535
 
     ### Attribute[  3]: CurrentPositionLift  ====================
-    - label: "4: read the RO optional attribute default: CurrentPositionLift"
-      command: "readAttribute"
-      attribute: "CurrentPositionLift"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
-    - label:
-          "5a: write a value into the RO optional attribute: CurrentPositionLift"
-      command: "writeAttribute"
-      attribute: "CurrentPositionLift"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "5b: reads back the RO optional attribute: CurrentPositionLift"
+    - label: "3d: read the RO optional attribute default: CurrentPositionLift"
       command: "readAttribute"
       attribute: "CurrentPositionLift"
+      PICS: A_CURRENTPOSITIONLIFT
       response:
           constraints:
               type: uint16
@@ -529,27 +261,10 @@ tests:
               maxValue: 65535
 
     ### Attribute[  4]: CurrentPositionTilt  ====================
-    - label: "4: read the RO optional attribute default: CurrentPositionTilt"
-      command: "readAttribute"
-      attribute: "CurrentPositionTilt"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
-    - label:
-          "5a: write a value into the RO optional attribute: CurrentPositionTilt"
-      command: "writeAttribute"
-      attribute: "CurrentPositionTilt"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "5b: reads back the RO optional attribute: CurrentPositionTilt"
+    - label: "3e: read the RO optional attribute default: CurrentPositionTilt"
       command: "readAttribute"
       attribute: "CurrentPositionTilt"
+      PICS: A_CURRENTPOSITIONTILT
       response:
           constraints:
               type: uint16
@@ -557,31 +272,11 @@ tests:
               maxValue: 65535
 
     ### Attribute[  5]: NumberOfActuationsLift  ====================
-    - label: "4: read the RO optional attribute default: NumberOfActuationsLift"
-      disabled: true
-      command: "readAttribute"
-      attribute: "NumberOfActuationsLift"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
     - label:
-          "5a: write a value into the RO optional attribute:
-          NumberOfActuationsLift"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "NumberOfActuationsLift"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "5b: reads back the RO optional attribute: NumberOfActuationsLift"
-      disabled: true
+          "3f: read the RO optional attribute default: NumberOfActuationsLift"
       command: "readAttribute"
       attribute: "NumberOfActuationsLift"
+      PICS: A_NUMBEROFACTUATIONSLIFT
       response:
           constraints:
               type: uint16
@@ -589,31 +284,11 @@ tests:
               maxValue: 65535
 
     ### Attribute[  6]: NumberOfActuationsTilt  ====================
-    - label: "4: read the RO optional attribute default: NumberOfActuationsTilt"
-      disabled: true
-      command: "readAttribute"
-      attribute: "NumberOfActuationsTilt"
-      response:
-          constraints:
-              type: uint16
-              minValue: 0
-              maxValue: 65535
-
     - label:
-          "5a: write a value into the RO optional attribute:
-          NumberOfActuationsTilt"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "NumberOfActuationsTilt"
-      arguments:
-          value: 255
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "5b: reads back the RO optional attribute: NumberOfActuationsTilt"
-      disabled: true
+          "3g: read the RO optional attribute default: NumberOfActuationsTilt"
       command: "readAttribute"
       attribute: "NumberOfActuationsTilt"
+      PICS: A_NUMBEROFACTUATIONSTILT
       response:
           constraints:
               type: uint16
@@ -622,67 +297,29 @@ tests:
 
     ### Attribute[  8]: CurrentPositionLiftPercentage  ====================
     - label:
-          "4: read the RO optional attribute default:
+          "3h: read the RO optional attribute default:
           CurrentPositionLiftPercentage"
       command: "readAttribute"
       attribute: "CurrentPositionLiftPercentage"
+      PICS: A_CURRENTPOSITIONLIFTPERCENTAGE
       response:
           constraints:
               type: Percent
               minValue: 0
               maxValue: 100
 
-    - label:
-          "5a: write a value into the RO optional attribute:
-          CurrentPositionLiftPercentage"
-      command: "writeAttribute"
-      attribute: "CurrentPositionLiftPercentage"
-      arguments:
-          value: 200
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "5b: reads back the RO optional attribute:
-          CurrentPositionLiftPercentage"
-      command: "readAttribute"
-      attribute: "CurrentPositionLiftPercentage"
-      response:
-          constraints:
-              type: Percent
-              notValue: 200
-
     ### Attribute[  9]: CurrentPositionTiltPercentage  ====================
     - label:
-          "4: read the RO optional attribute default:
+          "3i:read the RO optional attribute default:
           CurrentPositionTiltPercentage"
       command: "readAttribute"
       attribute: "CurrentPositionTiltPercentage"
+      PICS: A_CURRENTPOSITIONTILTPERCENTAGE
       response:
           constraints:
               type: Percent
               minValue: 0
               maxValue: 100
-
-    - label:
-          "5a: write a value into the RO optional attribute:
-          CurrentPositionTiltPercentage"
-      command: "writeAttribute"
-      attribute: "CurrentPositionTiltPercentage"
-      arguments:
-          value: 200
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label:
-          "5b: reads back the RO optional attribute:
-          CurrentPositionTiltPercentage"
-      command: "readAttribute"
-      attribute: "CurrentPositionTiltPercentage"
-      response:
-          constraints:
-              type: Percent
-              notValue: 200
     ###################################################
     # FYI Non Tested deprecated attributes
     # 20 VelocityLift
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml
index 39c45bfb57f111..8c999b3b5819dd 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml
@@ -30,13 +30,6 @@ tests:
 
     #Issue #10811 if condition is required, need YAML support for this
     - label: "Reads Type attribute from DUT"
-      command: "readAttribute"
-      attribute: "Type"
-      PICS: A_TYPE
-      response:
-          value: 0
-
-    - label: "Reads Type attribute constraints"
       command: "readAttribute"
       attribute: "Type"
       PICS: A_TYPE
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml
index 909a85c9551532..e902b761b26a1c 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml
@@ -34,12 +34,6 @@ tests:
       PICS: A_ENDPRODUCTTYPE
       response:
           value: 0
-
-    - label: "Reads EndProductType attribute constraints from DUT"
-      command: "readAttribute"
-      attribute: "EndProductType"
-      PICS: A_ENDPRODUCTTYPE
-      response:
           constraints:
               type: enum8
               minValue: 0
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml
index b356cb05f04476..fec00d60b8521a 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml
@@ -72,6 +72,12 @@ tests:
               - name: "ms"
                 value: fullMotionDuration
 
+    - label: "2c: TH reads OperationalStatus attribute from DUT"
+      command: "readAttribute"
+      attribute: "OperationalStatus"
+      response:
+          value: 0
+
     ######## UpOrOpen Long-Run: Category only for Position Aware DUT #######
     ### Step 3x -> Verify the DUT has reached its fully-open limits
     ### Mandatory Depends on the FeatureMap
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml
index 0dbf166c126f93..a3ee3dcbda430f 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml
@@ -72,6 +72,12 @@ tests:
               - name: "ms"
                 value: fullMotionDuration
 
+    - label: "2c: TH reads OperationalStatus attribute from DUT"
+      command: "readAttribute"
+      attribute: "OperationalStatus"
+      response:
+          value: 0
+
     ######## DownOrClose Long-Run: Category only for Position Aware DUT #######
     ### Step 3x -> Verify the DUT has reached its fully-open limits
     ### Mandatory Depends on the FeatureMap
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
index 86658e0313495d..acbbc0047184cb 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
@@ -46,14 +46,16 @@ tests:
               minValue: 0
               maxValue: 10000
 
+    # Issue 18794
     - label:
           "1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from
           DUT + assert CurrentPositionLiftPercent100ths/100 equals
           CurrentPositionLiftPercentage"
-      disabled: true
       command: "readAttribute"
       attribute: "CurrentPositionLiftPercentage"
-      PICS: WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE
+      PICS:
+          PICS_SKIP_SAMPLE_APP && WNCV_LF && WNCV_PA_LF &&
+          A_CURRENTPOSITIONLIFTPERCENTAGE
       response:
           value: attrCurrentPositionLiftPercent100ths / 100
           constraints:
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
index a74f3d86c641a7..94a1062d1a3f6b 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
@@ -47,20 +47,18 @@ tests:
               maxValue: 10000
 
     - label:
-          "1b: If (PA_TL & TL) TH reads CurrentPositionTiltPercentage from DUT"
+          "1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from
+          DUT + assert CurrentPositionTiltPercent100ths/100 equals
+          CurrentPositionTiltPercentage"
       command: "readAttribute"
       attribute: "CurrentPositionTiltPercentage"
-      PICS: WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE
+      PICS: WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONTILTPERCENTAGE
       response:
-          saveAs: attrCurrentPositionTiltPercentage
+          value: attrCurrentPositionTiltPercent100ths / 100
           constraints:
               minValue: 0
               maxValue: 100
 
-    ##- label: "1c: If (PA_TL & TL) TH assert CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage"
-    ##  PICS: WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE
-    # TODO [TC_WNCV_4_4] WindowCovering Fix this arithmetic operation issue #15190
-
     ######## Command BadParams 1 #######
     ### Step 2x -> Verify the GoToTiltPercentage with a BadParam
 
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 91d6c956f2137a..8e8fbe2d148acd 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -49,20 +49,6 @@ A_CONTROLSEQUENCEOFOPERATION=1
 CR_SetpointRaiseLower=1
 A_OCCUPANCY=1
 MANUAL_OCCUPANCY_CHANGE=1
-WNCV_LF=1
-WNCV_PA_LF=1
-WNCV_TL=1
-WNCV_PA_TL=1
-WNCV_CALIBRATION=1
-WNCV_MAINTENANCE=1
-WNCV_REVERSAL=1
-A_TYPE=1
-A_CONFIGSTATUS=1
-A_ENDPRODUCTTYPE=1
-A_CURRENTPOSITIONLIFTPERCENTAGE=1
-A_CURRENTPOSITIONTILTPERCENTAGE=1
-CR_GOTOLIFTPERCENTAGE=1
-CR_GOTOTILTPERCENTAGE=1
 A_ONOFF=1
 A_GLOBALSCENECONTROL=1
 A_ONTIME=1
@@ -85,3 +71,40 @@ PI_KEY=1
 PICS_USER_PROMPT=0
 PICS_SKIP_SAMPLE_APP=0
 OO_LT=1
+A_UNOCCUPIEDCOOLINGSETPOINT=0
+A_UNOCCUPIEDHEATINGSETPOINT=0
+A_MINSETPOINTDEADBAND=1
+MANUAL_FLOW_CHANGE=1
+
+# WindowCovering aka WNCV
+WNCV_LF=1
+WNCV_PA_LF=1
+WNCV_TL=1
+WNCV_PA_TL=1
+WNCV_CALIBRATION=1
+WNCV_MAINTENANCE=1
+WNCV_REVERSAL=1
+A_TYPE=1
+A_CONFIGSTATUS=1
+A_ENDPRODUCTTYPE=1
+A_CURRENTPOSITIONLIFT=1
+A_CURRENTPOSITIONLIFTPERCENTAGE=1
+A_CURRENTPOSITIONLIFTPERCENT100THS=1
+A_TARGETPOSITIONLIFTPERCENT100THS=1
+A_CURRENTPOSITIONTILT=1
+A_CURRENTPOSITIONTILTPERCENTAGE=1
+A_CURRENTPOSITIONTILTPERCENT100THS=1
+A_TARGETPOSITIONTILTPERCENT100THS=1
+A_INSTALLEDCLOSEDLIMITLIFT=1
+A_INSTALLEDCLOSEDLIMITTILT=1
+A_INSTALLEDOPENLIMITLIFT=1
+A_INSTALLEDOPENLIMITTILT=1
+A_MODE=1
+A_OPERATIONALSTATUS=1
+A_NUMBEROFACTUATIONSLIFT=1
+A_NUMBEROFACTUATIONSTILT=1
+A_PHYSICALCLOSEDLIMITLIFT=1
+A_PHYSICALCLOSEDLIMITTILT=1
+A_SAFETYSTATUS=1
+CR_GOTOLIFTPERCENTAGE=1
+CR_GOTOTILTPERCENTAGE=1
diff --git a/src/app/tests/suites/commands/interaction_model/InteractionModel.cpp b/src/app/tests/suites/commands/interaction_model/InteractionModel.cpp
index f52e5ae5261a90..91cb73b35ef714 100644
--- a/src/app/tests/suites/commands/interaction_model/InteractionModel.cpp
+++ b/src/app/tests/suites/commands/interaction_model/InteractionModel.cpp
@@ -125,6 +125,8 @@ void InteractionModel::OnSubscriptionEstablished(SubscriptionId subscriptionId)
     ContinueOnChipMainThread(CHIP_NO_ERROR);
 }
 
+void InteractionModel::OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) {}
+
 /////////// WriteClient Callback Interface /////////
 void InteractionModel::OnResponse(const WriteClient * client, const ConcreteDataAttributePath & path, StatusIB status)
 {
@@ -300,7 +302,16 @@ CHIP_ERROR InteractionModelReports::ReportAttribute(DeviceProxy * device, std::v
 
     auto client = std::make_unique<ReadClient>(InteractionModelEngine::GetInstance(), device->GetExchangeManager(),
                                                mBufferedReadAdapter, interactionType);
-    ReturnErrorOnFailure(client->SendRequest(params));
+    if (interactionType == ReadClient::InteractionType::Read)
+    {
+        ReturnErrorOnFailure(client->SendRequest(params));
+    }
+    else
+    {
+        // We want to allow certain kinds of spec-invalid subscriptions so we
+        // can test how the server reacts to them.
+        ReturnErrorOnFailure(client->SendSubscribeRequestWithoutValidation(params));
+    }
     mReadClients.push_back(std::move(client));
     return CHIP_NO_ERROR;
 }
@@ -309,15 +320,18 @@ CHIP_ERROR InteractionModelReports::ReportEvent(DeviceProxy * device, std::vecto
                                                 std::vector<ClusterId> clusterIds, std::vector<EventId> eventIds,
                                                 ReadClient::InteractionType interactionType, uint16_t minInterval,
                                                 uint16_t maxInterval, const Optional<bool> & fabricFiltered,
-                                                const Optional<EventNumber> & eventNumber, const Optional<bool> & keepSubscriptions)
+                                                const Optional<EventNumber> & eventNumber, const Optional<bool> & keepSubscriptions,
+                                                const Optional<std::vector<bool>> & isUrgents)
 {
     const size_t clusterCount  = clusterIds.size();
     const size_t eventCount    = eventIds.size();
     const size_t endpointCount = endpointIds.size();
+    const size_t isUrgentCount = isUrgents.HasValue() ? isUrgents.Value().size() : 0;
 
     VerifyOrReturnError(clusterCount > 0 && clusterCount <= kMaxAllowedPaths, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(eventCount > 0 && eventCount <= kMaxAllowedPaths, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(endpointCount > 0 && endpointCount <= kMaxAllowedPaths, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(isUrgentCount <= kMaxAllowedPaths, CHIP_ERROR_INVALID_ARGUMENT);
 
     const bool hasSameIdsCount   = (clusterCount == eventCount) && (clusterCount == endpointCount);
     const bool multipleClusters  = clusterCount > 1 && eventCount == 1 && endpointCount == 1;
@@ -380,6 +394,11 @@ CHIP_ERROR InteractionModelReports::ReportEvent(DeviceProxy * device, std::vecto
         {
             eventPathParams[i].mEndpointId = endpointId;
         }
+
+        if (isUrgents.HasValue() && isUrgents.Value().size() > i)
+        {
+            eventPathParams[i].mIsUrgentEvent = isUrgents.Value().at(i);
+        }
     }
 
     ReadPrepareParams params(device->GetSecureSession().Value());
diff --git a/src/app/tests/suites/commands/interaction_model/InteractionModel.h b/src/app/tests/suites/commands/interaction_model/InteractionModel.h
index b7b983fe550185..b588aa9de762c2 100644
--- a/src/app/tests/suites/commands/interaction_model/InteractionModel.h
+++ b/src/app/tests/suites/commands/interaction_model/InteractionModel.h
@@ -76,10 +76,11 @@ class InteractionModelReports
                               uint16_t minInterval = 0, uint16_t maxInterval = 0,
                               const chip::Optional<bool> & fabricFiltered           = chip::Optional<bool>(true),
                               const chip::Optional<chip::EventNumber> & eventNumber = chip::NullOptional,
-                              const chip::Optional<bool> & keepSubscriptions        = chip::NullOptional)
+                              const chip::Optional<bool> & keepSubscriptions        = chip::NullOptional,
+                              const chip::Optional<std::vector<bool>> & isUrgents   = chip::NullOptional)
     {
         return ReportEvent(device, endpointIds, clusterIds, eventIds, chip::app::ReadClient::InteractionType::Subscribe,
-                           minInterval, maxInterval, fabricFiltered, eventNumber, keepSubscriptions);
+                           minInterval, maxInterval, fabricFiltered, eventNumber, keepSubscriptions, isUrgents);
     }
 
     CHIP_ERROR ReportEvent(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds,
@@ -87,7 +88,8 @@ class InteractionModelReports
                            chip::app::ReadClient::InteractionType interactionType, uint16_t minInterval = 0,
                            uint16_t maxInterval = 0, const chip::Optional<bool> & fabricFiltered = chip::Optional<bool>(true),
                            const chip::Optional<chip::EventNumber> & eventNumber = chip::NullOptional,
-                           const chip::Optional<bool> & keepSubscriptions        = chip::NullOptional);
+                           const chip::Optional<bool> & keepSubscriptions        = chip::NullOptional,
+                           const chip::Optional<std::vector<bool>> & isUrgents   = chip::NullOptional);
 
     void Shutdown() { mReadClients.clear(); }
 
@@ -174,30 +176,43 @@ class InteractionModelWriter
                               chip::AttributeId attributeId, const T & value,
                               const chip::Optional<uint16_t> & timedInteractionTimeoutMs = chip::NullOptional,
                               const chip::Optional<bool> & suppressResponse              = chip::NullOptional,
-                              const chip::Optional<chip::DataVersion> & dataVersion      = chip::NullOptional)
+                              const chip::Optional<chip::DataVersion> & dataVersion      = chip::NullOptional,
+                              const chip::Optional<uint16_t> & repeatCount               = chip::NullOptional,
+                              const chip::Optional<uint16_t> & repeatDelayInMs           = chip::NullOptional)
     {
-        chip::app::AttributePathParams attributePathParams;
-        if (endpointId != chip::kInvalidEndpointId)
+        uint16_t repeat = repeatCount.ValueOr(1);
+        while (repeat--)
         {
-            attributePathParams.mEndpointId = endpointId;
-        }
+            chip::app::AttributePathParams attributePathParams;
+            if (endpointId != chip::kInvalidEndpointId)
+            {
+                attributePathParams.mEndpointId = endpointId;
+            }
 
-        if (clusterId != chip::kInvalidClusterId)
-        {
-            attributePathParams.mClusterId = clusterId;
-        }
+            if (clusterId != chip::kInvalidClusterId)
+            {
+                attributePathParams.mClusterId = clusterId;
+            }
 
-        if (attributeId != chip::kInvalidAttributeId)
-        {
-            attributePathParams.mAttributeId = attributeId;
-        }
+            if (attributeId != chip::kInvalidAttributeId)
+            {
+                attributePathParams.mAttributeId = attributeId;
+            }
+
+            mWriteClient = std::make_unique<chip::app::WriteClient>(device->GetExchangeManager(), &mChunkedWriteCallback,
+                                                                    timedInteractionTimeoutMs, suppressResponse.ValueOr(false));
+            VerifyOrReturnError(mWriteClient != nullptr, CHIP_ERROR_NO_MEMORY);
+
+            ReturnErrorOnFailure(mWriteClient->EncodeAttribute(attributePathParams, value, dataVersion));
+            ReturnErrorOnFailure(mWriteClient->SendWriteRequest(device->GetSecureSession().Value()));
 
-        mWriteClient = std::make_unique<chip::app::WriteClient>(device->GetExchangeManager(), &mChunkedWriteCallback,
-                                                                timedInteractionTimeoutMs, suppressResponse.ValueOr(false));
-        VerifyOrReturnError(mWriteClient != nullptr, CHIP_ERROR_NO_MEMORY);
+            if (repeatDelayInMs.HasValue())
+            {
+                chip::test_utils::SleepMillis(repeatDelayInMs.Value());
+            }
+        }
 
-        ReturnErrorOnFailure(mWriteClient->EncodeAttribute(attributePathParams, value, dataVersion));
-        return mWriteClient->SendWriteRequest(device->GetSecureSession().Value());
+        return CHIP_NO_ERROR;
     }
 
     template <class T>
@@ -326,7 +341,7 @@ class InteractionModel : public InteractionModelReports,
     void OnError(CHIP_ERROR error) override;
     void OnDone(chip::app::ReadClient * aReadClient) override;
     void OnSubscriptionEstablished(chip::SubscriptionId subscriptionId) override;
-
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override;
     /////////// WriteClient Callback Interface /////////
     void OnResponse(const chip::app::WriteClient * client, const chip::app::ConcreteDataAttributePath & path,
                     chip::app::StatusIB status) override;
diff --git a/src/app/tests/suites/commands/log/LogCommands.cpp b/src/app/tests/suites/commands/log/LogCommands.cpp
index 866315cdc1573c..690eeea432d881 100644
--- a/src/app/tests/suites/commands/log/LogCommands.cpp
+++ b/src/app/tests/suites/commands/log/LogCommands.cpp
@@ -34,7 +34,7 @@ CHIP_ERROR LogCommands::UserPrompt(const char * identity,
     {
         std::string line;
         std::getline(std::cin, line);
-        if (line != value.expectedValue.Value().data())
+        if (line != std::string(value.expectedValue.Value().data(), value.expectedValue.Value().size()))
         {
             return ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT);
         }
diff --git a/src/app/tests/suites/include/ConstraintsChecker.h b/src/app/tests/suites/include/ConstraintsChecker.h
index 10c87d61095b93..f728ef2ed502d8 100644
--- a/src/app/tests/suites/include/ConstraintsChecker.h
+++ b/src/app/tests/suites/include/ConstraintsChecker.h
@@ -189,7 +189,7 @@ class ConstraintsChecker
         return true;
     }
 
-    template <typename T, typename U, std::enable_if_t<!std::is_enum<T>::value, int> = 0>
+    template <typename T, typename U, std::enable_if_t<!std::is_enum<T>::value && !std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMinValue(const char * itemName, T current, U expected)
     {
         if (current < expected)
@@ -201,13 +201,13 @@ class ConstraintsChecker
         return true;
     }
 
-    template <typename T, typename U, std::enable_if_t<std::is_enum<T>::value, int> = 0>
+    template <typename T, typename U, std::enable_if_t<std::is_enum<T>::value && !std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMinValue(const char * itemName, T current, U expected)
     {
         return CheckConstraintMinValue(itemName, chip::to_underlying(current), expected);
     }
 
-    template <typename T, typename U>
+    template <typename T, typename U, std::enable_if_t<!std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMinValue(const char * itemName, chip::BitFlags<T> current, U expected)
     {
         if (current.Raw() < expected)
@@ -219,7 +219,19 @@ class ConstraintsChecker
         return true;
     }
 
-    template <typename T, typename U>
+    template <typename T, typename U, std::enable_if_t<!std::is_pointer<U>::value, int> = 0>
+    bool CheckConstraintMinValue(const char * itemName, chip::BitMask<T> current, U expected)
+    {
+        if (current.Raw() < expected)
+        {
+            Exit(std::string(itemName) + " value < minValue: " + std::to_string(current.Raw()) + " < " + std::to_string(expected));
+            return false;
+        }
+
+        return true;
+    }
+
+    template <typename T, typename U, std::enable_if_t<!std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMinValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current, U expected)
     {
         if (current.IsNull())
@@ -240,7 +252,7 @@ class ConstraintsChecker
         return CheckConstraintMinValue(itemName, current, expected.Value());
     }
 
-    template <typename T, typename U, std::enable_if_t<!std::is_enum<T>::value, int> = 0>
+    template <typename T, typename U, std::enable_if_t<!std::is_enum<T>::value && !std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMaxValue(const char * itemName, T current, U expected)
     {
         if (current > expected)
@@ -252,13 +264,13 @@ class ConstraintsChecker
         return true;
     }
 
-    template <typename T, typename U, std::enable_if_t<std::is_enum<T>::value, int> = 0>
+    template <typename T, typename U, std::enable_if_t<std::is_enum<T>::value && !std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMaxValue(const char * itemName, T current, U expected)
     {
         return CheckConstraintMaxValue(itemName, chip::to_underlying(current), expected);
     }
 
-    template <typename T, typename U>
+    template <typename T, typename U, std::enable_if_t<!std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMaxValue(const char * itemName, chip::BitFlags<T> current, U expected)
     {
         if (current.Raw() > expected)
@@ -270,7 +282,19 @@ class ConstraintsChecker
         return true;
     }
 
-    template <typename T, typename U>
+    template <typename T, typename U, std::enable_if_t<!std::is_pointer<U>::value, int> = 0>
+    bool CheckConstraintMaxValue(const char * itemName, chip::BitMask<T> current, U expected)
+    {
+        if (current.Raw() > expected)
+        {
+            Exit(std::string(itemName) + " value > maxValue: " + std::to_string(current.Raw()) + " > " + std::to_string(expected));
+            return false;
+        }
+
+        return true;
+    }
+
+    template <typename T, typename U, std::enable_if_t<!std::is_pointer<U>::value, int> = 0>
     bool CheckConstraintMaxValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current, U expected)
     {
         if (current.IsNull())
@@ -345,6 +369,18 @@ class ConstraintsChecker
         return true;
     }
 
+    template <typename T>
+    bool CheckConstraintNotValue(const char * itemName, chip::BitMask<T> current, chip::BitMask<T> expected)
+    {
+        if (current == expected)
+        {
+            Exit(std::string(itemName) + " got unexpected value: " + std::to_string(current.Raw()));
+            return false;
+        }
+
+        return true;
+    }
+
     template <typename T, typename U>
     bool CheckConstraintNotValue(const char * itemName, chip::BitFlags<T> current, U expected)
     {
@@ -358,6 +394,19 @@ class ConstraintsChecker
         return true;
     }
 
+    template <typename T, typename U>
+    bool CheckConstraintNotValue(const char * itemName, chip::BitMask<T> current, U expected)
+    {
+        if (current.Raw() == expected)
+        {
+
+            Exit(std::string(itemName) + " got unexpected value: " + std::to_string(current.Raw()));
+            return false;
+        }
+
+        return true;
+    }
+
     template <typename T, typename U>
     bool CheckConstraintNotValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current, U expected)
     {
@@ -419,4 +468,46 @@ class ConstraintsChecker
         }
         return false;
     }
+
+    template <typename T, typename U>
+    bool CheckConstraintContains(const char * itemName, const chip::app::DataModel::DecodableList<T> & current, const U & expected)
+    {
+        auto iterValue = current.begin();
+        while (iterValue.Next())
+        {
+            auto currentValue = iterValue.GetValue();
+            if (currentValue == expected)
+            {
+                return true;
+            }
+        }
+
+        Exit(std::string(itemName) + " expect the value " + std::to_string(expected) + " but the list does not contains it.");
+        return false;
+    }
+
+    template <typename T, typename U>
+    bool CheckConstraintExcludes(const char * itemName, const chip::app::DataModel::DecodableList<T> & current, const U & expected)
+    {
+        auto iterValue = current.begin();
+        while (iterValue.Next())
+        {
+            auto currentValue = iterValue.GetValue();
+            if (currentValue == expected)
+            {
+                Exit(std::string(itemName) + " does not expect the value " + std::to_string(expected) +
+                     " but the list contains it.");
+                return false;
+            }
+        }
+
+        CHIP_ERROR err = iterValue.GetStatus();
+        if (CHIP_NO_ERROR != err)
+        {
+            Exit(std::string(chip::ErrorStr(err)));
+            return false;
+        }
+
+        return true;
+    }
 };
diff --git a/src/app/tests/suites/include/ValueChecker.h b/src/app/tests/suites/include/ValueChecker.h
index 9ea70c8b67bf20..d629626f4cd11d 100644
--- a/src/app/tests/suites/include/ValueChecker.h
+++ b/src/app/tests/suites/include/ValueChecker.h
@@ -94,6 +94,12 @@ class ValueChecker
         return CheckValue(itemName, current.Raw(), expected);
     }
 
+    template <typename T, typename U>
+    bool CheckValue(const char * itemName, chip::BitMask<T> current, U expected)
+    {
+        return CheckValue(itemName, current.Raw(), expected);
+    }
+
     // Allow an expected value that is a nullable wrapped around the actual
     // value (e.g. a SaveAs from reading a different attribute that has a value
     // space that includes null).  In that case we check that:
@@ -114,6 +120,12 @@ class ValueChecker
         return CheckValue(itemName, current.Raw(), expected.Raw());
     }
 
+    template <typename T>
+    bool CheckValue(const char * itemName, chip::BitMask<T> current, chip::BitMask<T> expected)
+    {
+        return CheckValue(itemName, current.Raw(), expected.Raw());
+    }
+
     template <typename T>
     bool CheckValuePresent(const char * itemName, const chip::Optional<T> & value)
     {
diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
index b41a4078fe48fa..0601716cc8e728 100644
--- a/src/app/tests/suites/tests.js
+++ b/src/app/tests/suites/tests.js
@@ -38,6 +38,9 @@ function getManualTests() {
     'Test_TC_DD_1_10',
     'Test_TC_DD_1_11',
     'Test_TC_DD_1_12',
+    'Test_TC_DD_1_13',
+    'Test_TC_DD_1_14',
+    'Test_TC_DD_1_15',
     'Test_TC_DD_2_1',
     'Test_TC_DD_2_2',
     'Test_TC_DD_3_1',
@@ -54,26 +57,30 @@ function getManualTests() {
     'Test_TC_DD_3_12',
     'Test_TC_DD_3_13',
     'Test_TC_DD_3_14',
-    'Test_TC_DD_4_1',
+    'Test_TC_DD_3_15',
+    'Test_TC_DD_3_16',
+    'Test_TC_DD_3_17',
+    'Test_TC_DD_3_18',
+    'Test_TC_DD_3_19',
+    'Test_TC_DD_3_20',
   ];
 
   const Groups = [
     'TestGroupDemoCommand',
     'TestGroupDemoConfig',
+    'Test_TC_GR_1_1',
+    'Test_TC_GR_2_1',
+    'Test_TC_GR_2_2',
+    'Test_TC_GR_2_3',
+    'Test_TC_GR_3_1',
+    'Test_TC_GR_3_2',
   ];
 
   const BulkDataExchangeProtocol = [
-    'Test_TC_BDX_1_1',
     'Test_TC_BDX_1_2',
-    'Test_TC_BDX_1_3',
     'Test_TC_BDX_1_4',
-    'Test_TC_BDX_1_5',
-    'Test_TC_BDX_1_6',
     'Test_TC_BDX_2_1',
     'Test_TC_BDX_2_2',
-    'Test_TC_BDX_2_3',
-    'Test_TC_BDX_2_4',
-    'Test_TC_BDX_2_5',
   ];
 
   const bridge = [
@@ -93,11 +100,14 @@ function getManualTests() {
   ];
 
   const DeviceManagement = [
+    'Test_TC_DM_1_1',
     'Test_TC_DM_1_2',
-    'Test_TC_DM_1_4',
-    'Test_TC_DM_2_1',
+    'Test_TC_DM_1_3',
+    'Test_TC_DM_2_2',
     'Test_TC_DM_2_4',
+    'Test_TC_DM_3_1',
     'Test_TC_DM_3_2',
+    'Test_TC_DM_3_3',
     'Test_TC_DM_3_4',
     'Test_TC_DM_4_1',
     'Test_TC_DM_4_2',
@@ -123,23 +133,28 @@ function getManualTests() {
   ];
 
   const DiagnosticsLogs = [
-    'Test_TC_Diag_Log_2_1',
-    'Test_TC_Diag_Log_2_2',
-    'Test_TC_Diag_Log_2_3',
+    'Test_TC_DLOG_1_1',
+    'Test_TC_DLOG_2_1',
+    'Test_TC_DLOG_2_2',
+    'Test_TC_DLOG_3_1',
   ];
 
   const Descriptor = [
     'Test_TC_DESC_1_1',
+    'Test_TC_DESC_2_1',
+    'Test_TC_DESC_2_2',
   ];
 
   const EthernetNetworkDiagnostics = [
-    'Test_TC_ETHDIAG_1_2',
+    'Test_TC_DGETH_1_1',
+    'Test_TC_DGETH_3_1',
+    'Test_TC_DGETH_3_2',
   ];
 
   const GeneralCommissioning = [
-    'Test_TC_GC_2_2',
-    'Test_TC_GC_2_3',
-    'Test_TC_GC_2_4',
+    'Test_TC_CGEN_2_2',
+    'Test_TC_CGEN_2_3',
+    'Test_TC_CGEN_2_4',
   ];
 
   const GeneralDiagnostics = [
@@ -168,6 +183,7 @@ function getManualTests() {
     'Test_TC_IDM_3_2',
     'Test_TC_IDM_4_1',
     'Test_TC_IDM_4_2',
+    'Test_TC_IDM_4_3',
     'Test_TC_IDM_5_1',
     'Test_TC_IDM_5_2',
     'Test_TC_IDM_6_1',
@@ -179,19 +195,32 @@ function getManualTests() {
 
   const MediaControl = [
     'Test_TC_MC_2_2',
+    'Test_TC_MC_3_7_1',
+    'Test_TC_MC_3_8_1',
+    'Test_TC_MC_3_9_1',
+    'Test_TC_MC_3_14',
+    'Test_TC_MC_3_15',
+    'Test_TC_MC_3_16',
+    'Test_TC_MC_3_17',
     'Test_TC_MC_4_1',
+    'Test_TC_MC_5_4',
+    'Test_TC_MC_5_5',
+    'Test_TC_MC_5_6',
     'Test_TC_MC_6_1',
     'Test_TC_MC_6_2',
     'Test_TC_MC_6_3',
     'Test_TC_MC_6_4',
-    'Test_TC_MC_8_2',
-    'Test_TC_MC_9_2',
-    'Test_TC_MC_10_2',
+    'Test_TC_MC_6_5',
+    'Test_TC_MC_6_7',
+    'Test_TC_MC_7_3',
+    'Test_TC_MC_7_4',
     'Test_TC_MC_10_3',
-    'Test_TC_MC_10_4',
     'Test_TC_MC_10_5',
-    'Test_TC_MC_10_6',
     'Test_TC_MC_10_7',
+    'Test_TC_MC_11_1',
+    'Test_TC_MC_11_2',
+    'Test_TC_MC_12_1',
+    'Test_TC_MC_12_2',
   ];
 
   const MultipleFabrics = [
@@ -199,8 +228,6 @@ function getManualTests() {
     'Test_TC_MF_1_2',
     'Test_TC_MF_1_7',
     'Test_TC_MF_1_8',
-    'Test_TC_MF_1_9',
-    'Test_TC_MF_1_10',
     'Test_TC_MF_1_11',
     'Test_TC_MF_1_12',
     'Test_TC_MF_1_13',
@@ -239,6 +266,7 @@ function getManualTests() {
     'Test_TC_SU_2_5',
     'Test_TC_SU_2_6',
     'Test_TC_SU_2_7',
+    'Test_TC_SU_2_8',
     'Test_TC_SU_3_1',
     'Test_TC_SU_3_2',
     'Test_TC_SU_3_3',
@@ -270,8 +298,10 @@ function getManualTests() {
   ];
 
   const WiFiNetworkDiagnostics = [
-    'Test_TC_WIFIDIAG_1_2',
-    'Test_TC_WIFIDIAG_2_1',
+    'Test_TC_DGWIFI_1_1',
+    'Test_TC_DGWIFI_2_2',
+    'Test_TC_DGWIFI_3_1',
+    'Test_TC_DGWIFI_3_2',
   ];
 
   const WindowCovering = [
@@ -280,6 +310,7 @@ function getManualTests() {
   ];
 
   const FlowMeasurement = [
+    'Test_TC_FLW_2_2',
     'Test_TC_FLW_3_1',
   ];
 
@@ -318,16 +349,11 @@ function getManualTests() {
   ];
 
   const DoorLock = [
+    'Test_TC_DL_1_1',
     'Test_TC_DL_2_1',
-    'Test_TC_DL_2_5',
     'Test_TC_DL_2_6',
-    'Test_TC_DL_2_7',
+    'Test_TC_DL_2_8',
     'Test_TC_DL_2_10',
-    'Test_TC_DL_2_13',
-    'Test_TC_DL_2_14',
-    'Test_TC_DL_2_15',
-    'Test_TC_DL_2_16',
-    'Test_TC_DL_2_17',
   ];
 
   const UserLabel = [
@@ -337,32 +363,14 @@ function getManualTests() {
   ];
 
   const LocalizationConfiguration = [
-    'Test_TC_LO_1_1',
+    'Test_TC_LCFG_1_1',
+    'Test_TC_LCFG_2_1',
+    'Test_TC_LCFG_3_1',
   ];
 
   const LevelControl = [
     'Test_TC_LVL_2_3',
-  ];
-
-  const NetworkCommissioning = [
-    'Test_TC_NC_1_1',
-    'Test_TC_NC_1_2',
-    'Test_TC_NC_1_3',
-    'Test_TC_NC_1_4',
-    'Test_TC_NC_1_5',
-    'Test_TC_NC_1_6',
-    'Test_TC_NC_1_7',
-    'Test_TC_NC_1_8',
-    'Test_TC_NC_1_9',
-    'Test_TC_NC_1_10',
-    'Test_TC_NC_1_11',
-    'Test_TC_NC_1_12',
-    'Test_TC_NC_1_13',
-    'Test_TC_NC_1_14',
-    'Test_TC_NC_1_15',
-    'Test_TC_NC_1_16',
-    'Test_TC_NC_1_17',
-    'Test_TC_NC_1_18',
+    'Test_TC_LVL_8_1',
   ];
 
   const OnOff = [
@@ -371,15 +379,18 @@ function getManualTests() {
   ];
 
   const RelativeHumidityMeasurement = [
+    'Test_TC_RH_2_2',
     'Test_TC_RH_3_1',
   ];
 
   const Switch = [
     'Test_TC_SWTCH_1_1',
+    'Test_TC_SWTCH_2_2',
     'Test_TC_SWTCH_3_1',
   ];
 
   const TemperatureMeasurement = [
+    'Test_TC_TM_2_2',
     'Test_TC_TM_3_1',
   ];
 
@@ -399,6 +410,37 @@ function getManualTests() {
     'Test_TC_DIAG_TH_NW_2_9',
   ];
 
+  const Actions = [
+    'Test_TC_ACT_1_1',
+    'Test_TC_ACT_2_1',
+    'Test_TC_ACT_2_2',
+    'Test_TC_ACT_3_1',
+  ];
+
+  const TimeFormatLocalization = [
+    'Test_TC_TFL_1_1',
+    'Test_TC_TFL_1_2',
+    'Test_TC_TFL_2_1',
+    'Test_TC_TFL_2_2',
+  ];
+
+  const UnitLocalization = [
+    'Test_TC_UL_1_1',
+    'Test_TC_UL_1_2',
+    'Test_TC_UL_2_1',
+    'Test_TC_UL_2_2',
+  ];
+
+  const FixedLabel = [
+    'Test_TC_FLABEL_1_1',
+    'Test_TC_FLABEL_2_1',
+    'Test_TC_FLABEL_2_2',
+  ];
+
+  const Binding = [
+    'Test_TC_BIND_1_1',
+    'Test_TC_BIND_2_1',
+  ];
 
   const tests = [
     DeviceDiscovery,
@@ -435,7 +477,6 @@ function getManualTests() {
     UserLabel,
     LocalizationConfiguration,
     LevelControl,
-    NetworkCommissioning,
     OnOff,
     RelativeHumidityMeasurement,
     Switch,
@@ -443,6 +484,11 @@ function getManualTests() {
     Thermostat,
     ThermostatUserConfiguration,
     ThreadNetworkDiagnostics,
+    Actions,
+    TimeFormatLocalization,
+    UnitLocalization,
+    FixedLabel,
+    Binding,
   ].flat(1);
 
   tests.disable = disable.bind(tests);
@@ -496,9 +542,7 @@ function getTests() {
   ];
 
   const DeviceManagement = [
-    'Test_TC_DM_1_1',
-    'Test_TC_DM_3_1',
-    'Test_TC_DM_2_2',
+    'Test_TC_DM_2_1',
   ];
 
   const ElectricalMeasurement = [
@@ -506,19 +550,18 @@ function getTests() {
   ];
 
   const EthernetNetworkDiagnostics = [
-    'Test_TC_ETHDIAG_1_1',
-    'Test_TC_ETHDIAG_2_1',
+    'Test_TC_DGETH_2_1',
+    'Test_TC_DGETH_2_2',
   ];
 
   const FlowMeasurement = [
     'Test_TC_FLW_1_1',
     'Test_TC_FLW_2_1',
-    'Test_TC_FLW_2_2',
   ];
 
   const GeneralCommissioning = [
-    'Test_TC_GC_1_1',
-    'Test_TC_GC_2_1',
+    'Test_TC_CGEN_1_1',
+    'Test_TC_CGEN_2_1',
   ];
 
   const Identify = [
@@ -566,7 +609,6 @@ function getTests() {
     'Test_TC_MC_1_11',
     'Test_TC_MC_1_12',
     'Test_TC_MC_2_1',
-    'Test_TC_MC_3_1',
     'Test_TC_MC_3_2',
     'Test_TC_MC_3_3',
     'Test_TC_MC_3_4',
@@ -598,6 +640,8 @@ function getTests() {
     'Test_TC_MF_1_4',
     'Test_TC_MF_1_5',
     'Test_TC_MF_1_6',
+    'Test_TC_MF_1_9',
+    'Test_TC_MF_1_10',
     'Test_TC_MF_1_15',
   ];
 
@@ -638,7 +682,6 @@ function getTests() {
   const RelativeHumidityMeasurement = [
     'Test_TC_RH_1_1',
     'Test_TC_RH_2_1',
-    'Test_TC_RH_2_2',
   ];
 
   const SecureChannel = [
@@ -647,13 +690,11 @@ function getTests() {
 
   const Switch = [
     'Test_TC_SWTCH_2_1',
-    'Test_TC_SWTCH_2_2',
   ];
 
   const TemperatureMeasurement = [
     'Test_TC_TM_1_1',
     'Test_TC_TM_2_1',
-    'Test_TC_TM_2_2',
   ];
 
   const Thermostat = [
@@ -676,8 +717,8 @@ function getTests() {
   ];
 
   const WiFiNetworkDiagnostics = [
-    'Test_TC_WIFIDIAG_1_1',
-    'Test_TC_WIFIDIAG_3_1',
+    'Test_TC_DGWIFI_2_1',
+    'Test_TC_DGWIFI_2_3',
   ];
 
   const WindowCovering = [
@@ -759,8 +800,9 @@ function getTests() {
     'Test_TC_DL_2_2',
     'Test_TC_DL_2_3',
     'Test_TC_DL_2_4',
-    'Test_TC_DL_2_8',
-    'Test_TC_DL_2_11',
+    'Test_TC_DL_2_5',
+    'Test_TC_DL_2_7',
+    'Test_TC_DL_2_9',
   ];
 
   const Groups = [
diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp
index 20f3b0c476942b..d02463bc51d30a 100644
--- a/src/app/util/DataModelHandler.cpp
+++ b/src/app/util/DataModelHandler.cpp
@@ -29,10 +29,6 @@
 #endif
 #include <lib/support/logging/CHIPLogging.h>
 
-#ifdef EMBER_AF_PLUGIN_IAS_ZONE_SERVER
-void emberAfPluginIasZoneServerStackStatusCallback(EmberStatus status);
-#endif
-
 using namespace ::chip;
 
 void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeManager)
@@ -41,13 +37,5 @@ void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeManager)
     ChipLogProgress(Zcl, "Using ZAP configuration...");
     emberAfEndpointConfigure();
     emberAfInit(exchangeManager);
-
-#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER)
-    EmberStatus status = EMBER_NETWORK_UP;
-#endif
-
-#ifdef EMBER_AF_PLUGIN_IAS_ZONE_SERVER
-    emberAfPluginIasZoneServerStackStatusCallback(status);
-#endif
 #endif
 }
diff --git a/src/app/util/af-enums.h b/src/app/util/af-enums.h
index 8bfd1019349ecc..6bcf85cd189999 100644
--- a/src/app/util/af-enums.h
+++ b/src/app/util/af-enums.h
@@ -70,5 +70,7 @@ enum EmberAfStatus : uint8_t
     EMBER_ZCL_STATUS_NEEDS_TIMED_INTERACTION  = 0xC6,
     EMBER_ZCL_STATUS_UNSUPPORTED_EVENT        = 0xC7,
     EMBER_ZCL_STATUS_PATHS_EXHAUSTED          = 0xC8,
-    EMBER_ZCL_STATUS_WRITE_IGNORED            = 0xC9
+    EMBER_ZCL_STATUS_TIMED_REQUEST_MISMATCH   = 0xC9,
+    EMBER_ZCL_STATUS_FAILSAFE_REQUIRED        = 0xCA,
+    EMBER_ZCL_STATUS_WRITE_IGNORED            = 0xF0, // NOT SPEC COMPLIANT FOR TEST ONLY
 };
diff --git a/src/app/util/af-event.cpp b/src/app/util/af-event.cpp
index 31a87bae250fa5..d2d14987027638 100644
--- a/src/app/util/af-event.cpp
+++ b/src/app/util/af-event.cpp
@@ -66,10 +66,6 @@ struct EmberEventData
 // Globals
 
 #ifdef EMBER_AF_GENERATED_EVENT_CODE
-// Stubs for IAS Zone Client Cluster issue #2057
-EmberEventControl emberAfPluginIasZoneClientStateMachineEventControl;
-void emberAfPluginIasZoneClientStateMachineEventHandler(void){};
-
 EMBER_AF_GENERATED_EVENT_CODE
 #endif // EMBER_AF_GENERATED_EVENT_CODE
 
diff --git a/src/app/util/af.h b/src/app/util/af.h
index 1749168135e435..c46e33f1fed0ff 100644
--- a/src/app/util/af.h
+++ b/src/app/util/af.h
@@ -68,7 +68,6 @@
 
 #include <app/util/af-types.h>
 
-#include <app/util/client-api.h>
 #include <app/util/debug-printing.h>
 #include <app/util/ember-print.h>
 
diff --git a/src/app/util/attribute-storage-null-handling.h b/src/app/util/attribute-storage-null-handling.h
index 000fa8cb40483d..e1167e6d57a1e7 100644
--- a/src/app/util/attribute-storage-null-handling.h
+++ b/src/app/util/attribute-storage-null-handling.h
@@ -18,6 +18,8 @@
 #pragma once
 
 #include <lib/core/CHIPTLV.h>
+#include <lib/support/BitFlags.h>
+#include <lib/support/BitMask.h>
 #include <lib/support/TypeTraits.h>
 
 #include <limits>
@@ -171,6 +173,15 @@ struct NumericAttributeTraits<BitFlags<T>>
     static uint8_t * ToAttributeStoreRepresentation(StorageType & value) { return reinterpret_cast<uint8_t *>(&value); }
 };
 
+template <typename T>
+struct NumericAttributeTraits<BitMask<T>> : public NumericAttributeTraits<BitFlags<T>>
+{
+    using StorageType = T;
+    using WorkingType = BitMask<T>;
+
+    static constexpr WorkingType StorageToWorking(StorageType storageValue) { return WorkingType(storageValue); }
+};
+
 template <>
 struct NumericAttributeTraits<bool>
 {
diff --git a/src/app/util/client-api.cpp b/src/app/util/client-api.cpp
deleted file mode 100644
index 79f1c7243b694e..00000000000000
--- a/src/app/util/client-api.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/**
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *
- *    Copyright (c) 2020 Silicon Labs
- *
- *    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
- * @brief
- *******************************************************************************
- ******************************************************************************/
-
-#include "app/util/common.h"
-#include <app/util/client-api.h>
-#include <app/util/util.h>
-#include <stdarg.h>
-
-using namespace chip;
-
-uint8_t * emAfZclBuffer   = nullptr;
-uint16_t emAfZclBufferLen = 0;
-
-// Pointer to where this API should put the length
-uint16_t * emAfResponseLengthPtr = nullptr;
-
-// Pointer to where the API should put the cluster ID
-EmberApsFrame * emAfCommandApsFrame = nullptr;
-
-/////////////////
-
-// Method that fills in the buffer.
-// It returns number of bytes filled
-// and 0 on error.
-static uint16_t vFillBuffer(uint8_t * buffer, uint16_t bufferLen, uint8_t frameControl, uint16_t manufacturerCode,
-                            CommandId commandId, const char * format, va_list argPointer)
-{
-    uint64_t value;
-    uint8_t valueLen;
-    uint8_t * data;
-    uint16_t dataLen;
-    uint8_t i;
-    uint16_t bytes = 0;
-
-    // The destination buffer must be at least large enough to hold the ZCL
-    // overhead: frame control, manufacturer code (if applicable), sequence
-    // number, and command id.  If it is, add these in order.
-    if (bufferLen < EMBER_AF_ZCL_OVERHEAD ||
-        (manufacturerCode != EMBER_AF_NULL_MANUFACTURER_CODE && bufferLen < EMBER_AF_ZCL_MANUFACTURER_SPECIFIC_OVERHEAD))
-    {
-        emberAfDebugPrintln("ERR: Buffer too short for ZCL header");
-        return 0;
-    }
-    if (manufacturerCode != EMBER_AF_NULL_MANUFACTURER_CODE)
-    {
-        frameControl |= ZCL_MANUFACTURER_SPECIFIC_MASK;
-    }
-    buffer[bytes++] = frameControl;
-    if (manufacturerCode != EMBER_AF_NULL_MANUFACTURER_CODE)
-    {
-        buffer[bytes++] = EMBER_LOW_BYTE(manufacturerCode);
-        buffer[bytes++] = EMBER_HIGH_BYTE(manufacturerCode);
-    }
-    buffer[bytes++] = emberAfNextSequence();
-    buffer[bytes++] = EMBER_BYTE_0(commandId);
-    buffer[bytes++] = EMBER_BYTE_1(commandId);
-    buffer[bytes++] = EMBER_BYTE_2(commandId);
-    buffer[bytes++] = EMBER_BYTE_3(commandId);
-
-    // Each argument comes in as an integer value, a pointer to a buffer, or a
-    // pointer to a buffer followed by an integer length.
-    for (i = 0; format[i] != 0; i++)
-    {
-        char cmd;
-        value    = 0;
-        valueLen = 0;
-        data     = nullptr;
-        cmd      = format[i];
-        if (cmd <= 's')
-        {
-            //  0--9, A--G, L, S, b, l, and s all have a pointer to a buffer.  The
-            // length of that buffer is implied by 0--9 and A--G (0 to 16 bytes).
-            // For L, S, and b, a separate integer specifies the length.  That length
-            // will precede the data in the destination buffer for L and S, which
-            // turns them into regular ZigBee strings.  In this case, care must be
-            // taken to account for invalid strings, which have length 0xFFFF or 0xFF
-            // for L and S respectively.  In the case of invalid strings, the length
-            // byte(s) are copied to the destination buffer but the string itself is
-            // not.  Finally, l and s are just ZigBee strings and the length of the
-            // string data is contained within the buffer itself and the entire
-            // buffer is copied as is to the destination buffer.  Note that
-            // emberAf(Long)StringLength handles invalid strings, but it does not
-            // include the length byte(s) in the total length, so the overhead
-            // must be maually accounted for when copying.
-            data     = (uint8_t *) va_arg(argPointer, uint8_t *);
-            valueLen = 0;
-            if (cmd == 'L' || cmd == 'S' || cmd == 'b')
-            {
-                dataLen = (uint16_t) va_arg(argPointer, int);
-                if (cmd == 'L')
-                {
-                    value    = dataLen;
-                    valueLen = (value == 0xFFFF ? 0 : 2);
-                }
-                else if (cmd == 'S')
-                {
-                    value    = (uint8_t) dataLen;
-                    valueLen = (value == 0xFF ? 0 : 1);
-                }
-                else
-                {
-                    // MISRA requires ..else if.. to have terminating else.
-                }
-            }
-            else if (cmd == 'l')
-            {
-                dataLen = static_cast<uint16_t>(emberAfLongStringLength(data) + 2);
-            }
-            else if (cmd == 's')
-            {
-                dataLen = static_cast<uint16_t>(emberAfStringLength(data) + 1);
-            }
-            else if ('0' <= cmd && cmd <= '9')
-            {
-                dataLen = static_cast<uint16_t>(cmd - '0');
-            }
-            else if ('A' <= cmd && cmd <= 'G')
-            {
-                dataLen = static_cast<uint16_t>(cmd - 'A' + 10);
-            }
-            else
-            {
-                emberAfDebugPrintln("ERR: Unknown format '%c'", cmd);
-                return 0;
-            }
-        }
-        else
-        {
-            // u, v, x, w, and y are one-, two-, three-, four-byte or eight-byte integers.  u and v
-            // must be extracted as an int while x and w come through as an uint32_t, y as a uint64_t.
-            // In all cases, the value is copied to the destination buffer in little-
-            // endian format.
-            dataLen = 0;
-            if (cmd == 'u')
-            {
-                valueLen = 1;
-            }
-            else if (cmd == 'v')
-            {
-                valueLen = 2;
-            }
-            else if (cmd == 'x')
-            {
-                valueLen = 3;
-            }
-            else if (cmd == 'w')
-            {
-                valueLen = 4;
-            }
-            else if (cmd == 'y')
-            {
-                valueLen = 8;
-            }
-            else
-            {
-                emberAfDebugPrintln("ERR: Unknown format '%c'", cmd);
-                return 0;
-            }
-            if (valueLen <= 2)
-            {
-                value = static_cast<uint64_t>(va_arg(argPointer, int));
-            }
-            else if (valueLen <= 4)
-            {
-                value = static_cast<uint64_t>(va_arg(argPointer, uint32_t));
-            }
-            else
-            {
-                value = va_arg(argPointer, uint64_t);
-            }
-        }
-
-        // The destination buffer must be at least as large as the running total
-        // plus the length of the integer value (if applicable) plus the length of
-        // the data (if applicable).
-        if (bufferLen < bytes + dataLen + valueLen)
-        {
-            emberAfDebugPrintln("ERR: Buffer too short for %d bytes for format '%c'", dataLen + valueLen, cmd);
-            return 0;
-        }
-
-        // If there is an integer value, add it to destination buffer in little-
-        // endian format.
-        for (; 0 < valueLen; valueLen--)
-        {
-            buffer[bytes++] = EMBER_LOW_BYTE(value);
-            value           = value >> 8;
-        }
-
-        // Finally, if there is data, add it to the destination buffer as is.  If
-        // the data length is zero, data may actually be NULL.  Even if the length
-        // argument is zero, passing NULL as either the source or destination to
-        // memcpy is invalid and the behavior is undefined.  We avoid that with an
-        // explicit check.
-        if (dataLen != 0)
-        {
-            if (data == nullptr)
-            {
-                emberAfDebugPrintln("ERR: Missing data for %d bytes for format '%c'", dataLen, cmd);
-                return 0;
-            }
-            memcpy(buffer + bytes, data, dataLen);
-            bytes = static_cast<uint16_t>(bytes + dataLen);
-        }
-    }
-
-    return bytes;
-}
-
-////////////////////// Public API ////////////////////////
-
-void emberAfSetExternalBuffer(uint8_t * buffer, uint16_t bufferLen, uint16_t * lenPtr, EmberApsFrame * apsFrame)
-{
-    emAfZclBuffer         = buffer;
-    emAfZclBufferLen      = bufferLen;
-    emAfResponseLengthPtr = lenPtr;
-    emAfCommandApsFrame   = apsFrame;
-}
-
-uint16_t emberAfFillExternalBuffer(uint8_t frameControl, ClusterId clusterId, CommandId commandId, const char * format, ...)
-{
-    uint16_t returnValue;
-    va_list argPointer;
-
-    va_start(argPointer, format);
-    returnValue =
-        vFillBuffer(emAfZclBuffer, emAfZclBufferLen, frameControl, EMBER_AF_NULL_MANUFACTURER_CODE, commandId, format, argPointer);
-    va_end(argPointer);
-    *emAfResponseLengthPtr         = returnValue;
-    emAfCommandApsFrame->clusterId = clusterId;
-    emAfCommandApsFrame->options   = EMBER_AF_DEFAULT_APS_OPTIONS;
-    return returnValue;
-}
-
-EmberApsFrame * emberAfGetCommandApsFrame(void)
-{
-    return emAfCommandApsFrame;
-}
-
-void emberAfSetCommandEndpoints(EndpointId sourceEndpoint, EndpointId destinationEndpoint)
-{
-    emAfCommandApsFrame->sourceEndpoint      = sourceEndpoint;
-    emAfCommandApsFrame->destinationEndpoint = destinationEndpoint;
-}
diff --git a/src/app/util/client-api.h b/src/app/util/client-api.h
deleted file mode 100644
index 9488eca4399a4b..00000000000000
--- a/src/app/util/client-api.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *
- *    Copyright (c) 2020 Silicon Labs
- *
- *    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
- * @brief API for generating command buffer.
- *******************************************************************************
- ******************************************************************************/
-
-#pragma once
-
-#include <app/util/af-types.h>
-
-/*
-   @addtogroup command
-   @{
- */
-
-/** @name Client API functions */
-// @{
-
-/**
- * @brief Function that fills in the buffer with command.
- *
- * Fills the outgoing ZCL buffer and returns the number
- * of bytes used in a buffer. Uses the buffers that
- * were previously set with emberAfSetExternalBuffer.
- *
- * @param frameControl Byte used for frame control.
- * @param clusterId Cluster ID of message.
- * @param commandId Command ID of message.
- * @param format String format for further arguments to the function.
- *   Format values are:
- *     - '0' - '9' and 'A' - 'G': Pointer to a buffer containing 0--16 raw
- *            bytes.  The data is copied as is to the destination buffer.
- *     - 'u': uint8_t.
- *     - 'v': uint16_t. The bytes are copied in little-endian format to the
- *            destination buffer.
- *     - 'x': int24u. The bytes are copied in little-endian format to the
- *            destination buffer.
- *     - 'w': uint32_t. The bytes are copied in little-endian format to the
- *            destination buffer.
- *     - 'l': Pointer to a buffer containing a ZigBee long string, with the
- *            first two bytes of the buffer specifying the length of the string
- *            data in little-endian format. The length bytes and the string
- *            itself are both included as is in the destination buffer.
- *     - 's': Pointer to a buffer containing a ZigBee string, with the first
- *            byte of the buffer specifying the length of the string data. The
- *            length byte and the string itself are both included as is in the
- *            destination buffer.
- *     - 'L': Pointer to a buffer containing a long string followed by an
- *            uint16_t specifying the length of the string data. The length
- *            bytes in little-endian format will precede the string itself in
- *            the destination buffer.
- *     - 'S': Pointer to a buffer containing a string followed by an uint8_t
- *            specifying the length of the string data. The length byte will
- *            precede the string itself in the destination buffer.
- *     - 'b': Pointer to a buffer containing a sequence of raw bytes followed
- *            by an uint16_t specifying the length of the data. The data is
- *            copied as is to the destination buffer. The length is not
- *            included.
- */
-uint16_t emberAfFillExternalBuffer(uint8_t frameControl, chip::ClusterId clusterId, chip::CommandId commandId, const char * format,
-                                   ...);
-
-/**
- * @brief Function that registers the buffer to use with the fill function.
- * Registers the buffer for use with the emberAfFillExternalBuffer function.
- *
- * @param buffer Main buffer for constructing message.
- * @param bufferLen Available length of buffer.
- * @param responseLengthPtr Location where length of message will be written into.
- * @param apsFramePtr Location where APS frame data will be written.
- */
-void emberAfSetExternalBuffer(uint8_t * buffer, uint16_t bufferLen, uint16_t * responseLengthPtr, EmberApsFrame * apsFramePtr);
-
-#if !defined(DOXYGEN_SHOULD_SKIP_THIS)
-// The buffer used for filling ZCL Messages.
-extern uint8_t * emAfZclBuffer;
-// Max length of the buffer.
-extern uint16_t emAfZclBufferLen;
-// Pointer to where this API should put the length.
-extern uint16_t * emAfResponseLengthPtr;
-// The APS frame accompanying the ZCL message.
-extern EmberApsFrame * emAfCommandApsFrame;
-#endif
-
-// Generated macros.
-
-#define emberAfAppendToExternalBuffer(...) emberAfPutBlockInResp(__VA_ARGS__)
-
-/** @} END Client API functions */
-
-/** @} END addtogroup
- */
diff --git a/src/app/util/debug-printing.h b/src/app/util/debug-printing.h
index 43852fceda4068..ced7cd1c6d2176 100644
--- a/src/app/util/debug-printing.h
+++ b/src/app/util/debug-printing.h
@@ -1722,75 +1722,6 @@
 #define emberAfSodiumConcentrationMeasurementClusterPrintString(buffer)
 #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER)
 
-// Printing macros for cluster: IAS Zone
-#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IAS_ZONE_CLUSTER)
-#define emberAfIasZoneClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_IAS_ZONE_CLUSTER, __VA_ARGS__)
-#define emberAfIasZoneClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_IAS_ZONE_CLUSTER, __VA_ARGS__)
-// Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary.
-#define emberAfIasZoneClusterFlush()
-#define emberAfIasZoneClusterDebugExec(x)                                                                                          \
-    if (emberAfPrintEnabled(EMBER_AF_PRINT_IAS_ZONE_CLUSTER))                                                                      \
-    {                                                                                                                              \
-        x;                                                                                                                         \
-    }
-#define emberAfIasZoneClusterPrintBuffer(buffer, len, withSpace)                                                                   \
-    emberAfPrintBuffer(EMBER_AF_PRINT_IAS_ZONE_CLUSTER, (buffer), (len), (withSpace))
-#define emberAfIasZoneClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_IAS_ZONE_CLUSTER, (buffer))
-#else
-#define emberAfIasZoneClusterPrint(...)
-#define emberAfIasZoneClusterPrintln(...)
-#define emberAfIasZoneClusterFlush()
-#define emberAfIasZoneClusterDebugExec(x)
-#define emberAfIasZoneClusterPrintBuffer(buffer, len, withSpace)
-#define emberAfIasZoneClusterPrintString(buffer)
-#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IAS_ZONE_CLUSTER)
-
-// Printing macros for cluster: IAS ACE
-#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IAS_ACE_CLUSTER)
-#define emberAfIasAceClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_IAS_ACE_CLUSTER, __VA_ARGS__)
-#define emberAfIasAceClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_IAS_ACE_CLUSTER, __VA_ARGS__)
-// Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary.
-#define emberAfIasAceClusterFlush()
-#define emberAfIasAceClusterDebugExec(x)                                                                                           \
-    if (emberAfPrintEnabled(EMBER_AF_PRINT_IAS_ACE_CLUSTER))                                                                       \
-    {                                                                                                                              \
-        x;                                                                                                                         \
-    }
-#define emberAfIasAceClusterPrintBuffer(buffer, len, withSpace)                                                                    \
-    emberAfPrintBuffer(EMBER_AF_PRINT_IAS_ACE_CLUSTER, (buffer), (len), (withSpace))
-#define emberAfIasAceClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_IAS_ACE_CLUSTER, (buffer))
-#else
-#define emberAfIasAceClusterPrint(...)
-#define emberAfIasAceClusterPrintln(...)
-#define emberAfIasAceClusterFlush()
-#define emberAfIasAceClusterDebugExec(x)
-#define emberAfIasAceClusterPrintBuffer(buffer, len, withSpace)
-#define emberAfIasAceClusterPrintString(buffer)
-#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IAS_ACE_CLUSTER)
-
-// Printing macros for cluster: IAS WD
-#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IAS_WD_CLUSTER)
-#define emberAfIasWdClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_IAS_WD_CLUSTER, __VA_ARGS__)
-#define emberAfIasWdClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_IAS_WD_CLUSTER, __VA_ARGS__)
-// Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary.
-#define emberAfIasWdClusterFlush()
-#define emberAfIasWdClusterDebugExec(x)                                                                                            \
-    if (emberAfPrintEnabled(EMBER_AF_PRINT_IAS_WD_CLUSTER))                                                                        \
-    {                                                                                                                              \
-        x;                                                                                                                         \
-    }
-#define emberAfIasWdClusterPrintBuffer(buffer, len, withSpace)                                                                     \
-    emberAfPrintBuffer(EMBER_AF_PRINT_IAS_WD_CLUSTER, (buffer), (len), (withSpace))
-#define emberAfIasWdClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_IAS_WD_CLUSTER, (buffer))
-#else
-#define emberAfIasWdClusterPrint(...)
-#define emberAfIasWdClusterPrintln(...)
-#define emberAfIasWdClusterFlush()
-#define emberAfIasWdClusterDebugExec(x)
-#define emberAfIasWdClusterPrintBuffer(buffer, len, withSpace)
-#define emberAfIasWdClusterPrintString(buffer)
-#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IAS_WD_CLUSTER)
-
 // Printing macros for cluster: Generic Tunnel
 #if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER)
 #define emberAfGenericTunnelClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER, __VA_ARGS__)
diff --git a/src/app/util/ember-print.cpp b/src/app/util/ember-print.cpp
index 09f53c1930f0a5..9f863b42fa3716 100644
--- a/src/app/util/ember-print.cpp
+++ b/src/app/util/ember-print.cpp
@@ -29,9 +29,10 @@ bool emberAfPrintReceivedMessages = true;
 
 using namespace chip::Logging;
 
+#if CHIP_PROGRESS_LOGGING
+
 void emberAfPrint(int category, const char * format, ...)
 {
-#if _CHIP_USE_LOGGING
     if (format != nullptr)
     {
         va_list args;
@@ -39,13 +40,11 @@ void emberAfPrint(int category, const char * format, ...)
         chip::Logging::LogV(chip::Logging::kLogModule_Zcl, chip::Logging::kLogCategory_Progress, format, args);
         va_end(args);
     }
-#endif
 }
 
 #if !CHIP_PW_TOKENIZER_LOGGING
 void emberAfPrintln(int category, const char * format, ...)
 {
-#if _CHIP_USE_LOGGING
     if (format != nullptr)
     {
         va_list args;
@@ -53,7 +52,6 @@ void emberAfPrintln(int category, const char * format, ...)
         chip::Logging::LogV(chip::Logging::kLogModule_Zcl, chip::Logging::kLogCategory_Progress, format, args);
         va_end(args);
     }
-#endif
 }
 #endif
 
@@ -101,3 +99,5 @@ void emberAfPrintString(int category, const uint8_t * string)
 {
     emberAfPrint(category, "%.*s", emberAfStringLength(string), string + 1);
 }
+
+#endif // CHIP_PROGRESS_LOGGING
diff --git a/src/app/util/ember-print.h b/src/app/util/ember-print.h
index 829cd90e754c3b..a456adbf15d3a4 100644
--- a/src/app/util/ember-print.h
+++ b/src/app/util/ember-print.h
@@ -27,18 +27,24 @@
  * @brief Prints a log message
  * @param category - Currently ignored as zcl categories do not map to chip categories. Defaults to kLogCategory_Progress
  * @param format - Format string to print
- * */
+ */
+#if CHIP_PROGRESS_LOGGING
 void emberAfPrint(int category, const char * format, ...) ENFORCE_FORMAT(2, 3);
+#else
+#define emberAfPrint(...) ((void) 0)
+#endif
 
 /**
  * @brief Prints a log followed by new line line
  * @param category - Currently ignored as zcl categories do not map to chip categories. Defaults to kLogCategory_Progress
  * @param format - Format string to print
- * */
+ */
 #if CHIP_PW_TOKENIZER_LOGGING
 #define emberAfPrintln(MOD, MSG, ...) ChipLogProgress(Zcl, MSG, __VA_ARGS__);
-#else
+#elif CHIP_PROGRESS_LOGGING
 void emberAfPrintln(int category, const char * format, ...) ENFORCE_FORMAT(2, 3);
+#else
+#define emberAfPrintln(...) ((void) 0)
 #endif
 
 /**
@@ -47,12 +53,20 @@ void emberAfPrintln(int category, const char * format, ...) ENFORCE_FORMAT(2, 3)
  * @param buffer - Buffer to print.
  * @param length - Length of buffer
  * @param withSpace - Pass in true if a space should be printed between each byte.
- * */
+ */
+#if CHIP_PROGRESS_LOGGING
 void emberAfPrintBuffer(int category, const uint8_t * buffer, uint16_t length, bool withSpace);
+#else
+#define emberAfPrintBuffer(...) ((void) 0)
+#endif
 
 /**
  * @brief Prints a strings
  * @param category - Currently ignored as zcl categories do not map to chip categories. Defaults to kLogCategory_Progress.
  * @param string - Buffer to print as a string
- * */
+ */
+#if CHIP_PROGRESS_LOGGING
 void emberAfPrintString(int category, const uint8_t * string);
+#else
+#define emberAfPrintString(...) ((void) 0)
+#endif
diff --git a/src/app/util/time-util.h b/src/app/util/time-util.h
index 34646d738a9720..804a7f44ebef78 100644
--- a/src/app/util/time-util.h
+++ b/src/app/util/time-util.h
@@ -103,12 +103,6 @@ uint32_t emberAfGetUtcFromTimeStruct(EmberAfTimeStruct * time);
  */
 uint8_t emberAfGetWeekdayFromUtc(uint32_t utcTime);
 
-/*
- * @brief Prints out a human readable date form from the given ZCL data type.
- */
-void emberAfPrintDate(const EmberAfDate * date);
-void emberAfPrintDateln(const EmberAfDate * date);
-
 /**
  * @brief Sets current time.
  * Convenience function for setting the time to a value.
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
index 54239e8e55d9d0..02d68a315fa3d2 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -74,8 +74,8 @@ uint32_t afNumPktsSent;
 #endif
 
 const EmberAfClusterName zclClusterNames[] = {
-    CLUSTER_IDS_TO_NAMES                                               // defined in print-cluster.h
-    { ZCL_NULL_CLUSTER_ID, EMBER_AF_NULL_MANUFACTURER_CODE, nullptr }, // terminator
+    CLUSTER_IDS_TO_NAMES              // defined in print-cluster.h
+    { ZCL_NULL_CLUSTER_ID, nullptr }, // terminator
 };
 
 // A pointer to the current command being processed
@@ -210,9 +210,6 @@ void emberAfInit(chip::Messaging::ExchangeManager * exchangeMgr)
 
     memset(afDeviceEnabled, true, emberAfEndpointCount());
 
-    // Set up client API buffer.
-    emberAfSetExternalBuffer(appResponseData, EMBER_AF_RESPONSE_BUFFER_LEN, &appResponseLength, &emberAfResponseApsFrame);
-
     MATTER_PLUGINS_INIT
 
     emAfCallInits();
diff --git a/src/app/util/util.h b/src/app/util/util.h
index 2362d217304387..4d8910a15d4bb8 100644
--- a/src/app/util/util.h
+++ b/src/app/util/util.h
@@ -74,8 +74,7 @@
 // Cluster name structure
 typedef struct
 {
-    uint16_t id;
-    uint16_t mfgCode;
+    chip::ClusterId id;
     const char * name;
 } EmberAfClusterName;
 
diff --git a/src/app/zap-templates/README.md b/src/app/zap-templates/README.md
index 52fc2b6344f26b..ccc9b5dae9c85b 100644
--- a/src/app/zap-templates/README.md
+++ b/src/app/zap-templates/README.md
@@ -8,6 +8,10 @@ This directory contains generation templates for ZAP, ZCL Advanced Platform.
 
 ### How to configure an application
 
+Before running ZAP, you need to have [npm](https://www.npmjs.com/) installed.
+The best way is to simply download latest install of
+[node](https://nodejs.org/en/download/) and you will get npm.
+
 Run ZAP with UI to configure endpoints and clusters
 
 ```
@@ -20,6 +24,8 @@ or
 ./scripts/tools/zap/run_zaptool.sh <path to *.zap file>
 ```
 
+## Generating Files
+
 ### How to generate files for all applications
 
 When any of the `.zapt` templates has been changed, all examples applications
@@ -51,6 +57,16 @@ the command is:
 ./scripts/tools/zap/generate.py examples/lighting-app/lighting-common/lighting-app.zap -o zzz_generated/lighting-app/zap-generated
 ```
 
+### Note
+
+If you are encountering issues while generating zap files, try running the
+following commands
+
+```
+source ./scripts/activate.sh
+./scripts/tools/zap/run_zaptool.sh
+```
+
 ### How to generate files for a single application using custom templates
 
 An application may use some custom templates to generate additional files.
diff --git a/src/app/zap-templates/common/ClusterTestGeneration.js b/src/app/zap-templates/common/ClusterTestGeneration.js
index f750ada84566ef..8dbeb696c2f0d5 100644
--- a/src/app/zap-templates/common/ClusterTestGeneration.js
+++ b/src/app/zap-templates/common/ClusterTestGeneration.js
@@ -48,6 +48,8 @@ const kPICSName          = 'PICS';
 const kSaveAsName        = 'saveAs';
 const kFabricFiltered    = 'fabricFiltered';
 
+const kHexPrefix = 'hex:';
+
 class NullObject {
   toString()
   {
@@ -826,6 +828,33 @@ function isLiteralNull(value, options)
   return (value === null) || (value instanceof NullObject);
 }
 
+function isHexString(value)
+{
+  return value && value.startsWith(kHexPrefix);
+}
+
+function octetStringFromHexString(value)
+{
+  const hexString = value.substring(kHexPrefix.length);
+
+  if (hexString.length % 2) {
+    throw new Error("The provided hexadecimal string contains an even number of characters");
+  }
+
+  if (!(/^[0-9a-fA-F]+$/.test(hexString))) {
+    throw new Error("The provided hexadecimal string contains invalid hexadecimal character.");
+  }
+
+  const bytes = hexString.match(/(..)/g);
+  return bytes.map(byte => '\\x' + byte).join('');
+}
+
+function octetStringLengthFromHexString(value)
+{
+  const hexString = value.substring(kHexPrefix.length);
+  return (hexString.length / 2);
+}
+
 function octetStringEscapedForCLiteral(value)
 {
   // Escape control characters, things outside the ASCII range, and single
@@ -969,6 +998,18 @@ async function chip_tests_only_cluster_response_parameters(options)
   return asBlocks.call(this, Promise.resolve(this.arguments), options);
 }
 
+function chip_tests_iterate_expected_list(values, options)
+{
+  values = values.map(value => {
+    return {
+      global: this.global, parent: this.parent, name: this.name, type: this.type, isArray: this.isArray,
+          isNullable: this.isNullable, value: value,
+    }
+  });
+
+  return asBlocks.call(this, Promise.resolve(values), options);
+}
+
 //
 // Module exports
 //
@@ -996,3 +1037,7 @@ exports.chip_tests_only_cluster_commands            = chip_tests_only_cluster_co
 exports.chip_tests_only_cluster_command_parameters  = chip_tests_only_cluster_command_parameters;
 exports.chip_tests_only_cluster_responses           = chip_tests_only_cluster_responses;
 exports.chip_tests_only_cluster_response_parameters = chip_tests_only_cluster_response_parameters;
+exports.isHexString                                 = isHexString;
+exports.octetStringLengthFromHexString              = octetStringLengthFromHexString;
+exports.octetStringFromHexString                    = octetStringFromHexString;
+exports.chip_tests_iterate_expected_list            = chip_tests_iterate_expected_list;
diff --git a/src/app/zap-templates/partials/cluster-objects-attribute-typeinfo.zapt b/src/app/zap-templates/partials/cluster-objects-attribute-typeinfo.zapt
new file mode 100644
index 00000000000000..04388e8b1a3844
--- /dev/null
+++ b/src/app/zap-templates/partials/cluster-objects-attribute-typeinfo.zapt
@@ -0,0 +1,26 @@
+struct TypeInfo {
+{{! forceNotOptional=true because the optionality is on the attribute
+    itself, but we want just the type of the attribute. }}
+{{#if entryType}}
+    using Type = {{zapTypeToEncodableClusterObjectType entryType ns=ns forceNotOptional=true}};
+    using DecodableType = {{zapTypeToDecodableClusterObjectType entryType ns=ns forceNotOptional=true}};
+    using DecodableArgType = {{zapTypeToDecodableClusterObjectType entryType ns=ns forceNotOptional=true isArgument=true}};
+{{else}}
+    using Type = {{zapTypeToEncodableClusterObjectType type ns=ns forceNotOptional=true}};
+    using DecodableType = {{zapTypeToDecodableClusterObjectType type ns=ns forceNotOptional=true}};
+    using DecodableArgType = {{zapTypeToDecodableClusterObjectType type ns=ns forceNotOptional=true isArgument=true}};
+{{/if}}
+
+    {{#if clusterRef}}
+    static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
+    {{/if}}
+    static constexpr AttributeId GetAttributeId() { return Attributes::{{asUpperCamelCase label}}::Id; }
+    static constexpr bool MustUseTimedWrite() { return {{mustUseTimedWrite}}; }
+    {{#unless isArray}}
+    {{#if (isString type)}}
+    {{#if maxLength}}
+    static constexpr size_t MaxLength() { return {{maxLength}}; }
+    {{/if}}
+    {{/if}}
+    {{/unless}}
+};
diff --git a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt
index 9053c1768b7de4..2f0b429f6a3337 100644
--- a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt
+++ b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt
@@ -36,7 +36,7 @@ while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR)
     if (argExists[currentDecodeTagId])
     {
       ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag()));
-      TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+      TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB;
       break;
     }
     else
diff --git a/src/app/zap-templates/templates/app/MatterIDL.zapt b/src/app/zap-templates/templates/app/MatterIDL.zapt
index 2e6df5aec7bb9a..12272b992122e1 100644
--- a/src/app/zap-templates/templates/app/MatterIDL.zapt
+++ b/src/app/zap-templates/templates/app/MatterIDL.zapt
@@ -115,8 +115,11 @@
 
 {{/all_user_clusters}}
 {{#user_endpoints}}
-
 endpoint {{endpointId}} {
+  {{#if deviceIdentifier}}
+  device type {{chip_friendly_endpoint_type_name}} = {{deviceIdentifier}};
+  {{/if~}}
+
   {{#user_clusters}}
     {{#if enabled}}
       {{#unless (isServer side)}}
diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
index a8dbc29205c5e4..3ba302d78804ce 100644
--- a/src/app/zap-templates/templates/app/cluster-objects.zapt
+++ b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -11,7 +11,7 @@
 #include <app/EventLoggingTypes.h>
 #include <app/util/basic-types.h>
 #include <lib/core/ClusterEnums.h>
-#include <lib/support/BitFlags.h>
+#include <lib/support/BitMask.h>
 #include <protocols/interaction_model/Constants.h>
 #include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
@@ -34,6 +34,19 @@ namespace Structs {
 } // namespace Structs
 } // namespace detail
 
+namespace Globals {
+namespace Attributes {
+{{#zcl_attributes_server}}
+{{#unless clusterRef}}
+namespace {{asUpperCamelCase label}} {
+  {{> cluster_objects_attribute_typeinfo ns=""}}
+} // namespace {{asUpperCamelCase label}}
+
+{{/unless}}
+{{/zcl_attributes_server}}
+} // namespace Attributes
+} // namespace Globals
+
 {{#zcl_clusters}}
 namespace {{asUpperCamelCase name}} {
 {{#zcl_structs}}
@@ -120,30 +133,13 @@ namespace Attributes {
 
 {{#zcl_attributes_server}}
 namespace {{asUpperCamelCase label}} {
-    struct TypeInfo {
-    {{! forceNotOptional=true because the optionality is on the attribute
-        itself, but we want just the type of the attribute. }}
-    {{#if entryType}}
-        using Type = {{zapTypeToEncodableClusterObjectType entryType ns=parent.name forceNotOptional=true}};
-        using DecodableType = {{zapTypeToDecodableClusterObjectType entryType ns=parent.name forceNotOptional=true}};
-        using DecodableArgType = {{zapTypeToDecodableClusterObjectType entryType ns=parent.name forceNotOptional=true isArgument=true}};
+    {{#if clusterRef}}
+      {{> cluster_objects_attribute_typeinfo ns=parent.name}}
     {{else}}
-        using Type = {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotOptional=true}};
-        using DecodableType = {{zapTypeToDecodableClusterObjectType type ns=parent.name forceNotOptional=true}};
-        using DecodableArgType = {{zapTypeToDecodableClusterObjectType type ns=parent.name forceNotOptional=true isArgument=true}};
+      struct TypeInfo : public Clusters::Globals::Attributes::{{asUpperCamelCase label}}::TypeInfo {
+          static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
+      };
     {{/if}}
-
-        static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
-        static constexpr AttributeId GetAttributeId() { return Attributes::{{asUpperCamelCase label}}::Id; }
-        static constexpr bool MustUseTimedWrite() { return {{mustUseTimedWrite}}; }
-        {{#unless isArray}}
-        {{#if (isString type)}}
-        {{#if maxLength}}
-        static constexpr size_t MaxLength() { return {{maxLength}}; }
-        {{/if}}
-        {{/if}}
-        {{/unless}}
-    };
 } // namespace {{asUpperCamelCase label}}
 {{/zcl_attributes_server}}
 
diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js
index 6a1f3235ed6532..562e6384349f9c 100644
--- a/src/app/zap-templates/templates/app/helper.js
+++ b/src/app/zap-templates/templates/app/helper.js
@@ -57,7 +57,6 @@ var endpointClusterWithInit = [
   'Basic',
   'Color Control',
   'Groups',
-  'IAS Zone',
   'Identify',
   'Level Control',
   'Localization Configuration',
@@ -78,7 +77,6 @@ var endpointClusterWithAttributeChanged = [
   'Fan Control',
 ];
 var endpointClusterWithPreAttribute = [
-  'IAS Zone',
   'Door Lock',
   'Pump Configuration and Control',
   'Thermostat User Interface Configuration',
@@ -86,8 +84,8 @@ var endpointClusterWithPreAttribute = [
   'Localization Configuration',
   'Mode Select',
   'Fan Control',
+  'Thermostat',
 ];
-var endpointClusterWithMessageSent = [ 'IAS Zone' ];
 
 /**
  * Populate the GENERATED_FUNCTIONS field
@@ -118,12 +116,6 @@ function chip_endpoint_generated_functions()
         hasFunctionArray = true
       }
 
-      if (endpointClusterWithMessageSent.includes(clusterName)) {
-        functionList     = functionList.concat(`  (EmberAfGenericClusterFunction) emberAf${
-            cHelper.asCamelCased(clusterName, false)}ClusterServerMessageSentCallback,\\\n`)
-        hasFunctionArray = true
-      }
-
       if (endpointClusterWithPreAttribute.includes(clusterName)) {
         functionList     = functionList.concat(`  (EmberAfGenericClusterFunction) Matter${
             cHelper.asCamelCased(clusterName, false)}ClusterServerPreAttributeChangedCallback,\\\n`)
@@ -209,11 +201,6 @@ function chip_endpoint_cluster_list()
         hasFunctionArray = true
       }
 
-      if (endpointClusterWithMessageSent.includes(clusterName)) {
-        c.mask.push('MESSAGE_SENT_FUNCTION')
-        hasFunctionArray = true
-      }
-
       if (hasFunctionArray) {
         functionArray = 'chipFuncArray' + cHelper.asCamelCased(clusterName, false) + 'Server'
       }
@@ -403,6 +390,17 @@ function asUpperCamelCase(label)
   return str.replace(/[^A-Za-z0-9_]/g, '');
 }
 
+function chip_friendly_endpoint_type_name(options)
+{
+  var name = this.endpointTypeName;
+  if (name.startsWith("MA-")) {
+    // prefix likely for "Matter" and is redundant
+    name = name.substring(3);
+  }
+
+  return asLowerCamelCase(name);
+}
+
 function asMEI(prefix, suffix)
 {
   return cHelper.asHex((prefix << 16) + suffix, 8);
@@ -479,7 +477,7 @@ async function zapTypeToClusterObjectType(type, isDecodable, options)
       if (s) {
         return 'uint' + s[1] + '_t';
       }
-      return 'chip::BitFlags<' + ns + type + '>';
+      return 'chip::BitMask<' + ns + type + '>';
     }
 
     if (types.isStruct) {
@@ -729,9 +727,6 @@ function isWeaklyTypedEnum(label)
     "HueDirection",
     "HueMoveMode",
     "HueStepMode",
-    "IasEnrollResponseCode",
-    "IasZoneState",
-    "IasZoneType",
     "IdentifyEffectIdentifier",
     "IdentifyEffectVariant",
     "IdentifyIdentifyType",
@@ -864,6 +859,7 @@ exports.asTypedExpression                     = asTypedExpression;
 exports.asTypedLiteral                        = asTypedLiteral;
 exports.asLowerCamelCase                      = asLowerCamelCase;
 exports.asUpperCamelCase                      = asUpperCamelCase;
+exports.chip_friendly_endpoint_type_name      = chip_friendly_endpoint_type_name;
 exports.hasProperty                           = hasProperty;
 exports.hasSpecificAttributes                 = hasSpecificAttributes;
 exports.asMEI                                 = asMEI;
diff --git a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt
index 569ae8d4c573dd..9d6d3242bf8557 100644
--- a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt
+++ b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt
@@ -74,13 +74,13 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
 
     switch (aCommandPath.mClusterId)
     {
-    {{#chip_server_clusters}}
-    {{#if (user_cluster_has_enabled_command name side)}}
-    case Clusters::{{asUpperCamelCase name}}::Id:
-        Clusters::{{asUpperCamelCase name}}::Dispatch{{asUpperCamelCase side}}Command(apCommandObj, aCommandPath, aReader);
+    {{#all_user_clusters_with_incoming_commands}}
+    {{#if (isServer clusterSide)}}
+    case Clusters::{{asUpperCamelCase clusterName}}::Id:
+        Clusters::{{asUpperCamelCase clusterName}}::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
     {{/if}}
-    {{/chip_server_clusters}}
+    {{/all_user_clusters_with_incoming_commands}}
     default:
         ChipLogError(Zcl, "Unknown cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mClusterId));
         apCommandObj->AddStatus(
diff --git a/src/app/zap-templates/templates/app/print-cluster.zapt b/src/app/zap-templates/templates/app/print-cluster.zapt
index 6b9a41db9b3f08..c5d56577a31228 100644
--- a/src/app/zap-templates/templates/app/print-cluster.zapt
+++ b/src/app/zap-templates/templates/app/print-cluster.zapt
@@ -9,7 +9,7 @@
 
 {{#zcl_clusters}}
 #if defined(ZCL_USING_{{asDelimitedMacro this.define}}_SERVER) || defined(ZCL_USING_{{asDelimitedMacro this.define}}_CLIENT)
-    #define CHIP_PRINTCLUSTER_{{asDelimitedMacro this.define}} {ZCL_{{asDelimitedMacro this.define}}_ID, {{this.code}}, "{{this.label}}" },
+    #define CHIP_PRINTCLUSTER_{{asDelimitedMacro this.define}} {ZCL_{{asDelimitedMacro this.define}}_ID, "{{this.label}}" },
 #else
     #define CHIP_PRINTCLUSTER_{{asDelimitedMacro this.define}}
 #endif
diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
index 3305ef52846a15..97b8b8ad8b4f9b 100644
--- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
@@ -81,7 +81,7 @@ limitations under the License.
       <access modifier="fabric-scoped"/>
     </attribute>
 
-    <attribute side="server" code="0x0001" define="EXTENSION" type="ARRAY" entryType="ExtensionEntry" writable="true">
+    <attribute side="server" code="0x0001" define="EXTENSION" type="ARRAY" entryType="ExtensionEntry" writable="true" optional="true">
       <description>Extension</description>
       <access op="read" privilege="administer"/>
       <access op="write" privilege="administer"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
index 9f51a0c929f149..6f365e2e58fdb8 100644
--- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
@@ -52,7 +52,7 @@ limitations under the License.
       <access op="invoke" privilege="administer"/>
     </command>
 
-    <command source="client" code="0x01" name="OpenBasicCommissioningWindow" mustUseTimedInvoke="true" optional="false">
+    <command source="client" code="0x01" name="OpenBasicCommissioningWindow" mustUseTimedInvoke="true" optional="true">
       <description>This command is used by a current Administrator to instruct a Node to go into commissioning mode using basic commissioning method, if the node supports it.</description>
       <arg name="CommissioningTimeout" type="INT16U"/>
       <access op="invoke" privilege="administer"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
index 9d9501469447ea..f2c857dfa2d227 100644
--- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <server init="false" tick="false">true</server>
     <description>This cluster provides an interface for launching content on a media player device such as a TV or Speaker.</description>
 
-    <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST"        type="ARRAY" entryType="INT16U" length="254" reportable="true"  writable="false" optional="false">CatalogList</attribute>
+    <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST"        type="ARRAY" entryType="INT16U" length="254" reportable="true"  writable="false" optional="true">CatalogList</attribute>
     <attribute side="server" code="0x0001" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEP"            default="0x0" isNullable="true" writable="true"  optional="true">CurrentApp</attribute>
 
     <command source="client" code="0x00" name="LaunchApp" response="LauncherResponse" optional="false">
diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
index d66e12909c72f0..280d1cd423dc48 100644
--- a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
@@ -32,7 +32,7 @@ limitations under the License.
       <arg name="index" type="INT8U"/>
     </command>
 
-    <command source="client" code="0x01" name="RenameOutput" optional="false">
+    <command source="client" code="0x01" name="RenameOutput" optional="true">
       <description>Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus.</description>
       <arg name="index" type="INT8U"/>
       <arg name="name" type="CHAR_STRING"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
index 58583a73a99640..d02cce013faf7d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
@@ -28,7 +28,7 @@ limitations under the License.
     <attribute side="server" code="0x0001" define="CHANNEL_LINEUP"          type="LineupInfo"                    default="0x0" isNullable="true" writable="false" optional="true">Lineup</attribute>
     <attribute side="server" code="0x0002" define="CHANNEL_CURRENT_CHANNEL" type="ChannelInfo"                   default="0x0" isNullable="true" writable="false" optional="true">CurrentChannel</attribute>
 
-    <command source="client" code="0x00" name="ChangeChannel" response="ChangeChannelResponse" optional="false">
+    <command source="client" code="0x00" name="ChangeChannel" response="ChangeChannelResponse" optional="true">
       <description>Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. </description>
       <arg name="match" type="CHAR_STRING"/>
     </command>
@@ -44,7 +44,7 @@ limitations under the License.
       <arg name="count" type="INT16U"/>
     </command>
 
-    <command source="server" code="0x01" name="ChangeChannelResponse" optional="false">
+    <command source="server" code="0x01" name="ChangeChannelResponse" optional="true">
       <description>Upon receipt, this SHALL display the active status of the input list on screen.</description>
       <arg name="status" type="ChannelStatusEnum"/>
       <arg name="data"   type="CHAR_STRING" optional="true"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
index 4846a49bd532e3..f5c06e42cc308a 100644
--- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
@@ -28,21 +28,21 @@ limitations under the License.
     <attribute side="server" code="0x0000" define="CONTENT_LAUNCHER_ACCEPT_HEADER"                 type="ARRAY" entryType="CHAR_STRING" length="254" writable="false" optional="true">AcceptHeader</attribute>
     <attribute side="server" code="0x0001" define="CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS" type="BITMAP32" default="0"                       writable="true"  optional="true">SupportedStreamingProtocols</attribute>
 
-    <command source="client" code="0x00" name="LaunchContent" response="LaunchResponse" optional="false">
+    <command source="client" code="0x00" name="LaunchContent" response="LaunchResponse" optional="true">
       <description>Upon receipt, this SHALL launch the specified content with optional search criteria.</description>
       <arg name="search" type="ContentSearch"/>
       <arg name="autoPlay" type="BOOLEAN"/>
       <arg name="data" type="CHAR_STRING" optional="true"/>
     </command>
 
-    <command source="client" code="0x01" name="LaunchURL" response="LaunchResponse" optional="false">
+    <command source="client" code="0x01" name="LaunchURL" response="LaunchResponse" optional="true">
       <description>Upon receipt, this SHALL launch content from the specified URL.</description>
       <arg name="contentURL" type="CHAR_STRING"/>
       <arg name="displayString" type="CHAR_STRING" optional="true"/>
       <arg name="brandingInformation" type="BrandingInformation" optional="true"/>
     </command>
 
-    <command source="server" code="0x02" name="LaunchResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x02" name="LaunchResponse" optional="true" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to LaunchContent command.</description>
       <arg name="status" type="ContentLaunchStatusEnum"/>
       <arg name="data" type="CHAR_STRING" optional="true"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
index cb824c9243d911..faef2b0de95eb6 100644
--- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
@@ -86,8 +86,6 @@ limitations under the License.
             <access op="read" role="view" />
             <access op="write" role="manage" />
         </attribute>
-        <!-- Conformance feature LOG - for now optional -->
-        <attribute side="server" code="16" define="NUM_LOG_RECORDS_SUPPORTED" type="INT16U" default="0" writable="false" optional="true">NumberOfLogRecordsSupported</attribute>
         <!-- Conformance feature USR - for now optional -->
         <attribute side="server" code="17" define="NUM_TOTAL_USERS_SUPPORTED" type="INT16U" default="0" writable="false" optional="true">NumberOfTotalUsersSupported</attribute>
         <!-- Conformance feature PIN - for now optional -->
@@ -112,12 +110,6 @@ limitations under the License.
         <attribute side="server" code="27" define="CREDENTIAL_RULES_SUPPORT" type="DlCredentialRuleMask" min="0x00" max="0xFF" default="1" writable="false" optional="true">CredentialRulesSupport</attribute>
         <!-- Conformance feature USR - for now optional  -->
         <attribute side="server" code="28" define="NUM_CREDENTIALS_SUPPORTED_PER_USER" type="INT8U" default="0" writable="false" optional="true">NumberOfCredentialsSupportedPerUser</attribute>
-        <!-- Conformance feature LOG - for now optional -->
-        <attribute side="server" code="32" define="ENABLE_LOGGING" type="boolean" reportable="true" default="0" writable="true" optional="true">
-            <description>EnableLogging</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
         <attribute side="server" code="33" define="LANGUAGE" type="CHAR_STRING" length="3" reportable="true" writable="true" optional="true">
             <description>Language</description>
             <access op="read" role="view" />
@@ -201,53 +193,6 @@ limitations under the License.
             <access op="read" role="view" />
             <access op="write" role="administer" />
         </attribute>
-        <attribute side="server" code="64" define="ALARM_MASK" type="DlAlarmMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>AlarmMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT & PIN] - for now optional -->
-        <attribute side="server" code="65" define="KEYPAD_OPERATION_EVENT_MASK" type="DlKeypadOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>KeypadOperationEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT] - for now optional -->
-        <attribute side="server" code="66" define="REMOTE_OPERATION_EVENT_MASK" type="DlRemoteOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>RemoteOperationEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT] - for now optional -->
-        <attribute side="server" code="67" define="MANUAL_OPERATION_EVENT_MASK" type="DlManualOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>ManualOperationEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT & RID] - for now optional -->
-        <attribute side="server" code="68" define="RFID_OPERATION_EVENT_MASK" type="DlRFIDOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>RFIDOperationEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT & PIN] - for now optional -->
-        <attribute side="server" code="69" define="KEYPAD_PROGRAMMING_EVENT_MASK" type="DlKeypadOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>KeypadProgrammingEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT] - for now optional -->
-        <attribute side="server" code="70" define="REMOTE_PROGRAMMING_EVENT_MASK" type="DlRemoteProgrammingEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>RemoteProgrammingEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
-        <!-- Conformance feature [NOT & RID] - for now optional -->
-        <attribute side="server" code="71" define="RFID_PROGRAMMING_EVENT_MASK" type="DlRFIDProgrammingEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
-            <description>RFIDProgrammingEventMask</description>
-            <access op="read" role="view" />
-            <access op="write" role="administer" />
-        </attribute>
 
         <!-- Commands -->
         <command source="client" code="0" name="LockDoor" mustUseTimedInvoke="true">
@@ -267,79 +212,6 @@ limitations under the License.
             <!-- Conformance feature [COTA & PIN] - for now optional -->
             <arg name="pinCode" type="OCTET_STRING" optional="true" />
         </command>
-        <!-- Conformance feature LOG - for now optional -->
-        <command source="client" code="4" name="GetLogRecord" response="GetLogRecordResponse" optional="true">
-            <description>Request a log record.</description>
-            <access op="invoke" role="manage" />
-            <arg name="logIndex" type="INT16U" />
-        </command>
-        <!-- Conformance feature LOG - for now optional -->
-        <command source="server" code="4" name="GetLogRecordResponse" optional="true">
-            <description>Returns the specified log record.</description>
-            <access op="invoke" role="manage" />
-            <arg name="logEntryId" type="INT16U" />
-            <arg name="timestamp" type="INT32U" />
-            <arg name="eventType" type="ENUM8" />
-            <arg name="source" type="INT8U" />
-            <arg name="eventIdOrAlarmCode" type="INT8U" />
-            <arg name="userId" type="INT16U" />
-            <arg name="pin" type="OCTET_STRING" />
-        </command>
-        <!-- Conformance feature !USR & PIN - for now optional -->
-        <command source="client" code="5" name="SetPINCode" mustUseTimedInvoke="true" optional="true">
-            <description>Set a PIN Code into the lock.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
-            <arg name="pin" type="OCTET_STRING" />
-        </command>
-        <!-- Conformance feature !USR & PIN - for now optional -->
-        <command source="client" code="6" name="GetPINCode" response="GetPINCodeResponse" optional="true">
-            <description>Retrieve a PIN Code.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-        </command>
-        <!-- Conformance feature !USR & PIN - for now optional -->
-        <command source="server" code="6" name="GetPINCodeResponse" disableDefaultResponse="true" optional="true">
-            <description>Returns the PIN for the specified user ID.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
-            <arg name="pin" type="OCTET_STRING" isNullable="true" />
-        </command>
-        <!-- Conformance feature !USR & PIN - for now optional -->
-        <command source="client" code="7" name="ClearPINCode" mustUseTimedInvoke="true" optional="true">
-            <description>Clear a PIN code or all PIN codes.</description>
-            <access op="invoke" role="administer" />
-            <arg name="pinSlotIndex" type="INT16U" />
-        </command>
-        <!-- Conformance feature !USR & PIN - for now optional -->
-        <command source="client" code="8" name="ClearAllPINCodes" mustUseTimedInvoke="true" optional="true">
-            <description>Clear out all PINs on the lock.</description>
-            <access op="invoke" role="administer" />
-        </command>
-        <!-- Conformance feature !USR & (PIN | RID | FGP) - for now optional -->
-        <command source="client" code="9" name="SetUserStatus" optional="true">
-            <description>Set the status of a user ID.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userStatus" type="DlUserStatus" />
-        </command>
-        <!-- Conformance feature !USR & (PIN | RID | FGP) - for now optional -->
-        <command source="client" code="10" name="GetUserStatus" response="GetUserStatusResponse" optional="true">
-            <description>Get the status of a user.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-        </command>
-        <!-- Conformance feature !USR - for now optional -->
-        <command source="server" code="10" name="GetUserStatusResponse" disableDefaultResponse="true" optional="true">
-            <description>Returns the user status for the specified user ID.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userStatus" type="DlUserStatus" />
-        </command>
         <!-- Conformance feature SCH - for now optional -->
         <command source="client" code="11" name="SetWeekDaySchedule" optional="true">
             <description>Set a weekly repeating schedule for a specified user.</description>
@@ -443,61 +315,6 @@ limitations under the License.
             <access op="invoke" role="administer" />
             <arg name="holidayIndex" type="INT8U" />
         </command>
-        <!-- Conformance feature !USR & (PIN | RID | FGP) - for now optional -->
-        <command source="client" code="20" name="SetUserType" optional="true">
-            <description>Set the user type for a specified user.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userType" type="DlUserType" />
-        </command>
-        <!-- Conformance feature !USR & (PIN | RID | FGP) - for now optional -->
-        <command source="client" code="21" name="GetUserType" response="GetUserTypeResponse" optional="true">
-            <description>Retrieve the user type for a specific user.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-        </command>
-        <!-- Conformance feature !USR - for now optional -->
-        <command source="server" code="21" name="GetUserTypeResponse" disableDefaultResponse="true" optional="true">
-            <description>Returns the user type for the specified user ID.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userType" type="DlUserType" />
-        </command>
-        <!-- Conformance feature !USR & RID - for now optional -->
-        <command source="client" code="22" name="SetRFIDCode" mustUseTimedInvoke="true" optional="true">
-            <description>Set an ID for RFID access into the lock.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
-            <arg name="rfidCode" type="OCTET_STRING" />
-        </command>
-        <!-- Conformance feature !USR & RID - for now optional -->
-        <command source="client" code="23" name="GetRFIDCode" response="GetRFIDCodeResponse" optional="true">
-            <description>Retrieve an RFID code.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-        </command>
-        <!-- Conformance feature !USR & RID - for now optional -->
-        <command source="server" code="23" name="GetRFIDCodeResponse" disableDefaultResponse="true" optional="true">
-            <description>Returns the RFID code for the specified user ID.</description>
-            <access op="invoke" role="administer" />
-            <arg name="userId" type="INT16U" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
-            <arg name="rfidCode" type="OCTET_STRING" isNullable="true" />
-        </command>
-        <!-- Conformance feature !USR & RID - for now optional -->
-        <command source="client" code="24" name="ClearRFIDCode" mustUseTimedInvoke="true" optional="true">
-            <description>Clear an RFID code or all RFID codes.</description>
-            <access op="invoke" role="administer" />
-            <arg name="rfidSlotIndex" type="INT16U" />
-        </command>
-        <!-- Conformance feature !USR & PIN - for now optional -->
-        <command source="client" code="25" name="ClearAllRFIDCodes" mustUseTimedInvoke="true" optional="true">
-            <description>Clear out all RFIDs on the lock.</description>
-            <access op="invoke" role="administer" />
-        </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="26" name="SetUser" mustUseTimedInvoke="true" optional="true">
             <description>Set User into the lock.</description>
@@ -537,28 +354,6 @@ limitations under the License.
             <access op="invoke" role="administer" />
             <arg name="userIndex" type="INT16U" />
         </command>
-        <!-- Conformance feature [NOT] - for now optional -->
-        <command source="server" code="32" name="OperatingEventNotification" disableDefaultResponse="true" optional="true">
-            <description>The door lock server sends out operation event notification when the event is triggered by the various event sources.</description>
-            <arg name="operationEventSource" type="INT8U" />
-            <arg name="operationEventCode" type="INT8U" />
-            <arg name="userId" type="INT16U" />
-            <arg name="pin" type="OCTET_STRING" />
-            <arg name="localTime" type="epoch_s" />
-            <arg name="data" type="CHAR_STRING" optional="true" />
-        </command>
-        <!-- Conformance feature [NOT] - for now optional -->
-        <command source="server" code="33" name="ProgrammingEventNotification" disableDefaultResponse="true" optional="true">
-            <description>The door lock server sends out a programming event notification whenever a programming event takes place on the door lock.</description>
-            <arg name="programEventSource" type="INT8U" />
-            <arg name="programEventCode" type="INT8U" />
-            <arg name="userId" type="INT16U" />
-            <arg name="pin" type="OCTET_STRING" />
-            <arg name="userType" type="DlUserType" />
-            <arg name="userStatus" type="DlUserStatus" />
-            <arg name="localTime" type="epoch_s" />
-            <arg name="data" type="CHAR_STRING" optional="true" />
-        </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="34" name="SetCredential" response="SetCredentialResponse" mustUseTimedInvoke="true" optional="true">
             <description>Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser.</description>
@@ -855,18 +650,6 @@ limitations under the License.
         <field mask="0x08" name="AdjustLockSettingsLocally" />
     </bitmap>
 
-    <!-- AlarmMask attribute bit meaning set -->
-    <bitmap name="DlAlarmMask" type="BITMAP16">
-        <cluster code="0x0101" />
-        <field mask="0x01" name="LockingMechanismJammed" />
-        <field mask="0x02" name="LockResetToFactoryDefaults" />
-        <field mask="0x04" name="Reserved" />
-        <field mask="0x08" name="RFModulePowerCycled" />
-        <field mask="0x10" name="WrongCodeEntryLimit" />
-        <field mask="0x20" name="FrontEscutcheonRemovedFromMain" />
-        <field mask="0x40" name="ForcedDoorOpenUnderDoorLockedCondition" />
-    </bitmap>
-
     <!-- KeypadOperationEventMask attribute bit meaning set -->
     <bitmap name="DlKeypadOperationEventMask" type="BITMAP16">
         <cluster code="0x0101" />
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 5b281da964289b..e38bde96295c61 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
@@ -91,6 +91,14 @@ limitations under the License.
     <attribute side="server" code="0x05" define="ACTIVE_HARDWARE_FAULTS" type="ARRAY" entryType="ENUM8" writable="false" optional="true">ActiveHardwareFaults</attribute>
     <attribute side="server" code="0x06" define="ACTIVE_RADIO_FAULTS" type="ARRAY" entryType="ENUM8" writable="false" optional="true">ActiveRadioFaults</attribute>
     <attribute side="server" code="0x07" define="ACTIVE_NETWORK_FAULTS" type="ARRAY" entryType="ENUM8" writable="false" optional="true">ActiveNetworkFaults</attribute>
+    <attribute side="server" code="0x08" define="TEST_EVENT_TRIGGERS_ENABLED" type="BOOLEAN" writable="false" optional="false">TestEventTriggersEnabled</attribute>
+
+    <command source="client" code="0x00" name="TestEventTrigger" optional="false">
+      <description>Provide a means for certification tests to trigger some test-plan-specific events</description>
+      <arg name="EnableKey" type="OCTET_STRING" length="16"/>
+      <arg name="EventTrigger" type="INT64U"/>
+    </command>
+
     <event side="server" code="0x00" name="HardwareFaultChange" priority="critical" optional="true">
       <description>Indicate a change in the set of hardware faults currently detected by the Node.</description>
       <field id="0" name="Current" type="HardwareFaultType" array="true"/>
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 ce0739799c42d2..2b3cd830e7fa40 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
@@ -66,7 +66,7 @@ limitations under the License.
             <include cluster="Time Synchronization" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="Group Key Management" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Network Commissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
-            <include cluster="AdministratorCommissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Administrator Commissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Operational Credentials" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Localization Configuration" client="false" server="true" clientLocked="true" serverLocked="false">
                 <requireAttribute>ACTIVE_LOCALE</requireAttribute>
@@ -2017,7 +2017,7 @@ limitations under the License.
             <include cluster="Application Launcher" client="false" server="true" clientLocked="false" serverLocked="false"></include>
             <include cluster="Media Input" client="false" server="true" clientLocked="false" serverLocked="false"></include>
             <include cluster="On/Off" client="false" server="true" clientLocked="false" serverLocked="false"></include>
-            <include cluster="TV Channel" client="false" server="true" clientLocked="false" serverLocked="false"></include>
+            <include cluster="Channel" client="false" server="true" clientLocked="false" serverLocked="false"></include>
             <include cluster="Audio Output" client="false" server="true" clientLocked="false" serverLocked="false"></include>
             <include cluster="Low Power" client="false" server="true" clientLocked="false" serverLocked="false"></include>
             <include cluster="Wake on LAN" client="false" server="true" clientLocked="false" serverLocked="false"></include>
diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml
index db12e57e6138af..2f876925426ac4 100644
--- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml
@@ -41,7 +41,7 @@ limitations under the License.
       <description>Upon receipt, this SHALL hide the input list from the screen.</description>
     </command>
 
-    <command source="client" code="0x03" name="RenameInput" optional="false">
+    <command source="client" code="0x03" name="RenameInput" optional="true">
       <description>Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus.    </description>
       <arg name="index" type="INT8U"/>
       <arg name="name" type="CHAR_STRING"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
index e4c212e330fab1..7fe5aa904143fd 100644
--- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
@@ -35,6 +35,7 @@ limitations under the License.
     <item name="InvalidNOC" value="0x03"/>
     <item name="MissingCsr" value="0x04"/>
     <item name="TableFull" value="0x05"/>
+    <item name="InvalidAdminSubject" value="0x06"/>
     <item name="InsufficientPrivilege" value="0x08"/>
     <item name="FabricConflict" value="0x09"/>
     <item name="LabelConflict" value="0x0a"/>
@@ -91,6 +92,7 @@ limitations under the License.
     <command source="client" code="0x04" name="CSRRequest" response="CSRResponse" optional="false">
       <description>Sender is requesting a certificate signing request (CSR) from the receiver.</description>
       <arg name="CSRNonce" type="OCTET_STRING"/>
+      <arg name="IsForUpdateNOC" type="boolean" optional="true"/>
       <access op="invoke" privilege="administer"/>
     </command>
 
@@ -106,7 +108,7 @@ limitations under the License.
       <arg name="NOCValue" type="OCTET_STRING"/>
       <arg name="ICACValue" type="OCTET_STRING" optional="true"/>
       <arg name="IPKValue" type="OCTET_STRING"/>
-      <arg name="CaseAdminNode" type="NODE_ID"/>
+      <arg name="CaseAdminSubject" type="Int64u"/>
       <arg name="AdminVendorId" type="VENDOR_ID"/>
       <access op="invoke" privilege="administer"/>
     </command>
@@ -142,12 +144,5 @@ limitations under the License.
       <arg name="RootCertificate" type="OCTET_STRING"/>
       <access op="invoke" privilege="administer"/>
     </command>
-
-    <command source="client" code="0x0c" name="RemoveTrustedRootCertificate" optional="false">
-      <description>This command SHALL remove a Trusted Root CA Certificate, provided as its CHIP Certificate representation.</description>
-      <arg name="TrustedRootIdentifier" type="OCTET_STRING"/>
-      <access op="invoke" privilege="administer"/>
-    </command>
-
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
index 18029e48dd7789..e8bdc18b633f3c 100644
--- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
@@ -19,10 +19,10 @@ limitations under the License.
   <struct name="ThreadMetrics">
     <cluster code="0x0034"/>
     <item name="Id" type="INT64U"/>
-    <item name="Name" type="CHAR_STRING" length="8"/>
-    <item name="StackFreeCurrent" type="INT32U"/>
-    <item name="StackFreeMinimum" type="INT32U"/>
-    <item name="StackSize" type="INT32U"/>
+    <item name="Name" type="CHAR_STRING" length="8" optional="true"/>
+    <item name="StackFreeCurrent" type="INT32U" optional="true"/>
+    <item name="StackFreeMinimum" type="INT32U" optional="true"/>
+    <item name="StackSize" type="INT32U" optional="true"/>
   </struct>
   <struct name="SoftwareFaultStruct">
     <cluster code="0x0034"/>
@@ -40,7 +40,7 @@ limitations under the License.
     <attribute side="server" code="0x01" define="CURRENT_HEAP_FREE" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapFree</attribute>
     <attribute side="server" code="0x02" define="CURRENT_HEAP_USED" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapUsed</attribute>
     <attribute side="server" code="0x03" define="CURRENT_HEAP_HIGH_WATERMARK" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapHighWatermark</attribute>
-    <command source="client" code="0x00" name="ResetWatermarks" optional="false" cli="chip software_diagnostics resetwatermarks">
+    <command source="client" code="0x00" name="ResetWatermarks" optional="true" cli="chip software_diagnostics resetwatermarks">
       <description>Reception of this command SHALL reset the values: The StackFreeMinimum field of the ThreadMetrics attribute, CurrentHeapHighWaterMark attribute.</description>
     </command>
     <event side="server" code="0x00" name="SoftwareFault" priority="info" optional="true">
@@ -49,6 +49,7 @@ limitations under the License.
     </event>    
   </cluster>
   <bitmap name="SoftwareDiagnosticsFeature" type="BITMAP32">
+    <cluster code="0x0034"/>
     <field name="WaterMarks" mask="0x1"/>
   </bitmap>   
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
index 33225e90f2a08a..b87d790d3b102d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
@@ -32,7 +32,7 @@ Interactions with the switch device are exposed as attributes (for the latching
 
     <attribute side="server" code="0x0000" define="NUMBER_OF_POSITIONS" type="INT8U" writable="false" optional="false" default="2" min="2">number of positions</attribute>
     <attribute side="server" code="0x0001" define="CURRENT_POSITION" type="INT8U" writable="false" reportable="true" optional="false">current position</attribute>
-    <attribute side="server" code="0x0002" define="MULTI_PRESS_MAX" type="INT8U" writable="false" optional="false" default="2" min="2">multi press max</attribute>
+    <attribute side="server" code="0x0002" define="MULTI_PRESS_MAX" type="INT8U" writable="false" optional="true" default="2" min="2">multi press max</attribute>
     <event side="server" code="0x00" priority="info" name="SwitchLatched" optional="true">
       <description>Switch Latched</description>
       <field id="0" name="NewPosition" type="INT8U" />
diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
index 587c282fef8be9..2af47d21b36e31 100644
--- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
@@ -17,13 +17,13 @@ limitations under the License.
 <configurator>
   <domain name="CHIP"/>
   <struct name="TestListStructOctet">
-    <cluster code="0x050F"/>
-    <item name="fabricIndex" type="INT64U"/>
-    <item name="operationalCert" type="OCTET_STRING" length="32"/>
+    <cluster code="0xFFF1FC05"/>
+    <item name="member1" type="INT64U"/>
+    <item name="member2" type="OCTET_STRING" length="32"/>
   </struct>
 
   <struct name="TestFabricScoped">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item fieldId="1" name="fabricSensitiveInt8u" type="INT8U" isFabricSensitive="true"/>
     <item fieldId="2" name="optionalFabricSensitiveInt8u" type="INT8U" optional="true" isFabricSensitive="true"/>
     <item fieldId="3" name="nullableFabricSensitiveInt8u" type="INT8U" isNullable="true" isFabricSensitive="true"/>
@@ -35,7 +35,7 @@ limitations under the License.
   </struct>
 
   <enum name="SimpleEnum" type="ENUM8">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item name="Unspecified" value="0x00"/>
     <item name="ValueA" value="0x01"/>
     <item name="ValueB" value="0x02"/>
@@ -43,14 +43,14 @@ limitations under the License.
   </enum>
 
   <bitmap name="SimpleBitmap" type="BITMAP8">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <field name="ValueA" mask="0x1"/>
     <field name="ValueB" mask="0x2"/>
     <field name="ValueC" mask="0x4"/>
   </bitmap>
 
   <struct name="SimpleStruct">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item name="a" type="INT8U" optional="false"/>
     <item name="b" type="BOOLEAN" optional="false"/>
     <item name="c" type="SimpleEnum" optional="false"/>
@@ -62,14 +62,14 @@ limitations under the License.
   </struct>
 
   <struct name="NestedStruct">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item name="a" type="INT8U" optional="false"/>
     <item name="b" type="BOOLEAN" optional="false"/>
     <item name="c" type="SimpleStruct" optional="false"/>
   </struct>
 
   <struct name="NestedStructList">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item name="a" type="INT8U" optional="false"/>
     <item name="b" type="BOOLEAN" optional="false"/>
     <item name="c" type="SimpleStruct" optional="false"/>
@@ -80,13 +80,13 @@ limitations under the License.
   </struct>
 
   <struct name="DoubleNestedStructList">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item name="a" type="NestedStructList" array="true" optional="false"/>
   </struct>
 
 
   <struct name="NullablesAndOptionalsStruct">
-    <cluster code="0x050F"/>
+    <cluster code="0xFFF1FC05"/>
     <item name="NullableInt" type="INT16U" isNullable="true"/>
     <item name="OptionalInt" type="INT16U" optional="true"/>
     <item name="NullableOptionalInt" type="INT16U" isNullable="true"
@@ -106,7 +106,7 @@ limitations under the License.
   </struct>
 
     <bitmap name="Bitmap8MaskMap" type="BITMAP8">
-        <cluster code="0x050F" />
+        <cluster code="0xFFF1FC05" />
         <field mask="0x01" name="MaskVal1" />
         <field mask="0x02" name="MaskVal2" />
         <field mask="0x04" name="MaskVal3" />
@@ -114,7 +114,7 @@ limitations under the License.
     </bitmap>
 
     <bitmap name="Bitmap16MaskMap" type="BITMAP16">
-        <cluster code="0x050F" />
+        <cluster code="0xFFF1FC05" />
         <field mask="0x01" name="MaskVal1" />
         <field mask="0x02" name="MaskVal2" />
         <field mask="0x04" name="MaskVal3" />
@@ -122,7 +122,7 @@ limitations under the License.
     </bitmap>
 
     <bitmap name="Bitmap32MaskMap" type="BITMAP32">
-        <cluster code="0x050F" />
+        <cluster code="0xFFF1FC05" />
         <field mask="0x01" name="MaskVal1" />
         <field mask="0x02" name="MaskVal2" />
         <field mask="0x04" name="MaskVal3" />
@@ -130,7 +130,7 @@ limitations under the License.
     </bitmap>
     
     <bitmap name="Bitmap64MaskMap" type="BITMAP64">
-        <cluster code="0x050F" />
+        <cluster code="0xFFF1FC05" />
         <field mask="0x01" name="MaskVal1" />
         <field mask="0x02" name="MaskVal2" />
         <field mask="0x04" name="MaskVal3" />
@@ -140,7 +140,7 @@ limitations under the License.
   <cluster>
     <domain>CHIP</domain>
     <name>Test Cluster</name>
-    <code>0x050F</code>
+    <code>0xFFF1FC05</code>
     <define>TEST_CLUSTER</define>
     <description>The Test Cluster is meant to validate the generated code</description>
     <!-- Base data types -->
@@ -234,7 +234,7 @@ limitations under the License.
     <attribute side="server" code="0x4029" define="NULLABLE_RANGE_RESTRICTED_INT16S" type="int16s" min="-150" max="200" writable="true" isNullable="true" optional="false" default="-5">nullable_range_restricted_int16s</attribute>
 
     <!-- This attribute should not be enabled on the server side -->
-    <attribute side="server" code="0x00FF" define="UNSUPPORTED" type="BOOLEAN" writable="true" optional="false">unsupported</attribute>
+    <attribute side="server" code="0x00FF" define="UNSUPPORTED" type="BOOLEAN" writable="true" optional="true">unsupported</attribute>
 
     <!-- Test Commands -->
     <command source="client" code="0x00" name="Test" optional="false">
@@ -261,7 +261,7 @@ limitations under the License.
       </description>
     </command>
 
-    <command source="client" code="0x04" name="TestAddArguments" response="TestAddArgumentsResponse" optional="false">
+    <command source="client" code="0x04" name="TestAddArguments" response="TestAddArgumentsResponse" optional="true">
       <description>
         Command that takes two arguments and returns their sum.
       </description>
@@ -269,14 +269,14 @@ limitations under the License.
       <arg name="arg2" type="INT8U"/>
     </command>
 
-    <command source="client" code="0x05" name="TestSimpleArgumentRequest" response="TestSimpleArgumentResponse" optional="false">
+    <command source="client" code="0x05" name="TestSimpleArgumentRequest" response="TestSimpleArgumentResponse" optional="true">
       <description>
         Command that takes an argument which is bool
       </description>
       <arg name="arg1" type="BOOLEAN"/>
     </command>
 
-    <command source="client" code="0x06" name="TestStructArrayArgumentRequest" response="TestStructArrayArgumentResponse" optional="false">
+    <command source="client" code="0x06" name="TestStructArrayArgumentRequest" response="TestStructArrayArgumentResponse" optional="true">
       <description>
         Command that takes various arguments that are arrays, including an array of structs which have a list member.
       </description>
@@ -289,7 +289,7 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x07" name="TestStructArgumentRequest"
-             response="BooleanResponse" optional="false">
+             response="BooleanResponse" optional="true">
       <description>
         Command that takes an argument which is struct.  The response echoes the
         'b' field of the single arg.
@@ -298,7 +298,7 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x08" name="TestNestedStructArgumentRequest"
-             response="BooleanResponse" optional="false">
+             response="BooleanResponse" optional="true">
       <description>
         Command that takes an argument which is nested struct.  The response
         echoes the 'b' field of ar1.c.
@@ -306,7 +306,7 @@ limitations under the License.
       <arg name="arg1" type="NestedStruct"/>
     </command>
 
-    <command source="client" code="0x09" name="TestListStructArgumentRequest" response="BooleanResponse" optional="false">
+    <command source="client" code="0x09" name="TestListStructArgumentRequest" response="BooleanResponse" optional="true">
       <description>
         Command that takes an argument which is a list of structs.  The response
         returns false if there is some struct in the list whose 'b' field is
@@ -315,7 +315,7 @@ limitations under the License.
       <arg name="arg1" type="SimpleStruct" array="true"/>
     </command>
 
-    <command source="client" code="0x0A" name="TestListInt8UArgumentRequest" response="BooleanResponse" optional="false">
+    <command source="client" code="0x0A" name="TestListInt8UArgumentRequest" response="BooleanResponse" optional="true">
       <description>
         Command that takes an argument which is a list of INT8U.  The response
         returns false if the list contains a 0 in it, true otherwise (including
@@ -324,7 +324,7 @@ limitations under the License.
       <arg name="arg1" type="INT8U" array="true"/>
     </command>
 
-    <command source="client" code="0x0B" name="TestNestedStructListArgumentRequest" response="BooleanResponse" optional="false">
+    <command source="client" code="0x0B" name="TestNestedStructListArgumentRequest" response="BooleanResponse" optional="true">
       <description>
         Command that takes an argument which is a Nested Struct List.  The
         response returns false if there is some struct in arg1 (either directly
@@ -334,7 +334,7 @@ limitations under the License.
       <arg name="arg1" type="NestedStructList"/>
     </command>
 
-    <command source="client" code="0x0C" name="TestListNestedStructListArgumentRequest" response="BooleanResponse" optional="false">
+    <command source="client" code="0x0C" name="TestListNestedStructListArgumentRequest" response="BooleanResponse" optional="true">
       <description>
         Command that takes an argument which is a list of Nested Struct List.
         The response returns false if there is some struct in arg1 (either
@@ -344,7 +344,7 @@ limitations under the License.
       <arg name="arg1" type="NestedStructList" array="true"/>
     </command>
 
-    <command source="client" code="0x0D" name="TestListInt8UReverseRequest" response="TestListInt8UReverseResponse" optional="false">
+    <command source="client" code="0x0D" name="TestListInt8UReverseRequest" response="TestListInt8UReverseResponse" optional="true">
       <description>
         Command that takes an argument which is a list of INT8U and expects a
         response that reverses the list.
@@ -352,7 +352,7 @@ limitations under the License.
       <arg name="arg1" type="INT8U" array="true"/>
     </command>
 
-    <command source="client" code="0x0E" name="TestEnumsRequest" response="TestEnumsResponse" optional="false">
+    <command source="client" code="0x0E" name="TestEnumsRequest" response="TestEnumsResponse" optional="true">
       <description>
         Command that sends a vendor id and an enum.  The server is expected to
         echo them back.
@@ -362,7 +362,7 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x0F" name="TestNullableOptionalRequest"
-             optional="false" response="TestNullableOptionalResponse">
+             optional="true" response="TestNullableOptionalResponse">
       <description>
         Command that takes an argument which is nullable and optional.  The
         response returns a boolean indicating whether the argument was present,
@@ -373,7 +373,7 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x10" name="TestComplexNullableOptionalRequest"
-             optional="false" response="TestComplexNullableOptionalResponse">
+             optional="true" response="TestComplexNullableOptionalResponse">
       <description>
         Command that takes various arguments which can be nullable and/or optional.  The
         response returns information about which things were received and what
@@ -398,7 +398,7 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x11" name="SimpleStructEchoRequest"
-             response="SimpleStructResponse" optional="false">
+             response="SimpleStructResponse" optional="true">
       <description>
         Command that takes an argument which is a struct.  The response echoes
         the struct back.
@@ -407,14 +407,14 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x12" name="TimedInvokeRequest"
-             mustUseTimedInvoke="true" optional="false">
+             mustUseTimedInvoke="true" optional="true">
       <description>
         Command that just responds with a success status if the timed invoke
         conditions are met.
       </description>
     </command>
 
-    <command source="client" code="0x13" name="TestSimpleOptionalArgumentRequest" optional="false">
+    <command source="client" code="0x13" name="TestSimpleOptionalArgumentRequest" optional="true">
       <description>
         Command that takes an optional argument which is bool. It responds with a success value if the optional is set to any value.
       </description>
@@ -422,7 +422,7 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x14" name="TestEmitTestEventRequest"
-             optional="false" response="TestEmitTestEventResponse">
+             optional="true" response="TestEmitTestEventResponse">
       <description>
         Command that takes identical arguments to the fields of the TestEvent and logs the TestEvent to the buffer.  Command returns an event ID as the response.
       </description>
@@ -432,35 +432,35 @@ limitations under the License.
     </command>
 
     <command source="client" code="0x15" name="TestEmitTestFabricScopedEventRequest"
-             optional="false" response="TestEmitTestFabricScopedEventResponse">
+             optional="true" response="TestEmitTestFabricScopedEventResponse">
       <description>
         Command that takes identical arguments to the fields of the TestFabricScopedEvent and logs the TestFabricScopedEvent to the buffer.  Command returns an event ID as the response.
       </description>
       <arg name="arg1" type="INT8U"/>
     </command>
 
-    <command source="server" code="0x00" name="TestSpecificResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x00" name="TestSpecificResponse" optional="true" disableDefaultResponse="true">
       <description>
         Simple response for TestWithResponse with a simple return value
       </description>
       <arg name="returnValue" type="INT8U"/>
     </command>
 
-    <command source="server" code="0x01" name="TestAddArgumentsResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x01" name="TestAddArgumentsResponse" optional="true" disableDefaultResponse="true">
       <description>
         Response for TestAddArguments that returns the sum.
       </description>
       <arg name="returnValue" type="INT8U"/>
     </command>
 
-    <command source="server" code="0x02" name="TestSimpleArgumentResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x02" name="TestSimpleArgumentResponse" optional="true" disableDefaultResponse="true">
       <description>
         Simple response for TestSimpleArgumentRequest with a simple return value
       </description>
       <arg name="returnValue" type="BOOLEAN"/>
     </command>
 
-    <command source="server" code="0x03" name="TestStructArrayArgumentResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x03" name="TestStructArrayArgumentResponse" optional="true" disableDefaultResponse="true">
       <description>
         Response for TestStructArrayArgumentRequest with complicated return arguments
       </description>
@@ -472,14 +472,14 @@ limitations under the License.
       <arg name="arg6" type="BOOLEAN"/>
     </command>
 
-    <command source="server" code="0x04" name="TestListInt8UReverseResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x04" name="TestListInt8UReverseResponse" optional="true" disableDefaultResponse="true">
       <description>
         Response that delivers the reversed list of uint8.
       </description>
       <arg name="arg1" type="INT8U" array="true"/>
     </command>
 
-    <command source="server" code="0x05" name="TestEnumsResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x05" name="TestEnumsResponse" optional="true" disableDefaultResponse="true">
       <description>
         Response that delivers a vendor id and an enum..
       </description>
@@ -487,7 +487,7 @@ limitations under the License.
       <arg name="arg2" type="SimpleEnum"/>
     </command>
 
-    <command source="server" code="0x06" name="TestNullableOptionalResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x06" name="TestNullableOptionalResponse" optional="true" disableDefaultResponse="true">
       <description>
         Delivers information about the argument TestNullableOptionalRequest had,
         and the original value if there was one.
@@ -498,7 +498,7 @@ limitations under the License.
       <arg name="originalValue" type="INT8U" optional="true" isNullable="true"/>
     </command>
 
-    <command source="server" code="0x07" name="TestComplexNullableOptionalResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x07" name="TestComplexNullableOptionalResponse" optional="true" disableDefaultResponse="true">
       <description>
         Delivers information about the arguments TestComplexNullableOptionalRequest had.
       </description>
@@ -535,7 +535,7 @@ limitations under the License.
            optional="true"/>
     </command>
 
-    <command source="server" code="0x08" name="BooleanResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x08" name="BooleanResponse" optional="true" disableDefaultResponse="true">
       <description>
         Delivers a single boolean argument. What the argument means depends on
         what we're responding to.
@@ -543,7 +543,7 @@ limitations under the License.
       <arg name="value" type="BOOLEAN"/>
     </command>
 
-    <command source="server" code="0x09" name="SimpleStructResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x09" name="SimpleStructResponse" optional="true" disableDefaultResponse="true">
       <description>
         Command that returns a single argument which is a struct.  The contents
         of the struct depend on what we are responding to.
@@ -551,14 +551,14 @@ limitations under the License.
       <arg name="arg1" type="SimpleStruct"/>
     </command>
 
-    <command source="server" code="0x0A" name="TestEmitTestEventResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x0A" name="TestEmitTestEventResponse" optional="true" disableDefaultResponse="true">
       <description>
         Delivers the ID of an event in response to test command emitting fabric scoped events.
       </description>
       <arg name="value" type="INT64U"/>
     </command>
 
-    <command source="server" code="0x0B" name="TestEmitTestFabricScopedEventResponse" optional="false" disableDefaultResponse="true">
+    <command source="server" code="0x0B" name="TestEmitTestFabricScopedEventResponse" optional="true" disableDefaultResponse="true">
       <description>
         Delivers the ID of an event in response to test command emitting fabric scope events.
       </description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
index 63080bd9572d6a..b1f0608e9f0be5 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
@@ -89,7 +89,6 @@ limitations under the License.
       <access op="read" privilege="view"/>
       <access op="write" privilege="manage"/>
     </attribute>
-    <attribute side="server" code="0x001D" define="THERMOSTAT_ALARM_MASK" type="BITMAP8" min="0x00" max="0x07" writable="false" default="0x00" optional="true">AlarmMask</attribute>
     <attribute side="server" code="0x001E" define="THERMOSTAT_RUNNING_MODE" type="ENUM8" min="0x00" max="0x04" writable="false" optional="true">ThermostatRunningMode</attribute>
     <attribute side="server" code="0x0020" define="START_OF_WEEK" type="ENUM8" min="0x00" max="0x06" writable="false" optional="true">StartOfWeek</attribute>
     <attribute side="server" code="0x0021" define="NUMBER_OF_WEEKLY_TRANSITIONS" type="INT8U" min="0x00" max="0xFF" writable="false" optional="true">NumberOfWeeklyTransitions</attribute>
@@ -198,11 +197,6 @@ limitations under the License.
       </description>
       <access op="invoke" privilege="manage"/>
     </command>
-    <command source="client" code="0x04" name="GetRelayStatusLog" response="GetRelayStatusLogResponse" optional="true">
-      <description>
-        The Get Relay Status Log command is used to query the thermostat internal relay status log.
-      </description>
-    </command>
     <command source="server" code="0x00" name="GetWeeklyScheduleResponse" optional="true">
       <description>
         The Current Weekly Schedule Command is sent from the server in response to the Get Weekly Schedule Command.
@@ -212,17 +206,6 @@ limitations under the License.
       <arg name="ModeForSequence" type="ModeForSequence"/>
       <arg name="Transitions" type="ThermostatScheduleTransition" array="true"/>
     </command>
-    <command source="server" code="0x01" name="GetRelayStatusLogResponse" optional="true">
-      <description>
-        This command is sent from the thermostat cluster server in response to the Get Relay Status Log.
-      </description>
-      <arg name="TimeOfDay" type="INT16U"/>
-      <arg name="RelayStatus" type="BITMAP8"/>
-      <arg name="LocalTemperature" type="INT16S"/>
-      <arg name="HumidityInPercentage" type="INT8U"/>
-      <arg name="Setpoint" type="INT16S"/>
-      <arg name="UnreadEntries" type="INT16U"/>
-    </command>
   </cluster>
 
   <bitmap name="ThermostatFeature" type="BITMAP32">
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
index 25d4317ed1ab8c..3a7aa3b468b930 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml
@@ -92,7 +92,7 @@ limitations under the License.
     <define>THREAD_NETWORK_DIAGNOSTICS_CLUSTER</define>
     <description>The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems</description>
     <attribute side="server" code="0x00" define="CHANNEL" type="INT16U" min="0x00" max="0xFFFF" writable="false" isNullable="true" optional="false">channel</attribute>
-    <attribute side="server" code="0x01" define="ROUTING_ROLE" type="ENUM8" writable="false" isNullable="true" optional="false">RoutingRole</attribute>
+    <attribute side="server" code="0x01" define="ROUTING_ROLE" type="RoutingRole" writable="false" isNullable="true" optional="false">RoutingRole</attribute>
     <attribute side="server" code="0x02" define="NETWORK_NAME" type="CHAR_STRING" length="16" writable="false" default="" isNullable="true" optional="false">NetworkName</attribute>
     <attribute side="server" code="0x03" define="DIAG_PAN_ID" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" isNullable="true" optional="false">PanId</attribute>
     <attribute side="server" code="0x04" define="DIAG_EXTENDED_PAN_ID" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" isNullable="true" optional="false">ExtendedPanId</attribute>
@@ -101,11 +101,11 @@ limitations under the License.
     <attribute side="server" code="0x06" define="DIAG_OVERRUN_COUNT" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">OverrunCount</attribute>
     <attribute side="server" code="0x07" define="NEIGHBOR_TABLE" type="ARRAY" entryType="NeighborTable" length="254" writable="false" optional="false">NeighborTableList</attribute>
     <attribute side="server" code="0x08" define="ROUTE_TABLE" type="ARRAY" entryType="RouteTable" length="254" writable="false" optional="false">RouteTableList</attribute>
-    <attribute side="server" code="0x09" define="PARTITION_ID" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" optional="false">PartitionId</attribute>
-    <attribute side="server" code="0x0A" define="WEIGHTING" type="INT8U" min="0x00" max="0xFF" writable="false" optional="false">weighting</attribute>
-    <attribute side="server" code="0x0B" define="DATA_VERSION" type="INT8U" min="0x00" max="0xFF" writable="false" optional="false">DataVersion</attribute>
-    <attribute side="server" code="0x0C" define="STABLE_DATA_VERSION" type="INT8U" min="0x00" max="0xFF" writable="false" optional="false">StableDataVersion</attribute>
-    <attribute side="server" code="0x0D" define="LEADER_ROUTER_ID" type="INT8U" min="0x00" max="0xFF" writable="false" optional="false">LeaderRouterId</attribute>
+    <attribute side="server" code="0x09" define="PARTITION_ID" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" isNullable="true" optional="false">PartitionId</attribute>
+    <attribute side="server" code="0x0A" define="WEIGHTING" type="INT8U" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">weighting</attribute>
+    <attribute side="server" code="0x0B" define="DATA_VERSION" type="INT8U" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">DataVersion</attribute>
+    <attribute side="server" code="0x0C" define="STABLE_DATA_VERSION" type="INT8U" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">StableDataVersion</attribute>
+    <attribute side="server" code="0x0D" define="LEADER_ROUTER_ID" type="INT8U" min="0x00" max="0xFF" writable="false"  isNullable="true" optional="false">LeaderRouterId</attribute>
     <!-- From 0x0E to 0x15 Conformance feature[MLECNT] - for now mandatory -->
     <attribute side="server" code="0x0E" define="DETACHED_ROLE_COUNT" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">DetachedRoleCount</attribute>
     <attribute side="server" code="0x0F" define="CHILD_ROLE_COUNT" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">ChildRoleCount</attribute>
@@ -150,14 +150,12 @@ limitations under the License.
     <attribute side="server" code="0x35" define="RX_ERR_SEC_COUNT" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" optional="true">RxErrSecCount</attribute>
     <attribute side="server" code="0x36" define="RX_ERR_FCS_COUNT" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" optional="true">RxErrFcsCount</attribute>
     <attribute side="server" code="0x37" define="RX_ERR_OTHER_COUNT" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" optional="true">RxErrOtherCount</attribute>
-    <attribute side="server" code="0x38" define="ACTIVE_TIMESTAMP" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">ActiveTimestamp</attribute>
-    <attribute side="server" code="0x39" define="PENDING_TIMESTAMP" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">PendingTimestamp</attribute>
-    <attribute side="server" code="0x3A" define="DELAY" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" optional="true">delay</attribute>
-    <!-- SECURITY_POLICY Length = 2 + (arraysize(1) * Size of Struct (4b))-->
-    <attribute side="server" code="0x3B" define="SECURITY_POLICY" type="ARRAY" entryType="SecurityPolicy" length="6" writable="false" optional="false">SecurityPolicy</attribute>
-    <attribute side="server" code="0x3C" define="DIAG_CHANNEL_MASK" type="OCTET_STRING" length="4" writable="false" optional="false">ChannelMask</attribute>
-    <!-- OPERATIONAL_DATASET_COMPONENTS Length = 2 + (arraysize(1) * Size of Struct (12b))-->
-    <attribute side="server" code="0x3D" define="OPERATIONAL_DATASET_COMPONENTS" type="ARRAY" entryType="OperationalDatasetComponents" length="14" writable="false" optional="false">OperationalDatasetComponents</attribute>
+    <attribute side="server" code="0x38" define="ACTIVE_TIMESTAMP" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" isNullable="true" optional="true">ActiveTimestamp</attribute>
+    <attribute side="server" code="0x39" define="PENDING_TIMESTAMP" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" isNullable="true" optional="true">PendingTimestamp</attribute>
+    <attribute side="server" code="0x3A" define="DELAY" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x0000" isNullable="true" optional="true">delay</attribute>
+    <attribute side="server" code="0x3B" define="SECURITY_POLICY" type="SecurityPolicy" writable="false" isNullable="true" optional="false">SecurityPolicy</attribute>
+    <attribute side="server" code="0x3C" define="DIAG_CHANNEL_MASK" type="OCTET_STRING" length="4" writable="false" isNullable="true" optional="false">ChannelMask</attribute>
+    <attribute side="server" code="0x3D" define="OPERATIONAL_DATASET_COMPONENTS" type="OperationalDatasetComponents" writable="false" isNullable="true" optional="false">OperationalDatasetComponents</attribute>
     <attribute side="server" code="0x3E" define="ACTIVE_THREAD_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFault" length="4" writable="false" optional="false">ActiveNetworkFaultsList</attribute>
     <command source="client" code="0x00" name="ResetCounts" optional="true" cli="chip thread_network_diagnostics resetcounts">
       <description>Reception of this command SHALL reset the OverrunCount attributes to 0</description>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml
index 65420d8e5ef79b..2429329895617a 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/general.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml
@@ -285,11 +285,11 @@ limitations under the License.
     <attribute side="server" code="0x0006" define="MAX_FREQUENCY" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">max frequency</attribute>
     
     <attribute side="server" code="0x0010" define="ON_OFF_TRANSITION_TIME" type="INT16U" writable="true" default="0x0000" optional="true">on off transition time</attribute>
-    <attribute side="server" code="0x0011" define="ON_LEVEL" type="INT8U" isNullable="true" writable="true" optional="true">on level</attribute>
+    <attribute side="server" code="0x0011" define="ON_LEVEL" type="INT8U" isNullable="true" writable="true" optional="false">on level</attribute>
     <attribute side="server" code="0x0012" define="ON_TRANSITION_TIME" type="INT16U" isNullable="true" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">on transition time</attribute>
     <attribute side="server" code="0x0013" define="OFF_TRANSITION_TIME" type="INT16U" isNullable="true" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">off transition time</attribute>
     <attribute side="server" code="0x0014" define="DEFAULT_MOVE_RATE" type="INT8U" isNullable="true" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">default move rate</attribute>
-    <attribute side="server" code="0x000F" define="OPTIONS" type="BITMAP8" min="0x00" max="0x03" writable="true" default="0x00" optional="true" introducedIn="l&amp;o-1.0-15-0014-04">options</attribute>
+    <attribute side="server" code="0x000F" define="OPTIONS" type="BITMAP8" min="0x00" max="0x03" writable="true" default="0x00" optional="false" introducedIn="l&amp;o-1.0-15-0014-04">options</attribute>
     <attribute side="server" code="0x4000" define="START_UP_CURRENT_LEVEL" type="INT8U" isNullable="true" writable="true" optional="true" introducedIn="l&amp;o-1.0-15-0014-04">
       <description>start up current level</description>
       <access op="read" role="view"/>
@@ -357,6 +357,13 @@ limitations under the License.
         Command description for StopWithOnOff
       </description>
     </command>
+    <command source="client" code="0x08" name="MoveToClosestFrequency" optional="true">
+      <description>
+        Change the currrent frequency to the provided one, or a close
+        approximation if the exact provided one is not possible.
+      </description>
+      <arg name="Frequency" type="int16u"/>
+    </command>
   </cluster>
   <cluster>
     <name>Alarms</name>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
index f076d984601003..2555a29c8ec10e 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -278,8 +278,8 @@ limitations under the License.
       <access op="write" role="manage"/>
     </attribute>
     <!-- COLOR_POINT_B_INTENSITY -->
-    <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="INT16U" min="0x0000" max="0xFFFF" writable="false" optional="false">CoupleColorTempToLevelMinMireds</attribute>
-    <attribute side="server" code="0x4010" define="START_UP_COLOR_TEMPERATURE_MIREDS" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="false">
+    <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="INT16U" min="0x0000" max="0xFFFF" writable="false" optional="true">CoupleColorTempToLevelMinMireds</attribute>
+    <attribute side="server" code="0x4010" define="START_UP_COLOR_TEMPERATURE_MIREDS" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
       <description>StartUpColorTemperatureMireds</description>
       <access op="read" role="view"/>
       <access op="write" role="manage"/>
@@ -351,7 +351,7 @@ limitations under the License.
       <arg name="OptionsMask" type="BITMAP8"/>
       <arg name="OptionsOverride" type="BITMAP8"/>
     </command>
-    <command source="client" code="0x07" name="MoveToColor" optional="false" cli="zcl color-control movetocolor">
+    <command source="client" code="0x07" name="MoveToColor" optional="true" cli="zcl color-control movetocolor">
       <description>
         Move to specified color.
       </description>
@@ -361,7 +361,7 @@ limitations under the License.
       <arg name="OptionsMask" type="BITMAP8"/>
       <arg name="OptionsOverride" type="BITMAP8"/>
     </command>
-    <command source="client" code="0x08" name="MoveColor" optional="false" cli="zcl color-control movecolor">
+    <command source="client" code="0x08" name="MoveColor" optional="true" cli="zcl color-control movecolor">
       <description>
         Moves the color.
       </description>
@@ -370,7 +370,7 @@ limitations under the License.
       <arg name="OptionsMask" type="BITMAP8"/>
       <arg name="OptionsOverride" type="BITMAP8"/>
     </command>
-    <command source="client" code="0x09" name="StepColor" optional="false" cli="zcl color-control stepcolor">
+    <command source="client" code="0x09" name="StepColor" optional="true" cli="zcl color-control stepcolor">
       <description>
         Steps the lighting to a specific color.
       </description>
@@ -1022,249 +1022,6 @@ limitations under the License.
     <attribute side="server" code="0x0003" define="SODIUM_CONCENTRATION_MEASUREMENT_TOLERANCE" type="SINGLE" min="0x0000" max="0x0800" writable="false" optional="true">tolerance</attribute>
     <!-- TOLERANCE -->
   </cluster>
-  <cluster>
-    <name>IAS Zone</name>
-    <domain>Security &amp; Safety</domain>
-    <description>Attributes and commands for IAS security zone devices.</description>
-    <code>0x0500</code>
-    <define>IAS_ZONE_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="2"/>
-    <attribute side="server" code="0x0000" define="ZONE_STATE" type="ENUM8" writable="false" default="0x00" optional="false">zone state</attribute>
-    <attribute side="server" code="0x0001" define="ZONE_TYPE" type="ENUM16" writable="false" optional="false">zone type</attribute>
-    <attribute side="server" code="0x0002" define="ZONE_STATUS" type="BITMAP16" writable="false" default="0x0000" optional="false">zone status</attribute>
-    <attribute side="server" code="0x0010" define="IAS_CIE_ADDRESS" type="node_id" writable="true" optional="false">IAS CIE address</attribute>
-    <attribute side="server" code="0x0011" define="ZONE_ID" type="INT8U" writable="false" default="0xff" optional="false">Zone ID</attribute>
-    <attribute side="server" code="0x0012" define="NUMBER_OF_ZONE_SENSITIVITY_LEVELS_SUPPORTED" type="INT8U" writable="false" default="0x02" optional="true">Number of Zone Sensitivity Levels Supported</attribute>
-    <attribute side="server" code="0x0013" define="CURRENT_ZONE_SENSITIVITY_LEVEL" type="INT8U" writable="true" default="0x00" optional="true">Current Zone Sensitivity Level</attribute>
-    <command source="client" code="0x00" name="ZoneEnrollResponse" optional="false" disableDefaultResponse="true">
-      <description>
-        Command description for zoneEnrollResponse
-      </description>
-      <arg name="enrollResponseCode" type="IasEnrollResponseCode"/>
-      <arg name="zoneId" type="INT8U"/>
-    </command>
-    <command source="client" code="0x01" name="InitiateNormalOperationMode" response="InitiateNormalOperationModeResponse" optional="true">
-      <description>
-        Used to tell the IAS Zone server to commence normal operation mode
-      </description>
-    </command>
-    <command source="client" code="0x02" name="InitiateTestMode" response="InitiateTestModeResponse" optional="true">
-      <description>
-        Certain IAS Zone servers may have operational configurations that could be configured OTA or locally on the device. This command enables them to be remotely placed into a test mode so that the user or installer may configure their field of view, sensitivity, and other operational parameters.
-      </description>
-      <arg name="testModeDuration" type="INT8U"/>
-      <arg name="currentZoneSensitivityLevel" type="INT8U"/>
-    </command>
-    <command source="server" code="0x00" name="ZoneStatusChangeNotification" optional="false" cli="zcl ias-zone sc">
-      <description>
-        Command description for zoneStatusChangeNotification
-      </description>
-      <arg name="zoneStatus" type="IasZoneStatus"/>
-      <arg name="extendedStatus" type="BITMAP8"/>
-      <arg name="zoneId" type="INT8U" introducedIn="ha-1.2-05-3520-29"/>
-      <arg name="delay" type="INT16U" introducedIn="ha-1.2-05-3520-29"/>
-    </command>
-    <command source="server" code="0x01" name="ZoneEnrollRequest" response="ZoneEnrollResponse" optional="false" cli="zcl ias-zone enroll">
-      <description>
-        Command description for zoneEnrollRequest
-      </description>
-      <arg name="zoneType" type="IasZoneType"/>
-      <arg name="manufacturerCode" type="INT16U"/>
-    </command>
-    <command source="server" code="0x02" name="InitiateNormalOperationModeResponse" optional="true" disableDefaultResponse="true">
-      <description>
-        Confirms that the IAS Zone server has commenced normal operation mode.
-      </description>
-    </command>
-    <command source="server" code="0x03" name="InitiateTestModeResponse" optional="true" disableDefaultResponse="true">
-      <description>
-        Confirms that the IAS Zone server has commenced test mode and that the IAS Zone client should treat any Zone Status Change Notification commands received from the sending IAS Zone server as being in response to test events.
-      </description>
-    </command>
-  </cluster>
-  <cluster>
-    <name>IAS ACE</name>
-    <domain>Security &amp; Safety</domain>
-    <description>Attributes and commands for IAS Ancillary Control Equipment.</description>
-    <code>0x0501</code>
-    <define>IAS_ACE_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" init="false">true</server>
-    <command source="client" code="0x00" name="Arm" response="ArmResponse" optional="false" cli="zcl ias-ace a">
-      <description>
-        Command description for Arm
-      </description>
-      <arg name="armMode" type="IasAceArmMode"/>
-      <arg name="armDisarmCode" type="CHAR_STRING" introducedIn="ha-1.2-05-3520-29"/>
-      <arg name="zoneId" type="INT8U" introducedIn="ha-1.2-05-3520-29"/>
-    </command>
-    <command source="client" code="0x01" name="Bypass" response="BypassResponse" optional="false" cli="zcl ias-ace b">
-      <description>
-        Command description for Bypass
-      </description>
-      <arg name="numberOfZones" type="INT8U"/>
-      <arg name="zoneIds" type="INT8U" array="true" countArg="numberOfZones"/>
-      <arg name="armDisarmCode" type="CHAR_STRING" introducedIn="ha-1.2.1-05-3520-30"/>
-    </command>
-    <command source="client" code="0x02" name="Emergency" optional="false" cli="zcl ias-ace e">
-      <description>
-        Command description for Emergency
-      </description>
-    </command>
-    <command source="client" code="0x03" name="Fire" optional="false" cli="zcl ias-ace f">
-      <description>
-        Command description for Fire
-      </description>
-    </command>
-    <command source="client" code="0x04" name="Panic" optional="false" cli="zcl ias-ace p">
-      <description>
-        Command description for Panic
-      </description>
-    </command>
-    <command source="client" code="0x05" name="GetZoneIdMap" response="GetZoneIdMapResponse" optional="false" cli="zcl ias-ace getzm">
-      <description>
-        Command description for GetZoneIdMap
-      </description>
-    </command>
-    <command source="client" code="0x06" name="GetZoneInformation" response="GetZoneInformationResponse" optional="false" cli="zcl ias-ace getzi">
-      <description>
-        Command description for GetZoneInformation
-      </description>
-      <arg name="zoneId" type="INT8U"/>
-    </command>
-    <command source="client" code="0x07" name="GetPanelStatus" response="GetPanelStatusResponse" optional="false" introducedIn="ha-1.2.1-05-3520-30">
-      <description>
-        Used by the ACE client to request an update to the status of the ACE server
-      </description>
-    </command>
-    <command source="client" code="0x08" name="GetBypassedZoneList" optional="false" introducedIn="ha-1.2.1-05-3520-30">
-      <description>
-        Used by the ACE client to retrieve the bypassed zones
-        </description>
-    </command>
-    <command source="client" code="0x09" name="GetZoneStatus" response="GetZoneStatusResponse" optional="false" introducedIn="ha-1.2.1-05-3520-30">
-      <description>
-        Used by the ACE client to request an update to the zone status of the ACE server
-      </description>
-      <arg name="startingZoneId" type="INT8U"/>
-      <arg name="maxNumberOfZoneIds" type="INT8U"/>
-      <arg name="zoneStatusMaskFlag" type="BOOLEAN"/>
-      <arg name="zoneStatusMask" type="BITMAP16"/>
-    </command>
-    <command source="server" code="0x00" name="ArmResponse" optional="false" disableDefaultResponse="true">
-      <description>
-        Command description for ArmResponse
-      </description>
-      <arg name="armNotification" type="IasAceArmNotification"/>
-    </command>
-    <command source="server" code="0x01" name="GetZoneIdMapResponse" optional="false" disableDefaultResponse="true">
-      <description>
-        Command description for GetZoneIdMapResponse
-      </description>
-      <arg name="section0" type="BITMAP16"/>
-      <arg name="section1" type="BITMAP16"/>
-      <arg name="section2" type="BITMAP16"/>
-      <arg name="section3" type="BITMAP16"/>
-      <arg name="section4" type="BITMAP16"/>
-      <arg name="section5" type="BITMAP16"/>
-      <arg name="section6" type="BITMAP16"/>
-      <arg name="section7" type="BITMAP16"/>
-      <arg name="section8" type="BITMAP16"/>
-      <arg name="section9" type="BITMAP16"/>
-      <arg name="section10" type="BITMAP16"/>
-      <arg name="section11" type="BITMAP16"/>
-      <arg name="section12" type="BITMAP16"/>
-      <arg name="section13" type="BITMAP16"/>
-      <arg name="section14" type="BITMAP16"/>
-      <arg name="section15" type="BITMAP16"/>
-    </command>
-    <command source="server" code="0x02" name="GetZoneInformationResponse" optional="false" disableDefaultResponse="true">
-      <description>
-        Command description for GetZoneInformationResponse
-      </description>
-      <arg name="zoneId" type="INT8U"/>
-      <arg name="zoneType" type="IasZoneType"/>
-      <arg name="ieeeAddress" type="node_id"/>
-      <arg name="zoneLabel" type="CHAR_STRING" introducedIn="ha-1.2.1-05-3520-30"/>
-    </command>
-    <command source="server" code="0x03" name="ZoneStatusChanged" optional="false">
-      <description>
-        This command updates ACE clients in the system of changes to zone status recorded by the ACE server (e.g., IAS CIE device).
-      </description>
-      <arg name="zoneId" type="INT8U"/>
-      <arg name="zoneStatus" type="ENUM16"/>
-      <arg name="audibleNotification" type="IasAceAudibleNotification" introducedIn="ha-1.2.1-05-3520-30"/>
-      <arg name="zoneLabel" type="CHAR_STRING" introducedIn="ha-1.2.1-05-3520-30"/>
-    </command>
-    <command source="server" code="0x04" name="PanelStatusChanged" optional="false">
-      <description>
-        This command updates ACE clients in the system of changes to panel status recorded by the ACE server (e.g., IAS CIE device).
-      </description>
-      <arg name="panelStatus" type="IasAcePanelStatus"/>
-      <arg name="secondsRemaining" type="INT8U"/>
-      <arg name="audibleNotification" type="IasAceAudibleNotification" introducedIn="ha-1.2.1-05-3520-30"/>
-      <arg name="alarmStatus" type="IasAceAlarmStatus" introducedIn="ha-1.2.1-05-3520-30"/>
-    </command>
-    <command source="server" code="0x05" name="GetPanelStatusResponse" optional="false" introducedIn="ha-1.2.1-05-3520-30" disableDefaultResponse="true">
-      <description>
-        Command updates requesting IAS ACE clients in the system of changes to the security panel status recorded by the ACE server.
-      </description>
-      <arg name="panelStatus" type="IasAcePanelStatus"/>
-      <arg name="secondsRemaining" type="INT8U"/>
-      <arg name="audibleNotification" type="IasAceAudibleNotification"/>
-      <arg name="alarmStatus" type="IasAceAlarmStatus"/>
-    </command>
-    <command source="server" code="0x06" name="SetBypassedZoneList" optional="false" introducedIn="ha-1.2.1-05-3520-30">
-      <description>
-       Sets the list of bypassed zones on the IAS ACE client
-      </description>
-      <arg name="numberOfZones" type="INT8U"/>
-      <arg name="zoneIds" type="INT8U" array="true"/>
-    </command>
-    <command source="server" code="0x07" name="BypassResponse" optional="false" introducedIn="ha-1.2.1-05-3520-30" disableDefaultResponse="true">
-      <description>
-        Provides the response of the security panel to the request from the IAS ACE client to bypass zones via a Bypass command.
-      </description>
-      <arg name="numberOfZones" type="INT8U"/>
-      <arg name="bypassResult" type="IasAceBypassResult" array="true"/>
-    </command>
-    <command source="server" code="0x08" name="GetZoneStatusResponse" optional="false" introducedIn="ha-1.2.1-05-3520-30" disableDefaultResponse="true">
-      <description>
-        This command updates requesting IAS ACE clients in the system of changes to the IAS Zone server statuses recorded by the ACE server (e.g., IAS CIE device).
-      </description>
-      <arg name="zoneStatusComplete" type="BOOLEAN"/>
-      <arg name="numberOfZones" type="INT8U"/>
-      <arg name="zoneStatusResult" type="IasAceZoneStatusResult" array="true"/>
-    </command>
-  </cluster>
-  <cluster>
-    <name>IAS WD</name>
-    <domain>Security &amp; Safety</domain>
-    <description>Attributes and commands for IAS Warning Devices.</description>
-    <code>0x0502</code>
-    <define>IAS_WD_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" tickFrequency="quarter" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="2"/>
-    <attribute side="server" code="0x0000" define="MAX_DURATION" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="240" optional="false">max duration</attribute>
-    <command source="client" code="0x00" name="StartWarning" optional="false">
-      <description>
-        Command description for StartWarning
-      </description>
-      <arg name="warningInfo" type="WarningInfo"/>
-      <arg name="warningDuration" type="INT16U"/>
-      <arg name="strobeDutyCycle" type="INT8U" introducedIn="ha-1.2-05-3520-29"/>
-      <arg name="strobeLevel" type="ENUM8" introducedIn="ha-1.2-05-3520-29"/>
-    </command>
-    <command source="client" code="0x01" name="Squawk" optional="false">
-      <description>
-        Command description for Squawk
-      </description>
-      <arg name="squawkInfo" type="SquawkInfo"/>
-    </command>
-  </cluster>
   <cluster>
     <name>Barrier Control</name>
     <domain>Closures</domain>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types.xml b/src/app/zap-templates/zcl/data-model/silabs/types.xml
index 6e34e97c17a532..2647817d2da415 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/types.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/types.xml
@@ -261,98 +261,6 @@ limitations under the License.
     <field name="Ultrasonic" mask="0x02"/>
     <field name="PhysicalContact" mask="0x04"/>
   </bitmap>
-  <enum name="IasZoneState" type="ENUM8">
-    <item name="notEnrolled" value="0x0"/>
-    <item name="enrolled" value="0x1"/>
-  </enum>
-  <enum name="IasZoneType" type="ENUM16">
-    <cluster code="0x0500"/>
-    <cluster code="0x0501"/>
-    <item name="standardCie" value="0x0"/>
-    <item name="motionSensor" value="0xd"/>
-    <item name="contactSwitch" value="0x15"/>
-    <item name="fireSensor" value="0x28"/>
-    <item name="waterSensor" value="0x2a"/>
-    <item name="gasSensor" value="0x2b"/>
-    <item name="personalEmergencyDevice" value="0x2c"/>
-    <item name="vibrationMovementSensor" value="0x2d"/>
-    <item name="remoteControl" value="0x10f"/>
-    <item name="keyFob" value="0x115"/>
-    <item name="keypad" value="0x21d"/>
-    <item name="standardWarningDevice" value="0x225"/>
-    <item name="glassBreakSensor" value="0x226"/>
-    <item name="carbonMonoxideSensor" value="0x227"/>
-    <item name="securityRepeater" value="0x0229"/>
-    <!-- 0x8000 - 0xFFFE manufacturer specific types -->
-    <item name="invalidZoneType" value="0xFFFF"/>
-  </enum>
-  <enum name="IasEnrollResponseCode" type="ENUM8">
-    <cluster code="0x0500"/>
-    <item name="success" value="0x0"/>
-    <item name="notSupported" value="0x1"/>
-    <item name="noEnrollPermit" value="0x2"/>
-    <item name="tooManyZones" value="0x3"/>
-  </enum>
-  <enum name="IasAceArmMode" type="ENUM8">
-    <cluster code="0x0501"/>
-    <item name="disarm" value="0x0"/>
-    <item name="armDayHomeZonesOnly" value="0x1"/>
-    <item name="armNightSleepZonesOnly" value="0x2"/>
-    <item name="armAllZones" value="0x3"/>
-  </enum>
-  <enum name="IasAceArmNotification" type="ENUM8">
-    <cluster code="0x0501"/>
-    <item name="allZonesDisarmed" value="0x0"/>
-    <item name="onlyDayHomeZonesArmed" value="0x1"/>
-    <item name="onlyNightSleepZonesArmed" value="0x2"/>
-    <item name="allZonesArmed" value="0x3"/>
-    <item name="invalidArmDisarmCode" value="0x04"/>
-    <item name="notReadyToArm" value="0x05"/>
-    <item name="alreadyDisarmed" value="0x06"/>
-  </enum>
-  <enum name="IasAceAudibleNotification" type="ENUM8">
-    <cluster code="0x0501"/>
-    <item name="mute" value="0x0"/>
-    <item name="defaultSound" value="0x1"/>
-  </enum>
-  <enum name="IasAceAlarmStatus" type="ENUM8">
-    <cluster code="0x0501"/>
-    <item name="noAlarm" value="0x0"/>
-    <item name="burglar" value="0x1"/>
-    <item name="fire" value="0x2"/>
-    <item name="emergency" value="0x3"/>
-    <item name="policePanic" value="0x4"/>
-    <item name="firePanic" value="0x5"/>
-    <item name="emergencyPanic" value="0x6"/>
-  </enum>
-  <enum name="IasAcePanelStatus" type="ENUM8">
-    <cluster code="0x0501"/>
-    <item name="panelDisarmed" value="0x00"/>
-    <item name="armedStay" value="0x01"/>
-    <item name="armedNight" value="0x02"/>
-    <item name="armedAway" value="0x03"/>
-    <item name="exitDelay" value="0x04"/>
-    <item name="entryDelay" value="0x05"/>
-    <item name="notReadyToArm" value="0x06"/>
-    <item name="inAlarm" value="0x07"/>
-    <item name="armingStay" value="0x08"/>
-    <item name="armingNight" value="0x09"/>
-    <item name="armingAway" value="0x0A"/>
-  </enum>
-  <enum name="IasAceBypassResult" type="ENUM8">
-    <cluster code="0x0501"/>
-    <item name="zoneBypassed" value="0x0"/>
-    <item name="zoneNotBypassed" value="0x1"/>
-    <item name="notAllowed" value="0x2"/>
-    <item name="invalidZoneId" value="0x3"/>
-    <item name="unknownZoneId" value="0x4"/>
-    <item name="invalidArmDisarmCode" value="0x5"/>
-  </enum>
-  <struct name="IasAceZoneStatusResult">
-    <cluster code="0x0501"/>
-    <item name="zoneId" type="INT8U"/>
-    <item name="zoneStatus" type="IasZoneStatus"/>
-  </struct>
   <enum name="WarningMode" type="ENUM8">
     <item name="stop" value="0x0"/>
     <item name="burglar" value="0x1"/>
diff --git a/src/app/zap-templates/zcl/data-model/test/mode-select-extensions.xml b/src/app/zap-templates/zcl/data-model/test/mode-select-extensions.xml
new file mode 100644
index 00000000000000..c10c691c357481
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/test/mode-select-extensions.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2022 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<configurator>
+  <domain name="CHIP"/>
+  <!-- This extends the ModeSelect cluster -->
+  <clusterExtension code="0x0050">
+    <!--
+       Manufacturer specific extension attribute:
+          - Prefix: 0xFFF1 - Test vendor MC
+          - Suffix: 0x0001 - Non-global attribute id
+     -->
+    <attribute side="server" code="0xFFF10001" define="MEI_EXTENSION" type="INT8U" writable="false" optional="true" isNullable="false">ManufacturerExtension</attribute>
+
+    <!--
+       Manufacturer specific extension command:
+          - Prefix: 0xFFF1 - Test vendor MC
+          - Suffix: 0x0001 - command id
+     -->
+    <command source="client" code="0xFFF10001" name="SampleMfgExtensionCommand" optional="true">
+      <description>Sample manufacturer specific extension command</description>
+    </command>
+  </clusterExtension>
+</configurator>
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
new file mode 100644
index 00000000000000..d99dcd82e89bab
--- /dev/null
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -0,0 +1,262 @@
+{
+    "version": "ZCL Test Data",
+    "xmlRoot": [
+        ".",
+        "./data-model/chip/",
+        "./data-model/silabs/",
+        "./data-model/test"
+    ],
+    "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
+    "xmlFile": [
+        "access-control-definitions.xml",
+        "access-control-cluster.xml",
+        "account-login-cluster.xml",
+        "administrator-commissioning-cluster.xml",
+        "application-basic-cluster.xml",
+        "application-launcher-cluster.xml",
+        "audio-output-cluster.xml",
+        "basic-information-cluster.xml",
+        "binding-cluster.xml",
+        "boolean-state-cluster.xml",
+        "bridged-actions-cluster.xml",
+        "bridged-device-basic.xml",
+        "chip-ota.xml",
+        "chip-types.xml",
+        "channel-cluster.xml",
+        "clusters-extensions.xml",
+        "content-launch-cluster.xml",
+        "descriptor-cluster.xml",
+        "diagnostic-logs-cluster.xml",
+        "door-lock-cluster.xml",
+        "ethernet-network-diagnostics-cluster.xml",
+        "fixed-label-cluster.xml",
+        "flow-measurement-cluster.xml",
+        "general-commissioning-cluster.xml",
+        "general-diagnostics-cluster.xml",
+        "global-attributes.xml",
+        "group-key-mgmt-cluster.xml",
+        "identify-cluster.xml",
+        "illuminance-measurement-cluster.xml",
+        "keypad-input-cluster.xml",
+        "localization-configuration-cluster.xml",
+        "low-power-cluster.xml",
+        "media-input-cluster.xml",
+        "media-playback-cluster.xml",
+        "mode-select-cluster.xml",
+        "mode-select-extensions.xml",
+        "network-commissioning-cluster.xml",
+        "onoff-cluster.xml",
+        "operational-credentials-cluster.xml",
+        "pressure-measurement-cluster.xml",
+        "power-source-cluster.xml",
+        "power-source-configuration-cluster.xml",
+        "proxy-configuration-cluster.xml",
+        "proxy-discovery-cluster.xml",
+        "proxy-valid-cluster.xml",
+        "pump-configuration-and-control-cluster.xml",
+        "pwm-cluster.xml",
+        "relative-humidity-measurement-cluster.xml",
+        "scene.xml",
+        "software-diagnostics-cluster.xml",
+        "switch-cluster.xml",
+        "target-navigator-cluster.xml",
+        "temperature-measurement-cluster.xml",
+        "test-cluster.xml",
+        "thermostat-cluster.xml",
+        "thread-network-diagnostics-cluster.xml",
+        "time-format-localization-cluster.xml",
+        "time-synchronization-cluster.xml",
+        "user-label-cluster.xml",
+        "unit-localization-cluster.xml",
+        "wake-on-lan-cluster.xml",
+        "wifi-network-diagnostics-cluster.xml",
+        "window-covering.xml",
+        "matter-devices.xml",
+        "ami.xml",
+        "general.xml",
+        "ha-devices.xml",
+        "ha.xml",
+        "lo-devices.xml",
+        "types.xml",
+        "zll-devices.xml",
+        "zll.xml"
+    ],
+    "manufacturersXml": "../../../../third_party/zap/repo/zcl-builtin/shared/manufacturers.xml",
+    "options": {
+        "text": {
+            "defaultResponsePolicy": ["Always", "Conditional", "Never"]
+        },
+        "bool": ["commandDiscovery"]
+    },
+    "defaults": {
+        "text": {
+            "manufacturerCodes": "0x1002",
+            "defaultResponsePolicy": "always"
+        },
+        "bool": {
+            "commandDiscovery": true
+        }
+    },
+    "listsUseAttributeAccessInterface": true,
+    "attributeAccessInterfaceAttributes": {
+        "Access Control": [
+            "ClusterRevision",
+            "SubjectsPerAccessControlEntry",
+            "TargetsPerAccessControlEntry",
+            "AccessControlEntriesPerFabric"
+        ],
+        "AdministratorCommissioning": [
+            "WindowStatus",
+            "AdminFabricIndex",
+            "AdminVendorId"
+        ],
+        "Basic": [
+            "DataModelRevision",
+            "VendorName",
+            "VendorID",
+            "ProductName",
+            "ProductID",
+            "Location",
+            "HardwareVersion",
+            "HardwareVersionString",
+            "SoftwareVersion",
+            "SoftwareVersionString",
+            "ManufacturingDate",
+            "PartNumber",
+            "ProductURL",
+            "ProductLabel",
+            "SerialNumber",
+            "UniqueID",
+            "CapabilityMinima"
+        ],
+        "Descriptor": ["ClusterRevision"],
+        "Ethernet Network Diagnostics": [
+            "PHYRate",
+            "FullDuplex",
+            "CarrierDetect",
+            "TimeSinceReset",
+            "PacketRxCount",
+            "PacketTxCount",
+            "TxErrCount",
+            "CollisionCount",
+            "OverrunCount"
+        ],
+        "General Commissioning": [
+            "RegulatoryConfig",
+            "LocationCapability",
+            "BasicCommissioningInfo",
+            "SupportsConcurrentConnection"
+        ],
+        "General Diagnostics": [
+            "NetworkInterfaces",
+            "ActiveHardwareFaults",
+            "ActiveRadioFaults",
+            "ActiveNetworkFaults",
+            "RebootCount",
+            "UpTime",
+            "TotalOperationalHours",
+            "BootReasons"
+        ],
+        "Group Key Management": [
+            "ClusterRevision",
+            "MaxGroupsPerFabric",
+            "MaxGroupKeysPerFabric",
+            "FeatureMap"
+        ],
+        "Operational Credentials": [
+            "SupportedFabrics",
+            "CommissionedFabrics",
+            "CurrentFabricIndex"
+        ],
+        "Software Diagnostics": [
+            "CurrentHeapFree",
+            "CurrentHeapHighWatermark",
+            "CurrentHeapUsed",
+            "FeatureMap",
+            "ThreadMetrics"
+        ],
+        "Test Cluster": [
+            "struct_attr",
+            "nullable_struct",
+            "general_error_boolean",
+            "cluster_error_boolean"
+        ],
+        "Thread Network Diagnostics": [
+            "channel",
+            "RoutingRole",
+            "NetworkName",
+            "PanId",
+            "ExtendedPanId",
+            "MeshLocalPrefix",
+            "OverrunCount",
+            "PartitionId",
+            "weighting",
+            "DataVersion",
+            "StableDataVersion",
+            "LeaderRouterId",
+            "DetachedRoleCount",
+            "ChildRoleCount",
+            "RouterRoleCount",
+            "LeaderRoleCount",
+            "AttachAttemptCount",
+            "PartitionIdChangeCount",
+            "BetterPartitionAttachAttemptCount",
+            "ParentChangeCount",
+            "TxTotalCount",
+            "TxUnicastCount",
+            "TxBroadcastCount",
+            "TxAckRequestedCount",
+            "TxAckedCount",
+            "TxNoAckRequestedCount",
+            "TxDataCount",
+            "TxDataPollCount",
+            "TxBeaconCount",
+            "TxBeaconRequestCount",
+            "TxOtherCount",
+            "TxRetryCount",
+            "TxDirectMaxRetryExpiryCount",
+            "TxIndirectMaxRetryExpiryCount",
+            "TxErrCcaCount",
+            "TxErrAbortCount",
+            "TxErrBusyChannelCount",
+            "RxTotalCount",
+            "RxUnicastCount",
+            "RxBroadcastCount",
+            "RxDataCount",
+            "RxDataPollCount",
+            "RxBeaconCount",
+            "RxBeaconRequestCount",
+            "RxOtherCount",
+            "RxAddressFilteredCount",
+            "RxDestAddrFilteredCount",
+            "RxDuplicatedCount",
+            "RxErrNoFrameCount",
+            "RxErrUnknownNeighborCount",
+            "RxErrInvalidSrcAddrCount",
+            "RxErrSecCount",
+            "RxErrFcsCount",
+            "RxErrOtherCount",
+            "ActiveTimestamp",
+            "PendingTimestamp",
+            "delay",
+            "ChannelMask"
+        ],
+        "WiFi Network Diagnostics": [
+            "bssid",
+            "SecurityType",
+            "WiFiVersion",
+            "ChannelNumber",
+            "Rssi",
+            "BeaconLostCount",
+            "BeaconRxCount",
+            "PacketMulticastRxCount",
+            "PacketMulticastTxCount",
+            "PacketUnicastRxCount",
+            "PacketUnicastTxCount",
+            "CurrentMaxRate",
+            "OverrunCount"
+        ]
+    },
+    "defaultReportingPolicy": "mandatory",
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"]
+}
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 8f763361d48acb..e0c451a858b09d 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -164,8 +164,9 @@
         ],
         "Software Diagnostics": [
             "CurrentHeapFree",
-            "CurrentHeapUsed",
             "CurrentHeapHighWatermark",
+            "CurrentHeapUsed",
+            "FeatureMap",
             "ThreadMetrics"
         ],
         "Test Cluster": [
@@ -174,6 +175,66 @@
             "general_error_boolean",
             "cluster_error_boolean"
         ],
+        "Thread Network Diagnostics": [
+            "channel",
+            "RoutingRole",
+            "NetworkName",
+            "PanId",
+            "ExtendedPanId",
+            "MeshLocalPrefix",
+            "OverrunCount",
+            "PartitionId",
+            "weighting",
+            "DataVersion",
+            "StableDataVersion",
+            "LeaderRouterId",
+            "DetachedRoleCount",
+            "ChildRoleCount",
+            "RouterRoleCount",
+            "LeaderRoleCount",
+            "AttachAttemptCount",
+            "PartitionIdChangeCount",
+            "BetterPartitionAttachAttemptCount",
+            "ParentChangeCount",
+            "TxTotalCount",
+            "TxUnicastCount",
+            "TxBroadcastCount",
+            "TxAckRequestedCount",
+            "TxAckedCount",
+            "TxNoAckRequestedCount",
+            "TxDataCount",
+            "TxDataPollCount",
+            "TxBeaconCount",
+            "TxBeaconRequestCount",
+            "TxOtherCount",
+            "TxRetryCount",
+            "TxDirectMaxRetryExpiryCount",
+            "TxIndirectMaxRetryExpiryCount",
+            "TxErrCcaCount",
+            "TxErrAbortCount",
+            "TxErrBusyChannelCount",
+            "RxTotalCount",
+            "RxUnicastCount",
+            "RxBroadcastCount",
+            "RxDataCount",
+            "RxDataPollCount",
+            "RxBeaconCount",
+            "RxBeaconRequestCount",
+            "RxOtherCount",
+            "RxAddressFilteredCount",
+            "RxDestAddrFilteredCount",
+            "RxDuplicatedCount",
+            "RxErrNoFrameCount",
+            "RxErrUnknownNeighborCount",
+            "RxErrInvalidSrcAddrCount",
+            "RxErrSecCount",
+            "RxErrFcsCount",
+            "RxErrOtherCount",
+            "ActiveTimestamp",
+            "PendingTimestamp",
+            "delay",
+            "ChannelMask"
+        ],
         "WiFi Network Diagnostics": [
             "bssid",
             "SecurityType",
diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py
index c6b8fbd3f7aa7c..1adf32c657f8ef 100755
--- a/src/app/zap_cluster_list.py
+++ b/src/app/zap_cluster_list.py
@@ -40,7 +40,7 @@
     'GENERAL_DIAGNOSTICS_CLUSTER': ['general-diagnostics-server'],
     'GROUP_KEY_MANAGEMENT_CLUSTER': ['group-key-mgmt-server'],
     'GROUPS_CLUSTER': ['groups-server'],
-    'IAS_ZONE_CLUSTER': ['ias-zone-server'],
+    'IAS_ZONE_CLUSTER': [],
     'IDENTIFY_CLUSTER': ['identify-server'],
     'ILLUMINANCE_MEASUREMENT_CLUSTER': [],
     'KEYPAD_INPUT_CLUSTER': ['keypad-input-server'],
@@ -123,7 +123,7 @@
     'GENERAL_DIAGNOSTICS_CLUSTER': [],
     'GROUP_KEY_MANAGEMENT_CLUSTER': [],
     'GROUPS_CLUSTER': [],
-    'IAS_ZONE_CLUSTER': ['ias-zone-client'],
+    'IAS_ZONE_CLUSTER': [],
     'IDENTIFY_CLUSTER': [],
     'ILLUMINANCE_MEASUREMENT_CLUSTER': [],
     'KEYPAD_INPUT_CLUSTER': [],
diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index 6e0b16b9da89fc..4ddd081e46ed04 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -18,6 +18,7 @@
 
 #include <controller/AutoCommissioner.h>
 
+#include <app/InteractionModelTimeout.h>
 #include <controller/CHIPDeviceController.h>
 #include <credentials/CHIPCert.h>
 #include <lib/support/SafeInt.h>
@@ -288,29 +289,56 @@ CHIP_ERROR AutoCommissioner::StartCommissioning(DeviceCommissioner * commissione
     CHIP_ERROR err               = CHIP_NO_ERROR;
     CommissioningStage nextStage = GetNextCommissioningStage(CommissioningStage::kSecurePairing, err);
     mCommissioner->PerformCommissioningStep(mCommissioneeDeviceProxy, nextStage, mParams, this, GetEndpoint(nextStage),
-                                            GetCommandTimeout(nextStage));
+                                            GetCommandTimeout(mCommissioneeDeviceProxy, nextStage));
     return CHIP_NO_ERROR;
 }
 
-Optional<System::Clock::Timeout> AutoCommissioner::GetCommandTimeout(CommissioningStage stage) const
+Optional<System::Clock::Timeout> AutoCommissioner::GetCommandTimeout(DeviceProxy * device, CommissioningStage stage) const
 {
-    // Per spec, all commands that are sent with the arm failsafe held need at least a 30s timeout.
-    // Network clusters can indicate the time required to connect, so if we are connecting, use that time as long as it is > 30s.
-    app::Clusters::NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo::DecodableType seconds = 30;
+    // Network clusters can indicate the time required to connect, so if we are
+    // connecting, use that time as our "how long it takes to process server
+    // side" time.  Otherwise pick a time that should be enough for the command
+    // processing: 7s for slow steps that can involve crypto, the default IM
+    // timeout otherwise.
+    // TODO: is this a reasonable estimate for the slow-crypto cases?
+    constexpr System::Clock::Timeout kSlowCryptoProcessingTime = System::Clock::Seconds16(7);
+
+    System::Clock::Timeout timeout;
     switch (stage)
     {
     case CommissioningStage::kWiFiNetworkEnable:
         ChipLogProgress(Controller, "Setting wifi connection time min = %u",
                         mDeviceCommissioningInfo.network.wifi.minConnectionTime);
-        seconds = std::max(mDeviceCommissioningInfo.network.wifi.minConnectionTime, seconds);
+        timeout = System::Clock::Seconds16(mDeviceCommissioningInfo.network.wifi.minConnectionTime);
         break;
     case CommissioningStage::kThreadNetworkEnable:
-        seconds = std::max(mDeviceCommissioningInfo.network.thread.minConnectionTime, seconds);
+        timeout = System::Clock::Seconds16(mDeviceCommissioningInfo.network.thread.minConnectionTime);
+        break;
+    case CommissioningStage::kSendNOC:
+    case CommissioningStage::kSendOpCertSigningRequest:
+        timeout = kSlowCryptoProcessingTime;
         break;
     default:
+        timeout = app::kExpectedIMProcessingTime;
         break;
     }
-    return MakeOptional(System::Clock::Timeout(System::Clock::Seconds16(seconds)));
+
+    // Adjust the timeout for our session transport latency, if we have access
+    // to a session.
+    auto sessionHandle = device->GetSecureSession();
+    if (sessionHandle.HasValue())
+    {
+        timeout = sessionHandle.Value()->ComputeRoundTripTimeout(timeout);
+    }
+
+    // Enforce the spec minimal timeout.  Maybe this enforcement should live in
+    // the DeviceCommissioner?
+    if (timeout < kMinimumCommissioningStepTimeout)
+    {
+        timeout = kMinimumCommissioningStepTimeout;
+    }
+
+    return MakeOptional(timeout);
 }
 
 CHIP_ERROR AutoCommissioner::NOCChainGenerated(ByteSpan noc, ByteSpan icac, ByteSpan rcac, AesCcm128KeySpan ipk,
@@ -326,7 +354,8 @@ CHIP_ERROR AutoCommissioner::NOCChainGenerated(ByteSpan noc, ByteSpan icac, Byte
     mParams.SetNoc(noCert);
 
     CommissioningStage nextStage = CommissioningStage::kSendTrustedRootCert;
-    mCommissioner->PerformCommissioningStep(mCommissioneeDeviceProxy, nextStage, mParams, this, 0, GetCommandTimeout(nextStage));
+    mCommissioner->PerformCommissioningStep(mCommissioneeDeviceProxy, nextStage, mParams, this, 0,
+                                            GetCommandTimeout(mCommissioneeDeviceProxy, nextStage));
 
     // Trusted root cert has been sent, so we can re-use the icac buffer for the icac.
     if (!icac.empty())
@@ -476,7 +505,8 @@ CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, Commissio
     }
 
     mParams.SetCompletionStatus(completionStatus);
-    mCommissioner->PerformCommissioningStep(proxy, nextStage, mParams, this, GetEndpoint(nextStage), GetCommandTimeout(nextStage));
+    mCommissioner->PerformCommissioningStep(proxy, nextStage, mParams, this, GetEndpoint(nextStage),
+                                            GetCommandTimeout(proxy, nextStage));
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/controller/AutoCommissioner.h b/src/controller/AutoCommissioner.h
index feba60bc649ebd..b6df47deb6bf64 100644
--- a/src/controller/AutoCommissioner.h
+++ b/src/controller/AutoCommissioner.h
@@ -53,7 +53,11 @@ class AutoCommissioner : public CommissioningDelegate
     ByteSpan GetPAI() const { return ByteSpan(mPAI, mPAILen); }
 
     CHIP_ERROR NOCChainGenerated(ByteSpan noc, ByteSpan icac, ByteSpan rcac, AesCcm128KeySpan ipk, NodeId adminSubject);
-    Optional<System::Clock::Timeout> GetCommandTimeout(CommissioningStage stage) const;
+    /**
+     * The device argument to GetCommandTimeout is the device whose session will
+     * be used for sending the relevant command.
+     */
+    Optional<System::Clock::Timeout> GetCommandTimeout(DeviceProxy * device, CommissioningStage stage) const;
     EndpointId GetEndpoint(const CommissioningStage & stage) const;
     CommissioningStage GetNextCommissioningStageInternal(CommissioningStage currentStage, CHIP_ERROR & lastErr);
 
diff --git a/src/controller/CHIPCluster.h b/src/controller/CHIPCluster.h
index 01c7b4cc39cc8d..559dd5c2b90771 100644
--- a/src/controller/CHIPCluster.h
+++ b/src/controller/CHIPCluster.h
@@ -48,7 +48,9 @@ using WriteResponseDoneCallback      = void (*)(void * context);
 template <typename T>
 using ReadResponseSuccessCallback     = void (*)(void * context, T responseData);
 using ReadResponseFailureCallback     = void (*)(void * context, CHIP_ERROR err);
+using ReadDoneCallback                = void (*)(void * context);
 using SubscriptionEstablishedCallback = void (*)(void * context);
+using ResubscriptionAttemptCallback   = void (*)(void * context, CHIP_ERROR aError, uint32_t aNextResubscribeIntervalMsec);
 
 class DLL_EXPORT ClusterBase
 {
@@ -222,18 +224,16 @@ class DLL_EXPORT ClusterBase
      */
     template <typename AttributeInfo>
     CHIP_ERROR ReadAttribute(void * context, ReadResponseSuccessCallback<typename AttributeInfo::DecodableArgType> successCb,
-                             ReadResponseFailureCallback failureCb, bool aIsFabricFiltered = true,
-                             const Optional<DataVersion> & aDataVersion = NullOptional)
+                             ReadResponseFailureCallback failureCb, bool aIsFabricFiltered = true)
     {
         return ReadAttribute<typename AttributeInfo::DecodableType, typename AttributeInfo::DecodableArgType>(
-            context, AttributeInfo::GetClusterId(), AttributeInfo::GetAttributeId(), successCb, failureCb, aIsFabricFiltered,
-            aDataVersion);
+            context, AttributeInfo::GetClusterId(), AttributeInfo::GetAttributeId(), successCb, failureCb, aIsFabricFiltered);
     }
 
     template <typename DecodableType, typename DecodableArgType>
     CHIP_ERROR ReadAttribute(void * context, ClusterId clusterId, AttributeId attributeId,
                              ReadResponseSuccessCallback<DecodableArgType> successCb, ReadResponseFailureCallback failureCb,
-                             bool aIsFabricFiltered = true, const Optional<DataVersion> & aDataVersion = NullOptional)
+                             bool aIsFabricFiltered = true)
     {
         VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -253,7 +253,7 @@ class DLL_EXPORT ClusterBase
 
         return Controller::ReadAttribute<DecodableType>(mDevice->GetExchangeManager(), mDevice->GetSecureSession().Value(),
                                                         mEndpoint, clusterId, attributeId, onSuccessCb, onFailureCb,
-                                                        aIsFabricFiltered, aDataVersion);
+                                                        aIsFabricFiltered);
     }
 
     /**
@@ -264,12 +264,14 @@ class DLL_EXPORT ClusterBase
     CHIP_ERROR
     SubscribeAttribute(void * context, ReadResponseSuccessCallback<typename AttributeInfo::DecodableArgType> reportCb,
                        ReadResponseFailureCallback failureCb, uint16_t minIntervalFloorSeconds, uint16_t maxIntervalCeilingSeconds,
-                       SubscriptionEstablishedCallback subscriptionEstablishedCb = nullptr, bool aIsFabricFiltered = true,
+                       SubscriptionEstablishedCallback subscriptionEstablishedCb = nullptr,
+                       ResubscriptionAttemptCallback resubscriptionAttemptCb = nullptr, bool aIsFabricFiltered = true,
                        bool aKeepPreviousSubscriptions = false, const Optional<DataVersion> & aDataVersion = NullOptional)
     {
         return SubscribeAttribute<typename AttributeInfo::DecodableType, typename AttributeInfo::DecodableArgType>(
             context, AttributeInfo::GetClusterId(), AttributeInfo::GetAttributeId(), reportCb, failureCb, minIntervalFloorSeconds,
-            maxIntervalCeilingSeconds, subscriptionEstablishedCb, aIsFabricFiltered, aKeepPreviousSubscriptions, aDataVersion);
+            maxIntervalCeilingSeconds, subscriptionEstablishedCb, resubscriptionAttemptCb, aIsFabricFiltered,
+            aKeepPreviousSubscriptions, aDataVersion);
     }
 
     template <typename DecodableType, typename DecodableArgType>
@@ -277,7 +279,8 @@ class DLL_EXPORT ClusterBase
                                   ReadResponseSuccessCallback<DecodableArgType> reportCb, ReadResponseFailureCallback failureCb,
                                   uint16_t minIntervalFloorSeconds, uint16_t maxIntervalCeilingSeconds,
                                   SubscriptionEstablishedCallback subscriptionEstablishedCb = nullptr,
-                                  bool aIsFabricFiltered = true, bool aKeepPreviousSubscriptions = false,
+                                  ResubscriptionAttemptCallback resubscriptionAttemptCb = nullptr, bool aIsFabricFiltered = true,
+                                  bool aKeepPreviousSubscriptions            = false,
                                   const Optional<DataVersion> & aDataVersion = NullOptional)
     {
         VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
@@ -303,18 +306,31 @@ class DLL_EXPORT ClusterBase
             }
         };
 
+        auto onResubscriptionAttemptCb = [context, resubscriptionAttemptCb](const app::ReadClient & readClient, CHIP_ERROR aError,
+                                                                            uint32_t aNextResubscribeIntervalMsec) {
+            if (resubscriptionAttemptCb != nullptr)
+            {
+                resubscriptionAttemptCb(context, aError, aNextResubscribeIntervalMsec);
+            }
+        };
+
         return Controller::SubscribeAttribute<DecodableType>(
             mDevice->GetExchangeManager(), mDevice->GetSecureSession().Value(), mEndpoint, clusterId, attributeId, onReportCb,
-            onFailureCb, minIntervalFloorSeconds, maxIntervalCeilingSeconds, onSubscriptionEstablishedCb, aIsFabricFiltered,
-            aKeepPreviousSubscriptions, aDataVersion);
+            onFailureCb, minIntervalFloorSeconds, maxIntervalCeilingSeconds, onSubscriptionEstablishedCb, onResubscriptionAttemptCb,
+            aIsFabricFiltered, aKeepPreviousSubscriptions, aDataVersion);
     }
 
     /**
      * Read an event and get a type-safe callback with the event data.
+     *
+     * @param[in] successCb Used to deliver event data received through the Read interactions
+     * @param[in] failureCb failureCb will be called when an error occurs *after* a successful call to ReadEvent.
+     * @param[in] doneCb    OnDone will be called when ReadClient has finished all work for event retrieval, it is possible that
+     * there is no event.
      */
     template <typename DecodableType>
     CHIP_ERROR ReadEvent(void * context, ReadResponseSuccessCallback<DecodableType> successCb,
-                         ReadResponseFailureCallback failureCb)
+                         ReadResponseFailureCallback failureCb, ReadDoneCallback doneCb)
     {
         VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -332,8 +348,14 @@ class DLL_EXPORT ClusterBase
             }
         };
 
+        auto onDoneCb = [context, doneCb](app::ReadClient * apReadClient) {
+            if (doneCb != nullptr)
+            {
+                doneCb(context);
+            }
+        };
         return Controller::ReadEvent<DecodableType>(mDevice->GetExchangeManager(), mDevice->GetSecureSession().Value(), mEndpoint,
-                                                    onSuccessCb, onFailureCb);
+                                                    onSuccessCb, onFailureCb, onDoneCb);
     }
 
     template <typename DecodableType>
@@ -341,6 +363,7 @@ class DLL_EXPORT ClusterBase
                               ReadResponseFailureCallback failureCb, uint16_t minIntervalFloorSeconds,
                               uint16_t maxIntervalCeilingSeconds,
                               SubscriptionEstablishedCallback subscriptionEstablishedCb = nullptr,
+                              ResubscriptionAttemptCallback resubscriptionAttemptCb     = nullptr,
                               bool aKeepPreviousSubscriptions = false, bool aIsUrgentEvent = false)
     {
         VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
@@ -366,10 +389,18 @@ class DLL_EXPORT ClusterBase
             }
         };
 
+        auto onResubscriptionAttemptCb = [context, resubscriptionAttemptCb](const app::ReadClient & readClient, CHIP_ERROR aError,
+                                                                            uint32_t aNextResubscribeIntervalMsec) {
+            if (resubscriptionAttemptCb != nullptr)
+            {
+                resubscriptionAttemptCb(context, aError, aNextResubscribeIntervalMsec);
+            }
+        };
+
         return Controller::SubscribeEvent<DecodableType>(mDevice->GetExchangeManager(), mDevice->GetSecureSession().Value(),
                                                          mEndpoint, onReportCb, onFailureCb, minIntervalFloorSeconds,
                                                          maxIntervalCeilingSeconds, onSubscriptionEstablishedCb,
-                                                         aKeepPreviousSubscriptions, aIsUrgentEvent);
+                                                         onResubscriptionAttemptCb, aKeepPreviousSubscriptions, aIsUrgentEvent);
     }
 
 protected:
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index e9dc953fc91e4b..2271bea031e3ff 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -149,14 +149,21 @@ CHIP_ERROR DeviceController::InitControllerNOCChain(const ControllerInitParams &
     FabricInfo newFabric;
     constexpr uint32_t chipCertAllocatedLen = kMaxCHIPCertLength;
     chip::Platform::ScopedMemoryBuffer<uint8_t> chipCert;
-    Credentials::P256PublicKeySpan rootPublicKey;
+    Credentials::P256PublicKeySpan rootPublicKeySpan;
     FabricId fabricId;
 
+    // There are three possibilities here in terms of what happens with our
+    // operational key:
+    // 1) We have an externally owned operational keypair.
+    // 2) We have an operational keypair that the fabric table should clone via
+    //    serialize/deserialize.
+    // 3) We have no keypair at all, and the fabric table has been initialized
+    //    with a key store.
     if (params.hasExternallyOwnedOperationalKeypair)
     {
         ReturnErrorOnFailure(newFabric.SetExternallyOwnedOperationalKeypair(params.operationalKeypair));
     }
-    else
+    else if (params.operationalKeypair)
     {
         ReturnErrorOnFailure(newFabric.SetOperationalKeypair(params.operationalKeypair));
     }
@@ -168,6 +175,8 @@ CHIP_ERROR DeviceController::InitControllerNOCChain(const ControllerInitParams &
 
     ReturnErrorOnFailure(ConvertX509CertToChipCert(params.controllerRCAC, chipCertSpan));
     ReturnErrorOnFailure(newFabric.SetRootCert(chipCertSpan));
+    ReturnErrorOnFailure(Credentials::ExtractPublicKeyFromChipCert(chipCertSpan, rootPublicKeySpan));
+    Crypto::P256PublicKey rootPublicKey{ rootPublicKeySpan };
 
     if (params.controllerICAC.empty())
     {
@@ -187,14 +196,10 @@ CHIP_ERROR DeviceController::InitControllerNOCChain(const ControllerInitParams &
     ReturnErrorOnFailure(newFabric.SetNOCCert(chipCertSpan));
     ReturnErrorOnFailure(ExtractFabricIdFromCert(chipCertSpan, &fabricId));
 
-    ReturnErrorOnFailure(newFabric.GetRootPubkey(rootPublicKey));
     mFabricInfo = params.systemState->Fabrics()->FindFabric(rootPublicKey, fabricId);
     if (mFabricInfo != nullptr)
     {
-        ReturnErrorOnFailure(mFabricInfo->SetFabricInfo(newFabric));
-        // Store the new fabric info, since we might now have new certificates
-        // and whatnot.
-        ReturnErrorOnFailure(params.systemState->Fabrics()->Store(mFabricInfo->GetFabricIndex()));
+        ReturnErrorOnFailure(params.systemState->Fabrics()->UpdateFabric(mFabricInfo->GetFabricIndex(), newFabric));
     }
     else
     {
@@ -282,44 +287,6 @@ CHIP_ERROR DeviceController::DisconnectDevice(NodeId nodeId)
     return CHIP_NO_ERROR;
 }
 
-void DeviceController::OnFirstMessageDeliveryFailed(const SessionHandle & session)
-{
-    if (session->GetSessionType() != Session::SessionType::kSecure)
-    {
-        // Definitely not a CASE session.
-        return;
-    }
-
-    auto * secureSession = session->AsSecureSession();
-    if (secureSession->GetSecureSessionType() != SecureSession::Type::kCASE)
-    {
-        // Still not CASE.
-        return;
-    }
-
-    FabricIndex ourIndex = kUndefinedFabricIndex;
-    CHIP_ERROR err       = GetFabricIndex(&ourIndex);
-    if (err != CHIP_NO_ERROR)
-    {
-        // We can't really do CASE, now can we?
-        return;
-    }
-
-    if (ourIndex != session->GetFabricIndex())
-    {
-        // Not one of our sessions.
-        return;
-    }
-
-    err = UpdateDevice(secureSession->GetPeerNodeId());
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(Controller,
-                     "OnFirstMessageDeliveryFailed was called, but UpdateDevice did not succeed (%" CHIP_ERROR_FORMAT ")",
-                     err.Format());
-    }
-}
-
 CHIP_ERROR DeviceController::GetPeerAddressAndPort(PeerId peerId, Inet::IPAddress & addr, uint16_t & port)
 {
     VerifyOrReturnError(mState == State::Initialized, CHIP_ERROR_INCORRECT_STATE);
@@ -360,8 +327,6 @@ CHIP_ERROR DeviceCommissioner::Init(CommissionerInitParams params)
 {
     ReturnErrorOnFailure(DeviceController::Init(params));
 
-    params.systemState->SessionMgr()->RegisterRecoveryDelegate(*this);
-
     mPairingDelegate = params.pairingDelegate;
 
     // Configure device attestation validation
@@ -434,8 +399,6 @@ CHIP_ERROR DeviceCommissioner::Shutdown()
     }
     // TODO: If we have a commissioning step in progress, is there a way to cancel that callback?
 
-    mSystemState->SessionMgr()->UnregisterRecoveryDelegate(*this);
-
 #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY // make this commissioner discoverable
     if (mUdcTransportMgr != nullptr)
     {
@@ -598,24 +561,31 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, Re
     current = FindCommissioneeDevice(peerAddress);
     if (current != nullptr)
     {
-
-        if (current->IsSecureConnected())
+        if (current->GetDeviceId() == remoteDeviceId)
         {
-            if (mPairingDelegate)
+            // We might be able to just reuse its connection if it has one or is
+            // working on one.
+            if (current->IsSecureConnected())
             {
-                // We already have an open secure session to this device, call the callback immediately and early return.
-                mPairingDelegate->OnPairingComplete(CHIP_NO_ERROR);
+                if (mPairingDelegate)
+                {
+                    // We already have an open secure session to this device, call the callback immediately and early return.
+                    mPairingDelegate->OnPairingComplete(CHIP_NO_ERROR);
+                }
+                return CHIP_NO_ERROR;
+            }
+            if (current->IsSessionSetupInProgress())
+            {
+                // We're not connected yet, but we're in the process of connecting. Pairing delegate will get a callback when
+                // connection completes
+                return CHIP_NO_ERROR;
             }
-            return CHIP_NO_ERROR;
-        }
-        if (current->IsSessionSetupInProgress())
-        {
-            // We're not connected yet, but we're in the process of connecting. Pairing delegate will get a callback when
-            // connection completes
-            return CHIP_NO_ERROR;
         }
 
-        // Something has gone strange. Delete the old device, try again.
+        // Either the consumer wants to assign a different device id to this
+        // peer address now (so we can't reuse the commissionee device we have
+        // already) or something has gone strange. Delete the old device, try
+        // again.
         ChipLogError(Controller, "Found unconnected device, removing");
         ReleaseCommissioneeDevice(current);
     }
@@ -778,19 +748,6 @@ DeviceCommissioner::ContinueCommissioningAfterDeviceAttestationFailure(DevicePro
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DeviceCommissioner::GetAttestationChallenge(ByteSpan & attestationChallenge)
-{
-    Optional<SessionHandle> secureSessionHandle;
-
-    VerifyOrReturnError(mDeviceBeingCommissioned != nullptr, CHIP_ERROR_INCORRECT_STATE);
-
-    secureSessionHandle = mDeviceBeingCommissioned->GetSecureSession();
-    VerifyOrReturnError(secureSessionHandle.HasValue(), CHIP_ERROR_INCORRECT_STATE);
-
-    attestationChallenge = secureSessionHandle.Value()->AsSecureSession()->GetCryptoContext().GetAttestationChallenge();
-    return CHIP_NO_ERROR;
-}
-
 CHIP_ERROR DeviceCommissioner::StopPairing(NodeId remoteDeviceId)
 {
     VerifyOrReturnError(mState == State::Initialized, CHIP_ERROR_INCORRECT_STATE);
@@ -867,7 +824,8 @@ void DeviceCommissioner::OnSessionEstablished(const SessionHandle & session)
 }
 
 CHIP_ERROR DeviceCommissioner::SendCertificateChainRequestCommand(DeviceProxy * device,
-                                                                  Credentials::CertificateType certificateType)
+                                                                  Credentials::CertificateType certificateType,
+                                                                  Optional<System::Clock::Timeout> timeout)
 {
     MATTER_TRACE_EVENT_SCOPE("SendCertificateChainRequestCommand", "DeviceCommissioner");
     ChipLogDetail(Controller, "Sending Certificate Chain request to %p device", device);
@@ -876,7 +834,7 @@ CHIP_ERROR DeviceCommissioner::SendCertificateChainRequestCommand(DeviceProxy *
     OperationalCredentials::Commands::CertificateChainRequest::Type request;
     request.certificateType = certificateType;
     return SendCommand<OperationalCredentialsCluster>(device, request, OnCertificateChainResponse,
-                                                      OnCertificateChainFailureResponse);
+                                                      OnCertificateChainFailureResponse, timeout);
 
     return CHIP_NO_ERROR;
 }
@@ -902,7 +860,8 @@ void DeviceCommissioner::OnCertificateChainResponse(
     commissioner->CommissioningStageComplete(CHIP_NO_ERROR, report);
 }
 
-CHIP_ERROR DeviceCommissioner::SendAttestationRequestCommand(DeviceProxy * device, const ByteSpan & attestationNonce)
+CHIP_ERROR DeviceCommissioner::SendAttestationRequestCommand(DeviceProxy * device, const ByteSpan & attestationNonce,
+                                                             Optional<System::Clock::Timeout> timeout)
 {
     MATTER_TRACE_EVENT_SCOPE("SendAttestationRequestCommand", "DeviceCommissioner");
     ChipLogDetail(Controller, "Sending Attestation request to %p device", device);
@@ -912,7 +871,7 @@ CHIP_ERROR DeviceCommissioner::SendAttestationRequestCommand(DeviceProxy * devic
     request.attestationNonce = attestationNonce;
 
     ReturnErrorOnFailure(
-        SendCommand<OperationalCredentialsCluster>(device, request, OnAttestationResponse, OnAttestationFailureResponse));
+        SendCommand<OperationalCredentialsCluster>(device, request, OnAttestationResponse, OnAttestationFailureResponse, timeout));
     ChipLogDetail(Controller, "Sent Attestation request, waiting for the Attestation Information");
     return CHIP_NO_ERROR;
 }
@@ -1034,8 +993,11 @@ void DeviceCommissioner::ExtendArmFailSafeForFailedDeviceAttestation(Attestation
         request.expiryLengthSeconds = expiryLengthSeconds.Value();
         request.breadcrumb          = mCommissioningStage;
         ChipLogProgress(Controller, "Changing fail-safe timer to %u seconds to handle DA failure", request.expiryLengthSeconds);
+        // Per spec, anything we do with the fail-safe armed must not time out
+        // in less than kMinimumCommissioningStepTimeout.
         SendCommand<GeneralCommissioningCluster>(mDeviceBeingCommissioned, request, OnArmFailSafeExtendedForFailedDeviceAttestation,
-                                                 OnFailedToExtendedArmFailSafeFailedDeviceAttestation);
+                                                 OnFailedToExtendedArmFailSafeFailedDeviceAttestation,
+                                                 MakeOptional(kMinimumCommissioningStepTimeout));
     }
     else
     {
@@ -1078,7 +1040,8 @@ CHIP_ERROR DeviceCommissioner::ValidateCSR(DeviceProxy * proxy, const ByteSpan &
                                                                            AttestationSignature, dacPubkey, csrNonce);
 }
 
-CHIP_ERROR DeviceCommissioner::SendOperationalCertificateSigningRequestCommand(DeviceProxy * device, const ByteSpan & csrNonce)
+CHIP_ERROR DeviceCommissioner::SendOperationalCertificateSigningRequestCommand(DeviceProxy * device, const ByteSpan & csrNonce,
+                                                                               Optional<System::Clock::Timeout> timeout)
 {
     MATTER_TRACE_EVENT_SCOPE("SendOperationalCertificateSigningRequestCommand", "DeviceCommissioner");
     ChipLogDetail(Controller, "Sending CSR request to %p device", device);
@@ -1087,8 +1050,8 @@ CHIP_ERROR DeviceCommissioner::SendOperationalCertificateSigningRequestCommand(D
     OperationalCredentials::Commands::CSRRequest::Type request;
     request.CSRNonce = csrNonce;
 
-    ReturnErrorOnFailure(
-        SendCommand<OperationalCredentialsCluster>(device, request, OnOperationalCertificateSigningRequest, OnCSRFailureResponse));
+    ReturnErrorOnFailure(SendCommand<OperationalCredentialsCluster>(device, request, OnOperationalCertificateSigningRequest,
+                                                                    OnCSRFailureResponse, timeout));
     ChipLogDetail(Controller, "Sent CSR request, waiting for the CSR");
     return CHIP_NO_ERROR;
 }
@@ -1175,20 +1138,21 @@ CHIP_ERROR DeviceCommissioner::ProcessCSR(DeviceProxy * proxy, const ByteSpan &
 
 CHIP_ERROR DeviceCommissioner::SendOperationalCertificate(DeviceProxy * device, const ByteSpan & nocCertBuf,
                                                           const Optional<ByteSpan> & icaCertBuf, const AesCcm128KeySpan ipk,
-                                                          const NodeId adminSubject)
+                                                          const NodeId adminSubject, Optional<System::Clock::Timeout> timeout)
 {
     MATTER_TRACE_EVENT_SCOPE("SendOperationalCertificate", "DeviceCommissioner");
+
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     OperationalCredentials::Commands::AddNOC::Type request;
-    request.NOCValue      = nocCertBuf;
-    request.ICACValue     = icaCertBuf;
-    request.IPKValue      = ipk;
-    request.caseAdminNode = adminSubject;
-    request.adminVendorId = mVendorId;
+    request.NOCValue         = nocCertBuf;
+    request.ICACValue        = icaCertBuf;
+    request.IPKValue         = ipk;
+    request.caseAdminSubject = adminSubject;
+    request.adminVendorId    = mVendorId;
 
-    ReturnErrorOnFailure(
-        SendCommand<OperationalCredentialsCluster>(device, request, OnOperationalCertificateAddResponse, OnAddNOCFailureResponse));
+    ReturnErrorOnFailure(SendCommand<OperationalCredentialsCluster>(device, request, OnOperationalCertificateAddResponse,
+                                                                    OnAddNOCFailureResponse, timeout));
 
     ChipLogProgress(Controller, "Sent operational certificate to the device");
 
@@ -1212,9 +1176,12 @@ CHIP_ERROR DeviceCommissioner::ConvertFromOperationalCertStatus(OperationalCrede
         return CHIP_ERROR_INCORRECT_STATE;
     case OperationalCertStatus::kTableFull:
         return CHIP_ERROR_NO_MEMORY;
+    case OperationalCertStatus::kInvalidAdminSubject:
+        return CHIP_ERROR_INVALID_ADMIN_SUBJECT;
     case OperationalCertStatus::kFabricConflict:
         return CHIP_ERROR_FABRIC_EXISTS;
     case OperationalCertStatus::kInsufficientPrivilege:
+        return CHIP_ERROR_INSUFFICIENT_PRIVILEGE;
     case OperationalCertStatus::kLabelConflict:
         return CHIP_ERROR_INVALID_ARGUMENT;
     case OperationalCertStatus::kInvalidFabricIndex:
@@ -1258,7 +1225,8 @@ void DeviceCommissioner::OnOperationalCertificateAddResponse(
     }
 }
 
-CHIP_ERROR DeviceCommissioner::SendTrustedRootCertificate(DeviceProxy * device, const ByteSpan & rcac)
+CHIP_ERROR DeviceCommissioner::SendTrustedRootCertificate(DeviceProxy * device, const ByteSpan & rcac,
+                                                          Optional<System::Clock::Timeout> timeout)
 {
     MATTER_TRACE_EVENT_SCOPE("SendTrustedRootCertificate", "DeviceCommissioner");
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -1268,7 +1236,7 @@ CHIP_ERROR DeviceCommissioner::SendTrustedRootCertificate(DeviceProxy * device,
     OperationalCredentials::Commands::AddTrustedRootCertificate::Type request;
     request.rootCertificate = rcac;
     ReturnErrorOnFailure(
-        SendCommand<OperationalCredentialsCluster>(device, request, OnRootCertSuccessResponse, OnRootCertFailureResponse));
+        SendCommand<OperationalCredentialsCluster>(device, request, OnRootCertSuccessResponse, OnRootCertFailureResponse, timeout));
 
     ChipLogProgress(Controller, "Sent root certificate to the device");
 
@@ -1434,7 +1402,8 @@ void DeviceCommissioner::CleanupCommissioning(DeviceProxy * proxy, NodeId nodeId
         ChipLogProgress(Controller, "Expiring failsafe on proxy %p", proxy);
         mDeviceBeingCommissioned = proxy;
         // We actually want to do the same thing on success or failure because we're already in a failure state
-        SendCommand<GeneralCommissioningCluster>(proxy, request, OnDisarmFailsafe, OnDisarmFailsafeFailure);
+        SendCommand<GeneralCommissioningCluster>(proxy, request, OnDisarmFailsafe, OnDisarmFailsafeFailure,
+                                                 /* timeout = */ NullOptional);
     }
 }
 
@@ -1950,11 +1919,11 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
     break;
     case CommissioningStage::kSendPAICertificateRequest:
         ChipLogProgress(Controller, "Sending request for PAI certificate");
-        SendCertificateChainRequestCommand(proxy, CertificateType::kPAI);
+        SendCertificateChainRequestCommand(proxy, CertificateType::kPAI, timeout);
         break;
     case CommissioningStage::kSendDACCertificateRequest:
         ChipLogProgress(Controller, "Sending request for DAC certificate");
-        SendCertificateChainRequestCommand(proxy, CertificateType::kDAC);
+        SendCertificateChainRequestCommand(proxy, CertificateType::kDAC, timeout);
         break;
     case CommissioningStage::kSendAttestationRequest:
         ChipLogProgress(Controller, "Sending Attestation Request to the device.");
@@ -1964,7 +1933,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             CommissioningStageComplete(CHIP_ERROR_INVALID_ARGUMENT);
             return;
         }
-        SendAttestationRequestCommand(proxy, params.GetAttestationNonce().Value());
+        SendAttestationRequestCommand(proxy, params.GetAttestationNonce().Value(), timeout);
         break;
     case CommissioningStage::kAttestationVerification: {
         ChipLogProgress(Controller, "Verifying attestation");
@@ -1998,7 +1967,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             CommissioningStageComplete(CHIP_ERROR_INVALID_ARGUMENT);
             return;
         }
-        SendOperationalCertificateSigningRequestCommand(proxy, params.GetCSRNonce().Value());
+        SendOperationalCertificateSigningRequestCommand(proxy, params.GetCSRNonce().Value(), timeout);
         break;
     case CommissioningStage::kValidateCSR: {
         if (!params.GetNOCChainGenerationParameters().HasValue() || !params.GetDAC().HasValue() || !params.GetCSRNonce().HasValue())
@@ -2045,7 +2014,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             CommissioningStageComplete(CHIP_ERROR_INVALID_ARGUMENT);
             return;
         }
-        CHIP_ERROR err = SendTrustedRootCertificate(proxy, params.GetRootCert().Value());
+        CHIP_ERROR err = SendTrustedRootCertificate(proxy, params.GetRootCert().Value(), timeout);
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(Controller, "Error sending trusted root certificate: %s", err.AsString());
@@ -2075,7 +2044,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
             return;
         }
         SendOperationalCertificate(proxy, params.GetNoc().Value(), params.GetIcac(), params.GetIpk().Value(),
-                                   params.GetAdminSubject().Value());
+                                   params.GetAdminSubject().Value(), timeout);
         break;
     case CommissioningStage::kWiFiNetworkSetup: {
         if (!params.GetWiFiCredentials().HasValue())
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index aaf5393fb3b8c5..efa61e5170daf8 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -136,7 +136,7 @@ struct CommissionerInitParams : public ControllerInitParams
  *   and device pairing information for individual devices). Alternatively, this class can retrieve the
  *   relevant information when the application tries to communicate with the device
  */
-class DLL_EXPORT DeviceController : public SessionRecoveryDelegate, public AbstractDnssdDiscoveryController
+class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
 {
 public:
     DeviceController();
@@ -240,6 +240,15 @@ class DLL_EXPORT DeviceController : public SessionRecoveryDelegate, public Abstr
 
     FabricInfo * GetFabricInfo() { return mFabricInfo; }
 
+    const FabricTable * GetFabricTable() const
+    {
+        if (mSystemState == nullptr)
+        {
+            return nullptr;
+        }
+        return mSystemState->Fabrics();
+    }
+
     void ReleaseOperationalDevice(NodeId remoteDeviceId);
 
     OperationalCredentialsDelegate * GetOperationalCredentialsDelegate() { return mOperationalCredentialsDelegate; }
@@ -301,9 +310,6 @@ class DLL_EXPORT DeviceController : public SessionRecoveryDelegate, public Abstr
     /// in case subclasses want to create the session if it does not yet exist
     virtual OperationalDeviceProxy * GetDeviceSession(const PeerId & peerId);
 
-    //////////// SessionRecoveryDelegate Implementation ///////////////
-    void OnFirstMessageDeliveryFailed(const SessionHandle & session) override;
-
     DiscoveredNodeList GetDiscoveredNodes() override { return DiscoveredNodeList(mCommissionableNodes); }
 
 private:
@@ -466,16 +472,6 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
 
     CHIP_ERROR GetDeviceBeingCommissioned(NodeId deviceId, CommissioneeDeviceProxy ** device);
 
-    /**
-     * @brief
-     *   This function returns the attestation challenge for the secure session of the device being commissioned.
-     *
-     * @param[out] attestationChallenge The output for the attestationChallenge
-     *
-     * @return CHIP_ERROR               CHIP_NO_ERROR on success, or CHIP_ERROR_INVALID_ARGUMENT if no secure session is active
-     */
-    CHIP_ERROR GetAttestationChallenge(ByteSpan & attestationChallenge);
-
     /**
      * @brief
      *   This function stops a pairing process that's in progress. It does not delete the pairing of a previously
@@ -632,24 +628,27 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
     /* This function sends a Device Attestation Certificate chain request to the device.
        The function does not hold a reference to the device object.
      */
-    CHIP_ERROR SendCertificateChainRequestCommand(DeviceProxy * device, Credentials::CertificateType certificateType);
+    CHIP_ERROR SendCertificateChainRequestCommand(DeviceProxy * device, Credentials::CertificateType certificateType,
+                                                  Optional<System::Clock::Timeout> timeout);
     /* This function sends an Attestation request to the device.
        The function does not hold a reference to the device object.
      */
-    CHIP_ERROR SendAttestationRequestCommand(DeviceProxy * device, const ByteSpan & attestationNonce);
+    CHIP_ERROR SendAttestationRequestCommand(DeviceProxy * device, const ByteSpan & attestationNonce,
+                                             Optional<System::Clock::Timeout> timeout);
     /* This function sends an CSR request to the device.
        The function does not hold a reference to the device object.
      */
-    CHIP_ERROR SendOperationalCertificateSigningRequestCommand(DeviceProxy * device, const ByteSpan & csrNonce);
+    CHIP_ERROR SendOperationalCertificateSigningRequestCommand(DeviceProxy * device, const ByteSpan & csrNonce,
+                                                               Optional<System::Clock::Timeout> timeout);
     /* This function sends the operational credentials to the device.
        The function does not hold a reference to the device object.
      */
     CHIP_ERROR SendOperationalCertificate(DeviceProxy * device, const ByteSpan & nocCertBuf, const Optional<ByteSpan> & icaCertBuf,
-                                          AesCcm128KeySpan ipk, NodeId adminSubject);
+                                          AesCcm128KeySpan ipk, NodeId adminSubject, Optional<System::Clock::Timeout> timeout);
     /* This function sends the trusted root certificate to the device.
        The function does not hold a reference to the device object.
      */
-    CHIP_ERROR SendTrustedRootCertificate(DeviceProxy * device, const ByteSpan & rcac);
+    CHIP_ERROR SendTrustedRootCertificate(DeviceProxy * device, const ByteSpan & rcac, Optional<System::Clock::Timeout> timeout);
 
     /* This function is called by the commissioner code when the device completes
        the operational credential provisioning process.
@@ -768,9 +767,9 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
     template <typename ClusterObjectT, typename RequestObjectT>
     CHIP_ERROR SendCommand(DeviceProxy * device, const RequestObjectT & request,
                            CommandResponseSuccessCallback<typename RequestObjectT::ResponseType> successCb,
-                           CommandResponseFailureCallback failureCb)
+                           CommandResponseFailureCallback failureCb, Optional<System::Clock::Timeout> timeout)
     {
-        return SendCommand<ClusterObjectT>(device, request, successCb, failureCb, 0, NullOptional);
+        return SendCommand<ClusterObjectT>(device, request, successCb, failureCb, 0, timeout);
     }
 
     template <typename ClusterObjectT, typename RequestObjectT>
diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
index 9da43c5ddc0cde..63343aede01464 100644
--- a/src/controller/CHIPDeviceControllerFactory.cpp
+++ b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -60,6 +60,7 @@ CHIP_ERROR DeviceControllerFactory::Init(FactoryInitParams params)
     // created-but-shut-down system state.
     mListenPort               = params.listenPort;
     mFabricIndependentStorage = params.fabricIndependentStorage;
+    mOperationalKeystore      = params.operationalKeystore;
     mEnableServerInteractions = params.enableServerInteractions;
 
     CHIP_ERROR err = InitSystemState(params);
@@ -83,6 +84,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState()
         params.enableServerInteractions = mEnableServerInteractions;
         params.groupDataProvider        = mSystemState->GetGroupDataProvider();
         params.fabricTable              = mSystemState->Fabrics();
+        params.operationalKeystore      = mOperationalKeystore;
     }
 
     return InitSystemState(params);
@@ -151,6 +153,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params)
     stateParams.sessionMgr                                    = chip::Platform::New<SessionManager>();
     SimpleSessionResumptionStorage * sessionResumptionStorage = chip::Platform::New<SimpleSessionResumptionStorage>();
     stateParams.sessionResumptionStorage                      = sessionResumptionStorage;
+    stateParams.certificateValidityPolicy                     = params.certificateValidityPolicy;
     stateParams.exchangeMgr                                   = chip::Platform::New<Messaging::ExchangeManager>();
     stateParams.messageCounterManager                         = chip::Platform::New<secure_channel::MessageCounterManager>();
     stateParams.groupDataProvider                             = params.groupDataProvider;
@@ -161,7 +164,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params)
     if (stateParams.fabricTable == nullptr)
     {
         stateParams.fabricTable = tempFabricTable = chip::Platform::New<FabricTable>();
-        ReturnErrorOnFailure(stateParams.fabricTable->Init(params.fabricIndependentStorage));
+        ReturnErrorOnFailure(stateParams.fabricTable->Init(params.fabricIndependentStorage, params.operationalKeystore));
     }
     ReturnErrorOnFailure(sessionResumptionStorage->Init(params.fabricIndependentStorage));
 
@@ -190,7 +193,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params)
         // Enable listening for session establishment messages.
         ReturnErrorOnFailure(stateParams.caseServer->ListenForSessionEstablishment(
             stateParams.exchangeMgr, stateParams.sessionMgr, stateParams.fabricTable, stateParams.sessionResumptionStorage,
-            stateParams.groupDataProvider));
+            stateParams.certificateValidityPolicy, stateParams.groupDataProvider));
 
         //
         // We need to advertise the port that we're listening to for unsolicited messages over UDP. However, we have both a IPv4
@@ -317,6 +320,7 @@ void DeviceControllerFactory::Shutdown()
         mSystemState = nullptr;
     }
     mFabricIndependentStorage = nullptr;
+    mOperationalKeystore      = nullptr;
 }
 
 CHIP_ERROR DeviceControllerSystemState::Shutdown()
@@ -338,6 +342,7 @@ CHIP_ERROR DeviceControllerSystemState::Shutdown()
 
     if (mCASEServer != nullptr)
     {
+        mCASEServer->Shutdown();
         chip::Platform::Delete(mCASEServer);
         mCASEServer = nullptr;
     }
diff --git a/src/controller/CHIPDeviceControllerFactory.h b/src/controller/CHIPDeviceControllerFactory.h
index 8c00195453f5aa..e090926811d94b 100644
--- a/src/controller/CHIPDeviceControllerFactory.h
+++ b/src/controller/CHIPDeviceControllerFactory.h
@@ -77,16 +77,18 @@ struct SetupParams
     CommissioningDelegate * defaultCommissioner                        = nullptr;
 };
 
-// TODO everything other than the fabric storage and group data provider here should be removed.
-// We're blocked because of the need to support !CHIP_DEVICE_LAYER
+// TODO everything other than the fabric storage, group data provider and OperationalKeystore
+//  here should be removed. We're blocked because of the need to support !CHIP_DEVICE_LAYER
 struct FactoryInitParams
 {
-    System::Layer * systemLayer                                   = nullptr;
-    PersistentStorageDelegate * fabricIndependentStorage          = nullptr;
-    Credentials::GroupDataProvider * groupDataProvider            = nullptr;
-    Inet::EndPointManager<Inet::TCPEndPoint> * tcpEndPointManager = nullptr;
-    Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPointManager = nullptr;
-    FabricTable * fabricTable                                     = nullptr;
+    System::Layer * systemLayer                                        = nullptr;
+    PersistentStorageDelegate * fabricIndependentStorage               = nullptr;
+    Credentials::CertificateValidityPolicy * certificateValidityPolicy = nullptr;
+    Credentials::GroupDataProvider * groupDataProvider                 = nullptr;
+    Inet::EndPointManager<Inet::TCPEndPoint> * tcpEndPointManager      = nullptr;
+    Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPointManager      = nullptr;
+    FabricTable * fabricTable                                          = nullptr;
+    OperationalKeystore * operationalKeystore                          = nullptr;
 #if CONFIG_NETWORK_LAYER_BLE
     Ble::BleLayer * bleLayer = nullptr;
 #endif
@@ -212,6 +214,7 @@ class DeviceControllerFactory
     uint16_t mListenPort;
     DeviceControllerSystemState * mSystemState            = nullptr;
     PersistentStorageDelegate * mFabricIndependentStorage = nullptr;
+    Crypto::OperationalKeystore * mOperationalKeystore    = nullptr;
     bool mEnableServerInteractions                        = false;
 };
 
diff --git a/src/controller/CHIPDeviceControllerSystemState.h b/src/controller/CHIPDeviceControllerSystemState.h
index 5b1cb9b6ff2ecb..92a3879f1c4682 100644
--- a/src/controller/CHIPDeviceControllerSystemState.h
+++ b/src/controller/CHIPDeviceControllerSystemState.h
@@ -82,16 +82,17 @@ struct DeviceControllerSystemStateParams
 
     // Params that will be deallocated via Platform::Delete in
     // DeviceControllerSystemState::Shutdown.
-    DeviceTransportMgr * transportMgr                             = nullptr;
-    SessionResumptionStorage * sessionResumptionStorage           = nullptr;
-    SessionManager * sessionMgr                                   = nullptr;
-    Messaging::ExchangeManager * exchangeMgr                      = nullptr;
-    secure_channel::MessageCounterManager * messageCounterManager = nullptr;
-    CASEServer * caseServer                                       = nullptr;
-    CASESessionManager * caseSessionManager                       = nullptr;
-    OperationalDevicePool * operationalDevicePool                 = nullptr;
-    CASEClientPool * caseClientPool                               = nullptr;
-    FabricTable::Delegate * fabricTableDelegate                   = nullptr;
+    DeviceTransportMgr * transportMgr                                  = nullptr;
+    SessionResumptionStorage * sessionResumptionStorage                = nullptr;
+    Credentials::CertificateValidityPolicy * certificateValidityPolicy = nullptr;
+    SessionManager * sessionMgr                                        = nullptr;
+    Messaging::ExchangeManager * exchangeMgr                           = nullptr;
+    secure_channel::MessageCounterManager * messageCounterManager      = nullptr;
+    CASEServer * caseServer                                            = nullptr;
+    CASESessionManager * caseSessionManager                            = nullptr;
+    OperationalDevicePool * operationalDevicePool                      = nullptr;
+    CASEClientPool * caseClientPool                                    = nullptr;
+    FabricTable::Delegate * fabricTableDelegate                        = nullptr;
 };
 
 // A representation of the internal state maintained by the DeviceControllerFactory
diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h
index 666b0c7e8a8feb..58cc4131569690 100644
--- a/src/controller/CommissioningDelegate.h
+++ b/src/controller/CommissioningDelegate.h
@@ -22,6 +22,7 @@
 #include <credentials/attestation_verifier/DeviceAttestationDelegate.h>
 #include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
 #include <lib/support/Variant.h>
+#include <system/SystemClock.h>
 
 namespace chip {
 namespace Controller {
@@ -79,6 +80,11 @@ struct CompletionStatus
 };
 
 constexpr uint16_t kDefaultFailsafeTimeout = 60;
+
+// Per spec, all commands that are sent with the failsafe armed need at least
+// a 30s timeout.
+constexpr System::Clock::Timeout kMinimumCommissioningStepTimeout = System::Clock::Seconds16(30);
+
 class CommissioningParameters
 {
 public:
diff --git a/src/controller/README.md b/src/controller/README.md
index 88df3136bd61e0..94b69b24bc3576 100644
--- a/src/controller/README.md
+++ b/src/controller/README.md
@@ -21,7 +21,7 @@ The POSIX CLI chip-tool is located in
 ### Darwin CLI
 
 The POSIX CLI chip-tool is located in
-[../../examples/chip-tool-darwin](../../examples/chip-tool).
+[../../examples/darwin-framework-tool](../../examples/chip-tool).
 
 ### Python
 
diff --git a/src/controller/ReadInteraction.h b/src/controller/ReadInteraction.h
index fa333682ffb1f4..cc4838cfafad45 100644
--- a/src/controller/ReadInteraction.h
+++ b/src/controller/ReadInteraction.h
@@ -37,7 +37,9 @@ struct ReportAttributeParams : public app::ReadPrepareParams
     typename TypedReadAttributeCallback<DecodableAttributeType>::OnSuccessCallbackType mOnReportCb;
     typename TypedReadAttributeCallback<DecodableAttributeType>::OnErrorCallbackType mOnErrorCb;
     typename TypedReadAttributeCallback<DecodableAttributeType>::OnSubscriptionEstablishedCallbackType
-        mOnSubscriptionEstablishedCb             = nullptr;
+        mOnSubscriptionEstablishedCb = nullptr;
+    typename TypedReadAttributeCallback<DecodableAttributeType>::OnResubscriptionAttemptCallbackType mOnResubscriptionAttemptCb =
+        nullptr;
     app::ReadClient::InteractionType mReportType = app::ReadClient::InteractionType::Read;
 };
 
@@ -64,7 +66,8 @@ CHIP_ERROR ReportAttribute(Messaging::ExchangeManager * exchangeMgr, EndpointId
     auto onDone = [](TypedReadAttributeCallback<DecodableAttributeType> * callback) { chip::Platform::Delete(callback); };
 
     auto callback = chip::Platform::MakeUnique<TypedReadAttributeCallback<DecodableAttributeType>>(
-        clusterId, attributeId, readParams.mOnReportCb, readParams.mOnErrorCb, onDone, readParams.mOnSubscriptionEstablishedCb);
+        clusterId, attributeId, readParams.mOnReportCb, readParams.mOnErrorCb, onDone, readParams.mOnSubscriptionEstablishedCb,
+        readParams.mOnResubscriptionAttemptCb);
     VerifyOrReturnError(callback != nullptr, CHIP_ERROR_NO_MEMORY);
 
     auto readClient =
@@ -107,13 +110,13 @@ CHIP_ERROR ReadAttribute(Messaging::ExchangeManager * exchangeMgr, const Session
                          ClusterId clusterId, AttributeId attributeId,
                          typename TypedReadAttributeCallback<DecodableAttributeType>::OnSuccessCallbackType onSuccessCb,
                          typename TypedReadAttributeCallback<DecodableAttributeType>::OnErrorCallbackType onErrorCb,
-                         bool fabricFiltered = true, const Optional<DataVersion> & aDataVersion = NullOptional)
+                         bool fabricFiltered = true)
 {
     detail::ReportAttributeParams<DecodableAttributeType> params(sessionHandle);
     params.mOnReportCb       = onSuccessCb;
     params.mOnErrorCb        = onErrorCb;
     params.mIsFabricFiltered = fabricFiltered;
-    return detail::ReportAttribute(exchangeMgr, endpointId, clusterId, attributeId, std::move(params), aDataVersion);
+    return detail::ReportAttribute(exchangeMgr, endpointId, clusterId, attributeId, std::move(params), NullOptional);
 }
 
 /*
@@ -130,11 +133,11 @@ CHIP_ERROR
 ReadAttribute(Messaging::ExchangeManager * exchangeMgr, const SessionHandle & sessionHandle, EndpointId endpointId,
               typename TypedReadAttributeCallback<typename AttributeTypeInfo::DecodableType>::OnSuccessCallbackType onSuccessCb,
               typename TypedReadAttributeCallback<typename AttributeTypeInfo::DecodableType>::OnErrorCallbackType onErrorCb,
-              bool fabricFiltered = true, const Optional<DataVersion> & aDataVersion = NullOptional)
+              bool fabricFiltered = true)
 {
     return ReadAttribute<typename AttributeTypeInfo::DecodableType>(
         exchangeMgr, sessionHandle, endpointId, AttributeTypeInfo::GetClusterId(), AttributeTypeInfo::GetAttributeId(), onSuccessCb,
-        onErrorCb, fabricFiltered, aDataVersion);
+        onErrorCb, fabricFiltered);
 }
 
 // Helper for SubscribeAttribute to reduce the amount of code generated.
@@ -146,12 +149,15 @@ CHIP_ERROR SubscribeAttribute(
     uint16_t maxIntervalCeilingSeconds,
     typename TypedReadAttributeCallback<DecodableAttributeType>::OnSubscriptionEstablishedCallbackType onSubscriptionEstablishedCb =
         nullptr,
+    typename TypedReadAttributeCallback<DecodableAttributeType>::OnResubscriptionAttemptCallbackType onResubscriptionAttemptCb =
+        nullptr,
     bool fabricFiltered = true, bool keepPreviousSubscriptions = false, const Optional<DataVersion> & aDataVersion = NullOptional)
 {
     detail::ReportAttributeParams<DecodableAttributeType> params(sessionHandle);
     params.mOnReportCb                  = onReportCb;
     params.mOnErrorCb                   = onErrorCb;
     params.mOnSubscriptionEstablishedCb = onSubscriptionEstablishedCb;
+    params.mOnResubscriptionAttemptCb   = onResubscriptionAttemptCb;
     params.mMinIntervalFloorSeconds     = minIntervalFloorSeconds;
     params.mMaxIntervalCeilingSeconds   = maxIntervalCeilingSeconds;
     params.mKeepSubscriptions           = keepPreviousSubscriptions;
@@ -177,12 +183,14 @@ CHIP_ERROR SubscribeAttribute(
     uint16_t aMinIntervalFloorSeconds, uint16_t aMaxIntervalCeilingSeconds,
     typename TypedReadAttributeCallback<typename AttributeTypeInfo::DecodableType>::OnSubscriptionEstablishedCallbackType
         onSubscriptionEstablishedCb = nullptr,
+    typename TypedReadAttributeCallback<typename AttributeTypeInfo::DecodableType>::OnResubscriptionAttemptCallbackType
+        onResubscriptionAttemptCb = nullptr,
     bool fabricFiltered = true, bool keepPreviousSubscriptions = false, const Optional<DataVersion> & aDataVersion = NullOptional)
 {
     return SubscribeAttribute<typename AttributeTypeInfo::DecodableType>(
         exchangeMgr, sessionHandle, endpointId, AttributeTypeInfo::GetClusterId(), AttributeTypeInfo::GetAttributeId(), onReportCb,
-        onErrorCb, aMinIntervalFloorSeconds, aMaxIntervalCeilingSeconds, onSubscriptionEstablishedCb, fabricFiltered,
-        keepPreviousSubscriptions, aDataVersion);
+        onErrorCb, aMinIntervalFloorSeconds, aMaxIntervalCeilingSeconds, onSubscriptionEstablishedCb, onResubscriptionAttemptCb,
+        fabricFiltered, keepPreviousSubscriptions, aDataVersion);
 }
 
 namespace detail {
@@ -193,8 +201,10 @@ struct ReportEventParams : public app::ReadPrepareParams
     ReportEventParams(const SessionHandle & sessionHandle) : app::ReadPrepareParams(sessionHandle) {}
     typename TypedReadEventCallback<DecodableEventType>::OnSuccessCallbackType mOnReportCb;
     typename TypedReadEventCallback<DecodableEventType>::OnErrorCallbackType mOnErrorCb;
+    typename TypedReadEventCallback<DecodableEventType>::OnDoneCallbackType mOnDoneCb;
     typename TypedReadEventCallback<DecodableEventType>::OnSubscriptionEstablishedCallbackType mOnSubscriptionEstablishedCb =
         nullptr;
+    typename TypedReadEventCallback<DecodableEventType>::OnResubscriptionAttemptCallbackType mOnResubscriptionAttemptCb = nullptr;
     app::ReadClient::InteractionType mReportType = app::ReadClient::InteractionType::Read;
 };
 
@@ -214,10 +224,9 @@ CHIP_ERROR ReportEvent(Messaging::ExchangeManager * apExchangeMgr, EndpointId en
 
     readParams.mEventPathParamsListSize = 1;
 
-    auto onDone = [](TypedReadEventCallback<DecodableEventType> * callback) { chip::Platform::Delete(callback); };
-
     auto callback = chip::Platform::MakeUnique<TypedReadEventCallback<DecodableEventType>>(
-        readParams.mOnReportCb, readParams.mOnErrorCb, onDone, readParams.mOnSubscriptionEstablishedCb);
+        readParams.mOnReportCb, readParams.mOnErrorCb, readParams.mOnDoneCb, readParams.mOnSubscriptionEstablishedCb,
+        readParams.mOnResubscriptionAttemptCb);
 
     VerifyOrReturnError(callback != nullptr, CHIP_ERROR_NO_MEMORY);
 
@@ -242,7 +251,7 @@ CHIP_ERROR ReportEvent(Messaging::ExchangeManager * apExchangeMgr, EndpointId en
     // object now to prevent it from being reclaimed at the end of this scoped block.
     //
     callback->AdoptReadClient(std::move(readClient));
-    readClient.release();
+    callback.release();
 
     return err;
 }
@@ -257,15 +266,22 @@ CHIP_ERROR ReportEvent(Messaging::ExchangeManager * apExchangeMgr, EndpointId en
  * The DecodableEventType is generally expected to be a ClusterName::Events::EventName::DecodableEventType struct, but any
  * object that contains type information exposed through a 'DecodableType' type declaration as well as GetClusterId() and
  * GetEventId() methods is expected to work.
+ *
+ * @param[in] onSuccessCb Used to deliver event data received through the Read interactions
+ * @param[in] onErrorCb failureCb will be called when an error occurs *after* a successful call to ReadEvent.
+ * @param[in] onDoneCb    OnDone will be called when ReadClient has finished all work for event retrieval, it is possible that there
+ * is no event.
  */
 template <typename DecodableEventType>
 CHIP_ERROR ReadEvent(Messaging::ExchangeManager * exchangeMgr, const SessionHandle & sessionHandle, EndpointId endpointId,
                      typename TypedReadEventCallback<DecodableEventType>::OnSuccessCallbackType onSuccessCb,
-                     typename TypedReadEventCallback<DecodableEventType>::OnErrorCallbackType onErrorCb)
+                     typename TypedReadEventCallback<DecodableEventType>::OnErrorCallbackType onErrorCb,
+                     typename TypedReadEventCallback<DecodableEventType>::OnDoneCallbackType onDoneCb)
 {
     detail::ReportEventParams<DecodableEventType> params(sessionHandle);
     params.mOnReportCb = onSuccessCb;
     params.mOnErrorCb  = onErrorCb;
+    params.mOnDoneCb   = onDoneCb;
     return detail::ReportEvent(exchangeMgr, endpointId, std::move(params), false /*aIsUrgentEvent*/);
 }
 
@@ -274,18 +290,22 @@ CHIP_ERROR ReadEvent(Messaging::ExchangeManager * exchangeMgr, const SessionHand
  * similarly to ReadEvent but keeps reporting events as they are emitted.
  */
 template <typename DecodableEventType>
-CHIP_ERROR SubscribeEvent(Messaging::ExchangeManager * exchangeMgr, const SessionHandle & sessionHandle, EndpointId endpointId,
-                          typename TypedReadEventCallback<DecodableEventType>::OnSuccessCallbackType onReportCb,
-                          typename TypedReadEventCallback<DecodableEventType>::OnErrorCallbackType onErrorCb,
-                          uint16_t minIntervalFloorSeconds, uint16_t maxIntervalCeilingSeconds,
-                          typename TypedReadEventCallback<DecodableEventType>::OnSubscriptionEstablishedCallbackType
-                              onSubscriptionEstablishedCb = nullptr,
-                          bool keepPreviousSubscriptions = false, bool aIsUrgentEvent = false)
+CHIP_ERROR SubscribeEvent(
+    Messaging::ExchangeManager * exchangeMgr, const SessionHandle & sessionHandle, EndpointId endpointId,
+    typename TypedReadEventCallback<DecodableEventType>::OnSuccessCallbackType onReportCb,
+    typename TypedReadEventCallback<DecodableEventType>::OnErrorCallbackType onErrorCb, uint16_t minIntervalFloorSeconds,
+    uint16_t maxIntervalCeilingSeconds,
+    typename TypedReadEventCallback<DecodableEventType>::OnSubscriptionEstablishedCallbackType onSubscriptionEstablishedCb =
+        nullptr,
+    typename TypedReadEventCallback<DecodableEventType>::OnResubscriptionAttemptCallbackType onResubscriptionAttemptCb = nullptr,
+    bool keepPreviousSubscriptions = false, bool aIsUrgentEvent = false)
 {
     detail::ReportEventParams<DecodableEventType> params(sessionHandle);
     params.mOnReportCb                  = onReportCb;
     params.mOnErrorCb                   = onErrorCb;
+    params.mOnDoneCb                    = nullptr;
     params.mOnSubscriptionEstablishedCb = onSubscriptionEstablishedCb;
+    params.mOnResubscriptionAttemptCb   = onResubscriptionAttemptCb;
     params.mMinIntervalFloorSeconds     = minIntervalFloorSeconds;
     params.mMaxIntervalCeilingSeconds   = maxIntervalCeilingSeconds;
     params.mKeepSubscriptions           = keepPreviousSubscriptions;
diff --git a/src/controller/SetUpCodePairer.cpp b/src/controller/SetUpCodePairer.cpp
index 4445c380f0c018..addd337ee4d798 100644
--- a/src/controller/SetUpCodePairer.cpp
+++ b/src/controller/SetUpCodePairer.cpp
@@ -128,6 +128,18 @@ CHIP_ERROR SetUpCodePairer::StartDiscoverOverBle(SetupPayload & payload)
 
 CHIP_ERROR SetUpCodePairer::StopConnectOverBle()
 {
+    // Make sure to not call CancelBleIncompleteConnection unless we are in fact
+    // waiting on BLE discovery.  It will cancel connections that are in fact
+    // completed. In particular, if we just established PASE over BLE calling
+    // CancelBleIncompleteConnection here unconditionally would cancel the BLE
+    // connection underlying the PASE session.  So make sure to only call
+    // CancelBleIncompleteConnection if we're still waiting to hear back on the
+    // BLE discovery bits.
+    if (!mWaitingForDiscovery[kBLETransport])
+    {
+        return CHIP_NO_ERROR;
+    }
+
     mWaitingForDiscovery[kBLETransport] = false;
 #if CONFIG_NETWORK_LAYER_BLE
     VerifyOrReturnError(mBleLayer != nullptr, CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
@@ -146,26 +158,9 @@ CHIP_ERROR SetUpCodePairer::StartDiscoverOverIP(SetupPayload & payload)
                                                       : Dnssd::DiscoveryFilterType::kLongDiscriminator;
     currentFilter.code =
         payload.isShortDiscriminator ? static_cast<uint16_t>((payload.discriminator >> 8) & 0x0F) : payload.discriminator;
-
-    // We're going to ensure that anything we discover matches currentFilter
-    // before we use it, which will do our discriminator checks for us.
-    //
-    // We are using an mdns continuous query for some PTR record to discover
-    // devices.  If the PTR record we use is for one of the discriminator-based
-    // subtypes (based on currentFilter), then we can run into a problem where
-    // we discover a (possibly stale) advertisement for a non-commissionable
-    // (CM=0) node and ignore it, and then when it becomes commissionable we
-    // don't notice because that just updates the TXT record to CM=1 and does
-    // not touch the PTR record we are querying for.
-    //
-    // So instead we query the PTR record for the "_CM" subtype, which will get
-    // added when a node enters commissioning mode.
-    Dnssd::DiscoveryFilter filter;
-    filter.type = Dnssd::DiscoveryFilterType::kCommissioningMode;
-
     // Handle possibly-sync callbacks.
     mWaitingForDiscovery[kIPTransport] = true;
-    CHIP_ERROR err                     = mCommissioner->DiscoverCommissionableNodes(filter);
+    CHIP_ERROR err                     = mCommissioner->DiscoverCommissionableNodes(currentFilter);
     if (err != CHIP_NO_ERROR)
     {
         mWaitingForDiscovery[kIPTransport] = false;
@@ -195,8 +190,6 @@ CHIP_ERROR SetUpCodePairer::StopConnectOverSoftAP()
 
 bool SetUpCodePairer::ConnectToDiscoveredDevice()
 {
-    mSystemLayer->CancelTimer(OnDeviceDiscoveredTimeoutCallback, this);
-
     if (mWaitingForPASE)
     {
         // Nothing to do.  Just wait until we either succeed or fail at that
@@ -204,17 +197,14 @@ bool SetUpCodePairer::ConnectToDiscoveredDevice()
         return false;
     }
 
-    for (auto & storedParams : mDiscoveredParameters)
+    if (!mDiscoveredParameters.empty())
     {
-        if (!storedParams.HasPeerAddress())
-        {
-            continue;
-        }
-
-        // Clear out those params, since we will kick off a connection to them
-        // now.
-        RendezvousParameters params(storedParams);
-        storedParams = RendezvousParameters();
+        // Grab the first element from the queue and try connecting to it.
+        // Remove it from the queue before we try to connect, in case the
+        // connection attempt fails and calls right back into us to try the next
+        // thing.
+        RendezvousParameters params(mDiscoveredParameters.front());
+        mDiscoveredParameters.pop();
 
         params.SetSetupPINCode(mSetUpPINCode);
 
@@ -257,12 +247,9 @@ void SetUpCodePairer::OnDiscoveredDeviceOverBle(BLE_CONNECTION_OBJECT connObj)
 
     mWaitingForDiscovery[kBLETransport] = false;
 
-    // Probably safe to stop connections over other transports at this point?
-    LogErrorOnFailure(StopConnectOverIP());
-    LogErrorOnFailure(StopConnectOverSoftAP());
-
-    Transport::PeerAddress peerAddress   = Transport::PeerAddress::BLE();
-    mDiscoveredParameters[kBLETransport] = RendezvousParameters().SetPeerAddress(peerAddress).SetConnectionObject(connObj);
+    Transport::PeerAddress peerAddress = Transport::PeerAddress::BLE();
+    mDiscoveredParameters.emplace();
+    mDiscoveredParameters.back().SetPeerAddress(peerAddress).SetConnectionObject(connObj);
     ConnectToDiscoveredDevice();
 }
 
@@ -312,16 +299,12 @@ void SetUpCodePairer::NotifyCommissionableDeviceDiscovered(const Dnssd::Discover
 
     ChipLogProgress(Controller, "Discovered device to be commissioned over DNS-SD");
 
-    // Don't stop trying to connect over BLE, because we may be dealing with
-    // stale DNS-SD records.
-    LogErrorOnFailure(StopConnectOverIP());
-    LogErrorOnFailure(StopConnectOverSoftAP());
-
     Inet::InterfaceId interfaceId =
         nodeData.resolutionData.ipAddress[0].IsIPv6LinkLocal() ? nodeData.resolutionData.interfaceId : Inet::InterfaceId::Null();
     Transport::PeerAddress peerAddress =
         Transport::PeerAddress::UDP(nodeData.resolutionData.ipAddress[0], nodeData.resolutionData.port, interfaceId);
-    mDiscoveredParameters[kIPTransport] = RendezvousParameters().SetPeerAddress(peerAddress);
+    mDiscoveredParameters.emplace();
+    mDiscoveredParameters.back().SetPeerAddress(peerAddress);
     ConnectToDiscoveredDevice();
 }
 
@@ -333,11 +316,21 @@ bool SetUpCodePairer::TryNextRendezvousParameters()
         return true;
     }
 
+    if (DiscoveryInProgress())
+    {
+        ChipLogProgress(Controller, "Waiting to discover commissionees that match our filters");
+        return true;
+    }
+
+    return false;
+}
+
+bool SetUpCodePairer::DiscoveryInProgress() const
+{
     for (const auto & waiting : mWaitingForDiscovery)
     {
         if (waiting)
         {
-            ChipLogProgress(Controller, "Waiting to discover commissionees that match our filters");
             return true;
         }
     }
@@ -347,15 +340,22 @@ bool SetUpCodePairer::TryNextRendezvousParameters()
 
 void SetUpCodePairer::ResetDiscoveryState()
 {
+    StopConnectOverBle();
+    StopConnectOverIP();
+    StopConnectOverSoftAP();
+
+    // Just in case any of those failed to reset the waiting state properly.
     for (auto & waiting : mWaitingForDiscovery)
     {
         waiting = false;
     }
 
-    for (auto & params : mDiscoveredParameters)
+    while (!mDiscoveredParameters.empty())
     {
-        params = RendezvousParameters();
+        mDiscoveredParameters.pop();
     }
+
+    mLastPASEError = CHIP_NO_ERROR;
 }
 
 void SetUpCodePairer::ExpectPASEEstablishment()
@@ -382,6 +382,28 @@ void SetUpCodePairer::PASEEstablishmentComplete()
 
 void SetUpCodePairer::OnStatusUpdate(DevicePairingDelegate::Status status)
 {
+    if (status == DevicePairingDelegate::Status::SecurePairingFailed)
+    {
+        // If we're still waiting on discovery, don't propagate this failure
+        // (which is due to PASE failure with something we discovered, but the
+        // "something" may not have been the right thing) for now.  Wait until
+        // discovery completes.  Then we will either succeed and notify
+        // accordingly or time out and land in OnStatusUpdate again, but at that
+        // point we will not be waiting on discovery anymore.
+        if (!mDiscoveredParameters.empty())
+        {
+            ChipLogProgress(Controller, "Ignoring SecurePairingFailed status for now; we have more discovered devices to try");
+            return;
+        }
+
+        if (DiscoveryInProgress())
+        {
+            ChipLogProgress(Controller,
+                            "Ignoring SecurePairingFailed status for now; we are waiting to see if we discover more devices");
+            return;
+        }
+    }
+
     if (mPairingDelegate)
     {
         mPairingDelegate->OnStatusUpdate(status);
@@ -399,18 +421,8 @@ void SetUpCodePairer::OnPairingComplete(CHIP_ERROR error)
 
     if (CHIP_NO_ERROR == error)
     {
-        // StopConnectOverBle calls CancelBleIncompleteConnection, which will
-        // cancel connections that are in fact completed. In particular, if we
-        // just established PASE over BLE calling StopConnectOverBle here
-        // unconditionally would cancel the BLE connection underlying the PASE
-        // session.  So make sure to only call StopConnectOverBle if we're still
-        // waiting to hear back on the BLE discovery bits.
-        if (mWaitingForDiscovery[kBLETransport])
-        {
-            StopConnectOverBle();
-        }
-        StopConnectOverIP();
-        StopConnectOverSoftAP();
+        mSystemLayer->CancelTimer(OnDeviceDiscoveredTimeoutCallback, this);
+
         ResetDiscoveryState();
         pairingDelegate->OnPairingComplete(error);
         return;
@@ -421,6 +433,7 @@ void SetUpCodePairer::OnPairingComplete(CHIP_ERROR error)
     if (TryNextRendezvousParameters())
     {
         // Keep waiting until that finishes.  Don't call OnPairingComplete yet.
+        mLastPASEError = error;
         return;
     }
 
@@ -446,11 +459,23 @@ void SetUpCodePairer::OnCommissioningComplete(NodeId deviceId, CHIP_ERROR error)
 
 void SetUpCodePairer::OnDeviceDiscoveredTimeoutCallback(System::Layer * layer, void * context)
 {
+    ChipLogError(Controller, "Discovery timed out");
     auto * pairer = static_cast<SetUpCodePairer *>(context);
     LogErrorOnFailure(pairer->StopConnectOverBle());
     LogErrorOnFailure(pairer->StopConnectOverIP());
     LogErrorOnFailure(pairer->StopConnectOverSoftAP());
-    pairer->mCommissioner->OnSessionEstablishmentError(CHIP_ERROR_TIMEOUT);
+    if (!pairer->mWaitingForPASE && pairer->mDiscoveredParameters.empty())
+    {
+        // We're not waiting on any more PASE attempts, and we're not going to
+        // discover anything at this point, so we should just notify our
+        // listener.
+        CHIP_ERROR err = pairer->mLastPASEError;
+        if (err == CHIP_NO_ERROR)
+        {
+            err = CHIP_ERROR_TIMEOUT;
+        }
+        pairer->mCommissioner->OnSessionEstablishmentError(err);
+    }
 }
 
 } // namespace Controller
diff --git a/src/controller/SetUpCodePairer.h b/src/controller/SetUpCodePairer.h
index d7697f2f0f1d46..8a47b6a69364d4 100644
--- a/src/controller/SetUpCodePairer.h
+++ b/src/controller/SetUpCodePairer.h
@@ -41,6 +41,8 @@
 
 #include <controller/DeviceDiscoveryDelegate.h>
 
+#include <queue>
+
 namespace chip {
 namespace Controller {
 
@@ -113,6 +115,10 @@ class DLL_EXPORT SetUpCodePairer : public DevicePairingDelegate
     // actually failed or not.
     bool TryNextRendezvousParameters();
 
+    // True if we are still waiting on discovery to possibly produce new
+    // RendezvousParameters in the future.
+    bool DiscoveryInProgress() const;
+
     // Not an enum class because we use this for indexing into arrays.
     enum TransportTypes
     {
@@ -151,17 +157,18 @@ class DLL_EXPORT SetUpCodePairer : public DevicePairingDelegate
     // process happening via the relevant transport.
     bool mWaitingForDiscovery[kTransportTypeCount] = { false };
 
-    // HasPeerAddress() for a given transport type will test true if we have
-    // discovered an address for that transport and not tried connecting to it
-    // yet.  The general discovery/pairing process will terminate once all
-    // parameters test false for HasPeerAddress() and all the booleans in
-    // mWaitingForDiscovery are false.
-    RendezvousParameters mDiscoveredParameters[kTransportTypeCount];
+    // Queue of things we have discovered but not tried connecting to yet.  The
+    // general discovery/pairing process will terminate once this queue is empty
+    // and all the booleans in mWaitingForDiscovery are false.
+    std::queue<RendezvousParameters> mDiscoveredParameters;
 
     // mWaitingForPASE is true if we have called either
     // EstablishPASEConnection or PairDevice on mCommissioner and are now just
     // waiting to see whether that works.
     bool mWaitingForPASE = false;
+
+    // mLastPASEError is the error from the last OnPairingComplete call we got.
+    CHIP_ERROR mLastPASEError = CHIP_NO_ERROR;
 };
 
 } // namespace Controller
diff --git a/src/controller/TypedReadCallback.h b/src/controller/TypedReadCallback.h
index 13b75567a33b37..29fe831ae93a4e 100644
--- a/src/controller/TypedReadCallback.h
+++ b/src/controller/TypedReadCallback.h
@@ -53,13 +53,16 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback
     using OnErrorCallbackType = std::function<void(const app::ConcreteDataAttributePath * aPath, CHIP_ERROR aError)>;
     using OnDoneCallbackType  = std::function<void(TypedReadAttributeCallback * callback)>;
     using OnSubscriptionEstablishedCallbackType = std::function<void(const app::ReadClient & readClient)>;
-
+    using OnResubscriptionAttemptCallbackType =
+        std::function<void(const app::ReadClient & readClient, CHIP_ERROR aError, uint32_t aNextResubscribeIntervalMsec)>;
     TypedReadAttributeCallback(ClusterId aClusterId, AttributeId aAttributeId, OnSuccessCallbackType aOnSuccess,
                                OnErrorCallbackType aOnError, OnDoneCallbackType aOnDone,
-                               OnSubscriptionEstablishedCallbackType aOnSubscriptionEstablished = nullptr) :
+                               OnSubscriptionEstablishedCallbackType aOnSubscriptionEstablished = nullptr,
+                               OnResubscriptionAttemptCallbackType aOnResubscriptionAttempt     = nullptr) :
         mClusterId(aClusterId),
         mAttributeId(aAttributeId), mOnSuccess(aOnSuccess), mOnError(aOnError), mOnDone(aOnDone),
-        mOnSubscriptionEstablished(aOnSubscriptionEstablished), mBufferedReadAdapter(*this)
+        mOnSubscriptionEstablished(aOnSubscriptionEstablished), mOnResubscriptionAttempt(aOnResubscriptionAttempt),
+        mBufferedReadAdapter(*this)
     {}
 
     app::BufferedReadCallback & GetBufferedCallback() { return mBufferedReadAdapter; }
@@ -106,6 +109,14 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback
         }
     }
 
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override
+    {
+        if (mOnResubscriptionAttempt)
+        {
+            mOnResubscriptionAttempt(*mReadClient.get(), aTerminationCause, aNextResubscribeIntervalMsec);
+        }
+    }
+
     void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override
     {
         VerifyOrDie(aReadPrepareParams.mAttributePathParamsListSize == 1 &&
@@ -124,6 +135,7 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback
     OnErrorCallbackType mOnError;
     OnDoneCallbackType mOnDone;
     OnSubscriptionEstablishedCallbackType mOnSubscriptionEstablished;
+    OnResubscriptionAttemptCallbackType mOnResubscriptionAttempt;
     app::BufferedReadCallback mBufferedReadAdapter;
     Platform::UniquePtr<app::ReadClient> mReadClient;
 };
@@ -134,13 +146,17 @@ class TypedReadEventCallback final : public app::ReadClient::Callback
 public:
     using OnSuccessCallbackType = std::function<void(const app::EventHeader & aEventHeader, const DecodableEventType & aData)>;
     using OnErrorCallbackType   = std::function<void(const app::EventHeader * apEventHeader, CHIP_ERROR aError)>;
-    using OnDoneCallbackType    = std::function<void(TypedReadEventCallback * callback)>;
-    using OnSubscriptionEstablishedCallbackType = std::function<void()>;
+    using OnDoneCallbackType    = std::function<void(app::ReadClient * apReadClient)>;
+    using OnSubscriptionEstablishedCallbackType = std::function<void(const app::ReadClient & aReadClient)>;
+    using OnResubscriptionAttemptCallbackType =
+        std::function<void(const app::ReadClient & aReadClient, CHIP_ERROR aError, uint32_t aNextResubscribeIntervalMsec)>;
 
     TypedReadEventCallback(OnSuccessCallbackType aOnSuccess, OnErrorCallbackType aOnError, OnDoneCallbackType aOnDone,
-                           OnSubscriptionEstablishedCallbackType aOnSubscriptionEstablished = nullptr) :
+                           OnSubscriptionEstablishedCallbackType aOnSubscriptionEstablished = nullptr,
+                           OnResubscriptionAttemptCallbackType aOnResubscriptionAttempt     = nullptr) :
         mOnSuccess(aOnSuccess),
-        mOnError(aOnError), mOnDone(aOnDone), mOnSubscriptionEstablished(aOnSubscriptionEstablished)
+        mOnError(aOnError), mOnDone(aOnDone), mOnSubscriptionEstablished(aOnSubscriptionEstablished),
+        mOnResubscriptionAttempt(aOnResubscriptionAttempt)
     {}
 
     void AdoptReadClient(Platform::UniquePtr<app::ReadClient> aReadClient) { mReadClient = std::move(aReadClient); }
@@ -173,7 +189,16 @@ class TypedReadEventCallback final : public app::ReadClient::Callback
 
     void OnError(CHIP_ERROR aError) override { mOnError(nullptr, aError); }
 
-    void OnDone(app::ReadClient *) override { mOnDone(this); }
+    void OnDone(app::ReadClient * apReadClient) override
+    {
+        if (mOnDone != nullptr)
+        {
+            mOnDone(apReadClient);
+        }
+
+        // Always needs to be the last call
+        chip::Platform::Delete(this);
+    }
 
     void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override
     {
@@ -185,7 +210,15 @@ class TypedReadEventCallback final : public app::ReadClient::Callback
     {
         if (mOnSubscriptionEstablished)
         {
-            mOnSubscriptionEstablished();
+            mOnSubscriptionEstablished(*mReadClient.get());
+        }
+    }
+
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override
+    {
+        if (mOnResubscriptionAttempt)
+        {
+            mOnResubscriptionAttempt(*mReadClient.get(), aTerminationCause, aNextResubscribeIntervalMsec);
         }
     }
 
@@ -193,6 +226,7 @@ class TypedReadEventCallback final : public app::ReadClient::Callback
     OnErrorCallbackType mOnError;
     OnDoneCallbackType mOnDone;
     OnSubscriptionEstablishedCallbackType mOnSubscriptionEstablished;
+    OnResubscriptionAttemptCallbackType mOnResubscriptionAttempt;
     Platform::UniquePtr<app::ReadClient> mReadClient;
 };
 
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 82e21bf6b093be..955a9825ea593e 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1276,16 +1276,6 @@ client cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlAlarmMask : BITMAP16 {
-    kLockingMechanismJammed = 0x1;
-    kLockResetToFactoryDefaults = 0x2;
-    kReserved = 0x4;
-    kRFModulePowerCycled = 0x8;
-    kWrongCodeEntryLimit = 0x10;
-    kFrontEscutcheonRemovedFromMain = 0x20;
-    kForcedDoorOpenUnderDoorLockedCondition = 0x40;
-  }
-
   bitmap DlCredentialRuleMask : BITMAP8 {
     kSingle = 0x1;
     kDual = 0x2;
@@ -1624,11 +1614,6 @@ client cluster DoorLock = 257 {
     optional DlOperatingMode operatingMode = 4;
   }
 
-  response struct GetUserTypeResponse = 21 {
-    INT16U userId = 0;
-    DlUserType userType = 1;
-  }
-
   response struct GetUserResponse = 28 {
     INT16U userIndex = 0;
     nullable CHAR_STRING userName = 1;
@@ -1958,11 +1943,19 @@ client cluster GeneralDiagnostics = 51 {
   readonly attribute ENUM8 activeHardwareFaults[] = 5;
   readonly attribute ENUM8 activeRadioFaults[] = 6;
   readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   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 TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 client cluster GroupKeyManagement = 63 {
@@ -2901,6 +2894,7 @@ client cluster OperationalCredentials = 62 {
     kInvalidNOC = 3;
     kMissingCsr = 4;
     kTableFull = 5;
+    kInvalidAdminSubject = 6;
     kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
@@ -2944,13 +2938,14 @@ client cluster OperationalCredentials = 62 {
 
   request struct CSRRequestRequest {
     OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
     OCTET_STRING NOCValue = 0;
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
-    NODE_ID caseAdminNode = 3;
+    Int64u caseAdminSubject = 3;
     VENDOR_ID adminVendorId = 4;
   }
 
@@ -2971,10 +2966,6 @@ client cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  request struct RemoveTrustedRootCertificateRequest {
-    OCTET_STRING trustedRootIdentifier = 0;
-  }
-
   response struct AttestationResponse = 1 {
     OCTET_STRING attestationElements = 0;
     OCTET_STRING signature = 1;
@@ -3003,7 +2994,6 @@ client cluster OperationalCredentials = 62 {
   command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
   command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-  command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
 }
 
 client cluster PowerSource = 47 {
@@ -3372,12 +3362,16 @@ client cluster Scenes = 5 {
 }
 
 client cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
   struct ThreadMetrics {
     int64u id = 0;
-    char_string<8> name = 1;
-    int32u stackFreeCurrent = 2;
-    int32u stackFreeMinimum = 3;
-    int32u stackSize = 4;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
   info event SoftwareFault = 0 {
@@ -3481,7 +3475,7 @@ client cluster TemperatureMeasurement = 1026 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster TestCluster = 1295 {
+client cluster TestCluster = 4294048773 {
   enum SimpleEnum : ENUM8 {
     kUnspecified = 0;
     kValueA = 1;
@@ -3524,8 +3518,8 @@ client cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   struct NullablesAndOptionalsStruct {
@@ -3901,20 +3895,10 @@ client cluster Thermostat = 513 {
     ThermostatScheduleTransition transitions[] = 3;
   }
 
-  response struct GetRelayStatusLogResponse = 1 {
-    INT16U timeOfDay = 0;
-    BITMAP8 relayStatus = 1;
-    INT16S localTemperature = 2;
-    INT8U humidityInPercentage = 3;
-    INT16S setpoint = 4;
-    INT16U unreadEntries = 5;
-  }
-
   command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
   command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
   command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
   command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
-  command GetRelayStatusLog(): GetRelayStatusLogResponse = 4;
 }
 
 client cluster ThermostatUserInterfaceConfiguration = 516 {
@@ -4013,7 +3997,7 @@ client cluster ThreadNetworkDiagnostics = 53 {
   }
 
   readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable enum8 routingRole = 1;
+  readonly attribute nullable RoutingRole routingRole = 1;
   readonly attribute nullable char_string<16> networkName = 2;
   readonly attribute nullable int16u panId = 3;
   readonly attribute nullable int64u extendedPanId = 4;
@@ -4021,11 +4005,11 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int64u overrunCount = 6;
   readonly attribute NeighborTable neighborTableList[] = 7;
   readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute int32u partitionId = 9;
-  readonly attribute int8u weighting = 10;
-  readonly attribute int8u dataVersion = 11;
-  readonly attribute int8u stableDataVersion = 12;
-  readonly attribute int8u leaderRouterId = 13;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
   readonly attribute int16u detachedRoleCount = 14;
   readonly attribute int16u childRoleCount = 15;
   readonly attribute int16u routerRoleCount = 16;
@@ -4068,12 +4052,12 @@ client cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int32u rxErrSecCount = 53;
   readonly attribute int32u rxErrFcsCount = 54;
   readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute int64u activeTimestamp = 56;
-  readonly attribute int64u pendingTimestamp = 57;
-  readonly attribute int32u delay = 58;
-  readonly attribute SecurityPolicy securityPolicy[] = 59;
-  readonly attribute octet_string<4> channelMask = 60;
-  readonly attribute OperationalDatasetComponents operationalDatasetComponents[] = 61;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
   readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -4304,8 +4288,12 @@ client cluster WindowCovering = 258 {
   }
 
   readonly attribute Type type = 0;
+  readonly attribute int16u physicalClosedLimitLift = 1;
+  readonly attribute int16u physicalClosedLimitTilt = 2;
   readonly attribute nullable int16u currentPositionLift = 3;
   readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute int16u numberOfActuationsLift = 5;
+  readonly attribute int16u numberOfActuationsTilt = 6;
   readonly attribute ConfigStatus configStatus = 7;
   readonly attribute nullable Percent currentPositionLiftPercentage = 8;
   readonly attribute nullable Percent currentPositionTiltPercentage = 9;
@@ -4352,8 +4340,8 @@ client cluster WindowCovering = 258 {
   command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
-
 endpoint 1 {
+  device type rootdevice = 22;
   binding cluster Identify;
   binding cluster Groups;
   binding cluster Scenes;
@@ -4416,8 +4404,8 @@ endpoint 1 {
   binding cluster ApplicationLauncher;
   binding cluster ApplicationBasic;
   binding cluster AccountLogin;
-  binding cluster TestCluster;
   binding cluster ElectricalMeasurement;
+  binding cluster TestCluster;
 }
 
 
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 8e6ea8db55c2b1..1b3350840081c5 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1311,7 +1311,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "0x01",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5212,7 +5212,16 @@
           "define": "GENERAL_DIAGNOSTICS_CLUSTER",
           "side": "client",
           "enabled": 1,
-          "commands": [],
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 0,
+              "outgoing": 1
+            }
+          ],
           "attributes": [
             {
               "name": "ClusterRevision",
@@ -5369,6 +5378,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -5726,7 +5751,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5740,9 +5765,9 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "RoutingRole",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5758,7 +5783,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -5774,7 +5799,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -5790,7 +5815,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -5806,7 +5831,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5822,7 +5847,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -5870,7 +5895,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5886,7 +5911,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5902,7 +5927,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5918,7 +5943,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5934,7 +5959,7 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -5950,7 +5975,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -5966,7 +5991,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -5982,7 +6007,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -5998,7 +6023,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6014,7 +6039,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6030,7 +6055,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6046,7 +6071,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6062,7 +6087,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6078,7 +6103,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6094,7 +6119,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6110,7 +6135,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6126,7 +6151,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6142,7 +6167,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6158,7 +6183,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6174,7 +6199,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6190,7 +6215,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6206,7 +6231,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6222,7 +6247,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6238,7 +6263,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6254,7 +6279,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6270,7 +6295,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6286,7 +6311,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6302,7 +6327,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6318,7 +6343,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6334,7 +6359,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6350,7 +6375,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6366,7 +6391,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6382,7 +6407,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6398,7 +6423,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6414,7 +6439,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6430,7 +6455,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6446,7 +6471,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6462,7 +6487,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6478,7 +6503,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6494,7 +6519,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6510,7 +6535,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6526,7 +6551,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6542,7 +6567,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6558,7 +6583,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6574,7 +6599,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6590,7 +6615,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6606,7 +6631,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6622,7 +6647,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -6638,7 +6663,7 @@
               "side": "server",
               "type": "int64u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000000000000000",
@@ -6654,7 +6679,7 @@
               "side": "server",
               "type": "int32u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6668,7 +6693,7 @@
               "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -6686,7 +6711,7 @@
               "side": "server",
               "type": "octet_string",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
@@ -6700,7 +6725,7 @@
               "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -8233,14 +8258,6 @@
               "source": "client",
               "incoming": 0,
               "outgoing": 1
-            },
-            {
-              "name": "RemoveTrustedRootCertificate",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 0,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -9423,7 +9440,7 @@
               "code": 17,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -9431,7 +9448,7 @@
               "code": 18,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -9439,7 +9456,7 @@
               "code": 19,
               "mfgCode": null,
               "source": "client",
-              "incoming": 0,
+              "incoming": 1,
               "outgoing": 1
             },
             {
@@ -9534,30 +9551,6 @@
           "side": "server",
           "enabled": 0,
           "commands": [
-            {
-              "name": "GetLogRecordResponse",
-              "code": 4,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 1
-            },
-            {
-              "name": "GetPINCodeResponse",
-              "code": 6,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 1
-            },
-            {
-              "name": "GetUserStatusResponse",
-              "code": 10,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 0
-            },
             {
               "name": "GetWeekDayScheduleResponse",
               "code": 12,
@@ -9582,22 +9575,6 @@
               "incoming": 1,
               "outgoing": 1
             },
-            {
-              "name": "GetUserTypeResponse",
-              "code": 21,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 1
-            },
-            {
-              "name": "GetRFIDCodeResponse",
-              "code": 23,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 1
-            },
             {
               "name": "GetUserResponse",
               "code": 28,
@@ -9736,22 +9713,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "NumberOfLogRecordsSupported",
-              "code": 16,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "NumberOfTotalUsersSupported",
               "code": 17,
@@ -9944,22 +9905,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EnableLogging",
-              "code": 32,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "Language",
               "code": 33,
@@ -10233,173 +10178,45 @@
               "reportableChange": 0
             },
             {
-              "name": "AlarmMask",
-              "code": 64,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "DlAlarmMask",
-              "included": 0,
-              "storageOption": "RAM",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
+              "defaultValue": "",
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "KeypadOperationEventMask",
-              "code": 65,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
+              "defaultValue": "",
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "RemoteOperationEventMask",
-              "code": 66,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
-              "type": "DlRemoteOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ManualOperationEventMask",
-              "code": 67,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlManualOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDOperationEventMask",
-              "code": 68,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "KeypadProgrammingEventMask",
-              "code": 69,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlKeypadOperationEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemoteProgrammingEventMask",
-              "code": 70,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRemoteProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RFIDProgrammingEventMask",
-              "code": 71,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlRFIDProgrammingEventMask",
-              "included": 0,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xFFFF",
-              "reportable": 0,
-              "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",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -10557,7 +10374,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -10573,7 +10390,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -10621,7 +10438,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -10637,7 +10454,7 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -11805,14 +11622,6 @@
               "source": "client",
               "incoming": 0,
               "outgoing": 1
-            },
-            {
-              "name": "GetRelayStatusLog",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 0,
-              "outgoing": 1
             }
           ],
           "attributes": [
@@ -11849,14 +11658,6 @@
               "source": "server",
               "incoming": 1,
               "outgoing": 0
-            },
-            {
-              "name": "GetRelayStatusLogResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 1,
-              "outgoing": 0
             }
           ],
           "attributes": [
@@ -15012,182 +14813,6 @@
             }
           ]
         },
-        {
-          "name": "IAS Zone",
-          "code": 1280,
-          "mfgCode": null,
-          "define": "IAS_ZONE_CLUSTER",
-          "side": "client",
-          "enabled": 0,
-          "commands": [
-            {
-              "name": "ZoneEnrollResponse",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "incoming": 1,
-              "outgoing": 0
-            }
-          ],
-          "attributes": [
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "client",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "IAS Zone",
-          "code": 1280,
-          "mfgCode": null,
-          "define": "IAS_ZONE_CLUSTER",
-          "side": "server",
-          "enabled": 0,
-          "commands": [
-            {
-              "name": "ZoneStatusChangeNotification",
-              "code": 0,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 1
-            },
-            {
-              "name": "ZoneEnrollRequest",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "zone state",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "enum8",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "zone type",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "enum16",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "zone status",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap16",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "IAS CIE address",
-              "code": 16,
-              "mfgCode": null,
-              "side": "server",
-              "type": "node_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "Zone ID",
-              "code": 17,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0xff",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Wake on LAN",
           "code": 1283,
@@ -17567,7 +17192,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -17755,7 +17380,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 1295,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -19513,4 +19138,4 @@
       "deviceIdentifier": 22
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
index 424fac43ee1605..afc2670be5d794 100644
--- a/src/controller/java/AndroidCallbacks.cpp
+++ b/src/controller/java/AndroidCallbacks.cpp
@@ -222,7 +222,7 @@ void ReportCallback::OnAttributeData(const app::ConcreteDataAttributePath & aPat
 
     jobject value = DecodeAttributeValue(aPath, readerForJavaObject, &err);
     // If we don't know this attribute, just skip it.
-    VerifyOrReturn(err != CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
+    VerifyOrReturn(err != CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB);
     VerifyOrReturn(err == CHIP_NO_ERROR, ReportError(attributePathObj, err));
     VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe(),
                    ReportError(attributePathObj, CHIP_JNI_ERROR_EXCEPTION_THROWN));
diff --git a/src/controller/java/AndroidCommissioningWindowOpener.cpp b/src/controller/java/AndroidCommissioningWindowOpener.cpp
new file mode 100644
index 00000000000000..feae69f414967b
--- /dev/null
+++ b/src/controller/java/AndroidCommissioningWindowOpener.cpp
@@ -0,0 +1,178 @@
+/*
+ *    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 "AndroidCommissioningWindowOpener.h"
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <controller-clusters/zap-generated/CHIPClusters.h>
+#include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+#include <protocols/secure_channel/PASESession.h>
+#include <setup_payload/ManualSetupPayloadGenerator.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+
+using namespace chip::app::Clusters;
+using namespace chip::System::Clock;
+
+namespace chip {
+namespace Controller {
+
+AndroidCommissioningWindowOpener::AndroidCommissioningWindowOpener(DeviceController * controller, jobject jCallbackObject) :
+    CommissioningWindowOpener(controller), mOnOpenCommissioningWindowCallback(OnOpenCommissioningWindowResponse, this),
+    mOnOpenBasicCommissioningWindowCallback(OnOpenBasicCommissioningWindowResponse, this)
+{
+    JNIEnv * env  = JniReferences::GetInstance().GetEnvForCurrentThread();
+    mJavaCallback = env->NewGlobalRef(jCallbackObject);
+
+    jclass callbackClass = env->GetObjectClass(jCallbackObject);
+
+    mOnSuccessMethod = env->GetMethodID(callbackClass, "onSuccess", "(JLjava/lang/String;Ljava/lang/String;)V");
+    if (mOnSuccessMethod == nullptr)
+    {
+        ChipLogError(Controller, "Failed to access callback 'onSuccess' method");
+        env->ExceptionClear();
+    }
+
+    mOnErrorMethod = env->GetMethodID(callbackClass, "onError", "(IJ)V");
+    if (mOnErrorMethod == nullptr)
+    {
+        ChipLogError(Controller, "Failed to access callback 'onError' method");
+        env->ExceptionClear();
+    }
+}
+
+AndroidCommissioningWindowOpener::~AndroidCommissioningWindowOpener()
+{
+    ChipLogError(Controller, "Delete AndroidCommissioningWindowOpener");
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    env->DeleteGlobalRef(mJavaCallback);
+}
+
+CHIP_ERROR AndroidCommissioningWindowOpener::OpenBasicCommissioningWindow(DeviceController * controller, NodeId deviceId,
+                                                                          Seconds16 timeout, jobject jcallback)
+{
+    // Not using Platform::New because we want to keep our constructor private.
+    auto * opener = new AndroidCommissioningWindowOpener(controller, jcallback);
+    if (opener == nullptr)
+    {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    CHIP_ERROR err = opener->CommissioningWindowOpener::OpenBasicCommissioningWindow(
+        deviceId, timeout, &opener->mOnOpenBasicCommissioningWindowCallback);
+    if (err != CHIP_NO_ERROR)
+    {
+        delete opener;
+    }
+    // Else will clean up when the callback is called.
+    return err;
+}
+
+CHIP_ERROR AndroidCommissioningWindowOpener::OpenCommissioningWindow(DeviceController * controller, NodeId deviceId,
+                                                                     Seconds16 timeout, uint32_t iteration, uint16_t discriminator,
+                                                                     Optional<uint32_t> setupPIN, Optional<ByteSpan> salt,
+                                                                     jobject jcallback, SetupPayload & payload,
+                                                                     bool readVIDPIDAttributes)
+{
+    // Not using Platform::New because we want to keep our constructor private.
+    auto * opener = new AndroidCommissioningWindowOpener(controller, jcallback);
+    if (opener == nullptr)
+    {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    CHIP_ERROR err = opener->CommissioningWindowOpener::OpenCommissioningWindow(
+        deviceId, timeout, iteration, discriminator, setupPIN, salt, &opener->mOnOpenCommissioningWindowCallback, payload,
+        readVIDPIDAttributes);
+    if (err != CHIP_NO_ERROR)
+    {
+        delete opener;
+    }
+    // Else will clean up when the callback is called.
+    return err;
+}
+
+void AndroidCommissioningWindowOpener::OnOpenCommissioningWindowResponse(void * context, NodeId deviceId, CHIP_ERROR status,
+                                                                         chip::SetupPayload payload)
+{
+    auto * self  = static_cast<AndroidCommissioningWindowOpener *>(context);
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+
+    VerifyOrExit(self->mJavaCallback != nullptr, ChipLogError(Controller, "mJavaCallback is not allocated."));
+
+    if (status == CHIP_NO_ERROR)
+    {
+        std::string QRCode;
+        std::string manualPairingCode;
+
+        SuccessOrExit(ManualSetupPayloadGenerator(payload).payloadDecimalStringRepresentation(manualPairingCode));
+        SuccessOrExit(QRCodeSetupPayloadGenerator(payload).payloadBase38Representation(QRCode));
+
+        if (self->mOnSuccessMethod != nullptr)
+        {
+            UtfString jManualPairingCode(env, manualPairingCode.c_str());
+            UtfString jQRCode(env, QRCode.c_str());
+            env->CallVoidMethod(self->mJavaCallback, self->mOnSuccessMethod, static_cast<jlong>(deviceId),
+                                jManualPairingCode.jniValue(), jQRCode.jniValue());
+        }
+    }
+    else
+    {
+        if (self->mOnErrorMethod != nullptr)
+        {
+            env->CallVoidMethod(self->mJavaCallback, self->mOnErrorMethod, static_cast<jint>(status.GetValue()),
+                                static_cast<jlong>(deviceId));
+        }
+    }
+exit:
+    delete self;
+}
+
+void AndroidCommissioningWindowOpener::OnOpenBasicCommissioningWindowResponse(void * context, NodeId deviceId, CHIP_ERROR status)
+{
+    auto * self = static_cast<AndroidCommissioningWindowOpener *>(context);
+
+    if (self->mJavaCallback != nullptr)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (status == CHIP_NO_ERROR)
+        {
+            if (self->mOnSuccessMethod != nullptr)
+            {
+                UtfString jManualPairingCode(env, "");
+                UtfString jQRCode(env, "");
+                env->CallVoidMethod(self->mJavaCallback, self->mOnSuccessMethod, static_cast<jlong>(deviceId),
+                                    jManualPairingCode.jniValue(), jQRCode.jniValue());
+            }
+        }
+        else
+        {
+            if (self->mOnErrorMethod != nullptr)
+            {
+                env->CallVoidMethod(self->mJavaCallback, self->mOnErrorMethod, static_cast<jint>(status.GetValue()),
+                                    static_cast<jlong>(deviceId));
+            }
+        }
+    }
+
+    delete self;
+}
+
+} // namespace Controller
+} // namespace chip
diff --git a/src/controller/java/AndroidCommissioningWindowOpener.h b/src/controller/java/AndroidCommissioningWindowOpener.h
new file mode 100644
index 00000000000000..2d6a61f62d6743
--- /dev/null
+++ b/src/controller/java/AndroidCommissioningWindowOpener.h
@@ -0,0 +1,61 @@
+/*
+ *    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 <controller/CommissioningWindowOpener.h>
+#include <jni.h>
+
+namespace chip {
+namespace Controller {
+
+/**
+ * A helper class that can be used by consumers that don't care about the callback from the
+ * open-commissioning-window process and just want automatic cleanup of the CommissioningWindowOpener when done
+ * with it.
+ */
+class AndroidCommissioningWindowOpener : private CommissioningWindowOpener
+{
+public:
+    // Takes the same arguments as CommissioningWindowOpener::OpenBasicCommissioningWindow except without the
+    // callback.
+    static CHIP_ERROR OpenBasicCommissioningWindow(DeviceController * controller, NodeId deviceId, System::Clock::Seconds16 timeout,
+                                                   jobject jcallback);
+    // Takes the same arguments as CommissioningWindowOpener::OpenCommissioningWindow except without the
+    // callback.
+    static CHIP_ERROR OpenCommissioningWindow(DeviceController * controller, NodeId deviceId, System::Clock::Seconds16 timeout,
+                                              uint32_t iteration, uint16_t discriminator, Optional<uint32_t> setupPIN,
+                                              Optional<ByteSpan> salt, jobject jcallback, SetupPayload & payload,
+                                              bool readVIDPIDAttributes = false);
+
+private:
+    AndroidCommissioningWindowOpener(DeviceController * controller, jobject javaCallbackObject);
+    ~AndroidCommissioningWindowOpener();
+
+    static void OnOpenCommissioningWindowResponse(void * context, NodeId deviceId, CHIP_ERROR status, chip::SetupPayload payload);
+    static void OnOpenBasicCommissioningWindowResponse(void * context, NodeId deviceId, CHIP_ERROR status);
+
+    chip::Callback::Callback<chip::Controller::OnOpenCommissioningWindow> mOnOpenCommissioningWindowCallback;
+    chip::Callback::Callback<chip::Controller::OnOpenBasicCommissioningWindow> mOnOpenBasicCommissioningWindowCallback;
+
+    jobject mJavaCallback;
+    jmethodID mOnSuccessMethod = nullptr;
+    jmethodID mOnErrorMethod   = nullptr;
+};
+
+} // Namespace Controller
+} // namespace chip
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 1357c0f6dc1f69..ed5a9fee167a16 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -26,6 +26,8 @@ shared_library("jni") {
     "AndroidCallbacks.h",
     "AndroidClusterExceptions.cpp",
     "AndroidClusterExceptions.h",
+    "AndroidCommissioningWindowOpener.cpp",
+    "AndroidCommissioningWindowOpener.h",
     "AndroidDeviceControllerWrapper.cpp",
     "AndroidDeviceControllerWrapper.h",
     "AndroidOperationalCredentialsIssuer.cpp",
@@ -85,9 +87,11 @@ android_library("java") {
     "src/chip/devicecontroller/ChipCommandType.java",
     "src/chip/devicecontroller/ChipDeviceController.java",
     "src/chip/devicecontroller/ChipDeviceControllerException.java",
+    "src/chip/devicecontroller/DiscoveredDevice.java",
     "src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
     "src/chip/devicecontroller/NetworkCredentials.java",
     "src/chip/devicecontroller/NetworkLocation.java",
+    "src/chip/devicecontroller/OpenCommissioningCallback.java",
     "src/chip/devicecontroller/PaseVerifierParams.java",
     "src/chip/devicecontroller/ReportCallback.java",
     "src/chip/devicecontroller/ReportCallbackJni.java",
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index ef229d1626a158..34a7a117475ab3 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -22,6 +22,7 @@
  *
  */
 #include "AndroidCallbacks.h"
+#include "AndroidCommissioningWindowOpener.h"
 #include "AndroidDeviceControllerWrapper.h"
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
@@ -574,6 +575,55 @@ JNI_METHOD(void, updateDevice)(JNIEnv * env, jobject self, jlong handle, jlong f
     }
 }
 
+JNI_METHOD(void, discoverCommissionableNodes)(JNIEnv * env, jobject self, jlong handle)
+{
+    chip::DeviceLayer::StackLock lock;
+
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+    chip::Dnssd::DiscoveryFilter filter(Dnssd::DiscoveryFilterType::kNone, (uint64_t) 0);
+
+    CHIP_ERROR err = wrapper->Controller()->DiscoverCommissionableNodes(filter);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Controller, "Failed to discoverCommissionableNodes");
+        JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
+    }
+}
+
+JNI_METHOD(jobject, getDiscoveredDevice)(JNIEnv * env, jobject self, jlong handle, jint idx)
+{
+    chip::DeviceLayer::StackLock lock;
+
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+    const Dnssd::DiscoveredNodeData * data   = wrapper->Controller()->GetDiscoveredDevice(idx);
+
+    if (data == nullptr)
+    {
+        return nullptr;
+    }
+
+    jclass discoveredDeviceCls = env->FindClass("chip/devicecontroller/DiscoveredDevice");
+    jmethodID constructor      = env->GetMethodID(discoveredDeviceCls, "<init>", "()V");
+
+    jfieldID discrminatorID = env->GetFieldID(discoveredDeviceCls, "discriminator", "J");
+    jfieldID ipAddressID    = env->GetFieldID(discoveredDeviceCls, "ipAddress", "Ljava/lang/String;");
+
+    jobject discoveredObj = env->NewObject(discoveredDeviceCls, constructor);
+
+    env->SetLongField(discoveredObj, discrminatorID, data->commissionData.longDiscriminator);
+
+    char ipAddress[100];
+    data->resolutionData.ipAddress[0].ToString(ipAddress, 100);
+    jstring jniipAdress = env->NewStringUTF(ipAddress);
+    env->SetObjectField(discoveredObj, ipAddressID, jniipAdress);
+
+    if (data == nullptr)
+    {
+        ChipLogError(Controller, "GetDiscoveredDevice - not found");
+    }
+    return discoveredObj;
+}
+
 JNI_METHOD(jboolean, openPairingWindow)(JNIEnv * env, jobject self, jlong handle, jlong devicePtr, jint duration)
 {
     chip::DeviceLayer::StackLock lock;
@@ -629,6 +679,63 @@ JNI_METHOD(jboolean, openPairingWindowWithPIN)
     return true;
 }
 
+JNI_METHOD(jboolean, openPairingWindowCallback)
+(JNIEnv * env, jobject self, jlong handle, jlong devicePtr, jint duration, jobject jcallback)
+{
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    DeviceProxy * chipDevice = reinterpret_cast<DeviceProxy *>(devicePtr);
+    if (chipDevice == nullptr)
+    {
+        ChipLogProgress(Controller, "Could not cast device pointer to Device object");
+        return false;
+    }
+
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    err = AndroidCommissioningWindowOpener::OpenBasicCommissioningWindow(wrapper->Controller(), chipDevice->GetDeviceId(),
+                                                                         System::Clock::Seconds16(duration), jcallback);
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Controller, "OpenPairingWindow failed: %" CHIP_ERROR_FORMAT, err.Format());
+        return false;
+    }
+
+    return true;
+}
+
+JNI_METHOD(jboolean, openPairingWindowWithPINCallback)
+(JNIEnv * env, jobject self, jlong handle, jlong devicePtr, jint duration, jlong iteration, jint discriminator, jlong setupPinCode,
+ jobject jcallback)
+{
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    DeviceProxy * chipDevice = reinterpret_cast<DeviceProxy *>(devicePtr);
+    if (chipDevice == nullptr)
+    {
+        ChipLogProgress(Controller, "Could not cast device pointer to Device object");
+        return false;
+    }
+
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    chip::SetupPayload setupPayload;
+    err = AndroidCommissioningWindowOpener::OpenCommissioningWindow(
+        wrapper->Controller(), chipDevice->GetDeviceId(), System::Clock::Seconds16(duration), iteration, discriminator,
+        MakeOptional(static_cast<uint32_t>(setupPinCode)), NullOptional, jcallback, setupPayload);
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Controller, "OpenPairingWindow failed: %" CHIP_ERROR_FORMAT, err.Format());
+        return false;
+    }
+
+    return true;
+}
+
 JNI_METHOD(void, shutdownCommissioning)
 (JNIEnv * env, jobject self, jlong handle)
 {
@@ -655,8 +762,7 @@ JNI_METHOD(jbyteArray, getAttestationChallenge)
         JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, CHIP_ERROR_INCORRECT_STATE);
     }
 
-    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
-    err                                      = wrapper->Controller()->GetAttestationChallenge(attestationChallenge);
+    err = chipDevice->GetAttestationChallenge(attestationChallenge);
     SuccessOrExit(err);
     VerifyOrExit(attestationChallenge.size() == 16, err = CHIP_ERROR_INVALID_ARGUMENT);
 
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index f54987408f507b..90c2ac3468dcdc 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -4,11 +4,17 @@
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
-  public CommandParameterInfo(String name, Class<?> type) {
+  /*
+   * If 'type' is a complex type, such as ArrayList or Optional, 'underlyingType'
+   * stores information about the wrapped or element type.
+   */
+  public CommandParameterInfo(String name, Class<?> type, Class<?> underlyingType) {
     this.name = name;
     this.type = type;
+    this.underlyingType = underlyingType;
   }
 
   public String name;
   public Class<?> type;
+  public Class<?> underlyingType;
 }
diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
index c844d8680d3b0a..9e89f1d531ad9e 100644
--- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
+++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -292,6 +292,18 @@ public void updateDevice(long fabricId, long deviceId) {
     updateDevice(deviceControllerPtr, fabricId, deviceId);
   }
 
+  /**
+   * Get commmissionible Node. Commmissionible Node results are able to get using {@link
+   * ChipDeviceController.getDiscoveredDevice}.
+   */
+  public void discoverCommissionableNodes() {
+    discoverCommissionableNodes(deviceControllerPtr);
+  }
+
+  public DiscoveredDevice getDiscoveredDevice(int idx) {
+    return getDiscoveredDevice(deviceControllerPtr, idx);
+  }
+
   public boolean openPairingWindow(long devicePtr, int duration) {
     return openPairingWindow(deviceControllerPtr, devicePtr, duration);
   }
@@ -302,6 +314,22 @@ public boolean openPairingWindowWithPIN(
         deviceControllerPtr, devicePtr, duration, iteration, discriminator, setupPinCode);
   }
 
+  public boolean openPairingWindowCallback(
+      long devicePtr, int duration, OpenCommissioningCallback callback) {
+    return openPairingWindowCallback(deviceControllerPtr, devicePtr, duration, callback);
+  }
+
+  public boolean openPairingWindowWithPINCallback(
+      long devicePtr,
+      int duration,
+      long iteration,
+      int discriminator,
+      long setupPinCode,
+      OpenCommissioningCallback callback) {
+    return openPairingWindowWithPINCallback(
+        deviceControllerPtr, devicePtr, duration, iteration, discriminator, setupPinCode, callback);
+  }
+
   /* Shutdown all cluster attribute subscriptions for a given device */
   public void shutdownSubscriptions(long devicePtr) {
     shutdownSubscriptions(deviceControllerPtr, devicePtr);
@@ -436,6 +464,10 @@ private native void getConnectedDevicePointer(
 
   private native void updateDevice(long deviceControllerPtr, long fabricId, long deviceId);
 
+  private native void discoverCommissionableNodes(long deviceControllerPtr);
+
+  private native DiscoveredDevice getDiscoveredDevice(long deviceControllerPtr, int idx);
+
   private native boolean openPairingWindow(long deviceControllerPtr, long devicePtr, int duration);
 
   private native boolean openPairingWindowWithPIN(
@@ -446,6 +478,18 @@ private native boolean openPairingWindowWithPIN(
       int discriminator,
       long setupPinCode);
 
+  private native boolean openPairingWindowCallback(
+      long deviceControllerPtr, long devicePtr, int duration, OpenCommissioningCallback callback);
+
+  private native boolean openPairingWindowWithPINCallback(
+      long deviceControllerPtr,
+      long devicePtr,
+      int duration,
+      long iteration,
+      int discriminator,
+      long setupPinCode,
+      OpenCommissioningCallback callback);
+
   private native byte[] getAttestationChallenge(long deviceControllerPtr, long devicePtr);
 
   private native void shutdownSubscriptions(long deviceControllerPtr, long devicePtr);
diff --git a/src/controller/java/src/chip/devicecontroller/DiscoveredDevice.java b/src/controller/java/src/chip/devicecontroller/DiscoveredDevice.java
new file mode 100644
index 00000000000000..3be9631512af42
--- /dev/null
+++ b/src/controller/java/src/chip/devicecontroller/DiscoveredDevice.java
@@ -0,0 +1,23 @@
+/*
+ *   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.
+ *
+ */
+package chip.devicecontroller;
+
+public class DiscoveredDevice {
+  public long discriminator;
+  public String ipAddress;
+}
diff --git a/src/controller/java/src/chip/devicecontroller/OpenCommissioningCallback.java b/src/controller/java/src/chip/devicecontroller/OpenCommissioningCallback.java
new file mode 100644
index 00000000000000..4b2b0a3bbd8d0a
--- /dev/null
+++ b/src/controller/java/src/chip/devicecontroller/OpenCommissioningCallback.java
@@ -0,0 +1,24 @@
+/*
+ *   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.
+ *
+ */
+package chip.devicecontroller;
+
+public interface OpenCommissioningCallback {
+  public void onError(int status, long deviceId);
+
+  public void onSuccess(long deviceId, String manualPairingCode, String qrCode);
+}
diff --git a/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt b/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt
index 81bb283e4a3183..b8bbcfddd7737f 100644
--- a/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt
+++ b/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt
@@ -56,14 +56,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 }
                 {{/chip_server_cluster_attributes}}
                 default:
-                    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+                    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
                     break;
             }
             break;
         }
         {{/chip_client_clusters}}
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
     } 
     return nullptr;
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index d6ec5d849de0c5..622bc2998275f8 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -307,7 +307,7 @@ public class ClusterInfoMapping {
      {{#chip_cluster_command_arguments}}
      {{#if_is_struct type}}
      {{else}}
-       CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaType type null parent.parent.name removeGenericType=true}}.class);
+       CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaType type null parent.parent.name removeGenericType=true}}.class, {{asJavaType type null parent.parent.name underlyingType=true}}.class);
        {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
      {{#not_last}} {{/not_last}}
      {{/if_is_struct}}
diff --git a/src/controller/java/templates/ClusterInfo-write-interaction.zapt b/src/controller/java/templates/ClusterInfo-write-interaction.zapt
index 388572c857b41d..29e52ad07dde67 100644
--- a/src/controller/java/templates/ClusterInfo-write-interaction.zapt
+++ b/src/controller/java/templates/ClusterInfo-write-interaction.zapt
@@ -21,7 +21,7 @@ public class ClusterWriteMapping {
         {{#if isWritableAttribute}}
         {{#unless isArray}}
         Map<String, CommandParameterInfo> write{{asUpperCamelCase ../name}}{{asUpperCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("value", {{asJavaType type null parent.parent.name removeGenericType=true}}.class);
+        CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("value", {{asJavaType type null parent.parent.name removeGenericType=true}}.class, {{asJavaType type null parent.parent.name underlyingType=true}}.class);
         write{{asUpperCamelCase ../name}}{{asUpperCamelCase name}}CommandParams.put("value",{{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo);
         InteractionInfo write{{asUpperCamelCase ../name}}{{asUpperCamelCase name}}AttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
diff --git a/src/controller/java/templates/helper.js b/src/controller/java/templates/helper.js
index 992fb0b1cf9ba5..53a77aad35dc8c 100644
--- a/src/controller/java/templates/helper.js
+++ b/src/controller/java/templates/helper.js
@@ -217,24 +217,26 @@ async function asJavaType(type, zclType, cluster, options)
     classType += asJavaBoxedType(type, zclType);
   }
 
-  if (!options.hash.forceNotList && (this.isArray || this.entryType)) {
-    if (!options.hash.removeGenericType) {
-      classType = 'ArrayList<' + classType + '>';
-    } else {
-      classType = 'ArrayList';
+  if (!options.hash.underlyingType) {
+    if (!options.hash.forceNotList && (this.isArray || this.entryType)) {
+      if (!options.hash.removeGenericType) {
+        classType = 'ArrayList<' + classType + '>';
+      } else {
+        classType = 'ArrayList';
+      }
     }
-  }
 
-  if (this.isOptional) {
-    if (!options.hash.removeGenericType) {
-      classType = 'Optional<' + classType + '>';
-    } else {
-      classType = 'Optional';
+    if (this.isOptional) {
+      if (!options.hash.removeGenericType) {
+        classType = 'Optional<' + classType + '>';
+      } else {
+        classType = 'Optional';
+      }
     }
-  }
 
-  if (this.isNullable && options.hash.includeAnnotations) {
-    classType = '@Nullable ' + classType;
+    if (this.isNullable && options.hash.includeAnnotations) {
+      classType = '@Nullable ' + classType;
+    }
   }
 
   return classType;
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 1d274b75bc886c..0df4dd0bdbacdf 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -394,7 +394,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -506,7 +506,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -663,7 +663,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -920,7 +920,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1138,7 +1138,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1318,7 +1318,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1490,7 +1490,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1893,7 +1893,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2050,7 +2050,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2271,7 +2271,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2398,7 +2398,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2666,7 +2666,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2970,7 +2970,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -3334,7 +3334,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -4293,7 +4293,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -4441,7 +4441,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -4675,7 +4675,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -4787,7 +4787,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -5285,7 +5285,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -5562,7 +5562,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -5830,7 +5830,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6121,7 +6121,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6276,7 +6276,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6469,7 +6469,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6678,7 +6678,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6940,6 +6940,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
+        case Attributes::TestEventTriggersEnabled::Id: {
+            using TypeInfo = Attributes::TestEventTriggersEnabled::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";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -7043,7 +7058,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7322,7 +7337,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7449,7 +7464,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7591,7 +7606,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7806,7 +7821,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7918,7 +7933,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8275,7 +8290,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8396,7 +8411,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8508,7 +8523,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8692,7 +8707,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8977,7 +8992,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9269,7 +9284,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9532,7 +9547,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9596,7 +9611,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9770,7 +9785,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9927,7 +9942,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10121,7 +10136,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10263,7 +10278,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10579,7 +10594,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11171,7 +11186,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11307,7 +11322,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11548,7 +11563,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12131,7 +12146,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12324,7 +12339,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12511,7 +12526,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12542,25 +12557,67 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
                     newElement_0_idClassName.c_str(), newElement_0_idCtorSignature.c_str(), entry_0.id, newElement_0_id);
                 jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+                if (!entry_0.name.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
+                }
+                else
+                {
+                    jobject newElement_0_nameInsideOptional;
+                    newElement_0_nameInsideOptional =
+                        env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
+                }
                 jobject newElement_0_stackFreeCurrent;
-                std::string newElement_0_stackFreeCurrentClassName     = "java/lang/Long";
-                std::string newElement_0_stackFreeCurrentCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0_stackFreeCurrentClassName.c_str(), newElement_0_stackFreeCurrentCtorSignature.c_str(),
-                    entry_0.stackFreeCurrent, newElement_0_stackFreeCurrent);
+                if (!entry_0.stackFreeCurrent.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeCurrent);
+                }
+                else
+                {
+                    jobject newElement_0_stackFreeCurrentInsideOptional;
+                    std::string newElement_0_stackFreeCurrentInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_0_stackFreeCurrentInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_0_stackFreeCurrentInsideOptionalClassName.c_str(),
+                        newElement_0_stackFreeCurrentInsideOptionalCtorSignature.c_str(), entry_0.stackFreeCurrent.Value(),
+                        newElement_0_stackFreeCurrentInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeCurrentInsideOptional,
+                                                                      newElement_0_stackFreeCurrent);
+                }
                 jobject newElement_0_stackFreeMinimum;
-                std::string newElement_0_stackFreeMinimumClassName     = "java/lang/Long";
-                std::string newElement_0_stackFreeMinimumCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0_stackFreeMinimumClassName.c_str(), newElement_0_stackFreeMinimumCtorSignature.c_str(),
-                    entry_0.stackFreeMinimum, newElement_0_stackFreeMinimum);
+                if (!entry_0.stackFreeMinimum.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeMinimum);
+                }
+                else
+                {
+                    jobject newElement_0_stackFreeMinimumInsideOptional;
+                    std::string newElement_0_stackFreeMinimumInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_0_stackFreeMinimumInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_0_stackFreeMinimumInsideOptionalClassName.c_str(),
+                        newElement_0_stackFreeMinimumInsideOptionalCtorSignature.c_str(), entry_0.stackFreeMinimum.Value(),
+                        newElement_0_stackFreeMinimumInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeMinimumInsideOptional,
+                                                                      newElement_0_stackFreeMinimum);
+                }
                 jobject newElement_0_stackSize;
-                std::string newElement_0_stackSizeClassName     = "java/lang/Long";
-                std::string newElement_0_stackSizeCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_stackSizeClassName.c_str(),
-                                                                               newElement_0_stackSizeCtorSignature.c_str(),
-                                                                               entry_0.stackSize, newElement_0_stackSize);
+                if (!entry_0.stackSize.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackSize);
+                }
+                else
+                {
+                    jobject newElement_0_stackSizeInsideOptional;
+                    std::string newElement_0_stackSizeInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_0_stackSizeInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_0_stackSizeInsideOptionalClassName.c_str(),
+                        newElement_0_stackSizeInsideOptionalCtorSignature.c_str(), entry_0.stackSize.Value(),
+                        newElement_0_stackSizeInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
+                }
 
                 jclass threadMetricsStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
@@ -12570,9 +12627,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
                     return nullptr;
                 }
-                jmethodID threadMetricsStructCtor =
-                    env->GetMethodID(threadMetricsStructClass, "<init>",
-                                     "(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V");
+                jmethodID threadMetricsStructCtor = env->GetMethodID(
+                    threadMetricsStructClass, "<init>",
+                    "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
                 if (threadMetricsStructCtor == nullptr)
                 {
                     ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
@@ -12733,7 +12790,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12890,7 +12947,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -13064,7 +13121,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -13209,7 +13266,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -13672,19 +13729,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Long";
-                std::string newElement_0_fabricIndexCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                               newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                               entry_0.fabricIndex, newElement_0_fabricIndex);
-                jobject newElement_0_operationalCert;
-                jbyteArray newElement_0_operationalCertByteArray =
-                    env->NewByteArray(static_cast<jsize>(entry_0.operationalCert.size()));
-                env->SetByteArrayRegion(newElement_0_operationalCertByteArray, 0,
-                                        static_cast<jsize>(entry_0.operationalCert.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.operationalCert.data()));
-                newElement_0_operationalCert = newElement_0_operationalCertByteArray;
+                jobject newElement_0_member1;
+                std::string newElement_0_member1ClassName     = "java/lang/Long";
+                std::string newElement_0_member1CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_member1ClassName.c_str(),
+                                                                               newElement_0_member1CtorSignature.c_str(),
+                                                                               entry_0.member1, newElement_0_member1);
+                jobject newElement_0_member2;
+                jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.member2.size()));
+                env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast<jsize>(entry_0.member2.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.member2.data()));
+                newElement_0_member2 = newElement_0_member2ByteArray;
 
                 jclass testListStructOctetStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
@@ -13702,8 +13757,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor,
-                                              newElement_0_fabricIndex, newElement_0_operationalCert);
+                newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1,
+                                              newElement_0_member2);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
@@ -15605,7 +15660,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -15931,7 +15986,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16088,7 +16143,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16137,7 +16192,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
             }
             return value;
         }
@@ -16494,10 +16549,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::Weighting::Id: {
@@ -16509,10 +16571,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::DataVersion::Id: {
@@ -16524,10 +16593,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::StableDataVersion::Id: {
@@ -16539,10 +16615,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::LeaderRouterId::Id: {
@@ -16554,10 +16637,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::DetachedRoleCount::Id: {
@@ -17199,10 +17289,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::PendingTimestamp::Id: {
@@ -17214,10 +17311,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::Delay::Id: {
@@ -17229,10 +17333,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::SecurityPolicy::Id: {
@@ -17244,25 +17355,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_rotationTime;
-                std::string newElement_0_rotationTimeClassName     = "java/lang/Integer";
-                std::string newElement_0_rotationTimeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_rotationTimeClassName.c_str(),
-                                                                               newElement_0_rotationTimeCtorSignature.c_str(),
-                                                                               entry_0.rotationTime, newElement_0_rotationTime);
-                jobject newElement_0_flags;
-                std::string newElement_0_flagsClassName     = "java/lang/Integer";
-                std::string newElement_0_flagsCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_flagsClassName.c_str(),
-                                                                               newElement_0_flagsCtorSignature.c_str(),
-                                                                               entry_0.flags, newElement_0_flags);
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_rotationTime;
+                std::string value_rotationTimeClassName     = "java/lang/Integer";
+                std::string value_rotationTimeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_rotationTimeClassName.c_str(),
+                                                                               value_rotationTimeCtorSignature.c_str(),
+                                                                               cppValue.Value().rotationTime, value_rotationTime);
+                jobject value_flags;
+                std::string value_flagsClassName     = "java/lang/Integer";
+                std::string value_flagsCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    value_flagsClassName.c_str(), value_flagsCtorSignature.c_str(), cppValue.Value().flags, value_flags);
 
                 jclass securityPolicyStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
@@ -17281,9 +17390,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, newElement_0_rotationTime,
-                                              newElement_0_flags);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, value_rotationTime, value_flags);
             }
             return value;
         }
@@ -17296,10 +17403,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.size()));
-            env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.size()),
-                                    reinterpret_cast<const jbyte *>(cppValue.data()));
-            value = valueByteArray;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
+                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
+                value = valueByteArray;
+            }
             return value;
         }
         case Attributes::OperationalDatasetComponents::Id: {
@@ -17311,86 +17425,84 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_activeTimestampPresent;
-                std::string newElement_0_activeTimestampPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_activeTimestampPresentCtorSignature = "(Z)V";
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_activeTimestampPresent;
+                std::string value_activeTimestampPresentClassName     = "java/lang/Boolean";
+                std::string value_activeTimestampPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_activeTimestampPresentClassName.c_str(), value_activeTimestampPresentCtorSignature.c_str(),
+                    cppValue.Value().activeTimestampPresent, value_activeTimestampPresent);
+                jobject value_pendingTimestampPresent;
+                std::string value_pendingTimestampPresentClassName     = "java/lang/Boolean";
+                std::string value_pendingTimestampPresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_activeTimestampPresentClassName.c_str(), newElement_0_activeTimestampPresentCtorSignature.c_str(),
-                    entry_0.activeTimestampPresent, newElement_0_activeTimestampPresent);
-                jobject newElement_0_pendingTimestampPresent;
-                std::string newElement_0_pendingTimestampPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_pendingTimestampPresentCtorSignature = "(Z)V";
+                    value_pendingTimestampPresentClassName.c_str(), value_pendingTimestampPresentCtorSignature.c_str(),
+                    cppValue.Value().pendingTimestampPresent, value_pendingTimestampPresent);
+                jobject value_masterKeyPresent;
+                std::string value_masterKeyPresentClassName     = "java/lang/Boolean";
+                std::string value_masterKeyPresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_pendingTimestampPresentClassName.c_str(),
-                    newElement_0_pendingTimestampPresentCtorSignature.c_str(), entry_0.pendingTimestampPresent,
-                    newElement_0_pendingTimestampPresent);
-                jobject newElement_0_masterKeyPresent;
-                std::string newElement_0_masterKeyPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_masterKeyPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_masterKeyPresentClassName.c_str(),
-                                                                           newElement_0_masterKeyPresentCtorSignature.c_str(),
-                                                                           entry_0.masterKeyPresent, newElement_0_masterKeyPresent);
-                jobject newElement_0_networkNamePresent;
-                std::string newElement_0_networkNamePresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_networkNamePresentCtorSignature = "(Z)V";
+                    value_masterKeyPresentClassName.c_str(), value_masterKeyPresentCtorSignature.c_str(),
+                    cppValue.Value().masterKeyPresent, value_masterKeyPresent);
+                jobject value_networkNamePresent;
+                std::string value_networkNamePresentClassName     = "java/lang/Boolean";
+                std::string value_networkNamePresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_networkNamePresentClassName.c_str(), newElement_0_networkNamePresentCtorSignature.c_str(),
-                    entry_0.networkNamePresent, newElement_0_networkNamePresent);
-                jobject newElement_0_extendedPanIdPresent;
-                std::string newElement_0_extendedPanIdPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_extendedPanIdPresentCtorSignature = "(Z)V";
+                    value_networkNamePresentClassName.c_str(), value_networkNamePresentCtorSignature.c_str(),
+                    cppValue.Value().networkNamePresent, value_networkNamePresent);
+                jobject value_extendedPanIdPresent;
+                std::string value_extendedPanIdPresentClassName     = "java/lang/Boolean";
+                std::string value_extendedPanIdPresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_extendedPanIdPresentClassName.c_str(), newElement_0_extendedPanIdPresentCtorSignature.c_str(),
-                    entry_0.extendedPanIdPresent, newElement_0_extendedPanIdPresent);
-                jobject newElement_0_meshLocalPrefixPresent;
-                std::string newElement_0_meshLocalPrefixPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_meshLocalPrefixPresentCtorSignature = "(Z)V";
+                    value_extendedPanIdPresentClassName.c_str(), value_extendedPanIdPresentCtorSignature.c_str(),
+                    cppValue.Value().extendedPanIdPresent, value_extendedPanIdPresent);
+                jobject value_meshLocalPrefixPresent;
+                std::string value_meshLocalPrefixPresentClassName     = "java/lang/Boolean";
+                std::string value_meshLocalPrefixPresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_meshLocalPrefixPresentClassName.c_str(), newElement_0_meshLocalPrefixPresentCtorSignature.c_str(),
-                    entry_0.meshLocalPrefixPresent, newElement_0_meshLocalPrefixPresent);
-                jobject newElement_0_delayPresent;
-                std::string newElement_0_delayPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_delayPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_delayPresentClassName.c_str(),
-                                                                           newElement_0_delayPresentCtorSignature.c_str(),
-                                                                           entry_0.delayPresent, newElement_0_delayPresent);
-                jobject newElement_0_panIdPresent;
-                std::string newElement_0_panIdPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_panIdPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_panIdPresentClassName.c_str(),
-                                                                           newElement_0_panIdPresentCtorSignature.c_str(),
-                                                                           entry_0.panIdPresent, newElement_0_panIdPresent);
-                jobject newElement_0_channelPresent;
-                std::string newElement_0_channelPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_channelPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_channelPresentClassName.c_str(),
-                                                                           newElement_0_channelPresentCtorSignature.c_str(),
-                                                                           entry_0.channelPresent, newElement_0_channelPresent);
-                jobject newElement_0_pskcPresent;
-                std::string newElement_0_pskcPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_pskcPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_pskcPresentClassName.c_str(),
-                                                                           newElement_0_pskcPresentCtorSignature.c_str(),
-                                                                           entry_0.pskcPresent, newElement_0_pskcPresent);
-                jobject newElement_0_securityPolicyPresent;
-                std::string newElement_0_securityPolicyPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_securityPolicyPresentCtorSignature = "(Z)V";
+                    value_meshLocalPrefixPresentClassName.c_str(), value_meshLocalPrefixPresentCtorSignature.c_str(),
+                    cppValue.Value().meshLocalPrefixPresent, value_meshLocalPrefixPresent);
+                jobject value_delayPresent;
+                std::string value_delayPresentClassName     = "java/lang/Boolean";
+                std::string value_delayPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_delayPresentClassName.c_str(),
+                                                                           value_delayPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().delayPresent, value_delayPresent);
+                jobject value_panIdPresent;
+                std::string value_panIdPresentClassName     = "java/lang/Boolean";
+                std::string value_panIdPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_panIdPresentClassName.c_str(),
+                                                                           value_panIdPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().panIdPresent, value_panIdPresent);
+                jobject value_channelPresent;
+                std::string value_channelPresentClassName     = "java/lang/Boolean";
+                std::string value_channelPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_channelPresentClassName.c_str(),
+                                                                           value_channelPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().channelPresent, value_channelPresent);
+                jobject value_pskcPresent;
+                std::string value_pskcPresentClassName     = "java/lang/Boolean";
+                std::string value_pskcPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_pskcPresentClassName.c_str(),
+                                                                           value_pskcPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().pskcPresent, value_pskcPresent);
+                jobject value_securityPolicyPresent;
+                std::string value_securityPolicyPresentClassName     = "java/lang/Boolean";
+                std::string value_securityPolicyPresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_securityPolicyPresentClassName.c_str(), newElement_0_securityPolicyPresentCtorSignature.c_str(),
-                    entry_0.securityPolicyPresent, newElement_0_securityPolicyPresent);
-                jobject newElement_0_channelMaskPresent;
-                std::string newElement_0_channelMaskPresentClassName     = "java/lang/Boolean";
-                std::string newElement_0_channelMaskPresentCtorSignature = "(Z)V";
+                    value_securityPolicyPresentClassName.c_str(), value_securityPolicyPresentCtorSignature.c_str(),
+                    cppValue.Value().securityPolicyPresent, value_securityPolicyPresent);
+                jobject value_channelMaskPresent;
+                std::string value_channelMaskPresentClassName     = "java/lang/Boolean";
+                std::string value_channelMaskPresentCtorSignature = "(Z)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_channelMaskPresentClassName.c_str(), newElement_0_channelMaskPresentCtorSignature.c_str(),
-                    entry_0.channelMaskPresent, newElement_0_channelMaskPresent);
+                    value_channelMaskPresentClassName.c_str(), value_channelMaskPresentCtorSignature.c_str(),
+                    cppValue.Value().channelMaskPresent, value_channelMaskPresent);
 
                 jclass operationalDatasetComponentsStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
@@ -17414,13 +17526,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(
-                    operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor,
-                    newElement_0_activeTimestampPresent, newElement_0_pendingTimestampPresent, newElement_0_masterKeyPresent,
-                    newElement_0_networkNamePresent, newElement_0_extendedPanIdPresent, newElement_0_meshLocalPrefixPresent,
-                    newElement_0_delayPresent, newElement_0_panIdPresent, newElement_0_channelPresent, newElement_0_pskcPresent,
-                    newElement_0_securityPolicyPresent, newElement_0_channelMaskPresent);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = env->NewObject(operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor,
+                                       value_activeTimestampPresent, value_pendingTimestampPresent, value_masterKeyPresent,
+                                       value_networkNamePresent, value_extendedPanIdPresent, value_meshLocalPrefixPresent,
+                                       value_delayPresent, value_panIdPresent, value_channelPresent, value_pskcPresent,
+                                       value_securityPolicyPresent, value_channelMaskPresent);
             }
             return value;
         }
@@ -17551,7 +17661,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -17693,7 +17803,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -17772,7 +17882,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -17903,7 +18013,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -18027,7 +18137,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -18369,7 +18479,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -18393,6 +18503,36 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           static_cast<uint8_t>(cppValue), value);
             return value;
         }
+        case Attributes::PhysicalClosedLimitLift::Id: {
+            using TypeInfo = Attributes::PhysicalClosedLimitLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::PhysicalClosedLimitTilt::Id: {
+            using TypeInfo = Attributes::PhysicalClosedLimitTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
         case Attributes::CurrentPositionLift::Id: {
             using TypeInfo = Attributes::CurrentPositionLift::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -18437,6 +18577,36 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
+        case Attributes::NumberOfActuationsLift::Id: {
+            using TypeInfo = Attributes::NumberOfActuationsLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::NumberOfActuationsTilt::Id: {
+            using TypeInfo = Attributes::NumberOfActuationsTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
         case Attributes::ConfigStatus::Id: {
             using TypeInfo = Attributes::ConfigStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -18807,13 +18977,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
     }
     default:
-        *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+        *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
         break;
     }
     return nullptr;
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index abe2ebf9f7089b..257190cef397d4 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -730,6 +730,8 @@ typedef void (*CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackTy
     void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo::DecodableType &);
 typedef void (*CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType)(
     void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterTestEventTriggersEnabledAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo::DecodableArgType);
 typedef void (*CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
     void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
 typedef void (*CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
@@ -1579,8 +1581,6 @@ typedef void (*CHIPTestClusterClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::TestCluster::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPTestClusterClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::TestCluster::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterGetRelayStatusLogResponseCallbackType)(
-    void *, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType &);
 typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)(
     void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &);
 
@@ -1767,12 +1767,11 @@ typedef void (*CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallb
 typedef void (*CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType)(
     void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo::DecodableArgType);
 typedef void (*CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableType &);
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableArgType);
 typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType)(
     void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo::DecodableArgType);
 typedef void (*CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType)(
-    void *,
-    const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableType &);
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableArgType);
 typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType)(
     void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo::DecodableType &);
 typedef void (*CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
@@ -1873,10 +1872,18 @@ typedef void (*CHIPWiFiNetworkDiagnosticsClusterClusterRevisionAttributeCallback
 
 typedef void (*CHIPWindowCoveringClusterTypeAttributeCallbackType)(
     void *, chip::app::Clusters::WindowCovering::Attributes::Type::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterPhysicalClosedLimitLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterPhysicalClosedLimitTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo::DecodableArgType);
 typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType)(
     void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLift::TypeInfo::DecodableArgType);
 typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType)(
     void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTilt::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterNumberOfActuationsLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterNumberOfActuationsTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo::DecodableArgType);
 typedef void (*CHIPWindowCoveringClusterConfigStatusAttributeCallbackType)(
     void *, chip::app::Clusters::WindowCovering::Attributes::ConfigStatus::TypeInfo::DecodableArgType);
 typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType)(
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
index 5325e4851a1d43..d21c690816cb13 100644
--- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
@@ -5174,18 +5174,16 @@ JNI_METHOD(void, TestClusterCluster, writeListStructOctetStringAttribute)
             {
                 jobject element_0;
                 chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Long;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().LongToPrimitive(element_0_fabricIndexItem_1));
-                jobject element_0_operationalCertItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "operationalCert", "[B",
-                                                                  element_0_operationalCertItem_1);
+                jobject element_0_member1Item_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "member1", "Ljava/lang/Long;",
+                                                                  element_0_member1Item_1);
+                listHolder_0->mList[i_0].member1 = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].member1)>>(
+                    chip::JniReferences::GetInstance().LongToPrimitive(element_0_member1Item_1));
+                jobject element_0_member2Item_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "member2", "[B", element_0_member2Item_1);
                 cleanupByteArrays.push_back(
-                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0_operationalCertItem_1)));
-                listHolder_0->mList[i_0].operationalCert = cleanupByteArrays.back()->byteSpan();
+                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0_member2Item_1)));
+                listHolder_0->mList[i_0].member2 = cleanupByteArrays.back()->byteSpan();
             }
             cppValue = ListType_0(listHolder_0->mList, valueSize);
         }
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index 16182bd8adad60..c338d62132e1cd 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -4189,97 +4189,6 @@ void CHIPTestClusterClusterTestSpecificResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
 }
-CHIPThermostatClusterGetRelayStatusLogResponseCallback::CHIPThermostatClusterGetRelayStatusLogResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPThermostatClusterGetRelayStatusLogResponseCallbackType>(CallbackFn, this)
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThermostatClusterGetRelayStatusLogResponseCallback::~CHIPThermostatClusterGetRelayStatusLogResponseCallback()
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-};
-
-void CHIPThermostatClusterGetRelayStatusLogResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & dataResponse)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-    jmethodID javaMethod;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
-
-    std::unique_ptr<CHIPThermostatClusterGetRelayStatusLogResponseCallback,
-                    void (*)(CHIPThermostatClusterGetRelayStatusLogResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPThermostatClusterGetRelayStatusLogResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPThermostatClusterGetRelayStatusLogResponseCallback>);
-    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
-
-    javaCallbackRef = cppCallback->javaCallbackRef;
-    // Java callback is allowed to be null, exit early if this is the case.
-    VerifyOrReturn(javaCallbackRef != nullptr);
-
-    err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V",
-        &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
-
-    jobject TimeOfDay;
-    std::string TimeOfDayClassName     = "java/lang/Integer";
-    std::string TimeOfDayCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(TimeOfDayClassName.c_str(), TimeOfDayCtorSignature.c_str(),
-                                                                   dataResponse.timeOfDay, TimeOfDay);
-    jobject RelayStatus;
-    std::string RelayStatusClassName     = "java/lang/Integer";
-    std::string RelayStatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(RelayStatusClassName.c_str(), RelayStatusCtorSignature.c_str(),
-                                                                  dataResponse.relayStatus, RelayStatus);
-    jobject LocalTemperature;
-    std::string LocalTemperatureClassName     = "java/lang/Integer";
-    std::string LocalTemperatureCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(
-        LocalTemperatureClassName.c_str(), LocalTemperatureCtorSignature.c_str(), dataResponse.localTemperature, LocalTemperature);
-    jobject HumidityInPercentage;
-    std::string HumidityInPercentageClassName     = "java/lang/Integer";
-    std::string HumidityInPercentageCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(HumidityInPercentageClassName.c_str(),
-                                                                  HumidityInPercentageCtorSignature.c_str(),
-                                                                  dataResponse.humidityInPercentage, HumidityInPercentage);
-    jobject Setpoint;
-    std::string SetpointClassName     = "java/lang/Integer";
-    std::string SetpointCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(SetpointClassName.c_str(), SetpointCtorSignature.c_str(),
-                                                                  dataResponse.setpoint, Setpoint);
-    jobject UnreadEntries;
-    std::string UnreadEntriesClassName     = "java/lang/Integer";
-    std::string UnreadEntriesCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-        UnreadEntriesClassName.c_str(), UnreadEntriesCtorSignature.c_str(), dataResponse.unreadEntries, UnreadEntries);
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, TimeOfDay, RelayStatus, LocalTemperature, HumidityInPercentage, Setpoint,
-                        UnreadEntries);
-}
 CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback(
     jobject javaCallback) :
     Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(CallbackFn, this)
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
index 7d7178e0b21747..f248dc4c60ff62 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
@@ -700,21 +700,6 @@ class CHIPTestClusterClusterTestSpecificResponseCallback
     jobject javaCallbackRef;
 };
 
-class CHIPThermostatClusterGetRelayStatusLogResponseCallback
-    : public Callback::Callback<CHIPThermostatClusterGetRelayStatusLogResponseCallbackType>
-{
-public:
-    CHIPThermostatClusterGetRelayStatusLogResponseCallback(jobject javaCallback);
-
-    ~CHIPThermostatClusterGetRelayStatusLogResponseCallback();
-
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data);
-
-private:
-    jobject javaCallbackRef;
-};
-
 class CHIPThermostatClusterGetWeeklyScheduleResponseCallback
     : public Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>
 {
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 6a0323a9983c47..a1e32b98819411 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -18850,25 +18850,66 @@ void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
         chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
             newElement_0_idClassName.c_str(), newElement_0_idCtorSignature.c_str(), entry_0.id, newElement_0_id);
         jobject newElement_0_name;
-        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+        if (!entry_0.name.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
+        }
+        else
+        {
+            jobject newElement_0_nameInsideOptional;
+            newElement_0_nameInsideOptional =
+                env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
+        }
         jobject newElement_0_stackFreeCurrent;
-        std::string newElement_0_stackFreeCurrentClassName     = "java/lang/Long";
-        std::string newElement_0_stackFreeCurrentCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_stackFreeCurrentClassName.c_str(),
-                                                                       newElement_0_stackFreeCurrentCtorSignature.c_str(),
-                                                                       entry_0.stackFreeCurrent, newElement_0_stackFreeCurrent);
+        if (!entry_0.stackFreeCurrent.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeCurrent);
+        }
+        else
+        {
+            jobject newElement_0_stackFreeCurrentInsideOptional;
+            std::string newElement_0_stackFreeCurrentInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_stackFreeCurrentInsideOptionalCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                newElement_0_stackFreeCurrentInsideOptionalClassName.c_str(),
+                newElement_0_stackFreeCurrentInsideOptionalCtorSignature.c_str(), entry_0.stackFreeCurrent.Value(),
+                newElement_0_stackFreeCurrentInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeCurrentInsideOptional,
+                                                              newElement_0_stackFreeCurrent);
+        }
         jobject newElement_0_stackFreeMinimum;
-        std::string newElement_0_stackFreeMinimumClassName     = "java/lang/Long";
-        std::string newElement_0_stackFreeMinimumCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_stackFreeMinimumClassName.c_str(),
-                                                                       newElement_0_stackFreeMinimumCtorSignature.c_str(),
-                                                                       entry_0.stackFreeMinimum, newElement_0_stackFreeMinimum);
+        if (!entry_0.stackFreeMinimum.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeMinimum);
+        }
+        else
+        {
+            jobject newElement_0_stackFreeMinimumInsideOptional;
+            std::string newElement_0_stackFreeMinimumInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_stackFreeMinimumInsideOptionalCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                newElement_0_stackFreeMinimumInsideOptionalClassName.c_str(),
+                newElement_0_stackFreeMinimumInsideOptionalCtorSignature.c_str(), entry_0.stackFreeMinimum.Value(),
+                newElement_0_stackFreeMinimumInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeMinimumInsideOptional,
+                                                              newElement_0_stackFreeMinimum);
+        }
         jobject newElement_0_stackSize;
-        std::string newElement_0_stackSizeClassName     = "java/lang/Long";
-        std::string newElement_0_stackSizeCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_stackSizeClassName.c_str(),
-                                                                       newElement_0_stackSizeCtorSignature.c_str(),
-                                                                       entry_0.stackSize, newElement_0_stackSize);
+        if (!entry_0.stackSize.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackSize);
+        }
+        else
+        {
+            jobject newElement_0_stackSizeInsideOptional;
+            std::string newElement_0_stackSizeInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_stackSizeInsideOptionalCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                newElement_0_stackSizeInsideOptionalClassName.c_str(), newElement_0_stackSizeInsideOptionalCtorSignature.c_str(),
+                entry_0.stackSize.Value(), newElement_0_stackSizeInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
+        }
 
         jclass threadMetricsStructClass;
         err = chip::JniReferences::GetInstance().GetClassRef(
@@ -18880,7 +18921,7 @@ void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
         }
         jmethodID threadMetricsStructCtor =
             env->GetMethodID(threadMetricsStructClass, "<init>",
-                             "(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V");
+                             "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
         if (threadMetricsStructCtor == nullptr)
         {
             ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
@@ -20100,17 +20141,17 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Long";
-        std::string newElement_0_fabricIndexCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                       newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                       entry_0.fabricIndex, newElement_0_fabricIndex);
-        jobject newElement_0_operationalCert;
-        jbyteArray newElement_0_operationalCertByteArray = env->NewByteArray(static_cast<jsize>(entry_0.operationalCert.size()));
-        env->SetByteArrayRegion(newElement_0_operationalCertByteArray, 0, static_cast<jsize>(entry_0.operationalCert.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.operationalCert.data()));
-        newElement_0_operationalCert = newElement_0_operationalCertByteArray;
+        jobject newElement_0_member1;
+        std::string newElement_0_member1ClassName     = "java/lang/Long";
+        std::string newElement_0_member1CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_member1ClassName.c_str(),
+                                                                       newElement_0_member1CtorSignature.c_str(), entry_0.member1,
+                                                                       newElement_0_member1);
+        jobject newElement_0_member2;
+        jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.member2.size()));
+        env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast<jsize>(entry_0.member2.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.member2.data()));
+        newElement_0_member2 = newElement_0_member2ByteArray;
 
         jclass testListStructOctetStructClass;
         err = chip::JniReferences::GetInstance().GetClassRef(
@@ -20128,8 +20169,8 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
             return;
         }
 
-        newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_fabricIndex,
-                                      newElement_0_operationalCert);
+        newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1,
+                                      newElement_0_member2);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -21141,7 +21182,7 @@ CHIPTestClusterNullableBitmap8AttributeCallback::~CHIPTestClusterNullableBitmap8
 }
 
 void CHIPTestClusterNullableBitmap8AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21208,7 +21249,7 @@ CHIPTestClusterNullableBitmap16AttributeCallback::~CHIPTestClusterNullableBitmap
 }
 
 void CHIPTestClusterNullableBitmap16AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21275,7 +21316,7 @@ CHIPTestClusterNullableBitmap32AttributeCallback::~CHIPTestClusterNullableBitmap
 }
 
 void CHIPTestClusterNullableBitmap32AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21342,7 +21383,7 @@ CHIPTestClusterNullableBitmap64AttributeCallback::~CHIPTestClusterNullableBitmap
 }
 
 void CHIPTestClusterNullableBitmap64AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23841,8 +23882,8 @@ CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::~CHIPThreadNetworkDiag
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23872,7 +23913,7 @@ void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(void *
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
@@ -24479,9 +24520,9 @@ void CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(
+CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24498,7 +24539,7 @@ CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CHIPThreadNetworkDi
     }
 }
 
-CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::~CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback()
+CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::~CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24509,10 +24550,8 @@ CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::~CHIPThreadNetworkD
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
+void CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24520,9 +24559,8 @@ void CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24530,58 +24568,95 @@ void CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
+    }
 
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CHIPThreadNetworkDiagnosticsWeightingAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_rotationTime;
-        std::string newElement_0_rotationTimeClassName     = "java/lang/Integer";
-        std::string newElement_0_rotationTimeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_rotationTimeClassName.c_str(),
-                                                                       newElement_0_rotationTimeCtorSignature.c_str(),
-                                                                       entry_0.rotationTime, newElement_0_rotationTime);
-        jobject newElement_0_flags;
-        std::string newElement_0_flagsClassName     = "java/lang/Integer";
-        std::string newElement_0_flagsCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            newElement_0_flagsClassName.c_str(), newElement_0_flagsCtorSignature.c_str(), entry_0.flags, newElement_0_flags);
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
 
-        jclass securityPolicyStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy", securityPolicyStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy");
-            return;
-        }
-        jmethodID securityPolicyStructCtor =
-            env->GetMethodID(securityPolicyStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-        if (securityPolicyStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy constructor");
-            return;
-        }
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
 
-        newElement_0 =
-            env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, newElement_0_rotationTime, newElement_0_flags);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::~CHIPThreadNetworkDiagnosticsWeightingAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
     }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+void CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType>(CallbackFn,
-                                                                                                                   this),
+CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24598,8 +24673,7 @@ CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::
     }
 }
 
-CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback()
+CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::~CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24610,10 +24684,8 @@ CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
+void CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24621,9 +24693,75 @@ void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::~CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
 
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *>(context), maybeDestroy);
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24631,121 +24769,358 @@ void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback::
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
 
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_activeTimestampPresent;
-        std::string newElement_0_activeTimestampPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_activeTimestampPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-            newElement_0_activeTimestampPresentClassName.c_str(), newElement_0_activeTimestampPresentCtorSignature.c_str(),
-            entry_0.activeTimestampPresent, newElement_0_activeTimestampPresent);
-        jobject newElement_0_pendingTimestampPresent;
-        std::string newElement_0_pendingTimestampPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_pendingTimestampPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-            newElement_0_pendingTimestampPresentClassName.c_str(), newElement_0_pendingTimestampPresentCtorSignature.c_str(),
-            entry_0.pendingTimestampPresent, newElement_0_pendingTimestampPresent);
-        jobject newElement_0_masterKeyPresent;
-        std::string newElement_0_masterKeyPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_masterKeyPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_masterKeyPresentClassName.c_str(),
-                                                                   newElement_0_masterKeyPresentCtorSignature.c_str(),
-                                                                   entry_0.masterKeyPresent, newElement_0_masterKeyPresent);
-        jobject newElement_0_networkNamePresent;
-        std::string newElement_0_networkNamePresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_networkNamePresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_networkNamePresentClassName.c_str(),
-                                                                   newElement_0_networkNamePresentCtorSignature.c_str(),
-                                                                   entry_0.networkNamePresent, newElement_0_networkNamePresent);
-        jobject newElement_0_extendedPanIdPresent;
-        std::string newElement_0_extendedPanIdPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_extendedPanIdPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_extendedPanIdPresentClassName.c_str(),
-                                                                   newElement_0_extendedPanIdPresentCtorSignature.c_str(),
-                                                                   entry_0.extendedPanIdPresent, newElement_0_extendedPanIdPresent);
-        jobject newElement_0_meshLocalPrefixPresent;
-        std::string newElement_0_meshLocalPrefixPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_meshLocalPrefixPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-            newElement_0_meshLocalPrefixPresentClassName.c_str(), newElement_0_meshLocalPrefixPresentCtorSignature.c_str(),
-            entry_0.meshLocalPrefixPresent, newElement_0_meshLocalPrefixPresent);
-        jobject newElement_0_delayPresent;
-        std::string newElement_0_delayPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_delayPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_delayPresentClassName.c_str(),
-                                                                   newElement_0_delayPresentCtorSignature.c_str(),
-                                                                   entry_0.delayPresent, newElement_0_delayPresent);
-        jobject newElement_0_panIdPresent;
-        std::string newElement_0_panIdPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_panIdPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_panIdPresentClassName.c_str(),
-                                                                   newElement_0_panIdPresentCtorSignature.c_str(),
-                                                                   entry_0.panIdPresent, newElement_0_panIdPresent);
-        jobject newElement_0_channelPresent;
-        std::string newElement_0_channelPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_channelPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_channelPresentClassName.c_str(),
-                                                                   newElement_0_channelPresentCtorSignature.c_str(),
-                                                                   entry_0.channelPresent, newElement_0_channelPresent);
-        jobject newElement_0_pskcPresent;
-        std::string newElement_0_pskcPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_pskcPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_pskcPresentClassName.c_str(),
-                                                                   newElement_0_pskcPresentCtorSignature.c_str(),
-                                                                   entry_0.pskcPresent, newElement_0_pskcPresent);
-        jobject newElement_0_securityPolicyPresent;
-        std::string newElement_0_securityPolicyPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_securityPolicyPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-            newElement_0_securityPolicyPresentClassName.c_str(), newElement_0_securityPolicyPresentCtorSignature.c_str(),
-            entry_0.securityPolicyPresent, newElement_0_securityPolicyPresent);
-        jobject newElement_0_channelMaskPresent;
-        std::string newElement_0_channelMaskPresentClassName     = "java/lang/Boolean";
-        std::string newElement_0_channelMaskPresentCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_channelMaskPresentClassName.c_str(),
-                                                                   newElement_0_channelMaskPresentCtorSignature.c_str(),
-                                                                   entry_0.channelMaskPresent, newElement_0_channelMaskPresent);
-
-        jclass operationalDatasetComponentsStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents",
-            operationalDatasetComponentsStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents");
-            return;
-        }
-        jmethodID operationalDatasetComponentsStructCtor =
-            env->GetMethodID(operationalDatasetComponentsStructClass, "<init>",
-                             "(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/"
-                             "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/"
-                             "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
-        if (operationalDatasetComponentsStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents constructor");
-            return;
-        }
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
 
-        newElement_0 =
-            env->NewObject(operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor,
-                           newElement_0_activeTimestampPresent, newElement_0_pendingTimestampPresent, newElement_0_masterKeyPresent,
-                           newElement_0_networkNamePresent, newElement_0_extendedPanIdPresent, newElement_0_meshLocalPrefixPresent,
-                           newElement_0_delayPresent, newElement_0_panIdPresent, newElement_0_channelPresent,
-                           newElement_0_pskcPresent, newElement_0_securityPolicyPresent, newElement_0_channelMaskPresent);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::~CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
     }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+void CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::~CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::~CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPThreadNetworkDiagnosticsDelayAttributeCallback::~CHIPThreadNetworkDiagnosticsDelayAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsDelayAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsDelayAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
+        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
+                                reinterpret_cast<const jbyte *>(value.Value().data()));
+        javaValue = javaValueByteArray;
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
 CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index a4673a8a4f4255..47cdbfab4e3917 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -8590,7 +8590,7 @@ class CHIPTestClusterNullableBitmap8AttributeCallback
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -8622,7 +8622,7 @@ class CHIPTestClusterNullableBitmap16AttributeCallback
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -8654,7 +8654,7 @@ class CHIPTestClusterNullableBitmap32AttributeCallback
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -8686,7 +8686,7 @@ class CHIPTestClusterNullableBitmap64AttributeCallback
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -9799,7 +9799,9 @@ class CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -9996,30 +9998,28 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10028,32 +10028,238 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsWeightingAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsWeightingAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsWeightingAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsWeightingAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<
-                   chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *>(context)
-                ->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsDelayAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsDelayAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsDelayAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsDelayAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsDelayAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>
+{
+public:
+    CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback();
+
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 0d3ebffc4b15ee..a4c0f48b018e3c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -9053,6 +9053,26 @@ public GeneralDiagnosticsCluster(long devicePtr, int endpointId) {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
+    public void testEventTrigger(
+        DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger) {
+      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, null);
+    }
+
+    public void testEventTrigger(
+        DefaultClusterCallback callback,
+        byte[] enableKey,
+        Long eventTrigger,
+        int timedInvokeTimeoutMs) {
+      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, timedInvokeTimeoutMs);
+    }
+
+    private native void testEventTrigger(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        byte[] enableKey,
+        Long eventTrigger,
+        @Nullable Integer timedInvokeTimeoutMs);
+
     public interface NetworkInterfacesAttributeCallback {
       void onSuccess(List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType> valueList);
 
@@ -9181,6 +9201,16 @@ public void subscribeActiveNetworkFaultsAttribute(
       subscribeActiveNetworkFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
+    public void readTestEventTriggersEnabledAttribute(BooleanAttributeCallback callback) {
+      readTestEventTriggersEnabledAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeTestEventTriggersEnabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTestEventTriggersEnabledAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
       readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
@@ -9285,6 +9315,12 @@ private native void subscribeActiveNetworkFaultsAttribute(
         int minInterval,
         int maxInterval);
 
+    private native void readTestEventTriggersEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeTestEventTriggersEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -13903,7 +13939,7 @@ public void addNOC(
         byte[] NOCValue,
         Optional<byte[]> ICACValue,
         byte[] IPKValue,
-        Long caseAdminNode,
+        Long caseAdminSubject,
         Integer adminVendorId) {
       addNOC(
           chipClusterPtr,
@@ -13911,7 +13947,7 @@ public void addNOC(
           NOCValue,
           ICACValue,
           IPKValue,
-          caseAdminNode,
+          caseAdminSubject,
           adminVendorId,
           null);
     }
@@ -13921,7 +13957,7 @@ public void addNOC(
         byte[] NOCValue,
         Optional<byte[]> ICACValue,
         byte[] IPKValue,
-        Long caseAdminNode,
+        Long caseAdminSubject,
         Integer adminVendorId,
         int timedInvokeTimeoutMs) {
       addNOC(
@@ -13930,7 +13966,7 @@ public void addNOC(
           NOCValue,
           ICACValue,
           IPKValue,
-          caseAdminNode,
+          caseAdminSubject,
           adminVendorId,
           timedInvokeTimeoutMs);
     }
@@ -13953,13 +13989,17 @@ public void attestationRequest(
       attestationRequest(chipClusterPtr, callback, attestationNonce, timedInvokeTimeoutMs);
     }
 
-    public void CSRRequest(CSRResponseCallback callback, byte[] CSRNonce) {
-      CSRRequest(chipClusterPtr, callback, CSRNonce, null);
+    public void CSRRequest(
+        CSRResponseCallback callback, byte[] CSRNonce, Optional<Boolean> isForUpdateNOC) {
+      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, null);
     }
 
     public void CSRRequest(
-        CSRResponseCallback callback, byte[] CSRNonce, int timedInvokeTimeoutMs) {
-      CSRRequest(chipClusterPtr, callback, CSRNonce, timedInvokeTimeoutMs);
+        CSRResponseCallback callback,
+        byte[] CSRNonce,
+        Optional<Boolean> isForUpdateNOC,
+        int timedInvokeTimeoutMs) {
+      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, timedInvokeTimeoutMs);
     }
 
     public void certificateChainRequest(
@@ -13983,17 +14023,6 @@ public void removeFabric(
       removeFabric(chipClusterPtr, callback, fabricIndex, timedInvokeTimeoutMs);
     }
 
-    public void removeTrustedRootCertificate(
-        DefaultClusterCallback callback, byte[] trustedRootIdentifier) {
-      removeTrustedRootCertificate(chipClusterPtr, callback, trustedRootIdentifier, null);
-    }
-
-    public void removeTrustedRootCertificate(
-        DefaultClusterCallback callback, byte[] trustedRootIdentifier, int timedInvokeTimeoutMs) {
-      removeTrustedRootCertificate(
-          chipClusterPtr, callback, trustedRootIdentifier, timedInvokeTimeoutMs);
-    }
-
     public void updateFabricLabel(NOCResponseCallback callback, String label) {
       updateFabricLabel(chipClusterPtr, callback, label, null);
     }
@@ -14022,7 +14051,7 @@ private native void addNOC(
         byte[] NOCValue,
         Optional<byte[]> ICACValue,
         byte[] IPKValue,
-        Long caseAdminNode,
+        Long caseAdminSubject,
         Integer adminVendorId,
         @Nullable Integer timedInvokeTimeoutMs);
 
@@ -14042,6 +14071,7 @@ private native void CSRRequest(
         long chipClusterPtr,
         CSRResponseCallback Callback,
         byte[] CSRNonce,
+        Optional<Boolean> isForUpdateNOC,
         @Nullable Integer timedInvokeTimeoutMs);
 
     private native void certificateChainRequest(
@@ -14056,12 +14086,6 @@ private native void removeFabric(
         Integer fabricIndex,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void removeTrustedRootCertificate(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        byte[] trustedRootIdentifier,
-        @Nullable Integer timedInvokeTimeoutMs);
-
     private native void updateFabricLabel(
         long chipClusterPtr,
         NOCResponseCallback Callback,
@@ -17426,7 +17450,7 @@ private native void subscribeClusterRevisionAttribute(
   }
 
   public static class TestClusterCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1295L;
+    public static final long CLUSTER_ID = 4294048773L;
 
     public TestClusterCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
@@ -20734,16 +20758,6 @@ public void clearWeeklySchedule(DefaultClusterCallback callback, int timedInvoke
       clearWeeklySchedule(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void getRelayStatusLog(GetRelayStatusLogResponseCallback callback) {
-      getRelayStatusLog(chipClusterPtr, callback, null);
-    }
-
-    public void getRelayStatusLog(
-        GetRelayStatusLogResponseCallback callback, int timedInvokeTimeoutMs) {
-
-      getRelayStatusLog(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
     public void getWeeklySchedule(
         GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
       getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, null);
@@ -20804,11 +20818,6 @@ private native void clearWeeklySchedule(
         DefaultClusterCallback Callback,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void getRelayStatusLog(
-        long chipClusterPtr,
-        GetRelayStatusLogResponseCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
     private native void getWeeklySchedule(
         long chipClusterPtr,
         GetWeeklyScheduleResponseCallback Callback,
@@ -20832,18 +20841,6 @@ private native void setpointRaiseLower(
         Integer amount,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface GetRelayStatusLogResponseCallback {
-      void onSuccess(
-          Integer timeOfDay,
-          Integer relayStatus,
-          Integer localTemperature,
-          Integer humidityInPercentage,
-          Integer setpoint,
-          Integer unreadEntries);
-
-      void onError(Exception error);
-    }
-
     public interface GetWeeklyScheduleResponseCallback {
       void onSuccess(
           Integer numberOfTransitionsForSequence,
@@ -21620,17 +21617,72 @@ public interface RouteTableListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface SecurityPolicyAttributeCallback {
-      void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy> valueList);
+    public interface PartitionIdAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface OperationalDatasetComponentsAttributeCallback {
-      void onSuccess(
-          List<ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents> valueList);
+    public interface WeightingAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface DataVersionAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface StableDataVersionAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface LeaderRouterIdAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface ActiveTimestampAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface PendingTimestampAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface DelayAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface ChannelMaskAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
 
       void onError(Exception ex);
 
@@ -21750,48 +21802,48 @@ public void subscribeRouteTableListAttribute(
       subscribeRouteTableListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPartitionIdAttribute(LongAttributeCallback callback) {
+    public void readPartitionIdAttribute(PartitionIdAttributeCallback callback) {
       readPartitionIdAttribute(chipClusterPtr, callback);
     }
 
     public void subscribePartitionIdAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        PartitionIdAttributeCallback callback, int minInterval, int maxInterval) {
       subscribePartitionIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readWeightingAttribute(IntegerAttributeCallback callback) {
+    public void readWeightingAttribute(WeightingAttributeCallback callback) {
       readWeightingAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeWeightingAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        WeightingAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeWeightingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readDataVersionAttribute(IntegerAttributeCallback callback) {
+    public void readDataVersionAttribute(DataVersionAttributeCallback callback) {
       readDataVersionAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeDataVersionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        DataVersionAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readStableDataVersionAttribute(IntegerAttributeCallback callback) {
+    public void readStableDataVersionAttribute(StableDataVersionAttributeCallback callback) {
       readStableDataVersionAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeStableDataVersionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        StableDataVersionAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeStableDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readLeaderRouterIdAttribute(IntegerAttributeCallback callback) {
+    public void readLeaderRouterIdAttribute(LeaderRouterIdAttributeCallback callback) {
       readLeaderRouterIdAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeLeaderRouterIdAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        LeaderRouterIdAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeLeaderRouterIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -22178,62 +22230,42 @@ public void subscribeRxErrOtherCountAttribute(
       subscribeRxErrOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveTimestampAttribute(LongAttributeCallback callback) {
+    public void readActiveTimestampAttribute(ActiveTimestampAttributeCallback callback) {
       readActiveTimestampAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeActiveTimestampAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        ActiveTimestampAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeActiveTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPendingTimestampAttribute(LongAttributeCallback callback) {
+    public void readPendingTimestampAttribute(PendingTimestampAttributeCallback callback) {
       readPendingTimestampAttribute(chipClusterPtr, callback);
     }
 
     public void subscribePendingTimestampAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        PendingTimestampAttributeCallback callback, int minInterval, int maxInterval) {
       subscribePendingTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readDelayAttribute(LongAttributeCallback callback) {
+    public void readDelayAttribute(DelayAttributeCallback callback) {
       readDelayAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeDelayAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        DelayAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSecurityPolicyAttribute(SecurityPolicyAttributeCallback callback) {
-      readSecurityPolicyAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSecurityPolicyAttribute(
-        SecurityPolicyAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSecurityPolicyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readChannelMaskAttribute(OctetStringAttributeCallback callback) {
+    public void readChannelMaskAttribute(ChannelMaskAttributeCallback callback) {
       readChannelMaskAttribute(chipClusterPtr, callback);
     }
 
     public void subscribeChannelMaskAttribute(
-        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+        ChannelMaskAttributeCallback callback, int minInterval, int maxInterval) {
       subscribeChannelMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readOperationalDatasetComponentsAttribute(
-        OperationalDatasetComponentsAttributeCallback callback) {
-      readOperationalDatasetComponentsAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeOperationalDatasetComponentsAttribute(
-        OperationalDatasetComponentsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOperationalDatasetComponentsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
     public void readActiveNetworkFaultsListAttribute(
         ActiveNetworkFaultsListAttributeCallback callback) {
       readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
@@ -22361,34 +22393,46 @@ private native void subscribeRouteTableListAttribute(
         int maxInterval);
 
     private native void readPartitionIdAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+        long chipClusterPtr, PartitionIdAttributeCallback callback);
 
     private native void subscribePartitionIdAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+        long chipClusterPtr,
+        PartitionIdAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readWeightingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+        long chipClusterPtr, WeightingAttributeCallback callback);
 
     private native void subscribeWeightingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        long chipClusterPtr, WeightingAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readDataVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+        long chipClusterPtr, DataVersionAttributeCallback callback);
 
     private native void subscribeDataVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        long chipClusterPtr,
+        DataVersionAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readStableDataVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+        long chipClusterPtr, StableDataVersionAttributeCallback callback);
 
     private native void subscribeStableDataVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        long chipClusterPtr,
+        StableDataVersionAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readLeaderRouterIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+        long chipClusterPtr, LeaderRouterIdAttributeCallback callback);
 
     private native void subscribeLeaderRouterIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        long chipClusterPtr,
+        LeaderRouterIdAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readDetachedRoleCountAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
@@ -22643,46 +22687,34 @@ private native void subscribeRxErrOtherCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readActiveTimestampAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+        long chipClusterPtr, ActiveTimestampAttributeCallback callback);
 
     private native void subscribeActiveTimestampAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+        long chipClusterPtr,
+        ActiveTimestampAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readPendingTimestampAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+        long chipClusterPtr, PendingTimestampAttributeCallback callback);
 
     private native void subscribePendingTimestampAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDelayAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeDelayAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSecurityPolicyAttribute(
-        long chipClusterPtr, SecurityPolicyAttributeCallback callback);
-
-    private native void subscribeSecurityPolicyAttribute(
         long chipClusterPtr,
-        SecurityPolicyAttributeCallback callback,
+        PendingTimestampAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readChannelMaskAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
+    private native void readDelayAttribute(long chipClusterPtr, DelayAttributeCallback callback);
 
-    private native void subscribeChannelMaskAttribute(
-        long chipClusterPtr,
-        OctetStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeDelayAttribute(
+        long chipClusterPtr, DelayAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOperationalDatasetComponentsAttribute(
-        long chipClusterPtr, OperationalDatasetComponentsAttributeCallback callback);
+    private native void readChannelMaskAttribute(
+        long chipClusterPtr, ChannelMaskAttributeCallback callback);
 
-    private native void subscribeOperationalDatasetComponentsAttribute(
+    private native void subscribeChannelMaskAttribute(
         long chipClusterPtr,
-        OperationalDatasetComponentsAttributeCallback callback,
+        ChannelMaskAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
@@ -23869,6 +23901,24 @@ public void subscribeTypeAttribute(
       subscribeTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
+    public void readPhysicalClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
+      readPhysicalClosedLimitLiftAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePhysicalClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPhysicalClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
+      readPhysicalClosedLimitTiltAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePhysicalClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
     public void readCurrentPositionLiftAttribute(CurrentPositionLiftAttributeCallback callback) {
       readCurrentPositionLiftAttribute(chipClusterPtr, callback);
     }
@@ -23887,6 +23937,24 @@ public void subscribeCurrentPositionTiltAttribute(
       subscribeCurrentPositionTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
+    public void readNumberOfActuationsLiftAttribute(IntegerAttributeCallback callback) {
+      readNumberOfActuationsLiftAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfActuationsLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNumberOfActuationsTiltAttribute(IntegerAttributeCallback callback) {
+      readNumberOfActuationsTiltAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfActuationsTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
     public void readConfigStatusAttribute(IntegerAttributeCallback callback) {
       readConfigStatusAttribute(chipClusterPtr, callback);
     }
@@ -24103,6 +24171,18 @@ public void subscribeClusterRevisionAttribute(
     private native void subscribeTypeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
+    private native void readPhysicalClosedLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribePhysicalClosedLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readPhysicalClosedLimitTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribePhysicalClosedLimitTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readCurrentPositionLiftAttribute(
         long chipClusterPtr, CurrentPositionLiftAttributeCallback callback);
 
@@ -24121,6 +24201,18 @@ private native void subscribeCurrentPositionTiltAttribute(
         int minInterval,
         int maxInterval);
 
+    private native void readNumberOfActuationsLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfActuationsLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfActuationsTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfActuationsTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readConfigStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
index 2a92aacd382922..284573aecb22b9 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
@@ -187,7 +187,7 @@ public static String clusterIdToName(long clusterId) {
     if (clusterId == 1026L) {
       return "TemperatureMeasurement";
     }
-    if (clusterId == 1295L) {
+    if (clusterId == 4294048773L) {
       return "TestCluster";
     }
     if (clusterId == 513L) {
@@ -1282,6 +1282,9 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 7L) {
         return "ActiveNetworkFaults";
       }
+      if (attributeId == 8L) {
+        return "TestEventTriggersEnabled";
+      }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -2244,7 +2247,7 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1295L) {
+    if (clusterId == 4294048773L) {
       if (attributeId == 0L) {
         return "Boolean";
       }
@@ -2941,12 +2944,24 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 0L) {
         return "Type";
       }
+      if (attributeId == 1L) {
+        return "PhysicalClosedLimitLift";
+      }
+      if (attributeId == 2L) {
+        return "PhysicalClosedLimitTilt";
+      }
       if (attributeId == 3L) {
         return "CurrentPositionLift";
       }
       if (attributeId == 4L) {
         return "CurrentPositionTilt";
       }
+      if (attributeId == 5L) {
+        return "NumberOfActuationsLift";
+      }
+      if (attributeId == 6L) {
+        return "NumberOfActuationsTilt";
+      }
       if (attributeId == 7L) {
         return "ConfigStatus";
       }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index 889a1b030e375e..4affe8b8bd6946 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -1449,13 +1449,17 @@ public String toString() {
 
   public static class SoftwareDiagnosticsClusterThreadMetrics {
     public Long id;
-    public String name;
-    public Long stackFreeCurrent;
-    public Long stackFreeMinimum;
-    public Long stackSize;
+    public Optional<String> name;
+    public Optional<Long> stackFreeCurrent;
+    public Optional<Long> stackFreeMinimum;
+    public Optional<Long> stackSize;
 
     public SoftwareDiagnosticsClusterThreadMetrics(
-        Long id, String name, Long stackFreeCurrent, Long stackFreeMinimum, Long stackSize) {
+        Long id,
+        Optional<String> name,
+        Optional<Long> stackFreeCurrent,
+        Optional<Long> stackFreeMinimum,
+        Optional<Long> stackSize) {
       this.id = id;
       this.name = name;
       this.stackFreeCurrent = stackFreeCurrent;
@@ -1821,23 +1825,23 @@ public String toString() {
   }
 
   public static class TestClusterClusterTestListStructOctet {
-    public Long fabricIndex;
-    public byte[] operationalCert;
+    public Long member1;
+    public byte[] member2;
 
-    public TestClusterClusterTestListStructOctet(Long fabricIndex, byte[] operationalCert) {
-      this.fabricIndex = fabricIndex;
-      this.operationalCert = operationalCert;
+    public TestClusterClusterTestListStructOctet(Long member1, byte[] member2) {
+      this.member1 = member1;
+      this.member2 = member2;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
       output.append("TestClusterClusterTestListStructOctet {\n");
-      output.append("\tfabricIndex: ");
-      output.append(fabricIndex);
+      output.append("\tmember1: ");
+      output.append(member1);
       output.append("\n");
-      output.append("\toperationalCert: ");
-      output.append(Arrays.toString(operationalCert));
+      output.append("\tmember2: ");
+      output.append(Arrays.toString(member2));
       output.append("\n");
       output.append("}\n");
       return output.toString();
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index c9156547351ef2..1ebc4db7f06805 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -6383,50 +6383,6 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGetRelayStatusLogResponseCallback
-      implements ChipClusters.ThermostatCluster.GetRelayStatusLogResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        Integer TimeOfDay,
-        Integer RelayStatus,
-        Integer LocalTemperature,
-        Integer HumidityInPercentage,
-        Integer Setpoint,
-        Integer UnreadEntries) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo TimeOfDayResponseValue = new CommandResponseInfo("TimeOfDay", "Integer");
-      responseValues.put(TimeOfDayResponseValue, TimeOfDay);
-      CommandResponseInfo RelayStatusResponseValue =
-          new CommandResponseInfo("RelayStatus", "Integer");
-      responseValues.put(RelayStatusResponseValue, RelayStatus);
-      CommandResponseInfo LocalTemperatureResponseValue =
-          new CommandResponseInfo("LocalTemperature", "Integer");
-      responseValues.put(LocalTemperatureResponseValue, LocalTemperature);
-      CommandResponseInfo HumidityInPercentageResponseValue =
-          new CommandResponseInfo("HumidityInPercentage", "Integer");
-      responseValues.put(HumidityInPercentageResponseValue, HumidityInPercentage);
-      CommandResponseInfo SetpointResponseValue = new CommandResponseInfo("Setpoint", "Integer");
-      responseValues.put(SetpointResponseValue, Setpoint);
-      CommandResponseInfo UnreadEntriesResponseValue =
-          new CommandResponseInfo("UnreadEntries", "Integer");
-      responseValues.put(UnreadEntriesResponseValue, UnreadEntries);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
   public static class DelegatedGetWeeklyScheduleResponseCallback
       implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback,
           DelegatedClusterCallback {
@@ -6620,63 +6576,6 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster.SecurityPolicyAttributeCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        List<ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy> valueList) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy>");
-      responseValues.put(commandResponseInfo, valueList);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
-    }
-  }
-
-  public static
-  class DelegatedThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster
-              .OperationalDatasetComponentsAttributeCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        List<ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents> valueList) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList",
-              "List<ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents>");
-      responseValues.put(commandResponseInfo, valueList);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
-    }
-  }
-
   public static
   class DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback
       implements ChipClusters.ThreadNetworkDiagnosticsCluster
@@ -7599,7 +7498,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class);
+        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
     accountLogingetSetupPINCommandParams.put(
         "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
 
@@ -7619,12 +7518,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> accountLoginloginCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class);
+        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
     accountLoginloginCommandParams.put(
         "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo);
 
     CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo =
-        new CommandParameterInfo("setupPIN", String.class);
+        new CommandParameterInfo("setupPIN", String.class, String.class);
     accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo);
 
     InteractionInfo accountLoginloginInteractionInfo =
@@ -7659,7 +7558,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", Integer.class);
+            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
     administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
         "commissioningTimeout",
         administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
@@ -7683,34 +7582,34 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", Integer.class);
+            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "commissioningTimeout",
         administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
 
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo =
-            new CommandParameterInfo("PAKEVerifier", byte[].class);
+            new CommandParameterInfo("PAKEVerifier", byte[].class, byte[].class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "PAKEVerifier",
         administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo);
 
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo =
-            new CommandParameterInfo("discriminator", Integer.class);
+            new CommandParameterInfo("discriminator", Integer.class, Integer.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "discriminator",
         administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
 
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo =
-            new CommandParameterInfo("iterations", Long.class);
+            new CommandParameterInfo("iterations", Long.class, Long.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "iterations",
         administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
 
     CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo =
-        new CommandParameterInfo("salt", byte[].class);
+        new CommandParameterInfo("salt", byte[].class, byte[].class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
 
@@ -7768,7 +7667,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class);
+        new CommandParameterInfo("data", Optional.class, byte[].class);
     applicationLauncherlaunchAppCommandParams.put(
         "data", applicationLauncherlaunchAppdataCommandParameterInfo);
 
@@ -7806,12 +7705,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     audioOutputrenameOutputCommandParams.put(
         "index", audioOutputrenameOutputindexCommandParameterInfo);
 
     CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class);
+        new CommandParameterInfo("name", String.class, String.class);
     audioOutputrenameOutputCommandParams.put(
         "name", audioOutputrenameOutputnameCommandParameterInfo);
 
@@ -7831,7 +7730,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     audioOutputselectOutputCommandParams.put(
         "index", audioOutputselectOutputindexCommandParameterInfo);
 
@@ -7851,7 +7750,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
-        new CommandParameterInfo("percentOpen", Integer.class);
+        new CommandParameterInfo("percentOpen", Integer.class, Integer.class);
     barrierControlbarrierControlGoToPercentCommandParams.put(
         "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
 
@@ -7892,12 +7791,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsdisableActionCommandParams.put(
         "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsdisableActionCommandParams.put(
         "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
 
@@ -7917,17 +7816,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsdisableActionWithDurationCommandParams.put(
         "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsdisableActionWithDurationCommandParams.put(
         "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionsdisableActionWithDurationCommandParams.put(
         "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
 
@@ -7948,12 +7847,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsenableActionCommandParams.put(
         "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsenableActionCommandParams.put(
         "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
 
@@ -7973,17 +7872,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsenableActionWithDurationCommandParams.put(
         "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsenableActionWithDurationCommandParams.put(
         "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionsenableActionWithDurationCommandParams.put(
         "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
 
@@ -8004,12 +7903,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsinstantActionCommandParams.put(
         "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsinstantActionCommandParams.put(
         "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
 
@@ -8029,18 +7928,18 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsinstantActionWithTransitionCommandParams.put(
         "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsinstantActionWithTransitionCommandParams.put(
         "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
 
     CommandParameterInfo
         bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", Integer.class);
+            new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     bridgedActionsinstantActionWithTransitionCommandParams.put(
         "transitionTime",
         bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
@@ -8062,12 +7961,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionspauseActionCommandParams.put(
         "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionspauseActionCommandParams.put(
         "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
 
@@ -8087,17 +7986,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionspauseActionWithDurationCommandParams.put(
         "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionspauseActionWithDurationCommandParams.put(
         "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionspauseActionWithDurationCommandParams.put(
         "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
 
@@ -8118,12 +8017,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsresumeActionCommandParams.put(
         "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsresumeActionCommandParams.put(
         "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
 
@@ -8143,12 +8042,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsstartActionCommandParams.put(
         "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsstartActionCommandParams.put(
         "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
 
@@ -8168,17 +8067,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsstartActionWithDurationCommandParams.put(
         "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsstartActionWithDurationCommandParams.put(
         "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionsstartActionWithDurationCommandParams.put(
         "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
 
@@ -8199,12 +8098,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsstopActionCommandParams.put(
         "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsstopActionCommandParams.put(
         "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
 
@@ -8229,7 +8128,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> channelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo channelchangeChannelmatchCommandParameterInfo =
-        new CommandParameterInfo("match", String.class);
+        new CommandParameterInfo("match", String.class, String.class);
     channelchangeChannelCommandParams.put("match", channelchangeChannelmatchCommandParameterInfo);
 
     InteractionInfo channelchangeChannelInteractionInfo =
@@ -8246,12 +8145,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo =
-        new CommandParameterInfo("majorNumber", Integer.class);
+        new CommandParameterInfo("majorNumber", Integer.class, Integer.class);
     channelchangeChannelByNumberCommandParams.put(
         "majorNumber", channelchangeChannelByNumbermajorNumberCommandParameterInfo);
 
     CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo =
-        new CommandParameterInfo("minorNumber", Integer.class);
+        new CommandParameterInfo("minorNumber", Integer.class, Integer.class);
     channelchangeChannelByNumberCommandParams.put(
         "minorNumber", channelchangeChannelByNumberminorNumberCommandParameterInfo);
 
@@ -8271,7 +8170,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> channelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo channelskipChannelcountCommandParameterInfo =
-        new CommandParameterInfo("count", Integer.class);
+        new CommandParameterInfo("count", Integer.class, Integer.class);
     channelskipChannelCommandParams.put("count", channelskipChannelcountCommandParameterInfo);
 
     InteractionInfo channelskipChannelInteractionInfo =
@@ -8289,37 +8188,37 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
-        new CommandParameterInfo("updateFlags", Integer.class);
+        new CommandParameterInfo("updateFlags", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo =
-        new CommandParameterInfo("action", Integer.class);
+        new CommandParameterInfo("action", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "action", colorControlcolorLoopSetactionCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class);
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "direction", colorControlcolorLoopSetdirectionCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo =
-        new CommandParameterInfo("time", Integer.class);
+        new CommandParameterInfo("time", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "time", colorControlcolorLoopSettimeCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo =
-        new CommandParameterInfo("startHue", Integer.class);
+        new CommandParameterInfo("startHue", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "startHue", colorControlcolorLoopSetstartHueCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
 
@@ -8344,22 +8243,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "moveMode", colorControlenhancedMoveHuemoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "rate", colorControlenhancedMoveHuerateCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
 
@@ -8381,27 +8280,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", Integer.class);
+        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class);
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "direction", colorControlenhancedMoveToHuedirectionCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
 
@@ -8424,30 +8323,30 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", Integer.class);
+        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class);
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
 
     CommandParameterInfo
         colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", Integer.class);
+            new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "transitionTime",
         colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo
         colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-            new CommandParameterInfo("optionsOverride", Integer.class);
+            new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "optionsOverride",
         colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
@@ -8472,27 +8371,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "stepMode", colorControlenhancedStepHuestepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "stepSize", colorControlenhancedStepHuestepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
 
@@ -8515,20 +8414,20 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
-        new CommandParameterInfo("rateX", Integer.class);
+        new CommandParameterInfo("rateX", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo =
-        new CommandParameterInfo("rateY", Integer.class);
+        new CommandParameterInfo("rateY", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put(
         "optionsMask", colorControlmoveColoroptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put(
         "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameterInfo);
 
@@ -8549,36 +8448,36 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
 
     CommandParameterInfo
         colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMinimumMireds",
         colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
 
     CommandParameterInfo
         colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMaximumMireds",
         colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
 
@@ -8602,21 +8501,21 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put(
         "moveMode", colorControlmoveHuemoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put(
         "optionsMask", colorControlmoveHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put(
         "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameterInfo);
 
@@ -8637,22 +8536,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "moveMode", colorControlmoveSaturationmoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "rate", colorControlmoveSaturationrateCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8674,27 +8573,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
-        new CommandParameterInfo("colorX", Integer.class);
+        new CommandParameterInfo("colorX", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "colorX", colorControlmoveToColorcolorXCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo =
-        new CommandParameterInfo("colorY", Integer.class);
+        new CommandParameterInfo("colorY", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "colorY", colorControlmoveToColorcolorYCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "transitionTime", colorControlmoveToColortransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "optionsMask", colorControlmoveToColoroptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameterInfo);
 
@@ -8717,22 +8616,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("colorTemperature", Integer.class);
+        new CommandParameterInfo("colorTemperature", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
 
@@ -8754,26 +8653,26 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
-        new CommandParameterInfo("hue", Integer.class);
+        new CommandParameterInfo("hue", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class);
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "direction", colorControlmoveToHuedirectionCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "transitionTime", colorControlmoveToHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "optionsMask", colorControlmoveToHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameterInfo);
 
@@ -8795,27 +8694,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
-        new CommandParameterInfo("hue", Integer.class);
+        new CommandParameterInfo("hue", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "hue", colorControlmoveToHueAndSaturationhueCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class);
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8838,22 +8737,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class);
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "saturation", colorControlmoveToSaturationsaturationCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8875,25 +8774,25 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
-        new CommandParameterInfo("stepX", Integer.class);
+        new CommandParameterInfo("stepX", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorstepYCommandParameterInfo =
-        new CommandParameterInfo("stepY", Integer.class);
+        new CommandParameterInfo("stepY", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put(
         "transitionTime", colorControlstepColortransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put(
         "optionsMask", colorControlstepColoroptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put(
         "optionsOverride", colorControlstepColoroptionsOverrideCommandParameterInfo);
 
@@ -8915,41 +8814,41 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "stepMode", colorControlstepColorTemperaturestepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "stepSize", colorControlstepColorTemperaturestepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo
         colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMinimumMireds",
         colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
 
     CommandParameterInfo
         colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMaximumMireds",
         colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
 
@@ -8974,27 +8873,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "stepMode", colorControlstepHuestepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "stepSize", colorControlstepHuestepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "transitionTime", colorControlstepHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "optionsMask", colorControlstepHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "optionsOverride", colorControlstepHueoptionsOverrideCommandParameterInfo);
 
@@ -9016,27 +8915,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "stepMode", colorControlstepSaturationstepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "stepSize", colorControlstepSaturationstepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "transitionTime", colorControlstepSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "optionsMask", colorControlstepSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameterInfo);
 
@@ -9059,12 +8958,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstopMoveStepCommandParams.put(
         "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstopMoveStepCommandParams.put(
         "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
 
@@ -9086,12 +8985,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo =
-        new CommandParameterInfo("autoPlay", Boolean.class);
+        new CommandParameterInfo("autoPlay", Boolean.class, Boolean.class);
     contentLauncherlaunchContentCommandParams.put(
         "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo);
 
     CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class);
+        new CommandParameterInfo("data", Optional.class, String.class);
     contentLauncherlaunchContentCommandParams.put(
         "data", contentLauncherlaunchContentdataCommandParameterInfo);
 
@@ -9113,12 +9012,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo =
-        new CommandParameterInfo("contentURL", String.class);
+        new CommandParameterInfo("contentURL", String.class, String.class);
     contentLauncherlaunchURLCommandParams.put(
         "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo);
 
     CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo =
-        new CommandParameterInfo("displayString", Optional.class);
+        new CommandParameterInfo("displayString", Optional.class, String.class);
     contentLauncherlaunchURLCommandParams.put(
         "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo);
 
@@ -9144,19 +9043,19 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
-        new CommandParameterInfo("intent", Integer.class);
+        new CommandParameterInfo("intent", Integer.class, Integer.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "intent", diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
 
     CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo =
-        new CommandParameterInfo("requestedProtocol", Integer.class);
+        new CommandParameterInfo("requestedProtocol", Integer.class, Integer.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "requestedProtocol",
         diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
 
     CommandParameterInfo
         diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo =
-            new CommandParameterInfo("transferFileDesignator", byte[].class);
+            new CommandParameterInfo("transferFileDesignator", byte[].class, byte[].class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "transferFileDesignator",
         diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
@@ -9195,7 +9094,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class);
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
     doorLockclearHolidayScheduleCommandParams.put(
         "holidayIndex", doorLockclearHolidayScheduleholidayIndexCommandParameterInfo);
 
@@ -9214,7 +9113,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockclearUserCommandParams.put("userIndex", doorLockclearUseruserIndexCommandParameterInfo);
 
     InteractionInfo doorLockclearUserInteractionInfo =
@@ -9232,12 +9131,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class);
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
     doorLockclearWeekDayScheduleCommandParams.put(
         "weekDayIndex", doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockclearWeekDayScheduleCommandParams.put(
         "userIndex", doorLockclearWeekDayScheduleuserIndexCommandParameterInfo);
 
@@ -9257,12 +9156,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class);
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
     doorLockclearYearDayScheduleCommandParams.put(
         "yearDayIndex", doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockclearYearDayScheduleCommandParams.put(
         "userIndex", doorLockclearYearDayScheduleuserIndexCommandParameterInfo);
 
@@ -9296,7 +9195,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class);
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
     doorLockgetHolidayScheduleCommandParams.put(
         "holidayIndex", doorLockgetHolidayScheduleholidayIndexCommandParameterInfo);
 
@@ -9315,7 +9214,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockgetUserCommandParams.put("userIndex", doorLockgetUseruserIndexCommandParameterInfo);
 
     InteractionInfo doorLockgetUserInteractionInfo =
@@ -9332,12 +9231,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class);
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
     doorLockgetWeekDayScheduleCommandParams.put(
         "weekDayIndex", doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockgetWeekDayScheduleCommandParams.put(
         "userIndex", doorLockgetWeekDayScheduleuserIndexCommandParameterInfo);
 
@@ -9357,12 +9256,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class);
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
     doorLockgetYearDayScheduleCommandParams.put(
         "yearDayIndex", doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockgetYearDayScheduleCommandParams.put(
         "userIndex", doorLockgetYearDayScheduleuserIndexCommandParameterInfo);
 
@@ -9382,7 +9281,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class);
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
     doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo);
 
     InteractionInfo doorLocklockDoorInteractionInfo =
@@ -9400,27 +9299,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetCredentialCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetCredentialoperationTypeCommandParameterInfo =
-        new CommandParameterInfo("operationType", Integer.class);
+        new CommandParameterInfo("operationType", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "operationType", doorLocksetCredentialoperationTypeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialcredentialDataCommandParameterInfo =
-        new CommandParameterInfo("credentialData", byte[].class);
+        new CommandParameterInfo("credentialData", byte[].class, byte[].class);
     doorLocksetCredentialCommandParams.put(
         "credentialData", doorLocksetCredentialcredentialDataCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "userIndex", doorLocksetCredentialuserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialuserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", Integer.class);
+        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "userStatus", doorLocksetCredentialuserStatusCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialuserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", Integer.class);
+        new CommandParameterInfo("userType", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "userType", doorLocksetCredentialuserTypeCommandParameterInfo);
 
@@ -9444,22 +9343,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class);
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "holidayIndex", doorLocksetHolidayScheduleholidayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", Long.class);
+        new CommandParameterInfo("localStartTime", Long.class, Long.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", Long.class);
+        new CommandParameterInfo("localEndTime", Long.class, Long.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo =
-        new CommandParameterInfo("operatingMode", Integer.class);
+        new CommandParameterInfo("operatingMode", Integer.class, Integer.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "operatingMode", doorLocksetHolidayScheduleoperatingModeCommandParameterInfo);
 
@@ -9481,33 +9380,33 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetUseroperationTypeCommandParameterInfo =
-        new CommandParameterInfo("operationType", Integer.class);
+        new CommandParameterInfo("operationType", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put(
         "operationType", doorLocksetUseroperationTypeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put("userIndex", doorLocksetUseruserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserNameCommandParameterInfo =
-        new CommandParameterInfo("userName", String.class);
+        new CommandParameterInfo("userName", String.class, String.class);
     doorLocksetUserCommandParams.put("userName", doorLocksetUseruserNameCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserUniqueIdCommandParameterInfo =
-        new CommandParameterInfo("userUniqueId", Long.class);
+        new CommandParameterInfo("userUniqueId", Long.class, Long.class);
     doorLocksetUserCommandParams.put(
         "userUniqueId", doorLocksetUseruserUniqueIdCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", Integer.class);
+        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put("userStatus", doorLocksetUseruserStatusCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", Integer.class);
+        new CommandParameterInfo("userType", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put("userType", doorLocksetUseruserTypeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUsercredentialRuleCommandParameterInfo =
-        new CommandParameterInfo("credentialRule", Integer.class);
+        new CommandParameterInfo("credentialRule", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put(
         "credentialRule", doorLocksetUsercredentialRuleCommandParameterInfo);
 
@@ -9532,37 +9431,37 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class);
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "weekDayIndex", doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "userIndex", doorLocksetWeekDayScheduleuserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo =
-        new CommandParameterInfo("daysMask", Integer.class);
+        new CommandParameterInfo("daysMask", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "daysMask", doorLocksetWeekDayScheduledaysMaskCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo =
-        new CommandParameterInfo("startHour", Integer.class);
+        new CommandParameterInfo("startHour", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "startHour", doorLocksetWeekDaySchedulestartHourCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo =
-        new CommandParameterInfo("startMinute", Integer.class);
+        new CommandParameterInfo("startMinute", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "startMinute", doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo =
-        new CommandParameterInfo("endHour", Integer.class);
+        new CommandParameterInfo("endHour", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "endHour", doorLocksetWeekDayScheduleendHourCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo =
-        new CommandParameterInfo("endMinute", Integer.class);
+        new CommandParameterInfo("endMinute", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "endMinute", doorLocksetWeekDayScheduleendMinuteCommandParameterInfo);
 
@@ -9587,22 +9486,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class);
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "yearDayIndex", doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "userIndex", doorLocksetYearDayScheduleuserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", Long.class);
+        new CommandParameterInfo("localStartTime", Long.class, Long.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "localStartTime", doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", Long.class);
+        new CommandParameterInfo("localEndTime", Long.class, Long.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "localEndTime", doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo);
 
@@ -9624,7 +9523,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class);
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
     doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo);
 
     InteractionInfo doorLockunlockDoorInteractionInfo =
@@ -9642,12 +9541,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo =
-        new CommandParameterInfo("timeout", Integer.class);
+        new CommandParameterInfo("timeout", Integer.class, Integer.class);
     doorLockunlockWithTimeoutCommandParams.put(
         "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo);
 
     CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class);
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
     doorLockunlockWithTimeoutCommandParams.put(
         "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo);
 
@@ -9696,13 +9595,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo =
-        new CommandParameterInfo("expiryLengthSeconds", Integer.class);
+        new CommandParameterInfo("expiryLengthSeconds", Integer.class, Integer.class);
     generalCommissioningarmFailSafeCommandParams.put(
         "expiryLengthSeconds",
         generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
 
     CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Long.class);
+        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
     generalCommissioningarmFailSafeCommandParams.put(
         "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
 
@@ -9739,18 +9638,18 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo =
-            new CommandParameterInfo("newRegulatoryConfig", Integer.class);
+            new CommandParameterInfo("newRegulatoryConfig", Integer.class, Integer.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "newRegulatoryConfig",
         generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo);
 
     CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo =
-        new CommandParameterInfo("countryCode", String.class);
+        new CommandParameterInfo("countryCode", String.class, String.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
 
     CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Long.class);
+        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
 
@@ -9772,13 +9671,38 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     commandMap.put("generalCommissioning", generalCommissioningClusterInteractionInfoMap);
     Map<String, InteractionInfo> generalDiagnosticsClusterInteractionInfoMap =
         new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> generalDiagnosticstestEventTriggerCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo =
+        new CommandParameterInfo("enableKey", byte[].class, byte[].class);
+    generalDiagnosticstestEventTriggerCommandParams.put(
+        "enableKey", generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo);
+
+    CommandParameterInfo generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo =
+        new CommandParameterInfo("eventTrigger", Long.class, Long.class);
+    generalDiagnosticstestEventTriggerCommandParams.put(
+        "eventTrigger", generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo);
+
+    InteractionInfo generalDiagnosticstestEventTriggerInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .testEventTrigger(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("enableKey"),
+                      (Long) commandArguments.get("eventTrigger"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            generalDiagnosticstestEventTriggerCommandParams);
+    generalDiagnosticsClusterInteractionInfoMap.put(
+        "testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo);
     commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap);
     Map<String, InteractionInfo> groupKeyManagementClusterInteractionInfoMap =
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetID", Integer.class);
+        new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
     groupKeyManagementkeySetReadCommandParams.put(
         "groupKeySetID", groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo);
 
@@ -9797,7 +9721,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadAllIndicesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetIDs", ArrayList.class);
+        new CommandParameterInfo("groupKeySetIDs", ArrayList.class, Object.class);
     groupKeyManagementkeySetReadAllIndicesCommandParams.put(
         "groupKeySetIDs", groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo);
 
@@ -9817,7 +9741,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupKeyManagementkeySetRemoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetID", Integer.class);
+        new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
     groupKeyManagementkeySetRemoveCommandParams.put(
         "groupKeySetID", groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo);
 
@@ -9853,11 +9777,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
 
     CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class);
+        new CommandParameterInfo("groupName", String.class, String.class);
     groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameterInfo);
 
     InteractionInfo groupsaddGroupInteractionInfo =
@@ -9875,12 +9799,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsaddGroupIfIdentifyingCommandParams.put(
         "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
 
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class);
+        new CommandParameterInfo("groupName", String.class, String.class);
     groupsaddGroupIfIdentifyingCommandParams.put(
         "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
 
@@ -9900,7 +9824,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo =
-        new CommandParameterInfo("groupList", ArrayList.class);
+        new CommandParameterInfo("groupList", ArrayList.class, Object.class);
     groupsgetGroupMembershipCommandParams.put(
         "groupList", groupsgetGroupMembershipgroupListCommandParameterInfo);
 
@@ -9930,7 +9854,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
 
     InteractionInfo groupsremoveGroupInteractionInfo =
@@ -9947,7 +9871,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
 
     InteractionInfo groupsviewGroupInteractionInfo =
@@ -9966,7 +9890,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> identifyidentifyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
-        new CommandParameterInfo("identifyTime", Integer.class);
+        new CommandParameterInfo("identifyTime", Integer.class, Integer.class);
     identifyidentifyCommandParams.put(
         "identifyTime", identifyidentifyidentifyTimeCommandParameterInfo);
 
@@ -9984,12 +9908,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
-        new CommandParameterInfo("effectIdentifier", Integer.class);
+        new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
     identifytriggerEffectCommandParams.put(
         "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameterInfo);
 
     CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", Integer.class);
+        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
     identifytriggerEffectCommandParams.put(
         "effectVariant", identifytriggerEffecteffectVariantCommandParameterInfo);
 
@@ -10013,7 +9937,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo =
-        new CommandParameterInfo("keyCode", Integer.class);
+        new CommandParameterInfo("keyCode", Integer.class, Integer.class);
     keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo);
 
     InteractionInfo keypadInputsendKeyInteractionInfo =
@@ -10032,19 +9956,19 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameterInfo);
 
     CommandParameterInfo levelControlmoverateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlmoveCommandParams.put(
         "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
 
@@ -10065,22 +9989,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
-        new CommandParameterInfo("level", Integer.class);
+        new CommandParameterInfo("level", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "level", levelControlmoveToLevellevelCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
 
@@ -10102,12 +10026,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
-        new CommandParameterInfo("level", Integer.class);
+        new CommandParameterInfo("level", Integer.class, Integer.class);
     levelControlmoveToLevelWithOnOffCommandParams.put(
         "level", levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlmoveToLevelWithOnOffCommandParams.put(
         "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
 
@@ -10127,12 +10051,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     levelControlmoveWithOnOffCommandParams.put(
         "moveMode", levelControlmoveWithOnOffmoveModeCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     levelControlmoveWithOnOffCommandParams.put(
         "rate", levelControlmoveWithOnOffrateCommandParameterInfo);
 
@@ -10152,24 +10076,24 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameterInfo);
 
     CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlstepCommandParams.put(
         "transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlstepCommandParams.put(
         "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
 
@@ -10191,17 +10115,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     levelControlstepWithOnOffCommandParams.put(
         "stepMode", levelControlstepWithOnOffstepModeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     levelControlstepWithOnOffCommandParams.put(
         "stepSize", levelControlstepWithOnOffstepSizeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlstepWithOnOffCommandParams.put(
         "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
 
@@ -10222,11 +10146,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlstopCommandParams.put(
         "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
 
@@ -10286,11 +10210,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo);
 
     CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class);
+        new CommandParameterInfo("name", String.class, String.class);
     mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo);
 
     InteractionInfo mediaInputrenameInputInteractionInfo =
@@ -10308,7 +10232,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo);
 
     InteractionInfo mediaInputselectInputInteractionInfo =
@@ -10406,7 +10330,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaPlaybackseekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaPlaybackseekpositionCommandParameterInfo =
-        new CommandParameterInfo("position", Long.class);
+        new CommandParameterInfo("position", Long.class, Long.class);
     mediaPlaybackseekCommandParams.put("position", mediaPlaybackseekpositionCommandParameterInfo);
 
     InteractionInfo mediaPlaybackseekInteractionInfo =
@@ -10423,7 +10347,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaPlaybackskipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo =
-        new CommandParameterInfo("deltaPositionMilliseconds", Long.class);
+        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
     mediaPlaybackskipBackwardCommandParams.put(
         "deltaPositionMilliseconds",
         mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo);
@@ -10443,7 +10367,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaPlaybackskipForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo =
-        new CommandParameterInfo("deltaPositionMilliseconds", Long.class);
+        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
     mediaPlaybackskipForwardCommandParams.put(
         "deltaPositionMilliseconds",
         mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo);
@@ -10489,7 +10413,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo =
-        new CommandParameterInfo("newMode", Integer.class);
+        new CommandParameterInfo("newMode", Integer.class, Integer.class);
     modeSelectchangeToModeCommandParams.put(
         "newMode", modeSelectchangeToModenewModeCommandParameterInfo);
 
@@ -10510,14 +10434,14 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo =
-            new CommandParameterInfo("operationalDataset", byte[].class);
+            new CommandParameterInfo("operationalDataset", byte[].class, byte[].class);
     networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
         "operationalDataset",
         networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo);
 
     CommandParameterInfo
         networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo =
-            new CommandParameterInfo("breadcrumb", Optional.class);
+            new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
         "breadcrumb", networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo);
 
@@ -10538,17 +10462,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", byte[].class);
+        new CommandParameterInfo("ssid", byte[].class, byte[].class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
         "ssid", networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo =
-        new CommandParameterInfo("credentials", byte[].class);
+        new CommandParameterInfo("credentials", byte[].class, byte[].class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
         "credentials", networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
         "breadcrumb", networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
 
@@ -10570,12 +10494,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningconnectNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningconnectNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
     networkCommissioningconnectNetworkCommandParams.put(
         "networkID", networkCommissioningconnectNetworknetworkIDCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningconnectNetworkCommandParams.put(
         "breadcrumb", networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo);
 
@@ -10596,12 +10520,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
     networkCommissioningremoveNetworkCommandParams.put(
         "networkID", networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningremoveNetworkCommandParams.put(
         "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
 
@@ -10622,17 +10546,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningreorderNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningreorderNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
     networkCommissioningreorderNetworkCommandParams.put(
         "networkID", networkCommissioningreorderNetworknetworkIDCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningreorderNetworknetworkIndexCommandParameterInfo =
-        new CommandParameterInfo("networkIndex", Integer.class);
+        new CommandParameterInfo("networkIndex", Integer.class, Integer.class);
     networkCommissioningreorderNetworkCommandParams.put(
         "networkIndex", networkCommissioningreorderNetworknetworkIndexCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningreorderNetworkCommandParams.put(
         "breadcrumb", networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo);
 
@@ -10654,12 +10578,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", Optional.class);
+        new CommandParameterInfo("ssid", Optional.class, byte[].class);
     networkCommissioningscanNetworksCommandParams.put(
         "ssid", networkCommissioningscanNetworksssidCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningscanNetworksCommandParams.put(
         "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
 
@@ -10684,12 +10608,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class);
+            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
     otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
         "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo =
-        new CommandParameterInfo("newVersion", Long.class);
+        new CommandParameterInfo("newVersion", Long.class, Long.class);
     otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
         "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
 
@@ -10711,13 +10635,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class);
+            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
     otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
         "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo =
-            new CommandParameterInfo("softwareVersion", Long.class);
+            new CommandParameterInfo("softwareVersion", Long.class, Long.class);
     otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
         "softwareVersion",
         otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
@@ -10738,46 +10662,46 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", Integer.class);
+        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo =
-        new CommandParameterInfo("productId", Integer.class);
+        new CommandParameterInfo("productId", Integer.class, Integer.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo =
-        new CommandParameterInfo("softwareVersion", Long.class);
+        new CommandParameterInfo("softwareVersion", Long.class, Long.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo =
-        new CommandParameterInfo("protocolsSupported", ArrayList.class);
+        new CommandParameterInfo("protocolsSupported", ArrayList.class, Object.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "protocolsSupported",
         otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo =
-        new CommandParameterInfo("hardwareVersion", Optional.class);
+        new CommandParameterInfo("hardwareVersion", Optional.class, Integer.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo =
-        new CommandParameterInfo("location", Optional.class);
+        new CommandParameterInfo("location", Optional.class, String.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo =
-            new CommandParameterInfo("requestorCanConsent", Optional.class);
+            new CommandParameterInfo("requestorCanConsent", Optional.class, Boolean.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "requestorCanConsent",
         otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo =
-            new CommandParameterInfo("metadataForProvider", Optional.class);
+            new CommandParameterInfo("metadataForProvider", Optional.class, byte[].class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "metadataForProvider",
         otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
@@ -10809,32 +10733,32 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo =
-            new CommandParameterInfo("providerNodeId", Long.class);
+            new CommandParameterInfo("providerNodeId", Long.class, Long.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "providerNodeId",
         otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", Integer.class);
+        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo =
-            new CommandParameterInfo("announcementReason", Integer.class);
+            new CommandParameterInfo("announcementReason", Integer.class, Integer.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "announcementReason",
         otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo =
-            new CommandParameterInfo("metadataForNode", Optional.class);
+            new CommandParameterInfo("metadataForNode", Optional.class, byte[].class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "metadataForNode",
         otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo =
-        new CommandParameterInfo("endpoint", Integer.class);
+        new CommandParameterInfo("endpoint", Integer.class, Integer.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "endpoint", otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo);
 
@@ -10872,11 +10796,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
-        new CommandParameterInfo("effectId", Integer.class);
+        new CommandParameterInfo("effectId", Integer.class, Integer.class);
     onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo);
 
     CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", Integer.class);
+        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
     onOffoffWithEffectCommandParams.put(
         "effectVariant", onOffoffWithEffecteffectVariantCommandParameterInfo);
 
@@ -10917,16 +10841,16 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
-        new CommandParameterInfo("onOffControl", Integer.class);
+        new CommandParameterInfo("onOffControl", Integer.class, Integer.class);
     onOffonWithTimedOffCommandParams.put(
         "onOffControl", onOffonWithTimedOffonOffControlCommandParameterInfo);
 
     CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo =
-        new CommandParameterInfo("onTime", Integer.class);
+        new CommandParameterInfo("onTime", Integer.class, Integer.class);
     onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameterInfo);
 
     CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo =
-        new CommandParameterInfo("offWaitTime", Integer.class);
+        new CommandParameterInfo("offWaitTime", Integer.class, Integer.class);
     onOffonWithTimedOffCommandParams.put(
         "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
 
@@ -10962,27 +10886,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class);
+        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
         "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", Optional.class);
+        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
         "ICACValue", operationalCredentialsaddNOCICACValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo =
-        new CommandParameterInfo("IPKValue", byte[].class);
+        new CommandParameterInfo("IPKValue", byte[].class, byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
         "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameterInfo);
 
-    CommandParameterInfo operationalCredentialsaddNOCcaseAdminNodeCommandParameterInfo =
-        new CommandParameterInfo("caseAdminNode", Long.class);
+    CommandParameterInfo operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo =
+        new CommandParameterInfo("caseAdminSubject", Long.class, Long.class);
     operationalCredentialsaddNOCCommandParams.put(
-        "caseAdminNode", operationalCredentialsaddNOCcaseAdminNodeCommandParameterInfo);
+        "caseAdminSubject", operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo =
-        new CommandParameterInfo("adminVendorId", Integer.class);
+        new CommandParameterInfo("adminVendorId", Integer.class, Integer.class);
     operationalCredentialsaddNOCCommandParams.put(
         "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
 
@@ -10995,7 +10919,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("NOCValue"),
                       (Optional<byte[]>) commandArguments.get("ICACValue"),
                       (byte[]) commandArguments.get("IPKValue"),
-                      (Long) commandArguments.get("caseAdminNode"),
+                      (Long) commandArguments.get("caseAdminSubject"),
                       (Integer) commandArguments.get("adminVendorId"));
             },
             () -> new DelegatedNOCResponseCallback(),
@@ -11006,7 +10930,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo =
-            new CommandParameterInfo("rootCertificate", byte[].class);
+            new CommandParameterInfo("rootCertificate", byte[].class, byte[].class);
     operationalCredentialsaddTrustedRootCertificateCommandParams.put(
         "rootCertificate",
         operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo);
@@ -11028,7 +10952,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         operationalCredentialsattestationRequestattestationNonceCommandParameterInfo =
-            new CommandParameterInfo("attestationNonce", byte[].class);
+            new CommandParameterInfo("attestationNonce", byte[].class, byte[].class);
     operationalCredentialsattestationRequestCommandParams.put(
         "attestationNonce",
         operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
@@ -11049,17 +10973,23 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsCSRRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsCSRRequestCSRNonceCommandParameterInfo =
-        new CommandParameterInfo("CSRNonce", byte[].class);
+        new CommandParameterInfo("CSRNonce", byte[].class, byte[].class);
     operationalCredentialsCSRRequestCommandParams.put(
         "CSRNonce", operationalCredentialsCSRRequestCSRNonceCommandParameterInfo);
 
+    CommandParameterInfo operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo =
+        new CommandParameterInfo("isForUpdateNOC", Optional.class, Boolean.class);
+    operationalCredentialsCSRRequestCommandParams.put(
+        "isForUpdateNOC", operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo);
+
     InteractionInfo operationalCredentialsCSRRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.OperationalCredentialsCluster) cluster)
                   .CSRRequest(
                       (ChipClusters.OperationalCredentialsCluster.CSRResponseCallback) callback,
-                      (byte[]) commandArguments.get("CSRNonce"));
+                      (byte[]) commandArguments.get("CSRNonce"),
+                      (Optional<Boolean>) commandArguments.get("isForUpdateNOC"));
             },
             () -> new DelegatedCSRResponseCallback(),
             operationalCredentialsCSRRequestCommandParams);
@@ -11069,7 +10999,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo =
-            new CommandParameterInfo("certificateType", Integer.class);
+            new CommandParameterInfo("certificateType", Integer.class, Integer.class);
     operationalCredentialscertificateChainRequestCommandParams.put(
         "certificateType",
         operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
@@ -11090,7 +11020,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo =
-        new CommandParameterInfo("fabricIndex", Integer.class);
+        new CommandParameterInfo("fabricIndex", Integer.class, Integer.class);
     operationalCredentialsremoveFabricCommandParams.put(
         "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
 
@@ -11106,33 +11036,10 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             operationalCredentialsremoveFabricCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "removeFabric", operationalCredentialsremoveFabricInteractionInfo);
-    Map<String, CommandParameterInfo>
-        operationalCredentialsremoveTrustedRootCertificateCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameterInfo =
-            new CommandParameterInfo("trustedRootIdentifier", byte[].class);
-    operationalCredentialsremoveTrustedRootCertificateCommandParams.put(
-        "trustedRootIdentifier",
-        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsremoveTrustedRootCertificateInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .removeTrustedRootCertificate(
-                      (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("trustedRootIdentifier"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentialsremoveTrustedRootCertificateCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "removeTrustedRootCertificate",
-        operationalCredentialsremoveTrustedRootCertificateInteractionInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo =
-        new CommandParameterInfo("label", String.class);
+        new CommandParameterInfo("label", String.class, String.class);
     operationalCredentialsupdateFabricLabelCommandParams.put(
         "label", operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
 
@@ -11151,12 +11058,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class);
+        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
     operationalCredentialsupdateNOCCommandParams.put(
         "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", Optional.class);
+        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
     operationalCredentialsupdateNOCCommandParams.put(
         "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameterInfo);
 
@@ -11194,20 +11101,20 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo);
 
     CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     scenesaddSceneCommandParams.put(
         "transitionTime", scenesaddScenetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo =
-        new CommandParameterInfo("sceneName", String.class);
+        new CommandParameterInfo("sceneName", String.class, String.class);
     scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameterInfo);
 
     InteractionInfo scenesaddSceneInteractionInfo =
@@ -11229,7 +11136,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesgetSceneMembershipCommandParams.put(
         "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo);
 
@@ -11248,15 +11155,15 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo);
 
     CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Optional.class);
+        new CommandParameterInfo("transitionTime", Optional.class, Integer.class);
     scenesrecallSceneCommandParams.put(
         "transitionTime", scenesrecallScenetransitionTimeCommandParameterInfo);
 
@@ -11276,7 +11183,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesremoveAllScenesCommandParams.put(
         "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo);
 
@@ -11294,11 +11201,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo);
 
     InteractionInfo scenesremoveSceneInteractionInfo =
@@ -11316,11 +11223,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo);
 
     InteractionInfo scenesstoreSceneInteractionInfo =
@@ -11338,11 +11245,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo);
 
     InteractionInfo scenesviewSceneInteractionInfo =
@@ -11379,12 +11286,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo =
-        new CommandParameterInfo("target", Integer.class);
+        new CommandParameterInfo("target", Integer.class, Integer.class);
     targetNavigatornavigateTargetCommandParams.put(
         "target", targetNavigatornavigateTargettargetCommandParameterInfo);
 
     CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class);
+        new CommandParameterInfo("data", Optional.class, String.class);
     targetNavigatornavigateTargetCommandParams.put(
         "data", targetNavigatornavigateTargetdataCommandParameterInfo);
 
@@ -11433,12 +11340,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestAddArgumentsarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class);
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
     testClustertestAddArgumentsCommandParams.put(
         "arg1", testClustertestAddArgumentsarg1CommandParameterInfo);
 
     CommandParameterInfo testClustertestAddArgumentsarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class);
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
     testClustertestAddArgumentsCommandParams.put(
         "arg2", testClustertestAddArgumentsarg2CommandParameterInfo);
 
@@ -11458,17 +11365,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestEmitTestEventRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestEmitTestEventRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class);
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
     testClustertestEmitTestEventRequestCommandParams.put(
         "arg1", testClustertestEmitTestEventRequestarg1CommandParameterInfo);
 
     CommandParameterInfo testClustertestEmitTestEventRequestarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class);
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
     testClustertestEmitTestEventRequestCommandParams.put(
         "arg2", testClustertestEmitTestEventRequestarg2CommandParameterInfo);
 
     CommandParameterInfo testClustertestEmitTestEventRequestarg3CommandParameterInfo =
-        new CommandParameterInfo("arg3", Boolean.class);
+        new CommandParameterInfo("arg3", Boolean.class, Boolean.class);
     testClustertestEmitTestEventRequestCommandParams.put(
         "arg3", testClustertestEmitTestEventRequestarg3CommandParameterInfo);
 
@@ -11489,12 +11396,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestEnumsRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class);
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
     testClustertestEnumsRequestCommandParams.put(
         "arg1", testClustertestEnumsRequestarg1CommandParameterInfo);
 
     CommandParameterInfo testClustertestEnumsRequestarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class);
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
     testClustertestEnumsRequestCommandParams.put(
         "arg2", testClustertestEnumsRequestarg2CommandParameterInfo);
 
@@ -11514,7 +11421,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", ArrayList.class);
+        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
     testClustertestListInt8UArgumentRequestCommandParams.put(
         "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameterInfo);
 
@@ -11533,7 +11440,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestListInt8UReverseRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", ArrayList.class);
+        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
     testClustertestListInt8UReverseRequestCommandParams.put(
         "arg1", testClustertestListInt8UReverseRequestarg1CommandParameterInfo);
 
@@ -11628,7 +11535,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestNullableOptionalRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Optional.class);
+        new CommandParameterInfo("arg1", Optional.class, Integer.class);
     testClustertestNullableOptionalRequestCommandParams.put(
         "arg1", testClustertestNullableOptionalRequestarg1CommandParameterInfo);
 
@@ -11648,7 +11555,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestSimpleOptionalArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Optional.class);
+        new CommandParameterInfo("arg1", Optional.class, Boolean.class);
     testClustertestSimpleOptionalArgumentRequestCommandParams.put(
         "arg1", testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo);
 
@@ -11730,28 +11637,15 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             thermostatclearWeeklyScheduleCommandParams);
     thermostatClusterInteractionInfoMap.put(
         "clearWeeklySchedule", thermostatclearWeeklyScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> thermostatgetRelayStatusLogCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo thermostatgetRelayStatusLogInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .getRelayStatusLog(
-                      (ChipClusters.ThermostatCluster.GetRelayStatusLogResponseCallback) callback);
-            },
-            () -> new DelegatedGetRelayStatusLogResponseCallback(),
-            thermostatgetRelayStatusLogCommandParams);
-    thermostatClusterInteractionInfoMap.put(
-        "getRelayStatusLog", thermostatgetRelayStatusLogInteractionInfo);
     Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
-        new CommandParameterInfo("daysToReturn", Integer.class);
+        new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
     thermostatgetWeeklyScheduleCommandParams.put(
         "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
 
     CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo =
-        new CommandParameterInfo("modeToReturn", Integer.class);
+        new CommandParameterInfo("modeToReturn", Integer.class, Integer.class);
     thermostatgetWeeklyScheduleCommandParams.put(
         "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
 
@@ -11772,19 +11666,20 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo =
-            new CommandParameterInfo("numberOfTransitionsForSequence", Integer.class);
+            new CommandParameterInfo(
+                "numberOfTransitionsForSequence", Integer.class, Integer.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "numberOfTransitionsForSequence",
         thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
 
     CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo =
-        new CommandParameterInfo("dayOfWeekForSequence", Integer.class);
+        new CommandParameterInfo("dayOfWeekForSequence", Integer.class, Integer.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "dayOfWeekForSequence",
         thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
 
     CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo =
-        new CommandParameterInfo("modeForSequence", Integer.class);
+        new CommandParameterInfo("modeForSequence", Integer.class, Integer.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
 
@@ -11807,12 +11702,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
-        new CommandParameterInfo("mode", Integer.class);
+        new CommandParameterInfo("mode", Integer.class, Integer.class);
     thermostatsetpointRaiseLowerCommandParams.put(
         "mode", thermostatsetpointRaiseLowermodeCommandParameterInfo);
 
     CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo =
-        new CommandParameterInfo("amount", Integer.class);
+        new CommandParameterInfo("amount", Integer.class, Integer.class);
     thermostatsetpointRaiseLowerCommandParams.put(
         "amount", thermostatsetpointRaiseLoweramountCommandParameterInfo);
 
@@ -11891,7 +11786,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("liftPercent100thsValue", Integer.class);
+            new CommandParameterInfo("liftPercent100thsValue", Integer.class, Integer.class);
     windowCoveringgoToLiftPercentageCommandParams.put(
         "liftPercent100thsValue",
         windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
@@ -11911,7 +11806,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
-        new CommandParameterInfo("liftValue", Integer.class);
+        new CommandParameterInfo("liftValue", Integer.class, Integer.class);
     windowCoveringgoToLiftValueCommandParams.put(
         "liftValue", windowCoveringgoToLiftValueliftValueCommandParameterInfo);
 
@@ -11931,7 +11826,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("tiltPercent100thsValue", Integer.class);
+            new CommandParameterInfo("tiltPercent100thsValue", Integer.class, Integer.class);
     windowCoveringgoToTiltPercentageCommandParams.put(
         "tiltPercent100thsValue",
         windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
@@ -11951,7 +11846,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
-        new CommandParameterInfo("tiltValue", Integer.class);
+        new CommandParameterInfo("tiltValue", Integer.class, Integer.class);
     windowCoveringgoToTiltValueCommandParams.put(
         "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index 255e855811356e..cec82839d68ac5 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -4478,6 +4478,20 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
     readGeneralDiagnosticsInteractionInfo.put(
         "readActiveNetworkFaultsAttribute",
         readGeneralDiagnosticsActiveNetworkFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsTestEventTriggersEnabledCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readTestEventTriggersEnabledAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readGeneralDiagnosticsTestEventTriggersEnabledCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readTestEventTriggersEnabledAttribute",
+        readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo);
     Map<String, CommandParameterInfo> readGeneralDiagnosticsGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     InteractionInfo readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo =
@@ -10354,7 +10368,9 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readPartitionIdAttribute((ChipClusters.LongAttributeCallback) callback);
+                  .readPartitionIdAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.PartitionIdAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
             readThreadNetworkDiagnosticsPartitionIdCommandParams);
@@ -10367,7 +10383,9 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readWeightingAttribute((ChipClusters.IntegerAttributeCallback) callback);
+                  .readWeightingAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.WeightingAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
             readThreadNetworkDiagnosticsWeightingCommandParams);
@@ -10379,7 +10397,9 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readDataVersionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+                  .readDataVersionAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.DataVersionAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
             readThreadNetworkDiagnosticsDataVersionCommandParams);
@@ -10392,7 +10412,10 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readStableDataVersionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+                  .readStableDataVersionAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .StableDataVersionAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
             readThreadNetworkDiagnosticsStableDataVersionCommandParams);
@@ -10405,7 +10428,9 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readLeaderRouterIdAttribute((ChipClusters.IntegerAttributeCallback) callback);
+                  .readLeaderRouterIdAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.LeaderRouterIdAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
             readThreadNetworkDiagnosticsLeaderRouterIdCommandParams);
@@ -10990,7 +11015,10 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readActiveTimestampAttribute((ChipClusters.LongAttributeCallback) callback);
+                  .readActiveTimestampAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .ActiveTimestampAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
             readThreadNetworkDiagnosticsActiveTimestampCommandParams);
@@ -11003,7 +11031,10 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readPendingTimestampAttribute((ChipClusters.LongAttributeCallback) callback);
+                  .readPendingTimestampAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .PendingTimestampAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
             readThreadNetworkDiagnosticsPendingTimestampCommandParams);
@@ -11016,62 +11047,29 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readDelayAttribute((ChipClusters.LongAttributeCallback) callback);
+                  .readDelayAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.DelayAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
             readThreadNetworkDiagnosticsDelayCommandParams);
     readThreadNetworkDiagnosticsInteractionInfo.put(
         "readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsSecurityPolicyCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsSecurityPolicyAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readSecurityPolicyAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.SecurityPolicyAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallback(),
-            readThreadNetworkDiagnosticsSecurityPolicyCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readSecurityPolicyAttribute",
-        readThreadNetworkDiagnosticsSecurityPolicyAttributeInteractionInfo);
     Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelMaskCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     InteractionInfo readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readChannelMaskAttribute((ChipClusters.OctetStringAttributeCallback) callback);
+                  .readChannelMaskAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelMaskAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
             readThreadNetworkDiagnosticsChannelMaskCommandParams);
     readThreadNetworkDiagnosticsInteractionInfo.put(
         "readChannelMaskAttribute",
         readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsOperationalDatasetComponentsCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                      .readOperationalDatasetComponentsAttribute(
-                          (ChipClusters.ThreadNetworkDiagnosticsCluster
-                                  .OperationalDatasetComponentsAttributeCallback)
-                              callback);
-                },
-                () ->
-                    new ClusterInfoMapping
-                        .DelegatedThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallback(),
-                readThreadNetworkDiagnosticsOperationalDatasetComponentsCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readOperationalDatasetComponentsAttribute",
-        readThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeInteractionInfo);
     Map<String, CommandParameterInfo>
         readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
@@ -11764,6 +11762,34 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
             readWindowCoveringTypeCommandParams);
     readWindowCoveringInteractionInfo.put(
         "readTypeAttribute", readWindowCoveringTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringPhysicalClosedLimitLiftCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readPhysicalClosedLimitLiftAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringPhysicalClosedLimitLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readPhysicalClosedLimitLiftAttribute",
+        readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringPhysicalClosedLimitTiltCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readPhysicalClosedLimitTiltAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringPhysicalClosedLimitTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readPhysicalClosedLimitTiltAttribute",
+        readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo);
     Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionLiftCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     InteractionInfo readWindowCoveringCurrentPositionLiftAttributeInteractionInfo =
@@ -11794,6 +11820,34 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
     readWindowCoveringInteractionInfo.put(
         "readCurrentPositionTiltAttribute",
         readWindowCoveringCurrentPositionTiltAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringNumberOfActuationsLiftCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readNumberOfActuationsLiftAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringNumberOfActuationsLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readNumberOfActuationsLiftAttribute",
+        readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringNumberOfActuationsTiltCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readNumberOfActuationsTiltAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringNumberOfActuationsTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readNumberOfActuationsTiltAttribute",
+        readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo);
     Map<String, CommandParameterInfo> readWindowCoveringConfigStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     InteractionInfo readWindowCoveringConfigStatusAttributeInteractionInfo =
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
index db8990475c3d9c..40c7cfecb1aee0 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
@@ -49,7 +49,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBasicNodeLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo basicnodeLabelCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeBasicNodeLabelCommandParams.put("value", basicnodeLabelCommandParameterInfo);
     InteractionInfo writeBasicNodeLabelAttributeInteractionInfo =
         new InteractionInfo(
@@ -65,7 +65,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBasicLocationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo basiclocationCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeBasicLocationCommandParams.put("value", basiclocationCommandParameterInfo);
     InteractionInfo writeBasicLocationAttributeInteractionInfo =
         new InteractionInfo(
@@ -81,7 +81,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBasicLocalConfigDisabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo basiclocalConfigDisabledCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeBasicLocalConfigDisabledCommandParams.put(
         "value", basiclocalConfigDisabledCommandParameterInfo);
     InteractionInfo writeBasicLocalConfigDisabledAttributeInteractionInfo =
@@ -100,7 +100,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBinaryInputBasicOutOfServiceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo binaryInputBasicoutOfServiceCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeBinaryInputBasicOutOfServiceCommandParams.put(
         "value", binaryInputBasicoutOfServiceCommandParameterInfo);
     InteractionInfo writeBinaryInputBasicOutOfServiceAttributeInteractionInfo =
@@ -117,7 +117,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBinaryInputBasicPresentValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo binaryInputBasicpresentValueCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeBinaryInputBasicPresentValueCommandParams.put(
         "value", binaryInputBasicpresentValueCommandParameterInfo);
     InteractionInfo writeBinaryInputBasicPresentValueAttributeInteractionInfo =
@@ -142,7 +142,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBridgedDeviceBasicNodeLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedDeviceBasicnodeLabelCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeBridgedDeviceBasicNodeLabelCommandParams.put(
         "value", bridgedDeviceBasicnodeLabelCommandParameterInfo);
     InteractionInfo writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo =
@@ -163,7 +163,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControloptionsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlOptionsCommandParams.put("value", colorControloptionsCommandParameterInfo);
     InteractionInfo writeColorControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
@@ -179,7 +179,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlWhitePointXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlwhitePointXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlWhitePointXCommandParams.put(
         "value", colorControlwhitePointXCommandParameterInfo);
     InteractionInfo writeColorControlWhitePointXAttributeInteractionInfo =
@@ -196,7 +196,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlWhitePointYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlwhitePointYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlWhitePointYCommandParams.put(
         "value", colorControlwhitePointYCommandParameterInfo);
     InteractionInfo writeColorControlWhitePointYAttributeInteractionInfo =
@@ -213,7 +213,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointRXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointRXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointRXCommandParams.put(
         "value", colorControlcolorPointRXCommandParameterInfo);
     InteractionInfo writeColorControlColorPointRXAttributeInteractionInfo =
@@ -230,7 +230,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointRYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointRYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointRYCommandParams.put(
         "value", colorControlcolorPointRYCommandParameterInfo);
     InteractionInfo writeColorControlColorPointRYAttributeInteractionInfo =
@@ -247,7 +247,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointRIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointRIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointRIntensityCommandParams.put(
         "value", colorControlcolorPointRIntensityCommandParameterInfo);
     InteractionInfo writeColorControlColorPointRIntensityAttributeInteractionInfo =
@@ -265,7 +265,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointGXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointGXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointGXCommandParams.put(
         "value", colorControlcolorPointGXCommandParameterInfo);
     InteractionInfo writeColorControlColorPointGXAttributeInteractionInfo =
@@ -282,7 +282,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointGYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointGYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointGYCommandParams.put(
         "value", colorControlcolorPointGYCommandParameterInfo);
     InteractionInfo writeColorControlColorPointGYAttributeInteractionInfo =
@@ -299,7 +299,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointGIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointGIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointGIntensityCommandParams.put(
         "value", colorControlcolorPointGIntensityCommandParameterInfo);
     InteractionInfo writeColorControlColorPointGIntensityAttributeInteractionInfo =
@@ -317,7 +317,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointBXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointBXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointBXCommandParams.put(
         "value", colorControlcolorPointBXCommandParameterInfo);
     InteractionInfo writeColorControlColorPointBXAttributeInteractionInfo =
@@ -334,7 +334,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointBYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointBYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointBYCommandParams.put(
         "value", colorControlcolorPointBYCommandParameterInfo);
     InteractionInfo writeColorControlColorPointBYAttributeInteractionInfo =
@@ -351,7 +351,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointBIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointBIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointBIntensityCommandParams.put(
         "value", colorControlcolorPointBIntensityCommandParameterInfo);
     InteractionInfo writeColorControlColorPointBIntensityAttributeInteractionInfo =
@@ -369,7 +369,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlStartUpColorTemperatureMiredsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstartUpColorTemperatureMiredsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlStartUpColorTemperatureMiredsCommandParams.put(
         "value", colorControlstartUpColorTemperatureMiredsCommandParameterInfo);
     InteractionInfo writeColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo =
@@ -389,7 +389,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeContentLauncherSupportedStreamingProtocolsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo contentLaunchersupportedStreamingProtocolsCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeContentLauncherSupportedStreamingProtocolsCommandParams.put(
         "value", contentLaunchersupportedStreamingProtocolsCommandParameterInfo);
     InteractionInfo writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo =
@@ -413,7 +413,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockLanguageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocklanguageCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeDoorLockLanguageCommandParams.put("value", doorLocklanguageCommandParameterInfo);
     InteractionInfo writeDoorLockLanguageAttributeInteractionInfo =
         new InteractionInfo(
@@ -429,7 +429,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockAutoRelockTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockautoRelockTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeDoorLockAutoRelockTimeCommandParams.put(
         "value", doorLockautoRelockTimeCommandParameterInfo);
     InteractionInfo writeDoorLockAutoRelockTimeAttributeInteractionInfo =
@@ -446,7 +446,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockSoundVolumeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksoundVolumeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockSoundVolumeCommandParams.put("value", doorLocksoundVolumeCommandParameterInfo);
     InteractionInfo writeDoorLockSoundVolumeAttributeInteractionInfo =
         new InteractionInfo(
@@ -462,7 +462,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockOperatingModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockoperatingModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockOperatingModeCommandParams.put("value", doorLockoperatingModeCommandParameterInfo);
     InteractionInfo writeDoorLockOperatingModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -478,7 +478,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockEnableOneTouchLockingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockenableOneTouchLockingCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeDoorLockEnableOneTouchLockingCommandParams.put(
         "value", doorLockenableOneTouchLockingCommandParameterInfo);
     InteractionInfo writeDoorLockEnableOneTouchLockingAttributeInteractionInfo =
@@ -496,7 +496,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockEnablePrivacyModeButtonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockenablePrivacyModeButtonCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeDoorLockEnablePrivacyModeButtonCommandParams.put(
         "value", doorLockenablePrivacyModeButtonCommandParameterInfo);
     InteractionInfo writeDoorLockEnablePrivacyModeButtonAttributeInteractionInfo =
@@ -514,7 +514,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockWrongCodeEntryLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockwrongCodeEntryLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockWrongCodeEntryLimitCommandParams.put(
         "value", doorLockwrongCodeEntryLimitCommandParameterInfo);
     InteractionInfo writeDoorLockWrongCodeEntryLimitAttributeInteractionInfo =
@@ -532,7 +532,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockUserCodeTemporaryDisableTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockuserCodeTemporaryDisableTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockUserCodeTemporaryDisableTimeCommandParams.put(
         "value", doorLockuserCodeTemporaryDisableTimeCommandParameterInfo);
     InteractionInfo writeDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo =
@@ -550,7 +550,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockRequirePINforRemoteOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockrequirePINforRemoteOperationCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeDoorLockRequirePINforRemoteOperationCommandParams.put(
         "value", doorLockrequirePINforRemoteOperationCommandParameterInfo);
     InteractionInfo writeDoorLockRequirePINforRemoteOperationAttributeInteractionInfo =
@@ -576,7 +576,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlFanModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlfanModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlFanModeCommandParams.put("value", fanControlfanModeCommandParameterInfo);
     InteractionInfo writeFanControlFanModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -592,7 +592,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlFanModeSequenceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlfanModeSequenceCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlFanModeSequenceCommandParams.put(
         "value", fanControlfanModeSequenceCommandParameterInfo);
     InteractionInfo writeFanControlFanModeSequenceAttributeInteractionInfo =
@@ -609,7 +609,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlPercentSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlpercentSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlPercentSettingCommandParams.put(
         "value", fanControlpercentSettingCommandParameterInfo);
     InteractionInfo writeFanControlPercentSettingAttributeInteractionInfo =
@@ -626,7 +626,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlSpeedSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlspeedSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlSpeedSettingCommandParams.put(
         "value", fanControlspeedSettingCommandParameterInfo);
     InteractionInfo writeFanControlSpeedSettingAttributeInteractionInfo =
@@ -643,7 +643,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlRockSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlrockSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlRockSettingCommandParams.put("value", fanControlrockSettingCommandParameterInfo);
     InteractionInfo writeFanControlRockSettingAttributeInteractionInfo =
         new InteractionInfo(
@@ -659,7 +659,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlWindSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlwindSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlWindSettingCommandParams.put("value", fanControlwindSettingCommandParameterInfo);
     InteractionInfo writeFanControlWindSettingAttributeInteractionInfo =
         new InteractionInfo(
@@ -681,7 +681,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeGeneralCommissioningBreadcrumbCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo generalCommissioningbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeGeneralCommissioningBreadcrumbCommandParams.put(
         "value", generalCommissioningbreadcrumbCommandParameterInfo);
     InteractionInfo writeGeneralCommissioningBreadcrumbAttributeInteractionInfo =
@@ -706,7 +706,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeIdentifyIdentifyTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo identifyidentifyTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeIdentifyIdentifyTimeCommandParams.put("value", identifyidentifyTimeCommandParameterInfo);
     InteractionInfo writeIdentifyIdentifyTimeAttributeInteractionInfo =
         new InteractionInfo(
@@ -728,7 +728,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControloptionsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOptionsCommandParams.put("value", levelControloptionsCommandParameterInfo);
     InteractionInfo writeLevelControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
@@ -744,7 +744,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOnOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlonOffTransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOnOffTransitionTimeCommandParams.put(
         "value", levelControlonOffTransitionTimeCommandParameterInfo);
     InteractionInfo writeLevelControlOnOffTransitionTimeAttributeInteractionInfo =
@@ -762,7 +762,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOnLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlonLevelCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOnLevelCommandParams.put("value", levelControlonLevelCommandParameterInfo);
     InteractionInfo writeLevelControlOnLevelAttributeInteractionInfo =
         new InteractionInfo(
@@ -778,7 +778,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOnTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlonTransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOnTransitionTimeCommandParams.put(
         "value", levelControlonTransitionTimeCommandParameterInfo);
     InteractionInfo writeLevelControlOnTransitionTimeAttributeInteractionInfo =
@@ -796,7 +796,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControloffTransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOffTransitionTimeCommandParams.put(
         "value", levelControloffTransitionTimeCommandParameterInfo);
     InteractionInfo writeLevelControlOffTransitionTimeAttributeInteractionInfo =
@@ -814,7 +814,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlDefaultMoveRateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControldefaultMoveRateCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlDefaultMoveRateCommandParams.put(
         "value", levelControldefaultMoveRateCommandParameterInfo);
     InteractionInfo writeLevelControlDefaultMoveRateAttributeInteractionInfo =
@@ -831,7 +831,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlStartUpCurrentLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstartUpCurrentLevelCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlStartUpCurrentLevelCommandParams.put(
         "value", levelControlstartUpCurrentLevelCommandParameterInfo);
     InteractionInfo writeLevelControlStartUpCurrentLevelAttributeInteractionInfo =
@@ -852,7 +852,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLocalizationConfigurationActiveLocaleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo localizationConfigurationactiveLocaleCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeLocalizationConfigurationActiveLocaleCommandParams.put(
         "value", localizationConfigurationactiveLocaleCommandParameterInfo);
     InteractionInfo writeLocalizationConfigurationActiveLocaleAttributeInteractionInfo =
@@ -879,7 +879,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeModeSelectStartUpModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectstartUpModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeModeSelectStartUpModeCommandParams.put("value", modeSelectstartUpModeCommandParameterInfo);
     InteractionInfo writeModeSelectStartUpModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -895,7 +895,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeModeSelectOnModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectonModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeModeSelectOnModeCommandParams.put("value", modeSelectonModeCommandParameterInfo);
     InteractionInfo writeModeSelectOnModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -913,7 +913,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeNetworkCommissioningInterfaceEnabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioninginterfaceEnabledCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeNetworkCommissioningInterfaceEnabledCommandParams.put(
         "value", networkCommissioninginterfaceEnabledCommandParameterInfo);
     InteractionInfo writeNetworkCommissioningInterfaceEnabledAttributeInteractionInfo =
@@ -943,7 +943,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffOnTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffonTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffOnTimeCommandParams.put("value", onOffonTimeCommandParameterInfo);
     InteractionInfo writeOnOffOnTimeAttributeInteractionInfo =
         new InteractionInfo(
@@ -958,7 +958,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffOffWaitTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffoffWaitTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffOffWaitTimeCommandParams.put("value", onOffoffWaitTimeCommandParameterInfo);
     InteractionInfo writeOnOffOffWaitTimeAttributeInteractionInfo =
         new InteractionInfo(
@@ -974,7 +974,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffStartUpOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffstartUpOnOffCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffStartUpOnOffCommandParams.put("value", onOffstartUpOnOffCommandParameterInfo);
     InteractionInfo writeOnOffStartUpOnOffAttributeInteractionInfo =
         new InteractionInfo(
@@ -993,7 +993,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffSwitchConfigurationSwitchActionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffSwitchConfigurationswitchActionsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffSwitchConfigurationSwitchActionsCommandParams.put(
         "value", onOffSwitchConfigurationswitchActionsCommandParameterInfo);
     InteractionInfo writeOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo =
@@ -1024,7 +1024,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         writePumpConfigurationAndControlLifetimeRunningHoursCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writePumpConfigurationAndControlLifetimeRunningHoursCommandParams.put(
         "value", pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo =
@@ -1043,7 +1043,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams.put(
         "value", pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo =
@@ -1061,7 +1061,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writePumpConfigurationAndControlOperationModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControloperationModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writePumpConfigurationAndControlOperationModeCommandParams.put(
         "value", pumpConfigurationAndControloperationModeCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlOperationModeAttributeInteractionInfo =
@@ -1079,7 +1079,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writePumpConfigurationAndControlControlModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControlcontrolModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writePumpConfigurationAndControlControlModeCommandParams.put(
         "value", pumpConfigurationAndControlcontrolModeCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlControlModeAttributeInteractionInfo =
@@ -1114,7 +1114,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterBooleanCommandParams.put("value", testClusterbooleanCommandParameterInfo);
     InteractionInfo writeTestClusterBooleanAttributeInteractionInfo =
         new InteractionInfo(
@@ -1130,7 +1130,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterBitmap8CommandParams.put("value", testClusterbitmap8CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap8AttributeInteractionInfo =
         new InteractionInfo(
@@ -1146,7 +1146,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterBitmap16CommandParams.put("value", testClusterbitmap16CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap16AttributeInteractionInfo =
         new InteractionInfo(
@@ -1162,7 +1162,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap32CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap32CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterBitmap32CommandParams.put("value", testClusterbitmap32CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap32AttributeInteractionInfo =
         new InteractionInfo(
@@ -1178,7 +1178,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap64CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap64CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterBitmap64CommandParams.put("value", testClusterbitmap64CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap64AttributeInteractionInfo =
         new InteractionInfo(
@@ -1194,7 +1194,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt8uCommandParams.put("value", testClusterint8uCommandParameterInfo);
     InteractionInfo writeTestClusterInt8uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1210,7 +1210,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt16uCommandParams.put("value", testClusterint16uCommandParameterInfo);
     InteractionInfo writeTestClusterInt16uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1226,7 +1226,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt24uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint24uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt24uCommandParams.put("value", testClusterint24uCommandParameterInfo);
     InteractionInfo writeTestClusterInt24uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1242,7 +1242,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt32uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint32uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt32uCommandParams.put("value", testClusterint32uCommandParameterInfo);
     InteractionInfo writeTestClusterInt32uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1258,7 +1258,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt40uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint40uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt40uCommandParams.put("value", testClusterint40uCommandParameterInfo);
     InteractionInfo writeTestClusterInt40uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1274,7 +1274,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt48uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint48uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt48uCommandParams.put("value", testClusterint48uCommandParameterInfo);
     InteractionInfo writeTestClusterInt48uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1290,7 +1290,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt56uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint56uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt56uCommandParams.put("value", testClusterint56uCommandParameterInfo);
     InteractionInfo writeTestClusterInt56uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1306,7 +1306,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt64uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint64uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt64uCommandParams.put("value", testClusterint64uCommandParameterInfo);
     InteractionInfo writeTestClusterInt64uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1322,7 +1322,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt8sCommandParams.put("value", testClusterint8sCommandParameterInfo);
     InteractionInfo writeTestClusterInt8sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1338,7 +1338,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt16sCommandParams.put("value", testClusterint16sCommandParameterInfo);
     InteractionInfo writeTestClusterInt16sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1354,7 +1354,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt24sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint24sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt24sCommandParams.put("value", testClusterint24sCommandParameterInfo);
     InteractionInfo writeTestClusterInt24sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1370,7 +1370,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt32sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint32sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt32sCommandParams.put("value", testClusterint32sCommandParameterInfo);
     InteractionInfo writeTestClusterInt32sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1386,7 +1386,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt40sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint40sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt40sCommandParams.put("value", testClusterint40sCommandParameterInfo);
     InteractionInfo writeTestClusterInt40sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1402,7 +1402,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt48sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint48sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt48sCommandParams.put("value", testClusterint48sCommandParameterInfo);
     InteractionInfo writeTestClusterInt48sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1418,7 +1418,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt56sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint56sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt56sCommandParams.put("value", testClusterint56sCommandParameterInfo);
     InteractionInfo writeTestClusterInt56sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1434,7 +1434,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt64sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint64sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt64sCommandParams.put("value", testClusterint64sCommandParameterInfo);
     InteractionInfo writeTestClusterInt64sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1450,7 +1450,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEnum8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterenum8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterEnum8CommandParams.put("value", testClusterenum8CommandParameterInfo);
     InteractionInfo writeTestClusterEnum8AttributeInteractionInfo =
         new InteractionInfo(
@@ -1466,7 +1466,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEnum16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterenum16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterEnum16CommandParams.put("value", testClusterenum16CommandParameterInfo);
     InteractionInfo writeTestClusterEnum16AttributeInteractionInfo =
         new InteractionInfo(
@@ -1482,7 +1482,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterFloatSingleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterfloatSingleCommandParameterInfo =
-        new CommandParameterInfo("value", Float.class);
+        new CommandParameterInfo("value", Float.class, Float.class);
     writeTestClusterFloatSingleCommandParams.put(
         "value", testClusterfloatSingleCommandParameterInfo);
     InteractionInfo writeTestClusterFloatSingleAttributeInteractionInfo =
@@ -1499,7 +1499,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterFloatDoubleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterfloatDoubleCommandParameterInfo =
-        new CommandParameterInfo("value", Double.class);
+        new CommandParameterInfo("value", Double.class, Double.class);
     writeTestClusterFloatDoubleCommandParams.put(
         "value", testClusterfloatDoubleCommandParameterInfo);
     InteractionInfo writeTestClusterFloatDoubleAttributeInteractionInfo =
@@ -1516,7 +1516,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusteroctetStringCommandParameterInfo =
-        new CommandParameterInfo("value", byte[].class);
+        new CommandParameterInfo("value", byte[].class, byte[].class);
     writeTestClusterOctetStringCommandParams.put(
         "value", testClusteroctetStringCommandParameterInfo);
     InteractionInfo writeTestClusterOctetStringAttributeInteractionInfo =
@@ -1533,7 +1533,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterLongOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterlongOctetStringCommandParameterInfo =
-        new CommandParameterInfo("value", byte[].class);
+        new CommandParameterInfo("value", byte[].class, byte[].class);
     writeTestClusterLongOctetStringCommandParams.put(
         "value", testClusterlongOctetStringCommandParameterInfo);
     InteractionInfo writeTestClusterLongOctetStringAttributeInteractionInfo =
@@ -1550,7 +1550,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustercharStringCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeTestClusterCharStringCommandParams.put("value", testClustercharStringCommandParameterInfo);
     InteractionInfo writeTestClusterCharStringAttributeInteractionInfo =
         new InteractionInfo(
@@ -1566,7 +1566,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterLongCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterlongCharStringCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeTestClusterLongCharStringCommandParams.put(
         "value", testClusterlongCharStringCommandParameterInfo);
     InteractionInfo writeTestClusterLongCharStringAttributeInteractionInfo =
@@ -1583,7 +1583,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEpochUsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterepochUsCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterEpochUsCommandParams.put("value", testClusterepochUsCommandParameterInfo);
     InteractionInfo writeTestClusterEpochUsAttributeInteractionInfo =
         new InteractionInfo(
@@ -1599,7 +1599,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEpochSCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterepochSCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterEpochSCommandParams.put("value", testClusterepochSCommandParameterInfo);
     InteractionInfo writeTestClusterEpochSAttributeInteractionInfo =
         new InteractionInfo(
@@ -1615,7 +1615,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterVendorIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustervendorIdCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterVendorIdCommandParams.put("value", testClustervendorIdCommandParameterInfo);
     InteractionInfo writeTestClusterVendorIdAttributeInteractionInfo =
         new InteractionInfo(
@@ -1631,7 +1631,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEnumAttrCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterenumAttrCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterEnumAttrCommandParams.put("value", testClusterenumAttrCommandParameterInfo);
     InteractionInfo writeTestClusterEnumAttrAttributeInteractionInfo =
         new InteractionInfo(
@@ -1647,7 +1647,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt8uCommandParams.put(
         "value", testClusterrangeRestrictedInt8uCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt8uAttributeInteractionInfo =
@@ -1665,7 +1665,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt8sCommandParams.put(
         "value", testClusterrangeRestrictedInt8sCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt8sAttributeInteractionInfo =
@@ -1683,7 +1683,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt16uCommandParams.put(
         "value", testClusterrangeRestrictedInt16uCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt16uAttributeInteractionInfo =
@@ -1701,7 +1701,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt16sCommandParams.put(
         "value", testClusterrangeRestrictedInt16sCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt16sAttributeInteractionInfo =
@@ -1719,7 +1719,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterTimedWriteBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertimedWriteBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterTimedWriteBooleanCommandParams.put(
         "value", testClustertimedWriteBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterTimedWriteBooleanAttributeInteractionInfo =
@@ -1739,7 +1739,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterGeneralErrorBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustergeneralErrorBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterGeneralErrorBooleanCommandParams.put(
         "value", testClustergeneralErrorBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterGeneralErrorBooleanAttributeInteractionInfo =
@@ -1757,7 +1757,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterClusterErrorBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterclusterErrorBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterClusterErrorBooleanCommandParams.put(
         "value", testClusterclusterErrorBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterClusterErrorBooleanAttributeInteractionInfo =
@@ -1775,7 +1775,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterUnsupportedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterunsupportedCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterUnsupportedCommandParams.put(
         "value", testClusterunsupportedCommandParameterInfo);
     InteractionInfo writeTestClusterUnsupportedAttributeInteractionInfo =
@@ -1792,7 +1792,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterNullableBooleanCommandParams.put(
         "value", testClusternullableBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterNullableBooleanAttributeInteractionInfo =
@@ -1809,7 +1809,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableBitmap8CommandParams.put(
         "value", testClusternullableBitmap8CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap8AttributeInteractionInfo =
@@ -1826,7 +1826,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableBitmap16CommandParams.put(
         "value", testClusternullableBitmap16CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap16AttributeInteractionInfo =
@@ -1843,7 +1843,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap32CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap32CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableBitmap32CommandParams.put(
         "value", testClusternullableBitmap32CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap32AttributeInteractionInfo =
@@ -1860,7 +1860,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap64CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap64CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableBitmap64CommandParams.put(
         "value", testClusternullableBitmap64CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap64AttributeInteractionInfo =
@@ -1877,7 +1877,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt8uCommandParams.put(
         "value", testClusternullableInt8uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt8uAttributeInteractionInfo =
@@ -1894,7 +1894,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt16uCommandParams.put(
         "value", testClusternullableInt16uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt16uAttributeInteractionInfo =
@@ -1911,7 +1911,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt24uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt24uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt24uCommandParams.put(
         "value", testClusternullableInt24uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt24uAttributeInteractionInfo =
@@ -1928,7 +1928,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt32uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt32uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt32uCommandParams.put(
         "value", testClusternullableInt32uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt32uAttributeInteractionInfo =
@@ -1945,7 +1945,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt40uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt40uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt40uCommandParams.put(
         "value", testClusternullableInt40uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt40uAttributeInteractionInfo =
@@ -1962,7 +1962,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt48uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt48uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt48uCommandParams.put(
         "value", testClusternullableInt48uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt48uAttributeInteractionInfo =
@@ -1979,7 +1979,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt56uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt56uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt56uCommandParams.put(
         "value", testClusternullableInt56uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt56uAttributeInteractionInfo =
@@ -1996,7 +1996,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt64uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt64uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt64uCommandParams.put(
         "value", testClusternullableInt64uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt64uAttributeInteractionInfo =
@@ -2013,7 +2013,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt8sCommandParams.put(
         "value", testClusternullableInt8sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt8sAttributeInteractionInfo =
@@ -2030,7 +2030,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt16sCommandParams.put(
         "value", testClusternullableInt16sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt16sAttributeInteractionInfo =
@@ -2047,7 +2047,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt24sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt24sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt24sCommandParams.put(
         "value", testClusternullableInt24sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt24sAttributeInteractionInfo =
@@ -2064,7 +2064,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt32sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt32sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt32sCommandParams.put(
         "value", testClusternullableInt32sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt32sAttributeInteractionInfo =
@@ -2081,7 +2081,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt40sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt40sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt40sCommandParams.put(
         "value", testClusternullableInt40sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt40sAttributeInteractionInfo =
@@ -2098,7 +2098,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt48sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt48sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt48sCommandParams.put(
         "value", testClusternullableInt48sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt48sAttributeInteractionInfo =
@@ -2115,7 +2115,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt56sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt56sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt56sCommandParams.put(
         "value", testClusternullableInt56sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt56sAttributeInteractionInfo =
@@ -2132,7 +2132,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt64sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt64sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt64sCommandParams.put(
         "value", testClusternullableInt64sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt64sAttributeInteractionInfo =
@@ -2149,7 +2149,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableEnum8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableEnum8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableEnum8CommandParams.put(
         "value", testClusternullableEnum8CommandParameterInfo);
     InteractionInfo writeTestClusterNullableEnum8AttributeInteractionInfo =
@@ -2166,7 +2166,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableEnum16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableEnum16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableEnum16CommandParams.put(
         "value", testClusternullableEnum16CommandParameterInfo);
     InteractionInfo writeTestClusterNullableEnum16AttributeInteractionInfo =
@@ -2183,7 +2183,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableFloatSingleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableFloatSingleCommandParameterInfo =
-        new CommandParameterInfo("value", Float.class);
+        new CommandParameterInfo("value", Float.class, Float.class);
     writeTestClusterNullableFloatSingleCommandParams.put(
         "value", testClusternullableFloatSingleCommandParameterInfo);
     InteractionInfo writeTestClusterNullableFloatSingleAttributeInteractionInfo =
@@ -2201,7 +2201,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableFloatDoubleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableFloatDoubleCommandParameterInfo =
-        new CommandParameterInfo("value", Double.class);
+        new CommandParameterInfo("value", Double.class, Double.class);
     writeTestClusterNullableFloatDoubleCommandParams.put(
         "value", testClusternullableFloatDoubleCommandParameterInfo);
     InteractionInfo writeTestClusterNullableFloatDoubleAttributeInteractionInfo =
@@ -2219,7 +2219,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableOctetStringCommandParameterInfo =
-        new CommandParameterInfo("value", byte[].class);
+        new CommandParameterInfo("value", byte[].class, byte[].class);
     writeTestClusterNullableOctetStringCommandParams.put(
         "value", testClusternullableOctetStringCommandParameterInfo);
     InteractionInfo writeTestClusterNullableOctetStringAttributeInteractionInfo =
@@ -2237,7 +2237,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableCharStringCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeTestClusterNullableCharStringCommandParams.put(
         "value", testClusternullableCharStringCommandParameterInfo);
     InteractionInfo writeTestClusterNullableCharStringAttributeInteractionInfo =
@@ -2255,7 +2255,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableEnumAttrCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableEnumAttrCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableEnumAttrCommandParams.put(
         "value", testClusternullableEnumAttrCommandParameterInfo);
     InteractionInfo writeTestClusterNullableEnumAttrAttributeInteractionInfo =
@@ -2272,7 +2272,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt8uCommandParams.put(
         "value", testClusternullableRangeRestrictedInt8uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt8uAttributeInteractionInfo =
@@ -2290,7 +2290,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt8sCommandParams.put(
         "value", testClusternullableRangeRestrictedInt8sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt8sAttributeInteractionInfo =
@@ -2308,7 +2308,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt16uCommandParams.put(
         "value", testClusternullableRangeRestrictedInt16uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt16uAttributeInteractionInfo =
@@ -2326,7 +2326,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt16sCommandParams.put(
         "value", testClusternullableRangeRestrictedInt16sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo =
@@ -2346,7 +2346,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatOccupiedCoolingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatoccupiedCoolingSetpointCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatOccupiedCoolingSetpointCommandParams.put(
         "value", thermostatoccupiedCoolingSetpointCommandParameterInfo);
     InteractionInfo writeThermostatOccupiedCoolingSetpointAttributeInteractionInfo =
@@ -2364,7 +2364,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatOccupiedHeatingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatoccupiedHeatingSetpointCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatOccupiedHeatingSetpointCommandParams.put(
         "value", thermostatoccupiedHeatingSetpointCommandParameterInfo);
     InteractionInfo writeThermostatOccupiedHeatingSetpointAttributeInteractionInfo =
@@ -2382,7 +2382,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMinHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatminHeatSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMinHeatSetpointLimitCommandParams.put(
         "value", thermostatminHeatSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMinHeatSetpointLimitAttributeInteractionInfo =
@@ -2400,7 +2400,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMaxHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatmaxHeatSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMaxHeatSetpointLimitCommandParams.put(
         "value", thermostatmaxHeatSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMaxHeatSetpointLimitAttributeInteractionInfo =
@@ -2418,7 +2418,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMinCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatminCoolSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMinCoolSetpointLimitCommandParams.put(
         "value", thermostatminCoolSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMinCoolSetpointLimitAttributeInteractionInfo =
@@ -2436,7 +2436,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMaxCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatmaxCoolSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMaxCoolSetpointLimitCommandParams.put(
         "value", thermostatmaxCoolSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMaxCoolSetpointLimitAttributeInteractionInfo =
@@ -2454,7 +2454,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMinSetpointDeadBandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatminSetpointDeadBandCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMinSetpointDeadBandCommandParams.put(
         "value", thermostatminSetpointDeadBandCommandParameterInfo);
     InteractionInfo writeThermostatMinSetpointDeadBandAttributeInteractionInfo =
@@ -2472,7 +2472,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatControlSequenceOfOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatcontrolSequenceOfOperationCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatControlSequenceOfOperationCommandParams.put(
         "value", thermostatcontrolSequenceOfOperationCommandParameterInfo);
     InteractionInfo writeThermostatControlSequenceOfOperationAttributeInteractionInfo =
@@ -2490,7 +2490,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatSystemModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatsystemModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatSystemModeCommandParams.put("value", thermostatsystemModeCommandParameterInfo);
     InteractionInfo writeThermostatSystemModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -2511,7 +2511,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo =
-            new CommandParameterInfo("value", Integer.class);
+            new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams.put(
         "value", thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo);
     InteractionInfo
@@ -2532,7 +2532,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams.put(
         "value", thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo);
     InteractionInfo writeThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo =
@@ -2552,7 +2552,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo =
-            new CommandParameterInfo("value", Integer.class);
+            new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams.put(
         "value",
         thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo);
@@ -2580,7 +2580,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTimeFormatLocalizationHourFormatCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo timeFormatLocalizationhourFormatCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTimeFormatLocalizationHourFormatCommandParams.put(
         "value", timeFormatLocalizationhourFormatCommandParameterInfo);
     InteractionInfo writeTimeFormatLocalizationHourFormatAttributeInteractionInfo =
@@ -2597,7 +2597,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTimeFormatLocalizationActiveCalendarTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo timeFormatLocalizationactiveCalendarTypeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTimeFormatLocalizationActiveCalendarTypeCommandParams.put(
         "value", timeFormatLocalizationactiveCalendarTypeCommandParameterInfo);
     InteractionInfo writeTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo =
@@ -2617,7 +2617,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeUnitLocalizationTemperatureUnitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo unitLocalizationtemperatureUnitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeUnitLocalizationTemperatureUnitCommandParams.put(
         "value", unitLocalizationtemperatureUnitCommandParameterInfo);
     InteractionInfo writeUnitLocalizationTemperatureUnitAttributeInteractionInfo =
@@ -2643,7 +2643,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeWindowCoveringModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo windowCoveringmodeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeWindowCoveringModeCommandParams.put("value", windowCoveringmodeCommandParameterInfo);
     InteractionInfo writeWindowCoveringModeAttributeInteractionInfo =
         new InteractionInfo(
diff --git a/src/controller/python/chip-device-ctrl.py b/src/controller/python/chip-device-ctrl.py
index 7d8a5f245db57c..4d85016de24498 100755
--- a/src/controller/python/chip-device-ctrl.py
+++ b/src/controller/python/chip-device-ctrl.py
@@ -672,12 +672,14 @@ def do_resolve(self, line):
         try:
             args = shlex.split(line)
             if len(args) == 1:
-                err = self.devCtrl.ResolveNode(int(args[0]))
-                if err == 0:
+                try:
+                    self.devCtrl.ResolveNode(int(args[0]))
                     address = self.devCtrl.GetAddressAndPort(int(args[0]))
                     address = "{}:{}".format(
                         *address) if address else "unknown"
                     print("Current address: " + address)
+                except exceptions.ChipStackException as ex:
+                    print(str(ex))
             else:
                 self.do_help("resolve")
         except exceptions.ChipStackException as ex:
diff --git a/src/controller/python/chip/ChipDeviceCtrl.py b/src/controller/python/chip/ChipDeviceCtrl.py
index 5ebbf09098c4d1..3fd5e9bee859b9 100644
--- a/src/controller/python/chip/ChipDeviceCtrl.py
+++ b/src/controller/python/chip/ChipDeviceCtrl.py
@@ -359,11 +359,7 @@ def SetThreadOperationalDataset(self, threadOperationalDataset):
     def ResolveNode(self, nodeid):
         self.CheckIsActive()
 
-        try:
-            self.GetConnectedDeviceSync(nodeid, allowPASE=False)
-            return 0
-        except ChipStackError as ex:
-            return ex.err
+        self.GetConnectedDeviceSync(nodeid, allowPASE=False)
 
     def GetAddressAndPort(self, nodeid):
         self.CheckIsActive()
@@ -501,18 +497,18 @@ def GetConnectedDeviceSync(self, nodeid, allowPASE=True):
         self.CheckIsActive()
 
         returnDevice = c_void_p(None)
+        returnErr = None
         deviceAvailableCV = threading.Condition()
 
         @_DeviceAvailableFunct
         def DeviceAvailableCallback(device, err):
             nonlocal returnDevice
+            nonlocal returnErr
             nonlocal deviceAvailableCV
             with deviceAvailableCV:
                 returnDevice = c_void_p(device)
+                returnErr = err
                 deviceAvailableCV.notify_all()
-            if err != 0:
-                print("Failed in getting the connected device: {}".format(err))
-                raise self._ChipStack.ErrorToException(err)
 
         if allowPASE:
             res = self._ChipStack.Call(lambda: self._dmLib.pychip_GetDeviceBeingCommissioned(
@@ -533,7 +529,7 @@ def DeviceAvailableCallback(device, err):
                 deviceAvailableCV.wait()
 
         if returnDevice.value is None:
-            raise self._ChipStack.ErrorToException(CHIP_ERROR_INTERNAL)
+            raise self._ChipStack.ErrorToException(returnErr)
         return returnDevice
 
     async def SendCommand(self, nodeid: int, endpoint: int, payload: ClusterObjects.ClusterCommand, responseType=None, timedRequestTimeoutMs: int = None):
diff --git a/src/controller/python/chip/clusters/Attribute.py b/src/controller/python/chip/clusters/Attribute.py
index 6d39df7d6bd9ee..34970a5ee28d47 100644
--- a/src/controller/python/chip/clusters/Attribute.py
+++ b/src/controller/python/chip/clusters/Attribute.py
@@ -676,6 +676,9 @@ def handleSubscriptionEstablished(self, subscriptionId):
         self._event_loop.call_soon_threadsafe(
             self._handleSubscriptionEstablished, subscriptionId)
 
+    def handleResubscriptionAttempted(self, terminationCause, nextResubscribeIntervalMsec):
+        print("would resubscribe with error " + str(terminationCause) + " in " + str(nextResubscribeIntervalMsec))
+
     def _handleReportBegin(self):
         pass
 
@@ -743,6 +746,7 @@ def handleDone(self):
 _OnReadAttributeDataCallbackFunct = CFUNCTYPE(
     None, py_object, c_uint32, c_uint16, c_uint32, c_uint32, c_uint8, c_void_p, c_size_t)
 _OnSubscriptionEstablishedCallbackFunct = CFUNCTYPE(None, py_object, c_uint32)
+_OnResubscriptionAttemptedCallbackFunct = CFUNCTYPE(None, py_object, c_uint32, c_uint32)
 _OnReadEventDataCallbackFunct = CFUNCTYPE(
     None, py_object, c_uint16, c_uint32, c_uint32, c_uint64, c_uint8, c_uint64, c_uint8, c_void_p, c_size_t, c_uint8)
 _OnReadErrorCallbackFunct = CFUNCTYPE(
@@ -775,6 +779,11 @@ def _OnSubscriptionEstablishedCallback(closure, subscriptionId):
     closure.handleSubscriptionEstablished(subscriptionId)
 
 
+@_OnResubscriptionAttemptedCallbackFunct
+def _OnResubscriptionAttemptedCallback(closure, terminationCause, nextResubscribeIntervalMsec):
+    closure.handleResubscriptionAttempted(terminationCause, nextResubscribeIntervalMsec)
+
+
 @_OnReadErrorCallbackFunct
 def _OnReadErrorCallback(closure, chiperror: int):
     closure.handleError(chiperror)
@@ -985,13 +994,13 @@ def Init():
                    _OnWriteResponseCallbackFunct, _OnWriteErrorCallbackFunct, _OnWriteDoneCallbackFunct])
         handle.pychip_ReadClient_Read.restype = c_uint32
         setter.Set('pychip_ReadClient_InitCallbacks', None, [
-                   _OnReadAttributeDataCallbackFunct, _OnReadEventDataCallbackFunct, _OnSubscriptionEstablishedCallbackFunct, _OnReadErrorCallbackFunct, _OnReadDoneCallbackFunct,
+                   _OnReadAttributeDataCallbackFunct, _OnReadEventDataCallbackFunct, _OnSubscriptionEstablishedCallbackFunct, _OnResubscriptionAttemptedCallbackFunct, _OnReadErrorCallbackFunct, _OnReadDoneCallbackFunct,
                    _OnReportBeginCallbackFunct, _OnReportEndCallbackFunct])
 
     handle.pychip_WriteClient_InitCallbacks(
         _OnWriteResponseCallback, _OnWriteErrorCallback, _OnWriteDoneCallback)
     handle.pychip_ReadClient_InitCallbacks(
-        _OnReadAttributeDataCallback, _OnReadEventDataCallback, _OnSubscriptionEstablishedCallback, _OnReadErrorCallback, _OnReadDoneCallback,
+        _OnReadAttributeDataCallback, _OnReadEventDataCallback, _OnSubscriptionEstablishedCallback, _OnResubscriptionAttemptedCallback, _OnReadErrorCallback, _OnReadDoneCallback,
         _OnReportBeginCallback, _OnReportEndCallback)
 
     _BuildAttributeIndex()
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 92c0485043dd01..58383a62c4bbb0 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -2830,6 +2830,14 @@ class ChipClusters:
             "clusterName": "GeneralDiagnostics",
             "clusterId": 0x00000033,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "TestEventTrigger",
+                    "args": {
+                        "enableKey": "bytes",
+                        "eventTrigger": "int",
+                    },
+                },
             },
             "attributes": {
                 0x00000000: {
@@ -2880,6 +2888,12 @@ class ChipClusters:
                     "type": "int",
                     "reportable": True,
                 },
+                0x00000008: {
+                    "attributeName": "TestEventTriggersEnabled",
+                    "attributeId": 0x00000008,
+                    "type": "bool",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -4352,7 +4366,7 @@ class ChipClusters:
                         "NOCValue": "bytes",
                         "ICACValue": "bytes",
                         "IPKValue": "bytes",
-                        "caseAdminNode": "int",
+                        "caseAdminSubject": "int",
                         "adminVendorId": "int",
                     },
                 },
@@ -4375,6 +4389,7 @@ class ChipClusters:
                     "commandName": "CSRRequest",
                     "args": {
                         "CSRNonce": "bytes",
+                        "isForUpdateNOC": "bool",
                     },
                 },
             0x00000002: {
@@ -4391,13 +4406,6 @@ class ChipClusters:
                         "fabricIndex": "int",
                     },
                 },
-            0x0000000C: {
-                    "commandId": 0x0000000C,
-                    "commandName": "RemoveTrustedRootCertificate",
-                    "args": {
-                        "trustedRootIdentifier": "bytes",
-                    },
-                },
             0x00000009: {
                     "commandId": 0x00000009,
                     "commandName": "UpdateFabricLabel",
@@ -5434,7 +5442,7 @@ class ChipClusters:
     }
     _TEST_CLUSTER_CLUSTER_INFO = {
             "clusterName": "TestCluster",
-            "clusterId": 0x0000050F,
+            "clusterId": 0xFFF1FC05,
             "commands": {
             0x00000011: {
                     "commandId": 0x00000011,
@@ -6207,12 +6215,6 @@ class ChipClusters:
                     "args": {
                     },
                 },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "GetRelayStatusLog",
-                    "args": {
-                    },
-                },
             0x00000002: {
                     "commandId": 0x00000002,
                     "commandName": "GetWeeklySchedule",
@@ -7203,6 +7205,18 @@ class ChipClusters:
                     "type": "int",
                     "reportable": True,
                 },
+                0x00000001: {
+                    "attributeName": "PhysicalClosedLimitLift",
+                    "attributeId": 0x00000001,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000002: {
+                    "attributeName": "PhysicalClosedLimitTilt",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x00000003: {
                     "attributeName": "CurrentPositionLift",
                     "attributeId": 0x00000003,
@@ -7215,6 +7229,18 @@ class ChipClusters:
                     "type": "int",
                     "reportable": True,
                 },
+                0x00000005: {
+                    "attributeName": "NumberOfActuationsLift",
+                    "attributeId": 0x00000005,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000006: {
+                    "attributeName": "NumberOfActuationsTilt",
+                    "attributeId": 0x00000006,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x00000007: {
                     "attributeName": "ConfigStatus",
                     "attributeId": 0x00000007,
@@ -7394,7 +7420,7 @@ class ChipClusters:
     0x0000003B: _SWITCH_CLUSTER_INFO,
     0x00000505: _TARGET_NAVIGATOR_CLUSTER_INFO,
     0x00000402: _TEMPERATURE_MEASUREMENT_CLUSTER_INFO,
-    0x0000050F: _TEST_CLUSTER_CLUSTER_INFO,
+    0xFFF1FC05: _TEST_CLUSTER_CLUSTER_INFO,
     0x00000201: _THERMOSTAT_CLUSTER_INFO,
     0x00000204: _THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_INFO,
     0x00000035: _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 599b1382c11195..47d298a82c9e62 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -2993,9 +2993,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="currentFrequency", Tag=0x00000004, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="minFrequency", Tag=0x00000005, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="maxFrequency", Tag=0x00000006, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="options", Tag=0x0000000F, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="options", Tag=0x0000000F, Type=uint),
                 ClusterObjectFieldDescriptor(Label="onOffTransitionTime", Tag=0x00000010, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="onLevel", Tag=0x00000011, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="onLevel", Tag=0x00000011, Type=typing.Union[Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="onTransitionTime", Tag=0x00000012, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="offTransitionTime", Tag=0x00000013, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="defaultMoveRate", Tag=0x00000014, Type=typing.Union[None, Nullable, uint]),
@@ -3014,9 +3014,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     currentFrequency: 'typing.Optional[uint]' = None
     minFrequency: 'typing.Optional[uint]' = None
     maxFrequency: 'typing.Optional[uint]' = None
-    options: 'typing.Optional[uint]' = None
+    options: 'uint' = None
     onOffTransitionTime: 'typing.Optional[uint]' = None
-    onLevel: 'typing.Union[None, Nullable, uint]' = None
+    onLevel: 'typing.Union[Nullable, uint]' = None
     onTransitionTime: 'typing.Union[None, Nullable, uint]' = None
     offTransitionTime: 'typing.Union[None, Nullable, uint]' = None
     defaultMoveRate: 'typing.Union[None, Nullable, uint]' = None
@@ -3187,6 +3187,21 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     ])
 
 
+        @dataclass
+        class MoveToClosestFrequency(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x0008
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="frequency", Tag=0, Type=uint),
+                    ])
+
+            frequency: 'uint' = 0
+
 
     class Attributes:
         @dataclass
@@ -3313,9 +3328,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
         class OnOffTransitionTime(ClusterAttributeDescriptor):
@@ -3345,9 +3360,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
         class OnTransitionTime(ClusterAttributeDescriptor):
@@ -5675,7 +5690,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
                 ClusterObjectFieldDescriptor(Label="acl", Tag=0x00000000, Type=typing.List[AccessControl.Structs.AccessControlEntry]),
-                ClusterObjectFieldDescriptor(Label="extension", Tag=0x00000001, Type=typing.List[AccessControl.Structs.ExtensionEntry]),
+                ClusterObjectFieldDescriptor(Label="extension", Tag=0x00000001, Type=typing.Optional[typing.List[AccessControl.Structs.ExtensionEntry]]),
                 ClusterObjectFieldDescriptor(Label="subjectsPerAccessControlEntry", Tag=0x00000002, Type=uint),
                 ClusterObjectFieldDescriptor(Label="targetsPerAccessControlEntry", Tag=0x00000003, Type=uint),
                 ClusterObjectFieldDescriptor(Label="accessControlEntriesPerFabric", Tag=0x00000004, Type=uint),
@@ -5687,7 +5702,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             ])
 
     acl: 'typing.List[AccessControl.Structs.AccessControlEntry]' = None
-    extension: 'typing.List[AccessControl.Structs.ExtensionEntry]' = None
+    extension: 'typing.Optional[typing.List[AccessControl.Structs.ExtensionEntry]]' = None
     subjectsPerAccessControlEntry: 'uint' = None
     targetsPerAccessControlEntry: 'uint' = None
     accessControlEntriesPerFabric: 'uint' = None
@@ -5796,9 +5811,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[AccessControl.Structs.ExtensionEntry])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[AccessControl.Structs.ExtensionEntry]])
 
-            value: 'typing.List[AccessControl.Structs.ExtensionEntry]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[typing.List[AccessControl.Structs.ExtensionEntry]]' = None
 
         @dataclass
         class SubjectsPerAccessControlEntry(ClusterAttributeDescriptor):
@@ -10244,6 +10259,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="activeHardwareFaults", Tag=0x00000005, Type=typing.Optional[typing.List[uint]]),
                 ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[uint]]),
                 ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[uint]]),
+                ClusterObjectFieldDescriptor(Label="testEventTriggersEnabled", Tag=0x00000008, Type=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]),
@@ -10259,6 +10275,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     activeHardwareFaults: 'typing.Optional[typing.List[uint]]' = None
     activeRadioFaults: 'typing.Optional[typing.List[uint]]' = None
     activeNetworkFaults: 'typing.Optional[typing.List[uint]]' = None
+    testEventTriggersEnabled: 'bool' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -10339,6 +10356,24 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+    class Commands:
+        @dataclass
+        class TestEventTrigger(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0033
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="enableKey", Tag=0, Type=bytes),
+                            ClusterObjectFieldDescriptor(Label="eventTrigger", Tag=1, Type=uint),
+                    ])
+
+            enableKey: 'bytes' = b""
+            eventTrigger: 'uint' = 0
+
 
     class Attributes:
         @dataclass
@@ -10469,6 +10504,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[typing.List[uint]]' = None
 
+        @dataclass
+        class TestEventTriggersEnabled(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0033
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=bool)
+
+            value: 'bool' = False
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -10687,17 +10738,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="id", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
-                            ClusterObjectFieldDescriptor(Label="stackFreeCurrent", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="stackFreeMinimum", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="stackSize", Tag=4, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="stackFreeCurrent", Tag=2, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="stackFreeMinimum", Tag=3, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="stackSize", Tag=4, Type=typing.Optional[uint]),
                     ])
 
             id: 'uint' = 0
-            name: 'str' = ""
-            stackFreeCurrent: 'uint' = 0
-            stackFreeMinimum: 'uint' = 0
-            stackSize: 'uint' = 0
+            name: 'typing.Optional[str]' = None
+            stackFreeCurrent: 'typing.Optional[uint]' = None
+            stackFreeMinimum: 'typing.Optional[uint]' = None
+            stackSize: 'typing.Optional[uint]' = None
 
 
 
@@ -10892,7 +10943,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
                 ClusterObjectFieldDescriptor(Label="channel", Tag=0x00000000, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="routingRole", Tag=0x00000001, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]),
                 ClusterObjectFieldDescriptor(Label="networkName", Tag=0x00000002, Type=typing.Union[Nullable, str]),
                 ClusterObjectFieldDescriptor(Label="panId", Tag=0x00000003, Type=typing.Union[Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="extendedPanId", Tag=0x00000004, Type=typing.Union[Nullable, uint]),
@@ -10900,11 +10951,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="overrunCount", Tag=0x00000006, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="neighborTableList", Tag=0x00000007, Type=typing.List[ThreadNetworkDiagnostics.Structs.NeighborTable]),
                 ClusterObjectFieldDescriptor(Label="routeTableList", Tag=0x00000008, Type=typing.List[ThreadNetworkDiagnostics.Structs.RouteTable]),
-                ClusterObjectFieldDescriptor(Label="partitionId", Tag=0x00000009, Type=uint),
-                ClusterObjectFieldDescriptor(Label="weighting", Tag=0x0000000A, Type=uint),
-                ClusterObjectFieldDescriptor(Label="dataVersion", Tag=0x0000000B, Type=uint),
-                ClusterObjectFieldDescriptor(Label="stableDataVersion", Tag=0x0000000C, Type=uint),
-                ClusterObjectFieldDescriptor(Label="leaderRouterId", Tag=0x0000000D, Type=uint),
+                ClusterObjectFieldDescriptor(Label="partitionId", Tag=0x00000009, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="weighting", Tag=0x0000000A, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="dataVersion", Tag=0x0000000B, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="stableDataVersion", Tag=0x0000000C, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="leaderRouterId", Tag=0x0000000D, Type=typing.Union[Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="detachedRoleCount", Tag=0x0000000E, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="childRoleCount", Tag=0x0000000F, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="routerRoleCount", Tag=0x00000010, Type=typing.Optional[uint]),
@@ -10947,12 +10998,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="rxErrSecCount", Tag=0x00000035, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="rxErrFcsCount", Tag=0x00000036, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="rxErrOtherCount", Tag=0x00000037, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="activeTimestamp", Tag=0x00000038, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="pendingTimestamp", Tag=0x00000039, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="delay", Tag=0x0000003A, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="securityPolicy", Tag=0x0000003B, Type=typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]),
-                ClusterObjectFieldDescriptor(Label="channelMask", Tag=0x0000003C, Type=bytes),
-                ClusterObjectFieldDescriptor(Label="operationalDatasetComponents", Tag=0x0000003D, Type=typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]),
+                ClusterObjectFieldDescriptor(Label="activeTimestamp", Tag=0x00000038, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="pendingTimestamp", Tag=0x00000039, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="delay", Tag=0x0000003A, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="securityPolicy", Tag=0x0000003B, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]),
+                ClusterObjectFieldDescriptor(Label="channelMask", Tag=0x0000003C, Type=typing.Union[Nullable, bytes]),
+                ClusterObjectFieldDescriptor(Label="operationalDatasetComponents", Tag=0x0000003D, Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]),
                 ClusterObjectFieldDescriptor(Label="activeNetworkFaultsList", Tag=0x0000003E, Type=typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -10962,7 +11013,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             ])
 
     channel: 'typing.Union[Nullable, uint]' = None
-    routingRole: 'typing.Union[Nullable, uint]' = None
+    routingRole: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]' = None
     networkName: 'typing.Union[Nullable, str]' = None
     panId: 'typing.Union[Nullable, uint]' = None
     extendedPanId: 'typing.Union[Nullable, uint]' = None
@@ -10970,11 +11021,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     overrunCount: 'typing.Optional[uint]' = None
     neighborTableList: 'typing.List[ThreadNetworkDiagnostics.Structs.NeighborTable]' = None
     routeTableList: 'typing.List[ThreadNetworkDiagnostics.Structs.RouteTable]' = None
-    partitionId: 'uint' = None
-    weighting: 'uint' = None
-    dataVersion: 'uint' = None
-    stableDataVersion: 'uint' = None
-    leaderRouterId: 'uint' = None
+    partitionId: 'typing.Union[Nullable, uint]' = None
+    weighting: 'typing.Union[Nullable, uint]' = None
+    dataVersion: 'typing.Union[Nullable, uint]' = None
+    stableDataVersion: 'typing.Union[Nullable, uint]' = None
+    leaderRouterId: 'typing.Union[Nullable, uint]' = None
     detachedRoleCount: 'typing.Optional[uint]' = None
     childRoleCount: 'typing.Optional[uint]' = None
     routerRoleCount: 'typing.Optional[uint]' = None
@@ -11017,12 +11068,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     rxErrSecCount: 'typing.Optional[uint]' = None
     rxErrFcsCount: 'typing.Optional[uint]' = None
     rxErrOtherCount: 'typing.Optional[uint]' = None
-    activeTimestamp: 'typing.Optional[uint]' = None
-    pendingTimestamp: 'typing.Optional[uint]' = None
-    delay: 'typing.Optional[uint]' = None
-    securityPolicy: 'typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = None
-    channelMask: 'bytes' = None
-    operationalDatasetComponents: 'typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = None
+    activeTimestamp: 'typing.Union[None, Nullable, uint]' = None
+    pendingTimestamp: 'typing.Union[None, Nullable, uint]' = None
+    delay: 'typing.Union[None, Nullable, uint]' = None
+    securityPolicy: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = None
+    channelMask: 'typing.Union[Nullable, bytes]' = None
+    operationalDatasetComponents: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = None
     activeNetworkFaultsList: 'typing.List[ThreadNetworkDiagnostics.Enums.NetworkFault]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
@@ -11210,9 +11261,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Enums.RoutingRole]' = NullValue
 
         @dataclass
         class NetworkName(ClusterAttributeDescriptor):
@@ -11338,9 +11389,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
         class Weighting(ClusterAttributeDescriptor):
@@ -11354,9 +11405,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
         class DataVersion(ClusterAttributeDescriptor):
@@ -11370,9 +11421,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
         class StableDataVersion(ClusterAttributeDescriptor):
@@ -11386,9 +11437,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
         class LeaderRouterId(ClusterAttributeDescriptor):
@@ -11402,9 +11453,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
         class DetachedRoleCount(ClusterAttributeDescriptor):
@@ -12090,9 +12141,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
         class PendingTimestamp(ClusterAttributeDescriptor):
@@ -12106,9 +12157,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
         class Delay(ClusterAttributeDescriptor):
@@ -12122,9 +12173,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
         class SecurityPolicy(ClusterAttributeDescriptor):
@@ -12138,9 +12189,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy])
 
-            value: 'typing.List[ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = field(default_factory=lambda: [])
+            value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.SecurityPolicy]' = NullValue
 
         @dataclass
         class ChannelMask(ClusterAttributeDescriptor):
@@ -12154,9 +12205,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bytes)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, bytes])
 
-            value: 'bytes' = b""
+            value: 'typing.Union[Nullable, bytes]' = NullValue
 
         @dataclass
         class OperationalDatasetComponents(ClusterAttributeDescriptor):
@@ -12170,9 +12221,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents])
 
-            value: 'typing.List[ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = field(default_factory=lambda: [])
+            value: 'typing.Union[Nullable, ThreadNetworkDiagnostics.Structs.OperationalDatasetComponents]' = NullValue
 
         @dataclass
         class ActiveNetworkFaultsList(ClusterAttributeDescriptor):
@@ -13597,7 +13648,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             Fields = [
                 ClusterObjectFieldDescriptor(Label="numberOfPositions", Tag=0x00000000, Type=uint),
                 ClusterObjectFieldDescriptor(Label="currentPosition", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="multiPressMax", Tag=0x00000002, Type=uint),
+                ClusterObjectFieldDescriptor(Label="multiPressMax", Tag=0x00000002, Type=typing.Optional[uint]),
                 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]),
@@ -13607,7 +13658,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     numberOfPositions: 'uint' = None
     currentPosition: 'uint' = None
-    multiPressMax: 'uint' = None
+    multiPressMax: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -13662,9 +13713,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -14163,6 +14214,7 @@ class OperationalCertStatus(IntEnum):
             kInvalidNOC = 0x03
             kMissingCsr = 0x04
             kTableFull = 0x05
+            kInvalidAdminSubject = 0x06
             kInsufficientPrivilege = 0x08
             kFabricConflict = 0x09
             kLabelConflict = 0x0A
@@ -14282,9 +14334,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="CSRNonce", Tag=0, Type=bytes),
+                            ClusterObjectFieldDescriptor(Label="isForUpdateNOC", Tag=1, Type=typing.Optional[bool]),
                     ])
 
             CSRNonce: 'bytes' = b""
+            isForUpdateNOC: 'typing.Optional[bool]' = None
 
         @dataclass
         class CSRResponse(ClusterCommand):
@@ -14316,14 +14370,14 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                             ClusterObjectFieldDescriptor(Label="NOCValue", Tag=0, Type=bytes),
                             ClusterObjectFieldDescriptor(Label="ICACValue", Tag=1, Type=typing.Optional[bytes]),
                             ClusterObjectFieldDescriptor(Label="IPKValue", Tag=2, Type=bytes),
-                            ClusterObjectFieldDescriptor(Label="caseAdminNode", Tag=3, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="caseAdminSubject", Tag=3, Type=uint),
                             ClusterObjectFieldDescriptor(Label="adminVendorId", Tag=4, Type=uint),
                     ])
 
             NOCValue: 'bytes' = b""
             ICACValue: 'typing.Optional[bytes]' = None
             IPKValue: 'bytes' = b""
-            caseAdminNode: 'uint' = 0
+            caseAdminSubject: 'uint' = 0
             adminVendorId: 'uint' = 0
 
         @dataclass
@@ -14407,21 +14461,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
             rootCertificate: 'bytes' = b""
 
-        @dataclass
-        class RemoveTrustedRootCertificate(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x000C
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="trustedRootIdentifier", Tag=0, Type=bytes),
-                    ])
-
-            trustedRootIdentifier: 'bytes' = b""
-
 
     class Attributes:
         @dataclass
@@ -16155,7 +16194,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="doorOpenEvents", Tag=0x00000004, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="doorClosedEvents", Tag=0x00000005, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="openPeriod", Tag=0x00000006, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="numberOfLogRecordsSupported", Tag=0x00000010, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="numberOfTotalUsersSupported", Tag=0x00000011, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="numberOfPINUsersSupported", Tag=0x00000012, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="numberOfRFIDUsersSupported", Tag=0x00000013, Type=typing.Optional[uint]),
@@ -16168,7 +16206,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="minRFIDCodeLength", Tag=0x0000001A, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="credentialRulesSupport", Tag=0x0000001B, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="numberOfCredentialsSupportedPerUser", Tag=0x0000001C, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="enableLogging", Tag=0x00000020, Type=typing.Optional[bool]),
                 ClusterObjectFieldDescriptor(Label="language", Tag=0x00000021, Type=typing.Optional[str]),
                 ClusterObjectFieldDescriptor(Label="LEDSettings", Tag=0x00000022, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="autoRelockTime", Tag=0x00000023, Type=uint),
@@ -16186,14 +16223,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="sendPINOverTheAir", Tag=0x00000032, Type=typing.Optional[bool]),
                 ClusterObjectFieldDescriptor(Label="requirePINforRemoteOperation", Tag=0x00000033, Type=typing.Optional[bool]),
                 ClusterObjectFieldDescriptor(Label="expiringUserTimeout", Tag=0x00000035, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="alarmMask", Tag=0x00000040, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="keypadOperationEventMask", Tag=0x00000041, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="remoteOperationEventMask", Tag=0x00000042, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="manualOperationEventMask", Tag=0x00000043, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="RFIDOperationEventMask", Tag=0x00000044, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="keypadProgrammingEventMask", Tag=0x00000045, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="remoteProgrammingEventMask", Tag=0x00000046, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="RFIDProgrammingEventMask", Tag=0x00000047, Type=typing.Optional[uint]),
                 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]),
@@ -16208,7 +16237,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     doorOpenEvents: 'typing.Optional[uint]' = None
     doorClosedEvents: 'typing.Optional[uint]' = None
     openPeriod: 'typing.Optional[uint]' = None
-    numberOfLogRecordsSupported: 'typing.Optional[uint]' = None
     numberOfTotalUsersSupported: 'typing.Optional[uint]' = None
     numberOfPINUsersSupported: 'typing.Optional[uint]' = None
     numberOfRFIDUsersSupported: 'typing.Optional[uint]' = None
@@ -16221,7 +16249,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     minRFIDCodeLength: 'typing.Optional[uint]' = None
     credentialRulesSupport: 'typing.Optional[uint]' = None
     numberOfCredentialsSupportedPerUser: 'typing.Optional[uint]' = None
-    enableLogging: 'typing.Optional[bool]' = None
     language: 'typing.Optional[str]' = None
     LEDSettings: 'typing.Optional[uint]' = None
     autoRelockTime: 'uint' = None
@@ -16239,14 +16266,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     sendPINOverTheAir: 'typing.Optional[bool]' = None
     requirePINforRemoteOperation: 'typing.Optional[bool]' = None
     expiringUserTimeout: 'typing.Optional[uint]' = None
-    alarmMask: 'typing.Optional[uint]' = None
-    keypadOperationEventMask: 'typing.Optional[uint]' = None
-    remoteOperationEventMask: 'typing.Optional[uint]' = None
-    manualOperationEventMask: 'typing.Optional[uint]' = None
-    RFIDOperationEventMask: 'typing.Optional[uint]' = None
-    keypadProgrammingEventMask: 'typing.Optional[uint]' = None
-    remoteProgrammingEventMask: 'typing.Optional[uint]' = None
-    RFIDProgrammingEventMask: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -16500,194 +16519,6 @@ def must_use_timed_invoke(cls) -> bool:
             timeout: 'uint' = 0
             pinCode: 'typing.Optional[bytes]' = None
 
-        @dataclass
-        class GetLogRecord(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0004
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="logIndex", Tag=0, Type=uint),
-                    ])
-
-            logIndex: 'uint' = 0
-
-        @dataclass
-        class GetLogRecordResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0004
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="logEntryId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="timestamp", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="eventType", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="source", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="eventIdOrAlarmCode", Tag=4, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=5, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="pin", Tag=6, Type=bytes),
-                    ])
-
-            logEntryId: 'uint' = 0
-            timestamp: 'uint' = 0
-            eventType: 'uint' = 0
-            source: 'uint' = 0
-            eventIdOrAlarmCode: 'uint' = 0
-            userId: 'uint' = 0
-            pin: 'bytes' = b""
-
-        @dataclass
-        class SetPINCode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0005
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=1, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=2, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
-                            ClusterObjectFieldDescriptor(Label="pin", Tag=3, Type=bytes),
-                    ])
-
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
-
-            userId: 'uint' = 0
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
-            pin: 'bytes' = b""
-
-        @dataclass
-        class GetPINCode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0006
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                    ])
-
-            userId: 'uint' = 0
-
-        @dataclass
-        class GetPINCodeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0006
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=1, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=2, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
-                            ClusterObjectFieldDescriptor(Label="pin", Tag=3, Type=typing.Union[Nullable, bytes]),
-                    ])
-
-            userId: 'uint' = 0
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
-            pin: 'typing.Union[Nullable, bytes]' = NullValue
-
-        @dataclass
-        class ClearPINCode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0007
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="pinSlotIndex", Tag=0, Type=uint),
-                    ])
-
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
-
-            pinSlotIndex: 'uint' = 0
-
-        @dataclass
-        class ClearAllPINCodes(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0008
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
-
-
-        @dataclass
-        class SetUserStatus(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0009
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=1, Type=DoorLock.Enums.DlUserStatus),
-                    ])
-
-            userId: 'uint' = 0
-            userStatus: 'DoorLock.Enums.DlUserStatus' = 0
-
-        @dataclass
-        class GetUserStatus(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000A
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                    ])
-
-            userId: 'uint' = 0
-
-        @dataclass
-        class GetUserStatusResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000A
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=1, Type=DoorLock.Enums.DlUserStatus),
-                    ])
-
-            userId: 'uint' = 0
-            userStatus: 'DoorLock.Enums.DlUserStatus' = 0
-
         @dataclass
         class SetWeekDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
@@ -16930,152 +16761,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
             holidayIndex: 'uint' = 0
 
-        @dataclass
-        class SetUserType(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0014
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=1, Type=DoorLock.Enums.DlUserType),
-                    ])
-
-            userId: 'uint' = 0
-            userType: 'DoorLock.Enums.DlUserType' = 0
-
-        @dataclass
-        class GetUserType(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0015
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                    ])
-
-            userId: 'uint' = 0
-
-        @dataclass
-        class GetUserTypeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0015
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=1, Type=DoorLock.Enums.DlUserType),
-                    ])
-
-            userId: 'uint' = 0
-            userType: 'DoorLock.Enums.DlUserType' = 0
-
-        @dataclass
-        class SetRFIDCode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0016
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=1, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=2, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
-                            ClusterObjectFieldDescriptor(Label="rfidCode", Tag=3, Type=bytes),
-                    ])
-
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
-
-            userId: 'uint' = 0
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
-            rfidCode: 'bytes' = b""
-
-        @dataclass
-        class GetRFIDCode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0017
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                    ])
-
-            userId: 'uint' = 0
-
-        @dataclass
-        class GetRFIDCodeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0017
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=1, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=2, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
-                            ClusterObjectFieldDescriptor(Label="rfidCode", Tag=3, Type=typing.Union[Nullable, bytes]),
-                    ])
-
-            userId: 'uint' = 0
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
-            rfidCode: 'typing.Union[Nullable, bytes]' = NullValue
-
-        @dataclass
-        class ClearRFIDCode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0018
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="rfidSlotIndex", Tag=0, Type=uint),
-                    ])
-
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
-
-            rfidSlotIndex: 'uint' = 0
-
-        @dataclass
-        class ClearAllRFIDCodes(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0019
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
-
-
         @dataclass
         class SetUser(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
@@ -17174,60 +16859,6 @@ def must_use_timed_invoke(cls) -> bool:
 
             userIndex: 'uint' = 0
 
-        @dataclass
-        class OperatingEventNotification(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0020
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="operationEventSource", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="operationEventCode", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="pin", Tag=3, Type=bytes),
-                            ClusterObjectFieldDescriptor(Label="localTime", Tag=4, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=5, Type=typing.Optional[str]),
-                    ])
-
-            operationEventSource: 'uint' = 0
-            operationEventCode: 'uint' = 0
-            userId: 'uint' = 0
-            pin: 'bytes' = b""
-            localTime: 'uint' = 0
-            data: 'typing.Optional[str]' = None
-
-        @dataclass
-        class ProgrammingEventNotification(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0021
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="programEventSource", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="programEventCode", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="userId", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="pin", Tag=3, Type=bytes),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=4, Type=DoorLock.Enums.DlUserType),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=5, Type=DoorLock.Enums.DlUserStatus),
-                            ClusterObjectFieldDescriptor(Label="localTime", Tag=6, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=7, Type=typing.Optional[str]),
-                    ])
-
-            programEventSource: 'uint' = 0
-            programEventCode: 'uint' = 0
-            userId: 'uint' = 0
-            pin: 'bytes' = b""
-            userType: 'DoorLock.Enums.DlUserType' = 0
-            userStatus: 'DoorLock.Enums.DlUserStatus' = 0
-            localTime: 'uint' = 0
-            data: 'typing.Optional[str]' = None
-
         @dataclass
         class SetCredential(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
@@ -17447,22 +17078,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[uint]' = None
 
-        @dataclass
-        class NumberOfLogRecordsSupported(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000010
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
         @dataclass
         class NumberOfTotalUsersSupported(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -17655,22 +17270,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[uint]' = None
 
-        @dataclass
-        class EnableLogging(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000020
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
-
-            value: 'typing.Optional[bool]' = None
-
         @dataclass
         class Language(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -17943,134 +17542,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[uint]' = None
 
-        @dataclass
-        class AlarmMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000040
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class KeypadOperationEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000041
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class RemoteOperationEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000042
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class ManualOperationEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000043
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class RFIDOperationEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000044
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class KeypadProgrammingEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000045
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class RemoteProgrammingEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000046
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class RFIDProgrammingEventMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0101
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000047
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -20100,7 +19571,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="remoteSensing", Tag=0x0000001A, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="controlSequenceOfOperation", Tag=0x0000001B, Type=Thermostat.Enums.ThermostatControlSequence),
                 ClusterObjectFieldDescriptor(Label="systemMode", Tag=0x0000001C, Type=uint),
-                ClusterObjectFieldDescriptor(Label="alarmMask", Tag=0x0000001D, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="thermostatRunningMode", Tag=0x0000001E, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="startOfWeek", Tag=0x00000020, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="numberOfWeeklyTransitions", Tag=0x00000021, Type=typing.Optional[uint]),
@@ -20157,7 +19627,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     remoteSensing: 'typing.Optional[uint]' = None
     controlSequenceOfOperation: 'Thermostat.Enums.ThermostatControlSequence' = None
     systemMode: 'uint' = None
-    alarmMask: 'typing.Optional[uint]' = None
     thermostatRunningMode: 'typing.Optional[uint]' = None
     startOfWeek: 'typing.Optional[uint]' = None
     numberOfWeeklyTransitions: 'typing.Optional[uint]' = None
@@ -20297,31 +19766,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             modeForSequence: 'uint' = 0
             transitions: 'typing.List[Thermostat.Structs.ThermostatScheduleTransition]' = field(default_factory=lambda: [])
 
-        @dataclass
-        class GetRelayStatusLogResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="timeOfDay", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="relayStatus", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="localTemperature", Tag=2, Type=int),
-                            ClusterObjectFieldDescriptor(Label="humidityInPercentage", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="setpoint", Tag=4, Type=int),
-                            ClusterObjectFieldDescriptor(Label="unreadEntries", Tag=5, Type=uint),
-                    ])
-
-            timeOfDay: 'uint' = 0
-            relayStatus: 'uint' = 0
-            localTemperature: 'int' = 0
-            humidityInPercentage: 'uint' = 0
-            setpoint: 'int' = 0
-            unreadEntries: 'uint' = 0
-
         @dataclass
         class GetWeeklySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0201
@@ -20352,19 +19796,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     ])
 
 
-        @dataclass
-        class GetRelayStatusLog(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0004
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
 
     class Attributes:
         @dataclass
@@ -20735,22 +20166,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-        @dataclass
-        class AlarmMask(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0201
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000001D
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
         @dataclass
         class ThermostatRunningMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -22042,8 +21457,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="colorCapabilities", Tag=0x0000400A, Type=uint),
                 ClusterObjectFieldDescriptor(Label="colorTempPhysicalMinMireds", Tag=0x0000400B, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="colorTempPhysicalMaxMireds", Tag=0x0000400C, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="coupleColorTempToLevelMinMireds", Tag=0x0000400D, Type=uint),
-                ClusterObjectFieldDescriptor(Label="startUpColorTemperatureMireds", Tag=0x00004010, Type=uint),
+                ClusterObjectFieldDescriptor(Label="coupleColorTempToLevelMinMireds", Tag=0x0000400D, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="startUpColorTemperatureMireds", Tag=0x00004010, Type=typing.Optional[uint]),
                 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]),
@@ -22101,8 +21516,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     colorCapabilities: 'uint' = None
     colorTempPhysicalMinMireds: 'typing.Optional[uint]' = None
     colorTempPhysicalMaxMireds: 'typing.Optional[uint]' = None
-    coupleColorTempToLevelMinMireds: 'uint' = None
-    startUpColorTemperatureMireds: 'uint' = None
+    coupleColorTempToLevelMinMireds: 'typing.Optional[uint]' = None
+    startUpColorTemperatureMireds: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -23394,9 +22809,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class StartUpColorTemperatureMireds(ClusterAttributeDescriptor):
@@ -23410,9 +22825,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -30593,20 +30008,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class IasZone(Cluster):
-    id: typing.ClassVar[int] = 0x0500
+class WakeOnLan(Cluster):
+    id: typing.ClassVar[int] = 0x0503
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="zoneState", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="zoneType", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="zoneStatus", Tag=0x00000002, Type=uint),
-                ClusterObjectFieldDescriptor(Label="iasCieAddress", Tag=0x00000010, Type=uint),
-                ClusterObjectFieldDescriptor(Label="zoneId", Tag=0x00000011, Type=uint),
-                ClusterObjectFieldDescriptor(Label="numberOfZoneSensitivityLevelsSupported", Tag=0x00000012, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="currentZoneSensitivityLevel", Tag=0x00000013, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="MACAddress", Tag=0x00000000, Type=typing.Optional[str]),
                 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]),
@@ -30614,169 +30023,90 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    zoneState: 'uint' = None
-    zoneType: 'uint' = None
-    zoneStatus: 'uint' = None
-    iasCieAddress: 'uint' = None
-    zoneId: 'uint' = None
-    numberOfZoneSensitivityLevelsSupported: 'typing.Optional[uint]' = None
-    currentZoneSensitivityLevel: 'typing.Optional[uint]' = None
+    MACAddress: 'typing.Optional[str]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Enums:
-        class IasEnrollResponseCode(IntEnum):
-            kSuccess = 0x00
-            kNotSupported = 0x01
-            kNoEnrollPermit = 0x02
-            kTooManyZones = 0x03
-
-        class IasZoneType(IntEnum):
-            kStandardCie = 0x00
-            kMotionSensor = 0x0D
-            kContactSwitch = 0x15
-            kFireSensor = 0x28
-            kWaterSensor = 0x2A
-            kGasSensor = 0x2B
-            kPersonalEmergencyDevice = 0x2C
-            kVibrationMovementSensor = 0x2D
-            kRemoteControl = 0x10F
-            kKeyFob = 0x115
-            kKeypad = 0x21D
-            kStandardWarningDevice = 0x225
-            kGlassBreakSensor = 0x226
-            kCarbonMonoxideSensor = 0x227
-            kSecurityRepeater = 0x229
-            kInvalidZoneType = 0xFFFF
 
 
 
-    class Commands:
+    class Attributes:
         @dataclass
-        class ZoneEnrollResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
-
+        class MACAddress(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="enrollResponseCode", Tag=0, Type=IasZone.Enums.IasEnrollResponseCode),
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=1, Type=uint),
-                    ])
-
-            enrollResponseCode: 'IasZone.Enums.IasEnrollResponseCode' = 0
-            zoneId: 'uint' = 0
+            def cluster_id(cls) -> int:
+                return 0x0503
 
-        @dataclass
-        class ZoneStatusChangeNotification(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = False
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneStatus", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="extendedStatus", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="delay", Tag=3, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
 
-            zoneStatus: 'uint' = 0
-            extendedStatus: 'uint' = 0
-            zoneId: 'uint' = 0
-            delay: 'uint' = 0
+            value: 'typing.Optional[str]' = None
 
         @dataclass
-        class InitiateNormalOperationMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
-
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
+            def cluster_id(cls) -> int:
+                return 0x0503
 
-        @dataclass
-        class ZoneEnrollRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneType", Tag=0, Type=IasZone.Enums.IasZoneType),
-                            ClusterObjectFieldDescriptor(Label="manufacturerCode", Tag=1, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            zoneType: 'IasZone.Enums.IasZoneType' = 0
-            manufacturerCode: 'uint' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class InitiateTestMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
-
+        class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="testModeDuration", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="currentZoneSensitivityLevel", Tag=1, Type=uint),
-                    ])
-
-            testModeDuration: 'uint' = 0
-            currentZoneSensitivityLevel: 'uint' = 0
+            def cluster_id(cls) -> int:
+                return 0x0503
 
-        @dataclass
-        class InitiateNormalOperationModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = False
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class InitiateTestModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0500
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = False
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0503
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
-    class Attributes:
         @dataclass
-        class ZoneState(ClusterAttributeDescriptor):
+        class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0503
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x0000FFFC
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -30785,14 +30115,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class ZoneType(ClusterAttributeDescriptor):
+        class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0503
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x0000FFFD
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -30800,91 +30130,204 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+
+
+@dataclass
+class Channel(Cluster):
+    id: typing.ClassVar[int] = 0x0504
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields = [
+                ClusterObjectFieldDescriptor(Label="channelList", Tag=0x00000000, Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]]),
+                ClusterObjectFieldDescriptor(Label="lineup", Tag=0x00000001, Type=typing.Union[None, Nullable, Channel.Structs.LineupInfo]),
+                ClusterObjectFieldDescriptor(Label="currentChannel", Tag=0x00000002, Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfo]),
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    channelList: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None
+    lineup: 'typing.Union[None, Nullable, Channel.Structs.LineupInfo]' = None
+    currentChannel: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfo]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class ChannelStatusEnum(IntEnum):
+            kSuccess = 0x00
+            kMultipleMatches = 0x01
+            kNoMatches = 0x02
+
+        class LineupInfoTypeEnum(IntEnum):
+            kMso = 0x00
+
+
+    class Structs:
         @dataclass
-        class ZoneStatus(ClusterAttributeDescriptor):
+        class ChannelInfo(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0500
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="majorNumber", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="minorNumber", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=2, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="callSign", Tag=3, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="affiliateCallSign", Tag=4, Type=typing.Optional[str]),
+                    ])
+
+            majorNumber: 'uint' = 0
+            minorNumber: 'uint' = 0
+            name: 'typing.Optional[str]' = None
+            callSign: 'typing.Optional[str]' = None
+            affiliateCallSign: 'typing.Optional[str]' = None
 
+        @dataclass
+        class LineupInfo(ClusterObject):
             @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000002
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="operatorName", Tag=0, Type=str),
+                            ClusterObjectFieldDescriptor(Label="lineupName", Tag=1, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="postalCode", Tag=2, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="lineupInfoType", Tag=3, Type=Channel.Enums.LineupInfoTypeEnum),
+                    ])
+
+            operatorName: 'str' = ""
+            lineupName: 'typing.Optional[str]' = None
+            postalCode: 'typing.Optional[str]' = None
+            lineupInfoType: 'Channel.Enums.LineupInfoTypeEnum' = 0
+
+
+
+    class Commands:
+        @dataclass
+        class ChangeChannel(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0504
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="match", Tag=0, Type=str),
+                    ])
 
-            value: 'uint' = 0
+            match: 'str' = ""
 
         @dataclass
-        class IasCieAddress(ClusterAttributeDescriptor):
+        class ChangeChannelResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0504
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
+
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0500
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=Channel.Enums.ChannelStatusEnum),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
+                    ])
+
+            status: 'Channel.Enums.ChannelStatusEnum' = 0
+            data: 'typing.Optional[str]' = None
+
+        @dataclass
+        class ChangeChannelByNumber(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0504
+            command_id: typing.ClassVar[int] = 0x0002
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000010
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="majorNumber", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="minorNumber", Tag=1, Type=uint),
+                    ])
+
+            majorNumber: 'uint' = 0
+            minorNumber: 'uint' = 0
+
+        @dataclass
+        class SkipChannel(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0504
+            command_id: typing.ClassVar[int] = 0x0003
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="count", Tag=0, Type=uint),
+                    ])
+
+            count: 'uint' = 0
 
-            value: 'uint' = 0
 
+    class Attributes:
         @dataclass
-        class ZoneId(ClusterAttributeDescriptor):
+        class ChannelList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000011
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None
 
         @dataclass
-        class NumberOfZoneSensitivityLevelsSupported(ClusterAttributeDescriptor):
+        class Lineup(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000012
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.LineupInfo])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, Channel.Structs.LineupInfo]' = None
 
         @dataclass
-        class CurrentZoneSensitivityLevel(ClusterAttributeDescriptor):
+        class CurrentChannel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000013
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfo])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfo]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -30900,7 +30343,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -30916,7 +30359,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -30932,7 +30375,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -30948,7 +30391,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0500
+                return 0x0504
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -30963,13 +30406,15 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class IasAce(Cluster):
-    id: typing.ClassVar[int] = 0x0501
+class TargetNavigator(Cluster):
+    id: typing.ClassVar[int] = 0x0505
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
+                ClusterObjectFieldDescriptor(Label="targetList", Tag=0x00000000, Type=typing.List[TargetNavigator.Structs.TargetInfo]),
+                ClusterObjectFieldDescriptor(Label="currentTarget", Tag=0x00000001, Type=typing.Optional[uint]),
                 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]),
@@ -30977,6 +30422,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
+    targetList: 'typing.List[TargetNavigator.Structs.TargetInfo]' = None
+    currentTarget: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -30984,94 +30431,32 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class IasAceAlarmStatus(IntEnum):
-            kNoAlarm = 0x00
-            kBurglar = 0x01
-            kFire = 0x02
-            kEmergency = 0x03
-            kPolicePanic = 0x04
-            kFirePanic = 0x05
-            kEmergencyPanic = 0x06
-
-        class IasAceArmMode(IntEnum):
-            kDisarm = 0x00
-            kArmDayHomeZonesOnly = 0x01
-            kArmNightSleepZonesOnly = 0x02
-            kArmAllZones = 0x03
-
-        class IasAceArmNotification(IntEnum):
-            kAllZonesDisarmed = 0x00
-            kOnlyDayHomeZonesArmed = 0x01
-            kOnlyNightSleepZonesArmed = 0x02
-            kAllZonesArmed = 0x03
-            kInvalidArmDisarmCode = 0x04
-            kNotReadyToArm = 0x05
-            kAlreadyDisarmed = 0x06
-
-        class IasAceAudibleNotification(IntEnum):
-            kMute = 0x00
-            kDefaultSound = 0x01
-
-        class IasAceBypassResult(IntEnum):
-            kZoneBypassed = 0x00
-            kZoneNotBypassed = 0x01
+        class TargetNavigatorStatusEnum(IntEnum):
+            kSuccess = 0x00
+            kTargetNotFound = 0x01
             kNotAllowed = 0x02
-            kInvalidZoneId = 0x03
-            kUnknownZoneId = 0x04
-            kInvalidArmDisarmCode = 0x05
-
-        class IasAcePanelStatus(IntEnum):
-            kPanelDisarmed = 0x00
-            kArmedStay = 0x01
-            kArmedNight = 0x02
-            kArmedAway = 0x03
-            kExitDelay = 0x04
-            kEntryDelay = 0x05
-            kNotReadyToArm = 0x06
-            kInAlarm = 0x07
-            kArmingStay = 0x08
-            kArmingNight = 0x09
-            kArmingAway = 0x0A
-
-        class IasZoneType(IntEnum):
-            kStandardCie = 0x00
-            kMotionSensor = 0x0D
-            kContactSwitch = 0x15
-            kFireSensor = 0x28
-            kWaterSensor = 0x2A
-            kGasSensor = 0x2B
-            kPersonalEmergencyDevice = 0x2C
-            kVibrationMovementSensor = 0x2D
-            kRemoteControl = 0x10F
-            kKeyFob = 0x115
-            kKeypad = 0x21D
-            kStandardWarningDevice = 0x225
-            kGlassBreakSensor = 0x226
-            kCarbonMonoxideSensor = 0x227
-            kSecurityRepeater = 0x229
-            kInvalidZoneType = 0xFFFF
 
 
     class Structs:
         @dataclass
-        class IasAceZoneStatusResult(ClusterObject):
+        class TargetInfo(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneStatus", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="identifier", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
                     ])
 
-            zoneId: 'uint' = 0
-            zoneStatus: 'uint' = 0
+            identifier: 'uint' = 0
+            name: 'str' = ""
 
 
 
     class Commands:
         @dataclass
-        class Arm(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
+        class NavigateTarget(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0505
             command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
@@ -31079,166 +30464,231 @@ class Arm(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="armMode", Tag=0, Type=IasAce.Enums.IasAceArmMode),
-                            ClusterObjectFieldDescriptor(Label="armDisarmCode", Tag=1, Type=str),
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="target", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            armMode: 'IasAce.Enums.IasAceArmMode' = 0
-            armDisarmCode: 'str' = ""
-            zoneId: 'uint' = 0
+            target: 'uint' = 0
+            data: 'typing.Optional[str]' = None
 
         @dataclass
-        class ArmResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0000
+        class NavigateTargetResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0505
+            command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="armNotification", Tag=0, Type=IasAce.Enums.IasAceArmNotification),
+                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=TargetNavigator.Enums.TargetNavigatorStatusEnum),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            armNotification: 'IasAce.Enums.IasAceArmNotification' = 0
+            status: 'TargetNavigator.Enums.TargetNavigatorStatusEnum' = 0
+            data: 'typing.Optional[str]' = None
+
 
+    class Attributes:
         @dataclass
-        class Bypass(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
+        class TargetList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="numberOfZones", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneIds", Tag=1, Type=typing.List[uint]),
-                            ClusterObjectFieldDescriptor(Label="armDisarmCode", Tag=2, Type=str),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[TargetNavigator.Structs.TargetInfo])
 
-            numberOfZones: 'uint' = 0
-            zoneIds: 'typing.List[uint]' = field(default_factory=lambda: [])
-            armDisarmCode: 'str' = ""
+            value: 'typing.List[TargetNavigator.Structs.TargetInfo]' = field(default_factory=lambda: [])
 
         @dataclass
-        class GetZoneIdMapResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
+        class CurrentTarget(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="section0", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section1", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section2", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section3", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section4", Tag=4, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section5", Tag=5, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section6", Tag=6, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section7", Tag=7, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section8", Tag=8, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section9", Tag=9, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section10", Tag=10, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section11", Tag=11, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section12", Tag=12, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section13", Tag=13, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section14", Tag=14, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="section15", Tag=15, Type=uint),
-                    ])
-
-            section0: 'uint' = 0
-            section1: 'uint' = 0
-            section2: 'uint' = 0
-            section3: 'uint' = 0
-            section4: 'uint' = 0
-            section5: 'uint' = 0
-            section6: 'uint' = 0
-            section7: 'uint' = 0
-            section8: 'uint' = 0
-            section9: 'uint' = 0
-            section10: 'uint' = 0
-            section11: 'uint' = 0
-            section12: 'uint' = 0
-            section13: 'uint' = 0
-            section14: 'uint' = 0
-            section15: 'uint' = 0
-
-        @dataclass
-        class Emergency(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
+            def attribute_id(cls) -> int:
+                return 0x00000001
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class GetZoneInformationResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = False
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneType", Tag=1, Type=IasAce.Enums.IasZoneType),
-                            ClusterObjectFieldDescriptor(Label="ieeeAddress", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneLabel", Tag=3, Type=str),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            zoneId: 'uint' = 0
-            zoneType: 'IasAce.Enums.IasZoneType' = 0
-            ieeeAddress: 'uint' = 0
-            zoneLabel: 'str' = ""
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class Fire(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = True
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+        @dataclass
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0505
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
+
+
+
+@dataclass
+class MediaPlayback(Cluster):
+    id: typing.ClassVar[int] = 0x0506
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields = [
+                ClusterObjectFieldDescriptor(Label="currentState", Tag=0x00000000, Type=MediaPlayback.Enums.PlaybackStateEnum),
+                ClusterObjectFieldDescriptor(Label="startTime", Tag=0x00000001, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="duration", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="sampledPosition", Tag=0x00000003, Type=typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition]),
+                ClusterObjectFieldDescriptor(Label="playbackSpeed", Tag=0x00000004, Type=typing.Optional[float32]),
+                ClusterObjectFieldDescriptor(Label="seekRangeEnd", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="seekRangeStart", Tag=0x00000006, Type=typing.Union[None, Nullable, uint]),
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    currentState: 'MediaPlayback.Enums.PlaybackStateEnum' = None
+    startTime: 'typing.Union[None, Nullable, uint]' = None
+    duration: 'typing.Union[None, Nullable, uint]' = None
+    sampledPosition: 'typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition]' = None
+    playbackSpeed: 'typing.Optional[float32]' = None
+    seekRangeEnd: 'typing.Union[None, Nullable, uint]' = None
+    seekRangeStart: 'typing.Union[None, Nullable, uint]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class MediaPlaybackStatusEnum(IntEnum):
+            kSuccess = 0x00
+            kInvalidStateForCommand = 0x01
+            kNotAllowed = 0x02
+            kNotActive = 0x03
+            kSpeedOutOfRange = 0x04
+            kSeekOutOfRange = 0x05
+
+        class PlaybackStateEnum(IntEnum):
+            kPlaying = 0x00
+            kPaused = 0x01
+            kNotPlaying = 0x02
+            kBuffering = 0x03
 
+
+    class Structs:
+        @dataclass
+        class PlaybackPosition(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="updatedAt", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="position", Tag=1, Type=typing.Union[Nullable, uint]),
                     ])
 
+            updatedAt: 'uint' = 0
+            position: 'typing.Union[Nullable, uint]' = NullValue
+
+
 
+    class Commands:
         @dataclass
-        class ZoneStatusChanged(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = False
+        class Play(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneStatus", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="audibleNotification", Tag=2, Type=IasAce.Enums.IasAceAudibleNotification),
-                            ClusterObjectFieldDescriptor(Label="zoneLabel", Tag=3, Type=str),
                     ])
 
-            zoneId: 'uint' = 0
-            zoneStatus: 'uint' = 0
-            audibleNotification: 'IasAce.Enums.IasAceAudibleNotification' = 0
-            zoneLabel: 'str' = ""
 
         @dataclass
-        class Panic(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0004
+        class Pause(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
@@ -31249,30 +30699,22 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
         @dataclass
-        class PanelStatusChanged(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0004
-            is_client: typing.ClassVar[bool] = False
+        class StopPlayback(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0002
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="panelStatus", Tag=0, Type=IasAce.Enums.IasAcePanelStatus),
-                            ClusterObjectFieldDescriptor(Label="secondsRemaining", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="audibleNotification", Tag=2, Type=IasAce.Enums.IasAceAudibleNotification),
-                            ClusterObjectFieldDescriptor(Label="alarmStatus", Tag=3, Type=IasAce.Enums.IasAceAlarmStatus),
                     ])
 
-            panelStatus: 'IasAce.Enums.IasAcePanelStatus' = 0
-            secondsRemaining: 'uint' = 0
-            audibleNotification: 'IasAce.Enums.IasAceAudibleNotification' = 0
-            alarmStatus: 'IasAce.Enums.IasAceAlarmStatus' = 0
 
         @dataclass
-        class GetZoneIdMap(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0005
+        class StartOver(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0003
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
@@ -31283,61 +30725,47 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
         @dataclass
-        class GetPanelStatusResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0005
-            is_client: typing.ClassVar[bool] = False
+        class Previous(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0004
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="panelStatus", Tag=0, Type=IasAce.Enums.IasAcePanelStatus),
-                            ClusterObjectFieldDescriptor(Label="secondsRemaining", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="audibleNotification", Tag=2, Type=IasAce.Enums.IasAceAudibleNotification),
-                            ClusterObjectFieldDescriptor(Label="alarmStatus", Tag=3, Type=IasAce.Enums.IasAceAlarmStatus),
                     ])
 
-            panelStatus: 'IasAce.Enums.IasAcePanelStatus' = 0
-            secondsRemaining: 'uint' = 0
-            audibleNotification: 'IasAce.Enums.IasAceAudibleNotification' = 0
-            alarmStatus: 'IasAce.Enums.IasAceAlarmStatus' = 0
 
         @dataclass
-        class GetZoneInformation(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0006
+        class Next(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0005
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneId", Tag=0, Type=uint),
                     ])
 
-            zoneId: 'uint' = 0
 
         @dataclass
-        class SetBypassedZoneList(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
+        class Rewind(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
             command_id: typing.ClassVar[int] = 0x0006
-            is_client: typing.ClassVar[bool] = False
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="numberOfZones", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneIds", Tag=1, Type=typing.List[uint]),
                     ])
 
-            numberOfZones: 'uint' = 0
-            zoneIds: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class GetPanelStatus(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
+        class FastForward(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
             command_id: typing.ClassVar[int] = 0x0007
             is_client: typing.ClassVar[bool] = True
 
@@ -31349,244 +30777,186 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
         @dataclass
-        class BypassResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0007
-            is_client: typing.ClassVar[bool] = False
+        class SkipForward(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0008
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="numberOfZones", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="bypassResult", Tag=1, Type=typing.List[IasAce.Enums.IasAceBypassResult]),
+                            ClusterObjectFieldDescriptor(Label="deltaPositionMilliseconds", Tag=0, Type=uint),
                     ])
 
-            numberOfZones: 'uint' = 0
-            bypassResult: 'typing.List[IasAce.Enums.IasAceBypassResult]' = field(default_factory=lambda: [])
+            deltaPositionMilliseconds: 'uint' = 0
 
         @dataclass
-        class GetBypassedZoneList(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0008
+        class SkipBackward(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x0009
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="deltaPositionMilliseconds", Tag=0, Type=uint),
                     ])
 
+            deltaPositionMilliseconds: 'uint' = 0
 
         @dataclass
-        class GetZoneStatusResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0008
+        class PlaybackResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x000A
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="zoneStatusComplete", Tag=0, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="numberOfZones", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneStatusResult", Tag=2, Type=typing.List[IasAce.Structs.IasAceZoneStatusResult]),
+                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatusEnum),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            zoneStatusComplete: 'bool' = False
-            numberOfZones: 'uint' = 0
-            zoneStatusResult: 'typing.List[IasAce.Structs.IasAceZoneStatusResult]' = field(default_factory=lambda: [])
+            status: 'MediaPlayback.Enums.MediaPlaybackStatusEnum' = 0
+            data: 'typing.Optional[str]' = None
 
         @dataclass
-        class GetZoneStatus(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0501
-            command_id: typing.ClassVar[int] = 0x0009
+        class Seek(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0506
+            command_id: typing.ClassVar[int] = 0x000B
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="startingZoneId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="maxNumberOfZoneIds", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="zoneStatusMaskFlag", Tag=2, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="zoneStatusMask", Tag=3, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="position", Tag=0, Type=uint),
                     ])
 
-            startingZoneId: 'uint' = 0
-            maxNumberOfZoneIds: 'uint' = 0
-            zoneStatusMaskFlag: 'bool' = False
-            zoneStatusMask: 'uint' = 0
+            position: 'uint' = 0
 
 
     class Attributes:
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class CurrentState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0501
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF8
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=MediaPlayback.Enums.PlaybackStateEnum)
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'MediaPlayback.Enums.PlaybackStateEnum' = 0
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
+        class StartTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0501
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF9
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class Duration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0501
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class SampledPosition(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0501
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition])
 
-            value: 'uint' = 0
+            value: 'typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition]' = None
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class PlaybackSpeed(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0501
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000004
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-
-
-@dataclass
-class IasWd(Cluster):
-    id: typing.ClassVar[int] = 0x0502
-
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                ClusterObjectFieldDescriptor(Label="maxDuration", Tag=0x00000000, Type=uint),
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    maxDuration: 'uint' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
-
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[float32])
 
+            value: 'typing.Optional[float32]' = None
 
-    class Commands:
         @dataclass
-        class StartWarning(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0502
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
-
+        class SeekRangeEnd(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="warningInfo", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="warningDuration", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="strobeDutyCycle", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="strobeLevel", Tag=3, Type=uint),
-                    ])
-
-            warningInfo: 'uint' = 0
-            warningDuration: 'uint' = 0
-            strobeDutyCycle: 'uint' = 0
-            strobeLevel: 'uint' = 0
-
-        @dataclass
-        class Squawk(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0502
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
+            def cluster_id(cls) -> int:
+                return 0x0506
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="squawkInfo", Tag=0, Type=uint),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000005
 
-            squawkInfo: 'uint' = 0
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
+            value: 'typing.Union[None, Nullable, uint]' = None
 
-    class Attributes:
         @dataclass
-        class MaxDuration(ClusterAttributeDescriptor):
+        class SeekRangeStart(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0502
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000006
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'uint' = 0
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0502
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31602,7 +30972,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0502
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31618,7 +30988,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0502
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31634,7 +31004,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0502
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31650,7 +31020,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0502
+                return 0x0506
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31665,14 +31035,15 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class WakeOnLan(Cluster):
-    id: typing.ClassVar[int] = 0x0503
+class MediaInput(Cluster):
+    id: typing.ClassVar[int] = 0x0507
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="MACAddress", Tag=0x00000000, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="inputList", Tag=0x00000000, Type=typing.List[MediaInput.Structs.InputInfo]),
+                ClusterObjectFieldDescriptor(Label="currentInput", Tag=0x00000001, Type=typing.Optional[uint]),
                 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]),
@@ -31680,22 +31051,116 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    MACAddress: 'typing.Optional[str]' = None
+    inputList: 'typing.List[MediaInput.Structs.InputInfo]' = None
+    currentInput: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class InputTypeEnum(IntEnum):
+            kInternal = 0x00
+            kAux = 0x01
+            kCoax = 0x02
+            kComposite = 0x03
+            kHdmi = 0x04
+            kInput = 0x05
+            kLine = 0x06
+            kOptical = 0x07
+            kVideo = 0x08
+            kScart = 0x09
+            kUsb = 0x0A
+            kOther = 0x0B
+
+
+    class Structs:
+        @dataclass
+        class InputInfo(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="inputType", Tag=1, Type=MediaInput.Enums.InputTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=2, Type=str),
+                            ClusterObjectFieldDescriptor(Label="description", Tag=3, Type=str),
+                    ])
+
+            index: 'uint' = 0
+            inputType: 'MediaInput.Enums.InputTypeEnum' = 0
+            name: 'str' = ""
+            description: 'str' = ""
+
+
+
+    class Commands:
+        @dataclass
+        class SelectInput(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0507
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                    ])
+
+            index: 'uint' = 0
+
+        @dataclass
+        class ShowInputStatus(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0507
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                    ])
+
+
+        @dataclass
+        class HideInputStatus(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0507
+            command_id: typing.ClassVar[int] = 0x0002
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                    ])
+
+
+        @dataclass
+        class RenameInput(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0507
+            command_id: typing.ClassVar[int] = 0x0003
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
+                    ])
 
+            index: 'uint' = 0
+            name: 'str' = ""
 
 
     class Attributes:
         @dataclass
-        class MACAddress(ClusterAttributeDescriptor):
+        class InputList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0503
+                return 0x0507
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31703,15 +31168,31 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+                return ClusterObjectFieldDescriptor(Type=typing.List[MediaInput.Structs.InputInfo])
 
-            value: 'typing.Optional[str]' = None
+            value: 'typing.List[MediaInput.Structs.InputInfo]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class CurrentInput(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0507
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0503
+                return 0x0507
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31727,7 +31208,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0503
+                return 0x0507
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31743,7 +31224,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0503
+                return 0x0507
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31759,7 +31240,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0503
+                return 0x0507
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31775,7 +31256,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0503
+                return 0x0507
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -31790,16 +31271,13 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class Channel(Cluster):
-    id: typing.ClassVar[int] = 0x0504
+class LowPower(Cluster):
+    id: typing.ClassVar[int] = 0x0508
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="channelList", Tag=0x00000000, Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]]),
-                ClusterObjectFieldDescriptor(Label="lineup", Tag=0x00000001, Type=typing.Union[None, Nullable, Channel.Structs.LineupInfo]),
-                ClusterObjectFieldDescriptor(Label="currentChannel", Tag=0x00000002, Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfo]),
                 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]),
@@ -31807,68 +31285,18 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    channelList: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None
-    lineup: 'typing.Union[None, Nullable, Channel.Structs.LineupInfo]' = None
-    currentChannel: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfo]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Enums:
-        class ChannelStatusEnum(IntEnum):
-            kSuccess = 0x00
-            kMultipleMatches = 0x01
-            kNoMatches = 0x02
-
-        class LineupInfoTypeEnum(IntEnum):
-            kMso = 0x00
-
-
-    class Structs:
-        @dataclass
-        class ChannelInfo(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="majorNumber", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="minorNumber", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=2, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="callSign", Tag=3, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="affiliateCallSign", Tag=4, Type=typing.Optional[str]),
-                    ])
-
-            majorNumber: 'uint' = 0
-            minorNumber: 'uint' = 0
-            name: 'typing.Optional[str]' = None
-            callSign: 'typing.Optional[str]' = None
-            affiliateCallSign: 'typing.Optional[str]' = None
-
-        @dataclass
-        class LineupInfo(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="operatorName", Tag=0, Type=str),
-                            ClusterObjectFieldDescriptor(Label="lineupName", Tag=1, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="postalCode", Tag=2, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="lineupInfoType", Tag=3, Type=Channel.Enums.LineupInfoTypeEnum),
-                    ])
-
-            operatorName: 'str' = ""
-            lineupName: 'typing.Optional[str]' = None
-            postalCode: 'typing.Optional[str]' = None
-            lineupInfoType: 'Channel.Enums.LineupInfoTypeEnum' = 0
-
 
 
     class Commands:
         @dataclass
-        class ChangeChannel(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0504
+        class Sleep(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0508
             command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
@@ -31876,115 +31304,248 @@ class ChangeChannel(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="match", Tag=0, Type=str),
                     ])
 
-            match: 'str' = ""
 
-        @dataclass
-        class ChangeChannelResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
 
+    class Attributes:
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=Channel.Enums.ChannelStatusEnum),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
-                    ])
-
-            status: 'Channel.Enums.ChannelStatusEnum' = 0
-            data: 'typing.Optional[str]' = None
+            def cluster_id(cls) -> int:
+                return 0x0508
 
-        @dataclass
-        class ChangeChannelByNumber(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="majorNumber", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="minorNumber", Tag=1, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            majorNumber: 'uint' = 0
-            minorNumber: 'uint' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class SkipChannel(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = True
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0508
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="count", Tag=0, Type=uint),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
 
-            count: 'uint' = 0
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
-    class Attributes:
         @dataclass
-        class ChannelList(ClusterAttributeDescriptor):
+        class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0508
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x0000FFFB
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]])
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class Lineup(ClusterAttributeDescriptor):
+        class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0508
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x0000FFFC
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.LineupInfo])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Union[None, Nullable, Channel.Structs.LineupInfo]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class CurrentChannel(ClusterAttributeDescriptor):
+        class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0508
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x0000FFFD
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Channel.Structs.ChannelInfo])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Union[None, Nullable, Channel.Structs.ChannelInfo]' = None
+            value: 'uint' = 0
+
+
+
+@dataclass
+class KeypadInput(Cluster):
+    id: typing.ClassVar[int] = 0x0509
+
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields = [
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
+
+    class Enums:
+        class CecKeyCode(IntEnum):
+            kSelect = 0x00
+            kUp = 0x01
+            kDown = 0x02
+            kLeft = 0x03
+            kRight = 0x04
+            kRightUp = 0x05
+            kRightDown = 0x06
+            kLeftUp = 0x07
+            kLeftDown = 0x08
+            kRootMenu = 0x09
+            kSetupMenu = 0x0A
+            kContentsMenu = 0x0B
+            kFavoriteMenu = 0x0C
+            kExit = 0x0D
+            kMediaTopMenu = 0x10
+            kMediaContextSensitiveMenu = 0x11
+            kNumberEntryMode = 0x1D
+            kNumber11 = 0x1E
+            kNumber12 = 0x1F
+            kNumber0OrNumber10 = 0x20
+            kNumbers1 = 0x21
+            kNumbers2 = 0x22
+            kNumbers3 = 0x23
+            kNumbers4 = 0x24
+            kNumbers5 = 0x25
+            kNumbers6 = 0x26
+            kNumbers7 = 0x27
+            kNumbers8 = 0x28
+            kNumbers9 = 0x29
+            kDot = 0x2A
+            kEnter = 0x2B
+            kClear = 0x2C
+            kNextFavorite = 0x2F
+            kChannelUp = 0x30
+            kChannelDown = 0x31
+            kPreviousChannel = 0x32
+            kSoundSelect = 0x33
+            kInputSelect = 0x34
+            kDisplayInformation = 0x35
+            kHelp = 0x36
+            kPageUp = 0x37
+            kPageDown = 0x38
+            kPower = 0x40
+            kVolumeUp = 0x41
+            kVolumeDown = 0x42
+            kMute = 0x43
+            kPlay = 0x44
+            kStop = 0x45
+            kPause = 0x46
+            kRecord = 0x47
+            kRewind = 0x48
+            kFastForward = 0x49
+            kEject = 0x4A
+            kForward = 0x4B
+            kBackward = 0x4C
+            kStopRecord = 0x4D
+            kPauseRecord = 0x4E
+            kReserved = 0x4F
+            kAngle = 0x50
+            kSubPicture = 0x51
+            kVideoOnDemand = 0x52
+            kElectronicProgramGuide = 0x53
+            kTimerProgramming = 0x54
+            kInitialConfiguration = 0x55
+            kSelectBroadcastType = 0x56
+            kSelectSoundPresentation = 0x57
+            kPlayFunction = 0x60
+            kPausePlayFunction = 0x61
+            kRecordFunction = 0x62
+            kPauseRecordFunction = 0x63
+            kStopFunction = 0x64
+            kMuteFunction = 0x65
+            kRestoreVolumeFunction = 0x66
+            kTuneFunction = 0x67
+            kSelectMediaFunction = 0x68
+            kSelectAvInputFunction = 0x69
+            kSelectAudioInputFunction = 0x6A
+            kPowerToggleFunction = 0x6B
+            kPowerOffFunction = 0x6C
+            kPowerOnFunction = 0x6D
+            kF1Blue = 0x71
+            kF2Red = 0x72
+            kF3Green = 0x73
+            kF4Yellow = 0x74
+            kF5 = 0x75
+            kData = 0x76
 
+        class KeypadInputStatusEnum(IntEnum):
+            kSuccess = 0x00
+            kUnsupportedKey = 0x01
+            kInvalidKeyInCurrentState = 0x02
+
+
+
+    class Commands:
+        @dataclass
+        class SendKey(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0509
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="keyCode", Tag=0, Type=KeypadInput.Enums.CecKeyCode),
+                    ])
+
+            keyCode: 'KeypadInput.Enums.CecKeyCode' = 0
+
+        @dataclass
+        class SendKeyResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0509
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=KeypadInput.Enums.KeypadInputStatusEnum),
+                    ])
+
+            status: 'KeypadInput.Enums.KeypadInputStatusEnum' = 0
+
+
+    class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0509
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32000,7 +31561,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0509
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32016,7 +31577,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0509
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32032,7 +31593,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0509
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32048,7 +31609,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0504
+                return 0x0509
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32063,15 +31624,15 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class TargetNavigator(Cluster):
-    id: typing.ClassVar[int] = 0x0505
+class ContentLauncher(Cluster):
+    id: typing.ClassVar[int] = 0x050A
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="targetList", Tag=0x00000000, Type=typing.List[TargetNavigator.Structs.TargetInfo]),
-                ClusterObjectFieldDescriptor(Label="currentTarget", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acceptHeader", Tag=0x00000000, Type=typing.Optional[typing.List[str]]),
+                ClusterObjectFieldDescriptor(Label="supportedStreamingProtocols", Tag=0x00000001, Type=typing.Optional[uint]),
                 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]),
@@ -32079,8 +31640,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    targetList: 'typing.List[TargetNavigator.Structs.TargetInfo]' = None
-    currentTarget: 'typing.Optional[uint]' = None
+    acceptHeader: 'typing.Optional[typing.List[str]]' = None
+    supportedStreamingProtocols: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -32088,32 +31649,128 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class TargetNavigatorStatusEnum(IntEnum):
+        class ContentLaunchStatusEnum(IntEnum):
             kSuccess = 0x00
-            kTargetNotFound = 0x01
-            kNotAllowed = 0x02
+            kUrlNotAvailable = 0x01
+            kAuthFailed = 0x02
+
+        class MetricTypeEnum(IntEnum):
+            kPixels = 0x00
+            kPercentage = 0x01
+
+        class ParameterEnum(IntEnum):
+            kActor = 0x00
+            kChannel = 0x01
+            kCharacter = 0x02
+            kDirector = 0x03
+            kEvent = 0x04
+            kFranchise = 0x05
+            kGenre = 0x06
+            kLeague = 0x07
+            kPopularity = 0x08
+            kProvider = 0x09
+            kSport = 0x0A
+            kSportsTeam = 0x0B
+            kType = 0x0C
 
 
     class Structs:
         @dataclass
-        class TargetInfo(ClusterObject):
+        class Dimension(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="identifier", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
+                            ClusterObjectFieldDescriptor(Label="width", Tag=0, Type=float),
+                            ClusterObjectFieldDescriptor(Label="height", Tag=1, Type=float),
+                            ClusterObjectFieldDescriptor(Label="metric", Tag=2, Type=ContentLauncher.Enums.MetricTypeEnum),
+                    ])
+
+            width: 'float' = 0.0
+            height: 'float' = 0.0
+            metric: 'ContentLauncher.Enums.MetricTypeEnum' = 0
+
+        @dataclass
+        class AdditionalInfo(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="name", Tag=0, Type=str),
+                            ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=str),
                     ])
 
-            identifier: 'uint' = 0
             name: 'str' = ""
+            value: 'str' = ""
+
+        @dataclass
+        class Parameter(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="type", Tag=0, Type=ContentLauncher.Enums.ParameterEnum),
+                            ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=str),
+                            ClusterObjectFieldDescriptor(Label="externalIDList", Tag=2, Type=typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]),
+                    ])
+
+            type: 'ContentLauncher.Enums.ParameterEnum' = 0
+            value: 'str' = ""
+            externalIDList: 'typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]' = None
+
+        @dataclass
+        class ContentSearch(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="parameterList", Tag=0, Type=typing.List[ContentLauncher.Structs.Parameter]),
+                    ])
+
+            parameterList: 'typing.List[ContentLauncher.Structs.Parameter]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class StyleInformation(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="imageUrl", Tag=0, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="color", Tag=1, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="size", Tag=2, Type=typing.Optional[ContentLauncher.Structs.Dimension]),
+                    ])
+
+            imageUrl: 'typing.Optional[str]' = None
+            color: 'typing.Optional[str]' = None
+            size: 'typing.Optional[ContentLauncher.Structs.Dimension]' = None
+
+        @dataclass
+        class BrandingInformation(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="providerName", Tag=0, Type=str),
+                            ClusterObjectFieldDescriptor(Label="background", Tag=1, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                            ClusterObjectFieldDescriptor(Label="logo", Tag=2, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                            ClusterObjectFieldDescriptor(Label="progressBar", Tag=3, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                            ClusterObjectFieldDescriptor(Label="splash", Tag=4, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                            ClusterObjectFieldDescriptor(Label="waterMark", Tag=5, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                    ])
+
+            providerName: 'str' = ""
+            background: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
+            logo: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
+            progressBar: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
+            splash: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
+            waterMark: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
 
 
 
     class Commands:
         @dataclass
-        class NavigateTarget(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0505
+        class LaunchContent(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050A
             command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
@@ -32121,37 +31778,58 @@ class NavigateTarget(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="target", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="search", Tag=0, Type=ContentLauncher.Structs.ContentSearch),
+                            ClusterObjectFieldDescriptor(Label="autoPlay", Tag=1, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=2, Type=typing.Optional[str]),
                     ])
 
-            target: 'uint' = 0
+            search: 'ContentLauncher.Structs.ContentSearch' = field(default_factory=lambda: ContentLauncher.Structs.ContentSearch())
+            autoPlay: 'bool' = False
             data: 'typing.Optional[str]' = None
 
         @dataclass
-        class NavigateTargetResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0505
+        class LaunchURL(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050A
             command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = True
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="contentURL", Tag=0, Type=str),
+                            ClusterObjectFieldDescriptor(Label="displayString", Tag=1, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.Optional[ContentLauncher.Structs.BrandingInformation]),
+                    ])
+
+            contentURL: 'str' = ""
+            displayString: 'typing.Optional[str]' = None
+            brandingInformation: 'typing.Optional[ContentLauncher.Structs.BrandingInformation]' = None
+
+        @dataclass
+        class LaunchResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050A
+            command_id: typing.ClassVar[int] = 0x0002
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=TargetNavigator.Enums.TargetNavigatorStatusEnum),
+                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ContentLauncher.Enums.ContentLaunchStatusEnum),
                             ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            status: 'TargetNavigator.Enums.TargetNavigatorStatusEnum' = 0
+            status: 'ContentLauncher.Enums.ContentLaunchStatusEnum' = 0
             data: 'typing.Optional[str]' = None
 
 
     class Attributes:
         @dataclass
-        class TargetList(ClusterAttributeDescriptor):
+        class AcceptHeader(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32159,15 +31837,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[TargetNavigator.Structs.TargetInfo])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
 
-            value: 'typing.List[TargetNavigator.Structs.TargetInfo]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[typing.List[str]]' = None
 
         @dataclass
-        class CurrentTarget(ClusterAttributeDescriptor):
+        class SupportedStreamingProtocols(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32183,7 +31861,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32199,7 +31877,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32215,7 +31893,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32231,7 +31909,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32247,7 +31925,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0505
+                return 0x050A
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32262,20 +31940,15 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class MediaPlayback(Cluster):
-    id: typing.ClassVar[int] = 0x0506
+class AudioOutput(Cluster):
+    id: typing.ClassVar[int] = 0x050B
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="currentState", Tag=0x00000000, Type=MediaPlayback.Enums.PlaybackStateEnum),
-                ClusterObjectFieldDescriptor(Label="startTime", Tag=0x00000001, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="duration", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="sampledPosition", Tag=0x00000003, Type=typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition]),
-                ClusterObjectFieldDescriptor(Label="playbackSpeed", Tag=0x00000004, Type=typing.Optional[float32]),
-                ClusterObjectFieldDescriptor(Label="seekRangeEnd", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="seekRangeStart", Tag=0x00000006, Type=typing.Union[None, Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="outputList", Tag=0x00000000, Type=typing.List[AudioOutput.Structs.OutputInfo]),
+                ClusterObjectFieldDescriptor(Label="currentOutput", Tag=0x00000001, Type=typing.Optional[uint]),
                 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]),
@@ -32283,13 +31956,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    currentState: 'MediaPlayback.Enums.PlaybackStateEnum' = None
-    startTime: 'typing.Union[None, Nullable, uint]' = None
-    duration: 'typing.Union[None, Nullable, uint]' = None
-    sampledPosition: 'typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition]' = None
-    playbackSpeed: 'typing.Optional[float32]' = None
-    seekRangeEnd: 'typing.Union[None, Nullable, uint]' = None
-    seekRangeStart: 'typing.Union[None, Nullable, uint]' = None
+    outputList: 'typing.List[AudioOutput.Structs.OutputInfo]' = None
+    currentOutput: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -32297,41 +31965,37 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class MediaPlaybackStatusEnum(IntEnum):
-            kSuccess = 0x00
-            kInvalidStateForCommand = 0x01
-            kNotAllowed = 0x02
-            kNotActive = 0x03
-            kSpeedOutOfRange = 0x04
-            kSeekOutOfRange = 0x05
-
-        class PlaybackStateEnum(IntEnum):
-            kPlaying = 0x00
-            kPaused = 0x01
-            kNotPlaying = 0x02
-            kBuffering = 0x03
+        class OutputTypeEnum(IntEnum):
+            kHdmi = 0x00
+            kBt = 0x01
+            kOptical = 0x02
+            kHeadphone = 0x03
+            kInternal = 0x04
+            kOther = 0x05
 
 
     class Structs:
         @dataclass
-        class PlaybackPosition(ClusterObject):
+        class OutputInfo(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="updatedAt", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="position", Tag=1, Type=typing.Union[Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="outputType", Tag=1, Type=AudioOutput.Enums.OutputTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=2, Type=str),
                     ])
 
-            updatedAt: 'uint' = 0
-            position: 'typing.Union[Nullable, uint]' = NullValue
+            index: 'uint' = 0
+            outputType: 'AudioOutput.Enums.OutputTypeEnum' = 0
+            name: 'str' = ""
 
 
 
     class Commands:
         @dataclass
-        class Play(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
+        class SelectOutput(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050B
             command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
@@ -32339,12 +32003,14 @@ class Play(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
                     ])
 
+            index: 'uint' = 0
 
         @dataclass
-        class Pause(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
+        class RenameOutput(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050B
             command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = True
 
@@ -32352,156 +32018,20 @@ class Pause(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
                     ])
 
-
-        @dataclass
-        class StopPlayback(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class StartOver(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class Previous(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0004
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class Next(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0005
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class Rewind(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0006
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class FastForward(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0007
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class SkipForward(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0008
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="deltaPositionMilliseconds", Tag=0, Type=uint),
-                    ])
-
-            deltaPositionMilliseconds: 'uint' = 0
-
-        @dataclass
-        class SkipBackward(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0009
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="deltaPositionMilliseconds", Tag=0, Type=uint),
-                    ])
-
-            deltaPositionMilliseconds: 'uint' = 0
-
-        @dataclass
-        class PlaybackResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x000A
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatusEnum),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
-                    ])
-
-            status: 'MediaPlayback.Enums.MediaPlaybackStatusEnum' = 0
-            data: 'typing.Optional[str]' = None
-
-        @dataclass
-        class Seek(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x000B
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="position", Tag=0, Type=uint),
-                    ])
-
-            position: 'uint' = 0
+            index: 'uint' = 0
+            name: 'str' = ""
 
 
     class Attributes:
         @dataclass
-        class CurrentState(ClusterAttributeDescriptor):
+        class OutputList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32509,15 +32039,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=MediaPlayback.Enums.PlaybackStateEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.List[AudioOutput.Structs.OutputInfo])
 
-            value: 'MediaPlayback.Enums.PlaybackStateEnum' = 0
+            value: 'typing.List[AudioOutput.Structs.OutputInfo]' = field(default_factory=lambda: [])
 
         @dataclass
-        class StartTime(ClusterAttributeDescriptor):
+        class CurrentOutput(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32525,95 +32055,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
-
-            value: 'typing.Union[None, Nullable, uint]' = None
-
-        @dataclass
-        class Duration(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0506
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000002
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
-
-            value: 'typing.Union[None, Nullable, uint]' = None
-
-        @dataclass
-        class SampledPosition(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0506
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000003
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition])
-
-            value: 'typing.Union[None, Nullable, MediaPlayback.Structs.PlaybackPosition]' = None
-
-        @dataclass
-        class PlaybackSpeed(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0506
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000004
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[float32])
-
-            value: 'typing.Optional[float32]' = None
-
-        @dataclass
-        class SeekRangeEnd(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0506
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000005
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
-
-            value: 'typing.Union[None, Nullable, uint]' = None
-
-        @dataclass
-        class SeekRangeStart(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0506
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000006
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32629,7 +32079,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32645,7 +32095,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32661,7 +32111,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32677,7 +32127,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0506
+                return 0x050B
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32692,15 +32142,15 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class MediaInput(Cluster):
-    id: typing.ClassVar[int] = 0x0507
+class ApplicationLauncher(Cluster):
+    id: typing.ClassVar[int] = 0x050C
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="inputList", Tag=0x00000000, Type=typing.List[MediaInput.Structs.InputInfo]),
-                ClusterObjectFieldDescriptor(Label="currentInput", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="catalogList", Tag=0x00000000, Type=typing.Optional[typing.List[uint]]),
+                ClusterObjectFieldDescriptor(Label="currentApp", Tag=0x00000001, Type=typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP]),
                 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]),
@@ -32708,8 +32158,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    inputList: 'typing.List[MediaInput.Structs.InputInfo]' = None
-    currentInput: 'typing.Optional[uint]' = None
+    catalogList: 'typing.Optional[typing.List[uint]]' = None
+    currentApp: 'typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -32717,45 +32167,45 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class InputTypeEnum(IntEnum):
-            kInternal = 0x00
-            kAux = 0x01
-            kCoax = 0x02
-            kComposite = 0x03
-            kHdmi = 0x04
-            kInput = 0x05
-            kLine = 0x06
-            kOptical = 0x07
-            kVideo = 0x08
-            kScart = 0x09
-            kUsb = 0x0A
-            kOther = 0x0B
+        class ApplicationLauncherStatusEnum(IntEnum):
+            kSuccess = 0x00
+            kAppNotAvailable = 0x01
+            kSystemBusy = 0x02
 
 
     class Structs:
         @dataclass
-        class InputInfo(ClusterObject):
+        class Application(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="inputType", Tag=1, Type=MediaInput.Enums.InputTypeEnum),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=2, Type=str),
-                            ClusterObjectFieldDescriptor(Label="description", Tag=3, Type=str),
+                            ClusterObjectFieldDescriptor(Label="catalogVendorId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="applicationId", Tag=1, Type=str),
                     ])
 
-            index: 'uint' = 0
-            inputType: 'MediaInput.Enums.InputTypeEnum' = 0
-            name: 'str' = ""
-            description: 'str' = ""
+            catalogVendorId: 'uint' = 0
+            applicationId: 'str' = ""
+
+        @dataclass
+        class ApplicationEP(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
+                            ClusterObjectFieldDescriptor(Label="endpoint", Tag=1, Type=typing.Optional[uint]),
+                    ])
+
+            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
+            endpoint: 'typing.Optional[uint]' = None
 
 
 
     class Commands:
         @dataclass
-        class SelectInput(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0507
+        class LaunchApp(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050C
             command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
@@ -32763,14 +32213,16 @@ class SelectInput(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[bytes]),
                     ])
 
-            index: 'uint' = 0
+            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
+            data: 'typing.Optional[bytes]' = None
 
         @dataclass
-        class ShowInputStatus(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0507
+        class StopApp(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050C
             command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = True
 
@@ -32778,12 +32230,14 @@ class ShowInputStatus(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
                     ])
 
+            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
 
         @dataclass
-        class HideInputStatus(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0507
+        class HideApp(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050C
             command_id: typing.ClassVar[int] = 0x0002
             is_client: typing.ClassVar[bool] = True
 
@@ -32791,33 +32245,35 @@ class HideInputStatus(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
                     ])
 
+            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
 
         @dataclass
-        class RenameInput(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0507
+        class LauncherResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050C
             command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = True
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
+                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.ApplicationLauncherStatusEnum),
+                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=bytes),
                     ])
 
-            index: 'uint' = 0
-            name: 'str' = ""
+            status: 'ApplicationLauncher.Enums.ApplicationLauncherStatusEnum' = 0
+            data: 'bytes' = b""
 
 
     class Attributes:
         @dataclass
-        class InputList(ClusterAttributeDescriptor):
+        class CatalogList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32825,15 +32281,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[MediaInput.Structs.InputInfo])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[uint]])
 
-            value: 'typing.List[MediaInput.Structs.InputInfo]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[typing.List[uint]]' = None
 
         @dataclass
-        class CurrentInput(ClusterAttributeDescriptor):
+        class CurrentApp(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32841,15 +32297,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32865,7 +32321,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32881,7 +32337,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32897,7 +32353,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32913,7 +32369,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0507
+                return 0x050C
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -32928,13 +32384,21 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class LowPower(Cluster):
-    id: typing.ClassVar[int] = 0x0508
+class ApplicationBasic(Cluster):
+    id: typing.ClassVar[int] = 0x050D
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
+                ClusterObjectFieldDescriptor(Label="vendorName", Tag=0x00000000, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="vendorID", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="applicationName", Tag=0x00000002, Type=str),
+                ClusterObjectFieldDescriptor(Label="productID", Tag=0x00000003, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="application", Tag=0x00000004, Type=ApplicationBasic.Structs.ApplicationBasicApplication),
+                ClusterObjectFieldDescriptor(Label="status", Tag=0x00000005, Type=ApplicationBasic.Enums.ApplicationStatusEnum),
+                ClusterObjectFieldDescriptor(Label="applicationVersion", Tag=0x00000006, Type=str),
+                ClusterObjectFieldDescriptor(Label="allowedVendorList", Tag=0x00000007, Type=typing.List[uint]),
                 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]),
@@ -32942,267 +32406,179 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
+    vendorName: 'typing.Optional[str]' = None
+    vendorID: 'typing.Optional[uint]' = None
+    applicationName: 'str' = None
+    productID: 'typing.Optional[uint]' = None
+    application: 'ApplicationBasic.Structs.ApplicationBasicApplication' = None
+    status: 'ApplicationBasic.Enums.ApplicationStatusEnum' = None
+    applicationVersion: 'str' = None
+    allowedVendorList: 'typing.List[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
+    class Enums:
+        class ApplicationStatusEnum(IntEnum):
+            kStopped = 0x00
+            kActiveVisibleFocus = 0x01
+            kActiveHidden = 0x02
+            kActiveVisibleNotFocus = 0x03
 
 
-    class Commands:
+    class Structs:
         @dataclass
-        class Sleep(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0508
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
-
+        class ApplicationBasicApplication(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="catalogVendorId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="applicationId", Tag=1, Type=str),
                     ])
 
+            catalogVendorId: 'uint' = 0
+            applicationId: 'str' = ""
+
+
 
 
     class Attributes:
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class VendorName(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0508
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF8
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[str]' = None
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
+        class VendorID(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0508
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF9
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class ApplicationName(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0508
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=str)
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'str' = ""
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class ProductID(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0508
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class Application(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0508
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000004
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Structs.ApplicationBasicApplication)
 
-            value: 'uint' = 0
+            value: 'ApplicationBasic.Structs.ApplicationBasicApplication' = field(default_factory=lambda: ApplicationBasic.Structs.ApplicationBasicApplication())
 
+        @dataclass
+        class Status(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x050D
 
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
 
-@dataclass
-class KeypadInput(Cluster):
-    id: typing.ClassVar[int] = 0x0509
-
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
-
-    class Enums:
-        class CecKeyCode(IntEnum):
-            kSelect = 0x00
-            kUp = 0x01
-            kDown = 0x02
-            kLeft = 0x03
-            kRight = 0x04
-            kRightUp = 0x05
-            kRightDown = 0x06
-            kLeftUp = 0x07
-            kLeftDown = 0x08
-            kRootMenu = 0x09
-            kSetupMenu = 0x0A
-            kContentsMenu = 0x0B
-            kFavoriteMenu = 0x0C
-            kExit = 0x0D
-            kMediaTopMenu = 0x10
-            kMediaContextSensitiveMenu = 0x11
-            kNumberEntryMode = 0x1D
-            kNumber11 = 0x1E
-            kNumber12 = 0x1F
-            kNumber0OrNumber10 = 0x20
-            kNumbers1 = 0x21
-            kNumbers2 = 0x22
-            kNumbers3 = 0x23
-            kNumbers4 = 0x24
-            kNumbers5 = 0x25
-            kNumbers6 = 0x26
-            kNumbers7 = 0x27
-            kNumbers8 = 0x28
-            kNumbers9 = 0x29
-            kDot = 0x2A
-            kEnter = 0x2B
-            kClear = 0x2C
-            kNextFavorite = 0x2F
-            kChannelUp = 0x30
-            kChannelDown = 0x31
-            kPreviousChannel = 0x32
-            kSoundSelect = 0x33
-            kInputSelect = 0x34
-            kDisplayInformation = 0x35
-            kHelp = 0x36
-            kPageUp = 0x37
-            kPageDown = 0x38
-            kPower = 0x40
-            kVolumeUp = 0x41
-            kVolumeDown = 0x42
-            kMute = 0x43
-            kPlay = 0x44
-            kStop = 0x45
-            kPause = 0x46
-            kRecord = 0x47
-            kRewind = 0x48
-            kFastForward = 0x49
-            kEject = 0x4A
-            kForward = 0x4B
-            kBackward = 0x4C
-            kStopRecord = 0x4D
-            kPauseRecord = 0x4E
-            kReserved = 0x4F
-            kAngle = 0x50
-            kSubPicture = 0x51
-            kVideoOnDemand = 0x52
-            kElectronicProgramGuide = 0x53
-            kTimerProgramming = 0x54
-            kInitialConfiguration = 0x55
-            kSelectBroadcastType = 0x56
-            kSelectSoundPresentation = 0x57
-            kPlayFunction = 0x60
-            kPausePlayFunction = 0x61
-            kRecordFunction = 0x62
-            kPauseRecordFunction = 0x63
-            kStopFunction = 0x64
-            kMuteFunction = 0x65
-            kRestoreVolumeFunction = 0x66
-            kTuneFunction = 0x67
-            kSelectMediaFunction = 0x68
-            kSelectAvInputFunction = 0x69
-            kSelectAudioInputFunction = 0x6A
-            kPowerToggleFunction = 0x6B
-            kPowerOffFunction = 0x6C
-            kPowerOnFunction = 0x6D
-            kF1Blue = 0x71
-            kF2Red = 0x72
-            kF3Green = 0x73
-            kF4Yellow = 0x74
-            kF5 = 0x75
-            kData = 0x76
-
-        class KeypadInputStatusEnum(IntEnum):
-            kSuccess = 0x00
-            kUnsupportedKey = 0x01
-            kInvalidKeyInCurrentState = 0x02
-
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Enums.ApplicationStatusEnum)
 
+            value: 'ApplicationBasic.Enums.ApplicationStatusEnum' = 0
 
-    class Commands:
         @dataclass
-        class SendKey(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0509
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
+        class ApplicationVersion(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x050D
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="keyCode", Tag=0, Type=KeypadInput.Enums.CecKeyCode),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000006
 
-            keyCode: 'KeypadInput.Enums.CecKeyCode' = 0
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=str)
+
+            value: 'str' = ""
 
         @dataclass
-        class SendKeyResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0509
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
+        class AllowedVendorList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x050D
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=KeypadInput.Enums.KeypadInputStatusEnum),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000007
 
-            status: 'KeypadInput.Enums.KeypadInputStatusEnum' = 0
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
-    class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0509
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33218,7 +32594,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0509
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33234,7 +32610,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0509
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33250,7 +32626,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0509
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33266,7 +32642,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0509
+                return 0x050D
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33281,15 +32657,13 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class ContentLauncher(Cluster):
-    id: typing.ClassVar[int] = 0x050A
+class AccountLogin(Cluster):
+    id: typing.ClassVar[int] = 0x050E
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="acceptHeader", Tag=0x00000000, Type=typing.Optional[typing.List[str]]),
-                ClusterObjectFieldDescriptor(Label="supportedStreamingProtocols", Tag=0x00000001, Type=typing.Optional[uint]),
                 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]),
@@ -33297,228 +32671,94 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    acceptHeader: 'typing.Optional[typing.List[str]]' = None
-    supportedStreamingProtocols: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Enums:
-        class ContentLaunchStatusEnum(IntEnum):
-            kSuccess = 0x00
-            kUrlNotAvailable = 0x01
-            kAuthFailed = 0x02
-
-        class MetricTypeEnum(IntEnum):
-            kPixels = 0x00
-            kPercentage = 0x01
-
-        class ParameterEnum(IntEnum):
-            kActor = 0x00
-            kChannel = 0x01
-            kCharacter = 0x02
-            kDirector = 0x03
-            kEvent = 0x04
-            kFranchise = 0x05
-            kGenre = 0x06
-            kLeague = 0x07
-            kPopularity = 0x08
-            kProvider = 0x09
-            kSport = 0x0A
-            kSportsTeam = 0x0B
-            kType = 0x0C
-
-
-    class Structs:
-        @dataclass
-        class Dimension(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="width", Tag=0, Type=float),
-                            ClusterObjectFieldDescriptor(Label="height", Tag=1, Type=float),
-                            ClusterObjectFieldDescriptor(Label="metric", Tag=2, Type=ContentLauncher.Enums.MetricTypeEnum),
-                    ])
 
-            width: 'float' = 0.0
-            height: 'float' = 0.0
-            metric: 'ContentLauncher.Enums.MetricTypeEnum' = 0
 
+    class Commands:
         @dataclass
-        class AdditionalInfo(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="name", Tag=0, Type=str),
-                            ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=str),
-                    ])
-
-            name: 'str' = ""
-            value: 'str' = ""
+        class GetSetupPIN(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050E
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
 
-        @dataclass
-        class Parameter(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="type", Tag=0, Type=ContentLauncher.Enums.ParameterEnum),
-                            ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=str),
-                            ClusterObjectFieldDescriptor(Label="externalIDList", Tag=2, Type=typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]),
+                            ClusterObjectFieldDescriptor(Label="tempAccountIdentifier", Tag=0, Type=str),
                     ])
 
-            type: 'ContentLauncher.Enums.ParameterEnum' = 0
-            value: 'str' = ""
-            externalIDList: 'typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]' = None
-
-        @dataclass
-        class ContentSearch(ClusterObject):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="parameterList", Tag=0, Type=typing.List[ContentLauncher.Structs.Parameter]),
-                    ])
+            def must_use_timed_invoke(cls) -> bool:
+                return True
 
-            parameterList: 'typing.List[ContentLauncher.Structs.Parameter]' = field(default_factory=lambda: [])
+            tempAccountIdentifier: 'str' = ""
 
         @dataclass
-        class StyleInformation(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="imageUrl", Tag=0, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="color", Tag=1, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="size", Tag=2, Type=typing.Optional[ContentLauncher.Structs.Dimension]),
-                    ])
-
-            imageUrl: 'typing.Optional[str]' = None
-            color: 'typing.Optional[str]' = None
-            size: 'typing.Optional[ContentLauncher.Structs.Dimension]' = None
+        class GetSetupPINResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050E
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
 
-        @dataclass
-        class BrandingInformation(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="providerName", Tag=0, Type=str),
-                            ClusterObjectFieldDescriptor(Label="background", Tag=1, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="logo", Tag=2, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="progressBar", Tag=3, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="splash", Tag=4, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="waterMark", Tag=5, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                            ClusterObjectFieldDescriptor(Label="setupPIN", Tag=0, Type=str),
                     ])
 
-            providerName: 'str' = ""
-            background: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            logo: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            progressBar: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            splash: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            waterMark: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-
-
+            setupPIN: 'str' = ""
 
-    class Commands:
         @dataclass
-        class LaunchContent(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050A
-            command_id: typing.ClassVar[int] = 0x0000
+        class Login(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050E
+            command_id: typing.ClassVar[int] = 0x0002
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="search", Tag=0, Type=ContentLauncher.Structs.ContentSearch),
-                            ClusterObjectFieldDescriptor(Label="autoPlay", Tag=1, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=2, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="tempAccountIdentifier", Tag=0, Type=str),
+                            ClusterObjectFieldDescriptor(Label="setupPIN", Tag=1, Type=str),
                     ])
 
-            search: 'ContentLauncher.Structs.ContentSearch' = field(default_factory=lambda: ContentLauncher.Structs.ContentSearch())
-            autoPlay: 'bool' = False
-            data: 'typing.Optional[str]' = None
-
-        @dataclass
-        class LaunchURL(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050A
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
-
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="contentURL", Tag=0, Type=str),
-                            ClusterObjectFieldDescriptor(Label="displayString", Tag=1, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.Optional[ContentLauncher.Structs.BrandingInformation]),
-                    ])
+            def must_use_timed_invoke(cls) -> bool:
+                return True
 
-            contentURL: 'str' = ""
-            displayString: 'typing.Optional[str]' = None
-            brandingInformation: 'typing.Optional[ContentLauncher.Structs.BrandingInformation]' = None
+            tempAccountIdentifier: 'str' = ""
+            setupPIN: 'str' = ""
 
         @dataclass
-        class LaunchResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050A
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = False
+        class Logout(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x050E
+            command_id: typing.ClassVar[int] = 0x0003
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ContentLauncher.Enums.ContentLaunchStatusEnum),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[str]),
                     ])
 
-            status: 'ContentLauncher.Enums.ContentLaunchStatusEnum' = 0
-            data: 'typing.Optional[str]' = None
-
-
-    class Attributes:
-        @dataclass
-        class AcceptHeader(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050A
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
-
-            value: 'typing.Optional[typing.List[str]]' = None
-
-        @dataclass
-        class SupportedStreamingProtocols(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050A
-
             @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
+            def must_use_timed_invoke(cls) -> bool:
+                return True
 
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[uint]' = None
 
+    class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050A
+                return 0x050E
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33534,7 +32774,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050A
+                return 0x050E
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33550,7 +32790,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050A
+                return 0x050E
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33566,7 +32806,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050A
+                return 0x050E
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33582,7 +32822,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050A
+                return 0x050E
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33597,15 +32837,13 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class AudioOutput(Cluster):
-    id: typing.ClassVar[int] = 0x050B
+class Messaging(Cluster):
+    id: typing.ClassVar[int] = 0x0703
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="outputList", Tag=0x00000000, Type=typing.List[AudioOutput.Structs.OutputInfo]),
-                ClusterObjectFieldDescriptor(Label="currentOutput", Tag=0x00000001, Type=typing.Optional[uint]),
                 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]),
@@ -33613,8 +32851,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    outputList: 'typing.List[AudioOutput.Structs.OutputInfo]' = None
-    currentOutput: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -33622,279 +32858,216 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class OutputTypeEnum(IntEnum):
-            kHdmi = 0x00
-            kBt = 0x01
-            kOptical = 0x02
-            kHeadphone = 0x03
-            kInternal = 0x04
-            kOther = 0x05
+        class EventId(IntEnum):
+            kMeterCoverRemoved = 0x00
+            kMeterCoverClosed = 0x01
+            kStrongMagneticField = 0x02
+            kNoStrongMagneticField = 0x03
+            kBatteryFailure = 0x04
+            kLowBattery = 0x05
+            kProgramMemoryError = 0x06
+            kRamError = 0x07
+            kNvMemoryError = 0x08
+            kMeasurementSystemError = 0x09
+            kWatchdogError = 0x0A
+            kSupplyDisconnectFailure = 0x0B
+            kSupplyConnectFailure = 0x0C
+            kMeasurmentSoftwareChanged = 0x0D
+            kDstEnabled = 0x0E
+            kDstDisabled = 0x0F
+            kClockAdjBackward = 0x10
+            kClockAdjForward = 0x11
+            kClockInvalid = 0x12
+            kCommsErrorHan = 0x13
+            kCommsOkHan = 0x14
+            kFraudAttempt = 0x15
+            kPowerLoss = 0x16
+            kIncorrectProtocol = 0x17
+            kUnusualHanTraffic = 0x18
+            kUnexpectedClockChange = 0x19
+            kCommsUsingUnauthenticatedComponent = 0x1A
+            kErrorRegClear = 0x1B
+            kAlarmRegClear = 0x1C
+            kUnexpectedHwReset = 0x1D
+            kUnexpectedProgramExecution = 0x1E
+            kEventLogCleared = 0x1F
+            kManualDisconnect = 0x20
+            kManualConnect = 0x21
+            kRemoteDisconnection = 0x22
+            kLocalDisconnection = 0x23
+            kLimitThresholdExceeded = 0x24
+            kLimitThresholdOk = 0x25
+            kLimitThresholdChanged = 0x26
+            kMaximumDemandExceeded = 0x27
+            kProfileCleared = 0x28
+            kFirmwareReadyForActivation = 0x29
+            kFirmwareActivated = 0x2A
+            kPatchFailure = 0x2B
+            kTouTariffActivation = 0x2C
+            k8x8Tariffactivated = 0x2D
+            kSingleTariffRateActivated = 0x2E
+            kAsynchronousBillingOccurred = 0x2F
+            kSynchronousBillingOccurred = 0x30
+            kIncorrectPolarity = 0x80
+            kCurrentNoVoltage = 0x81
+            kUnderVoltage = 0x82
+            kOverVoltage = 0x83
+            kNormalVoltage = 0x84
+            kPfBelowThreshold = 0x85
+            kPfAboveThreshold = 0x86
+            kTerminalCoverRemoved = 0x87
+            kTerminalCoverClosed = 0x88
+            kReverseFlow = 0xA0
+            kTiltTamper = 0xA1
+            kBatteryCoverRemoved = 0xA2
+            kBatteryCoverClosed = 0xA3
+            kExcessFlow = 0xA4
+            kCreditOk = 0xC0
+            kLowCredit = 0xC1
+            kEmergencyCreditInUse = 0xC0
+            kEmergencyCreditExhausted = 0xC1
+            kZeroCreditEcNotSelected = 0xC2
+            kSupplyOn = 0xC3
+            kSupplyOffAarmed = 0xC4
+            kSupplyOff = 0xC5
+            kDiscountApplied = 0xC6
+            kManufacturerSpecificA = 0xE0
+            kManufacturerSpecificB = 0xE1
+            kManufacturerSpecificC = 0xE2
+            kManufacturerSpecificD = 0xE3
+            kManufacturerSpecificE = 0xE4
+            kManufacturerSpecificF = 0xE5
+            kManufacturerSpecificG = 0xE6
+            kManufacturerSpecificH = 0xE7
+            kManufacturerSpecificI = 0xE8
 
+        class MessagingControlConfirmation(IntEnum):
+            kNotRequired = 0x00
+            kRequired = 0x80
 
-    class Structs:
-        @dataclass
-        class OutputInfo(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="outputType", Tag=1, Type=AudioOutput.Enums.OutputTypeEnum),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=2, Type=str),
-                    ])
+        class MessagingControlEnhancedConfirmation(IntEnum):
+            kNotRequired = 0x00
+            kRequired = 0x20
 
-            index: 'uint' = 0
-            outputType: 'AudioOutput.Enums.OutputTypeEnum' = 0
-            name: 'str' = ""
+        class MessagingControlImportance(IntEnum):
+            kLow = 0x00
+            kMedium = 0x04
+            kHigh = 0x08
+            kCritical = 0x0C
+
+        class MessagingControlTransmission(IntEnum):
+            kNormal = 0x00
+            kNormalAndAnonymous = 0x01
+            kAnonymous = 0x02
+            kReserved = 0x03
 
 
 
     class Commands:
         @dataclass
-        class SelectOutput(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050B
+        class DisplayMessage(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
             command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="startTime", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="durationInMinutes", Tag=3, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="message", Tag=4, Type=str),
+                            ClusterObjectFieldDescriptor(Label="optionalExtendedMessageControl", Tag=5, Type=uint),
                     ])
 
-            index: 'uint' = 0
+            messageId: 'uint' = 0
+            messageControl: 'uint' = 0
+            startTime: 'uint' = 0
+            durationInMinutes: 'uint' = 0
+            message: 'str' = ""
+            optionalExtendedMessageControl: 'uint' = 0
 
         @dataclass
-        class RenameOutput(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050B
-            command_id: typing.ClassVar[int] = 0x0001
+        class GetLastMessage(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
+            command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="index", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
                     ])
 
-            index: 'uint' = 0
-            name: 'str' = ""
-
-
-    class Attributes:
-        @dataclass
-        class OutputList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[AudioOutput.Structs.OutputInfo])
-
-            value: 'typing.List[AudioOutput.Structs.OutputInfo]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class CurrentOutput(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF8
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF9
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFB
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFC
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-        @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050B
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFD
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-
-
-@dataclass
-class ApplicationLauncher(Cluster):
-    id: typing.ClassVar[int] = 0x050C
-
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                ClusterObjectFieldDescriptor(Label="catalogList", Tag=0x00000000, Type=typing.List[uint]),
-                ClusterObjectFieldDescriptor(Label="currentApp", Tag=0x00000001, Type=typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP]),
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    catalogList: 'typing.List[uint]' = None
-    currentApp: 'typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP]' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
-
-    class Enums:
-        class ApplicationLauncherStatusEnum(IntEnum):
-            kSuccess = 0x00
-            kAppNotAvailable = 0x01
-            kSystemBusy = 0x02
 
-
-    class Structs:
         @dataclass
-        class Application(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="catalogVendorId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="applicationId", Tag=1, Type=str),
-                    ])
-
-            catalogVendorId: 'uint' = 0
-            applicationId: 'str' = ""
+        class CancelMessage(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
 
-        @dataclass
-        class ApplicationEP(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
-                            ClusterObjectFieldDescriptor(Label="endpoint", Tag=1, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint),
                     ])
 
-            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
-            endpoint: 'typing.Optional[uint]' = None
-
-
+            messageId: 'uint' = 0
+            messageControl: 'uint' = 0
 
-    class Commands:
         @dataclass
-        class LaunchApp(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050C
-            command_id: typing.ClassVar[int] = 0x0000
+        class MessageConfirmation(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
+            command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=typing.Optional[bytes]),
+                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="confirmationTime", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="messageConfirmationControl", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="messageResponse", Tag=3, Type=bytes),
                     ])
 
-            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
-            data: 'typing.Optional[bytes]' = None
+            messageId: 'uint' = 0
+            confirmationTime: 'uint' = 0
+            messageConfirmationControl: 'uint' = 0
+            messageResponse: 'bytes' = b""
 
         @dataclass
-        class StopApp(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050C
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
+        class DisplayProtectedMessage(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
+            command_id: typing.ClassVar[int] = 0x0002
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
+                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="startTime", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="durationInMinutes", Tag=3, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="message", Tag=4, Type=str),
+                            ClusterObjectFieldDescriptor(Label="optionalExtendedMessageControl", Tag=5, Type=uint),
                     ])
 
-            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
+            messageId: 'uint' = 0
+            messageControl: 'uint' = 0
+            startTime: 'uint' = 0
+            durationInMinutes: 'uint' = 0
+            message: 'str' = ""
+            optionalExtendedMessageControl: 'uint' = 0
 
         @dataclass
-        class HideApp(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050C
+        class GetMessageCancellation(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
             command_id: typing.ClassVar[int] = 0x0002
             is_client: typing.ClassVar[bool] = True
 
@@ -33902,14 +33075,14 @@ class HideApp(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application),
+                            ClusterObjectFieldDescriptor(Label="earliestImplementationTime", Tag=0, Type=uint),
                     ])
 
-            application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application())
+            earliestImplementationTime: 'uint' = 0
 
         @dataclass
-        class LauncherResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050C
+        class CancelAllMessages(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0703
             command_id: typing.ClassVar[int] = 0x0003
             is_client: typing.ClassVar[bool] = False
 
@@ -33917,52 +33090,18 @@ class LauncherResponse(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.ApplicationLauncherStatusEnum),
-                            ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=bytes),
+                            ClusterObjectFieldDescriptor(Label="implementationDateTime", Tag=0, Type=uint),
                     ])
 
-            status: 'ApplicationLauncher.Enums.ApplicationLauncherStatusEnum' = 0
-            data: 'bytes' = b""
+            implementationDateTime: 'uint' = 0
 
 
     class Attributes:
-        @dataclass
-        class CatalogList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050C
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class CurrentApp(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x050C
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP])
-
-            value: 'typing.Union[None, Nullable, ApplicationLauncher.Structs.ApplicationEP]' = None
-
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050C
+                return 0x0703
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33978,7 +33117,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050C
+                return 0x0703
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -33994,7 +33133,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050C
+                return 0x0703
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34010,7 +33149,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050C
+                return 0x0703
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34026,7 +33165,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050C
+                return 0x0703
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34041,21 +33180,25 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class ApplicationBasic(Cluster):
-    id: typing.ClassVar[int] = 0x050D
+class ApplianceIdentification(Cluster):
+    id: typing.ClassVar[int] = 0x0B00
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="vendorName", Tag=0x00000000, Type=typing.Optional[str]),
-                ClusterObjectFieldDescriptor(Label="vendorID", Tag=0x00000001, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="applicationName", Tag=0x00000002, Type=str),
-                ClusterObjectFieldDescriptor(Label="productID", Tag=0x00000003, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="application", Tag=0x00000004, Type=ApplicationBasic.Structs.ApplicationBasicApplication),
-                ClusterObjectFieldDescriptor(Label="status", Tag=0x00000005, Type=ApplicationBasic.Enums.ApplicationStatusEnum),
-                ClusterObjectFieldDescriptor(Label="applicationVersion", Tag=0x00000006, Type=str),
-                ClusterObjectFieldDescriptor(Label="allowedVendorList", Tag=0x00000007, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="basicIdentification", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="companyName", Tag=0x00000010, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="companyId", Tag=0x00000011, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="brandName", Tag=0x00000012, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="brandId", Tag=0x00000013, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="model", Tag=0x00000014, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="partNumber", Tag=0x00000015, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="productRevision", Tag=0x00000016, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="softwareRevision", Tag=0x00000017, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="productTypeName", Tag=0x00000018, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="productTypeId", Tag=0x00000019, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="cecedSpecificationVersion", Tag=0x0000001A, Type=typing.Optional[uint]),
                 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]),
@@ -34063,55 +33206,53 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    vendorName: 'typing.Optional[str]' = None
-    vendorID: 'typing.Optional[uint]' = None
-    applicationName: 'str' = None
-    productID: 'typing.Optional[uint]' = None
-    application: 'ApplicationBasic.Structs.ApplicationBasicApplication' = None
-    status: 'ApplicationBasic.Enums.ApplicationStatusEnum' = None
-    applicationVersion: 'str' = None
-    allowedVendorList: 'typing.List[uint]' = None
+    basicIdentification: 'uint' = None
+    companyName: 'typing.Optional[str]' = None
+    companyId: 'typing.Optional[uint]' = None
+    brandName: 'typing.Optional[str]' = None
+    brandId: 'typing.Optional[uint]' = None
+    model: 'typing.Optional[bytes]' = None
+    partNumber: 'typing.Optional[bytes]' = None
+    productRevision: 'typing.Optional[bytes]' = None
+    softwareRevision: 'typing.Optional[bytes]' = None
+    productTypeName: 'typing.Optional[bytes]' = None
+    productTypeId: 'typing.Optional[uint]' = None
+    cecedSpecificationVersion: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Enums:
-        class ApplicationStatusEnum(IntEnum):
-            kStopped = 0x00
-            kActiveVisibleFocus = 0x01
-            kActiveHidden = 0x02
-            kActiveVisibleNotFocus = 0x03
 
 
-    class Structs:
+
+    class Attributes:
         @dataclass
-        class ApplicationBasicApplication(ClusterObject):
+        class BasicIdentification(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="catalogVendorId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="applicationId", Tag=1, Type=str),
-                    ])
-
-            catalogVendorId: 'uint' = 0
-            applicationId: 'str' = ""
+            def cluster_id(cls) -> int:
+                return 0x0B00
 
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = 0
 
-    class Attributes:
         @dataclass
-        class VendorName(ClusterAttributeDescriptor):
+        class CompanyName(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000010
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -34120,14 +33261,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[str]' = None
 
         @dataclass
-        class VendorID(ClusterAttributeDescriptor):
+        class CompanyId(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000011
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -34136,30 +33277,30 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ApplicationName(ClusterAttributeDescriptor):
+        class BrandName(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000012
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
 
-            value: 'str' = ""
+            value: 'typing.Optional[str]' = None
 
         @dataclass
-        class ProductID(ClusterAttributeDescriptor):
+        class BrandId(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000013
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -34168,74 +33309,122 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Application(ClusterAttributeDescriptor):
+        class Model(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000014
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Structs.ApplicationBasicApplication)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
 
-            value: 'ApplicationBasic.Structs.ApplicationBasicApplication' = field(default_factory=lambda: ApplicationBasic.Structs.ApplicationBasicApplication())
+            value: 'typing.Optional[bytes]' = None
 
         @dataclass
-        class Status(ClusterAttributeDescriptor):
+        class PartNumber(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000015
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Enums.ApplicationStatusEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
 
-            value: 'ApplicationBasic.Enums.ApplicationStatusEnum' = 0
+            value: 'typing.Optional[bytes]' = None
 
         @dataclass
-        class ApplicationVersion(ClusterAttributeDescriptor):
+        class ProductRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000006
+                return 0x00000016
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
 
-            value: 'str' = ""
+            value: 'typing.Optional[bytes]' = None
 
         @dataclass
-        class AllowedVendorList(ClusterAttributeDescriptor):
+        class SoftwareRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000007
+                return 0x00000017
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class ProductTypeName(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B00
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000018
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+
+            value: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class ProductTypeId(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B00
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000019
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class CecedSpecificationVersion(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B00
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000001A
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34251,7 +33440,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34267,7 +33456,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34283,7 +33472,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34299,7 +33488,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050D
+                return 0x0B00
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34314,108 +33503,251 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class AccountLogin(Cluster):
-    id: typing.ClassVar[int] = 0x050E
+class MeterIdentification(Cluster):
+    id: typing.ClassVar[int] = 0x0B01
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
+                ClusterObjectFieldDescriptor(Label="companyName", Tag=0x00000000, Type=str),
+                ClusterObjectFieldDescriptor(Label="meterTypeId", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="dataQualityId", Tag=0x00000004, Type=uint),
+                ClusterObjectFieldDescriptor(Label="customerName", Tag=0x00000005, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="model", Tag=0x00000006, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="partNumber", Tag=0x00000007, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="productRevision", Tag=0x00000008, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="softwareRevision", Tag=0x0000000A, Type=typing.Optional[bytes]),
+                ClusterObjectFieldDescriptor(Label="utilityName", Tag=0x0000000B, Type=typing.Optional[str]),
+                ClusterObjectFieldDescriptor(Label="pod", Tag=0x0000000C, Type=str),
+                ClusterObjectFieldDescriptor(Label="availablePower", Tag=0x0000000D, Type=int),
+                ClusterObjectFieldDescriptor(Label="powerThreshold", Tag=0x0000000E, Type=int),
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    companyName: 'str' = None
+    meterTypeId: 'uint' = None
+    dataQualityId: 'uint' = None
+    customerName: 'typing.Optional[str]' = None
+    model: 'typing.Optional[bytes]' = None
+    partNumber: 'typing.Optional[bytes]' = None
+    productRevision: 'typing.Optional[bytes]' = None
+    softwareRevision: 'typing.Optional[bytes]' = None
+    utilityName: 'typing.Optional[str]' = None
+    pod: 'str' = None
+    availablePower: 'int' = None
+    powerThreshold: 'int' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
 
 
-    class Commands:
+
+    class Attributes:
         @dataclass
-        class GetSetupPIN(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
+        class CompanyName(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="tempAccountIdentifier", Tag=0, Type=str),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000000
 
             @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=str)
 
-            tempAccountIdentifier: 'str' = ""
+            value: 'str' = ""
 
         @dataclass
-        class GetSetupPINResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
+        class MeterTypeId(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="setupPIN", Tag=0, Type=str),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000001
 
-            setupPIN: 'str' = ""
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
+
+            value: 'uint' = 0
 
         @dataclass
-        class Login(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
+        class DataQualityId(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="tempAccountIdentifier", Tag=0, Type=str),
-                            ClusterObjectFieldDescriptor(Label="setupPIN", Tag=1, Type=str),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000004
 
             @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            tempAccountIdentifier: 'str' = ""
-            setupPIN: 'str' = ""
+            value: 'uint' = 0
 
         @dataclass
-        class Logout(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = True
+        class CustomerName(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000005
 
             @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
 
+            value: 'typing.Optional[str]' = None
 
+        @dataclass
+        class Model(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000006
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+
+            value: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class PartNumber(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000007
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+
+            value: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class ProductRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+
+            value: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class SoftwareRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000A
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+
+            value: 'typing.Optional[bytes]' = None
+
+        @dataclass
+        class UtilityName(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000B
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+
+            value: 'typing.Optional[str]' = None
+
+        @dataclass
+        class Pod(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000C
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=str)
+
+            value: 'str' = ""
+
+        @dataclass
+        class AvailablePower(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000D
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=int)
+
+            value: 'int' = 0
+
+        @dataclass
+        class PowerThreshold(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B01
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000E
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=int)
+
+            value: 'int' = 0
 
-    class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050E
+                return 0x0B01
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34431,7 +33763,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050E
+                return 0x0B01
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34447,7 +33779,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050E
+                return 0x0B01
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34463,7 +33795,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050E
+                return 0x0B01
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34479,7 +33811,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050E
+                return 0x0B01
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -34494,94 +33826,13 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class TestCluster(Cluster):
-    id: typing.ClassVar[int] = 0x050F
+class ApplianceEventsAndAlert(Cluster):
+    id: typing.ClassVar[int] = 0x0B02
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="boolean", Tag=0x00000000, Type=bool),
-                ClusterObjectFieldDescriptor(Label="bitmap8", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="bitmap16", Tag=0x00000002, Type=uint),
-                ClusterObjectFieldDescriptor(Label="bitmap32", Tag=0x00000003, Type=uint),
-                ClusterObjectFieldDescriptor(Label="bitmap64", Tag=0x00000004, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int8u", Tag=0x00000005, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int16u", Tag=0x00000006, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int24u", Tag=0x00000007, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int32u", Tag=0x00000008, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int40u", Tag=0x00000009, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int48u", Tag=0x0000000A, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int56u", Tag=0x0000000B, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int64u", Tag=0x0000000C, Type=uint),
-                ClusterObjectFieldDescriptor(Label="int8s", Tag=0x0000000D, Type=int),
-                ClusterObjectFieldDescriptor(Label="int16s", Tag=0x0000000E, Type=int),
-                ClusterObjectFieldDescriptor(Label="int24s", Tag=0x0000000F, Type=int),
-                ClusterObjectFieldDescriptor(Label="int32s", Tag=0x00000010, Type=int),
-                ClusterObjectFieldDescriptor(Label="int40s", Tag=0x00000011, Type=int),
-                ClusterObjectFieldDescriptor(Label="int48s", Tag=0x00000012, Type=int),
-                ClusterObjectFieldDescriptor(Label="int56s", Tag=0x00000013, Type=int),
-                ClusterObjectFieldDescriptor(Label="int64s", Tag=0x00000014, Type=int),
-                ClusterObjectFieldDescriptor(Label="enum8", Tag=0x00000015, Type=uint),
-                ClusterObjectFieldDescriptor(Label="enum16", Tag=0x00000016, Type=uint),
-                ClusterObjectFieldDescriptor(Label="floatSingle", Tag=0x00000017, Type=float32),
-                ClusterObjectFieldDescriptor(Label="floatDouble", Tag=0x00000018, Type=float),
-                ClusterObjectFieldDescriptor(Label="octetString", Tag=0x00000019, Type=bytes),
-                ClusterObjectFieldDescriptor(Label="listInt8u", Tag=0x0000001A, Type=typing.List[uint]),
-                ClusterObjectFieldDescriptor(Label="listOctetString", Tag=0x0000001B, Type=typing.List[bytes]),
-                ClusterObjectFieldDescriptor(Label="listStructOctetString", Tag=0x0000001C, Type=typing.List[TestCluster.Structs.TestListStructOctet]),
-                ClusterObjectFieldDescriptor(Label="longOctetString", Tag=0x0000001D, Type=bytes),
-                ClusterObjectFieldDescriptor(Label="charString", Tag=0x0000001E, Type=str),
-                ClusterObjectFieldDescriptor(Label="longCharString", Tag=0x0000001F, Type=str),
-                ClusterObjectFieldDescriptor(Label="epochUs", Tag=0x00000020, Type=uint),
-                ClusterObjectFieldDescriptor(Label="epochS", Tag=0x00000021, Type=uint),
-                ClusterObjectFieldDescriptor(Label="vendorId", Tag=0x00000022, Type=uint),
-                ClusterObjectFieldDescriptor(Label="listNullablesAndOptionalsStruct", Tag=0x00000023, Type=typing.List[TestCluster.Structs.NullablesAndOptionalsStruct]),
-                ClusterObjectFieldDescriptor(Label="enumAttr", Tag=0x00000024, Type=TestCluster.Enums.SimpleEnum),
-                ClusterObjectFieldDescriptor(Label="structAttr", Tag=0x00000025, Type=TestCluster.Structs.SimpleStruct),
-                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt8u", Tag=0x00000026, Type=uint),
-                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt8s", Tag=0x00000027, Type=int),
-                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt16u", Tag=0x00000028, Type=uint),
-                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt16s", Tag=0x00000029, Type=int),
-                ClusterObjectFieldDescriptor(Label="listLongOctetString", Tag=0x0000002A, Type=typing.List[bytes]),
-                ClusterObjectFieldDescriptor(Label="listFabricScoped", Tag=0x0000002B, Type=typing.List[TestCluster.Structs.TestFabricScoped]),
-                ClusterObjectFieldDescriptor(Label="timedWriteBoolean", Tag=0x00000030, Type=bool),
-                ClusterObjectFieldDescriptor(Label="generalErrorBoolean", Tag=0x00000031, Type=bool),
-                ClusterObjectFieldDescriptor(Label="clusterErrorBoolean", Tag=0x00000032, Type=bool),
-                ClusterObjectFieldDescriptor(Label="unsupported", Tag=0x000000FF, Type=bool),
-                ClusterObjectFieldDescriptor(Label="nullableBoolean", Tag=0x00004000, Type=typing.Union[Nullable, bool]),
-                ClusterObjectFieldDescriptor(Label="nullableBitmap8", Tag=0x00004001, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableBitmap16", Tag=0x00004002, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableBitmap32", Tag=0x00004003, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableBitmap64", Tag=0x00004004, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt8u", Tag=0x00004005, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt16u", Tag=0x00004006, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt24u", Tag=0x00004007, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt32u", Tag=0x00004008, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt40u", Tag=0x00004009, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt48u", Tag=0x0000400A, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt56u", Tag=0x0000400B, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt64u", Tag=0x0000400C, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableInt8s", Tag=0x0000400D, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt16s", Tag=0x0000400E, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt24s", Tag=0x0000400F, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt32s", Tag=0x00004010, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt40s", Tag=0x00004011, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt48s", Tag=0x00004012, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt56s", Tag=0x00004013, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableInt64s", Tag=0x00004014, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableEnum8", Tag=0x00004015, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableEnum16", Tag=0x00004016, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableFloatSingle", Tag=0x00004017, Type=typing.Union[Nullable, float32]),
-                ClusterObjectFieldDescriptor(Label="nullableFloatDouble", Tag=0x00004018, Type=typing.Union[Nullable, float]),
-                ClusterObjectFieldDescriptor(Label="nullableOctetString", Tag=0x00004019, Type=typing.Union[Nullable, bytes]),
-                ClusterObjectFieldDescriptor(Label="nullableCharString", Tag=0x0000401E, Type=typing.Union[Nullable, str]),
-                ClusterObjectFieldDescriptor(Label="nullableEnumAttr", Tag=0x00004024, Type=typing.Union[Nullable, TestCluster.Enums.SimpleEnum]),
-                ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=0x00004025, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]),
-                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8u", Tag=0x00004026, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8s", Tag=0x00004027, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16u", Tag=0x00004028, Type=typing.Union[Nullable, uint]),
-                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16s", Tag=0x00004029, Type=typing.Union[Nullable, int]),
                 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]),
@@ -34589,87 +33840,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    boolean: 'bool' = None
-    bitmap8: 'uint' = None
-    bitmap16: 'uint' = None
-    bitmap32: 'uint' = None
-    bitmap64: 'uint' = None
-    int8u: 'uint' = None
-    int16u: 'uint' = None
-    int24u: 'uint' = None
-    int32u: 'uint' = None
-    int40u: 'uint' = None
-    int48u: 'uint' = None
-    int56u: 'uint' = None
-    int64u: 'uint' = None
-    int8s: 'int' = None
-    int16s: 'int' = None
-    int24s: 'int' = None
-    int32s: 'int' = None
-    int40s: 'int' = None
-    int48s: 'int' = None
-    int56s: 'int' = None
-    int64s: 'int' = None
-    enum8: 'uint' = None
-    enum16: 'uint' = None
-    floatSingle: 'float32' = None
-    floatDouble: 'float' = None
-    octetString: 'bytes' = None
-    listInt8u: 'typing.List[uint]' = None
-    listOctetString: 'typing.List[bytes]' = None
-    listStructOctetString: 'typing.List[TestCluster.Structs.TestListStructOctet]' = None
-    longOctetString: 'bytes' = None
-    charString: 'str' = None
-    longCharString: 'str' = None
-    epochUs: 'uint' = None
-    epochS: 'uint' = None
-    vendorId: 'uint' = None
-    listNullablesAndOptionalsStruct: 'typing.List[TestCluster.Structs.NullablesAndOptionalsStruct]' = None
-    enumAttr: 'TestCluster.Enums.SimpleEnum' = None
-    structAttr: 'TestCluster.Structs.SimpleStruct' = None
-    rangeRestrictedInt8u: 'uint' = None
-    rangeRestrictedInt8s: 'int' = None
-    rangeRestrictedInt16u: 'uint' = None
-    rangeRestrictedInt16s: 'int' = None
-    listLongOctetString: 'typing.List[bytes]' = None
-    listFabricScoped: 'typing.List[TestCluster.Structs.TestFabricScoped]' = None
-    timedWriteBoolean: 'bool' = None
-    generalErrorBoolean: 'bool' = None
-    clusterErrorBoolean: 'bool' = None
-    unsupported: 'bool' = None
-    nullableBoolean: 'typing.Union[Nullable, bool]' = None
-    nullableBitmap8: 'typing.Union[Nullable, uint]' = None
-    nullableBitmap16: 'typing.Union[Nullable, uint]' = None
-    nullableBitmap32: 'typing.Union[Nullable, uint]' = None
-    nullableBitmap64: 'typing.Union[Nullable, uint]' = None
-    nullableInt8u: 'typing.Union[Nullable, uint]' = None
-    nullableInt16u: 'typing.Union[Nullable, uint]' = None
-    nullableInt24u: 'typing.Union[Nullable, uint]' = None
-    nullableInt32u: 'typing.Union[Nullable, uint]' = None
-    nullableInt40u: 'typing.Union[Nullable, uint]' = None
-    nullableInt48u: 'typing.Union[Nullable, uint]' = None
-    nullableInt56u: 'typing.Union[Nullable, uint]' = None
-    nullableInt64u: 'typing.Union[Nullable, uint]' = None
-    nullableInt8s: 'typing.Union[Nullable, int]' = None
-    nullableInt16s: 'typing.Union[Nullable, int]' = None
-    nullableInt24s: 'typing.Union[Nullable, int]' = None
-    nullableInt32s: 'typing.Union[Nullable, int]' = None
-    nullableInt40s: 'typing.Union[Nullable, int]' = None
-    nullableInt48s: 'typing.Union[Nullable, int]' = None
-    nullableInt56s: 'typing.Union[Nullable, int]' = None
-    nullableInt64s: 'typing.Union[Nullable, int]' = None
-    nullableEnum8: 'typing.Union[Nullable, uint]' = None
-    nullableEnum16: 'typing.Union[Nullable, uint]' = None
-    nullableFloatSingle: 'typing.Union[Nullable, float32]' = None
-    nullableFloatDouble: 'typing.Union[Nullable, float]' = None
-    nullableOctetString: 'typing.Union[Nullable, bytes]' = None
-    nullableCharString: 'typing.Union[Nullable, str]' = None
-    nullableEnumAttr: 'typing.Union[Nullable, TestCluster.Enums.SimpleEnum]' = None
-    nullableStruct: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = None
-    nullableRangeRestrictedInt8u: 'typing.Union[Nullable, uint]' = None
-    nullableRangeRestrictedInt8s: 'typing.Union[Nullable, int]' = None
-    nullableRangeRestrictedInt16u: 'typing.Union[Nullable, uint]' = None
-    nullableRangeRestrictedInt16s: 'typing.Union[Nullable, int]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -34677,2644 +33847,2397 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class SimpleEnum(IntEnum):
-            kUnspecified = 0x00
-            kValueA = 0x01
-            kValueB = 0x02
-            kValueC = 0x03
+        class EventIdentification(IntEnum):
+            kEndOfCycle = 0x01
+            kTemperatureReached = 0x04
+            kEndOfCooking = 0x05
+            kSwitchingOff = 0x06
+            kWrongData = 0x07
 
 
-    class Structs:
+
+    class Commands:
         @dataclass
-        class SimpleStruct(ClusterObject):
+        class GetAlerts(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B02
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="b", Tag=1, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="c", Tag=2, Type=TestCluster.Enums.SimpleEnum),
-                            ClusterObjectFieldDescriptor(Label="d", Tag=3, Type=bytes),
-                            ClusterObjectFieldDescriptor(Label="e", Tag=4, Type=str),
-                            ClusterObjectFieldDescriptor(Label="f", Tag=5, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="g", Tag=6, Type=float32),
-                            ClusterObjectFieldDescriptor(Label="h", Tag=7, Type=float),
                     ])
 
-            a: 'uint' = 0
-            b: 'bool' = False
-            c: 'TestCluster.Enums.SimpleEnum' = 0
-            d: 'bytes' = b""
-            e: 'str' = ""
-            f: 'uint' = 0
-            g: 'float32' = 0.0
-            h: 'float' = 0.0
 
         @dataclass
-        class TestFabricScoped(ClusterObject):
+        class GetAlertsResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B02
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = False
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="fabricSensitiveInt8u", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="optionalFabricSensitiveInt8u", Tag=2, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableFabricSensitiveInt8u", Tag=3, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalFabricSensitiveInt8u", Tag=4, Type=typing.Union[None, Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="fabricSensitiveCharString", Tag=5, Type=str),
-                            ClusterObjectFieldDescriptor(Label="fabricSensitiveStruct", Tag=6, Type=TestCluster.Structs.SimpleStruct),
-                            ClusterObjectFieldDescriptor(Label="fabricSensitiveInt8uList", Tag=7, Type=typing.List[uint]),
-                            ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="alertsCount", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="alertStructures", Tag=1, Type=typing.List[uint]),
                     ])
 
-            fabricSensitiveInt8u: 'uint' = 0
-            optionalFabricSensitiveInt8u: 'typing.Optional[uint]' = None
-            nullableFabricSensitiveInt8u: 'typing.Union[Nullable, uint]' = NullValue
-            nullableOptionalFabricSensitiveInt8u: 'typing.Union[None, Nullable, uint]' = None
-            fabricSensitiveCharString: 'str' = ""
-            fabricSensitiveStruct: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
-            fabricSensitiveInt8uList: 'typing.List[uint]' = field(default_factory=lambda: [])
-            fabricIndex: 'uint' = 0
+            alertsCount: 'uint' = 0
+            alertStructures: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class NullablesAndOptionalsStruct(ClusterObject):
+        class AlertsNotification(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B02
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="nullableInt", Tag=0, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="optionalInt", Tag=1, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalInt", Tag=2, Type=typing.Union[None, Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableString", Tag=3, Type=typing.Union[Nullable, str]),
-                            ClusterObjectFieldDescriptor(Label="optionalString", Tag=4, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalString", Tag=5, Type=typing.Union[None, Nullable, str]),
-                            ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=6, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="optionalStruct", Tag=7, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStruct", Tag=8, Type=typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="nullableList", Tag=9, Type=typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
-                            ClusterObjectFieldDescriptor(Label="optionalList", Tag=10, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalList", Tag=11, Type=typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="alertsCount", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="alertStructures", Tag=1, Type=typing.List[uint]),
                     ])
 
-            nullableInt: 'typing.Union[Nullable, uint]' = NullValue
-            optionalInt: 'typing.Optional[uint]' = None
-            nullableOptionalInt: 'typing.Union[None, Nullable, uint]' = None
-            nullableString: 'typing.Union[Nullable, str]' = NullValue
-            optionalString: 'typing.Optional[str]' = None
-            nullableOptionalString: 'typing.Union[None, Nullable, str]' = None
-            nullableStruct: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = NullValue
-            optionalStruct: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
-            nullableOptionalStruct: 'typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]' = None
-            nullableList: 'typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = NullValue
-            optionalList: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
-            nullableOptionalList: 'typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = None
+            alertsCount: 'uint' = 0
+            alertStructures: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class NestedStruct(ClusterObject):
+        class EventsNotification(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B02
+            command_id: typing.ClassVar[int] = 0x0002
+            is_client: typing.ClassVar[bool] = False
+
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="b", Tag=1, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="c", Tag=2, Type=TestCluster.Structs.SimpleStruct),
+                            ClusterObjectFieldDescriptor(Label="eventHeader", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="eventId", Tag=1, Type=ApplianceEventsAndAlert.Enums.EventIdentification),
                     ])
 
-            a: 'uint' = 0
-            b: 'bool' = False
-            c: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            eventHeader: 'uint' = 0
+            eventId: 'ApplianceEventsAndAlert.Enums.EventIdentification' = 0
 
+
+    class Attributes:
         @dataclass
-        class NestedStructList(ClusterObject):
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="b", Tag=1, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="c", Tag=2, Type=TestCluster.Structs.SimpleStruct),
-                            ClusterObjectFieldDescriptor(Label="d", Tag=3, Type=typing.List[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="e", Tag=4, Type=typing.List[uint]),
-                            ClusterObjectFieldDescriptor(Label="f", Tag=5, Type=typing.List[bytes]),
-                            ClusterObjectFieldDescriptor(Label="g", Tag=6, Type=typing.List[uint]),
-                    ])
+            def cluster_id(cls) -> int:
+                return 0x0B02
 
-            a: 'uint' = 0
-            b: 'bool' = False
-            c: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
-            d: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
-            e: 'typing.List[uint]' = field(default_factory=lambda: [])
-            f: 'typing.List[bytes]' = field(default_factory=lambda: [])
-            g: 'typing.List[uint]' = field(default_factory=lambda: [])
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
 
-        @dataclass
-        class DoubleNestedStructList(ClusterObject):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            a: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestListStructOctet(ClusterObject):
+        class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="operationalCert", Tag=1, Type=bytes),
-                    ])
+            def cluster_id(cls) -> int:
+                return 0x0B02
 
-            fabricIndex: 'uint' = 0
-            operationalCert: 'bytes' = b""
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
-    class Commands:
         @dataclass
-        class Test(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
-
+        class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
+            def cluster_id(cls) -> int:
+                return 0x0B02
 
-        @dataclass
-        class TestSpecificResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = False
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="returnValue", Tag=0, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            returnValue: 'uint' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestNotHandled(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
-
+        class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
+            def cluster_id(cls) -> int:
+                return 0x0B02
 
-        @dataclass
-        class TestAddArgumentsResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="returnValue", Tag=0, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            returnValue: 'uint' = 0
+            value: 'uint' = 0
 
         @dataclass
-        class TestSpecific(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
+        class ClusterRevision(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B02
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-        @dataclass
-        class TestSimpleArgumentResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = False
+            value: 'uint' = 0
 
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="returnValue", Tag=0, Type=bool),
-                    ])
 
-            returnValue: 'bool' = False
 
-        @dataclass
-        class TestUnknownCommand(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = True
+@dataclass
+class ApplianceStatistics(Cluster):
+    id: typing.ClassVar[int] = 0x0B03
 
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields = [
+                ClusterObjectFieldDescriptor(Label="logMaxSize", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="logQueueMaxSize", Tag=0x00000001, Type=uint),
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
+
+    logMaxSize: 'uint' = None
+    logQueueMaxSize: 'uint' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
 
 
+
+    class Commands:
         @dataclass
-        class TestStructArrayArgumentResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0003
+        class LogNotification(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B03
+            command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=typing.List[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="arg3", Tag=2, Type=typing.List[TestCluster.Enums.SimpleEnum]),
-                            ClusterObjectFieldDescriptor(Label="arg4", Tag=3, Type=typing.List[bool]),
-                            ClusterObjectFieldDescriptor(Label="arg5", Tag=4, Type=TestCluster.Enums.SimpleEnum),
-                            ClusterObjectFieldDescriptor(Label="arg6", Tag=5, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="timeStamp", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logId", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logLength", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logPayload", Tag=3, Type=typing.List[uint]),
                     ])
 
-            arg1: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
-            arg2: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
-            arg3: 'typing.List[TestCluster.Enums.SimpleEnum]' = field(default_factory=lambda: [])
-            arg4: 'typing.List[bool]' = field(default_factory=lambda: [])
-            arg5: 'TestCluster.Enums.SimpleEnum' = 0
-            arg6: 'bool' = False
+            timeStamp: 'uint' = 0
+            logId: 'uint' = 0
+            logLength: 'uint' = 0
+            logPayload: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestAddArguments(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0004
+        class LogRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B03
+            command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logId", Tag=0, Type=uint),
                     ])
 
-            arg1: 'uint' = 0
-            arg2: 'uint' = 0
+            logId: 'uint' = 0
 
         @dataclass
-        class TestListInt8UReverseResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0004
+        class LogResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B03
+            command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="timeStamp", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logId", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logLength", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logPayload", Tag=3, Type=typing.List[uint]),
                     ])
 
-            arg1: 'typing.List[uint]' = field(default_factory=lambda: [])
+            timeStamp: 'uint' = 0
+            logId: 'uint' = 0
+            logLength: 'uint' = 0
+            logPayload: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestSimpleArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0005
+        class LogQueueRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B03
+            command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=bool),
                     ])
 
-            arg1: 'bool' = False
 
         @dataclass
-        class TestEnumsResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0005
+        class LogQueueResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B03
+            command_id: typing.ClassVar[int] = 0x0002
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=TestCluster.Enums.SimpleEnum),
+                            ClusterObjectFieldDescriptor(Label="logQueueSize", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logIds", Tag=1, Type=typing.List[uint]),
                     ])
 
-            arg1: 'uint' = 0
-            arg2: 'TestCluster.Enums.SimpleEnum' = 0
+            logQueueSize: 'uint' = 0
+            logIds: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestStructArrayArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0006
-            is_client: typing.ClassVar[bool] = True
+        class StatisticsAvailable(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B03
+            command_id: typing.ClassVar[int] = 0x0003
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=typing.List[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="arg3", Tag=2, Type=typing.List[TestCluster.Enums.SimpleEnum]),
-                            ClusterObjectFieldDescriptor(Label="arg4", Tag=3, Type=typing.List[bool]),
-                            ClusterObjectFieldDescriptor(Label="arg5", Tag=4, Type=TestCluster.Enums.SimpleEnum),
-                            ClusterObjectFieldDescriptor(Label="arg6", Tag=5, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="logQueueSize", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="logIds", Tag=1, Type=typing.List[uint]),
                     ])
 
-            arg1: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
-            arg2: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
-            arg3: 'typing.List[TestCluster.Enums.SimpleEnum]' = field(default_factory=lambda: [])
-            arg4: 'typing.List[bool]' = field(default_factory=lambda: [])
-            arg5: 'TestCluster.Enums.SimpleEnum' = 0
-            arg6: 'bool' = False
+            logQueueSize: 'uint' = 0
+            logIds: 'typing.List[uint]' = field(default_factory=lambda: [])
 
-        @dataclass
-        class TestNullableOptionalResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0006
-            is_client: typing.ClassVar[bool] = False
 
+    class Attributes:
+        @dataclass
+        class LogMaxSize(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="wasPresent", Tag=0, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="wasNull", Tag=1, Type=typing.Optional[bool]),
-                            ClusterObjectFieldDescriptor(Label="value", Tag=2, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="originalValue", Tag=3, Type=typing.Union[None, Nullable, uint]),
-                    ])
-
-            wasPresent: 'bool' = False
-            wasNull: 'typing.Optional[bool]' = None
-            value: 'typing.Optional[uint]' = None
-            originalValue: 'typing.Union[None, Nullable, uint]' = None
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
-        @dataclass
-        class TestStructArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0007
-            is_client: typing.ClassVar[bool] = True
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000000
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.SimpleStruct),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            arg1: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            value: 'uint' = 0
 
         @dataclass
-        class TestComplexNullableOptionalResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0007
-            is_client: typing.ClassVar[bool] = False
-
+        class LogQueueMaxSize(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="nullableIntWasNull", Tag=0, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableIntValue", Tag=1, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="optionalIntWasPresent", Tag=2, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="optionalIntValue", Tag=3, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalIntWasPresent", Tag=4, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalIntWasNull", Tag=5, Type=typing.Optional[bool]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalIntValue", Tag=6, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableStringWasNull", Tag=7, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableStringValue", Tag=8, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="optionalStringWasPresent", Tag=9, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="optionalStringValue", Tag=10, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStringWasPresent", Tag=11, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStringWasNull", Tag=12, Type=typing.Optional[bool]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStringValue", Tag=13, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="nullableStructWasNull", Tag=14, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableStructValue", Tag=15, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="optionalStructWasPresent", Tag=16, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="optionalStructValue", Tag=17, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStructWasPresent", Tag=18, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStructWasNull", Tag=19, Type=typing.Optional[bool]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStructValue", Tag=20, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="nullableListWasNull", Tag=21, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableListValue", Tag=22, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
-                            ClusterObjectFieldDescriptor(Label="optionalListWasPresent", Tag=23, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="optionalListValue", Tag=24, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalListWasPresent", Tag=25, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalListWasNull", Tag=26, Type=typing.Optional[bool]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalListValue", Tag=27, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
-                    ])
-
-            nullableIntWasNull: 'bool' = False
-            nullableIntValue: 'typing.Optional[uint]' = None
-            optionalIntWasPresent: 'bool' = False
-            optionalIntValue: 'typing.Optional[uint]' = None
-            nullableOptionalIntWasPresent: 'bool' = False
-            nullableOptionalIntWasNull: 'typing.Optional[bool]' = None
-            nullableOptionalIntValue: 'typing.Optional[uint]' = None
-            nullableStringWasNull: 'bool' = False
-            nullableStringValue: 'typing.Optional[str]' = None
-            optionalStringWasPresent: 'bool' = False
-            optionalStringValue: 'typing.Optional[str]' = None
-            nullableOptionalStringWasPresent: 'bool' = False
-            nullableOptionalStringWasNull: 'typing.Optional[bool]' = None
-            nullableOptionalStringValue: 'typing.Optional[str]' = None
-            nullableStructWasNull: 'bool' = False
-            nullableStructValue: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
-            optionalStructWasPresent: 'bool' = False
-            optionalStructValue: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
-            nullableOptionalStructWasPresent: 'bool' = False
-            nullableOptionalStructWasNull: 'typing.Optional[bool]' = None
-            nullableOptionalStructValue: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
-            nullableListWasNull: 'bool' = False
-            nullableListValue: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
-            optionalListWasPresent: 'bool' = False
-            optionalListValue: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
-            nullableOptionalListWasPresent: 'bool' = False
-            nullableOptionalListWasNull: 'typing.Optional[bool]' = None
-            nullableOptionalListValue: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
-        @dataclass
-        class TestNestedStructArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0008
-            is_client: typing.ClassVar[bool] = True
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000001
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.NestedStruct),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            arg1: 'TestCluster.Structs.NestedStruct' = field(default_factory=lambda: TestCluster.Structs.NestedStruct())
+            value: 'uint' = 0
 
         @dataclass
-        class BooleanResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0008
-            is_client: typing.ClassVar[bool] = False
-
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="value", Tag=0, Type=bool),
-                    ])
-
-            value: 'bool' = False
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
-        @dataclass
-        class TestListStructArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0009
-            is_client: typing.ClassVar[bool] = True
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFF8
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.SimpleStruct]),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            arg1: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class SimpleStructResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0009
-            is_client: typing.ClassVar[bool] = False
+        class AcceptedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.SimpleStruct),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFF9
 
-            arg1: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestListInt8UArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000A
-            is_client: typing.ClassVar[bool] = True
+        class AttributeList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[uint]),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
 
-            arg1: 'typing.List[uint]' = field(default_factory=lambda: [])
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestEmitTestEventResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000A
-            is_client: typing.ClassVar[bool] = False
+        class FeatureMap(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="value", Tag=0, Type=uint),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000FFFC
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
             value: 'uint' = 0
 
         @dataclass
-        class TestNestedStructListArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000B
-            is_client: typing.ClassVar[bool] = True
-
+        class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.NestedStructList),
-                    ])
+            def cluster_id(cls) -> int:
+                return 0x0B03
 
-            arg1: 'TestCluster.Structs.NestedStructList' = field(default_factory=lambda: TestCluster.Structs.NestedStructList())
-
-        @dataclass
-        class TestEmitTestFabricScopedEventResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000B
-            is_client: typing.ClassVar[bool] = False
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="value", Tag=0, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
             value: 'uint' = 0
 
-        @dataclass
-        class TestListNestedStructListArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000C
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
-                    ])
-
-            arg1: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
 
-        @dataclass
-        class TestListInt8UReverseRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000D
-            is_client: typing.ClassVar[bool] = True
 
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[uint]),
-                    ])
+@dataclass
+class ElectricalMeasurement(Cluster):
+    id: typing.ClassVar[int] = 0x0B04
 
-            arg1: 'typing.List[uint]' = field(default_factory=lambda: [])
+    @ChipUtility.classproperty
+    def descriptor(cls) -> ClusterObjectDescriptor:
+        return ClusterObjectDescriptor(
+            Fields = [
+                ClusterObjectFieldDescriptor(Label="measurementType", Tag=0x00000000, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="dcVoltage", Tag=0x00000100, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcVoltageMin", Tag=0x00000101, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcVoltageMax", Tag=0x00000102, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcCurrent", Tag=0x00000103, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcCurrentMin", Tag=0x00000104, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcCurrentMax", Tag=0x00000105, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcPower", Tag=0x00000106, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcPowerMin", Tag=0x00000107, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcPowerMax", Tag=0x00000108, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="dcVoltageMultiplier", Tag=0x00000200, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="dcVoltageDivisor", Tag=0x00000201, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="dcCurrentMultiplier", Tag=0x00000202, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="dcCurrentDivisor", Tag=0x00000203, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="dcPowerMultiplier", Tag=0x00000204, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="dcPowerDivisor", Tag=0x00000205, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acFrequency", Tag=0x00000300, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acFrequencyMin", Tag=0x00000301, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acFrequencyMax", Tag=0x00000302, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="neutralCurrent", Tag=0x00000303, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="totalActivePower", Tag=0x00000304, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="totalReactivePower", Tag=0x00000305, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="totalApparentPower", Tag=0x00000306, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="measured1stHarmonicCurrent", Tag=0x00000307, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measured3rdHarmonicCurrent", Tag=0x00000308, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measured5thHarmonicCurrent", Tag=0x00000309, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measured7thHarmonicCurrent", Tag=0x0000030A, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measured9thHarmonicCurrent", Tag=0x0000030B, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measured11thHarmonicCurrent", Tag=0x0000030C, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measuredPhase1stHarmonicCurrent", Tag=0x0000030D, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measuredPhase3rdHarmonicCurrent", Tag=0x0000030E, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measuredPhase5thHarmonicCurrent", Tag=0x0000030F, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measuredPhase7thHarmonicCurrent", Tag=0x00000310, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measuredPhase9thHarmonicCurrent", Tag=0x00000311, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="measuredPhase11thHarmonicCurrent", Tag=0x00000312, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="acFrequencyMultiplier", Tag=0x00000400, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acFrequencyDivisor", Tag=0x00000401, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="powerMultiplier", Tag=0x00000402, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="powerDivisor", Tag=0x00000403, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="harmonicCurrentMultiplier", Tag=0x00000404, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="phaseHarmonicCurrentMultiplier", Tag=0x00000405, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="instantaneousVoltage", Tag=0x00000500, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="instantaneousLineCurrent", Tag=0x00000501, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="instantaneousActiveCurrent", Tag=0x00000502, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="instantaneousReactiveCurrent", Tag=0x00000503, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="instantaneousPower", Tag=0x00000504, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltage", Tag=0x00000505, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageMin", Tag=0x00000506, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageMax", Tag=0x00000507, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrent", Tag=0x00000508, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentMin", Tag=0x00000509, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentMax", Tag=0x0000050A, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="activePower", Tag=0x0000050B, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="activePowerMin", Tag=0x0000050C, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="activePowerMax", Tag=0x0000050D, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="reactivePower", Tag=0x0000050E, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="apparentPower", Tag=0x0000050F, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="powerFactor", Tag=0x00000510, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="averageRmsVoltageMeasurementPeriod", Tag=0x00000511, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltageCounter", Tag=0x00000513, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltagePeriod", Tag=0x00000514, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltagePeriod", Tag=0x00000515, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSagPeriod", Tag=0x00000516, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSwellPeriod", Tag=0x00000517, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acVoltageMultiplier", Tag=0x00000600, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acVoltageDivisor", Tag=0x00000601, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acCurrentMultiplier", Tag=0x00000602, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acCurrentDivisor", Tag=0x00000603, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acPowerMultiplier", Tag=0x00000604, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acPowerDivisor", Tag=0x00000605, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="overloadAlarmsMask", Tag=0x00000700, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="voltageOverload", Tag=0x00000701, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="currentOverload", Tag=0x00000702, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="acOverloadAlarmsMask", Tag=0x00000800, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="acVoltageOverload", Tag=0x00000801, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="acCurrentOverload", Tag=0x00000802, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="acActivePowerOverload", Tag=0x00000803, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="acReactivePowerOverload", Tag=0x00000804, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="averageRmsOverVoltage", Tag=0x00000805, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltage", Tag=0x00000806, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltage", Tag=0x00000807, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltage", Tag=0x00000808, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSag", Tag=0x00000809, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSwell", Tag=0x0000080A, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="lineCurrentPhaseB", Tag=0x00000901, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="activeCurrentPhaseB", Tag=0x00000902, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="reactiveCurrentPhaseB", Tag=0x00000903, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltagePhaseB", Tag=0x00000905, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageMinPhaseB", Tag=0x00000906, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageMaxPhaseB", Tag=0x00000907, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentPhaseB", Tag=0x00000908, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentMinPhaseB", Tag=0x00000909, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentMaxPhaseB", Tag=0x0000090A, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="activePowerPhaseB", Tag=0x0000090B, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="activePowerMinPhaseB", Tag=0x0000090C, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="activePowerMaxPhaseB", Tag=0x0000090D, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="reactivePowerPhaseB", Tag=0x0000090E, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="apparentPowerPhaseB", Tag=0x0000090F, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="powerFactorPhaseB", Tag=0x00000910, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="averageRmsVoltageMeasurementPeriodPhaseB", Tag=0x00000911, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="averageRmsOverVoltageCounterPhaseB", Tag=0x00000912, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltageCounterPhaseB", Tag=0x00000913, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltagePeriodPhaseB", Tag=0x00000914, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltagePeriodPhaseB", Tag=0x00000915, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSagPeriodPhaseB", Tag=0x00000916, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSwellPeriodPhaseB", Tag=0x00000917, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="lineCurrentPhaseC", Tag=0x00000A01, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="activeCurrentPhaseC", Tag=0x00000A02, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="reactiveCurrentPhaseC", Tag=0x00000A03, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltagePhaseC", Tag=0x00000A05, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageMinPhaseC", Tag=0x00000A06, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageMaxPhaseC", Tag=0x00000A07, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentPhaseC", Tag=0x00000A08, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentMinPhaseC", Tag=0x00000A09, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsCurrentMaxPhaseC", Tag=0x00000A0A, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="activePowerPhaseC", Tag=0x00000A0B, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="activePowerMinPhaseC", Tag=0x00000A0C, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="activePowerMaxPhaseC", Tag=0x00000A0D, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="reactivePowerPhaseC", Tag=0x00000A0E, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="apparentPowerPhaseC", Tag=0x00000A0F, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="powerFactorPhaseC", Tag=0x00000A10, Type=typing.Optional[int]),
+                ClusterObjectFieldDescriptor(Label="averageRmsVoltageMeasurementPeriodPhaseC", Tag=0x00000A11, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="averageRmsOverVoltageCounterPhaseC", Tag=0x00000A12, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltageCounterPhaseC", Tag=0x00000A13, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltagePeriodPhaseC", Tag=0x00000A14, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltagePeriodPhaseC", Tag=0x00000A15, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSagPeriodPhaseC", Tag=0x00000A16, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="rmsVoltageSwellPeriodPhaseC", Tag=0x00000A17, Type=typing.Optional[uint]),
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+            ])
 
-        @dataclass
-        class TestEnumsRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000E
-            is_client: typing.ClassVar[bool] = True
+    measurementType: 'typing.Optional[uint]' = None
+    dcVoltage: 'typing.Optional[int]' = None
+    dcVoltageMin: 'typing.Optional[int]' = None
+    dcVoltageMax: 'typing.Optional[int]' = None
+    dcCurrent: 'typing.Optional[int]' = None
+    dcCurrentMin: 'typing.Optional[int]' = None
+    dcCurrentMax: 'typing.Optional[int]' = None
+    dcPower: 'typing.Optional[int]' = None
+    dcPowerMin: 'typing.Optional[int]' = None
+    dcPowerMax: 'typing.Optional[int]' = None
+    dcVoltageMultiplier: 'typing.Optional[uint]' = None
+    dcVoltageDivisor: 'typing.Optional[uint]' = None
+    dcCurrentMultiplier: 'typing.Optional[uint]' = None
+    dcCurrentDivisor: 'typing.Optional[uint]' = None
+    dcPowerMultiplier: 'typing.Optional[uint]' = None
+    dcPowerDivisor: 'typing.Optional[uint]' = None
+    acFrequency: 'typing.Optional[uint]' = None
+    acFrequencyMin: 'typing.Optional[uint]' = None
+    acFrequencyMax: 'typing.Optional[uint]' = None
+    neutralCurrent: 'typing.Optional[uint]' = None
+    totalActivePower: 'typing.Optional[int]' = None
+    totalReactivePower: 'typing.Optional[int]' = None
+    totalApparentPower: 'typing.Optional[uint]' = None
+    measured1stHarmonicCurrent: 'typing.Optional[int]' = None
+    measured3rdHarmonicCurrent: 'typing.Optional[int]' = None
+    measured5thHarmonicCurrent: 'typing.Optional[int]' = None
+    measured7thHarmonicCurrent: 'typing.Optional[int]' = None
+    measured9thHarmonicCurrent: 'typing.Optional[int]' = None
+    measured11thHarmonicCurrent: 'typing.Optional[int]' = None
+    measuredPhase1stHarmonicCurrent: 'typing.Optional[int]' = None
+    measuredPhase3rdHarmonicCurrent: 'typing.Optional[int]' = None
+    measuredPhase5thHarmonicCurrent: 'typing.Optional[int]' = None
+    measuredPhase7thHarmonicCurrent: 'typing.Optional[int]' = None
+    measuredPhase9thHarmonicCurrent: 'typing.Optional[int]' = None
+    measuredPhase11thHarmonicCurrent: 'typing.Optional[int]' = None
+    acFrequencyMultiplier: 'typing.Optional[uint]' = None
+    acFrequencyDivisor: 'typing.Optional[uint]' = None
+    powerMultiplier: 'typing.Optional[uint]' = None
+    powerDivisor: 'typing.Optional[uint]' = None
+    harmonicCurrentMultiplier: 'typing.Optional[int]' = None
+    phaseHarmonicCurrentMultiplier: 'typing.Optional[int]' = None
+    instantaneousVoltage: 'typing.Optional[int]' = None
+    instantaneousLineCurrent: 'typing.Optional[uint]' = None
+    instantaneousActiveCurrent: 'typing.Optional[int]' = None
+    instantaneousReactiveCurrent: 'typing.Optional[int]' = None
+    instantaneousPower: 'typing.Optional[int]' = None
+    rmsVoltage: 'typing.Optional[uint]' = None
+    rmsVoltageMin: 'typing.Optional[uint]' = None
+    rmsVoltageMax: 'typing.Optional[uint]' = None
+    rmsCurrent: 'typing.Optional[uint]' = None
+    rmsCurrentMin: 'typing.Optional[uint]' = None
+    rmsCurrentMax: 'typing.Optional[uint]' = None
+    activePower: 'typing.Optional[int]' = None
+    activePowerMin: 'typing.Optional[int]' = None
+    activePowerMax: 'typing.Optional[int]' = None
+    reactivePower: 'typing.Optional[int]' = None
+    apparentPower: 'typing.Optional[uint]' = None
+    powerFactor: 'typing.Optional[int]' = None
+    averageRmsVoltageMeasurementPeriod: 'typing.Optional[uint]' = None
+    averageRmsUnderVoltageCounter: 'typing.Optional[uint]' = None
+    rmsExtremeOverVoltagePeriod: 'typing.Optional[uint]' = None
+    rmsExtremeUnderVoltagePeriod: 'typing.Optional[uint]' = None
+    rmsVoltageSagPeriod: 'typing.Optional[uint]' = None
+    rmsVoltageSwellPeriod: 'typing.Optional[uint]' = None
+    acVoltageMultiplier: 'typing.Optional[uint]' = None
+    acVoltageDivisor: 'typing.Optional[uint]' = None
+    acCurrentMultiplier: 'typing.Optional[uint]' = None
+    acCurrentDivisor: 'typing.Optional[uint]' = None
+    acPowerMultiplier: 'typing.Optional[uint]' = None
+    acPowerDivisor: 'typing.Optional[uint]' = None
+    overloadAlarmsMask: 'typing.Optional[uint]' = None
+    voltageOverload: 'typing.Optional[int]' = None
+    currentOverload: 'typing.Optional[int]' = None
+    acOverloadAlarmsMask: 'typing.Optional[uint]' = None
+    acVoltageOverload: 'typing.Optional[int]' = None
+    acCurrentOverload: 'typing.Optional[int]' = None
+    acActivePowerOverload: 'typing.Optional[int]' = None
+    acReactivePowerOverload: 'typing.Optional[int]' = None
+    averageRmsOverVoltage: 'typing.Optional[int]' = None
+    averageRmsUnderVoltage: 'typing.Optional[int]' = None
+    rmsExtremeOverVoltage: 'typing.Optional[int]' = None
+    rmsExtremeUnderVoltage: 'typing.Optional[int]' = None
+    rmsVoltageSag: 'typing.Optional[int]' = None
+    rmsVoltageSwell: 'typing.Optional[int]' = None
+    lineCurrentPhaseB: 'typing.Optional[uint]' = None
+    activeCurrentPhaseB: 'typing.Optional[int]' = None
+    reactiveCurrentPhaseB: 'typing.Optional[int]' = None
+    rmsVoltagePhaseB: 'typing.Optional[uint]' = None
+    rmsVoltageMinPhaseB: 'typing.Optional[uint]' = None
+    rmsVoltageMaxPhaseB: 'typing.Optional[uint]' = None
+    rmsCurrentPhaseB: 'typing.Optional[uint]' = None
+    rmsCurrentMinPhaseB: 'typing.Optional[uint]' = None
+    rmsCurrentMaxPhaseB: 'typing.Optional[uint]' = None
+    activePowerPhaseB: 'typing.Optional[int]' = None
+    activePowerMinPhaseB: 'typing.Optional[int]' = None
+    activePowerMaxPhaseB: 'typing.Optional[int]' = None
+    reactivePowerPhaseB: 'typing.Optional[int]' = None
+    apparentPowerPhaseB: 'typing.Optional[uint]' = None
+    powerFactorPhaseB: 'typing.Optional[int]' = None
+    averageRmsVoltageMeasurementPeriodPhaseB: 'typing.Optional[uint]' = None
+    averageRmsOverVoltageCounterPhaseB: 'typing.Optional[uint]' = None
+    averageRmsUnderVoltageCounterPhaseB: 'typing.Optional[uint]' = None
+    rmsExtremeOverVoltagePeriodPhaseB: 'typing.Optional[uint]' = None
+    rmsExtremeUnderVoltagePeriodPhaseB: 'typing.Optional[uint]' = None
+    rmsVoltageSagPeriodPhaseB: 'typing.Optional[uint]' = None
+    rmsVoltageSwellPeriodPhaseB: 'typing.Optional[uint]' = None
+    lineCurrentPhaseC: 'typing.Optional[uint]' = None
+    activeCurrentPhaseC: 'typing.Optional[int]' = None
+    reactiveCurrentPhaseC: 'typing.Optional[int]' = None
+    rmsVoltagePhaseC: 'typing.Optional[uint]' = None
+    rmsVoltageMinPhaseC: 'typing.Optional[uint]' = None
+    rmsVoltageMaxPhaseC: 'typing.Optional[uint]' = None
+    rmsCurrentPhaseC: 'typing.Optional[uint]' = None
+    rmsCurrentMinPhaseC: 'typing.Optional[uint]' = None
+    rmsCurrentMaxPhaseC: 'typing.Optional[uint]' = None
+    activePowerPhaseC: 'typing.Optional[int]' = None
+    activePowerMinPhaseC: 'typing.Optional[int]' = None
+    activePowerMaxPhaseC: 'typing.Optional[int]' = None
+    reactivePowerPhaseC: 'typing.Optional[int]' = None
+    apparentPowerPhaseC: 'typing.Optional[uint]' = None
+    powerFactorPhaseC: 'typing.Optional[int]' = None
+    averageRmsVoltageMeasurementPeriodPhaseC: 'typing.Optional[uint]' = None
+    averageRmsOverVoltageCounterPhaseC: 'typing.Optional[uint]' = None
+    averageRmsUnderVoltageCounterPhaseC: 'typing.Optional[uint]' = None
+    rmsExtremeOverVoltagePeriodPhaseC: 'typing.Optional[uint]' = None
+    rmsExtremeUnderVoltagePeriodPhaseC: 'typing.Optional[uint]' = None
+    rmsVoltageSagPeriodPhaseC: 'typing.Optional[uint]' = None
+    rmsVoltageSwellPeriodPhaseC: 'typing.Optional[uint]' = None
+    generatedCommandList: 'typing.List[uint]' = None
+    acceptedCommandList: 'typing.List[uint]' = None
+    attributeList: 'typing.List[uint]' = None
+    featureMap: 'uint' = None
+    clusterRevision: 'uint' = None
 
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=TestCluster.Enums.SimpleEnum),
-                    ])
 
-            arg1: 'uint' = 0
-            arg2: 'TestCluster.Enums.SimpleEnum' = 0
 
+    class Commands:
         @dataclass
-        class TestNullableOptionalRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x000F
-            is_client: typing.ClassVar[bool] = True
+        class GetProfileInfoResponseCommand(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B04
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.Union[None, Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="profileCount", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="profileIntervalPeriod", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="maxNumberOfIntervals", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="listOfAttributes", Tag=3, Type=typing.List[uint]),
                     ])
 
-            arg1: 'typing.Union[None, Nullable, uint]' = None
+            profileCount: 'uint' = 0
+            profileIntervalPeriod: 'uint' = 0
+            maxNumberOfIntervals: 'uint' = 0
+            listOfAttributes: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestComplexNullableOptionalRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0010
+        class GetProfileInfoCommand(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B04
+            command_id: typing.ClassVar[int] = 0x0000
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="nullableInt", Tag=0, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="optionalInt", Tag=1, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalInt", Tag=2, Type=typing.Union[None, Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="nullableString", Tag=3, Type=typing.Union[Nullable, str]),
-                            ClusterObjectFieldDescriptor(Label="optionalString", Tag=4, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalString", Tag=5, Type=typing.Union[None, Nullable, str]),
-                            ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=6, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="optionalStruct", Tag=7, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalStruct", Tag=8, Type=typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="nullableList", Tag=9, Type=typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
-                            ClusterObjectFieldDescriptor(Label="optionalList", Tag=10, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
-                            ClusterObjectFieldDescriptor(Label="nullableOptionalList", Tag=11, Type=typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
                     ])
 
-            nullableInt: 'typing.Union[Nullable, uint]' = NullValue
-            optionalInt: 'typing.Optional[uint]' = None
-            nullableOptionalInt: 'typing.Union[None, Nullable, uint]' = None
-            nullableString: 'typing.Union[Nullable, str]' = NullValue
-            optionalString: 'typing.Optional[str]' = None
-            nullableOptionalString: 'typing.Union[None, Nullable, str]' = None
-            nullableStruct: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = NullValue
-            optionalStruct: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
-            nullableOptionalStruct: 'typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]' = None
-            nullableList: 'typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = NullValue
-            optionalList: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
-            nullableOptionalList: 'typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = None
 
         @dataclass
-        class SimpleStructEchoRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0011
-            is_client: typing.ClassVar[bool] = True
+        class GetMeasurementProfileResponseCommand(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B04
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.SimpleStruct),
+                            ClusterObjectFieldDescriptor(Label="startTime", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="status", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="profileIntervalPeriod", Tag=2, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="numberOfIntervalsDelivered", Tag=3, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="attributeId", Tag=4, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="intervals", Tag=5, Type=typing.List[uint]),
                     ])
 
-            arg1: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            startTime: 'uint' = 0
+            status: 'uint' = 0
+            profileIntervalPeriod: 'uint' = 0
+            numberOfIntervalsDelivered: 'uint' = 0
+            attributeId: 'uint' = 0
+            intervals: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TimedInvokeRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0012
+        class GetMeasurementProfileCommand(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x0B04
+            command_id: typing.ClassVar[int] = 0x0001
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="attributeId", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="startTime", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="numberOfIntervals", Tag=2, Type=uint),
                     ])
 
-            @ChipUtility.classproperty
-            def must_use_timed_invoke(cls) -> bool:
-                return True
+            attributeId: 'uint' = 0
+            startTime: 'uint' = 0
+            numberOfIntervals: 'uint' = 0
 
 
+    class Attributes:
         @dataclass
-        class TestSimpleOptionalArgumentRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0013
-            is_client: typing.ClassVar[bool] = True
-
+        class MeasurementType(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.Optional[bool]),
-                    ])
-
-            arg1: 'typing.Optional[bool]' = None
-
-        @dataclass
-        class TestEmitTestEventRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0014
-            is_client: typing.ClassVar[bool] = True
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=TestCluster.Enums.SimpleEnum),
-                            ClusterObjectFieldDescriptor(Label="arg3", Tag=2, Type=bool),
-                    ])
-
-            arg1: 'uint' = 0
-            arg2: 'TestCluster.Enums.SimpleEnum' = 0
-            arg3: 'bool' = False
-
-        @dataclass
-        class TestEmitTestFabricScopedEventRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x050F
-            command_id: typing.ClassVar[int] = 0x0015
-            is_client: typing.ClassVar[bool] = True
+            def attribute_id(cls) -> int:
+                return 0x00000000
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
-                    ])
-
-            arg1: 'uint' = 0
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
 
-    class Attributes:
         @dataclass
-        class Boolean(ClusterAttributeDescriptor):
+        class DcVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000100
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'bool' = False
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Bitmap8(ClusterAttributeDescriptor):
+        class DcVoltageMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000101
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Bitmap16(ClusterAttributeDescriptor):
+        class DcVoltageMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000102
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Bitmap32(ClusterAttributeDescriptor):
+        class DcCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000103
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Bitmap64(ClusterAttributeDescriptor):
+        class DcCurrentMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000104
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Int8u(ClusterAttributeDescriptor):
+        class DcCurrentMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000105
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Int16u(ClusterAttributeDescriptor):
+        class DcPower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000006
+                return 0x00000106
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Int24u(ClusterAttributeDescriptor):
+        class DcPowerMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000007
+                return 0x00000107
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Int32u(ClusterAttributeDescriptor):
+        class DcPowerMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000008
+                return 0x00000108
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Int40u(ClusterAttributeDescriptor):
+        class DcVoltageMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000009
+                return 0x00000200
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int48u(ClusterAttributeDescriptor):
+        class DcVoltageDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000A
+                return 0x00000201
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int56u(ClusterAttributeDescriptor):
+        class DcCurrentMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000B
+                return 0x00000202
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int64u(ClusterAttributeDescriptor):
+        class DcCurrentDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000C
+                return 0x00000203
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int8s(ClusterAttributeDescriptor):
+        class DcPowerMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000D
+                return 0x00000204
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int16s(ClusterAttributeDescriptor):
+        class DcPowerDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000E
+                return 0x00000205
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int24s(ClusterAttributeDescriptor):
+        class AcFrequency(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000F
+                return 0x00000300
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int32s(ClusterAttributeDescriptor):
+        class AcFrequencyMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000010
+                return 0x00000301
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int40s(ClusterAttributeDescriptor):
+        class AcFrequencyMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000011
+                return 0x00000302
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int48s(ClusterAttributeDescriptor):
+        class NeutralCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000012
+                return 0x00000303
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Int56s(ClusterAttributeDescriptor):
+        class TotalActivePower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000013
+                return 0x00000304
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'int' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Int64s(ClusterAttributeDescriptor):
+        class TotalReactivePower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000014
+                return 0x00000305
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'int' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class Enum8(ClusterAttributeDescriptor):
+        class TotalApparentPower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000015
+                return 0x00000306
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Enum16(ClusterAttributeDescriptor):
+        class Measured1stHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000016
+                return 0x00000307
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class FloatSingle(ClusterAttributeDescriptor):
+        class Measured3rdHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000017
+                return 0x00000308
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=float32)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'float32' = 0.0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class FloatDouble(ClusterAttributeDescriptor):
+        class Measured5thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000018
+                return 0x00000309
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=float)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'float' = 0.0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class OctetString(ClusterAttributeDescriptor):
+        class Measured7thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000019
+                return 0x0000030A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bytes)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'bytes' = b""
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ListInt8u(ClusterAttributeDescriptor):
+        class Measured9thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001A
+                return 0x0000030B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ListOctetString(ClusterAttributeDescriptor):
+        class Measured11thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001B
+                return 0x0000030C
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[bytes]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ListStructOctetString(ClusterAttributeDescriptor):
+        class MeasuredPhase1stHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001C
+                return 0x0000030D
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[TestCluster.Structs.TestListStructOctet])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[TestCluster.Structs.TestListStructOctet]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class LongOctetString(ClusterAttributeDescriptor):
+        class MeasuredPhase3rdHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001D
+                return 0x0000030E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bytes)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'bytes' = b""
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class CharString(ClusterAttributeDescriptor):
+        class MeasuredPhase5thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001E
+                return 0x0000030F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'str' = ""
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class LongCharString(ClusterAttributeDescriptor):
+        class MeasuredPhase7thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001F
+                return 0x00000310
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'str' = ""
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class EpochUs(ClusterAttributeDescriptor):
+        class MeasuredPhase9thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000020
+                return 0x00000311
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class EpochS(ClusterAttributeDescriptor):
+        class MeasuredPhase11thHarmonicCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000021
+                return 0x00000312
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class VendorId(ClusterAttributeDescriptor):
+        class AcFrequencyMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000022
+                return 0x00000400
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ListNullablesAndOptionalsStruct(ClusterAttributeDescriptor):
+        class AcFrequencyDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000023
+                return 0x00000401
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[TestCluster.Structs.NullablesAndOptionalsStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[TestCluster.Structs.NullablesAndOptionalsStruct]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class EnumAttr(ClusterAttributeDescriptor):
+        class PowerMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000024
+                return 0x00000402
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=TestCluster.Enums.SimpleEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'TestCluster.Enums.SimpleEnum' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class StructAttr(ClusterAttributeDescriptor):
+        class PowerDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000025
+                return 0x00000403
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=TestCluster.Structs.SimpleStruct)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class RangeRestrictedInt8u(ClusterAttributeDescriptor):
+        class HarmonicCurrentMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000026
+                return 0x00000404
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class RangeRestrictedInt8s(ClusterAttributeDescriptor):
+        class PhaseHarmonicCurrentMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000027
+                return 0x00000405
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'int' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class RangeRestrictedInt16u(ClusterAttributeDescriptor):
+        class InstantaneousVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000028
+                return 0x00000500
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class RangeRestrictedInt16s(ClusterAttributeDescriptor):
+        class InstantaneousLineCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000029
+                return 0x00000501
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ListLongOctetString(ClusterAttributeDescriptor):
+        class InstantaneousActiveCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000002A
+                return 0x00000502
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[bytes]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ListFabricScoped(ClusterAttributeDescriptor):
+        class InstantaneousReactiveCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000002B
+                return 0x00000503
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[TestCluster.Structs.TestFabricScoped])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[TestCluster.Structs.TestFabricScoped]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class TimedWriteBoolean(ClusterAttributeDescriptor):
+        class InstantaneousPower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000030
-
-            @ChipUtility.classproperty
-            def must_use_timed_write(cls) -> bool:
-                return True
+                return 0x00000504
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'bool' = False
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class GeneralErrorBoolean(ClusterAttributeDescriptor):
+        class RmsVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000031
+                return 0x00000505
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'bool' = False
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ClusterErrorBoolean(ClusterAttributeDescriptor):
+        class RmsVoltageMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000032
+                return 0x00000506
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'bool' = False
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Unsupported(ClusterAttributeDescriptor):
+        class RmsVoltageMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x000000FF
+                return 0x00000507
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=bool)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'bool' = False
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableBoolean(ClusterAttributeDescriptor):
+        class RmsCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004000
+                return 0x00000508
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, bool])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, bool]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableBitmap8(ClusterAttributeDescriptor):
+        class RmsCurrentMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004001
+                return 0x00000509
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableBitmap16(ClusterAttributeDescriptor):
+        class RmsCurrentMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004002
+                return 0x0000050A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableBitmap32(ClusterAttributeDescriptor):
+        class ActivePower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004003
+                return 0x0000050B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableBitmap64(ClusterAttributeDescriptor):
+        class ActivePowerMin(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004004
+                return 0x0000050C
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableInt8u(ClusterAttributeDescriptor):
+        class ActivePowerMax(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004005
+                return 0x0000050D
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableInt16u(ClusterAttributeDescriptor):
+        class ReactivePower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004006
+                return 0x0000050E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableInt24u(ClusterAttributeDescriptor):
+        class ApparentPower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004007
+                return 0x0000050F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt32u(ClusterAttributeDescriptor):
+        class PowerFactor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004008
+                return 0x00000510
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableInt40u(ClusterAttributeDescriptor):
+        class AverageRmsVoltageMeasurementPeriod(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004009
+                return 0x00000511
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt48u(ClusterAttributeDescriptor):
+        class AverageRmsUnderVoltageCounter(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000400A
+                return 0x00000513
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt56u(ClusterAttributeDescriptor):
+        class RmsExtremeOverVoltagePeriod(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000400B
+                return 0x00000514
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt64u(ClusterAttributeDescriptor):
+        class RmsExtremeUnderVoltagePeriod(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000400C
+                return 0x00000515
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt8s(ClusterAttributeDescriptor):
+        class RmsVoltageSagPeriod(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000400D
+                return 0x00000516
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt16s(ClusterAttributeDescriptor):
+        class RmsVoltageSwellPeriod(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000400E
+                return 0x00000517
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt24s(ClusterAttributeDescriptor):
+        class AcVoltageMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000400F
+                return 0x00000600
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt32s(ClusterAttributeDescriptor):
+        class AcVoltageDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004010
+                return 0x00000601
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt40s(ClusterAttributeDescriptor):
+        class AcCurrentMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004011
+                return 0x00000602
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt48s(ClusterAttributeDescriptor):
+        class AcCurrentDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004012
+                return 0x00000603
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt56s(ClusterAttributeDescriptor):
+        class AcPowerMultiplier(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004013
+                return 0x00000604
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableInt64s(ClusterAttributeDescriptor):
+        class AcPowerDivisor(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004014
+                return 0x00000605
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableEnum8(ClusterAttributeDescriptor):
+        class OverloadAlarmsMask(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004015
+                return 0x00000700
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableEnum16(ClusterAttributeDescriptor):
+        class VoltageOverload(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004016
+                return 0x00000701
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableFloatSingle(ClusterAttributeDescriptor):
+        class CurrentOverload(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004017
+                return 0x00000702
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, float32])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, float32]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableFloatDouble(ClusterAttributeDescriptor):
+        class AcOverloadAlarmsMask(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004018
+                return 0x00000800
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, float])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, float]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class NullableOctetString(ClusterAttributeDescriptor):
+        class AcVoltageOverload(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004019
+                return 0x00000801
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, bytes]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableCharString(ClusterAttributeDescriptor):
+        class AcCurrentOverload(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000401E
+                return 0x00000802
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, str])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, str]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableEnumAttr(ClusterAttributeDescriptor):
+        class AcActivePowerOverload(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004024
+                return 0x00000803
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, TestCluster.Enums.SimpleEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, TestCluster.Enums.SimpleEnum]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableStruct(ClusterAttributeDescriptor):
+        class AcReactivePowerOverload(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004025
+                return 0x00000804
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableRangeRestrictedInt8u(ClusterAttributeDescriptor):
+        class AverageRmsOverVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004026
+                return 0x00000805
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableRangeRestrictedInt8s(ClusterAttributeDescriptor):
+        class AverageRmsUnderVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004027
+                return 0x00000806
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableRangeRestrictedInt16u(ClusterAttributeDescriptor):
+        class RmsExtremeOverVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004028
+                return 0x00000807
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class NullableRangeRestrictedInt16s(ClusterAttributeDescriptor):
+        class RmsExtremeUnderVoltage(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00004029
+                return 0x00000808
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Union[Nullable, int]' = NullValue
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class RmsVoltageSag(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF8
+                return 0x00000809
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
+        class RmsVoltageSwell(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF9
+                return 0x0000080A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class LineCurrentPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x00000901
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class ActiveCurrentPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x00000902
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class ReactiveCurrentPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000903
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
+            value: 'typing.Optional[int]' = None
 
-    class Events:
         @dataclass
-        class TestEvent(ClusterEvent):
+        class RmsVoltagePhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000001
+            def attribute_id(cls) -> int:
+                return 0x00000905
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="arg2", Tag=2, Type=TestCluster.Enums.SimpleEnum),
-                            ClusterObjectFieldDescriptor(Label="arg3", Tag=3, Type=bool),
-                            ClusterObjectFieldDescriptor(Label="arg4", Tag=4, Type=TestCluster.Structs.SimpleStruct),
-                            ClusterObjectFieldDescriptor(Label="arg5", Tag=5, Type=typing.List[TestCluster.Structs.SimpleStruct]),
-                            ClusterObjectFieldDescriptor(Label="arg6", Tag=6, Type=typing.List[TestCluster.Enums.SimpleEnum]),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            arg1: 'uint' = 0
-            arg2: 'TestCluster.Enums.SimpleEnum' = 0
-            arg3: 'bool' = False
-            arg4: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
-            arg5: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
-            arg6: 'typing.List[TestCluster.Enums.SimpleEnum]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class TestFabricScopedEvent(ClusterEvent):
+        class RmsVoltageMinPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x050F
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000002
+            def attribute_id(cls) -> int:
+                return 0x00000906
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="arg1", Tag=254, Type=uint),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            arg1: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
+        @dataclass
+        class RmsVoltageMaxPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
-@dataclass
-class Messaging(Cluster):
-    id: typing.ClassVar[int] = 0x0703
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000907
 
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
+            value: 'typing.Optional[uint]' = None
 
-    class Enums:
-        class EventId(IntEnum):
-            kMeterCoverRemoved = 0x00
-            kMeterCoverClosed = 0x01
-            kStrongMagneticField = 0x02
-            kNoStrongMagneticField = 0x03
-            kBatteryFailure = 0x04
-            kLowBattery = 0x05
-            kProgramMemoryError = 0x06
-            kRamError = 0x07
-            kNvMemoryError = 0x08
-            kMeasurementSystemError = 0x09
-            kWatchdogError = 0x0A
-            kSupplyDisconnectFailure = 0x0B
-            kSupplyConnectFailure = 0x0C
-            kMeasurmentSoftwareChanged = 0x0D
-            kDstEnabled = 0x0E
-            kDstDisabled = 0x0F
-            kClockAdjBackward = 0x10
-            kClockAdjForward = 0x11
-            kClockInvalid = 0x12
-            kCommsErrorHan = 0x13
-            kCommsOkHan = 0x14
-            kFraudAttempt = 0x15
-            kPowerLoss = 0x16
-            kIncorrectProtocol = 0x17
-            kUnusualHanTraffic = 0x18
-            kUnexpectedClockChange = 0x19
-            kCommsUsingUnauthenticatedComponent = 0x1A
-            kErrorRegClear = 0x1B
-            kAlarmRegClear = 0x1C
-            kUnexpectedHwReset = 0x1D
-            kUnexpectedProgramExecution = 0x1E
-            kEventLogCleared = 0x1F
-            kManualDisconnect = 0x20
-            kManualConnect = 0x21
-            kRemoteDisconnection = 0x22
-            kLocalDisconnection = 0x23
-            kLimitThresholdExceeded = 0x24
-            kLimitThresholdOk = 0x25
-            kLimitThresholdChanged = 0x26
-            kMaximumDemandExceeded = 0x27
-            kProfileCleared = 0x28
-            kFirmwareReadyForActivation = 0x29
-            kFirmwareActivated = 0x2A
-            kPatchFailure = 0x2B
-            kTouTariffActivation = 0x2C
-            k8x8Tariffactivated = 0x2D
-            kSingleTariffRateActivated = 0x2E
-            kAsynchronousBillingOccurred = 0x2F
-            kSynchronousBillingOccurred = 0x30
-            kIncorrectPolarity = 0x80
-            kCurrentNoVoltage = 0x81
-            kUnderVoltage = 0x82
-            kOverVoltage = 0x83
-            kNormalVoltage = 0x84
-            kPfBelowThreshold = 0x85
-            kPfAboveThreshold = 0x86
-            kTerminalCoverRemoved = 0x87
-            kTerminalCoverClosed = 0x88
-            kReverseFlow = 0xA0
-            kTiltTamper = 0xA1
-            kBatteryCoverRemoved = 0xA2
-            kBatteryCoverClosed = 0xA3
-            kExcessFlow = 0xA4
-            kCreditOk = 0xC0
-            kLowCredit = 0xC1
-            kEmergencyCreditInUse = 0xC0
-            kEmergencyCreditExhausted = 0xC1
-            kZeroCreditEcNotSelected = 0xC2
-            kSupplyOn = 0xC3
-            kSupplyOffAarmed = 0xC4
-            kSupplyOff = 0xC5
-            kDiscountApplied = 0xC6
-            kManufacturerSpecificA = 0xE0
-            kManufacturerSpecificB = 0xE1
-            kManufacturerSpecificC = 0xE2
-            kManufacturerSpecificD = 0xE3
-            kManufacturerSpecificE = 0xE4
-            kManufacturerSpecificF = 0xE5
-            kManufacturerSpecificG = 0xE6
-            kManufacturerSpecificH = 0xE7
-            kManufacturerSpecificI = 0xE8
+        @dataclass
+        class RmsCurrentPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
-        class MessagingControlConfirmation(IntEnum):
-            kNotRequired = 0x00
-            kRequired = 0x80
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000908
 
-        class MessagingControlEnhancedConfirmation(IntEnum):
-            kNotRequired = 0x00
-            kRequired = 0x20
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-        class MessagingControlImportance(IntEnum):
-            kLow = 0x00
-            kMedium = 0x04
-            kHigh = 0x08
-            kCritical = 0x0C
+            value: 'typing.Optional[uint]' = None
 
-        class MessagingControlTransmission(IntEnum):
-            kNormal = 0x00
-            kNormalAndAnonymous = 0x01
-            kAnonymous = 0x02
-            kReserved = 0x03
+        @dataclass
+        class RmsCurrentMinPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000909
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
 
-    class Commands:
         @dataclass
-        class DisplayMessage(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = False
+        class RmsCurrentMaxPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="startTime", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="durationInMinutes", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="message", Tag=4, Type=str),
-                            ClusterObjectFieldDescriptor(Label="optionalExtendedMessageControl", Tag=5, Type=uint),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000090A
 
-            messageId: 'uint' = 0
-            messageControl: 'uint' = 0
-            startTime: 'uint' = 0
-            durationInMinutes: 'uint' = 0
-            message: 'str' = ""
-            optionalExtendedMessageControl: 'uint' = 0
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class GetLastMessage(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
+        class ActivePowerPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000090B
 
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class CancelMessage(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
+        class ActivePowerMinPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000090C
 
-            messageId: 'uint' = 0
-            messageControl: 'uint' = 0
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class MessageConfirmation(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
+        class ActivePowerMaxPhaseB(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x0B04
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="confirmationTime", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="messageConfirmationControl", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="messageResponse", Tag=3, Type=bytes),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x0000090D
 
-            messageId: 'uint' = 0
-            confirmationTime: 'uint' = 0
-            messageConfirmationControl: 'uint' = 0
-            messageResponse: 'bytes' = b""
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class DisplayProtectedMessage(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="startTime", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="durationInMinutes", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="message", Tag=4, Type=str),
-                            ClusterObjectFieldDescriptor(Label="optionalExtendedMessageControl", Tag=5, Type=uint),
-                    ])
-
-            messageId: 'uint' = 0
-            messageControl: 'uint' = 0
-            startTime: 'uint' = 0
-            durationInMinutes: 'uint' = 0
-            message: 'str' = ""
-            optionalExtendedMessageControl: 'uint' = 0
-
-        @dataclass
-        class GetMessageCancellation(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="earliestImplementationTime", Tag=0, Type=uint),
-                    ])
-
-            earliestImplementationTime: 'uint' = 0
-
-        @dataclass
-        class CancelAllMessages(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0703
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="implementationDateTime", Tag=0, Type=uint),
-                    ])
-
-            implementationDateTime: 'uint' = 0
-
-
-    class Attributes:
-        @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0703
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF8
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0703
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF9
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class ReactivePowerPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0703
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x0000090E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class ApparentPowerPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0703
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x0000090F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class PowerFactorPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0703
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000910
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-
-
-@dataclass
-class ApplianceIdentification(Cluster):
-    id: typing.ClassVar[int] = 0x0B00
-
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                ClusterObjectFieldDescriptor(Label="basicIdentification", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="companyName", Tag=0x00000010, Type=typing.Optional[str]),
-                ClusterObjectFieldDescriptor(Label="companyId", Tag=0x00000011, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="brandName", Tag=0x00000012, Type=typing.Optional[str]),
-                ClusterObjectFieldDescriptor(Label="brandId", Tag=0x00000013, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="model", Tag=0x00000014, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="partNumber", Tag=0x00000015, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="productRevision", Tag=0x00000016, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="softwareRevision", Tag=0x00000017, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="productTypeName", Tag=0x00000018, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="productTypeId", Tag=0x00000019, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="cecedSpecificationVersion", Tag=0x0000001A, Type=typing.Optional[uint]),
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    basicIdentification: 'uint' = None
-    companyName: 'typing.Optional[str]' = None
-    companyId: 'typing.Optional[uint]' = None
-    brandName: 'typing.Optional[str]' = None
-    brandId: 'typing.Optional[uint]' = None
-    model: 'typing.Optional[bytes]' = None
-    partNumber: 'typing.Optional[bytes]' = None
-    productRevision: 'typing.Optional[bytes]' = None
-    softwareRevision: 'typing.Optional[bytes]' = None
-    productTypeName: 'typing.Optional[bytes]' = None
-    productTypeId: 'typing.Optional[uint]' = None
-    cecedSpecificationVersion: 'typing.Optional[uint]' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
-
-
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
+            value: 'typing.Optional[int]' = None
 
-    class Attributes:
         @dataclass
-        class BasicIdentification(ClusterAttributeDescriptor):
+        class AverageRmsVoltageMeasurementPeriodPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000911
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class CompanyName(ClusterAttributeDescriptor):
+        class AverageRmsOverVoltageCounterPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000010
+                return 0x00000912
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[str]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class CompanyId(ClusterAttributeDescriptor):
+        class AverageRmsUnderVoltageCounterPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000011
+                return 0x00000913
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -37323,30 +36246,30 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class BrandName(ClusterAttributeDescriptor):
+        class RmsExtremeOverVoltagePeriodPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000012
+                return 0x00000914
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[str]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class BrandId(ClusterAttributeDescriptor):
+        class RmsExtremeUnderVoltagePeriodPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000013
+                return 0x00000915
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -37355,94 +36278,94 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Model(ClusterAttributeDescriptor):
+        class RmsVoltageSagPeriodPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000014
+                return 0x00000916
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class PartNumber(ClusterAttributeDescriptor):
+        class RmsVoltageSwellPeriodPhaseB(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000015
+                return 0x00000917
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ProductRevision(ClusterAttributeDescriptor):
+        class LineCurrentPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000016
+                return 0x00000A01
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class SoftwareRevision(ClusterAttributeDescriptor):
+        class ActiveCurrentPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000017
+                return 0x00000A02
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ProductTypeName(ClusterAttributeDescriptor):
+        class ReactiveCurrentPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000018
+                return 0x00000A03
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class ProductTypeId(ClusterAttributeDescriptor):
+        class RmsVoltagePhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000019
+                return 0x00000A05
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -37451,14 +36374,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class CecedSpecificationVersion(ClusterAttributeDescriptor):
+        class RmsVoltageMinPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000001A
+                return 0x00000A06
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -37467,333 +36390,282 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class RmsVoltageMaxPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF8
+                return 0x00000A07
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
+        class RmsCurrentPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF9
+                return 0x00000A08
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class RmsCurrentMinPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x00000A09
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class RmsCurrentMaxPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x00000A0A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class ActivePowerPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B00
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000A0B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-
-
-@dataclass
-class MeterIdentification(Cluster):
-    id: typing.ClassVar[int] = 0x0B01
-
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                ClusterObjectFieldDescriptor(Label="companyName", Tag=0x00000000, Type=str),
-                ClusterObjectFieldDescriptor(Label="meterTypeId", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="dataQualityId", Tag=0x00000004, Type=uint),
-                ClusterObjectFieldDescriptor(Label="customerName", Tag=0x00000005, Type=typing.Optional[str]),
-                ClusterObjectFieldDescriptor(Label="model", Tag=0x00000006, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="partNumber", Tag=0x00000007, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="productRevision", Tag=0x00000008, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="softwareRevision", Tag=0x0000000A, Type=typing.Optional[bytes]),
-                ClusterObjectFieldDescriptor(Label="utilityName", Tag=0x0000000B, Type=typing.Optional[str]),
-                ClusterObjectFieldDescriptor(Label="pod", Tag=0x0000000C, Type=str),
-                ClusterObjectFieldDescriptor(Label="availablePower", Tag=0x0000000D, Type=int),
-                ClusterObjectFieldDescriptor(Label="powerThreshold", Tag=0x0000000E, Type=int),
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    companyName: 'str' = None
-    meterTypeId: 'uint' = None
-    dataQualityId: 'uint' = None
-    customerName: 'typing.Optional[str]' = None
-    model: 'typing.Optional[bytes]' = None
-    partNumber: 'typing.Optional[bytes]' = None
-    productRevision: 'typing.Optional[bytes]' = None
-    softwareRevision: 'typing.Optional[bytes]' = None
-    utilityName: 'typing.Optional[str]' = None
-    pod: 'str' = None
-    availablePower: 'int' = None
-    powerThreshold: 'int' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
-
-
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
+            value: 'typing.Optional[int]' = None
 
-    class Attributes:
         @dataclass
-        class CompanyName(ClusterAttributeDescriptor):
+        class ActivePowerMinPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000A0C
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'str' = ""
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class MeterTypeId(ClusterAttributeDescriptor):
+        class ActivePowerMaxPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000A0D
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class DataQualityId(ClusterAttributeDescriptor):
+        class ReactivePowerPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000A0E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class CustomerName(ClusterAttributeDescriptor):
+        class ApparentPowerPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000A0F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[str]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Model(ClusterAttributeDescriptor):
+        class PowerFactorPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000006
+                return 0x00000A10
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class PartNumber(ClusterAttributeDescriptor):
+        class AverageRmsVoltageMeasurementPeriodPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000007
+                return 0x00000A11
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class ProductRevision(ClusterAttributeDescriptor):
+        class AverageRmsOverVoltageCounterPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000008
+                return 0x00000A12
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class SoftwareRevision(ClusterAttributeDescriptor):
+        class AverageRmsUnderVoltageCounterPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000A
+                return 0x00000A13
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bytes])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[bytes]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class UtilityName(ClusterAttributeDescriptor):
+        class RmsExtremeOverVoltagePeriodPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000B
+                return 0x00000A14
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Optional[str]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class Pod(ClusterAttributeDescriptor):
+        class RmsExtremeUnderVoltagePeriodPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000C
+                return 0x00000A15
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=str)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'str' = ""
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class AvailablePower(ClusterAttributeDescriptor):
+        class RmsVoltageSagPeriodPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000D
+                return 0x00000A16
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class PowerThreshold(ClusterAttributeDescriptor):
+        class RmsVoltageSwellPeriodPhaseC(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000E
+                return 0x00000A17
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=int)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'int' = 0
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -37809,7 +36681,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -37825,7 +36697,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -37841,7 +36713,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -37857,7 +36729,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B01
+                return 0x0B04
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -37872,20 +36744,182 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class ApplianceEventsAndAlert(Cluster):
-    id: typing.ClassVar[int] = 0x0B02
+class TestCluster(Cluster):
+    id: typing.ClassVar[int] = 0xFFF1FC05
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
+                ClusterObjectFieldDescriptor(Label="boolean", Tag=0x00000000, Type=bool),
+                ClusterObjectFieldDescriptor(Label="bitmap8", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="bitmap16", Tag=0x00000002, Type=uint),
+                ClusterObjectFieldDescriptor(Label="bitmap32", Tag=0x00000003, Type=uint),
+                ClusterObjectFieldDescriptor(Label="bitmap64", Tag=0x00000004, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int8u", Tag=0x00000005, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int16u", Tag=0x00000006, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int24u", Tag=0x00000007, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int32u", Tag=0x00000008, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int40u", Tag=0x00000009, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int48u", Tag=0x0000000A, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int56u", Tag=0x0000000B, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int64u", Tag=0x0000000C, Type=uint),
+                ClusterObjectFieldDescriptor(Label="int8s", Tag=0x0000000D, Type=int),
+                ClusterObjectFieldDescriptor(Label="int16s", Tag=0x0000000E, Type=int),
+                ClusterObjectFieldDescriptor(Label="int24s", Tag=0x0000000F, Type=int),
+                ClusterObjectFieldDescriptor(Label="int32s", Tag=0x00000010, Type=int),
+                ClusterObjectFieldDescriptor(Label="int40s", Tag=0x00000011, Type=int),
+                ClusterObjectFieldDescriptor(Label="int48s", Tag=0x00000012, Type=int),
+                ClusterObjectFieldDescriptor(Label="int56s", Tag=0x00000013, Type=int),
+                ClusterObjectFieldDescriptor(Label="int64s", Tag=0x00000014, Type=int),
+                ClusterObjectFieldDescriptor(Label="enum8", Tag=0x00000015, Type=uint),
+                ClusterObjectFieldDescriptor(Label="enum16", Tag=0x00000016, Type=uint),
+                ClusterObjectFieldDescriptor(Label="floatSingle", Tag=0x00000017, Type=float32),
+                ClusterObjectFieldDescriptor(Label="floatDouble", Tag=0x00000018, Type=float),
+                ClusterObjectFieldDescriptor(Label="octetString", Tag=0x00000019, Type=bytes),
+                ClusterObjectFieldDescriptor(Label="listInt8u", Tag=0x0000001A, Type=typing.List[uint]),
+                ClusterObjectFieldDescriptor(Label="listOctetString", Tag=0x0000001B, Type=typing.List[bytes]),
+                ClusterObjectFieldDescriptor(Label="listStructOctetString", Tag=0x0000001C, Type=typing.List[TestCluster.Structs.TestListStructOctet]),
+                ClusterObjectFieldDescriptor(Label="longOctetString", Tag=0x0000001D, Type=bytes),
+                ClusterObjectFieldDescriptor(Label="charString", Tag=0x0000001E, Type=str),
+                ClusterObjectFieldDescriptor(Label="longCharString", Tag=0x0000001F, Type=str),
+                ClusterObjectFieldDescriptor(Label="epochUs", Tag=0x00000020, Type=uint),
+                ClusterObjectFieldDescriptor(Label="epochS", Tag=0x00000021, Type=uint),
+                ClusterObjectFieldDescriptor(Label="vendorId", Tag=0x00000022, Type=uint),
+                ClusterObjectFieldDescriptor(Label="listNullablesAndOptionalsStruct", Tag=0x00000023, Type=typing.List[TestCluster.Structs.NullablesAndOptionalsStruct]),
+                ClusterObjectFieldDescriptor(Label="enumAttr", Tag=0x00000024, Type=TestCluster.Enums.SimpleEnum),
+                ClusterObjectFieldDescriptor(Label="structAttr", Tag=0x00000025, Type=TestCluster.Structs.SimpleStruct),
+                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt8u", Tag=0x00000026, Type=uint),
+                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt8s", Tag=0x00000027, Type=int),
+                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt16u", Tag=0x00000028, Type=uint),
+                ClusterObjectFieldDescriptor(Label="rangeRestrictedInt16s", Tag=0x00000029, Type=int),
+                ClusterObjectFieldDescriptor(Label="listLongOctetString", Tag=0x0000002A, Type=typing.List[bytes]),
+                ClusterObjectFieldDescriptor(Label="listFabricScoped", Tag=0x0000002B, Type=typing.List[TestCluster.Structs.TestFabricScoped]),
+                ClusterObjectFieldDescriptor(Label="timedWriteBoolean", Tag=0x00000030, Type=bool),
+                ClusterObjectFieldDescriptor(Label="generalErrorBoolean", Tag=0x00000031, Type=bool),
+                ClusterObjectFieldDescriptor(Label="clusterErrorBoolean", Tag=0x00000032, Type=bool),
+                ClusterObjectFieldDescriptor(Label="unsupported", Tag=0x000000FF, Type=typing.Optional[bool]),
+                ClusterObjectFieldDescriptor(Label="nullableBoolean", Tag=0x00004000, Type=typing.Union[Nullable, bool]),
+                ClusterObjectFieldDescriptor(Label="nullableBitmap8", Tag=0x00004001, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableBitmap16", Tag=0x00004002, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableBitmap32", Tag=0x00004003, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableBitmap64", Tag=0x00004004, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt8u", Tag=0x00004005, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt16u", Tag=0x00004006, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt24u", Tag=0x00004007, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt32u", Tag=0x00004008, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt40u", Tag=0x00004009, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt48u", Tag=0x0000400A, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt56u", Tag=0x0000400B, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt64u", Tag=0x0000400C, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableInt8s", Tag=0x0000400D, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt16s", Tag=0x0000400E, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt24s", Tag=0x0000400F, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt32s", Tag=0x00004010, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt40s", Tag=0x00004011, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt48s", Tag=0x00004012, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt56s", Tag=0x00004013, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableInt64s", Tag=0x00004014, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableEnum8", Tag=0x00004015, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableEnum16", Tag=0x00004016, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableFloatSingle", Tag=0x00004017, Type=typing.Union[Nullable, float32]),
+                ClusterObjectFieldDescriptor(Label="nullableFloatDouble", Tag=0x00004018, Type=typing.Union[Nullable, float]),
+                ClusterObjectFieldDescriptor(Label="nullableOctetString", Tag=0x00004019, Type=typing.Union[Nullable, bytes]),
+                ClusterObjectFieldDescriptor(Label="nullableCharString", Tag=0x0000401E, Type=typing.Union[Nullable, str]),
+                ClusterObjectFieldDescriptor(Label="nullableEnumAttr", Tag=0x00004024, Type=typing.Union[Nullable, TestCluster.Enums.SimpleEnum]),
+                ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=0x00004025, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]),
+                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8u", Tag=0x00004026, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8s", Tag=0x00004027, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16u", Tag=0x00004028, Type=typing.Union[Nullable, uint]),
+                ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16s", Tag=0x00004029, Type=typing.Union[Nullable, int]),
+                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]),
+                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
+                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
+    boolean: 'bool' = None
+    bitmap8: 'uint' = None
+    bitmap16: 'uint' = None
+    bitmap32: 'uint' = None
+    bitmap64: 'uint' = None
+    int8u: 'uint' = None
+    int16u: 'uint' = None
+    int24u: 'uint' = None
+    int32u: 'uint' = None
+    int40u: 'uint' = None
+    int48u: 'uint' = None
+    int56u: 'uint' = None
+    int64u: 'uint' = None
+    int8s: 'int' = None
+    int16s: 'int' = None
+    int24s: 'int' = None
+    int32s: 'int' = None
+    int40s: 'int' = None
+    int48s: 'int' = None
+    int56s: 'int' = None
+    int64s: 'int' = None
+    enum8: 'uint' = None
+    enum16: 'uint' = None
+    floatSingle: 'float32' = None
+    floatDouble: 'float' = None
+    octetString: 'bytes' = None
+    listInt8u: 'typing.List[uint]' = None
+    listOctetString: 'typing.List[bytes]' = None
+    listStructOctetString: 'typing.List[TestCluster.Structs.TestListStructOctet]' = None
+    longOctetString: 'bytes' = None
+    charString: 'str' = None
+    longCharString: 'str' = None
+    epochUs: 'uint' = None
+    epochS: 'uint' = None
+    vendorId: 'uint' = None
+    listNullablesAndOptionalsStruct: 'typing.List[TestCluster.Structs.NullablesAndOptionalsStruct]' = None
+    enumAttr: 'TestCluster.Enums.SimpleEnum' = None
+    structAttr: 'TestCluster.Structs.SimpleStruct' = None
+    rangeRestrictedInt8u: 'uint' = None
+    rangeRestrictedInt8s: 'int' = None
+    rangeRestrictedInt16u: 'uint' = None
+    rangeRestrictedInt16s: 'int' = None
+    listLongOctetString: 'typing.List[bytes]' = None
+    listFabricScoped: 'typing.List[TestCluster.Structs.TestFabricScoped]' = None
+    timedWriteBoolean: 'bool' = None
+    generalErrorBoolean: 'bool' = None
+    clusterErrorBoolean: 'bool' = None
+    unsupported: 'typing.Optional[bool]' = None
+    nullableBoolean: 'typing.Union[Nullable, bool]' = None
+    nullableBitmap8: 'typing.Union[Nullable, uint]' = None
+    nullableBitmap16: 'typing.Union[Nullable, uint]' = None
+    nullableBitmap32: 'typing.Union[Nullable, uint]' = None
+    nullableBitmap64: 'typing.Union[Nullable, uint]' = None
+    nullableInt8u: 'typing.Union[Nullable, uint]' = None
+    nullableInt16u: 'typing.Union[Nullable, uint]' = None
+    nullableInt24u: 'typing.Union[Nullable, uint]' = None
+    nullableInt32u: 'typing.Union[Nullable, uint]' = None
+    nullableInt40u: 'typing.Union[Nullable, uint]' = None
+    nullableInt48u: 'typing.Union[Nullable, uint]' = None
+    nullableInt56u: 'typing.Union[Nullable, uint]' = None
+    nullableInt64u: 'typing.Union[Nullable, uint]' = None
+    nullableInt8s: 'typing.Union[Nullable, int]' = None
+    nullableInt16s: 'typing.Union[Nullable, int]' = None
+    nullableInt24s: 'typing.Union[Nullable, int]' = None
+    nullableInt32s: 'typing.Union[Nullable, int]' = None
+    nullableInt40s: 'typing.Union[Nullable, int]' = None
+    nullableInt48s: 'typing.Union[Nullable, int]' = None
+    nullableInt56s: 'typing.Union[Nullable, int]' = None
+    nullableInt64s: 'typing.Union[Nullable, int]' = None
+    nullableEnum8: 'typing.Union[Nullable, uint]' = None
+    nullableEnum16: 'typing.Union[Nullable, uint]' = None
+    nullableFloatSingle: 'typing.Union[Nullable, float32]' = None
+    nullableFloatDouble: 'typing.Union[Nullable, float]' = None
+    nullableOctetString: 'typing.Union[Nullable, bytes]' = None
+    nullableCharString: 'typing.Union[Nullable, str]' = None
+    nullableEnumAttr: 'typing.Union[Nullable, TestCluster.Enums.SimpleEnum]' = None
+    nullableStruct: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = None
+    nullableRangeRestrictedInt8u: 'typing.Union[Nullable, uint]' = None
+    nullableRangeRestrictedInt8s: 'typing.Union[Nullable, int]' = None
+    nullableRangeRestrictedInt16u: 'typing.Union[Nullable, uint]' = None
+    nullableRangeRestrictedInt16s: 'typing.Union[Nullable, int]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     attributeList: 'typing.List[uint]' = None
@@ -37893,2825 +36927,2085 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class EventIdentification(IntEnum):
-            kEndOfCycle = 0x01
-            kTemperatureReached = 0x04
-            kEndOfCooking = 0x05
-            kSwitchingOff = 0x06
-            kWrongData = 0x07
-
+        class SimpleEnum(IntEnum):
+            kUnspecified = 0x00
+            kValueA = 0x01
+            kValueB = 0x02
+            kValueC = 0x03
 
 
-    class Commands:
+    class Structs:
         @dataclass
-        class GetAlerts(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B02
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
-
+        class SimpleStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="b", Tag=1, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="c", Tag=2, Type=TestCluster.Enums.SimpleEnum),
+                            ClusterObjectFieldDescriptor(Label="d", Tag=3, Type=bytes),
+                            ClusterObjectFieldDescriptor(Label="e", Tag=4, Type=str),
+                            ClusterObjectFieldDescriptor(Label="f", Tag=5, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="g", Tag=6, Type=float32),
+                            ClusterObjectFieldDescriptor(Label="h", Tag=7, Type=float),
                     ])
 
+            a: 'uint' = 0
+            b: 'bool' = False
+            c: 'TestCluster.Enums.SimpleEnum' = 0
+            d: 'bytes' = b""
+            e: 'str' = ""
+            f: 'uint' = 0
+            g: 'float32' = 0.0
+            h: 'float' = 0.0
 
         @dataclass
-        class GetAlertsResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B02
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = False
-
+        class TestFabricScoped(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="alertsCount", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="alertStructures", Tag=1, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="fabricSensitiveInt8u", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="optionalFabricSensitiveInt8u", Tag=2, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableFabricSensitiveInt8u", Tag=3, Type=typing.Union[Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalFabricSensitiveInt8u", Tag=4, Type=typing.Union[None, Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="fabricSensitiveCharString", Tag=5, Type=str),
+                            ClusterObjectFieldDescriptor(Label="fabricSensitiveStruct", Tag=6, Type=TestCluster.Structs.SimpleStruct),
+                            ClusterObjectFieldDescriptor(Label="fabricSensitiveInt8uList", Tag=7, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
                     ])
 
-            alertsCount: 'uint' = 0
-            alertStructures: 'typing.List[uint]' = field(default_factory=lambda: [])
+            fabricSensitiveInt8u: 'uint' = 0
+            optionalFabricSensitiveInt8u: 'typing.Optional[uint]' = None
+            nullableFabricSensitiveInt8u: 'typing.Union[Nullable, uint]' = NullValue
+            nullableOptionalFabricSensitiveInt8u: 'typing.Union[None, Nullable, uint]' = None
+            fabricSensitiveCharString: 'str' = ""
+            fabricSensitiveStruct: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            fabricSensitiveInt8uList: 'typing.List[uint]' = field(default_factory=lambda: [])
+            fabricIndex: 'uint' = 0
 
         @dataclass
-        class AlertsNotification(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B02
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
-
+        class NullablesAndOptionalsStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="alertsCount", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="alertStructures", Tag=1, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableInt", Tag=0, Type=typing.Union[Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="optionalInt", Tag=1, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalInt", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableString", Tag=3, Type=typing.Union[Nullable, str]),
+                            ClusterObjectFieldDescriptor(Label="optionalString", Tag=4, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalString", Tag=5, Type=typing.Union[None, Nullable, str]),
+                            ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=6, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="optionalStruct", Tag=7, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStruct", Tag=8, Type=typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="nullableList", Tag=9, Type=typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="optionalList", Tag=10, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalList", Tag=11, Type=typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
                     ])
 
-            alertsCount: 'uint' = 0
-            alertStructures: 'typing.List[uint]' = field(default_factory=lambda: [])
+            nullableInt: 'typing.Union[Nullable, uint]' = NullValue
+            optionalInt: 'typing.Optional[uint]' = None
+            nullableOptionalInt: 'typing.Union[None, Nullable, uint]' = None
+            nullableString: 'typing.Union[Nullable, str]' = NullValue
+            optionalString: 'typing.Optional[str]' = None
+            nullableOptionalString: 'typing.Union[None, Nullable, str]' = None
+            nullableStruct: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = NullValue
+            optionalStruct: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
+            nullableOptionalStruct: 'typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]' = None
+            nullableList: 'typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = NullValue
+            optionalList: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
+            nullableOptionalList: 'typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = None
 
         @dataclass
-        class EventsNotification(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B02
-            command_id: typing.ClassVar[int] = 0x0002
-            is_client: typing.ClassVar[bool] = False
-
+        class NestedStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="eventHeader", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="eventId", Tag=1, Type=ApplianceEventsAndAlert.Enums.EventIdentification),
+                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="b", Tag=1, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="c", Tag=2, Type=TestCluster.Structs.SimpleStruct),
                     ])
 
-            eventHeader: 'uint' = 0
-            eventId: 'ApplianceEventsAndAlert.Enums.EventIdentification' = 0
-
+            a: 'uint' = 0
+            b: 'bool' = False
+            c: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
 
-    class Attributes:
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class NestedStructList(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B02
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="b", Tag=1, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="c", Tag=2, Type=TestCluster.Structs.SimpleStruct),
+                            ClusterObjectFieldDescriptor(Label="d", Tag=3, Type=typing.List[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="e", Tag=4, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="f", Tag=5, Type=typing.List[bytes]),
+                            ClusterObjectFieldDescriptor(Label="g", Tag=6, Type=typing.List[uint]),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF8
+            a: 'uint' = 0
+            b: 'bool' = False
+            c: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            d: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
+            e: 'typing.List[uint]' = field(default_factory=lambda: [])
+            f: 'typing.List[bytes]' = field(default_factory=lambda: [])
+            g: 'typing.List[uint]' = field(default_factory=lambda: [])
 
+        @dataclass
+        class DoubleNestedStructList(ClusterObject):
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="a", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
+                    ])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            a: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
+        class TestListStructOctet(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B02
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="member1", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="member2", Tag=1, Type=bytes),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF9
+            member1: 'uint' = 0
+            member2: 'bytes' = b""
 
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
+    class Commands:
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B02
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFB
+        class Test(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                    ])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B02
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFC
+        class TestSpecificResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0000
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="returnValue", Tag=0, Type=uint),
+                    ])
 
-            value: 'uint' = 0
+            returnValue: 'uint' = 0
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B02
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFD
+        class TestNotHandled(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                    ])
 
 
+        @dataclass
+        class TestAddArgumentsResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0001
+            is_client: typing.ClassVar[bool] = False
 
-@dataclass
-class ApplianceStatistics(Cluster):
-    id: typing.ClassVar[int] = 0x0B03
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="returnValue", Tag=0, Type=uint),
+                    ])
 
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                ClusterObjectFieldDescriptor(Label="logMaxSize", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="logQueueMaxSize", Tag=0x00000001, Type=uint),
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
+            returnValue: 'uint' = 0
 
-    logMaxSize: 'uint' = None
-    logQueueMaxSize: 'uint' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
+        @dataclass
+        class TestSpecific(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0002
+            is_client: typing.ClassVar[bool] = True
 
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                    ])
 
 
-    class Commands:
         @dataclass
-        class LogNotification(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B03
-            command_id: typing.ClassVar[int] = 0x0000
+        class TestSimpleArgumentResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0002
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="timeStamp", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logId", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logLength", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logPayload", Tag=3, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="returnValue", Tag=0, Type=bool),
                     ])
 
-            timeStamp: 'uint' = 0
-            logId: 'uint' = 0
-            logLength: 'uint' = 0
-            logPayload: 'typing.List[uint]' = field(default_factory=lambda: [])
+            returnValue: 'bool' = False
 
         @dataclass
-        class LogRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B03
-            command_id: typing.ClassVar[int] = 0x0000
+        class TestUnknownCommand(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0003
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="logId", Tag=0, Type=uint),
                     ])
 
-            logId: 'uint' = 0
 
         @dataclass
-        class LogResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B03
-            command_id: typing.ClassVar[int] = 0x0001
+        class TestStructArrayArgumentResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0003
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="timeStamp", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logId", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logLength", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logPayload", Tag=3, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=typing.List[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="arg3", Tag=2, Type=typing.List[TestCluster.Enums.SimpleEnum]),
+                            ClusterObjectFieldDescriptor(Label="arg4", Tag=3, Type=typing.List[bool]),
+                            ClusterObjectFieldDescriptor(Label="arg5", Tag=4, Type=TestCluster.Enums.SimpleEnum),
+                            ClusterObjectFieldDescriptor(Label="arg6", Tag=5, Type=bool),
                     ])
 
-            timeStamp: 'uint' = 0
-            logId: 'uint' = 0
-            logLength: 'uint' = 0
-            logPayload: 'typing.List[uint]' = field(default_factory=lambda: [])
+            arg1: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
+            arg2: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
+            arg3: 'typing.List[TestCluster.Enums.SimpleEnum]' = field(default_factory=lambda: [])
+            arg4: 'typing.List[bool]' = field(default_factory=lambda: [])
+            arg5: 'TestCluster.Enums.SimpleEnum' = 0
+            arg6: 'bool' = False
 
         @dataclass
-        class LogQueueRequest(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B03
-            command_id: typing.ClassVar[int] = 0x0001
+        class TestAddArguments(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0004
             is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=uint),
                     ])
 
+            arg1: 'uint' = 0
+            arg2: 'uint' = 0
 
         @dataclass
-        class LogQueueResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B03
-            command_id: typing.ClassVar[int] = 0x0002
+        class TestListInt8UReverseResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0004
             is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="logQueueSize", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logIds", Tag=1, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[uint]),
                     ])
 
-            logQueueSize: 'uint' = 0
-            logIds: 'typing.List[uint]' = field(default_factory=lambda: [])
+            arg1: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class StatisticsAvailable(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B03
-            command_id: typing.ClassVar[int] = 0x0003
-            is_client: typing.ClassVar[bool] = False
+        class TestSimpleArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0005
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="logQueueSize", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="logIds", Tag=1, Type=typing.List[uint]),
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=bool),
                     ])
 
-            logQueueSize: 'uint' = 0
-            logIds: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-
-    class Attributes:
-        @dataclass
-        class LogMaxSize(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-        @dataclass
-        class LogQueueMaxSize(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-        @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF8
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF9
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFB
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFC
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-        @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B03
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFD
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
-
-            value: 'uint' = 0
-
-
-
-@dataclass
-class ElectricalMeasurement(Cluster):
-    id: typing.ClassVar[int] = 0x0B04
-
-    @ChipUtility.classproperty
-    def descriptor(cls) -> ClusterObjectDescriptor:
-        return ClusterObjectDescriptor(
-            Fields = [
-                ClusterObjectFieldDescriptor(Label="measurementType", Tag=0x00000000, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="dcVoltage", Tag=0x00000100, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcVoltageMin", Tag=0x00000101, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcVoltageMax", Tag=0x00000102, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcCurrent", Tag=0x00000103, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcCurrentMin", Tag=0x00000104, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcCurrentMax", Tag=0x00000105, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcPower", Tag=0x00000106, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcPowerMin", Tag=0x00000107, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcPowerMax", Tag=0x00000108, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="dcVoltageMultiplier", Tag=0x00000200, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="dcVoltageDivisor", Tag=0x00000201, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="dcCurrentMultiplier", Tag=0x00000202, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="dcCurrentDivisor", Tag=0x00000203, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="dcPowerMultiplier", Tag=0x00000204, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="dcPowerDivisor", Tag=0x00000205, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acFrequency", Tag=0x00000300, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acFrequencyMin", Tag=0x00000301, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acFrequencyMax", Tag=0x00000302, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="neutralCurrent", Tag=0x00000303, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="totalActivePower", Tag=0x00000304, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="totalReactivePower", Tag=0x00000305, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="totalApparentPower", Tag=0x00000306, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="measured1stHarmonicCurrent", Tag=0x00000307, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measured3rdHarmonicCurrent", Tag=0x00000308, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measured5thHarmonicCurrent", Tag=0x00000309, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measured7thHarmonicCurrent", Tag=0x0000030A, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measured9thHarmonicCurrent", Tag=0x0000030B, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measured11thHarmonicCurrent", Tag=0x0000030C, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measuredPhase1stHarmonicCurrent", Tag=0x0000030D, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measuredPhase3rdHarmonicCurrent", Tag=0x0000030E, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measuredPhase5thHarmonicCurrent", Tag=0x0000030F, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measuredPhase7thHarmonicCurrent", Tag=0x00000310, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measuredPhase9thHarmonicCurrent", Tag=0x00000311, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="measuredPhase11thHarmonicCurrent", Tag=0x00000312, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="acFrequencyMultiplier", Tag=0x00000400, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acFrequencyDivisor", Tag=0x00000401, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="powerMultiplier", Tag=0x00000402, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="powerDivisor", Tag=0x00000403, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="harmonicCurrentMultiplier", Tag=0x00000404, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="phaseHarmonicCurrentMultiplier", Tag=0x00000405, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="instantaneousVoltage", Tag=0x00000500, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="instantaneousLineCurrent", Tag=0x00000501, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="instantaneousActiveCurrent", Tag=0x00000502, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="instantaneousReactiveCurrent", Tag=0x00000503, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="instantaneousPower", Tag=0x00000504, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltage", Tag=0x00000505, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageMin", Tag=0x00000506, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageMax", Tag=0x00000507, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrent", Tag=0x00000508, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentMin", Tag=0x00000509, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentMax", Tag=0x0000050A, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="activePower", Tag=0x0000050B, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="activePowerMin", Tag=0x0000050C, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="activePowerMax", Tag=0x0000050D, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="reactivePower", Tag=0x0000050E, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="apparentPower", Tag=0x0000050F, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="powerFactor", Tag=0x00000510, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="averageRmsVoltageMeasurementPeriod", Tag=0x00000511, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltageCounter", Tag=0x00000513, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltagePeriod", Tag=0x00000514, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltagePeriod", Tag=0x00000515, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSagPeriod", Tag=0x00000516, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSwellPeriod", Tag=0x00000517, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acVoltageMultiplier", Tag=0x00000600, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acVoltageDivisor", Tag=0x00000601, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acCurrentMultiplier", Tag=0x00000602, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acCurrentDivisor", Tag=0x00000603, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acPowerMultiplier", Tag=0x00000604, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acPowerDivisor", Tag=0x00000605, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="overloadAlarmsMask", Tag=0x00000700, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="voltageOverload", Tag=0x00000701, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="currentOverload", Tag=0x00000702, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="acOverloadAlarmsMask", Tag=0x00000800, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="acVoltageOverload", Tag=0x00000801, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="acCurrentOverload", Tag=0x00000802, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="acActivePowerOverload", Tag=0x00000803, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="acReactivePowerOverload", Tag=0x00000804, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="averageRmsOverVoltage", Tag=0x00000805, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltage", Tag=0x00000806, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltage", Tag=0x00000807, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltage", Tag=0x00000808, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSag", Tag=0x00000809, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSwell", Tag=0x0000080A, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="lineCurrentPhaseB", Tag=0x00000901, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="activeCurrentPhaseB", Tag=0x00000902, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="reactiveCurrentPhaseB", Tag=0x00000903, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltagePhaseB", Tag=0x00000905, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageMinPhaseB", Tag=0x00000906, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageMaxPhaseB", Tag=0x00000907, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentPhaseB", Tag=0x00000908, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentMinPhaseB", Tag=0x00000909, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentMaxPhaseB", Tag=0x0000090A, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="activePowerPhaseB", Tag=0x0000090B, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="activePowerMinPhaseB", Tag=0x0000090C, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="activePowerMaxPhaseB", Tag=0x0000090D, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="reactivePowerPhaseB", Tag=0x0000090E, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="apparentPowerPhaseB", Tag=0x0000090F, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="powerFactorPhaseB", Tag=0x00000910, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="averageRmsVoltageMeasurementPeriodPhaseB", Tag=0x00000911, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="averageRmsOverVoltageCounterPhaseB", Tag=0x00000912, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltageCounterPhaseB", Tag=0x00000913, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltagePeriodPhaseB", Tag=0x00000914, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltagePeriodPhaseB", Tag=0x00000915, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSagPeriodPhaseB", Tag=0x00000916, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSwellPeriodPhaseB", Tag=0x00000917, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="lineCurrentPhaseC", Tag=0x00000A01, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="activeCurrentPhaseC", Tag=0x00000A02, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="reactiveCurrentPhaseC", Tag=0x00000A03, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltagePhaseC", Tag=0x00000A05, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageMinPhaseC", Tag=0x00000A06, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageMaxPhaseC", Tag=0x00000A07, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentPhaseC", Tag=0x00000A08, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentMinPhaseC", Tag=0x00000A09, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsCurrentMaxPhaseC", Tag=0x00000A0A, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="activePowerPhaseC", Tag=0x00000A0B, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="activePowerMinPhaseC", Tag=0x00000A0C, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="activePowerMaxPhaseC", Tag=0x00000A0D, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="reactivePowerPhaseC", Tag=0x00000A0E, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="apparentPowerPhaseC", Tag=0x00000A0F, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="powerFactorPhaseC", Tag=0x00000A10, Type=typing.Optional[int]),
-                ClusterObjectFieldDescriptor(Label="averageRmsVoltageMeasurementPeriodPhaseC", Tag=0x00000A11, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="averageRmsOverVoltageCounterPhaseC", Tag=0x00000A12, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="averageRmsUnderVoltageCounterPhaseC", Tag=0x00000A13, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeOverVoltagePeriodPhaseC", Tag=0x00000A14, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsExtremeUnderVoltagePeriodPhaseC", Tag=0x00000A15, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSagPeriodPhaseC", Tag=0x00000A16, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="rmsVoltageSwellPeriodPhaseC", Tag=0x00000A17, Type=typing.Optional[uint]),
-                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]),
-                ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint),
-                ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
-            ])
-
-    measurementType: 'typing.Optional[uint]' = None
-    dcVoltage: 'typing.Optional[int]' = None
-    dcVoltageMin: 'typing.Optional[int]' = None
-    dcVoltageMax: 'typing.Optional[int]' = None
-    dcCurrent: 'typing.Optional[int]' = None
-    dcCurrentMin: 'typing.Optional[int]' = None
-    dcCurrentMax: 'typing.Optional[int]' = None
-    dcPower: 'typing.Optional[int]' = None
-    dcPowerMin: 'typing.Optional[int]' = None
-    dcPowerMax: 'typing.Optional[int]' = None
-    dcVoltageMultiplier: 'typing.Optional[uint]' = None
-    dcVoltageDivisor: 'typing.Optional[uint]' = None
-    dcCurrentMultiplier: 'typing.Optional[uint]' = None
-    dcCurrentDivisor: 'typing.Optional[uint]' = None
-    dcPowerMultiplier: 'typing.Optional[uint]' = None
-    dcPowerDivisor: 'typing.Optional[uint]' = None
-    acFrequency: 'typing.Optional[uint]' = None
-    acFrequencyMin: 'typing.Optional[uint]' = None
-    acFrequencyMax: 'typing.Optional[uint]' = None
-    neutralCurrent: 'typing.Optional[uint]' = None
-    totalActivePower: 'typing.Optional[int]' = None
-    totalReactivePower: 'typing.Optional[int]' = None
-    totalApparentPower: 'typing.Optional[uint]' = None
-    measured1stHarmonicCurrent: 'typing.Optional[int]' = None
-    measured3rdHarmonicCurrent: 'typing.Optional[int]' = None
-    measured5thHarmonicCurrent: 'typing.Optional[int]' = None
-    measured7thHarmonicCurrent: 'typing.Optional[int]' = None
-    measured9thHarmonicCurrent: 'typing.Optional[int]' = None
-    measured11thHarmonicCurrent: 'typing.Optional[int]' = None
-    measuredPhase1stHarmonicCurrent: 'typing.Optional[int]' = None
-    measuredPhase3rdHarmonicCurrent: 'typing.Optional[int]' = None
-    measuredPhase5thHarmonicCurrent: 'typing.Optional[int]' = None
-    measuredPhase7thHarmonicCurrent: 'typing.Optional[int]' = None
-    measuredPhase9thHarmonicCurrent: 'typing.Optional[int]' = None
-    measuredPhase11thHarmonicCurrent: 'typing.Optional[int]' = None
-    acFrequencyMultiplier: 'typing.Optional[uint]' = None
-    acFrequencyDivisor: 'typing.Optional[uint]' = None
-    powerMultiplier: 'typing.Optional[uint]' = None
-    powerDivisor: 'typing.Optional[uint]' = None
-    harmonicCurrentMultiplier: 'typing.Optional[int]' = None
-    phaseHarmonicCurrentMultiplier: 'typing.Optional[int]' = None
-    instantaneousVoltage: 'typing.Optional[int]' = None
-    instantaneousLineCurrent: 'typing.Optional[uint]' = None
-    instantaneousActiveCurrent: 'typing.Optional[int]' = None
-    instantaneousReactiveCurrent: 'typing.Optional[int]' = None
-    instantaneousPower: 'typing.Optional[int]' = None
-    rmsVoltage: 'typing.Optional[uint]' = None
-    rmsVoltageMin: 'typing.Optional[uint]' = None
-    rmsVoltageMax: 'typing.Optional[uint]' = None
-    rmsCurrent: 'typing.Optional[uint]' = None
-    rmsCurrentMin: 'typing.Optional[uint]' = None
-    rmsCurrentMax: 'typing.Optional[uint]' = None
-    activePower: 'typing.Optional[int]' = None
-    activePowerMin: 'typing.Optional[int]' = None
-    activePowerMax: 'typing.Optional[int]' = None
-    reactivePower: 'typing.Optional[int]' = None
-    apparentPower: 'typing.Optional[uint]' = None
-    powerFactor: 'typing.Optional[int]' = None
-    averageRmsVoltageMeasurementPeriod: 'typing.Optional[uint]' = None
-    averageRmsUnderVoltageCounter: 'typing.Optional[uint]' = None
-    rmsExtremeOverVoltagePeriod: 'typing.Optional[uint]' = None
-    rmsExtremeUnderVoltagePeriod: 'typing.Optional[uint]' = None
-    rmsVoltageSagPeriod: 'typing.Optional[uint]' = None
-    rmsVoltageSwellPeriod: 'typing.Optional[uint]' = None
-    acVoltageMultiplier: 'typing.Optional[uint]' = None
-    acVoltageDivisor: 'typing.Optional[uint]' = None
-    acCurrentMultiplier: 'typing.Optional[uint]' = None
-    acCurrentDivisor: 'typing.Optional[uint]' = None
-    acPowerMultiplier: 'typing.Optional[uint]' = None
-    acPowerDivisor: 'typing.Optional[uint]' = None
-    overloadAlarmsMask: 'typing.Optional[uint]' = None
-    voltageOverload: 'typing.Optional[int]' = None
-    currentOverload: 'typing.Optional[int]' = None
-    acOverloadAlarmsMask: 'typing.Optional[uint]' = None
-    acVoltageOverload: 'typing.Optional[int]' = None
-    acCurrentOverload: 'typing.Optional[int]' = None
-    acActivePowerOverload: 'typing.Optional[int]' = None
-    acReactivePowerOverload: 'typing.Optional[int]' = None
-    averageRmsOverVoltage: 'typing.Optional[int]' = None
-    averageRmsUnderVoltage: 'typing.Optional[int]' = None
-    rmsExtremeOverVoltage: 'typing.Optional[int]' = None
-    rmsExtremeUnderVoltage: 'typing.Optional[int]' = None
-    rmsVoltageSag: 'typing.Optional[int]' = None
-    rmsVoltageSwell: 'typing.Optional[int]' = None
-    lineCurrentPhaseB: 'typing.Optional[uint]' = None
-    activeCurrentPhaseB: 'typing.Optional[int]' = None
-    reactiveCurrentPhaseB: 'typing.Optional[int]' = None
-    rmsVoltagePhaseB: 'typing.Optional[uint]' = None
-    rmsVoltageMinPhaseB: 'typing.Optional[uint]' = None
-    rmsVoltageMaxPhaseB: 'typing.Optional[uint]' = None
-    rmsCurrentPhaseB: 'typing.Optional[uint]' = None
-    rmsCurrentMinPhaseB: 'typing.Optional[uint]' = None
-    rmsCurrentMaxPhaseB: 'typing.Optional[uint]' = None
-    activePowerPhaseB: 'typing.Optional[int]' = None
-    activePowerMinPhaseB: 'typing.Optional[int]' = None
-    activePowerMaxPhaseB: 'typing.Optional[int]' = None
-    reactivePowerPhaseB: 'typing.Optional[int]' = None
-    apparentPowerPhaseB: 'typing.Optional[uint]' = None
-    powerFactorPhaseB: 'typing.Optional[int]' = None
-    averageRmsVoltageMeasurementPeriodPhaseB: 'typing.Optional[uint]' = None
-    averageRmsOverVoltageCounterPhaseB: 'typing.Optional[uint]' = None
-    averageRmsUnderVoltageCounterPhaseB: 'typing.Optional[uint]' = None
-    rmsExtremeOverVoltagePeriodPhaseB: 'typing.Optional[uint]' = None
-    rmsExtremeUnderVoltagePeriodPhaseB: 'typing.Optional[uint]' = None
-    rmsVoltageSagPeriodPhaseB: 'typing.Optional[uint]' = None
-    rmsVoltageSwellPeriodPhaseB: 'typing.Optional[uint]' = None
-    lineCurrentPhaseC: 'typing.Optional[uint]' = None
-    activeCurrentPhaseC: 'typing.Optional[int]' = None
-    reactiveCurrentPhaseC: 'typing.Optional[int]' = None
-    rmsVoltagePhaseC: 'typing.Optional[uint]' = None
-    rmsVoltageMinPhaseC: 'typing.Optional[uint]' = None
-    rmsVoltageMaxPhaseC: 'typing.Optional[uint]' = None
-    rmsCurrentPhaseC: 'typing.Optional[uint]' = None
-    rmsCurrentMinPhaseC: 'typing.Optional[uint]' = None
-    rmsCurrentMaxPhaseC: 'typing.Optional[uint]' = None
-    activePowerPhaseC: 'typing.Optional[int]' = None
-    activePowerMinPhaseC: 'typing.Optional[int]' = None
-    activePowerMaxPhaseC: 'typing.Optional[int]' = None
-    reactivePowerPhaseC: 'typing.Optional[int]' = None
-    apparentPowerPhaseC: 'typing.Optional[uint]' = None
-    powerFactorPhaseC: 'typing.Optional[int]' = None
-    averageRmsVoltageMeasurementPeriodPhaseC: 'typing.Optional[uint]' = None
-    averageRmsOverVoltageCounterPhaseC: 'typing.Optional[uint]' = None
-    averageRmsUnderVoltageCounterPhaseC: 'typing.Optional[uint]' = None
-    rmsExtremeOverVoltagePeriodPhaseC: 'typing.Optional[uint]' = None
-    rmsExtremeUnderVoltagePeriodPhaseC: 'typing.Optional[uint]' = None
-    rmsVoltageSagPeriodPhaseC: 'typing.Optional[uint]' = None
-    rmsVoltageSwellPeriodPhaseC: 'typing.Optional[uint]' = None
-    generatedCommandList: 'typing.List[uint]' = None
-    acceptedCommandList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    clusterRevision: 'uint' = None
-
-
-
-    class Commands:
-        @dataclass
-        class GetProfileInfoResponseCommand(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="profileCount", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="profileIntervalPeriod", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="maxNumberOfIntervals", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="listOfAttributes", Tag=3, Type=typing.List[uint]),
-                    ])
-
-            profileCount: 'uint' = 0
-            profileIntervalPeriod: 'uint' = 0
-            maxNumberOfIntervals: 'uint' = 0
-            listOfAttributes: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class GetProfileInfoCommand(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0000
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                    ])
-
-
-        @dataclass
-        class GetMeasurementProfileResponseCommand(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = False
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="startTime", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="status", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="profileIntervalPeriod", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="numberOfIntervalsDelivered", Tag=3, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="attributeId", Tag=4, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="intervals", Tag=5, Type=typing.List[uint]),
-                    ])
-
-            startTime: 'uint' = 0
-            status: 'uint' = 0
-            profileIntervalPeriod: 'uint' = 0
-            numberOfIntervalsDelivered: 'uint' = 0
-            attributeId: 'uint' = 0
-            intervals: 'typing.List[uint]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class GetMeasurementProfileCommand(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0001
-            is_client: typing.ClassVar[bool] = True
-
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields = [
-                            ClusterObjectFieldDescriptor(Label="attributeId", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="startTime", Tag=1, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="numberOfIntervals", Tag=2, Type=uint),
-                    ])
-
-            attributeId: 'uint' = 0
-            startTime: 'uint' = 0
-            numberOfIntervals: 'uint' = 0
-
-
-    class Attributes:
-        @dataclass
-        class MeasurementType(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000000
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class DcVoltage(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000100
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcVoltageMin(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000101
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcVoltageMax(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000102
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000103
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcCurrentMin(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000104
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcCurrentMax(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000105
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcPower(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000106
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcPowerMin(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000107
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcPowerMax(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000108
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class DcVoltageMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000200
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class DcVoltageDivisor(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000201
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class DcCurrentMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000202
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class DcCurrentDivisor(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000203
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class DcPowerMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000204
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class DcPowerDivisor(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000205
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class AcFrequency(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000300
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class AcFrequencyMin(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000301
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class AcFrequencyMax(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000302
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
-
-        @dataclass
-        class NeutralCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000303
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
-
-            value: 'typing.Optional[uint]' = None
+            arg1: 'bool' = False
 
         @dataclass
-        class TotalActivePower(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000304
+        class TestEnumsResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0005
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=TestCluster.Enums.SimpleEnum),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'uint' = 0
+            arg2: 'TestCluster.Enums.SimpleEnum' = 0
 
         @dataclass
-        class TotalReactivePower(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000305
+        class TestStructArrayArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0006
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=typing.List[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="arg3", Tag=2, Type=typing.List[TestCluster.Enums.SimpleEnum]),
+                            ClusterObjectFieldDescriptor(Label="arg4", Tag=3, Type=typing.List[bool]),
+                            ClusterObjectFieldDescriptor(Label="arg5", Tag=4, Type=TestCluster.Enums.SimpleEnum),
+                            ClusterObjectFieldDescriptor(Label="arg6", Tag=5, Type=bool),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
+            arg2: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
+            arg3: 'typing.List[TestCluster.Enums.SimpleEnum]' = field(default_factory=lambda: [])
+            arg4: 'typing.List[bool]' = field(default_factory=lambda: [])
+            arg5: 'TestCluster.Enums.SimpleEnum' = 0
+            arg6: 'bool' = False
 
         @dataclass
-        class TotalApparentPower(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000306
+        class TestNullableOptionalResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0006
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="wasPresent", Tag=0, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="wasNull", Tag=1, Type=typing.Optional[bool]),
+                            ClusterObjectFieldDescriptor(Label="value", Tag=2, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="originalValue", Tag=3, Type=typing.Union[None, Nullable, uint]),
+                    ])
 
+            wasPresent: 'bool' = False
+            wasNull: 'typing.Optional[bool]' = None
             value: 'typing.Optional[uint]' = None
+            originalValue: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class Measured1stHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000307
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class Measured3rdHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000308
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class Measured5thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000309
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class Measured7thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000030A
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class Measured9thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000030B
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class Measured11thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000030C
+        class TestStructArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0007
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.SimpleStruct),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
 
         @dataclass
-        class MeasuredPhase1stHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000030D
+        class TestComplexNullableOptionalResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0007
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="nullableIntWasNull", Tag=0, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableIntValue", Tag=1, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="optionalIntWasPresent", Tag=2, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="optionalIntValue", Tag=3, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalIntWasPresent", Tag=4, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalIntWasNull", Tag=5, Type=typing.Optional[bool]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalIntValue", Tag=6, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableStringWasNull", Tag=7, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableStringValue", Tag=8, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="optionalStringWasPresent", Tag=9, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="optionalStringValue", Tag=10, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStringWasPresent", Tag=11, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStringWasNull", Tag=12, Type=typing.Optional[bool]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStringValue", Tag=13, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="nullableStructWasNull", Tag=14, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableStructValue", Tag=15, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="optionalStructWasPresent", Tag=16, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="optionalStructValue", Tag=17, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStructWasPresent", Tag=18, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStructWasNull", Tag=19, Type=typing.Optional[bool]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStructValue", Tag=20, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="nullableListWasNull", Tag=21, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableListValue", Tag=22, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="optionalListWasPresent", Tag=23, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="optionalListValue", Tag=24, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalListWasPresent", Tag=25, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalListWasNull", Tag=26, Type=typing.Optional[bool]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalListValue", Tag=27, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            nullableIntWasNull: 'bool' = False
+            nullableIntValue: 'typing.Optional[uint]' = None
+            optionalIntWasPresent: 'bool' = False
+            optionalIntValue: 'typing.Optional[uint]' = None
+            nullableOptionalIntWasPresent: 'bool' = False
+            nullableOptionalIntWasNull: 'typing.Optional[bool]' = None
+            nullableOptionalIntValue: 'typing.Optional[uint]' = None
+            nullableStringWasNull: 'bool' = False
+            nullableStringValue: 'typing.Optional[str]' = None
+            optionalStringWasPresent: 'bool' = False
+            optionalStringValue: 'typing.Optional[str]' = None
+            nullableOptionalStringWasPresent: 'bool' = False
+            nullableOptionalStringWasNull: 'typing.Optional[bool]' = None
+            nullableOptionalStringValue: 'typing.Optional[str]' = None
+            nullableStructWasNull: 'bool' = False
+            nullableStructValue: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
+            optionalStructWasPresent: 'bool' = False
+            optionalStructValue: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
+            nullableOptionalStructWasPresent: 'bool' = False
+            nullableOptionalStructWasNull: 'typing.Optional[bool]' = None
+            nullableOptionalStructValue: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
+            nullableListWasNull: 'bool' = False
+            nullableListValue: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
+            optionalListWasPresent: 'bool' = False
+            optionalListValue: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
+            nullableOptionalListWasPresent: 'bool' = False
+            nullableOptionalListWasNull: 'typing.Optional[bool]' = None
+            nullableOptionalListValue: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
 
         @dataclass
-        class MeasuredPhase3rdHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000030E
+        class TestNestedStructArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0008
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.NestedStruct),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'TestCluster.Structs.NestedStruct' = field(default_factory=lambda: TestCluster.Structs.NestedStruct())
 
         @dataclass
-        class MeasuredPhase5thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000030F
+        class BooleanResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0008
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="value", Tag=0, Type=bool),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            value: 'bool' = False
 
         @dataclass
-        class MeasuredPhase7thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000310
+        class TestListStructArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0009
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.SimpleStruct]),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class MeasuredPhase9thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000311
+        class SimpleStructResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0009
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.SimpleStruct),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
 
         @dataclass
-        class MeasuredPhase11thHarmonicCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000312
+        class TestListInt8UArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000A
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[uint]),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class AcFrequencyMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000400
+        class TestEmitTestEventResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000A
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="value", Tag=0, Type=uint),
+                    ])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class AcFrequencyDivisor(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000401
+        class TestNestedStructListArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000B
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.NestedStructList),
+                    ])
 
-            value: 'typing.Optional[uint]' = None
+            arg1: 'TestCluster.Structs.NestedStructList' = field(default_factory=lambda: TestCluster.Structs.NestedStructList())
 
         @dataclass
-        class PowerMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000402
+        class TestEmitTestFabricScopedEventResponse(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000B
+            is_client: typing.ClassVar[bool] = False
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="value", Tag=0, Type=uint),
+                    ])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class PowerDivisor(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000403
+        class TestListNestedStructListArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000C
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[TestCluster.Structs.NestedStructList]),
+                    ])
 
-            value: 'typing.Optional[uint]' = None
+            arg1: 'typing.List[TestCluster.Structs.NestedStructList]' = field(default_factory=lambda: [])
 
         @dataclass
-        class HarmonicCurrentMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000404
+        class TestListInt8UReverseRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000D
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.List[uint]),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class PhaseHarmonicCurrentMultiplier(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000405
+        class TestEnumsRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000E
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=TestCluster.Enums.SimpleEnum),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'uint' = 0
+            arg2: 'TestCluster.Enums.SimpleEnum' = 0
 
         @dataclass
-        class InstantaneousVoltage(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000500
+        class TestNullableOptionalRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x000F
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.Union[None, Nullable, uint]),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class InstantaneousLineCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000501
+        class TestComplexNullableOptionalRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0010
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="nullableInt", Tag=0, Type=typing.Union[Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="optionalInt", Tag=1, Type=typing.Optional[uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalInt", Tag=2, Type=typing.Union[None, Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="nullableString", Tag=3, Type=typing.Union[Nullable, str]),
+                            ClusterObjectFieldDescriptor(Label="optionalString", Tag=4, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalString", Tag=5, Type=typing.Union[None, Nullable, str]),
+                            ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=6, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="optionalStruct", Tag=7, Type=typing.Optional[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalStruct", Tag=8, Type=typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="nullableList", Tag=9, Type=typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="optionalList", Tag=10, Type=typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]),
+                            ClusterObjectFieldDescriptor(Label="nullableOptionalList", Tag=11, Type=typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]),
+                    ])
 
-            value: 'typing.Optional[uint]' = None
+            nullableInt: 'typing.Union[Nullable, uint]' = NullValue
+            optionalInt: 'typing.Optional[uint]' = None
+            nullableOptionalInt: 'typing.Union[None, Nullable, uint]' = None
+            nullableString: 'typing.Union[Nullable, str]' = NullValue
+            optionalString: 'typing.Optional[str]' = None
+            nullableOptionalString: 'typing.Union[None, Nullable, str]' = None
+            nullableStruct: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = NullValue
+            optionalStruct: 'typing.Optional[TestCluster.Structs.SimpleStruct]' = None
+            nullableOptionalStruct: 'typing.Union[None, Nullable, TestCluster.Structs.SimpleStruct]' = None
+            nullableList: 'typing.Union[Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = NullValue
+            optionalList: 'typing.Optional[typing.List[TestCluster.Enums.SimpleEnum]]' = None
+            nullableOptionalList: 'typing.Union[None, Nullable, typing.List[TestCluster.Enums.SimpleEnum]]' = None
 
         @dataclass
-        class InstantaneousActiveCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000502
+        class SimpleStructEchoRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0011
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=TestCluster.Structs.SimpleStruct),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
 
         @dataclass
-        class InstantaneousReactiveCurrent(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
+        class TimedInvokeRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0012
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000503
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                    ])
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def must_use_timed_invoke(cls) -> bool:
+                return True
 
-            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class InstantaneousPower(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
+        class TestSimpleOptionalArgumentRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0013
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000504
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=typing.Optional[bool]),
+                    ])
+
+            arg1: 'typing.Optional[bool]' = None
+
+        @dataclass
+        class TestEmitTestEventRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0014
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=1, Type=TestCluster.Enums.SimpleEnum),
+                            ClusterObjectFieldDescriptor(Label="arg3", Tag=2, Type=bool),
+                    ])
 
-            value: 'typing.Optional[int]' = None
+            arg1: 'uint' = 0
+            arg2: 'TestCluster.Enums.SimpleEnum' = 0
+            arg3: 'bool' = False
 
         @dataclass
-        class RmsVoltage(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0B04
+        class TestEmitTestFabricScopedEventRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0xFFF1FC05
+            command_id: typing.ClassVar[int] = 0x0015
+            is_client: typing.ClassVar[bool] = True
 
             @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000505
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=0, Type=uint),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+            arg1: 'uint' = 0
 
-            value: 'typing.Optional[uint]' = None
 
+    class Attributes:
         @dataclass
-        class RmsVoltageMin(ClusterAttributeDescriptor):
+        class Boolean(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000506
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=bool)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'bool' = False
 
         @dataclass
-        class RmsVoltageMax(ClusterAttributeDescriptor):
+        class Bitmap8(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000507
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsCurrent(ClusterAttributeDescriptor):
+        class Bitmap16(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000508
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsCurrentMin(ClusterAttributeDescriptor):
+        class Bitmap32(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000509
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsCurrentMax(ClusterAttributeDescriptor):
+        class Bitmap64(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000050A
+                return 0x00000004
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class ActivePower(ClusterAttributeDescriptor):
+        class Int8u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000050B
+                return 0x00000005
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class ActivePowerMin(ClusterAttributeDescriptor):
+        class Int16u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000050C
+                return 0x00000006
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class ActivePowerMax(ClusterAttributeDescriptor):
+        class Int24u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000050D
+                return 0x00000007
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class ReactivePower(ClusterAttributeDescriptor):
+        class Int32u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000050E
+                return 0x00000008
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class ApparentPower(ClusterAttributeDescriptor):
+        class Int40u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000050F
+                return 0x00000009
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class PowerFactor(ClusterAttributeDescriptor):
+        class Int48u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000510
+                return 0x0000000A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class AverageRmsVoltageMeasurementPeriod(ClusterAttributeDescriptor):
+        class Int56u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000511
+                return 0x0000000B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class AverageRmsUnderVoltageCounter(ClusterAttributeDescriptor):
+        class Int64u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000513
+                return 0x0000000C
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsExtremeOverVoltagePeriod(ClusterAttributeDescriptor):
+        class Int8s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000514
+                return 0x0000000D
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class RmsExtremeUnderVoltagePeriod(ClusterAttributeDescriptor):
+        class Int16s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000515
+                return 0x0000000E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class RmsVoltageSagPeriod(ClusterAttributeDescriptor):
+        class Int24s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000516
+                return 0x0000000F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class RmsVoltageSwellPeriod(ClusterAttributeDescriptor):
+        class Int32s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000517
+                return 0x00000010
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class AcVoltageMultiplier(ClusterAttributeDescriptor):
+        class Int40s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000600
+                return 0x00000011
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class AcVoltageDivisor(ClusterAttributeDescriptor):
+        class Int48s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000601
+                return 0x00000012
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class AcCurrentMultiplier(ClusterAttributeDescriptor):
+        class Int56s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000602
+                return 0x00000013
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class AcCurrentDivisor(ClusterAttributeDescriptor):
+        class Int64s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000603
+                return 0x00000014
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class AcPowerMultiplier(ClusterAttributeDescriptor):
+        class Enum8(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000604
+                return 0x00000015
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class AcPowerDivisor(ClusterAttributeDescriptor):
+        class Enum16(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000605
+                return 0x00000016
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class OverloadAlarmsMask(ClusterAttributeDescriptor):
+        class FloatSingle(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000700
+                return 0x00000017
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=float32)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'float32' = 0.0
 
         @dataclass
-        class VoltageOverload(ClusterAttributeDescriptor):
+        class FloatDouble(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000701
+                return 0x00000018
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=float)
 
-            value: 'typing.Optional[int]' = None
+            value: 'float' = 0.0
 
         @dataclass
-        class CurrentOverload(ClusterAttributeDescriptor):
+        class OctetString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000702
+                return 0x00000019
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=bytes)
 
-            value: 'typing.Optional[int]' = None
+            value: 'bytes' = b""
 
         @dataclass
-        class AcOverloadAlarmsMask(ClusterAttributeDescriptor):
+        class ListInt8u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000800
+                return 0x0000001A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class AcVoltageOverload(ClusterAttributeDescriptor):
+        class ListOctetString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000801
+                return 0x0000001B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.List[bytes])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.List[bytes]' = field(default_factory=lambda: [])
 
         @dataclass
-        class AcCurrentOverload(ClusterAttributeDescriptor):
+        class ListStructOctetString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000802
+                return 0x0000001C
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.List[TestCluster.Structs.TestListStructOctet])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.List[TestCluster.Structs.TestListStructOctet]' = field(default_factory=lambda: [])
 
         @dataclass
-        class AcActivePowerOverload(ClusterAttributeDescriptor):
+        class LongOctetString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000803
+                return 0x0000001D
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=bytes)
 
-            value: 'typing.Optional[int]' = None
+            value: 'bytes' = b""
 
         @dataclass
-        class AcReactivePowerOverload(ClusterAttributeDescriptor):
+        class CharString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000804
+                return 0x0000001E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=str)
 
-            value: 'typing.Optional[int]' = None
+            value: 'str' = ""
 
         @dataclass
-        class AverageRmsOverVoltage(ClusterAttributeDescriptor):
+        class LongCharString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000805
+                return 0x0000001F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=str)
 
-            value: 'typing.Optional[int]' = None
+            value: 'str' = ""
 
         @dataclass
-        class AverageRmsUnderVoltage(ClusterAttributeDescriptor):
+        class EpochUs(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000806
+                return 0x00000020
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsExtremeOverVoltage(ClusterAttributeDescriptor):
+        class EpochS(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000807
+                return 0x00000021
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsExtremeUnderVoltage(ClusterAttributeDescriptor):
+        class VendorId(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000808
+                return 0x00000022
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsVoltageSag(ClusterAttributeDescriptor):
+        class ListNullablesAndOptionalsStruct(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000809
+                return 0x00000023
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.List[TestCluster.Structs.NullablesAndOptionalsStruct])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.List[TestCluster.Structs.NullablesAndOptionalsStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class RmsVoltageSwell(ClusterAttributeDescriptor):
+        class EnumAttr(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000080A
+                return 0x00000024
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=TestCluster.Enums.SimpleEnum)
 
-            value: 'typing.Optional[int]' = None
+            value: 'TestCluster.Enums.SimpleEnum' = 0
 
         @dataclass
-        class LineCurrentPhaseB(ClusterAttributeDescriptor):
+        class StructAttr(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000901
+                return 0x00000025
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=TestCluster.Structs.SimpleStruct)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
 
         @dataclass
-        class ActiveCurrentPhaseB(ClusterAttributeDescriptor):
+        class RangeRestrictedInt8u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000902
+                return 0x00000026
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[int]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class ReactiveCurrentPhaseB(ClusterAttributeDescriptor):
+        class RangeRestrictedInt8s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000903
+                return 0x00000027
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[int]' = None
+            value: 'int' = 0
 
         @dataclass
-        class RmsVoltagePhaseB(ClusterAttributeDescriptor):
+        class RangeRestrictedInt16u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000905
+                return 0x00000028
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class RmsVoltageMinPhaseB(ClusterAttributeDescriptor):
+        class RangeRestrictedInt16s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000906
+                return 0x00000029
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=int)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'int' = 0
 
         @dataclass
-        class RmsVoltageMaxPhaseB(ClusterAttributeDescriptor):
+        class ListLongOctetString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000907
+                return 0x0000002A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.List[bytes])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.List[bytes]' = field(default_factory=lambda: [])
 
         @dataclass
-        class RmsCurrentPhaseB(ClusterAttributeDescriptor):
+        class ListFabricScoped(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000908
+                return 0x0000002B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.List[TestCluster.Structs.TestFabricScoped])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.List[TestCluster.Structs.TestFabricScoped]' = field(default_factory=lambda: [])
 
         @dataclass
-        class RmsCurrentMinPhaseB(ClusterAttributeDescriptor):
+        class TimedWriteBoolean(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000909
+                return 0x00000030
+
+            @ChipUtility.classproperty
+            def must_use_timed_write(cls) -> bool:
+                return True
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=bool)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'bool' = False
 
         @dataclass
-        class RmsCurrentMaxPhaseB(ClusterAttributeDescriptor):
+        class GeneralErrorBoolean(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000090A
+                return 0x00000031
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=bool)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'bool' = False
 
         @dataclass
-        class ActivePowerPhaseB(ClusterAttributeDescriptor):
+        class ClusterErrorBoolean(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000090B
+                return 0x00000032
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=bool)
 
-            value: 'typing.Optional[int]' = None
+            value: 'bool' = False
 
         @dataclass
-        class ActivePowerMinPhaseB(ClusterAttributeDescriptor):
+        class Unsupported(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000090C
+                return 0x000000FF
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Optional[bool]' = None
 
         @dataclass
-        class ActivePowerMaxPhaseB(ClusterAttributeDescriptor):
+        class NullableBoolean(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000090D
+                return 0x00004000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, bool])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, bool]' = NullValue
 
         @dataclass
-        class ReactivePowerPhaseB(ClusterAttributeDescriptor):
+        class NullableBitmap8(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000090E
+                return 0x00004001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class ApparentPowerPhaseB(ClusterAttributeDescriptor):
+        class NullableBitmap16(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000090F
+                return 0x00004002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class PowerFactorPhaseB(ClusterAttributeDescriptor):
+        class NullableBitmap32(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000910
+                return 0x00004003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class AverageRmsVoltageMeasurementPeriodPhaseB(ClusterAttributeDescriptor):
+        class NullableBitmap64(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000911
+                return 0x00004004
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class AverageRmsOverVoltageCounterPhaseB(ClusterAttributeDescriptor):
+        class NullableInt8u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000912
+                return 0x00004005
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class AverageRmsUnderVoltageCounterPhaseB(ClusterAttributeDescriptor):
+        class NullableInt16u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000913
+                return 0x00004006
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class RmsExtremeOverVoltagePeriodPhaseB(ClusterAttributeDescriptor):
+        class NullableInt24u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000914
+                return 0x00004007
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class RmsExtremeUnderVoltagePeriodPhaseB(ClusterAttributeDescriptor):
+        class NullableInt32u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000915
+                return 0x00004008
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class RmsVoltageSagPeriodPhaseB(ClusterAttributeDescriptor):
+        class NullableInt40u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000916
+                return 0x00004009
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class RmsVoltageSwellPeriodPhaseB(ClusterAttributeDescriptor):
+        class NullableInt48u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000917
+                return 0x0000400A
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class LineCurrentPhaseC(ClusterAttributeDescriptor):
+        class NullableInt56u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A01
+                return 0x0000400B
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class ActiveCurrentPhaseC(ClusterAttributeDescriptor):
+        class NullableInt64u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A02
+                return 0x0000400C
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class ReactiveCurrentPhaseC(ClusterAttributeDescriptor):
+        class NullableInt8s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A03
+                return 0x0000400D
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsVoltagePhaseC(ClusterAttributeDescriptor):
+        class NullableInt16s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A05
+                return 0x0000400E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsVoltageMinPhaseC(ClusterAttributeDescriptor):
+        class NullableInt24s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A06
+                return 0x0000400F
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsVoltageMaxPhaseC(ClusterAttributeDescriptor):
+        class NullableInt32s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A07
+                return 0x00004010
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsCurrentPhaseC(ClusterAttributeDescriptor):
+        class NullableInt40s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A08
+                return 0x00004011
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsCurrentMinPhaseC(ClusterAttributeDescriptor):
+        class NullableInt48s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A09
+                return 0x00004012
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsCurrentMaxPhaseC(ClusterAttributeDescriptor):
+        class NullableInt56s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A0A
+                return 0x00004013
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class ActivePowerPhaseC(ClusterAttributeDescriptor):
+        class NullableInt64s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A0B
+                return 0x00004014
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class ActivePowerMinPhaseC(ClusterAttributeDescriptor):
+        class NullableEnum8(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A0C
+                return 0x00004015
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class ActivePowerMaxPhaseC(ClusterAttributeDescriptor):
+        class NullableEnum16(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A0D
+                return 0x00004016
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class ReactivePowerPhaseC(ClusterAttributeDescriptor):
+        class NullableFloatSingle(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A0E
+                return 0x00004017
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, float32])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, float32]' = NullValue
 
         @dataclass
-        class ApparentPowerPhaseC(ClusterAttributeDescriptor):
+        class NullableFloatDouble(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A0F
+                return 0x00004018
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, float])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, float]' = NullValue
 
         @dataclass
-        class PowerFactorPhaseC(ClusterAttributeDescriptor):
+        class NullableOctetString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A10
+                return 0x00004019
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, bytes])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[Nullable, bytes]' = NullValue
 
         @dataclass
-        class AverageRmsVoltageMeasurementPeriodPhaseC(ClusterAttributeDescriptor):
+        class NullableCharString(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A11
+                return 0x0000401E
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, str])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, str]' = NullValue
 
         @dataclass
-        class AverageRmsOverVoltageCounterPhaseC(ClusterAttributeDescriptor):
+        class NullableEnumAttr(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A12
+                return 0x00004024
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, TestCluster.Enums.SimpleEnum])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, TestCluster.Enums.SimpleEnum]' = NullValue
 
         @dataclass
-        class AverageRmsUnderVoltageCounterPhaseC(ClusterAttributeDescriptor):
+        class NullableStruct(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A13
+                return 0x00004025
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, TestCluster.Structs.SimpleStruct]' = NullValue
 
         @dataclass
-        class RmsExtremeOverVoltagePeriodPhaseC(ClusterAttributeDescriptor):
+        class NullableRangeRestrictedInt8u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A14
+                return 0x00004026
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class RmsExtremeUnderVoltagePeriodPhaseC(ClusterAttributeDescriptor):
+        class NullableRangeRestrictedInt8s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A15
+                return 0x00004027
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
-        class RmsVoltageSagPeriodPhaseC(ClusterAttributeDescriptor):
+        class NullableRangeRestrictedInt16u(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A16
+                return 0x00004028
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class RmsVoltageSwellPeriodPhaseC(ClusterAttributeDescriptor):
+        class NullableRangeRestrictedInt16s(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000A17
+                return 0x00004029
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, int]' = NullValue
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -40727,7 +39021,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -40743,7 +39037,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -40759,7 +39053,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -40775,7 +39069,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0B04
+                return 0xFFF1FC05
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -40788,4 +39082,53 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
 
+    class Events:
+        @dataclass
+        class TestEvent(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0xFFF1FC05
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000001
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=1, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="arg2", Tag=2, Type=TestCluster.Enums.SimpleEnum),
+                            ClusterObjectFieldDescriptor(Label="arg3", Tag=3, Type=bool),
+                            ClusterObjectFieldDescriptor(Label="arg4", Tag=4, Type=TestCluster.Structs.SimpleStruct),
+                            ClusterObjectFieldDescriptor(Label="arg5", Tag=5, Type=typing.List[TestCluster.Structs.SimpleStruct]),
+                            ClusterObjectFieldDescriptor(Label="arg6", Tag=6, Type=typing.List[TestCluster.Enums.SimpleEnum]),
+                    ])
+
+            arg1: 'uint' = 0
+            arg2: 'TestCluster.Enums.SimpleEnum' = 0
+            arg3: 'bool' = False
+            arg4: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct())
+            arg5: 'typing.List[TestCluster.Structs.SimpleStruct]' = field(default_factory=lambda: [])
+            arg6: 'typing.List[TestCluster.Enums.SimpleEnum]' = field(default_factory=lambda: [])
+
+        @dataclass
+        class TestFabricScopedEvent(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0xFFF1FC05
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000002
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields = [
+                            ClusterObjectFieldDescriptor(Label="arg1", Tag=254, Type=uint),
+                    ])
+
+            arg1: 'uint' = 0
+
 
diff --git a/src/controller/python/chip/clusters/attribute.cpp b/src/controller/python/chip/clusters/attribute.cpp
index 5c33245450107f..2fb29196b48d1a 100644
--- a/src/controller/python/chip/clusters/attribute.cpp
+++ b/src/controller/python/chip/clusters/attribute.cpp
@@ -70,6 +70,8 @@ using OnReadEventDataCallback           = void (*)(PyObject * appContext, chip::
                                          uint8_t timestampType, uint8_t * data, uint32_t dataLen,
                                          std::underlying_type_t<Protocols::InteractionModel::Status> imstatus);
 using OnSubscriptionEstablishedCallback = void (*)(PyObject * appContext, SubscriptionId subscriptionId);
+using OnResubscriptionAttemptedCallback = void (*)(PyObject * appContext, uint32_t aTerminationCause,
+                                                   uint32_t aNextResubscribeIntervalMsec);
 using OnReadErrorCallback               = void (*)(PyObject * appContext, uint32_t chiperror);
 using OnReadDoneCallback                = void (*)(PyObject * appContext);
 using OnReportBeginCallback             = void (*)(PyObject * appContext);
@@ -78,6 +80,7 @@ using OnReportEndCallback               = void (*)(PyObject * appContext);
 OnReadAttributeDataCallback gOnReadAttributeDataCallback             = nullptr;
 OnReadEventDataCallback gOnReadEventDataCallback                     = nullptr;
 OnSubscriptionEstablishedCallback gOnSubscriptionEstablishedCallback = nullptr;
+OnResubscriptionAttemptedCallback gOnResubscriptionAttemptedCallback = nullptr;
 OnReadErrorCallback gOnReadErrorCallback                             = nullptr;
 OnReadDoneCallback gOnReadDoneCallback                               = nullptr;
 OnReportBeginCallback gOnReportBeginCallback                         = nullptr;
@@ -141,6 +144,11 @@ class ReadClientCallback : public ReadClient::Callback
         gOnSubscriptionEstablishedCallback(mAppContext, aSubscriptionId);
     }
 
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override
+    {
+        gOnResubscriptionAttemptedCallback(mAppContext, aTerminationCause.AsInteger(), aNextResubscribeIntervalMsec);
+    }
+
     void OnEventData(const EventHeader & aEventHeader, TLV::TLVReader * apData, const StatusIB * apStatus) override
     {
         uint8_t buffer[CHIP_CONFIG_DEFAULT_UDP_MTU_SIZE];
@@ -296,12 +304,14 @@ void pychip_WriteClient_InitCallbacks(OnWriteResponseCallback onWriteResponseCal
 void pychip_ReadClient_InitCallbacks(OnReadAttributeDataCallback onReadAttributeDataCallback,
                                      OnReadEventDataCallback onReadEventDataCallback,
                                      OnSubscriptionEstablishedCallback onSubscriptionEstablishedCallback,
+                                     OnResubscriptionAttemptedCallback onResubscriptionAttemptedCallback,
                                      OnReadErrorCallback onReadErrorCallback, OnReadDoneCallback onReadDoneCallback,
                                      OnReportBeginCallback onReportBeginCallback, OnReportEndCallback onReportEndCallback)
 {
     gOnReadAttributeDataCallback       = onReadAttributeDataCallback;
     gOnReadEventDataCallback           = onReadEventDataCallback;
     gOnSubscriptionEstablishedCallback = onSubscriptionEstablishedCallback;
+    gOnResubscriptionAttemptedCallback = onResubscriptionAttemptedCallback;
     gOnReadErrorCallback               = onReadErrorCallback;
     gOnReadDoneCallback                = onReadDoneCallback;
     gOnReportBeginCallback             = onReportBeginCallback;
diff --git a/src/controller/python/chip/clusters/command.cpp b/src/controller/python/chip/clusters/command.cpp
index b3ddbfba04b583..e87a2252048b26 100644
--- a/src/controller/python/chip/clusters/command.cpp
+++ b/src/controller/python/chip/clusters/command.cpp
@@ -146,7 +146,7 @@ chip::ChipError::StorageType pychip_CommandSender_SendCommand(void * appContext,
         VerifyOrExit(writer != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
         reader.Init(payload, length);
         reader.Next();
-        SuccessOrExit(writer->CopyContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kData)), reader));
+        SuccessOrExit(writer->CopyContainer(TLV::ContextTag(to_underlying(CommandDataIB::Tag::kFields)), reader));
     }
 
     SuccessOrExit(err = sender->FinishCommand(timedRequestTimeoutMs != 0 ? Optional<uint16_t>(timedRequestTimeoutMs)
diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py
index 4711ff7f31d3e8..69dad256d83cdd 100644
--- a/src/controller/python/test/test_scripts/base.py
+++ b/src/controller/python/test/test_scripts/base.py
@@ -831,7 +831,7 @@ def TestNonControllerAPIs(self):
         '''
         try:
             cluster = self.devCtrl.GetClusterHandler()
-            clusterInfo = cluster.GetClusterInfoById(0x50F)  # TestCluster
+            clusterInfo = cluster.GetClusterInfoById(0xFFF1FC05)  # TestCluster
             if clusterInfo["clusterName"] != "TestCluster":
                 raise Exception(
                     f"Wrong cluster info clusterName: {clusterInfo['clusterName']} expected TestCluster")
diff --git a/src/controller/tests/TestEventChunking.cpp b/src/controller/tests/TestEventChunking.cpp
index c0d4da80ec2d9b..b3a7bb35a045f5 100644
--- a/src/controller/tests/TestEventChunking.cpp
+++ b/src/controller/tests/TestEventChunking.cpp
@@ -156,6 +156,8 @@ class TestReadCallback : public app::ReadClient::Callback
 
     void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override { mOnSubscriptionEstablished = true; }
 
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override {}
+
     uint32_t mAttributeCount        = 0;
     uint32_t mEventCount            = 0;
     bool mOnReportEnd               = false;
diff --git a/src/controller/tests/TestReadChunking.cpp b/src/controller/tests/TestReadChunking.cpp
index e6365659d588ab..ce7668b318e5a6 100644
--- a/src/controller/tests/TestReadChunking.cpp
+++ b/src/controller/tests/TestReadChunking.cpp
@@ -64,7 +64,8 @@ constexpr EndpointId kTestEndpointId3 = 3;
 constexpr EndpointId kTestEndpointId4    = 4;
 constexpr EndpointId kTestEndpointId5    = 5;
 constexpr AttributeId kTestListAttribute = 6;
-constexpr AttributeId kTestBadAttribute  = 7; // Reading this attribute will return CHIP_NO_MEMORY but nothing is actually encoded.
+constexpr AttributeId kTestBadAttribute =
+    7; // Reading this attribute will return CHIP_ERROR_NO_MEMORY but nothing is actually encoded.
 
 class TestCommandInteraction
 {
@@ -134,6 +135,8 @@ class TestReadCallback : public app::ReadClient::Callback
 
     void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override { mOnSubscriptionEstablished = true; }
 
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override {}
+
     uint32_t mAttributeCount        = 0;
     bool mOnReportEnd               = false;
     bool mOnSubscriptionEstablished = false;
@@ -274,7 +277,7 @@ CHIP_ERROR TestAttrAccess::Read(const app::ConcreteReadAttributePath & aPath, ap
         });
     case kTestBadAttribute:
         // The "BadAttribute" is implemented by encoding a very large octet string, then the encode will always return
-        // CHIP_NO_MEMORY.
+        // CHIP_ERROR_NO_MEMORY.
         return aEncoder.EncodeList([](const auto & encoder) {
             return encoder.Encode(ByteSpan(sAnStringThatCanNeverFitIntoTheMTU, sizeof(sAnStringThatCanNeverFitIntoTheMTU)));
         });
@@ -302,6 +305,7 @@ class TestMutableReadCallback : public app::ReadClient::Callback
     void OnReportEnd() override { mOnReportEnd = true; }
 
     void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override { mOnSubscriptionEstablished = true; }
+    void OnResubscriptionAttempt(CHIP_ERROR aTerminationCause, uint32_t aNextResubscribeIntervalMsec) override {}
 
     uint32_t mAttributeCount = 0;
     // We record every dataversion field from every attribute IB.
diff --git a/src/controller/tests/TestServerCommandDispatch.cpp b/src/controller/tests/TestServerCommandDispatch.cpp
index a6812b1d2ad7df..138ed583329a5b 100644
--- a/src/controller/tests/TestServerCommandDispatch.cpp
+++ b/src/controller/tests/TestServerCommandDispatch.cpp
@@ -321,7 +321,10 @@ void TestCommandInteraction::TestDataResponseHelper(nlTestSuite * apSuite, void
         }
         onSuccessWasCalled = true;
     };
-    auto readFailureCb = [&onFailureWasCalled](const ConcreteDataAttributePath *, CHIP_ERROR aError) { onFailureWasCalled = true; };
+    auto readFailureCb = [&onFailureWasCalled](const ConcreteDataAttributePath *, CHIP_ERROR aError) {
+        onFailureWasCalled = true;
+        ChipLogError(NotSpecified, "TEST FAILURE: %" CHIP_ERROR_FORMAT, aError.Format());
+    };
 
     chip::Controller::ReadAttribute<TestCluster::Attributes::AcceptedCommandList::TypeInfo>(
         &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, readSuccessCb, readFailureCb);
diff --git a/src/controller/tests/TestWriteChunking.cpp b/src/controller/tests/TestWriteChunking.cpp
index 6917aa0d17a38e..89b0c1379141d6 100644
--- a/src/controller/tests/TestWriteChunking.cpp
+++ b/src/controller/tests/TestWriteChunking.cpp
@@ -579,7 +579,8 @@ void RunTest(nlTestSuite * apSuite, TestContext & ctx, Instructions instructions
     err = writeClient->SendWriteRequest(sessionHandle);
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-    ctx.GetIOContext().DriveIOUntil(System::Clock::Seconds16(15),
+    ctx.GetIOContext().DriveIOUntil(sessionHandle->ComputeRoundTripTimeout(app::kExpectedIMProcessingTime) +
+                                        System::Clock::Seconds16(1),
                                     [&]() { return ctx.GetExchangeManager().GetNumActiveExchanges() == 0; });
 
     NL_TEST_ASSERT(apSuite, onGoingPath == app::ConcreteAttributePath());
diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp
index 6d5cd25c234168..3dcb5a921f8dde 100644
--- a/src/controller/tests/data_model/TestRead.cpp
+++ b/src/controller/tests/data_model/TestRead.cpp
@@ -147,7 +147,7 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
         uint8_t i = 0;
         for (auto & item : valueBuf)
         {
-            item.fabricIndex = i;
+            item.member1 = i;
             i++;
         }
 
@@ -208,9 +208,9 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
     TestReadInteraction() {}
 
     static void TestReadAttributeResponse(nlTestSuite * apSuite, void * apContext);
-    static void TestReadDataVersionFilter(nlTestSuite * apSuite, void * apContext);
     static void TestReadAttributeError(nlTestSuite * apSuite, void * apContext);
     static void TestReadAttributeTimeout(nlTestSuite * apSuite, void * apContext);
+    static void TestSubscribeAttributeTimeout(nlTestSuite * apSuite, void * apContext);
     static void TestReadEventResponse(nlTestSuite * apSuite, void * apContext);
     static void TestReadFabricScopedWithoutFabricFilter(nlTestSuite * apSuite, void * apContext);
     static void TestReadFabricScopedWithFabricFilter(nlTestSuite * apSuite, void * apContext);
@@ -220,7 +220,15 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
     static void TestReadHandler_OneSubscribeMultipleReads(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_TwoSubscribesMultipleReads(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_MultipleSubscriptionsWithDataVersionFilter(nlTestSuite * apSuite, void * apContext);
-    static void TestReadHandler_SubscriptionAlteredReportingIntervals(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest1(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest2(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest3(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest4(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest5(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest6(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest7(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest8(nlTestSuite * apSuite, void * apContext);
+    static void TestReadHandler_SubscriptionReportingIntervalsTest9(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandlerResourceExhaustion_MultipleReads(nlTestSuite * apSuite, void * apContext);
     static void TestReadSubscribeAttributeResponseWithCache(nlTestSuite * apSuite, void * apContext);
     static void TestReadHandler_KillOverQuotaSubscriptions(nlTestSuite * apSuite, void * apContext);
@@ -230,8 +238,7 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
     static void TestReadHandler_TwoParallelReadsSecondTooManyPaths(nlTestSuite * apSuite, void * apContext);
 
 private:
-    static constexpr uint16_t kTestMinInterval = 33;
-    static constexpr uint16_t kTestMaxInterval = 66;
+    static uint16_t mMaxInterval;
 
     CHIP_ERROR OnSubscriptionRequested(app::ReadHandler & aReadHandler, Transport::SecureSession & aSecureSession)
     {
@@ -239,7 +246,7 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
 
         if (mAlterSubscriptionIntervals)
         {
-            ReturnErrorOnFailure(aReadHandler.SetReportingIntervals(kTestMinInterval, kTestMaxInterval));
+            ReturnErrorOnFailure(aReadHandler.SetReportingIntervals(mMaxInterval));
         }
         return CHIP_NO_ERROR;
     }
@@ -261,6 +268,8 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
     bool mAlterSubscriptionIntervals = false;
 };
 
+uint16_t TestReadInteraction::mMaxInterval = 66;
+
 TestReadInteraction gTestReadInteraction;
 
 class MockInteractionModelApp : public chip::app::ClusterStateCache::Callback
@@ -330,7 +339,7 @@ void TestReadInteraction::TestReadAttributeResponse(nlTestSuite * apSuite, void
         while (iter.Next())
         {
             auto & item = iter.GetValue();
-            NL_TEST_ASSERT(apSuite, item.fabricIndex == i);
+            NL_TEST_ASSERT(apSuite, item.member1 == i);
             i++;
         }
         NL_TEST_ASSERT(apSuite, i == 4);
@@ -355,49 +364,6 @@ void TestReadInteraction::TestReadAttributeResponse(nlTestSuite * apSuite, void
     NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
 }
 
-void TestReadInteraction::TestReadDataVersionFilter(nlTestSuite * apSuite, void * apContext)
-{
-    TestContext & ctx       = *static_cast<TestContext *>(apContext);
-    auto sessionHandle      = ctx.GetSessionBobToAlice();
-    bool onSuccessCbInvoked = false, onFailureCbInvoked = false;
-
-    responseDirective = kSendDataResponse;
-
-    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
-    // not safe to do so.
-    auto onSuccessCb = [apSuite, &onSuccessCbInvoked](const app::ConcreteDataAttributePath & attributePath,
-                                                      const auto & dataResponse) {
-        uint8_t i = 0;
-        auto iter = dataResponse.begin();
-        while (iter.Next())
-        {
-            auto & item = iter.GetValue();
-            NL_TEST_ASSERT(apSuite, item.fabricIndex == i);
-            i++;
-        }
-        NL_TEST_ASSERT(apSuite, i == 4);
-        NL_TEST_ASSERT(apSuite, iter.GetStatus() == CHIP_NO_ERROR);
-        onSuccessCbInvoked = true;
-    };
-
-    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
-    // not safe to do so.
-    auto onFailureCb = [&onFailureCbInvoked](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
-        onFailureCbInvoked = true;
-    };
-
-    Optional<DataVersion> dataVersion(kDataVersion);
-    Controller::ReadAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
-        &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, true, dataVersion);
-
-    ctx.DrainAndServiceIO();
-
-    NL_TEST_ASSERT(apSuite, !onSuccessCbInvoked && !onFailureCbInvoked);
-    NL_TEST_ASSERT(apSuite, app::InteractionModelEngine::GetInstance()->GetNumActiveReadClients() == 0);
-    NL_TEST_ASSERT(apSuite, app::InteractionModelEngine::GetInstance()->GetNumActiveReadHandlers() == 0);
-    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
-}
-
 void TestReadInteraction::TestReadSubscribeAttributeResponseWithCache(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(apContext);
@@ -1356,7 +1322,7 @@ void TestReadInteraction::TestReadEventResponse(nlTestSuite * apSuite, void * ap
 {
     TestContext & ctx       = *static_cast<TestContext *>(apContext);
     auto sessionHandle      = ctx.GetSessionBobToAlice();
-    bool onSuccessCbInvoked = false, onFailureCbInvoked = false;
+    bool onSuccessCbInvoked = false, onFailureCbInvoked = false, onDoneCbInvoked = false;
 
     // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
     // not safe to do so.
@@ -1372,12 +1338,16 @@ void TestReadInteraction::TestReadEventResponse(nlTestSuite * apSuite, void * ap
         onFailureCbInvoked = true;
     };
 
+    auto onDoneCb = [&onDoneCbInvoked](app::ReadClient * apReadClient) { onDoneCbInvoked = true; };
+
     Controller::ReadEvent<TestCluster::Events::TestEvent::DecodableType>(&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId,
-                                                                         onSuccessCb, onFailureCb);
+                                                                         onSuccessCb, onFailureCb, onDoneCb);
 
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(apSuite, !onFailureCbInvoked);
+    NL_TEST_ASSERT(apSuite, onDoneCbInvoked);
+
     NL_TEST_ASSERT(apSuite, app::InteractionModelEngine::GetInstance()->GetNumActiveReadClients() == 0);
     NL_TEST_ASSERT(apSuite, app::InteractionModelEngine::GetInstance()->GetNumActiveReadHandlers() == 0);
     NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
@@ -1465,6 +1435,69 @@ void TestReadInteraction::TestReadAttributeTimeout(nlTestSuite * apSuite, void *
     NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
 }
 
+// After client initiated subscription request, test expire session so that subscription fails to establish, and trigger the timeout
+// error. Client would automatically try to resubscribe and bump the value for numResubscriptionAttemptedCalls.
+void TestReadInteraction::TestSubscribeAttributeTimeout(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx       = *static_cast<TestContext *>(apContext);
+    auto sessionHandle      = ctx.GetSessionBobToAlice();
+    bool onSuccessCbInvoked = false, onFailureCbInvoked = false;
+    responseDirective                        = kSendDataError;
+    uint32_t numSubscriptionEstablishedCalls = 0, numResubscriptionAttemptedCalls = 0;
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&onSuccessCbInvoked](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        onSuccessCbInvoked = true;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&onFailureCbInvoked, apSuite](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        NL_TEST_ASSERT(apSuite, aError == CHIP_ERROR_TIMEOUT);
+        onFailureCbInvoked = true;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) {
+        numSubscriptionEstablishedCalls++;
+    };
+
+    auto onSubscriptionAttemptedCb = [&numResubscriptionAttemptedCalls](const app::ReadClient & readClient, CHIP_ERROR aError,
+                                                                        uint32_t aNextResubscribeIntervalMsec) {
+        numResubscriptionAttemptedCalls++;
+    };
+
+    Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+        &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 20, onSubscriptionEstablishedCb,
+        onSubscriptionAttemptedCb, false, true);
+
+    ctx.ExpireSessionAliceToBob();
+
+    ctx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 1);
+
+    ctx.ExpireSessionBobToAlice();
+
+    ctx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(apSuite,
+                   !onSuccessCbInvoked && !onFailureCbInvoked && numSubscriptionEstablishedCalls == 0 &&
+                       numResubscriptionAttemptedCalls == 1);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    NL_TEST_ASSERT(apSuite, app::InteractionModelEngine::GetInstance()->GetNumActiveReadHandlers() == 0);
+
+    //
+    // Let's put back the sessions so that the next tests (which assume a valid initialized set of sessions)
+    // can function correctly.
+    //
+    ctx.CreateSessionAliceToBob();
+    ctx.CreateSessionBobToAlice();
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+}
+
 void TestReadInteraction::TestReadHandler_MultipleSubscriptions(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx                        = *static_cast<TestContext *>(apContext);
@@ -1509,7 +1542,7 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptions(nlTestSuite * ap
         NL_TEST_ASSERT(apSuite,
                        Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
                            &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 20,
-                           onSubscriptionEstablishedCb, false, true) == CHIP_NO_ERROR);
+                           onSubscriptionEstablishedCb, nullptr, false, true) == CHIP_NO_ERROR);
     }
 
     // There are too many messages and the test (gcc_debug, which includes many sanity checks) will be quite slow. Note: report
@@ -1527,7 +1560,6 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptions(nlTestSuite * ap
     app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
 
     NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
-
     NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
 
     app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
@@ -1573,7 +1605,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionAppRejection(nlTestSuite *
     NL_TEST_ASSERT(apSuite,
                    Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
                        &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
-                       onSubscriptionEstablishedCb, false, true) == CHIP_NO_ERROR);
+                       onSubscriptionEstablishedCb, nullptr, false, true) == CHIP_NO_ERROR);
 
     ctx.DrainAndServiceIO();
 
@@ -1589,15 +1621,15 @@ void TestReadInteraction::TestReadHandler_SubscriptionAppRejection(nlTestSuite *
 
     app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
 
-    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
-
     NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
 
     app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
     gTestReadInteraction.mEmitSubscriptionError = false;
 }
 
-void TestReadInteraction::TestReadHandler_SubscriptionAlteredReportingIntervals(nlTestSuite * apSuite, void * apContext)
+// Subscriber sends the request with particular max-interval value:
+// Max interval equal to client-requested min-interval.
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx                        = *static_cast<TestContext *>(apContext);
     auto sessionHandle                       = ctx.GetSessionBobToAlice();
@@ -1626,8 +1658,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionAlteredReportingIntervals(
 
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-        NL_TEST_ASSERT(apSuite, minInterval == kTestMinInterval);
-        NL_TEST_ASSERT(apSuite, maxInterval == kTestMaxInterval);
+        NL_TEST_ASSERT(apSuite, minInterval == 5);
+        NL_TEST_ASSERT(apSuite, maxInterval == 5);
 
         numSubscriptionEstablishedCalls++;
     };
@@ -1641,12 +1673,12 @@ void TestReadInteraction::TestReadHandler_SubscriptionAlteredReportingIntervals(
     //
     // Test the server-side application altering the subscription intervals.
     //
-    gTestReadInteraction.mAlterSubscriptionIntervals = true;
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
 
     NL_TEST_ASSERT(apSuite,
                    Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
-                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
-                       onSubscriptionEstablishedCb, false, true) == CHIP_NO_ERROR);
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 5, 5,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
 
     ctx.DrainAndServiceIO();
 
@@ -1669,55 +1701,15 @@ void TestReadInteraction::TestReadHandler_SubscriptionAlteredReportingIntervals(
     gTestReadInteraction.mAlterSubscriptionIntervals = false;
 }
 
-void TestReadInteraction::TestReadHandler_MultipleReads(nlTestSuite * apSuite, void * apContext)
-{
-    TestContext & ctx = *static_cast<TestContext *>(apContext);
-
-    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT <= app::InteractionModelEngine::kReadHandlerPoolSize,
-                  "How can we have more reports in flight than read handlers?");
-
-    MultipleReadHelper(apSuite, ctx, CHIP_IM_MAX_REPORTS_IN_FLIGHT);
-
-    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
-
-    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
-}
-
-void TestReadInteraction::TestReadHandler_OneSubscribeMultipleReads(nlTestSuite * apSuite, void * apContext)
-{
-    TestContext & ctx = *static_cast<TestContext *>(apContext);
-
-    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT <= app::InteractionModelEngine::kReadHandlerPoolSize,
-                  "How can we have more reports in flight than read handlers?");
-    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT > 1, "We won't do any reads");
-
-    SubscribeThenReadHelper(apSuite, ctx, 1, CHIP_IM_MAX_REPORTS_IN_FLIGHT - 1);
-
-    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
-
-    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
-}
-
-void TestReadInteraction::TestReadHandler_TwoSubscribesMultipleReads(nlTestSuite * apSuite, void * apContext)
-{
-    TestContext & ctx = *static_cast<TestContext *>(apContext);
-
-    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT <= app::InteractionModelEngine::kReadHandlerPoolSize,
-                  "How can we have more reports in flight than read handlers?");
-    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT > 2, "We won't do any reads");
-
-    SubscribeThenReadHelper(apSuite, ctx, 2, CHIP_IM_MAX_REPORTS_IN_FLIGHT - 2);
-
-    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
-
-    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
-}
-
-void TestReadInteraction::SubscribeThenReadHelper(nlTestSuite * apSuite, TestContext & aCtx, size_t aSubscribeCount,
-                                                  size_t aReadCount)
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but lower than 60m:
+// With no server adjustment.
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest2(nlTestSuite * apSuite, void * apContext)
 {
-    auto sessionHandle                       = aCtx.GetSessionBobToAlice();
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
     uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
     uint32_t numSubscriptionEstablishedCalls = 0;
 
     responseDirective = kSendDataResponse;
@@ -1730,102 +1722,707 @@ void TestReadInteraction::SubscribeThenReadHelper(nlTestSuite * apSuite, TestCon
 
     // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
     // not safe to do so.
-    auto onFailureCb = [&apSuite](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
-        //
-        // We shouldn't be encountering any failures in this test.
-        //
-        NL_TEST_ASSERT(apSuite, false);
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
     };
 
-    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite, &aCtx, aSubscribeCount,
-                                        aReadCount](const app::ReadClient & readClient) {
-        numSubscriptionEstablishedCalls++;
-        if (numSubscriptionEstablishedCalls == aSubscribeCount)
-        {
-            MultipleReadHelper(apSuite, aCtx, aReadCount);
-        }
-    };
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) {
+        uint16_t minInterval = 0, maxInterval = 0;
 
-    for (size_t i = 0; i < aSubscribeCount; ++i)
-    {
-        NL_TEST_ASSERT(apSuite,
-                       Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
-                           &aCtx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
-                           onSubscriptionEstablishedCb, false, true) == CHIP_NO_ERROR);
-    }
+        CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval);
 
-    aCtx.DrainAndServiceIO();
+        NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-    NL_TEST_ASSERT(apSuite, numSuccessCalls == aSubscribeCount);
-    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == aSubscribeCount);
-}
+        NL_TEST_ASSERT(apSuite, minInterval == 0);
+        NL_TEST_ASSERT(apSuite, maxInterval == 10);
 
-void TestReadInteraction::MultipleReadHelper(nlTestSuite * apSuite, TestContext & aCtx, size_t aReadCount)
-{
-    auto sessionHandle       = aCtx.GetSessionBobToAlice();
-    uint32_t numSuccessCalls = 0;
-    uint32_t numFailureCalls = 0;
+        numSubscriptionEstablishedCalls++;
+    };
 
-    responseDirective = kSendDataResponse;
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
 
-    uint16_t firstExpectedResponse = totalReadCount + 1;
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
 
-    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
-    // not safe to do so.
-    auto onFailureCb = [&apSuite, &numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
-        numFailureCalls++;
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
 
-        NL_TEST_ASSERT(apSuite, attributePath == nullptr);
-    };
+    ctx.DrainAndServiceIO();
 
-    for (size_t i = 0; i < aReadCount; ++i)
-    {
-        // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise,
-        // it's not safe to do so.
-        auto onSuccessCb = [&numSuccessCalls, &apSuite, firstExpectedResponse,
-                            i](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
-            NL_TEST_ASSERT(apSuite, dataResponse == firstExpectedResponse + i);
-            numSuccessCalls++;
-        };
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls != 0);
+    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 1);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 1);
 
-        NL_TEST_ASSERT(apSuite,
-                       Controller::ReadAttribute<TestCluster::Attributes::Int16u::TypeInfo>(
-                           &aCtx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb) == CHIP_NO_ERROR);
-    }
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
 
-    aCtx.DrainAndServiceIO();
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
 
-    NL_TEST_ASSERT(apSuite, numSuccessCalls == aReadCount);
-    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
 }
 
-void TestReadInteraction::TestReadHandler_MultipleSubscriptionsWithDataVersionFilter(nlTestSuite * apSuite, void * apContext)
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but lower than 60m:
+// With server adjustment to a value greater than client-requested, but less than 60m (allowed).
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx                        = *static_cast<TestContext *>(apContext);
     auto sessionHandle                       = ctx.GetSessionBobToAlice();
     uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
     uint32_t numSubscriptionEstablishedCalls = 0;
 
     responseDirective = kSendDataResponse;
 
     // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
     // not safe to do so.
-    auto onSuccessCb = [apSuite, &numSuccessCalls](const app::ConcreteDataAttributePath & attributePath,
-                                                   const auto & dataResponse) {
-        NL_TEST_ASSERT(apSuite, attributePath.mDataVersion.HasValue() && attributePath.mDataVersion.Value() == kDataVersion);
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
         numSuccessCalls++;
     };
 
     // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
     // not safe to do so.
-    auto onFailureCb = [&apSuite](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
-        //
-        // We shouldn't be encountering any failures in this test.
-        //
-        NL_TEST_ASSERT(apSuite, false);
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
     };
 
-    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) {
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) {
+        uint16_t minInterval = 0, maxInterval = 0;
+
+        CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval);
+
+        NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+        NL_TEST_ASSERT(apSuite, minInterval == 0);
+        NL_TEST_ASSERT(apSuite, maxInterval == 3000);
+
+        numSubscriptionEstablishedCalls++;
+    };
+
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = true;
+    gTestReadInteraction.mMaxInterval                = 3000;
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
+
+    ctx.DrainAndServiceIO();
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls != 0);
+    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 1);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 1);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but lower than 60m:
+// server adjustment to a value greater than client-requested, but greater than 60 (not allowed).
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) {
+        numSubscriptionEstablishedCalls++;
+    };
+
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = true;
+    gTestReadInteraction.mMaxInterval                = 3700;
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
+
+    ctx.DrainAndServiceIO();
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 0);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but greater than 60m:
+// With no server adjustment.
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest5(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) {
+        uint16_t minInterval = 0, maxInterval = 0;
+
+        CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval);
+
+        NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+        NL_TEST_ASSERT(apSuite, minInterval == 0);
+        NL_TEST_ASSERT(apSuite, maxInterval == 4000);
+
+        numSubscriptionEstablishedCalls++;
+    };
+
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
+
+    ctx.DrainAndServiceIO();
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls != 0);
+    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 1);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 1);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but greater than 60m:
+// With server adjustment to a value lower than 60m. Allowed
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest6(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) {
+        uint16_t minInterval = 0, maxInterval = 0;
+
+        CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval);
+
+        NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+        NL_TEST_ASSERT(apSuite, minInterval == 0);
+        NL_TEST_ASSERT(apSuite, maxInterval == 3000);
+
+        numSubscriptionEstablishedCalls++;
+    };
+
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = true;
+    gTestReadInteraction.mMaxInterval                = 3000;
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
+
+    ctx.DrainAndServiceIO();
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls != 0);
+    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 1);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 1);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but greater than 60m:
+// With server adjustment to a value larger than 60m, but less than max interval. Allowed
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite](const app::ReadClient & readClient) {
+        uint16_t minInterval = 0, maxInterval = 0;
+
+        CHIP_ERROR err = readClient.GetReportingIntervals(minInterval, maxInterval);
+
+        NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+        NL_TEST_ASSERT(apSuite, minInterval == 0);
+        NL_TEST_ASSERT(apSuite, maxInterval == 3700);
+
+        numSubscriptionEstablishedCalls++;
+    };
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = true;
+    gTestReadInteraction.mMaxInterval                = 3700;
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
+
+    ctx.DrainAndServiceIO();
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls != 0);
+    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 1);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 1);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+// Subscriber sends the request with particular max-interval value:
+// Max interval greater than client-requested min-interval but greater than 60m:
+// With server adjustment to a value larger than 60m, but larger than max interval. Disallowed
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest8(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) {
+        numSubscriptionEstablishedCalls++;
+    };
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = true;
+    gTestReadInteraction.mMaxInterval                = 4100;
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);
+
+    ctx.DrainAndServiceIO();
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 0);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+// Subscriber sends the request with particular max-interval value:
+// Validate client is not requesting max-interval < min-interval.
+void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest9(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numFailureCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) {
+        numSubscriptionEstablishedCalls++;
+    };
+
+    //
+    // Test the application callback as well to ensure we get the right number of SubscriptionEstablishment/Termination
+    // callbacks.
+    //
+    app::InteractionModelEngine::GetInstance()->RegisterReadHandlerAppCallback(&gTestReadInteraction);
+
+    //
+    // Test the server-side application altering the subscription intervals.
+    //
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+
+    NL_TEST_ASSERT(apSuite,
+                   Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                       &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 5, 4,
+                       onSubscriptionEstablishedCb, nullptr, true) == CHIP_ERROR_INVALID_ARGUMENT);
+
+    //
+    // Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
+    // implementation.
+    //
+    NL_TEST_ASSERT(apSuite, numSuccessCalls == 0);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == 0);
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+
+    NL_TEST_ASSERT(apSuite, gTestReadInteraction.mNumActiveSubscriptions == 0);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->UnregisterReadHandlerAppCallback();
+    gTestReadInteraction.mAlterSubscriptionIntervals = false;
+}
+
+void TestReadInteraction::TestReadHandler_MultipleReads(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx = *static_cast<TestContext *>(apContext);
+
+    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT <= app::InteractionModelEngine::kReadHandlerPoolSize,
+                  "How can we have more reports in flight than read handlers?");
+
+    MultipleReadHelper(apSuite, ctx, CHIP_IM_MAX_REPORTS_IN_FLIGHT);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+}
+
+void TestReadInteraction::TestReadHandler_OneSubscribeMultipleReads(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx = *static_cast<TestContext *>(apContext);
+
+    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT <= app::InteractionModelEngine::kReadHandlerPoolSize,
+                  "How can we have more reports in flight than read handlers?");
+    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT > 1, "We won't do any reads");
+
+    SubscribeThenReadHelper(apSuite, ctx, 1, CHIP_IM_MAX_REPORTS_IN_FLIGHT - 1);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+}
+
+void TestReadInteraction::TestReadHandler_TwoSubscribesMultipleReads(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx = *static_cast<TestContext *>(apContext);
+
+    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT <= app::InteractionModelEngine::kReadHandlerPoolSize,
+                  "How can we have more reports in flight than read handlers?");
+    static_assert(CHIP_IM_MAX_REPORTS_IN_FLIGHT > 2, "We won't do any reads");
+
+    SubscribeThenReadHelper(apSuite, ctx, 2, CHIP_IM_MAX_REPORTS_IN_FLIGHT - 2);
+
+    NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
+
+    app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
+}
+
+void TestReadInteraction::SubscribeThenReadHelper(nlTestSuite * apSuite, TestContext & aCtx, size_t aSubscribeCount,
+                                                  size_t aReadCount)
+{
+    auto sessionHandle                       = aCtx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [&numSuccessCalls](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&apSuite](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        //
+        // We shouldn't be encountering any failures in this test.
+        //
+        NL_TEST_ASSERT(apSuite, false);
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls, &apSuite, &aCtx, aSubscribeCount,
+                                        aReadCount](const app::ReadClient & readClient) {
+        numSubscriptionEstablishedCalls++;
+        if (numSubscriptionEstablishedCalls == aSubscribeCount)
+        {
+            MultipleReadHelper(apSuite, aCtx, aReadCount);
+        }
+    };
+
+    for (size_t i = 0; i < aSubscribeCount; ++i)
+    {
+        NL_TEST_ASSERT(apSuite,
+                       Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
+                           &aCtx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
+                           onSubscriptionEstablishedCb, nullptr, false, true) == CHIP_NO_ERROR);
+    }
+
+    aCtx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(apSuite, numSuccessCalls == aSubscribeCount);
+    NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == aSubscribeCount);
+}
+
+void TestReadInteraction::MultipleReadHelper(nlTestSuite * apSuite, TestContext & aCtx, size_t aReadCount)
+{
+    auto sessionHandle       = aCtx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls = 0;
+    uint32_t numFailureCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    uint16_t firstExpectedResponse = totalReadCount + 1;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&apSuite, &numFailureCalls](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        numFailureCalls++;
+
+        NL_TEST_ASSERT(apSuite, attributePath == nullptr);
+    };
+
+    for (size_t i = 0; i < aReadCount; ++i)
+    {
+        // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise,
+        // it's not safe to do so.
+        auto onSuccessCb = [&numSuccessCalls, &apSuite, firstExpectedResponse,
+                            i](const app::ConcreteDataAttributePath & attributePath, const auto & dataResponse) {
+            NL_TEST_ASSERT(apSuite, dataResponse == firstExpectedResponse + i);
+            numSuccessCalls++;
+        };
+
+        NL_TEST_ASSERT(apSuite,
+                       Controller::ReadAttribute<TestCluster::Attributes::Int16u::TypeInfo>(
+                           &aCtx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb) == CHIP_NO_ERROR);
+    }
+
+    aCtx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(apSuite, numSuccessCalls == aReadCount);
+    NL_TEST_ASSERT(apSuite, numFailureCalls == 0);
+}
+
+void TestReadInteraction::TestReadHandler_MultipleSubscriptionsWithDataVersionFilter(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx                        = *static_cast<TestContext *>(apContext);
+    auto sessionHandle                       = ctx.GetSessionBobToAlice();
+    uint32_t numSuccessCalls                 = 0;
+    uint32_t numSubscriptionEstablishedCalls = 0;
+
+    responseDirective = kSendDataResponse;
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onSuccessCb = [apSuite, &numSuccessCalls](const app::ConcreteDataAttributePath & attributePath,
+                                                   const auto & dataResponse) {
+        NL_TEST_ASSERT(apSuite, attributePath.mDataVersion.HasValue() && attributePath.mDataVersion.Value() == kDataVersion);
+        numSuccessCalls++;
+    };
+
+    // Passing of stack variables by reference is only safe because of synchronous completion of the interaction. Otherwise, it's
+    // not safe to do so.
+    auto onFailureCb = [&apSuite](const app::ConcreteDataAttributePath * attributePath, CHIP_ERROR aError) {
+        //
+        // We shouldn't be encountering any failures in this test.
+        //
+        NL_TEST_ASSERT(apSuite, false);
+    };
+
+    auto onSubscriptionEstablishedCb = [&numSubscriptionEstablishedCalls](const app::ReadClient & readClient) {
         numSubscriptionEstablishedCalls++;
     };
 
@@ -1840,7 +2437,7 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptionsWithDataVersionFi
         NL_TEST_ASSERT(apSuite,
                        Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
                            &ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
-                           onSubscriptionEstablishedCb, false, true, dataVersion) == CHIP_NO_ERROR);
+                           onSubscriptionEstablishedCb, nullptr, false, true, dataVersion) == CHIP_NO_ERROR);
     }
 
     // There are too many messages and the test (gcc_debug, which includes many sanity checks) will be quite slow. Note: report
@@ -1856,7 +2453,6 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptionsWithDataVersionFi
 
     NL_TEST_ASSERT(apSuite, numSuccessCalls == (app::InteractionModelEngine::kReadHandlerPoolSize + 1));
     NL_TEST_ASSERT(apSuite, numSubscriptionEstablishedCalls == (app::InteractionModelEngine::kReadHandlerPoolSize + 1));
-
     app::InteractionModelEngine::GetInstance()->ShutdownActiveReads();
 
     NL_TEST_ASSERT(apSuite, ctx.GetExchangeManager().GetNumActiveExchanges() == 0);
@@ -3523,7 +4119,6 @@ void TestReadInteraction::TestReadHandler_TwoParallelReadsSecondTooManyPaths(nlT
 const nlTest sTests[] =
 {
     NL_TEST_DEF("TestReadAttributeResponse", TestReadInteraction::TestReadAttributeResponse),
-    NL_TEST_DEF("TestReadDataVersionFilter", TestReadInteraction::TestReadDataVersionFilter),
     NL_TEST_DEF("TestReadEventResponse", TestReadInteraction::TestReadEventResponse),
     NL_TEST_DEF("TestReadAttributeError", TestReadInteraction::TestReadAttributeError),
     NL_TEST_DEF("TestReadFabricScopedWithoutFabricFilter", TestReadInteraction::TestReadFabricScopedWithoutFabricFilter),
@@ -3536,7 +4131,16 @@ const nlTest sTests[] =
     NL_TEST_DEF("TestReadHandler_TwoSubscribesMultipleReads", TestReadInteraction::TestReadHandler_TwoSubscribesMultipleReads),
     NL_TEST_DEF("TestReadHandlerResourceExhaustion_MultipleReads", TestReadInteraction::TestReadHandlerResourceExhaustion_MultipleReads),
     NL_TEST_DEF("TestReadAttributeTimeout", TestReadInteraction::TestReadAttributeTimeout),
-    NL_TEST_DEF("TestReadHandler_SubscriptionAlteredReportingIntervals", TestReadInteraction::TestReadHandler_SubscriptionAlteredReportingIntervals),
+    NL_TEST_DEF("TestSubscribeAttributeTimeout", TestReadInteraction::TestSubscribeAttributeTimeout),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest1", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest2", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest2),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest3", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest4", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest5", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest5),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest6", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest6),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest7", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest8", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest8),
+    NL_TEST_DEF("TestReadHandler_SubscriptionReportingIntervalsTest9", TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest9),
     NL_TEST_DEF("TestReadSubscribeAttributeResponseWithCache", TestReadInteraction::TestReadSubscribeAttributeResponseWithCache),
     NL_TEST_DEF("TestReadHandler_KillOverQuotaSubscriptions", TestReadInteraction::TestReadHandler_KillOverQuotaSubscriptions),
     NL_TEST_DEF("TestReadHandler_KillOldestSubscriptions", TestReadInteraction::TestReadHandler_KillOldestSubscriptions),
diff --git a/src/controller/tests/data_model/TestWrite.cpp b/src/controller/tests/data_model/TestWrite.cpp
index 073044cb372d90..2e12ddcc5fd6b8 100644
--- a/src/controller/tests/data_model/TestWrite.cpp
+++ b/src/controller/tests/data_model/TestWrite.cpp
@@ -89,7 +89,7 @@ CHIP_ERROR WriteSingleClusterData(const Access::SubjectDescriptor & aSubjectDesc
                 {
                     auto & item = iter.GetValue();
 
-                    VerifyOrReturnError(item.fabricIndex == listStructOctetStringElementCount, CHIP_ERROR_INVALID_ARGUMENT);
+                    VerifyOrReturnError(item.member1 == listStructOctetStringElementCount, CHIP_ERROR_INVALID_ARGUMENT);
                     listStructOctetStringElementCount++;
                 }
 
@@ -99,7 +99,7 @@ CHIP_ERROR WriteSingleClusterData(const Access::SubjectDescriptor & aSubjectDesc
             {
                 Structs::TestListStructOctet::DecodableType item;
                 ReturnErrorOnFailure(DataModel::Decode(aReader, item));
-                VerifyOrReturnError(item.fabricIndex == listStructOctetStringElementCount, CHIP_ERROR_INVALID_ARGUMENT);
+                VerifyOrReturnError(item.member1 == listStructOctetStringElementCount, CHIP_ERROR_INVALID_ARGUMENT);
                 listStructOctetStringElementCount++;
 
                 aWriteHandler->AddStatus(aPath, Protocols::InteractionModel::Status::Success);
@@ -182,7 +182,7 @@ void TestWriteInteraction::TestDataResponse(nlTestSuite * apSuite, void * apCont
     uint8_t i = 0;
     for (auto & item : valueBuf)
     {
-        item.fabricIndex = i;
+        item.member1 = i;
         i++;
     }
 
@@ -221,7 +221,7 @@ void TestWriteInteraction::TestDataResponseWithAcceptedDataVersion(nlTestSuite *
     uint8_t i = 0;
     for (auto & item : valueBuf)
     {
-        item.fabricIndex = i;
+        item.member1 = i;
         i++;
     }
 
@@ -262,7 +262,7 @@ void TestWriteInteraction::TestDataResponseWithRejectedDataVersion(nlTestSuite *
     uint8_t i = 0;
     for (auto & item : valueBuf)
     {
-        item.fabricIndex = i;
+        item.member1 = i;
         i++;
     }
 
@@ -302,7 +302,7 @@ void TestWriteInteraction::TestAttributeError(nlTestSuite * apSuite, void * apCo
     uint8_t i = 0;
     for (auto & item : valueBuf)
     {
-        item.fabricIndex = i;
+        item.member1 = i;
         i++;
     }
 
diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn
index 30faf6720f2222..c907b0aaa83996 100644
--- a/src/credentials/BUILD.gn
+++ b/src/credentials/BUILD.gn
@@ -25,6 +25,7 @@ static_library("credentials") {
     "CHIPCert.h",
     "CHIPCertFromX509.cpp",
     "CHIPCertToX509.cpp",
+    "CHIPCertificateSet.h",
     "CertificationDeclaration.cpp",
     "CertificationDeclaration.h",
     "DeviceAttestationConstructor.cpp",
@@ -37,6 +38,8 @@ static_library("credentials") {
     "GenerateChipX509Cert.cpp",
     "GroupDataProvider.h",
     "GroupDataProviderImpl.cpp",
+    "LastKnownGoodTime.cpp",
+    "LastKnownGoodTime.h",
     "attestation_verifier/DeviceAttestationDelegate.h",
     "attestation_verifier/DeviceAttestationVerifier.cpp",
     "attestation_verifier/DeviceAttestationVerifier.h",
@@ -46,6 +49,8 @@ static_library("credentials") {
     "examples/ExampleDACs.h",
     "examples/ExamplePAI.cpp",
     "examples/ExamplePAI.h",
+    "examples/LastKnownGoodTimeCertificateValidityPolicyExample.h",
+    "examples/StrictCertificateValidityPolicyExample.h",
   ]
 
   # TODO: These tests files should be removed after the DeviceAttestationCredsExample implementation
diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp
index 32fbc21129a326..7f2f757c50726b 100644
--- a/src/credentials/CHIPCert.cpp
+++ b/src/credentials/CHIPCert.cpp
@@ -32,6 +32,7 @@
 #include <stddef.h>
 
 #include <credentials/CHIPCert.h>
+#include <credentials/CHIPCertificateSet.h>
 #include <lib/asn1/ASN1.h>
 #include <lib/asn1/ASN1Macros.h>
 #include <lib/core/CHIPCore.h>
@@ -273,7 +274,7 @@ CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, Va
 
     context.mTrustAnchor = nullptr;
 
-    return ValidateCert(cert, context, context.mValidateFlags, 0);
+    return ValidateCert(cert, context, 0);
 }
 
 CHIP_ERROR ChipCertificateSet::FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId,
@@ -281,7 +282,7 @@ CHIP_ERROR ChipCertificateSet::FindValidCert(const ChipDN & subjectDN, const Cer
 {
     context.mTrustAnchor = nullptr;
 
-    return FindValidCert(subjectDN, subjectKeyId, context, context.mValidateFlags, 0, certData);
+    return FindValidCert(subjectDN, subjectKeyId, context, 0, certData);
 }
 
 CHIP_ERROR ChipCertificateSet::VerifySignature(const ChipCertificateData * cert, const ChipCertificateData * caCert)
@@ -304,8 +305,7 @@ CHIP_ERROR ChipCertificateSet::VerifySignature(const ChipCertificateData * cert,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, ValidationContext & context,
-                                            BitFlags<CertValidateFlags> validateFlags, uint8_t depth)
+CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, ValidationContext & context, uint8_t depth)
 {
     CHIP_ERROR err                     = CHIP_NO_ERROR;
     const ChipCertificateData * caCert = nullptr;
@@ -371,15 +371,85 @@ CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, Va
         }
     }
 
-    // Verify the validity time of the certificate, if requested.
-    if (cert->mNotBeforeTime != 0 && !validateFlags.Has(CertValidateFlags::kIgnoreNotBefore))
+    // Verify NotBefore and NotAfter validity of the certificates.
+    //
+    // See also ASN1ToChipEpochTime().
+    //
+    // X.509/RFC5280 defines the special time 99991231235959Z to mean 'no
+    // well-defined expiration date'.  In CHIP TLV-encoded certificates, this
+    // special value is represented as a CHIP Epoch time value of 0 sec
+    // (2020-01-01 00:00:00 UTC).
+    //
+    // When evaluating NotBefore from a CHIP TLV-encoded certificate, this
+    // special value 0 does not require additional handling, as it is impossible
+    // for CHIP epoch time to represent any moment before the epoch, and so all
+    // representable times at or after this will be considered valid.  But for
+    // NotAfter, we special case this value as always passing (not expired).
+    CertificateValidityResult validityResult;
+    if (context.mEffectiveTime.Is<CurrentChipEpochTime>())
     {
-        // TODO - enable check for certificate validity dates
-        // VerifyOrExit(context.mEffectiveTime >= cert->mNotBeforeTime, err = CHIP_ERROR_CERT_NOT_VALID_YET);
+        if (context.mEffectiveTime.Get<CurrentChipEpochTime>().count() < cert->mNotBeforeTime)
+        {
+            validityResult = CertificateValidityResult::kNotYetValid;
+        }
+        else if (cert->mNotAfterTime != 0 && context.mEffectiveTime.Get<CurrentChipEpochTime>().count() > cert->mNotAfterTime)
+        {
+            validityResult = CertificateValidityResult::kExpired;
+        }
+        else
+        {
+            validityResult = CertificateValidityResult::kValid;
+        }
+    }
+    else if (context.mEffectiveTime.Is<LastKnownGoodChipEpochTime>())
+    {
+        // Last Known Good Time may not be moved forward except at the time of
+        // commissioning or firmware update, so we can't use it to validate
+        // NotBefore.  However, so long as firmware build times are properly
+        // recorded and certificates loaded during commissioning are in fact
+        // valid at the time of commissioning, observing a NotAfter that falls
+        // before Last Known Good Time is a reliable indicator that the
+        // certificate in question is expired.  Check for this.
+        if (cert->mNotAfterTime != 0 && context.mEffectiveTime.Get<LastKnownGoodChipEpochTime>().count() > cert->mNotAfterTime)
+        {
+            validityResult = CertificateValidityResult::kExpiredAtLastKnownGoodTime;
+        }
+        else
+        {
+            validityResult = CertificateValidityResult::kNotExpiredAtLastKnownGoodTime;
+        }
+    }
+    else
+    {
+        validityResult = CertificateValidityResult::kTimeUnknown;
+    }
+
+    if (context.mValidityPolicy != nullptr)
+    {
+        SuccessOrExit(err = context.mValidityPolicy->ApplyCertificateValidityPolicy(cert, depth, validityResult));
     }
-    if (cert->mNotAfterTime != 0 && !validateFlags.Has(CertValidateFlags::kIgnoreNotAfter))
+    else
     {
-        VerifyOrExit(context.mEffectiveTime <= cert->mNotAfterTime, err = CHIP_ERROR_CERT_EXPIRED);
+        switch (validityResult)
+        {
+        case CertificateValidityResult::kValid:
+        case CertificateValidityResult::kNotExpiredAtLastKnownGoodTime:
+        // By default, we do not enforce certificate validity based upon a Last
+        // Known Good Time source.  However, implementations may always inject a
+        // policy that does enforce based upon this.
+        case CertificateValidityResult::kExpiredAtLastKnownGoodTime:
+        case CertificateValidityResult::kTimeUnknown:
+            break;
+        case CertificateValidityResult::kNotYetValid:
+            ExitNow(err = CHIP_ERROR_CERT_NOT_VALID_YET);
+            break;
+        case CertificateValidityResult::kExpired:
+            ExitNow(err = CHIP_ERROR_CERT_EXPIRED);
+            break;
+        default:
+            ExitNow(err = CHIP_ERROR_INTERNAL);
+            break;
+        }
     }
 
     // If the certificate itself is trusted, then it is implicitly valid.  Record this certificate as the trust
@@ -411,7 +481,7 @@ CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, Va
 
     // Search for a valid CA certificate that matches the Issuer DN and Authority Key Id of the current certificate.
     // Fail if no acceptable certificate is found.
-    err = FindValidCert(cert->mIssuerDN, cert->mAuthKeyId, context, validateFlags, static_cast<uint8_t>(depth + 1), &caCert);
+    err = FindValidCert(cert->mIssuerDN, cert->mAuthKeyId, context, static_cast<uint8_t>(depth + 1), &caCert);
     if (err != CHIP_NO_ERROR)
     {
         ExitNow(err = CHIP_ERROR_CA_CERT_NOT_FOUND);
@@ -427,8 +497,7 @@ CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, Va
 }
 
 CHIP_ERROR ChipCertificateSet::FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId,
-                                             ValidationContext & context, BitFlags<CertValidateFlags> validateFlags, uint8_t depth,
-                                             const ChipCertificateData ** certData)
+                                             ValidationContext & context, uint8_t depth, const ChipCertificateData ** certData)
 {
     CHIP_ERROR err;
 
@@ -461,7 +530,7 @@ CHIP_ERROR ChipCertificateSet::FindValidCert(const ChipDN & subjectDN, const Cer
         // Attempt to validate the cert.  If the cert is valid, return it to the caller. Otherwise,
         // save the returned error and continue searching.  If there are no other matching certs this
         // will be the error returned to the caller.
-        err = ValidateCert(candidateCert, context, validateFlags, depth);
+        err = ValidateCert(candidateCert, context, depth);
         if (err == CHIP_NO_ERROR)
         {
             *certData = candidateCert;
@@ -513,11 +582,11 @@ bool ChipCertificateData::IsEqual(const ChipCertificateData & other) const
 
 void ValidationContext::Reset()
 {
-    mEffectiveTime = 0;
-    mTrustAnchor   = nullptr;
+    mEffectiveTime  = EffectiveTime{};
+    mTrustAnchor    = nullptr;
+    mValidityPolicy = nullptr;
     mRequiredKeyUsages.ClearAll();
     mRequiredKeyPurposes.ClearAll();
-    mValidateFlags.ClearAll();
     mRequiredCertType = kCertType_NotSpecified;
 }
 
@@ -1013,7 +1082,7 @@ DLL_EXPORT CHIP_ERROR ASN1ToChipEpochTime(const chip::ASN1::ASN1UniversalTime &
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     // X.509/RFC5280 defines the special time 99991231235959Z to mean 'no well-defined expiration date'.
-    // In CHIP certificate it is represented as a CHIP Epoch UTC time value of 0 sec (2020-01-01 00:00:00 UTC).
+    // In CHIP certificate it is represented as a CHIP Epoch time value of 0 sec (2000-01-01 00:00:00 UTC).
     if ((asn1Time.Year == kX509NoWellDefinedExpirationDateYear) && (asn1Time.Month == kMonthsPerYear) &&
         (asn1Time.Day == kMaxDaysPerMonth) && (asn1Time.Hour == kHoursPerDay - 1) && (asn1Time.Minute == kMinutesPerHour - 1) &&
         (asn1Time.Second == kSecondsPerMinute - 1))
@@ -1036,7 +1105,7 @@ DLL_EXPORT CHIP_ERROR ASN1ToChipEpochTime(const chip::ASN1::ASN1UniversalTime &
 DLL_EXPORT CHIP_ERROR ChipEpochToASN1Time(uint32_t epochTime, chip::ASN1::ASN1UniversalTime & asn1Time)
 {
     // X.509/RFC5280 defines the special time 99991231235959Z to mean 'no well-defined expiration date'.
-    // In CHIP certificate it is represented as a CHIP Epoch time value of 0 secs (2020-01-01 00:00:00 UTC).
+    // In CHIP certificate it is represented as a CHIP Epoch time value of 0 secs (2000-01-01 00:00:00 UTC).
     if (epochTime == kNullCertTime)
     {
         asn1Time.Year   = kX509NoWellDefinedExpirationDateYear;
@@ -1276,6 +1345,20 @@ CHIP_ERROR ExtractPublicKeyFromChipCert(const ByteSpan & chipCert, P256PublicKey
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR ExtractNotBeforeFromChipCert(const ByteSpan & chipCert, chip::System::Clock::Seconds32 & notBeforeChipEpochTime)
+{
+    ChipCertificateSet certSet;
+    ChipCertificateData certData;
+
+    ReturnErrorOnFailure(certSet.Init(&certData, 1));
+
+    ReturnErrorOnFailure(certSet.LoadCert(chipCert, BitFlags<CertDecodeFlags>()));
+
+    notBeforeChipEpochTime = chip::System::Clock::Seconds32(certData.mNotBeforeTime);
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR ExtractSKIDFromChipCert(const ByteSpan & chipCert, CertificateKeyId & skid)
 {
     ChipCertificateSet certSet;
diff --git a/src/credentials/CHIPCert.h b/src/credentials/CHIPCert.h
index cbc6d0d98f2b00..16279294498c75 100644
--- a/src/credentials/CHIPCert.h
+++ b/src/credentials/CHIPCert.h
@@ -173,18 +173,6 @@ enum class CertDecodeFlags : uint8_t
     kIsTrustAnchor = 0x02,   /**< Indicates that the corresponding certificate is trust anchor. */
 };
 
-/** CHIP Certificate Validate Flags
- *
- * Contains information specifying how a certificate should be validated.
- */
-enum class CertValidateFlags : uint8_t
-{
-    kIgnoreNotBefore = 0x01, /**< Indicate that a Not Before field should be ignored when doing certificate validation. This
-                                flag applies to all certificates in the validation chain. */
-    kIgnoreNotAfter = 0x02,  /**< Indicate that a Not After field should be ignored when doing certificate validation. This
-                                flag applies to all certificates in the validation chain. */
-};
-
 enum
 {
     kNullCertTime = 0
@@ -454,225 +442,6 @@ struct ChipCertificateData
     uint8_t mTBSHash[Crypto::kSHA256_Hash_Length]; /**< Certificate TBS hash. */
 };
 
-/**
- *  @struct ValidationContext
- *
- *  @brief
- *    Context information used during certification validation.
- */
-struct ValidationContext
-{
-    uint32_t mEffectiveTime;                        /**< Current CHIP Epoch UTC time. */
-    const ChipCertificateData * mTrustAnchor;       /**< Pointer to the Trust Anchor Certificate data structure.
-                                                       This value is set during certificate validation process
-                                                       to indicate to the caller the trust anchor of the
-                                                       validated certificate. */
-    BitFlags<KeyUsageFlags> mRequiredKeyUsages;     /**< Key usage extensions that should be present in the
-                                                       validated certificate. */
-    BitFlags<KeyPurposeFlags> mRequiredKeyPurposes; /**< Extended Key usage extensions that should be present
-                                                       in the validated certificate. */
-    BitFlags<CertValidateFlags> mValidateFlags;     /**< Certificate validation flags, specifying how a certificate
-                                                       should be validated. */
-    uint8_t mRequiredCertType;                      /**< Required certificate type. */
-
-    void Reset();
-};
-
-/**
- *  @class ChipCertificateSet
- *
- *  @brief
- *    Collection of CHIP certificate data providing methods for
- *    certificate validation and signature verification.
- */
-class DLL_EXPORT ChipCertificateSet
-{
-public:
-    ChipCertificateSet();
-    ~ChipCertificateSet();
-
-    ChipCertificateSet & operator=(ChipCertificateSet && aOther)
-    {
-        mCerts               = aOther.mCerts;
-        aOther.mCerts        = nullptr;
-        mCertCount           = aOther.mCertCount;
-        mMaxCerts            = aOther.mMaxCerts;
-        mMemoryAllocInternal = aOther.mMemoryAllocInternal;
-
-        return *this;
-    }
-
-    /**
-     * @brief Initialize ChipCertificateSet.
-     *        This initialization method is used when all memory structures needed for operation are
-     *        allocated internally using chip::Platform::MemoryAlloc() and freed with chip::Platform::MemoryFree().
-     *
-     * @param maxCertsArraySize  Maximum number of CHIP certificates to be loaded to the set.
-     *
-     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR Init(uint8_t maxCertsArraySize);
-
-    /**
-     * @brief Initialize ChipCertificateSet.
-     *        This initialization method is used when all memory structures needed for operation are
-     *        allocated externally and methods in this class don't need to deal with memory allocations.
-     *
-     * @param certsArray      A pointer to the array of the ChipCertificateData structures.
-     * @param certsArraySize  Number of ChipCertificateData entries in the array.
-     *
-     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR Init(ChipCertificateData * certsArray, uint8_t certsArraySize);
-
-    /**
-     * @brief Release resources allocated by this class.
-     **/
-    void Release();
-
-    /**
-     * @brief Clear certificate data loaded into this set.
-     **/
-    void Clear();
-
-    /**
-     * @brief Load CHIP certificate into set.
-     *        It is required that the CHIP certificate in the chipCert buffer stays valid while
-     *        the certificate data in the set is used.
-     *        In case of an error the certificate set is left in the same state as prior to this call.
-     *
-     * @param chipCert     Buffer containing certificate encoded in CHIP format.
-     * @param decodeFlags  Certificate decoding option flags.
-     *
-     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR LoadCert(const ByteSpan chipCert, BitFlags<CertDecodeFlags> decodeFlags);
-
-    /**
-     * @brief Load CHIP certificate into set.
-     *        It is required that the CHIP certificate in the reader's underlying buffer stays valid while
-     *        the certificate data in the set is used.
-     *        In case of an error the certificate set is left in the same state as prior to this call.
-     *
-     * @param reader       A TLVReader positioned at the CHIP certificate TLV structure.
-     * @param decodeFlags  Certificate decoding option flags.
-     * @param chipCert     Buffer containing certificate encoded on CHIP format. It is required that this CHIP certificate
-     *                     in chipCert ByteSpan stays valid while the certificate data in the set is used.
-     *
-     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR LoadCert(chip::TLV::TLVReader & reader, BitFlags<CertDecodeFlags> decodeFlags, ByteSpan chipCert = ByteSpan());
-
-    CHIP_ERROR ReleaseLastCert();
-
-    /**
-     * @brief Find certificate in the set.
-     *
-     * @param subjectKeyId  Subject key identifier of the certificate to be found in the set.
-     *
-     * @return A pointer to the certificate data On success. Otherwise, NULL if no certificate found.
-     **/
-    const ChipCertificateData * FindCert(const CertificateKeyId & subjectKeyId) const;
-
-    /**
-     * @return A pointer to the set of certificate data entries.
-     **/
-    const ChipCertificateData * GetCertSet() const { return mCerts; }
-
-    /**
-     * @return A pointer to the last certificate data in the set. Returns NULL if certificate set is empty.
-     **/
-    const ChipCertificateData * GetLastCert() const { return (mCertCount > 0) ? &mCerts[mCertCount - 1] : nullptr; }
-
-    /**
-     * @return Number of certificates loaded into the set.
-     **/
-    uint8_t GetCertCount() const { return mCertCount; }
-
-    /**
-     * @brief Check whether certificate is in the set.
-     *
-     * @param cert  Pointer to the ChipCertificateData structures.
-     *
-     * @return True if certificate is in the set, false otherwise.
-     **/
-    bool IsCertInTheSet(const ChipCertificateData * cert) const;
-
-    /**
-     * @brief Validate CHIP certificate.
-     *
-     * @param cert     Pointer to the CHIP certificate to be validated. The certificate is
-     *                 required to be in this set, otherwise this function returns error.
-     * @param context  Certificate validation context.
-     *
-     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR ValidateCert(const ChipCertificateData * cert, ValidationContext & context);
-
-    /**
-     * @brief Find and validate CHIP certificate.
-     *
-     * @param[in]  subjectDN     Subject distinguished name to use as certificate search parameter.
-     * @param[in]  subjectKeyId  Subject key identifier to use as certificate search parameter.
-     * @param[in]  context       Certificate validation context.
-     * @param[out] certData      A slot to write a pointer to the CHIP certificate data that matches search criteria.
-     *
-     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId, ValidationContext & context,
-                             const ChipCertificateData ** certData);
-
-    /**
-     * @brief Verify CHIP certificate signature.
-     *
-     * @param cert    Pointer to the CHIP certificate which signature should be validated.
-     * @param caCert  Pointer to the CA certificate of the verified certificate.
-     *
-     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
-     **/
-    static CHIP_ERROR VerifySignature(const ChipCertificateData * cert, const ChipCertificateData * caCert);
-
-private:
-    ChipCertificateData * mCerts; /**< Pointer to an array of certificate data. */
-    uint8_t mCertCount;           /**< Number of certificates in mCerts
-                                     array. We maintain the invariant that all
-                                     the slots at indices less than
-                                     mCertCount have been constructed and slots
-                                     at indices >= mCertCount have either never
-                                     had their constructor called, or have had
-                                     their destructor called since then. */
-    uint8_t mMaxCerts;            /**< Length of mCerts array. */
-    bool mMemoryAllocInternal;    /**< Indicates whether temporary memory buffers are allocated internally. */
-
-    /**
-     * @brief Find and validate CHIP certificate.
-     *
-     * @param[in]  subjectDN      Subject distinguished name to use as certificate search parameter.
-     * @param[in]  subjectKeyId   Subject key identifier to use as certificate search parameter.
-     * @param[in]  context        Certificate validation context.
-     * @param[in]  validateFlags  Certificate validation flags.
-     * @param[in]  depth          Depth of the current certificate in the certificate validation chain.
-     * @param[out] certData       A slot to write a pointer to the CHIP certificate data that matches search criteria.
-     *
-     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId, ValidationContext & context,
-                             BitFlags<CertValidateFlags> validateFlags, uint8_t depth, const ChipCertificateData ** certData);
-
-    /**
-     * @brief Validate CHIP certificate.
-     *
-     * @param cert           Pointer to the CHIP certificate to be validated.
-     * @param context        Certificate validation context.
-     * @param validateFlags  Certificate validation flags.
-     * @param depth          Depth of the current certificate in the certificate validation chain.
-     *
-     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
-     **/
-    CHIP_ERROR ValidateCert(const ChipCertificateData * cert, ValidationContext & context,
-                            BitFlags<CertValidateFlags> validateFlags, uint8_t depth);
-};
-
 /**
  * @brief Decode CHIP certificate.
  *        It is required that the CHIP certificate in the chipCert buffer stays valid while
@@ -778,14 +547,14 @@ CHIP_ERROR NewNodeOperationalX509Cert(const X509CertRequestParams & requestParam
 
 /**
  * @brief
- *   Convert a certificate date/time (in the form of an ASN.1 universal time structure) into a CHIP Epoch UTC time.
+ *   Convert a certificate date/time (in the form of an ASN.1 universal time structure) into a CHIP Epoch time.
  *
  * @note
  *   This function makes no attempt to verify the correct range of the input time other than year.
  *   Therefore callers must make sure the supplied values are valid prior to invocation.
  *
  * @param asn1Time   The calendar date/time to be converted.
- * @param epochTime  A reference to an integer that will receive CHIP Epoch UTC time.
+ * @param epochTime  A reference to an integer that will receive CHIP Epoch time.
  *
  * @retval  #CHIP_NO_ERROR                      If the input time was successfully converted.
  * @retval  #ASN1_ERROR_UNSUPPORTED_ENCODING    If the input time contained a year value that could not
@@ -967,6 +736,25 @@ CHIP_ERROR ExtractNodeIdFabricIdFromOpCert(const ByteSpan & opcert, NodeId * nod
  */
 CHIP_ERROR ExtractPublicKeyFromChipCert(const ByteSpan & chipCert, P256PublicKeySpan & publicKey);
 
+/**
+ * Extract Not Before Time from a chip certificate in ByteSpan TLV-encoded form.
+ * Output format is seconds referenced from the CHIP epoch.
+ *
+ * Special value 0 corresponds to the X.509/RFC5280 defined special time value
+ * 99991231235959Z meaning 'no well-defined expiration date'.  However, as a
+ * NotBefore time, this does not require special handling when comparing to
+ * a CHIP epoch time source, as 0 (the epoch) is also the earliest representable
+ * uint32 time.
+
+ * This does not perform any sort of validation on the certificate structure
+ * other than parsing it.
+ *
+ * @param chipCert CHIP certificate in TLV-encoded form
+ * @param notBeforeChipEpochTime (out) certificate NotBefore time as seconds from the CHIP epoch
+ * @return CHIP_NO_ERROR if certificate parsing was successful, else an appropriate CHIP_ERROR
+ */
+CHIP_ERROR ExtractNotBeforeFromChipCert(const ByteSpan & chipCert, chip::System::Clock::Seconds32 & notBeforeChipEpochTime);
+
 /**
  * Extract Subject Key Identifier from a chip certificate in ByteSpan TLV-encoded form.
  * This does not perform any sort of validation on the certificate structure
diff --git a/src/credentials/CHIPCertificateSet.h b/src/credentials/CHIPCertificateSet.h
new file mode 100644
index 00000000000000..d3694467c74fbc
--- /dev/null
+++ b/src/credentials/CHIPCertificateSet.h
@@ -0,0 +1,298 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    Copyright (c) 2013-2017 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file defines data types and objects for modeling and
+ *      working with CHIP certificates.
+ *
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <string.h>
+
+#include "CHIPCert.h"
+#include "CertificateValidityPolicy.h"
+#include <lib/support/Variant.h>
+
+namespace chip {
+namespace Credentials {
+
+struct CurrentChipEpochTime : chip::System::Clock::Seconds32
+{
+    template <typename... Args>
+    CurrentChipEpochTime(Args &&... args) : chip::System::Clock::Seconds32(std::forward<Args>(args)...)
+    {}
+};
+
+struct LastKnownGoodChipEpochTime : chip::System::Clock::Seconds32
+{
+    template <typename... Args>
+    LastKnownGoodChipEpochTime(Args &&... args) : chip::System::Clock::Seconds32(std::forward<Args>(args)...)
+    {}
+};
+
+using EffectiveTime = Variant<CurrentChipEpochTime, LastKnownGoodChipEpochTime>;
+
+/**
+ *  @struct ValidationContext
+ *
+ *  @brief
+ *    Context information used during certification validation.
+ */
+struct ValidationContext
+{
+    EffectiveTime mEffectiveTime;                   /**< Current or last known good CHIP Epoch time. */
+    const ChipCertificateData * mTrustAnchor;       /**< Pointer to the Trust Anchor Certificate data structure.
+                                                       This value is set during certificate validation process
+                                                       to indicate to the caller the trust anchor of the
+                                                       validated certificate. */
+    BitFlags<KeyUsageFlags> mRequiredKeyUsages;     /**< Key usage extensions that should be present in the
+                                                       validated certificate. */
+    BitFlags<KeyPurposeFlags> mRequiredKeyPurposes; /**< Extended Key usage extensions that should be present
+                                                       in the validated certificate. */
+    uint8_t mRequiredCertType;                      /**< Required certificate type. */
+
+    CertificateValidityPolicy * mValidityPolicy =
+        nullptr; /**< Optional application policy to apply for certificate validity period evaluation. */
+
+    void Reset();
+
+    template <typename T>
+    void SetEffectiveTime(chip::System::Clock::Seconds32 chipTime)
+    {
+        mEffectiveTime.Set<T>(chipTime);
+    }
+
+    template <typename T>
+    CHIP_ERROR SetEffectiveTimeFromUnixTime(chip::System::Clock::Seconds32 unixTime)
+    {
+        uint32_t chipTime;
+        VerifyOrReturnError(UnixEpochToChipEpochTime(unixTime.count(), chipTime), CHIP_ERROR_INVALID_TIME);
+        SetEffectiveTime<T>(chip::System::Clock::Seconds32(chipTime));
+        return CHIP_NO_ERROR;
+    }
+
+    template <typename T>
+    CHIP_ERROR SetEffectiveTimeFromAsn1Time(const ASN1::ASN1UniversalTime & asn1Time)
+    {
+        uint32_t chipTime;
+        ReturnErrorOnFailure(ASN1ToChipEpochTime(asn1Time, chipTime));
+        SetEffectiveTime<T>(chip::System::Clock::Seconds32(chipTime));
+        return CHIP_NO_ERROR;
+    }
+};
+
+/**
+ *  @class ChipCertificateSet
+ *
+ *  @brief
+ *    Collection of CHIP certificate data providing methods for
+ *    certificate validation and signature verification.
+ */
+class DLL_EXPORT ChipCertificateSet
+{
+public:
+    ChipCertificateSet();
+    ~ChipCertificateSet();
+
+    ChipCertificateSet & operator=(ChipCertificateSet && aOther)
+    {
+        mCerts               = aOther.mCerts;
+        aOther.mCerts        = nullptr;
+        mCertCount           = aOther.mCertCount;
+        mMaxCerts            = aOther.mMaxCerts;
+        mMemoryAllocInternal = aOther.mMemoryAllocInternal;
+
+        return *this;
+    }
+
+    /**
+     * @brief Initialize ChipCertificateSet.
+     *        This initialization method is used when all memory structures needed for operation are
+     *        allocated internally using chip::Platform::MemoryAlloc() and freed with chip::Platform::MemoryFree().
+     *
+     * @param maxCertsArraySize  Maximum number of CHIP certificates to be loaded to the set.
+     *
+     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR Init(uint8_t maxCertsArraySize);
+
+    /**
+     * @brief Initialize ChipCertificateSet.
+     *        This initialization method is used when all memory structures needed for operation are
+     *        allocated externally and methods in this class don't need to deal with memory allocations.
+     *
+     * @param certsArray      A pointer to the array of the ChipCertificateData structures.
+     * @param certsArraySize  Number of ChipCertificateData entries in the array.
+     *
+     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR Init(ChipCertificateData * certsArray, uint8_t certsArraySize);
+
+    /**
+     * @brief Release resources allocated by this class.
+     **/
+    void Release();
+
+    /**
+     * @brief Clear certificate data loaded into this set.
+     **/
+    void Clear();
+
+    /**
+     * @brief Load CHIP certificate into set.
+     *        It is required that the CHIP certificate in the chipCert buffer stays valid while
+     *        the certificate data in the set is used.
+     *        In case of an error the certificate set is left in the same state as prior to this call.
+     *
+     * @param chipCert     Buffer containing certificate encoded in CHIP format.
+     * @param decodeFlags  Certificate decoding option flags.
+     *
+     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR LoadCert(const ByteSpan chipCert, BitFlags<CertDecodeFlags> decodeFlags);
+
+    /**
+     * @brief Load CHIP certificate into set.
+     *        It is required that the CHIP certificate in the reader's underlying buffer stays valid while
+     *        the certificate data in the set is used.
+     *        In case of an error the certificate set is left in the same state as prior to this call.
+     *
+     * @param reader       A TLVReader positioned at the CHIP certificate TLV structure.
+     * @param decodeFlags  Certificate decoding option flags.
+     * @param chipCert     Buffer containing certificate encoded on CHIP format. It is required that this CHIP certificate
+     *                     in chipCert ByteSpan stays valid while the certificate data in the set is used.
+     *
+     * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR LoadCert(chip::TLV::TLVReader & reader, BitFlags<CertDecodeFlags> decodeFlags, ByteSpan chipCert = ByteSpan());
+
+    CHIP_ERROR ReleaseLastCert();
+
+    /**
+     * @brief Find certificate in the set.
+     *
+     * @param subjectKeyId  Subject key identifier of the certificate to be found in the set.
+     *
+     * @return A pointer to the certificate data On success. Otherwise, NULL if no certificate found.
+     **/
+    const ChipCertificateData * FindCert(const CertificateKeyId & subjectKeyId) const;
+
+    /**
+     * @return A pointer to the set of certificate data entries.
+     **/
+    const ChipCertificateData * GetCertSet() const { return mCerts; }
+
+    /**
+     * @return A pointer to the last certificate data in the set. Returns NULL if certificate set is empty.
+     **/
+    const ChipCertificateData * GetLastCert() const { return (mCertCount > 0) ? &mCerts[mCertCount - 1] : nullptr; }
+
+    /**
+     * @return Number of certificates loaded into the set.
+     **/
+    uint8_t GetCertCount() const { return mCertCount; }
+
+    /**
+     * @brief Check whether certificate is in the set.
+     *
+     * @param cert  Pointer to the ChipCertificateData structures.
+     *
+     * @return True if certificate is in the set, false otherwise.
+     **/
+    bool IsCertInTheSet(const ChipCertificateData * cert) const;
+
+    /**
+     * @brief Validate CHIP certificate.
+     *
+     * @param cert     Pointer to the CHIP certificate to be validated. The certificate is
+     *                 required to be in this set, otherwise this function returns error.
+     * @param context  Certificate validation context.
+     *
+     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR ValidateCert(const ChipCertificateData * cert, ValidationContext & context);
+
+    /**
+     * @brief Find and validate CHIP certificate.
+     *
+     * @param[in]  subjectDN     Subject distinguished name to use as certificate search parameter.
+     * @param[in]  subjectKeyId  Subject key identifier to use as certificate search parameter.
+     * @param[in]  context       Certificate validation context.
+     * @param[out] certData      A slot to write a pointer to the CHIP certificate data that matches search criteria.
+     *
+     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId, ValidationContext & context,
+                             const ChipCertificateData ** certData);
+
+    /**
+     * @brief Verify CHIP certificate signature.
+     *
+     * @param cert    Pointer to the CHIP certificate which signature should be validated.
+     * @param caCert  Pointer to the CA certificate of the verified certificate.
+     *
+     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
+     **/
+    static CHIP_ERROR VerifySignature(const ChipCertificateData * cert, const ChipCertificateData * caCert);
+
+private:
+    ChipCertificateData * mCerts; /**< Pointer to an array of certificate data. */
+    uint8_t mCertCount;           /**< Number of certificates in mCerts
+                                     array. We maintain the invariant that all
+                                     the slots at indices less than
+                                     mCertCount have been constructed and slots
+                                     at indices >= mCertCount have either never
+                                     had their constructor called, or have had
+                                     their destructor called since then. */
+    uint8_t mMaxCerts;            /**< Length of mCerts array. */
+    bool mMemoryAllocInternal;    /**< Indicates whether temporary memory buffers are allocated internally. */
+
+    /**
+     * @brief Find and validate CHIP certificate.
+     *
+     * @param[in]  subjectDN      Subject distinguished name to use as certificate search parameter.
+     * @param[in]  subjectKeyId   Subject key identifier to use as certificate search parameter.
+     * @param[in]  context        Certificate validation context.
+     * @param[in]  depth          Depth of the current certificate in the certificate validation chain.
+     * @param[out] certData       A slot to write a pointer to the CHIP certificate data that matches search criteria.
+     *
+     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId, ValidationContext & context,
+                             uint8_t depth, const ChipCertificateData ** certData);
+
+    /**
+     * @brief Validate CHIP certificate.
+     *
+     * @param cert           Pointer to the CHIP certificate to be validated.
+     * @param context        Certificate validation context.
+     * @param depth          Depth of the current certificate in the certificate validation chain.
+     *
+     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
+     **/
+    CHIP_ERROR ValidateCert(const ChipCertificateData * cert, ValidationContext & context, uint8_t depth);
+};
+
+} // namespace Credentials
+} // namespace chip
diff --git a/src/credentials/CertificateValidityPolicy.h b/src/credentials/CertificateValidityPolicy.h
new file mode 100644
index 00000000000000..0df351dff8390c
--- /dev/null
+++ b/src/credentials/CertificateValidityPolicy.h
@@ -0,0 +1,58 @@
+/*
+ *
+ *    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.
+ */
+#pragma once
+
+#include <credentials/CHIPCert.h>
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace Credentials {
+
+enum class CertificateValidityResult
+{
+    kValid                         = 0, // current time is known and is within the validity period bounded by [notBefore, notAfter]
+    kNotYetValid                   = 1, // current time is known and falls before the validity period bounded by notBefore
+    kExpired                       = 2, // current time is known and falls after the validity period bounded by notAfter
+    kNotExpiredAtLastKnownGoodTime = 3, // Last Known Good Time is known and notAfter occurs at or after this
+    kExpiredAtLastKnownGoodTime    = 4, // Last Known Good Time is known and notAfter occurs before this
+    kTimeUnknown                   = 5, // No time source is available
+};
+
+/// Callback to request application acceptance or rejection of the path
+/// segment based upon the CertificateValidityResult.
+class CertificateValidityPolicy
+{
+public:
+    virtual ~CertificateValidityPolicy() {}
+
+    /**
+     *  If a policy is provided to CHIPCert, this method is invoked to
+     *  determine what action an application determines is appropriate given
+     *  CHIPCert's evaluation of certificate validity based upon the best
+     *  available time source.  If no policy is provided, CHIPCert enforces a
+     *  default policy.
+     *
+     * @param cert CHIP Certificate from a peer certificate chain to be evaluated based upon application-enacted expiration policies
+     * @param depth the depth of the certificate in the chain, where the leaf is at depth 0
+     * @return CHIP_NO_ERROR if CHIPCert should accept the certificate; an appropriate CHIP_ERROR if it should be rejected
+     */
+    virtual CHIP_ERROR ApplyCertificateValidityPolicy(const ChipCertificateData * cert, uint8_t depth,
+                                                      CertificateValidityResult result) = 0;
+};
+
+} // namespace Credentials
+} // namespace chip
diff --git a/src/credentials/FabricTable.cpp b/src/credentials/FabricTable.cpp
index 3f15c7b7f91a2b..222ea1c278defb 100644
--- a/src/credentials/FabricTable.cpp
+++ b/src/credentials/FabricTable.cpp
@@ -43,21 +43,18 @@ CHIP_ERROR FabricInfo::SetFabricLabel(const CharSpan & fabricLabel)
 }
 
 namespace {
+
+static_assert(kMinValidFabricIndex <= CHIP_CONFIG_MAX_FABRICS, "Must support some fabrics.");
+static_assert(CHIP_CONFIG_MAX_FABRICS <= kMaxValidFabricIndex, "Max fabric count out of range.");
+
 // Tags for our metadata storage.
 constexpr TLV::Tag kVendorIdTag    = TLV::ContextTag(0);
 constexpr TLV::Tag kFabricLabelTag = TLV::ContextTag(1);
 
-// Tags for our operational keypair storage.
-constexpr TLV::Tag kOpKeyVersionTag = TLV::ContextTag(0);
-constexpr TLV::Tag kOpKeyDataTag    = TLV::ContextTag(1);
-
-// If this version grows beyond UINT16_MAX, adjust OpKeypairTLVMaxSize
-// accordingly.
-constexpr uint16_t kOpKeyVersion = 1;
-
 // Tags for our index list storage.
 constexpr TLV::Tag kNextAvailableFabricIndexTag = TLV::ContextTag(0);
 constexpr TLV::Tag kFabricIndicesTag            = TLV::ContextTag(1);
+
 } // anonymous namespace
 
 CHIP_ERROR FabricInfo::CommitToStorage(PersistentStorageDelegate * storage)
@@ -93,32 +90,6 @@ CHIP_ERROR FabricInfo::CommitToStorage(PersistentStorageDelegate * storage)
     ReturnErrorOnFailure(
         storage->SyncSetKeyValue(keyAlloc.FabricNOC(mFabricIndex), mNOCCert.data(), static_cast<uint16_t>(mNOCCert.size())));
 
-    {
-        uint8_t buf[OpKeyTLVMaxSize()];
-        TLV::TLVWriter writer;
-        writer.Init(buf);
-
-        TLV::TLVType outerType;
-        ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerType));
-
-        ReturnErrorOnFailure(writer.Put(kOpKeyVersionTag, kOpKeyVersion));
-
-        // If key storage is externally managed, key is not stored here,
-        // and when loading is done later, it will be ignored.
-        if (!mHasExternallyOwnedOperationalKey && (mOperationalKey != nullptr))
-        {
-            Crypto::P256SerializedKeypair serializedOpKey;
-            ReturnErrorOnFailure(mOperationalKey->Serialize(serializedOpKey));
-            ReturnErrorOnFailure(writer.Put(kOpKeyDataTag, ByteSpan(serializedOpKey.Bytes(), serializedOpKey.Length())));
-        }
-
-        ReturnErrorOnFailure(writer.EndContainer(outerType));
-
-        const auto opKeyLength = writer.GetLengthWritten();
-        VerifyOrReturnError(CanCastTo<uint16_t>(opKeyLength), CHIP_ERROR_BUFFER_TOO_SMALL);
-        ReturnErrorOnFailure(storage->SyncSetKeyValue(keyAlloc.FabricOpKey(mFabricIndex), buf, static_cast<uint16_t>(opKeyLength)));
-    }
-
     {
         uint8_t buf[MetadataTLVMaxSize()];
         TLV::TLVWriter writer;
@@ -139,6 +110,8 @@ CHIP_ERROR FabricInfo::CommitToStorage(PersistentStorageDelegate * storage)
             storage->SyncSetKeyValue(keyAlloc.FabricMetadata(mFabricIndex), buf, static_cast<uint16_t>(metadataLength)));
     }
 
+    // NOTE: Operational Key is never saved to storage here. See OperationalKeystore interface for how it is accessed
+
     return CHIP_NO_ERROR;
 }
 
@@ -146,7 +119,7 @@ CHIP_ERROR FabricInfo::LoadFromStorage(PersistentStorageDelegate * storage)
 {
     DefaultStorageKeyAllocator keyAlloc;
 
-    ChipLogProgress(Inet, "Loading from storage for fabric index 0x%x", static_cast<unsigned>(mFabricIndex));
+    ChipLogProgress(FabricProvisioning, "Loading from storage for fabric index 0x%x", static_cast<unsigned>(mFabricIndex));
 
     // Scopes for "size" so we don't forget to re-initialize it between gets,
     // since each get modifies it.
@@ -187,60 +160,6 @@ CHIP_ERROR FabricInfo::LoadFromStorage(PersistentStorageDelegate * storage)
         ReturnErrorOnFailure(SetNOCCert(nocCert));
     }
 
-    {
-        // Use a CapacityBoundBuffer to get RAII secret data clearing on scope exit.
-        Crypto::CapacityBoundBuffer<OpKeyTLVMaxSize()> buf;
-        uint16_t size = static_cast<uint16_t>(buf.Capacity());
-        ReturnErrorOnFailure(storage->SyncGetKeyValue(keyAlloc.FabricOpKey(mFabricIndex), buf.Bytes(), size));
-        buf.SetLength(static_cast<size_t>(size));
-
-        TLV::ContiguousBufferTLVReader reader;
-        reader.Init(buf.Bytes(), buf.Length());
-
-        ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Structure, TLV::AnonymousTag()));
-        TLV::TLVType containerType;
-        ReturnErrorOnFailure(reader.EnterContainer(containerType));
-
-        ReturnErrorOnFailure(reader.Next(kOpKeyVersionTag));
-        uint16_t opKeyVersion;
-        ReturnErrorOnFailure(reader.Get(opKeyVersion));
-        VerifyOrReturnError(opKeyVersion == kOpKeyVersion, CHIP_ERROR_VERSION_MISMATCH);
-
-        CHIP_ERROR err = reader.Next(kOpKeyDataTag);
-        if (err == CHIP_NO_ERROR)
-        {
-            ByteSpan keyData;
-            ReturnErrorOnFailure(reader.GetByteView(keyData));
-
-            // Unfortunately, we have to copy the data into a P256SerializedKeypair.
-            Crypto::P256SerializedKeypair serializedOpKey;
-            VerifyOrReturnError(keyData.size() <= serializedOpKey.Capacity(), CHIP_ERROR_BUFFER_TOO_SMALL);
-
-            memcpy(serializedOpKey.Bytes(), keyData.data(), keyData.size());
-            serializedOpKey.SetLength(keyData.size());
-
-            if (mOperationalKey == nullptr)
-            {
-#ifdef ENABLE_HSM_CASE_OPS_KEY
-                mOperationalKey = chip::Platform::New<P256KeypairHSM>();
-#else
-                mOperationalKey = chip::Platform::New<P256Keypair>();
-#endif
-            }
-            VerifyOrReturnError(mOperationalKey != nullptr, CHIP_ERROR_NO_MEMORY);
-            ReturnErrorOnFailure(mOperationalKey->Deserialize(serializedOpKey));
-        }
-        else
-        {
-            // Key was absent: set mOperationalKey to null, for another caller to set
-            // it. This may happen if externally owned.
-            mOperationalKey = nullptr;
-        }
-
-        ReturnErrorOnFailure(reader.ExitContainer(containerType));
-        ReturnErrorOnFailure(reader.VerifyEndOfContainer());
-    }
-
     {
         uint8_t buf[MetadataTLVMaxSize()];
         uint16_t size = sizeof(buf);
@@ -266,6 +185,8 @@ CHIP_ERROR FabricInfo::LoadFromStorage(PersistentStorageDelegate * storage)
         ReturnErrorOnFailure(reader.VerifyEndOfContainer());
     }
 
+    // NOTE: Operational Key is never loaded here. See OperationalKeystore interface for how it is accessed
+
     return CHIP_NO_ERROR;
 }
 
@@ -299,8 +220,7 @@ CHIP_ERROR FabricInfo::DeleteFromStorage(PersistentStorageDelegate * storage, Fa
     // Try to delete all the state even if one of the deletes fails.
     typedef const char * (DefaultStorageKeyAllocator::*KeyGetter)(FabricIndex);
     constexpr KeyGetter keyGetters[] = { &DefaultStorageKeyAllocator::FabricNOC, &DefaultStorageKeyAllocator::FabricICAC,
-                                         &DefaultStorageKeyAllocator::FabricRCAC, &DefaultStorageKeyAllocator::FabricMetadata,
-                                         &DefaultStorageKeyAllocator::FabricOpKey };
+                                         &DefaultStorageKeyAllocator::FabricRCAC, &DefaultStorageKeyAllocator::FabricMetadata };
 
     CHIP_ERROR prevDeleteErr = CHIP_NO_ERROR;
 
@@ -315,7 +235,8 @@ CHIP_ERROR FabricInfo::DeleteFromStorage(PersistentStorageDelegate * storage, Fa
     }
     if (prevDeleteErr != CHIP_NO_ERROR)
     {
-        ChipLogDetail(Discovery, "Error deleting part of fabric %d: %" CHIP_ERROR_FORMAT, fabricIndex, prevDeleteErr.Format());
+        ChipLogError(FabricProvisioning, "Error deleting part of fabric %d: %" CHIP_ERROR_FORMAT, fabricIndex,
+                     prevDeleteErr.Format());
     }
     return prevDeleteErr;
 }
@@ -360,6 +281,57 @@ CHIP_ERROR FabricInfo::SetExternallyOwnedOperationalKeypair(P256Keypair * keyPai
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR FabricInfo::ValidateIncomingNOCChain(const ByteSpan & noc, const ByteSpan & icac, const ByteSpan & rcac,
+                                                FabricId existingFabricId, Credentials::CertificateValidityPolicy * policy,
+                                                PeerId & outOperationalId, FabricId & outFabricId,
+                                                Crypto::P256PublicKey & outNocPubkey)
+{
+    Credentials::ValidationContext validContext;
+
+    // Note that we do NOT set a time in the validation context.  This will
+    // cause the certificate chain NotBefore / NotAfter time validation logic
+    // to report CertificateValidityResult::kTimeUnknown.
+    //
+    // The default CHIPCert policy passes NotBefore / NotAfter validation for
+    // this case where time is unknown.  If an override policy is passed, it
+    // will be up to the passed policy to decide how to handle this.
+    //
+    // In the FabricTable::AddNewFabric and FabricTable::UpdateFabric calls,
+    // the passed policy always passes for all questions of time validity.  The
+    // rationale is that installed certificates should be valid at the time of
+    // installation by definition.  If they are not and the commissionee and
+    // commissioner disagree enough on current time, CASE will fail and our
+    // fail-safe timer will expire.
+    //
+    // This then is ultimately how we validate that NotBefore / NotAfter in
+    // newly installed certificates is workable.
+    validContext.Reset();
+    validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
+    validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
+    validContext.mValidityPolicy = policy;
+
+    ChipLogProgress(FabricProvisioning, "Validating NOC chain");
+    CHIP_ERROR err = FabricInfo::VerifyCredentials(noc, icac, rcac, validContext, outOperationalId, outFabricId, outNocPubkey);
+    if (err != CHIP_NO_ERROR && err != CHIP_ERROR_WRONG_NODE_ID)
+    {
+        err = CHIP_ERROR_UNSUPPORTED_CERT_FORMAT;
+    }
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(FabricProvisioning, "Failed NOC chain validation: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    ReturnErrorOnFailure(err);
+
+    // Validate fabric ID match for cases like UpdateNOC.
+    if (existingFabricId != kUndefinedFabricId)
+    {
+        VerifyOrReturnError(existingFabricId == outFabricId, CHIP_ERROR_UNSUPPORTED_CERT_FORMAT);
+    }
+
+    ChipLogProgress(FabricProvisioning, "NOC chain validation successful");
+    return CHIP_NO_ERROR;
+}
+
 void FabricInfo::ReleaseCert(MutableByteSpan & cert)
 {
     if (cert.data() != nullptr)
@@ -388,6 +360,13 @@ CHIP_ERROR FabricInfo::SetCert(MutableByteSpan & dstCert, const ByteSpan & srcCe
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR FabricInfo::SignWithOpKeypair(ByteSpan message, P256ECDSASignature & outSignature) const
+{
+    VerifyOrReturnError(mOperationalKey != nullptr, CHIP_ERROR_KEY_NOT_FOUND);
+
+    return mOperationalKey->ECDSA_sign_msg(message.data(), message.size(), outSignature);
+}
+
 CHIP_ERROR FabricInfo::VerifyCredentials(const ByteSpan & noc, const ByteSpan & icac, ValidationContext & context,
                                          PeerId & nocPeerId, FabricId & fabricId, Crypto::P256PublicKey & nocPubkey) const
 {
@@ -456,11 +435,23 @@ CHIP_ERROR FabricInfo::VerifyCredentials(const ByteSpan & noc, const ByteSpan &
     }
 
     ReturnErrorOnFailure(GeneratePeerId(rcac, fabricId, nodeId, &nocPeerId));
-    nocPubkey = P256PublicKey(certificates.GetLastCert()[0].mPublicKey);
+    nocPubkey = certificates.GetLastCert()[0].mPublicKey;
 
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR FabricInfo::FetchRootPubkey(Crypto::P256PublicKey & outPublicKey) const
+{
+    P256PublicKeySpan publicKeySpan;
+    CHIP_ERROR err = Credentials::ExtractPublicKeyFromChipCert(mRootCert, publicKeySpan);
+    if (err == CHIP_NO_ERROR)
+    {
+        outPublicKey = publicKeySpan;
+    }
+
+    return err;
+}
+
 FabricTable::~FabricTable()
 {
     // Remove all links to every delegate
@@ -473,7 +464,7 @@ FabricTable::~FabricTable()
     }
 }
 
-FabricInfo * FabricTable::FindFabric(P256PublicKeySpan rootPubKey, FabricId fabricId)
+FabricInfo * FabricTable::FindFabric(const Crypto::P256PublicKey & rootPubKey, FabricId fabricId)
 {
     for (auto & fabric : mStates)
     {
@@ -481,16 +472,17 @@ FabricInfo * FabricTable::FindFabric(P256PublicKeySpan rootPubKey, FabricId fabr
         {
             continue;
         }
-        P256PublicKeySpan candidatePubKey;
-        if (fabric.GetRootPubkey(candidatePubKey) != CHIP_NO_ERROR)
+        P256PublicKey candidatePubKey;
+        if (fabric.FetchRootPubkey(candidatePubKey) != CHIP_NO_ERROR)
         {
             continue;
         }
-        if (rootPubKey.data_equal(candidatePubKey) && fabricId == fabric.GetFabricId())
+        if (rootPubKey.Matches(candidatePubKey) && fabricId == fabric.GetFabricId())
         {
             return &fabric;
         }
     }
+
     return nullptr;
 }
 
@@ -512,6 +504,24 @@ FabricInfo * FabricTable::FindFabricWithIndex(FabricIndex fabricIndex)
     return nullptr;
 }
 
+const FabricInfo * FabricTable::FindFabricWithIndex(FabricIndex fabricIndex) const
+{
+    for (const auto & fabric : mStates)
+    {
+        if (!fabric.IsInitialized())
+        {
+            continue;
+        }
+
+        if (fabric.GetFabricIndex() == fabricIndex)
+        {
+            return &fabric;
+        }
+    }
+
+    return nullptr;
+}
+
 FabricInfo * FabricTable::FindFabricWithCompressedId(CompressedFabricId fabricId)
 {
     for (auto & fabric : mStates)
@@ -529,6 +539,34 @@ FabricInfo * FabricTable::FindFabricWithCompressedId(CompressedFabricId fabricId
     return nullptr;
 }
 
+CHIP_ERROR FabricTable::FetchRootCert(FabricIndex fabricIndex, MutableByteSpan & outCert) const
+{
+    const FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_FABRIC_INDEX);
+    return fabricInfo->FetchRootCert(outCert);
+}
+
+CHIP_ERROR FabricTable::FetchICACert(FabricIndex fabricIndex, MutableByteSpan & outCert) const
+{
+    const FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_FABRIC_INDEX);
+    return fabricInfo->FetchICACert(outCert);
+}
+
+CHIP_ERROR FabricTable::FetchNOCCert(FabricIndex fabricIndex, MutableByteSpan & outCert) const
+{
+    const FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_FABRIC_INDEX);
+    return fabricInfo->FetchNOCCert(outCert);
+}
+
+CHIP_ERROR FabricTable::FetchRootPubkey(FabricIndex fabricIndex, Crypto::P256PublicKey & outPublicKey) const
+{
+    const FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_FABRIC_INDEX);
+    return fabricInfo->FetchRootPubkey(outPublicKey);
+}
+
 CHIP_ERROR FabricTable::Store(FabricIndex fabricIndex)
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
@@ -543,7 +581,7 @@ CHIP_ERROR FabricTable::Store(FabricIndex fabricIndex)
 exit:
     if (err == CHIP_NO_ERROR && mDelegateListRoot != nullptr)
     {
-        ChipLogProgress(Discovery, "Fabric (0x%x) persisted to storage. Calling OnFabricPersistedToStorage",
+        ChipLogProgress(FabricProvisioning, "Fabric (0x%x) persisted to storage. Calling OnFabricPersistedToStorage",
                         static_cast<unsigned>(fabricIndex));
         FabricTable::Delegate * delegate = mDelegateListRoot;
         while (delegate)
@@ -566,7 +604,8 @@ CHIP_ERROR FabricTable::LoadFromStorage(FabricInfo * fabric)
         FabricTable::Delegate * delegate = mDelegateListRoot;
         while (delegate)
         {
-            ChipLogProgress(Discovery, "Fabric (0x%x) loaded from storage", static_cast<unsigned>(fabric->GetFabricIndex()));
+            ChipLogProgress(FabricProvisioning, "Fabric (0x%x) loaded from storage",
+                            static_cast<unsigned>(fabric->GetFabricIndex()));
             delegate->OnFabricRetrievedFromStorage(*this, fabric->GetFabricIndex());
             delegate = delegate->next;
         }
@@ -574,44 +613,39 @@ CHIP_ERROR FabricTable::LoadFromStorage(FabricInfo * fabric)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR FabricInfo::SetFabricInfo(FabricInfo & newFabric)
+CHIP_ERROR FabricInfo::SetFabricInfo(FabricInfo & newFabric, Credentials::CertificateValidityPolicy * policy)
 {
-    P256PublicKey pubkey;
-    ValidationContext validContext;
-    validContext.Reset();
-    validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
-    validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
+    auto * operationalKey = newFabric.mOperationalKey;
 
-    // Make sure to not modify any of our state until VerifyCredentials passes.
+    // Make sure to not modify any of our state until ValidateIncomingNOCChain passes.
+    P256PublicKey pubkey;
     PeerId operationalId;
     FabricId fabricId;
-    ChipLogProgress(Discovery, "Verifying the received credentials");
-    CHIP_ERROR err = VerifyCredentials(newFabric.mNOCCert, newFabric.mICACert, newFabric.mRootCert, validContext, operationalId,
-                                       fabricId, pubkey);
-    if (err != CHIP_NO_ERROR && err != CHIP_ERROR_WRONG_NODE_ID)
-    {
-        err = CHIP_ERROR_UNSUPPORTED_CERT_FORMAT;
-    }
-    ReturnErrorOnFailure(err);
-
-    auto * operationalKey = newFabric.GetOperationalKey();
-    if (operationalKey == nullptr)
-    {
-        return CHIP_ERROR_INCORRECT_STATE;
-    }
 
-    // Verify that public key in NOC matches public key generated by node and sent in CSRResponse message.
-    VerifyOrReturnError(operationalKey->Pubkey().Length() == pubkey.Length(), CHIP_ERROR_INVALID_PUBLIC_KEY);
-    VerifyOrReturnError(memcmp(operationalKey->Pubkey().ConstBytes(), pubkey.Bytes(), pubkey.Length()) == 0,
-                        CHIP_ERROR_INVALID_PUBLIC_KEY);
+    ReturnErrorOnFailure(ValidateIncomingNOCChain(newFabric.mNOCCert, newFabric.mICACert, newFabric.mRootCert, mFabricId, policy,
+                                                  operationalId, fabricId, pubkey));
 
-    if (newFabric.mHasExternallyOwnedOperationalKey)
+    if (operationalKey != nullptr)
     {
-        ReturnErrorOnFailure(SetExternallyOwnedOperationalKeypair(operationalKey));
-    }
-    else
-    {
-        ReturnErrorOnFailure(SetOperationalKeypair(operationalKey));
+        // Verify that public key in NOC matches public key of the provided keypair.
+        // When operational key is not injected (e.g. when mOperationalKeystore != nullptr)
+        // the check is done by the keystore in `ActivatePendingOperationalKey`.
+        VerifyOrReturnError(operationalKey->Pubkey().Length() == pubkey.Length(), CHIP_ERROR_INVALID_PUBLIC_KEY);
+        VerifyOrReturnError(memcmp(operationalKey->Pubkey().ConstBytes(), pubkey.ConstBytes(), pubkey.Length()) == 0,
+                            CHIP_ERROR_INVALID_PUBLIC_KEY);
+
+        if (newFabric.mHasExternallyOwnedOperationalKey)
+        {
+            ReturnErrorOnFailure(SetExternallyOwnedOperationalKeypair(operationalKey));
+        }
+        else if (operationalKey != nullptr)
+        {
+            ReturnErrorOnFailure(SetOperationalKeypair(operationalKey));
+        }
+        else
+        {
+            return CHIP_ERROR_INCORRECT_STATE;
+        }
     }
 
     SetRootCert(newFabric.mRootCert);
@@ -621,13 +655,34 @@ CHIP_ERROR FabricInfo::SetFabricInfo(FabricInfo & newFabric)
     SetNOCCert(newFabric.mNOCCert);
     SetVendorId(newFabric.GetVendorId());
     SetFabricLabel(newFabric.GetFabricLabel());
-    ChipLogProgress(Discovery, "Added new fabric at index: 0x%x, Initialized: %d", static_cast<unsigned>(GetFabricIndex()),
+    ChipLogProgress(FabricProvisioning, "Added new fabric at index: 0x%x, Initialized: %d", static_cast<unsigned>(GetFabricIndex()),
                     IsInitialized());
-    ChipLogProgress(Discovery, "Assigned compressed fabric ID: 0x" ChipLogFormatX64 ", node ID: 0x" ChipLogFormatX64,
+    ChipLogProgress(FabricProvisioning, "Assigned compressed fabric ID: 0x" ChipLogFormatX64 ", node ID: 0x" ChipLogFormatX64,
                     ChipLogValueX64(mOperationalId.GetCompressedFabricId()), ChipLogValueX64(mOperationalId.GetNodeId()));
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR FabricInfo::TestOnlyBuildFabric(ByteSpan rootCert, ByteSpan icacCert, ByteSpan nocCert, ByteSpan nocKey)
+{
+    Reset();
+
+    ReturnErrorOnFailure(SetRootCert(rootCert));
+    ReturnErrorOnFailure(SetICACert(icacCert));
+    ReturnErrorOnFailure(SetNOCCert(nocCert));
+
+    // NOTE: this requres ENABLE_HSM_CASE_OPS_KEY is not defined
+    P256SerializedKeypair opKeysSerialized;
+    memcpy(static_cast<uint8_t *>(opKeysSerialized), nocKey.data(), nocKey.size());
+    ReturnErrorOnFailure(opKeysSerialized.SetLength(nocKey.size()));
+
+    P256Keypair opKey;
+    ReturnErrorOnFailure(opKey.Deserialize(opKeysSerialized));
+    ReturnErrorOnFailure(SetOperationalKeypair(&opKey));
+
+    // NOTE: mVendorId and mFabricLabel are not initialized, because they are not used in tests.
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR FabricTable::AddNewFabricForTest(FabricInfo & newFabric, FabricIndex * outputIndex)
 {
     VerifyOrReturnError(outputIndex != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -644,19 +699,22 @@ CHIP_ERROR FabricTable::AddNewFabric(FabricInfo & newFabric, FabricIndex * outpu
     // comparison.
     FabricId fabricId;
     {
-        ByteSpan noc;
-        ReturnErrorOnFailure(newFabric.GetNOCCert(noc));
+        uint8_t nocBuf[kMaxCHIPCertLength];
+        MutableByteSpan nocSpan{ nocBuf };
+        ReturnErrorOnFailure(newFabric.FetchNOCCert(nocSpan));
         NodeId unused;
-        ReturnErrorOnFailure(ExtractNodeIdFabricIdFromOpCert(noc, &unused, &fabricId));
+        ReturnErrorOnFailure(ExtractNodeIdFabricIdFromOpCert(nocSpan, &unused, &fabricId));
     }
+
     for (auto & existingFabric : *this)
     {
         if (existingFabric.GetFabricId() == fabricId)
         {
-            P256PublicKeySpan existingRootKey, newRootKey;
-            ReturnErrorOnFailure(existingFabric.GetRootPubkey(existingRootKey));
-            ReturnErrorOnFailure(newFabric.GetRootPubkey(newRootKey));
-            if (existingRootKey.data_equal(newRootKey))
+            P256PublicKey existingRootKey, newRootKey;
+            ReturnErrorOnFailure(existingFabric.FetchRootPubkey(existingRootKey));
+            ReturnErrorOnFailure(newFabric.FetchRootPubkey(newRootKey));
+
+            if (existingRootKey.Matches(newRootKey))
             {
                 return CHIP_ERROR_FABRIC_EXISTS;
             }
@@ -666,7 +724,53 @@ CHIP_ERROR FabricTable::AddNewFabric(FabricInfo & newFabric, FabricIndex * outpu
     return AddNewFabricInner(newFabric, outputIndex);
 }
 
-CHIP_ERROR FabricTable::AddNewFabricInner(FabricInfo & newFabric, FabricIndex * outputIndex)
+/*
+ * A validation policy we can pass into VerifyCredentials to extract the
+ * latest NotBefore time in the certificate chain without having to load the
+ * certificates into memory again, and one which will pass validation for all
+ * questions of NotBefore / NotAfter validity.
+ *
+ * The rationale is that installed certificates should be valid at the time of
+ * installation by definition.  If they are not and the commissionee and
+ * commissioner disagree enough on current time, CASE will fail and our
+ * fail-safe timer will expire.
+ *
+ * This then is ultimately how we validate that NotBefore / NotAfter in
+ * newly installed certificates is workable.
+ */
+class NotBeforeCollector : public Credentials::CertificateValidityPolicy
+{
+public:
+    NotBeforeCollector() : mLatestNotBefore(0) {}
+    CHIP_ERROR ApplyCertificateValidityPolicy(const ChipCertificateData * cert, uint8_t depth,
+                                              CertificateValidityResult result) override
+    {
+        if (cert->mNotBeforeTime > mLatestNotBefore.count())
+        {
+            mLatestNotBefore = System::Clock::Seconds32(cert->mNotBeforeTime);
+        }
+        return CHIP_NO_ERROR;
+    }
+    System::Clock::Seconds32 mLatestNotBefore;
+};
+
+CHIP_ERROR FabricTable::UpdateFabric(FabricIndex fabricIndex, FabricInfo & newFabricInfo)
+{
+    FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
+    VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    NotBeforeCollector notBeforeCollector;
+    ReturnErrorOnFailure(fabricInfo->SetFabricInfo(newFabricInfo, &notBeforeCollector));
+    ReturnErrorOnFailure(Store(fabricIndex));
+    // Update failure of Last Known Good Time is non-fatal.  If Last
+    // Known Good Time is unknown during incoming certificate validation
+    // for CASE and current time is also unknown, the certificate
+    // validity policy will see this condition and can act appropriately.
+    mLastKnownGoodTime.UpdateLastKnownGoodChipEpochTime(notBeforeCollector.mLatestNotBefore);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR
+FabricTable::AddNewFabricInner(FabricInfo & newFabric, FabricIndex * outputIndex)
 {
     if (!mNextAvailableFabricIndex.HasValue())
     {
@@ -679,10 +783,11 @@ CHIP_ERROR FabricTable::AddNewFabricInner(FabricInfo & newFabric, FabricIndex *
     {
         if (!fabric.IsInitialized())
         {
+            NotBeforeCollector notBeforeCollector;
             FabricIndex newFabricIndex = mNextAvailableFabricIndex.Value();
             fabric.mFabricIndex        = newFabricIndex;
-            CHIP_ERROR err             = fabric.SetFabricInfo(newFabric);
-            if (err != CHIP_NO_ERROR)
+            CHIP_ERROR err;
+            if ((err = fabric.SetFabricInfo(newFabric, &notBeforeCollector)) != CHIP_NO_ERROR)
             {
                 fabric.Reset();
                 return err;
@@ -697,8 +802,12 @@ CHIP_ERROR FabricTable::AddNewFabricInner(FabricInfo & newFabric, FabricIndex *
             }
 
             UpdateNextAvailableFabricIndex();
-            err = StoreFabricIndexInfo();
-            if (err != CHIP_NO_ERROR)
+            // Update failure of Last Known Good Time is non-fatal.  If Last
+            // Known Good Time is unknown during incoming certificate validation
+            // for CASE and current time is also unknown, the certificate
+            // validity policy will see this condition and can act appropriately.
+            mLastKnownGoodTime.UpdateLastKnownGoodChipEpochTime(notBeforeCollector.mLatestNotBefore);
+            if ((err = StoreFabricIndexInfo()) != CHIP_NO_ERROR)
             {
                 // Roll everything back.
                 mNextAvailableFabricIndex.SetValue(newFabricIndex);
@@ -724,13 +833,29 @@ CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex)
     FabricInfo * fabric      = FindFabricWithIndex(fabricIndex);
     bool fabricIsInitialized = fabric != nullptr && fabric->IsInitialized();
     CHIP_ERROR err           = FabricInfo::DeleteFromStorage(mStorage, fabricIndex); // Delete from storage regardless
+
+    CHIP_ERROR opKeyErr = CHIP_NO_ERROR;
+    if (mOperationalKeystore != nullptr)
+    {
+        opKeyErr = mOperationalKeystore->RemoveOpKeypairForFabric(fabricIndex);
+        // Not having found data is not an error, we may just have gotten here
+        // on a fail-safe expiry after `RevertPendingFabricData`.
+        if (opKeyErr == CHIP_ERROR_INVALID_FABRIC_INDEX)
+        {
+            opKeyErr = CHIP_NO_ERROR;
+        }
+    }
+
     if (!fabricIsInitialized)
     {
         // Make sure to return the error our API promises, not whatever storage
         // chose to return.
         return CHIP_ERROR_NOT_FOUND;
     }
+
+    // TODO: The error chain below can cause partial state storage. We must refactor.
     ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(opKeyErr);
 
     // Since fabricIsInitialized was true, fabric is not null.
     fabric->Reset();
@@ -755,12 +880,12 @@ CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex)
     {
         if (mFabricCount == 0)
         {
-            ChipLogError(Discovery, "Trying to delete a fabric, but the current fabric count is already 0");
+            ChipLogError(FabricProvisioning, "Trying to delete a fabric, but the current fabric count is already 0");
         }
         else
         {
             mFabricCount--;
-            ChipLogProgress(Discovery, "Fabric (0x%x) deleted. Calling OnFabricDeletedFromStorage",
+            ChipLogProgress(FabricProvisioning, "Fabric (0x%x) deleted. Calling OnFabricDeletedFromStorage",
                             static_cast<unsigned>(fabricIndex));
         }
 
@@ -788,7 +913,7 @@ CHIP_ERROR FabricTable::Init(PersistentStorageDelegate * storage)
     VerifyOrReturnError(storage != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     mStorage = storage;
-    ChipLogDetail(Discovery, "Init fabric pairing table with server storage");
+    ChipLogDetail(FabricProvisioning, "Initializing FabricTable from persistent storage");
 
     // Load the current fabrics from the storage. This is done here, since ConstFabricIterator
     // iterator doesn't have mechanism to load fabric info from storage on demand.
@@ -802,6 +927,12 @@ CHIP_ERROR FabricTable::Init(PersistentStorageDelegate * storage)
     }
     mNextAvailableFabricIndex.SetValue(kMinValidFabricIndex);
 
+    // Init failure of Last Known Good Time is non-fatal.  If Last Known Good
+    // Time is unknown during incoming certificate validation for CASE and
+    // current time is also unknown, the certificate validity policy will see
+    // this condition and can act appropriately.
+    mLastKnownGoodTime.Init(storage);
+
     uint8_t buf[IndexInfoTLVMaxSize()];
     uint16_t size = sizeof(buf);
     DefaultStorageKeyAllocator keyAlloc;
@@ -822,6 +953,12 @@ CHIP_ERROR FabricTable::Init(PersistentStorageDelegate * storage)
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR FabricTable::Init(PersistentStorageDelegate * storage, OperationalKeystore * operationalKeystore)
+{
+    mOperationalKeystore = operationalKeystore;
+    return Init(storage);
+}
+
 CHIP_ERROR FabricTable::AddFabricDelegate(FabricTable::Delegate * delegate)
 {
     VerifyOrReturnError(delegate != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -868,6 +1005,56 @@ void FabricTable::RemoveFabricDelegate(FabricTable::Delegate * delegateToRemove)
     }
 }
 
+CHIP_ERROR FabricTable::SetLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    // Find our latest NotBefore time for any installed certificate.
+    System::Clock::Seconds32 latestNotBefore = System::Clock::Seconds32(0);
+    for (auto & fabric : mStates)
+    {
+        if (!fabric.IsInitialized())
+        {
+            continue;
+        }
+        {
+            uint8_t rcacBuf[kMaxCHIPCertLength];
+            MutableByteSpan rcacSpan{ rcacBuf };
+            SuccessOrExit(err = fabric.FetchRootCert(rcacSpan));
+            chip::System::Clock::Seconds32 rcacNotBefore;
+            SuccessOrExit(err = Credentials::ExtractNotBeforeFromChipCert(rcacSpan, rcacNotBefore));
+            latestNotBefore = rcacNotBefore > latestNotBefore ? rcacNotBefore : latestNotBefore;
+        }
+        {
+            uint8_t icacBuf[kMaxCHIPCertLength];
+            MutableByteSpan icacSpan{ icacBuf };
+            SuccessOrExit(err = fabric.FetchICACert(icacSpan));
+            if (!icacSpan.empty())
+            {
+                chip::System::Clock::Seconds32 icacNotBefore;
+                ReturnErrorOnFailure(Credentials::ExtractNotBeforeFromChipCert(icacSpan, icacNotBefore));
+                latestNotBefore = icacNotBefore > latestNotBefore ? icacNotBefore : latestNotBefore;
+            }
+        }
+        {
+            uint8_t nocBuf[kMaxCHIPCertLength];
+            MutableByteSpan nocSpan{ nocBuf };
+            SuccessOrExit(err = fabric.FetchNOCCert(nocSpan));
+            chip::System::Clock::Seconds32 nocNotBefore;
+            ReturnErrorOnFailure(Credentials::ExtractNotBeforeFromChipCert(nocSpan, nocNotBefore));
+            latestNotBefore = nocNotBefore > latestNotBefore ? nocNotBefore : latestNotBefore;
+        }
+    }
+    // Pass this to the LastKnownGoodTime object so it can make determination
+    // of the legality of our new proposed time.
+    SuccessOrExit(err = mLastKnownGoodTime.SetLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime, latestNotBefore));
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(FabricProvisioning, "Failed to update Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    return err;
+}
+
 namespace {
 // Increment a fabric index in a way that ensures that it stays in the valid
 // range [kMinValidFabricIndex, kMaxValidFabricIndex].
@@ -923,7 +1110,6 @@ CHIP_ERROR FabricTable::StoreFabricIndexInfo() const
     {
         writer.Put(TLV::AnonymousTag(), fabric.GetFabricIndex());
     }
-
     ReturnErrorOnFailure(writer.EndContainer(innerContainerType));
     ReturnErrorOnFailure(writer.EndContainer(outerType));
 
@@ -936,6 +1122,21 @@ CHIP_ERROR FabricTable::StoreFabricIndexInfo() const
     return CHIP_NO_ERROR;
 }
 
+void FabricTable::EnsureNextAvailableFabricIndexUpdated()
+{
+    if (!mNextAvailableFabricIndex.HasValue() && mFabricCount < kMaxValidFabricIndex)
+    {
+        // We must have a fabric index available here. This situation could
+        // happen if we fail to store fabric index info when deleting a
+        // fabric.
+        mNextAvailableFabricIndex.SetValue(kMinValidFabricIndex);
+        if (FindFabricWithIndex(kMinValidFabricIndex))
+        {
+            UpdateNextAvailableFabricIndex();
+        }
+    }
+}
+
 CHIP_ERROR FabricTable::ReadFabricInfo(TLV::ContiguousBufferTLVReader & reader)
 {
     ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Structure, TLV::AnonymousTag()));
@@ -987,43 +1188,137 @@ CHIP_ERROR FabricTable::ReadFabricInfo(TLV::ContiguousBufferTLVReader & reader)
     }
 
     ReturnErrorOnFailure(reader.ExitContainer(arrayType));
+
     ReturnErrorOnFailure(reader.ExitContainer(containerType));
     ReturnErrorOnFailure(reader.VerifyEndOfContainer());
 
-    if (!mNextAvailableFabricIndex.HasValue() && mFabricCount < kMaxValidFabricIndex)
+    EnsureNextAvailableFabricIndexUpdated();
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FabricTable::SignWithOpKeypair(FabricIndex fabricIndex, ByteSpan message, P256ECDSASignature & outSignature) const
+{
+    const FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
+    VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_KEY_NOT_FOUND);
+
+    if (fabricInfo->HasOperationalKey())
     {
-        // We must have a fabric index available here. This situation could
-        // happen if we fail to store fabric index info when deleting a
-        // fabric.
-        mNextAvailableFabricIndex.SetValue(kMinValidFabricIndex);
-        if (FindFabricWithIndex(kMinValidFabricIndex))
-        {
-            UpdateNextAvailableFabricIndex();
-        }
+        // Legacy case of manually injected FabricInfo: delegate to FabricInfo directly
+        return fabricInfo->SignWithOpKeypair(message, outSignature);
+    }
+    if (mOperationalKeystore != nullptr)
+    {
+        return mOperationalKeystore->SignWithOpKeypair(fabricIndex, message, outSignature);
     }
 
-    return CHIP_NO_ERROR;
+    return CHIP_ERROR_KEY_NOT_FOUND;
 }
 
-CHIP_ERROR FabricInfo::TestOnlyBuildFabric(ByteSpan rootCert, ByteSpan icacCert, ByteSpan nocCert, ByteSpan nocKey)
+bool FabricTable::HasPendingOperationalKey() const
 {
-    Reset();
+    // We can only manage commissionable pending fail-safe state if we have a keystore
+    return (mOperationalKeystore != nullptr) ? mOperationalKeystore->HasPendingOpKeypair() : false;
+}
 
-    ReturnErrorOnFailure(SetRootCert(rootCert));
-    ReturnErrorOnFailure(SetICACert(icacCert));
-    ReturnErrorOnFailure(SetNOCCert(nocCert));
+CHIP_ERROR FabricTable::AllocatePendingOperationalKey(Optional<FabricIndex> fabricIndex, MutableByteSpan & outputCsr)
+{
+    // We can only manage commissionable pending fail-safe state if we have a keystore
+    VerifyOrReturnError(mOperationalKeystore != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
-    // NOTE: this requres ENABLE_HSM_CASE_OPS_KEY is not defined
-    P256SerializedKeypair opKeysSerialized;
-    memcpy(static_cast<uint8_t *>(opKeysSerialized), nocKey.data(), nocKey.size());
-    ReturnErrorOnFailure(opKeysSerialized.SetLength(nocKey.size()));
+    // We can only allocate a pending key if no pending state (NOC, ICAC) already present,
+    // since there can only be one pending state per fail-safe.
+    VerifyOrReturnError(!mIsPendingFabricDataPresent, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(outputCsr.size() >= Crypto::kMAX_CSR_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
 
-    P256Keypair opKey;
-    ReturnErrorOnFailure(opKey.Deserialize(opKeysSerialized));
-    ReturnErrorOnFailure(SetOperationalKeypair(&opKey));
+    EnsureNextAvailableFabricIndexUpdated();
 
-    // NOTE: mVendorId and mFabricLabel are not initialize, because they are not used in tests.
-    return CHIP_NO_ERROR;
+    if (fabricIndex.HasValue())
+    {
+        // Fabric udpate case (e.g. UpdateNOC): we already know the fabric index
+        mFabricIndexWithPendingState = fabricIndex.Value();
+    }
+    else if (mNextAvailableFabricIndex.HasValue())
+    {
+        // Fabric addition case (e.g. AddNOC): we need to allocate for the next pending fabric index
+        mFabricIndexWithPendingState = mNextAvailableFabricIndex.Value();
+    }
+    else
+    {
+        // Fabric addition, but adding NOC would fail on table full: let's not allocate a key
+        mFabricIndexWithPendingState = kUndefinedFabricIndex;
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    VerifyOrReturnError(IsValidFabricIndex(mFabricIndexWithPendingState), CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    return mOperationalKeystore->NewOpKeypairForFabric(mFabricIndexWithPendingState, outputCsr);
+}
+
+CHIP_ERROR FabricTable::ActivatePendingOperationalKey(const Crypto::P256PublicKey & nocSubjectPublicKey)
+{
+    // We can only manage commissionable pending fail-safe state if we have a keystore
+    VerifyOrReturnError(mOperationalKeystore != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    VerifyOrReturnError(!mIsPendingFabricDataPresent, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(IsValidFabricIndex(mFabricIndexWithPendingState), CHIP_ERROR_INCORRECT_STATE);
+
+    CHIP_ERROR err = mOperationalKeystore->ActivateOpKeypairForFabric(mFabricIndexWithPendingState, nocSubjectPublicKey);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        // TODO: Refactor to set mIsPendingFabricDataPresent to true more "directly" when a NOC add/update for
+        //       pending fabric occurs. Can only be done when we have shadow fabric.
+        mIsPendingFabricDataPresent = true;
+    }
+
+    return err;
+}
+
+// Currently only operational key and last known good time are managed by this API.
+CHIP_ERROR FabricTable::CommitPendingFabricData()
+{
+    // We can only manage commissionable pending fail-safe state if we have a keystore
+    VerifyOrReturnError(mOperationalKeystore != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    // If there was nothing pending, it's no-op success.
+    if (!mIsPendingFabricDataPresent)
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    VerifyOrReturnError(IsValidFabricIndex(mFabricIndexWithPendingState), CHIP_ERROR_INCORRECT_STATE);
+
+    CHIP_ERROR err = mOperationalKeystore->CommitOpKeypairForFabric(mFabricIndexWithPendingState);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        mIsPendingFabricDataPresent  = false;
+        mFabricIndexWithPendingState = kUndefinedFabricIndex;
+    }
+
+    CHIP_ERROR lkgtErr = CommitLastKnownGoodChipEpochTime();
+    if (lkgtErr != CHIP_NO_ERROR)
+    {
+        ChipLogError(FabricProvisioning, "Failed to commit Last Known Good Time: %" CHIP_ERROR_FORMAT, lkgtErr.Format());
+    }
+
+    return err;
+}
+
+void FabricTable::RevertPendingFabricData()
+{
+    if (mIsPendingFabricDataPresent)
+    {
+        ChipLogError(FabricProvisioning, "Reverting pending fabric data for fabric 0x%u",
+                     static_cast<unsigned>(mFabricIndexWithPendingState));
+    }
+
+    mIsPendingFabricDataPresent  = false;
+    mFabricIndexWithPendingState = kUndefinedFabricIndex;
+
+    VerifyOrReturn(mOperationalKeystore != nullptr);
+    mOperationalKeystore->RevertPendingKeypair();
 }
 
 } // namespace chip
diff --git a/src/credentials/FabricTable.h b/src/credentials/FabricTable.h
index e131dffb8e31e5..23968dc684093c 100644
--- a/src/credentials/FabricTable.h
+++ b/src/credentials/FabricTable.h
@@ -25,7 +25,11 @@
 
 #include <app/util/basic-types.h>
 #include <credentials/CHIPCert.h>
+#include <credentials/CHIPCertificateSet.h>
+#include <credentials/CertificateValidityPolicy.h>
+#include <credentials/LastKnownGoodTime.h>
 #include <crypto/CHIPCryptoPAL.h>
+#include <crypto/OperationalKeystore.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>
 #if CHIP_CRYPTO_HSM
 #include <crypto/hsm/CHIPCryptoPALHsm.h>
@@ -41,26 +45,12 @@
 
 namespace chip {
 
-static constexpr FabricIndex kMinValidFabricIndex = 1;
-static constexpr FabricIndex kMaxValidFabricIndex = UINT8_MAX - 1;
-
-static_assert(kMinValidFabricIndex <= CHIP_CONFIG_MAX_FABRICS, "Must support some fabrics.");
-static_assert(CHIP_CONFIG_MAX_FABRICS <= kMaxValidFabricIndex, "Max fabric count out of range.");
-
 static constexpr uint8_t kFabricLabelMaxLengthInBytes = 32;
 
 static_assert(kUndefinedFabricIndex < chip::kMinValidFabricIndex, "Undefined fabric index should not be valid");
 
 /**
- * Defines state of a pairing established by a fabric.
- * Node ID is only settable using the device operational credentials.
- *
- * Information contained within the state:
- *   - Fabric identification
- *   - Node Id assigned by the fabric to the device
- *   - Vendor Id
- *   - Fabric Id
- *   - Device operational credentials
+ * Provides access to the core metadata for a given fabric to which a node is joined.
  */
 class DLL_EXPORT FabricInfo
 {
@@ -109,8 +99,6 @@ class DLL_EXPORT FabricInfo
 
     void SetVendorId(uint16_t vendorId) { mVendorId = vendorId; }
 
-    Crypto::P256Keypair * GetOperationalKey() const { return mOperationalKey; }
-
     /**
      * Sets the P256Keypair used for this fabric.  This will make a copy of the keypair
      * via the P256Keypair::Serialize and P256Keypair::Deserialize methods.
@@ -137,9 +125,6 @@ class DLL_EXPORT FabricInfo
      */
     CHIP_ERROR SetExternallyOwnedOperationalKeypair(Crypto::P256Keypair * keyPair);
 
-    // TODO - Update these APIs to take ownership of the buffer, instead of copying
-    //        internally.
-    // TODO - Optimize persistent storage of NOC and Root Cert in FabricInfo.
     CHIP_ERROR SetRootCert(const chip::ByteSpan & cert) { return SetCert(mRootCert, cert); }
     CHIP_ERROR SetICACert(const chip::ByteSpan & cert) { return SetCert(mICACert, cert); }
     CHIP_ERROR SetICACert(const Optional<ByteSpan> & cert) { return SetICACert(cert.ValueOr(ByteSpan())); }
@@ -147,38 +132,7 @@ class DLL_EXPORT FabricInfo
 
     bool IsInitialized() const { return IsOperationalNodeId(mOperationalId.GetNodeId()); }
 
-    // TODO - Refactor storing and loading of fabric info from persistent storage.
-    //        The op cert array doesn't need to be in RAM except when it's being
-    //        transmitted to peer node during CASE session setup.
-    CHIP_ERROR GetRootCert(ByteSpan & cert) const
-    {
-        ReturnErrorCodeIf(mRootCert.empty(), CHIP_ERROR_INCORRECT_STATE);
-        cert = mRootCert;
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR GetICACert(ByteSpan & cert) const
-    {
-        cert = mICACert;
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR GetNOCCert(ByteSpan & cert) const
-    {
-        ReturnErrorCodeIf(mNOCCert.empty(), CHIP_ERROR_INCORRECT_STATE);
-        cert = mNOCCert;
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR GetTrustedRootId(Credentials::CertificateKeyId & skid) const
-    {
-        return Credentials::ExtractSKIDFromChipCert(mRootCert, skid);
-    }
-
-    CHIP_ERROR GetRootPubkey(Credentials::P256PublicKeySpan & publicKey) const
-    {
-        return Credentials::ExtractPublicKeyFromChipCert(mRootCert, publicKey);
-    }
+    bool HasOperationalKey() const { return mOperationalKey != nullptr; }
 
     // Verifies credentials, using this fabric info's root certificate.
     CHIP_ERROR VerifyCredentials(const ByteSpan & noc, const ByteSpan & icac, Credentials::ValidationContext & context,
@@ -189,6 +143,15 @@ class DLL_EXPORT FabricInfo
                                         Credentials::ValidationContext & context, PeerId & nocPeerId, FabricId & fabricId,
                                         Crypto::P256PublicKey & nocPubkey);
 
+    // Validate an NOC chain at time of adding/updating a fabric (uses VerifyCredentials with additional checks).
+    // The `existingFabricId` is passed for UpdateNOC, and must match the Fabric, to make sure that we are
+    // not trying to change FabricID with UpdateNOC. If set to kUndefinedFabricId, we are doing AddNOC and
+    // we don't need to check match to pre-existing fabric.
+    static CHIP_ERROR ValidateIncomingNOCChain(const ByteSpan & noc, const ByteSpan & icac, const ByteSpan & rcac,
+                                               FabricId existingFabricId, Credentials::CertificateValidityPolicy * policy,
+                                               PeerId & outOperationalId, FabricId & outFabricId,
+                                               Crypto::P256PublicKey & outNocPubkey);
+
     /**
      *  Reset the state to a completely uninitialized status.
      */
@@ -208,19 +171,62 @@ class DLL_EXPORT FabricInfo
         mFabricIndex = kUndefinedFabricIndex;
     }
 
-    CHIP_ERROR SetFabricInfo(FabricInfo & fabric);
+    /**
+     * Verify the validity of the passed fabric info, and then emplace into
+     * this.  If a policy is passed, enact this for the fabric info validation.
+     *
+     * @param newFabric fabric to emplace into this
+     * @param policy validation policy to apply, or nulllptr for none
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR SetFabricInfo(FabricInfo & newFabric, Credentials::CertificateValidityPolicy * policy);
 
     /* Generate a compressed peer ID (containing compressed fabric ID) using provided fabric ID, node ID and
        root public key of the provided root certificate. The generated compressed ID is returned via compressedPeerId
        output parameter */
     static CHIP_ERROR GeneratePeerId(const ByteSpan & rcac, FabricId fabricId, NodeId nodeId, PeerId * compressedPeerId);
 
-    friend class FabricTable;
-
     // Test-only, build a fabric using given root cert and NOC
     CHIP_ERROR TestOnlyBuildFabric(ByteSpan rootCert, ByteSpan icacCert, ByteSpan nocCert, ByteSpan nocKey);
 
-private:
+    friend class FabricTable;
+
+protected:
+    /**
+     * @brief Sign a message with the fabric's operational private key. This ONLY
+     *        works if `SetOperationalKeypair` or `SetExternallyOwnedOperationalKeypair`
+     *        had been called and is an API that is present ONLY to be called by FabricTable.
+     *
+     * @param message - message to sign
+     * @param outSignature - buffer to hold the signature
+     * @return CHIP_NO_ERROR on success or another CHIP_ERROR on crypto internal errors
+     */
+    CHIP_ERROR SignWithOpKeypair(ByteSpan message, Crypto::P256ECDSASignature & outSignature) const;
+
+    CHIP_ERROR FetchRootCert(MutableByteSpan & outCert) const
+    {
+        ReturnErrorCodeIf(mRootCert.empty(), CHIP_ERROR_INCORRECT_STATE);
+        return CopySpanToMutableSpan(mRootCert, outCert);
+    }
+
+    CHIP_ERROR FetchICACert(MutableByteSpan & outCert) const
+    {
+        if (mICACert.empty())
+        {
+            outCert.reduce_size(0);
+            return CHIP_NO_ERROR;
+        }
+        return CopySpanToMutableSpan(mICACert, outCert);
+    }
+
+    CHIP_ERROR FetchNOCCert(MutableByteSpan & outCert) const
+    {
+        ReturnErrorCodeIf(mNOCCert.empty(), CHIP_ERROR_INCORRECT_STATE);
+        return CopySpanToMutableSpan(mNOCCert, outCert);
+    }
+
+    CHIP_ERROR FetchRootPubkey(Crypto::P256PublicKey & outPublicKey) const;
+
     static constexpr size_t MetadataTLVMaxSize()
     {
         return TLV::EstimateStructOverhead(sizeof(VendorId), kFabricLabelMaxLengthInBytes);
@@ -389,14 +395,73 @@ class DLL_EXPORT FabricTable
     // test-cases
     CHIP_ERROR AddNewFabricForTest(FabricInfo & newFabric, FabricIndex * outputIndex);
 
-    FabricInfo * FindFabric(Credentials::P256PublicKeySpan rootPubKey, FabricId fabricId);
+    /**
+     * Update fabric at the specified fabric index with the passed fabric info.
+     *
+     * @param fabricIndex index at which to update fabric info
+     * @param fabricInfo fabric info to validate and copy into the specified index
+     * @return CHIP_NO_ERROR on success, an appropriate CHIP_ERROR on failure
+     */
+    CHIP_ERROR UpdateFabric(FabricIndex fabricIndex, FabricInfo & fabricInfo);
+
+    FabricInfo * FindFabric(const Crypto::P256PublicKey & rootPubKey, FabricId fabricId);
     FabricInfo * FindFabricWithIndex(FabricIndex fabricIndex);
+    const FabricInfo * FindFabricWithIndex(FabricIndex fabricIndex) const;
     FabricInfo * FindFabricWithCompressedId(CompressedFabricId fabricId);
 
     CHIP_ERROR Init(PersistentStorageDelegate * storage);
+    CHIP_ERROR Init(PersistentStorageDelegate * storage, Crypto::OperationalKeystore * operationalKeystore);
+
     CHIP_ERROR AddFabricDelegate(FabricTable::Delegate * delegate);
     void RemoveFabricDelegate(FabricTable::Delegate * delegate);
 
+    /**
+     * Get the current Last Known Good Time.
+     *
+     * @param lastKnownGoodChipEpochTime (out) the current last known good time, if any is known
+     * @return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR GetLastKnownGoodChipEpochTime(System::Clock::Seconds32 & lastKnownGoodChipEpochTime) const
+    {
+        return mLastKnownGoodTime.GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime);
+    }
+
+    /**
+     * Validate that the passed Last Known Good Time is within bounds and then
+     * store this and write back to storage.  Legal values are those which are
+     * not earlier than firmware build time or any of our stored certificates'
+     * NotBefore times:
+     *
+     *    3.5.6.1. Last Known Good UTC Time
+     *
+     *    A Node MAY adjust the Last Known Good UTC Time backwards if it
+     *    believes the current Last Known Good UTC Time is incorrect and it has
+     *    a good time value from a trusted source. The Node SHOULD NOT adjust
+     *    the Last Known Good UTC to a time before the later of:
+     *      • The build timestamp of its currently running software image
+     *      • The not-before timestamp of any of its operational certificates
+     *
+     * @param lastKnownGoodChipEpochTime Last Known Good Time in seconds since CHIP epoch
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR SetLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime);
+
+    /*
+     * Commit the Last Known Good Time by deleting the fail-safe backup from
+     * storage.
+     *
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR CommitLastKnownGoodChipEpochTime() { return mLastKnownGoodTime.CommitLastKnownGoodChipEpochTime(); }
+
+    /*
+     * Revert the Last Known Good Time to the fail-safe backup value in
+     * persistence if any exists.
+     *
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR RevertLastKnownGoodChipEpochTime() { return mLastKnownGoodTime.RevertLastKnownGoodChipEpochTime(); }
+
     uint8_t FabricCount() const { return mFabricCount; }
 
     ConstFabricIterator cbegin() const { return ConstFabricIterator(mStates, 0, CHIP_CONFIG_MAX_FABRICS); }
@@ -404,6 +469,91 @@ class DLL_EXPORT FabricTable
     ConstFabricIterator begin() const { return cbegin(); }
     ConstFabricIterator end() const { return cend(); }
 
+    CHIP_ERROR FetchRootCert(FabricIndex fabricIndex, MutableByteSpan & outCert) const;
+    CHIP_ERROR FetchICACert(FabricIndex fabricIndex, MutableByteSpan & outCert) const;
+    CHIP_ERROR FetchNOCCert(FabricIndex fabricIndex, MutableByteSpan & outCert) const;
+    CHIP_ERROR FetchRootPubkey(FabricIndex fabricIndex, Crypto::P256PublicKey & outPublicKey) const;
+
+    /**
+     * @brief Sign a message with a given fabric's operational keypair. This is used for
+     *        CASE and the only way the key should be used.
+     *
+     * This will use a pending key activated with `ActivatePendingOperationalKey` but
+     * not yet persisted, if one is available for the fabric.
+     *
+     * @param fabricIndex - Fabric index whose operational key touse
+     * @param message - Message to sign
+     * @param outSignature - Signature object to receive the signature
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if no active key is found for the given `fabricIndex` or if
+     *                                         `fabricIndex` is invalid.
+     * @retval other CHIP_ERROR value on internal errors
+     */
+    CHIP_ERROR SignWithOpKeypair(FabricIndex fabricIndex, ByteSpan message, Crypto::P256ECDSASignature & outSignature) const;
+
+    /**
+     * This initializes a new keypair for the given fabric and generates a CSR for it,
+     * so that it can be passed in a CSRResponse.
+     *
+     * The keypair is temporary and becomes usable for `SignWithOpKeypair` only after either
+     * `ActivatePendingOperationalKey` is called. It is destroyed if
+     * `RevertPendingFabricData` is called before `CommitPendingFabricData`.
+     *  If a pending keypair for the provided fabricIndex (if present) already existed, it is replaced by this call.
+     *
+     *  Only one pending operational keypair is supported at a time.
+     *
+     * @param fabricIndex - Existing FabricIndex for which a new keypair must be made available. If it
+     *                      doesn't have a value, the key will be marked pending for the next available
+     *                      fabric index that would apply for `AddNewFabric`.
+     * @param outputCsr - Buffer to contain the CSR. Must be at least `kMAX_CSR_Length` large.
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_BUFFER_TOO_SMALL if `outputCsr` buffer is too small
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is already a pending keypair for another `fabricIndex` value
+     *                                         or if fabricIndex is an invalid value.
+     * @retval other CHIP_ERROR value on internal errors
+     */
+    CHIP_ERROR AllocatePendingOperationalKey(Optional<FabricIndex> fabricIndex, MutableByteSpan & outputCsr);
+
+    /**
+     * @brief Temporarily activates the operational keypair last generated with `AllocatePendingOperationalKey`,
+     *        so that `SignWithOpKeypair` starts using it, but only if it matches the public key passed
+     *        in `nocSubjectPublicKey` gotten from a matching NOC.
+     *
+     * This is to be used by AddNOC and UpdateNOC so that a prior key generated by AllocatePendingOperationalKey
+     * can be used for CASE while not committing it yet to permanent storage to remain after fail-safe.
+     *
+     * @param nocSubjectPublicKey - Subject public key associated with an incoming NOC
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is no pending operational keypair
+     * @retval CHIP_ERROR_INVALID_PUBLIC_KEY if `nocSubjectPublicKey` does not match the public key associated
+     *                                       with the key pair from last `AllocatePendingOperationalKey`.
+     * @retval other CHIP_ERROR value on internal errors
+     */
+    CHIP_ERROR ActivatePendingOperationalKey(const Crypto::P256PublicKey & nocSubjectPublicKey);
+
+    /**
+     * @brief Returns whether an operational key is pending (true if `AllocatePendingOperationalKey` was
+     *        previously successfully called, false otherwise
+     */
+    bool HasPendingOperationalKey() const;
+
+    /**
+     * @brief Commit any pending temporary FabricTable state. This is used mostly for affecting
+     *        CommissioningComplete.
+     *
+     * @return CHIP_NO_ERROR on success or any toher CHIO_ERROR value on internal errors
+     */
+    CHIP_ERROR CommitPendingFabricData();
+
+    /**
+     * @brief Revert any pending state. This is used to handle fail-safe expiry of partially
+     *        configured fabrics.
+     */
+    void RevertPendingFabricData();
+
 private:
     static constexpr size_t IndexInfoTLVMaxSize()
     {
@@ -423,6 +573,13 @@ class DLL_EXPORT FabricTable
      */
     void UpdateNextAvailableFabricIndex();
 
+    /**
+     * Ensure that we have a valid next available fabric index, if that's at all possible.  This covers
+     * some FabricIndex allocation corner cases.  After this is called, the only way we can fail to have
+     * a next available fabric index is if our fabric table is max-sized (254 entries) and full.
+     */
+    void EnsureNextAvailableFabricIndexUpdated();
+
     /**
      * Store our current fabric index state: what our next available index is
      * and what indices we're using right now.
@@ -438,7 +595,8 @@ class DLL_EXPORT FabricTable
     CHIP_ERROR AddNewFabricInner(FabricInfo & fabric, FabricIndex * assignedIndex);
 
     FabricInfo mStates[CHIP_CONFIG_MAX_FABRICS];
-    PersistentStorageDelegate * mStorage = nullptr;
+    PersistentStorageDelegate * mStorage               = nullptr;
+    Crypto::OperationalKeystore * mOperationalKeystore = nullptr;
 
     // FabricTable::Delegate link to first node, since FabricTable::Delegate is a form
     // of intrusive linked-list item.
@@ -448,6 +606,16 @@ class DLL_EXPORT FabricTable
     // it can go and is full.
     Optional<FabricIndex> mNextAvailableFabricIndex;
     uint8_t mFabricCount = 0;
+
+    // If true, we are in the process of a fail-safe and there was at least one
+    // operation that caused partial data in the fabric table.
+    bool mIsPendingFabricDataPresent = false;
+
+    // When mIsPendingFabricDataPresent is true, this holds the index of the fabric
+    // for which there is currently pending data.
+    FabricIndex mFabricIndexWithPendingState = kUndefinedFabricIndex;
+
+    LastKnownGoodTime mLastKnownGoodTime;
 };
 
 } // namespace chip
diff --git a/src/credentials/GroupDataProviderImpl.cpp b/src/credentials/GroupDataProviderImpl.cpp
index c5d65bfcb6e850..4c56a0943d2670 100644
--- a/src/credentials/GroupDataProviderImpl.cpp
+++ b/src/credentials/GroupDataProviderImpl.cpp
@@ -1187,11 +1187,15 @@ CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index,
         prev.next = endpoint.next;
         ReturnErrorOnFailure(prev.Save(mStorage));
     }
-    if (group.endpoint_count > 0)
+
+    if (group.endpoint_count > 1)
     {
         group.endpoint_count--;
+        return group.Save(mStorage);
     }
-    return group.Save(mStorage);
+
+    // No more endpoints, remove the group
+    return RemoveGroupInfoAt(fabric_index, group.index);
 }
 
 CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index, chip::EndpointId endpoint_id)
diff --git a/src/credentials/LastKnownGoodTime.cpp b/src/credentials/LastKnownGoodTime.cpp
new file mode 100644
index 00000000000000..18644a89546766
--- /dev/null
+++ b/src/credentials/LastKnownGoodTime.cpp
@@ -0,0 +1,267 @@
+/*
+ *
+ *    Copyright (c) 2021-2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @brief Defines a table of fabrics that have provisioned the device.
+ */
+
+#include "LastKnownGoodTime.h"
+
+#include <lib/support/BufferWriter.h>
+#include <lib/support/DefaultStorageKeyAllocator.h>
+#include <lib/support/SafeInt.h>
+#include <platform/ConfigurationManager.h>
+
+namespace chip {
+
+namespace {
+// Tags for Last Known Good Time.
+constexpr TLV::Tag kLastKnownGoodChipEpochSecondsTag         = TLV::ContextTag(0);
+constexpr TLV::Tag kFailSafeLastKnownGoodChipEpochSecondsTag = TLV::ContextTag(1);
+} // anonymous namespace
+
+void LastKnownGoodTime::LogTime(const char * msg, System::Clock::Seconds32 chipEpochTime)
+{
+    char buf[26] = { 0 }; // strlen("00000-000-000T000:000:000") == 25
+    uint16_t year;
+    uint8_t month;
+    uint8_t day;
+    uint8_t hour;
+    uint8_t minute;
+    uint8_t second;
+    ChipEpochToCalendarTime(chipEpochTime.count(), year, month, day, hour, minute, second);
+    snprintf(buf, sizeof(buf), "%04u-%02u-%02uT%02u:%02u:%02u", year, month, day, hour, minute, second);
+    ChipLogProgress(TimeService, "%s%s", msg, buf);
+}
+
+CHIP_ERROR LastKnownGoodTime::LoadLastKnownGoodChipEpochTime(System::Clock::Seconds32 & lastKnownGoodChipEpochTime,
+                                                             Optional<System::Clock::Seconds32> & failSafeBackup) const
+{
+    uint8_t buf[LastKnownGoodTimeTLVMaxSize()];
+    uint16_t size = sizeof(buf);
+    uint32_t seconds;
+    DefaultStorageKeyAllocator keyAlloc;
+    ReturnErrorOnFailure(mStorage->SyncGetKeyValue(keyAlloc.LastKnownGoodTimeKey(), buf, size));
+    TLV::ContiguousBufferTLVReader reader;
+    reader.Init(buf, size);
+    ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Structure, TLV::AnonymousTag()));
+    TLV::TLVType containerType;
+    ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(reader.Next(kLastKnownGoodChipEpochSecondsTag));
+    ReturnErrorOnFailure(reader.Get(seconds));
+    lastKnownGoodChipEpochTime = System::Clock::Seconds32(seconds);
+    CHIP_ERROR err             = reader.Next();
+    if (err == CHIP_END_OF_TLV)
+    {
+        failSafeBackup = NullOptional;
+        return CHIP_NO_ERROR; // not an error; this tag is optional
+    }
+    VerifyOrReturnError(reader.GetTag() == kFailSafeLastKnownGoodChipEpochSecondsTag, CHIP_ERROR_UNEXPECTED_TLV_ELEMENT);
+    ReturnErrorOnFailure(reader.Get(seconds));
+    failSafeBackup.Emplace(seconds);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LastKnownGoodTime::LoadLastKnownGoodChipEpochTime(System::Clock::Seconds32 & lastKnownGoodChipEpochTime) const
+{
+    Optional<System::Clock::Seconds32> failSafeBackup;
+    return LoadLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime, failSafeBackup);
+}
+
+CHIP_ERROR LastKnownGoodTime::StoreLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime,
+                                                              const Optional<System::Clock::Seconds32> & failSafeBackup) const
+{
+    uint8_t buf[LastKnownGoodTimeTLVMaxSize()];
+    TLV::TLVWriter writer;
+    writer.Init(buf);
+    TLV::TLVType outerType;
+    ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerType));
+    ReturnErrorOnFailure(writer.Put(kLastKnownGoodChipEpochSecondsTag, lastKnownGoodChipEpochTime.count()));
+    if (failSafeBackup.HasValue())
+    {
+        ReturnErrorOnFailure(writer.Put(kFailSafeLastKnownGoodChipEpochSecondsTag, failSafeBackup.Value().count()));
+    }
+    ReturnErrorOnFailure(writer.EndContainer(outerType));
+    const auto length = writer.GetLengthWritten();
+    VerifyOrReturnError(CanCastTo<uint16_t>(length), CHIP_ERROR_BUFFER_TOO_SMALL);
+    DefaultStorageKeyAllocator keyAlloc;
+    ReturnErrorOnFailure(mStorage->SyncSetKeyValue(keyAlloc.LastKnownGoodTimeKey(), buf, static_cast<uint16_t>(length)));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR LastKnownGoodTime::StoreLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime) const
+{
+    return StoreLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime, NullOptional);
+}
+
+CHIP_ERROR LastKnownGoodTime::Init(PersistentStorageDelegate * storage)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    mStorage       = storage;
+    // 3.5.6.1 Last Known Good UTC Time:
+    //
+    // "A Node’s initial out-of-box Last Known Good UTC time SHALL be the
+    // compile-time of the firmware."
+    System::Clock::Seconds32 buildTime;
+    SuccessOrExit(err = DeviceLayer::ConfigurationMgr().GetFirmwareBuildChipEpochTime(buildTime));
+    System::Clock::Seconds32 storedLastKnownGoodChipEpochTime;
+    err = LoadLastKnownGoodChipEpochTime(storedLastKnownGoodChipEpochTime);
+    VerifyOrExit(err == CHIP_NO_ERROR || err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND, ;);
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
+    {
+        ChipLogProgress(TimeService, "Last Known Good Time: [unknown]");
+    }
+    else
+    {
+        LogTime("Last Known Good Time: ", storedLastKnownGoodChipEpochTime);
+    }
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND || buildTime > storedLastKnownGoodChipEpochTime)
+    {
+        // If we have no value in persistence, or the firmware build time is
+        // later than the value in persistence, set last known good time to the
+        // firmware build time and write back.
+        LogTime("Setting Last Known Good Time to firmware build time ", buildTime);
+        mLastKnownGoodChipEpochTime.SetValue(buildTime);
+        SuccessOrExit(err = StoreLastKnownGoodChipEpochTime(buildTime));
+    }
+    else
+    {
+        mLastKnownGoodChipEpochTime.SetValue(storedLastKnownGoodChipEpochTime);
+    }
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(TimeService, "Failed to init Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    return err;
+}
+
+CHIP_ERROR LastKnownGoodTime::SetLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime,
+                                                            System::Clock::Seconds32 notBefore)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    VerifyOrExit(mLastKnownGoodChipEpochTime.HasValue(), err = CHIP_ERROR_INCORRECT_STATE);
+    LogTime("Last Known Good Time: ", mLastKnownGoodChipEpochTime.Value());
+    LogTime("New proposed Last Known Good Time: ", lastKnownGoodChipEpochTime);
+
+    // Verify that the passed value is not earlier than the firmware build time.
+    System::Clock::Seconds32 buildTime;
+    SuccessOrExit(err = DeviceLayer::ConfigurationMgr().GetFirmwareBuildChipEpochTime(buildTime));
+    VerifyOrExit(lastKnownGoodChipEpochTime >= buildTime, err = CHIP_ERROR_INVALID_ARGUMENT);
+    // Verify that the passed value is not earlier than the passed NotBefore time.
+    VerifyOrExit(lastKnownGoodChipEpochTime >= notBefore, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Passed value is valid.  Capture it and write back to persistence.
+    //
+    // Note that we are purposefully overwriting any previous last known
+    // good time that may have been stored as part of a fail-safe context.
+    // This is intentional: we don't promise not to change last known good
+    // time during the fail-safe timer.  For instance, if the platform has a
+    // new, better time source, it is legal to capture it.  If we do, we should
+    // both overwrite last known good time and discard the previous value stored
+    // for fail safe recovery, as together these comprise a transaction.  By
+    // overwriting both, we are fully superseding that transaction with our
+    // own, which does not to have a revert feature.
+    SuccessOrExit(err = StoreLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime));
+    mLastKnownGoodChipEpochTime.SetValue(lastKnownGoodChipEpochTime);
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(TimeService, "Failed to update Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    else
+    {
+        LogTime("Updating Last Known Good Time to ", lastKnownGoodChipEpochTime);
+    }
+    return err;
+}
+
+CHIP_ERROR LastKnownGoodTime::UpdateLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    VerifyOrExit(mLastKnownGoodChipEpochTime.HasValue(), err = CHIP_ERROR_INCORRECT_STATE);
+    LogTime("Last Known Good Time: ", mLastKnownGoodChipEpochTime.Value());
+    LogTime("New proposed Last Known Good Time: ", lastKnownGoodChipEpochTime);
+    if (lastKnownGoodChipEpochTime > mLastKnownGoodChipEpochTime.Value())
+    {
+        LogTime("Current Last Known Good time retained in fail-safe context, updating to ", lastKnownGoodChipEpochTime);
+        // We have a later timestamp.  Advance last known good time and store
+        // the fail-safe value.
+        SuccessOrExit(
+            err = StoreLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime, MakeOptional(mLastKnownGoodChipEpochTime.Value())));
+        mLastKnownGoodChipEpochTime.SetValue(lastKnownGoodChipEpochTime);
+    }
+    else
+    {
+        ChipLogProgress(TimeService, "Retaining current Last Known Good Time");
+        // Our timestamp is not later.  Retain the existing last known good time
+        // and discard any fail-safe value in persistence.
+        SuccessOrExit(err = StoreLastKnownGoodChipEpochTime(mLastKnownGoodChipEpochTime.Value()));
+    }
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(TimeService, "Failed to persist Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    return err;
+}
+
+CHIP_ERROR LastKnownGoodTime::CommitLastKnownGoodChipEpochTime()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    VerifyOrExit(mLastKnownGoodChipEpochTime.HasValue(), err = CHIP_ERROR_INCORRECT_STATE);
+    LogTime("Committing Last Known Good Time to storage: ", mLastKnownGoodChipEpochTime.Value());
+    // Writing with no fail-safe backup removes the fail-safe backup from
+    // storage, thus committing the new Last Known Good Time.
+    SuccessOrExit(err = StoreLastKnownGoodChipEpochTime(mLastKnownGoodChipEpochTime.Value()));
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(TimeService, "Failed to commit Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    return err;
+}
+
+CHIP_ERROR LastKnownGoodTime::RevertLastKnownGoodChipEpochTime()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    System::Clock::Seconds32 lastKnownGoodChipEpochTime;
+    Optional<System::Clock::Seconds32> failSafeBackup;
+    VerifyOrExit(mLastKnownGoodChipEpochTime.HasValue(), err = CHIP_ERROR_INCORRECT_STATE);
+    LogTime("Last Known Good Time: ", mLastKnownGoodChipEpochTime.Value());
+    SuccessOrExit(err = LoadLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime, failSafeBackup));
+    if (!failSafeBackup.HasValue())
+    {
+        ChipLogProgress(TimeService, "No fail safe Last Known Good Time to revert to");
+        return CHIP_NO_ERROR; // if there's no value to revert to, we are done
+    }
+    LogTime("Fail safe Last Known Good Time: ", failSafeBackup.Value());
+    SuccessOrExit(err = StoreLastKnownGoodChipEpochTime(failSafeBackup.Value()));
+    mLastKnownGoodChipEpochTime.SetValue(failSafeBackup.Value());
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(TimeService, "Failed to persist Last Known Good Time: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    else
+    {
+        ChipLogProgress(TimeService, "Reverted Last Known Good Time to fail safe value");
+    }
+    return err;
+}
+
+} // namespace chip
diff --git a/src/credentials/LastKnownGoodTime.h b/src/credentials/LastKnownGoodTime.h
new file mode 100644
index 00000000000000..9c0798291188c9
--- /dev/null
+++ b/src/credentials/LastKnownGoodTime.h
@@ -0,0 +1,171 @@
+/*
+ *
+ *    Copyright (c) 2021-2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @brief Defines a table of fabrics that have provisioned the device.
+ */
+
+#pragma once
+
+#include <lib/core/CHIPPersistentStorageDelegate.h>
+#include <lib/core/CHIPTLV.h>
+#include <lib/core/Optional.h>
+#include <system/SystemClock.h>
+
+namespace chip {
+
+class LastKnownGoodTime
+{
+public:
+    LastKnownGoodTime() {}
+
+    /**
+     * Initialize Last Known Good Time to the later of firmware build time or
+     * last known good time persisted in storage.  Persist the selected value
+     * if this differs from the value in storage or no value is yet persisted.
+     *
+     * @param storage storage delegate to persist Last Known Good Time
+     * @return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR Init(PersistentStorageDelegate * storage);
+
+    /**
+     * Get the current Last Known Good Time.
+     *
+     * @param lastKnownGoodChipEpochTime (out) the current last known good time, if any is known
+     * &return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR GetLastKnownGoodChipEpochTime(System::Clock::Seconds32 & lastKnownGoodChipEpochTime) const
+    {
+        VerifyOrReturnError(mLastKnownGoodChipEpochTime.HasValue(), CHIP_ERROR_INCORRECT_STATE);
+        lastKnownGoodChipEpochTime = mLastKnownGoodChipEpochTime.Value();
+        return CHIP_NO_ERROR;
+    }
+
+    /**
+     * Validate that the passed Last Known Good Time is within bounds and then
+     * store this and write back to storage.  Legal values are those which are
+     * not earlier than firmware build time or any of our stored certificates'
+     * NotBefore times:
+     *
+     *    3.5.6.1. Last Known Good UTC Time
+     *
+     *    A Node MAY adjust the Last Known Good UTC Time backwards if it
+     *    believes the current Last Known Good UTC Time is incorrect and it has
+     *    a good time value from a trusted source. The Node SHOULD NOT adjust
+     *    the Last Known Good UTC to a time before the later of:
+     *      • The build timestamp of its currently running software image
+     *      • The not-before timestamp of any of its operational certificates
+     *
+     * @param lastKnownGoodChipEpochTime Last Known Good Time in seconds since CHIP epoch
+     * @param notBefore the latest NotBefore time of all installed certificates
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR SetLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime,
+                                             System::Clock::Seconds32 notBefore);
+
+    /**
+     * Update the Last Known Good Time to the later of the current value and
+     * the passed value and persist to storage.  If the value is changed, also
+     * store the current value for fail-safe recovery.
+     *
+     * We can only support storage of a single fail-safe recovery value, so
+     * for nodes and fabric additions where fail-safe recovery is required, this
+     * should only be called from within a fail-safe context.
+     *
+     * @param lastKnownGoodChipEpochTime Last Known Good Time in seconds since CHIP epoch
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR UpdateLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime);
+
+    /*
+     * Commit the Last Known Good Time by deleting the fail-safe backup from
+     * storage.
+     *
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR CommitLastKnownGoodChipEpochTime();
+
+    /*
+     * Revert the Last Known Good Time to the fail-safe backup value in
+     * persistence if any exists.
+     *
+     * @return CHIP_NO_ERROR on success, else an appopriate CHIP_ERROR
+     */
+    CHIP_ERROR RevertLastKnownGoodChipEpochTime();
+
+private:
+    static constexpr size_t LastKnownGoodTimeTLVMaxSize()
+    {
+        // We have Last Known Good Time and, optionally, a previous Last known
+        // good time for fail safe cleanup.
+        return TLV::EstimateStructOverhead(sizeof(uint32_t), sizeof(uint32_t));
+    }
+
+    /**
+     * Log the message, appending the passed CHIP epoch time in ISO8601 format.
+     *
+     * @param msg message to log with ISO8601 time appended
+     * @param chipEpochTime time in seconds from the CHIP epoch
+     */
+    void LogTime(const char * msg, System::Clock::Seconds32 chipEpochTime);
+
+    /**
+     * Load the Last Known Good Time from storage and, optionally, a fail-safe
+     * value to fall back to if any exists.
+     *
+     * @param lastKnownGoodChipEpochTime (out) Last Known Good Time as seconds from CHIP epoch
+     * @param failSafeBackup (out) an optional Fail Safe context last known good time value to fall back to, also in seconds from
+     * CHIP epoch from CHIP epoch
+     * @return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR LoadLastKnownGoodChipEpochTime(System::Clock::Seconds32 & lastKnownGoodChipEpochTime,
+                                              Optional<System::Clock::Seconds32> & failSafeBackup) const;
+
+    /**
+     * Load the Last Known Good Time from storage.
+     *
+     * @param lastKnownGoodChipEpochTime (out) Last Known Good Time as seconds from CHIP epoch
+     * @return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR LoadLastKnownGoodChipEpochTime(System::Clock::Seconds32 & lastKnownGoodChipEpochTime) const;
+
+    /**
+     * Store the Last Known Good Time to storage, and optionally, a fail-safe
+     * value to fall back to if the fail safe timer expires.
+     *
+     * @param lastKnownGoodChipEpochTime Last Known Good Time as seconds from CHIP epoch
+     * @param failSafeBackup fail safe backup of the previous Last Known Good Time
+     * @return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR StoreLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime,
+                                               const Optional<System::Clock::Seconds32> & failSafeBackup) const;
+
+    /**
+     * Store the Last Known Good Time to storage.  This overload also clears
+     * the fail safe Last Known Good Time from storage.
+     *
+     * @param lastKnownGoodChipEpochTime Last Known Good Time as seconds from CHIP epoch
+     * @return CHIP_NO_ERROR on success, else an appropriate CHIP_ERROR
+     */
+    CHIP_ERROR StoreLastKnownGoodChipEpochTime(System::Clock::Seconds32 lastKnownGoodChipEpochTime) const;
+
+    PersistentStorageDelegate * mStorage = nullptr;
+    Optional<System::Clock::Seconds32> mLastKnownGoodChipEpochTime;
+};
+
+} // namespace chip
diff --git a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
index 6524fafa80f836..61172baefb9075 100644
--- a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
+++ b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
@@ -42,6 +42,9 @@ namespace Credentials {
 
 namespace {
 
+// As per specifications section 11.22.5.1. Constant RESP_MAX
+constexpr size_t kMaxResponseLength = 900;
+
 static const ByteSpan kTestPaaRoots[] = {
     TestCerts::sTestCert_PAA_FFF1_Cert,
     TestCerts::sTestCert_PAA_NoVID_Cert,
@@ -184,6 +187,9 @@ void DefaultDACVerifier::VerifyAttestationInformation(const DeviceAttestationVer
                      !info.attestationNonceBuffer.empty() && onCompletion != nullptr,
                  attestationError = AttestationVerificationResult::kInvalidArgument);
 
+    VerifyOrExit(info.attestationElementsBuffer.size() <= kMaxResponseLength,
+                 attestationError = AttestationVerificationResult::kInvalidArgument);
+
     // match DAC and PAI VIDs
     {
         VerifyOrExit(ExtractVIDPIDFromX509Cert(info.dacDerBuffer, dacVidPid) == CHIP_NO_ERROR,
@@ -410,6 +416,7 @@ CHIP_ERROR DefaultDACVerifier::VerifyNodeOperationalCSRInformation(const ByteSpa
                             !attestationSignatureBuffer.empty() && !csrNonce.empty(),
                         CHIP_ERROR_INVALID_ARGUMENT);
 
+    VerifyOrReturnError(nocsrElementsBuffer.size() <= kMaxResponseLength, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(csrNonce.size() == Controller::kCSRNonceLength, CHIP_ERROR_INVALID_ARGUMENT);
 
     ByteSpan csrSpan;
@@ -420,6 +427,8 @@ CHIP_ERROR DefaultDACVerifier::VerifyNodeOperationalCSRInformation(const ByteSpa
     ReturnErrorOnFailure(DeconstructNOCSRElements(nocsrElementsBuffer, csrSpan, csrNonceSpan, vendorReserved1Span,
                                                   vendorReserved2Span, vendorReserved3Span));
 
+    VerifyOrReturnError(csrNonceSpan.size() == Controller::kCSRNonceLength, CHIP_ERROR_INVALID_ARGUMENT);
+
     // Verify that Nonce matches with what we sent
     VerifyOrReturnError(csrNonceSpan.data_equal(csrNonce), CHIP_ERROR_INVALID_ARGUMENT);
 
diff --git a/src/credentials/examples/LastKnownGoodTimeCertificateValidityPolicyExample.h b/src/credentials/examples/LastKnownGoodTimeCertificateValidityPolicyExample.h
new file mode 100644
index 00000000000000..408019dbc51d56
--- /dev/null
+++ b/src/credentials/examples/LastKnownGoodTimeCertificateValidityPolicyExample.h
@@ -0,0 +1,64 @@
+/*
+ *
+ *    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.
+ */
+#pragma once
+
+#include <credentials/CertificateValidityPolicy.h>
+
+namespace chip {
+namespace Credentials {
+
+class LastKnownGoodTimeCertificateValidityPolicyExample : public CertificateValidityPolicy
+{
+public:
+    ~LastKnownGoodTimeCertificateValidityPolicyExample() {}
+
+    /**
+     * @brief
+     *
+     * This certificate validity policy will validate NotBefore / NotAfter if
+     * current time is known and also validates NotAfter if only Last Known
+     * Good Time is known.
+     *
+     * This provides an example for enforcing certificate expiration on nodes
+     * where no current time source is available.
+     *
+     * @param cert CHIP Certificate for which we are evaluating validity
+     * @param depth the depth of the certificate in the chain, where the leaf is at depth 0
+     * @return CHIP_NO_ERROR if CHIPCert should accept the certificate; an appropriate CHIP_ERROR if it should be rejected
+     */
+    CHIP_ERROR ApplyCertificateValidityPolicy(const ChipCertificateData * cert, uint8_t depth,
+                                              CertificateValidityResult result) override
+    {
+        switch (result)
+        {
+        case CertificateValidityResult::kValid:
+        case CertificateValidityResult::kNotExpiredAtLastKnownGoodTime:
+        case CertificateValidityResult::kTimeUnknown:
+            return CHIP_NO_ERROR;
+        case CertificateValidityResult::kNotYetValid:
+            return CHIP_ERROR_CERT_NOT_VALID_YET;
+        case CertificateValidityResult::kExpired:
+        case CertificateValidityResult::kExpiredAtLastKnownGoodTime:
+            return CHIP_ERROR_CERT_EXPIRED;
+        default:
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        }
+    }
+};
+
+} // namespace Credentials
+} // namespace chip
diff --git a/src/credentials/examples/StrictCertificateValidityPolicyExample.h b/src/credentials/examples/StrictCertificateValidityPolicyExample.h
new file mode 100644
index 00000000000000..a8d63aba99e93e
--- /dev/null
+++ b/src/credentials/examples/StrictCertificateValidityPolicyExample.h
@@ -0,0 +1,62 @@
+/*
+ *
+ *    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.
+ */
+#pragma once
+
+#include <credentials/CertificateValidityPolicy.h>
+
+namespace chip {
+namespace Credentials {
+
+class StrictCertificateValidityPolicyExample : public CertificateValidityPolicy
+{
+public:
+    ~StrictCertificateValidityPolicyExample() {}
+
+    /**
+     * @brief
+     *
+     * This certificate validity policy is strict in that it rejects all
+     * certificates if any of wall clock time or last known good time show
+     * them to be invalid.  This policy also rejects certificates if time
+     * is unknown.
+     *
+     * @param cert CHIP Certificate for which we are evaluating validity
+     * @param depth the depth of the certificate in the chain, where the leaf is at depth 0
+     * @return CHIP_NO_ERROR if CHIPCert should accept the certificate; an appropriate CHIP_ERROR if it should be rejected
+     */
+    CHIP_ERROR ApplyCertificateValidityPolicy(const ChipCertificateData * cert, uint8_t depth,
+                                              CertificateValidityResult result) override
+    {
+        switch (result)
+        {
+        case CertificateValidityResult::kValid:
+        case CertificateValidityResult::kNotExpiredAtLastKnownGoodTime:
+            return CHIP_NO_ERROR;
+        case CertificateValidityResult::kNotYetValid:
+            return CHIP_ERROR_CERT_NOT_VALID_YET;
+        case CertificateValidityResult::kExpiredAtLastKnownGoodTime:
+        case CertificateValidityResult::kTimeUnknown:
+        case CertificateValidityResult::kExpired:
+            return CHIP_ERROR_CERT_EXPIRED;
+        default:
+            return CHIP_ERROR_INVALID_ARGUMENT;
+        }
+    }
+};
+
+} // namespace Credentials
+} // namespace chip
diff --git a/src/credentials/tests/CHIPCert_test_vectors.h b/src/credentials/tests/CHIPCert_test_vectors.h
index 08085e66a43af4..30f36c8cd46455 100644
--- a/src/credentials/tests/CHIPCert_test_vectors.h
+++ b/src/credentials/tests/CHIPCert_test_vectors.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include <credentials/CHIPCert.h>
+#include <credentials/CHIPCertificateSet.h>
 #include <lib/support/CodeUtils.h>
 
 namespace chip {
diff --git a/src/credentials/tests/TestChipCert.cpp b/src/credentials/tests/TestChipCert.cpp
index 9f4ea1d33a1f27..bf9aae14a2394c 100644
--- a/src/credentials/tests/TestChipCert.cpp
+++ b/src/credentials/tests/TestChipCert.cpp
@@ -25,6 +25,8 @@
  */
 
 #include <credentials/CHIPCert.h>
+#include <credentials/examples/LastKnownGoodTimeCertificateValidityPolicyExample.h>
+#include <credentials/examples/StrictCertificateValidityPolicyExample.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CHIPTLV.h>
 #include <lib/core/PeerId.h>
@@ -49,9 +51,6 @@ enum
     kStandardCertsCount = 3,
 };
 
-static const BitFlags<CertValidateFlags> sIgnoreNotBeforeFlag(CertValidateFlags::kIgnoreNotBefore);
-static const BitFlags<CertValidateFlags> sIgnoreNotAfterFlag(CertValidateFlags::kIgnoreNotAfter);
-
 static const BitFlags<CertDecodeFlags> sNullDecodeFlag;
 static const BitFlags<CertDecodeFlags> sGenTBSHashFlag(CertDecodeFlags::kGenerateTBSHash);
 static const BitFlags<CertDecodeFlags> sTrustAnchorFlag(CertDecodeFlags::kIsTrustAnchor);
@@ -119,19 +118,39 @@ static CHIP_ERROR LoadTestCertSet01(ChipCertificateSet & certSet)
     return err;
 }
 
-static CHIP_ERROR SetEffectiveTime(ValidationContext & validContext, uint16_t year, uint8_t mon, uint8_t day, uint8_t hour = 0,
-                                   uint8_t min = 0, uint8_t sec = 0)
+static CHIP_ERROR SetCurrentTime(ValidationContext & validContext, uint16_t year, uint8_t mon, uint8_t day, uint8_t hour = 0,
+                                 uint8_t min = 0, uint8_t sec = 0)
+{
+    ASN1UniversalTime currentTime;
+
+    currentTime.Year   = year;
+    currentTime.Month  = mon;
+    currentTime.Day    = day;
+    currentTime.Hour   = hour;
+    currentTime.Minute = min;
+    currentTime.Second = sec;
+
+    return validContext.SetEffectiveTimeFromAsn1Time<CurrentChipEpochTime>(currentTime);
+}
+
+static CHIP_ERROR SetLastKnownGoodTime(ValidationContext & validContext, uint16_t year, uint8_t mon, uint8_t day, uint8_t hour = 0,
+                                       uint8_t min = 0, uint8_t sec = 0)
 {
-    ASN1UniversalTime effectiveTime;
+    ASN1UniversalTime lastKnownGoodTime;
 
-    effectiveTime.Year   = year;
-    effectiveTime.Month  = mon;
-    effectiveTime.Day    = day;
-    effectiveTime.Hour   = hour;
-    effectiveTime.Minute = min;
-    effectiveTime.Second = sec;
+    lastKnownGoodTime.Year   = year;
+    lastKnownGoodTime.Month  = mon;
+    lastKnownGoodTime.Day    = day;
+    lastKnownGoodTime.Hour   = hour;
+    lastKnownGoodTime.Minute = min;
+    lastKnownGoodTime.Second = sec;
+
+    return validContext.SetEffectiveTimeFromAsn1Time<LastKnownGoodChipEpochTime>(lastKnownGoodTime);
+}
 
-    return ASN1ToChipEpochTime(effectiveTime, validContext.mEffectiveTime);
+static void ClearTimeSource(ValidationContext & validContext)
+{
+    validContext.mEffectiveTime = EffectiveTime{};
 }
 
 static void TestChipCert_ChipToX509(nlTestSuite * inSuite, void * inContext)
@@ -421,12 +440,11 @@ static void TestChipCert_CertValidation(nlTestSuite * inSuite, void * inContext)
 
         // Initialize the validation context.
         validContext.Reset();
-        err = SetEffectiveTime(validContext, 2021, 1, 1);
+        err = SetCurrentTime(validContext, 2021, 1, 1);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
         validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
         validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
         validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kClientAuth);
-        validContext.mValidateFlags.SetRaw(testCase.mValidateFlags);
         validContext.mRequiredCertType = testCase.mRequiredCertType;
 
         // Locate the subject DN and key id that will be used as input the FindValidCert() method.
@@ -469,63 +487,464 @@ static void TestChipCert_CertValidTime(nlTestSuite * inSuite, void * inContext)
     validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
     validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kClientAuth);
 
-    // Before certificate validity period.
-    err = SetEffectiveTime(validContext, 2020, 1, 3);
+    Credentials::StrictCertificateValidityPolicyExample strictCertificateValidityPolicy;
+    Credentials::LastKnownGoodTimeCertificateValidityPolicyExample lastKnownGoodTimeValidityPolicy;
+
+    // No time source available.
+    ClearTimeSource(validContext);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    // TODO - enable check for certificate validity dates
-    // err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
-    // NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
 
-    // 1 second before validity period.
-    err = SetEffectiveTime(validContext, 2020, 10, 15, 14, 23, 42);
+    // Current time before certificate validity period.
+    err = SetCurrentTime(validContext, 2020, 1, 3);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+
+    // Current time 1 second before validity period.
+    err = SetCurrentTime(validContext, 2020, 10, 15, 14, 23, 42);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+
+    // Current time 1st second of validity period.
+    err = SetCurrentTime(validContext, 2020, 10, 15, 14, 23, 43);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    // TODO - enable check for certificate validity dates
-    // err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
-    // NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
 
-    // 1st second of validity period.
-    err = SetEffectiveTime(validContext, 2020, 10, 15, 14, 23, 43);
+    // Current time within validity period.
+    err = SetCurrentTime(validContext, 2022, 02, 23, 12, 30, 01);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    // Validity period.
-    err = SetEffectiveTime(validContext, 2022, 02, 23, 12, 30, 01);
+    // Current time at last second of validity period.
+    err = SetCurrentTime(validContext, 2040, 10, 15, 14, 23, 42);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    // Last second of validity period.
-    err = SetEffectiveTime(validContext, 2040, 10, 15, 14, 23, 42);
+    // Current time at 1 second after end of certificate validity period.
+    err = SetCurrentTime(validContext, 2040, 10, 15, 14, 23, 43);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+
+    // Current time after end of certificate validity period.
+    err = SetCurrentTime(validContext, 2042, 4, 25, 0, 0, 0);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
 
-    // 1 second after end of certificate validity period.
-    err = SetEffectiveTime(validContext, 2040, 10, 15, 14, 23, 43);
+    // Last known good time before certificate validity period.
+    // We can't invalidate based on NotBefore with Last Known Good Time.
+    // Hence, we expect CHIP_NO_ERROR.
+    err = SetLastKnownGoodTime(validContext, 2020, 1, 3);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Last known good time 1 second before certificate validity period.
+    // We can't invalidate based on NotBefore with Last Known Good Time.
+    // Hence, we expect CHIP_NO_ERROR.
+    err = SetLastKnownGoodTime(validContext, 2020, 10, 15, 14, 23, 42);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Last Known Good Time 1st second of validity period.
+    err = SetLastKnownGoodTime(validContext, 2020, 10, 15, 14, 23, 43);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Last Known Good Time within validity period.
+    err = SetLastKnownGoodTime(validContext, 2022, 02, 23, 12, 30, 01);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Last Known Good Time at last second of validity period.
+    err = SetLastKnownGoodTime(validContext, 2040, 10, 15, 14, 23, 42);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Last Known Good Time at 1 second after end of certificate validity period.
+    err = SetLastKnownGoodTime(validContext, 2040, 10, 15, 14, 23, 43);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
 
-    // After end of certificate validity period.
-    err = SetEffectiveTime(validContext, 2042, 4, 25, 0, 0, 0);
+    // Last Known Good Time after end of certificate validity period.
+    err = SetLastKnownGoodTime(validContext, 2042, 4, 25, 0, 0, 0);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    // Strict policy
+    validContext.mValidityPolicy = &strictCertificateValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimeValidityPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+
+    certSet.Release();
+}
 
-    // Ignore 'not before' time.
-    validContext.mValidateFlags.Set(sIgnoreNotBeforeFlag);
-    err = SetEffectiveTime(validContext, 2020, 4, 23, 23, 59, 59);
+class AlwaysAcceptValidityPolicy : public CertificateValidityPolicy
+{
+public:
+    ~AlwaysAcceptValidityPolicy() {}
+
+    CHIP_ERROR ApplyCertificateValidityPolicy(const ChipCertificateData * cert, uint8_t depth,
+                                              CertificateValidityResult result) override
+    {
+        return CHIP_NO_ERROR;
+    }
+};
+
+class AlwaysRejectValidityPolicy : public CertificateValidityPolicy
+{
+public:
+    ~AlwaysRejectValidityPolicy() {}
+
+    CHIP_ERROR ApplyCertificateValidityPolicy(const ChipCertificateData * cert, uint8_t depth,
+                                              CertificateValidityResult result) override
+    {
+        return CHIP_ERROR_CERT_EXPIRED;
+    }
+};
+
+static void TestChipCert_CertValidityPolicyInjection(nlTestSuite * inSuite, void * inContext)
+{
+    CHIP_ERROR err;
+    ChipCertificateSet certSet;
+    ValidationContext validContext;
+    StrictCertificateValidityPolicyExample strictPolicy;
+    LastKnownGoodTimeCertificateValidityPolicyExample lastKnownGoodTimePolicy;
+    AlwaysAcceptValidityPolicy alwaysAcceptPolicy;
+    AlwaysRejectValidityPolicy alwaysRejectPolicy;
+
+    err = certSet.Init(kStandardCertsCount);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    err = LoadTestCertSet01(certSet);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    validContext.Reset();
+    validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
+    validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
+    validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kClientAuth);
+
+    // Current time unknown.
+
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimePolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
+
+    // Curent time before certificate validity period.
+    err = SetCurrentTime(validContext, 2020, 1, 3);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimePolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_NOT_VALID_YET);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
+
+    // Last known good time before certificate validity period.
+    err = SetLastKnownGoodTime(validContext, 2020, 1, 3);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
+
+    // Current time during validity period
+    err = SetCurrentTime(validContext, 2022, 02, 23, 12, 30, 01);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
+
+    // Last Known Good Time during validity period
+    err = SetLastKnownGoodTime(validContext, 2022, 02, 23, 12, 30, 01);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    // Ignore 'not after' time.
-    validContext.mValidateFlags.Set(sIgnoreNotAfterFlag);
-    err = SetEffectiveTime(validContext, 2042, 5, 25, 0, 0, 0);
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
-    err = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimePolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
+
+    // Current time after end of certificate validity period.
+    err = SetCurrentTime(validContext, 2042, 4, 25, 0, 0, 0);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimePolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
+
+    // Last Known Good Time after end of certificate validity period.
+    err = SetLastKnownGoodTime(validContext, 2042, 4, 25, 0, 0, 0);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Default policy
+    validContext.mValidityPolicy = nullptr;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Strict policy
+    validContext.mValidityPolicy = &strictPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Last Known Good Time policy
+    validContext.mValidityPolicy = &lastKnownGoodTimePolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+    // Always accept policy
+    validContext.mValidityPolicy = &alwaysAcceptPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    // Always reject policy
+    validContext.mValidityPolicy = &alwaysRejectPolicy;
+    err                          = certSet.ValidateCert(certSet.GetLastCert(), validContext);
+    NL_TEST_ASSERT(inSuite, err != CHIP_NO_ERROR);
 
     certSet.Release();
 }
@@ -632,7 +1051,7 @@ static void TestChipCert_CertUsage(nlTestSuite * inSuite, void * inContext)
         validContext.mRequiredKeyUsages   = sUsageTestCases[i].mRequiredKeyUsages;
         validContext.mRequiredKeyPurposes = sUsageTestCases[i].mRequiredKeyPurposes;
 
-        err = SetEffectiveTime(validContext, 2020, 10, 16);
+        err = SetCurrentTime(validContext, 2020, 10, 16);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
         err = certSet.ValidateCert(&certSet.GetCertSet()[sUsageTestCases[i].mCertIndex], validContext);
@@ -1064,7 +1483,7 @@ static void TestChipCert_VerifyGeneratedCerts(nlTestSuite * inSuite, void * inCo
     ValidationContext validContext;
 
     validContext.Reset();
-    NL_TEST_ASSERT(inSuite, SetEffectiveTime(validContext, 2022, 1, 1) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, SetCurrentTime(validContext, 2022, 1, 1) == CHIP_NO_ERROR);
     validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
     validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
     validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kClientAuth);
@@ -1130,7 +1549,7 @@ static void TestChipCert_VerifyGeneratedCertsNoICA(nlTestSuite * inSuite, void *
     ValidationContext validContext;
 
     validContext.Reset();
-    NL_TEST_ASSERT(inSuite, SetEffectiveTime(validContext, 2022, 1, 1) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, SetCurrentTime(validContext, 2022, 1, 1) == CHIP_NO_ERROR);
     validContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
     validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
     validContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kClientAuth);
@@ -1542,6 +1961,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("Test CHIP Certificate Distinguish Name", TestChipCert_ChipDN),
     NL_TEST_DEF("Test CHIP Certificate Validation", TestChipCert_CertValidation),
     NL_TEST_DEF("Test CHIP Certificate Validation time", TestChipCert_CertValidTime),
+    NL_TEST_DEF("Test CHIP Certificate Validity Policy injection", TestChipCert_CertValidityPolicyInjection),
     NL_TEST_DEF("Test CHIP Certificate Usage", TestChipCert_CertUsage),
     NL_TEST_DEF("Test CHIP Certificate Type", TestChipCert_CertType),
     NL_TEST_DEF("Test CHIP Certificate ID", TestChipCert_CertId),
diff --git a/src/credentials/tests/TestFabricTable.cpp b/src/credentials/tests/TestFabricTable.cpp
index 90f29c3ab98c81..6edcfd20c920e8 100644
--- a/src/credentials/tests/TestFabricTable.cpp
+++ b/src/credentials/tests/TestFabricTable.cpp
@@ -28,8 +28,12 @@
 
 #include <credentials/FabricTable.h>
 
+#include <credentials/tests/CHIPCert_test_vectors.h>
+#include <lib/asn1/ASN1.h>
 #include <lib/support/CodeUtils.h>
+#include <lib/support/TestPersistentStorageDelegate.h>
 #include <lib/support/UnitTestRegistration.h>
+#include <platform/ConfigurationManager.h>
 #include <stdarg.h>
 
 using namespace chip;
@@ -73,6 +77,306 @@ void TestGetCompressedFabricID(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, compressedId.GetNodeId() == 0xdeed);
 }
 
+void TestLastKnownGoodTimeInit(nlTestSuite * inSuite, void * inContext)
+{
+    // Fabric table init should init Last Known Good Time to the firmware build time.
+    FabricTable fabricTable;
+    chip::TestPersistentStorageDelegate testStorage;
+    NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+    System::Clock::Seconds32 lastKnownGoodChipEpochTime;
+    NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime) == CHIP_NO_ERROR);
+    System::Clock::Seconds32 firmwareBuildTime;
+    NL_TEST_ASSERT(inSuite, DeviceLayer::ConfigurationMgr().GetFirmwareBuildChipEpochTime(firmwareBuildTime) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, lastKnownGoodChipEpochTime == firmwareBuildTime);
+}
+
+/**
+ * Load a single test fabric with with the Root01:ICA01:Node01_01 identity.
+ */
+static CHIP_ERROR LoadTestFabric(nlTestSuite * inSuite, FabricTable & fabricTable)
+{
+    Crypto::P256SerializedKeypair opKeysSerialized;
+    Crypto::P256Keypair opKey;
+    FabricInfo fabricInfo;
+    FabricIndex fabricIndex;
+    memcpy((uint8_t *) (opKeysSerialized), TestCerts::sTestCert_Node01_01_PublicKey, TestCerts::sTestCert_Node01_01_PublicKey_Len);
+    memcpy((uint8_t *) (opKeysSerialized) + TestCerts::sTestCert_Node01_01_PublicKey_Len, TestCerts::sTestCert_Node01_01_PrivateKey,
+           TestCerts::sTestCert_Node01_01_PrivateKey_Len);
+    NL_TEST_ASSERT(inSuite,
+                   opKeysSerialized.SetLength(TestCerts::sTestCert_Node01_02_PublicKey_Len +
+                                              TestCerts::sTestCert_Node01_02_PrivateKey_Len) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, opKey.Deserialize(opKeysSerialized) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, fabricInfo.SetOperationalKeypair(&opKey) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite,
+                   fabricInfo.SetRootCert(ByteSpan(TestCerts::sTestCert_Root01_Chip, TestCerts::sTestCert_Root01_Chip_Len)) ==
+                       CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite,
+                   fabricInfo.SetICACert(ByteSpan(TestCerts::sTestCert_ICA01_Chip, TestCerts::sTestCert_ICA01_Chip_Len)) ==
+                       CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite,
+                   fabricInfo.SetNOCCert(ByteSpan(TestCerts::sTestCert_Node01_01_Chip, TestCerts::sTestCert_Node01_01_Chip_Len)) ==
+                       CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, fabricTable.AddNewFabric(fabricInfo, &fabricIndex) == CHIP_NO_ERROR);
+    return CHIP_NO_ERROR;
+}
+
+void TestUpdateLastKnownGoodTime(nlTestSuite * inSuite, void * inContext)
+{
+    // Adding a fabric should advance Last Known Good Time if any certificate's
+    // NotBefore time is later than the build time, and else should leave it
+    // to the initial build time value.
+
+    // Test certs all have this NotBefore: Oct 15 14:23:43 2020 GMT
+    const ASN1::ASN1UniversalTime asn1Expected = { 2020, 10, 15, 14, 23, 43 };
+    uint32_t testCertNotBeforeSeconds;
+    NL_TEST_ASSERT(inSuite, Credentials::ASN1ToChipEpochTime(asn1Expected, testCertNotBeforeSeconds) == CHIP_NO_ERROR);
+    System::Clock::Seconds32 testCertNotBeforeTime = System::Clock::Seconds32(testCertNotBeforeSeconds);
+
+    // Test that certificate NotBefore times that are before the Firmware build time
+    // do not advance Last Known Good Time.
+    System::Clock::Seconds32 afterNotBeforeBuildTimes[] = { System::Clock::Seconds32(testCertNotBeforeTime.count() + 1),
+                                                            System::Clock::Seconds32(testCertNotBeforeTime.count() + 1000),
+                                                            System::Clock::Seconds32(testCertNotBeforeTime.count() + 1000000) };
+    for (auto buildTime : afterNotBeforeBuildTimes)
+    {
+        // Set build time to the desired value.
+        NL_TEST_ASSERT(inSuite, DeviceLayer::ConfigurationMgr().SetFirmwareBuildChipEpochTime(buildTime) == CHIP_NO_ERROR);
+        chip::TestPersistentStorageDelegate testStorage;
+        {
+            // Initialize a fabric table.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Read back Last Known Good Time, which will have been initialized to firmware build time.
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+
+            // Load a test fabric
+            NL_TEST_ASSERT(inSuite, LoadTestFabric(inSuite, fabricTable) == CHIP_NO_ERROR);
+
+            // Read Last Known Good Time and verify that it hasn't moved forward.
+            // This test case was written after the test certs' NotBefore time and we
+            // are using a configuration manager that should reflect a real build time.
+            // Therefore, we expect that build time is after NotBefore and so Last
+            // Known Good Time will be set to the later of these, build time, even
+            // after installing the new fabric.
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+        }
+        {
+            // Test reloading last known good time from persistence.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Verify that last known good time was retained.
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+
+            // Verify that we can call the fail-safe roll back interface.
+            // Because we didn't advance Last Known Good Time, this should be a
+            // no-op.
+            NL_TEST_ASSERT(inSuite, fabricTable.RevertLastKnownGoodChipEpochTime() == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+        }
+        {
+            // Reload again from persistence to verify the fail-safe rollback
+            // left the time intact.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+        }
+    }
+
+    System::Clock::Seconds32 beforeNotBeforeBuildTimes[] = { testCertNotBeforeTime,
+                                                             System::Clock::Seconds32(testCertNotBeforeTime.count() - 1),
+                                                             System::Clock::Seconds32(testCertNotBeforeTime.count() - 1000),
+                                                             System::Clock::Seconds32(testCertNotBeforeTime.count() - 1000000) };
+    // Test that certificate NotBefore times that are at or after the Firmware
+    // build time do result in Last Known Good Times set to these.  Then test
+    // that we can do a fail-safe roll back.
+    for (auto buildTime : beforeNotBeforeBuildTimes)
+    {
+        // Set build time to the desired value.
+        NL_TEST_ASSERT(inSuite, DeviceLayer::ConfigurationMgr().SetFirmwareBuildChipEpochTime(buildTime) == CHIP_NO_ERROR);
+        chip::TestPersistentStorageDelegate testStorage;
+        {
+            // Initialize a fabric table.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Load a test fabric
+            NL_TEST_ASSERT(inSuite, LoadTestFabric(inSuite, fabricTable) == CHIP_NO_ERROR);
+
+            // Read Last Known Good Time and verify that it is now set to the certificate
+            // NotBefore time, as this should be at or after firmware build time.
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == testCertNotBeforeTime);
+        }
+        {
+            // Test reloading last known good time from persistence.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Verify that last known good time was retained.
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == testCertNotBeforeTime);
+
+            // Verify that we can do a fail-safe roll back.
+            NL_TEST_ASSERT(inSuite, fabricTable.RevertLastKnownGoodChipEpochTime() == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+        }
+        {
+            // Reload again from persistence to verify the fail-safe rollback
+            // persisted the reverted time.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == buildTime);
+        }
+    }
+    // Test that certificate NotBefore times that are at or after the Firmware
+    // build time do result in Last Known Good Times set to these.  Then test
+    // that we can commit these to storage.  Attempted fail-safe roll back after
+    // commit will be a no-op.
+    for (auto buildTime : beforeNotBeforeBuildTimes)
+    {
+        // Set build time to the desired value.
+        NL_TEST_ASSERT(inSuite, DeviceLayer::ConfigurationMgr().SetFirmwareBuildChipEpochTime(buildTime) == CHIP_NO_ERROR);
+        chip::TestPersistentStorageDelegate testStorage;
+        {
+            // Initialize a fabric table.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Load a test fabric
+            NL_TEST_ASSERT(inSuite, LoadTestFabric(inSuite, fabricTable) == CHIP_NO_ERROR);
+
+            // Read Last Known Good Time and verify that it is now set to the certificate
+            // NotBefore time, as this should be at or after firmware build time.
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == testCertNotBeforeTime);
+
+            // Commit to storage.
+            NL_TEST_ASSERT(inSuite, fabricTable.CommitLastKnownGoodChipEpochTime() == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == testCertNotBeforeTime);
+
+            // Verify that we can do a no-op fail-safe roll back.
+            NL_TEST_ASSERT(inSuite, fabricTable.RevertLastKnownGoodChipEpochTime() == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == testCertNotBeforeTime);
+        }
+        {
+            // Test reloading last known good time from persistence.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Verify that last known good time was retained.
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == testCertNotBeforeTime);
+        }
+    }
+}
+
+void TestSetLastKnownGoodTime(nlTestSuite * inSuite, void * inContext)
+{
+    // It is desirable for nodes to set Last Known Good Time whenever a good
+    // time source is available, including cases where this would set the time
+    // backward.  However, it is impermissible to set last known good time to
+    // any time before the Firmware Build time or the latest NotBefore of any
+    // installed certificate.
+
+    // Test certs all have this NotBefore: Oct 15 14:23:43 2020 GMT
+    const ASN1::ASN1UniversalTime asn1Expected = { 2020, 10, 15, 14, 23, 43 };
+    uint32_t testCertNotBeforeSeconds;
+    NL_TEST_ASSERT(inSuite, Credentials::ASN1ToChipEpochTime(asn1Expected, testCertNotBeforeSeconds) == CHIP_NO_ERROR);
+    System::Clock::Seconds32 testCertNotBeforeTime = System::Clock::Seconds32(testCertNotBeforeSeconds);
+
+    // Iterate over two cases: one with build time prior to our certificates' NotBefore, one with build time after.
+    System::Clock::Seconds32 testCaseFirmwareBuildTimes[] = { System::Clock::Seconds32(testCertNotBeforeTime.count() - 100000),
+                                                              System::Clock::Seconds32(testCertNotBeforeTime.count() + 100000) };
+
+    for (auto buildTime : testCaseFirmwareBuildTimes)
+    {
+        // Set build time to the desired value.
+        NL_TEST_ASSERT(inSuite, DeviceLayer::ConfigurationMgr().SetFirmwareBuildChipEpochTime(buildTime) == CHIP_NO_ERROR);
+        chip::TestPersistentStorageDelegate testStorage;
+        System::Clock::Seconds32 newTime;
+        {
+            // Initialize a fabric table.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+
+            // Load a test fabric
+            NL_TEST_ASSERT(inSuite, LoadTestFabric(inSuite, fabricTable) == CHIP_NO_ERROR);
+
+            // Verify the Last Known Good Time matches our expected initial value.
+            System::Clock::Seconds32 initialLastKnownGoodTime =
+                buildTime > testCertNotBeforeTime ? buildTime : testCertNotBeforeTime;
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == initialLastKnownGoodTime);
+
+            // Read Last Known Good Time and verify that it hasn't moved forward, since
+            // build time is later than the test certs' NotBefore times.
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == initialLastKnownGoodTime);
+
+            // Attempt to set a Last Known Good Time that is before the firmware build time.  This should fail.
+            newTime = System::Clock::Seconds32(buildTime.count() - 1000);
+            NL_TEST_ASSERT(inSuite, fabricTable.SetLastKnownGoodChipEpochTime(newTime) != CHIP_NO_ERROR);
+
+            // Verify Last Known Good Time is unchanged.
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == initialLastKnownGoodTime);
+
+            // Attempt to set a Last Known Good Time that is before our certificates' NotBefore times.  This should fail.
+            newTime = System::Clock::Seconds32(testCertNotBeforeTime.count() - 1000);
+            NL_TEST_ASSERT(inSuite, fabricTable.SetLastKnownGoodChipEpochTime(newTime) != CHIP_NO_ERROR);
+
+            // Verify Last Known Good Time is unchanged.
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == initialLastKnownGoodTime);
+
+            // Attempt to set a Last Known Good Time that at our current value.
+            NL_TEST_ASSERT(inSuite, fabricTable.SetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+
+            // Verify Last Known Good Time is unchanged.
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == initialLastKnownGoodTime);
+
+            // Attempt to set Last Known Good Times that is after our current value.
+            newTime = System::Clock::Seconds32(initialLastKnownGoodTime.count() + 1000);
+            NL_TEST_ASSERT(inSuite, fabricTable.SetLastKnownGoodChipEpochTime(newTime) == CHIP_NO_ERROR);
+
+            // Verify Last Known Good Time is updated.
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == newTime);
+        }
+        {
+            // Verify that Last Known Good Time was persisted.
+
+            // Initialize a new fabric table from persistence.
+            FabricTable fabricTable;
+            NL_TEST_ASSERT(inSuite, fabricTable.Init(&testStorage) == CHIP_NO_ERROR);
+            System::Clock::Seconds32 lastKnownGoodTime;
+            NL_TEST_ASSERT(inSuite, fabricTable.GetLastKnownGoodChipEpochTime(lastKnownGoodTime) == CHIP_NO_ERROR);
+            NL_TEST_ASSERT(inSuite, lastKnownGoodTime == newTime);
+        }
+    }
+}
+
 // Test Suite
 
 /**
@@ -81,7 +385,10 @@ void TestGetCompressedFabricID(nlTestSuite * inSuite, void * inContext)
 // clang-format off
 static const nlTest sTests[] =
 {
-    NL_TEST_DEF("Compressed Fabric ID",    TestGetCompressedFabricID),
+    NL_TEST_DEF("Get Compressed Fabric ID",    TestGetCompressedFabricID),
+    NL_TEST_DEF("Last Known Good Time Init",    TestLastKnownGoodTimeInit),
+    NL_TEST_DEF("Update Last Known Good Time",    TestUpdateLastKnownGoodTime),
+    NL_TEST_DEF("Set Last Known Good Time",    TestSetLastKnownGoodTime),
     NL_TEST_SENTINEL()
 };
 // clang-format on
@@ -104,6 +411,7 @@ static nlTestSuite sSuite =
  */
 int TestFabricTable_Setup(void * inContext)
 {
+    DeviceLayer::SetConfigurationMgr(&DeviceLayer::ConfigurationManagerImpl::GetDefaultInstance());
     return chip::Platform::MemoryInit() == CHIP_NO_ERROR ? SUCCESS : FAILURE;
 }
 
diff --git a/src/crypto/BUILD.gn b/src/crypto/BUILD.gn
index 45ab4dc4355b68..98bbfe0b5e199f 100644
--- a/src/crypto/BUILD.gn
+++ b/src/crypto/BUILD.gn
@@ -62,6 +62,9 @@ static_library("crypto") {
   sources = [
     "CHIPCryptoPAL.cpp",
     "CHIPCryptoPAL.h",
+    "OperationalKeystore.h",
+    "PersistentStorageOperationalKeystore.cpp",
+    "PersistentStorageOperationalKeystore.h",
     "RandUtils.cpp",
     "RandUtils.h",
   ]
@@ -72,6 +75,7 @@ static_library("crypto") {
     ":crypto_buildconfig",
     "${chip_root}/src/lib/asn1",
     "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
     "${nlassert_root}:nlassert",
   ]
 
diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h
index d89c42af6e9d52..c25e854baa31f6 100644
--- a/src/crypto/CHIPCryptoPAL.h
+++ b/src/crypto/CHIPCryptoPAL.h
@@ -187,6 +187,19 @@ void ClearSecretData(uint8_t (&buf)[N])
     ClearSecretData(buf, N);
 }
 
+/**
+ * @brief Constant-time buffer comparison
+ *
+ * This function implements constant time memcmp. It's good practice
+ * to use constant time functions for cryptographic functions.
+ *
+ * @param a Pointer to first buffer
+ * @param b Pointer to Second buffer
+ * @param n Number of bytes to compare
+ * @return true if `n` first bytes of both buffers are equal, false otherwise
+ */
+bool IsBufferContentEqualConstantTime(const void * a, const void * b, size_t n);
+
 template <typename Sig>
 class ECPKey
 {
@@ -200,6 +213,12 @@ class ECPKey
     virtual const uint8_t * ConstBytes() const = 0;
     virtual uint8_t * Bytes()                  = 0;
 
+    virtual bool Matches(const ECPKey<Sig> & other) const
+    {
+        return (this->Length() == other.Length()) &&
+            IsBufferContentEqualConstantTime(this->ConstBytes(), other.ConstBytes(), this->Length());
+    }
+
     virtual CHIP_ERROR ECDSA_validate_msg_signature(const uint8_t * msg, const size_t msg_length, const Sig & signature) const = 0;
     virtual CHIP_ERROR ECDSA_validate_hash_signature(const uint8_t * hash, const size_t hash_length,
                                                      const Sig & signature) const                                              = 0;
@@ -287,6 +306,14 @@ class P256PublicKey : public ECPKey<P256ECDSASignature>
         memcpy(&bytes[0], value.data(), N);
     }
 
+    template <size_t N>
+    P256PublicKey & 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; }
diff --git a/src/crypto/CHIPCryptoPALOpenSSL.cpp b/src/crypto/CHIPCryptoPALOpenSSL.cpp
index 24ed1b2c1ccdd1..44af20001c812d 100644
--- a/src/crypto/CHIPCryptoPALOpenSSL.cpp
+++ b/src/crypto/CHIPCryptoPALOpenSSL.cpp
@@ -913,6 +913,11 @@ void ClearSecretData(uint8_t * buf, size_t len)
     OPENSSL_cleanse(buf, len);
 }
 
+bool IsBufferContentEqualConstantTime(const void * a, const void * b, size_t n)
+{
+    return CRYPTO_memcmp(a, b, n) == 0;
+}
+
 static CHIP_ERROR P256PublicKeyFromECKey(EC_KEY * ec_key, P256PublicKey & pubkey)
 {
     ERR_clear_error();
diff --git a/src/crypto/CHIPCryptoPALmbedTLS.cpp b/src/crypto/CHIPCryptoPALmbedTLS.cpp
index 8b63966b1bce21..c83ac6124ba78e 100644
--- a/src/crypto/CHIPCryptoPALmbedTLS.cpp
+++ b/src/crypto/CHIPCryptoPALmbedTLS.cpp
@@ -44,11 +44,19 @@
 #include <mbedtls/x509.h>
 #include <mbedtls/x509_csr.h>
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+#include <mbedtls/pk.h>
+#include <tinycrypt/ecc.h>
+#include <tinycrypt/ecc_dh.h>
+#include <tinycrypt/ecc_dsa.h>
+#endif // defined(MBEDTLS_USE_TINYCRYPT)
+
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/BufferWriter.h>
 #include <lib/support/BytesToHex.h>
 #include <lib/support/CHIPArgParser.hpp>
 #include <lib/support/CodeUtils.h>
+#include <lib/support/SafeInt.h>
 #include <lib/support/SafePointerCast.h>
 #include <lib/support/logging/CHIPLogging.h>
 
@@ -85,7 +93,11 @@ static EntropyContext gsEntropyContext;
 
 static void _log_mbedTLS_error(int error_code)
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    if (error_code != 0 && error_code != UECC_SUCCESS)
+#else
     if (error_code != 0)
+#endif
     {
 #if defined(MBEDTLS_ERROR_C)
         char error_str[MAX_ERROR_STR_LEN];
@@ -289,6 +301,7 @@ CHIP_ERROR Hash_SHA256_stream::GetDigest(MutableByteSpan & out_buffer)
 
     // 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.
@@ -296,6 +309,7 @@ CHIP_ERROR Hash_SHA256_stream::GetDigest(MutableByteSpan & out_buffer)
 
     // Restore context prior to finalization.
     mbedtls_sha256_clone(context, &previous_ctx);
+    mbedtls_sha256_free(&previous_ctx);
 
     return result;
 }
@@ -482,6 +496,24 @@ 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;
 }
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+
+static int uecc_rng_wrapper(uint8_t * dest, unsigned int size)
+{
+    int ret;
+
+    ret = CryptoRNG(NULL, dest, size);
+
+    return (ret == 0) ? size : 0;
+}
+
+static int uECC_is_rng_set(void)
+{
+    return (uecc_rng_wrapper == uECC_get_rng()) ? 1 : 0;
+}
+
+#endif
+
 mbedtls_ecp_group_id MapECPGroupId(SupportedECPKeyTypes keyType)
 {
     switch (keyType)
@@ -493,6 +525,20 @@ mbedtls_ecp_group_id MapECPGroupId(SupportedECPKeyTypes keyType)
     }
 }
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+
+static inline mbedtls_uecc_keypair * to_keypair(P256KeypairContext * context)
+{
+    return SafePointerCast<mbedtls_uecc_keypair *>(context);
+}
+
+static inline const mbedtls_uecc_keypair * to_const_keypair(const P256KeypairContext * context)
+{
+    return SafePointerCast<const mbedtls_uecc_keypair *>(context);
+}
+
+#else
+
 static inline mbedtls_ecp_keypair * to_keypair(P256KeypairContext * context)
 {
     return SafePointerCast<mbedtls_ecp_keypair *>(context);
@@ -503,6 +549,8 @@ static inline const mbedtls_ecp_keypair * to_const_keypair(const P256KeypairCont
     return SafePointerCast<const mbedtls_ecp_keypair *>(context);
 }
 
+#endif
+
 CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, const size_t msg_length, P256ECDSASignature & out_signature) const
 {
 #if defined(MBEDTLS_ECDSA_C)
@@ -521,13 +569,32 @@ CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, const size_t msg_len
 
 CHIP_ERROR P256Keypair::ECDSA_sign_hash(const uint8_t * hash, const size_t hash_length, P256ECDSASignature & out_signature) const
 {
-#if defined(MBEDTLS_ECDSA_C)
+#if defined(MBEDTLS_USE_TINYCRYPT)
     VerifyOrReturnError(mInitialized, CHIP_ERROR_INCORRECT_STATE);
     VerifyOrReturnError(hash != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(hash_length == kSHA256_Hash_Length, CHIP_ERROR_INVALID_ARGUMENT);
 
     CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
+    int result       = UECC_FAILURE;
+
+    const mbedtls_uecc_keypair * keypair = to_const_keypair(&mKeypair);
+
+    result = uECC_sign(keypair->private_key, hash, hash_length, out_signature.Bytes());
+
+    VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(out_signature.SetLength(kP256_ECDSA_Signature_Length_Raw) == CHIP_NO_ERROR, error = CHIP_ERROR_INTERNAL);
+
+    keypair = nullptr;
+
+exit:
+    return error;
+#elif defined(MBEDTLS_ECDSA_C)
+    VerifyOrReturnError(mInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(hash != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(hash_length == kSHA256_Hash_Length, 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);
@@ -588,13 +655,29 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_msg_signature(const uint8_t * msg, cons
 CHIP_ERROR P256PublicKey::ECDSA_validate_hash_signature(const uint8_t * hash, const size_t hash_length,
                                                         const P256ECDSASignature & signature) const
 {
-#if defined(MBEDTLS_ECDSA_C)
+#if defined(MBEDTLS_USE_TINYCRYPT)
     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;
+    int result       = UECC_FAILURE;
+
+    const uint8_t * public_key = *this;
+
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    result = uECC_verify(public_key + 1, hash, hash_length, Uint8::to_const_uchar(signature.ConstBytes()));
+    VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INVALID_SIGNATURE);
+
+exit:
+    return error;
+#elif 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);
@@ -645,6 +728,27 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_hash_signature(const uint8_t * hash, co
 CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_key, P256ECDHDerivedSecret & out_secret) const
 {
 #if defined(MBEDTLS_ECDH_C)
+
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    CHIP_ERROR error     = CHIP_NO_ERROR;
+    int result           = 0;
+    size_t secret_length = (out_secret.Length() == 0) ? out_secret.Capacity() : out_secret.Length();
+
+    const mbedtls_uecc_keypair * keypair = to_const_keypair(&mKeypair);
+
+    VerifyOrExit(mInitialized, error = CHIP_ERROR_INCORRECT_STATE);
+
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    result = uECC_shared_secret(remote_public_key.ConstBytes() + 1, keypair->private_key, Uint8::to_uchar(out_secret));
+    VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
+
+    SuccessOrExit(out_secret.SetLength(secret_length));
+
+exit:
+    keypair = nullptr;
+    _log_mbedTLS_error(result);
+    return error;
+#else
     CHIP_ERROR error     = CHIP_NO_ERROR;
     int result           = 0;
     size_t secret_length = (out_secret.Length() == 0) ? out_secret.Capacity() : out_secret.Length();
@@ -684,6 +788,8 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
     mbedtls_ecp_point_free(&ecp_pubkey);
     _log_mbedTLS_error(result);
     return error;
+#endif
+
 #else
     return CHIP_ERROR_NOT_IMPLEMENTED;
 #endif
@@ -694,10 +800,62 @@ void ClearSecretData(uint8_t * buf, size_t len)
     mbedtls_platform_zeroize(buf, len);
 }
 
+// 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;
+}
+
 CHIP_ERROR P256Keypair::Initialize()
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
     CHIP_ERROR error = CHIP_NO_ERROR;
-    int result       = 0;
+    int result       = UECC_FAILURE;
+
+    Clear();
+
+    mbedtls_uecc_keypair * keypair = to_keypair(&mKeypair);
+    if (!uECC_is_rng_set())
+    {
+        uECC_set_rng(&uecc_rng_wrapper);
+    }
+
+    result = uECC_make_key(keypair->public_key, keypair->private_key);
+    VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
+
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    Uint8::to_uchar(mPublicKey)[0] = 0x04;
+    memcpy(Uint8::to_uchar(mPublicKey) + 1, keypair->public_key, 2 * NUM_ECC_BYTES);
+
+    keypair      = nullptr;
+    mInitialized = true;
+
+exit:
+    _log_mbedTLS_error(result);
+    return error;
+#else
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    int result = 0;
 
     size_t pubkey_size = 0;
 
@@ -717,7 +875,7 @@ CHIP_ERROR P256Keypair::Initialize()
     VerifyOrExit(result == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrExit(pubkey_size == mPublicKey.Length(), error = CHIP_ERROR_INVALID_ARGUMENT);
 
-    keypair      = nullptr;
+    keypair = nullptr;
     mInitialized = true;
 
 exit:
@@ -729,12 +887,14 @@ CHIP_ERROR P256Keypair::Initialize()
 
     _log_mbedTLS_error(result);
     return error;
+#endif
 }
 
 CHIP_ERROR P256Keypair::Serialize(P256SerializedKeypair & output) const
 {
-    const mbedtls_ecp_keypair * keypair = to_const_keypair(&mKeypair);
-    size_t len                          = output.Length() == 0 ? output.Capacity() : output.Length();
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    const mbedtls_uecc_keypair * keypair = to_const_keypair(&mKeypair);
+    size_t len                           = output.Length() == 0 ? output.Capacity() : output.Length();
     Encoding::BufferWriter bbuf(output, len);
     uint8_t privkey[kP256_PrivateKey_Length];
     CHIP_ERROR error = CHIP_NO_ERROR;
@@ -742,6 +902,30 @@ CHIP_ERROR P256Keypair::Serialize(P256SerializedKeypair & output) const
 
     bbuf.Put(mPublicKey, mPublicKey.Length());
 
+    VerifyOrExit(bbuf.Available() == sizeof(privkey), error = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(sizeof(keypair->private_key) <= bbuf.Available(), error = CHIP_ERROR_INTERNAL);
+
+    memcpy(privkey, keypair->private_key, sizeof(privkey));
+
+    bbuf.Put(privkey, sizeof(privkey));
+    VerifyOrExit(bbuf.Fit(), error = CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    output.SetLength(bbuf.Needed());
+
+exit:
+    memset(privkey, 0, sizeof(privkey));
+    _log_mbedTLS_error(result);
+    return error;
+#else
+    const mbedtls_ecp_keypair * keypair = to_const_keypair(&mKeypair);
+    size_t len = output.Length() == 0 ? output.Capacity() : output.Length();
+    Encoding::BufferWriter bbuf(output, len);
+    uint8_t privkey[kP256_PrivateKey_Length];
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    int result = 0;
+
+    bbuf.Put(mPublicKey, mPublicKey.Length());
+
     VerifyOrExit(bbuf.Available() == sizeof(privkey), error = CHIP_ERROR_INTERNAL);
 
     VerifyOrExit(mbedtls_mpi_size(&keypair->CHIP_CRYPTO_PAL_PRIVATE(d)) <= bbuf.Available(), error = CHIP_ERROR_INTERNAL);
@@ -758,13 +942,44 @@ CHIP_ERROR P256Keypair::Serialize(P256SerializedKeypair & output) const
     ClearSecretData(privkey, sizeof(privkey));
     _log_mbedTLS_error(result);
     return error;
+#endif
 }
 
 CHIP_ERROR P256Keypair::Deserialize(P256SerializedKeypair & input)
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    int result       = 0;
+    CHIP_ERROR error = CHIP_NO_ERROR;
     Encoding::BufferWriter bbuf(mPublicKey, mPublicKey.Length());
 
-    int result       = 0;
+    Clear();
+
+    mbedtls_uecc_keypair * keypair = to_keypair(&mKeypair);
+    if (!uECC_is_rng_set())
+    {
+        uECC_set_rng(&uecc_rng_wrapper);
+    }
+
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    memcpy(keypair->public_key, Uint8::to_uchar(input) + 1, 2 * NUM_ECC_BYTES);
+    memcpy(keypair->private_key, Uint8::to_uchar(input) + mPublicKey.Length(), NUM_ECC_BYTES);
+
+    keypair = nullptr;
+
+    VerifyOrExit(input.Length() == mPublicKey.Length() + kP256_PrivateKey_Length, error = CHIP_ERROR_INVALID_ARGUMENT);
+    bbuf.Put((const uint8_t *) input, mPublicKey.Length());
+    VerifyOrExit(bbuf.Fit(), error = CHIP_ERROR_NO_MEMORY);
+
+    mInitialized = true;
+
+    _log_mbedTLS_error(result);
+
+exit:
+    return error;
+#else
+    Encoding::BufferWriter bbuf(mPublicKey, mPublicKey.Length());
+
+    int result = 0;
     CHIP_ERROR error = CHIP_NO_ERROR;
 
     Clear();
@@ -795,15 +1010,22 @@ CHIP_ERROR P256Keypair::Deserialize(P256SerializedKeypair & input)
 exit:
     _log_mbedTLS_error(result);
     return error;
+#endif
 }
 
 void P256Keypair::Clear()
 {
     if (mInitialized)
     {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+        mbedtls_uecc_keypair * keypair = to_keypair(&mKeypair);
+        memset(keypair, 0, sizeof(mbedtls_uecc_keypair));
+        mInitialized = false;
+#else
         mbedtls_ecp_keypair * keypair = to_keypair(&mKeypair);
         mbedtls_ecp_keypair_free(keypair);
         mInitialized = false;
+#endif
     }
 }
 
@@ -815,29 +1037,19 @@ P256Keypair::~P256Keypair()
 CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t & csr_length) const
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
-
-    int result = 0;
-
+    int result       = 0;
     size_t out_length;
 
-    const mbedtls_ecp_keypair * keypair = to_const_keypair(&mKeypair);
-
     mbedtls_x509write_csr csr;
     mbedtls_x509write_csr_init(&csr);
 
     mbedtls_pk_context pk;
-    mbedtls_pk_init(&pk);
-
-    const mbedtls_pk_info_t * pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
-    VerifyOrExit(pk_info != nullptr, error = CHIP_ERROR_INTERNAL);
+    pk.CHIP_CRYPTO_PAL_PRIVATE(pk_info) = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
+    pk.CHIP_CRYPTO_PAL_PRIVATE(pk_ctx)  = to_keypair(&mKeypair);
+    VerifyOrExit(pk.CHIP_CRYPTO_PAL_PRIVATE(pk_info) != nullptr, error = CHIP_ERROR_INTERNAL);
 
     VerifyOrExit(mInitialized, error = CHIP_ERROR_INCORRECT_STATE);
 
-    result = mbedtls_pk_setup(&pk, pk_info);
-    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
-
-    memcpy(mbedtls_pk_ec(pk), keypair, sizeof(mbedtls_ecp_keypair));
-
     mbedtls_x509write_csr_set_key(&csr, &pk);
 
     mbedtls_x509write_csr_set_md_alg(&csr, MBEDTLS_MD_SHA256);
@@ -850,8 +1062,9 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t &
 
     result = mbedtls_x509write_csr_der(&csr, out_csr, csr_length, CryptoRNG, nullptr);
     VerifyOrExit(result > 0, error = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(CanCastTo<size_t>(result), error = CHIP_ERROR_INTERNAL);
 
-    out_length = (size_t) result;
+    out_length = static_cast<size_t>(result);
     result     = 0;
     VerifyOrExit(out_length <= csr_length, error = CHIP_ERROR_INTERNAL);
 
@@ -868,12 +1081,6 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t &
 exit:
     mbedtls_x509write_csr_free(&csr);
 
-    // TODO: Figure-out why the next 2 lines are OK. Valgrind complains or crash occurs if either is deleted.
-    // Oddly, the following `mbedtls_ecp_keypair_init` is needed to avoid a double-free
-    // with the following pk_free, which is needed.
-    mbedtls_ecp_keypair_init(mbedtls_pk_ec(pk));
-    mbedtls_pk_free(&pk);
-
     _log_mbedTLS_error(result);
     return error;
 }
@@ -939,6 +1146,21 @@ CHIP_ERROR VerifyCertificateSigningRequest(const uint8_t * csr_buf, size_t csr_l
 
 typedef struct Spake2p_Context
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    const mbedtls_md_info_t * md_info;
+    uECC_word_t M[2 * NUM_ECC_WORDS];
+    uECC_word_t N[2 * NUM_ECC_WORDS];
+    uECC_word_t X[2 * NUM_ECC_WORDS];
+    uECC_word_t Y[2 * NUM_ECC_WORDS];
+    uECC_word_t L[2 * NUM_ECC_WORDS];
+    uECC_word_t Z[2 * NUM_ECC_WORDS];
+    uECC_word_t V[2 * NUM_ECC_WORDS];
+
+    uECC_word_t w0[NUM_ECC_WORDS];
+    uECC_word_t w1[NUM_ECC_WORDS];
+    uECC_word_t xy[NUM_ECC_WORDS];
+    uECC_word_t tempbn[NUM_ECC_WORDS];
+#else
     mbedtls_ecp_group curve;
     const mbedtls_md_info_t * md_info;
     mbedtls_ecp_point M;
@@ -953,6 +1175,7 @@ typedef struct Spake2p_Context
     mbedtls_mpi w1;
     mbedtls_mpi xy;
     mbedtls_mpi tempbn;
+#endif
 } Spake2p_Context;
 
 static inline Spake2p_Context * to_inner_spake2p_context(Spake2pOpaqueContext * context)
@@ -968,6 +1191,28 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::InitInternal(void)
     Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
 
     memset(context, 0, sizeof(Spake2p_Context));
+
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    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;
+
+    G = curve_G;
+
+    if (!uECC_is_rng_set())
+    {
+        uECC_set_rng(&uecc_rng_wrapper);
+    }
+#else
     mbedtls_ecp_group_init(&context->curve);
     result = mbedtls_ecp_group_load(&context->curve, MBEDTLS_ECP_DP_SECP256R1);
     VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
@@ -994,13 +1239,14 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::InitInternal(void)
     mbedtls_mpi_init(&context->w1);
     mbedtls_mpi_init(&context->xy);
     mbedtls_mpi_init(&context->tempbn);
-    w0     = &context->w0;
-    w1     = &context->w1;
-    xy     = &context->xy;
+    w0 = &context->w0;
+    w1 = &context->w1;
+    xy = &context->xy;
     tempbn = &context->tempbn;
 
-    G     = &context->curve.G;
+    G = &context->curve.G;
     order = &context->curve.N;
+#endif
 
     return error;
 
@@ -1015,7 +1261,22 @@ void Spake2p_P256_SHA256_HKDF_HMAC::Clear()
     VerifyOrReturn(state != CHIP_SPAKE2P_STATE::PREINIT);
 
     Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
-
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    memset(&context->M, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->N, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->X, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->Y, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->L, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->Z, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->V, 0, 2 * NUM_ECC_WORDS * sizeof(uECC_word_t));
+
+    memset(&context->w0, 0, NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->w1, 0, NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->xy, 0, NUM_ECC_WORDS * sizeof(uECC_word_t));
+    memset(&context->tempbn, 0, NUM_ECC_WORDS * sizeof(uECC_word_t));
+
+    G = NULL;
+#else
     mbedtls_ecp_point_free(&context->M);
     mbedtls_ecp_point_free(&context->N);
     mbedtls_ecp_point_free(&context->X);
@@ -1030,7 +1291,7 @@ void Spake2p_P256_SHA256_HKDF_HMAC::Clear()
     mbedtls_mpi_free(&context->tempbn);
 
     mbedtls_ecp_group_free(&context->curve);
-
+#endif
     state = CHIP_SPAKE2P_STATE::PREINIT;
 }
 
@@ -1044,24 +1305,6 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::Mac(const uint8_t * key, size_t key_le
     return CHIP_NO_ERROR;
 }
 
-/**
- * This function implements constant time memcmp. It's good practice
- * to use constant time functions for cryptographic functions.
- */
-static inline int constant_time_memcmp(const void * a, const void * b, size_t n)
-{
-    const uint8_t * A = (const uint8_t *) a;
-    const uint8_t * B = (const uint8_t *) b;
-    uint8_t diff      = 0;
-
-    for (size_t i = 0; i < n; i++)
-    {
-        diff |= (A[i] ^ B[i]);
-    }
-
-    return diff;
-}
-
 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)
 {
@@ -1075,7 +1318,7 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::MacVerify(const uint8_t * key, size_t
     SuccessOrExit(error = Mac(key, key_len, in, in_len, computed_mac_span));
     VerifyOrExit(computed_mac_span.size() == mac_len, error = CHIP_ERROR_INTERNAL);
 
-    VerifyOrExit(constant_time_memcmp(mac, computed_mac, kSHA256_Hash_Length) == 0, error = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(IsBufferContentEqualConstantTime(mac, computed_mac, kSHA256_Hash_Length), error = CHIP_ERROR_INTERNAL);
 
 exit:
     _log_mbedTLS_error(result);
@@ -1087,11 +1330,18 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FELoad(const uint8_t * in, size_t in_l
     CHIP_ERROR error = CHIP_NO_ERROR;
     int result       = 0;
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    uECC_word_t tmp[2 * NUM_ECC_WORDS] = { 0 };
+    uECC_vli_bytesToNative(tmp, in, NUM_ECC_BYTES);
+
+    uECC_vli_mmod((uECC_word_t *) fe, tmp, curve_n);
+#else
     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);
+#endif
 
 exit:
     _log_mbedTLS_error(result);
@@ -1100,11 +1350,14 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FELoad(const uint8_t * in, size_t in_l
 
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEWrite(const void * fe, uint8_t * out, size_t out_len)
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    uECC_vli_nativeToBytes(out, NUM_ECC_BYTES, (const unsigned int *) fe);
+#else
     if (mbedtls_mpi_write_binary((const mbedtls_mpi *) fe, Uint8::to_uchar(out), out_len) != 0)
     {
         return CHIP_ERROR_INTERNAL;
     }
-
+#endif
     return CHIP_NO_ERROR;
 }
 
@@ -1113,10 +1366,21 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEGenerate(void * fe)
     CHIP_ERROR error = CHIP_NO_ERROR;
     int result       = 0;
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    mbedtls_uecc_keypair keypair;
+
+    result = UECC_FAILURE;
+
+    result = uECC_make_key(keypair.public_key, keypair.private_key);
+    VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
+
+    uECC_vli_bytesToNative((uECC_word_t *) fe, keypair.private_key, NUM_ECC_BYTES);
+#else
     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);
+#endif
 
 exit:
     _log_mbedTLS_error(result);
@@ -1128,11 +1392,15 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEMul(void * fer, const void * fe1, co
     CHIP_ERROR error = CHIP_NO_ERROR;
     int result       = 0;
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    uECC_vli_modMult((uECC_word_t *) fer, (const uECC_word_t *) fe1, (const uECC_word_t *) fe2, (const uECC_word_t *) curve_n);
+#else
     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);
+#endif
 
 exit:
     _log_mbedTLS_error(result);
@@ -1141,12 +1409,22 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::FEMul(void * fer, const void * fe1, co
 
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointLoad(const uint8_t * in, size_t in_len, void * R)
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    uint8_t tmp[2 * NUM_ECC_BYTES];
+
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    memcpy(tmp, in + 1, 2 * NUM_ECC_BYTES);
+
+    uECC_vli_bytesToNative((uECC_word_t *) R, tmp, NUM_ECC_BYTES);
+    uECC_vli_bytesToNative((uECC_word_t *) R + NUM_ECC_WORDS, tmp + NUM_ECC_BYTES, NUM_ECC_BYTES);
+#else
     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;
     }
+#endif
 
     return CHIP_NO_ERROR;
 }
@@ -1154,6 +1432,13 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointLoad(const uint8_t * in, size_t i
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointWrite(const void * R, uint8_t * out, size_t out_len)
 {
     memset(out, 0, out_len);
+
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    out[0] = 0x04;
+    uECC_vli_nativeToBytes(out + 1, NUM_ECC_BYTES, (uECC_word_t *) R);
+    uECC_vli_nativeToBytes(out + NUM_ECC_BYTES + 1, NUM_ECC_BYTES, (uECC_word_t *) R + NUM_ECC_WORDS);
+#else
     size_t mbedtls_out_len = out_len;
 
     Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
@@ -1163,16 +1448,22 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointWrite(const void * R, uint8_t * o
     {
         return CHIP_ERROR_INTERNAL;
     }
+#endif
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointMul(void * R, const void * P1, const void * fe1)
 {
+
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    if (EccPoint_mult_safer((uECC_word_t *) R, (const uECC_word_t *) P1, (const uECC_word_t *) fe1) != UECC_SUCCESS)
+#else
     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)
+#endif
     {
         return CHIP_ERROR_INTERNAL;
     }
@@ -1183,6 +1474,29 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointMul(void * R, const void * P1, co
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointAddMul(void * R, const void * P1, const void * fe1, const void * P2,
                                                       const void * fe2)
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    uECC_word_t R1[2 * NUM_ECC_WORDS];
+    uECC_word_t R2[2 * NUM_ECC_WORDS];
+    uECC_word_t z[NUM_ECC_WORDS];
+    uint8_t ret = UECC_SUCCESS;
+
+    if (EccPoint_mult_safer(R1, (const uECC_word_t *) P1, (const uECC_word_t *) fe1) != UECC_SUCCESS)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    if (EccPoint_mult_safer(R2, (const uECC_word_t *) P2, (const uECC_word_t *) fe2) != UECC_SUCCESS)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    uECC_vli_modSub(z, R2, R1, curve_p);
+    XYcZ_add(R1, R1 + NUM_ECC_WORDS, R2, R2 + NUM_ECC_WORDS);
+    uECC_vli_modInv(z, z, curve_p);
+    apply_z(R2, R2 + NUM_ECC_WORDS, z);
+
+    memcpy((uECC_word_t *) R, R2, 2 * NUM_ECC_BYTES);
+#else
     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,
@@ -1190,19 +1504,27 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointAddMul(void * R, const void * P1,
     {
         return CHIP_ERROR_INTERNAL;
     }
+#endif
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointInvert(void * R)
 {
-    mbedtls_ecp_point * Rp    = (mbedtls_ecp_point *) R;
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    uECC_word_t tmp[NUM_ECC_WORDS] = { 0 };
+
+    uECC_vli_sub(tmp, curve_p, (uECC_word_t *) R + NUM_ECC_WORDS);
+    memcpy((uECC_word_t *) R + NUM_ECC_WORDS, tmp, NUM_ECC_BYTES);
+#else
+    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;
     }
+#endif
 
     return CHIP_NO_ERROR;
 }
@@ -1217,6 +1539,24 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::ComputeL(uint8_t * Lout, size_t * L_le
     CHIP_ERROR error = CHIP_NO_ERROR;
     int result       = 0;
 
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    result = UECC_SUCCESS;
+    uECC_word_t tmp[2 * NUM_ECC_WORDS];
+    uECC_word_t w1_bn[NUM_ECC_WORDS];
+    uECC_word_t L_tmp[2 * NUM_ECC_WORDS];
+
+    uECC_vli_bytesToNative(tmp, w1in, NUM_ECC_BYTES);
+
+    uECC_vli_mmod(w1_bn, tmp, curve_n);
+
+    result = EccPoint_mult_safer(L_tmp, curve_G, w1_bn);
+    VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
+
+    // Fully padded raw uncompressed points expected, first byte is always 0x04 i.e uncompressed
+    Lout[0] = 0x04;
+    uECC_vli_nativeToBytes(Lout + 1, NUM_ECC_BYTES, L_tmp);
+    uECC_vli_nativeToBytes(Lout + NUM_ECC_BYTES + 1, NUM_ECC_BYTES, L_tmp + NUM_ECC_WORDS);
+#else
     mbedtls_ecp_group curve;
     mbedtls_mpi w1_bn;
     mbedtls_ecp_point Ltemp;
@@ -1241,21 +1581,28 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::ComputeL(uint8_t * Lout, size_t * L_le
 
     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);
+#endif
 
 exit:
     _log_mbedTLS_error(result);
+#if !defined(MBEDTLS_USE_TINYCRYPT)
     mbedtls_ecp_point_free(&Ltemp);
     mbedtls_mpi_free(&w1_bn);
     mbedtls_ecp_group_free(&curve);
+#endif
 
     return error;
 }
 
 CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointIsValid(void * R)
 {
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    if (uECC_valid_point((const uECC_word_t *) R) != 0)
+#else
     Spake2p_Context * context = to_inner_spake2p_context(&mSpake2pContext);
 
     if (mbedtls_ecp_check_pubkey(&context->curve, (mbedtls_ecp_point *) R) != 0)
+#endif
     {
         return CHIP_ERROR_INTERNAL;
     }
diff --git a/src/crypto/OperationalKeystore.h b/src/crypto/OperationalKeystore.h
new file mode 100644
index 00000000000000..29f13290d42f92
--- /dev/null
+++ b/src/crypto/OperationalKeystore.h
@@ -0,0 +1,157 @@
+#pragma once
+
+#include <crypto/CHIPCryptoPAL.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
+#include <lib/support/Span.h>
+
+namespace chip {
+namespace Crypto {
+
+class OperationalKeystore
+{
+public:
+    virtual ~OperationalKeystore() {}
+
+    // ==== API designed for commisionables to support fail-safe (although can be used by controllers) ====
+
+    /**
+     * @brief Returns true if a pending operational key exists from a previous
+     *        `NewOpKeypairForFabric` before any `CommitOpKeypairForFabric` or
+     *        `RevertOpKeypairForFabric`. This returns true even if the key is
+     *        NOT ACTIVE (i.e after `NewOpKeypairForFabric` but before
+     *        `ActivateOpKeypairForFabric`).
+     */
+    virtual bool HasPendingOpKeypair() const = 0;
+
+    /**
+     * @brief Returns whether a usable operational key exists for the given fabric.
+     *
+     * Returns true even if the key is not persisted, such as if `ActivateOpKeypairForFabric`
+     * had been successfully called for a given fabric. Only returns true if a key
+     * is presently usable such that `SignWithOpKeypair` would succeed for the fabric. Therefore
+     * if there was no previously persisted key and `NewOpKeypairForFabric` had been called
+     * but not `ActivateOpKeypairForFabric`, there is only an inactive key, and this would return false.
+     *
+     * @param fabricIndex - FabricIndex for which availability of keypair will be checked.
+     * @return true if there an active operational keypair for the given FabricIndex, false otherwise.
+     */
+    virtual bool HasOpKeypairForFabric(FabricIndex fabricIndex) const = 0;
+
+    /**
+     * @brief This initializes a new keypair for the given fabric and generates a CSR for it,
+     *        so that it can be passed in a CSRResponse.
+     *
+     * The keypair is temporary and becomes usable for `SignWithOpKeypair` only after either
+     * `ActivateOpKeypairForFabric` is called. It is destroyed if
+     * `RevertPendingKeypair` or `Finish` is called before `CommitOpKeypairForFabric`.
+     *  If a pending keypair already existed for the given `fabricIndex`, it is replaced by this call.
+     *
+     *  Only one pending operational keypair is supported at a time.
+     *
+     * @param fabricIndex - FabricIndex for which a new keypair must be made available
+     * @param outCertificateSigningRequest - Buffer to contain the CSR. Must be at least `kMAX_CSR_Length` large.
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_BUFFER_TOO_SMALL if `outCertificateSigningRequest` buffer is too small
+     * @retval CHIP_ERROR_INCORRECT_STATE if the key store is not properly initialized.
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is already a pending keypair for another `fabricIndex` value
+     *                                         or if fabricIndex is an invalid value.
+     * @retval CHIP_ERROR_NOT_IMPLEMENTED if only `SignWithOpKeypair` is supported
+     * @retval other CHIP_ERROR value on internal crypto engine errors
+     */
+    virtual CHIP_ERROR NewOpKeypairForFabric(FabricIndex fabricIndex, MutableByteSpan & outCertificateSigningRequest) = 0;
+
+    /**
+     * @brief Temporarily activates the operational keypair last generated with `NewOpKeypairForFabric`, so
+     *        that `SignWithOpKeypair` starts using it, but only if it matches the public key associated
+     *        with the last NewOpKeypairForFabric.
+     *
+     * This is to be used by AddNOC and UpdateNOC so that a prior key generated by NewOpKeypairForFabric
+     * can be used for CASE while not committing it yet to permanent storage to remain after fail-safe.
+     *
+     * @param fabricIndex - FabricIndex for which to activate the keypair, used for security cross-checking
+     * @param nocPublicKey - Subject public key associated with an incoming NOC
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INCORRECT_STATE if the key store is not properly initialized.
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is no operational keypair for `fabricIndex` from a previous
+     *                                         matching `NewOpKeypairForFabric`.
+     * @retval CHIP_ERROR_INVALID_PUBLIC_KEY if `nocPublicKey` does not match the public key associated with the
+     *                                       key pair from last `NewOpKeypairForFabric`.
+     * @retval CHIP_ERROR_NOT_IMPLEMENTED if only `SignWithOpKeypair` is supported
+     * @retval other CHIP_ERROR value on internal storage or crypto engine errors
+     */
+    virtual CHIP_ERROR ActivateOpKeypairForFabric(FabricIndex fabricIndex, const Crypto::P256PublicKey & nocPublicKey) = 0;
+
+    /**
+     * @brief Permanently commit the operational keypair last generated with `NewOpKeypairForFabric`,
+     *        replacing a prior one previously committed, if any, so that `SignWithOpKeypair` for the
+     *        given `FabricIndex` permanently uses the key that was pending.
+     *
+     * This is to be used when CommissioningComplete is successfully received
+     *
+     * @param fabricIndex - FabricIndex for which to commit the keypair, used for security cross-checking
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INCORRECT_STATE if the key store is not properly initialized,
+     *                                    or ActivateOpKeypairForFabric not yet called
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is no pending operational keypair for `fabricIndex`
+     * @retval CHIP_ERROR_NOT_IMPLEMENTED if only `SignWithOpKeypair` is supported
+     * @retval other CHIP_ERROR value on internal storage or crypto engine errors
+     */
+    virtual CHIP_ERROR CommitOpKeypairForFabric(FabricIndex fabricIndex) = 0;
+
+    /**
+     * @brief Permanently remove the keypair associated with a fabric
+     *
+     * This is to be used for fail-safe handling and RemoveFabric.  Removes both the
+     * pending operational keypair for the fabricIndex (if any) and the committed one (if any).
+     *
+     * @param fabricIndex - FabricIndex for which to remove the keypair
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INCORRECT_STATE if the key store is not properly initialized.
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if there is no operational keypair for `fabricIndex`
+     * @retval CHIP_ERROR_NOT_IMPLEMENTED if only `SignWithOpKeypair` is supported
+     * @retval other CHIP_ERROR value on internal storage errors
+     */
+    virtual CHIP_ERROR RemoveOpKeypairForFabric(FabricIndex fabricIndex) = 0;
+
+    /**
+     * @brief Permanently release the operational keypair last generated with `NewOpKeypairForFabric`,
+     *        such that `SignWithOpKeypair` uses the previously committed key (if one existed).
+     *
+     * This is to be used when a fail-safe expires prior to CommissioningComplete.
+     *
+     * This method cannot error-out and must always succeed, even on a no-op. This should
+     * be safe to do given that `CommitOpKeypairForFabric` must succeed to make a new operational
+     * keypair usable.
+     */
+    virtual void RevertPendingKeypair() = 0;
+
+    // ==== Primary operation required: signature
+    /**
+     * @brief Sign a message with a fabric's currently-active operational keypair.
+     *
+     * If a Keypair was successfully made temporarily active for the given `fabricIndex` with `ActivateOpKeypairForFabric`,
+     * then that is the keypair whose private key is used. Otherwise, the last committed private key
+     * is used, if one exists
+     *
+     * @param fabricIndex - FabricIndex whose operational keypair will be used to sign the `message`
+     * @param message - Message to sign with the currently active operational keypair
+     * @param outSignature - Buffer to contain the signature
+     *
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INCORRECT_STATE if the key store is not properly initialized.
+     * @retval CHIP_ERROR_INVALID_FABRIC_INDEX if no active key is found for the given `fabricIndex` or if
+     *                                         `fabricIndex` is invalid.
+     * @retval other CHIP_ERROR value on internal crypto engine errors
+     *
+     */
+    virtual CHIP_ERROR SignWithOpKeypair(FabricIndex fabricIndex, const ByteSpan & message,
+                                         Crypto::P256ECDSASignature & outSignature) const = 0;
+};
+
+} // namespace Crypto
+} // namespace chip
diff --git a/src/crypto/PersistentStorageOperationalKeystore.cpp b/src/crypto/PersistentStorageOperationalKeystore.cpp
new file mode 100644
index 00000000000000..3c099833ffb601
--- /dev/null
+++ b/src/crypto/PersistentStorageOperationalKeystore.cpp
@@ -0,0 +1,304 @@
+/*
+ *    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 <crypto/OperationalKeystore.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/CHIPPersistentStorageDelegate.h>
+#include <lib/core/CHIPTLV.h>
+#include <lib/core/DataModelTypes.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/DefaultStorageKeyAllocator.h>
+#include <lib/support/SafeInt.h>
+
+#include "PersistentStorageOperationalKeystore.h"
+
+namespace chip {
+
+using namespace chip::Crypto;
+
+namespace {
+
+// Tags for our operational keypair storage.
+constexpr TLV::Tag kOpKeyVersionTag = TLV::ContextTag(0);
+constexpr TLV::Tag kOpKeyDataTag    = TLV::ContextTag(1);
+
+// If this version grows beyond UINT16_MAX, adjust OpKeypairTLVMaxSize
+// accordingly.
+constexpr uint16_t kOpKeyVersion = 1;
+
+constexpr size_t OpKeyTLVMaxSize()
+{
+    // Version and serialized key
+    return TLV::EstimateStructOverhead(sizeof(uint16_t), Crypto::P256SerializedKeypair::Capacity());
+}
+
+/** WARNING: This can leave the operational key on the stack somewhere, since many of the platform
+ *           APIs use stack buffers and do not sanitize! This implementation is for example purposes
+ *           only of the API and it is recommended to avoid directly accessing raw private key bits
+ *           in storage.
+ */
+CHIP_ERROR StoreOperationalKey(FabricIndex fabricIndex, PersistentStorageDelegate * storage, P256Keypair * keypair)
+{
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex) && (storage != nullptr) && (keypair != nullptr),
+                        CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Use a CapacityBoundBuffer to get RAII secret data clearing on scope exit.
+    Crypto::CapacityBoundBuffer<OpKeyTLVMaxSize()> buf;
+    TLV::TLVWriter writer;
+
+    writer.Init(buf.Bytes(), buf.Capacity());
+
+    TLV::TLVType outerType;
+    ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerType));
+
+    ReturnErrorOnFailure(writer.Put(kOpKeyVersionTag, kOpKeyVersion));
+
+    {
+        // P256SerializedKeypair has RAII secret clearing
+        Crypto::P256SerializedKeypair serializedOpKey;
+        ReturnErrorOnFailure(keypair->Serialize(serializedOpKey));
+
+        ReturnErrorOnFailure(writer.Put(kOpKeyDataTag, ByteSpan(serializedOpKey.Bytes(), serializedOpKey.Length())));
+    }
+
+    ReturnErrorOnFailure(writer.EndContainer(outerType));
+
+    const auto opKeyLength = writer.GetLengthWritten();
+    DefaultStorageKeyAllocator keyAlloc;
+    VerifyOrReturnError(CanCastTo<uint16_t>(opKeyLength), CHIP_ERROR_BUFFER_TOO_SMALL);
+    ReturnErrorOnFailure(storage->SyncSetKeyValue(keyAlloc.FabricOpKey(fabricIndex), buf, static_cast<uint16_t>(opKeyLength)));
+
+    return CHIP_NO_ERROR;
+}
+
+/** WARNING: This can leave the operational key on the stack somewhere, since many of the platform
+ *           APIs use stack buffers and do not sanitize! This implementation is for example purposes
+ *           only of the API and it is recommended to avoid directly accessing raw private key bits
+ *           in storage.
+ */
+CHIP_ERROR SignWithStoredOpKey(FabricIndex fabricIndex, PersistentStorageDelegate * storage, const ByteSpan & message,
+                               P256ECDSASignature & outSignature)
+{
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex) && (storage != nullptr), CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Use RAII scoping for the transient keypair, to make sure it doesn't get leaked on any error paths.
+    // Key is put in heap since signature is a costly stack operation and P256Keypair is
+    // a costly class depending on the backend.
+    auto transientOperationalKeypair = Platform::MakeUnique<P256Keypair>();
+    if (!transientOperationalKeypair)
+    {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+
+    // Scope 1: Load up the keypair data from storage
+    {
+        // Use a CapacityBoundBuffer to get RAII secret data clearing on scope exit.
+        Crypto::CapacityBoundBuffer<OpKeyTLVMaxSize()> buf;
+
+        // Load up the operational key structure from storage
+        uint16_t size = static_cast<uint16_t>(buf.Capacity());
+        DefaultStorageKeyAllocator keyAlloc;
+        CHIP_ERROR err = storage->SyncGetKeyValue(keyAlloc.FabricOpKey(fabricIndex), buf.Bytes(), size);
+        if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
+        {
+            err = CHIP_ERROR_INVALID_FABRIC_INDEX;
+        }
+        ReturnErrorOnFailure(err);
+        buf.SetLength(static_cast<size_t>(size));
+
+        // Read-out the operational key TLV entry.
+        TLV::ContiguousBufferTLVReader reader;
+        reader.Init(buf.Bytes(), buf.Length());
+
+        ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Structure, TLV::AnonymousTag()));
+        TLV::TLVType containerType;
+        ReturnErrorOnFailure(reader.EnterContainer(containerType));
+
+        ReturnErrorOnFailure(reader.Next(kOpKeyVersionTag));
+        uint16_t opKeyVersion;
+        ReturnErrorOnFailure(reader.Get(opKeyVersion));
+        VerifyOrReturnError(opKeyVersion == kOpKeyVersion, CHIP_ERROR_VERSION_MISMATCH);
+
+        ReturnErrorOnFailure(reader.Next(kOpKeyDataTag));
+        {
+            ByteSpan keyData;
+            Crypto::P256SerializedKeypair serializedOpKey;
+            ReturnErrorOnFailure(reader.GetByteView(keyData));
+
+            // Unfortunately, we have to copy the data into a P256SerializedKeypair.
+            VerifyOrReturnError(keyData.size() <= serializedOpKey.Capacity(), CHIP_ERROR_BUFFER_TOO_SMALL);
+
+            // Before doing anything with the key, validate format further.
+            ReturnErrorOnFailure(reader.ExitContainer(containerType));
+            ReturnErrorOnFailure(reader.VerifyEndOfContainer());
+
+            memcpy(serializedOpKey.Bytes(), keyData.data(), keyData.size());
+            serializedOpKey.SetLength(keyData.size());
+
+            // Load-up key material
+            // WARNING: This makes use of the raw key bits
+            ReturnErrorOnFailure(transientOperationalKeypair->Deserialize(serializedOpKey));
+        }
+    }
+
+    // Scope 2: Sign message with the keypair
+    return transientOperationalKeypair->ECDSA_sign_msg(message.data(), message.size(), outSignature);
+}
+
+} // namespace
+
+bool PersistentStorageOperationalKeystore::HasOpKeypairForFabric(FabricIndex fabricIndex) const
+{
+    VerifyOrReturnError(mStorage != nullptr, false);
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex), false);
+
+    // If there was a pending keypair, then there's really a usable key
+    if (mIsPendingKeypairActive && (fabricIndex == mPendingFabricIndex) && (mPendingKeypair != nullptr))
+    {
+        return true;
+    }
+
+    DefaultStorageKeyAllocator keyAlloc;
+    uint16_t keySize = 0;
+    CHIP_ERROR err   = mStorage->SyncGetKeyValue(keyAlloc.FabricOpKey(fabricIndex), nullptr, keySize);
+
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
+    {
+        // Obviously not found
+        return false;
+    }
+    if ((err == CHIP_ERROR_BUFFER_TOO_SMALL) && (keySize > 0))
+    {
+        // On found, we actually expect an "error", since we didn't want to read it out.
+        return true;
+    }
+
+    // On any other error, we consider the key not found
+    return false;
+}
+
+CHIP_ERROR PersistentStorageOperationalKeystore::NewOpKeypairForFabric(FabricIndex fabricIndex,
+                                                                       MutableByteSpan & outCertificateSigningRequest)
+{
+    VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+    // If a key is pending, we cannot generate for a different fabric index until we commit or revert.
+    if ((mPendingFabricIndex != kUndefinedFabricIndex) && (fabricIndex != mPendingFabricIndex))
+    {
+        return CHIP_ERROR_INVALID_FABRIC_INDEX;
+    }
+    VerifyOrReturnError(outCertificateSigningRequest.size() >= Crypto::kMAX_CSR_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    // Replace previous pending keypair, if any was previously allocated
+    ResetPendingKey();
+
+    mPendingKeypair = Platform::New<Crypto::P256Keypair>();
+    VerifyOrReturnError(mPendingKeypair != nullptr, CHIP_ERROR_NO_MEMORY);
+
+    mPendingKeypair->Initialize();
+    size_t csrLength = outCertificateSigningRequest.size();
+    CHIP_ERROR err   = mPendingKeypair->NewCertificateSigningRequest(outCertificateSigningRequest.data(), csrLength);
+    if (err != CHIP_NO_ERROR)
+    {
+        ResetPendingKey();
+        return err;
+    }
+
+    outCertificateSigningRequest.reduce_size(csrLength);
+    mPendingFabricIndex = fabricIndex;
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR PersistentStorageOperationalKeystore::ActivateOpKeypairForFabric(FabricIndex fabricIndex,
+                                                                            const Crypto::P256PublicKey & nocPublicKey)
+{
+    VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mPendingKeypair != nullptr, CHIP_ERROR_INVALID_FABRIC_INDEX);
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex) && (fabricIndex == mPendingFabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    // Validate public key being activated matches last generated pending keypair
+    VerifyOrReturnError(mPendingKeypair->Pubkey().Matches(nocPublicKey), CHIP_ERROR_INVALID_PUBLIC_KEY);
+
+    mIsPendingKeypairActive = true;
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR PersistentStorageOperationalKeystore::CommitOpKeypairForFabric(FabricIndex fabricIndex)
+{
+    VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mPendingKeypair != nullptr, CHIP_ERROR_INVALID_FABRIC_INDEX);
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex) && (fabricIndex == mPendingFabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+    VerifyOrReturnError(mIsPendingKeypairActive == true, CHIP_ERROR_INCORRECT_STATE);
+
+    // Try to store persistent key. On failure, leave everything pending as-is
+    CHIP_ERROR err = StoreOperationalKey(fabricIndex, mStorage, mPendingKeypair);
+    ReturnErrorOnFailure(err);
+
+    // If we got here, we succeeded and can reset the pending key: next `SignWithOpKeypair` will use the stored key.
+    ResetPendingKey();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR PersistentStorageOperationalKeystore::RemoveOpKeypairForFabric(FabricIndex fabricIndex)
+{
+    VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(IsValidFabricIndex(fabricIndex), CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    // Remove pending state if matching
+    if ((mPendingKeypair != nullptr) && (fabricIndex == mPendingFabricIndex))
+    {
+        RevertPendingKeypair();
+    }
+
+    DefaultStorageKeyAllocator keyAlloc;
+    CHIP_ERROR err = mStorage->SyncDeleteKeyValue(keyAlloc.FabricOpKey(fabricIndex));
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
+    {
+        err = CHIP_ERROR_INVALID_FABRIC_INDEX;
+    }
+
+    return err;
+}
+
+void PersistentStorageOperationalKeystore::RevertPendingKeypair()
+{
+    VerifyOrReturn(mStorage != nullptr);
+
+    // Just reset the pending key, we never stored anything
+    ResetPendingKey();
+}
+
+CHIP_ERROR PersistentStorageOperationalKeystore::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);
+
+    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);
+    }
+
+    return SignWithStoredOpKey(fabricIndex, mStorage, message, outSignature);
+}
+
+} // namespace chip
diff --git a/src/crypto/PersistentStorageOperationalKeystore.h b/src/crypto/PersistentStorageOperationalKeystore.h
new file mode 100644
index 00000000000000..a332bd968d38a6
--- /dev/null
+++ b/src/crypto/PersistentStorageOperationalKeystore.h
@@ -0,0 +1,110 @@
+/*
+ *    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 <crypto/OperationalKeystore.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/CHIPPersistentStorageDelegate.h>
+#include <lib/core/DataModelTypes.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+
+namespace chip {
+
+/**
+ * @brief OperationalKeystore implementation making use of PersistentStorageDelegate
+ *        to load/store keypairs. This is the legacy behavior of `FabricTable` prior
+ *        to refactors to use `OperationalKeystore` and exists as a baseline example
+ *        of how to use the interface.
+ *
+ * WARNING: Ensure that any implementation that uses this one as a starting point
+ *          DOES NOT have the raw key material (in usable form) passed up/down to
+ *          direct storage APIs that may make copies on heap/stack without sanitization.
+ */
+class PersistentStorageOperationalKeystore : public Crypto::OperationalKeystore
+{
+public:
+    PersistentStorageOperationalKeystore() = default;
+    virtual ~PersistentStorageOperationalKeystore() { Finish(); }
+
+    /**
+     * @brief Initialize the Operational Keystore to map to a given storage delegate.
+     *
+     * @param storage Pointer to persistent storage delegate to use. Must outlive this instance.
+     * @retval CHIP_NO_ERROR on success
+     * @retval CHIP_ERROR_INCORRECT_STATE if already initialized
+     */
+    CHIP_ERROR Init(PersistentStorageDelegate * storage)
+    {
+        VerifyOrReturnError(mStorage == nullptr, CHIP_ERROR_INCORRECT_STATE);
+        mPendingFabricIndex       = kUndefinedFabricIndex;
+        mIsExternallyOwnedKeypair = false;
+        mStorage                  = storage;
+        mPendingKeypair           = nullptr;
+        mIsPendingKeypairActive   = false;
+        return CHIP_NO_ERROR;
+    }
+
+    /**
+     * @brief Finalize the keystore, so that subsequent operations fail
+     */
+    void Finish()
+    {
+        VerifyOrReturn(mStorage != nullptr);
+
+        ResetPendingKey();
+        mStorage = nullptr;
+    }
+
+    bool HasPendingOpKeypair() const override { return (mPendingKeypair != nullptr); }
+
+    bool HasOpKeypairForFabric(FabricIndex fabricIndex) const override;
+    CHIP_ERROR NewOpKeypairForFabric(FabricIndex fabricIndex, MutableByteSpan & outCertificateSigningRequest) override;
+    CHIP_ERROR ActivateOpKeypairForFabric(FabricIndex fabricIndex, const Crypto::P256PublicKey & nocPublicKey) override;
+    CHIP_ERROR CommitOpKeypairForFabric(FabricIndex fabricIndex) override;
+    CHIP_ERROR RemoveOpKeypairForFabric(FabricIndex fabricIndex) override;
+    void RevertPendingKeypair() override;
+    CHIP_ERROR SignWithOpKeypair(FabricIndex fabricIndex, const ByteSpan & message,
+                                 Crypto::P256ECDSASignature & outSignature) const override;
+
+protected:
+    void ResetPendingKey()
+    {
+        if (!mIsExternallyOwnedKeypair && (mPendingKeypair != nullptr))
+        {
+            Platform::Delete(mPendingKeypair);
+        }
+        mPendingKeypair           = nullptr;
+        mIsExternallyOwnedKeypair = false;
+        mIsPendingKeypairActive   = false;
+        mPendingFabricIndex       = kUndefinedFabricIndex;
+    }
+
+    PersistentStorageDelegate * mStorage = nullptr;
+
+    // This pending fabric index is `kUndefinedFabricIndex` if there isn't a pending keypair override for a given fabric.
+    FabricIndex mPendingFabricIndex       = kUndefinedFabricIndex;
+    Crypto::P256Keypair * mPendingKeypair = nullptr;
+    bool mIsPendingKeypairActive          = false;
+
+    // If overridding NewOpKeypairForFabric method in a subclass, set this to true in
+    // `NewOpKeypairForFabric` if the mPendingKeypair should not be deleted when no longer in use.
+    bool mIsExternallyOwnedKeypair = false;
+};
+
+} // namespace chip
diff --git a/src/crypto/tests/BUILD.gn b/src/crypto/tests/BUILD.gn
index 98d2e6adfdefb8..265a49e60a1632 100644
--- a/src/crypto/tests/BUILD.gn
+++ b/src/crypto/tests/BUILD.gn
@@ -44,6 +44,8 @@ chip_test_suite("tests") {
     "TestCryptoLayer.h",
   ]
 
+  test_sources = [ "TestPersistentStorageOpKeyStore.cpp" ]
+
   if (chip_device_platform == "esp32" || chip_device_platform == "nrfconnect" ||
       chip_device_platform == "efr32") {
     defines = [ "CURRENT_TIME_NOT_IMPLEMENTED=1" ]
diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp
index eb95e9d9d8a7b6..2ffc861df3762b 100644
--- a/src/crypto/tests/CHIPCryptoPALTest.cpp
+++ b/src/crypto/tests/CHIPCryptoPALTest.cpp
@@ -1983,80 +1983,44 @@ static void TestX509_IssuingTimestampValidation(nlTestSuite * inSuite, void * in
     HeapChecker heapChecker(inSuite);
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-    /*
-    credentials/test/attestation/Chip-Test-DAC-FFF1-8000-000A-Cert.pem
-    -----BEGIN CERTIFICATE-----
-    MIIB6jCCAY+gAwIBAgIIBRpp5eeAND4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
-    TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-    gqJ8AgIMBDgwMDAwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMEsx
-    HTAbBgNVBAMMFE1hdHRlciBUZXN0IERBQyAwMDBBMRQwEgYKKwYBBAGConwCAQwE
-    RkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAwWTATBgcqhkjOPQIBBggqhkjOPQMB
-    BwNCAAR6hFivu5vNFeGa3NJm9mycL2B8dHR6NfgPN+EYEz+A8XYBEyePkfFaoPf4
-    eTIJT+aftyhoqB4ml5s2izO1VDEDo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
-    /wQEAwIHgDAdBgNVHQ4EFgQU1a2yuIOOyAc8R3LcfoeX/rsjs64wHwYDVR0jBBgw
-    FoAUhPUd/57M2ik1lEhSDoXxKS2j7dcwCgYIKoZIzj0EAwIDSQAwRgIhAPL+Fnlk
-    P0xbynYuijQV7VEwBvzQUtpQbWLYvVFeN70IAiEAvi20eqszdReOEkmgeSCgrG6q
-    OS8H8W2E/ctS268o19k=
-    -----END CERTIFICATE-----
-    */
-    /*
-    Validity
-        Not Before: Jun 28 14:23:43 2021 GMT
-        Not After : Dec 31 23:59:59 9999 GMT
-    */
-    constexpr uint8_t kDacCertificate[] = {
-        0x30, 0x82, 0x01, 0xEA, 0x30, 0x82, 0x01, 0x8F, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x05, 0x1A, 0x69, 0xE5, 0xE7,
-        0x80, 0x34, 0x3E, 0x30, 0x0A, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x30, 0x46, 0x31, 0x18, 0x30,
-        0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F, 0x4D, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20,
-        0x50, 0x41, 0x49, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01, 0x0C,
-        0x04, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02,
-        0x02, 0x0C, 0x04, 0x38, 0x30, 0x30, 0x30, 0x30, 0x20, 0x17, 0x0D, 0x32, 0x31, 0x30, 0x36, 0x32, 0x38, 0x31, 0x34, 0x32,
-        0x33, 0x34, 0x33, 0x5A, 0x18, 0x0F, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39,
-        0x5A, 0x30, 0x4B, 0x31, 0x1D, 0x30, 0x1B, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x14, 0x4D, 0x61, 0x74, 0x74, 0x65, 0x72,
-        0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x30, 0x30, 0x41, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0A,
-        0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01, 0x0C, 0x04, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12,
-        0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02, 0x0C, 0x04, 0x38, 0x30, 0x30, 0x30, 0x30, 0x59,
-        0x30, 0x13, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01,
-        0x07, 0x03, 0x42, 0x00, 0x04, 0x7A, 0x84, 0x58, 0xAF, 0xBB, 0x9B, 0xCD, 0x15, 0xE1, 0x9A, 0xDC, 0xD2, 0x66, 0xF6, 0x6C,
-        0x9C, 0x2F, 0x60, 0x7C, 0x74, 0x74, 0x7A, 0x35, 0xF8, 0x0F, 0x37, 0xE1, 0x18, 0x13, 0x3F, 0x80, 0xF1, 0x76, 0x01, 0x13,
-        0x27, 0x8F, 0x91, 0xF1, 0x5A, 0xA0, 0xF7, 0xF8, 0x79, 0x32, 0x09, 0x4F, 0xE6, 0x9F, 0xB7, 0x28, 0x68, 0xA8, 0x1E, 0x26,
-        0x97, 0x9B, 0x36, 0x8B, 0x33, 0xB5, 0x54, 0x31, 0x03, 0xA3, 0x60, 0x30, 0x5E, 0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13,
-        0x01, 0x01, 0xFF, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x01, 0x01, 0xFF, 0x04, 0x04, 0x03,
-        0x02, 0x07, 0x80, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0xD5, 0xAD, 0xB2, 0xB8, 0x83, 0x8E,
-        0xC8, 0x07, 0x3C, 0x47, 0x72, 0xDC, 0x7E, 0x87, 0x97, 0xFE, 0xBB, 0x23, 0xB3, 0xAE, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D,
-        0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x84, 0xF5, 0x1D, 0xFF, 0x9E, 0xCC, 0xDA, 0x29, 0x35, 0x94, 0x48, 0x52, 0x0E,
-        0x85, 0xF1, 0x29, 0x2D, 0xA3, 0xED, 0xD7, 0x30, 0x0A, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x03,
-        0x49, 0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xF2, 0xFE, 0x16, 0x79, 0x64, 0x3F, 0x4C, 0x5B, 0xCA, 0x76, 0x2E, 0x8A, 0x34,
-        0x15, 0xED, 0x51, 0x30, 0x06, 0xFC, 0xD0, 0x52, 0xDA, 0x50, 0x6D, 0x62, 0xD8, 0xBD, 0x51, 0x5E, 0x37, 0xBD, 0x08, 0x02,
-        0x21, 0x00, 0xBE, 0x2D, 0xB4, 0x7A, 0xAB, 0x33, 0x75, 0x17, 0x8E, 0x12, 0x49, 0xA0, 0x79, 0x20, 0xA0, 0xAC, 0x6E, 0xAA,
-        0x39, 0x2F, 0x07, 0xF1, 0x6D, 0x84, 0xFD, 0xCB, 0x52, 0xDB, 0xAF, 0x28, 0xD7, 0xD9
-    };
-    ByteSpan kDacCert(kDacCertificate);
+    ByteSpan rcacDer;
+    err = GetTestCert(TestCert::kRoot01, TestCertLoadFlags::kDERForm, rcacDer);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    ByteSpan icacDer;
+    err = GetTestCert(TestCert::kICA01, TestCertLoadFlags::kDERForm, icacDer);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    ByteSpan rootCert;
-    err = GetTestCert(TestCert::kRoot01, TestCertLoadFlags::kDERForm, rootCert);
+    ByteSpan nocDer;
+    err = GetTestCert(TestCert::kNode01_01, TestCertLoadFlags::kDERForm, nocDer);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    ByteSpan icaCert;
-    err = GetTestCert(TestCert::kICA01, TestCertLoadFlags::kDERForm, icaCert);
+    err = IsCertificateValidAtIssuance(icacDer, nocDer);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    ByteSpan leafCert;
-    err = GetTestCert(TestCert::kNode01_01, TestCertLoadFlags::kDERForm, leafCert);
+    err = IsCertificateValidAtIssuance(rcacDer, nocDer);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = IsCertificateValidAtIssuance(leafCert, icaCert);
+    err = IsCertificateValidAtIssuance(sTestCert_PAI_FFF1_8000_Cert, sTestCert_DAC_FFF1_8000_0004_Cert);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = IsCertificateValidAtIssuance(leafCert, rootCert);
+    err = IsCertificateValidAtIssuance(sTestCert_PAA_FFF1_Cert, sTestCert_DAC_FFF1_8000_0004_Cert);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = IsCertificateValidAtIssuance(kDacCert, leafCert);
+    err = IsCertificateValidAtIssuance(sTestCert_PAA_FFF1_Cert, sTestCert_PAI_FFF1_8000_Cert);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
+    // Certificate Expired Case
+    err = IsCertificateValidAtIssuance(icacDer, sTestCert_DAC_FFF1_8000_0004_Cert);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+
+    // Certificate Expired Case
+    err = IsCertificateValidAtIssuance(rcacDer, sTestCert_DAC_FFF1_8000_0004_Cert);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_CERT_EXPIRED);
+
 #if !defined(CURRENT_TIME_NOT_IMPLEMENTED)
     // test certificate validity (this one contains validity until year 9999 so it will not fail soon)
-    err = IsCertificateValidAtCurrentTime(kDacCert);
+    err = IsCertificateValidAtCurrentTime(sTestCert_DAC_FFF2_8001_0008_Cert);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 #endif
 }
diff --git a/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp b/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp
new file mode 100644
index 00000000000000..34d10d3971d507
--- /dev/null
+++ b/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp
@@ -0,0 +1,237 @@
+/*
+ *
+ *    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 <inttypes.h>
+
+#include <crypto/PersistentStorageOperationalKeystore.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/DefaultStorageKeyAllocator.h>
+#include <lib/support/Span.h>
+#include <lib/support/TestPersistentStorageDelegate.h>
+#include <lib/support/UnitTestRegistration.h>
+#include <nlunit-test.h>
+
+using namespace chip;
+using namespace chip::Crypto;
+
+namespace {
+
+void TestBasicLifeCycle(nlTestSuite * inSuite, void * inContext)
+{
+    TestPersistentStorageDelegate storageDelegate;
+    PersistentStorageOperationalKeystore opKeystore;
+
+    FabricIndex kFabricIndex    = 111;
+    FabricIndex kBadFabricIndex = static_cast<FabricIndex>(kFabricIndex + 10u);
+
+    // Failure before Init of ActivateOpKeypairForFabric
+    P256PublicKey placeHolderPublicKey;
+    CHIP_ERROR err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, placeHolderPublicKey);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+
+    // Failure before Init of NewOpKeypairForFabric
+    uint8_t unusedCsrBuf[kMAX_CSR_Length];
+    MutableByteSpan unusedCsrSpan{ unusedCsrBuf };
+    err = opKeystore.NewOpKeypairForFabric(kFabricIndex, unusedCsrSpan);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
+
+    // Failure before Init of CommitOpKeypairForFabric
+    err = opKeystore.CommitOpKeypairForFabric(kFabricIndex);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
+
+    // Failure before Init of RemoveOpKeypairForFabric
+    err = opKeystore.RemoveOpKeypairForFabric(kFabricIndex);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
+
+    // Success after Init
+    err = opKeystore.Init(&storageDelegate);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Can generate a key and get a CSR
+    uint8_t csrBuf[kMAX_CSR_Length];
+    MutableByteSpan csrSpan{ csrBuf };
+    err = opKeystore.NewOpKeypairForFabric(kFabricIndex, csrSpan);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
+
+    P256PublicKey csrPublicKey1;
+    err = VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), csrPublicKey1);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, csrPublicKey1.Matches(csrPublicKey1));
+
+    // Can regenerate a second CSR and it has different PK
+    csrSpan = MutableByteSpan{ csrBuf };
+    err     = opKeystore.NewOpKeypairForFabric(kFabricIndex, csrSpan);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+
+    // Cannot NewOpKeypair for a different fabric if one already pending
+    uint8_t badCsrBuf[kMAX_CSR_Length];
+    MutableByteSpan badCsrSpan = MutableByteSpan{ badCsrBuf };
+    err                        = opKeystore.NewOpKeypairForFabric(kBadFabricIndex, badCsrSpan);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+
+    P256PublicKey csrPublicKey2;
+    err = VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), csrPublicKey2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, !csrPublicKey1.Matches(csrPublicKey2));
+
+    // Fail to generate CSR for invalid fabrics
+    csrSpan = MutableByteSpan{ csrBuf };
+    err     = opKeystore.NewOpKeypairForFabric(kUndefinedFabricIndex, csrSpan);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    csrSpan = MutableByteSpan{ csrBuf };
+    err     = opKeystore.NewOpKeypairForFabric(kMaxValidFabricIndex + 1, csrSpan);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    // No storage done by NewOpKeypairForFabric
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
+
+    // Even after error, the previous valid pending keypair stays valid.
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+
+    // Activating with mismatching fabricIndex and matching public key fails
+    err = opKeystore.ActivateOpKeypairForFabric(kBadFabricIndex, csrPublicKey2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
+
+    // Activating with matching fabricIndex and mismatching public key fails
+    err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, csrPublicKey1);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_PUBLIC_KEY);
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
+
+    uint8_t message[] = { 1, 2, 3, 4 };
+    P256ECDSASignature sig1;
+    // Before successful activation, cannot sign
+    err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message }, sig1);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    // Activating with matching fabricIndex and matching public key succeeds
+    err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, csrPublicKey2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Activating does not store, and keeps pending
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == true);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kBadFabricIndex) == false);
+
+    // Can't sign for wrong fabric after activation
+    P256ECDSASignature sig2;
+    err = opKeystore.SignWithOpKeypair(kBadFabricIndex, ByteSpan{ message }, sig2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+
+    // Can sign after activation
+    err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message }, sig2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Signature matches pending key
+    err = csrPublicKey2.ECDSA_validate_msg_signature(message, sizeof(message), sig2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Signature does not match a previous pending key
+    err = csrPublicKey1.ECDSA_validate_msg_signature(message, sizeof(message), sig2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_SIGNATURE);
+
+    // Committing with mismatching fabric fails, leaves pending
+    err = opKeystore.CommitOpKeypairForFabric(kBadFabricIndex);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == true);
+
+    // Committing key resets pending state and adds storage
+    DefaultStorageKeyAllocator keyAllocator;
+    std::string opKeyStorageKey = keyAllocator.FabricOpKey(kFabricIndex);
+    err                         = opKeystore.CommitOpKeypairForFabric(kFabricIndex);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == false);
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 1);
+    NL_TEST_ASSERT(inSuite, storageDelegate.HasKey(opKeyStorageKey) == true);
+
+    // After committing, signing works with the key that was pending
+    P256ECDSASignature sig3;
+    uint8_t message2[] = { 10, 11, 12, 13 };
+    err                = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message2 }, sig3);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    err = csrPublicKey2.ECDSA_validate_msg_signature(message2, sizeof(message2), sig3);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Let's remove the opkey for a fabric, it disappears
+    err = opKeystore.RemoveOpKeypairForFabric(kFabricIndex);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == false);
+    NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
+    NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
+    NL_TEST_ASSERT(inSuite, storageDelegate.HasKey(opKeyStorageKey) == false);
+
+    opKeystore.Finish();
+}
+
+/**
+ *   Test Suite. It lists all the test functions.
+ */
+static const nlTest sTests[] = { NL_TEST_DEF("Test Basic Lifecycle of PersistentStorageOperationalKeystore", TestBasicLifeCycle),
+
+                                 NL_TEST_SENTINEL() };
+
+/**
+ *  Set up the test suite.
+ */
+int Test_Setup(void * inContext)
+{
+    CHIP_ERROR error = chip::Platform::MemoryInit();
+    VerifyOrReturnError(error == CHIP_NO_ERROR, FAILURE);
+    return SUCCESS;
+}
+
+/**
+ *  Tear down the test suite.
+ */
+int Test_Teardown(void * inContext)
+{
+    chip::Platform::MemoryShutdown();
+    return SUCCESS;
+}
+
+} // namespace
+
+/**
+ *  Main
+ */
+int TestPersistentStorageOperationalKeystore()
+{
+    nlTestSuite theSuite = { "PersistentStorageOperationalKeystore tests", &sTests[0], Test_Setup, Test_Teardown };
+
+    // Run test suite againt one context.
+    nlTestRunner(&theSuite, nullptr);
+    return nlTestRunnerStats(&theSuite);
+}
+
+CHIP_REGISTER_TEST_SUITE(TestPersistentStorageOperationalKeystore)
diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
index cc0203a7da48a2..4e2e74e72203d1 100644
--- a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
@@ -41,6 +41,8 @@
 		513DDB8A2761F6F900DAA01A /* CHIPAttributeTLVValueDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 513DDB892761F6F900DAA01A /* CHIPAttributeTLVValueDecoder.mm */; };
 		51431AF927D2973E008A7943 /* CHIPIMDispatch.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51431AF827D2973E008A7943 /* CHIPIMDispatch.mm */; };
 		51431AFB27D29CA4008A7943 /* ota-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51431AFA27D29CA4008A7943 /* ota-provider.cpp */; };
+		515C1C6F284F9FFB00A48F0C /* MTRMemory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 515C1C6D284F9FFB00A48F0C /* MTRMemory.mm */; };
+		515C1C70284F9FFB00A48F0C /* MTRMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 515C1C6E284F9FFB00A48F0C /* MTRMemory.h */; };
 		517BF3F0282B62B800A8B7DB /* MTRCertificates.h in Headers */ = {isa = PBXBuildFile; fileRef = 517BF3EE282B62B800A8B7DB /* MTRCertificates.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		517BF3F1282B62B800A8B7DB /* MTRCertificates.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */; };
 		517BF3F3282B62CB00A8B7DB /* MatterCertificateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 517BF3F2282B62CB00A8B7DB /* MatterCertificateTests.m */; };
@@ -152,6 +154,8 @@
 		513DDB892761F6F900DAA01A /* CHIPAttributeTLVValueDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CHIPAttributeTLVValueDecoder.mm; path = "zap-generated/CHIPAttributeTLVValueDecoder.mm"; sourceTree = "<group>"; };
 		51431AF827D2973E008A7943 /* CHIPIMDispatch.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CHIPIMDispatch.mm; sourceTree = "<group>"; };
 		51431AFA27D29CA4008A7943 /* ota-provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ota-provider.cpp"; path = "../../../app/clusters/ota-provider/ota-provider.cpp"; sourceTree = "<group>"; };
+		515C1C6D284F9FFB00A48F0C /* MTRMemory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRMemory.mm; sourceTree = "<group>"; };
+		515C1C6E284F9FFB00A48F0C /* MTRMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRMemory.h; sourceTree = "<group>"; };
 		517BF3EE282B62B800A8B7DB /* MTRCertificates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCertificates.h; sourceTree = "<group>"; };
 		517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCertificates.mm; sourceTree = "<group>"; };
 		517BF3F2282B62CB00A8B7DB /* MatterCertificateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MatterCertificateTests.m; sourceTree = "<group>"; };
@@ -355,6 +359,8 @@
 				5A7947E227C0101200434CF2 /* CHIPDeviceController+XPC.h */,
 				517BF3EE282B62B800A8B7DB /* MTRCertificates.h */,
 				517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */,
+				515C1C6E284F9FFB00A48F0C /* MTRMemory.h */,
+				515C1C6D284F9FFB00A48F0C /* MTRMemory.mm */,
 				5A7947E327C0129500434CF2 /* CHIPDeviceController+XPC.m */,
 				B20252912459E34F00F97062 /* Info.plist */,
 				998F286C26D55E10001846C6 /* CHIPKeypair.h */,
@@ -419,6 +425,7 @@
 				99D466E12798936D0089A18F /* CHIPCommissioningParameters.h in Headers */,
 				5136661528067D550025EDAE /* MatterControllerFactory_Internal.h in Headers */,
 				75C645A42825AAC3007E2C29 /* MatterClusterConstants.h in Headers */,
+				515C1C70284F9FFB00A48F0C /* MTRMemory.h in Headers */,
 				B289D4212639C0D300D4E314 /* CHIPOnboardingPayloadParser.h in Headers */,
 				513DDB862761F69300DAA01A /* CHIPAttributeTLVValueDecoder_Internal.h in Headers */,
 				2CB7163F252F731E0026E2BB /* CHIPDevicePairingDelegate.h in Headers */,
@@ -580,6 +587,7 @@
 				99AECC802798A57F00B6355B /* CHIPCommissioningParameters.m in Sources */,
 				2CB7163C252E8A7C0026E2BB /* CHIPDevicePairingDelegateBridge.mm in Sources */,
 				997DED162695343400975E97 /* CHIPThreadOperationalDataset.mm in Sources */,
+				515C1C6F284F9FFB00A48F0C /* MTRMemory.mm in Sources */,
 				27A53C1827FBC6920053F131 /* CHIPAttestationTrustStoreBridge.mm in Sources */,
 				998F287126D56940001846C6 /* CHIPP256KeypairBridge.mm in Sources */,
 				5136661428067D550025EDAE /* MatterControllerFactory.mm in Sources */,
diff --git a/src/darwin/Framework/CHIP/BUILD.gn b/src/darwin/Framework/CHIP/BUILD.gn
index a3137390ea3eb7..d95c3723db693d 100644
--- a/src/darwin/Framework/CHIP/BUILD.gn
+++ b/src/darwin/Framework/CHIP/BUILD.gn
@@ -68,6 +68,8 @@ static_library("framework") {
     "CHIPSetupPayload.mm",
     "MTRCertificates.h",
     "MTRCertificates.mm",
+    "MTRMemory.h",
+    "MTRMemory.mm",
     "MatterControllerFactory.h",
     "MatterControllerFactory.mm",
     "MatterControllerFactory_Internal.h",
diff --git a/src/darwin/Framework/CHIP/CHIPDevice.mm b/src/darwin/Framework/CHIP/CHIPDevice.mm
index ed9499f4664fde..510cb8553c8d13 100644
--- a/src/darwin/Framework/CHIP/CHIPDevice.mm
+++ b/src/darwin/Framework/CHIP/CHIPDevice.mm
@@ -1423,7 +1423,7 @@ - (instancetype)initWithPath:(const ConcreteEventPath &)path
     } else {
         CHIP_ERROR err;
         value = CHIPDecodeEventPayload(aEventHeader.mPath, *apData, &err);
-        if (err == CHIP_ERROR_IM_MALFORMED_EVENT_PATH) {
+        if (err == CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB) {
             // We don't know this event; just skip it.
             return;
         }
@@ -1465,7 +1465,7 @@ - (instancetype)initWithPath:(const ConcreteEventPath &)path
     } else {
         CHIP_ERROR err;
         value = CHIPDecodeAttributeValue(aPath, *apData, &err);
-        if (err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH) {
+        if (err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB) {
             // We don't know this attribute; just skip it.
             return;
         }
diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.mm b/src/darwin/Framework/CHIP/CHIPDeviceController.mm
index 6a92aa1a9530cb..e90ba51f752e19 100644
--- a/src/darwin/Framework/CHIP/CHIPDeviceController.mm
+++ b/src/darwin/Framework/CHIP/CHIPDeviceController.mm
@@ -45,7 +45,6 @@
 #include <credentials/FabricTable.h>
 #include <credentials/GroupDataProvider.h>
 #include <lib/core/CHIPVendorIdentifiers.hpp>
-#include <lib/support/CHIPMem.h>
 #include <platform/PlatformManager.h>
 #include <setup_payload/ManualSetupPayloadGenerator.h>
 #include <system/SystemClock.h>
@@ -63,6 +62,11 @@
 static NSString * const kErrorNotRunning = @"Controller is not running. Call startup first.";
 static NSString * const kInfoStackShutdown = @"Shutting down the CHIP Stack";
 static NSString * const kErrorSetupCodeGen = @"Generating Manual Pairing Code failed";
+static NSString * const kErrorGenerateNOC = @"Generating operational certificate failed";
+static NSString * const kErrorKeyAllocation = @"Generating new operational key failed";
+static NSString * const kErrorCSRValidation = @"Extracting public key from CSR failed";
+static NSString * const kErrorActivateKey = @"Activating new operational key failed";
+static NSString * const kErrorCommitPendingFabricData = @"Committing fabric data failed";
 
 @interface CHIPDeviceController ()
 
@@ -174,7 +178,8 @@ - (BOOL)startup:(CHIPDeviceControllerStartupParamsInternal *)startupParams
         }
 
         if (startupParams.operationalCertificate != nil && startupParams.operationalKeypair == nil
-            && startupParams.serializedOperationalKeypair == nullptr) {
+            && (!startupParams.fabricIndex.HasValue()
+                || !startupParams.keystore->HasOpKeypairForFabric(startupParams.fabricIndex.Value()))) {
             CHIP_LOG_ERROR("Have no operational keypair for our operational certificate");
             return;
         }
@@ -201,10 +206,6 @@ - (BOOL)startup:(CHIPDeviceControllerStartupParamsInternal *)startupParams
             return;
         }
 
-        // internallyCreatedOperationalKeypair might not be used, but
-        // if it is it needs to live long enough (until after we are
-        // done using commissionerParams).
-        chip::Crypto::P256Keypair internallyCreatedOperationalKeypair;
         // nocBuffer might not be used, but if it is it needs to live
         // long enough (until after we are done using
         // commissionerParams).
@@ -227,16 +228,6 @@ - (BOOL)startup:(CHIPDeviceControllerStartupParamsInternal *)startupParams
             _operationalKeypairNativeBridge.Emplace(_operationalKeypairBridge);
             commissionerParams.operationalKeypair = &_operationalKeypairNativeBridge.Value();
             commissionerParams.hasExternallyOwnedOperationalKeypair = true;
-        } else {
-            if (startupParams.serializedOperationalKeypair != nullptr) {
-                errorCode = internallyCreatedOperationalKeypair.Deserialize(*startupParams.serializedOperationalKeypair);
-            } else {
-                errorCode = internallyCreatedOperationalKeypair.Initialize();
-            }
-            if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorCommissionerInit]) {
-                return;
-            }
-            commissionerParams.operationalKeypair = &internallyCreatedOperationalKeypair;
         }
 
         if (startupParams.operationalCertificate) {
@@ -244,10 +235,44 @@ - (BOOL)startup:(CHIPDeviceControllerStartupParamsInternal *)startupParams
         } else {
             chip::MutableByteSpan noc(nocBuffer);
 
-            errorCode = _operationalCredentialsDelegate->GenerateNOC([startupParams.nodeId unsignedLongLongValue],
-                startupParams.fabricId, chip::kUndefinedCATs, commissionerParams.operationalKeypair->Pubkey(), noc);
-            if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorCommissionerInit]) {
-                return;
+            if (commissionerParams.operationalKeypair != nullptr) {
+                errorCode = _operationalCredentialsDelegate->GenerateNOC([startupParams.nodeId unsignedLongLongValue],
+                    startupParams.fabricId, chip::kUndefinedCATs, commissionerParams.operationalKeypair->Pubkey(), noc);
+
+                if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorGenerateNOC]) {
+                    return;
+                }
+            } else {
+                // Generate a new random keypair.
+                uint8_t csrBuffer[chip::Crypto::kMAX_CSR_Length];
+                chip::MutableByteSpan csr(csrBuffer);
+                errorCode = startupParams.fabricTable->AllocatePendingOperationalKey(startupParams.fabricIndex, csr);
+                if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorKeyAllocation]) {
+                    return;
+                }
+
+                chip::Crypto::P256PublicKey pubKey;
+                errorCode = VerifyCertificateSigningRequest(csr.data(), csr.size(), pubKey);
+                if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorCSRValidation]) {
+                    return;
+                }
+
+                errorCode = _operationalCredentialsDelegate->GenerateNOC(
+                    [startupParams.nodeId unsignedLongLongValue], startupParams.fabricId, chip::kUndefinedCATs, pubKey, noc);
+
+                if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorGenerateNOC]) {
+                    return;
+                }
+
+                errorCode = startupParams.fabricTable->ActivatePendingOperationalKey(pubKey);
+                if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorActivateKey]) {
+                    return;
+                }
+
+                errorCode = startupParams.fabricTable->CommitPendingFabricData();
+                if ([self checkForStartError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorCommitPendingFabricData]) {
+                    return;
+                }
             }
             commissionerParams.controllerNOC = noc;
         }
@@ -705,7 +730,9 @@ @implementation CHIPDeviceController (InternalMethods)
     return fabricIdx;
 }
 
-- (CHIP_ERROR)isRunningOnFabric:(chip::FabricInfo *)fabric isRunning:(BOOL *)isRunning
+- (CHIP_ERROR)isRunningOnFabric:(chip::FabricTable *)fabricTable
+                    fabricIndex:(chip::FabricIndex)fabricIndex
+                      isRunning:(BOOL *)isRunning
 {
     if (![self isRunning]) {
         *isRunning = NO;
@@ -718,16 +745,28 @@ - (CHIP_ERROR)isRunningOnFabric:(chip::FabricInfo *)fabric isRunning:(BOOL *)isR
         return CHIP_ERROR_INCORRECT_STATE;
     }
 
-    if (ourFabric->GetFabricId() != fabric->GetFabricId()) {
+    chip::FabricInfo * otherFabric = fabricTable->FindFabricWithIndex(fabricIndex);
+    if (!otherFabric) {
+        // Also surprising!
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    if (ourFabric->GetFabricId() != otherFabric->GetFabricId()) {
         *isRunning = NO;
         return CHIP_NO_ERROR;
     }
 
-    chip::Credentials::P256PublicKeySpan ourRootPublicKey, otherRootPublicKey;
-    ReturnErrorOnFailure(ourFabric->GetRootPubkey(ourRootPublicKey));
-    ReturnErrorOnFailure(fabric->GetRootPubkey(otherRootPublicKey));
+    const chip::FabricTable * ourFabricTable = _cppCommissioner->GetFabricTable();
+    if (!ourFabricTable) {
+        // Surprising as well!
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    chip::Crypto::P256PublicKey ourRootPublicKey, otherRootPublicKey;
+    ReturnErrorOnFailure(ourFabricTable->FetchRootPubkey(ourFabric->GetFabricIndex(), ourRootPublicKey));
+    ReturnErrorOnFailure(fabricTable->FetchRootPubkey(otherFabric->GetFabricIndex(), otherRootPublicKey));
 
-    *isRunning = (ourRootPublicKey.data_equal(otherRootPublicKey));
+    *isRunning = (ourRootPublicKey.Matches(otherRootPublicKey));
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams.mm b/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams.mm
index 976a69df1a1089..76e5943e0aff68 100644
--- a/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams.mm
+++ b/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams.mm
@@ -156,7 +156,9 @@ - (instancetype)initWithParams:(CHIPDeviceControllerStartupParams *)params
     return self;
 }
 
-- (instancetype)initForNewFabric:(CHIPDeviceControllerStartupParams *)params
+- (instancetype)initForNewFabric:(chip::FabricTable *)fabricTable
+                        keystore:(chip::Crypto::OperationalKeystore *)keystore
+                          params:(CHIPDeviceControllerStartupParams *)params
 {
     if (!(self = [self initWithParams:params])) {
         return nil;
@@ -187,15 +189,23 @@ - (instancetype)initForNewFabric:(CHIPDeviceControllerStartupParams *)params
         }
     }
 
+    _fabricTable = fabricTable;
+    _keystore = keystore;
+
     return self;
 }
 
-- (instancetype)initForExistingFabric:(FabricInfo *)fabric params:(CHIPDeviceControllerStartupParams *)params
+- (instancetype)initForExistingFabric:(FabricTable *)fabricTable
+                          fabricIndex:(FabricIndex)fabricIndex
+                             keystore:(chip::Crypto::OperationalKeystore *)keystore
+                               params:(CHIPDeviceControllerStartupParams *)params
 {
     if (!(self = [self initWithParams:params])) {
         return nil;
     }
 
+    FabricInfo * fabric = fabricTable->FindFabricWithIndex(fabricIndex);
+
     if (self.vendorId == nil) {
         self.vendorId = @(fabric->GetVendorId());
     }
@@ -205,8 +215,9 @@ - (instancetype)initForExistingFabric:(FabricInfo *)fabric params:(CHIPDeviceCon
         self.nodeId = @(fabric->GetNodeId());
 
         if (self.operationalKeypair == nil) {
-            ByteSpan noc;
-            CHIP_ERROR err = fabric->GetNOCCert(noc);
+            uint8_t nocBuf[Credentials::kMaxCHIPCertLength];
+            MutableByteSpan noc(nocBuf);
+            CHIP_ERROR err = fabricTable->FetchNOCCert(fabric->GetFabricIndex(), noc);
             if (err != CHIP_NO_ERROR) {
                 CHIP_LOG_ERROR("Failed to get existing NOC: %s", ErrorStr(err));
                 return nil;
@@ -216,21 +227,10 @@ - (instancetype)initForExistingFabric:(FabricInfo *)fabric params:(CHIPDeviceCon
                 CHIP_LOG_ERROR("Failed to convert TLV NOC to DER X.509: %s", ErrorStr(err));
                 return nil;
             }
-            if (fabric->GetOperationalKey() == nullptr) {
+            if (!keystore->HasOpKeypairForFabric(fabric->GetFabricIndex())) {
                 CHIP_LOG_ERROR("No existing operational key for fabric");
                 return nil;
             }
-            _serializedOperationalKeypair = new Crypto::P256SerializedKeypair();
-            if (_serializedOperationalKeypair == nullptr) {
-                CHIP_LOG_ERROR("Failed to allocate serialized keypair");
-                return nil;
-            }
-
-            err = fabric->GetOperationalKey()->Serialize(*_serializedOperationalKeypair);
-            if (err != CHIP_NO_ERROR) {
-                CHIP_LOG_ERROR("Failed to serialize operational keypair: %s", ErrorStr(err));
-                return nil;
-            }
         }
 
         usingExistingNOC = YES;
@@ -238,8 +238,9 @@ - (instancetype)initForExistingFabric:(FabricInfo *)fabric params:(CHIPDeviceCon
 
     NSData * oldIntermediateCert = nil;
     {
-        ByteSpan icaCert;
-        CHIP_ERROR err = fabric->GetICACert(icaCert);
+        uint8_t icaBuf[Credentials::kMaxCHIPCertLength];
+        MutableByteSpan icaCert(icaBuf);
+        CHIP_ERROR err = fabricTable->FetchICACert(fabric->GetFabricIndex(), icaCert);
         if (err != CHIP_NO_ERROR) {
             CHIP_LOG_ERROR("Failed to get existing intermediate certificate: %s", ErrorStr(err));
             return nil;
@@ -279,8 +280,9 @@ - (instancetype)initForExistingFabric:(FabricInfo *)fabric params:(CHIPDeviceCon
 
     NSData * oldRootCert;
     {
-        ByteSpan rootCert;
-        CHIP_ERROR err = fabric->GetRootCert(rootCert);
+        uint8_t rootBuf[Credentials::kMaxCHIPCertLength];
+        MutableByteSpan rootCert(rootBuf);
+        CHIP_ERROR err = fabricTable->FetchRootCert(fabric->GetFabricIndex(), rootCert);
         if (err != CHIP_NO_ERROR) {
             CHIP_LOG_ERROR("Failed to get existing root certificate: %s", ErrorStr(err));
             return nil;
@@ -298,6 +300,10 @@ - (instancetype)initForExistingFabric:(FabricInfo *)fabric params:(CHIPDeviceCon
         return nil;
     }
 
+    _fabricTable = fabricTable;
+    _fabricIndex.Emplace(fabricIndex);
+    _keystore = keystore;
+
     return self;
 }
 
@@ -329,11 +335,4 @@ - (BOOL)keypairsMatchCertificates
     return YES;
 }
 
-- (void)dealloc
-{
-    if (_serializedOperationalKeypair != nullptr) {
-        delete _serializedOperationalKeypair;
-        _serializedOperationalKeypair = nullptr;
-    }
-}
 @end
diff --git a/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams_Internal.h b/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams_Internal.h
index d21928a4220144..5326d1cc8faac3 100644
--- a/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams_Internal.h
+++ b/src/darwin/Framework/CHIP/CHIPDeviceControllerStartupParams_Internal.h
@@ -20,10 +20,16 @@
 #import <Foundation/Foundation.h>
 
 #include <crypto/CHIPCryptoPAL.h>
+#include <lib/core/DataModelTypes.h>
+#include <lib/core/Optional.h>
 
 namespace chip {
-class FabricInfo;
-}
+class FabricTable;
+
+namespace Crypto {
+    class OperationalKeystore;
+} // namespace Crypto
+} // namespace chip
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -38,27 +44,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPDeviceControllerStartupParamsInternal : CHIPDeviceControllerStartupParams
 
-/**
- * We may have an operational keypair either provided externally, via
- * operationalKeypair, or internally (from the fabric table) via
- * serializedOperationalKeypair.
- *
- * If operationalKeypair is nil and serializedOperationalKeypair is nullptr, a
- * new random operational keypair will be generated.
- *
- * If operationalCertificate is not nil, either operationalKeypair must be not
- * nil or serializedOperationalKeypair must be not nullptr.
- *
- * If operationalCertificate is nil, operationalKeypair may be not nil or
- * serializedOperationalKeypair may be not nullptr; that corresponds to needing
- * to create a new NOC (e.g. if our signing certificate changed) without
- * changing our operational identity.
- *
- * Meant to be set by MatterControllerFactory.
- *
- * Assumed to be allocated via C++ new and will be deleted via C++ delete.
- */
-@property (nonatomic, nullable, readonly) chip::Crypto::P256SerializedKeypair * serializedOperationalKeypair;
+// Fabric table we can use to do things like allocate operational keys.
+@property (nonatomic, readonly) chip::FabricTable * fabricTable;
+
+// Fabric index we're starting on.  Only has a value when starting on an
+// existing fabric.
+@property (nonatomic, readonly) chip::Optional<chip::FabricIndex> fabricIndex;
+
+// Key store we're using with our fabric table, for sanity checks.
+@property (nonatomic, readonly) chip::Crypto::OperationalKeystore * keystore;
 
 /**
  * Helper method that checks that our keypairs match our certificates.
@@ -77,12 +71,17 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Initialize for controller bringup on a new fabric.
  */
-- (instancetype)initForNewFabric:(CHIPDeviceControllerStartupParams *)params;
+- (instancetype)initForNewFabric:(chip::FabricTable *)fabricTable
+                        keystore:(chip::Crypto::OperationalKeystore *)keystore
+                          params:(CHIPDeviceControllerStartupParams *)params;
 
 /**
  * Initialize for controller bringup on an existing fabric.
  */
-- (instancetype)initForExistingFabric:(chip::FabricInfo *)fabric params:(CHIPDeviceControllerStartupParams *)params;
+- (instancetype)initForExistingFabric:(chip::FabricTable *)fabricTable
+                          fabricIndex:(chip::FabricIndex)fabricIndex
+                             keystore:(chip::Crypto::OperationalKeystore *)keystore
+                               params:(CHIPDeviceControllerStartupParams *)params;
 
 - (instancetype)initWithSigningKeypair:(id<CHIPKeypair>)nocSigner fabricId:(uint64_t)fabricId ipk:(NSData *)ipk NS_UNAVAILABLE;
 - (instancetype)initWithOperationalKeypair:(id<CHIPKeypair>)operationalKeypair
diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController_Internal.h b/src/darwin/Framework/CHIP/CHIPDeviceController_Internal.h
index 01a162351dcd7e..8419de759b82f6 100644
--- a/src/darwin/Framework/CHIP/CHIPDeviceController_Internal.h
+++ b/src/darwin/Framework/CHIP/CHIPDeviceController_Internal.h
@@ -33,7 +33,7 @@
 @class MatterControllerFactory;
 
 namespace chip {
-class FabricInfo;
+class FabricTable;
 } // namespace chip
 
 NS_ASSUME_NONNULL_BEGIN
@@ -66,16 +66,19 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithFactory:(MatterControllerFactory *)factory queue:(dispatch_queue_t)queue;
 
 /**
- * Check whether this controller is running on the given fabric.  The FabricInfo
- * might be from a one-off fabric table.  This method MUST be called from the
- * Matter work queue.
+ * Check whether this controller is running on the given fabric, as represented
+ * by the provided FabricTable and fabric index.  The provided fabric table may
+ * not be the same as the fabric table this controller is using. This method
+ * MUST be called from the Matter work queue.
  *
  * Might return failure, in which case we don't know whether it's running on the
  * given fabric.  Otherwise it will set *isRunning to the right boolean value.
  *
  * Only MatterControllerFactory should be calling this.
  */
-- (CHIP_ERROR)isRunningOnFabric:(chip::FabricInfo *)fabric isRunning:(BOOL *)isRunning;
+- (CHIP_ERROR)isRunningOnFabric:(chip::FabricTable *)fabricTable
+                    fabricIndex:(chip::FabricIndex)fabricIndex
+                      isRunning:(BOOL *)isRunning;
 
 @end
 
diff --git a/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.mm b/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.mm
index 4841a8a7592911..9a8d274ab15710 100644
--- a/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.mm
+++ b/src/darwin/Framework/CHIP/CHIPManualSetupPayloadParser.mm
@@ -19,8 +19,8 @@
 #import "CHIPError_Internal.h"
 #import "CHIPLogging.h"
 #import "CHIPSetupPayload_Internal.h"
+#import "MTRMemory.h"
 
-#import <lib/support/CHIPMem.h>
 #import <setup_payload/ManualSetupPayloadParser.h>
 #import <setup_payload/SetupPayload.h>
 
@@ -32,10 +32,7 @@ @implementation CHIPManualSetupPayloadParser {
 - (id)initWithDecimalStringRepresentation:(NSString *)decimalStringRepresentation
 {
     if (self = [super init]) {
-        if (CHIP_NO_ERROR != chip::Platform::MemoryInit()) {
-            CHIP_LOG_ERROR("Error: couldn't initialize platform memory");
-            return self;
-        }
+        [MTRMemory ensureInit];
         _decimalStringRepresentation = decimalStringRepresentation;
         _chipManualSetupPayloadParser = new chip::ManualSetupPayloadParser(std::string([decimalStringRepresentation UTF8String]));
     }
@@ -69,7 +66,6 @@ - (void)dealloc
 {
     delete _chipManualSetupPayloadParser;
     _chipManualSetupPayloadParser = nullptr;
-    chip::Platform::MemoryShutdown();
 }
 
 @end
diff --git a/src/darwin/Framework/CHIP/CHIPP256KeypairBridge.mm b/src/darwin/Framework/CHIP/CHIPP256KeypairBridge.mm
index e451081e83741c..e51f41bc35080d 100644
--- a/src/darwin/Framework/CHIP/CHIPP256KeypairBridge.mm
+++ b/src/darwin/Framework/CHIP/CHIPP256KeypairBridge.mm
@@ -161,7 +161,7 @@
         return CHIP_ERROR_INTERNAL;
     }
     chip::FixedByteSpan<kP256_PublicKey_Length> pubkeyBytes((const uint8_t *) pubkeyData.bytes);
-    *matterPubKey = P256PublicKey(pubkeyBytes);
+    *matterPubKey = pubkeyBytes;
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.mm b/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.mm
index f28b3032f5e66f..6df71fb8725bbe 100644
--- a/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.mm
+++ b/src/darwin/Framework/CHIP/CHIPQRCodeSetupPayloadParser.mm
@@ -19,8 +19,8 @@
 #import "CHIPError_Internal.h"
 #import "CHIPLogging.h"
 #import "CHIPSetupPayload_Internal.h"
+#import "MTRMemory.h"
 
-#import <lib/support/CHIPMem.h>
 #import <setup_payload/QRCodeSetupPayloadParser.h>
 #import <setup_payload/SetupPayload.h>
 
@@ -32,10 +32,7 @@ @implementation CHIPQRCodeSetupPayloadParser {
 - (id)initWithBase38Representation:(NSString *)base38Representation
 {
     if (self = [super init]) {
-        if (CHIP_NO_ERROR != chip::Platform::MemoryInit()) {
-            CHIP_LOG_ERROR("Error: couldn't initialize platform memory");
-            return self;
-        }
+        [MTRMemory ensureInit];
         _base38Representation = base38Representation;
         _chipQRCodeSetupPayloadParser = new chip::QRCodeSetupPayloadParser(std::string([base38Representation UTF8String]));
     }
@@ -69,7 +66,6 @@ - (void)dealloc
 {
     delete _chipQRCodeSetupPayloadParser;
     _chipQRCodeSetupPayloadParser = nullptr;
-    chip::Platform::MemoryShutdown();
 }
 
 @end
diff --git a/src/darwin/Framework/CHIP/MTRCertificates.mm b/src/darwin/Framework/CHIP/MTRCertificates.mm
index abf8832f201227..57d968e2e4a792 100644
--- a/src/darwin/Framework/CHIP/MTRCertificates.mm
+++ b/src/darwin/Framework/CHIP/MTRCertificates.mm
@@ -18,25 +18,16 @@
 #import "CHIPError_Internal.h"
 #import "CHIPOperationalCredentialsDelegate.h"
 #import "CHIPP256KeypairBridge.h"
+#import "MTRMemory.h"
 #import "NSDataSpanConversion.h"
 
 #include <credentials/CHIPCert.h>
 #include <crypto/CHIPCryptoPAL.h>
-#include <lib/support/CHIPMem.h>
 
 using namespace chip;
 using namespace chip::Crypto;
 using namespace chip::Credentials;
 
-// RAII helper for doing MemoryInit/MemoryShutdown, just in case the underlying
-// Matter APIs we are using use Platform::Memory.  MemoryInit/MemoryShutdown are
-// refcounted, so it's OK if we use AutoPlatformMemory after MemoryInit has
-// already happened elsewhere.
-struct AutoPlatformMemory {
-    AutoPlatformMemory() { Platform::MemoryInit(); }
-    ~AutoPlatformMemory() { Platform::MemoryShutdown(); }
-};
-
 @implementation MTRCertificates
 
 + (nullable NSData *)generateRootCertificate:(id<CHIPKeypair>)keypair
@@ -46,7 +37,7 @@ + (nullable NSData *)generateRootCertificate:(id<CHIPKeypair>)keypair
 {
     NSLog(@"Generating root certificate");
 
-    AutoPlatformMemory platformMemory;
+    [MTRMemory ensureInit];
 
     NSData * rootCert = nil;
     CHIP_ERROR err = CHIPOperationalCredentialsDelegate::GenerateRootCertificate(keypair, issuerId, fabricId, &rootCert);
@@ -70,7 +61,7 @@ + (nullable NSData *)generateIntermediateCertificate:(id<CHIPKeypair>)rootKeypai
 {
     NSLog(@"Generating intermediate certificate");
 
-    AutoPlatformMemory platformMemory;
+    [MTRMemory ensureInit];
 
     NSData * intermediate = nil;
     CHIP_ERROR err = CHIPOperationalCredentialsDelegate::GenerateIntermediateCertificate(
@@ -96,7 +87,7 @@ + (nullable NSData *)generateOperationalCertificate:(id<CHIPKeypair>)signingKeyp
 {
     NSLog(@"Generating operational certificate");
 
-    AutoPlatformMemory platformMemory;
+    [MTRMemory ensureInit];
 
     NSData * opcert = nil;
     CHIP_ERROR err = CHIPOperationalCredentialsDelegate::GenerateOperationalCertificate(
@@ -114,7 +105,7 @@ + (nullable NSData *)generateOperationalCertificate:(id<CHIPKeypair>)signingKeyp
 
 + (BOOL)keypair:(id<CHIPKeypair>)keypair matchesCertificate:(NSData *)certificate
 {
-    AutoPlatformMemory platformMemory;
+    [MTRMemory ensureInit];
 
     P256PublicKey keypairPubKey;
     CHIP_ERROR err = CHIPP256KeypairBridge::MatterPubKeyFromSecKeyRef(keypair.pubkey, &keypairPubKey);
@@ -137,7 +128,7 @@ + (BOOL)keypair:(id<CHIPKeypair>)keypair matchesCertificate:(NSData *)certificat
 
 + (BOOL)isCertificate:(NSData *)certificate1 equalTo:(NSData *)certificate2
 {
-    AutoPlatformMemory platformMemory;
+    [MTRMemory ensureInit];
 
     P256PublicKey pubKey1;
     CHIP_ERROR err = ExtractPubkeyFromX509Cert(AsByteSpan(certificate1), pubKey1);
@@ -179,7 +170,7 @@ + (BOOL)isCertificate:(NSData *)certificate1 equalTo:(NSData *)certificate2
 + (nullable NSData *)generateCertificateSigningRequest:(id<CHIPKeypair>)keypair
                                                  error:(NSError * __autoreleasing _Nullable * _Nullable)error
 {
-    AutoPlatformMemory platformMemory;
+    [MTRMemory ensureInit];
 
     CHIPP256KeypairBridge keypairBridge;
     CHIP_ERROR err = CHIP_NO_ERROR;
diff --git a/src/darwin/Framework/CHIP/MTRMemory.h b/src/darwin/Framework/CHIP/MTRMemory.h
new file mode 100644
index 00000000000000..124e47e92fcecc
--- /dev/null
+++ b/src/darwin/Framework/CHIP/MTRMemory.h
@@ -0,0 +1,40 @@
+/**
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+/**
+ * Utility to initialize the Matter memory subsystem.  Not a public framework
+ * header.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MTRMemory : NSObject
+/**
+ * Ensure Matter Platform::Memory is initialized.  This only needs to happen
+ * once per process, because in practice we just use malloc/free so there is
+ * nothing to initialize, so this just needs to happen to avoid debug
+ * assertions.  This class handles ensuring the initialization only happens
+ * once.
+ */
++ (void)ensureInit;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRMemory.mm b/src/darwin/Framework/CHIP/MTRMemory.mm
new file mode 100644
index 00000000000000..f6c94bf4682b18
--- /dev/null
+++ b/src/darwin/Framework/CHIP/MTRMemory.mm
@@ -0,0 +1,32 @@
+/**
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#import "MTRMemory.h"
+
+#include <lib/support/CHIPMem.h>
+
+@implementation MTRMemory
+
++ (void)ensureInit
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        // The malloc version of MemoryInit never fails.
+        chip::Platform::MemoryInit();
+    });
+}
+
+@end
diff --git a/src/darwin/Framework/CHIP/MatterControllerFactory.mm b/src/darwin/Framework/CHIP/MatterControllerFactory.mm
index 28cd2f424e9929..4e533dc78c4433 100644
--- a/src/darwin/Framework/CHIP/MatterControllerFactory.mm
+++ b/src/darwin/Framework/CHIP/MatterControllerFactory.mm
@@ -27,6 +27,7 @@
 #import "CHIPP256KeypairBridge.h"
 #import "CHIPPersistentStorageDelegateBridge.h"
 #import "MTRCertificates.h"
+#import "MTRMemory.h"
 #import "NSDataSpanConversion.h"
 
 #include <controller/CHIPDeviceControllerFactory.h>
@@ -35,19 +36,20 @@
 #include <credentials/GroupDataProviderImpl.h>
 #include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
 #include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
+#include <crypto/PersistentStorageOperationalKeystore.h>
 #include <lib/support/TestPersistentStorageDelegate.h>
 #include <platform/PlatformManager.h>
 
 using namespace chip;
 using namespace chip::Controller;
 
-static NSString * const kErrorMemoryInit = @"Init Memory failure";
 static NSString * const kErrorPersistentStorageInit = @"Init failure while creating a persistent storage delegate";
 static NSString * const kErrorAttestationTrustStoreInit = @"Init failure while creating the attestation trust store";
 static NSString * const kInfoFactoryShutdown = @"Shutting down the Matter controller factory";
 static NSString * const kErrorGroupProviderInit = @"Init failure while initializing group data provider";
 static NSString * const kErrorControllersInit = @"Init controllers array failure";
 static NSString * const kErrorControllerFactoryInit = @"Init failure while initializing controller factory";
+static NSString * const kErrorKeystoreInit = @"Init failure while initializing persistent storage keystore";
 
 @interface MatterControllerFactory ()
 
@@ -58,9 +60,10 @@ @interface MatterControllerFactory ()
 // We use TestPersistentStorageDelegate just to get an in-memory store to back
 // our group data provider impl.  We initialize this store correctly on every
 // controller startup, so don't need to actually persist it.
-@property (readonly) chip::TestPersistentStorageDelegate * groupStorageDelegate;
-@property (readonly) chip::Credentials::GroupDataProviderImpl * groupDataProvider;
+@property (readonly) TestPersistentStorageDelegate * groupStorageDelegate;
+@property (readonly) Credentials::GroupDataProviderImpl * groupDataProvider;
 @property (readonly) NSMutableArray<CHIPDeviceController *> * controllers;
+@property (readonly) PersistentStorageOperationalKeystore * keystore;
 
 - (BOOL)findMatchingFabric:(FabricTable &)fabricTable
                     params:(CHIPDeviceControllerStartupParams *)params
@@ -89,10 +92,7 @@ - (instancetype)init
     _isRunning = NO;
     _chipWorkQueue = DeviceLayer::PlatformMgrImpl().GetWorkQueue();
     _controllerFactory = &DeviceControllerFactory::GetInstance();
-    CHIP_ERROR errorCode = Platform::MemoryInit();
-    if ([self checkForInitError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorMemoryInit]) {
-        return nil;
-    }
+    [MTRMemory ensureInit];
 
     _groupStorageDelegate = new chip::TestPersistentStorageDelegate();
     if ([self checkForInitError:(_groupStorageDelegate != nullptr) logMsg:kErrorGroupProviderInit]) {
@@ -106,7 +106,7 @@ - (instancetype)init
     }
 
     _groupDataProvider->SetStorageDelegate(_groupStorageDelegate);
-    errorCode = _groupDataProvider->Init();
+    CHIP_ERROR errorCode = _groupDataProvider->Init();
     if ([self checkForInitError:(CHIP_NO_ERROR == errorCode) logMsg:kErrorGroupProviderInit]) {
         return nil;
     }
@@ -152,8 +152,6 @@ - (void)cleanupInitObjects
         delete _groupStorageDelegate;
         _groupStorageDelegate = nullptr;
     }
-
-    Platform::MemoryShutdown();
 }
 
 - (void)cleanupStartupObjects
@@ -163,6 +161,12 @@ - (void)cleanupStartupObjects
         _attestationTrustStoreBridge = nullptr;
     }
 
+    if (_keystore) {
+        _keystore->Finish();
+        delete _keystore;
+        _keystore = nullptr;
+    }
+
     if (_persistentStorageDelegateBridge) {
         delete _persistentStorageDelegateBridge;
         _persistentStorageDelegateBridge = nullptr;
@@ -191,6 +195,19 @@ - (BOOL)startup:(MatterControllerFactoryParams *)startupParams
             return;
         }
 
+        // TODO: Allow passing a different keystore implementation via startupParams.
+        _keystore = new PersistentStorageOperationalKeystore();
+        if (_keystore == nullptr) {
+            CHIP_LOG_ERROR("Error: %@", kErrorKeystoreInit);
+            return;
+        }
+
+        CHIP_ERROR errorCode = _keystore->Init(_persistentStorageDelegateBridge);
+        if (errorCode != CHIP_NO_ERROR) {
+            CHIP_LOG_ERROR("Error: %@", kErrorKeystoreInit);
+            return;
+        }
+
         // Initialize device attestation verifier
         if (startupParams.paaCerts) {
             _attestationTrustStoreBridge = new CHIPAttestationTrustStoreBridge(startupParams.paaCerts);
@@ -215,7 +232,8 @@ - (BOOL)startup:(MatterControllerFactoryParams *)startupParams
 
         params.groupDataProvider = _groupDataProvider;
         params.fabricIndependentStorage = _persistentStorageDelegateBridge;
-        CHIP_ERROR errorCode = _controllerFactory->Init(params);
+        params.operationalKeystore = _keystore;
+        errorCode = _controllerFactory->Init(params);
         if (errorCode != CHIP_NO_ERROR) {
             CHIP_LOG_ERROR("Error: %@", kErrorControllerFactoryInit);
             return;
@@ -271,8 +289,8 @@ - (CHIPDeviceController * _Nullable)startControllerOnExistingFabric:(CHIPDeviceC
     }
 
     __block CHIPDeviceControllerStartupParamsInternal * params = nil;
+    __block FabricTable fabricTable;
     dispatch_sync(_chipWorkQueue, ^{
-        FabricTable fabricTable;
         FabricInfo * fabric = nullptr;
         BOOL ok = [self findMatchingFabric:fabricTable params:startupParams fabric:&fabric];
         if (!ok) {
@@ -287,7 +305,8 @@ - (CHIPDeviceController * _Nullable)startControllerOnExistingFabric:(CHIPDeviceC
 
         for (CHIPDeviceController * existing in _controllers) {
             BOOL isRunning = YES; // assume the worst
-            if ([existing isRunningOnFabric:fabric isRunning:&isRunning] != CHIP_NO_ERROR) {
+            if ([existing isRunningOnFabric:&fabricTable fabricIndex:fabric->GetFabricIndex() isRunning:&isRunning]
+                != CHIP_NO_ERROR) {
                 CHIP_LOG_ERROR("Can't tell what fabric a controller is running on.  Not safe to start.");
                 return;
             }
@@ -298,7 +317,10 @@ - (CHIPDeviceController * _Nullable)startControllerOnExistingFabric:(CHIPDeviceC
             }
         }
 
-        params = [[CHIPDeviceControllerStartupParamsInternal alloc] initForExistingFabric:fabric params:startupParams];
+        params = [[CHIPDeviceControllerStartupParamsInternal alloc] initForExistingFabric:&fabricTable
+                                                                              fabricIndex:fabric->GetFabricIndex()
+                                                                                 keystore:_keystore
+                                                                                   params:startupParams];
     });
 
     if (params == nil) {
@@ -339,8 +361,8 @@ - (CHIPDeviceController * _Nullable)startControllerOnNewFabric:(CHIPDeviceContro
     }
 
     __block CHIPDeviceControllerStartupParamsInternal * params = nil;
+    __block FabricTable fabricTable;
     dispatch_sync(_chipWorkQueue, ^{
-        FabricTable fabricTable;
         FabricInfo * fabric = nullptr;
         BOOL ok = [self findMatchingFabric:fabricTable params:startupParams fabric:&fabric];
         if (!ok) {
@@ -353,7 +375,9 @@ - (CHIPDeviceController * _Nullable)startControllerOnNewFabric:(CHIPDeviceContro
             return;
         }
 
-        params = [[CHIPDeviceControllerStartupParamsInternal alloc] initForNewFabric:startupParams];
+        params = [[CHIPDeviceControllerStartupParamsInternal alloc] initForNewFabric:&fabricTable
+                                                                            keystore:_keystore
+                                                                              params:startupParams];
     });
 
     if (params == nil) {
@@ -402,7 +426,7 @@ - (BOOL)findMatchingFabric:(FabricTable &)fabricTable
                     params:(CHIPDeviceControllerStartupParams *)params
                     fabric:(FabricInfo * _Nullable * _Nonnull)fabric
 {
-    CHIP_ERROR err = fabricTable.Init(_persistentStorageDelegateBridge);
+    CHIP_ERROR err = fabricTable.Init(_persistentStorageDelegateBridge, _keystore);
     if (err != CHIP_NO_ERROR) {
         CHIP_LOG_ERROR("Can't initialize fabric table: %s", ErrorStr(err));
         return NO;
@@ -425,7 +449,7 @@ - (BOOL)findMatchingFabric:(FabricTable &)fabricTable
         }
     }
 
-    *fabric = fabricTable.FindFabric(Credentials::P256PublicKeySpan(pubKey.ConstBytes()), params.fabricId);
+    *fabric = fabricTable.FindFabric(pubKey, params.fabricId);
     return YES;
 }
 
diff --git a/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt
index 102be84e662142..347d18014dcdc0 100644
--- a/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt
@@ -38,14 +38,14 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         {{/chip_server_cluster_attributes}}
         default:
-          *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+          *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
           break;
         }
         break;
     }
     {{/chip_client_clusters}}
     default: {
-      *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+      *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
       break;
     }
     }
diff --git a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt
index e2410936f2cc55..90d73249dd2c95 100644
--- a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt
@@ -167,7 +167,7 @@ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEs
           using TypeInfo = {{asUpperCamelCase parent.name}}::Attributes::{{asUpperCamelCase name}}::TypeInfo;
           auto successFn = Callback<{{>attribute_data_callback_name}}Callback>::FromCancelable(success);
           auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-          return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], CHIP{{>attribute_data_callback_name}}CallbackSubscriptionBridge::OnSubscriptionEstablished,
+          return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], CHIP{{>attribute_data_callback_name}}CallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
               params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
               params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]
           );
diff --git a/src/darwin/Framework/CHIP/templates/CHIPCommandPayloadsObjc-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPCommandPayloadsObjc-src.zapt
index 7249730486b2d1..a4cf0626ff9dd9 100644
--- a/src/darwin/Framework/CHIP/templates/CHIPCommandPayloadsObjc-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/CHIPCommandPayloadsObjc-src.zapt
@@ -18,6 +18,13 @@ NS_ASSUME_NONNULL_BEGIN
   }
   return self;
 }
+
+- (NSString *)description
+{
+  NSString *descriptionString = [NSString stringWithFormat:@"<%@: {{#zcl_command_arguments}}{{asStructPropertyName label}}:%@; {{/zcl_command_arguments}}>", NSStringFromClass([self class]) {{#zcl_command_arguments}},{{#if isArray}}_{{asStructPropertyName label}}{{else if (isOctetString type)}}[_{{asStructPropertyName label}} base64EncodedStringWithOptions:0]{{else}}_{{asStructPropertyName label}}{{/if}}{{/zcl_command_arguments}}];
+  return descriptionString;
+}
+
 @end
 {{/zcl_commands}}
 {{/zcl_clusters}}
diff --git a/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt
index a93042336ac313..5c48cf27b8c14a 100644
--- a/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt
@@ -54,14 +54,14 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         {{/zcl_events}}
 
         default:
-          *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+          *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
           break;
         }
         break;
     }
     {{/chip_client_clusters}}
     default: {
-      *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+      *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
       break;
     }
     }
diff --git a/src/darwin/Framework/CHIP/templates/CHIPStructsObjc-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPStructsObjc-src.zapt
index 8467b429ad650e..56608b5f6856ff 100644
--- a/src/darwin/Framework/CHIP/templates/CHIPStructsObjc-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/CHIPStructsObjc-src.zapt
@@ -16,6 +16,13 @@ NS_ASSUME_NONNULL_BEGIN
   }
   return self;
 }
+
+- (NSString *)description
+{
+  NSString *descriptionString = [NSString stringWithFormat:@"<%@: {{#zcl_struct_items}}{{asStructPropertyName label}}:%@; {{/zcl_struct_items}}>", NSStringFromClass([self class]){{#zcl_struct_items}},{{#if isArray}}_{{asStructPropertyName label}}{{else if (isOctetString type)}}[_{{asStructPropertyName label}} base64EncodedStringWithOptions:0]{{else}}_{{asStructPropertyName label}}{{/if}}{{/zcl_struct_items}}];
+  return descriptionString;
+}
+
 @end
 
 {{/zcl_structs}}
@@ -31,6 +38,13 @@ NS_ASSUME_NONNULL_BEGIN
   }
   return self;
 }
+
+- (NSString *)description
+{
+  NSString *descriptionString = [NSString stringWithFormat:@"<%@: {{#zcl_event_fields}}{{asStructPropertyName name}}:%@; {{/zcl_event_fields}}>", NSStringFromClass([self class]){{#zcl_event_fields}},{{#if isArray}}_{{asStructPropertyName name}}{{else if (isOctetString type)}}[_{{asStructPropertyName label}} base64EncodedStringWithOptions:0]{{else}}_{{asStructPropertyName name}}{{/if}}{{/zcl_event_fields}}];
+  return descriptionString;
+}
+
 @end
 
 {{/zcl_events}}
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
index 71425a9e1c4b9d..98b0a58b532c52 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
@@ -283,7 +283,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -392,7 +392,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -534,7 +534,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -750,7 +750,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -910,7 +910,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1061,7 +1061,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1280,7 +1280,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1611,7 +1611,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1819,7 +1819,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -1975,7 +1975,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2095,7 +2095,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2296,7 +2296,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2570,7 +2570,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -2799,7 +2799,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -3520,7 +3520,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -3668,7 +3668,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -3883,7 +3883,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -3992,7 +3992,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -4085,17 +4085,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NumberOfLogRecordsSupported::Id: {
-            using TypeInfo = Attributes::NumberOfLogRecordsSupported::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
         case Attributes::NumberOfTotalUsersSupported::Id: {
             using TypeInfo = Attributes::NumberOfTotalUsersSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -4228,17 +4217,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::EnableLogging::Id: {
-            using TypeInfo = Attributes::EnableLogging::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;
-        }
         case Attributes::Language::Id: {
             using TypeInfo = Attributes::Language::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -4426,94 +4404,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AlarmMask::Id: {
-            using TypeInfo = Attributes::AlarmMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::KeypadOperationEventMask::Id: {
-            using TypeInfo = Attributes::KeypadOperationEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::RemoteOperationEventMask::Id: {
-            using TypeInfo = Attributes::RemoteOperationEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::ManualOperationEventMask::Id: {
-            using TypeInfo = Attributes::ManualOperationEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::RFIDOperationEventMask::Id: {
-            using TypeInfo = Attributes::RFIDOperationEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::KeypadProgrammingEventMask::Id: {
-            using TypeInfo = Attributes::KeypadProgrammingEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::RemoteProgrammingEventMask::Id: {
-            using TypeInfo = Attributes::RemoteProgrammingEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::RFIDProgrammingEventMask::Id: {
-            using TypeInfo = Attributes::RFIDProgrammingEventMask::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -4615,7 +4505,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6132,7 +6022,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6352,7 +6242,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6590,7 +6480,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6731,7 +6621,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -6896,7 +6786,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7061,7 +6951,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7268,6 +7158,17 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
+        case Attributes::TestEventTriggersEnabled::Id: {
+            using TypeInfo = Attributes::TestEventTriggersEnabled::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;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -7369,7 +7270,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7580,7 +7481,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7700,7 +7601,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -7831,7 +7732,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8011,7 +7912,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8120,7 +8021,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8403,7 +8304,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8551,7 +8452,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8660,7 +8561,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -8814,7 +8715,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9026,7 +8927,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9250,7 +9151,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9476,7 +9377,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9585,7 +9486,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -9760,7 +9661,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10001,7 +9902,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10169,7 +10070,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10300,7 +10201,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -10536,7 +10437,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11031,7 +10932,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11166,7 +11067,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11398,7 +11299,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11832,7 +11733,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -11997,7 +11898,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12176,7 +12077,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12200,12 +12101,28 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                     CHIPSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
                     newElement_0 = [CHIPSoftwareDiagnosticsClusterThreadMetrics new];
                     newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
-                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                                 length:entry_0.name.size()
-                                                               encoding:NSUTF8StringEncoding];
-                    newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent];
-                    newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum];
-                    newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize];
+                    if (entry_0.name.HasValue()) {
+                        newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
+                                                                     length:entry_0.name.Value().size()
+                                                                   encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.name = nil;
+                    }
+                    if (entry_0.stackFreeCurrent.HasValue()) {
+                        newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent.Value()];
+                    } else {
+                        newElement_0.stackFreeCurrent = nil;
+                    }
+                    if (entry_0.stackFreeMinimum.HasValue()) {
+                        newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum.Value()];
+                    } else {
+                        newElement_0.stackFreeMinimum = nil;
+                    }
+                    if (entry_0.stackSize.HasValue()) {
+                        newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize.Value()];
+                    } else {
+                        newElement_0.stackSize = nil;
+                    }
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -12351,7 +12268,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12493,7 +12410,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12643,7 +12560,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -12808,7 +12725,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -13169,9 +13086,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                     auto & entry_0 = iter_0.GetValue();
                     CHIPTestClusterClusterTestListStructOctet * newElement_0;
                     newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedLongLong:entry_0.fabricIndex];
-                    newElement_0.operationalCert = [NSData dataWithBytes:entry_0.operationalCert.data()
-                                                                  length:entry_0.operationalCert.size()];
+                    newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
+                    newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -14282,7 +14198,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -14551,17 +14467,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AlarmMask::Id: {
-            using TypeInfo = Attributes::AlarmMask::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::ThermostatRunningMode::Id: {
             using TypeInfo = Attributes::ThermostatRunningMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -14985,7 +14890,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -15127,7 +15032,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -15161,7 +15066,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
             }
             return value;
         }
@@ -15329,8 +15234,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::Weighting::Id: {
@@ -15340,8 +15249,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::DataVersion::Id: {
@@ -15351,8 +15264,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::StableDataVersion::Id: {
@@ -15362,8 +15279,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::LeaderRouterId::Id: {
@@ -15373,8 +15294,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::DetachedRoleCount::Id: {
@@ -15846,8 +15771,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::PendingTimestamp::Id: {
@@ -15857,8 +15786,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::Delay::Id: {
@@ -15868,8 +15801,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::SecurityPolicy::Id: {
@@ -15879,24 +15816,13 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             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();
-                    CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * newElement_0;
-                    newElement_0 = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
-                    newElement_0.rotationTime = [NSNumber numberWithUnsignedShort:entry_0.rotationTime];
-                    newElement_0.flags = [NSNumber numberWithUnsignedShort:entry_0.flags];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
+                value.rotationTime = [NSNumber numberWithUnsignedShort:cppValue.Value().rotationTime];
+                value.flags = [NSNumber numberWithUnsignedShort:cppValue.Value().flags];
             }
             return value;
         }
@@ -15907,8 +15833,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nonnull value;
-            value = [NSData dataWithBytes:cppValue.data() length:cppValue.size()];
+            NSData * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
+            }
             return value;
         }
         case Attributes::OperationalDatasetComponents::Id: {
@@ -15918,34 +15848,23 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             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();
-                    CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * newElement_0;
-                    newElement_0 = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
-                    newElement_0.activeTimestampPresent = [NSNumber numberWithBool:entry_0.activeTimestampPresent];
-                    newElement_0.pendingTimestampPresent = [NSNumber numberWithBool:entry_0.pendingTimestampPresent];
-                    newElement_0.masterKeyPresent = [NSNumber numberWithBool:entry_0.masterKeyPresent];
-                    newElement_0.networkNamePresent = [NSNumber numberWithBool:entry_0.networkNamePresent];
-                    newElement_0.extendedPanIdPresent = [NSNumber numberWithBool:entry_0.extendedPanIdPresent];
-                    newElement_0.meshLocalPrefixPresent = [NSNumber numberWithBool:entry_0.meshLocalPrefixPresent];
-                    newElement_0.delayPresent = [NSNumber numberWithBool:entry_0.delayPresent];
-                    newElement_0.panIdPresent = [NSNumber numberWithBool:entry_0.panIdPresent];
-                    newElement_0.channelPresent = [NSNumber numberWithBool:entry_0.channelPresent];
-                    newElement_0.pskcPresent = [NSNumber numberWithBool:entry_0.pskcPresent];
-                    newElement_0.securityPolicyPresent = [NSNumber numberWithBool:entry_0.securityPolicyPresent];
-                    newElement_0.channelMaskPresent = [NSNumber numberWithBool:entry_0.channelMaskPresent];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
+                value.activeTimestampPresent = [NSNumber numberWithBool:cppValue.Value().activeTimestampPresent];
+                value.pendingTimestampPresent = [NSNumber numberWithBool:cppValue.Value().pendingTimestampPresent];
+                value.masterKeyPresent = [NSNumber numberWithBool:cppValue.Value().masterKeyPresent];
+                value.networkNamePresent = [NSNumber numberWithBool:cppValue.Value().networkNamePresent];
+                value.extendedPanIdPresent = [NSNumber numberWithBool:cppValue.Value().extendedPanIdPresent];
+                value.meshLocalPrefixPresent = [NSNumber numberWithBool:cppValue.Value().meshLocalPrefixPresent];
+                value.delayPresent = [NSNumber numberWithBool:cppValue.Value().delayPresent];
+                value.panIdPresent = [NSNumber numberWithBool:cppValue.Value().panIdPresent];
+                value.channelPresent = [NSNumber numberWithBool:cppValue.Value().channelPresent];
+                value.pskcPresent = [NSNumber numberWithBool:cppValue.Value().pskcPresent];
+                value.securityPolicyPresent = [NSNumber numberWithBool:cppValue.Value().securityPolicyPresent];
+                value.channelMaskPresent = [NSNumber numberWithBool:cppValue.Value().channelMaskPresent];
             }
             return value;
         }
@@ -16076,7 +15995,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16233,7 +16152,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16353,7 +16272,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16494,7 +16413,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16614,7 +16533,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -16886,7 +16805,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
@@ -17269,13 +17188,13 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             return value;
         }
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
             break;
         }
         break;
     }
     default: {
-        *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH;
+        *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
         break;
     }
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
index 0efb5dda0a4f4f..2cfaba55ac5894 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
@@ -3719,7 +3719,7 @@
 }
 
 void CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
@@ -3743,7 +3743,7 @@
 }
 
 void CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
@@ -3767,7 +3767,7 @@
 }
 
 void CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
@@ -3791,7 +3791,7 @@
 }
 
 void CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
@@ -3814,198 +3814,6 @@
     }
 }
 
-void CHIPDoorLockAlarmMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockAlarmMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockAlarmMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockKeypadOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockKeypadOperationEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockRemoteOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockRemoteOperationEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockManualOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockManualOperationEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockRFIDOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockRFIDOperationEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
 void CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
@@ -8359,7 +8167,7 @@
 }
 
 void CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value)
+    void * context, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
@@ -8752,12 +8560,28 @@
             CHIPSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
             newElement_0 = [CHIPSoftwareDiagnosticsClusterThreadMetrics new];
             newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
-            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                         length:entry_0.name.size()
-                                                       encoding:NSUTF8StringEncoding];
-            newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent];
-            newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum];
-            newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize];
+            if (entry_0.name.HasValue()) {
+                newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
+                                                             length:entry_0.name.Value().size()
+                                                           encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.name = nil;
+            }
+            if (entry_0.stackFreeCurrent.HasValue()) {
+                newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent.Value()];
+            } else {
+                newElement_0.stackFreeCurrent = nil;
+            }
+            if (entry_0.stackFreeMinimum.HasValue()) {
+                newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum.Value()];
+            } else {
+                newElement_0.stackFreeMinimum = nil;
+            }
+            if (entry_0.stackSize.HasValue()) {
+                newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize.Value()];
+            } else {
+                newElement_0.stackSize = nil;
+            }
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9299,7 +9123,7 @@
 }
 
 void CHIPTestClusterBitmap8AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
@@ -9323,7 +9147,7 @@
 }
 
 void CHIPTestClusterBitmap16AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
@@ -9347,7 +9171,7 @@
 }
 
 void CHIPTestClusterBitmap32AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedInt:value.Raw()];
@@ -9371,7 +9195,7 @@
 }
 
 void CHIPTestClusterBitmap64AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedLongLong:value.Raw()];
@@ -9484,9 +9308,8 @@
             auto & entry_0 = iter_0.GetValue();
             CHIPTestClusterClusterTestListStructOctet * newElement_0;
             newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedLongLong:entry_0.fabricIndex];
-            newElement_0.operationalCert = [NSData dataWithBytes:entry_0.operationalCert.data()
-                                                          length:entry_0.operationalCert.size()];
+            newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
+            newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9895,7 +9718,7 @@
 }
 
 void CHIPTestClusterNullableBitmap8AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -9923,7 +9746,7 @@
 }
 
 void CHIPTestClusterNullableBitmap16AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -9951,7 +9774,7 @@
 }
 
 void CHIPTestClusterNullableBitmap32AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -9979,7 +9802,7 @@
 }
 
 void CHIPTestClusterNullableBitmap64AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -10514,35 +10337,24 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & value)
+void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &
+        value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * newElement_0;
-            newElement_0 = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
-            newElement_0.rotationTime = [NSNumber numberWithUnsignedShort:entry_0.rotationTime];
-            newElement_0.flags = [NSNumber numberWithUnsignedShort:entry_0.flags];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
+    CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
+        objCValue.rotationTime = [NSNumber numberWithUnsignedShort:value.Value().rotationTime];
+        objCValue.flags = [NSNumber numberWithUnsignedShort:value.Value().flags];
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10556,47 +10368,36 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<
+void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<
         chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * newElement_0;
-            newElement_0 = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
-            newElement_0.activeTimestampPresent = [NSNumber numberWithBool:entry_0.activeTimestampPresent];
-            newElement_0.pendingTimestampPresent = [NSNumber numberWithBool:entry_0.pendingTimestampPresent];
-            newElement_0.masterKeyPresent = [NSNumber numberWithBool:entry_0.masterKeyPresent];
-            newElement_0.networkNamePresent = [NSNumber numberWithBool:entry_0.networkNamePresent];
-            newElement_0.extendedPanIdPresent = [NSNumber numberWithBool:entry_0.extendedPanIdPresent];
-            newElement_0.meshLocalPrefixPresent = [NSNumber numberWithBool:entry_0.meshLocalPrefixPresent];
-            newElement_0.delayPresent = [NSNumber numberWithBool:entry_0.delayPresent];
-            newElement_0.panIdPresent = [NSNumber numberWithBool:entry_0.panIdPresent];
-            newElement_0.channelPresent = [NSNumber numberWithBool:entry_0.channelPresent];
-            newElement_0.pskcPresent = [NSNumber numberWithBool:entry_0.pskcPresent];
-            newElement_0.securityPolicyPresent = [NSNumber numberWithBool:entry_0.securityPolicyPresent];
-            newElement_0.channelMaskPresent = [NSNumber numberWithBool:entry_0.channelMaskPresent];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
+    CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
+        objCValue.activeTimestampPresent = [NSNumber numberWithBool:value.Value().activeTimestampPresent];
+        objCValue.pendingTimestampPresent = [NSNumber numberWithBool:value.Value().pendingTimestampPresent];
+        objCValue.masterKeyPresent = [NSNumber numberWithBool:value.Value().masterKeyPresent];
+        objCValue.networkNamePresent = [NSNumber numberWithBool:value.Value().networkNamePresent];
+        objCValue.extendedPanIdPresent = [NSNumber numberWithBool:value.Value().extendedPanIdPresent];
+        objCValue.meshLocalPrefixPresent = [NSNumber numberWithBool:value.Value().meshLocalPrefixPresent];
+        objCValue.delayPresent = [NSNumber numberWithBool:value.Value().delayPresent];
+        objCValue.panIdPresent = [NSNumber numberWithBool:value.Value().panIdPresent];
+        objCValue.channelPresent = [NSNumber numberWithBool:value.Value().channelPresent];
+        objCValue.pskcPresent = [NSNumber numberWithBool:value.Value().pskcPresent];
+        objCValue.securityPolicyPresent = [NSNumber numberWithBool:value.Value().securityPolicyPresent];
+        objCValue.channelMaskPresent = [NSNumber numberWithBool:value.Value().channelMaskPresent];
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
     void * context)
 {
     auto * self
-        = static_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge *>(context);
+        = static_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11443,7 +11244,7 @@
 }
 
 void CHIPWindowCoveringConfigStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value)
+    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
@@ -11467,7 +11268,7 @@
 }
 
 void CHIPWindowCoveringModeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value)
+    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
@@ -11689,131 +11490,59 @@
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetLogRecordResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & data)
+void CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data)
 {
-    auto * response = [CHIPDoorLockClusterGetLogRecordResponseParams new];
-    {
-        response.logEntryId = [NSNumber numberWithUnsignedShort:data.logEntryId];
-    }
-    {
-        response.timestamp = [NSNumber numberWithUnsignedInt:data.timestamp];
-    }
-    {
-        response.eventType = [NSNumber numberWithUnsignedChar:data.eventType];
-    }
+    auto * response = [CHIPDoorLockClusterGetWeekDayScheduleResponseParams new];
     {
-        response.source = [NSNumber numberWithUnsignedChar:data.source];
+        response.weekDayIndex = [NSNumber numberWithUnsignedChar:data.weekDayIndex];
     }
     {
-        response.eventIdOrAlarmCode = [NSNumber numberWithUnsignedChar:data.eventIdOrAlarmCode];
+        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
     }
     {
-        response.userId = [NSNumber numberWithUnsignedShort:data.userId];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        response.pin = [NSData dataWithBytes:data.pin.data() length:data.pin.size()];
+        if (data.daysMask.HasValue()) {
+            response.daysMask = [NSNumber numberWithUnsignedChar:data.daysMask.Value().Raw()];
+        } else {
+            response.daysMask = nil;
+        }
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPDoorLockClusterGetPINCodeResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & data)
-{
-    auto * response = [CHIPDoorLockClusterGetPINCodeResponseParams new];
     {
-        response.userId = [NSNumber numberWithUnsignedShort:data.userId];
+        if (data.startHour.HasValue()) {
+            response.startHour = [NSNumber numberWithUnsignedChar:data.startHour.Value()];
+        } else {
+            response.startHour = nil;
+        }
     }
     {
-        if (data.userStatus.IsNull()) {
-            response.userStatus = nil;
+        if (data.startMinute.HasValue()) {
+            response.startMinute = [NSNumber numberWithUnsignedChar:data.startMinute.Value()];
         } else {
-            response.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus.Value())];
+            response.startMinute = nil;
         }
     }
     {
-        if (data.userType.IsNull()) {
-            response.userType = nil;
+        if (data.endHour.HasValue()) {
+            response.endHour = [NSNumber numberWithUnsignedChar:data.endHour.Value()];
         } else {
-            response.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType.Value())];
+            response.endHour = nil;
         }
     }
     {
-        if (data.pin.IsNull()) {
-            response.pin = nil;
+        if (data.endMinute.HasValue()) {
+            response.endMinute = [NSNumber numberWithUnsignedChar:data.endMinute.Value()];
         } else {
-            response.pin = [NSData dataWithBytes:data.pin.Value().data() length:data.pin.Value().size()];
+            response.endMinute = nil;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetUserStatusResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetUserStatusResponse::DecodableType & data)
-{
-    auto * response = [CHIPDoorLockClusterGetUserStatusResponseParams new];
-    {
-        response.userId = [NSNumber numberWithUnsignedShort:data.userId];
-    }
-    {
-        response.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus)];
-    }
-    DispatchSuccess(context, response);
-};
-
-void CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data)
-{
-    auto * response = [CHIPDoorLockClusterGetWeekDayScheduleResponseParams new];
-    {
-        response.weekDayIndex = [NSNumber numberWithUnsignedChar:data.weekDayIndex];
-    }
-    {
-        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
-    }
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
-    }
-    {
-        if (data.daysMask.HasValue()) {
-            response.daysMask = [NSNumber numberWithUnsignedChar:data.daysMask.Value().Raw()];
-        } else {
-            response.daysMask = nil;
-        }
-    }
-    {
-        if (data.startHour.HasValue()) {
-            response.startHour = [NSNumber numberWithUnsignedChar:data.startHour.Value()];
-        } else {
-            response.startHour = nil;
-        }
-    }
-    {
-        if (data.startMinute.HasValue()) {
-            response.startMinute = [NSNumber numberWithUnsignedChar:data.startMinute.Value()];
-        } else {
-            response.startMinute = nil;
-        }
-    }
-    {
-        if (data.endHour.HasValue()) {
-            response.endHour = [NSNumber numberWithUnsignedChar:data.endHour.Value()];
-        } else {
-            response.endHour = nil;
-        }
-    }
-    {
-        if (data.endMinute.HasValue()) {
-            response.endMinute = [NSNumber numberWithUnsignedChar:data.endMinute.Value()];
-        } else {
-            response.endMinute = nil;
-        }
-    }
-    DispatchSuccess(context, response);
-};
-
-void CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data)
+void CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data)
 {
     auto * response = [CHIPDoorLockClusterGetYearDayScheduleResponseParams new];
     {
@@ -11876,50 +11605,6 @@
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetUserTypeResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & data)
-{
-    auto * response = [CHIPDoorLockClusterGetUserTypeResponseParams new];
-    {
-        response.userId = [NSNumber numberWithUnsignedShort:data.userId];
-    }
-    {
-        response.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType)];
-    }
-    DispatchSuccess(context, response);
-};
-
-void CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & data)
-{
-    auto * response = [CHIPDoorLockClusterGetRFIDCodeResponseParams new];
-    {
-        response.userId = [NSNumber numberWithUnsignedShort:data.userId];
-    }
-    {
-        if (data.userStatus.IsNull()) {
-            response.userStatus = nil;
-        } else {
-            response.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus.Value())];
-        }
-    }
-    {
-        if (data.userType.IsNull()) {
-            response.userType = nil;
-        } else {
-            response.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType.Value())];
-        }
-    }
-    {
-        if (data.rfidCode.IsNull()) {
-            response.rfidCode = nil;
-        } else {
-            response.rfidCode = [NSData dataWithBytes:data.rfidCode.Value().data() length:data.rfidCode.Value().size()];
-        }
-    }
-    DispatchSuccess(context, response);
-};
-
 void CHIPDoorLockClusterGetUserResponseCallbackBridge::OnSuccessFn(
     void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data)
 {
@@ -13525,31 +13210,6 @@
     DispatchSuccess(context, response);
 };
 
-void CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data)
-{
-    auto * response = [CHIPThermostatClusterGetRelayStatusLogResponseParams new];
-    {
-        response.timeOfDay = [NSNumber numberWithUnsignedShort:data.timeOfDay];
-    }
-    {
-        response.relayStatus = [NSNumber numberWithUnsignedChar:data.relayStatus];
-    }
-    {
-        response.localTemperature = [NSNumber numberWithShort:data.localTemperature];
-    }
-    {
-        response.humidityInPercentage = [NSNumber numberWithUnsignedChar:data.humidityInPercentage];
-    }
-    {
-        response.setpoint = [NSNumber numberWithShort:data.setpoint];
-    }
-    {
-        response.unreadEntries = [NSNumber numberWithUnsignedShort:data.unreadEntries];
-    }
-    DispatchSuccess(context, response);
-};
-
 void CHIPIdentifyClusterIdentifyEffectIdentifierAttributeCallbackBridge::OnSuccessFn(
     void * context, chip::app::Clusters::Identify::IdentifyEffectIdentifier value)
 {
@@ -18798,17 +18458,17 @@
     }
 }
 
-void CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasZone::IasEnrollResponseCode value)
+void CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::Channel::ChannelStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18822,8 +18482,8 @@
     }
 }
 
-void CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasZone::IasEnrollResponseCode> & value)
+void CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::ChannelStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -18834,9 +18494,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18850,17 +18510,17 @@
     }
 }
 
-void CHIPIasZoneClusterIasZoneTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasZone::IasZoneType value)
+void CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::Channel::LineupInfoTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value)];
+    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18874,21 +18534,21 @@
     }
 }
 
-void CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasZone::IasZoneType> & value)
+void CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::LineupInfoTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
         objCValue = nil;
     } else {
-        objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value.Value())];
+        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18902,17 +18562,18 @@
     }
 }
 
-void CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasAceAlarmStatus value)
+void CHIPTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::TargetNavigator::TargetNavigatorStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18926,8 +18587,8 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceAlarmStatus> & value)
+void CHIPNullableTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::TargetNavigator::TargetNavigatorStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -18938,9 +18599,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPNullableTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18954,17 +18617,17 @@
     }
 }
 
-void CHIPIasAceClusterIasAceArmModeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasAceArmMode value)
+void CHIPMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::MediaPlayback::MediaPlaybackStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -18978,8 +18641,8 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceArmMode> & value)
+void CHIPNullableMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::MediaPlaybackStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -18990,9 +18653,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPNullableMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19006,17 +18671,17 @@
     }
 }
 
-void CHIPIasAceClusterIasAceArmNotificationAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasAceArmNotification value)
+void CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19030,8 +18695,8 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceArmNotification> & value)
+void CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::PlaybackStateEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19042,9 +18707,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19058,17 +18723,17 @@
     }
 }
 
-void CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasAceAudibleNotification value)
+void CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::MediaInput::InputTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19082,8 +18747,8 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceAudibleNotification> & value)
+void CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaInput::InputTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19094,10 +18759,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19111,17 +18775,17 @@
     }
 }
 
-void CHIPIasAceClusterIasAceBypassResultAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasAceBypassResult value)
+void CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::KeypadInput::CecKeyCode value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19135,8 +18799,8 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceBypassResult> & value)
+void CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::KeypadInput::CecKeyCode> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19147,9 +18811,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19163,17 +18827,17 @@
     }
 }
 
-void CHIPIasAceClusterIasAcePanelStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasAcePanelStatus value)
+void CHIPKeypadInputClusterKeypadInputStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::KeypadInput::KeypadInputStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19187,8 +18851,8 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAcePanelStatus> & value)
+void CHIPNullableKeypadInputClusterKeypadInputStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::KeypadInput::KeypadInputStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19199,9 +18863,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19215,17 +18880,17 @@
     }
 }
 
-void CHIPIasAceClusterIasZoneTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::IasAce::IasZoneType value)
+void CHIPContentLauncherClusterContentLaunchStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value)];
+    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19239,21 +18904,23 @@
     }
 }
 
-void CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasZoneType> & value)
+void CHIPNullableContentLauncherClusterContentLaunchStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
         objCValue = nil;
     } else {
-        objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value.Value())];
+        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPNullableContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19267,17 +18934,17 @@
     }
 }
 
-void CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::Channel::ChannelStatusEnum value)
+void CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::ContentLauncher::MetricTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19291,8 +18958,8 @@
     }
 }
 
-void CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::ChannelStatusEnum> & value)
+void CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ContentLauncher::MetricTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19303,9 +18970,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19319,17 +18986,17 @@
     }
 }
 
-void CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::Channel::LineupInfoTypeEnum value)
+void CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::ContentLauncher::ParameterEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19343,8 +19010,8 @@
     }
 }
 
-void CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::LineupInfoTypeEnum> & value)
+void CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ContentLauncher::ParameterEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19355,9 +19022,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19371,18 +19038,17 @@
     }
 }
 
-void CHIPTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::TargetNavigator::TargetNavigatorStatusEnum value)
+void CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::AudioOutput::OutputTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19396,8 +19062,8 @@
     }
 }
 
-void CHIPNullableTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::TargetNavigator::TargetNavigatorStatusEnum> & value)
+void CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::AudioOutput::OutputTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -19408,11 +19074,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNullableTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self
-        = static_cast<CHIPNullableTargetNavigatorClusterTargetNavigatorStatusEnumAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -19426,489 +19090,16 @@
     }
 }
 
-void CHIPMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::MediaPlayback::MediaPlaybackStatusEnum value)
+void CHIPApplicationLauncherClusterApplicationLauncherStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::MediaPlaybackStatusEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
-{
-    auto * self
-        = static_cast<CHIPNullableMediaPlaybackClusterMediaPlaybackStatusEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::PlaybackStateEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::MediaInput::InputTypeEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaInput::InputTypeEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::KeypadInput::CecKeyCode value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::KeypadInput::CecKeyCode> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPKeypadInputClusterKeypadInputStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::KeypadInput::KeypadInputStatusEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableKeypadInputClusterKeypadInputStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::KeypadInput::KeypadInputStatusEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
-{
-    auto * self = static_cast<CHIPNullableKeypadInputClusterKeypadInputStatusEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPContentLauncherClusterContentLaunchStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableContentLauncherClusterContentLaunchStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ContentLauncher::ContentLaunchStatusEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
-{
-    auto * self
-        = static_cast<CHIPNullableContentLauncherClusterContentLaunchStatusEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::ContentLauncher::MetricTypeEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ContentLauncher::MetricTypeEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::ContentLauncher::ParameterEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ContentLauncher::ParameterEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::AudioOutput::OutputTypeEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::AudioOutput::OutputTypeEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPApplicationLauncherClusterApplicationLauncherStatusEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatusEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPApplicationLauncherClusterApplicationLauncherStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPApplicationLauncherClusterApplicationLauncherStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
     auto * self
         = static_cast<CHIPApplicationLauncherClusterApplicationLauncherStatusEnumAttributeCallbackSubscriptionBridge *>(context);
@@ -20010,58 +19201,6 @@
     }
 }
 
-void CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::TestCluster::SimpleEnum value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
 void CHIPMessagingClusterEventIdAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::Messaging::EventId value)
 {
     NSNumber * _Nonnull objCValue;
@@ -20385,3 +19524,55 @@
         self->mEstablishedHandler = nil;
     }
 }
+
+void CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::TestCluster::SimpleEnum value)
+{
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
+{
+    NSNumber * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
index 589aaf0d6220d0..7db67a8f437c48 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
@@ -41,22 +41,12 @@ typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)(
     void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
 typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)(
     void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetLogRecordResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetPINCodeResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetUserStatusResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetUserStatusResponse::DecodableType &);
 typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)(
     void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &);
 typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)(
     void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &);
 typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)(
     void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetUserTypeResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetRFIDCodeResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType &);
 typedef void (*CHIPDoorLockClusterGetUserResponseCallbackType)(
     void *, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType &);
 typedef void (*CHIPDoorLockClusterSetCredentialResponseCallbackType)(
@@ -149,8 +139,6 @@ typedef void (*CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallba
     void *, const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType &);
 typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)(
     void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &);
-typedef void (*CHIPThermostatClusterGetRelayStatusLogResponseCallbackType)(
-    void *, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType &);
 
 typedef void (*IdentifyClusterIdentifyEffectIdentifierAttributeCallback)(void *,
                                                                          chip::app::Clusters::Identify::IdentifyEffectIdentifier);
@@ -496,34 +484,6 @@ typedef void (*IlluminanceMeasurementClusterLightSensorTypeAttributeCallback)(
     void *, chip::app::Clusters::IlluminanceMeasurement::LightSensorType);
 typedef void (*NullableIlluminanceMeasurementClusterLightSensorTypeAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IlluminanceMeasurement::LightSensorType> &);
-typedef void (*IasZoneClusterIasEnrollResponseCodeAttributeCallback)(void *, chip::app::Clusters::IasZone::IasEnrollResponseCode);
-typedef void (*NullableIasZoneClusterIasEnrollResponseCodeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasZone::IasEnrollResponseCode> &);
-typedef void (*IasZoneClusterIasZoneTypeAttributeCallback)(void *, chip::app::Clusters::IasZone::IasZoneType);
-typedef void (*NullableIasZoneClusterIasZoneTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasZone::IasZoneType> &);
-typedef void (*IasAceClusterIasAceAlarmStatusAttributeCallback)(void *, chip::app::Clusters::IasAce::IasAceAlarmStatus);
-typedef void (*NullableIasAceClusterIasAceAlarmStatusAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceAlarmStatus> &);
-typedef void (*IasAceClusterIasAceArmModeAttributeCallback)(void *, chip::app::Clusters::IasAce::IasAceArmMode);
-typedef void (*NullableIasAceClusterIasAceArmModeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceArmMode> &);
-typedef void (*IasAceClusterIasAceArmNotificationAttributeCallback)(void *, chip::app::Clusters::IasAce::IasAceArmNotification);
-typedef void (*NullableIasAceClusterIasAceArmNotificationAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceArmNotification> &);
-typedef void (*IasAceClusterIasAceAudibleNotificationAttributeCallback)(void *,
-                                                                        chip::app::Clusters::IasAce::IasAceAudibleNotification);
-typedef void (*NullableIasAceClusterIasAceAudibleNotificationAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceAudibleNotification> &);
-typedef void (*IasAceClusterIasAceBypassResultAttributeCallback)(void *, chip::app::Clusters::IasAce::IasAceBypassResult);
-typedef void (*NullableIasAceClusterIasAceBypassResultAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceBypassResult> &);
-typedef void (*IasAceClusterIasAcePanelStatusAttributeCallback)(void *, chip::app::Clusters::IasAce::IasAcePanelStatus);
-typedef void (*NullableIasAceClusterIasAcePanelStatusAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAcePanelStatus> &);
-typedef void (*IasAceClusterIasZoneTypeAttributeCallback)(void *, chip::app::Clusters::IasAce::IasZoneType);
-typedef void (*NullableIasAceClusterIasZoneTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasZoneType> &);
 typedef void (*ChannelClusterChannelStatusEnumAttributeCallback)(void *, chip::app::Clusters::Channel::ChannelStatusEnum);
 typedef void (*NullableChannelClusterChannelStatusEnumAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::ChannelStatusEnum> &);
@@ -573,9 +533,6 @@ typedef void (*ApplicationBasicClusterApplicationStatusEnumAttributeCallback)(
     void *, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum);
 typedef void (*NullableApplicationBasicClusterApplicationStatusEnumAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum> &);
-typedef void (*TestClusterClusterSimpleEnumAttributeCallback)(void *, chip::app::Clusters::TestCluster::SimpleEnum);
-typedef void (*NullableTestClusterClusterSimpleEnumAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> &);
 typedef void (*MessagingClusterEventIdAttributeCallback)(void *, chip::app::Clusters::Messaging::EventId);
 typedef void (*NullableMessagingClusterEventIdAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Messaging::EventId> &);
@@ -599,6 +556,9 @@ typedef void (*ApplianceEventsAndAlertClusterEventIdentificationAttributeCallbac
     void *, chip::app::Clusters::ApplianceEventsAndAlert::EventIdentification);
 typedef void (*NullableApplianceEventsAndAlertClusterEventIdentificationAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::ApplianceEventsAndAlert::EventIdentification> &);
+typedef void (*TestClusterClusterSimpleEnumAttributeCallback)(void *, chip::app::Clusters::TestCluster::SimpleEnum);
+typedef void (*NullableTestClusterClusterSimpleEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> &);
 
 typedef void (*AccessControlAclListAttributeCallback)(
     void * context,
@@ -757,29 +717,14 @@ typedef void (*DiagnosticLogsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*DiagnosticLogsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DoorLockCredentialRulesSupportAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>);
+typedef void (*DoorLockCredentialRulesSupportAttributeCallback)(void *,
+                                                                chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>);
 typedef void (*DoorLockSupportedOperatingModesAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>);
+    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>);
 typedef void (*DoorLockDefaultConfigurationRegisterAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>);
+    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>);
 typedef void (*DoorLockLocalProgrammingFeaturesAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>);
-typedef void (*DoorLockAlarmMaskAttributeCallback)(void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>);
-typedef void (*DoorLockKeypadOperationEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>);
-typedef void (*DoorLockRemoteOperationEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>);
-typedef void (*DoorLockManualOperationEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>);
-typedef void (*DoorLockRFIDOperationEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>);
-typedef void (*DoorLockKeypadProgrammingEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>);
-typedef void (*DoorLockRemoteProgrammingEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>);
-typedef void (*DoorLockRFIDProgrammingEventMaskAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>);
+    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>);
 typedef void (*DoorLockGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*DoorLockAcceptedCommandListListAttributeCallback)(void * context,
@@ -1014,7 +959,7 @@ typedef void (*PressureMeasurementAcceptedCommandListListAttributeCallback)(
 typedef void (*PressureMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*PumpConfigurationAndControlPumpStatusAttributeCallback)(
-    void *, chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>);
+    void *, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>);
 typedef void (*PumpConfigurationAndControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*PumpConfigurationAndControlAcceptedCommandListListAttributeCallback)(
@@ -1064,10 +1009,10 @@ typedef void (*TemperatureMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*TemperatureMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*TestClusterBitmap8AttributeCallback)(void *, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>);
-typedef void (*TestClusterBitmap16AttributeCallback)(void *, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>);
-typedef void (*TestClusterBitmap32AttributeCallback)(void *, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>);
-typedef void (*TestClusterBitmap64AttributeCallback)(void *, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>);
+typedef void (*TestClusterBitmap8AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>);
+typedef void (*TestClusterBitmap16AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>);
+typedef void (*TestClusterBitmap32AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>);
+typedef void (*TestClusterBitmap64AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>);
 typedef void (*TestClusterListInt8uListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<uint8_t> & data);
 typedef void (*TestClusterListOctetStringListAttributeCallback)(void * context,
@@ -1088,13 +1033,13 @@ typedef void (*TestClusterListFabricScopedListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & data);
 typedef void (*TestClusterNullableBitmap8AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> &);
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> &);
 typedef void (*TestClusterNullableBitmap16AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> &);
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> &);
 typedef void (*TestClusterNullableBitmap32AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> &);
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> &);
 typedef void (*TestClusterNullableBitmap64AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> &);
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> &);
 typedef void (*TestClusterNullableStructStructAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> &);
 typedef void (*TestClusterGeneratedCommandListListAttributeCallback)(
@@ -1123,14 +1068,13 @@ typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
         data);
-typedef void (*ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & data);
-typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & data);
+typedef void (*ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback)(
+    void *,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &);
+typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback)(
+    void *,
+    const chip::app::DataModel::Nullable<
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &);
 typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
 typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
@@ -1175,8 +1119,8 @@ typedef void (*WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
 typedef void (*WiFiNetworkDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*WindowCoveringConfigStatusAttributeCallback)(void *,
-                                                            chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>);
-typedef void (*WindowCoveringModeAttributeCallback)(void *, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>);
+                                                            chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>);
+typedef void (*WindowCoveringModeAttributeCallback)(void *, chip::BitMask<chip::app::Clusters::WindowCovering::Mode>);
 typedef void (*WindowCoveringGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*WindowCoveringAcceptedCommandListListAttributeCallback)(
@@ -3984,7 +3928,7 @@ class CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge
                                                               CHIPActionBlock action, bool keepAlive = false) :
         CHIPCallbackBridge<DoorLockCredentialRulesSupportAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
 };
 
 class CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge
@@ -4012,7 +3956,7 @@ class CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge
                                                                CHIPActionBlock action, bool keepAlive = false) :
         CHIPCallbackBridge<DoorLockSupportedOperatingModesAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
 };
 
 class CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge
@@ -4040,7 +3984,7 @@ class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge
                                                                     CHIPActionBlock action, bool keepAlive = false) :
         CHIPCallbackBridge<DoorLockDefaultConfigurationRegisterAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
 };
 
 class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge
@@ -4068,7 +4012,7 @@ class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge
                                                                 CHIPActionBlock action, bool keepAlive = false) :
         CHIPCallbackBridge<DoorLockLocalProgrammingFeaturesAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
 };
 
 class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge
@@ -4088,228 +4032,6 @@ class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockAlarmMaskAttributeCallbackBridge : public CHIPCallbackBridge<DoorLockAlarmMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockAlarmMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                 bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockAlarmMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> value);
-};
-
-class CHIPDoorLockAlarmMaskAttributeCallbackSubscriptionBridge : public CHIPDoorLockAlarmMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockAlarmMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action,
-                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockAlarmMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockKeypadOperationEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockKeypadOperationEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value);
-};
-
-class CHIPDoorLockKeypadOperationEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockKeypadOperationEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockRemoteOperationEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockRemoteOperationEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> value);
-};
-
-class CHIPDoorLockRemoteOperationEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockRemoteOperationEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockManualOperationEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockManualOperationEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> value);
-};
-
-class CHIPDoorLockManualOperationEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockManualOperationEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockRFIDOperationEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockRFIDOperationEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> value);
-};
-
-class CHIPDoorLockRFIDOperationEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockRFIDOperationEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockKeypadProgrammingEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockKeypadProgrammingEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value);
-};
-
-class CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockRemoteProgrammingEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockRemoteProgrammingEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> value);
-};
-
-class CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockRFIDProgrammingEventMaskAttributeCallback>
-{
-public:
-    CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockRFIDProgrammingEventMaskAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> value);
-};
-
-class CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge
-{
-public:
-    CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
 class CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge
     : public CHIPCallbackBridge<DoorLockGeneratedCommandListListAttributeCallback>
 {
@@ -7409,7 +7131,7 @@ class CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge
         CHIPCallbackBridge<PumpConfigurationAndControlPumpStatusAttributeCallback>(queue, handler, action, OnSuccessFn,
                                                                                    keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value);
 };
 
 class CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge
@@ -8095,7 +7817,7 @@ class CHIPTestClusterBitmap8AttributeCallbackBridge : public CHIPCallbackBridge<
                                                   bool keepAlive = false) :
         CHIPCallbackBridge<TestClusterBitmap8AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
 };
 
 class CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap8AttributeCallbackBridge
@@ -8121,7 +7843,7 @@ class CHIPTestClusterBitmap16AttributeCallbackBridge : public CHIPCallbackBridge
                                                    bool keepAlive = false) :
         CHIPCallbackBridge<TestClusterBitmap16AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
 };
 
 class CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap16AttributeCallbackBridge
@@ -8147,7 +7869,7 @@ class CHIPTestClusterBitmap32AttributeCallbackBridge : public CHIPCallbackBridge
                                                    bool keepAlive = false) :
         CHIPCallbackBridge<TestClusterBitmap32AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
 };
 
 class CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap32AttributeCallbackBridge
@@ -8173,7 +7895,7 @@ class CHIPTestClusterBitmap64AttributeCallbackBridge : public CHIPCallbackBridge
                                                    bool keepAlive = false) :
         CHIPCallbackBridge<TestClusterBitmap64AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
 };
 
 class CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap64AttributeCallbackBridge
@@ -8404,7 +8126,7 @@ class CHIPTestClusterNullableBitmap8AttributeCallbackBridge : public CHIPCallbac
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
 };
 
 class CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge
@@ -8434,7 +8156,7 @@ class CHIPTestClusterNullableBitmap16AttributeCallbackBridge
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
 };
 
 class CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge
@@ -8464,7 +8186,7 @@ class CHIPTestClusterNullableBitmap32AttributeCallbackBridge
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
 };
 
 class CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge
@@ -8494,7 +8216,7 @@ class CHIPTestClusterNullableBitmap64AttributeCallbackBridge
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
 };
 
 class CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge
@@ -8867,28 +8589,28 @@ class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                          keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
+                            const chip::app::DataModel::Nullable<
                                 chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8898,31 +8620,31 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                        ResponseHandler handler,
-                                                                                        CHIPActionBlock action,
-                                                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>(queue, handler, action,
-                                                                                                      OnSuccessFn, keepAlive){};
+    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                          ResponseHandler handler,
+                                                                                          CHIPActionBlock action,
+                                                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>(queue, handler, action,
+                                                                                                        OnSuccessFn, keepAlive){};
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::DecodableList<
+                const chip::app::DataModel::Nullable<
                     chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9542,7 +9264,7 @@ class CHIPWindowCoveringConfigStatusAttributeCallbackBridge : public CHIPCallbac
                                                           bool keepAlive = false) :
         CHIPCallbackBridge<WindowCoveringConfigStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value);
 };
 
 class CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge
@@ -9569,7 +9291,7 @@ class CHIPWindowCoveringModeAttributeCallbackBridge : public CHIPCallbackBridge<
                                                   bool keepAlive = false) :
         CHIPCallbackBridge<WindowCoveringModeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value);
 };
 
 class CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge : public CHIPWindowCoveringModeAttributeCallbackBridge
@@ -9737,42 +9459,6 @@ class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge
                             const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetLogRecordResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetLogRecordResponseCallbackType>
-{
-public:
-    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetLogRecordResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & data);
-};
-
-class CHIPDoorLockClusterGetPINCodeResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetPINCodeResponseCallbackType>
-{
-public:
-    CHIPDoorLockClusterGetPINCodeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetPINCodeResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & data);
-};
-
-class CHIPDoorLockClusterGetUserStatusResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetUserStatusResponseCallbackType>
-{
-public:
-    CHIPDoorLockClusterGetUserStatusResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetUserStatusResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetUserStatusResponse::DecodableType & data);
-};
-
 class CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge
     : public CHIPCallbackBridge<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>
 {
@@ -9812,30 +9498,6 @@ class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge
                             const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetUserTypeResponseCallbackType>
-{
-public:
-    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetUserTypeResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & data);
-};
-
-class CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetRFIDCodeResponseCallbackType>
-{
-public:
-    CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetRFIDCodeResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & data);
-};
-
 class CHIPDoorLockClusterGetUserResponseCallbackBridge : public CHIPCallbackBridge<CHIPDoorLockClusterGetUserResponseCallbackType>
 {
 public:
@@ -10412,19 +10074,6 @@ class CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge
                             const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data);
 };
 
-class CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPThermostatClusterGetRelayStatusLogResponseCallbackType>
-{
-public:
-    CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPThermostatClusterGetRelayStatusLogResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data);
-};
-
 class CHIPIdentifyClusterIdentifyEffectIdentifierAttributeCallbackBridge
     : public CHIPCallbackBridge<IdentifyClusterIdentifyEffectIdentifierAttributeCallback>
 {
@@ -16272,25 +15921,25 @@ class CHIPNullableIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackS
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge
-    : public CHIPCallbackBridge<IasZoneClusterIasEnrollResponseCodeAttributeCallback>
+class CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge
+    : public CHIPCallbackBridge<ChannelClusterChannelStatusEnumAttributeCallback>
 {
 public:
-    CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IasZoneClusterIasEnrollResponseCodeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelClusterChannelStatusEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasZone::IasEnrollResponseCode value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::Channel::ChannelStatusEnum value);
 };
 
-class CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge
-    : public CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge
+class CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge
+    : public CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge
 {
 public:
-    CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge(queue, handler, action, true),
+    CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -16300,27 +15949,27 @@ class CHIPIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasZoneClusterIasEnrollResponseCodeAttributeCallback>
+class CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge
+    : public CHIPCallbackBridge<NullableChannelClusterChannelStatusEnumAttributeCallback>
 {
 public:
-    CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasZoneClusterIasEnrollResponseCodeAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<NullableChannelClusterChannelStatusEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasZone::IasEnrollResponseCode> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::ChannelStatusEnum> & value);
 };
 
-class CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge
+class CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge
+    : public CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge
 {
 public:
-    CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscriptionBridge(
+    CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackBridge(queue, handler, action, true),
+        CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -16330,539 +15979,25 @@ class CHIPNullableIasZoneClusterIasEnrollResponseCodeAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPIasZoneClusterIasZoneTypeAttributeCallbackBridge : public CHIPCallbackBridge<IasZoneClusterIasZoneTypeAttributeCallback>
+class CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge
+    : public CHIPCallbackBridge<ChannelClusterLineupInfoTypeEnumAttributeCallback>
 {
 public:
-    CHIPIasZoneClusterIasZoneTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<IasZoneClusterIasZoneTypeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelClusterLineupInfoTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasZone::IasZoneType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::Channel::LineupInfoTypeEnum value);
 };
 
-class CHIPIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge : public CHIPIasZoneClusterIasZoneTypeAttributeCallbackBridge
+class CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge
+    : public CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge
 {
 public:
-    CHIPIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action,
-                                                                     SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasZoneClusterIasZoneTypeAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasZoneClusterIasZoneTypeAttributeCallback>
-{
-public:
-    CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasZoneClusterIasZoneTypeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasZone::IasZoneType> & value);
-};
-
-class CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasZoneClusterIasZoneTypeAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackBridge
-    : public CHIPCallbackBridge<IasAceClusterIasAceAlarmStatusAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasAceAlarmStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasAceAlarmStatus value);
-};
-
-class CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge
-    : public CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasAceAlarmStatusAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasAceAlarmStatusAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasAceAlarmStatusAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceAlarmStatus> & value);
-};
-
-class CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasAceAlarmStatusAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasAceArmModeAttributeCallbackBridge : public CHIPCallbackBridge<IasAceClusterIasAceArmModeAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasAceArmModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasAceArmModeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasAceArmMode value);
-};
-
-class CHIPIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge
-    : public CHIPIasAceClusterIasAceArmModeAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action,
-                                                                      SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasAceArmModeAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasAceArmModeAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasAceArmModeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceArmMode> & value);
-};
-
-class CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasAceArmModeAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasAceArmNotificationAttributeCallbackBridge
-    : public CHIPCallbackBridge<IasAceClusterIasAceArmNotificationAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasAceArmNotificationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasAceArmNotificationAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasAceArmNotification value);
-};
-
-class CHIPIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge
-    : public CHIPIasAceClusterIasAceArmNotificationAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasAceArmNotificationAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasAceArmNotificationAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasAceArmNotificationAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceArmNotification> & value);
-};
-
-class CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasAceArmNotificationAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge
-    : public CHIPCallbackBridge<IasAceClusterIasAceAudibleNotificationAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasAceAudibleNotificationAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasAceAudibleNotification value);
-};
-
-class CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge
-    : public CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasAceAudibleNotificationAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasAceAudibleNotificationAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceAudibleNotification> & value);
-};
-
-class CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasAceAudibleNotificationAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasAceBypassResultAttributeCallbackBridge
-    : public CHIPCallbackBridge<IasAceClusterIasAceBypassResultAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasAceBypassResultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasAceBypassResultAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasAceBypassResult value);
-};
-
-class CHIPIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge
-    : public CHIPIasAceClusterIasAceBypassResultAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasAceBypassResultAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasAceBypassResultAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasAceBypassResultAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAceBypassResult> & value);
-};
-
-class CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasAceBypassResultAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasAcePanelStatusAttributeCallbackBridge
-    : public CHIPCallbackBridge<IasAceClusterIasAcePanelStatusAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasAcePanelStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasAcePanelStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasAcePanelStatus value);
-};
-
-class CHIPIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge
-    : public CHIPIasAceClusterIasAcePanelStatusAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasAcePanelStatusAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasAcePanelStatusAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasAcePanelStatusAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasAcePanelStatus> & value);
-};
-
-class CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasAcePanelStatusAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIasAceClusterIasZoneTypeAttributeCallbackBridge : public CHIPCallbackBridge<IasAceClusterIasZoneTypeAttributeCallback>
-{
-public:
-    CHIPIasAceClusterIasZoneTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<IasAceClusterIasZoneTypeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::IasAce::IasZoneType value);
-};
-
-class CHIPIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge : public CHIPIasAceClusterIasZoneTypeAttributeCallbackBridge
-{
-public:
-    CHIPIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIasAceClusterIasZoneTypeAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableIasAceClusterIasZoneTypeAttributeCallback>
-{
-public:
-    CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableIasAceClusterIasZoneTypeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::IasAce::IasZoneType> & value);
-};
-
-class CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge
-    : public CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackBridge
-{
-public:
-    CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge
-    : public CHIPCallbackBridge<ChannelClusterChannelStatusEnumAttributeCallback>
-{
-public:
-    CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelClusterChannelStatusEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::Channel::ChannelStatusEnum value);
-};
-
-class CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge
-    : public CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge
-{
-public:
-    CHIPChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelClusterChannelStatusEnumAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableChannelClusterChannelStatusEnumAttributeCallback>
-{
-public:
-    CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableChannelClusterChannelStatusEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::ChannelStatusEnum> & value);
-};
-
-class CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge
-    : public CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge
-{
-public:
-    CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableChannelClusterChannelStatusEnumAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge
-    : public CHIPCallbackBridge<ChannelClusterLineupInfoTypeEnumAttributeCallback>
-{
-public:
-    CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelClusterLineupInfoTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::Channel::LineupInfoTypeEnum value);
-};
-
-class CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge
-    : public CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge
-{
-public:
-    CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(queue, handler, action, true),
+    CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -17618,63 +16753,6 @@ class CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackS
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterClusterSimpleEnumAttributeCallback>
-{
-public:
-    CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterClusterSimpleEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::TestCluster::SimpleEnum value);
-};
-
-class CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge
-{
-public:
-    CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge
-    : public CHIPCallbackBridge<NullableTestClusterClusterSimpleEnumAttributeCallback>
-{
-public:
-    CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NullableTestClusterClusterSimpleEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value);
-};
-
-class CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge
-    : public CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge
-{
-public:
-    CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
 class CHIPMessagingClusterEventIdAttributeCallbackBridge : public CHIPCallbackBridge<MessagingClusterEventIdAttributeCallback>
 {
 public:
@@ -18035,3 +17113,60 @@ class CHIPNullableApplianceEventsAndAlertClusterEventIdentificationAttributeCall
 private:
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
+
+class CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterClusterSimpleEnumAttributeCallback>
+{
+public:
+    CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterClusterSimpleEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context, chip::app::Clusters::TestCluster::SimpleEnum value);
+};
+
+class CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge
+{
+public:
+    CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge
+    : public CHIPCallbackBridge<NullableTestClusterClusterSimpleEnumAttributeCallback>
+{
+public:
+    CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<NullableTestClusterClusterSimpleEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value);
+};
+
+class CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge
+    : public CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge
+{
+public:
+    CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
index d44eb3a6de6952..326621dc1bb925 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
@@ -4532,23 +4532,6 @@ NS_ASSUME_NONNULL_BEGIN
            completionHandler:(StatusCompletion)completionHandler;
 - (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params
                   completionHandler:(StatusCompletion)completionHandler;
-- (void)getLogRecordWithParams:(CHIPDoorLockClusterGetLogRecordParams *)params
-             completionHandler:(void (^)(CHIPDoorLockClusterGetLogRecordResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler;
-- (void)setPINCodeWithParams:(CHIPDoorLockClusterSetPINCodeParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)getPINCodeWithParams:(CHIPDoorLockClusterGetPINCodeParams *)params
-           completionHandler:
-               (void (^)(CHIPDoorLockClusterGetPINCodeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)clearPINCodeWithParams:(CHIPDoorLockClusterClearPINCodeParams *)params
-             completionHandler:(StatusCompletion)completionHandler;
-- (void)clearAllPINCodesWithParams:(CHIPDoorLockClusterClearAllPINCodesParams * _Nullable)params
-                 completionHandler:(StatusCompletion)completionHandler;
-- (void)clearAllPINCodesWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)setUserStatusWithParams:(CHIPDoorLockClusterSetUserStatusParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)getUserStatusWithParams:(CHIPDoorLockClusterGetUserStatusParams *)params
-              completionHandler:(void (^)(CHIPDoorLockClusterGetUserStatusResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler;
 - (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params
                    completionHandler:(StatusCompletion)completionHandler;
 - (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params
@@ -4570,19 +4553,6 @@ NS_ASSUME_NONNULL_BEGIN
                                          NSError * _Nullable error))completionHandler;
 - (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params
                      completionHandler:(StatusCompletion)completionHandler;
-- (void)setUserTypeWithParams:(CHIPDoorLockClusterSetUserTypeParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)getUserTypeWithParams:(CHIPDoorLockClusterGetUserTypeParams *)params
-            completionHandler:(void (^)(CHIPDoorLockClusterGetUserTypeResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler;
-- (void)setRFIDCodeWithParams:(CHIPDoorLockClusterSetRFIDCodeParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)getRFIDCodeWithParams:(CHIPDoorLockClusterGetRFIDCodeParams *)params
-            completionHandler:(void (^)(CHIPDoorLockClusterGetRFIDCodeResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler;
-- (void)clearRFIDCodeWithParams:(CHIPDoorLockClusterClearRFIDCodeParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)clearAllRFIDCodesWithParams:(CHIPDoorLockClusterClearAllRFIDCodesParams * _Nullable)params
-                  completionHandler:(StatusCompletion)completionHandler;
-- (void)clearAllRFIDCodesWithCompletionHandler:(StatusCompletion)completionHandler;
 - (void)setUserWithParams:(CHIPDoorLockClusterSetUserParams *)params completionHandler:(StatusCompletion)completionHandler;
 - (void)getUserWithParams:(CHIPDoorLockClusterGetUserParams *)params
         completionHandler:
@@ -4596,10 +4566,6 @@ NS_ASSUME_NONNULL_BEGIN
                                           NSError * _Nullable error))completionHandler;
 - (void)clearCredentialWithParams:(CHIPDoorLockClusterClearCredentialParams *)params
                 completionHandler:(StatusCompletion)completionHandler;
-- (void)operatingEventNotificationWithParams:(CHIPDoorLockClusterOperatingEventNotificationParams *)params
-                           completionHandler:(StatusCompletion)completionHandler;
-- (void)programmingEventNotificationWithParams:(CHIPDoorLockClusterProgrammingEventNotificationParams *)params
-                             completionHandler:(StatusCompletion)completionHandler;
 
 - (void)readAttributeLockStateWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
@@ -4732,25 +4698,6 @@ NS_ASSUME_NONNULL_BEGIN
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfLogRecordsSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeNumberOfLogRecordsSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfLogRecordsSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                           NSError * _Nullable error))completionHandler;
 /**
@@ -4977,28 +4924,6 @@ NS_ASSUME_NONNULL_BEGIN
                                                          completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                                NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnableLoggingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnableLoggingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnableLoggingWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeEnableLoggingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnableLoggingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeLanguageWithCompletionHandler:(void (^)(
                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 - (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -5379,194 +5304,6 @@ NS_ASSUME_NONNULL_BEGIN
                                          completionHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAlarmMaskWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAlarmMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAlarmMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeKeypadOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributeKeypadOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeKeypadOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeKeypadOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeKeypadOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRemoteOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRemoteOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRemoteOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRemoteOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRemoteOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeManualOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributeManualOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeManualOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeManualOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeManualOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRFIDOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRFIDOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRFIDOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRFIDOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRFIDOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeKeypadProgrammingEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
-- (void)writeAttributeKeypadProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeKeypadProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                   params:(CHIPWriteParams * _Nullable)params
-                                        completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeKeypadProgrammingEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeKeypadProgrammingEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRemoteProgrammingEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRemoteProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRemoteProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                   params:(CHIPWriteParams * _Nullable)params
-                                        completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRemoteProgrammingEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRemoteProgrammingEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRFIDProgrammingEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRFIDProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRFIDProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRFIDProgrammingEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRFIDProgrammingEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -9240,6 +8977,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface CHIPGeneralDiagnostics : CHIPCluster
 
+- (void)testEventTriggerWithParams:(CHIPGeneralDiagnosticsClusterTestEventTriggerParams *)params
+                 completionHandler:(StatusCompletion)completionHandler;
+
 - (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
@@ -9382,6 +9122,25 @@ NS_ASSUME_NONNULL_BEGIN
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -10246,6 +10005,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)stopWithOnOffWithParams:(CHIPLevelControlClusterStopWithOnOffParams * _Nullable)params
               completionHandler:(StatusCompletion)completionHandler;
 - (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)moveToClosestFrequencyWithParams:(CHIPLevelControlClusterMoveToClosestFrequencyParams *)params
+                       completionHandler:(StatusCompletion)completionHandler;
 
 - (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
@@ -12785,8 +12546,6 @@ NS_ASSUME_NONNULL_BEGIN
                                    NSError * _Nullable error))completionHandler;
 - (void)addTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams *)params
                           completionHandler:(StatusCompletion)completionHandler;
-- (void)removeTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterRemoveTrustedRootCertificateParams *)params
-                             completionHandler:(StatusCompletion)completionHandler;
 
 - (void)readAttributeNOCsWithParams:(CHIPReadParams * _Nullable)params
                   completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
@@ -17501,11 +17260,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)clearWeeklyScheduleWithParams:(CHIPThermostatClusterClearWeeklyScheduleParams * _Nullable)params
                     completionHandler:(StatusCompletion)completionHandler;
 - (void)clearWeeklyScheduleWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)getRelayStatusLogWithParams:(CHIPThermostatClusterGetRelayStatusLogParams * _Nullable)params
-                  completionHandler:(void (^)(CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler;
-- (void)getRelayStatusLogWithCompletionHandler:(void (^)(CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable data,
-                                                   NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
@@ -18001,22 +17755,6 @@ NS_ASSUME_NONNULL_BEGIN
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAlarmMaskWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAlarmMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAlarmMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))completionHandler;
 /**
@@ -19877,8 +19615,8 @@ NS_ASSUME_NONNULL_BEGIN
                                        queue:(dispatch_queue_t)queue
                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSecurityPolicyWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeSecurityPolicyWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
@@ -19888,12 +19626,13 @@ NS_ASSUME_NONNULL_BEGIN
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
+                                              (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                  NSError * _Nullable error))reportHandler;
 + (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                    completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
                                                           NSData * _Nullable value, NSError * _Nullable error))completionHandler;
@@ -19911,24 +19650,31 @@ NS_ASSUME_NONNULL_BEGIN
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSArray * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)
+    subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:
+                                                        (void (^)(
+                                                            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler;
++ (void)
+    readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(
+                                                      CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                       NSError * _Nullable error))completionHandler;
@@ -21864,6 +21610,10 @@ typedef NS_ENUM(uint8_t, CHIPGeneralDiagnosticsRadioFaultType) {
     CHIPGeneralDiagnosticsRadioFaultTypeEthernetFault = 0x06,
 };
 
+typedef NS_OPTIONS(uint32_t, CHIPSoftwareDiagnosticsFeature) {
+    CHIPSoftwareDiagnosticsFeatureWaterMarks = 0x1,
+};
+
 typedef NS_ENUM(uint8_t, CHIPThreadNetworkDiagnosticsNetworkFault) {
     CHIPThreadNetworkDiagnosticsNetworkFaultUnspecified = 0x00,
     CHIPThreadNetworkDiagnosticsNetworkFaultLinkDown = 0x01,
@@ -21955,6 +21705,7 @@ typedef NS_ENUM(uint8_t, CHIPOperationalCredentialsOperationalCertStatus) {
     CHIPOperationalCredentialsOperationalCertStatusInvalidNOC = 0x03,
     CHIPOperationalCredentialsOperationalCertStatusMissingCsr = 0x04,
     CHIPOperationalCredentialsOperationalCertStatusTableFull = 0x05,
+    CHIPOperationalCredentialsOperationalCertStatusInvalidAdminSubject = 0x06,
     CHIPOperationalCredentialsOperationalCertStatusInsufficientPrivilege = 0x08,
     CHIPOperationalCredentialsOperationalCertStatusFabricConflict = 0x09,
     CHIPOperationalCredentialsOperationalCertStatusLabelConflict = 0x0A,
@@ -22159,16 +21910,6 @@ typedef NS_ENUM(uint8_t, CHIPDoorLockUserType) {
     CHIPDoorLockUserTypeNotSupported = 0xFF,
 };
 
-typedef NS_OPTIONS(uint16_t, CHIPDoorLockDlAlarmMask) {
-    CHIPDoorLockDlAlarmMaskLockingMechanismJammed = 0x1,
-    CHIPDoorLockDlAlarmMaskLockResetToFactoryDefaults = 0x2,
-    CHIPDoorLockDlAlarmMaskReserved = 0x4,
-    CHIPDoorLockDlAlarmMaskRFModulePowerCycled = 0x8,
-    CHIPDoorLockDlAlarmMaskWrongCodeEntryLimit = 0x10,
-    CHIPDoorLockDlAlarmMaskFrontEscutcheonRemovedFromMain = 0x20,
-    CHIPDoorLockDlAlarmMaskForcedDoorOpenUnderDoorLockedCondition = 0x40,
-};
-
 typedef NS_OPTIONS(uint8_t, CHIPDoorLockDlCredentialRuleMask) {
     CHIPDoorLockDlCredentialRuleMaskSingle = 0x1,
     CHIPDoorLockDlCredentialRuleMaskDual = 0x2,
@@ -22599,144 +22340,6 @@ typedef NS_OPTIONS(uint32_t, CHIPPressureMeasurementPressureFeature) {
     CHIPPressureMeasurementPressureFeatureEXT = 0x1,
 };
 
-typedef NS_ENUM(uint8_t, CHIPIasZoneIasEnrollResponseCode) {
-    CHIPIasZoneIasEnrollResponseCodeSuccess = 0x00,
-    CHIPIasZoneIasEnrollResponseCodeNotSupported = 0x01,
-    CHIPIasZoneIasEnrollResponseCodeNoEnrollPermit = 0x02,
-    CHIPIasZoneIasEnrollResponseCodeTooManyZones = 0x03,
-};
-
-typedef NS_ENUM(uint16_t, CHIPIasZoneType) {
-    CHIPIasZoneTypeStandardCie = 0x00,
-    CHIPIasZoneTypeMotionSensor = 0x0D,
-    CHIPIasZoneTypeContactSwitch = 0x15,
-    CHIPIasZoneTypeFireSensor = 0x28,
-    CHIPIasZoneTypeWaterSensor = 0x2A,
-    CHIPIasZoneTypeGasSensor = 0x2B,
-    CHIPIasZoneTypePersonalEmergencyDevice = 0x2C,
-    CHIPIasZoneTypeVibrationMovementSensor = 0x2D,
-    CHIPIasZoneTypeRemoteControl = 0x10F,
-    CHIPIasZoneTypeKeyFob = 0x115,
-    CHIPIasZoneTypeKeypad = 0x21D,
-    CHIPIasZoneTypeStandardWarningDevice = 0x225,
-    CHIPIasZoneTypeGlassBreakSensor = 0x226,
-    CHIPIasZoneTypeCarbonMonoxideSensor = 0x227,
-    CHIPIasZoneTypeSecurityRepeater = 0x229,
-    CHIPIasZoneTypeInvalidZoneType = 0xFFFF,
-};
-
-typedef NS_OPTIONS(uint16_t, CHIPIasZoneStatus) {
-    CHIPIasZoneStatusAlarm1 = 0x1,
-    CHIPIasZoneStatusAlarm2 = 0x2,
-    CHIPIasZoneStatusTamper = 0x4,
-    CHIPIasZoneStatusBattery = 0x8,
-    CHIPIasZoneStatusSupervisionReports = 0x10,
-    CHIPIasZoneStatusRestoreReports = 0x20,
-    CHIPIasZoneStatusTrouble = 0x40,
-    CHIPIasZoneStatusAC = 0x80,
-    CHIPIasZoneStatusTest = 0x100,
-    CHIPIasZoneStatusBatteryDefect = 0x200,
-};
-
-typedef NS_ENUM(uint8_t, CHIPIasAceAlarmStatus) {
-    CHIPIasAceAlarmStatusNoAlarm = 0x00,
-    CHIPIasAceAlarmStatusBurglar = 0x01,
-    CHIPIasAceAlarmStatusFire = 0x02,
-    CHIPIasAceAlarmStatusEmergency = 0x03,
-    CHIPIasAceAlarmStatusPolicePanic = 0x04,
-    CHIPIasAceAlarmStatusFirePanic = 0x05,
-    CHIPIasAceAlarmStatusEmergencyPanic = 0x06,
-};
-
-typedef NS_ENUM(uint8_t, CHIPIasAceArmMode) {
-    CHIPIasAceArmModeDisarm = 0x00,
-    CHIPIasAceArmModeArmDayHomeZonesOnly = 0x01,
-    CHIPIasAceArmModeArmNightSleepZonesOnly = 0x02,
-    CHIPIasAceArmModeArmAllZones = 0x03,
-};
-
-typedef NS_ENUM(uint8_t, CHIPIasAceArmNotification) {
-    CHIPIasAceArmNotificationAllZonesDisarmed = 0x00,
-    CHIPIasAceArmNotificationOnlyDayHomeZonesArmed = 0x01,
-    CHIPIasAceArmNotificationOnlyNightSleepZonesArmed = 0x02,
-    CHIPIasAceArmNotificationAllZonesArmed = 0x03,
-    CHIPIasAceArmNotificationInvalidArmDisarmCode = 0x04,
-    CHIPIasAceArmNotificationNotReadyToArm = 0x05,
-    CHIPIasAceArmNotificationAlreadyDisarmed = 0x06,
-};
-
-typedef NS_ENUM(uint8_t, CHIPIasAceAudibleNotification) {
-    CHIPIasAceAudibleNotificationMute = 0x00,
-    CHIPIasAceAudibleNotificationDefaultSound = 0x01,
-};
-
-typedef NS_ENUM(uint8_t, CHIPIasAceBypassResult) {
-    CHIPIasAceBypassResultZoneBypassed = 0x00,
-    CHIPIasAceBypassResultZoneNotBypassed = 0x01,
-    CHIPIasAceBypassResultNotAllowed = 0x02,
-    CHIPIasAceBypassResultInvalidZoneId = 0x03,
-    CHIPIasAceBypassResultUnknownZoneId = 0x04,
-    CHIPIasAceBypassResultInvalidArmDisarmCode = 0x05,
-};
-
-typedef NS_ENUM(uint8_t, CHIPIasAcePanelStatus) {
-    CHIPIasAcePanelStatusPanelDisarmed = 0x00,
-    CHIPIasAcePanelStatusArmedStay = 0x01,
-    CHIPIasAcePanelStatusArmedNight = 0x02,
-    CHIPIasAcePanelStatusArmedAway = 0x03,
-    CHIPIasAcePanelStatusExitDelay = 0x04,
-    CHIPIasAcePanelStatusEntryDelay = 0x05,
-    CHIPIasAcePanelStatusNotReadyToArm = 0x06,
-    CHIPIasAcePanelStatusInAlarm = 0x07,
-    CHIPIasAcePanelStatusArmingStay = 0x08,
-    CHIPIasAcePanelStatusArmingNight = 0x09,
-    CHIPIasAcePanelStatusArmingAway = 0x0A,
-};
-
-typedef NS_ENUM(uint16_t, CHIPIasAceIasZoneType) {
-    CHIPIasAceIasZoneTypeStandardCie = 0x00,
-    CHIPIasAceIasZoneTypeMotionSensor = 0x0D,
-    CHIPIasAceIasZoneTypeContactSwitch = 0x15,
-    CHIPIasAceIasZoneTypeFireSensor = 0x28,
-    CHIPIasAceIasZoneTypeWaterSensor = 0x2A,
-    CHIPIasAceIasZoneTypeGasSensor = 0x2B,
-    CHIPIasAceIasZoneTypePersonalEmergencyDevice = 0x2C,
-    CHIPIasAceIasZoneTypeVibrationMovementSensor = 0x2D,
-    CHIPIasAceIasZoneTypeRemoteControl = 0x10F,
-    CHIPIasAceIasZoneTypeKeyFob = 0x115,
-    CHIPIasAceIasZoneTypeKeypad = 0x21D,
-    CHIPIasAceIasZoneTypeStandardWarningDevice = 0x225,
-    CHIPIasAceIasZoneTypeGlassBreakSensor = 0x226,
-    CHIPIasAceIasZoneTypeCarbonMonoxideSensor = 0x227,
-    CHIPIasAceIasZoneTypeSecurityRepeater = 0x229,
-    CHIPIasAceIasZoneTypeInvalidZoneType = 0xFFFF,
-};
-
-typedef NS_OPTIONS(uint16_t, CHIPIasAceIasZoneStatus) {
-    CHIPIasAceIasZoneStatusAlarm1 = 0x1,
-    CHIPIasAceIasZoneStatusAlarm2 = 0x2,
-    CHIPIasAceIasZoneStatusTamper = 0x4,
-    CHIPIasAceIasZoneStatusBattery = 0x8,
-    CHIPIasAceIasZoneStatusSupervisionReports = 0x10,
-    CHIPIasAceIasZoneStatusRestoreReports = 0x20,
-    CHIPIasAceIasZoneStatusTrouble = 0x40,
-    CHIPIasAceIasZoneStatusAC = 0x80,
-    CHIPIasAceIasZoneStatusTest = 0x100,
-    CHIPIasAceIasZoneStatusBatteryDefect = 0x200,
-};
-
-typedef NS_OPTIONS(uint8_t, CHIPIasWdSquawkInfo) {
-    CHIPIasWdSquawkInfoMode = 0xF0,
-    CHIPIasWdSquawkInfoStrobe = 0x8,
-    CHIPIasWdSquawkInfoLevel = 0x3,
-};
-
-typedef NS_OPTIONS(uint8_t, CHIPIasWdWarningInfo) {
-    CHIPIasWdWarningInfoMode = 0xF0,
-    CHIPIasWdWarningInfoStrobe = 0xC,
-    CHIPIasWdWarningInfoSirenLevel = 0x3,
-};
-
 typedef NS_ENUM(uint8_t, CHIPChannelStatus) {
     CHIPChannelStatusSuccess = 0x00,
     CHIPChannelStatusMultipleMatches = 0x01,
@@ -22961,47 +22564,6 @@ typedef NS_ENUM(uint8_t, CHIPApplicationBasicApplicationStatus) {
     CHIPApplicationBasicApplicationStatusActiveVisibleNotFocus = 0x03,
 };
 
-typedef NS_ENUM(uint8_t, CHIPTestClusterSimple) {
-    CHIPTestClusterSimpleUnspecified = 0x00,
-    CHIPTestClusterSimpleValueA = 0x01,
-    CHIPTestClusterSimpleValueB = 0x02,
-    CHIPTestClusterSimpleValueC = 0x03,
-};
-
-typedef NS_OPTIONS(uint16_t, CHIPTestClusterBitmap16MaskMap) {
-    CHIPTestClusterBitmap16MaskMapMaskVal1 = 0x1,
-    CHIPTestClusterBitmap16MaskMapMaskVal2 = 0x2,
-    CHIPTestClusterBitmap16MaskMapMaskVal3 = 0x4,
-    CHIPTestClusterBitmap16MaskMapMaskVal4 = 0x4000,
-};
-
-typedef NS_OPTIONS(uint32_t, CHIPTestClusterBitmap32MaskMap) {
-    CHIPTestClusterBitmap32MaskMapMaskVal1 = 0x1,
-    CHIPTestClusterBitmap32MaskMapMaskVal2 = 0x2,
-    CHIPTestClusterBitmap32MaskMapMaskVal3 = 0x4,
-    CHIPTestClusterBitmap32MaskMapMaskVal4 = 0x40000000,
-};
-
-typedef NS_OPTIONS(uint64_t, CHIPTestClusterBitmap64MaskMap) {
-    CHIPTestClusterBitmap64MaskMapMaskVal1 = 0x1,
-    CHIPTestClusterBitmap64MaskMapMaskVal2 = 0x2,
-    CHIPTestClusterBitmap64MaskMapMaskVal3 = 0x4,
-    CHIPTestClusterBitmap64MaskMapMaskVal4 = 0x4000000000000000,
-};
-
-typedef NS_OPTIONS(uint8_t, CHIPTestClusterBitmap8MaskMap) {
-    CHIPTestClusterBitmap8MaskMapMaskVal1 = 0x1,
-    CHIPTestClusterBitmap8MaskMapMaskVal2 = 0x2,
-    CHIPTestClusterBitmap8MaskMapMaskVal3 = 0x4,
-    CHIPTestClusterBitmap8MaskMapMaskVal4 = 0x40,
-};
-
-typedef NS_OPTIONS(uint8_t, CHIPTestClusterSimpleBitmap) {
-    CHIPTestClusterSimpleBitmapValueA = 0x1,
-    CHIPTestClusterSimpleBitmapValueB = 0x2,
-    CHIPTestClusterSimpleBitmapValueC = 0x4,
-};
-
 typedef NS_ENUM(uint8_t, CHIPMessagingEventId) {
     CHIPMessagingEventIdMeterCoverRemoved = 0x00,
     CHIPMessagingEventIdMeterCoverClosed = 0x01,
@@ -23145,6 +22707,47 @@ typedef NS_OPTIONS(uint32_t, CHIPApplianceEventsAndAlertAlertStructure) {
     CHIPApplianceEventsAndAlertAlertStructurePresenceRecovery = 0x3000,
 };
 
+typedef NS_ENUM(uint8_t, CHIPTestClusterSimple) {
+    CHIPTestClusterSimpleUnspecified = 0x00,
+    CHIPTestClusterSimpleValueA = 0x01,
+    CHIPTestClusterSimpleValueB = 0x02,
+    CHIPTestClusterSimpleValueC = 0x03,
+};
+
+typedef NS_OPTIONS(uint16_t, CHIPTestClusterBitmap16MaskMap) {
+    CHIPTestClusterBitmap16MaskMapMaskVal1 = 0x1,
+    CHIPTestClusterBitmap16MaskMapMaskVal2 = 0x2,
+    CHIPTestClusterBitmap16MaskMapMaskVal3 = 0x4,
+    CHIPTestClusterBitmap16MaskMapMaskVal4 = 0x4000,
+};
+
+typedef NS_OPTIONS(uint32_t, CHIPTestClusterBitmap32MaskMap) {
+    CHIPTestClusterBitmap32MaskMapMaskVal1 = 0x1,
+    CHIPTestClusterBitmap32MaskMapMaskVal2 = 0x2,
+    CHIPTestClusterBitmap32MaskMapMaskVal3 = 0x4,
+    CHIPTestClusterBitmap32MaskMapMaskVal4 = 0x40000000,
+};
+
+typedef NS_OPTIONS(uint64_t, CHIPTestClusterBitmap64MaskMap) {
+    CHIPTestClusterBitmap64MaskMapMaskVal1 = 0x1,
+    CHIPTestClusterBitmap64MaskMapMaskVal2 = 0x2,
+    CHIPTestClusterBitmap64MaskMapMaskVal3 = 0x4,
+    CHIPTestClusterBitmap64MaskMapMaskVal4 = 0x4000000000000000,
+};
+
+typedef NS_OPTIONS(uint8_t, CHIPTestClusterBitmap8MaskMap) {
+    CHIPTestClusterBitmap8MaskMapMaskVal1 = 0x1,
+    CHIPTestClusterBitmap8MaskMapMaskVal2 = 0x2,
+    CHIPTestClusterBitmap8MaskMapMaskVal3 = 0x4,
+    CHIPTestClusterBitmap8MaskMapMaskVal4 = 0x40,
+};
+
+typedef NS_OPTIONS(uint8_t, CHIPTestClusterSimpleBitmap) {
+    CHIPTestClusterSimpleBitmapValueA = 0x1,
+    CHIPTestClusterSimpleBitmapValueB = 0x2,
+    CHIPTestClusterSimpleBitmapValueC = 0x4,
+};
+
 NS_ASSUME_NONNULL_END
 
 #endif /* CHIP_CLUSTERS_H */
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
index 0703c595770dd1..05d6c2fd5d6352 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
@@ -203,7 +203,7 @@ new CHIPAccessControlAclListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlAclListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccessControlAclListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -319,7 +319,7 @@ new CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -382,7 +382,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -445,7 +445,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -508,7 +508,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -572,7 +572,7 @@ new CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -637,7 +637,7 @@ new CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -700,7 +700,7 @@ new CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -762,7 +762,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -823,7 +823,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -983,7 +983,7 @@ new CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1048,7 +1048,7 @@ new CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1111,7 +1111,7 @@ new CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1173,7 +1173,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1234,7 +1234,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1398,7 +1398,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1460,7 +1460,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1522,7 +1522,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1588,7 +1588,7 @@ new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubsc
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -1654,7 +1654,7 @@ new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -1717,7 +1717,7 @@ new CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1779,7 +1779,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1840,7 +1840,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1910,7 +1910,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1970,7 +1970,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2031,7 +2031,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2092,7 +2092,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2155,7 +2155,7 @@ new CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2218,7 +2218,7 @@ new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptio
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2280,7 +2280,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2343,7 +2343,7 @@ new CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2408,7 +2408,7 @@ new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBri
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2473,7 +2473,7 @@ new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2536,7 +2536,7 @@ new CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2598,7 +2598,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2659,7 +2659,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2806,7 +2806,7 @@ new CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2914,7 +2914,7 @@ new CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2979,7 +2979,7 @@ new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3044,7 +3044,7 @@ new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3107,7 +3107,7 @@ new CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3169,7 +3169,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3230,7 +3230,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3354,7 +3354,7 @@ new CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3416,7 +3416,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3480,7 +3480,7 @@ new CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3545,7 +3545,7 @@ new CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3608,7 +3608,7 @@ new CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3670,7 +3670,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3731,7 +3731,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3857,7 +3857,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3920,7 +3920,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3983,7 +3983,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4077,7 +4077,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4171,7 +4171,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4269,7 +4269,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4367,7 +4367,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4461,7 +4461,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4555,7 +4555,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4617,7 +4617,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4681,7 +4681,7 @@ new CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4746,7 +4746,7 @@ new CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4809,7 +4809,7 @@ new CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4871,7 +4871,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4932,7 +4932,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5032,7 +5032,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5093,7 +5093,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5153,7 +5153,7 @@ new CHIPVendorIdAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5213,7 +5213,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5274,7 +5274,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5366,7 +5366,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5458,7 +5458,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5519,7 +5519,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5582,7 +5582,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5644,7 +5644,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5707,7 +5707,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5769,7 +5769,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5830,7 +5830,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5890,7 +5890,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -5950,7 +5950,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6011,7 +6011,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6106,7 +6106,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6167,7 +6167,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6227,7 +6227,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6289,7 +6289,7 @@ new CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6354,7 +6354,7 @@ new CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6419,7 +6419,7 @@ new CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6482,7 +6482,7 @@ new CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6543,7 +6543,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6604,7 +6604,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6706,7 +6706,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6798,7 +6798,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6891,7 +6891,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6984,7 +6984,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7045,7 +7045,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7137,7 +7137,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7230,7 +7230,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7291,7 +7291,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7353,7 +7353,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7417,7 +7417,7 @@ new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBri
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7482,7 +7482,7 @@ new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7545,7 +7545,7 @@ new CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7607,7 +7607,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7668,7 +7668,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7809,7 +7809,7 @@ new CHIPBindingBindingListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingBindingListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBindingBindingListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7872,7 +7872,7 @@ new CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7937,7 +7937,7 @@ new CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8000,7 +8000,7 @@ new CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8062,7 +8062,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8123,7 +8123,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8193,7 +8193,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8256,7 +8256,7 @@ new CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8321,7 +8321,7 @@ new CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8384,7 +8384,7 @@ new CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8446,7 +8446,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8507,7 +8507,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8943,7 +8943,7 @@ new CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9005,7 +9005,7 @@ new CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9067,7 +9067,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9130,7 +9130,7 @@ new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9195,7 +9195,7 @@ new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9258,7 +9258,7 @@ new CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9320,7 +9320,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9381,7 +9381,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9451,7 +9451,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9511,7 +9511,7 @@ new CHIPVendorIdAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9571,7 +9571,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9664,7 +9664,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9725,7 +9725,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9788,7 +9788,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9850,7 +9850,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9913,7 +9913,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -9975,7 +9975,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10036,7 +10036,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10096,7 +10096,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10156,7 +10156,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10217,7 +10217,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10278,7 +10278,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10338,7 +10338,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10401,7 +10401,7 @@ new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10466,7 +10466,7 @@ new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10529,7 +10529,7 @@ new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10591,7 +10591,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10652,7 +10652,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10798,7 +10798,7 @@ new CHIPChannelChannelListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelChannelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPChannelChannelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10860,7 +10860,7 @@ new CHIPChannelLineupStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelLineupStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPChannelLineupStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10923,7 +10923,7 @@ new CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10988,7 +10988,7 @@ new CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11053,7 +11053,7 @@ new CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11116,7 +11116,7 @@ new CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11178,7 +11178,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11239,7 +11239,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11870,7 +11870,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11931,7 +11931,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11993,7 +11993,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12054,7 +12054,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12114,7 +12114,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12175,7 +12175,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12237,7 +12237,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12299,7 +12299,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12360,7 +12360,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12451,7 +12451,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12513,7 +12513,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12574,7 +12574,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12634,7 +12634,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12696,7 +12696,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12757,7 +12757,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12817,7 +12817,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12879,7 +12879,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -12940,7 +12940,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13000,7 +13000,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13062,7 +13062,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13123,7 +13123,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13183,7 +13183,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13245,7 +13245,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13306,7 +13306,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13366,7 +13366,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13428,7 +13428,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13489,7 +13489,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13549,7 +13549,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13611,7 +13611,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13704,7 +13704,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13797,7 +13797,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13890,7 +13890,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -13983,7 +13983,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14085,7 +14085,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14178,7 +14178,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14271,7 +14271,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14373,7 +14373,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14466,7 +14466,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14559,7 +14559,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14661,7 +14661,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14723,7 +14723,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14785,7 +14785,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14847,7 +14847,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14909,7 +14909,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -14971,7 +14971,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15034,7 +15034,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15097,7 +15097,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15159,7 +15159,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15222,7 +15222,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15285,7 +15285,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15348,7 +15348,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15446,7 +15446,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15510,7 +15510,7 @@ new CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15575,7 +15575,7 @@ new CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15638,7 +15638,7 @@ new CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15700,7 +15700,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15761,7 +15761,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16031,7 +16031,7 @@ new CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16130,7 +16130,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16194,7 +16194,7 @@ new CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16259,7 +16259,7 @@ new CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16322,7 +16322,7 @@ new CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16384,7 +16384,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16445,7 +16445,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16516,7 +16516,7 @@ new CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16578,7 +16578,7 @@ new CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16640,7 +16640,7 @@ new CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16702,7 +16702,7 @@ new CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16765,7 +16765,7 @@ new CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16830,7 +16830,7 @@ new CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16893,7 +16893,7 @@ new CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16955,7 +16955,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17016,7 +17016,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17115,7 +17115,7 @@ new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17180,7 +17180,7 @@ new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17243,7 +17243,7 @@ new CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17305,7 +17305,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17366,7 +17366,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -17508,203 +17508,6 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)getLogRecordWithParams:(CHIPDoorLockClusterGetLogRecordParams *)params
-             completionHandler:(void (^)(CHIPDoorLockClusterGetLogRecordResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetLogRecord::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.logIndex = params.logIndex.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetLogRecordResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setPINCodeWithParams:(CHIPDoorLockClusterSetPINCodeParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetPINCode::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.userId = params.userId.unsignedShortValue;
-    if (params.userStatus == nil) {
-        request.userStatus.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userStatus.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userStatus.unsignedCharValue);
-    }
-    if (params.userType == nil) {
-        request.userType.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userType.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userType.unsignedCharValue);
-    }
-    request.pin = [self asByteSpan:params.pin];
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getPINCodeWithParams:(CHIPDoorLockClusterGetPINCodeParams *)params
-           completionHandler:
-               (void (^)(CHIPDoorLockClusterGetPINCodeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetPINCode::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userId = params.userId.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetPINCodeResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetPINCodeResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearPINCodeWithParams:(CHIPDoorLockClusterClearPINCodeParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearPINCode::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.pinSlotIndex = params.pinSlotIndex.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearAllPINCodesWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self clearAllPINCodesWithParams:nil completionHandler:completionHandler];
-}
-- (void)clearAllPINCodesWithParams:(CHIPDoorLockClusterClearAllPINCodesParams * _Nullable)params
-                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearAllPINCodes::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setUserStatusWithParams:(CHIPDoorLockClusterSetUserStatusParams *)params
-              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetUserStatus::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userId = params.userId.unsignedShortValue;
-    request.userStatus = static_cast<std::remove_reference_t<decltype(request.userStatus)>>(params.userStatus.unsignedCharValue);
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getUserStatusWithParams:(CHIPDoorLockClusterGetUserStatusParams *)params
-              completionHandler:(void (^)(CHIPDoorLockClusterGetUserStatusResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetUserStatus::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userId = params.userId.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetUserStatusResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetUserStatusResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
 - (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params
                    completionHandler:(StatusCompletion)completionHandler
 {
@@ -17947,180 +17750,6 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)setUserTypeWithParams:(CHIPDoorLockClusterSetUserTypeParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetUserType::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userId = params.userId.unsignedShortValue;
-    request.userType = static_cast<std::remove_reference_t<decltype(request.userType)>>(params.userType.unsignedCharValue);
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getUserTypeWithParams:(CHIPDoorLockClusterGetUserTypeParams *)params
-            completionHandler:(void (^)(CHIPDoorLockClusterGetUserTypeResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetUserType::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userId = params.userId.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetUserTypeResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setRFIDCodeWithParams:(CHIPDoorLockClusterSetRFIDCodeParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetRFIDCode::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.userId = params.userId.unsignedShortValue;
-    if (params.userStatus == nil) {
-        request.userStatus.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userStatus.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userStatus.unsignedCharValue);
-    }
-    if (params.userType == nil) {
-        request.userType.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userType.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userType.unsignedCharValue);
-    }
-    request.rfidCode = [self asByteSpan:params.rfidCode];
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getRFIDCodeWithParams:(CHIPDoorLockClusterGetRFIDCodeParams *)params
-            completionHandler:(void (^)(CHIPDoorLockClusterGetRFIDCodeResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetRFIDCode::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userId = params.userId.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetRFIDCodeResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearRFIDCodeWithParams:(CHIPDoorLockClusterClearRFIDCodeParams *)params
-              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearRFIDCode::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.rfidSlotIndex = params.rfidSlotIndex.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearAllRFIDCodesWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self clearAllRFIDCodesWithParams:nil completionHandler:completionHandler];
-}
-- (void)clearAllRFIDCodesWithParams:(CHIPDoorLockClusterClearAllRFIDCodesParams * _Nullable)params
-                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearAllRFIDCodes::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
 - (void)setUserWithParams:(CHIPDoorLockClusterSetUserParams *)params completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
@@ -18342,76 +17971,6 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)operatingEventNotificationWithParams:(CHIPDoorLockClusterOperatingEventNotificationParams *)params
-                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::OperatingEventNotification::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.operationEventSource = params.operationEventSource.unsignedCharValue;
-    request.operationEventCode = params.operationEventCode.unsignedCharValue;
-    request.userId = params.userId.unsignedShortValue;
-    request.pin = [self asByteSpan:params.pin];
-    request.localTime = params.localTime.unsignedIntValue;
-    if (params.data != nil) {
-        auto & definedValue_0 = request.data.Emplace();
-        definedValue_0 = [self asCharSpan:params.data];
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)programmingEventNotificationWithParams:(CHIPDoorLockClusterProgrammingEventNotificationParams *)params
-                             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ProgrammingEventNotification::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.programEventSource = params.programEventSource.unsignedCharValue;
-    request.programEventCode = params.programEventCode.unsignedCharValue;
-    request.userId = params.userId.unsignedShortValue;
-    request.pin = [self asByteSpan:params.pin];
-    request.userType = static_cast<std::remove_reference_t<decltype(request.userType)>>(params.userType.unsignedCharValue);
-    request.userStatus = static_cast<std::remove_reference_t<decltype(request.userStatus)>>(params.userStatus.unsignedCharValue);
-    request.localTime = params.localTime.unsignedIntValue;
-    if (params.data != nil) {
-        auto & definedValue_0 = request.data.Emplace();
-        definedValue_0 = [self asCharSpan:params.data];
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
 - (void)readAttributeLockStateWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
@@ -18442,7 +18001,7 @@ new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18504,7 +18063,7 @@ new CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18566,7 +18125,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18628,7 +18187,7 @@ new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18722,7 +18281,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18816,7 +18375,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18909,7 +18468,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -18940,69 +18499,6 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeNumberOfLogRecordsSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfLogRecordsSupported::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeNumberOfLogRecordsSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::NumberOfLogRecordsSupported::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeNumberOfLogRecordsSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfLogRecordsSupported::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
 - (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                           NSError * _Nullable error))completionHandler
 {
@@ -19034,7 +18530,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19097,7 +18593,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19160,7 +18656,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19223,7 +18719,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19287,7 +18783,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19351,7 +18847,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19413,7 +18909,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19475,7 +18971,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19537,7 +19033,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19599,7 +19095,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19663,7 +19159,7 @@ new CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19727,7 +19223,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -19759,100 +19255,6 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeEnableLoggingWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::EnableLogging::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeEnableLoggingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEnableLoggingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEnableLoggingWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::EnableLogging::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEnableLoggingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::EnableLogging::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeEnableLoggingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::EnableLogging::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
 - (void)readAttributeLanguageWithCompletionHandler:(void (^)(
                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
@@ -19914,7 +19316,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20006,7 +19408,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20100,7 +19502,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20193,7 +19595,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20288,7 +19690,7 @@ new CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20353,7 +19755,7 @@ new CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20418,7 +19820,7 @@ new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20515,7 +19917,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20611,7 +20013,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20707,7 +20109,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20805,7 +20207,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -20904,7 +20306,7 @@ new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -21000,7 +20402,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -21028,808 +20430,31 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
             }
             return err;
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSendPINOverTheAirWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
-{
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeExpiringUserTimeoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeAlarmMaskWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockAlarmMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::AlarmMask::TypeInfo;
-            auto successFn = Callback<DoorLockAlarmMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::AlarmMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeAlarmMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPDoorLockAlarmMaskAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::AlarmMask::TypeInfo;
-            auto successFn = Callback<DoorLockAlarmMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockAlarmMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAlarmMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockAlarmMaskAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::AlarmMask::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<DoorLockAlarmMaskAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeKeypadOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::KeypadOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockKeypadOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeKeypadOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeKeypadOperationEventMaskWithValue:(NSNumber * _Nonnull) value
-                                                   params:nil
-                                        completionHandler:completionHandler];
-}
-- (void)writeAttributeKeypadOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::KeypadOperationEventMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeKeypadOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
-{
-    new CHIPDoorLockKeypadOperationEventMaskAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::KeypadOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockKeypadOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockKeypadOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeKeypadOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockKeypadOperationEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::KeypadOperationEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockKeypadOperationEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeRemoteOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::RemoteOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRemoteOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeRemoteOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRemoteOperationEventMaskWithValue:(NSNumber * _Nonnull) value
-                                                   params:nil
-                                        completionHandler:completionHandler];
-}
-- (void)writeAttributeRemoteOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::RemoteOperationEventMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeRemoteOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
-{
-    new CHIPDoorLockRemoteOperationEventMaskAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::RemoteOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRemoteOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockRemoteOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeRemoteOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockRemoteOperationEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::RemoteOperationEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockRemoteOperationEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeManualOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::ManualOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockManualOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeManualOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeManualOperationEventMaskWithValue:(NSNumber * _Nonnull) value
-                                                   params:nil
-                                        completionHandler:completionHandler];
-}
-- (void)writeAttributeManualOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::ManualOperationEventMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeManualOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
-{
-    new CHIPDoorLockManualOperationEventMaskAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DoorLock::Attributes::ManualOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockManualOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockManualOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeManualOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDoorLockManualOperationEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::ManualOperationEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockManualOperationEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeRFIDOperationEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::RFIDOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRFIDOperationEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeRFIDOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeRFIDOperationEventMaskWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
 }
-- (void)writeAttributeRFIDOperationEventMaskWithValue:(NSNumber * _Nonnull)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -21845,9 +20470,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::RFIDOperationEventMask::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -21855,81 +20480,76 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeRFIDOperationEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockRFIDOperationEventMaskAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::RFIDOperationEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRFIDOperationEventMaskAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockRFIDOperationEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRFIDOperationEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockRFIDOperationEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::RFIDOperationEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockRFIDOperationEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeKeypadProgrammingEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::KeypadProgrammingEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockKeypadProgrammingEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeKeypadProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeKeypadProgrammingEventMaskWithValue:(NSNumber * _Nonnull) value
-                                                     params:nil
-                                          completionHandler:completionHandler];
+    [self writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeKeypadProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                   params:(CHIPWriteParams * _Nullable)params
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -21945,9 +20565,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::KeypadProgrammingEventMask::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -21955,81 +20575,78 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeKeypadProgrammingEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::KeypadProgrammingEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockKeypadProgrammingEventMaskAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeKeypadProgrammingEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeSendPINOverTheAirWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockKeypadProgrammingEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::KeypadProgrammingEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockKeypadProgrammingEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeRemoteProgrammingEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::RemoteProgrammingEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRemoteProgrammingEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeRemoteProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeRemoteProgrammingEventMaskWithValue:(NSNumber * _Nonnull) value
-                                                     params:nil
-                                          completionHandler:completionHandler];
+    [self writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
 }
-- (void)writeAttributeRemoteProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                   params:(CHIPWriteParams * _Nullable)params
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -22045,9 +20662,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::RemoteProgrammingEventMask::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -22055,81 +20672,76 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeRemoteProgrammingEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::RemoteProgrammingEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRemoteProgrammingEventMaskAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRemoteProgrammingEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockRemoteProgrammingEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::RemoteProgrammingEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockRemoteProgrammingEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeRFIDProgrammingEventMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::RFIDProgrammingEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRFIDProgrammingEventMaskAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeRFIDProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeRFIDProgrammingEventMaskWithValue:(NSNumber * _Nonnull) value
-                                                   params:nil
-                                        completionHandler:completionHandler];
+    [self writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeRFIDProgrammingEventMaskWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -22145,9 +20757,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::RFIDProgrammingEventMask::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -22155,57 +20767,56 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeRFIDProgrammingEventMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::RFIDProgrammingEventMask::TypeInfo;
-            auto successFn = Callback<DoorLockRFIDProgrammingEventMaskAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRFIDProgrammingEventMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeExpiringUserTimeoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockRFIDProgrammingEventMaskAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::RFIDProgrammingEventMask::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockRFIDProgrammingEventMaskAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
@@ -22240,7 +20851,7 @@ new CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22305,7 +20916,7 @@ new CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22368,7 +20979,7 @@ new CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22430,7 +21041,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22491,7 +21102,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22619,7 +21230,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22680,7 +21291,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22740,7 +21351,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22801,7 +21412,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22862,7 +21473,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22922,7 +21533,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -22983,7 +21594,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23043,7 +21654,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23103,7 +21714,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23163,7 +21774,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23225,7 +21836,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23287,7 +21898,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23350,7 +21961,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23412,7 +22023,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23474,7 +22085,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23536,7 +22147,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23597,7 +22208,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23659,7 +22270,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23721,7 +22332,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23783,7 +22394,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23845,7 +22456,7 @@ new CHIPInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23907,7 +22518,7 @@ new CHIPInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -23969,7 +22580,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24032,7 +22643,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24095,7 +22706,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24158,7 +22769,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24221,7 +22832,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24284,7 +22895,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24347,7 +22958,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24410,7 +23021,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24473,7 +23084,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24536,7 +23147,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24599,7 +23210,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24662,7 +23273,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24725,7 +23336,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24788,7 +23399,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24850,7 +23461,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24912,7 +23523,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -24973,7 +23584,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25036,7 +23647,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25099,7 +23710,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25162,7 +23773,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25225,7 +23836,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25288,7 +23899,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25351,7 +23962,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25413,7 +24024,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25474,7 +24085,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25535,7 +24146,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25597,7 +24208,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25658,7 +24269,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25719,7 +24330,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25781,7 +24392,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25842,7 +24453,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25904,7 +24515,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -25966,7 +24577,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26028,7 +24639,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26090,7 +24701,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26151,7 +24762,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26249,7 +24860,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26347,7 +24958,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26445,7 +25056,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26543,7 +25154,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26638,7 +25249,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26734,7 +25345,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26797,7 +25408,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26859,7 +25470,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26922,7 +25533,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -26984,7 +25595,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27046,7 +25657,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27108,7 +25719,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27202,7 +25813,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27264,7 +25875,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27326,7 +25937,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27421,7 +26032,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27483,7 +26094,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27545,7 +26156,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27608,7 +26219,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27671,7 +26282,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27734,7 +26345,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27797,7 +26408,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27860,7 +26471,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27923,7 +26534,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -27985,7 +26596,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28047,7 +26658,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28109,7 +26720,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28172,7 +26783,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28235,7 +26846,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28297,7 +26908,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28360,7 +26971,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28423,7 +27034,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28485,7 +27096,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28548,7 +27159,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28611,7 +27222,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28673,7 +27284,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28736,7 +27347,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28799,7 +27410,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28862,7 +27473,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28925,7 +27536,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -28987,7 +27598,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29050,7 +27661,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29114,7 +27725,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29177,7 +27788,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29240,7 +27851,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29303,7 +27914,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29366,7 +27977,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29429,7 +28040,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29491,7 +28102,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29554,7 +28165,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29617,7 +28228,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29679,7 +28290,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29742,7 +28353,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29805,7 +28416,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29867,7 +28478,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29930,7 +28541,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29993,7 +28604,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30055,7 +28666,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30118,7 +28729,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30181,7 +28792,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30244,7 +28855,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30307,7 +28918,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30369,7 +28980,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30432,7 +29043,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30496,7 +29107,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30559,7 +29170,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30622,7 +29233,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30685,7 +29296,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30748,7 +29359,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30811,7 +29422,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30876,7 +29487,7 @@ new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -30940,7 +29551,7 @@ new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptio
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31003,7 +29614,7 @@ new CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31065,7 +29676,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31126,7 +29737,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31229,7 +29840,7 @@ new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSub
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -31291,7 +29902,7 @@ new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31352,7 +29963,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31414,7 +30025,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31475,7 +30086,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31536,7 +30147,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31597,7 +30208,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31660,7 +30271,7 @@ new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31722,7 +30333,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31788,7 +30399,7 @@ new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubsc
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -31854,7 +30465,7 @@ new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -31917,7 +30528,7 @@ new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31979,7 +30590,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32040,7 +30651,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32142,7 +30753,7 @@ new CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32237,7 +30848,7 @@ new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32338,7 +30949,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32400,7 +31011,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32461,7 +31072,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32559,7 +31170,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32620,7 +31231,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32681,7 +31292,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32774,7 +31385,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32835,7 +31446,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32928,7 +31539,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32992,7 +31603,7 @@ new CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33057,7 +31668,7 @@ new CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33120,7 +31731,7 @@ new CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33182,7 +31793,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33243,7 +31854,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33314,7 +31925,7 @@ new CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33377,7 +31988,7 @@ new CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33442,7 +32053,7 @@ new CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33505,7 +32116,7 @@ new CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33567,7 +32178,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33628,7 +32239,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33700,7 +32311,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33763,7 +32374,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33826,7 +32437,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33887,7 +32498,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -33950,7 +32561,7 @@ new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34015,7 +32626,7 @@ new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34078,7 +32689,7 @@ new CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34140,7 +32751,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34201,7 +32812,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34384,7 +32995,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34449,7 +33060,7 @@ new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -34515,7 +33126,7 @@ new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -34580,7 +33191,7 @@ new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -34644,7 +33255,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34708,7 +33319,7 @@ new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptio
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34773,7 +33384,7 @@ new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34836,7 +33447,7 @@ new CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34898,7 +33509,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -34959,7 +33570,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35000,6 +33611,33 @@ @implementation CHIPGeneralDiagnostics
     return &_cppCluster;
 }
 
+- (void)testEventTriggerWithParams:(CHIPGeneralDiagnosticsClusterTestEventTriggerParams *)params
+                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    GeneralDiagnostics::Commands::TestEventTrigger::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.enableKey = [self asByteSpan:params.enableKey];
+    request.eventTrigger = params.eventTrigger.unsignedLongLongValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
 - (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler
 {
@@ -35031,7 +33669,7 @@ new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35093,7 +33731,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35153,7 +33791,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35215,7 +33853,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35276,7 +33914,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35340,7 +33978,7 @@ new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35404,7 +34042,7 @@ new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35469,7 +34107,7 @@ new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35502,6 +34140,69 @@ new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(
         });
 }
 
+- (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
+{
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
@@ -35534,7 +34235,7 @@ new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35599,7 +34300,7 @@ new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35662,7 +34363,7 @@ new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35724,7 +34425,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35785,7 +34486,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36071,7 +34772,7 @@ new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36134,7 +34835,7 @@ new CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36196,7 +34897,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36259,7 +34960,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36323,7 +35024,7 @@ new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36388,7 +35089,7 @@ new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36451,7 +35152,7 @@ new CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36513,7 +35214,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36574,7 +35275,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36814,7 +35515,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36878,7 +35579,7 @@ new CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -36943,7 +35644,7 @@ new CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37006,7 +35707,7 @@ new CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37067,7 +35768,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37128,7 +35829,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37284,7 +35985,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37345,7 +36046,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37409,7 +36110,7 @@ new CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37474,7 +36175,7 @@ new CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37537,7 +36238,7 @@ new CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37599,7 +36300,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37660,7 +36361,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37732,7 +36433,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37795,7 +36496,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37858,7 +36559,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37919,7 +36620,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -37981,7 +36682,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38046,7 +36747,7 @@ new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscript
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -38111,7 +36812,7 @@ new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -38173,7 +36874,7 @@ new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38235,7 +36936,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38296,7 +36997,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38392,7 +37093,7 @@ new CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38457,7 +37158,7 @@ new CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38520,7 +37221,7 @@ new CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38582,7 +37283,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38643,7 +37344,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38907,6 +37608,32 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
+- (void)moveToClosestFrequencyWithParams:(CHIPLevelControlClusterMoveToClosestFrequencyParams *)params
+                       completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::MoveToClosestFrequency::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.frequency = params.frequency.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
 - (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
@@ -38936,7 +37663,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38998,7 +37725,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39059,7 +37786,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39119,7 +37846,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39180,7 +37907,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39241,7 +37968,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39302,7 +38029,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39394,7 +38121,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39488,7 +38215,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39586,7 +38313,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39685,7 +38412,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39785,7 +38512,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39885,7 +38612,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -39986,7 +38713,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40050,7 +38777,7 @@ new CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40115,7 +38842,7 @@ new CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40178,7 +38905,7 @@ new CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40240,7 +38967,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40301,7 +39028,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40403,7 +39130,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40467,7 +39194,7 @@ new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -40532,7 +39259,7 @@ new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -40598,7 +39325,7 @@ new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -40661,7 +39388,7 @@ new CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40723,7 +39450,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40784,7 +39511,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40885,7 +39612,7 @@ new CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -40950,7 +39677,7 @@ new CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41013,7 +39740,7 @@ new CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41075,7 +39802,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41136,7 +39863,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41316,7 +40043,7 @@ new CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41376,7 +40103,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41440,7 +40167,7 @@ new CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41505,7 +40232,7 @@ new CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41568,7 +40295,7 @@ new CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41630,7 +40357,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41691,7 +40418,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42047,7 +40774,7 @@ new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42110,7 +40837,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42171,7 +40898,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42233,7 +40960,7 @@ new CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42296,7 +41023,7 @@ new CHIPFloatAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42358,7 +41085,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42421,7 +41148,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42485,7 +41212,7 @@ new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42550,7 +41277,7 @@ new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42613,7 +41340,7 @@ new CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42675,7 +41402,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42736,7 +41463,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42832,7 +41559,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42895,7 +41622,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -42958,7 +41685,7 @@ new CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43020,7 +41747,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43119,7 +41846,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43217,7 +41944,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43280,7 +42007,7 @@ new CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43345,7 +42072,7 @@ new CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43408,7 +42135,7 @@ new CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43470,7 +42197,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43531,7 +42258,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43775,7 +42502,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43836,7 +42563,7 @@ new CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43898,7 +42625,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -43961,7 +42688,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44055,7 +42782,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44123,7 +42850,7 @@ new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCa
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -44187,7 +42914,7 @@ new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44251,7 +42978,7 @@ new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44315,7 +43042,7 @@ new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptio
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44380,7 +43107,7 @@ new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44443,7 +43170,7 @@ new CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44505,7 +43232,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44566,7 +43293,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44755,7 +43482,7 @@ new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -44821,7 +43548,7 @@ new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -44884,7 +43611,7 @@ new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -44946,7 +43673,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45007,7 +43734,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45171,7 +43898,7 @@ new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -45234,7 +43961,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45300,7 +44027,7 @@ new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubs
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -45365,7 +44092,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45431,7 +44158,7 @@ new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubsc
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -45497,7 +44224,7 @@ new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -45560,7 +44287,7 @@ new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45622,7 +44349,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45683,7 +44410,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45753,7 +44480,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45815,7 +44542,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45878,7 +44605,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45976,7 +44703,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46074,7 +44801,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46172,7 +44899,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46270,7 +44997,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46368,7 +45095,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46466,7 +45193,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46565,7 +45292,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46664,7 +45391,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46763,7 +45490,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46828,7 +45555,7 @@ new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBri
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46893,7 +45620,7 @@ new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -46956,7 +45683,7 @@ new CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47018,7 +45745,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47079,7 +45806,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47317,7 +46044,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47378,7 +46105,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47470,7 +46197,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47562,7 +46289,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47661,7 +46388,7 @@ new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47726,7 +46453,7 @@ new CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47791,7 +46518,7 @@ new CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47854,7 +46581,7 @@ new CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47915,7 +46642,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47976,7 +46703,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48046,7 +46773,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48139,7 +46866,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48204,7 +46931,7 @@ new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -48270,7 +46997,7 @@ new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscrip
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -48333,7 +47060,7 @@ new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48395,7 +47122,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48456,7 +47183,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48558,6 +47285,10 @@ - (void)CSRRequestWithParams:(CHIPOperationalCredentialsClusterCSRRequestParams
         }
     }
     request.CSRNonce = [self asByteSpan:params.csrNonce];
+    if (params.isForUpdateNOC != nil) {
+        auto & definedValue_0 = request.isForUpdateNOC.Emplace();
+        definedValue_0 = params.isForUpdateNOC.boolValue;
+    }
 
     new CHIPOperationalCredentialsClusterCSRResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
@@ -48586,7 +47317,7 @@ - (void)addNOCWithParams:(CHIPOperationalCredentialsClusterAddNOCParams *)params
         definedValue_0 = [self asByteSpan:params.icacValue];
     }
     request.IPKValue = [self asByteSpan:params.ipkValue];
-    request.caseAdminNode = params.caseAdminNode.unsignedLongLongValue;
+    request.caseAdminSubject = params.caseAdminSubject.unsignedLongLongValue;
     request.adminVendorId
         = static_cast<std::remove_reference_t<decltype(request.adminVendorId)>>(params.adminVendorId.unsignedShortValue);
 
@@ -48698,32 +47429,6 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)removeTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterRemoveTrustedRootCertificateParams *)params
-                             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::RemoveTrustedRootCertificate::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.trustedRootIdentifier = [self asByteSpan:params.trustedRootIdentifier];
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
 - (void)readAttributeNOCsWithParams:(CHIPReadParams * _Nullable)params
                   completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
@@ -48755,7 +47460,7 @@ new CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48818,7 +47523,7 @@ new CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48880,7 +47585,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -48943,7 +47648,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49008,7 +47713,7 @@ new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -49071,7 +47776,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49136,7 +47841,7 @@ new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscript
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -49201,7 +47906,7 @@ new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -49263,7 +47968,7 @@ new CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49325,7 +48030,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49386,7 +48091,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49455,7 +48160,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49514,7 +48219,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49574,7 +48279,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49637,7 +48342,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49700,7 +48405,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49762,7 +48467,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49825,7 +48530,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49888,7 +48593,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -49951,7 +48656,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50012,7 +48717,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50075,7 +48780,7 @@ new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50138,7 +48843,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50201,7 +48906,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50264,7 +48969,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50326,7 +49031,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50389,7 +49094,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50452,7 +49157,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50514,7 +49219,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50578,7 +49283,7 @@ new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50642,7 +49347,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50705,7 +49410,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50768,7 +49473,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50831,7 +49536,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50894,7 +49599,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -50956,7 +49661,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51018,7 +49723,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51080,7 +49785,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51143,7 +49848,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51206,7 +49911,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51269,7 +49974,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51333,7 +50038,7 @@ new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBri
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51398,7 +50103,7 @@ new CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51463,7 +50168,7 @@ new CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51526,7 +50231,7 @@ new CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51588,7 +50293,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51649,7 +50354,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51719,7 +50424,7 @@ new CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51784,7 +50489,7 @@ new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -51850,7 +50555,7 @@ new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscrip
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -51913,7 +50618,7 @@ new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -51975,7 +50680,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52036,7 +50741,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52108,7 +50813,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52171,7 +50876,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52234,7 +50939,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52295,7 +51000,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52356,7 +51061,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52419,7 +51124,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52482,7 +51187,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52544,7 +51249,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52604,7 +51309,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52667,7 +51372,7 @@ new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52732,7 +51437,7 @@ new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52795,7 +51500,7 @@ new CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52857,7 +51562,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52918,7 +51623,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -52989,7 +51694,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53051,7 +51756,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53111,7 +51816,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53173,7 +51878,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53236,7 +51941,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53299,7 +52004,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53362,7 +52067,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53425,7 +52130,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53488,7 +52193,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53550,7 +52255,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53612,7 +52317,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53674,7 +52379,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53736,7 +52441,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53798,7 +52503,7 @@ new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53866,7 +52571,7 @@ new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubs
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -53932,7 +52637,7 @@ new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -53995,7 +52700,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54055,7 +52760,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54156,7 +52861,7 @@ new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54217,7 +52922,7 @@ new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54320,7 +53025,7 @@ new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54419,7 +53124,7 @@ new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubs
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -54515,7 +53220,7 @@ new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -54584,7 +53289,7 @@ new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubs
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -54651,7 +53356,7 @@ new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubsc
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -54714,7 +53419,7 @@ new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptio
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54776,7 +53481,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54837,7 +53542,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54909,7 +53614,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -54972,7 +53677,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55035,7 +53740,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55096,7 +53801,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55163,7 +53868,7 @@ new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubs
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -55230,7 +53935,7 @@ new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubsc
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -55293,7 +53998,7 @@ new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptio
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55355,7 +54060,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55416,7 +54121,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55884,7 +54589,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55944,7 +54649,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56005,7 +54710,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56066,7 +54771,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56126,7 +54831,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56189,7 +54894,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56253,7 +54958,7 @@ new CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56318,7 +55023,7 @@ new CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56381,7 +55086,7 @@ new CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56442,7 +55147,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56503,7 +55208,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56603,7 +55308,7 @@ new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56666,7 +55371,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56728,7 +55433,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56791,7 +55496,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56855,7 +55560,7 @@ new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscription
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56920,7 +55625,7 @@ new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -56983,7 +55688,7 @@ new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57045,7 +55750,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57106,7 +55811,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57177,7 +55882,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57239,7 +55944,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57301,7 +56006,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57365,7 +56070,7 @@ new CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57430,7 +56135,7 @@ new CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57493,7 +56198,7 @@ new CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57554,7 +56259,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57615,7 +56320,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57713,7 +56418,7 @@ new CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57775,7 +56480,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57839,7 +56544,7 @@ new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57904,7 +56609,7 @@ new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57967,7 +56672,7 @@ new CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58029,7 +56734,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58090,7 +56795,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58162,7 +56867,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58225,7 +56930,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58288,7 +56993,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58349,7 +57054,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58413,7 +57118,7 @@ new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscript
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -58478,7 +57183,7 @@ new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -58540,7 +57245,7 @@ new CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58602,7 +57307,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -58663,7 +57368,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60035,7 +58740,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60127,7 +58832,7 @@ new CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60220,7 +58925,7 @@ new CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60313,7 +59018,7 @@ new CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60406,7 +59111,7 @@ new CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60497,7 +59202,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60588,7 +59293,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60679,7 +59384,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60770,7 +59475,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60861,7 +59566,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -60952,7 +59657,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61043,7 +59748,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61134,7 +59839,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61225,7 +59930,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61316,7 +60021,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61407,7 +60112,7 @@ new CHIPInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61498,7 +60203,7 @@ new CHIPInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61589,7 +60294,7 @@ new CHIPInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61680,7 +60385,7 @@ new CHIPInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61771,7 +60476,7 @@ new CHIPInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61862,7 +60567,7 @@ new CHIPInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -61953,7 +60658,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62044,7 +60749,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62136,7 +60841,7 @@ new CHIPFloatAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62229,7 +60934,7 @@ new CHIPDoubleAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62323,7 +61028,7 @@ new CHIPOctetStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62437,7 +61142,7 @@ new CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62553,7 +61258,7 @@ new CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62637,8 +61342,8 @@ new CHIPDefaultSuccessCallbackBridge(
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
                         auto element_0 = (CHIPTestClusterClusterTestListStructOctet *) value[i_0];
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].operationalCert = [self asByteSpan:element_0.operationalCert];
+                        listHolder_0->mList[i_0].member1 = element_0.member1.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].member2 = [self asByteSpan:element_0.member2];
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -62672,7 +61377,7 @@ new CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62768,7 +61473,7 @@ new CHIPOctetStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62861,7 +61566,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -62954,7 +61659,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63046,7 +61751,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63137,7 +61842,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63229,7 +61934,7 @@ new CHIPVendorIdAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63521,7 +62226,7 @@ new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscript
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -63615,7 +62320,7 @@ new CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63720,7 +62425,7 @@ new CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63816,7 +62521,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -63911,7 +62616,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64007,7 +62712,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64103,7 +62808,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64220,7 +62925,7 @@ new CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64394,7 +63099,7 @@ new CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64489,7 +63194,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64584,7 +63289,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64679,7 +63384,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64772,7 +63477,7 @@ new CHIPBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64872,7 +63577,7 @@ new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -64972,7 +63677,7 @@ new CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65073,7 +63778,7 @@ new CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65174,7 +63879,7 @@ new CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65275,7 +63980,7 @@ new CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65376,7 +64081,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65476,7 +64181,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65576,7 +64281,7 @@ new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65676,7 +64381,7 @@ new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65776,7 +64481,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65876,7 +64581,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -65976,7 +64681,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66076,7 +64781,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66176,7 +64881,7 @@ new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66276,7 +64981,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66376,7 +65081,7 @@ new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66476,7 +65181,7 @@ new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66576,7 +65281,7 @@ new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66676,7 +65381,7 @@ new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66776,7 +65481,7 @@ new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66876,7 +65581,7 @@ new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -66976,7 +65681,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67076,7 +65781,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67177,7 +65882,7 @@ new CHIPNullableFloatAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67278,7 +65983,7 @@ new CHIPNullableDoubleAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67379,7 +66084,7 @@ new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67479,7 +66184,7 @@ new CHIPNullableCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67579,7 +66284,7 @@ new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67690,7 +66395,7 @@ new CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67795,7 +66500,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -67899,7 +66604,7 @@ new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68003,7 +66708,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68107,7 +66812,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68171,7 +66876,7 @@ new CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68236,7 +66941,7 @@ new CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68299,7 +67004,7 @@ new CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68361,7 +67066,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68422,7 +67127,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68609,33 +67314,6 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)getRelayStatusLogWithCompletionHandler:(void (^)(CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable data,
-                                                   NSError * _Nullable error))completionHandler
-{
-    [self getRelayStatusLogWithParams:nil completionHandler:completionHandler];
-}
-- (void)getRelayStatusLogWithParams:(CHIPThermostatClusterGetRelayStatusLogParams * _Nullable)params
-                  completionHandler:(void (^)(CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Thermostat::Commands::GetRelayStatusLog::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPThermostatClusterGetRelayStatusLogResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
 - (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler
 {
@@ -68667,7 +67345,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68730,7 +67408,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68791,7 +67469,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68853,7 +67531,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68916,7 +67594,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -68979,7 +67657,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69042,7 +67720,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69104,7 +67782,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69166,7 +67844,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69264,7 +67942,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69362,7 +68040,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69460,7 +68138,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69558,7 +68236,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69656,7 +68334,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69754,7 +68432,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69849,7 +68527,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -69944,7 +68622,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70039,7 +68717,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70134,7 +68812,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70229,7 +68907,7 @@ new CHIPInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70323,7 +69001,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70422,7 +69100,7 @@ new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70516,7 +69194,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70547,66 +69225,6 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAlarmMaskWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::AlarmMask::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeAlarmMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Thermostat::Attributes::AlarmMask::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAlarmMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::AlarmMask::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
 - (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))completionHandler
 {
@@ -70638,7 +69256,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70699,7 +69317,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70762,7 +69380,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70825,7 +69443,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -70923,7 +69541,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71027,7 +69645,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71125,7 +69743,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71188,7 +69806,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71251,7 +69869,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71315,7 +69933,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71378,7 +69996,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71478,7 +70096,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71541,7 +70159,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71604,7 +70222,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71704,7 +70322,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71768,7 +70386,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71832,7 +70450,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -71926,7 +70544,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72018,7 +70636,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72110,7 +70728,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72203,7 +70821,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72297,7 +70915,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72390,7 +71008,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72484,7 +71102,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72547,7 +71165,7 @@ new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72641,7 +71259,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72705,7 +71323,7 @@ new CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72770,7 +71388,7 @@ new CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72833,7 +71451,7 @@ new CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72895,7 +71513,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -72956,7 +71574,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73061,7 +71679,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73155,7 +71773,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73253,7 +71871,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73321,7 +71939,7 @@ new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCal
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -73391,7 +72009,7 @@ new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCall
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -73459,7 +72077,7 @@ new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSu
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -73521,7 +72139,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73582,7 +72200,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73681,7 +72299,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73715,10 +72333,10 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
 - (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -73730,7 +72348,7 @@ - (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInt
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -73738,12 +72356,13 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -73755,23 +72374,25 @@ + (void)readAttributeRoutingRoleWithAttributeCache:(CHIPAttributeCacheContainer
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
 - (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
@@ -73804,7 +72425,7 @@ new CHIPNullableCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73865,7 +72486,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73927,7 +72548,7 @@ new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -73990,7 +72611,7 @@ new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74051,7 +72672,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74115,7 +72736,7 @@ new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -74178,7 +72799,7 @@ new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionB
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74214,12 +72835,13 @@ new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(
 - (void)readAttributePartitionIdWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -74228,7 +72850,7 @@ - (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInt
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -74236,11 +72858,11 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74253,7 +72875,7 @@ + (void)readAttributePartitionIdWithAttributeCache:(CHIPAttributeCacheContainer
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
@@ -74262,7 +72884,7 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74275,12 +72897,13 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeWeightingWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -74289,7 +72912,7 @@ - (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInter
                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -74297,11 +72920,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74313,7 +72936,7 @@ + (void)readAttributeWeightingWithAttributeCache:(CHIPAttributeCacheContainer *)
                                            queue:(dispatch_queue_t)queue
                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
@@ -74322,7 +72945,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74335,12 +72958,13 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeDataVersionWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -74349,7 +72973,7 @@ - (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInt
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -74357,11 +72981,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74374,7 +72998,7 @@ + (void)readAttributeDataVersionWithAttributeCache:(CHIPAttributeCacheContainer
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
@@ -74383,7 +73007,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74396,12 +73020,13 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeStableDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -74411,7 +73036,7 @@ - (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -74419,11 +73044,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74436,7 +73061,7 @@ + (void)readAttributeStableDataVersionWithAttributeCache:(CHIPAttributeCacheCont
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
@@ -74445,7 +73070,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74458,12 +73083,13 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeLeaderRouterIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -74473,7 +73099,7 @@ - (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)min
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -74481,11 +73107,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74498,7 +73124,7 @@ + (void)readAttributeLeaderRouterIdWithAttributeCache:(CHIPAttributeCacheContain
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
@@ -74507,7 +73133,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74547,7 +73173,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74609,7 +73235,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74671,7 +73297,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74733,7 +73359,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74795,7 +73421,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74858,7 +73484,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74921,7 +73547,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -74983,7 +73609,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75044,7 +73670,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75106,7 +73732,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75168,7 +73794,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75231,7 +73857,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75292,7 +73918,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75355,7 +73981,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75416,7 +74042,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75478,7 +74104,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75540,7 +74166,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75603,7 +74229,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75664,7 +74290,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75725,7 +74351,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75788,7 +74414,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75851,7 +74477,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75913,7 +74539,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -75975,7 +74601,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76038,7 +74664,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76099,7 +74725,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76161,7 +74787,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76223,7 +74849,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76284,7 +74910,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76346,7 +74972,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76408,7 +75034,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76471,7 +75097,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76532,7 +75158,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76595,7 +75221,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76658,7 +75284,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76720,7 +75346,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76782,7 +75408,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76845,7 +75471,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76908,7 +75534,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -76970,7 +75596,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77032,7 +75658,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77094,7 +75720,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77129,12 +75755,13 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeActiveTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -77144,7 +75771,7 @@ - (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)mi
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -77152,11 +75779,11 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77169,7 +75796,7 @@ + (void)readAttributeActiveTimestampWithAttributeCache:(CHIPAttributeCacheContai
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
@@ -77178,7 +75805,7 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77191,12 +75818,13 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributePendingTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -77206,7 +75834,7 @@ - (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)m
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -77214,11 +75842,11 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77231,7 +75859,7 @@ + (void)readAttributePendingTimestampWithAttributeCache:(CHIPAttributeCacheConta
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
@@ -77240,7 +75868,7 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77252,12 +75880,13 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 - (void)readAttributeDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -77266,7 +75895,7 @@ - (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -77274,11 +75903,11 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77290,7 +75919,7 @@ + (void)readAttributeDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attr
                                        queue:(dispatch_queue_t)queue
                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
@@ -77299,7 +75928,7 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77309,13 +75938,13 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeSecurityPolicyWithCompletionHandler:(void (^)(
-                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSecurityPolicyWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(
+    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -77326,9 +75955,10 @@ - (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)min
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                              (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                  NSError * _Nullable error))reportHandler
 {
-    new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -77336,11 +75966,11 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionB
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77350,10 +75980,10 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackSubscriptionB
 + (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                    completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(
+    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
@@ -77363,7 +75993,7 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -77376,10 +76006,10 @@ new CHIPThreadNetworkDiagnosticsSecurityPolicyListAttributeCallbackBridge(
 - (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
                                                           NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOctetStringAttributeCallbackBridge(
+    new CHIPNullableOctetStringAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -77391,7 +76021,7 @@ - (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInt
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -77399,11 +76029,11 @@ new CHIPOctetStringAttributeCallbackSubscriptionBridge(
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77415,7 +76045,7 @@ + (void)readAttributeChannelMaskWithAttributeCache:(CHIPAttributeCacheContainer
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
@@ -77424,7 +76054,7 @@ new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelabl
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77434,28 +76064,32 @@ new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelabl
     });
 }
 
-- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
+- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+        NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge(
+    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
             auto successFn
-                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>::FromCancelable(success);
+                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)
+    subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:
+                                                        (void (^)(
+                                                            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler
 {
-    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -77464,25 +76098,28 @@ new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbac
             }
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
             auto successFn
-                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>::FromCancelable(success);
+                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackSubscriptionBridge::
+                CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSArray * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)
+    readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(
+                                                      CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbackBridge(
+    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
@@ -77493,7 +76130,8 @@ new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallbac
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
                 auto successFn
-                    = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>::FromCancelable(success);
+                    = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(
+                        success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -77539,7 +76177,7 @@ new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubs
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -77605,7 +76243,7 @@ new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -77671,7 +76309,7 @@ new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscrip
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -77734,7 +76372,7 @@ new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77796,7 +76434,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77857,7 +76495,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -77960,7 +76598,7 @@ new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78055,7 +76693,7 @@ new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBr
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78121,7 +76759,7 @@ new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscri
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -78187,7 +76825,7 @@ new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscript
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -78252,7 +76890,7 @@ new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -78314,7 +76952,7 @@ new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78376,7 +77014,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78437,7 +77075,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78541,7 +77179,7 @@ new CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78606,7 +77244,7 @@ new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBri
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78671,7 +77309,7 @@ new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78734,7 +77372,7 @@ new CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78796,7 +77434,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78857,7 +77495,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -78982,7 +77620,7 @@ new CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79045,7 +77683,7 @@ new CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79110,7 +77748,7 @@ new CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79173,7 +77811,7 @@ new CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79235,7 +77873,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79296,7 +77934,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79366,7 +78004,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79429,7 +78067,7 @@ new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79494,7 +78132,7 @@ new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79557,7 +78195,7 @@ new CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79619,7 +78257,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79680,7 +78318,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79779,7 +78417,7 @@ new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -79841,7 +78479,7 @@ new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackSubscr
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -79908,7 +78546,7 @@ new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSub
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSubscriptionBridge::
                     OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -79972,7 +78610,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80033,7 +78671,7 @@ new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80094,7 +78732,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80156,7 +78794,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80219,7 +78857,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80282,7 +78920,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80345,7 +78983,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80408,7 +79046,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80470,7 +79108,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80531,7 +79169,7 @@ new CHIPInt64uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80596,7 +79234,7 @@ new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscript
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -80661,7 +79299,7 @@ new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscripti
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
                 CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -80723,7 +79361,7 @@ new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBrid
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80785,7 +79423,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -80846,7 +79484,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81107,7 +79745,7 @@ new CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81170,7 +79808,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81233,7 +79871,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81297,7 +79935,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81361,7 +79999,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81424,7 +80062,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81487,7 +80125,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81549,7 +80187,7 @@ new CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81614,7 +80252,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81678,7 +80316,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81740,7 +80378,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81804,7 +80442,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81868,7 +80506,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81931,7 +80569,7 @@ new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81996,7 +80634,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82060,7 +80698,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82123,7 +80761,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82186,7 +80824,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82249,7 +80887,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82312,7 +80950,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82405,7 +81043,7 @@ new CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82465,7 +81103,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82529,7 +81167,7 @@ new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridg
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82594,7 +81232,7 @@ new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82657,7 +81295,7 @@ new CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82719,7 +81357,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -82780,7 +81418,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h
index b3d1b264a9653e..88762e95395254 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h
@@ -1092,6 +1092,27 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
+- (instancetype)init;
+@end
+@interface CHIPLevelControlClusterMoveToClosestFrequencyParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull frequency;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+
 - (instancetype)init;
 @end
 @interface CHIPAlarmsClusterResetAlarmParams : NSObject
@@ -2876,6 +2897,29 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
+- (instancetype)init;
+@end
+@interface CHIPGeneralDiagnosticsClusterTestEventTriggerParams : NSObject
+
+@property (strong, nonatomic) NSData * _Nonnull enableKey;
+
+@property (strong, nonatomic) NSNumber * _Nonnull eventTrigger;
+/**
+ * Controls whether the command is a timed command (using Timed Invoke).
+ *
+ * If nil (the default value), a regular invoke is done for commands that do
+ * not require a timed invoke and a timed invoke with some default timed request
+ * timeout is done for commands that require a timed invoke.
+ *
+ * If not nil, a timed invoke is done, with the provided value used as the timed
+ * request timeout.  The value should be chosen small enough to provide the
+ * desired security properties but large enough that it will allow a round-trip
+ * from the sever to the client (for the status response and actual invoke
+ * request) within the timeout window.
+ *
+ */
+@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+
 - (instancetype)init;
 @end
 @interface CHIPSoftwareDiagnosticsClusterResetWatermarksParams : NSObject
@@ -3112,6 +3156,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CHIPOperationalCredentialsClusterCSRRequestParams : NSObject
 
 @property (strong, nonatomic) NSData * _Nonnull csrNonce;
+
+@property (strong, nonatomic) NSNumber * _Nullable isForUpdateNOC;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3161,7 +3207,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (strong, nonatomic) NSData * _Nonnull ipkValue;
 
-@property (strong, nonatomic) NSNumber * _Nonnull caseAdminNode;
+@property (strong, nonatomic) NSNumber * _Nonnull caseAdminSubject;
 
 @property (strong, nonatomic) NSNumber * _Nonnull adminVendorId;
 /**
@@ -3291,27 +3337,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
-- (instancetype)init;
-@end
-@interface CHIPOperationalCredentialsClusterRemoveTrustedRootCertificateParams : NSObject
-
-@property (strong, nonatomic) NSData * _Nonnull trustedRootIdentifier;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
 - (instancetype)init;
 @end
 @interface CHIPGroupKeyManagementClusterKeySetWriteParams : NSObject
@@ -3526,9 +3551,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetLogRecordParams : NSObject
+@interface CHIPDoorLockClusterSetWeekDayScheduleParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
+
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull logIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull daysMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull startHour;
+
+@property (strong, nonatomic) NSNumber * _Nonnull startMinute;
+
+@property (strong, nonatomic) NSNumber * _Nonnull endHour;
+
+@property (strong, nonatomic) NSNumber * _Nonnull endMinute;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3547,21 +3584,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetLogRecordResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull logEntryId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull timestamp;
-
-@property (strong, nonatomic) NSNumber * _Nonnull eventType;
-
-@property (strong, nonatomic) NSNumber * _Nonnull source;
-
-@property (strong, nonatomic) NSNumber * _Nonnull eventIdOrAlarmCode;
+@interface CHIPDoorLockClusterGetWeekDayScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
 
-@property (strong, nonatomic) NSData * _Nonnull pin;
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3580,15 +3607,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetPINCodeParams : NSObject
+@interface CHIPDoorLockClusterGetWeekDayScheduleResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
 
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 
-@property (strong, nonatomic) NSNumber * _Nullable userType;
+@property (strong, nonatomic) NSNumber * _Nonnull status;
+
+@property (strong, nonatomic) NSNumber * _Nullable daysMask;
+
+@property (strong, nonatomic) NSNumber * _Nullable startHour;
+
+@property (strong, nonatomic) NSNumber * _Nullable startMinute;
+
+@property (strong, nonatomic) NSNumber * _Nullable endHour;
 
-@property (strong, nonatomic) NSData * _Nonnull pin;
+@property (strong, nonatomic) NSNumber * _Nullable endMinute;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3607,9 +3642,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetPINCodeParams : NSObject
+@interface CHIPDoorLockClusterClearWeekDayScheduleParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3628,15 +3665,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetPINCodeResponseParams : NSObject
+@interface CHIPDoorLockClusterSetYearDayScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
 
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 
-@property (strong, nonatomic) NSNumber * _Nullable userType;
+@property (strong, nonatomic) NSNumber * _Nonnull localStartTime;
 
-@property (strong, nonatomic) NSData * _Nullable pin;
+@property (strong, nonatomic) NSNumber * _Nonnull localEndTime;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3655,9 +3692,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearPINCodeParams : NSObject
+@interface CHIPDoorLockClusterGetYearDayScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull pinSlotIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
+
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3676,7 +3715,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearAllPINCodesParams : NSObject
+@interface CHIPDoorLockClusterGetYearDayScheduleResponseParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
+
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+
+@property (strong, nonatomic) NSNumber * _Nonnull status;
+
+@property (strong, nonatomic) NSNumber * _Nullable localStartTime;
+
+@property (strong, nonatomic) NSNumber * _Nullable localEndTime;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3695,11 +3744,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetUserStatusParams : NSObject
+@interface CHIPDoorLockClusterClearYearDayScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3718,9 +3767,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetUserStatusParams : NSObject
+@interface CHIPDoorLockClusterSetHolidayScheduleParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull localStartTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull localEndTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull operatingMode;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3739,11 +3794,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetUserStatusResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@interface CHIPDoorLockClusterGetHolidayScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3762,21 +3815,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetWeekDayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
-
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+@interface CHIPDoorLockClusterGetHolidayScheduleResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull daysMask;
+@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull startHour;
+@property (strong, nonatomic) NSNumber * _Nonnull status;
 
-@property (strong, nonatomic) NSNumber * _Nonnull startMinute;
+@property (strong, nonatomic) NSNumber * _Nullable localStartTime;
 
-@property (strong, nonatomic) NSNumber * _Nonnull endHour;
+@property (strong, nonatomic) NSNumber * _Nullable localEndTime;
 
-@property (strong, nonatomic) NSNumber * _Nonnull endMinute;
+@property (strong, nonatomic) NSNumber * _Nullable operatingMode;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3795,11 +3844,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetWeekDayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
+@interface CHIPDoorLockClusterClearHolidayScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3818,23 +3865,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetWeekDayScheduleResponseParams : NSObject
+@interface CHIPDoorLockClusterSetUserParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull operationType;
 
 @property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull status;
-
-@property (strong, nonatomic) NSNumber * _Nullable daysMask;
+@property (strong, nonatomic) NSString * _Nullable userName;
 
-@property (strong, nonatomic) NSNumber * _Nullable startHour;
+@property (strong, nonatomic) NSNumber * _Nullable userUniqueId;
 
-@property (strong, nonatomic) NSNumber * _Nullable startMinute;
+@property (strong, nonatomic) NSNumber * _Nullable userStatus;
 
-@property (strong, nonatomic) NSNumber * _Nullable endHour;
+@property (strong, nonatomic) NSNumber * _Nullable userType;
 
-@property (strong, nonatomic) NSNumber * _Nullable endMinute;
+@property (strong, nonatomic) NSNumber * _Nullable credentialRule;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3853,9 +3898,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearWeekDayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex;
+@interface CHIPDoorLockClusterGetUserParams : NSObject
 
 @property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 /**
@@ -3876,15 +3919,27 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetYearDayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
+@interface CHIPDoorLockClusterGetUserResponseParams : NSObject
 
 @property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 
-@property (strong, nonatomic) NSNumber * _Nonnull localStartTime;
+@property (strong, nonatomic) NSString * _Nullable userName;
 
-@property (strong, nonatomic) NSNumber * _Nonnull localEndTime;
+@property (strong, nonatomic) NSNumber * _Nullable userUniqueId;
+
+@property (strong, nonatomic) NSNumber * _Nullable userStatus;
+
+@property (strong, nonatomic) NSNumber * _Nullable userType;
+
+@property (strong, nonatomic) NSNumber * _Nullable credentialRule;
+
+@property (strong, nonatomic) NSArray * _Nullable credentials;
+
+@property (strong, nonatomic) NSNumber * _Nullable creatorFabricIndex;
+
+@property (strong, nonatomic) NSNumber * _Nullable lastModifiedFabricIndex;
+
+@property (strong, nonatomic) NSNumber * _Nullable nextUserIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3903,9 +3958,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetYearDayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
+@interface CHIPDoorLockClusterClearUserParams : NSObject
 
 @property (strong, nonatomic) NSNumber * _Nonnull userIndex;
 /**
@@ -3926,17 +3979,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetYearDayScheduleResponseParams : NSObject
+@interface CHIPDoorLockClusterSetCredentialParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull operationType;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential;
 
-@property (strong, nonatomic) NSNumber * _Nonnull status;
+@property (strong, nonatomic) NSData * _Nonnull credentialData;
 
-@property (strong, nonatomic) NSNumber * _Nullable localStartTime;
+@property (strong, nonatomic) NSNumber * _Nullable userIndex;
 
-@property (strong, nonatomic) NSNumber * _Nullable localEndTime;
+@property (strong, nonatomic) NSNumber * _Nullable userStatus;
+
+@property (strong, nonatomic) NSNumber * _Nullable userType;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3955,11 +4010,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearYearDayScheduleParams : NSObject
+@interface CHIPDoorLockClusterSetCredentialResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull status;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+@property (strong, nonatomic) NSNumber * _Nullable userIndex;
+
+@property (strong, nonatomic) NSNumber * _Nullable nextCredentialIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3978,15 +4035,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetHolidayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
-
-@property (strong, nonatomic) NSNumber * _Nonnull localStartTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull localEndTime;
+@interface CHIPDoorLockClusterGetCredentialStatusParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull operatingMode;
+@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4005,9 +4056,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetHolidayScheduleParams : NSObject
+@interface CHIPDoorLockClusterGetCredentialStatusResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull credentialExists;
+
+@property (strong, nonatomic) NSNumber * _Nullable userIndex;
+
+@property (strong, nonatomic) NSNumber * _Nullable creatorFabricIndex;
+
+@property (strong, nonatomic) NSNumber * _Nullable lastModifiedFabricIndex;
+
+@property (strong, nonatomic) NSNumber * _Nullable nextCredentialIndex;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4026,17 +4085,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetHolidayScheduleResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
-
-@property (strong, nonatomic) NSNumber * _Nonnull status;
-
-@property (strong, nonatomic) NSNumber * _Nullable localStartTime;
+@interface CHIPDoorLockClusterClearCredentialParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nullable localEndTime;
-
-@property (strong, nonatomic) NSNumber * _Nullable operatingMode;
+@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nullable credential;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4055,9 +4106,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearHolidayScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex;
+@interface CHIPWindowCoveringClusterUpOrOpenParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4076,11 +4125,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetUserTypeParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull userType;
+@interface CHIPWindowCoveringClusterDownOrCloseParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4099,9 +4144,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetUserTypeParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@interface CHIPWindowCoveringClusterStopMotionParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4120,11 +4163,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetUserTypeResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@interface CHIPWindowCoveringClusterGoToLiftValueParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userType;
+@property (strong, nonatomic) NSNumber * _Nonnull liftValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4143,15 +4184,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetRFIDCodeParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
-
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
-
-@property (strong, nonatomic) NSNumber * _Nullable userType;
+@interface CHIPWindowCoveringClusterGoToLiftPercentageParams : NSObject
 
-@property (strong, nonatomic) NSData * _Nonnull rfidCode;
+@property (strong, nonatomic) NSNumber * _Nonnull liftPercent100thsValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4170,9 +4205,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetRFIDCodeParams : NSObject
+@interface CHIPWindowCoveringClusterGoToTiltValueParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@property (strong, nonatomic) NSNumber * _Nonnull tiltValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4191,15 +4226,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetRFIDCodeResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
-
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
-
-@property (strong, nonatomic) NSNumber * _Nullable userType;
+@interface CHIPWindowCoveringClusterGoToTiltPercentageParams : NSObject
 
-@property (strong, nonatomic) NSData * _Nullable rfidCode;
+@property (strong, nonatomic) NSNumber * _Nonnull tiltPercent100thsValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4218,9 +4247,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearRFIDCodeParams : NSObject
+@interface CHIPBarrierControlClusterBarrierControlGoToPercentParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull rfidSlotIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull percentOpen;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4239,7 +4268,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearAllRFIDCodesParams : NSObject
+@interface CHIPBarrierControlClusterBarrierControlStopParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4258,21 +4287,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetUserParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull operationType;
-
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
-
-@property (strong, nonatomic) NSString * _Nullable userName;
-
-@property (strong, nonatomic) NSNumber * _Nullable userUniqueId;
-
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
+@interface CHIPThermostatClusterSetpointRaiseLowerParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nullable userType;
+@property (strong, nonatomic) NSNumber * _Nonnull mode;
 
-@property (strong, nonatomic) NSNumber * _Nullable credentialRule;
+@property (strong, nonatomic) NSNumber * _Nonnull amount;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4291,9 +4310,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetUserParams : NSObject
+@interface CHIPThermostatClusterGetWeeklyScheduleResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull numberOfTransitionsForSequence;
+
+@property (strong, nonatomic) NSNumber * _Nonnull dayOfWeekForSequence;
+
+@property (strong, nonatomic) NSNumber * _Nonnull modeForSequence;
+
+@property (strong, nonatomic) NSArray * _Nonnull transitions;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4312,27 +4337,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetUserResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
-
-@property (strong, nonatomic) NSString * _Nullable userName;
-
-@property (strong, nonatomic) NSNumber * _Nullable userUniqueId;
-
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
-
-@property (strong, nonatomic) NSNumber * _Nullable userType;
-
-@property (strong, nonatomic) NSNumber * _Nullable credentialRule;
+@interface CHIPThermostatClusterSetWeeklyScheduleParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nullable credentials;
+@property (strong, nonatomic) NSNumber * _Nonnull numberOfTransitionsForSequence;
 
-@property (strong, nonatomic) NSNumber * _Nullable creatorFabricIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull dayOfWeekForSequence;
 
-@property (strong, nonatomic) NSNumber * _Nullable lastModifiedFabricIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull modeForSequence;
 
-@property (strong, nonatomic) NSNumber * _Nullable nextUserIndex;
+@property (strong, nonatomic) NSArray * _Nonnull transitions;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4351,9 +4364,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearUserParams : NSObject
+@interface CHIPThermostatClusterGetWeeklyScheduleParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull userIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull daysToReturn;
+
+@property (strong, nonatomic) NSNumber * _Nonnull modeToReturn;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4372,19 +4387,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterOperatingEventNotificationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull operationEventSource;
-
-@property (strong, nonatomic) NSNumber * _Nonnull operationEventCode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
-
-@property (strong, nonatomic) NSData * _Nonnull pin;
-
-@property (strong, nonatomic) NSNumber * _Nonnull localTime;
-
-@property (strong, nonatomic) NSString * _Nullable data;
+@interface CHIPThermostatClusterClearWeeklyScheduleParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4403,23 +4406,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterProgrammingEventNotificationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull programEventSource;
-
-@property (strong, nonatomic) NSNumber * _Nonnull programEventCode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull userId;
+@interface CHIPColorControlClusterMoveToHueParams : NSObject
 
-@property (strong, nonatomic) NSData * _Nonnull pin;
+@property (strong, nonatomic) NSNumber * _Nonnull hue;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userType;
+@property (strong, nonatomic) NSNumber * _Nonnull direction;
 
-@property (strong, nonatomic) NSNumber * _Nonnull userStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
 
-@property (strong, nonatomic) NSNumber * _Nonnull localTime;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSString * _Nullable data;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4438,19 +4435,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetCredentialParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull operationType;
-
-@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential;
+@interface CHIPColorControlClusterMoveHueParams : NSObject
 
-@property (strong, nonatomic) NSData * _Nonnull credentialData;
+@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
 
-@property (strong, nonatomic) NSNumber * _Nullable userIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull rate;
 
-@property (strong, nonatomic) NSNumber * _Nullable userStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSNumber * _Nullable userType;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4469,13 +4462,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterSetCredentialResponseParams : NSObject
+@interface CHIPColorControlClusterStepHueParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull status;
+@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
 
-@property (strong, nonatomic) NSNumber * _Nullable userIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
 
-@property (strong, nonatomic) NSNumber * _Nullable nextCredentialIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4494,9 +4491,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetCredentialStatusParams : NSObject
+@interface CHIPColorControlClusterMoveToSaturationParams : NSObject
 
-@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential;
+@property (strong, nonatomic) NSNumber * _Nonnull saturation;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4515,17 +4518,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterGetCredentialStatusResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull credentialExists;
+@interface CHIPColorControlClusterMoveSaturationParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nullable userIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
 
-@property (strong, nonatomic) NSNumber * _Nullable creatorFabricIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull rate;
 
-@property (strong, nonatomic) NSNumber * _Nullable lastModifiedFabricIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSNumber * _Nullable nextCredentialIndex;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4544,9 +4545,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPDoorLockClusterClearCredentialParams : NSObject
+@interface CHIPColorControlClusterStepSaturationParams : NSObject
 
-@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nullable credential;
+@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
+
+@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4565,7 +4574,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterUpOrOpenParams : NSObject
+@interface CHIPColorControlClusterMoveToHueAndSaturationParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull hue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull saturation;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4584,7 +4603,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterDownOrCloseParams : NSObject
+@interface CHIPColorControlClusterMoveToColorParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull colorX;
+
+@property (strong, nonatomic) NSNumber * _Nonnull colorY;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4603,7 +4632,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterStopMotionParams : NSObject
+@interface CHIPColorControlClusterMoveColorParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull rateX;
+
+@property (strong, nonatomic) NSNumber * _Nonnull rateY;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4622,9 +4659,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterGoToLiftValueParams : NSObject
+@interface CHIPColorControlClusterStepColorParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull liftValue;
+@property (strong, nonatomic) NSNumber * _Nonnull stepX;
+
+@property (strong, nonatomic) NSNumber * _Nonnull stepY;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4643,9 +4688,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterGoToLiftPercentageParams : NSObject
+@interface CHIPColorControlClusterMoveToColorTemperatureParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull liftPercent100thsValue;
+@property (strong, nonatomic) NSNumber * _Nonnull colorTemperature;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4664,9 +4715,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterGoToTiltValueParams : NSObject
+@interface CHIPColorControlClusterEnhancedMoveToHueParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull tiltValue;
+@property (strong, nonatomic) NSNumber * _Nonnull enhancedHue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull direction;
+
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4685,9 +4744,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPWindowCoveringClusterGoToTiltPercentageParams : NSObject
+@interface CHIPColorControlClusterEnhancedMoveHueParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull tiltPercent100thsValue;
+@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
+
+@property (strong, nonatomic) NSNumber * _Nonnull rate;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -4706,1107 +4771,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPBarrierControlClusterBarrierControlGoToPercentParams : NSObject
+@interface CHIPColorControlClusterEnhancedStepHueParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull percentOpen;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPBarrierControlClusterBarrierControlStopParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterSetpointRaiseLowerParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull mode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull amount;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterGetWeeklyScheduleResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfTransitionsForSequence;
-
-@property (strong, nonatomic) NSNumber * _Nonnull dayOfWeekForSequence;
-
-@property (strong, nonatomic) NSNumber * _Nonnull modeForSequence;
-
-@property (strong, nonatomic) NSArray * _Nonnull transitions;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterSetWeeklyScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfTransitionsForSequence;
-
-@property (strong, nonatomic) NSNumber * _Nonnull dayOfWeekForSequence;
-
-@property (strong, nonatomic) NSNumber * _Nonnull modeForSequence;
-
-@property (strong, nonatomic) NSArray * _Nonnull transitions;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterGetRelayStatusLogResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull timeOfDay;
-
-@property (strong, nonatomic) NSNumber * _Nonnull relayStatus;
-
-@property (strong, nonatomic) NSNumber * _Nonnull localTemperature;
-
-@property (strong, nonatomic) NSNumber * _Nonnull humidityInPercentage;
-
-@property (strong, nonatomic) NSNumber * _Nonnull setpoint;
-
-@property (strong, nonatomic) NSNumber * _Nonnull unreadEntries;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterGetWeeklyScheduleParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull daysToReturn;
-
-@property (strong, nonatomic) NSNumber * _Nonnull modeToReturn;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterClearWeeklyScheduleParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPThermostatClusterGetRelayStatusLogParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveToHueParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull hue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull direction;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveHueParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull rate;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterStepHueParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveToSaturationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull saturation;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveSaturationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull rate;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterStepSaturationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveToHueAndSaturationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull hue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull saturation;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveToColorParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorX;
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorY;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveColorParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull rateX;
-
-@property (strong, nonatomic) NSNumber * _Nonnull rateY;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterStepColorParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepX;
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepY;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveToColorTemperatureParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorTemperature;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterEnhancedMoveToHueParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull enhancedHue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull direction;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterEnhancedMoveHueParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull rate;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterEnhancedStepHueParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull enhancedHue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull saturation;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterColorLoopSetParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull updateFlags;
-
-@property (strong, nonatomic) NSNumber * _Nonnull action;
-
-@property (strong, nonatomic) NSNumber * _Nonnull direction;
-
-@property (strong, nonatomic) NSNumber * _Nonnull time;
-
-@property (strong, nonatomic) NSNumber * _Nonnull startHue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterStopMoveStepParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterMoveColorTemperatureParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull rate;
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMinimumMireds;
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMaximumMireds;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPColorControlClusterStepColorTemperatureParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
-
-@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMinimumMireds;
-
-@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMaximumMireds;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterZoneEnrollResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull enrollResponseCode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterZoneStatusChangeNotificationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneStatus;
-
-@property (strong, nonatomic) NSNumber * _Nonnull extendedStatus;
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull delay;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterInitiateNormalOperationModeParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterZoneEnrollRequestParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneType;
-
-@property (strong, nonatomic) NSNumber * _Nonnull manufacturerCode;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterInitiateTestModeParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull testModeDuration;
-
-@property (strong, nonatomic) NSNumber * _Nonnull currentZoneSensitivityLevel;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterInitiateNormalOperationModeResponseParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasZoneClusterInitiateTestModeResponseParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterArmParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull armMode;
-
-@property (strong, nonatomic) NSString * _Nonnull armDisarmCode;
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterArmResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull armNotification;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterBypassParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfZones;
-
-@property (strong, nonatomic) NSArray * _Nonnull zoneIds;
-
-@property (strong, nonatomic) NSString * _Nonnull armDisarmCode;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetZoneIdMapResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull section0;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section1;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section2;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section3;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section4;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section5;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section6;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section7;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section8;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section9;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section10;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section11;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section12;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section13;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section14;
-
-@property (strong, nonatomic) NSNumber * _Nonnull section15;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterEmergencyParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetZoneInformationResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneType;
-
-@property (strong, nonatomic) NSNumber * _Nonnull ieeeAddress;
-
-@property (strong, nonatomic) NSString * _Nonnull zoneLabel;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterFireParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
-
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterZoneStatusChangedParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
 
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
+@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
 
-@property (strong, nonatomic) NSNumber * _Nonnull zoneStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
 
-@property (strong, nonatomic) NSNumber * _Nonnull audibleNotification;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSString * _Nonnull zoneLabel;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -5825,34 +4800,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPIasAceClusterPanicParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@interface CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams : NSObject
 
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterPanelStatusChangedParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull enhancedHue;
 
-@property (strong, nonatomic) NSNumber * _Nonnull panelStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull saturation;
 
-@property (strong, nonatomic) NSNumber * _Nonnull secondsRemaining;
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
 
-@property (strong, nonatomic) NSNumber * _Nonnull audibleNotification;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSNumber * _Nonnull alarmStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -5871,55 +4829,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPIasAceClusterGetZoneIdMapParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@interface CHIPColorControlClusterColorLoopSetParams : NSObject
 
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetPanelStatusResponseParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull updateFlags;
 
-@property (strong, nonatomic) NSNumber * _Nonnull panelStatus;
+@property (strong, nonatomic) NSNumber * _Nonnull action;
 
-@property (strong, nonatomic) NSNumber * _Nonnull secondsRemaining;
+@property (strong, nonatomic) NSNumber * _Nonnull direction;
 
-@property (strong, nonatomic) NSNumber * _Nonnull audibleNotification;
+@property (strong, nonatomic) NSNumber * _Nonnull time;
 
-@property (strong, nonatomic) NSNumber * _Nonnull alarmStatus;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@property (strong, nonatomic) NSNumber * _Nonnull startHue;
 
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetZoneInformationParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -5938,30 +4862,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPIasAceClusterSetBypassedZoneListParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfZones;
+@interface CHIPColorControlClusterStopMoveStepParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull zoneIds;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetPanelStatusParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -5980,55 +4885,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPIasAceClusterBypassResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfZones;
+@interface CHIPColorControlClusterMoveColorTemperatureParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull bypassResult;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@property (strong, nonatomic) NSNumber * _Nonnull moveMode;
 
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetBypassedZoneListParams : NSObject
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@property (strong, nonatomic) NSNumber * _Nonnull rate;
 
-- (instancetype)init;
-@end
-@interface CHIPIasAceClusterGetZoneStatusResponseParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMinimumMireds;
 
-@property (strong, nonatomic) NSNumber * _Nonnull zoneStatusComplete;
+@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMaximumMireds;
 
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfZones;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSArray * _Nonnull zoneStatusResult;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -6047,63 +4916,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPIasAceClusterGetZoneStatusParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull startingZoneId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull maxNumberOfZoneIds;
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneStatusMaskFlag;
-
-@property (strong, nonatomic) NSNumber * _Nonnull zoneStatusMask;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@interface CHIPColorControlClusterStepColorTemperatureParams : NSObject
 
-- (instancetype)init;
-@end
-@interface CHIPIasWdClusterStartWarningParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull stepMode;
 
-@property (strong, nonatomic) NSNumber * _Nonnull warningInfo;
+@property (strong, nonatomic) NSNumber * _Nonnull stepSize;
 
-@property (strong, nonatomic) NSNumber * _Nonnull warningDuration;
+@property (strong, nonatomic) NSNumber * _Nonnull transitionTime;
 
-@property (strong, nonatomic) NSNumber * _Nonnull strobeDutyCycle;
+@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMinimumMireds;
 
-@property (strong, nonatomic) NSNumber * _Nonnull strobeLevel;
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout.  The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
+@property (strong, nonatomic) NSNumber * _Nonnull colorTemperatureMaximumMireds;
 
-- (instancetype)init;
-@end
-@interface CHIPIasWdClusterSquawkParams : NSObject
+@property (strong, nonatomic) NSNumber * _Nonnull optionsMask;
 
-@property (strong, nonatomic) NSNumber * _Nonnull squawkInfo;
+@property (strong, nonatomic) NSNumber * _Nonnull optionsOverride;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -6926,7 +5753,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestParams : NSObject
+@interface CHIPMessagingClusterDisplayMessageParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageId;
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageControl;
+
+@property (strong, nonatomic) NSNumber * _Nonnull startTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull durationInMinutes;
+
+@property (strong, nonatomic) NSString * _Nonnull message;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionalExtendedMessageControl;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -6945,9 +5784,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestSpecificResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull returnValue;
+@interface CHIPMessagingClusterGetLastMessageParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -6966,7 +5803,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestNotHandledParams : NSObject
+@interface CHIPMessagingClusterCancelMessageParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageId;
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageControl;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -6983,11 +5824,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
-- (instancetype)init;
-@end
-@interface CHIPTestClusterClusterTestAddArgumentsResponseParams : NSObject
+- (instancetype)init;
+@end
+@interface CHIPMessagingClusterMessageConfirmationParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageId;
+
+@property (strong, nonatomic) NSNumber * _Nonnull confirmationTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageConfirmationControl;
 
-@property (strong, nonatomic) NSNumber * _Nonnull returnValue;
+@property (strong, nonatomic) NSData * _Nonnull messageResponse;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7006,7 +5853,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestSpecificParams : NSObject
+@interface CHIPMessagingClusterDisplayProtectedMessageParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageId;
+
+@property (strong, nonatomic) NSNumber * _Nonnull messageControl;
+
+@property (strong, nonatomic) NSNumber * _Nonnull startTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull durationInMinutes;
+
+@property (strong, nonatomic) NSString * _Nonnull message;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionalExtendedMessageControl;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7025,9 +5884,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestSimpleArgumentResponseParams : NSObject
+@interface CHIPMessagingClusterGetMessageCancellationParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull returnValue;
+@property (strong, nonatomic) NSNumber * _Nonnull earliestImplementationTime;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7046,7 +5905,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestUnknownCommandParams : NSObject
+@interface CHIPMessagingClusterCancelAllMessagesParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nonnull implementationDateTime;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7065,19 +5926,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestStructArrayArgumentResponseParams : NSObject
-
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
-
-@property (strong, nonatomic) NSArray * _Nonnull arg2;
-
-@property (strong, nonatomic) NSArray * _Nonnull arg3;
-
-@property (strong, nonatomic) NSArray * _Nonnull arg4;
-
-@property (strong, nonatomic) NSNumber * _Nonnull arg5;
-
-@property (strong, nonatomic) NSNumber * _Nonnull arg6;
+@interface CHIPApplianceEventsAndAlertClusterGetAlertsParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7096,11 +5945,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestAddArgumentsParams : NSObject
+@interface CHIPApplianceEventsAndAlertClusterGetAlertsResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull alertsCount;
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg2;
+@property (strong, nonatomic) NSArray * _Nonnull alertStructures;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7119,9 +5968,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestListInt8UReverseResponseParams : NSObject
+@interface CHIPApplianceEventsAndAlertClusterAlertsNotificationParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull alertsCount;
+
+@property (strong, nonatomic) NSArray * _Nonnull alertStructures;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7140,9 +5991,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestSimpleArgumentRequestParams : NSObject
+@interface CHIPApplianceEventsAndAlertClusterEventsNotificationParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull eventHeader;
+
+@property (strong, nonatomic) NSNumber * _Nonnull eventId;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7161,11 +6014,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestEnumsResponseParams : NSObject
+@interface CHIPApplianceStatisticsClusterLogNotificationParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull timeStamp;
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg2;
+@property (strong, nonatomic) NSNumber * _Nonnull logId;
+
+@property (strong, nonatomic) NSNumber * _Nonnull logLength;
+
+@property (strong, nonatomic) NSArray * _Nonnull logPayload;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7184,19 +6041,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestStructArrayArgumentRequestParams : NSObject
-
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
-
-@property (strong, nonatomic) NSArray * _Nonnull arg2;
-
-@property (strong, nonatomic) NSArray * _Nonnull arg3;
-
-@property (strong, nonatomic) NSArray * _Nonnull arg4;
-
-@property (strong, nonatomic) NSNumber * _Nonnull arg5;
+@interface CHIPApplianceStatisticsClusterLogRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg6;
+@property (strong, nonatomic) NSNumber * _Nonnull logId;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7215,15 +6062,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestNullableOptionalResponseParams : NSObject
+@interface CHIPApplianceStatisticsClusterLogResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull wasPresent;
+@property (strong, nonatomic) NSNumber * _Nonnull timeStamp;
 
-@property (strong, nonatomic) NSNumber * _Nullable wasNull;
+@property (strong, nonatomic) NSNumber * _Nonnull logId;
 
-@property (strong, nonatomic) NSNumber * _Nullable value;
+@property (strong, nonatomic) NSNumber * _Nonnull logLength;
 
-@property (strong, nonatomic) NSNumber * _Nullable originalValue;
+@property (strong, nonatomic) NSArray * _Nonnull logPayload;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7242,9 +6089,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestStructArgumentRequestParams : NSObject
-
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull arg1;
+@interface CHIPApplianceStatisticsClusterLogQueueRequestParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7263,63 +6108,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestComplexNullableOptionalResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableIntWasNull;
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableIntValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionalIntWasPresent;
-
-@property (strong, nonatomic) NSNumber * _Nullable optionalIntValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalIntWasPresent;
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalIntWasNull;
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalIntValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableStringWasNull;
-
-@property (strong, nonatomic) NSString * _Nullable nullableStringValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionalStringWasPresent;
-
-@property (strong, nonatomic) NSString * _Nullable optionalStringValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalStringWasPresent;
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalStringWasNull;
-
-@property (strong, nonatomic) NSString * _Nullable nullableOptionalStringValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableStructWasNull;
-
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableStructValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionalStructWasPresent;
-
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable optionalStructValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalStructWasPresent;
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalStructWasNull;
-
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableOptionalStructValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableListWasNull;
-
-@property (strong, nonatomic) NSArray * _Nullable nullableListValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull optionalListWasPresent;
-
-@property (strong, nonatomic) NSArray * _Nullable optionalListValue;
-
-@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalListWasPresent;
+@interface CHIPApplianceStatisticsClusterLogQueueResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalListWasNull;
+@property (strong, nonatomic) NSNumber * _Nonnull logQueueSize;
 
-@property (strong, nonatomic) NSArray * _Nullable nullableOptionalListValue;
+@property (strong, nonatomic) NSArray * _Nonnull logIds;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7338,9 +6131,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestNestedStructArgumentRequestParams : NSObject
+@interface CHIPApplianceStatisticsClusterStatisticsAvailableParams : NSObject
 
-@property (strong, nonatomic) CHIPTestClusterClusterNestedStruct * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull logQueueSize;
+
+@property (strong, nonatomic) NSArray * _Nonnull logIds;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7359,9 +6154,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterBooleanResponseParams : NSObject
+@interface CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull value;
+@property (strong, nonatomic) NSNumber * _Nonnull profileCount;
+
+@property (strong, nonatomic) NSNumber * _Nonnull profileIntervalPeriod;
+
+@property (strong, nonatomic) NSNumber * _Nonnull maxNumberOfIntervals;
+
+@property (strong, nonatomic) NSArray * _Nonnull listOfAttributes;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7380,9 +6181,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestListStructArgumentRequestParams : NSObject
-
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
+@interface CHIPElectricalMeasurementClusterGetProfileInfoCommandParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7401,9 +6200,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterSimpleStructResponseParams : NSObject
+@interface CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandParams : NSObject
 
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull startTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull status;
+
+@property (strong, nonatomic) NSNumber * _Nonnull profileIntervalPeriod;
+
+@property (strong, nonatomic) NSNumber * _Nonnull numberOfIntervalsDelivered;
+
+@property (strong, nonatomic) NSNumber * _Nonnull attributeId;
+
+@property (strong, nonatomic) NSArray * _Nonnull intervals;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7422,9 +6231,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestListInt8UArgumentRequestParams : NSObject
+@interface CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull attributeId;
+
+@property (strong, nonatomic) NSNumber * _Nonnull startTime;
+
+@property (strong, nonatomic) NSNumber * _Nonnull numberOfIntervals;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7443,9 +6256,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestEmitTestEventResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull value;
+@interface CHIPTestClusterClusterTestParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7464,9 +6275,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestNestedStructListArgumentRequestParams : NSObject
+@interface CHIPTestClusterClusterTestSpecificResponseParams : NSObject
 
-@property (strong, nonatomic) CHIPTestClusterClusterNestedStructList * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull returnValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7485,9 +6296,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull value;
+@interface CHIPTestClusterClusterTestNotHandledParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7506,9 +6315,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams : NSObject
+@interface CHIPTestClusterClusterTestAddArgumentsResponseParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull returnValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7527,9 +6336,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestListInt8UReverseRequestParams : NSObject
-
-@property (strong, nonatomic) NSArray * _Nonnull arg1;
+@interface CHIPTestClusterClusterTestSpecificParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7548,11 +6355,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestEnumsRequestParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull arg1;
+@interface CHIPTestClusterClusterTestSimpleArgumentResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg2;
+@property (strong, nonatomic) NSNumber * _Nonnull returnValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7571,9 +6376,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestNullableOptionalRequestParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nullable arg1;
+@interface CHIPTestClusterClusterTestUnknownCommandParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7592,31 +6395,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestComplexNullableOptionalRequestParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableInt;
-
-@property (strong, nonatomic) NSNumber * _Nullable optionalInt;
-
-@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalInt;
-
-@property (strong, nonatomic) NSString * _Nullable nullableString;
-
-@property (strong, nonatomic) NSString * _Nullable optionalString;
-
-@property (strong, nonatomic) NSString * _Nullable nullableOptionalString;
+@interface CHIPTestClusterClusterTestStructArrayArgumentResponseParams : NSObject
 
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableStruct;
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
 
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable optionalStruct;
+@property (strong, nonatomic) NSArray * _Nonnull arg2;
 
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableOptionalStruct;
+@property (strong, nonatomic) NSArray * _Nonnull arg3;
 
-@property (strong, nonatomic) NSArray * _Nullable nullableList;
+@property (strong, nonatomic) NSArray * _Nonnull arg4;
 
-@property (strong, nonatomic) NSArray * _Nullable optionalList;
+@property (strong, nonatomic) NSNumber * _Nonnull arg5;
 
-@property (strong, nonatomic) NSArray * _Nullable nullableOptionalList;
+@property (strong, nonatomic) NSNumber * _Nonnull arg6;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7635,9 +6426,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterSimpleStructEchoRequestParams : NSObject
+@interface CHIPTestClusterClusterTestAddArgumentsParams : NSObject
 
-@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull arg1;
+
+@property (strong, nonatomic) NSNumber * _Nonnull arg2;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7656,7 +6449,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTimedInvokeRequestParams : NSObject
+@interface CHIPTestClusterClusterTestListInt8UReverseResponseParams : NSObject
+
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7675,9 +6470,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams : NSObject
+@interface CHIPTestClusterClusterTestSimpleArgumentRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nullable arg1;
+@property (strong, nonatomic) NSNumber * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7696,13 +6491,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestEmitTestEventRequestParams : NSObject
+@interface CHIPTestClusterClusterTestEnumsResponseParams : NSObject
 
 @property (strong, nonatomic) NSNumber * _Nonnull arg1;
 
 @property (strong, nonatomic) NSNumber * _Nonnull arg2;
-
-@property (strong, nonatomic) NSNumber * _Nonnull arg3;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7721,9 +6514,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams : NSObject
+@interface CHIPTestClusterClusterTestStructArrayArgumentRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull arg1;
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
+
+@property (strong, nonatomic) NSArray * _Nonnull arg2;
+
+@property (strong, nonatomic) NSArray * _Nonnull arg3;
+
+@property (strong, nonatomic) NSArray * _Nonnull arg4;
+
+@property (strong, nonatomic) NSNumber * _Nonnull arg5;
+
+@property (strong, nonatomic) NSNumber * _Nonnull arg6;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7742,19 +6545,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterDisplayMessageParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull messageId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull messageControl;
+@interface CHIPTestClusterClusterTestNullableOptionalResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull startTime;
+@property (strong, nonatomic) NSNumber * _Nonnull wasPresent;
 
-@property (strong, nonatomic) NSNumber * _Nonnull durationInMinutes;
+@property (strong, nonatomic) NSNumber * _Nullable wasNull;
 
-@property (strong, nonatomic) NSString * _Nonnull message;
+@property (strong, nonatomic) NSNumber * _Nullable value;
 
-@property (strong, nonatomic) NSNumber * _Nonnull optionalExtendedMessageControl;
+@property (strong, nonatomic) NSNumber * _Nullable originalValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7773,7 +6572,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterGetLastMessageParams : NSObject
+@interface CHIPTestClusterClusterTestStructArgumentRequestParams : NSObject
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7792,11 +6593,63 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterCancelMessageParams : NSObject
+@interface CHIPTestClusterClusterTestComplexNullableOptionalResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull messageId;
+@property (strong, nonatomic) NSNumber * _Nonnull nullableIntWasNull;
 
-@property (strong, nonatomic) NSNumber * _Nonnull messageControl;
+@property (strong, nonatomic) NSNumber * _Nullable nullableIntValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionalIntWasPresent;
+
+@property (strong, nonatomic) NSNumber * _Nullable optionalIntValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalIntWasPresent;
+
+@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalIntWasNull;
+
+@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalIntValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableStringWasNull;
+
+@property (strong, nonatomic) NSString * _Nullable nullableStringValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionalStringWasPresent;
+
+@property (strong, nonatomic) NSString * _Nullable optionalStringValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalStringWasPresent;
+
+@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalStringWasNull;
+
+@property (strong, nonatomic) NSString * _Nullable nullableOptionalStringValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableStructWasNull;
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableStructValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionalStructWasPresent;
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable optionalStructValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalStructWasPresent;
+
+@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalStructWasNull;
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableOptionalStructValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableListWasNull;
+
+@property (strong, nonatomic) NSArray * _Nullable nullableListValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull optionalListWasPresent;
+
+@property (strong, nonatomic) NSArray * _Nullable optionalListValue;
+
+@property (strong, nonatomic) NSNumber * _Nonnull nullableOptionalListWasPresent;
+
+@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalListWasNull;
+
+@property (strong, nonatomic) NSArray * _Nullable nullableOptionalListValue;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7815,15 +6668,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterMessageConfirmationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull messageId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull confirmationTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull messageConfirmationControl;
+@interface CHIPTestClusterClusterTestNestedStructArgumentRequestParams : NSObject
 
-@property (strong, nonatomic) NSData * _Nonnull messageResponse;
+@property (strong, nonatomic) CHIPTestClusterClusterNestedStruct * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7842,19 +6689,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterDisplayProtectedMessageParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull messageId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull messageControl;
-
-@property (strong, nonatomic) NSNumber * _Nonnull startTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull durationInMinutes;
-
-@property (strong, nonatomic) NSString * _Nonnull message;
+@interface CHIPTestClusterClusterBooleanResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull optionalExtendedMessageControl;
+@property (strong, nonatomic) NSNumber * _Nonnull value;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7873,9 +6710,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterGetMessageCancellationParams : NSObject
+@interface CHIPTestClusterClusterTestListStructArgumentRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull earliestImplementationTime;
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7894,9 +6731,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPMessagingClusterCancelAllMessagesParams : NSObject
+@interface CHIPTestClusterClusterSimpleStructResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull implementationDateTime;
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7915,7 +6752,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceEventsAndAlertClusterGetAlertsParams : NSObject
+@interface CHIPTestClusterClusterTestListInt8UArgumentRequestParams : NSObject
+
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7934,11 +6773,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceEventsAndAlertClusterGetAlertsResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull alertsCount;
+@interface CHIPTestClusterClusterTestEmitTestEventResponseParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull alertStructures;
+@property (strong, nonatomic) NSNumber * _Nonnull value;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7957,11 +6794,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceEventsAndAlertClusterAlertsNotificationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull alertsCount;
+@interface CHIPTestClusterClusterTestNestedStructListArgumentRequestParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull alertStructures;
+@property (strong, nonatomic) CHIPTestClusterClusterNestedStructList * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -7980,11 +6815,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceEventsAndAlertClusterEventsNotificationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull eventHeader;
+@interface CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull eventId;
+@property (strong, nonatomic) NSNumber * _Nonnull value;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8003,15 +6836,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceStatisticsClusterLogNotificationParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull timeStamp;
-
-@property (strong, nonatomic) NSNumber * _Nonnull logId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull logLength;
+@interface CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull logPayload;
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8030,9 +6857,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceStatisticsClusterLogRequestParams : NSObject
+@interface CHIPTestClusterClusterTestListInt8UReverseRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull logId;
+@property (strong, nonatomic) NSArray * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8051,15 +6878,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceStatisticsClusterLogResponseParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull timeStamp;
-
-@property (strong, nonatomic) NSNumber * _Nonnull logId;
+@interface CHIPTestClusterClusterTestEnumsRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull logLength;
+@property (strong, nonatomic) NSNumber * _Nonnull arg1;
 
-@property (strong, nonatomic) NSArray * _Nonnull logPayload;
+@property (strong, nonatomic) NSNumber * _Nonnull arg2;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8078,7 +6901,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceStatisticsClusterLogQueueRequestParams : NSObject
+@interface CHIPTestClusterClusterTestNullableOptionalRequestParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nullable arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8097,11 +6922,31 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceStatisticsClusterLogQueueResponseParams : NSObject
+@interface CHIPTestClusterClusterTestComplexNullableOptionalRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull logQueueSize;
+@property (strong, nonatomic) NSNumber * _Nullable nullableInt;
 
-@property (strong, nonatomic) NSArray * _Nonnull logIds;
+@property (strong, nonatomic) NSNumber * _Nullable optionalInt;
+
+@property (strong, nonatomic) NSNumber * _Nullable nullableOptionalInt;
+
+@property (strong, nonatomic) NSString * _Nullable nullableString;
+
+@property (strong, nonatomic) NSString * _Nullable optionalString;
+
+@property (strong, nonatomic) NSString * _Nullable nullableOptionalString;
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableStruct;
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable optionalStruct;
+
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nullable nullableOptionalStruct;
+
+@property (strong, nonatomic) NSArray * _Nullable nullableList;
+
+@property (strong, nonatomic) NSArray * _Nullable optionalList;
+
+@property (strong, nonatomic) NSArray * _Nullable nullableOptionalList;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8120,11 +6965,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPApplianceStatisticsClusterStatisticsAvailableParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull logQueueSize;
+@interface CHIPTestClusterClusterSimpleStructEchoRequestParams : NSObject
 
-@property (strong, nonatomic) NSArray * _Nonnull logIds;
+@property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8143,15 +6986,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull profileCount;
-
-@property (strong, nonatomic) NSNumber * _Nonnull profileIntervalPeriod;
-
-@property (strong, nonatomic) NSNumber * _Nonnull maxNumberOfIntervals;
-
-@property (strong, nonatomic) NSArray * _Nonnull listOfAttributes;
+@interface CHIPTestClusterClusterTimedInvokeRequestParams : NSObject
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8170,7 +7005,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPElectricalMeasurementClusterGetProfileInfoCommandParams : NSObject
+@interface CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams : NSObject
+
+@property (strong, nonatomic) NSNumber * _Nullable arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8189,19 +7026,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull startTime;
-
-@property (strong, nonatomic) NSNumber * _Nonnull status;
-
-@property (strong, nonatomic) NSNumber * _Nonnull profileIntervalPeriod;
+@interface CHIPTestClusterClusterTestEmitTestEventRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfIntervalsDelivered;
+@property (strong, nonatomic) NSNumber * _Nonnull arg1;
 
-@property (strong, nonatomic) NSNumber * _Nonnull attributeId;
+@property (strong, nonatomic) NSNumber * _Nonnull arg2;
 
-@property (strong, nonatomic) NSArray * _Nonnull intervals;
+@property (strong, nonatomic) NSNumber * _Nonnull arg3;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -8220,13 +7051,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init;
 @end
-@interface CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams : NSObject
-
-@property (strong, nonatomic) NSNumber * _Nonnull attributeId;
-
-@property (strong, nonatomic) NSNumber * _Nonnull startTime;
+@interface CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams : NSObject
 
-@property (strong, nonatomic) NSNumber * _Nonnull numberOfIntervals;
+@property (strong, nonatomic) NSNumber * _Nonnull arg1;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm
index 12259c86a1440a..d03f5e035eaef6 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm
@@ -31,6 +31,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: identifyTime:%@; >", NSStringFromClass([self class]), _identifyTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPIdentifyClusterTriggerEffectParams
 - (instancetype)init
@@ -44,6 +52,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: effectIdentifier:%@; effectVariant:%@; >",
+                                             NSStringFromClass([self class]), _effectIdentifier, _effectVariant];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterAddGroupParams
 - (instancetype)init
@@ -57,6 +73,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; groupName:%@; >", NSStringFromClass([self class]), _groupId, _groupName];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterAddGroupResponseParams
 - (instancetype)init
@@ -70,6 +94,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; >", NSStringFromClass([self class]), _status, _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterViewGroupParams
 - (instancetype)init
@@ -81,6 +113,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterViewGroupResponseParams
 - (instancetype)init
@@ -96,6 +135,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; groupName:%@; >",
+                                             NSStringFromClass([self class]), _status, _groupId, _groupName];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterGetGroupMembershipParams
 - (instancetype)init
@@ -107,6 +154,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupList:%@; >", NSStringFromClass([self class]), _groupList];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterGetGroupMembershipResponseParams
 - (instancetype)init
@@ -120,6 +174,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: capacity:%@; groupList:%@; >", NSStringFromClass([self class]), _capacity, _groupList];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterRemoveGroupParams
 - (instancetype)init
@@ -131,6 +193,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterRemoveGroupResponseParams
 - (instancetype)init
@@ -144,6 +213,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; >", NSStringFromClass([self class]), _status, _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterRemoveAllGroupsParams
 - (instancetype)init
@@ -153,6 +230,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupsClusterAddGroupIfIdentifyingParams
 - (instancetype)init
@@ -166,6 +250,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; groupName:%@; >", NSStringFromClass([self class]), _groupId, _groupName];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterAddSceneParams
 - (instancetype)init
@@ -185,6 +277,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >",
+                  NSStringFromClass([self class]), _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterAddSceneResponseParams
 - (instancetype)init
@@ -200,6 +301,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >",
+                                             NSStringFromClass([self class]), _status, _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterViewSceneParams
 - (instancetype)init
@@ -213,6 +322,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterViewSceneResponseParams
 - (instancetype)init
@@ -234,6 +351,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >",
+        NSStringFromClass([self class]), _status, _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterRemoveSceneParams
 - (instancetype)init
@@ -247,6 +373,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterRemoveSceneResponseParams
 - (instancetype)init
@@ -262,6 +396,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >",
+                                             NSStringFromClass([self class]), _status, _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterRemoveAllScenesParams
 - (instancetype)init
@@ -273,6 +415,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterRemoveAllScenesResponseParams
 - (instancetype)init
@@ -286,6 +435,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; >", NSStringFromClass([self class]), _status, _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterStoreSceneParams
 - (instancetype)init
@@ -299,6 +456,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterStoreSceneResponseParams
 - (instancetype)init
@@ -314,6 +479,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >",
+                                             NSStringFromClass([self class]), _status, _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterRecallSceneParams
 - (instancetype)init
@@ -329,6 +502,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; transitionTime:%@; >",
+                                             NSStringFromClass([self class]), _groupId, _sceneId, _transitionTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterGetSceneMembershipParams
 - (instancetype)init
@@ -340,6 +521,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterGetSceneMembershipResponseParams
 - (instancetype)init
@@ -357,6 +545,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; capacity:%@; groupId:%@; sceneList:%@; >",
+                                             NSStringFromClass([self class]), _status, _capacity, _groupId, _sceneList];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterEnhancedAddSceneParams
 - (instancetype)init
@@ -376,6 +572,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >",
+                  NSStringFromClass([self class]), _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterEnhancedAddSceneResponseParams
 - (instancetype)init
@@ -391,6 +596,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >",
+                                             NSStringFromClass([self class]), _status, _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterEnhancedViewSceneParams
 - (instancetype)init
@@ -404,6 +617,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterEnhancedViewSceneResponseParams
 - (instancetype)init
@@ -425,6 +646,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >",
+        NSStringFromClass([self class]), _status, _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterCopySceneParams
 - (instancetype)init
@@ -444,6 +674,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: mode:%@; groupIdFrom:%@; sceneIdFrom:%@; groupIdTo:%@; sceneIdTo:%@; >",
+                  NSStringFromClass([self class]), _mode, _groupIdFrom, _sceneIdFrom, _groupIdTo, _sceneIdTo];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPScenesClusterCopySceneResponseParams
 - (instancetype)init
@@ -459,6 +698,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupIdFrom:%@; sceneIdFrom:%@; >",
+                                             NSStringFromClass([self class]), _status, _groupIdFrom, _sceneIdFrom];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOnOffClusterOffParams
 - (instancetype)init
@@ -468,6 +715,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOnOffClusterOnParams
 - (instancetype)init
@@ -477,6 +731,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOnOffClusterToggleParams
 - (instancetype)init
@@ -486,6 +747,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOnOffClusterOffWithEffectParams
 - (instancetype)init
@@ -499,6 +767,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: effectId:%@; effectVariant:%@; >", NSStringFromClass([self class]), _effectId, _effectVariant];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOnOffClusterOnWithRecallGlobalSceneParams
 - (instancetype)init
@@ -508,6 +784,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOnOffClusterOnWithTimedOffParams
 - (instancetype)init
@@ -523,6 +806,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: onOffControl:%@; onTime:%@; offWaitTime:%@; >",
+                                             NSStringFromClass([self class]), _onOffControl, _onTime, _offWaitTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterMoveToLevelParams
 - (instancetype)init
@@ -540,6 +831,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: level:%@; transitionTime:%@; optionMask:%@; optionOverride:%@; >",
+                  NSStringFromClass([self class]), _level, _transitionTime, _optionMask, _optionOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterMoveParams
 - (instancetype)init
@@ -557,6 +857,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionMask:%@; optionOverride:%@; >",
+                                             NSStringFromClass([self class]), _moveMode, _rate, _optionMask, _optionOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterStepParams
 - (instancetype)init
@@ -576,6 +884,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionMask:%@; optionOverride:%@; >",
+                  NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionMask, _optionOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterStopParams
 - (instancetype)init
@@ -589,6 +906,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: optionMask:%@; optionOverride:%@; >",
+                                             NSStringFromClass([self class]), _optionMask, _optionOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterMoveToLevelWithOnOffParams
 - (instancetype)init
@@ -602,6 +927,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: level:%@; transitionTime:%@; >", NSStringFromClass([self class]), _level, _transitionTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterMoveWithOnOffParams
 - (instancetype)init
@@ -615,6 +948,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; >", NSStringFromClass([self class]), _moveMode, _rate];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterStepWithOnOffParams
 - (instancetype)init
@@ -630,6 +971,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; >",
+                                             NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPLevelControlClusterStopWithOnOffParams
 - (instancetype)init
@@ -639,6 +988,31 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+@implementation CHIPLevelControlClusterMoveToClosestFrequencyParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _frequency = @(0);
+        _timedInvokeTimeoutMs = nil;
+    }
+    return self;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: frequency:%@; >", NSStringFromClass([self class]), _frequency];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAlarmsClusterResetAlarmParams
 - (instancetype)init
@@ -652,6 +1026,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: alarmCode:%@; clusterId:%@; >", NSStringFromClass([self class]), _alarmCode, _clusterId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAlarmsClusterAlarmParams
 - (instancetype)init
@@ -665,6 +1047,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: alarmCode:%@; clusterId:%@; >", NSStringFromClass([self class]), _alarmCode, _clusterId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAlarmsClusterResetAllAlarmsParams
 - (instancetype)init
@@ -674,6 +1064,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAlarmsClusterGetAlarmResponseParams
 - (instancetype)init
@@ -691,6 +1088,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; alarmCode:%@; clusterId:%@; timeStamp:%@; >",
+                                             NSStringFromClass([self class]), _status, _alarmCode, _clusterId, _timeStamp];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAlarmsClusterGetAlarmParams
 - (instancetype)init
@@ -700,6 +1105,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAlarmsClusterResetAlarmLogParams
 - (instancetype)init
@@ -709,6 +1121,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileRequestParams
 - (instancetype)init
@@ -720,6 +1139,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; >", NSStringFromClass([self class]), _powerProfileId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileNotificationParams
 - (instancetype)init
@@ -737,6 +1164,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: totalProfileNum:%@; powerProfileId:%@; numOfTransferredPhases:%@; transferredPhases:%@; >",
+        NSStringFromClass([self class]), _totalProfileNum, _powerProfileId, _numOfTransferredPhases, _transferredPhases];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileStateRequestParams
 - (instancetype)init
@@ -746,6 +1182,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileResponseParams
 - (instancetype)init
@@ -763,6 +1206,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: totalProfileNum:%@; powerProfileId:%@; numOfTransferredPhases:%@; transferredPhases:%@; >",
+        NSStringFromClass([self class]), _totalProfileNum, _powerProfileId, _numOfTransferredPhases, _transferredPhases];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterGetPowerProfilePriceResponseParams
 - (instancetype)init
@@ -780,6 +1232,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; currency:%@; price:%@; priceTrailingDigit:%@; >",
+                  NSStringFromClass([self class]), _powerProfileId, _currency, _price, _priceTrailingDigit];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileStateResponseParams
 - (instancetype)init
@@ -793,6 +1254,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: powerProfileCount:%@; powerProfileRecords:%@; >",
+                                             NSStringFromClass([self class]), _powerProfileCount, _powerProfileRecords];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterGetOverallSchedulePriceResponseParams
 - (instancetype)init
@@ -808,6 +1277,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: currency:%@; price:%@; priceTrailingDigit:%@; >",
+                                             NSStringFromClass([self class]), _currency, _price, _priceTrailingDigit];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterGetPowerProfilePriceParams
 - (instancetype)init
@@ -819,6 +1296,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; >", NSStringFromClass([self class]), _powerProfileId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterEnergyPhasesScheduleNotificationParams
 - (instancetype)init
@@ -834,6 +1319,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; numOfScheduledPhases:%@; scheduledPhases:%@; >",
+                  NSStringFromClass([self class]), _powerProfileId, _numOfScheduledPhases, _scheduledPhases];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfilesStateNotificationParams
 - (instancetype)init
@@ -847,9 +1341,17 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPPowerProfileClusterEnergyPhasesScheduleResponseParams
-- (instancetype)init
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: powerProfileCount:%@; powerProfileRecords:%@; >",
+                                             NSStringFromClass([self class]), _powerProfileCount, _powerProfileRecords];
+    return descriptionString;
+}
+
+@end
+@implementation CHIPPowerProfileClusterEnergyPhasesScheduleResponseParams
+- (instancetype)init
 {
     if (self = [super init]) {
 
@@ -862,6 +1364,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; numOfScheduledPhases:%@; scheduledPhases:%@; >",
+                  NSStringFromClass([self class]), _powerProfileId, _numOfScheduledPhases, _scheduledPhases];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterGetOverallSchedulePriceParams
 - (instancetype)init
@@ -871,6 +1382,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileScheduleConstraintsRequestParams
 - (instancetype)init
@@ -882,6 +1400,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; >", NSStringFromClass([self class]), _powerProfileId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterEnergyPhasesScheduleRequestParams
 - (instancetype)init
@@ -893,6 +1419,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; >", NSStringFromClass([self class]), _powerProfileId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterEnergyPhasesScheduleStateRequestParams
 - (instancetype)init
@@ -904,6 +1438,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; >", NSStringFromClass([self class]), _powerProfileId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterEnergyPhasesScheduleStateResponseParams
 - (instancetype)init
@@ -919,6 +1461,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; numOfScheduledPhases:%@; scheduledPhases:%@; >",
+                  NSStringFromClass([self class]), _powerProfileId, _numOfScheduledPhases, _scheduledPhases];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterGetPowerProfilePriceExtendedResponseParams
 - (instancetype)init
@@ -936,6 +1487,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; currency:%@; price:%@; priceTrailingDigit:%@; >",
+                  NSStringFromClass([self class]), _powerProfileId, _currency, _price, _priceTrailingDigit];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterEnergyPhasesScheduleStateNotificationParams
 - (instancetype)init
@@ -951,6 +1511,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: powerProfileId:%@; numOfScheduledPhases:%@; scheduledPhases:%@; >",
+                  NSStringFromClass([self class]), _powerProfileId, _numOfScheduledPhases, _scheduledPhases];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileScheduleConstraintsNotificationParams
 - (instancetype)init
@@ -966,6 +1535,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: powerProfileId:%@; startAfter:%@; stopBefore:%@; >",
+                                             NSStringFromClass([self class]), _powerProfileId, _startAfter, _stopBefore];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterPowerProfileScheduleConstraintsResponseParams
 - (instancetype)init
@@ -981,6 +1558,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: powerProfileId:%@; startAfter:%@; stopBefore:%@; >",
+                                             NSStringFromClass([self class]), _powerProfileId, _startAfter, _stopBefore];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPowerProfileClusterGetPowerProfilePriceExtendedParams
 - (instancetype)init
@@ -996,6 +1581,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: options:%@; powerProfileId:%@; powerProfileStartTime:%@; >",
+                                             NSStringFromClass([self class]), _options, _powerProfileId, _powerProfileStartTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterExecutionOfACommandParams
 - (instancetype)init
@@ -1007,6 +1600,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandId:%@; >", NSStringFromClass([self class]), _commandId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterSignalStateResponseParams
 - (instancetype)init
@@ -1022,6 +1622,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: applianceStatus:%@; remoteEnableFlagsAndDeviceStatus2:%@; applianceStatus2:%@; >",
+                  NSStringFromClass([self class]), _applianceStatus, _remoteEnableFlagsAndDeviceStatus2, _applianceStatus2];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterSignalStateParams
 - (instancetype)init
@@ -1031,6 +1640,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterSignalStateNotificationParams
 - (instancetype)init
@@ -1046,6 +1662,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: applianceStatus:%@; remoteEnableFlagsAndDeviceStatus2:%@; applianceStatus2:%@; >",
+                  NSStringFromClass([self class]), _applianceStatus, _remoteEnableFlagsAndDeviceStatus2, _applianceStatus2];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterWriteFunctionsParams
 - (instancetype)init
@@ -1061,6 +1686,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: functionId:%@; functionDataType:%@; functionData:%@; >",
+                                             NSStringFromClass([self class]), _functionId, _functionDataType, _functionData];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterOverloadPauseResumeParams
 - (instancetype)init
@@ -1070,6 +1703,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterOverloadPauseParams
 - (instancetype)init
@@ -1079,6 +1719,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPApplianceControlClusterOverloadWarningParams
 - (instancetype)init
@@ -1090,6 +1737,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: warningEvent:%@; >", NSStringFromClass([self class]), _warningEvent];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPollControlClusterCheckInParams
 - (instancetype)init
@@ -1099,6 +1754,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPollControlClusterCheckInResponseParams
 - (instancetype)init
@@ -1112,6 +1774,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: startFastPolling:%@; fastPollTimeout:%@; >",
+                                             NSStringFromClass([self class]), _startFastPolling, _fastPollTimeout];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPollControlClusterFastPollStopParams
 - (instancetype)init
@@ -1121,6 +1791,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPollControlClusterSetLongPollIntervalParams
 - (instancetype)init
@@ -1132,6 +1809,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: newLongPollInterval:%@; >", NSStringFromClass([self class]), _newLongPollInterval];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPPollControlClusterSetShortPollIntervalParams
 - (instancetype)init
@@ -1143,6 +1828,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: newShortPollInterval:%@; >", NSStringFromClass([self class]), _newShortPollInterval];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterInstantActionParams
 - (instancetype)init
@@ -1156,6 +1849,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterInstantActionWithTransitionParams
 - (instancetype)init
@@ -1171,6 +1872,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; transitionTime:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _transitionTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterStartActionParams
 - (instancetype)init
@@ -1184,6 +1893,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterStartActionWithDurationParams
 - (instancetype)init
@@ -1199,6 +1916,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; duration:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _duration];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterStopActionParams
 - (instancetype)init
@@ -1212,6 +1937,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterPauseActionParams
 - (instancetype)init
@@ -1225,6 +1958,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterPauseActionWithDurationParams
 - (instancetype)init
@@ -1240,6 +1981,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; duration:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _duration];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterResumeActionParams
 - (instancetype)init
@@ -1253,6 +2002,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterEnableActionParams
 - (instancetype)init
@@ -1266,6 +2023,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterEnableActionWithDurationParams
 - (instancetype)init
@@ -1281,6 +2046,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; duration:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _duration];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterDisableActionParams
 - (instancetype)init
@@ -1294,6 +2067,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; >", NSStringFromClass([self class]), _actionID, _invokeID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBridgedActionsClusterDisableActionWithDurationParams
 - (instancetype)init
@@ -1309,6 +2090,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; duration:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _duration];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBasicClusterMfgSpecificPingParams
 - (instancetype)init
@@ -1318,6 +2107,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOtaSoftwareUpdateProviderClusterQueryImageParams
 - (instancetype)init
@@ -1343,6 +2139,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: vendorId:%@; productId:%@; softwareVersion:%@; protocolsSupported:%@; "
+                                   @"hardwareVersion:%@; location:%@; requestorCanConsent:%@; metadataForProvider:%@; >",
+                  NSStringFromClass([self class]), _vendorId, _productId, _softwareVersion, _protocolsSupported, _hardwareVersion,
+                  _location, _requestorCanConsent, [_metadataForProvider base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams
 - (instancetype)init
@@ -1368,6 +2175,18 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; delayedActionTime:%@; imageURI:%@; softwareVersion:%@; "
+                                   @"softwareVersionString:%@; updateToken:%@; userConsentNeeded:%@; metadataForRequestor:%@; >",
+                  NSStringFromClass([self class]), _status, _delayedActionTime, _imageURI, _softwareVersion, _softwareVersionString,
+                  [_updateToken base64EncodedStringWithOptions:0], _userConsentNeeded,
+                  [_metadataForRequestor base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams
 - (instancetype)init
@@ -1381,6 +2200,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: updateToken:%@; newVersion:%@; >", NSStringFromClass([self class]),
+                  [_updateToken base64EncodedStringWithOptions:0], _newVersion];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams
 - (instancetype)init
@@ -1394,6 +2222,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: action:%@; delayedActionTime:%@; >", NSStringFromClass([self class]), _action, _delayedActionTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams
 - (instancetype)init
@@ -1407,6 +2243,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: updateToken:%@; softwareVersion:%@; >", NSStringFromClass([self class]),
+                  [_updateToken base64EncodedStringWithOptions:0], _softwareVersion];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams
 - (instancetype)init
@@ -1426,6 +2271,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: providerNodeId:%@; vendorId:%@; announcementReason:%@; metadataForNode:%@; endpoint:%@; >",
+        NSStringFromClass([self class]), _providerNodeId, _vendorId, _announcementReason,
+        [_metadataForNode base64EncodedStringWithOptions:0], _endpoint];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGeneralCommissioningClusterArmFailSafeParams
 - (instancetype)init
@@ -1439,6 +2294,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: expiryLengthSeconds:%@; breadcrumb:%@; >",
+                                             NSStringFromClass([self class]), _expiryLengthSeconds, _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGeneralCommissioningClusterArmFailSafeResponseParams
 - (instancetype)init
@@ -1452,6 +2315,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: errorCode:%@; debugText:%@; >", NSStringFromClass([self class]), _errorCode, _debugText];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGeneralCommissioningClusterSetRegulatoryConfigParams
 - (instancetype)init
@@ -1467,6 +2338,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newRegulatoryConfig:%@; countryCode:%@; breadcrumb:%@; >",
+                                             NSStringFromClass([self class]), _newRegulatoryConfig, _countryCode, _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams
 - (instancetype)init
@@ -1480,6 +2359,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: errorCode:%@; debugText:%@; >", NSStringFromClass([self class]), _errorCode, _debugText];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGeneralCommissioningClusterCommissioningCompleteParams
 - (instancetype)init
@@ -1489,6 +2376,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams
 - (instancetype)init
@@ -1502,6 +2396,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: errorCode:%@; debugText:%@; >", NSStringFromClass([self class]), _errorCode, _debugText];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterScanNetworksParams
 - (instancetype)init
@@ -1515,6 +2417,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: ssid:%@; breadcrumb:%@; >", NSStringFromClass([self class]),
+                                             [_ssid base64EncodedStringWithOptions:0], _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterScanNetworksResponseParams
 - (instancetype)init
@@ -1532,6 +2442,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: networkingStatus:%@; debugText:%@; wiFiScanResults:%@; threadScanResults:%@; >",
+                  NSStringFromClass([self class]), _networkingStatus, _debugText, _wiFiScanResults, _threadScanResults];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams
 - (instancetype)init
@@ -1547,6 +2466,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: ssid:%@; credentials:%@; breadcrumb:%@; >", NSStringFromClass([self class]),
+                  [_ssid base64EncodedStringWithOptions:0], [_credentials base64EncodedStringWithOptions:0], _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams
 - (instancetype)init
@@ -1560,6 +2488,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: operationalDataset:%@; breadcrumb:%@; >", NSStringFromClass([self class]),
+                  [_operationalDataset base64EncodedStringWithOptions:0], _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterRemoveNetworkParams
 - (instancetype)init
@@ -1573,6 +2510,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: networkID:%@; breadcrumb:%@; >", NSStringFromClass([self class]),
+                  [_networkID base64EncodedStringWithOptions:0], _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterNetworkConfigResponseParams
 - (instancetype)init
@@ -1588,6 +2534,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: networkingStatus:%@; debugText:%@; networkIndex:%@; >",
+                                             NSStringFromClass([self class]), _networkingStatus, _debugText, _networkIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterConnectNetworkParams
 - (instancetype)init
@@ -1601,6 +2555,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: networkID:%@; breadcrumb:%@; >", NSStringFromClass([self class]),
+                  [_networkID base64EncodedStringWithOptions:0], _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterConnectNetworkResponseParams
 - (instancetype)init
@@ -1616,6 +2579,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: networkingStatus:%@; debugText:%@; errorValue:%@; >",
+                                             NSStringFromClass([self class]), _networkingStatus, _debugText, _errorValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPNetworkCommissioningClusterReorderNetworkParams
 - (instancetype)init
@@ -1631,6 +2602,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: networkID:%@; networkIndex:%@; breadcrumb:%@; >", NSStringFromClass([self class]),
+                  [_networkID base64EncodedStringWithOptions:0], _networkIndex, _breadcrumb];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDiagnosticLogsClusterRetrieveLogsRequestParams
 - (instancetype)init
@@ -1646,6 +2626,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: intent:%@; requestedProtocol:%@; transferFileDesignator:%@; >",
+                                             NSStringFromClass([self class]), _intent, _requestedProtocol,
+                                             [_transferFileDesignator base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDiagnosticLogsClusterRetrieveLogsResponseParams
 - (instancetype)init
@@ -1663,17 +2652,39 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; content:%@; timeStamp:%@; timeSinceBoot:%@; >",
+                                             NSStringFromClass([self class]), _status, [_content base64EncodedStringWithOptions:0],
+                                             _timeStamp, _timeSinceBoot];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPSoftwareDiagnosticsClusterResetWatermarksParams
+@implementation CHIPGeneralDiagnosticsClusterTestEventTriggerParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _enableKey = [NSData data];
+
+        _eventTrigger = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: enableKey:%@; eventTrigger:%@; >", NSStringFromClass([self class]),
+                  [_enableKey base64EncodedStringWithOptions:0], _eventTrigger];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPThreadNetworkDiagnosticsClusterResetCountsParams
+@implementation CHIPSoftwareDiagnosticsClusterResetWatermarksParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -1681,6 +2692,29 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
+@end
+@implementation CHIPThreadNetworkDiagnosticsClusterResetCountsParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timedInvokeTimeoutMs = nil;
+    }
+    return self;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWiFiNetworkDiagnosticsClusterResetCountsParams
 - (instancetype)init
@@ -1690,6 +2724,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPEthernetNetworkDiagnosticsClusterResetCountsParams
 - (instancetype)init
@@ -1699,6 +2740,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams
 - (instancetype)init
@@ -1718,6 +2766,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: commissioningTimeout:%@; pakeVerifier:%@; discriminator:%@; iterations:%@; salt:%@; >",
+                  NSStringFromClass([self class]), _commissioningTimeout, [_pakeVerifier base64EncodedStringWithOptions:0],
+                  _discriminator, _iterations, [_salt base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams
 - (instancetype)init
@@ -1729,6 +2787,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: commissioningTimeout:%@; >", NSStringFromClass([self class]), _commissioningTimeout];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPAdministratorCommissioningClusterRevokeCommissioningParams
 - (instancetype)init
@@ -1738,6 +2804,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterAttestationRequestParams
 - (instancetype)init
@@ -1749,6 +2822,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: attestationNonce:%@; >", NSStringFromClass([self class]),
+                                             [_attestationNonce base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterAttestationResponseParams
 - (instancetype)init
@@ -1762,6 +2843,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: attestationElements:%@; signature:%@; >", NSStringFromClass([self class]),
+                  [_attestationElements base64EncodedStringWithOptions:0], [_signature base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterCertificateChainRequestParams
 - (instancetype)init
@@ -1773,6 +2863,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: certificateType:%@; >", NSStringFromClass([self class]), _certificateType];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterCertificateChainResponseParams
 - (instancetype)init
@@ -1784,6 +2882,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: certificate:%@; >", NSStringFromClass([self class]),
+                                             [_certificate base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterCSRRequestParams
 - (instancetype)init
@@ -1791,10 +2897,21 @@ - (instancetype)init
     if (self = [super init]) {
 
         _csrNonce = [NSData data];
+
+        _isForUpdateNOC = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: csrNonce:%@; isForUpdateNOC:%@; >", NSStringFromClass([self class]),
+                  [_csrNonce base64EncodedStringWithOptions:0], _isForUpdateNOC];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterCSRResponseParams
 - (instancetype)init
@@ -1808,6 +2925,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: nocsrElements:%@; attestationSignature:%@; >", NSStringFromClass([self class]),
+                  [_nocsrElements base64EncodedStringWithOptions:0], [_attestationSignature base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterAddNOCParams
 - (instancetype)init
@@ -1820,13 +2946,24 @@ - (instancetype)init
 
         _ipkValue = [NSData data];
 
-        _caseAdminNode = @(0);
+        _caseAdminSubject = @(0);
 
         _adminVendorId = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: nocValue:%@; icacValue:%@; ipkValue:%@; caseAdminSubject:%@; adminVendorId:%@; >",
+                  NSStringFromClass([self class]), [_nocValue base64EncodedStringWithOptions:0],
+                  [_icacValue base64EncodedStringWithOptions:0], [_ipkValue base64EncodedStringWithOptions:0], _caseAdminSubject,
+                  _adminVendorId];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterUpdateNOCParams
 - (instancetype)init
@@ -1840,6 +2977,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: nocValue:%@; icacValue:%@; >", NSStringFromClass([self class]),
+                  [_nocValue base64EncodedStringWithOptions:0], [_icacValue base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterNOCResponseParams
 - (instancetype)init
@@ -1855,6 +3001,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: statusCode:%@; fabricIndex:%@; debugText:%@; >",
+                                             NSStringFromClass([self class]), _statusCode, _fabricIndex, _debugText];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterUpdateFabricLabelParams
 - (instancetype)init
@@ -1866,6 +3020,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: label:%@; >", NSStringFromClass([self class]), _label];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterRemoveFabricParams
 - (instancetype)init
@@ -1877,6 +3038,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: fabricIndex:%@; >", NSStringFromClass([self class]), _fabricIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams
 - (instancetype)init
@@ -1888,17 +3057,14 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPOperationalCredentialsClusterRemoveTrustedRootCertificateParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _trustedRootIdentifier = [NSData data];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: rootCertificate:%@; >", NSStringFromClass([self class]),
+                                             [_rootCertificate base64EncodedStringWithOptions:0]];
+    return descriptionString;
 }
+
 @end
 @implementation CHIPGroupKeyManagementClusterKeySetWriteParams
 - (instancetype)init
@@ -1910,6 +3076,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupKeySet:%@; >", NSStringFromClass([self class]), _groupKeySet];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupKeyManagementClusterKeySetReadParams
 - (instancetype)init
@@ -1921,6 +3095,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupKeySetID:%@; >", NSStringFromClass([self class]), _groupKeySetID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupKeyManagementClusterKeySetReadResponseParams
 - (instancetype)init
@@ -1932,6 +3114,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupKeySet:%@; >", NSStringFromClass([self class]), _groupKeySet];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupKeyManagementClusterKeySetRemoveParams
 - (instancetype)init
@@ -1943,6 +3133,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupKeySetID:%@; >", NSStringFromClass([self class]), _groupKeySetID];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams
 - (instancetype)init
@@ -1954,6 +3152,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupKeySetIDs:%@; >", NSStringFromClass([self class]), _groupKeySetIDs];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams
 - (instancetype)init
@@ -1965,6 +3171,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: groupKeySetIDs:%@; >", NSStringFromClass([self class]), _groupKeySetIDs];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPModeSelectClusterChangeToModeParams
 - (instancetype)init
@@ -1976,177 +3190,72 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterLockDoorParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _pinCode = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterUnlockDoorParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _pinCode = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
+    return descriptionString;
 }
-@end
-@implementation CHIPDoorLockClusterUnlockWithTimeoutParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _timeout = @(0);
 
-        _pinCode = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
 @end
-@implementation CHIPDoorLockClusterGetLogRecordParams
+@implementation CHIPDoorLockClusterLockDoorParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _logIndex = @(0);
+        _pinCode = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterGetLogRecordResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _logEntryId = @(0);
-
-        _timestamp = @(0);
-
-        _eventType = @(0);
-
-        _source = @(0);
-
-        _eventIdOrAlarmCode = @(0);
-
-        _userId = @(0);
-
-        _pin = [NSData data];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterSetPINCodeParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _userId = @(0);
-
-        _userStatus = nil;
-
-        _userType = nil;
-
-        _pin = [NSData data];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: pinCode:%@; >", NSStringFromClass([self class]), [_pinCode base64EncodedStringWithOptions:0]];
+    return descriptionString;
 }
-@end
-@implementation CHIPDoorLockClusterGetPINCodeParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _userId = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
 @end
-@implementation CHIPDoorLockClusterGetPINCodeResponseParams
+@implementation CHIPDoorLockClusterUnlockDoorParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _userId = @(0);
-
-        _userStatus = nil;
-
-        _userType = nil;
-
-        _pin = nil;
+        _pinCode = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterClearPINCodeParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _pinSlotIndex = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterClearAllPINCodesParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: pinCode:%@; >", NSStringFromClass([self class]), [_pinCode base64EncodedStringWithOptions:0]];
+    return descriptionString;
 }
+
 @end
-@implementation CHIPDoorLockClusterSetUserStatusParams
+@implementation CHIPDoorLockClusterUnlockWithTimeoutParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _userId = @(0);
+        _timeout = @(0);
 
-        _userStatus = @(0);
+        _pinCode = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterGetUserStatusParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _userId = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterGetUserStatusResponseParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _userId = @(0);
-
-        _userStatus = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: timeout:%@; pinCode:%@; >", NSStringFromClass([self class]),
+                                             _timeout, [_pinCode base64EncodedStringWithOptions:0]];
+    return descriptionString;
 }
+
 @end
 @implementation CHIPDoorLockClusterSetWeekDayScheduleParams
 - (instancetype)init
@@ -2170,6 +3279,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: weekDayIndex:%@; userIndex:%@; daysMask:%@; startHour:%@; startMinute:%@; endHour:%@; endMinute:%@; >",
+        NSStringFromClass([self class]), _weekDayIndex, _userIndex, _daysMask, _startHour, _startMinute, _endHour, _endMinute];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetWeekDayScheduleParams
 - (instancetype)init
@@ -2183,6 +3302,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: weekDayIndex:%@; userIndex:%@; >", NSStringFromClass([self class]), _weekDayIndex, _userIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetWeekDayScheduleResponseParams
 - (instancetype)init
@@ -2208,6 +3335,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: weekDayIndex:%@; userIndex:%@; status:%@; daysMask:%@; "
+                                                              @"startHour:%@; startMinute:%@; endHour:%@; endMinute:%@; >",
+                                             NSStringFromClass([self class]), _weekDayIndex, _userIndex, _status, _daysMask,
+                                             _startHour, _startMinute, _endHour, _endMinute];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterClearWeekDayScheduleParams
 - (instancetype)init
@@ -2221,6 +3358,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: weekDayIndex:%@; userIndex:%@; >", NSStringFromClass([self class]), _weekDayIndex, _userIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterSetYearDayScheduleParams
 - (instancetype)init
@@ -2238,6 +3383,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: yearDayIndex:%@; userIndex:%@; localStartTime:%@; localEndTime:%@; >",
+                  NSStringFromClass([self class]), _yearDayIndex, _userIndex, _localStartTime, _localEndTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetYearDayScheduleParams
 - (instancetype)init
@@ -2251,6 +3405,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: yearDayIndex:%@; userIndex:%@; >", NSStringFromClass([self class]), _yearDayIndex, _userIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetYearDayScheduleResponseParams
 - (instancetype)init
@@ -2270,6 +3432,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: yearDayIndex:%@; userIndex:%@; status:%@; localStartTime:%@; localEndTime:%@; >",
+                  NSStringFromClass([self class]), _yearDayIndex, _userIndex, _status, _localStartTime, _localEndTime];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterClearYearDayScheduleParams
 - (instancetype)init
@@ -2283,6 +3454,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: yearDayIndex:%@; userIndex:%@; >", NSStringFromClass([self class]), _yearDayIndex, _userIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterSetHolidayScheduleParams
 - (instancetype)init
@@ -2300,6 +3479,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: holidayIndex:%@; localStartTime:%@; localEndTime:%@; operatingMode:%@; >",
+                  NSStringFromClass([self class]), _holidayIndex, _localStartTime, _localEndTime, _operatingMode];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetHolidayScheduleParams
 - (instancetype)init
@@ -2311,6 +3499,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: holidayIndex:%@; >", NSStringFromClass([self class]), _holidayIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetHolidayScheduleResponseParams
 - (instancetype)init
@@ -2330,119 +3526,34 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterClearHolidayScheduleParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _holidayIndex = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterSetUserTypeParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _userId = @(0);
 
-        _userType = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterGetUserTypeParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _userId = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: holidayIndex:%@; status:%@; localStartTime:%@; localEndTime:%@; operatingMode:%@; >",
+                  NSStringFromClass([self class]), _holidayIndex, _status, _localStartTime, _localEndTime, _operatingMode];
+    return descriptionString;
 }
-@end
-@implementation CHIPDoorLockClusterGetUserTypeResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _userId = @(0);
 
-        _userType = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
 @end
-@implementation CHIPDoorLockClusterSetRFIDCodeParams
+@implementation CHIPDoorLockClusterClearHolidayScheduleParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _userId = @(0);
-
-        _userStatus = nil;
-
-        _userType = nil;
-
-        _rfidCode = [NSData data];
+        _holidayIndex = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterGetRFIDCodeParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _userId = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterGetRFIDCodeResponseParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _userId = @(0);
-
-        _userStatus = nil;
-
-        _userType = nil;
-
-        _rfidCode = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: holidayIndex:%@; >", NSStringFromClass([self class]), _holidayIndex];
+    return descriptionString;
 }
-@end
-@implementation CHIPDoorLockClusterClearRFIDCodeParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _rfidSlotIndex = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterClearAllRFIDCodesParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
 @end
 @implementation CHIPDoorLockClusterSetUserParams
 - (instancetype)init
@@ -2466,6 +3577,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: operationType:%@; userIndex:%@; userName:%@; userUniqueId:%@; userStatus:%@; userType:%@; credentialRule:%@; >",
+        NSStringFromClass([self class]), _operationType, _userIndex, _userName, _userUniqueId, _userStatus, _userType,
+        _credentialRule];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetUserParams
 - (instancetype)init
@@ -2477,6 +3599,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: userIndex:%@; >", NSStringFromClass([self class]), _userIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetUserResponseParams
 - (instancetype)init
@@ -2506,6 +3635,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: userIndex:%@; userName:%@; userUniqueId:%@; userStatus:%@; userType:%@; credentialRule:%@; "
+                         @"credentials:%@; creatorFabricIndex:%@; lastModifiedFabricIndex:%@; nextUserIndex:%@; >",
+        NSStringFromClass([self class]), _userIndex, _userName, _userUniqueId, _userStatus, _userType, _credentialRule,
+        _credentials, _creatorFabricIndex, _lastModifiedFabricIndex, _nextUserIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterClearUserParams
 - (instancetype)init
@@ -2517,52 +3657,13 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPDoorLockClusterOperatingEventNotificationParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _operationEventSource = @(0);
 
-        _operationEventCode = @(0);
-
-        _userId = @(0);
-
-        _pin = [NSData data];
-
-        _localTime = @(0);
-
-        _data = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPDoorLockClusterProgrammingEventNotificationParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _programEventSource = @(0);
-
-        _programEventCode = @(0);
-
-        _userId = @(0);
-
-        _pin = [NSData data];
-
-        _userType = @(0);
-
-        _userStatus = @(0);
-
-        _localTime = @(0);
-
-        _data = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: userIndex:%@; >", NSStringFromClass([self class]), _userIndex];
+    return descriptionString;
 }
+
 @end
 @implementation CHIPDoorLockClusterSetCredentialParams
 - (instancetype)init
@@ -2584,6 +3685,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: operationType:%@; credential:%@; credentialData:%@; userIndex:%@; userStatus:%@; userType:%@; >",
+        NSStringFromClass([self class]), _operationType, _credential, [_credentialData base64EncodedStringWithOptions:0],
+        _userIndex, _userStatus, _userType];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterSetCredentialResponseParams
 - (instancetype)init
@@ -2599,6 +3710,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; userIndex:%@; nextCredentialIndex:%@; >",
+                                             NSStringFromClass([self class]), _status, _userIndex, _nextCredentialIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetCredentialStatusParams
 - (instancetype)init
@@ -2610,6 +3729,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: credential:%@; >", NSStringFromClass([self class]), _credential];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterGetCredentialStatusResponseParams
 - (instancetype)init
@@ -2629,6 +3756,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: credentialExists:%@; userIndex:%@; creatorFabricIndex:%@; lastModifiedFabricIndex:%@; nextCredentialIndex:%@; >",
+        NSStringFromClass([self class]), _credentialExists, _userIndex, _creatorFabricIndex, _lastModifiedFabricIndex,
+        _nextCredentialIndex];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPDoorLockClusterClearCredentialParams
 - (instancetype)init
@@ -2640,6 +3778,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: credential:%@; >", NSStringFromClass([self class]), _credential];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterUpOrOpenParams
 - (instancetype)init
@@ -2649,6 +3795,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterDownOrCloseParams
 - (instancetype)init
@@ -2658,6 +3811,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterStopMotionParams
 - (instancetype)init
@@ -2667,6 +3827,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterGoToLiftValueParams
 - (instancetype)init
@@ -2678,6 +3845,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: liftValue:%@; >", NSStringFromClass([self class]), _liftValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterGoToLiftPercentageParams
 - (instancetype)init
@@ -2689,6 +3863,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: liftPercent100thsValue:%@; >", NSStringFromClass([self class]), _liftPercent100thsValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterGoToTiltValueParams
 - (instancetype)init
@@ -2700,6 +3882,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: tiltValue:%@; >", NSStringFromClass([self class]), _tiltValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPWindowCoveringClusterGoToTiltPercentageParams
 - (instancetype)init
@@ -2711,6 +3900,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: tiltPercent100thsValue:%@; >", NSStringFromClass([self class]), _tiltPercent100thsValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBarrierControlClusterBarrierControlGoToPercentParams
 - (instancetype)init
@@ -2722,6 +3919,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: percentOpen:%@; >", NSStringFromClass([self class]), _percentOpen];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPBarrierControlClusterBarrierControlStopParams
 - (instancetype)init
@@ -2731,6 +3936,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPThermostatClusterSetpointRaiseLowerParams
 - (instancetype)init
@@ -2744,6 +3956,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: mode:%@; amount:%@; >", NSStringFromClass([self class]), _mode, _amount];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPThermostatClusterGetWeeklyScheduleResponseParams
 - (instancetype)init
@@ -2761,6 +3981,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: numberOfTransitionsForSequence:%@; dayOfWeekForSequence:%@; modeForSequence:%@; transitions:%@; >",
+        NSStringFromClass([self class]), _numberOfTransitionsForSequence, _dayOfWeekForSequence, _modeForSequence, _transitions];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPThermostatClusterSetWeeklyScheduleParams
 - (instancetype)init
@@ -2778,27 +4007,15 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPThermostatClusterGetRelayStatusLogResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _timeOfDay = @(0);
-
-        _relayStatus = @(0);
-
-        _localTemperature = @(0);
 
-        _humidityInPercentage = @(0);
-
-        _setpoint = @(0);
-
-        _unreadEntries = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: numberOfTransitionsForSequence:%@; dayOfWeekForSequence:%@; modeForSequence:%@; transitions:%@; >",
+        NSStringFromClass([self class]), _numberOfTransitionsForSequence, _dayOfWeekForSequence, _modeForSequence, _transitions];
+    return descriptionString;
 }
+
 @end
 @implementation CHIPThermostatClusterGetWeeklyScheduleParams
 - (instancetype)init
@@ -2812,6 +4029,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: daysToReturn:%@; modeToReturn:%@; >",
+                                             NSStringFromClass([self class]), _daysToReturn, _modeToReturn];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPThermostatClusterClearWeeklyScheduleParams
 - (instancetype)init
@@ -2821,15 +4046,13 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPThermostatClusterGetRelayStatusLogParams
-- (instancetype)init
+
+- (NSString *)description
 {
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
 }
+
 @end
 @implementation CHIPColorControlClusterMoveToHueParams
 - (instancetype)init
@@ -2849,6 +4072,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: hue:%@; direction:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _hue, _direction, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveHueParams
 - (instancetype)init
@@ -2866,6 +4098,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionsMask:%@; optionsOverride:%@; >",
+                                             NSStringFromClass([self class]), _moveMode, _rate, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterStepHueParams
 - (instancetype)init
@@ -2885,6 +4125,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveToSaturationParams
 - (instancetype)init
@@ -2902,6 +4151,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: saturation:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _saturation, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveSaturationParams
 - (instancetype)init
@@ -2919,6 +4177,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionsMask:%@; optionsOverride:%@; >",
+                                             NSStringFromClass([self class]), _moveMode, _rate, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterStepSaturationParams
 - (instancetype)init
@@ -2938,6 +4204,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveToHueAndSaturationParams
 - (instancetype)init
@@ -2957,6 +4232,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: hue:%@; saturation:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _hue, _saturation, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveToColorParams
 - (instancetype)init
@@ -2976,6 +4260,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: colorX:%@; colorY:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _colorX, _colorY, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveColorParams
 - (instancetype)init
@@ -2993,6 +4286,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: rateX:%@; rateY:%@; optionsMask:%@; optionsOverride:%@; >",
+                                             NSStringFromClass([self class]), _rateX, _rateY, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterStepColorParams
 - (instancetype)init
@@ -3012,7 +4313,16 @@ - (instancetype)init
     }
     return self;
 }
-@end
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stepX:%@; stepY:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _stepX, _stepY, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
+@end
 @implementation CHIPColorControlClusterMoveToColorTemperatureParams
 - (instancetype)init
 {
@@ -3029,6 +4339,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: colorTemperature:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _colorTemperature, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterEnhancedMoveToHueParams
 - (instancetype)init
@@ -3048,6 +4367,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: enhancedHue:%@; direction:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _enhancedHue, _direction, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterEnhancedMoveHueParams
 - (instancetype)init
@@ -3065,6 +4393,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; optionsMask:%@; optionsOverride:%@; >",
+                                             NSStringFromClass([self class]), _moveMode, _rate, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterEnhancedStepHueParams
 - (instancetype)init
@@ -3084,6 +4420,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams
 - (instancetype)init
@@ -3103,6 +4448,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: enhancedHue:%@; saturation:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _enhancedHue, _saturation, _transitionTime, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterColorLoopSetParams
 - (instancetype)init
@@ -3126,6 +4480,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: updateFlags:%@; action:%@; direction:%@; time:%@; startHue:%@; optionsMask:%@; optionsOverride:%@; >",
+        NSStringFromClass([self class]), _updateFlags, _action, _direction, _time, _startHue, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterStopMoveStepParams
 - (instancetype)init
@@ -3139,6 +4503,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: optionsMask:%@; optionsOverride:%@; >",
+                                             NSStringFromClass([self class]), _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterMoveColorTemperatureParams
 - (instancetype)init
@@ -3160,6 +4532,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: moveMode:%@; rate:%@; colorTemperatureMinimumMireds:%@; "
+                                   @"colorTemperatureMaximumMireds:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _moveMode, _rate, _colorTemperatureMinimumMireds, _colorTemperatureMaximumMireds,
+                  _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPColorControlClusterStepColorTemperatureParams
 - (instancetype)init
@@ -3183,82 +4566,139 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stepMode:%@; stepSize:%@; transitionTime:%@; colorTemperatureMinimumMireds:%@; "
+                                   @"colorTemperatureMaximumMireds:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _stepMode, _stepSize, _transitionTime, _colorTemperatureMinimumMireds,
+                  _colorTemperatureMaximumMireds, _optionsMask, _optionsOverride];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterZoneEnrollResponseParams
+@implementation CHIPChannelClusterChangeChannelParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _enrollResponseCode = @(0);
-
-        _zoneId = @(0);
+        _match = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: match:%@; >", NSStringFromClass([self class]), _match];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterZoneStatusChangeNotificationParams
+@implementation CHIPChannelClusterChangeChannelResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _zoneStatus = @(0);
-
-        _extendedStatus = @(0);
-
-        _zoneId = @(0);
+        _status = @(0);
 
-        _delay = @(0);
+        _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; data:%@; >", NSStringFromClass([self class]), _status, _data];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterInitiateNormalOperationModeParams
+@implementation CHIPChannelClusterChangeChannelByNumberParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _majorNumber = @(0);
+
+        _minorNumber = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: majorNumber:%@; minorNumber:%@; >", NSStringFromClass([self class]), _majorNumber, _minorNumber];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterZoneEnrollRequestParams
+@implementation CHIPChannelClusterSkipChannelParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _zoneType = @(0);
-
-        _manufacturerCode = @(0);
+        _count = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: count:%@; >", NSStringFromClass([self class]), _count];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterInitiateTestModeParams
+@implementation CHIPTargetNavigatorClusterNavigateTargetParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _testModeDuration = @(0);
+        _target = @(0);
 
-        _currentZoneSensitivityLevel = @(0);
+        _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: target:%@; data:%@; >", NSStringFromClass([self class]), _target, _data];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterInitiateNormalOperationModeResponseParams
+@implementation CHIPTargetNavigatorClusterNavigateTargetResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _status = @(0);
+
+        _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; data:%@; >", NSStringFromClass([self class]), _status, _data];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasZoneClusterInitiateTestModeResponseParams
+@implementation CHIPMediaPlaybackClusterPlayParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3266,90 +4706,79 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterArmParams
+@implementation CHIPMediaPlaybackClusterPauseParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _armMode = @(0);
-
-        _armDisarmCode = @"";
-
-        _zoneId = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterArmResponseParams
+@implementation CHIPMediaPlaybackClusterStopPlaybackParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _armNotification = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterBypassParams
+@implementation CHIPMediaPlaybackClusterStartOverParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _numberOfZones = @(0);
-
-        _zoneIds = [NSArray array];
-
-        _armDisarmCode = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetZoneIdMapResponseParams
+@implementation CHIPMediaPlaybackClusterPreviousParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _section0 = @(0);
-
-        _section1 = @(0);
-
-        _section2 = @(0);
-
-        _section3 = @(0);
-
-        _section4 = @(0);
-
-        _section5 = @(0);
-
-        _section6 = @(0);
-
-        _section7 = @(0);
-
-        _section8 = @(0);
-
-        _section9 = @(0);
-
-        _section10 = @(0);
-
-        _section11 = @(0);
-
-        _section12 = @(0);
-
-        _section13 = @(0);
-
-        _section14 = @(0);
-
-        _section15 = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterEmergencyParams
+@implementation CHIPMediaPlaybackClusterNextParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3357,25 +4786,31 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetZoneInformationResponseParams
+@implementation CHIPMediaPlaybackClusterRewindParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _zoneId = @(0);
-
-        _zoneType = @(0);
-
-        _ieeeAddress = @(0);
-
-        _zoneLabel = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterFireParams
+@implementation CHIPMediaPlaybackClusterFastForwardParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3383,101 +4818,126 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterZoneStatusChangedParams
+@implementation CHIPMediaPlaybackClusterSkipForwardParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _zoneId = @(0);
-
-        _zoneStatus = @(0);
-
-        _audibleNotification = @(0);
-
-        _zoneLabel = @"";
+        _deltaPositionMilliseconds = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: deltaPositionMilliseconds:%@; >", NSStringFromClass([self class]), _deltaPositionMilliseconds];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterPanicParams
+@implementation CHIPMediaPlaybackClusterSkipBackwardParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _deltaPositionMilliseconds = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: deltaPositionMilliseconds:%@; >", NSStringFromClass([self class]), _deltaPositionMilliseconds];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterPanelStatusChangedParams
+@implementation CHIPMediaPlaybackClusterPlaybackResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _panelStatus = @(0);
-
-        _secondsRemaining = @(0);
-
-        _audibleNotification = @(0);
+        _status = @(0);
 
-        _alarmStatus = @(0);
+        _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPIasAceClusterGetZoneIdMapParams
-- (instancetype)init
+
+- (NSString *)description
 {
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; data:%@; >", NSStringFromClass([self class]), _status, _data];
+    return descriptionString;
 }
+
 @end
-@implementation CHIPIasAceClusterGetPanelStatusResponseParams
+@implementation CHIPMediaPlaybackClusterSeekParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _panelStatus = @(0);
-
-        _secondsRemaining = @(0);
-
-        _audibleNotification = @(0);
-
-        _alarmStatus = @(0);
+        _position = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: position:%@; >", NSStringFromClass([self class]), _position];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetZoneInformationParams
+@implementation CHIPMediaInputClusterSelectInputParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _zoneId = @(0);
+        _index = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: index:%@; >", NSStringFromClass([self class]), _index];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterSetBypassedZoneListParams
+@implementation CHIPMediaInputClusterShowInputStatusParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _numberOfZones = @(0);
-
-        _zoneIds = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetPanelStatusParams
+@implementation CHIPMediaInputClusterHideInputStatusParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3485,21 +4945,36 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterBypassResponseParams
+@implementation CHIPMediaInputClusterRenameInputParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _numberOfZones = @(0);
+        _index = @(0);
 
-        _bypassResult = [NSArray array];
+        _name = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: index:%@; name:%@; >", NSStringFromClass([self class]), _index, _name];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetBypassedZoneListParams
+@implementation CHIPLowPowerClusterSleepParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3507,79 +4982,97 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetZoneStatusResponseParams
+@implementation CHIPKeypadInputClusterSendKeyParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _zoneStatusComplete = @(0);
-
-        _numberOfZones = @(0);
-
-        _zoneStatusResult = [NSArray array];
+        _keyCode = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: keyCode:%@; >", NSStringFromClass([self class]), _keyCode];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasAceClusterGetZoneStatusParams
+@implementation CHIPKeypadInputClusterSendKeyResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _startingZoneId = @(0);
-
-        _maxNumberOfZoneIds = @(0);
-
-        _zoneStatusMaskFlag = @(0);
-
-        _zoneStatusMask = @(0);
+        _status = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; >", NSStringFromClass([self class]), _status];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasWdClusterStartWarningParams
+@implementation CHIPContentLauncherClusterLaunchContentParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _warningInfo = @(0);
-
-        _warningDuration = @(0);
+        _search = [CHIPContentLauncherClusterContentSearch new];
 
-        _strobeDutyCycle = @(0);
+        _autoPlay = @(0);
 
-        _strobeLevel = @(0);
+        _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: search:%@; autoPlay:%@; data:%@; >", NSStringFromClass([self class]), _search, _autoPlay, _data];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPIasWdClusterSquawkParams
+@implementation CHIPContentLauncherClusterLaunchURLParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _squawkInfo = @(0);
+        _contentURL = @"";
+
+        _displayString = nil;
+
+        _brandingInformation = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPChannelClusterChangeChannelParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _match = @"";
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: contentURL:%@; displayString:%@; brandingInformation:%@; >",
+                                             NSStringFromClass([self class]), _contentURL, _displayString, _brandingInformation];
+    return descriptionString;
 }
+
 @end
-@implementation CHIPChannelClusterChangeChannelResponseParams
+@implementation CHIPContentLauncherClusterLaunchResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3591,103 +5084,193 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: status:%@; data:%@; >", NSStringFromClass([self class]), _status, _data];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPChannelClusterChangeChannelByNumberParams
+@implementation CHIPAudioOutputClusterSelectOutputParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _majorNumber = @(0);
-
-        _minorNumber = @(0);
+        _index = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: index:%@; >", NSStringFromClass([self class]), _index];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPChannelClusterSkipChannelParams
+@implementation CHIPAudioOutputClusterRenameOutputParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _count = @(0);
+        _index = @(0);
+
+        _name = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: index:%@; name:%@; >", NSStringFromClass([self class]), _index, _name];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPTargetNavigatorClusterNavigateTargetParams
+@implementation CHIPApplicationLauncherClusterLaunchAppParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _target = @(0);
+        _application = [CHIPApplicationLauncherClusterApplication new];
 
         _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: application:%@; data:%@; >", NSStringFromClass([self class]),
+                                             _application, [_data base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPTargetNavigatorClusterNavigateTargetResponseParams
+@implementation CHIPApplicationLauncherClusterStopAppParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _status = @(0);
-
-        _data = nil;
+        _application = [CHIPApplicationLauncherClusterApplication new];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: application:%@; >", NSStringFromClass([self class]), _application];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterPlayParams
+@implementation CHIPApplicationLauncherClusterHideAppParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _application = [CHIPApplicationLauncherClusterApplication new];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: application:%@; >", NSStringFromClass([self class]), _application];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterPauseParams
+@implementation CHIPApplicationLauncherClusterLauncherResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _status = @(0);
+
+        _data = [NSData data];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; data:%@; >", NSStringFromClass([self class]),
+                                             _status, [_data base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterStopPlaybackParams
+@implementation CHIPAccountLoginClusterGetSetupPINParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _tempAccountIdentifier = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: tempAccountIdentifier:%@; >", NSStringFromClass([self class]), _tempAccountIdentifier];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterStartOverParams
+@implementation CHIPAccountLoginClusterGetSetupPINResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _setupPIN = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: setupPIN:%@; >", NSStringFromClass([self class]), _setupPIN];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterPreviousParams
+@implementation CHIPAccountLoginClusterLoginParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _tempAccountIdentifier = @"";
+
+        _setupPIN = @"";
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: tempAccountIdentifier:%@; setupPIN:%@; >",
+                                             NSStringFromClass([self class]), _tempAccountIdentifier, _setupPIN];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterNextParams
+@implementation CHIPAccountLoginClusterLogoutParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3695,17 +5278,47 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterRewindParams
+@implementation CHIPMessagingClusterDisplayMessageParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _messageId = @(0);
+
+        _messageControl = @(0);
+
+        _startTime = @(0);
+
+        _durationInMinutes = @(0);
+
+        _message = @"";
+
+        _optionalExtendedMessageControl = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: messageId:%@; messageControl:%@; startTime:%@; durationInMinutes:%@; message:%@; "
+                                   @"optionalExtendedMessageControl:%@; >",
+                  NSStringFromClass([self class]), _messageId, _messageControl, _startTime, _durationInMinutes, _message,
+                  _optionalExtendedMessageControl];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterFastForwardParams
+@implementation CHIPMessagingClusterGetLastMessageParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3713,65 +5326,133 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterSkipForwardParams
+@implementation CHIPMessagingClusterCancelMessageParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _deltaPositionMilliseconds = @(0);
+        _messageId = @(0);
+
+        _messageControl = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: messageId:%@; messageControl:%@; >", NSStringFromClass([self class]), _messageId, _messageControl];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterSkipBackwardParams
+@implementation CHIPMessagingClusterMessageConfirmationParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _deltaPositionMilliseconds = @(0);
+        _messageId = @(0);
+
+        _confirmationTime = @(0);
+
+        _messageConfirmationControl = @(0);
+
+        _messageResponse = [NSData data];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: messageId:%@; confirmationTime:%@; messageConfirmationControl:%@; messageResponse:%@; >",
+                  NSStringFromClass([self class]), _messageId, _confirmationTime, _messageConfirmationControl,
+                  [_messageResponse base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterPlaybackResponseParams
+@implementation CHIPMessagingClusterDisplayProtectedMessageParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _status = @(0);
+        _messageId = @(0);
 
-        _data = nil;
+        _messageControl = @(0);
+
+        _startTime = @(0);
+
+        _durationInMinutes = @(0);
+
+        _message = @"";
+
+        _optionalExtendedMessageControl = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: messageId:%@; messageControl:%@; startTime:%@; durationInMinutes:%@; message:%@; "
+                                   @"optionalExtendedMessageControl:%@; >",
+                  NSStringFromClass([self class]), _messageId, _messageControl, _startTime, _durationInMinutes, _message,
+                  _optionalExtendedMessageControl];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaPlaybackClusterSeekParams
+@implementation CHIPMessagingClusterGetMessageCancellationParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _position = @(0);
+        _earliestImplementationTime = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: earliestImplementationTime:%@; >", NSStringFromClass([self class]), _earliestImplementationTime];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaInputClusterSelectInputParams
+@implementation CHIPMessagingClusterCancelAllMessagesParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _index = @(0);
+        _implementationDateTime = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: implementationDateTime:%@; >", NSStringFromClass([self class]), _implementationDateTime];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaInputClusterShowInputStatusParams
+@implementation CHIPApplianceEventsAndAlertClusterGetAlertsParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3779,218 +5460,298 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaInputClusterHideInputStatusParams
+@implementation CHIPApplianceEventsAndAlertClusterGetAlertsResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _alertsCount = @(0);
+
+        _alertStructures = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alertsCount:%@; alertStructures:%@; >",
+                                             NSStringFromClass([self class]), _alertsCount, _alertStructures];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPMediaInputClusterRenameInputParams
+@implementation CHIPApplianceEventsAndAlertClusterAlertsNotificationParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _index = @(0);
+        _alertsCount = @(0);
 
-        _name = @"";
+        _alertStructures = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alertsCount:%@; alertStructures:%@; >",
+                                             NSStringFromClass([self class]), _alertsCount, _alertStructures];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPLowPowerClusterSleepParams
+@implementation CHIPApplianceEventsAndAlertClusterEventsNotificationParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _eventHeader = @(0);
+
+        _eventId = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: eventHeader:%@; eventId:%@; >", NSStringFromClass([self class]), _eventHeader, _eventId];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPKeypadInputClusterSendKeyParams
+@implementation CHIPApplianceStatisticsClusterLogNotificationParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _keyCode = @(0);
+        _timeStamp = @(0);
+
+        _logId = @(0);
+
+        _logLength = @(0);
+
+        _logPayload = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: timeStamp:%@; logId:%@; logLength:%@; logPayload:%@; >",
+                                             NSStringFromClass([self class]), _timeStamp, _logId, _logLength, _logPayload];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPKeypadInputClusterSendKeyResponseParams
+@implementation CHIPApplianceStatisticsClusterLogRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _status = @(0);
+        _logId = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: logId:%@; >", NSStringFromClass([self class]), _logId];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPContentLauncherClusterLaunchContentParams
+@implementation CHIPApplianceStatisticsClusterLogResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _search = [CHIPContentLauncherClusterContentSearch new];
+        _timeStamp = @(0);
 
-        _autoPlay = @(0);
+        _logId = @(0);
 
-        _data = nil;
+        _logLength = @(0);
+
+        _logPayload = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPContentLauncherClusterLaunchURLParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _contentURL = @"";
-
-        _displayString = nil;
 
-        _brandingInformation = nil;
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: timeStamp:%@; logId:%@; logLength:%@; logPayload:%@; >",
+                                             NSStringFromClass([self class]), _timeStamp, _logId, _logLength, _logPayload];
+    return descriptionString;
 }
+
 @end
-@implementation CHIPContentLauncherClusterLaunchResponseParams
+@implementation CHIPApplianceStatisticsClusterLogQueueRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _status = @(0);
-
-        _data = nil;
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPAudioOutputClusterSelectOutputParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _index = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
 }
+
 @end
-@implementation CHIPAudioOutputClusterRenameOutputParams
+@implementation CHIPApplianceStatisticsClusterLogQueueResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _index = @(0);
+        _logQueueSize = @(0);
 
-        _name = @"";
+        _logIds = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: logQueueSize:%@; logIds:%@; >", NSStringFromClass([self class]), _logQueueSize, _logIds];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPApplicationLauncherClusterLaunchAppParams
+@implementation CHIPApplianceStatisticsClusterStatisticsAvailableParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _application = [CHIPApplicationLauncherClusterApplication new];
+        _logQueueSize = @(0);
 
-        _data = nil;
+        _logIds = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: logQueueSize:%@; logIds:%@; >", NSStringFromClass([self class]), _logQueueSize, _logIds];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPApplicationLauncherClusterStopAppParams
+@implementation CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _application = [CHIPApplicationLauncherClusterApplication new];
+        _profileCount = @(0);
+
+        _profileIntervalPeriod = @(0);
+
+        _maxNumberOfIntervals = @(0);
+
+        _listOfAttributes = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: profileCount:%@; profileIntervalPeriod:%@; maxNumberOfIntervals:%@; listOfAttributes:%@; >",
+        NSStringFromClass([self class]), _profileCount, _profileIntervalPeriod, _maxNumberOfIntervals, _listOfAttributes];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPApplicationLauncherClusterHideAppParams
+@implementation CHIPElectricalMeasurementClusterGetProfileInfoCommandParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _application = [CHIPApplicationLauncherClusterApplication new];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
-@implementation CHIPApplicationLauncherClusterLauncherResponseParams
+@implementation CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
+        _startTime = @(0);
+
         _status = @(0);
 
-        _data = [NSData data];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPAccountLoginClusterGetSetupPINParams
-- (instancetype)init
-{
-    if (self = [super init]) {
+        _profileIntervalPeriod = @(0);
 
-        _tempAccountIdentifier = @"";
+        _numberOfIntervalsDelivered = @(0);
+
+        _attributeId = @(0);
+
+        _intervals = [NSArray array];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPAccountLoginClusterGetSetupPINResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
 
-        _setupPIN = @"";
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: startTime:%@; status:%@; profileIntervalPeriod:%@; "
+                                                              @"numberOfIntervalsDelivered:%@; attributeId:%@; intervals:%@; >",
+                                             NSStringFromClass([self class]), _startTime, _status, _profileIntervalPeriod,
+                                             _numberOfIntervalsDelivered, _attributeId, _intervals];
+    return descriptionString;
 }
+
 @end
-@implementation CHIPAccountLoginClusterLoginParams
+@implementation CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _tempAccountIdentifier = @"";
+        _attributeId = @(0);
 
-        _setupPIN = @"";
+        _startTime = @(0);
+
+        _numberOfIntervals = @(0);
         _timedInvokeTimeoutMs = nil;
     }
     return self;
 }
-@end
-@implementation CHIPAccountLoginClusterLogoutParams
-- (instancetype)init
+
+- (NSString *)description
 {
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: attributeId:%@; startTime:%@; numberOfIntervals:%@; >",
+                                             NSStringFromClass([self class]), _attributeId, _startTime, _numberOfIntervals];
+    return descriptionString;
 }
+
 @end
 @implementation CHIPTestClusterClusterTestParams
 - (instancetype)init
@@ -4000,6 +5761,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestSpecificResponseParams
 - (instancetype)init
@@ -4011,6 +5779,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: returnValue:%@; >", NSStringFromClass([self class]), _returnValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestNotHandledParams
 - (instancetype)init
@@ -4020,6 +5796,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestAddArgumentsResponseParams
 - (instancetype)init
@@ -4031,6 +5814,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: returnValue:%@; >", NSStringFromClass([self class]), _returnValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestSpecificParams
 - (instancetype)init
@@ -4040,6 +5831,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestSimpleArgumentResponseParams
 - (instancetype)init
@@ -4051,6 +5849,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: returnValue:%@; >", NSStringFromClass([self class]), _returnValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestUnknownCommandParams
 - (instancetype)init
@@ -4060,6 +5866,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestStructArrayArgumentResponseParams
 - (instancetype)init
@@ -4081,6 +5894,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; arg3:%@; arg4:%@; arg5:%@; arg6:%@; >",
+                                             NSStringFromClass([self class]), _arg1, _arg2, _arg3, _arg4, _arg5, _arg6];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestAddArgumentsParams
 - (instancetype)init
@@ -4094,6 +5915,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; >", NSStringFromClass([self class]), _arg1, _arg2];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestListInt8UReverseResponseParams
 - (instancetype)init
@@ -4105,6 +5934,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestSimpleArgumentRequestParams
 - (instancetype)init
@@ -4116,6 +5952,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestEnumsResponseParams
 - (instancetype)init
@@ -4129,6 +5972,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; >", NSStringFromClass([self class]), _arg1, _arg2];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestStructArrayArgumentRequestParams
 - (instancetype)init
@@ -4150,6 +6001,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; arg3:%@; arg4:%@; arg5:%@; arg6:%@; >",
+                                             NSStringFromClass([self class]), _arg1, _arg2, _arg3, _arg4, _arg5, _arg6];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestNullableOptionalResponseParams
 - (instancetype)init
@@ -4167,6 +6026,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: wasPresent:%@; wasNull:%@; value:%@; originalValue:%@; >",
+                                             NSStringFromClass([self class]), _wasPresent, _wasNull, _value, _originalValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestStructArgumentRequestParams
 - (instancetype)init
@@ -4178,6 +6045,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestComplexNullableOptionalResponseParams
 - (instancetype)init
@@ -4243,6 +6117,28 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: nullableIntWasNull:%@; nullableIntValue:%@; optionalIntWasPresent:%@; optionalIntValue:%@; "
+                         @"nullableOptionalIntWasPresent:%@; nullableOptionalIntWasNull:%@; nullableOptionalIntValue:%@; "
+                         @"nullableStringWasNull:%@; nullableStringValue:%@; optionalStringWasPresent:%@; optionalStringValue:%@; "
+                         @"nullableOptionalStringWasPresent:%@; nullableOptionalStringWasNull:%@; nullableOptionalStringValue:%@; "
+                         @"nullableStructWasNull:%@; nullableStructValue:%@; optionalStructWasPresent:%@; optionalStructValue:%@; "
+                         @"nullableOptionalStructWasPresent:%@; nullableOptionalStructWasNull:%@; nullableOptionalStructValue:%@; "
+                         @"nullableListWasNull:%@; nullableListValue:%@; optionalListWasPresent:%@; optionalListValue:%@; "
+                         @"nullableOptionalListWasPresent:%@; nullableOptionalListWasNull:%@; nullableOptionalListValue:%@; >",
+        NSStringFromClass([self class]), _nullableIntWasNull, _nullableIntValue, _optionalIntWasPresent, _optionalIntValue,
+        _nullableOptionalIntWasPresent, _nullableOptionalIntWasNull, _nullableOptionalIntValue, _nullableStringWasNull,
+        _nullableStringValue, _optionalStringWasPresent, _optionalStringValue, _nullableOptionalStringWasPresent,
+        _nullableOptionalStringWasNull, _nullableOptionalStringValue, _nullableStructWasNull, _nullableStructValue,
+        _optionalStructWasPresent, _optionalStructValue, _nullableOptionalStructWasPresent, _nullableOptionalStructWasNull,
+        _nullableOptionalStructValue, _nullableListWasNull, _nullableListValue, _optionalListWasPresent, _optionalListValue,
+        _nullableOptionalListWasPresent, _nullableOptionalListWasNull, _nullableOptionalListValue];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestNestedStructArgumentRequestParams
 - (instancetype)init
@@ -4254,6 +6150,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterBooleanResponseParams
 - (instancetype)init
@@ -4265,6 +6168,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: value:%@; >", NSStringFromClass([self class]), _value];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestListStructArgumentRequestParams
 - (instancetype)init
@@ -4276,6 +6186,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterSimpleStructResponseParams
 - (instancetype)init
@@ -4287,6 +6204,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestListInt8UArgumentRequestParams
 - (instancetype)init
@@ -4298,6 +6222,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestEmitTestEventResponseParams
 - (instancetype)init
@@ -4309,6 +6240,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: value:%@; >", NSStringFromClass([self class]), _value];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestNestedStructListArgumentRequestParams
 - (instancetype)init
@@ -4320,6 +6258,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams
 - (instancetype)init
@@ -4331,6 +6276,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: value:%@; >", NSStringFromClass([self class]), _value];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams
 - (instancetype)init
@@ -4342,6 +6294,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestListInt8UReverseRequestParams
 - (instancetype)init
@@ -4353,6 +6312,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestEnumsRequestParams
 - (instancetype)init
@@ -4366,6 +6332,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; >", NSStringFromClass([self class]), _arg1, _arg2];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestNullableOptionalRequestParams
 - (instancetype)init
@@ -4377,6 +6351,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestComplexNullableOptionalRequestParams
 - (instancetype)init
@@ -4410,6 +6391,19 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: nullableInt:%@; optionalInt:%@; nullableOptionalInt:%@; nullableString:%@; "
+                                   @"optionalString:%@; nullableOptionalString:%@; nullableStruct:%@; optionalStruct:%@; "
+                                   @"nullableOptionalStruct:%@; nullableList:%@; optionalList:%@; nullableOptionalList:%@; >",
+                  NSStringFromClass([self class]), _nullableInt, _optionalInt, _nullableOptionalInt, _nullableString,
+                  _optionalString, _nullableOptionalString, _nullableStruct, _optionalStruct, _nullableOptionalStruct,
+                  _nullableList, _optionalList, _nullableOptionalList];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterSimpleStructEchoRequestParams
 - (instancetype)init
@@ -4421,6 +6415,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTimedInvokeRequestParams
 - (instancetype)init
@@ -4430,6 +6431,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams
 - (instancetype)init
@@ -4441,6 +6449,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestEmitTestEventRequestParams
 - (instancetype)init
@@ -4456,6 +6471,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; arg3:%@; >", NSStringFromClass([self class]), _arg1, _arg2, _arg3];
+    return descriptionString;
+}
+
 @end
 @implementation CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams
 - (instancetype)init
@@ -4467,299 +6490,13 @@ - (instancetype)init
     }
     return self;
 }
-@end
-@implementation CHIPMessagingClusterDisplayMessageParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _messageId = @(0);
-
-        _messageControl = @(0);
-
-        _startTime = @(0);
-
-        _durationInMinutes = @(0);
-
-        _message = @"";
-
-        _optionalExtendedMessageControl = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPMessagingClusterGetLastMessageParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPMessagingClusterCancelMessageParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _messageId = @(0);
-
-        _messageControl = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPMessagingClusterMessageConfirmationParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _messageId = @(0);
-
-        _confirmationTime = @(0);
-
-        _messageConfirmationControl = @(0);
-
-        _messageResponse = [NSData data];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPMessagingClusterDisplayProtectedMessageParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _messageId = @(0);
-
-        _messageControl = @(0);
-
-        _startTime = @(0);
-
-        _durationInMinutes = @(0);
-
-        _message = @"";
-
-        _optionalExtendedMessageControl = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPMessagingClusterGetMessageCancellationParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _earliestImplementationTime = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPMessagingClusterCancelAllMessagesParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _implementationDateTime = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceEventsAndAlertClusterGetAlertsParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceEventsAndAlertClusterGetAlertsResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _alertsCount = @(0);
 
-        _alertStructures = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceEventsAndAlertClusterAlertsNotificationParams
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _alertsCount = @(0);
-
-        _alertStructures = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
 }
-@end
-@implementation CHIPApplianceEventsAndAlertClusterEventsNotificationParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _eventHeader = @(0);
 
-        _eventId = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceStatisticsClusterLogNotificationParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _timeStamp = @(0);
-
-        _logId = @(0);
-
-        _logLength = @(0);
-
-        _logPayload = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceStatisticsClusterLogRequestParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _logId = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceStatisticsClusterLogResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _timeStamp = @(0);
-
-        _logId = @(0);
-
-        _logLength = @(0);
-
-        _logPayload = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceStatisticsClusterLogQueueRequestParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceStatisticsClusterLogQueueResponseParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _logQueueSize = @(0);
-
-        _logIds = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPApplianceStatisticsClusterStatisticsAvailableParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _logQueueSize = @(0);
-
-        _logIds = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _profileCount = @(0);
-
-        _profileIntervalPeriod = @(0);
-
-        _maxNumberOfIntervals = @(0);
-
-        _listOfAttributes = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPElectricalMeasurementClusterGetProfileInfoCommandParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _startTime = @(0);
-
-        _status = @(0);
-
-        _profileIntervalPeriod = @(0);
-
-        _numberOfIntervalsDelivered = @(0);
-
-        _attributeId = @(0);
-
-        _intervals = [NSArray array];
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
-@end
-@implementation CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams
-- (instancetype)init
-{
-    if (self = [super init]) {
-
-        _attributeId = @(0);
-
-        _startTime = @(0);
-
-        _numberOfIntervals = @(0);
-        _timedInvokeTimeoutMs = nil;
-    }
-    return self;
-}
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm
index 5d3c55fe6103d5..073315ad6e0583 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm
@@ -207,7 +207,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -217,7 +217,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -227,7 +227,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -237,7 +237,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -247,7 +247,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -257,7 +257,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -267,7 +267,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -337,7 +337,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -347,7 +347,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -357,7 +357,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -385,7 +385,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -456,7 +456,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -526,7 +526,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -536,7 +536,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -546,7 +546,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -556,7 +556,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -566,7 +566,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -576,7 +576,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -853,7 +853,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -863,7 +863,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -873,7 +873,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -883,7 +883,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -893,7 +893,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -903,7 +903,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -913,7 +913,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1102,7 +1102,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1112,7 +1112,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1122,7 +1122,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1132,7 +1132,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1142,7 +1142,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1152,7 +1152,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1162,7 +1162,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1172,7 +1172,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1182,7 +1182,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1192,7 +1192,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1202,7 +1202,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1212,7 +1212,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1222,7 +1222,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1232,7 +1232,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1346,7 +1346,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1356,7 +1356,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1366,7 +1366,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1376,7 +1376,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1386,7 +1386,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1396,7 +1396,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1406,7 +1406,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1416,7 +1416,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1646,7 +1646,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1656,7 +1656,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1666,7 +1666,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1700,7 +1700,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1846,7 +1846,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1856,7 +1856,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1866,7 +1866,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1987,7 +1987,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -1997,7 +1997,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2007,7 +2007,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2036,7 +2036,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2046,7 +2046,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2056,7 +2056,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2066,7 +2066,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2076,7 +2076,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2147,7 +2147,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
@@ -2157,13 +2157,13 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         switch (aPath.mEventId) {
 
         default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
             break;
         }
         break;
     }
     default: {
-        *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH;
+        *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
         break;
     }
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h
index e35ebce3aca9a3..a1f9e206f889d0 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h
@@ -281,10 +281,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CHIPSoftwareDiagnosticsClusterThreadMetrics : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull id;
-@property (strong, nonatomic) NSString * _Nonnull name;
-@property (strong, nonatomic) NSNumber * _Nonnull stackFreeCurrent;
-@property (strong, nonatomic) NSNumber * _Nonnull stackFreeMinimum;
-@property (strong, nonatomic) NSNumber * _Nonnull stackSize;
+@property (strong, nonatomic) NSString * _Nullable name;
+@property (strong, nonatomic) NSNumber * _Nullable stackFreeCurrent;
+@property (strong, nonatomic) NSNumber * _Nullable stackFreeMinimum;
+@property (strong, nonatomic) NSNumber * _Nullable stackSize;
 - (instancetype)init;
 @end
 
@@ -581,12 +581,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init;
 @end
 
-@interface CHIPIasAceClusterIasAceZoneStatusResult : NSObject
-@property (strong, nonatomic) NSNumber * _Nonnull zoneId;
-@property (strong, nonatomic) NSNumber * _Nonnull zoneStatus;
-- (instancetype)init;
-@end
-
 @interface CHIPChannelClusterChannelInfo : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull majorNumber;
 @property (strong, nonatomic) NSNumber * _Nonnull minorNumber;
@@ -755,8 +749,8 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface CHIPTestClusterClusterTestListStructOctet : NSObject
-@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
-@property (strong, nonatomic) NSData * _Nonnull operationalCert;
+@property (strong, nonatomic) NSNumber * _Nonnull member1;
+@property (strong, nonatomic) NSData * _Nonnull member2;
 - (instancetype)init;
 @end
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm
index dcbc75ab4a4c2b..9d9a5958fdfab2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm
@@ -32,6 +32,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: attributeId:%@; attributeValue:%@; >",
+                                             NSStringFromClass([self class]), _attributeId, _attributeValue];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPScenesClusterExtensionFieldSet
@@ -45,6 +53,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: clusterId:%@; attributeValueList:%@; >",
+                                             NSStringFromClass([self class]), _clusterId, _attributeValueList];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPowerProfileClusterPowerProfileRecord
@@ -62,6 +78,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: powerProfileId:%@; energyPhaseId:%@; powerProfileRemoteControl:%@; powerProfileState:%@; >",
+        NSStringFromClass([self class]), _powerProfileId, _energyPhaseId, _powerProfileRemoteControl, _powerProfileState];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPowerProfileClusterScheduledPhase
@@ -75,6 +100,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: energyPhaseId:%@; scheduledTime:%@; >",
+                                             NSStringFromClass([self class]), _energyPhaseId, _scheduledTime];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPowerProfileClusterTransferredPhase
@@ -96,6 +129,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: energyPhaseId:%@; macroPhaseId:%@; expectedDuration:%@; peakPower:%@; energy:%@; maxActivationDelay:%@; >",
+        NSStringFromClass([self class]), _energyPhaseId, _macroPhaseId, _expectedDuration, _peakPower, _energy,
+        _maxActivationDelay];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDescriptorClusterDeviceType
@@ -109,6 +153,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: type:%@; revision:%@; >", NSStringFromClass([self class]), _type, _revision];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBindingClusterTargetStruct
@@ -128,6 +180,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: node:%@; group:%@; endpoint:%@; cluster:%@; fabricIndex:%@; >",
+                                             NSStringFromClass([self class]), _node, _group, _endpoint, _cluster, _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPAccessControlClusterTarget
@@ -143,6 +203,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: cluster:%@; endpoint:%@; deviceType:%@; >",
+                                             NSStringFromClass([self class]), _cluster, _endpoint, _deviceType];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPAccessControlClusterAccessControlEntry
@@ -162,6 +230,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: privilege:%@; authMode:%@; subjects:%@; targets:%@; fabricIndex:%@; >",
+                  NSStringFromClass([self class]), _privilege, _authMode, _subjects, _targets, _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPAccessControlClusterExtensionEntry
@@ -175,6 +252,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: data:%@; fabricIndex:%@; >", NSStringFromClass([self class]),
+                                             [_data base64EncodedStringWithOptions:0], _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPAccessControlClusterAccessControlEntryChangedEvent
@@ -194,6 +279,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: adminNodeID:%@; adminPasscodeID:%@; changeType:%@; latestValue:%@; adminFabricIndex:%@; >",
+        NSStringFromClass([self class]), _adminNodeID, _adminPasscodeID, _changeType, _latestValue, _adminFabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPAccessControlClusterAccessControlExtensionChangedEvent
@@ -213,6 +307,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: adminNodeID:%@; adminPasscodeID:%@; changeType:%@; latestValue:%@; adminFabricIndex:%@; >",
+        NSStringFromClass([self class]), _adminNodeID, _adminPasscodeID, _changeType, _latestValue, _adminFabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedActionsClusterActionStruct
@@ -234,6 +337,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: actionID:%@; name:%@; type:%@; endpointListID:%@; supportedCommands:%@; status:%@; >",
+                  NSStringFromClass([self class]), _actionID, _name, _type, _endpointListID, _supportedCommands, _status];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedActionsClusterEndpointListStruct
@@ -251,6 +363,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: endpointListID:%@; name:%@; type:%@; endpoints:%@; >",
+                                             NSStringFromClass([self class]), _endpointListID, _name, _type, _endpoints];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedActionsClusterStateChangedEvent
@@ -266,6 +386,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; newState:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _newState];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedActionsClusterActionFailedEvent
@@ -283,6 +411,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: actionID:%@; invokeID:%@; newState:%@; error:%@; >",
+                                             NSStringFromClass([self class]), _actionID, _invokeID, _newState, _error];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBasicClusterCapabilityMinimaStruct
@@ -296,6 +432,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: caseSessionsPerFabric:%@; subscriptionsPerFabric:%@; >",
+                                             NSStringFromClass([self class]), _caseSessionsPerFabric, _subscriptionsPerFabric];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBasicClusterStartUpEvent
@@ -307,6 +451,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: softwareVersion:%@; >", NSStringFromClass([self class]), _softwareVersion];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBasicClusterShutDownEvent
@@ -316,6 +468,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBasicClusterLeaveEvent
@@ -325,6 +484,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBasicClusterReachableChangedEvent
@@ -336,6 +502,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: reachableNewValue:%@; >", NSStringFromClass([self class]), _reachableNewValue];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPOtaSoftwareUpdateRequestorClusterProviderLocation
@@ -351,6 +525,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: providerNodeID:%@; endpoint:%@; fabricIndex:%@; >",
+                                             NSStringFromClass([self class]), _providerNodeID, _endpoint, _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPOtaSoftwareUpdateRequestorClusterStateTransitionEvent
@@ -368,6 +550,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: previousState:%@; newState:%@; reason:%@; targetSoftwareVersion:%@; >",
+                  NSStringFromClass([self class]), _previousState, _newState, _reason, _targetSoftwareVersion];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPOtaSoftwareUpdateRequestorClusterVersionAppliedEvent
@@ -381,6 +572,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: softwareVersion:%@; productID:%@; >",
+                                             NSStringFromClass([self class]), _softwareVersion, _productID];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPOtaSoftwareUpdateRequestorClusterDownloadErrorEvent
@@ -398,6 +597,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: softwareVersion:%@; bytesDownloaded:%@; progressPercent:%@; platformCode:%@; >",
+                  NSStringFromClass([self class]), _softwareVersion, _bytesDownloaded, _progressPercent, _platformCode];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPowerSourceClusterBatChargeFaultChangeType
@@ -411,6 +619,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: current:%@; previous:%@; >", NSStringFromClass([self class]), _current, _previous];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPowerSourceClusterBatFaultChangeType
@@ -424,6 +640,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: current:%@; previous:%@; >", NSStringFromClass([self class]), _current, _previous];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPowerSourceClusterWiredFaultChangeType
@@ -437,6 +661,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: current:%@; previous:%@; >", NSStringFromClass([self class]), _current, _previous];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGeneralCommissioningClusterBasicCommissioningInfo
@@ -448,6 +680,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: failSafeExpiryLengthSeconds:%@; >", NSStringFromClass([self class]), _failSafeExpiryLengthSeconds];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPNetworkCommissioningClusterNetworkInfo
@@ -461,6 +701,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: networkID:%@; connected:%@; >", NSStringFromClass([self class]),
+                  [_networkID base64EncodedStringWithOptions:0], _connected];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPNetworkCommissioningClusterThreadInterfaceScanResult
@@ -486,6 +735,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: panId:%@; extendedPanId:%@; networkName:%@; channel:%@; version:%@; extendedAddress:%@; rssi:%@; lqi:%@; >",
+        NSStringFromClass([self class]), _panId, _extendedPanId, _networkName, _channel, _version,
+        [_extendedAddress base64EncodedStringWithOptions:0], _rssi, _lqi];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPNetworkCommissioningClusterWiFiInterfaceScanResult
@@ -507,6 +767,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: security:%@; ssid:%@; bssid:%@; channel:%@; wiFiBand:%@; rssi:%@; >",
+                  NSStringFromClass([self class]), _security, [_ssid base64EncodedStringWithOptions:0],
+                  [_bssid base64EncodedStringWithOptions:0], _channel, _wiFiBand, _rssi];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGeneralDiagnosticsClusterNetworkInterfaceType
@@ -532,6 +802,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: name:%@; isOperational:%@; offPremiseServicesReachableIPv4:%@; offPremiseServicesReachableIPv6:%@; "
+                         @"hardwareAddress:%@; iPv4Addresses:%@; iPv6Addresses:%@; type:%@; >",
+        NSStringFromClass([self class]), _name, _isOperational, _offPremiseServicesReachableIPv4, _offPremiseServicesReachableIPv6,
+        [_hardwareAddress base64EncodedStringWithOptions:0], _iPv4Addresses, _iPv6Addresses, _type];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGeneralDiagnosticsClusterHardwareFaultChangeEvent
@@ -545,6 +826,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: current:%@; previous:%@; >", NSStringFromClass([self class]), _current, _previous];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGeneralDiagnosticsClusterRadioFaultChangeEvent
@@ -558,6 +847,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: current:%@; previous:%@; >", NSStringFromClass([self class]), _current, _previous];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGeneralDiagnosticsClusterNetworkFaultChangeEvent
@@ -571,6 +868,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: current:%@; previous:%@; >", NSStringFromClass([self class]), _current, _previous];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGeneralDiagnosticsClusterBootReasonEvent
@@ -582,6 +887,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: bootReason:%@; >", NSStringFromClass([self class]), _bootReason];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct
@@ -597,6 +910,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: id:%@; name:%@; faultRecording:%@; >", NSStringFromClass([self class]), _id, _name,
+                  [_faultRecording base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSoftwareDiagnosticsClusterThreadMetrics
@@ -606,16 +928,25 @@ - (instancetype)init
 
         _id = @(0);
 
-        _name = @"";
+        _name = nil;
 
-        _stackFreeCurrent = @(0);
+        _stackFreeCurrent = nil;
 
-        _stackFreeMinimum = @(0);
+        _stackFreeMinimum = nil;
 
-        _stackSize = @(0);
+        _stackSize = nil;
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: id:%@; name:%@; stackFreeCurrent:%@; stackFreeMinimum:%@; stackSize:%@; >",
+                  NSStringFromClass([self class]), _id, _name, _stackFreeCurrent, _stackFreeMinimum, _stackSize];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSoftwareDiagnosticsClusterSoftwareFaultEvent
@@ -627,6 +958,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: softwareFault:%@; >", NSStringFromClass([self class]), _softwareFault];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPThreadNetworkDiagnosticsClusterNeighborTable
@@ -664,6 +1003,18 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: extAddress:%@; age:%@; rloc16:%@; linkFrameCounter:%@; mleFrameCounter:%@; lqi:%@; averageRssi:%@; lastRssi:%@; "
+            @"frameErrorRate:%@; messageErrorRate:%@; rxOnWhenIdle:%@; fullThreadDevice:%@; fullNetworkData:%@; isChild:%@; >",
+        NSStringFromClass([self class]), _extAddress, _age, _rloc16, _linkFrameCounter, _mleFrameCounter, _lqi, _averageRssi,
+        _lastRssi, _frameErrorRate, _messageErrorRate, _rxOnWhenIdle, _fullThreadDevice, _fullNetworkData, _isChild];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents
@@ -697,6 +1048,19 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: activeTimestampPresent:%@; pendingTimestampPresent:%@; masterKeyPresent:%@; networkNamePresent:%@; "
+                         @"extendedPanIdPresent:%@; meshLocalPrefixPresent:%@; delayPresent:%@; panIdPresent:%@; "
+                         @"channelPresent:%@; pskcPresent:%@; securityPolicyPresent:%@; channelMaskPresent:%@; >",
+        NSStringFromClass([self class]), _activeTimestampPresent, _pendingTimestampPresent, _masterKeyPresent, _networkNamePresent,
+        _extendedPanIdPresent, _meshLocalPrefixPresent, _delayPresent, _panIdPresent, _channelPresent, _pskcPresent,
+        _securityPolicyPresent, _channelMaskPresent];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPThreadNetworkDiagnosticsClusterRouteTable
@@ -726,6 +1090,17 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: extAddress:%@; rloc16:%@; routerId:%@; nextHop:%@; pathCost:%@; lqiIn:%@; lqiOut:%@; "
+                                   @"age:%@; allocated:%@; linkEstablished:%@; >",
+                  NSStringFromClass([self class]), _extAddress, _rloc16, _routerId, _nextHop, _pathCost, _lqiIn, _lqiOut, _age,
+                  _allocated, _linkEstablished];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPThreadNetworkDiagnosticsClusterSecurityPolicy
@@ -739,6 +1114,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: rotationTime:%@; flags:%@; >", NSStringFromClass([self class]), _rotationTime, _flags];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPThreadNetworkDiagnosticsClusterConnectionStatusEvent
@@ -750,6 +1133,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: connectionStatus:%@; >", NSStringFromClass([self class]), _connectionStatus];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPWiFiNetworkDiagnosticsClusterDisconnectionEvent
@@ -761,6 +1152,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: reasonCode:%@; >", NSStringFromClass([self class]), _reasonCode];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPWiFiNetworkDiagnosticsClusterAssociationFailureEvent
@@ -774,6 +1173,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: associationFailure:%@; status:%@; >",
+                                             NSStringFromClass([self class]), _associationFailure, _status];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPWiFiNetworkDiagnosticsClusterConnectionStatusEvent
@@ -785,6 +1192,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: connectionStatus:%@; >", NSStringFromClass([self class]), _connectionStatus];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedDeviceBasicClusterStartUpEvent
@@ -796,6 +1211,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: softwareVersion:%@; >", NSStringFromClass([self class]), _softwareVersion];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedDeviceBasicClusterShutDownEvent
@@ -805,6 +1228,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedDeviceBasicClusterLeaveEvent
@@ -814,6 +1244,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBridgedDeviceBasicClusterReachableChangedEvent
@@ -825,6 +1262,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: reachableNewValue:%@; >", NSStringFromClass([self class]), _reachableNewValue];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterSwitchLatchedEvent
@@ -836,6 +1281,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: newPosition:%@; >", NSStringFromClass([self class]), _newPosition];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterInitialPressEvent
@@ -847,6 +1300,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: newPosition:%@; >", NSStringFromClass([self class]), _newPosition];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterLongPressEvent
@@ -858,6 +1319,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: newPosition:%@; >", NSStringFromClass([self class]), _newPosition];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterShortReleaseEvent
@@ -869,6 +1338,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: previousPosition:%@; >", NSStringFromClass([self class]), _previousPosition];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterLongReleaseEvent
@@ -880,6 +1357,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: previousPosition:%@; >", NSStringFromClass([self class]), _previousPosition];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterMultiPressOngoingEvent
@@ -893,6 +1378,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newPosition:%@; currentNumberOfPressesCounted:%@; >",
+                                             NSStringFromClass([self class]), _newPosition, _currentNumberOfPressesCounted];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPSwitchClusterMultiPressCompleteEvent
@@ -906,6 +1399,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newPosition:%@; totalNumberOfPressesCounted:%@; >",
+                                             NSStringFromClass([self class]), _newPosition, _totalNumberOfPressesCounted];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPOperationalCredentialsClusterFabricDescriptor
@@ -927,6 +1428,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: rootPublicKey:%@; vendorId:%@; fabricId:%@; nodeId:%@; label:%@; fabricIndex:%@; >",
+                  NSStringFromClass([self class]), [_rootPublicKey base64EncodedStringWithOptions:0], _vendorId, _fabricId, _nodeId,
+                  _label, _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPOperationalCredentialsClusterNOCStruct
@@ -942,6 +1453,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: noc:%@; icac:%@; fabricIndex:%@; >", NSStringFromClass([self class]),
+                  [_noc base64EncodedStringWithOptions:0], [_icac base64EncodedStringWithOptions:0], _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGroupKeyManagementClusterGroupInfoMapStruct
@@ -959,6 +1479,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; endpoints:%@; groupName:%@; fabricIndex:%@; >",
+                                             NSStringFromClass([self class]), _groupId, _endpoints, _groupName, _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGroupKeyManagementClusterGroupKeyMapStruct
@@ -974,6 +1502,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; groupKeySetID:%@; fabricIndex:%@; >",
+                                             NSStringFromClass([self class]), _groupId, _groupKeySetID, _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPGroupKeyManagementClusterGroupKeySetStruct
@@ -999,6 +1535,18 @@ - (instancetype)init
     }
     return self;
 }
+
+- (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];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPFixedLabelClusterLabelStruct
@@ -1012,6 +1560,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: label:%@; value:%@; >", NSStringFromClass([self class]), _label, _value];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPUserLabelClusterLabelStruct
@@ -1025,6 +1581,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: label:%@; value:%@; >", NSStringFromClass([self class]), _label, _value];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPBooleanStateClusterStateChangeEvent
@@ -1036,6 +1600,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: stateValue:%@; >", NSStringFromClass([self class]), _stateValue];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPModeSelectClusterSemanticTag
@@ -1049,6 +1621,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: mfgCode:%@; value:%@; >", NSStringFromClass([self class]), _mfgCode, _value];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPModeSelectClusterModeOptionStruct
@@ -1064,6 +1644,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: label:%@; mode:%@; semanticTags:%@; >",
+                                             NSStringFromClass([self class]), _label, _mode, _semanticTags];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDoorLockClusterDlCredential
@@ -1077,6 +1665,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: credentialType:%@; credentialIndex:%@; >",
+                                             NSStringFromClass([self class]), _credentialType, _credentialIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDoorLockClusterDoorLockAlarmEvent
@@ -1088,6 +1684,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alarmCode:%@; >", NSStringFromClass([self class]), _alarmCode];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDoorLockClusterDoorStateChangeEvent
@@ -1099,6 +1702,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: doorState:%@; >", NSStringFromClass([self class]), _doorState];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDoorLockClusterLockOperationEvent
@@ -1120,6 +1730,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:
+            @"<%@: lockOperationType:%@; operationSource:%@; userIndex:%@; fabricIndex:%@; sourceNode:%@; credentials:%@; >",
+        NSStringFromClass([self class]), _lockOperationType, _operationSource, _userIndex, _fabricIndex, _sourceNode, _credentials];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDoorLockClusterLockOperationErrorEvent
@@ -1143,6 +1763,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: lockOperationType:%@; operationSource:%@; operationError:%@; "
+                                                              @"userIndex:%@; fabricIndex:%@; sourceNode:%@; credentials:%@; >",
+                                             NSStringFromClass([self class]), _lockOperationType, _operationSource, _operationError,
+                                             _userIndex, _fabricIndex, _sourceNode, _credentials];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPDoorLockClusterLockUserChangeEvent
@@ -1166,6 +1796,16 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: lockDataType:%@; dataOperationType:%@; operationSource:%@; "
+                                                              @"userIndex:%@; fabricIndex:%@; sourceNode:%@; dataIndex:%@; >",
+                                             NSStringFromClass([self class]), _lockDataType, _dataOperationType, _operationSource,
+                                             _userIndex, _fabricIndex, _sourceNode, _dataIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterSupplyVoltageLowEvent
@@ -1175,6 +1815,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterSupplyVoltageHighEvent
@@ -1184,6 +1831,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterPowerMissingPhaseEvent
@@ -1193,6 +1847,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterSystemPressureLowEvent
@@ -1202,6 +1863,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterSystemPressureHighEvent
@@ -1211,6 +1879,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterDryRunningEvent
@@ -1220,6 +1895,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterMotorTemperatureHighEvent
@@ -1229,6 +1911,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterPumpMotorFatalFailureEvent
@@ -1238,6 +1927,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterElectronicTemperatureHighEvent
@@ -1247,6 +1943,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterPumpBlockedEvent
@@ -1256,6 +1959,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterSensorFailureEvent
@@ -1265,6 +1975,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterElectronicNonFatalFailureEvent
@@ -1274,6 +1991,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterElectronicFatalFailureEvent
@@ -1283,6 +2007,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterGeneralFaultEvent
@@ -1292,6 +2023,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterLeakageEvent
@@ -1301,6 +2039,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterAirDetectionEvent
@@ -1310,6 +2055,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPPumpConfigurationAndControlClusterTurbineOperationEvent
@@ -1319,6 +2071,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPThermostatClusterThermostatScheduleTransition
@@ -1334,19 +2093,14 @@ - (instancetype)init
     }
     return self;
 }
-@end
 
-@implementation CHIPIasAceClusterIasAceZoneStatusResult
-- (instancetype)init
+- (NSString *)description
 {
-    if (self = [super init]) {
-
-        _zoneId = @(0);
-
-        _zoneStatus = @(0);
-    }
-    return self;
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: transitionTime:%@; heatSetpoint:%@; coolSetpoint:%@; >",
+                                             NSStringFromClass([self class]), _transitionTime, _heatSetpoint, _coolSetpoint];
+    return descriptionString;
 }
+
 @end
 
 @implementation CHIPChannelClusterChannelInfo
@@ -1366,6 +2120,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: majorNumber:%@; minorNumber:%@; name:%@; callSign:%@; affiliateCallSign:%@; >",
+                  NSStringFromClass([self class]), _majorNumber, _minorNumber, _name, _callSign, _affiliateCallSign];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPChannelClusterLineupInfo
@@ -1383,6 +2146,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: operatorName:%@; lineupName:%@; postalCode:%@; lineupInfoType:%@; >",
+                  NSStringFromClass([self class]), _operatorName, _lineupName, _postalCode, _lineupInfoType];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTargetNavigatorClusterTargetInfo
@@ -1396,6 +2168,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: identifier:%@; name:%@; >", NSStringFromClass([self class]), _identifier, _name];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPMediaPlaybackClusterPlaybackPosition
@@ -1409,6 +2189,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: updatedAt:%@; position:%@; >", NSStringFromClass([self class]), _updatedAt, _position];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPMediaInputClusterInputInfo
@@ -1426,6 +2214,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: index:%@; inputType:%@; name:%@; descriptionString:%@; >",
+                                             NSStringFromClass([self class]), _index, _inputType, _name, _descriptionString];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPContentLauncherClusterDimension
@@ -1441,6 +2237,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: width:%@; height:%@; metric:%@; >", NSStringFromClass([self class]), _width, _height, _metric];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPContentLauncherClusterAdditionalInfo
@@ -1454,6 +2258,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: name:%@; value:%@; >", NSStringFromClass([self class]), _name, _value];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPContentLauncherClusterParameter
@@ -1469,6 +2281,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: type:%@; value:%@; externalIDList:%@; >",
+                                             NSStringFromClass([self class]), _type, _value, _externalIDList];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPContentLauncherClusterContentSearch
@@ -1480,6 +2300,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: parameterList:%@; >", NSStringFromClass([self class]), _parameterList];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPContentLauncherClusterStyleInformation
@@ -1495,6 +2323,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: imageUrl:%@; color:%@; size:%@; >", NSStringFromClass([self class]), _imageUrl, _color, _size];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPContentLauncherClusterBrandingInformation
@@ -1516,6 +2352,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: providerName:%@; background:%@; logo:%@; progressBar:%@; splash:%@; waterMark:%@; >",
+                  NSStringFromClass([self class]), _providerName, _background, _logo, _progressBar, _splash, _waterMark];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPAudioOutputClusterOutputInfo
@@ -1531,6 +2376,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: index:%@; outputType:%@; name:%@; >", NSStringFromClass([self class]), _index, _outputType, _name];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPApplicationLauncherClusterApplication
@@ -1544,6 +2397,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: catalogVendorId:%@; applicationId:%@; >",
+                                             NSStringFromClass([self class]), _catalogVendorId, _applicationId];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPApplicationLauncherClusterApplicationEP
@@ -1557,6 +2418,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: application:%@; endpoint:%@; >", NSStringFromClass([self class]), _application, _endpoint];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPApplicationBasicClusterApplicationBasicApplication
@@ -1570,6 +2439,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: catalogVendorId:%@; applicationId:%@; >",
+                                             NSStringFromClass([self class]), _catalogVendorId, _applicationId];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterSimpleStruct
@@ -1595,6 +2472,15 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: a:%@; b:%@; c:%@; d:%@; e:%@; f:%@; g:%@; h:%@; >", NSStringFromClass([self class]), _a,
+                  _b, _c, [_d base64EncodedStringWithOptions:0], _e, _f, _g, _h];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterTestFabricScoped
@@ -1620,6 +2506,19 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString
+        stringWithFormat:@"<%@: fabricSensitiveInt8u:%@; optionalFabricSensitiveInt8u:%@; nullableFabricSensitiveInt8u:%@; "
+                         @"nullableOptionalFabricSensitiveInt8u:%@; fabricSensitiveCharString:%@; fabricSensitiveStruct:%@; "
+                         @"fabricSensitiveInt8uList:%@; fabricIndex:%@; >",
+        NSStringFromClass([self class]), _fabricSensitiveInt8u, _optionalFabricSensitiveInt8u, _nullableFabricSensitiveInt8u,
+        _nullableOptionalFabricSensitiveInt8u, _fabricSensitiveCharString, _fabricSensitiveStruct, _fabricSensitiveInt8uList,
+        _fabricIndex];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterNullablesAndOptionalsStruct
@@ -1653,6 +2552,19 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: nullableInt:%@; optionalInt:%@; nullableOptionalInt:%@; nullableString:%@; "
+                                   @"optionalString:%@; nullableOptionalString:%@; nullableStruct:%@; optionalStruct:%@; "
+                                   @"nullableOptionalStruct:%@; nullableList:%@; optionalList:%@; nullableOptionalList:%@; >",
+                  NSStringFromClass([self class]), _nullableInt, _optionalInt, _nullableOptionalInt, _nullableString,
+                  _optionalString, _nullableOptionalString, _nullableStruct, _optionalStruct, _nullableOptionalStruct,
+                  _nullableList, _optionalList, _nullableOptionalList];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterNestedStruct
@@ -1668,6 +2580,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString =
+        [NSString stringWithFormat:@"<%@: a:%@; b:%@; c:%@; >", NSStringFromClass([self class]), _a, _b, _c];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterNestedStructList
@@ -1691,6 +2611,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: a:%@; b:%@; c:%@; d:%@; e:%@; f:%@; g:%@; >",
+                                             NSStringFromClass([self class]), _a, _b, _c, _d, _e, _f, _g];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterDoubleNestedStructList
@@ -1702,6 +2630,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: a:%@; >", NSStringFromClass([self class]), _a];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterTestListStructOctet
@@ -1709,12 +2644,20 @@ - (instancetype)init
 {
     if (self = [super init]) {
 
-        _fabricIndex = @(0);
+        _member1 = @(0);
 
-        _operationalCert = [NSData data];
+        _member2 = [NSData data];
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: member1:%@; member2:%@; >", NSStringFromClass([self class]),
+                                             _member1, [_member2 base64EncodedStringWithOptions:0]];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterTestEventEvent
@@ -1736,6 +2679,14 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; arg2:%@; arg3:%@; arg4:%@; arg5:%@; arg6:%@; >",
+                                             NSStringFromClass([self class]), _arg1, _arg2, _arg3, _arg4, _arg5, _arg6];
+    return descriptionString;
+}
+
 @end
 
 @implementation CHIPTestClusterClusterTestFabricScopedEventEvent
@@ -1747,6 +2698,13 @@ - (instancetype)init
     }
     return self;
 }
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1];
+    return descriptionString;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h
index dac1bd94f25dac..40dfaad2d890c5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h
@@ -121,9 +121,6 @@ typedef NS_ENUM(uint32_t, MatterClusterIDType) {
     kMatterClusterChlorodibromomethaneConcentrationMeasurementID = 0x00000427,
     kMatterClusterChloroformConcentrationMeasurementID = 0x00000428,
     kMatterClusterSodiumConcentrationMeasurementID = 0x00000429,
-    kMatterClusterIasZoneID = 0x00000500,
-    kMatterClusterIasAceID = 0x00000501,
-    kMatterClusterIasWdID = 0x00000502,
     kMatterClusterWakeOnLanID = 0x00000503,
     kMatterClusterChannelID = 0x00000504,
     kMatterClusterTargetNavigatorID = 0x00000505,
@@ -136,13 +133,13 @@ typedef NS_ENUM(uint32_t, MatterClusterIDType) {
     kMatterClusterApplicationLauncherID = 0x0000050C,
     kMatterClusterApplicationBasicID = 0x0000050D,
     kMatterClusterAccountLoginID = 0x0000050E,
-    kMatterClusterTestClusterID = 0x0000050F,
     kMatterClusterMessagingID = 0x00000703,
     kMatterClusterApplianceIdentificationID = 0x00000B00,
     kMatterClusterMeterIdentificationID = 0x00000B01,
     kMatterClusterApplianceEventsAndAlertID = 0x00000B02,
     kMatterClusterApplianceStatisticsID = 0x00000B03,
     kMatterClusterElectricalMeasurementID = 0x00000B04,
+    kMatterClusterTestClusterID = 0xFFF1FC05,
 };
 
 #pragma mark - Attributes IDs
@@ -594,6 +591,7 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterGeneralDiagnosticsAttributeActiveHardwareFaultsID = 0x00000005,
     kMatterClusterGeneralDiagnosticsAttributeActiveRadioFaultsID = 0x00000006,
     kMatterClusterGeneralDiagnosticsAttributeActiveNetworkFaultsID = 0x00000007,
+    kMatterClusterGeneralDiagnosticsAttributeTestEventTriggersEnabledID = 0x00000008,
     kMatterClusterGeneralDiagnosticsAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
     kMatterClusterGeneralDiagnosticsAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
     kMatterClusterGeneralDiagnosticsAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
@@ -868,7 +866,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterDoorLockAttributeDoorOpenEventsID = 0x00000004,
     kMatterClusterDoorLockAttributeDoorClosedEventsID = 0x00000005,
     kMatterClusterDoorLockAttributeOpenPeriodID = 0x00000006,
-    kMatterClusterDoorLockAttributeNumberOfLogRecordsSupportedID = 0x00000010,
     kMatterClusterDoorLockAttributeNumberOfTotalUsersSupportedID = 0x00000011,
     kMatterClusterDoorLockAttributeNumberOfPINUsersSupportedID = 0x00000012,
     kMatterClusterDoorLockAttributeNumberOfRFIDUsersSupportedID = 0x00000013,
@@ -881,7 +878,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterDoorLockAttributeMinRFIDCodeLengthID = 0x0000001A,
     kMatterClusterDoorLockAttributeCredentialRulesSupportID = 0x0000001B,
     kMatterClusterDoorLockAttributeNumberOfCredentialsSupportedPerUserID = 0x0000001C,
-    kMatterClusterDoorLockAttributeEnableLoggingID = 0x00000020,
     kMatterClusterDoorLockAttributeLanguageID = 0x00000021,
     kMatterClusterDoorLockAttributeLEDSettingsID = 0x00000022,
     kMatterClusterDoorLockAttributeAutoRelockTimeID = 0x00000023,
@@ -899,14 +895,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterDoorLockAttributeSendPINOverTheAirID = 0x00000032,
     kMatterClusterDoorLockAttributeRequirePINforRemoteOperationID = 0x00000033,
     kMatterClusterDoorLockAttributeExpiringUserTimeoutID = 0x00000035,
-    kMatterClusterDoorLockAttributeAlarmMaskID = 0x00000040,
-    kMatterClusterDoorLockAttributeKeypadOperationEventMaskID = 0x00000041,
-    kMatterClusterDoorLockAttributeRemoteOperationEventMaskID = 0x00000042,
-    kMatterClusterDoorLockAttributeManualOperationEventMaskID = 0x00000043,
-    kMatterClusterDoorLockAttributeRFIDOperationEventMaskID = 0x00000044,
-    kMatterClusterDoorLockAttributeKeypadProgrammingEventMaskID = 0x00000045,
-    kMatterClusterDoorLockAttributeRemoteProgrammingEventMaskID = 0x00000046,
-    kMatterClusterDoorLockAttributeRFIDProgrammingEventMaskID = 0x00000047,
     kMatterClusterDoorLockAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
     kMatterClusterDoorLockAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
     kMatterClusterDoorLockAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
@@ -1013,7 +1001,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterThermostatAttributeRemoteSensingID = 0x0000001A,
     kMatterClusterThermostatAttributeControlSequenceOfOperationID = 0x0000001B,
     kMatterClusterThermostatAttributeSystemModeID = 0x0000001C,
-    kMatterClusterThermostatAttributeAlarmMaskID = 0x0000001D,
     kMatterClusterThermostatAttributeThermostatRunningModeID = 0x0000001E,
     kMatterClusterThermostatAttributeStartOfWeekID = 0x00000020,
     kMatterClusterThermostatAttributeNumberOfWeeklyTransitionsID = 0x00000021,
@@ -1651,35 +1638,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterSodiumConcentrationMeasurementAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
     kMatterClusterSodiumConcentrationMeasurementAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
 
-    // Cluster IasZone attributes
-    kMatterClusterIasZoneAttributeZoneStateID = 0x00000000,
-    kMatterClusterIasZoneAttributeZoneTypeID = 0x00000001,
-    kMatterClusterIasZoneAttributeZoneStatusID = 0x00000002,
-    kMatterClusterIasZoneAttributeIasCieAddressID = 0x00000010,
-    kMatterClusterIasZoneAttributeZoneIdID = 0x00000011,
-    kMatterClusterIasZoneAttributeNumberOfZoneSensitivityLevelsSupportedID = 0x00000012,
-    kMatterClusterIasZoneAttributeCurrentZoneSensitivityLevelID = 0x00000013,
-    kMatterClusterIasZoneAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
-    kMatterClusterIasZoneAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
-    kMatterClusterIasZoneAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
-    kMatterClusterIasZoneAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
-    kMatterClusterIasZoneAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
-
-    // Cluster IasAce attributes
-    kMatterClusterIasAceAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
-    kMatterClusterIasAceAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
-    kMatterClusterIasAceAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
-    kMatterClusterIasAceAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
-    kMatterClusterIasAceAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
-
-    // Cluster IasWd attributes
-    kMatterClusterIasWdAttributeMaxDurationID = 0x00000000,
-    kMatterClusterIasWdAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
-    kMatterClusterIasWdAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
-    kMatterClusterIasWdAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
-    kMatterClusterIasWdAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
-    kMatterClusterIasWdAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
-
     // Cluster WakeOnLan attributes
     kMatterClusterWakeOnLanAttributeMACAddressID = 0x00000000,
     kMatterClusterWakeOnLanAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
@@ -1793,94 +1751,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterAccountLoginAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
     kMatterClusterAccountLoginAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
 
-    // Cluster TestCluster attributes
-    kMatterClusterTestClusterAttributeBooleanID = 0x00000000,
-    kMatterClusterTestClusterAttributeBitmap8ID = 0x00000001,
-    kMatterClusterTestClusterAttributeBitmap16ID = 0x00000002,
-    kMatterClusterTestClusterAttributeBitmap32ID = 0x00000003,
-    kMatterClusterTestClusterAttributeBitmap64ID = 0x00000004,
-    kMatterClusterTestClusterAttributeInt8uID = 0x00000005,
-    kMatterClusterTestClusterAttributeInt16uID = 0x00000006,
-    kMatterClusterTestClusterAttributeInt24uID = 0x00000007,
-    kMatterClusterTestClusterAttributeInt32uID = 0x00000008,
-    kMatterClusterTestClusterAttributeInt40uID = 0x00000009,
-    kMatterClusterTestClusterAttributeInt48uID = 0x0000000A,
-    kMatterClusterTestClusterAttributeInt56uID = 0x0000000B,
-    kMatterClusterTestClusterAttributeInt64uID = 0x0000000C,
-    kMatterClusterTestClusterAttributeInt8sID = 0x0000000D,
-    kMatterClusterTestClusterAttributeInt16sID = 0x0000000E,
-    kMatterClusterTestClusterAttributeInt24sID = 0x0000000F,
-    kMatterClusterTestClusterAttributeInt32sID = 0x00000010,
-    kMatterClusterTestClusterAttributeInt40sID = 0x00000011,
-    kMatterClusterTestClusterAttributeInt48sID = 0x00000012,
-    kMatterClusterTestClusterAttributeInt56sID = 0x00000013,
-    kMatterClusterTestClusterAttributeInt64sID = 0x00000014,
-    kMatterClusterTestClusterAttributeEnum8ID = 0x00000015,
-    kMatterClusterTestClusterAttributeEnum16ID = 0x00000016,
-    kMatterClusterTestClusterAttributeFloatSingleID = 0x00000017,
-    kMatterClusterTestClusterAttributeFloatDoubleID = 0x00000018,
-    kMatterClusterTestClusterAttributeOctetStringID = 0x00000019,
-    kMatterClusterTestClusterAttributeListInt8uID = 0x0000001A,
-    kMatterClusterTestClusterAttributeListOctetStringID = 0x0000001B,
-    kMatterClusterTestClusterAttributeListStructOctetStringID = 0x0000001C,
-    kMatterClusterTestClusterAttributeLongOctetStringID = 0x0000001D,
-    kMatterClusterTestClusterAttributeCharStringID = 0x0000001E,
-    kMatterClusterTestClusterAttributeLongCharStringID = 0x0000001F,
-    kMatterClusterTestClusterAttributeEpochUsID = 0x00000020,
-    kMatterClusterTestClusterAttributeEpochSID = 0x00000021,
-    kMatterClusterTestClusterAttributeVendorIdID = 0x00000022,
-    kMatterClusterTestClusterAttributeListNullablesAndOptionalsStructID = 0x00000023,
-    kMatterClusterTestClusterAttributeEnumAttrID = 0x00000024,
-    kMatterClusterTestClusterAttributeStructAttrID = 0x00000025,
-    kMatterClusterTestClusterAttributeRangeRestrictedInt8uID = 0x00000026,
-    kMatterClusterTestClusterAttributeRangeRestrictedInt8sID = 0x00000027,
-    kMatterClusterTestClusterAttributeRangeRestrictedInt16uID = 0x00000028,
-    kMatterClusterTestClusterAttributeRangeRestrictedInt16sID = 0x00000029,
-    kMatterClusterTestClusterAttributeListLongOctetStringID = 0x0000002A,
-    kMatterClusterTestClusterAttributeListFabricScopedID = 0x0000002B,
-    kMatterClusterTestClusterAttributeTimedWriteBooleanID = 0x00000030,
-    kMatterClusterTestClusterAttributeGeneralErrorBooleanID = 0x00000031,
-    kMatterClusterTestClusterAttributeClusterErrorBooleanID = 0x00000032,
-    kMatterClusterTestClusterAttributeUnsupportedID = 0x000000FF,
-    kMatterClusterTestClusterAttributeNullableBooleanID = 0x00004000,
-    kMatterClusterTestClusterAttributeNullableBitmap8ID = 0x00004001,
-    kMatterClusterTestClusterAttributeNullableBitmap16ID = 0x00004002,
-    kMatterClusterTestClusterAttributeNullableBitmap32ID = 0x00004003,
-    kMatterClusterTestClusterAttributeNullableBitmap64ID = 0x00004004,
-    kMatterClusterTestClusterAttributeNullableInt8uID = 0x00004005,
-    kMatterClusterTestClusterAttributeNullableInt16uID = 0x00004006,
-    kMatterClusterTestClusterAttributeNullableInt24uID = 0x00004007,
-    kMatterClusterTestClusterAttributeNullableInt32uID = 0x00004008,
-    kMatterClusterTestClusterAttributeNullableInt40uID = 0x00004009,
-    kMatterClusterTestClusterAttributeNullableInt48uID = 0x0000400A,
-    kMatterClusterTestClusterAttributeNullableInt56uID = 0x0000400B,
-    kMatterClusterTestClusterAttributeNullableInt64uID = 0x0000400C,
-    kMatterClusterTestClusterAttributeNullableInt8sID = 0x0000400D,
-    kMatterClusterTestClusterAttributeNullableInt16sID = 0x0000400E,
-    kMatterClusterTestClusterAttributeNullableInt24sID = 0x0000400F,
-    kMatterClusterTestClusterAttributeNullableInt32sID = 0x00004010,
-    kMatterClusterTestClusterAttributeNullableInt40sID = 0x00004011,
-    kMatterClusterTestClusterAttributeNullableInt48sID = 0x00004012,
-    kMatterClusterTestClusterAttributeNullableInt56sID = 0x00004013,
-    kMatterClusterTestClusterAttributeNullableInt64sID = 0x00004014,
-    kMatterClusterTestClusterAttributeNullableEnum8ID = 0x00004015,
-    kMatterClusterTestClusterAttributeNullableEnum16ID = 0x00004016,
-    kMatterClusterTestClusterAttributeNullableFloatSingleID = 0x00004017,
-    kMatterClusterTestClusterAttributeNullableFloatDoubleID = 0x00004018,
-    kMatterClusterTestClusterAttributeNullableOctetStringID = 0x00004019,
-    kMatterClusterTestClusterAttributeNullableCharStringID = 0x0000401E,
-    kMatterClusterTestClusterAttributeNullableEnumAttrID = 0x00004024,
-    kMatterClusterTestClusterAttributeNullableStructID = 0x00004025,
-    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt8uID = 0x00004026,
-    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt8sID = 0x00004027,
-    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt16uID = 0x00004028,
-    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt16sID = 0x00004029,
-    kMatterClusterTestClusterAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
-    kMatterClusterTestClusterAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
-    kMatterClusterTestClusterAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
-    kMatterClusterTestClusterAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
-    kMatterClusterTestClusterAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
-
     // Cluster Messaging attributes
     kMatterClusterMessagingAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
     kMatterClusterMessagingAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
@@ -2077,6 +1947,94 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) {
     kMatterClusterElectricalMeasurementAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
     kMatterClusterElectricalMeasurementAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
 
+    // Cluster TestCluster attributes
+    kMatterClusterTestClusterAttributeBooleanID = 0x00000000,
+    kMatterClusterTestClusterAttributeBitmap8ID = 0x00000001,
+    kMatterClusterTestClusterAttributeBitmap16ID = 0x00000002,
+    kMatterClusterTestClusterAttributeBitmap32ID = 0x00000003,
+    kMatterClusterTestClusterAttributeBitmap64ID = 0x00000004,
+    kMatterClusterTestClusterAttributeInt8uID = 0x00000005,
+    kMatterClusterTestClusterAttributeInt16uID = 0x00000006,
+    kMatterClusterTestClusterAttributeInt24uID = 0x00000007,
+    kMatterClusterTestClusterAttributeInt32uID = 0x00000008,
+    kMatterClusterTestClusterAttributeInt40uID = 0x00000009,
+    kMatterClusterTestClusterAttributeInt48uID = 0x0000000A,
+    kMatterClusterTestClusterAttributeInt56uID = 0x0000000B,
+    kMatterClusterTestClusterAttributeInt64uID = 0x0000000C,
+    kMatterClusterTestClusterAttributeInt8sID = 0x0000000D,
+    kMatterClusterTestClusterAttributeInt16sID = 0x0000000E,
+    kMatterClusterTestClusterAttributeInt24sID = 0x0000000F,
+    kMatterClusterTestClusterAttributeInt32sID = 0x00000010,
+    kMatterClusterTestClusterAttributeInt40sID = 0x00000011,
+    kMatterClusterTestClusterAttributeInt48sID = 0x00000012,
+    kMatterClusterTestClusterAttributeInt56sID = 0x00000013,
+    kMatterClusterTestClusterAttributeInt64sID = 0x00000014,
+    kMatterClusterTestClusterAttributeEnum8ID = 0x00000015,
+    kMatterClusterTestClusterAttributeEnum16ID = 0x00000016,
+    kMatterClusterTestClusterAttributeFloatSingleID = 0x00000017,
+    kMatterClusterTestClusterAttributeFloatDoubleID = 0x00000018,
+    kMatterClusterTestClusterAttributeOctetStringID = 0x00000019,
+    kMatterClusterTestClusterAttributeListInt8uID = 0x0000001A,
+    kMatterClusterTestClusterAttributeListOctetStringID = 0x0000001B,
+    kMatterClusterTestClusterAttributeListStructOctetStringID = 0x0000001C,
+    kMatterClusterTestClusterAttributeLongOctetStringID = 0x0000001D,
+    kMatterClusterTestClusterAttributeCharStringID = 0x0000001E,
+    kMatterClusterTestClusterAttributeLongCharStringID = 0x0000001F,
+    kMatterClusterTestClusterAttributeEpochUsID = 0x00000020,
+    kMatterClusterTestClusterAttributeEpochSID = 0x00000021,
+    kMatterClusterTestClusterAttributeVendorIdID = 0x00000022,
+    kMatterClusterTestClusterAttributeListNullablesAndOptionalsStructID = 0x00000023,
+    kMatterClusterTestClusterAttributeEnumAttrID = 0x00000024,
+    kMatterClusterTestClusterAttributeStructAttrID = 0x00000025,
+    kMatterClusterTestClusterAttributeRangeRestrictedInt8uID = 0x00000026,
+    kMatterClusterTestClusterAttributeRangeRestrictedInt8sID = 0x00000027,
+    kMatterClusterTestClusterAttributeRangeRestrictedInt16uID = 0x00000028,
+    kMatterClusterTestClusterAttributeRangeRestrictedInt16sID = 0x00000029,
+    kMatterClusterTestClusterAttributeListLongOctetStringID = 0x0000002A,
+    kMatterClusterTestClusterAttributeListFabricScopedID = 0x0000002B,
+    kMatterClusterTestClusterAttributeTimedWriteBooleanID = 0x00000030,
+    kMatterClusterTestClusterAttributeGeneralErrorBooleanID = 0x00000031,
+    kMatterClusterTestClusterAttributeClusterErrorBooleanID = 0x00000032,
+    kMatterClusterTestClusterAttributeUnsupportedID = 0x000000FF,
+    kMatterClusterTestClusterAttributeNullableBooleanID = 0x00004000,
+    kMatterClusterTestClusterAttributeNullableBitmap8ID = 0x00004001,
+    kMatterClusterTestClusterAttributeNullableBitmap16ID = 0x00004002,
+    kMatterClusterTestClusterAttributeNullableBitmap32ID = 0x00004003,
+    kMatterClusterTestClusterAttributeNullableBitmap64ID = 0x00004004,
+    kMatterClusterTestClusterAttributeNullableInt8uID = 0x00004005,
+    kMatterClusterTestClusterAttributeNullableInt16uID = 0x00004006,
+    kMatterClusterTestClusterAttributeNullableInt24uID = 0x00004007,
+    kMatterClusterTestClusterAttributeNullableInt32uID = 0x00004008,
+    kMatterClusterTestClusterAttributeNullableInt40uID = 0x00004009,
+    kMatterClusterTestClusterAttributeNullableInt48uID = 0x0000400A,
+    kMatterClusterTestClusterAttributeNullableInt56uID = 0x0000400B,
+    kMatterClusterTestClusterAttributeNullableInt64uID = 0x0000400C,
+    kMatterClusterTestClusterAttributeNullableInt8sID = 0x0000400D,
+    kMatterClusterTestClusterAttributeNullableInt16sID = 0x0000400E,
+    kMatterClusterTestClusterAttributeNullableInt24sID = 0x0000400F,
+    kMatterClusterTestClusterAttributeNullableInt32sID = 0x00004010,
+    kMatterClusterTestClusterAttributeNullableInt40sID = 0x00004011,
+    kMatterClusterTestClusterAttributeNullableInt48sID = 0x00004012,
+    kMatterClusterTestClusterAttributeNullableInt56sID = 0x00004013,
+    kMatterClusterTestClusterAttributeNullableInt64sID = 0x00004014,
+    kMatterClusterTestClusterAttributeNullableEnum8ID = 0x00004015,
+    kMatterClusterTestClusterAttributeNullableEnum16ID = 0x00004016,
+    kMatterClusterTestClusterAttributeNullableFloatSingleID = 0x00004017,
+    kMatterClusterTestClusterAttributeNullableFloatDoubleID = 0x00004018,
+    kMatterClusterTestClusterAttributeNullableOctetStringID = 0x00004019,
+    kMatterClusterTestClusterAttributeNullableCharStringID = 0x0000401E,
+    kMatterClusterTestClusterAttributeNullableEnumAttrID = 0x00004024,
+    kMatterClusterTestClusterAttributeNullableStructID = 0x00004025,
+    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt8uID = 0x00004026,
+    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt8sID = 0x00004027,
+    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt16uID = 0x00004028,
+    kMatterClusterTestClusterAttributeNullableRangeRestrictedInt16sID = 0x00004029,
+    kMatterClusterTestClusterAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID,
+    kMatterClusterTestClusterAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID,
+    kMatterClusterTestClusterAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID,
+    kMatterClusterTestClusterAttributeFeatureMapID = kMatterClusterGlobalAttributeFeatureMapID,
+    kMatterClusterTestClusterAttributeClusterRevisionID = kMatterClusterGlobalAttributeClusterRevisionID,
+
 };
 
 #pragma mark - Commands IDs
@@ -2136,6 +2094,7 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterLevelControlCommandMoveWithOnOffID = 0x00000005,
     kMatterClusterLevelControlCommandStepWithOnOffID = 0x00000006,
     kMatterClusterLevelControlCommandStopWithOnOffID = 0x00000007,
+    kMatterClusterLevelControlCommandMoveToClosestFrequencyID = 0x00000008,
 
     // Cluster Alarms commands
     kMatterClusterAlarmsCommandResetAlarmID = 0x00000000,
@@ -2235,6 +2194,9 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterDiagnosticLogsCommandRetrieveLogsRequestID = 0x00000000,
     kMatterClusterDiagnosticLogsCommandRetrieveLogsResponseID = 0x00000001,
 
+    // Cluster GeneralDiagnostics commands
+    kMatterClusterGeneralDiagnosticsCommandTestEventTriggerID = 0x00000000,
+
     // Cluster SoftwareDiagnostics commands
     kMatterClusterSoftwareDiagnosticsCommandResetWatermarksID = 0x00000000,
 
@@ -2265,7 +2227,6 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterOperationalCredentialsCommandUpdateFabricLabelID = 0x00000009,
     kMatterClusterOperationalCredentialsCommandRemoveFabricID = 0x0000000A,
     kMatterClusterOperationalCredentialsCommandAddTrustedRootCertificateID = 0x0000000B,
-    kMatterClusterOperationalCredentialsCommandRemoveTrustedRootCertificateID = 0x0000000C,
 
     // Cluster GroupKeyManagement commands
     kMatterClusterGroupKeyManagementCommandKeySetWriteID = 0x00000000,
@@ -2282,16 +2243,6 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterDoorLockCommandLockDoorID = 0x00000000,
     kMatterClusterDoorLockCommandUnlockDoorID = 0x00000001,
     kMatterClusterDoorLockCommandUnlockWithTimeoutID = 0x00000003,
-    kMatterClusterDoorLockCommandGetLogRecordID = 0x00000004,
-    kMatterClusterDoorLockCommandGetLogRecordResponseID = 0x00000004,
-    kMatterClusterDoorLockCommandSetPINCodeID = 0x00000005,
-    kMatterClusterDoorLockCommandGetPINCodeID = 0x00000006,
-    kMatterClusterDoorLockCommandGetPINCodeResponseID = 0x00000006,
-    kMatterClusterDoorLockCommandClearPINCodeID = 0x00000007,
-    kMatterClusterDoorLockCommandClearAllPINCodesID = 0x00000008,
-    kMatterClusterDoorLockCommandSetUserStatusID = 0x00000009,
-    kMatterClusterDoorLockCommandGetUserStatusID = 0x0000000A,
-    kMatterClusterDoorLockCommandGetUserStatusResponseID = 0x0000000A,
     kMatterClusterDoorLockCommandSetWeekDayScheduleID = 0x0000000B,
     kMatterClusterDoorLockCommandGetWeekDayScheduleID = 0x0000000C,
     kMatterClusterDoorLockCommandGetWeekDayScheduleResponseID = 0x0000000C,
@@ -2304,20 +2255,10 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterDoorLockCommandGetHolidayScheduleID = 0x00000012,
     kMatterClusterDoorLockCommandGetHolidayScheduleResponseID = 0x00000012,
     kMatterClusterDoorLockCommandClearHolidayScheduleID = 0x00000013,
-    kMatterClusterDoorLockCommandSetUserTypeID = 0x00000014,
-    kMatterClusterDoorLockCommandGetUserTypeID = 0x00000015,
-    kMatterClusterDoorLockCommandGetUserTypeResponseID = 0x00000015,
-    kMatterClusterDoorLockCommandSetRFIDCodeID = 0x00000016,
-    kMatterClusterDoorLockCommandGetRFIDCodeID = 0x00000017,
-    kMatterClusterDoorLockCommandGetRFIDCodeResponseID = 0x00000017,
-    kMatterClusterDoorLockCommandClearRFIDCodeID = 0x00000018,
-    kMatterClusterDoorLockCommandClearAllRFIDCodesID = 0x00000019,
     kMatterClusterDoorLockCommandSetUserID = 0x0000001A,
     kMatterClusterDoorLockCommandGetUserID = 0x0000001B,
     kMatterClusterDoorLockCommandGetUserResponseID = 0x0000001C,
     kMatterClusterDoorLockCommandClearUserID = 0x0000001D,
-    kMatterClusterDoorLockCommandOperatingEventNotificationID = 0x00000020,
-    kMatterClusterDoorLockCommandProgrammingEventNotificationID = 0x00000021,
     kMatterClusterDoorLockCommandSetCredentialID = 0x00000022,
     kMatterClusterDoorLockCommandSetCredentialResponseID = 0x00000023,
     kMatterClusterDoorLockCommandGetCredentialStatusID = 0x00000024,
@@ -2341,10 +2282,8 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterThermostatCommandSetpointRaiseLowerID = 0x00000000,
     kMatterClusterThermostatCommandGetWeeklyScheduleResponseID = 0x00000000,
     kMatterClusterThermostatCommandSetWeeklyScheduleID = 0x00000001,
-    kMatterClusterThermostatCommandGetRelayStatusLogResponseID = 0x00000001,
     kMatterClusterThermostatCommandGetWeeklyScheduleID = 0x00000002,
     kMatterClusterThermostatCommandClearWeeklyScheduleID = 0x00000003,
-    kMatterClusterThermostatCommandGetRelayStatusLogID = 0x00000004,
 
     // Cluster ColorControl commands
     kMatterClusterColorControlCommandMoveToHueID = 0x00000000,
@@ -2367,40 +2306,6 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterColorControlCommandMoveColorTemperatureID = 0x0000004B,
     kMatterClusterColorControlCommandStepColorTemperatureID = 0x0000004C,
 
-    // Cluster IasZone commands
-    kMatterClusterIasZoneCommandZoneEnrollResponseID = 0x00000000,
-    kMatterClusterIasZoneCommandZoneStatusChangeNotificationID = 0x00000000,
-    kMatterClusterIasZoneCommandInitiateNormalOperationModeID = 0x00000001,
-    kMatterClusterIasZoneCommandZoneEnrollRequestID = 0x00000001,
-    kMatterClusterIasZoneCommandInitiateTestModeID = 0x00000002,
-    kMatterClusterIasZoneCommandInitiateNormalOperationModeResponseID = 0x00000002,
-    kMatterClusterIasZoneCommandInitiateTestModeResponseID = 0x00000003,
-
-    // Cluster IasAce commands
-    kMatterClusterIasAceCommandArmID = 0x00000000,
-    kMatterClusterIasAceCommandArmResponseID = 0x00000000,
-    kMatterClusterIasAceCommandBypassID = 0x00000001,
-    kMatterClusterIasAceCommandGetZoneIdMapResponseID = 0x00000001,
-    kMatterClusterIasAceCommandEmergencyID = 0x00000002,
-    kMatterClusterIasAceCommandGetZoneInformationResponseID = 0x00000002,
-    kMatterClusterIasAceCommandFireID = 0x00000003,
-    kMatterClusterIasAceCommandZoneStatusChangedID = 0x00000003,
-    kMatterClusterIasAceCommandPanicID = 0x00000004,
-    kMatterClusterIasAceCommandPanelStatusChangedID = 0x00000004,
-    kMatterClusterIasAceCommandGetZoneIdMapID = 0x00000005,
-    kMatterClusterIasAceCommandGetPanelStatusResponseID = 0x00000005,
-    kMatterClusterIasAceCommandGetZoneInformationID = 0x00000006,
-    kMatterClusterIasAceCommandSetBypassedZoneListID = 0x00000006,
-    kMatterClusterIasAceCommandGetPanelStatusID = 0x00000007,
-    kMatterClusterIasAceCommandBypassResponseID = 0x00000007,
-    kMatterClusterIasAceCommandGetBypassedZoneListID = 0x00000008,
-    kMatterClusterIasAceCommandGetZoneStatusResponseID = 0x00000008,
-    kMatterClusterIasAceCommandGetZoneStatusID = 0x00000009,
-
-    // Cluster IasWd commands
-    kMatterClusterIasWdCommandStartWarningID = 0x00000000,
-    kMatterClusterIasWdCommandSquawkID = 0x00000001,
-
     // Cluster Channel commands
     kMatterClusterChannelCommandChangeChannelID = 0x00000000,
     kMatterClusterChannelCommandChangeChannelResponseID = 0x00000001,
@@ -2459,6 +2364,35 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterAccountLoginCommandLoginID = 0x00000002,
     kMatterClusterAccountLoginCommandLogoutID = 0x00000003,
 
+    // Cluster Messaging commands
+    kMatterClusterMessagingCommandDisplayMessageID = 0x00000000,
+    kMatterClusterMessagingCommandGetLastMessageID = 0x00000000,
+    kMatterClusterMessagingCommandCancelMessageID = 0x00000001,
+    kMatterClusterMessagingCommandMessageConfirmationID = 0x00000001,
+    kMatterClusterMessagingCommandDisplayProtectedMessageID = 0x00000002,
+    kMatterClusterMessagingCommandGetMessageCancellationID = 0x00000002,
+    kMatterClusterMessagingCommandCancelAllMessagesID = 0x00000003,
+
+    // Cluster ApplianceEventsAndAlert commands
+    kMatterClusterApplianceEventsAndAlertCommandGetAlertsID = 0x00000000,
+    kMatterClusterApplianceEventsAndAlertCommandGetAlertsResponseID = 0x00000000,
+    kMatterClusterApplianceEventsAndAlertCommandAlertsNotificationID = 0x00000001,
+    kMatterClusterApplianceEventsAndAlertCommandEventsNotificationID = 0x00000002,
+
+    // Cluster ApplianceStatistics commands
+    kMatterClusterApplianceStatisticsCommandLogNotificationID = 0x00000000,
+    kMatterClusterApplianceStatisticsCommandLogRequestID = 0x00000000,
+    kMatterClusterApplianceStatisticsCommandLogResponseID = 0x00000001,
+    kMatterClusterApplianceStatisticsCommandLogQueueRequestID = 0x00000001,
+    kMatterClusterApplianceStatisticsCommandLogQueueResponseID = 0x00000002,
+    kMatterClusterApplianceStatisticsCommandStatisticsAvailableID = 0x00000003,
+
+    // Cluster ElectricalMeasurement commands
+    kMatterClusterElectricalMeasurementCommandGetProfileInfoResponseCommandID = 0x00000000,
+    kMatterClusterElectricalMeasurementCommandGetProfileInfoCommandID = 0x00000000,
+    kMatterClusterElectricalMeasurementCommandGetMeasurementProfileResponseCommandID = 0x00000001,
+    kMatterClusterElectricalMeasurementCommandGetMeasurementProfileCommandID = 0x00000001,
+
     // Cluster TestCluster commands
     kMatterClusterTestClusterCommandTestID = 0x00000000,
     kMatterClusterTestClusterCommandTestSpecificResponseID = 0x00000000,
@@ -2495,35 +2429,6 @@ typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) {
     kMatterClusterTestClusterCommandTestEmitTestEventRequestID = 0x00000014,
     kMatterClusterTestClusterCommandTestEmitTestFabricScopedEventRequestID = 0x00000015,
 
-    // Cluster Messaging commands
-    kMatterClusterMessagingCommandDisplayMessageID = 0x00000000,
-    kMatterClusterMessagingCommandGetLastMessageID = 0x00000000,
-    kMatterClusterMessagingCommandCancelMessageID = 0x00000001,
-    kMatterClusterMessagingCommandMessageConfirmationID = 0x00000001,
-    kMatterClusterMessagingCommandDisplayProtectedMessageID = 0x00000002,
-    kMatterClusterMessagingCommandGetMessageCancellationID = 0x00000002,
-    kMatterClusterMessagingCommandCancelAllMessagesID = 0x00000003,
-
-    // Cluster ApplianceEventsAndAlert commands
-    kMatterClusterApplianceEventsAndAlertCommandGetAlertsID = 0x00000000,
-    kMatterClusterApplianceEventsAndAlertCommandGetAlertsResponseID = 0x00000000,
-    kMatterClusterApplianceEventsAndAlertCommandAlertsNotificationID = 0x00000001,
-    kMatterClusterApplianceEventsAndAlertCommandEventsNotificationID = 0x00000002,
-
-    // Cluster ApplianceStatistics commands
-    kMatterClusterApplianceStatisticsCommandLogNotificationID = 0x00000000,
-    kMatterClusterApplianceStatisticsCommandLogRequestID = 0x00000000,
-    kMatterClusterApplianceStatisticsCommandLogResponseID = 0x00000001,
-    kMatterClusterApplianceStatisticsCommandLogQueueRequestID = 0x00000001,
-    kMatterClusterApplianceStatisticsCommandLogQueueResponseID = 0x00000002,
-    kMatterClusterApplianceStatisticsCommandStatisticsAvailableID = 0x00000003,
-
-    // Cluster ElectricalMeasurement commands
-    kMatterClusterElectricalMeasurementCommandGetProfileInfoResponseCommandID = 0x00000000,
-    kMatterClusterElectricalMeasurementCommandGetProfileInfoCommandID = 0x00000000,
-    kMatterClusterElectricalMeasurementCommandGetMeasurementProfileResponseCommandID = 0x00000001,
-    kMatterClusterElectricalMeasurementCommandGetMeasurementProfileCommandID = 0x00000001,
-
 };
 
 #pragma mark - Events IDs
diff --git a/src/include/platform/BuildTime.h b/src/include/platform/BuildTime.h
new file mode 100644
index 00000000000000..8015a534778a19
--- /dev/null
+++ b/src/include/platform/BuildTime.h
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// Adapted from https://stackoverflow.com/questions/11697820/how-to-use-date-and-time-predefined-macros-in-as-two-integers-then-stri
+
+#pragma once
+
+#include <platform/CHIPDeviceConfig.h>
+
+// Expects input as provided by __DATE__ and __TIME__ macros.
+//
+// Example of __DATE__ string: "Jul 27 2012"
+// Example of __DATE__ string: "Jul  2 2012" -> note leading whitespace for single-digit day of month
+// Example of __TIME__ string: "21:06:19"
+
+#define COMPUTE_BUILD_YEAR(_date)                                                                                                  \
+    (((_date)[7] - '0') * 1000 + ((_date)[8] - '0') * 100 + ((_date)[9] - '0') * 10 + ((_date)[10] - '0'))
+
+#define COMPUTE_BUILD_DAY(_date) ((((_date)[4] >= '0') ? ((_date)[4] - '0') * 10 : 0) + ((_date)[5] - '0'))
+
+#define BUILD_MONTH_IS_JAN(_date) ((_date)[0] == 'J' && (_date)[1] == 'a')
+#define BUILD_MONTH_IS_FEB(_date) ((_date)[0] == 'F')
+#define BUILD_MONTH_IS_MAR(_date) ((_date)[0] == 'M' && (_date)[1] == 'a' && (_date)[2] == 'r')
+#define BUILD_MONTH_IS_APR(_date) ((_date)[0] == 'A' && (_date)[1] == 'p')
+#define BUILD_MONTH_IS_MAY(_date) ((_date)[0] == 'M' && (_date)[1] == 'a' && (_date)[2] == 'y')
+#define BUILD_MONTH_IS_JUN(_date) ((_date)[0] == 'J' && (_date)[1] == 'u' && (_date)[2] == 'n')
+#define BUILD_MONTH_IS_JUL(_date) ((_date)[0] == 'J' && (_date)[1] == 'u' && (_date)[2] == 'l')
+#define BUILD_MONTH_IS_AUG(_date) ((_date)[0] == 'A' && (_date)[1] == 'u')
+#define BUILD_MONTH_IS_SEP(_date) ((_date)[0] == 'S')
+#define BUILD_MONTH_IS_OCT(_date) ((_date)[0] == 'O')
+#define BUILD_MONTH_IS_NOV(_date) ((_date)[0] == 'N')
+#define BUILD_MONTH_IS_DEC(_date) ((_date)[0] == 'D')
+
+#define COMPUTE_BUILD_MONTH(_date)                                                                                                 \
+    ((BUILD_MONTH_IS_JAN(_date))                                                                                                   \
+         ? 1                                                                                                                       \
+         : (BUILD_MONTH_IS_FEB(_date)) ? 2                                                                                         \
+                                       : (BUILD_MONTH_IS_MAR(_date)) ? 3                                                           \
+                                                                     : (BUILD_MONTH_IS_APR(_date)) ? 4                             \
+                                                                                                   : (BUILD_MONTH_IS_MAY(_date))   \
+                         ? 5                                                                                                       \
+                         : (BUILD_MONTH_IS_JUN(_date)) ? 6                                                                         \
+                                                       : (BUILD_MONTH_IS_JUL(_date)) ? 7                                           \
+                                                                                     : (BUILD_MONTH_IS_AUG(_date))                 \
+                                     ? 8                                                                                           \
+                                     : (BUILD_MONTH_IS_SEP(_date)) ? 9                                                             \
+                                                                   : (BUILD_MONTH_IS_OCT(_date)) ? 10                              \
+                                                                                                 : (BUILD_MONTH_IS_NOV(_date))     \
+                                                 ? 11                                                                              \
+                                                 : (BUILD_MONTH_IS_DEC(_date)) ? 12 : /* error default */ 99)
+
+#define COMPUTE_BUILD_HOUR(_time) (((_time)[0] - '0') * 10 + (_time)[1] - '0')
+#define COMPUTE_BUILD_MIN(_time) (((_time)[3] - '0') * 10 + (_time)[4] - '0')
+#define COMPUTE_BUILD_SEC(_time) (((_time)[6] - '0') * 10 + (_time)[7] - '0')
+
+#define BUILD_DATE_IS_BAD(_date) ((_date) == nullptr || strlen(_date) < strlen("Jan 01 2000") || (_date)[0] == '?')
+#define BUILD_TIME_IS_BAD(_time) ((_time) == nullptr || strlen(_time) < strlen("00:00:00") || (_time)[0] == '?')
diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h
index 8c84494a9d6c0e..286efee3a7c1a2 100644
--- a/src/include/platform/CHIPDeviceConfig.h
+++ b/src/include/platform/CHIPDeviceConfig.h
@@ -1176,8 +1176,8 @@
  *
  * Specifies the date of the build. Useful for deterministic builds.
  */
-#ifndef CHIP_DEVICE_CONFIG_FIRWMARE_BUILD_DATE
-#define CHIP_DEVICE_CONFIG_FIRWMARE_BUILD_DATE __DATE__
+#ifndef CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_DATE
+#define CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_DATE __DATE__
 #endif
 
 /**
diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h
index 796e4ab7a3dfc8..0b67eef7f88f67 100644
--- a/src/include/platform/CHIPDeviceEvent.h
+++ b/src/include/platform/CHIPDeviceEvent.h
@@ -470,15 +470,15 @@ struct ChipDeviceEvent final
 
         struct
         {
-            uint64_t PeerNodeId;
-            FabricIndex PeerFabricIndex;
+            uint64_t nodeId;
+            FabricIndex fabricIndex;
         } CommissioningComplete;
 
         struct
         {
-            FabricIndex PeerFabricIndex;
-            bool AddNocCommandHasBeenInvoked;
-            bool UpdateNocCommandHasBeenInvoked;
+            FabricIndex fabricIndex;
+            bool addNocCommandHasBeenInvoked;
+            bool updateNocCommandHasBeenInvoked;
         } FailSafeTimerExpired;
 
         struct
diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
index 027e0a547d2311..7b3be4d4b6bf4a 100644
--- a/src/include/platform/ConfigurationManager.h
+++ b/src/include/platform/ConfigurationManager.h
@@ -85,27 +85,22 @@ class ConfigurationManager
         kMaxLanguageTagLength = 5 // ISO 639-1 standard language codes
     };
 
-    virtual CHIP_ERROR GetVendorName(char * buf, size_t bufSize)                                    = 0;
-    virtual CHIP_ERROR GetVendorId(uint16_t & vendorId)                                             = 0;
-    virtual CHIP_ERROR GetProductName(char * buf, size_t bufSize)                                   = 0;
-    virtual CHIP_ERROR GetProductId(uint16_t & productId)                                           = 0;
-    virtual CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize)                         = 0;
-    virtual CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVer)                                   = 0;
-    virtual CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize)                                  = 0;
-    virtual CHIP_ERROR GetPrimaryMACAddress(MutableByteSpan buf)                                    = 0;
-    virtual CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf)                                      = 0;
-    virtual CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf)                                    = 0;
-    virtual CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth) = 0;
-    virtual CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize)                         = 0;
-    virtual CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer)                                   = 0;
+    virtual CHIP_ERROR GetVendorName(char * buf, size_t bufSize)                           = 0;
+    virtual CHIP_ERROR GetVendorId(uint16_t & vendorId)                                    = 0;
+    virtual CHIP_ERROR GetProductName(char * buf, size_t bufSize)                          = 0;
+    virtual CHIP_ERROR GetProductId(uint16_t & productId)                                  = 0;
+    virtual CHIP_ERROR GetPrimaryMACAddress(MutableByteSpan buf)                           = 0;
+    virtual CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf)                             = 0;
+    virtual CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf)                           = 0;
+    virtual CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize)                = 0;
+    virtual CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer)                          = 0;
+    virtual CHIP_ERROR GetFirmwareBuildChipEpochTime(System::Clock::Seconds32 & buildTime) = 0;
+    virtual CHIP_ERROR SetFirmwareBuildChipEpochTime(System::Clock::Seconds32 buildTime) { return CHIP_ERROR_NOT_IMPLEMENTED; }
 #if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
     // Lifetime counter is monotonic counter that is incremented upon each commencement of advertising
-    virtual CHIP_ERROR GetLifetimeCounter(uint16_t & lifetimeCounter) = 0;
-    virtual CHIP_ERROR IncrementLifetimeCounter()                     = 0;
-    // Unique ID is identifier utilized for the rotating device ID calculation purpose as an input key. It is separate identifier
-    // from the Basic cluster unique ID.
-    virtual CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) = 0;
-    virtual CHIP_ERROR SetRotatingDeviceIdUniqueId(const ByteSpan & uniqueIdSpan)  = 0;
+    virtual CHIP_ERROR GetLifetimeCounter(uint16_t & lifetimeCounter)             = 0;
+    virtual CHIP_ERROR IncrementLifetimeCounter()                                 = 0;
+    virtual CHIP_ERROR SetRotatingDeviceIdUniqueId(const ByteSpan & uniqueIdSpan) = 0;
 #endif
     virtual CHIP_ERROR GetRegulatoryLocation(uint8_t & location)                       = 0;
     virtual CHIP_ERROR GetCountryCode(char * buf, size_t bufSize, size_t & codeLen)    = 0;
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
index 105f70a74ee506..a44b1c53321a96 100644
--- a/src/include/platform/ConnectivityManager.h
+++ b/src/include/platform/ConnectivityManager.h
@@ -221,6 +221,12 @@ class ConnectivityManager
     CHIPoBLEServiceMode GetCHIPoBLEServiceMode();
     CHIP_ERROR SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
     bool IsBLEAdvertisingEnabled();
+    /**
+     * Enable or disable BLE advertising.
+     *
+     * @return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE if BLE advertising is not
+     * supported or other error on other failures.
+     */
     CHIP_ERROR SetBLEAdvertisingEnabled(bool val);
     bool IsBLEAdvertising();
     CHIP_ERROR SetBLEAdvertisingMode(BLEAdvertisingMode mode);
diff --git a/src/include/platform/DeviceControlServer.h b/src/include/platform/DeviceControlServer.h
index b43ba515c7f935..865211e016ad86 100644
--- a/src/include/platform/DeviceControlServer.h
+++ b/src/include/platform/DeviceControlServer.h
@@ -34,9 +34,9 @@ class DeviceControlServer final
 public:
     // ===== Members for internal use by other Device Layer components.
 
-    CHIP_ERROR CommissioningComplete(NodeId peerNodeId, FabricIndex accessingFabricIndex);
+    CHIP_ERROR PostCommissioningCompleteEvent(NodeId peerNodeId, FabricIndex accessingFabricIndex);
     CHIP_ERROR SetRegulatoryConfig(uint8_t location, const CharSpan & countryCode);
-    CHIP_ERROR ConnectNetworkForOperational(ByteSpan networkID);
+    CHIP_ERROR PostConnectedToOperationalNetworkEvent(ByteSpan networkID);
 
     FailSafeContext & GetFailSafeContext() { return mFailSafeContext; }
 
diff --git a/src/include/platform/DeviceInstanceInfoProvider.h b/src/include/platform/DeviceInstanceInfoProvider.h
new file mode 100644
index 00000000000000..1735aac4fa9822
--- /dev/null
+++ b/src/include/platform/DeviceInstanceInfoProvider.h
@@ -0,0 +1,124 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <lib/core/CHIPError.h>
+#include <lib/support/Span.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+class DeviceInstanceInfoProvider
+{
+public:
+    DeviceInstanceInfoProvider()          = default;
+    virtual ~DeviceInstanceInfoProvider() = default;
+
+    /**
+     * @brief Obtain the Serial Number from the device's factory data.
+     *
+     * The SerialNumber attribute specifies a human readable serial number
+     *
+     * @param[in, out] buf Buffer to copy string.
+     *                 On CHIP_NO_ERROR return from this function this buffer will be null-terminated.
+     *                 On error CHIP_ERROR_BUFFER_TOO_SMALL there is no guarantee that buffer will be null-terminated.
+     * @param[in] bufSize Size of data, including the null terminator, that can be written to buf.
+     *                    This size should be +1 higher than maximum possible string.
+     * @returns CHIP_NO_ERROR on success, or another CHIP_ERROR from the underlying implementation
+     *          if access fails.
+     */
+    virtual CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) = 0;
+
+    /**
+     * @brief Obtain a manufacturing date from the device's factory data.
+     *
+     * The ManufacturingDate attribute specifies the date that the Node was manufactured.
+     * Output values are returned in ISO 8601, where:
+     *      The first month of the year is January and its returning value is equal to 1.
+     *      The first day of a month starts from 1.
+     *
+     * @param[out] year Reference to location where manufacturing year will be stored
+     * @param[out] month 1-based value [range 1-12] Reference to location where manufacturing month will be stored
+     * @param[out] day 1-based value [range 1-31] Reference to location where manufacturing day will be stored
+     * @returns CHIP_NO_ERROR on success, or another CHIP_ERROR from the underlying implementation
+     *          if access fails.
+     */
+    virtual CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) = 0;
+
+    /**
+     * @brief Obtain a Hardware Version from the device's factory data.
+     *
+     * @param[out] hardwareVersion Reference to location where the hardware version integer will be copied
+     * @returns CHIP_NO_ERROR on success, or another CHIP_ERROR from the underlying implementation
+     *          if access fails.
+     */
+    virtual CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) = 0;
+
+    /**
+     * @brief Obtain a Hardware Version String from the device's factory data.
+     *
+     * The HardwareVersionString can be used to provide a more user-friendly value than that
+     * represented by the HardwareVersion attribute.
+     *
+     * @param[in, out] buf Buffer to copy string.
+     *                     On CHIP_NO_ERROR return from this function this buffer will be null-terminated.
+     *                     On error CHIP_ERROR_BUFFER_TOO_SMALL there is no guarantee that buffer will be null-terminated.
+     * @param[in] bufSize Size of data, including the null terminator, that can be written to buf.
+     *                    This size should be +1 higher than maximum possible string.
+     * @returns CHIP_NO_ERROR on success, CHIP_ERROR_BUFFER_TOO_SMALL if the buffer was too small to fit string and null
+     * terminating. or another CHIP_ERROR from the underlying implementation if access fails.
+     */
+    virtual CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) = 0;
+
+    /**
+     * @brief Obtain a Rotating Device ID Unique ID from the device's factory data.
+     *
+     * The unique identifier consists of a randomly-generated 128-bit or longer octet string which
+     * was programmed during factory provisioning or delivered to the device by the vendor using
+     * secure means after a software update.
+     *
+     * @param[out] uniqueIdSpan Reference to location where the Rotating Device ID Unique ID will be copied
+     *                          According to specification input size of span buffer should be declared with at least 16 Bytes
+     * length The size of uniqueIdSpan is reduced to actual value on success
+     * @returns CHIP_NO_ERROR on success, or another CHIP_ERROR from the underlying implementation
+     *          if access fails.
+     */
+    virtual CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) = 0;
+};
+
+/**
+ * Instance getter for the global DeviceInstanceInfoProvider.
+ *
+ * Callers have to externally synchronize usage of this function.
+ *
+ * @return The pointer to global device instance info provider. Assume never null.
+ */
+DeviceInstanceInfoProvider * GetDeviceInstanceInfoProvider();
+
+/**
+ * Instance setter for the global DeviceInstanceInfoProvider.
+ *
+ * Callers have to externally synchronize usage of this function.
+ *
+ * If the `provider` is nullptr, no change is done.
+ *
+ * @param[in] provider the DeviceInstanceInfoProvider pointer to start returning with the getter
+ */
+void SetDeviceInstanceInfoProvider(DeviceInstanceInfoProvider * provider);
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h
index 599139ed6c4880..a53ee3d8979411 100644
--- a/src/include/platform/DiagnosticDataProvider.h
+++ b/src/include/platform/DiagnosticDataProvider.h
@@ -62,57 +62,6 @@ struct NetworkInterface : public app::Clusters::GeneralDiagnostics::Structs::Net
     NetworkInterface * Next; /* Pointer to the next structure.  */
 };
 
-/**
- * Defines the General Diagnostics Delegate class to notify platform events.
- */
-class GeneralDiagnosticsDelegate
-{
-public:
-    virtual ~GeneralDiagnosticsDelegate() {}
-
-    /**
-     * @brief
-     *   Called after the current device is rebooted.
-     */
-    virtual void OnDeviceRebooted(BootReasonType bootReason) {}
-
-    /**
-     * @brief
-     *   Called when the Node detects a hardware fault has been raised.
-     */
-    virtual void OnHardwareFaultsDetected(GeneralFaults<kMaxHardwareFaults> & previous, GeneralFaults<kMaxHardwareFaults> & current)
-    {}
-
-    /**
-     * @brief
-     *   Called when the Node detects a radio fault has been raised.
-     */
-    virtual void OnRadioFaultsDetected(GeneralFaults<kMaxRadioFaults> & previous, GeneralFaults<kMaxRadioFaults> & current) {}
-
-    /**
-     * @brief
-     *   Called when the Node detects a network fault has been raised.
-     */
-    virtual void OnNetworkFaultsDetected(GeneralFaults<kMaxNetworkFaults> & previous, GeneralFaults<kMaxNetworkFaults> & current) {}
-};
-
-/**
- * Defines the Software Diagnostics Delegate class to notify software events.
- */
-class SoftwareDiagnosticsDelegate
-{
-public:
-    virtual ~SoftwareDiagnosticsDelegate() {}
-
-    /**
-     * @brief
-     *   Called when a software fault that has taken place on the Node.
-     */
-    virtual void
-    OnSoftwareFaultDetected(chip::app::Clusters::SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type & softwareFault)
-    {}
-};
-
 /**
  * Defines the WiFi Diagnostics Delegate class to notify WiFi network events.
  */
@@ -146,12 +95,6 @@ class WiFiDiagnosticsDelegate
 class DiagnosticDataProvider
 {
 public:
-    void SetGeneralDiagnosticsDelegate(GeneralDiagnosticsDelegate * delegate) { mGeneralDiagnosticsDelegate = delegate; }
-    GeneralDiagnosticsDelegate * GetGeneralDiagnosticsDelegate() const { return mGeneralDiagnosticsDelegate; }
-
-    void SetSoftwareDiagnosticsDelegate(SoftwareDiagnosticsDelegate * delegate) { mSoftwareDiagnosticsDelegate = delegate; }
-    SoftwareDiagnosticsDelegate * GetSoftwareDiagnosticsDelegate() const { return mSoftwareDiagnosticsDelegate; }
-
     void SetWiFiDiagnosticsDelegate(WiFiDiagnosticsDelegate * delegate) { mWiFiDiagnosticsDelegate = delegate; }
     WiFiDiagnosticsDelegate * GetWiFiDiagnosticsDelegate() const { return mWiFiDiagnosticsDelegate; }
 
@@ -177,6 +120,10 @@ class DiagnosticDataProvider
     /**
      * Software Diagnostics methods.
      */
+
+    /// Feature support - this returns support gor GetCurrentHeapHighWatermark and ResetWatermarks()
+    virtual bool SupportsWatermarks() { return false; }
+
     virtual CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree);
     virtual CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed);
     virtual CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark);
@@ -228,9 +175,7 @@ class DiagnosticDataProvider
     virtual ~DiagnosticDataProvider() = default;
 
 private:
-    GeneralDiagnosticsDelegate * mGeneralDiagnosticsDelegate   = nullptr;
-    SoftwareDiagnosticsDelegate * mSoftwareDiagnosticsDelegate = nullptr;
-    WiFiDiagnosticsDelegate * mWiFiDiagnosticsDelegate         = nullptr;
+    WiFiDiagnosticsDelegate * mWiFiDiagnosticsDelegate = nullptr;
 
     // No copy, move or assignment.
     DiagnosticDataProvider(const DiagnosticDataProvider &)  = delete;
diff --git a/src/include/platform/FailSafeContext.h b/src/include/platform/FailSafeContext.h
index 75640c77a7f14f..ce7a3300efd97e 100644
--- a/src/include/platform/FailSafeContext.h
+++ b/src/include/platform/FailSafeContext.h
@@ -40,9 +40,15 @@ class FailSafeContext
      *  first be cancelled, then the fail-safe timer will be re-armed.
      */
     CHIP_ERROR ArmFailSafe(FabricIndex accessingFabricIndex, System::Clock::Timeout expiryLength);
-    CHIP_ERROR DisarmFailSafe();
+
+    /**
+     * @brief Cleanly disarm failsafe timer, such as on CommissioningComplete
+     */
+    void DisarmFailSafe();
     CHIP_ERROR SetAddNocCommandInvoked(FabricIndex nocFabricIndex);
     CHIP_ERROR SetUpdateNocCommandInvoked();
+    void SetAddTrustedRootCertInvoked() { mAddTrustedRootCertHasBeenInvoked = true; }
+    void SetCsrRequestForUpdateNoc(bool isForUpdateNoc) { mIsCsrRequestForUpdateNoc = isForUpdateNoc; }
 
     /**
      * @brief
@@ -51,28 +57,30 @@ class FailSafeContext
      */
     void ScheduleFailSafeCleanup(FabricIndex fabricIndex, bool addNocCommandInvoked, bool updateNocCommandInvoked);
 
-    inline bool IsFailSafeArmed(FabricIndex accessingFabricIndex) const
+    bool IsFailSafeArmed(FabricIndex accessingFabricIndex) const
     {
         return mFailSafeArmed && MatchesFabricIndex(accessingFabricIndex);
     }
 
     // Returns true if the fail-safe is in a state where commands that require an armed
     // fail-safe can no longer execute, but a new fail-safe can't be armed yet.
-    inline bool IsFailSafeBusy() const { return mFailSafeBusy; }
+    bool IsFailSafeBusy() const { return mFailSafeBusy; }
 
-    inline bool IsFailSafeArmed() const { return mFailSafeArmed; }
+    bool IsFailSafeArmed() const { return mFailSafeArmed; }
 
-    inline bool MatchesFabricIndex(FabricIndex accessingFabricIndex) const
+    bool MatchesFabricIndex(FabricIndex accessingFabricIndex) const
     {
         VerifyOrDie(mFailSafeArmed);
         return (accessingFabricIndex == mFabricIndex);
     }
 
-    inline bool NocCommandHasBeenInvoked() const { return mAddNocCommandHasBeenInvoked || mUpdateNocCommandHasBeenInvoked; }
-    inline bool AddNocCommandHasBeenInvoked() { return mAddNocCommandHasBeenInvoked; }
-    inline bool UpdateNocCommandHasBeenInvoked() { return mUpdateNocCommandHasBeenInvoked; }
+    bool NocCommandHasBeenInvoked() const { return mAddNocCommandHasBeenInvoked || mUpdateNocCommandHasBeenInvoked; }
+    bool AddNocCommandHasBeenInvoked() const { return mAddNocCommandHasBeenInvoked; }
+    bool UpdateNocCommandHasBeenInvoked() const { return mUpdateNocCommandHasBeenInvoked; }
+    bool AddTrustedRootCertHasBeenInvoked() const { return mAddTrustedRootCertHasBeenInvoked; }
+    bool IsCsrRequestForUpdateNoc() const { return mIsCsrRequestForUpdateNoc; }
 
-    inline FabricIndex GetFabricIndex() const
+    FabricIndex GetFabricIndex() const
     {
         VerifyOrDie(mFailSafeArmed);
         return mFabricIndex;
@@ -86,13 +94,14 @@ class FailSafeContext
     static CHIP_ERROR DeleteFromStorage();
 
 private:
-    // ===== Private members reserved for use by this class only.
-
-    bool mFailSafeArmed                  = false;
-    bool mFailSafeBusy                   = false;
-    bool mAddNocCommandHasBeenInvoked    = false;
-    bool mUpdateNocCommandHasBeenInvoked = false;
-    FabricIndex mFabricIndex             = kUndefinedFabricIndex;
+    bool mFailSafeArmed                    = false;
+    bool mFailSafeBusy                     = false;
+    bool mAddNocCommandHasBeenInvoked      = false;
+    bool mUpdateNocCommandHasBeenInvoked   = false;
+    bool mAddTrustedRootCertHasBeenInvoked = false;
+    // The fact of whether a CSR occurred at all is stored elsewhere.
+    bool mIsCsrRequestForUpdateNoc = false;
+    FabricIndex mFabricIndex       = kUndefinedFabricIndex;
 
     // TODO:: Track the state of what was mutated during fail-safe.
 
@@ -114,6 +123,19 @@ class FailSafeContext
      */
     static void HandleDisarmFailSafe(intptr_t arg);
 
+    /**
+     * @brief Reset to unarmed basic state
+     */
+    void ResetState()
+    {
+        mFailSafeArmed                    = false;
+        mAddNocCommandHasBeenInvoked      = false;
+        mUpdateNocCommandHasBeenInvoked   = false;
+        mAddTrustedRootCertHasBeenInvoked = false;
+        mFailSafeBusy                     = false;
+        mIsCsrRequestForUpdateNoc         = false;
+    }
+
     void FailSafeTimerExpired();
     CHIP_ERROR CommitToStorage();
 };
diff --git a/src/include/platform/GeneralFaults.h b/src/include/platform/GeneralFaults.h
index 9994449e122416..182a4e32cbdefc 100644
--- a/src/include/platform/GeneralFaults.h
+++ b/src/include/platform/GeneralFaults.h
@@ -54,7 +54,7 @@ class GeneralFaults
 
     CHIP_ERROR add(const uint8_t value);
 
-    uint8_t * data() { return mData; }
+    const uint8_t * data() const { return mData; }
     size_t size() const;
     uint8_t operator[](int index) const;
 
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.h b/src/include/platform/internal/GenericConfigurationManagerImpl.h
index e42386d28f48bd..db479f90643b00 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.h
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.h
@@ -40,6 +40,11 @@ class ProvisioningDataSet;
 
 namespace Internal {
 
+#if CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+template <class ConfigClass>
+class LegacyDeviceInstanceInfoProvider;
+#endif // CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+
 #if CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER
 template <class ConfigClass>
 class LegacyTemporaryCommissionableDataProvider;
@@ -63,23 +68,20 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
     CHIP_ERROR GetVendorId(uint16_t & vendorId) override;
     CHIP_ERROR GetProductName(char * buf, size_t bufSize) override;
     CHIP_ERROR GetProductId(uint16_t & productId) override;
-    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override;
-    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVer) override;
     CHIP_ERROR StoreHardwareVersion(uint16_t hardwareVer) override;
     CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize) override;
     CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer) override;
     CHIP_ERROR StoreSoftwareVersion(uint32_t softwareVer) override;
-    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetFirmwareBuildChipEpochTime(System::Clock::Seconds32 & buildTime) override;
+    CHIP_ERROR SetFirmwareBuildChipEpochTime(System::Clock::Seconds32 buildTime) override;
     CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) override;
     CHIP_ERROR GetPrimaryMACAddress(MutableByteSpan buf) override;
     CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override;
     CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf) override;
-    CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth) override;
     CHIP_ERROR StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen) override;
 #if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
     CHIP_ERROR GetLifetimeCounter(uint16_t & lifetimeCounter) override;
     CHIP_ERROR IncrementLifetimeCounter() override;
-    CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override;
     CHIP_ERROR SetRotatingDeviceIdUniqueId(const ByteSpan & uniqueIdSpan) override;
 #endif
     CHIP_ERROR GetFailSafeArmed(bool & val) override;
@@ -127,6 +129,10 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
     uint8_t mRotatingDeviceIdUniqueId[kRotatingDeviceIDUniqueIDLength] = CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID;
 #endif
 
+#if CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+    friend LegacyDeviceInstanceInfoProvider<ConfigClass>;
+#endif // CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+
 #if CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER
     friend LegacyTemporaryCommissionableDataProvider<ConfigClass>;
 #endif // CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
index eb10c2a46d46ea..5c3044478626e0 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
@@ -38,6 +38,8 @@
 #include <lib/support/ScopedBuffer.h>
 #include <platform/CommissionableDataProvider.h>
 #include <platform/DeviceControlServer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
+#include <platform/BuildTime.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/GenericConfigurationManagerImpl.h>
 
@@ -52,6 +54,163 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
+static Optional<System::Clock::Seconds32> sFirmwareBuildChipEpochTime;
+
+#if CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+template <class ConfigClass>
+class LegacyDeviceInstanceInfoProvider : public DeviceInstanceInfoProvider
+{
+
+public:
+    // GenericConfigurationManagerImpl will own a LegacyDeviceInstanceInfoProvider which
+    // *refers back to that GenericConfigurationManagerImpl*, due to how CRTP-based
+    // storage APIs are defined. This is a bit unclean, but only applicable to the
+    // transition path when `CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER` is true.
+    // This circular dependency is NOT needed by DeviceInstanceInfoProvider, but required
+    // to keep legacy code running.
+    LegacyDeviceInstanceInfoProvider(GenericConfigurationManagerImpl<ConfigClass> & configManager) :
+        mGenericConfigManager(configManager)
+    {}
+
+    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override;
+    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override;
+    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override;
+
+private:
+    GenericConfigurationManagerImpl<ConfigClass> & mGenericConfigManager;
+};
+
+template <class ConfigClass>
+CHIP_ERROR LegacyDeviceInstanceInfoProvider<ConfigClass>::GetSerialNumber(char * buf, size_t bufSize)
+{
+    ChipError err       = CHIP_NO_ERROR;
+    size_t serialNumLen = 0; // without counting null-terminator
+
+    err = mGenericConfigManager.ReadConfigValueStr(ConfigClass::kConfigKey_SerialNum, buf, bufSize, serialNumLen);
+
+#ifdef CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
+    if (CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER[0] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        ReturnErrorCodeIf(sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER) > bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
+        memcpy(buf, CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER, sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER));
+        serialNumLen = sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER) - 1;
+    }
+#endif // CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
+    ReturnErrorOnFailure(err);
+
+    ReturnErrorCodeIf(serialNumLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
+    ReturnErrorCodeIf(buf[serialNumLen] != 0, CHIP_ERROR_INVALID_STRING_LENGTH);
+
+    return err;
+}
+
+template <class ConfigClass>
+CHIP_ERROR LegacyDeviceInstanceInfoProvider<ConfigClass>::GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day)
+{
+#if CHIP_DEVICE_LAYER_TARGET_FAKE
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#else
+
+    CHIP_ERROR err;
+    enum
+    {
+        kDateStringLength = 10 // YYYY-MM-DD
+    };
+    char dateStr[kDateStringLength + 1];
+    size_t dateLen;
+    char * parseEnd;
+
+    err = mGenericConfigManager.ReadConfigValueStr(ConfigClass::kConfigKey_ManufacturingDate, dateStr, sizeof(dateStr), dateLen);
+    SuccessOrExit(err);
+
+    VerifyOrExit(dateLen == kDateStringLength, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Cast does not lose information, because we then check that we only parsed
+    // 4 digits, so our number can't be bigger than 9999.
+    year = static_cast<uint16_t>(strtoul(dateStr, &parseEnd, 10));
+    VerifyOrExit(parseEnd == dateStr + 4, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Cast does not lose information, because we then check that we only parsed
+    // 2 digits, so our number can't be bigger than 99.
+    month = static_cast<uint8_t>(strtoul(dateStr + 5, &parseEnd, 10));
+    VerifyOrExit(parseEnd == dateStr + 7, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Cast does not lose information, because we then check that we only parsed
+    // 2 digits, so our number can't be bigger than 99.
+    day = static_cast<uint8_t>(strtoul(dateStr + 8, &parseEnd, 10));
+    VerifyOrExit(parseEnd == dateStr + 10, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+exit:
+    if (err != CHIP_NO_ERROR && err != CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        ChipLogError(DeviceLayer, "Invalid manufacturing date: %s", dateStr);
+    }
+    return err;
+#endif
+}
+
+template <class ConfigClass>
+CHIP_ERROR LegacyDeviceInstanceInfoProvider<ConfigClass>::GetHardwareVersion(uint16_t & hardwareVersion)
+{
+    ChipError err   = CHIP_NO_ERROR;
+    uint32_t valInt = 0;
+
+    err = mGenericConfigManager.ReadConfigValue(ConfigClass::kConfigKey_HardwareVersion, valInt);
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        hardwareVersion = static_cast<uint16_t>(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION);
+        err             = CHIP_NO_ERROR;
+    }
+    else
+    {
+        hardwareVersion = static_cast<uint16_t>(valInt);
+    }
+
+    return err;
+}
+
+template <class ConfigClass>
+CHIP_ERROR LegacyDeviceInstanceInfoProvider<ConfigClass>::GetHardwareVersionString(char * buf, size_t bufSize)
+{
+#if CHIP_DEVICE_LAYER_TARGET_ANDROID
+    CHIP_ERROR err;
+    size_t hardwareVersionLen = 0; // without counting null-terminator
+    err = ConfigClass::ReadConfigValueStr(ConfigClass::kConfigKey_HardwareVersionString, buf, bufSize, hardwareVersionLen);
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
+        strcpy(buf, CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING);
+    }
+
+    return err;
+#else
+    ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
+    strcpy(buf, CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING);
+    return CHIP_NO_ERROR;
+#endif
+}
+
+template <class ConfigClass>
+CHIP_ERROR LegacyDeviceInstanceInfoProvider<ConfigClass>::GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan)
+{
+    ChipError err = CHIP_ERROR_WRONG_KEY_TYPE;
+#if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
+    static_assert(ConfigurationManager::kRotatingDeviceIDUniqueIDLength >= ConfigurationManager::kMinRotatingDeviceIDUniqueIDLength,
+                  "Length of unique ID for rotating device ID is smaller than minimum.");
+    constexpr uint8_t uniqueId[] = CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID;
+
+    ReturnErrorCodeIf(sizeof(uniqueId) > uniqueIdSpan.size(), CHIP_ERROR_BUFFER_TOO_SMALL);
+    ReturnErrorCodeIf(sizeof(uniqueId) != ConfigurationManager::kRotatingDeviceIDUniqueIDLength, CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(uniqueIdSpan.data(), uniqueId, sizeof(uniqueId));
+    uniqueIdSpan.reduce_size(sizeof(uniqueId));
+    return CHIP_NO_ERROR;
+#endif
+    return err;
+}
+#endif // CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+
 #if CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER
 
 // Legacy version of CommissionableDataProvider used for a grace period
@@ -231,6 +390,15 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::Init()
     mLifetimePersistedCounter.Init(CHIP_CONFIG_LIFETIIME_PERSISTED_COUNTER_KEY);
 #endif
 
+#if CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER
+    // Using a temporary singleton here because the overall GenericConfigurationManagerImpl is
+    // a singleton. This is TEMPORARY code to set the table for clients to set their own
+    // implementation properly, without loss of functionality for legacy in the meantime.
+    static LegacyDeviceInstanceInfoProvider<ConfigClass> sLegacyDeviceInstanceInfoProvider(*this);
+
+    SetDeviceInstanceInfoProvider(&sLegacyDeviceInstanceInfoProvider);
+#endif
+
 #if CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER
     // Using a temporary singleton here because the overall GenericConfigurationManagerImpl is
     // a singleton. This is TEMPORARY code to set the table for clients to set their own
@@ -249,32 +417,6 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::Init()
         ReturnErrorOnFailure(StoreUniqueId(uniqueId, strlen(uniqueId)));
     }
 
-    bool failSafeArmed = false;
-
-    // If the fail-safe was armed when the device last shutdown, initiate cleanup based on the pending Fail Safe Context with
-    // which the fail-safe timer was armed.
-    if (GetFailSafeArmed(failSafeArmed) == CHIP_NO_ERROR && failSafeArmed)
-    {
-        FabricIndex fabricIndex;
-        bool addNocCommandInvoked;
-        bool updateNocCommandInvoked;
-
-        ChipLogProgress(DeviceLayer, "Detected fail-safe armed on reboot");
-
-        err = FailSafeContext::LoadFromStorage(fabricIndex, addNocCommandInvoked, updateNocCommandInvoked);
-        if (err == CHIP_NO_ERROR)
-        {
-            DeviceControlServer::DeviceControlSvr().GetFailSafeContext().ScheduleFailSafeCleanup(fabricIndex, addNocCommandInvoked, updateNocCommandInvoked);
-        }
-        else
-        {
-            // This should not happen, but we should not fail system init based on it!
-            ChipLogError(DeviceLayer, "Failed to load fail-safe context from storage (err= %" CHIP_ERROR_FORMAT "), cleaning-up!", err.Format());
-            (void)SetFailSafeArmed(false);
-            err = CHIP_NO_ERROR;
-        }
-    }
-
     return err;
 }
 
@@ -305,6 +447,42 @@ inline CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreSoftwareVer
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
+template <class ConfigClass>
+CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetFirmwareBuildChipEpochTime(System::Clock::Seconds32 & chipEpochTime)
+{
+    // If the setter was called and we have a value in memory, return this.
+    if (sFirmwareBuildChipEpochTime.HasValue())
+    {
+        chipEpochTime = sFirmwareBuildChipEpochTime.Value();
+        return CHIP_NO_ERROR;
+    }
+    // Else, attempt to read the hard-coded values.
+    VerifyOrReturnError(!BUILD_DATE_IS_BAD(CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_DATE), CHIP_ERROR_INTERNAL);
+    VerifyOrReturnError(!BUILD_TIME_IS_BAD(CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME), CHIP_ERROR_INTERNAL);
+    const char * date = CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_DATE;
+    const char * time = CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME;
+    uint32_t seconds;
+    auto good = CalendarToChipEpochTime(COMPUTE_BUILD_YEAR(date), COMPUTE_BUILD_MONTH(date), COMPUTE_BUILD_DAY(date), COMPUTE_BUILD_HOUR(time), COMPUTE_BUILD_MIN(time), COMPUTE_BUILD_SEC(time), seconds);
+    if (good)
+    {
+        chipEpochTime = chip::System::Clock::Seconds32(seconds);
+    }
+    return good ? CHIP_NO_ERROR : CHIP_ERROR_INVALID_ARGUMENT;
+}
+
+template <class ConfigClass>
+CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::SetFirmwareBuildChipEpochTime(System::Clock::Seconds32 chipEpochTime)
+{
+    // The setter is sticky in that once the hard-coded time is overriden, it
+    // will be for the lifetime of the configuration manager singleton.
+    // However, this is not persistent across boots.
+    //
+    // Implementations that can't use the hard-coded time for whatever reason
+    // should set this at each init.
+    sFirmwareBuildChipEpochTime.SetValue(chipEpochTime);
+    return CHIP_NO_ERROR;
+}
+
 template <class ConfigClass>
 CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetDeviceTypeId(uint32_t & deviceType)
 {
@@ -350,31 +528,6 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetSoftwareVersionStrin
     return CHIP_NO_ERROR;
 }
 
-template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetSerialNumber(char * buf, size_t bufSize)
-{
-    CHIP_ERROR err;
-    size_t serialNumLen = 0; // without counting null-terminator
-    err                 = ReadConfigValueStr(ConfigClass::kConfigKey_SerialNum, buf, bufSize, serialNumLen);
-
-#ifdef CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
-    if (CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER[0] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-    {
-        ReturnErrorCodeIf(sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER) > bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
-        memcpy(buf, CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER, sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER));
-        serialNumLen = sizeof(CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER) - 1;
-        err          = CHIP_NO_ERROR;
-    }
-#endif // CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
-
-    ReturnErrorOnFailure(err);
-
-    ReturnErrorCodeIf(serialNumLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorCodeIf(buf[serialNumLen] != 0, CHIP_ERROR_INVALID_STRING_LENGTH);
-
-    return err;
-}
-
 template <class ConfigClass>
 CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreSerialNumber(const char * serialNum, size_t serialNumLen)
 {
@@ -422,81 +575,12 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetPrimary802154MACAddr
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 }
 
-template <class ConfigClass>
-inline CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetHardwareVersionString(char * buf, size_t bufSize)
-{
-    ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
-    strcpy(buf, CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING);
-    return CHIP_NO_ERROR;
-}
-
-template <class ConfigClass>
-inline CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetHardwareVersion(uint16_t & hardwareVer)
-{
-    CHIP_ERROR err;
-    uint32_t val;
-
-    err = ReadConfigValue(ConfigClass::kConfigKey_HardwareVersion, val);
-    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-    {
-        hardwareVer = static_cast<uint16_t>(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION);
-        err         = CHIP_NO_ERROR;
-    }
-    else
-    {
-        hardwareVer = static_cast<uint16_t>(val);
-    }
-
-    return err;
-}
-
 template <class ConfigClass>
 inline CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreHardwareVersion(uint16_t hardwareVer)
 {
     return WriteConfigValue(ConfigClass::kConfigKey_HardwareVersion, static_cast<uint32_t>(hardwareVer));
 }
 
-template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetManufacturingDate(uint16_t & year, uint8_t & month,
-                                                                              uint8_t & dayOfMonth)
-{
-    CHIP_ERROR err;
-    enum
-    {
-        kDateStringLength = 10 // YYYY-MM-DD
-    };
-    char dateStr[kDateStringLength + 1];
-    size_t dateLen;
-    char * parseEnd;
-
-    err = ReadConfigValueStr(ConfigClass::kConfigKey_ManufacturingDate, dateStr, sizeof(dateStr), dateLen);
-    SuccessOrExit(err);
-
-    VerifyOrExit(dateLen == kDateStringLength, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    // Cast does not lose information, because we then check that we only parsed
-    // 4 digits, so our number can't be bigger than 9999.
-    year = static_cast<uint16_t>(strtoul(dateStr, &parseEnd, 10));
-    VerifyOrExit(parseEnd == dateStr + 4, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    // Cast does not lose information, because we then check that we only parsed
-    // 2 digits, so our number can't be bigger than 99.
-    month = static_cast<uint8_t>(strtoul(dateStr + 5, &parseEnd, 10));
-    VerifyOrExit(parseEnd == dateStr + 7, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    // Cast does not lose information, because we then check that we only parsed
-    // 2 digits, so our number can't be bigger than 99.
-    dayOfMonth = static_cast<uint8_t>(strtoul(dateStr + 8, &parseEnd, 10));
-    VerifyOrExit(parseEnd == dateStr + 10, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-exit:
-    if (err != CHIP_NO_ERROR && err != CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-    {
-        ChipLogError(DeviceLayer, "Invalid manufacturing date: %s", dateStr);
-    }
-    return err;
-}
-
 template <class ConfigClass>
 CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen)
 {
@@ -646,17 +730,6 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::SetRotatingDeviceIdUniq
     return CHIP_NO_ERROR;
 }
 
-template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan)
-{
-    static_assert(kRotatingDeviceIDUniqueIDLength >= kMinRotatingDeviceIDUniqueIDLength,
-                  "Length of unique ID for rotating device ID is smaller than minimum.");
-    ReturnErrorCodeIf(sizeof(mRotatingDeviceIdUniqueId) > uniqueIdSpan.size(), CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorCodeIf(sizeof(mRotatingDeviceIdUniqueId) != kRotatingDeviceIDUniqueIDLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-    memcpy(uniqueIdSpan.data(), mRotatingDeviceIdUniqueId, sizeof(mRotatingDeviceIdUniqueId));
-    uniqueIdSpan = uniqueIdSpan.SubSpan(0, sizeof(mRotatingDeviceIdUniqueId));
-    return CHIP_NO_ERROR;
-}
 #endif // CHIP_ENABLE_ROTATING_DEVICE_ID
 
 template <class ConfigClass>
@@ -773,9 +846,11 @@ void GenericConfigurationManagerImpl<ConfigClass>::LogDeviceConfig()
 
     ChipLogProgress(DeviceLayer, "Device Configuration:");
 
+    DeviceInstanceInfoProvider * deviceInstanceInfoProvider = GetDeviceInstanceInfoProvider();
+
     {
         char serialNum[ConfigurationManager::kMaxSerialNumberLength + 1];
-        err = GetSerialNumber(serialNum, sizeof(serialNum));
+        err = deviceInstanceInfoProvider->GetSerialNumber(serialNum, sizeof(serialNum));
         ChipLogProgress(DeviceLayer, "  Serial Number: %s", (err == CHIP_NO_ERROR) ? serialNum : "(not set)");
     }
 
@@ -799,7 +874,7 @@ void GenericConfigurationManagerImpl<ConfigClass>::LogDeviceConfig()
 
     {
         uint16_t hardwareVer;
-        if (GetHardwareVersion(hardwareVer) != CHIP_NO_ERROR)
+        if (deviceInstanceInfoProvider->GetHardwareVersion(hardwareVer) != CHIP_NO_ERROR)
         {
             hardwareVer = 0;
         }
@@ -823,14 +898,14 @@ void GenericConfigurationManagerImpl<ConfigClass>::LogDeviceConfig()
         {
             setupDiscriminator = 0xFFFF;
         }
-        ChipLogProgress(DeviceLayer, "  Setup Discriminator (0xFFFF for UNKNOWN/ERROR): %u (0x%X)",
-                        setupDiscriminator, setupDiscriminator);
+        ChipLogProgress(DeviceLayer, "  Setup Discriminator (0xFFFF for UNKNOWN/ERROR): %u (0x%X)", setupDiscriminator,
+                        setupDiscriminator);
     }
 
     {
         uint16_t year;
         uint8_t month, dayOfMonth;
-        err = GetManufacturingDate(year, month, dayOfMonth);
+        err = deviceInstanceInfoProvider->GetManufacturingDate(year, month, dayOfMonth);
         if (err == CHIP_NO_ERROR)
         {
             ChipLogProgress(DeviceLayer, "  Manufacturing Date: %04u/%02u/%02u", year, month, dayOfMonth);
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.ipp b/src/include/platform/internal/GenericPlatformManagerImpl.ipp
index c3e2370748395c..66233710a595b2 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl.ipp
@@ -195,7 +195,6 @@ template <class ImplClass>
 void GenericPlatformManagerImpl<ImplClass>::_HandleServerStarted()
 {
     PlatformManagerDelegate * platformManagerDelegate       = PlatformMgr().GetDelegate();
-    GeneralDiagnosticsDelegate * generalDiagnosticsDelegate = GetDiagnosticDataProvider().GetGeneralDiagnosticsDelegate();
 
     if (platformManagerDelegate != nullptr)
     {
@@ -204,14 +203,6 @@ void GenericPlatformManagerImpl<ImplClass>::_HandleServerStarted()
         if (ConfigurationMgr().GetSoftwareVersion(softwareVersion) == CHIP_NO_ERROR)
             platformManagerDelegate->OnStartUp(softwareVersion);
     }
-
-    if (generalDiagnosticsDelegate != nullptr)
-    {
-        BootReasonType bootReason;
-
-        if (GetDiagnosticDataProvider().GetBootReason(bootReason) == CHIP_NO_ERROR)
-            generalDiagnosticsDelegate->OnDeviceRebooted(bootReason);
-    }
 }
 
 template <class ImplClass>
diff --git a/src/inet/UDPEndPointImplOpenThread.cpp b/src/inet/UDPEndPointImplOpenThread.cpp
index 1668cc99a3c369..02f11ba30bdf75 100644
--- a/src/inet/UDPEndPointImplOpenThread.cpp
+++ b/src/inet/UDPEndPointImplOpenThread.cpp
@@ -32,11 +32,21 @@ namespace Inet {
 
 otInstance * globalOtInstance;
 
+namespace {
+// We want to reserve space for an IPPacketInfo in our buffer, but it needs to
+// be 4-byte aligned.  We ensure the alignment by masking off the low bits of
+// the pointer that we get by doing `Start() - sizeof(IPPacketInfo)`.  That
+// might move it backward by up to kPacketInfoAlignmentBytes, so we need to make
+// sure we allocate enough reserved space that this will still be within our
+// buffer.
+constexpr uint16_t kPacketInfoAlignmentBytes = sizeof(uint32_t) - 1;
+constexpr uint16_t kPacketInfoReservedSize   = sizeof(IPPacketInfo) + kPacketInfoAlignmentBytes;
+} // namespace
+
 void UDPEndPointImplOT::handleUdpReceive(void * aContext, otMessage * aMessage, const otMessageInfo * aMessageInfo)
 {
     UDPEndPointImplOT * ep = static_cast<UDPEndPointImplOT *>(aContext);
-    IPPacketInfo pktInfo;
-    uint16_t msgLen = otMessageGetLength(aMessage);
+    uint16_t msgLen        = otMessageGetLength(aMessage);
     System::PacketBufferHandle payload;
 #if CHIP_DETAIL_LOGGING
     static uint16_t msgReceivedCount = 0;
@@ -50,12 +60,7 @@ void UDPEndPointImplOT::handleUdpReceive(void * aContext, otMessage * aMessage,
         return;
     }
 
-    pktInfo.SrcAddress  = IPAddress::FromOtAddr(aMessageInfo->mPeerAddr);
-    pktInfo.DestAddress = IPAddress::FromOtAddr(aMessageInfo->mSockAddr);
-    pktInfo.SrcPort     = aMessageInfo->mPeerPort;
-    pktInfo.DestPort    = aMessageInfo->mSockPort;
-
-    payload = System::PacketBufferHandle::New(msgLen, 0);
+    payload = System::PacketBufferHandle::New(msgLen, kPacketInfoReservedSize);
 
     if (payload.IsNull())
     {
@@ -63,25 +68,35 @@ void UDPEndPointImplOT::handleUdpReceive(void * aContext, otMessage * aMessage,
         return;
     }
 
+    IPPacketInfo * pktInfo = GetPacketInfo(payload);
+    if (pktInfo == nullptr)
+    {
+        ChipLogError(Inet, "Failed to pre-allocate reserved space for an IPPacketInfo for UDP Message reception.");
+        return;
+    }
+
+    pktInfo->SrcAddress  = IPAddress::FromOtAddr(aMessageInfo->mPeerAddr);
+    pktInfo->DestAddress = IPAddress::FromOtAddr(aMessageInfo->mSockAddr);
+    pktInfo->SrcPort     = aMessageInfo->mPeerPort;
+    pktInfo->DestPort    = aMessageInfo->mSockPort;
+
 #if CHIP_DETAIL_LOGGING
-    pktInfo.SrcAddress.ToString(sourceStr, Inet::IPAddress::kMaxStringLength);
-    pktInfo.DestAddress.ToString(destStr, Inet::IPAddress::kMaxStringLength);
+    pktInfo->SrcAddress.ToString(sourceStr, Inet::IPAddress::kMaxStringLength);
+    pktInfo->DestAddress.ToString(destStr, Inet::IPAddress::kMaxStringLength);
 
     ChipLogDetail(Inet,
                   "UDP Message Received packet nb : %d SrcAddr : %s[%d] DestAddr "
                   ": %s[%d] Payload Length %d",
-                  ++msgReceivedCount, sourceStr, pktInfo.SrcPort, destStr, pktInfo.DestPort, msgLen);
+                  ++msgReceivedCount, sourceStr, pktInfo->SrcPort, destStr, pktInfo->DestPort, msgLen);
 
 #endif
 
-    memcpy(payload->Start(), &pktInfo, sizeof(IPPacketInfo));
-
-    if (otMessageRead(aMessage, 0, payload->Start() + sizeof(IPPacketInfo), msgLen) != msgLen)
+    if (otMessageRead(aMessage, 0, payload->Start(), msgLen) != msgLen)
     {
         ChipLogError(Inet, "Failed to copy OpenThread buffer into System Packet buffer");
         return;
     }
-    payload->SetDataLength(static_cast<uint16_t>(msgLen + sizeof(IPPacketInfo)));
+    payload->SetDataLength(static_cast<uint16_t>(msgLen));
 
     ep->Retain();
     auto * buf     = std::move(payload).UnsafeRelease();
@@ -160,7 +175,6 @@ void UDPEndPointImplOT::HandleDataReceived(System::PacketBufferHandle && msg)
             const IPPacketInfo pktInfoCopy = *pktInfo; // copy the address info so that the app can free the
                                                        // PacketBuffer without affecting access to address info.
 
-            msg->ConsumeHead(sizeof(IPPacketInfo));
             OnMessageReceived(this, std::move(msg), &pktInfoCopy);
         }
         else
@@ -279,7 +293,7 @@ CHIP_ERROR UDPEndPointImplOT::IPv6JoinLeaveMulticastGroupImpl(InterfaceId aInter
 
 IPPacketInfo * UDPEndPointImplOT::GetPacketInfo(const System::PacketBufferHandle & aBuffer)
 {
-    if (!aBuffer->EnsureReservedSize(sizeof(IPPacketInfo)))
+    if (!aBuffer->EnsureReservedSize(kPacketInfoReservedSize))
     {
         return nullptr;
     }
@@ -288,7 +302,7 @@ IPPacketInfo * UDPEndPointImplOT::GetPacketInfo(const System::PacketBufferHandle
     uintptr_t lPacketInfoStart = lStart - sizeof(IPPacketInfo);
 
     // Align to a 4-byte boundary
-    return reinterpret_cast<IPPacketInfo *>(lPacketInfoStart & ~(sizeof(uint32_t) - 1));
+    return reinterpret_cast<IPPacketInfo *>(lPacketInfoStart & ~kPacketInfoAlignmentBytes);
 }
 
 } // namespace Inet
diff --git a/src/lib/address_resolve/AddressResolve.h b/src/lib/address_resolve/AddressResolve.h
index 754abbd37d21ec..789fcddce7f104 100644
--- a/src/lib/address_resolve/AddressResolve.h
+++ b/src/lib/address_resolve/AddressResolve.h
@@ -66,7 +66,7 @@ class NodeListener
 /// Implementations extend this class with implementation-specific data like
 /// storing the 'last known good address' and 'scores' or any additional data
 /// required to figure out when a resolve is ok.
-class NodeLookupHandleBase : public IntrusiveListNodeBase
+class NodeLookupHandleBase : public IntrusiveListNodeBase<>
 {
 public:
     NodeLookupHandleBase() {}
diff --git a/src/lib/asn1/ASN1Reader.cpp b/src/lib/asn1/ASN1Reader.cpp
index 9309dc53448721..6ac0605149d0fc 100644
--- a/src/lib/asn1/ASN1Reader.cpp
+++ b/src/lib/asn1/ASN1Reader.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright (c) 2020-2022 Project CHIP Authors
  *    Copyright (c) 2013-2017 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -113,6 +113,8 @@ CHIP_ERROR ASN1Reader::EnterContainer(uint32_t offset)
     mElemStart = Value + offset;
     if (!IndefiniteLen)
     {
+        VerifyOrReturnError(CanCastTo<uint32_t>(mBufEnd - Value), ASN1_ERROR_VALUE_OVERFLOW);
+        VerifyOrReturnError(static_cast<uint32_t>(mBufEnd - Value) >= ValueLen, ASN1_ERROR_VALUE_OVERFLOW);
         mContainerEnd = Value + ValueLen;
     }
 
@@ -303,8 +305,9 @@ CHIP_ERROR ASN1Reader::DecodeHead()
         IndefiniteLen = false;
     }
 
+    VerifyOrReturnError(CanCastTo<uint32_t>(mBufEnd - p), ASN1_ERROR_VALUE_OVERFLOW);
+    VerifyOrReturnError(static_cast<uint32_t>(mBufEnd - p) >= ValueLen, ASN1_ERROR_VALUE_OVERFLOW);
     VerifyOrReturnError(CanCastTo<uint32_t>(p - mElemStart), ASN1_ERROR_VALUE_OVERFLOW);
-
     mHeadLen = static_cast<uint32_t>(p - mElemStart);
 
     EndOfContents = (Class == kASN1TagClass_Universal && Tag == 0 && !Constructed && ValueLen == 0);
diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
index 147e589d045ff5..f0cca0fbe3d88c 100644
--- a/src/lib/core/BUILD.gn
+++ b/src/lib/core/BUILD.gn
@@ -44,6 +44,7 @@ buildconfig_header("chip_buildconfig") {
     "CHIP_ERROR_LOGGING=${chip_error_logging}",
     "CHIP_PROGRESS_LOGGING=${chip_progress_logging}",
     "CHIP_DETAIL_LOGGING=${chip_detail_logging}",
+    "CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE=${chip_log_message_max_size}",
     "CHIP_AUTOMATION_LOGGING=${chip_automation_logging}",
     "CHIP_PW_TOKENIZER_LOGGING=${chip_pw_tokenizer_logging}",
     "CHIP_CONFIG_SHORT_ERROR_STR=${chip_config_short_error_str}",
diff --git a/src/lib/core/CASEAuthTag.h b/src/lib/core/CASEAuthTag.h
index cd490d70d28334..e673848a988dce 100644
--- a/src/lib/core/CASEAuthTag.h
+++ b/src/lib/core/CASEAuthTag.h
@@ -94,7 +94,7 @@ constexpr CASEAuthTag CASEAuthTagFromNodeId(NodeId aNodeId)
     return aNodeId & kMaskCASEAuthTag;
 }
 
-constexpr CASEAuthTag IsValidCASEAuthTag(CASEAuthTag aCAT)
+constexpr bool IsValidCASEAuthTag(CASEAuthTag aCAT)
 {
     return (aCAT & kTagVersionMask) > 0;
 }
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
index ff925866268dfd..3a454686295740 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -644,34 +644,32 @@
 #endif // CHIP_CONFIG_UNAUTHENTICATED_CONNECTION_POOL_SIZE
 
 /**
- * @def CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE
+ * @def CHIP_CONFIG_SECURE_SESSION_POOL_SIZE
  *
- * @brief Define the size of the pool used for tracking CHIP
- * Peer connections. This defines maximum number of concurrent
- * device connections across all supported transports.
- */
-#ifndef CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE
-#define CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE 16
-#endif // CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE
-
-/**
- * @def CHIP_PEER_CONNECTION_TIMEOUT_MS
+ * @brief Defines the size of the pool used for tracking the state of
+ * secure sessions. This controls the maximum number of concurrent
+ * established secure sessions across all supported transports.
+ *
+ * This is sized to cover the sum of the following:
+ *  - At least 3 CASE sessions / fabric (Spec Ref: 4.13.2.8)
+ *  - 1 reserved slot for CASEServer as a responder.
+ *  - 1 reserved slot for PASE.
  *
- * @brief After what period of inactivity is a peer connection considered
- * expired.
  */
-#ifndef CHIP_PEER_CONNECTION_TIMEOUT_MS
-#define CHIP_PEER_CONNECTION_TIMEOUT_MS 120000
-#endif // CHIP_PEER_CONNECTION_TIMEOUT_MS
+#ifndef CHIP_CONFIG_SECURE_SESSION_POOL_SIZE
+#define CHIP_CONFIG_SECURE_SESSION_POOL_SIZE (CHIP_CONFIG_MAX_FABRICS * 3 + 2)
+#endif // CHIP_CONFIG_SECURE_SESSION_POOL_SIZE
 
 /**
- * @def CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS
+ * @def CHIP_CONFIG_SECURE_SESSION_REFCOUNT_LOGGING
+ *
+ * @brief This enables logging of changes to the underlying reference count of
+ * SecureSession objects.
  *
- * @brief How frequent are peer connections checked for timeouts.
  */
-#ifndef CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS
-#define CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS 5000
-#endif // CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS
+#ifndef CHIP_CONFIG_SECURE_SESSION_REFCOUNT_LOGGING
+#define CHIP_CONFIG_SECURE_SESSION_REFCOUNT_LOGGING 0
+#endif
 
 /**
  *  @def CHIP_CONFIG_MAX_FABRICS
@@ -707,6 +705,17 @@
 #define CHIP_CONFIG_MAX_GROUP_CONTROL_PEERS 2
 #endif // CHIP_CONFIG_MAX_GROUP_CONTROL_PEER
 
+/**
+ *  @def CHIP_CONFIG_SLOW_CRYPTO
+ *
+ *  @brief
+ *   When enabled, CASE and PASE setup will proactively send standalone acknowledgements
+ *   prior to engaging in crypto operations.
+ */
+#ifndef CHIP_CONFIG_SLOW_CRYPTO
+#define CHIP_CONFIG_SLOW_CRYPTO 1
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
 /**
  * @def CHIP_NON_PRODUCTION_MARKER
  *
@@ -1100,17 +1109,6 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
     "Please enable at least one of CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_FAST_COPY_SUPPORT or CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_FLEXIBLE_COPY_SUPPORT"
 #endif
 
-/**
- * @def CHIP_CONFIG_MAX_SESSION_RECOVERY_DELEGATES
- *
- * @brief Defines the max number of SessionRecoveryDelegate
- *
- * // TODO: Explain what this is for.
- */
-#ifndef CHIP_CONFIG_MAX_SESSION_RECOVERY_DELEGATES
-#define CHIP_CONFIG_MAX_SESSION_RECOVERY_DELEGATES 4
-#endif
-
 /**
  * @def CHIP_CONFIG_CASE_SESSION_RESUME_CACHE_SIZE
  *
diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
index e7006ba8c0b70a..706972fa59b567 100644
--- a/src/lib/core/CHIPError.cpp
+++ b/src/lib/core/CHIPError.cpp
@@ -209,6 +209,24 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_MISSING_SECURE_SESSION.AsInteger():
         desc = "Missing secure session";
         break;
+    case CHIP_ERROR_INVALID_ADMIN_SUBJECT.AsInteger():
+        desc = "CaseAdminSubject is not valid";
+        break;
+    case CHIP_ERROR_INSUFFICIENT_PRIVILEGE.AsInteger():
+        desc = "Required privilege was insufficient during an operation";
+        break;
+    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB.AsInteger():
+        desc = "Malformed Interacton Model Attribute Report IB";
+        break;
+    case CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB.AsInteger():
+        desc = "Malformed Interacton Model Command Data IB";
+        break;
+    case CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB.AsInteger():
+        desc = "Malformed Interacton Model Event Status IB";
+        break;
+    case CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE.AsInteger():
+        desc = "Malformed Interacton Model Status Response IB";
+        break;
     case CHIP_ERROR_INVALID_PATH_LIST.AsInteger():
         desc = "Invalid TLV path list";
         break;
@@ -419,6 +437,9 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_DRBG_ENTROPY_SOURCE_FAILED.AsInteger():
         desc = "DRBG entropy source failed to generate entropy data";
         break;
+    case CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED.AsInteger():
+        desc = "Message counter exhausted";
+        break;
     case CHIP_ERROR_FABRIC_EXISTS.AsInteger():
         desc = "Trying to add a NOC for a fabric that already exists";
         break;
@@ -509,8 +530,8 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES.AsInteger():
         desc = "Too many shared session end nodes";
         break;
-    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT.AsInteger():
-        desc = "Malformed Interaction Model Attribute DataElement";
+    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB.AsInteger():
+        desc = "Malformed Interaction Model Attribute Data IB";
         break;
     case CHIP_ERROR_WRONG_CERT_TYPE.AsInteger():
         desc = "Wrong certificate type";
@@ -581,26 +602,23 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_MDNS_COLLISION.AsInteger():
         desc = "mDNS collision";
         break;
-    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH.AsInteger():
-        desc = "Malformed Interacton Model Attribute Path";
-        break;
-    case CHIP_ERROR_IM_MALFORMED_EVENT_PATH.AsInteger():
-        desc = "Malformed Interacton Model Event Path";
+    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB.AsInteger():
+        desc = "Malformed Interacton Model Attribute Path IB";
         break;
-    case CHIP_ERROR_IM_MALFORMED_COMMAND_PATH.AsInteger():
-        desc = "Malformed Interacton Model Command Path";
+    case CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB.AsInteger():
+        desc = "Malformed Interacton Model Event Path IB";
         break;
-    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT.AsInteger():
-        desc = "Malformed Interacton Model Attribute DataElement";
+    case CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB.AsInteger():
+        desc = "Malformed Interacton Model Command Path IB";
         break;
-    case CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT.AsInteger():
-        desc = "Malformed Interacton Model Attribute DataElement";
+    case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB.AsInteger():
+        desc = "Malformed Interacton Model Attribute Status IB";
         break;
-    case CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT.AsInteger():
-        desc = "Malformed Interacton Model Event DataElement";
+    case CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB.AsInteger():
+        desc = "Malformed Interacton Model Event Data IB";
         break;
-    case CHIP_ERROR_IM_MALFORMED_STATUS_CODE.AsInteger():
-        desc = "Malformed Interacton Model Status Code";
+    case CHIP_ERROR_IM_MALFORMED_STATUS_IB.AsInteger():
+        desc = "Malformed Interacton Model Status IB";
         break;
     case CHIP_ERROR_PEER_NODE_NOT_FOUND.AsInteger():
         desc = "Unable to find the peer node";
@@ -651,10 +669,10 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
         desc = "Malformed Interaction Model Command Status IB";
         break;
     case CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB.AsInteger():
-        desc = "Malformed Interaction Model Invoke Response code IB";
+        desc = "Malformed Interaction Model Invoke Response IB";
         break;
     case CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE.AsInteger():
-        desc = "Malformed Interaction Model Invoke Response Message";
+        desc = "Malformed Interaction Model Invoke Request Message";
         break;
     case CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE.AsInteger():
         desc = "Malformed Interaction Model Invoke Response Message";
@@ -665,8 +683,8 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE.AsInteger():
         desc = "Malformed Interaction Model Write Request Message";
         break;
-    case CHIP_ERROR_IM_MALFORMED_WRITE_RESPONSE_MESSAGE.AsInteger():
-        desc = "Malformed Interaction Model Write Response Message";
+    case CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB.AsInteger():
+        desc = "Malformed Interaction Model Event Filter IB";
         break;
     case CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE.AsInteger():
         desc = "Malformed Interaction Model Read Request Message";
@@ -713,9 +731,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_MISSING_URI_SEPARATOR.AsInteger():
         desc = "The URI separator is missing";
         break;
-    case CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE.AsInteger():
-        desc = "Malformed Interaction Model Status Response Message";
-        break;
     }
 #endif // !CHIP_CONFIG_SHORT_ERROR_STR
 
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
index 52c5ff047dec6a..4e67ef507c9b97 100644
--- a/src/lib/core/CHIPError.h
+++ b/src/lib/core/CHIPError.h
@@ -1509,17 +1509,58 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_MISSING_SECURE_SESSION                      CHIP_CORE_ERROR(0x77)
 
-// unused CHIP_CORE_ERROR(0x78)
+/**
+ * @def CHIP_ERROR_INVALID_ADMIN_SUBJECT
+ *
+ * @brief
+ *   The CaseAdminSubject field is not valid in AddNOC command.
+ *
+ */
+#define CHIP_ERROR_INVALID_ADMIN_SUBJECT                      CHIP_CORE_ERROR(0x78)
 
-// unused CHIP_CORE_ERROR(0x79)
+/**
+ * @def CHIP_ERROR_INSUFFICIENT_PRIVILEGE
+ *
+ * @brief
+ *   Required privilege was insufficient during an operation.
+ *
+ */
+#define CHIP_ERROR_INSUFFICIENT_PRIVILEGE                          CHIP_CORE_ERROR(0x79)
 
-// unused CHIP_CORE_ERROR(0x7a)
+/**
+ * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB
+ *
+ * @brief
+ *   The Attribute Report IB is malformed: it does not contain
+ *   the required elements
+ */
+#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB             CHIP_CORE_ERROR(0x7a)
 
-// unused CHIP_CORE_ERROR(0x7b)
+/**
+ * @def CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB
+ *
+ * @brief
+ *   The Event Status IB is malformed: it does not contain
+ *   the required elements
+ */
+#define CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB             CHIP_CORE_ERROR(0x7b)
 
-// unused CHIP_CORE_ERROR(0x7c)
+/**
+ * @def CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE
+ *
+ * @brief
+ *   The Status Response Message is malformed: it does not contain
+ *   the required elements
+ */
+#define CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE      CHIP_CORE_ERROR(0x7c)
 
-// unused CHIP_CORE_ERROR(0x7d)
+/**
+ * @def CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED
+ *
+ * @brief
+ *   The message counter of the session is exhausted, the session should be closed.
+ */
+#define CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED                 CHIP_CORE_ERROR(0x7d)
 
 /**
  *  @def CHIP_ERROR_FABRIC_EXISTS
@@ -1793,13 +1834,13 @@ using CHIP_ERROR = ::chip::ChipError;
 #define CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES           CHIP_CORE_ERROR(0x9b)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT
+ * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB
  *
  * @brief
- *   The Attribute DataElement is malformed: it either does not contain
+ *   The Attribute Data IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT         CHIP_CORE_ERROR(0x9c)
+#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB         CHIP_CORE_ERROR(0x9c)
 
 /**
  * @def CHIP_ERROR_WRONG_CERT_TYPE
@@ -2007,67 +2048,67 @@ using CHIP_ERROR = ::chip::ChipError;
 #define CHIP_ERROR_MDNS_COLLISION                             CHIP_CORE_ERROR(0xb4)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH
+ * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB
  *
  * @brief
- *   The Attribute path is malformed: it either does not contain
+ *   The Attribute path IB is malformed: it does not contain
  *   the required path
  */
-#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH                 CHIP_CORE_ERROR(0xb5)
+#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB                CHIP_CORE_ERROR(0xb5)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_EVENT_PATH
+ * @def CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB
  *
  * @brief
- *   The Attribute Path is malformed: it either does not contain
+ *   The Event Path IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_EVENT_PATH                     CHIP_CORE_ERROR(0xb6)
+#define CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB                     CHIP_CORE_ERROR(0xb6)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_COMMAND_PATH
+ * @def CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB
  *
  * @brief
- *   The Attribute DataElement is malformed: it either does not contain
+ *   The Command Path IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_COMMAND_PATH                   CHIP_CORE_ERROR(0xb7)
+#define CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB                  CHIP_CORE_ERROR(0xb7)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT
+ * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB
  *
  * @brief
- *   The Attribute DataElement is malformed: it either does not contain
+ *   The Attribute Status IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT       CHIP_CORE_ERROR(0xb8)
+#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB       CHIP_CORE_ERROR(0xb8)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT
+ * @def CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB
  *
  * @brief
- *   The Attribute DataElement is malformed: it either does not contain
+ *   The Command Data IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT           CHIP_CORE_ERROR(0xb9)
+#define CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB           CHIP_CORE_ERROR(0xb9)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT
+ * @def CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB
  *
  * @brief
- *   The Event DataElement is malformed: it either does not contain
+ *   The Event Data IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT             CHIP_CORE_ERROR(0xba)
+#define CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB             CHIP_CORE_ERROR(0xba)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_STATUS_CODE
+ * @def CHIP_ERROR_IM_MALFORMED_STATUS_IB
  *
  * @brief
- *   The Attribute DataElement is malformed: it either does not contain
+ *   The Attribute Data IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_STATUS_CODE                    CHIP_CORE_ERROR(0xbb)
+#define CHIP_ERROR_IM_MALFORMED_STATUS_IB                    CHIP_CORE_ERROR(0xbb)
 
 /**
  * @def CHIP_ERROR_PEER_NODE_NOT_FOUND
@@ -2198,7 +2239,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB
  *
  * @brief
- *   The CommandStatusCodeIB is malformed: it either does not contain
+ *   The Command Status IB is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB         CHIP_CORE_ERROR(0xcb)
@@ -2207,7 +2248,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB
  *
  * @brief
- *   The InvokeResponseIB is malformed: it either does not contain
+ *   The Invoke Response IB is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB         CHIP_CORE_ERROR(0xcc)
@@ -2216,7 +2257,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE
  *
  * @brief
- *   The InvokeResponseMessage is malformed: it either does not contain
+ *   The Invoke Request Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE    CHIP_CORE_ERROR(0xcd)
@@ -2225,7 +2266,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE
  *
  * @brief
- *   The InvokeResponseMessage is malformed: it either does not contain
+ *   The Invoke Response Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE    CHIP_CORE_ERROR(0xce)
@@ -2234,7 +2275,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE
  *
  * @brief
- *   The InvokeResponseMessage is malformed: it either does not contain
+ *   The Attribute Response Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE    CHIP_CORE_ERROR(0xcf)
@@ -2243,25 +2284,25 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE
  *
  * @brief
- *   The WriteRequestMessage is malformed: it either does not contain
+ *   The Write Request Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE    CHIP_CORE_ERROR(0xd0)
 
 /**
- * @def CHIP_ERROR_IM_MALFORMED_WRITE_RESPONSE_MESSAGE
+ * @def CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB
  *
  * @brief
- *   The WriteResponseMessage is malformed: it either does not contain
+ *   The Event Filter IB is malformed: it does not contain
  *   the required elements
  */
-#define CHIP_ERROR_IM_MALFORMED_WRITE_RESPONSE_MESSAGE    CHIP_CORE_ERROR(0xd1)
+#define CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB    CHIP_CORE_ERROR(0xd1)
 
 /**
  * @def CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE
  *
  * @brief
- *   The ReadRequestMessage is malformed: it either does not contain
+ *   The Read Request Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE    CHIP_CORE_ERROR(0xd2)
@@ -2270,7 +2311,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE
  *
  * @brief
- *   The SubscribeRequestMessage is malformed: it either does not contain
+ *   The Subscribe Request Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE    CHIP_CORE_ERROR(0xd3)
@@ -2279,7 +2320,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE
  *
  * @brief
- *   The SubscribeResponseMessage is malformed: it either does not contain
+ *   The Subscribe Response Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE    CHIP_CORE_ERROR(0xd4)
@@ -2288,7 +2329,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB
  *
  * @brief
- *   The EventReportIB is malformed: it either does not contain
+ *   The Event Report IB is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB             CHIP_CORE_ERROR(0xd5)
@@ -2297,7 +2338,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB
  *
  * @brief
- *   The ClusterPathIB is malformed: it either does not contain
+ *   The Cluster Path IB is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB                CHIP_CORE_ERROR(0xd6)
@@ -2306,7 +2347,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB
  *
  * @brief
- *   The DataVersionFilterIB is malformed: it either does not contain
+ *   The Data Version Filter IB is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB             CHIP_CORE_ERROR(0xd7)
@@ -2323,7 +2364,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * @def CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE
  *
  * @brief
- *   The Attribute DataElement is malformed: it either does not contain
+ *   The Timed Request Message is malformed: it does not contain
  *   the required elements
  */
 #define CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE                    CHIP_CORE_ERROR(0xd9)
@@ -2386,15 +2427,6 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_MISSING_URI_SEPARATOR                      CHIP_CORE_ERROR(0xe0)
 
-/**
- * @def CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE
- *
- * @brief
- *   The Attribute DataElement is malformed: it either does not contain
- *   the required elements
- */
-#define CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE      CHIP_CORE_ERROR(0xe1)
-
 // clang-format on
 
 // !!!!! IMPORTANT !!!!!  If you add new CHIP errors, please update the translation
diff --git a/src/lib/core/CHIPTLV.h b/src/lib/core/CHIPTLV.h
index f507294435d4a8..8a96f45ce1069f 100644
--- a/src/lib/core/CHIPTLV.h
+++ b/src/lib/core/CHIPTLV.h
@@ -32,6 +32,7 @@
 #include <lib/core/CHIPTLVTypes.h>
 
 #include <lib/support/BitFlags.h>
+#include <lib/support/BitMask.h>
 #include <lib/support/DLLUtil.h>
 #include <lib/support/EnforceFormat.h>
 #include <lib/support/ScopedBuffer.h>
@@ -531,6 +532,21 @@ class DLL_EXPORT TLVReader
         return CHIP_NO_ERROR;
     }
 
+    /**
+     * Get the value of the current element as a BitMask value, if it's an integer
+     * value that fits in the BitMask type.
+     *
+     * @param[out] v Receives the value associated with current TLV element.
+     */
+    template <typename T>
+    CHIP_ERROR Get(BitMask<T> & v)
+    {
+        std::underlying_type_t<T> val;
+        ReturnErrorOnFailure(Get(val));
+        v.SetRaw(val);
+        return CHIP_NO_ERROR;
+    }
+
     /**
      * Get the value of the current byte or UTF8 string element.
      *
@@ -1433,6 +1449,16 @@ class DLL_EXPORT TLVWriter
         return Put(tag, data.Raw());
     }
 
+    /**
+     *
+     * Encodes an unsigned integer with bits corresponding to the flags set when data is a BitMask
+     */
+    template <typename T>
+    CHIP_ERROR Put(Tag tag, BitMask<T> data)
+    {
+        return Put(tag, data.Raw());
+    }
+
     /**
      * Encodes a TLV boolean value.
      *
diff --git a/src/lib/core/CHIPVendorIdentifiers.hpp b/src/lib/core/CHIPVendorIdentifiers.hpp
index 957433859c6526..b9f31ceb56b3b6 100644
--- a/src/lib/core/CHIPVendorIdentifiers.hpp
+++ b/src/lib/core/CHIPVendorIdentifiers.hpp
@@ -42,6 +42,7 @@ namespace chip {
 enum VendorId : uint16_t
 {
     Common       = 0x0000u,
+    Unspecified  = 0x0000u,
     Apple        = 0x1349u,
     Google       = 0x6006u,
     TestVendor1  = 0xFFF1u,
@@ -56,4 +57,14 @@ constexpr bool IsTestVendorId(VendorId vid)
     return (vid >= TestVendor1 && vid <= TestVendor4);
 }
 
+constexpr bool IsVendorIdValidOperationally(uint16_t vendorId)
+{
+    return (vendorId != static_cast<uint16_t>(VendorId::Common)) && (vendorId <= static_cast<uint16_t>(VendorId::TestVendor4));
+}
+
+constexpr bool IsVendorIdValidOperationally(VendorId vendorId)
+{
+    return IsVendorIdValidOperationally(static_cast<uint16_t>(vendorId));
+}
+
 } // namespace chip
diff --git a/src/lib/core/DataModelTypes.h b/src/lib/core/DataModelTypes.h
index c6db07b306b902..2c94dd9012bc6b 100644
--- a/src/lib/core/DataModelTypes.h
+++ b/src/lib/core/DataModelTypes.h
@@ -46,10 +46,13 @@ typedef uint8_t InteractionModelRevision;
 typedef uint32_t SubscriptionId;
 
 constexpr FabricIndex kUndefinedFabricIndex = 0;
-constexpr EndpointId kInvalidEndpointId     = 0xFFFF;
-constexpr EndpointId kRootEndpointId        = 0;
-constexpr ListIndex kInvalidListIndex       = 0xFFFF; // List index is a uint16 thus 0xFFFF is a invalid list index.
-constexpr KeysetId kInvalidKeysetId         = 0xFFFF;
+constexpr FabricIndex kMinValidFabricIndex  = 1;
+constexpr FabricIndex kMaxValidFabricIndex  = UINT8_MAX - 1;
+
+constexpr EndpointId kInvalidEndpointId = 0xFFFF;
+constexpr EndpointId kRootEndpointId    = 0;
+constexpr ListIndex kInvalidListIndex   = 0xFFFF; // List index is a uint16 thus 0xFFFF is a invalid list index.
+constexpr KeysetId kInvalidKeysetId     = 0xFFFF;
 
 // These are MEIs, 0xFFFF is not a valid manufacturer code,
 // thus 0xFFFF'FFFF is not a valid MEI.
@@ -116,4 +119,9 @@ constexpr bool IsValidEndpointId(EndpointId aEndpointId)
     return aEndpointId != kInvalidEndpointId;
 }
 
+constexpr bool IsValidFabricIndex(FabricIndex fabricIndex)
+{
+    return (fabricIndex >= kMinValidFabricIndex) && (fabricIndex <= kMaxValidFabricIndex);
+}
+
 } // namespace chip
diff --git a/src/lib/core/core.gni b/src/lib/core/core.gni
index 3034061342546b..3d1fc28b848065 100644
--- a/src/lib/core/core.gni
+++ b/src/lib/core/core.gni
@@ -33,6 +33,14 @@ declare_args() {
   # Enable automation logging.
   chip_automation_logging = chip_logging
 
+  # Configure the maximum size for logged messages
+  if (current_os == "linux" || current_os == "mac") {
+    # Allow base64 encoding of 1 MTU (4 * (1280 / 3) + padding
+    chip_log_message_max_size = 1708
+  } else {
+    chip_log_message_max_size = 256
+  }
+
   # Enable pigweed tokenizer logging.
   chip_pw_tokenizer_logging = false
 
diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
index ba3101f3c8a4b7..67a9c40775455a 100644
--- a/src/lib/core/tests/TestCHIPErrorStr.cpp
+++ b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -167,6 +167,13 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_CANCELLED,
     CHIP_ERROR_DRBG_ENTROPY_SOURCE_FAILED,
     CHIP_ERROR_TLV_TAG_NOT_FOUND,
+    CHIP_ERROR_MISSING_SECURE_SESSION,
+    CHIP_ERROR_INVALID_ADMIN_SUBJECT,
+    CHIP_ERROR_INSUFFICIENT_PRIVILEGE,
+    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB,
+    CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB,
+    CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE,
+    CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED,
     CHIP_ERROR_FABRIC_EXISTS,
     CHIP_ERROR_KEY_NOT_FOUND_FROM_PEER,
     CHIP_ERROR_WRONG_ENCRYPTION_TYPE_FROM_PEER,
@@ -197,7 +204,7 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_UNAUTHORIZED_KEY_EXPORT_RESPONSE,
     CHIP_ERROR_EXPORTED_KEY_AUTHENTICATION_FAILED,
     CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES,
-    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT,
+    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB,
     CHIP_ERROR_WRONG_CERT_TYPE,
     CHIP_ERROR_DEFAULT_EVENT_HANDLER_NOT_CALLED,
     CHIP_ERROR_PERSISTED_STORAGE_FAILED,
@@ -221,13 +228,13 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_UNSUPPORTED_WIRELESS_REGULATORY_DOMAIN,
     CHIP_ERROR_UNSUPPORTED_WIRELESS_OPERATING_LOCATION,
     CHIP_ERROR_MDNS_COLLISION,
-    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH,
-    CHIP_ERROR_IM_MALFORMED_EVENT_PATH,
-    CHIP_ERROR_IM_MALFORMED_COMMAND_PATH,
-    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT,
-    CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT,
-    CHIP_ERROR_IM_MALFORMED_EVENT_DATA_ELEMENT,
-    CHIP_ERROR_IM_MALFORMED_STATUS_CODE,
+    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB,
+    CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB,
+    CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB,
+    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB,
+    CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB,
+    CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB,
+    CHIP_ERROR_IM_MALFORMED_STATUS_IB,
     CHIP_ERROR_PEER_NODE_NOT_FOUND,
     CHIP_ERROR_HSM,
     CHIP_ERROR_IM_STATUS_CODE_RECEIVED,
@@ -237,7 +244,7 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE,
     CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE,
     CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE,
-    CHIP_ERROR_IM_MALFORMED_WRITE_RESPONSE_MESSAGE,
+    CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB,
     CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE,
     CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE,
     CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE,
@@ -256,7 +263,9 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE,
     CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE,
     CHIP_ERROR_INVALID_FILE_IDENTIFIER,
-    CHIP_ERROR_BUSY
+    CHIP_ERROR_BUSY,
+    CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB,
+    CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB,
 };
 // clang-format on
 
diff --git a/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp b/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
index d8c13907fc4598..a90a31a9f6a24e 100644
--- a/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
+++ b/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
@@ -105,7 +105,7 @@ constexpr size_t kMaxOperationalRecords = 6;
 /// Represents an allocated operational responder.
 ///
 /// Wraps a QueryResponderAllocator.
-class OperationalQueryAllocator : public chip::IntrusiveListNodeBase
+class OperationalQueryAllocator : public chip::IntrusiveListNodeBase<>
 {
 public:
     using Allocator = QueryResponderAllocator<kMaxOperationalRecords>;
diff --git a/src/lib/shell/commands/Config.cpp b/src/lib/shell/commands/Config.cpp
index 2f355df34407ae..8582bbefaaee3a 100644
--- a/src/lib/shell/commands/Config.cpp
+++ b/src/lib/shell/commands/Config.cpp
@@ -25,6 +25,7 @@
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/CommissionableDataProvider.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 
 using chip::DeviceLayer::ConfigurationMgr;
 
@@ -82,7 +83,7 @@ static CHIP_ERROR ConfigGetHardwareVersion(bool printHeader)
     streamer_t * sout = streamer_get();
     uint16_t value16;
 
-    ReturnErrorOnFailure(ConfigurationMgr().GetHardwareVersion(value16));
+    ReturnErrorOnFailure(DeviceLayer::GetDeviceInstanceInfoProvider()->GetHardwareVersion(value16));
     if (printHeader)
     {
         streamer_printf(sout, "HardwareVersion: ");
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index e96066221d5b47..81a9e0e255c12b 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -61,6 +61,7 @@ static_library("support") {
     "Base64.cpp",
     "Base64.h",
     "BitFlags.h",
+    "BitMask.h",
     "BufferReader.cpp",
     "BufferReader.h",
     "BufferWriter.cpp",
diff --git a/src/lib/support/BitMask.h b/src/lib/support/BitMask.h
new file mode 100644
index 00000000000000..313f113ad80154
--- /dev/null
+++ b/src/lib/support/BitMask.h
@@ -0,0 +1,144 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <lib/support/BitFlags.h>
+
+namespace chip {
+
+/**
+ * Stores bit masks and flags in a more typesafe manner.
+ *
+ * Extends BitFlags for boolean flags and also adds support for bit-mask set options.
+ *
+ */
+template <typename FlagsEnum, typename StorageType = typename std::underlying_type_t<FlagsEnum>>
+class BitMask : public BitFlags<FlagsEnum, StorageType>
+{
+public:
+    using IntegerType = typename BitFlags<FlagsEnum, StorageType>::IntegerType;
+
+    BitMask() : BitFlags<FlagsEnum, StorageType>() {}
+    BitMask(const BitFlags<FlagsEnum, StorageType> & other) : BitFlags<FlagsEnum, StorageType>(other) {}
+    BitMask(BitFlags<FlagsEnum, StorageType> && other) : BitFlags<FlagsEnum, StorageType>(std::move(other)) {}
+    BitMask(const BitMask &) = default;
+
+    explicit BitMask(FlagsEnum value) : BitFlags<FlagsEnum, StorageType>(value) {}
+    explicit BitMask(IntegerType value) : BitFlags<FlagsEnum, StorageType>(value) {}
+
+    template <typename... Args>
+    BitMask(FlagsEnum flag, Args &&... args) : BitFlags<FlagsEnum, StorageType>(flag, std::forward<Args>(args)...)
+    {}
+
+    template <typename... Args>
+    BitMask(IntegerType value, Args &&... args) : BitFlags<FlagsEnum, StorageType>(value, std::forward<Args>(args)...)
+    {}
+
+    BitMask & operator=(const BitMask &) = default;
+
+    BitMask & operator=(const BitFlags<FlagsEnum, StorageType> & other)
+    {
+        BitFlags<FlagsEnum, StorageType>::SetRaw(other.Raw());
+        return *this;
+    }
+
+    BitMask & operator=(FlagsEnum value)
+    {
+        BitFlags<FlagsEnum, StorageType>::SetRaw(static_cast<StorageType>(value));
+        return *this;
+    }
+
+    /**
+     * Set a field within the bit mask integer.
+     *
+     * Fields are assumed to be contiguous bits within the underlying integer, for example:
+     * A mask of 0x70 == 0b01110000 means that a 3 bit value is encoded at bits [4;6].
+     *
+     * Calling SetField(0x70, n) is equivalent to "(value & ~0x70) | (n << 4)"
+     *
+     * @param mask  The mask, code assumes a continous bit mask
+     * @param value The value, NOT shifted, MUST fit within the number of bits of the mask
+     */
+    constexpr BitMask & SetField(FlagsEnum mask, IntegerType value)
+    {
+        IntegerType bitMask = static_cast<IntegerType>(mask);
+        IntegerType shift   = GetShiftToFirstSetBit(bitMask);
+
+        // NOTE: value should be fully contained within the shift mask.
+        //
+        // assert((value & (mask >> shift)) == value);
+
+        // Clear bits overlayed by the mask
+        IntegerType updated = static_cast<IntegerType>(BitFlags<FlagsEnum, StorageType>::Raw() & ~bitMask);
+
+        // Set the right bits
+        updated |= static_cast<IntegerType>(bitMask & (value << shift));
+
+        BitFlags<FlagsEnum, StorageType>::SetRaw(updated);
+
+        return *this;
+    }
+
+    /**
+     * Gets an underlying field that is contained within a bit subset of the integer.
+     * Examples:
+     *    GetField(0x70) == GetField(0b01110000) == ((n & 0x70) >> 4) == ((n >> 4) 0x07)
+     *    GetField(0xC0) == GetField(0b11000000) == ((n & 0xC0) >> 6) == ((n >> 6) 0x03)
+     *
+     * @param mask The bit mask to be used, assumed to be a contigous bit mask
+     */
+    IntegerType GetField(FlagsEnum mask) const
+    {
+        IntegerType bitMask = static_cast<IntegerType>(mask);
+        IntegerType shift   = GetShiftToFirstSetBit(bitMask);
+
+        // Forward the right bits
+        return static_cast<IntegerType>(((BitFlags<FlagsEnum, StorageType>::Raw() & bitMask) >> shift));
+    }
+
+protected:
+    /// Get the shift amount to reach the first non-zero bit in a bitmask
+    ///
+    /// Examples:
+    ///    GetShiftToFirstSetBit(0b0000001) == 0
+    ///    GetShiftToFirstSetBit(0b0011100) == 2
+    ///    GetShiftToFirstSetBit(0b0110000) == 4
+    ///
+    /// Note: This does NOT validate if the given mask is a valid mask. So:
+    ///    GetShiftToFirstSetBit(0b0100010) == 1
+    ///    GetShiftToFirstSetBit(0b010110100) == 2
+    static constexpr IntegerType GetShiftToFirstSetBit(IntegerType bitMask)
+    {
+        IntegerType count = 0;
+        IntegerType mask  = 0x01;
+
+        if (bitMask == 0)
+        {
+            return sizeof(bitMask); // generally invalid value
+        }
+
+        while ((mask & bitMask) == 0)
+        {
+            mask = static_cast<IntegerType>(mask << 1);
+            count++;
+        }
+        return count;
+    }
+};
+
+} // namespace chip
diff --git a/src/lib/support/CHIPMemString.h b/src/lib/support/CHIPMemString.h
index 3a7497cb08f9b9..51341192a76250 100644
--- a/src/lib/support/CHIPMemString.h
+++ b/src/lib/support/CHIPMemString.h
@@ -171,7 +171,10 @@ class ScopedMemoryString : public ScopedMemoryBuffer<char>
     ScopedMemoryString(const char * string, size_t length)
     {
         size_t lengthWithNull = length + 1;
-        CopyString(Alloc(lengthWithNull).Get(), lengthWithNull, string);
+
+        // We must convert the source string to a CharSpan, so we call the
+        // version of CopyString that handles unterminated strings.
+        CopyString(Alloc(lengthWithNull).Get(), lengthWithNull, CharSpan(string, length));
     }
 };
 
diff --git a/src/lib/support/DefaultStorageKeyAllocator.h b/src/lib/support/DefaultStorageKeyAllocator.h
index ee433fded170b0..b17b0b3d6f905b 100644
--- a/src/lib/support/DefaultStorageKeyAllocator.h
+++ b/src/lib/support/DefaultStorageKeyAllocator.h
@@ -54,6 +54,9 @@ class DefaultStorageKeyAllocator
     const char * FailSafeContextKey() { return Format("g/fs/c"); }
     static const char * FailSafeNetworkConfig() { return "g/fs/n"; }
 
+    // LastKnownGoodTime
+    const char * LastKnownGoodTimeKey() { return Format("g/lkgt"); }
+
     // Session resumption
     const char * FabricSession(FabricIndex fabric, NodeId nodeId)
     {
diff --git a/src/lib/support/IntrusiveList.h b/src/lib/support/IntrusiveList.h
index dde33a8e52a313..158c332b6965de 100644
--- a/src/lib/support/IntrusiveList.h
+++ b/src/lib/support/IntrusiveList.h
@@ -25,19 +25,95 @@ namespace chip {
 
 class IntrusiveListBase;
 
-class IntrusiveListNodeBase
+enum class IntrusiveMode
+{
+    // Strict mode features
+    //
+    //   Node constructor puts the hook in a well-known default state.
+    //
+    //   Node destructor checks if the hook is in the well-known default state.
+    //   If not, an assertion is raised.
+    //
+    //   Every time an object is inserted in the intrusive container, the
+    //   container checks if the hook is in the well-known default state. If
+    //   not, an assertion is raised.
+    //
+    //   Every time an object is being erased from the intrusive container, the
+    //   container puts the erased object in the well-known default state.
+    //
+    // Note: The strict mode works similar as safe mode for Boost.Intrusive
+    //
+    Strict,
+
+    // Auto-unlink mode features
+    //
+    //   When the destructor of the node is called, the hook checks if the node
+    //   is inserted in a container. If so, the hook removes the node from the
+    //   container.
+    //
+    //   The hook has a member function called unlink() that can be used to
+    //   unlink the node from the container at any time, without having any
+    //   reference to the container, if the user wants to do so.
+    //
+    // This auto-unlink feature is useful in certain applications but it must
+    // be used very carefully:
+    //
+    //   If several threads are using the same container the destructor of the
+    //   auto-unlink hook will be called without any thread synchronization so
+    //   removing the object is thread-unsafe. Container contents change
+    //   silently without modifying the container directly. This can lead to
+    //   surprising effects.
+    //
+    // These auto-unlink hooks have also strict-mode properties:
+    //
+    //   Node constructors put the hook in a well-known default state.
+    //
+    //   Every time an object is inserted in the intrusive container, the
+    //   container checks if the hook is in the well-known default state. If
+    //   not, an assertion is raised.
+    //
+    //   Every time an object is erased from an intrusive container, the
+    //   container puts the erased object in the well-known default state.
+    //
+    // Note: The strict mode works similar as auto-unlink mode for
+    // Boost.Intrusive
+    //
+    AutoUnlink,
+};
+
+class IntrusiveListNodePrivateBase
 {
 public:
-    IntrusiveListNodeBase() : mPrev(nullptr), mNext(nullptr) {}
-    ~IntrusiveListNodeBase() { VerifyOrDie(!IsInList()); }
+    IntrusiveListNodePrivateBase() : mPrev(nullptr), mNext(nullptr) {}
+    ~IntrusiveListNodePrivateBase() { VerifyOrDie(!IsInList()); }
+
+    // Note: The copy construct/assignment is not provided because the list node state is not copyable.
+    //       The move construct/assignment is not provided because all modifications to the list shall go through the list object.
+    IntrusiveListNodePrivateBase(const IntrusiveListNodePrivateBase &) = delete;
+    IntrusiveListNodePrivateBase & operator=(const IntrusiveListNodePrivateBase &) = delete;
+    IntrusiveListNodePrivateBase(IntrusiveListNodePrivateBase &&)                  = delete;
+    IntrusiveListNodePrivateBase & operator=(IntrusiveListNodePrivateBase &&) = delete;
 
     bool IsInList() const { return (mPrev != nullptr && mNext != nullptr); }
 
 private:
     friend class IntrusiveListBase;
-    IntrusiveListNodeBase(IntrusiveListNodeBase * prev, IntrusiveListNodeBase * next) : mPrev(prev), mNext(next) {}
+    IntrusiveListNodePrivateBase(IntrusiveListNodePrivateBase * prev, IntrusiveListNodePrivateBase * next) :
+        mPrev(prev), mNext(next)
+    {}
 
-    void Prepend(IntrusiveListNodeBase * node)
+    void TakePlaceOf(const IntrusiveListNodePrivateBase * that)
+    {
+        // prerequisite `that` is in a list
+        // `this` will take place of the position of `that`.
+        // `that` will be emptied by the caller after this function
+        mPrev        = that->mPrev;
+        mNext        = that->mNext;
+        mPrev->mNext = this;
+        mNext->mPrev = this;
+    }
+
+    void Prepend(IntrusiveListNodePrivateBase * node)
     {
         VerifyOrDie(IsInList());
         VerifyOrDie(!node->IsInList());
@@ -47,7 +123,7 @@ class IntrusiveListNodeBase
         mPrev        = node;
     }
 
-    void Append(IntrusiveListNodeBase * node)
+    void Append(IntrusiveListNodePrivateBase * node)
     {
         VerifyOrDie(IsInList());
         VerifyOrDie(!node->IsInList());
@@ -57,6 +133,7 @@ class IntrusiveListNodeBase
         mNext        = node;
     }
 
+protected:
     void Remove()
     {
         VerifyOrDie(IsInList());
@@ -66,11 +143,31 @@ class IntrusiveListNodeBase
         mNext        = nullptr;
     }
 
-    IntrusiveListNodeBase * mPrev;
-    IntrusiveListNodeBase * mNext;
+private:
+    IntrusiveListNodePrivateBase * mPrev;
+    IntrusiveListNodePrivateBase * mNext;
 };
 
-// non template part of IntrusiveList
+// Strict mode implementation
+template <IntrusiveMode Mode = IntrusiveMode::Strict>
+class IntrusiveListNodeBase : public IntrusiveListNodePrivateBase
+{
+};
+
+// Partial specialization implementation for auto-unlink mode.
+template <>
+class IntrusiveListNodeBase<IntrusiveMode::AutoUnlink> : public IntrusiveListNodePrivateBase
+{
+public:
+    ~IntrusiveListNodeBase() { Unlink(); }
+    void Unlink()
+    {
+        if (IsInList())
+            Remove();
+    }
+};
+
+// Non-template part of IntrusiveList. It appears that for list structure, both mode can share same implementation.
 class IntrusiveListBase
 {
 public:
@@ -78,9 +175,9 @@ class IntrusiveListBase
     {
     private:
         friend class IntrusiveListBase;
-        ConstIteratorBase(const IntrusiveListNodeBase * cur) : mCurrent(cur) {}
+        ConstIteratorBase(const IntrusiveListNodePrivateBase * cur) : mCurrent(cur) {}
 
-        const IntrusiveListNodeBase & operator*() { return *mCurrent; }
+        const IntrusiveListNodePrivateBase & operator*() { return *mCurrent; }
 
     public:
         using difference_type   = std::ptrdiff_t;
@@ -121,16 +218,16 @@ class IntrusiveListBase
         }
 
     protected:
-        const IntrusiveListNodeBase * mCurrent;
+        const IntrusiveListNodePrivateBase * mCurrent;
     };
 
     class IteratorBase
     {
     private:
         friend class IntrusiveListBase;
-        IteratorBase(IntrusiveListNodeBase * cur) : mCurrent(cur) {}
+        IteratorBase(IntrusiveListNodePrivateBase * cur) : mCurrent(cur) {}
 
-        IntrusiveListNodeBase & operator*() { return *mCurrent; }
+        IntrusiveListNodePrivateBase & operator*() { return *mCurrent; }
 
     public:
         using difference_type   = std::ptrdiff_t;
@@ -171,7 +268,7 @@ class IntrusiveListBase
         }
 
     protected:
-        IntrusiveListNodeBase * mCurrent;
+        IntrusiveListNodePrivateBase * mCurrent;
     };
 
     bool Empty() const { return mNode.mNext == &mNode; }
@@ -195,19 +292,50 @@ class IntrusiveListBase
         mNode.Remove();
     }
 
+    IntrusiveListBase(const IntrusiveListBase &) = delete;
+    IntrusiveListBase & operator=(const IntrusiveListBase &) = delete;
+
+    IntrusiveListBase(IntrusiveListBase && that) : mNode(&mNode, &mNode) { *this = std::move(that); }
+
+    IntrusiveListBase & operator=(IntrusiveListBase && that)
+    {
+        VerifyOrDie(Empty());
+        if (!that.Empty())
+        {
+            mNode.TakePlaceOf(&that.mNode);
+            that.mNode.mNext = &that.mNode;
+            that.mNode.mPrev = &that.mNode;
+        }
+        else
+        {
+            // Do nothing here if that is empty, because there is a prerequisite that `this` is empty.
+        }
+        return *this;
+    }
+
     ConstIteratorBase begin() const { return ConstIteratorBase(mNode.mNext); }
     ConstIteratorBase end() const { return ConstIteratorBase(&mNode); }
     IteratorBase begin() { return IteratorBase(mNode.mNext); }
     IteratorBase end() { return IteratorBase(&mNode); }
 
-    void PushFront(IntrusiveListNodeBase * node) { mNode.Append(node); }
-    void PushBack(IntrusiveListNodeBase * node) { mNode.Prepend(node); }
+    void PushFront(IntrusiveListNodePrivateBase * node) { mNode.Append(node); }
+    void PushBack(IntrusiveListNodePrivateBase * node) { mNode.Prepend(node); }
 
-    void InsertBefore(IteratorBase pos, IntrusiveListNodeBase * node) { pos.mCurrent->Prepend(node); }
-    void InsertAfter(IteratorBase pos, IntrusiveListNodeBase * node) { pos.mCurrent->Append(node); }
-    void Remove(IntrusiveListNodeBase * node) { node->Remove(); }
+    void InsertBefore(IteratorBase pos, IntrusiveListNodePrivateBase * node) { pos.mCurrent->Prepend(node); }
+    void InsertAfter(IteratorBase pos, IntrusiveListNodePrivateBase * node) { pos.mCurrent->Append(node); }
+    void Remove(IntrusiveListNodePrivateBase * node) { node->Remove(); }
 
-    bool Contains(const IntrusiveListNodeBase * node) const
+    /// @brief Replace an original node in list with a new node.
+    void Replace(IntrusiveListNodePrivateBase * original, IntrusiveListNodePrivateBase * replacement)
+    {
+        // VerifyOrDie(Contains(original)); This check is too heavy to do, but it shall hold
+        VerifyOrDie(!replacement->IsInList());
+        replacement->TakePlaceOf(original);
+        original->mPrev = nullptr;
+        original->mNext = nullptr;
+    }
+
+    bool Contains(const IntrusiveListNodePrivateBase * node) const
     {
         for (auto & iter : *this)
         {
@@ -218,24 +346,30 @@ class IntrusiveListBase
     }
 
 private:
-    IntrusiveListNodeBase mNode;
+    IntrusiveListNodePrivateBase mNode;
 };
 
 /// The hook converts between node object T and IntrusiveListNodeBase
 ///
 /// When using this hook, the node type (T) MUST inherit from IntrusiveListNodeBase.
 ///
-template <typename T>
+template <typename T, IntrusiveMode Mode>
 class IntrusiveListBaseHook
 {
 public:
-    static_assert(std::is_base_of<IntrusiveListNodeBase, T>::value, "T must be derived from IntrusiveListNodeBase");
+    static_assert(std::is_base_of<IntrusiveListNodeBase<Mode>, T>::value, "T must be derived from IntrusiveListNodeBase");
+
+    static T * ToObject(IntrusiveListNodePrivateBase * node) { return static_cast<T *>(node); }
+    static const T * ToObject(const IntrusiveListNodePrivateBase * node) { return static_cast<T *>(node); }
 
-    static T * ToObject(IntrusiveListNodeBase * node) { return static_cast<T *>(node); }
-    static const T * ToObject(const IntrusiveListNodeBase * node) { return static_cast<T *>(node); }
+    static T * ToObject(IntrusiveListNodeBase<Mode> * node) { return static_cast<T *>(node); }
+    static const T * ToObject(const IntrusiveListNodeBase<Mode> * node) { return static_cast<T *>(node); }
 
-    static IntrusiveListNodeBase * ToNode(T * object) { return static_cast<IntrusiveListNodeBase *>(object); }
-    static const IntrusiveListNodeBase * ToNode(const T * object) { return static_cast<const IntrusiveListNodeBase *>(object); }
+    static IntrusiveListNodeBase<Mode> * ToNode(T * object) { return static_cast<IntrusiveListNodeBase<Mode> *>(object); }
+    static const IntrusiveListNodeBase<Mode> * ToNode(const T * object)
+    {
+        return static_cast<const IntrusiveListNodeBase<Mode> *>(object);
+    }
 };
 
 /// A double-linked list where the data is stored together with the previous/next pointers for cache efficiency / and compactness.
@@ -261,14 +395,15 @@ class IntrusiveListBaseHook
 ///     assert(list.Contains(&a)  && list.Contains(&b) && !list.Contains(&c));
 ///     list.Remove(&a);
 ///     list.Remove(&b);
-template <typename T, typename Hook = IntrusiveListBaseHook<T>>
+template <typename T, IntrusiveMode Mode = IntrusiveMode::Strict, typename Hook = IntrusiveListBaseHook<T, Mode>>
 class IntrusiveList : public IntrusiveListBase
 {
 public:
-    static_assert(std::is_base_of<IntrusiveListNodeBase, T>::value, "T must derive from IntrusiveListNodeBase");
-
     IntrusiveList() : IntrusiveListBase() {}
 
+    IntrusiveList(IntrusiveList &&) = default;
+    IntrusiveList & operator=(IntrusiveList &&) = default;
+
     class ConstIterator : public IntrusiveListBase::ConstIteratorBase
     {
     public:
@@ -302,6 +437,7 @@ class IntrusiveList : public IntrusiveListBase
     void InsertBefore(Iterator pos, T * value) { IntrusiveListBase::InsertBefore(pos, Hook::ToNode(value)); }
     void InsertAfter(Iterator pos, T * value) { IntrusiveListBase::InsertAfter(pos, Hook::ToNode(value)); }
     void Remove(T * value) { IntrusiveListBase::Remove(Hook::ToNode(value)); }
+    void Replace(T * original, T * replacement) { IntrusiveListBase::Replace(Hook::ToNode(original), Hook::ToNode(replacement)); }
     bool Contains(const T * value) const { return IntrusiveListBase::Contains(Hook::ToNode(value)); }
 };
 
diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp
index b4a2958559f854..654af73e94cd1d 100644
--- a/src/lib/support/JniReferences.cpp
+++ b/src/lib/support/JniReferences.cpp
@@ -210,7 +210,7 @@ CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & option
 
     jmethodID isPresentMethod = env->GetMethodID(optionalCls, "isPresent", "()Z");
     VerifyOrReturnError(isPresentMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
-    jboolean isPresent = env->CallBooleanMethod(optionalObj, isPresentMethod);
+    jboolean isPresent = optionalObj && env->CallBooleanMethod(optionalObj, isPresentMethod);
 
     if (!isPresent)
     {
diff --git a/src/lib/support/TestPersistentStorageDelegate.h b/src/lib/support/TestPersistentStorageDelegate.h
index 56e34ba2ac9a8c..bdc31179c6a8a6 100644
--- a/src/lib/support/TestPersistentStorageDelegate.h
+++ b/src/lib/support/TestPersistentStorageDelegate.h
@@ -59,7 +59,7 @@ class TestPersistentStorageDelegate : public PersistentStorageDelegate
             return CHIP_ERROR_PERSISTED_STORAGE_FAILED;
         }
 
-        bool contains = mStorage.find(key) != mStorage.end();
+        bool contains = HasKey(key);
         VerifyOrReturnError(contains, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
 
         std::vector<uint8_t> & value = mStorage[key];
@@ -109,7 +109,7 @@ class TestPersistentStorageDelegate : public PersistentStorageDelegate
             return CHIP_ERROR_PERSISTED_STORAGE_FAILED;
         }
 
-        bool contains = mStorage.find(key) != mStorage.end();
+        bool contains = HasKey(key);
         VerifyOrReturnError(contains, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
         mStorage.erase(key);
         return CHIP_NO_ERROR;
@@ -135,6 +135,34 @@ class TestPersistentStorageDelegate : public PersistentStorageDelegate
      */
     virtual void ClearStorage() { mStorage.clear(); }
 
+    /**
+     * @return the number of keys currently written in storage
+     */
+    virtual size_t GetNumKeys() { return mStorage.size(); }
+
+    /**
+     * @return a set of all the keys stored
+     */
+    virtual std::set<std::string> GetKeys()
+    {
+        std::set<std::string> keys;
+
+        for (auto it = mStorage.begin(); it != mStorage.end(); ++it)
+        {
+            keys.insert(it->first);
+        }
+
+        return keys;
+    }
+
+    /**
+     * @brief Determine if storage has a given key
+     *
+     * @param key - key to find (case-sensitive)
+     * @return true if key is present in storage, false otherwise
+     */
+    virtual bool HasKey(const std::string & key) { return (mStorage.find(key) != mStorage.end()); }
+
 protected:
     std::map<std::string, std::vector<uint8_t>> mStorage;
     std::set<std::string> mPoisonKeys;
diff --git a/src/lib/support/TimeUtils.h b/src/lib/support/TimeUtils.h
index cf3e3e702b8fe6..933988b86498a5 100644
--- a/src/lib/support/TimeUtils.h
+++ b/src/lib/support/TimeUtils.h
@@ -125,18 +125,18 @@ extern void SecondsSinceUnixEpochToCalendarTime(uint32_t secondsSinceEpoch, uint
                                                 uint8_t & hour, uint8_t & minute, uint8_t & second);
 
 /**
- *  @brief Convert a calendar date and time to the number of seconds since CHIP Epoch (2020-01-01 00:00:00 UTC).
+ *  @brief Convert a calendar date and time to the number of seconds since CHIP Epoch (2000-01-01 00:00:00 UTC).
  *
  *  @note  This function makes no attempt to verify the correct range of any arguments other than year.
  *         Therefore callers must make sure the supplied values are valid prior to invocation.
  *
- *  @param year           Gregorian calendar year in the range 2020 to 2155.
+ *  @param year           Gregorian calendar year in the range 2000 to 2135.
  *  @param month          Month in standard form (1=January ... 12=December).
  *  @param dayOfMonth     Day-of-month in standard form (1=1st, 2=2nd, etc.).
  *  @param hour           Hour (0-23).
  *  @param minute         Minute (0-59).
  *  @param second         Second (0-59).
- *  @param chipEpochTime  Number of seconds since 2020-01-01 00:00:00 UTC.
+ *  @param chipEpochTime  Number of seconds since 2000-01-01 00:00:00 UTC.
  *
  *  @return   True if the date/time was converted successfully. False if the given year falls outside the
  *            representable range.
@@ -145,12 +145,12 @@ extern bool CalendarToChipEpochTime(uint16_t year, uint8_t month, uint8_t dayOfM
                                     uint32_t & chipEpochTime);
 
 /**
- *  @brief Convert the number of seconds since CHIP Epoch (2020-01-01 00:00:00 UTC) to a calendar date and time.
+ *  @brief Convert the number of seconds since CHIP Epoch (2000-01-01 00:00:00 UTC) to a calendar date and time.
  *
  *  @details  Input time values are limited to positive values up to 2^32-1. This limits the
- *            representable date range to the year 2155.
+ *            representable date range to the year 2135.
  *
- *  @param chipEpochTime  Number of seconds since 2020-01-01 00:00:00 UTC.
+ *  @param chipEpochTime  Number of seconds since 2000-01-01 00:00:00 UTC.
  *  @param year           Gregorian calendar year.
  *  @param month          Month in standard form (1=January ... 12=December).
  *  @param dayOfMonth     Day-of-month in standard form (1=1st, 2=2nd, etc.).
@@ -163,13 +163,13 @@ extern void ChipEpochToCalendarTime(uint32_t chipEpochTime, uint16_t & year, uin
 
 /**
  *  @brief Convert the number of seconds since Unix Epoch (1970-01-01 00:00:00 UTC) to
- *         CHIP Epoch (2020-01-01 00:00:00 UTC).
+ *         CHIP Epoch (2000-01-01 00:00:00 UTC).
  *
  *  @details  Input time values are limited to positive values up to 2^32-1. This limits the
- *            representable date range to the year 2155.
+ *            representable date range to the year 2135.
  *
  *  @param unixEpochTime  Number of seconds since 1970-01-01 00:00:00 UTC.
- *  @param chipEpochTime  Number of seconds since 2020-01-01 00:00:00 UTC.
+ *  @param chipEpochTime  Number of seconds since 2000-01-01 00:00:00 UTC.
  *
  *  @return   True if the time was converted successfully. False if the given Unix epoch time
  *            falls outside the representable range.
diff --git a/src/lib/support/logging/CHIPLogging.cpp b/src/lib/support/logging/CHIPLogging.cpp
index 97876d08fb56f9..b92e04d7325d2e 100644
--- a/src/lib/support/logging/CHIPLogging.cpp
+++ b/src/lib/support/logging/CHIPLogging.cpp
@@ -100,8 +100,8 @@ const char ModuleNames[] = "-\0\0" // None
                            "SD\0"  // ServiceDirectory
                            "SP\0"  // ServiceProvisioning
                            "SWU"   // SoftwareUpdate
-                           "TP\0"  // TokenPairing
-                           "TS\0"  // TimeServices
+                           "FS\0"  // FailSafe
+                           "TS\0"  // TimeService
                            "HB\0"  // Heartbeat
                            "CSL"   // chipSystemLayer
                            "EVL"   // Event Logging
diff --git a/src/lib/support/logging/Constants.h b/src/lib/support/logging/Constants.h
index ec2c47aba9cff3..37cc149baba661 100644
--- a/src/lib/support/logging/Constants.h
+++ b/src/lib/support/logging/Constants.h
@@ -41,7 +41,7 @@ enum LogModule
     kLogModule_ServiceDirectory,
     kLogModule_ServiceProvisioning,
     kLogModule_SoftwareUpdate,
-    kLogModule_TokenPairing,
+    kLogModule_FailSafe,
     kLogModule_TimeService,
     kLogModule_Heartbeat,
     kLogModule_chipSystemLayer,
diff --git a/src/lib/support/tests/BUILD.gn b/src/lib/support/tests/BUILD.gn
index db44ef0d1640ae..25e6e96ad8c9df 100644
--- a/src/lib/support/tests/BUILD.gn
+++ b/src/lib/support/tests/BUILD.gn
@@ -22,6 +22,7 @@ chip_test_suite("tests") {
   output_name = "libSupportTests"
 
   test_sources = [
+    "TestBitMask.cpp",
     "TestBufferReader.cpp",
     "TestBufferWriter.cpp",
     "TestBytesCircularBuffer.cpp",
diff --git a/src/lib/support/tests/TestBitMask.cpp b/src/lib/support/tests/TestBitMask.cpp
new file mode 100644
index 00000000000000..1745f9295cc126
--- /dev/null
+++ b/src/lib/support/tests/TestBitMask.cpp
@@ -0,0 +1,119 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <lib/support/BitMask.h>
+#include <lib/support/UnitTestRegistration.h>
+
+#include <algorithm>
+#include <cstring>
+#include <initializer_list>
+#include <nlunit-test.h>
+
+using namespace chip;
+
+namespace {
+
+enum class TestEnum : uint16_t
+{
+    kZero = 0x0000, // not a valid mask or bit flag, here anyway
+
+    kBit_0      = 0x0001,
+    kBits_1_2   = 0x0006,
+    kBits_4_7   = 0x00F0,
+    kBits_High4 = 0xF000,
+    kBits_High8 = 0xFF00,
+};
+
+void TestBitMaskOperations(nlTestSuite * inSuite, void * inContext)
+{
+    BitMask<TestEnum> mask;
+
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0);
+
+    mask.SetField(TestEnum::kBits_1_2, 2);
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0x0004);
+
+    mask.SetRaw(0);
+    mask.SetField(TestEnum::kBits_4_7, 0x0B);
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0x00B0);
+
+    mask.SetRaw(0);
+
+    for (uint16_t i = 0; i < 0x10; i++)
+    {
+        mask.SetField(TestEnum::kBits_High4, i);
+        NL_TEST_ASSERT(inSuite, mask.Raw() == (i << 12));
+    }
+
+    mask.SetField(TestEnum::kBits_High8, 0x23);
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0x2300);
+
+    mask.SetField(TestEnum::kBits_High4, 0xA);
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0xA300);
+}
+
+void TestBitFieldLogic(nlTestSuite * inSuite, void * inContext)
+{
+    BitMask<TestEnum> mask;
+
+    // some general logic that still applies for bit fields just in case
+    NL_TEST_ASSERT(inSuite, !mask.HasAny(TestEnum::kBits_High4));
+    NL_TEST_ASSERT(inSuite, !mask.HasAny(TestEnum::kBits_High8));
+
+    // setting something non-zero in the upper 4 bits sets "something" in both
+    // upper and 4 and 8 bits
+    mask.SetField(TestEnum::kBits_High4, 0x01);
+    NL_TEST_ASSERT(inSuite, mask.HasAny(TestEnum::kBits_High4));
+    NL_TEST_ASSERT(inSuite, mask.HasAny(TestEnum::kBits_High8));
+
+    // sets something visible in high 8 bits, but not high 4 bits
+    mask.SetField(TestEnum::kBits_High8, 0x01);
+    NL_TEST_ASSERT(inSuite, !mask.HasAny(TestEnum::kBits_High4));
+    NL_TEST_ASSERT(inSuite, mask.HasAny(TestEnum::kBits_High8));
+}
+
+void TestBitMaskInvalid(nlTestSuite * inSuite, void * inContext)
+{
+    BitMask<TestEnum> mask;
+
+    // This generally tests for no infinite loops. Nothing to set here
+    mask.SetField(TestEnum::kZero, 0x01);
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0);
+
+    mask.SetRaw(0x1234);
+    mask.SetField(TestEnum::kZero, 0x01);
+    NL_TEST_ASSERT(inSuite, mask.Raw() == 0x1234);
+}
+
+const nlTest sTests[] = {
+    NL_TEST_DEF("BitMask operations", TestBitMaskOperations), //
+    NL_TEST_DEF("BitFields logic", TestBitFieldLogic),        //
+    NL_TEST_DEF("Invalid operations", TestBitMaskInvalid),    //
+    NL_TEST_SENTINEL()                                        //
+};
+
+} // namespace
+
+int TestBitMask()
+{
+    nlTestSuite theSuite = { "BitMask tests", &sTests[0], nullptr, nullptr };
+
+    // Run test suit againt one context.
+    nlTestRunner(&theSuite, nullptr);
+    return nlTestRunnerStats(&theSuite);
+}
+
+CHIP_REGISTER_TEST_SUITE(TestBitMask)
diff --git a/src/lib/support/tests/TestIntrusiveList.cpp b/src/lib/support/tests/TestIntrusiveList.cpp
index f65eb8557ba94a..ddb121b1262355 100644
--- a/src/lib/support/tests/TestIntrusiveList.cpp
+++ b/src/lib/support/tests/TestIntrusiveList.cpp
@@ -27,7 +27,7 @@ namespace {
 
 using namespace chip;
 
-class ListNode : public IntrusiveListNodeBase
+class ListNode : public IntrusiveListNodeBase<>
 {
 };
 
@@ -131,6 +131,95 @@ void TestContains(nlTestSuite * inSuite, void * inContext)
     list.Remove(&b);
 }
 
+void TestReplaceNode(nlTestSuite * inSuite, void * inContext)
+{
+    ListNode a, b;
+    IntrusiveList<ListNode> list;
+    list.PushBack(&a);
+
+    list.Replace(&a, &b);
+    NL_TEST_ASSERT(inSuite, !a.IsInList());
+    NL_TEST_ASSERT(inSuite, b.IsInList());
+    NL_TEST_ASSERT(inSuite, !list.Empty());
+    NL_TEST_ASSERT(inSuite, !list.Contains(&a));
+    NL_TEST_ASSERT(inSuite, list.Contains(&b));
+    list.Remove(&b);
+}
+
+void TestMoveList(nlTestSuite * inSuite, void * inContext)
+{
+    ListNode a, b;
+
+    {
+        // Test case 1: Move construct an empty list
+        IntrusiveList<ListNode> listA;
+        IntrusiveList<ListNode> listB(std::move(listA));
+        NL_TEST_ASSERT(inSuite, listA.Empty()); // NOLINT(bugprone-use-after-move)
+        NL_TEST_ASSERT(inSuite, listB.Empty());
+    }
+
+    {
+        // Test case 2: Move construct an non-empty list
+        IntrusiveList<ListNode> listA;
+        listA.PushBack(&a);
+
+        IntrusiveList<ListNode> listB(std::move(listA));
+        NL_TEST_ASSERT(inSuite, listA.Empty()); // NOLINT(bugprone-use-after-move)
+        NL_TEST_ASSERT(inSuite, listB.Contains(&a));
+        listB.Remove(&a);
+    }
+
+    {
+        // Test case 3: Move assign an empty list
+        IntrusiveList<ListNode> listA;
+        IntrusiveList<ListNode> listB;
+        listB = std::move(listA);
+        NL_TEST_ASSERT(inSuite, listA.Empty()); // NOLINT(bugprone-use-after-move)
+        NL_TEST_ASSERT(inSuite, listB.Empty());
+    }
+
+    {
+        // Test case 4: Move assign to a non-empty list
+        IntrusiveList<ListNode> listA;
+        listA.PushBack(&a);
+
+        IntrusiveList<ListNode> listB;
+        listB = std::move(listA);
+        NL_TEST_ASSERT(inSuite, listA.Empty()); // NOLINT(bugprone-use-after-move)
+        NL_TEST_ASSERT(inSuite, listB.Contains(&a));
+        listB.Remove(&a);
+    }
+}
+
+class ListNodeAutoUnlink : public IntrusiveListNodeBase<IntrusiveMode::AutoUnlink>
+{
+};
+
+void TestAutoUnlink(nlTestSuite * inSuite, void * inContext)
+{
+    IntrusiveList<ListNodeAutoUnlink, IntrusiveMode::AutoUnlink> list;
+
+    // Test case 1: Test node->Unlink()
+    {
+        ListNodeAutoUnlink a;
+        NL_TEST_ASSERT(inSuite, !list.Contains(&a));
+        list.PushBack(&a);
+        NL_TEST_ASSERT(inSuite, list.Contains(&a));
+        a.Unlink();
+        NL_TEST_ASSERT(inSuite, !list.Contains(&a));
+        NL_TEST_ASSERT(inSuite, list.Empty());
+    }
+
+    // Test case 2: The node is automatically removed when goes out of scope
+    {
+        ListNodeAutoUnlink a;
+        NL_TEST_ASSERT(inSuite, !list.Contains(&a));
+        list.PushBack(&a);
+        NL_TEST_ASSERT(inSuite, list.Contains(&a));
+    }
+    NL_TEST_ASSERT(inSuite, list.Empty());
+}
+
 int Setup(void * inContext)
 {
     return SUCCESS;
@@ -150,6 +239,9 @@ int Teardown(void * inContext)
 static const nlTest sTests[] = {
     NL_TEST_DEF_FN(TestIntrusiveListRandom), //
     NL_TEST_DEF_FN(TestContains),            //
+    NL_TEST_DEF_FN(TestReplaceNode),         //
+    NL_TEST_DEF_FN(TestMoveList),            //
+    NL_TEST_DEF_FN(TestAutoUnlink),          //
     NL_TEST_SENTINEL(),                      //
 };
 
diff --git a/src/lib/support/tests/TestTestPersistentStorageDelegate.cpp b/src/lib/support/tests/TestTestPersistentStorageDelegate.cpp
index 57d872b4cf9e3b..10cda95e078cc4 100644
--- a/src/lib/support/tests/TestTestPersistentStorageDelegate.cpp
+++ b/src/lib/support/tests/TestTestPersistentStorageDelegate.cpp
@@ -20,13 +20,36 @@
 #include <lib/support/TestPersistentStorageDelegate.h>
 #include <lib/support/UnitTestRegistration.h>
 
+#include <array>
 #include <cstring>
+#include <set>
+#include <string>
+
 #include <nlunit-test.h>
 
 using namespace chip;
 
 namespace {
 
+template <class T, size_t N>
+bool SetMatches(const std::set<T> & set, const std::array<T, N> expectedContents)
+{
+    if (set.size() != N)
+    {
+        return false;
+    }
+
+    for (auto item : expectedContents)
+    {
+        if (set.find(item) == set.cend())
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 void TestBasicApi(nlTestSuite * inSuite, void * inContext)
 {
     TestPersistentStorageDelegate storage;
@@ -42,6 +65,8 @@ void TestBasicApi(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
     NL_TEST_ASSERT(inSuite, size == sizeof(buf));
 
+    NL_TEST_ASSERT(inSuite, storage.GetNumKeys() == 0);
+
     err = storage.SyncDeleteKeyValue("roboto");
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
 
@@ -75,6 +100,11 @@ void TestBasicApi(nlTestSuite * inSuite, void * inContext)
     err = storage.SyncSetKeyValue("key3", kStringValue3, static_cast<uint16_t>(strlen(kStringValue3)));
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
+    NL_TEST_ASSERT(inSuite, storage.GetNumKeys() == 2);
+    auto keys = storage.GetKeys();
+    std::array<std::string, 2> kExpectedKeys{ "key2", "key3" };
+    NL_TEST_ASSERT(inSuite, SetMatches(keys, kExpectedKeys) == true);
+
     // Read them back
 
     memset(&buf[0], 0, sizeof(buf));
@@ -194,6 +224,8 @@ void TestClearStorage(nlTestSuite * inSuite, void * inContext)
     uint16_t size = sizeof(buf);
 
     // Key not there
+    NL_TEST_ASSERT(inSuite, storage.GetNumKeys() == 0);
+
     CHIP_ERROR err;
     memset(&buf[0], 0, sizeof(buf));
     size = sizeof(buf);
@@ -205,6 +237,7 @@ void TestClearStorage(nlTestSuite * inSuite, void * inContext)
     const char * kStringValue1 = "abcd";
     err                        = storage.SyncSetKeyValue("roboto", kStringValue1, static_cast<uint16_t>(strlen(kStringValue1)));
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, storage.GetNumKeys() == 1);
 
     memset(&buf[0], 0, sizeof(buf));
     size = sizeof(buf);
@@ -216,6 +249,7 @@ void TestClearStorage(nlTestSuite * inSuite, void * inContext)
     // Clear storage, make sure it's gone
     storage.ClearStorage();
 
+    NL_TEST_ASSERT(inSuite, storage.GetNumKeys() == 0);
     memset(&buf[0], 0, sizeof(buf));
     size = sizeof(buf);
     err  = storage.SyncGetKeyValue("roboto", &buf[0], size);
diff --git a/src/lwip/cyw30739/lwipopts.h b/src/lwip/cyw30739/lwipopts.h
index 40d3c1c6e1586a..36ed6df98e5cc3 100644
--- a/src/lwip/cyw30739/lwipopts.h
+++ b/src/lwip/cyw30739/lwipopts.h
@@ -77,7 +77,7 @@
 #define PBUF_POOL_BUFSIZE 1356
 
 /* Network Interfaces options */
-#define PBUF_POOL_SIZE 8
+#define PBUF_POOL_SIZE 10
 
 /* LOOPIF options */
 
diff --git a/src/messaging/ApplicationExchangeDispatch.cpp b/src/messaging/ApplicationExchangeDispatch.cpp
index 3e2ad293b7d34b..170e6bb702864d 100644
--- a/src/messaging/ApplicationExchangeDispatch.cpp
+++ b/src/messaging/ApplicationExchangeDispatch.cpp
@@ -26,12 +26,11 @@
 namespace chip {
 namespace Messaging {
 
-bool ApplicationExchangeDispatch::MessagePermitted(uint16_t protocol, uint8_t type)
+bool ApplicationExchangeDispatch::MessagePermitted(Protocols::Id protocol, uint8_t type)
 {
     // TODO: Change this check to only include the protocol and message types that are allowed
-    switch (protocol)
+    if (protocol == Protocols::SecureChannel::Id)
     {
-    case Protocols::SecureChannel::Id.GetProtocolId():
         switch (type)
         {
         case static_cast<uint8_t>(Protocols::SecureChannel::MsgType::PBKDFParamRequest):
@@ -49,11 +48,8 @@ bool ApplicationExchangeDispatch::MessagePermitted(uint16_t protocol, uint8_t ty
         default:
             break;
         }
-        break;
-
-    default:
-        break;
     }
+
     return true;
 }
 
diff --git a/src/messaging/ApplicationExchangeDispatch.h b/src/messaging/ApplicationExchangeDispatch.h
index 6316df05f1b44f..04d7a0d1b4c7d1 100644
--- a/src/messaging/ApplicationExchangeDispatch.h
+++ b/src/messaging/ApplicationExchangeDispatch.h
@@ -43,7 +43,7 @@ class ApplicationExchangeDispatch : public ExchangeMessageDispatch
     ~ApplicationExchangeDispatch() override {}
 
 protected:
-    bool MessagePermitted(uint16_t protocol, uint8_t type) override;
+    bool MessagePermitted(Protocols::Id protocol, uint8_t type) override;
 };
 
 } // namespace Messaging
diff --git a/src/messaging/EphemeralExchangeDispatch.h b/src/messaging/EphemeralExchangeDispatch.h
new file mode 100644
index 00000000000000..2f58587c8c103d
--- /dev/null
+++ b/src/messaging/EphemeralExchangeDispatch.h
@@ -0,0 +1,54 @@
+/*
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <messaging/ExchangeMessageDispatch.h>
+#include <protocols/secure_channel/Constants.h>
+
+namespace chip {
+namespace Messaging {
+
+class EphemeralExchangeDispatch : public ExchangeMessageDispatch
+{
+public:
+    static ExchangeMessageDispatch & Instance()
+    {
+        static EphemeralExchangeDispatch instance;
+        return instance;
+    }
+
+    EphemeralExchangeDispatch() {}
+    ~EphemeralExchangeDispatch() override {}
+
+protected:
+    bool MessagePermitted(Protocols::Id protocol, uint8_t type) override
+    {
+        // Only permit StandaloneAck
+        return (protocol == Protocols::SecureChannel::Id &&
+                type == to_underlying(Protocols::SecureChannel::MsgType::StandaloneAck));
+    }
+
+    bool IsEncryptionRequired() const override
+    {
+        // This function should not be called at all
+        VerifyOrDie(false);
+        return false;
+    }
+};
+
+} // namespace Messaging
+} // namespace chip
diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
index 507f2711b768fd..a2aa221a7cc78e 100644
--- a/src/messaging/ExchangeContext.cpp
+++ b/src/messaging/ExchangeContext.cpp
@@ -39,8 +39,10 @@
 #include <lib/support/TypeTraits.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <messaging/ApplicationExchangeDispatch.h>
+#include <messaging/EphemeralExchangeDispatch.h>
 #include <messaging/ExchangeContext.h>
 #include <messaging/ExchangeMgr.h>
+#include <platform/LockTracker.h>
 #include <protocols/Protocols.h>
 #include <protocols/secure_channel/Constants.h>
 
@@ -79,6 +81,11 @@ void ExchangeContext::SetResponseExpected(bool inResponseExpected)
     mFlags.Set(Flags::kFlagResponseExpected, inResponseExpected);
 }
 
+void ExchangeContext::UseSuggestedResponseTimeout(Timeout applicationProcessingTimeout)
+{
+    SetResponseTimeout(mSession->ComputeRoundTripTimeout(applicationProcessingTimeout));
+}
+
 void ExchangeContext::SetResponseTimeout(Timeout timeout)
 {
     mResponseTimeout = timeout;
@@ -126,6 +133,10 @@ void ExchangeContext::UpdateSEDIntervalMode(bool activeMode)
 CHIP_ERROR ExchangeContext::SendMessage(Protocols::Id protocolId, uint8_t msgType, PacketBufferHandle && msgBuf,
                                         const SendFlags & sendFlags)
 {
+    // This is the first point all outgoing messages funnel through.  Ensure
+    // that our message sends are all synchronized correctly.
+    assertChipStackLockedByCurrentThread();
+
     bool isStandaloneAck =
         (protocolId == Protocols::SecureChannel::Id) && msgType == to_underlying(Protocols::SecureChannel::MsgType::StandaloneAck);
     if (!isStandaloneAck)
@@ -285,8 +296,8 @@ void ExchangeContextDeletor::Release(ExchangeContext * ec)
 }
 
 ExchangeContext::ExchangeContext(ExchangeManager * em, uint16_t ExchangeId, const SessionHandle & session, bool Initiator,
-                                 ExchangeDelegate * delegate) :
-    mDispatch((delegate != nullptr) ? delegate->GetMessageDispatch() : ApplicationExchangeDispatch::Instance()),
+                                 ExchangeDelegate * delegate, bool isEphemeralExchange) :
+    mDispatch(GetMessageDispatch(isEphemeralExchange, delegate)),
     mSession(*this)
 {
     VerifyOrDie(mExchangeMgr == nullptr);
@@ -295,9 +306,9 @@ ExchangeContext::ExchangeContext(ExchangeManager * em, uint16_t ExchangeId, cons
     mExchangeId  = ExchangeId;
     mSession.Grab(session);
     mFlags.Set(Flags::kFlagInitiator, Initiator);
+    mFlags.Set(Flags::kFlagEphemeralExchange, isEphemeralExchange);
     mDelegate = delegate;
 
-    SetDropAckDebug(false);
     SetAckPending(false);
 
     // Do not request Ack for multicast
@@ -365,6 +376,8 @@ void ExchangeContext::OnSessionReleased()
         return;
     }
 
+    // Hold a ref to ourselves so we can make calls into our delegate that might
+    // decrease our refcount without worrying about use-after-free.
     ExchangeHandle ref(*this);
 
     if (IsResponseExpected())
@@ -372,11 +385,25 @@ void ExchangeContext::OnSessionReleased()
         // If we're waiting on a response, we now know it's never going to show up
         // and we should notify our delegate accordingly.
         CancelResponseTimer();
-        SetResponseExpected(false);
-        NotifyResponseTimeout();
+        // We want to Abort, not just Close, so that RMP bits are cleared, so
+        // don't let NotifyResponseTimeout close us.
+        NotifyResponseTimeout(/* aCloseIfNeeded = */ false);
+        Abort();
+    }
+    else
+    {
+        // Either we're expecting a send or we are in our "just allocated, first
+        // send has not happened yet" state.
+        //
+        // Just mark ourselves as closed.  The consumer is responsible for
+        // releasing us.  See documentation for
+        // ExchangeDelegate::OnExchangeClosing.
+        if (IsSendExpected())
+        {
+            mFlags.Clear(Flags::kFlagWillSendMessage);
+        }
+        DoClose(true /* clearRetransTable */);
     }
-
-    DoClose(true /* clearRetransTable */);
 }
 
 CHIP_ERROR ExchangeContext::StartResponseTimer()
@@ -410,10 +437,10 @@ void ExchangeContext::HandleResponseTimeout(System::Layer * aSystemLayer, void *
     if (ec == nullptr)
         return;
 
-    ec->NotifyResponseTimeout();
+    ec->NotifyResponseTimeout(/* aCloseIfNeeded = */ true);
 }
 
-void ExchangeContext::NotifyResponseTimeout()
+void ExchangeContext::NotifyResponseTimeout(bool aCloseIfNeeded)
 {
     SetResponseExpected(false);
 
@@ -425,7 +452,10 @@ void ExchangeContext::NotifyResponseTimeout()
         delegate->OnResponseTimeout(this);
     }
 
-    MessageHandled();
+    if (aCloseIfNeeded)
+    {
+        MessageHandled();
+    }
 }
 
 CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const PayloadHeader & payloadHeader, MessageFlags msgFlags,
@@ -454,7 +484,21 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
         MessageHandled();
     });
 
-    ReturnErrorOnFailure(mDispatch.OnMessageReceived(messageCounter, payloadHeader, msgFlags, GetReliableMessageContext()));
+    if (mDispatch.IsReliableTransmissionAllowed() && !IsGroupExchangeContext())
+    {
+        if (!msgFlags.Has(MessageFlagValues::kDuplicateMessage) && payloadHeader.IsAckMsg() &&
+            payloadHeader.GetAckMessageCounter().HasValue())
+        {
+            HandleRcvdAck(payloadHeader.GetAckMessageCounter().Value());
+        }
+
+        if (payloadHeader.NeedsAck())
+        {
+            // An acknowledgment needs to be sent back to the peer for this message on this exchange,
+
+            HandleNeedsAck(messageCounter, msgFlags);
+        }
+    }
 
     if (IsAckPending() && !mDelegate)
     {
@@ -476,6 +520,12 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
         return CHIP_NO_ERROR;
     }
 
+    if (IsEphemeralExchange())
+    {
+        // The EphemeralExchange has done its job, since StandaloneAck is sent in previous FlushAcks() call.
+        return CHIP_NO_ERROR;
+    }
+
     // Since we got the response, cancel the response timer.
     CancelResponseTimer();
 
@@ -483,7 +533,9 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
     // is implicitly that response.
     SetResponseExpected(false);
 
-    if (mDelegate != nullptr)
+    // Don't send messages on to our delegate if our dispatch does not allow
+    // those messages.
+    if (mDelegate != nullptr && mDispatch.MessagePermitted(payloadHeader.GetProtocolID(), payloadHeader.GetMessageType()))
     {
         return mDelegate->OnMessageReceived(this, payloadHeader, std::move(msgBuf));
     }
@@ -507,5 +559,16 @@ void ExchangeContext::MessageHandled()
     Close();
 }
 
+ExchangeMessageDispatch & ExchangeContext::GetMessageDispatch(bool isEphemeralExchange, ExchangeDelegate * delegate)
+{
+    if (isEphemeralExchange)
+        return EphemeralExchangeDispatch::Instance();
+
+    if (delegate != nullptr)
+        return delegate->GetMessageDispatch();
+
+    return ApplicationExchangeDispatch::Instance();
+}
+
 } // namespace Messaging
 } // namespace chip
diff --git a/src/messaging/ExchangeContext.h b/src/messaging/ExchangeContext.h
index bd45b65df86d3b..b59c68cba17fb1 100644
--- a/src/messaging/ExchangeContext.h
+++ b/src/messaging/ExchangeContext.h
@@ -66,7 +66,7 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
     typedef System::Clock::Timeout Timeout; // Type used to express the timeout in this ExchangeContext
 
     ExchangeContext(ExchangeManager * em, uint16_t ExchangeId, const SessionHandle & session, bool Initiator,
-                    ExchangeDelegate * delegate);
+                    ExchangeDelegate * delegate, bool isEphemeralExchange = false);
 
     ~ExchangeContext() override;
 
@@ -154,8 +154,6 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
 
     ReliableMessageContext * GetReliableMessageContext() { return static_cast<ReliableMessageContext *>(this); };
 
-    ExchangeMessageDispatch & GetMessageDispatch() { return mDispatch; }
-
     SessionHandle GetSessionHandle() const
     {
         VerifyOrDie(mSession);
@@ -175,6 +173,15 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
     void Close();
     void Abort();
 
+    // Applies a suggested response timeout value based on the session type and the given upper layer processing time for
+    // the next message to the exchange. The exchange context must have a valid session when calling this function.
+    //
+    // This function is an equivalent of SetResponseTimeout(mSession->ComputeRoundTripTimeout(applicationProcessingTimeout))
+    void UseSuggestedResponseTimeout(Timeout applicationProcessingTimeout);
+
+    // Set the response timeout for the exchange context, regardless of the underlying session type. Using
+    // UseSuggestedResponseTimeout to set a timeout based on the type of the session and the application processing time instead of
+    // using this function is recommended.
     void SetResponseTimeout(Timeout timeout);
 
 private:
@@ -229,9 +236,10 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
 
     /**
      * Notify our delegate, if any, that we have timed out waiting for a
-     * response.
+     * response.  If aCloseIfNeeded is true, check whether the exchange needs to
+     * be closed.
      */
-    void NotifyResponseTimeout();
+    void NotifyResponseTimeout(bool aCloseIfNeeded);
 
     CHIP_ERROR StartResponseTimer();
 
@@ -264,6 +272,8 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
      * exchange nor other component requests the active mode.
      */
     void UpdateSEDIntervalMode(bool activeMode);
+
+    static ExchangeMessageDispatch & GetMessageDispatch(bool isEphemeralExchange, ExchangeDelegate * delegate);
 };
 
 } // namespace Messaging
diff --git a/src/messaging/ExchangeDelegate.h b/src/messaging/ExchangeDelegate.h
index 1b66fd1c02b777..fe870b6c3094a9 100644
--- a/src/messaging/ExchangeDelegate.h
+++ b/src/messaging/ExchangeDelegate.h
@@ -91,7 +91,16 @@ class DLL_EXPORT ExchangeDelegate
     /**
      * @brief
      *   This function is the protocol callback to invoke when the associated
-     *   exchange context is being closed
+     *   exchange context is being closed.
+     *
+     *   If the exchange was in a state where it was expecting a message to be
+     *   sent due to an earlier WillSendMessage call or because the exchange has
+     *   just been created as an initiator, the consumer is holding a reference
+     *   to the exchange and it's the consumer's responsibility to call
+     *   Release() on the exchange at some point.  The usual way this happens is
+     *   that the consumer tries to send its message, that fails, and the
+     *   consumer calls Close() on the exchange.  Calling Close() after an
+     *   OnExchangeClosing() notification is allowed in this situation.
      *
      *  @param[in]    ec            A pointer to the ExchangeContext object.
      */
diff --git a/src/messaging/ExchangeMessageDispatch.cpp b/src/messaging/ExchangeMessageDispatch.cpp
index 3e318a72d247af..4bd14e89da600f 100644
--- a/src/messaging/ExchangeMessageDispatch.cpp
+++ b/src/messaging/ExchangeMessageDispatch.cpp
@@ -46,7 +46,7 @@ CHIP_ERROR ExchangeMessageDispatch::SendMessage(SessionManager * sessionManager,
                                                 bool isReliableTransmission, Protocols::Id protocol, uint8_t type,
                                                 System::PacketBufferHandle && message)
 {
-    ReturnErrorCodeIf(!MessagePermitted(protocol.GetProtocolId(), type), CHIP_ERROR_INVALID_ARGUMENT);
+    ReturnErrorCodeIf(!MessagePermitted(protocol, type), CHIP_ERROR_INVALID_ARGUMENT);
 
     PayloadHeader payloadHeader;
     payloadHeader.SetExchangeID(exchangeId).SetMessageType(protocol, type).SetInitiator(isInitiator);
@@ -113,30 +113,5 @@ CHIP_ERROR ExchangeMessageDispatch::SendMessage(SessionManager * sessionManager,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ExchangeMessageDispatch::OnMessageReceived(uint32_t messageCounter, const PayloadHeader & payloadHeader,
-                                                      MessageFlags msgFlags, ReliableMessageContext * reliableMessageContext)
-{
-    ReturnErrorCodeIf(!MessagePermitted(payloadHeader.GetProtocolID().GetProtocolId(), payloadHeader.GetMessageType()),
-                      CHIP_ERROR_INVALID_ARGUMENT);
-
-    if (IsReliableTransmissionAllowed() && !reliableMessageContext->GetExchangeContext()->IsGroupExchangeContext())
-    {
-        if (!msgFlags.Has(MessageFlagValues::kDuplicateMessage) && payloadHeader.IsAckMsg() &&
-            payloadHeader.GetAckMessageCounter().HasValue())
-        {
-            reliableMessageContext->HandleRcvdAck(payloadHeader.GetAckMessageCounter().Value());
-        }
-
-        if (payloadHeader.NeedsAck())
-        {
-            // An acknowledgment needs to be sent back to the peer for this message on this exchange,
-
-            ReturnErrorOnFailure(reliableMessageContext->HandleNeedsAck(messageCounter, msgFlags));
-        }
-    }
-
-    return CHIP_NO_ERROR;
-}
-
 } // namespace Messaging
 } // namespace chip
diff --git a/src/messaging/ExchangeMessageDispatch.h b/src/messaging/ExchangeMessageDispatch.h
index 6c6fefb24fcdeb..35f12e06e80d36 100644
--- a/src/messaging/ExchangeMessageDispatch.h
+++ b/src/messaging/ExchangeMessageDispatch.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <messaging/Flags.h>
+#include <protocols/Protocols.h>
 #include <transport/SessionManager.h>
 
 namespace chip {
@@ -42,11 +43,8 @@ class ExchangeMessageDispatch
     CHIP_ERROR SendMessage(SessionManager * sessionManager, const SessionHandle & session, uint16_t exchangeId, bool isInitiator,
                            ReliableMessageContext * reliableMessageContext, bool isReliableTransmission, Protocols::Id protocol,
                            uint8_t type, System::PacketBufferHandle && message);
-    CHIP_ERROR OnMessageReceived(uint32_t messageCounter, const PayloadHeader & payloadHeader, MessageFlags msgFlags,
-                                 ReliableMessageContext * reliableMessageContext);
 
-protected:
-    virtual bool MessagePermitted(uint16_t protocol, uint8_t type) = 0;
+    virtual bool MessagePermitted(Protocols::Id protocol, uint8_t type) = 0;
 
     // TODO: remove IsReliableTransmissionAllowed, this function should be provided over session.
     virtual bool IsReliableTransmissionAllowed() const { return true; }
diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
index cd258b8afe8db4..2c1242aff55c1c 100644
--- a/src/messaging/ExchangeMgr.cpp
+++ b/src/messaging/ExchangeMgr.cpp
@@ -111,8 +111,12 @@ CHIP_ERROR ExchangeManager::Shutdown()
 
 ExchangeContext * ExchangeManager::NewContext(const SessionHandle & session, ExchangeDelegate * delegate)
 {
-    // Disallow creating exchange on an inactive session
-    VerifyOrReturnError(session->IsActiveSession(), nullptr);
+    if (!session->IsActiveSession())
+    {
+        // Disallow creating exchange on an inactive session
+        ChipLogError(ExchangeManager, "NewContext failed: session inactive");
+        return nullptr;
+    }
     return mContextPool.CreateObject(this, mNextExchangeId++, session, true, delegate);
 }
 
@@ -266,40 +270,33 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const
         return;
     }
 
-    // If we found a handler or we need to send an ack, create an exchange to
-    // handle the message.
-    if (matchingUMH != nullptr || payloadHeader.NeedsAck())
+    // If we found a handler, create an exchange to handle the message.
+    if (matchingUMH != nullptr)
     {
         ExchangeDelegate * delegate = nullptr;
 
         // Fetch delegate from the handler
-        if (matchingUMH != nullptr)
+        CHIP_ERROR err = matchingUMH->Handler->OnUnsolicitedMessageReceived(payloadHeader, delegate);
+        if (err != CHIP_NO_ERROR)
         {
-            CHIP_ERROR err = matchingUMH->Handler->OnUnsolicitedMessageReceived(payloadHeader, delegate);
-            if (err != CHIP_NO_ERROR)
-            {
-                // Using same error message for all errors to reduce code size.
-                ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(err));
-                return;
-            }
+            // Using same error message for all errors to reduce code size.
+            ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(err));
+            SendStandaloneAckIfNeeded(packetHeader, payloadHeader, session, msgFlags, std::move(msgBuf));
+            return;
         }
 
-        // If rcvd msg is from initiator then this exchange is created as not Initiator.
-        // If rcvd msg is not from initiator then this exchange is created as Initiator.
-        // Note that if matchingUMH is not null then rcvd msg if from initiator.
-        // TODO: Figure out which channel to use for the received message
-        ExchangeContext * ec =
-            mContextPool.CreateObject(this, payloadHeader.GetExchangeID(), session, !payloadHeader.IsInitiator(), delegate);
+        ExchangeContext * ec = mContextPool.CreateObject(this, payloadHeader.GetExchangeID(), session, false, delegate);
 
         if (ec == nullptr)
         {
-            if (matchingUMH != nullptr && delegate != nullptr)
+            if (delegate != nullptr)
             {
                 matchingUMH->Handler->OnExchangeCreationFailed(delegate);
             }
 
             // Using same error message for all errors to reduce code size.
             ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(CHIP_ERROR_NO_MEMORY));
+            // No resource for creating new exchange, SendStandaloneAckIfNeeded probably also fails, so do not try it here
             return;
         }
 
@@ -310,16 +307,57 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const
         {
             ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(CHIP_ERROR_INVALID_MESSAGE_TYPE));
             ec->Close();
+            SendStandaloneAckIfNeeded(packetHeader, payloadHeader, session, msgFlags, std::move(msgBuf));
             return;
         }
 
-        CHIP_ERROR err = ec->HandleMessage(packetHeader.GetMessageCounter(), payloadHeader, msgFlags, std::move(msgBuf));
+        err = ec->HandleMessage(packetHeader.GetMessageCounter(), payloadHeader, msgFlags, std::move(msgBuf));
         if (err != CHIP_NO_ERROR)
         {
             // Using same error message for all errors to reduce code size.
             ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(err));
         }
+        return;
     }
+
+    SendStandaloneAckIfNeeded(packetHeader, payloadHeader, session, msgFlags, std::move(msgBuf));
+    return;
+}
+
+void ExchangeManager::SendStandaloneAckIfNeeded(const PacketHeader & packetHeader, const PayloadHeader & payloadHeader,
+                                                const SessionHandle & session, MessageFlags msgFlags,
+                                                System::PacketBufferHandle && msgBuf)
+{
+    // If we need to send a StandaloneAck, create a EphemeralExchange for the purpose to send the StandaloneAck
+    if (!payloadHeader.NeedsAck())
+        return;
+
+    // If rcvd msg is from initiator then this exchange is created as not Initiator.
+    // If rcvd msg is not from initiator then this exchange is created as Initiator.
+    // Create a EphemeralExchange to generate a StandaloneAck
+    ExchangeContext * ec = mContextPool.CreateObject(this, payloadHeader.GetExchangeID(), session, !payloadHeader.IsInitiator(),
+                                                     nullptr, true /* IsEphemeralExchange */);
+
+    if (ec == nullptr)
+    {
+        // Using same error message for all errors to reduce code size.
+        ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(CHIP_ERROR_NO_MEMORY));
+        return;
+    }
+
+    ChipLogDetail(ExchangeManager, "Generating StandaloneAck via exchange: " ChipLogFormatExchange, ChipLogValueExchange(ec));
+
+    // No need to verify packet encryption type, the EphemeralExchange can handle both secure and insecure messages.
+
+    CHIP_ERROR err = ec->HandleMessage(packetHeader.GetMessageCounter(), payloadHeader, msgFlags, std::move(msgBuf));
+    if (err != CHIP_NO_ERROR)
+    {
+        // Using same error message for all errors to reduce code size.
+        ChipLogError(ExchangeManager, "OnMessageReceived failed, err = %s", ErrorStr(err));
+    }
+
+    // The exchange should be closed inside HandleMessage function. So don't bother close it here.
+    return;
 }
 
 void ExchangeManager::CloseAllContextsForDelegate(const ExchangeDelegate * delegate)
diff --git a/src/messaging/ExchangeMgr.h b/src/messaging/ExchangeMgr.h
index 1c0a783703a343..d6b775436799f4 100644
--- a/src/messaging/ExchangeMgr.h
+++ b/src/messaging/ExchangeMgr.h
@@ -240,6 +240,8 @@ class DLL_EXPORT ExchangeManager : public SessionMessageDelegate
 
     void OnMessageReceived(const PacketHeader & packetHeader, const PayloadHeader & payloadHeader, const SessionHandle & session,
                            DuplicateMessage isDuplicate, System::PacketBufferHandle && msgBuf) override;
+    void SendStandaloneAckIfNeeded(const PacketHeader & packetHeader, const PayloadHeader & payloadHeader,
+                                   const SessionHandle & session, MessageFlags msgFlags, System::PacketBufferHandle && msgBuf);
 };
 
 } // namespace Messaging
diff --git a/src/messaging/ReliableMessageContext.cpp b/src/messaging/ReliableMessageContext.cpp
index ec4264d3742331..d2b47cf52dd64c 100644
--- a/src/messaging/ReliableMessageContext.cpp
+++ b/src/messaging/ReliableMessageContext.cpp
@@ -103,10 +103,6 @@ void ReliableMessageContext::HandleRcvdAck(uint32_t ackMessageCounter)
 CHIP_ERROR ReliableMessageContext::HandleNeedsAck(uint32_t messageCounter, BitFlags<MessageFlagValues> messageFlags)
 
 {
-    // Skip processing ack if drop ack debug is enabled.
-    if (ShouldDropAckDebug())
-        return CHIP_NO_ERROR;
-
     CHIP_ERROR err = HandleNeedsAckInner(messageCounter, messageFlags);
 
     // Schedule next physical wakeup on function exit
diff --git a/src/messaging/ReliableMessageContext.h b/src/messaging/ReliableMessageContext.h
index 804b358ea294cb..e67b2d596e963e 100644
--- a/src/messaging/ReliableMessageContext.h
+++ b/src/messaging/ReliableMessageContext.h
@@ -67,9 +67,9 @@ class ReliableMessageContext
     }
 
     /**
-     * Check whether we have an ack to piggyback on the message we are sending.
-     * If true, TakePendingPeerAckMessageCounter will return a valid value that
-     * should be included as an ack in the message.
+     * Check whether we have a mPendingPeerAckMessageCounter. The counter is
+     * valid once we receive a message which requests an ack. Once
+     * mPendingPeerAckMessageCounter is valid, it never stops being valid.
      */
     bool HasPiggybackAckPending() const;
 
@@ -102,26 +102,6 @@ class ReliableMessageContext
      */
     void SetAutoRequestAck(bool autoReqAck);
 
-    /**
-     *  Determine whether the ChipExchangeManager should not send an
-     *  acknowledgement.
-     *
-     *  For internal, debug use only.
-     */
-    bool ShouldDropAckDebug() const;
-
-    /**
-     *  Set whether the ChipExchangeManager should not send acknowledgements
-     *  for this context.
-     *
-     *  For internal, debug use only.
-     *
-     *  @param[in]  inDropAckDebug  A Boolean indicating whether (true) or not
-     *                         (false) the acknowledgements should be not
-     *                         sent for the exchange.
-     */
-    void SetDropAckDebug(bool inDropAckDebug);
-
     /**
      *  Determine whether there is already an acknowledgment pending to be sent to the peer on this exchange.
      *
@@ -141,6 +121,9 @@ class ReliableMessageContext
     /// Determine whether this exchange is requesting Sleepy End Device active mode
     bool IsRequestingActiveMode() const;
 
+    /// Determine whether this exchange is a EphemeralExchange for replying a StandaloneAck
+    bool IsEphemeralExchange() const;
+
     /**
      * Get the reliable message manager that corresponds to this reliable
      * message context.
@@ -159,29 +142,28 @@ class ReliableMessageContext
         /// When set, automatically request an acknowledgment whenever a message is sent via UDP.
         kFlagAutoRequestAck = (1u << 2),
 
-        /// Internal and debug only: when set, the exchange layer does not send an acknowledgment.
-        kFlagDropAckDebug = (1u << 3),
-
         /// When set, signifies there is a message which hasn't been acknowledged.
-        kFlagMessageNotAcked = (1u << 4),
+        kFlagMessageNotAcked = (1u << 3),
 
         /// When set, signifies that there is an acknowledgment pending to be sent back.
-        kFlagAckPending = (1u << 5),
+        kFlagAckPending = (1u << 4),
 
-        /// When set, signifies that there has once been an acknowledgment
-        /// pending to be sent back.  In that case,
-        /// mPendingPeerAckMessageCounter is a valid message counter value for
-        /// some message we have needed to acknowledge in the past.
-        kFlagAckMessageCounterIsValid = (1u << 6),
+        /// When set, signifies that mPendingPeerAckMessageCounter is valid.
+        /// The counter is valid once we receive a message which requests an ack.
+        /// Once mPendingPeerAckMessageCounter is valid, it never stops being valid.
+        kFlagAckMessageCounterIsValid = (1u << 5),
 
         /// When set, signifies that this exchange is waiting for a call to SendMessage.
-        kFlagWillSendMessage = (1u << 7),
+        kFlagWillSendMessage = (1u << 6),
 
         /// When set, we have had Close() or Abort() called on us already.
-        kFlagClosed = (1u << 8),
+        kFlagClosed = (1u << 7),
 
         /// When set, signifies that the exchange is requesting Sleepy End Device active mode.
-        kFlagActiveMode = (1u << 9),
+        kFlagActiveMode = (1u << 8),
+
+        /// When set, signifies that the exchange created sorely for replying a StandaloneAck
+        kFlagEphemeralExchange = (1u << 9),
     };
 
     BitFlags<Flags> mFlags; // Internal state flags
@@ -228,11 +210,6 @@ inline bool ReliableMessageContext::IsMessageNotAcked() const
     return mFlags.Has(Flags::kFlagMessageNotAcked);
 }
 
-inline bool ReliableMessageContext::ShouldDropAckDebug() const
-{
-    return mFlags.Has(Flags::kFlagDropAckDebug);
-}
-
 inline bool ReliableMessageContext::HasPiggybackAckPending() const
 {
     return mFlags.Has(Flags::kFlagAckMessageCounterIsValid);
@@ -253,11 +230,6 @@ inline void ReliableMessageContext::SetAckPending(bool inAckPending)
     mFlags.Set(Flags::kFlagAckPending, inAckPending);
 }
 
-inline void ReliableMessageContext::SetDropAckDebug(bool inDropAckDebug)
-{
-    mFlags.Set(Flags::kFlagDropAckDebug, inDropAckDebug);
-}
-
 inline void ReliableMessageContext::SetMessageNotAcked(bool messageNotAcked)
 {
     mFlags.Set(Flags::kFlagMessageNotAcked, messageNotAcked);
@@ -268,5 +240,10 @@ inline void ReliableMessageContext::SetRequestingActiveMode(bool activeMode)
     mFlags.Set(Flags::kFlagActiveMode, activeMode);
 }
 
+inline bool ReliableMessageContext::IsEphemeralExchange() const
+{
+    return mFlags.Has(Flags::kFlagEphemeralExchange);
+}
+
 } // namespace Messaging
 } // namespace chip
diff --git a/src/messaging/ReliableMessageMgr.cpp b/src/messaging/ReliableMessageMgr.cpp
index 1ad170b3a9a32a..e6bb6cb8f64a62 100644
--- a/src/messaging/ReliableMessageMgr.cpp
+++ b/src/messaging/ReliableMessageMgr.cpp
@@ -132,6 +132,10 @@ void ReliableMessageMgr::ExecuteActions()
                          " sendCount: %u max retries: %d",
                          messageCounter, ChipLogValueExchange(&entry->ec.Get()), sendCount, CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS);
 
+            // Don't check whether the session in the exchange is valid, because when the session is released, the retrans entry is
+            // cleared inside ExchangeContext::OnSessionReleased, so the session must be valid if the entry exists.
+            entry->ec->GetSessionHandle()->DispatchSessionEvent(&SessionDelegate::OnSessionHang);
+
             // Do not StartTimer, we will schedule the timer at the end of the timer handler.
             mRetransTable.ReleaseObject(entry);
             return Loop::Continue;
@@ -280,7 +284,7 @@ CHIP_ERROR ReliableMessageMgr::SendFromRetransTable(RetransTableEntry * entry)
             // After the first failure notify session manager to refresh device data
             if (entry->sendCount == 1)
             {
-                exchangeMgr->GetSessionManager()->RefreshSessionOperationalData(entry->ec->GetSessionHandle());
+                entry->ec->GetSessionHandle()->DispatchSessionEvent(&SessionDelegate::OnFirstMessageDeliveryFailed);
             }
         }
     }
diff --git a/src/messaging/ReliableMessageMgr.h b/src/messaging/ReliableMessageMgr.h
index 544c30e313746b..9538ad3f5e0c4c 100644
--- a/src/messaging/ReliableMessageMgr.h
+++ b/src/messaging/ReliableMessageMgr.h
@@ -38,9 +38,6 @@
 namespace chip {
 namespace Messaging {
 
-class ExchangeContext;
-using ExchangeHandle = ReferenceCountedHandle<ExchangeContext>;
-
 enum class SendMessageFlags : uint16_t;
 class ReliableMessageContext;
 
diff --git a/src/messaging/tests/MessagingContext.cpp b/src/messaging/tests/MessagingContext.cpp
index ef5cd63e7bde05..dd6db9fea07c15 100644
--- a/src/messaging/tests/MessagingContext.cpp
+++ b/src/messaging/tests/MessagingContext.cpp
@@ -46,8 +46,8 @@ CHIP_ERROR MessagingContext::Init(TransportMgrBase * transport, IOContext * ioCo
         FabricInfo aliceFabric;
         FabricInfo bobFabric;
 
-        aliceFabric.TestOnlyBuildFabric(GetRootACertAsset().mCert, GetIAA1CertAsset().mCert, GetNodeA1CertAsset().mCert,
-                                        GetNodeA1CertAsset().mKey);
+        ReturnErrorOnFailure(aliceFabric.TestOnlyBuildFabric(GetRootACertAsset().mCert, GetIAA1CertAsset().mCert,
+                                                             GetNodeA1CertAsset().mCert, GetNodeA1CertAsset().mKey));
         ReturnErrorOnFailure(mFabricTable.AddNewFabricForTest(aliceFabric, &mAliceFabricIndex));
 
         bobFabric.TestOnlyBuildFabric(GetRootACertAsset().mCert, GetIAA1CertAsset().mCert, GetNodeA2CertAsset().mCert,
diff --git a/src/messaging/tests/TestReliableMessageProtocol.cpp b/src/messaging/tests/TestReliableMessageProtocol.cpp
index 8cd06bb79015b2..4ddf2c63919759 100644
--- a/src/messaging/tests/TestReliableMessageProtocol.cpp
+++ b/src/messaging/tests/TestReliableMessageProtocol.cpp
@@ -132,7 +132,7 @@ class MockSessionEstablishmentExchangeDispatch : public Messaging::ApplicationEx
 public:
     bool IsReliableTransmissionAllowed() const override { return mRetainMessageOnSend; }
 
-    bool MessagePermitted(uint16_t protocol, uint8_t type) override { return true; }
+    bool MessagePermitted(Protocols::Id protocol, uint8_t type) override { return true; }
 
     bool IsEncryptionRequired() const override { return mRequireEncryption; }
 
diff --git a/src/platform/Ameba/AmebaConfig.cpp b/src/platform/Ameba/AmebaConfig.cpp
index d9a34c92f5cd6c..9dfed9d20ec783 100644
--- a/src/platform/Ameba/AmebaConfig.cpp
+++ b/src/platform/Ameba/AmebaConfig.cpp
@@ -42,20 +42,25 @@ namespace Internal {
 // *** CAUTION ***: Changing the names or namespaces of these values will *break* existing devices.
 
 // NVS namespaces used to store device configuration information.
-const char AmebaConfig::kConfigNamespace_ChipFactory[]      = "chip-factory";
-const char AmebaConfig::kConfigNamespace_ChipConfig[]       = "chip-config";
-const char AmebaConfig::kConfigNamespace_ChipCounters[]     = "chip-counters";
-const char AmebaConfig::kConfigNamespace_ChipFabric1[]      = "chip-fabric-1";
-const char AmebaConfig::kConfigNamespace_ChipFabric2[]      = "chip-fabric-2";
-const char AmebaConfig::kConfigNamespace_ChipFabric3[]      = "chip-fabric-3";
-const char AmebaConfig::kConfigNamespace_ChipFabric4[]      = "chip-fabric-4";
-const char AmebaConfig::kConfigNamespace_ChipFabric5[]      = "chip-fabric-5";
-const char AmebaConfig::kConfigNamespace_ChipACL[]          = "chip-acl";
-const char AmebaConfig::kConfigNamespace_ChipAttributes[]   = "chip-attributes";
-const char AmebaConfig::kConfigNamespace_ChipBindingTable[] = "chip-bindingtable";
-const char AmebaConfig::kConfigNamespace_ChipOTA[]          = "chip-ota";
-const char AmebaConfig::kConfigNamespace_ChipDNS[]          = "chip-dns";
-const char AmebaConfig::kConfigNamespace_ChipOthers[]       = "chip-others";
+const char AmebaConfig::kConfigNamespace_ChipFactory[]              = "chip-factory";
+const char AmebaConfig::kConfigNamespace_ChipConfig[]               = "chip-config";
+const char AmebaConfig::kConfigNamespace_ChipCounters[]             = "chip-counters";
+const char AmebaConfig::kConfigNamespace_ChipFabric1[]              = "chip-fabric-1";
+const char AmebaConfig::kConfigNamespace_ChipFabric2[]              = "chip-fabric-2";
+const char AmebaConfig::kConfigNamespace_ChipFabric3[]              = "chip-fabric-3";
+const char AmebaConfig::kConfigNamespace_ChipFabric4[]              = "chip-fabric-4";
+const char AmebaConfig::kConfigNamespace_ChipFabric5[]              = "chip-fabric-5";
+const char AmebaConfig::kConfigNamespace_ChipACL[]                  = "chip-acl";
+const char AmebaConfig::kConfigNamespace_ChipGroupMessageCounters[] = "chip-groupmsgcounters";
+const char AmebaConfig::kConfigNamespace_ChipAttributes[]           = "chip-attributes";
+const char AmebaConfig::kConfigNamespace_ChipBindingTable[]         = "chip-bindingtable";
+const char AmebaConfig::kConfigNamespace_ChipOTA[]                  = "chip-ota";
+const char AmebaConfig::kConfigNamespace_ChipFailSafe[]             = "chip-failsafe";
+const char AmebaConfig::kConfigNamespace_ChipSessionResumption[]    = "chip-sessionresumption";
+const char AmebaConfig::kConfigNamespace_ChipDeviceInfoProvider[]   = "chip-deviceinfoprovider";
+const char AmebaConfig::kConfigNamespace_ChipGroupDataProvider[]    = "chip-groupdataprovider";
+const char AmebaConfig::kConfigNamespace_ChipOthers[]               = "chip-others";
+const char AmebaConfig::kConfigNamespace_ChipOthers2[]              = "chip-others2";
 
 // Keys stored in the chip-factory namespace
 const AmebaConfig::Key AmebaConfig::kConfigKey_SerialNum             = { kConfigNamespace_ChipFactory, "serial-num" };
diff --git a/src/platform/Ameba/AmebaConfig.h b/src/platform/Ameba/AmebaConfig.h
index e2af3ea97826c7..95fc03971808c8 100755
--- a/src/platform/Ameba/AmebaConfig.h
+++ b/src/platform/Ameba/AmebaConfig.h
@@ -46,11 +46,16 @@ class AmebaConfig
     static const char kConfigNamespace_ChipFabric4[];
     static const char kConfigNamespace_ChipFabric5[];
     static const char kConfigNamespace_ChipACL[];
+    static const char kConfigNamespace_ChipGroupMessageCounters[];
     static const char kConfigNamespace_ChipAttributes[];
     static const char kConfigNamespace_ChipBindingTable[];
     static const char kConfigNamespace_ChipOTA[];
-    static const char kConfigNamespace_ChipDNS[];
+    static const char kConfigNamespace_ChipFailSafe[];
+    static const char kConfigNamespace_ChipSessionResumption[];
+    static const char kConfigNamespace_ChipDeviceInfoProvider[];
+    static const char kConfigNamespace_ChipGroupDataProvider[];
     static const char kConfigNamespace_ChipOthers[];
+    static const char kConfigNamespace_ChipOthers2[];
 
     // Key definitions for well-known keys.
     static const Key kConfigKey_SerialNum;
diff --git a/src/platform/Ameba/AmebaUtils.cpp b/src/platform/Ameba/AmebaUtils.cpp
new file mode 100644
index 00000000000000..b5f3b95f13454b
--- /dev/null
+++ b/src/platform/Ameba/AmebaUtils.cpp
@@ -0,0 +1,142 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          General utility methods for the Ameba platform.
+ */
+/* this file behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <chip_porting.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/ErrorStr.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/Ameba/AmebaConfig.h>
+#include <platform/Ameba/AmebaUtils.h>
+#include <platform/Ameba/ConfigurationManagerImpl.h>
+
+using namespace ::chip::DeviceLayer::Internal;
+using chip::DeviceLayer::Internal::DeviceNetworkInfo;
+
+namespace {
+constexpr char kWiFiSSIDKeyName[]        = "wifi-ssid";
+constexpr char kWiFiCredentialsKeyName[] = "wifi-pass";
+} // namespace
+
+CHIP_ERROR AmebaUtils::StartWiFi(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    // Ensure that the WiFi layer is started.
+    wifi_on(RTW_MODE_STA);
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::IsStationEnabled(bool & staEnabled)
+{
+    staEnabled = (wifi_mode == RTW_MODE_STA || wifi_mode == RTW_MODE_STA_AP);
+    return CHIP_NO_ERROR;
+}
+
+bool AmebaUtils::IsStationProvisioned(void)
+{
+    rtw_wifi_config_t WiFiConfig = { 0 };
+    return ((GetWiFiConfig(&WiFiConfig) == CHIP_NO_ERROR) && (WiFiConfig.ssid[0] != 0));
+}
+
+CHIP_ERROR AmebaUtils::IsStationConnected(bool & connected)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    connected      = (wifi_is_connected_to_ap() == RTW_SUCCESS) ? 1 : 0;
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::EnableStationMode(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    // Ensure that station mode is enabled in the WiFi layer.
+    wifi_set_mode(RTW_MODE_STA);
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::SetWiFiConfig(rtw_wifi_config_t * config)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    /* Store Wi-Fi Configurations in Storage */
+    err = PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, config->ssid, sizeof(config->ssid));
+    SuccessOrExit(err);
+
+    err = PersistedStorage::KeyValueStoreMgr().Put(kWiFiCredentialsKeyName, config->password, sizeof(config->password));
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::GetWiFiConfig(rtw_wifi_config_t * config)
+{
+    CHIP_ERROR err        = CHIP_NO_ERROR;
+    size_t ssidLen        = 0;
+    size_t credentialsLen = 0;
+
+    /* Retrieve Wi-Fi Configurations from Storage */
+    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiSSIDKeyName, config->ssid, sizeof(config->ssid), &ssidLen);
+    SuccessOrExit(err);
+
+    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiCredentialsKeyName, config->password, sizeof(config->password),
+                                                   &credentialsLen);
+    SuccessOrExit(err);
+
+    config->ssid_len     = ssidLen;
+    config->password_len = credentialsLen;
+
+exit:
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::ClearWiFiConfig()
+{
+    // Clear Ameba WiFi station config
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    rtw_wifi_config_t wifiConfig;
+    memset(&wifiConfig, 0, sizeof(wifiConfig));
+    err = SetWiFiConfig(&wifiConfig);
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::WiFiDisconnect(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    ChipLogProgress(DeviceLayer, "wifi_disconnect");
+    err = (wifi_disconnect() == RTW_SUCCESS) ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL;
+    return err;
+}
+
+CHIP_ERROR AmebaUtils::WiFiConnect(void)
+{
+    CHIP_ERROR err             = CHIP_NO_ERROR;
+    rtw_wifi_config_t * config = (rtw_wifi_config_t *) pvPortMalloc(sizeof(rtw_wifi_config_t));
+    memset(config, 0, sizeof(rtw_wifi_config_t));
+    GetWiFiConfig(config);
+    ChipLogProgress(DeviceLayer, "Connecting to AP : [%s]", (char *) config->ssid);
+    int ameba_err = wifi_connect((char *) config->ssid, RTW_SECURITY_WPA_WPA2_MIXED, (char *) config->password,
+                                 strlen((const char *) config->ssid), strlen((const char *) config->password), 0, NULL);
+
+    vPortFree(config);
+    err = (ameba_err == RTW_SUCCESS) ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL;
+    return err;
+}
diff --git a/src/platform/Ameba/AmebaUtils.h b/src/platform/Ameba/AmebaUtils.h
new file mode 100644
index 00000000000000..b2f68f38dad1ef
--- /dev/null
+++ b/src/platform/Ameba/AmebaUtils.h
@@ -0,0 +1,44 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "platform/internal/DeviceNetworkInfo.h"
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+class AmebaUtils
+{
+public:
+    static CHIP_ERROR StartWiFi(void);
+    static CHIP_ERROR IsStationEnabled(bool & staEnabled);
+    static bool IsStationProvisioned(void);
+    static CHIP_ERROR IsStationConnected(bool & connected);
+    static CHIP_ERROR EnableStationMode(void);
+    static CHIP_ERROR SetWiFiConfig(rtw_wifi_config_t * config);
+    static CHIP_ERROR GetWiFiConfig(rtw_wifi_config_t * config);
+    static CHIP_ERROR ClearWiFiConfig(void);
+    static CHIP_ERROR WiFiDisconnect(void);
+    static CHIP_ERROR WiFiConnect(void);
+};
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Ameba/BLEManagerImpl.cpp b/src/platform/Ameba/BLEManagerImpl.cpp
old mode 100755
new mode 100644
index 1116db19b359ef..a6c6f179907623
--- a/src/platform/Ameba/BLEManagerImpl.cpp
+++ b/src/platform/Ameba/BLEManagerImpl.cpp
@@ -24,8 +24,9 @@
 
 /* this file behaves like a config.h, comes first */
 #include <crypto/CHIPCryptoPAL.h>
-#include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/CommissionableDataProvider.h>
+#include <platform/DeviceInstanceInfoProvider.h>
+#include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -1042,7 +1043,7 @@ void BLEManagerImpl::HandleC3CharRead(TBTCONFIG_CALLBACK_DATA * p_data)
     uint8_t rotatingDeviceIdUniqueId[ConfigurationManager::kRotatingDeviceIDUniqueIDLength] = {};
     MutableByteSpan rotatingDeviceIdUniqueIdSpan(rotatingDeviceIdUniqueId);
 
-    err = ConfigurationMgr().GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
+    err = DeviceLayer::GetDeviceInstanceInfoProvider()->GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
     SuccessOrExit(err);
     err = ConfigurationMgr().GetLifetimeCounter(additionalDataPayloadParams.rotatingDeviceIdLifetimeCounter);
     SuccessOrExit(err);
diff --git a/src/platform/Ameba/BUILD.gn b/src/platform/Ameba/BUILD.gn
index ec2349745c5329..f9524f21487989 100755
--- a/src/platform/Ameba/BUILD.gn
+++ b/src/platform/Ameba/BUILD.gn
@@ -23,6 +23,8 @@ static_library("Ameba") {
     "../SingletonConfigurationManager.cpp",
     "AmebaConfig.cpp",
     "AmebaConfig.h",
+    "AmebaUtils.cpp",
+    "AmebaUtils.h",
     "BLEManagerImpl.cpp",
     "BLEManagerImpl.h",
     "CHIPDevicePlatformConfig.h",
diff --git a/src/platform/Ameba/ConfigurationManagerImpl.cpp b/src/platform/Ameba/ConfigurationManagerImpl.cpp
index 18a05566248367..a1f4f00eac306b 100644
--- a/src/platform/Ameba/ConfigurationManagerImpl.cpp
+++ b/src/platform/Ameba/ConfigurationManagerImpl.cpp
@@ -67,16 +67,26 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
     SuccessOrExit(err);
     err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipACL);
     SuccessOrExit(err);
+    err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipGroupMessageCounters);
+    SuccessOrExit(err);
     err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipAttributes);
     SuccessOrExit(err);
     err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipBindingTable);
     SuccessOrExit(err);
     err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipOTA);
     SuccessOrExit(err);
-    err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipDNS);
+    err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipFailSafe);
+    SuccessOrExit(err);
+    err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipSessionResumption);
+    SuccessOrExit(err);
+    err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipDeviceInfoProvider);
+    SuccessOrExit(err);
+    err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipGroupDataProvider);
     SuccessOrExit(err);
     err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipOthers);
     SuccessOrExit(err);
+    err = AmebaConfig::EnsureNamespace2(AmebaConfig::kConfigNamespace_ChipOthers2);
+    SuccessOrExit(err);
 
     if (AmebaConfig::ConfigValueExists(AmebaConfig::kCounterKey_RebootCount))
     {
@@ -167,30 +177,6 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConfigurationManagerImpl::GetUniqueId(char * buf, size_t bufSize)
-{
-#ifdef CHIP_DEVICE_CONFIG_UNIQUE_ID
-    ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_UNIQUE_ID), CHIP_ERROR_BUFFER_TOO_SMALL);
-    strcpy(buf, CHIP_DEVICE_CONFIG_UNIQUE_ID);
-    return CHIP_NO_ERROR;
-#else
-    ReturnErrorCodeIf(bufSize != 32, CHIP_ERROR_INVALID_MESSAGE_LENGTH);
-    char temp[32];
-    int i = 0, j = 0;
-
-    memset(&temp[0], 0, 32);
-    ReturnErrorCodeIf(wifi_get_mac_address(temp) != 0, CHIP_ERROR_INVALID_ARGUMENT);
-
-    for (i = 0; i < bufSize; i++)
-    {
-        if (temp[i] != ':')
-            buf[j++] = temp[i];
-    }
-
-    return CHIP_NO_ERROR;
-#endif
-}
-
 bool ConfigurationManagerImpl::CanFactoryReset()
 {
     // TODO: query the application to determine if factory reset is allowed.
diff --git a/src/platform/Ameba/ConfigurationManagerImpl.h b/src/platform/Ameba/ConfigurationManagerImpl.h
index 78555c6f07b126..def780ea343817 100644
--- a/src/platform/Ameba/ConfigurationManagerImpl.h
+++ b/src/platform/Ameba/ConfigurationManagerImpl.h
@@ -55,7 +55,6 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     void InitiateFactoryReset(void) override;
     CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
     CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
-    CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
     // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
 
     // ===== Members that implement the GenericConfigurationManagerImpl protected interface.
diff --git a/src/platform/Ameba/ConnectivityManagerImpl.cpp b/src/platform/Ameba/ConnectivityManagerImpl.cpp
index ee294acb78d665..ce2ff544c66d34 100644
--- a/src/platform/Ameba/ConnectivityManagerImpl.cpp
+++ b/src/platform/Ameba/ConnectivityManagerImpl.cpp
@@ -32,6 +32,7 @@
 #include <platform/internal/GenericConnectivityManagerImpl_WiFi.ipp>
 #endif
 
+#include <platform/Ameba/AmebaUtils.h>
 #include <platform/Ameba/NetworkCommissioningDriver.h>
 #include <platform/internal/BLEManager.h>
 #include <support/CodeUtils.h>
@@ -59,6 +60,7 @@ ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;
 
 CHIP_ERROR ConnectivityManagerImpl::_Init()
 {
+    CHIP_ERROR err = CHIP_NO_ERROR;
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     mLastStationConnectFailTime   = System::Clock::kZero;
     mLastAPDemandTime             = System::Clock::kZero;
@@ -77,39 +79,32 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
     wifi_reg_event_handler(WIFI_EVENT_CONNECT, ConnectivityManagerImpl::RtkWiFiStationConnectedHandler, NULL);
     wifi_reg_event_handler(WIFI_EVENT_DISCONNECT, ConnectivityManagerImpl::RtkWiFiStationDisconnectedHandler, NULL);
 
-    // Ensure that station mode is enabled.
-    wifi_on(RTW_MODE_STA);
-
-    // Ensure that station mode is enabled in the WiFi layer.
-    wifi_set_mode(RTW_MODE_STA);
-    ;
+    err = Internal::AmebaUtils::StartWiFi();
+    SuccessOrExit(err);
+    err = Internal::AmebaUtils::EnableStationMode();
+    SuccessOrExit(err);
 
     // If there is no persistent station provision...
     if (!IsWiFiStationProvisioned())
     {
         // If the code has been compiled with a default WiFi station provision, configure that now.
 #if !defined(CONFIG_DEFAULT_WIFI_SSID)
-        printf("%s %d pls define CONFIG_DEFAULT_WIFI_SSID\r\n", __func__, __LINE__);
+        ChipLogProgress(DeviceLayer, "Please define CONFIG_DEFAULT_WIFI_SSID");
 #else
         if (CONFIG_DEFAULT_WIFI_SSID[0] != 0)
         {
             ChipLogProgress(DeviceLayer, "Setting default WiFi station configuration (SSID: %s)", CONFIG_DEFAULT_WIFI_SSID);
 
             // Set a default station configuration.
-            rtw_wifi_setting_t wifiConfig;
-
-            // Set the wifi configuration
+            rtw_wifi_config_t wifiConfig;
             memset(&wifiConfig, 0, sizeof(wifiConfig));
             memcpy(wifiConfig.ssid, CONFIG_DEFAULT_WIFI_SSID, strlen(CONFIG_DEFAULT_WIFI_SSID) + 1);
             memcpy(wifiConfig.password, CONFIG_DEFAULT_WIFI_PASSWORD, strlen(CONFIG_DEFAULT_WIFI_PASSWORD) + 1);
             wifiConfig.mode = RTW_MODE_STA;
 
             // Configure the WiFi interface.
-            int err = CHIP_SetWiFiConfig(&wifiConfig);
-            if (err != 0)
-            {
-                ChipLogError(DeviceLayer, "_Init _SetWiFiConfig() failed: %d", err);
-            }
+            err = Internal::AmebaUtils::SetWiFiConfig(&wifiConfig);
+            SuccessOrExit(err);
 
             // Enable WiFi station mode.
             ReturnErrorOnFailure(SetWiFiStationMode(kWiFiStationMode_Enabled));
@@ -131,7 +126,8 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
-    return CHIP_NO_ERROR;
+exit:
+    return err;
 }
 
 void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
@@ -149,8 +145,8 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
         {
             ChangeWiFiStationState(kWiFiStationState_Connecting_Succeeded);
         }
-        DriveStationState();
         DHCPProcess();
+        DriveStationState();
     }
     if (event->Type == DeviceEventType::kRtkWiFiStationDisconnectedEvent)
     {
@@ -208,14 +204,15 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationMode(WiFiStationMode val)
 
 bool ConnectivityManagerImpl::_IsWiFiStationProvisioned(void)
 {
-    rtw_wifi_setting_t mWiFiSetting;
-    CHIP_GetWiFiConfig(&mWiFiSetting);
-    return mWiFiSetting.ssid[0] != 0;
+    return Internal::AmebaUtils::IsStationProvisioned();
 }
 
 void ConnectivityManagerImpl::_ClearWiFiStationProvision(void)
 {
-    // TBD
+    // Clear Ameba WiFi station config
+    rtw_wifi_config_t wifiConfig;
+    memset(&wifiConfig, 0, sizeof(wifiConfig));
+    Internal::AmebaUtils::SetWiFiConfig(&wifiConfig);
 }
 
 CHIP_ERROR ConnectivityManagerImpl::_SetWiFiAPMode(WiFiAPMode val)
@@ -468,6 +465,7 @@ void ConnectivityManagerImpl::_OnWiFiStationProvisionChange()
 
 void ConnectivityManagerImpl::DriveStationState()
 {
+    CHIP_ERROR err = CHIP_NO_ERROR;
     bool stationConnected;
 
     GetWiFiStationMode();
@@ -475,16 +473,14 @@ void ConnectivityManagerImpl::DriveStationState()
     // If the station interface is NOT under application control...
     if (mWiFiStationMode != kWiFiStationMode_ApplicationControlled)
     {
-        // Ensure that the WiFi layer is started.
-        wifi_on(RTW_MODE_STA);
-
-        // Ensure that station mode is enabled in the WiFi layer.
-        wifi_set_mode(RTW_MODE_STA);
-        ;
+        err = Internal::AmebaUtils::StartWiFi();
+        SuccessOrExit(err);
+        err = Internal::AmebaUtils::EnableStationMode();
+        SuccessOrExit(err);
     }
 
     // Determine if the WiFi layer thinks the station interface is currently connected.
-    stationConnected = (wifi_is_connected_to_ap() == RTW_SUCCESS) ? 1 : 0;
+    err = Internal::AmebaUtils::IsStationConnected(stationConnected);
 
     // If the station interface is currently connected ...
     if (stationConnected)
@@ -506,10 +502,10 @@ void ConnectivityManagerImpl::DriveStationState()
             (mWiFiStationMode != kWiFiStationMode_Enabled || !IsWiFiStationProvisioned()))
         {
             ChipLogProgress(DeviceLayer, "Disconnecting WiFi station interface");
-            int err = wifi_disconnect();
-            if (err != 0)
+            err = Internal::AmebaUtils::WiFiDisconnect();
+            if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(DeviceLayer, "wifi_disconnect() failed: %s", err);
+                ChipLogError(DeviceLayer, "WiFiDisconnect() failed: %s", err);
                 return;
             }
 
@@ -551,10 +547,13 @@ void ConnectivityManagerImpl::DriveStationState()
                 now >= mLastStationConnectFailTime + mWiFiStationReconnectInterval)
             {
                 ChipLogProgress(DeviceLayer, "Attempting to connect WiFi station interface");
-                rtw_wifi_setting_t wifi_info;
-                CHIP_GetWiFiConfig(&wifi_info);
-                wifi_connect((char *) wifi_info.ssid, RTW_SECURITY_WPA_WPA2_MIXED, (char *) wifi_info.password,
-                             strlen((const char *) wifi_info.ssid), strlen((const char *) wifi_info.password), 0, NULL);
+                err = Internal::AmebaUtils::WiFiConnect();
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(DeviceLayer, "WiFiConnect() failed: %s", chip::ErrorStr(err));
+                }
+                SuccessOrExit(err);
+
                 ChangeWiFiStationState(kWiFiStationState_Connecting);
             }
 
@@ -571,6 +570,7 @@ void ConnectivityManagerImpl::DriveStationState()
         }
     }
 
+exit:
     ChipLogProgress(DeviceLayer, "Done driving station state, nothing else to do...");
     // Kick-off any pending network scan that might have been deferred due to the activity
     // of the WiFi station.
@@ -674,16 +674,9 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
                 // address (2000::/3) that is in the valid state.  If such an address is found...
                 for (uint8_t i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++)
                 {
-                    if (ip6_addr_isglobal(netif_ip6_addr(netif, i)) && ip6_addr_isvalid(netif_ip6_addr_state(netif, i)))
+                    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)))
                     {
-                        // Determine if there is a default IPv6 router that is currently reachable
-                        // via the station interface.  If so, presume for now that the device has
-                        // IPv6 connectivity.
-                        struct netif * found_if = nd6_find_route(IP6_ADDR_ANY6);
-                        if (found_if && netif->num == found_if->num)
-                        {
-                            haveIPv6Conn = true;
-                        }
+                        haveIPv6Conn = true;
                     }
                 }
             }
diff --git a/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp b/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp
index 142d2b2daa7e5b..e5754f447c7e45 100644
--- a/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp
@@ -17,6 +17,7 @@
 
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
+#include <platform/Ameba/AmebaUtils.h>
 #include <platform/Ameba/NetworkCommissioningDriver.h>
 #include <platform/CHIPDeviceLayer.h>
 
@@ -30,11 +31,6 @@ namespace chip {
 namespace DeviceLayer {
 namespace NetworkCommissioning {
 
-namespace {
-constexpr char kWiFiSSIDKeyName[]        = "wifi-ssid";
-constexpr char kWiFiCredentialsKeyName[] = "wifi-pass";
-} // namespace
-
 CHIP_ERROR AmebaWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
 {
     CHIP_ERROR err;
@@ -44,20 +40,17 @@ CHIP_ERROR AmebaWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChan
     mpConnectCallback      = nullptr;
     mpStatusChangeCallback = networkStatusChangeCallback;
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiCredentialsKeyName, mSavedNetwork.credentials,
-                                                   sizeof(mSavedNetwork.credentials), &credentialsLen);
+    rtw_wifi_config_t config = { 0 };
+    err                      = chip::DeviceLayer::Internal::AmebaUtils::GetWiFiConfig(&config);
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
         return CHIP_NO_ERROR;
     }
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiSSIDKeyName, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid), &ssidLen);
-    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
-    {
-        return CHIP_NO_ERROR;
-    }
-    mSavedNetwork.credentialsLen = credentialsLen;
-    mSavedNetwork.ssidLen        = ssidLen;
+    memcpy(mSavedNetwork.ssid, config.ssid, sizeof(config.ssid));
+    memcpy(mSavedNetwork.credentials, config.password, sizeof(config.password));
+    mSavedNetwork.ssidLen        = config.ssid_len;
+    mSavedNetwork.credentialsLen = config.password_len;
 
     mStagingNetwork = mSavedNetwork;
     return err;
@@ -71,9 +64,11 @@ CHIP_ERROR AmebaWiFiDriver::Shutdown()
 
 CHIP_ERROR AmebaWiFiDriver::CommitConfiguration()
 {
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiCredentialsKeyName, mStagingNetwork.credentials,
-                                                                  mStagingNetwork.credentialsLen));
+    rtw_wifi_config_t config = { 0 };
+    memcpy(config.ssid, mStagingNetwork.ssid, mStagingNetwork.ssidLen);
+    memcpy(config.password, mStagingNetwork.credentials, mStagingNetwork.credentialsLen);
+    ReturnErrorOnFailure(chip::DeviceLayer::Internal::AmebaUtils::SetWiFiConfig(&config));
+
     mSavedNetwork = mStagingNetwork;
     return CHIP_NO_ERROR;
 }
@@ -129,22 +124,41 @@ Status AmebaWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, Mutabl
 
 CHIP_ERROR AmebaWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
 {
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    // If device is already connected to WiFi, then disconnect the WiFi,
+    // clear the WiFi configurations and add the newly provided WiFi configurations.
+    if (chip::DeviceLayer::Internal::AmebaUtils::IsStationProvisioned())
+    {
+        ChipLogProgress(DeviceLayer, "Disconnecting WiFi station interface");
+        err = chip::DeviceLayer::Internal::AmebaUtils::WiFiDisconnect();
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(DeviceLayer, "WiFiDisconnect() failed");
+            return err;
+        }
+        err = chip::DeviceLayer::Internal::AmebaUtils::ClearWiFiConfig();
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(DeviceLayer, "ClearWiFiStationProvision failed");
+            return err;
+        }
+    }
+
     ReturnErrorOnFailure(ConnectivityMgr().SetWiFiStationMode(ConnectivityManager::kWiFiStationMode_Disabled));
 
-    rtw_wifi_setting_t wifiConfig;
+    rtw_wifi_config_t wifiConfig;
 
     // Set the wifi configuration
     memset(&wifiConfig, 0, sizeof(wifiConfig));
     memcpy(wifiConfig.ssid, ssid, ssidLen + 1);
     memcpy(wifiConfig.password, key, keyLen + 1);
-    wifiConfig.mode = RTW_MODE_STA;
 
     // Configure the WiFi interface.
-    int err = CHIP_SetWiFiConfig(&wifiConfig);
-    if (err != 0)
+    err = chip::DeviceLayer::Internal::AmebaUtils::SetWiFiConfig(&wifiConfig);
+    if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(DeviceLayer, "_SetWiFiConfig() failed: %d", err);
-        return CHIP_ERROR_INCORRECT_STATE;
+        ChipLogError(DeviceLayer, "SetWiFiConfig() failed");
+        return err;
     }
 
     ReturnErrorOnFailure(ConnectivityMgr().SetWiFiStationMode(ConnectivityManager::kWiFiStationMode_Disabled));
@@ -249,7 +263,7 @@ void AmebaWiFiDriver::OnScanWiFiNetworkDone()
 CHIP_ERROR GetConfiguredNetwork(Network & network)
 {
     rtw_wifi_setting_t wifi_setting;
-    CHIP_GetWiFiConfig(&wifi_setting);
+    wifi_get_setting(WLAN0_NAME, &wifi_setting);
 
     uint8_t length = strnlen(reinterpret_cast<const char *>(wifi_setting.ssid), DeviceLayer::Internal::kMaxWiFiSSIDLength);
     if (length > sizeof(network.networkID))
@@ -266,10 +280,9 @@ CHIP_ERROR GetConfiguredNetwork(Network & network)
 void AmebaWiFiDriver::OnNetworkStatusChange()
 {
     Network configuredNetwork;
-    rtw_wifi_setting_t mWiFiSetting;
-    CHIP_GetWiFiConfig(&mWiFiSetting);
-    bool staEnable    = (mWiFiSetting.mode == RTW_MODE_STA || mWiFiSetting.mode == RTW_MODE_STA_AP);
-    bool staConnected = (mWiFiSetting.ssid[0] != 0);
+    bool staEnabled = false, staConnected = false;
+    VerifyOrReturn(chip::DeviceLayer::Internal::AmebaUtils::IsStationEnabled(staEnabled) == CHIP_NO_ERROR);
+    VerifyOrReturn(staEnabled && mpStatusChangeCallback != nullptr);
 
     CHIP_ERROR err = GetConfiguredNetwork(configuredNetwork);
     if (err != CHIP_NO_ERROR)
@@ -278,6 +291,7 @@ void AmebaWiFiDriver::OnNetworkStatusChange()
         return;
     }
 
+    VerifyOrReturn(chip::DeviceLayer::Internal::AmebaUtils::IsStationConnected(staConnected) == CHIP_NO_ERROR);
     if (staConnected)
     {
         mpStatusChangeCallback->OnNetworkingStatusChange(
@@ -334,9 +348,8 @@ bool AmebaWiFiDriver::WiFiNetworkIterator::Next(Network & item)
     CHIP_ERROR err = GetConfiguredNetwork(configuredNetwork);
     if (err == CHIP_NO_ERROR)
     {
-        rtw_wifi_setting_t mWiFiSetting;
-        CHIP_GetWiFiConfig(&mWiFiSetting);
-        bool isConnected = (mWiFiSetting.ssid[0] != 0);
+        bool isConnected = false;
+        err              = chip::DeviceLayer::Internal::AmebaUtils::IsStationConnected(isConnected);
 
         if (isConnected && configuredNetwork.networkIDLen == item.networkIDLen &&
             memcmp(configuredNetwork.networkID, item.networkID, item.networkIDLen) == 0)
diff --git a/src/platform/Ameba/SystemPlatformConfig.h b/src/platform/Ameba/SystemPlatformConfig.h
index 61fb892a58acb6..26ba0379e3d04f 100755
--- a/src/platform/Ameba/SystemPlatformConfig.h
+++ b/src/platform/Ameba/SystemPlatformConfig.h
@@ -34,7 +34,6 @@ struct ChipDeviceEvent;
 } // namespace chip
 
 // ==================== Platform Adaptations ====================
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1
 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
 #define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
 
diff --git a/src/platform/Ameba/SystemTimeSupport.cpp b/src/platform/Ameba/SystemTimeSupport.cpp
index a5940cb0356400..57e5d863b059f9 100644
--- a/src/platform/Ameba/SystemTimeSupport.cpp
+++ b/src/platform/Ameba/SystemTimeSupport.cpp
@@ -62,6 +62,10 @@ Milliseconds64 ClockImpl::GetMonotonicMilliseconds64(void)
 
 CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & curTime)
 {
+    // TODO(19081): This platform does not properly error out if wall clock has
+    //              not been set.  For now, short circuit this.
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#if 0
     time_t seconds;
     struct rtkTimeVal tv;
 
@@ -75,33 +79,21 @@ CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & curTime)
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    curTime = Clock::Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
+    curTime = Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
 
     return CHIP_NO_ERROR;
+#endif
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & curTime)
+CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Milliseconds64 & aCurTime)
 {
-    time_t seconds;
-    struct rtkTimeVal tv;
-
-    seconds = rtc_read();
-
-    tv.tv_sec  = (uint32_t) seconds;
-    tv.tv_usec = 0;
-
-    if (tv.tv_sec < CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    curTime =
-        Clock::Milliseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000)) + (static_cast<uint64_t>(tv.tv_usec) / 1000));
-
-    return CHIP_NO_ERROR;
+    Microseconds64 curTimeUs;
+    auto err = GetClock_RealTime(curTimeUs);
+    aCurTime = std::chrono::duration_cast<Milliseconds64>(curTimeUs);
+    return err;
 }
 
-CHIP_ERROR ClockImpl::SetClock_RealTime(Clock::Microseconds64 aNewCurTime)
+CHIP_ERROR ClockImpl::SetClock_RealTime(Microseconds64 aNewCurTime)
 {
     struct rtkTimeVal tv;
     tv.tv_sec  = static_cast<uint32_t>(aNewCurTime.count() / UINT64_C(1000000));
@@ -118,6 +110,9 @@ CHIP_ERROR InitClock_RealTime()
         Clock::Microseconds64((static_cast<uint64_t>(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD) * UINT64_C(1000000)));
     // Use CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD as the initial value of RealTime.
     // Then the RealTime obtained from GetClock_RealTime will be always valid.
+    //
+    // TODO(19081): This is broken because it causes the platform to report
+    //              that it does have wall clock time when it actually doesn't.
     return System::SystemClock().SetClock_RealTime(curTime);
 }
 
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index b4d717a0040b60..773fa52d93fa05 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -30,12 +30,6 @@ if (chip_enable_openthread) {
   }
 }
 
-if (chip_device_platform == "linux" && chip_mdns != "none") {
-  pkg_config("avahi_client_config") {
-    packages = [ "avahi-client" ]
-  }
-}
-
 if (chip_device_platform != "none" && chip_device_platform != "external") {
   declare_args() {
     # Extra header to include in CHIPDeviceConfig.h for project.
@@ -56,6 +50,10 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     # Enable including the additional data in the advertisement packets
     chip_enable_additional_data_advertising = false
 
+    # Enable default/generic test-mode DeviceInstanceInfoProvider in GenericConfigurationManagerImpl
+    # === FOR TRANSITION UNTIL ALL EXAMPLES PROVIDE THEIR OWN ===
+    chip_use_transitional_device_instance_info_provider = true
+
     # Enable default/generic test-mode CommissionableDataProvider in GenericConfigurationManagerImpl
     # === FOR TRANSITION UNTIL ALL EXAMPLES PROVIDE THEIR OWN ===
     # Linux platform has already transitioned.
@@ -154,6 +152,12 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       defines += [ "CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER=0" ]
     }
 
+    if (chip_use_transitional_device_instance_info_provider) {
+      defines += [ "CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER=1" ]
+    } else {
+      defines += [ "CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER=0" ]
+    }
+
     if (chip_device_platform == "cc13x2_26x2") {
       defines += [
         "CHIP_DEVICE_LAYER_TARGET_CC13X2_26X2=1",
@@ -254,6 +258,11 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       ]
       defines -=
           [ "CHIP_DEVICE_CONFIG_ENABLE_WPA=${chip_device_config_enable_wpa}" ]
+    } else if (chip_device_platform == "zephyr") {
+      defines += [
+        "CHIP_DEVICE_LAYER_TARGET_ZEPHYR=1",
+        "CHIP_DEVICE_LAYER_TARGET=Zephyr",
+      ]
     }
   }
 } else if (chip_device_platform == "none") {
@@ -295,6 +304,7 @@ if (chip_device_platform != "none") {
     output_name = "libDeviceLayer"
 
     sources = [
+      "../include/platform/BuildTime.h",
       "../include/platform/CHIPDeviceConfig.h",
       "../include/platform/CHIPDeviceError.h",
       "../include/platform/CHIPDeviceEvent.h",
@@ -303,6 +313,7 @@ if (chip_device_platform != "none") {
       "../include/platform/ConfigurationManager.h",
       "../include/platform/ConnectivityManager.h",
       "../include/platform/DeviceControlServer.h",
+      "../include/platform/DeviceInstanceInfoProvider.h",
       "../include/platform/FailSafeContext.h",
       "../include/platform/GeneralUtils.h",
       "../include/platform/KeyValueStoreManager.h",
@@ -339,6 +350,7 @@ if (chip_device_platform != "none") {
       "CommissionableDataProvider.cpp",
       "DeviceControlServer.cpp",
       "DeviceInfoProvider.cpp",
+      "DeviceInstanceInfoProvider.cpp",
       "DiagnosticDataProvider.cpp",
       "Entropy.cpp",
       "FailSafeContext.cpp",
@@ -406,6 +418,8 @@ if (chip_device_platform != "none") {
       _platform_target = "fake"
     } else if (chip_device_platform == "cyw30739") {
       _platform_target = "CYW30739"
+    } else if (chip_device_platform == "zephyr") {
+      _platform_target = "Zephyr"
     } else {
       assert(false, "Unknown chip_device_platform: ${chip_device_platform}")
     }
diff --git a/src/platform/CYW30739/CHIPPlatformConfig.h b/src/platform/CYW30739/CHIPPlatformConfig.h
index 3f9f965e4e4f55..12ee433af8c27d 100644
--- a/src/platform/CYW30739/CHIPPlatformConfig.h
+++ b/src/platform/CYW30739/CHIPPlatformConfig.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#define CHIP_CONFIG_MAX_FABRICS 4
+#define CHIP_CONFIG_MAX_FABRICS 5
 #define CHIP_CONFIG_UNAUTHENTICATED_CONNECTION_POOL_SIZE 10
 #define CHIP_DEVICE_CONFIG_ENABLE_JUST_IN_TIME_PROVISIONING 1
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_COMMISSIONABLE_DISCOVERY 1
diff --git a/src/platform/CYW30739/CYW30739Config.cpp b/src/platform/CYW30739/CYW30739Config.cpp
index cd845cdbd24bfe..997b573ba36aa9 100644
--- a/src/platform/CYW30739/CYW30739Config.cpp
+++ b/src/platform/CYW30739/CYW30739Config.cpp
@@ -76,7 +76,8 @@ template CHIP_ERROR CYW30739Config::ReadConfigValue(Key key, bool & val);
 template CHIP_ERROR CYW30739Config::ReadConfigValue(Key key, uint32_t & val);
 template CHIP_ERROR CYW30739Config::ReadConfigValue(Key key, uint64_t & val);
 
-CHIP_ERROR CYW30739Config::WriteConfigValue(Key key, uint32_t val)
+template <typename T>
+CHIP_ERROR CYW30739Config::WriteConfigValue(Key key, T val)
 {
     wiced_result_t result;
     uint16_t write_count = wiced_hal_write_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, sizeof(val), (uint8_t *) &val, &result);
@@ -86,6 +87,10 @@ CHIP_ERROR CYW30739Config::WriteConfigValue(Key key, uint32_t val)
         return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
+template CHIP_ERROR CYW30739Config::WriteConfigValue(Key key, bool val);
+template CHIP_ERROR CYW30739Config::WriteConfigValue(Key key, uint32_t val);
+template CHIP_ERROR CYW30739Config::WriteConfigValue(Key key, uint64_t val);
+
 CHIP_ERROR CYW30739Config::WriteConfigValueStr(Key key, const char * str)
 {
     return WriteConfigValueStr(key, str, (str != NULL) ? strlen(str) : 0);
@@ -98,9 +103,13 @@ CHIP_ERROR CYW30739Config::WriteConfigValueStr(Key key, const char * str, size_t
 
 CHIP_ERROR CYW30739Config::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
 {
+    /* Skip writing because the write API reports error result for zero length data. */
+    if (dataLen == 0)
+        return CHIP_NO_ERROR;
+
     wiced_result_t result;
-    wiced_hal_write_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, dataLen, (uint8_t *) data, &result);
-    if (result == WICED_SUCCESS)
+    const uint16_t write_count = wiced_hal_write_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, dataLen, (uint8_t *) data, &result);
+    if (result == WICED_SUCCESS && write_count == dataLen)
         return CHIP_NO_ERROR;
     else
         return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
@@ -109,7 +118,8 @@ CHIP_ERROR CYW30739Config::WriteConfigValueBin(Key key, const uint8_t * data, si
 bool CYW30739Config::ConfigValueExists(Key key)
 {
     wiced_result_t result;
-    wiced_hal_read_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, 0, NULL, &result);
+    uint8_t val;
+    wiced_hal_read_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, sizeof(val), &val, &result);
     if (result != WICED_SUCCESS)
         wiced_hal_read_nvram_static(PLATFORM_NVRAM_SSID_MATTER_BASE + key, 0, NULL, &result);
     return result == WICED_SUCCESS;
@@ -118,7 +128,7 @@ bool CYW30739Config::ConfigValueExists(Key key)
 CHIP_ERROR CYW30739Config::FactoryResetConfig(void)
 {
     wiced_result_t result;
-    for (Key key = kConfigKey_Base; key <= kConfigKey_Max; key++)
+    for (Key key = kMinConfigKey_ChipConfig; key <= kMaxConfigKey_ChipConfig; key++)
         wiced_hal_delete_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, &result);
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/CYW30739/CYW30739Config.h b/src/platform/CYW30739/CYW30739Config.h
index 00975a89f77fb6..8f8aad9f5bdde6 100644
--- a/src/platform/CYW30739/CYW30739Config.h
+++ b/src/platform/CYW30739/CYW30739Config.h
@@ -32,6 +32,11 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
+constexpr inline uint32_t CYW30739ConfigKey(uint8_t keyBaseOffset, uint8_t id)
+{
+    return static_cast<uint32_t>(keyBaseOffset) << 8 | id;
+}
+
 /**
  * Provides functions and definitions for accessing device configuration information.
  */
@@ -40,36 +45,46 @@ class CYW30739Config
 public:
     using Key = uint32_t;
 
+    static constexpr uint8_t kChipFactory_KeyBase = 0x00;
+    static constexpr uint8_t kChipConfig_KeyBase  = 0x01;
+
     // Key definitions for well-known keys.
     // Factory config keys
-    static constexpr Key kConfigKey_SerialNum             = 0;
-    static constexpr Key kConfigKey_MfrDeviceId           = 1;
-    static constexpr Key kConfigKey_MfrDeviceCert         = 2;
-    static constexpr Key kConfigKey_MfrDevicePrivateKey   = 3;
-    static constexpr Key kConfigKey_ManufacturingDate     = 4;
-    static constexpr Key kConfigKey_SetupPinCode          = 5;
-    static constexpr Key kConfigKey_MfrDeviceICACerts     = 6;
-    static constexpr Key kConfigKey_SetupDiscriminator    = 7;
-    static constexpr Key kConfigKey_Spake2pIterationCount = 8;
-    static constexpr Key kConfigKey_Spake2pSalt           = 9;
-    static constexpr Key kConfigKey_Spake2pVerifier       = 10;
+    static constexpr Key kConfigKey_SerialNum             = CYW30739ConfigKey(kChipFactory_KeyBase, 0x00);
+    static constexpr Key kConfigKey_MfrDeviceId           = CYW30739ConfigKey(kChipFactory_KeyBase, 0x01);
+    static constexpr Key kConfigKey_MfrDeviceCert         = CYW30739ConfigKey(kChipFactory_KeyBase, 0x02);
+    static constexpr Key kConfigKey_MfrDevicePrivateKey   = CYW30739ConfigKey(kChipFactory_KeyBase, 0x03);
+    static constexpr Key kConfigKey_ManufacturingDate     = CYW30739ConfigKey(kChipFactory_KeyBase, 0x04);
+    static constexpr Key kConfigKey_SetupPinCode          = CYW30739ConfigKey(kChipFactory_KeyBase, 0x05);
+    static constexpr Key kConfigKey_MfrDeviceICACerts     = CYW30739ConfigKey(kChipFactory_KeyBase, 0x06);
+    static constexpr Key kConfigKey_SetupDiscriminator    = CYW30739ConfigKey(kChipFactory_KeyBase, 0x07);
+    static constexpr Key kConfigKey_Spake2pIterationCount = CYW30739ConfigKey(kChipFactory_KeyBase, 0x08);
+    static constexpr Key kConfigKey_Spake2pSalt           = CYW30739ConfigKey(kChipFactory_KeyBase, 0x09);
+    static constexpr Key kConfigKey_Spake2pVerifier       = CYW30739ConfigKey(kChipFactory_KeyBase, 0x0a);
     // CHIP Config Keys
-    static constexpr Key kConfigKey_ServiceConfig      = 9;
-    static constexpr Key kConfigKey_PairedAccountId    = 10;
-    static constexpr Key kConfigKey_ServiceId          = 11;
-    static constexpr Key kConfigKey_LastUsedEpochKeyId = 13;
-    static constexpr Key kConfigKey_FailSafeArmed      = 14;
-    static constexpr Key kConfigKey_GroupKey           = 15;
-    static constexpr Key kConfigKey_HardwareVersion    = 16;
-    static constexpr Key kConfigKey_RegulatoryLocation = 17;
-    static constexpr Key kConfigKey_CountryCode        = 18;
-    static constexpr Key kConfigKey_HourFormat         = 20;
-    static constexpr Key kConfigKey_CalendarType       = 21;
-    static constexpr Key kConfigKey_UniqueId           = 23;
+    static constexpr Key kConfigKey_ServiceConfig      = CYW30739ConfigKey(kChipConfig_KeyBase, 0x00);
+    static constexpr Key kConfigKey_PairedAccountId    = CYW30739ConfigKey(kChipConfig_KeyBase, 0x01);
+    static constexpr Key kConfigKey_ServiceId          = CYW30739ConfigKey(kChipConfig_KeyBase, 0x02);
+    static constexpr Key kConfigKey_LastUsedEpochKeyId = CYW30739ConfigKey(kChipConfig_KeyBase, 0x03);
+    static constexpr Key kConfigKey_FailSafeArmed      = CYW30739ConfigKey(kChipConfig_KeyBase, 0x04);
+    static constexpr Key kConfigKey_GroupKey           = CYW30739ConfigKey(kChipConfig_KeyBase, 0x05);
+    static constexpr Key kConfigKey_HardwareVersion    = CYW30739ConfigKey(kChipConfig_KeyBase, 0x06);
+    static constexpr Key kConfigKey_RegulatoryLocation = CYW30739ConfigKey(kChipConfig_KeyBase, 0x07);
+    static constexpr Key kConfigKey_CountryCode        = CYW30739ConfigKey(kChipConfig_KeyBase, 0x08);
+    static constexpr Key kConfigKey_RebootCount        = CYW30739ConfigKey(kChipConfig_KeyBase, 0x09);
+    static constexpr Key kConfigKey_UniqueId           = CYW30739ConfigKey(kChipConfig_KeyBase, 0x0a);
+    static constexpr Key kConfigKey_LockUser           = CYW30739ConfigKey(kChipConfig_KeyBase, 0x0b);
+    static constexpr Key kConfigKey_Credential         = CYW30739ConfigKey(kChipConfig_KeyBase, 0x0c);
+    static constexpr Key kConfigKey_LockUserName       = CYW30739ConfigKey(kChipConfig_KeyBase, 0x0d);
+    static constexpr Key kConfigKey_CredentialData     = CYW30739ConfigKey(kChipConfig_KeyBase, 0x0e);
+    static constexpr Key kConfigKey_UserCredentials    = CYW30739ConfigKey(kChipConfig_KeyBase, 0x0f);
+    static constexpr Key kConfigKey_BootReason         = CYW30739ConfigKey(kChipConfig_KeyBase, 0x10);
 
     // Set key id limits for each group.
-    static constexpr Key kConfigKey_Base = kConfigKey_SerialNum;
-    static constexpr Key kConfigKey_Max  = kConfigKey_UniqueId;
+    static constexpr Key kMinConfigKey_ChipFactory = CYW30739ConfigKey(kChipFactory_KeyBase, 0x00);
+    static constexpr Key kMaxConfigKey_ChipFactory = CYW30739ConfigKey(kChipFactory_KeyBase, 0x0a);
+    static constexpr Key kMinConfigKey_ChipConfig  = CYW30739ConfigKey(kChipConfig_KeyBase, 0x00);
+    static constexpr Key kMaxConfigKey_ChipConfig  = CYW30739ConfigKey(kChipConfig_KeyBase, 0x10);
 
     static CHIP_ERROR Init(void);
 
@@ -79,7 +94,8 @@ class CYW30739Config
 
     static CHIP_ERROR ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen);
     static CHIP_ERROR ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen);
-    static CHIP_ERROR WriteConfigValue(Key key, uint32_t val);
+    template <typename T>
+    static CHIP_ERROR WriteConfigValue(Key key, T val);
     static CHIP_ERROR WriteConfigValueStr(Key key, const char * str);
     static CHIP_ERROR WriteConfigValueStr(Key key, const char * str, size_t strLen);
     static CHIP_ERROR WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen);
diff --git a/src/platform/CYW30739/ConfigurationManagerImpl.cpp b/src/platform/CYW30739/ConfigurationManagerImpl.cpp
index 1bd7ad747301d6..71d32970f10881 100644
--- a/src/platform/CYW30739/ConfigurationManagerImpl.cpp
+++ b/src/platform/CYW30739/ConfigurationManagerImpl.cpp
@@ -26,10 +26,10 @@
 
 #include <platform/internal/GenericConfigurationManagerImpl.ipp>
 
+#include <hal/wiced_hal_wdog.h>
 #include <platform/CYW30739/CYW30739Config.h>
 #include <platform/ConfigurationManager.h>
-
-#include <hal/wiced_hal_wdog.h>
+#include <platform/DiagnosticDataProvider.h>
 #include <platform/KeyValueStoreManager.h>
 
 namespace chip {
@@ -46,6 +46,27 @@ ConfigurationManagerImpl & ConfigurationManagerImpl::GetDefaultInstance()
 CHIP_ERROR ConfigurationManagerImpl::Init()
 {
     CHIP_ERROR err;
+    uint32_t rebootCount;
+    if (CYW30739Config::ConfigValueExists(CYW30739Config::kConfigKey_RebootCount))
+    {
+        err = GetRebootCount(rebootCount);
+        SuccessOrExit(err);
+
+        err = StoreRebootCount(rebootCount + 1);
+        SuccessOrExit(err);
+    }
+    else
+    {
+        // The first boot after factory reset of the Node.
+        err = StoreRebootCount(1);
+        SuccessOrExit(err);
+    }
+
+    if (!CYW30739Config::ConfigValueExists(CYW30739Config::kConfigKey_BootReason))
+    {
+        err = StoreBootReason(to_underlying(BootReasonType::kUnspecified));
+        SuccessOrExit(err);
+    }
 
     // Initialize the generic implementation base class.
     err = Internal::GenericConfigurationManagerImpl<CYW30739Config>::Init();
@@ -55,6 +76,26 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
     return err;
 }
 
+CHIP_ERROR ConfigurationManagerImpl::GetRebootCount(uint32_t & rebootCount)
+{
+    return ReadConfigValue(CYW30739Config::kConfigKey_RebootCount, rebootCount);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreRebootCount(uint32_t rebootCount)
+{
+    return WriteConfigValue(CYW30739Config::kConfigKey_RebootCount, rebootCount);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetBootReason(uint32_t & bootReason)
+{
+    return ReadConfigValue(CYW30739Config::kConfigKey_BootReason, bootReason);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreBootReason(uint32_t bootReason)
+{
+    return WriteConfigValue(CYW30739Config::kConfigKey_BootReason, bootReason);
+}
+
 bool ConfigurationManagerImpl::CanFactoryReset(void)
 {
     return true;
@@ -160,6 +201,12 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
 
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
+    err = PersistedStorage::KeyValueStoreMgrImpl().EraseAll();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Clear Key-Value Storage failed");
+    }
+
     // Restart the system.
     ChipLogProgress(DeviceLayer, "System restarting");
     wiced_hal_wdog_reset_system();
diff --git a/src/platform/CYW30739/ConfigurationManagerImpl.h b/src/platform/CYW30739/ConfigurationManagerImpl.h
index 021fde30a0067e..284f4d37e94551 100644
--- a/src/platform/CYW30739/ConfigurationManagerImpl.h
+++ b/src/platform/CYW30739/ConfigurationManagerImpl.h
@@ -39,6 +39,10 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
 public:
     // This returns an instance of this class.
     static ConfigurationManagerImpl & GetDefaultInstance();
+    CHIP_ERROR GetRebootCount(uint32_t & rebootCount) override;
+    CHIP_ERROR StoreRebootCount(uint32_t rebootCount) override;
+    CHIP_ERROR GetBootReason(uint32_t & bootReason) override;
+    CHIP_ERROR StoreBootReason(uint32_t bootReason) override;
 
 private:
     // ===== Members that implement the ConfigurationManager public interface.
diff --git a/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp b/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp
index 7360320ad800ed..b286b474531867 100644
--- a/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp
@@ -29,6 +29,10 @@
 #include <hal/wiced_memory.h>
 #include <malloc.h>
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include <platform/OpenThread/OpenThreadUtils.h>
+#endif
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -65,5 +69,62 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & cu
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DiagnosticDataProviderImpl::GetRebootCount(uint16_t & rebootCount)
+{
+    uint32_t count = 0;
+    CHIP_ERROR err = ConfigurationMgr().GetRebootCount(count);
+    if (err == CHIP_NO_ERROR)
+    {
+        // If the value overflows, return UINT16 max value to provide best-effort number.
+        rebootCount = static_cast<uint16_t>(count <= UINT16_MAX ? count : UINT16_MAX);
+    }
+    return err;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason)
+{
+    uint32_t reason = 0;
+    CHIP_ERROR err  = ConfigurationMgr().GetBootReason(reason);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        VerifyOrReturnError(reason <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
+        bootReason = static_cast<BootReasonType>(reason);
+    }
+
+    return err;
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface ** netifpp)
+{
+    auto ifp = Platform::New<ThreadNetworkInterface>();
+    VerifyOrReturnError(ifp != nullptr, CHIP_ERROR_NO_MEMORY);
+
+    const char * threadNetworkName = otThreadGetNetworkName(ThreadStackMgrImpl().OTInstance());
+    ifp->name                      = Span<const char>(threadNetworkName, strlen(threadNetworkName));
+    ifp->isOperational             = true;
+    ifp->offPremiseServicesReachableIPv4.SetNull();
+    ifp->offPremiseServicesReachableIPv6.SetNull();
+    ifp->hardwareAddress = ByteSpan(ifp->macBuffer);
+    ifp->type            = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+
+    ConfigurationMgr().GetPrimary802154MACAddress(ifp->macBuffer);
+
+    *netifpp = ifp;
+    return CHIP_NO_ERROR;
+}
+
+void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * netifp)
+{
+    while (netifp)
+    {
+        NetworkInterface * del = netifp;
+        netifp                 = netifp->Next;
+        Platform::Delete(del);
+    }
+}
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_THREAD */
+
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/CYW30739/DiagnosticDataProviderImpl.h b/src/platform/CYW30739/DiagnosticDataProviderImpl.h
index 6505cf5eedff17..9e6dd337244d02 100644
--- a/src/platform/CYW30739/DiagnosticDataProviderImpl.h
+++ b/src/platform/CYW30739/DiagnosticDataProviderImpl.h
@@ -42,6 +42,22 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
     CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
     CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
+    CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override;
+    CHIP_ERROR GetBootReason(BootReasonType & bootReason) override;
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override;
+    void ReleaseNetworkInterfaces(NetworkInterface * netifp) override;
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_THREAD */
+
+private:
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    struct ThreadNetworkInterface : public NetworkInterface
+    {
+        ~ThreadNetworkInterface() = delete;
+
+        uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
+    };
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_THREAD */
 };
 
 } // namespace DeviceLayer
diff --git a/src/platform/CYW30739/KeyValueStoreManagerImpl.cpp b/src/platform/CYW30739/KeyValueStoreManagerImpl.cpp
index e89017b8c4adc6..2e274875f6c641 100644
--- a/src/platform/CYW30739/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/CYW30739/KeyValueStoreManagerImpl.cpp
@@ -128,6 +128,19 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
     return err;
 }
 
+CHIP_ERROR KeyValueStoreManagerImpl::EraseAll(void)
+{
+    wiced_result_t result;
+    wiced_hal_delete_nvram(PLATFORM_NVRAM_ID_ENTRY_INFO_STRING, &result);
+    if (result == WICED_SUCCESS)
+    {
+        return CHIP_NO_ERROR;
+    }
+
+    ChipLogError(DeviceLayer, "%s wiced_hal_delete_nvram %u", __func__, result);
+    return CHIP_ERROR_PERSISTED_STORAGE_FAILED;
+}
+
 bool KeyValueStoreManagerImpl::KeyEntry::IsMatchKey(const char * key)
 {
     return mIsValid && strncmp(mKey, key, sizeof(mKey)) == 0;
diff --git a/src/platform/CYW30739/KeyValueStoreManagerImpl.h b/src/platform/CYW30739/KeyValueStoreManagerImpl.h
index de2928da942180..1d418844419777 100644
--- a/src/platform/CYW30739/KeyValueStoreManagerImpl.h
+++ b/src/platform/CYW30739/KeyValueStoreManagerImpl.h
@@ -44,11 +44,29 @@ class KeyValueStoreManagerImpl final : public KeyValueStoreManager
 
     CHIP_ERROR _Put(const char * key, const void * value, size_t value_size);
 
+    CHIP_ERROR EraseAll(void);
+
 private:
-    static constexpr uint8_t mMaxEntryCount = 1 + /* For the global message counter */
-        1 +                                       /* For the admin key count */
-        CHIP_CONFIG_MAX_FABRICS + 1               /* For the session key count */
-        ;
+    static constexpr uint8_t mMaxEntryCount = 1 +                   /* global event id counter */
+        1 +                                                         /* FabricIndexInfo */
+        CHIP_CONFIG_MAX_FABRICS +                                   /* FabricNOC */
+        CHIP_CONFIG_MAX_FABRICS +                                   /* FabricICAC */
+        CHIP_CONFIG_MAX_FABRICS +                                   /* FabricRCAC */
+        CHIP_CONFIG_MAX_FABRICS +                                   /* FabricMetadata */
+        CHIP_CONFIG_MAX_FABRICS +                                   /* FabricOpKey */
+        1 +                                                         /* AccessControlList */
+        CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC + /* AccessControlEntry */
+        1 +                                                         /* GroupDataCounter */
+        1 +                                                         /* GroupControlCounter */
+        1 +                                                         /* FabricTable */
+        4 +                                                         /* FabricGroups */
+        CHIP_CONFIG_MAX_FABRICS * 3 +                               /* FabricKeyset */
+        1 +                                                         /* OTADefaultProviders */
+        1 +                                                         /* OTACurrentProvider */
+        1 +                                                         /* OTAUpdateToken */
+        1 +                                                         /* OTACurrentUpdateState */
+        1 +                                                         /* OTATargetVersion */
+        16;                                                         /* AttributeValue */
 
     struct KeyEntry
     {
diff --git a/src/platform/CYW30739/OTAImageProcessorImpl.cpp b/src/platform/CYW30739/OTAImageProcessorImpl.cpp
index 1058afb042b501..27443e994829db 100644
--- a/src/platform/CYW30739/OTAImageProcessorImpl.cpp
+++ b/src/platform/CYW30739/OTAImageProcessorImpl.cpp
@@ -17,11 +17,14 @@
  */
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <ota_fw_upgrade.h>
 #include <wiced_hal_wdog.h>
 
 #include "OTAImageProcessorImpl.h"
 
+using namespace chip::System;
+
 namespace chip {
 
 CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
@@ -66,6 +69,35 @@ CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & block)
     return CHIP_NO_ERROR;
 }
 
+bool OTAImageProcessorImpl::IsFirstImageRun()
+{
+    OTARequestorInterface * requestor = chip::GetRequestorInstance();
+    if (requestor == nullptr)
+    {
+        return false;
+    }
+
+    return requestor->GetCurrentUpdateState() == OTARequestorInterface::OTAUpdateStateEnum::kApplying;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
+{
+    OTARequestorInterface * requestor = chip::GetRequestorInstance();
+    if (requestor == nullptr)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    uint32_t currentVersion;
+    ReturnErrorOnFailure(DeviceLayer::ConfigurationMgr().GetSoftwareVersion(currentVersion));
+    if (currentVersion != requestor->GetTargetVersion())
+    {
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
 {
     auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
@@ -80,6 +112,8 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
         return;
     }
 
+    imageProcessor->mHeaderParser.Init();
+
     if (!wiced_firmware_upgrade_prepare())
     {
         ChipLogError(SoftwareUpdate, "wiced_firmware_upgrade_prepare");
@@ -113,10 +147,7 @@ void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
 void OTAImageProcessorImpl::HandleApply(intptr_t context)
 {
     auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
+    VerifyOrReturn(imageProcessor != nullptr);
 
     if (!wiced_firmware_upgrade_apply())
     {
@@ -126,7 +157,13 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
 
     ChipLogProgress(SoftwareUpdate, "OTA upgrade completed");
 
-    wiced_hal_wdog_reset_system();
+    DeviceLayer::SystemLayer().StartTimer(
+        System::Clock::Seconds32(15),
+        [](Layer *, void *) {
+            ChipLogProgress(SoftwareUpdate, "Rebooting...");
+            wiced_hal_wdog_reset_system();
+        },
+        nullptr);
 }
 
 void OTAImageProcessorImpl::HandleAbort(intptr_t context)
@@ -158,11 +195,20 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
         return;
     }
 
-    if (IsSpanUsable(imageProcessor->mBlock))
+    ByteSpan block   = imageProcessor->mBlock;
+    CHIP_ERROR error = imageProcessor->ProcessHeader(block);
+    if (error != CHIP_NO_ERROR)
+    {
+        ChipLogError(SoftwareUpdate, "Image does not contain a valid header");
+        imageProcessor->mDownloader->EndDownload(CHIP_ERROR_INVALID_FILE_IDENTIFIER);
+        return;
+    }
+
+    if (IsSpanUsable(block))
     {
-        const uint32_t written = wiced_firmware_upgrade_process_block(imageProcessor->mParams.downloadedBytes,
-                                                                      imageProcessor->mBlock.data(), imageProcessor->mBlock.size());
-        if (written != imageProcessor->mBlock.size())
+        const uint32_t written =
+            wiced_firmware_upgrade_process_block(imageProcessor->mParams.downloadedBytes, block.data(), block.size());
+        if (written != block.size())
         {
             ChipLogError(SoftwareUpdate, "wiced_firmware_upgrade_process_block 0x%08lx", written);
             imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
@@ -170,10 +216,35 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
         }
     }
 
-    imageProcessor->mParams.downloadedBytes += imageProcessor->mBlock.size();
+    imageProcessor->mParams.downloadedBytes += block.size();
     imageProcessor->mDownloader->FetchNextData();
 }
 
+CHIP_ERROR OTAImageProcessorImpl::ProcessHeader(ByteSpan & block)
+{
+    if (mHeaderParser.IsInitialized())
+    {
+        OTAImageHeader header;
+        CHIP_ERROR error = mHeaderParser.AccumulateAndDecode(block, header);
+
+        // Needs more data to decode the header
+        ReturnErrorCodeIf(error == CHIP_ERROR_BUFFER_TOO_SMALL, CHIP_NO_ERROR);
+        ReturnErrorOnFailure(error);
+
+        mParams.totalFileBytes = header.mPayloadSize;
+        mHeaderParser.Clear();
+
+        /* Skip inserted zeroes before sections */
+        const size_t header_size = mBlock.size() - block.size();
+        if (header_size % 4 != 0)
+        {
+            block = block.SubSpan(4 - header_size % 4);
+        }
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR OTAImageProcessorImpl::SetBlock(ByteSpan & block)
 {
     if (!IsSpanUsable(block))
diff --git a/src/platform/CYW30739/OTAImageProcessorImpl.h b/src/platform/CYW30739/OTAImageProcessorImpl.h
index fc2e5f9da1ee72..d9ea2dfc5f071c 100644
--- a/src/platform/CYW30739/OTAImageProcessorImpl.h
+++ b/src/platform/CYW30739/OTAImageProcessorImpl.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
+#include <lib/core/OTAImageHeader.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/OTAImageProcessor.h>
 
@@ -35,8 +36,8 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     CHIP_ERROR Apply() override;
     CHIP_ERROR Abort() override;
     CHIP_ERROR ProcessBlock(ByteSpan & block) override;
-    bool IsFirstImageRun() override { return false; }
-    CHIP_ERROR ConfirmCurrentImage() override { return CHIP_NO_ERROR; }
+    bool IsFirstImageRun() override;
+    CHIP_ERROR ConfirmCurrentImage() override;
 
     void SetOTADownloader(OTADownloader * downloader) { mDownloader = downloader; }
 
@@ -48,6 +49,8 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     static void HandleAbort(intptr_t context);
     static void HandleProcessBlock(intptr_t context);
 
+    CHIP_ERROR ProcessHeader(ByteSpan & block);
+
     /**
      * Called to allocate memory for mBlock if necessary and set it to block
      */
@@ -60,6 +63,7 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
 
     MutableByteSpan mBlock;
     OTADownloader * mDownloader;
+    OTAImageHeaderParser mHeaderParser;
 };
 
 } // namespace chip
diff --git a/src/platform/CYW30739/ThreadStackManagerImpl.cpp b/src/platform/CYW30739/ThreadStackManagerImpl.cpp
index f8d8a76b034120..dcdee6f6d27999 100644
--- a/src/platform/CYW30739/ThreadStackManagerImpl.cpp
+++ b/src/platform/CYW30739/ThreadStackManagerImpl.cpp
@@ -25,6 +25,7 @@
 
 #include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp>
 
+#include <lib/support/CHIPPlatformMemory.h>
 #include <lwip/ip.h>
 #include <openthread-system.h>
 #include <wiced_platform.h>
@@ -101,6 +102,16 @@ void ThreadStackManagerImpl::ThreadTaskMain(uint32_t arg)
 } // namespace DeviceLayer
 } // namespace chip
 
+extern "C" void * otPlatCAlloc(size_t aNum, size_t aSize)
+{
+    return CHIPPlatformMemoryCalloc(aNum, aSize);
+}
+
+extern "C" void otPlatFree(void * aPtr)
+{
+    CHIPPlatformMemoryFree(aPtr);
+}
+
 /* A wrapper for the GenericThreadStackManagerImpl_OpenThread_LwIP implementation. */
 err_t tcpip_input(struct pbuf * p, struct netif * inp)
 {
diff --git a/src/platform/CYW30739/args.gni b/src/platform/CYW30739/args.gni
index 474c15b41b7f5e..3cc85db63b6c25 100644
--- a/src/platform/CYW30739/args.gni
+++ b/src/platform/CYW30739/args.gni
@@ -29,8 +29,6 @@ chip_crypto = "mbedtls"
 chip_device_platform = "cyw30739"
 chip_mdns = "platform"
 
-# Trying to fit into the available flash by disabling optional logging for now
-chip_detail_logging = false
 chip_enable_openthread = true
 
 lwip_platform = "cyw30739"
diff --git a/src/platform/CYW30739/cyw30739-chip-mbedtls-config.h b/src/platform/CYW30739/cyw30739-chip-mbedtls-config.h
index 0a7a749871aa48..f9de67ab717faa 100644
--- a/src/platform/CYW30739/cyw30739-chip-mbedtls-config.h
+++ b/src/platform/CYW30739/cyw30739-chip-mbedtls-config.h
@@ -42,12 +42,12 @@
  *            digests and ciphers instead.
  *
  */
-//#define MBEDTLS_AES_ALT
+#define MBEDTLS_AES_ALT
 //#define MBEDTLS_ARC4_ALT
 //#define MBEDTLS_ARIA_ALT
 //#define MBEDTLS_BLOWFISH_ALT
 //#define MBEDTLS_CAMELLIA_ALT
-//#define MBEDTLS_CCM_ALT
+#define MBEDTLS_CCM_ALT
 //#define MBEDTLS_CHACHA20_ALT
 //#define MBEDTLS_CHACHAPOLY_ALT
 //#define MBEDTLS_CMAC_ALT
@@ -63,7 +63,7 @@
 //#define MBEDTLS_RIPEMD160_ALT
 //#define MBEDTLS_RSA_ALT
 //#define MBEDTLS_SHA1_ALT
-//#define MBEDTLS_SHA256_ALT
+#define MBEDTLS_SHA256_ALT
 //#define MBEDTLS_SHA512_ALT
 //#define MBEDTLS_XTEA_ALT
 
diff --git a/src/platform/Darwin/CHIPPlatformConfig.h b/src/platform/Darwin/CHIPPlatformConfig.h
index 00107122d27d34..ea4252f93b1110 100644
--- a/src/platform/Darwin/CHIPPlatformConfig.h
+++ b/src/platform/Darwin/CHIPPlatformConfig.h
@@ -36,6 +36,11 @@
 
 // ==================== Security Adaptations ====================
 
+// If unspecified, assume crypto is fast on Darwin
+#ifndef CHIP_CONFIG_SLOW_CRYPTO
+#define CHIP_CONFIG_SLOW_CRYPTO 0
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
 // ==================== General Configuration Overrides ====================
 
 #ifndef CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
diff --git a/src/platform/Darwin/DiagnosticDataProviderImpl.h b/src/platform/Darwin/DiagnosticDataProviderImpl.h
index 7031fa7bd2a847..2bc8a5d73d26bc 100644
--- a/src/platform/Darwin/DiagnosticDataProviderImpl.h
+++ b/src/platform/Darwin/DiagnosticDataProviderImpl.h
@@ -40,6 +40,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override;
 
     // ===== Methods that implement the DiagnosticDataProvider abstract interface.
+    bool SupportsWatermarks() override { return true; }
     CHIP_ERROR ResetWatermarks() override;
 };
 
diff --git a/src/platform/Darwin/SystemTimeSupport.cpp b/src/platform/Darwin/SystemTimeSupport.cpp
index cfb6a2a9dcb11c..14afde67a47044 100644
--- a/src/platform/Darwin/SystemTimeSupport.cpp
+++ b/src/platform/Darwin/SystemTimeSupport.cpp
@@ -51,7 +51,7 @@ Milliseconds64 ClockImpl::GetMonotonicMilliseconds64()
     return std::chrono::duration_cast<Milliseconds64>(std::chrono::steady_clock::now().time_since_epoch());
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTime(Microseconds64 & aCurTime)
 {
     struct timeval tv;
     if (gettimeofday(&tv, nullptr) != 0)
@@ -67,32 +67,19 @@ CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime = Clock::Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
+    aCurTime = Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Milliseconds64 & aCurTime)
 {
-    struct timeval tv;
-    if (gettimeofday(&tv, nullptr) != 0)
-    {
-        return CHIP_ERROR_POSIX(errno);
-    }
-    if (tv.tv_sec < CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    if (tv.tv_usec < 0)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime =
-        Clock::Milliseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000)) + (static_cast<uint64_t>(tv.tv_usec) / 1000));
-    return CHIP_NO_ERROR;
+    Microseconds64 curTimeUs;
+    auto err = GetClock_RealTime(curTimeUs);
+    aCurTime = std::chrono::duration_cast<Milliseconds64>(curTimeUs);
+    return err;
 }
 
-CHIP_ERROR ClockImpl::SetClock_RealTime(Clock::Microseconds64 aNewCurTime)
+CHIP_ERROR ClockImpl::SetClock_RealTime(Microseconds64 aNewCurTime)
 {
     struct timeval tv;
     tv.tv_sec  = static_cast<time_t>(aNewCurTime.count() / UINT64_C(1000000));
diff --git a/src/platform/DeviceControlServer.cpp b/src/platform/DeviceControlServer.cpp
index 9c630c53e17872..da27293ada6008 100644
--- a/src/platform/DeviceControlServer.cpp
+++ b/src/platform/DeviceControlServer.cpp
@@ -34,15 +34,13 @@ DeviceControlServer & DeviceControlServer::DeviceControlSvr()
     return sInstance;
 }
 
-CHIP_ERROR DeviceControlServer::CommissioningComplete(NodeId peerNodeId, FabricIndex accessingFabricIndex)
+CHIP_ERROR DeviceControlServer::PostCommissioningCompleteEvent(NodeId peerNodeId, FabricIndex accessingFabricIndex)
 {
-    VerifyOrReturnError(CHIP_NO_ERROR == mFailSafeContext.DisarmFailSafe(), CHIP_ERROR_INTERNAL);
-
     ChipDeviceEvent event;
 
-    event.Type                                  = DeviceEventType::kCommissioningComplete;
-    event.CommissioningComplete.PeerNodeId      = peerNodeId;
-    event.CommissioningComplete.PeerFabricIndex = accessingFabricIndex;
+    event.Type                              = DeviceEventType::kCommissioningComplete;
+    event.CommissioningComplete.nodeId      = peerNodeId;
+    event.CommissioningComplete.fabricIndex = accessingFabricIndex;
 
     return PlatformMgr().PostEvent(&event);
 }
@@ -66,14 +64,13 @@ CHIP_ERROR DeviceControlServer::SetRegulatoryConfig(uint8_t location, const Char
     return err;
 }
 
-CHIP_ERROR DeviceControlServer::ConnectNetworkForOperational(ByteSpan networkID)
+CHIP_ERROR DeviceControlServer::PostConnectedToOperationalNetworkEvent(ByteSpan networkID)
 {
     ChipDeviceEvent event;
     event.Type = DeviceEventType::kOperationalNetworkEnabled;
     // TODO(cecille): This should be some way to specify thread or wifi.
     event.OperationalNetwork.network = 0;
-    PlatformMgr().DispatchEvent(&event);
-    return CHIP_NO_ERROR;
+    return PlatformMgr().PostEvent(&event);
 }
 
 } // namespace DeviceLayer
diff --git a/src/platform/DeviceInstanceInfoProvider.cpp b/src/platform/DeviceInstanceInfoProvider.cpp
new file mode 100644
index 00000000000000..5ac7a3726fa404
--- /dev/null
+++ b/src/platform/DeviceInstanceInfoProvider.cpp
@@ -0,0 +1,47 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <lib/support/CodeUtils.h>
+#include <platform/DeviceInstanceInfoProvider.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+namespace {
+
+DeviceInstanceInfoProvider * gDeviceInstanceInfoProvider = nullptr;
+
+} // namespace
+
+DeviceInstanceInfoProvider * GetDeviceInstanceInfoProvider()
+{
+    VerifyOrDie(gDeviceInstanceInfoProvider != nullptr);
+    return gDeviceInstanceInfoProvider;
+}
+
+void SetDeviceInstanceInfoProvider(DeviceInstanceInfoProvider * provider)
+{
+    if (provider == nullptr)
+    {
+        return;
+    }
+
+    gDeviceInstanceInfoProvider = provider;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h
index 42d6e6f65d7b92..38a264727588a2 100644
--- a/src/platform/EFR32/CHIPDevicePlatformConfig.h
+++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h
@@ -48,6 +48,18 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
 
+#if defined(RS911X_WIFI)
+
+#if defined(WIFI_IPV4_DISABLED)
+#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 0
+#define CHIP_DEVICE_CONFIG_ENABLE_IPV6 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 1
+#define CHIP_DEVICE_CONFIG_ENABLE_IPV6 1
+#endif
+
+#endif
+
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to the EFR32 platform.
diff --git a/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp b/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp
index a279c808c4ccb5..5d0085d6569af5 100644
--- a/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp
+++ b/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp
@@ -33,6 +33,7 @@
 #include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
 #endif
 
+#include "CHIPDevicePlatformConfig.h"
 #include "wfx_host_events.h"
 
 using namespace ::chip;
@@ -388,8 +389,10 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
     if (mWiFiStationState == kWiFiStationState_Connected)
     {
 #if 1 //! defined (SL_WF200) || (SL_WF200 == 0)
-
         haveIPv4Conn = wfx_have_ipv4_addr(SL_WFX_STA_INTERFACE);
+#if (CHIP_DEVICE_CONFIG_ENABLE_IPV6)
+        haveIPv6Conn = wfx_have_ipv6_addr(SL_WFX_STA_INTERFACE);
+#endif
         /* TODO  - haveIPv6Conn */
 #else  /* Old code that needed LWIP and its internals */
         // Get the LwIP netif for the WiFi station interface.
diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp b/src/platform/EFR32/DiagnosticDataProviderImpl.cpp
index 6ecfa321a13174..80430e238ef1a7 100644
--- a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/EFR32/DiagnosticDataProviderImpl.cpp
@@ -31,6 +31,7 @@
 
 #include "AppConfig.h"
 #include "FreeRTOS.h"
+#include "heap_4_silabs.h"
 
 using namespace ::chip::app::Clusters::GeneralDiagnostics;
 
@@ -81,6 +82,16 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & cu
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DiagnosticDataProviderImpl::ResetWatermarks()
+{
+    // If implemented, the server SHALL set the value of the CurrentHeapHighWatermark attribute to the
+    // value of the CurrentHeapUsed.
+
+    xPortResetHeapMinimumEverFreeHeapSize();
+
+    return CHIP_NO_ERROR;
+}
+
 // General Diagnostics Getters
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetRebootCount(uint16_t & rebootCount)
diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.h b/src/platform/EFR32/DiagnosticDataProviderImpl.h
index a10259e6f7b336..62223861e5679e 100644
--- a/src/platform/EFR32/DiagnosticDataProviderImpl.h
+++ b/src/platform/EFR32/DiagnosticDataProviderImpl.h
@@ -39,9 +39,11 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 
     // ===== Methods that implement the PlatformManager abstract interface.
 
+    bool SupportsWatermarks() override { return true; }
     CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
     CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
     CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
+    CHIP_ERROR ResetWatermarks() override;
     CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override;
     CHIP_ERROR GetBootReason(BootReasonType & bootReason) override;
     CHIP_ERROR GetUpTime(uint64_t & upTime) override;
diff --git a/src/platform/EFR32/EFR32Config.h b/src/platform/EFR32/EFR32Config.h
index 17ea6cdda6ccc8..1095bb074a2bd1 100644
--- a/src/platform/EFR32/EFR32Config.h
+++ b/src/platform/EFR32/EFR32Config.h
@@ -122,6 +122,7 @@ class EFR32Config
     static constexpr Key kConfigKey_LockUserName       = EFR32ConfigKey(kMatterConfig_KeyBase, 0x12);
     static constexpr Key kConfigKey_CredentialData     = EFR32ConfigKey(kMatterConfig_KeyBase, 0x13);
     static constexpr Key kConfigKey_UserCredentials    = EFR32ConfigKey(kMatterConfig_KeyBase, 0x14);
+
     static constexpr Key kConfigKey_GroupKeyMax =
         EFR32ConfigKey(kMatterConfig_KeyBase, 0x1E); // Allows 16 Group Keys to be created.
     static constexpr Key kConfigKey_UniqueId = EFR32ConfigKey(kMatterFactory_KeyBase, 0x1F);
diff --git a/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp b/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp
index d6ea0dc20cc1ce..7bc9883799e28e 100644
--- a/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp
@@ -132,7 +132,7 @@ CHIP_ERROR SlWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     memcpy(wifiConfig.passkey, key, keyLen);
     wifiConfig.security = WFX_SEC_WPA2;
 
-    ChipLogProgress(NetworkProvisioning, "Setting up connetion for WiFi SSID: %s", wifiConfig.ssid);
+    ChipLogProgress(NetworkProvisioning, "Setting up connection for WiFi SSID: %.*s", static_cast<int>(ssidLen), ssid);
     // Configure the WFX WiFi interface.
     wfx_set_wifi_provision(&wifiConfig);
     ReturnErrorOnFailure(ConnectivityMgr().SetWiFiStationMode(ConnectivityManager::kWiFiStationMode_Disabled));
diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn
index be663822919304..33b5ccb306013e 100644
--- a/src/platform/ESP32/BUILD.gn
+++ b/src/platform/ESP32/BUILD.gn
@@ -28,6 +28,8 @@ static_library("ESP32") {
     "ConfigurationManagerImpl.h",
     "ConnectivityManagerImpl.cpp",
     "ConnectivityManagerImpl.h",
+    "DeviceInfoProviderImpl.cpp",
+    "DeviceInfoProviderImpl.h",
     "DeviceNetworkProvisioningDelegateImpl.cpp",
     "DeviceNetworkProvisioningDelegateImpl.h",
     "DiagnosticDataProviderImpl.cpp",
diff --git a/src/platform/ESP32/DeviceInfoProviderImpl.cpp b/src/platform/ESP32/DeviceInfoProviderImpl.cpp
new file mode 100644
index 00000000000000..ff28ee8c585002
--- /dev/null
+++ b/src/platform/ESP32/DeviceInfoProviderImpl.cpp
@@ -0,0 +1,376 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <lib/core/CHIPTLV.h>
+#include <lib/support/CHIPMemString.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/DefaultStorageKeyAllocator.h>
+#include <platform/ESP32/DeviceInfoProviderImpl.h>
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+namespace {
+constexpr TLV::Tag kLabelNameTag  = TLV::ContextTag(0);
+constexpr TLV::Tag kLabelValueTag = TLV::ContextTag(1);
+} // anonymous namespace
+
+DeviceInfoProviderImpl & DeviceInfoProviderImpl::GetDefaultInstance()
+{
+    static DeviceInfoProviderImpl sInstance;
+    return sInstance;
+}
+
+DeviceInfoProvider::FixedLabelIterator * DeviceInfoProviderImpl::IterateFixedLabel(EndpointId endpoint)
+{
+    return new FixedLabelIteratorImpl(endpoint);
+}
+
+DeviceInfoProviderImpl::FixedLabelIteratorImpl::FixedLabelIteratorImpl(EndpointId endpoint) : mEndpoint(endpoint)
+{
+    mIndex = 0;
+}
+
+size_t DeviceInfoProviderImpl::FixedLabelIteratorImpl::Count()
+{
+    // TODO: Need to provide a script which can generate a binary file which contains device information and
+    // update the DeviceInfoProvider which can read the information from it.
+    // Now we use the hardcoded labellist.
+    return 4;
+}
+
+bool DeviceInfoProviderImpl::FixedLabelIteratorImpl::Next(FixedLabelType & output)
+{
+    bool retval = true;
+
+    // TODO: Need to provide a script which can generate a binary file which contains device information and
+    // update the DeviceInfoProvider which can read the information from it.
+    // Now we use the hardcoded labellist.
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    const char * labelPtr = nullptr;
+    const char * valuePtr = nullptr;
+
+    VerifyOrReturnError(mIndex < 4, false);
+
+    ChipLogProgress(DeviceLayer, "Get the fixed label with index:%d at endpoint:%d", mIndex, mEndpoint);
+
+    switch (mIndex)
+    {
+    case 0:
+        labelPtr = "room";
+        valuePtr = "bedroom 2";
+        break;
+    case 1:
+        labelPtr = "orientation";
+        valuePtr = "North";
+        break;
+    case 2:
+        labelPtr = "floor";
+        valuePtr = "2";
+        break;
+    case 3:
+        labelPtr = "direction";
+        valuePtr = "up";
+        break;
+    default:
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+        break;
+    }
+
+    if (err == CHIP_NO_ERROR)
+    {
+        VerifyOrReturnError(strlen(labelPtr) <= kMaxLabelNameLength, false);
+        VerifyOrReturnError(strlen(valuePtr) <= kMaxLabelValueLength, false);
+
+        Platform::CopyString(mFixedLabelNameBuf, kMaxLabelNameLength + 1, labelPtr);
+        Platform::CopyString(mFixedLabelValueBuf, kMaxLabelValueLength + 1, valuePtr);
+
+        output.label = CharSpan::fromCharString(mFixedLabelNameBuf);
+        output.value = CharSpan::fromCharString(mFixedLabelValueBuf);
+
+        mIndex++;
+
+        retval = true;
+    }
+    else
+    {
+        retval = false;
+    }
+
+    return retval;
+}
+
+CHIP_ERROR DeviceInfoProviderImpl::SetUserLabelLength(EndpointId endpoint, size_t val)
+{
+    DefaultStorageKeyAllocator keyAlloc;
+
+    return mStorage->SyncSetKeyValue(keyAlloc.UserLabelLengthKey(endpoint), &val, static_cast<uint16_t>(sizeof(val)));
+}
+
+CHIP_ERROR DeviceInfoProviderImpl::GetUserLabelLength(EndpointId endpoint, size_t & val)
+{
+    DefaultStorageKeyAllocator keyAlloc;
+    uint16_t len = static_cast<uint16_t>(sizeof(val));
+
+    return mStorage->SyncGetKeyValue(keyAlloc.UserLabelLengthKey(endpoint), &val, len);
+}
+
+CHIP_ERROR DeviceInfoProviderImpl::SetUserLabelAt(EndpointId endpoint, size_t index, const UserLabelType & userLabel)
+{
+    DefaultStorageKeyAllocator keyAlloc;
+    uint8_t buf[UserLabelTLVMaxSize()];
+    TLV::TLVWriter writer;
+    writer.Init(buf);
+
+    TLV::TLVType outerType;
+    ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerType));
+    ReturnErrorOnFailure(writer.PutString(kLabelNameTag, userLabel.label));
+    ReturnErrorOnFailure(writer.PutString(kLabelValueTag, userLabel.value));
+    ReturnErrorOnFailure(writer.EndContainer(outerType));
+
+    return mStorage->SyncSetKeyValue(keyAlloc.UserLabelIndexKey(endpoint, index), buf,
+                                     static_cast<uint16_t>(writer.GetLengthWritten()));
+}
+
+DeviceInfoProvider::UserLabelIterator * DeviceInfoProviderImpl::IterateUserLabel(EndpointId endpoint)
+{
+    return new UserLabelIteratorImpl(*this, endpoint);
+}
+
+DeviceInfoProviderImpl::UserLabelIteratorImpl::UserLabelIteratorImpl(DeviceInfoProviderImpl & provider, EndpointId endpoint) :
+    mProvider(provider), mEndpoint(endpoint)
+{
+    size_t total = 0;
+
+    ReturnOnFailure(mProvider.GetUserLabelLength(mEndpoint, total));
+    mTotal = total;
+    mIndex = 0;
+}
+
+bool DeviceInfoProviderImpl::UserLabelIteratorImpl::Next(UserLabelType & output)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrReturnError(mIndex < mTotal, false);
+
+    DefaultStorageKeyAllocator keyAlloc;
+    uint8_t buf[UserLabelTLVMaxSize()];
+    uint16_t len = static_cast<uint16_t>(sizeof(buf));
+
+    err = mProvider.mStorage->SyncGetKeyValue(keyAlloc.UserLabelIndexKey(mEndpoint, mIndex), buf, len);
+    VerifyOrReturnError(err == CHIP_NO_ERROR, false);
+
+    TLV::ContiguousBufferTLVReader reader;
+    reader.Init(buf);
+    err = reader.Next(TLV::kTLVType_Structure, TLV::AnonymousTag());
+    VerifyOrReturnError(err == CHIP_NO_ERROR, false);
+
+    TLV::TLVType containerType;
+    VerifyOrReturnError(reader.EnterContainer(containerType) == CHIP_NO_ERROR, false);
+
+    chip::CharSpan label;
+    chip::CharSpan value;
+
+    VerifyOrReturnError(reader.Next(kLabelNameTag) == CHIP_NO_ERROR, false);
+    VerifyOrReturnError(reader.Get(label) == CHIP_NO_ERROR, false);
+
+    VerifyOrReturnError(reader.Next(kLabelValueTag) == CHIP_NO_ERROR, false);
+    VerifyOrReturnError(reader.Get(value) == CHIP_NO_ERROR, false);
+
+    VerifyOrReturnError(reader.VerifyEndOfContainer() == CHIP_NO_ERROR, false);
+    VerifyOrReturnError(reader.ExitContainer(containerType) == CHIP_NO_ERROR, false);
+
+    Platform::CopyString(mUserLabelNameBuf, label);
+    Platform::CopyString(mUserLabelValueBuf, value);
+
+    output.label = CharSpan::fromCharString(mUserLabelNameBuf);
+    output.value = CharSpan::fromCharString(mUserLabelValueBuf);
+
+    mIndex++;
+
+    return true;
+}
+
+DeviceInfoProvider::SupportedLocalesIterator * DeviceInfoProviderImpl::IterateSupportedLocales()
+{
+    return new SupportedLocalesIteratorImpl();
+}
+
+size_t DeviceInfoProviderImpl::SupportedLocalesIteratorImpl::Count()
+{
+    // TODO: Need to provide a script which can generate a binary file which contains device information and
+    // update the DeviceInfoProvider which can read the information from it.
+    // Now we use the hardcoded SupportedLocales.
+    // {("en-US"), ("de-DE"), ("fr-FR"), ("en-GB"), ("es-ES"), ("zh-CN"), ("it-IT"), ("ja-JP")}
+
+    return 8;
+}
+
+bool DeviceInfoProviderImpl::SupportedLocalesIteratorImpl::Next(CharSpan & output)
+{
+    bool retval = true;
+
+    // TODO: Need to provide a script which can generate a binary file which contains device information and
+    // update the DeviceInfoProvider which can read the information from it.
+    // Now we use the hardcoded SupportedLocales.
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    const char * activeLocalePtr = nullptr;
+
+    VerifyOrReturnError(mIndex < 8, false);
+
+    switch (mIndex)
+    {
+    case 0:
+        activeLocalePtr = "en-US";
+        break;
+    case 1:
+        activeLocalePtr = "de-DE";
+        break;
+    case 2:
+        activeLocalePtr = "fr-FR";
+        break;
+    case 3:
+        activeLocalePtr = "en-GB";
+        break;
+    case 4:
+        activeLocalePtr = "es-ES";
+        break;
+    case 5:
+        activeLocalePtr = "zh-CN";
+        break;
+    case 6:
+        activeLocalePtr = "it-IT";
+        break;
+    case 7:
+        activeLocalePtr = "ja-JP";
+        break;
+    default:
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+        break;
+    }
+
+    if (err == CHIP_NO_ERROR)
+    {
+        VerifyOrReturnError(strlen(activeLocalePtr) <= kMaxActiveLocaleLength, false);
+
+        Platform::CopyString(mActiveLocaleBuf, kMaxActiveLocaleLength + 1, activeLocalePtr);
+
+        output = CharSpan::fromCharString(mActiveLocaleBuf);
+
+        mIndex++;
+
+        retval = true;
+    }
+    else
+    {
+        retval = false;
+    }
+
+    return retval;
+}
+
+DeviceInfoProvider::SupportedCalendarTypesIterator * DeviceInfoProviderImpl::IterateSupportedCalendarTypes()
+{
+    return new SupportedCalendarTypesIteratorImpl();
+}
+
+size_t DeviceInfoProviderImpl::SupportedCalendarTypesIteratorImpl::Count()
+{
+    // TODO: Need to provide a script which can generate a binary file which contains device information and
+    // update the DeviceInfoProvider which can read the information from it.
+    // Now we use the hardcoded SupportedCalendarTypes.
+    // {("kBuddhist"), ("kChinese"), ("kCoptic"), ("kEthiopian"), ("kGregorian"), ("kHebrew"), ("kIndian"), ("kJapanese"),
+    //  ("kKorean"), ("kPersian"), ("kTaiwanese"), ("kIslamic")}
+
+    return 12;
+}
+
+bool DeviceInfoProviderImpl::SupportedCalendarTypesIteratorImpl::Next(CalendarType & output)
+{
+    bool retval = true;
+
+    // TODO: Need to provide a script which can generate a binary file which contains device information and
+    // update the DeviceInfoProvider which can read the information from it.
+    // Now we use the hardcoded SupportedCalendarTypes.
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrReturnError(mIndex < 12, false);
+
+    switch (mIndex)
+    {
+    case 0:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kBuddhist;
+        break;
+    case 1:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kChinese;
+        break;
+    case 2:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kCoptic;
+        break;
+    case 3:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kEthiopian;
+        break;
+    case 4:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kGregorian;
+        break;
+    case 5:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kHebrew;
+        break;
+    case 6:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kIndian;
+        break;
+    case 7:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kJapanese;
+        break;
+    case 8:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kKorean;
+        break;
+    case 9:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kPersian;
+        break;
+    case 10:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kTaiwanese;
+        break;
+    case 11:
+        output = app::Clusters::TimeFormatLocalization::CalendarType::kIslamic;
+        break;
+    default:
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+        break;
+    }
+
+    if (err == CHIP_NO_ERROR)
+    {
+        mIndex++;
+        retval = true;
+    }
+    else
+    {
+        retval = false;
+    }
+
+    return retval;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/ESP32/DeviceInfoProviderImpl.h b/src/platform/ESP32/DeviceInfoProviderImpl.h
new file mode 100644
index 00000000000000..856e15498ab46f
--- /dev/null
+++ b/src/platform/ESP32/DeviceInfoProviderImpl.h
@@ -0,0 +1,107 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <lib/support/EnforceFormat.h>
+#include <platform/DeviceInfoProvider.h>
+#include <platform/ESP32/ESP32Config.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+class DeviceInfoProviderImpl : public DeviceInfoProvider
+{
+public:
+    DeviceInfoProviderImpl() = default;
+    ~DeviceInfoProviderImpl() override {}
+
+    // Iterators
+    FixedLabelIterator * IterateFixedLabel(EndpointId endpoint) override;
+    UserLabelIterator * IterateUserLabel(EndpointId endpoint) override;
+    SupportedLocalesIterator * IterateSupportedLocales() override;
+    SupportedCalendarTypesIterator * IterateSupportedCalendarTypes() override;
+
+    static DeviceInfoProviderImpl & GetDefaultInstance();
+
+protected:
+    class FixedLabelIteratorImpl : public FixedLabelIterator
+    {
+    public:
+        FixedLabelIteratorImpl(EndpointId endpoint);
+        size_t Count() override;
+        bool Next(FixedLabelType & output) override;
+        void Release() override { delete this; }
+
+    private:
+        EndpointId mEndpoint = 0;
+        size_t mIndex        = 0;
+        char mFixedLabelNameBuf[kMaxLabelNameLength + 1];
+        char mFixedLabelValueBuf[kMaxLabelValueLength + 1];
+    };
+
+    class UserLabelIteratorImpl : public UserLabelIterator
+    {
+    public:
+        UserLabelIteratorImpl(DeviceInfoProviderImpl & provider, EndpointId endpoint);
+        size_t Count() override { return mTotal; }
+        bool Next(UserLabelType & output) override;
+        void Release() override { delete this; }
+
+    private:
+        DeviceInfoProviderImpl & mProvider;
+        EndpointId mEndpoint = 0;
+        size_t mIndex        = 0;
+        size_t mTotal        = 0;
+        char mUserLabelNameBuf[kMaxLabelNameLength + 1];
+        char mUserLabelValueBuf[kMaxLabelValueLength + 1];
+    };
+
+    class SupportedLocalesIteratorImpl : public SupportedLocalesIterator
+    {
+    public:
+        SupportedLocalesIteratorImpl() = default;
+        size_t Count() override;
+        bool Next(CharSpan & output) override;
+        void Release() override { delete this; }
+
+    private:
+        size_t mIndex = 0;
+        char mActiveLocaleBuf[kMaxActiveLocaleLength + 1];
+    };
+
+    class SupportedCalendarTypesIteratorImpl : public SupportedCalendarTypesIterator
+    {
+    public:
+        SupportedCalendarTypesIteratorImpl() = default;
+        size_t Count() override;
+        bool Next(CalendarType & output) override;
+        void Release() override { delete this; }
+
+    private:
+        size_t mIndex = 0;
+    };
+
+    CHIP_ERROR SetUserLabelLength(EndpointId endpoint, size_t val) override;
+    CHIP_ERROR GetUserLabelLength(EndpointId endpoint, size_t & val) override;
+    CHIP_ERROR SetUserLabelAt(EndpointId endpoint, size_t index, const UserLabelType & userLabel) override;
+
+private:
+    static constexpr size_t UserLabelTLVMaxSize() { return TLV::EstimateStructOverhead(kMaxLabelNameLength, kMaxLabelValueLength); }
+};
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/ESP32/DnssdImpl.cpp b/src/platform/ESP32/DnssdImpl.cpp
index 0c55ecfa5c0a6b..0b3833a1d8f5c7 100644
--- a/src/platform/ESP32/DnssdImpl.cpp
+++ b/src/platform/ESP32/DnssdImpl.cpp
@@ -373,7 +373,7 @@ CHIP_ERROR OnResolveQuerySrvDone(ResolveContext * ctx)
                 auto * addr = ctx->mResult->addr;
                 while (addr)
                 {
-                    GetIPAddress(ctx->mAddressCount[addressIndex], addr);
+                    GetIPAddress(ctx->mAddresses[addressIndex], addr);
                     addressIndex++;
                     addr = addr->next;
                 }
diff --git a/src/platform/ESP32/NetworkCommissioningDriver.cpp b/src/platform/ESP32/NetworkCommissioningDriver.cpp
index 6e43839eaf9e80..ced3d347a39531 100644
--- a/src/platform/ESP32/NetworkCommissioningDriver.cpp
+++ b/src/platform/ESP32/NetworkCommissioningDriver.cpp
@@ -177,23 +177,47 @@ void ESPWiFiDriver::OnConnectWiFiNetwork()
 {
     if (mpConnectCallback)
     {
+        DeviceLayer::SystemLayer().CancelTimer(OnConnectWiFiNetworkFailed, NULL);
         mpConnectCallback->OnResult(Status::kSuccess, CharSpan(), 0);
         mpConnectCallback = nullptr;
     }
 }
 
+void ESPWiFiDriver::OnConnectWiFiNetworkFailed()
+{
+    if (mpConnectCallback)
+    {
+        mpConnectCallback->OnResult(Status::kNetworkNotFound, CharSpan(), 0);
+        mpConnectCallback = nullptr;
+    }
+}
+
+void ESPWiFiDriver::OnConnectWiFiNetworkFailed(chip::System::Layer * aLayer, void * aAppState)
+{
+    CHIP_ERROR error = chip::DeviceLayer::Internal::ESP32Utils::ClearWiFiStationProvision();
+    if (error != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ClearWiFiStationProvision failed: %s", chip::ErrorStr(error));
+    }
+    ESPWiFiDriver::GetInstance().OnConnectWiFiNetworkFailed();
+}
+
 void ESPWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
 {
-    CHIP_ERROR err          = CHIP_NO_ERROR;
-    Status networkingStatus = Status::kSuccess;
+    CHIP_ERROR err              = CHIP_NO_ERROR;
+    Status networkingStatus     = Status::kSuccess;
+    const uint32_t secToMiliSec = 1000;
 
     VerifyOrExit(NetworkMatch(mStagingNetwork, networkId), networkingStatus = Status::kNetworkIDNotFound);
     VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError);
     ChipLogProgress(NetworkProvisioning, "ESP NetworkCommissioningDelegate: SSID: %.*s", static_cast<int>(networkId.size()),
                     networkId.data());
 
-    err               = ConnectWiFiNetwork(reinterpret_cast<const char *>(mStagingNetwork.ssid), mStagingNetwork.ssidLen,
+    err = ConnectWiFiNetwork(reinterpret_cast<const char *>(mStagingNetwork.ssid), mStagingNetwork.ssidLen,
                              reinterpret_cast<const char *>(mStagingNetwork.credentials), mStagingNetwork.credentialsLen);
+
+    err = DeviceLayer::SystemLayer().StartTimer(
+        static_cast<System::Clock::Timeout>(kWiFiConnectNetworkTimeoutSeconds * secToMiliSec), OnConnectWiFiNetworkFailed, NULL);
     mpConnectCallback = callback;
 exit:
     if (err != CHIP_NO_ERROR)
diff --git a/src/platform/ESP32/NetworkCommissioningDriver.h b/src/platform/ESP32/NetworkCommissioningDriver.h
index f150959f1a30b5..fd3f1ddaa2ed64 100644
--- a/src/platform/ESP32/NetworkCommissioningDriver.h
+++ b/src/platform/ESP32/NetworkCommissioningDriver.h
@@ -109,6 +109,8 @@ class ESPWiFiDriver final : public WiFiDriver
 
     CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
     void OnConnectWiFiNetwork();
+    void OnConnectWiFiNetworkFailed();
+    static void OnConnectWiFiNetworkFailed(chip::System::Layer * aLayer, void * aAppState);
     void OnScanWiFiNetworkDone();
     void OnNetworkStatusChange();
 
diff --git a/src/platform/ESP32/PlatformManagerImpl.cpp b/src/platform/ESP32/PlatformManagerImpl.cpp
index f6bdaece639314..6c15b7c281790c 100644
--- a/src/platform/ESP32/PlatformManagerImpl.cpp
+++ b/src/platform/ESP32/PlatformManagerImpl.cpp
@@ -27,6 +27,7 @@
 
 #include <app-common/zap-generated/enums.h>
 #include <crypto/CHIPCryptoPAL.h>
+#include <platform/ESP32/DeviceInfoProviderImpl.h>
 #include <platform/ESP32/DiagnosticDataProviderImpl.h>
 #include <platform/ESP32/ESP32Utils.h>
 #include <platform/ESP32/SystemTimeSupport.h>
@@ -61,6 +62,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
     SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
     SetDiagnosticDataProvider(&DiagnosticDataProviderImpl::GetDefaultInstance());
+    SetDeviceInfoProvider(&DeviceInfoProviderImpl::GetDefaultInstance());
 
     esp_err_t err;
     // Arrange for CHIP-encapsulated ESP32 errors to be translated to text
diff --git a/src/platform/ESP32/SystemTimeSupport.cpp b/src/platform/ESP32/SystemTimeSupport.cpp
index f3a18626f450c3..33bec43435bc35 100644
--- a/src/platform/ESP32/SystemTimeSupport.cpp
+++ b/src/platform/ESP32/SystemTimeSupport.cpp
@@ -48,8 +48,12 @@ Milliseconds64 ClockImpl::GetMonotonicMilliseconds64(void)
     return std::chrono::duration_cast<Milliseconds64>(GetMonotonicMicroseconds64());
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTime(Microseconds64 & aCurTime)
 {
+    // TODO(19081): This platform does not properly error out if wall clock has
+    //              not been set.  For now, short circuit this.
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#if 0
     struct timeval tv;
     if (gettimeofday(&tv, nullptr) != 0)
     {
@@ -64,32 +68,20 @@ CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime = Clock::Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
+    aCurTime = Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
     return CHIP_NO_ERROR;
+#endif
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Milliseconds64 & aCurTime)
 {
-    struct timeval tv;
-    if (gettimeofday(&tv, nullptr) != 0)
-    {
-        return CHIP_ERROR_POSIX(errno);
-    }
-    if (tv.tv_sec < CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    if (tv.tv_usec < 0)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime =
-        Clock::Milliseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000)) + (static_cast<uint64_t>(tv.tv_usec) / 1000));
-    return CHIP_NO_ERROR;
+    Microseconds64 curTimeUs;
+    auto err = GetClock_RealTime(curTimeUs);
+    aCurTime = std::chrono::duration_cast<Milliseconds64>(curTimeUs);
+    return err;
 }
 
-CHIP_ERROR ClockImpl::SetClock_RealTime(Clock::Microseconds64 aNewCurTime)
+CHIP_ERROR ClockImpl::SetClock_RealTime(Microseconds64 aNewCurTime)
 {
     struct timeval tv;
     tv.tv_sec  = static_cast<time_t>(aNewCurTime.count() / UINT64_C(1000000));
@@ -116,6 +108,9 @@ CHIP_ERROR InitClock_RealTime()
         Clock::Microseconds64((static_cast<uint64_t>(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD) * UINT64_C(1000000)));
     // Use CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD as the initial value of RealTime.
     // Then the RealTime obtained from GetClock_RealTime will be always valid.
+    //
+    // TODO(19081): This is broken because it causes the platform to report
+    //              that it does have wall clock time when it actually doesn't.
     return System::SystemClock().SetClock_RealTime(curTime);
 }
 
diff --git a/src/platform/ESP32/ThreadStackManagerImpl.cpp b/src/platform/ESP32/ThreadStackManagerImpl.cpp
index 2562e0cea181a1..10d7af019bfc13 100644
--- a/src/platform/ESP32/ThreadStackManagerImpl.cpp
+++ b/src/platform/ESP32/ThreadStackManagerImpl.cpp
@@ -91,24 +91,5 @@ void ThreadStackManagerImpl::_OnCHIPoBLEAdvertisingStop()
     // Intentionally empty.
 }
 
-void ThreadStackManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
-{
-    Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::_OnPlatformEvent(event);
-
-    if (event->Type == DeviceEventType::kThreadStateChange && event->ThreadStateChange.RoleChanged)
-    {
-        const bool isAttached = IsThreadAttached();
-        VerifyOrReturn(isAttached != mIsAttached);
-        ChipDeviceEvent attachEvent;
-        attachEvent.Type                            = DeviceEventType::kThreadConnectivityChange;
-        attachEvent.ThreadConnectivityChange.Result = isAttached ? kConnectivity_Established : kConnectivity_Lost;
-
-        CHIP_ERROR error = PlatformMgr().PostEvent(&attachEvent);
-        VerifyOrReturn(error == CHIP_NO_ERROR,
-                       ChipLogError(DeviceLayer, "Failed to post Thread connectivity change: %" CHIP_ERROR_FORMAT, error.Format()));
-        mIsAttached = isAttached;
-    }
-}
-
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/ESP32/ThreadStackManagerImpl.h b/src/platform/ESP32/ThreadStackManagerImpl.h
index a479499616c0b7..46795d658d6535 100644
--- a/src/platform/ESP32/ThreadStackManagerImpl.h
+++ b/src/platform/ESP32/ThreadStackManagerImpl.h
@@ -67,15 +67,12 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     void _ProcessThreadActivity();
     void _OnCHIPoBLEAdvertisingStart();
     void _OnCHIPoBLEAdvertisingStop();
-    void _OnPlatformEvent(const ChipDeviceEvent * event);
 
 private:
     friend ThreadStackManager & ::chip::DeviceLayer::ThreadStackMgr(void);
     friend ThreadStackManagerImpl & ::chip::DeviceLayer::ThreadStackMgrImpl(void);
     static ThreadStackManagerImpl sInstance;
     ThreadStackManagerImpl() = default;
-
-    bool mIsAttached = false;
 };
 
 /**
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index 3b82453434b76f..ee2e4331c3f51f 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -34,6 +34,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/CommissionableDataProvider.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/internal/BLEManager.h>
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 #include <system/SystemTimer.h>
@@ -1076,7 +1077,7 @@ void BLEManagerImpl::HandleC3CharRead(struct ble_gatt_char_context * param)
     uint8_t rotatingDeviceIdUniqueId[ConfigurationManager::kRotatingDeviceIDUniqueIDLength] = {};
     MutableByteSpan rotatingDeviceIdUniqueIdSpan(rotatingDeviceIdUniqueId);
 
-    err = ConfigurationMgr().GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
+    err = DeviceLayer::GetDeviceInstanceInfoProvider()->GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
     SuccessOrExit(err);
     err = ConfigurationMgr().GetLifetimeCounter(additionalDataPayloadParams.rotatingDeviceIdLifetimeCounter);
     SuccessOrExit(err);
diff --git a/src/platform/FailSafeContext.cpp b/src/platform/FailSafeContext.cpp
index 37c885e9139b21..6bb4a0c3d19b9f 100644
--- a/src/platform/FailSafeContext.cpp
+++ b/src/platform/FailSafeContext.cpp
@@ -37,49 +37,47 @@ constexpr TLV::Tag kUpdateNocCommandTag = TLV::ContextTag(2);
 
 void FailSafeContext::HandleArmFailSafeTimer(System::Layer * layer, void * aAppState)
 {
-    FailSafeContext * context = reinterpret_cast<FailSafeContext *>(aAppState);
-    context->FailSafeTimerExpired();
+    FailSafeContext * failSafeContext = reinterpret_cast<FailSafeContext *>(aAppState);
+    failSafeContext->FailSafeTimerExpired();
 }
 
 void FailSafeContext::HandleDisarmFailSafe(intptr_t arg)
 {
-    FailSafeContext * this_ = reinterpret_cast<FailSafeContext *>(arg);
-
-    this_->mFailSafeBusy = false;
-
-    if (ConfigurationMgr().SetFailSafeArmed(false) != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Failed to set FailSafeArmed config to false");
-    }
-
-    if (DeleteFromStorage() != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Failed to delete FailSafeContext from configuration");
-    }
+    FailSafeContext * failSafeContext = reinterpret_cast<FailSafeContext *>(arg);
+    failSafeContext->DisarmFailSafe();
 }
 
 void FailSafeContext::FailSafeTimerExpired()
 {
+    if (!IsFailSafeArmed())
+    {
+        // In case this was a pending timer event in event loop, and we had
+        // done CommissioningComplete or manual disarm.
+        return;
+    }
+
+    ChipLogProgress(FailSafe, "Fail-safe timer expired");
     ScheduleFailSafeCleanup(mFabricIndex, mAddNocCommandHasBeenInvoked, mUpdateNocCommandHasBeenInvoked);
 }
 
 void FailSafeContext::ScheduleFailSafeCleanup(FabricIndex fabricIndex, bool addNocCommandInvoked, bool updateNocCommandInvoked)
 {
-    mFailSafeArmed                  = false;
-    mAddNocCommandHasBeenInvoked    = false;
-    mUpdateNocCommandHasBeenInvoked = false;
-    mFailSafeBusy                   = true;
+    // Not armed, but busy so cannot rearm (via General Commissioning cluster) until the flushing
+    // via `HandleDisarmFailSafe` path is complete.
+    // TODO: This is hacky and we need to remove all this event pushing business, to keep all fail-safe logic-only.
+    mFailSafeBusy  = true;
+    mFailSafeArmed = false;
 
     ChipDeviceEvent event;
     event.Type                                                = DeviceEventType::kFailSafeTimerExpired;
-    event.FailSafeTimerExpired.PeerFabricIndex                = fabricIndex;
-    event.FailSafeTimerExpired.AddNocCommandHasBeenInvoked    = addNocCommandInvoked;
-    event.FailSafeTimerExpired.UpdateNocCommandHasBeenInvoked = updateNocCommandInvoked;
+    event.FailSafeTimerExpired.fabricIndex                    = fabricIndex;
+    event.FailSafeTimerExpired.addNocCommandHasBeenInvoked    = addNocCommandInvoked;
+    event.FailSafeTimerExpired.updateNocCommandHasBeenInvoked = updateNocCommandInvoked;
     CHIP_ERROR status                                         = PlatformMgr().PostEvent(&event);
 
     if (status != CHIP_NO_ERROR)
     {
-        ChipLogError(DeviceLayer, "Failed to post fail-safe timer expired: %" CHIP_ERROR_FORMAT, status.Format());
+        ChipLogError(FailSafe, "Failed to post fail-safe timer expired: %" CHIP_ERROR_FORMAT, status.Format());
     }
 
     PlatformMgr().ScheduleWork(HandleDisarmFailSafe, reinterpret_cast<intptr_t>(this));
@@ -97,18 +95,23 @@ CHIP_ERROR FailSafeContext::ArmFailSafe(FabricIndex accessingFabricIndex, System
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR FailSafeContext::DisarmFailSafe()
+void FailSafeContext::DisarmFailSafe()
 {
-    mFailSafeArmed                  = false;
-    mAddNocCommandHasBeenInvoked    = false;
-    mUpdateNocCommandHasBeenInvoked = false;
-
     DeviceLayer::SystemLayer().CancelTimer(HandleArmFailSafeTimer, this);
 
-    ReturnErrorOnFailure(ConfigurationMgr().SetFailSafeArmed(false));
-    ReturnErrorOnFailure(DeleteFromStorage());
+    ResetState();
 
-    return CHIP_NO_ERROR;
+    if (ConfigurationMgr().SetFailSafeArmed(false) != CHIP_NO_ERROR)
+    {
+        ChipLogError(FailSafe, "Failed to set FailSafeArmed config to false");
+    }
+
+    if (DeleteFromStorage() != CHIP_NO_ERROR)
+    {
+        ChipLogError(FailSafe, "Failed to delete FailSafeContext from configuration");
+    }
+
+    ChipLogProgress(FailSafe, "Fail-safe cleanly disarmed");
 }
 
 CHIP_ERROR FailSafeContext::SetAddNocCommandInvoked(FabricIndex nocFabricIndex)
@@ -140,6 +143,8 @@ CHIP_ERROR FailSafeContext::CommitToStorage()
     TLV::TLVType outerType;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerType));
     ReturnErrorOnFailure(writer.Put(kFabricIndexTag, mFabricIndex));
+
+    // TODO: Stop storing this, and just make the fail-safe context volatile and sweep-up stale data next boot on partial commits
     ReturnErrorOnFailure(writer.Put(kAddNocCommandTag, mAddNocCommandHasBeenInvoked));
     ReturnErrorOnFailure(writer.Put(kUpdateNocCommandTag, mUpdateNocCommandHasBeenInvoked));
     ReturnErrorOnFailure(writer.EndContainer(outerType));
@@ -192,7 +197,10 @@ void FailSafeContext::ForceFailSafeTimerExpiry()
     {
         return;
     }
+
+    // Cancel the timer since we force its action
     DeviceLayer::SystemLayer().CancelTimer(HandleArmFailSafeTimer, this);
+
     FailSafeTimerExpired();
 }
 
diff --git a/src/platform/FreeRTOS/SystemTimeSupport.cpp b/src/platform/FreeRTOS/SystemTimeSupport.cpp
index df4fc6ae933a59..a14c0527b44240 100644
--- a/src/platform/FreeRTOS/SystemTimeSupport.cpp
+++ b/src/platform/FreeRTOS/SystemTimeSupport.cpp
@@ -119,12 +119,17 @@ uint64_t GetClock_MonotonicHiRes(void)
 
 CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
 {
+    // TODO(19081): This platform does not properly error out if wall clock has
+    //              not been set.  For now, short circuit this.
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#if 0
     if (sBootTimeUS == 0)
     {
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     aCurTime = Clock::Microseconds64(sBootTimeUS + GetClock_Monotonic());
     return CHIP_NO_ERROR;
+#endif
 }
 
 CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & aCurTime)
@@ -157,6 +162,9 @@ CHIP_ERROR InitClock_RealTime()
         Clock::Microseconds64((static_cast<uint64_t>(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD) * UINT64_C(1000000)));
     // Use CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD as the initial value of RealTime.
     // Then the RealTime obtained from GetClock_RealTime will be always valid.
+    //
+    // TODO(19081): This is broken because it causes the platform to report
+    //              that it does have wall clock time when it actually doesn't.
     return System::SystemClock().SetClock_RealTime(curTime);
 }
 
diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
index bf40d4b84ca99b..7f46aee3dcfc0b 100644
--- a/src/platform/Linux/BUILD.gn
+++ b/src/platform/Linux/BUILD.gn
@@ -26,7 +26,7 @@ if (chip_enable_openthread) {
   import("//build_overrides/ot_br_posix.gni")
 }
 
-if (chip_mdns != "none") {
+if (chip_mdns == "platform") {
   pkg_config("avahi_client_config") {
     packages = [ "avahi-client" ]
   }
@@ -92,7 +92,7 @@ static_library("Linux") {
 
   public_configs = []
 
-  if (chip_mdns != "none") {
+  if (chip_mdns == "platform") {
     sources += [
       "DnssdImpl.cpp",
       "DnssdImpl.h",
diff --git a/src/platform/Linux/CHIPLinuxStorage.h b/src/platform/Linux/CHIPLinuxStorage.h
index 6c51f4372e1a6b..e83a417359169a 100644
--- a/src/platform/Linux/CHIPLinuxStorage.h
+++ b/src/platform/Linux/CHIPLinuxStorage.h
@@ -48,10 +48,6 @@
 #define LOCALSTATEDIR "/tmp"
 #endif
 
-#ifndef DEVICEINFODIR
-#define DEVICEINFODIR "/tmp"
-#endif
-
 #define CHIP_DEFAULT_FACTORY_PATH                                                                                                  \
     FATCONFDIR "/"                                                                                                                 \
                "chip_factory.ini"
@@ -61,9 +57,6 @@
 #define CHIP_DEFAULT_DATA_PATH                                                                                                     \
     LOCALSTATEDIR "/"                                                                                                              \
                   "chip_counters.ini"
-#define CHIP_DEVICE_INFO_PATH                                                                                                      \
-    DEVICEINFODIR "/"                                                                                                              \
-                  "chip_device_info.ini"
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/Linux/CHIPPlatformConfig.h b/src/platform/Linux/CHIPPlatformConfig.h
index 4dcdd7d5418dd7..788fe9b80c75d9 100644
--- a/src/platform/Linux/CHIPPlatformConfig.h
+++ b/src/platform/Linux/CHIPPlatformConfig.h
@@ -41,6 +41,11 @@ using CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE = const char *;
 
 // ==================== Security Adaptations ====================
 
+// If unspecified, assume crypto is fast on Linux
+#ifndef CHIP_CONFIG_SLOW_CRYPTO
+#define CHIP_CONFIG_SLOW_CRYPTO 0
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
 // ==================== General Configuration Overrides ====================
 
 #ifndef CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index 751401b7724fa6..7c1965cd47df8f 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -303,13 +303,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetThreadMetrics(ThreadMetrics ** threadM
 
             strncpy(thread->NameBuf, entry->d_name, kMaxThreadNameLength);
             thread->NameBuf[kMaxThreadNameLength] = '\0';
-            thread->name                          = CharSpan::fromCharString(thread->NameBuf);
-            thread->id                            = atoi(entry->d_name);
+            thread->name.Emplace(CharSpan::fromCharString(thread->NameBuf));
+            thread->id = atoi(entry->d_name);
 
-            // TODO: Get stack info of each thread
-            thread->stackFreeCurrent = 0;
-            thread->stackFreeMinimum = 0;
-            thread->stackSize        = 0;
+            // TODO: Get stack info of each thread: thread->stackFreeCurrent,
+            // thread->stackFreeMinimum, thread->stackSize.
 
             thread->Next = head;
             head         = thread;
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.h b/src/platform/Linux/DiagnosticDataProviderImpl.h
index 02b43cdf448f82..f47e41c8f8e9a4 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.h
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.h
@@ -39,6 +39,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 
     // ===== Methods that implement the DiagnosticDataProvider abstract interface.
 
+    bool SupportsWatermarks() override { return true; }
     CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
     CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
     CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
diff --git a/src/platform/Linux/DnssdImpl.cpp b/src/platform/Linux/DnssdImpl.cpp
index f98c83adb118be..9b345b6a623122 100644
--- a/src/platform/Linux/DnssdImpl.cpp
+++ b/src/platform/Linux/DnssdImpl.cpp
@@ -328,6 +328,11 @@ CHIP_ERROR MdnsAvahi::Init(DnssdAsyncReturnCallback initCallback, DnssdAsyncRetu
     CHIP_ERROR error = CHIP_NO_ERROR;
     int avahiError   = 0;
 
+    if (Shutdown() != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Shutdown() failed, continue anyway...");
+    }
+
     VerifyOrExit(initCallback != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrExit(errorCallback != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrExit(mClient == nullptr && mGroup == nullptr, error = CHIP_ERROR_INCORRECT_STATE);
@@ -649,9 +654,10 @@ void MdnsAvahi::HandleBrowse(AvahiServiceBrowser * browser, AvahiIfIndex interfa
         ChipLogProgress(DeviceLayer, "Avahi browse: remove");
         if (strcmp("local", domain) == 0)
         {
-            std::remove_if(context->mServices.begin(), context->mServices.end(), [name, type](const DnssdService & service) {
-                return strcmp(name, service.mName) == 0 && type == GetFullType(service.mType, service.mProtocol);
-            });
+            context->mServices.erase(
+                std::remove_if(context->mServices.begin(), context->mServices.end(), [name, type](const DnssdService & service) {
+                    return strcmp(name, service.mName) == 0 && type == GetFullType(service.mType, service.mProtocol);
+                }));
         }
         break;
     case AVAHI_BROWSER_CACHE_EXHAUSTED:
diff --git a/src/platform/Linux/PlatformManagerImpl.cpp b/src/platform/Linux/PlatformManagerImpl.cpp
index 551b8dffff25f9..a4b8c432759487 100644
--- a/src/platform/Linux/PlatformManagerImpl.cpp
+++ b/src/platform/Linux/PlatformManagerImpl.cpp
@@ -59,29 +59,6 @@ PlatformManagerImpl PlatformManagerImpl::sInstance;
 
 namespace {
 
-void SignalHandler(int signum)
-{
-    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
-
-    switch (signum)
-    {
-    case SIGUSR1:
-        PlatformMgrImpl().HandleSoftwareFault(SoftwareDiagnostics::Events::SoftwareFault::Id);
-        break;
-    case SIGUSR2:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::HardwareFaultChange::Id);
-        break;
-    case SIGHUP:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::RadioFaultChange::Id);
-        break;
-    case SIGTTIN:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::NetworkFaultChange::Id);
-        break;
-    default:
-        break;
-    }
-}
-
 #if CHIP_WITH_GIO
 void GDBus_Thread()
 {
@@ -175,16 +152,6 @@ void PlatformManagerImpl::WiFIIPChangeListener()
 
 CHIP_ERROR PlatformManagerImpl::_InitChipStack()
 {
-    struct sigaction action;
-
-    memset(&action, 0, sizeof(action));
-    action.sa_handler = SignalHandler;
-    sigaction(SIGHUP, &action, nullptr);
-    sigaction(SIGTTIN, &action, nullptr);
-    sigaction(SIGUSR1, &action, nullptr);
-    sigaction(SIGUSR2, &action, nullptr);
-    sigaction(SIGTSTP, &action, nullptr);
-
 #if CHIP_WITH_GIO
     GError * error = nullptr;
 
@@ -238,91 +205,6 @@ CHIP_ERROR PlatformManagerImpl::_Shutdown()
     return Internal::GenericPlatformManagerImpl_POSIX<PlatformManagerImpl>::_Shutdown();
 }
 
-void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
-{
-    GeneralDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetGeneralDiagnosticsDelegate();
-
-    if (delegate == nullptr)
-    {
-        ChipLogError(DeviceLayer, "No delegate registered to handle General Diagnostics event");
-        return;
-    }
-
-    if (EventId == GeneralDiagnostics::Events::HardwareFaultChange::Id)
-    {
-        GeneralFaults<kMaxHardwareFaults> previous;
-        GeneralFaults<kMaxHardwareFaults> current;
-
-#if CHIP_CONFIG_TEST
-        // On Linux Simulation, set following hardware faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO));
-        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE));
-
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT));
-#endif
-        delegate->OnHardwareFaultsDetected(previous, current);
-    }
-    else if (EventId == GeneralDiagnostics::Events::RadioFaultChange::Id)
-    {
-        GeneralFaults<kMaxRadioFaults> previous;
-        GeneralFaults<kMaxRadioFaults> current;
-
-#if CHIP_CONFIG_TEST
-        // On Linux Simulation, set following radio faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT));
-        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT));
-
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_NFC_FAULT));
-#endif
-        delegate->OnRadioFaultsDetected(previous, current);
-    }
-    else if (EventId == GeneralDiagnostics::Events::NetworkFaultChange::Id)
-    {
-        GeneralFaults<kMaxNetworkFaults> previous;
-        GeneralFaults<kMaxNetworkFaults> current;
-
-#if CHIP_CONFIG_TEST
-        // On Linux Simulation, set following radio faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
-#endif
-        delegate->OnNetworkFaultsDetected(previous, current);
-    }
-    else
-    {
-        ChipLogError(DeviceLayer, "Unknow event ID:%d", EventId);
-    }
-}
-
-void PlatformManagerImpl::HandleSoftwareFault(uint32_t EventId)
-{
-    SoftwareDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetSoftwareDiagnosticsDelegate();
-
-    if (delegate != nullptr)
-    {
-        SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type softwareFault;
-        char threadName[kMaxThreadNameLength + 1];
-
-        softwareFault.id = gettid();
-        strncpy(threadName, std::to_string(softwareFault.id).c_str(), kMaxThreadNameLength);
-        threadName[kMaxThreadNameLength] = '\0';
-        softwareFault.name               = CharSpan::fromCharString(threadName);
-        softwareFault.faultRecording     = ByteSpan(Uint8::from_const_char("FaultRecording"), strlen("FaultRecording"));
-
-        delegate->OnSoftwareFaultDetected(softwareFault);
-    }
-}
-
 #if CHIP_WITH_GIO
 GDBusConnection * PlatformManagerImpl::GetGDBusConnection()
 {
diff --git a/src/platform/Linux/PlatformManagerImpl.h b/src/platform/Linux/PlatformManagerImpl.h
index 37f7cce7edf5ca..591121d0a05e80 100644
--- a/src/platform/Linux/PlatformManagerImpl.h
+++ b/src/platform/Linux/PlatformManagerImpl.h
@@ -56,9 +56,6 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
 
     System::Clock::Timestamp GetStartTime() { return mStartTime; }
 
-    void HandleGeneralFault(uint32_t EventId);
-    void HandleSoftwareFault(uint32_t EventId);
-
 private:
     // ===== Methods that implement the PlatformManager abstract interface.
 
diff --git a/src/platform/Linux/SystemTimeSupport.cpp b/src/platform/Linux/SystemTimeSupport.cpp
index d30a51bd575bd3..fc16459c302391 100644
--- a/src/platform/Linux/SystemTimeSupport.cpp
+++ b/src/platform/Linux/SystemTimeSupport.cpp
@@ -50,7 +50,7 @@ Milliseconds64 ClockImpl::GetMonotonicMilliseconds64()
     return std::chrono::duration_cast<Milliseconds64>(std::chrono::steady_clock::now().time_since_epoch());
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTime(Microseconds64 & aCurTime)
 {
     struct timeval tv;
     if (gettimeofday(&tv, nullptr) != 0)
@@ -66,22 +66,19 @@ CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime = Clock::Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
+    aCurTime = Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Milliseconds64 & aCurTime)
 {
-    Clock::Microseconds64 curTimeUs;
-    CHIP_ERROR err = GetClock_RealTime(curTimeUs);
-    if (err == CHIP_NO_ERROR)
-    {
-        aCurTime = std::chrono::duration_cast<Clock::Milliseconds64>(curTimeUs);
-    }
+    Microseconds64 curTimeUs;
+    auto err = GetClock_RealTime(curTimeUs);
+    aCurTime = std::chrono::duration_cast<Milliseconds64>(curTimeUs);
     return err;
 }
 
-CHIP_ERROR ClockImpl::SetClock_RealTime(Clock::Microseconds64 aNewCurTime)
+CHIP_ERROR ClockImpl::SetClock_RealTime(Microseconds64 aNewCurTime)
 {
     struct timeval tv;
     tv.tv_sec  = static_cast<time_t>(aNewCurTime.count() / UINT64_C(1000000));
diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
index b02e14d9d37930..bd4a2a6428e703 100644
--- a/src/platform/Linux/ThreadStackManagerImpl.cpp
+++ b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -683,20 +683,164 @@ CHIP_ERROR ThreadStackManagerImpl::_WriteThreadNetworkDiagnosticAttributeToTlv(A
     {
     case ThreadNetworkDiagnostics::Attributes::NeighborTableList::Id:
     case ThreadNetworkDiagnostics::Attributes::RouteTableList::Id:
+    case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id:
+        err = encoder.EncodeEmptyList();
+        break;
+    case ThreadNetworkDiagnostics::Attributes::Channel::Id:
+    case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id:
+    case ThreadNetworkDiagnostics::Attributes::NetworkName::Id:
+    case ThreadNetworkDiagnostics::Attributes::PanId::Id:
+    case ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id:
+    case ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::Id:
+    case ThreadNetworkDiagnostics::Attributes::PartitionId::Id:
+    case ThreadNetworkDiagnostics::Attributes::Weighting::Id:
+    case ThreadNetworkDiagnostics::Attributes::DataVersion::Id:
+    case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id:
+    case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id:
+    case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id:
+    case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id:
+    case ThreadNetworkDiagnostics::Attributes::Delay::Id:
+    case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id:
     case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id:
     case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id:
-    case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
-        err = encoder.EncodeEmptyList();
+        err = encoder.EncodeNull();
         break;
-    }
-    default: {
+    case ThreadNetworkDiagnostics::Attributes::OverrunCount::Id:
+        err = encoder.Encode(static_cast<uint64_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id:
+        err = encoder.Encode(static_cast<uint16_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxAckedCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxDataCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxDataCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    case ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id:
+        err = encoder.Encode(static_cast<uint32_t>(0));
+        break;
+    default:
         err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
         break;
     }
-    }
 
     return err;
-}
+} // namespace DeviceLayer
 
 CHIP_ERROR
 ThreadStackManagerImpl::_AttachToThreadNetwork(const Thread::OperationalDataset & dataset,
diff --git a/src/platform/Linux/bluez/Helper.cpp b/src/platform/Linux/bluez/Helper.cpp
index 14662980eda747..1337c4e69a1003 100644
--- a/src/platform/Linux/bluez/Helper.cpp
+++ b/src/platform/Linux/bluez/Helper.cpp
@@ -67,6 +67,7 @@
 #include <utility>
 
 #include <lib/support/CodeUtils.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/Linux/BLEManagerImpl.h>
 #include <system/TLVPacketBufferBackingStore.h>
 
@@ -1205,7 +1206,7 @@ static void UpdateAdditionalDataCharacteristic(BluezGattCharacteristic1 * charac
     uint8_t rotatingDeviceIdUniqueId[ConfigurationManager::kRotatingDeviceIDUniqueIDLength] = {};
     MutableByteSpan rotatingDeviceIdUniqueIdSpan(rotatingDeviceIdUniqueId);
 
-    err = ConfigurationMgr().GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
+    err = GetDeviceInstanceInfoProvider()->GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
     SuccessOrExit(err);
     err = ConfigurationMgr().GetLifetimeCounter(additionalDataPayloadParams.rotatingDeviceIdLifetimeCounter);
     SuccessOrExit(err);
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
index 5d5ce4f5fe77cc..3b352f25fdc094 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
@@ -200,41 +200,38 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnPlatformEvent(const
             }
         }
 #endif
-        Impl()->LockThreadStack();
 
-#if CHIP_DETAIL_LOGGING
-
-        LogOpenThreadStateChange(mOTInst, event->ThreadStateChange.OpenThread.Flags);
-
-#endif // CHIP_DETAIL_LOGGING
-
-#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
-        if (event->ThreadStateChange.RoleChanged || event->ThreadStateChange.AddressChanged)
+        bool isThreadAttached = Impl()->_IsThreadAttached();
+        // Avoid sending muliple events if the attachement state didn't change (Child->router or disable->Detached)
+        if (event->ThreadStateChange.RoleChanged && (isThreadAttached != mIsAttached))
         {
-            bool isInterfaceUp;
-            isInterfaceUp = GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadInterfaceUpNoLock();
-            // Post an event signaling the change in Thread interface connectivity state.
+            ChipDeviceEvent attachEvent;
+            attachEvent.Clear();
+            attachEvent.Type                            = DeviceEventType::kThreadConnectivityChange;
+            attachEvent.ThreadConnectivityChange.Result = (isThreadAttached) ? kConnectivity_Established : kConnectivity_Lost;
+            CHIP_ERROR status                           = PlatformMgr().PostEvent(&attachEvent);
+            if (status == CHIP_NO_ERROR)
             {
-                ChipDeviceEvent event;
-                event.Clear();
-                event.Type                            = DeviceEventType::kThreadConnectivityChange;
-                event.ThreadConnectivityChange.Result = (isInterfaceUp) ? kConnectivity_Established : kConnectivity_Lost;
-                CHIP_ERROR status                     = PlatformMgr().PostEvent(&event);
-                if (status != CHIP_NO_ERROR)
-                {
-                    ChipLogError(DeviceLayer, "Failed to post Thread connectivity change: %" CHIP_ERROR_FORMAT, status.Format());
-                }
+                mIsAttached = isThreadAttached;
             }
-
-            // Refresh Multicast listening
-            if (GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadAttachedNoLock())
+            else
             {
-                ChipLogDetail(DeviceLayer, "Thread Attached updating Multicast address");
-                Server::GetInstance().RejoinExistingMulticastGroups();
+                ChipLogError(DeviceLayer, "Failed to post Thread connectivity change: %" CHIP_ERROR_FORMAT, status.Format());
             }
         }
+
+#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
+        if (event->ThreadStateChange.AddressChanged && isThreadAttached)
+        {
+            // Refresh Multicast listening
+            ChipLogDetail(DeviceLayer, "Thread Attached updating Multicast address");
+            Server::GetInstance().RejoinExistingMulticastGroups();
+        }
 #endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
-        Impl()->UnlockThreadStack();
+
+#if CHIP_DETAIL_LOGGING
+        LogOpenThreadStateChange(mOTInst, event->ThreadStateChange.OpenThread.Flags);
+#endif // CHIP_DETAIL_LOGGING
     }
 }
 
@@ -388,17 +385,34 @@ template <class ImplClass>
 CHIP_ERROR
 GenericThreadStackManagerImpl_OpenThread<ImplClass>::_StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback)
 {
+    CHIP_ERROR error = CHIP_NO_ERROR;
+
     // If there is another ongoing scan request, reject the new one.
     VerifyOrReturnError(mpScanCallback == nullptr, CHIP_ERROR_INCORRECT_STATE);
+
     mpScanCallback = callback;
-    CHIP_ERROR err = MapOpenThreadError(otLinkActiveScan(mOTInst, 0, /* all channels */
-                                                         0,          /* default value `kScanDurationDefault` = 300 ms. */
-                                                         _OnNetworkScanFinished, this));
-    if (err != CHIP_NO_ERROR)
+
+    Impl()->LockThreadStack();
+
+    // Ensure that IPv6 interface is up when MLE Discovery is performed.
+    if (!otIp6IsEnabled(mOTInst))
+    {
+        SuccessOrExit(error = MapOpenThreadError(otIp6SetEnabled(mOTInst, true)));
+    }
+
+    error = MapOpenThreadError(otThreadDiscover(mOTInst, 0,                       /* all channels */
+                                                OT_PANID_BROADCAST, false, false, /* disable PAN ID, EUI64 and Joiner filtering */
+                                                _OnNetworkScanFinished, this));
+
+exit:
+    Impl()->UnlockThreadStack();
+
+    if (error != CHIP_NO_ERROR)
     {
         mpScanCallback = nullptr;
     }
-    return err;
+
+    return error;
 }
 
 template <class ImplClass>
@@ -412,6 +426,12 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_OnNetworkScanFinished
 {
     if (aResult == nullptr) // scan completed
     {
+        // If Thread scanning was done before commissioning, turn off the IPv6 interface.
+        if (otThreadGetDeviceRole(mOTInst) == OT_DEVICE_ROLE_DISABLED && !otDatasetIsCommissioned(mOTInst))
+        {
+            otIp6SetEnabled(mOTInst, false);
+        }
+
         if (mpScanCallback != nullptr)
         {
             DeviceLayer::SystemLayer().ScheduleLambda([this]() {
@@ -1523,10 +1543,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_WriteThreadNetw
             securityPolicy.rotationTime = policyAsInts[0];
             securityPolicy.flags        = policyAsInts[1];
 
-            err = encoder.EncodeList([securityPolicy](const auto & aEncoder) -> CHIP_ERROR {
-                ReturnErrorOnFailure(aEncoder.Encode(securityPolicy));
-                return CHIP_NO_ERROR;
-            });
+            err = encoder.Encode(securityPolicy);
         }
     }
     break;
@@ -1576,10 +1593,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_WriteThreadNetw
             OpDatasetComponents.securityPolicyPresent   = activeDataset.mComponents.mIsSecurityPolicyPresent;
             OpDatasetComponents.channelMaskPresent      = activeDataset.mComponents.mIsChannelMaskPresent;
 
-            err = encoder.EncodeList([OpDatasetComponents](const auto & aEncoder) -> CHIP_ERROR {
-                ReturnErrorOnFailure(aEncoder.Encode(OpDatasetComponents));
-                return CHIP_NO_ERROR;
-            });
+            err = encoder.Encode(OpDatasetComponents);
         }
     }
     break;
@@ -2391,10 +2405,16 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::FromOtDnsRespons
 template <class ImplClass>
 void GenericThreadStackManagerImpl_OpenThread<ImplClass>::DispatchResolve(intptr_t context)
 {
-    auto * dnsResult            = reinterpret_cast<DnsResult *>(context);
-    Inet::IPAddress * ipAddress = &(dnsResult->mMdnsService.mAddress.Value());
-    ThreadStackMgrImpl().mDnsResolveCallback(dnsResult->context, &(dnsResult->mMdnsService), Span<Inet::IPAddress>(ipAddress, 1),
-                                             dnsResult->error);
+    DnsResult * dnsResult         = reinterpret_cast<DnsResult *>(context);
+    Dnssd::DnssdService & service = dnsResult->mMdnsService;
+    Span<Inet::IPAddress> ipAddrs;
+
+    if (service.mAddress.HasValue())
+    {
+        ipAddrs = Span<Inet::IPAddress>(&service.mAddress.Value(), 1);
+    }
+
+    ThreadStackMgrImpl().mDnsResolveCallback(dnsResult->context, &service, ipAddrs, dnsResult->error);
     Platform::Delete<DnsResult>(dnsResult);
 }
 
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
index 5fb7fccf20801e..7a61600580acf5 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
@@ -151,6 +151,7 @@ class GenericThreadStackManagerImpl_OpenThread
 
     otInstance * mOTInst;
     uint64_t mOverrunCount = 0;
+    bool mIsAttached       = false;
 
     NetworkCommissioning::ThreadDriver::ScanCallback * mpScanCallback;
     NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * mpConnectCallback;
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp
index a08c4acea48eab..6abc66e2898659 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp
@@ -134,7 +134,7 @@ void GenericThreadStackManagerImpl_OpenThread_LwIP<ImplClass>::UpdateThreadInter
     LOCK_TCPIP_CORE();
     Impl()->LockThreadStack();
 
-    // Determine whether the device is attached to a Thread network.
+    // Determine whether the device Thread interface is up..
     isInterfaceUp = GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadInterfaceUpNoLock();
 
     // If needed, adjust the link state of the LwIP netif to reflect the state of the OpenThread stack.
@@ -152,19 +152,6 @@ void GenericThreadStackManagerImpl_OpenThread_LwIP<ImplClass>::UpdateThreadInter
             netif_set_link_down(mNetIf);
         }
 
-        // Post an event signaling the change in Thread interface connectivity state.
-        {
-            ChipDeviceEvent event;
-            event.Clear();
-            event.Type                            = DeviceEventType::kThreadConnectivityChange;
-            event.ThreadConnectivityChange.Result = (isInterfaceUp) ? kConnectivity_Established : kConnectivity_Lost;
-            CHIP_ERROR status                     = PlatformMgr().PostEvent(&event);
-            if (status != CHIP_NO_ERROR)
-            {
-                ChipLogError(DeviceLayer, "Failed to post Thread connectivity change: %" CHIP_ERROR_FORMAT, status.Format());
-            }
-        }
-
         // Presume the interface addresses are also changing.
         addrChange = true;
     }
diff --git a/src/platform/P6/NetworkCommissioningWiFiDriver.cpp b/src/platform/P6/NetworkCommissioningWiFiDriver.cpp
index b8dba7b1a17d1d..e9ca4f9e973501 100644
--- a/src/platform/P6/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/P6/NetworkCommissioningWiFiDriver.cpp
@@ -160,7 +160,9 @@ void P6WiFiDriver::OnConnectWiFiNetwork()
     if (mpConnectCallback)
     {
         CommitConfiguration();
+        chip::DeviceLayer::PlatformMgr().LockChipStack();
         mpConnectCallback->OnResult(Status::kSuccess, CharSpan(), 0);
+        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
         mpConnectCallback = nullptr;
     }
 }
@@ -185,7 +187,9 @@ void P6WiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     {
         ChipLogError(NetworkProvisioning, "Failed to connect to WiFi network:%s", chip::ErrorStr(err));
         mpConnectCallback = nullptr;
+        chip::DeviceLayer::PlatformMgr().LockChipStack();
         callback->OnResult(networkingStatus, CharSpan(), 0);
+        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
     }
 }
 
diff --git a/src/platform/P6/OTAImageProcessorImpl.cpp b/src/platform/P6/OTAImageProcessorImpl.cpp
index c57c0e83a20a9e..b6e3bc175fab4a 100644
--- a/src/platform/P6/OTAImageProcessorImpl.cpp
+++ b/src/platform/P6/OTAImageProcessorImpl.cpp
@@ -47,6 +47,40 @@ CHIP_ERROR OTAImageProcessorImpl::Abort()
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR OTAImageProcessorImpl::ProcessHeader(ByteSpan & block)
+{
+    // Only modify the ByteSpan if the OTAImageHeaderParser is currently initialized.
+    if (mHeaderParser.IsInitialized())
+    {
+        OTAImageHeader header;
+
+        // AccumulateAndDecode will cause the OTAImageHeader bytes to be stored
+        // in header. We don't do anything with header, however, the other
+        // consequence of this call is to advance the data pointer in block. In
+        // this or subsequent calls to this API, block will end up pointing at
+        // the first byte after OTAImageHeader.
+        CHIP_ERROR error = mHeaderParser.AccumulateAndDecode(block, header);
+
+        // If we have not received all the bytes of the OTAImageHeader yet, that is OK.
+        // Return CHIP_NO_ERROR and expect that future blocks will contain the rest.
+        ReturnErrorCodeIf(error == CHIP_ERROR_BUFFER_TOO_SMALL, CHIP_NO_ERROR);
+
+        // If there is some error other than "too small", return that so future
+        // processing will be aborted.
+        ReturnErrorOnFailure(error);
+
+        mParams.totalFileBytes = header.mPayloadSize;
+
+        // If we are here, then we have received all the OTAImageHeader bytes.
+        // Calling Clear() here results in the parser state being set to
+        // uninitialized. This means future calls to ProcessHeader will not
+        // modify block and those future bytes will be written to the device.
+        mHeaderParser.Clear();
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & block)
 {
     if ((block.data() == nullptr) || block.empty())
@@ -94,6 +128,10 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
         return;
     }
 
+    // init the OTAImageHeaderParser instance to indicate that we haven't yet
+    // parsed the header out of the incoming image.
+    imageProcessor->mHeaderParser.Init();
+
     imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
 }
 
@@ -145,15 +183,32 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
         return;
     }
 
-    int rc = flash_area_write(imageProcessor->mFlashArea, imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock.data(),
-                              imageProcessor->mBlock.size());
+    // The call to ProcessHeader will result in the modification of the block ByteSpan data
+    // pointer if the OTAImageHeader is present in the image. The result is that only
+    // the new application bytes will be written to the device in the flash_area_write calls,
+    // as all bytes for the header are skipped.
+    ByteSpan block = ByteSpan(imageProcessor->mBlock.data(), imageProcessor->mBlock.size());
+
+    CHIP_ERROR error = imageProcessor->ProcessHeader(block);
+    if (error != CHIP_NO_ERROR)
+    {
+        ChipLogError(SoftwareUpdate, "Failed to process OTA image header");
+        imageProcessor->mDownloader->EndDownload(error);
+        return;
+    }
+
+    // send down only the post-processed bytes from block to this call, rather than sending down
+    // the original bytes from imageProcessor. The bytes in imageProcessor may include date
+    // from the OTAImageHeader, which we don't want.
+    int rc = flash_area_write(imageProcessor->mFlashArea, imageProcessor->mParams.downloadedBytes, block.data(), block.size());
     if (rc != 0)
     {
         imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
         return;
     }
 
-    imageProcessor->mParams.downloadedBytes += imageProcessor->mBlock.size();
+    // increment the total downloaded bytes by the potentially modified block ByteSpan size
+    imageProcessor->mParams.downloadedBytes += block.size();
     imageProcessor->mDownloader->FetchNextData();
 }
 
diff --git a/src/platform/P6/OTAImageProcessorImpl.h b/src/platform/P6/OTAImageProcessorImpl.h
index 9c35a01d475a22..0f6a53fc7bd52a 100644
--- a/src/platform/P6/OTAImageProcessorImpl.h
+++ b/src/platform/P6/OTAImageProcessorImpl.h
@@ -19,11 +19,11 @@
 #pragma once
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
+#include <fstream>
+#include <lib/core/OTAImageHeader.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/OTAImageProcessor.h>
 
-#include <fstream>
-
 #ifdef P6_OTA
 extern "C" {
 #include "bootutil/bootutil.h"
@@ -66,10 +66,18 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
      */
     CHIP_ERROR ReleaseBlock();
 
+    /**
+     * Call to skip over any OTAImageHeader bytes in the downloaded image.
+     */
+    CHIP_ERROR ProcessHeader(ByteSpan & block);
+
     MutableByteSpan mBlock;
     OTADownloader * mDownloader;
 
     const struct flash_area * mFlashArea;
+
+    // Parser is used to remove the OTAImageHeader from the incoming image.
+    OTAImageHeaderParser mHeaderParser;
 };
 
 } // namespace chip
diff --git a/src/platform/P6/SystemPlatformConfig.h b/src/platform/P6/SystemPlatformConfig.h
index deba3447ffcf67..dd1672e2a5c87c 100644
--- a/src/platform/P6/SystemPlatformConfig.h
+++ b/src/platform/P6/SystemPlatformConfig.h
@@ -36,7 +36,6 @@ struct ChipDeviceEvent;
 
 // ==================== Platform Adaptations ====================
 
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1
 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 0
 #define CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE int
 #define CHIP_SYSTEM_CONFIG_LWIP_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
diff --git a/src/platform/Tizen/AppPreference.cpp b/src/platform/Tizen/AppPreference.cpp
index 77ec067b86dd6c..d10efac30f399b 100644
--- a/src/platform/Tizen/AppPreference.cpp
+++ b/src/platform/Tizen/AppPreference.cpp
@@ -19,6 +19,7 @@
 #include <app_preference.h>
 #include <lib/support/Base64.h>
 #include <lib/support/CHIPMem.h>
+#include <memory>
 
 namespace chip {
 namespace DeviceLayer {
@@ -26,138 +27,98 @@ namespace PersistedStorage {
 namespace Internal {
 namespace AppPreference {
 
-static CHIP_ERROR __IsKeyExist(const char * key)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    int preErr     = PREFERENCE_ERROR_NONE;
-    bool isExist   = false;
-
-    preErr = preference_is_existing(key, &isExist);
-    if (preErr != PREFERENCE_ERROR_NONE)
-    {
-        err = CHIP_ERROR_INCORRECT_STATE;
-    }
-    else if (isExist == false)
-    {
-        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
-    }
-
-    return err;
-}
-
 CHIP_ERROR CheckData(const char * key)
 {
-    return __IsKeyExist(key);
+    bool isExist = false;
+    int err      = preference_is_existing(key, &isExist);
+    VerifyOrReturnError(err == PREFERENCE_ERROR_NONE, CHIP_ERROR_INCORRECT_STATE);
+    return isExist ? CHIP_NO_ERROR : CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
 }
 
 CHIP_ERROR GetData(const char * key, void * data, size_t dataSize, size_t * getDataSize, size_t offset)
 {
-    CHIP_ERROR err                = CHIP_NO_ERROR;
-    int preErr                    = PREFERENCE_ERROR_NONE;
-    char * encodedData            = NULL;
-    uint8_t * decodedData         = NULL;
-    size_t encodedDataSize        = 0;
-    size_t encodedDataPaddingSize = 0;
-    size_t decodedDataSize        = 0;
-    size_t expectedDecodedSize    = 0;
-    size_t copy_size              = 0;
-
-    VerifyOrExit(data != NULL, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    err = __IsKeyExist(key);
-    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogProgress(DeviceLayer, "Not found data [%s]", key));
-
-    preErr = preference_get_string(key, &encodedData);
-    VerifyOrExit(preErr == PREFERENCE_ERROR_NONE, err = CHIP_ERROR_INCORRECT_STATE);
-    encodedDataSize = strlen(encodedData);
-
-    if ((encodedDataSize > 0) && (encodedData[encodedDataSize - 1] == '='))
-    {
-        encodedDataPaddingSize++;
-        if ((encodedDataSize > 1) && (encodedData[encodedDataSize - 2] == '='))
-            encodedDataPaddingSize++;
-    }
-    expectedDecodedSize = ((encodedDataSize - encodedDataPaddingSize) * 3) / 4;
-
-    decodedData = static_cast<uint8_t *>(chip::Platform::MemoryAlloc(expectedDecodedSize));
-    VerifyOrExit(decodedData != NULL, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(data != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-    decodedDataSize = Base64Decode(encodedData, static_cast<uint16_t>(encodedDataSize), decodedData);
+    char * encodedData = nullptr;
+    // Make sure that string allocated by preference_get_string() will be freed
+    std::unique_ptr<char, decltype(&::free)> _{ encodedData, &::free };
 
-    copy_size = min(dataSize, decodedDataSize - offset);
-    if (getDataSize != NULL)
+    int err = preference_get_string(key, &encodedData);
+    if (err == PREFERENCE_ERROR_NO_KEY)
     {
-        *getDataSize = copy_size;
+        return CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    }
+    if (err == PREFERENCE_ERROR_OUT_OF_MEMORY)
+    {
+        return CHIP_ERROR_NO_MEMORY;
+    }
+    if (err != PREFERENCE_ERROR_NONE)
+    {
+        ChipLogError(DeviceLayer, "Failed to get preference [%s]: %s", key, get_error_message(err));
+        return CHIP_ERROR_INCORRECT_STATE;
     }
-    memset(data, 0, dataSize);
-    memcpy(data, decodedData + offset, copy_size);
 
-    ChipLogProgress(DeviceLayer, "Get data [%s:%s]", key, (char *) data);
+    size_t encodedDataSize = strlen(encodedData);
 
-    chip::Platform::MemoryFree(decodedData);
+    Platform::ScopedMemoryBuffer<uint8_t> decodedData;
+    size_t expectedMaxDecodedSize = BASE64_MAX_DECODED_LEN(encodedDataSize);
+    VerifyOrReturnError(decodedData.Alloc(expectedMaxDecodedSize), CHIP_ERROR_NO_MEMORY);
 
-    VerifyOrExit(dataSize >= decodedDataSize - offset, err = CHIP_ERROR_BUFFER_TOO_SMALL);
+    size_t decodedDataSize = Base64Decode(encodedData, static_cast<uint16_t>(encodedDataSize), decodedData.Get());
+    VerifyOrReturnError(dataSize >= decodedDataSize - offset, CHIP_ERROR_BUFFER_TOO_SMALL);
 
-exit:
-    free(encodedData);
-    return err;
+    size_t copySize = std::min(dataSize, decodedDataSize - offset);
+    if (getDataSize != nullptr)
+    {
+        *getDataSize = copySize;
+    }
+    ::memcpy(data, decodedData.Get() + offset, copySize);
+
+    ChipLogProgress(DeviceLayer, "Get data [%s:%.*s]", key, static_cast<int>(copySize), static_cast<char *>(data));
+    return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR SaveData(const char * key, const uint8_t * data, size_t dataSize)
+CHIP_ERROR SaveData(const char * key, const void * data, size_t dataSize)
 {
-    CHIP_ERROR err             = CHIP_NO_ERROR;
-    int preErr                 = PREFERENCE_ERROR_NONE;
-    char * encodedData         = NULL;
-    size_t encodedDataSize     = 0;
-    size_t expectedEncodedSize = ((dataSize + 3) * 4) / 3;
-
-    err = __IsKeyExist(key);
-    if (err == CHIP_NO_ERROR)
-    {
-        VerifyOrExit(RemoveData(key) == CHIP_NO_ERROR, err = CHIP_ERROR_INCORRECT_STATE);
-    }
-    err = CHIP_NO_ERROR;
+    // Expected size for null-terminated base64 string
+    size_t expectedEncodedSize = BASE64_ENCODED_LEN(dataSize) + 1;
 
-    encodedData = static_cast<char *>(chip::Platform::MemoryAlloc(expectedEncodedSize));
-    VerifyOrExit(encodedData != NULL, err = CHIP_ERROR_INCORRECT_STATE);
+    Platform::ScopedMemoryBuffer<char> encodedData;
+    VerifyOrReturnError(encodedData.Alloc(expectedEncodedSize), CHIP_ERROR_NO_MEMORY);
 
-    encodedDataSize              = Base64Encode(data, static_cast<uint16_t>(dataSize), encodedData);
-    encodedData[encodedDataSize] = 0;
+    size_t encodedDataSize = Base64Encode(static_cast<const uint8_t *>(data), static_cast<uint16_t>(dataSize), encodedData.Get());
+    encodedData[encodedDataSize] = '\0';
 
-    preErr = preference_set_string(key, encodedData);
-    if (preErr == PREFERENCE_ERROR_NONE)
+    int err = preference_set_string(key, encodedData.Get());
+    if (err == PREFERENCE_ERROR_OUT_OF_MEMORY)
     {
-        ChipLogProgress(DeviceLayer, "Save data [%s:%s]", key, data);
+        return CHIP_ERROR_NO_MEMORY;
     }
-    else
+    if (err != PREFERENCE_ERROR_NONE)
     {
-        ChipLogProgress(DeviceLayer, "FAIL: set string [%s]", get_error_message(preErr));
-        err = CHIP_ERROR_INCORRECT_STATE;
+        ChipLogError(DeviceLayer, "Failed to set preference [%s]: %s", key, get_error_message(err));
+        return CHIP_ERROR_INCORRECT_STATE;
     }
 
-    chip::Platform::MemoryFree(encodedData);
-
-exit:
-    return err;
+    ChipLogProgress(DeviceLayer, "Save data [%s:%.*s]", key, static_cast<int>(dataSize), static_cast<const char *>(data));
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR RemoveData(const char * key)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    int preErr     = PREFERENCE_ERROR_NONE;
-
-    preErr = preference_remove(key);
-    if (preErr == PREFERENCE_ERROR_NONE)
+    int err = preference_remove(key);
+    if (err == PREFERENCE_ERROR_NO_KEY)
     {
-        ChipLogProgress(DeviceLayer, "Remove data [%s]", key);
+        return CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
     }
-    else
+    if (err != PREFERENCE_ERROR_NONE)
     {
-        ChipLogProgress(DeviceLayer, "FAIL: remove preference [%s]", get_error_message(preErr));
-        err = CHIP_ERROR_INCORRECT_STATE;
+        ChipLogError(DeviceLayer, "Failed to remove preference [%s]: %s", key, get_error_message(err));
+        return CHIP_ERROR_INCORRECT_STATE;
     }
 
-    return err;
+    ChipLogProgress(DeviceLayer, "Remove data [%s]", key);
+    return CHIP_NO_ERROR;
 }
 
 } // namespace AppPreference
diff --git a/src/platform/Tizen/AppPreference.h b/src/platform/Tizen/AppPreference.h
index da617307b66d01..2fee34cc3bb263 100644
--- a/src/platform/Tizen/AppPreference.h
+++ b/src/platform/Tizen/AppPreference.h
@@ -28,7 +28,7 @@ namespace AppPreference {
 
 CHIP_ERROR CheckData(const char * key);
 CHIP_ERROR GetData(const char * key, void * data, size_t dataSize, size_t * getDataSize, size_t offset);
-CHIP_ERROR SaveData(const char * key, const uint8_t * data, size_t size);
+CHIP_ERROR SaveData(const char * key, const void * data, size_t size);
 CHIP_ERROR RemoveData(const char * key);
 
 } // namespace AppPreference
diff --git a/src/platform/Tizen/BLEManagerImpl.cpp b/src/platform/Tizen/BLEManagerImpl.cpp
index f45e1e579d1359..f57a1ce7df6dbe 100644
--- a/src/platform/Tizen/BLEManagerImpl.cpp
+++ b/src/platform/Tizen/BLEManagerImpl.cpp
@@ -79,7 +79,7 @@ void BLEManagerImpl::GattConnectionStateChangedCb(int result, bool connected, co
 
     if (result != BT_ERROR_NONE)
     {
-        ChipLogError(DeviceLayer, connected ? "Connection req failed" : "Disconnection req failed");
+        ChipLogError(DeviceLayer, "%s", connected ? "Connection req failed" : "Disconnection req failed");
         if (connected)
             sInstance.NotifyHandleConnectFailed(CHIP_ERROR_INTERNAL);
     }
@@ -102,13 +102,13 @@ gboolean BLEManagerImpl::_BleInitialize(void * userData)
     ret = bt_initialize();
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_initialize() failed. ret: %d", ret));
 
-    ret = bt_adapter_set_state_changed_cb(__AdapterStateChangedCb, NULL);
+    ret = bt_adapter_set_state_changed_cb(__AdapterStateChangedCb, nullptr);
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_adapter_set_state_changed_cb() failed. ret: %d", ret));
 
     ret = bt_gatt_server_initialize();
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_server_initialize() failed. ret: %d", ret));
 
-    ret = bt_gatt_set_connection_state_changed_cb(GattConnectionStateChangedCb, NULL);
+    ret = bt_gatt_set_connection_state_changed_cb(GattConnectionStateChangedCb, nullptr);
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_adapter_set_state_changed_cb() failed. ret: %d", ret));
 
     sInstance.InitConnectionData();
@@ -122,17 +122,14 @@ gboolean BLEManagerImpl::_BleInitialize(void * userData)
     return false;
 }
 
-static int __GetAttInfo(bt_gatt_h gattHandle, char ** uuid, int * type)
+static int __GetAttInfo(bt_gatt_h gattHandle, char ** uuid, bt_gatt_type_e * type)
 {
-    int ret;
-
-    ret = bt_gatt_get_type(gattHandle, (bt_gatt_type_e *) type);
+    int ret = bt_gatt_get_type(gattHandle, type);
     VerifyOrReturnError(ret == BT_ERROR_NONE, ret);
-
     return bt_gatt_get_uuid(gattHandle, uuid);
 }
 
-static const char * __ConvertAttTypeToStr(int type)
+static constexpr const char * __ConvertAttTypeToStr(bt_gatt_type_e type)
 {
     switch (type)
     {
@@ -143,24 +140,27 @@ static const char * __ConvertAttTypeToStr(int type)
     case BT_GATT_TYPE_DESCRIPTOR:
         return "Descriptor";
     default:
-        return NULL;
+        return "(unknown)";
     }
 }
 
 static void __ReadValueRequestedCb(const char * remoteAddress, int requestId, bt_gatt_server_h server, bt_gatt_h gattHandle,
                                    int offset, void * userData)
 {
-    int ret, len = 0, type = 0;
-    char *value = NULL, *uuid = NULL;
+    int ret, len = 0;
+    bt_gatt_type_e type;
+    char * uuid  = nullptr;
+    char * value = nullptr;
 
-    __GetAttInfo(gattHandle, &uuid, &type);
-    ChipLogProgress(DeviceLayer, "Read Requested on %s(%s)", __ConvertAttTypeToStr(type), uuid);
+    VerifyOrReturn(__GetAttInfo(gattHandle, &uuid, &type) == BT_ERROR_NONE,
+                   ChipLogError(DeviceLayer, "Failed to fetch GATT Attribute from GATT handle"));
+    ChipLogProgress(DeviceLayer, "Read Requested on %s: %s", __ConvertAttTypeToStr(type), uuid);
     g_free(uuid);
 
     ret = bt_gatt_get_value(gattHandle, &value, &len);
     VerifyOrReturn(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_get_value() failed. ret: %d", ret));
 
-    ChipLogProgress(DeviceLayer, "Read Value: %s(len: %d)", value, len);
+    ChipLogProgress(DeviceLayer, "Read Value (len: %d): %.*s", len, len, value);
 
     ret = bt_gatt_server_send_response(requestId, BT_GATT_REQUEST_TYPE_READ, offset, 0x00, value, len);
     g_free(value);
@@ -170,9 +170,10 @@ static void __ReadValueRequestedCb(const char * remoteAddress, int requestId, bt
 void BLEManagerImpl::WriteValueRequestedCb(const char * remoteAddress, int requestId, bt_gatt_server_h server, bt_gatt_h gattHandle,
                                            bool responseNeeded, int offset, const char * value, int len, void * userData)
 {
-    int ret, type = 0;
-    char * uuid          = NULL;
+    int ret;
+    char * uuid          = nullptr;
     BLEConnection * conn = nullptr;
+    bt_gatt_type_e type;
 
     conn = static_cast<BLEConnection *>(g_hash_table_lookup(sInstance.mConnectionMap, remoteAddress));
     VerifyOrReturn(conn != nullptr, ChipLogError(DeviceLayer, "Failed to find connection info"));
@@ -180,24 +181,24 @@ void BLEManagerImpl::WriteValueRequestedCb(const char * remoteAddress, int reque
     VerifyOrReturn(__GetAttInfo(gattHandle, &uuid, &type) == BT_ERROR_NONE,
                    ChipLogError(DeviceLayer, "Failed to fetch GATT Attribute from GATT handle"));
 
-    ChipLogProgress(DeviceLayer, "Write Requested on %s(%s)", __ConvertAttTypeToStr(type), uuid);
-    ChipLogProgress(DeviceLayer, "Write Value: %s(len: %d)", value, len);
+    ChipLogProgress(DeviceLayer, "Write Requested on %s: %s", __ConvertAttTypeToStr(type), uuid);
+    ChipLogProgress(DeviceLayer, "Write Value (len: %d): %.*s ", len, len, value);
     g_free(uuid);
 
     ret = bt_gatt_set_value(gattHandle, value, len);
     VerifyOrReturn(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_set_value() failed. ret: %d", ret));
 
-    ret = bt_gatt_server_send_response(requestId, BT_GATT_REQUEST_TYPE_WRITE, offset, 0x00, NULL, 0);
+    ret = bt_gatt_server_send_response(requestId, BT_GATT_REQUEST_TYPE_WRITE, offset, 0x00, nullptr, 0);
     VerifyOrReturn(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_server_send_response() failed. ret: %d", ret));
 
-    sInstance.HandleC1CharWriteEvent(conn, (const uint8_t *) value, len);
+    sInstance.HandleC1CharWriteEvent(conn, reinterpret_cast<const uint8_t *>(value), len);
 }
 
 void BLEManagerImpl::NotificationStateChangedCb(bool notify, bt_gatt_server_h server, bt_gatt_h gattHandle, void * userData)
 {
-    int type             = 0;
-    char * uuid          = NULL;
+    char * uuid          = nullptr;
     BLEConnection * conn = nullptr;
+    bt_gatt_type_e type;
     GHashTableIter iter;
     gpointer key, value;
 
@@ -214,7 +215,7 @@ void BLEManagerImpl::NotificationStateChangedCb(bool notify, bt_gatt_server_h se
     VerifyOrReturn(__GetAttInfo(gattHandle, &uuid, &type) == BT_ERROR_NONE,
                    ChipLogError(DeviceLayer, "Failed to fetch GATT Attribute from GATT handle"));
 
-    ChipLogProgress(DeviceLayer, "Notification State Changed %d on %s(%s)", notify, __ConvertAttTypeToStr(type), uuid);
+    ChipLogProgress(DeviceLayer, "Notification State Changed %d on %s: %s", notify, __ConvertAttTypeToStr(type), uuid);
     g_free(uuid);
     sInstance.NotifyBLESubscribed(notify ? true : false, conn);
 }
@@ -240,7 +241,7 @@ void BLEManagerImpl::CharacteristicNotificationCb(bt_gatt_h characteristic, char
     VerifyOrReturn(conn->gattCharC2Handle == characteristic, ChipLogError(DeviceLayer, "Gatt characteristic handle did not match"));
 
     ChipLogProgress(DeviceLayer, "Notification Received from CHIP peripheral [%s]", conn->peerAddr);
-    sInstance.HandleRXCharChanged(conn, (const uint8_t *) value, len);
+    sInstance.HandleRXCharChanged(conn, reinterpret_cast<const uint8_t *>(value), len);
 }
 
 void BLEManagerImpl::IndicationConfirmationCb(int result, const char * remoteAddress, bt_gatt_server_h server,
@@ -419,7 +420,7 @@ gboolean BLEManagerImpl::ConnectChipThing(gpointer userData)
 {
     int ret = BT_ERROR_NONE;
 
-    char * address = (char *) userData;
+    char * address = reinterpret_cast<char *>(userData);
     ChipLogProgress(DeviceLayer, "ConnectRequest: Addr [%s]", address);
 
     ret = bt_gatt_client_create(address, &sInstance.mGattClient);
@@ -450,7 +451,7 @@ void BLEManagerImpl::ConnectHandler(const char * address)
 
 void BLEManagerImpl::OnChipDeviceScanned(void * device, const chip::Ble::ChipBLEDeviceIdentificationInfo & info)
 {
-    bt_adapter_le_device_scan_result_info_s * deviceInfo = (bt_adapter_le_device_scan_result_info_s *) device;
+    auto deviceInfo = reinterpret_cast<bt_adapter_le_device_scan_result_info_s *>(device);
     VerifyOrReturn(deviceInfo != nullptr, ChipLogError(DeviceLayer, "Invalid Device Info"));
 
     ChipLogProgress(DeviceLayer, "New device scanned: %s", deviceInfo->remote_address);
@@ -504,10 +505,10 @@ int BLEManagerImpl::RegisterGATTServer()
 {
     int ret = BT_ERROR_NONE;
 
-    bt_gatt_server_h server = NULL;
-    bt_gatt_h service       = NULL;
-    bt_gatt_h char1 = NULL, char2 = NULL;
-    bt_gatt_h desc     = NULL;
+    bt_gatt_server_h server = nullptr;
+    bt_gatt_h service       = nullptr;
+    bt_gatt_h char1 = nullptr, char2 = nullptr;
+    bt_gatt_h desc     = nullptr;
     char desc_value[2] = { 0, 0 };
 
     ChipLogProgress(DeviceLayer, "Start GATT Service Registration");
@@ -529,7 +530,7 @@ int BLEManagerImpl::RegisterGATTServer()
         "CHIPoBLE_C1", strlen("CHIPoBLE_C1"), &char1);
 
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_characteristic_create() failed. ret: %d", ret));
-    ret = bt_gatt_server_set_write_value_requested_cb(char1, WriteValueRequestedCb, NULL);
+    ret = bt_gatt_server_set_write_value_requested_cb(char1, WriteValueRequestedCb, nullptr);
     VerifyOrExit(ret == BT_ERROR_NONE,
                  ChipLogError(DeviceLayer, "bt_gatt_server_set_write_value_requested_cb() failed. ret: %d", ret));
     ret = bt_gatt_service_add_characteristic(service, char1);
@@ -541,10 +542,10 @@ int BLEManagerImpl::RegisterGATTServer()
                                         &char2);
 
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_characteristic_create() failed. ret: %d", ret));
-    ret = bt_gatt_server_set_read_value_requested_cb(char2, __ReadValueRequestedCb, NULL);
+    ret = bt_gatt_server_set_read_value_requested_cb(char2, __ReadValueRequestedCb, nullptr);
     VerifyOrExit(ret == BT_ERROR_NONE,
                  ChipLogError(DeviceLayer, "bt_gatt_server_set_read_value_requested_cb() failed. ret: %d", ret));
-    ret = bt_gatt_server_set_characteristic_notification_state_change_cb(char2, NotificationStateChangedCb, NULL);
+    ret = bt_gatt_server_set_characteristic_notification_state_change_cb(char2, NotificationStateChangedCb, nullptr);
     VerifyOrExit(
         ret == BT_ERROR_NONE,
         ChipLogError(DeviceLayer, "bt_gatt_server_set_characteristic_notification_state_change_cb() failed. ret: %d", ret));
@@ -600,7 +601,7 @@ int BLEManagerImpl::StartAdvertising()
 
     ChipLogProgress(DeviceLayer, "Start Advertising");
 
-    if (mAdvertiser == NULL)
+    if (mAdvertiser == nullptr)
     {
         ret = bt_adapter_le_create_advertiser(&mAdvertiser);
         VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_adapter_le_create_advertiser() failed. ret: %d", ret));
@@ -641,7 +642,7 @@ int BLEManagerImpl::StartAdvertising()
 
     BLEManagerImpl::NotifyBLEPeripheralAdvConfiguredComplete(true, nullptr);
 
-    ret = bt_adapter_le_start_advertising_new(mAdvertiser, AdvertisingStateChangedCb, NULL);
+    ret = bt_adapter_le_start_advertising_new(mAdvertiser, AdvertisingStateChangedCb, nullptr);
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_adapter_le_start_advertising_new() failed. ret: %d", ret));
     sInstance.mAdvReqInProgress = true;
     return ret;
@@ -678,50 +679,54 @@ void BLEManagerImpl::InitConnectionData(void)
 
 static bool __GattClientForeachCharCb(int total, int index, bt_gatt_h charHandle, void * data)
 {
-    int type;
-    char * uuid = NULL;
+    bt_gatt_type_e type;
+    char * uuid = nullptr;
     auto conn   = static_cast<BLEConnection *>(data);
 
-    if (__GetAttInfo(charHandle, &uuid, &type) == BT_ERROR_NONE)
+    VerifyOrExit(__GetAttInfo(charHandle, &uuid, &type) == BT_ERROR_NONE,
+                 ChipLogError(DeviceLayer, "Failed to fetch GATT Attribute from CHAR handle"));
+
+    if (strcasecmp(uuid, chip_ble_char_c1_tx_uuid) == 0)
     {
-        if (strcasecmp(uuid, chip_ble_char_c1_tx_uuid) == 0)
-        {
-            ChipLogProgress(DeviceLayer, "CHIP Char C1 TX Found [%s]", uuid);
-            conn->gattCharC1Handle = charHandle;
-        }
-        else if (strcasecmp(uuid, chip_ble_char_c2_rx_uuid) == 0)
-        {
-            ChipLogProgress(DeviceLayer, "CHIP Char C2 RX Found [%s]", uuid);
-            conn->gattCharC2Handle = charHandle;
-        }
-        g_free(uuid);
+        ChipLogProgress(DeviceLayer, "CHIP Char C1 TX Found [%s]", uuid);
+        conn->gattCharC1Handle = charHandle;
     }
+    else if (strcasecmp(uuid, chip_ble_char_c2_rx_uuid) == 0)
+    {
+        ChipLogProgress(DeviceLayer, "CHIP Char C2 RX Found [%s]", uuid);
+        conn->gattCharC2Handle = charHandle;
+    }
+    g_free(uuid);
+
+exit:
     /* Try next Char UUID */
     return true;
 }
 
 static bool __GattClientForeachServiceCb(int total, int index, bt_gatt_h svcHandle, void * data)
 {
-    int type;
-    char * uuid = NULL;
+    bt_gatt_type_e type;
+    char * uuid = nullptr;
     auto conn   = static_cast<BLEConnection *>(data);
     ChipLogProgress(DeviceLayer, "__GattClientForeachServiceCb");
 
-    if (__GetAttInfo(svcHandle, &uuid, &type) == BT_ERROR_NONE)
+    VerifyOrExit(__GetAttInfo(svcHandle, &uuid, &type) == BT_ERROR_NONE,
+                 ChipLogError(DeviceLayer, "Failed to fetch GATT Attribute from SVC handle"));
+
+    if (strcasecmp(uuid, chip_ble_service_uuid) == 0)
     {
-        if (strcasecmp(uuid, chip_ble_service_uuid) == 0)
-        {
-            ChipLogProgress(DeviceLayer, "CHIP Service UUID Found [%s]", uuid);
+        ChipLogProgress(DeviceLayer, "CHIP Service UUID Found [%s]", uuid);
 
-            if (bt_gatt_service_foreach_characteristics(svcHandle, __GattClientForeachCharCb, conn) == BT_ERROR_NONE)
-                conn->isChipDevice = true;
+        if (bt_gatt_service_foreach_characteristics(svcHandle, __GattClientForeachCharCb, conn) == BT_ERROR_NONE)
+            conn->isChipDevice = true;
 
-            /* Got CHIP Device, no need to process further service */
-            g_free(uuid);
-            return false;
-        }
+        /* Got CHIP Device, no need to process further service */
         g_free(uuid);
+        return false;
     }
+    g_free(uuid);
+
+exit:
     /* Try next Service UUID */
     return true;
 }
@@ -743,7 +748,7 @@ void BLEManagerImpl::AddConnectionData(const char * remoteAddr)
 
     if (!g_hash_table_lookup(mConnectionMap, remoteAddr))
     {
-        ChipLogProgress(DeviceLayer, "Not Found in Map");
+        ChipLogProgress(DeviceLayer, "Connection not found in map [%s]", remoteAddr);
         conn           = static_cast<BLEConnection *>(g_malloc0(sizeof(BLEConnection)));
         conn->peerAddr = g_strdup(remoteAddr);
 
@@ -782,10 +787,10 @@ void BLEManagerImpl::RemoveConnectionData(const char * remoteAddr)
     BLEConnection * conn = nullptr;
     ChipLogProgress(DeviceLayer, "Connection Remove Request for [%s]", remoteAddr);
 
-    VerifyOrReturn(mConnectionMap != nullptr, ChipLogError(DeviceLayer, "connection map does not exist"));
+    VerifyOrReturn(mConnectionMap != nullptr, ChipLogError(DeviceLayer, "Connection map does not exist"));
 
     conn = static_cast<BLEConnection *>(g_hash_table_lookup(mConnectionMap, remoteAddr));
-    VerifyOrReturn(conn != nullptr, ChipLogError(DeviceLayer, "connection does not exist for [%s]", remoteAddr));
+    VerifyOrReturn(conn != nullptr, ChipLogError(DeviceLayer, "Connection does not exist for [%s]", remoteAddr));
 
     g_hash_table_remove(mConnectionMap, conn->peerAddr);
 
@@ -889,7 +894,7 @@ void BLEManagerImpl::DriveBLEState()
 
         ret = bt_adapter_le_destroy_advertiser(mAdvertiser);
         VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_adapter_le_destroy_advertiser() failed. ret: %d", ret));
-        mAdvertiser = NULL;
+        mAdvertiser = nullptr;
     }
 
 exit:
@@ -970,9 +975,9 @@ CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     int ret;
-    char * deviceName = NULL;
+    char * deviceName = nullptr;
 
-    VerifyOrExit(buf != NULL, err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit(buf != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
 
     ret = bt_adapter_get_name(&deviceName);
     if (ret != BT_ERROR_NONE)
@@ -981,7 +986,7 @@ CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
         return CHIP_ERROR_INTERNAL;
     }
 
-    VerifyOrExit(deviceName != NULL, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(deviceName != nullptr, err = CHIP_ERROR_INTERNAL);
     VerifyOrExit(strlen(deviceName) >= bufSize, err = CHIP_ERROR_BUFFER_TOO_SMALL);
 
     g_strlcpy(buf, deviceName, bufSize);
@@ -996,7 +1001,7 @@ CHIP_ERROR BLEManagerImpl::_SetDeviceName(const char * deviceName)
     CHIP_ERROR err = CHIP_NO_ERROR;
     int ret;
 
-    VerifyOrExit(deviceName != NULL, err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit(deviceName != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
 
     ret = bt_adapter_set_name(deviceName);
     if (ret != BT_ERROR_NONE)
@@ -1242,13 +1247,13 @@ bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUU
     conn = static_cast<BLEConnection *>(g_hash_table_lookup(sInstance.mConnectionMap, conn->peerAddr));
     VerifyOrExit(conn != nullptr, ChipLogError(DeviceLayer, "Failed to find connection info"));
 
-    ret = bt_gatt_set_value(mGattCharC2Handle, (const char *) pBuf->Start(), pBuf->DataLength());
+    ret = bt_gatt_set_value(mGattCharC2Handle, reinterpret_cast<const char *>(pBuf->Start()), pBuf->DataLength());
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_set_value() failed. ret: %d", ret));
 
     ChipLogProgress(DeviceLayer, "Sending indication for CHIPoBLE RX characteristic (con %s, len %u)", conn->peerAddr,
                     pBuf->DataLength());
 
-    ret = bt_gatt_server_notify_characteristic_changed_value(mGattCharC2Handle, IndicationConfirmationCb, conn->peerAddr, NULL);
+    ret = bt_gatt_server_notify_characteristic_changed_value(mGattCharC2Handle, IndicationConfirmationCb, conn->peerAddr, nullptr);
     VerifyOrExit(ret == BT_ERROR_NONE,
                  ChipLogError(DeviceLayer, "bt_gatt_server_notify_characteristic_changed_value() failed. ret: %d", ret));
     return true;
@@ -1277,7 +1282,7 @@ bool BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const Ble::Ch
                  ChipLogError(DeviceLayer, "SendWriteRequest() called with invalid characteristic ID"));
     VerifyOrExit(conn->gattCharC1Handle != nullptr, ChipLogError(DeviceLayer, "Char C1 is null"));
 
-    ret = bt_gatt_set_value(conn->gattCharC1Handle, (const char *) pBuf->Start(), pBuf->DataLength());
+    ret = bt_gatt_set_value(conn->gattCharC1Handle, reinterpret_cast<const char *>(pBuf->Start()), pBuf->DataLength());
     VerifyOrExit(ret == BT_ERROR_NONE, ChipLogError(DeviceLayer, "bt_gatt_set_value() failed. ret: %d", ret));
 
     ChipLogProgress(DeviceLayer, "Sending Write Request for CHIPoBLE TX characteristic (con %s, len %u)", conn->peerAddr,
@@ -1318,7 +1323,7 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
 {
     CHIP_ERROR err      = CHIP_NO_ERROR;
     ScanFilterData data = {
-        0x0,
+        { 0x0 },
     };
 
     ChipLogProgress(DeviceLayer, "Initiate Scan");
diff --git a/src/platform/Tizen/ChipDeviceScanner.cpp b/src/platform/Tizen/ChipDeviceScanner.cpp
index 4a278438390640..ec29a3f8a881eb 100644
--- a/src/platform/Tizen/ChipDeviceScanner.cpp
+++ b/src/platform/Tizen/ChipDeviceScanner.cpp
@@ -56,13 +56,12 @@ std::unique_ptr<ChipDeviceScanner> ChipDeviceScanner::Create(ChipDeviceScannerDe
     return std::make_unique<ChipDeviceScanner>(delegate);
 }
 
-static void __CleanupServiceData(bt_adapter_le_service_data_s * dataList, int count)
+static void __CleanupServiceData(bt_adapter_le_service_data_s * dataList, size_t count)
 {
-    int i;
-    if (!dataList || count == 0)
-        return;
+    VerifyOrReturn(dataList != nullptr);
+    VerifyOrReturn(count != 0);
 
-    for (i = 0; i < count; i++)
+    for (size_t i = 0; i < count; i++)
     {
         g_free(dataList[i].service_uuid);
         g_free(dataList[i].service_data);
@@ -70,44 +69,34 @@ static void __CleanupServiceData(bt_adapter_le_service_data_s * dataList, int co
     g_free(dataList);
 }
 
-static void __PrintLEScanData(bt_adapter_le_service_data_s * dataList, int idx)
+static void __PrintLEScanData(bt_adapter_le_service_data_s * dataList, size_t idx)
 {
-    int i = 0;
-    if (!dataList)
-        return;
+    VerifyOrReturn(dataList != nullptr);
 
     // Print Service UUID in the Service Data
-    ChipLogProgress(DeviceLayer, "======Service UUID========\n");
-    ChipLogProgress(DeviceLayer, "        UUID[%s]\n", dataList[idx].service_uuid);
-
-    ChipLogProgress(DeviceLayer, "Service Data Length::[%d]\n", dataList[idx].service_data_len);
+    ChipLogDetail(DeviceLayer, "======Service UUID========");
+    ChipLogDetail(DeviceLayer, "Service UUID::[%s]", dataList[idx].service_uuid);
 
     // Print Service Data
-    if (dataList[idx].service_data_len > 0)
-        ChipLogProgress(DeviceLayer, "=====Service Data====\n");
-
-    for (i = 0; i < dataList[idx].service_data_len; i++)
-    {
-        ChipLogProgress(DeviceLayer, "Service Data[%d] = [0x%x]\n", i, dataList[idx].service_data[i]);
-    }
+    ChipLogDetail(DeviceLayer, "======Service Data========");
+    ChipLogDetail(DeviceLayer, "Service Data Length::[%d]", dataList[idx].service_data_len);
+    ChipLogByteSpan(DeviceLayer, ByteSpan(reinterpret_cast<uint8_t *>(dataList[idx].service_data), dataList[idx].service_data_len));
 }
 
 static bool __IsChipThingDevice(bt_adapter_le_device_scan_result_info_s * info,
                                 chip::Ble::ChipBLEDeviceIdentificationInfo & aDeviceInfo)
 {
+    VerifyOrReturnError(info != nullptr, false);
+
     int count                               = 0;
     bt_adapter_le_service_data_s * dataList = nullptr;
     bool isChipDevice                       = false;
 
-    if (!info)
-        return false;
-
-    ChipLogError(DeviceLayer, "Is [%s] ChipThingDevice ?: Check now", info->remote_address);
+    ChipLogProgress(DeviceLayer, "Is [%s] ChipThingDevice ?: Check now", info->remote_address);
 
     if (bt_adapter_le_get_scan_result_service_data_list(info, BT_ADAPTER_LE_PACKET_ADVERTISING, &dataList, &count) == BT_ERROR_NONE)
     {
-        int i;
-        for (i = 0; i < count; i++)
+        for (int i = 0; i < count; i++)
         {
             if (g_strcmp0(dataList[i].service_uuid, chip_service_uuid) == 0 ||
                 g_strcmp0(dataList[i].service_uuid, chip_service_uuid_short) == 0)
@@ -127,11 +116,10 @@ static bool __IsChipThingDevice(bt_adapter_le_device_scan_result_info_s * info,
 
 void ChipDeviceScanner::LeScanResultCb(int result, bt_adapter_le_device_scan_result_info_s * info, void * userData)
 {
-    ChipDeviceScanner * self = (ChipDeviceScanner *) userData;
-    chip::Ble::ChipBLEDeviceIdentificationInfo deviceInfo;
+    VerifyOrReturn(info != nullptr);
 
-    if (!info)
-        return;
+    auto self = reinterpret_cast<ChipDeviceScanner *>(userData);
+    chip::Ble::ChipBLEDeviceIdentificationInfo deviceInfo;
 
     ChipLogProgress(DeviceLayer, "LE Device Reported!! remote addr [%s]", info->remote_address);
 
@@ -148,7 +136,7 @@ void ChipDeviceScanner::LeScanResultCb(int result, bt_adapter_le_device_scan_res
 
 gboolean ChipDeviceScanner::TimerExpiredCb(gpointer userData)
 {
-    ChipDeviceScanner * self = (ChipDeviceScanner *) userData;
+    auto self = reinterpret_cast<ChipDeviceScanner *>(userData);
     ChipLogProgress(DeviceLayer, "Scan Timer expired!!");
     self->StopChipScan();
     return G_SOURCE_REMOVE;
@@ -156,8 +144,8 @@ gboolean ChipDeviceScanner::TimerExpiredCb(gpointer userData)
 
 gboolean ChipDeviceScanner::TriggerScan(GMainLoop * mainLoop, gpointer userData)
 {
-    ChipDeviceScanner * self = (ChipDeviceScanner *) userData;
-    int ret                  = BT_ERROR_NONE;
+    auto self = reinterpret_cast<ChipDeviceScanner *>(userData);
+    int ret   = BT_ERROR_NONE;
     GSource * idleSource;
 
     self->mAsyncLoop = mainLoop;
@@ -239,7 +227,10 @@ CHIP_ERROR ChipDeviceScanner::StopChipScan(void)
     ReturnErrorCodeIf(!mIsScanning, CHIP_ERROR_INCORRECT_STATE);
 
     ret = bt_adapter_le_stop_scan();
-    ChipLogError(DeviceLayer, "bt_adapter_le_stop_scan() ret: %d", ret);
+    if (ret != BT_ERROR_NONE)
+    {
+        ChipLogError(DeviceLayer, "bt_adapter_le_stop_scan() failed. ret: %d", ret);
+    }
 
     g_main_loop_quit(mAsyncLoop);
     ChipLogProgress(DeviceLayer, "CHIP Scanner Async Thread Quit Done..Wait for Thread Windup...!");
diff --git a/src/platform/Tizen/ChipDeviceScanner.h b/src/platform/Tizen/ChipDeviceScanner.h
index ea80eb44aa4d2b..7eb2a9de3e248c 100644
--- a/src/platform/Tizen/ChipDeviceScanner.h
+++ b/src/platform/Tizen/ChipDeviceScanner.h
@@ -57,7 +57,7 @@ struct ScanFilterData
     char address[CHIP_TIZEN_BLE_ADDRESS_STRING_LEN];
     char service_uuid[CHIP_TIZEN_BLE_SERVICE_UUID_STRING_LEN];
     char service_data[CHIP_TIZEN_BLE_SERVICE_DATA_MAX_LEN];
-    int service_data_len;
+    unsigned int service_data_len;
 };
 
 // Receives callbacks when chip devices are being scanned
diff --git a/src/platform/Tizen/ConfigurationManagerImpl.cpp b/src/platform/Tizen/ConfigurationManagerImpl.cpp
index 2735d0c86009c7..01e448f3255d6f 100644
--- a/src/platform/Tizen/ConfigurationManagerImpl.cpp
+++ b/src/platform/Tizen/ConfigurationManagerImpl.cpp
@@ -31,6 +31,7 @@
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/Tizen/PosixConfig.h>
+#include <platform/Tizen/WiFiManager.h>
 #include <platform/internal/GenericConfigurationManagerImpl.ipp>
 
 namespace chip {
@@ -91,7 +92,12 @@ CHIP_ERROR ConfigurationManagerImpl::StoreProductId(uint16_t productId)
 
 CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
 {
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    constexpr size_t kExpectedBufSize = ConfigurationManager::kPrimaryMACAddressLength;
+    return WiFiMgr().GetDeviceMACAddress(buf, kExpectedBufSize);
+#else
     return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif
 }
 
 bool ConfigurationManagerImpl::CanFactoryReset(void)
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.cpp b/src/platform/Tizen/ConnectivityManagerImpl.cpp
index 23421b8598a92d..b761847efff1e7 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.cpp
+++ b/src/platform/Tizen/ConnectivityManagerImpl.cpp
@@ -197,12 +197,12 @@ void ConnectivityManagerImpl::_SetWiFiAPIdleTimeout(System::Clock::Timeout val)
 
 void ConnectivityManagerImpl::StartWiFiManagement(void)
 {
-    SystemLayer().ScheduleWork(ActivateWiFiManager, NULL);
+    SystemLayer().ScheduleWork(ActivateWiFiManager, nullptr);
 }
 
 void ConnectivityManagerImpl::StopWiFiManagement(void)
 {
-    SystemLayer().ScheduleWork(DeactivateWiFiManager, NULL);
+    SystemLayer().ScheduleWork(DeactivateWiFiManager, nullptr);
 }
 
 void ConnectivityManagerImpl::ActivateWiFiManager(::chip::System::Layer * aLayer, void * aAppState)
diff --git a/src/platform/Tizen/DnssdImpl.cpp b/src/platform/Tizen/DnssdImpl.cpp
index 8631a306287592..2511a4156d2680 100644
--- a/src/platform/Tizen/DnssdImpl.cpp
+++ b/src/platform/Tizen/DnssdImpl.cpp
@@ -64,13 +64,13 @@ bool CheckForSuccess(GenericContext * context, int err, const char * func, bool
 {
     if (context == nullptr)
     {
-        ChipLogError(DeviceLayer, "%s (Dnssd context is null)", func);
+        ChipLogError(DeviceLayer, "DNSsd %s (context is null)", func);
         return false;
     }
 
     if (err != DNSSD_ERROR_NONE)
     {
-        ChipLogError(DeviceLayer, "%s Err(%d)", func, err);
+        ChipLogError(DeviceLayer, "DNSsd %s Err(%d)", func, err);
         if (useCallback)
         {
             switch (context->contextType)
@@ -108,7 +108,7 @@ CHIP_ERROR Initialize()
 
 CHIP_ERROR UpdateTXTRecord(dnssd_service_h service, TextEntry * textEntries, size_t textEntrySize)
 {
-    ChipLogProgress(DeviceLayer, "%s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
 
     // TODO
     return CHIP_NO_ERROR;
@@ -116,24 +116,24 @@ CHIP_ERROR UpdateTXTRecord(dnssd_service_h service, TextEntry * textEntries, siz
 
 void OnRegister(dnssd_error_e error, dnssd_service_h service, void * data)
 {
-    ChipLogDetail(DeviceLayer, "Dnssd: %s", __func__);
-    RegisterContext * rCtx = reinterpret_cast<RegisterContext *>(data);
-    GMainLoop * loop       = (GMainLoop *) rCtx->context;
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
+    auto rCtx = reinterpret_cast<RegisterContext *>(data);
+    auto loop = reinterpret_cast<GMainLoop *>(rCtx->context);
 
     g_main_loop_quit(loop);
 
-    VerifyOrReturn(CheckForSuccess(rCtx, (int) error, __func__));
+    VerifyOrReturn(CheckForSuccess(rCtx, static_cast<int>(error), __func__));
     rCtx->isRegistered = true;
-    ChipLogDetail(DeviceLayer, "Dnssd: %s name: %s, type: %s, port: %u, interfaceId: %u", __func__, rCtx->name, rCtx->type,
+    ChipLogDetail(DeviceLayer, "DNSsd %s name: %s, type: %s, port: %u, interfaceId: %u", __func__, rCtx->name, rCtx->type,
                   rCtx->port, rCtx->interfaceId);
 }
 
 gboolean RegisterAsync(GMainLoop * mainLoop, gpointer userData)
 {
-    ChipLogProgress(DeviceLayer, "%s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
 
-    RegisterContext * rCtx = reinterpret_cast<RegisterContext *>(userData);
-    rCtx->context          = mainLoop;
+    auto rCtx     = reinterpret_cast<RegisterContext *>(userData);
+    rCtx->context = mainLoop;
 
     int ret = dnssd_register_local_service(rCtx->service, OnRegister, rCtx);
     VerifyOrReturnError(CheckForSuccess(rCtx, ret, __func__), false);
@@ -162,7 +162,7 @@ CHIP_ERROR RegisterService(const char * type, const char * name, uint16_t port,
         return UpdateTXTRecord(context->service, textEntries, textEntrySize);
     }
 
-    ChipLogProgress(DeviceLayer, "%s type: %s, name: %s, port: %u, interfaceId: %u", __func__, type, name, port, interfaceId);
+    ChipLogProgress(DeviceLayer, "DNSsd %s type: %s, name: %s, port: %u, interfaceId: %u", __func__, type, name, port, interfaceId);
 
     context = chip::Platform::New<RegisterContext>();
 
@@ -214,7 +214,7 @@ CHIP_ERROR UnregisterAllServices()
 
 void OnBrowseAdd(BrowseContext * context, dnssd_service_h service, const char * type, const char * name, uint32_t interfaceId)
 {
-    ChipLogDetail(DeviceLayer, "Dnssd: %s  type: %s, name: %s", __func__, type, name);
+    ChipLogDetail(DeviceLayer, "DNSsd %s type: %s, name: %s", __func__, type, name);
 
     char * tokens  = strdup(type);
     char * regtype = strtok(tokens, ".");
@@ -234,7 +234,7 @@ void OnBrowseAdd(BrowseContext * context, dnssd_service_h service, const char *
 
 void OnBrowseRemove(BrowseContext * context, dnssd_service_h service, const char * type, const char * name, uint32_t interfaceId)
 {
-    ChipLogDetail(DeviceLayer, "Dnssd: %s  type: %s, name: %s, interfaceId: %u", __func__, type, name, interfaceId);
+    ChipLogDetail(DeviceLayer, "DNSsd %s type: %s, name: %s, interfaceId: %u", __func__, type, name, interfaceId);
 
     auto it = std::remove_if(
         context->services.begin(), context->services.end(), [name, type, interfaceId](const DnssdService & mdnsService) {
@@ -254,9 +254,9 @@ void StopBrowse(BrowseContext * context)
 
 void OnBrowse(dnssd_service_state_e state, dnssd_service_h service, void * data)
 {
-    ChipLogDetail(DeviceLayer, "Dnssd: %s", __func__);
-    BrowseContext * bCtx = reinterpret_cast<BrowseContext *>(data);
-    GMainLoop * loop     = (GMainLoop *) bCtx->context;
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
+    auto bCtx = reinterpret_cast<BrowseContext *>(data);
+    auto loop = reinterpret_cast<GMainLoop *>(bCtx->context);
 
     // Always stop browsing
     g_main_loop_quit(loop);
@@ -277,7 +277,7 @@ void OnBrowse(dnssd_service_state_e state, dnssd_service_h service, void * data)
     interfaceId = if_nametoindex(ifaceName);
     VerifyOrExit(interfaceId > 0, );
 
-    ChipLogDetail(DeviceLayer, "Dnssd: %s type: %s, name: %s, interfaceId: %u", __func__, type, name, interfaceId);
+    ChipLogDetail(DeviceLayer, "DNSsd %s type: %s, name: %s, interfaceId: %u", __func__, type, name, interfaceId);
 
     if (state == DNSSD_SERVICE_STATE_AVAILABLE)
     {
@@ -309,7 +309,7 @@ void OnBrowse(dnssd_service_state_e state, dnssd_service_h service, void * data)
 
 gboolean BrowseAsync(GMainLoop * mainLoop, gpointer userData)
 {
-    ChipLogProgress(DeviceLayer, "%s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
 
     BrowseContext * bCtx = reinterpret_cast<BrowseContext *>(userData);
     bCtx->context        = mainLoop;
@@ -319,7 +319,7 @@ gboolean BrowseAsync(GMainLoop * mainLoop, gpointer userData)
     dnssd_browser_h browser;
     if (interfaceId == 0)
     {
-        ret = dnssd_browse_service(bCtx->type, NULL, &browser, OnBrowse, bCtx);
+        ret = dnssd_browse_service(bCtx->type, nullptr, &browser, OnBrowse, bCtx);
     }
     else
     {
@@ -363,7 +363,7 @@ void ConvertTxtRecords(unsigned short txtLen, uint8_t * txtRecord, std::vector<T
 {
     if (txtLen <= 1)
     {
-        ChipLogDetail(DeviceLayer, "Dnssd: %s No TXT records", __func__);
+        ChipLogDetail(DeviceLayer, "DNSsd %s: No TXT records", __func__);
         return;
     }
 
@@ -377,7 +377,7 @@ void ConvertTxtRecords(unsigned short txtLen, uint8_t * txtRecord, std::vector<T
         const uint8_t * const end = ptr + 1 + ptr[0];
         if (end > max)
         {
-            ChipLogError(DeviceLayer, "Dnssd: %s Invalid TXT data", __func__);
+            ChipLogError(DeviceLayer, "DNSsd %s: Invalid TXT data", __func__);
             return;
         }
 
@@ -405,9 +405,9 @@ void ConvertTxtRecords(unsigned short txtLen, uint8_t * txtRecord, std::vector<T
 
 void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
 {
-    ChipLogDetail(DeviceLayer, "Dnssd: %s", __func__);
-    ResolveContext * rCtx = reinterpret_cast<ResolveContext *>(data);
-    GMainLoop * loop      = (GMainLoop *) rCtx->context;
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
+    auto rCtx = reinterpret_cast<ResolveContext *>(data);
+    auto loop = reinterpret_cast<GMainLoop *>(rCtx->context);
 
     g_main_loop_quit(loop);
 
@@ -434,7 +434,7 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
     ret = dnssd_service_get_port(service, &port);
     VerifyOrExit(CheckForSuccess(rCtx, ret, __func__, true), );
 
-    ret = dnssd_service_get_all_txt_record(service, &txtLen, (void **) &txtRecord);
+    ret = dnssd_service_get_all_txt_record(service, &txtLen, reinterpret_cast<void **>(&txtRecord));
     ConvertTxtRecords(txtLen, txtRecord, textEntries);
     g_free(txtRecord);
 
@@ -455,7 +455,7 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
     }
 #endif
 
-    ChipLogDetail(DeviceLayer, "Dnssd: %s ipv4: %s, ipv6: %s, valid: %d", __func__, ipv4, ipv6, validIP);
+    ChipLogDetail(DeviceLayer, "DNSsd %s ipv4: %s, ipv6: %s, valid: %d", __func__, ipv4, ipv6, validIP);
 
     if (validIP)
     {
@@ -476,7 +476,7 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
 
 gboolean ResolveAsync(GMainLoop * mainLoop, gpointer userData)
 {
-    ChipLogProgress(DeviceLayer, "Dnssd %s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
 
     ResolveContext * rCtx = reinterpret_cast<ResolveContext *>(userData);
     rCtx->context         = mainLoop;
@@ -491,7 +491,7 @@ gboolean ResolveAsync(GMainLoop * mainLoop, gpointer userData)
 
 CHIP_ERROR Resolve(uint32_t interfaceId, const char * type, const char * name, DnssdResolveCallback callback, void * context)
 {
-    ChipLogProgress(DeviceLayer, "Dnssd %s type: %s, name: %s, interfaceId: %u", __func__, type, name, interfaceId);
+    ChipLogDetail(DeviceLayer, "DNSsd %s type: %s, name: %s, interfaceId: %u", __func__, type, name, interfaceId);
 
     ResolveContext * rCtx = chip::Platform::New<ResolveContext>(type, name, interfaceId, callback, context);
 
@@ -500,7 +500,7 @@ CHIP_ERROR Resolve(uint32_t interfaceId, const char * type, const char * name, D
 
     if (interfaceId == 0)
     {
-        ret = dnssd_create_remote_service(type, name, NULL, &service);
+        ret = dnssd_create_remote_service(type, name, nullptr, &service);
     }
     else
     {
@@ -621,7 +621,7 @@ CHIP_ERROR DnssdContexts::Add(ResolveContext * context, dnssd_service_h service)
 
 CHIP_ERROR DnssdContexts::Remove(GenericContext * context)
 {
-    ChipLogProgress(DeviceLayer, "Dnssd %s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
     auto iter = mContexts.cbegin();
     while (iter != mContexts.end())
     {
@@ -638,7 +638,7 @@ CHIP_ERROR DnssdContexts::Remove(GenericContext * context)
 
 CHIP_ERROR DnssdContexts::Remove(const char * type, const char * name, uint16_t port, uint32_t interfaceId)
 {
-    ChipLogProgress(DeviceLayer, "Dnssd %s type: %s, name %s, port: %u, interfaceId: %u", __func__, type, name, port, interfaceId);
+    ChipLogDetail(DeviceLayer, "DNSsd %s type: %s, name %s, port: %u, interfaceId: %u", __func__, type, name, port, interfaceId);
     for (auto iter = mContexts.begin(); iter != mContexts.end(); ++iter)
     {
         if ((*iter)->contextType == ContextType::Register)
@@ -658,7 +658,7 @@ CHIP_ERROR DnssdContexts::Remove(const char * type, const char * name, uint16_t
 
 CHIP_ERROR DnssdContexts::Remove(ContextType type)
 {
-    ChipLogProgress(DeviceLayer, "Dnssd %s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
     bool found = false;
 
     auto iter = mContexts.cbegin();
@@ -700,7 +700,7 @@ CHIP_ERROR ChipDnssdInit(DnssdAsyncReturnCallback successCallback, DnssdAsyncRet
     VerifyOrReturnError(successCallback != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(errorCallback != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-    ChipLogProgress(DeviceLayer, "Dnssd: %s", __func__);
+    ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
     CHIP_ERROR err = Initialize();
     if (err == CHIP_NO_ERROR)
     {
@@ -720,7 +720,7 @@ CHIP_ERROR ChipDnssdShutdown()
 
 CHIP_ERROR ChipDnssdSetHostname(const char * hostname)
 {
-    ChipLogProgress(DeviceLayer, "Dnssd: hostname %s", hostname);
+    ChipLogProgress(DeviceLayer, "DNSsd: hostname: %s", hostname);
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/Tizen/DnssdImpl.h b/src/platform/Tizen/DnssdImpl.h
index 05695b7f789586..9f2d2ef0abcee4 100755
--- a/src/platform/Tizen/DnssdImpl.h
+++ b/src/platform/Tizen/DnssdImpl.h
@@ -44,7 +44,7 @@ struct GenericContext
 struct RegisterContext : public GenericContext
 {
     dnssd_service_h service;
-    char type[kDnssdTypeMaxSize + kDnssdProtocolTextMaxSize + 1];
+    char type[kDnssdTypeAndProtocolMaxSize + 1];
     char name[Common::kInstanceNameMaxLength + 1];
     uint16_t port;
     uint32_t interfaceId;
@@ -64,7 +64,7 @@ struct RegisterContext : public GenericContext
 struct BrowseContext : public GenericContext
 {
     dnssd_browser_h browser;
-    char type[kDnssdTypeMaxSize + kDnssdProtocolTextMaxSize + 1];
+    char type[kDnssdTypeAndProtocolMaxSize + 1];
     uint32_t interfaceId;
 
     std::vector<DnssdService> services;
@@ -89,7 +89,7 @@ struct BrowseContext : public GenericContext
 struct ResolveContext : public GenericContext
 {
     dnssd_service_h service;
-    char type[kDnssdTypeMaxSize + kDnssdProtocolTextMaxSize + 1];
+    char type[kDnssdTypeAndProtocolMaxSize + 1];
     char name[Common::kInstanceNameMaxLength + 1];
     uint32_t interfaceId;
     bool isResolving;
diff --git a/src/platform/Tizen/KeyValueStoreManagerImpl.cpp b/src/platform/Tizen/KeyValueStoreManagerImpl.cpp
index 4b3eb6bef2a6bb..f1e1753f6399ab 100644
--- a/src/platform/Tizen/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/Tizen/KeyValueStoreManagerImpl.cpp
@@ -43,7 +43,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value, size_t value_size)
 {
-    return Internal::AppPreference::SaveData(key, reinterpret_cast<const uint8_t *>(value), value_size);
+    return Internal::AppPreference::SaveData(key, value, value_size);
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
diff --git a/src/platform/Tizen/MainLoop.cpp b/src/platform/Tizen/MainLoop.cpp
index b886bd5933e27e..ee46240a0403ff 100644
--- a/src/platform/Tizen/MainLoop.cpp
+++ b/src/platform/Tizen/MainLoop.cpp
@@ -16,173 +16,132 @@
 
 #include "MainLoop.h"
 
-#include <errno.h>
-#include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <pthread.h>
-#include <system/SystemTimer.h>
 
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-gboolean MainLoop::ThreadTimeout(gpointer userData)
+LoopData::LoopData()
 {
-    LoopData * loopData = reinterpret_cast<LoopData *>(userData);
-
-    VerifyOrReturnError(loopData != NULL, G_SOURCE_REMOVE);
+    mMainContext = g_main_context_new();
+    mMainLoop    = g_main_loop_new(mMainContext, FALSE);
+}
 
-    if (loopData->mTimeoutFn)
+LoopData::~LoopData()
+{
+    if (mThread.joinable())
     {
-        ChipLogProgress(DeviceLayer, "[Timeout] thread timeout function");
-        loopData->mTimeoutFn(loopData->mTimeoutUserData);
+        mThread.join();
     }
-
-    if (loopData->mMainLoop)
+    if (mMainContext != nullptr)
     {
-        ChipLogProgress(DeviceLayer, "[Timeout] main loop %p", loopData->mMainLoop);
-        g_main_loop_quit(loopData->mMainLoop);
+        g_main_context_unref(mMainContext);
+    }
+    if (mMainLoop != nullptr)
+    {
+        g_main_loop_unref(mMainLoop);
     }
-
-    return G_SOURCE_REMOVE;
 }
 
-void MainLoop::SetThreadTimeout(LoopData * loopData, guint interval)
+gboolean MainLoop::ThreadTimeout(gpointer userData)
 {
-    VerifyOrReturn(loopData != NULL);
-
-    GSource * source = g_timeout_source_new_seconds(interval);
-    g_source_set_callback(source, ThreadTimeout, reinterpret_cast<gpointer>(loopData), NULL);
-    g_source_attach(source, loopData->mMainContext);
-    g_source_unref(source);
-}
+    LoopData * loopData = reinterpret_cast<LoopData *>(userData);
 
-gpointer MainLoop::ThreadMainHandler(gpointer data)
-{
-    LoopData * loopData = reinterpret_cast<LoopData *>(data);
+    VerifyOrReturnError(loopData != nullptr, G_SOURCE_REMOVE);
 
-    g_main_context_push_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[PUSH] main context %p", loopData->mMainContext);
+    ChipLogDetail(DeviceLayer, "[TIMEOUT] glib main loop [%p]", loopData->mMainLoop);
 
-    ChipLogProgress(DeviceLayer, "[RUN] main loop %p", loopData->mMainLoop);
-    g_main_loop_run(loopData->mMainLoop);
-    ChipLogProgress(DeviceLayer, "[QUIT] main loop %p", loopData->mMainLoop);
-    g_main_loop_unref(loopData->mMainLoop);
-    loopData->mMainLoop = NULL;
+    if (loopData->mTimeoutFn)
+    {
+        ChipLogDetail(DeviceLayer, "Running thread timeout function");
+        loopData->mTimeoutFn(loopData->mTimeoutUserData);
+    }
 
-    g_main_context_pop_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[POP] main context %p", loopData->mMainContext);
-    g_main_context_unref(loopData->mMainContext);
-    loopData->mMainContext = NULL;
+    g_main_loop_quit(loopData->mMainLoop);
 
-    return NULL;
+    return G_SOURCE_REMOVE;
 }
 
-gpointer MainLoop::ThreadAsyncHandler(gpointer data)
+void MainLoop::ThreadHandler(std::shared_ptr<LoopData> loopData)
 {
-    LoopData * loopData = reinterpret_cast<LoopData *>(data);
-
     g_main_context_push_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[PUSH] async context %p", loopData->mMainContext);
+    ChipLogDetail(DeviceLayer, "[PUSH] thread default context [%p]", loopData->mMainContext);
 
-    ChipLogProgress(DeviceLayer, "[RUN] async loop %p", loopData->mMainLoop);
+    ChipLogDetail(DeviceLayer, "[RUN] glib main loop [%p]", loopData->mMainLoop);
     g_main_loop_run(loopData->mMainLoop);
-    ChipLogProgress(DeviceLayer, "[QUIT] async loop %p", loopData->mMainLoop);
-    g_main_loop_unref(loopData->mMainLoop);
-    loopData->mMainLoop = NULL;
+    ChipLogDetail(DeviceLayer, "[QUIT] glib main loop [%p]", loopData->mMainLoop);
 
     g_main_context_pop_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[POP] async context %p", loopData->mMainContext);
-    g_main_context_unref(loopData->mMainContext);
-    loopData->mMainContext = NULL;
-
-    chip::Platform::Delete(loopData);
-
-    return NULL;
+    ChipLogDetail(DeviceLayer, "[POP] thread default context [%p]", loopData->mMainContext);
 }
 
 bool MainLoop::Init(initFn_t initFn, gpointer userData)
 {
-    bool result;
-    LoopData * loopData = chip::Platform::New<LoopData>();
+    auto loopData = std::make_shared<LoopData>();
+    bool result   = false;
 
-    VerifyOrReturnError(loopData != NULL, false);
-
-    loopData->mMainContext = g_main_context_new();
-    loopData->mMainLoop    = g_main_loop_new(loopData->mMainContext, FALSE);
+    VerifyOrReturnError(loopData, false);
 
     g_main_context_push_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[PUSH] main context %p", loopData->mMainContext);
+    ChipLogDetail(DeviceLayer, "[PUSH] thread default context [%p]", loopData->mMainContext);
 
     result = initFn(userData);
 
     g_main_context_pop_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[POP] main context %p", loopData->mMainContext);
-
-    if (result != false)
-    {
-        loopData->mThread = g_thread_new("ThreadMainHandler", ThreadMainHandler, reinterpret_cast<gpointer>(loopData));
-        mLoopData.push_back(loopData);
-    }
+    ChipLogDetail(DeviceLayer, "[POP] thread default context [%p]", loopData->mMainContext);
 
-    return result;
-}
+    VerifyOrReturnError(result, false);
 
-void MainLoop::DeleteData(LoopData * loopData)
-{
-    if (loopData->mMainLoop)
-    {
-        g_main_loop_quit(loopData->mMainLoop);
-        g_thread_join(loopData->mThread);
-    }
+    loopData->mThread = std::thread(ThreadHandler, loopData);
+    mLoopData.push_back(loopData);
 
-    chip::Platform::Delete(loopData);
+    return true;
 }
 
 void MainLoop::Deinit(void)
 {
-    std::vector<LoopData *>::const_iterator iter = mLoopData.cbegin();
-    while (iter != mLoopData.cend())
+    for (auto & loopData : mLoopData)
     {
-        DeleteData(*iter);
-        mLoopData.erase(iter);
-        iter++;
+        g_main_loop_quit(loopData->mMainLoop);
     }
+    mLoopData.clear();
 }
 
-bool MainLoop::AsyncRequest(asyncFn_t asyncFn, gpointer asyncUserData, guint interval, timeoutFn_t timeoutFn,
+bool MainLoop::AsyncRequest(asyncFn_t asyncFn, gpointer asyncUserData, guint timeoutInterval, timeoutFn_t timeoutFn,
                             gpointer timeoutUserData)
 {
-    bool result         = false;
-    LoopData * loopData = chip::Platform::New<LoopData>();
+    auto loopData = std::make_shared<LoopData>();
+    bool result   = false;
 
-    VerifyOrReturnError(loopData != NULL, false);
+    VerifyOrReturnError(loopData, false);
 
-    loopData->mMainContext = g_main_context_new();
-    loopData->mMainLoop    = g_main_loop_new(loopData->mMainContext, FALSE);
+    loopData->mTimeoutFn       = timeoutFn;
+    loopData->mTimeoutUserData = timeoutUserData;
 
     g_main_context_push_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[PUSH] async context %p", loopData->mMainContext);
+    ChipLogDetail(DeviceLayer, "[PUSH] thread default context [%p]", loopData->mMainContext);
 
     result = asyncFn(loopData->mMainLoop, asyncUserData);
 
     g_main_context_pop_thread_default(loopData->mMainContext);
-    ChipLogProgress(DeviceLayer, "[POP] async context %p", loopData->mMainContext);
+    ChipLogDetail(DeviceLayer, "[POP] thread default context [%p]", loopData->mMainContext);
+
+    VerifyOrReturnError(result, false);
+
+    loopData->mThread = std::thread(ThreadHandler, loopData);
+    loopData->mThread.detach();
 
-    if (result != false)
+    if (timeoutInterval)
     {
-        loopData->mThread = g_thread_new("ThreadAsyncHandler", ThreadAsyncHandler, reinterpret_cast<gpointer>(loopData));
-
-        if (interval)
-        {
-            loopData->mTimeoutFn       = timeoutFn;
-            loopData->mTimeoutUserData = timeoutUserData;
-            SetThreadTimeout(loopData, interval);
-        }
+        GSource * source = g_timeout_source_new_seconds(timeoutInterval);
+        g_source_set_callback(source, ThreadTimeout, loopData.get(), nullptr);
+        g_source_attach(source, loopData->mMainContext);
+        g_source_unref(source);
     }
 
-    return result;
+    return true;
 }
 
 MainLoop & MainLoop::Instance(void)
diff --git a/src/platform/Tizen/MainLoop.h b/src/platform/Tizen/MainLoop.h
index f8bc045706eabb..a4a67019c4de50 100644
--- a/src/platform/Tizen/MainLoop.h
+++ b/src/platform/Tizen/MainLoop.h
@@ -16,6 +16,9 @@
 
 #pragma once
 
+#include <memory>
+#include <thread>
+
 #include <lib/core/CHIPError.h>
 #include <platform/CHIPDeviceLayer.h>
 
@@ -32,33 +35,35 @@ typedef void (*timeoutFn_t)(gpointer userData);
 class LoopData
 {
 public:
-    LoopData() : mMainContext(NULL), mMainLoop(NULL), mThread(NULL), mTimeoutFn(NULL), mTimeoutUserData(NULL) {}
+    LoopData();
+    ~LoopData();
 
-    GMainContext * mMainContext;
-    GMainLoop * mMainLoop;
-    GThread * mThread;
-    timeoutFn_t mTimeoutFn;
-    gpointer mTimeoutUserData;
+    // Thread which governs glib main event loop
+    std::thread mThread;
+    // Objects for running glib main event loop
+    GMainContext * mMainContext = nullptr;
+    GMainLoop * mMainLoop       = nullptr;
+    // Optional timeout function
+    timeoutFn_t mTimeoutFn    = nullptr;
+    gpointer mTimeoutUserData = nullptr;
 };
 
 class MainLoop
 {
 public:
-    bool Init(initFn_t initFn, gpointer userData = NULL);
+    bool Init(initFn_t initFn, gpointer userData = nullptr);
     void Deinit(void);
-    bool AsyncRequest(asyncFn_t asyncFn, gpointer asyncUserData = NULL, guint interval = 0, timeoutFn_t timeoutFn = NULL,
-                      gpointer timeoutUserData = NULL);
+    bool AsyncRequest(asyncFn_t asyncFn, gpointer asyncUserData = nullptr, guint timeoutInterval = 0,
+                      timeoutFn_t timeoutFn = nullptr, gpointer timeoutUserData = nullptr);
     static MainLoop & Instance(void);
 
 private:
-    MainLoop() {}
-    void DeleteData(LoopData * loopData);
+    MainLoop() = default;
+
     static gboolean ThreadTimeout(gpointer userData);
-    void SetThreadTimeout(LoopData * loopData, guint interval);
-    static gpointer ThreadMainHandler(gpointer data);
-    static gpointer ThreadAsyncHandler(gpointer data);
+    static void ThreadHandler(std::shared_ptr<LoopData> loopData);
 
-    std::vector<LoopData *> mLoopData;
+    std::vector<std::shared_ptr<LoopData>> mLoopData;
 };
 
 } // namespace Internal
diff --git a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
index 584135266e378a..85a1b13f95a103 100644
--- a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
@@ -80,20 +80,7 @@ CHIP_ERROR TizenWiFiDriver::RevertConfiguration()
 
 bool TizenWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
 {
-    if (networkId.size() != network.ssidLen)
-    {
-        ChipLogProgress(NetworkProvisioning, "ssidLen is mismatched. network.ssidLen: %u, networkId.size(): %u", network.ssidLen,
-                        networkId.size());
-        return false;
-    }
-    else if (memcmp(networkId.data(), network.ssid, network.ssidLen) != 0)
-    {
-        ChipLogProgress(NetworkProvisioning, "ssid is mismatched. network.ssid: %s, networkId.data(): %s", network.ssid,
-                        networkId.data());
-        return false;
-    }
-
-    return true;
+    return networkId.size() == network.ssidLen && memcmp(networkId.data(), network.ssid, network.ssidLen) == 0;
 }
 
 Status TizenWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
@@ -141,9 +128,11 @@ void TizenWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callb
 
     VerifyOrExit(NetworkMatch(mStagingNetwork, networkId), networkingStatus = Status::kNetworkIDNotFound);
 
-    ChipLogProgress(NetworkProvisioning, "TizenNetworkCommissioningDelegate: SSID: %s", (char *) mStagingNetwork.ssid);
+    ChipLogProgress(NetworkProvisioning, "TizenNetworkCommissioningDelegate: SSID: %.*s",
+                    static_cast<int>(sizeof(mStagingNetwork.ssid)), reinterpret_cast<char *>(mStagingNetwork.ssid));
 
-    err = WiFiMgr().Connect((const char *) mStagingNetwork.ssid, (const char *) mStagingNetwork.credentials, callback);
+    err = WiFiMgr().Connect(reinterpret_cast<char *>(mStagingNetwork.ssid), reinterpret_cast<char *>(mStagingNetwork.credentials),
+                            callback);
 
 exit:
     if (err != CHIP_NO_ERROR)
diff --git a/src/platform/Tizen/SystemPlatformConfig.h b/src/platform/Tizen/SystemPlatformConfig.h
index f895bff0b9c972..80afd51b52e65b 100644
--- a/src/platform/Tizen/SystemPlatformConfig.h
+++ b/src/platform/Tizen/SystemPlatformConfig.h
@@ -37,8 +37,7 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 1
 #define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 0
 #define CHIP_SYSTEM_CONFIG_NO_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 0
+#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
 
 #define CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS 1
 
diff --git a/src/platform/Tizen/SystemTimeSupport.cpp b/src/platform/Tizen/SystemTimeSupport.cpp
index 8df58db002b991..b885edae978713 100644
--- a/src/platform/Tizen/SystemTimeSupport.cpp
+++ b/src/platform/Tizen/SystemTimeSupport.cpp
@@ -28,39 +28,30 @@
 #include <lib/support/TimeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 
+#include <chrono>
+#include <errno.h>
+#include <inttypes.h>
+#include <sys/time.h>
+
 namespace chip {
 namespace System {
-namespace Platform {
-namespace Layer {
+namespace Clock {
 
-uint64_t GetClock_Monotonic()
-{
-    std::chrono::microseconds epoch =
-        std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now().time_since_epoch());
-    // count() is nominally signed, but for a monotonic clock it cannot be
-    // negative.
-    return static_cast<uint64_t>(epoch.count());
-}
+namespace Internal {
+ClockImpl gClockImpl;
+} // namespace Internal
 
-uint64_t GetClock_MonotonicMS()
+Microseconds64 ClockImpl::GetMonotonicMicroseconds64()
 {
-    std::chrono::milliseconds epoch =
-        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch());
-    // count() is nominally signed, but for a monotonic clock it cannot be
-    // negative.
-    return static_cast<uint64_t>(epoch.count());
+    return std::chrono::duration_cast<Microseconds64>(std::chrono::steady_clock::now().time_since_epoch());
 }
 
-uint64_t GetClock_MonotonicHiRes()
+Milliseconds64 ClockImpl::GetMonotonicMilliseconds64()
 {
-    std::chrono::microseconds epoch =
-        std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now().time_since_epoch());
-    // count() is nominally signed, but for a monotonic clock it cannot be
-    // negative.
-    return static_cast<uint64_t>(epoch.count());
+    return std::chrono::duration_cast<Milliseconds64>(std::chrono::steady_clock::now().time_since_epoch());
 }
 
-CHIP_ERROR GetClock_RealTime(uint64_t & curTime)
+CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
 {
     struct timeval tv;
     if (gettimeofday(&tv, nullptr) != 0)
@@ -76,35 +67,23 @@ CHIP_ERROR GetClock_RealTime(uint64_t & curTime)
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    curTime = (static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec);
+    aCurTime = Clock::Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR GetClock_RealTimeMS(uint64_t & curTime)
+CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & aCurTime)
 {
-    struct timeval tv;
-    if (gettimeofday(&tv, nullptr) != 0)
-    {
-        return CHIP_ERROR_POSIX(errno);
-    }
-    if (tv.tv_sec < CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    if (tv.tv_usec < 0)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    curTime = (static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000)) + (static_cast<uint64_t>(tv.tv_usec) / 1000);
-    return CHIP_NO_ERROR;
+    Microseconds64 curTimeUs;
+    auto err = GetClock_RealTime(curTimeUs);
+    aCurTime = std::chrono::duration_cast<Milliseconds64>(curTimeUs);
+    return err;
 }
 
-CHIP_ERROR SetClock_RealTime(uint64_t newCurTime)
+CHIP_ERROR ClockImpl::SetClock_RealTime(Clock::Microseconds64 aNewCurTime)
 {
     struct timeval tv;
-    tv.tv_sec  = static_cast<time_t>(newCurTime / UINT64_C(1000000));
-    tv.tv_usec = static_cast<long>(newCurTime % UINT64_C(1000000));
+    tv.tv_sec  = static_cast<time_t>(aNewCurTime.count() / UINT64_C(1000000));
+    tv.tv_usec = static_cast<long>(aNewCurTime.count() % UINT64_C(1000000));
     if (settimeofday(&tv, nullptr) != 0)
     {
         return (errno == EPERM) ? CHIP_ERROR_ACCESS_DENIED : CHIP_ERROR_POSIX(errno);
@@ -121,7 +100,6 @@ CHIP_ERROR SetClock_RealTime(uint64_t newCurTime)
     return CHIP_NO_ERROR;
 }
 
-} // namespace Layer
-} // namespace Platform
+} // namespace Clock
 } // namespace System
 } // namespace chip
diff --git a/src/platform/Tizen/ThreadStackManagerImpl.cpp b/src/platform/Tizen/ThreadStackManagerImpl.cpp
index a5ff9f488431d9..5c4b60f215420f 100644
--- a/src/platform/Tizen/ThreadStackManagerImpl.cpp
+++ b/src/platform/Tizen/ThreadStackManagerImpl.cpp
@@ -123,7 +123,7 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
     ThreadDeviceRoleChangedHandler(deviceRole);
 
     /* Set callback for change of device role */
-    threadErr = thread_set_device_role_changed_cb(mThreadInstance, _ThreadDeviceRoleChangedCb, NULL);
+    threadErr = thread_set_device_role_changed_cb(mThreadInstance, _ThreadDeviceRoleChangedCb, nullptr);
     VerifyOrExit(threadErr == THREAD_ERROR_NONE, ChipLogError(DeviceLayer, "FAIL: set device role changed cb"));
 
     mIsInitialized = true;
@@ -493,7 +493,7 @@ CHIP_ERROR ThreadStackManagerImpl::_AddSrpService(const char * aInstanceName, co
                                                   const Span<const Dnssd::TextEntry> & aTxtEntries, uint32_t aLeaseInterval,
                                                   uint32_t aKeyLeaseInterval)
 {
-    ChipLogProgress(DeviceLayer, "%s +", __FUNCTION__);
+    ChipLogDetail(DeviceLayer, "%s +", __func__);
     CHIP_ERROR error = CHIP_NO_ERROR;
     int threadErr    = THREAD_ERROR_NONE;
 
@@ -564,7 +564,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetupSrpHost(const char * aHostName)
         ChipLogError(DeviceLayer, "FAIL: thread_srp_client_set_host_name");
 
     /* Get external ip address */
-    threadErr = thread_get_ipaddr(mThreadInstance, _ThreadIpAddressCb, THREAD_IPADDR_TYPE_MLEID, NULL);
+    threadErr = thread_get_ipaddr(mThreadInstance, _ThreadIpAddressCb, THREAD_IPADDR_TYPE_MLEID, nullptr);
     VerifyOrExit(threadErr == THREAD_ERROR_NONE, error = CHIP_ERROR_INTERNAL);
 
     return CHIP_NO_ERROR;
diff --git a/src/platform/Tizen/WiFiManager.cpp b/src/platform/Tizen/WiFiManager.cpp
index 2f28086034e0f2..ccbaf1982ed384 100644
--- a/src/platform/Tizen/WiFiManager.cpp
+++ b/src/platform/Tizen/WiFiManager.cpp
@@ -18,11 +18,14 @@
 #include <platform/CHIPDeviceLayer.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+#include <memory>
+#include <wifi-manager.h>
+
 #include "MainLoop.h"
 #include "WiFiManager.h"
 
 namespace {
-const char * __WiFiDeviceStateToStr(wifi_manager_device_state_e state)
+static constexpr const char * __WiFiDeviceStateToStr(wifi_manager_device_state_e state)
 {
     switch (state)
     {
@@ -35,7 +38,7 @@ const char * __WiFiDeviceStateToStr(wifi_manager_device_state_e state)
     }
 }
 
-const char * __WiFiScanStateToStr(wifi_manager_scan_state_e state)
+static constexpr const char * __WiFiScanStateToStr(wifi_manager_scan_state_e state)
 {
     switch (state)
     {
@@ -48,7 +51,7 @@ const char * __WiFiScanStateToStr(wifi_manager_scan_state_e state)
     }
 }
 
-const char * __WiFiConnectionStateToStr(wifi_manager_connection_state_e state)
+static constexpr const char * __WiFiConnectionStateToStr(wifi_manager_connection_state_e state)
 {
     switch (state)
     {
@@ -67,7 +70,7 @@ const char * __WiFiConnectionStateToStr(wifi_manager_connection_state_e state)
     }
 }
 
-const char * __WiFiIPConflictStateToStr(wifi_manager_ip_conflict_state_e state)
+static constexpr const char * __WiFiIPConflictStateToStr(wifi_manager_ip_conflict_state_e state)
 {
     switch (state)
     {
@@ -80,7 +83,7 @@ const char * __WiFiIPConflictStateToStr(wifi_manager_ip_conflict_state_e state)
     }
 }
 
-const char * __WiFiModuleStateToStr(wifi_manager_module_state_e state)
+static constexpr const char * __WiFiModuleStateToStr(wifi_manager_module_state_e state)
 {
     switch (state)
     {
@@ -93,7 +96,7 @@ const char * __WiFiModuleStateToStr(wifi_manager_module_state_e state)
     }
 }
 
-const char * __WiFiSecurityTypeToStr(wifi_manager_security_type_e type)
+static constexpr const char * __WiFiSecurityTypeToStr(wifi_manager_security_type_e type)
 {
     switch (type)
     {
@@ -167,7 +170,7 @@ void WiFiManager::_IPConflictCb(char * mac, wifi_manager_ip_conflict_state_e ipC
 
 void WiFiManager::_ActivateCb(wifi_manager_error_e wifiErr, void * userData)
 {
-    GMainLoop * loop = (GMainLoop *) userData;
+    auto loop = reinterpret_cast<GMainLoop *>(userData);
 
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
@@ -175,7 +178,7 @@ void WiFiManager::_ActivateCb(wifi_manager_error_e wifiErr, void * userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: activate WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: activate WiFi [%s]", get_error_message(wifiErr));
     }
 
     g_main_loop_quit(loop);
@@ -183,7 +186,7 @@ void WiFiManager::_ActivateCb(wifi_manager_error_e wifiErr, void * userData)
 
 void WiFiManager::_DeactivateCb(wifi_manager_error_e wifiErr, void * userData)
 {
-    GMainLoop * loop = (GMainLoop *) userData;
+    auto loop = reinterpret_cast<GMainLoop *>(userData);
 
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
@@ -191,7 +194,7 @@ void WiFiManager::_DeactivateCb(wifi_manager_error_e wifiErr, void * userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: deactivate WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: deactivate WiFi [%s]", get_error_message(wifiErr));
     }
 
     g_main_loop_quit(loop);
@@ -199,22 +202,22 @@ void WiFiManager::_DeactivateCb(wifi_manager_error_e wifiErr, void * userData)
 
 void WiFiManager::_ScanFinishedCb(wifi_manager_error_e wifiErr, void * userData)
 {
-    GMainLoop * loop          = (GMainLoop *) userData;
-    wifi_manager_ap_h foundAp = NULL;
+    auto loop                 = reinterpret_cast<GMainLoop *>(userData);
+    wifi_manager_ap_h foundAp = nullptr;
 
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "WiFi scan finished");
 
         foundAp = sInstance._WiFiGetFoundAP();
-        if (foundAp != NULL)
+        if (foundAp != nullptr)
         {
             MainLoop::Instance().AsyncRequest(_WiFiConnect, static_cast<gpointer>(foundAp));
         }
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: scan WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: scan WiFi [%s]", get_error_message(wifiErr));
     }
 
     g_main_loop_quit(loop);
@@ -222,32 +225,31 @@ void WiFiManager::_ScanFinishedCb(wifi_manager_error_e wifiErr, void * userData)
 
 bool WiFiManager::_FoundAPCb(wifi_manager_ap_h ap, void * userData)
 {
-    bool cbRet                   = true;
-    int wifiErr                  = WIFI_MANAGER_ERROR_NONE;
-    char * essid                 = NULL;
-    bool isPassphraseRequired    = false;
-    wifi_manager_ap_h * clonedAp = (wifi_manager_ap_h *) userData;
+    bool cbRet                = true;
+    int wifiErr               = WIFI_MANAGER_ERROR_NONE;
+    char * essid              = nullptr;
+    bool isPassphraseRequired = false;
+    auto clonedAp             = reinterpret_cast<wifi_manager_ap_h *>(userData);
 
     wifiErr = wifi_manager_ap_get_essid(ap, &essid);
     VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE,
-                 ChipLogProgress(DeviceLayer, "FAIL: get AP essid [%s]", get_error_message(wifiErr)));
+                 ChipLogError(DeviceLayer, "FAIL: get AP essid [%s]", get_error_message(wifiErr)));
 
     VerifyOrExit(strcmp(sInstance.mWiFiSSID, essid) == 0, );
 
     wifiErr = wifi_manager_ap_is_passphrase_required(ap, &isPassphraseRequired);
     VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE,
-                 ChipLogProgress(DeviceLayer, "FAIL: get AP passphrase required [%s]", get_error_message(wifiErr)));
+                 ChipLogError(DeviceLayer, "FAIL: get AP passphrase required [%s]", get_error_message(wifiErr)));
 
     if (isPassphraseRequired)
     {
         wifiErr = wifi_manager_ap_set_passphrase(ap, sInstance.mWiFiKey);
         VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE,
-                     ChipLogProgress(DeviceLayer, "FAIL: set AP passphrase [%s]", get_error_message(wifiErr)));
+                     ChipLogError(DeviceLayer, "FAIL: set AP passphrase [%s]", get_error_message(wifiErr)));
     }
 
     wifiErr = wifi_manager_ap_clone(clonedAp, ap);
-    VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE,
-                 ChipLogProgress(DeviceLayer, "FAIL: clone AP [%s]", get_error_message(wifiErr)));
+    VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE, ChipLogError(DeviceLayer, "FAIL: clone AP [%s]", get_error_message(wifiErr)));
 
     cbRet = false;
 
@@ -260,7 +262,7 @@ bool WiFiManager::_FoundAPCb(wifi_manager_ap_h ap, void * userData)
 
 void WiFiManager::_ConnectedCb(wifi_manager_error_e wifiErr, void * userData)
 {
-    GMainLoop * loop = (GMainLoop *) userData;
+    auto loop = reinterpret_cast<GMainLoop *>(userData);
 
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
@@ -273,7 +275,7 @@ void WiFiManager::_ConnectedCb(wifi_manager_error_e wifiErr, void * userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: connect WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: connect WiFi [%s]", get_error_message(wifiErr));
         if (sInstance.mpConnectCallback != nullptr)
         {
             sInstance.mpConnectCallback->OnResult(NetworkCommissioning::Status::kUnknownError, CharSpan(), 0);
@@ -287,7 +289,7 @@ void WiFiManager::_ConnectedCb(wifi_manager_error_e wifiErr, void * userData)
 bool WiFiManager::_ConfigListCb(const wifi_manager_config_h config, void * userData)
 {
     int wifiErr                               = WIFI_MANAGER_ERROR_NONE;
-    char * name                               = NULL;
+    char * name                               = nullptr;
     wifi_manager_security_type_e securityType = WIFI_MANAGER_SECURITY_TYPE_NONE;
 
     wifi_manager_config_get_name(config, &name);
@@ -300,7 +302,7 @@ bool WiFiManager::_ConfigListCb(const wifi_manager_config_h config, void * userD
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: remove config [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: remove config [%s]", get_error_message(wifiErr));
     }
 
     g_free(name);
@@ -320,7 +322,7 @@ gboolean WiFiManager::_WiFiInitialize(gpointer userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: initialize WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: initialize WiFi [%s]", get_error_message(wifiErr));
         return false;
     }
 
@@ -340,7 +342,7 @@ void WiFiManager::_WiFiDeinitialize(void)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: deinitialize WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: deinitialize WiFi [%s]", get_error_message(wifiErr));
     }
 }
 
@@ -355,7 +357,7 @@ gboolean WiFiManager::_WiFiActivate(GMainLoop * mainLoop, gpointer userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: request WiFi activation [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: request WiFi activation [%s]", get_error_message(wifiErr));
         return false;
     }
 
@@ -373,7 +375,7 @@ gboolean WiFiManager::_WiFiDeactivate(GMainLoop * mainLoop, gpointer userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: request WiFi deactivation [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: request WiFi deactivation [%s]", get_error_message(wifiErr));
         return false;
     }
 
@@ -391,7 +393,7 @@ gboolean WiFiManager::_WiFiScan(GMainLoop * mainLoop, gpointer userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: request WiFi scan [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: request WiFi scan [%s]", get_error_message(wifiErr));
         return false;
     }
 
@@ -410,7 +412,7 @@ gboolean WiFiManager::_WiFiConnect(GMainLoop * mainLoop, gpointer userData)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: request WiFi connect [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: request WiFi connect [%s]", get_error_message(wifiErr));
         wifi_manager_ap_destroy(ap);
         return false;
     }
@@ -448,43 +450,43 @@ void WiFiManager::_WiFiSetCallbacks(void)
 {
     int wifiErr = WIFI_MANAGER_ERROR_NONE;
 
-    wifiErr = wifi_manager_set_device_state_changed_cb(mWiFiManagerHandle, _DeviceStateChangedCb, NULL);
+    wifiErr = wifi_manager_set_device_state_changed_cb(mWiFiManagerHandle, _DeviceStateChangedCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi device state changed callback");
     }
 
-    wifiErr = wifi_manager_set_module_state_changed_cb(mWiFiManagerHandle, _ModuleStateChangedCb, NULL);
+    wifiErr = wifi_manager_set_module_state_changed_cb(mWiFiManagerHandle, _ModuleStateChangedCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi module state changed callback");
     }
 
-    wifiErr = wifi_manager_set_connection_state_changed_cb(mWiFiManagerHandle, _ConnectionStateChangedCb, NULL);
+    wifiErr = wifi_manager_set_connection_state_changed_cb(mWiFiManagerHandle, _ConnectionStateChangedCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi connection state changed callback");
     }
 
-    wifiErr = wifi_manager_set_scan_state_changed_cb(mWiFiManagerHandle, _ScanStateChangedCb, NULL);
+    wifiErr = wifi_manager_set_scan_state_changed_cb(mWiFiManagerHandle, _ScanStateChangedCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi scan state changed callback");
     }
 
-    wifiErr = wifi_manager_set_rssi_level_changed_cb(mWiFiManagerHandle, _RssiLevelChangedCb, NULL);
+    wifiErr = wifi_manager_set_rssi_level_changed_cb(mWiFiManagerHandle, _RssiLevelChangedCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi rssi level changed callback");
     }
 
-    wifiErr = wifi_manager_set_background_scan_cb(mWiFiManagerHandle, _BackgroundScanCb, NULL);
+    wifiErr = wifi_manager_set_background_scan_cb(mWiFiManagerHandle, _BackgroundScanCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi background scan callback");
     }
 
-    wifiErr = wifi_manager_set_ip_conflict_cb(mWiFiManagerHandle, _IPConflictCb, NULL);
+    wifiErr = wifi_manager_set_ip_conflict_cb(mWiFiManagerHandle, _IPConflictCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Set WiFi IP conflict callback");
@@ -559,7 +561,7 @@ void WiFiManager::_WiFiSetConnectionState(wifi_manager_connection_state_e connec
 wifi_manager_ap_h WiFiManager::_WiFiGetFoundAP(void)
 {
     int wifiErr               = WIFI_MANAGER_ERROR_NONE;
-    wifi_manager_ap_h foundAp = NULL;
+    wifi_manager_ap_h foundAp = nullptr;
 
     wifiErr = wifi_manager_foreach_found_ap(mWiFiManagerHandle, _FoundAPCb, &foundAp);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
@@ -568,7 +570,7 @@ wifi_manager_ap_h WiFiManager::_WiFiGetFoundAP(void)
     }
     else
     {
-        ChipLogProgress(DeviceLayer, "FAIL: get found AP list [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: get found AP list [%s]", get_error_message(wifiErr));
     }
 
     return foundAp;
@@ -602,7 +604,7 @@ CHIP_ERROR WiFiManager::IsActivated(bool * isWiFiActivated)
     else
     {
         err = CHIP_ERROR_INCORRECT_STATE;
-        ChipLogProgress(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr));
     }
 
     return err;
@@ -617,7 +619,7 @@ CHIP_ERROR WiFiManager::Activate(void)
 
     wifiErr = wifi_manager_is_activated(sInstance.mWiFiManagerHandle, &isWiFiActivated);
     VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE, err = CHIP_ERROR_INCORRECT_STATE;
-                 ChipLogProgress(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
+                 ChipLogError(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
 
     VerifyOrExit(isWiFiActivated == false, ChipLogProgress(DeviceLayer, "WiFi is already activated"));
 
@@ -640,7 +642,7 @@ CHIP_ERROR WiFiManager::Deactivate(void)
 
     wifiErr = wifi_manager_is_activated(sInstance.mWiFiManagerHandle, &isWiFiActivated);
     VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE, err = CHIP_ERROR_INCORRECT_STATE;
-                 ChipLogProgress(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
+                 ChipLogError(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
 
     VerifyOrExit(isWiFiActivated == true, ChipLogProgress(DeviceLayer, "WiFi is already deactivated"));
 
@@ -661,21 +663,21 @@ CHIP_ERROR WiFiManager::Connect(const char * ssid, const char * key,
     int wifiErr               = WIFI_MANAGER_ERROR_NONE;
     bool isWiFiActivated      = false;
     bool dbusAsyncErr         = false;
-    wifi_manager_ap_h foundAp = NULL;
+    wifi_manager_ap_h foundAp = nullptr;
 
-    g_strlcpy(sInstance.mWiFiSSID, ssid, kMaxWiFiSSIDLength + 1);
-    g_strlcpy(sInstance.mWiFiKey, key, kMaxWiFiKeyLength + 1);
+    g_strlcpy(sInstance.mWiFiSSID, ssid, sizeof(sInstance.mWiFiSSID));
+    g_strlcpy(sInstance.mWiFiKey, key, sizeof(sInstance.mWiFiKey));
 
     wifiErr = wifi_manager_is_activated(sInstance.mWiFiManagerHandle, &isWiFiActivated);
     VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE, err = CHIP_ERROR_INCORRECT_STATE;
-                 ChipLogProgress(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
+                 ChipLogError(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
 
     VerifyOrExit(isWiFiActivated == true, ChipLogProgress(DeviceLayer, "WiFi is deactivated"));
 
     sInstance.mpConnectCallback = apCallback;
 
     foundAp = sInstance._WiFiGetFoundAP();
-    if (foundAp != NULL)
+    if (foundAp != nullptr)
     {
         dbusAsyncErr = MainLoop::Instance().AsyncRequest(_WiFiConnect, static_cast<gpointer>(foundAp));
         if (dbusAsyncErr == false)
@@ -701,18 +703,18 @@ CHIP_ERROR WiFiManager::Disconnect(const char * ssid)
     CHIP_ERROR err            = CHIP_NO_ERROR;
     int wifiErr               = WIFI_MANAGER_ERROR_NONE;
     bool isWiFiActivated      = false;
-    wifi_manager_ap_h foundAp = NULL;
+    wifi_manager_ap_h foundAp = nullptr;
 
-    g_strlcpy(sInstance.mWiFiSSID, ssid, kMaxWiFiSSIDLength + 1);
+    g_strlcpy(sInstance.mWiFiSSID, ssid, sizeof(sInstance.mWiFiSSID));
 
     wifiErr = wifi_manager_is_activated(sInstance.mWiFiManagerHandle, &isWiFiActivated);
     VerifyOrExit(wifiErr == WIFI_MANAGER_ERROR_NONE, err = CHIP_ERROR_INCORRECT_STATE;
-                 ChipLogProgress(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
+                 ChipLogError(DeviceLayer, "FAIL: check whether WiFi is activated [%s]", get_error_message(wifiErr)));
 
     VerifyOrExit(isWiFiActivated == true, ChipLogProgress(DeviceLayer, "WiFi is deactivated"));
 
     foundAp = sInstance._WiFiGetFoundAP();
-    VerifyOrExit(foundAp != NULL, );
+    VerifyOrExit(foundAp != nullptr, );
 
     wifiErr = wifi_manager_forget_ap(sInstance.mWiFiManagerHandle, foundAp);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
@@ -722,7 +724,7 @@ CHIP_ERROR WiFiManager::Disconnect(const char * ssid)
     else
     {
         err = CHIP_ERROR_INCORRECT_STATE;
-        ChipLogProgress(DeviceLayer, "FAIL: disconnect WiFi [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: disconnect WiFi [%s]", get_error_message(wifiErr));
     }
 
     wifi_manager_ap_destroy(foundAp);
@@ -736,7 +738,7 @@ CHIP_ERROR WiFiManager::RemoveAllConfigs(void)
     CHIP_ERROR err = CHIP_NO_ERROR;
     int wifiErr    = WIFI_MANAGER_ERROR_NONE;
 
-    wifiErr = wifi_manager_config_foreach_configuration(sInstance.mWiFiManagerHandle, _ConfigListCb, NULL);
+    wifiErr = wifi_manager_config_foreach_configuration(sInstance.mWiFiManagerHandle, _ConfigListCb, nullptr);
     if (wifiErr == WIFI_MANAGER_ERROR_NONE)
     {
         ChipLogProgress(DeviceLayer, "Get config list finished");
@@ -744,12 +746,43 @@ CHIP_ERROR WiFiManager::RemoveAllConfigs(void)
     else
     {
         err = CHIP_ERROR_INCORRECT_STATE;
-        ChipLogProgress(DeviceLayer, "FAIL: get config list [%s]", get_error_message(wifiErr));
+        ChipLogError(DeviceLayer, "FAIL: get config list [%s]", get_error_message(wifiErr));
     }
 
     return err;
 }
 
+CHIP_ERROR WiFiManager::GetDeviceMACAddress(uint8_t * macAddress, size_t macAddressLen)
+{
+    VerifyOrReturnError(macAddress != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(macAddressLen >= 6, CHIP_ERROR_INVALID_ARGUMENT);
+
+    char * macAddrStr = nullptr;
+    // Make sure that string allocated by wifi_manager_get_mac_address() will be freed
+    std::unique_ptr<char, decltype(&::free)> _{ macAddrStr, &::free };
+
+    int wifiErr = wifi_manager_get_mac_address(sInstance.mWiFiManagerHandle, &macAddrStr);
+    if (wifiErr == WIFI_MANAGER_ERROR_NOT_SUPPORTED)
+    {
+        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    }
+    if (wifiErr != WIFI_MANAGER_ERROR_NONE)
+    {
+        ChipLogError(DeviceLayer, "FAIL: get MAC address [%s]", get_error_message(wifiErr));
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    // Parse MAC address
+    if (sscanf(macAddrStr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macAddress[0], &macAddress[1], &macAddress[2], &macAddress[3],
+               &macAddress[4], &macAddress[5]) != 6)
+    {
+        ChipLogError(DeviceLayer, "FAIL: parse MAC address");
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR WiFiManager::GetDeviceState(wifi_manager_device_state_e * deviceState)
 {
     *deviceState = sInstance.mDeviceState;
@@ -797,7 +830,7 @@ CHIP_ERROR WiFiManager::GetModuleState(wifi_manager_module_state_e * moduleState
         else
         {
             err = CHIP_ERROR_INCORRECT_STATE;
-            ChipLogProgress(DeviceLayer, "FAIL: get WiFi module state [%s]", get_error_message(wifiErr));
+            ChipLogError(DeviceLayer, "FAIL: get WiFi module state [%s]", get_error_message(wifiErr));
         }
     }
 
@@ -824,7 +857,7 @@ CHIP_ERROR WiFiManager::GetConnectionState(wifi_manager_connection_state_e * con
         else
         {
             err = CHIP_ERROR_INCORRECT_STATE;
-            ChipLogProgress(DeviceLayer, "FAIL: get WiFi connection state [%s]", get_error_message(wifiErr));
+            ChipLogError(DeviceLayer, "FAIL: get WiFi connection state [%s]", get_error_message(wifiErr));
         }
     }
 
diff --git a/src/platform/Tizen/WiFiManager.h b/src/platform/Tizen/WiFiManager.h
index 02763efff03c47..f7cf2f6a3ba2e0 100644
--- a/src/platform/Tizen/WiFiManager.h
+++ b/src/platform/Tizen/WiFiManager.h
@@ -45,6 +45,7 @@ class WiFiManager
     CHIP_ERROR Disconnect(const char * ssid);
     CHIP_ERROR RemoveAllConfigs(void);
 
+    CHIP_ERROR GetDeviceMACAddress(uint8_t * macAddress, size_t macAddressLen);
     CHIP_ERROR GetDeviceState(wifi_manager_device_state_e * deviceState);
     CHIP_ERROR SetDeviceState(wifi_manager_device_state_e deviceState);
     CHIP_ERROR GetModuleState(wifi_manager_module_state_e * moduleState);
diff --git a/src/platform/Zephyr/BLEManagerImpl.cpp b/src/platform/Zephyr/BLEManagerImpl.cpp
index 5e7f3310c7b761..7ce3960580ce3d 100644
--- a/src/platform/Zephyr/BLEManagerImpl.cpp
+++ b/src/platform/Zephyr/BLEManagerImpl.cpp
@@ -30,6 +30,7 @@
 #include <ble/CHIPBleServiceData.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/internal/BLEManager.h>
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
@@ -79,7 +80,7 @@ struct bt_gatt_attr sChipoBleAttributes[] = {
                                BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
                                nullptr, BLEManagerImpl::HandleRXWrite, nullptr),
         BT_GATT_CHARACTERISTIC(&UUID128_CHIPoBLEChar_TX.uuid,
-                               BT_GATT_CHRC_NOTIFY,
+                               BT_GATT_CHRC_INDICATE,
                                BT_GATT_PERM_NONE,
                                nullptr, nullptr, nullptr),
         BT_GATT_CCC_MANAGED(&CHIPoBLEChar_TX_CCC, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
@@ -124,7 +125,7 @@ CHIP_ERROR InitRandomStaticAddress()
 
     error = bt_id_create(&addr, nullptr);
 
-    if (error)
+    if (error < 0)
     {
         ChipLogError(DeviceLayer, "Failed to create BLE identity: %d", error);
         return System::MapErrorZephyr(error);
@@ -469,7 +470,7 @@ CHIP_ERROR BLEManagerImpl::HandleGAPDisconnect(const ChipDeviceEvent * event)
 
     mGAPConns--;
 
-    // If notifications were enabled for this connection, record that they are now disabled and
+    // If indications were enabled for this connection, record that they are now disabled and
     // notify the BLE Layer of a disconnect.
     if (UnsetSubscribed(connEvent->BtConn))
     {
@@ -515,8 +516,8 @@ CHIP_ERROR BLEManagerImpl::HandleTXCharCCCDWrite(const ChipDeviceEvent * event)
 
     ChipLogDetail(DeviceLayer, "ConnId: 0x%02x, New CCCD value: 0x%04x", bt_conn_index(writeEvent->BtConn), writeEvent->Value);
 
-    // If the client has requested to enable notifications and if it is not yet subscribed
-    if (writeEvent->Value != 0 && SetSubscribed(writeEvent->BtConn))
+    // If the client has requested to enable indications and if it is not yet subscribed
+    if (writeEvent->Value == BT_GATT_CCC_INDICATE && SetSubscribed(writeEvent->BtConn))
     {
         // Alert the BLE layer that CHIPoBLE "subscribe" has been received and increment the bt_conn reference counter.
         HandleSubscribeReceived(writeEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_TX);
@@ -546,26 +547,28 @@ CHIP_ERROR BLEManagerImpl::HandleTXCharCCCDWrite(const ChipDeviceEvent * event)
 
 CHIP_ERROR BLEManagerImpl::HandleRXCharWrite(const ChipDeviceEvent * event)
 {
-    const BleRXWriteEventType * writeEvent = &event->Platform.BleRXWriteEvent;
+    const BleC1WriteEventType * c1WriteEvent = &event->Platform.BleC1WriteEvent;
 
-    ChipLogDetail(DeviceLayer, "Write request received for CHIPoBLE RX (ConnId 0x%02x)", bt_conn_index(writeEvent->BtConn));
+    ChipLogDetail(DeviceLayer, "Write request received for CHIPoBLE RX characteristic (ConnId 0x%02x)",
+                  bt_conn_index(c1WriteEvent->BtConn));
 
-    HandleWriteReceived(writeEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_RX,
-                        PacketBufferHandle::Adopt(writeEvent->Data));
-    bt_conn_unref(writeEvent->BtConn);
+    HandleWriteReceived(c1WriteEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_RX,
+                        PacketBufferHandle::Adopt(c1WriteEvent->Data));
+    bt_conn_unref(c1WriteEvent->BtConn);
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR BLEManagerImpl::HandleTXCharComplete(const ChipDeviceEvent * event)
 {
-    const BleTXCompleteEventType * completeEvent = &event->Platform.BleTXCompleteEvent;
+    const BleC2IndDoneEventType * c2IndDoneEvent = &event->Platform.BleC2IndDoneEvent;
 
-    ChipLogDetail(DeviceLayer, "Notification for CHIPoBLE TX done (ConnId 0x%02x)", bt_conn_index(completeEvent->BtConn));
+    ChipLogDetail(DeviceLayer, "Indication for CHIPoBLE TX characteristic done (ConnId 0x%02x, result 0x%02x)",
+                  bt_conn_index(c2IndDoneEvent->BtConn), c2IndDoneEvent->Result);
 
-    // Signal the BLE Layer that the outstanding notification is complete.
-    HandleIndicationConfirmation(completeEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_TX);
-    bt_conn_unref(completeEvent->BtConn);
+    // Signal the BLE Layer that the outstanding indication is complete.
+    HandleIndicationConfirmation(c2IndDoneEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_TX);
+    bt_conn_unref(c2IndDoneEvent->BtConn);
 
     return CHIP_NO_ERROR;
 }
@@ -581,7 +584,7 @@ CHIP_ERROR BLEManagerImpl::PrepareC3CharData()
     uint8_t rotatingDeviceIdUniqueId[ConfigurationManager::kRotatingDeviceIDUniqueIDLength] = {};
     MutableByteSpan rotatingDeviceIdUniqueIdSpan(rotatingDeviceIdUniqueId);
 
-    err = ConfigurationMgr().GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
+    err = DeviceLayer::GetDeviceInstanceInfoProvider()->GetRotatingDeviceIdUniqueId(rotatingDeviceIdUniqueIdSpan);
     SuccessOrExit(err);
     err = ConfigurationMgr().GetLifetimeCounter(additionalDataPayloadParams.rotatingDeviceIdLifetimeCounter);
     SuccessOrExit(err);
@@ -632,11 +635,11 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
         err = HandleTXCharCCCDWrite(event);
         break;
 
-    case DeviceEventType::kPlatformZephyrBleRXWrite:
+    case DeviceEventType::kPlatformZephyrBleC1WriteEvent:
         err = HandleRXCharWrite(event);
         break;
 
-    case DeviceEventType::kPlatformZephyrBleTXComplete:
+    case DeviceEventType::kPlatformZephyrBleC2IndDoneEvent:
         err = HandleTXCharComplete(event);
         break;
 
@@ -705,29 +708,29 @@ bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, cons
 bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId,
                                     PacketBufferHandle pBuf)
 {
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    int status                     = 0;
-    uint8_t index                  = bt_conn_index(conId);
-    bt_gatt_notify_params * params = &mNotifyParams[index];
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    int status                       = 0;
+    uint8_t index                    = bt_conn_index(conId);
+    bt_gatt_indicate_params * params = &mIndicateParams[index];
 
     VerifyOrExit(IsSubscribed(conId) == true, err = CHIP_ERROR_INVALID_ARGUMENT);
 
-    ChipLogDetail(DeviceLayer, "Sending notification for CHIPoBLE TX (ConnId %02x, len %u)", index, pBuf->DataLength());
+    ChipLogDetail(DeviceLayer, "Sending indication for CHIPoBLE TX characteristic (ConnId %02x, len %u)", index,
+                  pBuf->DataLength());
 
-    params->uuid      = nullptr;
-    params->attr      = &sChipoBleAttributes[kCHIPoBLE_CCC_AttributeIndex];
-    params->data      = pBuf->Start();
-    params->len       = pBuf->DataLength();
-    params->func      = HandleTXCompleted;
-    params->user_data = nullptr;
+    params->uuid = nullptr;
+    params->attr = &sChipoBleAttributes[kCHIPoBLE_CCC_AttributeIndex];
+    params->func = HandleTXIndicated;
+    params->data = pBuf->Start();
+    params->len  = pBuf->DataLength();
 
-    status = bt_gatt_notify_cb(conId, params);
+    status = bt_gatt_indicate(conId, params);
     VerifyOrExit(status == 0, err = MapErrorZephyr(status));
 
 exit:
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(DeviceLayer, "Sending notification for CHIPoBLE TX failed: %s", ErrorStr(err));
+        ChipLogError(DeviceLayer, "BLEManagerImpl::SendIndication() failed: %s", ErrorStr(err));
     }
 
     return err == CHIP_NO_ERROR;
@@ -803,9 +806,9 @@ ssize_t BLEManagerImpl::HandleRXWrite(struct bt_conn * conId, const struct bt_ga
     if (!packetBuf.IsNull())
     {
         // Arrange to post a CHIPoBLERXWriteEvent event to the CHIP queue.
-        event.Type                            = DeviceEventType::kPlatformZephyrBleRXWrite;
-        event.Platform.BleRXWriteEvent.BtConn = bt_conn_ref(conId);
-        event.Platform.BleRXWriteEvent.Data   = std::move(packetBuf).UnsafeRelease();
+        event.Type                            = DeviceEventType::kPlatformZephyrBleC1WriteEvent;
+        event.Platform.BleC1WriteEvent.BtConn = bt_conn_ref(conId);
+        event.Platform.BleC1WriteEvent.Data   = std::move(packetBuf).UnsafeRelease();
     }
 
     // If we failed to allocate a buffer, post a kPlatformZephyrBleOutOfBuffersEvent event.
@@ -823,7 +826,7 @@ ssize_t BLEManagerImpl::HandleTXCCCWrite(struct bt_conn * conId, const struct bt
 {
     ChipDeviceEvent event;
 
-    if (value != BT_GATT_CCC_NOTIFY && value != 0)
+    if (value != BT_GATT_CCC_INDICATE && value != 0)
     {
         return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
     }
@@ -837,12 +840,13 @@ ssize_t BLEManagerImpl::HandleTXCCCWrite(struct bt_conn * conId, const struct bt
     return sizeof(value);
 }
 
-void BLEManagerImpl::HandleTXCompleted(struct bt_conn * conId, void * /* param */)
+void BLEManagerImpl::HandleTXIndicated(struct bt_conn * conId, IndicationAttrType, uint8_t err)
 {
     ChipDeviceEvent event;
 
-    event.Type                               = DeviceEventType::kPlatformZephyrBleTXComplete;
-    event.Platform.BleTXCompleteEvent.BtConn = bt_conn_ref(conId);
+    event.Type                              = DeviceEventType::kPlatformZephyrBleC2IndDoneEvent;
+    event.Platform.BleC2IndDoneEvent.BtConn = bt_conn_ref(conId);
+    event.Platform.BleC2IndDoneEvent.Result = err;
 
     PlatformMgr().PostEventOrDie(&event);
 }
diff --git a/src/platform/Zephyr/BLEManagerImpl.h b/src/platform/Zephyr/BLEManagerImpl.h
index 5c2146f8580706..5a6d69d40fdbc2 100644
--- a/src/platform/Zephyr/BLEManagerImpl.h
+++ b/src/platform/Zephyr/BLEManagerImpl.h
@@ -31,6 +31,8 @@
 
 #include <lib/support/logging/CHIPLogging.h>
 
+#include <type_traits>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
@@ -47,6 +49,13 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
     friend BLEManager;
 
 private:
+    // As a result of https://github.com/zephyrproject-rtos/zephyr/issues/29357, BLE indication
+    // callback parameter type has changed in recent Zephyr revisions. Select the compatible type
+    // below to support both versions for now.
+    using IndicationAttrType =
+        std::conditional_t<std::is_same<bt_gatt_indicate_func_t, void (*)(bt_conn *, bt_gatt_indicate_params *, uint8_t)>::value,
+                           bt_gatt_indicate_params *, const bt_gatt_attr *>;
+
     // ===== Members that implement the BLEManager internal interface.
 
     CHIP_ERROR _Init(void);
@@ -101,7 +110,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
     uint16_t mGAPConns;
     CHIPoBLEServiceMode mServiceMode;
     bool mSubscribedConns[CONFIG_BT_MAX_CONN];
-    bt_gatt_notify_params mNotifyParams[CONFIG_BT_MAX_CONN];
+    bt_gatt_indicate_params mIndicateParams[CONFIG_BT_MAX_CONN];
     bt_conn_cb mConnCallbacks;
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
     PacketBufferHandle c3CharDataBufferHandle;
@@ -127,7 +136,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
     static void DriveBLEState(intptr_t arg);
 
     // Below callbacks run from the system workqueue context and have a limited stack capacity.
-    static void HandleTXCompleted(bt_conn * conn, void * param);
+    static void HandleTXIndicated(bt_conn * conn, IndicationAttrType attr, uint8_t err);
     static void HandleConnect(bt_conn * conn, uint8_t err);
     static void HandleDisconnect(bt_conn * conn, uint8_t reason);
     static void HandleBLEAdvertisementTimeout(System::Layer * layer, void * param);
diff --git a/src/platform/Zephyr/BUILD.gn b/src/platform/Zephyr/BUILD.gn
new file mode 100644
index 00000000000000..c4f2820b4da8df
--- /dev/null
+++ b/src/platform/Zephyr/BUILD.gn
@@ -0,0 +1,79 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/chip.gni")
+import("//build_overrides/zephyr.gni")
+
+import("${chip_root}/src/platform/Zephyr/args.gni")
+import("${chip_root}/src/platform/device.gni")
+
+assert(chip_device_platform == "zephyr")
+
+static_library("Zephyr") {
+  sources = [
+    "../SingletonConfigurationManager.cpp",
+    "BLEManagerImpl.cpp",
+    "BLEManagerImpl.h",
+    "BlePlatformConfig.h",
+    "CHIPDevicePlatformConfig.h",
+    "CHIPDevicePlatformEvent.h",
+    "CHIPPlatformConfig.h",
+    "ConfigurationManagerImpl.cpp",
+    "ConfigurationManagerImpl.h",
+    "ConnectivityManagerImpl.cpp",
+    "ConnectivityManagerImpl.h",
+    "DeviceNetworkProvisioningDelegateImpl.cpp",
+    "DeviceNetworkProvisioningDelegateImpl.h",
+    "DiagnosticDataProviderImpl.cpp",
+    "DiagnosticDataProviderImpl.h",
+    "InetPlatformConfig.h",
+    "KeyValueStoreManagerImpl.cpp",
+    "KeyValueStoreManagerImpl.h",
+    "Logging.cpp",
+    "PlatformManagerImpl.cpp",
+    "PlatformManagerImpl.h",
+    "SysHeapMalloc.h",
+    "SystemPlatformConfig.h",
+    "SystemTimeSupport.cpp",
+    "ZephyrConfig.cpp",
+    "ZephyrConfig.h",
+  ]
+
+  public_deps = [ "${chip_root}/src/platform:platform_base" ]
+
+  if (chip_enable_openthread) {
+    sources += [
+      "../OpenThread/OpenThreadUtils.cpp",
+      "ThreadStackManagerImpl.cpp",
+      "ThreadStackManagerImpl.h",
+    ]
+
+    if (chip_mdns == "platform") {
+      sources += [ "../OpenThread/DnssdImpl.cpp" ]
+      deps = [ "${chip_root}/src/lib/dnssd:platform_header" ]
+    }
+  }
+
+  if (chip_enable_nfc) {
+    sources += [
+      "NFCManagerImpl.cpp",
+      "NFCManagerImpl.h",
+    ]
+  }
+
+  if (chip_malloc_sys_heap) {
+    sources += [ "SysHeapMalloc.cpp" ]
+  }
+}
diff --git a/src/platform/nxp/k32w/k32w0/WarmPlatformConfig.h b/src/platform/Zephyr/BlePlatformConfig.h
similarity index 65%
rename from src/platform/nxp/k32w/k32w0/WarmPlatformConfig.h
rename to src/platform/Zephyr/BlePlatformConfig.h
index b249c23837f10a..9f49cd73dcfec3 100644
--- a/src/platform/nxp/k32w/k32w0/WarmPlatformConfig.h
+++ b/src/platform/Zephyr/BlePlatformConfig.h
@@ -1,8 +1,6 @@
 /*
  *
  *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Google LLC.
- *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,9 +17,8 @@
 
 /**
  *    @file
- *          Platform-specific configuration overrides for the Chip
- *          Addressing and Routing Module (WARM) on K32W platforms
- *          using the NXP SDK.
+ *          Platform-specific configuration overrides for the CHIP BLE
+ *          Layer on Zephyr platform.
  *
  */
 
@@ -29,11 +26,10 @@
 
 // ==================== Platform Adaptations ====================
 
-#define WARM_CONFIG_SUPPORT_THREAD 1
-#define WARM_CONFIG_SUPPORT_THREAD_ROUTING 0
-#define WARM_CONFIG_SUPPORT_LEGACY6LOWPAN_NETWORK 0
-#define WARM_CONFIG_SUPPORT_WIFI 0
-#define WARM_CONFIG_SUPPORT_CELLULAR 0
+struct bt_conn;
+#define BLE_CONNECTION_OBJECT bt_conn *
+#define BLE_CONNECTION_UNINITIALIZED nullptr
+#define BLE_MAX_RECEIVE_WINDOW_SIZE 5
 
 // ========== Platform-specific Configuration Overrides =========
 
diff --git a/src/platform/Zephyr/CHIPDevicePlatformConfig.h b/src/platform/Zephyr/CHIPDevicePlatformConfig.h
new file mode 100644
index 00000000000000..c591a51af4c070
--- /dev/null
+++ b/src/platform/Zephyr/CHIPDevicePlatformConfig.h
@@ -0,0 +1,132 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the chip Device Layer
+ *          on Zephyr platform.
+ */
+
+#pragma once
+
+#include "autoconf.h"
+
+// ==================== Platform Adaptations ====================
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID CONFIG_CHIP_DEVICE_VENDOR_ID
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
+#endif
+
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
+
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD
+
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_BT
+
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
+
+// ========== Platform-specific Configuration =========
+
+// These are configuration options that are unique to Zephyr platforms.
+// These can be overridden by the application as needed.
+
+#ifndef CHIP_DEVICE_CONFIG_SETTINGS_KEY
+/// Key for all Matter persistent data stored using the Zephyr Settings API
+#define CHIP_DEVICE_CONFIG_SETTINGS_KEY "mt"
+#endif // CHIP_DEVICE_CONFIG_SETTINGS_KEY
+
+#ifndef CHIP_DEVICE_CONFIG_OTA_REQUESTOR_REBOOT_DELAY_MS
+/// Delay between completing a firmware update download and reboot to apply the update
+#define CHIP_DEVICE_CONFIG_OTA_REQUESTOR_REBOOT_DELAY_MS 1000
+#endif // CHIP_DEVICE_CONFIG_OTA_REQUESTOR_REBOOT_DELAY_MS
+
+#ifndef CHIP_DEVICE_CONFIG_SERVER_SHUTDOWN_ACTIONS_SLEEP_MS
+/// Time to sleep after running server shutdown actions to let lower layers complete the actions.
+/// This may include transmitting packets created by the actions.
+#define CHIP_DEVICE_CONFIG_SERVER_SHUTDOWN_ACTIONS_SLEEP_MS 500
+#endif // CHIP_DEVICE_CONFIG_SERVER_SHUTDOWN_ACTIONS_SLEEP_MS
+
+#ifndef CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO
+#if !defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_NEWLIB_LIBC)
+/// Use mallinfo() to obtain the heap usage statistics exposed by SoftwareDiagnostics cluster attributes.
+#define CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO 1
+#endif // !defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_NEWLIB_LIBC)
+#endif // CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO
+
+// ========== Platform-specific Configuration Overrides =========
+
+#ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
+#define CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY (K_PRIO_PREEMPT(1))
+#endif // CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
+
+#ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
+#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192
+#endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
+
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
+#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
+
+#define CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED CONFIG_CHIP_DISABLE_CHIPOBLE_ADVERTISING_WHEN_PROVISIONED
+
+#define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0
+
+#ifndef CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART
+#define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART 0
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART
+#endif // CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART
+
+#ifdef CONFIG_CHIP_ENABLE_DNSSD_SRP
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
+#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES (CHIP_CONFIG_MAX_FABRICS + 1)
+#ifdef CONFIG_CHIP_ENABLE_DNS_CLIENT
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_COMMISSIONABLE_DISCOVERY 1
+#endif // CONFIG_CHIP_ENABLE_DNS_CLIENT
+#endif // CONFIG_CHIP_ENABLE_DNSSD_SRP
+
+#ifdef CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT
+#define CHIP_DEVICE_CONFIG_ENABLE_SED 1
+#define CHIP_DEVICE_CONFIG_THREAD_SSED CONFIG_CHIP_THREAD_SSED
+#endif // CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT
+
+#ifdef CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
+#endif // CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE
+
+#ifdef CONFIG_CHIP_DEVICE_TYPE
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
+#endif // CONFIG_CHIP_DEVICE_TYPE
+
+#ifdef CONFIG_CHIP_EXTENDED_DISCOVERY
+#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
+#endif // CONFIG_CHIP_EXTENDED_DISCOVERY
diff --git a/src/platform/Zephyr/CHIPDevicePlatformEvent.h b/src/platform/Zephyr/CHIPDevicePlatformEvent.h
index 9f658bf4095731..5687945287c2b1 100644
--- a/src/platform/Zephyr/CHIPDevicePlatformEvent.h
+++ b/src/platform/Zephyr/CHIPDevicePlatformEvent.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2022 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -49,8 +49,8 @@ enum InternalPlatformSpecificEventTypes
     kPlatformZephyrBleConnected,
     kPlatformZephyrBleDisconnected,
     kPlatformZephyrBleCCCWrite,
-    kPlatformZephyrBleRXWrite,
-    kPlatformZephyrBleTXComplete,
+    kPlatformZephyrBleC1WriteEvent,
+    kPlatformZephyrBleC2IndDoneEvent,
     kPlatformZephyrBleOutOfBuffersEvent,
 };
 
@@ -68,15 +68,16 @@ struct BleCCCWriteEventType
     uint16_t Value;
 };
 
-struct BleRXWriteEventType
+struct BleC1WriteEventType
 {
     bt_conn * BtConn;
     ::chip::System::PacketBuffer * Data;
 };
 
-struct BleTXCompleteEventType
+struct BleC2IndDoneEventType
 {
     bt_conn * BtConn;
+    uint8_t Result;
 };
 
 /**
@@ -88,8 +89,8 @@ struct ChipDevicePlatformEvent final
     {
         BleConnEventType BleConnEvent;
         BleCCCWriteEventType BleCCCWriteEvent;
-        BleRXWriteEventType BleRXWriteEvent;
-        BleTXCompleteEventType BleTXCompleteEvent;
+        BleC1WriteEventType BleC1WriteEvent;
+        BleC2IndDoneEventType BleC2IndDoneEvent;
     };
 };
 
diff --git a/src/platform/Zephyr/CHIPPlatformConfig.h b/src/platform/Zephyr/CHIPPlatformConfig.h
new file mode 100644
index 00000000000000..c463fb21da88f2
--- /dev/null
+++ b/src/platform/Zephyr/CHIPPlatformConfig.h
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for CHIP on
+ *          Zephyr platform.
+ */
+
+#pragma once
+
+// ==================== General Platform Adaptations ====================
+
+#define CHIP_CONFIG_ABORT() abort()
+
+#define CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE const char *
+#define CHIP_CONFIG_PERSISTED_STORAGE_MAX_KEY_LENGTH 2
+
+#define CHIP_CONFIG_LIFETIIME_PERSISTED_COUNTER_KEY "rc"
+
+// ==================== General Configuration Overrides ====================
+
+#ifndef CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
+#define CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS 8
+#endif // CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
+
+#ifndef CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
+#define CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS 8
+#endif // CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
+
+#ifndef CHIP_LOG_FILTERING
+#define CHIP_LOG_FILTERING 0
+#endif // CHIP_LOG_FILTERING
+
+#ifndef CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS
+#define CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS 1
+#endif // CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS
+
+#ifndef CHIP_CONFIG_MAX_FABRICS
+#define CHIP_CONFIG_MAX_FABRICS 5
+#endif
diff --git a/src/platform/Zephyr/ConfigurationManagerImpl.h b/src/platform/Zephyr/ConfigurationManagerImpl.h
index e678b5a5146868..5f331d14d81897 100644
--- a/src/platform/Zephyr/ConfigurationManagerImpl.h
+++ b/src/platform/Zephyr/ConfigurationManagerImpl.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2022 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/platform/Zephyr/ConnectivityManagerImpl.cpp b/src/platform/Zephyr/ConnectivityManagerImpl.cpp
new file mode 100644
index 00000000000000..c09181db994e8d
--- /dev/null
+++ b/src/platform/Zephyr/ConnectivityManagerImpl.cpp
@@ -0,0 +1,61 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <platform/ConnectivityManager.h>
+#include <platform/internal/BLEManager.h>
+
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include <platform/internal/GenericConnectivityManagerImpl_Thread.ipp>
+#endif
+
+using namespace ::chip;
+using namespace ::chip::TLV;
+using namespace ::chip::DeviceLayer::Internal;
+
+namespace chip {
+namespace DeviceLayer {
+
+ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;
+
+CHIP_ERROR ConnectivityManagerImpl::_Init()
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>::_Init();
+#endif
+
+    return CHIP_NO_ERROR;
+}
+
+void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
+{
+    // Forward the event to the generic base classes as needed.
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>::_OnPlatformEvent(event);
+#endif
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Zephyr/ConnectivityManagerImpl.h b/src/platform/Zephyr/ConnectivityManagerImpl.h
new file mode 100644
index 00000000000000..16e39cdb1b63db
--- /dev/null
+++ b/src/platform/Zephyr/ConnectivityManagerImpl.h
@@ -0,0 +1,103 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <platform/ConnectivityManager.h>
+#include <platform/internal/GenericConnectivityManagerImpl.h>
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#include <platform/internal/GenericConnectivityManagerImpl_BLE.h>
+#else
+#include <platform/internal/GenericConnectivityManagerImpl_NoBLE.h>
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include <platform/internal/GenericConnectivityManagerImpl_Thread.h>
+#else
+#include <platform/internal/GenericConnectivityManagerImpl_NoThread.h>
+#endif
+#include <platform/internal/GenericConnectivityManagerImpl_NoWiFi.h>
+
+#include <lib/support/logging/CHIPLogging.h>
+
+namespace chip {
+namespace Inet {
+class IPAddress;
+} // namespace Inet
+} // namespace chip
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * Concrete implementation of the ConnectivityManager singleton object for Zephyr platforms.
+ */
+class ConnectivityManagerImpl final : public ConnectivityManager,
+                                      public Internal::GenericConnectivityManagerImpl<ConnectivityManagerImpl>,
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+                                      public Internal::GenericConnectivityManagerImpl_BLE<ConnectivityManagerImpl>,
+#else
+                                      public Internal::GenericConnectivityManagerImpl_NoBLE<ConnectivityManagerImpl>,
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+                                      public Internal::GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>,
+#else
+                                      public Internal::GenericConnectivityManagerImpl_NoThread<ConnectivityManagerImpl>,
+#endif
+                                      public Internal::GenericConnectivityManagerImpl_NoWiFi<ConnectivityManagerImpl>
+{
+    // Allow the ConnectivityManager interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend class ConnectivityManager;
+
+private:
+    // ===== Members that implement the ConnectivityManager abstract interface.
+
+    CHIP_ERROR _Init(void);
+    void _OnPlatformEvent(const ChipDeviceEvent * event);
+
+    // ===== Members for internal use by the following friends.
+
+    friend ConnectivityManager & ConnectivityMgr(void);
+    friend ConnectivityManagerImpl & ConnectivityMgrImpl(void);
+
+    static ConnectivityManagerImpl sInstance;
+};
+
+/**
+ * Returns the public interface of the ConnectivityManager singleton object.
+ *
+ * chip applications should use this to access features of the ConnectivityManager object
+ * that are common to all platforms.
+ */
+inline ConnectivityManager & ConnectivityMgr(void)
+{
+    return ConnectivityManagerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the ConnectivityManager singleton object.
+ *
+ * chip applications can use this to gain access to features of the ConnectivityManager
+ * that are specific to the ESP32 platform.
+ */
+inline ConnectivityManagerImpl & ConnectivityMgrImpl(void)
+{
+    return ConnectivityManagerImpl::sInstance;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp
new file mode 100644
index 00000000000000..2e75cfc0022518
--- /dev/null
+++ b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -0,0 +1,44 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "DeviceNetworkProvisioningDelegateImpl.h"
+
+#if CHIP_ENABLE_OPENTHREAD
+#include <platform/ThreadStackManager.h>
+#endif
+
+namespace chip {
+namespace DeviceLayer {
+
+CHIP_ERROR
+DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData)
+{
+#if CHIP_ENABLE_OPENTHREAD
+    CHIP_ERROR error = CHIP_NO_ERROR;
+
+    SuccessOrExit(error = ThreadStackMgr().SetThreadEnabled(false));
+    SuccessOrExit(error = ThreadStackMgr().SetThreadProvision(threadData));
+    SuccessOrExit(error = ThreadStackMgr().SetThreadEnabled(true));
+exit:
+    return error;
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif // CHIP_ENABLE_OPENTHREAD
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h
new file mode 100644
index 00000000000000..e799358e4b7536
--- /dev/null
+++ b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h
@@ -0,0 +1,43 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+namespace Internal {
+
+template <class ImplClass>
+class GenericDeviceNetworkProvisioningDelegateImpl;
+
+} // namespace Internal
+
+class DeviceNetworkProvisioningDelegateImpl final
+    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+{
+    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
+
+private:
+    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData);
+};
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
index 6419846a0c7d22..e3cee6927ea74b 100644
--- a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2022 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 /**
  *    @file
  *          Provides an implementation of the DiagnosticDataProvider object
- *          for Zephy platform.
+ *          for Zephyr platform.
  */
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -114,6 +114,15 @@ inline DiagnosticDataProviderImpl::DiagnosticDataProviderImpl() : mBootReason(De
     ChipLogDetail(DeviceLayer, "Boot reason: %u", static_cast<uint16_t>(mBootReason));
 }
 
+bool DiagnosticDataProviderImpl::SupportsWatermarks()
+{
+#ifdef CONFIG_CHIP_MALLOC_SYS_HEAP
+    return true;
+#else
+    return false;
+#endif
+}
+
 CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapFree(uint64_t & currentHeapFree)
 {
 #ifdef CONFIG_CHIP_MALLOC_SYS_HEAP
@@ -153,14 +162,17 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & cu
     Malloc::Stats stats;
     ReturnErrorOnFailure(Malloc::GetStats(stats));
 
-    // TODO: use the maximum usage once that is implemented in Zephyr
-    currentHeapHighWatermark = stats.used;
+    currentHeapHighWatermark = stats.maxUsed;
     return CHIP_NO_ERROR;
-#elif CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO
-    // ARM newlib does not provide a way to obtain the peak heap usage, so for now just return
-    // the amount of memory allocated from the system which should be an upper bound of the peak
-    // usage provided that the heap is not very fragmented.
-    currentHeapHighWatermark = mallinfo().arena;
+#else
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#endif
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::ResetWatermarks()
+{
+#ifdef CONFIG_CHIP_MALLOC_SYS_HEAP
+    Malloc::ResetMaxStats();
     return CHIP_NO_ERROR;
 #else
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.h b/src/platform/Zephyr/DiagnosticDataProviderImpl.h
index a90cf4eb43e24d..b23fb5778466d7 100644
--- a/src/platform/Zephyr/DiagnosticDataProviderImpl.h
+++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.h
@@ -39,9 +39,11 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 
     // ===== Methods that implement the PlatformManager abstract interface.
 
+    bool SupportsWatermarks() override;
     CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
     CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
     CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
+    CHIP_ERROR ResetWatermarks() override;
 
     CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override;
     CHIP_ERROR GetUpTime(uint64_t & upTime) override;
diff --git a/src/platform/Zephyr/InetPlatformConfig.h b/src/platform/Zephyr/InetPlatformConfig.h
new file mode 100644
index 00000000000000..a5d03a9d0614d5
--- /dev/null
+++ b/src/platform/Zephyr/InetPlatformConfig.h
@@ -0,0 +1,46 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP Inet
+ *          Layer on Zephyr platform.
+ *
+ */
+
+#pragma once
+
+// ==================== Platform Adaptations ====================
+
+#ifndef INET_CONFIG_ENABLE_IPV4
+#error Inet IPv4 configuration should be configured at build generation time
+#endif
+
+// ========== Platform-specific Configuration Overrides =========
+
+#ifndef INET_CONFIG_NUM_TCP_ENDPOINTS
+#define INET_CONFIG_NUM_TCP_ENDPOINTS 4
+#endif // INET_CONFIG_NUM_TCP_ENDPOINTS
+
+#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
+#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
+#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
+
+// Although Zephyr defines SO_BINDTODEVICE, it's currently unimplemented
+#ifdef HAVE_SO_BINDTODEVICE
+#undef HAVE_SO_BINDTODEVICE
+#endif // HAVE_SO_BINDTODEVICE
diff --git a/src/platform/Zephyr/PlatformManagerImpl.cpp b/src/platform/Zephyr/PlatformManagerImpl.cpp
index cea8a956b4806a..32380be2153f99 100644
--- a/src/platform/Zephyr/PlatformManagerImpl.cpp
+++ b/src/platform/Zephyr/PlatformManagerImpl.cpp
@@ -47,7 +47,7 @@ static k_timer sOperationalHoursSavingTimer;
 #if !CONFIG_NORDIC_SECURITY_BACKEND
 static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
 {
-    const struct device * entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
+    const struct device * entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
     int ret                       = entropy_get_entropy(entropy, output, len);
 
     if (ret == 0)
diff --git a/src/platform/Zephyr/SysHeapMalloc.cpp b/src/platform/Zephyr/SysHeapMalloc.cpp
index 68f8d2156ee6a0..e65ec8a44b7c7a 100644
--- a/src/platform/Zephyr/SysHeapMalloc.cpp
+++ b/src/platform/Zephyr/SysHeapMalloc.cpp
@@ -134,12 +134,18 @@ CHIP_ERROR GetStats(Stats & stats)
     sys_heap_runtime_stats sysHeapStats;
     ReturnErrorOnFailure(System::MapErrorZephyr(sys_heap_runtime_stats_get(&sHeap, &sysHeapStats)));
 
-    stats.free = sysHeapStats.free_bytes;
-    stats.used = sysHeapStats.allocated_bytes;
+    stats.free    = sysHeapStats.free_bytes;
+    stats.used    = sysHeapStats.allocated_bytes;
+    stats.maxUsed = sysHeapStats.max_allocated_bytes;
 
     return CHIP_NO_ERROR;
 }
 
+void ResetMaxStats()
+{
+    (void) sys_heap_runtime_stats_reset_max(&sHeap);
+}
+
 #endif // CONFIG_SYS_HEAP_RUNTIME_STATS
 
 } // namespace Malloc
diff --git a/src/platform/Zephyr/SysHeapMalloc.h b/src/platform/Zephyr/SysHeapMalloc.h
index 3ee6f50ab0d3da..ca2383027e8508 100644
--- a/src/platform/Zephyr/SysHeapMalloc.h
+++ b/src/platform/Zephyr/SysHeapMalloc.h
@@ -27,6 +27,7 @@ struct Stats
 {
     size_t free;
     size_t used;
+    size_t maxUsed;
 };
 
 void * Malloc(size_t size);
@@ -34,6 +35,7 @@ void * Calloc(size_t num, size_t size);
 void * Realloc(void * mem, size_t size);
 void Free(void * mem);
 CHIP_ERROR GetStats(Stats & stats);
+void ResetMaxStats();
 
 } // namespace Malloc
 } // namespace DeviceLayer
diff --git a/src/platform/Zephyr/SystemPlatformConfig.h b/src/platform/Zephyr/SystemPlatformConfig.h
new file mode 100644
index 00000000000000..6fa52c1728c093
--- /dev/null
+++ b/src/platform/Zephyr/SystemPlatformConfig.h
@@ -0,0 +1,58 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP System
+ *          Layer on Zephyr platform.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+namespace chip {
+namespace DeviceLayer {
+struct ChipDeviceEvent;
+} // namespace DeviceLayer
+} // namespace chip
+
+// ==================== Platform Adaptations ====================
+
+#define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 1
+#define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 0
+#define CHIP_SYSTEM_CONFIG_NO_LOCKING 0
+
+#ifndef CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
+#define CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS 0
+#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
+
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
+#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 0
+#else // CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
+#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
+#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
+
+#define CHIP_SYSTEM_CONFIG_USE_LWIP 0
+#define CHIP_SYSTEM_CONFIG_USE_SOCKETS 1
+
+// ========== Platform-specific Configuration Overrides =========
+
+#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
+#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
+#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
diff --git a/src/platform/Zephyr/ThreadStackManagerImpl.cpp b/src/platform/Zephyr/ThreadStackManagerImpl.cpp
index d6633007992476..4d6913b7f2c0b7 100644
--- a/src/platform/Zephyr/ThreadStackManagerImpl.cpp
+++ b/src/platform/Zephyr/ThreadStackManagerImpl.cpp
@@ -77,26 +77,5 @@ void ThreadStackManagerImpl::_UnlockThreadStack()
     openthread_api_mutex_unlock(openthread_get_default_context());
 }
 
-void ThreadStackManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
-{
-    Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::_OnPlatformEvent(event);
-
-    if (event->Type == DeviceEventType::kThreadStateChange && event->ThreadStateChange.RoleChanged)
-    {
-        const bool isAttached = IsThreadAttached();
-        VerifyOrReturn(isAttached != mIsAttached);
-
-        ChipDeviceEvent attachEvent;
-        attachEvent.Type                            = DeviceEventType::kThreadConnectivityChange;
-        attachEvent.ThreadConnectivityChange.Result = isAttached ? kConnectivity_Established : kConnectivity_Lost;
-
-        CHIP_ERROR error = PlatformMgr().PostEvent(&attachEvent);
-        VerifyOrReturn(error == CHIP_NO_ERROR,
-                       ChipLogError(DeviceLayer, "Failed to post Thread connectivity change: %" CHIP_ERROR_FORMAT, error.Format()));
-
-        mIsAttached = isAttached;
-    }
-}
-
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/Zephyr/ThreadStackManagerImpl.h b/src/platform/Zephyr/ThreadStackManagerImpl.h
index 5ee09e6c7a738b..19e5d7ecc643dc 100644
--- a/src/platform/Zephyr/ThreadStackManagerImpl.h
+++ b/src/platform/Zephyr/ThreadStackManagerImpl.h
@@ -74,7 +74,6 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that override the GenericThreadStackManagerImpl_OpenThread abstract interface.
 
     void _ProcessThreadActivity() {}
-    void _OnPlatformEvent(const ChipDeviceEvent * event);
 
     //} // namespace Internal
 
@@ -87,8 +86,6 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     static ThreadStackManagerImpl sInstance;
 
     // ===== Private members for use by this class only.
-
-    bool mIsAttached = false;
 };
 
 /**
diff --git a/src/platform/Zephyr/args.gni b/src/platform/Zephyr/args.gni
new file mode 100644
index 00000000000000..cc9de74cddd561
--- /dev/null
+++ b/src/platform/Zephyr/args.gni
@@ -0,0 +1,5 @@
+chip_device_platform = "zephyr"
+
+declare_args() {
+  chip_malloc_sys_heap = false
+}
diff --git a/src/platform/android/AndroidChipPlatform-JNI.cpp b/src/platform/android/AndroidChipPlatform-JNI.cpp
index 021849256df7b4..f86482994cb308 100644
--- a/src/platform/android/AndroidChipPlatform-JNI.cpp
+++ b/src/platform/android/AndroidChipPlatform-JNI.cpp
@@ -230,19 +230,26 @@ JNI_METHOD(void, setDiagnosticDataProviderManager)(JNIEnv * env, jclass self, jo
     chip::DeviceLayer::DiagnosticDataProviderImpl::GetDefaultInstance().InitializeWithObject(manager);
 }
 
-// for ServiceResolver
-JNI_METHOD(void, nativeSetServiceResolver)(JNIEnv * env, jclass self, jobject resolver, jobject chipMdnsCallback)
+// for ServiceResolver and  ServiceBrowser
+JNI_METHOD(void, nativeSetDnssdDelegates)(JNIEnv * env, jclass self, jobject resolver, jobject browser, jobject chipMdnsCallback)
 {
     chip::DeviceLayer::StackLock lock;
-    chip::Dnssd::InitializeWithObjects(resolver, chipMdnsCallback);
+    chip::Dnssd::InitializeWithObjects(resolver, browser, chipMdnsCallback);
 }
 
 JNI_MDNSCALLBACK_METHOD(void, handleServiceResolve)
-(JNIEnv * env, jclass self, jstring instanceName, jstring serviceType, jstring address, jint port, jlong callbackHandle,
- jlong contextHandle)
+(JNIEnv * env, jclass self, jstring instanceName, jstring serviceType, jstring hostName, jstring address, jint port,
+ jobject attributes, jlong callbackHandle, jlong contextHandle)
 {
     using ::chip::Dnssd::HandleResolve;
-    HandleResolve(instanceName, serviceType, address, port, callbackHandle, contextHandle);
+    HandleResolve(instanceName, serviceType, hostName, address, port, attributes, callbackHandle, contextHandle);
+}
+
+JNI_MDNSCALLBACK_METHOD(void, handleServiceBrowse)
+(JNIEnv * env, jclass self, jobjectArray instanceName, jstring serviceType, jlong callbackHandle, jlong contextHandle)
+{
+    using ::chip::Dnssd::HandleBrowse;
+    HandleBrowse(instanceName, serviceType, callbackHandle, contextHandle);
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
diff --git a/src/platform/android/BUILD.gn b/src/platform/android/BUILD.gn
index 0e8e75d2ac5ed2..510f5de71dd3c3 100644
--- a/src/platform/android/BUILD.gn
+++ b/src/platform/android/BUILD.gn
@@ -87,9 +87,11 @@ android_library("java") {
     "java/chip/platform/DiagnosticDataProviderImpl.java",
     "java/chip/platform/KeyValueStoreManager.java",
     "java/chip/platform/NetworkInterface.java",
+    "java/chip/platform/NsdManagerServiceBrowser.java",
     "java/chip/platform/NsdManagerServiceResolver.java",
     "java/chip/platform/PreferencesConfigurationManager.java",
     "java/chip/platform/PreferencesKeyValueStoreManager.java",
+    "java/chip/platform/ServiceBrowser.java",
     "java/chip/platform/ServiceResolver.java",
   ]
 
diff --git a/src/platform/android/ConfigurationManagerImpl.cpp b/src/platform/android/ConfigurationManagerImpl.cpp
index a34fc504e2c50d..f8d69be236fcc6 100644
--- a/src/platform/android/ConfigurationManagerImpl.cpp
+++ b/src/platform/android/ConfigurationManagerImpl.cpp
@@ -223,20 +223,6 @@ CHIP_ERROR ConfigurationManagerImpl::GetSoftwareVersionString(char * buf, size_t
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConfigurationManagerImpl::GetHardwareVersionString(char * buf, size_t bufSize)
-{
-    CHIP_ERROR err;
-    size_t hardwareVersionLen = 0; // without counting null-terminator
-    err = ReadConfigValueStr(AndroidConfig::kConfigKey_HardwareVersionString, buf, bufSize, hardwareVersionLen);
-    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-    {
-        ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
-        strcpy(buf, CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING);
-    }
-
-    return CHIP_NO_ERROR;
-}
-
 CHIP_ERROR ConfigurationManagerImpl::GetPartNumber(char * buf, size_t bufSize)
 {
     size_t dateLen;
diff --git a/src/platform/android/ConfigurationManagerImpl.h b/src/platform/android/ConfigurationManagerImpl.h
index 42c5c30c4b174c..c28c246d3ec534 100644
--- a/src/platform/android/ConfigurationManagerImpl.h
+++ b/src/platform/android/ConfigurationManagerImpl.h
@@ -42,7 +42,6 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     static ConfigurationManagerImpl & GetDefaultInstance();
     CHIP_ERROR GetProductId(uint16_t & productId) override;
     CHIP_ERROR GetProductName(char * buf, size_t bufSize) override;
-    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override;
     CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize) override;
     CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer) override;
     CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override;
diff --git a/src/platform/android/DnssdImpl.cpp b/src/platform/android/DnssdImpl.cpp
index 0fa4397d8f39ad..244032497456dc 100644
--- a/src/platform/android/DnssdImpl.cpp
+++ b/src/platform/android/DnssdImpl.cpp
@@ -29,6 +29,7 @@
 
 #include <cstddef>
 #include <jni.h>
+#include <memory>
 #include <string>
 
 namespace chip {
@@ -37,11 +38,16 @@ namespace Dnssd {
 using namespace chip::Platform;
 
 namespace {
-jobject sResolverObject         = nullptr;
-jobject sMdnsCallbackObject     = nullptr;
-jmethodID sResolveMethod        = nullptr;
-jmethodID sPublishMethod        = nullptr;
-jmethodID sRemoveServicesMethod = nullptr;
+jobject sResolverObject           = nullptr;
+jobject sBrowserObject            = nullptr;
+jobject sMdnsCallbackObject       = nullptr;
+jmethodID sResolveMethod          = nullptr;
+jmethodID sBrowseMethod           = nullptr;
+jmethodID sGetTextEntryKeysMethod = nullptr;
+jmethodID sGetTextEntryDataMethod = nullptr;
+jclass sMdnsCallbackClass         = nullptr;
+jmethodID sPublishMethod          = nullptr;
+jmethodID sRemoveServicesMethod   = nullptr;
 } // namespace
 
 // Implementation of functions declared in lib/dnssd/platform/Dnssd.h
@@ -142,8 +148,29 @@ CHIP_ERROR ChipDnssdFinalizeServiceUpdate()
 CHIP_ERROR ChipDnssdBrowse(const char * type, DnssdServiceProtocol protocol, Inet::IPAddressType addressType,
                            Inet::InterfaceId interface, DnssdBrowseCallback callback, void * context)
 {
-    // TODO: Implement DNS-SD browse for Android
-    return CHIP_ERROR_NOT_IMPLEMENTED;
+    VerifyOrReturnError(type != nullptr && callback != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(sBrowserObject != nullptr && sBrowseMethod != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(sMdnsCallbackObject != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    std::string serviceType = type;
+    serviceType += '.';
+    serviceType += (protocol == DnssdServiceProtocol::kDnssdProtocolUdp ? "_udp" : "_tcp");
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    UtfString jniServiceType(env, serviceType.c_str());
+
+    env->CallVoidMethod(sBrowserObject, sBrowseMethod, jniServiceType.jniValue(), reinterpret_cast<jlong>(callback),
+                        reinterpret_cast<jlong>(context), sMdnsCallbackObject);
+
+    if (env->ExceptionCheck())
+    {
+        ChipLogError(Discovery, "Java exception in ChipDnssdBrowse");
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return CHIP_JNI_ERROR_EXCEPTION_THROWN;
+    }
+
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR ChipDnssdResolve(DnssdService * service, Inet::InterfaceId interface, DnssdResolveCallback callback, void * context)
@@ -179,23 +206,52 @@ CHIP_ERROR ChipDnssdResolve(DnssdService * service, Inet::InterfaceId interface,
 
 // Implemention of Java-specific functions
 
-void InitializeWithObjects(jobject resolverObject, jobject mdnsCallbackObject)
+void InitializeWithObjects(jobject resolverObject, jobject browserObject, jobject mdnsCallbackObject)
 {
     JNIEnv * env         = JniReferences::GetInstance().GetEnvForCurrentThread();
     sResolverObject      = env->NewGlobalRef(resolverObject);
+    sBrowserObject       = env->NewGlobalRef(browserObject);
     sMdnsCallbackObject  = env->NewGlobalRef(mdnsCallbackObject);
     jclass resolverClass = env->GetObjectClass(sResolverObject);
+    jclass browserClass  = env->GetObjectClass(browserObject);
+    sMdnsCallbackClass   = env->GetObjectClass(sMdnsCallbackObject);
 
+    VerifyOrReturn(browserClass != nullptr, ChipLogError(Discovery, "Failed to get Browse Java class"));
     VerifyOrReturn(resolverClass != nullptr, ChipLogError(Discovery, "Failed to get Resolver Java class"));
 
+    sGetTextEntryKeysMethod = env->GetMethodID(sMdnsCallbackClass, "getTextEntryKeys", "(Ljava/util/Map;)[Ljava/lang/String;");
+
+    sGetTextEntryDataMethod = env->GetMethodID(sMdnsCallbackClass, "getTextEntryData", "(Ljava/util/Map;Ljava/lang/String;)[B");
+
     sResolveMethod =
         env->GetMethodID(resolverClass, "resolve", "(Ljava/lang/String;Ljava/lang/String;JJLchip/platform/ChipMdnsCallback;)V");
+
+    sBrowseMethod = env->GetMethodID(browserClass, "browse", "(Ljava/lang/String;JJLchip/platform/ChipMdnsCallback;)V");
+
     if (sResolveMethod == nullptr)
     {
         ChipLogError(Discovery, "Failed to access Resolver 'resolve' method");
         env->ExceptionClear();
     }
 
+    if (sBrowseMethod == nullptr)
+    {
+        ChipLogError(Discovery, "Failed to access Discover 'browse' method");
+        env->ExceptionClear();
+    }
+
+    if (sGetTextEntryKeysMethod == nullptr)
+    {
+        ChipLogError(Discovery, "Failed to access MdnsCallback 'getTextEntryKeys' method");
+        env->ExceptionClear();
+    }
+
+    if (sGetTextEntryDataMethod == nullptr)
+    {
+        ChipLogError(Discovery, "Failed to access MdnsCallback 'getTextEntryData' method");
+        env->ExceptionClear();
+    }
+
     sPublishMethod =
         env->GetMethodID(resolverClass, "publish",
                          "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I[Ljava/lang/String;[[B[Ljava/lang/String;)V");
@@ -213,7 +269,8 @@ void InitializeWithObjects(jobject resolverObject, jobject mdnsCallbackObject)
     }
 }
 
-void HandleResolve(jstring instanceName, jstring serviceType, jstring address, jint port, jlong callbackHandle, jlong contextHandle)
+void HandleResolve(jstring instanceName, jstring serviceType, jstring hostName, jstring address, jint port, jobject textEntries,
+                   jlong callbackHandle, jlong contextHandle)
 {
     VerifyOrReturn(callbackHandle != 0, ChipLogError(Discovery, "HandleResolve called with callback equal to nullptr"));
 
@@ -230,6 +287,7 @@ void HandleResolve(jstring instanceName, jstring serviceType, jstring address, j
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     JniUtfString jniInstanceName(env, instanceName);
     JniUtfString jniServiceType(env, serviceType);
+    JniUtfString jnihostName(env, hostName);
     JniUtfString jniAddress(env, address);
     Inet::IPAddress ipAddress;
 
@@ -240,10 +298,107 @@ void HandleResolve(jstring instanceName, jstring serviceType, jstring address, j
 
     DnssdService service = {};
     CopyString(service.mName, jniInstanceName.c_str());
+    CopyString(service.mHostName, jnihostName.c_str());
     CopyString(service.mType, jniServiceType.c_str());
-    service.mPort = static_cast<uint16_t>(port);
+    service.mPort          = static_cast<uint16_t>(port);
+    service.mTextEntrySize = 0;
+    service.mTextEntries   = nullptr;
+
+    // Note on alloc/free memory use
+    // We are only allocating the entries list and the data field of each entry
+    // so we free these in the exit section
+    if (textEntries != nullptr)
+    {
+        jobjectArray keys   = (jobjectArray) env->CallObjectMethod(sMdnsCallbackObject, sGetTextEntryKeysMethod, textEntries);
+        size_t size         = env->GetArrayLength(keys);
+        TextEntry * entries = new (std::nothrow) TextEntry[size];
+        VerifyOrExit(entries != nullptr, ChipLogError(Discovery, "entries alloc failure"));
+        memset(entries, 0, sizeof(entries[0]) * size);
+
+        service.mTextEntries = entries;
+        for (size_t i = 0; i < size; i++)
+        {
+            jstring jniKeyObject = (jstring) env->GetObjectArrayElement(keys, i);
+            JniUtfString key(env, jniKeyObject);
+            entries[i].mKey = strdup(key.c_str());
+
+            jbyteArray datas =
+                (jbyteArray) env->CallObjectMethod(sMdnsCallbackObject, sGetTextEntryDataMethod, textEntries, jniKeyObject);
+            if (datas != nullptr)
+            {
+                size_t dataSize = env->GetArrayLength(datas);
+                uint8_t * data  = new (std::nothrow) uint8_t[dataSize];
+                VerifyOrExit(data != nullptr, ChipLogError(Discovery, "data alloc failure"));
+
+                jbyte * jnidata = env->GetByteArrayElements(datas, nullptr);
+                for (size_t j = 0; j < dataSize; j++)
+                {
+                    data[j] = static_cast<uint8_t>(jnidata[j]);
+                }
+                entries[i].mDataSize = dataSize;
+                entries[i].mData     = data;
+
+                ChipLogProgress(Discovery, " ----- entry [%u] : %s %s\n", static_cast<unsigned int>(i), entries[i].mKey,
+                                std::string(reinterpret_cast<char *>(data), dataSize).c_str());
+            }
+            else
+            {
+                ChipLogProgress(Discovery, " ----- entry [%u] : %s NULL\n", static_cast<unsigned int>(i), entries[i].mKey);
+
+                entries[i].mDataSize = 0;
+                entries[i].mData     = nullptr;
+            }
+            service.mTextEntrySize = size;
+        }
+    }
 
+exit:
     dispatch(CHIP_NO_ERROR, &service, &ipAddress);
+
+    if (service.mTextEntries != nullptr)
+    {
+        size_t size = service.mTextEntrySize;
+        for (size_t i = 0; i < size; i++)
+        {
+            delete[] service.mTextEntries[i].mKey;
+            if (service.mTextEntries[i].mData != nullptr)
+            {
+                delete[] service.mTextEntries[i].mData;
+            }
+        }
+        delete[] service.mTextEntries;
+    }
+}
+
+void HandleBrowse(jobjectArray instanceName, jstring serviceType, jlong callbackHandle, jlong contextHandle)
+{
+    VerifyOrReturn(callbackHandle != 0, ChipLogError(Discovery, "HandleDiscover called with callback equal to nullptr"));
+
+    const auto dispatch = [callbackHandle, contextHandle](CHIP_ERROR error, DnssdService * service = nullptr, size_t size = 0) {
+        DeviceLayer::StackLock lock;
+        DnssdBrowseCallback callback = reinterpret_cast<DnssdBrowseCallback>(callbackHandle);
+        callback(reinterpret_cast<void *>(contextHandle), service, size, error);
+    };
+
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    JniUtfString jniServiceType(env, serviceType);
+
+    VerifyOrReturn(strlen(jniServiceType.c_str()) <= kDnssdTypeAndProtocolMaxSize, dispatch(CHIP_ERROR_INVALID_ARGUMENT));
+
+    size_t size            = env->GetArrayLength(instanceName);
+    DnssdService * service = new DnssdService[size];
+    for (size_t i = 0; i < size; i++)
+    {
+        JniUtfString jniInstanceName(env, (jstring) env->GetObjectArrayElement(instanceName, i));
+        VerifyOrReturn(strlen(jniInstanceName.c_str()) <= Operational::kInstanceNameMaxLength,
+                       dispatch(CHIP_ERROR_INVALID_ARGUMENT));
+
+        CopyString(service[i].mName, jniInstanceName.c_str());
+        CopyString(service[i].mType, jniServiceType.c_str());
+    }
+
+    dispatch(CHIP_NO_ERROR, service, size);
+    delete[] service;
 }
 
 } // namespace Dnssd
diff --git a/src/platform/android/DnssdImpl.h b/src/platform/android/DnssdImpl.h
index 0a6b30870b081b..a16015767fab90 100644
--- a/src/platform/android/DnssdImpl.h
+++ b/src/platform/android/DnssdImpl.h
@@ -27,13 +27,15 @@ namespace Dnssd {
  * that implements chip.devicecontroller.mdns.ServiceResolver interface, and an object of a class that implements
  * chip.devicecontroller.mdns.ChipMdnsCallback interface.
  */
-void InitializeWithObjects(jobject resolverObject, jobject chipMdnsCallbackObject);
+void InitializeWithObjects(jobject resolverObject, jobject browserObject, jobject chipMdnsCallbackObject);
 
 /**
  * Pass results of the service resolution to the CHIP stack.
  */
-void HandleResolve(jstring instanceName, jstring serviceType, jstring address, jint port, jlong callbackHandle,
-                   jlong contextHandle);
+void HandleResolve(jstring instanceName, jstring serviceType, jstring hostName, jstring address, jint port, jobject textEntries,
+                   jlong callbackHandle, jlong contextHandle);
+
+void HandleBrowse(jobjectArray instanceName, jstring serviceType, jlong callbackHandle, jlong contextHandle);
 
 } // namespace Dnssd
 } // namespace chip
diff --git a/src/platform/android/java/chip/platform/AndroidBleManager.java b/src/platform/android/java/chip/platform/AndroidBleManager.java
index 5b5611e539a521..20b51ee008683e 100644
--- a/src/platform/android/java/chip/platform/AndroidBleManager.java
+++ b/src/platform/android/java/chip/platform/AndroidBleManager.java
@@ -154,7 +154,7 @@ public void onDescriptorWrite(
               return;
             }
 
-            if (desc.getValue() == BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE) {
+            if (desc.getValue() == BluetoothGattDescriptor.ENABLE_INDICATION_VALUE) {
               mPlatform.handleSubscribeComplete(
                   connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS);
             } else if (desc.getValue() == BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE) {
@@ -283,7 +283,7 @@ public boolean onSubscribeCharacteristic(int connId, byte[] svcId, byte[] charId
 
     BluetoothGattDescriptor descriptor =
         subscribeChar.getDescriptor(UUID.fromString(CLIENT_CHARACTERISTIC_CONFIG));
-    descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
+    descriptor.setValue(BluetoothGattDescriptor.ENABLE_INDICATION_VALUE);
     if (!bluetoothGatt.writeDescriptor(descriptor)) {
       Log.e(TAG, "writeDescriptor failed");
       return false;
diff --git a/src/platform/android/java/chip/platform/AndroidChipPlatform.java b/src/platform/android/java/chip/platform/AndroidChipPlatform.java
index eaad0e6ed0d281..6b237db33eeed2 100644
--- a/src/platform/android/java/chip/platform/AndroidChipPlatform.java
+++ b/src/platform/android/java/chip/platform/AndroidChipPlatform.java
@@ -25,6 +25,7 @@ public AndroidChipPlatform(
       KeyValueStoreManager kvm,
       ConfigurationManager cfg,
       ServiceResolver resolver,
+      ServiceBrowser browser,
       ChipMdnsCallback chipMdnsCallback,
       DiagnosticDataProvider dataProvider) {
     // Order is important here: initChipStack() initializes the BLEManagerImpl, which depends on the
@@ -32,7 +33,7 @@ public AndroidChipPlatform(
     setBLEManager(ble);
     setKeyValueStoreManager(kvm);
     setConfigurationManager(cfg);
-    setServiceResolver(resolver, chipMdnsCallback);
+    setDnssdDelegates(resolver, browser, chipMdnsCallback);
     setDiagnosticDataProviderManager(dataProvider);
     initChipStack();
   }
@@ -80,15 +81,16 @@ public native void handleUnsubscribeComplete(
   /** Initialize the CHIP stack. */
   private native void initChipStack();
 
-  // for ServiceResolver
-  private void setServiceResolver(ServiceResolver resolver, ChipMdnsCallback chipMdnsCallback) {
+  // for DnssdDelegates
+  private void setDnssdDelegates(
+      ServiceResolver resolver, ServiceBrowser browser, ChipMdnsCallback chipMdnsCallback) {
     if (resolver != null) {
-      nativeSetServiceResolver(resolver, chipMdnsCallback);
+      nativeSetDnssdDelegates(resolver, browser, chipMdnsCallback);
     }
   }
 
-  private native void nativeSetServiceResolver(
-      ServiceResolver resolver, ChipMdnsCallback chipMdnsCallback);
+  private native void nativeSetDnssdDelegates(
+      ServiceResolver resolver, ServiceBrowser browser, ChipMdnsCallback chipMdnsCallback);
 
   private native void setDiagnosticDataProviderManager(DiagnosticDataProvider dataProviderCallback);
 
diff --git a/src/platform/android/java/chip/platform/ChipMdnsCallback.java b/src/platform/android/java/chip/platform/ChipMdnsCallback.java
index 58304997a07ef4..7662809a9ccc7b 100644
--- a/src/platform/android/java/chip/platform/ChipMdnsCallback.java
+++ b/src/platform/android/java/chip/platform/ChipMdnsCallback.java
@@ -17,13 +17,20 @@
  */
 package chip.platform;
 
+import java.util.Map;
+
 /** Interface for communicating with the CHIP mDNS stack. */
 public interface ChipMdnsCallback {
   void handleServiceResolve(
       String instanceName,
       String serviceType,
+      String hostName,
       String address,
       int port,
+      Map<String, byte[]> textEntries,
       long callbackHandle,
       long contextHandle);
+
+  void handleServiceBrowse(
+      String[] instanceName, String serviceType, long callbackHandle, long contextHandle);
 }
diff --git a/src/platform/android/java/chip/platform/ChipMdnsCallbackImpl.java b/src/platform/android/java/chip/platform/ChipMdnsCallbackImpl.java
index b57189994dab58..ee76a127651637 100644
--- a/src/platform/android/java/chip/platform/ChipMdnsCallbackImpl.java
+++ b/src/platform/android/java/chip/platform/ChipMdnsCallbackImpl.java
@@ -17,12 +17,27 @@
  */
 package chip.platform;
 
+import java.util.Map;
+
 public class ChipMdnsCallbackImpl implements ChipMdnsCallback {
   public native void handleServiceResolve(
       String instanceName,
       String serviceType,
+      String hostName,
       String address,
       int port,
+      Map<String, byte[]> textEntries,
       long callbackHandle,
       long contextHandle);
+
+  public native void handleServiceBrowse(
+      String[] instanceName, String serviceType, long callbackHandle, long contextHandle);
+
+  public String[] getTextEntryKeys(Map<String, byte[]> textEntries) {
+    return textEntries.keySet().toArray(new String[textEntries.size()]);
+  }
+
+  public byte[] getTextEntryData(Map<String, byte[]> textEntries, String key) {
+    return textEntries.get(key);
+  }
 }
diff --git a/src/platform/android/java/chip/platform/NsdManagerServiceBrowser.java b/src/platform/android/java/chip/platform/NsdManagerServiceBrowser.java
new file mode 100644
index 00000000000000..4e6bfc70d05f6d
--- /dev/null
+++ b/src/platform/android/java/chip/platform/NsdManagerServiceBrowser.java
@@ -0,0 +1,154 @@
+/*
+ *   Copyright (c) 2021 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package chip.platform;
+
+import android.content.Context;
+import android.net.nsd.NsdManager;
+import android.net.nsd.NsdServiceInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.MulticastLock;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class NsdManagerServiceBrowser implements ServiceBrowser {
+  private static final String TAG = NsdManagerServiceBrowser.class.getSimpleName();
+  private static final long BROWSE_SERVICE_TIMEOUT = 5000;
+  private final NsdManager nsdManager;
+  private MulticastLock multicastLock;
+  private Handler mainThreadHandler;
+
+  private HashMap<Long, NsdManagerDiscovery> callbackMap;
+
+  public NsdManagerServiceBrowser(Context context) {
+    this.nsdManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE);
+    this.mainThreadHandler = new Handler(Looper.getMainLooper());
+
+    this.multicastLock =
+        ((WifiManager) context.getSystemService(Context.WIFI_SERVICE))
+            .createMulticastLock("chipBrowseMulticastLock");
+    this.multicastLock.setReferenceCounted(true);
+    callbackMap = new HashMap<>();
+  }
+
+  @Override
+  public void browse(
+      final String serviceType,
+      final long callbackHandle,
+      final long contextHandle,
+      final ChipMdnsCallback chipMdnsCallback) {
+    Runnable timeoutRunnable =
+        new Runnable() {
+          @Override
+          public void run() {
+            stopDiscover(callbackHandle, chipMdnsCallback);
+          }
+        };
+    startDiscover(serviceType, callbackHandle, contextHandle, chipMdnsCallback);
+    mainThreadHandler.postDelayed(timeoutRunnable, BROWSE_SERVICE_TIMEOUT);
+  }
+
+  public void startDiscover(
+      final String serviceType,
+      final long callbackHandle,
+      final long contextHandle,
+      final ChipMdnsCallback chipMdnsCallback) {
+    if (callbackMap.containsKey(callbackHandle)) {
+      Log.d(TAG, "Invalid callbackHandle");
+      return;
+    }
+
+    NsdManagerDiscovery discovery =
+        new NsdManagerDiscovery(serviceType, callbackHandle, contextHandle);
+    multicastLock.acquire();
+
+    Log.d(TAG, "Starting service discovering for '" + serviceType + "'");
+
+    this.nsdManager.discoverServices(serviceType, NsdManager.PROTOCOL_DNS_SD, discovery);
+    callbackMap.put(callbackHandle, discovery);
+  }
+
+  public void stopDiscover(final long callbackHandle, final ChipMdnsCallback chipMdnsCallback) {
+    if (!callbackMap.containsKey(callbackHandle)) {
+      Log.d(TAG, "Invalid callbackHandle");
+      return;
+    }
+
+    NsdManagerDiscovery discovery = callbackMap.remove(callbackHandle);
+    if (multicastLock.isHeld()) {
+      multicastLock.release();
+    }
+
+    this.nsdManager.stopServiceDiscovery(discovery);
+    discovery.handleServiceBrowse(chipMdnsCallback);
+  }
+
+  public class NsdManagerDiscovery implements NsdManager.DiscoveryListener {
+    private String serviceType;
+    private long callbackHandle;
+    private long contextHandle;
+    private ArrayList<String> serviceNameList = new ArrayList<>();
+
+    public NsdManagerDiscovery(String serviceType, long callbackHandle, long contextHandle) {
+      this.serviceType = serviceType;
+      this.callbackHandle = callbackHandle;
+      this.contextHandle = contextHandle;
+    }
+
+    @Override
+    public void onStartDiscoveryFailed(String serviceType, int errorCode) {
+      Log.w(TAG, "Failed to start discovery service '" + serviceType + "': " + errorCode);
+    }
+
+    @Override
+    public void onDiscoveryStarted(String serviceType) {
+      Log.i(TAG, "Started service '" + serviceType + "'");
+    }
+
+    @Override
+    public void onServiceFound(NsdServiceInfo serviceInfo) {
+      Log.i(TAG, "Found service '" + serviceInfo.getServiceName() + "'");
+      serviceNameList.add(serviceInfo.getServiceName());
+    }
+
+    @Override
+    public void onServiceLost(NsdServiceInfo serviceInfo) {
+      Log.i(TAG, "Lost service '" + serviceType + "'");
+    }
+
+    @Override
+    public void onStopDiscoveryFailed(String serviceType, int errorCode) {
+      Log.w(TAG, "Failed to stop discovery service '" + serviceType + "': " + errorCode);
+    }
+
+    @Override
+    public void onDiscoveryStopped(String serviceType) {
+      Log.w(TAG, "Succeed to stop discovery service '" + serviceType);
+    }
+
+    public void handleServiceBrowse(ChipMdnsCallback chipMdnsCallback) {
+      chipMdnsCallback.handleServiceBrowse(
+          serviceNameList.toArray(new String[serviceNameList.size()]),
+          serviceType,
+          callbackHandle,
+          contextHandle);
+    }
+  }
+}
diff --git a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java
index 63a28d3ffd5a8e..630110296683ab 100644
--- a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java
+++ b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java
@@ -58,7 +58,13 @@ public void resolve(
     NsdServiceInfo serviceInfo = new NsdServiceInfo();
     serviceInfo.setServiceName(instanceName);
     serviceInfo.setServiceType(serviceType);
-    Log.d(TAG, "Starting service resolution for '" + instanceName + "'");
+    Log.d(
+        TAG,
+        "resolve: Starting service resolution for '"
+            + instanceName
+            + "' type '"
+            + serviceType
+            + "'");
 
     Runnable timeoutRunnable =
         new Runnable() {
@@ -67,6 +73,7 @@ public void run() {
             // Ensure we always release the multicast lock. It's possible that we release the
             // multicast lock here before ResolveListener returns, but since NsdManager has no API
             // to cancel service resolution, there's not much we can do here.
+            Log.d(TAG, "resolve: Timing out");
             if (multicastLock.isHeld()) {
               multicastLock.release();
             }
@@ -82,7 +89,7 @@ public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) {
                 TAG,
                 "Failed to resolve service '" + serviceInfo.getServiceName() + "': " + errorCode);
             chipMdnsCallback.handleServiceResolve(
-                instanceName, serviceType, null, 0, callbackHandle, contextHandle);
+                instanceName, serviceType, null, null, 0, null, callbackHandle, contextHandle);
 
             if (multicastLock.isHeld()) {
               multicastLock.release();
@@ -102,8 +109,10 @@ public void onServiceResolved(NsdServiceInfo serviceInfo) {
             chipMdnsCallback.handleServiceResolve(
                 instanceName,
                 serviceType,
+                serviceInfo.getHost().getHostName(),
                 serviceInfo.getHost().getHostAddress(),
                 serviceInfo.getPort(),
+                serviceInfo.getAttributes(),
                 callbackHandle,
                 contextHandle);
 
diff --git a/src/platform/android/java/chip/platform/ServiceBrowser.java b/src/platform/android/java/chip/platform/ServiceBrowser.java
new file mode 100644
index 00000000000000..d807ff8e1999a9
--- /dev/null
+++ b/src/platform/android/java/chip/platform/ServiceBrowser.java
@@ -0,0 +1,27 @@
+/*
+ *   Copyright (c) 2021 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package chip.platform;
+
+/** Interface for browsing network services. */
+public interface ServiceBrowser {
+  public void browse(
+      final String serviceType,
+      final long callbackHandle,
+      final long contextHandle,
+      final ChipMdnsCallback chipMdnsCallback);
+}
diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
index 8d4b3fcf6a52ec..72b95ebbbff639 100644
--- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
+++ b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
@@ -22,11 +22,13 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/bouffalolab/BL602/NetworkCommissioningDriver.h>
 #include <tcpip.h>
+#include <wifi_mgmr_api.h>
 #include <wifi_mgmr_ext.h>
 
 #include <limits>
 #include <stdint.h>
 #include <string>
+#include <utils_log.h>
 
 using namespace ::chip;
 //#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
@@ -220,36 +222,33 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     }
 }
 
-#if 0
-CHIP_ERROR ESPWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
+CHIP_ERROR BLWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
 {
-    esp_err_t err = ESP_OK;
-    if (ssid.data())
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    if (!ssid.empty())
     {
-        wifi_scan_config_t scan_config = { 0 };
         memset(WiFiSSIDStr, 0, sizeof(WiFiSSIDStr));
         memcpy(WiFiSSIDStr, ssid.data(), ssid.size());
-        scan_config.ssid = WiFiSSIDStr;
-        err              = esp_wifi_scan_start(&scan_config, false);
+        err = (CHIP_ERROR) wifi_mgmr_scan_adv(NULL, NULL, NULL, 0, WiFiSSIDStr);
     }
     else
     {
-        err = esp_wifi_scan_start(NULL, false);
+        err = (CHIP_ERROR) wifi_mgmr_scan(NULL, NULL);
     }
-    if (err != ESP_OK)
+    if (err != CHIP_NO_ERROR)
     {
-        return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
+        return CHIP_ERROR_INTERNAL;
     }
     return CHIP_NO_ERROR;
 }
-#endif
 
-#if 0
-void ESPWiFiDriver::OnScanWiFiNetworkDone()
+void BLWiFiDriver::OnScanWiFiNetworkDone()
 {
-    uint16_t ap_number;
-    esp_wifi_scan_get_ap_num(&ap_number);
-    if (!ap_number)
+    int ap_num;
+
+    ap_num = wifi_mgmr_get_scan_ap_num();
+    if (!ap_num)
     {
         ChipLogProgress(DeviceLayer, "No AP found");
         if (mpScanCallback != nullptr)
@@ -259,23 +258,14 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone()
         }
         return;
     }
-    std::unique_ptr<wifi_ap_record_t[]> ap_buffer_ptr(new wifi_ap_record_t[ap_number]);
-    if (ap_buffer_ptr == NULL)
-    {
-        ChipLogError(DeviceLayer, "can't malloc memory for ap_list_buffer");
-        if (mpScanCallback)
-        {
-            mpScanCallback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
-        }
-        return;
-    }
-    wifi_ap_record_t * ap_list_buffer = ap_buffer_ptr.get();
-    if (esp_wifi_scan_get_ap_records(&ap_number, ap_list_buffer) == ESP_OK)
+
+    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);
+
+    if (ScanResult)
     {
-        if (CHIP_NO_ERROR == DeviceLayer::SystemLayer().ScheduleLambda([ap_number, ap_list_buffer]() {
-                std::unique_ptr<wifi_ap_record_t[]> auto_free(ap_list_buffer);
-                ESPScanResponseIterator iter(ap_number, ap_list_buffer);
+        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);
@@ -287,7 +277,7 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone()
                 }
             }))
         {
-            ap_buffer_ptr.release();
+            ChipLogProgress(DeviceLayer, "ScheduleLambda OK");
         }
     }
     else
@@ -300,11 +290,9 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone()
         }
     }
 }
-#endif
 
 void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
 {
-#if 0
     if (callback != nullptr)
     {
         mpScanCallback = callback;
@@ -314,26 +302,11 @@ void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callba
             callback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
         }
     }
-#endif
 }
 
 #if 0
 CHIP_ERROR GetConnectedNetwork(Network & network)
 {
-    wifi_ap_record_t ap_info;
-    esp_err_t err;
-    err = esp_wifi_sta_get_ap_info(&ap_info);
-    if (err != ESP_OK)
-    {
-        return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
-    }
-    uint8_t length = strnlen(reinterpret_cast<const char *>(ap_info.ssid), DeviceLayer::Internal::kMaxWiFiSSIDLength);
-    if (length > sizeof(network.networkID))
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-    memcpy(network.networkID, ap_info.ssid, length);
-    network.networkIDLen = length;
     return CHIP_NO_ERROR;
 }
 #endif
diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
index f1e9bbd6f36016..2664415198f6a3 100644
--- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
+++ b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
@@ -17,6 +17,7 @@
 
 #pragma once
 #include <platform/NetworkCommissioning.h>
+#include <wifi_mgmr.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -31,7 +32,7 @@ constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds = 20;
 class BLScanResponseIterator : public Iterator<WiFiScanResponse>
 {
 public:
-    // BLScanResponseIterator(const size_t size, const wifi_ap_record_t * scanResults) : mSize(size), mpScanResults(scanResults) {}
+    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
     {
@@ -40,16 +41,15 @@ class BLScanResponseIterator : public Iterator<WiFiScanResponse>
             return false;
         }
 
-#if 0
-        item.security.SetRaw(mpScanResults[mIternum].authmode);
-        item.ssidLen =
-            strnlen(reinterpret_cast<const char *>(mpScanResults[mIternum].ssid), chip::DeviceLayer::Internal::kMaxWiFiSSIDLength);
-        item.channel  = mpScanResults[mIternum].primary;
+        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.rssi     = mpScanResults[mIternum].rssi;
         memcpy(item.ssid, mpScanResults[mIternum].ssid, item.ssidLen);
         memcpy(item.bssid, mpScanResults[mIternum].bssid, 6);
-#endif
 
         mIternum++;
         return true;
@@ -58,7 +58,7 @@ class BLScanResponseIterator : public Iterator<WiFiScanResponse>
 
 private:
     const size_t mSize;
-    // const wifi_ap_record_t * mpScanResults;
+    const wifi_mgmr_ap_item_t * mpScanResults;
     size_t mIternum = 0;
 };
 
diff --git a/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
index 647f1aa87e0b43..c61b6dec23d377 100644
--- a/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
@@ -27,6 +27,7 @@
 
 #include <platform/PlatformManager.h>
 #include <platform/bouffalolab/BL602/DiagnosticDataProviderImpl.h>
+#include <platform/bouffalolab/BL602/NetworkCommissioningDriver.h>
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 
 #include <lwip/tcpip.h>
@@ -78,6 +79,9 @@ void event_cb_wifi_event(input_event_t * event, void * private_data)
     case CODE_WIFI_ON_SCAN_DONE: {
         log_info("[APP] [EVT] SCAN Done %lld, SCAN Result: %s\r\n", aos_now_ms(),
                  WIFI_SCAN_DONE_EVENT_OK == event->value ? "OK" : "Busy now");
+
+        // wifi_mgmr_cli_scanlist();
+        NetworkCommissioning::BLWiFiDriver::GetInstance().OnScanWiFiNetworkDone();
     }
     break;
     case CODE_WIFI_ON_CONNECTING: {
diff --git a/src/platform/bouffalolab/BL602/SystemPlatformConfig.h b/src/platform/bouffalolab/BL602/SystemPlatformConfig.h
index 976231c4b15831..3410e99bff1ce4 100644
--- a/src/platform/bouffalolab/BL602/SystemPlatformConfig.h
+++ b/src/platform/bouffalolab/BL602/SystemPlatformConfig.h
@@ -34,7 +34,6 @@ struct ChipDeviceEvent;
 } // namespace chip
 
 // ==================== Platform Adaptations ====================
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1
 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
 #define CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE int
 #define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
diff --git a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
index a00a6f083bed33..ffb2411d0f4f9f 100644
--- a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
@@ -87,13 +87,13 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetThreadMetrics(ThreadMetrics ** threadM
 
             strncpy(thread->NameBuf, taskStatusArray[x].pcTaskName, kMaxThreadNameLength - 1);
             thread->NameBuf[kMaxThreadNameLength] = '\0';
-            thread->name                          = CharSpan(thread->NameBuf, strlen(thread->NameBuf));
-            thread->id                            = taskStatusArray[x].xTaskNumber;
+            thread->name.Emplace(CharSpan::fromCharString(thread->NameBuf));
+            thread->id = taskStatusArray[x].xTaskNumber;
 
-            thread->stackFreeMinimum = taskStatusArray[x].usStackHighWaterMark;
+            thread->stackFreeMinimum.Emplace(taskStatusArray[x].usStackHighWaterMark);
             /* Unsupported metrics */
-            thread->stackSize        = 0;
-            thread->stackFreeCurrent = 0;
+            // thread->stackSize
+            // thread->stackFreeCurrent
 
             thread->Next = head;
             head         = thread;
diff --git a/src/platform/device.gni b/src/platform/device.gni
index 2258f01cd22010..ec758393b98664 100755
--- a/src/platform/device.gni
+++ b/src/platform/device.gni
@@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/src/ble/ble.gni")
 
 declare_args() {
-  # Device platform layer: cc13x2_26x2, darwin, efr32, esp32, external, freertos, linux, nrfconnect, k32w0, qpg, tizen, cyw30739, bl602, none.
+  # Device platform layer: cc13x2_26x2, darwin, efr32, esp32, external, freertos, linux, nrfconnect, k32w0, qpg, tizen, cyw30739, bl602, zephyr, none.
 
   chip_device_platform = "auto"
   chip_platform_target = ""
@@ -38,6 +38,8 @@ if (chip_device_platform == "auto") {
     chip_device_platform = "android"
   } else if (current_os == "webos") {
     chip_device_platform = "webos"
+  } else if (current_os == "zephyr") {
+    chip_device_platform = "zephyr"
   } else {
     chip_device_platform = "none"
   }
@@ -125,6 +127,8 @@ if (chip_device_platform == "cc13x2_26x2") {
   _chip_device_layer = "CYW30739"
 } else if (chip_device_platform == "webos") {
   _chip_device_layer = "webos"
+} else if (chip_device_platform == "zephyr") {
+  _chip_device_layer = "Zephyr"
 }
 
 if (chip_device_platform != "external") {
@@ -149,6 +153,9 @@ declare_args() {
   # If true, disables KVS implementation for the platform.  May not be
   # supported on all platforms.
   chip_disable_platform_kvs = false
+
+  # If true, builds the tv-casting-common static lib
+  build_tv_casting_common_a = false
 }
 
 assert(chip_disable_platform_kvs == false || chip_device_platform == "darwin",
@@ -179,5 +186,6 @@ assert(
         chip_device_platform == "telink" || chip_device_platform == "mbed" ||
         chip_device_platform == "p6" || chip_device_platform == "android" ||
         chip_device_platform == "ameba" || chip_device_platform == "cyw30739" ||
-        chip_device_platform == "webos" || chip_device_platform == "bl602",
+        chip_device_platform == "webos" || chip_device_platform == "bl602" ||
+        chip_device_platform == "zephyr",
     "Please select a valid value for chip_device_platform")
diff --git a/src/platform/fake/ConfigurationManagerImpl.h b/src/platform/fake/ConfigurationManagerImpl.h
index 9e0c4b26588552..f01d29f61465a9 100644
--- a/src/platform/fake/ConfigurationManagerImpl.h
+++ b/src/platform/fake/ConfigurationManagerImpl.h
@@ -39,26 +39,28 @@ class ConfigurationManagerImpl : public ConfigurationManager
     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 GetHardwareVersionString(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR StoreHardwareVersion(uint16_t hardwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetFirmwareBuildChipEpochTime(System::Clock::Seconds32 & buildTime) override
+    {
+        buildTime = mFirmwareBuildChipEpochTime;
+        return CHIP_NO_ERROR;
+    }
+    CHIP_ERROR SetFirmwareBuildChipEpochTime(System::Clock::Seconds32 buildTime) override
+    {
+        mFirmwareBuildChipEpochTime = buildTime;
+        return CHIP_NO_ERROR;
+    }
     CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR StoreSoftwareVersion(uint32_t softwareVer) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     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 GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth) override
-    {
-        return CHIP_ERROR_NOT_IMPLEMENTED;
-    }
     CHIP_ERROR StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen) 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 GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
 #endif
     CHIP_ERROR GetFailSafeArmed(bool & val) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR SetFailSafeArmed(bool val) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
@@ -106,7 +108,8 @@ class ConfigurationManagerImpl : public ConfigurationManager
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
 
-    // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
+private:
+    System::Clock::Seconds32 mFirmwareBuildChipEpochTime = System::Clock::Seconds32(0);
 };
 
 } // namespace DeviceLayer
diff --git a/src/platform/mbed/ConfigurationManagerImpl.cpp b/src/platform/mbed/ConfigurationManagerImpl.cpp
index a43f914e8f786b..b22e48cdc7f6b3 100644
--- a/src/platform/mbed/ConfigurationManagerImpl.cpp
+++ b/src/platform/mbed/ConfigurationManagerImpl.cpp
@@ -51,7 +51,56 @@ ConfigurationManagerImpl & ConfigurationManagerImpl::GetDefaultInstance()
 
 CHIP_ERROR ConfigurationManagerImpl::Init()
 {
-    return CHIP_NO_ERROR;
+    CHIP_ERROR err;
+    uint32_t rebootCount;
+
+    if (MbedConfig::ConfigValueExists(MbedConfig::kCounterKey_RebootCount))
+    {
+        err = GetRebootCount(rebootCount);
+        SuccessOrExit(err);
+
+        err = StoreRebootCount(rebootCount + 1);
+        SuccessOrExit(err);
+    }
+    else
+    {
+        // The first boot after factory reset of the Node.
+        err = StoreRebootCount(1);
+        SuccessOrExit(err);
+    }
+
+    if (!MbedConfig::ConfigValueExists(MbedConfig::kCounterKey_TotalOperationalHours))
+    {
+        err = StoreTotalOperationalHours(0);
+        SuccessOrExit(err);
+    }
+
+    // Initialize the generic implementation base class.
+    err = Internal::GenericConfigurationManagerImpl<MbedConfig>::Init();
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetRebootCount(uint32_t & rebootCount)
+{
+    return ReadConfigValue(MbedConfig::kCounterKey_RebootCount, rebootCount);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreRebootCount(uint32_t rebootCount)
+{
+    return WriteConfigValue(MbedConfig::kCounterKey_RebootCount, rebootCount);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours)
+{
+    return ReadConfigValue(MbedConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreTotalOperationalHours(uint32_t totalOperationalHours)
+{
+    return WriteConfigValue(MbedConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
diff --git a/src/platform/mbed/ConfigurationManagerImpl.h b/src/platform/mbed/ConfigurationManagerImpl.h
index ad99477da305fa..e73c14cae0f81f 100644
--- a/src/platform/mbed/ConfigurationManagerImpl.h
+++ b/src/platform/mbed/ConfigurationManagerImpl.h
@@ -39,6 +39,11 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     // This returns an instance of this class.
     static ConfigurationManagerImpl & GetDefaultInstance();
 
+    CHIP_ERROR GetRebootCount(uint32_t & rebootCount) override;
+    CHIP_ERROR StoreRebootCount(uint32_t rebootCount) override;
+    CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override;
+    CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours) override;
+
 private:
     // ===== Members that implement the ConfigurationManager public interface.
 
diff --git a/src/platform/mbed/ConnectivityManagerImpl.h b/src/platform/mbed/ConnectivityManagerImpl.h
index 992659200a741a..a74319c2a39ae1 100644
--- a/src/platform/mbed/ConnectivityManagerImpl.h
+++ b/src/platform/mbed/ConnectivityManagerImpl.h
@@ -79,6 +79,8 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     CHIP_ERROR InitWiFi(void);
     void OnWiFiPlatformEvent(const ChipDeviceEvent * event);
 
+    void ChangeWiFiStationState(WiFiStationState newState);
+
     WiFiStationMode _GetWiFiStationMode();
     CHIP_ERROR _SetWiFiStationMode(WiFiStationMode val);
     bool _IsWiFiStationEnabled();
diff --git a/src/platform/mbed/ConnectivityManagerImpl_WiFi.cpp b/src/platform/mbed/ConnectivityManagerImpl_WiFi.cpp
index 6c9f7c5306086a..38ba90c9e855dc 100644
--- a/src/platform/mbed/ConnectivityManagerImpl_WiFi.cpp
+++ b/src/platform/mbed/ConnectivityManagerImpl_WiFi.cpp
@@ -82,20 +82,37 @@ void ConnectivityManagerImpl::OnWiFiPlatformEvent(const ChipDeviceEvent * event)
 {
     if (event->Type == DeviceEventType::kWiFiConnectivityChange)
     {
+        WiFiStationState wifiStaState;
         switch (event->WiFiConnectivityChange.Result)
         {
         case kConnectivity_NoChange:
-            mWiFiStationState = kWiFiStationState_Connecting;
+            wifiStaState = kWiFiStationState_Connecting;
             break;
         case kConnectivity_Established:
             ChipLogProgress(DeviceLayer, "WiFi station connected");
-            mWiFiStationState = kWiFiStationState_Connected;
+            wifiStaState = kWiFiStationState_Connected;
             break;
         case kConnectivity_Lost:
             ChipLogProgress(DeviceLayer, "WiFi station disconnected");
-            mWiFiStationState = kWiFiStationState_NotConnected;
+            wifiStaState = kWiFiStationState_NotConnected;
+            NetworkCommissioning::WiFiDriverImpl::GetInstance().SetLastDisconnectReason(event);
             break;
+        default:
+            ChipLogError(DeviceLayer, "Unknown WiFi connectivity state");
+            return;
         }
+        ChangeWiFiStationState(wifiStaState);
+    }
+}
+
+void ConnectivityManagerImpl::ChangeWiFiStationState(WiFiStationState newState)
+{
+    if (mWiFiStationState != newState)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi station state change: %s -> %s", WiFiStationStateToStr(mWiFiStationState),
+                        WiFiStationStateToStr(newState));
+        mWiFiStationState = newState;
+        SystemLayer().ScheduleLambda([]() { NetworkCommissioning::WiFiDriverImpl::GetInstance().OnNetworkStatusChange(); });
     }
 }
 
diff --git a/src/platform/mbed/KeyValueStoreManagerImpl.cpp b/src/platform/mbed/KeyValueStoreManagerImpl.cpp
index 29aeeb1358d45b..8e2d96d62e506b 100644
--- a/src/platform/mbed/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/mbed/KeyValueStoreManagerImpl.cpp
@@ -43,6 +43,13 @@ class KeyBuilder
     {
         auto ret = snprintf(buffer, sizeof(buffer), "%s%s", prefix, key);
         valid    = (ret > 0) && ((size_t) ret <= (sizeof(buffer) - 1));
+        // Key must not include '*' '/' '?' ':' ';' '\' '"' '|' ' ' '<' '>' '\'.
+        // It's replaced by '-'
+        char * ptr = buffer + strlen(prefix);
+        while ((ptr = strpbrk(ptr, " */?:;\"|<>\\")) != NULL)
+        {
+            *ptr = '-';
+        }
     }
 
     const char * str() const { return valid ? buffer : nullptr; }
diff --git a/src/platform/mbed/MbedConfig.cpp b/src/platform/mbed/MbedConfig.cpp
index e8891a7699c579..81f8f98da1a57d 100644
--- a/src/platform/mbed/MbedConfig.cpp
+++ b/src/platform/mbed/MbedConfig.cpp
@@ -55,6 +55,7 @@ namespace Internal {
 
 #define FACTORY_KEY(key) CHIP_CONFIG_KV_STORE_PARTITION CHIP_CONFIG_FACTORY_PREFIX key
 #define CONFIG_KEY(key) CHIP_CONFIG_KV_STORE_PARTITION CHIP_CONFIG_CONFIG_PREFIX key
+#define COUNTER_KEY(key) CHIP_CONFIG_KV_STORE_PARTITION CHIP_CONFIG_COUNTER_PREFIX key
 
 const char MbedConfig::kConfigNamespace_ChipFactory[]  = CHIP_CONFIG_KV_STORE_PARTITION CHIP_CONFIG_FACTORY_PREFIX;
 const char MbedConfig::kConfigNamespace_ChipConfig[]   = CHIP_CONFIG_KV_STORE_PARTITION CHIP_CONFIG_CONFIG_PREFIX;
@@ -85,6 +86,11 @@ const MbedConfig::Key MbedConfig::kConfigKey_RegulatoryLocation = { CONFIG_KEY("
 const MbedConfig::Key MbedConfig::kConfigKey_CountryCode        = { CONFIG_KEY("country-code") };
 const MbedConfig::Key MbedConfig::kConfigKey_UniqueId           = { CONFIG_KEY("unique-id") };
 
+// Keys stored in the Chip-counters namespace
+const MbedConfig::Key MbedConfig::kCounterKey_RebootCount           = { COUNTER_KEY("reboot-count") };
+const MbedConfig::Key MbedConfig::kCounterKey_UpTime                = { COUNTER_KEY("up-time") };
+const MbedConfig::Key MbedConfig::kCounterKey_TotalOperationalHours = { COUNTER_KEY("total-hours") };
+
 CHIP_ERROR MbedConfig::ReadConfigValue(Key key, bool & val)
 {
     if (!ConfigValueExists(key))
diff --git a/src/platform/mbed/MbedConfig.h b/src/platform/mbed/MbedConfig.h
index 4e2cb7a6507563..f9f82bc06c779f 100644
--- a/src/platform/mbed/MbedConfig.h
+++ b/src/platform/mbed/MbedConfig.h
@@ -73,6 +73,11 @@ class MbedConfig
     static const Key kConfigKey_Spake2pSalt;
     static const Key kConfigKey_Spake2pVerifier;
 
+    // CHIP Counter keys
+    static const Key kCounterKey_RebootCount;
+    static const Key kCounterKey_UpTime;
+    static const Key kCounterKey_TotalOperationalHours;
+
     // Config value accessors.
     static CHIP_ERROR ReadConfigValue(Key key, bool & val);
     static CHIP_ERROR ReadConfigValue(Key key, uint32_t & val);
diff --git a/src/platform/mbed/NetworkCommissioningDriver.h b/src/platform/mbed/NetworkCommissioningDriver.h
index 31f28c04d7a105..26e3fe73786c6f 100644
--- a/src/platform/mbed/NetworkCommissioningDriver.h
+++ b/src/platform/mbed/NetworkCommissioningDriver.h
@@ -114,6 +114,11 @@ class WiFiDriverImpl final : public WiFiDriver
                               uint8_t & outNetworkIndex) override;
     void ScanNetworks(ByteSpan ssid, ScanCallback * callback) override;
 
+    CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event);
+    int32_t GetLastDisconnectReason();
+
+    void OnNetworkStatusChange();
+
     static WiFiDriverImpl & GetInstance()
     {
         static WiFiDriverImpl instance;
@@ -150,6 +155,9 @@ class WiFiDriverImpl final : public WiFiDriver
     nsapi_security_t mSecurityType = NSAPI_SECURITY_NONE;
     Inet::IPAddress mIp4Address    = Inet::IPAddress::Any;
     Inet::IPAddress mIp6Address    = Inet::IPAddress::Any;
+
+    NetworkStatusChangeCallback * mStatusChangeCallback = nullptr;
+    int32_t mLastDisconnectedReason;
 };
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 } // namespace NetworkCommissioning
diff --git a/src/platform/mbed/NetworkCommissioningWiFiDriver.cpp b/src/platform/mbed/NetworkCommissioningWiFiDriver.cpp
index 6eca69d3eb4866..81e55a8d6692e9 100644
--- a/src/platform/mbed/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/mbed/NetworkCommissioningWiFiDriver.cpp
@@ -58,9 +58,10 @@ CHIP_ERROR WiFiDriverImpl::Init(NetworkStatusChangeCallback * networkStatusChang
         mWiFiInterface->set_blocking(false);
     }
 
-    mScanCallback    = nullptr;
-    mConnectCallback = nullptr;
-    mScanSpecific    = false;
+    mScanCallback         = nullptr;
+    mConnectCallback      = nullptr;
+    mScanSpecific         = false;
+    mStatusChangeCallback = networkStatusChangeCallback;
 
     mIp4Address = IPAddress::Any;
     mIp6Address = IPAddress::Any;
@@ -101,13 +102,14 @@ CHIP_ERROR WiFiDriverImpl::Shutdown()
     {
         networks->Release();
     }
-    mScanCallback    = nullptr;
-    mConnectCallback = nullptr;
-    mScanSpecific    = false;
-    mWiFiInterface   = nullptr;
-    mIp4Address      = IPAddress::Any;
-    mIp6Address      = IPAddress::Any;
-    mSecurityType    = NSAPI_SECURITY_NONE;
+    mScanCallback         = nullptr;
+    mConnectCallback      = nullptr;
+    mStatusChangeCallback = nullptr;
+    mScanSpecific         = false;
+    mWiFiInterface        = nullptr;
+    mIp4Address           = IPAddress::Any;
+    mIp6Address           = IPAddress::Any;
+    mSecurityType         = NSAPI_SECURITY_NONE;
     memset(mScanSSID, 0, sizeof(mScanSSID));
     mStagingNetwork.ssidLen        = 0;
     mStagingNetwork.credentialsLen = 0;
@@ -394,6 +396,18 @@ void WiFiDriverImpl::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * call
     }
 }
 
+CHIP_ERROR WiFiDriverImpl::SetLastDisconnectReason(const ChipDeviceEvent * event)
+{
+    (void) event;
+    mLastDisconnectedReason = 0;
+    return CHIP_NO_ERROR;
+}
+
+int32_t WiFiDriverImpl::GetLastDisconnectReason()
+{
+    return mLastDisconnectedReason;
+}
+
 size_t WiFiDriverImpl::WiFiNetworkIterator::Count()
 {
     return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1;
@@ -602,6 +616,25 @@ WiFiAuthSecurityType WiFiDriverImpl::NsapiToNetworkSecurity(nsapi_security_t nsa
     }
 }
 
+void WiFiDriverImpl::OnNetworkStatusChange()
+{
+    // Network configuredNetwork;
+    bool staEnabled   = ConnectivityMgrImpl().IsWiFiStationEnabled();
+    bool staConnected = ConnectivityMgrImpl().IsWiFiStationConnected();
+    VerifyOrReturn(staEnabled && mStatusChangeCallback != nullptr);
+
+    if (staConnected)
+    {
+        mStatusChangeCallback->OnNetworkingStatusChange(
+            Status::kSuccess, MakeOptional(ByteSpan((const uint8_t *) mStagingNetwork.ssid, mStagingNetwork.ssidLen)),
+            NullOptional);
+        return;
+    }
+    mStatusChangeCallback->OnNetworkingStatusChange(
+        Status::kUnknownError, MakeOptional(ByteSpan((const uint8_t *) mStagingNetwork.ssid, mStagingNetwork.ssidLen)),
+        MakeOptional(GetLastDisconnectReason()));
+}
+
 } // namespace NetworkCommissioning
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/mbed/SystemTimeSupport.cpp b/src/platform/mbed/SystemTimeSupport.cpp
index 43a568a32d1432..d850d511850fc4 100644
--- a/src/platform/mbed/SystemTimeSupport.cpp
+++ b/src/platform/mbed/SystemTimeSupport.cpp
@@ -71,8 +71,12 @@ Milliseconds64 ClockImpl::GetMonotonicMilliseconds64()
     return std::chrono::duration_cast<Milliseconds64>(GetMonotonicMicroseconds64());
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTime(Microseconds64 & aCurTime)
 {
+    // TODO(19081): This platform does not properly error out if wall clock has
+    //              not been set.  For now, short circuit this.
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#if 0
     struct timeval tv;
     if (gettimeofday(&tv, nullptr) != 0)
     {
@@ -87,32 +91,20 @@ CHIP_ERROR ClockImpl::GetClock_RealTime(Clock::Microseconds64 & aCurTime)
         return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
     }
     static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime = Clock::Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
+    aCurTime = Microseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000000)) + static_cast<uint64_t>(tv.tv_usec));
     return CHIP_NO_ERROR;
+#endif
 }
 
-CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Clock::Milliseconds64 & aCurTime)
+CHIP_ERROR ClockImpl::GetClock_RealTimeMS(Milliseconds64 & aCurTime)
 {
-    struct timeval tv;
-    if (gettimeofday(&tv, nullptr) != 0)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-    if (tv.tv_sec < CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    if (tv.tv_usec < 0)
-    {
-        return CHIP_ERROR_REAL_TIME_NOT_SYNCED;
-    }
-    static_assert(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD >= 0, "We might be letting through negative tv_sec values!");
-    aCurTime =
-        Clock::Milliseconds64((static_cast<uint64_t>(tv.tv_sec) * UINT64_C(1000)) + (static_cast<uint64_t>(tv.tv_usec) / 1000));
-    return CHIP_NO_ERROR;
+    Microseconds64 curTimeUs;
+    auto err = GetClock_RealTime(curTimeUs);
+    aCurTime = std::chrono::duration_cast<Milliseconds64>(curTimeUs);
+    return err;
 }
 
-CHIP_ERROR ClockImpl::SetClock_RealTime(Clock::Microseconds64 aNewCurTime)
+CHIP_ERROR ClockImpl::SetClock_RealTime(Microseconds64 aNewCurTime)
 {
     struct timeval tv;
     tv.tv_sec  = static_cast<time_t>(aNewCurTime.count() / UINT64_C(1000000));
@@ -137,6 +129,9 @@ CHIP_ERROR InitClock_RealTime()
         Clock::Microseconds64((static_cast<uint64_t>(CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD) * UINT64_C(1000000)));
     // Use CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD as the initial value of RealTime.
     // Then the RealTime obtained from GetClock_RealTime will be always valid.
+    //
+    // TODO(19081): This is broken because it causes the platform to report
+    //              that it does have wall clock time when it actually doesn't.
     return System::SystemClock().SetClock_RealTime(curTime);
 }
 
diff --git a/src/platform/nrfconnect/BUILD.gn b/src/platform/nrfconnect/BUILD.gn
index b5877349a1c204..d6a6a2dfc7adae 100644
--- a/src/platform/nrfconnect/BUILD.gn
+++ b/src/platform/nrfconnect/BUILD.gn
@@ -73,8 +73,6 @@ static_library("nrfconnect") {
 
   if (chip_enable_ota_requestor) {
     sources += [
-      "OTAImageContentHeader.cpp",
-      "OTAImageContentHeader.h",
       "OTAImageProcessorImpl.cpp",
       "OTAImageProcessorImpl.h",
     ]
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
index 69b58456ca4000..bcab84e5d9efc0 100644
--- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -27,6 +27,42 @@
 
 // ==================== Platform Adaptations ====================
 
+#ifndef CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
+#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE
+#define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE CONFIG_CHIP_DEVICE_PAIRING_PASSCODE
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR CONFIG_CHIP_DEVICE_DISCRIMINATOR
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER
+#endif
+
 #ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID CONFIG_CHIP_DEVICE_VENDOR_ID
 #endif
@@ -35,6 +71,14 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
 #endif
 
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME CONFIG_CHIP_DEVICE_VENDOR_NAME
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME CONFIG_CHIP_DEVICE_PRODUCT_NAME
+#endif
+
 #ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
 #endif
diff --git a/src/platform/nrfconnect/CHIPPlatformConfig.h b/src/platform/nrfconnect/CHIPPlatformConfig.h
index b34fc5ab5fa423..4d8bc0371a9d38 100644
--- a/src/platform/nrfconnect/CHIPPlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPPlatformConfig.h
@@ -37,7 +37,7 @@
 // Size of the statically allocated context for SHA256 operations in CryptoPAL
 // determined empirically.
 #ifdef CONFIG_CC3XX_BACKEND
-#define CHIP_CONFIG_SHA256_CONTEXT_SIZE 240
+#define CHIP_CONFIG_SHA256_CONTEXT_SIZE 244
 #else
 #define CHIP_CONFIG_SHA256_CONTEXT_SIZE 208
 #endif
diff --git a/src/platform/nrfconnect/OTAImageContentHeader.cpp b/src/platform/nrfconnect/OTAImageContentHeader.cpp
deleted file mode 100644
index 3eb21e2d3bfee2..00000000000000
--- a/src/platform/nrfconnect/OTAImageContentHeader.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "OTAImageContentHeader.h"
-
-#include <lib/core/CHIPEncoding.h>
-#include <lib/core/CHIPTLV.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/TypeTraits.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-namespace {
-
-enum class HeaderTag : uint8_t
-{
-    kFileInfoList = 0,
-};
-
-enum class FileInfoTag : uint8_t
-{
-    kFileId   = 0,
-    kFileSize = 1,
-};
-
-/// Maximum supported Matter OTA image content header size
-constexpr uint32_t kMaxHeaderSize = 1024;
-} // namespace
-
-void OTAImageContentHeaderParser::Init()
-{
-    mState         = State::kInitialized;
-    mBufferOffset  = 0;
-    mHeaderTlvSize = 0;
-    mBuffer.Alloc(sizeof(mHeaderTlvSize));
-}
-
-void OTAImageContentHeaderParser::Clear()
-{
-    mState         = State::kNotInitialized;
-    mBufferOffset  = 0;
-    mHeaderTlvSize = 0;
-    mBuffer.Free();
-}
-
-CHIP_ERROR OTAImageContentHeaderParser::AccumulateAndDecode(ByteSpan & buffer, OTAImageContentHeader & header)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-
-    if (mState == State::kInitialized)
-    {
-        ReturnErrorCodeIf(!mBuffer, CHIP_ERROR_NO_MEMORY);
-        Append(buffer, sizeof(mHeaderTlvSize) - mBufferOffset);
-        error = DecodeFixed();
-    }
-
-    if (mState == State::kTlv)
-    {
-        Append(buffer, mHeaderTlvSize - mBufferOffset);
-        error = DecodeTlv(header);
-    }
-
-    if (error != CHIP_NO_ERROR && error != CHIP_ERROR_BUFFER_TOO_SMALL)
-    {
-        Clear();
-    }
-
-    return error;
-}
-
-void OTAImageContentHeaderParser::Append(ByteSpan & buffer, uint32_t numBytes)
-{
-    numBytes = chip::min(numBytes, static_cast<uint32_t>(buffer.size()));
-    memcpy(&mBuffer[mBufferOffset], buffer.data(), numBytes);
-    mBufferOffset += numBytes;
-    buffer = buffer.SubSpan(numBytes);
-}
-
-CHIP_ERROR OTAImageContentHeaderParser::DecodeFixed()
-{
-    ReturnErrorCodeIf(mBufferOffset < sizeof(mHeaderTlvSize), CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    mHeaderTlvSize = Encoding::LittleEndian::Get32(mBuffer.Get());
-    // Safety check against malicious headers.
-    ReturnErrorCodeIf(mHeaderTlvSize > kMaxHeaderSize, CHIP_ERROR_NO_MEMORY);
-    ReturnErrorCodeIf(!mBuffer.Alloc(mHeaderTlvSize), CHIP_ERROR_NO_MEMORY);
-
-    mState        = State::kTlv;
-    mBufferOffset = 0;
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageContentHeaderParser::DecodeTlv(OTAImageContentHeader & header)
-{
-    ReturnErrorCodeIf(mBufferOffset < mHeaderTlvSize, CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    TLV::TLVReader tlvReader;
-    tlvReader.Init(mBuffer.Get(), mBufferOffset);
-    ReturnErrorOnFailure(tlvReader.Next(TLV::TLVType::kTLVType_Structure, TLV::AnonymousTag()));
-
-    TLV::TLVType outerType;
-    ReturnErrorOnFailure(tlvReader.EnterContainer(outerType));
-
-    TLV::TLVType headerType;
-    ReturnErrorOnFailure(tlvReader.Next(TLV::TLVType::kTLVType_Array, TLV::ContextTag(to_underlying(HeaderTag::kFileInfoList))));
-    ReturnErrorOnFailure(tlvReader.EnterContainer(headerType));
-
-    size_t fileNo = 0;
-
-    while (tlvReader.Next(TLV::TLVType::kTLVType_Structure, TLV::AnonymousTag()) == CHIP_NO_ERROR)
-    {
-        ReturnErrorCodeIf(fileNo >= OTAImageContentHeader::kMaxFiles, CHIP_ERROR_NO_MEMORY);
-
-        TLV::TLVType arrayType;
-        ReturnErrorOnFailure(tlvReader.EnterContainer(arrayType));
-
-        ReturnErrorOnFailure(tlvReader.Next(TLV::ContextTag(to_underlying(FileInfoTag::kFileId))));
-        ReturnErrorOnFailure(tlvReader.Get(header.mFiles[fileNo].mFileId));
-        ReturnErrorOnFailure(tlvReader.Next(TLV::ContextTag(to_underlying(FileInfoTag::kFileSize))));
-        ReturnErrorOnFailure(tlvReader.Get(header.mFiles[fileNo].mFileSize));
-        ++fileNo;
-
-        ReturnErrorOnFailure(tlvReader.ExitContainer(arrayType));
-    }
-
-    ReturnErrorOnFailure(tlvReader.ExitContainer(headerType));
-    ReturnErrorOnFailure(tlvReader.ExitContainer(outerType));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/nrfconnect/OTAImageContentHeader.h b/src/platform/nrfconnect/OTAImageContentHeader.h
deleted file mode 100644
index f56108a6f5469c..00000000000000
--- a/src/platform/nrfconnect/OTAImageContentHeader.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <lib/support/ScopedBuffer.h>
-#include <lib/support/Span.h>
-
-#include <cstdint>
-
-namespace chip {
-namespace DeviceLayer {
-
-struct OTAImageContentHeader
-{
-    static constexpr size_t kMaxFiles = 3;
-
-    enum class FileId : uint32_t
-    {
-        kMcuboot    = 0,
-        kAppMcuboot = 1,
-        kNetMcuboot = 2,
-    };
-
-    struct FileInfo
-    {
-        FileId mFileId;
-        uint32_t mFileSize;
-    };
-
-    FileInfo mFiles[kMaxFiles];
-};
-
-class OTAImageContentHeaderParser
-{
-public:
-    /**
-     * @brief Prepare the parser for accepting Matter OTA image chunks.
-     *
-     * The method can be called many times to reset the parser state.
-     */
-    void Init();
-
-    /**
-     * @brief Clear all resources associated with the parser.
-     */
-    void Clear();
-
-    /**
-     * @brief Returns if the parser is ready to accept subsequent Matter OTA image chunks.
-     */
-    bool IsInitialized() const { return mState != State::kNotInitialized; }
-
-    /**
-     * @brief Decode nRF Connect Matter OTA image content header
-     *
-     * The method takes subsequent chunks of the Matter OTA image file and decodes the header when
-     * enough data has been provided. If more image chunks are needed, CHIP_ERROR_BUFFER_TOO_SMALL
-     * error is returned. Other error codes indicate that the header is invalid.
-     *
-     * @param buffer Byte span containing a subsequent Matter OTA image chunk. When the method
-     *               returns CHIP_NO_ERROR, the byte span is used to return a remaining part
-     *               of the chunk, not used by the header.
-     * @param header Structure to store results of the operation.
-     *
-     * @retval CHIP_NO_ERROR                        Header has been decoded successfully.
-     * @retval CHIP_ERROR_BUFFER_TOO_SMALL          Provided buffers are insufficient to decode the
-     *                                              header. A user is expected call the method again
-     *                                              when the next image chunk is available.
-     * @retval Error code                           Encoded header is invalid.
-     */
-    CHIP_ERROR AccumulateAndDecode(ByteSpan & buffer, OTAImageContentHeader & header);
-
-private:
-    enum State
-    {
-        kNotInitialized,
-        kInitialized,
-        kTlv
-    };
-
-    void Append(ByteSpan & buffer, uint32_t numBytes);
-    CHIP_ERROR DecodeFixed();
-    CHIP_ERROR DecodeTlv(OTAImageContentHeader & header);
-
-    State mState;
-    uint32_t mBufferOffset;
-    uint32_t mHeaderTlvSize;
-    Platform::ScopedMemoryBuffer<uint8_t> mBuffer;
-};
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
index e117b29ca8a954..d9caebbd34a430 100644
--- a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
+++ b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
@@ -23,6 +23,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <system/SystemError.h>
 
+#include <dfu/dfu_multi_image.h>
 #include <dfu/dfu_target.h>
 #include <dfu/dfu_target_mcuboot.h>
 #include <dfu/mcuboot.h>
@@ -45,33 +46,41 @@ CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
 CHIP_ERROR OTAImageProcessorImpl::PrepareDownloadImpl()
 {
     mHeaderParser.Init();
-    mContentHeaderParser.Init();
     ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_mcuboot_set_buf(mBuffer, sizeof(mBuffer))));
+    ReturnErrorOnFailure(System::MapErrorZephyr(dfu_multi_image_init(mBuffer, sizeof(mBuffer))));
+
+    for (int image_id = 0; image_id < CONFIG_UPDATEABLE_IMAGE_NUMBER; ++image_id)
+    {
+        dfu_image_writer writer;
+        writer.image_id = image_id;
+        writer.open     = [](int id, size_t size) { return dfu_target_init(DFU_TARGET_IMAGE_TYPE_MCUBOOT, id, size, nullptr); };
+        writer.write    = [](const uint8_t * chunk, size_t chunk_size) { return dfu_target_write(chunk, chunk_size); };
+        writer.close    = [](bool success) { return dfu_target_done(success); };
+
+        ReturnErrorOnFailure(System::MapErrorZephyr(dfu_multi_image_register_writer(&writer)));
+    };
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Finalize()
 {
-    return CHIP_NO_ERROR;
+    return System::MapErrorZephyr(dfu_multi_image_done(true));
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Abort()
 {
-    CHIP_ERROR error = System::MapErrorZephyr(dfu_target_reset());
+    CHIP_ERROR error = System::MapErrorZephyr(dfu_multi_image_done(false));
 
     TriggerFlashAction(FlashHandler::Action::SLEEP);
+
     return error;
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Apply()
 {
-    int err = dfu_target_done(true);
-    if (!err)
-    {
-        // schedule update of all possible targets by caling this function with argument -1
-        err = dfu_target_schedule_update(-1);
-    }
+    // Schedule update of all images
+    int err = dfu_target_schedule_update(-1);
 
     TriggerFlashAction(FlashHandler::Action::SLEEP);
 
@@ -96,67 +105,25 @@ CHIP_ERROR OTAImageProcessorImpl::Apply()
 #endif
 }
 
-CHIP_ERROR OTAImageProcessorImpl::SwitchToNextImage(const ByteSpan & aRemainingData)
-{
-    mCurrentImage.mFileInfo  = &mContentHeader.mFiles[static_cast<uint8_t>(ImageType::kNetImage)];
-    mCurrentImage.mImageType = ImageType::kNetImage;
-
-    if (mCurrentImage.mFileInfo->mFileSize > 0)
-    {
-        // finish app-core dfu target to inform mcuboot that all bytes were written
-        ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_done(true)));
-        // Reset app-core target to allow switching a target to the next one
-        ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_reset()));
-        // initialize next dfu target to store net-core image.
-        ReturnErrorOnFailure(System::MapErrorZephyr(
-            dfu_target_init(DFU_TARGET_IMAGE_TYPE_MCUBOOT, static_cast<uint8_t>(mCurrentImage.mImageType), /* size */ 0, nullptr)));
-        // write remaining data to new image
-        ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_write(aRemainingData.data(), aRemainingData.size())));
-        mCurrentImage.mCurrentOffset = aRemainingData.size();
-    }
-    return CHIP_NO_ERROR;
-}
-
 CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & aBlock)
 {
     VerifyOrReturnError(mDownloader != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
     CHIP_ERROR error = ProcessHeader(aBlock);
+
     if (error == CHIP_NO_ERROR)
     {
-        mCurrentImage.mCurrentOffset += aBlock.size();
-        if (mCurrentImage.mCurrentOffset >= mCurrentImage.mFileInfo->mFileSize)
-        {
-            // create new subspan with data which should be moved to the next image
-            ByteSpan remainingData = aBlock.SubSpan(
-                aBlock.size() - (mCurrentImage.mCurrentOffset - static_cast<uint64_t>(mCurrentImage.mFileInfo->mFileSize)));
-            // write last data of previous image
-            error = System::MapErrorZephyr(dfu_target_write(aBlock.data(), aBlock.size() - remainingData.size()));
-            if (OTAImageContentHeader::FileId::kAppMcuboot == mCurrentImage.mFileInfo->mFileId && CHIP_NO_ERROR == error)
-            {
-                // switch to net image
-                error = SwitchToNextImage(remainingData);
-            }
-            else
-            {
-                // Finish process with error to ensure that only two images are available.
-                error = CHIP_ERROR_INVALID_DATA_LIST;
-            }
-        }
-        else
-        {
-            // DFU target library buffers data internally, so do not clone the block data.
-            error = System::MapErrorZephyr(dfu_target_write(aBlock.data(), aBlock.size()));
-        }
+        // DFU target library buffers data internally, so do not clone the block data.
+        error = System::MapErrorZephyr(dfu_multi_image_write(mParams.downloadedBytes, aBlock.data(), aBlock.size()));
+        mParams.downloadedBytes += aBlock.size();
     }
 
     // Report the result back to the downloader asynchronously.
     return DeviceLayer::SystemLayer().ScheduleLambda([this, error, aBlock] {
         if (error == CHIP_NO_ERROR)
         {
-            mParams.downloadedBytes += aBlock.size();
-            ChipLogDetail(SoftwareUpdate, "Processed %llu/%u Bytes of image no. %u", mCurrentImage.mCurrentOffset,
-                          mCurrentImage.mFileInfo->mFileSize, static_cast<uint8_t>(mCurrentImage.mImageType));
+            ChipLogDetail(SoftwareUpdate, "Downloaded %u/%u bytes", static_cast<unsigned>(mParams.downloadedBytes),
+                          static_cast<unsigned>(mParams.totalFileBytes));
             mDownloader->FetchNextData();
         }
         else
@@ -198,26 +165,6 @@ CHIP_ERROR OTAImageProcessorImpl::ProcessHeader(ByteSpan & aBlock)
         mHeaderParser.Clear();
     }
 
-    if (mContentHeaderParser.IsInitialized() && !aBlock.empty())
-    {
-        CHIP_ERROR error = mContentHeaderParser.AccumulateAndDecode(aBlock, mContentHeader);
-
-        // Needs more data to decode the header
-        ReturnErrorCodeIf(error == CHIP_ERROR_BUFFER_TOO_SMALL, CHIP_NO_ERROR);
-        ReturnErrorOnFailure(error);
-
-        if (OTAImageContentHeader::FileId::kAppMcuboot == mContentHeader.mFiles[0].mFileId)
-        {
-            mCurrentImage.mFileInfo  = &mContentHeader.mFiles[static_cast<int8_t>(ImageType::kAppImage)];
-            mCurrentImage.mImageType = ImageType::kAppImage;
-            // Initialize dfu target to receive first image
-            ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_init(
-                DFU_TARGET_IMAGE_TYPE_MCUBOOT, static_cast<uint8_t>(mCurrentImage.mImageType), /* size */ 0, nullptr)));
-        }
-
-        mContentHeaderParser.Clear();
-    }
-
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.h b/src/platform/nrfconnect/OTAImageProcessorImpl.h
index 59529c49a1d552..99b9c13e9d7693 100644
--- a/src/platform/nrfconnect/OTAImageProcessorImpl.h
+++ b/src/platform/nrfconnect/OTAImageProcessorImpl.h
@@ -19,7 +19,6 @@
 #include <lib/core/OTAImageHeader.h>
 #include <lib/support/Span.h>
 #include <platform/OTAImageProcessor.h>
-#include <platform/nrfconnect/OTAImageContentHeader.h>
 
 namespace chip {
 
@@ -44,22 +43,10 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
 public:
     static constexpr size_t kBufferSize = CONFIG_CHIP_OTA_REQUESTOR_BUFFER_SIZE;
 
-    OTAImageProcessorImpl(FlashHandler * flashHandler = nullptr) : mFlashHandler(flashHandler){};
-
-    enum class ImageType : uint8_t
-    {
-        kAppImage = 0,
-        kNetImage = 1
-    };
+    explicit OTAImageProcessorImpl(FlashHandler * flashHandler = nullptr) : mFlashHandler(flashHandler) {}
 
     void SetOTADownloader(OTADownloader * downloader) { mDownloader = downloader; };
-
-    struct OTAImage
-    {
-        OTAImageContentHeader::FileInfo * mFileInfo;
-        ImageType mImageType;
-        uint64_t mCurrentOffset;
-    };
+    void TriggerFlashAction(FlashHandler::Action action);
 
     CHIP_ERROR PrepareDownload() override;
     CHIP_ERROR Finalize() override;
@@ -68,19 +55,14 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     CHIP_ERROR ProcessBlock(ByteSpan & aBlock) override;
     bool IsFirstImageRun() override;
     CHIP_ERROR ConfirmCurrentImage() override;
-    void TriggerFlashAction(FlashHandler::Action action);
 
 private:
     CHIP_ERROR PrepareDownloadImpl();
     CHIP_ERROR ProcessHeader(ByteSpan & aBlock);
-    CHIP_ERROR SwitchToNextImage(const ByteSpan & aRemainingData);
 
     OTADownloader * mDownloader = nullptr;
     OTAImageHeaderParser mHeaderParser;
-    OTAImageContentHeaderParser mContentHeaderParser;
     uint8_t mBuffer[kBufferSize];
-    OTAImageContentHeader mContentHeader;
-    OTAImage mCurrentImage;
     FlashHandler * mFlashHandler;
 };
 
diff --git a/src/platform/nxp/k32w/k32w0/BLEManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/BLEManagerImpl.cpp
index 288cfbffbec3ea..cc46ea6602a4b8 100644
--- a/src/platform/nxp/k32w/k32w0/BLEManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/BLEManagerImpl.cpp
@@ -184,7 +184,6 @@ CHIP_ERROR BLEManagerImpl::_Init()
     VerifyOrExit(bleAppCreated == pdPASS, err = CHIP_ERROR_INCORRECT_STATE);
 
     /* BLE Radio Init */
-    XCVR_TemperatureUpdate(BOARD_GetTemperature());
     VerifyOrExit(XCVR_Init(BLE_MODE, DR_2MBPS) == gXcvrSuccess_c, err = CHIP_ERROR_INCORRECT_STATE);
 
     /* Create BLE Controller Task */
@@ -245,6 +244,11 @@ bool BLEManagerImpl::_IsAdvertisingEnabled(void)
     return mFlags.Has(Flags::kAdvertisingEnabled);
 }
 
+bool BLEManagerImpl::_IsAdvertising(void)
+{
+    return mFlags.Has(Flags::kAdvertising);
+}
+
 bool BLEManagerImpl::RemoveConnection(uint8_t connectionHandle)
 {
     CHIPoBLEConState * bleConnState = GetConnectionState(connectionHandle, true);
@@ -1010,7 +1014,7 @@ void BLEManagerImpl::bleAppTask(void * p_arg)
 
             if (msg->type == BLE_KW_MSG_ERROR)
             {
-                ChipLogProgress(DeviceLayer, "BLE Fatal Error: %d.\n", msg->data.u8);
+                ChipLogProgress(DeviceLayer, "BLE Error: %d.\n", msg->data.u8);
             }
             else if (msg->type == BLE_KW_MSG_CONNECTED)
             {
@@ -1276,6 +1280,11 @@ void BLEManagerImpl::blekw_gap_connection_cb(deviceId_t deviceId, gapConnectionE
 
     if (pConnectionEvent->eventType == gConnEvtConnected_c)
     {
+        ChipLogProgress(DeviceLayer, "BLE K32W: Trying to set the PHY to 2M");
+
+        (void) Gap_LeSetPhy(FALSE, deviceId, 0, gConnPhyUpdateReqTxPhySettings_c, gConnPhyUpdateReqRxPhySettings_c,
+                            (uint16_t) gConnPhyUpdateReqPhyOptions_c);
+
         /* Notify App Task that the BLE is connected now */
         (void) blekw_msg_add_u8(BLE_KW_MSG_CONNECTED, (uint8_t) deviceId);
 #if defined(cPWR_UsePowerDownMode) && (cPWR_UsePowerDownMode)
diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn
index e813d8253c48bd..dddeef7374b20a 100644
--- a/src/platform/nxp/k32w/k32w0/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w0/BUILD.gn
@@ -47,6 +47,8 @@ static_library("k32w0") {
     "NFCManagerImpl.h",
     "PlatformManagerImpl.cpp",
     "PlatformManagerImpl.h",
+    "RamStorage.cpp",
+    "RamStorage.h",
     "ble_function_mux.c",
   ]
 
diff --git a/src/platform/nxp/k32w/k32w0/CHIPPlatformConfig.h b/src/platform/nxp/k32w/k32w0/CHIPPlatformConfig.h
index 565dd75ceb88ab..1599a397d25798 100644
--- a/src/platform/nxp/k32w/k32w0/CHIPPlatformConfig.h
+++ b/src/platform/nxp/k32w/k32w0/CHIPPlatformConfig.h
@@ -76,11 +76,3 @@
 #ifndef WDM_PUBLISHER_MAX_NOTIFIES_IN_FLIGHT
 #define WDM_PUBLISHER_MAX_NOTIFIES_IN_FLIGHT 2
 #endif // WDM_PUBLISHER_MAX_NOTIFIES_IN_FLIGHT
-
-/* TODO:
- * https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/2534
- * https://app.slack.com/client/TUK3ZT5EX/G014G30SVV0/thread/G014G30SVV0-1626166816.177800
- */
-#ifndef CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS
-#define CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS 30000
-#endif
diff --git a/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp
index 9fc2bacaf5d8a2..51227fa1019c63 100644
--- a/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp
@@ -24,10 +24,12 @@
 #include <platform/ConnectivityManager.h>
 #include <platform/internal/BLEManager.h>
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
 #include <lwip/dns.h>
 #include <lwip/ip_addr.h>
 #include <lwip/nd6.h>
 #include <lwip/netif.h>
+#endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 #include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
diff --git a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
index 14e4126a066166..6df2cfb5b1785b 100644
--- a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
@@ -27,7 +27,9 @@
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.h>
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
 #include <lwip/tcpip.h>
+#endif
 
 #include <openthread/platform/entropy.h>
 
diff --git a/src/platform/nxp/k32w/k32w0/K32W0Config.cpp b/src/platform/nxp/k32w/k32w0/K32W0Config.cpp
index 6c8e4f9c1f2ad7..bab9d1eb2e618b 100644
--- a/src/platform/nxp/k32w/k32w0/K32W0Config.cpp
+++ b/src/platform/nxp/k32w/k32w0/K32W0Config.cpp
@@ -36,15 +36,26 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
+static ramBufferDescriptor * ramDescr;
+
+constexpr uint16_t kNvmIdChipConfigData  = 0x5000;
+constexpr uint16_t kRamBufferInitialSize = 3072;
+
 CHIP_ERROR K32WConfig::Init()
 {
-    CHIP_ERROR err;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     int pdmStatus;
 
     /* Initialise the Persistent Data Manager */
     pdmStatus = PDM_Init();
     SuccessOrExit(err = MapPdmInitStatus(pdmStatus));
 
+    ramDescr = getRamBuffer(kNvmIdChipConfigData, kRamBufferInitialSize);
+    if (!ramDescr)
+    {
+        err = CHIP_ERROR_NO_MEMORY;
+    }
+
 exit:
     return err;
 }
@@ -53,12 +64,12 @@ CHIP_ERROR K32WConfig::ReadConfigValue(Key key, bool & val)
 {
     CHIP_ERROR err;
     bool tempVal;
-    uint16_t bytesRead;
-    PDM_teStatus pdmStatus;
+    rsError status;
+    uint16_t sizeToRead = sizeof(tempVal);
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    pdmStatus = PDM_eReadDataFromRecord((uint16_t) key, &tempVal, sizeof(bool), &bytesRead);
-    SuccessOrExit(err = MapPdmStatus(pdmStatus));
+    status = ramStorageGet(ramDescr, key, 0, (uint8_t *) &tempVal, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
     val = tempVal;
 
 exit:
@@ -69,22 +80,13 @@ CHIP_ERROR K32WConfig::ReadConfigValue(Key key, uint32_t & val)
 {
     CHIP_ERROR err;
     uint32_t tempVal;
-    uint16_t bytesRead;
-    uint16_t recordSize;
-    PDM_teStatus pdmStatus;
+    rsError status;
+    uint16_t sizeToRead = sizeof(tempVal);
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    if (PDM_bDoesDataExist((uint16_t) key, &recordSize))
-    {
-        pdmStatus = PDM_eReadDataFromRecord((uint16_t) key, &tempVal, sizeof(uint32_t), &bytesRead);
-        SuccessOrExit(err = MapPdmStatus(pdmStatus));
-        val = tempVal;
-    }
-    else
-    {
-        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
-        goto exit;
-    }
+    status = ramStorageGet(ramDescr, key, 0, (uint8_t *) &tempVal, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    val = tempVal;
 
 exit:
     return err;
@@ -93,24 +95,14 @@ CHIP_ERROR K32WConfig::ReadConfigValue(Key key, uint32_t & val)
 CHIP_ERROR K32WConfig::ReadConfigValue(Key key, uint64_t & val)
 {
     CHIP_ERROR err;
-    uint64_t tempVal;
-    uint16_t bytesRead;
-    uint16_t recordSize;
-    PDM_teStatus pdmStatus;
+    uint32_t tempVal;
+    rsError status;
+    uint16_t sizeToRead = sizeof(tempVal);
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-
-    if (PDM_bDoesDataExist((uint16_t) key, &recordSize))
-    {
-        pdmStatus = PDM_eReadDataFromRecord((uint16_t) key, &tempVal, sizeof(uint64_t), &bytesRead);
-        SuccessOrExit(err = MapPdmStatus(pdmStatus));
-        val = tempVal;
-    }
-    else
-    {
-        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
-        goto exit;
-    }
+    status = ramStorageGet(ramDescr, key, 0, (uint8_t *) &tempVal, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    val = tempVal;
 
 exit:
     return err;
@@ -119,130 +111,44 @@ CHIP_ERROR K32WConfig::ReadConfigValue(Key key, uint64_t & val)
 CHIP_ERROR K32WConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
 {
     CHIP_ERROR err;
-    const uint8_t * strEnd;
-    char * pData = NULL;
-    uint16_t bytesRead;
-    uint16_t recordSize;
-    PDM_teStatus pdmStatus;
-
-    outLen = 0;
+    rsError status;
+    uint16_t sizeToRead = bufSize;
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
 
-    if (PDM_bDoesDataExist((uint16_t) key, &recordSize))
-    {
-        pData = (char *) pvPortMalloc(recordSize);
-        VerifyOrExit((pData != NULL), err = CHIP_ERROR_NO_MEMORY);
-
-        pdmStatus = PDM_eReadDataFromRecord((uint16_t) key, pData, recordSize, &bytesRead);
-        SuccessOrExit(err = MapPdmStatus(pdmStatus));
-
-        strEnd = (const uint8_t *) memchr(pData, 0, bytesRead);
-        VerifyOrExit(strEnd != NULL, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-        outLen = strEnd - (const uint8_t *) pData;
-
-        // NOTE: the caller is allowed to pass NULL for buf to query the length of the stored value.
-
-        if (buf != NULL)
-        {
-            VerifyOrExit(bufSize > outLen, err = CHIP_ERROR_BUFFER_TOO_SMALL);
-
-            memcpy(buf, pData, outLen + 1);
-        }
-    }
-    else
-    {
-        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
-        goto exit;
-    }
+    // We can call ramStorageGet with null pointer to only retrieve the size
+    status = ramStorageGet(ramDescr, key, 0, (uint8_t *) buf, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    outLen = sizeToRead;
 
 exit:
-    if (pData != NULL)
-    {
-        vPortFree((void *) pData);
-    }
     return err;
 }
 
 CHIP_ERROR K32WConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
 {
-    CHIP_ERROR err;
-    uint8_t * pData = NULL;
-    uint16_t bytesRead;
-    uint16_t recordSize;
-    PDM_teStatus pdmStatus;
-
-    outLen = 0;
-
-    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-
-    if (PDM_bDoesDataExist((uint16_t) key, &recordSize))
-    {
-        pData = (uint8_t *) pvPortMalloc(recordSize);
-        VerifyOrExit((pData != NULL), err = CHIP_ERROR_NO_MEMORY);
-
-        pdmStatus = PDM_eReadDataFromRecord((uint16_t) key, pData, recordSize, &bytesRead);
-        SuccessOrExit(err = MapPdmStatus(pdmStatus));
-
-        if (buf != NULL)
-        {
-            VerifyOrExit((bufSize >= bytesRead), err = CHIP_ERROR_BUFFER_TOO_SMALL);
-            memcpy(buf, pData, bytesRead);
-        }
-        outLen = bytesRead;
-    }
-    else
-    {
-        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
-        goto exit;
-    }
-
-exit:
-    if (pData != NULL)
-    {
-        vPortFree((void *) pData);
-    }
-
-    return err;
+    return ReadConfigValueStr(key, (char *) buf, bufSize, outLen);
 }
 
 CHIP_ERROR K32WConfig::ReadConfigValueCounter(uint8_t counterIdx, uint32_t & val)
 {
-    CHIP_ERROR err;
-    uint32_t tempVal;
-    uint16_t bytesRead;
-    uint16_t recordSize;
-    PDM_teStatus pdmStatus;
-
     Key key = kMinConfigKey_ChipCounter + counterIdx;
-    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-
-    if (PDM_bDoesDataExist((uint16_t) key, &recordSize))
-    {
-        pdmStatus = PDM_eReadDataFromRecord((uint16_t) key, &tempVal, sizeof(uint32_t), &bytesRead);
-        SuccessOrExit(err = MapPdmStatus(pdmStatus));
-        val = tempVal;
-    }
-    else
-    {
-        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
-        goto exit;
-    }
-
-exit:
-    return err;
+    return ReadConfigValue(key, val);
 }
 
 CHIP_ERROR K32WConfig::WriteConfigValue(Key key, bool val)
 {
     CHIP_ERROR err;
+    rsError status;
     PDM_teStatus pdmStatus;
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    pdmStatus = PDM_eSaveRecordData((uint16_t) key, &val, sizeof(bool));
-    SuccessOrExit(err = MapPdmStatus(pdmStatus));
+    status = ramStorageSet(&ramDescr, key, (uint8_t *) &val, sizeof(bool));
+    SuccessOrExit(err = MapRamStorageStatus(status));
 
+    pdmStatus =
+        PDM_eSaveRecordDataInIdleTask((uint16_t) kNvmIdChipConfigData, ramDescr, ramDescr->ramBufferLen + kRamDescHeaderSize);
+    SuccessOrExit(err = MapPdmStatus(pdmStatus));
 exit:
     return err;
 }
@@ -250,10 +156,15 @@ CHIP_ERROR K32WConfig::WriteConfigValue(Key key, bool val)
 CHIP_ERROR K32WConfig::WriteConfigValue(Key key, uint32_t val)
 {
     CHIP_ERROR err;
+    rsError status;
     PDM_teStatus pdmStatus;
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    pdmStatus = PDM_eSaveRecordData((uint16_t) key, &val, sizeof(uint32_t));
+    status = ramStorageSet(&ramDescr, key, (uint8_t *) &val, sizeof(uint32_t));
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    pdmStatus =
+        PDM_eSaveRecordDataInIdleTask((uint16_t) kNvmIdChipConfigData, ramDescr, ramDescr->ramBufferLen + kRamDescHeaderSize);
     SuccessOrExit(err = MapPdmStatus(pdmStatus));
 
 exit:
@@ -263,10 +174,15 @@ CHIP_ERROR K32WConfig::WriteConfigValue(Key key, uint32_t val)
 CHIP_ERROR K32WConfig::WriteConfigValue(Key key, uint64_t val)
 {
     CHIP_ERROR err;
+    rsError status;
     PDM_teStatus pdmStatus;
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    pdmStatus = PDM_eSaveRecordData((uint16_t) key, &val, sizeof(uint64_t));
+    status = ramStorageSet(&ramDescr, key, (uint8_t *) &val, sizeof(uint64_t));
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    pdmStatus =
+        PDM_eSaveRecordDataInIdleTask((uint16_t) kNvmIdChipConfigData, ramDescr, ramDescr->ramBufferLen + kRamDescHeaderSize);
     SuccessOrExit(err = MapPdmStatus(pdmStatus));
 
 exit:
@@ -282,25 +198,18 @@ CHIP_ERROR K32WConfig::WriteConfigValueStr(Key key, const char * str, size_t str
 {
     CHIP_ERROR err;
     PDM_teStatus pdmStatus;
+    rsError status;
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
 
     if (str != NULL)
     {
-        uint8_t * pData = (uint8_t *) pvPortMalloc(strLen + 1);
-
-        if (pData != NULL)
-        {
-            memcpy(pData, str, strLen);
-            pData[strLen] = '\0';
-            pdmStatus     = PDM_eSaveRecordData((uint16_t) key, (void *) pData, strLen + 1);
-            vPortFree((void *) pData);
-            SuccessOrExit(err = MapPdmStatus(pdmStatus));
-        }
-        else
-        {
-            err = CHIP_ERROR_NO_MEMORY;
-        }
+        status = ramStorageSet(&ramDescr, key, (uint8_t *) str, strLen);
+        SuccessOrExit(err = MapRamStorageStatus(status));
+
+        pdmStatus =
+            PDM_eSaveRecordDataInIdleTask((uint16_t) kNvmIdChipConfigData, ramDescr, ramDescr->ramBufferLen + kRamDescHeaderSize);
+        SuccessOrExit(err = MapPdmStatus(pdmStatus));
     }
     else
     {
@@ -314,48 +223,28 @@ CHIP_ERROR K32WConfig::WriteConfigValueStr(Key key, const char * str, size_t str
 
 CHIP_ERROR K32WConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
 {
-    CHIP_ERROR err;
-    PDM_teStatus pdmStatus;
-
-    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-
-    if ((data != NULL) && (dataLen > 0))
-    {
-        pdmStatus = PDM_eSaveRecordData((uint16_t) key, (void *) data, dataLen);
-        SuccessOrExit(err = MapPdmStatus(pdmStatus));
-    }
-    else
-    {
-        err = ClearConfigValue(key);
-        SuccessOrExit(err);
-    }
-
-exit:
-    return err;
+    return WriteConfigValueStr(key, (char *) data, dataLen);
 }
 
 CHIP_ERROR K32WConfig::WriteConfigValueCounter(uint8_t counterIdx, uint32_t val)
 {
-    CHIP_ERROR err;
-    PDM_teStatus pdmStatus;
-
     Key key = kMinConfigKey_ChipCounter + counterIdx;
-    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    pdmStatus = PDM_eSaveRecordData((uint16_t) key, &val, sizeof(uint32_t));
-    SuccessOrExit(err = MapPdmStatus(pdmStatus));
-
-exit:
-    return err;
+    return WriteConfigValue(key, val);
 }
 
 CHIP_ERROR K32WConfig::ClearConfigValue(Key key)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
+    rsError status;
+    PDM_teStatus pdmStatus;
 
     VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    PDM_vDeleteDataRecord((uint16_t) key);
+    status = ramStorageDelete(ramDescr, key, 0);
+    SuccessOrExit(err = MapRamStorageStatus(status));
 
-    SuccessOrExit(err);
+    pdmStatus =
+        PDM_eSaveRecordDataInIdleTask((uint16_t) kNvmIdChipConfigData, ramDescr, ramDescr->ramBufferLen + kRamDescHeaderSize);
+    SuccessOrExit(err = MapPdmStatus(pdmStatus));
 
 exit:
     return err;
@@ -363,66 +252,73 @@ CHIP_ERROR K32WConfig::ClearConfigValue(Key key)
 
 bool K32WConfig::ConfigValueExists(Key key)
 {
-    CHIP_ERROR err;
-    uint16_t size = 0;
-
-    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
-    VerifyOrExit(PDM_bDoesDataExist((uint16_t) key, &size), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
+    rsError status;
+    uint16_t sizeToRead;
+    bool found = false;
 
-exit:
-    // Return true if the record was found.
-    return (err == CHIP_NO_ERROR);
+    if (ValidConfigKey(key))
+    {
+        status = ramStorageGet(ramDescr, key, 0, NULL, &sizeToRead);
+        found  = (status == RS_ERROR_NONE && sizeToRead != 0);
+    }
+    return found;
 }
 
 CHIP_ERROR K32WConfig::FactoryResetConfig(void)
 {
-    CHIP_ERROR err;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    PDM_teStatus pdmStatus;
 
-    err = FactoryResetConfigInternal(kMinConfigKey_ChipConfig, kMaxConfigKey_ChipConfig);
+    FactoryResetConfigInternal(kMinConfigKey_ChipConfig, kMaxConfigKey_ChipConfig);
+    FactoryResetConfigInternal(kMinConfigKey_KVSKey, kMaxConfigKey_KVSKey);
+    FactoryResetConfigInternal(kMinConfigKey_KVSValue, kMaxConfigKey_KVSValue);
 
-    if (err == CHIP_NO_ERROR)
-    {
-        err = FactoryResetConfigInternal(kMinConfigKey_KVS, kMaxConfigKey_KVS);
-    }
+    pdmStatus = PDM_eSaveRecordData((uint16_t) kNvmIdChipConfigData, ramDescr, ramDescr->ramBufferLen + kRamDescHeaderSize);
+    SuccessOrExit(err = MapPdmStatus(pdmStatus));
 
+exit:
     return err;
 }
 
-CHIP_ERROR K32WConfig::FactoryResetConfigInternal(Key firstKey, Key lastKey)
+void K32WConfig::FactoryResetConfigInternal(Key firstKey, Key lastKey)
 {
-    CHIP_ERROR err;
-
-    // Iterate over all the CHIP Config PDM ID records and delete each one
-    err = ForEachRecord(firstKey, lastKey, false, [](const Key & pdmKey, const size_t & length) -> CHIP_ERROR {
-        CHIP_ERROR err2;
-
-        err2 = ClearConfigValue(pdmKey);
-        SuccessOrExit(err2);
+    for (Key key = firstKey; key <= lastKey; key++)
+    {
+        ramStorageDelete(ramDescr, key, 0);
+    }
+}
 
-    exit:
-        return err2;
-    });
+CHIP_ERROR K32WConfig::MapPdmStatus(PDM_teStatus pdmStatus)
+{
+    CHIP_ERROR err;
 
-    // Return success at end of iterations.
-    if (err == CHIP_END_OF_INPUT)
+    switch (pdmStatus)
     {
+    case PDM_E_STATUS_OK:
         err = CHIP_NO_ERROR;
+        break;
+    default:
+        err = CHIP_ERROR(ChipError::Range::kPlatform, pdmStatus);
+        break;
     }
 
     return err;
 }
 
-CHIP_ERROR K32WConfig::MapPdmStatus(PDM_teStatus pdmStatus)
+CHIP_ERROR K32WConfig::MapRamStorageStatus(rsError rsStatus)
 {
     CHIP_ERROR err;
 
-    switch (pdmStatus)
+    switch (rsStatus)
     {
-    case PDM_E_STATUS_OK:
+    case RS_ERROR_NONE:
         err = CHIP_NO_ERROR;
         break;
+    case RS_ERROR_NOT_FOUND:
+        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
+        break;
     default:
-        err = CHIP_ERROR(ChipError::Range::kPlatform, pdmStatus);
+        err = CHIP_ERROR_BUFFER_TOO_SMALL;
         break;
     }
 
@@ -437,8 +333,7 @@ CHIP_ERROR K32WConfig::MapPdmInitStatus(int pdmStatus)
 bool K32WConfig::ValidConfigKey(Key key)
 {
     // Returns true if the key is in the valid CHIP Config PDM key range.
-
-    if ((key >= kMinConfigKey_ChipFactory) && (key <= kMaxConfigKey_KVS))
+    if ((key >= kMinConfigKey_ChipFactory) && (key <= kMaxConfigKey_KVSValue))
     {
         return true;
     }
@@ -446,40 +341,6 @@ bool K32WConfig::ValidConfigKey(Key key)
     return false;
 }
 
-CHIP_ERROR K32WConfig::ForEachRecord(Key firstKey, Key lastKey, bool addNewRecord, ForEachRecordFunct funct)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    for (Key pdmKey = firstKey; pdmKey <= lastKey; pdmKey++)
-    {
-        uint16_t dataLen;
-
-        if (PDM_bDoesDataExist((uint16_t) pdmKey, &dataLen))
-        {
-            if (!addNewRecord)
-            {
-                // Invoke the caller's function
-                // (for retrieve,store,delete,enumerate GroupKey operations).
-                err = funct(pdmKey, dataLen);
-            }
-        }
-        else
-        {
-            if (addNewRecord)
-            {
-                // Invoke caller's function
-                // (for add GroupKey operation).
-                err = funct(pdmKey, dataLen);
-            }
-        }
-
-        SuccessOrExit(err);
-    }
-
-exit:
-    return err;
-}
-
 void K32WConfig::RunConfigUnitTest() {}
 
 } // namespace Internal
diff --git a/src/platform/nxp/k32w/k32w0/K32W0Config.h b/src/platform/nxp/k32w/k32w0/K32W0Config.h
index bae56b39845996..803149947a7a71 100644
--- a/src/platform/nxp/k32w/k32w0/K32W0Config.h
+++ b/src/platform/nxp/k32w/k32w0/K32W0Config.h
@@ -29,6 +29,7 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include "PDM.h"
+#include "RamStorage.h"
 
 namespace chip {
 namespace DeviceLayer {
@@ -59,7 +60,9 @@ class K32WConfig
                                                          *   Cleared during factory reset. */
     static constexpr uint8_t kPDMId_ChipCounter = 0x03; /**< PDM id for settings containing dynamic counter values set at runtime.
                                                          *   Retained during factory reset. */
-    static constexpr uint8_t kPDMId_KVS = 0x04;         /**< PDM id for settings containing KVS set at runtime.
+    static constexpr uint8_t kPDMId_KVSKey = 0x04;      /**< PDM id for settings containing KVS keys set at runtime.
+                                                         *   Cleared during factory reset. */
+    static constexpr uint8_t kPDMId_KVSValue = 0x05;    /**< PDM id for settings containing KVS values set at runtime.
                                                          *   Cleared during factory reset. */
 
     using Key = uint32_t;
@@ -104,8 +107,10 @@ class K32WConfig
     static constexpr Key kMaxConfigKey_ChipConfig  = K32WConfigKey(kPDMId_ChipConfig, 0xFF);
     static constexpr Key kMinConfigKey_ChipCounter = K32WConfigKey(kPDMId_ChipCounter, 0x00);
     static constexpr Key kMaxConfigKey_ChipCounter = K32WConfigKey(kPDMId_ChipCounter, 0xFF); // Allows 32 Counters to be created.
-    static constexpr Key kMinConfigKey_KVS         = K32WConfigKey(kPDMId_KVS, 0x00);
-    static constexpr Key kMaxConfigKey_KVS         = K32WConfigKey(kPDMId_KVS, 0xFF);
+    static constexpr Key kMinConfigKey_KVSKey      = K32WConfigKey(kPDMId_KVSKey, 0x00);
+    static constexpr Key kMaxConfigKey_KVSKey      = K32WConfigKey(kPDMId_KVSKey, 0xFF);
+    static constexpr Key kMinConfigKey_KVSValue    = K32WConfigKey(kPDMId_KVSValue, 0x00);
+    static constexpr Key kMaxConfigKey_KVSValue    = K32WConfigKey(kPDMId_KVSValue, 0xFF);
 
     static CHIP_ERROR Init(void);
 
@@ -131,15 +136,14 @@ class K32WConfig
     static void RunConfigUnitTest(void);
 
 protected:
-    using ForEachRecordFunct = std::function<CHIP_ERROR(const Key & PDMIdKey, const size_t & length)>;
-    static CHIP_ERROR ForEachRecord(Key firstKey, Key lastKey, bool addNewRecord, ForEachRecordFunct funct);
     static constexpr uint8_t GetPDMId(uint32_t key);
     static constexpr uint8_t GetRecordKey(uint32_t key);
 
 private:
     static CHIP_ERROR MapPdmStatus(PDM_teStatus pdmStatus);
+    static CHIP_ERROR MapRamStorageStatus(rsError rsStatus);
     static CHIP_ERROR MapPdmInitStatus(int pdmStatus);
-    static CHIP_ERROR FactoryResetConfigInternal(Key firstKey, Key lastKey);
+    static void FactoryResetConfigInternal(Key firstKey, Key lastKey);
 };
 
 /**
diff --git a/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.cpp
index 09fe21772150b4..8cd1914211f121 100644
--- a/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.cpp
@@ -38,230 +38,187 @@ namespace DeviceLayer {
 namespace PersistedStorage {
 
 /* TODO: adjust these values */
-constexpr size_t kMaxNumberOfKeys  = 30;
+constexpr size_t kMaxNumberOfKeys  = 150;
 constexpr size_t kMaxKeyValueBytes = 255;
 
 KeyValueStoreManagerImpl KeyValueStoreManagerImpl::sInstance;
 
-/* hashmap having:
- * 	- the matter key string as key;
- * 	- internal PDM identifier as value;
- */
-std::unordered_map<std::string, uint8_t> g_kvs_map;
-
-/* set containing used PDM identifiers */
-std::set<uint8_t> g_key_ids_set;
-
-/* used to check if we need to restore values from flash (e.g.: reset) */
-static bool g_restored_from_flash = false;
-
-CHIP_ERROR RestoreFromFlash()
+uint16_t GetStringKeyId(const char * key, uint16_t * freeId)
 {
-    CHIP_ERROR err                        = CHIP_NO_ERROR;
-    uint8_t key_id                        = 0;
-    char key_string_id[kMaxKeyValueBytes] = { 0 };
-    size_t key_string_id_size             = 0;
-    uint8_t pdm_id_kvs                    = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVS;
-    uint16_t pdm_internal_id              = 0;
-
-    if (g_restored_from_flash)
-    {
-        /* already restored from flash, nothing to do */
-        return err;
-    }
-
-    for (key_id = 0; key_id < kMaxNumberOfKeys; key_id++)
+    CHIP_ERROR err                    = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    uint8_t keyId                     = 0;
+    uint8_t pdmIdKvsKey               = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVSKey;
+    bool bFreeIdxFound                = false;
+    char keyString[kMaxKeyValueBytes] = { 0 };
+    size_t keyStringSize              = 0;
+    uint16_t pdmInternalId;
+
+    for (keyId = 0; keyId < kMaxNumberOfKeys; keyId++)
     {
-        /* key was saved as string in flash (key_string_id) using (key_id + kMaxNumberOfKeys) as PDM key
-         * value corresponding to key_string_id was saved in flash using key_id as PDM key
-         */
-
-        pdm_internal_id = chip::DeviceLayer::Internal::K32WConfigKey(pdm_id_kvs, key_id + kMaxNumberOfKeys);
-        err = chip::DeviceLayer::Internal::K32WConfig::ReadConfigValueStr(pdm_internal_id, key_string_id, kMaxKeyValueBytes,
-                                                                          key_string_id_size);
-
-        if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-        {
-            err = CHIP_NO_ERROR;
-            continue;
-        }
-        else if (err != CHIP_NO_ERROR)
-        {
-            ChipLogProgress(DeviceLayer, "KVS, Error while restoring Matter key [%s] from flash with PDM id: %i", key_string_id,
-                            pdm_internal_id);
-            return err;
-        }
+        pdmInternalId = chip::DeviceLayer::Internal::K32WConfigKey(pdmIdKvsKey, keyId);
+        err =
+            chip::DeviceLayer::Internal::K32WConfig::ReadConfigValueStr(pdmInternalId, keyString, kMaxKeyValueBytes, keyStringSize);
 
-        if (key_string_id_size)
+        if (err == CHIP_NO_ERROR)
         {
-            g_key_ids_set.insert(key_id);
-            key_string_id_size = 0;
-            if (!g_kvs_map.insert(std::make_pair(std::string(key_string_id), key_id)).second)
-            {
-                /* key collision is not expected when restoring from flash */
-                ChipLogProgress(DeviceLayer, "KVS, Unexpected collision while restoring Matter key [%s] from flash with PDM id: %i",
-                                key_string_id, pdm_internal_id);
-            }
-            else
+            if (strcmp(key, keyString) == 0)
             {
-                ChipLogProgress(DeviceLayer, "KVS, restored Matter key [%s] from flash with PDM id: %i", key_string_id,
-                                pdm_internal_id);
+                // found the entry we are looking for
+                break;
             }
         }
+        else if ((NULL != freeId) && (false == bFreeIdxFound))
+        {
+            bFreeIdxFound = true;
+            *freeId       = keyId;
+        }
     }
-
-    g_restored_from_flash = true;
-
-    return err;
+    return keyId;
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size,
                                           size_t offset_bytes)
 {
-    CHIP_ERROR err     = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
-    uint8_t pdm_id_kvs = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVS;
-    std::unordered_map<std::string, uint8_t>::const_iterator it;
-    size_t read_bytes        = 0;
-    uint8_t key_id           = 0;
-    uint16_t pdm_internal_id = 0;
+    CHIP_ERROR err         = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    uint8_t pdmIdKvsValue  = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVSValue;
+    size_t read_bytes      = 0;
+    uint8_t keyId          = 0;
+    uint16_t pdmInternalId = 0;
 
-    VerifyOrExit((key != NULL) && (value != NULL) && (RestoreFromFlash() == CHIP_NO_ERROR), err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit((key != NULL) && (value != NULL), err = CHIP_ERROR_INVALID_ARGUMENT);
 
-    if ((it = g_kvs_map.find(key)) != g_kvs_map.end())
-    {
-        key_id          = it->second;
-        pdm_internal_id = chip::DeviceLayer::Internal::K32WConfigKey(pdm_id_kvs, key_id);
+    keyId = GetStringKeyId(key, NULL);
 
-        err =
-            chip::DeviceLayer::Internal::K32WConfig::ReadConfigValueBin(pdm_internal_id, (uint8_t *) value, value_size, read_bytes);
+    if (keyId < kMaxNumberOfKeys)
+    {
+        // This is the ID of the actual data
+        pdmInternalId = chip::DeviceLayer::Internal::K32WConfigKey(pdmIdKvsValue, keyId);
+        err = chip::DeviceLayer::Internal::K32WConfig::ReadConfigValueBin(pdmInternalId, (uint8_t *) value, value_size, read_bytes);
         *read_bytes_size = read_bytes;
 
-        ChipLogProgress(DeviceLayer, "KVS, get Matter key [%s] with PDM id: %i", key, pdm_internal_id);
+        ChipLogProgress(DeviceLayer, "KVS, get Matter key [%s] with PDM id: %i", key, pdmInternalId);
     }
 
 exit:
+    ConvertError(err);
     return err;
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value, size_t value_size)
 {
-    CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
-    uint8_t key_id;
-    bool_t put_key     = false;
-    uint8_t pdm_id_kvs = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVS;
-    std::unordered_map<std::string, uint8_t>::const_iterator it;
-    uint16_t pdm_internal_id = 0;
+    CHIP_ERROR err         = CHIP_ERROR_INVALID_ARGUMENT;
+    bool_t putKey          = false;
+    uint8_t pdmIdKvsKey    = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVSKey;
+    uint8_t pdmIdKvsValue  = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVSValue;
+    uint16_t pdmInternalId = 0;
+    uint16_t freeKeyId;
+    uint8_t keyId;
 
-    VerifyOrExit((key != NULL) && (value != NULL) && (RestoreFromFlash() == CHIP_NO_ERROR), err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit((key != NULL) && (value != NULL), err = CHIP_ERROR_INVALID_ARGUMENT);
 
-    if ((it = g_kvs_map.find(key)) == g_kvs_map.end()) /* new key */
-    {
-        for (key_id = 0; key_id < kMaxNumberOfKeys; key_id++)
-        {
-            std::set<uint8_t>::iterator iter = std::find(g_key_ids_set.begin(), g_key_ids_set.end(), key_id);
-
-            if (iter == g_key_ids_set.end())
-            {
-                if (g_key_ids_set.size() >= kMaxNumberOfKeys)
-                {
-                    return CHIP_ERROR_NO_MEMORY;
-                }
+    keyId = GetStringKeyId(key, &freeKeyId);
 
-                g_key_ids_set.insert(key_id);
-
-                put_key = true;
-                break;
-            }
-        }
+    // Key already exists
+    if (keyId < kMaxNumberOfKeys)
+    {
+        // Update just the value in this case
+        putKey = false;
     }
-    else /* overwrite key */
+    else
     {
-        put_key = true;
-        key_id  = it->second;
+        // Need to write both the value and the string key
+        putKey = true;
+        keyId  = freeKeyId;
     }
 
-    if (put_key)
-    {
-        pdm_internal_id = chip::DeviceLayer::Internal::K32WConfigKey(pdm_id_kvs, key_id);
-        ChipLogProgress(DeviceLayer, "KVS, save in flash the value of the Matter key [%s] with PDM id: %i", key, pdm_internal_id);
+    pdmInternalId = chip::DeviceLayer::Internal::K32WConfigKey(pdmIdKvsValue, keyId);
+    ChipLogProgress(DeviceLayer, "KVS, save in flash the value of the Matter key [%s] with PDM id: %i", key, pdmInternalId);
 
-        g_kvs_map.insert(std::make_pair(std::string(key), key_id));
-        err = chip::DeviceLayer::Internal::K32WConfig::WriteConfigValueBin(pdm_internal_id, (uint8_t *) value, value_size);
+    err = chip::DeviceLayer::Internal::K32WConfig::WriteConfigValueBin(pdmInternalId, (uint8_t *) value, value_size);
 
-        /* save the 'key' in flash such that it can be retrieved later on */
-        if (err == CHIP_NO_ERROR)
+    /* save the 'key' in flash such that it can be retrieved later on */
+    if (err == CHIP_NO_ERROR)
+    {
+        if (true == putKey)
         {
-            pdm_internal_id = chip::DeviceLayer::Internal::K32WConfigKey(pdm_id_kvs, key_id + kMaxNumberOfKeys);
-            ChipLogProgress(DeviceLayer, "KVS, save in flash the Matter key [%s] with PDM id: %i", key, pdm_internal_id);
+            pdmInternalId = chip::DeviceLayer::Internal::K32WConfigKey(pdmIdKvsKey, keyId);
+            ChipLogProgress(DeviceLayer, "KVS, save in flash the Matter key [%s] with PDM id: %i", key, pdmInternalId);
 
-            /* TODO (MATTER-132): do we need to make sure that "key" is NULL-terminated? */
-            err = chip::DeviceLayer::Internal::K32WConfig::WriteConfigValueStr(pdm_internal_id, key, strlen(key) + 1);
+            err = chip::DeviceLayer::Internal::K32WConfig::WriteConfigValueStr(pdmInternalId, key, strlen(key) + 1);
 
             if (err != CHIP_NO_ERROR)
             {
                 ChipLogProgress(DeviceLayer, "KVS, Error while saving in flash the Matter key [%s] with PDM id: %i", key,
-                                pdm_internal_id);
+                                pdmInternalId);
             }
         }
-        else
-        {
-            ChipLogProgress(DeviceLayer, "KVS, Error while saving in flash the value of the Matter key [%s] with PDM id: %i", key,
-                            pdm_internal_id);
-        }
+    }
+    else
+    {
+        ChipLogProgress(DeviceLayer, "KVS, Error while saving in flash the value of the Matter key [%s] with PDM id: %i", key,
+                        pdmInternalId);
     }
 
 exit:
+    ConvertError(err);
     return err;
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 {
-    CHIP_ERROR err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
-    std::unordered_map<std::string, uint8_t>::const_iterator it;
-    uint8_t pdm_id_kvs       = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVS;
-    uint8_t key_id           = 0;
-    uint16_t pdm_internal_id = 0;
+    CHIP_ERROR err         = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    uint8_t pdmIdKvsKey    = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVSKey;
+    uint8_t pdmIdKvsValue  = chip::DeviceLayer::Internal::K32WConfig::kPDMId_KVSValue;
+    uint8_t keyId          = 0;
+    uint16_t pdmInternalId = 0;
 
-    VerifyOrExit((key != NULL) && (RestoreFromFlash() == CHIP_NO_ERROR), err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit((key != NULL), err = CHIP_ERROR_INVALID_ARGUMENT);
 
-    if ((it = g_kvs_map.find(key)) != g_kvs_map.end())
-    {
-        key_id          = it->second;
-        pdm_internal_id = chip::DeviceLayer::Internal::K32WConfigKey(pdm_id_kvs, key_id);
+    keyId = GetStringKeyId(key, NULL);
 
-        g_key_ids_set.erase(key_id);
-        g_kvs_map.erase(it);
+    if (keyId < kMaxNumberOfKeys)
+    {
+        // entry exists so we can remove it
+        pdmInternalId = chip::DeviceLayer::Internal::K32WConfigKey(pdmIdKvsKey, keyId);
 
-        ChipLogProgress(DeviceLayer, "KVS, delete from flash the Matter key [%s] with PDM id: %i", key, pdm_internal_id);
-        err = chip::DeviceLayer::Internal::K32WConfig::ClearConfigValue(pdm_internal_id);
+        ChipLogProgress(DeviceLayer, "KVS, delete from flash the Matter key [%s] with PDM id: %i", key, pdmInternalId);
+        err = chip::DeviceLayer::Internal::K32WConfig::ClearConfigValue(pdmInternalId);
 
         /* also delete the 'key string' from flash */
         if (err == CHIP_NO_ERROR)
         {
-            pdm_internal_id = chip::DeviceLayer::Internal::K32WConfigKey(pdm_id_kvs, key_id + kMaxNumberOfKeys);
+            pdmInternalId = chip::DeviceLayer::Internal::K32WConfigKey(pdmIdKvsValue, keyId);
             ChipLogProgress(DeviceLayer, "KVS, delete from flash the value of the Matter key [%s] with PDM id: %i", key,
-                            pdm_internal_id);
+                            pdmInternalId);
 
-            err = chip::DeviceLayer::Internal::K32WConfig::ClearConfigValue(pdm_internal_id);
+            err = chip::DeviceLayer::Internal::K32WConfig::ClearConfigValue(pdmInternalId);
 
             if (err != CHIP_NO_ERROR)
             {
                 ChipLogProgress(DeviceLayer,
                                 "KVS, Error while deleting from flash the value of the Matter key [%s] with PDM id: %i", key,
-                                pdm_internal_id);
+                                pdmInternalId);
             }
         }
         else
         {
             ChipLogProgress(DeviceLayer, "KVS, Error while deleting from flash the Matter key [%s] with PDM id: %i", key,
-                            pdm_internal_id);
+                            pdmInternalId);
         }
     }
-
 exit:
+    ConvertError(err);
     return err;
 }
 
+void KeyValueStoreManagerImpl::ConvertError(CHIP_ERROR & err)
+{
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    }
+}
+
 } // namespace PersistedStorage
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.h b/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.h
index c62eb65c0bc388..0b0a09178ed44d 100644
--- a/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.h
+++ b/src/platform/nxp/k32w/k32w0/KeyValueStoreManagerImpl.h
@@ -47,6 +47,11 @@ class KeyValueStoreManagerImpl final : public KeyValueStoreManager
     friend KeyValueStoreManager & KeyValueStoreMgr();
     friend KeyValueStoreManagerImpl & KeyValueStoreMgrImpl();
 
+    // Reading config values uses the K32WConfig API, which returns CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND
+    // error if a key was not found. Convert this error to the correct error KeyValueStoreManagerImpl
+    // should return: CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND
+    void ConvertError(CHIP_ERROR & err);
+
     static KeyValueStoreManagerImpl sInstance;
 };
 
diff --git a/src/platform/nxp/k32w/k32w0/Logging.cpp b/src/platform/nxp/k32w/k32w0/Logging.cpp
index 4d3a5ce2f8c9c5..eca2baf51216c1 100644
--- a/src/platform/nxp/k32w/k32w0/Logging.cpp
+++ b/src/platform/nxp/k32w/k32w0/Logging.cpp
@@ -157,6 +157,7 @@ void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char
 #undef K32W_LOG_MODULE_NAME
 #define K32W_LOG_MODULE_NAME lwip
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
 /**
  * LwIP log output function.
  */
@@ -169,6 +170,7 @@ extern "C" void ENFORCE_FORMAT(1, 2) LwIPLog(const char * msg, ...)
     GenericLog(msg, v, module, chip::Logging::kLogCategory_None);
     va_end(v);
 }
+#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
diff --git a/src/platform/nxp/k32w/k32w0/PlatformManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/PlatformManagerImpl.cpp
index ef6c5c3556d1dd..95303b4e922666 100644
--- a/src/platform/nxp/k32w/k32w0/PlatformManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/PlatformManagerImpl.cpp
@@ -31,7 +31,9 @@
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 #include <platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.h>
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
 #include <lwip/tcpip.h>
+#endif
 
 #include <openthread/platform/entropy.h>
 
@@ -114,8 +116,10 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     mStartTime = System::SystemClock().GetMonotonicTimestamp();
 
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
     // Initialize LwIP.
     tcpip_init(NULL, NULL);
+#endif
 
     err = chip::Crypto::add_entropy_source(app_entropy_source, NULL, 16);
     SuccessOrExit(err);
diff --git a/src/platform/nxp/k32w/k32w0/RamStorage.cpp b/src/platform/nxp/k32w/k32w0/RamStorage.cpp
new file mode 100644
index 00000000000000..4d23aa7024ad64
--- /dev/null
+++ b/src/platform/nxp/k32w/k32w0/RamStorage.cpp
@@ -0,0 +1,283 @@
+/*
+ *
+ *    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.
+ */
+
+/**
+ *    @file
+ *        NVM Writes are time-consuming so instead of blocking the main tasks (e.g.: Matter)
+ *        buffer the writes in a RAM buffer that gets to be written in the Idle Task
+ */
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "FunctionLib.h"
+#include "RamStorage.h"
+
+#ifndef RAM_STORAGE_LOG
+#define RAM_STORAGE_LOG 0
+#endif
+
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#if RAM_STORAGE_LOG
+#include "fsl_debug_console.h"
+#define RAM_STORAGE_PRINTF(...)                                                                                                    \
+    PRINTF("[%s] ", __FUNCTION__);                                                                                                 \
+    PRINTF(__VA_ARGS__);                                                                                                           \
+    PRINTF("\n\r");
+#else
+#define RAM_STORAGE_PRINTF(...)
+#endif
+
+/* increment size for dynamic memory re-allocation in case the
+ * initial RAM buffer size gets insufficient
+ */
+constexpr size_t kRamBufferReallocSize  = 512;
+constexpr size_t kRamBufferMaxAllocSize = 10240;
+
+ramBufferDescriptor * getRamBuffer(uint16_t nvmId, uint16_t initialSize)
+{
+    ramBufferDescriptor * ramDescr = NULL;
+    bool bLoadDataFromNvm          = false;
+    uint16_t bytesRead             = 0;
+    uint16_t recordSize            = 0;
+    uint16_t allocSize             = initialSize;
+
+    /* Check if dataset is present and get its size */
+    if (PDM_bDoesDataExist(nvmId, &recordSize))
+    {
+        bLoadDataFromNvm = true;
+        while (recordSize > allocSize)
+        {
+            // increase size until NVM data fits
+            allocSize += kRamBufferReallocSize;
+        }
+    }
+
+    if (allocSize <= kRamBufferMaxAllocSize)
+    {
+        ramDescr = (ramBufferDescriptor *) malloc(allocSize);
+        if (ramDescr)
+        {
+            ramDescr->ramBufferLen    = 0;
+            ramDescr->ramBufferMaxLen = allocSize - kRamDescHeaderSize;
+
+            if (bLoadDataFromNvm)
+            {
+                /* Try to load the dataset in RAM */
+                if (PDM_E_STATUS_OK != PDM_eReadDataFromRecord(nvmId, ramDescr, recordSize, &bytesRead))
+                {
+                    memset(ramDescr, 0, allocSize);
+                }
+            }
+        }
+    }
+
+    return ramDescr;
+}
+
+static rsError ramStorageAdd(ramBufferDescriptor * pBuffer, uint16_t aKey, const uint8_t * aValue, uint16_t aValueLength)
+{
+    rsError error                     = RS_ERROR_NONE;
+    struct settingsBlock currentBlock = { 0 };
+    const uint16_t newBlockLength     = sizeof(settingsBlock) + aValueLength;
+
+    if (pBuffer->ramBufferLen + newBlockLength <= pBuffer->ramBufferMaxLen)
+    {
+        currentBlock.key    = aKey;
+        currentBlock.length = aValueLength;
+
+        memcpy(&pBuffer->pRamBuffer[pBuffer->ramBufferLen], &currentBlock, sizeof(settingsBlock));
+        memcpy(&pBuffer->pRamBuffer[pBuffer->ramBufferLen + sizeof(settingsBlock)], aValue, aValueLength);
+        pBuffer->ramBufferLen += newBlockLength;
+
+        error = RS_ERROR_NONE;
+    }
+    else
+    {
+        error = RS_ERROR_NO_BUFS;
+    }
+
+    RAM_STORAGE_PRINTF("key = %d lengthWriten = %d err = %d", aKey, aValueLength, error);
+
+    return error;
+}
+
+rsError ramStorageGet(const ramBufferDescriptor * pBuffer, uint16_t aKey, int aIndex, uint8_t * aValue, uint16_t * aValueLength)
+{
+    uint16_t i                        = 0;
+    uint16_t valueLength              = 0;
+    uint16_t readLength               = 0;
+    int currentIndex                  = 0;
+    struct settingsBlock currentBlock = { 0 };
+    rsError error                     = RS_ERROR_NOT_FOUND;
+
+    while (i < pBuffer->ramBufferLen)
+    {
+        memcpy(&currentBlock, &pBuffer->pRamBuffer[i], sizeof(settingsBlock));
+
+        if (aKey == currentBlock.key)
+        {
+            if (currentIndex == aIndex)
+            {
+                readLength = currentBlock.length;
+
+                // Perform read only if an input buffer was passed in
+                if (aValue != NULL && aValueLength != NULL)
+                {
+                    // Adjust read length if input buffer size is smaller
+                    if (readLength > *aValueLength)
+                    {
+                        readLength = *aValueLength;
+                    }
+
+                    memcpy(aValue, &pBuffer->pRamBuffer[i + sizeof(settingsBlock)], readLength);
+                }
+
+                valueLength = currentBlock.length;
+                error       = RS_ERROR_NONE;
+                break;
+            }
+
+            currentIndex++;
+        }
+
+        i += sizeof(settingsBlock) + currentBlock.length;
+    }
+
+    if (aValueLength != NULL)
+    {
+        *aValueLength = valueLength;
+    }
+
+    RAM_STORAGE_PRINTF("key = %d err = %d", aKey, error);
+
+    return error;
+}
+
+static rsError ramStorageSetInternal(ramBufferDescriptor * pBuffer, uint16_t aKey, const uint8_t * aValue, uint16_t aValueLength)
+{
+    uint16_t i                        = 0;
+    uint16_t currentBlockLength       = 0;
+    uint16_t nextBlockStart           = 0;
+    struct settingsBlock currentBlock = { 0 };
+
+    // Delete all entries of aKey
+    while (i < pBuffer->ramBufferLen)
+    {
+        memcpy(&currentBlock, &pBuffer->pRamBuffer[i], sizeof(settingsBlock));
+        currentBlockLength = sizeof(settingsBlock) + currentBlock.length;
+
+        if (aKey == currentBlock.key)
+        {
+            nextBlockStart = i + currentBlockLength;
+
+            if (nextBlockStart < pBuffer->ramBufferLen)
+            {
+                memmove(&pBuffer->pRamBuffer[i], &pBuffer->pRamBuffer[nextBlockStart], pBuffer->ramBufferLen - nextBlockStart);
+            }
+
+            VerifyOrDie(pBuffer->ramBufferLen >= currentBlockLength);
+            pBuffer->ramBufferLen -= currentBlockLength;
+        }
+        else
+        {
+            i += currentBlockLength;
+        }
+    }
+
+    return ramStorageAdd(pBuffer, aKey, aValue, aValueLength);
+}
+
+rsError ramStorageSet(ramBufferDescriptor ** pBuffer, uint16_t aKey, const uint8_t * aValue, uint16_t aValueLength)
+{
+    rsError err               = RS_ERROR_NONE;
+    uint16_t allocSize        = (*pBuffer)->ramBufferMaxLen;
+    ramBufferDescriptor * ptr = NULL;
+
+    if (allocSize <= (*pBuffer)->ramBufferLen + aValueLength)
+    {
+        while ((allocSize < (*pBuffer)->ramBufferLen + aValueLength))
+        {
+            /* Need to realocate the memory buffer, increase size by kRamBufferReallocSize until NVM data fits */
+            allocSize += kRamBufferReallocSize;
+        }
+
+        allocSize += kRamDescHeaderSize;
+
+        if (kRamBufferMaxAllocSize <= kRamBufferMaxAllocSize)
+        {
+            ptr = (ramBufferDescriptor *) realloc((void *) (*pBuffer), allocSize);
+            VerifyOrExit((NULL != ptr), err = RS_ERROR_NO_BUFS);
+            *pBuffer                    = ptr;
+            (*pBuffer)->ramBufferMaxLen = allocSize;
+        }
+        else
+        {
+            err = RS_ERROR_NO_BUFS;
+        }
+    }
+
+    err = ramStorageSetInternal(*pBuffer, aKey, aValue, aValueLength);
+
+exit:
+    return err;
+}
+
+rsError ramStorageDelete(ramBufferDescriptor * pBuffer, uint16_t aKey, int aIndex)
+{
+    uint16_t i                        = 0;
+    int currentIndex                  = 0;
+    uint16_t nextBlockStart           = 0;
+    uint16_t currentBlockLength       = 0;
+    struct settingsBlock currentBlock = { 0 };
+    rsError error                     = RS_ERROR_NOT_FOUND;
+
+    while (i < pBuffer->ramBufferLen)
+    {
+        memcpy(&currentBlock, &pBuffer->pRamBuffer[i], sizeof(settingsBlock));
+        currentBlockLength = sizeof(settingsBlock) + currentBlock.length;
+
+        if (aKey == currentBlock.key)
+        {
+            if (currentIndex == aIndex)
+            {
+                nextBlockStart = i + currentBlockLength;
+
+                if (nextBlockStart < pBuffer->ramBufferLen)
+                {
+                    memmove(&pBuffer->pRamBuffer[i], &pBuffer->pRamBuffer[nextBlockStart], pBuffer->ramBufferLen - nextBlockStart);
+                }
+
+                VerifyOrDie(pBuffer->ramBufferLen >= currentBlockLength);
+                pBuffer->ramBufferLen -= currentBlockLength;
+
+                error = RS_ERROR_NONE;
+                break;
+            }
+            else
+            {
+                currentIndex++;
+            }
+        }
+
+        i += currentBlockLength;
+    }
+    RAM_STORAGE_PRINTF("key = %d err = %d", aKey, error);
+    return error;
+}
diff --git a/src/platform/nxp/k32w/k32w0/RamStorage.h b/src/platform/nxp/k32w/k32w0/RamStorage.h
new file mode 100644
index 00000000000000..b1bc0ea3ad2ad6
--- /dev/null
+++ b/src/platform/nxp/k32w/k32w0/RamStorage.h
@@ -0,0 +1,62 @@
+/*
+ *
+ *    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
+
+typedef enum
+{
+    RS_ERROR_NONE,
+    RS_ERROR_NOT_FOUND,
+    RS_ERROR_NO_BUFS
+} rsError;
+
+/* the structure used for keeping the records has the same structure both in RAM and in NVM:
+ * ramBufferLen | ramBufferMaxLen | settingsBlock | .... | settingsBlock
+ *
+ * ramBufferLen shows how much of the RAM buffer is currently occupied with settingsBlock structures
+ * ramBufferMaxLen shows the total malloc'ed size. Dynamic re-allocation is possible
+ */
+typedef struct
+{
+    uint16_t ramBufferLen;
+    uint16_t ramBufferMaxLen;
+    uint8_t pRamBuffer[1];
+} ramBufferDescriptor;
+
+struct settingsBlock
+{
+    uint16_t key;
+    uint16_t length;
+} __attribute__((packed));
+
+#define member_size(type, member) sizeof(((type *) 0)->member)
+
+constexpr size_t kRamDescHeaderSize =
+    member_size(ramBufferDescriptor, ramBufferLen) + member_size(ramBufferDescriptor, ramBufferMaxLen);
+
+/* Return a RAM buffer with initialSize and populated with the contents of NVM ID - if found in flash */
+ramBufferDescriptor * getRamBuffer(uint16_t nvmId, uint16_t initialSize);
+
+/* search pBuffer for aKey and return its value in aValue. aValueLength will contain the length of aValueLength */
+rsError ramStorageGet(const ramBufferDescriptor * pBuffer, uint16_t aKey, int aIndex, uint8_t * aValue, uint16_t * aValueLength);
+
+/* search pBuffer for aKey and set its value to aValue (having aValueLength length) */
+rsError ramStorageSet(ramBufferDescriptor ** pBuffer, uint16_t aKey, const uint8_t * aValue, uint16_t aValueLength);
+
+/* search pBuffer for aKey and delete it */
+rsError ramStorageDelete(ramBufferDescriptor * pBuffer, uint16_t aKey, int aIndex);
diff --git a/src/platform/nxp/k32w/k32w0/SystemPlatformConfig.h b/src/platform/nxp/k32w/k32w0/SystemPlatformConfig.h
index d1b09b1f70c58f..a589a86223d16d 100644
--- a/src/platform/nxp/k32w/k32w0/SystemPlatformConfig.h
+++ b/src/platform/nxp/k32w/k32w0/SystemPlatformConfig.h
@@ -37,6 +37,7 @@ struct ChipDeviceEvent;
 // ==================== Platform Adaptations ====================
 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
 #define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
+#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 11
 
 // ========== Platform-specific Configuration Overrides =========
 
diff --git a/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp
index 3c11ed202c29f7..7f5d4961ba41e4 100644
--- a/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp
@@ -32,7 +32,7 @@
 #include <platform/ThreadStackManager.h>
 
 #include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.cpp>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp>
 
 #include <lib/support/CHIPPlatformMemory.h>
 
@@ -55,7 +55,7 @@ CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
     // Initialize the generic implementation base classes.
     err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
     SuccessOrExit(err);
-    err = GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>::DoInit(otInst);
+    err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(otInst);
     SuccessOrExit(err);
 
 exit:
diff --git a/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.h b/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.h
index 5f0ee2917240ab..5e68b31524d81b 100644
--- a/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.h
+++ b/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.h
@@ -28,7 +28,7 @@
 #include <openthread/tasklet.h>
 #include <openthread/thread.h>
 #include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 
 extern "C" void otSysEventSignalPending(void);
 
@@ -46,7 +46,7 @@ extern int GetEntropy_K32W(uint8_t * buf, size_t bufSize);
  * using the NXP SDK and the OpenThread stack.
  */
 class ThreadStackManagerImpl final : public ThreadStackManager,
-                                     public Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>,
+                                     public Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>,
                                      public Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>
 {
     // Allow the ThreadStackManager interface class to delegate method calls to
@@ -57,7 +57,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // this class.
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     friend Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>;
-    friend Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>;
+    friend Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>;
     friend Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>;
 #endif
 
diff --git a/src/platform/nxp/k32w/k32w0/args.gni b/src/platform/nxp/k32w/k32w0/args.gni
index d6ccbd8bb86e29..1d72bfc74b1f2c 100644
--- a/src/platform/nxp/k32w/k32w0/args.gni
+++ b/src/platform/nxp/k32w/k32w0/args.gni
@@ -29,9 +29,12 @@ chip_build_tests = false
 chip_mdns = "platform"
 
 # Trying to fit into the available flash by disabling optional logging for now
-chip_detail_logging = false
+chip_detail_logging = true
 chip_progress_logging = true
 
+chip_system_config_use_open_thread_inet_endpoints = true
+chip_with_lwip = false
+
 mbedtls_target = "${chip_root}/third_party/nxp/k32w0_sdk:mbedtls"
 openthread_external_mbedtls = mbedtls_target
 
diff --git a/src/platform/tests/TestConfigurationMgr.cpp b/src/platform/tests/TestConfigurationMgr.cpp
index fc29e0dc7633aa..9073f3f5ade5da 100644
--- a/src/platform/tests/TestConfigurationMgr.cpp
+++ b/src/platform/tests/TestConfigurationMgr.cpp
@@ -33,7 +33,9 @@
 #include <lib/support/UnitTestRegistration.h>
 #include <nlunit-test.h>
 
+#include <platform/BuildTime.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 
 using namespace chip;
 using namespace chip::Logging;
@@ -73,7 +75,7 @@ static void TestConfigurationMgr_SerialNumber(nlTestSuite * inSuite, void * inCo
     err = ConfigurationMgr().StoreSerialNumber(serialNumber, strlen(serialNumber));
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = ConfigurationMgr().GetSerialNumber(buf, 64);
+    err = GetDeviceInstanceInfoProvider()->GetSerialNumber(buf, 64);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, strlen(buf) == 12);
@@ -82,7 +84,7 @@ static void TestConfigurationMgr_SerialNumber(nlTestSuite * inSuite, void * inCo
     err = ConfigurationMgr().StoreSerialNumber(serialNumber, 5);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = ConfigurationMgr().GetSerialNumber(buf, 64);
+    err = GetDeviceInstanceInfoProvider()->GetSerialNumber(buf, 64);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, strlen(buf) == 5);
@@ -127,7 +129,7 @@ static void TestConfigurationMgr_ManufacturingDate(nlTestSuite * inSuite, void *
     err = ConfigurationMgr().StoreManufacturingDate(mfgDate, strlen(mfgDate));
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = ConfigurationMgr().GetManufacturingDate(year, month, dayOfMonth);
+    err = GetDeviceInstanceInfoProvider()->GetManufacturingDate(year, month, dayOfMonth);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, year == 2008);
@@ -143,12 +145,206 @@ static void TestConfigurationMgr_HardwareVersion(nlTestSuite * inSuite, void * i
     err = ConfigurationMgr().StoreHardwareVersion(1234);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
-    err = ConfigurationMgr().GetHardwareVersion(hardwareVer);
+    err = GetDeviceInstanceInfoProvider()->GetHardwareVersion(hardwareVer);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, hardwareVer == 1234);
 }
 
+static int SnprintfBuildDate(char * s, size_t n, uint16_t year, uint8_t month, uint8_t day)
+{
+    // Print the calendar date to a human readable string as would
+    // given from the __DATE__ macro.
+    const char * monthString = nullptr;
+    switch (month)
+    {
+    case 1:
+        monthString = "Jan";
+        break;
+    case 2:
+        monthString = "Feb";
+        break;
+    case 3:
+        monthString = "Mar";
+        break;
+    case 4:
+        monthString = "Apr";
+        break;
+    case 5:
+        monthString = "May";
+        break;
+    case 6:
+        monthString = "Jun";
+        break;
+    case 7:
+        monthString = "Jul";
+        break;
+    case 8:
+        monthString = "Aug";
+        break;
+    case 9:
+        monthString = "Sep";
+        break;
+    case 10:
+        monthString = "Oct";
+        break;
+    case 11:
+        monthString = "Nov";
+        break;
+    case 12:
+        monthString = "Dec";
+        break;
+    }
+    if (monthString == nullptr)
+    {
+        return -1;
+    }
+    return snprintf(s, n, "%s %2u %u", monthString, day, year);
+}
+
+static int SnprintfBuildDate(char * s, size_t n, System::Clock::Seconds32 chipEpochBuildTime)
+{
+    // Convert to a calendar date-time.
+    uint16_t year;
+    uint8_t month;
+    uint8_t day;
+    uint8_t hour;
+    uint8_t minute;
+    uint8_t second;
+    ChipEpochToCalendarTime(chipEpochBuildTime.count(), year, month, day, hour, minute, second);
+    return SnprintfBuildDate(s, n, year, month, day);
+}
+
+static int SnprintfBuildTimeOfDay(char * s, size_t n, uint8_t hour, uint8_t minute, uint8_t second)
+{
+    // Print the time of day to a human readable string as would
+    // given from the __TIME__ macro.
+    return snprintf(s, n, "%02u:%02u:%02u", hour, minute, second);
+}
+
+static int SnprintfBuildTimeOfDay(char * s, size_t n, System::Clock::Seconds32 chipEpochBuildTime)
+{
+    // Convert to a calendar date-time.
+    uint16_t year;
+    uint8_t month;
+    uint8_t day;
+    uint8_t hour;
+    uint8_t minute;
+    uint8_t second;
+    ChipEpochToCalendarTime(chipEpochBuildTime.count(), year, month, day, hour, minute, second);
+    return SnprintfBuildTimeOfDay(s, n, hour, minute, second);
+}
+
+static void TestConfigurationMgr_FirmwareBuildTime(nlTestSuite * inSuite, void * inContext)
+{
+    // Read the firmware build time from the configuration manager.
+    // This is referenced to the CHIP epoch.
+    System::Clock::Seconds32 chipEpochTime;
+    NL_TEST_ASSERT(inSuite, ConfigurationMgr().GetFirmwareBuildChipEpochTime(chipEpochTime) == CHIP_NO_ERROR);
+
+    // Override the hard-coded build time with the setter and verify operation.
+    System::Clock::Seconds32 overrideValue = System::Clock::Seconds32(rand());
+    NL_TEST_ASSERT(inSuite, ConfigurationMgr().SetFirmwareBuildChipEpochTime(overrideValue) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, ConfigurationMgr().GetFirmwareBuildChipEpochTime(chipEpochTime) == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, overrideValue == chipEpochTime);
+
+    // Verify that the BuildTime.h parser can parse current CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_DATE / TIME.
+    do
+    {
+        const char * date      = CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_DATE;
+        const char * timeOfDay = CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME;
+
+        // Check that strings look good.
+        NL_TEST_ASSERT(inSuite, !BUILD_DATE_IS_BAD(date));
+        NL_TEST_ASSERT(inSuite, !BUILD_TIME_IS_BAD(timeOfDay));
+        if (BUILD_DATE_IS_BAD(date) || BUILD_TIME_IS_BAD(timeOfDay))
+        {
+            break;
+        }
+
+        // Parse.
+        uint16_t year  = COMPUTE_BUILD_YEAR(date);
+        uint8_t month  = COMPUTE_BUILD_MONTH(date);
+        uint8_t day    = COMPUTE_BUILD_DAY(date);
+        uint8_t hour   = COMPUTE_BUILD_HOUR(timeOfDay);
+        uint8_t minute = COMPUTE_BUILD_MIN(timeOfDay);
+        uint8_t second = COMPUTE_BUILD_SEC(timeOfDay);
+
+        // Print the date to a string as would be given by the __DATE__ macro.
+        char parsedDate[14] = { 0 }; // strlen("Jan 000 00000") == 13
+        {
+            int printed;
+            printed = SnprintfBuildDate(parsedDate, sizeof(parsedDate), year, month, day);
+            NL_TEST_ASSERT(inSuite, printed > 0 && printed < static_cast<int>(sizeof(parsedDate)));
+        }
+
+        // Print the time of day to a straing as would be given by the __TIME__ macro.
+        char parsedTimeOfDay[12] = { 0 }; // strlen("000:000:000") == 11
+        {
+            int printed;
+            printed = SnprintfBuildTimeOfDay(parsedTimeOfDay, sizeof(parsedTimeOfDay), hour, minute, second);
+            NL_TEST_ASSERT(inSuite, printed > 0 && printed < static_cast<int>(sizeof(parsedTimeOfDay)));
+        }
+
+        // Verify match.
+        NL_TEST_ASSERT(inSuite, strcmp(date, parsedDate) == 0);
+        NL_TEST_ASSERT(inSuite, strcmp(timeOfDay, parsedTimeOfDay) == 0);
+    } while (0);
+
+    // Generate random chip epoch times and verify that our BuildTime.h parser
+    // macros also work for these.
+    for (int i = 0; i < 10000; ++i)
+    {
+        char date[14]      = { 0 }; // strlen("Jan 000 00000") == 13
+        char timeOfDay[12] = { 0 }; // strlen("000:000:000") == 11
+
+        chipEpochTime = System::Clock::Seconds32(rand());
+
+        // rand() will only give us [0, 0x7FFFFFFF].  Give us coverage for
+        // times in the upper half of the chip epoch time range as well.
+        chipEpochTime = i % 2 ? chipEpochTime : System::Clock::Seconds32(chipEpochTime.count() | 0x80000000);
+
+        // Print the date to a string as would be given by the __DATE__ macro.
+        {
+            int printed;
+            printed = SnprintfBuildDate(date, sizeof(date), chipEpochTime);
+            NL_TEST_ASSERT(inSuite, printed > 0 && printed < static_cast<int>(sizeof(date)));
+        }
+
+        // Print the time of day to a straing as would be given by the __TIME__ macro.
+        {
+            int printed;
+            printed = SnprintfBuildTimeOfDay(timeOfDay, sizeof(timeOfDay), chipEpochTime);
+            NL_TEST_ASSERT(inSuite, printed > 0 && printed < static_cast<int>(sizeof(timeOfDay)));
+        }
+
+        // Check that strings look good.
+        NL_TEST_ASSERT(inSuite, !BUILD_DATE_IS_BAD(date));
+        NL_TEST_ASSERT(inSuite, !BUILD_TIME_IS_BAD(timeOfDay));
+        if (BUILD_DATE_IS_BAD(date) || BUILD_TIME_IS_BAD(timeOfDay))
+        {
+            continue;
+        }
+
+        // Convert from chip epoch seconds to calendar time.
+        uint16_t year;
+        uint8_t month;
+        uint8_t day;
+        uint8_t hour;
+        uint8_t minute;
+        uint8_t second;
+        ChipEpochToCalendarTime(chipEpochTime.count(), year, month, day, hour, minute, second);
+
+        // Verify that our BuildTime.h macros can correctly parse the date / time strings.
+        NL_TEST_ASSERT(inSuite, year == COMPUTE_BUILD_YEAR(date));
+        NL_TEST_ASSERT(inSuite, month == COMPUTE_BUILD_MONTH(date));
+        NL_TEST_ASSERT(inSuite, day == COMPUTE_BUILD_DAY(date));
+        NL_TEST_ASSERT(inSuite, hour == COMPUTE_BUILD_HOUR(timeOfDay));
+        NL_TEST_ASSERT(inSuite, minute == COMPUTE_BUILD_MIN(timeOfDay));
+        NL_TEST_ASSERT(inSuite, second == COMPUTE_BUILD_SEC(timeOfDay));
+    }
+}
+
 static void TestConfigurationMgr_CountryCode(nlTestSuite * inSuite, void * inContext)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -222,6 +418,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("Test ConfigurationMgr::UniqueId", TestConfigurationMgr_UniqueId),
     NL_TEST_DEF("Test ConfigurationMgr::ManufacturingDate", TestConfigurationMgr_ManufacturingDate),
     NL_TEST_DEF("Test ConfigurationMgr::HardwareVersion", TestConfigurationMgr_HardwareVersion),
+    NL_TEST_DEF("Test ConfigurationMgr::FirmwareBuildTime", TestConfigurationMgr_FirmwareBuildTime),
     NL_TEST_DEF("Test ConfigurationMgr::CountryCode", TestConfigurationMgr_CountryCode),
     NL_TEST_DEF("Test ConfigurationMgr::GetPrimaryMACAddress", TestConfigurationMgr_GetPrimaryMACAddress),
     NL_TEST_DEF("Test ConfigurationMgr::GetFailSafeArmed", TestConfigurationMgr_GetFailSafeArmed),
diff --git a/src/platform/tests/TestFailSafeContext.cpp b/src/platform/tests/TestFailSafeContext.cpp
index ec1dc5559a2996..1c998caee0a2aa 100644
--- a/src/platform/tests/TestFailSafeContext.cpp
+++ b/src/platform/tests/TestFailSafeContext.cpp
@@ -67,8 +67,7 @@ static void TestFailSafeContext_ArmFailSafe(nlTestSuite * inSuite, void * inCont
     NL_TEST_ASSERT(inSuite, failSafeContext.IsFailSafeArmed(kTestAccessingFabricIndex1) == true);
     NL_TEST_ASSERT(inSuite, failSafeContext.IsFailSafeArmed(kTestAccessingFabricIndex2) == false);
 
-    err = failSafeContext.DisarmFailSafe();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    failSafeContext.DisarmFailSafe();
     NL_TEST_ASSERT(inSuite, failSafeContext.IsFailSafeArmed() == false);
 }
 
@@ -93,8 +92,7 @@ static void TestFailSafeContext_NocCommandInvoked(nlTestSuite * inSuite, void *
     NL_TEST_ASSERT(inSuite, failSafeContext.NocCommandHasBeenInvoked() == true);
     NL_TEST_ASSERT(inSuite, failSafeContext.UpdateNocCommandHasBeenInvoked() == true);
 
-    err = failSafeContext.DisarmFailSafe();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    failSafeContext.DisarmFailSafe();
 }
 
 static void TestFailSafeContext_CommitToStorage(nlTestSuite * inSuite, void * inContext)
@@ -125,8 +123,7 @@ static void TestFailSafeContext_CommitToStorage(nlTestSuite * inSuite, void * in
     NL_TEST_ASSERT(inSuite, addNocCommandInvoked == true);
     NL_TEST_ASSERT(inSuite, updateNocCommandInvoked == true);
 
-    err = failSafeContext.DisarmFailSafe();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    failSafeContext.DisarmFailSafe();
 }
 
 /**
diff --git a/src/platform/webos/BUILD.gn b/src/platform/webos/BUILD.gn
index 50f8f571c928c4..cd837a03736c9f 100644
--- a/src/platform/webos/BUILD.gn
+++ b/src/platform/webos/BUILD.gn
@@ -31,7 +31,7 @@ if (chip_enable_openthread) {
   import("//build_overrides/ot_br_posix.gni")
 }
 
-if (chip_mdns != "none") {
+if (chip_mdns == "platform") {
   pkg_config("avahi_client_config") {
     packages = [ "avahi-client" ]
   }
@@ -111,7 +111,7 @@ static_library("webos") {
 
   public_configs = []
 
-  if (chip_mdns != "none") {
+  if (chip_mdns == "platform") {
     sources += [
       "DnssdImpl.cpp",
       "DnssdImpl.h",
diff --git a/src/platform/webos/CHIPWebOSStorage.h b/src/platform/webos/CHIPWebOSStorage.h
index 55db5149b6b334..5afd70d033302a 100644
--- a/src/platform/webos/CHIPWebOSStorage.h
+++ b/src/platform/webos/CHIPWebOSStorage.h
@@ -48,10 +48,6 @@
 #define LOCALSTATEDIR "/tmp"
 #endif
 
-#ifndef DEVICEINFODIR
-#define DEVICEINFODIR "/tmp"
-#endif
-
 #define CHIP_DEFAULT_FACTORY_PATH                                                                                                  \
     FATCONFDIR "/"                                                                                                                 \
                "chip_factory.ini"
@@ -61,9 +57,6 @@
 #define CHIP_DEFAULT_DATA_PATH                                                                                                     \
     LOCALSTATEDIR "/"                                                                                                              \
                   "chip_counters.ini"
-#define CHIP_DEVICE_INFO_PATH                                                                                                      \
-    DEVICEINFODIR "/"                                                                                                              \
-                  "chip_device_info.ini"
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp
index 19125ac0683fa2..60782415622093 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp
@@ -290,13 +290,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetThreadMetrics(ThreadMetrics ** threadM
 
             strncpy(thread->NameBuf, entry->d_name, kMaxThreadNameLength);
             thread->NameBuf[kMaxThreadNameLength] = '\0';
-            thread->name                          = CharSpan::fromCharString(thread->NameBuf);
-            thread->id                            = atoi(entry->d_name);
+            thread->name.Emplace(CharSpan::fromCharString(thread->NameBuf));
+            thread->id = atoi(entry->d_name);
 
-            // TODO: Get stack info of each thread
-            thread->stackFreeCurrent = 0;
-            thread->stackFreeMinimum = 0;
-            thread->stackSize        = 0;
+            // TODO: Get stack info of each thread: thread->stackFreeCurrent,
+            // thread->stackFreeMinimum, thread->stackSize.
 
             thread->Next = head;
             head         = thread;
diff --git a/src/platform/webos/PlatformManagerImpl.cpp b/src/platform/webos/PlatformManagerImpl.cpp
index 30be3740335c4a..a2e72542b6e58c 100644
--- a/src/platform/webos/PlatformManagerImpl.cpp
+++ b/src/platform/webos/PlatformManagerImpl.cpp
@@ -60,32 +60,6 @@ PlatformManagerImpl PlatformManagerImpl::sInstance;
 
 namespace {
 
-void SignalHandler(int signum)
-{
-    ChipLogDetail(DeviceLayer, "Caught signal %d", signum);
-
-    switch (signum)
-    {
-    case SIGUSR1:
-        PlatformMgrImpl().HandleSoftwareFault(SoftwareDiagnostics::Events::SoftwareFault::Id);
-        break;
-    case SIGUSR2:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::HardwareFaultChange::Id);
-        break;
-    case SIGHUP:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::RadioFaultChange::Id);
-        break;
-    case SIGTTIN:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::NetworkFaultChange::Id);
-        break;
-    case SIGTSTP:
-        PlatformMgrImpl().HandleSwitchEvent(Switch::Events::SwitchLatched::Id);
-        break;
-    default:
-        break;
-    }
-}
-
 #if CHIP_WITH_GIO
 void GDBus_Thread()
 {
@@ -174,16 +148,6 @@ void PlatformManagerImpl::WiFIIPChangeListener()
 
 CHIP_ERROR PlatformManagerImpl::_InitChipStack()
 {
-    struct sigaction action;
-
-    memset(&action, 0, sizeof(action));
-    action.sa_handler = SignalHandler;
-    sigaction(SIGHUP, &action, nullptr);
-    sigaction(SIGTTIN, &action, nullptr);
-    sigaction(SIGUSR1, &action, nullptr);
-    sigaction(SIGUSR2, &action, nullptr);
-    sigaction(SIGTSTP, &action, nullptr);
-
 #if CHIP_WITH_GIO
     GError * error = nullptr;
 
@@ -238,174 +202,6 @@ CHIP_ERROR PlatformManagerImpl::_Shutdown()
     return Internal::GenericPlatformManagerImpl_POSIX<PlatformManagerImpl>::_Shutdown();
 }
 
-void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
-{
-    GeneralDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetGeneralDiagnosticsDelegate();
-
-    if (delegate == nullptr)
-    {
-        ChipLogError(DeviceLayer, "No delegate registered to handle General Diagnostics event");
-        return;
-    }
-
-    if (EventId == GeneralDiagnostics::Events::HardwareFaultChange::Id)
-    {
-        GeneralFaults<kMaxHardwareFaults> previous;
-        GeneralFaults<kMaxHardwareFaults> current;
-
-#if CHIP_CONFIG_TEST
-        // On Linux Simulation, set following hardware faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO));
-        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE));
-
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_RADIO));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_SENSOR));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_POWER_SOURCE));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_TYPE_USER_INTERFACE_FAULT));
-#endif
-        delegate->OnHardwareFaultsDetected(previous, current);
-    }
-    else if (EventId == GeneralDiagnostics::Events::RadioFaultChange::Id)
-    {
-        GeneralFaults<kMaxRadioFaults> previous;
-        GeneralFaults<kMaxRadioFaults> current;
-
-#if CHIP_CONFIG_TEST
-        // On Linux Simulation, set following radio faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT));
-        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT));
-
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_WI_FI_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_CELLULAR_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_THREAD_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_TYPE_NFC_FAULT));
-#endif
-        delegate->OnRadioFaultsDetected(previous, current);
-    }
-    else if (EventId == GeneralDiagnostics::Events::NetworkFaultChange::Id)
-    {
-        GeneralFaults<kMaxNetworkFaults> previous;
-        GeneralFaults<kMaxNetworkFaults> current;
-
-#if CHIP_CONFIG_TEST
-        // On Linux Simulation, set following radio faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
-#endif
-        delegate->OnNetworkFaultsDetected(previous, current);
-    }
-    else
-    {
-        ChipLogError(DeviceLayer, "Unknow event ID:%d", EventId);
-    }
-}
-
-void PlatformManagerImpl::HandleSoftwareFault(uint32_t EventId)
-{
-    SoftwareDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetSoftwareDiagnosticsDelegate();
-
-    if (delegate != nullptr)
-    {
-        SoftwareDiagnostics::Structs::SoftwareFaultStruct::Type softwareFault;
-        char threadName[kMaxThreadNameLength + 1];
-
-        softwareFault.id = gettid();
-        strncpy(threadName, std::to_string(softwareFault.id).c_str(), kMaxThreadNameLength);
-        threadName[kMaxThreadNameLength] = '\0';
-        softwareFault.name               = CharSpan::fromCharString(threadName);
-        softwareFault.faultRecording     = ByteSpan(Uint8::from_const_char("FaultRecording"), strlen("FaultRecording"));
-
-        delegate->OnSoftwareFaultDetected(softwareFault);
-    }
-}
-
-void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
-{
-    SwitchDeviceControlDelegate * delegate = DeviceControlServer::DeviceControlSvr().GetSwitchDelegate();
-
-    if (delegate == nullptr)
-    {
-        ChipLogError(DeviceLayer, "No delegate registered to handle Switch event");
-        return;
-    }
-
-    if (EventId == Switch::Events::SwitchLatched::Id)
-    {
-        uint8_t newPosition = 0;
-
-#if CHIP_CONFIG_TEST
-        newPosition = 100;
-#endif
-        delegate->OnSwitchLatched(newPosition);
-    }
-    else if (EventId == Switch::Events::InitialPress::Id)
-    {
-        uint8_t newPosition = 0;
-
-#if CHIP_CONFIG_TEST
-        newPosition = 100;
-#endif
-        delegate->OnInitialPressed(newPosition);
-    }
-    else if (EventId == Switch::Events::LongPress::Id)
-    {
-        uint8_t newPosition = 0;
-
-#if CHIP_CONFIG_TEST
-        newPosition = 100;
-#endif
-        delegate->OnLongPressed(newPosition);
-    }
-    else if (EventId == Switch::Events::ShortRelease::Id)
-    {
-        uint8_t previousPosition = 0;
-
-#if CHIP_CONFIG_TEST
-        previousPosition = 50;
-#endif
-        delegate->OnShortReleased(previousPosition);
-    }
-    else if (EventId == Switch::Events::LongRelease::Id)
-    {
-        uint8_t previousPosition = 0;
-
-#if CHIP_CONFIG_TEST
-        previousPosition = 50;
-#endif
-        delegate->OnLongReleased(previousPosition);
-    }
-    else if (EventId == Switch::Events::MultiPressOngoing::Id)
-    {
-        uint8_t newPosition                   = 0;
-        uint8_t currentNumberOfPressesCounted = 0;
-
-#if CHIP_CONFIG_TEST
-        newPosition                   = 10;
-        currentNumberOfPressesCounted = 5;
-#endif
-        delegate->OnMultiPressOngoing(newPosition, currentNumberOfPressesCounted);
-    }
-    else if (EventId == Switch::Events::MultiPressComplete::Id)
-    {
-        uint8_t newPosition                 = 0;
-        uint8_t totalNumberOfPressesCounted = 0;
-
-#if CHIP_CONFIG_TEST
-        newPosition                 = 10;
-        totalNumberOfPressesCounted = 5;
-#endif
-        delegate->OnMultiPressComplete(newPosition, totalNumberOfPressesCounted);
-    }
-    else
-    {
-        ChipLogError(DeviceLayer, "Unknow event ID:%d", EventId);
-    }
-}
-
 #if CHIP_WITH_GIO
 GDBusConnection * PlatformManagerImpl::GetGDBusConnection()
 {
diff --git a/src/platform/webos/PlatformManagerImpl.h b/src/platform/webos/PlatformManagerImpl.h
index 46846c615cefb9..bdb6f4dbd46390 100644
--- a/src/platform/webos/PlatformManagerImpl.h
+++ b/src/platform/webos/PlatformManagerImpl.h
@@ -56,10 +56,6 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
 
     System::Clock::Timestamp GetStartTime() { return mStartTime; }
 
-    void HandleGeneralFault(uint32_t EventId);
-    void HandleSoftwareFault(uint32_t EventId);
-    void HandleSwitchEvent(uint32_t EventId);
-
 private:
     // ===== Methods that implement the PlatformManager abstract interface.
 
diff --git a/src/platform/webos/ThreadStackManagerImpl.cpp b/src/platform/webos/ThreadStackManagerImpl.cpp
index 07f326615d8269..db26c22518157d 100644
--- a/src/platform/webos/ThreadStackManagerImpl.cpp
+++ b/src/platform/webos/ThreadStackManagerImpl.cpp
@@ -680,17 +680,17 @@ CHIP_ERROR ThreadStackManagerImpl::_WriteThreadNetworkDiagnosticAttributeToTlv(A
     {
     case ThreadNetworkDiagnostics::Attributes::NeighborTableList::Id:
     case ThreadNetworkDiagnostics::Attributes::RouteTableList::Id:
+    case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id:
+        err = encoder.EncodeEmptyList();
+        break;
     case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id:
     case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id:
-    case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
-        err = encoder.EncodeEmptyList();
+        err = encoder.EncodeNull();
         break;
-    }
-    default: {
+    default:
         err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
         break;
     }
-    }
 
     return err;
 }
diff --git a/src/protocols/interaction_model/Constants.h b/src/protocols/interaction_model/Constants.h
index 819099a5f9fffb..13bd0481eaf0bd 100644
--- a/src/protocols/interaction_model/Constants.h
+++ b/src/protocols/interaction_model/Constants.h
@@ -50,7 +50,7 @@ namespace InteractionModel {
 constexpr uint16_t kVersion = 0;
 
 /**
- * SecureChannel Protocol Message Types
+ * Interaction Model Protocol Message Types
  */
 enum class MsgType : uint8_t
 {
diff --git a/src/protocols/interaction_model/StatusCodeList.h b/src/protocols/interaction_model/StatusCodeList.h
index 75d43a3712e3bb..f2b7a96c6770cf 100644
--- a/src/protocols/interaction_model/StatusCodeList.h
+++ b/src/protocols/interaction_model/StatusCodeList.h
@@ -65,6 +65,7 @@ CHIP_IM_STATUS_CODE(NoUpstreamSubscription, NO_UPSTREAM_SUBSCRIPTION, 0xc5)
 CHIP_IM_STATUS_CODE(NeedsTimedInteraction , NEEDS_TIMED_INTERACTION , 0xc6)
 CHIP_IM_STATUS_CODE(UnsupportedEvent      , UNSUPPORTED_EVENT       , 0xc7)
 CHIP_IM_STATUS_CODE(PathsExhausted        , PATHS_EXHAUSTED         , 0xc8)
-CHIP_IM_STATUS_CODE(WriteIgnored          , WRITE_IGNORED           , 0xc9) // non-spec error code and use only internally
-
+CHIP_IM_STATUS_CODE(TimedRequestMismatch  , TIMED_REQUEST_MISMATCH  , 0xc9)
+CHIP_IM_STATUS_CODE(FailsafeRequired      , FAILSAFE_REQUIRED       , 0xca)
+CHIP_IM_STATUS_CODE(WriteIgnored          , WRITE_IGNORED           , 0xF0) // non-spec error code and use only internally
 // clang-format on
diff --git a/src/protocols/secure_channel/CASEServer.cpp b/src/protocols/secure_channel/CASEServer.cpp
index 4ecbd28547ad8b..5751cd56850eac 100644
--- a/src/protocols/secure_channel/CASEServer.cpp
+++ b/src/protocols/secure_channel/CASEServer.cpp
@@ -31,19 +31,25 @@ namespace chip {
 
 CHIP_ERROR CASEServer::ListenForSessionEstablishment(Messaging::ExchangeManager * exchangeManager, SessionManager * sessionManager,
                                                      FabricTable * fabrics, SessionResumptionStorage * sessionResumptionStorage,
+                                                     Credentials::CertificateValidityPolicy * certificateValidityPolicy,
                                                      Credentials::GroupDataProvider * responderGroupDataProvider)
 {
     VerifyOrReturnError(exchangeManager != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(sessionManager != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(responderGroupDataProvider != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-    mSessionManager           = sessionManager;
-    mSessionResumptionStorage = sessionResumptionStorage;
-    mFabrics                  = fabrics;
-    mExchangeManager          = exchangeManager;
-    mGroupDataProvider        = responderGroupDataProvider;
+    mSessionManager            = sessionManager;
+    mSessionResumptionStorage  = sessionResumptionStorage;
+    mCertificateValidityPolicy = certificateValidityPolicy;
+    mFabrics                   = fabrics;
+    mExchangeManager           = exchangeManager;
+    mGroupDataProvider         = responderGroupDataProvider;
+
+    // Set up the group state provider that persists across all handshakes.
+    GetSession().SetGroupDataProvider(mGroupDataProvider);
+
+    PrepareForSessionEstablishment();
 
-    Cleanup();
     return CHIP_NO_ERROR;
 }
 
@@ -51,12 +57,6 @@ CHIP_ERROR CASEServer::InitCASEHandshake(Messaging::ExchangeContext * ec)
 {
     ReturnErrorCodeIf(ec == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-    // Setup CASE state machine using the credentials for the current fabric.
-    GetSession().SetGroupDataProvider(mGroupDataProvider);
-    ReturnErrorOnFailure(
-        GetSession().ListenForSessionEstablishment(*mSessionManager, mFabrics, mSessionResumptionStorage, this,
-                                                   Optional<ReliableMessageProtocolConfig>::Value(GetLocalMRPConfig())));
-
     // Hand over the exchange context to the CASE session.
     ec->SetDelegate(&GetSession());
 
@@ -88,12 +88,13 @@ CHIP_ERROR CASEServer::OnMessageReceived(Messaging::ExchangeContext * ec, const
 exit:
     if (err != CHIP_NO_ERROR)
     {
-        Cleanup();
+        PrepareForSessionEstablishment();
     }
+
     return err;
 }
 
-void CASEServer::Cleanup()
+void CASEServer::PrepareForSessionEstablishment(const ScopedNodeId & previouslyEstablishedPeer)
 {
     // Let's re-register for CASE Sigma1 message, so that the next CASE session setup request can be processed.
     // https://github.com/project-chip/connectedhomeip/issues/8342
@@ -101,18 +102,57 @@ void CASEServer::Cleanup()
     mExchangeManager->RegisterUnsolicitedMessageHandlerForType(Protocols::SecureChannel::MsgType::CASE_Sigma1, this);
 
     GetSession().Clear();
+
+    //
+    // Indicate to the underlying CASE session to prepare for session establishment requests coming its way. This will
+    // involve allocating a SecureSession that will be held until it's needed for the next CASE session handshake.
+    //
+    // Logically speaking, we're attempting to evict a session using details of the just-established session (to ensure
+    // we're evicting sessions from the right fabric if needed) and then transferring the just established session into that
+    // slot (and thereby free'ing up the slot for the next session attempt). However, this transfer isn't necessary - just
+    // evicting a session will ensure it is available for the next attempt.
+    //
+    // This call can fail if we have run out memory to allocate SecureSessions. Continuing without taking any action
+    // however will render this node deaf to future handshake requests, so it's better to die here to raise attention to the problem
+    // / facilitate recovery.
+    //
+    // TODO(#17568): Once session eviction is actually in place, this call should NEVER fail and if so, is a logic bug.
+    // Dying here on failure is even more appropriate then.
+    //
+    VerifyOrDie(GetSession().PrepareForSessionEstablishment(*mSessionManager, mFabrics, mSessionResumptionStorage,
+                                                            mCertificateValidityPolicy, this, previouslyEstablishedPeer,
+                                                            Optional<ReliableMessageProtocolConfig>::Value(GetLocalMRPConfig())) ==
+                CHIP_NO_ERROR);
+
+    //
+    // PairingSession::mSecureSessionHolder is a weak-reference. If MarkForRemoval is called on this session, the session is
+    // going to get de-allocated from underneath us. This session that has just been allocated should *never* get evicted, and
+    // remain available till the next hand-shake is received.
+    //
+    // TODO: Converting SessionHolder to a true weak-ref and making PairingSession hold a strong-ref (#18397) would avoid this
+    // headache...
+    //
+    // Let's create a SessionHandle strong-reference to it to keep it resident.
+    //
+    mPinnedSecureSession = GetSession().CopySecureSession();
+
+    //
+    // If we've gotten this far, it means we have successfully allocated a SecureSession to back our next attempt. If we haven't,
+    // there is a bug somewhere and we should raise attention to it by dying.
+    //
+    VerifyOrDie(mPinnedSecureSession.HasValue());
 }
 
 void CASEServer::OnSessionEstablishmentError(CHIP_ERROR err)
 {
     ChipLogError(Inet, "CASE Session establishment failed: %s", ErrorStr(err));
-    Cleanup();
+    PrepareForSessionEstablishment();
 }
 
 void CASEServer::OnSessionEstablished(const SessionHandle & session)
 {
     ChipLogProgress(Inet, "CASE Session established to peer: " ChipLogFormatScopedNodeId,
                     ChipLogValueScopedNodeId(session->GetPeer()));
-    Cleanup();
+    PrepareForSessionEstablishment(session->GetPeer());
 }
 } // namespace chip
diff --git a/src/protocols/secure_channel/CASEServer.h b/src/protocols/secure_channel/CASEServer.h
index d50ad6708c0583..4f05b5dfc56511 100644
--- a/src/protocols/secure_channel/CASEServer.h
+++ b/src/protocols/secure_channel/CASEServer.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <credentials/CertificateValidityPolicy.h>
 #include <credentials/GroupDataProvider.h>
 #include <messaging/ExchangeDelegate.h>
 #include <messaging/ExchangeMgr.h>
@@ -30,16 +31,28 @@ class CASEServer : public SessionEstablishmentDelegate,
 {
 public:
     CASEServer() {}
-    ~CASEServer() override
+    ~CASEServer() override { Shutdown(); }
+
+    /*
+     * This method will shutdown this object, releasing the strong reference to the pinned SecureSession object.
+     * It will also unregister the unsolicited handler and clear out the session object (which will release the weak
+     * reference through the underlying SessionHolder).
+     *
+     */
+    void Shutdown()
     {
         if (mExchangeManager != nullptr)
         {
             mExchangeManager->UnregisterUnsolicitedMessageHandlerForType(Protocols::SecureChannel::MsgType::CASE_Sigma1);
         }
+
+        GetSession().Clear();
+        mPinnedSecureSession.ClearValue();
     }
 
     CHIP_ERROR ListenForSessionEstablishment(Messaging::ExchangeManager * exchangeManager, SessionManager * sessionManager,
                                              FabricTable * fabrics, SessionResumptionStorage * sessionResumptionStorage,
+                                             Credentials::CertificateValidityPolicy * policy,
                                              Credentials::GroupDataProvider * responderGroupDataProvider);
 
     //////////// SessionEstablishmentDelegate Implementation ///////////////
@@ -58,8 +71,22 @@ class CASEServer : public SessionEstablishmentDelegate,
     virtual CASESession & GetSession() { return mPairingSession; }
 
 private:
-    Messaging::ExchangeManager * mExchangeManager        = nullptr;
-    SessionResumptionStorage * mSessionResumptionStorage = nullptr;
+    Messaging::ExchangeManager * mExchangeManager                       = nullptr;
+    SessionResumptionStorage * mSessionResumptionStorage                = nullptr;
+    Credentials::CertificateValidityPolicy * mCertificateValidityPolicy = nullptr;
+
+    //
+    // When we're in the process of establishing a session, this is used
+    // to maintain an additional, strong reference to the underlying SecureSession.
+    // This is because the existing reference in PairingSession is a weak one
+    // (i.e a SessionHolder) and can lose its reference if the session is evicted
+    // for any reason.
+    //
+    // This initially points to a session that is not yet active. Upon activation, it
+    // transfers ownership of the session to the SecureSessionManager and this reference
+    // is released before simultaneously acquiring ownership of a new SecureSession.
+    //
+    Optional<SessionHandle> mPinnedSecureSession;
 
     CASESession mPairingSession;
     SessionManager * mSessionManager = nullptr;
@@ -69,7 +96,16 @@ class CASEServer : public SessionEstablishmentDelegate,
 
     CHIP_ERROR InitCASEHandshake(Messaging::ExchangeContext * ec);
 
-    void Cleanup();
+    /*
+     * This will clean up any state from a previous session establishment
+     * attempt (if any) and setup the machinery to listen for and handle
+     * any session handshakes there-after.
+     *
+     * If a session had previously been established successfully, previouslyEstablishedPeer
+     * should be set to the scoped node-id of the peer associated with that session.
+     *
+     */
+    void PrepareForSessionEstablishment(const ScopedNodeId & previouslyEstablishedPeer = ScopedNodeId());
 };
 
 } // namespace chip
diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp
index 393ae04a2699e3..2c26c89039a6d5 100644
--- a/src/protocols/secure_channel/CASESession.cpp
+++ b/src/protocols/secure_channel/CASESession.cpp
@@ -144,12 +144,14 @@ void CASESession::Clear()
     mState = State::kInitialized;
     Crypto::ClearSecretData(mIPK);
 
-    mLocalNodeId = kUndefinedNodeId;
-    mPeerNodeId  = kUndefinedNodeId;
-    mFabricInfo  = nullptr;
+    mLocalNodeId  = kUndefinedNodeId;
+    mPeerNodeId   = kUndefinedNodeId;
+    mFabricsTable = nullptr;
+    mFabricIndex  = kUndefinedFabricIndex;
 }
 
-CHIP_ERROR CASESession::Init(SessionManager & sessionManager, SessionEstablishmentDelegate * delegate)
+CHIP_ERROR CASESession::Init(SessionManager & sessionManager, Credentials::CertificateValidityPolicy * policy,
+                             SessionEstablishmentDelegate * delegate, const ScopedNodeId & sessionEvictionHint)
 {
     VerifyOrReturnError(delegate != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(mGroupDataProvider != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -159,46 +161,56 @@ CHIP_ERROR CASESession::Init(SessionManager & sessionManager, SessionEstablishme
     ReturnErrorOnFailure(mCommissioningHash.Begin());
 
     mDelegate = delegate;
-    ReturnErrorOnFailure(AllocateSecureSession(sessionManager));
+    ReturnErrorOnFailure(AllocateSecureSession(sessionManager, sessionEvictionHint));
 
     mValidContext.Reset();
     mValidContext.mRequiredKeyUsages.Set(KeyUsageFlags::kDigitalSignature);
     mValidContext.mRequiredKeyPurposes.Set(KeyPurposeFlags::kServerAuth);
+    mValidContext.mValidityPolicy = policy;
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR
-CASESession::ListenForSessionEstablishment(SessionManager & sessionManager, FabricTable * fabrics,
-                                           SessionResumptionStorage * sessionResumptionStorage,
-                                           SessionEstablishmentDelegate * delegate,
-                                           Optional<ReliableMessageProtocolConfig> mrpConfig)
+CASESession::PrepareForSessionEstablishment(SessionManager & sessionManager, FabricTable * fabrics,
+                                            SessionResumptionStorage * sessionResumptionStorage,
+                                            Credentials::CertificateValidityPolicy * policy,
+                                            SessionEstablishmentDelegate * delegate, ScopedNodeId previouslyEstablishedPeer,
+                                            Optional<ReliableMessageProtocolConfig> mrpConfig)
 {
     VerifyOrReturnError(fabrics != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    ReturnErrorOnFailure(Init(sessionManager, delegate));
+    ReturnErrorOnFailure(Init(sessionManager, policy, delegate, previouslyEstablishedPeer));
 
-    mRole                     = CryptoContext::SessionRole::kResponder;
     mFabricsTable             = fabrics;
+    mRole                     = CryptoContext::SessionRole::kResponder;
     mSessionResumptionStorage = sessionResumptionStorage;
     mLocalMRPConfig           = mrpConfig;
 
-    ChipLogDetail(SecureChannel, "Waiting for Sigma1 msg");
+    ChipLogDetail(SecureChannel, "Allocated SecureSession (%p) - waiting for Sigma1 msg",
+                  mSecureSessionHolder.Get().Value()->AsSecureSession());
 
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, FabricInfo * fabric, NodeId peerNodeId,
+CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, FabricTable * fabricTable, ScopedNodeId peerScopedNodeId,
                                          ExchangeContext * exchangeCtxt, SessionResumptionStorage * sessionResumptionStorage,
-                                         SessionEstablishmentDelegate * delegate, Optional<ReliableMessageProtocolConfig> mrpConfig)
+                                         Credentials::CertificateValidityPolicy * policy, SessionEstablishmentDelegate * delegate,
+                                         Optional<ReliableMessageProtocolConfig> mrpConfig)
 {
     MATTER_TRACE_EVENT_SCOPE("EstablishSession", "CASESession");
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     // Return early on error here, as we have not initialized any state yet
     ReturnErrorCodeIf(exchangeCtxt == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    ReturnErrorCodeIf(fabric == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    ReturnErrorCodeIf(fabricTable == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+    // Use FabricTable directly to avoid situation of dangling index from stale FabricInfo
+    // until we factor-out any FabricInfo direct usage.
+    ReturnErrorCodeIf(peerScopedNodeId.GetFabricIndex() == kUndefinedFabricIndex, CHIP_ERROR_INVALID_ARGUMENT);
+    auto * fabricInfo = fabricTable->FindFabricWithIndex(peerScopedNodeId.GetFabricIndex());
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
-    err = Init(sessionManager, delegate);
+    err = Init(sessionManager, policy, delegate, peerScopedNodeId);
 
     mRole = CryptoContext::SessionRole::kInitiator;
 
@@ -210,16 +222,17 @@ CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, Fabric
     // been initialized
     SuccessOrExit(err);
 
-    mFabricInfo               = fabric;
+    mFabricsTable             = fabricTable;
+    mFabricIndex              = fabricInfo->GetFabricIndex();
     mSessionResumptionStorage = sessionResumptionStorage;
     mLocalMRPConfig           = mrpConfig;
 
     mExchangeCtxt->SetResponseTimeout(kSigma_Response_Timeout + mExchangeCtxt->GetSessionHandle()->GetAckTimeout());
-    mPeerNodeId  = peerNodeId;
-    mLocalNodeId = fabric->GetNodeId();
+    mPeerNodeId  = peerScopedNodeId.GetNodeId();
+    mLocalNodeId = fabricInfo->GetNodeId();
 
     ChipLogProgress(SecureChannel, "Initiating session on local FabricIndex %u from 0x" ChipLogFormatX64 " -> 0x" ChipLogFormatX64,
-                    static_cast<unsigned>(fabric->GetFabricIndex()), ChipLogValueX64(mLocalNodeId), ChipLogValueX64(mPeerNodeId));
+                    static_cast<unsigned>(mFabricIndex), ChipLogValueX64(mLocalNodeId), ChipLogValueX64(mPeerNodeId));
 
     err = SendSigma1();
     SuccessOrExit(err);
@@ -290,9 +303,8 @@ CHIP_ERROR CASESession::DeriveSecureSession(CryptoContext & session) const
 CHIP_ERROR CASESession::RecoverInitiatorIpk()
 {
     Credentials::GroupDataProvider::KeySet ipkKeySet;
-    FabricIndex fabricIndex = mFabricInfo->GetFabricIndex();
 
-    CHIP_ERROR err = mGroupDataProvider->GetIpkKeySet(fabricIndex, ipkKeySet);
+    CHIP_ERROR err = mGroupDataProvider->GetIpkKeySet(mFabricIndex, ipkKeySet);
 
     if (err != CHIP_NO_ERROR)
     {
@@ -316,7 +328,7 @@ CHIP_ERROR CASESession::RecoverInitiatorIpk()
     // since it leaks private security material.
 #if 0
     ChipLogProgress(SecureChannel, "RecoverInitiatorIpk: GroupDataProvider %p, Got IPK for FabricIndex %u", mGroupDataProvider,
-                    static_cast<unsigned>(mFabricInfo->GetFabricIndex()));
+                    static_cast<unsigned>(mFabricIndex));
     ChipLogByteSpan(SecureChannel, ByteSpan(mIPK));
 #endif
 
@@ -339,6 +351,10 @@ CHIP_ERROR CASESession::SendSigma1()
     TLV::TLVType outerContainerType                    = TLV::kTLVType_NotSpecified;
     uint8_t destinationIdentifier[kSHA256_Hash_Length] = { 0 };
 
+    // Lookup fabric info.
+    auto * fabricInfo = mFabricsTable->FindFabricWithIndex(mFabricIndex);
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INCORRECT_STATE);
+
     // Validate that we have a session ID allocated.
     VerifyOrReturnError(GetLocalSessionId().HasValue(), CHIP_ERROR_INCORRECT_STATE);
 
@@ -357,18 +373,17 @@ CHIP_ERROR CASESession::SendSigma1()
     ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(1), ByteSpan(mInitiatorRandom)));
     // Retrieve Session Identifier
     ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(2), GetLocalSessionId().Value()));
+
     // Generate a Destination Identifier based on the node we are attempting to reach
     {
-        ReturnErrorCodeIf(mFabricInfo == nullptr, CHIP_ERROR_INCORRECT_STATE);
-
         // Obtain originator IPK matching the fabric where we are trying to open a session. mIPK
         // will be properly set thereafter.
         ReturnErrorOnFailure(RecoverInitiatorIpk());
 
-        FabricId fabricId = mFabricInfo->GetFabricId();
-        uint8_t rootPubKeyBuf[Crypto::kP256_Point_Length];
-        Credentials::P256PublicKeySpan rootPubKeySpan(rootPubKeyBuf);
-        ReturnErrorOnFailure(mFabricInfo->GetRootPubkey(rootPubKeySpan));
+        FabricId fabricId = fabricInfo->GetFabricId();
+        Crypto::P256PublicKey rootPubKey;
+        ReturnErrorOnFailure(mFabricsTable->FetchRootPubkey(mFabricIndex, rootPubKey));
+        Credentials::P256PublicKeySpan rootPubKeySpan{ rootPubKey.ConstBytes() };
 
         MutableByteSpan destinationIdSpan(destinationIdentifier);
         ReturnErrorOnFailure(GenerateCaseDestinationId(ByteSpan(mIPK), ByteSpan(mInitiatorRandom), rootPubKeySpan, fabricId,
@@ -389,7 +404,7 @@ CHIP_ERROR CASESession::SendSigma1()
     bool resuming = false;
     if (mSessionResumptionStorage != nullptr)
     {
-        CHIP_ERROR err = mSessionResumptionStorage->FindByScopedNodeId(mFabricInfo->GetScopedNodeIdForNode(mPeerNodeId),
+        CHIP_ERROR err = mSessionResumptionStorage->FindByScopedNodeId(fabricInfo->GetScopedNodeIdForNode(mPeerNodeId),
                                                                        mResumeResumptionId, mSharedSecret, mPeerCATs);
         if (err == CHIP_NO_ERROR)
         {
@@ -442,9 +457,9 @@ CHIP_ERROR CASESession::FindLocalNodeFromDestionationId(const ByteSpan & destina
         // Basic data for candidate fabric, used to compute candidate destination identifiers
         FabricId fabricId = fabricInfo.GetFabricId();
         NodeId nodeId     = fabricInfo.GetNodeId();
-        uint8_t rootPubKeyBuf[Crypto::kP256_Point_Length];
-        Credentials::P256PublicKeySpan rootPubKeySpan(rootPubKeyBuf);
-        ReturnErrorOnFailure(fabricInfo.GetRootPubkey(rootPubKeySpan));
+        Crypto::P256PublicKey rootPubKey;
+        ReturnErrorOnFailure(mFabricsTable->FetchRootPubkey(fabricInfo.GetFabricIndex(), rootPubKey));
+        Credentials::P256PublicKeySpan rootPubKeySpan{ rootPubKey.ConstBytes() };
 
         // Get IPK operational group key set for current candidate fabric
         GroupDataProvider::KeySet ipkKeySet;
@@ -470,7 +485,7 @@ CHIP_ERROR CASESession::FindLocalNodeFromDestionationId(const ByteSpan & destina
                 found = true;
                 MutableByteSpan ipkSpan(mIPK);
                 CopySpanToMutableSpan(candidateIpkSpan, ipkSpan);
-                mFabricInfo  = &fabricInfo;
+                mFabricIndex = fabricInfo.GetFabricIndex();
                 mLocalNodeId = nodeId;
                 break;
             }
@@ -488,8 +503,8 @@ CHIP_ERROR CASESession::FindLocalNodeFromDestionationId(const ByteSpan & destina
 CHIP_ERROR CASESession::TryResumeSession(SessionResumptionStorage::ConstResumptionIdView resumptionId, ByteSpan resume1MIC,
                                          ByteSpan initiatorRandom)
 {
-    if (mSessionResumptionStorage == nullptr)
-        return CHIP_ERROR_INCORRECT_STATE;
+    VerifyOrReturnError(mSessionResumptionStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mFabricsTable != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
     SessionResumptionStorage::ConstResumptionIdView resumptionIdSpan(resumptionId);
     ScopedNodeId node;
@@ -499,12 +514,12 @@ CHIP_ERROR CASESession::TryResumeSession(SessionResumptionStorage::ConstResumpti
     ReturnErrorOnFailure(
         ValidateSigmaResumeMIC(resume1MIC, initiatorRandom, resumptionId, ByteSpan(kKDFS1RKeyInfo), ByteSpan(kResume1MIC_Nonce)));
 
-    mFabricInfo = mFabricsTable->FindFabricWithIndex(node.GetFabricIndex());
-    if (mFabricInfo == nullptr)
-        return CHIP_ERROR_INTERNAL;
+    auto * fabricInfo = mFabricsTable->FindFabricWithIndex(node.GetFabricIndex());
+    VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
+    mFabricIndex = node.GetFabricIndex();
     mPeerNodeId  = node.GetNodeId();
-    mLocalNodeId = mFabricInfo->GetNodeId();
+    mLocalNodeId = fabricInfo->GetNodeId();
 
     return CHIP_NO_ERROR;
 }
@@ -558,9 +573,9 @@ CHIP_ERROR CASESession::HandleSigma1(System::PacketBufferHandle && msg)
     if (err == CHIP_NO_ERROR)
     {
         ChipLogProgress(SecureChannel, "CASE matched destination ID: fabricIndex %u, NodeID 0x" ChipLogFormatX64,
-                        static_cast<unsigned>(mFabricInfo->GetFabricIndex()), ChipLogValueX64(mLocalNodeId));
+                        static_cast<unsigned>(mFabricIndex), ChipLogValueX64(mLocalNodeId));
 
-        // Side-effect of FindLocalNodeFromDestionationId success was that mFabricInfo/mLocalNodeId are now
+        // Side-effect of FindLocalNodeFromDestionationId success was that mFabricIndex/mLocalNodeId are now
         // set to the local fabric and associated NodeId that was targeted by the initiator.
     }
     else
@@ -651,14 +666,19 @@ CHIP_ERROR CASESession::SendSigma2()
     MATTER_TRACE_EVENT_SCOPE("SendSigma2", "CASESession");
 
     VerifyOrReturnError(GetLocalSessionId().HasValue(), CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mFabricsTable != nullptr, CHIP_ERROR_INCORRECT_STATE);
+
+    chip::Platform::ScopedMemoryBuffer<uint8_t> icacBuf;
+    VerifyOrReturnError(icacBuf.Alloc(kMaxCHIPCertLength), CHIP_ERROR_NO_MEMORY);
 
-    VerifyOrReturnError(mFabricInfo != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    chip::Platform::ScopedMemoryBuffer<uint8_t> nocBuf;
+    VerifyOrReturnError(nocBuf.Alloc(kMaxCHIPCertLength), CHIP_ERROR_NO_MEMORY);
 
-    ByteSpan icaCert;
-    ReturnErrorOnFailure(mFabricInfo->GetICACert(icaCert));
+    MutableByteSpan icaCert{ icacBuf.Get(), kMaxCHIPCertLength };
+    ReturnErrorOnFailure(mFabricsTable->FetchICACert(mFabricIndex, icaCert));
 
-    ByteSpan nocCert;
-    ReturnErrorOnFailure(mFabricInfo->GetNOCCert(nocCert));
+    MutableByteSpan nocCert{ nocBuf.Get(), kMaxCHIPCertLength };
+    ReturnErrorOnFailure(mFabricsTable->FetchNOCCert(mFabricIndex, nocCert));
 
     // Fill in the random value
     uint8_t msg_rand[kSigmaParamRandomNumberSize];
@@ -685,7 +705,7 @@ CHIP_ERROR CASESession::SendSigma2()
 
     // Construct Sigma2 TBS Data
     size_t msg_r2_signed_len =
-        TLV::EstimateStructOverhead(nocCert.size(), icaCert.size(), kP256_PublicKey_Length, kP256_PublicKey_Length);
+        TLV::EstimateStructOverhead(kMaxCHIPCertLength, kMaxCHIPCertLength, kP256_PublicKey_Length, kP256_PublicKey_Length);
 
     chip::Platform::ScopedMemoryBuffer<uint8_t> msg_R2_Signed;
     VerifyOrReturnError(msg_R2_Signed.Alloc(msg_r2_signed_len), CHIP_ERROR_NO_MEMORY);
@@ -694,12 +714,9 @@ CHIP_ERROR CASESession::SendSigma2()
                                           ByteSpan(mRemotePubKey, mRemotePubKey.Length()), msg_R2_Signed.Get(), msg_r2_signed_len));
 
     // Generate a Signature
-    VerifyOrReturnError(mFabricInfo->GetOperationalKey() != nullptr, CHIP_ERROR_INCORRECT_STATE);
-
     P256ECDSASignature tbsData2Signature;
     ReturnErrorOnFailure(
-        mFabricInfo->GetOperationalKey()->ECDSA_sign_msg(msg_R2_Signed.Get(), msg_r2_signed_len, tbsData2Signature));
-
+        mFabricsTable->SignWithOpKeypair(mFabricIndex, ByteSpan{ msg_R2_Signed.Get(), msg_r2_signed_len }, tbsData2Signature));
     msg_R2_Signed.Free();
 
     // Construct Sigma2 TBE Data
@@ -719,6 +736,16 @@ CHIP_ERROR CASESession::SendSigma2()
     {
         ReturnErrorOnFailure(tlvWriter.Put(TLV::ContextTag(kTag_TBEData_SenderICAC), icaCert));
     }
+
+    // We are now done with ICAC and NOC certs so we can release the memory.
+    {
+        icacBuf.Free();
+        icaCert = MutableByteSpan{};
+
+        nocBuf.Free();
+        nocCert = MutableByteSpan{};
+    }
+
     ReturnErrorOnFailure(tlvWriter.PutBytes(TLV::ContextTag(kTag_TBEData_Signature), tbsData2Signature,
                                             static_cast<uint32_t>(tbsData2Signature.Length())));
 
@@ -1030,15 +1057,24 @@ CHIP_ERROR CASESession::SendSigma3()
 
     P256ECDSASignature tbsData3Signature;
 
+    chip::Platform::ScopedMemoryBuffer<uint8_t> icacBuf;
+    MutableByteSpan icaCert;
+
+    chip::Platform::ScopedMemoryBuffer<uint8_t> nocBuf;
+    MutableByteSpan nocCert;
+
     ChipLogDetail(SecureChannel, "Sending Sigma3");
 
-    ByteSpan icaCert;
-    ByteSpan nocCert;
+    VerifyOrExit(icacBuf.Alloc(kMaxCHIPCertLength), err = CHIP_ERROR_NO_MEMORY);
+    icaCert = MutableByteSpan{ icacBuf.Get(), kMaxCHIPCertLength };
 
-    VerifyOrExit(mFabricInfo != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(nocBuf.Alloc(kMaxCHIPCertLength), err = CHIP_ERROR_NO_MEMORY);
+    nocCert = MutableByteSpan{ nocBuf.Get(), kMaxCHIPCertLength };
 
-    SuccessOrExit(err = mFabricInfo->GetICACert(icaCert));
-    SuccessOrExit(err = mFabricInfo->GetNOCCert(nocCert));
+    VerifyOrExit(mFabricsTable != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+
+    SuccessOrExit(err = mFabricsTable->FetchICACert(mFabricIndex, icaCert));
+    SuccessOrExit(err = mFabricsTable->FetchNOCCert(mFabricIndex, nocCert));
 
     // Prepare Sigma3 TBS Data Blob
     msg_r3_signed_len = TLV::EstimateStructOverhead(icaCert.size(), nocCert.size(), kP256_PublicKey_Length, kP256_PublicKey_Length);
@@ -1049,8 +1085,7 @@ CHIP_ERROR CASESession::SendSigma3()
                                          ByteSpan(mRemotePubKey, mRemotePubKey.Length()), msg_R3_Signed.Get(), msg_r3_signed_len));
 
     // Generate a signature
-    VerifyOrExit(mFabricInfo->GetOperationalKey() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
-    err = mFabricInfo->GetOperationalKey()->ECDSA_sign_msg(msg_R3_Signed.Get(), msg_r3_signed_len, tbsData3Signature);
+    err = mFabricsTable->SignWithOpKeypair(mFabricIndex, ByteSpan{ msg_R3_Signed.Get(), msg_r3_signed_len }, tbsData3Signature);
     SuccessOrExit(err);
 
     // Prepare Sigma3 TBE Data Blob
@@ -1069,6 +1104,16 @@ CHIP_ERROR CASESession::SendSigma3()
         {
             SuccessOrExit(err = tlvWriter.Put(TLV::ContextTag(kTag_TBEData_SenderICAC), icaCert));
         }
+
+        // We are now done with ICAC and NOC certs so we can release the memory.
+        {
+            icacBuf.Free();
+            icaCert = MutableByteSpan{};
+
+            nocBuf.Free();
+            nocCert = MutableByteSpan{};
+        }
+
         SuccessOrExit(err = tlvWriter.PutBytes(TLV::ContextTag(kTag_TBEData_Signature), tbsData3Signature,
                                                static_cast<uint32_t>(tbsData3Signature.Length())));
         SuccessOrExit(err = tlvWriter.EndContainer(outerContainerType));
@@ -1396,15 +1441,17 @@ CHIP_ERROR CASESession::ValidateSigmaResumeMIC(const ByteSpan & resumeMIC, const
 CHIP_ERROR CASESession::ValidatePeerIdentity(const ByteSpan & peerNOC, const ByteSpan & peerICAC, NodeId & peerNodeId,
                                              Crypto::P256PublicKey & peerPublicKey)
 {
-    ReturnErrorCodeIf(mFabricInfo == nullptr, CHIP_ERROR_INCORRECT_STATE);
+    ReturnErrorCodeIf(mFabricsTable == nullptr, CHIP_ERROR_INCORRECT_STATE);
+    auto * fabricInfo = mFabricsTable->FindFabricWithIndex(mFabricIndex);
+    ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
     ReturnErrorOnFailure(SetEffectiveTime());
 
     PeerId peerId;
     FabricId peerNOCFabricId;
-    ReturnErrorOnFailure(mFabricInfo->VerifyCredentials(peerNOC, peerICAC, mValidContext, peerId, peerNOCFabricId, peerPublicKey));
+    ReturnErrorOnFailure(fabricInfo->VerifyCredentials(peerNOC, peerICAC, mValidContext, peerId, peerNOCFabricId, peerPublicKey));
 
-    VerifyOrReturnError(mFabricInfo->GetFabricId() == peerNOCFabricId, CHIP_ERROR_INVALID_CASE_PARAMETER);
+    VerifyOrReturnError(fabricInfo->GetFabricId() == peerNOCFabricId, CHIP_ERROR_INVALID_CASE_PARAMETER);
 
     peerNodeId = peerId.GetNodeId();
 
@@ -1441,38 +1488,41 @@ CHIP_ERROR CASESession::ConstructTBSData(const ByteSpan & senderNOC, const ByteS
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR CASESession::GetHardcodedTime()
-{
-    using namespace ASN1;
-    ASN1UniversalTime effectiveTime;
-
-    effectiveTime.Year   = 2022;
-    effectiveTime.Month  = 1;
-    effectiveTime.Day    = 1;
-    effectiveTime.Hour   = 10;
-    effectiveTime.Minute = 10;
-    effectiveTime.Second = 10;
-
-    return ASN1ToChipEpochTime(effectiveTime, mValidContext.mEffectiveTime);
-}
-
 CHIP_ERROR CASESession::SetEffectiveTime()
 {
-    System::Clock::Milliseconds64 currentTimeMS;
-    CHIP_ERROR err = System::SystemClock().GetClock_RealTimeMS(currentTimeMS);
+    System::Clock::Milliseconds64 currentUnixTimeMS;
+    CHIP_ERROR err = System::SystemClock().GetClock_RealTimeMS(currentUnixTimeMS);
 
-    if (err != CHIP_NO_ERROR)
+    if (err == CHIP_NO_ERROR)
     {
-        ChipLogError(
-            SecureChannel,
-            "The device does not support GetClock_RealTimeMS() API. This will eventually result in CASE session setup failures.");
-        // TODO: Remove use of hardcoded time during CASE setup
-        return GetHardcodedTime();
+        // If the system has given us a wall clock time, we must use it or
+        // fail.  Conversion failures here are therefore always an error.
+        System::Clock::Seconds32 currentUnixTime = std::chrono::duration_cast<System::Clock::Seconds32>(currentUnixTimeMS);
+        ReturnErrorOnFailure(mValidContext.SetEffectiveTimeFromUnixTime<CurrentChipEpochTime>(currentUnixTime));
+    }
+    else
+    {
+        // If we don't have wall clock time, the spec dictates that we should
+        // fall back to Last Known Good Time.  Ultimately, the calling application's
+        // validity policy will determine whether this is permissible.
+        System::Clock::Seconds32 lastKnownGoodChipEpochTime;
+        ChipLogError(SecureChannel,
+                     "The device does not support GetClock_RealTimeMS() API: %" CHIP_ERROR_FORMAT
+                     ".  Falling back to Last Known Good UTC Time",
+                     err.Format());
+        VerifyOrReturnError(mFabricsTable != nullptr, CHIP_ERROR_INCORRECT_STATE);
+        err = mFabricsTable->GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpochTime);
+        if (err != CHIP_NO_ERROR)
+        {
+            // If we have no time available, the Validity Policy will
+            // determine what to do.
+            ChipLogError(SecureChannel, "Failed to retrieve Last Known Good UTC Time");
+        }
+        else
+        {
+            mValidContext.SetEffectiveTime<LastKnownGoodChipEpochTime>(lastKnownGoodChipEpochTime);
+        }
     }
-
-    System::Clock::Seconds32 currentTime = std::chrono::duration_cast<System::Clock::Seconds32>(currentTimeMS);
-    VerifyOrReturnError(UnixEpochToChipEpochTime(currentTime.count(), mValidContext.mEffectiveTime), CHIP_ERROR_INVALID_TIME);
-
     return CHIP_NO_ERROR;
 }
 
@@ -1642,6 +1692,15 @@ CHIP_ERROR CASESession::OnMessageReceived(ExchangeContext * ec, const PayloadHea
     Protocols::SecureChannel::MsgType msgType = static_cast<Protocols::SecureChannel::MsgType>(payloadHeader.GetMessageType());
     SuccessOrExit(err);
 
+#if CHIP_CONFIG_SLOW_CRYPTO
+    if (msgType == Protocols::SecureChannel::MsgType::CASE_Sigma1 || msgType == Protocols::SecureChannel::MsgType::CASE_Sigma2 ||
+        msgType == Protocols::SecureChannel::MsgType::CASE_Sigma2Resume ||
+        msgType == Protocols::SecureChannel::MsgType::CASE_Sigma3)
+    {
+        SuccessOrExit(mExchangeCtxt->FlushAcks());
+    }
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
     // By default, CHIP_ERROR_INVALID_MESSAGE_TYPE is returned if in the current state
     // a message handler is not defined for the received message type.
     err = CHIP_ERROR_INVALID_MESSAGE_TYPE;
diff --git a/src/protocols/secure_channel/CASESession.h b/src/protocols/secure_channel/CASESession.h
index 1914f3a2cc3507..2e8bf3f61f8ee7 100644
--- a/src/protocols/secure_channel/CASESession.h
+++ b/src/protocols/secure_channel/CASESession.h
@@ -30,9 +30,11 @@
 #if CHIP_CRYPTO_HSM
 #include <crypto/hsm/CHIPCryptoPALHsm.h>
 #endif
+#include <credentials/CertificateValidityPolicy.h>
 #include <credentials/FabricTable.h>
 #include <credentials/GroupDataProvider.h>
 #include <lib/core/CHIPTLV.h>
+#include <lib/core/ScopedNodeId.h>
 #include <lib/support/Base64.h>
 #include <messaging/ExchangeContext.h>
 #include <messaging/ExchangeDelegate.h>
@@ -72,13 +74,19 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
      *
      * @param sessionManager                session manager from which to allocate a secure session object
      * @param fabrics                       Table of fabrics that are currently configured on the device
+     * @param policy                        Optional application-provided certificate validity policy
      * @param delegate                      Callback object
+     * @param previouslyEstablishedPeer     If a session had previously been established successfully to a peer, this should
+     *                                      be set to its scoped node-id. Else, this should be initialized to a
+     *                                      default-constructed ScopedNodeId().
+     * @param mrpConfig                     MRP configuration to encode into Sigma2. If not provided, it won't be encoded.
      *
      * @return CHIP_ERROR     The result of initialization
      */
-    CHIP_ERROR ListenForSessionEstablishment(
+    CHIP_ERROR PrepareForSessionEstablishment(
         SessionManager & sessionManager, FabricTable * fabrics, SessionResumptionStorage * sessionResumptionStorage,
-        SessionEstablishmentDelegate * delegate,
+        Credentials::CertificateValidityPolicy * policy, SessionEstablishmentDelegate * delegate,
+        ScopedNodeId previouslyEstablishedPeer,
         Optional<ReliableMessageProtocolConfig> mrpConfig = Optional<ReliableMessageProtocolConfig>::Missing());
 
     /**
@@ -86,17 +94,18 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
      *   Create and send session establishment request using device's operational credentials.
      *
      * @param sessionManager                session manager from which to allocate a secure session object
-     * @param fabric                        The fabric that should be used for connecting with the peer
-     * @param peerNodeId                    Node id of the peer node
+     * @param fabricTable                   The fabric table that contains a fabric in common with the peer
+     * @param peerScopedNodeId              Node to which we want to establish a session
      * @param exchangeCtxt                  The exchange context to send and receive messages with the peer
+     * @param policy                        Optional application-provided certificate validity policy
      * @param delegate                      Callback object
      *
      * @return CHIP_ERROR      The result of initialization
      */
     CHIP_ERROR
-    EstablishSession(SessionManager & sessionManager, FabricInfo * fabric, NodeId peerNodeId,
+    EstablishSession(SessionManager & sessionManager, FabricTable * fabricTable, ScopedNodeId peerScopedNodeId,
                      Messaging::ExchangeContext * exchangeCtxt, SessionResumptionStorage * sessionResumptionStorage,
-                     SessionEstablishmentDelegate * delegate,
+                     Credentials::CertificateValidityPolicy * policy, SessionEstablishmentDelegate * delegate,
                      Optional<ReliableMessageProtocolConfig> mrpConfig = Optional<ReliableMessageProtocolConfig>::Missing());
 
     /**
@@ -157,7 +166,7 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
     //// SessionDelegate ////
     void OnSessionReleased() override;
 
-    FabricIndex GetFabricIndex() const { return mFabricInfo != nullptr ? mFabricInfo->GetFabricIndex() : kUndefinedFabricIndex; }
+    FabricIndex GetFabricIndex() const { return mFabricIndex; }
 
     // TODO: remove Clear, we should create a new instance instead reset the old instance.
     /** @brief This function zeroes out and resets the memory used by the object.
@@ -177,7 +186,17 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
         kFinishedViaResume = 7,
     };
 
-    CHIP_ERROR Init(SessionManager & sessionManager, SessionEstablishmentDelegate * delegate);
+    /*
+     * Initialize the object given a reference to the SessionManager, certificate validity policy and a delegate which will be
+     * notified of any further progress on this session.
+     *
+     * If we're either establishing or finished establishing a session to a peer in either initiator or responder
+     * roles, the node id of that peer should be provided in sessionEvictionHint. Else, it should be initialized
+     * to a default-constructed ScopedNodeId().
+     *
+     */
+    CHIP_ERROR Init(SessionManager & sessionManager, Credentials::CertificateValidityPolicy * policy,
+                    SessionEstablishmentDelegate * delegate, const ScopedNodeId & sessionEvictionHint);
 
     // On success, sets mIpk to the correct value for outgoing Sigma1 based on internal state
     CHIP_ERROR RecoverInitiatorIpk();
@@ -241,10 +260,10 @@ class DLL_EXPORT CASESession : public Messaging::UnsolicitedMessageHandler,
 
     SessionResumptionStorage * mSessionResumptionStorage = nullptr;
 
-    FabricTable * mFabricsTable    = nullptr;
-    const FabricInfo * mFabricInfo = nullptr;
-    NodeId mPeerNodeId             = kUndefinedNodeId;
-    NodeId mLocalNodeId            = kUndefinedNodeId;
+    FabricTable * mFabricsTable = nullptr;
+    FabricIndex mFabricIndex    = kUndefinedFabricIndex;
+    NodeId mPeerNodeId          = kUndefinedNodeId;
+    NodeId mLocalNodeId         = kUndefinedNodeId;
     CATValues mPeerCATs;
 
     SessionResumptionStorage::ResumptionIdStorage mResumeResumptionId; // ResumptionId which is used to resume this session
diff --git a/src/protocols/secure_channel/DefaultSessionResumptionStorage.cpp b/src/protocols/secure_channel/DefaultSessionResumptionStorage.cpp
index f08c19101e4af0..7a5f6a1399e3f3 100644
--- a/src/protocols/secure_channel/DefaultSessionResumptionStorage.cpp
+++ b/src/protocols/secure_channel/DefaultSessionResumptionStorage.cpp
@@ -80,14 +80,14 @@ CHIP_ERROR DefaultSessionResumptionStorage::Delete(const ScopedNodeId & node)
     if (err == CHIP_NO_ERROR)
     {
         err = DeleteLink(resumptionId);
-        if (err != CHIP_NO_ERROR)
+        if (err != CHIP_NO_ERROR && err != CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
         {
             ChipLogError(SecureChannel,
                          "Unable to delete session resumption link for node " ChipLogFormatX64 ": %" CHIP_ERROR_FORMAT,
                          ChipLogValueX64(node.GetNodeId()), err.Format());
         }
     }
-    else
+    else if (err != CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
         ChipLogError(SecureChannel,
                      "Unable to load session resumption state during session deletion for node " ChipLogFormatX64
@@ -96,7 +96,7 @@ CHIP_ERROR DefaultSessionResumptionStorage::Delete(const ScopedNodeId & node)
     }
 
     err = DeleteState(node);
-    if (err != CHIP_NO_ERROR)
+    if (err != CHIP_NO_ERROR && err != CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
         ChipLogError(SecureChannel, "Unable to delete session resumption state for node " ChipLogFormatX64 ": %" CHIP_ERROR_FORMAT,
                      ChipLogValueX64(node.GetNodeId()), err.Format());
diff --git a/src/protocols/secure_channel/PASESession.cpp b/src/protocols/secure_channel/PASESession.cpp
index c513f1d2808c99..d780c0821a55ff 100644
--- a/src/protocols/secure_channel/PASESession.cpp
+++ b/src/protocols/secure_channel/PASESession.cpp
@@ -800,10 +800,19 @@ CHIP_ERROR PASESession::OnUnsolicitedMessageReceived(const PayloadHeader & paylo
 CHIP_ERROR PASESession::OnMessageReceived(ExchangeContext * exchange, const PayloadHeader & payloadHeader,
                                           System::PacketBufferHandle && msg)
 {
-    CHIP_ERROR err = ValidateReceivedMessage(exchange, payloadHeader, msg);
+    CHIP_ERROR err  = ValidateReceivedMessage(exchange, payloadHeader, msg);
+    MsgType msgType = static_cast<MsgType>(payloadHeader.GetMessageType());
     SuccessOrExit(err);
 
-    switch (static_cast<MsgType>(payloadHeader.GetMessageType()))
+#if CHIP_CONFIG_SLOW_CRYPTO
+    if (msgType == MsgType::PBKDFParamRequest || msgType == MsgType::PBKDFParamResponse || msgType == MsgType::PASE_Pake1 ||
+        msgType == MsgType::PASE_Pake2 || msgType == MsgType::PASE_Pake3)
+    {
+        SuccessOrExit(mExchangeCtxt->FlushAcks());
+    }
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
+    switch (msgType)
     {
     case MsgType::PBKDFParamRequest:
         err = HandlePBKDFParamRequest(std::move(msg));
diff --git a/src/protocols/secure_channel/PairingSession.cpp b/src/protocols/secure_channel/PairingSession.cpp
index 55d992c1655d83..b3721ca8533a45 100644
--- a/src/protocols/secure_channel/PairingSession.cpp
+++ b/src/protocols/secure_channel/PairingSession.cpp
@@ -23,11 +23,11 @@
 
 namespace chip {
 
-CHIP_ERROR PairingSession::AllocateSecureSession(SessionManager & sessionManager)
+CHIP_ERROR PairingSession::AllocateSecureSession(SessionManager & sessionManager, const ScopedNodeId & sessionEvictionHint)
 {
-    auto handle = sessionManager.AllocateSession(GetSecureSessionType());
+    auto handle = sessionManager.AllocateSession(GetSecureSessionType(), sessionEvictionHint);
     VerifyOrReturnError(handle.HasValue(), CHIP_ERROR_NO_MEMORY);
-    VerifyOrReturnError(mSecureSessionHolder.GrabPairing(handle.Value()), CHIP_ERROR_INTERNAL);
+    VerifyOrReturnError(mSecureSessionHolder.GrabPairingSession(handle.Value()), CHIP_ERROR_INTERNAL);
     mSessionManager = &sessionManager;
     return CHIP_NO_ERROR;
 }
@@ -44,7 +44,7 @@ CHIP_ERROR PairingSession::ActivateSecureSession(const Transport::PeerAddress &
     ReturnErrorOnFailure(DeriveSecureSession(secureSession->GetCryptoContext()));
     uint16_t peerSessionId = GetPeerSessionId();
     secureSession->SetPeerAddress(peerAddress);
-    secureSession->GetSessionMessageCounter().GetPeerMessageCounter().SetCounter(LocalSessionMessageCounter::kInitialSyncValue);
+    secureSession->GetSessionMessageCounter().GetPeerMessageCounter().SetCounter(Transport::PeerMessageCounter::kInitialSyncValue);
 
     // Call Activate last, otherwise errors on anything after would lead to
     // a partially valid session.
diff --git a/src/protocols/secure_channel/PairingSession.h b/src/protocols/secure_channel/PairingSession.h
index 25e0c9f95bd06b..bc9d75892b2439 100644
--- a/src/protocols/secure_channel/PairingSession.h
+++ b/src/protocols/secure_channel/PairingSession.h
@@ -63,11 +63,27 @@ class DLL_EXPORT PairingSession : public SessionDelegate
         return localSessionId;
     }
 
+    /**
+     * Copy the underlying session (if present) into a SessionHandle that a caller can use to
+     * obtain a reference to the session.
+     */
+    Optional<SessionHandle> CopySecureSession()
+    {
+        if (mSecureSessionHolder)
+        {
+            VerifyOrDie(mSecureSessionHolder->GetSessionType() == Transport::Session::SessionType::kSecure);
+            return MakeOptional<SessionHandle>(*mSecureSessionHolder->AsSecureSession());
+        }
+
+        return Optional<SessionHandle>::Missing();
+    }
+
     uint16_t GetPeerSessionId() const
     {
         VerifyOrDie(mPeerSessionId.HasValue());
         return mPeerSessionId.Value();
     }
+
     bool IsValidPeerSessionId() const { return mPeerSessionId.HasValue(); }
 
     /**
@@ -93,10 +109,14 @@ class DLL_EXPORT PairingSession : public SessionDelegate
      * Allocate a secure session object from the passed session manager for the
      * pending session establishment operation.
      *
-     * @param sessionManager session manager from which to allocate a secure session object
+     * @param sessionManager        Session manager from which to allocate a secure session object
+     * @param sessionEvictionHint   If we're either establishing or just finished establishing a session to a peer in either
+     * initiator or responder roles, the node id of that peer should be provided in this argument. Else, it should be initialized to
+     * a default-constructed ScopedNodeId().
+     *
      * @return CHIP_ERROR The outcome of the allocation attempt
      */
-    CHIP_ERROR AllocateSecureSession(SessionManager & sessionManager);
+    CHIP_ERROR AllocateSecureSession(SessionManager & sessionManager, const ScopedNodeId & sessionEvictionHint = ScopedNodeId());
 
     CHIP_ERROR ActivateSecureSession(const Transport::PeerAddress & peerAddress);
 
diff --git a/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.cpp b/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.cpp
index 240c3ada9dc087..3a26d0df1ee06d 100644
--- a/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.cpp
+++ b/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.cpp
@@ -28,11 +28,10 @@ namespace chip {
 
 using namespace Messaging;
 
-bool SessionEstablishmentExchangeDispatch::MessagePermitted(uint16_t protocol, uint8_t type)
+bool SessionEstablishmentExchangeDispatch::MessagePermitted(Protocols::Id protocol, uint8_t type)
 {
-    switch (protocol)
+    if (protocol == Protocols::SecureChannel::Id)
     {
-    case Protocols::SecureChannel::Id.GetProtocolId():
         switch (type)
         {
         case static_cast<uint8_t>(Protocols::SecureChannel::MsgType::StandaloneAck):
@@ -52,11 +51,8 @@ bool SessionEstablishmentExchangeDispatch::MessagePermitted(uint16_t protocol, u
         default:
             break;
         }
-        break;
-
-    default:
-        break;
     }
+
     return false;
 }
 
diff --git a/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.h b/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.h
index 9cb75a596ff6a4..72083b45dd909c 100644
--- a/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.h
+++ b/src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.h
@@ -41,7 +41,7 @@ class SessionEstablishmentExchangeDispatch : public Messaging::ExchangeMessageDi
     ~SessionEstablishmentExchangeDispatch() override {}
 
 protected:
-    bool MessagePermitted(uint16_t protocol, uint8_t type) override;
+    bool MessagePermitted(Protocols::Id, uint8_t type) override;
     bool IsEncryptionRequired() const override { return false; }
 };
 
diff --git a/src/protocols/secure_channel/tests/TestCASESession.cpp b/src/protocols/secure_channel/tests/TestCASESession.cpp
index 6772ba7a0c80f4..86626ae08a2fb7 100644
--- a/src/protocols/secure_channel/tests/TestCASESession.cpp
+++ b/src/protocols/secure_channel/tests/TestCASESession.cpp
@@ -27,6 +27,7 @@
 #include <lib/core/CHIPCore.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/core/DataModelTypes.h>
+#include <lib/core/ScopedNodeId.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ScopedBuffer.h>
@@ -53,19 +54,6 @@ using namespace chip::Protocols;
 using TestContext = Test::LoopbackMessagingContext;
 
 namespace {
-FabricTable gCommissionerFabrics;
-FabricIndex gCommissionerFabricIndex;
-GroupDataProviderImpl gCommissionerGroupDataProvider;
-TestPersistentStorageDelegate gCommissionerStorageDelegate;
-
-FabricTable gDeviceFabrics;
-FabricIndex gDeviceFabricIndex;
-GroupDataProviderImpl gDeviceGroupDataProvider;
-TestPersistentStorageDelegate gDeviceStorageDelegate;
-
-NodeId Node01_01 = 0xDEDEDEDE00010001;
-NodeId Node01_02 = 0xDEDEDEDE00010002;
-
 class TestCASESecurePairingDelegate : public SessionEstablishmentDelegate
 {
 public:
@@ -95,6 +83,68 @@ class CASEServerForTest : public CASEServer
     CASESession mCaseSession;
 };
 
+class TestOperationalKeystore : public chip::Crypto::OperationalKeystore
+{
+public:
+    void Init(FabricIndex fabricIndex, Platform::UniquePtr<P256Keypair> keypair)
+    {
+        mSingleFabricIndex = fabricIndex;
+        mKeypair           = std::move(keypair);
+    }
+
+    bool HasPendingOpKeypair() const override { return false; }
+    bool HasOpKeypairForFabric(FabricIndex fabricIndex) const override { return mSingleFabricIndex != kUndefinedFabricIndex; }
+
+    CHIP_ERROR NewOpKeypairForFabric(FabricIndex fabricIndex, MutableByteSpan & outCertificateSigningRequest) override
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+
+    CHIP_ERROR ActivateOpKeypairForFabric(FabricIndex fabricIndex, const Crypto::P256PublicKey & nocPublicKey) override
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
+
+    CHIP_ERROR CommitOpKeypairForFabric(FabricIndex fabricIndex) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR RemoveOpKeypairForFabric(FabricIndex fabricIndex) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+
+    void RevertPendingKeypair() override {}
+
+    CHIP_ERROR SignWithOpKeypair(FabricIndex fabricIndex, const ByteSpan & message,
+                                 Crypto::P256ECDSASignature & outSignature) const override
+    {
+        VerifyOrReturnError(mKeypair != nullptr, CHIP_ERROR_INCORRECT_STATE);
+        VerifyOrReturnError(fabricIndex == mSingleFabricIndex, CHIP_ERROR_INVALID_FABRIC_INDEX);
+        return mKeypair->ECDSA_sign_msg(message.data(), message.size(), outSignature);
+    }
+
+protected:
+    Platform::UniquePtr<P256Keypair> mKeypair;
+    FabricIndex mSingleFabricIndex = kUndefinedFabricIndex;
+};
+
+#if CHIP_CONFIG_SLOW_CRYPTO
+constexpr uint32_t sTestCaseMessageCount           = 8;
+constexpr uint32_t sTestCaseResumptionMessageCount = 6;
+#else  // CHIP_CONFIG_SLOW_CRYPTO
+constexpr uint32_t sTestCaseMessageCount           = 5;
+constexpr uint32_t sTestCaseResumptionMessageCount = 4;
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
+FabricTable gCommissionerFabrics;
+FabricIndex gCommissionerFabricIndex;
+GroupDataProviderImpl gCommissionerGroupDataProvider;
+TestPersistentStorageDelegate gCommissionerStorageDelegate;
+
+FabricTable gDeviceFabrics;
+FabricIndex gDeviceFabricIndex;
+GroupDataProviderImpl gDeviceGroupDataProvider;
+TestPersistentStorageDelegate gDeviceStorageDelegate;
+TestOperationalKeystore gDeviceOperationalKeystore;
+
+NodeId Node01_01 = 0xDEDEDEDE00010001;
+NodeId Node01_02 = 0xDEDEDEDE00010002;
+
 CHIP_ERROR InitTestIpk(GroupDataProvider & groupDataProvider, const FabricInfo & fabricInfo, size_t numIpks)
 {
     VerifyOrReturnError((numIpks > 0) && (numIpks <= 3), CHIP_ERROR_INVALID_ARGUMENT);
@@ -152,14 +202,17 @@ CHIP_ERROR InitCredentialSets()
     ReturnErrorOnFailure(gDeviceGroupDataProvider.Init());
     FabricInfo deviceFabric;
 
+    auto deviceOpKey = Platform::MakeUnique<Crypto::P256Keypair>();
     memcpy((uint8_t *) (opKeysSerialized), sTestCert_Node01_01_PublicKey, sTestCert_Node01_01_PublicKey_Len);
     memcpy((uint8_t *) (opKeysSerialized) + sTestCert_Node01_01_PublicKey_Len, sTestCert_Node01_01_PrivateKey,
            sTestCert_Node01_01_PrivateKey_Len);
 
     ReturnErrorOnFailure(opKeysSerialized.SetLength(sTestCert_Node01_01_PublicKey_Len + sTestCert_Node01_01_PrivateKey_Len));
 
-    ReturnErrorOnFailure(opKey.Deserialize(opKeysSerialized));
-    ReturnErrorOnFailure(deviceFabric.SetOperationalKeypair(&opKey));
+    ReturnErrorOnFailure(deviceOpKey->Deserialize(opKeysSerialized));
+
+    gDeviceOperationalKeystore.Init(1, std::move(deviceOpKey));
+    ReturnErrorOnFailure(gDeviceFabrics.Init(&gDeviceStorageDelegate, &gDeviceOperationalKeystore));
 
     ReturnErrorOnFailure(deviceFabric.SetRootCert(ByteSpan(sTestCert_Root01_Chip, sTestCert_Root01_Chip_Len)));
     ReturnErrorOnFailure(deviceFabric.SetICACert(ByteSpan(sTestCert_ICA01_Chip, sTestCert_ICA01_Chip_Len)));
@@ -190,10 +243,14 @@ void CASE_SecurePairingWaitTest(nlTestSuite * inSuite, void * inContext)
 
     pairing.SetGroupDataProvider(&gDeviceGroupDataProvider);
     NL_TEST_ASSERT(inSuite,
-                   pairing.ListenForSessionEstablishment(sessionManager, nullptr, nullptr, nullptr) == CHIP_ERROR_INVALID_ARGUMENT);
-    NL_TEST_ASSERT(
-        inSuite, pairing.ListenForSessionEstablishment(sessionManager, nullptr, nullptr, &delegate) == CHIP_ERROR_INVALID_ARGUMENT);
-    NL_TEST_ASSERT(inSuite, pairing.ListenForSessionEstablishment(sessionManager, &fabrics, nullptr, &delegate) == CHIP_NO_ERROR);
+                   pairing.PrepareForSessionEstablishment(sessionManager, nullptr, nullptr, nullptr, nullptr, ScopedNodeId()) ==
+                       CHIP_ERROR_INVALID_ARGUMENT);
+    NL_TEST_ASSERT(inSuite,
+                   pairing.PrepareForSessionEstablishment(sessionManager, nullptr, nullptr, nullptr, &delegate, ScopedNodeId()) ==
+                       CHIP_ERROR_INVALID_ARGUMENT);
+    NL_TEST_ASSERT(inSuite,
+                   pairing.PrepareForSessionEstablishment(sessionManager, &fabrics, nullptr, nullptr, &delegate, ScopedNodeId()) ==
+                       CHIP_NO_ERROR);
 }
 
 void CASE_SecurePairingStartTest(nlTestSuite * inSuite, void * inContext)
@@ -206,30 +263,31 @@ void CASE_SecurePairingStartTest(nlTestSuite * inSuite, void * inContext)
     CASESession pairing;
     pairing.SetGroupDataProvider(&gCommissionerGroupDataProvider);
 
-    FabricInfo * fabric = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex);
-    NL_TEST_ASSERT(inSuite, fabric != nullptr);
-
     ExchangeContext * context = ctx.NewUnauthenticatedExchangeToBob(&pairing);
 
     NL_TEST_ASSERT(inSuite,
-                   pairing.EstablishSession(sessionManager, nullptr, Node01_01, nullptr, nullptr, nullptr) != CHIP_NO_ERROR);
+                   pairing.EstablishSession(sessionManager, nullptr, ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, nullptr,
+                                            nullptr, nullptr, nullptr) != CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(inSuite,
-                   pairing.EstablishSession(sessionManager, fabric, Node01_01, nullptr, nullptr, nullptr) != CHIP_NO_ERROR);
+                   pairing.EstablishSession(sessionManager, &gCommissionerFabrics,
+                                            ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, nullptr, nullptr, nullptr,
+                                            nullptr) != CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
     NL_TEST_ASSERT(inSuite,
-                   pairing.EstablishSession(sessionManager, fabric, Node01_01, context, nullptr, &delegate) == CHIP_NO_ERROR);
+                   pairing.EstablishSession(sessionManager, &gCommissionerFabrics,
+                                            ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, context, nullptr, nullptr,
+                                            &delegate) == CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
     auto & loopback = ctx.GetLoopback();
-    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 1);
+    // There should have been two message sent: Sigma1 and an ack.
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 2);
 
-    // Clear pending packet in CRMP
-    ReliableMessageMgr * rm     = ctx.GetExchangeManager().GetReliableMessageMgr();
-    ReliableMessageContext * rc = context->GetReliableMessageContext();
-    rm->ClearRetransTable(rc);
+    ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
+    NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 
     loopback.mMessageSendError = CHIP_ERROR_BAD_REQUEST;
 
@@ -241,8 +299,9 @@ void CASE_SecurePairingStartTest(nlTestSuite * inSuite, void * inContext)
     ExchangeContext * context1 = ctx.NewUnauthenticatedExchangeToBob(&pairing1);
 
     NL_TEST_ASSERT(inSuite,
-                   pairing1.EstablishSession(sessionManager, fabric, Node01_01, context1, nullptr, &delegate) ==
-                       CHIP_ERROR_BAD_REQUEST);
+                   pairing1.EstablishSession(sessionManager, &gCommissionerFabrics,
+                                             ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, context1, nullptr, nullptr,
+                                             &delegate) == CHIP_ERROR_BAD_REQUEST);
     ctx.DrainAndServiceIO();
 
     loopback.mMessageSendError = CHIP_NO_ERROR;
@@ -270,20 +329,19 @@ void CASE_SecurePairingHandshakeTestCommon(nlTestSuite * inSuite, void * inConte
 
     ExchangeContext * contextCommissioner = ctx.NewUnauthenticatedExchangeToBob(&pairingCommissioner);
 
-    FabricInfo * fabric = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex);
-    NL_TEST_ASSERT(inSuite, fabric != nullptr);
-
     pairingAccessory.SetGroupDataProvider(&gDeviceGroupDataProvider);
     NL_TEST_ASSERT(inSuite,
-                   pairingAccessory.ListenForSessionEstablishment(sessionManager, &gDeviceFabrics, nullptr, &delegateAccessory,
-                                                                  MakeOptional(verySleepyAccessoryRmpConfig)) == CHIP_NO_ERROR);
+                   pairingAccessory.PrepareForSessionEstablishment(sessionManager, &gDeviceFabrics, nullptr, nullptr,
+                                                                   &delegateAccessory, ScopedNodeId(),
+                                                                   MakeOptional(verySleepyAccessoryRmpConfig)) == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite,
-                   pairingCommissioner.EstablishSession(sessionManager, fabric, Node01_01, contextCommissioner, nullptr,
-                                                        &delegateCommissioner,
+                   pairingCommissioner.EstablishSession(sessionManager, &gCommissionerFabrics,
+                                                        ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, contextCommissioner,
+                                                        nullptr, nullptr, &delegateCommissioner,
                                                         MakeOptional(nonSleepyCommissionerRmpConfig)) == CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
-    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 5);
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == sTestCaseMessageCount);
     NL_TEST_ASSERT(inSuite, delegateAccessory.mNumPairingComplete == 1);
     NL_TEST_ASSERT(inSuite, delegateCommissioner.mNumPairingComplete == 1);
     NL_TEST_ASSERT(inSuite, pairingAccessory.GetRemoteMRPConfig().mIdleRetransTimeout == System::Clock::Milliseconds32(5000));
@@ -322,34 +380,34 @@ void CASE_SecurePairingHandshakeServerTest(nlTestSuite * inSuite, void * inConte
     // components may work simultaneously on a single device.
     NL_TEST_ASSERT(inSuite,
                    gPairingServer.ListenForSessionEstablishment(&ctx.GetExchangeManager(), &ctx.GetSecureSessionManager(),
-                                                                &gDeviceFabrics, nullptr,
+                                                                &gDeviceFabrics, nullptr, nullptr,
                                                                 &gDeviceGroupDataProvider) == CHIP_NO_ERROR);
 
     ExchangeContext * contextCommissioner = ctx.NewUnauthenticatedExchangeToBob(pairingCommissioner);
 
-    FabricInfo * fabric = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex);
-    NL_TEST_ASSERT(inSuite, fabric != nullptr);
-
     NL_TEST_ASSERT(inSuite,
-                   pairingCommissioner->EstablishSession(ctx.GetSecureSessionManager(), fabric, Node01_01, contextCommissioner,
-                                                         nullptr, &delegateCommissioner) == CHIP_NO_ERROR);
+                   pairingCommissioner->EstablishSession(ctx.GetSecureSessionManager(), &gCommissionerFabrics,
+                                                         ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, contextCommissioner,
+                                                         nullptr, nullptr, &delegateCommissioner) == CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
-    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 5);
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == sTestCaseMessageCount);
     NL_TEST_ASSERT(inSuite, delegateCommissioner.mNumPairingComplete == 1);
 
     // Validate that secure session is created
     SessionHolder & holder = delegateCommissioner.GetSessionHolder();
     NL_TEST_ASSERT(inSuite, bool(holder));
-    NL_TEST_ASSERT(inSuite, holder->GetPeer() == fabric->GetScopedNodeIdForNode(Node01_01));
+
+    NL_TEST_ASSERT(inSuite, (holder->GetPeer() == chip::ScopedNodeId{ Node01_01, gCommissionerFabricIndex }));
 
     auto * pairingCommissioner1 = chip::Platform::New<CASESession>();
     pairingCommissioner1->SetGroupDataProvider(&gCommissionerGroupDataProvider);
     ExchangeContext * contextCommissioner1 = ctx.NewUnauthenticatedExchangeToBob(pairingCommissioner1);
 
     NL_TEST_ASSERT(inSuite,
-                   pairingCommissioner1->EstablishSession(ctx.GetSecureSessionManager(), fabric, Node01_01, contextCommissioner1,
-                                                          nullptr, &delegateCommissioner) == CHIP_NO_ERROR);
+                   pairingCommissioner1->EstablishSession(ctx.GetSecureSessionManager(), &gCommissionerFabrics,
+                                                          ScopedNodeId{ Node01_01, gCommissionerFabricIndex }, contextCommissioner1,
+                                                          nullptr, nullptr, &delegateCommissioner) == CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
     chip::Platform::Delete(pairingCommissioner);
@@ -688,10 +746,10 @@ static void CASE_SessionResumptionStorage(nlTestSuite * inSuite, void * inContex
     chip::Crypto::P256ECDHDerivedSecret sharedSecretB;
 
     // Create our fabric-scoped node IDs.
-    FabricInfo * fabric = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex);
-    NL_TEST_ASSERT(inSuite, fabric != nullptr);
-    ScopedNodeId initiator = fabric->GetScopedNodeIdForNode(Node01_02);
-    ScopedNodeId responder = fabric->GetScopedNodeIdForNode(Node01_01);
+    const FabricInfo * fabricInfo = gCommissionerFabrics.FindFabricWithIndex(gCommissionerFabricIndex);
+    NL_TEST_ASSERT(inSuite, fabricInfo != nullptr);
+    ScopedNodeId initiator = fabricInfo->GetScopedNodeIdForNode(Node01_02);
+    ScopedNodeId responder = fabricInfo->GetScopedNodeIdForNode(Node01_01);
 
     // Generate a resumption IDs.
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == chip::Crypto::DRBG_get_bytes(resumptionIdA.data(), resumptionIdA.size()));
@@ -712,30 +770,32 @@ static void CASE_SessionResumptionStorage(nlTestSuite * inSuite, void * inContex
         // Both peers have a matching session resumption record.
         // This should succeed.
         {
-            .initiatorStorage         = SessionResumptionTestStorage(CHIP_NO_ERROR, responder, &resumptionIdA, &sharedSecretA),
-            .responderStorage         = SessionResumptionTestStorage(CHIP_NO_ERROR, initiator, &resumptionIdA, &sharedSecretA),
-            .expectedSentMessageCount = 4, // we expect this number of sent messages with successful session resumption
+            .initiatorStorage = SessionResumptionTestStorage(CHIP_NO_ERROR, responder, &resumptionIdA, &sharedSecretA),
+            .responderStorage = SessionResumptionTestStorage(CHIP_NO_ERROR, initiator, &resumptionIdA, &sharedSecretA),
+            .expectedSentMessageCount =
+                sTestCaseResumptionMessageCount, // we expect this number of sent messages with successful session resumption
         },
         // Peers have mismatched session resumption records.
         // This should succeed with fall back to CASE.
         {
             .initiatorStorage         = SessionResumptionTestStorage(CHIP_NO_ERROR, responder, &resumptionIdA, &sharedSecretA),
             .responderStorage         = SessionResumptionTestStorage(CHIP_ERROR_KEY_NOT_FOUND),
-            .expectedSentMessageCount = 5, // we expect this number of sent message when we fall back to CASE
+            .expectedSentMessageCount = sTestCaseMessageCount, // we expect this number of sent message when we fall back to CASE
         },
         // Peers both have record of the same resumption ID, but a different shared secret.
         // This should succeed with fall back to CASE.
         {
             .initiatorStorage         = SessionResumptionTestStorage(CHIP_NO_ERROR, responder, &resumptionIdA, &sharedSecretA),
             .responderStorage         = SessionResumptionTestStorage(CHIP_NO_ERROR, initiator, &resumptionIdA, &sharedSecretB),
-            .expectedSentMessageCount = 5, // we expect this number of sent message when we fall back to CASE
+            .expectedSentMessageCount = sTestCaseMessageCount, // we expect this number of sent message when we fall back to CASE
         },
         // Neither peer has a session resumption record.
         // This should succeed - no attempt at session resumption will be made.
         {
-            .initiatorStorage         = SessionResumptionTestStorage(CHIP_ERROR_KEY_NOT_FOUND),
-            .responderStorage         = SessionResumptionTestStorage(CHIP_ERROR_KEY_NOT_FOUND),
-            .expectedSentMessageCount = 5, // we expect this number of sent messages if we do not attempt session resumption
+            .initiatorStorage = SessionResumptionTestStorage(CHIP_ERROR_KEY_NOT_FOUND),
+            .responderStorage = SessionResumptionTestStorage(CHIP_ERROR_KEY_NOT_FOUND),
+            .expectedSentMessageCount =
+                sTestCaseMessageCount, // we expect this number of sent messages if we do not attempt session resumption
         },
     };
 
@@ -747,19 +807,19 @@ static void CASE_SessionResumptionStorage(nlTestSuite * inSuite, void * inContex
         loopback.mSentMessageCount = 0;
         NL_TEST_ASSERT(inSuite,
                        gPairingServer.ListenForSessionEstablishment(&ctx.GetExchangeManager(), &ctx.GetSecureSessionManager(),
-                                                                    &gDeviceFabrics, &testVectors[i].responderStorage,
+                                                                    &gDeviceFabrics, &testVectors[i].responderStorage, nullptr,
                                                                     &gDeviceGroupDataProvider) == CHIP_NO_ERROR);
         ExchangeContext * contextCommissioner = ctx.NewUnauthenticatedExchangeToBob(pairingCommissioner);
-        auto establishmentReturnVal =
-            pairingCommissioner->EstablishSession(ctx.GetSecureSessionManager(), fabric, Node01_01, contextCommissioner,
-                                                  &testVectors[i].initiatorStorage, &delegateCommissioner);
+        auto establishmentReturnVal           = pairingCommissioner->EstablishSession(
+            ctx.GetSecureSessionManager(), &gCommissionerFabrics, ScopedNodeId{ Node01_01, gCommissionerFabricIndex },
+            contextCommissioner, &testVectors[i].initiatorStorage, nullptr, &delegateCommissioner);
         ctx.DrainAndServiceIO();
         NL_TEST_ASSERT(inSuite, establishmentReturnVal == CHIP_NO_ERROR);
         NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == testVectors[i].expectedSentMessageCount);
         NL_TEST_ASSERT(inSuite, delegateCommissioner.mNumPairingComplete == i + 1);
         SessionHolder & holder = delegateCommissioner.GetSessionHolder();
         NL_TEST_ASSERT(inSuite, bool(holder));
-        NL_TEST_ASSERT(inSuite, holder->GetPeer() == fabric->GetScopedNodeIdForNode(Node01_01));
+        NL_TEST_ASSERT(inSuite, holder->GetPeer() == fabricInfo->GetScopedNodeIdForNode(Node01_01));
         chip::Platform::Delete(pairingCommissioner);
     }
 }
@@ -809,7 +869,6 @@ CHIP_ERROR CASETestSecurePairingSetup(void * inContext)
     ReturnErrorOnFailure(ctx.Init());
 
     gCommissionerFabrics.Init(&gCommissionerStorageDelegate);
-    gDeviceFabrics.Init(&gDeviceStorageDelegate);
 
     return InitCredentialSets();
 }
@@ -820,6 +879,8 @@ CHIP_ERROR CASETestSecurePairingSetup(void * inContext)
  */
 int CASE_TestSecurePairing_Setup(void * inContext)
 {
+    chip::Platform::MemoryInit();
+
     CHIP_ERROR err = CASETestSecurePairingSetup(inContext);
     if (err != CHIP_NO_ERROR)
     {
@@ -834,6 +895,7 @@ int CASE_TestSecurePairing_Setup(void * inContext)
  */
 int CASE_TestSecurePairing_Teardown(void * inContext)
 {
+    gPairingServer.Shutdown();
     gCommissionerStorageDelegate.ClearStorage();
     gDeviceStorageDelegate.ClearStorage();
     gCommissionerFabrics.DeleteAllFabrics();
diff --git a/src/protocols/secure_channel/tests/TestPASESession.cpp b/src/protocols/secure_channel/tests/TestPASESession.cpp
index fe467e4a12eec2..6b60ff3bd413ab 100644
--- a/src/protocols/secure_channel/tests/TestPASESession.cpp
+++ b/src/protocols/secure_channel/tests/TestPASESession.cpp
@@ -48,6 +48,12 @@ using namespace chip::Protocols;
 
 namespace {
 
+#if CHIP_CONFIG_SLOW_CRYPTO
+constexpr uint32_t sTestPaseMessageCount = 8;
+#else  // CHIP_CONFIG_SLOW_CRYPTO
+constexpr uint32_t sTestPaseMessageCount = 5;
+#endif // CHIP_CONFIG_SLOW_CRYPTO
+
 // Test Set #01 of Spake2p Parameters (PIN Code, Iteration Count, Salt, and matching Verifier):
 constexpr uint32_t sTestSpake2p01_PinCode        = 20202021;
 constexpr uint32_t sTestSpake2p01_IterationCount = 1000;
@@ -171,12 +177,11 @@ void SecurePairingStartTest(nlTestSuite * inSuite, void * inContext)
                                 &delegate) == CHIP_NO_ERROR);
     ctx.DrainAndServiceIO();
 
-    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 1);
+    // There should have been two messages sent: PBKDFParamRequest and an ack.
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 2);
 
-    // Clear pending packet in CRMP
-    ReliableMessageMgr * rm     = ctx.GetExchangeManager().GetReliableMessageMgr();
-    ReliableMessageContext * rc = context->GetReliableMessageContext();
-    rm->ClearRetransTable(rc);
+    ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
+    NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 
     loopback.Reset();
     loopback.mSentMessageCount = 0;
@@ -250,7 +255,7 @@ void SecurePairingHandshakeTestCommon(nlTestSuite * inSuite, void * inContext, S
     // via piggybacked acks. So we cannot check for a specific value of mSentMessageCount.
     // Let's make sure atleast number is >= than the minimum messages required to complete the
     // handshake.
-    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount >= 5);
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount >= sTestPaseMessageCount);
     NL_TEST_ASSERT(inSuite, delegateAccessory.mNumPairingComplete == 1);
     NL_TEST_ASSERT(inSuite, delegateCommissioner.mNumPairingComplete == 1);
 
diff --git a/src/setup_payload/SetupPayload.cpp b/src/setup_payload/SetupPayload.cpp
index 7fc5c7e9c0a4ec..a53cdf9e4c224d 100644
--- a/src/setup_payload/SetupPayload.cpp
+++ b/src/setup_payload/SetupPayload.cpp
@@ -128,8 +128,8 @@ bool PayloadContents::CheckPayloadCommonConstraints() const
         return false;
     }
 
-    // VendorID after TestVendor4 are reserved.
-    if (vendorID > VendorId::TestVendor4)
+    // VendorID must be unspecified (0) or in valid range expected.
+    if (!IsVendorIdValidOperationally(vendorID) && (vendorID != VendorId::Unspecified))
     {
         return false;
     }
@@ -138,7 +138,7 @@ bool PayloadContents::CheckPayloadCommonConstraints() const
     //  * To announce an anonymized Product ID as part of device discovery
     //  * To indicate an OTA software update file applies to multiple Product IDs equally.
     //  * To avoid confusion when presenting the Onboarding Payload for ECM with multiple nodes
-    if (productID == 0 && vendorID != 0)
+    if (productID == 0 && vendorID != VendorId::Unspecified)
     {
         return false;
     }
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 4dc27781e2ba0c..068478691c7de7 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -145,6 +145,9 @@ source_set("system_config_header") {
       if (chip_device_platform == "qpg") {
         public_deps += [ "${qpg_sdk_build_root}:qpg_sdk" ]
       }
+      if (chip_device_platform == "k32w0") {
+        public_deps += [ "${k32w0_sdk_build_root}:k32w0_sdk" ]
+      }
 
       # Add platform here as needed.
     }
@@ -202,9 +205,6 @@ static_library("system") {
 
   if (chip_system_config_use_sockets) {
     sources += [ "SocketEvents.h" ]
-    if (chip_system_config_event_loop == "Libevent") {
-      libs = [ "event" ]
-    }
   }
 
   if (chip_with_nlfaultinjection) {
diff --git a/src/system/SystemLayer.h b/src/system/SystemLayer.h
index ee0b72ddaac005..3a91b994475371 100644
--- a/src/system/SystemLayer.h
+++ b/src/system/SystemLayer.h
@@ -119,8 +119,11 @@ class DLL_EXPORT Layer
      *
      *   @note
      *       The cancellation could fail silently in two different ways. If the timer specified by the combination of the callback
-     *       function and application state object couldn't be found, cancellation could fail. If the timer has fired, but not yet
-     *       removed from memory, cancellation could also fail.
+     *       function and application state object couldn't be found, cancellation could fail. If the timer has fired, then
+     *       an event is queued and will be processed later.
+     *
+     *   WARNING: Timer handlers MUST assume that they may be hit even after CancelTimer due to cancelling an
+     *            already fired timer that is queued in the event loop already.
      *
      *   @param[in]  aOnComplete   A pointer to the callback function used in calling @p StartTimer().
      *   @param[in]  aAppState     A pointer to the application state object used in calling @p StartTimer().
diff --git a/src/system/SystemLayerImplLibevent.cpp b/src/system/SystemLayerImplLibevent.cpp
deleted file mode 100644
index b8dcda3527ae26..00000000000000
--- a/src/system/SystemLayerImplLibevent.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      This file implements System::Layer using libevent.
- */
-
-#include <lib/support/CodeUtils.h>
-#include <platform/CHIPDeviceBuildConfig.h>
-#include <system/SystemFaultInjection.h>
-#include <system/SystemLayer.h>
-#include <system/SystemLayerImplLibevent.h>
-
-#include <algorithm>
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifndef CHIP_CONFIG_LIBEVENT_DEBUG_CHECKS
-#define CHIP_CONFIG_LIBEVENT_DEBUG_CHECKS 1
-#endif
-
-// Choose an approximation of PTHREAD_NULL if pthread.h doesn't define one.
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING && !defined(PTHREAD_NULL)
-#define PTHREAD_NULL 0
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING && !defined(PTHREAD_NULL)
-
-namespace chip {
-namespace System {
-
-namespace {
-
-System::SocketEvents SocketEventsFromLibeventFlags(short eventFlags)
-{
-    return System::SocketEvents()
-        .Set(SocketEventFlags::kRead, eventFlags & EV_READ)
-        .Set(SocketEventFlags::kWrite, eventFlags & EV_WRITE);
-}
-
-} // anonymous namespace
-
-CHIP_ERROR LayerImplLibevent::Init(System::Layer & systemLayer)
-{
-    VerifyOrReturnError(mLayerState.SetInitializing(), CHIP_ERROR_INCORRECT_STATE);
-
-    RegisterPOSIXErrorFormatter();
-
-#if CHIP_CONFIG_LIBEVENT_DEBUG_CHECKS
-    static bool enabled_event_debug_mode = false;
-    if (!enabled_event_debug_mode)
-    {
-        enabled_event_debug_mode = true;
-        event_enable_debug_mode();
-    }
-#endif // CHIP_CONFIG_LIBEVENT_DEBUG_CHECKS
-
-    mSystemLayer = &systemLayer;
-    mEventBase   = event_base_new();
-    VerifyOrReturnError(mEventBase != nullptr, CHIP_ERROR_NO_MEMORY);
-
-#if !__ZEPHYR__
-    mMdnsTimeoutEvent = evtimer_new(mEventBase, MdnsTimeoutCallbackHandler, this);
-    VerifyOrReturnError(mMdnsTimeoutEvent != nullptr, CHIP_ERROR_NO_MEMORY);
-#endif // !__ZEPHYR__
-
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    mHandleSelectThread = PTHREAD_NULL;
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-
-    Mutex::Init(mTimerListMutex);
-
-    VerifyOrReturnError(mLayerState.SetInitialized(), CHIP_ERROR_INCORRECT_STATE);
-    return CHIP_NO_ERROR;
-}
-
-#if !__ZEPHYR__
-
-// static
-void LayerImplLibevent::MdnsTimeoutCallbackHandler(evutil_socket_t fd, short eventFlags, void * data)
-{
-    reinterpret_cast<LayerImplLibevent *>(data)->MdnsTimeoutCallbackHandler();
-}
-
-void LayerImplLibevent::MdnsTimeoutCallbackHandler()
-{
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    mHandleSelectThread = pthread_self();
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-
-    chip::Dnssd::HandleMdnsTimeout();
-
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    mHandleSelectThread = PTHREAD_NULL;
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-}
-#endif // !__ZEPHYR__
-
-CHIP_ERROR LayerImplLibevent::Shutdown()
-{
-    VerifyOrReturnError(mLayerState.SetShuttingDown(), CHIP_ERROR_INCORRECT_STATE);
-
-    event_base_loopbreak(mEventBase);
-
-#if !__ZEPHYR__
-    if (mMdnsTimeoutEvent != nullptr)
-    {
-        event_free(mMdnsTimeoutEvent);
-        mMdnsTimeoutEvent = nullptr;
-    }
-#endif // !__ZEPHYR__
-
-    mTimerListMutex.Lock();
-    mTimers.clear();
-    mTimerListMutex.Unlock();
-
-    mSocketWatches.clear();
-
-    event_base_free(mEventBase);
-    mEventBase   = nullptr;
-    mSystemLayer = nullptr;
-
-    mLayerState.ResetFromShuttingDown(); // Return to uninitialized state to permit re-initialization.
-    return CHIP_NO_ERROR;
-}
-
-void LayerImplLibevent::Signal()
-{
-    /*
-     * Wake up the I/O thread by writing a single byte to the wake pipe.
-     *
-     * If this is being called from within an I/O event callback, then writing to the wake pipe can be skipped,
-     * since the I/O thread is already awake.
-     *
-     * Furthermore, we don't care if this write fails as the only reasonably likely failure is that the pipe is full, in which
-     * case the select calling thread is going to wake up anyway.
-     */
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    if (pthread_equal(mHandleSelectThread, pthread_self()))
-    {
-        return;
-    }
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-
-    // Send notification to wake up the select call.
-    CHIP_ERROR status = mWakeEvent.Notify();
-    if (status != CHIP_NO_ERROR)
-    {
-        ChipLogError(chipSystemLayer, "System wake event notify failed: %" CHIP_ERROR_FORMAT, status.Format());
-    }
-}
-
-CHIP_ERROR LayerImplLibevent::StartTimer(Clock::Timeout delay, TimerCompleteCallback onComplete, void * appState)
-{
-    VerifyOrReturnError(mLayerState.IsInitialized(), CHIP_ERROR_INCORRECT_STATE);
-
-    std::lock_guard<Mutex> lock(mTimerListMutex);
-    mTimers.push_back(std::make_unique<LibeventTimer>(this, onComplete, appState));
-    LibeventTimer * timer = mTimers.back().get();
-    if (timer == nullptr)
-    {
-        mTimers.pop_back();
-        return CHIP_ERROR_NO_MEMORY;
-    }
-
-    event * e = evtimer_new(mEventBase, TimerCallbackHandler, timer);
-    VerifyOrReturnError(e != nullptr, CHIP_ERROR_NO_MEMORY);
-    timer->mEvent = e;
-
-    timeval tv;
-    Clock::ToTimeval(delay, tv);
-    int status = evtimer_add(e, &tv);
-    VerifyOrReturnError(status == 0, CHIP_ERROR_INTERNAL);
-
-    return CHIP_NO_ERROR;
-}
-
-void LayerImplLibevent::CancelTimer(TimerCompleteCallback onComplete, void * appState)
-{
-    VerifyOrReturnError(mLayerState.IsInitialized(), CHIP_ERROR_INCORRECT_STATE);
-
-    std::lock_guard<Mutex> lock(mTimerListMutex);
-    auto it = std::find_if(mTimers.begin(), mTimers.end(), [onComplete, appState](const std::unique_ptr<LibeventTimer> & timer) {
-        return timer->mOnComplete == onComplete && timer->mCallbackData == appState;
-    });
-    if (it != mTimers.end())
-    {
-        LibeventTimer * timer = it->get();
-        mActiveTimers.remove(timer);
-        mTimers.remove_if([timer](const std::unique_ptr<LibeventTimer> & t) { return t.get() == timer; });
-    }
-}
-
-CHIP_ERROR LayerImplLibevent::ScheduleWork(TimerCompleteCallback onComplete, void * appState)
-{
-    assertChipStackLockedByCurrentThread();
-    VerifyOrReturnError(mLayerState.IsInitialized(), CHIP_ERROR_INCORRECT_STATE);
-
-    return StartTimer(Clock::kZero, onComplete, appState);
-}
-
-// static
-void LayerImplLibevent::TimerCallbackHandler(evutil_socket_t fd, short eventFlags, void * data)
-{
-    // Copy the necessary timer information and remove it from the list.
-    LibeventTimer * timer            = reinterpret_cast<LibeventTimer *>(data);
-    Layer * systemLayer              = timer->mEventManager->mSystemLayer;
-    TimerCompleteCallback onComplete = timer->mOnComplete;
-    void * callbackData              = timer->mCallbackData;
-    systemLayer->CancelTimer(onComplete, callbackData);
-    if (onComplete)
-    {
-        onComplete(systemLayer, callbackData);
-    }
-}
-
-LayerImplLibevent::LibeventTimer::~LibeventTimer()
-{
-    mEventManager = nullptr;
-    mOnComplete   = nullptr;
-    mCallbackData = nullptr;
-    if (mEvent)
-    {
-        if (evtimer_pending(mEvent, nullptr))
-        {
-            event_del(mEvent);
-        }
-        event_free(mEvent);
-        mEvent = nullptr;
-    }
-};
-
-CHIP_ERROR LayerImplLibevent::StartWatchingSocket(int fd, SocketWatchToken * tokenOut)
-{
-    mSocketWatches.push_back(std::make_unique<SocketWatch>(this, fd));
-    SocketWatch * watch = mSocketWatches.back().get();
-    if (watch == nullptr)
-    {
-        mSocketWatches.pop_back();
-        return CHIP_ERROR_NO_MEMORY;
-    }
-
-    *tokenOut = reinterpret_cast<SocketWatchToken>(watch);
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR LayerImplLibevent::SetCallback(SocketWatchToken token, SocketWatchCallback callback, intptr_t data)
-{
-    SocketWatch * watch = reinterpret_cast<SocketWatch *>(token);
-    VerifyOrReturnError(watch != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    watch->mCallback     = callback;
-    watch->mCallbackData = data;
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR LayerImplLibevent::RequestCallbackOnPendingRead(SocketWatchToken token)
-{
-    return SetWatch(token, EV_READ);
-}
-
-CHIP_ERROR LayerImplLibevent::RequestCallbackOnPendingWrite(SocketWatchToken token)
-{
-    return SetWatch(token, EV_WRITE);
-}
-
-CHIP_ERROR LayerImplLibevent::ClearCallbackOnPendingRead(SocketWatchToken token)
-{
-    return ClearWatch(token, EV_READ);
-}
-
-CHIP_ERROR LayerImplLibevent::ClearCallbackOnPendingWrite(SocketWatchToken token)
-{
-    return ClearWatch(token, EV_WRITE);
-}
-
-CHIP_ERROR LayerImplLibevent::StopWatchingSocket(SocketWatchToken * tokenInOut)
-{
-    SocketWatch * watch = reinterpret_cast<SocketWatch *>(*tokenInOut);
-    VerifyOrReturnError(watch != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-    *tokenInOut = InvalidSocketWatchToken();
-
-    mActiveSocketWatches.remove(watch);
-    mSocketWatches.remove_if([watch](const std::unique_ptr<SocketWatch> & w) { return w.get() == watch; });
-    return CHIP_NO_ERROR;
-}
-
-SocketWatchToken InvalidSocketWatchToken()
-{
-    return reinterpret_cast<SocketWatchToken>(nullptr);
-}
-
-CHIP_ERROR LayerImplLibevent::SetWatch(SocketWatchToken token, short eventFlags)
-{
-    SocketWatch * watch = reinterpret_cast<SocketWatch *>(token);
-    VerifyOrReturnError(watch != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    const short oldFlags = watch->mEvent ? event_get_events(watch->mEvent) : 0;
-    return UpdateWatch(watch, static_cast<short>(EV_PERSIST | oldFlags | eventFlags));
-}
-
-CHIP_ERROR LayerImplLibevent::ClearWatch(SocketWatchToken token, short eventFlags)
-{
-    SocketWatch * watch = reinterpret_cast<SocketWatch *>(token);
-    VerifyOrReturnError(watch != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    const short oldFlags = watch->mEvent ? event_get_events(watch->mEvent) : 0;
-    return UpdateWatch(watch, static_cast<short>(EV_PERSIST | (oldFlags & ~eventFlags)));
-}
-
-CHIP_ERROR LayerImplLibevent::UpdateWatch(SocketWatch * watch, short eventFlags)
-{
-    if (watch->mEvent != nullptr)
-    {
-        if (event_get_events(watch->mEvent) == eventFlags)
-        {
-            // No update needed.
-            return CHIP_NO_ERROR;
-        }
-        if (event_pending(watch->mEvent, EV_TIMEOUT | EV_READ | EV_WRITE | EV_SIGNAL, nullptr))
-        {
-            event_del(watch->mEvent);
-        }
-        event_free(watch->mEvent);
-        watch->mEvent = nullptr;
-    }
-
-    if (eventFlags)
-    {
-        // libevent requires the socket to already be non-blocking.
-        int flags = ::fcntl(watch->mFD, F_GETFL, 0);
-        if ((flags & O_NONBLOCK) == 0)
-        {
-            int status = ::fcntl(watch->mFD, F_SETFL, flags | O_NONBLOCK);
-            VerifyOrReturnError(status == 0, CHIP_ERROR_POSIX(errno));
-        }
-        watch->mEvent = event_new(mEventBase, watch->mFD, eventFlags, SocketCallbackHandler, watch);
-        VerifyOrReturnError(watch->mEvent != nullptr, CHIP_ERROR_NO_MEMORY);
-        int status = event_add(watch->mEvent, nullptr);
-        VerifyOrReturnError(status == 0, CHIP_ERROR_INTERNAL);
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-// static
-void LayerImplLibevent::SocketCallbackHandler(evutil_socket_t fd, short eventFlags, void * data)
-{
-    SocketWatch * const watch = reinterpret_cast<SocketWatch *>(data);
-    VerifyOrDie(watch != nullptr);
-    VerifyOrDie(watch->mFD == fd);
-
-    watch->mPendingIO = SocketEventsFromLibeventFlags(eventFlags);
-    watch->mEventManager->mActiveSocketWatches.push_back(watch);
-}
-
-LayerImplLibevent::SocketWatch::~SocketWatch()
-{
-    mEventManager = nullptr;
-    mFD           = kInvalidFd;
-    mCallback     = nullptr;
-    mCallbackData = 0;
-    if (mEvent)
-    {
-        if (event_pending(mEvent, EV_TIMEOUT | EV_READ | EV_WRITE | EV_SIGNAL, nullptr))
-        {
-            event_del(mEvent);
-        }
-        event_free(mEvent);
-        mEvent = nullptr;
-    }
-}
-
-void LayerImplLibevent::PrepareEvents()
-{
-#if !__ZEPHYR__ && !__MBED__
-    timeval mdnsTimeout = { 0, 0 };
-    chip::Dnssd::GetMdnsTimeout(mdnsTimeout);
-    if (mdnsTimeout.tv_sec || mdnsTimeout.tv_usec)
-    {
-        evtimer_add(mMdnsTimeoutEvent, &mdnsTimeout);
-    }
-#endif // !__ZEPHYR__ && !__MBED__
-}
-
-void LayerImplLibevent::WaitForEvents()
-{
-    VerifyOrDie(mEventBase != nullptr);
-    event_base_loop(mEventBase, EVLOOP_ONCE);
-}
-
-void LayerImplLibevent::HandleEvents()
-{
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    mHandleSelectThread = pthread_self();
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-
-    while (!mActiveSocketWatches.empty())
-    {
-        SocketWatch * const watch = mActiveSocketWatches.front();
-        mActiveSocketWatches.pop_front();
-        if (watch->mPendingIO.HasAny() && watch->mCallback != nullptr)
-        {
-            watch->mCallback(watch->mPendingIO, watch->mCallbackData);
-        }
-    }
-
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    mHandleSelectThread = PTHREAD_NULL;
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-}
-
-} // namespace System
-} // namespace chip
diff --git a/src/system/SystemLayerImplLibevent.h b/src/system/SystemLayerImplLibevent.h
deleted file mode 100644
index 2f5d5439123a0d..00000000000000
--- a/src/system/SystemLayerImplLibevent.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      This file declares an implementation of System::Layer using libevent.
- */
-
-#pragma once
-
-#include <lib/support/ObjectLifeCycle.h>
-#include <system/SystemLayer.h>
-#include <system/WakeEvent.h>
-
-#include <event2/event.h>
-#include <list>
-#include <memory>
-#include <vector>
-
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-#include <atomic>
-#include <pthread.h>
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-
-namespace chip {
-
-namespace System {
-
-class LayerImplLibevent : public LayerSocketsLoop
-{
-public:
-    LayerImplLibevent() : mEventBase(nullptr), mMdnsTimeoutEvent(nullptr) {}
-    ~LayerImplLibevent() = default;
-
-    // Layer overrides.
-    CHIP_ERROR Init() override;
-    CHIP_ERROR Shutdown() override;
-    bool IsInitialized() const override { return mLayerState.IsInitialized(); }
-    CHIP_ERROR StartTimer(Clock::Timeout delay, TimerCompleteCallback onComplete, void * appState) override;
-    void CancelTimer(TimerCompleteCallback onComplete, void * appState) override;
-    CHIP_ERROR ScheduleWork(TimerCompleteCallback onComplete, void * appState) override;
-
-    // LayerSocket overrides.
-    CHIP_ERROR StartWatchingSocket(int fd, SocketWatchToken * tokenOut) override;
-    CHIP_ERROR SetCallback(SocketWatchToken token, SocketWatchCallback callback, intptr_t data) override;
-    CHIP_ERROR RequestCallbackOnPendingRead(SocketWatchToken token) override;
-    CHIP_ERROR RequestCallbackOnPendingWrite(SocketWatchToken token) override;
-    CHIP_ERROR ClearCallbackOnPendingRead(SocketWatchToken token) override;
-    CHIP_ERROR ClearCallbackOnPendingWrite(SocketWatchToken token) override;
-    CHIP_ERROR StopWatchingSocket(SocketWatchToken * tokenInOut) override;
-    SocketWatchToken InvalidSocketWatchToken() override { return reinterpret_cast<SocketWatchToken>(nullptr); }
-
-    // LayerSocketLoop overrides.
-    void Signal() override;
-    void EventLoopBegins() override {}
-    void PrepareEvents() override;
-    void WaitForEvents() override;
-    void HandleEvents() override;
-    void EventLoopEnds() override {}
-
-private:
-    /*
-     * In this implementation, libevent invokes TimerCallbackHandler and SocketCallbackHandler from beneath WaitForEvents(),
-     * which means that the CHIP stack is unlocked. These handles add the LibeventTimer or SocketWatch respectively to a list,
-     * then HandleEvents() invokes the client callbacks.
-     */
-    struct LibeventTimer
-    {
-        LibeventTimer(LayerImplLibevent * layer, TimerCompleteCallback onComplete, void * data) :
-            mEventManager(layer), mOnComplete(onComplete), mCallbackData(data), mEvent(nullptr)
-        {}
-        ~LibeventTimer();
-        LayerImplLibevent * mEventManager;
-        TimerCompleteCallback mOnComplete;
-        void * mCallbackData;
-        event * mEvent;
-    };
-    static void TimerCallbackHandler(evutil_socket_t fd, short eventFlags, void * data);
-
-    struct SocketWatch
-    {
-        SocketWatch(LayerImplLibevent * layer, int fd) :
-            mEventManager(layer), mFD(fd), mCallback(nullptr), mCallbackData(0), mEvent(nullptr)
-        {}
-        ~SocketWatch();
-        LayerImplLibevent * mEventManager;
-        int mFD;
-        SocketEvents mPendingIO;
-        SocketWatchCallback mCallback;
-        intptr_t mCallbackData;
-        event * mEvent;
-    };
-    CHIP_ERROR SetWatch(SocketWatchToken token, short eventFlags);
-    CHIP_ERROR ClearWatch(SocketWatchToken token, short eventFlags);
-    CHIP_ERROR UpdateWatch(SocketWatch * watch, short eventFlags);
-    static void SocketCallbackHandler(evutil_socket_t fd, short eventFlags, void * data);
-
-    event_base * mEventBase; ///< libevent shared state.
-
-    std::list<std::unique_ptr<LibeventTimer>> mTimers;
-    std::list<LibeventTimer *> mActiveTimers;
-    Mutex mTimerListMutex;
-
-    std::list<std::unique_ptr<SocketWatch>> mSocketWatches;
-    std::list<SocketWatch *> mActiveSocketWatches;
-
-    ObjectLifeCycle mLayerState;
-    WakeEvent mWakeEvent;
-
-#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-    std::atomic<pthread_t> mHandleSelectThread;
-#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
-
-#if !__ZEPHYR__
-    static void MdnsTimeoutCallbackHandler(evutil_socket_t fd, short eventFlags, void * data);
-    void MdnsTimeoutCallbackHandler();
-#endif // !__ZEPHYR__
-    event * mMdnsTimeoutEvent;
-};
-
-using LayerImpl = LayerImplLibevent;
-
-} // namespace System
-} // namespace chip
diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni
index 45e18a61dd1d37..8addd1383ed934 100644
--- a/src/test_driver/efr32/args.gni
+++ b/src/test_driver/efr32/args.gni
@@ -31,3 +31,5 @@ chip_monolithic_tests = true
 # Problem : Linker issue if set to true
 chip_system_config_use_open_thread_inet_endpoints = false
 chip_with_lwip = true
+
+pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
diff --git a/src/test_driver/esp32/main/Kconfig.projbuild b/src/test_driver/esp32/main/Kconfig.projbuild
index 9d7ffbefd84013..6518155d91b28e 100644
--- a/src/test_driver/esp32/main/Kconfig.projbuild
+++ b/src/test_driver/esp32/main/Kconfig.projbuild
@@ -37,5 +37,5 @@ menu "Crypto Tests"
 
     config CHIP_PROJECT_CONFIG
         string "CHIP Project Configuration file"
-        default "$(PROJECT_PATH)/main/include/CHIPProjectConfig.h"
-endmenu
\ No newline at end of file
+        default "main/include/CHIPProjectConfig.h"
+endmenu
diff --git a/src/test_driver/mbed/integration_tests/common/utils.py b/src/test_driver/mbed/integration_tests/common/utils.py
index 9b6de2e36e1513..438ab89c55912b 100644
--- a/src/test_driver/mbed/integration_tests/common/utils.py
+++ b/src/test_driver/mbed/integration_tests/common/utils.py
@@ -282,13 +282,10 @@ def resolve_device(devCtrl, nodeId):
     """
     ret = None
     try:
-        err = devCtrl.ResolveNode(int(nodeId))
-        if err == 0:
-            ret = devCtrl.GetAddressAndPort(int(nodeId))
-            if ret == None:
-                log.error("Get address and port failed")
-        else:
-            log.error("Resolve node failed [{}]".format(err))
+        devCtrl.ResolveNode(int(nodeId))
+        ret = devCtrl.GetAddressAndPort(int(nodeId))
+        if ret == None:
+            log.error("Get address and port failed")
     except exceptions.ChipStackException as ex:
         log.error("Resolve node failed {}".format(str(ex)))
 
diff --git a/src/tools/chip-cert/Cmd_ValidateCert.cpp b/src/tools/chip-cert/Cmd_ValidateCert.cpp
index 269f0a1485c86c..aed84676f86dd4 100644
--- a/src/tools/chip-cert/Cmd_ValidateCert.cpp
+++ b/src/tools/chip-cert/Cmd_ValidateCert.cpp
@@ -25,6 +25,7 @@
  */
 
 #include "chip-cert.h"
+#include <credentials/CHIPCertificateSet.h>
 
 #include "vector"
 
@@ -182,7 +183,9 @@ bool Cmd_ValidateCert(int argc, char * argv[])
     certToBeValidated = certSet.GetLastCert();
 
     context.Reset();
-    res = chip::UnixEpochToChipEpochTime(static_cast<uint32_t>(time(nullptr)), context.mEffectiveTime);
+    uint32_t currentTime;
+    res = chip::UnixEpochToChipEpochTime(static_cast<uint32_t>(time(nullptr)), currentTime);
+    context.mEffectiveTime.Set<CurrentChipEpochTime>(currentTime);
     VerifyTrueOrExit(res);
 
     err = certSet.FindValidCert(certToBeValidated->mSubjectDN, certToBeValidated->mSubjectKeyId, context, &validatedCert);
diff --git a/src/tools/chip-cert/chip-cert.h b/src/tools/chip-cert/chip-cert.h
index d51d3b89291d25..21c24b15cc790b 100644
--- a/src/tools/chip-cert/chip-cert.h
+++ b/src/tools/chip-cert/chip-cert.h
@@ -51,6 +51,7 @@
 
 #include <CHIPVersion.h>
 #include <credentials/CHIPCert.h>
+#include <credentials/CHIPCertificateSet.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/asn1/ASN1.h>
 #include <lib/core/CHIPConfig.h>
@@ -188,11 +189,11 @@ class AttCertStructConfig
         }
         if (attCertType == kAttCertType_PAA)
         {
-            return 0;
+            return 1;
         }
         if (attCertType == kAttCertType_PAI)
         {
-            return 1;
+            return 0;
         }
         return 0;
     }
diff --git a/src/transport/BUILD.gn b/src/transport/BUILD.gn
index defde06d387fdc..e70679a50cb61d 100644
--- a/src/transport/BUILD.gn
+++ b/src/transport/BUILD.gn
@@ -27,7 +27,6 @@ static_library("transport") {
     "GroupPeerMessageCounter.cpp",
     "GroupPeerMessageCounter.h",
     "GroupSession.h",
-    "MessageCounter.cpp",
     "MessageCounter.h",
     "MessageCounterManagerInterface.h",
     "PeerMessageCounter.h",
diff --git a/src/transport/CryptoContext.cpp b/src/transport/CryptoContext.cpp
index 1ef1a06d2a47b9..1150f7af823894 100644
--- a/src/transport/CryptoContext.cpp
+++ b/src/transport/CryptoContext.cpp
@@ -98,9 +98,10 @@ CHIP_ERROR CryptoContext::InitFromSecret(const ByteSpan & secret, const ByteSpan
     (void) infoLen;
 
 #warning                                                                                                                           \
-    "Warning: CONFIG_SECURITY_TEST_MODE=1 bypassing key negotiation... All sessions will use known, fixed test key.  Node can only communicate with other nodes built with this flag set."
+    "Warning: CONFIG_SECURITY_TEST_MODE=1 bypassing key negotiation... All sessions will use known, fixed test key, and NodeID=0 in NONCE. Node can only communicate with other nodes built with this flag set. Requires build flag 'treat_warnings_as_errors=false'."
     ChipLogError(SecureChannel,
-                 "Warning: CONFIG_SECURITY_TEST_MODE=1 bypassing key negotiation... All sessions will use known, fixed test key.  "
+                 "Warning: CONFIG_SECURITY_TEST_MODE=1 bypassing key negotiation... All sessions will use known, fixed test key, "
+                 "and NodeID=0 in NONCE. "
                  "Node can only communicate with other nodes built with this flag set.");
 
     ReturnErrorOnFailure(mHKDF.HKDF_SHA256(kTestSharedSecret, TEST_SECRET_SIZE, testSalt.data(), testSalt.size(), SEKeysInfo,
@@ -137,7 +138,11 @@ CHIP_ERROR CryptoContext::BuildNonce(NonceView nonce, uint8_t securityFlags, uin
 
     bbuf.Put8(securityFlags);
     bbuf.Put32(messageCounter);
+#if CHIP_CONFIG_SECURITY_TEST_MODE
+    bbuf.Put64(0); // Simplifies decryption of CASE sessions when in TEST_MODE.
+#else
     bbuf.Put64(nodeId);
+#endif
 
     return bbuf.Fit() ? CHIP_NO_ERROR : CHIP_ERROR_NO_MEMORY;
 }
diff --git a/src/transport/MessageCounter.h b/src/transport/MessageCounter.h
index c0e1c366ca8d64..5ca92af9e660bc 100644
--- a/src/transport/MessageCounter.h
+++ b/src/transport/MessageCounter.h
@@ -29,18 +29,18 @@
 namespace chip {
 
 /**
- * MessageCounter represents a local message counter. There are 3 types
- * of message counter
+ * MessageCounter represents a local message counter. There are 2 types of message counter
  *
  * 1. Global unencrypted message counter
- * 2. Global encrypted message counter
- * 3. Session message counter
+ * 2. Secure session message counter
  *
  * There will be separate implementations for each type
  */
 class MessageCounter
 {
 public:
+    static constexpr uint32_t kMessageCounterRandomInitMask = 0x0FFFFFFF; ///< 28-bit mask
+
     enum Type : uint8_t
     {
         GlobalUnencrypted,
@@ -50,53 +50,62 @@ class MessageCounter
 
     virtual ~MessageCounter() = default;
 
-    virtual Type GetType() const   = 0;
-    virtual uint32_t Value() const = 0; /** Get current value */
-    virtual CHIP_ERROR Advance()   = 0; /** Advance the counter */
+    virtual Type GetType() const                           = 0;
+    virtual CHIP_ERROR AdvanceAndConsume(uint32_t & fetch) = 0; /** Advance the counter, and feed the new counter to fetch */
+
+    // Note: this function must be called after Crypto is initialized. It can not be called from global variable constructor.
+    static uint32_t GetDefaultInitialValuePredecessor() { return Crypto::GetRandU32() & kMessageCounterRandomInitMask; }
 };
 
 class GlobalUnencryptedMessageCounter : public MessageCounter
 {
 public:
-    GlobalUnencryptedMessageCounter() : mValue(0) {}
+    GlobalUnencryptedMessageCounter() : mLastUsedValue(0) {}
 
-    void Init();
+    void Init() { mLastUsedValue = GetDefaultInitialValuePredecessor(); }
 
     Type GetType() const override { return GlobalUnencrypted; }
-    uint32_t Value() const override { return mValue; }
-    CHIP_ERROR Advance() override
+    CHIP_ERROR AdvanceAndConsume(uint32_t & fetch) override
     {
-        ++mValue;
+        fetch = ++mLastUsedValue;
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint32_t mValue;
+    uint32_t mLastUsedValue;
 };
 
 class LocalSessionMessageCounter : public MessageCounter
 {
 public:
-    static constexpr uint32_t kInitialSyncValue             = 0;         ///< Used for initializing peer counter
-    static constexpr uint32_t kMessageCounterRandomInitMask = 0x0FFFFFF; ///< 28-bit mask
+    static constexpr uint32_t kMessageCounterMax = 0xFFFFFFFF;
 
     /**
      * Initialize a local message counter with random value between [1, 2^28]. This increases the difficulty of traffic analysis
      * attacks by making it harder to determine how long a particular session has been open. The initial counter is always 1 or
      * higher to guarantee first message is always greater than initial peer counter set to 0.
+     *
+     * The mLastUsedValue is the predecessor of the initial value, it will be advanced before using, so don't need to add 1 here.
      */
-    LocalSessionMessageCounter() { mValue = (Crypto::GetRandU32() & kMessageCounterRandomInitMask) + 1; }
+    LocalSessionMessageCounter() { mLastUsedValue = GetDefaultInitialValuePredecessor(); }
 
     Type GetType() const override { return Session; }
-    uint32_t Value() const override { return mValue; }
-    CHIP_ERROR Advance() override
+    CHIP_ERROR AdvanceAndConsume(uint32_t & fetch) override
     {
-        ++mValue;
+        if (mLastUsedValue == kMessageCounterMax)
+        {
+            return CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED;
+        }
+
+        fetch = ++mLastUsedValue;
         return CHIP_NO_ERROR;
     }
 
+    // Test-only function to set the counter value
+    void TestSetCounter(uint32_t value) { mLastUsedValue = value; }
+
 private:
-    uint32_t mValue;
+    uint32_t mLastUsedValue;
 };
 
 } // namespace chip
diff --git a/src/transport/PeerMessageCounter.h b/src/transport/PeerMessageCounter.h
index edfac7bf8ddb5a..e02981d98a3e9d 100644
--- a/src/transport/PeerMessageCounter.h
+++ b/src/transport/PeerMessageCounter.h
@@ -32,7 +32,8 @@ namespace Transport {
 class PeerMessageCounter
 {
 public:
-    static constexpr size_t kChallengeSize = 8;
+    static constexpr size_t kChallengeSize      = 8;
+    static constexpr uint32_t kInitialSyncValue = 0;
 
     PeerMessageCounter() : mStatus(Status::NotSynced) {}
     ~PeerMessageCounter() { Reset(); }
diff --git a/src/transport/SecureSession.cpp b/src/transport/SecureSession.cpp
index 2902a9df5a9790..f2ec416c0ba9d6 100644
--- a/src/transport/SecureSession.cpp
+++ b/src/transport/SecureSession.cpp
@@ -28,7 +28,7 @@ void SecureSessionDeleter::Release(SecureSession * entry)
 
 void SecureSession::MarkForRemoval()
 {
-    ChipLogDetail(Inet, "SecureSession MarkForRemoval %p Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
+    ChipLogDetail(Inet, "SecureSession[%p]: MarkForRemoval Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
                   mLocalSessionId);
     ReferenceCountedHandle<Transport::Session> ref(*this);
     switch (mState)
@@ -77,5 +77,23 @@ Access::SubjectDescriptor SecureSession::GetSubjectDescriptor() const
     return subjectDescriptor;
 }
 
+void SecureSession::Retain()
+{
+#if CHIP_CONFIG_SECURE_SESSION_REFCOUNT_LOGGING
+    ChipLogProgress(SecureChannel, "SecureSession[%p]: ++ %d -> %d", this, GetReferenceCount(), GetReferenceCount() + 1);
+#endif
+
+    ReferenceCounted<SecureSession, SecureSessionDeleter, 0, uint16_t>::Retain();
+}
+
+void SecureSession::Release()
+{
+#if CHIP_CONFIG_SECURE_SESSION_REFCOUNT_LOGGING
+    ChipLogProgress(SecureChannel, "SecureSession[%p]: -- %d -> %d", this, GetReferenceCount(), GetReferenceCount() - 1);
+#endif
+
+    ReferenceCounted<SecureSession, SecureSessionDeleter, 0, uint16_t>::Release();
+}
+
 } // namespace Transport
 } // namespace chip
diff --git a/src/transport/SecureSession.h b/src/transport/SecureSession.h
index 7083ed34d5078d..a505a3237f00eb 100644
--- a/src/transport/SecureSession.h
+++ b/src/transport/SecureSession.h
@@ -66,6 +66,7 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
     };
 
     // Test-only: inject a session in Active state.
+    // TODO: Tests should allocate a pending session and then call Activate(), just like non-test code does.
     SecureSession(SecureSessionTable & table, Type secureSessionType, uint16_t localSessionId, NodeId localNodeId,
                   NodeId peerNodeId, CATValues peerCATs, uint16_t peerSessionId, FabricIndex fabric,
                   const ReliableMessageProtocolConfig & config) :
@@ -73,9 +74,9 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
         mState(State::kActive), mSecureSessionType(secureSessionType), mLocalNodeId(localNodeId), mPeerNodeId(peerNodeId),
         mPeerCATs(peerCATs), mLocalSessionId(localSessionId), mPeerSessionId(peerSessionId), mMRPConfig(config)
     {
-        Retain(); // Put the test session in Active state
+        Retain(); // Put the test session in Active state. This ref is released inside MarkForRemoval
         SetFabricIndex(fabric);
-        ChipLogDetail(Inet, "SecureSession Allocated for test %p Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
+        ChipLogDetail(Inet, "SecureSession[%p]: Allocated for Test Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
                       mLocalSessionId);
     }
 
@@ -88,7 +89,8 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
     SecureSession(SecureSessionTable & table, Type secureSessionType, uint16_t localSessionId) :
         mTable(table), mState(State::kPairing), mSecureSessionType(secureSessionType), mLocalSessionId(localSessionId)
     {
-        ChipLogDetail(Inet, "SecureSession Allocated %p Type:%d LSID:%d", this, to_underlying(mSecureSessionType), mLocalSessionId);
+        ChipLogDetail(Inet, "SecureSession[%p]: Allocated Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
+                      mLocalSessionId);
     }
 
     /**
@@ -118,13 +120,15 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
         mMRPConfig     = config;
         SetFabricIndex(peerNode.GetFabricIndex());
 
-        Retain();
+        Retain(); // This ref is released inside MarkForRemoval
         mState = State::kActive;
-        ChipLogDetail(Inet, "SecureSession Active %p Type:%d LSID:%d", this, to_underlying(mSecureSessionType), mLocalSessionId);
+        ChipLogDetail(Inet, "SecureSession[%p]: Activated - Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
+                      mLocalSessionId);
     }
     ~SecureSession() override
     {
-        ChipLogDetail(Inet, "SecureSession Released %p Type:%d LSID:%d", this, to_underlying(mSecureSessionType), mLocalSessionId);
+        ChipLogDetail(Inet, "SecureSession[%p]: Released - Type:%d LSID:%d", this, to_underlying(mSecureSessionType),
+                      mLocalSessionId);
     }
 
     SecureSession(SecureSession &&)      = delete;
@@ -132,8 +136,8 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
     SecureSession & operator=(const SecureSession &) = delete;
     SecureSession & operator=(SecureSession &&) = delete;
 
-    void Retain() override { ReferenceCounted<SecureSession, SecureSessionDeleter, 0, uint16_t>::Retain(); }
-    void Release() override { ReferenceCounted<SecureSession, SecureSessionDeleter, 0, uint16_t>::Release(); }
+    void Retain() override;
+    void Release() override;
 
     bool IsActiveSession() const override { return mState == State::kActive; }
     bool IsPairing() const { return mState == State::kPairing; }
@@ -161,6 +165,10 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
             return GetMRPConfig().mIdleRetransTimeout * (CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS + 1);
         case Transport::Type::kTcp:
             return System::Clock::Seconds16(30);
+        case Transport::Type::kBle:
+            // TODO: Figure out what this should be, but zero is not the right
+            // answer.
+            return System::Clock::Seconds16(5);
         default:
             break;
         }
@@ -223,9 +231,6 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
 private:
     enum class State : uint8_t
     {
-        // kPending denotes a secure session object that is internally
-        // reserved by the stack before and during session establishment.
-        //
         // Although the stack can tolerate eviction of these (releasing one
         // out from under the holder would exhibit as CHIP_ERROR_INCORRECT_STATE
         // during CASE or PASE), intent is that we should not and would leave
@@ -240,9 +245,9 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
         kActive = 2,
 
         // The session is pending for removal, all SessionHolders are already
-        // cleared during MarkForRemoval, no future SessionHolder is able grab
-        // this session, when all SessionHandles goes out of scope, the session
-        // object will be released automatically.
+        // cleared during MarkForRemoval, no future SessionHolder is able to
+        // grab this session, when all SessionHandles go out of scope, the
+        // session object will be released automatically.
         kPendingRemoval = 3,
     };
 
diff --git a/src/transport/SecureSessionTable.h b/src/transport/SecureSessionTable.h
index cf1fb0c9b6cbf6..3fcbf86cd14abe 100644
--- a/src/transport/SecureSessionTable.h
+++ b/src/transport/SecureSessionTable.h
@@ -214,7 +214,7 @@ class SecureSessionTable
         return NullOptional;
     }
 
-    BitMapObjectPool<SecureSession, CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE> mEntries;
+    BitMapObjectPool<SecureSession, CHIP_CONFIG_SECURE_SESSION_POOL_SIZE> mEntries;
     uint16_t mNextSessionId = 0;
 };
 
diff --git a/src/transport/Session.cpp b/src/transport/Session.cpp
index 3e3434ea558d5b..50f39f85e594f3 100644
--- a/src/transport/Session.cpp
+++ b/src/transport/Session.cpp
@@ -46,5 +46,14 @@ OutgoingGroupSession * Session::AsOutgoingGroupSession()
     return static_cast<OutgoingGroupSession *>(this);
 }
 
+System::Clock::Timeout Session::ComputeRoundTripTimeout(System::Clock::Timeout upperlayerProcessingTimeout)
+{
+    if (IsGroupSession())
+    {
+        return System::Clock::kZero;
+    }
+    return GetAckTimeout() + upperlayerProcessingTimeout;
+}
+
 } // namespace Transport
 } // namespace chip
diff --git a/src/transport/Session.h b/src/transport/Session.h
index b0a3261b3807cf..01eec0c8083676 100644
--- a/src/transport/Session.h
+++ b/src/transport/Session.h
@@ -78,6 +78,12 @@ class Session
     virtual System::Clock::Timestamp GetMRPBaseTimeout()               = 0;
     virtual System::Clock::Milliseconds32 GetAckTimeout() const        = 0;
 
+    // Returns a suggested timeout value based on the round-trip time it takes for the peer at the other end of the session to
+    // receive a message, process it and send it back. This is computed based on the session type, the type of transport, sleepy
+    // characteristics of the target and a caller-provided value for the time it takes to process a message at the upper layer on
+    // the target For group sessions, this function will always return 0.
+    System::Clock::Timeout ComputeRoundTripTimeout(System::Clock::Timeout upperlayerProcessingTimeout);
+
     FabricIndex GetFabricIndex() const { return mFabricIndex; }
 
     SecureSession * AsSecureSession();
@@ -92,6 +98,14 @@ class Session
 
     bool IsSecureSession() const { return GetSessionType() == SessionType::kSecure; }
 
+    void DispatchSessionEvent(SessionDelegate::Event event)
+    {
+        for (auto & holder : mHolders)
+        {
+            holder.DispatchSessionEvent(event);
+        }
+    }
+
 protected:
     // This should be called by sub-classes at the very beginning of the destructor, before any data field is disposed, such that
     // the session is still functional during the callback.
diff --git a/src/transport/SessionDelegate.h b/src/transport/SessionDelegate.h
index 5d10fe3fbf0c94..763848dfbb85eb 100644
--- a/src/transport/SessionDelegate.h
+++ b/src/transport/SessionDelegate.h
@@ -41,27 +41,29 @@ class DLL_EXPORT SessionDelegate
      */
     virtual NewSessionHandlingPolicy GetNewSessionHandlingPolicy() { return NewSessionHandlingPolicy::kShiftToNewSession; }
 
+    using Event = void (SessionDelegate::*)();
+
     /**
      * @brief
      *   Called when a session is releasing
      */
     virtual void OnSessionReleased() = 0;
-};
 
-class DLL_EXPORT SessionRecoveryDelegate
-{
-public:
-    virtual ~SessionRecoveryDelegate() {}
+    /**
+     * @brief
+     *   Called when the first message delivery in an exchange fails, so actions aiming to recover connection can be performed.
+     *
+     *   Note: the implementation must not do anything that will destroy the session or change the SessionHolder.
+     */
+    virtual void OnFirstMessageDeliveryFailed() {}
 
     /**
      * @brief
-     *   Called when the first message delivery in a session failed,
-     *   so actions aiming to recover connection can be performed.
+     *   Called when a session is unresponsive for a while (detected by MRP)
      *
-     * @param session   The handle to the session.  This may be any session type
-     *                  that supports MRP.
+     *   Note: the implementation must not do anything that will destroy the session or change the SessionHolder.
      */
-    virtual void OnFirstMessageDeliveryFailed(const SessionHandle & session) = 0;
+    virtual void OnSessionHang() {}
 };
 
 } // namespace chip
diff --git a/src/transport/SessionHandle.h b/src/transport/SessionHandle.h
index e5087133083968..528d9b973f1212 100644
--- a/src/transport/SessionHandle.h
+++ b/src/transport/SessionHandle.h
@@ -28,11 +28,12 @@ class Session;
 
 /** @brief
  *    Non-copyable session reference. All SessionHandles are created within SessionManager. It is not allowed to store SessionHandle
- * anywhere except for function arguments and return values.
+ *    anywhere except for function arguments and return values.
  *
- *    SessionHandle is reference counted such that it never dangling, but there can be a gray period when the session is mark as
- * pending removal but not actually removed yet. During this period, the handle is functional, but the underlying session won't be
- * able to grabbed by any SessionHolder. SessionHandle->IsActiveSession can be used to check if the session is active.
+ *    SessionHandle is reference counted such that it is never dangling, but there can be a gray period when the session is marked
+ *    as pending removal but not actually removed yet. During this period, the handle is functional, but the underlying session
+ *    won't be able to be grabbed by any SessionHolder. SessionHandle->IsActiveSession can be used to check if the session is
+ *    active.
  */
 class SessionHandle
 {
diff --git a/src/transport/SessionHolder.cpp b/src/transport/SessionHolder.cpp
index f9420a88e7a306..97498cf9dc41fb 100644
--- a/src/transport/SessionHolder.cpp
+++ b/src/transport/SessionHolder.cpp
@@ -74,7 +74,7 @@ SessionHolder & SessionHolder::operator=(SessionHolder && that)
     return *this;
 }
 
-bool SessionHolder::GrabPairing(const SessionHandle & session)
+bool SessionHolder::GrabPairingSession(const SessionHandle & session)
 {
     Release();
 
diff --git a/src/transport/SessionHolder.h b/src/transport/SessionHolder.h
index 0d9477b142be52..a9510a4a84fcb9 100644
--- a/src/transport/SessionHolder.h
+++ b/src/transport/SessionHolder.h
@@ -28,7 +28,7 @@ namespace chip {
  *    released when the underlying session is released. One must verify it is available before use. The object can be
  *    created using SessionHandle.Grab()
  */
-class SessionHolder : public SessionDelegate, public IntrusiveListNodeBase
+class SessionHolder : public SessionDelegate, public IntrusiveListNodeBase<>
 {
 public:
     SessionHolder() {}
@@ -47,7 +47,7 @@ class SessionHolder : public SessionDelegate, public IntrusiveListNodeBase
         return mSession.HasValue() && &mSession.Value().Get() == &session.mSession.Get();
     }
 
-    bool GrabPairing(const SessionHandle & session); // Should be only used inside CASE/PASE pairing.
+    bool GrabPairingSession(const SessionHandle & session); // Should be only used inside CASE/PASE pairing.
     bool Grab(const SessionHandle & session);
     void Release();
 
@@ -66,11 +66,14 @@ class SessionHolder : public SessionDelegate, public IntrusiveListNodeBase
 
     Transport::Session * operator->() const { return &mSession.Value().Get(); }
 
+    // There is not delegate, nothing to do here
+    virtual void DispatchSessionEvent(SessionDelegate::Event event) {}
+
 private:
     Optional<ReferenceCountedHandle<Transport::Session>> mSession;
 };
 
-// @brief Extends SessionHolder to allow propagate OnSessionReleased event to an extra given destination
+/// @brief Extends SessionHolder to allow propagate SessionDelegate::* events to a given destination
 class SessionHolderWithDelegate : public SessionHolder
 {
 public:
@@ -86,6 +89,8 @@ class SessionHolderWithDelegate : public SessionHolder
         mDelegate.OnSessionReleased();
     }
 
+    void DispatchSessionEvent(SessionDelegate::Event event) override { (mDelegate.*event)(); }
+
 private:
     SessionDelegate & mDelegate;
 };
diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
index 43228d44b41a71..a9e95411e778aa 100644
--- a/src/transport/SessionManager.cpp
+++ b/src/transport/SessionManager.cpp
@@ -95,8 +95,6 @@ CHIP_ERROR SessionManager::Init(System::Layer * systemLayer, TransportMgrBase *
 
     ReturnErrorOnFailure(mGroupClientCounter.Init(storageDelegate));
 
-    ScheduleExpiryTimer();
-
     mTransportMgr->SetSessionManager(this);
 
     return CHIP_NO_ERROR;
@@ -104,10 +102,6 @@ CHIP_ERROR SessionManager::Init(System::Layer * systemLayer, TransportMgrBase *
 
 void SessionManager::Shutdown()
 {
-    CancelExpiryTimer();
-
-    mSessionRecoveryDelegates.ReleaseAll();
-
     mMessageCounterManager = nullptr;
 
     mState        = State::kNotReady;
@@ -193,7 +187,8 @@ CHIP_ERROR SessionManager::PrepareMessage(const SessionHandle & sessionHandle, P
         }
 
         MessageCounter & counter = session->GetSessionMessageCounter().GetLocalMessageCounter();
-        uint32_t messageCounter  = counter.Value();
+        uint32_t messageCounter;
+        ReturnErrorOnFailure(counter.AdvanceAndConsume(messageCounter));
         packetHeader
             .SetMessageCounter(messageCounter)         //
             .SetSessionId(session->GetPeerSessionId()) //
@@ -207,7 +202,6 @@ CHIP_ERROR SessionManager::PrepareMessage(const SessionHandle & sessionHandle, P
         CryptoContext::BuildNonce(nonce, packetHeader.GetSecurityFlags(), messageCounter, sourceNodeId);
 
         ReturnErrorOnFailure(SecureMessageCodec::Encrypt(session->GetCryptoContext(), nonce, payloadHeader, packetHeader, message));
-        ReturnErrorOnFailure(counter.Advance());
 
 #if CHIP_PROGRESS_LOGGING
         destination = session->GetPeerNodeId();
@@ -217,8 +211,8 @@ CHIP_ERROR SessionManager::PrepareMessage(const SessionHandle & sessionHandle, P
     break;
     case Transport::Session::SessionType::kUnauthenticated: {
         MessageCounter & counter = mGlobalUnencryptedMessageCounter;
-        uint32_t messageCounter  = counter.Value();
-        ReturnErrorOnFailure(counter.Advance());
+        uint32_t messageCounter;
+        ReturnErrorOnFailure(counter.AdvanceAndConsume(messageCounter));
         packetHeader.SetMessageCounter(messageCounter);
         Transport::UnauthenticatedSession * session = sessionHandle->AsUnauthenticatedSession();
         switch (session->GetSessionRole())
@@ -273,15 +267,19 @@ CHIP_ERROR SessionManager::SendPreparedMessage(const SessionHandle & sessionHand
     {
     case Transport::Session::SessionType::kGroupOutgoing: {
         auto groupSession = sessionHandle->AsOutgoingGroupSession();
-        multicastAddress  = Transport::PeerAddress::Multicast(groupSession->GetFabricIndex(), groupSession->GetGroupId());
-        destination       = &multicastAddress;
+
+        FabricInfo * fabric = mFabricTable->FindFabricWithIndex(groupSession->GetFabricIndex());
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+        multicastAddress = Transport::PeerAddress::Multicast(fabric->GetFabricId(), groupSession->GetGroupId());
+        destination      = &multicastAddress;
         char addressStr[Transport::PeerAddress::kMaxToStringSize];
         multicastAddress.ToString(addressStr, Transport::PeerAddress::kMaxToStringSize);
 
         ChipLogProgress(Inet,
                         "Sending %s msg %p with MessageCounter:" ChipLogFormatMessageCounter " to %d"
                         " at monotonic time: " ChipLogFormatX64
-                        " msec to Multicast IPV6 address : %s with GroupID of %d and fabric Id of %d",
+                        " msec to Multicast IPV6 address : %s with GroupID of %d and fabric index of %x",
                         "encrypted group", &preparedMessage, preparedMessage.GetMessageCounter(), groupSession->GetGroupId(),
                         ChipLogValueX64(System::SystemClock().GetMonotonicMilliseconds64().count()), addressStr,
                         groupSession->GetGroupId(), groupSession->GetFabricIndex());
@@ -389,8 +387,14 @@ void SessionManager::ExpireAllPASEPairings()
     });
 }
 
-Optional<SessionHandle> SessionManager::AllocateSession(SecureSession::Type secureSessionType)
+Optional<SessionHandle> SessionManager::AllocateSession(SecureSession::Type secureSessionType,
+                                                        const ScopedNodeId & sessionEvictionHint)
 {
+    //
+    // This is currently not being utilized yet but will be once session eviction logic is added.
+    //
+    (void) sessionEvictionHint;
+
     return mSecureSessions.CreateNewSecureSession(secureSessionType);
 }
 
@@ -410,27 +414,11 @@ CHIP_ERROR SessionManager::InjectPaseSessionWithTestKey(SessionHolder & sessionH
     ByteSpan secret(reinterpret_cast<const uint8_t *>(CHIP_CONFIG_TEST_SHARED_SECRET_VALUE), secretLen);
     ReturnErrorOnFailure(secureSession->GetCryptoContext().InitFromSecret(
         secret, ByteSpan(nullptr, 0), CryptoContext::SessionInfoType::kSessionEstablishment, role));
-    secureSession->GetSessionMessageCounter().GetPeerMessageCounter().SetCounter(LocalSessionMessageCounter::kInitialSyncValue);
+    secureSession->GetSessionMessageCounter().GetPeerMessageCounter().SetCounter(Transport::PeerMessageCounter::kInitialSyncValue);
     sessionHolder.Grab(session.Value());
     return CHIP_NO_ERROR;
 }
 
-void SessionManager::ScheduleExpiryTimer()
-{
-    CHIP_ERROR err = mSystemLayer->StartTimer(System::Clock::Milliseconds32(CHIP_PEER_CONNECTION_TIMEOUT_CHECK_FREQUENCY_MS),
-                                              SessionManager::ExpiryTimerCallback, this);
-
-    VerifyOrDie(err == CHIP_NO_ERROR);
-}
-
-void SessionManager::CancelExpiryTimer()
-{
-    if (mSystemLayer != nullptr)
-    {
-        mSystemLayer->CancelTimer(SessionManager::ExpiryTimerCallback, this);
-    }
-}
-
 void SessionManager::OnMessageReceived(const PeerAddress & peerAddress, System::PacketBufferHandle && msg)
 {
     CHIP_TRACE_PREPARED_MESSAGE_RECEIVED(&peerAddress, &msg);
@@ -455,38 +443,6 @@ void SessionManager::OnMessageReceived(const PeerAddress & peerAddress, System::
     }
 }
 
-void SessionManager::RegisterRecoveryDelegate(SessionRecoveryDelegate & cb)
-{
-#ifndef NDEBUG
-    mSessionRecoveryDelegates.ForEachActiveObject([&](std::reference_wrapper<SessionRecoveryDelegate> * i) {
-        VerifyOrDie(std::addressof(cb) != std::addressof(i->get()));
-        return Loop::Continue;
-    });
-#endif
-    std::reference_wrapper<SessionRecoveryDelegate> * slot = mSessionRecoveryDelegates.CreateObject(cb);
-    VerifyOrDie(slot != nullptr);
-}
-
-void SessionManager::UnregisterRecoveryDelegate(SessionRecoveryDelegate & cb)
-{
-    mSessionRecoveryDelegates.ForEachActiveObject([&](std::reference_wrapper<SessionRecoveryDelegate> * i) {
-        if (std::addressof(cb) == std::addressof(i->get()))
-        {
-            mSessionRecoveryDelegates.ReleaseObject(i);
-            return Loop::Break;
-        }
-        return Loop::Continue;
-    });
-}
-
-void SessionManager::RefreshSessionOperationalData(const SessionHandle & sessionHandle)
-{
-    mSessionRecoveryDelegates.ForEachActiveObject([&](std::reference_wrapper<SessionRecoveryDelegate> * cb) {
-        cb->get().OnFirstMessageDeliveryFailed(sessionHandle);
-        return Loop::Continue;
-    });
-}
-
 void SessionManager::UnauthenticatedMessageDispatch(const PacketHeader & packetHeader, const Transport::PeerAddress & peerAddress,
                                                     System::PacketBufferHandle && msg)
 {
@@ -725,7 +681,7 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & packetHeade
 
     // Handle Group message counter here spec 4.7.3
     // spec 4.5.1.2 for msg counter
-    chip::Transport::PeerMessageCounter * counter = nullptr;
+    Transport::PeerMessageCounter * counter = nullptr;
 
     if (CHIP_NO_ERROR ==
         mGroupPeerMsgCounter.FindOrAddPeer(groupContext.fabric_index, packetHeader.GetSourceNodeId().Value(),
@@ -774,12 +730,6 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & packetHeade
     }
 }
 
-void SessionManager::ExpiryTimerCallback(System::Layer * layer, void * param)
-{
-    SessionManager * mgr = reinterpret_cast<SessionManager *>(param);
-    mgr->ScheduleExpiryTimer(); // re-schedule the oneshot timer
-}
-
 Optional<SessionHandle> SessionManager::FindSecureSessionForNode(ScopedNodeId peerNodeId,
                                                                  const Optional<Transport::SecureSession::Type> & type)
 {
diff --git a/src/transport/SessionManager.h b/src/transport/SessionManager.h
index a657fd8dadf3f9..1b01f1d5bcb5e7 100644
--- a/src/transport/SessionManager.h
+++ b/src/transport/SessionManager.h
@@ -150,10 +150,6 @@ class DLL_EXPORT SessionManager : public TransportMgrDelegate
     /// ExchangeManager)
     void SetMessageDelegate(SessionMessageDelegate * cb) { mCB = cb; }
 
-    void RegisterRecoveryDelegate(SessionRecoveryDelegate & cb);
-    void UnregisterRecoveryDelegate(SessionRecoveryDelegate & cb);
-    void RefreshSessionOperationalData(const SessionHandle & sessionHandle);
-
     // Test-only: create a session on the fly.
     CHIP_ERROR InjectPaseSessionWithTestKey(SessionHolder & sessionHolder, uint16_t localSessionId, NodeId peerNodeId,
                                             uint16_t peerSessionId, FabricIndex fabricIndex,
@@ -164,10 +160,15 @@ class DLL_EXPORT SessionManager : public TransportMgrDelegate
      *   Allocate a secure session and non-colliding session ID in the secure
      *   session table.
      *
+     *   If we're either establishing or just finished establishing a session to a peer in either initiator or responder
+     *   roles, the node id of that peer should be provided in sessionEvictionHint. Else, it should be initialized
+     *   to a default-constructed ScopedNodeId().
+     *
      * @return SessionHandle with a reference to a SecureSession, else NullOptional on failure
      */
     CHECK_RETURN_VALUE
-    Optional<SessionHandle> AllocateSession(Transport::SecureSession::Type secureSessionType);
+    Optional<SessionHandle> AllocateSession(Transport::SecureSession::Type secureSessionType,
+                                            const ScopedNodeId & sessionEvictionHint);
 
     void ExpirePairing(const SessionHandle & session);
     void ExpireAllPairings(const ScopedNodeId & node);
@@ -267,25 +268,11 @@ class DLL_EXPORT SessionManager : public TransportMgrDelegate
 
     SessionMessageDelegate * mCB = nullptr;
 
-    ObjectPool<std::reference_wrapper<SessionRecoveryDelegate>, CHIP_CONFIG_MAX_SESSION_RECOVERY_DELEGATES>
-        mSessionRecoveryDelegates;
-
     TransportMgrBase * mTransportMgr                                   = nullptr;
     Transport::MessageCounterManagerInterface * mMessageCounterManager = nullptr;
 
     GlobalUnencryptedMessageCounter mGlobalUnencryptedMessageCounter;
 
-    /** Schedules a new oneshot timer for checking connection expiry. */
-    void ScheduleExpiryTimer();
-
-    /** Cancels any active timers for connection expiry checks. */
-    void CancelExpiryTimer();
-
-    /**
-     * Callback for timer expiry check
-     */
-    static void ExpiryTimerCallback(System::Layer * layer, void * param);
-
     void SecureUnicastMessageDispatch(const PacketHeader & packetHeader, const Transport::PeerAddress & peerAddress,
                                       System::PacketBufferHandle && msg);
 
diff --git a/src/transport/TransportMgrBase.cpp b/src/transport/TransportMgrBase.cpp
index 4b8c8752bdb355..bde54a96c195b6 100644
--- a/src/transport/TransportMgrBase.cpp
+++ b/src/transport/TransportMgrBase.cpp
@@ -17,6 +17,7 @@
 #include <transport/TransportMgrBase.h>
 
 #include <lib/support/CodeUtils.h>
+#include <platform/LockTracker.h>
 #include <transport/TransportMgr.h>
 #include <transport/raw/Base.h>
 
@@ -57,6 +58,10 @@ CHIP_ERROR TransportMgrBase::MulticastGroupJoinLeave(const Transport::PeerAddres
 
 void TransportMgrBase::HandleMessageReceived(const Transport::PeerAddress & peerAddress, System::PacketBufferHandle && msg)
 {
+    // This is the first point all incoming messages funnel through.  Ensure
+    // that our message receipts are all synchronized correctly.
+    assertChipStackLockedByCurrentThread();
+
     if (msg->HasChainedBuffer())
     {
         // Something in the lower levels messed up.
diff --git a/src/transport/tests/TestPeerConnections.cpp b/src/transport/tests/TestPeerConnections.cpp
index b7a156fa307909..b7227c52f287c5 100644
--- a/src/transport/tests/TestPeerConnections.cpp
+++ b/src/transport/tests/TestPeerConnections.cpp
@@ -67,7 +67,7 @@ void TestBasicFunctionality(nlTestSuite * inSuite, void * inContext)
     System::Clock::Internal::SetSystemClockForTesting(&clock);
     clock.SetMonotonic(100_ms64);
     CATValues peerCATs;
-    Optional<SessionHandle> sessions[CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE];
+    Optional<SessionHandle> sessions[CHIP_CONFIG_SECURE_SESSION_POOL_SIZE];
 
     // First node, peer session id 1, local session id 2
     auto optionalSession = connections.CreateNewSecureSessionForTest(SecureSession::Type::kCASE, 2, kLocalNodeId, kCasePeer1NodeId,
@@ -97,11 +97,11 @@ void TestBasicFunctionality(nlTestSuite * inSuite, void * inContext)
     // This define guard will be needed when migrating SecureSessionTable to ObjectPool
     //#if !CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
     // If not using a heap, we can fill the SecureSessionTable
-    for (uint16_t i = 2; i < CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE; ++i)
+    for (int i = 2; i < CHIP_CONFIG_SECURE_SESSION_POOL_SIZE; ++i)
     {
-        sessions[i] =
-            connections.CreateNewSecureSessionForTest(SecureSession::Type::kCASE, static_cast<uint16_t>(i + 6u), kLocalNodeId,
-                                                      kCasePeer2NodeId, kPeer2CATs, 3, kFabricIndex, GetLocalMRPConfig());
+        sessions[i] = connections.CreateNewSecureSessionForTest(SecureSession::Type::kCASE,
+                                                                static_cast<uint16_t>(static_cast<uint16_t>(i) + 6u), kLocalNodeId,
+                                                                kCasePeer2NodeId, kPeer2CATs, 3, kFabricIndex, GetLocalMRPConfig());
         NL_TEST_ASSERT(inSuite, sessions[i].HasValue());
     }
 
diff --git a/src/transport/tests/TestPeerMessageCounter.cpp b/src/transport/tests/TestPeerMessageCounter.cpp
index 63a4e5a89f6de5..2c10ce4c8e6a0a 100644
--- a/src/transport/tests/TestPeerMessageCounter.cpp
+++ b/src/transport/tests/TestPeerMessageCounter.cpp
@@ -187,7 +187,7 @@ void UnicastSmallStepTest(nlTestSuite * inSuite, void * inContext)
         for (uint32_t k = 1; k <= 2 * CHIP_CONFIG_MESSAGE_COUNTER_WINDOW_SIZE; k++)
         {
             chip::Transport::PeerMessageCounter counter;
-            counter.SetCounter(LocalSessionMessageCounter::kInitialSyncValue);
+            counter.SetCounter(chip::Transport::PeerMessageCounter::kInitialSyncValue);
             if (counter.VerifyEncryptedUnicast(n) == CHIP_NO_ERROR)
             {
                 // Act like we got this counter value on the wire.
@@ -259,7 +259,7 @@ void UnicastLargeStepTest(nlTestSuite * inSuite, void * inContext)
         for (uint32_t k = (static_cast<uint32_t>(1 << 31) - 5); k <= (static_cast<uint32_t>(1 << 31) - 1); k++)
         {
             chip::Transport::PeerMessageCounter counter;
-            counter.SetCounter(LocalSessionMessageCounter::kInitialSyncValue);
+            counter.SetCounter(chip::Transport::PeerMessageCounter::kInitialSyncValue);
             if (counter.VerifyEncryptedUnicast(n) == CHIP_NO_ERROR)
             {
                 // Act like we got this counter value on the wire.
diff --git a/src/transport/tests/TestSessionManager.cpp b/src/transport/tests/TestSessionManager.cpp
index cc9179a92b2330..a665391af4a25a 100644
--- a/src/transport/tests/TestSessionManager.cpp
+++ b/src/transport/tests/TestSessionManager.cpp
@@ -656,7 +656,9 @@ static void RandomSessionIdAllocatorOffset(nlTestSuite * inSuite, SessionManager
     const int bound = rand() % max;
     for (int i = 0; i < bound; ++i)
     {
-        auto handle = sessionManager.AllocateSession(Transport::SecureSession::Type::kPASE);
+        auto handle = sessionManager.AllocateSession(
+            Transport::SecureSession::Type::kPASE,
+            ScopedNodeId(NodeIdFromPAKEKeyId(kDefaultCommissioningPasscodeId), kUndefinedFabricIndex));
         NL_TEST_ASSERT(inSuite, handle.HasValue());
         sessionManager.ExpirePairing(handle.Value());
     }
@@ -669,10 +671,12 @@ void SessionAllocationTest(nlTestSuite * inSuite, void * inContext)
     // Allocate a session.
     uint16_t sessionId1;
     {
-        auto handle = sessionManager.AllocateSession(Transport::SecureSession::Type::kPASE);
+        auto handle = sessionManager.AllocateSession(
+            Transport::SecureSession::Type::kPASE,
+            ScopedNodeId(NodeIdFromPAKEKeyId(kDefaultCommissioningPasscodeId), kUndefinedFabricIndex));
         NL_TEST_ASSERT(inSuite, handle.HasValue());
         SessionHolder session;
-        session.GrabPairing(handle.Value());
+        session.GrabPairingSession(handle.Value());
         sessionId1 = session->AsSecureSession()->GetLocalSessionId();
     }
 
@@ -681,7 +685,9 @@ void SessionAllocationTest(nlTestSuite * inSuite, void * inContext)
     auto prevSessionId = sessionId1;
     for (uint32_t i = 0; i < 10; ++i)
     {
-        auto handle = sessionManager.AllocateSession(Transport::SecureSession::Type::kPASE);
+        auto handle = sessionManager.AllocateSession(
+            Transport::SecureSession::Type::kPASE,
+            ScopedNodeId(NodeIdFromPAKEKeyId(kDefaultCommissioningPasscodeId), kUndefinedFabricIndex));
         if (!handle.HasValue())
         {
             break;
@@ -702,7 +708,9 @@ void SessionAllocationTest(nlTestSuite * inSuite, void * inContext)
     // sessions are immediately freed.
     for (uint32_t i = 0; i < UINT16_MAX + 10; ++i)
     {
-        auto handle = sessionManager.AllocateSession(Transport::SecureSession::Type::kPASE);
+        auto handle = sessionManager.AllocateSession(
+            Transport::SecureSession::Type::kPASE,
+            ScopedNodeId(NodeIdFromPAKEKeyId(kDefaultCommissioningPasscodeId), kUndefinedFabricIndex));
         NL_TEST_ASSERT(inSuite, handle.HasValue());
         auto sessionId = handle.Value()->AsSecureSession()->GetLocalSessionId();
         NL_TEST_ASSERT(inSuite, sessionId - prevSessionId == 1 || (sessionId == 1 && prevSessionId == 65535));
@@ -717,13 +725,15 @@ void SessionAllocationTest(nlTestSuite * inSuite, void * inContext)
     {
         // Allocate some session handles at pseudo-random offsets in the session
         // ID space.
-        constexpr size_t numHandles = CHIP_CONFIG_PEER_CONNECTION_POOL_SIZE - 1;
+        constexpr size_t numHandles = CHIP_CONFIG_SECURE_SESSION_POOL_SIZE - 1;
         Optional<SessionHandle> handles[numHandles];
         uint16_t sessionIds[numHandles];
         for (size_t h = 0; h < numHandles; ++h)
         {
             constexpr int maxOffset = 5000;
-            handles[h]              = sessionManager.AllocateSession(Transport::SecureSession::Type::kPASE);
+            handles[h]              = sessionManager.AllocateSession(
+                Transport::SecureSession::Type::kPASE,
+                ScopedNodeId(NodeIdFromPAKEKeyId(kDefaultCommissioningPasscodeId), kUndefinedFabricIndex));
             NL_TEST_ASSERT(inSuite, handles[h].HasValue());
             sessionIds[h] = handles[h].Value()->AsSecureSession()->GetLocalSessionId();
             RandomSessionIdAllocatorOffset(inSuite, sessionManager, maxOffset);
@@ -739,7 +749,9 @@ void SessionAllocationTest(nlTestSuite * inSuite, void * inContext)
         // these collide either.
         for (int j = 0; j < UINT16_MAX; ++j)
         {
-            auto handle = sessionManager.AllocateSession(Transport::SecureSession::Type::kPASE);
+            auto handle = sessionManager.AllocateSession(
+                Transport::SecureSession::Type::kPASE,
+                ScopedNodeId(NodeIdFromPAKEKeyId(kDefaultCommissioningPasscodeId), kUndefinedFabricIndex));
             NL_TEST_ASSERT(inSuite, handle.HasValue());
             auto potentialCollision = handle.Value()->AsSecureSession()->GetLocalSessionId();
             for (size_t h = 0; h < numHandles; ++h)
@@ -759,6 +771,83 @@ void SessionAllocationTest(nlTestSuite * inSuite, void * inContext)
     sessionManager.Shutdown();
 }
 
+void SessionCounterExhaustedTest(nlTestSuite * inSuite, void * inContext)
+{
+    TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
+
+    IPAddress addr;
+    IPAddress::FromString("::1", addr);
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    FabricTable fabricTable;
+    SessionManager sessionManager;
+    secure_channel::MessageCounterManager gMessageCounterManager;
+    chip::TestPersistentStorageDelegate deviceStorage;
+
+    NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == fabricTable.Init(&deviceStorage));
+    NL_TEST_ASSERT(inSuite,
+                   CHIP_NO_ERROR ==
+                       sessionManager.Init(&ctx.GetSystemLayer(), &ctx.GetTransportMgr(), &gMessageCounterManager, &deviceStorage,
+                                           &fabricTable));
+
+    Transport::PeerAddress peer(Transport::PeerAddress::UDP(addr, CHIP_PORT));
+
+    FabricIndex aliceFabricIndex;
+    FabricInfo aliceFabric;
+    aliceFabric.TestOnlyBuildFabric(GetRootACertAsset().mCert, GetIAA1CertAsset().mCert, GetNodeA1CertAsset().mCert,
+                                    GetNodeA1CertAsset().mKey);
+    NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == fabricTable.AddNewFabricForTest(aliceFabric, &aliceFabricIndex));
+
+    FabricIndex bobFabricIndex;
+    FabricInfo bobFabric;
+    bobFabric.TestOnlyBuildFabric(GetRootACertAsset().mCert, GetIAA1CertAsset().mCert, GetNodeA2CertAsset().mCert,
+                                  GetNodeA2CertAsset().mKey);
+    NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == fabricTable.AddNewFabricForTest(bobFabric, &bobFabricIndex));
+
+    SessionHolder aliceToBobSession;
+    err = sessionManager.InjectPaseSessionWithTestKey(aliceToBobSession, 2,
+                                                      fabricTable.FindFabricWithIndex(bobFabricIndex)->GetNodeId(), 1,
+                                                      aliceFabricIndex, peer, CryptoContext::SessionRole::kInitiator);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    SessionHolder bobToAliceSession;
+    err = sessionManager.InjectPaseSessionWithTestKey(bobToAliceSession, 1,
+                                                      fabricTable.FindFabricWithIndex(aliceFabricIndex)->GetNodeId(), 2,
+                                                      bobFabricIndex, peer, CryptoContext::SessionRole::kResponder);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // ==== Set counter value to max ====
+    LocalSessionMessageCounter & counter = static_cast<LocalSessionMessageCounter &>(
+        aliceToBobSession.Get().Value()->AsSecureSession()->GetSessionMessageCounter().GetLocalMessageCounter());
+    counter.TestSetCounter(LocalSessionMessageCounter::kMessageCounterMax - 1);
+
+    // ==== Build a valid message with max counter value ====
+    chip::System::PacketBufferHandle buffer = chip::MessagePacketBuffer::NewWithData(PAYLOAD, sizeof(PAYLOAD));
+    NL_TEST_ASSERT(inSuite, !buffer.IsNull());
+
+    PayloadHeader payloadHeader;
+
+    // Set the exchange ID for this header.
+    payloadHeader.SetExchangeID(0);
+
+    // Set the protocol ID and message type for this header.
+    payloadHeader.SetMessageType(chip::Protocols::Echo::MsgType::EchoRequest);
+
+    EncryptedPacketBufferHandle preparedMessage;
+    err = sessionManager.PrepareMessage(aliceToBobSession.Get().Value(), payloadHeader, std::move(buffer), preparedMessage);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // ==== Build another message which will fail becuase message counter is exhausted ====
+    chip::System::PacketBufferHandle buffer2 = chip::MessagePacketBuffer::NewWithData(PAYLOAD, sizeof(PAYLOAD));
+    NL_TEST_ASSERT(inSuite, !buffer2.IsNull());
+
+    EncryptedPacketBufferHandle preparedMessage2;
+    err = sessionManager.PrepareMessage(aliceToBobSession.Get().Value(), payloadHeader, std::move(buffer2), preparedMessage2);
+    NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED);
+
+    sessionManager.Shutdown();
+}
+
 // Test Suite
 
 /**
@@ -774,6 +863,7 @@ const nlTest sTests[] =
     NL_TEST_DEF("Old counter Test",               SendPacketWithOldCounterTest),
     NL_TEST_DEF("Too-old counter Test",           SendPacketWithTooOldCounterTest),
     NL_TEST_DEF("Session Allocation Test",        SessionAllocationTest),
+    NL_TEST_DEF("Session Counter Exhausted Test", SessionCounterExhaustedTest),
 
     NL_TEST_SENTINEL()
 };
diff --git a/third_party/bouffalolab/bl602_sdk/bl602_sdk.gni b/third_party/bouffalolab/bl602_sdk/bl602_sdk.gni
index 231373931e9ad1..8145dc55fe4442 100644
--- a/third_party/bouffalolab/bl602_sdk/bl602_sdk.gni
+++ b/third_party/bouffalolab/bl602_sdk/bl602_sdk.gni
@@ -117,6 +117,7 @@ template("bl602_sdk") {
       "${bl602_sdk_root}/components/network/ble/blestack/src/common/tinycrypt/include/tinycrypt",
 
       "${bl602_sdk_root}/components/network/wifi_manager/bl60x_wifi_driver/include",
+      "${bl602_sdk_root}/components/network/wifi_manager/bl60x_wifi_driver",
       "${bl602_sdk_root}/components/network/dns_server/include",
 
       "${bl602_sdk_root}/components/platform/soc/bl602/bl602_std/bl602_std/StdDriver/Inc",
@@ -213,7 +214,7 @@ template("bl602_sdk") {
       #dump backtrace
       "CONF_ENABLE_FRAME_PTR=1",
       "CONF_ENABLE_FUNC_BACKTRACE_ELF=connectedhomeip/examples/lock-app/bl602/out/debug/chip-bl602-lock-example.out",
-      "CHIP_SYSTEM_HEADER_RESERVE_SIZE=134",
+      "CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE=128",
     ]
 
     if (bl602_board == "BL-HWC-G1") {
@@ -265,6 +266,7 @@ template("bl602_sdk") {
     ]
 
     cflags_cc = [ "-fpermissive" ]
+    cflags_cc += [ "-std=c++17" ]
 
     foreach(include_dir, _include_dirs) {
       cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
diff --git a/third_party/bouffalolab/bl602_sdk/repo b/third_party/bouffalolab/bl602_sdk/repo
index 9b3e3f3e9cc193..5894617d02ec7d 160000
--- a/third_party/bouffalolab/bl602_sdk/repo
+++ b/third_party/bouffalolab/bl602_sdk/repo
@@ -1 +1 @@
-Subproject commit 9b3e3f3e9cc1932e2334d755fde864459944e2f9
+Subproject commit 5894617d02ec7d7d95916e72b3bdc197ab50da0d
diff --git a/third_party/cyw30739_sdk/BUILD.gn b/third_party/cyw30739_sdk/BUILD.gn
index 288d0135525ba7..a64a0293f54305 100644
--- a/third_party/cyw30739_sdk/BUILD.gn
+++ b/third_party/cyw30739_sdk/BUILD.gn
@@ -39,6 +39,12 @@ config("mbedtls_cyw30739_config") {
 }
 
 mbedtls_target("mbedtls") {
+  sources = [
+    "${chip_root}/third_party/openthread/ot-ifx/src/cyw30739/mbedtls/library/aes_alt.c",
+    "${chip_root}/third_party/openthread/ot-ifx/src/cyw30739/mbedtls/library/ccm_alt.c",
+    "${chip_root}/third_party/openthread/ot-ifx/src/cyw30739/mbedtls/library/sha256_alt.c",
+  ]
+
   public_configs = [ ":mbedtls_cyw30739_config" ]
 
   public_deps = [ "${openthread_root}/src/core:libopenthread_core_headers" ]
diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c b/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c
index 074229958e8113..ec8bc6af4af752 100644
--- a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c
+++ b/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c
@@ -4,14 +4,13 @@
  * Description:
  * Pin configuration
  * This file was automatically generated and should not be modified.
- * Tools Package 2.4.0.5880
- * 20739B2 CSP
+ * Tools Package 2.3.0.4276
+ * 30739A0 CSP
  * personalities 1.0.0.31
- * udd 3.0.0.1454
+ * udd 3.0.0.1636
  *
  ********************************************************************************
- * Copyright 2021 Cypress Semiconductor Corporation (an Infineon company) or
- * an affiliate of Cypress Semiconductor Corporation.
+ * Copyright 2022 Cypress Semiconductor Corporation
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,79 +28,118 @@
 
 #include "cycfg_pins.h"
 
+#if CHIP_PACKAGE_WLCSP
 #define BUTTON_USER_config                                                                                                         \
     {                                                                                                                              \
         .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_0].gpio_pin,                                       \
         .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP, .default_state = GPIO_PIN_OUTPUT_HIGH,                                         \
         .button_pressed_value = GPIO_PIN_OUTPUT_LOW,                                                                               \
     }
-#define GPIO2_config                                                                                                               \
+#define GPIO3_config                                                                                                               \
     {                                                                                                                              \
         .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_5].gpio_pin,                                       \
         .config = GPIO_OUTPUT_ENABLE | GPIO_INPUT_DISABLE, .default_state = GPIO_PIN_OUTPUT_LOW,                                   \
     }
-#define RX_PU_config                                                                                                               \
+#define GPIO4_config                                                                                                               \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_6].gpio_pin,                                       \
-        .config = GPIO_OUTPUT_ENABLE | GPIO_INPUT_DISABLE, .default_state = GPIO_PIN_OUTPUT_LOW,                                   \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_9].gpio_pin,                                       \
+        .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
-#define GPIO3_config                                                                                                               \
+#define GPIO5_config                                                                                                               \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_7].gpio_pin,                                       \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_11].gpio_pin,                                      \
         .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
-#define TX_PU_config                                                                                                               \
+#define GPIO6_config                                                                                                               \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_8].gpio_pin,                                       \
-        .config = GPIO_OUTPUT_ENABLE | GPIO_INPUT_DISABLE, .default_state = GPIO_PIN_OUTPUT_HIGH,                                  \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_12].gpio_pin,                                      \
+        .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
-#define GPIO4_config                                                                                                               \
+#define DEBUG_UART_TXD_config                                                                                                      \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_9].gpio_pin,                                       \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_15].gpio_pin,                                      \
         .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
-#define GPIO5_config                                                                                                               \
+#define LED1_config                                                                                                                \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_10].gpio_pin,                                      \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_16].gpio_pin,                                      \
+        .config = GPIO_OUTPUT_ENABLE | GPIO_PULL_UP, .default_state = GPIO_PIN_OUTPUT_HIGH,                                        \
+    }
+#define LED2_config                                                                                                                \
+    {                                                                                                                              \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_17].gpio_pin,                                      \
+        .config = GPIO_OUTPUT_ENABLE | GPIO_PULL_UP, .default_state = GPIO_PIN_OUTPUT_HIGH,                                        \
+    }
+#define GPIO2_config                                                                                                               \
+    {                                                                                                                              \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_3].gpio_pin,                                       \
         .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
+#else // !CHIP_PACKAGE_WLCSP
+#define BUTTON_USER_config                                                                                                         \
+    {                                                                                                                              \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_0].gpio_pin,                                       \
+        .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP, .default_state = GPIO_PIN_OUTPUT_HIGH,                                         \
+        .button_pressed_value = GPIO_PIN_OUTPUT_LOW,                                                                               \
+    }
 #define DEBUG_UART_TXD_config                                                                                                      \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_12].gpio_pin,                                      \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_11].gpio_pin,                                      \
         .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
 #define LED1_config                                                                                                                \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_13].gpio_pin,                                      \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_12].gpio_pin,                                      \
         .config = GPIO_OUTPUT_ENABLE | GPIO_PULL_UP, .default_state = GPIO_PIN_OUTPUT_HIGH,                                        \
     }
 #define LED2_config                                                                                                                \
     {                                                                                                                              \
-        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_14].gpio_pin,                                      \
+        .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_13].gpio_pin,                                      \
         .config = GPIO_OUTPUT_ENABLE | GPIO_PULL_UP, .default_state = GPIO_PIN_OUTPUT_HIGH,                                        \
     }
-#define GPIO1_config                                                                                                               \
+#define GPIO2_config                                                                                                               \
     {                                                                                                                              \
         .gpio   = (wiced_bt_gpio_numbers_t *) &platform_gpio_pins[PLATFORM_GPIO_3].gpio_pin,                                       \
         .config = GPIO_INPUT_ENABLE | GPIO_PULL_UP_DOWN_NONE, .default_state = GPIO_PIN_OUTPUT_LOW,                                \
     }
+#endif // CHIP_PACKAGE_WLCSP
 
 const wiced_platform_gpio_t platform_gpio_pins[] = {
+#if CHIP_PACKAGE_WLCSP
     [PLATFORM_GPIO_0]  = { WICED_P00, WICED_GPIO },
     [PLATFORM_GPIO_1]  = { WICED_P04, pwm_0_pwm_0_TRIGGER_IN },
     [PLATFORM_GPIO_2]  = { WICED_P06, uart_1_rxd_0_TRIGGER_IN },
     [PLATFORM_GPIO_3]  = { WICED_P07, WICED_GPIO },
     [PLATFORM_GPIO_4]  = { WICED_P10, uart_1_txd_0_TRIGGER_IN },
     [PLATFORM_GPIO_5]  = { WICED_P16, WICED_GPIO },
-    [PLATFORM_GPIO_6]  = { WICED_P17, WICED_GPIO },
-    [PLATFORM_GPIO_7]  = { WICED_P25, WICED_GPIO },
-    [PLATFORM_GPIO_8]  = { WICED_P26, WICED_GPIO },
-    [PLATFORM_GPIO_9]  = { WICED_P28, WICED_GPIO },
-    [PLATFORM_GPIO_10] = { WICED_P29, WICED_GPIO },
-    [PLATFORM_GPIO_11] = { WICED_P30, WICED_GPIO },
-    [PLATFORM_GPIO_12] = { WICED_P33, WICED_GPIO },
-    [PLATFORM_GPIO_13] = { WICED_P34, WICED_GPIO },
-    [PLATFORM_GPIO_14] = { WICED_P38, WICED_GPIO },
+    [PLATFORM_GPIO_6]  = { WICED_P17, amplifiers_0_rx_pu_0_TRIGGER_IN },
+    [PLATFORM_GPIO_7]  = { WICED_P23, spi_1_mosi_0_TRIGGER_IN },
+    [PLATFORM_GPIO_8]  = { WICED_P24, spi_1_miso_0_TRIGGER_IN },
+    [PLATFORM_GPIO_9]  = { WICED_P25, WICED_GPIO },
+    [PLATFORM_GPIO_10] = { WICED_P26, amplifiers_0_tx_pu_0_TRIGGER_IN },
+    [PLATFORM_GPIO_11] = { WICED_P28, WICED_GPIO },
+    [PLATFORM_GPIO_12] = { WICED_P29, WICED_GPIO },
+    [PLATFORM_GPIO_13] = { WICED_P30, spi_1_cs_0_TRIGGER_IN },
+    [PLATFORM_GPIO_14] = { WICED_P31, spi_1_clk_0_TRIGGER_IN },
+    [PLATFORM_GPIO_15] = { WICED_P33, WICED_GPIO },
+    [PLATFORM_GPIO_16] = { WICED_P34, WICED_GPIO },
+    [PLATFORM_GPIO_17] = { WICED_P38, WICED_GPIO },
+#else  // !CHIP_PACKAGE_WLCSP
+    [PLATFORM_GPIO_0]       = { WICED_P00, WICED_GPIO },
+    [PLATFORM_GPIO_1]       = { WICED_P04, pwm_0_pwm_0_TRIGGER_IN },
+    [PLATFORM_GPIO_2]       = { WICED_P06, uart_1_rxd_0_TRIGGER_IN },
+    [PLATFORM_GPIO_3]       = { WICED_P07, WICED_GPIO },
+    [PLATFORM_GPIO_4]       = { WICED_P10, uart_1_txd_0_TRIGGER_IN },
+    [PLATFORM_GPIO_5]       = { WICED_P16, spi_1_clk_0_TRIGGER_IN },
+    [PLATFORM_GPIO_6]       = { WICED_P17, amplifiers_0_rx_pu_0_TRIGGER_IN },
+    [PLATFORM_GPIO_7]       = { WICED_P25, spi_1_cs_0_TRIGGER_IN },
+    [PLATFORM_GPIO_8]       = { WICED_P26, amplifiers_0_tx_pu_0_TRIGGER_IN },
+    [PLATFORM_GPIO_9]       = { WICED_P28, spi_1_mosi_0_TRIGGER_IN },
+    [PLATFORM_GPIO_10]      = { WICED_P29, spi_1_miso_0_TRIGGER_IN },
+    [PLATFORM_GPIO_11]      = { WICED_P33, WICED_GPIO },
+    [PLATFORM_GPIO_12]      = { WICED_P34, WICED_GPIO },
+    [PLATFORM_GPIO_13]      = { WICED_P38, WICED_GPIO },
+#endif // CHIP_PACKAGE_WLCSP
 };
 const size_t platform_gpio_pin_count             = (sizeof(platform_gpio_pins) / sizeof(wiced_platform_gpio_t));
 const wiced_platform_led_config_t platform_led[] = {
@@ -114,8 +152,12 @@ const wiced_platform_button_config_t platform_button[] = {
 };
 const size_t button_count                          = (sizeof(platform_button) / sizeof(wiced_platform_button_config_t));
 const wiced_platform_gpio_config_t platform_gpio[] = {
-    [WICED_PLATFORM_GPIO_1] = GPIO1_config, [WICED_PLATFORM_GPIO_2] = GPIO2_config,          [WICED_PLATFORM_GPIO_7] = RX_PU_config,
-    [WICED_PLATFORM_GPIO_3] = GPIO3_config, [WICED_PLATFORM_GPIO_6] = TX_PU_config,          [WICED_PLATFORM_GPIO_4] = GPIO4_config,
-    [WICED_PLATFORM_GPIO_5] = GPIO5_config, [WICED_PLATFORM_GPIO_8] = DEBUG_UART_TXD_config,
+#if CHIP_PACKAGE_WLCSP
+    [WICED_PLATFORM_GPIO_2] = GPIO2_config, [WICED_PLATFORM_GPIO_3] = GPIO3_config, [WICED_PLATFORM_GPIO_4] = GPIO4_config,
+    [WICED_PLATFORM_GPIO_5] = GPIO5_config, [WICED_PLATFORM_GPIO_6] = GPIO6_config, [WICED_PLATFORM_GPIO_7] = DEBUG_UART_TXD_config,
+#else  // !CHIP_PACKAGE_WLCSP
+    [WICED_PLATFORM_GPIO_2] = GPIO2_config,
+    [WICED_PLATFORM_GPIO_7] = DEBUG_UART_TXD_config,
+#endif // CHIP_PACKAGE_WLCSP
 };
 const size_t gpio_count = (sizeof(platform_gpio) / sizeof(wiced_platform_gpio_config_t));
diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h b/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h
index de4b9f30d2d897..d8e3c8ab28fc58 100644
--- a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h
+++ b/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h
@@ -4,14 +4,13 @@
  * Description:
  * Pin configuration
  * This file was automatically generated and should not be modified.
- * Tools Package 2.4.0.5880
- * 20739B2 CSP
+ * Tools Package 2.3.0.4276
+ * 30739A0 CSP
  * personalities 1.0.0.31
- * udd 3.0.0.1454
+ * udd 3.0.0.1636
  *
  ********************************************************************************
- * Copyright 2021 Cypress Semiconductor Corporation (an Infineon company) or
- * an affiliate of Cypress Semiconductor Corporation.
+ * Copyright 2022 Cypress Semiconductor Corporation
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +37,7 @@
 extern "C" {
 #endif
 
+#define amplifiers_0_ENABLED 1U
 #define bluetooth_0_ENABLED 1U
 #define ioss_0_ENABLED 1U
 #define WICED_GET_PIN_FOR_LED(idx) (*(platform_led[(idx)].gpio))
@@ -47,20 +47,18 @@ extern "C" {
 #define BUTTON_USER WICED_P00
 #define PUART_TXD_ENABLED 1U
 #define PUART_TXD WICED_P10
-#define GPIO2_ENABLED 1U
-#define GPIO2 WICED_P16
+//#define GPIO3_ENABLED 1U
+//#define GPIO3 WICED_P16
 #define RX_PU_ENABLED 1U
 #define RX_PU WICED_P17
-#define GPIO3_ENABLED 1U
-#define GPIO3 WICED_P25
+//#define GPIO4_ENABLED 1U
+//#define GPIO4 WICED_P25
 #define TX_PU_ENABLED 1U
 #define TX_PU WICED_P26
-#define GPIO4_ENABLED 1U
-#define GPIO4 WICED_P28
-#define GPIO5_ENABLED 1U
-#define GPIO5 WICED_P29
-#define ioss_0_pin_30_ENABLED 1U
-#define ioss_0_pin_30 WICED_P30
+//#define GPIO5_ENABLED 1U
+//#define GPIO5 WICED_P28
+//#define GPIO6_ENABLED 1U
+//#define GPIO6 WICED_P29
 #define DEBUG_UART_TXD_ENABLED 1U
 #define DEBUG_UART_TXD WICED_P33
 #define LED1_ENABLED 1U
@@ -71,9 +69,10 @@ extern "C" {
 #define PWM0 WICED_P04
 #define PUART_RXD_ENABLED 1U
 #define PUART_RXD WICED_P06
-#define GPIO1_ENABLED 1U
-#define GPIO1 WICED_P07
+#define GPIO2_ENABLED 1U
+#define GPIO2 WICED_P07
 #define pwm_0_ENABLED 1U
+#define spi_1_ENABLED 1U
 #define uart_1_ENABLED 1U
 
 extern const wiced_platform_gpio_t platform_gpio_pins[];
diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h b/third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h
index 47e1e82b52b8cc..b4e1a38b050feb 100644
--- a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h
+++ b/third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h
@@ -4,14 +4,13 @@
  * Description:
  * Establishes all necessary connections between hardware elements.
  * This file was automatically generated and should not be modified.
- * Tools Package 2.4.0.5880
- * 20739B2 CSP
+ * Tools Package 2.3.0.4276
+ * 30739A0 CSP
  * personalities 1.0.0.31
- * udd 3.0.0.1454
+ * udd 3.0.0.1636
  *
  ********************************************************************************
- * Copyright 2021 Cypress Semiconductor Corporation (an Infineon company) or
- * an affiliate of Cypress Semiconductor Corporation.
+ * Copyright 2022 Cypress Semiconductor Corporation
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,11 +36,31 @@ extern "C" {
 #include "cycfg_notices.h"
 static inline void init_cycfg_routing(void) {}
 #define init_cycfg_connectivity() init_cycfg_routing()
+#if CHIP_PACKAGE_WLCSP
 #define ioss_0_pin_4_AUX UNKNOWN
 #define ioss_0_pin_6_AUX UNKNOWN
 #define ioss_0_pin_10_AUX UNKNOWN
+#define ioss_0_pin_17_AUX UNKNOWN
+#define ioss_0_pin_26_AUX UNKNOWN
+#else // !CHIP_PACKAGE_WLCSP
+#define ioss_0_pin_4_AUX UNKNOWN
+#define ioss_0_pin_6_AUX UNKNOWN
+#define ioss_0_pin_10_AUX UNKNOWN
+#define ioss_0_pin_16_AUX UNKNOWN
+#define ioss_0_pin_17_AUX UNKNOWN
+#define ioss_0_pin_25_AUX UNKNOWN
+#define ioss_0_pin_26_AUX UNKNOWN
+#define ioss_0_pin_28_AUX UNKNOWN
+#define ioss_0_pin_29_AUX UNKNOWN
+#endif
 
+#define amplifiers_0_rx_pu_0_TRIGGER_IN WICED_RX_PU
+#define amplifiers_0_tx_pu_0_TRIGGER_IN WICED_TX_PU
 #define pwm_0_pwm_0_TRIGGER_IN WICED_PWM0
+#define spi_1_clk_0_TRIGGER_IN WICED_SPI_2_CLK
+#define spi_1_cs_0_TRIGGER_IN WICED_SPI_2_CS
+#define spi_1_miso_0_TRIGGER_IN WICED_SPI_2_MISO
+#define spi_1_mosi_0_TRIGGER_IN WICED_SPI_2_MOSI
 #define uart_1_rxd_0_TRIGGER_IN WICED_UART_2_RXD
 #define uart_1_txd_0_TRIGGER_IN WICED_UART_2_TXD
 
diff --git a/third_party/cyw30739_sdk/btp_reader.py b/third_party/cyw30739_sdk/btp_reader.py
index 9dface1ff0b485..71fd7c28144ec7 100644
--- a/third_party/cyw30739_sdk/btp_reader.py
+++ b/third_party/cyw30739_sdk/btp_reader.py
@@ -1,4 +1,24 @@
 #!/usr/bin/env python
+#
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""BTP file reader
+
+This is a helper script to parse BTP file into json.
+
+"""
 
 import argparse
 import json
@@ -26,17 +46,24 @@ def main():
                 else:
                     items[key] = int(value, 0)
 
-    items["XS_LOCATION_ACTIVE"] = 0x0052E000
+    ds_len = items["ConfigDS2Location"] - items["ConfigDSLocation"]
+    xs_location_end = 0x00600000
+
+    items["ConfigXS1Location"] = items["ConfigDS2Location"] + ds_len
 
     if option.enable_ota:
-        items["XS_LOCATION_UPGRADE"] = 0x005A3000
+        items["ConfigXS1Length"] = 0x00076000
+        items["ConfigXS2Location"] = (
+            items["ConfigXS1Location"] + items["ConfigXS1Length"]
+        )
+        items["ConfigXS2Length"] = xs_location_end - items["ConfigXS2Location"]
     else:
-        items["XS_LOCATION_UPGRADE"] = 0x00600000
+        items["ConfigXS1Length"] = xs_location_end - items["ConfigXS1Location"]
+        items["ConfigXS2Length"] = 0
+        items["ConfigXS2Location"] = xs_location_end
 
-    items["XIP_DS_OFFSET"] = items["XS_LOCATION_ACTIVE"] - \
+    items["ConfigXS1DS1Offset"] = items["ConfigXS1Location"] - \
         items["ConfigDSLocation"]
-    items["XIP_LEN"] = items["XS_LOCATION_UPGRADE"] - \
-        items["XS_LOCATION_ACTIVE"]
 
     for key in items:
         if type(items[key]) is int:
diff --git a/third_party/cyw30739_sdk/compress_cgs_data.py b/third_party/cyw30739_sdk/compress_cgs_data.py
new file mode 100644
index 00000000000000..c159f61746f8f4
--- /dev/null
+++ b/third_party/cyw30739_sdk/compress_cgs_data.py
@@ -0,0 +1,239 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""CGS data entry compressor
+
+This script compresses "Data" entries into "Compressed data" entries
+from the input CGS file to the output CGS file with the given LZSS tool.
+
+"Data" entries that are smaller than 512 bytes would be skipped.
+
+"""
+
+import argparse
+import io
+import pathlib
+import re
+import subprocess
+import sys
+
+from collections import namedtuple
+
+
+Item = namedtuple('Item', 'line type nested_data')
+Entry = namedtuple('Entry', 'items name remark')
+CommentedBytes = namedtuple('CommentedBytes', 'items data')
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--output", required=True, type=pathlib.Path)
+    parser.add_argument("--input", required=True, type=pathlib.Path)
+    parser.add_argument("--lzss_tool", required=True, type=pathlib.Path)
+
+    option = parser.parse_args()
+
+    cgs = parse_cgs(option.input)
+    compress_cgs(option, cgs)
+    export_cgs(option.output, cgs)
+
+
+def parse_cgs(file_name):
+    cgs = []
+
+    with open(file_name, mode="r") as file:
+        for line in file:
+            if len(line) == 0:
+                break
+
+            striped_line = line.strip()
+            item_type = None
+            nested_data = None
+
+            if striped_line.startswith('ENTRY'):
+                item_type = "entry"
+                nested_data = parse_entry(file, line)
+            elif striped_line.startswith('#') or striped_line.startswith('//'):
+                item_type = "comment"
+            elif striped_line.startswith('DEFINITION'):
+                item_type = "definition"
+
+            cgs.append(Item(line, item_type, nested_data))
+
+    return cgs
+
+
+def parse_entry(file: io.TextIOBase, line):
+
+    # compile the regex for extracting name and remark of the entry.
+    data_re = re.compile(r"""
+      ^\s*               # Allow leading spaces
+      ENTRY\s+"([^"]+)"  # Parse the entry name
+      (?:                # Optional non-capturing part begin
+        \s*=\s*          # Allow leading and trailing spaces
+        "([^"]+)"        # Parse the entry remark
+      )?                 # Optional non-capturing part end
+      \s*$               # Allow trailing spaces
+    """, re.VERBOSE)
+
+    items = []
+    name = None
+    remark = None
+
+    while len(line) != 0:
+        striped_line = line.strip()
+        item_type = None
+        nested_data = None
+
+        if striped_line.startswith('ENTRY'):
+            item_type = "entry"
+            match = data_re.match(striped_line)
+            if match:
+                name = match[1]
+                remark = match[2]
+        elif striped_line.startswith('COMMENTED_BYTES'):
+            item_type = "commented_bytes"
+            nested_data = parse_commented_bytes(file, line)
+        elif striped_line.startswith('{'):
+            item_type = "start"
+        elif striped_line.startswith('}'):
+            item_type = "end"
+
+        items.append(Item(line, item_type, nested_data))
+        if item_type == "end":
+            break
+
+        line = file.readline()
+
+    return Entry(items, name, remark)
+
+
+def parse_commented_bytes(file: io.TextIOBase, line):
+    items = []
+    data = bytearray()
+
+    while len(line) != 0:
+        striped_line = line.strip()
+        name = None
+
+        if striped_line.startswith('COMMENTED_BYTES'):
+            name = "commented_bytes"
+        elif striped_line.startswith('<hex>'):
+            name = "hex"
+        elif striped_line.startswith('{'):
+            name = "start"
+        elif striped_line.startswith('}'):
+            name = "end"
+        else:
+            name = "data"
+            data += bytearray.fromhex(striped_line)
+
+        items.append(Item(line, name, None))
+        if name == "end":
+            break
+
+        line = file.readline()
+
+    return CommentedBytes(items, data)
+
+
+def compress_cgs(option, cgs):
+    for item in cgs:
+        if item.nested_data is None:
+            continue
+        entry = compress_entry(option, item.nested_data)
+        if entry is None:
+            continue
+
+        cgs.insert(cgs.index(item), Item(item.line, item.type, entry))
+        cgs.remove(item)
+
+
+def compress_entry(option, entry):
+    if entry.name != 'Data':
+        return None
+
+    for item in entry.items:
+        if item.nested_data is None:
+            continue
+        commented_bytes = compress_commented_bytes(option, item.nested_data)
+        if commented_bytes is None:
+            return None
+
+        entry.items.insert(entry.items.index(item), Item(item.line, item.type, commented_bytes))
+        entry.items.remove(item)
+
+    return Entry(entry.items, 'Compressed data', entry.remark)
+
+
+def compress_commented_bytes(option, commented_bytes):
+    if len(commented_bytes.data) < 512:
+        return None
+    return CommentedBytes(commented_bytes.items, compress_data(option, commented_bytes.data))
+
+
+def compress_data(option, data):
+    raw_file = str(option.input.with_suffix('.tmp'))
+    compressed_file = str(option.input.with_suffix('.tmp.lz'))
+
+    with open(raw_file, mode="wb") as binary:
+        binary.write(data)
+
+    subprocess.run([option.lzss_tool, "e", raw_file,
+                   compressed_file, ], check=True)
+
+    with open(compressed_file, mode="rb") as binary:
+        return binary.read()
+
+
+def export_cgs(file_name, cgs):
+    with open(file_name, mode="w") as file:
+        for item in cgs:
+            if item.nested_data is None:
+                file.write(item.line)
+            else:
+                export_entry(file, item.nested_data)
+
+
+def export_entry(file: io.TextIOBase, entry):
+    for item in entry.items:
+        if item.type == 'entry':
+            file.write('ENTRY "{}"'.format(entry.name))
+            if entry.remark:
+                file.write(' = "{}"'.format(entry.remark))
+            file.write('\n')
+        elif item.nested_data is None:
+            file.write(item.line)
+        else:
+            export_commented_bytes(file, item.nested_data, entry.name == 'Compressed data')
+
+
+def export_commented_bytes(file: io.TextIOBase, commented_bytes, is_compressed_data):
+    for item in commented_bytes.items:
+        if is_compressed_data and item.type == 'data':
+            continue
+
+        file.write(item.line)
+
+        if is_compressed_data and item.type == 'hex':
+            indent = item.line.rstrip()[:-len('<hex>')]
+
+            for i in range(0, len(commented_bytes.data), 16):
+                file.write(indent + commented_bytes.data[i:i + 16].hex(' ') + '\n')
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/third_party/cyw30739_sdk/cyw30739_executable.gni b/third_party/cyw30739_sdk/cyw30739_executable.gni
index a99793e0198b7b..eed0f9341befa5 100644
--- a/third_party/cyw30739_sdk/cyw30739_executable.gni
+++ b/third_party/cyw30739_sdk/cyw30739_executable.gni
@@ -27,23 +27,29 @@ template("cyw30739_executable") {
   output_base_name = get_path_info(invoker.output_name, "name")
   ldscript_file = "${root_build_dir}/${output_base_name}.ld"
   flashable_target = "${target_name}.flashable"
+  pre_build_target = "${target_name}.pre_build"
+  post_build_target = "${target_name}.post_build"
+  ota_image_target = "${target_name}.ota_image"
 
-  cyw30739_sdk_pre_build("${target_name}.pre_build") {
+  cyw30739_sdk_pre_build(pre_build_target) {
   }
 
-  cyw30739_sdk_post_build("${target_name}.post_build") {
-    executable_target = ":${flashable_target}.executable"
+  cyw30739_sdk_post_build(post_build_target) {
+    executable_target = "${flashable_target}.executable"
   }
 
-  cyw30739_sdk_ota_image("${target_name}.ota_image") {
-    deps = [ ":${invoker.target_name}.post_build" ]
+  cyw30739_sdk_ota_image(ota_image_target) {
+    deps = [ ":${post_build_target}" ]
   }
 
   group(target_name) {
-    deps = [
-      ":${flashable_target}",
-      ":${target_name}.ota_image",
-    ]
+    deps = [ ":${flashable_target}" ]
+
+    if (chip_enable_ota_requestor) {
+      deps += [ ":${ota_image_target}" ]
+    } else {
+      deps += [ ":${post_build_target}" ]
+    }
   }
 
   # Copy flashing dependencies to the output directory so that the output
@@ -76,7 +82,7 @@ template("cyw30739_executable") {
     forward_variables_from(invoker, "*")
     data_deps = [ ":${flashing_runtime_target}" ]
 
-    deps += [ ":${target_name}.pre_build" ]
+    deps += [ ":${pre_build_target}" ]
 
     inputs = [ ldscript_file ]
 
diff --git a/third_party/cyw30739_sdk/cyw30739_sdk.gni b/third_party/cyw30739_sdk/cyw30739_sdk.gni
index 2a4e06e11224d2..7bed70cf01ec28 100644
--- a/third_party/cyw30739_sdk/cyw30739_sdk.gni
+++ b/third_party/cyw30739_sdk/cyw30739_sdk.gni
@@ -22,6 +22,7 @@ declare_args() {
   # Location of the CYW30739 SDK.
   cyw30739_sdk_root = "${cyw30739_sdk_build_root}/repos"
   cyw30739_sdk_verbose = false
+  cyw30739_sdk_debug = 0
 }
 
 assert(cyw30739_sdk_root != "", "cyw30739_sdk_root must be specified")
@@ -54,7 +55,10 @@ if (chip_enable_ota_requestor) {
 }
 btp = exec_script("${cyw30739_sdk_build_root}/btp_reader.py",
                   btp_reader_args,
-                  "json")
+                  "json",
+                  [ cyw30739_sdk_btp_file ])
+
+cyw30739_sdk_crt_entry = "spar_crt_setup"
 
 template("cyw30739_sdk_script") {
   action(target_name) {
@@ -100,12 +104,6 @@ template("cyw30739_sdk") {
 
   assert(cyw30739_sdk_root != "", "cyw30739_sdk_root must be specified")
 
-  if (is_debug) {
-    enable_debug = 1
-  } else {
-    enable_debug = 0
-  }
-
   config("${target_name}_config") {
     include_dirs = []
     defines = []
@@ -138,7 +136,7 @@ template("cyw30739_sdk") {
 
     ldflags = [
       "--specs=nano.specs",
-      "-Wl,--entry=spar_crt_setup",
+      "-Wl,--entry=${cyw30739_sdk_crt_entry}",
       "-Wl,--just-symbols=" +
           rebase_path(cyw30739_sdk_patch_sym_file, root_build_dir),
       "-nostartfiles",
@@ -203,10 +201,10 @@ template("cyw30739_sdk") {
       "CHIP_HAVE_CONFIG_H=1",
       "CY_PLATFORM_SWDCK=WICED_P05",
       "CY_PLATFORM_SWDIO=WICED_P03",
-      "ENABLE_DEBUG=${enable_debug}",
-      "SPAR_CRT_SETUP=spar_crt_setup",
-      "XS_LOCATION_ACTIVE=" + btp.XS_LOCATION_ACTIVE,
-      "XS_LOCATION_UPGRADE=" + btp.XS_LOCATION_UPGRADE,
+      "ENABLE_DEBUG=${cyw30739_sdk_debug}",
+      "SPAR_CRT_SETUP=${cyw30739_sdk_crt_entry}",
+      "XS_LOCATION_ACTIVE=${btp.ConfigXS1Location}",
+      "XS_LOCATION_UPGRADE=${btp.ConfigXS2Location}",
     ]
     if (chip_enable_ota_requestor) {
       defines += [ "BLE_OTA_FW_UPGRADE=1" ]
@@ -219,14 +217,29 @@ template("cyw30739_sdk") {
 }
 
 template("cyw30739_sdk_pre_build") {
-  cyw30739_sdk_script(target_name) {
-    script_file_name = "bt_pre_build.bash"
+  action(target_name) {
+    script_file = "${cyw30739_sdk_build_root}/scripts/wiced-gen-ld.pl"
+
+    script = "${build_root}/gn_run_binary.py"
+
+    inputs = [
+      "${cyw30739_sdk_build_root}/btp_reader.py",
+      script_file,
+    ]
 
-    linker_defines = [
-      "FLASH0_BEGIN_ADDR=" + btp.DLConfigSSLocation,
+    sources = [ cyw30739_sdk_btp_file ]
+
+    outputs = [ invoker.ldscript_file ]
+
+    args = [
+      "perl",
+      "-I",
+      rebase_path(cyw30739_sdk_scripts_dir, root_build_dir),
+      rebase_path(script_file, root_build_dir),
+      "FLASH0_BEGIN_ADDR=${btp.DLConfigSSLocation}",
       "FLASH0_LENGTH=0x00100000",
-      "XIP_DS_OFFSET=" + btp.XIP_DS_OFFSET,
-      "XIP_LEN=" + btp.XIP_LEN,
+      "XIP_DS_OFFSET=${btp.ConfigXS1DS1Offset}",
+      "XIP_LEN=${btp.ConfigXS1Length}",
       "SRAM_BEGIN_ADDR=0x00200000",
       "SRAM_LENGTH=0x00070000",
       "AON_AREA_END=0x00284000",
@@ -234,75 +247,260 @@ template("cyw30739_sdk_pre_build") {
       "ISTATIC_LEN=0x400",
       "NUM_PATCH_ENTRIES=256",
       "BTP=" + rebase_path(cyw30739_sdk_btp_file, root_build_dir),
+      rebase_path(cyw30739_sdk_patch_sym_file, root_build_dir),
+      "out=" + rebase_path(invoker.ldscript_file, root_build_dir),
+    ]
+  }
+}
+
+template("cyw30739_sdk_post_build") {
+  output_base_path = "${root_out_dir}/${invoker.output_base_name}"
+  elf = "${output_base_path}.elf"
+  hex = "${output_base_path}_download.hex"
+  ds_hex = "${output_base_path}.ds.hex"
+  xs_hex = "${output_base_path}.xs.hex"
+  ss_cgs = "${output_base_path}.ss.cgs"
+  cgs = "${output_base_path}.cgs"
+  cx_cgs = "${output_base_path}.cx.cgs"
+  static_config = "${output_base_path}.static_config.txt"
+  hdf = "${root_out_dir}/configdef30739A0.hdf"
+
+  patched_cgs_args =
+      exec_script("${build_root}/gn_run_binary.py",
+                  [
+                    "perl",
+                    rebase_path("${cyw30739_sdk_scripts_dir}/wiced-bdaddr.pl",
+                                root_build_dir),
+                    "30739A0",
+                    rebase_path(cyw30739_sdk_btp_file, root_build_dir),
+                    "-O",
+                    "DLConfigBD_ADDRBase:default",
+                  ],
+                  "list lines",
+                  [ "${cyw30739_sdk_scripts_dir}/wiced-bdaddr.pl" ])
+
+  cgs_args = []
+  foreach(arg, patched_cgs_args) {
+    cgs_args += string_split(arg)
+  }
+
+  action(target_name) {
+    script = "${cyw30739_sdk_build_root}/merge_hex.py"
+
+    outputs = [ hex ]
+
+    sources = [
+      ds_hex,
+      xs_hex,
     ]
 
     args = [
-      "--defs=" + string_join(" ", linker_defines),
-      "--ld=" + rebase_path(invoker.ldscript_file, root_build_dir),
-      "--patch=" + rebase_path(cyw30739_sdk_patch_sym_file, root_build_dir),
+      "--output=" + rebase_path(hex, root_build_dir),
+      "--ds_hex=" + rebase_path(ds_hex, root_build_dir),
+      "--xs_hex=" + rebase_path(xs_hex, root_build_dir),
     ]
 
-    sources = [ cyw30739_sdk_btp_file ]
+    deps = [
+      ":${target_name}_gen_ds_hex",
+      ":${target_name}_gen_xs_hex",
+    ]
 
-    outputs = [ invoker.ldscript_file ]
+    data_deps = [
+      ":${target_name}_btp",
+      ":${target_name}_disassemble",
+      ":${target_name}_hci_id",
+      ":${target_name}_minidriver",
+    ]
   }
-}
 
-template("cyw30739_sdk_post_build") {
-  copy("${target_name}_static_config") {
-    sources = [ "static_config.txt" ]
-    outputs = [ "${root_out_dir}/{{source_file_part}}" ]
+  action("${target_name}_gen_ds_hex") {
+    cgs_map = "${cgs}.map"
+    script = "${build_root}/gn_run_binary.py"
+
+    outputs = [
+      cgs_map,
+      ds_hex,
+    ]
+
+    sources = [
+      cx_cgs,
+      cyw30739_sdk_btp_file,
+      ss_cgs,
+    ]
+
+    args = [
+      rebase_path("${cyw30739_sdk_tools_dir}/CGS/cgs", root_build_dir),
+      "-D",
+      rebase_path(root_out_dir, root_build_dir),
+      "-M",
+      rebase_path(cgs_map, root_build_dir),
+      "-I",
+      rebase_path(ds_hex, root_build_dir),
+      "-B",
+      rebase_path(cyw30739_sdk_btp_file, root_build_dir),
+      "--ss-cgs",
+      rebase_path(ss_cgs, root_build_dir),
+      "--cgs-files",
+      rebase_path(cx_cgs, root_build_dir),
+    ]
+    args += cgs_args
+
+    deps = [
+      ":${invoker.target_name}_compress_cgs_data",
+      ":${invoker.target_name}_gen_ss_cgs",
+    ]
   }
 
-  cyw30739_sdk_script(target_name) {
-    script_file_name = "bt_post_build.bash"
+  action("${target_name}_gen_xs_hex") {
+    script = "${build_root}/gn_run_binary.py"
+
+    outputs = [ xs_hex ]
 
-    cgs_list = [
-      "${cyw30739_sdk_patch_dir}/patch.cgs",
-      "${cyw30739_sdk_platform_dir}/platform.cgs",
-      "${cyw30739_sdk_platform_dir}/platform_xip.cgs",
+    sources = [ elf ]
+
+    args = [
+      "arm-none-eabi-objcopy",
+      "--only-section=.app_xip_area",
+      "--output-target=ihex",
+      rebase_path(elf, root_build_dir),
+      rebase_path(xs_hex, root_build_dir),
     ]
 
+    deps = [ ":${invoker.executable_target}" ]
+  }
+
+  action("${target_name}_compress_cgs_data") {
+    script = "${cyw30739_sdk_build_root}/compress_cgs_data.py"
+
+    outputs = [ cx_cgs ]
+
+    sources = [ cgs ]
+
     args = [
-      "--cross=arm-none-eabi-",
-      "--tools=" + rebase_path(cyw30739_sdk_tools_dir, root_build_dir),
-      "--builddir=" + rebase_path(root_out_dir, root_build_dir),
-      "--elfname=${invoker.output_base_name}.elf",
-      "--appname=${invoker.output_base_name}",
-      "--appver=0x00000000",
-      "--hdf=" + rebase_path(
-              "${cyw30739_sdk_baselib_dir}/internal/30739A0/configdef30739A0.hdf",
-              root_build_dir),
-      "--entry=spar_crt_setup.entry",
-      "--cgslist=" + string_join(" ", rebase_path(cgs_list, root_build_dir)),
-      "--cgsargs=-O DLConfigBD_ADDRBase:default",
-      "--btp=" + rebase_path(cyw30739_sdk_btp_file, root_build_dir),
-      "--id=" + rebase_path("${cyw30739_sdk_platform_dir}/IDFILE.txt",
-                            root_build_dir),
-      "--overridebaudfile=" +
-          rebase_path("${cyw30739_sdk_platform_dir}/BAUDRATEFILE.txt",
-                      root_build_dir),
-      "--chip=30739A0",
-      "--minidriver=" +
-          rebase_path("${cyw30739_sdk_platform_dir}/minidriver.hex",
-                      root_build_dir),
-      "--clflags=-NOHCIRESET",
-      "--extras=static_config_XIP_",
+      "--output=" + rebase_path(cx_cgs, root_build_dir),
+      "--input=" + rebase_path(cgs, root_build_dir),
+      "--lzss_tool=" +
+          rebase_path(cyw30739_sdk_tools_dir + "/lzss/lzss", root_build_dir),
+    ]
+
+    deps = [ ":${invoker.target_name}_gen_cgs" ]
+  }
+
+  action("${target_name}_gen_ss_cgs") {
+    hdf_in = "${cyw30739_sdk_baselib_dir}/internal/30739A0/configdef30739A0.hdf"
+
+    script_file = "${cyw30739_sdk_scripts_dir}/wiced-gen-ss-cgs.pl"
+
+    script = "${build_root}/gn_run_binary.py"
+
+    inputs = [ script_file ]
+
+    sources = [
+      hdf_in,
+      static_config,
+    ]
+
+    outputs = [
+      hdf,
+      ss_cgs,
     ]
 
+    args = [
+      "perl",
+      "-I",
+      rebase_path(cyw30739_sdk_scripts_dir, root_build_dir),
+      rebase_path(script_file, root_build_dir),
+      "config=" + rebase_path(static_config, root_build_dir),
+      "hdf_in=" + rebase_path(hdf_in, root_build_dir),
+      "hdf_out=" + rebase_path(hdf, root_build_dir),
+      "cgs_out=" + rebase_path(ss_cgs, root_build_dir),
+    ]
+    args += cgs_args
+
+    deps = [ ":${invoker.target_name}_static_config" ]
+  }
+
+  action("${target_name}_gen_cgs") {
+    script_file = "${cyw30739_sdk_scripts_dir}/wiced-gen-cgs.pl"
+
+    script = "${build_root}/gn_run_binary.py"
+
+    inputs = [ script_file ]
+
     sources = [
-      "${root_out_dir}/static_config.txt",
+      "${cyw30739_sdk_patch_dir}/patch.cgs",
+      "${cyw30739_sdk_platform_dir}/platform.cgs",
+      "${cyw30739_sdk_platform_dir}/platform_xip.cgs",
       cyw30739_sdk_btp_file,
+      elf,
+      hdf,
+      invoker.ldscript_file,
     ]
-    sources += cgs_list
 
-    outputs = [ "${root_out_dir}/${invoker.output_base_name}_download.hex" ]
+    outputs = [ cgs ]
+
+    args = [
+      "perl",
+      "-I",
+      rebase_path(cyw30739_sdk_scripts_dir, root_build_dir),
+      rebase_path(script_file, root_build_dir),
+      "${cyw30739_sdk_crt_entry}.entry",
+      "out=" + rebase_path(cgs, root_build_dir),
+    ]
+    foreach(source, sources) {
+      args += [ rebase_path(source, root_build_dir) ]
+    }
 
     deps = [
-      ":${target_name}_static_config",
-      invoker.executable_target,
+      ":${invoker.executable_target}",
+      ":${invoker.pre_build_target}",
+      ":${invoker.target_name}_gen_ss_cgs",
     ]
   }
+
+  action("${target_name}_disassemble") {
+    asm = "${output_base_path}.asm"
+
+    script = "${build_root}/gn_run_binary.py"
+
+    outputs = [ asm ]
+
+    sources = [ elf ]
+
+    args = [
+      "bash",
+      "--norc",
+      "--noprofile",
+      "-c",
+      "arm-none-eabi-objdump --disassemble " +
+          rebase_path(elf, root_build_dir) + " > " +
+          rebase_path(asm, root_build_dir),
+    ]
+
+    deps = [ ":${invoker.executable_target}" ]
+  }
+
+  copy("${target_name}_static_config") {
+    sources = [ "static_config.txt" ]
+    outputs = [ static_config ]
+  }
+
+  copy("${target_name}_btp") {
+    sources = [ "${cyw30739_sdk_btp_file}" ]
+    outputs = [ "${output_base_path}.btp" ]
+  }
+
+  copy("${target_name}_hci_id") {
+    sources = [ "${cyw30739_sdk_platform_dir}/IDFILE.txt" ]
+    outputs = [ "${output_base_path}_hci_id.txt" ]
+  }
+
+  copy("${target_name}_minidriver") {
+    sources = [ "${cyw30739_sdk_platform_dir}/minidriver.hex" ]
+    outputs = [ "${root_out_dir}/{{source_file_part}}" ]
+  }
+
+  write_file("${root_out_dir}/chipload_flags.txt", "-NOHCIRESET")
 }
 
 template("cyw30739_sdk_ota_image") {
@@ -311,7 +509,7 @@ template("cyw30739_sdk_ota_image") {
 
     script = "${cyw30739_sdk_build_root}/gen_ota_image.py"
 
-    binary = "${root_out_dir}/${invoker.output_base_name}_download.ota.bin"
+    binary = "${root_out_dir}/${invoker.output_base_name}.bin"
     hex = "${root_out_dir}/${invoker.output_base_name}_download.hex"
 
     outputs = [ binary ]
@@ -323,6 +521,12 @@ template("cyw30739_sdk_ota_image") {
       "--hex=" + rebase_path(hex, root_build_dir),
       "--lzss_tool=" +
           rebase_path(cyw30739_sdk_tools_dir + "/lzss/lzss", root_build_dir),
+      "--active_xs_len=${btp.ConfigXS1Length}",
+      "--upgrade_xs_len=${btp.ConfigXS2Length}",
+      "--project_config=" +
+          rebase_path("//include/CHIPProjectConfig.h", root_build_dir),
+      "--ota_image_tool=" +
+          rebase_path("${chip_root}/src/app/ota_image_tool.py", root_build_dir),
     ]
   }
 }
diff --git a/third_party/cyw30739_sdk/flash.btp b/third_party/cyw30739_sdk/flash.btp
index 71a08c458067ce..d6acdcb269a510 100644
--- a/third_party/cyw30739_sdk/flash.btp
+++ b/third_party/cyw30739_sdk/flash.btp
@@ -36,8 +36,8 @@ DevicePreset "30739 Flash"
 	DLConfigSerialControlBaudRate = 115200
 	DLConfigEEPROMAccessSpeed = 100
 	DLConfigVSOffset = 0
-	ConfigDSLocation = 0x508000
-	ConfigDS2Location = 0x51b000
+	ConfigDSLocation = 0x505000
+	ConfigDS2Location = 0x519000
 	DLConfigSSLocation = 0x500000
 	DLConfigIncludeBTWSecurityKey = 0
 	DLConfigVSLocation = 0x501000
diff --git a/third_party/cyw30739_sdk/gen_ota_image.py b/third_party/cyw30739_sdk/gen_ota_image.py
index e5d143ad6b6b04..2b86d9423b5bd8 100644
--- a/third_party/cyw30739_sdk/gen_ota_image.py
+++ b/third_party/cyw30739_sdk/gen_ota_image.py
@@ -1,4 +1,26 @@
 #!/usr/bin/env python
+#
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""OTA image generator
+
+This script generates OTA image file from the input hex file.
+
+The XS data would be compressed into OTA image with the given LZSS tool.
+
+"""
 
 import argparse
 import pathlib
@@ -15,6 +37,12 @@ def main():
     parser.add_argument("--binary", required=True, type=pathlib.Path)
     parser.add_argument("--hex", required=True, type=pathlib.Path)
     parser.add_argument("--lzss_tool", required=True, type=pathlib.Path)
+    parser.add_argument("--active_xs_len", required=True,
+                        type=lambda x: int(x, 0))
+    parser.add_argument("--upgrade_xs_len", required=True,
+                        type=lambda x: int(x, 0))
+    parser.add_argument("--project_config", required=True, type=pathlib.Path)
+    parser.add_argument("--ota_image_tool", required=True, type=pathlib.Path)
 
     option = parser.parse_args()
 
@@ -52,11 +80,23 @@ def main():
     print("XS: Length 0x{:08x}, CRC 0x{:08x}".format(len(xs_data), xs_crc))
     print("CX: Length 0x{:08x}, CRC 0x{:08x}".format(len(cx_data), cx_crc))
 
-    with open(str(option.binary), mode="wb") as binary:
-        binary.write(ds_header)
-        binary.write(ds_data)
-        binary.write(xs_header)
-        binary.write(cx_data)
+    print(
+        "Active  XS: Used {:7,}, Free {:7,}".format(
+            len(xs_data), option.active_xs_len - len(xs_data)
+        )
+    )
+    upgrade_xs_len = len(xs_header) + len(cx_data)
+    print(
+        "Upgrade XS: Used {:7,}, Free {:7,}".format(
+            upgrade_xs_len, option.upgrade_xs_len - upgrade_xs_len
+        )
+    )
+
+    if option.upgrade_xs_len < upgrade_xs_len:
+        print("Error: Insufficient space for the upgrade XS.")
+        return -1
+
+    gen_image(option, ds_header, ds_data, xs_header, cx_data)
 
     return 0
 
@@ -68,9 +108,8 @@ def compress_data(option, data, file_suffix):
     with open(raw_file, mode="wb") as binary:
         binary.write(data)
 
-    subprocess.run(
-        [option.lzss_tool, "e", raw_file, compressed_file, ]
-    ).check_returncode()
+    subprocess.run([option.lzss_tool, "e", raw_file,
+                   compressed_file, ], check=True)
 
     with open(compressed_file, mode="rb") as binary:
         return binary.read()
@@ -84,5 +123,87 @@ def pad_data(data, aligned_size):
     return data
 
 
+def gen_image(option, ds_header, ds_data, xs_header, cx_data):
+
+    configs = parse_config(option)
+
+    write_binary(option, ds_header, ds_data, xs_header, cx_data)
+    run_ota_image_tool(option, configs)
+
+    # Get the header size
+    header_size = 0
+    for line in subprocess.run(
+        [option.ota_image_tool, "show", option.binary.with_suffix(".ota"), ],
+        check=True,
+        capture_output=True,
+        text=True,
+    ).stdout.splitlines():
+        if line.startswith("Header Size:"):
+            header_size = int(line.split(":")[1])
+            break
+
+    if header_size % 4 == 0:
+        return
+
+    # Insert zeroes to align sections to word
+    inserted_zero_count = 4 - header_size % 4
+    write_binary(option, ds_header, ds_data, xs_header,
+                 cx_data, inserted_zero_count)
+    run_ota_image_tool(option, configs)
+
+
+def parse_config(option):
+    configs = {}
+    with open(option.project_config, "r") as config_file:
+        for line in config_file.readlines():
+
+            tokens = line.strip().split()
+            if not tokens or not tokens[0].endswith("define"):
+                continue
+
+            key = tokens[1]
+            value = tokens[2]
+
+            if value.startswith('"'):
+                configs[key] = value.strip('"')
+            else:
+                configs[key] = int(value, 0)
+
+    return configs
+
+
+def write_binary(option, ds_header, ds_data, xs_header, cx_data, inserted_zero_count=0):
+    with open(str(option.binary), mode="wb") as binary:
+        binary.write(bytes(inserted_zero_count))
+        binary.write(ds_header)
+        binary.write(ds_data)
+        binary.write(xs_header)
+        binary.write(cx_data)
+
+
+def run_ota_image_tool(option, configs):
+    subprocess.run(
+        [
+            option.ota_image_tool,
+            "create",
+            "--vendor-id={}".format(
+                configs["CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID"]),
+            "--product-id={}".format(
+                configs["CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID"]),
+            "--version={}".format(
+                configs["CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION"]
+            ),
+            "--version-str={}".format(
+                configs["CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING"]
+            ),
+            "--digest-algorithm=sha256",
+            option.binary,
+            option.binary.with_suffix(".ota"),
+        ],
+        stderr=subprocess.STDOUT,
+        check=True,
+    )
+
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/third_party/cyw30739_sdk/include/ota_fw_upgrade.h b/third_party/cyw30739_sdk/include/ota_fw_upgrade.h
index a6580f83adabfd..422da8230450a2 100644
--- a/third_party/cyw30739_sdk/include/ota_fw_upgrade.h
+++ b/third_party/cyw30739_sdk/include/ota_fw_upgrade.h
@@ -42,7 +42,7 @@ extern "C" {
 
 void wiced_firmware_upgrade_bootloader(void);
 bool wiced_firmware_upgrade_prepare(void);
-uint32_t wiced_firmware_upgrade_process_block(uint32_t offset, uint8_t * data, uint32_t len);
+uint32_t wiced_firmware_upgrade_process_block(uint32_t offset, const uint8_t * data, uint32_t len);
 bool wiced_firmware_upgrade_finalize(void);
 bool wiced_firmware_upgrade_apply(void);
 void wiced_firmware_upgrade_abort(void);
diff --git a/third_party/cyw30739_sdk/merge_hex.py b/third_party/cyw30739_sdk/merge_hex.py
new file mode 100644
index 00000000000000..8cf30eb2a526ad
--- /dev/null
+++ b/third_party/cyw30739_sdk/merge_hex.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""Hex file merger
+
+This is a helper script for merging DS and XS into a single hex file.
+
+"""
+
+import argparse
+import pathlib
+import sys
+
+from intelhex import IntelHex
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--output", required=True, type=pathlib.Path)
+    parser.add_argument("--ds_hex", required=True, type=pathlib.Path)
+    parser.add_argument("--xs_hex", required=True, type=pathlib.Path)
+
+    option = parser.parse_args()
+
+    ds_hex = IntelHex(str(option.ds_hex))
+    xs_hex = IntelHex(str(option.xs_hex))
+    ds_hex.merge(xs_hex)
+    ds_hex.write_hex_file(option.output)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/third_party/cyw30739_sdk/repos/30739A0 b/third_party/cyw30739_sdk/repos/30739A0
index c50b1e77f78d7a..ab7601a74bdffc 160000
--- a/third_party/cyw30739_sdk/repos/30739A0
+++ b/third_party/cyw30739_sdk/repos/30739A0
@@ -1 +1 @@
-Subproject commit c50b1e77f78d7a52f3677bae8cdb58dd1880a9fe
+Subproject commit ab7601a74bdffc7374353c1e19b22388bb3dcedd
diff --git a/third_party/cyw30739_sdk/repos/CYW930739M2EVB-01 b/third_party/cyw30739_sdk/repos/CYW930739M2EVB-01
index 92ec8873d34162..3132c30e1ec305 160000
--- a/third_party/cyw30739_sdk/repos/CYW930739M2EVB-01
+++ b/third_party/cyw30739_sdk/repos/CYW930739M2EVB-01
@@ -1 +1 @@
-Subproject commit 92ec8873d34162c9ce5aab23bb7b0275d8e21806
+Subproject commit 3132c30e1ec305fc53969220e056f5e55532a9b3
diff --git a/third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl b/third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl
new file mode 100644
index 00000000000000..28c3cff862cdd1
--- /dev/null
+++ b/third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl
@@ -0,0 +1,549 @@
+#!/usr/bin/perl
+#
+# Copyright 2016-2021, Cypress Semiconductor Corporation (an Infineon company) or
+# an affiliate of Cypress Semiconductor Corporation.  All rights reserved.
+#
+# This software, including source code, documentation and related
+# materials ("Software") is owned by Cypress Semiconductor Corporation
+# or one of its affiliates ("Cypress") and is protected by and subject to
+# worldwide patent protection (United States and foreign),
+# United States copyright laws and international treaty provisions.
+# Therefore, you may use this Software only as provided in the license
+# agreement accompanying the software package from which you
+# obtained this Software ("EULA").
+# If no EULA applies, Cypress hereby grants you a personal, non-exclusive,
+# non-transferable license to copy, modify, and compile the Software
+# source code solely for use in connection with Cypress's
+# integrated circuit products.  Any reproduction, modification, translation,
+# compilation, or representation of this Software except as specified
+# above is prohibited without the express written permission of Cypress.
+#
+# Disclaimer: THIS SOFTWARE IS PROVIDED AS-IS, WITH NO WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, NONINFRINGEMENT, IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Cypress
+# reserves the right to make changes to the Software without notice. Cypress
+# does not assume any liability arising out of the application or use of the
+# Software or any product or circuit described in the Software. Cypress does
+# not authorize its products for use in any products where a malfunction or
+# failure of the Cypress product may reasonably be expected to result in
+# significant property damage, injury or death ("High Risk Product"). By
+# including Cypress's product in a High Risk Product, the manufacturer
+# of such system or application assumes all risk of such use and in doing
+# so agrees to indemnify Cypress against all liability.
+#
+use READELF;
+# read patch.elf and generate linker directive file
+
+# call with "perl wiced-gen-ld.pl <args> patch.elf out=<*.ld>"
+# the "patch.elf" is parsed to determine where to start the application memory
+# the "out=<*.ld>" file is the output linker script
+# arguments:
+#   SRAM_BEGIN_ADDR=0x123456, SRAM_LENGTH=0x1234: start and length of SRAM section for app code and data
+#   NUM_PATCH_ENTRIES=256: used to calculate reserved space in SRAM for patch entries
+#   ISTATIC_BEGIN=0x123456, ISTATIC_LEN=0x1234: start and length of static section data, typically encrypted keys
+#   PRAM_OBJ=abc.o;def.o;ghi.o: code/rodata for patch ram
+#   XIP_LEN=0x1234, XIP_OBJ=abc.o;def.o;ghi.o: execute in place area for on-chip-flash starting at 0x504000, contains code and rodata from listed object files
+#   UNUSED_BEGIN=0x123456, UNUSED_LEN=0x1234: start and length of an UNUSED section defined to avoid loading anything into
+#   DIRECT_LOAD=1: indicates RAM download rather than FLASH
+#   overlay=overlays.ld: a linker script snippet generated for an overlay section
+
+# ram is extended with PRAM (taking from patch space) or XIP (taking from on-chip-flash, code or rodata only)
+# .dsp_pram_section is for dsp download (libraries/codec_ak4679_lib/akm4679_dsp_*.h)
+
+# look up for memory map and section input/output information
+my $mem_lut = {
+	".app_xip_area" => {
+		"sections" => [
+			"KEEP(*(.xs_header))",
+#    argument XIP_OBJ will add section matches $(XIP_OBJ)(.text.* .gnu.linkonce.t.* .rodata .constdata* .rodata.* .gnu.linkonce.r.* )
+#    special section for Position Independent trampoline functions.
+            "*(.pisec_*)",
+			"KEEP(*(.data_in_xip_area))",
+			"KEEP(*(.dsp_pram_section))",],
+		"mem_type" => "xip_section",
+		"pre" => ["xip_area_begin"],
+		"post" => ["spar_irom_end","xip_area_end"],},
+	".setup" => {
+		"sections" => [
+			"*(.init_code)",
+			"*(.init_text)",
+			"*(.init_data)",
+			"*(.spar_setup)"],
+		"mem_type" => "ram",
+		"pre" => [],
+		"post" => [],},
+	".text" => {
+		"sections" => [
+			"*(.app_init_code)",
+			"*(.emb_text)",
+			"*(.text)",
+			"*(.text_in_ram)",
+			"*(.text.*)",
+            "*(EmHeAacDec)",
+			"*(.gnu.linkonce.t.*)",
+			"*(.glue_7t)",
+			"*(.glue_7)",
+			"*(.vfp11_veneer)",
+			"*(.v4_bx)",
+			"*(.ARM.extab*)",
+			"*(.gnu.linkonce.armextab.*)",
+			"*(.ARM.exidx*)",
+			"*(.gnu.linkonce.armexidx.*)",
+			"*(.vpc_decoder_section)",
+			"PROVIDE_HIDDEN (__init_array_start = .);",
+			"KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))",
+			"KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))",
+			"PROVIDE_HIDDEN (__init_array_end = .);"],
+		"mem_type" => "ram",
+		"pre" => [],
+		"post" => [],},
+	".text.mbedtls" => {
+		"sections" => [
+		    "libmbedtls.*.o(.text.*)",
+		],
+		"mem_type" => "ram",
+		"pre" => [],
+		"post" => [],
+	},
+	".rodata" => {
+		"sections" => [
+			"*(const_drom_var)",
+			"*(.rodata)",
+            "*(.constdata*)",
+			"*(.rodata.*)",
+			"*(.gnu.linkonce.r.*)",
+			"*(.data.rom)"],
+		"mem_type" => "ram",
+		"pre" => [],
+		"post" => ["spar_irom_end"],},
+	".data" => {
+		"sections" => [
+			"*(.data)",
+			"*(.data.*)",
+			"*(.gnu.linkonce.d.*)",
+			"*(.init_patch_table)"],
+		"mem_type" => "ram",
+		"pre" => ["spar_iram_begin", "spar_iram_data_begin"],
+		"post" => ["spar_iram_data_end"],},
+	".bss" => {
+		"sections" => [
+			"*(.bss)",
+			"*(.bss.*)",
+			"*(.gnu.linkonce.b.*)",
+			"*(COMMON)"],
+		"mem_type" => "ram",
+		"pre" => ["spar_iram_bss_begin"],
+		"post" => ["spar_iram_bss_end", "spar_iram_end"],},
+	".unused" => {
+		"sections" => [
+			"*(.code_in_retention_ram)",
+			"*(.data_in_retention_ram)"],
+		"mem_type" => "unused",
+		"pre" => ["unused_iram_begin"],
+		"post" => ["unused_iram_end"],},
+	".aon" => {
+		"sections" => [
+			"*(always_on_ram_var)",
+			"*(.aon_code)",
+			"*(.data_in_retention_ram)",
+			"*(.code_in_retention_ram)"],
+		"mem_type" => "aon",
+		"pre" => ["aon_iram_begin"],
+		"post" => ["aon_iram_end"],},
+	".static_area" => {
+		"sections" => [
+			"KEEP(*(.data_in_static_area))"],
+		"mem_type" => "static_section",
+		"pre" => ["static_area_begin"],
+		"post" => ["static_area_end"],},
+	".pram_rodata" => {
+		"sections" => [
+			"KEEP(*(.dsp_pram_section))"],
+		"mem_type" => "pram",
+		"pre" => [],
+        "post" => ["pram_area_end"],},
+    ".log_section" => {
+        "sections" => [
+            "KEEP(*(log_data))"],
+        "mem_type" => "log_section",
+        "pre" => [],
+		"post" => [],},
+};
+
+my $xip_extra_in = [
+	"PROVIDE_HIDDEN (__init_array_start = .);",
+	"KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))",
+	"KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))",
+	"PROVIDE_HIDDEN (__init_array_end = .);",
+	"*(.app_init_code)",
+	"*(.emb_text)",
+	"*(.text)",
+	"*(EmHeAacDec)",
+	"*(.text.*)",
+	"*(.gnu.linkonce.t.*)",
+	"*(i.*)",
+	"*(.glue_7t)",
+	"*(.glue_7)",
+	"*(.vfp11_veneer)",
+	"*(.v4_bx)",
+	"*(.ARM.extab*)",
+	"*(.gnu.linkonce.armextab.*)",
+	"*(.ARM.exidx*)",
+	"*(.gnu.linkonce.armexidx.*)",
+	"*(const_drom_var)",
+	"*(.rodata)",
+	"*(.constdata*)",
+	"*(.rodata.*)",
+	"*(.gnu.linkonce.r.*)",
+	"*(.data.rom)",
+];
+
+main();
+
+sub main
+{
+	my $param;
+#	print "args: @ARGS\n";
+
+	foreach my $arg (@ARGV) {
+		if($arg =~ /\.elf$/) {
+			$param->{'elf'} = $arg;
+		}
+		if($arg =~ /\.sym$/) {
+			$param->{'sym'} = $arg;
+		}
+		elsif($arg =~ /^ISTATIC_BEGIN=(\w+)/) {
+			$param->{'ISTATIC_BEGIN'} = hex($1);
+		}
+		elsif($arg =~ /^ISTATIC_LEN=(\w+)/) {
+			$param->{'ISTATIC_LEN'} = hex($1);
+		}
+		elsif($arg =~ /^UNUSED_BEGIN=(\w+)/) {
+			$param->{'UNUSED_BEGIN'} = hex($1);
+		}
+		elsif($arg =~ /^UNUSED_LEN=(\w+)/) {
+			$param->{'UNUSED_LEN'} = hex($1);
+		}
+		elsif($arg =~ /^AON_AREA_END=(\w+)/) {
+			$param->{'AON_AREA_END'} = hex($1);
+		}
+		elsif($arg =~ /^SRAM_BEGIN_ADDR=(\w+)/) {
+			$param->{'SRAM_BEGIN_ADDR'} = hex($1);
+		}
+		elsif($arg =~ /^SRAM_LENGTH=(\w+)/) {
+			$param->{'SRAM_LENGTH'} = hex($1);
+		}
+        elsif($arg =~ /^PATCH_RAM_OBJ=(.*)/) {
+            $param->{'PATCH_RAM_OBJ'} = $1;
+            my @patch_ram_obj = split ";", $1;
+            my @patch_ram_o;
+            foreach my $obj (@patch_ram_obj) {
+                $obj =~ s/^\./\*/;
+                $obj .= " (.text.* .gnu.linkonce.t.* .rodata .constdata* .rodata.* .gnu.linkonce.r.*)";
+                push @patch_ram_o, $obj;
+		}
+            unshift @{$mem_lut->{'.pram_rodata'}->{sections}}, @patch_ram_o;
+		}
+		elsif($arg =~ /^NUM_PATCH_ENTRIES=(\d+)/) {
+			$param->{'NUM_PATCH_ENTRIES'} = $1;
+		}
+		elsif($arg =~ /^DIRECT_LOAD=(\d)/) {
+			$param->{'direct_load'} = $1;
+		}
+		elsif($arg =~ /^BTP=(.*)/) {
+			$param->{'btp'} = $1;
+		}
+		elsif($arg =~ /^FLASH0_BEGIN_ADDR=(\w+)/) {
+			$param->{'FLASH0_BEGIN_ADDR'} = hex($1);
+		}
+		elsif($arg =~ /^FLASH0_LENGTH=(\w+)/) {
+			$param->{'FLASH0_LENGTH'} = hex($1);
+		}
+		elsif($arg =~ /^XIP_DS_OFFSET=(\w+)/) {
+			$param->{'XIP_DS_OFFSET'} = hex($1);
+			$param->{'xip'} = 1;
+			push @{$mem_lut->{'.app_xip_area'}->{sections}}, @{$xip_extra_in};
+		}
+		elsif($arg =~ /^XIP_LEN=(\w+)/) {
+			$param->{'XIP_LEN'} = hex($1);
+		}
+		elsif($arg =~ /^XIP_OBJ=(.*)/) {
+			my @xip_obj = split ";", $1;
+			my @xip_o;
+			foreach my $obj (@xip_obj) {
+				$obj =~ s/^\./\*/;
+				$obj .= " (.text.* .gnu.linkonce.t.* .rodata .constdata* .rodata.* .gnu.linkonce.r.*)";
+				push @xip_o, $obj;
+			}
+			unshift @{$mem_lut->{'.app_xip_area'}->{sections}}, @xip_o;
+		}
+		elsif($arg =~ /^APP_DS2_LEN=(\w+)/) {
+			$param->{'APP_DS2_LEN'} = hex($1);
+		}
+		elsif($arg =~ /^DS_LOCATION=(\w+)/) {
+			$param->{'DS_LOCATION'} = hex($1);
+		}
+		elsif($arg =~ /^OTA_UPGRADE_STORE=(\w+)/) {
+			$param->{'OTA_UPGRADE_STORE'} = $1;
+		}
+		elsif($arg =~ /^overlay=(.*)$/) {
+			$param->{'overlay'} = $1;
+			warn "overlay is $1\n";
+		}
+		elsif($arg =~ /^out=(.*)/) {
+			$param->{'outfile'} = $1;
+		}
+	}
+
+	if(defined $param->{btp} && defined $param->{FLASH0_BEGIN_ADDR} && defined $param->{FLASH0_LENGTH}) {
+		open(my $BTP, "<", $param->{btp}) || die "Could not open *.btp file \"$param->{btp}\", $!";
+		while(defined(my $line = <$BTP>)) {
+			if($line =~ /\s*(\w+)\s*\=\s*(0x[0-9a-fA-F]+)/) {
+				$param->{$1} = hex($2);
+			}
+			elsif($line =~ /\s*(\w+)\s*\=\s*([0-9]+)/) {
+				$param->{$1} = int($2);
+			}
+		}
+		close $BTP;
+	}
+	# override ConfigDSLocation if DS_LOCATION provided on command line
+	if(defined $param->{ConfigDSLocation} && defined $param->{DS_LOCATION}) {
+		$param->{ConfigDSLocation} = $param->{DS_LOCATION};
+	}
+
+	my $section_lut = {};
+	if(defined $param->{elf}) {
+	my $sections = [];
+	my $stringtable = {};
+	my $sym_str_tbl = {};
+	my $symbol_entries = [];
+	parse_elf($param->{elf}, $sections, $stringtable, $sym_str_tbl, $symbol_entries, 1);
+
+	#printf "got %d sections\n", scalar(@{$sections});
+	foreach my $section (@{$sections}) {
+		if(!defined $section->{name}) {
+			#print "section name index $section->{sh_name}\n";
+			#printf("%s\n", $stringtable->{$section->{sh_name}}) if defined $section->{sh_name};
+			$section->{name} = $stringtable->{$section->{sh_name}};
+		}
+		$section_lut->{$section->{name}} = $section;
+		#printf "section %s: start 0x%x len 0x%x\n", $section->{name}, $section->{sh_addr}, $section->{sh_size};
+	}
+	}
+	elsif(defined $param->{sym}) {
+		# using sym file, so fake reading section headers from elf
+		open(my $SYM, "<", $param->{sym}) or die "Could not read $param->{sym}, $!\n";
+		while(defined(my $line = <$SYM>)) {
+			if($line =~ /(\w+)\s*=\s*0x([0-9A-Fa-f]+)/) {
+				last if $1 eq "END_SECTION_INFO";
+				$section_lut->{$1} = { sh_addr => hex($2) };
+			}
+		}
+		close $SYM;
+	}
+	$param->{SRAM_START_ADDR} = $section_lut->{first_free_section_in_SRAM}->{sh_addr}
+			if defined $section_lut->{first_free_section_in_SRAM}->{sh_addr};
+	$param->{SRAM_START_ADDR} = $section_lut->{FIRST_FREE_SECTION_IN_SRAM}->{sh_addr}
+			if defined $section_lut->{FIRST_FREE_SECTION_IN_SRAM}->{sh_addr};
+    # for DIRECT_LOAD, add app code after init sections (including SlimBoot)
+	$param->{SRAM_START_ADDR} = $section_lut->{POST_INIT_SECTION_IN_SRAM}->{sh_addr}
+			if defined $section_lut->{POST_INIT_SECTION_IN_SRAM}->{sh_addr} &&
+			   defined $param->{direct_load} && $param->{direct_load};
+    die "Ram start undefined\n" if !defined $param->{SRAM_START_ADDR};
+	output_ld($section_lut, $param);
+}
+
+sub output_ld
+{
+	my ($sections, $param) = @_;
+	my ($ram_start, $ram_begin, $ram_end, $ram_len,
+		$rom_start, $rom_begin, $rom_end, $rom_len,
+		$aon_begin, $aon_end, $aon_len,
+		$xip_start, $xip_len);
+	$rom_start = $sections->{CODE_AREA}->{sh_addr} if defined $sections->{CODE_AREA};
+    die "Could not locate CODE_AREA in patch elf\n" if !defined $rom_start;
+
+	$ram_start = $param->{SRAM_START_ADDR};
+	my $num_patches = $param->{NUM_PATCH_ENTRIES};
+	$num_patches = 256 if !defined $num_patches;
+
+	$ram_begin = $param->{SRAM_BEGIN_ADDR};
+	$ram_end = $ram_begin + $param->{SRAM_LENGTH};
+	die "Could not locate data ram start in patch elf\n" if !defined $ram_begin;
+	die "Could not locate data ram end in patch elf\n" if !defined $ram_end;
+	if (defined $sections->{FIRST_FREE_SECTION_IN_PROM}) {
+		$rom_begin = $sections->{FIRST_FREE_SECTION_IN_PROM}->{sh_addr};
+		$rom_end = $sections->{PATCH_CODE_END}->{sh_addr};
+		die "Could not locate code ram start in patch elf\n" if !defined $rom_begin;
+		die "Could not locate code ram end in patch elf\n" if !defined $rom_end;
+	}
+
+	if(defined $sections->{FIRST_FREE_SECTION_IN_AON}) {
+		$aon_begin = $sections->{FIRST_FREE_SECTION_IN_AON}->{sh_addr};
+		$aon_end = $sections->{AON_AREA_END}->{sh_addr};
+		$aon_end = $param->{AON_AREA_END} if !defined $aon_end;
+		die "Could not locate aon ram start in patch elf\n" if !defined $aon_begin;
+		die "Could not locate aon ram end in patch elf\n" if !defined $aon_end;
+	}
+
+	my $patch_replace_area = $num_patches * 4;
+	$ram_len = $ram_end - $ram_start - $patch_replace_area;
+	$rom_len = $rom_end - $rom_begin if defined $rom_begin;
+	$aon_len = $aon_end - $aon_begin if defined $aon_begin;
+
+#	$(eval LINK_LOC_FLAGS += ISTATIC_BEGIN=$(PLATFORM_APP_SPECIFIC_STATIC_DATA) ISTATIC_LEN=$(PLATFORM_APP_SPECIFIC_STATIC_LEN) IRAM_BEGIN=$(IRAM_BEGIN) IRAM_LEN=$(IRAM_LEN) IROM_BEGIN=$(IROM_BEGIN) IROM_LEN=$(IROM_LEN) IAON_BEGIN=$(IAON_BEGIN) IAON_LEN=$(IAON_LEN) )
+#	$(QUIET)$(XCC) -E -x c -P $(addprefix -D,$(LINK_LOC_FLAGS)) -I $(dir $(ELF_OUT)) -o $@ $<
+	$param->{ISTATIC_BEGIN} = $param->{ISTATIC_BEGIN} if defined $param->{ISTATIC_BEGIN};
+	$param->{ISTATIC_LEN} = $param->{ISTATIC_LEN} if defined $param->{ISTATIC_LEN};
+	$param->{'direct_load'} = 0 if !defined $param->{direct_load};
+
+	open(my $OUT, ">", $param->{outfile}) || die "ERROR: Cannot open $param->{outfile}, $!";
+
+	print $OUT "OUTPUT_FORMAT (\"elf32-littlearm\", \"elf32-bigarm\", \"elf32-littlearm\")\n";
+	print $OUT "SEARCH_DIR(.)\n";
+#	print $OUT "/* @ARGV */\n";
+#	print $OUT "/*\n";
+#	foreach my$key (sort(keys(%{$param}))) {
+#	    print $OUT "$key => $param->{$key}\n";
+#	}
+#	print $OUT "*/\n";
+	if(defined $rom_start) {
+		print $OUT sprintf "/* pram_patch_begin=0x%06X pram_patch_end=0x%06X pram_end=0x%06X */\n", $rom_start, $rom_begin, $rom_end;
+	}
+	print $OUT sprintf "/* ram_patch_begin=0x%06X ram_patch_end=0x%06X ram_end=0x%06X */\n", $sections->{SRAM_AREA}->{sh_addr}, $ram_start, $ram_end;
+	if(defined $aon_len) {
+		print $OUT sprintf "/* aon_patch_begin=0x%06X aon_patch_end=0x%06X aon_end=0x%06X */\n", $sections->{AON_AREA}->{sh_addr}, $aon_begin, $aon_end;
+	}
+    if(defined $aon_len) {
+        print $OUT sprintf "/* app_ram_begin=0x%06X app_ram_end=0x%06X */\n", $ram_start, $ram_start+$ram_len;
+    }
+	if(defined $param->{FLASH0_BEGIN_ADDR} && defined $param->{FLASH0_LENGTH}) {
+		print $OUT sprintf "/* FLASH0_BEGIN_ADDR=0x%06X FLASH0_LENGTH=0x%06X */\n", $param->{FLASH0_BEGIN_ADDR}, $param->{FLASH0_LENGTH};
+	}
+	if(defined $param->{DLConfigSSLocation}) {
+		print $OUT sprintf "/* FLASH0_SS=0x%06X */\n", $param->{DLConfigSSLocation};
+	}
+	if(defined $param->{DLConfigVSLocation}) {
+		print $OUT sprintf "/* FLASH0_VS=0x%06X */\n", $param->{DLConfigVSLocation};
+	}
+	if(defined $param->{ConfigDSLocation}) {
+		print $OUT sprintf "/* FLASH0_DS=0x%06X */\n", $param->{ConfigDSLocation};
+	}
+	if(defined $param->{ConfigDS2Location}) {
+        if(defined $param->{APP_DS2_LEN}) {
+            $param->{ConfigDS2Location} = $param->{FLASH0_BEGIN_ADDR} + $param->{FLASH0_LENGTH} - $param->{APP_DS2_LEN};
+        }
+		print $OUT sprintf "/* FLASH0_DS2=0x%06X */\n", $param->{ConfigDS2Location};
+	}
+    if(defined $param->{ConfigDSLocation}) {
+        my $store = $param->{ConfigDS2Location} - $param->{ConfigDSLocation};
+        $param->{'OTA_UPGRADE_STORE'} = 'off_chip_sflash' if !defined $param->{OTA_UPGRADE_STORE};
+        $store /=2 if $param->{OTA_UPGRADE_STORE} eq 'on_chip_flash';
+        print $OUT sprintf "/* UPGRADE_STORAGE_LENGTH=0x%06X (%s) */\n", $store, $param->{OTA_UPGRADE_STORE};
+    }
+
+	print $OUT "MEMORY\n";
+	print $OUT "{\n";
+	print $OUT sprintf "\tram (rwx) : ORIGIN = 0x%X, LENGTH = 0x%X\n", $ram_start, $ram_len;
+	if(defined $aon_len) {
+		print $OUT sprintf "\taon (rwx) : ORIGIN = 0x%X, LENGTH = 0x%X\n", $aon_begin, $aon_len;
+	}
+	if(defined $param->{UNUSED_LEN}) {
+		print $OUT sprintf "\tunused (rwx) : ORIGIN = 0x%X, LENGTH = %d\n", $param->{UNUSED_BEGIN}, $param->{UNUSED_LEN};
+	}
+	if(defined $param->{ISTATIC_BEGIN}) {
+		print $OUT sprintf "\tstatic_section (r) : ORIGIN = 0x%X, LENGTH = 0x%X\n", $param->{ISTATIC_BEGIN}, $param->{ISTATIC_LEN};
+	}
+	if(defined $param->{xip}) {
+		$xip_start = $param->{ConfigDSLocation} + $param->{XIP_DS_OFFSET};
+		$xip_len = $param->{XIP_LEN};
+		$xip_len = $param->{FLASH0_LENGTH} - ($xip_start - $param->{ConfigDSLocation}) if !defined $xip_len;
+        print $OUT sprintf "\txip_section (rx) : ORIGIN = 0x%X, LENGTH = 0x%X\n", $xip_start, $xip_len;
+	}
+    if(defined $param->{PATCH_RAM_OBJ}) {
+        print $OUT sprintf "\tpram (rwx) : ORIGIN = 0x%X, LENGTH = 0x%X\n", $rom_begin, $rom_end - $rom_begin;
+	}
+    print $OUT sprintf "\tlog_section (r) : ORIGIN = 0x81000004, LENGTH = 0x100000\n";
+	print $OUT "}\n";
+
+	print $OUT "EXTERN(spar_irom_begin spar_irom_end spar_irom_length);\n";
+	print $OUT "EXTERN(spar_iram_begin spar_iram_end spar_iram_length);\n";
+	print $OUT "EXTERN(spar_iram_data_begin spar_iram_data_end spar_iram_data_length);\n";
+	print $OUT "EXTERN(spar_iram_bss_begin spar_iram_bss_end spar_iram_bss_length);\n";
+	print $OUT "EXTERN(spar_irom_data_begin);\n";
+	print $OUT "EXTERN(aon_iram_end);\n" if defined $aon_len;
+	print $OUT "EXTERN(xip_area_begin);\n" if defined $xip_start;
+	print $OUT "EXTERN(xip_area_end);\n" if defined $xip_len;
+
+	print $OUT "PROVIDE(spar_irom_length = spar_irom_end - spar_irom_begin);\n";
+	print $OUT "PROVIDE(spar_iram_length = spar_iram_end - spar_iram_begin);\n";
+	print $OUT "PROVIDE(spar_iram_data_length = spar_iram_data_end - spar_iram_data_begin);\n";
+	print $OUT "PROVIDE(spar_iram_bss_length = spar_iram_bss_end - spar_iram_bss_begin);\n";
+
+	print $OUT "SECTIONS\n";
+	print $OUT "{\n";
+	printf $OUT sprintf "\tspar_irom_begin = 0x%X;\n", $ram_start;
+
+#	print "\t#include \"spar_ram_overlays.ld\"\n";
+	if(defined $param->{overlay}) {
+		open(my $OVER, "<", $param->{overlay}) || die "Could not open overlay *.ld file \"$param->{overlay}\", $!";
+		while(defined(my $line = <$OVER>)) {
+			print $OUT $line;
+		}
+		close $OVER;
+	}
+
+	output_section('.text.mbedtls', $mem_lut, $OUT);
+
+	# if objects are assigned to XIP, match their .text and .rodata
+	output_section('.app_xip_area', $mem_lut, $OUT) if defined $param->{xip};
+
+	# When direct loading, don't overlap init code with dynamic allocation.
+	if($param->{direct_load})
+	{
+		output_section('.setup', $mem_lut, $OUT);
+	}
+    output_section('.pram_rodata', $mem_lut, $OUT) if defined $param->{PATCH_RAM_OBJ};
+    output_section('.text', $mem_lut, $OUT);
+    output_section('.rodata', $mem_lut, $OUT);
+	output_section('.data', $mem_lut, $OUT);
+
+	# Nothing to load because it is loaded from EEPROM/SF at boot.
+	print $OUT "\tspar_irom_data_begin = spar_iram_data_begin;\n";
+	output_section('.bss', $mem_lut, $OUT);
+
+    if(!$param->{direct_load}) {
+		# Place the setup area after bss so that when dynamic allocation occurs
+		# after spar setup, it will reclaim the RAM taken up by the setup function.
+		output_section('.setup', $mem_lut, $OUT);
+	}
+	output_section('.aon', $mem_lut, $OUT) if defined $aon_len;
+	output_section('.static_area', $mem_lut, $OUT) if defined $param->{ISTATIC_BEGIN};
+    output_section('.log_section', $mem_lut, $OUT);
+	print $OUT "}\n";
+}
+
+sub output_section
+{
+	my ($name, $lut, $fh, $pre, $post) = @_;
+	my $info = $lut->{$name};
+	die "Could not find ld table entry for $name\n" if !defined $info;
+
+	my $align = "ALIGN (4)";
+	$align = "" if $name eq '.text';
+
+	print $fh "\t$name : $align\n\t{\n";
+	print $fh "\t\tCREATE_OBJECT_SYMBOLS\n";
+	foreach my $sym (@{$info->{pre}}) {
+		print $fh "\t\t$sym = .;\n";
+	}
+	foreach my $sect (@{$info->{sections}}) {
+		print $fh "\t\t$sect\n";
+	}
+	foreach my $sym (@{$info->{post}}) {
+		print $fh "\t\t$sym = .;\n";
+	}
+	print $fh "\t} >$info->{mem_type}\n";
+#	print "\n";
+}
diff --git a/third_party/cyw30739_sdk/src/ota_fw_upgrade.c b/third_party/cyw30739_sdk/src/ota_fw_upgrade.c
index 3ed38600459895..a741a1ac42dc40 100644
--- a/third_party/cyw30739_sdk/src/ota_fw_upgrade.c
+++ b/third_party/cyw30739_sdk/src/ota_fw_upgrade.c
@@ -222,8 +222,7 @@ typedef struct upgrade_xs
 
 extern const CONFIG_INFO_t g_config_Info;
 
-static uint32_t upgrade_location_write(uint32_t offset, uint8_t * data, uint32_t len);
-static bool upgrade_location_erase(uint32_t offset, uint8_t * data);
+static uint32_t upgrade_location_write(uint32_t offset, const uint8_t * data, uint32_t len);
 static bool lzss_decompress(const void * src, size_t n, bool (*data_writer)(uint32_t, int))
     __attribute__((section(".text_in_ram")));
 static bool xs_data_writer(uint32_t data_offset, int c) __attribute__((section(".text_in_ram")));
@@ -274,21 +273,36 @@ __attribute__((section(".init_code"))) void wiced_firmware_upgrade_bootloader(vo
 
 bool wiced_firmware_upgrade_prepare(void)
 {
-    const uint32_t ds1_location = g_config_Info.layout.failsafe_ds_base;
-    const uint32_t ds1_length   = g_config_Info.layout.upgradable_ds_base - g_config_Info.layout.failsafe_ds_base;
-    const uint32_t ds2_location = g_config_Info.layout.upgradable_ds_base;
-    const uint32_t ds2_length   = XS_LOCATION_ACTIVE - g_config_Info.layout.upgradable_ds_base;
-
-    printf("DS1: 0x%08lx, len: 0x%08lx\n", ds1_location, ds1_length);
-    printf("DS2: 0x%08lx, len: 0x%08lx\n", ds2_location, ds2_length);
-    printf("Active  DS: 0x%08x\n", g_config_Info.active_ds_base);
-    printf("Active  XS: 0x%08x\n", XS_LOCATION_ACTIVE);
-    printf("Upgrade XS: 0x%08x\n", XS_LOCATION_UPGRADE);
-
-    return upgrade_ds_location() != 0;
+    const uint32_t ds1_length = g_config_Info.layout.upgradable_ds_base - g_config_Info.layout.failsafe_ds_base;
+    const uint32_t ds2_length = XS_LOCATION_ACTIVE - g_config_Info.layout.upgradable_ds_base;
+
+    printf("Active DS: 0x%08x\n", g_config_Info.active_ds_base);
+    printf("Active XS: 0x%08x\n", XS_LOCATION_ACTIVE);
+
+    if (upgrade_ds_location() == 0 || ds1_length != ds2_length)
+    {
+        return false;
+    }
+
+    printf("Erasing Upgrade DS: 0x%08lx, len: 0x%08lx\n", upgrade_ds_location(), ds1_length);
+    if (WICED_SUCCESS != wiced_hal_eflash_erase(ef_offset(upgrade_ds_location()), ds1_length))
+    {
+        printf("ERROR erase\n");
+        return false;
+    }
+
+    const uint32_t upgrade_xs_length = FLASH_SIZE - ef_offset(XS_LOCATION_UPGRADE);
+    printf("Erasing Upgrade XS: 0x%08x, len: 0x%08lx\n", XS_LOCATION_UPGRADE, upgrade_xs_length);
+    if (WICED_SUCCESS != wiced_hal_eflash_erase(ef_offset(XS_LOCATION_UPGRADE), upgrade_xs_length))
+    {
+        printf("ERROR erase\n");
+        return false;
+    }
+
+    return true;
 }
 
-uint32_t wiced_firmware_upgrade_process_block(uint32_t offset, uint8_t * data, uint32_t len)
+uint32_t wiced_firmware_upgrade_process_block(uint32_t offset, const uint8_t * data, uint32_t len)
 {
     const ds_header_t * ds_header = (const ds_header_t *) upgrade_ds_location();
 
@@ -337,44 +351,8 @@ uint32_t wiced_firmware_upgrade_process_block(uint32_t offset, uint8_t * data, u
     return byte_written;
 }
 
-bool upgrade_location_erase(uint32_t offset, uint8_t * data)
+uint32_t upgrade_location_write(uint32_t offset, const uint8_t * data, uint32_t len)
 {
-    uint32_t erase_length;
-    if (offset == upgrade_ds_location())
-    {
-        const ds_header_t * ds_header = (const ds_header_t *) data;
-        erase_length                  = sizeof(*ds_header) + ds_header->length;
-    }
-    else if (offset == XS_LOCATION_UPGRADE)
-    {
-        const upgrade_xs_t * upgrade_xs = (const upgrade_xs_t *) data;
-        erase_length                    = sizeof(*upgrade_xs) + upgrade_xs->compressed_data_length;
-    }
-    else
-    {
-        return true;
-    }
-
-    if (erase_length != 0)
-    {
-        printf("Erasing 0x%08lx, len: %lu\n", offset, erase_length);
-        if (WICED_SUCCESS != wiced_hal_eflash_erase(ef_offset(offset), erase_length))
-        {
-            printf("ERROR erase\n");
-            return false;
-        }
-    }
-
-    return true;
-}
-
-uint32_t upgrade_location_write(uint32_t offset, uint8_t * data, uint32_t len)
-{
-    if (!upgrade_location_erase(offset, data))
-    {
-        return 0;
-    }
-
     // reserve first 4 bytes of download to commit when complete, in case of unexpected power loss
     // boot rom checks this signature to validate DS
     uint32_t offset_adjustment;
@@ -392,7 +370,7 @@ uint32_t upgrade_location_write(uint32_t offset, uint8_t * data, uint32_t len)
 
     printf("write: offset: 0x%08lx len: %lu\n", offset, len);
     /* write length should in words */
-    if (wiced_hal_eflash_write(ef_offset(offset), data, (len + 3) & 0xfffffffc) == WICED_SUCCESS)
+    if (wiced_hal_eflash_write(ef_offset(offset), (uint8_t *) data, (len + 3) & 0xfffffffc) == WICED_SUCCESS)
     {
         return len + offset_adjustment;
     }
@@ -564,7 +542,7 @@ uint32_t calc_crc32(const uint8_t * buf, uint32_t len)
 
 uint32_t ef_offset(uint32_t offset)
 {
-    return offset - 0x00500000u;
+    return offset - FLASH_BASE_ADDRESS;
 }
 
 uint32_t upgrade_ds_location(void)
diff --git a/third_party/efr32_sdk/repo b/third_party/efr32_sdk/repo
index cf743ca3cca307..c48b8de1bed36c 160000
--- a/third_party/efr32_sdk/repo
+++ b/third_party/efr32_sdk/repo
@@ -1 +1 @@
-Subproject commit cf743ca3cca307ddb209c45f62aed7dc5d8ce06d
+Subproject commit c48b8de1bed36cc57dd8caba94ecda8a7352524c
diff --git a/third_party/mbedtls/mbedtls.gni b/third_party/mbedtls/mbedtls.gni
index 0b3dddc891884d..1e146ab1621a11 100644
--- a/third_party/mbedtls/mbedtls.gni
+++ b/third_party/mbedtls/mbedtls.gni
@@ -17,7 +17,7 @@ import("//build_overrides/mbedtls.gni")
 template("mbedtls_target") {
   mbedtls_target_name = target_name
 
-  _mbedtls_root = "${mbedtls_root}/repo"
+  _mbedtls_root = "${mbedtls_repo}/repo"
 
   config("${mbedtls_target_name}_warnings") {
     cflags = [
diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
index bdd6905a5cb44f..7e163d796c7a8d 160000
--- a/third_party/mbedtls/repo
+++ b/third_party/mbedtls/repo
@@ -1 +1 @@
-Subproject commit bdd6905a5cb44fce66af373b3faa80f23002afc4
+Subproject commit 7e163d796c7a8d3dd1a48884fb48ee4398da3137
diff --git a/third_party/nxp/k32w0_sdk/BUILD.gn b/third_party/nxp/k32w0_sdk/BUILD.gn
index 2019a2c2a55f36..f2307bafa95ca4 100644
--- a/third_party/nxp/k32w0_sdk/BUILD.gn
+++ b/third_party/nxp/k32w0_sdk/BUILD.gn
@@ -53,7 +53,18 @@ config("mbedtls_k32w0_config") {
     ]
   }
 
+  if (mbedtls_use_tinycrypt) {
+    defines += [
+      "MBEDTLS_USE_TINYCRYPT",
+      "MBEDTLS_OPTIMIZE_TINYCRYPT_ASM",
+    ]
+  }
+
   include_dirs = [ chip_root ]
+
+  if (mbedtls_use_tinycrypt) {
+    include_dirs += [ "${mbedtls_repo}/repo/include/tinycrypt" ]
+  }
 }
 
 mbedtls_target("mbedtls") {
@@ -62,6 +73,14 @@ mbedtls_target("mbedtls") {
     "${k32w0_sdk_root}/middleware/mbedtls/port/ksdk/ksdk_mbedtls.c",
   ]
 
+  if (mbedtls_use_tinycrypt) {
+    sources += [
+      "${mbedtls_repo}/repo/tinycrypt/ecc.c",
+      "${mbedtls_repo}/repo/tinycrypt/ecc_dh.c",
+      "${mbedtls_repo}/repo/tinycrypt/ecc_dsa.c",
+    ]
+  }
+
   public_configs = [ ":mbedtls_k32w0_config" ]
 
   public_deps = [
diff --git a/third_party/nxp/k32w0_sdk/k32w0_sdk.gni b/third_party/nxp/k32w0_sdk/k32w0_sdk.gni
index b9a9889e1f4a40..a0aa55ada6b4be 100644
--- a/third_party/nxp/k32w0_sdk/k32w0_sdk.gni
+++ b/third_party/nxp/k32w0_sdk/k32w0_sdk.gni
@@ -29,6 +29,7 @@ declare_args() {
   chip_with_OM15082 = 0
   chip_with_ot_cli = 0
   chip_with_low_power = 0
+  mbedtls_use_tinycrypt = false
 }
 
 assert(k32w0_sdk_root != "", "k32w0_sdk_root must be specified")
@@ -158,7 +159,7 @@ template("k32w0_sdk") {
       "USE_SDK_OSA=0",
       "gSerialManagerMaxInterfaces_c=2",
       "FSL_RTOS_FREE_RTOS=1",
-      "gTotalHeapSize_c=0xDC00",
+      "gTotalHeapSize_c=0xB000",
       "gUartDebugConsole_d=1",
       "DEBUG_SERIAL_INTERFACE_INSTANCE=0",
       "APP_SERIAL_INTERFACE_INSTANCE=1",
@@ -187,6 +188,9 @@ template("k32w0_sdk") {
       "gSupportBle=1",
       "SUPPORT_FOR_BLE=1",
       "gEnableBleInactivityTimeNotify=1",
+      "gConnPhyUpdateReqTxPhySettings_c=(gLePhy2MFlag_c)",
+      "gConnPhyUpdateReqRxPhySettings_c=(gLePhy2MFlag_c)",
+      "gConnPhyUpdateReqPhyOptions_c=(gLeCodingNoPreference_c)",
       "DUAL_MODE_APP=1",
       "gMainThreadStackSize_c=5096",
       "HEAP_SIZE=gTotalHeapSize_c",
@@ -272,6 +276,7 @@ template("k32w0_sdk") {
       "-Wno-sign-compare",
       "-Wno-clobbered",
       "-Wno-implicit-fallthrough",
+      "-Wno-shadow",
       "-mthumb",
       "-MMD",
       "-MP",
diff --git a/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh b/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh
index 49a18592d4a5a2..6566feb72700bc 100755
--- a/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh
+++ b/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh
@@ -40,10 +40,29 @@ patch -N --binary -d "$NXP_K32W061_SDK_ROOT"/middleware/wireless/framework/Flash
 convert_to_dos "$NXP_K32W061_SDK_ROOT"/middleware/wireless/framework/MemManager/Interface/MemManager.h
 patch -N --binary -d "$NXP_K32W061_SDK_ROOT"/middleware/wireless/framework/MemManager/Interface -p1 <"$SOURCE_DIR/MemManager_h.patch"
 
+#internal: THREADIP-3660
+patch -N --binary -d ./third_party/openthread/ot-nxp/src/k32w0/platform -p1 <"$SOURCE_DIR/settings_k32w_c.patch"
+
 SIGN_FILE_PATH="$NXP_K32W061_SDK_ROOT"/tools/imagetool/sign_images.sh
 convert_to_dos "$SIGN_FILE_PATH"
 patch -N --binary -d "$NXP_K32W061_SDK_ROOT"/tools/imagetool/ -p1 <"$SOURCE_DIR/sign_images_sh.patch"
 sed -i 's/\r$//' "$SIGN_FILE_PATH"
 
+echo "Downloading PDM and BLE libraries from NXP server..."
+
+rm -rf patch_for_K32W061_SDK_2_6_4.zip patch_for_K32W061_SDK_2_6_4
+wget https://www.nxp.com/downloads/en/libraries/patch_for_K32W061_SDK_2_6_4.zip
+exitCode=$?
+if [ "$exitCode" -ne 0 ]; then
+    echo "Download error"
+    exit
+fi
+
+unzip patch_for_K32W061_SDK_2_6_4.zip
+cp patch_for_K32W061_SDK_2_6_4/controller_config.c "$NXP_K32W061_SDK_ROOT"/middleware/wireless/ble_controller/config/
+cp patch_for_K32W061_SDK_2_6_4/controller_interface.h "$NXP_K32W061_SDK_ROOT"/middleware/wireless/ble_controller/interface/
+cp patch_for_K32W061_SDK_2_6_4/lib_ble_controller.a "$NXP_K32W061_SDK_ROOT"/middleware/wireless/ble_controller/lib/
+cp patch_for_K32W061_SDK_2_6_4/libPDM_extFlash.a "$NXP_K32W061_SDK_ROOT"/middleware/wireless/framework/PDM/Library/
+
 echo "K32W SDK MR3 QP1 was patched!"
 exit 0
diff --git a/third_party/nxp/k32w0_sdk/sdk_fixes/settings_k32w_c.patch b/third_party/nxp/k32w0_sdk/sdk_fixes/settings_k32w_c.patch
new file mode 100644
index 00000000000000..08571a4d66b795
--- /dev/null
+++ b/third_party/nxp/k32w0_sdk/sdk_fixes/settings_k32w_c.patch
@@ -0,0 +1,11 @@
+--- a/settings_k32w.c
++++ b/settings_k32w.c
+@@ -52,7 +52,7 @@
+ #define NVM_START_ID 0x4F00
+ 
+ /* WARNING - the defines below must be in sync with OT NVM datasets from Settings.hpp */
+-#define NVM_MAX_ID 7
++#define NVM_MAX_ID 20
+ 
+ static uint8_t sPdmBuffer[pdmBufferSize] __attribute__((aligned(4))) = {0};
+ 
diff --git a/third_party/nxp/libs/mbedtls/repo b/third_party/nxp/libs/mbedtls/repo
new file mode 160000
index 00000000000000..62e0eb9f5ae044
--- /dev/null
+++ b/third_party/nxp/libs/mbedtls/repo
@@ -0,0 +1 @@
+Subproject commit 62e0eb9f5ae0448d03a420b5f5c76c1311b31b30
diff --git a/third_party/openthread/ot-ifx b/third_party/openthread/ot-ifx
index fd4355aa7e61ab..e80949a96db29c 160000
--- a/third_party/openthread/ot-ifx
+++ b/third_party/openthread/ot-ifx
@@ -1 +1 @@
-Subproject commit fd4355aa7e61ab750036a604262ffd71cd3ce36d
+Subproject commit e80949a96db29c6229cb78de650d120257284db7
diff --git a/third_party/openthread/platforms/ifx/BUILD.gn b/third_party/openthread/platforms/ifx/BUILD.gn
index ce9f1e1b89fab2..fefabcd3562fef 100644
--- a/third_party/openthread/platforms/ifx/BUILD.gn
+++ b/third_party/openthread/platforms/ifx/BUILD.gn
@@ -20,7 +20,10 @@ openthread_ifx_root = "${chip_root}/third_party/openthread/ot-ifx"
 openthread_ifx_mcu = "cyw30739"
 
 config("openthread_ifx_config") {
-  include_dirs = [ "${openthread_ifx_root}/src/${openthread_ifx_mcu}" ]
+  include_dirs = [
+    "${openthread_ifx_root}/src/${openthread_ifx_mcu}",
+    "${openthread_ifx_root}/src/${openthread_ifx_mcu}/mbedtls/include",
+  ]
 }
 
 source_set("openthread_core_config_ifx") {
@@ -38,6 +41,7 @@ source_set("libopenthread-ifx") {
     "${openthread_ifx_root}/src/${openthread_ifx_mcu}/logging.c",
     "${openthread_ifx_root}/src/${openthread_ifx_mcu}/misc.c",
     "${openthread_ifx_root}/src/${openthread_ifx_mcu}/radio.c",
+    "${openthread_ifx_root}/src/${openthread_ifx_mcu}/radio_wrapper.cpp",
     "${openthread_ifx_root}/src/${openthread_ifx_mcu}/settings.c",
     "${openthread_ifx_root}/src/${openthread_ifx_mcu}/system.c",
   ]
diff --git a/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn b/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn
index 913daa683c61ec..b942608b82ac9b 100644
--- a/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn
+++ b/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn
@@ -38,8 +38,8 @@ config("openthread_k32w0_config") {
 
 source_set("openthread_core_config_k32w0") {
   sources = [
+    "${chip_root}/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h",
     "${openthread_nxp_root}/src/k32w0/k32w061/openthread-core-k32w061-config-check.h",
-    "${openthread_nxp_root}/src/k32w0/k32w061/openthread-core-k32w061-config.h",
   ]
 
   public_configs = [ ":openthread_k32w0_config" ]
diff --git a/third_party/p6/BUILD.gn b/third_party/p6/BUILD.gn
index a4c3b8a264c883..dd79b07d9af0cc 100644
--- a/third_party/p6/BUILD.gn
+++ b/third_party/p6/BUILD.gn
@@ -24,9 +24,6 @@ assert(p6_target_project != "", "p6_target_project must be specified")
 
 # Add includes, cflags, asmflags, etc in config
 config("p6_sdk_config") {
-  # This is ugly but I'm unsure of any other way to forward (non-global) vars from the ota examples BUILD.gn file to this config object
-  ota_app = p6_target_project == "//:ota_requestor_app_sdk_sources"
-
   # Pull out includes from generated json
   # Treat these includes as system includes, so warnings in them are not fatal.
   _include_dirs = []
@@ -66,7 +63,7 @@ config("p6_sdk_config") {
 
   # Pull out linker flags with paths (-T flags) and make paths absolute
   # OTA app provides it's own linker script
-  if (!ota_app) {
+  if (!chip_enable_ota_requestor) {
     linker_script_flags = filter_include(mtb_json.ldflags, [ "-T*" ])
     foreach(flag, linker_script_flags) {
       ldflags += [ "-T/" + rebase_path(string_replace(flag, "-T", "", 1),
diff --git a/third_party/p6/p6_sdk.gni b/third_party/p6/p6_sdk.gni
index 2f8b8dc2afac2c..bb66435dd0e454 100644
--- a/third_party/p6/p6_sdk.gni
+++ b/third_party/p6/p6_sdk.gni
@@ -15,8 +15,8 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/jlink.gni")
 import("//build_overrides/mbedtls.gni")
-
 import("//build_overrides/p6.gni")
+import("${chip_root}/src/platform/device.gni")
 import("p6_board.gni")
 
 # TODO: Don't hardcode config/toolchain
@@ -41,6 +41,12 @@ template("p6_sdk_sources") {
     p6_project_dir = invoker.p6_project_dir
   }
 
+  if (defined(invoker.chip_enable_ota_requestor)) {
+    if (invoker.chip_enable_ota_requestor) {
+      chip_enable_ota_requestor = true
+    }
+  }
+
   # While most p6 sdk includes come from the p6_sdk_config config (in
   # BUILD.gn), this template gets instantiated by each project each of which
   # provides a few extra includes/defines. Handle those here.
@@ -68,7 +74,7 @@ template("p6_sdk_sources") {
 
     # This is ugly. See note in BUILD.gn for reasoning
     mtb_json_local = mtb_json  # Can't modify without copying into current scope
-    if (target_name == "ota_requestor_app_sdk_sources") {
+    if (chip_enable_ota_requestor == true) {
       mtb_json_local.c_source -= [
         "./libs/psoc6cm0p/COMPONENT_CM0P_SLEEP/psoc6_01_cm0p_sleep.c",
         "./libs/psoc6cm0p/COMPONENT_CM0P_SLEEP/psoc6_02_cm0p_sleep.c",
diff --git a/examples/ota-requestor-app/p6/config/mcuboot_config/mcuboot_assert.h b/third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_assert.h
similarity index 100%
rename from examples/ota-requestor-app/p6/config/mcuboot_config/mcuboot_assert.h
rename to third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_assert.h
diff --git a/examples/ota-requestor-app/p6/config/mcuboot_config/mcuboot_config.h b/third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_config.h
similarity index 100%
rename from examples/ota-requestor-app/p6/config/mcuboot_config/mcuboot_config.h
rename to third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_config.h
diff --git a/examples/ota-requestor-app/p6/config/mcuboot_config/mcuboot_logging.h b/third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_logging.h
similarity index 100%
rename from examples/ota-requestor-app/p6/config/mcuboot_config/mcuboot_logging.h
rename to third_party/p6/p6_sdk/ota/config/mcuboot_config/mcuboot_logging.h
diff --git a/examples/ota-requestor-app/p6/config/mcuboot_crypto_acc_config.h b/third_party/p6/p6_sdk/ota/config/mcuboot_crypto_acc_config.h
similarity index 100%
rename from examples/ota-requestor-app/p6/config/mcuboot_crypto_acc_config.h
rename to third_party/p6/p6_sdk/ota/config/mcuboot_crypto_acc_config.h
diff --git a/examples/ota-requestor-app/p6/config/mcuboot_crypto_config.h b/third_party/p6/p6_sdk/ota/config/mcuboot_crypto_config.h
similarity index 100%
rename from examples/ota-requestor-app/p6/config/mcuboot_crypto_config.h
rename to third_party/p6/p6_sdk/ota/config/mcuboot_crypto_config.h
diff --git a/examples/ota-requestor-app/p6/src/cy8c6xxa_cm4_dual_ota_int.ld b/third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld
similarity index 100%
rename from examples/ota-requestor-app/p6/src/cy8c6xxa_cm4_dual_ota_int.ld
rename to third_party/p6/p6_sdk/ota/cy8c6xxa_cm4_dual_ota_int.ld
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 2e14574efe7d02..834e876dab7a17 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 2e14574efe7d022966fc971151f0dfbbd81c85dc
+Subproject commit 834e876dab7a1785a824efbb704d7d139f6ce62d
diff --git a/third_party/tizen/tizen_sdk.gni b/third_party/tizen/tizen_sdk.gni
index dc17cf701fc762..05484aed50be3c 100644
--- a/third_party/tizen/tizen_sdk.gni
+++ b/third_party/tizen/tizen_sdk.gni
@@ -63,7 +63,7 @@ template("tizen_sdk_package") {
   # Output directory where packaging will occur. We need a separate directory
   # for this, because Tizen Studio CLI scans "res" (resources), "shared" and
   # "lib" directories for items to pack. In our case it could include in the
-  # TPK package libraries available in ${root_build_dir}/lib directory.
+  # TPK package libraries available in ${root_out_dir}/lib directory.
   tizen_package_dir = "${root_build_dir}/package"
   tizen_package_out_dir = "${tizen_package_dir}/out"
 
@@ -94,7 +94,7 @@ template("tizen_sdk_package") {
   if (manifest_apps["service"] != "") {
     dependencies += [ ":${target_name}:app:service" ]
     copy("${target_name}:app:service") {
-      sources = [ root_build_dir + "/" + manifest_apps["service"] ]
+      sources = [ root_out_dir + "/" + manifest_apps["service"] ]
       outputs = [ "${tizen_package_out_dir}/{{source_file_part}}" ]
       deps = invoker.deps
     }
diff --git a/third_party/zap/repo b/third_party/zap/repo
index 6594a9257ce96e..ca9cbecbc36228 160000
--- a/third_party/zap/repo
+++ b/third_party/zap/repo
@@ -1 +1 @@
-Subproject commit 6594a9257ce96ee6d852eed052939849b31259fc
+Subproject commit ca9cbecbc36228db65349864a77402075c39d9d2
diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
index c9ab49649e15d2..9f7a13348a8157 100644
--- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
@@ -629,6 +629,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace GroupKeyManagement {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -775,7 +812,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace Groups
 
-namespace IasZone {
+namespace Identify {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
 {
@@ -784,12 +821,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     {
         switch (aCommandPath.mCommandId)
         {
-        case Commands::ZoneEnrollResponse::Id: {
-            Commands::ZoneEnrollResponse::DecodableType commandData;
+        case Commands::Identify::Id: {
+            Commands::Identify::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfIdentifyClusterIdentifyCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TriggerEffect::Id: {
+            Commands::TriggerEffect::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfIdentifyClusterTriggerEffectCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
@@ -810,9 +856,9 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     }
 }
 
-} // namespace IasZone
+} // namespace Identify
 
-namespace Identify {
+namespace KeypadInput {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
 {
@@ -821,21 +867,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     {
         switch (aCommandPath.mCommandId)
         {
-        case Commands::Identify::Id: {
-            Commands::Identify::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfIdentifyClusterIdentifyCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::TriggerEffect::Id: {
-            Commands::TriggerEffect::DecodableType commandData;
+        case Commands::SendKey::Id: {
+            Commands::SendKey::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfIdentifyClusterTriggerEffectCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfKeypadInputClusterSendKeyCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
@@ -856,7 +893,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     }
 }
 
-} // namespace Identify
+} // namespace KeypadInput
 
 namespace LevelControl {
 
@@ -995,6 +1032,70 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace LowPower
 
+namespace MediaInput {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::SelectInput::Id: {
+            Commands::SelectInput::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterSelectInputCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ShowInputStatus::Id: {
+            Commands::ShowInputStatus::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterShowInputStatusCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::HideInputStatus::Id: {
+            Commands::HideInputStatus::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterHideInputStatusCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RenameInput::Id: {
+            Commands::RenameInput::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterRenameInputCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace MediaInput
+
 namespace ModeSelect {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1320,16 +1421,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -1477,6 +1568,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace SoftwareDiagnostics
 
+namespace TargetNavigator {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::NavigateTarget::Id: {
+            Commands::NavigateTarget::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTargetNavigatorClusterNavigateTargetCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace TargetNavigator
+
 namespace TestCluster {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1673,6 +1801,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace TestCluster
 
+namespace Thermostat {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::SetpointRaiseLower::Id: {
+            Commands::SetpointRaiseLower::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfThermostatClusterSetpointRaiseLowerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Thermostat
+
 namespace ThreadNetworkDiagnostics {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1867,24 +2032,30 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GroupKeyManagement::Id:
         Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
     case Clusters::Groups::Id:
         Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::IasZone::Id:
-        Clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::Identify::Id:
         Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::KeypadInput::Id:
+        Clusters::KeypadInput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::LevelControl::Id:
         Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
     case Clusters::LowPower::Id:
         Clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::MediaInput::Id:
+        Clusters::MediaInput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::ModeSelect::Id:
         Clusters::ModeSelect::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
@@ -1906,9 +2077,15 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::SoftwareDiagnostics::Id:
         Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::TargetNavigator::Id:
+        Clusters::TargetNavigator::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::TestCluster::Id:
         Clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::Thermostat::Id:
+        Clusters::Thermostat::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::ThreadNetworkDiagnostics::Id:
         Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
index 685fedf234d2bd..deda63ad5884a3 100644
--- a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
@@ -49,7 +49,6 @@
     MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIasZonePluginServerInitCallback();                                                                                       \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
     MatterKeypadInputPluginServerInitCallback();                                                                                   \
diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h
index a34b98bc39e255..3852ec7430be5e 100644
--- a/zzz_generated/all-clusters-app/zap-generated/access.h
+++ b/zzz_generated/all-clusters-app/zap-generated/access.h
@@ -425,7 +425,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -475,7 +474,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -525,7 +523,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
diff --git a/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h b/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h
index e1329ebde25892..4202d3998ecfb6 100644
--- a/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h
+++ b/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h
@@ -43,11 +43,8 @@
 #define EMBER_AF_GENERATED_EVENT_CODE                                                                                              \
     EmberEventControl emberAfLevelControlClusterServerTickCallbackControl1;                                                        \
     EmberEventControl emberAfBarrierControlClusterServerTickCallbackControl1;                                                      \
-    EmberEventControl emberAfIasZoneClusterServerTickCallbackControl1;                                                             \
-    extern EmberEventControl emberAfPluginIasZoneServerManageQueueEventControl;                                                    \
     extern void emberAfPluginDoorLockServerLockoutEventHandler(void);                                                              \
     extern void emberAfPluginDoorLockServerRelockEventHandler(void);                                                               \
-    extern void emberAfPluginIasZoneServerManageQueueEventHandler(void);                                                           \
     static void clusterTickWrapper(EmberEventControl * control, EmberAfTickFunction callback, chip::EndpointId endpoint)           \
     {                                                                                                                              \
         /* emberAfPushEndpointNetworkIndex(endpoint); */                                                                           \
@@ -65,33 +62,24 @@
         clusterTickWrapper(&emberAfBarrierControlClusterServerTickCallbackControl1,                                                \
                            emberAfBarrierControlClusterServerTickCallback, 1);                                                     \
     }                                                                                                                              \
-    void emberAfIasZoneClusterServerTickCallbackWrapperFunction1(void)                                                             \
-    {                                                                                                                              \
-        clusterTickWrapper(&emberAfIasZoneClusterServerTickCallbackControl1, emberAfIasZoneClusterServerTickCallback, 1);          \
-    }                                                                                                                              \
     /*to finish*/
 
 // EmberEventData structs used to populate the EmberEventData table
 #define EMBER_AF_GENERATED_EVENTS                                                                                                  \
     { &emberAfLevelControlClusterServerTickCallbackControl1, emberAfLevelControlClusterServerTickCallbackWrapperFunction1 },       \
         { &emberAfBarrierControlClusterServerTickCallbackControl1,                                                                 \
-          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },                                                        \
-        { &emberAfIasZoneClusterServerTickCallbackControl1, emberAfIasZoneClusterServerTickCallbackWrapperFunction1 },             \
-        { &emberAfPluginIasZoneServerManageQueueEventControl, emberAfPluginIasZoneServerManageQueueEventHandler },
+          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
 
 #define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
-    "Level Control Cluster Server EP 1", "Barrier Control Cluster Server EP 1", "IAS Zone Cluster Server EP 1",                    \
-        "Door Lock Server Cluster Plugin Lockout", "Door Lock Server Cluster Plugin Relock", "IAS Zone Server Plugin ManageQueue",
+    "Level Control Cluster Server EP 1", "Barrier Control Cluster Server EP 1", "Door Lock Server Cluster Plugin Lockout",         \
+        "Door Lock Server Cluster Plugin Relock",
 
 // The length of the event context table used to track and retrieve cluster events
-#define EMBER_AF_EVENT_CONTEXT_LENGTH 3
+#define EMBER_AF_EVENT_CONTEXT_LENGTH 2
 
 // EmberAfEventContext structs used to populate the EmberAfEventContext table
 #define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
     { 0x1, 0x8, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfLevelControlClusterServerTickCallbackControl1 },          \
-        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },  \
-    {                                                                                                                              \
-        0x1, 0x500, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfIasZoneClusterServerTickCallbackControl1              \
-    }
+        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
 
 #endif // __AF_GEN_EVENT__
diff --git a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
index d14cac9e3e37cf..dea4049e28b3cf 100644
--- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
@@ -110,9 +110,6 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_GROUPS_CLUSTER_ID:
         emberAfGroupsClusterInitCallback(endpoint);
         break;
-    case ZCL_IAS_ZONE_CLUSTER_ID:
-        emberAfIasZoneClusterInitCallback(endpoint);
-        break;
     case ZCL_IDENTIFY_CLUSTER_ID:
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
@@ -362,11 +359,6 @@ void __attribute__((weak)) emberAfGroupsClusterInitCallback(EndpointId endpoint)
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfIasZoneClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
 void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index e0a8d7773b57ca..944a560bc167e0 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -44,128 +44,103 @@
             /* 9 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 17 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 19 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 27 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 35 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 43 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 51 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Power Source (server), big-endian */                                                          \
                                                                                                                                    \
-            /* 58 - Description, */                                                                                                \
+            /* 17 - Description, */                                                                                                \
             2, 'B', '2',                                                                                                           \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Mode Select (server), big-endian */                                                           \
                                                                                                                                    \
-            /* 61 - Description, */                                                                                                \
+            /* 20 - Description, */                                                                                                \
             6, 'C', 'o', 'f', 'f', 'e', 'e',                                                                                       \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Door Lock (server), big-endian */                                                             \
                                                                                                                                    \
-            /* 68 - Language, */                                                                                                   \
+            /* 27 - Language, */                                                                                                   \
             2, 'e', 'n',                                                                                                           \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: IAS Zone (server), big-endian */                                                              \
-                                                                                                                                   \
-            /* 71 - IAS CIE address, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Media Playback (server), big-endian */                                                        \
                                                                                                                                    \
-            /* 79 - StartTime, */                                                                                                  \
+            /* 30 - StartTime, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,                                                                        \
                                                                                                                                    \
-            /* 87 - Duration, */                                                                                                   \
+            /* 38 - Duration, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 95 - SeekRangeEnd, */                                                                                               \
+            /* 46 - SeekRangeEnd, */                                                                                               \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 103 - SeekRangeStart, */                                                                                            \
+            /* 54 - SeekRangeStart, */                                                                                             \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Test Cluster (server), big-endian */                                                          \
                                                                                                                                    \
-            /* 111 - bitmap64, */                                                                                                  \
+            /* 62 - bitmap64, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 119 - int40u, */                                                                                                    \
+            /* 70 - int40u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 124 - int48u, */                                                                                                    \
+            /* 75 - int48u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 130 - int56u, */                                                                                                    \
+            /* 81 - int56u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 137 - int64u, */                                                                                                    \
+            /* 88 - int64u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 145 - int40s, */                                                                                                    \
+            /* 96 - int40s, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 150 - int48s, */                                                                                                    \
+            /* 101 - int48s, */                                                                                                    \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 156 - int56s, */                                                                                                    \
+            /* 107 - int56s, */                                                                                                    \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 163 - int64s, */                                                                                                    \
+            /* 114 - int64s, */                                                                                                    \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 171 - float_double, */                                                                                              \
+            /* 122 - float_double, */                                                                                              \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 179 - epoch_us, */                                                                                                  \
+            /* 130 - epoch_us, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 187 - nullable_bitmap64, */                                                                                         \
+            /* 138 - nullable_bitmap64, */                                                                                         \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 195 - nullable_int40u, */                                                                                           \
+            /* 146 - nullable_int40u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 200 - nullable_int48u, */                                                                                           \
+            /* 151 - nullable_int48u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 206 - nullable_int56u, */                                                                                           \
+            /* 157 - nullable_int56u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 213 - nullable_int64u, */                                                                                           \
+            /* 164 - nullable_int64u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 221 - nullable_int40s, */                                                                                           \
+            /* 172 - nullable_int40s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 226 - nullable_int48s, */                                                                                           \
+            /* 177 - nullable_int48s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 232 - nullable_int56s, */                                                                                           \
+            /* 183 - nullable_int56s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 239 - nullable_int64s, */                                                                                           \
+            /* 190 - nullable_int64s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 247 - nullable_float_double, */                                                                                     \
+            /* 198 - nullable_float_double, */                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 2, Cluster: Power Source (server), big-endian */                                                          \
                                                                                                                                    \
-            /* 255 - Description, */                                                                                               \
+            /* 206 - Description, */                                                                                               \
             2, 'B', '3',                                                                                                           \
     }
 
@@ -188,134 +163,109 @@
             /* 9 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 17 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 19 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 27 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 35 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 43 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 51 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Power Source (server), little-endian */                                                       \
                                                                                                                                    \
-            /* 58 - Description, */                                                                                                \
+            /* 17 - Description, */                                                                                                \
             2, 'B', '2',                                                                                                           \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Mode Select (server), little-endian */                                                        \
                                                                                                                                    \
-            /* 61 - Description, */                                                                                                \
+            /* 20 - Description, */                                                                                                \
             6, 'C', 'o', 'f', 'f', 'e', 'e',                                                                                       \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Door Lock (server), little-endian */                                                          \
                                                                                                                                    \
-            /* 68 - Language, */                                                                                                   \
+            /* 27 - Language, */                                                                                                   \
             2, 'e', 'n',                                                                                                           \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: IAS Zone (server), little-endian */                                                           \
-                                                                                                                                   \
-            /* 71 - IAS CIE address, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Media Playback (server), little-endian */                                                     \
                                                                                                                                    \
-            /* 79 - StartTime, */                                                                                                  \
+            /* 30 - StartTime, */                                                                                                  \
             0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 87 - Duration, */                                                                                                   \
+            /* 38 - Duration, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 95 - SeekRangeEnd, */                                                                                               \
+            /* 46 - SeekRangeEnd, */                                                                                               \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 103 - SeekRangeStart, */                                                                                            \
+            /* 54 - SeekRangeStart, */                                                                                             \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Test Cluster (server), little-endian */                                                       \
                                                                                                                                    \
-            /* 111 - bitmap64, */                                                                                                  \
+            /* 62 - bitmap64, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 119 - int40u, */                                                                                                    \
+            /* 70 - int40u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 124 - int48u, */                                                                                                    \
+            /* 75 - int48u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 130 - int56u, */                                                                                                    \
+            /* 81 - int56u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 137 - int64u, */                                                                                                    \
+            /* 88 - int64u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 145 - int40s, */                                                                                                    \
+            /* 96 - int40s, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 150 - int48s, */                                                                                                    \
+            /* 101 - int48s, */                                                                                                    \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 156 - int56s, */                                                                                                    \
+            /* 107 - int56s, */                                                                                                    \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 163 - int64s, */                                                                                                    \
+            /* 114 - int64s, */                                                                                                    \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 171 - float_double, */                                                                                              \
+            /* 122 - float_double, */                                                                                              \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 179 - epoch_us, */                                                                                                  \
+            /* 130 - epoch_us, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 187 - nullable_bitmap64, */                                                                                         \
+            /* 138 - nullable_bitmap64, */                                                                                         \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 195 - nullable_int40u, */                                                                                           \
+            /* 146 - nullable_int40u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 200 - nullable_int48u, */                                                                                           \
+            /* 151 - nullable_int48u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 206 - nullable_int56u, */                                                                                           \
+            /* 157 - nullable_int56u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 213 - nullable_int64u, */                                                                                           \
+            /* 164 - nullable_int64u, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 221 - nullable_int40s, */                                                                                           \
+            /* 172 - nullable_int40s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
                                                                                                                                    \
-            /* 226 - nullable_int48s, */                                                                                           \
+            /* 177 - nullable_int48s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
                                                                                                                                    \
-            /* 232 - nullable_int56s, */                                                                                           \
+            /* 183 - nullable_int56s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
                                                                                                                                    \
-            /* 239 - nullable_int64s, */                                                                                           \
+            /* 190 - nullable_int64s, */                                                                                           \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 247 - nullable_float_double, */                                                                                     \
+            /* 198 - nullable_float_double, */                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 2, Cluster: Power Source (server), little-endian */                                                       \
                                                                                                                                    \
-            /* 255 - Description, */                                                                                               \
+            /* 206 - Description, */                                                                                               \
             2, 'B', '3',                                                                                                           \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (39)
+#define GENERATED_DEFAULTS_COUNT (32)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -416,7 +366,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 719
+#define GENERATED_ATTRIBUTE_COUNT 716
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -591,7 +541,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -605,69 +557,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(17) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(19) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(27) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(35) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(43) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(51) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -809,7 +794,7 @@
             /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
             { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0xFE) }, /* current level */        \
             { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* remaining time */       \
-            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                            /* min level */            \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                            /* min level */            \
             { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xFE) },                            /* max level */            \
             { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* current frequency */    \
             { 0x00000005, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* min frequency */        \
@@ -865,7 +850,7 @@
             /* Endpoint: 1, Cluster: Power Source (server) */                                                                      \
             { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },              /* Status */                                \
             { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },              /* Order */                                 \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(58) }, /* Description */                           \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(17) }, /* Description */                           \
             { 0x0000000E, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },              /* BatteryChargeLevel */                    \
             { 0x0000000F, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() },              /* BatteryReplacementNeeded */              \
             { 0x00000010, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                /* BatteryReplaceability */                 \
@@ -876,7 +861,7 @@
             { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },    /* number of positions */                             \
             { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },      /* current position */                                \
             { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },    /* multi press max */                                 \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Fixed Label (server) */                                                                       \
@@ -896,8 +881,9 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Mode Select (server) */                                                                       \
-            { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_LONG_DEFAULTS_INDEX(61) },                     /* Description */       \
-            { 0x00000001, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) },      /* StandardNamespace */ \
+            { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_LONG_DEFAULTS_INDEX(20) },                /* Description */            \
+            { 0x00000001, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* StandardNamespace */      \
+            { 0xFFF10001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(255) },                           /* ManufacturerExtension */  \
             { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedModes */    \
             { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0) },       /* CurrentMode */       \
             { 0x00000004, ZAP_TYPE(INT8U), 1,                                                                                      \
@@ -929,7 +915,7 @@
             { 0x0000001A, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(10) },  /* MinRFIDCodeLength */                                \
             { 0x0000001B, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* CredentialRulesSupport */                           \
             { 0x0000001C, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(5) },   /* NumberOfCredentialsSupportedPerUser */              \
-            { 0x00000021, ZAP_TYPE(CHAR_STRING), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(68) }, /* Language */    \
+            { 0x00000021, ZAP_TYPE(CHAR_STRING), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(27) }, /* Language */    \
             { 0x00000023, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(60) }, /* AutoRelockTime */        \
             { 0x00000024, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
               ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* SoundVolume */                                                                   \
@@ -952,11 +938,17 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(6) },       /* ClusterRevision */                             \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Window Covering (server) */                                                                   \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Type */                                            \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x08) },    /* Type */                                         \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* PhysicalClosedLimitLift */                      \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* PhysicalClosedLimitTilt */                      \
             { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0x7FFF) }, /* CurrentPositionLift */                                                              \
             { 0x00000004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0x7FFF) }, /* CurrentPositionTilt */                                                              \
+            { 0x00000005, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* NumberOfActuationsLift */                                                           \
+            { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* NumberOfActuationsTilt */                                                           \
             { 0x00000007, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x03) }, /* ConfigStatus */       \
             { 0x00000008, ZAP_TYPE(PERCENT), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                       \
               ZAP_SIMPLE_DEFAULT(50) }, /* CurrentPositionLiftPercentage */                                                        \
@@ -964,14 +956,14 @@
               ZAP_SIMPLE_DEFAULT(50) },                                        /* CurrentPositionTiltPercentage */                 \
             { 0x0000000A, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OperationalStatus */                             \
             { 0x0000000B, ZAP_TYPE(PERCENT100THS), 2, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                \
-              ZAP_SIMPLE_DEFAULT(500) }, /* TargetPositionLiftPercent100ths */                                                     \
+              ZAP_SIMPLE_DEFAULT(5000) }, /* TargetPositionLiftPercent100ths */                                                    \
             { 0x0000000C, ZAP_TYPE(PERCENT100THS), 2, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                \
-              ZAP_SIMPLE_DEFAULT(500) },                                     /* TargetPositionTiltPercent100ths */                 \
+              ZAP_SIMPLE_DEFAULT(5000) },                                    /* TargetPositionTiltPercent100ths */                 \
             { 0x0000000D, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* EndProductType */                                  \
             { 0x0000000E, ZAP_TYPE(PERCENT100THS), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
-              ZAP_SIMPLE_DEFAULT(500) }, /* CurrentPositionLiftPercent100ths */                                                    \
+              ZAP_SIMPLE_DEFAULT(5000) }, /* CurrentPositionLiftPercent100ths */                                                   \
             { 0x0000000F, ZAP_TYPE(PERCENT100THS), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
-              ZAP_SIMPLE_DEFAULT(500) }, /* CurrentPositionTiltPercent100ths */                                                    \
+              ZAP_SIMPLE_DEFAULT(5000) }, /* CurrentPositionTiltPercent100ths */                                                   \
             { 0x00000010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
               ZAP_SIMPLE_DEFAULT(0x0000) }, /* InstalledOpenLimitLift */                                                           \
             { 0x00000011, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
@@ -1050,10 +1042,8 @@
               ZAP_MIN_MAX_DEFAULTS_INDEX(19) }, /* ControlSequenceOfOperation */                                                   \
             { 0x0000001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
               ZAP_MIN_MAX_DEFAULTS_INDEX(20) },                                   /* SystemMode */                                 \
-            { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },         /* StartOfWeek */                                \
-            { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) },         /* NumberOfWeeklyTransitions */                  \
-            { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) },         /* NumberOfDailyTransitions */                   \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000b) }, /* FeatureMap */                                 \
+            { 0x0000001E, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* ThermostatRunningMode */                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0023) }, /* FeatureMap */                                 \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },        /* ClusterRevision */                            \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
@@ -1203,15 +1193,6 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: IAS Zone (server) */                                                                          \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                                 /* zone state */      \
-            { 0x00000001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() },                                     /* zone type */       \
-            { 0x00000002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* zone status */     \
-            { 0x00000010, ZAP_TYPE(NODE_ID), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(71) }, /* IAS CIE address */ \
-            { 0x00000011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) },                                 /* Zone ID */         \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                 /* FeatureMap */      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },                                   /* ClusterRevision */ \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Wake on LAN (server) */                                                                       \
             { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* MACAddress */                                    \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },   /* FeatureMap */                                    \
@@ -1230,11 +1211,11 @@
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Media Playback (server) */                                                                    \
             { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                                  /* CurrentState */   \
-            { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(79) }, /* StartTime */      \
-            { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(87) },   /* Duration */       \
+            { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(30) }, /* StartTime */      \
+            { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(38) },   /* Duration */       \
             { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_EMPTY_DEFAULT() },                                      /* PlaybackSpeed */  \
-            { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(95) },   /* SeekRangeEnd */   \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(103) },  /* SeekRangeStart */ \
+            { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(46) },   /* SeekRangeEnd */   \
+            { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(54) },   /* SeekRangeStart */ \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                  /* FeatureMap */     \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */                                   \
                                                                                                                                    \
@@ -1285,33 +1266,48 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
+            /* Endpoint: 1, Cluster: Electrical Measurement (server) */                                                            \
+            { 0x00000000, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000000) }, /* measurement type */                         \
+            { 0x00000304, ZAP_TYPE(INT32S), 4, 0, ZAP_SIMPLE_DEFAULT(0x000000) },   /* total active power */                       \
+            { 0x00000505, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms voltage */                              \
+            { 0x00000506, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) },     /* rms voltage min */                          \
+            { 0x00000507, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) },     /* rms voltage max */                          \
+            { 0x00000508, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms current */                              \
+            { 0x00000509, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms current min */                          \
+            { 0x0000050A, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms current max */                          \
+            { 0x0000050B, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* active power */                             \
+            { 0x0000050C, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* active power min */                         \
+            { 0x0000050D, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* active power max */                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },        /* FeatureMap */                               \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },          /* ClusterRevision */                          \
+                                                                                                                                   \
             /* Endpoint: 1, Cluster: Test Cluster (server) */                                                                      \
-            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(false) },     /* boolean */       \
-            { 0x00000001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* bitmap8 */       \
-            { 0x00000002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },        /* bitmap16 */      \
-            { 0x00000003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },        /* bitmap32 */      \
-            { 0x00000004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(111) }, /* bitmap64 */      \
-            { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },           /* int8u */         \
-            { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int16u */        \
-            { 0x00000007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int24u */        \
-            { 0x00000008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int32u */        \
-            { 0x00000009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(119) },   /* int40u */        \
-            { 0x0000000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(124) },   /* int48u */        \
-            { 0x0000000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(130) },   /* int56u */        \
-            { 0x0000000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(137) },   /* int64u */        \
-            { 0x0000000D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },           /* int8s */         \
-            { 0x0000000E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int16s */        \
-            { 0x0000000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int24s */        \
-            { 0x00000010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int32s */        \
-            { 0x00000011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(145) },   /* int40s */        \
-            { 0x00000012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(150) },   /* int48s */        \
-            { 0x00000013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(156) },   /* int56s */        \
-            { 0x00000014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(163) },   /* int64s */        \
-            { 0x00000015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },           /* enum8 */         \
-            { 0x00000016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* enum16 */        \
-            { 0x00000017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* float_single */  \
-            { 0x00000018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(171) },   /* float_double */  \
-            { 0x00000019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },     /* octet_string */  \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(false) },    /* boolean */        \
+            { 0x00000001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },        /* bitmap8 */        \
+            { 0x00000002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },       /* bitmap16 */       \
+            { 0x00000003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },       /* bitmap32 */       \
+            { 0x00000004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(62) }, /* bitmap64 */       \
+            { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int8u */          \
+            { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int16u */         \
+            { 0x00000007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int24u */         \
+            { 0x00000008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int32u */         \
+            { 0x00000009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(70) },   /* int40u */         \
+            { 0x0000000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(75) },   /* int48u */         \
+            { 0x0000000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(81) },   /* int56u */         \
+            { 0x0000000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(88) },   /* int64u */         \
+            { 0x0000000D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int8s */          \
+            { 0x0000000E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int16s */         \
+            { 0x0000000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int24s */         \
+            { 0x00000010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int32s */         \
+            { 0x00000011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) },   /* int40s */         \
+            { 0x00000012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(101) },  /* int48s */         \
+            { 0x00000013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(107) },  /* int56s */         \
+            { 0x00000014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(114) },  /* int64s */         \
+            { 0x00000015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* enum8 */          \
+            { 0x00000016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* enum16 */         \
+            { 0x00000017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* float_single */   \
+            { 0x00000018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(122) },  /* float_double */   \
+            { 0x00000019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },    /* octet_string */   \
             { 0x0000001A, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
               ZAP_EMPTY_DEFAULT() }, /* list_int8u */                                                                              \
             { 0x0000001B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
@@ -1323,7 +1319,7 @@
             { 0x0000001E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* char_string */        \
             { 0x0000001F, ZAP_TYPE(LONG_CHAR_STRING), 1002, ZAP_ATTRIBUTE_MASK(WRITABLE),                                          \
               ZAP_EMPTY_DEFAULT() }, /* long_char_string */                                                                        \
-            { 0x00000020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(179) }, /* epoch_us */      \
+            { 0x00000020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(130) }, /* epoch_us */      \
             { 0x00000021, ZAP_TYPE(EPOCH_S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },           /* epoch_s */       \
             { 0x00000022, ZAP_TYPE(VENDOR_ID), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },         /* vendor_id */     \
             { 0x00000023, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
@@ -1358,7 +1354,7 @@
             { 0x00004003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                      \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap32 */                                                                     \
             { 0x00004004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                      \
-              ZAP_LONG_DEFAULTS_INDEX(187) }, /* nullable_bitmap64 */                                                              \
+              ZAP_LONG_DEFAULTS_INDEX(138) }, /* nullable_bitmap64 */                                                              \
             { 0x00004005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8u */                                                                        \
             { 0x00004006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
@@ -1368,13 +1364,13 @@
             { 0x00004008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int32u */                                                                       \
             { 0x00004009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(195) }, /* nullable_int40u */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(146) }, /* nullable_int40u */                                                                \
             { 0x0000400A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(200) }, /* nullable_int48u */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(151) }, /* nullable_int48u */                                                                \
             { 0x0000400B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(206) }, /* nullable_int56u */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(157) }, /* nullable_int56u */                                                                \
             { 0x0000400C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(213) }, /* nullable_int64u */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(164) }, /* nullable_int64u */                                                                \
             { 0x0000400D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8s */                                                                        \
             { 0x0000400E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
@@ -1384,13 +1380,13 @@
             { 0x00004010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int32s */                                                                       \
             { 0x00004011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(221) }, /* nullable_int40s */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(172) }, /* nullable_int40s */                                                                \
             { 0x00004012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(226) }, /* nullable_int48s */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(177) }, /* nullable_int48s */                                                                \
             { 0x00004013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(232) }, /* nullable_int56s */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(183) }, /* nullable_int56s */                                                                \
             { 0x00004014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(239) }, /* nullable_int64s */                                                                \
+              ZAP_LONG_DEFAULTS_INDEX(190) }, /* nullable_int64s */                                                                \
             { 0x00004015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum8 */                                                                        \
             { 0x00004016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
@@ -1398,7 +1394,7 @@
             { 0x00004017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* nullable_float_single */                                                                 \
             { 0x00004018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_LONG_DEFAULTS_INDEX(247) }, /* nullable_float_double */                                                          \
+              ZAP_LONG_DEFAULTS_INDEX(198) }, /* nullable_float_double */                                                          \
             { 0x00004019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
               ZAP_EMPTY_DEFAULT() }, /* nullable_octet_string */                                                                   \
             { 0x0000401E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                  \
@@ -1423,21 +1419,6 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Electrical Measurement (server) */                                                            \
-            { 0x00000000, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000000) }, /* measurement type */                         \
-            { 0x00000304, ZAP_TYPE(INT32S), 4, 0, ZAP_SIMPLE_DEFAULT(0x000000) },   /* total active power */                       \
-            { 0x00000505, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms voltage */                              \
-            { 0x00000506, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) },     /* rms voltage min */                          \
-            { 0x00000507, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) },     /* rms voltage max */                          \
-            { 0x00000508, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms current */                              \
-            { 0x00000509, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms current min */                          \
-            { 0x0000050A, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* rms current max */                          \
-            { 0x0000050B, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* active power */                             \
-            { 0x0000050C, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* active power min */                         \
-            { 0x0000050D, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) },     /* active power max */                         \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },        /* FeatureMap */                               \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },          /* ClusterRevision */                          \
-                                                                                                                                   \
             /* Endpoint: 2, Cluster: Groups (server) */                                                                            \
             { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
@@ -1465,7 +1446,7 @@
             /* Endpoint: 2, Cluster: Power Source (server) */                                                                      \
             { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },               /* Status */                               \
             { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) },               /* Order */                                \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(255) }, /* Description */                          \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(206) }, /* Description */                          \
             { 0x0000000E, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },               /* BatteryChargeLevel */                   \
             { 0x0000000F, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() },               /* BatteryReplacementNeeded */             \
             { 0x00000010, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                 /* BatteryReplaceability */                \
@@ -1550,6 +1531,7 @@
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayThermostatServer[] = {                                                        \
         (EmberAfGenericClusterFunction) emberAfThermostatClusterServerInitCallback,                                                \
+        (EmberAfGenericClusterFunction) MatterThermostatClusterServerPreAttributeChangedCallback,                                  \
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayFanControlServer[] = {                                                        \
         (EmberAfGenericClusterFunction) MatterFanControlClusterServerAttributeChangedCallback,                                     \
@@ -1563,11 +1545,6 @@
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {                                                  \
         (EmberAfGenericClusterFunction) emberAfOccupancySensingClusterServerInitCallback,                                          \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayIasZoneServer[] = {                                                           \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerInitCallback,                                                   \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerMessageSentCallback,                                            \
-        (EmberAfGenericClusterFunction) MatterIasZoneClusterServerPreAttributeChangedCallback,                                     \
     };
 
 // clang-format off
@@ -1628,30 +1605,34 @@
   /*   GeneratedCommandList (index=38)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=40) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=42) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=42) */ \
+  /*   AcceptedCommandList (index=44) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=44) */ \
+  /*   AcceptedCommandList (index=46) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=46) */ \
+  /*   AcceptedCommandList (index=48) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=48) */ \
+  /*   AcceptedCommandList (index=50) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=52) */ \
+  /*   AcceptedCommandList (index=54) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -1660,32 +1641,31 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=62)*/ \
+  /*   GeneratedCommandList (index=63)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Group Key Management (server) */\
-  /*   AcceptedCommandList (index=67) */ \
+  /*   AcceptedCommandList (index=68) */ \
   0x00000000 /* KeySetWrite */, \
   0x00000001 /* KeySetRead */, \
   0x00000003 /* KeySetRemove */, \
   0x00000004 /* KeySetReadAllIndices */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=72)*/ \
+  /*   GeneratedCommandList (index=73)*/ \
   0x00000002 /* KeySetReadResponse */, \
   0x00000005 /* KeySetReadAllIndicesResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=75) */ \
+  /*   AcceptedCommandList (index=76) */ \
   0x00000000 /* Identify */, \
   0x00000040 /* TriggerEffect */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=78) */ \
+  /*   AcceptedCommandList (index=79) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -1693,14 +1673,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=85)*/ \
+  /*   GeneratedCommandList (index=86)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Scenes (server) */\
-  /*   AcceptedCommandList (index=90) */ \
+  /*   AcceptedCommandList (index=91) */ \
   0x00000000 /* AddScene */, \
   0x00000001 /* ViewScene */, \
   0x00000002 /* RemoveScene */, \
@@ -1709,7 +1689,7 @@
   0x00000005 /* RecallScene */, \
   0x00000006 /* GetSceneMembership */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=98)*/ \
+  /*   GeneratedCommandList (index=99)*/ \
   0x00000000 /* AddSceneResponse */, \
   0x00000001 /* ViewSceneResponse */, \
   0x00000002 /* RemoveSceneResponse */, \
@@ -1718,7 +1698,7 @@
   0x00000006 /* GetSceneMembershipResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=105) */ \
+  /*   AcceptedCommandList (index=106) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
@@ -1727,7 +1707,7 @@
   0x00000042 /* OnWithTimedOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=112) */ \
+  /*   AcceptedCommandList (index=113) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -1738,11 +1718,11 @@
   0x00000007 /* StopWithOnOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Mode Select (server) */\
-  /*   AcceptedCommandList (index=121) */ \
+  /*   AcceptedCommandList (index=122) */ \
   0x00000000 /* ChangeToMode */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Door Lock (server) */\
-  /*   AcceptedCommandList (index=123) */ \
+  /*   AcceptedCommandList (index=124) */ \
   0x00000000 /* LockDoor */, \
   0x00000001 /* UnlockDoor */, \
   0x00000003 /* UnlockWithTimeout */, \
@@ -1758,7 +1738,7 @@
   0x00000024 /* GetCredentialStatus */, \
   0x00000026 /* ClearCredential */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=138)*/ \
+  /*   GeneratedCommandList (index=139)*/ \
   0x0000000C /* GetWeekDayScheduleResponse */, \
   0x0000000F /* GetYearDayScheduleResponse */, \
   0x0000001C /* GetUserResponse */, \
@@ -1766,7 +1746,7 @@
   0x00000025 /* GetCredentialStatusResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Window Covering (server) */\
-  /*   AcceptedCommandList (index=144) */ \
+  /*   AcceptedCommandList (index=145) */ \
   0x00000000 /* UpOrOpen */, \
   0x00000001 /* DownOrClose */, \
   0x00000002 /* StopMotion */, \
@@ -1776,16 +1756,16 @@
   0x00000008 /* GoToTiltPercentage */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Barrier Control (server) */\
-  /*   AcceptedCommandList (index=152) */ \
+  /*   AcceptedCommandList (index=153) */ \
   0x00000000 /* BarrierControlGoToPercent */, \
   0x00000001 /* BarrierControlStop */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Thermostat (server) */\
-  /*   AcceptedCommandList (index=155) */ \
+  /*   AcceptedCommandList (index=156) */ \
   0x00000000 /* SetpointRaiseLower */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Color Control (server) */\
-  /*   AcceptedCommandList (index=157) */ \
+  /*   AcceptedCommandList (index=158) */ \
   0x00000000 /* MoveToHue */, \
   0x00000001 /* MoveHue */, \
   0x00000002 /* StepHue */, \
@@ -1806,81 +1786,33 @@
   0x0000004B /* MoveColorTemperature */, \
   0x0000004C /* StepColorTemperature */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: IAS Zone (server) */\
-  /*   AcceptedCommandList (index=177) */ \
-  0x00000000 /* ZoneEnrollResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Channel (server) */\
-  /*   AcceptedCommandList (index=179) */ \
-  0x00000000 /* ChangeChannel */, \
-  0x00000002 /* ChangeChannelByNumber */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=182)*/ \
-  0x00000001 /* ChangeChannelResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Target Navigator (server) */\
-  /*   AcceptedCommandList (index=184) */ \
+  /*   AcceptedCommandList (index=178) */ \
   0x00000000 /* NavigateTarget */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=186)*/ \
+  /*   GeneratedCommandList (index=180)*/ \
   0x00000001 /* NavigateTargetResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Media Playback (server) */\
-  /*   AcceptedCommandList (index=188) */ \
-  0x00000000 /* Play */, \
-  0x00000001 /* Pause */, \
-  0x00000002 /* StopPlayback */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=192)*/ \
-  0x0000000A /* PlaybackResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Media Input (server) */\
-  /*   AcceptedCommandList (index=194) */ \
+  /*   AcceptedCommandList (index=182) */ \
   0x00000000 /* SelectInput */, \
   0x00000001 /* ShowInputStatus */, \
   0x00000002 /* HideInputStatus */, \
   0x00000003 /* RenameInput */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Low Power (server) */\
-  /*   AcceptedCommandList (index=199) */ \
+  /*   AcceptedCommandList (index=187) */ \
   0x00000000 /* Sleep */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Keypad Input (server) */\
-  /*   AcceptedCommandList (index=201) */ \
+  /*   AcceptedCommandList (index=189) */ \
   0x00000000 /* SendKey */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=203)*/ \
+  /*   GeneratedCommandList (index=191)*/ \
   0x00000001 /* SendKeyResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Content Launcher (server) */\
-  /*   AcceptedCommandList (index=205) */ \
-  0x00000000 /* LaunchContent */, \
-  0x00000001 /* LaunchURL */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=208)*/ \
-  0x00000002 /* LaunchResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Audio Output (server) */\
-  /*   AcceptedCommandList (index=210) */ \
-  0x00000000 /* SelectOutput */, \
-  0x00000001 /* RenameOutput */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Application Launcher (server) */\
-  /*   AcceptedCommandList (index=213) */ \
-  0x00000000 /* LaunchApp */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=215)*/ \
-  0x00000003 /* LauncherResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Account Login (server) */\
-  /*   AcceptedCommandList (index=217) */ \
-  0x00000000 /* GetSetupPIN */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=219)*/ \
-  0x00000001 /* GetSetupPINResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Test Cluster (server) */\
-  /*   AcceptedCommandList (index=221) */ \
+  /*   AcceptedCommandList (index=193) */ \
   0x00000000 /* Test */, \
   0x00000001 /* TestNotHandled */, \
   0x00000002 /* TestSpecific */, \
@@ -1900,7 +1832,7 @@
   0x00000014 /* TestEmitTestEventRequest */, \
   0x00000015 /* TestEmitTestFabricScopedEventRequest */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=240)*/ \
+  /*   GeneratedCommandList (index=212)*/ \
   0x00000000 /* TestSpecificResponse */, \
   0x00000001 /* TestAddArgumentsResponse */, \
   0x00000004 /* TestListInt8UReverseResponse */, \
@@ -1912,7 +1844,7 @@
   0x0000000B /* TestEmitTestFabricScopedEventResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=250) */ \
+  /*   AcceptedCommandList (index=222) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -1920,20 +1852,20 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=257)*/ \
+  /*   GeneratedCommandList (index=229)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=262) */ \
+  /*   AcceptedCommandList (index=234) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 65534, Cluster: Network Commissioning (server) */\
-  /*   AcceptedCommandList (index=266) */ \
+  /*   AcceptedCommandList (index=238) */ \
   0x00000000 /* ScanNetworks */, \
   0x00000002 /* AddOrUpdateWiFiNetwork */, \
   0x00000003 /* AddOrUpdateThreadNetwork */, \
@@ -1941,7 +1873,7 @@
   0x00000006 /* ConnectNetwork */, \
   0x00000008 /* ReorderNetwork */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=273)*/ \
+  /*   GeneratedCommandList (index=245)*/ \
   0x00000001 /* ScanNetworksResponse */, \
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
@@ -1951,7 +1883,7 @@
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 78
+#define GENERATED_CLUSTER_COUNT 77
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
@@ -2135,94 +2067,94 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(93), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(103), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(104), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(109), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(110), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(174), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(175), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(189), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(190), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(220), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2233,7 +2165,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(222), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(223), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2244,7 +2176,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2255,51 +2187,51 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(230), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(231), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(234), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(235), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (server) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 7, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayScenesServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 91 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 99 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(244), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(245), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 106 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/off Switch Configuration (server) */ \
       .clusterId = 0x00000007,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(252), \
       .attributeCount = 4, \
       .clusterSize = 8, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2310,18 +2242,18 @@
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(255), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(256), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 112 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 113 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \
       .clusterId = 0x0000000F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(272), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2332,7 +2264,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(276), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(277), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2343,7 +2275,7 @@
   { \
       /* Endpoint: 1, Cluster: Binding (server) */ \
       .clusterId = 0x0000001E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(282), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(283), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2354,7 +2286,7 @@
   { \
       /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
       .clusterId = 0x00000025,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(285), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(286), \
       .attributeCount = 5, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2365,7 +2297,7 @@
   { \
       /* Endpoint: 1, Cluster: Power Source (server) */ \
       .clusterId = 0x0000002F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(291), \
       .attributeCount = 8, \
       .clusterSize = 72, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2376,7 +2308,7 @@
   { \
       /* Endpoint: 1, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(298), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2387,7 +2319,7 @@
   { \
       /* Endpoint: 1, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(303), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(304), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2398,7 +2330,7 @@
   { \
       /* Endpoint: 1, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(306), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(307), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2409,7 +2341,7 @@
   { \
       /* Endpoint: 1, Cluster: Boolean State (server) */ \
       .clusterId = 0x00000045,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(309), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(310), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2420,51 +2352,51 @@
   { \
       /* Endpoint: 1, Cluster: Mode Select (server) */ \
       .clusterId = 0x00000050,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(312), \
-      .attributeCount = 8, \
-      .clusterSize = 44, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(313), \
+      .attributeCount = 9, \
+      .clusterSize = 45, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayModeSelectServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 121 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 122 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Door Lock (server) */ \
       .clusterId = 0x00000101,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(320), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(322), \
       .attributeCount = 33, \
       .clusterSize = 55, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayDoorLockServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 123 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 138 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 124 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 139 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Window Covering (server) */ \
       .clusterId = 0x00000102,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(353), \
-      .attributeCount = 20, \
-      .clusterSize = 35, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(355), \
+      .attributeCount = 24, \
+      .clusterSize = 43, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayWindowCoveringServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 145 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Barrier Control (server) */ \
       .clusterId = 0x00000103,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(373), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(379), \
       .attributeCount = 6, \
       .clusterSize = 11, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 152 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 153 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \
       .clusterId = 0x00000200,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(379), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(385), \
       .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), \
@@ -2475,18 +2407,18 @@
   { \
       /* Endpoint: 1, Cluster: Thermostat (server) */ \
       .clusterId = 0x00000201,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(404), \
-      .attributeCount = 19, \
-      .clusterSize = 34, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(410), \
+      .attributeCount = 17, \
+      .clusterSize = 32, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayThermostatServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 155 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 156 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Fan Control (server) */ \
       .clusterId = 0x00000202,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(423), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(427), \
       .attributeCount = 13, \
       .clusterSize = 17, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -2497,7 +2429,7 @@
   { \
       /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \
       .clusterId = 0x00000204,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(436), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(440), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -2508,18 +2440,18 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (server) */ \
       .clusterId = 0x00000300,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(441), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(445), \
       .attributeCount = 54, \
       .clusterSize = 345, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayColorControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 157 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 158 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \
       .clusterId = 0x00000400,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(495), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(499), \
       .attributeCount = 7, \
       .clusterSize = 15, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2530,7 +2462,7 @@
   { \
       /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(502), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(506), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2541,7 +2473,7 @@
   { \
       /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \
       .clusterId = 0x00000403,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(508), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(512), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2552,7 +2484,7 @@
   { \
       /* Endpoint: 1, Cluster: Flow Measurement (server) */ \
       .clusterId = 0x00000404,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(513), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(517), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2563,7 +2495,7 @@
   { \
       /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(519), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(523), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2574,7 +2506,7 @@
   { \
       /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
       .clusterId = 0x00000406,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(525), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(529), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -2582,21 +2514,10 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
-  { \
-      /* Endpoint: 1, Cluster: IAS Zone (server) */ \
-      .clusterId = 0x00000500,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(530), \
-      .attributeCount = 7, \
-      .clusterSize = 20, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \
-      .functions = chipFuncArrayIasZoneServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 177 ) ,\
-      .generatedCommandList = nullptr ,\
-    },\
   { \
       /* Endpoint: 1, Cluster: Wake on LAN (server) */ \
       .clusterId = 0x00000503,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(537), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(534), \
       .attributeCount = 3, \
       .clusterSize = 39, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2607,106 +2528,106 @@
   { \
       /* Endpoint: 1, Cluster: Channel (server) */ \
       .clusterId = 0x00000504,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(540), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(537), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 179 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 182 ) ,\
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Target Navigator (server) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(543), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(540), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 184 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 186 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 178 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 180 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Media Playback (server) */ \
       .clusterId = 0x00000506,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(547), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(544), \
       .attributeCount = 8, \
       .clusterSize = 43, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 188 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ) ,\
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Media Input (server) */ \
       .clusterId = 0x00000507,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(555), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(552), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 182 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Low Power (server) */ \
       .clusterId = 0x00000508,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(559), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(556), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 199 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 187 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Keypad Input (server) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(561), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(558), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 201 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 203 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 189 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 191 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Content Launcher (server) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(563), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(560), \
       .attributeCount = 4, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 205 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 208 ) ,\
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Audio Output (server) */ \
       .clusterId = 0x0000050B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(567), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(564), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 210 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Application Launcher (server) */ \
       .clusterId = 0x0000050C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(571), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(568), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 213 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 215 ) ,\
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Application Basic (server) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(574), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(571), \
       .attributeCount = 9, \
       .clusterSize = 110, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2717,29 +2638,18 @@
   { \
       /* Endpoint: 1, Cluster: Account Login (server) */ \
       .clusterId = 0x0000050E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(583), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(580), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 217 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 219 ) ,\
-    },\
-  { \
-      /* Endpoint: 1, Cluster: Test Cluster (server) */ \
-      .clusterId = 0x0000050F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(585), \
-      .attributeCount = 82, \
-      .clusterSize = 2289, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 221 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 240 ) ,\
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \
       .clusterId = 0x00000B04,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(667), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(582), \
       .attributeCount = 13, \
       .clusterSize = 32, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2747,32 +2657,43 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
+  { \
+      /* Endpoint: 1, Cluster: Test Cluster (server) */ \
+      .clusterId = 0xFFF1FC05,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(595), \
+      .attributeCount = 82, \
+      .clusterSize = 2289, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 193 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 212 ) ,\
+    },\
   { \
       /* Endpoint: 2, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(680), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(677), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 250 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 257 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 222 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 229 ) ,\
     },\
   { \
       /* Endpoint: 2, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(683), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(680), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 262 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 234 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 2, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(690), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(687), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2783,7 +2704,7 @@
   { \
       /* Endpoint: 2, Cluster: Power Source (server) */ \
       .clusterId = 0x0000002F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(696), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(693), \
       .attributeCount = 8, \
       .clusterSize = 72, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -2794,7 +2715,7 @@
   { \
       /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \
       .clusterId = 0x00000406,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(704), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(701), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -2805,13 +2726,13 @@
   { \
       /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \
       .clusterId = 0x00000031,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(709), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(706), \
       .attributeCount = 10, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 266 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 273 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 238 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 245 ) ,\
     },\
 }
 
@@ -2819,13 +2740,13 @@
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 77
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 76
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 27, 596 }, { ZAP_CLUSTER_INDEX(27), 45, 3473 }, { ZAP_CLUSTER_INDEX(72), 5, 105 },                 \
-            { ZAP_CLUSTER_INDEX(77), 1, 0 },                                                                                       \
+        { ZAP_CLUSTER_INDEX(0), 27, 355 }, { ZAP_CLUSTER_INDEX(27), 44, 3460 }, { ZAP_CLUSTER_INDEX(71), 5, 105 },                 \
+            { ZAP_CLUSTER_INDEX(76), 1, 0 },                                                                                       \
     }
 
 // Largest attribute size is needed for various buffers
@@ -2837,7 +2758,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (4174)
+#define ATTRIBUTE_MAX_SIZE (3920)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (4)
diff --git a/zzz_generated/all-clusters-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-app/zap-generated/gen_config.h
index 626f71c78b82f9..131feae3ac3028 100644
--- a/zzz_generated/all-clusters-app/zap-generated/gen_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/gen_config.h
@@ -56,7 +56,6 @@
 #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_IAS_ZONE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -235,13 +234,6 @@
 #define EMBER_AF_PLUGIN_GROUPS_SERVER
 #define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the IAS Zone cluster is included
-#define ZCL_USING_IAS_ZONE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IAS_ZONE_SERVER
-#define EMBER_AF_PLUGIN_IAS_ZONE
-// User options for server plugin IAS Zone
-#define EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE 541
-
 // Use this macro to check if the server side of the Identify cluster is included
 #define ZCL_USING_IDENTIFY_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY_SERVER
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/all-clusters-minimal-app/zap-generated/CHIPClientCallbacks.h
new file mode 100644
index 00000000000000..4458f51745a59b
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/CHIPClientCallbacks.h
@@ -0,0 +1,32 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#pragma once
+
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/InteractionModelEngine.h>
+#include <app/data-model/DecodableList.h>
+#include <app/util/af-enums.h>
+#include <app/util/im-client-callbacks.h>
+#include <inttypes.h>
+#include <lib/support/FunctionTraits.h>
+#include <lib/support/Span.h>
+
+// List specific responses
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/CHIPClusters.h b/zzz_generated/all-clusters-minimal-app/zap-generated/CHIPClusters.h
new file mode 100644
index 00000000000000..15ec5aca34a215
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/CHIPClusters.h
@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+
+#include <controller/CHIPCluster.h>
+#include <lib/core/CHIPCallback.h>
+#include <lib/support/Span.h>
+
+namespace chip {
+namespace Controller {
+
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+{
+public:
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
+};
+
+} // namespace Controller
+} // namespace chip
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
new file mode 100644
index 00000000000000..35d2c30acf31cc
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
@@ -0,0 +1,1800 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#include <cinttypes>
+#include <cstdint>
+
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+#include <app/CommandHandler.h>
+#include <app/InteractionModelEngine.h>
+#include <app/util/util.h>
+#include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/TypeTraits.h>
+
+// Currently we need some work to keep compatible with ember lib.
+#include <app/util/ember-compatibility-functions.h>
+
+namespace chip {
+namespace app {
+
+// Cluster specific command parsing
+
+namespace Clusters {
+
+namespace AccountLogin {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::GetSetupPIN::Id: {
+            Commands::GetSetupPIN::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAccountLoginClusterGetSetupPINCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Login::Id: {
+            Commands::Login::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAccountLoginClusterLoginCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Logout::Id: {
+            Commands::Logout::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAccountLoginClusterLogoutCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace AccountLogin
+
+namespace AdministratorCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::OpenCommissioningWindow::Id: {
+            Commands::OpenCommissioningWindow::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath,
+                                                                                                     commandData);
+            }
+            break;
+        }
+        case Commands::RevokeCommissioning::Id: {
+            Commands::RevokeCommissioning::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace AdministratorCommissioning
+
+namespace ApplicationLauncher {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::LaunchApp::Id: {
+            Commands::LaunchApp::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfApplicationLauncherClusterLaunchAppCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StopApp::Id: {
+            Commands::StopApp::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfApplicationLauncherClusterStopAppCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::HideApp::Id: {
+            Commands::HideApp::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfApplicationLauncherClusterHideAppCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace ApplicationLauncher
+
+namespace AudioOutput {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::SelectOutput::Id: {
+            Commands::SelectOutput::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAudioOutputClusterSelectOutputCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace AudioOutput
+
+namespace Channel {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ChangeChannelByNumber::Id: {
+            Commands::ChangeChannelByNumber::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfChannelClusterChangeChannelByNumberCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::SkipChannel::Id: {
+            Commands::SkipChannel::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfChannelClusterSkipChannelCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Channel
+
+namespace DiagnosticLogs {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::RetrieveLogsRequest::Id: {
+            Commands::RetrieveLogsRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace DiagnosticLogs
+
+namespace DoorLock {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::LockDoor::Id: {
+            Commands::LockDoor::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDoorLockClusterLockDoorCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::UnlockDoor::Id: {
+            Commands::UnlockDoor::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace DoorLock
+
+namespace EthernetNetworkDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetCounts::Id: {
+            Commands::ResetCounts::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace EthernetNetworkDiagnostics
+
+namespace GeneralCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ArmFailSafe::Id: {
+            Commands::ArmFailSafe::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralCommissioningClusterArmFailSafeCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::SetRegulatoryConfig::Id: {
+            Commands::SetRegulatoryConfig::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::CommissioningComplete::Id: {
+            Commands::CommissioningComplete::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralCommissioning
+
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
+namespace Groups {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AddGroup::Id: {
+            Commands::AddGroup::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterAddGroupCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ViewGroup::Id: {
+            Commands::ViewGroup::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::GetGroupMembership::Id: {
+            Commands::GetGroupMembership::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveGroup::Id: {
+            Commands::RemoveGroup::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveAllGroups::Id: {
+            Commands::RemoveAllGroups::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddGroupIfIdentifying::Id: {
+            Commands::AddGroupIfIdentifying::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Groups
+
+namespace Identify {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Identify::Id: {
+            Commands::Identify::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfIdentifyClusterIdentifyCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Identify
+
+namespace KeypadInput {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::SendKey::Id: {
+            Commands::SendKey::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfKeypadInputClusterSendKeyCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace KeypadInput
+
+namespace LevelControl {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::MoveToLevel::Id: {
+            Commands::MoveToLevel::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Move::Id: {
+            Commands::Move::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Step::Id: {
+            Commands::Step::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Stop::Id: {
+            Commands::Stop::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveToLevelWithOnOff::Id: {
+            Commands::MoveToLevelWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::MoveWithOnOff::Id: {
+            Commands::MoveWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StepWithOnOff::Id: {
+            Commands::StepWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StopWithOnOff::Id: {
+            Commands::StopWithOnOff::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace LevelControl
+
+namespace LowPower {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Sleep::Id: {
+            Commands::Sleep::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfLowPowerClusterSleepCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace LowPower
+
+namespace MediaInput {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::SelectInput::Id: {
+            Commands::SelectInput::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterSelectInputCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ShowInputStatus::Id: {
+            Commands::ShowInputStatus::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterShowInputStatusCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::HideInputStatus::Id: {
+            Commands::HideInputStatus::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaInputClusterHideInputStatusCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace MediaInput
+
+namespace MediaPlayback {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Play::Id: {
+            Commands::Play::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaPlaybackClusterPlayCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Pause::Id: {
+            Commands::Pause::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaPlaybackClusterPauseCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StopPlayback::Id: {
+            Commands::StopPlayback::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfMediaPlaybackClusterStopPlaybackCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace MediaPlayback
+
+namespace ModeSelect {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ChangeToMode::Id: {
+            Commands::ChangeToMode::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfModeSelectClusterChangeToModeCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace ModeSelect
+
+namespace NetworkCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ScanNetworks::Id: {
+            Commands::ScanNetworks::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddOrUpdateWiFiNetwork::Id: {
+            Commands::AddOrUpdateWiFiNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfNetworkCommissioningClusterAddOrUpdateWiFiNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddOrUpdateThreadNetwork::Id: {
+            Commands::AddOrUpdateThreadNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveNetwork::Id: {
+            Commands::RemoveNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ConnectNetwork::Id: {
+            Commands::ConnectNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ReorderNetwork::Id: {
+            Commands::ReorderNetwork::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace NetworkCommissioning
+
+namespace OtaSoftwareUpdateRequestor {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AnnounceOtaProvider::Id: {
+            Commands::AnnounceOtaProvider::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace OtaSoftwareUpdateRequestor
+
+namespace OnOff {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Off::Id: {
+            Commands::Off::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOffCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::On::Id: {
+            Commands::On::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::Toggle::Id: {
+            Commands::Toggle::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace OnOff
+
+namespace OperationalCredentials {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AttestationRequest::Id: {
+            Commands::AttestationRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::CertificateChainRequest::Id: {
+            Commands::CertificateChainRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::CSRRequest::Id: {
+            Commands::CSRRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddNOC::Id: {
+            Commands::AddNOC::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::UpdateNOC::Id: {
+            Commands::UpdateNOC::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::UpdateFabricLabel::Id: {
+            Commands::UpdateFabricLabel::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveFabric::Id: {
+            Commands::RemoveFabric::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::AddTrustedRootCertificate::Id: {
+            Commands::AddTrustedRootCertificate::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace OperationalCredentials
+
+namespace Scenes {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::AddScene::Id: {
+            Commands::AddScene::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterAddSceneCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ViewScene::Id: {
+            Commands::ViewScene::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveScene::Id: {
+            Commands::RemoveScene::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RemoveAllScenes::Id: {
+            Commands::RemoveAllScenes::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterRemoveAllScenesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StoreScene::Id: {
+            Commands::StoreScene::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RecallScene::Id: {
+            Commands::RecallScene::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::GetSceneMembership::Id: {
+            Commands::GetSceneMembership::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Scenes
+
+namespace TargetNavigator {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::NavigateTarget::Id: {
+            Commands::NavigateTarget::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTargetNavigatorClusterNavigateTargetCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace TargetNavigator
+
+namespace TestCluster {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Test::Id: {
+            Commands::Test::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestNotHandled::Id: {
+            Commands::TestNotHandled::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestNotHandledCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestSpecific::Id: {
+            Commands::TestSpecific::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestSpecificCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestAddArguments::Id: {
+            Commands::TestAddArguments::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestAddArgumentsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestStructArgumentRequest::Id: {
+            Commands::TestStructArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestNestedStructArgumentRequest::Id: {
+            Commands::TestNestedStructArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfTestClusterClusterTestNestedStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestListStructArgumentRequest::Id: {
+            Commands::TestListStructArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfTestClusterClusterTestListStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestListInt8UArgumentRequest::Id: {
+            Commands::TestListInt8UArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestListInt8UArgumentRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestNestedStructListArgumentRequest::Id: {
+            Commands::TestNestedStructListArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfTestClusterClusterTestNestedStructListArgumentRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestListNestedStructListArgumentRequest::Id: {
+            Commands::TestListNestedStructListArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestListNestedStructListArgumentRequestCallback(apCommandObj, aCommandPath,
+                                                                                                      commandData);
+            }
+            break;
+        }
+        case Commands::TestListInt8UReverseRequest::Id: {
+            Commands::TestListInt8UReverseRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestListInt8UReverseRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestEnumsRequest::Id: {
+            Commands::TestEnumsRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestEnumsRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestNullableOptionalRequest::Id: {
+            Commands::TestNullableOptionalRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestNullableOptionalRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::SimpleStructEchoRequest::Id: {
+            Commands::SimpleStructEchoRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterSimpleStructEchoRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TimedInvokeRequest::Id: {
+            Commands::TimedInvokeRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTimedInvokeRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestSimpleOptionalArgumentRequest::Id: {
+            Commands::TestSimpleOptionalArgumentRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfTestClusterClusterTestSimpleOptionalArgumentRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestEmitTestEventRequest::Id: {
+            Commands::TestEmitTestEventRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfTestClusterClusterTestEmitTestEventRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TestEmitTestFabricScopedEventRequest::Id: {
+            Commands::TestEmitTestFabricScopedEventRequest::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfTestClusterClusterTestEmitTestFabricScopedEventRequestCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace TestCluster
+
+namespace Thermostat {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::SetpointRaiseLower::Id: {
+            Commands::SetpointRaiseLower::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfThermostatClusterSetpointRaiseLowerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Thermostat
+
+namespace WindowCovering {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::UpOrOpen::Id: {
+            Commands::UpOrOpen::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::DownOrClose::Id: {
+            Commands::DownOrClose::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfWindowCoveringClusterDownOrCloseCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::StopMotion::Id: {
+            Commands::StopMotion::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace WindowCovering
+
+} // namespace Clusters
+
+void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj)
+{
+    Compatibility::SetupEmberAfCommandHandler(apCommandObj, aCommandPath);
+
+    switch (aCommandPath.mClusterId)
+    {
+    case Clusters::AccountLogin::Id:
+        Clusters::AccountLogin::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::AdministratorCommissioning::Id:
+        Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::ApplicationLauncher::Id:
+        Clusters::ApplicationLauncher::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::AudioOutput::Id:
+        Clusters::AudioOutput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Channel::Id:
+        Clusters::Channel::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::DiagnosticLogs::Id:
+        Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::DoorLock::Id:
+        Clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::EthernetNetworkDiagnostics::Id:
+        Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GeneralCommissioning::Id:
+        Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Groups::Id:
+        Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Identify::Id:
+        Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::KeypadInput::Id:
+        Clusters::KeypadInput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::LevelControl::Id:
+        Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::LowPower::Id:
+        Clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::MediaInput::Id:
+        Clusters::MediaInput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::MediaPlayback::Id:
+        Clusters::MediaPlayback::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::ModeSelect::Id:
+        Clusters::ModeSelect::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::NetworkCommissioning::Id:
+        Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::OtaSoftwareUpdateRequestor::Id:
+        Clusters::OtaSoftwareUpdateRequestor::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::OnOff::Id:
+        Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::OperationalCredentials::Id:
+        Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Scenes::Id:
+        Clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::TargetNavigator::Id:
+        Clusters::TargetNavigator::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::TestCluster::Id:
+        Clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Thermostat::Id:
+        Clusters::Thermostat::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::WindowCovering::Id:
+        Clusters::WindowCovering::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    default:
+        ChipLogError(Zcl, "Unknown cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mClusterId));
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCluster);
+        break;
+    }
+
+    Compatibility::ResetEmberAfObjects();
+}
+
+} // namespace app
+} // namespace chip
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
new file mode 100644
index 00000000000000..f9e37bf1d34e90
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
@@ -0,0 +1,83 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#pragma once
+
+#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
+
+#define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterAccountLoginPluginServerInitCallback();                                                                                  \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterApplicationBasicPluginServerInitCallback();                                                                              \
+    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
+    MatterAudioOutputPluginServerInitCallback();                                                                                   \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterBindingPluginServerInitCallback();                                                                                       \
+    MatterBooleanStatePluginServerInitCallback();                                                                                  \
+    MatterBridgedActionsPluginServerInitCallback();                                                                                \
+    MatterChannelPluginServerInitCallback();                                                                                       \
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterDoorLockPluginServerInitCallback();                                                                                      \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterFanControlPluginServerInitCallback();                                                                                    \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
+    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterLowPowerPluginServerInitCallback();                                                                                      \
+    MatterMediaInputPluginServerInitCallback();                                                                                    \
+    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
+    MatterModeSelectPluginServerInitCallback();                                                                                    \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
+    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
+    MatterOccupancySensingPluginServerInitCallback();                                                                              \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
+    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
+    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
+    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
+    MatterTestClusterPluginServerInitCallback();                                                                                   \
+    MatterThermostatPluginServerInitCallback();                                                                                    \
+    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterWakeOnLanPluginServerInitCallback();                                                                                     \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterWindowCoveringPluginServerInitCallback();
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/access.h b/zzz_generated/all-clusters-minimal-app/zap-generated/access.h
new file mode 100644
index 00000000000000..dcc08ca1ce86ea
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/access.h
@@ -0,0 +1,299 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+#include <app/util/privilege-storage.h>
+
+// Prevent changing generated format
+// clang-format off
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, attribute, privilege) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
+    /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
+    /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
+    /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+}
+
+// Parallel array data (cluster, *attribute*, privilege) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
+    /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
+    /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
+    /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+}
+
+// Parallel array data (cluster, attribute, *privilege*) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
+    /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
+    /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
+    /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, attribute, privilege) for write attribute
+#define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
+    40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
+    257, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
+    513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
+    513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
+    516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+}
+
+// Parallel array data (cluster, *attribute*, privilege) for write attribute
+#define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
+    6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
+    35, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
+    37, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
+    27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
+    28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
+    1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+}
+
+// Parallel array data (cluster, attribute, *privilege*) for write attribute
+#define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, command, privilege) for invoke command
+#define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+}
+
+// Parallel array data (cluster, *command*, privilege) for invoke command
+#define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
+    3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
+    4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
+    5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
+    2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
+    3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
+    4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
+    6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
+    8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
+    2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
+    4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
+    6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
+    9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
+    10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
+    11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+}
+
+// Parallel array data (cluster, command, *privilege*) for invoke command
+#define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Parallel array data (*cluster*, event, privilege) for read event
+#define GENERATED_ACCESS_READ_EVENT__CLUSTER { \
+    31, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
+    31, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
+}
+
+// Parallel array data (cluster, *event*, privilege) for read event
+#define GENERATED_ACCESS_READ_EVENT__EVENT { \
+    0, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
+    1, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
+}
+
+// Parallel array data (cluster, event, *privilege*) for read event
+#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// clang-format on
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/af-gen-event.h b/zzz_generated/all-clusters-minimal-app/zap-generated/af-gen-event.h
new file mode 100644
index 00000000000000..413268cb17d0fb
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/af-gen-event.h
@@ -0,0 +1,77 @@
+/**
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *
+ *    Copyright (c) 2020 Silicon Labs
+ *
+ *    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 file is generated by Simplicity Studio.  Please do not edit manually.
+//
+//
+
+// Enclosing macro to prevent multiple inclusion
+#ifndef __AF_GEN_EVENT__
+#define __AF_GEN_EVENT__
+
+// Code used to configure the cluster event mechanism
+#define EMBER_AF_GENERATED_EVENT_CODE                                                                                              \
+    EmberEventControl emberAfLevelControlClusterServerTickCallbackControl1;                                                        \
+    extern void emberAfPluginDoorLockServerLockoutEventHandler(void);                                                              \
+    extern void emberAfPluginDoorLockServerRelockEventHandler(void);                                                               \
+    static void clusterTickWrapper(EmberEventControl * control, EmberAfTickFunction callback, chip::EndpointId endpoint)           \
+    {                                                                                                                              \
+        /* emberAfPushEndpointNetworkIndex(endpoint); */                                                                           \
+        emberEventControlSetInactive(control);                                                                                     \
+        (*callback)(endpoint);                                                                                                     \
+        /* emberAfPopNetworkIndex(); */                                                                                            \
+    }                                                                                                                              \
+    void emberAfLevelControlClusterServerTickCallbackWrapperFunction1(void)                                                        \
+    {                                                                                                                              \
+        clusterTickWrapper(&emberAfLevelControlClusterServerTickCallbackControl1, emberAfLevelControlClusterServerTickCallback,    \
+                           1);                                                                                                     \
+    }                                                                                                                              \
+    /*to finish*/
+
+// EmberEventData structs used to populate the EmberEventData table
+#define EMBER_AF_GENERATED_EVENTS                                                                                                  \
+    { &emberAfLevelControlClusterServerTickCallbackControl1, emberAfLevelControlClusterServerTickCallbackWrapperFunction1 },
+
+#define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
+    "Level Control Cluster Server EP 1", "Door Lock Server Cluster Plugin Lockout", "Door Lock Server Cluster Plugin Relock",
+
+// The length of the event context table used to track and retrieve cluster events
+#define EMBER_AF_EVENT_CONTEXT_LENGTH 3
+
+// EmberAfEventContext structs used to populate the EmberAfEventContext table
+#define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
+    {                                                                                                                              \
+        0x1, 0x8, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfLevelControlClusterServerTickCallbackControl1           \
+    }
+
+#endif // __AF_GEN_EVENT__
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
new file mode 100644
index 00000000000000..4f6d431583fd13
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
@@ -0,0 +1,599 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/cluster-id.h>
+#include <lib/support/Span.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+
+// Cluster Init Functions
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+{
+    switch (clusterId)
+    {
+    case ZCL_ACCESS_CONTROL_CLUSTER_ID:
+        emberAfAccessControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_ACCOUNT_LOGIN_CLUSTER_ID:
+        emberAfAccountLoginClusterInitCallback(endpoint);
+        break;
+    case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
+        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
+        break;
+    case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+        emberAfApplicationBasicClusterInitCallback(endpoint);
+        break;
+    case ZCL_APPLICATION_LAUNCHER_CLUSTER_ID:
+        emberAfApplicationLauncherClusterInitCallback(endpoint);
+        break;
+    case ZCL_AUDIO_OUTPUT_CLUSTER_ID:
+        emberAfAudioOutputClusterInitCallback(endpoint);
+        break;
+    case ZCL_BASIC_CLUSTER_ID:
+        emberAfBasicClusterInitCallback(endpoint);
+        break;
+    case ZCL_BINDING_CLUSTER_ID:
+        emberAfBindingClusterInitCallback(endpoint);
+        break;
+    case ZCL_BOOLEAN_STATE_CLUSTER_ID:
+        emberAfBooleanStateClusterInitCallback(endpoint);
+        break;
+    case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
+        emberAfBridgedActionsClusterInitCallback(endpoint);
+        break;
+    case ZCL_CHANNEL_CLUSTER_ID:
+        emberAfChannelClusterInitCallback(endpoint);
+        break;
+    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        emberAfColorControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_CONTENT_LAUNCH_CLUSTER_ID:
+        emberAfContentLauncherClusterInitCallback(endpoint);
+        break;
+    case ZCL_DESCRIPTOR_CLUSTER_ID:
+        emberAfDescriptorClusterInitCallback(endpoint);
+        break;
+    case ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID:
+        emberAfDiagnosticLogsClusterInitCallback(endpoint);
+        break;
+    case ZCL_DOOR_LOCK_CLUSTER_ID:
+        emberAfDoorLockClusterInitCallback(endpoint);
+        break;
+    case ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID:
+        emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_FAN_CONTROL_CLUSTER_ID:
+        emberAfFanControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_FIXED_LABEL_CLUSTER_ID:
+        emberAfFixedLabelClusterInitCallback(endpoint);
+        break;
+    case ZCL_FLOW_MEASUREMENT_CLUSTER_ID:
+        emberAfFlowMeasurementClusterInitCallback(endpoint);
+        break;
+    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+        emberAfGeneralCommissioningClusterInitCallback(endpoint);
+        break;
+    case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID:
+        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
+    case ZCL_GROUPS_CLUSTER_ID:
+        emberAfGroupsClusterInitCallback(endpoint);
+        break;
+    case ZCL_IDENTIFY_CLUSTER_ID:
+        emberAfIdentifyClusterInitCallback(endpoint);
+        break;
+    case ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID:
+        emberAfIlluminanceMeasurementClusterInitCallback(endpoint);
+        break;
+    case ZCL_KEYPAD_INPUT_CLUSTER_ID:
+        emberAfKeypadInputClusterInitCallback(endpoint);
+        break;
+    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        emberAfLevelControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID:
+        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
+        break;
+    case ZCL_LOW_POWER_CLUSTER_ID:
+        emberAfLowPowerClusterInitCallback(endpoint);
+        break;
+    case ZCL_MEDIA_INPUT_CLUSTER_ID:
+        emberAfMediaInputClusterInitCallback(endpoint);
+        break;
+    case ZCL_MEDIA_PLAYBACK_CLUSTER_ID:
+        emberAfMediaPlaybackClusterInitCallback(endpoint);
+        break;
+    case ZCL_MODE_SELECT_CLUSTER_ID:
+        emberAfModeSelectClusterInitCallback(endpoint);
+        break;
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        emberAfNetworkCommissioningClusterInitCallback(endpoint);
+        break;
+    case ZCL_OTA_PROVIDER_CLUSTER_ID:
+        emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint);
+        break;
+    case ZCL_OTA_REQUESTOR_CLUSTER_ID:
+        emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
+        break;
+    case ZCL_OCCUPANCY_SENSING_CLUSTER_ID:
+        emberAfOccupancySensingClusterInitCallback(endpoint);
+        break;
+    case ZCL_ON_OFF_CLUSTER_ID:
+        emberAfOnOffClusterInitCallback(endpoint);
+        break;
+    case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID:
+        emberAfOperationalCredentialsClusterInitCallback(endpoint);
+        break;
+    case ZCL_POWER_SOURCE_CLUSTER_ID:
+        emberAfPowerSourceClusterInitCallback(endpoint);
+        break;
+    case ZCL_POWER_SOURCE_CONFIGURATION_CLUSTER_ID:
+        emberAfPowerSourceConfigurationClusterInitCallback(endpoint);
+        break;
+    case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID:
+        emberAfPressureMeasurementClusterInitCallback(endpoint);
+        break;
+    case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID:
+        emberAfPumpConfigurationAndControlClusterInitCallback(endpoint);
+        break;
+    case ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID:
+        emberAfRelativeHumidityMeasurementClusterInitCallback(endpoint);
+        break;
+    case ZCL_SCENES_CLUSTER_ID:
+        emberAfScenesClusterInitCallback(endpoint);
+        break;
+    case ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID:
+        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_SWITCH_CLUSTER_ID:
+        emberAfSwitchClusterInitCallback(endpoint);
+        break;
+    case ZCL_TARGET_NAVIGATOR_CLUSTER_ID:
+        emberAfTargetNavigatorClusterInitCallback(endpoint);
+        break;
+    case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+        emberAfTemperatureMeasurementClusterInitCallback(endpoint);
+        break;
+    case ZCL_TEST_CLUSTER_ID:
+        emberAfTestClusterClusterInitCallback(endpoint);
+        break;
+    case ZCL_THERMOSTAT_CLUSTER_ID:
+        emberAfThermostatClusterInitCallback(endpoint);
+        break;
+    case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID:
+        emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint);
+        break;
+    case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID:
+        emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID:
+        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
+        break;
+    case ZCL_UNIT_LOCALIZATION_CLUSTER_ID:
+        emberAfUnitLocalizationClusterInitCallback(endpoint);
+        break;
+    case ZCL_USER_LABEL_CLUSTER_ID:
+        emberAfUserLabelClusterInitCallback(endpoint);
+        break;
+    case ZCL_WAKE_ON_LAN_CLUSTER_ID:
+        emberAfWakeOnLanClusterInitCallback(endpoint);
+        break;
+    case ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID:
+        emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_WINDOW_COVERING_CLUSTER_ID:
+        emberAfWindowCoveringClusterInitCallback(endpoint);
+        break;
+    default:
+        // Unrecognized cluster ID
+        break;
+    }
+}
+
+void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfAccountLoginClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfApplicationBasicClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfApplicationLauncherClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfAudioOutputClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfBindingClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfBooleanStateClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfChannelClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfColorControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfContentLauncherClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfDiagnosticLogsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfDoorLockClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfEthernetNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfFanControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfFixedLabelClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfFlowMeasurementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGroupsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfIlluminanceMeasurementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfKeypadInputClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfLevelControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfLowPowerClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfMediaInputClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfMediaPlaybackClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfModeSelectClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOtaSoftwareUpdateProviderClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOtaSoftwareUpdateRequestorClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOccupancySensingClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOnOffClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfOperationalCredentialsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfPowerSourceClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfPowerSourceConfigurationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfPressureMeasurementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfPumpConfigurationAndControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfRelativeHumidityMeasurementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfScenesClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfSoftwareDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfSwitchClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfTargetNavigatorClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfTemperatureMeasurementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfTestClusterClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfThermostatClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfThermostatUserInterfaceConfigurationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfTimeFormatLocalizationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfUnitLocalizationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfUserLabelClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfWakeOnLanClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+
+//
+// Non-Cluster Related Callbacks
+//
+
+void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
+
+void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
+
+EmberAfAttributeWritePermission __attribute__((weak))
+emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
+                                          uint8_t type)
+{
+    return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
+}
+
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
+{
+    return true;
+}
+
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
+{
+    return true;
+}
+
+bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+{
+    return false;
+}
+
+bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+{
+    return false;
+}
+
+bool __attribute__((weak)) emberAfMessageSentCallback(const MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                      uint16_t msgLen, uint8_t * message, EmberStatus status)
+{
+    return false;
+}
+
+EmberAfStatus __attribute__((weak))
+emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata,
+                                     uint8_t * buffer, uint16_t maxReadLength)
+{
+    return EMBER_ZCL_STATUS_FAILURE;
+}
+
+EmberAfStatus __attribute__((weak))
+emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata,
+                                      uint8_t * buffer)
+{
+    return EMBER_ZCL_STATUS_FAILURE;
+}
+
+uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
+{
+    return 0;
+}
+
+bool __attribute__((weak))
+emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+{
+    return false;
+}
+
+void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
+
+EmberStatus __attribute__((weak))
+emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+{
+    return EMBER_LIBRARY_NOT_PRESENT;
+}
+
+bool __attribute__((weak)) emberAfStartMoveCallback()
+{
+    return false;
+}
+
+chip::Protocols::InteractionModel::Status __attribute__((weak))
+MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                 uint8_t * value)
+{
+    return chip::Protocols::InteractionModel::Status::Success;
+}
+
+void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type,
+                                                             uint16_t size, uint8_t * value)
+{}
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
new file mode 100644
index 00000000000000..6eec22a07af65e
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
@@ -0,0 +1,2269 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+#include <lib/core/CHIPConfig.h>
+
+// Default values for the attributes longer than a pointer,
+// in a form of a binary blob
+// Separate block is generated for big-endian and little-endian cases.
+#if BIGENDIAN_CPU
+#define GENERATED_DEFAULTS                                                                                                         \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Localization Configuration (server), big-endian */                                                \
+                                                                                                                                   \
+        /* 0 - ActiveLocale, */                                                                                                    \
+        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Power Source (server), big-endian */                                                          \
+                                                                                                                                   \
+            /* 6 - Description, */                                                                                                 \
+            2, 'B', '1',                                                                                                           \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                 \
+                                                                                                                                   \
+            /* 9 - Breadcrumb, */                                                                                                  \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Power Source (server), big-endian */                                                          \
+                                                                                                                                   \
+            /* 17 - Description, */                                                                                                \
+            2, 'B', '2',                                                                                                           \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Mode Select (server), big-endian */                                                           \
+                                                                                                                                   \
+            /* 20 - Description, */                                                                                                \
+            6, 'C', 'o', 'f', 'f', 'e', 'e',                                                                                       \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Test Cluster (server), big-endian */                                                          \
+                                                                                                                                   \
+            /* 27 - bitmap64, */                                                                                                   \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 35 - int40u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 40 - int48u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 46 - int56u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 53 - int64u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 61 - int40s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 66 - int48s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 72 - int56s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 79 - int64s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 87 - float_double, */                                                                                               \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 95 - epoch_us, */                                                                                                   \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 103 - nullable_bitmap64, */                                                                                         \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 111 - nullable_int40u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 116 - nullable_int48u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 122 - nullable_int56u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 129 - nullable_int64u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 137 - nullable_int40s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 142 - nullable_int48s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 148 - nullable_int56s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 155 - nullable_int64s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 163 - nullable_float_double, */                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: Power Source (server), big-endian */                                                          \
+                                                                                                                                   \
+            /* 171 - Description, */                                                                                               \
+            2, 'B', '3',                                                                                                           \
+    }
+
+#else // !BIGENDIAN_CPU
+#define GENERATED_DEFAULTS                                                                                                         \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Localization Configuration (server), little-endian */                                             \
+                                                                                                                                   \
+        /* 0 - ActiveLocale, */                                                                                                    \
+        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Power Source (server), little-endian */                                                       \
+                                                                                                                                   \
+            /* 6 - Description, */                                                                                                 \
+            2, 'B', '1',                                                                                                           \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                              \
+                                                                                                                                   \
+            /* 9 - Breadcrumb, */                                                                                                  \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Power Source (server), little-endian */                                                       \
+                                                                                                                                   \
+            /* 17 - Description, */                                                                                                \
+            2, 'B', '2',                                                                                                           \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Mode Select (server), little-endian */                                                        \
+                                                                                                                                   \
+            /* 20 - Description, */                                                                                                \
+            6, 'C', 'o', 'f', 'f', 'e', 'e',                                                                                       \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Test Cluster (server), little-endian */                                                       \
+                                                                                                                                   \
+            /* 27 - bitmap64, */                                                                                                   \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 35 - int40u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 40 - int48u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 46 - int56u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 53 - int64u, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 61 - int40s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 66 - int48s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 72 - int56s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 79 - int64s, */                                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 87 - float_double, */                                                                                               \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 95 - epoch_us, */                                                                                                   \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 103 - nullable_bitmap64, */                                                                                         \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 111 - nullable_int40u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 116 - nullable_int48u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 122 - nullable_int56u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 129 - nullable_int64u, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 137 - nullable_int40s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
+                                                                                                                                   \
+            /* 142 - nullable_int48s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+                                                                                                                                   \
+            /* 148 - nullable_int56s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+                                                                                                                                   \
+            /* 155 - nullable_int64s, */                                                                                           \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* 163 - nullable_float_double, */                                                                                     \
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: Power Source (server), little-endian */                                                       \
+                                                                                                                                   \
+            /* 171 - Description, */                                                                                               \
+            2, 'B', '3',                                                                                                           \
+    }
+
+#endif // BIGENDIAN_CPU
+
+#define GENERATED_DEFAULTS_COUNT (27)
+
+#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
+    {                                                                                                                              \
+        &generatedDefaults[index]                                                                                                  \
+    }
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
+    {                                                                                                                              \
+        &minMaxDefaults[index]                                                                                                     \
+    }
+#define ZAP_EMPTY_DEFAULT()                                                                                                        \
+    {                                                                                                                              \
+        (uint32_t) 0                                                                                                               \
+    }
+#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
+    {                                                                                                                              \
+        (uint32_t) x                                                                                                               \
+    }
+
+// This is an array of EmberAfAttributeMinMaxValue structures.
+#define GENERATED_MIN_MAX_DEFAULT_COUNT 21
+#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                              \
+        { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */                                                       \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 }, /* options */                                                      \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Door Lock (server) */                                                                         \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x4 }, /* OperatingMode */                                                \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Window Covering (server) */                                                                   \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xF }, /* Mode */                                                         \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */                                                    \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 }, /* OperationMode */                                                \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Thermostat (server) */                                                                        \
+            { (uint16_t) 0x7D0, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */                             \
+            { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 },          /* ControlSequenceOfOperation */                          \
+            { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 },          /* SystemMode */                                          \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 },  /* fan mode */                                                    \
+            { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 },  /* fan mode sequence */                                           \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* percent setting */                                             \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */                                           \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */                                     \
+            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* keypad lockout */                                               \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Test Cluster (server) */                                                                      \
+            { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 },   /* range_restricted_int8u */                                  \
+            { (uint16_t) -0x14, (uint16_t) -0x28, (uint16_t) 0x32 }, /* range_restricted_int8s */                                  \
+            { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 },  /* range_restricted_int16u */                                 \
+            { (uint16_t) -0x64, (uint16_t) -0x96, (uint16_t) 0xC8 }, /* range_restricted_int16s */                                 \
+            { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 },   /* nullable_range_restricted_int8u */                         \
+            { (uint16_t) -0x14, (uint16_t) -0x28, (uint16_t) 0x32 }, /* nullable_range_restricted_int8s */                         \
+            { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 },  /* nullable_range_restricted_int16u */                        \
+        {                                                                                                                          \
+            (uint16_t) - 0x64, (uint16_t) -0x96, (uint16_t) 0xC8                                                                   \
+        } /* nullable_range_restricted_int16s */                                                                                   \
+    }
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+// This is an array of EmberAfAttributeMetadata structures.
+#define GENERATED_ATTRIBUTE_COUNT 437
+#define GENERATED_ATTRIBUTES                                                                                                       \
+    {                                                                                                                              \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Identify (server) */                                                                              \
+        { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* identify time */         \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x0) },                            /* identify type */         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                           /* FeatureMap */            \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                             /* ClusterRevision */       \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Groups (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Descriptor (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
+            { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* parts list */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Binding (server) */                                                                           \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* Binding */                                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Access Control (server) */                                                                    \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* ACL */                                                                                     \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* SubjectsPerAccessControlEntry */                                                           \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TargetsPerAccessControlEntry */                                                            \
+            { 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* AccessControlEntriesPerFabric */                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Basic (server) */                                                                             \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* DataModelRevision */                                                                       \
+            { 0x00000001, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* VendorName */                                                                              \
+            { 0x00000002, ZAP_TYPE(VENDOR_ID), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),            \
+              ZAP_EMPTY_DEFAULT() }, /* VendorID */                                                                                \
+            { 0x00000003, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* ProductName */                                                                             \
+            { 0x00000004, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* ProductID */                                                                               \
+            { 0x00000005, ZAP_TYPE(CHAR_STRING), 33,                                                                               \
+              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_EMPTY_DEFAULT() }, /* NodeLabel */                                                                               \
+            { 0x00000006, ZAP_TYPE(CHAR_STRING), 0,                                                                                \
+              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* Location */                                                                                \
+            { 0x00000007, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* HardwareVersion */                                                                         \
+            { 0x00000008, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* HardwareVersionString */                                                                   \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),               \
+              ZAP_EMPTY_DEFAULT() }, /* SoftwareVersion */                                                                         \
+            { 0x0000000A, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
+              ZAP_EMPTY_DEFAULT() }, /* SoftwareVersionString */                                                                   \
+            { 0x00000013, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CapabilityMinima */ \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) },      /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                     \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                 /* DefaultOtaProviders */     \
+            { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* UpdatePossible */          \
+            { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },                            /* UpdateState */             \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                         /* FeatureMap */              \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                           /* ClusterRevision */         \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(CHAR_STRING), 36, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                  \
+              ZAP_LONG_DEFAULTS_INDEX(0) },                                                                /* ActiveLocale */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedLocales */  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                          \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(0) },                               /* HourFormat */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Unit Localization (server) */                                                                 \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Power Source Configuration (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Sources */           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Power Source (server) */                                                                      \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },             /* Status */                                 \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(3) },             /* Order */                                  \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(6) }, /* Description */                            \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },          /* FeatureMap */                             \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },            /* ClusterRevision */                        \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Commissioning (server) */                                                             \
+            { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(9) }, /* Breadcrumb */        \
+            { 0x00000001, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BasicCommissioningInfo */                                                                  \
+            { 0x00000002, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RegulatoryConfig */  \
+            { 0x00000003, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* LocationCapability */                                                                      \
+            { 0x00000004, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* SupportsConcurrentConnection */                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                             \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* MaxNetworks */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Networks */          \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                              /* ScanMaxTimeSeconds */      \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                              /* ConnectMaxTimeSeconds */   \
+            { 0x00000004, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* InterfaceEnabled */        \
+            { 0x00000005, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },   /* LastNetworkingStatus */    \
+            { 0x00000006, ZAP_TYPE(OCTET_STRING), 33, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LastNetworkID */     \
+            { 0x00000007, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LastConnectErrorValue */    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(2) },                        /* FeatureMap */               \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* ClusterRevision */          \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \
+            { 0x00000001, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RebootCount */      \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* MeshLocalPrefix */   \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
+            { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
+            { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaultsList */                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */                                                          \
+            { 0x00000000, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* bssid */                                                                                   \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityType */                                                                            \
+            { 0x00000002, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* WiFiVersion */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelNumber */                                                                           \
+            { 0x00000004, ZAP_TYPE(INT8S), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* Rssi */                                            \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */                                                      \
+            { 0x00000000, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* PHYRate */                                                                                 \
+            { 0x00000001, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),               \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* FullDuplex */       \
+            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* PacketRxCount */    \
+            { 0x00000003, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* PacketTxCount */    \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCount */       \
+            { 0x00000005, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CollisionCount */   \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
+            { 0x00000007, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),               \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* CarrierDetect */    \
+            { 0x00000008, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TimeSinceReset */   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(3) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* WindowStatus */      \
+            { 0x00000001, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* AdminFabricIndex */ \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AdminVendorId */    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                           \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NOCs */              \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Fabrics */           \
+            { 0x00000002, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedFabrics */  \
+            { 0x00000003, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */                                                                     \
+            { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */                                                                 \
+            { 0x00000005, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
+              ZAP_EMPTY_DEFAULT() },                                         /* CurrentFabricIndex */                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: User Label (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* label list */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */                                                     \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },   /* measured value */         \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* min measured value */     \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x2710) },                                  /* max measured value */                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Identify (server) */                                                                          \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* identify time */     \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x0) },                                /* identify type */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Groups (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Scenes (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* SceneCount */                                 \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* CurrentScene */                               \
+            { 0x00000002, ZAP_TYPE(GROUP_ID), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* CurrentGroup */                               \
+            { 0x00000003, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* SceneValid */                                 \
+            { 0x00000004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* NameSupport */                                \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },      /* FeatureMap */                                 \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },        /* ClusterRevision */                            \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                              /* FeatureMap */         \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                                /* ClusterRevision */    \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0xFE) }, /* current level */        \
+            { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                        \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(1) }, /* options */                                                                       \
+            { 0x00000011, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0xFF) },                                    /* on level */                                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
+            { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* parts list */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Binding (server) */                                                                           \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* Binding */                                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Bridged Actions (server) */                                                                   \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* action list */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* endpoint list */    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Power Source (server) */                                                                      \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },              /* Status */                                \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },              /* Order */                                 \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(17) }, /* Description */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },           /* FeatureMap */                            \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },             /* ClusterRevision */                       \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Switch (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },    /* number of positions */                             \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },      /* current position */                                \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Fixed Label (server) */                                                                       \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: User Label (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* label list */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Boolean State (server) */                                                                     \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0) },  /* StateValue */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Mode Select (server) */                                                                       \
+            { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_LONG_DEFAULTS_INDEX(20) },                     /* Description */       \
+            { 0x00000001, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) },      /* StandardNamespace */ \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedModes */    \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0) },       /* CurrentMode */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Door Lock (server) */                                                                         \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(2) },   /* LockState */             \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                                /* LockType */              \
+            { 0x00000002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() },                              /* ActuatorEnabled */       \
+            { 0x00000023, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(60) }, /* AutoRelockTime */        \
+            { 0x00000025, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(2) },                                    /* OperatingMode */                              \
+            { 0x00000026, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFF6) }, /* SupportedOperatingModes */                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },      /* FeatureMap */                                 \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(6) },        /* ClusterRevision */                            \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Window Covering (server) */                                                                   \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                              /* Type */               \
+            { 0x00000007, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x03) }, /* ConfigStatus */       \
+            { 0x0000000A, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                            /* OperationalStatus */  \
+            { 0x0000000D, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                              /* EndProductType */     \
+            { 0x00000017, ZAP_TYPE(BITMAP8), 1,                                                                                    \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(3) },                               /* Mode */                                            \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */                                                    \
+            { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* MaxPressure */              \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* MaxSpeed */                 \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* MaxFlow */                  \
+            { 0x00000011, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                             /* EffectiveOperationMode */   \
+            { 0x00000012, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                             /* EffectiveControlMode */     \
+            { 0x00000013, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* Capacity */                 \
+            { 0x00000020, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(4) },                               /* OperationMode */                                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Thermostat (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LocalTemperature */         \
+            { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* OccupiedHeatingSetpoint */                                                       \
+            { 0x0000001B, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* ControlSequenceOfOperation */                                                    \
+            { 0x0000001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(7) },                               /* SystemMode */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* fan mode */                                                                      \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* fan mode sequence */                                                             \
+            { 0x00000002, ZAP_TYPE(INT8U), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(10) },                              /* percent setting */                                 \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* percent current */                                 \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */                                           \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* temperature display mode */                                                     \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(12) },                              /* keypad lockout */                                  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Color Control (server) */                                                                     \
+            { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                              /* ColorMode */          \
+            { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Options */            \
+            { 0x00000010, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) },      /* NumberOfPrimaries */  \
+            { 0x00004001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                              /* EnhancedColorMode */  \
+            { 0x0000400A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* ColorCapabilities */  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                              /* FeatureMap */         \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },                                /* ClusterRevision */    \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Illuminance Measurement (server) */                                                           \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* MeasuredValue */     \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x01) },   /* MinMeasuredValue */  \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0xFFFE) }, /* MaxMeasuredValue */  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                           \
+            { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MeasuredValue */     \
+            { 0x00000001, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MinMeasuredValue */  \
+            { 0x00000002, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MaxMeasuredValue */  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Pressure Measurement (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* MeasuredValue */     \
+            { 0x00000001, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* MinMeasuredValue */  \
+            { 0x00000002, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* MaxMeasuredValue */  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Flow Measurement (server) */                                                                  \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* MeasuredValue */            \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* MinMeasuredValue */         \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* MaxMeasuredValue */         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                        /* FeatureMap */               \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },                          /* ClusterRevision */          \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */                                                     \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },   /* measured value */         \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* min measured value */     \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x2710) },                                  /* max measured value */                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Occupancy Sensing (server) */                                                                 \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* occupancy */                                       \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },      /* occupancy sensor type */                           \
+            { 0x00000002, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* occupancy sensor type bitmap */                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Wake on LAN (server) */                                                                       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Channel (server) */                                                                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Target Navigator (server) */                                                                  \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TargetList */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Media Playback (server) */                                                                    \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentState */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Media Input (server) */                                                                       \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* InputList */         \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                               /* CurrentInput */      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Low Power (server) */                                                                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Keypad Input (server) */                                                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Content Launcher (server) */                                                                  \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Audio Output (server) */                                                                      \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OutputList */        \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                               /* CurrentOutput */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Application Launcher (server) */                                                              \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Application Basic (server) */                                                                 \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() },                              /* ApplicationName */  \
+            { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */      \
+            { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                                     /* Status */           \
+            { 0x00000006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationVersion */                            \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AllowedVendorList */ \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Account Login (server) */                                                                     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Test Cluster (server) */                                                                      \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(false) },    /* boolean */        \
+            { 0x00000001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },        /* bitmap8 */        \
+            { 0x00000002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },       /* bitmap16 */       \
+            { 0x00000003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },       /* bitmap32 */       \
+            { 0x00000004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(27) }, /* bitmap64 */       \
+            { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int8u */          \
+            { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int16u */         \
+            { 0x00000007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int24u */         \
+            { 0x00000008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int32u */         \
+            { 0x00000009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(35) },   /* int40u */         \
+            { 0x0000000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(40) },   /* int48u */         \
+            { 0x0000000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(46) },   /* int56u */         \
+            { 0x0000000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(53) },   /* int64u */         \
+            { 0x0000000D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int8s */          \
+            { 0x0000000E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int16s */         \
+            { 0x0000000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int24s */         \
+            { 0x00000010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int32s */         \
+            { 0x00000011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(61) },   /* int40s */         \
+            { 0x00000012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(66) },   /* int48s */         \
+            { 0x00000013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(72) },   /* int56s */         \
+            { 0x00000014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(79) },   /* int64s */         \
+            { 0x00000015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* enum8 */          \
+            { 0x00000016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* enum16 */         \
+            { 0x00000017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* float_single */   \
+            { 0x00000018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(87) },   /* float_double */   \
+            { 0x00000019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },    /* octet_string */   \
+            { 0x0000001A, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* list_int8u */                                                                              \
+            { 0x0000001B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* list_octet_string */                                                                       \
+            { 0x0000001C, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* list_struct_octet_string */                                                                \
+            { 0x0000001D, ZAP_TYPE(LONG_OCTET_STRING), 1002, ZAP_ATTRIBUTE_MASK(WRITABLE),                                         \
+              ZAP_EMPTY_DEFAULT() },                                                                      /* long_octet_string */  \
+            { 0x0000001E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* char_string */        \
+            { 0x0000001F, ZAP_TYPE(LONG_CHAR_STRING), 1002, ZAP_ATTRIBUTE_MASK(WRITABLE),                                          \
+              ZAP_EMPTY_DEFAULT() }, /* long_char_string */                                                                        \
+            { 0x00000020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(95) }, /* epoch_us */       \
+            { 0x00000021, ZAP_TYPE(EPOCH_S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },          /* epoch_s */        \
+            { 0x00000022, ZAP_TYPE(VENDOR_ID), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },        /* vendor_id */      \
+            { 0x00000023, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* list_nullables_and_optionals_struct */                                                     \
+            { 0x00000024, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* enum_attr */                 \
+            { 0x00000025, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* struct_attr */                                                                             \
+            { 0x00000026, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* range_restricted_int8u */                                                       \
+            { 0x00000027, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* range_restricted_int8s */                                                       \
+            { 0x00000028, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* range_restricted_int16u */                                                      \
+            { 0x00000029, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* range_restricted_int16s */                                                      \
+            { 0x0000002A, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* list_long_octet_string */                                                                  \
+            { 0x0000002B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* list_fabric_scoped */                                                                      \
+            { 0x00000030, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(MUST_USE_TIMED_WRITE),           \
+              ZAP_EMPTY_DEFAULT() }, /* timed_write_boolean */                                                                     \
+            { 0x00000031, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),               \
+              ZAP_EMPTY_DEFAULT() }, /* general_error_boolean */                                                                   \
+            { 0x00000032, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),               \
+              ZAP_EMPTY_DEFAULT() }, /* cluster_error_boolean */                                                                   \
+            { 0x00004000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                       \
+              ZAP_SIMPLE_DEFAULT(false) }, /* nullable_boolean */                                                                  \
+            { 0x00004001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                       \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap8 */                                                                      \
+            { 0x00004002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                      \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap16 */                                                                     \
+            { 0x00004003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                      \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap32 */                                                                     \
+            { 0x00004004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                      \
+              ZAP_LONG_DEFAULTS_INDEX(103) }, /* nullable_bitmap64 */                                                              \
+            { 0x00004005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8u */                                                                        \
+            { 0x00004006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16u */                                                                       \
+            { 0x00004007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int24u */                                                                       \
+            { 0x00004008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int32u */                                                                       \
+            { 0x00004009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(111) }, /* nullable_int40u */                                                                \
+            { 0x0000400A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(116) }, /* nullable_int48u */                                                                \
+            { 0x0000400B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(122) }, /* nullable_int56u */                                                                \
+            { 0x0000400C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(129) }, /* nullable_int64u */                                                                \
+            { 0x0000400D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8s */                                                                        \
+            { 0x0000400E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16s */                                                                       \
+            { 0x0000400F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int24s */                                                                       \
+            { 0x00004010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int32s */                                                                       \
+            { 0x00004011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(137) }, /* nullable_int40s */                                                                \
+            { 0x00004012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(142) }, /* nullable_int48s */                                                                \
+            { 0x00004013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(148) }, /* nullable_int56s */                                                                \
+            { 0x00004014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(155) }, /* nullable_int64s */                                                                \
+            { 0x00004015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum8 */                                                                        \
+            { 0x00004016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum16 */                                                                       \
+            { 0x00004017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_SIMPLE_DEFAULT(0) }, /* nullable_float_single */                                                                 \
+            { 0x00004018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
+              ZAP_LONG_DEFAULTS_INDEX(163) }, /* nullable_float_double */                                                          \
+            { 0x00004019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* nullable_octet_string */                                                                   \
+            { 0x0000401E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                  \
+              ZAP_EMPTY_DEFAULT() }, /* nullable_char_string */                                                                    \
+            { 0x00004024, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
+              ZAP_EMPTY_DEFAULT() }, /* nullable_enum_attr */                                                                      \
+            { 0x00004025, ZAP_TYPE(STRUCT), 0,                                                                                     \
+              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                  \
+              ZAP_EMPTY_DEFAULT() }, /* nullable_struct */                                                                         \
+            { 0x00004026, ZAP_TYPE(INT8U), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(17) }, /* nullable_range_restricted_int8u */                                              \
+            { 0x00004027, ZAP_TYPE(INT8S), 1,                                                                                      \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(18) }, /* nullable_range_restricted_int8s */                                              \
+            { 0x00004028, ZAP_TYPE(INT16U), 2,                                                                                     \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(19) }, /* nullable_range_restricted_int16u */                                             \
+            { 0x00004029, ZAP_TYPE(INT16S), 2,                                                                                     \
+              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(20) },                              /* nullable_range_restricted_int16s */                \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: Groups (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: On/Off (server) */                                                                            \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* OnOff */                                      \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* FeatureMap */                                 \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },        /* ClusterRevision */                            \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: Descriptor (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
+            { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* parts list */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: Power Source (server) */                                                                      \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },               /* Status */                               \
+            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) },               /* Order */                                \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(171) }, /* Description */                          \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },            /* FeatureMap */                           \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },              /* ClusterRevision */                      \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: Occupancy Sensing (server) */                                                                 \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* occupancy */                                       \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },      /* occupancy sensor type */                           \
+            { 0x00000002, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* occupancy sensor type bitmap */                    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 65534, Cluster: Network Commissioning (server) */                                                         \
+            { 0x00000000, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* MaxNetworks */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Networks */          \
+            { 0x00000002, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ScanMaxTimeSeconds */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ConnectMaxTimeSeconds */                                                                   \
+            { 0x00000004, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),               \
+              ZAP_EMPTY_DEFAULT() }, /* InterfaceEnabled */                                                                        \
+            { 0x00000005, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LastNetworkingStatus */                                                                    \
+            { 0x00000006, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* LastNetworkID */                                                                           \
+            { 0x00000007, ZAP_TYPE(INT32S), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* LastConnectErrorValue */                                                                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* FeatureMap */     \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
+    }
+
+// This is an array of EmberAfCluster structures.
+#define ZAP_ATTRIBUTE_INDEX(index) (&generatedAttributes[index])
+
+#define ZAP_GENERATED_COMMANDS_INDEX(index) ((chip::CommandId *) (&generatedCommands[index]))
+
+// Cluster function static arrays
+#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
+    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
+        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
+        (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback,                                       \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {                                                            \
+        (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,                                                    \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = {                                                             \
+        (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback,                                                     \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayLocalizationConfigurationServer[] = {                                         \
+        (EmberAfGenericClusterFunction) emberAfLocalizationConfigurationClusterServerInitCallback,                                 \
+        (EmberAfGenericClusterFunction) MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback,                   \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayTimeFormatLocalizationServer[] = {                                            \
+        (EmberAfGenericClusterFunction) emberAfTimeFormatLocalizationClusterServerInitCallback,                                    \
+        (EmberAfGenericClusterFunction) MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback,                      \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {                                                            \
+        (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,                                                    \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
+        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
+        (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayModeSelectServer[] = {                                                        \
+        (EmberAfGenericClusterFunction) emberAfModeSelectClusterServerInitCallback,                                                \
+        (EmberAfGenericClusterFunction) MatterModeSelectClusterServerPreAttributeChangedCallback,                                  \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayDoorLockServer[] = {                                                          \
+        (EmberAfGenericClusterFunction) MatterDoorLockClusterServerAttributeChangedCallback,                                       \
+        (EmberAfGenericClusterFunction) MatterDoorLockClusterServerPreAttributeChangedCallback,                                    \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayWindowCoveringServer[] = {                                                    \
+        (EmberAfGenericClusterFunction) MatterWindowCoveringClusterServerAttributeChangedCallback,                                 \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayPumpConfigurationAndControlServer[] = {                                       \
+        (EmberAfGenericClusterFunction) emberAfPumpConfigurationAndControlClusterServerInitCallback,                               \
+        (EmberAfGenericClusterFunction) MatterPumpConfigurationAndControlClusterServerAttributeChangedCallback,                    \
+        (EmberAfGenericClusterFunction) MatterPumpConfigurationAndControlClusterServerPreAttributeChangedCallback,                 \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayThermostatServer[] = {                                                        \
+        (EmberAfGenericClusterFunction) emberAfThermostatClusterServerInitCallback,                                                \
+        (EmberAfGenericClusterFunction) MatterThermostatClusterServerPreAttributeChangedCallback,                                  \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayFanControlServer[] = {                                                        \
+        (EmberAfGenericClusterFunction) MatterFanControlClusterServerAttributeChangedCallback,                                     \
+        (EmberAfGenericClusterFunction) MatterFanControlClusterServerPreAttributeChangedCallback,                                  \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayThermostatUserInterfaceConfigurationServer[] = {                              \
+        (EmberAfGenericClusterFunction) MatterThermostatUserInterfaceConfigurationClusterServerPreAttributeChangedCallback,        \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayColorControlServer[] = {                                                      \
+        (EmberAfGenericClusterFunction) emberAfColorControlClusterServerInitCallback,                                              \
+    };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {                                                  \
+        (EmberAfGenericClusterFunction) emberAfOccupancySensingClusterServerInitCallback,                                          \
+    };
+
+// clang-format off
+#define GENERATED_COMMANDS { \
+  /* Endpoint: 0, Cluster: Identify (server) */\
+  /*   AcceptedCommandList (index=0) */ \
+  0x00000000 /* Identify */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Groups (server) */\
+  /*   AcceptedCommandList (index=2) */ \
+  0x00000000 /* AddGroup */, \
+  0x00000001 /* ViewGroup */, \
+  0x00000002 /* GetGroupMembership */, \
+  0x00000003 /* RemoveGroup */, \
+  0x00000004 /* RemoveAllGroups */, \
+  0x00000005 /* AddGroupIfIdentifying */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=9)*/ \
+  0x00000000 /* AddGroupResponse */, \
+  0x00000001 /* ViewGroupResponse */, \
+  0x00000002 /* GetGroupMembershipResponse */, \
+  0x00000003 /* RemoveGroupResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\
+  /*   AcceptedCommandList (index=14) */ \
+  0x00000000 /* AnnounceOtaProvider */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: General Commissioning (server) */\
+  /*   AcceptedCommandList (index=16) */ \
+  0x00000000 /* ArmFailSafe */, \
+  0x00000002 /* SetRegulatoryConfig */, \
+  0x00000004 /* CommissioningComplete */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=20)*/ \
+  0x00000001 /* ArmFailSafeResponse */, \
+  0x00000003 /* SetRegulatoryConfigResponse */, \
+  0x00000005 /* CommissioningCompleteResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Network Commissioning (server) */\
+  /*   AcceptedCommandList (index=24) */ \
+  0x00000000 /* ScanNetworks */, \
+  0x00000002 /* AddOrUpdateWiFiNetwork */, \
+  0x00000003 /* AddOrUpdateThreadNetwork */, \
+  0x00000004 /* RemoveNetwork */, \
+  0x00000006 /* ConnectNetwork */, \
+  0x00000008 /* ReorderNetwork */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=31)*/ \
+  0x00000001 /* ScanNetworksResponse */, \
+  0x00000005 /* NetworkConfigResponse */, \
+  0x00000007 /* ConnectNetworkResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\
+  /*   AcceptedCommandList (index=35) */ \
+  0x00000000 /* RetrieveLogsRequest */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=37)*/ \
+  0x00000001 /* RetrieveLogsResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
+  /*   AcceptedCommandList (index=39) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+  /*   AcceptedCommandList (index=41) */ \
+  0x00000000 /* ResetCounts */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /*   AcceptedCommandList (index=43) */ \
+  0x00000000 /* OpenCommissioningWindow */, \
+  0x00000002 /* RevokeCommissioning */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Operational Credentials (server) */\
+  /*   AcceptedCommandList (index=46) */ \
+  0x00000000 /* AttestationRequest */, \
+  0x00000002 /* CertificateChainRequest */, \
+  0x00000004 /* CSRRequest */, \
+  0x00000006 /* AddNOC */, \
+  0x00000007 /* UpdateNOC */, \
+  0x00000009 /* UpdateFabricLabel */, \
+  0x0000000A /* RemoveFabric */, \
+  0x0000000B /* AddTrustedRootCertificate */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=55)*/ \
+  0x00000001 /* AttestationResponse */, \
+  0x00000003 /* CertificateChainResponse */, \
+  0x00000005 /* CSRResponse */, \
+  0x00000008 /* NOCResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=60) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=65)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Identify (server) */\
+  /*   AcceptedCommandList (index=68) */ \
+  0x00000000 /* Identify */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Groups (server) */\
+  /*   AcceptedCommandList (index=70) */ \
+  0x00000000 /* AddGroup */, \
+  0x00000001 /* ViewGroup */, \
+  0x00000002 /* GetGroupMembership */, \
+  0x00000003 /* RemoveGroup */, \
+  0x00000004 /* RemoveAllGroups */, \
+  0x00000005 /* AddGroupIfIdentifying */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=77)*/ \
+  0x00000000 /* AddGroupResponse */, \
+  0x00000001 /* ViewGroupResponse */, \
+  0x00000002 /* GetGroupMembershipResponse */, \
+  0x00000003 /* RemoveGroupResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Scenes (server) */\
+  /*   AcceptedCommandList (index=82) */ \
+  0x00000000 /* AddScene */, \
+  0x00000001 /* ViewScene */, \
+  0x00000002 /* RemoveScene */, \
+  0x00000003 /* RemoveAllScenes */, \
+  0x00000004 /* StoreScene */, \
+  0x00000005 /* RecallScene */, \
+  0x00000006 /* GetSceneMembership */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=90)*/ \
+  0x00000000 /* AddSceneResponse */, \
+  0x00000001 /* ViewSceneResponse */, \
+  0x00000002 /* RemoveSceneResponse */, \
+  0x00000003 /* RemoveAllScenesResponse */, \
+  0x00000004 /* StoreSceneResponse */, \
+  0x00000006 /* GetSceneMembershipResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: On/Off (server) */\
+  /*   AcceptedCommandList (index=97) */ \
+  0x00000000 /* Off */, \
+  0x00000001 /* On */, \
+  0x00000002 /* Toggle */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Level Control (server) */\
+  /*   AcceptedCommandList (index=101) */ \
+  0x00000000 /* MoveToLevel */, \
+  0x00000001 /* Move */, \
+  0x00000002 /* Step */, \
+  0x00000003 /* Stop */, \
+  0x00000004 /* MoveToLevelWithOnOff */, \
+  0x00000005 /* MoveWithOnOff */, \
+  0x00000006 /* StepWithOnOff */, \
+  0x00000007 /* StopWithOnOff */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Mode Select (server) */\
+  /*   AcceptedCommandList (index=110) */ \
+  0x00000000 /* ChangeToMode */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Door Lock (server) */\
+  /*   AcceptedCommandList (index=112) */ \
+  0x00000000 /* LockDoor */, \
+  0x00000001 /* UnlockDoor */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Window Covering (server) */\
+  /*   AcceptedCommandList (index=115) */ \
+  0x00000000 /* UpOrOpen */, \
+  0x00000001 /* DownOrClose */, \
+  0x00000002 /* StopMotion */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Thermostat (server) */\
+  /*   AcceptedCommandList (index=119) */ \
+  0x00000000 /* SetpointRaiseLower */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Channel (server) */\
+  /*   AcceptedCommandList (index=121) */ \
+  0x00000002 /* ChangeChannelByNumber */, \
+  0x00000003 /* SkipChannel */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Target Navigator (server) */\
+  /*   AcceptedCommandList (index=124) */ \
+  0x00000000 /* NavigateTarget */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=126)*/ \
+  0x00000001 /* NavigateTargetResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Media Playback (server) */\
+  /*   AcceptedCommandList (index=128) */ \
+  0x00000000 /* Play */, \
+  0x00000001 /* Pause */, \
+  0x00000002 /* StopPlayback */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=132)*/ \
+  0x0000000A /* PlaybackResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Media Input (server) */\
+  /*   AcceptedCommandList (index=134) */ \
+  0x00000000 /* SelectInput */, \
+  0x00000001 /* ShowInputStatus */, \
+  0x00000002 /* HideInputStatus */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Low Power (server) */\
+  /*   AcceptedCommandList (index=138) */ \
+  0x00000000 /* Sleep */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Keypad Input (server) */\
+  /*   AcceptedCommandList (index=140) */ \
+  0x00000000 /* SendKey */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=142)*/ \
+  0x00000001 /* SendKeyResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Audio Output (server) */\
+  /*   AcceptedCommandList (index=144) */ \
+  0x00000000 /* SelectOutput */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Application Launcher (server) */\
+  /*   AcceptedCommandList (index=146) */ \
+  0x00000000 /* LaunchApp */, \
+  0x00000001 /* StopApp */, \
+  0x00000002 /* HideApp */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=150)*/ \
+  0x00000003 /* LauncherResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Account Login (server) */\
+  /*   AcceptedCommandList (index=152) */ \
+  0x00000000 /* GetSetupPIN */, \
+  0x00000002 /* Login */, \
+  0x00000003 /* Logout */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=156)*/ \
+  0x00000001 /* GetSetupPINResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Test Cluster (server) */\
+  /*   AcceptedCommandList (index=158) */ \
+  0x00000000 /* Test */, \
+  0x00000001 /* TestNotHandled */, \
+  0x00000002 /* TestSpecific */, \
+  0x00000004 /* TestAddArguments */, \
+  0x00000007 /* TestStructArgumentRequest */, \
+  0x00000008 /* TestNestedStructArgumentRequest */, \
+  0x00000009 /* TestListStructArgumentRequest */, \
+  0x0000000A /* TestListInt8UArgumentRequest */, \
+  0x0000000B /* TestNestedStructListArgumentRequest */, \
+  0x0000000C /* TestListNestedStructListArgumentRequest */, \
+  0x0000000D /* TestListInt8UReverseRequest */, \
+  0x0000000E /* TestEnumsRequest */, \
+  0x0000000F /* TestNullableOptionalRequest */, \
+  0x00000011 /* SimpleStructEchoRequest */, \
+  0x00000012 /* TimedInvokeRequest */, \
+  0x00000013 /* TestSimpleOptionalArgumentRequest */, \
+  0x00000014 /* TestEmitTestEventRequest */, \
+  0x00000015 /* TestEmitTestFabricScopedEventRequest */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=177)*/ \
+  0x00000000 /* TestSpecificResponse */, \
+  0x00000001 /* TestAddArgumentsResponse */, \
+  0x00000004 /* TestListInt8UReverseResponse */, \
+  0x00000005 /* TestEnumsResponse */, \
+  0x00000006 /* TestNullableOptionalResponse */, \
+  0x00000008 /* BooleanResponse */, \
+  0x00000009 /* SimpleStructResponse */, \
+  0x0000000A /* TestEmitTestEventResponse */, \
+  0x0000000B /* TestEmitTestFabricScopedEventResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 2, Cluster: Groups (server) */\
+  /*   AcceptedCommandList (index=187) */ \
+  0x00000000 /* AddGroup */, \
+  0x00000001 /* ViewGroup */, \
+  0x00000002 /* GetGroupMembership */, \
+  0x00000003 /* RemoveGroup */, \
+  0x00000004 /* RemoveAllGroups */, \
+  0x00000005 /* AddGroupIfIdentifying */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=194)*/ \
+  0x00000000 /* AddGroupResponse */, \
+  0x00000001 /* ViewGroupResponse */, \
+  0x00000002 /* GetGroupMembershipResponse */, \
+  0x00000003 /* RemoveGroupResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 2, Cluster: On/Off (server) */\
+  /*   AcceptedCommandList (index=199) */ \
+  0x00000000 /* Off */, \
+  0x00000001 /* On */, \
+  0x00000002 /* Toggle */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 65534, Cluster: Network Commissioning (server) */\
+  /*   AcceptedCommandList (index=203) */ \
+  0x00000000 /* ScanNetworks */, \
+  0x00000002 /* AddOrUpdateWiFiNetwork */, \
+  0x00000003 /* AddOrUpdateThreadNetwork */, \
+  0x00000004 /* RemoveNetwork */, \
+  0x00000006 /* ConnectNetwork */, \
+  0x00000008 /* ReorderNetwork */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=210)*/ \
+  0x00000001 /* ScanNetworksResponse */, \
+  0x00000005 /* NetworkConfigResponse */, \
+  0x00000007 /* ConnectNetworkResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+}
+
+// clang-format on
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+#define GENERATED_CLUSTER_COUNT 73
+
+// clang-format off
+#define GENERATED_CLUSTERS { \
+  { \
+      /* Endpoint: 0, Cluster: Identify (server) */ \
+      .clusterId = 0x00000003,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(0), \
+      .attributeCount = 4, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayIdentifyServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Groups (server) */ \
+      .clusterId = 0x00000004,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(4), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayGroupsServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 2 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 9 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Descriptor (server) */ \
+      .clusterId = 0x0000001D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(7), \
+      .attributeCount = 6, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Binding (server) */ \
+      .clusterId = 0x0000001E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(13), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Access Control (server) */ \
+      .clusterId = 0x0000001F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(16), \
+      .attributeCount = 6, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Basic (server) */ \
+      .clusterId = 0x00000028,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(22), \
+      .attributeCount = 14, \
+      .clusterSize = 39, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayBasicServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \
+      .clusterId = 0x00000029,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(36), \
+      .attributeCount = 0, \
+      .clusterSize = 0, \
+      .mask = ZAP_CLUSTER_MASK(CLIENT), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \
+      .clusterId = 0x0000002A,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(36), \
+      .attributeCount = 6, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 14 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Localization Configuration (server) */ \
+      .clusterId = 0x0000002B,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(42), \
+      .attributeCount = 4, \
+      .clusterSize = 42, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayLocalizationConfigurationServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Time Format Localization (server) */ \
+      .clusterId = 0x0000002C,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(46), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayTimeFormatLocalizationServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Unit Localization (server) */ \
+      .clusterId = 0x0000002D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(49), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Power Source Configuration (server) */ \
+      .clusterId = 0x0000002E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(51), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Power Source (server) */ \
+      .clusterId = 0x0000002F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(54), \
+      .attributeCount = 5, \
+      .clusterSize = 69, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: General Commissioning (server) */ \
+      .clusterId = 0x00000030,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(59), \
+      .attributeCount = 7, \
+      .clusterSize = 14, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 16 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 20 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Network Commissioning (server) */ \
+      .clusterId = 0x00000031,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(66), \
+      .attributeCount = 10, \
+      .clusterSize = 48, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \
+      .clusterId = 0x00000032,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(76), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
+      .clusterId = 0x00000033,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(78), \
+      .attributeCount = 5, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
+      .clusterId = 0x00000034,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(83), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
+      .clusterId = 0x00000035,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(85), \
+      .attributeCount = 19, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
+      .clusterId = 0x00000036,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(104), \
+      .attributeCount = 7, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
+      .clusterId = 0x00000037,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(111), \
+      .attributeCount = 11, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+      .clusterId = 0x0000003C,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(122), \
+      .attributeCount = 5, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
+      .clusterId = 0x0000003E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(127), \
+      .attributeCount = 8, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Group Key Management (server) */ \
+      .clusterId = 0x0000003F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Fixed Label (server) */ \
+      .clusterId = 0x00000040,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(141), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: User Label (server) */ \
+      .clusterId = 0x00000041,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(144), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
+      .clusterId = 0x00000405,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(147), \
+      .attributeCount = 5, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Identify (server) */ \
+      .clusterId = 0x00000003,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+      .attributeCount = 4, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayIdentifyServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Groups (server) */ \
+      .clusterId = 0x00000004,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(156), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayGroupsServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Scenes (server) */ \
+      .clusterId = 0x00000005,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(159), \
+      .attributeCount = 7, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayScenesServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: On/Off (server) */ \
+      .clusterId = 0x00000006,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(166), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayOnOffServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Level Control (server) */ \
+      .clusterId = 0x00000008,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(169), \
+      .attributeCount = 5, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayLevelControlServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 101 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Descriptor (server) */ \
+      .clusterId = 0x0000001D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(174), \
+      .attributeCount = 6, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Binding (server) */ \
+      .clusterId = 0x0000001E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(180), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
+      .clusterId = 0x00000025,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+      .attributeCount = 4, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Power Source (server) */ \
+      .clusterId = 0x0000002F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
+      .attributeCount = 5, \
+      .clusterSize = 69, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Switch (server) */ \
+      .clusterId = 0x0000003B,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(192), \
+      .attributeCount = 4, \
+      .clusterSize = 8, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Fixed Label (server) */ \
+      .clusterId = 0x00000040,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(196), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: User Label (server) */ \
+      .clusterId = 0x00000041,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(199), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Boolean State (server) */ \
+      .clusterId = 0x00000045,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(202), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Mode Select (server) */ \
+      .clusterId = 0x00000050,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
+      .attributeCount = 6, \
+      .clusterSize = 42, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayModeSelectServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 110 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Door Lock (server) */ \
+      .clusterId = 0x00000101,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+      .attributeCount = 8, \
+      .clusterSize = 16, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayDoorLockServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 112 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Window Covering (server) */ \
+      .clusterId = 0x00000102,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
+      .attributeCount = 7, \
+      .clusterSize = 11, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayWindowCoveringServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 115 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \
+      .clusterId = 0x00000200,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
+      .attributeCount = 9, \
+      .clusterSize = 17, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayPumpConfigurationAndControlServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Thermostat (server) */ \
+      .clusterId = 0x00000201,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(235), \
+      .attributeCount = 6, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayThermostatServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 119 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Fan Control (server) */ \
+      .clusterId = 0x00000202,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(241), \
+      .attributeCount = 6, \
+      .clusterSize = 10, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayFanControlServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \
+      .clusterId = 0x00000204,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(247), \
+      .attributeCount = 4, \
+      .clusterSize = 8, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayThermostatUserInterfaceConfigurationServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Color Control (server) */ \
+      .clusterId = 0x00000300,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+      .attributeCount = 7, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayColorControlServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \
+      .clusterId = 0x00000400,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(258), \
+      .attributeCount = 5, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
+      .clusterId = 0x00000402,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(263), \
+      .attributeCount = 5, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \
+      .clusterId = 0x00000403,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
+      .attributeCount = 5, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Flow Measurement (server) */ \
+      .clusterId = 0x00000404,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(273), \
+      .attributeCount = 5, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
+      .clusterId = 0x00000405,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(278), \
+      .attributeCount = 5, \
+      .clusterSize = 12, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
+      .clusterId = 0x00000406,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(283), \
+      .attributeCount = 5, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayOccupancySensingServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Wake on LAN (server) */ \
+      .clusterId = 0x00000503,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(288), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Channel (server) */ \
+      .clusterId = 0x00000504,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 121 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Target Navigator (server) */ \
+      .clusterId = 0x00000505,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(292), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 124 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 126 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Media Playback (server) */ \
+      .clusterId = 0x00000506,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(295), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 128 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 132 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Media Input (server) */ \
+      .clusterId = 0x00000507,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(298), \
+      .attributeCount = 4, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 134 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Low Power (server) */ \
+      .clusterId = 0x00000508,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(302), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 138 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Keypad Input (server) */ \
+      .clusterId = 0x00000509,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(304), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 140 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 142 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Content Launcher (server) */ \
+      .clusterId = 0x0000050A,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(306), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Audio Output (server) */ \
+      .clusterId = 0x0000050B,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(308), \
+      .attributeCount = 4, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Application Launcher (server) */ \
+      .clusterId = 0x0000050C,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(312), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 146 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 150 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Application Basic (server) */ \
+      .clusterId = 0x0000050D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(314), \
+      .attributeCount = 7, \
+      .clusterSize = 73, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Account Login (server) */ \
+      .clusterId = 0x0000050E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(321), \
+      .attributeCount = 2, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 152 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 156 ) ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Test Cluster (server) */ \
+      .clusterId = 0xFFF1FC05,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(323), \
+      .attributeCount = 82, \
+      .clusterSize = 2289, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 158 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 177 ) ,\
+    },\
+  { \
+      /* Endpoint: 2, Cluster: Groups (server) */ \
+      .clusterId = 0x00000004,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(405), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayGroupsServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 187 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ) ,\
+    },\
+  { \
+      /* Endpoint: 2, Cluster: On/Off (server) */ \
+      .clusterId = 0x00000006,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(408), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayOnOffServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 199 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 2, Cluster: Descriptor (server) */ \
+      .clusterId = 0x0000001D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(411), \
+      .attributeCount = 6, \
+      .clusterSize = 4, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 2, Cluster: Power Source (server) */ \
+      .clusterId = 0x0000002F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(417), \
+      .attributeCount = 5, \
+      .clusterSize = 69, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \
+      .clusterId = 0x00000406,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(422), \
+      .attributeCount = 5, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .functions = chipFuncArrayOccupancySensingServer, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \
+      .clusterId = 0x00000031,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(427), \
+      .attributeCount = 10, \
+      .clusterSize = 0, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 203 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 210 ) ,\
+    },\
+}
+
+// clang-format on
+
+#define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
+
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 72
+
+// This is an array of EmberAfEndpointType structures.
+#define GENERATED_ENDPOINT_TYPES                                                                                                   \
+    {                                                                                                                              \
+        { ZAP_CLUSTER_INDEX(0), 27, 348 }, { ZAP_CLUSTER_INDEX(27), 40, 2782 }, { ZAP_CLUSTER_INDEX(67), 5, 96 },                  \
+            { ZAP_CLUSTER_INDEX(72), 1, 0 },                                                                                       \
+    }
+
+// Largest attribute size is needed for various buffers
+#define ATTRIBUTE_LARGEST (1003)
+
+static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, "ATTRIBUTE_LARGEST larger than expected");
+
+// Total size of singleton attributes
+#define ATTRIBUTE_SINGLETONS_SIZE (35)
+
+// Total size of attribute storage
+#define ATTRIBUTE_MAX_SIZE (3226)
+
+// Number of fixed endpoints
+#define FIXED_ENDPOINT_COUNT (4)
+
+// Array of endpoints that are supported, the data inside
+// the array is the endpoint number.
+#define FIXED_ENDPOINT_ARRAY                                                                                                       \
+    {                                                                                                                              \
+        0x0000, 0x0001, 0x0002, 0xFFFE                                                                                             \
+    }
+
+// Array of profile ids
+#define FIXED_PROFILE_IDS                                                                                                          \
+    {                                                                                                                              \
+        0x0103, 0x0103, 0x0103, 0x0103                                                                                             \
+    }
+
+// Array of device types
+#define FIXED_DEVICE_TYPES                                                                                                         \
+    {                                                                                                                              \
+        { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, { 0xF002, 1 }                                                                 \
+    }
+
+// Array of device type offsets
+#define FIXED_DEVICE_TYPE_OFFSETS                                                                                                  \
+    {                                                                                                                              \
+        0, 1, 2, 3                                                                                                                 \
+    }
+
+// Array of device type lengths
+#define FIXED_DEVICE_TYPE_LENGTHS                                                                                                  \
+    {                                                                                                                              \
+        1, 1, 1, 1                                                                                                                 \
+    }
+
+// Array of endpoint types supported on each endpoint
+#define FIXED_ENDPOINT_TYPES                                                                                                       \
+    {                                                                                                                              \
+        0, 1, 2, 3                                                                                                                 \
+    }
+
+// Array of networks supported on each endpoint
+#define FIXED_NETWORKS                                                                                                             \
+    {                                                                                                                              \
+        0, 0, 0, 0                                                                                                                 \
+    }
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
new file mode 100644
index 00000000000000..291787a9c072ef
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
@@ -0,0 +1,406 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+// User options for plugin Binding Table Library
+#define EMBER_BINDING_TABLE_SIZE 10
+
+/**** Network Section ****/
+#define EMBER_SUPPORTED_NETWORKS (1)
+
+#define EMBER_APS_UNICAST_MESSAGE_COUNT 10
+
+/**** Cluster endpoint counts ****/
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEST_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+
+/**** Cluster Plugins ****/
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Account Login cluster is included
+#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the server side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC
+
+// Use this macro to check if the server side of the Application Launcher cluster is included
+#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
+
+// Use this macro to check if the server side of the Audio Output cluster is included
+#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
+
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
+
+// Use this macro to check if the server side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE
+
+// Use this macro to check if the server side of the Bridged Actions cluster is included
+#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+
+// Use this macro to check if the server side of the Channel cluster is included
+#define ZCL_USING_CHANNEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL
+
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
+
+// Use this macro to check if the server side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the Door Lock cluster is included
+#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Fan Control cluster is included
+#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
+
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the server side of the Illuminance Measurement cluster is included
+#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+
+// Use this macro to check if the server side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT
+
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+
+// Use this macro to check if the server side of the Low Power cluster is included
+#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER
+
+// Use this macro to check if the server side of the Media Input cluster is included
+#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT
+
+// Use this macro to check if the server side of the Media Playback cluster is included
+#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
+
+// Use this macro to check if the server side of the Mode Select cluster is included
+#define ZCL_USING_MODE_SELECT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MODE_SELECT_SERVER
+#define EMBER_AF_PLUGIN_MODE_SELECT
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Power Source cluster is included
+#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE
+
+// Use this macro to check if the server side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+
+// Use this macro to check if the server side of the Pressure Measurement cluster is included
+#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
+
+// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
+#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
+
+// Use this macro to check if the server side of the Relative Humidity Measurement cluster is included
+#define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
+
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
+
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
+
+// Use this macro to check if the server side of the Target Navigator cluster is included
+#define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER
+#define EMBER_AF_PLUGIN_TARGET_NAVIGATOR
+
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
+
+// Use this macro to check if the server side of the Test Cluster cluster is included
+#define ZCL_USING_TEST_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEST_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEST_CLUSTER
+
+// Use this macro to check if the server side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT
+
+// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
+
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
+
+// Use this macro to check if the server side of the Wake on LAN cluster is included
+#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Window Covering cluster is included
+#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_tokens.h b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_tokens.h
new file mode 100644
index 00000000000000..dcc229f5b2c306
--- /dev/null
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_tokens.h
@@ -0,0 +1,45 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+// Prevent multiple inclusion
+#pragma once
+
+// This file contains the tokens for attributes stored in flash
+
+// Identifier tags for tokens
+
+// Types for the tokens
+#ifdef DEFINETYPES
+#endif // DEFINETYPES
+
+// Actual token definitions
+#ifdef DEFINETOKENS
+#endif // DEFINETOKENS
+
+// Macro snippet that loads all the attributes from tokens
+#define GENERATED_TOKEN_LOADER(endpoint)                                                                                           \
+    do                                                                                                                             \
+    {                                                                                                                              \
+    } while (false)
+
+// Macro snippet that saves the attribute to token
+#define GENERATED_TOKEN_SAVER                                                                                                      \
+    do                                                                                                                             \
+    {                                                                                                                              \
+    } while (false)
diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
index 8aed0d2107d023..8aeb3f7108f1c4 100644
--- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h
+++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
@@ -334,13 +334,6 @@ typedef struct _GroupKeySetStruct
     uint64_t EpochStartTime2;
 } GroupKeySetStruct;
 
-// Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
-} IasAceZoneStatusResult;
-
 // Struct for InputInfo
 typedef struct _InputInfo
 {
@@ -543,8 +536,8 @@ typedef struct _TargetStruct
 // Struct for TestListStructOctet
 typedef struct _TestListStructOctet
 {
-    uint64_t fabricIndex;
-    chip::ByteSpan operationalCert;
+    uint64_t member1;
+    chip::ByteSpan member2;
 } TestListStructOctet;
 
 // Struct for ThermostatScheduleTransition
diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
index 9b2bea3e101d9b..e9b44f139a1fe3 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
@@ -441,6 +441,7 @@
 #define ZCL_ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID (0x0005)
 #define ZCL_ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID (0x0006)
 #define ZCL_ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID (0x0007)
+#define ZCL_TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID (0x0008)
 
 // Attribute ids for cluster: Software Diagnostics
 
@@ -696,7 +697,6 @@
 #define ZCL_DOOR_OPEN_EVENTS_ATTRIBUTE_ID (0x0004)
 #define ZCL_DOOR_CLOSED_EVENTS_ATTRIBUTE_ID (0x0005)
 #define ZCL_OPEN_PERIOD_ATTRIBUTE_ID (0x0006)
-#define ZCL_NUM_LOG_RECORDS_SUPPORTED_ATTRIBUTE_ID (0x0010)
 #define ZCL_NUM_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID (0x0011)
 #define ZCL_NUM_PIN_USERS_SUPPORTED_ATTRIBUTE_ID (0x0012)
 #define ZCL_NUM_RFID_USERS_SUPPORTED_ATTRIBUTE_ID (0x0013)
@@ -709,7 +709,6 @@
 #define ZCL_MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x001A)
 #define ZCL_CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID (0x001B)
 #define ZCL_NUM_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x001C)
-#define ZCL_ENABLE_LOGGING_ATTRIBUTE_ID (0x0020)
 #define ZCL_LANGUAGE_ATTRIBUTE_ID (0x0021)
 #define ZCL_LED_SETTINGS_ATTRIBUTE_ID (0x0022)
 #define ZCL_AUTO_RELOCK_TIME_ATTRIBUTE_ID (0x0023)
@@ -727,14 +726,6 @@
 #define ZCL_SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID (0x0032)
 #define ZCL_REQUIRE_PIN_FOR_REMOTE_OPERATION_ATTRIBUTE_ID (0x0033)
 #define ZCL_EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID (0x0035)
-#define ZCL_ALARM_MASK_ATTRIBUTE_ID (0x0040)
-#define ZCL_KEYPAD_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0041)
-#define ZCL_REMOTE_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0042)
-#define ZCL_MANUAL_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0043)
-#define ZCL_RFID_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0044)
-#define ZCL_KEYPAD_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0045)
-#define ZCL_REMOTE_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0046)
-#define ZCL_RFID_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0047)
 
 // Attribute ids for cluster: Window Covering
 
@@ -837,7 +828,6 @@
 #define ZCL_REMOTE_SENSING_ATTRIBUTE_ID (0x001A)
 #define ZCL_CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID (0x001B)
 #define ZCL_SYSTEM_MODE_ATTRIBUTE_ID (0x001C)
-#define ZCL_THERMOSTAT_ALARM_MASK_ATTRIBUTE_ID (0x001D)
 #define ZCL_THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID (0x001E)
 #define ZCL_START_OF_WEEK_ATTRIBUTE_ID (0x0020)
 #define ZCL_NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID (0x0021)
@@ -1359,32 +1349,6 @@
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002)
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_TOLERANCE_ATTRIBUTE_ID (0x0003)
 
-// Attribute ids for cluster: IAS Zone
-
-// Client attributes
-
-// Server attributes
-#define ZCL_ZONE_STATE_ATTRIBUTE_ID (0x0000)
-#define ZCL_ZONE_TYPE_ATTRIBUTE_ID (0x0001)
-#define ZCL_ZONE_STATUS_ATTRIBUTE_ID (0x0002)
-#define ZCL_IAS_CIE_ADDRESS_ATTRIBUTE_ID (0x0010)
-#define ZCL_ZONE_ID_ATTRIBUTE_ID (0x0011)
-#define ZCL_NUMBER_OF_ZONE_SENSITIVITY_LEVELS_SUPPORTED_ATTRIBUTE_ID (0x0012)
-#define ZCL_CURRENT_ZONE_SENSITIVITY_LEVEL_ATTRIBUTE_ID (0x0013)
-
-// Attribute ids for cluster: IAS ACE
-
-// Client attributes
-
-// Server attributes
-
-// Attribute ids for cluster: IAS WD
-
-// Client attributes
-
-// Server attributes
-#define ZCL_MAX_DURATION_ATTRIBUTE_ID (0x0000)
-
 // Attribute ids for cluster: Wake on LAN
 
 // Client attributes
@@ -1486,93 +1450,6 @@
 
 // Server attributes
 
-// Attribute ids for cluster: Test Cluster
-
-// Client attributes
-
-// Server attributes
-#define ZCL_BOOLEAN_ATTRIBUTE_ID (0x0000)
-#define ZCL_BITMAP8_ATTRIBUTE_ID (0x0001)
-#define ZCL_BITMAP16_ATTRIBUTE_ID (0x0002)
-#define ZCL_BITMAP32_ATTRIBUTE_ID (0x0003)
-#define ZCL_BITMAP64_ATTRIBUTE_ID (0x0004)
-#define ZCL_INT8_U_ATTRIBUTE_ID (0x0005)
-#define ZCL_INT16_U_ATTRIBUTE_ID (0x0006)
-#define ZCL_INT24_U_ATTRIBUTE_ID (0x0007)
-#define ZCL_INT32_U_ATTRIBUTE_ID (0x0008)
-#define ZCL_INT40_U_ATTRIBUTE_ID (0x0009)
-#define ZCL_INT48_U_ATTRIBUTE_ID (0x000A)
-#define ZCL_INT56_U_ATTRIBUTE_ID (0x000B)
-#define ZCL_INT64_U_ATTRIBUTE_ID (0x000C)
-#define ZCL_INT8_S_ATTRIBUTE_ID (0x000D)
-#define ZCL_INT16_S_ATTRIBUTE_ID (0x000E)
-#define ZCL_INT24_S_ATTRIBUTE_ID (0x000F)
-#define ZCL_INT32_S_ATTRIBUTE_ID (0x0010)
-#define ZCL_INT40_S_ATTRIBUTE_ID (0x0011)
-#define ZCL_INT48_S_ATTRIBUTE_ID (0x0012)
-#define ZCL_INT56_S_ATTRIBUTE_ID (0x0013)
-#define ZCL_INT64_S_ATTRIBUTE_ID (0x0014)
-#define ZCL_ENUM8_ATTRIBUTE_ID (0x0015)
-#define ZCL_ENUM16_ATTRIBUTE_ID (0x0016)
-#define ZCL_FLOAT_SINGLE_ATTRIBUTE_ID (0x0017)
-#define ZCL_FLOAT_DOUBLE_ATTRIBUTE_ID (0x0018)
-#define ZCL_OCTET_STRING_ATTRIBUTE_ID (0x0019)
-#define ZCL_LIST_ATTRIBUTE_ID (0x001A)
-#define ZCL_LIST_OCTET_STRING_ATTRIBUTE_ID (0x001B)
-#define ZCL_LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID (0x001C)
-#define ZCL_LONG_OCTET_STRING_ATTRIBUTE_ID (0x001D)
-#define ZCL_CHAR_STRING_ATTRIBUTE_ID (0x001E)
-#define ZCL_LONG_CHAR_STRING_ATTRIBUTE_ID (0x001F)
-#define ZCL_EPOCH_US_ATTRIBUTE_ID (0x0020)
-#define ZCL_EPOCH_S_ATTRIBUTE_ID (0x0021)
-#define ZCL_TEST_VENDOR_ID_ATTRIBUTE_ID (0x0022)
-#define ZCL_LIST_OF_STRUCTS_WITH_OPTIONALS_ATTRIBUTE_ID (0x0023)
-#define ZCL_SIMPLE_ENUM_ATTRIBUTE_ID (0x0024)
-#define ZCL_STRUCT_ATTRIBUTE_ID (0x0025)
-#define ZCL_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x0026)
-#define ZCL_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x0027)
-#define ZCL_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x0028)
-#define ZCL_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID (0x0029)
-#define ZCL_LIST_LONG_OCTET_STRING_ATTRIBUTE_ID (0x002A)
-#define ZCL_LIST_FABRIC_SCOPED_ATTRIBUTE_ID (0x002B)
-#define ZCL_TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID (0x0030)
-#define ZCL_GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0031)
-#define ZCL_CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0032)
-#define ZCL_UNSUPPORTED_ATTRIBUTE_ID (0x00FF)
-#define ZCL_NULLABLE_BOOLEAN_ATTRIBUTE_ID (0x4000)
-#define ZCL_NULLABLE_BITMAP8_ATTRIBUTE_ID (0x4001)
-#define ZCL_NULLABLE_BITMAP16_ATTRIBUTE_ID (0x4002)
-#define ZCL_NULLABLE_BITMAP32_ATTRIBUTE_ID (0x4003)
-#define ZCL_NULLABLE_BITMAP64_ATTRIBUTE_ID (0x4004)
-#define ZCL_NULLABLE_INT8_U_ATTRIBUTE_ID (0x4005)
-#define ZCL_NULLABLE_INT16_U_ATTRIBUTE_ID (0x4006)
-#define ZCL_NULLABLE_INT24_U_ATTRIBUTE_ID (0x4007)
-#define ZCL_NULLABLE_INT32_U_ATTRIBUTE_ID (0x4008)
-#define ZCL_NULLABLE_INT40_U_ATTRIBUTE_ID (0x4009)
-#define ZCL_NULLABLE_INT48_U_ATTRIBUTE_ID (0x400A)
-#define ZCL_NULLABLE_INT56_U_ATTRIBUTE_ID (0x400B)
-#define ZCL_NULLABLE_INT64_U_ATTRIBUTE_ID (0x400C)
-#define ZCL_NULLABLE_INT8_S_ATTRIBUTE_ID (0x400D)
-#define ZCL_NULLABLE_INT16_S_ATTRIBUTE_ID (0x400E)
-#define ZCL_NULLABLE_INT24_S_ATTRIBUTE_ID (0x400F)
-#define ZCL_NULLABLE_INT32_S_ATTRIBUTE_ID (0x4010)
-#define ZCL_NULLABLE_INT40_S_ATTRIBUTE_ID (0x4011)
-#define ZCL_NULLABLE_INT48_S_ATTRIBUTE_ID (0x4012)
-#define ZCL_NULLABLE_INT56_S_ATTRIBUTE_ID (0x4013)
-#define ZCL_NULLABLE_INT64_S_ATTRIBUTE_ID (0x4014)
-#define ZCL_NULLABLE_ENUM8_ATTRIBUTE_ID (0x4015)
-#define ZCL_NULLABLE_ENUM16_ATTRIBUTE_ID (0x4016)
-#define ZCL_NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID (0x4017)
-#define ZCL_NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID (0x4018)
-#define ZCL_NULLABLE_OCTET_STRING_ATTRIBUTE_ID (0x4019)
-#define ZCL_NULLABLE_CHAR_STRING_ATTRIBUTE_ID (0x401E)
-#define ZCL_NULLABLE_SIMPLE_ENUM_ATTRIBUTE_ID (0x4024)
-#define ZCL_NULLABLE_STRUCT_ATTRIBUTE_ID (0x4025)
-#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x4026)
-#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x4027)
-#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x4028)
-#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_S_ATTRIBUTE_ID (0x4029)
-
 // Attribute ids for cluster: Messaging
 
 // Client attributes
@@ -1762,3 +1639,90 @@
 #define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A15)
 #define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A16)
 #define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A17)
+
+// Attribute ids for cluster: Test Cluster
+
+// Client attributes
+
+// Server attributes
+#define ZCL_BOOLEAN_ATTRIBUTE_ID (0x0000)
+#define ZCL_BITMAP8_ATTRIBUTE_ID (0x0001)
+#define ZCL_BITMAP16_ATTRIBUTE_ID (0x0002)
+#define ZCL_BITMAP32_ATTRIBUTE_ID (0x0003)
+#define ZCL_BITMAP64_ATTRIBUTE_ID (0x0004)
+#define ZCL_INT8_U_ATTRIBUTE_ID (0x0005)
+#define ZCL_INT16_U_ATTRIBUTE_ID (0x0006)
+#define ZCL_INT24_U_ATTRIBUTE_ID (0x0007)
+#define ZCL_INT32_U_ATTRIBUTE_ID (0x0008)
+#define ZCL_INT40_U_ATTRIBUTE_ID (0x0009)
+#define ZCL_INT48_U_ATTRIBUTE_ID (0x000A)
+#define ZCL_INT56_U_ATTRIBUTE_ID (0x000B)
+#define ZCL_INT64_U_ATTRIBUTE_ID (0x000C)
+#define ZCL_INT8_S_ATTRIBUTE_ID (0x000D)
+#define ZCL_INT16_S_ATTRIBUTE_ID (0x000E)
+#define ZCL_INT24_S_ATTRIBUTE_ID (0x000F)
+#define ZCL_INT32_S_ATTRIBUTE_ID (0x0010)
+#define ZCL_INT40_S_ATTRIBUTE_ID (0x0011)
+#define ZCL_INT48_S_ATTRIBUTE_ID (0x0012)
+#define ZCL_INT56_S_ATTRIBUTE_ID (0x0013)
+#define ZCL_INT64_S_ATTRIBUTE_ID (0x0014)
+#define ZCL_ENUM8_ATTRIBUTE_ID (0x0015)
+#define ZCL_ENUM16_ATTRIBUTE_ID (0x0016)
+#define ZCL_FLOAT_SINGLE_ATTRIBUTE_ID (0x0017)
+#define ZCL_FLOAT_DOUBLE_ATTRIBUTE_ID (0x0018)
+#define ZCL_OCTET_STRING_ATTRIBUTE_ID (0x0019)
+#define ZCL_LIST_ATTRIBUTE_ID (0x001A)
+#define ZCL_LIST_OCTET_STRING_ATTRIBUTE_ID (0x001B)
+#define ZCL_LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID (0x001C)
+#define ZCL_LONG_OCTET_STRING_ATTRIBUTE_ID (0x001D)
+#define ZCL_CHAR_STRING_ATTRIBUTE_ID (0x001E)
+#define ZCL_LONG_CHAR_STRING_ATTRIBUTE_ID (0x001F)
+#define ZCL_EPOCH_US_ATTRIBUTE_ID (0x0020)
+#define ZCL_EPOCH_S_ATTRIBUTE_ID (0x0021)
+#define ZCL_TEST_VENDOR_ID_ATTRIBUTE_ID (0x0022)
+#define ZCL_LIST_OF_STRUCTS_WITH_OPTIONALS_ATTRIBUTE_ID (0x0023)
+#define ZCL_SIMPLE_ENUM_ATTRIBUTE_ID (0x0024)
+#define ZCL_STRUCT_ATTRIBUTE_ID (0x0025)
+#define ZCL_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x0026)
+#define ZCL_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x0027)
+#define ZCL_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x0028)
+#define ZCL_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID (0x0029)
+#define ZCL_LIST_LONG_OCTET_STRING_ATTRIBUTE_ID (0x002A)
+#define ZCL_LIST_FABRIC_SCOPED_ATTRIBUTE_ID (0x002B)
+#define ZCL_TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID (0x0030)
+#define ZCL_GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0031)
+#define ZCL_CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0032)
+#define ZCL_UNSUPPORTED_ATTRIBUTE_ID (0x00FF)
+#define ZCL_NULLABLE_BOOLEAN_ATTRIBUTE_ID (0x4000)
+#define ZCL_NULLABLE_BITMAP8_ATTRIBUTE_ID (0x4001)
+#define ZCL_NULLABLE_BITMAP16_ATTRIBUTE_ID (0x4002)
+#define ZCL_NULLABLE_BITMAP32_ATTRIBUTE_ID (0x4003)
+#define ZCL_NULLABLE_BITMAP64_ATTRIBUTE_ID (0x4004)
+#define ZCL_NULLABLE_INT8_U_ATTRIBUTE_ID (0x4005)
+#define ZCL_NULLABLE_INT16_U_ATTRIBUTE_ID (0x4006)
+#define ZCL_NULLABLE_INT24_U_ATTRIBUTE_ID (0x4007)
+#define ZCL_NULLABLE_INT32_U_ATTRIBUTE_ID (0x4008)
+#define ZCL_NULLABLE_INT40_U_ATTRIBUTE_ID (0x4009)
+#define ZCL_NULLABLE_INT48_U_ATTRIBUTE_ID (0x400A)
+#define ZCL_NULLABLE_INT56_U_ATTRIBUTE_ID (0x400B)
+#define ZCL_NULLABLE_INT64_U_ATTRIBUTE_ID (0x400C)
+#define ZCL_NULLABLE_INT8_S_ATTRIBUTE_ID (0x400D)
+#define ZCL_NULLABLE_INT16_S_ATTRIBUTE_ID (0x400E)
+#define ZCL_NULLABLE_INT24_S_ATTRIBUTE_ID (0x400F)
+#define ZCL_NULLABLE_INT32_S_ATTRIBUTE_ID (0x4010)
+#define ZCL_NULLABLE_INT40_S_ATTRIBUTE_ID (0x4011)
+#define ZCL_NULLABLE_INT48_S_ATTRIBUTE_ID (0x4012)
+#define ZCL_NULLABLE_INT56_S_ATTRIBUTE_ID (0x4013)
+#define ZCL_NULLABLE_INT64_S_ATTRIBUTE_ID (0x4014)
+#define ZCL_NULLABLE_ENUM8_ATTRIBUTE_ID (0x4015)
+#define ZCL_NULLABLE_ENUM16_ATTRIBUTE_ID (0x4016)
+#define ZCL_NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID (0x4017)
+#define ZCL_NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID (0x4018)
+#define ZCL_NULLABLE_OCTET_STRING_ATTRIBUTE_ID (0x4019)
+#define ZCL_NULLABLE_CHAR_STRING_ATTRIBUTE_ID (0x401E)
+#define ZCL_NULLABLE_SIMPLE_ENUM_ATTRIBUTE_ID (0x4024)
+#define ZCL_NULLABLE_STRUCT_ATTRIBUTE_ID (0x4025)
+#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x4026)
+#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x4027)
+#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x4028)
+#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_S_ATTRIBUTE_ID (0x4029)
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 9fedc2abffae77..d691e4c0388d3b 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
@@ -8659,6 +8659,37 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 } // namespace BootReasons
 
+namespace TestEventTriggersEnabled {
+
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::GeneralDiagnostics::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::GeneralDiagnostics::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+}
+
+} // namespace TestEventTriggersEnabled
+
 namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
@@ -8943,9 +8974,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
 
 namespace RoutingRole {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
@@ -8960,9 +8992,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & valu
     }
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
     if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8975,14 +9007,15 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
 {
     if (value.IsNull())
     {
@@ -9235,24 +9268,27 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 
 namespace PartitionId {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -9262,28 +9298,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace PartitionId
 
 namespace Weighting {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -9293,28 +9351,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace Weighting
 
 namespace DataVersion {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -9324,28 +9404,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace DataVersion
 
 namespace StableDataVersion {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -9355,28 +9457,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace StableDataVersion
 
 namespace LeaderRouterId {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -9386,6 +9510,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace LeaderRouterId
 
 namespace DetachedRoleCount {
@@ -10692,24 +10835,27 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 
 namespace ActiveTimestamp {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -10719,28 +10865,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace ActiveTimestamp
 
 namespace PendingTimestamp {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -10750,28 +10918,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PendingTimestamp
-
-namespace Delay {
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+}
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
-    Traits::StorageType temp;
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
+} // namespace PendingTimestamp
+
+namespace Delay {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
@@ -10781,11 +10971,30 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace Delay
 
 namespace ChannelMask {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
     uint8_t zclString[4 + 1];
     EmberAfStatus status =
@@ -10794,12 +11003,14 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
     size_t length = emberAfStringLength(zclString);
     if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+        return EMBER_ZCL_STATUS_SUCCESS;
     }
+    auto & span = value.SetNonNull();
 
-    VerifyOrReturnError(value.size() == 4, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 4);
-    value.reduce_size(length);
+    VerifyOrReturnError(span.size() == 4, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(span.data(), &zclString[1], 4);
+    span.reduce_size(length);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
@@ -10813,6 +11024,23 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
                                        ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteServerAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, zclString,
+                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+}
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
+}
+
 } // namespace ChannelMask
 
 namespace FeatureMap {
@@ -14320,37 +14548,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 
 } // namespace OpenPeriod
 
-namespace NumberOfLogRecordsSupported {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-} // namespace NumberOfLogRecordsSupported
-
 namespace NumberOfTotalUsersSupported {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
@@ -14663,9 +14860,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 namespace CredentialRulesSupport {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -14677,9 +14874,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -14723,37 +14920,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 } // namespace NumberOfCredentialsSupportedPerUser
 
-namespace EnableLogging {
-
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
-{
-    using Traits = NumericAttributeTraits<bool>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
-{
-    using Traits = NumericAttributeTraits<bool>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
-}
-
-} // namespace EnableLogging
-
 namespace Language {
 
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
@@ -14910,9 +15076,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOp
 
 namespace SupportedOperatingModes {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -14924,9 +15090,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -14941,9 +15107,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
 
 namespace DefaultConfigurationRegister {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -14955,9 +15121,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15096,9 +15262,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 
 namespace LocalProgrammingFeatures {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -15110,9 +15276,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15280,11 +15446,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 
 } // namespace ExpiringUserTimeout
 
-namespace AlarmMask {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -15296,9 +15462,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15306,16 +15472,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace AlarmMask
+} // namespace FeatureMap
 
-namespace KeypadOperationEventMask {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -15327,9 +15493,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15337,19 +15503,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace KeypadOperationEventMask
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace DoorLock
 
-namespace RemoteOperationEventMask {
+namespace WindowCovering {
+namespace Attributes {
+
+namespace Type {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::Type>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -15358,9 +15530,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::Type>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15368,19 +15540,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace RemoteOperationEventMask
+} // namespace Type
 
-namespace ManualOperationEventMask {
+namespace PhysicalClosedLimitLift {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -15389,9 +15561,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15399,19 +15571,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ManualOperationEventMask
+} // namespace PhysicalClosedLimitLift
 
-namespace RFIDOperationEventMask {
+namespace PhysicalClosedLimitTilt {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -15420,9 +15592,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -15430,348 +15602,94 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RFIDOperationEventMask
+} // namespace PhysicalClosedLimitTilt
 
-namespace KeypadProgrammingEventMask {
+namespace CurrentPositionLift {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace KeypadProgrammingEventMask
-
-namespace RemoteProgrammingEventMask {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RemoteProgrammingEventMask
+} // namespace CurrentPositionLift
 
-namespace RFIDProgrammingEventMask {
+namespace CurrentPositionTilt {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
-}
-
-} // namespace RFIDProgrammingEventMask
-
-namespace FeatureMap {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
-{
-    using Traits = NumericAttributeTraits<uint32_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
-{
-    using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
-}
-
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace DoorLock
-
-namespace WindowCovering {
-namespace Attributes {
-
-namespace Type {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type * value)
-{
-    using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::Type>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value)
-{
-    using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::Type>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
-}
-
-} // namespace Type
-
-namespace PhysicalClosedLimitLift {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-} // namespace PhysicalClosedLimitLift
-
-namespace PhysicalClosedLimitTilt {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-} // namespace PhysicalClosedLimitTilt
-
-namespace CurrentPositionLift {
-
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
-    {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
-    }
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace CurrentPositionLift
-
-namespace CurrentPositionTilt {
-
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
-    {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
-    }
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -15859,9 +15777,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 
 namespace ConfigStatus {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
@@ -15873,9 +15791,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -16394,9 +16312,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 
 namespace Mode {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp));
@@ -16408,9 +16326,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -17630,9 +17548,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
 
 namespace PumpStatus {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status =
@@ -17645,9 +17563,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -18898,7 +18816,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 } // namespace SystemMode
 
-namespace AlarmMask {
+namespace ThermostatRunningMode {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
@@ -18924,12 +18842,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace AlarmMask
+} // namespace ThermostatRunningMode
 
-namespace ThermostatRunningMode {
+namespace StartOfWeek {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
@@ -18958,9 +18876,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace ThermostatRunningMode
+} // namespace StartOfWeek
 
-namespace StartOfWeek {
+namespace NumberOfWeeklyTransitions {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
@@ -18986,38 +18904,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
-}
-
-} // namespace StartOfWeek
-
-namespace NumberOfWeeklyTransitions {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
-{
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
-{
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
 } // namespace NumberOfWeeklyTransitions
@@ -31540,48 +31427,47 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 } // namespace Attributes
 } // namespace SodiumConcentrationMeasurement
 
-namespace IasZone {
+namespace WakeOnLan {
 namespace Attributes {
 
-namespace ZoneState {
+namespace MACAddress {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[32 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 32);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[32 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ZoneState
+} // namespace MACAddress
 
-namespace ZoneType {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31590,9 +31476,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -31600,19 +31486,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace ZoneType
+} // namespace FeatureMap
 
-namespace ZoneStatus {
+namespace ClusterRevision {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31631,50 +31517,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ZoneStatus
-
-namespace IasCieAddress {
+} // namespace ClusterRevision
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::NodeId * value)
-{
-    using Traits = NumericAttributeTraits<chip::NodeId>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::NodeId value)
-{
-    using Traits = NumericAttributeTraits<chip::NodeId>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_NODE_ID_ATTRIBUTE_TYPE);
-}
+} // namespace Attributes
+} // namespace WakeOnLan
 
-} // namespace IasCieAddress
+namespace Channel {
+namespace Attributes {
 
-namespace ZoneId {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Channel::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31683,9 +31544,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -31693,19 +31554,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::Channel::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace ZoneId
+} // namespace FeatureMap
 
-namespace NumberOfZoneSensitivityLevelsSupported {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Channel::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31714,9 +31575,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -31724,19 +31585,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::Channel::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NumberOfZoneSensitivityLevelsSupported
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace Channel
+
+namespace TargetNavigator {
+namespace Attributes {
 
-namespace CurrentZoneSensitivityLevel {
+namespace CurrentTarget {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31755,10 +31622,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace CurrentZoneSensitivityLevel
+} // namespace CurrentTarget
 
 namespace FeatureMap {
 
@@ -31767,7 +31634,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31786,7 +31653,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -31798,7 +31665,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasZone::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31817,25 +31684,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasZone::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace IasZone
+} // namespace TargetNavigator
 
-namespace IasAce {
+namespace MediaPlayback {
 namespace Attributes {
 
-namespace FeatureMap {
+namespace CurrentState {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasAce::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31844,9 +31711,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -31854,87 +31721,125 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasAce::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace CurrentState
 
-namespace ClusterRevision {
+namespace StartTime {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasAce::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasAce::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
+}
 
-} // namespace Attributes
-} // namespace IasAce
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-namespace IasWd {
-namespace Attributes {
+    return Set(endpoint, value.Value());
+}
 
-namespace MaxDuration {
+} // namespace StartTime
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+namespace Duration {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasWd::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasWd::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
-} // namespace MaxDuration
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+}
 
-namespace FeatureMap {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace Duration
+
+namespace PlaybackSpeed {
+
+EmberAfStatus Get(chip::EndpointId endpoint, float * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<float>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasWd::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -31943,9 +31848,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, float value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<float>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -31953,77 +31858,116 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasWd::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace PlaybackSpeed
 
-namespace ClusterRevision {
+namespace SeekRangeEnd {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::IasWd::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::IasWd::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+}
 
-} // namespace Attributes
-} // namespace IasWd
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-namespace WakeOnLan {
-namespace Attributes {
+    return Set(endpoint, value.Value());
+}
 
-namespace MACAddress {
+} // namespace SeekRangeEnd
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+namespace SeekRangeStart {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    uint8_t zclString[32 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (Traits::IsNullValue(temp))
+    {
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
+    }
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+}
 
-    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 32);
-    value.reduce_size(length);
-    return status;
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
-    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[32 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace MACAddress
+} // namespace SeekRangeStart
 
 namespace FeatureMap {
 
@@ -32032,7 +31976,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32051,7 +31995,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -32063,7 +32007,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32082,17 +32026,48 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::WakeOnLan::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace WakeOnLan
+} // namespace MediaPlayback
 
-namespace Channel {
+namespace MediaInput {
 namespace Attributes {
 
+namespace CurrentInput {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaInput::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace CurrentInput
+
 namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
@@ -32100,7 +32075,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Channel::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaInput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32119,7 +32094,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Channel::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -32131,7 +32106,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Channel::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaInput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32150,25 +32125,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Channel::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace Channel
+} // namespace MediaInput
 
-namespace TargetNavigator {
+namespace LowPower {
 namespace Attributes {
 
-namespace CurrentTarget {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LowPower::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32177,9 +32152,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -32187,10 +32162,47 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::LowPower::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace CurrentTarget
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LowPower::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::LowPower::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace LowPower
+
+namespace KeypadInput {
+namespace Attributes {
 
 namespace FeatureMap {
 
@@ -32199,7 +32211,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32218,7 +32230,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -32230,7 +32242,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32249,25 +32261,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace TargetNavigator
+} // namespace KeypadInput
 
-namespace MediaPlayback {
+namespace ContentLauncher {
 namespace Attributes {
 
-namespace CurrentState {
+namespace SupportedStreamingProtocols {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32276,9 +32288,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -32286,125 +32298,87 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace CurrentState
+} // namespace SupportedStreamingProtocols
 
-namespace StartTime {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNull();
-    }
-    else
-    {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint64_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace StartTime
+} // namespace FeatureMap
 
-namespace Duration {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint64_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
+} // namespace ClusterRevision
 
-    return Set(endpoint, value.Value());
-}
+} // namespace Attributes
+} // namespace ContentLauncher
 
-} // namespace Duration
+namespace AudioOutput {
+namespace Attributes {
 
-namespace PlaybackSpeed {
+namespace CurrentOutput {
 
-EmberAfStatus Get(chip::EndpointId endpoint, float * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<float>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32413,9 +32387,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, float * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, float value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<float>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -32423,116 +32397,78 @@ EmberAfStatus Set(chip::EndpointId endpoint, float value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PlaybackSpeed
+} // namespace CurrentOutput
 
-namespace SeekRangeEnd {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint64_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace SeekRangeEnd
+} // namespace FeatureMap
 
-namespace SeekRangeStart {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint64_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
+} // namespace ClusterRevision
 
-    return Set(endpoint, value.Value());
-}
+} // namespace Attributes
+} // namespace AudioOutput
 
-} // namespace SeekRangeStart
+namespace ApplicationLauncher {
+namespace Attributes {
 
 namespace FeatureMap {
 
@@ -32541,7 +32477,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32560,7 +32496,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -32572,7 +32508,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32591,56 +32527,55 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace MediaPlayback
+} // namespace ApplicationLauncher
 
-namespace MediaInput {
+namespace ApplicationBasic {
 namespace Attributes {
 
-namespace CurrentInput {
+namespace VendorName {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaInput::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[32 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 32);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[32 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace CurrentInput
+} // namespace VendorName
 
-namespace FeatureMap {
+namespace VendorID {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaInput::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32649,9 +32584,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -32659,19 +32594,49 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace VendorID
 
-namespace ClusterRevision {
+namespace ApplicationName {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+{
+    uint8_t zclString[32 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+
+    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 32);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+{
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[32 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace ApplicationName
+
+namespace ProductID {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaInput::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32690,25 +32655,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace MediaInput
-
-namespace LowPower {
-namespace Attributes {
+} // namespace ProductID
 
-namespace FeatureMap {
+namespace Status {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LowPower::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32717,9 +32676,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -32727,47 +32686,40 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::LowPower::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace Status
 
-namespace ClusterRevision {
+namespace ApplicationVersion {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LowPower::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[32 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 32);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::LowPower::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[32 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace LowPower
-
-namespace KeypadInput {
-namespace Attributes {
+} // namespace ApplicationVersion
 
 namespace FeatureMap {
 
@@ -32776,7 +32728,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32795,7 +32747,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -32807,7 +32759,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32826,48 +32778,17 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::KeypadInput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace KeypadInput
+} // namespace ApplicationBasic
 
-namespace ContentLauncher {
+namespace AccountLogin {
 namespace Attributes {
 
-namespace SupportedStreamingProtocols {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
-{
-    using Traits = NumericAttributeTraits<uint32_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
-{
-    using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
-}
-
-} // namespace SupportedStreamingProtocols
-
 namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
@@ -32875,7 +32796,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32894,7 +32815,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -32906,7 +32827,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32925,48 +32846,17 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace ContentLauncher
+} // namespace AccountLogin
 
-namespace AudioOutput {
+namespace Messaging {
 namespace Attributes {
 
-namespace CurrentOutput {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
-{
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
-{
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
-}
-
-} // namespace CurrentOutput
-
 namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
@@ -32974,7 +32864,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Messaging::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -32993,7 +32883,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::Messaging::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -33005,7 +32895,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Messaging::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33024,25 +32914,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::Messaging::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace AudioOutput
+} // namespace Messaging
 
-namespace ApplicationLauncher {
+namespace ApplianceIdentification {
 namespace Attributes {
 
-namespace FeatureMap {
+namespace BasicIdentification {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33051,9 +32941,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33061,19 +32951,51 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace BasicIdentification
 
-namespace ClusterRevision {
+namespace CompanyName {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+{
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+{
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace CompanyName
+
+namespace CompanyId {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33092,23 +33014,18 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplicationLauncher
-
-namespace ApplicationBasic {
-namespace Attributes {
+} // namespace CompanyId
 
-namespace VendorName {
+namespace BrandName {
 
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    uint8_t zclString[32 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     size_t length = emberAfStringLength(zclString);
     if (length == NumericAttributeTraits<uint8_t>::kNullValue)
@@ -33116,31 +33033,32 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
 
-    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 32);
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
     value.reduce_size(length);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[32 + 1];
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
     emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
     memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace VendorName
+} // namespace BrandName
 
-namespace VendorID {
+namespace BrandId {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33159,17 +33077,18 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace VendorID
+} // namespace BrandId
 
-namespace ApplicationName {
+namespace Model {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    uint8_t zclString[32 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     size_t length = emberAfStringLength(zclString);
     if (length == NumericAttributeTraits<uint8_t>::kNullValue)
@@ -33177,91 +33096,127 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
 
-    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 32);
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
     value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[32 + 1];
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
     emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
     memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ApplicationName
+} // namespace Model
 
-namespace ProductID {
+namespace PartNumber {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ProductID
+} // namespace PartNumber
 
-namespace Status {
+namespace ProductRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[6 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 6);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[6 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace ProductRevision
+
+namespace SoftwareRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+{
+    uint8_t zclString[6 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+
+    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 6);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+{
+    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[6 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Status
+} // namespace SoftwareRevision
 
-namespace ApplicationVersion {
+namespace ProductTypeName {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    uint8_t zclString[32 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
+    uint8_t zclString[2 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     size_t length = emberAfStringLength(zclString);
     if (length == NumericAttributeTraits<uint8_t>::kNullValue)
@@ -33269,31 +33224,32 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
 
-    VerifyOrReturnError(value.size() == 32, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 32);
+    VerifyOrReturnError(value.size() == 2, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 2);
     value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 32, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[32 + 1];
+    static_assert(2 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 2, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[2 + 1];
     emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
     memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
+                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ApplicationVersion
+} // namespace ProductTypeName
 
-namespace FeatureMap {
+namespace ProductTypeId {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33302,9 +33258,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33312,19 +33268,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace ProductTypeId
 
-namespace ClusterRevision {
+namespace CecedSpecificationVersion {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33333,9 +33289,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33343,16 +33299,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplicationBasic
-
-namespace AccountLogin {
-namespace Attributes {
+} // namespace CecedSpecificationVersion
 
 namespace FeatureMap {
 
@@ -33361,7 +33311,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33380,7 +33330,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -33392,7 +33342,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33411,56 +33361,56 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::AccountLogin::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace AccountLogin
+} // namespace ApplianceIdentification
 
-namespace TestCluster {
+namespace MeterIdentification {
 namespace Attributes {
 
-namespace Boolean {
+namespace CompanyName {
 
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<bool>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<bool>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Boolean
+} // namespace CompanyName
 
-namespace Bitmap8 {
+namespace MeterTypeId {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33469,9 +33419,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33479,19 +33429,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Bitmap8
+} // namespace MeterTypeId
 
-namespace Bitmap16 {
+namespace DataQualityId {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33500,9 +33450,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33510,205 +33460,236 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters:
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Bitmap16
+} // namespace DataQualityId
 
-namespace Bitmap32 {
+namespace CustomerName {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Bitmap32
+} // namespace CustomerName
 
-namespace Bitmap64 {
+namespace Model {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Bitmap64
+} // namespace Model
 
-namespace Int8u {
+namespace PartNumber {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int8u
+} // namespace PartNumber
 
-namespace Int16u {
+namespace ProductRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[6 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 6);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[6 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int16u
+} // namespace ProductRevision
 
-namespace Int24u {
+namespace SoftwareRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[6 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 6);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
+    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[6 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int24u
+} // namespace SoftwareRevision
 
-namespace Int32u {
+namespace UtilityName {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace UtilityName
+
+namespace Pod {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+{
+    uint8_t zclString[16 + 1];
+    EmberAfStatus status =
+        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+
+    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 16);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+{
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[16 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int32u
+} // namespace Pod
 
-namespace Int40u {
+namespace AvailablePower {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33717,9 +33698,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33727,19 +33708,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int40u
+} // namespace AvailablePower
 
-namespace Int48u {
+namespace PowerThreshold {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33748,9 +33729,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33758,19 +33739,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int48u
+} // namespace PowerThreshold
 
-namespace Int56u {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33779,9 +33760,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33789,19 +33770,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int56u
+} // namespace FeatureMap
 
-namespace Int64u {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33810,9 +33791,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33820,19 +33801,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int64u
+} // namespace ClusterRevision
 
-namespace Int8s {
+} // namespace Attributes
+} // namespace MeterIdentification
 
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+namespace ApplianceEventsAndAlert {
+namespace Attributes {
+
+namespace FeatureMap {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33841,9 +33828,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33851,19 +33838,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int8s
+} // namespace FeatureMap
 
-namespace Int16s {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33872,9 +33859,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33882,19 +33869,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int16s
+} // namespace ClusterRevision
 
-namespace Int24s {
+} // namespace Attributes
+} // namespace ApplianceEventsAndAlert
 
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
+namespace ApplianceStatistics {
+namespace Attributes {
+
+namespace LogMaxSize {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33903,9 +33896,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33913,19 +33906,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int24s
+} // namespace LogMaxSize
 
-namespace Int32s {
+namespace LogQueueMaxSize {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33934,9 +33927,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33944,19 +33937,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int32s
+} // namespace LogQueueMaxSize
 
-namespace Int40s {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33965,9 +33958,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -33975,19 +33968,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int40s
+} // namespace FeatureMap
 
-namespace Int48s {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -33996,9 +33989,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34006,19 +33999,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int48s
+} // namespace ClusterRevision
 
-namespace Int56s {
+} // namespace Attributes
+} // namespace ApplianceStatistics
 
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+namespace ElectricalMeasurement {
+namespace Attributes {
+
+namespace MeasurementType {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34027,9 +34026,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34037,19 +34036,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int56s
+} // namespace MeasurementType
 
-namespace Int64s {
+namespace DcVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<int64_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34058,9 +34057,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<int64_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34068,19 +34067,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Int64s
+} // namespace DcVoltage
 
-namespace Enum8 {
+namespace DcVoltageMin {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34089,9 +34088,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34099,19 +34098,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Enum8
+} // namespace DcVoltageMin
 
-namespace Enum16 {
+namespace DcVoltageMax {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34120,9 +34119,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34130,19 +34129,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Enum16
+} // namespace DcVoltageMax
 
-namespace FloatSingle {
+namespace DcCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, float * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<float>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34151,9 +34150,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, float * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, float value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<float>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34161,19 +34160,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, float value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace FloatSingle
+} // namespace DcCurrent
 
-namespace FloatDouble {
+namespace DcCurrentMin {
 
-EmberAfStatus Get(chip::EndpointId endpoint, double * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<double>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34182,9 +34181,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, double * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, double value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<double>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34192,139 +34191,81 @@ EmberAfStatus Set(chip::EndpointId endpoint, double value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace FloatDouble
+} // namespace DcCurrentMin
 
-namespace OctetString {
+namespace DcCurrentMax {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[10 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 10);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
-{
-    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[10 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
-}
-
-} // namespace OctetString
-
-namespace LongOctetString {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    uint8_t zclString[1000 + 2];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfLongStringLength(zclString);
-    if (length == NumericAttributeTraits<uint16_t>::kNullValue)
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 1000, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[2], 1000);
-    value.reduce_size(length);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
-{
-    static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 1000, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[1000 + 2];
-    emberAfCopyInt16u(zclString, 0, static_cast<uint16_t>(value.size()));
-    memcpy(&zclString[2], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE);
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace LongOctetString
+} // namespace DcCurrentMax
 
-namespace CharString {
+namespace DcPower {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[10 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 10);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
-{
-    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[10 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
-}
-
-} // namespace CharString
-
-namespace LongCharString {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    uint8_t zclString[1000 + 2];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfLongStringLength(zclString);
-    if (length == NumericAttributeTraits<uint16_t>::kNullValue)
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 1000, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[2], 1000);
-    value.reduce_size(length);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
-{
-    static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 1000, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[1000 + 2];
-    emberAfCopyInt16u(zclString, 0, static_cast<uint16_t>(value.size()));
-    memcpy(&zclString[2], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE);
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace LongCharString
+} // namespace DcPower
 
-namespace EpochUs {
+namespace DcPowerMin {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34333,9 +34274,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34343,19 +34284,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace EpochUs
+} // namespace DcPowerMin
 
-namespace EpochS {
+namespace DcPowerMax {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34364,9 +34305,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34374,19 +34315,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace EpochS
+} // namespace DcPowerMax
 
-namespace VendorId {
+namespace DcVoltageMultiplier {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::VendorId>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34395,9 +34336,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::VendorId>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34405,19 +34346,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace VendorId
+} // namespace DcVoltageMultiplier
 
-namespace EnumAttr {
+namespace DcVoltageDivisor {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34426,9 +34367,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::S
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34436,19 +34377,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::S
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace EnumAttr
+} // namespace DcVoltageDivisor
 
-namespace RangeRestrictedInt8u {
+namespace DcCurrentMultiplier {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34457,9 +34398,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34467,19 +34408,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RangeRestrictedInt8u
+} // namespace DcCurrentMultiplier
 
-namespace RangeRestrictedInt8s {
+namespace DcCurrentDivisor {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34488,9 +34429,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34498,19 +34439,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RangeRestrictedInt8s
+} // namespace DcCurrentDivisor
 
-namespace RangeRestrictedInt16u {
+namespace DcPowerMultiplier {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34529,19 +34470,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RangeRestrictedInt16u
+} // namespace DcPowerMultiplier
 
-namespace RangeRestrictedInt16s {
+namespace DcPowerDivisor {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34550,9 +34491,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34560,19 +34501,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RangeRestrictedInt16s
+} // namespace DcPowerDivisor
 
-namespace TimedWriteBoolean {
+namespace AcFrequency {
 
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34581,9 +34522,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34591,19 +34532,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace TimedWriteBoolean
+} // namespace AcFrequency
 
-namespace GeneralErrorBoolean {
+namespace AcFrequencyMin {
 
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34612,9 +34553,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34622,19 +34563,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace GeneralErrorBoolean
+} // namespace AcFrequencyMin
 
-namespace ClusterErrorBoolean {
+namespace AcFrequencyMax {
 
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34643,9 +34584,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34653,19 +34594,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterErrorBoolean
+} // namespace AcFrequencyMax
 
-namespace Unsupported {
+namespace NeutralCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -34674,9 +34615,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -34684,1714 +34625,1321 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Unsupported
+} // namespace NeutralCurrent
 
-namespace NullableBoolean {
+namespace TotalActivePower {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<bool> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
 {
-    using Traits = NumericAttributeTraits<bool>;
+    using Traits = NumericAttributeTraits<int32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, bool value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<bool>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace TotalActivePower
+
+namespace TotalReactivePower {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
 {
-    using Traits = NumericAttributeTraits<bool>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableBoolean
+} // namespace TotalReactivePower
 
-namespace NullableBitmap8 {
+namespace TotalApparentPower {
 
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace TotalApparentPower
+
+namespace Measured1stHarmonicCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableBitmap8
+} // namespace Measured1stHarmonicCurrent
 
-namespace NullableBitmap16 {
+namespace Measured3rdHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace NullableBitmap16
+} // namespace Measured3rdHarmonicCurrent
 
-namespace NullableBitmap32 {
+namespace Measured5thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableBitmap32
+} // namespace Measured5thHarmonicCurrent
 
-namespace NullableBitmap64 {
+namespace Measured7thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableBitmap64
+} // namespace Measured7thHarmonicCurrent
 
-namespace NullableInt8u {
+namespace Measured9thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace Measured9thHarmonicCurrent
+
+namespace Measured11thHarmonicCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt8u
+} // namespace Measured11thHarmonicCurrent
 
-namespace NullableInt16u {
+namespace MeasuredPhase1stHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace MeasuredPhase1stHarmonicCurrent
+
+namespace MeasuredPhase3rdHarmonicCurrent {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt16u
+} // namespace MeasuredPhase3rdHarmonicCurrent
 
-namespace NullableInt24u {
+namespace MeasuredPhase5thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace NullableInt24u
+} // namespace MeasuredPhase5thHarmonicCurrent
 
-namespace NullableInt32u {
+namespace MeasuredPhase7thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint32_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt32u
+} // namespace MeasuredPhase7thHarmonicCurrent
 
-namespace NullableInt40u {
+namespace MeasuredPhase9thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt40u
+} // namespace MeasuredPhase9thHarmonicCurrent
 
-namespace NullableInt48u {
+namespace MeasuredPhase11thHarmonicCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt48u
+} // namespace MeasuredPhase11thHarmonicCurrent
 
-namespace NullableInt56u {
+namespace AcFrequencyMultiplier {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace AcFrequencyMultiplier
+
+namespace AcFrequencyDivisor {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt56u
+} // namespace AcFrequencyDivisor
 
-namespace NullableInt64u {
+namespace PowerMultiplier {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint64_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
-}
+} // namespace PowerMultiplier
 
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    if (value.IsNull())
+namespace PowerDivisor {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt64u
+} // namespace PowerDivisor
 
-namespace NullableInt8s {
+namespace HarmonicCurrentMultiplier {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace HarmonicCurrentMultiplier
+
+namespace PhaseHarmonicCurrentMultiplier {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt8s
+} // namespace PhaseHarmonicCurrentMultiplier
 
-namespace NullableInt16s {
+namespace InstantaneousVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt16s
+} // namespace InstantaneousVoltage
 
-namespace NullableInt24s {
+namespace InstantaneousLineCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt24s
+} // namespace InstantaneousLineCurrent
 
-namespace NullableInt32s {
+namespace InstantaneousActiveCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<int32_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt32s
+} // namespace InstantaneousActiveCurrent
 
-namespace NullableInt40s {
+namespace InstantaneousReactiveCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
-}
+} // namespace InstantaneousReactiveCurrent
 
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+namespace InstantaneousPower {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace NullableInt40s
-
-namespace NullableInt48s {
-
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt48s
+} // namespace InstantaneousPower
 
-namespace NullableInt56s {
+namespace RmsVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt56s
+} // namespace RmsVoltage
 
-namespace NullableInt64s {
+namespace RmsVoltageMin {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int64_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int64_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace RmsVoltageMin
+
+namespace RmsVoltageMax {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int64_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableInt64s
+} // namespace RmsVoltageMax
 
-namespace NullableEnum8 {
+namespace RmsCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace RmsCurrent
+
+namespace RmsCurrentMin {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableEnum8
+} // namespace RmsCurrentMin
 
-namespace NullableEnum16 {
+namespace RmsCurrentMax {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
-}
+} // namespace RmsCurrentMax
 
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace NullableEnum16
-
-namespace NullableFloatSingle {
+namespace ActivePower {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<float> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<float>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, float value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<float>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<float>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableFloatSingle
+} // namespace ActivePower
 
-namespace NullableFloatDouble {
+namespace ActivePowerMin {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<double> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<double>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, double value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<double>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace ActivePowerMin
+
+namespace ActivePowerMax {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<double>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
 }
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableFloatDouble
+} // namespace ActivePowerMax
 
-namespace NullableOctetString {
+namespace ReactivePower {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[10 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNull();
-        return EMBER_ZCL_STATUS_SUCCESS;
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    auto & span = value.SetNonNull();
-
-    VerifyOrReturnError(span.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(span.data(), &zclString[1], 10);
-    span.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
-{
-    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[10 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    uint8_t zclString[1] = { 0xFF };
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableOctetString
+} // namespace ReactivePower
 
-namespace NullableCharString {
+namespace ApparentPower {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    uint8_t zclString[10 + 1];
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNull();
-        return EMBER_ZCL_STATUS_SUCCESS;
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    auto & span = value.SetNonNull();
-
-    VerifyOrReturnError(span.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(span.data(), &zclString[1], 10);
-    span.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
-{
-    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[10 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    uint8_t zclString[1] = { 0xFF };
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableCharString
+} // namespace ApparentPower
 
-namespace NullableEnumAttr {
+namespace PowerFactor {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
-}
-
-} // namespace NullableEnumAttr
+} // namespace PowerFactor
 
-namespace NullableRangeRestrictedInt8u {
+namespace AverageRmsVoltageMeasurementPeriod {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint8_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableRangeRestrictedInt8u
+} // namespace AverageRmsVoltageMeasurementPeriod
 
-namespace NullableRangeRestrictedInt8s {
+namespace AverageRmsUnderVoltageCounter {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<int8_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableRangeRestrictedInt8s
+} // namespace AverageRmsUnderVoltageCounter
 
-namespace NullableRangeRestrictedInt16u {
+namespace RmsExtremeOverVoltagePeriod {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableRangeRestrictedInt16u
+} // namespace RmsExtremeOverVoltagePeriod
 
-namespace NullableRangeRestrictedInt16s {
+namespace RmsExtremeUnderVoltagePeriod {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (Traits::IsNullValue(temp))
-    {
-        value.SetNull();
-    }
-    else
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
-        value.SetNonNull() = Traits::StorageToWorking(temp);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus SetNull(chip::EndpointId endpoint)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType value;
-    Traits::SetNull(value);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
-}
-
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
-{
-    if (value.IsNull())
-    {
-        return SetNull(endpoint);
-    }
-
-    return Set(endpoint, value.Value());
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace NullableRangeRestrictedInt16s
+} // namespace RmsExtremeUnderVoltagePeriod
 
-namespace FeatureMap {
+namespace RmsVoltageSagPeriod {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36400,9 +35948,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36410,19 +35958,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace RmsVoltageSagPeriod
 
-namespace ClusterRevision {
+namespace RmsVoltageSwellPeriod {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36441,25 +35989,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace TestCluster
-
-namespace Messaging {
-namespace Attributes {
+} // namespace RmsVoltageSwellPeriod
 
-namespace FeatureMap {
+namespace AcVoltageMultiplier {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Messaging::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36468,9 +36010,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36478,19 +36020,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Messaging::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace AcVoltageMultiplier
 
-namespace ClusterRevision {
+namespace AcVoltageDivisor {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Messaging::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36509,25 +36051,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::Messaging::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace Messaging
+} // namespace AcVoltageDivisor
 
-namespace ApplianceIdentification {
-namespace Attributes {
+namespace AcCurrentMultiplier {
 
-namespace BasicIdentification {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36536,9 +36072,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36546,51 +36082,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace BasicIdentification
+} // namespace AcCurrentMultiplier
 
-namespace CompanyName {
+namespace AcCurrentDivisor {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace CompanyName
+} // namespace AcCurrentDivisor
 
-namespace CompanyId {
+namespace AcPowerMultiplier {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36609,51 +36144,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace CompanyId
+} // namespace AcPowerMultiplier
 
-namespace BrandName {
+namespace AcPowerDivisor {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace BrandName
+} // namespace AcPowerDivisor
 
-namespace BrandId {
+namespace OverloadAlarmsMask {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36662,9 +36196,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36672,179 +36206,174 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
 }
 
-} // namespace BrandId
+} // namespace OverloadAlarmsMask
 
-namespace Model {
+namespace VoltageOverload {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Model
+} // namespace VoltageOverload
 
-namespace PartNumber {
+namespace CurrentOverload {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace PartNumber
+} // namespace CurrentOverload
 
-namespace ProductRevision {
+namespace AcOverloadAlarmsMask {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    uint8_t zclString[6 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 6);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[6 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
 
-} // namespace ProductRevision
+} // namespace AcOverloadAlarmsMask
 
-namespace SoftwareRevision {
+namespace AcVoltageOverload {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[6 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 6);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[6 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace SoftwareRevision
+} // namespace AcVoltageOverload
 
-namespace ProductTypeName {
+namespace AcCurrentOverload {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[2 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 2, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 2);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    static_assert(2 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 2, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[2 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, zclString,
-                                       ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ProductTypeName
+} // namespace AcCurrentOverload
 
-namespace ProductTypeId {
+namespace AcActivePowerOverload {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36853,9 +36382,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36863,19 +36392,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ProductTypeId
+} // namespace AcActivePowerOverload
 
-namespace CecedSpecificationVersion {
+namespace AcReactivePowerOverload {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36884,9 +36413,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36894,19 +36423,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace CecedSpecificationVersion
+} // namespace AcReactivePowerOverload
 
-namespace FeatureMap {
+namespace AverageRmsOverVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36915,9 +36444,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36925,19 +36454,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace AverageRmsOverVoltage
 
-namespace ClusterRevision {
+namespace AverageRmsUnderVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -36946,9 +36475,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -36956,56 +36485,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplianceIdentification
-
-namespace MeterIdentification {
-namespace Attributes {
+} // namespace AverageRmsUnderVoltage
 
-namespace CompanyName {
+namespace RmsExtremeOverVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace CompanyName
+} // namespace RmsExtremeOverVoltage
 
-namespace MeterTypeId {
+namespace RmsExtremeUnderVoltage {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37014,9 +36537,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37024,19 +36547,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeterTypeId
+} // namespace RmsExtremeUnderVoltage
 
-namespace DataQualityId {
+namespace RmsVoltageSag {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37045,9 +36568,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37055,236 +36578,143 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace DataQualityId
+} // namespace RmsVoltageSag
 
-namespace CustomerName {
+namespace RmsVoltageSwell {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace CustomerName
+} // namespace RmsVoltageSwell
 
-namespace Model {
+namespace LineCurrentPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
-}
-
-} // namespace Model
-
-namespace PartNumber {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
-{
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
-{
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PartNumber
+} // namespace LineCurrentPhaseB
 
-namespace ProductRevision {
+namespace ActiveCurrentPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[6 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 6);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
-{
-    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[6 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
-}
-
-} // namespace ProductRevision
-
-namespace SoftwareRevision {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    uint8_t zclString[6 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 6, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 6);
-    value.reduce_size(length);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
-{
-    static_assert(6 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 6, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[6 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace SoftwareRevision
+} // namespace ActiveCurrentPhaseB
 
-namespace UtilityName {
+namespace ReactiveCurrentPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
+    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
-{
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
-}
-
-} // namespace UtilityName
-
-namespace Pod {
-
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    uint8_t zclString[16 + 1];
-    EmberAfStatus status =
-        emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, sizeof(zclString));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    VerifyOrReturnError(value.size() == 16, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
-    memcpy(value.data(), &zclString[1], 16);
-    value.reduce_size(length);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
-{
-    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
-    VerifyOrReturnError(value.size() <= 16, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
-    uint8_t zclString[16 + 1];
-    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace Pod
+} // namespace ReactiveCurrentPhaseB
 
-namespace AvailablePower {
+namespace RmsVoltagePhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37293,9 +36723,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37303,19 +36733,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace AvailablePower
+} // namespace RmsVoltagePhaseB
 
-namespace PowerThreshold {
+namespace RmsVoltageMinPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37324,9 +36754,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37334,19 +36764,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerThreshold
+} // namespace RmsVoltageMinPhaseB
 
-namespace FeatureMap {
+namespace RmsVoltageMaxPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37355,9 +36785,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37365,19 +36795,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace RmsVoltageMaxPhaseB
 
-namespace ClusterRevision {
+namespace RmsCurrentPhaseB {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37396,25 +36826,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::MeterIdentification::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace MeterIdentification
-
-namespace ApplianceEventsAndAlert {
-namespace Attributes {
+} // namespace RmsCurrentPhaseB
 
-namespace FeatureMap {
+namespace RmsCurrentMinPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37423,9 +36847,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37433,19 +36857,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace RmsCurrentMinPhaseB
 
-namespace ClusterRevision {
+namespace RmsCurrentMaxPhaseB {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37464,25 +36888,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceEventsAndAlert::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
+} // namespace RmsCurrentMaxPhaseB
 
-} // namespace Attributes
-} // namespace ApplianceEventsAndAlert
+namespace ActivePowerPhaseB {
 
-namespace ApplianceStatistics {
-namespace Attributes {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    *value = Traits::StorageToWorking(temp);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+}
 
-namespace LogMaxSize {
+} // namespace ActivePowerPhaseB
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+namespace ActivePowerMinPhaseB {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37491,9 +36940,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37501,19 +36950,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace LogMaxSize
+} // namespace ActivePowerMinPhaseB
 
-namespace LogQueueMaxSize {
+namespace ActivePowerMaxPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37522,9 +36971,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37532,19 +36981,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace LogQueueMaxSize
+} // namespace ActivePowerMaxPhaseB
 
-namespace FeatureMap {
+namespace ReactivePowerPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37553,9 +37002,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37563,19 +37012,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace ReactivePowerPhaseB
 
-namespace ClusterRevision {
+namespace ApparentPowerPhaseB {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -37594,22 +37043,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ApplianceStatistics::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplianceStatistics
-
-namespace ElectricalMeasurement {
-namespace Attributes {
+} // namespace ApparentPowerPhaseB
 
-namespace MeasurementType {
+namespace PowerFactorPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37621,9 +37064,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37631,16 +37074,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasurementType
+} // namespace PowerFactorPhaseB
 
-namespace DcVoltage {
+namespace AverageRmsVoltageMeasurementPeriodPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37652,9 +37095,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37662,16 +37105,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcVoltage
+} // namespace AverageRmsVoltageMeasurementPeriodPhaseB
 
-namespace DcVoltageMin {
+namespace AverageRmsOverVoltageCounterPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37683,9 +37126,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37693,16 +37136,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcVoltageMin
+} // namespace AverageRmsOverVoltageCounterPhaseB
 
-namespace DcVoltageMax {
+namespace AverageRmsUnderVoltageCounterPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37714,9 +37157,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37724,16 +37167,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcVoltageMax
+} // namespace AverageRmsUnderVoltageCounterPhaseB
 
-namespace DcCurrent {
+namespace RmsExtremeOverVoltagePeriodPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37745,9 +37188,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37755,16 +37198,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcCurrent
+} // namespace RmsExtremeOverVoltagePeriodPhaseB
 
-namespace DcCurrentMin {
+namespace RmsExtremeUnderVoltagePeriodPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37776,9 +37219,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37786,16 +37229,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcCurrentMin
+} // namespace RmsExtremeUnderVoltagePeriodPhaseB
 
-namespace DcCurrentMax {
+namespace RmsVoltageSagPeriodPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37807,9 +37250,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37817,16 +37260,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcCurrentMax
+} // namespace RmsVoltageSagPeriodPhaseB
 
-namespace DcPower {
+namespace RmsVoltageSwellPeriodPhaseB {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37838,9 +37281,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37848,16 +37291,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcPower
+} // namespace RmsVoltageSwellPeriodPhaseB
 
-namespace DcPowerMin {
+namespace LineCurrentPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37869,9 +37312,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37879,12 +37322,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcPowerMin
+} // namespace LineCurrentPhaseC
 
-namespace DcPowerMax {
+namespace ActiveCurrentPhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
@@ -37913,13 +37356,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcPowerMax
+} // namespace ActiveCurrentPhaseC
 
-namespace DcVoltageMultiplier {
+namespace ReactiveCurrentPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -37931,9 +37374,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -37941,12 +37384,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcVoltageMultiplier
+} // namespace ReactiveCurrentPhaseC
 
-namespace DcVoltageDivisor {
+namespace RmsVoltagePhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
@@ -37975,9 +37418,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcVoltageDivisor
+} // namespace RmsVoltagePhaseC
 
-namespace DcCurrentMultiplier {
+namespace RmsVoltageMinPhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
@@ -38006,9 +37449,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcCurrentMultiplier
+} // namespace RmsVoltageMinPhaseC
 
-namespace DcCurrentDivisor {
+namespace RmsVoltageMaxPhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
@@ -38037,9 +37480,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcCurrentDivisor
+} // namespace RmsVoltageMaxPhaseC
 
-namespace DcPowerMultiplier {
+namespace RmsCurrentPhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
@@ -38068,9 +37511,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcPowerMultiplier
+} // namespace RmsCurrentPhaseC
 
-namespace DcPowerDivisor {
+namespace RmsCurrentMinPhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
@@ -38099,9 +37542,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace DcPowerDivisor
+} // namespace RmsCurrentMinPhaseC
 
-namespace AcFrequency {
+namespace RmsCurrentMaxPhaseC {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
@@ -38130,13 +37573,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcFrequency
+} // namespace RmsCurrentMaxPhaseC
 
-namespace AcFrequencyMin {
+namespace ActivePowerPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38148,9 +37591,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38158,16 +37601,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcFrequencyMin
+} // namespace ActivePowerPhaseC
 
-namespace AcFrequencyMax {
+namespace ActivePowerMinPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38179,9 +37622,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38189,16 +37632,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcFrequencyMax
+} // namespace ActivePowerMinPhaseC
 
-namespace NeutralCurrent {
+namespace ActivePowerMaxPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38210,9 +37653,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38220,16 +37663,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace NeutralCurrent
+} // namespace ActivePowerMaxPhaseC
 
-namespace TotalActivePower {
+namespace ReactivePowerPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38241,9 +37684,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38251,16 +37694,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace TotalActivePower
+} // namespace ReactivePowerPhaseC
 
-namespace TotalReactivePower {
+namespace ApparentPowerPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38272,9 +37715,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38282,16 +37725,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace TotalReactivePower
+} // namespace ApparentPowerPhaseC
 
-namespace TotalApparentPower {
+namespace PowerFactorPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38303,9 +37746,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38313,16 +37756,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace TotalApparentPower
+} // namespace PowerFactorPhaseC
 
-namespace Measured1stHarmonicCurrent {
+namespace AverageRmsVoltageMeasurementPeriodPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38334,9 +37777,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38344,16 +37787,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Measured1stHarmonicCurrent
+} // namespace AverageRmsVoltageMeasurementPeriodPhaseC
 
-namespace Measured3rdHarmonicCurrent {
+namespace AverageRmsOverVoltageCounterPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38365,9 +37808,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38375,16 +37818,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Measured3rdHarmonicCurrent
+} // namespace AverageRmsOverVoltageCounterPhaseC
 
-namespace Measured5thHarmonicCurrent {
+namespace AverageRmsUnderVoltageCounterPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38396,9 +37839,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38406,16 +37849,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Measured5thHarmonicCurrent
+} // namespace AverageRmsUnderVoltageCounterPhaseC
 
-namespace Measured7thHarmonicCurrent {
+namespace RmsExtremeOverVoltagePeriodPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38427,9 +37870,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38437,16 +37880,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Measured7thHarmonicCurrent
+} // namespace RmsExtremeOverVoltagePeriodPhaseC
 
-namespace Measured9thHarmonicCurrent {
+namespace RmsExtremeUnderVoltagePeriodPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38458,9 +37901,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38468,16 +37911,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Measured9thHarmonicCurrent
+} // namespace RmsExtremeUnderVoltagePeriodPhaseC
 
-namespace Measured11thHarmonicCurrent {
+namespace RmsVoltageSagPeriodPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38489,9 +37932,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38499,16 +37942,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Measured11thHarmonicCurrent
+} // namespace RmsVoltageSagPeriodPhaseC
 
-namespace MeasuredPhase1stHarmonicCurrent {
+namespace RmsVoltageSwellPeriodPhaseC {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38520,9 +37963,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38530,16 +37973,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasuredPhase1stHarmonicCurrent
+} // namespace RmsVoltageSwellPeriodPhaseC
 
-namespace MeasuredPhase3rdHarmonicCurrent {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38551,9 +37994,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38561,16 +38004,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasuredPhase3rdHarmonicCurrent
+} // namespace FeatureMap
 
-namespace MeasuredPhase5thHarmonicCurrent {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
@@ -38582,9 +38025,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38592,19 +38035,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasuredPhase5thHarmonicCurrent
+} // namespace ClusterRevision
 
-namespace MeasuredPhase7thHarmonicCurrent {
+} // namespace Attributes
+} // namespace ElectricalMeasurement
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+namespace TestCluster {
+namespace Attributes {
+
+namespace Boolean {
+
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38613,9 +38062,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38623,19 +38072,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasuredPhase7thHarmonicCurrent
+} // namespace Boolean
 
-namespace MeasuredPhase9thHarmonicCurrent {
+namespace Bitmap8 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38644,9 +38093,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38654,19 +38103,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasuredPhase9thHarmonicCurrent
+} // namespace Bitmap8
 
-namespace MeasuredPhase11thHarmonicCurrent {
+namespace Bitmap16 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38675,9 +38124,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38685,19 +38134,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
 
-} // namespace MeasuredPhase11thHarmonicCurrent
+} // namespace Bitmap16
 
-namespace AcFrequencyMultiplier {
+namespace Bitmap32 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38706,9 +38155,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38716,19 +38165,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcFrequencyMultiplier
+} // namespace Bitmap32
 
-namespace AcFrequencyDivisor {
+namespace Bitmap64 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38737,9 +38186,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38747,19 +38196,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcFrequencyDivisor
+} // namespace Bitmap64
 
-namespace PowerMultiplier {
+namespace Int8u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38768,9 +38217,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38778,19 +38227,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerMultiplier
+} // namespace Int8u
 
-namespace PowerDivisor {
+namespace Int16u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38799,9 +38248,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38809,19 +38258,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerDivisor
+} // namespace Int16u
 
-namespace HarmonicCurrentMultiplier {
+namespace Int24u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38830,9 +38279,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38840,19 +38289,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
-} // namespace HarmonicCurrentMultiplier
+} // namespace Int24u
 
-namespace PhaseHarmonicCurrentMultiplier {
+namespace Int32u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38861,9 +38310,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38871,19 +38320,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PhaseHarmonicCurrentMultiplier
+} // namespace Int32u
 
-namespace InstantaneousVoltage {
+namespace Int40u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38892,9 +38341,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38902,19 +38351,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
 }
 
-} // namespace InstantaneousVoltage
+} // namespace Int40u
 
-namespace InstantaneousLineCurrent {
+namespace Int48u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38923,9 +38372,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38933,19 +38382,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
 }
 
-} // namespace InstantaneousLineCurrent
+} // namespace Int48u
 
-namespace InstantaneousActiveCurrent {
+namespace Int56u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38954,9 +38403,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38964,19 +38413,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
 }
 
-} // namespace InstantaneousActiveCurrent
+} // namespace Int56u
 
-namespace InstantaneousReactiveCurrent {
+namespace Int64u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -38985,9 +38434,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -38995,19 +38444,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
-} // namespace InstantaneousReactiveCurrent
+} // namespace Int64u
 
-namespace InstantaneousPower {
+namespace Int8s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39016,9 +38465,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39026,19 +38475,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace InstantaneousPower
+} // namespace Int8s
 
-namespace RmsVoltage {
+namespace Int16s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39047,9 +38496,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39057,19 +38506,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltage
+} // namespace Int16s
 
-namespace RmsVoltageMin {
+namespace Int24s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39078,9 +38527,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39088,19 +38537,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageMin
+} // namespace Int24s
 
-namespace RmsVoltageMax {
+namespace Int32s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39109,9 +38558,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39119,19 +38568,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageMax
+} // namespace Int32s
 
-namespace RmsCurrent {
+namespace Int40s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39140,9 +38589,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39150,19 +38599,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsCurrent
+} // namespace Int40s
 
-namespace RmsCurrentMin {
+namespace Int48s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39171,9 +38620,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39181,19 +38630,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsCurrentMin
+} // namespace Int48s
 
-namespace RmsCurrentMax {
+namespace Int56s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39202,9 +38651,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39212,19 +38661,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsCurrentMax
+} // namespace Int56s
 
-namespace ActivePower {
+namespace Int64s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39233,9 +38682,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39243,19 +38692,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePower
+} // namespace Int64s
 
-namespace ActivePowerMin {
+namespace Enum8 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39264,9 +38713,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39274,19 +38723,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePowerMin
+} // namespace Enum8
 
-namespace ActivePowerMax {
+namespace Enum16 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39295,9 +38744,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39305,19 +38754,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePowerMax
+} // namespace Enum16
 
-namespace ReactivePower {
+namespace FloatSingle {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, float * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<float>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39326,9 +38775,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, float value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<float>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39336,19 +38785,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
 }
 
-} // namespace ReactivePower
+} // namespace FloatSingle
 
-namespace ApparentPower {
+namespace FloatDouble {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, double * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<double>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39357,9 +38806,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, double value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<double>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39367,81 +38816,139 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
 }
 
-} // namespace ApparentPower
+} // namespace FloatDouble
 
-namespace PowerFactor {
+namespace OctetString {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[10 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 10);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[10 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace OctetString
+
+namespace LongOctetString {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value)
+{
+    uint8_t zclString[1000 + 2];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfLongStringLength(zclString);
+    if (length == NumericAttributeTraits<uint16_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+
+    VerifyOrReturnError(value.size() == 1000, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[2], 1000);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
+{
+    static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 1000, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[1000 + 2];
+    emberAfCopyInt16u(zclString, 0, static_cast<uint16_t>(value.size()));
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerFactor
+} // namespace LongOctetString
 
-namespace AverageRmsVoltageMeasurementPeriod {
+namespace CharString {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[10 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    *value = Traits::StorageToWorking(temp);
+
+    VerifyOrReturnError(value.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[1], 10);
+    value.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[10 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+}
+
+} // namespace CharString
+
+namespace LongCharString {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
+{
+    uint8_t zclString[1000 + 2];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
+    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
+    size_t length = emberAfLongStringLength(zclString);
+    if (length == NumericAttributeTraits<uint16_t>::kNullValue)
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    VerifyOrReturnError(value.size() == 1000, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[2], 1000);
+    value.reduce_size(length);
+    return status;
+}
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
+{
+    static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 1000, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[1000 + 2];
+    emberAfCopyInt16u(zclString, 0, static_cast<uint16_t>(value.size()));
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsVoltageMeasurementPeriod
+} // namespace LongCharString
 
-namespace AverageRmsUnderVoltageCounter {
+namespace EpochUs {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39450,9 +38957,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39460,19 +38967,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsUnderVoltageCounter
+} // namespace EpochUs
 
-namespace RmsExtremeOverVoltagePeriod {
+namespace EpochS {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39481,9 +38988,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39491,19 +38998,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsExtremeOverVoltagePeriod
+} // namespace EpochS
 
-namespace RmsExtremeUnderVoltagePeriod {
+namespace VendorId {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::VendorId>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39512,9 +39019,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::VendorId>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39522,19 +39029,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsExtremeUnderVoltagePeriod
+} // namespace VendorId
 
-namespace RmsVoltageSagPeriod {
+namespace EnumAttr {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39543,9 +39050,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39553,19 +39060,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageSagPeriod
+} // namespace EnumAttr
 
-namespace RmsVoltageSwellPeriod {
+namespace RangeRestrictedInt8u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39574,9 +39081,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39584,19 +39091,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageSwellPeriod
+} // namespace RangeRestrictedInt8u
 
-namespace AcVoltageMultiplier {
+namespace RangeRestrictedInt8s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39605,9 +39112,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39615,19 +39122,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcVoltageMultiplier
+} // namespace RangeRestrictedInt8s
 
-namespace AcVoltageDivisor {
+namespace RangeRestrictedInt16u {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39646,19 +39153,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcVoltageDivisor
+} // namespace RangeRestrictedInt16u
 
-namespace AcCurrentMultiplier {
+namespace RangeRestrictedInt16s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39667,9 +39174,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39677,19 +39184,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcCurrentMultiplier
+} // namespace RangeRestrictedInt16s
 
-namespace AcCurrentDivisor {
+namespace TimedWriteBoolean {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39698,9 +39205,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39708,19 +39215,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcCurrentDivisor
+} // namespace TimedWriteBoolean
 
-namespace AcPowerMultiplier {
+namespace GeneralErrorBoolean {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39729,9 +39236,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39739,19 +39246,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcPowerMultiplier
+} // namespace GeneralErrorBoolean
 
-namespace AcPowerDivisor {
+namespace ClusterErrorBoolean {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39760,9 +39267,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39770,19 +39277,19 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcPowerDivisor
+} // namespace ClusterErrorBoolean
 
-namespace OverloadAlarmsMask {
+namespace Unsupported {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<bool>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -39791,9 +39298,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<bool>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -39801,1777 +39308,1705 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
-} // namespace OverloadAlarmsMask
+} // namespace Unsupported
 
-namespace VoltageOverload {
+namespace NullableBoolean {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<bool> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<bool>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
-} // namespace VoltageOverload
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+}
 
-namespace CurrentOverload {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableBoolean
+
+namespace NullableBitmap8 {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
 }
 
-} // namespace CurrentOverload
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
+}
 
-namespace AcOverloadAlarmsMask {
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableBitmap8
+
+namespace NullableBitmap16 {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcOverloadAlarmsMask
-
-namespace AcVoltageOverload {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace AcVoltageOverload
+} // namespace NullableBitmap16
 
-namespace AcCurrentOverload {
+namespace NullableBitmap32 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcCurrentOverload
-
-namespace AcActivePowerOverload {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace AcActivePowerOverload
+} // namespace NullableBitmap32
 
-namespace AcReactivePowerOverload {
+namespace NullableBitmap64 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
 }
 
-} // namespace AcReactivePowerOverload
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
+}
 
-namespace AverageRmsOverVoltage {
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableBitmap64
+
+namespace NullableInt8u {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsOverVoltage
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
 
-namespace AverageRmsUnderVoltage {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt8u
+
+namespace NullableInt16u {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsUnderVoltage
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
 
-namespace RmsExtremeOverVoltage {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt16u
+
+namespace NullableInt24u {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsExtremeOverVoltage
-
-namespace RmsExtremeUnderVoltage {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsExtremeUnderVoltage
+} // namespace NullableInt24u
 
-namespace RmsVoltageSag {
+namespace NullableInt32u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageSag
-
-namespace RmsVoltageSwell {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsVoltageSwell
+} // namespace NullableInt32u
 
-namespace LineCurrentPhaseB {
+namespace NullableInt40u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
 }
 
-} // namespace LineCurrentPhaseB
-
-namespace ActiveCurrentPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace ActiveCurrentPhaseB
+} // namespace NullableInt40u
 
-namespace ReactiveCurrentPhaseB {
+namespace NullableInt48u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ReactiveCurrentPhaseB
-
-namespace RmsVoltagePhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsVoltagePhaseB
+} // namespace NullableInt48u
 
-namespace RmsVoltageMinPhaseB {
+namespace NullableInt56u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageMinPhaseB
-
-namespace RmsVoltageMaxPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsVoltageMaxPhaseB
+} // namespace NullableInt56u
 
-namespace RmsCurrentPhaseB {
+namespace NullableInt64u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsCurrentPhaseB
-
-namespace RmsCurrentMinPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsCurrentMinPhaseB
+} // namespace NullableInt64u
 
-namespace RmsCurrentMaxPhaseB {
+namespace NullableInt8s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsCurrentMaxPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+}
 
-namespace ActivePowerPhaseB {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt8s
+
+namespace NullableInt16s {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePowerPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+}
 
-namespace ActivePowerMinPhaseB {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt16s
+
+namespace NullableInt24s {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePowerMinPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
+}
 
-namespace ActivePowerMaxPhaseB {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt24s
+
+namespace NullableInt32s {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<int32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePowerMaxPhaseB
-
-namespace ReactivePowerPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<int32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace ReactivePowerPhaseB
+} // namespace NullableInt32s
 
-namespace ApparentPowerPhaseB {
+namespace NullableInt40s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
 }
 
-} // namespace ApparentPowerPhaseB
-
-namespace PowerFactorPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace PowerFactorPhaseB
+} // namespace NullableInt40s
 
-namespace AverageRmsVoltageMeasurementPeriodPhaseB {
+namespace NullableInt48s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsVoltageMeasurementPeriodPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
+}
 
-namespace AverageRmsOverVoltageCounterPhaseB {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt48s
+
+namespace NullableInt56s {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsOverVoltageCounterPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
+}
 
-namespace AverageRmsUnderVoltageCounterPhaseB {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt56s
+
+namespace NullableInt64s {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int64_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsUnderVoltageCounterPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
+}
 
-namespace RmsExtremeOverVoltagePeriodPhaseB {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace NullableInt64s
+
+namespace NullableEnum8 {
+
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsExtremeOverVoltagePeriodPhaseB
-
-namespace RmsExtremeUnderVoltagePeriodPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsExtremeUnderVoltagePeriodPhaseB
+} // namespace NullableEnum8
 
-namespace RmsVoltageSagPeriodPhaseB {
+namespace NullableEnum16 {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageSagPeriodPhaseB
-
-namespace RmsVoltageSwellPeriodPhaseB {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsVoltageSwellPeriodPhaseB
+} // namespace NullableEnum16
 
-namespace LineCurrentPhaseC {
+namespace NullableFloatSingle {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<float> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<float>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, float value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<float>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
 }
 
-} // namespace LineCurrentPhaseC
-
-namespace ActiveCurrentPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<float>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace ActiveCurrentPhaseC
+} // namespace NullableFloatSingle
 
-namespace ReactiveCurrentPhaseC {
+namespace NullableFloatDouble {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<double> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<double>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, double value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<double>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
 }
 
-} // namespace ReactiveCurrentPhaseC
-
-namespace RmsVoltagePhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<double>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsVoltagePhaseC
+} // namespace NullableFloatDouble
 
-namespace RmsVoltageMinPhaseC {
+namespace NullableOctetString {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[10 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+        return EMBER_ZCL_STATUS_SUCCESS;
     }
-    *value = Traits::StorageToWorking(temp);
+    auto & span = value.SetNonNull();
+
+    VerifyOrReturnError(span.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(span.data(), &zclString[1], 10);
+    span.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
-
-} // namespace RmsVoltageMinPhaseC
-
-namespace RmsVoltageMaxPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[10 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageMaxPhaseC
-
-namespace RmsCurrentPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsCurrentPhaseC
-
-namespace RmsCurrentMinPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
-}
 
-} // namespace RmsCurrentMinPhaseC
-
-namespace RmsCurrentMaxPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
-{
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsCurrentMaxPhaseC
+} // namespace NullableOctetString
 
-namespace ActivePowerPhaseC {
+namespace NullableCharString {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[10 + 1];
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    size_t length = emberAfStringLength(zclString);
+    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+        return EMBER_ZCL_STATUS_SUCCESS;
     }
-    *value = Traits::StorageToWorking(temp);
+    auto & span = value.SetNonNull();
+
+    VerifyOrReturnError(span.size() == 10, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(span.data(), &zclString[1], 10);
+    span.reduce_size(length);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[10 + 1];
+    emberAfCopyInt8u(zclString, 0, static_cast<uint8_t>(value.size()));
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
-} // namespace ActivePowerPhaseC
-
-namespace ActivePowerMinPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace ActivePowerMinPhaseC
+} // namespace NullableCharString
 
-namespace ActivePowerMaxPhaseC {
+namespace NullableEnumAttr {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
-}
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
-}
-
-} // namespace ActivePowerMaxPhaseC
-
-namespace ReactivePowerPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
-{
-    using Traits = NumericAttributeTraits<int16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    else
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace ReactivePowerPhaseC
-
-namespace ApparentPowerPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TestCluster::SimpleEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace ApparentPowerPhaseC
+} // namespace NullableEnumAttr
 
-namespace PowerFactorPhaseC {
+namespace NullableRangeRestrictedInt8u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<int8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerFactorPhaseC
-
-namespace AverageRmsVoltageMeasurementPeriodPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace AverageRmsVoltageMeasurementPeriodPhaseC
+} // namespace NullableRangeRestrictedInt8u
 
-namespace AverageRmsOverVoltageCounterPhaseC {
+namespace NullableRangeRestrictedInt8s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
-} // namespace AverageRmsOverVoltageCounterPhaseC
-
-namespace AverageRmsUnderVoltageCounterPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<int8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace AverageRmsUnderVoltageCounterPhaseC
+} // namespace NullableRangeRestrictedInt8s
 
-namespace RmsExtremeOverVoltagePeriodPhaseC {
+namespace NullableRangeRestrictedInt16u {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsExtremeOverVoltagePeriodPhaseC
-
-namespace RmsExtremeUnderVoltagePeriodPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsExtremeUnderVoltagePeriodPhaseC
+} // namespace NullableRangeRestrictedInt16u
 
-namespace RmsVoltageSagPeriodPhaseC {
+namespace NullableRangeRestrictedInt16s {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
+    if (Traits::IsNullValue(temp))
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        value.SetNull();
+    }
+    else
+    {
+        value.SetNonNull() = Traits::StorageToWorking(temp);
     }
-    *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
-} // namespace RmsVoltageSagPeriodPhaseC
-
-namespace RmsVoltageSwellPeriodPhaseC {
-
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
-    VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
-    {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
-    }
-    *value = Traits::StorageToWorking(temp);
-    return status;
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
+
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    if (value.IsNull())
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return SetNull(endpoint);
     }
-    Traits::StorageType storageValue;
-    Traits::WorkingToStorage(value, storageValue);
-    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+
+    return Set(endpoint, value.Value());
 }
 
-} // namespace RmsVoltageSwellPeriodPhaseC
+} // namespace NullableRangeRestrictedInt16s
 
 namespace FeatureMap {
 
@@ -41580,7 +41015,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
     using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -41599,7 +41034,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
 } // namespace FeatureMap
@@ -41611,7 +41046,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
     using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, readable, sizeof(temp));
+    EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TestCluster::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -41630,13 +41065,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteServerAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteServerAttribute(endpoint, Clusters::TestCluster::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace ElectricalMeasurement
+} // namespace TestCluster
 
 } // namespace Clusters
 } // namespace app
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 583c4eddf4ab64..57efb6fe95015f 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
@@ -1567,6 +1567,11 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
 } // namespace BootReasons
 
+namespace TestEventTriggersEnabled {
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+} // namespace TestEventTriggersEnabled
+
 namespace FeatureMap {
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
@@ -1622,10 +1627,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
 } // namespace Channel
 
 namespace RoutingRole {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value); // RoutingRole
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value);
 } // namespace RoutingRole
 
 namespace NetworkName {
@@ -1662,28 +1669,38 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
 } // namespace OverrunCount
 
 namespace PartitionId {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
 } // namespace PartitionId
 
 namespace Weighting {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
 } // namespace Weighting
 
 namespace DataVersion {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
 } // namespace DataVersion
 
 namespace StableDataVersion {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
 } // namespace StableDataVersion
 
 namespace LeaderRouterId {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
 } // namespace LeaderRouterId
 
 namespace DetachedRoleCount {
@@ -1897,23 +1914,31 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
 } // namespace RxErrOtherCount
 
 namespace ActiveTimestamp {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int64u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
 EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
 } // namespace ActiveTimestamp
 
 namespace PendingTimestamp {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int64u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
 EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
 } // namespace PendingTimestamp
 
 namespace Delay {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
 } // namespace Delay
 
 namespace ChannelMask {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
 } // namespace ChannelMask
 
 namespace FeatureMap {
@@ -2554,11 +2579,6 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace OpenPeriod
 
-namespace NumberOfLogRecordsSupported {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace NumberOfLogRecordsSupported
-
 namespace NumberOfTotalUsersSupported {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
@@ -2611,8 +2631,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
 
 namespace CredentialRulesSupport {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> * value); // DlCredentialRuleMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
+                  chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> * value); // DlCredentialRuleMask
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
 } // namespace CredentialRulesSupport
 
 namespace NumberOfCredentialsSupportedPerUser {
@@ -2620,11 +2640,6 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
 } // namespace NumberOfCredentialsSupportedPerUser
 
-namespace EnableLogging {
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-} // namespace EnableLogging
-
 namespace Language {
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
@@ -2652,15 +2667,15 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOp
 
 namespace SupportedOperatingModes {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> * value); // DlSupportedOperatingModes
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
+                  chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> * value); // DlSupportedOperatingModes
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
 } // namespace SupportedOperatingModes
 
 namespace DefaultConfigurationRegister {
 EmberAfStatus
 Get(chip::EndpointId endpoint,
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> * value); // DlDefaultConfigurationRegister
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
+    chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> * value); // DlDefaultConfigurationRegister
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
 } // namespace DefaultConfigurationRegister
 
 namespace EnableLocalProgramming {
@@ -2685,8 +2700,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value);
 
 namespace LocalProgrammingFeatures {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> * value); // DlLocalProgrammingFeatures
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
+                  chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> * value); // DlLocalProgrammingFeatures
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
 } // namespace LocalProgrammingFeatures
 
 namespace WrongCodeEntryLimit {
@@ -2714,54 +2729,6 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace ExpiringUserTimeout
 
-namespace AlarmMask {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> * value); // DlAlarmMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> value);
-} // namespace AlarmMask
-
-namespace KeypadOperationEventMask {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> * value); // DlKeypadOperationEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value);
-} // namespace KeypadOperationEventMask
-
-namespace RemoteOperationEventMask {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> * value); // DlRemoteOperationEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> value);
-} // namespace RemoteOperationEventMask
-
-namespace ManualOperationEventMask {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> * value); // DlManualOperationEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> value);
-} // namespace ManualOperationEventMask
-
-namespace RFIDOperationEventMask {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> * value); // DlRFIDOperationEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> value);
-} // namespace RFIDOperationEventMask
-
-namespace KeypadProgrammingEventMask {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> * value); // DlKeypadOperationEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value);
-} // namespace KeypadProgrammingEventMask
-
-namespace RemoteProgrammingEventMask {
-EmberAfStatus
-Get(chip::EndpointId endpoint,
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> * value); // DlRemoteProgrammingEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> value);
-} // namespace RemoteProgrammingEventMask
-
-namespace RFIDProgrammingEventMask {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> * value); // DlRFIDProgrammingEventMask
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> value);
-} // namespace RFIDProgrammingEventMask
-
 namespace FeatureMap {
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
@@ -2819,8 +2786,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 
 namespace ConfigStatus {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> * value); // ConfigStatus
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value);
+                  chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> * value); // ConfigStatus
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value);
 } // namespace ConfigStatus
 
 namespace CurrentPositionLiftPercentage {
@@ -2896,8 +2863,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace InstalledClosedLimitTilt
 
 namespace Mode {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> * value); // Mode
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value);
+EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> * value); // Mode
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value);
 } // namespace Mode
 
 namespace SafetyStatus {
@@ -3080,8 +3047,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
 
 namespace PumpStatus {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> * value); // PumpStatus
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value);
+                  chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> * value); // PumpStatus
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value);
 } // namespace PumpStatus
 
 namespace EffectiveOperationMode {
@@ -3279,11 +3246,6 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
 } // namespace SystemMode
 
-namespace AlarmMask {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace AlarmMask
-
 namespace ThermostatRunningMode {
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
@@ -5403,94 +5365,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace Attributes
 } // namespace SodiumConcentrationMeasurement
 
-namespace IasZone {
-namespace Attributes {
-
-namespace ZoneState {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace ZoneState
-
-namespace ZoneType {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // enum16
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ZoneType
-
-namespace ZoneStatus {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ZoneStatus
-
-namespace IasCieAddress {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::NodeId * value); // node_id
-EmberAfStatus Set(chip::EndpointId endpoint, chip::NodeId value);
-} // namespace IasCieAddress
-
-namespace ZoneId {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace ZoneId
-
-namespace NumberOfZoneSensitivityLevelsSupported {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace NumberOfZoneSensitivityLevelsSupported
-
-namespace CurrentZoneSensitivityLevel {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace CurrentZoneSensitivityLevel
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace IasZone
-
-namespace IasAce {
-namespace Attributes {
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace IasAce
-
-namespace IasWd {
-namespace Attributes {
-
-namespace MaxDuration {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace MaxDuration
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace IasWd
-
 namespace WakeOnLan {
 namespace Attributes {
 
@@ -5777,1320 +5651,1317 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace Attributes
 } // namespace AccountLogin
 
-namespace TestCluster {
+namespace Messaging {
 namespace Attributes {
 
-namespace Boolean {
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-} // namespace Boolean
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
 
-namespace Bitmap8 {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> * value); // Bitmap8MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
-} // namespace Bitmap8
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
 
-namespace Bitmap16 {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> * value); // Bitmap16MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
-} // namespace Bitmap16
+} // namespace Attributes
+} // namespace Messaging
 
-namespace Bitmap32 {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> * value); // Bitmap32MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
-} // namespace Bitmap32
+namespace ApplianceIdentification {
+namespace Attributes {
 
-namespace Bitmap64 {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> * value); // Bitmap64MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
-} // namespace Bitmap64
+namespace BasicIdentification {
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int56u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+} // namespace BasicIdentification
 
-namespace Int8u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace Int8u
+namespace CompanyName {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+} // namespace CompanyName
 
-namespace Int16u {
+namespace CompanyId {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace Int16u
+} // namespace CompanyId
 
-namespace Int24u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int24u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace Int24u
+namespace BrandName {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+} // namespace BrandName
 
-namespace Int32u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace Int32u
+namespace BrandId {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace BrandId
 
-namespace Int40u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int40u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-} // namespace Int40u
+namespace Model {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace Model
 
-namespace Int48u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int48u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-} // namespace Int48u
+namespace PartNumber {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace PartNumber
 
-namespace Int56u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int56u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-} // namespace Int56u
+namespace ProductRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace ProductRevision
 
-namespace Int64u {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int64u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-} // namespace Int64u
+namespace SoftwareRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace SoftwareRevision
 
-namespace Int8s {
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace Int8s
+namespace ProductTypeName {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace ProductTypeName
 
-namespace Int16s {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Int16s
+namespace ProductTypeId {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ProductTypeId
 
-namespace Int24s {
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int24s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-} // namespace Int24s
+namespace CecedSpecificationVersion {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace CecedSpecificationVersion
 
-namespace Int32s {
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int32s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-} // namespace Int32s
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
 
-namespace Int40s {
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int40s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-} // namespace Int40s
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
 
-namespace Int48s {
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int48s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-} // namespace Int48s
+} // namespace Attributes
+} // namespace ApplianceIdentification
 
-namespace Int56s {
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int56s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-} // namespace Int56s
+namespace MeterIdentification {
+namespace Attributes {
 
-namespace Int64s {
-EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-} // namespace Int64s
+namespace CompanyName {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+} // namespace CompanyName
 
-namespace Enum8 {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace Enum8
+namespace MeterTypeId {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace MeterTypeId
 
-namespace Enum16 {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // enum16
+namespace DataQualityId {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace Enum16
+} // namespace DataQualityId
 
-namespace FloatSingle {
-EmberAfStatus Get(chip::EndpointId endpoint, float * value); // single
-EmberAfStatus Set(chip::EndpointId endpoint, float value);
-} // namespace FloatSingle
+namespace CustomerName {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+} // namespace CustomerName
 
-namespace FloatDouble {
-EmberAfStatus Get(chip::EndpointId endpoint, double * value); // double
-EmberAfStatus Set(chip::EndpointId endpoint, double value);
-} // namespace FloatDouble
+namespace Model {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace Model
 
-namespace OctetString {
+namespace PartNumber {
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace OctetString
+} // namespace PartNumber
 
-namespace LongOctetString {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // long_octet_string
+namespace ProductRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace LongOctetString
+} // namespace ProductRevision
 
-namespace CharString {
+namespace SoftwareRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace SoftwareRevision
+
+namespace UtilityName {
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace CharString
+} // namespace UtilityName
 
-namespace LongCharString {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // long_char_string
+namespace Pod {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace LongCharString
+} // namespace Pod
 
-namespace EpochUs {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // epoch_us
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-} // namespace EpochUs
+namespace AvailablePower {
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int24s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+} // namespace AvailablePower
 
-namespace EpochS {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s
+namespace PowerThreshold {
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int24s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+} // namespace PowerThreshold
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace EpochS
+} // namespace FeatureMap
 
-namespace VendorId {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value); // vendor_id
-EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value);
-} // namespace VendorId
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
 
-namespace EnumAttr {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum * value); // SimpleEnum
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value);
-} // namespace EnumAttr
+} // namespace Attributes
+} // namespace MeterIdentification
 
-namespace RangeRestrictedInt8u {
+namespace ApplianceEventsAndAlert {
+namespace Attributes {
+
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace ApplianceEventsAndAlert
+
+namespace ApplianceStatistics {
+namespace Attributes {
+
+namespace LogMaxSize {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace LogMaxSize
+
+namespace LogQueueMaxSize {
 EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace RangeRestrictedInt8u
+} // namespace LogQueueMaxSize
 
-namespace RangeRestrictedInt8s {
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace RangeRestrictedInt8s
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
 
-namespace RangeRestrictedInt16u {
+namespace ClusterRevision {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RangeRestrictedInt16u
+} // namespace ClusterRevision
 
-namespace RangeRestrictedInt16s {
+} // namespace Attributes
+} // namespace ApplianceStatistics
+
+namespace ElectricalMeasurement {
+namespace Attributes {
+
+namespace MeasurementType {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace MeasurementType
+
+namespace DcVoltage {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace RangeRestrictedInt16s
+} // namespace DcVoltage
 
-namespace TimedWriteBoolean {
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-} // namespace TimedWriteBoolean
+namespace DcVoltageMin {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcVoltageMin
 
-namespace GeneralErrorBoolean {
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-} // namespace GeneralErrorBoolean
+namespace DcVoltageMax {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcVoltageMax
 
-namespace ClusterErrorBoolean {
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-} // namespace ClusterErrorBoolean
+namespace DcCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcCurrent
 
-namespace Unsupported {
-EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-} // namespace Unsupported
+namespace DcCurrentMin {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcCurrentMin
 
-namespace NullableBoolean {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<bool> & value); // boolean
-EmberAfStatus Set(chip::EndpointId endpoint, bool value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value);
-} // namespace NullableBoolean
+namespace DcCurrentMax {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcCurrentMax
 
-namespace NullableBitmap8 {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value); // Bitmap8MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
-} // namespace NullableBitmap8
+namespace DcPower {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcPower
 
-namespace NullableBitmap16 {
-EmberAfStatus
-Get(chip::EndpointId endpoint,
-    DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value); // Bitmap16MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
-} // namespace NullableBitmap16
+namespace DcPowerMin {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcPowerMin
 
-namespace NullableBitmap32 {
-EmberAfStatus
-Get(chip::EndpointId endpoint,
-    DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value); // Bitmap32MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
-} // namespace NullableBitmap32
+namespace DcPowerMax {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace DcPowerMax
 
-namespace NullableBitmap64 {
-EmberAfStatus
-Get(chip::EndpointId endpoint,
-    DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value); // Bitmap64MaskMap
-EmberAfStatus Set(chip::EndpointId endpoint, chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
-} // namespace NullableBitmap64
+namespace DcVoltageMultiplier {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace DcVoltageMultiplier
 
-namespace NullableInt8u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
-} // namespace NullableInt8u
-
-namespace NullableInt16u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
+namespace DcVoltageDivisor {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
-} // namespace NullableInt16u
-
-namespace NullableInt24u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
-} // namespace NullableInt24u
-
-namespace NullableInt32u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
-} // namespace NullableInt32u
-
-namespace NullableInt40u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int40u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
-} // namespace NullableInt40u
-
-namespace NullableInt48u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int48u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
-} // namespace NullableInt48u
-
-namespace NullableInt56u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int56u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
-} // namespace NullableInt56u
-
-namespace NullableInt64u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
-} // namespace NullableInt64u
-
-namespace NullableInt8s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value);
-} // namespace NullableInt8s
-
-namespace NullableInt16s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
-} // namespace NullableInt16s
-
-namespace NullableInt24s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int24s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
-} // namespace NullableInt24s
-
-namespace NullableInt32s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int32s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
-} // namespace NullableInt32s
-
-namespace NullableInt40s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int40s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
-} // namespace NullableInt40s
-
-namespace NullableInt48s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int48s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
-} // namespace NullableInt48s
-
-namespace NullableInt56s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int56s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
-} // namespace NullableInt56s
-
-namespace NullableInt64s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int64s
-EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
-} // namespace NullableInt64s
-
-namespace NullableEnum8 {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // enum8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
-} // namespace NullableEnum8
+} // namespace DcVoltageDivisor
 
-namespace NullableEnum16 {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // enum16
+namespace DcCurrentMultiplier {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
-} // namespace NullableEnum16
-
-namespace NullableFloatSingle {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<float> & value); // single
-EmberAfStatus Set(chip::EndpointId endpoint, float value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value);
-} // namespace NullableFloatSingle
-
-namespace NullableFloatDouble {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<double> & value); // double
-EmberAfStatus Set(chip::EndpointId endpoint, double value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value);
-} // namespace NullableFloatDouble
-
-namespace NullableOctetString {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
-} // namespace NullableOctetString
-
-namespace NullableCharString {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
-} // namespace NullableCharString
-
-namespace NullableEnumAttr {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value); // SimpleEnum
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value);
-} // namespace NullableEnumAttr
-
-namespace NullableRangeRestrictedInt8u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
-} // namespace NullableRangeRestrictedInt8u
-
-namespace NullableRangeRestrictedInt8s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value);
-} // namespace NullableRangeRestrictedInt8s
+} // namespace DcCurrentMultiplier
 
-namespace NullableRangeRestrictedInt16u {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
+namespace DcCurrentDivisor {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
-} // namespace NullableRangeRestrictedInt16u
-
-namespace NullableRangeRestrictedInt16s {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-EmberAfStatus SetNull(chip::EndpointId endpoint);
-EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
-} // namespace NullableRangeRestrictedInt16s
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
+} // namespace DcCurrentDivisor
 
-namespace ClusterRevision {
+namespace DcPowerMultiplier {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace TestCluster
-
-namespace Messaging {
-namespace Attributes {
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
+} // namespace DcPowerMultiplier
 
-namespace ClusterRevision {
+namespace DcPowerDivisor {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace Messaging
-
-namespace ApplianceIdentification {
-namespace Attributes {
-
-namespace BasicIdentification {
-EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int56u
-EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
-} // namespace BasicIdentification
-
-namespace CompanyName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace CompanyName
+} // namespace DcPowerDivisor
 
-namespace CompanyId {
+namespace AcFrequency {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace CompanyId
-
-namespace BrandName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace BrandName
+} // namespace AcFrequency
 
-namespace BrandId {
+namespace AcFrequencyMin {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace BrandId
-
-namespace Model {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace Model
-
-namespace PartNumber {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace PartNumber
-
-namespace ProductRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace ProductRevision
-
-namespace SoftwareRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace SoftwareRevision
-
-namespace ProductTypeName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace ProductTypeName
+} // namespace AcFrequencyMin
 
-namespace ProductTypeId {
+namespace AcFrequencyMax {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ProductTypeId
-
-namespace CecedSpecificationVersion {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace CecedSpecificationVersion
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
+} // namespace AcFrequencyMax
 
-namespace ClusterRevision {
+namespace NeutralCurrent {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
+} // namespace NeutralCurrent
 
-} // namespace Attributes
-} // namespace ApplianceIdentification
+namespace TotalActivePower {
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int32s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+} // namespace TotalActivePower
 
-namespace MeterIdentification {
-namespace Attributes {
+namespace TotalReactivePower {
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int32s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+} // namespace TotalReactivePower
 
-namespace CompanyName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace CompanyName
+namespace TotalApparentPower {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace TotalApparentPower
 
-namespace MeterTypeId {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace MeterTypeId
+namespace Measured1stHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace Measured1stHarmonicCurrent
 
-namespace DataQualityId {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DataQualityId
+namespace Measured3rdHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace Measured3rdHarmonicCurrent
 
-namespace CustomerName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace CustomerName
+namespace Measured5thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace Measured5thHarmonicCurrent
 
-namespace Model {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace Model
+namespace Measured7thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace Measured7thHarmonicCurrent
 
-namespace PartNumber {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace PartNumber
+namespace Measured9thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace Measured9thHarmonicCurrent
 
-namespace ProductRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace ProductRevision
+namespace Measured11thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace Measured11thHarmonicCurrent
 
-namespace SoftwareRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
-} // namespace SoftwareRevision
+namespace MeasuredPhase1stHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace MeasuredPhase1stHarmonicCurrent
 
-namespace UtilityName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace UtilityName
+namespace MeasuredPhase3rdHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace MeasuredPhase3rdHarmonicCurrent
 
-namespace Pod {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
-EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace Pod
+namespace MeasuredPhase5thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace MeasuredPhase5thHarmonicCurrent
 
-namespace AvailablePower {
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int24s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-} // namespace AvailablePower
+namespace MeasuredPhase7thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace MeasuredPhase7thHarmonicCurrent
 
-namespace PowerThreshold {
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int24s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-} // namespace PowerThreshold
+namespace MeasuredPhase9thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace MeasuredPhase9thHarmonicCurrent
 
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
+namespace MeasuredPhase11thHarmonicCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace MeasuredPhase11thHarmonicCurrent
 
-namespace ClusterRevision {
+namespace AcFrequencyMultiplier {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace MeterIdentification
-
-namespace ApplianceEventsAndAlert {
-namespace Attributes {
-
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
+} // namespace AcFrequencyMultiplier
 
-namespace ClusterRevision {
+namespace AcFrequencyDivisor {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplianceEventsAndAlert
-
-namespace ApplianceStatistics {
-namespace Attributes {
+} // namespace AcFrequencyDivisor
 
-namespace LogMaxSize {
+namespace PowerMultiplier {
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace LogMaxSize
-
-namespace LogQueueMaxSize {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace LogQueueMaxSize
+} // namespace PowerMultiplier
 
-namespace FeatureMap {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+namespace PowerDivisor {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplianceStatistics
+} // namespace PowerDivisor
 
-namespace ElectricalMeasurement {
-namespace Attributes {
+namespace HarmonicCurrentMultiplier {
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+} // namespace HarmonicCurrentMultiplier
 
-namespace MeasurementType {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace MeasurementType
+namespace PhaseHarmonicCurrentMultiplier {
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+} // namespace PhaseHarmonicCurrentMultiplier
 
-namespace DcVoltage {
+namespace InstantaneousVoltage {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcVoltage
+} // namespace InstantaneousVoltage
 
-namespace DcVoltageMin {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcVoltageMin
+namespace InstantaneousLineCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace InstantaneousLineCurrent
 
-namespace DcVoltageMax {
+namespace InstantaneousActiveCurrent {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcVoltageMax
+} // namespace InstantaneousActiveCurrent
 
-namespace DcCurrent {
+namespace InstantaneousReactiveCurrent {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcCurrent
+} // namespace InstantaneousReactiveCurrent
 
-namespace DcCurrentMin {
+namespace InstantaneousPower {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcCurrentMin
+} // namespace InstantaneousPower
 
-namespace DcCurrentMax {
+namespace RmsVoltage {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltage
+
+namespace RmsVoltageMin {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltageMin
+
+namespace RmsVoltageMax {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltageMax
+
+namespace RmsCurrent {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsCurrent
+
+namespace RmsCurrentMin {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsCurrentMin
+
+namespace RmsCurrentMax {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsCurrentMax
+
+namespace ActivePower {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcCurrentMax
+} // namespace ActivePower
 
-namespace DcPower {
+namespace ActivePowerMin {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcPower
+} // namespace ActivePowerMin
 
-namespace DcPowerMin {
+namespace ActivePowerMax {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcPowerMin
+} // namespace ActivePowerMax
 
-namespace DcPowerMax {
+namespace ReactivePower {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace DcPowerMax
+} // namespace ReactivePower
 
-namespace DcVoltageMultiplier {
+namespace ApparentPower {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DcVoltageMultiplier
+} // namespace ApparentPower
 
-namespace DcVoltageDivisor {
+namespace PowerFactor {
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+} // namespace PowerFactor
+
+namespace AverageRmsVoltageMeasurementPeriod {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DcVoltageDivisor
+} // namespace AverageRmsVoltageMeasurementPeriod
 
-namespace DcCurrentMultiplier {
+namespace AverageRmsUnderVoltageCounter {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DcCurrentMultiplier
+} // namespace AverageRmsUnderVoltageCounter
 
-namespace DcCurrentDivisor {
+namespace RmsExtremeOverVoltagePeriod {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DcCurrentDivisor
+} // namespace RmsExtremeOverVoltagePeriod
 
-namespace DcPowerMultiplier {
+namespace RmsExtremeUnderVoltagePeriod {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DcPowerMultiplier
+} // namespace RmsExtremeUnderVoltagePeriod
 
-namespace DcPowerDivisor {
+namespace RmsVoltageSagPeriod {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace DcPowerDivisor
+} // namespace RmsVoltageSagPeriod
 
-namespace AcFrequency {
+namespace RmsVoltageSwellPeriod {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcFrequency
+} // namespace RmsVoltageSwellPeriod
 
-namespace AcFrequencyMin {
+namespace AcVoltageMultiplier {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcFrequencyMin
+} // namespace AcVoltageMultiplier
 
-namespace AcFrequencyMax {
+namespace AcVoltageDivisor {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcFrequencyMax
+} // namespace AcVoltageDivisor
 
-namespace NeutralCurrent {
+namespace AcCurrentMultiplier {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace NeutralCurrent
+} // namespace AcCurrentMultiplier
 
-namespace TotalActivePower {
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int32s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-} // namespace TotalActivePower
+namespace AcCurrentDivisor {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace AcCurrentDivisor
 
-namespace TotalReactivePower {
-EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int32s
-EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
-} // namespace TotalReactivePower
+namespace AcPowerMultiplier {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace AcPowerMultiplier
 
-namespace TotalApparentPower {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace TotalApparentPower
+namespace AcPowerDivisor {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace AcPowerDivisor
 
-namespace Measured1stHarmonicCurrent {
+namespace OverloadAlarmsMask {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace OverloadAlarmsMask
+
+namespace VoltageOverload {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Measured1stHarmonicCurrent
+} // namespace VoltageOverload
 
-namespace Measured3rdHarmonicCurrent {
+namespace CurrentOverload {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Measured3rdHarmonicCurrent
+} // namespace CurrentOverload
 
-namespace Measured5thHarmonicCurrent {
+namespace AcOverloadAlarmsMask {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace AcOverloadAlarmsMask
+
+namespace AcVoltageOverload {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Measured5thHarmonicCurrent
+} // namespace AcVoltageOverload
 
-namespace Measured7thHarmonicCurrent {
+namespace AcCurrentOverload {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Measured7thHarmonicCurrent
+} // namespace AcCurrentOverload
 
-namespace Measured9thHarmonicCurrent {
+namespace AcActivePowerOverload {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Measured9thHarmonicCurrent
+} // namespace AcActivePowerOverload
 
-namespace Measured11thHarmonicCurrent {
+namespace AcReactivePowerOverload {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace Measured11thHarmonicCurrent
+} // namespace AcReactivePowerOverload
 
-namespace MeasuredPhase1stHarmonicCurrent {
+namespace AverageRmsOverVoltage {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace MeasuredPhase1stHarmonicCurrent
+} // namespace AverageRmsOverVoltage
 
-namespace MeasuredPhase3rdHarmonicCurrent {
+namespace AverageRmsUnderVoltage {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace MeasuredPhase3rdHarmonicCurrent
+} // namespace AverageRmsUnderVoltage
 
-namespace MeasuredPhase5thHarmonicCurrent {
+namespace RmsExtremeOverVoltage {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace RmsExtremeOverVoltage
+
+namespace RmsExtremeUnderVoltage {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace RmsExtremeUnderVoltage
+
+namespace RmsVoltageSag {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace RmsVoltageSag
+
+namespace RmsVoltageSwell {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace RmsVoltageSwell
+
+namespace LineCurrentPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace LineCurrentPhaseB
+
+namespace ActiveCurrentPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace ActiveCurrentPhaseB
+
+namespace ReactiveCurrentPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+} // namespace ReactiveCurrentPhaseB
+
+namespace RmsVoltagePhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltagePhaseB
+
+namespace RmsVoltageMinPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltageMinPhaseB
+
+namespace RmsVoltageMaxPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltageMaxPhaseB
+
+namespace RmsCurrentPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsCurrentPhaseB
+
+namespace RmsCurrentMinPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsCurrentMinPhaseB
+
+namespace RmsCurrentMaxPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsCurrentMaxPhaseB
+
+namespace ActivePowerPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace MeasuredPhase5thHarmonicCurrent
+} // namespace ActivePowerPhaseB
 
-namespace MeasuredPhase7thHarmonicCurrent {
+namespace ActivePowerMinPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace MeasuredPhase7thHarmonicCurrent
+} // namespace ActivePowerMinPhaseB
 
-namespace MeasuredPhase9thHarmonicCurrent {
+namespace ActivePowerMaxPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace MeasuredPhase9thHarmonicCurrent
+} // namespace ActivePowerMaxPhaseB
 
-namespace MeasuredPhase11thHarmonicCurrent {
+namespace ReactivePowerPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace MeasuredPhase11thHarmonicCurrent
+} // namespace ReactivePowerPhaseB
 
-namespace AcFrequencyMultiplier {
+namespace ApparentPowerPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcFrequencyMultiplier
+} // namespace ApparentPowerPhaseB
 
-namespace AcFrequencyDivisor {
+namespace PowerFactorPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+} // namespace PowerFactorPhaseB
+
+namespace AverageRmsVoltageMeasurementPeriodPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcFrequencyDivisor
+} // namespace AverageRmsVoltageMeasurementPeriodPhaseB
 
-namespace PowerMultiplier {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace PowerMultiplier
+namespace AverageRmsOverVoltageCounterPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace AverageRmsOverVoltageCounterPhaseB
 
-namespace PowerDivisor {
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
-EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
-} // namespace PowerDivisor
+namespace AverageRmsUnderVoltageCounterPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace AverageRmsUnderVoltageCounterPhaseB
 
-namespace HarmonicCurrentMultiplier {
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace HarmonicCurrentMultiplier
+namespace RmsExtremeOverVoltagePeriodPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsExtremeOverVoltagePeriodPhaseB
 
-namespace PhaseHarmonicCurrentMultiplier {
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace PhaseHarmonicCurrentMultiplier
+namespace RmsExtremeUnderVoltagePeriodPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsExtremeUnderVoltagePeriodPhaseB
 
-namespace InstantaneousVoltage {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace InstantaneousVoltage
+namespace RmsVoltageSagPeriodPhaseB {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace RmsVoltageSagPeriodPhaseB
 
-namespace InstantaneousLineCurrent {
+namespace RmsVoltageSwellPeriodPhaseB {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace InstantaneousLineCurrent
+} // namespace RmsVoltageSwellPeriodPhaseB
 
-namespace InstantaneousActiveCurrent {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace InstantaneousActiveCurrent
+namespace LineCurrentPhaseC {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace LineCurrentPhaseC
 
-namespace InstantaneousReactiveCurrent {
+namespace ActiveCurrentPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace InstantaneousReactiveCurrent
+} // namespace ActiveCurrentPhaseC
 
-namespace InstantaneousPower {
+namespace ReactiveCurrentPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace InstantaneousPower
+} // namespace ReactiveCurrentPhaseC
 
-namespace RmsVoltage {
+namespace RmsVoltagePhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltage
+} // namespace RmsVoltagePhaseC
 
-namespace RmsVoltageMin {
+namespace RmsVoltageMinPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageMin
+} // namespace RmsVoltageMinPhaseC
 
-namespace RmsVoltageMax {
+namespace RmsVoltageMaxPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageMax
+} // namespace RmsVoltageMaxPhaseC
 
-namespace RmsCurrent {
+namespace RmsCurrentPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrent
+} // namespace RmsCurrentPhaseC
 
-namespace RmsCurrentMin {
+namespace RmsCurrentMinPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentMin
+} // namespace RmsCurrentMinPhaseC
 
-namespace RmsCurrentMax {
+namespace RmsCurrentMaxPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentMax
+} // namespace RmsCurrentMaxPhaseC
 
-namespace ActivePower {
+namespace ActivePowerPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePower
+} // namespace ActivePowerPhaseC
 
-namespace ActivePowerMin {
+namespace ActivePowerMinPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerMin
+} // namespace ActivePowerMinPhaseC
 
-namespace ActivePowerMax {
+namespace ActivePowerMaxPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerMax
+} // namespace ActivePowerMaxPhaseC
 
-namespace ReactivePower {
+namespace ReactivePowerPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ReactivePower
+} // namespace ReactivePowerPhaseC
 
-namespace ApparentPower {
+namespace ApparentPowerPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ApparentPower
+} // namespace ApparentPowerPhaseC
 
-namespace PowerFactor {
+namespace PowerFactorPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
 EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace PowerFactor
+} // namespace PowerFactorPhaseC
 
-namespace AverageRmsVoltageMeasurementPeriod {
+namespace AverageRmsVoltageMeasurementPeriodPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsVoltageMeasurementPeriod
+} // namespace AverageRmsVoltageMeasurementPeriodPhaseC
 
-namespace AverageRmsUnderVoltageCounter {
+namespace AverageRmsOverVoltageCounterPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsUnderVoltageCounter
+} // namespace AverageRmsOverVoltageCounterPhaseC
 
-namespace RmsExtremeOverVoltagePeriod {
+namespace AverageRmsUnderVoltageCounterPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsExtremeOverVoltagePeriod
+} // namespace AverageRmsUnderVoltageCounterPhaseC
 
-namespace RmsExtremeUnderVoltagePeriod {
+namespace RmsExtremeOverVoltagePeriodPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsExtremeUnderVoltagePeriod
+} // namespace RmsExtremeOverVoltagePeriodPhaseC
 
-namespace RmsVoltageSagPeriod {
+namespace RmsExtremeUnderVoltagePeriodPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageSagPeriod
+} // namespace RmsExtremeUnderVoltagePeriodPhaseC
 
-namespace RmsVoltageSwellPeriod {
+namespace RmsVoltageSagPeriodPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageSwellPeriod
+} // namespace RmsVoltageSagPeriodPhaseC
 
-namespace AcVoltageMultiplier {
+namespace RmsVoltageSwellPeriodPhaseC {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcVoltageMultiplier
+} // namespace RmsVoltageSwellPeriodPhaseC
 
-namespace AcVoltageDivisor {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcVoltageDivisor
+namespace FeatureMap {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace FeatureMap
 
-namespace AcCurrentMultiplier {
+namespace ClusterRevision {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcCurrentMultiplier
+} // namespace ClusterRevision
 
-namespace AcCurrentDivisor {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcCurrentDivisor
+} // namespace Attributes
+} // namespace ElectricalMeasurement
 
-namespace AcPowerMultiplier {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcPowerMultiplier
+namespace TestCluster {
+namespace Attributes {
 
-namespace AcPowerDivisor {
+namespace Boolean {
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+} // namespace Boolean
+
+namespace Bitmap8 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> * value); // Bitmap8MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
+} // namespace Bitmap8
+
+namespace Bitmap16 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> * value); // Bitmap16MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
+} // namespace Bitmap16
+
+namespace Bitmap32 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> * value); // Bitmap32MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
+} // namespace Bitmap32
+
+namespace Bitmap64 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> * value); // Bitmap64MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
+} // namespace Bitmap64
+
+namespace Int8u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace Int8u
+
+namespace Int16u {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcPowerDivisor
+} // namespace Int16u
 
-namespace OverloadAlarmsMask {
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
-EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
-} // namespace OverloadAlarmsMask
+namespace Int24u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int24u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace Int24u
+
+namespace Int32u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace Int32u
+
+namespace Int40u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int40u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+} // namespace Int40u
+
+namespace Int48u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int48u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+} // namespace Int48u
+
+namespace Int56u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int56u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+} // namespace Int56u
+
+namespace Int64u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // int64u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+} // namespace Int64u
+
+namespace Int8s {
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+} // namespace Int8s
 
-namespace VoltageOverload {
+namespace Int16s {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace VoltageOverload
+} // namespace Int16s
 
-namespace CurrentOverload {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace CurrentOverload
+namespace Int24s {
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int24s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+} // namespace Int24s
 
-namespace AcOverloadAlarmsMask {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AcOverloadAlarmsMask
+namespace Int32s {
+EmberAfStatus Get(chip::EndpointId endpoint, int32_t * value); // int32s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+} // namespace Int32s
 
-namespace AcVoltageOverload {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace AcVoltageOverload
+namespace Int40s {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int40s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace Int40s
 
-namespace AcCurrentOverload {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace AcCurrentOverload
+namespace Int48s {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int48s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace Int48s
 
-namespace AcActivePowerOverload {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace AcActivePowerOverload
+namespace Int56s {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int56s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace Int56s
 
-namespace AcReactivePowerOverload {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace AcReactivePowerOverload
+namespace Int64s {
+EmberAfStatus Get(chip::EndpointId endpoint, int64_t * value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+} // namespace Int64s
 
-namespace AverageRmsOverVoltage {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace AverageRmsOverVoltage
+namespace Enum8 {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace Enum8
 
-namespace AverageRmsUnderVoltage {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace AverageRmsUnderVoltage
+namespace Enum16 {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // enum16
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace Enum16
 
-namespace RmsExtremeOverVoltage {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace RmsExtremeOverVoltage
+namespace FloatSingle {
+EmberAfStatus Get(chip::EndpointId endpoint, float * value); // single
+EmberAfStatus Set(chip::EndpointId endpoint, float value);
+} // namespace FloatSingle
 
-namespace RmsExtremeUnderVoltage {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace RmsExtremeUnderVoltage
+namespace FloatDouble {
+EmberAfStatus Get(chip::EndpointId endpoint, double * value); // double
+EmberAfStatus Set(chip::EndpointId endpoint, double value);
+} // namespace FloatDouble
 
-namespace RmsVoltageSag {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace RmsVoltageSag
+namespace OctetString {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace OctetString
 
-namespace RmsVoltageSwell {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace RmsVoltageSwell
+namespace LongOctetString {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableByteSpan value); // long_octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+} // namespace LongOctetString
 
-namespace LineCurrentPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace LineCurrentPhaseB
+namespace CharString {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+} // namespace CharString
 
-namespace ActiveCurrentPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActiveCurrentPhaseB
+namespace LongCharString {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // long_char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+} // namespace LongCharString
 
-namespace ReactiveCurrentPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ReactiveCurrentPhaseB
+namespace EpochUs {
+EmberAfStatus Get(chip::EndpointId endpoint, uint64_t * value); // epoch_us
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+} // namespace EpochUs
 
-namespace RmsVoltagePhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltagePhaseB
+namespace EpochS {
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+} // namespace EpochS
 
-namespace RmsVoltageMinPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageMinPhaseB
+namespace VendorId {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value); // vendor_id
+EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value);
+} // namespace VendorId
 
-namespace RmsVoltageMaxPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageMaxPhaseB
+namespace EnumAttr {
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum * value); // SimpleEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value);
+} // namespace EnumAttr
 
-namespace RmsCurrentPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentPhaseB
+namespace RangeRestrictedInt8u {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace RangeRestrictedInt8u
 
-namespace RmsCurrentMinPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentMinPhaseB
+namespace RangeRestrictedInt8s {
+EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+} // namespace RangeRestrictedInt8s
 
-namespace RmsCurrentMaxPhaseB {
+namespace RangeRestrictedInt16u {
 EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentMaxPhaseB
+} // namespace RangeRestrictedInt16u
 
-namespace ActivePowerPhaseB {
+namespace RangeRestrictedInt16s {
 EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerPhaseB
+} // namespace RangeRestrictedInt16s
 
-namespace ActivePowerMinPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerMinPhaseB
+namespace TimedWriteBoolean {
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+} // namespace TimedWriteBoolean
 
-namespace ActivePowerMaxPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerMaxPhaseB
+namespace GeneralErrorBoolean {
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+} // namespace GeneralErrorBoolean
 
-namespace ReactivePowerPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ReactivePowerPhaseB
+namespace ClusterErrorBoolean {
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+} // namespace ClusterErrorBoolean
 
-namespace ApparentPowerPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ApparentPowerPhaseB
+namespace Unsupported {
+EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+} // namespace Unsupported
 
-namespace PowerFactorPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace PowerFactorPhaseB
+namespace NullableBoolean {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<bool> & value); // boolean
+EmberAfStatus Set(chip::EndpointId endpoint, bool value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value);
+} // namespace NullableBoolean
 
-namespace AverageRmsVoltageMeasurementPeriodPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsVoltageMeasurementPeriodPhaseB
+namespace NullableBitmap8 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value); // Bitmap8MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
+} // namespace NullableBitmap8
 
-namespace AverageRmsOverVoltageCounterPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsOverVoltageCounterPhaseB
+namespace NullableBitmap16 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value); // Bitmap16MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
+} // namespace NullableBitmap16
 
-namespace AverageRmsUnderVoltageCounterPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsUnderVoltageCounterPhaseB
+namespace NullableBitmap32 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value); // Bitmap32MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
+} // namespace NullableBitmap32
 
-namespace RmsExtremeOverVoltagePeriodPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsExtremeOverVoltagePeriodPhaseB
+namespace NullableBitmap64 {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value); // Bitmap64MaskMap
+EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
+} // namespace NullableBitmap64
+
+namespace NullableInt8u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+} // namespace NullableInt8u
 
-namespace RmsExtremeUnderVoltagePeriodPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+namespace NullableInt16u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsExtremeUnderVoltagePeriodPhaseB
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+} // namespace NullableInt16u
 
-namespace RmsVoltageSagPeriodPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageSagPeriodPhaseB
+namespace NullableInt24u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace NullableInt24u
 
-namespace RmsVoltageSwellPeriodPhaseB {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageSwellPeriodPhaseB
+namespace NullableInt32u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+} // namespace NullableInt32u
 
-namespace LineCurrentPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace LineCurrentPhaseC
+namespace NullableInt40u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int40u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+} // namespace NullableInt40u
 
-namespace ActiveCurrentPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActiveCurrentPhaseC
+namespace NullableInt48u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int48u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+} // namespace NullableInt48u
 
-namespace ReactiveCurrentPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ReactiveCurrentPhaseC
+namespace NullableInt56u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int56u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+} // namespace NullableInt56u
 
-namespace RmsVoltagePhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltagePhaseC
+namespace NullableInt64u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
+EmberAfStatus Set(chip::EndpointId endpoint, uint64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+} // namespace NullableInt64u
 
-namespace RmsVoltageMinPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageMinPhaseC
+namespace NullableInt8s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value);
+} // namespace NullableInt8s
 
-namespace RmsVoltageMaxPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageMaxPhaseC
+namespace NullableInt16s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+} // namespace NullableInt16s
 
-namespace RmsCurrentPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentPhaseC
+namespace NullableInt24s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int24s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
+} // namespace NullableInt24s
 
-namespace RmsCurrentMinPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentMinPhaseC
+namespace NullableInt32s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int32s
+EmberAfStatus Set(chip::EndpointId endpoint, int32_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
+} // namespace NullableInt32s
 
-namespace RmsCurrentMaxPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsCurrentMaxPhaseC
+namespace NullableInt40s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int40s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+} // namespace NullableInt40s
 
-namespace ActivePowerPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerPhaseC
+namespace NullableInt48s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int48s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+} // namespace NullableInt48s
 
-namespace ActivePowerMinPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerMinPhaseC
+namespace NullableInt56s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int56s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+} // namespace NullableInt56s
 
-namespace ActivePowerMaxPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ActivePowerMaxPhaseC
+namespace NullableInt64s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int64s
+EmberAfStatus Set(chip::EndpointId endpoint, int64_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+} // namespace NullableInt64s
 
-namespace ReactivePowerPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
-} // namespace ReactivePowerPhaseC
+namespace NullableEnum8 {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // enum8
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+} // namespace NullableEnum8
 
-namespace ApparentPowerPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+namespace NullableEnum16 {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // enum16
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace ApparentPowerPhaseC
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+} // namespace NullableEnum16
 
-namespace PowerFactorPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s
-EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
-} // namespace PowerFactorPhaseC
+namespace NullableFloatSingle {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<float> & value); // single
+EmberAfStatus Set(chip::EndpointId endpoint, float value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value);
+} // namespace NullableFloatSingle
 
-namespace AverageRmsVoltageMeasurementPeriodPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsVoltageMeasurementPeriodPhaseC
+namespace NullableFloatDouble {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<double> & value); // double
+EmberAfStatus Set(chip::EndpointId endpoint, double value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value);
+} // namespace NullableFloatDouble
 
-namespace AverageRmsOverVoltageCounterPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsOverVoltageCounterPhaseC
+namespace NullableOctetString {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::ByteSpan value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+} // namespace NullableOctetString
 
-namespace AverageRmsUnderVoltageCounterPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace AverageRmsUnderVoltageCounterPhaseC
+namespace NullableCharString {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value); // char_string
+EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
+} // namespace NullableCharString
 
-namespace RmsExtremeOverVoltagePeriodPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsExtremeOverVoltagePeriodPhaseC
+namespace NullableEnumAttr {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value); // SimpleEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::TestCluster::SimpleEnum value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value);
+} // namespace NullableEnumAttr
 
-namespace RmsExtremeUnderVoltagePeriodPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsExtremeUnderVoltagePeriodPhaseC
+namespace NullableRangeRestrictedInt8u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+} // namespace NullableRangeRestrictedInt8u
 
-namespace RmsVoltageSagPeriodPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageSagPeriodPhaseC
+namespace NullableRangeRestrictedInt8s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value); // int8s
+EmberAfStatus Set(chip::EndpointId endpoint, int8_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value);
+} // namespace NullableRangeRestrictedInt8s
 
-namespace RmsVoltageSwellPeriodPhaseC {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+namespace NullableRangeRestrictedInt16u {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
-} // namespace RmsVoltageSwellPeriodPhaseC
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+} // namespace NullableRangeRestrictedInt16u
+
+namespace NullableRangeRestrictedInt16s {
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
+EmberAfStatus SetNull(chip::EndpointId endpoint);
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+} // namespace NullableRangeRestrictedInt16s
 
 namespace FeatureMap {
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
@@ -7103,7 +6974,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace ElectricalMeasurement
+} // namespace TestCluster
 
 } // namespace Clusters
 } // namespace app
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index a1a264bec3df9b..393a046cb1809a 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -805,30 +805,6 @@ void emberAfChloroformConcentrationMeasurementClusterInitCallback(chip::Endpoint
  */
 void emberAfSodiumConcentrationMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS Zone Cluster Init
- *
- * Cluster Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfIasZoneClusterInitCallback(chip::EndpointId endpoint);
-
-/** @brief IAS ACE Cluster Init
- *
- * Cluster Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfIasAceClusterInitCallback(chip::EndpointId endpoint);
-
-/** @brief IAS WD Cluster Init
- *
- * Cluster Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfIasWdClusterInitCallback(chip::EndpointId endpoint);
-
 /** @brief Wake on LAN Cluster Init
  *
  * Cluster Init
@@ -925,14 +901,6 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfAccountLoginClusterInitCallback(chip::EndpointId endpoint);
 
-/** @brief Test Cluster Cluster Init
- *
- * Cluster Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfTestClusterClusterInitCallback(chip::EndpointId endpoint);
-
 /** @brief Messaging Cluster Init
  *
  * Cluster Init
@@ -981,6 +949,14 @@ void emberAfApplianceStatisticsClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfElectricalMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
+/** @brief Test Cluster Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTestClusterClusterInitCallback(chip::EndpointId endpoint);
+
 // Cluster Server/Client Init Functions
 
 //
@@ -10168,34 +10144,34 @@ void emberAfSodiumConcentrationMeasurementClusterServerTickCallback(chip::Endpoi
 void emberAfSodiumConcentrationMeasurementClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// IAS Zone Cluster
+// Wake on LAN Cluster
 //
 
-/** @brief IAS Zone Cluster Server Init
+/** @brief Wake on LAN Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfIasZoneClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfWakeOnLanClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS Zone Cluster Client Init
+/** @brief Wake on LAN Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfIasZoneClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfWakeOnLanClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS Zone Cluster Server Attribute Changed
+/** @brief Wake on LAN Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterIasZoneClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterWakeOnLanClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief IAS Zone Cluster Server Message Sent
+/** @brief Wake on LAN Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -10205,10 +10181,10 @@ void MatterIasZoneClusterServerAttributeChangedCallback(const chip::app::Concret
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasZoneClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                    uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfWakeOnLanClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                      uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief IAS Zone Cluster Client Message Sent
+/** @brief Wake on LAN Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -10218,10 +10194,10 @@ void emberAfIasZoneClusterServerMessageSentCallback(const chip::MessageSendDesti
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasZoneClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                    uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfWakeOnLanClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                      uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief IAS Zone Cluster Server Pre Attribute Changed
+/** @brief Wake on LAN Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -10231,10 +10207,10 @@ void emberAfIasZoneClusterClientMessageSentCallback(const chip::MessageSendDesti
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterIasZoneClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterWakeOnLanClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                        EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief IAS Zone Cluster Client Pre Attribute Changed
+/** @brief Wake on LAN Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -10244,54 +10220,54 @@ MatterIasZoneClusterServerPreAttributeChangedCallback(const chip::app::ConcreteA
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterIasZoneClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterWakeOnLanClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                        EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief IAS Zone Cluster Server Tick
+/** @brief Wake on LAN Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfIasZoneClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfWakeOnLanClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief IAS Zone Cluster Client Tick
+/** @brief Wake on LAN Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfIasZoneClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfWakeOnLanClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// IAS ACE Cluster
+// Channel Cluster
 //
 
-/** @brief IAS ACE Cluster Server Init
+/** @brief Channel Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfIasAceClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfChannelClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS ACE Cluster Client Init
+/** @brief Channel Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfIasAceClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfChannelClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS ACE Cluster Server Attribute Changed
+/** @brief Channel Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterIasAceClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterChannelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief IAS ACE Cluster Server Message Sent
+/** @brief Channel Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -10301,10 +10277,10 @@ void MatterIasAceClusterServerAttributeChangedCallback(const chip::app::Concrete
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasAceClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                   uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfChannelClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                    uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief IAS ACE Cluster Client Message Sent
+/** @brief Channel Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -10314,10 +10290,10 @@ void emberAfIasAceClusterServerMessageSentCallback(const chip::MessageSendDestin
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasAceClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                   uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfChannelClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                    uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief IAS ACE Cluster Server Pre Attribute Changed
+/** @brief Channel Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -10327,10 +10303,10 @@ void emberAfIasAceClusterClientMessageSentCallback(const chip::MessageSendDestin
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterIasAceClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                     EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterChannelClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief IAS ACE Cluster Client Pre Attribute Changed
+/** @brief Channel Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -10340,54 +10316,54 @@ MatterIasAceClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAt
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterIasAceClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                     EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterChannelClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief IAS ACE Cluster Server Tick
+/** @brief Channel Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfIasAceClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfChannelClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief IAS ACE Cluster Client Tick
+/** @brief Channel Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfIasAceClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfChannelClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// IAS WD Cluster
+// Target Navigator Cluster
 //
 
-/** @brief IAS WD Cluster Server Init
+/** @brief Target Navigator Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfIasWdClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfTargetNavigatorClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS WD Cluster Client Init
+/** @brief Target Navigator Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfIasWdClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfTargetNavigatorClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief IAS WD Cluster Server Attribute Changed
+/** @brief Target Navigator Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterIasWdClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterTargetNavigatorClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief IAS WD Cluster Server Message Sent
+/** @brief Target Navigator Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -10397,10 +10373,11 @@ void MatterIasWdClusterServerAttributeChangedCallback(const chip::app::ConcreteA
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasWdClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                  uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfTargetNavigatorClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
+                                                            EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+                                                            EmberStatus status);
 
-/** @brief IAS WD Cluster Client Message Sent
+/** @brief Target Navigator Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -10410,10 +10387,11 @@ void emberAfIasWdClusterServerMessageSentCallback(const chip::MessageSendDestina
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasWdClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                  uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfTargetNavigatorClusterClientMessageSentCallback(const chip::MessageSendDestination & destination,
+                                                            EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+                                                            EmberStatus status);
 
-/** @brief IAS WD Cluster Server Pre Attribute Changed
+/** @brief Target Navigator Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -10423,10 +10401,10 @@ void emberAfIasWdClusterClientMessageSentCallback(const chip::MessageSendDestina
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterIasWdClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                    EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterTargetNavigatorClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief IAS WD Cluster Client Pre Attribute Changed
+/** @brief Target Navigator Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -10436,54 +10414,54 @@ MatterIasWdClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAtt
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterIasWdClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                    EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterTargetNavigatorClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief IAS WD Cluster Server Tick
+/** @brief Target Navigator Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfIasWdClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfTargetNavigatorClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief IAS WD Cluster Client Tick
+/** @brief Target Navigator Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfIasWdClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfTargetNavigatorClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Wake on LAN Cluster
+// Media Playback Cluster
 //
 
-/** @brief Wake on LAN Cluster Server Init
+/** @brief Media Playback Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfWakeOnLanClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfMediaPlaybackClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Wake on LAN Cluster Client Init
+/** @brief Media Playback Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfWakeOnLanClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfMediaPlaybackClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Wake on LAN Cluster Server Attribute Changed
+/** @brief Media Playback Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterWakeOnLanClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterMediaPlaybackClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Wake on LAN Cluster Server Message Sent
+/** @brief Media Playback Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -10493,10 +10471,11 @@ void MatterWakeOnLanClusterServerAttributeChangedCallback(const chip::app::Concr
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfWakeOnLanClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                      uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfMediaPlaybackClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
+                                                          EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+                                                          EmberStatus status);
 
-/** @brief Wake on LAN Cluster Client Message Sent
+/** @brief Media Playback Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -10506,10 +10485,11 @@ void emberAfWakeOnLanClusterServerMessageSentCallback(const chip::MessageSendDes
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfWakeOnLanClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                      uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfMediaPlaybackClusterClientMessageSentCallback(const chip::MessageSendDestination & destination,
+                                                          EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+                                                          EmberStatus status);
 
-/** @brief Wake on LAN Cluster Server Pre Attribute Changed
+/** @brief Media Playback Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -10519,10 +10499,10 @@ void emberAfWakeOnLanClusterClientMessageSentCallback(const chip::MessageSendDes
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterWakeOnLanClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                        EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterMediaPlaybackClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                            EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Wake on LAN Cluster Client Pre Attribute Changed
+/** @brief Media Playback Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -10532,54 +10512,54 @@ MatterWakeOnLanClusterServerPreAttributeChangedCallback(const chip::app::Concret
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterWakeOnLanClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                        EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterMediaPlaybackClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                            EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Wake on LAN Cluster Server Tick
+/** @brief Media Playback Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfWakeOnLanClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfMediaPlaybackClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Wake on LAN Cluster Client Tick
+/** @brief Media Playback Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfWakeOnLanClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfMediaPlaybackClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Channel Cluster
+// Media Input Cluster
 //
 
-/** @brief Channel Cluster Server Init
+/** @brief Media Input Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfChannelClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfMediaInputClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Channel Cluster Client Init
+/** @brief Media Input Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfChannelClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfMediaInputClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Channel Cluster Server Attribute Changed
+/** @brief Media Input Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterChannelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterMediaInputClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Channel Cluster Server Message Sent
+/** @brief Media Input Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -10589,10 +10569,10 @@ void MatterChannelClusterServerAttributeChangedCallback(const chip::app::Concret
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfChannelClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                    uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfMediaInputClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                       uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief Channel Cluster Client Message Sent
+/** @brief Media Input Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -10602,10 +10582,10 @@ void emberAfChannelClusterServerMessageSentCallback(const chip::MessageSendDesti
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfChannelClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                    uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfMediaInputClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                       uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief Channel Cluster Server Pre Attribute Changed
+/** @brief Media Input Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -10615,10 +10595,10 @@ void emberAfChannelClusterClientMessageSentCallback(const chip::MessageSendDesti
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterChannelClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterMediaInputClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Channel Cluster Client Pre Attribute Changed
+/** @brief Media Input Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -10628,54 +10608,54 @@ MatterChannelClusterServerPreAttributeChangedCallback(const chip::app::ConcreteA
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterChannelClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterMediaInputClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Channel Cluster Server Tick
+/** @brief Media Input Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfChannelClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfMediaInputClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Channel Cluster Client Tick
+/** @brief Media Input Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfChannelClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfMediaInputClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// Target Navigator Cluster
+// Low Power Cluster
 //
 
-/** @brief Target Navigator Cluster Server Init
+/** @brief Low Power Cluster Server Init
  *
  * Server Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfTargetNavigatorClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfLowPowerClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief Target Navigator Cluster Client Init
+/** @brief Low Power Cluster Client Init
  *
  * Client Init
  *
  * @param endpoint    Endpoint that is being initialized
  */
-void emberAfTargetNavigatorClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfLowPowerClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief Target Navigator Cluster Server Attribute Changed
+/** @brief Low Power Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
  * @param attributePath Concrete attribute path that changed
  */
-void MatterTargetNavigatorClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterLowPowerClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief Target Navigator Cluster Server Message Sent
+/** @brief Low Power Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -10685,11 +10665,10 @@ void MatterTargetNavigatorClusterServerAttributeChangedCallback(const chip::app:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTargetNavigatorClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
-                                                            EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                            EmberStatus status);
+void emberAfLowPowerClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                     uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief Target Navigator Cluster Client Message Sent
+/** @brief Low Power Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -10699,11 +10678,10 @@ void emberAfTargetNavigatorClusterServerMessageSentCallback(const chip::MessageS
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTargetNavigatorClusterClientMessageSentCallback(const chip::MessageSendDestination & destination,
-                                                            EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                            EmberStatus status);
+void emberAfLowPowerClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                     uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief Target Navigator Cluster Server Pre Attribute Changed
+/** @brief Low Power Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -10713,10 +10691,10 @@ void emberAfTargetNavigatorClusterClientMessageSentCallback(const chip::MessageS
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterTargetNavigatorClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterLowPowerClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Target Navigator Cluster Client Pre Attribute Changed
+/** @brief Low Power Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -10726,306 +10704,16 @@ MatterTargetNavigatorClusterServerPreAttributeChangedCallback(const chip::app::C
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterTargetNavigatorClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                              EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterLowPowerClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Target Navigator Cluster Server Tick
+/** @brief Low Power Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfTargetNavigatorClusterServerTickCallback(chip::EndpointId endpoint);
-
-/** @brief Target Navigator Cluster Client Tick
- *
- * Client Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfTargetNavigatorClusterClientTickCallback(chip::EndpointId endpoint);
-
-//
-// Media Playback Cluster
-//
-
-/** @brief Media Playback Cluster Server Init
- *
- * Server Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfMediaPlaybackClusterServerInitCallback(chip::EndpointId endpoint);
-
-/** @brief Media Playback Cluster Client Init
- *
- * Client Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfMediaPlaybackClusterClientInitCallback(chip::EndpointId endpoint);
-
-/** @brief Media Playback Cluster Server Attribute Changed
- *
- * Server Attribute Changed
- *
- * @param attributePath Concrete attribute path that changed
- */
-void MatterMediaPlaybackClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
-
-/** @brief Media Playback Cluster Server Message Sent
- *
- * Server Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfMediaPlaybackClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
-                                                          EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                          EmberStatus status);
-
-/** @brief Media Playback Cluster Client Message Sent
- *
- * Client Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfMediaPlaybackClusterClientMessageSentCallback(const chip::MessageSendDestination & destination,
-                                                          EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                          EmberStatus status);
-
-/** @brief Media Playback Cluster Server Pre Attribute Changed
- *
- * Server Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterMediaPlaybackClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                            EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Media Playback Cluster Client Pre Attribute Changed
- *
- * Client Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterMediaPlaybackClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                            EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Media Playback Cluster Server Tick
- *
- * Server Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfMediaPlaybackClusterServerTickCallback(chip::EndpointId endpoint);
-
-/** @brief Media Playback Cluster Client Tick
- *
- * Client Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfMediaPlaybackClusterClientTickCallback(chip::EndpointId endpoint);
-
-//
-// Media Input Cluster
-//
-
-/** @brief Media Input Cluster Server Init
- *
- * Server Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfMediaInputClusterServerInitCallback(chip::EndpointId endpoint);
-
-/** @brief Media Input Cluster Client Init
- *
- * Client Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfMediaInputClusterClientInitCallback(chip::EndpointId endpoint);
-
-/** @brief Media Input Cluster Server Attribute Changed
- *
- * Server Attribute Changed
- *
- * @param attributePath Concrete attribute path that changed
- */
-void MatterMediaInputClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
-
-/** @brief Media Input Cluster Server Message Sent
- *
- * Server Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfMediaInputClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                       uint16_t msgLen, uint8_t * message, EmberStatus status);
-
-/** @brief Media Input Cluster Client Message Sent
- *
- * Client Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfMediaInputClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                       uint16_t msgLen, uint8_t * message, EmberStatus status);
-
-/** @brief Media Input Cluster Server Pre Attribute Changed
- *
- * Server Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterMediaInputClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Media Input Cluster Client Pre Attribute Changed
- *
- * Client Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterMediaInputClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Media Input Cluster Server Tick
- *
- * Server Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfMediaInputClusterServerTickCallback(chip::EndpointId endpoint);
-
-/** @brief Media Input Cluster Client Tick
- *
- * Client Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfMediaInputClusterClientTickCallback(chip::EndpointId endpoint);
-
-//
-// Low Power Cluster
-//
-
-/** @brief Low Power Cluster Server Init
- *
- * Server Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfLowPowerClusterServerInitCallback(chip::EndpointId endpoint);
-
-/** @brief Low Power Cluster Client Init
- *
- * Client Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfLowPowerClusterClientInitCallback(chip::EndpointId endpoint);
-
-/** @brief Low Power Cluster Server Attribute Changed
- *
- * Server Attribute Changed
- *
- * @param attributePath Concrete attribute path that changed
- */
-void MatterLowPowerClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
-
-/** @brief Low Power Cluster Server Message Sent
- *
- * Server Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfLowPowerClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                     uint16_t msgLen, uint8_t * message, EmberStatus status);
-
-/** @brief Low Power Cluster Client Message Sent
- *
- * Client Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfLowPowerClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                     uint16_t msgLen, uint8_t * message, EmberStatus status);
-
-/** @brief Low Power Cluster Server Pre Attribute Changed
- *
- * Server Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterLowPowerClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Low Power Cluster Client Pre Attribute Changed
- *
- * Client Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterLowPowerClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Low Power Cluster Server Tick
- *
- * Server Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfLowPowerClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfLowPowerClusterServerTickCallback(chip::EndpointId endpoint);
 
 /** @brief Low Power Cluster Client Tick
  *
@@ -11560,103 +11248,7 @@ void MatterAccountLoginClusterServerAttributeChangedCallback(const chip::app::Co
 void emberAfAccountLoginClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
                                                          uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief Account Login Cluster Client Message Sent
- *
- * Client Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfAccountLoginClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                         uint16_t msgLen, uint8_t * message, EmberStatus status);
-
-/** @brief Account Login Cluster Server Pre Attribute Changed
- *
- * Server Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterAccountLoginClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Account Login Cluster Client Pre Attribute Changed
- *
- * Client Pre Attribute Changed
- *
- * @param attributePath Concrete attribute path to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-chip::Protocols::InteractionModel::Status
-MatterAccountLoginClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-
-/** @brief Account Login Cluster Server Tick
- *
- * Server Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfAccountLoginClusterServerTickCallback(chip::EndpointId endpoint);
-
-/** @brief Account Login Cluster Client Tick
- *
- * Client Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfAccountLoginClusterClientTickCallback(chip::EndpointId endpoint);
-
-//
-// Test Cluster Cluster
-//
-
-/** @brief Test Cluster Cluster Server Init
- *
- * Server Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfTestClusterClusterServerInitCallback(chip::EndpointId endpoint);
-
-/** @brief Test Cluster Cluster Client Init
- *
- * Client Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfTestClusterClusterClientInitCallback(chip::EndpointId endpoint);
-
-/** @brief Test Cluster Cluster Server Attribute Changed
- *
- * Server Attribute Changed
- *
- * @param attributePath Concrete attribute path that changed
- */
-void MatterTestClusterClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
-
-/** @brief Test Cluster Cluster Server Message Sent
- *
- * Server Message Sent
- *
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfTestClusterClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                        uint16_t msgLen, uint8_t * message, EmberStatus status);
-
-/** @brief Test Cluster Cluster Client Message Sent
+/** @brief Account Login Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -11666,10 +11258,10 @@ void emberAfTestClusterClusterServerMessageSentCallback(const chip::MessageSendD
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTestClusterClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
-                                                        uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfAccountLoginClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                         uint16_t msgLen, uint8_t * message, EmberStatus status);
 
-/** @brief Test Cluster Cluster Server Pre Attribute Changed
+/** @brief Account Login Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -11679,10 +11271,10 @@ void emberAfTestClusterClusterClientMessageSentCallback(const chip::MessageSendD
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterTestClusterClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                          EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterAccountLoginClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Test Cluster Cluster Client Pre Attribute Changed
+/** @brief Account Login Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -11692,24 +11284,24 @@ MatterTestClusterClusterServerPreAttributeChangedCallback(const chip::app::Concr
  * @param value         Attribute value
  */
 chip::Protocols::InteractionModel::Status
-MatterTestClusterClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                          EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterAccountLoginClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                           EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief Test Cluster Cluster Server Tick
+/** @brief Account Login Cluster Server Tick
  *
  * Server Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfTestClusterClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfAccountLoginClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief Test Cluster Cluster Client Tick
+/** @brief Account Login Cluster Client Tick
  *
  * Client Tick
  *
  * @param endpoint  Endpoint that is being served
  */
-void emberAfTestClusterClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfAccountLoginClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
 // Messaging Cluster
@@ -12287,6 +11879,102 @@ void emberAfElectricalMeasurementClusterServerTickCallback(chip::EndpointId endp
  */
 void emberAfElectricalMeasurementClusterClientTickCallback(chip::EndpointId endpoint);
 
+//
+// Test Cluster Cluster
+//
+
+/** @brief Test Cluster Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTestClusterClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Test Cluster Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTestClusterClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Test Cluster Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterTestClusterClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Test Cluster Cluster Server Message Sent
+ *
+ * Server Message Sent
+ *
+ * @param destination        The destination to which the message was sent
+ * @param apsFrame           The APS frame for the message
+ * @param msgLen             The length of the message
+ * @param message            The message that was sent
+ * @param status             The status of the sent message
+ */
+void emberAfTestClusterClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                        uint16_t msgLen, uint8_t * message, EmberStatus status);
+
+/** @brief Test Cluster Cluster Client Message Sent
+ *
+ * Client Message Sent
+ *
+ * @param destination        The destination to which the message was sent
+ * @param apsFrame           The APS frame for the message
+ * @param msgLen             The length of the message
+ * @param message            The message that was sent
+ * @param status             The status of the sent message
+ */
+void emberAfTestClusterClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+                                                        uint16_t msgLen, uint8_t * message, EmberStatus status);
+
+/** @brief Test Cluster Cluster Server Pre Attribute Changed
+ *
+ * Server Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterTestClusterClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                          EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Test Cluster Cluster Client Pre Attribute Changed
+ *
+ * Client Pre Attribute Changed
+ *
+ * @param attributePath Concrete attribute path to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+chip::Protocols::InteractionModel::Status
+MatterTestClusterClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                          EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Test Cluster Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfTestClusterClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Test Cluster Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfTestClusterClusterClientTickCallback(chip::EndpointId endpoint);
+
 // Cluster Commands Callback
 
 /**
@@ -12548,6 +12236,12 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(
 bool emberAfLevelControlClusterStopWithOnOffCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::LevelControl::Commands::StopWithOnOff::DecodableType & commandData);
+/**
+ * @brief Level Control Cluster MoveToClosestFrequency Command callback (from client)
+ */
+bool emberAfLevelControlClusterMoveToClosestFrequencyCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::LevelControl::Commands::MoveToClosestFrequency::DecodableType & commandData);
 /**
  * @brief Alarms Cluster ResetAlarm Command callback (from client)
  */
@@ -13002,6 +12696,12 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(
 bool emberAfDiagnosticLogsClusterRetrieveLogsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
                                                               uint8_t status, chip::ByteSpan content, uint32_t timeStamp,
                                                               uint32_t timeSinceBoot);
+/**
+ * @brief General Diagnostics Cluster TestEventTrigger Command callback (from client)
+ */
+bool emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::DecodableType & commandData);
 /**
  * @brief Software Diagnostics Cluster ResetWatermarks Command callback (from client)
  */
@@ -13115,12 +12815,6 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(
 bool emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::DecodableType & commandData);
-/**
- * @brief Operational Credentials Cluster RemoveTrustedRootCertificate Command callback (from client)
- */
-bool emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::DecodableType & commandData);
 /**
  * @brief Group Key Management Cluster KeySetWrite Command callback (from client)
  */
@@ -13181,64 +12875,6 @@ bool emberAfDoorLockClusterUnlockDoorCallback(
 bool emberAfDoorLockClusterUnlockWithTimeoutCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetLogRecord Command callback (from client)
- */
-bool emberAfDoorLockClusterGetLogRecordCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::GetLogRecord::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetLogRecordResponse Command callback (from server)
- */
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                        uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin);
-/**
- * @brief Door Lock Cluster SetPINCode Command callback (from client)
- */
-bool emberAfDoorLockClusterSetPINCodeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::SetPINCode::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetPINCode Command callback (from client)
- */
-bool emberAfDoorLockClusterGetPINCodeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::GetPINCode::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetPINCodeResponse Command callback (from server)
- */
-bool emberAfDoorLockClusterGetPINCodeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                      uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin);
-/**
- * @brief Door Lock Cluster ClearPINCode Command callback (from client)
- */
-bool emberAfDoorLockClusterClearPINCodeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::ClearPINCode::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster ClearAllPINCodes Command callback (from client)
- */
-bool emberAfDoorLockClusterClearAllPINCodesCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::ClearAllPINCodes::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster SetUserStatus Command callback (from client)
- */
-bool emberAfDoorLockClusterSetUserStatusCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::SetUserStatus::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetUserStatus Command callback (from client)
- */
-bool emberAfDoorLockClusterGetUserStatusCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::GetUserStatus::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetUserStatusResponse Command callback (from server)
- */
-bool emberAfDoorLockClusterGetUserStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                         uint16_t userId, uint8_t userStatus);
 /**
  * @brief Door Lock Cluster SetWeekDaySchedule Command callback (from client)
  */
@@ -13312,53 +12948,6 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::EndpointId e
 bool emberAfDoorLockClusterClearHolidayScheduleCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster SetUserType Command callback (from client)
- */
-bool emberAfDoorLockClusterSetUserTypeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::SetUserType::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetUserType Command callback (from client)
- */
-bool emberAfDoorLockClusterGetUserTypeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::GetUserType::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetUserTypeResponse Command callback (from server)
- */
-bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                       uint16_t userId, uint8_t userType);
-/**
- * @brief Door Lock Cluster SetRFIDCode Command callback (from client)
- */
-bool emberAfDoorLockClusterSetRFIDCodeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::SetRFIDCode::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetRFIDCode Command callback (from client)
- */
-bool emberAfDoorLockClusterGetRFIDCodeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::GetRFIDCode::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster GetRFIDCodeResponse Command callback (from server)
- */
-bool emberAfDoorLockClusterGetRFIDCodeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                       uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                       chip::ByteSpan rfidCode);
-/**
- * @brief Door Lock Cluster ClearRFIDCode Command callback (from client)
- */
-bool emberAfDoorLockClusterClearRFIDCodeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::ClearRFIDCode::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster ClearAllRFIDCodes Command callback (from client)
- */
-bool emberAfDoorLockClusterClearAllRFIDCodesCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::DoorLock::Commands::ClearAllRFIDCodes::DecodableType & commandData);
 /**
  * @brief Door Lock Cluster SetUser Command callback (from client)
  */
@@ -13386,20 +12975,6 @@ bool emberAfDoorLockClusterGetUserResponseCallback(chip::EndpointId endpoint, ch
 bool emberAfDoorLockClusterClearUserCallback(chip::app::CommandHandler * commandObj,
                                              const chip::app::ConcreteCommandPath & commandPath,
                                              const chip::app::Clusters::DoorLock::Commands::ClearUser::DecodableType & commandData);
-/**
- * @brief Door Lock Cluster OperatingEventNotification Command callback (from server)
- */
-bool emberAfDoorLockClusterOperatingEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                              uint8_t operationEventSource, uint8_t operationEventCode,
-                                                              uint16_t userId, chip::ByteSpan pin, uint32_t localTime,
-                                                              chip::CharSpan data);
-/**
- * @brief Door Lock Cluster ProgrammingEventNotification Command callback (from server)
- */
-bool emberAfDoorLockClusterProgrammingEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                                uint8_t programEventSource, uint8_t programEventCode,
-                                                                uint16_t userId, chip::ByteSpan pin, uint8_t userType,
-                                                                uint8_t userStatus, uint32_t localTime, chip::CharSpan data);
 /**
  * @brief Door Lock Cluster SetCredential Command callback (from client)
  */
@@ -13504,13 +13079,6 @@ bool emberAfThermostatClusterGetWeeklyScheduleResponseCallback(chip::EndpointId
 bool emberAfThermostatClusterSetWeeklyScheduleCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::DecodableType & commandData);
-/**
- * @brief Thermostat Cluster GetRelayStatusLogResponse Command callback (from server)
- */
-bool emberAfThermostatClusterGetRelayStatusLogResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                               uint16_t TimeOfDay, uint8_t RelayStatus, int16_t LocalTemperature,
-                                                               uint8_t HumidityInPercentage, int16_t Setpoint,
-                                                               uint16_t UnreadEntries);
 /**
  * @brief Thermostat Cluster GetWeeklySchedule Command callback (from client)
  */
@@ -13523,12 +13091,6 @@ bool emberAfThermostatClusterGetWeeklyScheduleCallback(
 bool emberAfThermostatClusterClearWeeklyScheduleCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::DecodableType & commandData);
-/**
- * @brief Thermostat Cluster GetRelayStatusLog Command callback (from client)
- */
-bool emberAfThermostatClusterGetRelayStatusLogCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLog::DecodableType & commandData);
 /**
  * @brief Color Control Cluster MoveToHue Command callback (from client)
  */
@@ -13641,168 +13203,8 @@ bool emberAfColorControlClusterMoveColorTemperatureCallback(
  * @brief Color Control Cluster StepColorTemperature Command callback (from client)
  */
 bool emberAfColorControlClusterStepColorTemperatureCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::ColorControl::Commands::StepColorTemperature::DecodableType & commandData);
-/**
- * @brief IAS Zone Cluster ZoneEnrollResponse Command callback (from client)
- */
-bool emberAfIasZoneClusterZoneEnrollResponseCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasZone::Commands::ZoneEnrollResponse::DecodableType & commandData);
-/**
- * @brief IAS Zone Cluster ZoneStatusChangeNotification Command callback (from server)
- */
-bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                               uint16_t zoneStatus, uint8_t extendedStatus, uint8_t zoneId,
-                                                               uint16_t delay);
-/**
- * @brief IAS Zone Cluster InitiateNormalOperationMode Command callback (from client)
- */
-bool emberAfIasZoneClusterInitiateNormalOperationModeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasZone::Commands::InitiateNormalOperationMode::DecodableType & commandData);
-/**
- * @brief IAS Zone Cluster ZoneEnrollRequest Command callback (from server)
- */
-bool emberAfIasZoneClusterZoneEnrollRequestCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                    uint16_t zoneType, uint16_t manufacturerCode);
-/**
- * @brief IAS Zone Cluster InitiateTestMode Command callback (from client)
- */
-bool emberAfIasZoneClusterInitiateTestModeCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasZone::Commands::InitiateTestMode::DecodableType & commandData);
-/**
- * @brief IAS Zone Cluster InitiateNormalOperationModeResponse Command callback (from server)
- */
-bool emberAfIasZoneClusterInitiateNormalOperationModeResponseCallback(chip::EndpointId endpoint,
-                                                                      chip::app::CommandSender * commandObj);
-/**
- * @brief IAS Zone Cluster InitiateTestModeResponse Command callback (from server)
- */
-bool emberAfIasZoneClusterInitiateTestModeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
-/**
- * @brief IAS ACE Cluster Arm Command callback (from client)
- */
-bool emberAfIasAceClusterArmCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                     const chip::app::Clusters::IasAce::Commands::Arm::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster ArmResponse Command callback (from server)
- */
-bool emberAfIasAceClusterArmResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                             uint8_t armNotification);
-/**
- * @brief IAS ACE Cluster Bypass Command callback (from client)
- */
-bool emberAfIasAceClusterBypassCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                        const chip::app::Clusters::IasAce::Commands::Bypass::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster GetZoneIdMapResponse Command callback (from server)
- */
-bool emberAfIasAceClusterGetZoneIdMapResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                      uint16_t section0, uint16_t section1, uint16_t section2, uint16_t section3,
-                                                      uint16_t section4, uint16_t section5, uint16_t section6, uint16_t section7,
-                                                      uint16_t section8, uint16_t section9, uint16_t section10, uint16_t section11,
-                                                      uint16_t section12, uint16_t section13, uint16_t section14,
-                                                      uint16_t section15);
-/**
- * @brief IAS ACE Cluster Emergency Command callback (from client)
- */
-bool emberAfIasAceClusterEmergencyCallback(chip::app::CommandHandler * commandObj,
-                                           const chip::app::ConcreteCommandPath & commandPath,
-                                           const chip::app::Clusters::IasAce::Commands::Emergency::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster GetZoneInformationResponse Command callback (from server)
- */
-bool emberAfIasAceClusterGetZoneInformationResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                            uint8_t zoneId, uint16_t zoneType, chip::NodeId ieeeAddress,
-                                                            chip::CharSpan zoneLabel);
-/**
- * @brief IAS ACE Cluster Fire Command callback (from client)
- */
-bool emberAfIasAceClusterFireCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                      const chip::app::Clusters::IasAce::Commands::Fire::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster ZoneStatusChanged Command callback (from server)
- */
-bool emberAfIasAceClusterZoneStatusChangedCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t zoneId,
-                                                   uint16_t zoneStatus, uint8_t audibleNotification, chip::CharSpan zoneLabel);
-/**
- * @brief IAS ACE Cluster Panic Command callback (from client)
- */
-bool emberAfIasAceClusterPanicCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                       const chip::app::Clusters::IasAce::Commands::Panic::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster PanelStatusChanged Command callback (from server)
- */
-bool emberAfIasAceClusterPanelStatusChangedCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                    uint8_t panelStatus, uint8_t secondsRemaining, uint8_t audibleNotification,
-                                                    uint8_t alarmStatus);
-/**
- * @brief IAS ACE Cluster GetZoneIdMap Command callback (from client)
- */
-bool emberAfIasAceClusterGetZoneIdMapCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasAce::Commands::GetZoneIdMap::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster GetPanelStatusResponse Command callback (from server)
- */
-bool emberAfIasAceClusterGetPanelStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                        uint8_t panelStatus, uint8_t secondsRemaining, uint8_t audibleNotification,
-                                                        uint8_t alarmStatus);
-/**
- * @brief IAS ACE Cluster GetZoneInformation Command callback (from client)
- */
-bool emberAfIasAceClusterGetZoneInformationCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasAce::Commands::GetZoneInformation::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster SetBypassedZoneList Command callback (from server)
- */
-bool emberAfIasAceClusterSetBypassedZoneListCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                     uint8_t numberOfZones,
-                                                     /* TYPE WARNING: array array defaults to */ uint8_t * zoneIds);
-/**
- * @brief IAS ACE Cluster GetPanelStatus Command callback (from client)
- */
-bool emberAfIasAceClusterGetPanelStatusCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasAce::Commands::GetPanelStatus::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster BypassResponse Command callback (from server)
- */
-bool emberAfIasAceClusterBypassResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                uint8_t numberOfZones,
-                                                /* TYPE WARNING: array array defaults to */ uint8_t * bypassResult);
-/**
- * @brief IAS ACE Cluster GetBypassedZoneList Command callback (from client)
- */
-bool emberAfIasAceClusterGetBypassedZoneListCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasAce::Commands::GetBypassedZoneList::DecodableType & commandData);
-/**
- * @brief IAS ACE Cluster GetZoneStatusResponse Command callback (from server)
- */
-bool emberAfIasAceClusterGetZoneStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                       bool zoneStatusComplete, uint8_t numberOfZones,
-                                                       /* TYPE WARNING: array array defaults to */ uint8_t * zoneStatusResult);
-/**
- * @brief IAS ACE Cluster GetZoneStatus Command callback (from client)
- */
-bool emberAfIasAceClusterGetZoneStatusCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::IasAce::Commands::GetZoneStatus::DecodableType & commandData);
-/**
- * @brief IAS WD Cluster StartWarning Command callback (from client)
- */
-bool emberAfIasWdClusterStartWarningCallback(chip::app::CommandHandler * commandObj,
-                                             const chip::app::ConcreteCommandPath & commandPath,
-                                             const chip::app::Clusters::IasWd::Commands::StartWarning::DecodableType & commandData);
-/**
- * @brief IAS WD Cluster Squawk Command callback (from client)
- */
-bool emberAfIasWdClusterSquawkCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                       const chip::app::Clusters::IasWd::Commands::Squawk::DecodableType & commandData);
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ColorControl::Commands::StepColorTemperature::DecodableType & commandData);
 /**
  * @brief Channel Cluster ChangeChannel Command callback (from client)
  */
@@ -14023,6 +13425,133 @@ bool emberAfAccountLoginClusterLoginCallback(chip::app::CommandHandler * command
 bool emberAfAccountLoginClusterLogoutCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::AccountLogin::Commands::Logout::DecodableType & commandData);
+/**
+ * @brief Messaging Cluster DisplayMessage Command callback (from server)
+ */
+bool emberAfMessagingClusterDisplayMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                   uint32_t messageId, uint8_t messageControl, uint32_t startTime,
+                                                   uint16_t durationInMinutes, chip::CharSpan message,
+                                                   uint8_t optionalExtendedMessageControl);
+/**
+ * @brief Messaging Cluster GetLastMessage Command callback (from client)
+ */
+bool emberAfMessagingClusterGetLastMessageCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::Messaging::Commands::GetLastMessage::DecodableType & commandData);
+/**
+ * @brief Messaging Cluster CancelMessage Command callback (from server)
+ */
+bool emberAfMessagingClusterCancelMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                  uint32_t messageId, uint8_t messageControl);
+/**
+ * @brief Messaging Cluster MessageConfirmation Command callback (from client)
+ */
+bool emberAfMessagingClusterMessageConfirmationCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::Messaging::Commands::MessageConfirmation::DecodableType & commandData);
+/**
+ * @brief Messaging Cluster DisplayProtectedMessage Command callback (from server)
+ */
+bool emberAfMessagingClusterDisplayProtectedMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint32_t messageId, uint8_t messageControl, uint32_t startTime,
+                                                            uint16_t durationInMinutes, chip::CharSpan message,
+                                                            uint8_t optionalExtendedMessageControl);
+/**
+ * @brief Messaging Cluster GetMessageCancellation Command callback (from client)
+ */
+bool emberAfMessagingClusterGetMessageCancellationCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::Messaging::Commands::GetMessageCancellation::DecodableType & commandData);
+/**
+ * @brief Messaging Cluster CancelAllMessages Command callback (from server)
+ */
+bool emberAfMessagingClusterCancelAllMessagesCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                      uint32_t implementationDateTime);
+/**
+ * @brief Appliance Events and Alert Cluster GetAlerts Command callback (from client)
+ */
+bool emberAfApplianceEventsAndAlertClusterGetAlertsCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ApplianceEventsAndAlert::Commands::GetAlerts::DecodableType & commandData);
+/**
+ * @brief Appliance Events and Alert Cluster GetAlertsResponse Command callback (from server)
+ */
+bool emberAfApplianceEventsAndAlertClusterGetAlertsResponseCallback(
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alertsCount,
+    /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures);
+/**
+ * @brief Appliance Events and Alert Cluster AlertsNotification Command callback (from server)
+ */
+bool emberAfApplianceEventsAndAlertClusterAlertsNotificationCallback(
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alertsCount,
+    /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures);
+/**
+ * @brief Appliance Events and Alert Cluster EventsNotification Command callback (from server)
+ */
+bool emberAfApplianceEventsAndAlertClusterEventsNotificationCallback(chip::EndpointId endpoint,
+                                                                     chip::app::CommandSender * commandObj, uint8_t eventHeader,
+                                                                     uint8_t eventId);
+/**
+ * @brief Appliance Statistics Cluster LogNotification Command callback (from server)
+ */
+bool emberAfApplianceStatisticsClusterLogNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint32_t timeStamp, uint32_t logId, uint32_t logLength,
+                                                              /* TYPE WARNING: array array defaults to */ uint8_t * logPayload);
+/**
+ * @brief Appliance Statistics Cluster LogRequest Command callback (from client)
+ */
+bool emberAfApplianceStatisticsClusterLogRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ApplianceStatistics::Commands::LogRequest::DecodableType & commandData);
+/**
+ * @brief Appliance Statistics Cluster LogResponse Command callback (from server)
+ */
+bool emberAfApplianceStatisticsClusterLogResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          uint32_t timeStamp, uint32_t logId, uint32_t logLength,
+                                                          /* TYPE WARNING: array array defaults to */ uint8_t * logPayload);
+/**
+ * @brief Appliance Statistics Cluster LogQueueRequest Command callback (from client)
+ */
+bool emberAfApplianceStatisticsClusterLogQueueRequestCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ApplianceStatistics::Commands::LogQueueRequest::DecodableType & commandData);
+/**
+ * @brief Appliance Statistics Cluster LogQueueResponse Command callback (from server)
+ */
+bool emberAfApplianceStatisticsClusterLogQueueResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               uint8_t logQueueSize,
+                                                               /* TYPE WARNING: array array defaults to */ uint8_t * logIds);
+/**
+ * @brief Appliance Statistics Cluster StatisticsAvailable Command callback (from server)
+ */
+bool emberAfApplianceStatisticsClusterStatisticsAvailableCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                  uint8_t logQueueSize,
+                                                                  /* TYPE WARNING: array array defaults to */ uint8_t * logIds);
+/**
+ * @brief Electrical Measurement Cluster GetProfileInfoResponseCommand Command callback (from server)
+ */
+bool emberAfElectricalMeasurementClusterGetProfileInfoResponseCommandCallback(
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t profileCount, uint8_t profileIntervalPeriod,
+    uint8_t maxNumberOfIntervals, /* TYPE WARNING: array array defaults to */ uint8_t * listOfAttributes);
+/**
+ * @brief Electrical Measurement Cluster GetProfileInfoCommand Command callback (from client)
+ */
+bool emberAfElectricalMeasurementClusterGetProfileInfoCommandCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::DecodableType & commandData);
+/**
+ * @brief Electrical Measurement Cluster GetMeasurementProfileResponseCommand Command callback (from server)
+ */
+bool emberAfElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback(
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint32_t startTime, uint8_t status,
+    uint8_t profileIntervalPeriod, uint8_t numberOfIntervalsDelivered, uint16_t attributeId,
+    /* TYPE WARNING: array array defaults to */ uint8_t * intervals);
+/**
+ * @brief Electrical Measurement Cluster GetMeasurementProfileCommand Command callback (from client)
+ */
+bool emberAfElectricalMeasurementClusterGetMeasurementProfileCommandCallback(
+    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+    const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::DecodableType & commandData);
 /**
  * @brief Test Cluster Cluster Test Command callback (from client)
  */
@@ -14230,133 +13759,6 @@ bool emberAfTestClusterClusterTestEmitTestEventRequestCallback(
 bool emberAfTestClusterClusterTestEmitTestFabricScopedEventRequestCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventRequest::DecodableType & commandData);
-/**
- * @brief Messaging Cluster DisplayMessage Command callback (from server)
- */
-bool emberAfMessagingClusterDisplayMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                   uint32_t messageId, uint8_t messageControl, uint32_t startTime,
-                                                   uint16_t durationInMinutes, chip::CharSpan message,
-                                                   uint8_t optionalExtendedMessageControl);
-/**
- * @brief Messaging Cluster GetLastMessage Command callback (from client)
- */
-bool emberAfMessagingClusterGetLastMessageCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::Messaging::Commands::GetLastMessage::DecodableType & commandData);
-/**
- * @brief Messaging Cluster CancelMessage Command callback (from server)
- */
-bool emberAfMessagingClusterCancelMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                  uint32_t messageId, uint8_t messageControl);
-/**
- * @brief Messaging Cluster MessageConfirmation Command callback (from client)
- */
-bool emberAfMessagingClusterMessageConfirmationCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::Messaging::Commands::MessageConfirmation::DecodableType & commandData);
-/**
- * @brief Messaging Cluster DisplayProtectedMessage Command callback (from server)
- */
-bool emberAfMessagingClusterDisplayProtectedMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                            uint32_t messageId, uint8_t messageControl, uint32_t startTime,
-                                                            uint16_t durationInMinutes, chip::CharSpan message,
-                                                            uint8_t optionalExtendedMessageControl);
-/**
- * @brief Messaging Cluster GetMessageCancellation Command callback (from client)
- */
-bool emberAfMessagingClusterGetMessageCancellationCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::Messaging::Commands::GetMessageCancellation::DecodableType & commandData);
-/**
- * @brief Messaging Cluster CancelAllMessages Command callback (from server)
- */
-bool emberAfMessagingClusterCancelAllMessagesCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                      uint32_t implementationDateTime);
-/**
- * @brief Appliance Events and Alert Cluster GetAlerts Command callback (from client)
- */
-bool emberAfApplianceEventsAndAlertClusterGetAlertsCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::ApplianceEventsAndAlert::Commands::GetAlerts::DecodableType & commandData);
-/**
- * @brief Appliance Events and Alert Cluster GetAlertsResponse Command callback (from server)
- */
-bool emberAfApplianceEventsAndAlertClusterGetAlertsResponseCallback(
-    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alertsCount,
-    /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures);
-/**
- * @brief Appliance Events and Alert Cluster AlertsNotification Command callback (from server)
- */
-bool emberAfApplianceEventsAndAlertClusterAlertsNotificationCallback(
-    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alertsCount,
-    /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures);
-/**
- * @brief Appliance Events and Alert Cluster EventsNotification Command callback (from server)
- */
-bool emberAfApplianceEventsAndAlertClusterEventsNotificationCallback(chip::EndpointId endpoint,
-                                                                     chip::app::CommandSender * commandObj, uint8_t eventHeader,
-                                                                     uint8_t eventId);
-/**
- * @brief Appliance Statistics Cluster LogNotification Command callback (from server)
- */
-bool emberAfApplianceStatisticsClusterLogNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                              uint32_t timeStamp, uint32_t logId, uint32_t logLength,
-                                                              /* TYPE WARNING: array array defaults to */ uint8_t * logPayload);
-/**
- * @brief Appliance Statistics Cluster LogRequest Command callback (from client)
- */
-bool emberAfApplianceStatisticsClusterLogRequestCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::ApplianceStatistics::Commands::LogRequest::DecodableType & commandData);
-/**
- * @brief Appliance Statistics Cluster LogResponse Command callback (from server)
- */
-bool emberAfApplianceStatisticsClusterLogResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                          uint32_t timeStamp, uint32_t logId, uint32_t logLength,
-                                                          /* TYPE WARNING: array array defaults to */ uint8_t * logPayload);
-/**
- * @brief Appliance Statistics Cluster LogQueueRequest Command callback (from client)
- */
-bool emberAfApplianceStatisticsClusterLogQueueRequestCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::ApplianceStatistics::Commands::LogQueueRequest::DecodableType & commandData);
-/**
- * @brief Appliance Statistics Cluster LogQueueResponse Command callback (from server)
- */
-bool emberAfApplianceStatisticsClusterLogQueueResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                               uint8_t logQueueSize,
-                                                               /* TYPE WARNING: array array defaults to */ uint8_t * logIds);
-/**
- * @brief Appliance Statistics Cluster StatisticsAvailable Command callback (from server)
- */
-bool emberAfApplianceStatisticsClusterStatisticsAvailableCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                                  uint8_t logQueueSize,
-                                                                  /* TYPE WARNING: array array defaults to */ uint8_t * logIds);
-/**
- * @brief Electrical Measurement Cluster GetProfileInfoResponseCommand Command callback (from server)
- */
-bool emberAfElectricalMeasurementClusterGetProfileInfoResponseCommandCallback(
-    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t profileCount, uint8_t profileIntervalPeriod,
-    uint8_t maxNumberOfIntervals, /* TYPE WARNING: array array defaults to */ uint8_t * listOfAttributes);
-/**
- * @brief Electrical Measurement Cluster GetProfileInfoCommand Command callback (from client)
- */
-bool emberAfElectricalMeasurementClusterGetProfileInfoCommandCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::DecodableType & commandData);
-/**
- * @brief Electrical Measurement Cluster GetMeasurementProfileResponseCommand Command callback (from server)
- */
-bool emberAfElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback(
-    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint32_t startTime, uint8_t status,
-    uint8_t profileIntervalPeriod, uint8_t numberOfIntervalsDelivered, uint16_t attributeId,
-    /* TYPE WARNING: array array defaults to */ uint8_t * intervals);
-/**
- * @brief Electrical Measurement Cluster GetMeasurementProfileCommand Command callback (from client)
- */
-bool emberAfElectricalMeasurementClusterGetMeasurementProfileCommandCallback(
-    chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-    const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::DecodableType & commandData);
 
 /** @brief Add To Current App Tasks
  *
diff --git a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
index c4e9ae9188ccd8..8d44a1d1e50d2c 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
@@ -209,12 +209,6 @@ void __attribute__((weak)) MatterChloroformConcentrationMeasurementPluginClientI
 void MatterChloroformConcentrationMeasurementPluginServerInitCallback();
 void __attribute__((weak)) MatterSodiumConcentrationMeasurementPluginClientInitCallback() {}
 void MatterSodiumConcentrationMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterIasZonePluginClientInitCallback() {}
-void MatterIasZonePluginServerInitCallback();
-void __attribute__((weak)) MatterIasAcePluginClientInitCallback() {}
-void MatterIasAcePluginServerInitCallback();
-void __attribute__((weak)) MatterIasWdPluginClientInitCallback() {}
-void MatterIasWdPluginServerInitCallback();
 void __attribute__((weak)) MatterWakeOnLanPluginClientInitCallback() {}
 void MatterWakeOnLanPluginServerInitCallback();
 void __attribute__((weak)) MatterChannelPluginClientInitCallback() {}
@@ -239,8 +233,6 @@ void __attribute__((weak)) MatterApplicationBasicPluginClientInitCallback() {}
 void MatterApplicationBasicPluginServerInitCallback();
 void __attribute__((weak)) MatterAccountLoginPluginClientInitCallback() {}
 void MatterAccountLoginPluginServerInitCallback();
-void __attribute__((weak)) MatterTestClusterPluginClientInitCallback() {}
-void MatterTestClusterPluginServerInitCallback();
 void __attribute__((weak)) MatterMessagingPluginClientInitCallback() {}
 void MatterMessagingPluginServerInitCallback();
 void __attribute__((weak)) MatterApplianceIdentificationPluginClientInitCallback() {}
@@ -253,3 +245,5 @@ void __attribute__((weak)) MatterApplianceStatisticsPluginClientInitCallback() {
 void MatterApplianceStatisticsPluginServerInitCallback();
 void __attribute__((weak)) MatterElectricalMeasurementPluginClientInitCallback() {}
 void MatterElectricalMeasurementPluginServerInitCallback();
+void __attribute__((weak)) MatterTestClusterPluginClientInitCallback() {}
+void MatterTestClusterPluginServerInitCallback();
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index da6117336c352f..993407dd1a80bf 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -755,6 +755,12 @@ using RadioFaultType                  = EmberAfRadioFaultType;
 } // namespace GeneralDiagnostics
 
 namespace SoftwareDiagnostics {
+
+// Bitmap for SoftwareDiagnosticsFeature
+enum class SoftwareDiagnosticsFeature : uint32_t
+{
+    kWaterMarks = 0x1,
+};
 } // namespace SoftwareDiagnostics
 
 namespace ThreadNetworkDiagnostics {
@@ -925,6 +931,7 @@ enum class OperationalCertStatus : uint8_t
     kInvalidNOC            = 0x03,
     kMissingCsr            = 0x04,
     kTableFull             = 0x05,
+    kInvalidAdminSubject   = 0x06,
     kInsufficientPrivilege = 0x08,
     kFabricConflict        = 0x09,
     kLabelConflict         = 0x0A,
@@ -1203,18 +1210,6 @@ enum class DoorLockUserType : uint8_t
     kNotSupported        = 0xFF,
 };
 
-// Bitmap for DlAlarmMask
-enum class DlAlarmMask : uint16_t
-{
-    kLockingMechanismJammed                 = 0x1,
-    kLockResetToFactoryDefaults             = 0x2,
-    kReserved                               = 0x4,
-    kRFModulePowerCycled                    = 0x8,
-    kWrongCodeEntryLimit                    = 0x10,
-    kFrontEscutcheonRemovedFromMain         = 0x20,
-    kForcedDoorOpenUnderDoorLockedCondition = 0x40,
-};
-
 // Bitmap for DlCredentialRuleMask
 enum class DlCredentialRuleMask : uint8_t
 {
@@ -1937,197 +1932,6 @@ namespace ChloroformConcentrationMeasurement {
 namespace SodiumConcentrationMeasurement {
 } // namespace SodiumConcentrationMeasurement
 
-namespace IasZone {
-
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for IasEnrollResponseCode
-enum class IasEnrollResponseCode : uint8_t
-{
-    kSuccess        = 0x00,
-    kNotSupported   = 0x01,
-    kNoEnrollPermit = 0x02,
-    kTooManyZones   = 0x03,
-};
-#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using IasEnrollResponseCode           = EmberAfIasEnrollResponseCode;
-#endif
-
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for IasZoneType
-enum class IasZoneType : uint16_t
-{
-    kStandardCie             = 0x00,
-    kMotionSensor            = 0x0D,
-    kContactSwitch           = 0x15,
-    kFireSensor              = 0x28,
-    kWaterSensor             = 0x2A,
-    kGasSensor               = 0x2B,
-    kPersonalEmergencyDevice = 0x2C,
-    kVibrationMovementSensor = 0x2D,
-    kRemoteControl           = 0x10F,
-    kKeyFob                  = 0x115,
-    kKeypad                  = 0x21D,
-    kStandardWarningDevice   = 0x225,
-    kGlassBreakSensor        = 0x226,
-    kCarbonMonoxideSensor    = 0x227,
-    kSecurityRepeater        = 0x229,
-    kInvalidZoneType         = 0xFFFF,
-};
-#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using IasZoneType                     = EmberAfIasZoneType;
-#endif
-
-// Bitmap for IasZoneStatus
-enum class IasZoneStatus : uint16_t
-{
-    kAlarm1             = 0x1,
-    kAlarm2             = 0x2,
-    kTamper             = 0x4,
-    kBattery            = 0x8,
-    kSupervisionReports = 0x10,
-    kRestoreReports     = 0x20,
-    kTrouble            = 0x40,
-    kAc                 = 0x80,
-    kTest               = 0x100,
-    kBatteryDefect      = 0x200,
-};
-} // namespace IasZone
-
-namespace IasAce {
-
-// Enum for IasAceAlarmStatus
-enum class IasAceAlarmStatus : uint8_t
-{
-    kNoAlarm        = 0x00,
-    kBurglar        = 0x01,
-    kFire           = 0x02,
-    kEmergency      = 0x03,
-    kPolicePanic    = 0x04,
-    kFirePanic      = 0x05,
-    kEmergencyPanic = 0x06,
-};
-
-// Enum for IasAceArmMode
-enum class IasAceArmMode : uint8_t
-{
-    kDisarm                 = 0x00,
-    kArmDayHomeZonesOnly    = 0x01,
-    kArmNightSleepZonesOnly = 0x02,
-    kArmAllZones            = 0x03,
-};
-
-// Enum for IasAceArmNotification
-enum class IasAceArmNotification : uint8_t
-{
-    kAllZonesDisarmed         = 0x00,
-    kOnlyDayHomeZonesArmed    = 0x01,
-    kOnlyNightSleepZonesArmed = 0x02,
-    kAllZonesArmed            = 0x03,
-    kInvalidArmDisarmCode     = 0x04,
-    kNotReadyToArm            = 0x05,
-    kAlreadyDisarmed          = 0x06,
-};
-
-// Enum for IasAceAudibleNotification
-enum class IasAceAudibleNotification : uint8_t
-{
-    kMute         = 0x00,
-    kDefaultSound = 0x01,
-};
-
-// Enum for IasAceBypassResult
-enum class IasAceBypassResult : uint8_t
-{
-    kZoneBypassed         = 0x00,
-    kZoneNotBypassed      = 0x01,
-    kNotAllowed           = 0x02,
-    kInvalidZoneId        = 0x03,
-    kUnknownZoneId        = 0x04,
-    kInvalidArmDisarmCode = 0x05,
-};
-
-// Enum for IasAcePanelStatus
-enum class IasAcePanelStatus : uint8_t
-{
-    kPanelDisarmed = 0x00,
-    kArmedStay     = 0x01,
-    kArmedNight    = 0x02,
-    kArmedAway     = 0x03,
-    kExitDelay     = 0x04,
-    kEntryDelay    = 0x05,
-    kNotReadyToArm = 0x06,
-    kInAlarm       = 0x07,
-    kArmingStay    = 0x08,
-    kArmingNight   = 0x09,
-    kArmingAway    = 0x0A,
-};
-
-// Need to convert consumers to using the new enum classes, so we
-// don't just have casts all over.
-#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for IasZoneType
-enum class IasZoneType : uint16_t
-{
-    kStandardCie             = 0x00,
-    kMotionSensor            = 0x0D,
-    kContactSwitch           = 0x15,
-    kFireSensor              = 0x28,
-    kWaterSensor             = 0x2A,
-    kGasSensor               = 0x2B,
-    kPersonalEmergencyDevice = 0x2C,
-    kVibrationMovementSensor = 0x2D,
-    kRemoteControl           = 0x10F,
-    kKeyFob                  = 0x115,
-    kKeypad                  = 0x21D,
-    kStandardWarningDevice   = 0x225,
-    kGlassBreakSensor        = 0x226,
-    kCarbonMonoxideSensor    = 0x227,
-    kSecurityRepeater        = 0x229,
-    kInvalidZoneType         = 0xFFFF,
-};
-#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using IasZoneType                     = EmberAfIasZoneType;
-#endif
-
-// Bitmap for IasZoneStatus
-enum class IasZoneStatus : uint16_t
-{
-    kAlarm1             = 0x1,
-    kAlarm2             = 0x2,
-    kTamper             = 0x4,
-    kBattery            = 0x8,
-    kSupervisionReports = 0x10,
-    kRestoreReports     = 0x20,
-    kTrouble            = 0x40,
-    kAc                 = 0x80,
-    kTest               = 0x100,
-    kBatteryDefect      = 0x200,
-};
-} // namespace IasAce
-
-namespace IasWd {
-
-// Bitmap for SquawkInfo
-enum class SquawkInfo : uint8_t
-{
-    kMode   = 0xF0,
-    kStrobe = 0x8,
-    kLevel  = 0x3,
-};
-
-// Bitmap for WarningInfo
-enum class WarningInfo : uint8_t
-{
-    kMode       = 0xF0,
-    kStrobe     = 0xC,
-    kSirenLevel = 0x3,
-};
-} // namespace IasWd
-
 namespace WakeOnLan {
 } // namespace WakeOnLan
 
@@ -2430,62 +2234,6 @@ enum class ApplicationStatusEnum : uint8_t
 namespace AccountLogin {
 } // namespace AccountLogin
 
-namespace TestCluster {
-
-// Enum for SimpleEnum
-enum class SimpleEnum : uint8_t
-{
-    kUnspecified = 0x00,
-    kValueA      = 0x01,
-    kValueB      = 0x02,
-    kValueC      = 0x03,
-};
-
-// Bitmap for Bitmap16MaskMap
-enum class Bitmap16MaskMap : uint16_t
-{
-    kMaskVal1 = 0x1,
-    kMaskVal2 = 0x2,
-    kMaskVal3 = 0x4,
-    kMaskVal4 = 0x4000,
-};
-
-// Bitmap for Bitmap32MaskMap
-enum class Bitmap32MaskMap : uint32_t
-{
-    kMaskVal1 = 0x1,
-    kMaskVal2 = 0x2,
-    kMaskVal3 = 0x4,
-    kMaskVal4 = 0x40000000,
-};
-
-// Bitmap for Bitmap64MaskMap
-enum class Bitmap64MaskMap : uint64_t
-{
-    kMaskVal1 = 0x1,
-    kMaskVal2 = 0x2,
-    kMaskVal3 = 0x4,
-    kMaskVal4 = 0x4000000000000000,
-};
-
-// Bitmap for Bitmap8MaskMap
-enum class Bitmap8MaskMap : uint8_t
-{
-    kMaskVal1 = 0x1,
-    kMaskVal2 = 0x2,
-    kMaskVal3 = 0x4,
-    kMaskVal4 = 0x40,
-};
-
-// Bitmap for SimpleBitmap
-enum class SimpleBitmap : uint8_t
-{
-    kValueA = 0x1,
-    kValueB = 0x2,
-    kValueC = 0x4,
-};
-} // namespace TestCluster
-
 namespace Messaging {
 
 // Enum for EventId
@@ -2669,6 +2417,62 @@ namespace ApplianceStatistics {
 namespace ElectricalMeasurement {
 } // namespace ElectricalMeasurement
 
+namespace TestCluster {
+
+// Enum for SimpleEnum
+enum class SimpleEnum : uint8_t
+{
+    kUnspecified = 0x00,
+    kValueA      = 0x01,
+    kValueB      = 0x02,
+    kValueC      = 0x03,
+};
+
+// Bitmap for Bitmap16MaskMap
+enum class Bitmap16MaskMap : uint16_t
+{
+    kMaskVal1 = 0x1,
+    kMaskVal2 = 0x2,
+    kMaskVal3 = 0x4,
+    kMaskVal4 = 0x4000,
+};
+
+// Bitmap for Bitmap32MaskMap
+enum class Bitmap32MaskMap : uint32_t
+{
+    kMaskVal1 = 0x1,
+    kMaskVal2 = 0x2,
+    kMaskVal3 = 0x4,
+    kMaskVal4 = 0x40000000,
+};
+
+// Bitmap for Bitmap64MaskMap
+enum class Bitmap64MaskMap : uint64_t
+{
+    kMaskVal1 = 0x1,
+    kMaskVal2 = 0x2,
+    kMaskVal3 = 0x4,
+    kMaskVal4 = 0x4000000000000000,
+};
+
+// Bitmap for Bitmap8MaskMap
+enum class Bitmap8MaskMap : uint8_t
+{
+    kMaskVal1 = 0x1,
+    kMaskVal2 = 0x2,
+    kMaskVal3 = 0x4,
+    kMaskVal4 = 0x40,
+};
+
+// Bitmap for SimpleBitmap
+enum class SimpleBitmap : uint8_t
+{
+    kValueA = 0x1,
+    kValueB = 0x2,
+    kValueC = 0x4,
+};
+} // namespace TestCluster
+
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h
index d6b5f0c17fa89c..d2facf25253f48 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h
@@ -307,15 +307,6 @@ static constexpr chip::ClusterId ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTE
 // Definitions for cluster: Sodium Concentration Measurement
 static constexpr chip::ClusterId ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0429;
 
-// Definitions for cluster: IAS Zone
-static constexpr chip::ClusterId ZCL_IAS_ZONE_CLUSTER_ID = 0x0500;
-
-// Definitions for cluster: IAS ACE
-static constexpr chip::ClusterId ZCL_IAS_ACE_CLUSTER_ID = 0x0501;
-
-// Definitions for cluster: IAS WD
-static constexpr chip::ClusterId ZCL_IAS_WD_CLUSTER_ID = 0x0502;
-
 // Definitions for cluster: Wake on LAN
 static constexpr chip::ClusterId ZCL_WAKE_ON_LAN_CLUSTER_ID = 0x0503;
 
@@ -352,9 +343,6 @@ static constexpr chip::ClusterId ZCL_APPLICATION_BASIC_CLUSTER_ID = 0x050D;
 // Definitions for cluster: Account Login
 static constexpr chip::ClusterId ZCL_ACCOUNT_LOGIN_CLUSTER_ID = 0x050E;
 
-// Definitions for cluster: Test Cluster
-static constexpr chip::ClusterId ZCL_TEST_CLUSTER_ID = 0x050F;
-
 // Definitions for cluster: Messaging
 static constexpr chip::ClusterId ZCL_MESSAGING_CLUSTER_ID = 0x0703;
 
@@ -372,3 +360,6 @@ static constexpr chip::ClusterId ZCL_APPLIANCE_STATISTICS_CLUSTER_ID = 0x0B03;
 
 // Definitions for cluster: Electrical Measurement
 static constexpr chip::ClusterId ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID = 0x0B04;
+
+// Definitions for cluster: Test Cluster
+static constexpr chip::ClusterId ZCL_TEST_CLUSTER_ID = 0xFFF1FC05;
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index 95515c24504e34..4efa5aa127e4a3 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -2589,6 +2589,43 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 } // namespace StopWithOnOff.
+namespace MoveToClosestFrequency {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFrequency)), frequency));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kFrequency):
+            ReturnErrorOnFailure(DataModel::Decode(reader, frequency));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace MoveToClosestFrequency.
 } // namespace Commands
 
 namespace Attributes {
@@ -8665,6 +8702,47 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace Structs
 
 namespace Commands {
+namespace TestEventTrigger {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEnableKey)), enableKey));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventTrigger)), eventTrigger));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kEnableKey):
+            ReturnErrorOnFailure(DataModel::Decode(reader, enableKey));
+            break;
+        case to_underlying(Fields::kEventTrigger):
+            ReturnErrorOnFailure(DataModel::Decode(reader, eventTrigger));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestEventTrigger.
 } // namespace Commands
 
 namespace Attributes {
@@ -8696,6 +8774,9 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
     case Attributes::ActiveNetworkFaults::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, activeNetworkFaults));
         break;
+    case Attributes::TestEventTriggersEnabled::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, testEventTriggersEnabled));
+        break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
@@ -11081,6 +11162,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCSRNonce)), CSRNonce));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIsForUpdateNOC)), isForUpdateNOC));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -11102,6 +11184,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kCSRNonce):
             ReturnErrorOnFailure(DataModel::Decode(reader, CSRNonce));
             break;
+        case to_underlying(Fields::kIsForUpdateNOC):
+            ReturnErrorOnFailure(DataModel::Decode(reader, isForUpdateNOC));
+            break;
         default:
             break;
         }
@@ -11162,7 +11247,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNOCValue)), NOCValue));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kICACValue)), ICACValue));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIPKValue)), IPKValue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCaseAdminNode)), caseAdminNode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCaseAdminSubject)), caseAdminSubject));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminVendorId)), adminVendorId));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
@@ -11191,8 +11276,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kIPKValue):
             ReturnErrorOnFailure(DataModel::Decode(reader, IPKValue));
             break;
-        case to_underlying(Fields::kCaseAdminNode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, caseAdminNode));
+        case to_underlying(Fields::kCaseAdminSubject):
+            ReturnErrorOnFailure(DataModel::Decode(reader, caseAdminSubject));
             break;
         case to_underlying(Fields::kAdminVendorId):
             ReturnErrorOnFailure(DataModel::Decode(reader, adminVendorId));
@@ -11404,44 +11489,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 } // namespace AddTrustedRootCertificate.
-namespace RemoveTrustedRootCertificate {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTrustedRootIdentifier)), trustedRootIdentifier));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kTrustedRootIdentifier):
-            ReturnErrorOnFailure(DataModel::Decode(reader, trustedRootIdentifier));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace RemoveTrustedRootCertificate.
 } // namespace Commands
 
 namespace Attributes {
@@ -12636,12 +12683,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 } // namespace UnlockWithTimeout.
-namespace GetLogRecord {
+namespace SetWeekDaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogIndex)), logIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12660,8 +12713,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLogIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logIndex));
+        case to_underlying(Fields::kWeekDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
+            break;
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+            break;
+        case to_underlying(Fields::kDaysMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, daysMask));
+            break;
+        case to_underlying(Fields::kStartHour):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startHour));
+            break;
+        case to_underlying(Fields::kStartMinute):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startMinute));
+            break;
+        case to_underlying(Fields::kEndHour):
+            ReturnErrorOnFailure(DataModel::Decode(reader, endHour));
+            break;
+        case to_underlying(Fields::kEndMinute):
+            ReturnErrorOnFailure(DataModel::Decode(reader, endMinute));
             break;
         default:
             break;
@@ -12672,20 +12743,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetLogRecord.
-namespace GetLogRecordResponse {
+} // namespace SetWeekDaySchedule.
+namespace GetWeekDaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogEntryId)), logEntryId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimestamp)), timestamp));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventType)), eventType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSource)), source));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventIdOrAlarmCode)), eventIdOrAlarmCode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12704,26 +12769,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLogEntryId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logEntryId));
-            break;
-        case to_underlying(Fields::kTimestamp):
-            ReturnErrorOnFailure(DataModel::Decode(reader, timestamp));
-            break;
-        case to_underlying(Fields::kEventType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, eventType));
-            break;
-        case to_underlying(Fields::kSource):
-            ReturnErrorOnFailure(DataModel::Decode(reader, source));
-            break;
-        case to_underlying(Fields::kEventIdOrAlarmCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, eventIdOrAlarmCode));
-            break;
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kWeekDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
             break;
-        case to_underlying(Fields::kPin):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pin));
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
         default:
             break;
@@ -12734,16 +12784,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetLogRecordResponse.
-namespace SetPINCode {
+} // namespace GetWeekDaySchedule.
+namespace GetWeekDayScheduleResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12762,17 +12816,29 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kWeekDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
             break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kDaysMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, daysMask));
+            break;
+        case to_underlying(Fields::kStartHour):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startHour));
+            break;
+        case to_underlying(Fields::kStartMinute):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startMinute));
+            break;
+        case to_underlying(Fields::kEndHour):
+            ReturnErrorOnFailure(DataModel::Decode(reader, endHour));
             break;
-        case to_underlying(Fields::kPin):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pin));
+        case to_underlying(Fields::kEndMinute):
+            ReturnErrorOnFailure(DataModel::Decode(reader, endMinute));
             break;
         default:
             break;
@@ -12783,13 +12849,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetPINCode.
-namespace GetPINCode {
+} // namespace GetWeekDayScheduleResponse.
+namespace ClearWeekDaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12808,8 +12875,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kWeekDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
+            break;
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
         default:
             break;
@@ -12820,16 +12890,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetPINCode.
-namespace GetPINCodeResponse {
+} // namespace ClearWeekDaySchedule.
+namespace SetYearDaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12848,17 +12918,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kYearDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
             break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kLocalStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
             break;
-        case to_underlying(Fields::kPin):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pin));
+        case to_underlying(Fields::kLocalEndTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
             break;
         default:
             break;
@@ -12869,13 +12939,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetPINCodeResponse.
-namespace ClearPINCode {
+} // namespace SetYearDaySchedule.
+namespace GetYearDaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinSlotIndex)), pinSlotIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12894,8 +12965,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPinSlotIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pinSlotIndex));
+        case to_underlying(Fields::kYearDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
+            break;
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
         default:
             break;
@@ -12906,12 +12980,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearPINCode.
-namespace ClearAllPINCodes {
+} // namespace GetYearDaySchedule.
+namespace GetYearDayScheduleResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12930,6 +13009,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kYearDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
+            break;
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+            break;
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kLocalStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
+            break;
+        case to_underlying(Fields::kLocalEndTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
+            break;
         default:
             break;
         }
@@ -12939,14 +13033,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearAllPINCodes.
-namespace SetUserStatus {
+} // namespace GetYearDayScheduleResponse.
+namespace ClearYearDaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -12965,11 +13059,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kYearDayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
             break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
         default:
             break;
@@ -12980,13 +13074,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetUserStatus.
-namespace GetUserStatus {
+} // namespace ClearYearDaySchedule.
+namespace SetHolidaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingMode)), operatingMode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13005,9 +13102,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
-            break;
+        case to_underlying(Fields::kHolidayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
+            break;
+        case to_underlying(Fields::kLocalStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
+            break;
+        case to_underlying(Fields::kLocalEndTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
+            break;
+        case to_underlying(Fields::kOperatingMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode));
+            break;
         default:
             break;
         }
@@ -13017,14 +13123,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetUserStatus.
-namespace GetUserStatusResponse {
+} // namespace SetHolidaySchedule.
+namespace GetHolidaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13043,11 +13148,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
-            break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+        case to_underlying(Fields::kHolidayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
             break;
         default:
             break;
@@ -13058,19 +13160,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetUserStatusResponse.
-namespace SetWeekDaySchedule {
+} // namespace GetHolidaySchedule.
+namespace GetHolidayScheduleResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingMode)), operatingMode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13089,26 +13189,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kWeekDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kDaysMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, daysMask));
+        case to_underlying(Fields::kHolidayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
             break;
-        case to_underlying(Fields::kStartHour):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startHour));
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
             break;
-        case to_underlying(Fields::kStartMinute):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startMinute));
+        case to_underlying(Fields::kLocalStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
             break;
-        case to_underlying(Fields::kEndHour):
-            ReturnErrorOnFailure(DataModel::Decode(reader, endHour));
+        case to_underlying(Fields::kLocalEndTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
             break;
-        case to_underlying(Fields::kEndMinute):
-            ReturnErrorOnFailure(DataModel::Decode(reader, endMinute));
+        case to_underlying(Fields::kOperatingMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode));
             break;
         default:
             break;
@@ -13119,14 +13213,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetWeekDaySchedule.
-namespace GetWeekDaySchedule {
+} // namespace GetHolidayScheduleResponse.
+namespace ClearHolidaySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13145,11 +13238,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kWeekDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+        case to_underlying(Fields::kHolidayIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
             break;
         default:
             break;
@@ -13160,20 +13250,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetWeekDaySchedule.
-namespace GetWeekDayScheduleResponse {
+} // namespace ClearHolidaySchedule.
+namespace SetUser {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13192,29 +13281,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kWeekDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
+        case to_underlying(Fields::kOperationType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operationType));
             break;
         case to_underlying(Fields::kUserIndex):
             ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kDaysMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, daysMask));
+        case to_underlying(Fields::kUserName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userName));
             break;
-        case to_underlying(Fields::kStartHour):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startHour));
+        case to_underlying(Fields::kUserUniqueId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId));
             break;
-        case to_underlying(Fields::kStartMinute):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startMinute));
+        case to_underlying(Fields::kUserStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
             break;
-        case to_underlying(Fields::kEndHour):
-            ReturnErrorOnFailure(DataModel::Decode(reader, endHour));
+        case to_underlying(Fields::kUserType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
             break;
-        case to_underlying(Fields::kEndMinute):
-            ReturnErrorOnFailure(DataModel::Decode(reader, endMinute));
+        case to_underlying(Fields::kCredentialRule):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentialRule));
             break;
         default:
             break;
@@ -13225,13 +13311,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetWeekDayScheduleResponse.
-namespace ClearWeekDaySchedule {
+} // namespace SetUser.
+namespace GetUser {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
@@ -13251,9 +13336,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kWeekDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex));
-            break;
         case to_underlying(Fields::kUserIndex):
             ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
@@ -13266,16 +13348,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearWeekDaySchedule.
-namespace SetYearDaySchedule {
+} // namespace GetUser.
+namespace GetUserResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCreatorFabricIndex)), creatorFabricIndex));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLastModifiedFabricIndex)), lastModifiedFabricIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextUserIndex)), nextUserIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13294,17 +13384,35 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kYearDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
-            break;
         case to_underlying(Fields::kUserIndex):
             ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kLocalStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
+        case to_underlying(Fields::kUserName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userName));
             break;
-        case to_underlying(Fields::kLocalEndTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
+        case to_underlying(Fields::kUserUniqueId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId));
+            break;
+        case to_underlying(Fields::kUserStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+            break;
+        case to_underlying(Fields::kUserType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+            break;
+        case to_underlying(Fields::kCredentialRule):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentialRule));
+            break;
+        case to_underlying(Fields::kCredentials):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentials));
+            break;
+        case to_underlying(Fields::kCreatorFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, creatorFabricIndex));
+            break;
+        case to_underlying(Fields::kLastModifiedFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lastModifiedFabricIndex));
+            break;
+        case to_underlying(Fields::kNextUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nextUserIndex));
             break;
         default:
             break;
@@ -13315,13 +13423,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetYearDaySchedule.
-namespace GetYearDaySchedule {
+} // namespace GetUserResponse.
+namespace ClearUser {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
@@ -13341,9 +13448,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kYearDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
-            break;
         case to_underlying(Fields::kUserIndex):
             ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
@@ -13356,17 +13460,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetYearDaySchedule.
-namespace GetYearDayScheduleResponse {
+} // namespace ClearUser.
+namespace SetCredential {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialData)), credentialData));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13385,20 +13490,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kYearDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
+        case to_underlying(Fields::kOperationType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operationType));
+            break;
+        case to_underlying(Fields::kCredential):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credential));
+            break;
+        case to_underlying(Fields::kCredentialData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentialData));
             break;
         case to_underlying(Fields::kUserIndex):
             ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kLocalStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
+        case to_underlying(Fields::kUserStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
             break;
-        case to_underlying(Fields::kLocalEndTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
+        case to_underlying(Fields::kUserType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
             break;
         default:
             break;
@@ -13409,14 +13517,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetYearDayScheduleResponse.
-namespace ClearYearDaySchedule {
+} // namespace SetCredential.
+namespace SetCredentialResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextCredentialIndex)), nextCredentialIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13435,12 +13545,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kYearDayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex));
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
             break;
         case to_underlying(Fields::kUserIndex):
             ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
+        case to_underlying(Fields::kNextCredentialIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nextCredentialIndex));
+            break;
         default:
             break;
         }
@@ -13450,16 +13563,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearYearDaySchedule.
-namespace SetHolidaySchedule {
+} // namespace SetCredentialResponse.
+namespace GetCredentialStatus {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingMode)), operatingMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13478,19 +13588,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kHolidayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
-            break;
-        case to_underlying(Fields::kLocalStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
+        case to_underlying(Fields::kCredential):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credential));
             break;
-        case to_underlying(Fields::kLocalEndTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
-            break;
-        case to_underlying(Fields::kOperatingMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode));
-            break;
-        default:
+        default:
             break;
         }
     }
@@ -13499,13 +13600,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetHolidaySchedule.
-namespace GetHolidaySchedule {
+} // namespace GetCredentialStatus.
+namespace GetCredentialStatusResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialExists)), credentialExists));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCreatorFabricIndex)), creatorFabricIndex));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLastModifiedFabricIndex)), lastModifiedFabricIndex));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextCredentialIndex)), nextCredentialIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13524,8 +13632,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kHolidayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
+        case to_underlying(Fields::kCredentialExists):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentialExists));
+            break;
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+            break;
+        case to_underlying(Fields::kCreatorFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, creatorFabricIndex));
+            break;
+        case to_underlying(Fields::kLastModifiedFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lastModifiedFabricIndex));
+            break;
+        case to_underlying(Fields::kNextCredentialIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nextCredentialIndex));
             break;
         default:
             break;
@@ -13536,17 +13656,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetHolidaySchedule.
-namespace GetHolidayScheduleResponse {
+} // namespace GetCredentialStatusResponse.
+namespace ClearCredential {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingMode)), operatingMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13565,20 +13681,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kHolidayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
-            break;
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kLocalStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime));
-            break;
-        case to_underlying(Fields::kLocalEndTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime));
-            break;
-        case to_underlying(Fields::kOperatingMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode));
+        case to_underlying(Fields::kCredential):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credential));
             break;
         default:
             break;
@@ -13589,13 +13693,152 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetHolidayScheduleResponse.
-namespace ClearHolidaySchedule {
+} // namespace ClearCredential.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::LockState::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lockState));
+        break;
+    case Attributes::LockType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lockType));
+        break;
+    case Attributes::ActuatorEnabled::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, actuatorEnabled));
+        break;
+    case Attributes::DoorState::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, doorState));
+        break;
+    case Attributes::DoorOpenEvents::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, doorOpenEvents));
+        break;
+    case Attributes::DoorClosedEvents::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, doorClosedEvents));
+        break;
+    case Attributes::OpenPeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, openPeriod));
+        break;
+    case Attributes::NumberOfTotalUsersSupported::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfTotalUsersSupported));
+        break;
+    case Attributes::NumberOfPINUsersSupported::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfPINUsersSupported));
+        break;
+    case Attributes::NumberOfRFIDUsersSupported::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfRFIDUsersSupported));
+        break;
+    case Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfWeekDaySchedulesSupportedPerUser));
+        break;
+    case Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfYearDaySchedulesSupportedPerUser));
+        break;
+    case Attributes::NumberOfHolidaySchedulesSupported::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfHolidaySchedulesSupported));
+        break;
+    case Attributes::MaxPINCodeLength::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxPINCodeLength));
+        break;
+    case Attributes::MinPINCodeLength::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minPINCodeLength));
+        break;
+    case Attributes::MaxRFIDCodeLength::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxRFIDCodeLength));
+        break;
+    case Attributes::MinRFIDCodeLength::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minRFIDCodeLength));
+        break;
+    case Attributes::CredentialRulesSupport::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, credentialRulesSupport));
+        break;
+    case Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfCredentialsSupportedPerUser));
+        break;
+    case Attributes::Language::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, language));
+        break;
+    case Attributes::LEDSettings::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, LEDSettings));
+        break;
+    case Attributes::AutoRelockTime::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, autoRelockTime));
+        break;
+    case Attributes::SoundVolume::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, soundVolume));
+        break;
+    case Attributes::OperatingMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode));
+        break;
+    case Attributes::SupportedOperatingModes::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, supportedOperatingModes));
+        break;
+    case Attributes::DefaultConfigurationRegister::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, defaultConfigurationRegister));
+        break;
+    case Attributes::EnableLocalProgramming::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enableLocalProgramming));
+        break;
+    case Attributes::EnableOneTouchLocking::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enableOneTouchLocking));
+        break;
+    case Attributes::EnableInsideStatusLED::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enableInsideStatusLED));
+        break;
+    case Attributes::EnablePrivacyModeButton::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enablePrivacyModeButton));
+        break;
+    case Attributes::LocalProgrammingFeatures::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, localProgrammingFeatures));
+        break;
+    case Attributes::WrongCodeEntryLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, wrongCodeEntryLimit));
+        break;
+    case Attributes::UserCodeTemporaryDisableTime::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, userCodeTemporaryDisableTime));
+        break;
+    case Attributes::SendPINOverTheAir::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, sendPINOverTheAir));
+        break;
+    case Attributes::RequirePINforRemoteOperation::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, requirePINforRemoteOperation));
+        break;
+    case Attributes::ExpiringUserTimeout::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, expiringUserTimeout));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+namespace DoorLockAlarm {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlarmCode)), alarmCode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13614,8 +13857,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kHolidayIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex));
+        case to_underlying(Fields::kAlarmCode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, alarmCode));
             break;
         default:
             break;
@@ -13626,14 +13869,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearHolidaySchedule.
-namespace SetUserType {
+} // namespace DoorLockAlarm.
+namespace DoorStateChange {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDoorState)), doorState));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13652,11 +13894,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
-            break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kDoorState):
+            ReturnErrorOnFailure(DataModel::Decode(reader, doorState));
             break;
         default:
             break;
@@ -13667,13 +13906,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetUserType.
-namespace GetUserType {
+} // namespace DoorStateChange.
+namespace LockOperation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockOperationType)), lockOperationType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13692,8 +13936,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kLockOperationType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lockOperationType));
+            break;
+        case to_underlying(Fields::kOperationSource):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operationSource));
+            break;
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+            break;
+        case to_underlying(Fields::kFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
+            break;
+        case to_underlying(Fields::kSourceNode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode));
+            break;
+        case to_underlying(Fields::kCredentials):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentials));
             break;
         default:
             break;
@@ -13704,14 +13963,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetUserType.
-namespace GetUserTypeResponse {
+} // namespace LockOperation.
+namespace LockOperationError {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockOperationType)), lockOperationType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationError)), operationError));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13730,60 +13994,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kLockOperationType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lockOperationType));
             break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kOperationSource):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operationSource));
             break;
-        default:
+        case to_underlying(Fields::kOperationError):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operationError));
             break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetUserTypeResponse.
-namespace SetRFIDCode {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRfidCode)), rfidCode));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+        case to_underlying(Fields::kFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
             break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kSourceNode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode));
             break;
-        case to_underlying(Fields::kRfidCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rfidCode));
+        case to_underlying(Fields::kCredentials):
+            ReturnErrorOnFailure(DataModel::Decode(reader, credentials));
             break;
         default:
             break;
@@ -13794,13 +14024,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetRFIDCode.
-namespace GetRFIDCode {
+} // namespace LockOperationError.
+namespace LockUserChange {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockDataType)), lockDataType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDataOperationType)), dataOperationType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDataIndex)), dataIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13819,57 +14055,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kLockDataType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lockDataType));
             break;
-        default:
+        case to_underlying(Fields::kDataOperationType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, dataOperationType));
             break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetRFIDCode.
-namespace GetRFIDCodeResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRfidCode)), rfidCode));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
+        case to_underlying(Fields::kOperationSource):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operationSource));
             break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
+        case to_underlying(Fields::kUserIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
             break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
+            break;
+        case to_underlying(Fields::kSourceNode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode));
             break;
-        case to_underlying(Fields::kRfidCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rfidCode));
+        case to_underlying(Fields::kDataIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, dataIndex));
             break;
         default:
             break;
@@ -13880,13 +14085,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetRFIDCodeResponse.
-namespace ClearRFIDCode {
+} // namespace LockUserChange.
+} // namespace Events
+
+} // namespace DoorLock
+namespace WindowCovering {
+
+namespace Commands {
+namespace UpOrOpen {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRfidSlotIndex)), rfidSlotIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13905,9 +14115,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kRfidSlotIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rfidSlotIndex));
-            break;
         default:
             break;
         }
@@ -13917,8 +14124,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearRFIDCode.
-namespace ClearAllRFIDCodes {
+} // namespace UpOrOpen.
+namespace DownOrClose {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -13950,19 +14157,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearAllRFIDCodes.
-namespace SetUser {
+} // namespace DownOrClose.
+namespace StopMotion {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -13981,27 +14181,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kOperationType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationType));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kUserName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userName));
-            break;
-        case to_underlying(Fields::kUserUniqueId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId));
-            break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
-            break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
-            break;
-        case to_underlying(Fields::kCredentialRule):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentialRule));
-            break;
         default:
             break;
         }
@@ -14011,13 +14190,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetUser.
-namespace GetUser {
+} // namespace StopMotion.
+namespace GoToLiftValue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLiftValue)), liftValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14036,8 +14215,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+        case to_underlying(Fields::kLiftValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, liftValue));
             break;
         default:
             break;
@@ -14048,24 +14227,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetUser.
-namespace GetUserResponse {
+} // namespace GoToLiftValue.
+namespace GoToLiftPercentage {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCreatorFabricIndex)), creatorFabricIndex));
     ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLastModifiedFabricIndex)), lastModifiedFabricIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextUserIndex)), nextUserIndex));
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLiftPercent100thsValue)), liftPercent100thsValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14084,35 +14253,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kUserName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userName));
-            break;
-        case to_underlying(Fields::kUserUniqueId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId));
-            break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
-            break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
-            break;
-        case to_underlying(Fields::kCredentialRule):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentialRule));
-            break;
-        case to_underlying(Fields::kCredentials):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentials));
-            break;
-        case to_underlying(Fields::kCreatorFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, creatorFabricIndex));
-            break;
-        case to_underlying(Fields::kLastModifiedFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lastModifiedFabricIndex));
-            break;
-        case to_underlying(Fields::kNextUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nextUserIndex));
+        case to_underlying(Fields::kLiftPercent100thsValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, liftPercent100thsValue));
             break;
         default:
             break;
@@ -14123,13 +14265,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetUserResponse.
-namespace ClearUser {
+} // namespace GoToLiftPercentage.
+namespace GoToTiltValue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTiltValue)), tiltValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14148,8 +14290,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
+        case to_underlying(Fields::kTiltValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, tiltValue));
             break;
         default:
             break;
@@ -14160,20 +14302,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearUser.
-namespace OperatingEventNotification {
+} // namespace GoToTiltValue.
+namespace GoToTiltPercentage {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationEventSource)), operationEventSource));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationEventCode)), operationEventCode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalTime)), localTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTiltPercent100thsValue)), tiltPercent100thsValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14192,23 +14328,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kOperationEventSource):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationEventSource));
-            break;
-        case to_underlying(Fields::kOperationEventCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationEventCode));
-            break;
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
-            break;
-        case to_underlying(Fields::kPin):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pin));
-            break;
-        case to_underlying(Fields::kLocalTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localTime));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+        case to_underlying(Fields::kTiltPercent100thsValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, tiltPercent100thsValue));
             break;
         default:
             break;
@@ -14219,84 +14340,116 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace OperatingEventNotification.
-namespace ProgrammingEventNotification {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProgramEventSource)), programEventSource));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProgramEventCode)), programEventCode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalTime)), localTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace GoToTiltPercentage.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kProgramEventSource):
-            ReturnErrorOnFailure(DataModel::Decode(reader, programEventSource));
-            break;
-        case to_underlying(Fields::kProgramEventCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, programEventCode));
-            break;
-        case to_underlying(Fields::kUserId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userId));
-            break;
-        case to_underlying(Fields::kPin):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pin));
-            break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
-            break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
-            break;
-        case to_underlying(Fields::kLocalTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localTime));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
-            break;
-        default:
-            break;
-        }
+    case Attributes::Type::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, type));
+        break;
+    case Attributes::PhysicalClosedLimitLift::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalClosedLimitLift));
+        break;
+    case Attributes::PhysicalClosedLimitTilt::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalClosedLimitTilt));
+        break;
+    case Attributes::CurrentPositionLift::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionLift));
+        break;
+    case Attributes::CurrentPositionTilt::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionTilt));
+        break;
+    case Attributes::NumberOfActuationsLift::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfActuationsLift));
+        break;
+    case Attributes::NumberOfActuationsTilt::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfActuationsTilt));
+        break;
+    case Attributes::ConfigStatus::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, configStatus));
+        break;
+    case Attributes::CurrentPositionLiftPercentage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionLiftPercentage));
+        break;
+    case Attributes::CurrentPositionTiltPercentage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionTiltPercentage));
+        break;
+    case Attributes::OperationalStatus::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, operationalStatus));
+        break;
+    case Attributes::TargetPositionLiftPercent100ths::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, targetPositionLiftPercent100ths));
+        break;
+    case Attributes::TargetPositionTiltPercent100ths::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, targetPositionTiltPercent100ths));
+        break;
+    case Attributes::EndProductType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, endProductType));
+        break;
+    case Attributes::CurrentPositionLiftPercent100ths::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionLiftPercent100ths));
+        break;
+    case Attributes::CurrentPositionTiltPercent100ths::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionTiltPercent100ths));
+        break;
+    case Attributes::InstalledOpenLimitLift::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, installedOpenLimitLift));
+        break;
+    case Attributes::InstalledClosedLimitLift::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, installedClosedLimitLift));
+        break;
+    case Attributes::InstalledOpenLimitTilt::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, installedOpenLimitTilt));
+        break;
+    case Attributes::InstalledClosedLimitTilt::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, installedClosedLimitTilt));
+        break;
+    case Attributes::Mode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, mode));
+        break;
+    case Attributes::SafetyStatus::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, safetyStatus));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ProgrammingEventNotification.
-namespace SetCredential {
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace WindowCovering
+namespace BarrierControl {
+
+namespace Commands {
+namespace BarrierControlGoToPercent {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialData)), credentialData));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPercentOpen)), percentOpen));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14315,23 +14468,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kOperationType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationType));
-            break;
-        case to_underlying(Fields::kCredential):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credential));
-            break;
-        case to_underlying(Fields::kCredentialData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentialData));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kUserStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
-            break;
-        case to_underlying(Fields::kUserType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userType));
+        case to_underlying(Fields::kPercentOpen):
+            ReturnErrorOnFailure(DataModel::Decode(reader, percentOpen));
             break;
         default:
             break;
@@ -14342,16 +14480,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetCredential.
-namespace SetCredentialResponse {
+} // namespace BarrierControlGoToPercent.
+namespace BarrierControlStop {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextCredentialIndex)), nextCredentialIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14370,15 +14504,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kNextCredentialIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nextCredentialIndex));
-            break;
         default:
             break;
         }
@@ -14388,137 +14513,74 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetCredentialResponse.
-namespace GetCredentialStatus {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace BarrierControlStop.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kCredential):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credential));
-            break;
-        default:
-            break;
-        }
+    case Attributes::BarrierMovingState::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierMovingState));
+        break;
+    case Attributes::BarrierSafetyStatus::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierSafetyStatus));
+        break;
+    case Attributes::BarrierCapabilities::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCapabilities));
+        break;
+    case Attributes::BarrierOpenEvents::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierOpenEvents));
+        break;
+    case Attributes::BarrierCloseEvents::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCloseEvents));
+        break;
+    case Attributes::BarrierCommandOpenEvents::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCommandOpenEvents));
+        break;
+    case Attributes::BarrierCommandCloseEvents::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCommandCloseEvents));
+        break;
+    case Attributes::BarrierOpenPeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierOpenPeriod));
+        break;
+    case Attributes::BarrierClosePeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierClosePeriod));
+        break;
+    case Attributes::BarrierPosition::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, barrierPosition));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetCredentialStatus.
-namespace GetCredentialStatusResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialExists)), credentialExists));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCreatorFabricIndex)), creatorFabricIndex));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLastModifiedFabricIndex)), lastModifiedFabricIndex));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextCredentialIndex)), nextCredentialIndex));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kCredentialExists):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentialExists));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kCreatorFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, creatorFabricIndex));
-            break;
-        case to_underlying(Fields::kLastModifiedFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lastModifiedFabricIndex));
-            break;
-        case to_underlying(Fields::kNextCredentialIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nextCredentialIndex));
-            break;
-        default:
-            break;
-        }
-    }
+} // namespace Attributes
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetCredentialStatusResponse.
-namespace ClearCredential {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+namespace Events {
+} // namespace Events
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kCredential):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credential));
-            break;
-        default:
-            break;
-        }
-    }
+} // namespace BarrierControl
+namespace PumpConfigurationAndControl {
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace ClearCredential.
+namespace Commands {
 } // namespace Commands
 
 namespace Attributes {
@@ -14526,143 +14588,74 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::LockState::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lockState));
-        break;
-    case Attributes::LockType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lockType));
-        break;
-    case Attributes::ActuatorEnabled::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, actuatorEnabled));
-        break;
-    case Attributes::DoorState::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, doorState));
-        break;
-    case Attributes::DoorOpenEvents::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, doorOpenEvents));
-        break;
-    case Attributes::DoorClosedEvents::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, doorClosedEvents));
-        break;
-    case Attributes::OpenPeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, openPeriod));
-        break;
-    case Attributes::NumberOfLogRecordsSupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfLogRecordsSupported));
-        break;
-    case Attributes::NumberOfTotalUsersSupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfTotalUsersSupported));
-        break;
-    case Attributes::NumberOfPINUsersSupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfPINUsersSupported));
-        break;
-    case Attributes::NumberOfRFIDUsersSupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfRFIDUsersSupported));
-        break;
-    case Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfWeekDaySchedulesSupportedPerUser));
-        break;
-    case Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfYearDaySchedulesSupportedPerUser));
-        break;
-    case Attributes::NumberOfHolidaySchedulesSupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfHolidaySchedulesSupported));
-        break;
-    case Attributes::MaxPINCodeLength::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxPINCodeLength));
-        break;
-    case Attributes::MinPINCodeLength::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minPINCodeLength));
-        break;
-    case Attributes::MaxRFIDCodeLength::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxRFIDCodeLength));
-        break;
-    case Attributes::MinRFIDCodeLength::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minRFIDCodeLength));
-        break;
-    case Attributes::CredentialRulesSupport::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, credentialRulesSupport));
-        break;
-    case Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfCredentialsSupportedPerUser));
-        break;
-    case Attributes::EnableLogging::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enableLogging));
-        break;
-    case Attributes::Language::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, language));
-        break;
-    case Attributes::LEDSettings::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, LEDSettings));
-        break;
-    case Attributes::AutoRelockTime::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, autoRelockTime));
+    case Attributes::MaxPressure::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxPressure));
         break;
-    case Attributes::SoundVolume::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, soundVolume));
+    case Attributes::MaxSpeed::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxSpeed));
         break;
-    case Attributes::OperatingMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode));
+    case Attributes::MaxFlow::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxFlow));
         break;
-    case Attributes::SupportedOperatingModes::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, supportedOperatingModes));
+    case Attributes::MinConstPressure::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minConstPressure));
         break;
-    case Attributes::DefaultConfigurationRegister::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, defaultConfigurationRegister));
+    case Attributes::MaxConstPressure::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstPressure));
         break;
-    case Attributes::EnableLocalProgramming::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enableLocalProgramming));
+    case Attributes::MinCompPressure::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minCompPressure));
         break;
-    case Attributes::EnableOneTouchLocking::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enableOneTouchLocking));
+    case Attributes::MaxCompPressure::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxCompPressure));
         break;
-    case Attributes::EnableInsideStatusLED::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enableInsideStatusLED));
+    case Attributes::MinConstSpeed::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minConstSpeed));
         break;
-    case Attributes::EnablePrivacyModeButton::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enablePrivacyModeButton));
+    case Attributes::MaxConstSpeed::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstSpeed));
         break;
-    case Attributes::LocalProgrammingFeatures::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, localProgrammingFeatures));
+    case Attributes::MinConstFlow::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minConstFlow));
         break;
-    case Attributes::WrongCodeEntryLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, wrongCodeEntryLimit));
+    case Attributes::MaxConstFlow::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstFlow));
         break;
-    case Attributes::UserCodeTemporaryDisableTime::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, userCodeTemporaryDisableTime));
+    case Attributes::MinConstTemp::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minConstTemp));
         break;
-    case Attributes::SendPINOverTheAir::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, sendPINOverTheAir));
+    case Attributes::MaxConstTemp::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstTemp));
         break;
-    case Attributes::RequirePINforRemoteOperation::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, requirePINforRemoteOperation));
+    case Attributes::PumpStatus::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, pumpStatus));
         break;
-    case Attributes::ExpiringUserTimeout::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, expiringUserTimeout));
+    case Attributes::EffectiveOperationMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, effectiveOperationMode));
         break;
-    case Attributes::AlarmMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, alarmMask));
+    case Attributes::EffectiveControlMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, effectiveControlMode));
         break;
-    case Attributes::KeypadOperationEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, keypadOperationEventMask));
+    case Attributes::Capacity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, capacity));
         break;
-    case Attributes::RemoteOperationEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, remoteOperationEventMask));
+    case Attributes::Speed::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, speed));
         break;
-    case Attributes::ManualOperationEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, manualOperationEventMask));
+    case Attributes::LifetimeRunningHours::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lifetimeRunningHours));
         break;
-    case Attributes::RFIDOperationEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, RFIDOperationEventMask));
+    case Attributes::Power::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, power));
         break;
-    case Attributes::KeypadProgrammingEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, keypadProgrammingEventMask));
+    case Attributes::LifetimeEnergyConsumed::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lifetimeEnergyConsumed));
         break;
-    case Attributes::RemoteProgrammingEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, remoteProgrammingEventMask));
+    case Attributes::OperationMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, operationMode));
         break;
-    case Attributes::RFIDProgrammingEventMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, RFIDProgrammingEventMask));
+    case Attributes::ControlMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, controlMode));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -14688,12 +14681,11 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 } // namespace Attributes
 
 namespace Events {
-namespace DoorLockAlarm {
+namespace SupplyVoltageLow {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlarmCode)), alarmCode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14712,9 +14704,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kAlarmCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alarmCode));
-            break;
         default:
             break;
         }
@@ -14724,13 +14713,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace DoorLockAlarm.
-namespace DoorStateChange {
+} // namespace SupplyVoltageLow.
+namespace SupplyVoltageHigh {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDoorState)), doorState));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14749,9 +14737,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kDoorState):
-            ReturnErrorOnFailure(DataModel::Decode(reader, doorState));
-            break;
         default:
             break;
         }
@@ -14761,18 +14746,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace DoorStateChange.
-namespace LockOperation {
+} // namespace SupplyVoltageHigh.
+namespace PowerMissingPhase {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockOperationType)), lockOperationType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14791,25 +14770,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLockOperationType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lockOperationType));
-            break;
-        case to_underlying(Fields::kOperationSource):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationSource));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
-            break;
-        case to_underlying(Fields::kSourceNode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode));
-            break;
-        case to_underlying(Fields::kCredentials):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentials));
-            break;
-        default:
+        default:
             break;
         }
     }
@@ -14818,19 +14779,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LockOperation.
-namespace LockOperationError {
+} // namespace PowerMissingPhase.
+namespace SystemPressureLow {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockOperationType)), lockOperationType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationError)), operationError));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14849,27 +14803,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLockOperationType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lockOperationType));
-            break;
-        case to_underlying(Fields::kOperationSource):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationSource));
-            break;
-        case to_underlying(Fields::kOperationError):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationError));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
-            break;
-        case to_underlying(Fields::kSourceNode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode));
-            break;
-        case to_underlying(Fields::kCredentials):
-            ReturnErrorOnFailure(DataModel::Decode(reader, credentials));
-            break;
         default:
             break;
         }
@@ -14879,19 +14812,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LockOperationError.
-namespace LockUserChange {
+} // namespace SystemPressureLow.
+namespace SystemPressureHigh {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockDataType)), lockDataType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDataOperationType)), dataOperationType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDataIndex)), dataIndex));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -14910,27 +14836,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLockDataType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lockDataType));
-            break;
-        case to_underlying(Fields::kDataOperationType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, dataOperationType));
-            break;
-        case to_underlying(Fields::kOperationSource):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationSource));
-            break;
-        case to_underlying(Fields::kUserIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userIndex));
-            break;
-        case to_underlying(Fields::kFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
-            break;
-        case to_underlying(Fields::kSourceNode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode));
-            break;
-        case to_underlying(Fields::kDataIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, dataIndex));
-            break;
         default:
             break;
         }
@@ -14940,14 +14845,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LockUserChange.
-} // namespace Events
-
-} // namespace DoorLock
-namespace WindowCovering {
-
-namespace Commands {
-namespace UpOrOpen {
+} // namespace SystemPressureHigh.
+namespace DryRunning {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -14979,8 +14878,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace UpOrOpen.
-namespace DownOrClose {
+} // namespace DryRunning.
+namespace MotorTemperatureHigh {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -15012,8 +14911,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace DownOrClose.
-namespace StopMotion {
+} // namespace MotorTemperatureHigh.
+namespace PumpMotorFatalFailure {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -15045,13 +14944,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace StopMotion.
-namespace GoToLiftValue {
+} // namespace PumpMotorFatalFailure.
+namespace ElectronicTemperatureHigh {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLiftValue)), liftValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15070,9 +14968,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLiftValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, liftValue));
-            break;
         default:
             break;
         }
@@ -15082,14 +14977,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GoToLiftValue.
-namespace GoToLiftPercentage {
+} // namespace ElectronicTemperatureHigh.
+namespace PumpBlocked {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLiftPercent100thsValue)), liftPercent100thsValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15108,9 +15001,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLiftPercent100thsValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, liftPercent100thsValue));
-            break;
         default:
             break;
         }
@@ -15120,13 +15010,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GoToLiftPercentage.
-namespace GoToTiltValue {
+} // namespace PumpBlocked.
+namespace SensorFailure {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTiltValue)), tiltValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15145,9 +15034,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTiltValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, tiltValue));
-            break;
         default:
             break;
         }
@@ -15157,14 +15043,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GoToTiltValue.
-namespace GoToTiltPercentage {
+} // namespace SensorFailure.
+namespace ElectronicNonFatalFailure {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTiltPercent100thsValue)), tiltPercent100thsValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15183,9 +15067,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTiltPercent100thsValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, tiltPercent100thsValue));
-            break;
         default:
             break;
         }
@@ -15195,116 +15076,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GoToTiltPercentage.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::Type::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, type));
-        break;
-    case Attributes::PhysicalClosedLimitLift::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalClosedLimitLift));
-        break;
-    case Attributes::PhysicalClosedLimitTilt::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalClosedLimitTilt));
-        break;
-    case Attributes::CurrentPositionLift::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionLift));
-        break;
-    case Attributes::CurrentPositionTilt::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionTilt));
-        break;
-    case Attributes::NumberOfActuationsLift::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfActuationsLift));
-        break;
-    case Attributes::NumberOfActuationsTilt::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfActuationsTilt));
-        break;
-    case Attributes::ConfigStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, configStatus));
-        break;
-    case Attributes::CurrentPositionLiftPercentage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionLiftPercentage));
-        break;
-    case Attributes::CurrentPositionTiltPercentage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionTiltPercentage));
-        break;
-    case Attributes::OperationalStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, operationalStatus));
-        break;
-    case Attributes::TargetPositionLiftPercent100ths::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, targetPositionLiftPercent100ths));
-        break;
-    case Attributes::TargetPositionTiltPercent100ths::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, targetPositionTiltPercent100ths));
-        break;
-    case Attributes::EndProductType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, endProductType));
-        break;
-    case Attributes::CurrentPositionLiftPercent100ths::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionLiftPercent100ths));
-        break;
-    case Attributes::CurrentPositionTiltPercent100ths::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentPositionTiltPercent100ths));
-        break;
-    case Attributes::InstalledOpenLimitLift::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, installedOpenLimitLift));
-        break;
-    case Attributes::InstalledClosedLimitLift::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, installedClosedLimitLift));
-        break;
-    case Attributes::InstalledOpenLimitTilt::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, installedOpenLimitTilt));
-        break;
-    case Attributes::InstalledClosedLimitTilt::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, installedClosedLimitTilt));
-        break;
-    case Attributes::Mode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, mode));
-        break;
-    case Attributes::SafetyStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, safetyStatus));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace WindowCovering
-namespace BarrierControl {
-
-namespace Commands {
-namespace BarrierControlGoToPercent {
+} // namespace ElectronicNonFatalFailure.
+namespace ElectronicFatalFailure {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPercentOpen)), percentOpen));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15323,9 +15100,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPercentOpen):
-            ReturnErrorOnFailure(DataModel::Decode(reader, percentOpen));
-            break;
         default:
             break;
         }
@@ -15335,8 +15109,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace BarrierControlGoToPercent.
-namespace BarrierControlStop {
+} // namespace ElectronicFatalFailure.
+namespace GeneralFault {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -15368,176 +15142,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace BarrierControlStop.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::BarrierMovingState::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierMovingState));
-        break;
-    case Attributes::BarrierSafetyStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierSafetyStatus));
-        break;
-    case Attributes::BarrierCapabilities::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCapabilities));
-        break;
-    case Attributes::BarrierOpenEvents::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierOpenEvents));
-        break;
-    case Attributes::BarrierCloseEvents::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCloseEvents));
-        break;
-    case Attributes::BarrierCommandOpenEvents::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCommandOpenEvents));
-        break;
-    case Attributes::BarrierCommandCloseEvents::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierCommandCloseEvents));
-        break;
-    case Attributes::BarrierOpenPeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierOpenPeriod));
-        break;
-    case Attributes::BarrierClosePeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierClosePeriod));
-        break;
-    case Attributes::BarrierPosition::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, barrierPosition));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace BarrierControl
-namespace PumpConfigurationAndControl {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::MaxPressure::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxPressure));
-        break;
-    case Attributes::MaxSpeed::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxSpeed));
-        break;
-    case Attributes::MaxFlow::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxFlow));
-        break;
-    case Attributes::MinConstPressure::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minConstPressure));
-        break;
-    case Attributes::MaxConstPressure::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstPressure));
-        break;
-    case Attributes::MinCompPressure::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minCompPressure));
-        break;
-    case Attributes::MaxCompPressure::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxCompPressure));
-        break;
-    case Attributes::MinConstSpeed::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minConstSpeed));
-        break;
-    case Attributes::MaxConstSpeed::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstSpeed));
-        break;
-    case Attributes::MinConstFlow::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minConstFlow));
-        break;
-    case Attributes::MaxConstFlow::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstFlow));
-        break;
-    case Attributes::MinConstTemp::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minConstTemp));
-        break;
-    case Attributes::MaxConstTemp::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxConstTemp));
-        break;
-    case Attributes::PumpStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, pumpStatus));
-        break;
-    case Attributes::EffectiveOperationMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, effectiveOperationMode));
-        break;
-    case Attributes::EffectiveControlMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, effectiveControlMode));
-        break;
-    case Attributes::Capacity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, capacity));
-        break;
-    case Attributes::Speed::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, speed));
-        break;
-    case Attributes::LifetimeRunningHours::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lifetimeRunningHours));
-        break;
-    case Attributes::Power::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, power));
-        break;
-    case Attributes::LifetimeEnergyConsumed::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lifetimeEnergyConsumed));
-        break;
-    case Attributes::OperationMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, operationMode));
-        break;
-    case Attributes::ControlMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, controlMode));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-namespace SupplyVoltageLow {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+} // namespace GeneralFault.
+namespace Leakage {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
@@ -15568,8 +15175,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SupplyVoltageLow.
-namespace SupplyVoltageHigh {
+} // namespace Leakage.
+namespace AirDetection {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -15601,8 +15208,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SupplyVoltageHigh.
-namespace PowerMissingPhase {
+} // namespace AirDetection.
+namespace TurbineOperation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -15634,12 +15241,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace PowerMissingPhase.
-namespace SystemPressureLow {
+} // namespace TurbineOperation.
+} // namespace Events
+
+} // namespace PumpConfigurationAndControl
+namespace Thermostat {
+namespace Structs {
+namespace ThermostatScheduleTransition {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHeatSetpoint)), heatSetpoint));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCoolSetpoint)), coolSetpoint));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15649,7 +15264,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -15658,6 +15274,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kHeatSetpoint):
+            ReturnErrorOnFailure(DataModel::Decode(reader, heatSetpoint));
+            break;
+        case to_underlying(Fields::kCoolSetpoint):
+            ReturnErrorOnFailure(DataModel::Decode(reader, coolSetpoint));
+            break;
         default:
             break;
         }
@@ -15665,14 +15290,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace SystemPressureLow.
-namespace SystemPressureHigh {
+
+} // namespace ThermostatScheduleTransition
+} // namespace Structs
+
+namespace Commands {
+namespace SetpointRaiseLower {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMode)), mode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAmount)), amount));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15691,6 +15323,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, mode));
+            break;
+        case to_underlying(Fields::kAmount):
+            ReturnErrorOnFailure(DataModel::Decode(reader, amount));
+            break;
         default:
             break;
         }
@@ -15700,12 +15338,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SystemPressureHigh.
-namespace DryRunning {
+} // namespace SetpointRaiseLower.
+namespace GetWeeklyScheduleResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfTransitionsForSequence)),
+                                           numberOfTransitionsForSequence));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDayOfWeekForSequence)), dayOfWeekForSequence));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeForSequence)), modeForSequence));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitions)), transitions));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15724,6 +15368,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kNumberOfTransitionsForSequence):
+            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfTransitionsForSequence));
+            break;
+        case to_underlying(Fields::kDayOfWeekForSequence):
+            ReturnErrorOnFailure(DataModel::Decode(reader, dayOfWeekForSequence));
+            break;
+        case to_underlying(Fields::kModeForSequence):
+            ReturnErrorOnFailure(DataModel::Decode(reader, modeForSequence));
+            break;
+        case to_underlying(Fields::kTransitions):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitions));
+            break;
         default:
             break;
         }
@@ -15733,12 +15389,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace DryRunning.
-namespace MotorTemperatureHigh {
+} // namespace GetWeeklyScheduleResponse.
+namespace SetWeeklySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfTransitionsForSequence)),
+                                           numberOfTransitionsForSequence));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDayOfWeekForSequence)), dayOfWeekForSequence));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeForSequence)), modeForSequence));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitions)), transitions));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15757,6 +15419,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kNumberOfTransitionsForSequence):
+            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfTransitionsForSequence));
+            break;
+        case to_underlying(Fields::kDayOfWeekForSequence):
+            ReturnErrorOnFailure(DataModel::Decode(reader, dayOfWeekForSequence));
+            break;
+        case to_underlying(Fields::kModeForSequence):
+            ReturnErrorOnFailure(DataModel::Decode(reader, modeForSequence));
+            break;
+        case to_underlying(Fields::kTransitions):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitions));
+            break;
         default:
             break;
         }
@@ -15766,12 +15440,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MotorTemperatureHigh.
-namespace PumpMotorFatalFailure {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+} // namespace SetWeeklySchedule.
+namespace GetWeeklySchedule {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysToReturn)), daysToReturn));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeToReturn)), modeToReturn));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15790,6 +15466,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kDaysToReturn):
+            ReturnErrorOnFailure(DataModel::Decode(reader, daysToReturn));
+            break;
+        case to_underlying(Fields::kModeToReturn):
+            ReturnErrorOnFailure(DataModel::Decode(reader, modeToReturn));
+            break;
         default:
             break;
         }
@@ -15799,8 +15481,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace PumpMotorFatalFailure.
-namespace ElectronicTemperatureHigh {
+} // namespace GetWeeklySchedule.
+namespace ClearWeeklySchedule {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -15832,144 +15514,378 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ElectronicTemperatureHigh.
-namespace PumpBlocked {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace ClearWeeklySchedule.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
+    case Attributes::LocalTemperature::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, localTemperature));
+        break;
+    case Attributes::OutdoorTemperature::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, outdoorTemperature));
+        break;
+    case Attributes::Occupancy::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupancy));
+        break;
+    case Attributes::AbsMinHeatSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, absMinHeatSetpointLimit));
+        break;
+    case Attributes::AbsMaxHeatSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, absMaxHeatSetpointLimit));
+        break;
+    case Attributes::AbsMinCoolSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, absMinCoolSetpointLimit));
+        break;
+    case Attributes::AbsMaxCoolSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, absMaxCoolSetpointLimit));
+        break;
+    case Attributes::PICoolingDemand::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, PICoolingDemand));
+        break;
+    case Attributes::PIHeatingDemand::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, PIHeatingDemand));
+        break;
+    case Attributes::HVACSystemTypeConfiguration::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, HVACSystemTypeConfiguration));
+        break;
+    case Attributes::LocalTemperatureCalibration::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, localTemperatureCalibration));
+        break;
+    case Attributes::OccupiedCoolingSetpoint::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedCoolingSetpoint));
+        break;
+    case Attributes::OccupiedHeatingSetpoint::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedHeatingSetpoint));
+        break;
+    case Attributes::UnoccupiedCoolingSetpoint::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedCoolingSetpoint));
+        break;
+    case Attributes::UnoccupiedHeatingSetpoint::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedHeatingSetpoint));
+        break;
+    case Attributes::MinHeatSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minHeatSetpointLimit));
+        break;
+    case Attributes::MaxHeatSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxHeatSetpointLimit));
+        break;
+    case Attributes::MinCoolSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minCoolSetpointLimit));
+        break;
+    case Attributes::MaxCoolSetpointLimit::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxCoolSetpointLimit));
+        break;
+    case Attributes::MinSetpointDeadBand::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minSetpointDeadBand));
+        break;
+    case Attributes::RemoteSensing::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, remoteSensing));
+        break;
+    case Attributes::ControlSequenceOfOperation::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, controlSequenceOfOperation));
+        break;
+    case Attributes::SystemMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, systemMode));
+        break;
+    case Attributes::ThermostatRunningMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningMode));
+        break;
+    case Attributes::StartOfWeek::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, startOfWeek));
+        break;
+    case Attributes::NumberOfWeeklyTransitions::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfWeeklyTransitions));
+        break;
+    case Attributes::NumberOfDailyTransitions::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfDailyTransitions));
+        break;
+    case Attributes::TemperatureSetpointHold::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHold));
+        break;
+    case Attributes::TemperatureSetpointHoldDuration::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHoldDuration));
+        break;
+    case Attributes::ThermostatProgrammingOperationMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, thermostatProgrammingOperationMode));
+        break;
+    case Attributes::ThermostatRunningState::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningState));
+        break;
+    case Attributes::SetpointChangeSource::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSource));
+        break;
+    case Attributes::SetpointChangeAmount::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeAmount));
+        break;
+    case Attributes::SetpointChangeSourceTimestamp::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSourceTimestamp));
+        break;
+    case Attributes::OccupiedSetback::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetback));
+        break;
+    case Attributes::OccupiedSetbackMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMin));
+        break;
+    case Attributes::OccupiedSetbackMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMax));
+        break;
+    case Attributes::UnoccupiedSetback::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetback));
+        break;
+    case Attributes::UnoccupiedSetbackMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMin));
+        break;
+    case Attributes::UnoccupiedSetbackMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMax));
+        break;
+    case Attributes::EmergencyHeatDelta::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, emergencyHeatDelta));
+        break;
+    case Attributes::ACType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACType));
+        break;
+    case Attributes::ACCapacity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacity));
+        break;
+    case Attributes::ACRefrigerantType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACRefrigerantType));
+        break;
+    case Attributes::ACCompressorType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACCompressorType));
+        break;
+    case Attributes::ACErrorCode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACErrorCode));
+        break;
+    case Attributes::ACLouverPosition::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACLouverPosition));
+        break;
+    case Attributes::ACCoilTemperature::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACCoilTemperature));
+        break;
+    case Attributes::ACCapacityformat::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacityformat));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace PumpBlocked.
-namespace SensorFailure {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
+namespace Events {
+} // namespace Events
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace SensorFailure.
-namespace ElectronicNonFatalFailure {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace Thermostat
+namespace FanControl {
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
+    case Attributes::FanMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, fanMode));
+        break;
+    case Attributes::FanModeSequence::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, fanModeSequence));
+        break;
+    case Attributes::PercentSetting::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, percentSetting));
+        break;
+    case Attributes::PercentCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, percentCurrent));
+        break;
+    case Attributes::SpeedMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, speedMax));
+        break;
+    case Attributes::SpeedSetting::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, speedSetting));
+        break;
+    case Attributes::SpeedCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, speedCurrent));
+        break;
+    case Attributes::RockSupport::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rockSupport));
+        break;
+    case Attributes::RockSetting::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rockSetting));
+        break;
+    case Attributes::WindSupport::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, windSupport));
+        break;
+    case Attributes::WindSetting::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, windSetting));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ElectronicNonFatalFailure.
-namespace ElectronicFatalFailure {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace FanControl
+namespace DehumidificationControl {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
+    switch (path.mAttributeId)
+    {
+    case Attributes::RelativeHumidity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, relativeHumidity));
+        break;
+    case Attributes::DehumidificationCooling::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationCooling));
+        break;
+    case Attributes::RhDehumidificationSetpoint::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rhDehumidificationSetpoint));
+        break;
+    case Attributes::RelativeHumidityMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, relativeHumidityMode));
+        break;
+    case Attributes::DehumidificationLockout::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationLockout));
+        break;
+    case Attributes::DehumidificationHysteresis::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationHysteresis));
+        break;
+    case Attributes::DehumidificationMaxCool::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationMaxCool));
+        break;
+    case Attributes::RelativeHumidityDisplay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, relativeHumidityDisplay));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace DehumidificationControl
+namespace ThermostatUserInterfaceConfiguration {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
+    case Attributes::TemperatureDisplayMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, temperatureDisplayMode));
+        break;
+    case Attributes::KeypadLockout::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, keypadLockout));
+        break;
+    case Attributes::ScheduleProgrammingVisibility::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, scheduleProgrammingVisibility));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ElectronicFatalFailure.
-namespace GeneralFault {
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace ThermostatUserInterfaceConfiguration
+namespace ColorControl {
+
+namespace Commands {
+namespace MoveToHue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHue)), hue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDirection)), direction));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -15988,6 +15904,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kHue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, hue));
+            break;
+        case to_underlying(Fields::kDirection):
+            ReturnErrorOnFailure(DataModel::Decode(reader, direction));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
         default:
             break;
         }
@@ -15997,12 +15928,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GeneralFault.
-namespace Leakage {
+} // namespace MoveToHue.
+namespace MoveHue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16021,6 +15956,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kMoveMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, moveMode));
+            break;
+        case to_underlying(Fields::kRate):
+            ReturnErrorOnFailure(DataModel::Decode(reader, rate));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
         default:
             break;
         }
@@ -16030,12 +15977,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Leakage.
-namespace AirDetection {
+} // namespace MoveHue.
+namespace StepHue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16054,7 +16006,22 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        default:
+        case to_underlying(Fields::kStepMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepMode));
+            break;
+        case to_underlying(Fields::kStepSize):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepSize));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
+        default:
             break;
         }
     }
@@ -16063,12 +16030,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace AirDetection.
-namespace TurbineOperation {
+} // namespace StepHue.
+namespace MoveToSaturation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSaturation)), saturation));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16087,6 +16058,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kSaturation):
+            ReturnErrorOnFailure(DataModel::Decode(reader, saturation));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
         default:
             break;
         }
@@ -16096,20 +16079,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace TurbineOperation.
-} // namespace Events
-
-} // namespace PumpConfigurationAndControl
-namespace Thermostat {
-namespace Structs {
-namespace ThermostatScheduleTransition {
+} // namespace MoveToSaturation.
+namespace MoveSaturation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHeatSetpoint)), heatSetpoint));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCoolSetpoint)), coolSetpoint));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16119,8 +16098,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -16129,14 +16107,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+        case to_underlying(Fields::kMoveMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, moveMode));
             break;
-        case to_underlying(Fields::kHeatSetpoint):
-            ReturnErrorOnFailure(DataModel::Decode(reader, heatSetpoint));
+        case to_underlying(Fields::kRate):
+            ReturnErrorOnFailure(DataModel::Decode(reader, rate));
             break;
-        case to_underlying(Fields::kCoolSetpoint):
-            ReturnErrorOnFailure(DataModel::Decode(reader, coolSetpoint));
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
             break;
         default:
             break;
@@ -16145,21 +16126,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
-
     return CHIP_NO_ERROR;
 }
-
-} // namespace ThermostatScheduleTransition
-} // namespace Structs
-
-namespace Commands {
-namespace SetpointRaiseLower {
+} // namespace MoveSaturation.
+namespace StepSaturation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMode)), mode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAmount)), amount));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16178,11 +16157,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, mode));
+        case to_underlying(Fields::kStepMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepMode));
             break;
-        case to_underlying(Fields::kAmount):
-            ReturnErrorOnFailure(DataModel::Decode(reader, amount));
+        case to_underlying(Fields::kStepSize):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepSize));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
             break;
         default:
             break;
@@ -16193,18 +16181,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetpointRaiseLower.
-namespace GetWeeklyScheduleResponse {
+} // namespace StepSaturation.
+namespace MoveToHueAndSaturation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfTransitionsForSequence)),
-                                           numberOfTransitionsForSequence));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDayOfWeekForSequence)), dayOfWeekForSequence));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeForSequence)), modeForSequence));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitions)), transitions));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHue)), hue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSaturation)), saturation));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16223,17 +16210,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kNumberOfTransitionsForSequence):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfTransitionsForSequence));
+        case to_underlying(Fields::kHue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, hue));
             break;
-        case to_underlying(Fields::kDayOfWeekForSequence):
-            ReturnErrorOnFailure(DataModel::Decode(reader, dayOfWeekForSequence));
+        case to_underlying(Fields::kSaturation):
+            ReturnErrorOnFailure(DataModel::Decode(reader, saturation));
             break;
-        case to_underlying(Fields::kModeForSequence):
-            ReturnErrorOnFailure(DataModel::Decode(reader, modeForSequence));
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
             break;
-        case to_underlying(Fields::kTransitions):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitions));
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
             break;
         default:
             break;
@@ -16244,18 +16234,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetWeeklyScheduleResponse.
-namespace SetWeeklySchedule {
+} // namespace MoveToHueAndSaturation.
+namespace MoveToColor {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfTransitionsForSequence)),
-                                           numberOfTransitionsForSequence));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDayOfWeekForSequence)), dayOfWeekForSequence));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeForSequence)), modeForSequence));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitions)), transitions));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorX)), colorX));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorY)), colorY));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16274,17 +16263,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kNumberOfTransitionsForSequence):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfTransitionsForSequence));
+        case to_underlying(Fields::kColorX):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorX));
             break;
-        case to_underlying(Fields::kDayOfWeekForSequence):
-            ReturnErrorOnFailure(DataModel::Decode(reader, dayOfWeekForSequence));
+        case to_underlying(Fields::kColorY):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorY));
             break;
-        case to_underlying(Fields::kModeForSequence):
-            ReturnErrorOnFailure(DataModel::Decode(reader, modeForSequence));
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
             break;
-        case to_underlying(Fields::kTransitions):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitions));
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
             break;
         default:
             break;
@@ -16295,19 +16287,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SetWeeklySchedule.
-namespace GetRelayStatusLogResponse {
+} // namespace MoveToColor.
+namespace MoveColor {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeOfDay)), timeOfDay));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRelayStatus)), relayStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalTemperature)), localTemperature));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHumidityInPercentage)), humidityInPercentage));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSetpoint)), setpoint));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUnreadEntries)), unreadEntries));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRateX)), rateX));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRateY)), rateY));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16326,23 +16315,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTimeOfDay):
-            ReturnErrorOnFailure(DataModel::Decode(reader, timeOfDay));
-            break;
-        case to_underlying(Fields::kRelayStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, relayStatus));
-            break;
-        case to_underlying(Fields::kLocalTemperature):
-            ReturnErrorOnFailure(DataModel::Decode(reader, localTemperature));
+        case to_underlying(Fields::kRateX):
+            ReturnErrorOnFailure(DataModel::Decode(reader, rateX));
             break;
-        case to_underlying(Fields::kHumidityInPercentage):
-            ReturnErrorOnFailure(DataModel::Decode(reader, humidityInPercentage));
+        case to_underlying(Fields::kRateY):
+            ReturnErrorOnFailure(DataModel::Decode(reader, rateY));
             break;
-        case to_underlying(Fields::kSetpoint):
-            ReturnErrorOnFailure(DataModel::Decode(reader, setpoint));
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
             break;
-        case to_underlying(Fields::kUnreadEntries):
-            ReturnErrorOnFailure(DataModel::Decode(reader, unreadEntries));
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
             break;
         default:
             break;
@@ -16353,14 +16336,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetRelayStatusLogResponse.
-namespace GetWeeklySchedule {
+} // namespace MoveColor.
+namespace StepColor {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysToReturn)), daysToReturn));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeToReturn)), modeToReturn));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepX)), stepX));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepY)), stepY));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16379,11 +16365,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kDaysToReturn):
-            ReturnErrorOnFailure(DataModel::Decode(reader, daysToReturn));
+        case to_underlying(Fields::kStepX):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepX));
             break;
-        case to_underlying(Fields::kModeToReturn):
-            ReturnErrorOnFailure(DataModel::Decode(reader, modeToReturn));
+        case to_underlying(Fields::kStepY):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepY));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
             break;
         default:
             break;
@@ -16394,12 +16389,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetWeeklySchedule.
-namespace ClearWeeklySchedule {
+} // namespace StepColor.
+namespace MoveToColorTemperature {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperature)), colorTemperature));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16418,6 +16417,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kColorTemperature):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperature));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
         default:
             break;
         }
@@ -16427,12 +16438,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ClearWeeklySchedule.
-namespace GetRelayStatusLog {
+} // namespace MoveToColorTemperature.
+namespace EnhancedMoveToHue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEnhancedHue)), enhancedHue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDirection)), direction));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -16451,387 +16467,87 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        default:
+        case to_underlying(Fields::kEnhancedHue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, enhancedHue));
             break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetRelayStatusLog.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::LocalTemperature::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, localTemperature));
-        break;
-    case Attributes::OutdoorTemperature::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, outdoorTemperature));
-        break;
-    case Attributes::Occupancy::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupancy));
-        break;
-    case Attributes::AbsMinHeatSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, absMinHeatSetpointLimit));
-        break;
-    case Attributes::AbsMaxHeatSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, absMaxHeatSetpointLimit));
-        break;
-    case Attributes::AbsMinCoolSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, absMinCoolSetpointLimit));
-        break;
-    case Attributes::AbsMaxCoolSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, absMaxCoolSetpointLimit));
-        break;
-    case Attributes::PICoolingDemand::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, PICoolingDemand));
-        break;
-    case Attributes::PIHeatingDemand::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, PIHeatingDemand));
-        break;
-    case Attributes::HVACSystemTypeConfiguration::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, HVACSystemTypeConfiguration));
-        break;
-    case Attributes::LocalTemperatureCalibration::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, localTemperatureCalibration));
-        break;
-    case Attributes::OccupiedCoolingSetpoint::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedCoolingSetpoint));
-        break;
-    case Attributes::OccupiedHeatingSetpoint::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedHeatingSetpoint));
-        break;
-    case Attributes::UnoccupiedCoolingSetpoint::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedCoolingSetpoint));
-        break;
-    case Attributes::UnoccupiedHeatingSetpoint::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedHeatingSetpoint));
-        break;
-    case Attributes::MinHeatSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minHeatSetpointLimit));
-        break;
-    case Attributes::MaxHeatSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxHeatSetpointLimit));
-        break;
-    case Attributes::MinCoolSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minCoolSetpointLimit));
-        break;
-    case Attributes::MaxCoolSetpointLimit::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxCoolSetpointLimit));
-        break;
-    case Attributes::MinSetpointDeadBand::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minSetpointDeadBand));
-        break;
-    case Attributes::RemoteSensing::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, remoteSensing));
-        break;
-    case Attributes::ControlSequenceOfOperation::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, controlSequenceOfOperation));
-        break;
-    case Attributes::SystemMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, systemMode));
-        break;
-    case Attributes::AlarmMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, alarmMask));
-        break;
-    case Attributes::ThermostatRunningMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningMode));
-        break;
-    case Attributes::StartOfWeek::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, startOfWeek));
-        break;
-    case Attributes::NumberOfWeeklyTransitions::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfWeeklyTransitions));
-        break;
-    case Attributes::NumberOfDailyTransitions::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfDailyTransitions));
-        break;
-    case Attributes::TemperatureSetpointHold::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHold));
-        break;
-    case Attributes::TemperatureSetpointHoldDuration::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHoldDuration));
-        break;
-    case Attributes::ThermostatProgrammingOperationMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, thermostatProgrammingOperationMode));
-        break;
-    case Attributes::ThermostatRunningState::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningState));
-        break;
-    case Attributes::SetpointChangeSource::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSource));
-        break;
-    case Attributes::SetpointChangeAmount::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeAmount));
-        break;
-    case Attributes::SetpointChangeSourceTimestamp::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSourceTimestamp));
-        break;
-    case Attributes::OccupiedSetback::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetback));
-        break;
-    case Attributes::OccupiedSetbackMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMin));
-        break;
-    case Attributes::OccupiedSetbackMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMax));
-        break;
-    case Attributes::UnoccupiedSetback::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetback));
-        break;
-    case Attributes::UnoccupiedSetbackMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMin));
-        break;
-    case Attributes::UnoccupiedSetbackMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMax));
-        break;
-    case Attributes::EmergencyHeatDelta::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, emergencyHeatDelta));
-        break;
-    case Attributes::ACType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACType));
-        break;
-    case Attributes::ACCapacity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacity));
-        break;
-    case Attributes::ACRefrigerantType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACRefrigerantType));
-        break;
-    case Attributes::ACCompressorType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACCompressorType));
-        break;
-    case Attributes::ACErrorCode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACErrorCode));
-        break;
-    case Attributes::ACLouverPosition::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACLouverPosition));
-        break;
-    case Attributes::ACCoilTemperature::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACCoilTemperature));
-        break;
-    case Attributes::ACCapacityformat::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacityformat));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        case to_underlying(Fields::kDirection):
+            ReturnErrorOnFailure(DataModel::Decode(reader, direction));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace EnhancedMoveToHue.
+namespace EnhancedMoveHue {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace Thermostat
-namespace FanControl {
-
-namespace Commands {
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::FanMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, fanMode));
-        break;
-    case Attributes::FanModeSequence::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, fanModeSequence));
-        break;
-    case Attributes::PercentSetting::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, percentSetting));
-        break;
-    case Attributes::PercentCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, percentCurrent));
-        break;
-    case Attributes::SpeedMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, speedMax));
-        break;
-    case Attributes::SpeedSetting::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, speedSetting));
-        break;
-    case Attributes::SpeedCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, speedCurrent));
-        break;
-    case Attributes::RockSupport::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rockSupport));
-        break;
-    case Attributes::RockSetting::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rockSetting));
-        break;
-    case Attributes::WindSupport::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, windSupport));
-        break;
-    case Attributes::WindSetting::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, windSetting));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace FanControl
-namespace DehumidificationControl {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::RelativeHumidity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, relativeHumidity));
-        break;
-    case Attributes::DehumidificationCooling::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationCooling));
-        break;
-    case Attributes::RhDehumidificationSetpoint::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rhDehumidificationSetpoint));
-        break;
-    case Attributes::RelativeHumidityMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, relativeHumidityMode));
-        break;
-    case Attributes::DehumidificationLockout::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationLockout));
-        break;
-    case Attributes::DehumidificationHysteresis::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationHysteresis));
-        break;
-    case Attributes::DehumidificationMaxCool::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dehumidificationMaxCool));
-        break;
-    case Attributes::RelativeHumidityDisplay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, relativeHumidityDisplay));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace DehumidificationControl
-namespace ThermostatUserInterfaceConfiguration {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::TemperatureDisplayMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, temperatureDisplayMode));
-        break;
-    case Attributes::KeypadLockout::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, keypadLockout));
-        break;
-    case Attributes::ScheduleProgrammingVisibility::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, scheduleProgrammingVisibility));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kMoveMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, moveMode));
+            break;
+        case to_underlying(Fields::kRate):
+            ReturnErrorOnFailure(DataModel::Decode(reader, rate));
+            break;
+        case to_underlying(Fields::kOptionsMask):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
+            break;
+        case to_underlying(Fields::kOptionsOverride):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ThermostatUserInterfaceConfiguration
-namespace ColorControl {
-
-namespace Commands {
-namespace MoveToHue {
+} // namespace EnhancedMoveHue.
+namespace EnhancedStepHue {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHue)), hue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDirection)), direction));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
@@ -16853,11 +16569,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kHue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, hue));
+        case to_underlying(Fields::kStepMode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepMode));
             break;
-        case to_underlying(Fields::kDirection):
-            ReturnErrorOnFailure(DataModel::Decode(reader, direction));
+        case to_underlying(Fields::kStepSize):
+            ReturnErrorOnFailure(DataModel::Decode(reader, stepSize));
             break;
         case to_underlying(Fields::kTransitionTime):
             ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
@@ -16877,14 +16593,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MoveToHue.
-namespace MoveHue {
+} // namespace EnhancedStepHue.
+namespace EnhancedMoveToHueAndSaturation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEnhancedHue)), enhancedHue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSaturation)), saturation));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -16905,11 +16622,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMoveMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, moveMode));
+        case to_underlying(Fields::kEnhancedHue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, enhancedHue));
             break;
-        case to_underlying(Fields::kRate):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rate));
+        case to_underlying(Fields::kSaturation):
+            ReturnErrorOnFailure(DataModel::Decode(reader, saturation));
+            break;
+        case to_underlying(Fields::kTransitionTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
             break;
         case to_underlying(Fields::kOptionsMask):
             ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
@@ -16926,15 +16646,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MoveHue.
-namespace StepHue {
+} // namespace EnhancedMoveToHueAndSaturation.
+namespace ColorLoopSet {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUpdateFlags)), updateFlags));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAction)), action));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDirection)), direction));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTime)), time));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHue)), startHue));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -16955,14 +16677,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStepMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepMode));
+        case to_underlying(Fields::kUpdateFlags):
+            ReturnErrorOnFailure(DataModel::Decode(reader, updateFlags));
             break;
-        case to_underlying(Fields::kStepSize):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepSize));
+        case to_underlying(Fields::kAction):
+            ReturnErrorOnFailure(DataModel::Decode(reader, action));
             break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
+        case to_underlying(Fields::kDirection):
+            ReturnErrorOnFailure(DataModel::Decode(reader, direction));
+            break;
+        case to_underlying(Fields::kTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, time));
+            break;
+        case to_underlying(Fields::kStartHue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startHue));
             break;
         case to_underlying(Fields::kOptionsMask):
             ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
@@ -16979,14 +16707,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace StepHue.
-namespace MoveToSaturation {
+} // namespace ColorLoopSet.
+namespace StopMoveStep {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSaturation)), saturation));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -17007,12 +16733,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kSaturation):
-            ReturnErrorOnFailure(DataModel::Decode(reader, saturation));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
         case to_underlying(Fields::kOptionsMask):
             ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
             break;
@@ -17028,14 +16748,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MoveToSaturation.
-namespace MoveSaturation {
+} // namespace StopMoveStep.
+namespace MoveColorTemperature {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMinimumMireds)),
+                                           colorTemperatureMinimumMireds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMaximumMireds)),
+                                           colorTemperatureMaximumMireds));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -17062,6 +16786,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kRate):
             ReturnErrorOnFailure(DataModel::Decode(reader, rate));
             break;
+        case to_underlying(Fields::kColorTemperatureMinimumMireds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMinimumMireds));
+            break;
+        case to_underlying(Fields::kColorTemperatureMaximumMireds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMaximumMireds));
+            break;
         case to_underlying(Fields::kOptionsMask):
             ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
             break;
@@ -17077,8 +16807,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MoveSaturation.
-namespace StepSaturation {
+} // namespace MoveColorTemperature.
+namespace StepColorTemperature {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -17086,6 +16816,10 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMinimumMireds)),
+                                           colorTemperatureMinimumMireds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMaximumMireds)),
+                                           colorTemperatureMaximumMireds));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
     ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -17115,6 +16849,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kTransitionTime):
             ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
             break;
+        case to_underlying(Fields::kColorTemperatureMinimumMireds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMinimumMireds));
+            break;
+        case to_underlying(Fields::kColorTemperatureMaximumMireds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMaximumMireds));
+            break;
         case to_underlying(Fields::kOptionsMask):
             ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
             break;
@@ -17130,696 +16870,866 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace StepSaturation.
-namespace MoveToHueAndSaturation {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHue)), hue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSaturation)), saturation));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace StepColorTemperature.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kHue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, hue));
-            break;
-        case to_underlying(Fields::kSaturation):
-            ReturnErrorOnFailure(DataModel::Decode(reader, saturation));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::CurrentHue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentHue));
+        break;
+    case Attributes::CurrentSaturation::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentSaturation));
+        break;
+    case Attributes::RemainingTime::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, remainingTime));
+        break;
+    case Attributes::CurrentX::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentX));
+        break;
+    case Attributes::CurrentY::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentY));
+        break;
+    case Attributes::DriftCompensation::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, driftCompensation));
+        break;
+    case Attributes::CompensationText::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, compensationText));
+        break;
+    case Attributes::ColorTemperature::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperature));
+        break;
+    case Attributes::ColorMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorMode));
+        break;
+    case Attributes::Options::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, options));
+        break;
+    case Attributes::NumberOfPrimaries::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfPrimaries));
+        break;
+    case Attributes::Primary1X::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary1X));
+        break;
+    case Attributes::Primary1Y::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary1Y));
+        break;
+    case Attributes::Primary1Intensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary1Intensity));
+        break;
+    case Attributes::Primary2X::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary2X));
+        break;
+    case Attributes::Primary2Y::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary2Y));
+        break;
+    case Attributes::Primary2Intensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary2Intensity));
+        break;
+    case Attributes::Primary3X::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary3X));
+        break;
+    case Attributes::Primary3Y::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary3Y));
+        break;
+    case Attributes::Primary3Intensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary3Intensity));
+        break;
+    case Attributes::Primary4X::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary4X));
+        break;
+    case Attributes::Primary4Y::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary4Y));
+        break;
+    case Attributes::Primary4Intensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary4Intensity));
+        break;
+    case Attributes::Primary5X::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary5X));
+        break;
+    case Attributes::Primary5Y::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary5Y));
+        break;
+    case Attributes::Primary5Intensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary5Intensity));
+        break;
+    case Attributes::Primary6X::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary6X));
+        break;
+    case Attributes::Primary6Y::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary6Y));
+        break;
+    case Attributes::Primary6Intensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, primary6Intensity));
+        break;
+    case Attributes::WhitePointX::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, whitePointX));
+        break;
+    case Attributes::WhitePointY::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, whitePointY));
+        break;
+    case Attributes::ColorPointRX::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointRX));
+        break;
+    case Attributes::ColorPointRY::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointRY));
+        break;
+    case Attributes::ColorPointRIntensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointRIntensity));
+        break;
+    case Attributes::ColorPointGX::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointGX));
+        break;
+    case Attributes::ColorPointGY::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointGY));
+        break;
+    case Attributes::ColorPointGIntensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointGIntensity));
+        break;
+    case Attributes::ColorPointBX::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointBX));
+        break;
+    case Attributes::ColorPointBY::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointBY));
+        break;
+    case Attributes::ColorPointBIntensity::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointBIntensity));
+        break;
+    case Attributes::EnhancedCurrentHue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enhancedCurrentHue));
+        break;
+    case Attributes::EnhancedColorMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enhancedColorMode));
+        break;
+    case Attributes::ColorLoopActive::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopActive));
+        break;
+    case Attributes::ColorLoopDirection::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopDirection));
+        break;
+    case Attributes::ColorLoopTime::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopTime));
+        break;
+    case Attributes::ColorLoopStartEnhancedHue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopStartEnhancedHue));
+        break;
+    case Attributes::ColorLoopStoredEnhancedHue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopStoredEnhancedHue));
+        break;
+    case Attributes::ColorCapabilities::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorCapabilities));
+        break;
+    case Attributes::ColorTempPhysicalMinMireds::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorTempPhysicalMinMireds));
+        break;
+    case Attributes::ColorTempPhysicalMaxMireds::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, colorTempPhysicalMaxMireds));
+        break;
+    case Attributes::CoupleColorTempToLevelMinMireds::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, coupleColorTempToLevelMinMireds));
+        break;
+    case Attributes::StartUpColorTemperatureMireds::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, startUpColorTemperatureMireds));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace MoveToHueAndSaturation.
-namespace MoveToColor {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorX)), colorX));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorY)), colorY));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace ColorControl
+namespace BallastConfiguration {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kColorX):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorX));
-            break;
-        case to_underlying(Fields::kColorY):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorY));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::PhysicalMinLevel::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalMinLevel));
+        break;
+    case Attributes::PhysicalMaxLevel::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalMaxLevel));
+        break;
+    case Attributes::BallastStatus::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ballastStatus));
+        break;
+    case Attributes::MinLevel::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minLevel));
+        break;
+    case Attributes::MaxLevel::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxLevel));
+        break;
+    case Attributes::PowerOnLevel::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerOnLevel));
+        break;
+    case Attributes::PowerOnFadeTime::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerOnFadeTime));
+        break;
+    case Attributes::IntrinsicBallastFactor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, intrinsicBallastFactor));
+        break;
+    case Attributes::BallastFactorAdjustment::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ballastFactorAdjustment));
+        break;
+    case Attributes::LampQuality::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampQuality));
+        break;
+    case Attributes::LampType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampType));
+        break;
+    case Attributes::LampManufacturer::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampManufacturer));
+        break;
+    case Attributes::LampRatedHours::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampRatedHours));
+        break;
+    case Attributes::LampBurnHours::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampBurnHours));
+        break;
+    case Attributes::LampAlarmMode::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampAlarmMode));
+        break;
+    case Attributes::LampBurnHoursTripPoint::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lampBurnHoursTripPoint));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace MoveToColor.
-namespace MoveColor {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRateX)), rateX));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRateY)), rateY));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace BallastConfiguration
+namespace IlluminanceMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kRateX):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rateX));
-            break;
-        case to_underlying(Fields::kRateY):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rateY));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::LightSensorType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lightSensorType));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MoveColor.
-namespace StepColor {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace IlluminanceMeasurement
+namespace TemperatureMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepX)), stepX));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepY)), stepY));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
+    switch (path.mAttributeId)
+    {
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace TemperatureMeasurement
+namespace PressureMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kStepX):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepX));
-            break;
-        case to_underlying(Fields::kStepY):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepY));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::ScaledValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, scaledValue));
+        break;
+    case Attributes::MinScaledValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minScaledValue));
+        break;
+    case Attributes::MaxScaledValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxScaledValue));
+        break;
+    case Attributes::ScaledTolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, scaledTolerance));
+        break;
+    case Attributes::Scale::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, scale));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace StepColor.
-namespace MoveToColorTemperature {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperature)), colorTemperature));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace PressureMeasurement
+namespace FlowMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kColorTemperature):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperature));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace MoveToColorTemperature.
-namespace EnhancedMoveToHue {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEnhancedHue)), enhancedHue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDirection)), direction));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace FlowMeasurement
+namespace RelativeHumidityMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kEnhancedHue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, enhancedHue));
-            break;
-        case to_underlying(Fields::kDirection):
-            ReturnErrorOnFailure(DataModel::Decode(reader, direction));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace EnhancedMoveToHue.
-namespace EnhancedMoveHue {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+namespace Events {
+} // namespace Events
+
+} // namespace RelativeHumidityMeasurement
+namespace OccupancySensing {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kMoveMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, moveMode));
-            break;
-        case to_underlying(Fields::kRate):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rate));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::Occupancy::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupancy));
+        break;
+    case Attributes::OccupancySensorType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorType));
+        break;
+    case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap));
+        break;
+    case Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, pirOccupiedToUnoccupiedDelay));
+        break;
+    case Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedDelay));
+        break;
+    case Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedThreshold));
+        break;
+    case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay));
+        break;
+    case Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedDelay));
+        break;
+    case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedThreshold));
+        break;
+    case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactOccupiedToUnoccupiedDelay));
+        break;
+    case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedDelay));
+        break;
+    case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedThreshold));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace EnhancedMoveHue.
-namespace EnhancedStepHue {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace OccupancySensing
+namespace CarbonMonoxideConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kStepMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepMode));
-            break;
-        case to_underlying(Fields::kStepSize):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepSize));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace EnhancedStepHue.
-namespace EnhancedMoveToHueAndSaturation {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace CarbonMonoxideConcentrationMeasurement
+namespace CarbonDioxideConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEnhancedHue)), enhancedHue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSaturation)), saturation));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
+    switch (path.mAttributeId)
+    {
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace CarbonDioxideConcentrationMeasurement
+namespace EthyleneConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kEnhancedHue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, enhancedHue));
-            break;
-        case to_underlying(Fields::kSaturation):
-            ReturnErrorOnFailure(DataModel::Decode(reader, saturation));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace EnhancedMoveToHueAndSaturation.
-namespace ColorLoopSet {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUpdateFlags)), updateFlags));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAction)), action));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDirection)), direction));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTime)), time));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHue)), startHue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace EthyleneConcentrationMeasurement
+namespace EthyleneOxideConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kUpdateFlags):
-            ReturnErrorOnFailure(DataModel::Decode(reader, updateFlags));
-            break;
-        case to_underlying(Fields::kAction):
-            ReturnErrorOnFailure(DataModel::Decode(reader, action));
-            break;
-        case to_underlying(Fields::kDirection):
-            ReturnErrorOnFailure(DataModel::Decode(reader, direction));
-            break;
-        case to_underlying(Fields::kTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, time));
-            break;
-        case to_underlying(Fields::kStartHue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startHue));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace ColorLoopSet.
-namespace StopMoveStep {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace EthyleneOxideConcentrationMeasurement
+namespace HydrogenConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
+        break;
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+        break;
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+        break;
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace StopMoveStep.
-namespace MoveColorTemperature {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMoveMode)), moveMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRate)), rate));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMinimumMireds)),
-                                           colorTemperatureMinimumMireds));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMaximumMireds)),
-                                           colorTemperatureMaximumMireds));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kMoveMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, moveMode));
-            break;
-        case to_underlying(Fields::kRate):
-            ReturnErrorOnFailure(DataModel::Decode(reader, rate));
-            break;
-        case to_underlying(Fields::kColorTemperatureMinimumMireds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMinimumMireds));
-            break;
-        case to_underlying(Fields::kColorTemperatureMaximumMireds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMaximumMireds));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace MoveColorTemperature.
-namespace StepColorTemperature {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepMode)), stepMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStepSize)), stepSize));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMinimumMireds)),
-                                           colorTemperatureMinimumMireds));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMaximumMireds)),
-                                           colorTemperatureMaximumMireds));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+namespace Events {
+} // namespace Events
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kStepMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepMode));
-            break;
-        case to_underlying(Fields::kStepSize):
-            ReturnErrorOnFailure(DataModel::Decode(reader, stepSize));
-            break;
-        case to_underlying(Fields::kTransitionTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
-            break;
-        case to_underlying(Fields::kColorTemperatureMinimumMireds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMinimumMireds));
-            break;
-        case to_underlying(Fields::kColorTemperatureMaximumMireds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMaximumMireds));
-            break;
-        case to_underlying(Fields::kOptionsMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask));
-            break;
-        case to_underlying(Fields::kOptionsOverride):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride));
-            break;
-        default:
-            break;
-        }
-    }
+} // namespace HydrogenConcentrationMeasurement
+namespace HydrogenSulphideConcentrationMeasurement {
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace StepColorTemperature.
+namespace Commands {
 } // namespace Commands
 
 namespace Attributes {
@@ -17827,178 +17737,132 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::CurrentHue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentHue));
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
         break;
-    case Attributes::CurrentSaturation::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentSaturation));
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
         break;
-    case Attributes::RemainingTime::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, remainingTime));
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
         break;
-    case Attributes::CurrentX::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentX));
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
-    case Attributes::CurrentY::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentY));
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
-    case Attributes::DriftCompensation::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, driftCompensation));
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
         break;
-    case Attributes::CompensationText::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, compensationText));
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
         break;
-    case Attributes::ColorTemperature::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperature));
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
         break;
-    case Attributes::ColorMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorMode));
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
         break;
-    case Attributes::Options::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, options));
+    default:
         break;
-    case Attributes::NumberOfPrimaries::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfPrimaries));
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace HydrogenSulphideConcentrationMeasurement
+namespace NitricOxideConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
         break;
-    case Attributes::Primary1X::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary1X));
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
         break;
-    case Attributes::Primary1Y::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary1Y));
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
         break;
-    case Attributes::Primary1Intensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary1Intensity));
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
-    case Attributes::Primary2X::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary2X));
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
-    case Attributes::Primary2Y::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary2Y));
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
         break;
-    case Attributes::Primary2Intensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary2Intensity));
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
         break;
-    case Attributes::Primary3X::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary3X));
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
         break;
-    case Attributes::Primary3Y::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary3Y));
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
         break;
-    case Attributes::Primary3Intensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary3Intensity));
+    default:
         break;
-    case Attributes::Primary4X::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary4X));
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace NitricOxideConcentrationMeasurement
+namespace NitrogenDioxideConcentrationMeasurement {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
         break;
-    case Attributes::Primary4Y::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary4Y));
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
         break;
-    case Attributes::Primary4Intensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary4Intensity));
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
         break;
-    case Attributes::Primary5X::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary5X));
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
-    case Attributes::Primary5Y::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary5Y));
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
-    case Attributes::Primary5Intensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary5Intensity));
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
         break;
-    case Attributes::Primary6X::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary6X));
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
         break;
-    case Attributes::Primary6Y::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary6Y));
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
         break;
-    case Attributes::Primary6Intensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, primary6Intensity));
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
         break;
-    case Attributes::WhitePointX::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, whitePointX));
-        break;
-    case Attributes::WhitePointY::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, whitePointY));
-        break;
-    case Attributes::ColorPointRX::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointRX));
-        break;
-    case Attributes::ColorPointRY::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointRY));
-        break;
-    case Attributes::ColorPointRIntensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointRIntensity));
-        break;
-    case Attributes::ColorPointGX::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointGX));
-        break;
-    case Attributes::ColorPointGY::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointGY));
-        break;
-    case Attributes::ColorPointGIntensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointGIntensity));
-        break;
-    case Attributes::ColorPointBX::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointBX));
-        break;
-    case Attributes::ColorPointBY::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointBY));
-        break;
-    case Attributes::ColorPointBIntensity::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorPointBIntensity));
-        break;
-    case Attributes::EnhancedCurrentHue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enhancedCurrentHue));
-        break;
-    case Attributes::EnhancedColorMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enhancedColorMode));
-        break;
-    case Attributes::ColorLoopActive::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopActive));
-        break;
-    case Attributes::ColorLoopDirection::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopDirection));
-        break;
-    case Attributes::ColorLoopTime::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopTime));
-        break;
-    case Attributes::ColorLoopStartEnhancedHue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopStartEnhancedHue));
-        break;
-    case Attributes::ColorLoopStoredEnhancedHue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorLoopStoredEnhancedHue));
-        break;
-    case Attributes::ColorCapabilities::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorCapabilities));
-        break;
-    case Attributes::ColorTempPhysicalMinMireds::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorTempPhysicalMinMireds));
-        break;
-    case Attributes::ColorTempPhysicalMaxMireds::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, colorTempPhysicalMaxMireds));
-        break;
-    case Attributes::CoupleColorTempToLevelMinMireds::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, coupleColorTempToLevelMinMireds));
-        break;
-    case Attributes::StartUpColorTemperatureMireds::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, startUpColorTemperatureMireds));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
+    default:
         break;
     }
 
@@ -18009,8 +17873,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace ColorControl
-namespace BallastConfiguration {
+} // namespace NitrogenDioxideConcentrationMeasurement
+namespace OxygenConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18020,53 +17884,17 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::PhysicalMinLevel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalMinLevel));
-        break;
-    case Attributes::PhysicalMaxLevel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalMaxLevel));
-        break;
-    case Attributes::BallastStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ballastStatus));
-        break;
-    case Attributes::MinLevel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minLevel));
-        break;
-    case Attributes::MaxLevel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxLevel));
-        break;
-    case Attributes::PowerOnLevel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerOnLevel));
-        break;
-    case Attributes::PowerOnFadeTime::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerOnFadeTime));
-        break;
-    case Attributes::IntrinsicBallastFactor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, intrinsicBallastFactor));
-        break;
-    case Attributes::BallastFactorAdjustment::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ballastFactorAdjustment));
-        break;
-    case Attributes::LampQuality::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampQuality));
-        break;
-    case Attributes::LampType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampType));
-        break;
-    case Attributes::LampManufacturer::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampManufacturer));
-        break;
-    case Attributes::LampRatedHours::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampRatedHours));
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
         break;
-    case Attributes::LampBurnHours::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampBurnHours));
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
         break;
-    case Attributes::LampAlarmMode::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampAlarmMode));
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
         break;
-    case Attributes::LampBurnHoursTripPoint::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lampBurnHoursTripPoint));
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -18094,8 +17922,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace BallastConfiguration
-namespace IlluminanceMeasurement {
+} // namespace OxygenConcentrationMeasurement
+namespace OzoneConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18117,9 +17945,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
     case Attributes::Tolerance::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
-    case Attributes::LightSensorType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lightSensorType));
-        break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
@@ -18146,8 +17971,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace IlluminanceMeasurement
-namespace TemperatureMeasurement {
+} // namespace OzoneConcentrationMeasurement
+namespace SulfurDioxideConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18195,8 +18020,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace TemperatureMeasurement
-namespace PressureMeasurement {
+} // namespace SulfurDioxideConcentrationMeasurement
+namespace DissolvedOxygenConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18218,21 +18043,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
     case Attributes::Tolerance::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
-    case Attributes::ScaledValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, scaledValue));
-        break;
-    case Attributes::MinScaledValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minScaledValue));
-        break;
-    case Attributes::MaxScaledValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxScaledValue));
-        break;
-    case Attributes::ScaledTolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, scaledTolerance));
-        break;
-    case Attributes::Scale::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, scale));
-        break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
@@ -18259,8 +18069,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace PressureMeasurement
-namespace FlowMeasurement {
+} // namespace DissolvedOxygenConcentrationMeasurement
+namespace BromateConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18308,8 +18118,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace FlowMeasurement
-namespace RelativeHumidityMeasurement {
+} // namespace BromateConcentrationMeasurement
+namespace ChloraminesConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18357,8 +18167,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace RelativeHumidityMeasurement
-namespace OccupancySensing {
+} // namespace ChloraminesConcentrationMeasurement
+namespace ChlorineConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18368,41 +18178,17 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::Occupancy::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupancy));
-        break;
-    case Attributes::OccupancySensorType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorType));
-        break;
-    case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap));
-        break;
-    case Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, pirOccupiedToUnoccupiedDelay));
-        break;
-    case Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedDelay));
-        break;
-    case Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedThreshold));
-        break;
-    case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay));
-        break;
-    case Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedDelay));
-        break;
-    case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedThreshold));
+    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
         break;
-    case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactOccupiedToUnoccupiedDelay));
+    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
         break;
-    case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedDelay));
+    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
         break;
-    case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedThreshold));
+    case Attributes::Tolerance::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -18430,8 +18216,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace OccupancySensing
-namespace CarbonMonoxideConcentrationMeasurement {
+} // namespace ChlorineConcentrationMeasurement
+namespace FecalColiformAndEColiConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18479,8 +18265,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace CarbonMonoxideConcentrationMeasurement
-namespace CarbonDioxideConcentrationMeasurement {
+} // namespace FecalColiformAndEColiConcentrationMeasurement
+namespace FluorideConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18528,8 +18314,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace CarbonDioxideConcentrationMeasurement
-namespace EthyleneConcentrationMeasurement {
+} // namespace FluorideConcentrationMeasurement
+namespace HaloaceticAcidsConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18577,8 +18363,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace EthyleneConcentrationMeasurement
-namespace EthyleneOxideConcentrationMeasurement {
+} // namespace HaloaceticAcidsConcentrationMeasurement
+namespace TotalTrihalomethanesConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18626,8 +18412,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace EthyleneOxideConcentrationMeasurement
-namespace HydrogenConcentrationMeasurement {
+} // namespace TotalTrihalomethanesConcentrationMeasurement
+namespace TotalColiformBacteriaConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18675,8 +18461,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace HydrogenConcentrationMeasurement
-namespace HydrogenSulphideConcentrationMeasurement {
+} // namespace TotalColiformBacteriaConcentrationMeasurement
+namespace TurbidityConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18724,8 +18510,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace HydrogenSulphideConcentrationMeasurement
-namespace NitricOxideConcentrationMeasurement {
+} // namespace TurbidityConcentrationMeasurement
+namespace CopperConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18773,8 +18559,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace NitricOxideConcentrationMeasurement
-namespace NitrogenDioxideConcentrationMeasurement {
+} // namespace CopperConcentrationMeasurement
+namespace LeadConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18822,9 +18608,9 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace NitrogenDioxideConcentrationMeasurement
-namespace OxygenConcentrationMeasurement {
-
+} // namespace LeadConcentrationMeasurement
+namespace ManganeseConcentrationMeasurement {
+
 namespace Commands {
 } // namespace Commands
 
@@ -18871,8 +18657,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace OxygenConcentrationMeasurement
-namespace OzoneConcentrationMeasurement {
+} // namespace ManganeseConcentrationMeasurement
+namespace SulfateConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18920,8 +18706,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace OzoneConcentrationMeasurement
-namespace SulfurDioxideConcentrationMeasurement {
+} // namespace SulfateConcentrationMeasurement
+namespace BromodichloromethaneConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -18969,8 +18755,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace SulfurDioxideConcentrationMeasurement
-namespace DissolvedOxygenConcentrationMeasurement {
+} // namespace BromodichloromethaneConcentrationMeasurement
+namespace BromoformConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -19018,8 +18804,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace DissolvedOxygenConcentrationMeasurement
-namespace BromateConcentrationMeasurement {
+} // namespace BromoformConcentrationMeasurement
+namespace ChlorodibromomethaneConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -19067,8 +18853,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace BromateConcentrationMeasurement
-namespace ChloraminesConcentrationMeasurement {
+} // namespace ChlorodibromomethaneConcentrationMeasurement
+namespace ChloroformConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -19116,8 +18902,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace ChloraminesConcentrationMeasurement
-namespace ChlorineConcentrationMeasurement {
+} // namespace ChloroformConcentrationMeasurement
+namespace SodiumConcentrationMeasurement {
 
 namespace Commands {
 } // namespace Commands
@@ -19165,8 +18951,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace ChlorineConcentrationMeasurement
-namespace FecalColiformAndEColiConcentrationMeasurement {
+} // namespace SodiumConcentrationMeasurement
+namespace WakeOnLan {
 
 namespace Commands {
 } // namespace Commands
@@ -19176,17 +18962,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+    case Attributes::MACAddress::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, MACAddress));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -19214,255 +18991,276 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace FecalColiformAndEColiConcentrationMeasurement
-namespace FluorideConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
+} // namespace WakeOnLan
+namespace Channel {
+namespace Structs {
+namespace ChannelInfo {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMajorNumber)), majorNumber));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMinorNumber)), minorNumber));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCallSign)), callSign));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAffiliateCallSign)), affiliateCallSign));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kMajorNumber):
+            ReturnErrorOnFailure(DataModel::Decode(reader, majorNumber));
+            break;
+        case to_underlying(Fields::kMinorNumber):
+            ReturnErrorOnFailure(DataModel::Decode(reader, minorNumber));
+            break;
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+            break;
+        case to_underlying(Fields::kCallSign):
+            ReturnErrorOnFailure(DataModel::Decode(reader, callSign));
+            break;
+        case to_underlying(Fields::kAffiliateCallSign):
+            ReturnErrorOnFailure(DataModel::Decode(reader, affiliateCallSign));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace FluorideConcentrationMeasurement
-namespace HaloaceticAcidsConcentrationMeasurement {
 
-namespace Commands {
-} // namespace Commands
+} // namespace ChannelInfo
+namespace LineupInfo {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatorName)), operatorName));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLineupName)), lineupName));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPostalCode)), postalCode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLineupInfoType)), lineupInfoType));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kOperatorName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, operatorName));
+            break;
+        case to_underlying(Fields::kLineupName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lineupName));
+            break;
+        case to_underlying(Fields::kPostalCode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, postalCode));
+            break;
+        case to_underlying(Fields::kLineupInfoType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, lineupInfoType));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
 
-} // namespace HaloaceticAcidsConcentrationMeasurement
-namespace TotalTrihalomethanesConcentrationMeasurement {
+} // namespace LineupInfo
+} // namespace Structs
 
 namespace Commands {
-} // namespace Commands
+namespace ChangeChannel {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMatch)), match));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kMatch):
+            ReturnErrorOnFailure(DataModel::Decode(reader, match));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace ChangeChannel.
+namespace ChangeChannelResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace TotalTrihalomethanesConcentrationMeasurement
-namespace TotalColiformBacteriaConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace ChangeChannelResponse.
+namespace ChangeChannelByNumber {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMajorNumber)), majorNumber));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMinorNumber)), minorNumber));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace TotalColiformBacteriaConcentrationMeasurement
-namespace TurbidityConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kMajorNumber):
+            ReturnErrorOnFailure(DataModel::Decode(reader, majorNumber));
+            break;
+        case to_underlying(Fields::kMinorNumber):
+            ReturnErrorOnFailure(DataModel::Decode(reader, minorNumber));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace ChangeChannelByNumber.
+namespace SkipChannel {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCount)), count));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
 
-} // namespace TurbidityConcentrationMeasurement
-namespace CopperConcentrationMeasurement {
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kCount):
+            ReturnErrorOnFailure(DataModel::Decode(reader, count));
+            break;
+        default:
+            break;
+        }
+    }
 
-namespace Commands {
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace SkipChannel.
 } // namespace Commands
 
 namespace Attributes {
@@ -19470,17 +19268,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
+    case Attributes::ChannelList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, channelList));
         break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+    case Attributes::Lineup::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lineup));
         break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+    case Attributes::CurrentChannel::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentChannel));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -19508,157 +19303,138 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace CopperConcentrationMeasurement
-namespace LeadConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+} // namespace Channel
+namespace TargetNavigator {
+namespace Structs {
+namespace TargetInfo {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
-    switch (path.mAttributeId)
-    {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIdentifier)), identifier));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace LeadConcentrationMeasurement
-namespace ManganeseConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kIdentifier):
+            ReturnErrorOnFailure(DataModel::Decode(reader, identifier));
+            break;
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
 
-} // namespace ManganeseConcentrationMeasurement
-namespace SulfateConcentrationMeasurement {
+} // namespace TargetInfo
+} // namespace Structs
 
 namespace Commands {
-} // namespace Commands
+namespace NavigateTarget {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTarget)), target));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kTarget):
+            ReturnErrorOnFailure(DataModel::Decode(reader, target));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace NavigateTarget.
+namespace NavigateTargetResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
 
-} // namespace SulfateConcentrationMeasurement
-namespace BromodichloromethaneConcentrationMeasurement {
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+            break;
+        default:
+            break;
+        }
+    }
 
-namespace Commands {
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace NavigateTargetResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -19666,17 +19442,11 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
+    case Attributes::TargetList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, targetList));
         break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
+    case Attributes::CurrentTarget::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentTarget));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -19704,214 +19474,94 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace BromodichloromethaneConcentrationMeasurement
-namespace BromoformConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+} // namespace TargetNavigator
+namespace MediaPlayback {
+namespace Structs {
+namespace PlaybackPosition {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
-    switch (path.mAttributeId)
-    {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUpdatedAt)), updatedAt));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPosition)), position));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace BromoformConcentrationMeasurement
-namespace ChlorodibromomethaneConcentrationMeasurement {
-
-namespace Commands {
-} // namespace Commands
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kUpdatedAt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, updatedAt));
+            break;
+        case to_underlying(Fields::kPosition):
+            ReturnErrorOnFailure(DataModel::Decode(reader, position));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
 
-namespace Events {
-} // namespace Events
-
-} // namespace ChlorodibromomethaneConcentrationMeasurement
-namespace ChloroformConcentrationMeasurement {
+} // namespace PlaybackPosition
+} // namespace Structs
 
 namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+namespace Play {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
-    switch (path.mAttributeId)
-    {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ChloroformConcentrationMeasurement
-namespace SodiumConcentrationMeasurement {
 
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredValue));
-        break;
-    case Attributes::MinMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, minMeasuredValue));
-        break;
-    case Attributes::MaxMeasuredValue::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxMeasuredValue));
-        break;
-    case Attributes::Tolerance::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, tolerance));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace SodiumConcentrationMeasurement
-namespace IasZone {
-
-namespace Commands {
-namespace ZoneEnrollResponse {
+} // namespace Play.
+namespace Pause {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEnrollResponseCode)), enrollResponseCode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -19930,12 +19580,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kEnrollResponseCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, enrollResponseCode));
-            break;
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
-            break;
         default:
             break;
         }
@@ -19945,16 +19589,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ZoneEnrollResponse.
-namespace ZoneStatusChangeNotification {
+} // namespace Pause.
+namespace StopPlayback {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatus)), zoneStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kExtendedStatus)), extendedStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDelay)), delay));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -19973,18 +19613,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatus));
-            break;
-        case to_underlying(Fields::kExtendedStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, extendedStatus));
-            break;
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
-            break;
-        case to_underlying(Fields::kDelay):
-            ReturnErrorOnFailure(DataModel::Decode(reader, delay));
-            break;
         default:
             break;
         }
@@ -19994,8 +19622,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ZoneStatusChangeNotification.
-namespace InitiateNormalOperationMode {
+} // namespace StopPlayback.
+namespace StartOver {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -20027,14 +19655,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace InitiateNormalOperationMode.
-namespace ZoneEnrollRequest {
+} // namespace StartOver.
+namespace Previous {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneType)), zoneType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kManufacturerCode)), manufacturerCode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20053,12 +19679,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneType));
-            break;
-        case to_underlying(Fields::kManufacturerCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, manufacturerCode));
-            break;
         default:
             break;
         }
@@ -20068,15 +19688,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ZoneEnrollRequest.
-namespace InitiateTestMode {
+} // namespace Previous.
+namespace Next {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTestModeDuration)), testModeDuration));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCurrentZoneSensitivityLevel)),
-                                           currentZoneSensitivityLevel));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20095,12 +19712,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTestModeDuration):
-            ReturnErrorOnFailure(DataModel::Decode(reader, testModeDuration));
-            break;
-        case to_underlying(Fields::kCurrentZoneSensitivityLevel):
-            ReturnErrorOnFailure(DataModel::Decode(reader, currentZoneSensitivityLevel));
-            break;
         default:
             break;
         }
@@ -20110,8 +19721,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace InitiateTestMode.
-namespace InitiateNormalOperationModeResponse {
+} // namespace Next.
+namespace Rewind {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -20143,8 +19754,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace InitiateNormalOperationModeResponse.
-namespace InitiateTestModeResponse {
+} // namespace Rewind.
+namespace FastForward {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -20176,82 +19787,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace InitiateTestModeResponse.
-} // namespace Commands
+} // namespace FastForward.
+namespace SkipForward {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDeltaPositionMilliseconds)), deltaPositionMilliseconds));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::ZoneState::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, zoneState));
-        break;
-    case Attributes::ZoneType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, zoneType));
-        break;
-    case Attributes::ZoneStatus::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatus));
-        break;
-    case Attributes::IasCieAddress::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, iasCieAddress));
-        break;
-    case Attributes::ZoneId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
-        break;
-    case Attributes::NumberOfZoneSensitivityLevelsSupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, numberOfZoneSensitivityLevelsSupported));
-        break;
-    case Attributes::CurrentZoneSensitivityLevel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentZoneSensitivityLevel));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace IasZone
-namespace IasAce {
-namespace Structs {
-namespace IasAceZoneStatusResult {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatus)), zoneStatus));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20260,11 +19813,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
-            break;
-        case to_underlying(Fields::kZoneStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatus));
+        case to_underlying(Fields::kDeltaPositionMilliseconds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, deltaPositionMilliseconds));
             break;
         default:
             break;
@@ -20273,22 +19823,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
-
     return CHIP_NO_ERROR;
 }
-
-} // namespace IasAceZoneStatusResult
-} // namespace Structs
-
-namespace Commands {
-namespace Arm {
+} // namespace SkipForward.
+namespace SkipBackward {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArmMode)), armMode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArmDisarmCode)), armDisarmCode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDeltaPositionMilliseconds)), deltaPositionMilliseconds));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20307,14 +19851,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kArmMode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, armMode));
-            break;
-        case to_underlying(Fields::kArmDisarmCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, armDisarmCode));
-            break;
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
+        case to_underlying(Fields::kDeltaPositionMilliseconds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, deltaPositionMilliseconds));
             break;
         default:
             break;
@@ -20325,13 +19863,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Arm.
-namespace ArmResponse {
+} // namespace SkipBackward.
+namespace PlaybackResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArmNotification)), armNotification));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20350,8 +19889,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kArmNotification):
-            ReturnErrorOnFailure(DataModel::Decode(reader, armNotification));
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
             break;
         default:
             break;
@@ -20362,15 +19904,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ArmResponse.
-namespace Bypass {
+} // namespace PlaybackResponse.
+namespace Seek {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfZones)), numberOfZones));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneIds)), zoneIds));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArmDisarmCode)), armDisarmCode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPosition)), position));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20389,14 +19929,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kNumberOfZones):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfZones));
-            break;
-        case to_underlying(Fields::kZoneIds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneIds));
-            break;
-        case to_underlying(Fields::kArmDisarmCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, armDisarmCode));
+        case to_underlying(Fields::kPosition):
+            ReturnErrorOnFailure(DataModel::Decode(reader, position));
             break;
         default:
             break;
@@ -20407,28 +19941,73 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Bypass.
-namespace GetZoneIdMapResponse {
+} // namespace Seek.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::CurrentState::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentState));
+        break;
+    case Attributes::StartTime::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
+        break;
+    case Attributes::Duration::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, duration));
+        break;
+    case Attributes::SampledPosition::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, sampledPosition));
+        break;
+    case Attributes::PlaybackSpeed::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, playbackSpeed));
+        break;
+    case Attributes::SeekRangeEnd::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, seekRangeEnd));
+        break;
+    case Attributes::SeekRangeStart::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, seekRangeStart));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace MediaPlayback
+namespace MediaInput {
+namespace Structs {
+namespace InputInfo {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection0)), section0));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection1)), section1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection2)), section2));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection3)), section3));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection4)), section4));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection5)), section5));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection6)), section6));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection7)), section7));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection8)), section8));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection9)), section9));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection10)), section10));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection11)), section11));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection12)), section12));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection13)), section13));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection14)), section14));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSection15)), section15));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kInputType)), inputType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDescription)), description));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20438,7 +20017,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20447,53 +20027,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kSection0):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section0));
-            break;
-        case to_underlying(Fields::kSection1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section1));
-            break;
-        case to_underlying(Fields::kSection2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section2));
-            break;
-        case to_underlying(Fields::kSection3):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section3));
-            break;
-        case to_underlying(Fields::kSection4):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section4));
-            break;
-        case to_underlying(Fields::kSection5):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section5));
-            break;
-        case to_underlying(Fields::kSection6):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section6));
-            break;
-        case to_underlying(Fields::kSection7):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section7));
-            break;
-        case to_underlying(Fields::kSection8):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section8));
-            break;
-        case to_underlying(Fields::kSection9):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section9));
-            break;
-        case to_underlying(Fields::kSection10):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section10));
-            break;
-        case to_underlying(Fields::kSection11):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section11));
-            break;
-        case to_underlying(Fields::kSection12):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section12));
+        case to_underlying(Fields::kIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, index));
             break;
-        case to_underlying(Fields::kSection13):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section13));
+        case to_underlying(Fields::kInputType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, inputType));
             break;
-        case to_underlying(Fields::kSection14):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section14));
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
             break;
-        case to_underlying(Fields::kSection15):
-            ReturnErrorOnFailure(DataModel::Decode(reader, section15));
+        case to_underlying(Fields::kDescription):
+            ReturnErrorOnFailure(DataModel::Decode(reader, description));
             break;
         default:
             break;
@@ -20502,14 +20046,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace GetZoneIdMapResponse.
-namespace Emergency {
+
+} // namespace InputInfo
+} // namespace Structs
+
+namespace Commands {
+namespace SelectInput {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20528,6 +20078,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, index));
+            break;
         default:
             break;
         }
@@ -20537,16 +20090,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Emergency.
-namespace GetZoneInformationResponse {
+} // namespace SelectInput.
+namespace ShowInputStatus {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneType)), zoneType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIeeeAddress)), ieeeAddress));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneLabel)), zoneLabel));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20565,18 +20114,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
-            break;
-        case to_underlying(Fields::kZoneType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneType));
-            break;
-        case to_underlying(Fields::kIeeeAddress):
-            ReturnErrorOnFailure(DataModel::Decode(reader, ieeeAddress));
-            break;
-        case to_underlying(Fields::kZoneLabel):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneLabel));
-            break;
         default:
             break;
         }
@@ -20586,8 +20123,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetZoneInformationResponse.
-namespace Fire {
+} // namespace ShowInputStatus.
+namespace HideInputStatus {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -20619,17 +20156,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Fire.
-namespace ZoneStatusChanged {
+} // namespace HideInputStatus.
+namespace RenameInput {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatus)), zoneStatus));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAudibleNotification)), audibleNotification));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneLabel)), zoneLabel));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20648,17 +20182,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
-            break;
-        case to_underlying(Fields::kZoneStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatus));
-            break;
-        case to_underlying(Fields::kAudibleNotification):
-            ReturnErrorOnFailure(DataModel::Decode(reader, audibleNotification));
+        case to_underlying(Fields::kIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, index));
             break;
-        case to_underlying(Fields::kZoneLabel):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneLabel));
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
             break;
         default:
             break;
@@ -20669,8 +20197,51 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ZoneStatusChanged.
-namespace Panic {
+} // namespace RenameInput.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::InputList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, inputList));
+        break;
+    case Attributes::CurrentInput::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentInput));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace MediaInput
+namespace LowPower {
+
+namespace Commands {
+namespace Sleep {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -20702,24 +20273,57 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Panic.
-namespace PanelStatusChanged {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPanelStatus)), panelStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSecondsRemaining)), secondsRemaining));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAudibleNotification)), audibleNotification));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlarmStatus)), alarmStatus));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace Sleep.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    switch (path.mAttributeId)
+    {
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace LowPower
+namespace KeypadInput {
+
+namespace Commands {
+namespace SendKey {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kKeyCode)), keyCode));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
     ReturnErrorOnFailure(reader.EnterContainer(outer));
@@ -20731,17 +20335,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPanelStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, panelStatus));
-            break;
-        case to_underlying(Fields::kSecondsRemaining):
-            ReturnErrorOnFailure(DataModel::Decode(reader, secondsRemaining));
-            break;
-        case to_underlying(Fields::kAudibleNotification):
-            ReturnErrorOnFailure(DataModel::Decode(reader, audibleNotification));
-            break;
-        case to_underlying(Fields::kAlarmStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alarmStatus));
+        case to_underlying(Fields::kKeyCode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, keyCode));
             break;
         default:
             break;
@@ -20752,12 +20347,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace PanelStatusChanged.
-namespace GetZoneIdMap {
+} // namespace SendKey.
+namespace SendKeyResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20776,6 +20372,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
         default:
             break;
         }
@@ -20785,17 +20384,51 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetZoneIdMap.
-namespace GetPanelStatusResponse {
+} // namespace SendKeyResponse.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace KeypadInput
+namespace ContentLauncher {
+namespace Structs {
+namespace Dimension {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPanelStatus)), panelStatus));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSecondsRemaining)), secondsRemaining));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAudibleNotification)), audibleNotification));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlarmStatus)), alarmStatus));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWidth)), width));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHeight)), height));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMetric)), metric));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20805,7 +20438,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20814,17 +20448,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPanelStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, panelStatus));
-            break;
-        case to_underlying(Fields::kSecondsRemaining):
-            ReturnErrorOnFailure(DataModel::Decode(reader, secondsRemaining));
+        case to_underlying(Fields::kWidth):
+            ReturnErrorOnFailure(DataModel::Decode(reader, width));
             break;
-        case to_underlying(Fields::kAudibleNotification):
-            ReturnErrorOnFailure(DataModel::Decode(reader, audibleNotification));
+        case to_underlying(Fields::kHeight):
+            ReturnErrorOnFailure(DataModel::Decode(reader, height));
             break;
-        case to_underlying(Fields::kAlarmStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alarmStatus));
+        case to_underlying(Fields::kMetric):
+            ReturnErrorOnFailure(DataModel::Decode(reader, metric));
             break;
         default:
             break;
@@ -20833,15 +20464,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace GetPanelStatusResponse.
-namespace GetZoneInformation {
+
+} // namespace Dimension
+namespace AdditionalInfo {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneId)), zoneId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20851,7 +20485,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20860,8 +20495,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneId));
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+            break;
+        case to_underlying(Fields::kValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, value));
             break;
         default:
             break;
@@ -20870,16 +20508,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace GetZoneInformation.
-namespace SetBypassedZoneList {
+
+} // namespace AdditionalInfo
+namespace Parameter {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfZones)), numberOfZones));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneIds)), zoneIds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kType)), type));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kExternalIDList)), externalIDList));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20889,7 +20530,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20898,11 +20540,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kNumberOfZones):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfZones));
+        case to_underlying(Fields::kType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, type));
+            break;
+        case to_underlying(Fields::kValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, value));
             break;
-        case to_underlying(Fields::kZoneIds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneIds));
+        case to_underlying(Fields::kExternalIDList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, externalIDList));
             break;
         default:
             break;
@@ -20911,14 +20556,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace SetBypassedZoneList.
-namespace GetPanelStatus {
+
+} // namespace Parameter
+namespace ContentSearch {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kParameterList)), parameterList));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20928,7 +20576,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20937,6 +20586,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kParameterList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, parameterList));
+            break;
         default:
             break;
         }
@@ -20944,16 +20596,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace GetPanelStatus.
-namespace BypassResponse {
+
+} // namespace ContentSearch
+namespace StyleInformation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfZones)), numberOfZones));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kBypassResult)), bypassResult));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImageUrl)), imageUrl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColor)), color));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSize)), size));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -20963,7 +20618,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -20972,11 +20628,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kNumberOfZones):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfZones));
+        case to_underlying(Fields::kImageUrl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, imageUrl));
+            break;
+        case to_underlying(Fields::kColor):
+            ReturnErrorOnFailure(DataModel::Decode(reader, color));
             break;
-        case to_underlying(Fields::kBypassResult):
-            ReturnErrorOnFailure(DataModel::Decode(reader, bypassResult));
+        case to_underlying(Fields::kSize):
+            ReturnErrorOnFailure(DataModel::Decode(reader, size));
             break;
         default:
             break;
@@ -20985,14 +20644,22 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace BypassResponse.
-namespace GetBypassedZoneList {
+
+} // namespace StyleInformation
+namespace BrandingInformation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProviderName)), providerName));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kBackground)), background));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogo)), logo));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProgressBar)), progressBar));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSplash)), splash));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWaterMark)), waterMark));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21002,7 +20669,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -21011,6 +20679,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kProviderName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, providerName));
+            break;
+        case to_underlying(Fields::kBackground):
+            ReturnErrorOnFailure(DataModel::Decode(reader, background));
+            break;
+        case to_underlying(Fields::kLogo):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logo));
+            break;
+        case to_underlying(Fields::kProgressBar):
+            ReturnErrorOnFailure(DataModel::Decode(reader, progressBar));
+            break;
+        case to_underlying(Fields::kSplash):
+            ReturnErrorOnFailure(DataModel::Decode(reader, splash));
+            break;
+        case to_underlying(Fields::kWaterMark):
+            ReturnErrorOnFailure(DataModel::Decode(reader, waterMark));
+            break;
         default:
             break;
         }
@@ -21018,18 +20704,22 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace GetBypassedZoneList.
-namespace GetZoneStatusResponse {
+
+} // namespace BrandingInformation
+} // namespace Structs
+
+namespace Commands {
+namespace LaunchContent {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatusComplete)), zoneStatusComplete));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfZones)), numberOfZones));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatusResult)), zoneStatusResult));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSearch)), search));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAutoPlay)), autoPlay));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21048,14 +20738,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kZoneStatusComplete):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatusComplete));
+        case to_underlying(Fields::kSearch):
+            ReturnErrorOnFailure(DataModel::Decode(reader, search));
             break;
-        case to_underlying(Fields::kNumberOfZones):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfZones));
+        case to_underlying(Fields::kAutoPlay):
+            ReturnErrorOnFailure(DataModel::Decode(reader, autoPlay));
             break;
-        case to_underlying(Fields::kZoneStatusResult):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatusResult));
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
             break;
         default:
             break;
@@ -21066,18 +20756,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetZoneStatusResponse.
-namespace GetZoneStatus {
+} // namespace LaunchContent.
+namespace LaunchURL {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartingZoneId)), startingZoneId));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMaxNumberOfZoneIds)), maxNumberOfZoneIds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kContentURL)), contentURL));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDisplayString)), displayString));
     ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatusMaskFlag)), zoneStatusMaskFlag));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kZoneStatusMask)), zoneStatusMask));
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kBrandingInformation)), brandingInformation));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21096,17 +20784,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStartingZoneId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startingZoneId));
-            break;
-        case to_underlying(Fields::kMaxNumberOfZoneIds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, maxNumberOfZoneIds));
+        case to_underlying(Fields::kContentURL):
+            ReturnErrorOnFailure(DataModel::Decode(reader, contentURL));
             break;
-        case to_underlying(Fields::kZoneStatusMaskFlag):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatusMaskFlag));
+        case to_underlying(Fields::kDisplayString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, displayString));
             break;
-        case to_underlying(Fields::kZoneStatusMask):
-            ReturnErrorOnFailure(DataModel::Decode(reader, zoneStatusMask));
+        case to_underlying(Fields::kBrandingInformation):
+            ReturnErrorOnFailure(DataModel::Decode(reader, brandingInformation));
             break;
         default:
             break;
@@ -21117,21 +20802,68 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetZoneStatus.
-} // namespace Commands
+} // namespace LaunchURL.
+namespace LaunchResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace LaunchResponse.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::AcceptHeader::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptHeader));
+        break;
+    case Attributes::SupportedStreamingProtocols::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, supportedStreamingProtocols));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
         break;
     case Attributes::FeatureMap::TypeInfo::GetAttributeId():
@@ -21151,19 +20883,17 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace IasAce
-namespace IasWd {
-
-namespace Commands {
-namespace StartWarning {
+} // namespace ContentLauncher
+namespace AudioOutput {
+namespace Structs {
+namespace OutputInfo {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWarningInfo)), warningInfo));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWarningDuration)), warningDuration));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStrobeDutyCycle)), strobeDutyCycle));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStrobeLevel)), strobeLevel));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOutputType)), outputType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21173,7 +20903,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -21182,17 +20913,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kWarningInfo):
-            ReturnErrorOnFailure(DataModel::Decode(reader, warningInfo));
-            break;
-        case to_underlying(Fields::kWarningDuration):
-            ReturnErrorOnFailure(DataModel::Decode(reader, warningDuration));
+        case to_underlying(Fields::kIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, index));
             break;
-        case to_underlying(Fields::kStrobeDutyCycle):
-            ReturnErrorOnFailure(DataModel::Decode(reader, strobeDutyCycle));
+        case to_underlying(Fields::kOutputType):
+            ReturnErrorOnFailure(DataModel::Decode(reader, outputType));
             break;
-        case to_underlying(Fields::kStrobeLevel):
-            ReturnErrorOnFailure(DataModel::Decode(reader, strobeLevel));
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
             break;
         default:
             break;
@@ -21201,15 +20929,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
+
     return CHIP_NO_ERROR;
 }
-} // namespace StartWarning.
-namespace Squawk {
+
+} // namespace OutputInfo
+} // namespace Structs
+
+namespace Commands {
+namespace SelectOutput {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSquawkInfo)), squawkInfo));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21228,8 +20961,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kSquawkInfo):
-            ReturnErrorOnFailure(DataModel::Decode(reader, squawkInfo));
+        case to_underlying(Fields::kIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, index));
             break;
         default:
             break;
@@ -21240,47 +20973,48 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Squawk.
-} // namespace Commands
+} // namespace SelectOutput.
+namespace RenameOutput {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
 
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 {
-    switch (path.mAttributeId)
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
-    case Attributes::MaxDuration::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, maxDuration));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, index));
+            break;
+        case to_underlying(Fields::kName):
+            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace IasWd
-namespace WakeOnLan {
-
-namespace Commands {
+} // namespace RenameOutput.
 } // namespace Commands
 
 namespace Attributes {
@@ -21288,8 +21022,11 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::MACAddress::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, MACAddress));
+    case Attributes::OutputList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, outputList));
+        break;
+    case Attributes::CurrentOutput::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentOutput));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -21317,19 +21054,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace WakeOnLan
-namespace Channel {
+} // namespace AudioOutput
+namespace ApplicationLauncher {
 namespace Structs {
-namespace ChannelInfo {
+namespace Application {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMajorNumber)), majorNumber));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMinorNumber)), minorNumber));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCallSign)), callSign));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAffiliateCallSign)), affiliateCallSign));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCatalogVendorId)), catalogVendorId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplicationId)), applicationId));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21349,20 +21083,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMajorNumber):
-            ReturnErrorOnFailure(DataModel::Decode(reader, majorNumber));
-            break;
-        case to_underlying(Fields::kMinorNumber):
-            ReturnErrorOnFailure(DataModel::Decode(reader, minorNumber));
-            break;
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
-            break;
-        case to_underlying(Fields::kCallSign):
-            ReturnErrorOnFailure(DataModel::Decode(reader, callSign));
+        case to_underlying(Fields::kCatalogVendorId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, catalogVendorId));
             break;
-        case to_underlying(Fields::kAffiliateCallSign):
-            ReturnErrorOnFailure(DataModel::Decode(reader, affiliateCallSign));
+        case to_underlying(Fields::kApplicationId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, applicationId));
             break;
         default:
             break;
@@ -21375,16 +21100,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace ChannelInfo
-namespace LineupInfo {
+} // namespace Application
+namespace ApplicationEP {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatorName)), operatorName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLineupName)), lineupName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPostalCode)), postalCode));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLineupInfoType)), lineupInfoType));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoint)), endpoint));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21404,17 +21127,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kOperatorName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operatorName));
-            break;
-        case to_underlying(Fields::kLineupName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lineupName));
-            break;
-        case to_underlying(Fields::kPostalCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, postalCode));
+        case to_underlying(Fields::kApplication):
+            ReturnErrorOnFailure(DataModel::Decode(reader, application));
             break;
-        case to_underlying(Fields::kLineupInfoType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, lineupInfoType));
+        case to_underlying(Fields::kEndpoint):
+            ReturnErrorOnFailure(DataModel::Decode(reader, endpoint));
             break;
         default:
             break;
@@ -21427,16 +21144,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace LineupInfo
+} // namespace ApplicationEP
 } // namespace Structs
 
 namespace Commands {
-namespace ChangeChannel {
+namespace LaunchApp {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMatch)), match));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21455,8 +21173,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMatch):
-            ReturnErrorOnFailure(DataModel::Decode(reader, match));
+        case to_underlying(Fields::kApplication):
+            ReturnErrorOnFailure(DataModel::Decode(reader, application));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
             break;
         default:
             break;
@@ -21467,14 +21188,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ChangeChannel.
-namespace ChangeChannelResponse {
+} // namespace LaunchApp.
+namespace StopApp {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21493,11 +21213,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+        case to_underlying(Fields::kApplication):
+            ReturnErrorOnFailure(DataModel::Decode(reader, application));
             break;
         default:
             break;
@@ -21508,14 +21225,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ChangeChannelResponse.
-namespace ChangeChannelByNumber {
+} // namespace StopApp.
+namespace HideApp {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMajorNumber)), majorNumber));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMinorNumber)), minorNumber));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21534,11 +21250,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMajorNumber):
-            ReturnErrorOnFailure(DataModel::Decode(reader, majorNumber));
-            break;
-        case to_underlying(Fields::kMinorNumber):
-            ReturnErrorOnFailure(DataModel::Decode(reader, minorNumber));
+        case to_underlying(Fields::kApplication):
+            ReturnErrorOnFailure(DataModel::Decode(reader, application));
             break;
         default:
             break;
@@ -21549,13 +21262,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ChangeChannelByNumber.
-namespace SkipChannel {
+} // namespace HideApp.
+namespace LauncherResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCount)), count));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21574,8 +21288,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kCount):
-            ReturnErrorOnFailure(DataModel::Decode(reader, count));
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+            break;
+        case to_underlying(Fields::kData):
+            ReturnErrorOnFailure(DataModel::Decode(reader, data));
             break;
         default:
             break;
@@ -21586,7 +21303,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SkipChannel.
+} // namespace LauncherResponse.
 } // namespace Commands
 
 namespace Attributes {
@@ -21594,14 +21311,11 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::ChannelList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, channelList));
-        break;
-    case Attributes::Lineup::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lineup));
+    case Attributes::CatalogList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, catalogList));
         break;
-    case Attributes::CurrentChannel::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentChannel));
+    case Attributes::CurrentApp::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentApp));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -21629,16 +21343,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace Channel
-namespace TargetNavigator {
+} // namespace ApplicationLauncher
+namespace ApplicationBasic {
 namespace Structs {
-namespace TargetInfo {
+namespace ApplicationBasicApplication {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIdentifier)), identifier));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCatalogVendorId)), catalogVendorId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplicationId)), applicationId));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21658,11 +21372,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kIdentifier):
-            ReturnErrorOnFailure(DataModel::Decode(reader, identifier));
+        case to_underlying(Fields::kCatalogVendorId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, catalogVendorId));
             break;
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+        case to_underlying(Fields::kApplicationId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, applicationId));
             break;
         default:
             break;
@@ -21675,17 +21389,78 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace TargetInfo
+} // namespace ApplicationBasicApplication
 } // namespace Structs
 
 namespace Commands {
-namespace NavigateTarget {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::VendorName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, vendorName));
+        break;
+    case Attributes::VendorID::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, vendorID));
+        break;
+    case Attributes::ApplicationName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, applicationName));
+        break;
+    case Attributes::ProductID::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, productID));
+        break;
+    case Attributes::Application::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, application));
+        break;
+    case Attributes::Status::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, status));
+        break;
+    case Attributes::ApplicationVersion::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, applicationVersion));
+        break;
+    case Attributes::AllowedVendorList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, allowedVendorList));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace ApplicationBasic
+namespace AccountLogin {
+
+namespace Commands {
+namespace GetSetupPIN {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTarget)), target));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTempAccountIdentifier)), tempAccountIdentifier));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21704,11 +21479,45 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTarget):
-            ReturnErrorOnFailure(DataModel::Decode(reader, target));
+        case to_underlying(Fields::kTempAccountIdentifier):
+            ReturnErrorOnFailure(DataModel::Decode(reader, tempAccountIdentifier));
             break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace GetSetupPIN.
+namespace GetSetupPINResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSetupPIN)), setupPIN));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kSetupPIN):
+            ReturnErrorOnFailure(DataModel::Decode(reader, setupPIN));
             break;
         default:
             break;
@@ -21719,14 +21528,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace NavigateTarget.
-namespace NavigateTargetResponse {
+} // namespace GetSetupPINResponse.
+namespace Login {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTempAccountIdentifier)), tempAccountIdentifier));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSetupPIN)), setupPIN));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21745,11 +21555,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+        case to_underlying(Fields::kTempAccountIdentifier):
+            ReturnErrorOnFailure(DataModel::Decode(reader, tempAccountIdentifier));
             break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+        case to_underlying(Fields::kSetupPIN):
+            ReturnErrorOnFailure(DataModel::Decode(reader, setupPIN));
             break;
         default:
             break;
@@ -21760,7 +21570,40 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace NavigateTargetResponse.
+} // namespace Login.
+namespace Logout {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace Logout.
 } // namespace Commands
 
 namespace Attributes {
@@ -21768,12 +21611,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::TargetList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, targetList));
-        break;
-    case Attributes::CurrentTarget::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentTarget));
-        break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
@@ -21800,16 +21637,22 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace TargetNavigator
-namespace MediaPlayback {
-namespace Structs {
-namespace PlaybackPosition {
+} // namespace AccountLogin
+namespace Messaging {
+
+namespace Commands {
+namespace DisplayMessage {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUpdatedAt)), updatedAt));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPosition)), position));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDurationInMinutes)), durationInMinutes));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessage)), message));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalExtendedMessageControl)),
+                                           optionalExtendedMessageControl));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21819,8 +21662,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -21829,11 +21671,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kUpdatedAt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, updatedAt));
+        case to_underlying(Fields::kMessageId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
             break;
-        case to_underlying(Fields::kPosition):
-            ReturnErrorOnFailure(DataModel::Decode(reader, position));
+        case to_underlying(Fields::kMessageControl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageControl));
+            break;
+        case to_underlying(Fields::kStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
+            break;
+        case to_underlying(Fields::kDurationInMinutes):
+            ReturnErrorOnFailure(DataModel::Decode(reader, durationInMinutes));
+            break;
+        case to_underlying(Fields::kMessage):
+            ReturnErrorOnFailure(DataModel::Decode(reader, message));
+            break;
+        case to_underlying(Fields::kOptionalExtendedMessageControl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalExtendedMessageControl));
             break;
         default:
             break;
@@ -21842,15 +21696,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
-
     return CHIP_NO_ERROR;
 }
-
-} // namespace PlaybackPosition
-} // namespace Structs
-
-namespace Commands {
-namespace Play {
+} // namespace DisplayMessage.
+namespace GetLastMessage {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -21882,12 +21731,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Play.
-namespace Pause {
+} // namespace GetLastMessage.
+namespace CancelMessage {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21906,7 +21757,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        default:
+        case to_underlying(Fields::kMessageId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
+            break;
+        case to_underlying(Fields::kMessageControl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageControl));
+            break;
+        default:
             break;
         }
     }
@@ -21915,12 +21772,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Pause.
-namespace StopPlayback {
+} // namespace CancelMessage.
+namespace MessageConfirmation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kConfirmationTime)), confirmationTime));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageConfirmationControl)), messageConfirmationControl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageResponse)), messageResponse));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21939,6 +21801,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kMessageId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
+            break;
+        case to_underlying(Fields::kConfirmationTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, confirmationTime));
+            break;
+        case to_underlying(Fields::kMessageConfirmationControl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageConfirmationControl));
+            break;
+        case to_underlying(Fields::kMessageResponse):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageResponse));
+            break;
         default:
             break;
         }
@@ -21948,12 +21822,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace StopPlayback.
-namespace StartOver {
+} // namespace MessageConfirmation.
+namespace DisplayProtectedMessage {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDurationInMinutes)), durationInMinutes));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessage)), message));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalExtendedMessageControl)),
+                                           optionalExtendedMessageControl));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -21972,6 +21853,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kMessageId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
+            break;
+        case to_underlying(Fields::kMessageControl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, messageControl));
+            break;
+        case to_underlying(Fields::kStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
+            break;
+        case to_underlying(Fields::kDurationInMinutes):
+            ReturnErrorOnFailure(DataModel::Decode(reader, durationInMinutes));
+            break;
+        case to_underlying(Fields::kMessage):
+            ReturnErrorOnFailure(DataModel::Decode(reader, message));
+            break;
+        case to_underlying(Fields::kOptionalExtendedMessageControl):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalExtendedMessageControl));
+            break;
         default:
             break;
         }
@@ -21981,12 +21880,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace StartOver.
-namespace Previous {
+} // namespace DisplayProtectedMessage.
+namespace GetMessageCancellation {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEarliestImplementationTime)), earliestImplementationTime));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22005,6 +21906,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kEarliestImplementationTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, earliestImplementationTime));
+            break;
         default:
             break;
         }
@@ -22014,12 +21918,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Previous.
-namespace Next {
+} // namespace GetMessageCancellation.
+namespace CancelAllMessages {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImplementationDateTime)), implementationDateTime));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22038,6 +21944,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kImplementationDateTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, implementationDateTime));
+            break;
         default:
             break;
         }
@@ -22047,118 +21956,230 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Next.
-namespace Rewind {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
+} // namespace CancelAllMessages.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace Rewind.
-namespace FastForward {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace Messaging
+namespace ApplianceIdentification {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
+    case Attributes::BasicIdentification::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, basicIdentification));
+        break;
+    case Attributes::CompanyName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, companyName));
+        break;
+    case Attributes::CompanyId::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, companyId));
+        break;
+    case Attributes::BrandName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, brandName));
+        break;
+    case Attributes::BrandId::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, brandId));
+        break;
+    case Attributes::Model::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, model));
+        break;
+    case Attributes::PartNumber::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, partNumber));
+        break;
+    case Attributes::ProductRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, productRevision));
+        break;
+    case Attributes::SoftwareRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, softwareRevision));
+        break;
+    case Attributes::ProductTypeName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, productTypeName));
+        break;
+    case Attributes::ProductTypeId::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, productTypeId));
+        break;
+    case Attributes::CecedSpecificationVersion::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, cecedSpecificationVersion));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace FastForward.
-namespace SkipForward {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDeltaPositionMilliseconds)), deltaPositionMilliseconds));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace Attributes
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Events {
+} // namespace Events
+
+} // namespace ApplianceIdentification
+namespace MeterIdentification {
+
+namespace Commands {
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kDeltaPositionMilliseconds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, deltaPositionMilliseconds));
-            break;
-        default:
-            break;
-        }
-    }
+    case Attributes::CompanyName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, companyName));
+        break;
+    case Attributes::MeterTypeId::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, meterTypeId));
+        break;
+    case Attributes::DataQualityId::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dataQualityId));
+        break;
+    case Attributes::CustomerName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, customerName));
+        break;
+    case Attributes::Model::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, model));
+        break;
+    case Attributes::PartNumber::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, partNumber));
+        break;
+    case Attributes::ProductRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, productRevision));
+        break;
+    case Attributes::SoftwareRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, softwareRevision));
+        break;
+    case Attributes::UtilityName::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, utilityName));
+        break;
+    case Attributes::Pod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, pod));
+        break;
+    case Attributes::AvailablePower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, availablePower));
+        break;
+    case Attributes::PowerThreshold::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerThreshold));
+        break;
+    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+        break;
+    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+        break;
+    case Attributes::AttributeList::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+        break;
+    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+        break;
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+        break;
+    default:
+        break;
+    }
+
+    return CHIP_NO_ERROR;
+}
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace MeterIdentification
+namespace ApplianceEventsAndAlert {
+
+namespace Commands {
+namespace GetAlerts {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
+    }
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SkipForward.
-namespace SkipBackward {
+} // namespace GetAlerts.
+namespace GetAlertsResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDeltaPositionMilliseconds)), deltaPositionMilliseconds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertsCount)), alertsCount));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertStructures)), alertStructures));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22177,8 +22198,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kDeltaPositionMilliseconds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, deltaPositionMilliseconds));
+        case to_underlying(Fields::kAlertsCount):
+            ReturnErrorOnFailure(DataModel::Decode(reader, alertsCount));
+            break;
+        case to_underlying(Fields::kAlertStructures):
+            ReturnErrorOnFailure(DataModel::Decode(reader, alertStructures));
             break;
         default:
             break;
@@ -22189,14 +22213,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SkipBackward.
-namespace PlaybackResponse {
+} // namespace GetAlertsResponse.
+namespace AlertsNotification {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertsCount)), alertsCount));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertStructures)), alertStructures));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22215,11 +22239,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
+        case to_underlying(Fields::kAlertsCount):
+            ReturnErrorOnFailure(DataModel::Decode(reader, alertsCount));
             break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
+        case to_underlying(Fields::kAlertStructures):
+            ReturnErrorOnFailure(DataModel::Decode(reader, alertStructures));
             break;
         default:
             break;
@@ -22230,13 +22254,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace PlaybackResponse.
-namespace Seek {
+} // namespace AlertsNotification.
+namespace EventsNotification {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPosition)), position));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventHeader)), eventHeader));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventId)), eventId));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22255,8 +22280,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPosition):
-            ReturnErrorOnFailure(DataModel::Decode(reader, position));
+        case to_underlying(Fields::kEventHeader):
+            ReturnErrorOnFailure(DataModel::Decode(reader, eventHeader));
+            break;
+        case to_underlying(Fields::kEventId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, eventId));
             break;
         default:
             break;
@@ -22267,7 +22295,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Seek.
+} // namespace EventsNotification.
 } // namespace Commands
 
 namespace Attributes {
@@ -22275,27 +22303,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::CurrentState::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentState));
-        break;
-    case Attributes::StartTime::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
-        break;
-    case Attributes::Duration::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, duration));
-        break;
-    case Attributes::SampledPosition::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, sampledPosition));
-        break;
-    case Attributes::PlaybackSpeed::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, playbackSpeed));
-        break;
-    case Attributes::SeekRangeEnd::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, seekRangeEnd));
-        break;
-    case Attributes::SeekRangeStart::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, seekRangeStart));
-        break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
@@ -22322,18 +22329,19 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace MediaPlayback
-namespace MediaInput {
-namespace Structs {
-namespace InputInfo {
+} // namespace ApplianceEventsAndAlert
+namespace ApplianceStatistics {
+
+namespace Commands {
+namespace LogNotification {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kInputType)), inputType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDescription)), description));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeStamp)), timeStamp));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogId)), logId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogLength)), logLength));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogPayload)), logPayload));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22343,8 +22351,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -22353,17 +22360,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, index));
+        case to_underlying(Fields::kTimeStamp):
+            ReturnErrorOnFailure(DataModel::Decode(reader, timeStamp));
             break;
-        case to_underlying(Fields::kInputType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, inputType));
+        case to_underlying(Fields::kLogId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logId));
             break;
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+        case to_underlying(Fields::kLogLength):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logLength));
             break;
-        case to_underlying(Fields::kDescription):
-            ReturnErrorOnFailure(DataModel::Decode(reader, description));
+        case to_underlying(Fields::kLogPayload):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logPayload));
             break;
         default:
             break;
@@ -22372,20 +22379,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
-
     return CHIP_NO_ERROR;
 }
-
-} // namespace InputInfo
-} // namespace Structs
-
-namespace Commands {
-namespace SelectInput {
+} // namespace LogNotification.
+namespace LogRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogId)), logId));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22404,8 +22406,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, index));
+        case to_underlying(Fields::kLogId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logId));
             break;
         default:
             break;
@@ -22416,12 +22418,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SelectInput.
-namespace ShowInputStatus {
+} // namespace LogRequest.
+namespace LogResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeStamp)), timeStamp));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogId)), logId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogLength)), logLength));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogPayload)), logPayload));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22440,6 +22446,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kTimeStamp):
+            ReturnErrorOnFailure(DataModel::Decode(reader, timeStamp));
+            break;
+        case to_underlying(Fields::kLogId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logId));
+            break;
+        case to_underlying(Fields::kLogLength):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logLength));
+            break;
+        case to_underlying(Fields::kLogPayload):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logPayload));
+            break;
         default:
             break;
         }
@@ -22449,8 +22467,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace ShowInputStatus.
-namespace HideInputStatus {
+} // namespace LogResponse.
+namespace LogQueueRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -22482,14 +22500,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace HideInputStatus.
-namespace RenameInput {
+} // namespace LogQueueRequest.
+namespace LogQueueResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogQueueSize)), logQueueSize));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogIds)), logIds));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22508,11 +22526,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, index));
+        case to_underlying(Fields::kLogQueueSize):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logQueueSize));
             break;
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+        case to_underlying(Fields::kLogIds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logIds));
             break;
         default:
             break;
@@ -22523,55 +22541,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace RenameInput.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::InputList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, inputList));
-        break;
-    case Attributes::CurrentInput::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentInput));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace MediaInput
-namespace LowPower {
-
-namespace Commands {
-namespace Sleep {
+} // namespace LogQueueResponse.
+namespace StatisticsAvailable {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogQueueSize)), logQueueSize));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogIds)), logIds));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22590,6 +22567,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kLogQueueSize):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logQueueSize));
+            break;
+        case to_underlying(Fields::kLogIds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, logIds));
+            break;
         default:
             break;
         }
@@ -22599,7 +22582,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Sleep.
+} // namespace StatisticsAvailable.
 } // namespace Commands
 
 namespace Attributes {
@@ -22607,6 +22590,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
+    case Attributes::LogMaxSize::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, logMaxSize));
+        break;
+    case Attributes::LogQueueMaxSize::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, logQueueMaxSize));
+        break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
         break;
@@ -22633,16 +22622,21 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 namespace Events {
 } // namespace Events
 
-} // namespace LowPower
-namespace KeypadInput {
+} // namespace ApplianceStatistics
+namespace ElectricalMeasurement {
 
 namespace Commands {
-namespace SendKey {
+namespace GetProfileInfoResponseCommand {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kKeyCode)), keyCode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProfileCount)), profileCount));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProfileIntervalPeriod)), profileIntervalPeriod));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMaxNumberOfIntervals)), maxNumberOfIntervals));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kListOfAttributes)), listOfAttributes));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22661,8 +22655,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kKeyCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, keyCode));
+        case to_underlying(Fields::kProfileCount):
+            ReturnErrorOnFailure(DataModel::Decode(reader, profileCount));
+            break;
+        case to_underlying(Fields::kProfileIntervalPeriod):
+            ReturnErrorOnFailure(DataModel::Decode(reader, profileIntervalPeriod));
+            break;
+        case to_underlying(Fields::kMaxNumberOfIntervals):
+            ReturnErrorOnFailure(DataModel::Decode(reader, maxNumberOfIntervals));
+            break;
+        case to_underlying(Fields::kListOfAttributes):
+            ReturnErrorOnFailure(DataModel::Decode(reader, listOfAttributes));
             break;
         default:
             break;
@@ -22673,13 +22676,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SendKey.
-namespace SendKeyResponse {
+} // namespace GetProfileInfoResponseCommand.
+namespace GetProfileInfoCommand {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22698,9 +22700,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
         default:
             break;
         }
@@ -22710,51 +22709,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace SendKeyResponse.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace KeypadInput
-namespace ContentLauncher {
-namespace Structs {
-namespace Dimension {
+} // namespace GetProfileInfoCommand.
+namespace GetMeasurementProfileResponseCommand {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWidth)), width));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHeight)), height));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMetric)), metric));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProfileIntervalPeriod)), profileIntervalPeriod));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfIntervalsDelivered)), numberOfIntervalsDelivered));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeId)), attributeId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIntervals)), intervals));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22764,8 +22732,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -22774,58 +22741,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kWidth):
-            ReturnErrorOnFailure(DataModel::Decode(reader, width));
+        case to_underlying(Fields::kStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
             break;
-        case to_underlying(Fields::kHeight):
-            ReturnErrorOnFailure(DataModel::Decode(reader, height));
+        case to_underlying(Fields::kStatus):
+            ReturnErrorOnFailure(DataModel::Decode(reader, status));
             break;
-        case to_underlying(Fields::kMetric):
-            ReturnErrorOnFailure(DataModel::Decode(reader, metric));
+        case to_underlying(Fields::kProfileIntervalPeriod):
+            ReturnErrorOnFailure(DataModel::Decode(reader, profileIntervalPeriod));
             break;
-        default:
+        case to_underlying(Fields::kNumberOfIntervalsDelivered):
+            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfIntervalsDelivered));
             break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace Dimension
-namespace AdditionalInfo {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
+        case to_underlying(Fields::kAttributeId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, attributeId));
             break;
-        case to_underlying(Fields::kValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, value));
+        case to_underlying(Fields::kIntervals):
+            ReturnErrorOnFailure(DataModel::Decode(reader, intervals));
             break;
         default:
             break;
@@ -22834,19 +22766,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
-
     return CHIP_NO_ERROR;
 }
-
-} // namespace AdditionalInfo
-namespace Parameter {
+} // namespace GetMeasurementProfileResponseCommand.
+namespace GetMeasurementProfileCommand {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kType)), type));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kExternalIDList)), externalIDList));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeId)), attributeId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfIntervals)), numberOfIntervals));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -22856,8 +22786,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     CHIP_ERROR err = CHIP_NO_ERROR;
     TLV::TLVType outer;
     VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
     while ((err = reader.Next()) == CHIP_NO_ERROR)
     {
         if (!TLV::IsContextTag(reader.GetTag()))
@@ -22866,14 +22795,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, type));
+        case to_underlying(Fields::kAttributeId):
+            ReturnErrorOnFailure(DataModel::Decode(reader, attributeId));
             break;
-        case to_underlying(Fields::kValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, value));
+        case to_underlying(Fields::kStartTime):
+            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
             break;
-        case to_underlying(Fields::kExternalIDList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, externalIDList));
+        case to_underlying(Fields::kNumberOfIntervals):
+            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfIntervals));
             break;
         default:
             break;
@@ -22882,3295 +22811,399 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 
     VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
     ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace Parameter
-namespace ContentSearch {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kParameterList)), parameterList));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
+} // namespace GetMeasurementProfileCommand.
+} // namespace Commands
 
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kParameterList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, parameterList));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace ContentSearch
-namespace StyleInformation {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImageUrl)), imageUrl));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColor)), color));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSize)), size));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kImageUrl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, imageUrl));
-            break;
-        case to_underlying(Fields::kColor):
-            ReturnErrorOnFailure(DataModel::Decode(reader, color));
-            break;
-        case to_underlying(Fields::kSize):
-            ReturnErrorOnFailure(DataModel::Decode(reader, size));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace StyleInformation
-namespace BrandingInformation {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProviderName)), providerName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kBackground)), background));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogo)), logo));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProgressBar)), progressBar));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSplash)), splash));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWaterMark)), waterMark));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kProviderName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, providerName));
-            break;
-        case to_underlying(Fields::kBackground):
-            ReturnErrorOnFailure(DataModel::Decode(reader, background));
-            break;
-        case to_underlying(Fields::kLogo):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logo));
-            break;
-        case to_underlying(Fields::kProgressBar):
-            ReturnErrorOnFailure(DataModel::Decode(reader, progressBar));
-            break;
-        case to_underlying(Fields::kSplash):
-            ReturnErrorOnFailure(DataModel::Decode(reader, splash));
-            break;
-        case to_underlying(Fields::kWaterMark):
-            ReturnErrorOnFailure(DataModel::Decode(reader, waterMark));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace BrandingInformation
-} // namespace Structs
-
-namespace Commands {
-namespace LaunchContent {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSearch)), search));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAutoPlay)), autoPlay));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kSearch):
-            ReturnErrorOnFailure(DataModel::Decode(reader, search));
-            break;
-        case to_underlying(Fields::kAutoPlay):
-            ReturnErrorOnFailure(DataModel::Decode(reader, autoPlay));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace LaunchContent.
-namespace LaunchURL {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kContentURL)), contentURL));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDisplayString)), displayString));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kBrandingInformation)), brandingInformation));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kContentURL):
-            ReturnErrorOnFailure(DataModel::Decode(reader, contentURL));
-            break;
-        case to_underlying(Fields::kDisplayString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, displayString));
-            break;
-        case to_underlying(Fields::kBrandingInformation):
-            ReturnErrorOnFailure(DataModel::Decode(reader, brandingInformation));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace LaunchURL.
-namespace LaunchResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    switch (path.mAttributeId)
     {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace LaunchResponse.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::AcceptHeader::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptHeader));
+    case Attributes::MeasurementType::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measurementType));
         break;
-    case Attributes::SupportedStreamingProtocols::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, supportedStreamingProtocols));
+    case Attributes::DcVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltage));
         break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+    case Attributes::DcVoltageMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageMin));
         break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+    case Attributes::DcVoltageMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageMax));
         break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+    case Attributes::DcCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrent));
         break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+    case Attributes::DcCurrentMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentMin));
         break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+    case Attributes::DcCurrentMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentMax));
         break;
-    default:
+    case Attributes::DcPower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcPower));
         break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ContentLauncher
-namespace AudioOutput {
-namespace Structs {
-namespace OutputInfo {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOutputType)), outputType));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, index));
-            break;
-        case to_underlying(Fields::kOutputType):
-            ReturnErrorOnFailure(DataModel::Decode(reader, outputType));
-            break;
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace OutputInfo
-} // namespace Structs
-
-namespace Commands {
-namespace SelectOutput {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, index));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace SelectOutput.
-namespace RenameOutput {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIndex)), index));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kName)), name));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, index));
-            break;
-        case to_underlying(Fields::kName):
-            ReturnErrorOnFailure(DataModel::Decode(reader, name));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace RenameOutput.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::OutputList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, outputList));
+    case Attributes::DcPowerMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerMin));
         break;
-    case Attributes::CurrentOutput::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentOutput));
+    case Attributes::DcPowerMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerMax));
         break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+    case Attributes::DcVoltageMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageMultiplier));
         break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+    case Attributes::DcVoltageDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageDivisor));
         break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+    case Attributes::DcCurrentMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentMultiplier));
         break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+    case Attributes::DcCurrentDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentDivisor));
         break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+    case Attributes::DcPowerMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerMultiplier));
         break;
-    default:
+    case Attributes::DcPowerDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerDivisor));
         break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace AudioOutput
-namespace ApplicationLauncher {
-namespace Structs {
-namespace Application {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCatalogVendorId)), catalogVendorId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplicationId)), applicationId));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kCatalogVendorId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, catalogVendorId));
-            break;
-        case to_underlying(Fields::kApplicationId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, applicationId));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace Application
-namespace ApplicationEP {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoint)), endpoint));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kApplication):
-            ReturnErrorOnFailure(DataModel::Decode(reader, application));
-            break;
-        case to_underlying(Fields::kEndpoint):
-            ReturnErrorOnFailure(DataModel::Decode(reader, endpoint));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace ApplicationEP
-} // namespace Structs
-
-namespace Commands {
-namespace LaunchApp {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kApplication):
-            ReturnErrorOnFailure(DataModel::Decode(reader, application));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace LaunchApp.
-namespace StopApp {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kApplication):
-            ReturnErrorOnFailure(DataModel::Decode(reader, application));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace StopApp.
-namespace HideApp {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplication)), application));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kApplication):
-            ReturnErrorOnFailure(DataModel::Decode(reader, application));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace HideApp.
-namespace LauncherResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kData):
-            ReturnErrorOnFailure(DataModel::Decode(reader, data));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace LauncherResponse.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::CatalogList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, catalogList));
+    case Attributes::AcFrequency::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequency));
         break;
-    case Attributes::CurrentApp::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentApp));
+    case Attributes::AcFrequencyMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyMin));
         break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+    case Attributes::AcFrequencyMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyMax));
         break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+    case Attributes::NeutralCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, neutralCurrent));
         break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+    case Attributes::TotalActivePower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, totalActivePower));
         break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+    case Attributes::TotalReactivePower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, totalReactivePower));
         break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+    case Attributes::TotalApparentPower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, totalApparentPower));
         break;
-    default:
+    case Attributes::Measured1stHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measured1stHarmonicCurrent));
         break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ApplicationLauncher
-namespace ApplicationBasic {
-namespace Structs {
-namespace ApplicationBasicApplication {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCatalogVendorId)), catalogVendorId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kApplicationId)), applicationId));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kCatalogVendorId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, catalogVendorId));
-            break;
-        case to_underlying(Fields::kApplicationId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, applicationId));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace ApplicationBasicApplication
-} // namespace Structs
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::VendorName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, vendorName));
+    case Attributes::Measured3rdHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measured3rdHarmonicCurrent));
         break;
-    case Attributes::VendorID::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, vendorID));
+    case Attributes::Measured5thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measured5thHarmonicCurrent));
         break;
-    case Attributes::ApplicationName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, applicationName));
+    case Attributes::Measured7thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measured7thHarmonicCurrent));
         break;
-    case Attributes::ProductID::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, productID));
+    case Attributes::Measured9thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measured9thHarmonicCurrent));
         break;
-    case Attributes::Application::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, application));
+    case Attributes::Measured11thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measured11thHarmonicCurrent));
         break;
-    case Attributes::Status::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, status));
+    case Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase1stHarmonicCurrent));
         break;
-    case Attributes::ApplicationVersion::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, applicationVersion));
+    case Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase3rdHarmonicCurrent));
         break;
-    case Attributes::AllowedVendorList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, allowedVendorList));
+    case Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase5thHarmonicCurrent));
         break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+    case Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase7thHarmonicCurrent));
         break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+    case Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase9thHarmonicCurrent));
         break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+    case Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase11thHarmonicCurrent));
         break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+    case Attributes::AcFrequencyMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyMultiplier));
         break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+    case Attributes::AcFrequencyDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyDivisor));
         break;
-    default:
+    case Attributes::PowerMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerMultiplier));
         break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ApplicationBasic
-namespace AccountLogin {
-
-namespace Commands {
-namespace GetSetupPIN {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTempAccountIdentifier)), tempAccountIdentifier));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kTempAccountIdentifier):
-            ReturnErrorOnFailure(DataModel::Decode(reader, tempAccountIdentifier));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetSetupPIN.
-namespace GetSetupPINResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSetupPIN)), setupPIN));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kSetupPIN):
-            ReturnErrorOnFailure(DataModel::Decode(reader, setupPIN));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetSetupPINResponse.
-namespace Login {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTempAccountIdentifier)), tempAccountIdentifier));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSetupPIN)), setupPIN));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kTempAccountIdentifier):
-            ReturnErrorOnFailure(DataModel::Decode(reader, tempAccountIdentifier));
-            break;
-        case to_underlying(Fields::kSetupPIN):
-            ReturnErrorOnFailure(DataModel::Decode(reader, setupPIN));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace Login.
-namespace Logout {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace Logout.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
+    case Attributes::PowerDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerDivisor));
         break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
+    case Attributes::HarmonicCurrentMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, harmonicCurrentMultiplier));
         break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
+    case Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, phaseHarmonicCurrentMultiplier));
         break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
+    case Attributes::InstantaneousVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousVoltage));
         break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
+    case Attributes::InstantaneousLineCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousLineCurrent));
         break;
-    default:
+    case Attributes::InstantaneousActiveCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousActiveCurrent));
         break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace AccountLogin
-namespace TestCluster {
-namespace Structs {
-namespace SimpleStruct {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kB)), b));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kC)), c));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kD)), d));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kE)), e));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kF)), f));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kG)), g));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kH)), h));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kA):
-            ReturnErrorOnFailure(DataModel::Decode(reader, a));
-            break;
-        case to_underlying(Fields::kB):
-            ReturnErrorOnFailure(DataModel::Decode(reader, b));
-            break;
-        case to_underlying(Fields::kC):
-            ReturnErrorOnFailure(DataModel::Decode(reader, c));
-            break;
-        case to_underlying(Fields::kD):
-            ReturnErrorOnFailure(DataModel::Decode(reader, d));
-            break;
-        case to_underlying(Fields::kE):
-            ReturnErrorOnFailure(DataModel::Decode(reader, e));
-            break;
-        case to_underlying(Fields::kF):
-            ReturnErrorOnFailure(DataModel::Decode(reader, f));
-            break;
-        case to_underlying(Fields::kG):
-            ReturnErrorOnFailure(DataModel::Decode(reader, g));
-            break;
-        case to_underlying(Fields::kH):
-            ReturnErrorOnFailure(DataModel::Decode(reader, h));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace SimpleStruct
-namespace TestFabricScoped {
-CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    return DoEncode(writer, tag, NullOptional);
-}
-
-CHIP_ERROR Type::EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex accessingFabricIndex) const
-{
-    return DoEncode(writer, tag, MakeOptional(accessingFabricIndex));
-}
-
-CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional<FabricIndex> & accessingFabricIndex) const
-{
-    bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == fabricIndex);
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(
-            DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveInt8u)), fabricSensitiveInt8u));
-    }
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalFabricSensitiveInt8u)),
-                                               optionalFabricSensitiveInt8u));
-    }
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableFabricSensitiveInt8u)),
-                                               nullableFabricSensitiveInt8u));
-    }
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(DataModel::Encode(writer,
-                                               TLV::ContextTag(to_underlying(Fields::kNullableOptionalFabricSensitiveInt8u)),
-                                               nullableOptionalFabricSensitiveInt8u));
-    }
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveCharString)),
-                                               fabricSensitiveCharString));
-    }
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(
-            DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveStruct)), fabricSensitiveStruct));
-    }
-    if (includeSensitive)
-    {
-        ReturnErrorOnFailure(
-            DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveInt8uList)), fabricSensitiveInt8uList));
-    }
-    if (accessingFabricIndex.HasValue())
-    {
-        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
-    }
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kFabricSensitiveInt8u):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveInt8u));
-            break;
-        case to_underlying(Fields::kOptionalFabricSensitiveInt8u):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalFabricSensitiveInt8u));
-            break;
-        case to_underlying(Fields::kNullableFabricSensitiveInt8u):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableFabricSensitiveInt8u));
-            break;
-        case to_underlying(Fields::kNullableOptionalFabricSensitiveInt8u):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalFabricSensitiveInt8u));
-            break;
-        case to_underlying(Fields::kFabricSensitiveCharString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveCharString));
-            break;
-        case to_underlying(Fields::kFabricSensitiveStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveStruct));
-            break;
-        case to_underlying(Fields::kFabricSensitiveInt8uList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveInt8uList));
-            break;
-        case to_underlying(Fields::kFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace TestFabricScoped
-namespace NullablesAndOptionalsStruct {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableInt)), nullableInt));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalInt)), optionalInt));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalInt)), nullableOptionalInt));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableString)), nullableString));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalString)), optionalString));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalString)), nullableOptionalString));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStruct)), nullableStruct));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStruct)), optionalStruct));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStruct)), nullableOptionalStruct));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableList)), nullableList));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalList)), optionalList));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalList)), nullableOptionalList));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kNullableInt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt));
-            break;
-        case to_underlying(Fields::kOptionalInt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalInt));
-            break;
-        case to_underlying(Fields::kNullableOptionalInt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalInt));
-            break;
-        case to_underlying(Fields::kNullableString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableString));
-            break;
-        case to_underlying(Fields::kOptionalString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalString));
-            break;
-        case to_underlying(Fields::kNullableOptionalString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalString));
-            break;
-        case to_underlying(Fields::kNullableStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStruct));
-            break;
-        case to_underlying(Fields::kOptionalStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStruct));
-            break;
-        case to_underlying(Fields::kNullableOptionalStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStruct));
-            break;
-        case to_underlying(Fields::kNullableList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableList));
-            break;
-        case to_underlying(Fields::kOptionalList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalList));
-            break;
-        case to_underlying(Fields::kNullableOptionalList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalList));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace NullablesAndOptionalsStruct
-namespace NestedStruct {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kB)), b));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kC)), c));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kA):
-            ReturnErrorOnFailure(DataModel::Decode(reader, a));
-            break;
-        case to_underlying(Fields::kB):
-            ReturnErrorOnFailure(DataModel::Decode(reader, b));
-            break;
-        case to_underlying(Fields::kC):
-            ReturnErrorOnFailure(DataModel::Decode(reader, c));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace NestedStruct
-namespace NestedStructList {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kB)), b));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kC)), c));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kD)), d));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kE)), e));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kF)), f));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kG)), g));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kA):
-            ReturnErrorOnFailure(DataModel::Decode(reader, a));
-            break;
-        case to_underlying(Fields::kB):
-            ReturnErrorOnFailure(DataModel::Decode(reader, b));
-            break;
-        case to_underlying(Fields::kC):
-            ReturnErrorOnFailure(DataModel::Decode(reader, c));
-            break;
-        case to_underlying(Fields::kD):
-            ReturnErrorOnFailure(DataModel::Decode(reader, d));
-            break;
-        case to_underlying(Fields::kE):
-            ReturnErrorOnFailure(DataModel::Decode(reader, e));
-            break;
-        case to_underlying(Fields::kF):
-            ReturnErrorOnFailure(DataModel::Decode(reader, f));
-            break;
-        case to_underlying(Fields::kG):
-            ReturnErrorOnFailure(DataModel::Decode(reader, g));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace NestedStructList
-namespace DoubleNestedStructList {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kA):
-            ReturnErrorOnFailure(DataModel::Decode(reader, a));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace DoubleNestedStructList
-namespace TestListStructOctet {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationalCert)), operationalCert));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    err = reader.EnterContainer(outer);
-    ReturnErrorOnFailure(err);
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kFabricIndex):
-            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
-            break;
-        case to_underlying(Fields::kOperationalCert):
-            ReturnErrorOnFailure(DataModel::Decode(reader, operationalCert));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace TestListStructOctet
-} // namespace Structs
-
-namespace Commands {
-namespace Test {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace Test.
-namespace TestSpecificResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kReturnValue)), returnValue));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kReturnValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, returnValue));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestSpecificResponse.
-namespace TestNotHandled {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestNotHandled.
-namespace TestAddArgumentsResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kReturnValue)), returnValue));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kReturnValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, returnValue));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestAddArgumentsResponse.
-namespace TestSpecific {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestSpecific.
-namespace TestSimpleArgumentResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kReturnValue)), returnValue));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kReturnValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, returnValue));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestSimpleArgumentResponse.
-namespace TestUnknownCommand {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestUnknownCommand.
-namespace TestStructArrayArgumentResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg4)), arg4));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg5)), arg5));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg6)), arg6));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        case to_underlying(Fields::kArg3):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
-            break;
-        case to_underlying(Fields::kArg4):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg4));
-            break;
-        case to_underlying(Fields::kArg5):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg5));
-            break;
-        case to_underlying(Fields::kArg6):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg6));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestStructArrayArgumentResponse.
-namespace TestAddArguments {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestAddArguments.
-namespace TestListInt8UReverseResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestListInt8UReverseResponse.
-namespace TestSimpleArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestSimpleArgumentRequest.
-namespace TestEnumsResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestEnumsResponse.
-namespace TestStructArrayArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg4)), arg4));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg5)), arg5));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg6)), arg6));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        case to_underlying(Fields::kArg3):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
-            break;
-        case to_underlying(Fields::kArg4):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg4));
-            break;
-        case to_underlying(Fields::kArg5):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg5));
-            break;
-        case to_underlying(Fields::kArg6):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg6));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestStructArrayArgumentRequest.
-namespace TestNullableOptionalResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWasPresent)), wasPresent));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWasNull)), wasNull));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOriginalValue)), originalValue));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, wasPresent));
-            break;
-        case to_underlying(Fields::kWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, wasNull));
-            break;
-        case to_underlying(Fields::kValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, value));
-            break;
-        case to_underlying(Fields::kOriginalValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, originalValue));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestNullableOptionalResponse.
-namespace TestStructArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestStructArgumentRequest.
-namespace TestComplexNullableOptionalResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableIntWasNull)), nullableIntWasNull));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableIntValue)), nullableIntValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalIntWasPresent)), optionalIntWasPresent));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalIntValue)), optionalIntValue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalIntWasPresent)),
-                                           nullableOptionalIntWasPresent));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalIntWasNull)), nullableOptionalIntWasNull));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalIntValue)), nullableOptionalIntValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStringWasNull)), nullableStringWasNull));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStringValue)), nullableStringValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStringWasPresent)), optionalStringWasPresent));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStringValue)), optionalStringValue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStringWasPresent)),
-                                           nullableOptionalStringWasPresent));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStringWasNull)),
-                                           nullableOptionalStringWasNull));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStringValue)),
-                                           nullableOptionalStringValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStructWasNull)), nullableStructWasNull));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStructValue)), nullableStructValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStructWasPresent)), optionalStructWasPresent));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStructValue)), optionalStructValue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStructWasPresent)),
-                                           nullableOptionalStructWasPresent));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStructWasNull)),
-                                           nullableOptionalStructWasNull));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStructValue)),
-                                           nullableOptionalStructValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableListWasNull)), nullableListWasNull));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableListValue)), nullableListValue));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalListWasPresent)), optionalListWasPresent));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalListValue)), optionalListValue));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalListWasPresent)),
-                                           nullableOptionalListWasPresent));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalListWasNull)),
-                                           nullableOptionalListWasNull));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalListValue)), nullableOptionalListValue));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kNullableIntWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableIntWasNull));
-            break;
-        case to_underlying(Fields::kNullableIntValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableIntValue));
-            break;
-        case to_underlying(Fields::kOptionalIntWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalIntWasPresent));
-            break;
-        case to_underlying(Fields::kOptionalIntValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalIntValue));
-            break;
-        case to_underlying(Fields::kNullableOptionalIntWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalIntWasPresent));
-            break;
-        case to_underlying(Fields::kNullableOptionalIntWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalIntWasNull));
-            break;
-        case to_underlying(Fields::kNullableOptionalIntValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalIntValue));
-            break;
-        case to_underlying(Fields::kNullableStringWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStringWasNull));
-            break;
-        case to_underlying(Fields::kNullableStringValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStringValue));
-            break;
-        case to_underlying(Fields::kOptionalStringWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStringWasPresent));
-            break;
-        case to_underlying(Fields::kOptionalStringValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStringValue));
-            break;
-        case to_underlying(Fields::kNullableOptionalStringWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStringWasPresent));
-            break;
-        case to_underlying(Fields::kNullableOptionalStringWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStringWasNull));
-            break;
-        case to_underlying(Fields::kNullableOptionalStringValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStringValue));
-            break;
-        case to_underlying(Fields::kNullableStructWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStructWasNull));
-            break;
-        case to_underlying(Fields::kNullableStructValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStructValue));
-            break;
-        case to_underlying(Fields::kOptionalStructWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStructWasPresent));
-            break;
-        case to_underlying(Fields::kOptionalStructValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStructValue));
-            break;
-        case to_underlying(Fields::kNullableOptionalStructWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStructWasPresent));
-            break;
-        case to_underlying(Fields::kNullableOptionalStructWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStructWasNull));
-            break;
-        case to_underlying(Fields::kNullableOptionalStructValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStructValue));
-            break;
-        case to_underlying(Fields::kNullableListWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableListWasNull));
-            break;
-        case to_underlying(Fields::kNullableListValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableListValue));
-            break;
-        case to_underlying(Fields::kOptionalListWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalListWasPresent));
-            break;
-        case to_underlying(Fields::kOptionalListValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalListValue));
-            break;
-        case to_underlying(Fields::kNullableOptionalListWasPresent):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalListWasPresent));
-            break;
-        case to_underlying(Fields::kNullableOptionalListWasNull):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalListWasNull));
-            break;
-        case to_underlying(Fields::kNullableOptionalListValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalListValue));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestComplexNullableOptionalResponse.
-namespace TestNestedStructArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestNestedStructArgumentRequest.
-namespace BooleanResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, value));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace BooleanResponse.
-namespace TestListStructArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestListStructArgumentRequest.
-namespace SimpleStructResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace SimpleStructResponse.
-namespace TestListInt8UArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestListInt8UArgumentRequest.
-namespace TestEmitTestEventResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, value));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestEmitTestEventResponse.
-namespace TestNestedStructListArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestNestedStructListArgumentRequest.
-namespace TestEmitTestFabricScopedEventResponse {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kValue):
-            ReturnErrorOnFailure(DataModel::Decode(reader, value));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestEmitTestFabricScopedEventResponse.
-namespace TestListNestedStructListArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestListNestedStructListArgumentRequest.
-namespace TestListInt8UReverseRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestListInt8UReverseRequest.
-namespace TestEnumsRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestEnumsRequest.
-namespace TestNullableOptionalRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestNullableOptionalRequest.
-namespace TestComplexNullableOptionalRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableInt)), nullableInt));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalInt)), optionalInt));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalInt)), nullableOptionalInt));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableString)), nullableString));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalString)), optionalString));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalString)), nullableOptionalString));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStruct)), nullableStruct));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStruct)), optionalStruct));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStruct)), nullableOptionalStruct));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableList)), nullableList));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalList)), optionalList));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalList)), nullableOptionalList));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kNullableInt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt));
-            break;
-        case to_underlying(Fields::kOptionalInt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalInt));
-            break;
-        case to_underlying(Fields::kNullableOptionalInt):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalInt));
-            break;
-        case to_underlying(Fields::kNullableString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableString));
-            break;
-        case to_underlying(Fields::kOptionalString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalString));
-            break;
-        case to_underlying(Fields::kNullableOptionalString):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalString));
-            break;
-        case to_underlying(Fields::kNullableStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStruct));
-            break;
-        case to_underlying(Fields::kOptionalStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStruct));
-            break;
-        case to_underlying(Fields::kNullableOptionalStruct):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStruct));
-            break;
-        case to_underlying(Fields::kNullableList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableList));
-            break;
-        case to_underlying(Fields::kOptionalList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalList));
-            break;
-        case to_underlying(Fields::kNullableOptionalList):
-            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalList));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestComplexNullableOptionalRequest.
-namespace SimpleStructEchoRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace SimpleStructEchoRequest.
-namespace TimedInvokeRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TimedInvokeRequest.
-namespace TestSimpleOptionalArgumentRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestSimpleOptionalArgumentRequest.
-namespace TestEmitTestEventRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        case to_underlying(Fields::kArg3):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestEmitTestEventRequest.
-namespace TestEmitTestFabricScopedEventRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
-{
-    TLV::TLVType outer;
-    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(writer.EndContainer(outer));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    TLV::TLVType outer;
-    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(reader.EnterContainer(outer));
-    while ((err = reader.Next()) == CHIP_NO_ERROR)
-    {
-        if (!TLV::IsContextTag(reader.GetTag()))
-        {
-            continue;
-        }
-        switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kArg1):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace TestEmitTestFabricScopedEventRequest.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::Boolean::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, boolean));
+    case Attributes::InstantaneousReactiveCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousReactiveCurrent));
         break;
-    case Attributes::Bitmap8::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap8));
+    case Attributes::InstantaneousPower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousPower));
         break;
-    case Attributes::Bitmap16::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap16));
+    case Attributes::RmsVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltage));
         break;
-    case Attributes::Bitmap32::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap32));
+    case Attributes::RmsVoltageMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMin));
         break;
-    case Attributes::Bitmap64::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap64));
+    case Attributes::RmsVoltageMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMax));
         break;
-    case Attributes::Int8u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int8u));
+    case Attributes::RmsCurrent::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrent));
         break;
-    case Attributes::Int16u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int16u));
+    case Attributes::RmsCurrentMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMin));
         break;
-    case Attributes::Int24u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int24u));
+    case Attributes::RmsCurrentMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMax));
         break;
-    case Attributes::Int32u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int32u));
+    case Attributes::ActivePower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePower));
         break;
-    case Attributes::Int40u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int40u));
+    case Attributes::ActivePowerMin::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMin));
         break;
-    case Attributes::Int48u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int48u));
+    case Attributes::ActivePowerMax::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMax));
         break;
-    case Attributes::Int56u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int56u));
+    case Attributes::ReactivePower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, reactivePower));
         break;
-    case Attributes::Int64u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int64u));
+    case Attributes::ApparentPower::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, apparentPower));
         break;
-    case Attributes::Int8s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int8s));
+    case Attributes::PowerFactor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerFactor));
         break;
-    case Attributes::Int16s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int16s));
+    case Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsVoltageMeasurementPeriod));
         break;
-    case Attributes::Int24s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int24s));
+    case Attributes::AverageRmsUnderVoltageCounter::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltageCounter));
         break;
-    case Attributes::Int32s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int32s));
+    case Attributes::RmsExtremeOverVoltagePeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltagePeriod));
         break;
-    case Attributes::Int40s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int40s));
+    case Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltagePeriod));
         break;
-    case Attributes::Int48s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int48s));
+    case Attributes::RmsVoltageSagPeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSagPeriod));
         break;
-    case Attributes::Int56s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int56s));
+    case Attributes::RmsVoltageSwellPeriod::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwellPeriod));
         break;
-    case Attributes::Int64s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, int64s));
+    case Attributes::AcVoltageMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acVoltageMultiplier));
         break;
-    case Attributes::Enum8::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enum8));
+    case Attributes::AcVoltageDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acVoltageDivisor));
         break;
-    case Attributes::Enum16::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enum16));
+    case Attributes::AcCurrentMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acCurrentMultiplier));
         break;
-    case Attributes::FloatSingle::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, floatSingle));
+    case Attributes::AcCurrentDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acCurrentDivisor));
+        break;
+    case Attributes::AcPowerMultiplier::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acPowerMultiplier));
+        break;
+    case Attributes::AcPowerDivisor::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acPowerDivisor));
+        break;
+    case Attributes::OverloadAlarmsMask::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, overloadAlarmsMask));
         break;
-    case Attributes::FloatDouble::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, floatDouble));
+    case Attributes::VoltageOverload::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, voltageOverload));
         break;
-    case Attributes::OctetString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, octetString));
+    case Attributes::CurrentOverload::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, currentOverload));
         break;
-    case Attributes::ListInt8u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, listInt8u));
+    case Attributes::AcOverloadAlarmsMask::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acOverloadAlarmsMask));
         break;
-    case Attributes::ListOctetString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, listOctetString));
+    case Attributes::AcVoltageOverload::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acVoltageOverload));
         break;
-    case Attributes::ListStructOctetString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, listStructOctetString));
+    case Attributes::AcCurrentOverload::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acCurrentOverload));
         break;
-    case Attributes::LongOctetString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, longOctetString));
+    case Attributes::AcActivePowerOverload::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acActivePowerOverload));
         break;
-    case Attributes::CharString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, charString));
+    case Attributes::AcReactivePowerOverload::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, acReactivePowerOverload));
         break;
-    case Attributes::LongCharString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, longCharString));
+    case Attributes::AverageRmsOverVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsOverVoltage));
         break;
-    case Attributes::EpochUs::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, epochUs));
+    case Attributes::AverageRmsUnderVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltage));
         break;
-    case Attributes::EpochS::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, epochS));
+    case Attributes::RmsExtremeOverVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltage));
         break;
-    case Attributes::VendorId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, vendorId));
+    case Attributes::RmsExtremeUnderVoltage::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltage));
         break;
-    case Attributes::ListNullablesAndOptionalsStruct::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, listNullablesAndOptionalsStruct));
+    case Attributes::RmsVoltageSag::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSag));
         break;
-    case Attributes::EnumAttr::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, enumAttr));
+    case Attributes::RmsVoltageSwell::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwell));
         break;
-    case Attributes::StructAttr::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, structAttr));
+    case Attributes::LineCurrentPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lineCurrentPhaseB));
         break;
-    case Attributes::RangeRestrictedInt8u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt8u));
+    case Attributes::ActiveCurrentPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activeCurrentPhaseB));
         break;
-    case Attributes::RangeRestrictedInt8s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt8s));
+    case Attributes::ReactiveCurrentPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, reactiveCurrentPhaseB));
         break;
-    case Attributes::RangeRestrictedInt16u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt16u));
+    case Attributes::RmsVoltagePhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltagePhaseB));
         break;
-    case Attributes::RangeRestrictedInt16s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt16s));
+    case Attributes::RmsVoltageMinPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMinPhaseB));
         break;
-    case Attributes::ListLongOctetString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, listLongOctetString));
+    case Attributes::RmsVoltageMaxPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMaxPhaseB));
         break;
-    case Attributes::ListFabricScoped::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, listFabricScoped));
+    case Attributes::RmsCurrentPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentPhaseB));
         break;
-    case Attributes::TimedWriteBoolean::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, timedWriteBoolean));
+    case Attributes::RmsCurrentMinPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMinPhaseB));
         break;
-    case Attributes::GeneralErrorBoolean::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generalErrorBoolean));
+    case Attributes::RmsCurrentMaxPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMaxPhaseB));
         break;
-    case Attributes::ClusterErrorBoolean::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterErrorBoolean));
+    case Attributes::ActivePowerPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerPhaseB));
         break;
-    case Attributes::Unsupported::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, unsupported));
+    case Attributes::ActivePowerMinPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMinPhaseB));
         break;
-    case Attributes::NullableBoolean::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBoolean));
+    case Attributes::ActivePowerMaxPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMaxPhaseB));
         break;
-    case Attributes::NullableBitmap8::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap8));
+    case Attributes::ReactivePowerPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, reactivePowerPhaseB));
         break;
-    case Attributes::NullableBitmap16::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap16));
+    case Attributes::ApparentPowerPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, apparentPowerPhaseB));
         break;
-    case Attributes::NullableBitmap32::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap32));
+    case Attributes::PowerFactorPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerFactorPhaseB));
         break;
-    case Attributes::NullableBitmap64::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap64));
+    case Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsVoltageMeasurementPeriodPhaseB));
         break;
-    case Attributes::NullableInt8u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt8u));
+    case Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsOverVoltageCounterPhaseB));
         break;
-    case Attributes::NullableInt16u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt16u));
+    case Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltageCounterPhaseB));
         break;
-    case Attributes::NullableInt24u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt24u));
+    case Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltagePeriodPhaseB));
         break;
-    case Attributes::NullableInt32u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt32u));
+    case Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltagePeriodPhaseB));
         break;
-    case Attributes::NullableInt40u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt40u));
+    case Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSagPeriodPhaseB));
         break;
-    case Attributes::NullableInt48u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt48u));
+    case Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwellPeriodPhaseB));
         break;
-    case Attributes::NullableInt56u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt56u));
+    case Attributes::LineCurrentPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, lineCurrentPhaseC));
         break;
-    case Attributes::NullableInt64u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt64u));
+    case Attributes::ActiveCurrentPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activeCurrentPhaseC));
         break;
-    case Attributes::NullableInt8s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt8s));
+    case Attributes::ReactiveCurrentPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, reactiveCurrentPhaseC));
         break;
-    case Attributes::NullableInt16s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt16s));
+    case Attributes::RmsVoltagePhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltagePhaseC));
         break;
-    case Attributes::NullableInt24s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt24s));
+    case Attributes::RmsVoltageMinPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMinPhaseC));
         break;
-    case Attributes::NullableInt32s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt32s));
+    case Attributes::RmsVoltageMaxPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMaxPhaseC));
         break;
-    case Attributes::NullableInt40s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt40s));
+    case Attributes::RmsCurrentPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentPhaseC));
         break;
-    case Attributes::NullableInt48s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt48s));
+    case Attributes::RmsCurrentMinPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMinPhaseC));
         break;
-    case Attributes::NullableInt56s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt56s));
+    case Attributes::RmsCurrentMaxPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMaxPhaseC));
         break;
-    case Attributes::NullableInt64s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt64s));
+    case Attributes::ActivePowerPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerPhaseC));
         break;
-    case Attributes::NullableEnum8::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableEnum8));
+    case Attributes::ActivePowerMinPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMinPhaseC));
         break;
-    case Attributes::NullableEnum16::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableEnum16));
+    case Attributes::ActivePowerMaxPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMaxPhaseC));
         break;
-    case Attributes::NullableFloatSingle::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableFloatSingle));
+    case Attributes::ReactivePowerPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, reactivePowerPhaseC));
         break;
-    case Attributes::NullableFloatDouble::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableFloatDouble));
+    case Attributes::ApparentPowerPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, apparentPowerPhaseC));
         break;
-    case Attributes::NullableOctetString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableOctetString));
+    case Attributes::PowerFactorPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, powerFactorPhaseC));
         break;
-    case Attributes::NullableCharString::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableCharString));
+    case Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsVoltageMeasurementPeriodPhaseC));
         break;
-    case Attributes::NullableEnumAttr::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableEnumAttr));
+    case Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsOverVoltageCounterPhaseC));
         break;
-    case Attributes::NullableStruct::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableStruct));
+    case Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltageCounterPhaseC));
         break;
-    case Attributes::NullableRangeRestrictedInt8u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt8u));
+    case Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltagePeriodPhaseC));
         break;
-    case Attributes::NullableRangeRestrictedInt8s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt8s));
+    case Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltagePeriodPhaseC));
         break;
-    case Attributes::NullableRangeRestrictedInt16u::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt16u));
+    case Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSagPeriodPhaseC));
         break;
-    case Attributes::NullableRangeRestrictedInt16s::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt16s));
+    case Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwellPeriodPhaseC));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -26193,20 +23226,827 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-namespace TestEvent {
+} // namespace Attributes
+
+namespace Events {
+} // namespace Events
+
+} // namespace ElectricalMeasurement
+namespace TestCluster {
+namespace Structs {
+namespace SimpleStruct {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kB)), b));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kC)), c));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kD)), d));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kE)), e));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kF)), f));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kG)), g));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kH)), h));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kA):
+            ReturnErrorOnFailure(DataModel::Decode(reader, a));
+            break;
+        case to_underlying(Fields::kB):
+            ReturnErrorOnFailure(DataModel::Decode(reader, b));
+            break;
+        case to_underlying(Fields::kC):
+            ReturnErrorOnFailure(DataModel::Decode(reader, c));
+            break;
+        case to_underlying(Fields::kD):
+            ReturnErrorOnFailure(DataModel::Decode(reader, d));
+            break;
+        case to_underlying(Fields::kE):
+            ReturnErrorOnFailure(DataModel::Decode(reader, e));
+            break;
+        case to_underlying(Fields::kF):
+            ReturnErrorOnFailure(DataModel::Decode(reader, f));
+            break;
+        case to_underlying(Fields::kG):
+            ReturnErrorOnFailure(DataModel::Decode(reader, g));
+            break;
+        case to_underlying(Fields::kH):
+            ReturnErrorOnFailure(DataModel::Decode(reader, h));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace SimpleStruct
+namespace TestFabricScoped {
+CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    return DoEncode(writer, tag, NullOptional);
+}
+
+CHIP_ERROR Type::EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex accessingFabricIndex) const
+{
+    return DoEncode(writer, tag, MakeOptional(accessingFabricIndex));
+}
+
+CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional<FabricIndex> & accessingFabricIndex) const
+{
+    bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == fabricIndex);
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(
+            DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveInt8u)), fabricSensitiveInt8u));
+    }
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalFabricSensitiveInt8u)),
+                                               optionalFabricSensitiveInt8u));
+    }
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableFabricSensitiveInt8u)),
+                                               nullableFabricSensitiveInt8u));
+    }
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(DataModel::Encode(writer,
+                                               TLV::ContextTag(to_underlying(Fields::kNullableOptionalFabricSensitiveInt8u)),
+                                               nullableOptionalFabricSensitiveInt8u));
+    }
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveCharString)),
+                                               fabricSensitiveCharString));
+    }
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(
+            DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveStruct)), fabricSensitiveStruct));
+    }
+    if (includeSensitive)
+    {
+        ReturnErrorOnFailure(
+            DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveInt8uList)), fabricSensitiveInt8uList));
+    }
+    if (accessingFabricIndex.HasValue())
+    {
+        ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex));
+    }
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kFabricSensitiveInt8u):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveInt8u));
+            break;
+        case to_underlying(Fields::kOptionalFabricSensitiveInt8u):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalFabricSensitiveInt8u));
+            break;
+        case to_underlying(Fields::kNullableFabricSensitiveInt8u):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableFabricSensitiveInt8u));
+            break;
+        case to_underlying(Fields::kNullableOptionalFabricSensitiveInt8u):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalFabricSensitiveInt8u));
+            break;
+        case to_underlying(Fields::kFabricSensitiveCharString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveCharString));
+            break;
+        case to_underlying(Fields::kFabricSensitiveStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveStruct));
+            break;
+        case to_underlying(Fields::kFabricSensitiveInt8uList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveInt8uList));
+            break;
+        case to_underlying(Fields::kFabricIndex):
+            ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace TestFabricScoped
+namespace NullablesAndOptionalsStruct {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableInt)), nullableInt));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalInt)), optionalInt));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalInt)), nullableOptionalInt));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableString)), nullableString));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalString)), optionalString));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalString)), nullableOptionalString));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStruct)), nullableStruct));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStruct)), optionalStruct));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStruct)), nullableOptionalStruct));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableList)), nullableList));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalList)), optionalList));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalList)), nullableOptionalList));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kNullableInt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt));
+            break;
+        case to_underlying(Fields::kOptionalInt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalInt));
+            break;
+        case to_underlying(Fields::kNullableOptionalInt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalInt));
+            break;
+        case to_underlying(Fields::kNullableString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableString));
+            break;
+        case to_underlying(Fields::kOptionalString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalString));
+            break;
+        case to_underlying(Fields::kNullableOptionalString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalString));
+            break;
+        case to_underlying(Fields::kNullableStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStruct));
+            break;
+        case to_underlying(Fields::kOptionalStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStruct));
+            break;
+        case to_underlying(Fields::kNullableOptionalStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStruct));
+            break;
+        case to_underlying(Fields::kNullableList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableList));
+            break;
+        case to_underlying(Fields::kOptionalList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalList));
+            break;
+        case to_underlying(Fields::kNullableOptionalList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalList));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace NullablesAndOptionalsStruct
+namespace NestedStruct {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kB)), b));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kC)), c));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kA):
+            ReturnErrorOnFailure(DataModel::Decode(reader, a));
+            break;
+        case to_underlying(Fields::kB):
+            ReturnErrorOnFailure(DataModel::Decode(reader, b));
+            break;
+        case to_underlying(Fields::kC):
+            ReturnErrorOnFailure(DataModel::Decode(reader, c));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace NestedStruct
+namespace NestedStructList {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kB)), b));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kC)), c));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kD)), d));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kE)), e));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kF)), f));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kG)), g));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kA):
+            ReturnErrorOnFailure(DataModel::Decode(reader, a));
+            break;
+        case to_underlying(Fields::kB):
+            ReturnErrorOnFailure(DataModel::Decode(reader, b));
+            break;
+        case to_underlying(Fields::kC):
+            ReturnErrorOnFailure(DataModel::Decode(reader, c));
+            break;
+        case to_underlying(Fields::kD):
+            ReturnErrorOnFailure(DataModel::Decode(reader, d));
+            break;
+        case to_underlying(Fields::kE):
+            ReturnErrorOnFailure(DataModel::Decode(reader, e));
+            break;
+        case to_underlying(Fields::kF):
+            ReturnErrorOnFailure(DataModel::Decode(reader, f));
+            break;
+        case to_underlying(Fields::kG):
+            ReturnErrorOnFailure(DataModel::Decode(reader, g));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace NestedStructList
+namespace DoubleNestedStructList {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kA)), a));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kA):
+            ReturnErrorOnFailure(DataModel::Decode(reader, a));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace DoubleNestedStructList
+namespace TestListStructOctet {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMember1)), member1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMember2)), member2));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    err = reader.EnterContainer(outer);
+    ReturnErrorOnFailure(err);
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kMember1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, member1));
+            break;
+        case to_underlying(Fields::kMember2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, member2));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace TestListStructOctet
+} // namespace Structs
+
+namespace Commands {
+namespace Test {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace Test.
+namespace TestSpecificResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kReturnValue)), returnValue));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kReturnValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, returnValue));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestSpecificResponse.
+namespace TestNotHandled {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestNotHandled.
+namespace TestAddArgumentsResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kReturnValue)), returnValue));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kReturnValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, returnValue));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestAddArgumentsResponse.
+namespace TestSpecific {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestSpecific.
+namespace TestSimpleArgumentResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kReturnValue)), returnValue));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kReturnValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, returnValue));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestSimpleArgumentResponse.
+namespace TestUnknownCommand {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestUnknownCommand.
+namespace TestStructArrayArgumentResponse {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg4)), arg4));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg5)), arg5));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg6)), arg6));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
+            break;
+        case to_underlying(Fields::kArg3):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
+            break;
+        case to_underlying(Fields::kArg4):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg4));
+            break;
+        case to_underlying(Fields::kArg5):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg5));
+            break;
+        case to_underlying(Fields::kArg6):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg6));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestStructArrayArgumentResponse.
+namespace TestAddArguments {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestAddArguments.
+namespace TestListInt8UReverseResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg4)), arg4));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg5)), arg5));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg6)), arg6));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26228,21 +24068,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kArg1):
             ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
-        case to_underlying(Fields::kArg2):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
-            break;
-        case to_underlying(Fields::kArg3):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
-            break;
-        case to_underlying(Fields::kArg4):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg4));
-            break;
-        case to_underlying(Fields::kArg5):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg5));
-            break;
-        case to_underlying(Fields::kArg6):
-            ReturnErrorOnFailure(DataModel::Decode(reader, arg6));
-            break;
         default:
             break;
         }
@@ -26252,8 +24077,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace TestEvent.
-namespace TestFabricScopedEvent {
+} // namespace TestListInt8UReverseResponse.
+namespace TestSimpleArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -26289,25 +24114,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace TestFabricScopedEvent.
-} // namespace Events
-
-} // namespace TestCluster
-namespace Messaging {
-
-namespace Commands {
-namespace DisplayMessage {
+} // namespace TestSimpleArgumentRequest.
+namespace TestEnumsResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDurationInMinutes)), durationInMinutes));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessage)), message));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalExtendedMessageControl)),
-                                           optionalExtendedMessageControl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26326,23 +24140,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMessageId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
-            break;
-        case to_underlying(Fields::kMessageControl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageControl));
-            break;
-        case to_underlying(Fields::kStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
-            break;
-        case to_underlying(Fields::kDurationInMinutes):
-            ReturnErrorOnFailure(DataModel::Decode(reader, durationInMinutes));
-            break;
-        case to_underlying(Fields::kMessage):
-            ReturnErrorOnFailure(DataModel::Decode(reader, message));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
-        case to_underlying(Fields::kOptionalExtendedMessageControl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalExtendedMessageControl));
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
             break;
         default:
             break;
@@ -26353,12 +24155,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace DisplayMessage.
-namespace GetLastMessage {
+} // namespace TestEnumsResponse.
+namespace TestStructArrayArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg4)), arg4));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg5)), arg5));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg6)), arg6));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26377,6 +24185,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
+            break;
+        case to_underlying(Fields::kArg3):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
+            break;
+        case to_underlying(Fields::kArg4):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg4));
+            break;
+        case to_underlying(Fields::kArg5):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg5));
+            break;
+        case to_underlying(Fields::kArg6):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg6));
+            break;
         default:
             break;
         }
@@ -26386,14 +24212,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetLastMessage.
-namespace CancelMessage {
+} // namespace TestStructArrayArgumentRequest.
+namespace TestNullableOptionalResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWasPresent)), wasPresent));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWasNull)), wasNull));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOriginalValue)), originalValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26412,11 +24240,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMessageId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
+        case to_underlying(Fields::kWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, wasPresent));
             break;
-        case to_underlying(Fields::kMessageControl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageControl));
+        case to_underlying(Fields::kWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, wasNull));
+            break;
+        case to_underlying(Fields::kValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, value));
+            break;
+        case to_underlying(Fields::kOriginalValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, originalValue));
             break;
         default:
             break;
@@ -26427,17 +24261,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace CancelMessage.
-namespace MessageConfirmation {
+} // namespace TestNullableOptionalResponse.
+namespace TestStructArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kConfirmationTime)), confirmationTime));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageConfirmationControl)), messageConfirmationControl));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageResponse)), messageResponse));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26456,17 +24286,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMessageId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
-            break;
-        case to_underlying(Fields::kConfirmationTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, confirmationTime));
-            break;
-        case to_underlying(Fields::kMessageConfirmationControl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageConfirmationControl));
-            break;
-        case to_underlying(Fields::kMessageResponse):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageResponse));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -26477,19 +24298,64 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace MessageConfirmation.
-namespace DisplayProtectedMessage {
+} // namespace TestStructArgumentRequest.
+namespace TestComplexNullableOptionalResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageId)), messageId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDurationInMinutes)), durationInMinutes));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessage)), message));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalExtendedMessageControl)),
-                                           optionalExtendedMessageControl));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableIntWasNull)), nullableIntWasNull));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableIntValue)), nullableIntValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalIntWasPresent)), optionalIntWasPresent));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalIntValue)), optionalIntValue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalIntWasPresent)),
+                                           nullableOptionalIntWasPresent));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalIntWasNull)), nullableOptionalIntWasNull));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalIntValue)), nullableOptionalIntValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStringWasNull)), nullableStringWasNull));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStringValue)), nullableStringValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStringWasPresent)), optionalStringWasPresent));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStringValue)), optionalStringValue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStringWasPresent)),
+                                           nullableOptionalStringWasPresent));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStringWasNull)),
+                                           nullableOptionalStringWasNull));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStringValue)),
+                                           nullableOptionalStringValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStructWasNull)), nullableStructWasNull));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStructValue)), nullableStructValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStructWasPresent)), optionalStructWasPresent));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStructValue)), optionalStructValue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStructWasPresent)),
+                                           nullableOptionalStructWasPresent));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStructWasNull)),
+                                           nullableOptionalStructWasNull));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStructValue)),
+                                           nullableOptionalStructValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableListWasNull)), nullableListWasNull));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableListValue)), nullableListValue));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalListWasPresent)), optionalListWasPresent));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalListValue)), optionalListValue));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalListWasPresent)),
+                                           nullableOptionalListWasPresent));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalListWasNull)),
+                                           nullableOptionalListWasNull));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalListValue)), nullableOptionalListValue));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26508,23 +24374,89 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kMessageId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageId));
+        case to_underlying(Fields::kNullableIntWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableIntWasNull));
+            break;
+        case to_underlying(Fields::kNullableIntValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableIntValue));
+            break;
+        case to_underlying(Fields::kOptionalIntWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalIntWasPresent));
+            break;
+        case to_underlying(Fields::kOptionalIntValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalIntValue));
+            break;
+        case to_underlying(Fields::kNullableOptionalIntWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalIntWasPresent));
+            break;
+        case to_underlying(Fields::kNullableOptionalIntWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalIntWasNull));
+            break;
+        case to_underlying(Fields::kNullableOptionalIntValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalIntValue));
+            break;
+        case to_underlying(Fields::kNullableStringWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStringWasNull));
+            break;
+        case to_underlying(Fields::kNullableStringValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStringValue));
+            break;
+        case to_underlying(Fields::kOptionalStringWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStringWasPresent));
+            break;
+        case to_underlying(Fields::kOptionalStringValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStringValue));
+            break;
+        case to_underlying(Fields::kNullableOptionalStringWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStringWasPresent));
             break;
-        case to_underlying(Fields::kMessageControl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, messageControl));
+        case to_underlying(Fields::kNullableOptionalStringWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStringWasNull));
             break;
-        case to_underlying(Fields::kStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
+        case to_underlying(Fields::kNullableOptionalStringValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStringValue));
             break;
-        case to_underlying(Fields::kDurationInMinutes):
-            ReturnErrorOnFailure(DataModel::Decode(reader, durationInMinutes));
+        case to_underlying(Fields::kNullableStructWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStructWasNull));
             break;
-        case to_underlying(Fields::kMessage):
-            ReturnErrorOnFailure(DataModel::Decode(reader, message));
+        case to_underlying(Fields::kNullableStructValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStructValue));
             break;
-        case to_underlying(Fields::kOptionalExtendedMessageControl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, optionalExtendedMessageControl));
+        case to_underlying(Fields::kOptionalStructWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStructWasPresent));
+            break;
+        case to_underlying(Fields::kOptionalStructValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStructValue));
+            break;
+        case to_underlying(Fields::kNullableOptionalStructWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStructWasPresent));
+            break;
+        case to_underlying(Fields::kNullableOptionalStructWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStructWasNull));
+            break;
+        case to_underlying(Fields::kNullableOptionalStructValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStructValue));
+            break;
+        case to_underlying(Fields::kNullableListWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableListWasNull));
+            break;
+        case to_underlying(Fields::kNullableListValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableListValue));
+            break;
+        case to_underlying(Fields::kOptionalListWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalListWasPresent));
+            break;
+        case to_underlying(Fields::kOptionalListValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalListValue));
+            break;
+        case to_underlying(Fields::kNullableOptionalListWasPresent):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalListWasPresent));
+            break;
+        case to_underlying(Fields::kNullableOptionalListWasNull):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalListWasNull));
+            break;
+        case to_underlying(Fields::kNullableOptionalListValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalListValue));
             break;
         default:
             break;
@@ -26535,14 +24467,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace DisplayProtectedMessage.
-namespace GetMessageCancellation {
+} // namespace TestComplexNullableOptionalResponse.
+namespace TestNestedStructArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEarliestImplementationTime)), earliestImplementationTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26561,8 +24492,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kEarliestImplementationTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, earliestImplementationTime));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -26573,14 +24504,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetMessageCancellation.
-namespace CancelAllMessages {
+} // namespace TestNestedStructArgumentRequest.
+namespace BooleanResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImplementationDateTime)), implementationDateTime));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26598,208 +24528,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             continue;
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
-        {
-        case to_underlying(Fields::kImplementationDateTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, implementationDateTime));
-            break;
-        default:
-            break;
-        }
-    }
-
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace CancelAllMessages.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace Messaging
-namespace ApplianceIdentification {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::BasicIdentification::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, basicIdentification));
-        break;
-    case Attributes::CompanyName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, companyName));
-        break;
-    case Attributes::CompanyId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, companyId));
-        break;
-    case Attributes::BrandName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, brandName));
-        break;
-    case Attributes::BrandId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, brandId));
-        break;
-    case Attributes::Model::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, model));
-        break;
-    case Attributes::PartNumber::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, partNumber));
-        break;
-    case Attributes::ProductRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, productRevision));
-        break;
-    case Attributes::SoftwareRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, softwareRevision));
-        break;
-    case Attributes::ProductTypeName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, productTypeName));
-        break;
-    case Attributes::ProductTypeId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, productTypeId));
-        break;
-    case Attributes::CecedSpecificationVersion::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, cecedSpecificationVersion));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ApplianceIdentification
-namespace MeterIdentification {
-
-namespace Commands {
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::CompanyName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, companyName));
-        break;
-    case Attributes::MeterTypeId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, meterTypeId));
-        break;
-    case Attributes::DataQualityId::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dataQualityId));
-        break;
-    case Attributes::CustomerName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, customerName));
-        break;
-    case Attributes::Model::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, model));
-        break;
-    case Attributes::PartNumber::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, partNumber));
-        break;
-    case Attributes::ProductRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, productRevision));
-        break;
-    case Attributes::SoftwareRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, softwareRevision));
-        break;
-    case Attributes::UtilityName::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, utilityName));
-        break;
-    case Attributes::Pod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, pod));
-        break;
-    case Attributes::AvailablePower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, availablePower));
-        break;
-    case Attributes::PowerThreshold::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerThreshold));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
+        {
+        case to_underlying(Fields::kValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, value));
+            break;
+        default:
+            break;
+        }
     }
 
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace MeterIdentification
-namespace ApplianceEventsAndAlert {
-
-namespace Commands {
-namespace GetAlerts {
+} // namespace BooleanResponse.
+namespace TestListStructArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26818,6 +24566,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
         default:
             break;
         }
@@ -26827,14 +24578,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetAlerts.
-namespace GetAlertsResponse {
+} // namespace TestListStructArgumentRequest.
+namespace SimpleStructResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertsCount)), alertsCount));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertStructures)), alertStructures));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26853,11 +24603,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kAlertsCount):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alertsCount));
-            break;
-        case to_underlying(Fields::kAlertStructures):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alertStructures));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -26868,14 +24615,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetAlertsResponse.
-namespace AlertsNotification {
+} // namespace SimpleStructResponse.
+namespace TestListInt8UArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertsCount)), alertsCount));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlertStructures)), alertStructures));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26894,11 +24640,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kAlertsCount):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alertsCount));
-            break;
-        case to_underlying(Fields::kAlertStructures):
-            ReturnErrorOnFailure(DataModel::Decode(reader, alertStructures));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -26909,14 +24652,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace AlertsNotification.
-namespace EventsNotification {
+} // namespace TestListInt8UArgumentRequest.
+namespace TestEmitTestEventResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventHeader)), eventHeader));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventId)), eventId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -26935,11 +24677,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kEventHeader):
-            ReturnErrorOnFailure(DataModel::Decode(reader, eventHeader));
-            break;
-        case to_underlying(Fields::kEventId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, eventId));
+        case to_underlying(Fields::kValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, value));
             break;
         default:
             break;
@@ -26950,53 +24689,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace EventsNotification.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ApplianceEventsAndAlert
-namespace ApplianceStatistics {
-
-namespace Commands {
-namespace LogNotification {
+} // namespace TestEmitTestEventResponse.
+namespace TestNestedStructListArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeStamp)), timeStamp));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogId)), logId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogLength)), logLength));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogPayload)), logPayload));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27015,17 +24714,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTimeStamp):
-            ReturnErrorOnFailure(DataModel::Decode(reader, timeStamp));
-            break;
-        case to_underlying(Fields::kLogId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logId));
-            break;
-        case to_underlying(Fields::kLogLength):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logLength));
-            break;
-        case to_underlying(Fields::kLogPayload):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logPayload));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -27036,13 +24726,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LogNotification.
-namespace LogRequest {
+} // namespace TestNestedStructListArgumentRequest.
+namespace TestEmitTestFabricScopedEventResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogId)), logId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kValue)), value));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27061,8 +24751,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLogId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logId));
+        case to_underlying(Fields::kValue):
+            ReturnErrorOnFailure(DataModel::Decode(reader, value));
             break;
         default:
             break;
@@ -27073,16 +24763,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LogRequest.
-namespace LogResponse {
+} // namespace TestEmitTestFabricScopedEventResponse.
+namespace TestListNestedStructListArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeStamp)), timeStamp));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogId)), logId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogLength)), logLength));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogPayload)), logPayload));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27101,17 +24788,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kTimeStamp):
-            ReturnErrorOnFailure(DataModel::Decode(reader, timeStamp));
-            break;
-        case to_underlying(Fields::kLogId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logId));
-            break;
-        case to_underlying(Fields::kLogLength):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logLength));
-            break;
-        case to_underlying(Fields::kLogPayload):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logPayload));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -27122,12 +24800,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LogResponse.
-namespace LogQueueRequest {
+} // namespace TestListNestedStructListArgumentRequest.
+namespace TestListInt8UReverseRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27146,6 +24825,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
         default:
             break;
         }
@@ -27155,14 +24837,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LogQueueRequest.
-namespace LogQueueResponse {
+} // namespace TestListInt8UReverseRequest.
+namespace TestEnumsRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogQueueSize)), logQueueSize));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogIds)), logIds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27181,11 +24863,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLogQueueSize):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logQueueSize));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
-        case to_underlying(Fields::kLogIds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logIds));
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
             break;
         default:
             break;
@@ -27196,14 +24878,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LogQueueResponse.
-namespace StatisticsAvailable {
+} // namespace TestEnumsRequest.
+namespace TestNullableOptionalRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogQueueSize)), logQueueSize));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLogIds)), logIds));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27222,11 +24903,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kLogQueueSize):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logQueueSize));
-            break;
-        case to_underlying(Fields::kLogIds):
-            ReturnErrorOnFailure(DataModel::Decode(reader, logIds));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
@@ -27237,61 +24915,28 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace StatisticsAvailable.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::LogMaxSize::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, logMaxSize));
-        break;
-    case Attributes::LogQueueMaxSize::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, logQueueMaxSize));
-        break;
-    case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
-        break;
-    case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList));
-        break;
-    case Attributes::AttributeList::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, attributeList));
-        break;
-    case Attributes::FeatureMap::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, featureMap));
-        break;
-    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision));
-        break;
-    default:
-        break;
-    }
-
-    return CHIP_NO_ERROR;
-}
-} // namespace Attributes
-
-namespace Events {
-} // namespace Events
-
-} // namespace ApplianceStatistics
-namespace ElectricalMeasurement {
-
-namespace Commands {
-namespace GetProfileInfoResponseCommand {
+} // namespace TestNullableOptionalRequest.
+namespace TestComplexNullableOptionalRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProfileCount)), profileCount));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableInt)), nullableInt));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalInt)), optionalInt));
     ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProfileIntervalPeriod)), profileIntervalPeriod));
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalInt)), nullableOptionalInt));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableString)), nullableString));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalString)), optionalString));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalString)), nullableOptionalString));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableStruct)), nullableStruct));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalStruct)), optionalStruct));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalStruct)), nullableOptionalStruct));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableList)), nullableList));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalList)), optionalList));
     ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMaxNumberOfIntervals)), maxNumberOfIntervals));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kListOfAttributes)), listOfAttributes));
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNullableOptionalList)), nullableOptionalList));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27310,17 +24955,41 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kProfileCount):
-            ReturnErrorOnFailure(DataModel::Decode(reader, profileCount));
+        case to_underlying(Fields::kNullableInt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt));
             break;
-        case to_underlying(Fields::kProfileIntervalPeriod):
-            ReturnErrorOnFailure(DataModel::Decode(reader, profileIntervalPeriod));
+        case to_underlying(Fields::kOptionalInt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalInt));
             break;
-        case to_underlying(Fields::kMaxNumberOfIntervals):
-            ReturnErrorOnFailure(DataModel::Decode(reader, maxNumberOfIntervals));
+        case to_underlying(Fields::kNullableOptionalInt):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalInt));
             break;
-        case to_underlying(Fields::kListOfAttributes):
-            ReturnErrorOnFailure(DataModel::Decode(reader, listOfAttributes));
+        case to_underlying(Fields::kNullableString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableString));
+            break;
+        case to_underlying(Fields::kOptionalString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalString));
+            break;
+        case to_underlying(Fields::kNullableOptionalString):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalString));
+            break;
+        case to_underlying(Fields::kNullableStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableStruct));
+            break;
+        case to_underlying(Fields::kOptionalStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalStruct));
+            break;
+        case to_underlying(Fields::kNullableOptionalStruct):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalStruct));
+            break;
+        case to_underlying(Fields::kNullableList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableList));
+            break;
+        case to_underlying(Fields::kOptionalList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, optionalList));
+            break;
+        case to_underlying(Fields::kNullableOptionalList):
+            ReturnErrorOnFailure(DataModel::Decode(reader, nullableOptionalList));
             break;
         default:
             break;
@@ -27331,12 +25000,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetProfileInfoResponseCommand.
-namespace GetProfileInfoCommand {
+} // namespace TestComplexNullableOptionalRequest.
+namespace SimpleStructEchoRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27355,6 +25025,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
         default:
             break;
         }
@@ -27364,20 +25037,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetProfileInfoCommand.
-namespace GetMeasurementProfileResponseCommand {
+} // namespace SimpleStructEchoRequest.
+namespace TimedInvokeRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProfileIntervalPeriod)), profileIntervalPeriod));
-    ReturnErrorOnFailure(
-        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfIntervalsDelivered)), numberOfIntervalsDelivered));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeId)), attributeId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIntervals)), intervals));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27396,24 +25061,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
-            break;
-        case to_underlying(Fields::kStatus):
-            ReturnErrorOnFailure(DataModel::Decode(reader, status));
-            break;
-        case to_underlying(Fields::kProfileIntervalPeriod):
-            ReturnErrorOnFailure(DataModel::Decode(reader, profileIntervalPeriod));
-            break;
-        case to_underlying(Fields::kNumberOfIntervalsDelivered):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfIntervalsDelivered));
-            break;
-        case to_underlying(Fields::kAttributeId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, attributeId));
-            break;
-        case to_underlying(Fields::kIntervals):
-            ReturnErrorOnFailure(DataModel::Decode(reader, intervals));
-            break;
         default:
             break;
         }
@@ -27423,15 +25070,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace GetMeasurementProfileResponseCommand.
-namespace GetMeasurementProfileCommand {
+} // namespace TimedInvokeRequest.
+namespace TestSimpleOptionalArgumentRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeId)), attributeId));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNumberOfIntervals)), numberOfIntervals));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -27450,415 +25095,350 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kAttributeId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, attributeId));
-            break;
-        case to_underlying(Fields::kStartTime):
-            ReturnErrorOnFailure(DataModel::Decode(reader, startTime));
-            break;
-        case to_underlying(Fields::kNumberOfIntervals):
-            ReturnErrorOnFailure(DataModel::Decode(reader, numberOfIntervals));
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
             break;
         default:
             break;
         }
     }
 
-    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
-    ReturnErrorOnFailure(reader.ExitContainer(outer));
-    return CHIP_NO_ERROR;
-}
-} // namespace GetMeasurementProfileCommand.
-} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    switch (path.mAttributeId)
-    {
-    case Attributes::MeasurementType::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measurementType));
-        break;
-    case Attributes::DcVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltage));
-        break;
-    case Attributes::DcVoltageMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageMin));
-        break;
-    case Attributes::DcVoltageMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageMax));
-        break;
-    case Attributes::DcCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrent));
-        break;
-    case Attributes::DcCurrentMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentMin));
-        break;
-    case Attributes::DcCurrentMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentMax));
-        break;
-    case Attributes::DcPower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcPower));
-        break;
-    case Attributes::DcPowerMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerMin));
-        break;
-    case Attributes::DcPowerMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerMax));
-        break;
-    case Attributes::DcVoltageMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageMultiplier));
-        break;
-    case Attributes::DcVoltageDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcVoltageDivisor));
-        break;
-    case Attributes::DcCurrentMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentMultiplier));
-        break;
-    case Attributes::DcCurrentDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcCurrentDivisor));
-        break;
-    case Attributes::DcPowerMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerMultiplier));
-        break;
-    case Attributes::DcPowerDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, dcPowerDivisor));
-        break;
-    case Attributes::AcFrequency::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequency));
-        break;
-    case Attributes::AcFrequencyMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyMin));
-        break;
-    case Attributes::AcFrequencyMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyMax));
-        break;
-    case Attributes::NeutralCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, neutralCurrent));
-        break;
-    case Attributes::TotalActivePower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, totalActivePower));
-        break;
-    case Attributes::TotalReactivePower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, totalReactivePower));
-        break;
-    case Attributes::TotalApparentPower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, totalApparentPower));
-        break;
-    case Attributes::Measured1stHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measured1stHarmonicCurrent));
-        break;
-    case Attributes::Measured3rdHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measured3rdHarmonicCurrent));
-        break;
-    case Attributes::Measured5thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measured5thHarmonicCurrent));
-        break;
-    case Attributes::Measured7thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measured7thHarmonicCurrent));
-        break;
-    case Attributes::Measured9thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measured9thHarmonicCurrent));
-        break;
-    case Attributes::Measured11thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measured11thHarmonicCurrent));
-        break;
-    case Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase1stHarmonicCurrent));
-        break;
-    case Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase3rdHarmonicCurrent));
-        break;
-    case Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase5thHarmonicCurrent));
-        break;
-    case Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase7thHarmonicCurrent));
-        break;
-    case Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase9thHarmonicCurrent));
-        break;
-    case Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, measuredPhase11thHarmonicCurrent));
-        break;
-    case Attributes::AcFrequencyMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyMultiplier));
-        break;
-    case Attributes::AcFrequencyDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acFrequencyDivisor));
-        break;
-    case Attributes::PowerMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerMultiplier));
-        break;
-    case Attributes::PowerDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerDivisor));
-        break;
-    case Attributes::HarmonicCurrentMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, harmonicCurrentMultiplier));
-        break;
-    case Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, phaseHarmonicCurrentMultiplier));
-        break;
-    case Attributes::InstantaneousVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousVoltage));
-        break;
-    case Attributes::InstantaneousLineCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousLineCurrent));
-        break;
-    case Attributes::InstantaneousActiveCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousActiveCurrent));
-        break;
-    case Attributes::InstantaneousReactiveCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousReactiveCurrent));
-        break;
-    case Attributes::InstantaneousPower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, instantaneousPower));
-        break;
-    case Attributes::RmsVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltage));
-        break;
-    case Attributes::RmsVoltageMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMin));
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestSimpleOptionalArgumentRequest.
+namespace TestEmitTestEventRequest {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
+            break;
+        case to_underlying(Fields::kArg3):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestEmitTestEventRequest.
+namespace TestEmitTestFabricScopedEventRequest {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestEmitTestFabricScopedEventRequest.
+} // namespace Commands
+
+namespace Attributes {
+CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
+{
+    switch (path.mAttributeId)
+    {
+    case Attributes::Boolean::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, boolean));
         break;
-    case Attributes::RmsVoltageMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMax));
+    case Attributes::Bitmap8::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap8));
         break;
-    case Attributes::RmsCurrent::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrent));
+    case Attributes::Bitmap16::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap16));
         break;
-    case Attributes::RmsCurrentMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMin));
+    case Attributes::Bitmap32::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap32));
         break;
-    case Attributes::RmsCurrentMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMax));
+    case Attributes::Bitmap64::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, bitmap64));
         break;
-    case Attributes::ActivePower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePower));
+    case Attributes::Int8u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int8u));
         break;
-    case Attributes::ActivePowerMin::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMin));
+    case Attributes::Int16u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int16u));
         break;
-    case Attributes::ActivePowerMax::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMax));
+    case Attributes::Int24u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int24u));
         break;
-    case Attributes::ReactivePower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, reactivePower));
+    case Attributes::Int32u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int32u));
         break;
-    case Attributes::ApparentPower::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, apparentPower));
+    case Attributes::Int40u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int40u));
         break;
-    case Attributes::PowerFactor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerFactor));
+    case Attributes::Int48u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int48u));
         break;
-    case Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsVoltageMeasurementPeriod));
+    case Attributes::Int56u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int56u));
         break;
-    case Attributes::AverageRmsUnderVoltageCounter::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltageCounter));
+    case Attributes::Int64u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int64u));
         break;
-    case Attributes::RmsExtremeOverVoltagePeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltagePeriod));
+    case Attributes::Int8s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int8s));
         break;
-    case Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltagePeriod));
+    case Attributes::Int16s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int16s));
         break;
-    case Attributes::RmsVoltageSagPeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSagPeriod));
+    case Attributes::Int24s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int24s));
         break;
-    case Attributes::RmsVoltageSwellPeriod::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwellPeriod));
+    case Attributes::Int32s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int32s));
         break;
-    case Attributes::AcVoltageMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acVoltageMultiplier));
+    case Attributes::Int40s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int40s));
         break;
-    case Attributes::AcVoltageDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acVoltageDivisor));
+    case Attributes::Int48s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int48s));
         break;
-    case Attributes::AcCurrentMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acCurrentMultiplier));
+    case Attributes::Int56s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int56s));
         break;
-    case Attributes::AcCurrentDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acCurrentDivisor));
+    case Attributes::Int64s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, int64s));
         break;
-    case Attributes::AcPowerMultiplier::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acPowerMultiplier));
+    case Attributes::Enum8::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enum8));
         break;
-    case Attributes::AcPowerDivisor::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acPowerDivisor));
+    case Attributes::Enum16::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enum16));
         break;
-    case Attributes::OverloadAlarmsMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, overloadAlarmsMask));
+    case Attributes::FloatSingle::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, floatSingle));
         break;
-    case Attributes::VoltageOverload::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, voltageOverload));
+    case Attributes::FloatDouble::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, floatDouble));
         break;
-    case Attributes::CurrentOverload::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, currentOverload));
+    case Attributes::OctetString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, octetString));
         break;
-    case Attributes::AcOverloadAlarmsMask::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acOverloadAlarmsMask));
+    case Attributes::ListInt8u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, listInt8u));
         break;
-    case Attributes::AcVoltageOverload::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acVoltageOverload));
+    case Attributes::ListOctetString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, listOctetString));
         break;
-    case Attributes::AcCurrentOverload::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acCurrentOverload));
+    case Attributes::ListStructOctetString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, listStructOctetString));
         break;
-    case Attributes::AcActivePowerOverload::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acActivePowerOverload));
+    case Attributes::LongOctetString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, longOctetString));
         break;
-    case Attributes::AcReactivePowerOverload::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, acReactivePowerOverload));
+    case Attributes::CharString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, charString));
         break;
-    case Attributes::AverageRmsOverVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsOverVoltage));
+    case Attributes::LongCharString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, longCharString));
         break;
-    case Attributes::AverageRmsUnderVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltage));
+    case Attributes::EpochUs::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, epochUs));
         break;
-    case Attributes::RmsExtremeOverVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltage));
+    case Attributes::EpochS::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, epochS));
         break;
-    case Attributes::RmsExtremeUnderVoltage::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltage));
+    case Attributes::VendorId::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, vendorId));
         break;
-    case Attributes::RmsVoltageSag::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSag));
+    case Attributes::ListNullablesAndOptionalsStruct::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, listNullablesAndOptionalsStruct));
         break;
-    case Attributes::RmsVoltageSwell::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwell));
+    case Attributes::EnumAttr::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, enumAttr));
         break;
-    case Attributes::LineCurrentPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lineCurrentPhaseB));
+    case Attributes::StructAttr::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, structAttr));
         break;
-    case Attributes::ActiveCurrentPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activeCurrentPhaseB));
+    case Attributes::RangeRestrictedInt8u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt8u));
         break;
-    case Attributes::ReactiveCurrentPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, reactiveCurrentPhaseB));
+    case Attributes::RangeRestrictedInt8s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt8s));
         break;
-    case Attributes::RmsVoltagePhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltagePhaseB));
+    case Attributes::RangeRestrictedInt16u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt16u));
         break;
-    case Attributes::RmsVoltageMinPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMinPhaseB));
+    case Attributes::RangeRestrictedInt16s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, rangeRestrictedInt16s));
         break;
-    case Attributes::RmsVoltageMaxPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMaxPhaseB));
+    case Attributes::ListLongOctetString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, listLongOctetString));
         break;
-    case Attributes::RmsCurrentPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentPhaseB));
+    case Attributes::ListFabricScoped::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, listFabricScoped));
         break;
-    case Attributes::RmsCurrentMinPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMinPhaseB));
+    case Attributes::TimedWriteBoolean::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, timedWriteBoolean));
         break;
-    case Attributes::RmsCurrentMaxPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMaxPhaseB));
+    case Attributes::GeneralErrorBoolean::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, generalErrorBoolean));
         break;
-    case Attributes::ActivePowerPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerPhaseB));
+    case Attributes::ClusterErrorBoolean::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, clusterErrorBoolean));
         break;
-    case Attributes::ActivePowerMinPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMinPhaseB));
+    case Attributes::Unsupported::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, unsupported));
         break;
-    case Attributes::ActivePowerMaxPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMaxPhaseB));
+    case Attributes::NullableBoolean::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBoolean));
         break;
-    case Attributes::ReactivePowerPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, reactivePowerPhaseB));
+    case Attributes::NullableBitmap8::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap8));
         break;
-    case Attributes::ApparentPowerPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, apparentPowerPhaseB));
+    case Attributes::NullableBitmap16::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap16));
         break;
-    case Attributes::PowerFactorPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerFactorPhaseB));
+    case Attributes::NullableBitmap32::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap32));
         break;
-    case Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsVoltageMeasurementPeriodPhaseB));
+    case Attributes::NullableBitmap64::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableBitmap64));
         break;
-    case Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsOverVoltageCounterPhaseB));
+    case Attributes::NullableInt8u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt8u));
         break;
-    case Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltageCounterPhaseB));
+    case Attributes::NullableInt16u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt16u));
         break;
-    case Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltagePeriodPhaseB));
+    case Attributes::NullableInt24u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt24u));
         break;
-    case Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltagePeriodPhaseB));
+    case Attributes::NullableInt32u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt32u));
         break;
-    case Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSagPeriodPhaseB));
+    case Attributes::NullableInt40u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt40u));
         break;
-    case Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwellPeriodPhaseB));
+    case Attributes::NullableInt48u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt48u));
         break;
-    case Attributes::LineCurrentPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, lineCurrentPhaseC));
+    case Attributes::NullableInt56u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt56u));
         break;
-    case Attributes::ActiveCurrentPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activeCurrentPhaseC));
+    case Attributes::NullableInt64u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt64u));
         break;
-    case Attributes::ReactiveCurrentPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, reactiveCurrentPhaseC));
+    case Attributes::NullableInt8s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt8s));
         break;
-    case Attributes::RmsVoltagePhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltagePhaseC));
+    case Attributes::NullableInt16s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt16s));
         break;
-    case Attributes::RmsVoltageMinPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMinPhaseC));
+    case Attributes::NullableInt24s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt24s));
         break;
-    case Attributes::RmsVoltageMaxPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageMaxPhaseC));
+    case Attributes::NullableInt32s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt32s));
         break;
-    case Attributes::RmsCurrentPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentPhaseC));
+    case Attributes::NullableInt40s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt40s));
         break;
-    case Attributes::RmsCurrentMinPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMinPhaseC));
+    case Attributes::NullableInt48s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt48s));
         break;
-    case Attributes::RmsCurrentMaxPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsCurrentMaxPhaseC));
+    case Attributes::NullableInt56s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt56s));
         break;
-    case Attributes::ActivePowerPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerPhaseC));
+    case Attributes::NullableInt64s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableInt64s));
         break;
-    case Attributes::ActivePowerMinPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMinPhaseC));
+    case Attributes::NullableEnum8::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableEnum8));
         break;
-    case Attributes::ActivePowerMaxPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, activePowerMaxPhaseC));
+    case Attributes::NullableEnum16::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableEnum16));
         break;
-    case Attributes::ReactivePowerPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, reactivePowerPhaseC));
+    case Attributes::NullableFloatSingle::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableFloatSingle));
         break;
-    case Attributes::ApparentPowerPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, apparentPowerPhaseC));
+    case Attributes::NullableFloatDouble::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableFloatDouble));
         break;
-    case Attributes::PowerFactorPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, powerFactorPhaseC));
+    case Attributes::NullableOctetString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableOctetString));
         break;
-    case Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsVoltageMeasurementPeriodPhaseC));
+    case Attributes::NullableCharString::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableCharString));
         break;
-    case Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsOverVoltageCounterPhaseC));
+    case Attributes::NullableEnumAttr::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableEnumAttr));
         break;
-    case Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, averageRmsUnderVoltageCounterPhaseC));
+    case Attributes::NullableStruct::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableStruct));
         break;
-    case Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeOverVoltagePeriodPhaseC));
+    case Attributes::NullableRangeRestrictedInt8u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt8u));
         break;
-    case Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsExtremeUnderVoltagePeriodPhaseC));
+    case Attributes::NullableRangeRestrictedInt8s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt8s));
         break;
-    case Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSagPeriodPhaseC));
+    case Attributes::NullableRangeRestrictedInt16u::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt16u));
         break;
-    case Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo::GetAttributeId():
-        ReturnErrorOnFailure(DataModel::Decode(reader, rmsVoltageSwellPeriodPhaseC));
+    case Attributes::NullableRangeRestrictedInt16s::TypeInfo::GetAttributeId():
+        ReturnErrorOnFailure(DataModel::Decode(reader, nullableRangeRestrictedInt16s));
         break;
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -27884,9 +25464,103 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 } // namespace Attributes
 
 namespace Events {
+namespace TestEvent {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg2)), arg2));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg3)), arg3));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg4)), arg4));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg5)), arg5));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg6)), arg6));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        case to_underlying(Fields::kArg2):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg2));
+            break;
+        case to_underlying(Fields::kArg3):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg3));
+            break;
+        case to_underlying(Fields::kArg4):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg4));
+            break;
+        case to_underlying(Fields::kArg5):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg5));
+            break;
+        case to_underlying(Fields::kArg6):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg6));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestEvent.
+namespace TestFabricScopedEvent {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
+{
+    TLV::TLVType outer;
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1));
+    ReturnErrorOnFailure(writer.EndContainer(outer));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TLV::TLVType outer;
+    VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnErrorOnFailure(reader.EnterContainer(outer));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        if (!TLV::IsContextTag(reader.GetTag()))
+        {
+            continue;
+        }
+        switch (TLV::TagNumFromTag(reader.GetTag()))
+        {
+        case to_underlying(Fields::kArg1):
+            ReturnErrorOnFailure(DataModel::Decode(reader, arg1));
+            break;
+        default:
+            break;
+        }
+    }
+
+    VerifyOrReturnError(err == CHIP_END_OF_TLV, err);
+    ReturnErrorOnFailure(reader.ExitContainer(outer));
+    return CHIP_NO_ERROR;
+}
+} // namespace TestFabricScopedEvent.
 } // namespace Events
 
-} // namespace ElectricalMeasurement
+} // namespace TestCluster
 
 } // namespace Clusters
 
@@ -27913,12 +25587,6 @@ bool CommandNeedsTimedInvoke(ClusterId aCluster, CommandId aCommand)
         case Clusters::DoorLock::Commands::LockDoor::Id:
         case Clusters::DoorLock::Commands::UnlockDoor::Id:
         case Clusters::DoorLock::Commands::UnlockWithTimeout::Id:
-        case Clusters::DoorLock::Commands::SetPINCode::Id:
-        case Clusters::DoorLock::Commands::ClearPINCode::Id:
-        case Clusters::DoorLock::Commands::ClearAllPINCodes::Id:
-        case Clusters::DoorLock::Commands::SetRFIDCode::Id:
-        case Clusters::DoorLock::Commands::ClearRFIDCode::Id:
-        case Clusters::DoorLock::Commands::ClearAllRFIDCodes::Id:
         case Clusters::DoorLock::Commands::SetUser::Id:
         case Clusters::DoorLock::Commands::ClearUser::Id:
         case Clusters::DoorLock::Commands::SetCredential::Id:
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 14c302815afb27..b649099b92593b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -33,7 +33,7 @@
 #include <app/data-model/NullObject.h>
 #include <app/util/basic-types.h>
 #include <lib/core/ClusterEnums.h>
-#include <lib/support/BitFlags.h>
+#include <lib/support/BitMask.h>
 #include <protocols/interaction_model/Constants.h>
 
 namespace chip {
@@ -69,6 +69,71 @@ using DecodableType = Type;
 } // namespace Structs
 } // namespace detail
 
+namespace Globals {
+namespace Attributes {
+namespace GeneratedCommandList {
+struct TypeInfo
+{
+    using Type             = DataModel::List<const chip::CommandId>;
+    using DecodableType    = DataModel::DecodableList<chip::CommandId>;
+    using DecodableArgType = const DataModel::DecodableList<chip::CommandId> &;
+
+    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+struct TypeInfo
+{
+    using Type             = DataModel::List<const chip::CommandId>;
+    using DecodableType    = DataModel::DecodableList<chip::CommandId>;
+    using DecodableArgType = const DataModel::DecodableList<chip::CommandId> &;
+
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace AcceptedCommandList
+
+namespace AttributeList {
+struct TypeInfo
+{
+    using Type             = DataModel::List<const chip::AttributeId>;
+    using DecodableType    = DataModel::DecodableList<chip::AttributeId>;
+    using DecodableArgType = const DataModel::DecodableList<chip::AttributeId> &;
+
+    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace AttributeList
+
+namespace FeatureMap {
+struct TypeInfo
+{
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
+
+    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+struct TypeInfo
+{
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
+
+    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace Globals
+
 namespace PowerConfiguration {
 
 namespace Attributes {
@@ -761,63 +826,33 @@ struct TypeInfo
 };
 } // namespace Battery3AlarmState
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -1010,63 +1045,33 @@ struct TypeInfo
 };
 } // namespace HighTempDwellTripPoint
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DeviceTemperatureConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DeviceTemperatureConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DeviceTemperatureConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DeviceTemperatureConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DeviceTemperatureConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -1210,63 +1215,33 @@ struct TypeInfo
 };
 } // namespace IdentifyType
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -1701,63 +1676,33 @@ struct TypeInfo
 };
 } // namespace NameSupport
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Groups::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -2613,11 +2558,11 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::CopyScene::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
 
-    chip::BitFlags<ScenesCopyMode> mode = static_cast<chip::BitFlags<ScenesCopyMode>>(0);
-    chip::GroupId groupIdFrom           = static_cast<chip::GroupId>(0);
-    uint8_t sceneIdFrom                 = static_cast<uint8_t>(0);
-    chip::GroupId groupIdTo             = static_cast<chip::GroupId>(0);
-    uint8_t sceneIdTo                   = static_cast<uint8_t>(0);
+    chip::BitMask<ScenesCopyMode> mode = static_cast<chip::BitMask<ScenesCopyMode>>(0);
+    chip::GroupId groupIdFrom          = static_cast<chip::GroupId>(0);
+    uint8_t sceneIdFrom                = static_cast<uint8_t>(0);
+    chip::GroupId groupIdTo            = static_cast<chip::GroupId>(0);
+    uint8_t sceneIdTo                  = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -2632,11 +2577,11 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::CopyScene::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
 
-    chip::BitFlags<ScenesCopyMode> mode = static_cast<chip::BitFlags<ScenesCopyMode>>(0);
-    chip::GroupId groupIdFrom           = static_cast<chip::GroupId>(0);
-    uint8_t sceneIdFrom                 = static_cast<uint8_t>(0);
-    chip::GroupId groupIdTo             = static_cast<chip::GroupId>(0);
-    uint8_t sceneIdTo                   = static_cast<uint8_t>(0);
+    chip::BitMask<ScenesCopyMode> mode = static_cast<chip::BitMask<ScenesCopyMode>>(0);
+    chip::GroupId groupIdFrom          = static_cast<chip::GroupId>(0);
+    uint8_t sceneIdFrom                = static_cast<uint8_t>(0);
+    chip::GroupId groupIdTo            = static_cast<chip::GroupId>(0);
+    uint8_t sceneIdTo                  = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace CopyScene
@@ -2755,63 +2700,33 @@ struct TypeInfo
 };
 } // namespace LastConfiguredBy
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -3038,9 +2953,9 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::OnWithTimedOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
 
-    chip::BitFlags<OnOffControl> onOffControl = static_cast<chip::BitFlags<OnOffControl>>(0);
-    uint16_t onTime                           = static_cast<uint16_t>(0);
-    uint16_t offWaitTime                      = static_cast<uint16_t>(0);
+    chip::BitMask<OnOffControl> onOffControl = static_cast<chip::BitMask<OnOffControl>>(0);
+    uint16_t onTime                          = static_cast<uint16_t>(0);
+    uint16_t offWaitTime                     = static_cast<uint16_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -3055,9 +2970,9 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::OnWithTimedOff::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
 
-    chip::BitFlags<OnOffControl> onOffControl = static_cast<chip::BitFlags<OnOffControl>>(0);
-    uint16_t onTime                           = static_cast<uint16_t>(0);
-    uint16_t offWaitTime                      = static_cast<uint16_t>(0);
+    chip::BitMask<OnOffControl> onOffControl = static_cast<chip::BitMask<OnOffControl>>(0);
+    uint16_t onTime                          = static_cast<uint16_t>(0);
+    uint16_t offWaitTime                     = static_cast<uint16_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace OnWithTimedOff
@@ -3126,63 +3041,33 @@ struct TypeInfo
 };
 } // namespace StartUpOnOff
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -3237,63 +3122,33 @@ struct TypeInfo
 };
 } // namespace SwitchActions
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOffSwitchConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOffSwitchConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOffSwitchConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOffSwitchConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OnOffSwitchConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -3361,6 +3216,11 @@ struct Type;
 struct DecodableType;
 } // namespace StopWithOnOff
 
+namespace MoveToClosestFrequency {
+struct Type;
+struct DecodableType;
+} // namespace MoveToClosestFrequency
+
 } // namespace Commands
 
 namespace Commands {
@@ -3661,6 +3521,38 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace StopWithOnOff
+namespace MoveToClosestFrequency {
+enum class Fields
+{
+    kFrequency = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::MoveToClosestFrequency::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
+
+    uint16_t frequency = static_cast<uint16_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::MoveToClosestFrequency::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
+
+    uint16_t frequency = static_cast<uint16_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace MoveToClosestFrequency
 } // namespace Commands
 
 namespace Attributes {
@@ -3834,63 +3726,33 @@ struct TypeInfo
 };
 } // namespace StartUpCurrentLevel
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -4175,63 +4037,33 @@ struct TypeInfo
 };
 } // namespace AlarmCount
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Alarms::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Alarms::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Alarms::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Alarms::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Alarms::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -4378,63 +4210,33 @@ struct TypeInfo
 };
 } // namespace ValidUntilTime
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Time::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Time::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Time::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Time::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Time::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -4581,63 +4383,33 @@ struct TypeInfo
 };
 } // namespace ApplicationType
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BinaryInputBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BinaryInputBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BinaryInputBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BinaryInputBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BinaryInputBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -5682,63 +5454,33 @@ struct TypeInfo
 };
 } // namespace ScheduleMode
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerProfile::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerProfile::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerProfile::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerProfile::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerProfile::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -5860,8 +5602,8 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
 
     ApplianceStatus applianceStatus = static_cast<ApplianceStatus>(0);
-    chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
-        static_cast<chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2>>(0);
+    chip::BitMask<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
+        static_cast<chip::BitMask<RemoteEnableFlagsAndDeviceStatus2>>(0);
     ApplianceStatus applianceStatus2 = static_cast<ApplianceStatus>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -5878,8 +5620,8 @@ struct DecodableType
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
 
     ApplianceStatus applianceStatus = static_cast<ApplianceStatus>(0);
-    chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
-        static_cast<chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2>>(0);
+    chip::BitMask<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
+        static_cast<chip::BitMask<RemoteEnableFlagsAndDeviceStatus2>>(0);
     ApplianceStatus applianceStatus2 = static_cast<ApplianceStatus>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -5928,8 +5670,8 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
 
     ApplianceStatus applianceStatus = static_cast<ApplianceStatus>(0);
-    chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
-        static_cast<chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2>>(0);
+    chip::BitMask<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
+        static_cast<chip::BitMask<RemoteEnableFlagsAndDeviceStatus2>>(0);
     ApplianceStatus applianceStatus2 = static_cast<ApplianceStatus>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -5946,8 +5688,8 @@ struct DecodableType
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
 
     ApplianceStatus applianceStatus = static_cast<ApplianceStatus>(0);
-    chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
-        static_cast<chip::BitFlags<RemoteEnableFlagsAndDeviceStatus2>>(0);
+    chip::BitMask<RemoteEnableFlagsAndDeviceStatus2> remoteEnableFlagsAndDeviceStatus2 =
+        static_cast<chip::BitMask<RemoteEnableFlagsAndDeviceStatus2>>(0);
     ApplianceStatus applianceStatus2 = static_cast<ApplianceStatus>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -6119,63 +5861,33 @@ struct TypeInfo
 };
 } // namespace RemainingTime
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ApplianceControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -6204,63 +5916,33 @@ namespace PulseWidthModulation {
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -6360,63 +6042,33 @@ struct TypeInfo
 };
 } // namespace PartsList
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Descriptor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Descriptor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Descriptor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Descriptor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Descriptor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -6498,63 +6150,33 @@ struct TypeInfo
 };
 } // namespace Binding
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -6754,63 +6376,33 @@ struct TypeInfo
 };
 } // namespace AccessControlEntriesPerFabric
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -7209,63 +6801,33 @@ struct TypeInfo
 };
 } // namespace FastPollTimeoutMax
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PollControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PollControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PollControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PollControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PollControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -7911,63 +7473,33 @@ struct TypeInfo
 };
 } // namespace SetupUrl
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -8397,63 +7929,33 @@ struct TypeInfo
 };
 } // namespace CapabilityMinima
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -8867,63 +8369,33 @@ struct DecodableType
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -9091,63 +8563,33 @@ struct TypeInfo
 };
 } // namespace UpdateStateProgress
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -9325,63 +8767,33 @@ struct TypeInfo
 };
 } // namespace SupportedLocales
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LocalizationConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LocalizationConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LocalizationConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LocalizationConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LocalizationConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -9445,63 +8857,33 @@ struct TypeInfo
 };
 } // namespace SupportedCalendarTypes
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -9544,63 +8926,33 @@ struct TypeInfo
 };
 } // namespace TemperatureUnit
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UnitLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UnitLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UnitLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UnitLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UnitLocalization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -9640,63 +8992,33 @@ struct TypeInfo
 };
 } // namespace Sources
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -10191,63 +9513,33 @@ struct TypeInfo
 };
 } // namespace ActiveBatteryChargeFaults
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSource::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSource::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSource::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSource::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSource::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -10631,63 +9923,33 @@ struct TypeInfo
 };
 } // namespace SupportsConcurrentConnection
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -10789,7 +10051,7 @@ enum class Fields
 struct Type
 {
 public:
-    chip::BitFlags<WiFiSecurity> security = static_cast<chip::BitFlags<WiFiSecurity>>(0);
+    chip::BitMask<WiFiSecurity> security = static_cast<chip::BitMask<WiFiSecurity>>(0);
     chip::ByteSpan ssid;
     chip::ByteSpan bssid;
     uint16_t channel  = static_cast<uint16_t>(0);
@@ -11297,63 +10559,33 @@ struct TypeInfo
 };
 } // namespace LastConnectErrorValue
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -11484,63 +10716,33 @@ struct DecodableType
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -11613,6 +10815,54 @@ struct DecodableType
 } // namespace NetworkInterfaceType
 } // namespace Structs
 
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace TestEventTrigger {
+struct Type;
+struct DecodableType;
+} // namespace TestEventTrigger
+
+} // namespace Commands
+
+namespace Commands {
+namespace TestEventTrigger {
+enum class Fields
+{
+    kEnableKey    = 0,
+    kEventTrigger = 1,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestEventTrigger::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+
+    chip::ByteSpan enableKey;
+    uint64_t eventTrigger = static_cast<uint64_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestEventTrigger::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+
+    chip::ByteSpan enableKey;
+    uint64_t eventTrigger = static_cast<uint64_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TestEventTrigger
+} // namespace Commands
+
 namespace Attributes {
 
 namespace NetworkInterfaces {
@@ -11713,64 +10963,46 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ActiveNetworkFaults
-namespace GeneratedCommandList {
+namespace TestEventTriggersEnabled {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
 
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TestEventTriggersEnabled::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace TestEventTriggersEnabled
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
+};
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -11790,6 +11022,7 @@ struct TypeInfo
         Attributes::ActiveHardwareFaults::TypeInfo::DecodableType activeHardwareFaults;
         Attributes::ActiveRadioFaults::TypeInfo::DecodableType activeRadioFaults;
         Attributes::ActiveNetworkFaults::TypeInfo::DecodableType activeNetworkFaults;
+        Attributes::TestEventTriggersEnabled::TypeInfo::DecodableType testEventTriggersEnabled = static_cast<bool>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -11983,10 +11216,10 @@ struct Type
 {
 public:
     uint64_t id = static_cast<uint64_t>(0);
-    chip::CharSpan name;
-    uint32_t stackFreeCurrent = static_cast<uint32_t>(0);
-    uint32_t stackFreeMinimum = static_cast<uint32_t>(0);
-    uint32_t stackSize        = static_cast<uint32_t>(0);
+    Optional<chip::CharSpan> name;
+    Optional<uint32_t> stackFreeCurrent;
+    Optional<uint32_t> stackFreeMinimum;
+    Optional<uint32_t> stackSize;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -12094,63 +11327,33 @@ struct TypeInfo
 };
 } // namespace CurrentHeapHighWatermark
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -12424,9 +11627,9 @@ struct TypeInfo
 namespace RoutingRole {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::RoutingRole::Id; }
@@ -12526,9 +11729,9 @@ struct TypeInfo
 namespace PartitionId {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::PartitionId::Id; }
@@ -12538,9 +11741,9 @@ struct TypeInfo
 namespace Weighting {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Weighting::Id; }
@@ -12550,9 +11753,9 @@ struct TypeInfo
 namespace DataVersion {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::DataVersion::Id; }
@@ -12562,9 +11765,9 @@ struct TypeInfo
 namespace StableDataVersion {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::StableDataVersion::Id; }
@@ -12574,9 +11777,9 @@ struct TypeInfo
 namespace LeaderRouterId {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::LeaderRouterId::Id; }
@@ -13090,9 +12293,9 @@ struct TypeInfo
 namespace ActiveTimestamp {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ActiveTimestamp::Id; }
@@ -13102,9 +12305,9 @@ struct TypeInfo
 namespace PendingTimestamp {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::PendingTimestamp::Id; }
@@ -13114,9 +12317,9 @@ struct TypeInfo
 namespace Delay {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Delay::Id; }
@@ -13126,10 +12329,10 @@ struct TypeInfo
 namespace SecurityPolicy {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::Type>;
+    using Type = chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::Type>;
     using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<
         chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
@@ -13140,9 +12343,9 @@ struct TypeInfo
 namespace ChannelMask {
 struct TypeInfo
 {
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    using Type             = chip::app::DataModel::Nullable<chip::ByteSpan>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::ByteSpan>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::ByteSpan> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ChannelMask::Id; }
@@ -13153,11 +12356,11 @@ struct TypeInfo
 namespace OperationalDatasetComponents {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<
-        const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<
+    using Type =
+        chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::Type>;
+    using DecodableType = chip::app::DataModel::Nullable<
         chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
+    using DecodableArgType = const chip::app::DataModel::Nullable<
         chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
@@ -13179,63 +12382,33 @@ struct TypeInfo
 };
 } // namespace ActiveNetworkFaultsList
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -13256,11 +12429,11 @@ struct TypeInfo
         Attributes::OverrunCount::TypeInfo::DecodableType overrunCount = static_cast<uint64_t>(0);
         Attributes::NeighborTableList::TypeInfo::DecodableType neighborTableList;
         Attributes::RouteTableList::TypeInfo::DecodableType routeTableList;
-        Attributes::PartitionId::TypeInfo::DecodableType partitionId                       = static_cast<uint32_t>(0);
-        Attributes::Weighting::TypeInfo::DecodableType weighting                           = static_cast<uint8_t>(0);
-        Attributes::DataVersion::TypeInfo::DecodableType dataVersion                       = static_cast<uint8_t>(0);
-        Attributes::StableDataVersion::TypeInfo::DecodableType stableDataVersion           = static_cast<uint8_t>(0);
-        Attributes::LeaderRouterId::TypeInfo::DecodableType leaderRouterId                 = static_cast<uint8_t>(0);
+        Attributes::PartitionId::TypeInfo::DecodableType partitionId;
+        Attributes::Weighting::TypeInfo::DecodableType weighting;
+        Attributes::DataVersion::TypeInfo::DecodableType dataVersion;
+        Attributes::StableDataVersion::TypeInfo::DecodableType stableDataVersion;
+        Attributes::LeaderRouterId::TypeInfo::DecodableType leaderRouterId;
         Attributes::DetachedRoleCount::TypeInfo::DecodableType detachedRoleCount           = static_cast<uint16_t>(0);
         Attributes::ChildRoleCount::TypeInfo::DecodableType childRoleCount                 = static_cast<uint16_t>(0);
         Attributes::RouterRoleCount::TypeInfo::DecodableType routerRoleCount               = static_cast<uint16_t>(0);
@@ -13304,9 +12477,9 @@ struct TypeInfo
         Attributes::RxErrSecCount::TypeInfo::DecodableType rxErrSecCount                                 = static_cast<uint32_t>(0);
         Attributes::RxErrFcsCount::TypeInfo::DecodableType rxErrFcsCount                                 = static_cast<uint32_t>(0);
         Attributes::RxErrOtherCount::TypeInfo::DecodableType rxErrOtherCount                             = static_cast<uint32_t>(0);
-        Attributes::ActiveTimestamp::TypeInfo::DecodableType activeTimestamp                             = static_cast<uint64_t>(0);
-        Attributes::PendingTimestamp::TypeInfo::DecodableType pendingTimestamp                           = static_cast<uint64_t>(0);
-        Attributes::Delay::TypeInfo::DecodableType delay                                                 = static_cast<uint32_t>(0);
+        Attributes::ActiveTimestamp::TypeInfo::DecodableType activeTimestamp;
+        Attributes::PendingTimestamp::TypeInfo::DecodableType pendingTimestamp;
+        Attributes::Delay::TypeInfo::DecodableType delay;
         Attributes::SecurityPolicy::TypeInfo::DecodableType securityPolicy;
         Attributes::ChannelMask::TypeInfo::DecodableType channelMask;
         Attributes::OperationalDatasetComponents::TypeInfo::DecodableType operationalDatasetComponents;
@@ -13558,63 +12731,33 @@ struct TypeInfo
 };
 } // namespace OverrunCount
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -13906,63 +13049,33 @@ struct TypeInfo
 };
 } // namespace TimeSinceReset
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -13997,63 +13110,33 @@ namespace TimeSynchronization {
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeSynchronization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeSynchronization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeSynchronization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeSynchronization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TimeSynchronization::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -14270,63 +13353,33 @@ struct TypeInfo
 };
 } // namespace UniqueID
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -14527,63 +13580,33 @@ struct TypeInfo
 };
 } // namespace MultiPressMax
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -15014,63 +14037,33 @@ struct TypeInfo
 };
 } // namespace AdminVendorId
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -15233,11 +14226,6 @@ struct Type;
 struct DecodableType;
 } // namespace AddTrustedRootCertificate
 
-namespace RemoveTrustedRootCertificate {
-struct Type;
-struct DecodableType;
-} // namespace RemoveTrustedRootCertificate
-
 } // namespace Commands
 
 namespace Commands {
@@ -15375,7 +14363,8 @@ struct DecodableType
 namespace CSRRequest {
 enum class Fields
 {
-    kCSRNonce = 0,
+    kCSRNonce       = 0,
+    kIsForUpdateNOC = 1,
 };
 
 struct Type
@@ -15386,6 +14375,7 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
 
     chip::ByteSpan CSRNonce;
+    Optional<bool> isForUpdateNOC;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -15401,6 +14391,7 @@ struct DecodableType
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
 
     chip::ByteSpan CSRNonce;
+    Optional<bool> isForUpdateNOC;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace CSRRequest
@@ -15442,11 +14433,11 @@ struct DecodableType
 namespace AddNOC {
 enum class Fields
 {
-    kNOCValue      = 0,
-    kICACValue     = 1,
-    kIPKValue      = 2,
-    kCaseAdminNode = 3,
-    kAdminVendorId = 4,
+    kNOCValue         = 0,
+    kICACValue        = 1,
+    kIPKValue         = 2,
+    kCaseAdminSubject = 3,
+    kAdminVendorId    = 4,
 };
 
 struct Type
@@ -15459,7 +14450,7 @@ struct Type
     chip::ByteSpan NOCValue;
     Optional<chip::ByteSpan> ICACValue;
     chip::ByteSpan IPKValue;
-    chip::NodeId caseAdminNode   = static_cast<chip::NodeId>(0);
+    uint64_t caseAdminSubject    = static_cast<uint64_t>(0);
     chip::VendorId adminVendorId = static_cast<chip::VendorId>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -15478,7 +14469,7 @@ struct DecodableType
     chip::ByteSpan NOCValue;
     Optional<chip::ByteSpan> ICACValue;
     chip::ByteSpan IPKValue;
-    chip::NodeId caseAdminNode   = static_cast<chip::NodeId>(0);
+    uint64_t caseAdminSubject    = static_cast<uint64_t>(0);
     chip::VendorId adminVendorId = static_cast<chip::VendorId>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -15652,38 +14643,6 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace AddTrustedRootCertificate
-namespace RemoveTrustedRootCertificate {
-enum class Fields
-{
-    kTrustedRootIdentifier = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::RemoveTrustedRootCertificate::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-
-    chip::ByteSpan trustedRootIdentifier;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::RemoveTrustedRootCertificate::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-
-    chip::ByteSpan trustedRootIdentifier;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace RemoveTrustedRootCertificate
 } // namespace Commands
 
 namespace Attributes {
@@ -15765,63 +14724,33 @@ struct TypeInfo
 };
 } // namespace CurrentFabricIndex
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16253,63 +15182,33 @@ struct TypeInfo
 };
 } // namespace MaxGroupKeysPerFabric
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16355,63 +15254,33 @@ struct TypeInfo
 };
 } // namespace LabelList
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FixedLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FixedLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FixedLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FixedLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FixedLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16454,63 +15323,33 @@ struct TypeInfo
 };
 } // namespace LabelList
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16537,63 +15376,33 @@ namespace ProxyConfiguration {
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16619,63 +15428,33 @@ namespace ProxyDiscovery {
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16701,63 +15480,33 @@ namespace ProxyValid {
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -16795,63 +15544,33 @@ struct TypeInfo
 };
 } // namespace StateValue
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -17091,63 +15810,33 @@ struct TypeInfo
 };
 } // namespace OnMode
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -17239,63 +15928,33 @@ struct TypeInfo
 };
 } // namespace Mode
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ShadeConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ShadeConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ShadeConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ShadeConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ShadeConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -17366,56 +16025,6 @@ struct Type;
 struct DecodableType;
 } // namespace UnlockWithTimeout
 
-namespace GetLogRecord {
-struct Type;
-struct DecodableType;
-} // namespace GetLogRecord
-
-namespace GetLogRecordResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetLogRecordResponse
-
-namespace SetPINCode {
-struct Type;
-struct DecodableType;
-} // namespace SetPINCode
-
-namespace GetPINCode {
-struct Type;
-struct DecodableType;
-} // namespace GetPINCode
-
-namespace GetPINCodeResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetPINCodeResponse
-
-namespace ClearPINCode {
-struct Type;
-struct DecodableType;
-} // namespace ClearPINCode
-
-namespace ClearAllPINCodes {
-struct Type;
-struct DecodableType;
-} // namespace ClearAllPINCodes
-
-namespace SetUserStatus {
-struct Type;
-struct DecodableType;
-} // namespace SetUserStatus
-
-namespace GetUserStatus {
-struct Type;
-struct DecodableType;
-} // namespace GetUserStatus
-
-namespace GetUserStatusResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetUserStatusResponse
-
 namespace SetWeekDaySchedule {
 struct Type;
 struct DecodableType;
@@ -17476,46 +16085,6 @@ struct Type;
 struct DecodableType;
 } // namespace ClearHolidaySchedule
 
-namespace SetUserType {
-struct Type;
-struct DecodableType;
-} // namespace SetUserType
-
-namespace GetUserType {
-struct Type;
-struct DecodableType;
-} // namespace GetUserType
-
-namespace GetUserTypeResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetUserTypeResponse
-
-namespace SetRFIDCode {
-struct Type;
-struct DecodableType;
-} // namespace SetRFIDCode
-
-namespace GetRFIDCode {
-struct Type;
-struct DecodableType;
-} // namespace GetRFIDCode
-
-namespace GetRFIDCodeResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetRFIDCodeResponse
-
-namespace ClearRFIDCode {
-struct Type;
-struct DecodableType;
-} // namespace ClearRFIDCode
-
-namespace ClearAllRFIDCodes {
-struct Type;
-struct DecodableType;
-} // namespace ClearAllRFIDCodes
-
 namespace SetUser {
 struct Type;
 struct DecodableType;
@@ -17536,16 +16105,6 @@ struct Type;
 struct DecodableType;
 } // namespace ClearUser
 
-namespace OperatingEventNotification {
-struct Type;
-struct DecodableType;
-} // namespace OperatingEventNotification
-
-namespace ProgrammingEventNotification {
-struct Type;
-struct DecodableType;
-} // namespace ProgrammingEventNotification
-
 namespace SetCredential {
 struct Type;
 struct DecodableType;
@@ -17673,364 +16232,6 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace UnlockWithTimeout
-namespace GetLogRecord {
-enum class Fields
-{
-    kLogIndex = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetLogRecord::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t logIndex = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetLogRecord::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t logIndex = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetLogRecord
-namespace GetLogRecordResponse {
-enum class Fields
-{
-    kLogEntryId         = 0,
-    kTimestamp          = 1,
-    kEventType          = 2,
-    kSource             = 3,
-    kEventIdOrAlarmCode = 4,
-    kUserId             = 5,
-    kPin                = 6,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetLogRecordResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t logEntryId        = static_cast<uint16_t>(0);
-    uint32_t timestamp         = static_cast<uint32_t>(0);
-    uint8_t eventType          = static_cast<uint8_t>(0);
-    uint8_t source             = static_cast<uint8_t>(0);
-    uint8_t eventIdOrAlarmCode = static_cast<uint8_t>(0);
-    uint16_t userId            = static_cast<uint16_t>(0);
-    chip::ByteSpan pin;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetLogRecordResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t logEntryId        = static_cast<uint16_t>(0);
-    uint32_t timestamp         = static_cast<uint32_t>(0);
-    uint8_t eventType          = static_cast<uint8_t>(0);
-    uint8_t source             = static_cast<uint8_t>(0);
-    uint8_t eventIdOrAlarmCode = static_cast<uint8_t>(0);
-    uint16_t userId            = static_cast<uint16_t>(0);
-    chip::ByteSpan pin;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetLogRecordResponse
-namespace SetPINCode {
-enum class Fields
-{
-    kUserId     = 0,
-    kUserStatus = 1,
-    kUserType   = 2,
-    kPin        = 3,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SetPINCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    chip::ByteSpan pin;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SetPINCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    chip::ByteSpan pin;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SetPINCode
-namespace GetPINCode {
-enum class Fields
-{
-    kUserId = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetPINCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetPINCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetPINCode
-namespace GetPINCodeResponse {
-enum class Fields
-{
-    kUserId     = 0,
-    kUserStatus = 1,
-    kUserType   = 2,
-    kPin        = 3,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetPINCodeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<chip::ByteSpan> pin;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetPINCodeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<chip::ByteSpan> pin;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetPINCodeResponse
-namespace ClearPINCode {
-enum class Fields
-{
-    kPinSlotIndex = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ClearPINCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t pinSlotIndex = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ClearPINCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t pinSlotIndex = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace ClearPINCode
-namespace ClearAllPINCodes {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ClearAllPINCodes::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ClearAllPINCodes::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace ClearAllPINCodes
-namespace SetUserStatus {
-enum class Fields
-{
-    kUserId     = 0,
-    kUserStatus = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SetUserStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId         = static_cast<uint16_t>(0);
-    DlUserStatus userStatus = static_cast<DlUserStatus>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SetUserStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId         = static_cast<uint16_t>(0);
-    DlUserStatus userStatus = static_cast<DlUserStatus>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SetUserStatus
-namespace GetUserStatus {
-enum class Fields
-{
-    kUserId = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetUserStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::DoorLock::Commands::GetUserStatusResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetUserStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetUserStatus
-namespace GetUserStatusResponse {
-enum class Fields
-{
-    kUserId     = 0,
-    kUserStatus = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetUserStatusResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId         = static_cast<uint16_t>(0);
-    DlUserStatus userStatus = static_cast<DlUserStatus>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetUserStatusResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId         = static_cast<uint16_t>(0);
-    DlUserStatus userStatus = static_cast<DlUserStatus>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetUserStatusResponse
 namespace SetWeekDaySchedule {
 enum class Fields
 {
@@ -18050,13 +16251,13 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    uint8_t weekDayIndex                   = static_cast<uint8_t>(0);
-    uint16_t userIndex                     = static_cast<uint16_t>(0);
-    chip::BitFlags<DlDaysMaskMap> daysMask = static_cast<chip::BitFlags<DlDaysMaskMap>>(0);
-    uint8_t startHour                      = static_cast<uint8_t>(0);
-    uint8_t startMinute                    = static_cast<uint8_t>(0);
-    uint8_t endHour                        = static_cast<uint8_t>(0);
-    uint8_t endMinute                      = static_cast<uint8_t>(0);
+    uint8_t weekDayIndex                  = static_cast<uint8_t>(0);
+    uint16_t userIndex                    = static_cast<uint16_t>(0);
+    chip::BitMask<DlDaysMaskMap> daysMask = static_cast<chip::BitMask<DlDaysMaskMap>>(0);
+    uint8_t startHour                     = static_cast<uint8_t>(0);
+    uint8_t startMinute                   = static_cast<uint8_t>(0);
+    uint8_t endHour                       = static_cast<uint8_t>(0);
+    uint8_t endMinute                     = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -18071,13 +16272,13 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    uint8_t weekDayIndex                   = static_cast<uint8_t>(0);
-    uint16_t userIndex                     = static_cast<uint16_t>(0);
-    chip::BitFlags<DlDaysMaskMap> daysMask = static_cast<chip::BitFlags<DlDaysMaskMap>>(0);
-    uint8_t startHour                      = static_cast<uint8_t>(0);
-    uint8_t startMinute                    = static_cast<uint8_t>(0);
-    uint8_t endHour                        = static_cast<uint8_t>(0);
-    uint8_t endMinute                      = static_cast<uint8_t>(0);
+    uint8_t weekDayIndex                  = static_cast<uint8_t>(0);
+    uint16_t userIndex                    = static_cast<uint16_t>(0);
+    chip::BitMask<DlDaysMaskMap> daysMask = static_cast<chip::BitMask<DlDaysMaskMap>>(0);
+    uint8_t startHour                     = static_cast<uint8_t>(0);
+    uint8_t startMinute                   = static_cast<uint8_t>(0);
+    uint8_t endHour                       = static_cast<uint8_t>(0);
+    uint8_t endMinute                     = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SetWeekDaySchedule
@@ -18139,7 +16340,7 @@ struct Type
     uint8_t weekDayIndex = static_cast<uint8_t>(0);
     uint16_t userIndex   = static_cast<uint16_t>(0);
     DlStatus status      = static_cast<DlStatus>(0);
-    Optional<chip::BitFlags<DlDaysMaskMap>> daysMask;
+    Optional<chip::BitMask<DlDaysMaskMap>> daysMask;
     Optional<uint8_t> startHour;
     Optional<uint8_t> startMinute;
     Optional<uint8_t> endHour;
@@ -18161,7 +16362,7 @@ struct DecodableType
     uint8_t weekDayIndex = static_cast<uint8_t>(0);
     uint16_t userIndex   = static_cast<uint16_t>(0);
     DlStatus status      = static_cast<DlStatus>(0);
-    Optional<chip::BitFlags<DlDaysMaskMap>> daysMask;
+    Optional<chip::BitMask<DlDaysMaskMap>> daysMask;
     Optional<uint8_t> startHour;
     Optional<uint8_t> startMinute;
     Optional<uint8_t> endHour;
@@ -18508,282 +16709,6 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace ClearHolidaySchedule
-namespace SetUserType {
-enum class Fields
-{
-    kUserId   = 0,
-    kUserType = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SetUserType::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId     = static_cast<uint16_t>(0);
-    DlUserType userType = static_cast<DlUserType>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SetUserType::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId     = static_cast<uint16_t>(0);
-    DlUserType userType = static_cast<DlUserType>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SetUserType
-namespace GetUserType {
-enum class Fields
-{
-    kUserId = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetUserType::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetUserType::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetUserType
-namespace GetUserTypeResponse {
-enum class Fields
-{
-    kUserId   = 0,
-    kUserType = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetUserTypeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId     = static_cast<uint16_t>(0);
-    DlUserType userType = static_cast<DlUserType>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetUserTypeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId     = static_cast<uint16_t>(0);
-    DlUserType userType = static_cast<DlUserType>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetUserTypeResponse
-namespace SetRFIDCode {
-enum class Fields
-{
-    kUserId     = 0,
-    kUserStatus = 1,
-    kUserType   = 2,
-    kRfidCode   = 3,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SetRFIDCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    chip::ByteSpan rfidCode;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SetRFIDCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    chip::ByteSpan rfidCode;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SetRFIDCode
-namespace GetRFIDCode {
-enum class Fields
-{
-    kUserId = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetRFIDCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetRFIDCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetRFIDCode
-namespace GetRFIDCodeResponse {
-enum class Fields
-{
-    kUserId     = 0,
-    kUserStatus = 1,
-    kUserType   = 2,
-    kRfidCode   = 3,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetRFIDCodeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<chip::ByteSpan> rfidCode;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetRFIDCodeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t userId = static_cast<uint16_t>(0);
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<chip::ByteSpan> rfidCode;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetRFIDCodeResponse
-namespace ClearRFIDCode {
-enum class Fields
-{
-    kRfidSlotIndex = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ClearRFIDCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t rfidSlotIndex = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ClearRFIDCode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint16_t rfidSlotIndex = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace ClearRFIDCode
-namespace ClearAllRFIDCodes {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ClearAllRFIDCodes::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ClearAllRFIDCodes::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace ClearAllRFIDCodes
 namespace SetUser {
 enum class Fields
 {
@@ -18957,106 +16882,6 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace ClearUser
-namespace OperatingEventNotification {
-enum class Fields
-{
-    kOperationEventSource = 0,
-    kOperationEventCode   = 1,
-    kUserId               = 2,
-    kPin                  = 3,
-    kLocalTime            = 4,
-    kData                 = 5,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::OperatingEventNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint8_t operationEventSource = static_cast<uint8_t>(0);
-    uint8_t operationEventCode   = static_cast<uint8_t>(0);
-    uint16_t userId              = static_cast<uint16_t>(0);
-    chip::ByteSpan pin;
-    uint32_t localTime = static_cast<uint32_t>(0);
-    Optional<chip::CharSpan> data;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::OperatingEventNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint8_t operationEventSource = static_cast<uint8_t>(0);
-    uint8_t operationEventCode   = static_cast<uint8_t>(0);
-    uint16_t userId              = static_cast<uint16_t>(0);
-    chip::ByteSpan pin;
-    uint32_t localTime = static_cast<uint32_t>(0);
-    Optional<chip::CharSpan> data;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace OperatingEventNotification
-namespace ProgrammingEventNotification {
-enum class Fields
-{
-    kProgramEventSource = 0,
-    kProgramEventCode   = 1,
-    kUserId             = 2,
-    kPin                = 3,
-    kUserType           = 4,
-    kUserStatus         = 5,
-    kLocalTime          = 6,
-    kData               = 7,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ProgrammingEventNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint8_t programEventSource = static_cast<uint8_t>(0);
-    uint8_t programEventCode   = static_cast<uint8_t>(0);
-    uint16_t userId            = static_cast<uint16_t>(0);
-    chip::ByteSpan pin;
-    DlUserType userType     = static_cast<DlUserType>(0);
-    DlUserStatus userStatus = static_cast<DlUserStatus>(0);
-    uint32_t localTime      = static_cast<uint32_t>(0);
-    Optional<chip::CharSpan> data;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ProgrammingEventNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-
-    uint8_t programEventSource = static_cast<uint8_t>(0);
-    uint8_t programEventCode   = static_cast<uint8_t>(0);
-    uint16_t userId            = static_cast<uint16_t>(0);
-    chip::ByteSpan pin;
-    DlUserType userType     = static_cast<DlUserType>(0);
-    DlUserStatus userStatus = static_cast<DlUserStatus>(0);
-    uint32_t localTime      = static_cast<uint32_t>(0);
-    Optional<chip::CharSpan> data;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace ProgrammingEventNotification
 namespace SetCredential {
 enum class Fields
 {
@@ -19338,18 +17163,6 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace OpenPeriod
-namespace NumberOfLogRecordsSupported {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfLogRecordsSupported::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace NumberOfLogRecordsSupported
 namespace NumberOfTotalUsersSupported {
 struct TypeInfo
 {
@@ -19473,9 +17286,9 @@ struct TypeInfo
 namespace CredentialRulesSupport {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>;
+    using Type             = chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CredentialRulesSupport::Id; }
@@ -19494,18 +17307,6 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace NumberOfCredentialsSupportedPerUser
-namespace EnableLogging {
-struct TypeInfo
-{
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::EnableLogging::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace EnableLogging
 namespace Language {
 struct TypeInfo
 {
@@ -19570,9 +17371,9 @@ struct TypeInfo
 namespace SupportedOperatingModes {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>;
+    using Type             = chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedOperatingModes::Id; }
@@ -19582,9 +17383,9 @@ struct TypeInfo
 namespace DefaultConfigurationRegister {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>;
+    using Type             = chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::DefaultConfigurationRegister::Id; }
@@ -19642,9 +17443,9 @@ struct TypeInfo
 namespace LocalProgrammingFeatures {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>;
+    using Type             = chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::LocalProgrammingFeatures::Id; }
@@ -19711,160 +17512,34 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ExpiringUserTimeout
-namespace AlarmMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AlarmMask
-namespace KeypadOperationEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::KeypadOperationEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace KeypadOperationEventMask
-namespace RemoteOperationEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RemoteOperationEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace RemoteOperationEventMask
-namespace ManualOperationEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ManualOperationEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ManualOperationEventMask
-namespace RFIDOperationEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RFIDOperationEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace RFIDOperationEventMask
-namespace KeypadProgrammingEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::KeypadProgrammingEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace KeypadProgrammingEventMask
-namespace RemoteProgrammingEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RemoteProgrammingEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace RemoteProgrammingEventMask
-namespace RFIDProgrammingEventMask {
-struct TypeInfo
-{
-    using Type             = chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RFIDProgrammingEventMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace RFIDProgrammingEventMask
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -19883,7 +17558,6 @@ struct TypeInfo
         Attributes::DoorOpenEvents::TypeInfo::DecodableType doorOpenEvents                           = static_cast<uint32_t>(0);
         Attributes::DoorClosedEvents::TypeInfo::DecodableType doorClosedEvents                       = static_cast<uint32_t>(0);
         Attributes::OpenPeriod::TypeInfo::DecodableType openPeriod                                   = static_cast<uint16_t>(0);
-        Attributes::NumberOfLogRecordsSupported::TypeInfo::DecodableType numberOfLogRecordsSupported = static_cast<uint16_t>(0);
         Attributes::NumberOfTotalUsersSupported::TypeInfo::DecodableType numberOfTotalUsersSupported = static_cast<uint16_t>(0);
         Attributes::NumberOfPINUsersSupported::TypeInfo::DecodableType numberOfPINUsersSupported     = static_cast<uint16_t>(0);
         Attributes::NumberOfRFIDUsersSupported::TypeInfo::DecodableType numberOfRFIDUsersSupported   = static_cast<uint16_t>(0);
@@ -19898,10 +17572,9 @@ struct TypeInfo
         Attributes::MaxRFIDCodeLength::TypeInfo::DecodableType maxRFIDCodeLength = static_cast<uint8_t>(0);
         Attributes::MinRFIDCodeLength::TypeInfo::DecodableType minRFIDCodeLength = static_cast<uint8_t>(0);
         Attributes::CredentialRulesSupport::TypeInfo::DecodableType credentialRulesSupport =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>(0);
         Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo::DecodableType numberOfCredentialsSupportedPerUser =
             static_cast<uint8_t>(0);
-        Attributes::EnableLogging::TypeInfo::DecodableType enableLogging = static_cast<bool>(0);
         Attributes::Language::TypeInfo::DecodableType language;
         Attributes::LEDSettings::TypeInfo::DecodableType LEDSettings       = static_cast<uint8_t>(0);
         Attributes::AutoRelockTime::TypeInfo::DecodableType autoRelockTime = static_cast<uint32_t>(0);
@@ -19909,36 +17582,20 @@ struct TypeInfo
         Attributes::OperatingMode::TypeInfo::DecodableType operatingMode =
             static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
         Attributes::SupportedOperatingModes::TypeInfo::DecodableType supportedOperatingModes =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>(0);
         Attributes::DefaultConfigurationRegister::TypeInfo::DecodableType defaultConfigurationRegister =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>(0);
         Attributes::EnableLocalProgramming::TypeInfo::DecodableType enableLocalProgramming   = static_cast<bool>(0);
         Attributes::EnableOneTouchLocking::TypeInfo::DecodableType enableOneTouchLocking     = static_cast<bool>(0);
         Attributes::EnableInsideStatusLED::TypeInfo::DecodableType enableInsideStatusLED     = static_cast<bool>(0);
         Attributes::EnablePrivacyModeButton::TypeInfo::DecodableType enablePrivacyModeButton = static_cast<bool>(0);
         Attributes::LocalProgrammingFeatures::TypeInfo::DecodableType localProgrammingFeatures =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>(0);
         Attributes::WrongCodeEntryLimit::TypeInfo::DecodableType wrongCodeEntryLimit                   = static_cast<uint8_t>(0);
         Attributes::UserCodeTemporaryDisableTime::TypeInfo::DecodableType userCodeTemporaryDisableTime = static_cast<uint8_t>(0);
         Attributes::SendPINOverTheAir::TypeInfo::DecodableType sendPINOverTheAir                       = static_cast<bool>(0);
         Attributes::RequirePINforRemoteOperation::TypeInfo::DecodableType requirePINforRemoteOperation = static_cast<bool>(0);
         Attributes::ExpiringUserTimeout::TypeInfo::DecodableType expiringUserTimeout                   = static_cast<uint16_t>(0);
-        Attributes::AlarmMask::TypeInfo::DecodableType alarmMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask>>(0);
-        Attributes::KeypadOperationEventMask::TypeInfo::DecodableType keypadOperationEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>>(0);
-        Attributes::RemoteOperationEventMask::TypeInfo::DecodableType remoteOperationEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask>>(0);
-        Attributes::ManualOperationEventMask::TypeInfo::DecodableType manualOperationEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask>>(0);
-        Attributes::RFIDOperationEventMask::TypeInfo::DecodableType RFIDOperationEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask>>(0);
-        Attributes::KeypadProgrammingEventMask::TypeInfo::DecodableType keypadProgrammingEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask>>(0);
-        Attributes::RemoteProgrammingEventMask::TypeInfo::DecodableType remoteProgrammingEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask>>(0);
-        Attributes::RFIDProgrammingEventMask::TypeInfo::DecodableType RFIDProgrammingEventMask =
-            static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask>>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -20512,9 +18169,9 @@ struct TypeInfo
 namespace ConfigStatus {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>;
+    using Type             = chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ConfigStatus::Id; }
@@ -20668,9 +18325,9 @@ struct TypeInfo
 namespace Mode {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>;
+    using Type             = chip::BitMask<chip::app::Clusters::WindowCovering::Mode>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::WindowCovering::Mode>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::WindowCovering::Mode>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Mode::Id; }
@@ -20690,63 +18347,33 @@ struct TypeInfo
 };
 } // namespace SafetyStatus
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -20766,7 +18393,7 @@ struct TypeInfo
         Attributes::NumberOfActuationsLift::TypeInfo::DecodableType numberOfActuationsLift = static_cast<uint16_t>(0);
         Attributes::NumberOfActuationsTilt::TypeInfo::DecodableType numberOfActuationsTilt = static_cast<uint16_t>(0);
         Attributes::ConfigStatus::TypeInfo::DecodableType configStatus =
-            static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>>(0);
         Attributes::CurrentPositionLiftPercentage::TypeInfo::DecodableType currentPositionLiftPercentage;
         Attributes::CurrentPositionTiltPercentage::TypeInfo::DecodableType currentPositionTiltPercentage;
         Attributes::OperationalStatus::TypeInfo::DecodableType operationalStatus = static_cast<uint8_t>(0);
@@ -20780,7 +18407,7 @@ struct TypeInfo
         Attributes::InstalledClosedLimitLift::TypeInfo::DecodableType installedClosedLimitLift = static_cast<uint16_t>(0);
         Attributes::InstalledOpenLimitTilt::TypeInfo::DecodableType installedOpenLimitTilt     = static_cast<uint16_t>(0);
         Attributes::InstalledClosedLimitTilt::TypeInfo::DecodableType installedClosedLimitTilt = static_cast<uint16_t>(0);
-        Attributes::Mode::TypeInfo::DecodableType mode = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(0);
+        Attributes::Mode::TypeInfo::DecodableType mode = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(0);
         Attributes::SafetyStatus::TypeInfo::DecodableType safetyStatus = static_cast<uint16_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
@@ -20994,63 +18621,33 @@ struct TypeInfo
 };
 } // namespace BarrierPosition
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BarrierControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BarrierControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BarrierControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BarrierControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BarrierControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -21244,9 +18841,9 @@ struct TypeInfo
 namespace PumpStatus {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>;
+    using Type             = chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>;
 
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::PumpStatus::Id; }
@@ -21362,63 +18959,33 @@ struct TypeInfo
 };
 } // namespace ControlMode
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -21444,7 +19011,7 @@ struct TypeInfo
         Attributes::MinConstTemp::TypeInfo::DecodableType minConstTemp;
         Attributes::MaxConstTemp::TypeInfo::DecodableType maxConstTemp;
         Attributes::PumpStatus::TypeInfo::DecodableType pumpStatus =
-            static_cast<chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>>(0);
+            static_cast<chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>>(0);
         Attributes::EffectiveOperationMode::TypeInfo::DecodableType effectiveOperationMode =
             static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode>(0);
         Attributes::EffectiveControlMode::TypeInfo::DecodableType effectiveControlMode =
@@ -21992,11 +19559,6 @@ struct Type;
 struct DecodableType;
 } // namespace SetWeeklySchedule
 
-namespace GetRelayStatusLogResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetRelayStatusLogResponse
-
 namespace GetWeeklySchedule {
 struct Type;
 struct DecodableType;
@@ -22007,11 +19569,6 @@ struct Type;
 struct DecodableType;
 } // namespace ClearWeeklySchedule
 
-namespace GetRelayStatusLog {
-struct Type;
-struct DecodableType;
-} // namespace GetRelayStatusLog
-
 } // namespace Commands
 
 namespace Commands {
@@ -22066,9 +19623,9 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::GetWeeklyScheduleResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
 
-    uint8_t numberOfTransitionsForSequence          = static_cast<uint8_t>(0);
-    chip::BitFlags<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitFlags<DayOfWeek>>(0);
-    chip::BitFlags<ModeForSequence> modeForSequence = static_cast<chip::BitFlags<ModeForSequence>>(0);
+    uint8_t numberOfTransitionsForSequence         = static_cast<uint8_t>(0);
+    chip::BitMask<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitMask<DayOfWeek>>(0);
+    chip::BitMask<ModeForSequence> modeForSequence = static_cast<chip::BitMask<ModeForSequence>>(0);
     DataModel::List<const Structs::ThermostatScheduleTransition::Type> transitions;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -22084,9 +19641,9 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::GetWeeklyScheduleResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
 
-    uint8_t numberOfTransitionsForSequence          = static_cast<uint8_t>(0);
-    chip::BitFlags<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitFlags<DayOfWeek>>(0);
-    chip::BitFlags<ModeForSequence> modeForSequence = static_cast<chip::BitFlags<ModeForSequence>>(0);
+    uint8_t numberOfTransitionsForSequence         = static_cast<uint8_t>(0);
+    chip::BitMask<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitMask<DayOfWeek>>(0);
+    chip::BitMask<ModeForSequence> modeForSequence = static_cast<chip::BitMask<ModeForSequence>>(0);
     DataModel::DecodableList<Structs::ThermostatScheduleTransition::DecodableType> transitions;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -22107,9 +19664,9 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SetWeeklySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
 
-    uint8_t numberOfTransitionsForSequence          = static_cast<uint8_t>(0);
-    chip::BitFlags<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitFlags<DayOfWeek>>(0);
-    chip::BitFlags<ModeForSequence> modeForSequence = static_cast<chip::BitFlags<ModeForSequence>>(0);
+    uint8_t numberOfTransitionsForSequence         = static_cast<uint8_t>(0);
+    chip::BitMask<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitMask<DayOfWeek>>(0);
+    chip::BitMask<ModeForSequence> modeForSequence = static_cast<chip::BitMask<ModeForSequence>>(0);
     DataModel::List<const Structs::ThermostatScheduleTransition::Type> transitions;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -22125,60 +19682,13 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SetWeeklySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
 
-    uint8_t numberOfTransitionsForSequence          = static_cast<uint8_t>(0);
-    chip::BitFlags<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitFlags<DayOfWeek>>(0);
-    chip::BitFlags<ModeForSequence> modeForSequence = static_cast<chip::BitFlags<ModeForSequence>>(0);
+    uint8_t numberOfTransitionsForSequence         = static_cast<uint8_t>(0);
+    chip::BitMask<DayOfWeek> dayOfWeekForSequence  = static_cast<chip::BitMask<DayOfWeek>>(0);
+    chip::BitMask<ModeForSequence> modeForSequence = static_cast<chip::BitMask<ModeForSequence>>(0);
     DataModel::DecodableList<Structs::ThermostatScheduleTransition::DecodableType> transitions;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SetWeeklySchedule
-namespace GetRelayStatusLogResponse {
-enum class Fields
-{
-    kTimeOfDay            = 0,
-    kRelayStatus          = 1,
-    kLocalTemperature     = 2,
-    kHumidityInPercentage = 3,
-    kSetpoint             = 4,
-    kUnreadEntries        = 5,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetRelayStatusLogResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-
-    uint16_t timeOfDay           = static_cast<uint16_t>(0);
-    uint8_t relayStatus          = static_cast<uint8_t>(0);
-    int16_t localTemperature     = static_cast<int16_t>(0);
-    uint8_t humidityInPercentage = static_cast<uint8_t>(0);
-    int16_t setpoint             = static_cast<int16_t>(0);
-    uint16_t unreadEntries       = static_cast<uint16_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetRelayStatusLogResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-
-    uint16_t timeOfDay           = static_cast<uint16_t>(0);
-    uint8_t relayStatus          = static_cast<uint8_t>(0);
-    int16_t localTemperature     = static_cast<int16_t>(0);
-    uint8_t humidityInPercentage = static_cast<uint8_t>(0);
-    int16_t setpoint             = static_cast<int16_t>(0);
-    uint16_t unreadEntries       = static_cast<uint16_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetRelayStatusLogResponse
 namespace GetWeeklySchedule {
 enum class Fields
 {
@@ -22193,8 +19703,8 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::GetWeeklySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
 
-    chip::BitFlags<DayOfWeek> daysToReturn       = static_cast<chip::BitFlags<DayOfWeek>>(0);
-    chip::BitFlags<ModeForSequence> modeToReturn = static_cast<chip::BitFlags<ModeForSequence>>(0);
+    chip::BitMask<DayOfWeek> daysToReturn       = static_cast<chip::BitMask<DayOfWeek>>(0);
+    chip::BitMask<ModeForSequence> modeToReturn = static_cast<chip::BitMask<ModeForSequence>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -22209,8 +19719,8 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::GetWeeklySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
 
-    chip::BitFlags<DayOfWeek> daysToReturn       = static_cast<chip::BitFlags<DayOfWeek>>(0);
-    chip::BitFlags<ModeForSequence> modeToReturn = static_cast<chip::BitFlags<ModeForSequence>>(0);
+    chip::BitMask<DayOfWeek> daysToReturn       = static_cast<chip::BitMask<DayOfWeek>>(0);
+    chip::BitMask<ModeForSequence> modeToReturn = static_cast<chip::BitMask<ModeForSequence>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace GetWeeklySchedule
@@ -22242,34 +19752,6 @@ struct DecodableType
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace ClearWeeklySchedule
-namespace GetRelayStatusLog {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetRelayStatusLog::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetRelayStatusLog::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetRelayStatusLog
 } // namespace Commands
 
 namespace Attributes {
@@ -22550,18 +20032,6 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace SystemMode
-namespace AlarmMask {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmMask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AlarmMask
 namespace ThermostatRunningMode {
 struct TypeInfo
 {
@@ -22875,63 +20345,33 @@ struct TypeInfo
 };
 } // namespace ACCapacityformat
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -22967,7 +20407,6 @@ struct TypeInfo
         Attributes::ControlSequenceOfOperation::TypeInfo::DecodableType controlSequenceOfOperation =
             static_cast<chip::app::Clusters::Thermostat::ThermostatControlSequence>(0);
         Attributes::SystemMode::TypeInfo::DecodableType systemMode                               = static_cast<uint8_t>(0);
-        Attributes::AlarmMask::TypeInfo::DecodableType alarmMask                                 = static_cast<uint8_t>(0);
         Attributes::ThermostatRunningMode::TypeInfo::DecodableType thermostatRunningMode         = static_cast<uint8_t>(0);
         Attributes::StartOfWeek::TypeInfo::DecodableType startOfWeek                             = static_cast<uint8_t>(0);
         Attributes::NumberOfWeeklyTransitions::TypeInfo::DecodableType numberOfWeeklyTransitions = static_cast<uint8_t>(0);
@@ -23141,63 +20580,33 @@ struct TypeInfo
 };
 } // namespace WindSetting
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FanControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FanControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FanControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FanControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FanControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -23331,63 +20740,33 @@ struct TypeInfo
 };
 } // namespace RelativeHumidityDisplay
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DehumidificationControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DehumidificationControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DehumidificationControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DehumidificationControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DehumidificationControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -23457,63 +20836,33 @@ struct TypeInfo
 };
 } // namespace ScheduleProgrammingVisibility
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ThermostatUserInterfaceConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -24301,13 +21650,13 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::ColorLoopSet::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
 
-    chip::BitFlags<ColorLoopUpdateFlags> updateFlags = static_cast<chip::BitFlags<ColorLoopUpdateFlags>>(0);
-    ColorLoopAction action                           = static_cast<ColorLoopAction>(0);
-    ColorLoopDirection direction                     = static_cast<ColorLoopDirection>(0);
-    uint16_t time                                    = static_cast<uint16_t>(0);
-    uint16_t startHue                                = static_cast<uint16_t>(0);
-    uint8_t optionsMask                              = static_cast<uint8_t>(0);
-    uint8_t optionsOverride                          = static_cast<uint8_t>(0);
+    chip::BitMask<ColorLoopUpdateFlags> updateFlags = static_cast<chip::BitMask<ColorLoopUpdateFlags>>(0);
+    ColorLoopAction action                          = static_cast<ColorLoopAction>(0);
+    ColorLoopDirection direction                    = static_cast<ColorLoopDirection>(0);
+    uint16_t time                                   = static_cast<uint16_t>(0);
+    uint16_t startHue                               = static_cast<uint16_t>(0);
+    uint8_t optionsMask                             = static_cast<uint8_t>(0);
+    uint8_t optionsOverride                         = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -24322,13 +21671,13 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::ColorLoopSet::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
 
-    chip::BitFlags<ColorLoopUpdateFlags> updateFlags = static_cast<chip::BitFlags<ColorLoopUpdateFlags>>(0);
-    ColorLoopAction action                           = static_cast<ColorLoopAction>(0);
-    ColorLoopDirection direction                     = static_cast<ColorLoopDirection>(0);
-    uint16_t time                                    = static_cast<uint16_t>(0);
-    uint16_t startHue                                = static_cast<uint16_t>(0);
-    uint8_t optionsMask                              = static_cast<uint8_t>(0);
-    uint8_t optionsOverride                          = static_cast<uint8_t>(0);
+    chip::BitMask<ColorLoopUpdateFlags> updateFlags = static_cast<chip::BitMask<ColorLoopUpdateFlags>>(0);
+    ColorLoopAction action                          = static_cast<ColorLoopAction>(0);
+    ColorLoopDirection direction                    = static_cast<ColorLoopDirection>(0);
+    uint16_t time                                   = static_cast<uint16_t>(0);
+    uint16_t startHue                               = static_cast<uint16_t>(0);
+    uint8_t optionsMask                             = static_cast<uint8_t>(0);
+    uint8_t optionsOverride                         = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace ColorLoopSet
@@ -25094,63 +22443,33 @@ struct TypeInfo
 };
 } // namespace StartUpColorTemperatureMireds
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -25423,63 +22742,33 @@ struct TypeInfo
 };
 } // namespace LampBurnHoursTripPoint
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BallastConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BallastConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BallastConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BallastConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BallastConfiguration::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -25581,63 +22870,33 @@ struct TypeInfo
 };
 } // namespace LightSensorType
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::IlluminanceMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::IlluminanceMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::IlluminanceMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::IlluminanceMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::IlluminanceMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -25716,63 +22975,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -25910,63 +23139,33 @@ struct TypeInfo
 };
 } // namespace Scale
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PressureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PressureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PressureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PressureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::PressureMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26049,63 +23248,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FlowMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FlowMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FlowMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FlowMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FlowMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26183,63 +23352,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::RelativeHumidityMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::RelativeHumidityMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::RelativeHumidityMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::RelativeHumidityMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::RelativeHumidityMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26413,63 +23552,33 @@ struct TypeInfo
 };
 } // namespace PhysicalContactUnoccupiedToOccupiedThreshold
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26562,63 +23671,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonMonoxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonMonoxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonMonoxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonMonoxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonMonoxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26696,63 +23775,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CarbonDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26830,63 +23879,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -26964,63 +23983,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::EthyleneOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27098,63 +24087,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27232,63 +24191,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenSulphideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenSulphideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenSulphideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenSulphideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HydrogenSulphideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27366,63 +24295,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitricOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitricOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitricOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitricOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitricOxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27500,63 +24399,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitrogenDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitrogenDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitrogenDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitrogenDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::NitrogenDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27634,63 +24503,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27768,63 +24607,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OzoneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OzoneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OzoneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OzoneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::OzoneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -27902,63 +24711,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfurDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfurDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfurDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfurDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfurDioxideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28036,63 +24815,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DissolvedOxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DissolvedOxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DissolvedOxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DissolvedOxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::DissolvedOxygenConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28170,63 +24919,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28304,63 +25023,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloraminesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloraminesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloraminesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloraminesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloraminesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28438,63 +25127,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorineConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorineConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorineConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorineConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorineConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28572,63 +25231,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FecalColiformAndEColiConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FecalColiformAndEColiConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FecalColiformAndEColiConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FecalColiformAndEColiConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FecalColiformAndEColiConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28706,63 +25335,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FluorideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FluorideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FluorideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FluorideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::FluorideConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28840,63 +25439,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HaloaceticAcidsConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HaloaceticAcidsConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HaloaceticAcidsConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HaloaceticAcidsConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::HaloaceticAcidsConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -28974,63 +25543,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalTrihalomethanesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalTrihalomethanesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalTrihalomethanesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalTrihalomethanesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalTrihalomethanesConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29108,63 +25647,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalColiformBacteriaConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalColiformBacteriaConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalColiformBacteriaConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalColiformBacteriaConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TotalColiformBacteriaConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29242,63 +25751,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TurbidityConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TurbidityConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TurbidityConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TurbidityConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::TurbidityConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29376,63 +25855,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CopperConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CopperConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CopperConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CopperConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::CopperConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29510,63 +25959,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LeadConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LeadConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LeadConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LeadConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::LeadConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29644,63 +26063,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ManganeseConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ManganeseConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ManganeseConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ManganeseConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ManganeseConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29778,63 +26167,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SulfateConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -29912,63 +26271,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromodichloromethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromodichloromethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromodichloromethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromodichloromethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromodichloromethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -30046,63 +26375,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromoformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromoformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromoformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromoformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::BromoformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -30180,63 +26479,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorodibromomethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorodibromomethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorodibromomethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorodibromomethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChlorodibromomethaneConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -30314,63 +26583,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloroformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloroformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloroformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloroformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::ChloroformConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -30448,63 +26687,33 @@ struct TypeInfo
 };
 } // namespace Tolerance
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SodiumConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SodiumConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SodiumConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SodiumConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
     static constexpr ClusterId GetClusterId() { return Clusters::SodiumConcentrationMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClusterRevision
 
@@ -30529,69 +26738,176 @@ struct TypeInfo
 };
 } // namespace Attributes
 } // namespace SodiumConcentrationMeasurement
-namespace IasZone {
+namespace WakeOnLan {
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+namespace Attributes {
 
-namespace ZoneEnrollResponse {
-struct Type;
-struct DecodableType;
-} // namespace ZoneEnrollResponse
+namespace MACAddress {
+struct TypeInfo
+{
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-namespace ZoneStatusChangeNotification {
-struct Type;
-struct DecodableType;
-} // namespace ZoneStatusChangeNotification
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MACAddress::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 32; }
+};
+} // namespace MACAddress
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+};
+} // namespace ClusterRevision
 
-namespace InitiateNormalOperationMode {
-struct Type;
-struct DecodableType;
-} // namespace InitiateNormalOperationMode
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::MACAddress::TypeInfo::DecodableType MACAddress;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace WakeOnLan
+namespace Channel {
+namespace Structs {
+namespace ChannelInfo {
+enum class Fields
+{
+    kMajorNumber       = 0,
+    kMinorNumber       = 1,
+    kName              = 2,
+    kCallSign          = 3,
+    kAffiliateCallSign = 4,
+};
+
+struct Type
+{
+public:
+    uint16_t majorNumber = static_cast<uint16_t>(0);
+    uint16_t minorNumber = static_cast<uint16_t>(0);
+    Optional<chip::CharSpan> name;
+    Optional<chip::CharSpan> callSign;
+    Optional<chip::CharSpan> affiliateCallSign;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
+
+using DecodableType = Type;
+
+} // namespace ChannelInfo
+namespace LineupInfo {
+enum class Fields
+{
+    kOperatorName   = 0,
+    kLineupName     = 1,
+    kPostalCode     = 2,
+    kLineupInfoType = 3,
+};
+
+struct Type
+{
+public:
+    chip::CharSpan operatorName;
+    Optional<chip::CharSpan> lineupName;
+    Optional<chip::CharSpan> postalCode;
+    LineupInfoTypeEnum lineupInfoType = static_cast<LineupInfoTypeEnum>(0);
 
-namespace ZoneEnrollRequest {
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
+
+using DecodableType = Type;
+
+} // namespace LineupInfo
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace ChangeChannel {
 struct Type;
 struct DecodableType;
-} // namespace ZoneEnrollRequest
+} // namespace ChangeChannel
 
-namespace InitiateTestMode {
+namespace ChangeChannelResponse {
 struct Type;
 struct DecodableType;
-} // namespace InitiateTestMode
+} // namespace ChangeChannelResponse
 
-namespace InitiateNormalOperationModeResponse {
+namespace ChangeChannelByNumber {
 struct Type;
 struct DecodableType;
-} // namespace InitiateNormalOperationModeResponse
+} // namespace ChangeChannelByNumber
 
-namespace InitiateTestModeResponse {
+namespace SkipChannel {
 struct Type;
 struct DecodableType;
-} // namespace InitiateTestModeResponse
+} // namespace SkipChannel
 
 } // namespace Commands
 
 namespace Commands {
-namespace ZoneEnrollResponse {
+namespace ChangeChannel {
 enum class Fields
 {
-    kEnrollResponseCode = 0,
-    kZoneId             = 1,
+    kMatch = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ZoneEnrollResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeChannel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    IasEnrollResponseCode enrollResponseCode = static_cast<IasEnrollResponseCode>(0);
-    uint8_t zoneId                           = static_cast<uint8_t>(0);
+    chip::CharSpan match;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::Channel::Commands::ChangeChannelResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -30599,34 +26915,29 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ZoneEnrollResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeChannel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    IasEnrollResponseCode enrollResponseCode = static_cast<IasEnrollResponseCode>(0);
-    uint8_t zoneId                           = static_cast<uint8_t>(0);
+    chip::CharSpan match;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ZoneEnrollResponse
-namespace ZoneStatusChangeNotification {
+}; // namespace ChangeChannel
+namespace ChangeChannelResponse {
 enum class Fields
 {
-    kZoneStatus     = 0,
-    kExtendedStatus = 1,
-    kZoneId         = 2,
-    kDelay          = 3,
+    kStatus = 0,
+    kData   = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ZoneStatusChangeNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    chip::BitFlags<IasZoneStatus> zoneStatus = static_cast<chip::BitFlags<IasZoneStatus>>(0);
-    uint8_t extendedStatus                   = static_cast<uint8_t>(0);
-    uint8_t zoneId                           = static_cast<uint8_t>(0);
-    uint16_t delay                           = static_cast<uint16_t>(0);
+    ChannelStatusEnum status = static_cast<ChannelStatusEnum>(0);
+    Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -30638,31 +26949,34 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ZoneStatusChangeNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    chip::BitFlags<IasZoneStatus> zoneStatus = static_cast<chip::BitFlags<IasZoneStatus>>(0);
-    uint8_t extendedStatus                   = static_cast<uint8_t>(0);
-    uint8_t zoneId                           = static_cast<uint8_t>(0);
-    uint16_t delay                           = static_cast<uint16_t>(0);
+    ChannelStatusEnum status = static_cast<ChannelStatusEnum>(0);
+    Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ZoneStatusChangeNotification
-namespace InitiateNormalOperationMode {
+}; // namespace ChangeChannelResponse
+namespace ChangeChannelByNumber {
 enum class Fields
 {
+    kMajorNumber = 0,
+    kMinorNumber = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::InitiateNormalOperationMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumber::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+
+    uint16_t majorNumber = static_cast<uint16_t>(0);
+    uint16_t minorNumber = static_cast<uint16_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasZone::Commands::InitiateNormalOperationModeResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -30670,32 +26984,32 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::InitiateNormalOperationMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumber::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
+    uint16_t majorNumber = static_cast<uint16_t>(0);
+    uint16_t minorNumber = static_cast<uint16_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace InitiateNormalOperationMode
-namespace ZoneEnrollRequest {
+}; // namespace ChangeChannelByNumber
+namespace SkipChannel {
 enum class Fields
 {
-    kZoneType         = 0,
-    kManufacturerCode = 1,
+    kCount = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ZoneEnrollRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    IasZoneType zoneType      = static_cast<IasZoneType>(0);
-    uint16_t manufacturerCode = static_cast<uint16_t>(0);
+    uint16_t count = static_cast<uint16_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasZone::Commands::ZoneEnrollResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -30703,64 +27017,170 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ZoneEnrollRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    IasZoneType zoneType      = static_cast<IasZoneType>(0);
-    uint16_t manufacturerCode = static_cast<uint16_t>(0);
+    uint16_t count = static_cast<uint16_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ZoneEnrollRequest
-namespace InitiateTestMode {
-enum class Fields
+}; // namespace SkipChannel
+} // namespace Commands
+
+namespace Attributes {
+
+namespace ChannelList {
+struct TypeInfo
 {
-    kTestModeDuration            = 0,
-    kCurrentZoneSensitivityLevel = 1,
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::Channel::Structs::ChannelInfo::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ChannelList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace ChannelList
+namespace Lineup {
+struct TypeInfo
+{
+    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::Type>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Lineup::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Lineup
+namespace CurrentChannel {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::InitiateTestMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::Type>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> &;
 
-    uint8_t testModeDuration            = static_cast<uint8_t>(0);
-    uint8_t currentZoneSensitivityLevel = static_cast<uint8_t>(0);
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentChannel::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentChannel
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+};
+} // namespace ClusterRevision
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
 
-    using ResponseType = Clusters::IasZone::Commands::InitiateTestModeResponse::DecodableType;
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+        Attributes::ChannelList::TypeInfo::DecodableType channelList;
+        Attributes::Lineup::TypeInfo::DecodableType lineup;
+        Attributes::CurrentChannel::TypeInfo::DecodableType currentChannel;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace Channel
+namespace TargetNavigator {
+namespace Structs {
+namespace TargetInfo {
+enum class Fields
+{
+    kIdentifier = 0,
+    kName       = 1,
 };
 
-struct DecodableType
+struct Type
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::InitiateTestMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    uint8_t identifier = static_cast<uint8_t>(0);
+    chip::CharSpan name;
 
-    uint8_t testModeDuration            = static_cast<uint8_t>(0);
-    uint8_t currentZoneSensitivityLevel = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
-}; // namespace InitiateTestMode
-namespace InitiateNormalOperationModeResponse {
+
+using DecodableType = Type;
+
+} // namespace TargetInfo
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace NavigateTarget {
+struct Type;
+struct DecodableType;
+} // namespace NavigateTarget
+
+namespace NavigateTargetResponse {
+struct Type;
+struct DecodableType;
+} // namespace NavigateTargetResponse
+
+} // namespace Commands
+
+namespace Commands {
+namespace NavigateTarget {
 enum class Fields
 {
+    kTarget = 0,
+    kData   = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::InitiateNormalOperationModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::NavigateTarget::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+
+    uint8_t target = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -30768,23 +27188,30 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::InitiateNormalOperationModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::NavigateTarget::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 
+    uint8_t target = static_cast<uint8_t>(0);
+    Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace InitiateNormalOperationModeResponse
-namespace InitiateTestModeResponse {
+}; // namespace NavigateTarget
+namespace NavigateTargetResponse {
 enum class Fields
 {
+    kStatus = 0,
+    kData   = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::InitiateTestModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+
+    TargetNavigatorStatusEnum status = static_cast<TargetNavigatorStatusEnum>(0);
+    Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -30796,158 +27223,72 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::InitiateTestModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 
+    TargetNavigatorStatusEnum status = static_cast<TargetNavigatorStatusEnum>(0);
+    Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace InitiateTestModeResponse
+}; // namespace NavigateTargetResponse
 } // namespace Commands
 
 namespace Attributes {
 
-namespace ZoneState {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ZoneState::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ZoneState
-namespace ZoneType {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ZoneType::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ZoneType
-namespace ZoneStatus {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ZoneStatus::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ZoneStatus
-namespace IasCieAddress {
-struct TypeInfo
-{
-    using Type             = chip::NodeId;
-    using DecodableType    = chip::NodeId;
-    using DecodableArgType = chip::NodeId;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::IasCieAddress::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace IasCieAddress
-namespace ZoneId {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ZoneId::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ZoneId
-namespace NumberOfZoneSensitivityLevelsSupported {
+namespace TargetList {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfZoneSensitivityLevelsSupported::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TargetList::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NumberOfZoneSensitivityLevelsSupported
-namespace CurrentZoneSensitivityLevel {
+} // namespace TargetList
+namespace CurrentTarget {
 struct TypeInfo
 {
     using Type             = uint8_t;
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentZoneSensitivityLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentTarget::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentZoneSensitivityLevel
+} // namespace CurrentTarget
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 };
 } // namespace ClusterRevision
 
@@ -30955,18 +27296,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::IasZone::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::ZoneState::TypeInfo::DecodableType zoneState         = static_cast<uint8_t>(0);
-        Attributes::ZoneType::TypeInfo::DecodableType zoneType           = static_cast<uint16_t>(0);
-        Attributes::ZoneStatus::TypeInfo::DecodableType zoneStatus       = static_cast<uint16_t>(0);
-        Attributes::IasCieAddress::TypeInfo::DecodableType iasCieAddress = static_cast<chip::NodeId>(0);
-        Attributes::ZoneId::TypeInfo::DecodableType zoneId               = static_cast<uint8_t>(0);
-        Attributes::NumberOfZoneSensitivityLevelsSupported::TypeInfo::DecodableType numberOfZoneSensitivityLevelsSupported =
-            static_cast<uint8_t>(0);
-        Attributes::CurrentZoneSensitivityLevel::TypeInfo::DecodableType currentZoneSensitivityLevel = static_cast<uint8_t>(0);
+        Attributes::TargetList::TypeInfo::DecodableType targetList;
+        Attributes::CurrentTarget::TypeInfo::DecodableType currentTarget = static_cast<uint8_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -30975,21 +27310,21 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace IasZone
-namespace IasAce {
+} // namespace TargetNavigator
+namespace MediaPlayback {
 namespace Structs {
-namespace IasAceZoneStatusResult {
+namespace PlaybackPosition {
 enum class Fields
 {
-    kZoneId     = 0,
-    kZoneStatus = 1,
+    kUpdatedAt = 0,
+    kPosition  = 1,
 };
 
 struct Type
 {
 public:
-    uint8_t zoneId                           = static_cast<uint8_t>(0);
-    chip::BitFlags<IasZoneStatus> zoneStatus = static_cast<chip::BitFlags<IasZoneStatus>>(0);
+    uint64_t updatedAt = static_cast<uint64_t>(0);
+    DataModel::Nullable<uint64_t> position;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -31000,132 +27335,90 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace IasAceZoneStatusResult
+} // namespace PlaybackPosition
 } // namespace Structs
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace Arm {
-struct Type;
-struct DecodableType;
-} // namespace Arm
-
-namespace ArmResponse {
-struct Type;
-struct DecodableType;
-} // namespace ArmResponse
-
-namespace Bypass {
-struct Type;
-struct DecodableType;
-} // namespace Bypass
-
-namespace GetZoneIdMapResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetZoneIdMapResponse
-
-namespace Emergency {
-struct Type;
-struct DecodableType;
-} // namespace Emergency
-
-namespace GetZoneInformationResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetZoneInformationResponse
-
-namespace Fire {
-struct Type;
-struct DecodableType;
-} // namespace Fire
-
-namespace ZoneStatusChanged {
+namespace Play {
 struct Type;
 struct DecodableType;
-} // namespace ZoneStatusChanged
+} // namespace Play
 
-namespace Panic {
+namespace Pause {
 struct Type;
 struct DecodableType;
-} // namespace Panic
+} // namespace Pause
 
-namespace PanelStatusChanged {
+namespace StopPlayback {
 struct Type;
 struct DecodableType;
-} // namespace PanelStatusChanged
+} // namespace StopPlayback
 
-namespace GetZoneIdMap {
+namespace StartOver {
 struct Type;
 struct DecodableType;
-} // namespace GetZoneIdMap
+} // namespace StartOver
 
-namespace GetPanelStatusResponse {
+namespace Previous {
 struct Type;
 struct DecodableType;
-} // namespace GetPanelStatusResponse
+} // namespace Previous
 
-namespace GetZoneInformation {
+namespace Next {
 struct Type;
 struct DecodableType;
-} // namespace GetZoneInformation
+} // namespace Next
 
-namespace SetBypassedZoneList {
+namespace Rewind {
 struct Type;
 struct DecodableType;
-} // namespace SetBypassedZoneList
+} // namespace Rewind
 
-namespace GetPanelStatus {
+namespace FastForward {
 struct Type;
 struct DecodableType;
-} // namespace GetPanelStatus
+} // namespace FastForward
 
-namespace BypassResponse {
+namespace SkipForward {
 struct Type;
 struct DecodableType;
-} // namespace BypassResponse
+} // namespace SkipForward
 
-namespace GetBypassedZoneList {
+namespace SkipBackward {
 struct Type;
 struct DecodableType;
-} // namespace GetBypassedZoneList
+} // namespace SkipBackward
 
-namespace GetZoneStatusResponse {
+namespace PlaybackResponse {
 struct Type;
 struct DecodableType;
-} // namespace GetZoneStatusResponse
+} // namespace PlaybackResponse
 
-namespace GetZoneStatus {
+namespace Seek {
 struct Type;
 struct DecodableType;
-} // namespace GetZoneStatus
+} // namespace Seek
 
 } // namespace Commands
 
 namespace Commands {
-namespace Arm {
+namespace Play {
 enum class Fields
 {
-    kArmMode       = 0,
-    kArmDisarmCode = 1,
-    kZoneId        = 2,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Arm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    IasAceArmMode armMode = static_cast<IasAceArmMode>(0);
-    chip::CharSpan armDisarmCode;
-    uint8_t zoneId = static_cast<uint8_t>(0);
+    static constexpr CommandId GetCommandId() { return Commands::Play::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasAce::Commands::ArmResponse::DecodableType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31133,33 +27426,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Arm::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Play::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    IasAceArmMode armMode = static_cast<IasAceArmMode>(0);
-    chip::CharSpan armDisarmCode;
-    uint8_t zoneId = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Arm
-namespace ArmResponse {
+}; // namespace Play
+namespace Pause {
 enum class Fields
 {
-    kArmNotification = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ArmResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    IasAceArmNotification armNotification = static_cast<IasAceArmNotification>(0);
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31167,35 +27454,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ArmResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    IasAceArmNotification armNotification = static_cast<IasAceArmNotification>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ArmResponse
-namespace Bypass {
+}; // namespace Pause
+namespace StopPlayback {
 enum class Fields
 {
-    kNumberOfZones = 0,
-    kZoneIds       = 1,
-    kArmDisarmCode = 2,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Bypass::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    uint8_t numberOfZones = static_cast<uint8_t>(0);
-    DataModel::List<const uint8_t> zoneIds;
-    chip::CharSpan armDisarmCode;
+    static constexpr CommandId GetCommandId() { return Commands::StopPlayback::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasAce::Commands::BypassResponse::DecodableType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31203,63 +27482,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Bypass::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::StopPlayback::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    uint8_t numberOfZones = static_cast<uint8_t>(0);
-    DataModel::DecodableList<uint8_t> zoneIds;
-    chip::CharSpan armDisarmCode;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Bypass
-namespace GetZoneIdMapResponse {
+}; // namespace StopPlayback
+namespace StartOver {
 enum class Fields
 {
-    kSection0  = 0,
-    kSection1  = 1,
-    kSection2  = 2,
-    kSection3  = 3,
-    kSection4  = 4,
-    kSection5  = 5,
-    kSection6  = 6,
-    kSection7  = 7,
-    kSection8  = 8,
-    kSection9  = 9,
-    kSection10 = 10,
-    kSection11 = 11,
-    kSection12 = 12,
-    kSection13 = 13,
-    kSection14 = 14,
-    kSection15 = 15,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneIdMapResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    uint16_t section0  = static_cast<uint16_t>(0);
-    uint16_t section1  = static_cast<uint16_t>(0);
-    uint16_t section2  = static_cast<uint16_t>(0);
-    uint16_t section3  = static_cast<uint16_t>(0);
-    uint16_t section4  = static_cast<uint16_t>(0);
-    uint16_t section5  = static_cast<uint16_t>(0);
-    uint16_t section6  = static_cast<uint16_t>(0);
-    uint16_t section7  = static_cast<uint16_t>(0);
-    uint16_t section8  = static_cast<uint16_t>(0);
-    uint16_t section9  = static_cast<uint16_t>(0);
-    uint16_t section10 = static_cast<uint16_t>(0);
-    uint16_t section11 = static_cast<uint16_t>(0);
-    uint16_t section12 = static_cast<uint16_t>(0);
-    uint16_t section13 = static_cast<uint16_t>(0);
-    uint16_t section14 = static_cast<uint16_t>(0);
-    uint16_t section15 = static_cast<uint16_t>(0);
+    static constexpr CommandId GetCommandId() { return Commands::StartOver::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31267,29 +27510,13 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneIdMapResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::StartOver::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    uint16_t section0  = static_cast<uint16_t>(0);
-    uint16_t section1  = static_cast<uint16_t>(0);
-    uint16_t section2  = static_cast<uint16_t>(0);
-    uint16_t section3  = static_cast<uint16_t>(0);
-    uint16_t section4  = static_cast<uint16_t>(0);
-    uint16_t section5  = static_cast<uint16_t>(0);
-    uint16_t section6  = static_cast<uint16_t>(0);
-    uint16_t section7  = static_cast<uint16_t>(0);
-    uint16_t section8  = static_cast<uint16_t>(0);
-    uint16_t section9  = static_cast<uint16_t>(0);
-    uint16_t section10 = static_cast<uint16_t>(0);
-    uint16_t section11 = static_cast<uint16_t>(0);
-    uint16_t section12 = static_cast<uint16_t>(0);
-    uint16_t section13 = static_cast<uint16_t>(0);
-    uint16_t section14 = static_cast<uint16_t>(0);
-    uint16_t section15 = static_cast<uint16_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetZoneIdMapResponse
-namespace Emergency {
+}; // namespace StartOver
+namespace Previous {
 enum class Fields
 {
 };
@@ -31298,12 +27525,12 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Emergency::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Previous::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31311,36 +27538,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Emergency::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Previous::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Emergency
-namespace GetZoneInformationResponse {
+}; // namespace Previous
+namespace Next {
 enum class Fields
 {
-    kZoneId      = 0,
-    kZoneType    = 1,
-    kIeeeAddress = 2,
-    kZoneLabel   = 3,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneInformationResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    uint8_t zoneId           = static_cast<uint8_t>(0);
-    IasZoneType zoneType     = static_cast<IasZoneType>(0);
-    chip::NodeId ieeeAddress = static_cast<chip::NodeId>(0);
-    chip::CharSpan zoneLabel;
+    static constexpr CommandId GetCommandId() { return Commands::Next::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31348,17 +27566,13 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneInformationResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Next::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    uint8_t zoneId           = static_cast<uint8_t>(0);
-    IasZoneType zoneType     = static_cast<IasZoneType>(0);
-    chip::NodeId ieeeAddress = static_cast<chip::NodeId>(0);
-    chip::CharSpan zoneLabel;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetZoneInformationResponse
-namespace Fire {
+}; // namespace Next
+namespace Rewind {
 enum class Fields
 {
 };
@@ -31367,12 +27581,12 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Fire::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Rewind::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31380,36 +27594,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Fire::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Rewind::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Fire
-namespace ZoneStatusChanged {
+}; // namespace Rewind
+namespace FastForward {
 enum class Fields
 {
-    kZoneId              = 0,
-    kZoneStatus          = 1,
-    kAudibleNotification = 2,
-    kZoneLabel           = 3,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ZoneStatusChanged::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    uint8_t zoneId                                = static_cast<uint8_t>(0);
-    uint16_t zoneStatus                           = static_cast<uint16_t>(0);
-    IasAceAudibleNotification audibleNotification = static_cast<IasAceAudibleNotification>(0);
-    chip::CharSpan zoneLabel;
+    static constexpr CommandId GetCommandId() { return Commands::FastForward::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31417,31 +27622,30 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ZoneStatusChanged::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::FastForward::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    uint8_t zoneId                                = static_cast<uint8_t>(0);
-    uint16_t zoneStatus                           = static_cast<uint16_t>(0);
-    IasAceAudibleNotification audibleNotification = static_cast<IasAceAudibleNotification>(0);
-    chip::CharSpan zoneLabel;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ZoneStatusChanged
-namespace Panic {
+}; // namespace FastForward
+namespace SkipForward {
 enum class Fields
 {
+    kDeltaPositionMilliseconds = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Panic::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SkipForward::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+
+    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31449,36 +27653,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Panic::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SkipForward::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
+    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Panic
-namespace PanelStatusChanged {
+}; // namespace SkipForward
+namespace SkipBackward {
 enum class Fields
 {
-    kPanelStatus         = 0,
-    kSecondsRemaining    = 1,
-    kAudibleNotification = 2,
-    kAlarmStatus         = 3,
+    kDeltaPositionMilliseconds = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::PanelStatusChanged::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SkipBackward::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    IasAcePanelStatus panelStatus                 = static_cast<IasAcePanelStatus>(0);
-    uint8_t secondsRemaining                      = static_cast<uint8_t>(0);
-    IasAceAudibleNotification audibleNotification = static_cast<IasAceAudibleNotification>(0);
-    IasAceAlarmStatus alarmStatus                 = static_cast<IasAceAlarmStatus>(0);
+    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31486,31 +27685,33 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::PanelStatusChanged::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SkipBackward::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    IasAcePanelStatus panelStatus                 = static_cast<IasAcePanelStatus>(0);
-    uint8_t secondsRemaining                      = static_cast<uint8_t>(0);
-    IasAceAudibleNotification audibleNotification = static_cast<IasAceAudibleNotification>(0);
-    IasAceAlarmStatus alarmStatus                 = static_cast<IasAceAlarmStatus>(0);
+    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace PanelStatusChanged
-namespace GetZoneIdMap {
+}; // namespace SkipBackward
+namespace PlaybackResponse {
 enum class Fields
 {
+    kStatus = 0,
+    kData   = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneIdMap::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+
+    MediaPlaybackStatusEnum status = static_cast<MediaPlaybackStatusEnum>(0);
+    Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasAce::Commands::GetZoneIdMapResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31518,36 +27719,32 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneIdMap::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
+    MediaPlaybackStatusEnum status = static_cast<MediaPlaybackStatusEnum>(0);
+    Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetZoneIdMap
-namespace GetPanelStatusResponse {
+}; // namespace PlaybackResponse
+namespace Seek {
 enum class Fields
 {
-    kPanelStatus         = 0,
-    kSecondsRemaining    = 1,
-    kAudibleNotification = 2,
-    kAlarmStatus         = 3,
+    kPosition = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetPanelStatusResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Seek::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    IasAcePanelStatus panelStatus                 = static_cast<IasAcePanelStatus>(0);
-    uint8_t secondsRemaining                      = static_cast<uint8_t>(0);
-    IasAceAudibleNotification audibleNotification = static_cast<IasAceAudibleNotification>(0);
-    IasAceAlarmStatus alarmStatus                 = static_cast<IasAceAlarmStatus>(0);
+    uint64_t position = static_cast<uint64_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31555,98 +27752,234 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetPanelStatusResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Seek::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
 
-    IasAcePanelStatus panelStatus                 = static_cast<IasAcePanelStatus>(0);
-    uint8_t secondsRemaining                      = static_cast<uint8_t>(0);
-    IasAceAudibleNotification audibleNotification = static_cast<IasAceAudibleNotification>(0);
-    IasAceAlarmStatus alarmStatus                 = static_cast<IasAceAlarmStatus>(0);
+    uint64_t position = static_cast<uint64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetPanelStatusResponse
-namespace GetZoneInformation {
-enum class Fields
+}; // namespace Seek
+} // namespace Commands
+
+namespace Attributes {
+
+namespace CurrentState {
+struct TypeInfo
 {
-    kZoneId = 0,
+    using Type             = chip::app::Clusters::MediaPlayback::PlaybackStateEnum;
+    using DecodableType    = chip::app::Clusters::MediaPlayback::PlaybackStateEnum;
+    using DecodableArgType = chip::app::Clusters::MediaPlayback::PlaybackStateEnum;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace CurrentState
+namespace StartTime {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StartTime
+namespace Duration {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneInformation::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    uint8_t zoneId = static_cast<uint8_t>(0);
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Duration::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Duration
+namespace SampledPosition {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Type>;
+    using DecodableType =
+        chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> &;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SampledPosition::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SampledPosition
+namespace PlaybackSpeed {
+struct TypeInfo
+{
+    using Type             = float;
+    using DecodableType    = float;
+    using DecodableArgType = float;
 
-    using ResponseType = Clusters::IasAce::Commands::GetZoneInformationResponse::DecodableType;
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PlaybackSpeed::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PlaybackSpeed
+namespace SeekRangeEnd {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SeekRangeEnd::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace SeekRangeEnd
+namespace SeekRangeStart {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-struct DecodableType
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SeekRangeStart::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SeekRangeStart
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneInformation::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+};
+} // namespace ClusterRevision
 
-    uint8_t zoneId = static_cast<uint8_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::CurrentState::TypeInfo::DecodableType currentState =
+            static_cast<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>(0);
+        Attributes::StartTime::TypeInfo::DecodableType startTime;
+        Attributes::Duration::TypeInfo::DecodableType duration;
+        Attributes::SampledPosition::TypeInfo::DecodableType sampledPosition;
+        Attributes::PlaybackSpeed::TypeInfo::DecodableType playbackSpeed = static_cast<float>(0);
+        Attributes::SeekRangeEnd::TypeInfo::DecodableType seekRangeEnd;
+        Attributes::SeekRangeStart::TypeInfo::DecodableType seekRangeStart;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
 };
-}; // namespace GetZoneInformation
-namespace SetBypassedZoneList {
+} // namespace Attributes
+} // namespace MediaPlayback
+namespace MediaInput {
+namespace Structs {
+namespace InputInfo {
 enum class Fields
 {
-    kNumberOfZones = 0,
-    kZoneIds       = 1,
+    kIndex       = 0,
+    kInputType   = 1,
+    kName        = 2,
+    kDescription = 3,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SetBypassedZoneList::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    uint8_t index           = static_cast<uint8_t>(0);
+    InputTypeEnum inputType = static_cast<InputTypeEnum>(0);
+    chip::CharSpan name;
+    chip::CharSpan description;
 
-    uint8_t numberOfZones = static_cast<uint8_t>(0);
-    DataModel::List<const uint8_t> zoneIds;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
 
-    using ResponseType = DataModel::NullObjectType;
+using DecodableType = Type;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
+} // namespace InputInfo
+} // namespace Structs
 
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SetBypassedZoneList::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-    uint8_t numberOfZones = static_cast<uint8_t>(0);
-    DataModel::DecodableList<uint8_t> zoneIds;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SetBypassedZoneList
-namespace GetPanelStatus {
+namespace SelectInput {
+struct Type;
+struct DecodableType;
+} // namespace SelectInput
+
+namespace ShowInputStatus {
+struct Type;
+struct DecodableType;
+} // namespace ShowInputStatus
+
+namespace HideInputStatus {
+struct Type;
+struct DecodableType;
+} // namespace HideInputStatus
+
+namespace RenameInput {
+struct Type;
+struct DecodableType;
+} // namespace RenameInput
+
+} // namespace Commands
+
+namespace Commands {
+namespace SelectInput {
 enum class Fields
 {
+    kIndex = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetPanelStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SelectInput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+
+    uint8_t index = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasAce::Commands::GetPanelStatusResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31654,28 +27987,24 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetPanelStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SelectInput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
+    uint8_t index = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetPanelStatus
-namespace BypassResponse {
+}; // namespace SelectInput
+namespace ShowInputStatus {
 enum class Fields
 {
-    kNumberOfZones = 0,
-    kBypassResult  = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::BypassResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    uint8_t numberOfZones = static_cast<uint8_t>(0);
-    DataModel::List<const IasAceBypassResult> bypassResult;
+    static constexpr CommandId GetCommandId() { return Commands::ShowInputStatus::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -31687,15 +28016,13 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::BypassResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ShowInputStatus::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
-    uint8_t numberOfZones = static_cast<uint8_t>(0);
-    DataModel::DecodableList<IasAceBypassResult> bypassResult;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace BypassResponse
-namespace GetBypassedZoneList {
+}; // namespace ShowInputStatus
+namespace HideInputStatus {
 enum class Fields
 {
 };
@@ -31704,8 +28031,8 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetBypassedZoneList::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::HideInputStatus::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -31717,30 +28044,28 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetBypassedZoneList::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::HideInputStatus::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetBypassedZoneList
-namespace GetZoneStatusResponse {
+}; // namespace HideInputStatus
+namespace RenameInput {
 enum class Fields
 {
-    kZoneStatusComplete = 0,
-    kNumberOfZones      = 1,
-    kZoneStatusResult   = 2,
+    kIndex = 0,
+    kName  = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneStatusResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RenameInput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
-    bool zoneStatusComplete = static_cast<bool>(0);
-    uint8_t numberOfZones   = static_cast<uint8_t>(0);
-    DataModel::List<const Structs::IasAceZoneStatusResult::Type> zoneStatusResult;
+    uint8_t index = static_cast<uint8_t>(0);
+    chip::CharSpan name;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -31752,39 +28077,121 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneStatusResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RenameInput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
 
-    bool zoneStatusComplete = static_cast<bool>(0);
-    uint8_t numberOfZones   = static_cast<uint8_t>(0);
-    DataModel::DecodableList<Structs::IasAceZoneStatusResult::DecodableType> zoneStatusResult;
+    uint8_t index = static_cast<uint8_t>(0);
+    chip::CharSpan name;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetZoneStatusResponse
-namespace GetZoneStatus {
+}; // namespace RenameInput
+} // namespace Commands
+
+namespace Attributes {
+
+namespace InputList {
+struct TypeInfo
+{
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::MediaInput::Structs::InputInfo::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InputList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace InputList
+namespace CurrentInput {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentInput::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentInput
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::InputList::TypeInfo::DecodableType inputList;
+        Attributes::CurrentInput::TypeInfo::DecodableType currentInput = static_cast<uint8_t>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace MediaInput
+namespace LowPower {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace Sleep {
+struct Type;
+struct DecodableType;
+} // namespace Sleep
+
+} // namespace Commands
+
+namespace Commands {
+namespace Sleep {
 enum class Fields
 {
-    kStartingZoneId     = 0,
-    kMaxNumberOfZoneIds = 1,
-    kZoneStatusMaskFlag = 2,
-    kZoneStatusMask     = 3,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-
-    uint8_t startingZoneId     = static_cast<uint8_t>(0);
-    uint8_t maxNumberOfZoneIds = static_cast<uint8_t>(0);
-    bool zoneStatusMaskFlag    = static_cast<bool>(0);
-    uint16_t zoneStatusMask    = static_cast<uint16_t>(0);
+    static constexpr CommandId GetCommandId() { return Commands::Sleep::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::IasAce::Commands::GetZoneStatusResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31792,78 +28199,44 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetZoneStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Sleep::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 
-    uint8_t startingZoneId     = static_cast<uint8_t>(0);
-    uint8_t maxNumberOfZoneIds = static_cast<uint8_t>(0);
-    bool zoneStatusMaskFlag    = static_cast<bool>(0);
-    uint16_t zoneStatusMask    = static_cast<uint16_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetZoneStatus
+}; // namespace Sleep
 } // namespace Commands
 
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 };
 } // namespace ClusterRevision
 
@@ -31871,7 +28244,7 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::IasAce::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
@@ -31883,49 +28256,43 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace IasAce
-namespace IasWd {
+} // namespace LowPower
+namespace KeypadInput {
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace StartWarning {
+namespace SendKey {
 struct Type;
 struct DecodableType;
-} // namespace StartWarning
+} // namespace SendKey
 
-namespace Squawk {
+namespace SendKeyResponse {
 struct Type;
 struct DecodableType;
-} // namespace Squawk
+} // namespace SendKeyResponse
 
 } // namespace Commands
 
 namespace Commands {
-namespace StartWarning {
+namespace SendKey {
 enum class Fields
 {
-    kWarningInfo     = 0,
-    kWarningDuration = 1,
-    kStrobeDutyCycle = 2,
-    kStrobeLevel     = 3,
+    kKeyCode = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::StartWarning::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    chip::BitFlags<WarningInfo> warningInfo = static_cast<chip::BitFlags<WarningInfo>>(0);
-    uint16_t warningDuration                = static_cast<uint16_t>(0);
-    uint8_t strobeDutyCycle                 = static_cast<uint8_t>(0);
-    uint8_t strobeLevel                     = static_cast<uint8_t>(0);
+    CecKeyCode keyCode = static_cast<CecKeyCode>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -31933,30 +28300,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::StartWarning::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    chip::BitFlags<WarningInfo> warningInfo = static_cast<chip::BitFlags<WarningInfo>>(0);
-    uint16_t warningDuration                = static_cast<uint16_t>(0);
-    uint8_t strobeDutyCycle                 = static_cast<uint8_t>(0);
-    uint8_t strobeLevel                     = static_cast<uint8_t>(0);
+    CecKeyCode keyCode = static_cast<CecKeyCode>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace StartWarning
-namespace Squawk {
+}; // namespace SendKey
+namespace SendKeyResponse {
 enum class Fields
 {
-    kSquawkInfo = 0,
+    kStatus = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Squawk::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    chip::BitFlags<SquawkInfo> squawkInfo = static_cast<chip::BitFlags<SquawkInfo>>(0);
+    KeypadInputStatusEnum status = static_cast<KeypadInputStatusEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -31968,87 +28332,45 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Squawk::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
-    chip::BitFlags<SquawkInfo> squawkInfo = static_cast<chip::BitFlags<SquawkInfo>>(0);
+    KeypadInputStatusEnum status = static_cast<KeypadInputStatusEnum>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Squawk
+}; // namespace SendKeyResponse
 } // namespace Commands
 
 namespace Attributes {
 
-namespace MaxDuration {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MaxDuration::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace MaxDuration
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 };
 } // namespace ClusterRevision
 
@@ -32056,11 +28378,10 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::IasWd::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::MaxDuration::TypeInfo::DecodableType maxDuration = static_cast<uint16_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -32069,123 +28390,131 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace IasWd
-namespace WakeOnLan {
-
-namespace Attributes {
-
-namespace MACAddress {
-struct TypeInfo
+} // namespace KeypadInput
+namespace ContentLauncher {
+namespace Structs {
+namespace Dimension {
+enum class Fields
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MACAddress::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 32; }
+    kWidth  = 0,
+    kHeight = 1,
+    kMetric = 2,
 };
-} // namespace MACAddress
-namespace GeneratedCommandList {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    double width          = static_cast<double>(0);
+    double height         = static_cast<double>(0);
+    MetricTypeEnum metric = static_cast<MetricTypeEnum>(0);
 
-    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
+
+using DecodableType = Type;
+
+} // namespace Dimension
+namespace AdditionalInfo {
+enum class Fields
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    kName  = 0,
+    kValue = 1,
+};
 
-    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+struct Type
+{
+public:
+    chip::CharSpan name;
+    chip::CharSpan value;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
+
+using DecodableType = Type;
+
+} // namespace AdditionalInfo
+namespace Parameter {
+enum class Fields
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    kType           = 0,
+    kValue          = 1,
+    kExternalIDList = 2,
+};
 
-    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+struct Type
+{
+public:
+    ParameterEnum type = static_cast<ParameterEnum>(0);
+    chip::CharSpan value;
+    Optional<DataModel::List<const Structs::AdditionalInfo::Type>> externalIDList;
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    ParameterEnum type = static_cast<ParameterEnum>(0);
+    chip::CharSpan value;
+    Optional<DataModel::DecodableList<Structs::AdditionalInfo::DecodableType>> externalIDList;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
+
+} // namespace Parameter
+namespace ContentSearch {
+enum class Fields
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    kParameterList = 0,
+};
 
-    static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+struct Type
+{
+public:
+    DataModel::List<const Structs::Parameter::Type> parameterList;
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct DecodableType
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::WakeOnLan::Id; }
+public:
+    DataModel::DecodableList<Structs::Parameter::DecodableType> parameterList;
 
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 
-        Attributes::MACAddress::TypeInfo::DecodableType MACAddress;
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    static constexpr bool kIsFabricScoped = false;
 };
-} // namespace Attributes
-} // namespace WakeOnLan
-namespace Channel {
-namespace Structs {
-namespace ChannelInfo {
+
+} // namespace ContentSearch
+namespace StyleInformation {
 enum class Fields
 {
-    kMajorNumber       = 0,
-    kMinorNumber       = 1,
-    kName              = 2,
-    kCallSign          = 3,
-    kAffiliateCallSign = 4,
+    kImageUrl = 0,
+    kColor    = 1,
+    kSize     = 2,
 };
 
 struct Type
 {
 public:
-    uint16_t majorNumber = static_cast<uint16_t>(0);
-    uint16_t minorNumber = static_cast<uint16_t>(0);
-    Optional<chip::CharSpan> name;
-    Optional<chip::CharSpan> callSign;
-    Optional<chip::CharSpan> affiliateCallSign;
+    Optional<chip::CharSpan> imageUrl;
+    Optional<chip::CharSpan> color;
+    Optional<Structs::Dimension::Type> size;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -32196,23 +28525,27 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace ChannelInfo
-namespace LineupInfo {
+} // namespace StyleInformation
+namespace BrandingInformation {
 enum class Fields
 {
-    kOperatorName   = 0,
-    kLineupName     = 1,
-    kPostalCode     = 2,
-    kLineupInfoType = 3,
+    kProviderName = 0,
+    kBackground   = 1,
+    kLogo         = 2,
+    kProgressBar  = 3,
+    kSplash       = 4,
+    kWaterMark    = 5,
 };
 
 struct Type
 {
 public:
-    chip::CharSpan operatorName;
-    Optional<chip::CharSpan> lineupName;
-    Optional<chip::CharSpan> postalCode;
-    LineupInfoTypeEnum lineupInfoType = static_cast<LineupInfoTypeEnum>(0);
+    chip::CharSpan providerName;
+    Optional<Structs::StyleInformation::Type> background;
+    Optional<Structs::StyleInformation::Type> logo;
+    Optional<Structs::StyleInformation::Type> progressBar;
+    Optional<Structs::StyleInformation::Type> splash;
+    Optional<Structs::StyleInformation::Type> waterMark;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -32223,87 +28556,52 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace LineupInfo
+} // namespace BrandingInformation
 } // namespace Structs
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace ChangeChannel {
-struct Type;
-struct DecodableType;
-} // namespace ChangeChannel
-
-namespace ChangeChannelResponse {
+namespace LaunchContent {
 struct Type;
 struct DecodableType;
-} // namespace ChangeChannelResponse
+} // namespace LaunchContent
 
-namespace ChangeChannelByNumber {
+namespace LaunchURL {
 struct Type;
 struct DecodableType;
-} // namespace ChangeChannelByNumber
+} // namespace LaunchURL
 
-namespace SkipChannel {
+namespace LaunchResponse {
 struct Type;
 struct DecodableType;
-} // namespace SkipChannel
+} // namespace LaunchResponse
 
 } // namespace Commands
 
 namespace Commands {
-namespace ChangeChannel {
-enum class Fields
-{
-    kMatch = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeChannel::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-
-    chip::CharSpan match;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::Channel::Commands::ChangeChannelResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeChannel::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-
-    chip::CharSpan match;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace ChangeChannel
-namespace ChangeChannelResponse {
+namespace LaunchContent {
 enum class Fields
 {
-    kStatus = 0,
-    kData   = 1,
+    kSearch   = 0,
+    kAutoPlay = 1,
+    kData     = 2,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    ChannelStatusEnum status = static_cast<ChannelStatusEnum>(0);
+    Structs::ContentSearch::Type search;
+    bool autoPlay = static_cast<bool>(0);
     Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32311,34 +28609,37 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    ChannelStatusEnum status = static_cast<ChannelStatusEnum>(0);
+    Structs::ContentSearch::DecodableType search;
+    bool autoPlay = static_cast<bool>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ChangeChannelResponse
-namespace ChangeChannelByNumber {
+}; // namespace LaunchContent
+namespace LaunchURL {
 enum class Fields
 {
-    kMajorNumber = 0,
-    kMinorNumber = 1,
+    kContentURL          = 0,
+    kDisplayString       = 1,
+    kBrandingInformation = 2,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumber::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchURL::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    uint16_t majorNumber = static_cast<uint16_t>(0);
-    uint16_t minorNumber = static_cast<uint16_t>(0);
+    chip::CharSpan contentURL;
+    Optional<chip::CharSpan> displayString;
+    Optional<Structs::BrandingInformation::Type> brandingInformation;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32346,28 +28647,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumber::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchURL::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    uint16_t majorNumber = static_cast<uint16_t>(0);
-    uint16_t minorNumber = static_cast<uint16_t>(0);
+    chip::CharSpan contentURL;
+    Optional<chip::CharSpan> displayString;
+    Optional<Structs::BrandingInformation::DecodableType> brandingInformation;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ChangeChannelByNumber
-namespace SkipChannel {
+}; // namespace LaunchURL
+namespace LaunchResponse {
 enum class Fields
 {
-    kCount = 0,
+    kStatus = 0,
+    kData   = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    uint16_t count = static_cast<uint16_t>(0);
+    ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
+    Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -32379,114 +28683,70 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    uint16_t count = static_cast<uint16_t>(0);
+    ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
+    Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace SkipChannel
+}; // namespace LaunchResponse
 } // namespace Commands
 
 namespace Attributes {
 
-namespace ChannelList {
-struct TypeInfo
-{
-    using Type          = chip::app::DataModel::List<const chip::app::Clusters::Channel::Structs::ChannelInfo::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ChannelList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ChannelList
-namespace Lineup {
+namespace AcceptHeader {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::Type>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> &;
+    using Type             = chip::app::DataModel::List<const chip::CharSpan>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::CharSpan>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CharSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Lineup::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptHeader::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Lineup
-namespace CurrentChannel {
+} // namespace AcceptHeader
+namespace SupportedStreamingProtocols {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::Type>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> &;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentChannel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedStreamingProtocols::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentChannel
+} // namespace SupportedStreamingProtocols
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 };
 } // namespace ClusterRevision
 
@@ -32494,13 +28754,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::ChannelList::TypeInfo::DecodableType channelList;
-        Attributes::Lineup::TypeInfo::DecodableType lineup;
-        Attributes::CurrentChannel::TypeInfo::DecodableType currentChannel;
+        Attributes::AcceptHeader::TypeInfo::DecodableType acceptHeader;
+        Attributes::SupportedStreamingProtocols::TypeInfo::DecodableType supportedStreamingProtocols = static_cast<uint32_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -32509,20 +28768,22 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace Channel
-namespace TargetNavigator {
+} // namespace ContentLauncher
+namespace AudioOutput {
 namespace Structs {
-namespace TargetInfo {
+namespace OutputInfo {
 enum class Fields
 {
-    kIdentifier = 0,
-    kName       = 1,
+    kIndex      = 0,
+    kOutputType = 1,
+    kName       = 2,
 };
 
 struct Type
 {
 public:
-    uint8_t identifier = static_cast<uint8_t>(0);
+    uint8_t index             = static_cast<uint8_t>(0);
+    OutputTypeEnum outputType = static_cast<OutputTypeEnum>(0);
     chip::CharSpan name;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -32534,45 +28795,43 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace TargetInfo
+} // namespace OutputInfo
 } // namespace Structs
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace NavigateTarget {
+namespace SelectOutput {
 struct Type;
 struct DecodableType;
-} // namespace NavigateTarget
+} // namespace SelectOutput
 
-namespace NavigateTargetResponse {
+namespace RenameOutput {
 struct Type;
 struct DecodableType;
-} // namespace NavigateTargetResponse
+} // namespace RenameOutput
 
 } // namespace Commands
 
 namespace Commands {
-namespace NavigateTarget {
+namespace SelectOutput {
 enum class Fields
 {
-    kTarget = 0,
-    kData   = 1,
+    kIndex = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::NavigateTarget::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SelectOutput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 
-    uint8_t target = static_cast<uint8_t>(0);
-    Optional<chip::CharSpan> data;
+    uint8_t index = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32580,30 +28839,29 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::NavigateTarget::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SelectOutput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 
-    uint8_t target = static_cast<uint8_t>(0);
-    Optional<chip::CharSpan> data;
+    uint8_t index = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace NavigateTarget
-namespace NavigateTargetResponse {
+}; // namespace SelectOutput
+namespace RenameOutput {
 enum class Fields
 {
-    kStatus = 0,
-    kData   = 1,
+    kIndex = 0,
+    kName  = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RenameOutput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 
-    TargetNavigatorStatusEnum status = static_cast<TargetNavigatorStatusEnum>(0);
-    Optional<chip::CharSpan> data;
+    uint8_t index = static_cast<uint8_t>(0);
+    chip::CharSpan name;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -32615,102 +28873,71 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::RenameOutput::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 
-    TargetNavigatorStatusEnum status = static_cast<TargetNavigatorStatusEnum>(0);
-    Optional<chip::CharSpan> data;
+    uint8_t index = static_cast<uint8_t>(0);
+    chip::CharSpan name;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace NavigateTargetResponse
+}; // namespace RenameOutput
 } // namespace Commands
 
 namespace Attributes {
 
-namespace TargetList {
+namespace OutputList {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType>;
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::AudioOutput::Structs::OutputInfo::Type>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType>;
     using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> &;
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TargetList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OutputList::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace TargetList
-namespace CurrentTarget {
+} // namespace OutputList
+namespace CurrentOutput {
 struct TypeInfo
 {
     using Type             = uint8_t;
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentTarget::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentOutput::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentTarget
+} // namespace CurrentOutput
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 };
 } // namespace ClusterRevision
 
@@ -32718,12 +28945,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::TargetList::TypeInfo::DecodableType targetList;
-        Attributes::CurrentTarget::TypeInfo::DecodableType currentTarget = static_cast<uint8_t>(0);
+        Attributes::OutputList::TypeInfo::DecodableType outputList;
+        Attributes::CurrentOutput::TypeInfo::DecodableType currentOutput = static_cast<uint8_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -32732,21 +28959,21 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace TargetNavigator
-namespace MediaPlayback {
+} // namespace AudioOutput
+namespace ApplicationLauncher {
 namespace Structs {
-namespace PlaybackPosition {
+namespace Application {
 enum class Fields
 {
-    kUpdatedAt = 0,
-    kPosition  = 1,
+    kCatalogVendorId = 0,
+    kApplicationId   = 1,
 };
 
 struct Type
 {
 public:
-    uint64_t updatedAt = static_cast<uint64_t>(0);
-    DataModel::Nullable<uint64_t> position;
+    uint16_t catalogVendorId = static_cast<uint16_t>(0);
+    chip::CharSpan applicationId;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -32757,90 +28984,78 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace PlaybackPosition
-} // namespace Structs
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace Play {
-struct Type;
-struct DecodableType;
-} // namespace Play
+} // namespace Application
+namespace ApplicationEP {
+enum class Fields
+{
+    kApplication = 0,
+    kEndpoint    = 1,
+};
 
-namespace Pause {
-struct Type;
-struct DecodableType;
-} // namespace Pause
+struct Type
+{
+public:
+    Structs::Application::Type application;
+    Optional<chip::EndpointId> endpoint;
 
-namespace StopPlayback {
-struct Type;
-struct DecodableType;
-} // namespace StopPlayback
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 
-namespace StartOver {
-struct Type;
-struct DecodableType;
-} // namespace StartOver
+    static constexpr bool kIsFabricScoped = false;
 
-namespace Previous {
-struct Type;
-struct DecodableType;
-} // namespace Previous
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
 
-namespace Next {
-struct Type;
-struct DecodableType;
-} // namespace Next
+using DecodableType = Type;
 
-namespace Rewind {
-struct Type;
-struct DecodableType;
-} // namespace Rewind
+} // namespace ApplicationEP
+} // namespace Structs
 
-namespace FastForward {
-struct Type;
-struct DecodableType;
-} // namespace FastForward
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-namespace SkipForward {
+namespace LaunchApp {
 struct Type;
 struct DecodableType;
-} // namespace SkipForward
+} // namespace LaunchApp
 
-namespace SkipBackward {
+namespace StopApp {
 struct Type;
 struct DecodableType;
-} // namespace SkipBackward
+} // namespace StopApp
 
-namespace PlaybackResponse {
+namespace HideApp {
 struct Type;
 struct DecodableType;
-} // namespace PlaybackResponse
+} // namespace HideApp
 
-namespace Seek {
+namespace LauncherResponse {
 struct Type;
 struct DecodableType;
-} // namespace Seek
+} // namespace LauncherResponse
 
 } // namespace Commands
 
 namespace Commands {
-namespace Play {
+namespace LaunchApp {
 enum class Fields
 {
+    kApplication = 0,
+    kData        = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Play::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+
+    Structs::Application::Type application;
+    Optional<chip::ByteSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32848,27 +29063,32 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Play::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LaunchApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
 
+    Structs::Application::DecodableType application;
+    Optional<chip::ByteSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Play
-namespace Pause {
+}; // namespace LaunchApp
+namespace StopApp {
 enum class Fields
 {
+    kApplication = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::StopApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+
+    Structs::Application::Type application;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32876,27 +29096,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::StopApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
 
+    Structs::Application::DecodableType application;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Pause
-namespace StopPlayback {
+}; // namespace StopApp
+namespace HideApp {
 enum class Fields
 {
+    kApplication = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::StopPlayback::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::HideApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+
+    Structs::Application::Type application;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32904,27 +29128,33 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::StopPlayback::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::HideApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
 
+    Structs::Application::DecodableType application;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace StopPlayback
-namespace StartOver {
+}; // namespace HideApp
+namespace LauncherResponse {
 enum class Fields
 {
+    kStatus = 0,
+    kData   = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::StartOver::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+
+    ApplicationLauncherStatusEnum status = static_cast<ApplicationLauncherStatusEnum>(0);
+    chip::ByteSpan data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -32932,111 +29162,357 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::StartOver::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
 
+    ApplicationLauncherStatusEnum status = static_cast<ApplicationLauncherStatusEnum>(0);
+    chip::ByteSpan data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace StartOver
-namespace Previous {
+}; // namespace LauncherResponse
+} // namespace Commands
+
+namespace Attributes {
+
+namespace CatalogList {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::List<const uint16_t>;
+    using DecodableType    = chip::app::DataModel::DecodableList<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<uint16_t> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CatalogList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CatalogList
+namespace CurrentApp {
+struct TypeInfo
+{
+    using Type = chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type>;
+    using DecodableType =
+        chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentApp::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace CurrentApp
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::CatalogList::TypeInfo::DecodableType catalogList;
+        Attributes::CurrentApp::TypeInfo::DecodableType currentApp;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace ApplicationLauncher
+namespace ApplicationBasic {
+namespace Structs {
+namespace ApplicationBasicApplication {
 enum class Fields
 {
+    kCatalogVendorId = 0,
+    kApplicationId   = 1,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Previous::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    uint16_t catalogVendorId = static_cast<uint16_t>(0);
+    chip::CharSpan applicationId;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+using DecodableType = Type;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+} // namespace ApplicationBasicApplication
+} // namespace Structs
+
+namespace Attributes {
+
+namespace VendorName {
+struct TypeInfo
+{
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::VendorName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 32; }
 };
+} // namespace VendorName
+namespace VendorID {
+struct TypeInfo
+{
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-struct DecodableType
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::VendorID::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace VendorID
+namespace ApplicationName {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Previous::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 32; }
 };
-}; // namespace Previous
-namespace Next {
-enum class Fields
+} // namespace ApplicationName
+namespace ProductID {
+struct TypeInfo
 {
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ProductID::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace ProductID
+namespace Application {
+struct TypeInfo
+{
+    using Type             = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type;
+    using DecodableType    = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType;
+    using DecodableArgType = const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Application::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Application
+namespace Status {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Next::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    using Type             = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
+    using DecodableType    = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
+    using DecodableArgType = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Status::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Status
+namespace ApplicationVersion {
+struct TypeInfo
+{
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationVersion::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 32; }
+};
+} // namespace ApplicationVersion
+namespace AllowedVendorList {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::List<const chip::VendorId>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::VendorId>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::VendorId> &;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AllowedVendorList::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace AllowedVendorList
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
 };
+} // namespace ClusterRevision
 
-struct DecodableType
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Next::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::VendorName::TypeInfo::DecodableType vendorName;
+        Attributes::VendorID::TypeInfo::DecodableType vendorID = static_cast<uint16_t>(0);
+        Attributes::ApplicationName::TypeInfo::DecodableType applicationName;
+        Attributes::ProductID::TypeInfo::DecodableType productID = static_cast<uint16_t>(0);
+        Attributes::Application::TypeInfo::DecodableType application;
+        Attributes::Status::TypeInfo::DecodableType status =
+            static_cast<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>(0);
+        Attributes::ApplicationVersion::TypeInfo::DecodableType applicationVersion;
+        Attributes::AllowedVendorList::TypeInfo::DecodableType allowedVendorList;
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
 };
-}; // namespace Next
-namespace Rewind {
+} // namespace Attributes
+} // namespace ApplicationBasic
+namespace AccountLogin {
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace GetSetupPIN {
+struct Type;
+struct DecodableType;
+} // namespace GetSetupPIN
+
+namespace GetSetupPINResponse {
+struct Type;
+struct DecodableType;
+} // namespace GetSetupPINResponse
+
+namespace Login {
+struct Type;
+struct DecodableType;
+} // namespace Login
+
+namespace Logout {
+struct Type;
+struct DecodableType;
+} // namespace Logout
+
+} // namespace Commands
+
+namespace Commands {
+namespace GetSetupPIN {
 enum class Fields
 {
+    kTempAccountIdentifier = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Rewind::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetSetupPIN::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
+
+    chip::CharSpan tempAccountIdentifier;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr bool MustUseTimedInvoke() { return true; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Rewind::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetSetupPIN::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
+    chip::CharSpan tempAccountIdentifier;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Rewind
-namespace FastForward {
+}; // namespace GetSetupPIN
+namespace GetSetupPINResponse {
 enum class Fields
 {
+    kSetupPIN = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::FastForward::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetSetupPINResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
+
+    chip::CharSpan setupPIN;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -33044,291 +29520,108 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::FastForward::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetSetupPINResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
+    chip::CharSpan setupPIN;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace FastForward
-namespace SkipForward {
+}; // namespace GetSetupPINResponse
+namespace Login {
 enum class Fields
 {
-    kDeltaPositionMilliseconds = 0,
+    kTempAccountIdentifier = 0,
+    kSetupPIN              = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SkipForward::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-
-    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SkipForward::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-
-    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SkipForward
-namespace SkipBackward {
-enum class Fields
-{
-    kDeltaPositionMilliseconds = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SkipBackward::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-
-    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SkipBackward::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-
-    uint64_t deltaPositionMilliseconds = static_cast<uint64_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SkipBackward
-namespace PlaybackResponse {
-enum class Fields
-{
-    kStatus = 0,
-    kData   = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Login::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
-    MediaPlaybackStatusEnum status = static_cast<MediaPlaybackStatusEnum>(0);
-    Optional<chip::CharSpan> data;
+    chip::CharSpan tempAccountIdentifier;
+    chip::CharSpan setupPIN;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr bool MustUseTimedInvoke() { return true; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Login::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
-    MediaPlaybackStatusEnum status = static_cast<MediaPlaybackStatusEnum>(0);
-    Optional<chip::CharSpan> data;
+    chip::CharSpan tempAccountIdentifier;
+    chip::CharSpan setupPIN;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace PlaybackResponse
-namespace Seek {
+}; // namespace Login
+namespace Logout {
 enum class Fields
 {
-    kPosition = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Seek::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-
-    uint64_t position = static_cast<uint64_t>(0);
+    static constexpr CommandId GetCommandId() { return Commands::Logout::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr bool MustUseTimedInvoke() { return true; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Seek::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Logout::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
-    uint64_t position = static_cast<uint64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Seek
+}; // namespace Logout
 } // namespace Commands
 
 namespace Attributes {
 
-namespace CurrentState {
-struct TypeInfo
-{
-    using Type             = chip::app::Clusters::MediaPlayback::PlaybackStateEnum;
-    using DecodableType    = chip::app::Clusters::MediaPlayback::PlaybackStateEnum;
-    using DecodableArgType = chip::app::Clusters::MediaPlayback::PlaybackStateEnum;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentState::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace CurrentState
-namespace StartTime {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StartTime::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace StartTime
-namespace Duration {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Duration::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace Duration
-namespace SampledPosition {
-struct TypeInfo
-{
-    using Type = chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Type>;
-    using DecodableType =
-        chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SampledPosition::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SampledPosition
-namespace PlaybackSpeed {
-struct TypeInfo
-{
-    using Type             = float;
-    using DecodableType    = float;
-    using DecodableArgType = float;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PlaybackSpeed::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace PlaybackSpeed
-namespace SeekRangeEnd {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SeekRangeEnd::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SeekRangeEnd
-namespace SeekRangeStart {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SeekRangeStart::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SeekRangeStart
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 };
 } // namespace ClusterRevision
 
@@ -33336,18 +29629,10 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::CurrentState::TypeInfo::DecodableType currentState =
-            static_cast<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>(0);
-        Attributes::StartTime::TypeInfo::DecodableType startTime;
-        Attributes::Duration::TypeInfo::DecodableType duration;
-        Attributes::SampledPosition::TypeInfo::DecodableType sampledPosition;
-        Attributes::PlaybackSpeed::TypeInfo::DecodableType playbackSpeed = static_cast<float>(0);
-        Attributes::SeekRangeEnd::TypeInfo::DecodableType seekRangeEnd;
-        Attributes::SeekRangeStart::TypeInfo::DecodableType seekRangeStart;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -33356,78 +29641,75 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace MediaPlayback
-namespace MediaInput {
-namespace Structs {
-namespace InputInfo {
-enum class Fields
-{
-    kIndex       = 0,
-    kInputType   = 1,
-    kName        = 2,
-    kDescription = 3,
-};
-
-struct Type
-{
-public:
-    uint8_t index           = static_cast<uint8_t>(0);
-    InputTypeEnum inputType = static_cast<InputTypeEnum>(0);
-    chip::CharSpan name;
-    chip::CharSpan description;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
+} // namespace AccountLogin
+namespace Messaging {
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-using DecodableType = Type;
+namespace DisplayMessage {
+struct Type;
+struct DecodableType;
+} // namespace DisplayMessage
 
-} // namespace InputInfo
-} // namespace Structs
+namespace GetLastMessage {
+struct Type;
+struct DecodableType;
+} // namespace GetLastMessage
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+namespace CancelMessage {
+struct Type;
+struct DecodableType;
+} // namespace CancelMessage
 
-namespace SelectInput {
+namespace MessageConfirmation {
 struct Type;
 struct DecodableType;
-} // namespace SelectInput
+} // namespace MessageConfirmation
 
-namespace ShowInputStatus {
+namespace DisplayProtectedMessage {
 struct Type;
 struct DecodableType;
-} // namespace ShowInputStatus
+} // namespace DisplayProtectedMessage
 
-namespace HideInputStatus {
+namespace GetMessageCancellation {
 struct Type;
 struct DecodableType;
-} // namespace HideInputStatus
+} // namespace GetMessageCancellation
 
-namespace RenameInput {
+namespace CancelAllMessages {
 struct Type;
 struct DecodableType;
-} // namespace RenameInput
+} // namespace CancelAllMessages
 
 } // namespace Commands
 
 namespace Commands {
-namespace SelectInput {
+namespace DisplayMessage {
 enum class Fields
 {
-    kIndex = 0,
+    kMessageId                      = 0,
+    kMessageControl                 = 1,
+    kStartTime                      = 2,
+    kDurationInMinutes              = 3,
+    kMessage                        = 4,
+    kOptionalExtendedMessageControl = 5,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SelectInput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::DisplayMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
+    uint32_t messageId                                 = static_cast<uint32_t>(0);
+    chip::BitMask<MessagingControlMask> messageControl = static_cast<chip::BitMask<MessagingControlMask>>(0);
+    uint32_t startTime                                 = static_cast<uint32_t>(0);
+    uint16_t durationInMinutes                         = static_cast<uint16_t>(0);
+    chip::CharSpan message;
+    chip::BitMask<MessagingExtendedControlMask> optionalExtendedMessageControl =
+        static_cast<chip::BitMask<MessagingExtendedControlMask>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -33439,14 +29721,20 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::SelectInput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::DisplayMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
+    uint32_t messageId                                 = static_cast<uint32_t>(0);
+    chip::BitMask<MessagingControlMask> messageControl = static_cast<chip::BitMask<MessagingControlMask>>(0);
+    uint32_t startTime                                 = static_cast<uint32_t>(0);
+    uint16_t durationInMinutes                         = static_cast<uint16_t>(0);
+    chip::CharSpan message;
+    chip::BitMask<MessagingExtendedControlMask> optionalExtendedMessageControl =
+        static_cast<chip::BitMask<MessagingExtendedControlMask>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace SelectInput
-namespace ShowInputStatus {
+}; // namespace DisplayMessage
+namespace GetLastMessage {
 enum class Fields
 {
 };
@@ -33455,8 +29743,8 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::ShowInputStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetLastMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -33468,23 +29756,28 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ShowInputStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetLastMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ShowInputStatus
-namespace HideInputStatus {
+}; // namespace GetLastMessage
+namespace CancelMessage {
 enum class Fields
 {
+    kMessageId      = 0,
+    kMessageControl = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::HideInputStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::CancelMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+
+    uint32_t messageId                                 = static_cast<uint32_t>(0);
+    chip::BitMask<MessagingControlMask> messageControl = static_cast<chip::BitMask<MessagingControlMask>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -33496,28 +29789,34 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::HideInputStatus::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::CancelMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
+    uint32_t messageId                                 = static_cast<uint32_t>(0);
+    chip::BitMask<MessagingControlMask> messageControl = static_cast<chip::BitMask<MessagingControlMask>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace HideInputStatus
-namespace RenameInput {
+}; // namespace CancelMessage
+namespace MessageConfirmation {
 enum class Fields
 {
-    kIndex = 0,
-    kName  = 1,
+    kMessageId                  = 0,
+    kConfirmationTime           = 1,
+    kMessageConfirmationControl = 2,
+    kMessageResponse            = 3,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::RenameInput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::MessageConfirmation::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
-    chip::CharSpan name;
+    uint32_t messageId                 = static_cast<uint32_t>(0);
+    uint32_t confirmationTime          = static_cast<uint32_t>(0);
+    uint8_t messageConfirmationControl = static_cast<uint8_t>(0);
+    chip::ByteSpan messageResponse;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -33529,147 +29828,79 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::RenameInput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::MessageConfirmation::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
-    chip::CharSpan name;
+    uint32_t messageId                 = static_cast<uint32_t>(0);
+    uint32_t confirmationTime          = static_cast<uint32_t>(0);
+    uint8_t messageConfirmationControl = static_cast<uint8_t>(0);
+    chip::ByteSpan messageResponse;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace RenameInput
-} // namespace Commands
-
-namespace Attributes {
-
-namespace InputList {
-struct TypeInfo
-{
-    using Type          = chip::app::DataModel::List<const chip::app::Clusters::MediaInput::Structs::InputInfo::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InputList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace InputList
-namespace CurrentInput {
-struct TypeInfo
+}; // namespace MessageConfirmation
+namespace DisplayProtectedMessage {
+enum class Fields
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentInput::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kMessageId                      = 0,
+    kMessageControl                 = 1,
+    kStartTime                      = 2,
+    kDurationInMinutes              = 3,
+    kMessage                        = 4,
+    kOptionalExtendedMessageControl = 5,
 };
-} // namespace CurrentInput
-namespace GeneratedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::DisplayProtectedMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    uint32_t messageId                                 = static_cast<uint32_t>(0);
+    chip::BitMask<MessagingControlMask> messageControl = static_cast<chip::BitMask<MessagingControlMask>>(0);
+    uint32_t startTime                                 = static_cast<uint32_t>(0);
+    uint16_t durationInMinutes                         = static_cast<uint16_t>(0);
+    chip::CharSpan message;
+    chip::BitMask<MessagingExtendedControlMask> optionalExtendedMessageControl =
+        static_cast<chip::BitMask<MessagingExtendedControlMask>>(0);
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using ResponseType = DataModel::NullObjectType;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct DecodableType
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+public:
+    static constexpr CommandId GetCommandId() { return Commands::DisplayProtectedMessage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
-        Attributes::InputList::TypeInfo::DecodableType inputList;
-        Attributes::CurrentInput::TypeInfo::DecodableType currentInput = static_cast<uint8_t>(0);
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    uint32_t messageId                                 = static_cast<uint32_t>(0);
+    chip::BitMask<MessagingControlMask> messageControl = static_cast<chip::BitMask<MessagingControlMask>>(0);
+    uint32_t startTime                                 = static_cast<uint32_t>(0);
+    uint16_t durationInMinutes                         = static_cast<uint16_t>(0);
+    chip::CharSpan message;
+    chip::BitMask<MessagingExtendedControlMask> optionalExtendedMessageControl =
+        static_cast<chip::BitMask<MessagingExtendedControlMask>>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace Attributes
-} // namespace MediaInput
-namespace LowPower {
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace Sleep {
-struct Type;
-struct DecodableType;
-} // namespace Sleep
-
-} // namespace Commands
-
-namespace Commands {
-namespace Sleep {
+}; // namespace DisplayProtectedMessage
+namespace GetMessageCancellation {
 enum class Fields
 {
+    kEarliestImplementationTime = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Sleep::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetMessageCancellation::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+
+    uint32_t earliestImplementationTime = static_cast<uint32_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -33681,74 +29912,77 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Sleep::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetMessageCancellation::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
+    uint32_t earliestImplementationTime = static_cast<uint32_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Sleep
+}; // namespace GetMessageCancellation
+namespace CancelAllMessages {
+enum class Fields
+{
+    kImplementationDateTime = 0,
+};
+
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::CancelAllMessages::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+
+    uint32_t implementationDateTime = static_cast<uint32_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::CancelAllMessages::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+
+    uint32_t implementationDateTime = static_cast<uint32_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace CancelAllMessages
 } // namespace Commands
 
 namespace Attributes {
 
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 };
 } // namespace ClusterRevision
 
@@ -33756,7 +29990,7 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::LowPower::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
@@ -33768,162 +30002,213 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace LowPower
-namespace KeypadInput {
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace SendKey {
-struct Type;
-struct DecodableType;
-} // namespace SendKey
-
-namespace SendKeyResponse {
-struct Type;
-struct DecodableType;
-} // namespace SendKeyResponse
+} // namespace Messaging
+namespace ApplianceIdentification {
 
-} // namespace Commands
+namespace Attributes {
 
-namespace Commands {
-namespace SendKey {
-enum class Fields
+namespace BasicIdentification {
+struct TypeInfo
 {
-    kKeyCode = 0,
-};
+    using Type             = uint64_t;
+    using DecodableType    = uint64_t;
+    using DecodableArgType = uint64_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::BasicIdentification::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace BasicIdentification
+namespace CompanyName {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-
-    CecKeyCode keyCode = static_cast<CecKeyCode>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType;
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CompanyName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-
-struct DecodableType
+} // namespace CompanyName
+namespace CompanyId {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    CecKeyCode keyCode = static_cast<CecKeyCode>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CompanyId::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace SendKey
-namespace SendKeyResponse {
-enum class Fields
+} // namespace CompanyId
+namespace BrandName {
+struct TypeInfo
 {
-    kStatus = 0,
-};
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::BrandName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
+};
+} // namespace BrandName
+namespace BrandId {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-
-    KeypadInputStatusEnum status = static_cast<KeypadInputStatusEnum>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::BrandId::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace BrandId
+namespace Model {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    KeypadInputStatusEnum status = static_cast<KeypadInputStatusEnum>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Model::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-}; // namespace SendKeyResponse
-} // namespace Commands
-
-namespace Attributes {
-
-namespace GeneratedCommandList {
+} // namespace Model
+namespace PartNumber {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PartNumber::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
+} // namespace PartNumber
+namespace ProductRevision {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ProductRevision::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 6; }
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
+} // namespace ProductRevision
+namespace SoftwareRevision {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SoftwareRevision::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 6; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
+} // namespace SoftwareRevision
+namespace ProductTypeName {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ProductTypeName::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 2; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
+} // namespace ProductTypeName
+namespace ProductTypeId {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ProductTypeId::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ProductTypeId
+namespace CecedSpecificationVersion {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CecedSpecificationVersion::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace CecedSpecificationVersion
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
+};
 } // namespace ClusterRevision
 
 struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
+        Attributes::BasicIdentification::TypeInfo::DecodableType basicIdentification = static_cast<uint64_t>(0);
+        Attributes::CompanyName::TypeInfo::DecodableType companyName;
+        Attributes::CompanyId::TypeInfo::DecodableType companyId = static_cast<uint16_t>(0);
+        Attributes::BrandName::TypeInfo::DecodableType brandName;
+        Attributes::BrandId::TypeInfo::DecodableType brandId = static_cast<uint16_t>(0);
+        Attributes::Model::TypeInfo::DecodableType model;
+        Attributes::PartNumber::TypeInfo::DecodableType partNumber;
+        Attributes::ProductRevision::TypeInfo::DecodableType productRevision;
+        Attributes::SoftwareRevision::TypeInfo::DecodableType softwareRevision;
+        Attributes::ProductTypeName::TypeInfo::DecodableType productTypeName;
+        Attributes::ProductTypeId::TypeInfo::DecodableType productTypeId                         = static_cast<uint16_t>(0);
+        Attributes::CecedSpecificationVersion::TypeInfo::DecodableType cecedSpecificationVersion = static_cast<uint8_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -33932,218 +30217,266 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace KeypadInput
-namespace ContentLauncher {
-namespace Structs {
-namespace Dimension {
-enum class Fields
-{
-    kWidth  = 0,
-    kHeight = 1,
-    kMetric = 2,
-};
-
-struct Type
-{
-public:
-    double width          = static_cast<double>(0);
-    double height         = static_cast<double>(0);
-    MetricTypeEnum metric = static_cast<MetricTypeEnum>(0);
+} // namespace ApplianceIdentification
+namespace MeterIdentification {
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+namespace Attributes {
 
-    static constexpr bool kIsFabricScoped = false;
+namespace CompanyName {
+struct TypeInfo
+{
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CompanyName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-
-using DecodableType = Type;
-
-} // namespace Dimension
-namespace AdditionalInfo {
-enum class Fields
+} // namespace CompanyName
+namespace MeterTypeId {
+struct TypeInfo
 {
-    kName  = 0,
-    kValue = 1,
-};
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeterTypeId::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MeterTypeId
+namespace DataQualityId {
+struct TypeInfo
 {
-public:
-    chip::CharSpan name;
-    chip::CharSpan value;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DataQualityId::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-using DecodableType = Type;
-
-} // namespace AdditionalInfo
-namespace Parameter {
-enum class Fields
+} // namespace DataQualityId
+namespace CustomerName {
+struct TypeInfo
 {
-    kType           = 0,
-    kValue          = 1,
-    kExternalIDList = 2,
-};
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CustomerName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
+};
+} // namespace CustomerName
+namespace Model {
+struct TypeInfo
 {
-public:
-    ParameterEnum type = static_cast<ParameterEnum>(0);
-    chip::CharSpan value;
-    Optional<DataModel::List<const Structs::AdditionalInfo::Type>> externalIDList;
-
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Model::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-
-struct DecodableType
+} // namespace Model
+namespace PartNumber {
+struct TypeInfo
 {
-public:
-    ParameterEnum type = static_cast<ParameterEnum>(0);
-    chip::CharSpan value;
-    Optional<DataModel::DecodableList<Structs::AdditionalInfo::DecodableType>> externalIDList;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr bool kIsFabricScoped = false;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PartNumber::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-
-} // namespace Parameter
-namespace ContentSearch {
-enum class Fields
+} // namespace PartNumber
+namespace ProductRevision {
+struct TypeInfo
 {
-    kParameterList = 0,
-};
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ProductRevision::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 6; }
+};
+} // namespace ProductRevision
+namespace SoftwareRevision {
+struct TypeInfo
 {
-public:
-    DataModel::List<const Structs::Parameter::Type> parameterList;
-
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SoftwareRevision::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 6; }
 };
-
-struct DecodableType
+} // namespace SoftwareRevision
+namespace UtilityName {
+struct TypeInfo
 {
-public:
-    DataModel::DecodableList<Structs::Parameter::DecodableType> parameterList;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    static constexpr bool kIsFabricScoped = false;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::UtilityName::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
-
-} // namespace ContentSearch
-namespace StyleInformation {
-enum class Fields
+} // namespace UtilityName
+namespace Pod {
+struct TypeInfo
 {
-    kImageUrl = 0,
-    kColor    = 1,
-    kSize     = 2,
-};
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-struct Type
-{
-public:
-    Optional<chip::CharSpan> imageUrl;
-    Optional<chip::CharSpan> color;
-    Optional<Structs::Dimension::Type> size;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Pod::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 16; }
 };
+} // namespace Pod
+namespace AvailablePower {
+struct TypeInfo
+{
+    using Type             = int32_t;
+    using DecodableType    = int32_t;
+    using DecodableArgType = int32_t;
 
-using DecodableType = Type;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AvailablePower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace AvailablePower
+namespace PowerThreshold {
+struct TypeInfo
+{
+    using Type             = int32_t;
+    using DecodableType    = int32_t;
+    using DecodableArgType = int32_t;
 
-} // namespace StyleInformation
-namespace BrandingInformation {
-enum class Fields
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerThreshold::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PowerThreshold
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    kProviderName = 0,
-    kBackground   = 1,
-    kLogo         = 2,
-    kProgressBar  = 3,
-    kSplash       = 4,
-    kWaterMark    = 5,
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
 };
-
-struct Type
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-public:
-    chip::CharSpan providerName;
-    Optional<Structs::StyleInformation::Type> background;
-    Optional<Structs::StyleInformation::Type> logo;
-    Optional<Structs::StyleInformation::Type> progressBar;
-    Optional<Structs::StyleInformation::Type> splash;
-    Optional<Structs::StyleInformation::Type> waterMark;
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
+};
+} // namespace ClusterRevision
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
 
-    static constexpr bool kIsFabricScoped = false;
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+        Attributes::CompanyName::TypeInfo::DecodableType companyName;
+        Attributes::MeterTypeId::TypeInfo::DecodableType meterTypeId     = static_cast<uint16_t>(0);
+        Attributes::DataQualityId::TypeInfo::DecodableType dataQualityId = static_cast<uint16_t>(0);
+        Attributes::CustomerName::TypeInfo::DecodableType customerName;
+        Attributes::Model::TypeInfo::DecodableType model;
+        Attributes::PartNumber::TypeInfo::DecodableType partNumber;
+        Attributes::ProductRevision::TypeInfo::DecodableType productRevision;
+        Attributes::SoftwareRevision::TypeInfo::DecodableType softwareRevision;
+        Attributes::UtilityName::TypeInfo::DecodableType utilityName;
+        Attributes::Pod::TypeInfo::DecodableType pod;
+        Attributes::AvailablePower::TypeInfo::DecodableType availablePower = static_cast<int32_t>(0);
+        Attributes::PowerThreshold::TypeInfo::DecodableType powerThreshold = static_cast<int32_t>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
 };
-
-using DecodableType = Type;
-
-} // namespace BrandingInformation
-} // namespace Structs
+} // namespace Attributes
+} // namespace MeterIdentification
+namespace ApplianceEventsAndAlert {
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace LaunchContent {
+namespace GetAlerts {
 struct Type;
 struct DecodableType;
-} // namespace LaunchContent
+} // namespace GetAlerts
 
-namespace LaunchURL {
+namespace GetAlertsResponse {
 struct Type;
 struct DecodableType;
-} // namespace LaunchURL
+} // namespace GetAlertsResponse
 
-namespace LaunchResponse {
+namespace AlertsNotification {
 struct Type;
 struct DecodableType;
-} // namespace LaunchResponse
+} // namespace AlertsNotification
+
+namespace EventsNotification {
+struct Type;
+struct DecodableType;
+} // namespace EventsNotification
 
 } // namespace Commands
 
 namespace Commands {
-namespace LaunchContent {
+namespace GetAlerts {
 enum class Fields
 {
-    kSearch   = 0,
-    kAutoPlay = 1,
-    kData     = 2,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-
-    Structs::ContentSearch::Type search;
-    bool autoPlay = static_cast<bool>(0);
-    Optional<chip::CharSpan> data;
+    static constexpr CommandId GetCommandId() { return Commands::GetAlerts::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType;
+    using ResponseType = Clusters::ApplianceEventsAndAlert::Commands::GetAlertsResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -34151,37 +30484,32 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetAlerts::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    Structs::ContentSearch::DecodableType search;
-    bool autoPlay = static_cast<bool>(0);
-    Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LaunchContent
-namespace LaunchURL {
+}; // namespace GetAlerts
+namespace GetAlertsResponse {
 enum class Fields
 {
-    kContentURL          = 0,
-    kDisplayString       = 1,
-    kBrandingInformation = 2,
+    kAlertsCount     = 0,
+    kAlertStructures = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LaunchURL::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetAlertsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    chip::CharSpan contentURL;
-    Optional<chip::CharSpan> displayString;
-    Optional<Structs::BrandingInformation::Type> brandingInformation;
+    chip::BitMask<AlertCount> alertsCount = static_cast<chip::BitMask<AlertCount>>(0);
+    DataModel::List<const chip::BitMask<AlertStructure>> alertStructures;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -34189,31 +30517,30 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LaunchURL::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetAlertsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    chip::CharSpan contentURL;
-    Optional<chip::CharSpan> displayString;
-    Optional<Structs::BrandingInformation::DecodableType> brandingInformation;
+    chip::BitMask<AlertCount> alertsCount = static_cast<chip::BitMask<AlertCount>>(0);
+    DataModel::DecodableList<chip::BitMask<AlertStructure>> alertStructures;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LaunchURL
-namespace LaunchResponse {
+}; // namespace GetAlertsResponse
+namespace AlertsNotification {
 enum class Fields
 {
-    kStatus = 0,
-    kData   = 1,
+    kAlertsCount     = 0,
+    kAlertStructures = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::AlertsNotification::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
-    Optional<chip::CharSpan> data;
+    chip::BitMask<AlertCount> alertsCount = static_cast<chip::BitMask<AlertCount>>(0);
+    DataModel::List<const chip::BitMask<AlertStructure>> alertStructures;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -34225,100 +30552,81 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::AlertsNotification::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
-    Optional<chip::CharSpan> data;
+    chip::BitMask<AlertCount> alertsCount = static_cast<chip::BitMask<AlertCount>>(0);
+    DataModel::DecodableList<chip::BitMask<AlertStructure>> alertStructures;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LaunchResponse
-} // namespace Commands
-
-namespace Attributes {
+}; // namespace AlertsNotification
+namespace EventsNotification {
+enum class Fields
+{
+    kEventHeader = 0,
+    kEventId     = 1,
+};
 
-namespace AcceptHeader {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CharSpan>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CharSpan>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CharSpan> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::EventsNotification::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptHeader::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t eventHeader         = static_cast<uint8_t>(0);
+    EventIdentification eventId = static_cast<EventIdentification>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace AcceptHeader
-namespace SupportedStreamingProtocols {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::EventsNotification::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedStreamingProtocols::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t eventHeader         = static_cast<uint8_t>(0);
+    EventIdentification eventId = static_cast<EventIdentification>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace SupportedStreamingProtocols
+}; // namespace EventsNotification
+} // namespace Commands
+
+namespace Attributes {
+
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 };
 } // namespace ClusterRevision
 
@@ -34326,12 +30634,10 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::AcceptHeader::TypeInfo::DecodableType acceptHeader;
-        Attributes::SupportedStreamingProtocols::TypeInfo::DecodableType supportedStreamingProtocols = static_cast<uint32_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -34340,66 +30646,65 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace ContentLauncher
-namespace AudioOutput {
-namespace Structs {
-namespace OutputInfo {
-enum class Fields
-{
-    kIndex      = 0,
-    kOutputType = 1,
-    kName       = 2,
-};
-
-struct Type
-{
-public:
-    uint8_t index             = static_cast<uint8_t>(0);
-    OutputTypeEnum outputType = static_cast<OutputTypeEnum>(0);
-    chip::CharSpan name;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+} // namespace ApplianceEventsAndAlert
+namespace ApplianceStatistics {
 
-    static constexpr bool kIsFabricScoped = false;
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
+namespace LogNotification {
+struct Type;
+struct DecodableType;
+} // namespace LogNotification
 
-using DecodableType = Type;
+namespace LogRequest {
+struct Type;
+struct DecodableType;
+} // namespace LogRequest
 
-} // namespace OutputInfo
-} // namespace Structs
+namespace LogResponse {
+struct Type;
+struct DecodableType;
+} // namespace LogResponse
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+namespace LogQueueRequest {
+struct Type;
+struct DecodableType;
+} // namespace LogQueueRequest
 
-namespace SelectOutput {
+namespace LogQueueResponse {
 struct Type;
 struct DecodableType;
-} // namespace SelectOutput
+} // namespace LogQueueResponse
 
-namespace RenameOutput {
+namespace StatisticsAvailable {
 struct Type;
 struct DecodableType;
-} // namespace RenameOutput
+} // namespace StatisticsAvailable
 
 } // namespace Commands
 
 namespace Commands {
-namespace SelectOutput {
+namespace LogNotification {
 enum class Fields
 {
-    kIndex = 0,
+    kTimeStamp  = 0,
+    kLogId      = 1,
+    kLogLength  = 2,
+    kLogPayload = 3,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SelectOutput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LogNotification::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
+    uint32_t timeStamp = static_cast<uint32_t>(0);
+    uint32_t logId     = static_cast<uint32_t>(0);
+    uint32_t logLength = static_cast<uint32_t>(0);
+    DataModel::List<const uint8_t> logPayload;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -34411,33 +30716,34 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::SelectOutput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LogNotification::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
+    uint32_t timeStamp = static_cast<uint32_t>(0);
+    uint32_t logId     = static_cast<uint32_t>(0);
+    uint32_t logLength = static_cast<uint32_t>(0);
+    DataModel::DecodableList<uint8_t> logPayload;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace SelectOutput
-namespace RenameOutput {
+}; // namespace LogNotification
+namespace LogRequest {
 enum class Fields
 {
-    kIndex = 0,
-    kName  = 1,
+    kLogId = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::RenameOutput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LogRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
-    chip::CharSpan name;
+    uint32_t logId = static_cast<uint32_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::ApplianceStatistics::Commands::LogResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -34445,219 +30751,282 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::RenameOutput::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LogRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    uint8_t index = static_cast<uint8_t>(0);
-    chip::CharSpan name;
+    uint32_t logId = static_cast<uint32_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace RenameOutput
-} // namespace Commands
-
-namespace Attributes {
-
-namespace OutputList {
-struct TypeInfo
+}; // namespace LogRequest
+namespace LogResponse {
+enum class Fields
 {
-    using Type          = chip::app::DataModel::List<const chip::app::Clusters::AudioOutput::Structs::OutputInfo::Type>;
-    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OutputList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kTimeStamp  = 0,
+    kLogId      = 1,
+    kLogLength  = 2,
+    kLogPayload = 3,
 };
-} // namespace OutputList
-namespace CurrentOutput {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentOutput::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace CurrentOutput
-namespace GeneratedCommandList {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::LogResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    uint32_t timeStamp = static_cast<uint32_t>(0);
+    uint32_t logId     = static_cast<uint32_t>(0);
+    uint32_t logLength = static_cast<uint32_t>(0);
+    DataModel::List<const uint8_t> logPayload;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::LogResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint32_t timeStamp = static_cast<uint32_t>(0);
+    uint32_t logId     = static_cast<uint32_t>(0);
+    uint32_t logLength = static_cast<uint32_t>(0);
+    DataModel::DecodableList<uint8_t> logPayload;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
+}; // namespace LogResponse
+namespace LogQueueRequest {
+enum class Fields
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::LogQueueRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::ApplianceStatistics::Commands::LogQueueResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct DecodableType
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; }
+public:
+    static constexpr CommandId GetCommandId() { return Commands::LogQueueRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
-
-        Attributes::OutputList::TypeInfo::DecodableType outputList;
-        Attributes::CurrentOutput::TypeInfo::DecodableType currentOutput = static_cast<uint8_t>(0);
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace Attributes
-} // namespace AudioOutput
-namespace ApplicationLauncher {
-namespace Structs {
-namespace Application {
+}; // namespace LogQueueRequest
+namespace LogQueueResponse {
 enum class Fields
 {
-    kCatalogVendorId = 0,
-    kApplicationId   = 1,
+    kLogQueueSize = 0,
+    kLogIds       = 1,
 };
 
 struct Type
 {
 public:
-    uint16_t catalogVendorId = static_cast<uint16_t>(0);
-    chip::CharSpan applicationId;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::LogQueueResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-    static constexpr bool kIsFabricScoped = false;
+    uint8_t logQueueSize = static_cast<uint8_t>(0);
+    DataModel::List<const uint32_t> logIds;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
-using DecodableType = Type;
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::LogQueueResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
 
-} // namespace Application
-namespace ApplicationEP {
+    uint8_t logQueueSize = static_cast<uint8_t>(0);
+    DataModel::DecodableList<uint32_t> logIds;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace LogQueueResponse
+namespace StatisticsAvailable {
 enum class Fields
 {
-    kApplication = 0,
-    kEndpoint    = 1,
+    kLogQueueSize = 0,
+    kLogIds       = 1,
 };
 
 struct Type
 {
 public:
-    Structs::Application::Type application;
-    Optional<chip::EndpointId> endpoint;
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::StatisticsAvailable::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+
+    uint8_t logQueueSize = static_cast<uint8_t>(0);
+    DataModel::List<const uint32_t> logIds;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::StatisticsAvailable::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+
+    uint8_t logQueueSize = static_cast<uint8_t>(0);
+    DataModel::DecodableList<uint32_t> logIds;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace StatisticsAvailable
+} // namespace Commands
 
-    static constexpr bool kIsFabricScoped = false;
+namespace Attributes {
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+namespace LogMaxSize {
+struct TypeInfo
+{
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LogMaxSize::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
+} // namespace LogMaxSize
+namespace LogQueueMaxSize {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-using DecodableType = Type;
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LogQueueMaxSize::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace LogQueueMaxSize
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+};
+} // namespace AcceptedCommandList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+};
+} // namespace AttributeList
+namespace FeatureMap {
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+};
+} // namespace ClusterRevision
 
-} // namespace ApplicationEP
-} // namespace Structs
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+
+        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+
+        Attributes::LogMaxSize::TypeInfo::DecodableType logMaxSize           = static_cast<uint32_t>(0);
+        Attributes::LogQueueMaxSize::TypeInfo::DecodableType logQueueMaxSize = static_cast<uint8_t>(0);
+        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
+        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
+        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
+        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
+        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
+    };
+};
+} // namespace Attributes
+} // namespace ApplianceStatistics
+namespace ElectricalMeasurement {
 
 namespace Commands {
 // Forward-declarations so we can reference these later.
 
-namespace LaunchApp {
+namespace GetProfileInfoResponseCommand {
 struct Type;
 struct DecodableType;
-} // namespace LaunchApp
+} // namespace GetProfileInfoResponseCommand
 
-namespace StopApp {
+namespace GetProfileInfoCommand {
 struct Type;
 struct DecodableType;
-} // namespace StopApp
+} // namespace GetProfileInfoCommand
 
-namespace HideApp {
+namespace GetMeasurementProfileResponseCommand {
 struct Type;
 struct DecodableType;
-} // namespace HideApp
+} // namespace GetMeasurementProfileResponseCommand
 
-namespace LauncherResponse {
+namespace GetMeasurementProfileCommand {
 struct Type;
 struct DecodableType;
-} // namespace LauncherResponse
+} // namespace GetMeasurementProfileCommand
 
 } // namespace Commands
 
 namespace Commands {
-namespace LaunchApp {
+namespace GetProfileInfoResponseCommand {
 enum class Fields
 {
-    kApplication = 0,
-    kData        = 1,
+    kProfileCount          = 0,
+    kProfileIntervalPeriod = 1,
+    kMaxNumberOfIntervals  = 2,
+    kListOfAttributes      = 3,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LaunchApp::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoResponseCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    Structs::Application::Type application;
-    Optional<chip::ByteSpan> data;
+    uint8_t profileCount          = static_cast<uint8_t>(0);
+    uint8_t profileIntervalPeriod = static_cast<uint8_t>(0);
+    uint8_t maxNumberOfIntervals  = static_cast<uint8_t>(0);
+    DataModel::List<const uint16_t> listOfAttributes;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -34665,32 +31034,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LaunchApp::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoResponseCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    Structs::Application::DecodableType application;
-    Optional<chip::ByteSpan> data;
+    uint8_t profileCount          = static_cast<uint8_t>(0);
+    uint8_t profileIntervalPeriod = static_cast<uint8_t>(0);
+    uint8_t maxNumberOfIntervals  = static_cast<uint8_t>(0);
+    DataModel::DecodableList<uint16_t> listOfAttributes;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LaunchApp
-namespace StopApp {
+}; // namespace GetProfileInfoResponseCommand
+namespace GetProfileInfoCommand {
 enum class Fields
 {
-    kApplication = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::StopApp::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-
-    Structs::Application::Type application;
+    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -34698,31 +31066,40 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::StopApp::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    Structs::Application::DecodableType application;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace StopApp
-namespace HideApp {
+}; // namespace GetProfileInfoCommand
+namespace GetMeasurementProfileResponseCommand {
 enum class Fields
 {
-    kApplication = 0,
+    kStartTime                  = 0,
+    kStatus                     = 1,
+    kProfileIntervalPeriod      = 2,
+    kNumberOfIntervalsDelivered = 3,
+    kAttributeId                = 4,
+    kIntervals                  = 5,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::HideApp::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileResponseCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    Structs::Application::Type application;
+    uint32_t startTime                 = static_cast<uint32_t>(0);
+    uint8_t status                     = static_cast<uint8_t>(0);
+    uint8_t profileIntervalPeriod      = static_cast<uint8_t>(0);
+    uint8_t numberOfIntervalsDelivered = static_cast<uint8_t>(0);
+    uint16_t attributeId               = static_cast<uint16_t>(0);
+    DataModel::List<const uint8_t> intervals;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -34730,29 +31107,36 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::HideApp::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileResponseCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    Structs::Application::DecodableType application;
+    uint32_t startTime                 = static_cast<uint32_t>(0);
+    uint8_t status                     = static_cast<uint8_t>(0);
+    uint8_t profileIntervalPeriod      = static_cast<uint8_t>(0);
+    uint8_t numberOfIntervalsDelivered = static_cast<uint8_t>(0);
+    uint16_t attributeId               = static_cast<uint16_t>(0);
+    DataModel::DecodableList<uint8_t> intervals;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace HideApp
-namespace LauncherResponse {
+}; // namespace GetMeasurementProfileResponseCommand
+namespace GetMeasurementProfileCommand {
 enum class Fields
 {
-    kStatus = 0,
-    kData   = 1,
+    kAttributeId       = 0,
+    kStartTime         = 1,
+    kNumberOfIntervals = 2,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    ApplicationLauncherStatusEnum status = static_cast<ApplicationLauncherStatusEnum>(0);
-    chip::ByteSpan data;
+    uint16_t attributeId      = static_cast<uint16_t>(0);
+    uint32_t startTime        = static_cast<uint32_t>(0);
+    uint8_t numberOfIntervals = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -34764,3318 +31148,1583 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
-    ApplicationLauncherStatusEnum status = static_cast<ApplicationLauncherStatusEnum>(0);
-    chip::ByteSpan data;
+    uint16_t attributeId      = static_cast<uint16_t>(0);
+    uint32_t startTime        = static_cast<uint32_t>(0);
+    uint8_t numberOfIntervals = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LauncherResponse
+}; // namespace GetMeasurementProfileCommand
 } // namespace Commands
 
 namespace Attributes {
 
-namespace CatalogList {
+namespace MeasurementType {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const uint16_t>;
-    using DecodableType    = chip::app::DataModel::DecodableList<uint16_t>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<uint16_t> &;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CatalogList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasurementType::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CatalogList
-namespace CurrentApp {
+} // namespace MeasurementType
+namespace DcVoltage {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type>;
-    using DecodableType =
-        chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentApp::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltage::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentApp
-namespace GeneratedCommandList {
+} // namespace DcVoltage
+namespace DcVoltageMin {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageMin::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
+} // namespace DcVoltageMin
+namespace DcVoltageMax {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
+} // namespace DcVoltageMax
+namespace DcCurrent {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrent::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
+} // namespace DcCurrent
+namespace DcCurrentMin {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentMin::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
+} // namespace DcCurrentMin
+namespace DcCurrentMax {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ClusterRevision
-
+} // namespace DcCurrentMax
+namespace DcPower {
 struct TypeInfo
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-        Attributes::CatalogList::TypeInfo::DecodableType catalogList;
-        Attributes::CurrentApp::TypeInfo::DecodableType currentApp;
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
-};
-} // namespace Attributes
-} // namespace ApplicationLauncher
-namespace ApplicationBasic {
-namespace Structs {
-namespace ApplicationBasicApplication {
-enum class Fields
-{
-    kCatalogVendorId = 0,
-    kApplicationId   = 1,
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcPower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct Type
+} // namespace DcPower
+namespace DcPowerMin {
+struct TypeInfo
 {
-public:
-    uint16_t catalogVendorId = static_cast<uint16_t>(0);
-    chip::CharSpan applicationId;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerMin::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-using DecodableType = Type;
-
-} // namespace ApplicationBasicApplication
-} // namespace Structs
-
-namespace Attributes {
-
-namespace VendorName {
+} // namespace DcPowerMin
+namespace DcPowerMax {
 struct TypeInfo
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::VendorName::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 32; }
 };
-} // namespace VendorName
-namespace VendorID {
+} // namespace DcPowerMax
+namespace DcVoltageMultiplier {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::VendorID::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace VendorID
-namespace ApplicationName {
+} // namespace DcVoltageMultiplier
+namespace DcVoltageDivisor {
 struct TypeInfo
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationName::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 32; }
 };
-} // namespace ApplicationName
-namespace ProductID {
+} // namespace DcVoltageDivisor
+namespace DcCurrentMultiplier {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ProductID::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ProductID
-namespace Application {
+} // namespace DcCurrentMultiplier
+namespace DcCurrentDivisor {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type;
-    using DecodableType    = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType;
-    using DecodableArgType = const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Application::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Application
-namespace Status {
+} // namespace DcCurrentDivisor
+namespace DcPowerMultiplier {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
-    using DecodableType    = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
-    using DecodableArgType = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Status::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Status
-namespace ApplicationVersion {
+} // namespace DcPowerMultiplier
+namespace DcPowerDivisor {
 struct TypeInfo
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationVersion::Id; }
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 32; }
 };
-} // namespace ApplicationVersion
-namespace AllowedVendorList {
+} // namespace DcPowerDivisor
+namespace AcFrequency {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::VendorId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::VendorId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::VendorId> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AllowedVendorList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequency::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AllowedVendorList
-namespace GeneratedCommandList {
+} // namespace AcFrequency
+namespace AcFrequencyMin {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyMin::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
+} // namespace AcFrequencyMin
+namespace AcFrequencyMax {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
+} // namespace AcFrequencyMax
+namespace NeutralCurrent {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NeutralCurrent::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
+} // namespace NeutralCurrent
+namespace TotalActivePower {
+struct TypeInfo
+{
+    using Type             = int32_t;
+    using DecodableType    = int32_t;
+    using DecodableArgType = int32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TotalActivePower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace TotalActivePower
+namespace TotalReactivePower {
+struct TypeInfo
+{
+    using Type             = int32_t;
+    using DecodableType    = int32_t;
+    using DecodableArgType = int32_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TotalReactivePower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace TotalReactivePower
+namespace TotalApparentPower {
 struct TypeInfo
 {
     using Type             = uint32_t;
     using DecodableType    = uint32_t;
     using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TotalApparentPower::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
+} // namespace TotalApparentPower
+namespace Measured1stHarmonicCurrent {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Measured1stHarmonicCurrent::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ClusterRevision
-
+} // namespace Measured1stHarmonicCurrent
+namespace Measured3rdHarmonicCurrent {
 struct TypeInfo
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-        Attributes::VendorName::TypeInfo::DecodableType vendorName;
-        Attributes::VendorID::TypeInfo::DecodableType vendorID = static_cast<uint16_t>(0);
-        Attributes::ApplicationName::TypeInfo::DecodableType applicationName;
-        Attributes::ProductID::TypeInfo::DecodableType productID = static_cast<uint16_t>(0);
-        Attributes::Application::TypeInfo::DecodableType application;
-        Attributes::Status::TypeInfo::DecodableType status =
-            static_cast<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>(0);
-        Attributes::ApplicationVersion::TypeInfo::DecodableType applicationVersion;
-        Attributes::AllowedVendorList::TypeInfo::DecodableType allowedVendorList;
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Measured3rdHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Attributes
-} // namespace ApplicationBasic
-namespace AccountLogin {
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace GetSetupPIN {
-struct Type;
-struct DecodableType;
-} // namespace GetSetupPIN
-
-namespace GetSetupPINResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetSetupPINResponse
-
-namespace Login {
-struct Type;
-struct DecodableType;
-} // namespace Login
-
-namespace Logout {
-struct Type;
-struct DecodableType;
-} // namespace Logout
-
-} // namespace Commands
-
-namespace Commands {
-namespace GetSetupPIN {
-enum class Fields
+} // namespace Measured3rdHarmonicCurrent
+namespace Measured5thHarmonicCurrent {
+struct TypeInfo
 {
-    kTempAccountIdentifier = 0,
-};
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Measured5thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Measured5thHarmonicCurrent
+namespace Measured7thHarmonicCurrent {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetSetupPIN::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-
-    chip::CharSpan tempAccountIdentifier;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr bool MustUseTimedInvoke() { return true; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Measured7thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace Measured7thHarmonicCurrent
+namespace Measured9thHarmonicCurrent {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetSetupPIN::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    chip::CharSpan tempAccountIdentifier;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Measured9thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace GetSetupPIN
-namespace GetSetupPINResponse {
-enum class Fields
+} // namespace Measured9thHarmonicCurrent
+namespace Measured11thHarmonicCurrent {
+struct TypeInfo
 {
-    kSetupPIN = 0,
-};
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Measured11thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Measured11thHarmonicCurrent
+namespace MeasuredPhase1stHarmonicCurrent {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetSetupPINResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-
-    chip::CharSpan setupPIN;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase1stHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace MeasuredPhase1stHarmonicCurrent
+namespace MeasuredPhase3rdHarmonicCurrent {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetSetupPINResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    chip::CharSpan setupPIN;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase3rdHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace GetSetupPINResponse
-namespace Login {
-enum class Fields
+} // namespace MeasuredPhase3rdHarmonicCurrent
+namespace MeasuredPhase5thHarmonicCurrent {
+struct TypeInfo
 {
-    kTempAccountIdentifier = 0,
-    kSetupPIN              = 1,
-};
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase5thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MeasuredPhase5thHarmonicCurrent
+namespace MeasuredPhase7thHarmonicCurrent {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Login::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-
-    chip::CharSpan tempAccountIdentifier;
-    chip::CharSpan setupPIN;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr bool MustUseTimedInvoke() { return true; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase7thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace MeasuredPhase7thHarmonicCurrent
+namespace MeasuredPhase9thHarmonicCurrent {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Login::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    chip::CharSpan tempAccountIdentifier;
-    chip::CharSpan setupPIN;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase9thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace Login
-namespace Logout {
-enum class Fields
+} // namespace MeasuredPhase9thHarmonicCurrent
+namespace MeasuredPhase11thHarmonicCurrent {
+struct TypeInfo
 {
-};
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase11thHarmonicCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MeasuredPhase11thHarmonicCurrent
+namespace AcFrequencyMultiplier {
+struct TypeInfo
 {
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Logout::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr bool MustUseTimedInvoke() { return true; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyMultiplier::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace AcFrequencyMultiplier
+namespace AcFrequencyDivisor {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Logout::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyDivisor::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace Logout
-} // namespace Commands
-
-namespace Attributes {
+} // namespace AcFrequencyDivisor
+namespace PowerMultiplier {
+struct TypeInfo
+{
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-namespace GeneratedCommandList {
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerMultiplier::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace PowerMultiplier
+namespace PowerDivisor {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
+} // namespace PowerDivisor
+namespace HarmonicCurrentMultiplier {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    using Type             = int8_t;
+    using DecodableType    = int8_t;
+    using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::HarmonicCurrentMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
+} // namespace HarmonicCurrentMultiplier
+namespace PhaseHarmonicCurrentMultiplier {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    using Type             = int8_t;
+    using DecodableType    = int8_t;
+    using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseHarmonicCurrentMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
+} // namespace PhaseHarmonicCurrentMultiplier
+namespace InstantaneousVoltage {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousVoltage::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
+} // namespace InstantaneousVoltage
+namespace InstantaneousLineCurrent {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousLineCurrent::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ClusterRevision
-
+} // namespace InstantaneousLineCurrent
+namespace InstantaneousActiveCurrent {
 struct TypeInfo
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousActiveCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Attributes
-} // namespace AccountLogin
-namespace TestCluster {
-namespace Structs {
-namespace SimpleStruct {
-enum class Fields
+} // namespace InstantaneousActiveCurrent
+namespace InstantaneousReactiveCurrent {
+struct TypeInfo
 {
-    kA = 0,
-    kB = 1,
-    kC = 2,
-    kD = 3,
-    kE = 4,
-    kF = 5,
-    kG = 6,
-    kH = 7,
-};
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousReactiveCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace InstantaneousReactiveCurrent
+namespace InstantaneousPower {
+struct TypeInfo
 {
-public:
-    uint8_t a    = static_cast<uint8_t>(0);
-    bool b       = static_cast<bool>(0);
-    SimpleEnum c = static_cast<SimpleEnum>(0);
-    chip::ByteSpan d;
-    chip::CharSpan e;
-    chip::BitFlags<SimpleBitmap> f = static_cast<chip::BitFlags<SimpleBitmap>>(0);
-    float g                        = static_cast<float>(0);
-    double h                       = static_cast<double>(0);
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousPower::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-using DecodableType = Type;
-
-} // namespace SimpleStruct
-namespace TestFabricScoped {
-enum class Fields
+} // namespace InstantaneousPower
+namespace RmsVoltage {
+struct TypeInfo
 {
-    kFabricSensitiveInt8u                 = 1,
-    kOptionalFabricSensitiveInt8u         = 2,
-    kNullableFabricSensitiveInt8u         = 3,
-    kNullableOptionalFabricSensitiveInt8u = 4,
-    kFabricSensitiveCharString            = 5,
-    kFabricSensitiveStruct                = 6,
-    kFabricSensitiveInt8uList             = 7,
-    kFabricIndex                          = 254,
-};
-
-struct Type
-{
-public:
-    uint8_t fabricSensitiveInt8u = static_cast<uint8_t>(0);
-    Optional<uint8_t> optionalFabricSensitiveInt8u;
-    DataModel::Nullable<uint8_t> nullableFabricSensitiveInt8u;
-    Optional<DataModel::Nullable<uint8_t>> nullableOptionalFabricSensitiveInt8u;
-    chip::CharSpan fabricSensitiveCharString;
-    Structs::SimpleStruct::Type fabricSensitiveStruct;
-    DataModel::List<const uint8_t> fabricSensitiveInt8uList;
-    chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
-
-    static constexpr bool kIsFabricScoped = true;
-
-    auto GetFabricIndex() const { return fabricIndex; }
-
-    void SetFabricIndex(chip::FabricIndex fabricIndex_) { fabricIndex = fabricIndex_; }
-
-    CHIP_ERROR EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const;
-    CHIP_ERROR EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex accessingFabricIndex) const;
-
-private:
-    CHIP_ERROR DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional<FabricIndex> & accessingFabricIndex) const;
-};
-
-struct DecodableType
-{
-public:
-    uint8_t fabricSensitiveInt8u = static_cast<uint8_t>(0);
-    Optional<uint8_t> optionalFabricSensitiveInt8u;
-    DataModel::Nullable<uint8_t> nullableFabricSensitiveInt8u;
-    Optional<DataModel::Nullable<uint8_t>> nullableOptionalFabricSensitiveInt8u;
-    chip::CharSpan fabricSensitiveCharString;
-    Structs::SimpleStruct::DecodableType fabricSensitiveStruct;
-    DataModel::DecodableList<uint8_t> fabricSensitiveInt8uList;
-    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_; }
-};
-
-} // namespace TestFabricScoped
-namespace NullablesAndOptionalsStruct {
-enum class Fields
-{
-    kNullableInt            = 0,
-    kOptionalInt            = 1,
-    kNullableOptionalInt    = 2,
-    kNullableString         = 3,
-    kOptionalString         = 4,
-    kNullableOptionalString = 5,
-    kNullableStruct         = 6,
-    kOptionalStruct         = 7,
-    kNullableOptionalStruct = 8,
-    kNullableList           = 9,
-    kOptionalList           = 10,
-    kNullableOptionalList   = 11,
-};
-
-struct Type
-{
-public:
-    DataModel::Nullable<uint16_t> nullableInt;
-    Optional<uint16_t> optionalInt;
-    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
-    DataModel::Nullable<chip::CharSpan> nullableString;
-    Optional<chip::CharSpan> optionalString;
-    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
-    DataModel::Nullable<Structs::SimpleStruct::Type> nullableStruct;
-    Optional<Structs::SimpleStruct::Type> optionalStruct;
-    Optional<DataModel::Nullable<Structs::SimpleStruct::Type>> nullableOptionalStruct;
-    DataModel::Nullable<DataModel::List<const SimpleEnum>> nullableList;
-    Optional<DataModel::List<const SimpleEnum>> optionalList;
-    Optional<DataModel::Nullable<DataModel::List<const SimpleEnum>>> nullableOptionalList;
-
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
-
-struct DecodableType
-{
-public:
-    DataModel::Nullable<uint16_t> nullableInt;
-    Optional<uint16_t> optionalInt;
-    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
-    DataModel::Nullable<chip::CharSpan> nullableString;
-    Optional<chip::CharSpan> optionalString;
-    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
-    DataModel::Nullable<Structs::SimpleStruct::DecodableType> nullableStruct;
-    Optional<Structs::SimpleStruct::DecodableType> optionalStruct;
-    Optional<DataModel::Nullable<Structs::SimpleStruct::DecodableType>> nullableOptionalStruct;
-    DataModel::Nullable<DataModel::DecodableList<SimpleEnum>> nullableList;
-    Optional<DataModel::DecodableList<SimpleEnum>> optionalList;
-    Optional<DataModel::Nullable<DataModel::DecodableList<SimpleEnum>>> nullableOptionalList;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
-};
-
-} // namespace NullablesAndOptionalsStruct
-namespace NestedStruct {
-enum class Fields
-{
-    kA = 0,
-    kB = 1,
-    kC = 2,
-};
-
-struct Type
-{
-public:
-    uint8_t a = static_cast<uint8_t>(0);
-    bool b    = static_cast<bool>(0);
-    Structs::SimpleStruct::Type c;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
-
-using DecodableType = Type;
-
-} // namespace NestedStruct
-namespace NestedStructList {
-enum class Fields
-{
-    kA = 0,
-    kB = 1,
-    kC = 2,
-    kD = 3,
-    kE = 4,
-    kF = 5,
-    kG = 6,
-};
-
-struct Type
-{
-public:
-    uint8_t a = static_cast<uint8_t>(0);
-    bool b    = static_cast<bool>(0);
-    Structs::SimpleStruct::Type c;
-    DataModel::List<const Structs::SimpleStruct::Type> d;
-    DataModel::List<const uint32_t> e;
-    DataModel::List<const chip::ByteSpan> f;
-    DataModel::List<const uint8_t> g;
-
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
-
-struct DecodableType
-{
-public:
-    uint8_t a = static_cast<uint8_t>(0);
-    bool b    = static_cast<bool>(0);
-    Structs::SimpleStruct::DecodableType c;
-    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> d;
-    DataModel::DecodableList<uint32_t> e;
-    DataModel::DecodableList<chip::ByteSpan> f;
-    DataModel::DecodableList<uint8_t> g;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
-};
-
-} // namespace NestedStructList
-namespace DoubleNestedStructList {
-enum class Fields
-{
-    kA = 0,
-};
-
-struct Type
-{
-public:
-    DataModel::List<const Structs::NestedStructList::Type> a;
-
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
-
-struct DecodableType
-{
-public:
-    DataModel::DecodableList<Structs::NestedStructList::DecodableType> a;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
-};
-
-} // namespace DoubleNestedStructList
-namespace TestListStructOctet {
-enum class Fields
-{
-    kFabricIndex     = 0,
-    kOperationalCert = 1,
-};
-
-struct Type
-{
-public:
-    uint64_t fabricIndex = static_cast<uint64_t>(0);
-    chip::ByteSpan operationalCert;
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-
-    static constexpr bool kIsFabricScoped = false;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-};
-
-using DecodableType = Type;
-
-} // namespace TestListStructOctet
-} // namespace Structs
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace Test {
-struct Type;
-struct DecodableType;
-} // namespace Test
-
-namespace TestSpecificResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestSpecificResponse
-
-namespace TestNotHandled {
-struct Type;
-struct DecodableType;
-} // namespace TestNotHandled
-
-namespace TestAddArgumentsResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestAddArgumentsResponse
-
-namespace TestSpecific {
-struct Type;
-struct DecodableType;
-} // namespace TestSpecific
-
-namespace TestSimpleArgumentResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestSimpleArgumentResponse
-
-namespace TestUnknownCommand {
-struct Type;
-struct DecodableType;
-} // namespace TestUnknownCommand
-
-namespace TestStructArrayArgumentResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestStructArrayArgumentResponse
-
-namespace TestAddArguments {
-struct Type;
-struct DecodableType;
-} // namespace TestAddArguments
-
-namespace TestListInt8UReverseResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestListInt8UReverseResponse
-
-namespace TestSimpleArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestSimpleArgumentRequest
-
-namespace TestEnumsResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestEnumsResponse
-
-namespace TestStructArrayArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestStructArrayArgumentRequest
-
-namespace TestNullableOptionalResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestNullableOptionalResponse
-
-namespace TestStructArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestStructArgumentRequest
-
-namespace TestComplexNullableOptionalResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestComplexNullableOptionalResponse
-
-namespace TestNestedStructArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestNestedStructArgumentRequest
-
-namespace BooleanResponse {
-struct Type;
-struct DecodableType;
-} // namespace BooleanResponse
-
-namespace TestListStructArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestListStructArgumentRequest
-
-namespace SimpleStructResponse {
-struct Type;
-struct DecodableType;
-} // namespace SimpleStructResponse
-
-namespace TestListInt8UArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestListInt8UArgumentRequest
-
-namespace TestEmitTestEventResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestEmitTestEventResponse
-
-namespace TestNestedStructListArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestNestedStructListArgumentRequest
-
-namespace TestEmitTestFabricScopedEventResponse {
-struct Type;
-struct DecodableType;
-} // namespace TestEmitTestFabricScopedEventResponse
-
-namespace TestListNestedStructListArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestListNestedStructListArgumentRequest
-
-namespace TestListInt8UReverseRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestListInt8UReverseRequest
-
-namespace TestEnumsRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestEnumsRequest
-
-namespace TestNullableOptionalRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestNullableOptionalRequest
-
-namespace TestComplexNullableOptionalRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestComplexNullableOptionalRequest
-
-namespace SimpleStructEchoRequest {
-struct Type;
-struct DecodableType;
-} // namespace SimpleStructEchoRequest
-
-namespace TimedInvokeRequest {
-struct Type;
-struct DecodableType;
-} // namespace TimedInvokeRequest
-
-namespace TestSimpleOptionalArgumentRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestSimpleOptionalArgumentRequest
-
-namespace TestEmitTestEventRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestEmitTestEventRequest
-
-namespace TestEmitTestFabricScopedEventRequest {
-struct Type;
-struct DecodableType;
-} // namespace TestEmitTestFabricScopedEventRequest
-
-} // namespace Commands
-
-namespace Commands {
-namespace Test {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::Test::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Test::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace Test
-namespace TestSpecificResponse {
-enum class Fields
-{
-    kReturnValue = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestSpecificResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t returnValue = static_cast<uint8_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestSpecificResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t returnValue = static_cast<uint8_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestSpecificResponse
-namespace TestNotHandled {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestNotHandled::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestNotHandled::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestNotHandled
-namespace TestAddArgumentsResponse {
-enum class Fields
-{
-    kReturnValue = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestAddArgumentsResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t returnValue = static_cast<uint8_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestAddArgumentsResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t returnValue = static_cast<uint8_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestAddArgumentsResponse
-namespace TestSpecific {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestSpecific::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestSpecific::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestSpecific
-namespace TestSimpleArgumentResponse {
-enum class Fields
-{
-    kReturnValue = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool returnValue = static_cast<bool>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool returnValue = static_cast<bool>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestSimpleArgumentResponse
-namespace TestUnknownCommand {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestUnknownCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestUnknownCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestUnknownCommand
-namespace TestStructArrayArgumentResponse {
-enum class Fields
-{
-    kArg1 = 0,
-    kArg2 = 1,
-    kArg3 = 2,
-    kArg4 = 3,
-    kArg5 = 4,
-    kArg6 = 5,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const Structs::NestedStructList::Type> arg1;
-    DataModel::List<const Structs::SimpleStruct::Type> arg2;
-    DataModel::List<const SimpleEnum> arg3;
-    DataModel::List<const bool> arg4;
-    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
-    bool arg6       = static_cast<bool>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<Structs::NestedStructList::DecodableType> arg1;
-    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg2;
-    DataModel::DecodableList<SimpleEnum> arg3;
-    DataModel::DecodableList<bool> arg4;
-    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
-    bool arg6       = static_cast<bool>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestStructArrayArgumentResponse
-namespace TestAddArguments {
-enum class Fields
-{
-    kArg1 = 0,
-    kArg2 = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestAddArguments::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t arg1 = static_cast<uint8_t>(0);
-    uint8_t arg2 = static_cast<uint8_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestAddArguments::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t arg1 = static_cast<uint8_t>(0);
-    uint8_t arg2 = static_cast<uint8_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestAddArguments
-namespace TestListInt8UReverseResponse {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const uint8_t> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<uint8_t> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestListInt8UReverseResponse
-namespace TestSimpleArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool arg1 = static_cast<bool>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestSimpleArgumentResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool arg1 = static_cast<bool>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestSimpleArgumentRequest
-namespace TestEnumsResponse {
-enum class Fields
-{
-    kArg1 = 0,
-    kArg2 = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestEnumsResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
-    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestEnumsResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
-    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestEnumsResponse
-namespace TestStructArrayArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-    kArg2 = 1,
-    kArg3 = 2,
-    kArg4 = 3,
-    kArg5 = 4,
-    kArg6 = 5,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const Structs::NestedStructList::Type> arg1;
-    DataModel::List<const Structs::SimpleStruct::Type> arg2;
-    DataModel::List<const SimpleEnum> arg3;
-    DataModel::List<const bool> arg4;
-    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
-    bool arg6       = static_cast<bool>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestStructArrayArgumentResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<Structs::NestedStructList::DecodableType> arg1;
-    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg2;
-    DataModel::DecodableList<SimpleEnum> arg3;
-    DataModel::DecodableList<bool> arg4;
-    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
-    bool arg6       = static_cast<bool>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestStructArrayArgumentRequest
-namespace TestNullableOptionalResponse {
-enum class Fields
-{
-    kWasPresent    = 0,
-    kWasNull       = 1,
-    kValue         = 2,
-    kOriginalValue = 3,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool wasPresent = static_cast<bool>(0);
-    Optional<bool> wasNull;
-    Optional<uint8_t> value;
-    Optional<DataModel::Nullable<uint8_t>> originalValue;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool wasPresent = static_cast<bool>(0);
-    Optional<bool> wasNull;
-    Optional<uint8_t> value;
-    Optional<DataModel::Nullable<uint8_t>> originalValue;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestNullableOptionalResponse
-namespace TestStructArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestStructArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::SimpleStruct::Type arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestStructArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::SimpleStruct::DecodableType arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestStructArgumentRequest
-namespace TestComplexNullableOptionalResponse {
-enum class Fields
-{
-    kNullableIntWasNull               = 0,
-    kNullableIntValue                 = 1,
-    kOptionalIntWasPresent            = 2,
-    kOptionalIntValue                 = 3,
-    kNullableOptionalIntWasPresent    = 4,
-    kNullableOptionalIntWasNull       = 5,
-    kNullableOptionalIntValue         = 6,
-    kNullableStringWasNull            = 7,
-    kNullableStringValue              = 8,
-    kOptionalStringWasPresent         = 9,
-    kOptionalStringValue              = 10,
-    kNullableOptionalStringWasPresent = 11,
-    kNullableOptionalStringWasNull    = 12,
-    kNullableOptionalStringValue      = 13,
-    kNullableStructWasNull            = 14,
-    kNullableStructValue              = 15,
-    kOptionalStructWasPresent         = 16,
-    kOptionalStructValue              = 17,
-    kNullableOptionalStructWasPresent = 18,
-    kNullableOptionalStructWasNull    = 19,
-    kNullableOptionalStructValue      = 20,
-    kNullableListWasNull              = 21,
-    kNullableListValue                = 22,
-    kOptionalListWasPresent           = 23,
-    kOptionalListValue                = 24,
-    kNullableOptionalListWasPresent   = 25,
-    kNullableOptionalListWasNull      = 26,
-    kNullableOptionalListValue        = 27,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool nullableIntWasNull = static_cast<bool>(0);
-    Optional<uint16_t> nullableIntValue;
-    bool optionalIntWasPresent = static_cast<bool>(0);
-    Optional<uint16_t> optionalIntValue;
-    bool nullableOptionalIntWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalIntWasNull;
-    Optional<uint16_t> nullableOptionalIntValue;
-    bool nullableStringWasNull = static_cast<bool>(0);
-    Optional<chip::CharSpan> nullableStringValue;
-    bool optionalStringWasPresent = static_cast<bool>(0);
-    Optional<chip::CharSpan> optionalStringValue;
-    bool nullableOptionalStringWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalStringWasNull;
-    Optional<chip::CharSpan> nullableOptionalStringValue;
-    bool nullableStructWasNull = static_cast<bool>(0);
-    Optional<Structs::SimpleStruct::Type> nullableStructValue;
-    bool optionalStructWasPresent = static_cast<bool>(0);
-    Optional<Structs::SimpleStruct::Type> optionalStructValue;
-    bool nullableOptionalStructWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalStructWasNull;
-    Optional<Structs::SimpleStruct::Type> nullableOptionalStructValue;
-    bool nullableListWasNull = static_cast<bool>(0);
-    Optional<DataModel::List<const SimpleEnum>> nullableListValue;
-    bool optionalListWasPresent = static_cast<bool>(0);
-    Optional<DataModel::List<const SimpleEnum>> optionalListValue;
-    bool nullableOptionalListWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalListWasNull;
-    Optional<DataModel::List<const SimpleEnum>> nullableOptionalListValue;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool nullableIntWasNull = static_cast<bool>(0);
-    Optional<uint16_t> nullableIntValue;
-    bool optionalIntWasPresent = static_cast<bool>(0);
-    Optional<uint16_t> optionalIntValue;
-    bool nullableOptionalIntWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalIntWasNull;
-    Optional<uint16_t> nullableOptionalIntValue;
-    bool nullableStringWasNull = static_cast<bool>(0);
-    Optional<chip::CharSpan> nullableStringValue;
-    bool optionalStringWasPresent = static_cast<bool>(0);
-    Optional<chip::CharSpan> optionalStringValue;
-    bool nullableOptionalStringWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalStringWasNull;
-    Optional<chip::CharSpan> nullableOptionalStringValue;
-    bool nullableStructWasNull = static_cast<bool>(0);
-    Optional<Structs::SimpleStruct::DecodableType> nullableStructValue;
-    bool optionalStructWasPresent = static_cast<bool>(0);
-    Optional<Structs::SimpleStruct::DecodableType> optionalStructValue;
-    bool nullableOptionalStructWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalStructWasNull;
-    Optional<Structs::SimpleStruct::DecodableType> nullableOptionalStructValue;
-    bool nullableListWasNull = static_cast<bool>(0);
-    Optional<DataModel::DecodableList<SimpleEnum>> nullableListValue;
-    bool optionalListWasPresent = static_cast<bool>(0);
-    Optional<DataModel::DecodableList<SimpleEnum>> optionalListValue;
-    bool nullableOptionalListWasPresent = static_cast<bool>(0);
-    Optional<bool> nullableOptionalListWasNull;
-    Optional<DataModel::DecodableList<SimpleEnum>> nullableOptionalListValue;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestComplexNullableOptionalResponse
-namespace TestNestedStructArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::NestedStruct::Type arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::NestedStruct::DecodableType arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestNestedStructArgumentRequest
-namespace BooleanResponse {
-enum class Fields
-{
-    kValue = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::BooleanResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool value = static_cast<bool>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::BooleanResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    bool value = static_cast<bool>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace BooleanResponse
-namespace TestListStructArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestListStructArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const Structs::SimpleStruct::Type> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestListStructArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestListStructArgumentRequest
-namespace SimpleStructResponse {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SimpleStructResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::SimpleStruct::Type arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SimpleStructResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::SimpleStruct::DecodableType arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SimpleStructResponse
-namespace TestListInt8UArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const uint8_t> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<uint8_t> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestListInt8UArgumentRequest
-namespace TestEmitTestEventResponse {
-enum class Fields
-{
-    kValue = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint64_t value = static_cast<uint64_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint64_t value = static_cast<uint64_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestEmitTestEventResponse
-namespace TestNestedStructListArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructListArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::NestedStructList::Type arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructListArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::NestedStructList::DecodableType arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestNestedStructListArgumentRequest
-namespace TestEmitTestFabricScopedEventResponse {
-enum class Fields
-{
-    kValue = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint64_t value = static_cast<uint64_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint64_t value = static_cast<uint64_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestEmitTestFabricScopedEventResponse
-namespace TestListNestedStructListArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestListNestedStructListArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const Structs::NestedStructList::Type> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestListNestedStructListArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<Structs::NestedStructList::DecodableType> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestListNestedStructListArgumentRequest
-namespace TestListInt8UReverseRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::List<const uint8_t> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::DecodableList<uint8_t> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestListInt8UReverseRequest
-namespace TestEnumsRequest {
-enum class Fields
-{
-    kArg1 = 0,
-    kArg2 = 1,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestEnumsRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
-    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestEnumsRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
-    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestEnumsRequest
-namespace TestNullableOptionalRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Optional<DataModel::Nullable<uint8_t>> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Optional<DataModel::Nullable<uint8_t>> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestNullableOptionalRequest
-namespace TestComplexNullableOptionalRequest {
-enum class Fields
-{
-    kNullableInt            = 0,
-    kOptionalInt            = 1,
-    kNullableOptionalInt    = 2,
-    kNullableString         = 3,
-    kOptionalString         = 4,
-    kNullableOptionalString = 5,
-    kNullableStruct         = 6,
-    kOptionalStruct         = 7,
-    kNullableOptionalStruct = 8,
-    kNullableList           = 9,
-    kOptionalList           = 10,
-    kNullableOptionalList   = 11,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::Nullable<uint16_t> nullableInt;
-    Optional<uint16_t> optionalInt;
-    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
-    DataModel::Nullable<chip::CharSpan> nullableString;
-    Optional<chip::CharSpan> optionalString;
-    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
-    DataModel::Nullable<Structs::SimpleStruct::Type> nullableStruct;
-    Optional<Structs::SimpleStruct::Type> optionalStruct;
-    Optional<DataModel::Nullable<Structs::SimpleStruct::Type>> nullableOptionalStruct;
-    DataModel::Nullable<DataModel::List<const SimpleEnum>> nullableList;
-    Optional<DataModel::List<const SimpleEnum>> optionalList;
-    Optional<DataModel::Nullable<DataModel::List<const SimpleEnum>>> nullableOptionalList;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestComplexNullableOptionalResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    DataModel::Nullable<uint16_t> nullableInt;
-    Optional<uint16_t> optionalInt;
-    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
-    DataModel::Nullable<chip::CharSpan> nullableString;
-    Optional<chip::CharSpan> optionalString;
-    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
-    DataModel::Nullable<Structs::SimpleStruct::DecodableType> nullableStruct;
-    Optional<Structs::SimpleStruct::DecodableType> optionalStruct;
-    Optional<DataModel::Nullable<Structs::SimpleStruct::DecodableType>> nullableOptionalStruct;
-    DataModel::Nullable<DataModel::DecodableList<SimpleEnum>> nullableList;
-    Optional<DataModel::DecodableList<SimpleEnum>> optionalList;
-    Optional<DataModel::Nullable<DataModel::DecodableList<SimpleEnum>>> nullableOptionalList;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestComplexNullableOptionalRequest
-namespace SimpleStructEchoRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::SimpleStructEchoRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::SimpleStruct::Type arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SimpleStructEchoRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Structs::SimpleStruct::DecodableType arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SimpleStructEchoRequest
-namespace TimedInvokeRequest {
-enum class Fields
-{
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TimedInvokeRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return true; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TimedInvokeRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TimedInvokeRequest
-namespace TestSimpleOptionalArgumentRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestSimpleOptionalArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Optional<bool> arg1;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestSimpleOptionalArgumentRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    Optional<bool> arg1;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestSimpleOptionalArgumentRequest
-namespace TestEmitTestEventRequest {
-enum class Fields
-{
-    kArg1 = 0,
-    kArg2 = 1,
-    kArg3 = 2,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t arg1    = static_cast<uint8_t>(0);
-    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
-    bool arg3       = static_cast<bool>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t arg1    = static_cast<uint8_t>(0);
-    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
-    bool arg3       = static_cast<bool>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace TestEmitTestEventRequest
-namespace TestEmitTestFabricScopedEventRequest {
-enum class Fields
-{
-    kArg1 = 0,
-};
-
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t arg1 = static_cast<uint8_t>(0);
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    uint8_t arg1 = static_cast<uint8_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltage::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace TestEmitTestFabricScopedEventRequest
-} // namespace Commands
-
-namespace Attributes {
-
-namespace Boolean {
+} // namespace RmsVoltage
+namespace RmsVoltageMin {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Boolean::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMin::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Boolean
-namespace Bitmap8 {
+} // namespace RmsVoltageMin
+namespace RmsVoltageMax {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap8::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Bitmap8
-namespace Bitmap16 {
+} // namespace RmsVoltageMax
+namespace RmsCurrent {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap16::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrent::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Bitmap16
-namespace Bitmap32 {
+} // namespace RmsCurrent
+namespace RmsCurrentMin {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap32::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMin::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Bitmap32
-namespace Bitmap64 {
+} // namespace RmsCurrentMin
+namespace RmsCurrentMax {
 struct TypeInfo
 {
-    using Type             = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>;
-    using DecodableType    = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>;
-    using DecodableArgType = chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap64::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Bitmap64
-namespace Int8u {
+} // namespace RmsCurrentMax
+namespace ActivePower {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int8u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePower::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int8u
-namespace Int16u {
+} // namespace ActivePower
+namespace ActivePowerMin {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int16u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMin::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int16u
-namespace Int24u {
+} // namespace ActivePowerMin
+namespace ActivePowerMax {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int24u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMax::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int24u
-namespace Int32u {
+} // namespace ActivePowerMax
+namespace ReactivePower {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int32u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReactivePower::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int32u
-namespace Int40u {
+} // namespace ReactivePower
+namespace ApparentPower {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int40u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ApparentPower::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int40u
-namespace Int48u {
+} // namespace ApparentPower
+namespace PowerFactor {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = int8_t;
+    using DecodableType    = int8_t;
+    using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int48u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerFactor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int48u
-namespace Int56u {
+} // namespace PowerFactor
+namespace AverageRmsVoltageMeasurementPeriod {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int56u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsVoltageMeasurementPeriod::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int56u
-namespace Int64u {
+} // namespace AverageRmsVoltageMeasurementPeriod
+namespace AverageRmsUnderVoltageCounter {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int64u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltageCounter::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int64u
-namespace Int8s {
+} // namespace AverageRmsUnderVoltageCounter
+namespace RmsExtremeOverVoltagePeriod {
 struct TypeInfo
 {
-    using Type             = int8_t;
-    using DecodableType    = int8_t;
-    using DecodableArgType = int8_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int8s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltagePeriod::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int8s
-namespace Int16s {
+} // namespace RmsExtremeOverVoltagePeriod
+namespace RmsExtremeUnderVoltagePeriod {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int16s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltagePeriod::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int16s
-namespace Int24s {
+} // namespace RmsExtremeUnderVoltagePeriod
+namespace RmsVoltageSagPeriod {
 struct TypeInfo
 {
-    using Type             = int32_t;
-    using DecodableType    = int32_t;
-    using DecodableArgType = int32_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int24s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSagPeriod::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int24s
-namespace Int32s {
+} // namespace RmsVoltageSagPeriod
+namespace RmsVoltageSwellPeriod {
 struct TypeInfo
 {
-    using Type             = int32_t;
-    using DecodableType    = int32_t;
-    using DecodableArgType = int32_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int32s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwellPeriod::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int32s
-namespace Int40s {
+} // namespace RmsVoltageSwellPeriod
+namespace AcVoltageMultiplier {
 struct TypeInfo
 {
-    using Type             = int64_t;
-    using DecodableType    = int64_t;
-    using DecodableArgType = int64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int40s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcVoltageMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int40s
-namespace Int48s {
+} // namespace AcVoltageMultiplier
+namespace AcVoltageDivisor {
 struct TypeInfo
 {
-    using Type             = int64_t;
-    using DecodableType    = int64_t;
-    using DecodableArgType = int64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int48s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcVoltageDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int48s
-namespace Int56s {
+} // namespace AcVoltageDivisor
+namespace AcCurrentMultiplier {
 struct TypeInfo
 {
-    using Type             = int64_t;
-    using DecodableType    = int64_t;
-    using DecodableArgType = int64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int56s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcCurrentMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int56s
-namespace Int64s {
+} // namespace AcCurrentMultiplier
+namespace AcCurrentDivisor {
 struct TypeInfo
 {
-    using Type             = int64_t;
-    using DecodableType    = int64_t;
-    using DecodableArgType = int64_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Int64s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcCurrentDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Int64s
-namespace Enum8 {
+} // namespace AcCurrentDivisor
+namespace AcPowerMultiplier {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Enum8::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcPowerMultiplier::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Enum8
-namespace Enum16 {
+} // namespace AcPowerMultiplier
+namespace AcPowerDivisor {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Enum16::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcPowerDivisor::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Enum16
-namespace FloatSingle {
+} // namespace AcPowerDivisor
+namespace OverloadAlarmsMask {
 struct TypeInfo
 {
-    using Type             = float;
-    using DecodableType    = float;
-    using DecodableArgType = float;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FloatSingle::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OverloadAlarmsMask::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FloatSingle
-namespace FloatDouble {
+} // namespace OverloadAlarmsMask
+namespace VoltageOverload {
 struct TypeInfo
 {
-    using Type             = double;
-    using DecodableType    = double;
-    using DecodableArgType = double;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FloatDouble::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::VoltageOverload::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace FloatDouble
-namespace OctetString {
+} // namespace VoltageOverload
+namespace CurrentOverload {
 struct TypeInfo
 {
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OctetString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentOverload::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace OctetString
-namespace ListInt8u {
+} // namespace CurrentOverload
+namespace AcOverloadAlarmsMask {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const uint8_t>;
-    using DecodableType    = chip::app::DataModel::DecodableList<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<uint8_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ListInt8u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcOverloadAlarmsMask::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ListInt8u
-namespace ListOctetString {
+} // namespace AcOverloadAlarmsMask
+namespace AcVoltageOverload {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::ByteSpan>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::ByteSpan>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::ByteSpan> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ListOctetString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcVoltageOverload::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ListOctetString
-namespace ListStructOctetString {
+} // namespace AcVoltageOverload
+namespace AcCurrentOverload {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ListStructOctetString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcCurrentOverload::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ListStructOctetString
-namespace LongOctetString {
+};
+} // namespace AcCurrentOverload
+namespace AcActivePowerOverload {
 struct TypeInfo
 {
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LongOctetString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcActivePowerOverload::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 1000; }
 };
-} // namespace LongOctetString
-namespace CharString {
+} // namespace AcActivePowerOverload
+namespace AcReactivePowerOverload {
 struct TypeInfo
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CharString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AcReactivePowerOverload::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace CharString
-namespace LongCharString {
+} // namespace AcReactivePowerOverload
+namespace AverageRmsOverVoltage {
 struct TypeInfo
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LongCharString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsOverVoltage::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 1000; }
 };
-} // namespace LongCharString
-namespace EpochUs {
+} // namespace AverageRmsOverVoltage
+namespace AverageRmsUnderVoltage {
 struct TypeInfo
 {
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::EpochUs::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltage::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace EpochUs
-namespace EpochS {
+} // namespace AverageRmsUnderVoltage
+namespace RmsExtremeOverVoltage {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::EpochS::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltage::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace EpochS
-namespace VendorId {
+} // namespace RmsExtremeOverVoltage
+namespace RmsExtremeUnderVoltage {
 struct TypeInfo
 {
-    using Type             = chip::VendorId;
-    using DecodableType    = chip::VendorId;
-    using DecodableArgType = chip::VendorId;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::VendorId::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltage::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace VendorId
-namespace ListNullablesAndOptionalsStruct {
+} // namespace RmsExtremeUnderVoltage
+namespace RmsVoltageSag {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ListNullablesAndOptionalsStruct::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSag::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ListNullablesAndOptionalsStruct
-namespace EnumAttr {
+} // namespace RmsVoltageSag
+namespace RmsVoltageSwell {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::TestCluster::SimpleEnum;
-    using DecodableType    = chip::app::Clusters::TestCluster::SimpleEnum;
-    using DecodableArgType = chip::app::Clusters::TestCluster::SimpleEnum;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::EnumAttr::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwell::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace EnumAttr
-namespace StructAttr {
+} // namespace RmsVoltageSwell
+namespace LineCurrentPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type;
-    using DecodableType    = chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType;
-    using DecodableArgType = const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StructAttr::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LineCurrentPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace StructAttr
-namespace RangeRestrictedInt8u {
+} // namespace LineCurrentPhaseB
+namespace ActiveCurrentPhaseB {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt8u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveCurrentPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RangeRestrictedInt8u
-namespace RangeRestrictedInt8s {
+} // namespace ActiveCurrentPhaseB
+namespace ReactiveCurrentPhaseB {
 struct TypeInfo
 {
-    using Type             = int8_t;
-    using DecodableType    = int8_t;
-    using DecodableArgType = int8_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt8s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReactiveCurrentPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RangeRestrictedInt8s
-namespace RangeRestrictedInt16u {
+} // namespace ReactiveCurrentPhaseB
+namespace RmsVoltagePhaseB {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt16u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltagePhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RangeRestrictedInt16u
-namespace RangeRestrictedInt16s {
+} // namespace RmsVoltagePhaseB
+namespace RmsVoltageMinPhaseB {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt16s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMinPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RangeRestrictedInt16s
-namespace ListLongOctetString {
+} // namespace RmsVoltageMinPhaseB
+namespace RmsVoltageMaxPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::ByteSpan>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::ByteSpan>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::ByteSpan> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ListLongOctetString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMaxPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ListLongOctetString
-namespace ListFabricScoped {
+} // namespace RmsVoltageMaxPhaseB
+namespace RmsCurrentPhaseB {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type>;
-    using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ListFabricScoped::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ListFabricScoped
-namespace TimedWriteBoolean {
+} // namespace RmsCurrentPhaseB
+namespace RmsCurrentMinPhaseB {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TimedWriteBoolean::Id; }
-    static constexpr bool MustUseTimedWrite() { return true; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMinPhaseB::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace TimedWriteBoolean
-namespace GeneralErrorBoolean {
+} // namespace RmsCurrentMinPhaseB
+namespace RmsCurrentMaxPhaseB {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneralErrorBoolean::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMaxPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace GeneralErrorBoolean
-namespace ClusterErrorBoolean {
+} // namespace RmsCurrentMaxPhaseB
+namespace ActivePowerPhaseB {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterErrorBoolean::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ClusterErrorBoolean
-namespace Unsupported {
+} // namespace ActivePowerPhaseB
+namespace ActivePowerMinPhaseB {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Unsupported::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMinPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Unsupported
-namespace NullableBoolean {
+} // namespace ActivePowerMinPhaseB
+namespace ActivePowerMaxPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<bool>;
-    using DecodableType    = chip::app::DataModel::Nullable<bool>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<bool> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBoolean::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMaxPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableBoolean
-namespace NullableBitmap8 {
+} // namespace ActivePowerMaxPhaseB
+namespace ReactivePowerPhaseB {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap8::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReactivePowerPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableBitmap8
-namespace NullableBitmap16 {
+} // namespace ReactivePowerPhaseB
+namespace ApparentPowerPhaseB {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap16::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ApparentPowerPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableBitmap16
-namespace NullableBitmap32 {
+} // namespace ApparentPowerPhaseB
+namespace PowerFactorPhaseB {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> &;
+    using Type             = int8_t;
+    using DecodableType    = int8_t;
+    using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap32::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerFactorPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableBitmap32
-namespace NullableBitmap64 {
+} // namespace PowerFactorPhaseB
+namespace AverageRmsVoltageMeasurementPeriodPhaseB {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap64::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableBitmap64
-namespace NullableInt8u {
+} // namespace AverageRmsVoltageMeasurementPeriodPhaseB
+namespace AverageRmsOverVoltageCounterPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt8u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsOverVoltageCounterPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt8u
-namespace NullableInt16u {
+} // namespace AverageRmsOverVoltageCounterPhaseB
+namespace AverageRmsUnderVoltageCounterPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt16u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltageCounterPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt16u
-namespace NullableInt24u {
+} // namespace AverageRmsUnderVoltageCounterPhaseB
+namespace RmsExtremeOverVoltagePeriodPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt24u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt24u
-namespace NullableInt32u {
+} // namespace RmsExtremeOverVoltagePeriodPhaseB
+namespace RmsExtremeUnderVoltagePeriodPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt32u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt32u
-namespace NullableInt40u {
+} // namespace RmsExtremeUnderVoltagePeriodPhaseB
+namespace RmsVoltageSagPeriodPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt40u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSagPeriodPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt40u
-namespace NullableInt48u {
+} // namespace RmsVoltageSagPeriodPhaseB
+namespace RmsVoltageSwellPeriodPhaseB {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt48u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwellPeriodPhaseB::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt48u
-namespace NullableInt56u {
+} // namespace RmsVoltageSwellPeriodPhaseB
+namespace LineCurrentPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt56u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LineCurrentPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt56u
-namespace NullableInt64u {
+} // namespace LineCurrentPhaseC
+namespace ActiveCurrentPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt64u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveCurrentPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt64u
-namespace NullableInt8s {
+} // namespace ActiveCurrentPhaseC
+namespace ReactiveCurrentPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int8_t> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt8s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReactiveCurrentPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt8s
-namespace NullableInt16s {
+} // namespace ReactiveCurrentPhaseC
+namespace RmsVoltagePhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int16_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int16_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int16_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt16s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltagePhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt16s
-namespace NullableInt24s {
+} // namespace RmsVoltagePhaseC
+namespace RmsVoltageMinPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int32_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int32_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int32_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt24s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMinPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt24s
-namespace NullableInt32s {
+} // namespace RmsVoltageMinPhaseC
+namespace RmsVoltageMaxPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int32_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int32_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int32_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt32s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMaxPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt32s
-namespace NullableInt40s {
+} // namespace RmsVoltageMaxPhaseC
+namespace RmsCurrentPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt40s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt40s
-namespace NullableInt48s {
+} // namespace RmsCurrentPhaseC
+namespace RmsCurrentMinPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt48s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMinPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt48s
-namespace NullableInt56s {
+} // namespace RmsCurrentMinPhaseC
+namespace RmsCurrentMaxPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt56s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMaxPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt56s
-namespace NullableInt64s {
+} // namespace RmsCurrentMaxPhaseC
+namespace ActivePowerPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt64s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableInt64s
-namespace NullableEnum8 {
+} // namespace ActivePowerPhaseC
+namespace ActivePowerMinPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableEnum8::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMinPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableEnum8
-namespace NullableEnum16 {
+} // namespace ActivePowerMinPhaseC
+namespace ActivePowerMaxPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableEnum16::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMaxPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableEnum16
-namespace NullableFloatSingle {
+} // namespace ActivePowerMaxPhaseC
+namespace ReactivePowerPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<float>;
-    using DecodableType    = chip::app::DataModel::Nullable<float>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<float> &;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableFloatSingle::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReactivePowerPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableFloatSingle
-namespace NullableFloatDouble {
+} // namespace ReactivePowerPhaseC
+namespace ApparentPowerPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<double>;
-    using DecodableType    = chip::app::DataModel::Nullable<double>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<double> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableFloatDouble::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ApparentPowerPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableFloatDouble
-namespace NullableOctetString {
+} // namespace ApparentPowerPhaseC
+namespace PowerFactorPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::ByteSpan>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::ByteSpan>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::ByteSpan> &;
+    using Type             = int8_t;
+    using DecodableType    = int8_t;
+    using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableOctetString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerFactorPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace NullableOctetString
-namespace NullableCharString {
+} // namespace PowerFactorPhaseC
+namespace AverageRmsVoltageMeasurementPeriodPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::CharSpan>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::CharSpan>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::CharSpan> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableCharString::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace NullableCharString
-namespace NullableEnumAttr {
+} // namespace AverageRmsVoltageMeasurementPeriodPhaseC
+namespace AverageRmsOverVoltageCounterPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableEnumAttr::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsOverVoltageCounterPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableEnumAttr
-namespace NullableStruct {
+} // namespace AverageRmsOverVoltageCounterPhaseC
+namespace AverageRmsUnderVoltageCounterPhaseC {
 struct TypeInfo
 {
-    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>;
-    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableStruct::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltageCounterPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableStruct
-namespace NullableRangeRestrictedInt8u {
+} // namespace AverageRmsUnderVoltageCounterPhaseC
+namespace RmsExtremeOverVoltagePeriodPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt8u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableRangeRestrictedInt8u
-namespace NullableRangeRestrictedInt8s {
+} // namespace RmsExtremeOverVoltagePeriodPhaseC
+namespace RmsExtremeUnderVoltagePeriodPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int8_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int8_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int8_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt8s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableRangeRestrictedInt8s
-namespace NullableRangeRestrictedInt16u {
+} // namespace RmsExtremeUnderVoltagePeriodPhaseC
+namespace RmsVoltageSagPeriodPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt16u::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSagPeriodPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableRangeRestrictedInt16u
-namespace NullableRangeRestrictedInt16s {
+} // namespace RmsVoltageSagPeriodPhaseC
+namespace RmsVoltageSwellPeriodPhaseC {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<int16_t>;
-    using DecodableType    = chip::app::DataModel::Nullable<int16_t>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<int16_t> &;
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt16s::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwellPeriodPhaseC::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace NullableRangeRestrictedInt16s
+} // namespace RmsVoltageSwellPeriodPhaseC
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 };
 } // namespace ClusterRevision
 
@@ -38083,95 +32732,155 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::Boolean::TypeInfo::DecodableType boolean = static_cast<bool>(0);
-        Attributes::Bitmap8::TypeInfo::DecodableType bitmap8 =
-            static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(0);
-        Attributes::Bitmap16::TypeInfo::DecodableType bitmap16 =
-            static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(0);
-        Attributes::Bitmap32::TypeInfo::DecodableType bitmap32 =
-            static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(0);
-        Attributes::Bitmap64::TypeInfo::DecodableType bitmap64 =
-            static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(0);
-        Attributes::Int8u::TypeInfo::DecodableType int8u             = static_cast<uint8_t>(0);
-        Attributes::Int16u::TypeInfo::DecodableType int16u           = static_cast<uint16_t>(0);
-        Attributes::Int24u::TypeInfo::DecodableType int24u           = static_cast<uint32_t>(0);
-        Attributes::Int32u::TypeInfo::DecodableType int32u           = static_cast<uint32_t>(0);
-        Attributes::Int40u::TypeInfo::DecodableType int40u           = static_cast<uint64_t>(0);
-        Attributes::Int48u::TypeInfo::DecodableType int48u           = static_cast<uint64_t>(0);
-        Attributes::Int56u::TypeInfo::DecodableType int56u           = static_cast<uint64_t>(0);
-        Attributes::Int64u::TypeInfo::DecodableType int64u           = static_cast<uint64_t>(0);
-        Attributes::Int8s::TypeInfo::DecodableType int8s             = static_cast<int8_t>(0);
-        Attributes::Int16s::TypeInfo::DecodableType int16s           = static_cast<int16_t>(0);
-        Attributes::Int24s::TypeInfo::DecodableType int24s           = static_cast<int32_t>(0);
-        Attributes::Int32s::TypeInfo::DecodableType int32s           = static_cast<int32_t>(0);
-        Attributes::Int40s::TypeInfo::DecodableType int40s           = static_cast<int64_t>(0);
-        Attributes::Int48s::TypeInfo::DecodableType int48s           = static_cast<int64_t>(0);
-        Attributes::Int56s::TypeInfo::DecodableType int56s           = static_cast<int64_t>(0);
-        Attributes::Int64s::TypeInfo::DecodableType int64s           = static_cast<int64_t>(0);
-        Attributes::Enum8::TypeInfo::DecodableType enum8             = static_cast<uint8_t>(0);
-        Attributes::Enum16::TypeInfo::DecodableType enum16           = static_cast<uint16_t>(0);
-        Attributes::FloatSingle::TypeInfo::DecodableType floatSingle = static_cast<float>(0);
-        Attributes::FloatDouble::TypeInfo::DecodableType floatDouble = static_cast<double>(0);
-        Attributes::OctetString::TypeInfo::DecodableType octetString;
-        Attributes::ListInt8u::TypeInfo::DecodableType listInt8u;
-        Attributes::ListOctetString::TypeInfo::DecodableType listOctetString;
-        Attributes::ListStructOctetString::TypeInfo::DecodableType listStructOctetString;
-        Attributes::LongOctetString::TypeInfo::DecodableType longOctetString;
-        Attributes::CharString::TypeInfo::DecodableType charString;
-        Attributes::LongCharString::TypeInfo::DecodableType longCharString;
-        Attributes::EpochUs::TypeInfo::DecodableType epochUs   = static_cast<uint64_t>(0);
-        Attributes::EpochS::TypeInfo::DecodableType epochS     = static_cast<uint32_t>(0);
-        Attributes::VendorId::TypeInfo::DecodableType vendorId = static_cast<chip::VendorId>(0);
-        Attributes::ListNullablesAndOptionalsStruct::TypeInfo::DecodableType listNullablesAndOptionalsStruct;
-        Attributes::EnumAttr::TypeInfo::DecodableType enumAttr = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(0);
-        Attributes::StructAttr::TypeInfo::DecodableType structAttr;
-        Attributes::RangeRestrictedInt8u::TypeInfo::DecodableType rangeRestrictedInt8u   = static_cast<uint8_t>(0);
-        Attributes::RangeRestrictedInt8s::TypeInfo::DecodableType rangeRestrictedInt8s   = static_cast<int8_t>(0);
-        Attributes::RangeRestrictedInt16u::TypeInfo::DecodableType rangeRestrictedInt16u = static_cast<uint16_t>(0);
-        Attributes::RangeRestrictedInt16s::TypeInfo::DecodableType rangeRestrictedInt16s = static_cast<int16_t>(0);
-        Attributes::ListLongOctetString::TypeInfo::DecodableType listLongOctetString;
-        Attributes::ListFabricScoped::TypeInfo::DecodableType listFabricScoped;
-        Attributes::TimedWriteBoolean::TypeInfo::DecodableType timedWriteBoolean     = static_cast<bool>(0);
-        Attributes::GeneralErrorBoolean::TypeInfo::DecodableType generalErrorBoolean = static_cast<bool>(0);
-        Attributes::ClusterErrorBoolean::TypeInfo::DecodableType clusterErrorBoolean = static_cast<bool>(0);
-        Attributes::Unsupported::TypeInfo::DecodableType unsupported                 = static_cast<bool>(0);
-        Attributes::NullableBoolean::TypeInfo::DecodableType nullableBoolean;
-        Attributes::NullableBitmap8::TypeInfo::DecodableType nullableBitmap8;
-        Attributes::NullableBitmap16::TypeInfo::DecodableType nullableBitmap16;
-        Attributes::NullableBitmap32::TypeInfo::DecodableType nullableBitmap32;
-        Attributes::NullableBitmap64::TypeInfo::DecodableType nullableBitmap64;
-        Attributes::NullableInt8u::TypeInfo::DecodableType nullableInt8u;
-        Attributes::NullableInt16u::TypeInfo::DecodableType nullableInt16u;
-        Attributes::NullableInt24u::TypeInfo::DecodableType nullableInt24u;
-        Attributes::NullableInt32u::TypeInfo::DecodableType nullableInt32u;
-        Attributes::NullableInt40u::TypeInfo::DecodableType nullableInt40u;
-        Attributes::NullableInt48u::TypeInfo::DecodableType nullableInt48u;
-        Attributes::NullableInt56u::TypeInfo::DecodableType nullableInt56u;
-        Attributes::NullableInt64u::TypeInfo::DecodableType nullableInt64u;
-        Attributes::NullableInt8s::TypeInfo::DecodableType nullableInt8s;
-        Attributes::NullableInt16s::TypeInfo::DecodableType nullableInt16s;
-        Attributes::NullableInt24s::TypeInfo::DecodableType nullableInt24s;
-        Attributes::NullableInt32s::TypeInfo::DecodableType nullableInt32s;
-        Attributes::NullableInt40s::TypeInfo::DecodableType nullableInt40s;
-        Attributes::NullableInt48s::TypeInfo::DecodableType nullableInt48s;
-        Attributes::NullableInt56s::TypeInfo::DecodableType nullableInt56s;
-        Attributes::NullableInt64s::TypeInfo::DecodableType nullableInt64s;
-        Attributes::NullableEnum8::TypeInfo::DecodableType nullableEnum8;
-        Attributes::NullableEnum16::TypeInfo::DecodableType nullableEnum16;
-        Attributes::NullableFloatSingle::TypeInfo::DecodableType nullableFloatSingle;
-        Attributes::NullableFloatDouble::TypeInfo::DecodableType nullableFloatDouble;
-        Attributes::NullableOctetString::TypeInfo::DecodableType nullableOctetString;
-        Attributes::NullableCharString::TypeInfo::DecodableType nullableCharString;
-        Attributes::NullableEnumAttr::TypeInfo::DecodableType nullableEnumAttr;
-        Attributes::NullableStruct::TypeInfo::DecodableType nullableStruct;
-        Attributes::NullableRangeRestrictedInt8u::TypeInfo::DecodableType nullableRangeRestrictedInt8u;
-        Attributes::NullableRangeRestrictedInt8s::TypeInfo::DecodableType nullableRangeRestrictedInt8s;
-        Attributes::NullableRangeRestrictedInt16u::TypeInfo::DecodableType nullableRangeRestrictedInt16u;
-        Attributes::NullableRangeRestrictedInt16s::TypeInfo::DecodableType nullableRangeRestrictedInt16s;
+        Attributes::MeasurementType::TypeInfo::DecodableType measurementType                         = static_cast<uint32_t>(0);
+        Attributes::DcVoltage::TypeInfo::DecodableType dcVoltage                                     = static_cast<int16_t>(0);
+        Attributes::DcVoltageMin::TypeInfo::DecodableType dcVoltageMin                               = static_cast<int16_t>(0);
+        Attributes::DcVoltageMax::TypeInfo::DecodableType dcVoltageMax                               = static_cast<int16_t>(0);
+        Attributes::DcCurrent::TypeInfo::DecodableType dcCurrent                                     = static_cast<int16_t>(0);
+        Attributes::DcCurrentMin::TypeInfo::DecodableType dcCurrentMin                               = static_cast<int16_t>(0);
+        Attributes::DcCurrentMax::TypeInfo::DecodableType dcCurrentMax                               = static_cast<int16_t>(0);
+        Attributes::DcPower::TypeInfo::DecodableType dcPower                                         = static_cast<int16_t>(0);
+        Attributes::DcPowerMin::TypeInfo::DecodableType dcPowerMin                                   = static_cast<int16_t>(0);
+        Attributes::DcPowerMax::TypeInfo::DecodableType dcPowerMax                                   = static_cast<int16_t>(0);
+        Attributes::DcVoltageMultiplier::TypeInfo::DecodableType dcVoltageMultiplier                 = static_cast<uint16_t>(0);
+        Attributes::DcVoltageDivisor::TypeInfo::DecodableType dcVoltageDivisor                       = static_cast<uint16_t>(0);
+        Attributes::DcCurrentMultiplier::TypeInfo::DecodableType dcCurrentMultiplier                 = static_cast<uint16_t>(0);
+        Attributes::DcCurrentDivisor::TypeInfo::DecodableType dcCurrentDivisor                       = static_cast<uint16_t>(0);
+        Attributes::DcPowerMultiplier::TypeInfo::DecodableType dcPowerMultiplier                     = static_cast<uint16_t>(0);
+        Attributes::DcPowerDivisor::TypeInfo::DecodableType dcPowerDivisor                           = static_cast<uint16_t>(0);
+        Attributes::AcFrequency::TypeInfo::DecodableType acFrequency                                 = static_cast<uint16_t>(0);
+        Attributes::AcFrequencyMin::TypeInfo::DecodableType acFrequencyMin                           = static_cast<uint16_t>(0);
+        Attributes::AcFrequencyMax::TypeInfo::DecodableType acFrequencyMax                           = static_cast<uint16_t>(0);
+        Attributes::NeutralCurrent::TypeInfo::DecodableType neutralCurrent                           = static_cast<uint16_t>(0);
+        Attributes::TotalActivePower::TypeInfo::DecodableType totalActivePower                       = static_cast<int32_t>(0);
+        Attributes::TotalReactivePower::TypeInfo::DecodableType totalReactivePower                   = static_cast<int32_t>(0);
+        Attributes::TotalApparentPower::TypeInfo::DecodableType totalApparentPower                   = static_cast<uint32_t>(0);
+        Attributes::Measured1stHarmonicCurrent::TypeInfo::DecodableType measured1stHarmonicCurrent   = static_cast<int16_t>(0);
+        Attributes::Measured3rdHarmonicCurrent::TypeInfo::DecodableType measured3rdHarmonicCurrent   = static_cast<int16_t>(0);
+        Attributes::Measured5thHarmonicCurrent::TypeInfo::DecodableType measured5thHarmonicCurrent   = static_cast<int16_t>(0);
+        Attributes::Measured7thHarmonicCurrent::TypeInfo::DecodableType measured7thHarmonicCurrent   = static_cast<int16_t>(0);
+        Attributes::Measured9thHarmonicCurrent::TypeInfo::DecodableType measured9thHarmonicCurrent   = static_cast<int16_t>(0);
+        Attributes::Measured11thHarmonicCurrent::TypeInfo::DecodableType measured11thHarmonicCurrent = static_cast<int16_t>(0);
+        Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo::DecodableType measuredPhase1stHarmonicCurrent =
+            static_cast<int16_t>(0);
+        Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo::DecodableType measuredPhase3rdHarmonicCurrent =
+            static_cast<int16_t>(0);
+        Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo::DecodableType measuredPhase5thHarmonicCurrent =
+            static_cast<int16_t>(0);
+        Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo::DecodableType measuredPhase7thHarmonicCurrent =
+            static_cast<int16_t>(0);
+        Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo::DecodableType measuredPhase9thHarmonicCurrent =
+            static_cast<int16_t>(0);
+        Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo::DecodableType measuredPhase11thHarmonicCurrent =
+            static_cast<int16_t>(0);
+        Attributes::AcFrequencyMultiplier::TypeInfo::DecodableType acFrequencyMultiplier         = static_cast<uint16_t>(0);
+        Attributes::AcFrequencyDivisor::TypeInfo::DecodableType acFrequencyDivisor               = static_cast<uint16_t>(0);
+        Attributes::PowerMultiplier::TypeInfo::DecodableType powerMultiplier                     = static_cast<uint32_t>(0);
+        Attributes::PowerDivisor::TypeInfo::DecodableType powerDivisor                           = static_cast<uint32_t>(0);
+        Attributes::HarmonicCurrentMultiplier::TypeInfo::DecodableType harmonicCurrentMultiplier = static_cast<int8_t>(0);
+        Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo::DecodableType phaseHarmonicCurrentMultiplier = static_cast<int8_t>(0);
+        Attributes::InstantaneousVoltage::TypeInfo::DecodableType instantaneousVoltage                 = static_cast<int16_t>(0);
+        Attributes::InstantaneousLineCurrent::TypeInfo::DecodableType instantaneousLineCurrent         = static_cast<uint16_t>(0);
+        Attributes::InstantaneousActiveCurrent::TypeInfo::DecodableType instantaneousActiveCurrent     = static_cast<int16_t>(0);
+        Attributes::InstantaneousReactiveCurrent::TypeInfo::DecodableType instantaneousReactiveCurrent = static_cast<int16_t>(0);
+        Attributes::InstantaneousPower::TypeInfo::DecodableType instantaneousPower                     = static_cast<int16_t>(0);
+        Attributes::RmsVoltage::TypeInfo::DecodableType rmsVoltage                                     = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageMin::TypeInfo::DecodableType rmsVoltageMin                               = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageMax::TypeInfo::DecodableType rmsVoltageMax                               = static_cast<uint16_t>(0);
+        Attributes::RmsCurrent::TypeInfo::DecodableType rmsCurrent                                     = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentMin::TypeInfo::DecodableType rmsCurrentMin                               = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentMax::TypeInfo::DecodableType rmsCurrentMax                               = static_cast<uint16_t>(0);
+        Attributes::ActivePower::TypeInfo::DecodableType activePower                                   = static_cast<int16_t>(0);
+        Attributes::ActivePowerMin::TypeInfo::DecodableType activePowerMin                             = static_cast<int16_t>(0);
+        Attributes::ActivePowerMax::TypeInfo::DecodableType activePowerMax                             = static_cast<int16_t>(0);
+        Attributes::ReactivePower::TypeInfo::DecodableType reactivePower                               = static_cast<int16_t>(0);
+        Attributes::ApparentPower::TypeInfo::DecodableType apparentPower                               = static_cast<uint16_t>(0);
+        Attributes::PowerFactor::TypeInfo::DecodableType powerFactor                                   = static_cast<int8_t>(0);
+        Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo::DecodableType averageRmsVoltageMeasurementPeriod =
+            static_cast<uint16_t>(0);
+        Attributes::AverageRmsUnderVoltageCounter::TypeInfo::DecodableType averageRmsUnderVoltageCounter = static_cast<uint16_t>(0);
+        Attributes::RmsExtremeOverVoltagePeriod::TypeInfo::DecodableType rmsExtremeOverVoltagePeriod     = static_cast<uint16_t>(0);
+        Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo::DecodableType rmsExtremeUnderVoltagePeriod   = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageSagPeriod::TypeInfo::DecodableType rmsVoltageSagPeriod                     = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageSwellPeriod::TypeInfo::DecodableType rmsVoltageSwellPeriod                 = static_cast<uint16_t>(0);
+        Attributes::AcVoltageMultiplier::TypeInfo::DecodableType acVoltageMultiplier                     = static_cast<uint16_t>(0);
+        Attributes::AcVoltageDivisor::TypeInfo::DecodableType acVoltageDivisor                           = static_cast<uint16_t>(0);
+        Attributes::AcCurrentMultiplier::TypeInfo::DecodableType acCurrentMultiplier                     = static_cast<uint16_t>(0);
+        Attributes::AcCurrentDivisor::TypeInfo::DecodableType acCurrentDivisor                           = static_cast<uint16_t>(0);
+        Attributes::AcPowerMultiplier::TypeInfo::DecodableType acPowerMultiplier                         = static_cast<uint16_t>(0);
+        Attributes::AcPowerDivisor::TypeInfo::DecodableType acPowerDivisor                               = static_cast<uint16_t>(0);
+        Attributes::OverloadAlarmsMask::TypeInfo::DecodableType overloadAlarmsMask                       = static_cast<uint8_t>(0);
+        Attributes::VoltageOverload::TypeInfo::DecodableType voltageOverload                             = static_cast<int16_t>(0);
+        Attributes::CurrentOverload::TypeInfo::DecodableType currentOverload                             = static_cast<int16_t>(0);
+        Attributes::AcOverloadAlarmsMask::TypeInfo::DecodableType acOverloadAlarmsMask                   = static_cast<uint16_t>(0);
+        Attributes::AcVoltageOverload::TypeInfo::DecodableType acVoltageOverload                         = static_cast<int16_t>(0);
+        Attributes::AcCurrentOverload::TypeInfo::DecodableType acCurrentOverload                         = static_cast<int16_t>(0);
+        Attributes::AcActivePowerOverload::TypeInfo::DecodableType acActivePowerOverload                 = static_cast<int16_t>(0);
+        Attributes::AcReactivePowerOverload::TypeInfo::DecodableType acReactivePowerOverload             = static_cast<int16_t>(0);
+        Attributes::AverageRmsOverVoltage::TypeInfo::DecodableType averageRmsOverVoltage                 = static_cast<int16_t>(0);
+        Attributes::AverageRmsUnderVoltage::TypeInfo::DecodableType averageRmsUnderVoltage               = static_cast<int16_t>(0);
+        Attributes::RmsExtremeOverVoltage::TypeInfo::DecodableType rmsExtremeOverVoltage                 = static_cast<int16_t>(0);
+        Attributes::RmsExtremeUnderVoltage::TypeInfo::DecodableType rmsExtremeUnderVoltage               = static_cast<int16_t>(0);
+        Attributes::RmsVoltageSag::TypeInfo::DecodableType rmsVoltageSag                                 = static_cast<int16_t>(0);
+        Attributes::RmsVoltageSwell::TypeInfo::DecodableType rmsVoltageSwell                             = static_cast<int16_t>(0);
+        Attributes::LineCurrentPhaseB::TypeInfo::DecodableType lineCurrentPhaseB                         = static_cast<uint16_t>(0);
+        Attributes::ActiveCurrentPhaseB::TypeInfo::DecodableType activeCurrentPhaseB                     = static_cast<int16_t>(0);
+        Attributes::ReactiveCurrentPhaseB::TypeInfo::DecodableType reactiveCurrentPhaseB                 = static_cast<int16_t>(0);
+        Attributes::RmsVoltagePhaseB::TypeInfo::DecodableType rmsVoltagePhaseB                           = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageMinPhaseB::TypeInfo::DecodableType rmsVoltageMinPhaseB                     = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageMaxPhaseB::TypeInfo::DecodableType rmsVoltageMaxPhaseB                     = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentPhaseB::TypeInfo::DecodableType rmsCurrentPhaseB                           = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentMinPhaseB::TypeInfo::DecodableType rmsCurrentMinPhaseB                     = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentMaxPhaseB::TypeInfo::DecodableType rmsCurrentMaxPhaseB                     = static_cast<uint16_t>(0);
+        Attributes::ActivePowerPhaseB::TypeInfo::DecodableType activePowerPhaseB                         = static_cast<int16_t>(0);
+        Attributes::ActivePowerMinPhaseB::TypeInfo::DecodableType activePowerMinPhaseB                   = static_cast<int16_t>(0);
+        Attributes::ActivePowerMaxPhaseB::TypeInfo::DecodableType activePowerMaxPhaseB                   = static_cast<int16_t>(0);
+        Attributes::ReactivePowerPhaseB::TypeInfo::DecodableType reactivePowerPhaseB                     = static_cast<int16_t>(0);
+        Attributes::ApparentPowerPhaseB::TypeInfo::DecodableType apparentPowerPhaseB                     = static_cast<uint16_t>(0);
+        Attributes::PowerFactorPhaseB::TypeInfo::DecodableType powerFactorPhaseB                         = static_cast<int8_t>(0);
+        Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo::DecodableType averageRmsVoltageMeasurementPeriodPhaseB =
+            static_cast<uint16_t>(0);
+        Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo::DecodableType averageRmsOverVoltageCounterPhaseB =
+            static_cast<uint16_t>(0);
+        Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo::DecodableType averageRmsUnderVoltageCounterPhaseB =
+            static_cast<uint16_t>(0);
+        Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo::DecodableType rmsExtremeOverVoltagePeriodPhaseB =
+            static_cast<uint16_t>(0);
+        Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo::DecodableType rmsExtremeUnderVoltagePeriodPhaseB =
+            static_cast<uint16_t>(0);
+        Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo::DecodableType rmsVoltageSagPeriodPhaseB     = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo::DecodableType rmsVoltageSwellPeriodPhaseB = static_cast<uint16_t>(0);
+        Attributes::LineCurrentPhaseC::TypeInfo::DecodableType lineCurrentPhaseC                     = static_cast<uint16_t>(0);
+        Attributes::ActiveCurrentPhaseC::TypeInfo::DecodableType activeCurrentPhaseC                 = static_cast<int16_t>(0);
+        Attributes::ReactiveCurrentPhaseC::TypeInfo::DecodableType reactiveCurrentPhaseC             = static_cast<int16_t>(0);
+        Attributes::RmsVoltagePhaseC::TypeInfo::DecodableType rmsVoltagePhaseC                       = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageMinPhaseC::TypeInfo::DecodableType rmsVoltageMinPhaseC                 = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageMaxPhaseC::TypeInfo::DecodableType rmsVoltageMaxPhaseC                 = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentPhaseC::TypeInfo::DecodableType rmsCurrentPhaseC                       = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentMinPhaseC::TypeInfo::DecodableType rmsCurrentMinPhaseC                 = static_cast<uint16_t>(0);
+        Attributes::RmsCurrentMaxPhaseC::TypeInfo::DecodableType rmsCurrentMaxPhaseC                 = static_cast<uint16_t>(0);
+        Attributes::ActivePowerPhaseC::TypeInfo::DecodableType activePowerPhaseC                     = static_cast<int16_t>(0);
+        Attributes::ActivePowerMinPhaseC::TypeInfo::DecodableType activePowerMinPhaseC               = static_cast<int16_t>(0);
+        Attributes::ActivePowerMaxPhaseC::TypeInfo::DecodableType activePowerMaxPhaseC               = static_cast<int16_t>(0);
+        Attributes::ReactivePowerPhaseC::TypeInfo::DecodableType reactivePowerPhaseC                 = static_cast<int16_t>(0);
+        Attributes::ApparentPowerPhaseC::TypeInfo::DecodableType apparentPowerPhaseC                 = static_cast<uint16_t>(0);
+        Attributes::PowerFactorPhaseC::TypeInfo::DecodableType powerFactorPhaseC                     = static_cast<int8_t>(0);
+        Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo::DecodableType averageRmsVoltageMeasurementPeriodPhaseC =
+            static_cast<uint16_t>(0);
+        Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo::DecodableType averageRmsOverVoltageCounterPhaseC =
+            static_cast<uint16_t>(0);
+        Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo::DecodableType averageRmsUnderVoltageCounterPhaseC =
+            static_cast<uint16_t>(0);
+        Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo::DecodableType rmsExtremeOverVoltagePeriodPhaseC =
+            static_cast<uint16_t>(0);
+        Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo::DecodableType rmsExtremeUnderVoltagePeriodPhaseC =
+            static_cast<uint16_t>(0);
+        Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo::DecodableType rmsVoltageSagPeriodPhaseC     = static_cast<uint16_t>(0);
+        Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo::DecodableType rmsVoltageSwellPeriodPhaseC = static_cast<uint16_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -38180,1003 +32889,643 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-namespace Events {
-namespace TestEvent {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
+} // namespace ElectricalMeasurement
+namespace TestCluster {
+namespace Structs {
+namespace SimpleStruct {
 enum class Fields
 {
-    kArg1 = 1,
-    kArg2 = 2,
-    kArg3 = 3,
-    kArg4 = 4,
-    kArg5 = 5,
-    kArg6 = 6,
-};
-
-struct Type
-{
-public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::TestEvent::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-    static constexpr bool kIsFabricScoped = false;
-
-    uint8_t arg1    = static_cast<uint8_t>(0);
-    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
-    bool arg3       = static_cast<bool>(0);
-    Structs::SimpleStruct::Type arg4;
-    DataModel::List<const Structs::SimpleStruct::Type> arg5;
-    DataModel::List<const SimpleEnum> arg6;
-
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    kA = 0,
+    kB = 1,
+    kC = 2,
+    kD = 3,
+    kE = 4,
+    kF = 5,
+    kG = 6,
+    kH = 7,
 };
 
-struct DecodableType
+struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::TestEvent::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    uint8_t arg1    = static_cast<uint8_t>(0);
-    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
-    bool arg3       = static_cast<bool>(0);
-    Structs::SimpleStruct::DecodableType arg4;
-    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg5;
-    DataModel::DecodableList<SimpleEnum> arg6;
+    uint8_t a    = static_cast<uint8_t>(0);
+    bool b       = static_cast<bool>(0);
+    SimpleEnum c = static_cast<SimpleEnum>(0);
+    chip::ByteSpan d;
+    chip::CharSpan e;
+    chip::BitMask<SimpleBitmap> f = static_cast<chip::BitMask<SimpleBitmap>>(0);
+    float g                       = static_cast<float>(0);
+    double h                      = static_cast<double>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
-} // namespace TestEvent
-namespace TestFabricScopedEvent {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
+using DecodableType = Type;
+
+} // namespace SimpleStruct
+namespace TestFabricScoped {
 enum class Fields
 {
-    kArg1 = 254,
+    kFabricSensitiveInt8u                 = 1,
+    kOptionalFabricSensitiveInt8u         = 2,
+    kNullableFabricSensitiveInt8u         = 3,
+    kNullableOptionalFabricSensitiveInt8u = 4,
+    kFabricSensitiveCharString            = 5,
+    kFabricSensitiveStruct                = 6,
+    kFabricSensitiveInt8uList             = 7,
+    kFabricIndex                          = 254,
 };
 
 struct Type
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::TestFabricScopedEvent::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    uint8_t fabricSensitiveInt8u = static_cast<uint8_t>(0);
+    Optional<uint8_t> optionalFabricSensitiveInt8u;
+    DataModel::Nullable<uint8_t> nullableFabricSensitiveInt8u;
+    Optional<DataModel::Nullable<uint8_t>> nullableOptionalFabricSensitiveInt8u;
+    chip::CharSpan fabricSensitiveCharString;
+    Structs::SimpleStruct::Type fabricSensitiveStruct;
+    DataModel::List<const uint8_t> fabricSensitiveInt8uList;
+    chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
+
     static constexpr bool kIsFabricScoped = true;
 
-    chip::FabricIndex arg1 = static_cast<chip::FabricIndex>(0);
+    auto GetFabricIndex() const { return fabricIndex; }
 
-    auto GetFabricIndex() const { return arg1; }
+    void SetFabricIndex(chip::FabricIndex fabricIndex_) { fabricIndex = fabricIndex_; }
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    CHIP_ERROR EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    CHIP_ERROR EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex accessingFabricIndex) const;
+
+private:
+    CHIP_ERROR DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional<FabricIndex> & accessingFabricIndex) const;
 };
 
 struct DecodableType
 {
 public:
-    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::TestFabricScopedEvent::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
-
-    chip::FabricIndex arg1 = static_cast<chip::FabricIndex>(0);
+    uint8_t fabricSensitiveInt8u = static_cast<uint8_t>(0);
+    Optional<uint8_t> optionalFabricSensitiveInt8u;
+    DataModel::Nullable<uint8_t> nullableFabricSensitiveInt8u;
+    Optional<DataModel::Nullable<uint8_t>> nullableOptionalFabricSensitiveInt8u;
+    chip::CharSpan fabricSensitiveCharString;
+    Structs::SimpleStruct::DecodableType fabricSensitiveStruct;
+    DataModel::DecodableList<uint8_t> fabricSensitiveInt8uList;
+    chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace TestFabricScopedEvent
-} // namespace Events
-} // namespace TestCluster
-namespace Messaging {
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace DisplayMessage {
-struct Type;
-struct DecodableType;
-} // namespace DisplayMessage
-
-namespace GetLastMessage {
-struct Type;
-struct DecodableType;
-} // namespace GetLastMessage
-
-namespace CancelMessage {
-struct Type;
-struct DecodableType;
-} // namespace CancelMessage
-
-namespace MessageConfirmation {
-struct Type;
-struct DecodableType;
-} // namespace MessageConfirmation
-
-namespace DisplayProtectedMessage {
-struct Type;
-struct DecodableType;
-} // namespace DisplayProtectedMessage
 
-namespace GetMessageCancellation {
-struct Type;
-struct DecodableType;
-} // namespace GetMessageCancellation
+    static constexpr bool kIsFabricScoped = true;
 
-namespace CancelAllMessages {
-struct Type;
-struct DecodableType;
-} // namespace CancelAllMessages
+    auto GetFabricIndex() const { return fabricIndex; }
 
-} // namespace Commands
+    void SetFabricIndex(chip::FabricIndex fabricIndex_) { fabricIndex = fabricIndex_; }
+};
 
-namespace Commands {
-namespace DisplayMessage {
+} // namespace TestFabricScoped
+namespace NullablesAndOptionalsStruct {
 enum class Fields
 {
-    kMessageId                      = 0,
-    kMessageControl                 = 1,
-    kStartTime                      = 2,
-    kDurationInMinutes              = 3,
-    kMessage                        = 4,
-    kOptionalExtendedMessageControl = 5,
+    kNullableInt            = 0,
+    kOptionalInt            = 1,
+    kNullableOptionalInt    = 2,
+    kNullableString         = 3,
+    kOptionalString         = 4,
+    kNullableOptionalString = 5,
+    kNullableStruct         = 6,
+    kOptionalStruct         = 7,
+    kNullableOptionalStruct = 8,
+    kNullableList           = 9,
+    kOptionalList           = 10,
+    kNullableOptionalList   = 11,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::DisplayMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    DataModel::Nullable<uint16_t> nullableInt;
+    Optional<uint16_t> optionalInt;
+    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
+    DataModel::Nullable<chip::CharSpan> nullableString;
+    Optional<chip::CharSpan> optionalString;
+    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
+    DataModel::Nullable<Structs::SimpleStruct::Type> nullableStruct;
+    Optional<Structs::SimpleStruct::Type> optionalStruct;
+    Optional<DataModel::Nullable<Structs::SimpleStruct::Type>> nullableOptionalStruct;
+    DataModel::Nullable<DataModel::List<const SimpleEnum>> nullableList;
+    Optional<DataModel::List<const SimpleEnum>> optionalList;
+    Optional<DataModel::Nullable<DataModel::List<const SimpleEnum>>> nullableOptionalList;
 
-    uint32_t messageId                                  = static_cast<uint32_t>(0);
-    chip::BitFlags<MessagingControlMask> messageControl = static_cast<chip::BitFlags<MessagingControlMask>>(0);
-    uint32_t startTime                                  = static_cast<uint32_t>(0);
-    uint16_t durationInMinutes                          = static_cast<uint16_t>(0);
-    chip::CharSpan message;
-    chip::BitFlags<MessagingExtendedControlMask> optionalExtendedMessageControl =
-        static_cast<chip::BitFlags<MessagingExtendedControlMask>>(0);
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::DisplayMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    DataModel::Nullable<uint16_t> nullableInt;
+    Optional<uint16_t> optionalInt;
+    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
+    DataModel::Nullable<chip::CharSpan> nullableString;
+    Optional<chip::CharSpan> optionalString;
+    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
+    DataModel::Nullable<Structs::SimpleStruct::DecodableType> nullableStruct;
+    Optional<Structs::SimpleStruct::DecodableType> optionalStruct;
+    Optional<DataModel::Nullable<Structs::SimpleStruct::DecodableType>> nullableOptionalStruct;
+    DataModel::Nullable<DataModel::DecodableList<SimpleEnum>> nullableList;
+    Optional<DataModel::DecodableList<SimpleEnum>> optionalList;
+    Optional<DataModel::Nullable<DataModel::DecodableList<SimpleEnum>>> nullableOptionalList;
 
-    uint32_t messageId                                  = static_cast<uint32_t>(0);
-    chip::BitFlags<MessagingControlMask> messageControl = static_cast<chip::BitFlags<MessagingControlMask>>(0);
-    uint32_t startTime                                  = static_cast<uint32_t>(0);
-    uint16_t durationInMinutes                          = static_cast<uint16_t>(0);
-    chip::CharSpan message;
-    chip::BitFlags<MessagingExtendedControlMask> optionalExtendedMessageControl =
-        static_cast<chip::BitFlags<MessagingExtendedControlMask>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 };
-}; // namespace DisplayMessage
-namespace GetLastMessage {
+
+} // namespace NullablesAndOptionalsStruct
+namespace NestedStruct {
 enum class Fields
 {
+    kA = 0,
+    kB = 1,
+    kC = 2,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetLastMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    uint8_t a = static_cast<uint8_t>(0);
+    bool b    = static_cast<bool>(0);
+    Structs::SimpleStruct::Type c;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 
-    using ResponseType = DataModel::NullObjectType;
+    static constexpr bool kIsFabricScoped = false;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
 
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetLastMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+using DecodableType = Type;
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetLastMessage
-namespace CancelMessage {
+} // namespace NestedStruct
+namespace NestedStructList {
 enum class Fields
 {
-    kMessageId      = 0,
-    kMessageControl = 1,
+    kA = 0,
+    kB = 1,
+    kC = 2,
+    kD = 3,
+    kE = 4,
+    kF = 5,
+    kG = 6,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::CancelMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    uint8_t a = static_cast<uint8_t>(0);
+    bool b    = static_cast<bool>(0);
+    Structs::SimpleStruct::Type c;
+    DataModel::List<const Structs::SimpleStruct::Type> d;
+    DataModel::List<const uint32_t> e;
+    DataModel::List<const chip::ByteSpan> f;
+    DataModel::List<const uint8_t> g;
 
-    uint32_t messageId                                  = static_cast<uint32_t>(0);
-    chip::BitFlags<MessagingControlMask> messageControl = static_cast<chip::BitFlags<MessagingControlMask>>(0);
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::CancelMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    uint8_t a = static_cast<uint8_t>(0);
+    bool b    = static_cast<bool>(0);
+    Structs::SimpleStruct::DecodableType c;
+    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> d;
+    DataModel::DecodableList<uint32_t> e;
+    DataModel::DecodableList<chip::ByteSpan> f;
+    DataModel::DecodableList<uint8_t> g;
 
-    uint32_t messageId                                  = static_cast<uint32_t>(0);
-    chip::BitFlags<MessagingControlMask> messageControl = static_cast<chip::BitFlags<MessagingControlMask>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 };
-}; // namespace CancelMessage
-namespace MessageConfirmation {
+
+} // namespace NestedStructList
+namespace DoubleNestedStructList {
 enum class Fields
 {
-    kMessageId                  = 0,
-    kConfirmationTime           = 1,
-    kMessageConfirmationControl = 2,
-    kMessageResponse            = 3,
+    kA = 0,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::MessageConfirmation::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    DataModel::List<const Structs::NestedStructList::Type> a;
 
-    uint32_t messageId                 = static_cast<uint32_t>(0);
-    uint32_t confirmationTime          = static_cast<uint32_t>(0);
-    uint8_t messageConfirmationControl = static_cast<uint8_t>(0);
-    chip::ByteSpan messageResponse;
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
-
-    using ResponseType = DataModel::NullObjectType;
-
-    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::MessageConfirmation::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    DataModel::DecodableList<Structs::NestedStructList::DecodableType> a;
 
-    uint32_t messageId                 = static_cast<uint32_t>(0);
-    uint32_t confirmationTime          = static_cast<uint32_t>(0);
-    uint8_t messageConfirmationControl = static_cast<uint8_t>(0);
-    chip::ByteSpan messageResponse;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 };
-}; // namespace MessageConfirmation
-namespace DisplayProtectedMessage {
+
+} // namespace DoubleNestedStructList
+namespace TestListStructOctet {
 enum class Fields
 {
-    kMessageId                      = 0,
-    kMessageControl                 = 1,
-    kStartTime                      = 2,
-    kDurationInMinutes              = 3,
-    kMessage                        = 4,
-    kOptionalExtendedMessageControl = 5,
+    kMember1 = 0,
+    kMember2 = 1,
 };
 
 struct Type
 {
 public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::DisplayProtectedMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+    uint64_t member1 = static_cast<uint64_t>(0);
+    chip::ByteSpan member2;
 
-    uint32_t messageId                                  = static_cast<uint32_t>(0);
-    chip::BitFlags<MessagingControlMask> messageControl = static_cast<chip::BitFlags<MessagingControlMask>>(0);
-    uint32_t startTime                                  = static_cast<uint32_t>(0);
-    uint16_t durationInMinutes                          = static_cast<uint16_t>(0);
-    chip::CharSpan message;
-    chip::BitFlags<MessagingExtendedControlMask> optionalExtendedMessageControl =
-        static_cast<chip::BitFlags<MessagingExtendedControlMask>>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
 
-    using ResponseType = DataModel::NullObjectType;
+using DecodableType = Type;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
+} // namespace TestListStructOctet
+} // namespace Structs
 
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::DisplayProtectedMessage::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-    uint32_t messageId                                  = static_cast<uint32_t>(0);
-    chip::BitFlags<MessagingControlMask> messageControl = static_cast<chip::BitFlags<MessagingControlMask>>(0);
-    uint32_t startTime                                  = static_cast<uint32_t>(0);
-    uint16_t durationInMinutes                          = static_cast<uint16_t>(0);
-    chip::CharSpan message;
-    chip::BitFlags<MessagingExtendedControlMask> optionalExtendedMessageControl =
-        static_cast<chip::BitFlags<MessagingExtendedControlMask>>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace DisplayProtectedMessage
-namespace GetMessageCancellation {
-enum class Fields
-{
-    kEarliestImplementationTime = 0,
-};
+namespace Test {
+struct Type;
+struct DecodableType;
+} // namespace Test
 
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetMessageCancellation::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+namespace TestSpecificResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestSpecificResponse
 
-    uint32_t earliestImplementationTime = static_cast<uint32_t>(0);
+namespace TestNotHandled {
+struct Type;
+struct DecodableType;
+} // namespace TestNotHandled
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+namespace TestAddArgumentsResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestAddArgumentsResponse
 
-    using ResponseType = DataModel::NullObjectType;
+namespace TestSpecific {
+struct Type;
+struct DecodableType;
+} // namespace TestSpecific
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
+namespace TestSimpleArgumentResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestSimpleArgumentResponse
 
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::GetMessageCancellation::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+namespace TestUnknownCommand {
+struct Type;
+struct DecodableType;
+} // namespace TestUnknownCommand
 
-    uint32_t earliestImplementationTime = static_cast<uint32_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace GetMessageCancellation
-namespace CancelAllMessages {
-enum class Fields
-{
-    kImplementationDateTime = 0,
-};
+namespace TestStructArrayArgumentResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestStructArrayArgumentResponse
 
-struct Type
-{
-public:
-    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::CancelAllMessages::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+namespace TestAddArguments {
+struct Type;
+struct DecodableType;
+} // namespace TestAddArguments
 
-    uint32_t implementationDateTime = static_cast<uint32_t>(0);
+namespace TestListInt8UReverseResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestListInt8UReverseResponse
 
-    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+namespace TestSimpleArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestSimpleArgumentRequest
 
-    using ResponseType = DataModel::NullObjectType;
+namespace TestEnumsResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestEnumsResponse
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
+namespace TestStructArrayArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestStructArrayArgumentRequest
 
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::CancelAllMessages::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+namespace TestNullableOptionalResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestNullableOptionalResponse
 
-    uint32_t implementationDateTime = static_cast<uint32_t>(0);
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace CancelAllMessages
-} // namespace Commands
+namespace TestStructArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestStructArgumentRequest
 
-namespace Attributes {
+namespace TestComplexNullableOptionalResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestComplexNullableOptionalResponse
 
-namespace GeneratedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+namespace TestNestedStructArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestNestedStructArgumentRequest
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+namespace BooleanResponse {
+struct Type;
+struct DecodableType;
+} // namespace BooleanResponse
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+namespace TestListStructArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestListStructArgumentRequest
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+namespace SimpleStructResponse {
+struct Type;
+struct DecodableType;
+} // namespace SimpleStructResponse
+
+namespace TestListInt8UArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestListInt8UArgumentRequest
+
+namespace TestEmitTestEventResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestEmitTestEventResponse
+
+namespace TestNestedStructListArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestNestedStructListArgumentRequest
+
+namespace TestEmitTestFabricScopedEventResponse {
+struct Type;
+struct DecodableType;
+} // namespace TestEmitTestFabricScopedEventResponse
+
+namespace TestListNestedStructListArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestListNestedStructListArgumentRequest
+
+namespace TestListInt8UReverseRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestListInt8UReverseRequest
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+namespace TestEnumsRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestEnumsRequest
 
-    static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ClusterRevision
+namespace TestNullableOptionalRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestNullableOptionalRequest
 
-struct TypeInfo
-{
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; }
+namespace TestComplexNullableOptionalRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestComplexNullableOptionalRequest
 
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+namespace SimpleStructEchoRequest {
+struct Type;
+struct DecodableType;
+} // namespace SimpleStructEchoRequest
 
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
-};
-} // namespace Attributes
-} // namespace Messaging
-namespace ApplianceIdentification {
+namespace TimedInvokeRequest {
+struct Type;
+struct DecodableType;
+} // namespace TimedInvokeRequest
 
-namespace Attributes {
+namespace TestSimpleOptionalArgumentRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestSimpleOptionalArgumentRequest
 
-namespace BasicIdentification {
-struct TypeInfo
-{
-    using Type             = uint64_t;
-    using DecodableType    = uint64_t;
-    using DecodableArgType = uint64_t;
+namespace TestEmitTestEventRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestEmitTestEventRequest
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::BasicIdentification::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace BasicIdentification
-namespace CompanyName {
-struct TypeInfo
-{
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+namespace TestEmitTestFabricScopedEventRequest {
+struct Type;
+struct DecodableType;
+} // namespace TestEmitTestFabricScopedEventRequest
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CompanyName::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
-};
-} // namespace CompanyName
-namespace CompanyId {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+} // namespace Commands
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CompanyId::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace CompanyId
-namespace BrandName {
-struct TypeInfo
+namespace Commands {
+namespace Test {
+enum class Fields
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::BrandName::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
 };
-} // namespace BrandName
-namespace BrandId {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::BrandId::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace BrandId
-namespace Model {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::Test::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Model::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
-};
-} // namespace Model
-namespace PartNumber {
-struct TypeInfo
-{
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PartNumber::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
-};
-} // namespace PartNumber
-namespace ProductRevision {
-struct TypeInfo
-{
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    using ResponseType = DataModel::NullObjectType;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ProductRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 6; }
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace ProductRevision
-namespace SoftwareRevision {
-struct TypeInfo
-{
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SoftwareRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 6; }
-};
-} // namespace SoftwareRevision
-namespace ProductTypeName {
-struct TypeInfo
+struct DecodableType
 {
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Test::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ProductTypeName::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 2; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace ProductTypeName
-namespace ProductTypeId {
-struct TypeInfo
+}; // namespace Test
+namespace TestSpecificResponse {
+enum class Fields
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ProductTypeId::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kReturnValue = 0,
 };
-} // namespace ProductTypeId
-namespace CecedSpecificationVersion {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CecedSpecificationVersion::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace CecedSpecificationVersion
-namespace GeneratedCommandList {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestSpecificResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+    uint8_t returnValue = static_cast<uint8_t>(0);
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestSpecificResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t returnValue = static_cast<uint8_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
+}; // namespace TestSpecificResponse
+namespace TestNotHandled {
+enum class Fields
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct Type
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::ApplianceIdentification::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
-
-        Attributes::BasicIdentification::TypeInfo::DecodableType basicIdentification = static_cast<uint64_t>(0);
-        Attributes::CompanyName::TypeInfo::DecodableType companyName;
-        Attributes::CompanyId::TypeInfo::DecodableType companyId = static_cast<uint16_t>(0);
-        Attributes::BrandName::TypeInfo::DecodableType brandName;
-        Attributes::BrandId::TypeInfo::DecodableType brandId = static_cast<uint16_t>(0);
-        Attributes::Model::TypeInfo::DecodableType model;
-        Attributes::PartNumber::TypeInfo::DecodableType partNumber;
-        Attributes::ProductRevision::TypeInfo::DecodableType productRevision;
-        Attributes::SoftwareRevision::TypeInfo::DecodableType softwareRevision;
-        Attributes::ProductTypeName::TypeInfo::DecodableType productTypeName;
-        Attributes::ProductTypeId::TypeInfo::DecodableType productTypeId                         = static_cast<uint16_t>(0);
-        Attributes::CecedSpecificationVersion::TypeInfo::DecodableType cecedSpecificationVersion = static_cast<uint8_t>(0);
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
-};
-} // namespace Attributes
-} // namespace ApplianceIdentification
-namespace MeterIdentification {
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestNotHandled::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-namespace Attributes {
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-namespace CompanyName {
-struct TypeInfo
-{
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    using ResponseType = DataModel::NullObjectType;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CompanyName::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace CompanyName
-namespace MeterTypeId {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeterTypeId::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace MeterTypeId
-namespace DataQualityId {
-struct TypeInfo
+struct DecodableType
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestNotHandled::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DataQualityId::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace DataQualityId
-namespace CustomerName {
-struct TypeInfo
+}; // namespace TestNotHandled
+namespace TestAddArgumentsResponse {
+enum class Fields
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CustomerName::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
+    kReturnValue = 0,
 };
-} // namespace CustomerName
-namespace Model {
-struct TypeInfo
-{
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Model::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
-};
-} // namespace Model
-namespace PartNumber {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestAddArgumentsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PartNumber::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
-};
-} // namespace PartNumber
-namespace ProductRevision {
-struct TypeInfo
-{
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    uint8_t returnValue = static_cast<uint8_t>(0);
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ProductRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 6; }
-};
-} // namespace ProductRevision
-namespace SoftwareRevision {
-struct TypeInfo
-{
-    using Type             = chip::ByteSpan;
-    using DecodableType    = chip::ByteSpan;
-    using DecodableArgType = chip::ByteSpan;
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SoftwareRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 6; }
-};
-} // namespace SoftwareRevision
-namespace UtilityName {
-struct TypeInfo
-{
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    using ResponseType = DataModel::NullObjectType;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::UtilityName::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace UtilityName
-namespace Pod {
-struct TypeInfo
-{
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Pod::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 16; }
-};
-} // namespace Pod
-namespace AvailablePower {
-struct TypeInfo
+struct DecodableType
 {
-    using Type             = int32_t;
-    using DecodableType    = int32_t;
-    using DecodableArgType = int32_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestAddArgumentsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AvailablePower::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t returnValue = static_cast<uint8_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace AvailablePower
-namespace PowerThreshold {
-struct TypeInfo
+}; // namespace TestAddArgumentsResponse
+namespace TestSpecific {
+enum class Fields
 {
-    using Type             = int32_t;
-    using DecodableType    = int32_t;
-    using DecodableArgType = int32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerThreshold::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PowerThreshold
-namespace GeneratedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestSpecific::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using ResponseType = Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestSpecific::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace ClusterRevision
-
-struct TypeInfo
+}; // namespace TestSpecific
+namespace TestSimpleArgumentResponse {
+enum class Fields
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::MeterIdentification::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
-
-        Attributes::CompanyName::TypeInfo::DecodableType companyName;
-        Attributes::MeterTypeId::TypeInfo::DecodableType meterTypeId     = static_cast<uint16_t>(0);
-        Attributes::DataQualityId::TypeInfo::DecodableType dataQualityId = static_cast<uint16_t>(0);
-        Attributes::CustomerName::TypeInfo::DecodableType customerName;
-        Attributes::Model::TypeInfo::DecodableType model;
-        Attributes::PartNumber::TypeInfo::DecodableType partNumber;
-        Attributes::ProductRevision::TypeInfo::DecodableType productRevision;
-        Attributes::SoftwareRevision::TypeInfo::DecodableType softwareRevision;
-        Attributes::UtilityName::TypeInfo::DecodableType utilityName;
-        Attributes::Pod::TypeInfo::DecodableType pod;
-        Attributes::AvailablePower::TypeInfo::DecodableType availablePower = static_cast<int32_t>(0);
-        Attributes::PowerThreshold::TypeInfo::DecodableType powerThreshold = static_cast<int32_t>(0);
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    kReturnValue = 0,
 };
-} // namespace Attributes
-} // namespace MeterIdentification
-namespace ApplianceEventsAndAlert {
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-namespace GetAlerts {
-struct Type;
-struct DecodableType;
-} // namespace GetAlerts
+    bool returnValue = static_cast<bool>(0);
 
-namespace GetAlertsResponse {
-struct Type;
-struct DecodableType;
-} // namespace GetAlertsResponse
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-namespace AlertsNotification {
-struct Type;
-struct DecodableType;
-} // namespace AlertsNotification
+    using ResponseType = DataModel::NullObjectType;
 
-namespace EventsNotification {
-struct Type;
-struct DecodableType;
-} // namespace EventsNotification
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
 
-} // namespace Commands
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-namespace Commands {
-namespace GetAlerts {
+    bool returnValue = static_cast<bool>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TestSimpleArgumentResponse
+namespace TestUnknownCommand {
 enum class Fields
 {
 };
@@ -39185,12 +33534,12 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetAlerts::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestUnknownCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ApplianceEventsAndAlert::Commands::GetAlertsResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39198,28 +33547,36 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetAlerts::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestUnknownCommand::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetAlerts
-namespace GetAlertsResponse {
+}; // namespace TestUnknownCommand
+namespace TestStructArrayArgumentResponse {
 enum class Fields
 {
-    kAlertsCount     = 0,
-    kAlertStructures = 1,
+    kArg1 = 0,
+    kArg2 = 1,
+    kArg3 = 2,
+    kArg4 = 3,
+    kArg5 = 4,
+    kArg6 = 5,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetAlertsResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    chip::BitFlags<AlertCount> alertsCount = static_cast<chip::BitFlags<AlertCount>>(0);
-    DataModel::List<const chip::BitFlags<AlertStructure>> alertStructures;
+    DataModel::List<const Structs::NestedStructList::Type> arg1;
+    DataModel::List<const Structs::SimpleStruct::Type> arg2;
+    DataModel::List<const SimpleEnum> arg3;
+    DataModel::List<const bool> arg4;
+    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
+    bool arg6       = static_cast<bool>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -39231,34 +33588,38 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetAlertsResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    chip::BitFlags<AlertCount> alertsCount = static_cast<chip::BitFlags<AlertCount>>(0);
-    DataModel::DecodableList<chip::BitFlags<AlertStructure>> alertStructures;
+    DataModel::DecodableList<Structs::NestedStructList::DecodableType> arg1;
+    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg2;
+    DataModel::DecodableList<SimpleEnum> arg3;
+    DataModel::DecodableList<bool> arg4;
+    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
+    bool arg6       = static_cast<bool>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetAlertsResponse
-namespace AlertsNotification {
+}; // namespace TestStructArrayArgumentResponse
+namespace TestAddArguments {
 enum class Fields
 {
-    kAlertsCount     = 0,
-    kAlertStructures = 1,
+    kArg1 = 0,
+    kArg2 = 1,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::AlertsNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestAddArguments::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    chip::BitFlags<AlertCount> alertsCount = static_cast<chip::BitFlags<AlertCount>>(0);
-    DataModel::List<const chip::BitFlags<AlertStructure>> alertStructures;
+    uint8_t arg1 = static_cast<uint8_t>(0);
+    uint8_t arg2 = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39266,30 +33627,28 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::AlertsNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestAddArguments::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    chip::BitFlags<AlertCount> alertsCount = static_cast<chip::BitFlags<AlertCount>>(0);
-    DataModel::DecodableList<chip::BitFlags<AlertStructure>> alertStructures;
+    uint8_t arg1 = static_cast<uint8_t>(0);
+    uint8_t arg2 = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace AlertsNotification
-namespace EventsNotification {
+}; // namespace TestAddArguments
+namespace TestListInt8UReverseResponse {
 enum class Fields
 {
-    kEventHeader = 0,
-    kEventId     = 1,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::EventsNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t eventHeader         = static_cast<uint8_t>(0);
-    EventIdentification eventId = static_cast<EventIdentification>(0);
+    DataModel::List<const uint8_t> arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -39301,158 +33660,186 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::EventsNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t eventHeader         = static_cast<uint8_t>(0);
-    EventIdentification eventId = static_cast<EventIdentification>(0);
+    DataModel::DecodableList<uint8_t> arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace EventsNotification
-} // namespace Commands
-
-namespace Attributes {
+}; // namespace TestListInt8UReverseResponse
+namespace TestSimpleArgumentRequest {
+enum class Fields
+{
+    kArg1 = 0,
+};
 
-namespace GeneratedCommandList {
-struct TypeInfo
+struct Type
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    bool arg1 = static_cast<bool>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestSimpleArgumentResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestSimpleArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    bool arg1 = static_cast<bool>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
+}; // namespace TestSimpleArgumentRequest
+namespace TestEnumsResponse {
+enum class Fields
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
+    kArg2 = 1,
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestEnumsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
+    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestEnumsResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
+    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TestEnumsResponse
+namespace TestStructArrayArgumentRequest {
+enum class Fields
+{
+    kArg1 = 0,
+    kArg2 = 1,
+    kArg3 = 2,
+    kArg4 = 3,
+    kArg5 = 4,
+    kArg6 = 5,
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct Type
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::ApplianceEventsAndAlert::Id; }
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    DataModel::List<const Structs::NestedStructList::Type> arg1;
+    DataModel::List<const Structs::SimpleStruct::Type> arg2;
+    DataModel::List<const SimpleEnum> arg3;
+    DataModel::List<const bool> arg4;
+    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
+    bool arg6       = static_cast<bool>(0);
 
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestStructArrayArgumentResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace Attributes
-} // namespace ApplianceEventsAndAlert
-namespace ApplianceStatistics {
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestStructArrayArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-namespace LogNotification {
-struct Type;
-struct DecodableType;
-} // namespace LogNotification
+    DataModel::DecodableList<Structs::NestedStructList::DecodableType> arg1;
+    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg2;
+    DataModel::DecodableList<SimpleEnum> arg3;
+    DataModel::DecodableList<bool> arg4;
+    SimpleEnum arg5 = static_cast<SimpleEnum>(0);
+    bool arg6       = static_cast<bool>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TestStructArrayArgumentRequest
+namespace TestNullableOptionalResponse {
+enum class Fields
+{
+    kWasPresent    = 0,
+    kWasNull       = 1,
+    kValue         = 2,
+    kOriginalValue = 3,
+};
 
-namespace LogRequest {
-struct Type;
-struct DecodableType;
-} // namespace LogRequest
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-namespace LogResponse {
-struct Type;
-struct DecodableType;
-} // namespace LogResponse
+    bool wasPresent = static_cast<bool>(0);
+    Optional<bool> wasNull;
+    Optional<uint8_t> value;
+    Optional<DataModel::Nullable<uint8_t>> originalValue;
 
-namespace LogQueueRequest {
-struct Type;
-struct DecodableType;
-} // namespace LogQueueRequest
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-namespace LogQueueResponse {
-struct Type;
-struct DecodableType;
-} // namespace LogQueueResponse
+    using ResponseType = DataModel::NullObjectType;
 
-namespace StatisticsAvailable {
-struct Type;
-struct DecodableType;
-} // namespace StatisticsAvailable
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
 
-} // namespace Commands
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-namespace Commands {
-namespace LogNotification {
+    bool wasPresent = static_cast<bool>(0);
+    Optional<bool> wasNull;
+    Optional<uint8_t> value;
+    Optional<DataModel::Nullable<uint8_t>> originalValue;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TestNullableOptionalResponse
+namespace TestStructArgumentRequest {
 enum class Fields
 {
-    kTimeStamp  = 0,
-    kLogId      = 1,
-    kLogLength  = 2,
-    kLogPayload = 3,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LogNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestStructArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t timeStamp = static_cast<uint32_t>(0);
-    uint32_t logId     = static_cast<uint32_t>(0);
-    uint32_t logLength = static_cast<uint32_t>(0);
-    DataModel::List<const uint8_t> logPayload;
+    Structs::SimpleStruct::Type arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39460,34 +33847,85 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LogNotification::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestStructArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t timeStamp = static_cast<uint32_t>(0);
-    uint32_t logId     = static_cast<uint32_t>(0);
-    uint32_t logLength = static_cast<uint32_t>(0);
-    DataModel::DecodableList<uint8_t> logPayload;
+    Structs::SimpleStruct::DecodableType arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LogNotification
-namespace LogRequest {
+}; // namespace TestStructArgumentRequest
+namespace TestComplexNullableOptionalResponse {
 enum class Fields
 {
-    kLogId = 0,
+    kNullableIntWasNull               = 0,
+    kNullableIntValue                 = 1,
+    kOptionalIntWasPresent            = 2,
+    kOptionalIntValue                 = 3,
+    kNullableOptionalIntWasPresent    = 4,
+    kNullableOptionalIntWasNull       = 5,
+    kNullableOptionalIntValue         = 6,
+    kNullableStringWasNull            = 7,
+    kNullableStringValue              = 8,
+    kOptionalStringWasPresent         = 9,
+    kOptionalStringValue              = 10,
+    kNullableOptionalStringWasPresent = 11,
+    kNullableOptionalStringWasNull    = 12,
+    kNullableOptionalStringValue      = 13,
+    kNullableStructWasNull            = 14,
+    kNullableStructValue              = 15,
+    kOptionalStructWasPresent         = 16,
+    kOptionalStructValue              = 17,
+    kNullableOptionalStructWasPresent = 18,
+    kNullableOptionalStructWasNull    = 19,
+    kNullableOptionalStructValue      = 20,
+    kNullableListWasNull              = 21,
+    kNullableListValue                = 22,
+    kOptionalListWasPresent           = 23,
+    kOptionalListValue                = 24,
+    kNullableOptionalListWasPresent   = 25,
+    kNullableOptionalListWasNull      = 26,
+    kNullableOptionalListValue        = 27,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LogRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t logId = static_cast<uint32_t>(0);
+    bool nullableIntWasNull = static_cast<bool>(0);
+    Optional<uint16_t> nullableIntValue;
+    bool optionalIntWasPresent = static_cast<bool>(0);
+    Optional<uint16_t> optionalIntValue;
+    bool nullableOptionalIntWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalIntWasNull;
+    Optional<uint16_t> nullableOptionalIntValue;
+    bool nullableStringWasNull = static_cast<bool>(0);
+    Optional<chip::CharSpan> nullableStringValue;
+    bool optionalStringWasPresent = static_cast<bool>(0);
+    Optional<chip::CharSpan> optionalStringValue;
+    bool nullableOptionalStringWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalStringWasNull;
+    Optional<chip::CharSpan> nullableOptionalStringValue;
+    bool nullableStructWasNull = static_cast<bool>(0);
+    Optional<Structs::SimpleStruct::Type> nullableStructValue;
+    bool optionalStructWasPresent = static_cast<bool>(0);
+    Optional<Structs::SimpleStruct::Type> optionalStructValue;
+    bool nullableOptionalStructWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalStructWasNull;
+    Optional<Structs::SimpleStruct::Type> nullableOptionalStructValue;
+    bool nullableListWasNull = static_cast<bool>(0);
+    Optional<DataModel::List<const SimpleEnum>> nullableListValue;
+    bool optionalListWasPresent = static_cast<bool>(0);
+    Optional<DataModel::List<const SimpleEnum>> optionalListValue;
+    bool nullableOptionalListWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalListWasNull;
+    Optional<DataModel::List<const SimpleEnum>> nullableOptionalListValue;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ApplianceStatistics::Commands::LogResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39495,37 +33933,58 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LogRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t logId = static_cast<uint32_t>(0);
+    bool nullableIntWasNull = static_cast<bool>(0);
+    Optional<uint16_t> nullableIntValue;
+    bool optionalIntWasPresent = static_cast<bool>(0);
+    Optional<uint16_t> optionalIntValue;
+    bool nullableOptionalIntWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalIntWasNull;
+    Optional<uint16_t> nullableOptionalIntValue;
+    bool nullableStringWasNull = static_cast<bool>(0);
+    Optional<chip::CharSpan> nullableStringValue;
+    bool optionalStringWasPresent = static_cast<bool>(0);
+    Optional<chip::CharSpan> optionalStringValue;
+    bool nullableOptionalStringWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalStringWasNull;
+    Optional<chip::CharSpan> nullableOptionalStringValue;
+    bool nullableStructWasNull = static_cast<bool>(0);
+    Optional<Structs::SimpleStruct::DecodableType> nullableStructValue;
+    bool optionalStructWasPresent = static_cast<bool>(0);
+    Optional<Structs::SimpleStruct::DecodableType> optionalStructValue;
+    bool nullableOptionalStructWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalStructWasNull;
+    Optional<Structs::SimpleStruct::DecodableType> nullableOptionalStructValue;
+    bool nullableListWasNull = static_cast<bool>(0);
+    Optional<DataModel::DecodableList<SimpleEnum>> nullableListValue;
+    bool optionalListWasPresent = static_cast<bool>(0);
+    Optional<DataModel::DecodableList<SimpleEnum>> optionalListValue;
+    bool nullableOptionalListWasPresent = static_cast<bool>(0);
+    Optional<bool> nullableOptionalListWasNull;
+    Optional<DataModel::DecodableList<SimpleEnum>> nullableOptionalListValue;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LogRequest
-namespace LogResponse {
+}; // namespace TestComplexNullableOptionalResponse
+namespace TestNestedStructArgumentRequest {
 enum class Fields
 {
-    kTimeStamp  = 0,
-    kLogId      = 1,
-    kLogLength  = 2,
-    kLogPayload = 3,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LogResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t timeStamp = static_cast<uint32_t>(0);
-    uint32_t logId     = static_cast<uint32_t>(0);
-    uint32_t logLength = static_cast<uint32_t>(0);
-    DataModel::List<const uint8_t> logPayload;
+    Structs::NestedStruct::Type arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39533,31 +33992,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LogResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t timeStamp = static_cast<uint32_t>(0);
-    uint32_t logId     = static_cast<uint32_t>(0);
-    uint32_t logLength = static_cast<uint32_t>(0);
-    DataModel::DecodableList<uint8_t> logPayload;
+    Structs::NestedStruct::DecodableType arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LogResponse
-namespace LogQueueRequest {
+}; // namespace TestNestedStructArgumentRequest
+namespace BooleanResponse {
 enum class Fields
 {
+    kValue = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LogQueueRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::BooleanResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+
+    bool value = static_cast<bool>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ApplianceStatistics::Commands::LogQueueResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39565,32 +34024,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LogQueueRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::BooleanResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
+    bool value = static_cast<bool>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LogQueueRequest
-namespace LogQueueResponse {
+}; // namespace BooleanResponse
+namespace TestListStructArgumentRequest {
 enum class Fields
 {
-    kLogQueueSize = 0,
-    kLogIds       = 1,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LogQueueResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestListStructArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t logQueueSize = static_cast<uint8_t>(0);
-    DataModel::List<const uint32_t> logIds;
+    DataModel::List<const Structs::SimpleStruct::Type> arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39598,30 +34056,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LogQueueResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestListStructArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t logQueueSize = static_cast<uint8_t>(0);
-    DataModel::DecodableList<uint32_t> logIds;
+    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LogQueueResponse
-namespace StatisticsAvailable {
+}; // namespace TestListStructArgumentRequest
+namespace SimpleStructResponse {
 enum class Fields
 {
-    kLogQueueSize = 0,
-    kLogIds       = 1,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::StatisticsAvailable::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SimpleStructResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t logQueueSize = static_cast<uint8_t>(0);
-    DataModel::List<const uint32_t> logIds;
+    Structs::SimpleStruct::Type arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -39633,174 +34088,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::StatisticsAvailable::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SimpleStructResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t logQueueSize = static_cast<uint8_t>(0);
-    DataModel::DecodableList<uint32_t> logIds;
+    Structs::SimpleStruct::DecodableType arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace StatisticsAvailable
-} // namespace Commands
-
-namespace Attributes {
-
-namespace LogMaxSize {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LogMaxSize::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace LogMaxSize
-namespace LogQueueMaxSize {
-struct TypeInfo
-{
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LogQueueMaxSize::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace LogQueueMaxSize
-namespace GeneratedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AcceptedCommandList
-namespace AttributeList {
-struct TypeInfo
-{
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace ClusterRevision
-
-struct TypeInfo
-{
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::ApplianceStatistics::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
-
-        Attributes::LogMaxSize::TypeInfo::DecodableType logMaxSize           = static_cast<uint32_t>(0);
-        Attributes::LogQueueMaxSize::TypeInfo::DecodableType logQueueMaxSize = static_cast<uint8_t>(0);
-        Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
-        Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
-        Attributes::AttributeList::TypeInfo::DecodableType attributeList;
-        Attributes::FeatureMap::TypeInfo::DecodableType featureMap           = static_cast<uint32_t>(0);
-        Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast<uint16_t>(0);
-    };
-};
-} // namespace Attributes
-} // namespace ApplianceStatistics
-namespace ElectricalMeasurement {
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace GetProfileInfoResponseCommand {
-struct Type;
-struct DecodableType;
-} // namespace GetProfileInfoResponseCommand
-
-namespace GetProfileInfoCommand {
-struct Type;
-struct DecodableType;
-} // namespace GetProfileInfoCommand
-
-namespace GetMeasurementProfileResponseCommand {
-struct Type;
-struct DecodableType;
-} // namespace GetMeasurementProfileResponseCommand
-
-namespace GetMeasurementProfileCommand {
-struct Type;
-struct DecodableType;
-} // namespace GetMeasurementProfileCommand
-
-} // namespace Commands
-
-namespace Commands {
-namespace GetProfileInfoResponseCommand {
+}; // namespace SimpleStructResponse
+namespace TestListInt8UArgumentRequest {
 enum class Fields
 {
-    kProfileCount          = 0,
-    kProfileIntervalPeriod = 1,
-    kMaxNumberOfIntervals  = 2,
-    kListOfAttributes      = 3,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoResponseCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t profileCount          = static_cast<uint8_t>(0);
-    uint8_t profileIntervalPeriod = static_cast<uint8_t>(0);
-    uint8_t maxNumberOfIntervals  = static_cast<uint8_t>(0);
-    DataModel::List<const uint16_t> listOfAttributes;
+    DataModel::List<const uint8_t> arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39808,27 +34120,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoResponseCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint8_t profileCount          = static_cast<uint8_t>(0);
-    uint8_t profileIntervalPeriod = static_cast<uint8_t>(0);
-    uint8_t maxNumberOfIntervals  = static_cast<uint8_t>(0);
-    DataModel::DecodableList<uint16_t> listOfAttributes;
+    DataModel::DecodableList<uint8_t> arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetProfileInfoResponseCommand
-namespace GetProfileInfoCommand {
+}; // namespace TestListInt8UArgumentRequest
+namespace TestEmitTestEventResponse {
 enum class Fields
 {
+    kValue = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+
+    uint64_t value = static_cast<uint64_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -39840,40 +34152,31 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetProfileInfoCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
+    uint64_t value = static_cast<uint64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetProfileInfoCommand
-namespace GetMeasurementProfileResponseCommand {
+}; // namespace TestEmitTestEventResponse
+namespace TestNestedStructListArgumentRequest {
 enum class Fields
 {
-    kStartTime                  = 0,
-    kStatus                     = 1,
-    kProfileIntervalPeriod      = 2,
-    kNumberOfIntervalsDelivered = 3,
-    kAttributeId                = 4,
-    kIntervals                  = 5,
+    kArg1 = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileResponseCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructListArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t startTime                 = static_cast<uint32_t>(0);
-    uint8_t status                     = static_cast<uint8_t>(0);
-    uint8_t profileIntervalPeriod      = static_cast<uint8_t>(0);
-    uint8_t numberOfIntervalsDelivered = static_cast<uint8_t>(0);
-    uint16_t attributeId               = static_cast<uint16_t>(0);
-    DataModel::List<const uint8_t> intervals;
+    Structs::NestedStructList::Type arg1;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = DataModel::NullObjectType;
+    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -39881,36 +34184,27 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileResponseCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestNestedStructListArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint32_t startTime                 = static_cast<uint32_t>(0);
-    uint8_t status                     = static_cast<uint8_t>(0);
-    uint8_t profileIntervalPeriod      = static_cast<uint8_t>(0);
-    uint8_t numberOfIntervalsDelivered = static_cast<uint8_t>(0);
-    uint16_t attributeId               = static_cast<uint16_t>(0);
-    DataModel::DecodableList<uint8_t> intervals;
+    Structs::NestedStructList::DecodableType arg1;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetMeasurementProfileResponseCommand
-namespace GetMeasurementProfileCommand {
+}; // namespace TestNestedStructListArgumentRequest
+namespace TestEmitTestFabricScopedEventResponse {
 enum class Fields
 {
-    kAttributeId       = 0,
-    kStartTime         = 1,
-    kNumberOfIntervals = 2,
+    kValue = 0,
 };
 
 struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint16_t attributeId      = static_cast<uint16_t>(0);
-    uint32_t startTime        = static_cast<uint32_t>(0);
-    uint8_t numberOfIntervals = static_cast<uint8_t>(0);
+    uint64_t value = static_cast<uint64_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -39922,1613 +34216,1392 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::GetMeasurementProfileCommand::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    uint16_t attributeId      = static_cast<uint16_t>(0);
-    uint32_t startTime        = static_cast<uint32_t>(0);
-    uint8_t numberOfIntervals = static_cast<uint8_t>(0);
+    uint64_t value = static_cast<uint64_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace GetMeasurementProfileCommand
-} // namespace Commands
-
-namespace Attributes {
-
-namespace MeasurementType {
-struct TypeInfo
-{
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasurementType::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace MeasurementType
-namespace DcVoltage {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltage::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcVoltage
-namespace DcVoltageMin {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageMin::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcVoltageMin
-namespace DcVoltageMax {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageMax::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcVoltageMax
-namespace DcCurrent {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcCurrent
-namespace DcCurrentMin {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentMin::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcCurrentMin
-namespace DcCurrentMax {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentMax::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcCurrentMax
-namespace DcPower {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcPower::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcPower
-namespace DcPowerMin {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerMin::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcPowerMin
-namespace DcPowerMax {
-struct TypeInfo
-{
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerMax::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcPowerMax
-namespace DcVoltageMultiplier {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcVoltageMultiplier
-namespace DcVoltageDivisor {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcVoltageDivisor::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcVoltageDivisor
-namespace DcCurrentMultiplier {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcCurrentMultiplier
-namespace DcCurrentDivisor {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcCurrentDivisor::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcCurrentDivisor
-namespace DcPowerMultiplier {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace DcPowerMultiplier
-namespace DcPowerDivisor {
-struct TypeInfo
+}; // namespace TestEmitTestFabricScopedEventResponse
+namespace TestListNestedStructListArgumentRequest {
+enum class Fields
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DcPowerDivisor::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
 };
-} // namespace DcPowerDivisor
-namespace AcFrequency {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestListNestedStructListArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequency::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    DataModel::List<const Structs::NestedStructList::Type> arg1;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::BooleanResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace AcFrequency
-namespace AcFrequencyMin {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestListNestedStructListArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyMin::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    DataModel::DecodableList<Structs::NestedStructList::DecodableType> arg1;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace AcFrequencyMin
-namespace AcFrequencyMax {
-struct TypeInfo
+}; // namespace TestListNestedStructListArgumentRequest
+namespace TestListInt8UReverseRequest {
+enum class Fields
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyMax::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
 };
-} // namespace AcFrequencyMax
-namespace NeutralCurrent {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::NeutralCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    DataModel::List<const uint8_t> arg1;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace NeutralCurrent
-namespace TotalActivePower {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int32_t;
-    using DecodableType    = int32_t;
-    using DecodableArgType = int32_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestListInt8UReverseRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TotalActivePower::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    DataModel::DecodableList<uint8_t> arg1;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace TotalActivePower
-namespace TotalReactivePower {
-struct TypeInfo
+}; // namespace TestListInt8UReverseRequest
+namespace TestEnumsRequest {
+enum class Fields
 {
-    using Type             = int32_t;
-    using DecodableType    = int32_t;
-    using DecodableArgType = int32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TotalReactivePower::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
+    kArg2 = 1,
 };
-} // namespace TotalReactivePower
-namespace TotalApparentPower {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestEnumsRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TotalApparentPower::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
+    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace TotalApparentPower
-namespace Measured1stHarmonicCurrent {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestEnumsRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Measured1stHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    chip::VendorId arg1 = static_cast<chip::VendorId>(0);
+    SimpleEnum arg2     = static_cast<SimpleEnum>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace Measured1stHarmonicCurrent
-namespace Measured3rdHarmonicCurrent {
-struct TypeInfo
+}; // namespace TestEnumsRequest
+namespace TestNullableOptionalRequest {
+enum class Fields
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Measured3rdHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
 };
-} // namespace Measured3rdHarmonicCurrent
-namespace Measured5thHarmonicCurrent {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Measured5thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Optional<DataModel::Nullable<uint8_t>> arg1;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace Measured5thHarmonicCurrent
-namespace Measured7thHarmonicCurrent {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestNullableOptionalRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Measured7thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Optional<DataModel::Nullable<uint8_t>> arg1;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace Measured7thHarmonicCurrent
-namespace Measured9thHarmonicCurrent {
-struct TypeInfo
+}; // namespace TestNullableOptionalRequest
+namespace TestComplexNullableOptionalRequest {
+enum class Fields
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Measured9thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kNullableInt            = 0,
+    kOptionalInt            = 1,
+    kNullableOptionalInt    = 2,
+    kNullableString         = 3,
+    kOptionalString         = 4,
+    kNullableOptionalString = 5,
+    kNullableStruct         = 6,
+    kOptionalStruct         = 7,
+    kNullableOptionalStruct = 8,
+    kNullableList           = 9,
+    kOptionalList           = 10,
+    kNullableOptionalList   = 11,
 };
-} // namespace Measured9thHarmonicCurrent
-namespace Measured11thHarmonicCurrent {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Measured11thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    DataModel::Nullable<uint16_t> nullableInt;
+    Optional<uint16_t> optionalInt;
+    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
+    DataModel::Nullable<chip::CharSpan> nullableString;
+    Optional<chip::CharSpan> optionalString;
+    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
+    DataModel::Nullable<Structs::SimpleStruct::Type> nullableStruct;
+    Optional<Structs::SimpleStruct::Type> optionalStruct;
+    Optional<DataModel::Nullable<Structs::SimpleStruct::Type>> nullableOptionalStruct;
+    DataModel::Nullable<DataModel::List<const SimpleEnum>> nullableList;
+    Optional<DataModel::List<const SimpleEnum>> optionalList;
+    Optional<DataModel::Nullable<DataModel::List<const SimpleEnum>>> nullableOptionalList;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestComplexNullableOptionalResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace Measured11thHarmonicCurrent
-namespace MeasuredPhase1stHarmonicCurrent {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestComplexNullableOptionalRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase1stHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    DataModel::Nullable<uint16_t> nullableInt;
+    Optional<uint16_t> optionalInt;
+    Optional<DataModel::Nullable<uint16_t>> nullableOptionalInt;
+    DataModel::Nullable<chip::CharSpan> nullableString;
+    Optional<chip::CharSpan> optionalString;
+    Optional<DataModel::Nullable<chip::CharSpan>> nullableOptionalString;
+    DataModel::Nullable<Structs::SimpleStruct::DecodableType> nullableStruct;
+    Optional<Structs::SimpleStruct::DecodableType> optionalStruct;
+    Optional<DataModel::Nullable<Structs::SimpleStruct::DecodableType>> nullableOptionalStruct;
+    DataModel::Nullable<DataModel::DecodableList<SimpleEnum>> nullableList;
+    Optional<DataModel::DecodableList<SimpleEnum>> optionalList;
+    Optional<DataModel::Nullable<DataModel::DecodableList<SimpleEnum>>> nullableOptionalList;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace MeasuredPhase1stHarmonicCurrent
-namespace MeasuredPhase3rdHarmonicCurrent {
-struct TypeInfo
+}; // namespace TestComplexNullableOptionalRequest
+namespace SimpleStructEchoRequest {
+enum class Fields
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase3rdHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
 };
-} // namespace MeasuredPhase3rdHarmonicCurrent
-namespace MeasuredPhase5thHarmonicCurrent {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::SimpleStructEchoRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase5thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Structs::SimpleStruct::Type arg1;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace MeasuredPhase5thHarmonicCurrent
-namespace MeasuredPhase7thHarmonicCurrent {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SimpleStructEchoRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase7thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Structs::SimpleStruct::DecodableType arg1;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace MeasuredPhase7thHarmonicCurrent
-namespace MeasuredPhase9thHarmonicCurrent {
-struct TypeInfo
+}; // namespace SimpleStructEchoRequest
+namespace TimedInvokeRequest {
+enum class Fields
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase9thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace MeasuredPhase9thHarmonicCurrent
-namespace MeasuredPhase11thHarmonicCurrent {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TimedInvokeRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MeasuredPhase11thHarmonicCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return true; }
 };
-} // namespace MeasuredPhase11thHarmonicCurrent
-namespace AcFrequencyMultiplier {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TimedInvokeRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace AcFrequencyMultiplier
-namespace AcFrequencyDivisor {
-struct TypeInfo
+}; // namespace TimedInvokeRequest
+namespace TestSimpleOptionalArgumentRequest {
+enum class Fields
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcFrequencyDivisor::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
 };
-} // namespace AcFrequencyDivisor
-namespace PowerMultiplier {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestSimpleOptionalArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Optional<bool> arg1;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace PowerMultiplier
-namespace PowerDivisor {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestSimpleOptionalArgumentRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerDivisor::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Optional<bool> arg1;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace PowerDivisor
-namespace HarmonicCurrentMultiplier {
-struct TypeInfo
+}; // namespace TestSimpleOptionalArgumentRequest
+namespace TestEmitTestEventRequest {
+enum class Fields
 {
-    using Type             = int8_t;
-    using DecodableType    = int8_t;
-    using DecodableArgType = int8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::HarmonicCurrentMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kArg1 = 0,
+    kArg2 = 1,
+    kArg3 = 2,
 };
-} // namespace HarmonicCurrentMultiplier
-namespace PhaseHarmonicCurrentMultiplier {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = int8_t;
-    using DecodableType    = int8_t;
-    using DecodableArgType = int8_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseHarmonicCurrentMultiplier::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t arg1    = static_cast<uint8_t>(0);
+    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
+    bool arg3       = static_cast<bool>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace PhaseHarmonicCurrentMultiplier
-namespace InstantaneousVoltage {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousVoltage::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t arg1    = static_cast<uint8_t>(0);
+    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
+    bool arg3       = static_cast<bool>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace TestEmitTestEventRequest
+namespace TestEmitTestFabricScopedEventRequest {
+enum class Fields
+{
+    kArg1 = 0,
 };
-} // namespace InstantaneousVoltage
-namespace InstantaneousLineCurrent {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousLineCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t arg1 = static_cast<uint8_t>(0);
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+
+    using ResponseType = Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace InstantaneousLineCurrent
-namespace InstantaneousActiveCurrent {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::TestEmitTestFabricScopedEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousActiveCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint8_t arg1 = static_cast<uint8_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace InstantaneousActiveCurrent
-namespace InstantaneousReactiveCurrent {
+}; // namespace TestEmitTestFabricScopedEventRequest
+} // namespace Commands
+
+namespace Attributes {
+
+namespace Boolean {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousReactiveCurrent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Boolean::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InstantaneousReactiveCurrent
-namespace InstantaneousPower {
+} // namespace Boolean
+namespace Bitmap8 {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InstantaneousPower::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap8::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InstantaneousPower
-namespace RmsVoltage {
+} // namespace Bitmap8
+namespace Bitmap16 {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap16::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltage
-namespace RmsVoltageMin {
+} // namespace Bitmap16
+namespace Bitmap32 {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMin::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap32::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageMin
-namespace RmsVoltageMax {
+} // namespace Bitmap32
+namespace Bitmap64 {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMax::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Bitmap64::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageMax
-namespace RmsCurrent {
+} // namespace Bitmap64
+namespace Int8u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int8u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrent
-namespace RmsCurrentMin {
+} // namespace Int8u
+namespace Int16u {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMin::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int16u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentMin
-namespace RmsCurrentMax {
+} // namespace Int16u
+namespace Int24u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMax::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int24u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentMax
-namespace ActivePower {
+} // namespace Int24u
+namespace Int32u {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePower::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int32u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePower
-namespace ActivePowerMin {
+} // namespace Int32u
+namespace Int40u {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint64_t;
+    using DecodableType    = uint64_t;
+    using DecodableArgType = uint64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMin::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int40u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerMin
-namespace ActivePowerMax {
+} // namespace Int40u
+namespace Int48u {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint64_t;
+    using DecodableType    = uint64_t;
+    using DecodableArgType = uint64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMax::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int48u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerMax
-namespace ReactivePower {
+} // namespace Int48u
+namespace Int56u {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint64_t;
+    using DecodableType    = uint64_t;
+    using DecodableArgType = uint64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReactivePower::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int56u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReactivePower
-namespace ApparentPower {
+} // namespace Int56u
+namespace Int64u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = uint64_t;
+    using DecodableType    = uint64_t;
+    using DecodableArgType = uint64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ApparentPower::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int64u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ApparentPower
-namespace PowerFactor {
+} // namespace Int64u
+namespace Int8s {
 struct TypeInfo
 {
     using Type             = int8_t;
     using DecodableType    = int8_t;
     using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerFactor::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace PowerFactor
-namespace AverageRmsVoltageMeasurementPeriod {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsVoltageMeasurementPeriod::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AverageRmsVoltageMeasurementPeriod
-namespace AverageRmsUnderVoltageCounter {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltageCounter::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace AverageRmsUnderVoltageCounter
-namespace RmsExtremeOverVoltagePeriod {
-struct TypeInfo
-{
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltagePeriod::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int8s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeOverVoltagePeriod
-namespace RmsExtremeUnderVoltagePeriod {
+} // namespace Int8s
+namespace Int16s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltagePeriod::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int16s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeUnderVoltagePeriod
-namespace RmsVoltageSagPeriod {
+} // namespace Int16s
+namespace Int24s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int32_t;
+    using DecodableType    = int32_t;
+    using DecodableArgType = int32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSagPeriod::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int24s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSagPeriod
-namespace RmsVoltageSwellPeriod {
+} // namespace Int24s
+namespace Int32s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int32_t;
+    using DecodableType    = int32_t;
+    using DecodableArgType = int32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwellPeriod::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int32s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSwellPeriod
-namespace AcVoltageMultiplier {
+} // namespace Int32s
+namespace Int40s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcVoltageMultiplier::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int40s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcVoltageMultiplier
-namespace AcVoltageDivisor {
+} // namespace Int40s
+namespace Int48s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcVoltageDivisor::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int48s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcVoltageDivisor
-namespace AcCurrentMultiplier {
+} // namespace Int48s
+namespace Int56s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcCurrentMultiplier::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int56s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcCurrentMultiplier
-namespace AcCurrentDivisor {
+} // namespace Int56s
+namespace Int64s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int64_t;
+    using DecodableType    = int64_t;
+    using DecodableArgType = int64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcCurrentDivisor::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Int64s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcCurrentDivisor
-namespace AcPowerMultiplier {
+} // namespace Int64s
+namespace Enum8 {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcPowerMultiplier::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Enum8::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcPowerMultiplier
-namespace AcPowerDivisor {
+} // namespace Enum8
+namespace Enum16 {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcPowerDivisor::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Enum16::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcPowerDivisor
-namespace OverloadAlarmsMask {
+} // namespace Enum16
+namespace FloatSingle {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = float;
+    using DecodableType    = float;
+    using DecodableArgType = float;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OverloadAlarmsMask::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::FloatSingle::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OverloadAlarmsMask
-namespace VoltageOverload {
+} // namespace FloatSingle
+namespace FloatDouble {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = double;
+    using DecodableType    = double;
+    using DecodableArgType = double;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::VoltageOverload::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::FloatDouble::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace VoltageOverload
-namespace CurrentOverload {
+} // namespace FloatDouble
+namespace OctetString {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentOverload::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OctetString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace CurrentOverload
-namespace AcOverloadAlarmsMask {
+} // namespace OctetString
+namespace ListInt8u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::List<const uint8_t>;
+    using DecodableType    = chip::app::DataModel::DecodableList<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcOverloadAlarmsMask::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ListInt8u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcOverloadAlarmsMask
-namespace AcVoltageOverload {
+} // namespace ListInt8u
+namespace ListOctetString {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::List<const chip::ByteSpan>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::ByteSpan>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::ByteSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcVoltageOverload::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ListOctetString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcVoltageOverload
-namespace AcCurrentOverload {
+} // namespace ListOctetString
+namespace ListStructOctetString {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcCurrentOverload::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ListStructOctetString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AcCurrentOverload
-namespace AcActivePowerOverload {
+} // namespace ListStructOctetString
+namespace LongOctetString {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::ByteSpan;
+    using DecodableType    = chip::ByteSpan;
+    using DecodableArgType = chip::ByteSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcActivePowerOverload::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LongOctetString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 1000; }
 };
-} // namespace AcActivePowerOverload
-namespace AcReactivePowerOverload {
+} // namespace LongOctetString
+namespace CharString {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcReactivePowerOverload::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CharString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace AcReactivePowerOverload
-namespace AverageRmsOverVoltage {
+} // namespace CharString
+namespace LongCharString {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsOverVoltage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LongCharString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 1000; }
 };
-} // namespace AverageRmsOverVoltage
-namespace AverageRmsUnderVoltage {
+} // namespace LongCharString
+namespace EpochUs {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint64_t;
+    using DecodableType    = uint64_t;
+    using DecodableArgType = uint64_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::EpochUs::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AverageRmsUnderVoltage
-namespace RmsExtremeOverVoltage {
+} // namespace EpochUs
+namespace EpochS {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::EpochS::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeOverVoltage
-namespace RmsExtremeUnderVoltage {
+} // namespace EpochS
+namespace VendorId {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::VendorId;
+    using DecodableType    = chip::VendorId;
+    using DecodableArgType = chip::VendorId;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltage::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::VendorId::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeUnderVoltage
-namespace RmsVoltageSag {
+} // namespace VendorId
+namespace ListNullablesAndOptionalsStruct {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSag::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ListNullablesAndOptionalsStruct::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSag
-namespace RmsVoltageSwell {
+} // namespace ListNullablesAndOptionalsStruct
+namespace EnumAttr {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::Clusters::TestCluster::SimpleEnum;
+    using DecodableType    = chip::app::Clusters::TestCluster::SimpleEnum;
+    using DecodableArgType = chip::app::Clusters::TestCluster::SimpleEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwell::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::EnumAttr::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSwell
-namespace LineCurrentPhaseB {
+} // namespace EnumAttr
+namespace StructAttr {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type;
+    using DecodableType    = chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType;
+    using DecodableArgType = const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LineCurrentPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StructAttr::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace LineCurrentPhaseB
-namespace ActiveCurrentPhaseB {
+} // namespace StructAttr
+namespace RangeRestrictedInt8u {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveCurrentPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt8u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActiveCurrentPhaseB
-namespace ReactiveCurrentPhaseB {
+} // namespace RangeRestrictedInt8u
+namespace RangeRestrictedInt8s {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = int8_t;
+    using DecodableType    = int8_t;
+    using DecodableArgType = int8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReactiveCurrentPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt8s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReactiveCurrentPhaseB
-namespace RmsVoltagePhaseB {
+} // namespace RangeRestrictedInt8s
+namespace RangeRestrictedInt16u {
 struct TypeInfo
 {
     using Type             = uint16_t;
     using DecodableType    = uint16_t;
     using DecodableArgType = uint16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltagePhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt16u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltagePhaseB
-namespace RmsVoltageMinPhaseB {
+} // namespace RangeRestrictedInt16u
+namespace RangeRestrictedInt16s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMinPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RangeRestrictedInt16s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageMinPhaseB
-namespace RmsVoltageMaxPhaseB {
+} // namespace RangeRestrictedInt16s
+namespace ListLongOctetString {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::List<const chip::ByteSpan>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::ByteSpan>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::ByteSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMaxPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ListLongOctetString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageMaxPhaseB
-namespace RmsCurrentPhaseB {
+} // namespace ListLongOctetString
+namespace ListFabricScoped {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ListFabricScoped::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentPhaseB
-namespace RmsCurrentMinPhaseB {
+} // namespace ListFabricScoped
+namespace TimedWriteBoolean {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMinPhaseB::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TimedWriteBoolean::Id; }
+    static constexpr bool MustUseTimedWrite() { return true; }
 };
-} // namespace RmsCurrentMinPhaseB
-namespace RmsCurrentMaxPhaseB {
+} // namespace TimedWriteBoolean
+namespace GeneralErrorBoolean {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMaxPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::GeneralErrorBoolean::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentMaxPhaseB
-namespace ActivePowerPhaseB {
+} // namespace GeneralErrorBoolean
+namespace ClusterErrorBoolean {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterErrorBoolean::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerPhaseB
-namespace ActivePowerMinPhaseB {
+} // namespace ClusterErrorBoolean
+namespace Unsupported {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = bool;
+    using DecodableType    = bool;
+    using DecodableArgType = bool;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMinPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Unsupported::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerMinPhaseB
-namespace ActivePowerMaxPhaseB {
+} // namespace Unsupported
+namespace NullableBoolean {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<bool>;
+    using DecodableType    = chip::app::DataModel::Nullable<bool>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<bool> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMaxPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBoolean::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerMaxPhaseB
-namespace ReactivePowerPhaseB {
+} // namespace NullableBoolean
+namespace NullableBitmap8 {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type          = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReactivePowerPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap8::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReactivePowerPhaseB
-namespace ApparentPowerPhaseB {
+} // namespace NullableBitmap8
+namespace NullableBitmap16 {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type          = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ApparentPowerPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap16::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ApparentPowerPhaseB
-namespace PowerFactorPhaseB {
+} // namespace NullableBitmap16
+namespace NullableBitmap32 {
 struct TypeInfo
 {
-    using Type             = int8_t;
-    using DecodableType    = int8_t;
-    using DecodableArgType = int8_t;
+    using Type          = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerFactorPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap32::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PowerFactorPhaseB
-namespace AverageRmsVoltageMeasurementPeriodPhaseB {
+} // namespace NullableBitmap32
+namespace NullableBitmap64 {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type          = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableBitmap64::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AverageRmsVoltageMeasurementPeriodPhaseB
-namespace AverageRmsOverVoltageCounterPhaseB {
+} // namespace NullableBitmap64
+namespace NullableInt8u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsOverVoltageCounterPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt8u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AverageRmsOverVoltageCounterPhaseB
-namespace AverageRmsUnderVoltageCounterPhaseB {
+} // namespace NullableInt8u
+namespace NullableInt16u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltageCounterPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt16u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AverageRmsUnderVoltageCounterPhaseB
-namespace RmsExtremeOverVoltagePeriodPhaseB {
+} // namespace NullableInt16u
+namespace NullableInt24u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt24u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeOverVoltagePeriodPhaseB
-namespace RmsExtremeUnderVoltagePeriodPhaseB {
+} // namespace NullableInt24u
+namespace NullableInt32u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt32u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeUnderVoltagePeriodPhaseB
-namespace RmsVoltageSagPeriodPhaseB {
+} // namespace NullableInt32u
+namespace NullableInt40u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSagPeriodPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt40u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSagPeriodPhaseB
-namespace RmsVoltageSwellPeriodPhaseB {
+} // namespace NullableInt40u
+namespace NullableInt48u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwellPeriodPhaseB::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt48u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSwellPeriodPhaseB
-namespace LineCurrentPhaseC {
+} // namespace NullableInt48u
+namespace NullableInt56u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LineCurrentPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt56u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace LineCurrentPhaseC
-namespace ActiveCurrentPhaseC {
+} // namespace NullableInt56u
+namespace NullableInt64u {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveCurrentPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt64u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActiveCurrentPhaseC
-namespace ReactiveCurrentPhaseC {
+} // namespace NullableInt64u
+namespace NullableInt8s {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<int8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReactiveCurrentPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt8s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReactiveCurrentPhaseC
-namespace RmsVoltagePhaseC {
+} // namespace NullableInt8s
+namespace NullableInt16s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int16_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltagePhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt16s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltagePhaseC
-namespace RmsVoltageMinPhaseC {
+} // namespace NullableInt16s
+namespace NullableInt24s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMinPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt24s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageMinPhaseC
-namespace RmsVoltageMaxPhaseC {
+} // namespace NullableInt24s
+namespace NullableInt32s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int32_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int32_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int32_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageMaxPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt32s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageMaxPhaseC
-namespace RmsCurrentPhaseC {
+} // namespace NullableInt32s
+namespace NullableInt40s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt40s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentPhaseC
-namespace RmsCurrentMinPhaseC {
+} // namespace NullableInt40s
+namespace NullableInt48s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMinPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt48s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentMinPhaseC
-namespace RmsCurrentMaxPhaseC {
+} // namespace NullableInt48s
+namespace NullableInt56s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsCurrentMaxPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt56s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsCurrentMaxPhaseC
-namespace ActivePowerPhaseC {
+} // namespace NullableInt56s
+namespace NullableInt64s {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int64_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int64_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableInt64s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerPhaseC
-namespace ActivePowerMinPhaseC {
+} // namespace NullableInt64s
+namespace NullableEnum8 {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMinPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableEnum8::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerMinPhaseC
-namespace ActivePowerMaxPhaseC {
+} // namespace NullableEnum8
+namespace NullableEnum16 {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActivePowerMaxPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableEnum16::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActivePowerMaxPhaseC
-namespace ReactivePowerPhaseC {
+} // namespace NullableEnum16
+namespace NullableFloatSingle {
 struct TypeInfo
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
+    using Type             = chip::app::DataModel::Nullable<float>;
+    using DecodableType    = chip::app::DataModel::Nullable<float>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<float> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReactivePowerPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableFloatSingle::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReactivePowerPhaseC
-namespace ApparentPowerPhaseC {
+} // namespace NullableFloatSingle
+namespace NullableFloatDouble {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<double>;
+    using DecodableType    = chip::app::DataModel::Nullable<double>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<double> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ApparentPowerPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableFloatDouble::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ApparentPowerPhaseC
-namespace PowerFactorPhaseC {
+} // namespace NullableFloatDouble
+namespace NullableOctetString {
 struct TypeInfo
 {
-    using Type             = int8_t;
-    using DecodableType    = int8_t;
-    using DecodableArgType = int8_t;
+    using Type             = chip::app::DataModel::Nullable<chip::ByteSpan>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::ByteSpan>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::ByteSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerFactorPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableOctetString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace PowerFactorPhaseC
-namespace AverageRmsVoltageMeasurementPeriodPhaseC {
+} // namespace NullableOctetString
+namespace NullableCharString {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<chip::CharSpan>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::CharSpan>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::CharSpan> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableCharString::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 10; }
 };
-} // namespace AverageRmsVoltageMeasurementPeriodPhaseC
-namespace AverageRmsOverVoltageCounterPhaseC {
+} // namespace NullableCharString
+namespace NullableEnumAttr {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsOverVoltageCounterPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableEnumAttr::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AverageRmsOverVoltageCounterPhaseC
-namespace AverageRmsUnderVoltageCounterPhaseC {
+} // namespace NullableEnumAttr
+namespace NullableStruct {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type          = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>;
+    using DecodableType = chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AverageRmsUnderVoltageCounterPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableStruct::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace AverageRmsUnderVoltageCounterPhaseC
-namespace RmsExtremeOverVoltagePeriodPhaseC {
+} // namespace NullableStruct
+namespace NullableRangeRestrictedInt8u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt8u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeOverVoltagePeriodPhaseC
-namespace RmsExtremeUnderVoltagePeriodPhaseC {
+} // namespace NullableRangeRestrictedInt8u
+namespace NullableRangeRestrictedInt8s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int8_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int8_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int8_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt8s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsExtremeUnderVoltagePeriodPhaseC
-namespace RmsVoltageSagPeriodPhaseC {
+} // namespace NullableRangeRestrictedInt8s
+namespace NullableRangeRestrictedInt16u {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<uint16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<uint16_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSagPeriodPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt16u::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSagPeriodPhaseC
-namespace RmsVoltageSwellPeriodPhaseC {
+} // namespace NullableRangeRestrictedInt16u
+namespace NullableRangeRestrictedInt16s {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = chip::app::DataModel::Nullable<int16_t>;
+    using DecodableType    = chip::app::DataModel::Nullable<int16_t>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<int16_t> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::RmsVoltageSwellPeriodPhaseC::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NullableRangeRestrictedInt16s::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace RmsVoltageSwellPeriodPhaseC
+} // namespace NullableRangeRestrictedInt16s
 namespace GeneratedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::GeneratedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 };
 } // namespace GeneratedCommandList
 namespace AcceptedCommandList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::CommandId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::CommandId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::CommandId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AcceptedCommandList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 };
 } // namespace AcceptedCommandList
 namespace AttributeList {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::AttributeId>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::AttributeId>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::AttributeId> &;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
-struct TypeInfo
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 };
 } // namespace ClusterRevision
 
@@ -41536,155 +35609,95 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::ElectricalMeasurement::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::MeasurementType::TypeInfo::DecodableType measurementType                         = static_cast<uint32_t>(0);
-        Attributes::DcVoltage::TypeInfo::DecodableType dcVoltage                                     = static_cast<int16_t>(0);
-        Attributes::DcVoltageMin::TypeInfo::DecodableType dcVoltageMin                               = static_cast<int16_t>(0);
-        Attributes::DcVoltageMax::TypeInfo::DecodableType dcVoltageMax                               = static_cast<int16_t>(0);
-        Attributes::DcCurrent::TypeInfo::DecodableType dcCurrent                                     = static_cast<int16_t>(0);
-        Attributes::DcCurrentMin::TypeInfo::DecodableType dcCurrentMin                               = static_cast<int16_t>(0);
-        Attributes::DcCurrentMax::TypeInfo::DecodableType dcCurrentMax                               = static_cast<int16_t>(0);
-        Attributes::DcPower::TypeInfo::DecodableType dcPower                                         = static_cast<int16_t>(0);
-        Attributes::DcPowerMin::TypeInfo::DecodableType dcPowerMin                                   = static_cast<int16_t>(0);
-        Attributes::DcPowerMax::TypeInfo::DecodableType dcPowerMax                                   = static_cast<int16_t>(0);
-        Attributes::DcVoltageMultiplier::TypeInfo::DecodableType dcVoltageMultiplier                 = static_cast<uint16_t>(0);
-        Attributes::DcVoltageDivisor::TypeInfo::DecodableType dcVoltageDivisor                       = static_cast<uint16_t>(0);
-        Attributes::DcCurrentMultiplier::TypeInfo::DecodableType dcCurrentMultiplier                 = static_cast<uint16_t>(0);
-        Attributes::DcCurrentDivisor::TypeInfo::DecodableType dcCurrentDivisor                       = static_cast<uint16_t>(0);
-        Attributes::DcPowerMultiplier::TypeInfo::DecodableType dcPowerMultiplier                     = static_cast<uint16_t>(0);
-        Attributes::DcPowerDivisor::TypeInfo::DecodableType dcPowerDivisor                           = static_cast<uint16_t>(0);
-        Attributes::AcFrequency::TypeInfo::DecodableType acFrequency                                 = static_cast<uint16_t>(0);
-        Attributes::AcFrequencyMin::TypeInfo::DecodableType acFrequencyMin                           = static_cast<uint16_t>(0);
-        Attributes::AcFrequencyMax::TypeInfo::DecodableType acFrequencyMax                           = static_cast<uint16_t>(0);
-        Attributes::NeutralCurrent::TypeInfo::DecodableType neutralCurrent                           = static_cast<uint16_t>(0);
-        Attributes::TotalActivePower::TypeInfo::DecodableType totalActivePower                       = static_cast<int32_t>(0);
-        Attributes::TotalReactivePower::TypeInfo::DecodableType totalReactivePower                   = static_cast<int32_t>(0);
-        Attributes::TotalApparentPower::TypeInfo::DecodableType totalApparentPower                   = static_cast<uint32_t>(0);
-        Attributes::Measured1stHarmonicCurrent::TypeInfo::DecodableType measured1stHarmonicCurrent   = static_cast<int16_t>(0);
-        Attributes::Measured3rdHarmonicCurrent::TypeInfo::DecodableType measured3rdHarmonicCurrent   = static_cast<int16_t>(0);
-        Attributes::Measured5thHarmonicCurrent::TypeInfo::DecodableType measured5thHarmonicCurrent   = static_cast<int16_t>(0);
-        Attributes::Measured7thHarmonicCurrent::TypeInfo::DecodableType measured7thHarmonicCurrent   = static_cast<int16_t>(0);
-        Attributes::Measured9thHarmonicCurrent::TypeInfo::DecodableType measured9thHarmonicCurrent   = static_cast<int16_t>(0);
-        Attributes::Measured11thHarmonicCurrent::TypeInfo::DecodableType measured11thHarmonicCurrent = static_cast<int16_t>(0);
-        Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo::DecodableType measuredPhase1stHarmonicCurrent =
-            static_cast<int16_t>(0);
-        Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo::DecodableType measuredPhase3rdHarmonicCurrent =
-            static_cast<int16_t>(0);
-        Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo::DecodableType measuredPhase5thHarmonicCurrent =
-            static_cast<int16_t>(0);
-        Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo::DecodableType measuredPhase7thHarmonicCurrent =
-            static_cast<int16_t>(0);
-        Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo::DecodableType measuredPhase9thHarmonicCurrent =
-            static_cast<int16_t>(0);
-        Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo::DecodableType measuredPhase11thHarmonicCurrent =
-            static_cast<int16_t>(0);
-        Attributes::AcFrequencyMultiplier::TypeInfo::DecodableType acFrequencyMultiplier         = static_cast<uint16_t>(0);
-        Attributes::AcFrequencyDivisor::TypeInfo::DecodableType acFrequencyDivisor               = static_cast<uint16_t>(0);
-        Attributes::PowerMultiplier::TypeInfo::DecodableType powerMultiplier                     = static_cast<uint32_t>(0);
-        Attributes::PowerDivisor::TypeInfo::DecodableType powerDivisor                           = static_cast<uint32_t>(0);
-        Attributes::HarmonicCurrentMultiplier::TypeInfo::DecodableType harmonicCurrentMultiplier = static_cast<int8_t>(0);
-        Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo::DecodableType phaseHarmonicCurrentMultiplier = static_cast<int8_t>(0);
-        Attributes::InstantaneousVoltage::TypeInfo::DecodableType instantaneousVoltage                 = static_cast<int16_t>(0);
-        Attributes::InstantaneousLineCurrent::TypeInfo::DecodableType instantaneousLineCurrent         = static_cast<uint16_t>(0);
-        Attributes::InstantaneousActiveCurrent::TypeInfo::DecodableType instantaneousActiveCurrent     = static_cast<int16_t>(0);
-        Attributes::InstantaneousReactiveCurrent::TypeInfo::DecodableType instantaneousReactiveCurrent = static_cast<int16_t>(0);
-        Attributes::InstantaneousPower::TypeInfo::DecodableType instantaneousPower                     = static_cast<int16_t>(0);
-        Attributes::RmsVoltage::TypeInfo::DecodableType rmsVoltage                                     = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageMin::TypeInfo::DecodableType rmsVoltageMin                               = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageMax::TypeInfo::DecodableType rmsVoltageMax                               = static_cast<uint16_t>(0);
-        Attributes::RmsCurrent::TypeInfo::DecodableType rmsCurrent                                     = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentMin::TypeInfo::DecodableType rmsCurrentMin                               = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentMax::TypeInfo::DecodableType rmsCurrentMax                               = static_cast<uint16_t>(0);
-        Attributes::ActivePower::TypeInfo::DecodableType activePower                                   = static_cast<int16_t>(0);
-        Attributes::ActivePowerMin::TypeInfo::DecodableType activePowerMin                             = static_cast<int16_t>(0);
-        Attributes::ActivePowerMax::TypeInfo::DecodableType activePowerMax                             = static_cast<int16_t>(0);
-        Attributes::ReactivePower::TypeInfo::DecodableType reactivePower                               = static_cast<int16_t>(0);
-        Attributes::ApparentPower::TypeInfo::DecodableType apparentPower                               = static_cast<uint16_t>(0);
-        Attributes::PowerFactor::TypeInfo::DecodableType powerFactor                                   = static_cast<int8_t>(0);
-        Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo::DecodableType averageRmsVoltageMeasurementPeriod =
-            static_cast<uint16_t>(0);
-        Attributes::AverageRmsUnderVoltageCounter::TypeInfo::DecodableType averageRmsUnderVoltageCounter = static_cast<uint16_t>(0);
-        Attributes::RmsExtremeOverVoltagePeriod::TypeInfo::DecodableType rmsExtremeOverVoltagePeriod     = static_cast<uint16_t>(0);
-        Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo::DecodableType rmsExtremeUnderVoltagePeriod   = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageSagPeriod::TypeInfo::DecodableType rmsVoltageSagPeriod                     = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageSwellPeriod::TypeInfo::DecodableType rmsVoltageSwellPeriod                 = static_cast<uint16_t>(0);
-        Attributes::AcVoltageMultiplier::TypeInfo::DecodableType acVoltageMultiplier                     = static_cast<uint16_t>(0);
-        Attributes::AcVoltageDivisor::TypeInfo::DecodableType acVoltageDivisor                           = static_cast<uint16_t>(0);
-        Attributes::AcCurrentMultiplier::TypeInfo::DecodableType acCurrentMultiplier                     = static_cast<uint16_t>(0);
-        Attributes::AcCurrentDivisor::TypeInfo::DecodableType acCurrentDivisor                           = static_cast<uint16_t>(0);
-        Attributes::AcPowerMultiplier::TypeInfo::DecodableType acPowerMultiplier                         = static_cast<uint16_t>(0);
-        Attributes::AcPowerDivisor::TypeInfo::DecodableType acPowerDivisor                               = static_cast<uint16_t>(0);
-        Attributes::OverloadAlarmsMask::TypeInfo::DecodableType overloadAlarmsMask                       = static_cast<uint8_t>(0);
-        Attributes::VoltageOverload::TypeInfo::DecodableType voltageOverload                             = static_cast<int16_t>(0);
-        Attributes::CurrentOverload::TypeInfo::DecodableType currentOverload                             = static_cast<int16_t>(0);
-        Attributes::AcOverloadAlarmsMask::TypeInfo::DecodableType acOverloadAlarmsMask                   = static_cast<uint16_t>(0);
-        Attributes::AcVoltageOverload::TypeInfo::DecodableType acVoltageOverload                         = static_cast<int16_t>(0);
-        Attributes::AcCurrentOverload::TypeInfo::DecodableType acCurrentOverload                         = static_cast<int16_t>(0);
-        Attributes::AcActivePowerOverload::TypeInfo::DecodableType acActivePowerOverload                 = static_cast<int16_t>(0);
-        Attributes::AcReactivePowerOverload::TypeInfo::DecodableType acReactivePowerOverload             = static_cast<int16_t>(0);
-        Attributes::AverageRmsOverVoltage::TypeInfo::DecodableType averageRmsOverVoltage                 = static_cast<int16_t>(0);
-        Attributes::AverageRmsUnderVoltage::TypeInfo::DecodableType averageRmsUnderVoltage               = static_cast<int16_t>(0);
-        Attributes::RmsExtremeOverVoltage::TypeInfo::DecodableType rmsExtremeOverVoltage                 = static_cast<int16_t>(0);
-        Attributes::RmsExtremeUnderVoltage::TypeInfo::DecodableType rmsExtremeUnderVoltage               = static_cast<int16_t>(0);
-        Attributes::RmsVoltageSag::TypeInfo::DecodableType rmsVoltageSag                                 = static_cast<int16_t>(0);
-        Attributes::RmsVoltageSwell::TypeInfo::DecodableType rmsVoltageSwell                             = static_cast<int16_t>(0);
-        Attributes::LineCurrentPhaseB::TypeInfo::DecodableType lineCurrentPhaseB                         = static_cast<uint16_t>(0);
-        Attributes::ActiveCurrentPhaseB::TypeInfo::DecodableType activeCurrentPhaseB                     = static_cast<int16_t>(0);
-        Attributes::ReactiveCurrentPhaseB::TypeInfo::DecodableType reactiveCurrentPhaseB                 = static_cast<int16_t>(0);
-        Attributes::RmsVoltagePhaseB::TypeInfo::DecodableType rmsVoltagePhaseB                           = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageMinPhaseB::TypeInfo::DecodableType rmsVoltageMinPhaseB                     = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageMaxPhaseB::TypeInfo::DecodableType rmsVoltageMaxPhaseB                     = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentPhaseB::TypeInfo::DecodableType rmsCurrentPhaseB                           = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentMinPhaseB::TypeInfo::DecodableType rmsCurrentMinPhaseB                     = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentMaxPhaseB::TypeInfo::DecodableType rmsCurrentMaxPhaseB                     = static_cast<uint16_t>(0);
-        Attributes::ActivePowerPhaseB::TypeInfo::DecodableType activePowerPhaseB                         = static_cast<int16_t>(0);
-        Attributes::ActivePowerMinPhaseB::TypeInfo::DecodableType activePowerMinPhaseB                   = static_cast<int16_t>(0);
-        Attributes::ActivePowerMaxPhaseB::TypeInfo::DecodableType activePowerMaxPhaseB                   = static_cast<int16_t>(0);
-        Attributes::ReactivePowerPhaseB::TypeInfo::DecodableType reactivePowerPhaseB                     = static_cast<int16_t>(0);
-        Attributes::ApparentPowerPhaseB::TypeInfo::DecodableType apparentPowerPhaseB                     = static_cast<uint16_t>(0);
-        Attributes::PowerFactorPhaseB::TypeInfo::DecodableType powerFactorPhaseB                         = static_cast<int8_t>(0);
-        Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo::DecodableType averageRmsVoltageMeasurementPeriodPhaseB =
-            static_cast<uint16_t>(0);
-        Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo::DecodableType averageRmsOverVoltageCounterPhaseB =
-            static_cast<uint16_t>(0);
-        Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo::DecodableType averageRmsUnderVoltageCounterPhaseB =
-            static_cast<uint16_t>(0);
-        Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo::DecodableType rmsExtremeOverVoltagePeriodPhaseB =
-            static_cast<uint16_t>(0);
-        Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo::DecodableType rmsExtremeUnderVoltagePeriodPhaseB =
-            static_cast<uint16_t>(0);
-        Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo::DecodableType rmsVoltageSagPeriodPhaseB     = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo::DecodableType rmsVoltageSwellPeriodPhaseB = static_cast<uint16_t>(0);
-        Attributes::LineCurrentPhaseC::TypeInfo::DecodableType lineCurrentPhaseC                     = static_cast<uint16_t>(0);
-        Attributes::ActiveCurrentPhaseC::TypeInfo::DecodableType activeCurrentPhaseC                 = static_cast<int16_t>(0);
-        Attributes::ReactiveCurrentPhaseC::TypeInfo::DecodableType reactiveCurrentPhaseC             = static_cast<int16_t>(0);
-        Attributes::RmsVoltagePhaseC::TypeInfo::DecodableType rmsVoltagePhaseC                       = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageMinPhaseC::TypeInfo::DecodableType rmsVoltageMinPhaseC                 = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageMaxPhaseC::TypeInfo::DecodableType rmsVoltageMaxPhaseC                 = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentPhaseC::TypeInfo::DecodableType rmsCurrentPhaseC                       = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentMinPhaseC::TypeInfo::DecodableType rmsCurrentMinPhaseC                 = static_cast<uint16_t>(0);
-        Attributes::RmsCurrentMaxPhaseC::TypeInfo::DecodableType rmsCurrentMaxPhaseC                 = static_cast<uint16_t>(0);
-        Attributes::ActivePowerPhaseC::TypeInfo::DecodableType activePowerPhaseC                     = static_cast<int16_t>(0);
-        Attributes::ActivePowerMinPhaseC::TypeInfo::DecodableType activePowerMinPhaseC               = static_cast<int16_t>(0);
-        Attributes::ActivePowerMaxPhaseC::TypeInfo::DecodableType activePowerMaxPhaseC               = static_cast<int16_t>(0);
-        Attributes::ReactivePowerPhaseC::TypeInfo::DecodableType reactivePowerPhaseC                 = static_cast<int16_t>(0);
-        Attributes::ApparentPowerPhaseC::TypeInfo::DecodableType apparentPowerPhaseC                 = static_cast<uint16_t>(0);
-        Attributes::PowerFactorPhaseC::TypeInfo::DecodableType powerFactorPhaseC                     = static_cast<int8_t>(0);
-        Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo::DecodableType averageRmsVoltageMeasurementPeriodPhaseC =
-            static_cast<uint16_t>(0);
-        Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo::DecodableType averageRmsOverVoltageCounterPhaseC =
-            static_cast<uint16_t>(0);
-        Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo::DecodableType averageRmsUnderVoltageCounterPhaseC =
-            static_cast<uint16_t>(0);
-        Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo::DecodableType rmsExtremeOverVoltagePeriodPhaseC =
-            static_cast<uint16_t>(0);
-        Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo::DecodableType rmsExtremeUnderVoltagePeriodPhaseC =
-            static_cast<uint16_t>(0);
-        Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo::DecodableType rmsVoltageSagPeriodPhaseC     = static_cast<uint16_t>(0);
-        Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo::DecodableType rmsVoltageSwellPeriodPhaseC = static_cast<uint16_t>(0);
+        Attributes::Boolean::TypeInfo::DecodableType boolean = static_cast<bool>(0);
+        Attributes::Bitmap8::TypeInfo::DecodableType bitmap8 =
+            static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(0);
+        Attributes::Bitmap16::TypeInfo::DecodableType bitmap16 =
+            static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(0);
+        Attributes::Bitmap32::TypeInfo::DecodableType bitmap32 =
+            static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(0);
+        Attributes::Bitmap64::TypeInfo::DecodableType bitmap64 =
+            static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(0);
+        Attributes::Int8u::TypeInfo::DecodableType int8u             = static_cast<uint8_t>(0);
+        Attributes::Int16u::TypeInfo::DecodableType int16u           = static_cast<uint16_t>(0);
+        Attributes::Int24u::TypeInfo::DecodableType int24u           = static_cast<uint32_t>(0);
+        Attributes::Int32u::TypeInfo::DecodableType int32u           = static_cast<uint32_t>(0);
+        Attributes::Int40u::TypeInfo::DecodableType int40u           = static_cast<uint64_t>(0);
+        Attributes::Int48u::TypeInfo::DecodableType int48u           = static_cast<uint64_t>(0);
+        Attributes::Int56u::TypeInfo::DecodableType int56u           = static_cast<uint64_t>(0);
+        Attributes::Int64u::TypeInfo::DecodableType int64u           = static_cast<uint64_t>(0);
+        Attributes::Int8s::TypeInfo::DecodableType int8s             = static_cast<int8_t>(0);
+        Attributes::Int16s::TypeInfo::DecodableType int16s           = static_cast<int16_t>(0);
+        Attributes::Int24s::TypeInfo::DecodableType int24s           = static_cast<int32_t>(0);
+        Attributes::Int32s::TypeInfo::DecodableType int32s           = static_cast<int32_t>(0);
+        Attributes::Int40s::TypeInfo::DecodableType int40s           = static_cast<int64_t>(0);
+        Attributes::Int48s::TypeInfo::DecodableType int48s           = static_cast<int64_t>(0);
+        Attributes::Int56s::TypeInfo::DecodableType int56s           = static_cast<int64_t>(0);
+        Attributes::Int64s::TypeInfo::DecodableType int64s           = static_cast<int64_t>(0);
+        Attributes::Enum8::TypeInfo::DecodableType enum8             = static_cast<uint8_t>(0);
+        Attributes::Enum16::TypeInfo::DecodableType enum16           = static_cast<uint16_t>(0);
+        Attributes::FloatSingle::TypeInfo::DecodableType floatSingle = static_cast<float>(0);
+        Attributes::FloatDouble::TypeInfo::DecodableType floatDouble = static_cast<double>(0);
+        Attributes::OctetString::TypeInfo::DecodableType octetString;
+        Attributes::ListInt8u::TypeInfo::DecodableType listInt8u;
+        Attributes::ListOctetString::TypeInfo::DecodableType listOctetString;
+        Attributes::ListStructOctetString::TypeInfo::DecodableType listStructOctetString;
+        Attributes::LongOctetString::TypeInfo::DecodableType longOctetString;
+        Attributes::CharString::TypeInfo::DecodableType charString;
+        Attributes::LongCharString::TypeInfo::DecodableType longCharString;
+        Attributes::EpochUs::TypeInfo::DecodableType epochUs   = static_cast<uint64_t>(0);
+        Attributes::EpochS::TypeInfo::DecodableType epochS     = static_cast<uint32_t>(0);
+        Attributes::VendorId::TypeInfo::DecodableType vendorId = static_cast<chip::VendorId>(0);
+        Attributes::ListNullablesAndOptionalsStruct::TypeInfo::DecodableType listNullablesAndOptionalsStruct;
+        Attributes::EnumAttr::TypeInfo::DecodableType enumAttr = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(0);
+        Attributes::StructAttr::TypeInfo::DecodableType structAttr;
+        Attributes::RangeRestrictedInt8u::TypeInfo::DecodableType rangeRestrictedInt8u   = static_cast<uint8_t>(0);
+        Attributes::RangeRestrictedInt8s::TypeInfo::DecodableType rangeRestrictedInt8s   = static_cast<int8_t>(0);
+        Attributes::RangeRestrictedInt16u::TypeInfo::DecodableType rangeRestrictedInt16u = static_cast<uint16_t>(0);
+        Attributes::RangeRestrictedInt16s::TypeInfo::DecodableType rangeRestrictedInt16s = static_cast<int16_t>(0);
+        Attributes::ListLongOctetString::TypeInfo::DecodableType listLongOctetString;
+        Attributes::ListFabricScoped::TypeInfo::DecodableType listFabricScoped;
+        Attributes::TimedWriteBoolean::TypeInfo::DecodableType timedWriteBoolean     = static_cast<bool>(0);
+        Attributes::GeneralErrorBoolean::TypeInfo::DecodableType generalErrorBoolean = static_cast<bool>(0);
+        Attributes::ClusterErrorBoolean::TypeInfo::DecodableType clusterErrorBoolean = static_cast<bool>(0);
+        Attributes::Unsupported::TypeInfo::DecodableType unsupported                 = static_cast<bool>(0);
+        Attributes::NullableBoolean::TypeInfo::DecodableType nullableBoolean;
+        Attributes::NullableBitmap8::TypeInfo::DecodableType nullableBitmap8;
+        Attributes::NullableBitmap16::TypeInfo::DecodableType nullableBitmap16;
+        Attributes::NullableBitmap32::TypeInfo::DecodableType nullableBitmap32;
+        Attributes::NullableBitmap64::TypeInfo::DecodableType nullableBitmap64;
+        Attributes::NullableInt8u::TypeInfo::DecodableType nullableInt8u;
+        Attributes::NullableInt16u::TypeInfo::DecodableType nullableInt16u;
+        Attributes::NullableInt24u::TypeInfo::DecodableType nullableInt24u;
+        Attributes::NullableInt32u::TypeInfo::DecodableType nullableInt32u;
+        Attributes::NullableInt40u::TypeInfo::DecodableType nullableInt40u;
+        Attributes::NullableInt48u::TypeInfo::DecodableType nullableInt48u;
+        Attributes::NullableInt56u::TypeInfo::DecodableType nullableInt56u;
+        Attributes::NullableInt64u::TypeInfo::DecodableType nullableInt64u;
+        Attributes::NullableInt8s::TypeInfo::DecodableType nullableInt8s;
+        Attributes::NullableInt16s::TypeInfo::DecodableType nullableInt16s;
+        Attributes::NullableInt24s::TypeInfo::DecodableType nullableInt24s;
+        Attributes::NullableInt32s::TypeInfo::DecodableType nullableInt32s;
+        Attributes::NullableInt40s::TypeInfo::DecodableType nullableInt40s;
+        Attributes::NullableInt48s::TypeInfo::DecodableType nullableInt48s;
+        Attributes::NullableInt56s::TypeInfo::DecodableType nullableInt56s;
+        Attributes::NullableInt64s::TypeInfo::DecodableType nullableInt64s;
+        Attributes::NullableEnum8::TypeInfo::DecodableType nullableEnum8;
+        Attributes::NullableEnum16::TypeInfo::DecodableType nullableEnum16;
+        Attributes::NullableFloatSingle::TypeInfo::DecodableType nullableFloatSingle;
+        Attributes::NullableFloatDouble::TypeInfo::DecodableType nullableFloatDouble;
+        Attributes::NullableOctetString::TypeInfo::DecodableType nullableOctetString;
+        Attributes::NullableCharString::TypeInfo::DecodableType nullableCharString;
+        Attributes::NullableEnumAttr::TypeInfo::DecodableType nullableEnumAttr;
+        Attributes::NullableStruct::TypeInfo::DecodableType nullableStruct;
+        Attributes::NullableRangeRestrictedInt8u::TypeInfo::DecodableType nullableRangeRestrictedInt8u;
+        Attributes::NullableRangeRestrictedInt8s::TypeInfo::DecodableType nullableRangeRestrictedInt8s;
+        Attributes::NullableRangeRestrictedInt16u::TypeInfo::DecodableType nullableRangeRestrictedInt16u;
+        Attributes::NullableRangeRestrictedInt16s::TypeInfo::DecodableType nullableRangeRestrictedInt16s;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -41693,7 +35706,92 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace ElectricalMeasurement
+namespace Events {
+namespace TestEvent {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields
+{
+    kArg1 = 1,
+    kArg2 = 2,
+    kArg3 = 3,
+    kArg4 = 4,
+    kArg5 = 5,
+    kArg6 = 6,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::TestEvent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    uint8_t arg1    = static_cast<uint8_t>(0);
+    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
+    bool arg3       = static_cast<bool>(0);
+    Structs::SimpleStruct::Type arg4;
+    DataModel::List<const Structs::SimpleStruct::Type> arg5;
+    DataModel::List<const SimpleEnum> arg6;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::TestEvent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+
+    uint8_t arg1    = static_cast<uint8_t>(0);
+    SimpleEnum arg2 = static_cast<SimpleEnum>(0);
+    bool arg3       = static_cast<bool>(0);
+    Structs::SimpleStruct::DecodableType arg4;
+    DataModel::DecodableList<Structs::SimpleStruct::DecodableType> arg5;
+    DataModel::DecodableList<SimpleEnum> arg6;
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace TestEvent
+namespace TestFabricScopedEvent {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields
+{
+    kArg1 = 254,
+};
+
+struct Type
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::TestFabricScopedEvent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+    static constexpr bool kIsFabricScoped = true;
+
+    chip::FabricIndex arg1 = static_cast<chip::FabricIndex>(0);
+
+    auto GetFabricIndex() const { return arg1; }
+
+    CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::TestFabricScopedEvent::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
+
+    chip::FabricIndex arg1 = static_cast<chip::FabricIndex>(0);
+
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+} // namespace TestFabricScopedEvent
+} // namespace Events
+} // namespace TestCluster
 
 } // namespace Clusters
 
diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h
index 004f8a61d62162..8135695b990b13 100644
--- a/zzz_generated/app-common/app-common/zap-generated/command-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h
@@ -86,6 +86,7 @@
 #define ZCL_MOVE_WITH_ON_OFF_COMMAND_ID (0x05)
 #define ZCL_STEP_WITH_ON_OFF_COMMAND_ID (0x06)
 #define ZCL_STOP_WITH_ON_OFF_COMMAND_ID (0x07)
+#define ZCL_MOVE_TO_CLOSEST_FREQUENCY_COMMAND_ID (0x08)
 
 // Commands for cluster: Alarms
 #define ZCL_RESET_ALARM_COMMAND_ID (0x00)
@@ -185,6 +186,9 @@
 #define ZCL_RETRIEVE_LOGS_REQUEST_COMMAND_ID (0x00)
 #define ZCL_RETRIEVE_LOGS_RESPONSE_COMMAND_ID (0x01)
 
+// Commands for cluster: General Diagnostics
+#define ZCL_TEST_EVENT_TRIGGER_COMMAND_ID (0x00)
+
 // Commands for cluster: Software Diagnostics
 #define ZCL_RESET_WATERMARKS_COMMAND_ID (0x00)
 
@@ -215,7 +219,6 @@
 #define ZCL_UPDATE_FABRIC_LABEL_COMMAND_ID (0x09)
 #define ZCL_REMOVE_FABRIC_COMMAND_ID (0x0A)
 #define ZCL_ADD_TRUSTED_ROOT_CERTIFICATE_COMMAND_ID (0x0B)
-#define ZCL_REMOVE_TRUSTED_ROOT_CERTIFICATE_COMMAND_ID (0x0C)
 
 // Commands for cluster: Group Key Management
 #define ZCL_KEY_SET_WRITE_COMMAND_ID (0x00)
@@ -232,16 +235,6 @@
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_UNLOCK_DOOR_COMMAND_ID (0x01)
 #define ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID (0x03)
-#define ZCL_GET_LOG_RECORD_COMMAND_ID (0x04)
-#define ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID (0x04)
-#define ZCL_SET_PIN_CODE_COMMAND_ID (0x05)
-#define ZCL_GET_PIN_CODE_COMMAND_ID (0x06)
-#define ZCL_GET_PIN_CODE_RESPONSE_COMMAND_ID (0x06)
-#define ZCL_CLEAR_PIN_CODE_COMMAND_ID (0x07)
-#define ZCL_CLEAR_ALL_PIN_CODES_COMMAND_ID (0x08)
-#define ZCL_SET_USER_STATUS_COMMAND_ID (0x09)
-#define ZCL_GET_USER_STATUS_COMMAND_ID (0x0A)
-#define ZCL_GET_USER_STATUS_RESPONSE_COMMAND_ID (0x0A)
 #define ZCL_SET_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0B)
 #define ZCL_GET_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0C)
 #define ZCL_GET_WEEK_DAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0C)
@@ -254,20 +247,10 @@
 #define ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID (0x12)
 #define ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x12)
 #define ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID (0x13)
-#define ZCL_SET_USER_TYPE_COMMAND_ID (0x14)
-#define ZCL_GET_USER_TYPE_COMMAND_ID (0x15)
-#define ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID (0x15)
-#define ZCL_SET_RFID_CODE_COMMAND_ID (0x16)
-#define ZCL_GET_RFID_CODE_COMMAND_ID (0x17)
-#define ZCL_GET_RFID_CODE_RESPONSE_COMMAND_ID (0x17)
-#define ZCL_CLEAR_RFID_CODE_COMMAND_ID (0x18)
-#define ZCL_CLEAR_ALL_RFID_CODES_COMMAND_ID (0x19)
 #define ZCL_SET_USER_COMMAND_ID (0x1A)
 #define ZCL_GET_USER_COMMAND_ID (0x1B)
 #define ZCL_GET_USER_RESPONSE_COMMAND_ID (0x1C)
 #define ZCL_CLEAR_USER_COMMAND_ID (0x1D)
-#define ZCL_OPERATING_EVENT_NOTIFICATION_COMMAND_ID (0x20)
-#define ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID (0x21)
 #define ZCL_SET_CREDENTIAL_COMMAND_ID (0x22)
 #define ZCL_SET_CREDENTIAL_RESPONSE_COMMAND_ID (0x23)
 #define ZCL_GET_CREDENTIAL_STATUS_COMMAND_ID (0x24)
@@ -291,10 +274,8 @@
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_GET_WEEKLY_SCHEDULE_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID (0x01)
-#define ZCL_GET_RELAY_STATUS_LOG_RESPONSE_COMMAND_ID (0x01)
 #define ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID (0x02)
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
-#define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
@@ -317,40 +298,6 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
-// Commands for cluster: IAS Zone
-#define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
-#define ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID (0x01)
-#define ZCL_ZONE_ENROLL_REQUEST_COMMAND_ID (0x01)
-#define ZCL_INITIATE_TEST_MODE_COMMAND_ID (0x02)
-#define ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID (0x03)
-
-// Commands for cluster: IAS ACE
-#define ZCL_ARM_COMMAND_ID (0x00)
-#define ZCL_ARM_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_BYPASS_COMMAND_ID (0x01)
-#define ZCL_GET_ZONE_ID_MAP_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_EMERGENCY_COMMAND_ID (0x02)
-#define ZCL_GET_ZONE_INFORMATION_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_FIRE_COMMAND_ID (0x03)
-#define ZCL_ZONE_STATUS_CHANGED_COMMAND_ID (0x03)
-#define ZCL_PANIC_COMMAND_ID (0x04)
-#define ZCL_PANEL_STATUS_CHANGED_COMMAND_ID (0x04)
-#define ZCL_GET_ZONE_ID_MAP_COMMAND_ID (0x05)
-#define ZCL_GET_PANEL_STATUS_RESPONSE_COMMAND_ID (0x05)
-#define ZCL_GET_ZONE_INFORMATION_COMMAND_ID (0x06)
-#define ZCL_SET_BYPASSED_ZONE_LIST_COMMAND_ID (0x06)
-#define ZCL_GET_PANEL_STATUS_COMMAND_ID (0x07)
-#define ZCL_BYPASS_RESPONSE_COMMAND_ID (0x07)
-#define ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID (0x08)
-#define ZCL_GET_ZONE_STATUS_RESPONSE_COMMAND_ID (0x08)
-#define ZCL_GET_ZONE_STATUS_COMMAND_ID (0x09)
-
-// Commands for cluster: IAS WD
-#define ZCL_START_WARNING_COMMAND_ID (0x00)
-#define ZCL_SQUAWK_COMMAND_ID (0x01)
-
 // Commands for cluster: Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x01)
@@ -409,6 +356,35 @@
 #define ZCL_LOGIN_COMMAND_ID (0x02)
 #define ZCL_LOGOUT_COMMAND_ID (0x03)
 
+// Commands for cluster: Messaging
+#define ZCL_DISPLAY_MESSAGE_COMMAND_ID (0x00)
+#define ZCL_GET_LAST_MESSAGE_COMMAND_ID (0x00)
+#define ZCL_CANCEL_MESSAGE_COMMAND_ID (0x01)
+#define ZCL_MESSAGE_CONFIRMATION_COMMAND_ID (0x01)
+#define ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID (0x02)
+#define ZCL_GET_MESSAGE_CANCELLATION_COMMAND_ID (0x02)
+#define ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID (0x03)
+
+// Commands for cluster: Appliance Events and Alert
+#define ZCL_GET_ALERTS_COMMAND_ID (0x00)
+#define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
+#define ZCL_ALERTS_NOTIFICATION_COMMAND_ID (0x01)
+#define ZCL_EVENTS_NOTIFICATION_COMMAND_ID (0x02)
+
+// Commands for cluster: Appliance Statistics
+#define ZCL_LOG_NOTIFICATION_COMMAND_ID (0x00)
+#define ZCL_LOG_REQUEST_COMMAND_ID (0x00)
+#define ZCL_LOG_RESPONSE_COMMAND_ID (0x01)
+#define ZCL_LOG_QUEUE_REQUEST_COMMAND_ID (0x01)
+#define ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID (0x02)
+#define ZCL_STATISTICS_AVAILABLE_COMMAND_ID (0x03)
+
+// Commands for cluster: Electrical Measurement
+#define ZCL_GET_PROFILE_INFO_RESPONSE_COMMAND_COMMAND_ID (0x00)
+#define ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID (0x00)
+#define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
+#define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
+
 // Commands for cluster: Test Cluster
 #define ZCL_TEST_COMMAND_ID (0x00)
 #define ZCL_TEST_SPECIFIC_RESPONSE_COMMAND_ID (0x00)
@@ -444,32 +420,3 @@
 #define ZCL_TEST_SIMPLE_OPTIONAL_ARGUMENT_REQUEST_COMMAND_ID (0x13)
 #define ZCL_TEST_EMIT_TEST_EVENT_REQUEST_COMMAND_ID (0x14)
 #define ZCL_TEST_EMIT_TEST_FABRIC_SCOPED_EVENT_REQUEST_COMMAND_ID (0x15)
-
-// Commands for cluster: Messaging
-#define ZCL_DISPLAY_MESSAGE_COMMAND_ID (0x00)
-#define ZCL_GET_LAST_MESSAGE_COMMAND_ID (0x00)
-#define ZCL_CANCEL_MESSAGE_COMMAND_ID (0x01)
-#define ZCL_MESSAGE_CONFIRMATION_COMMAND_ID (0x01)
-#define ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID (0x02)
-#define ZCL_GET_MESSAGE_CANCELLATION_COMMAND_ID (0x02)
-#define ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID (0x03)
-
-// Commands for cluster: Appliance Events and Alert
-#define ZCL_GET_ALERTS_COMMAND_ID (0x00)
-#define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_ALERTS_NOTIFICATION_COMMAND_ID (0x01)
-#define ZCL_EVENTS_NOTIFICATION_COMMAND_ID (0x02)
-
-// Commands for cluster: Appliance Statistics
-#define ZCL_LOG_NOTIFICATION_COMMAND_ID (0x00)
-#define ZCL_LOG_REQUEST_COMMAND_ID (0x00)
-#define ZCL_LOG_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_LOG_QUEUE_REQUEST_COMMAND_ID (0x01)
-#define ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_STATISTICS_AVAILABLE_COMMAND_ID (0x03)
-
-// Commands for cluster: Electrical Measurement
-#define ZCL_GET_PROFILE_INFO_RESPONSE_COMMAND_COMMAND_ID (0x00)
-#define ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID (0x00)
-#define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
-#define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index 5bbf2307c1de1a..5509a461e00104 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -130,43 +130,6 @@ enum EmberAfHueStepMode : uint8_t
     EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 };
 
-// Enum for IasEnrollResponseCode
-enum EmberAfIasEnrollResponseCode : uint8_t
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
-};
-
-// Enum for IasZoneState
-enum EmberAfIasZoneState : uint8_t
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
-};
-
-// Enum for IasZoneType
-enum EmberAfIasZoneType : uint16_t
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
-};
-
 // Enum for IdentifyEffectIdentifier
 enum EmberAfIdentifyEffectIdentifier : uint8_t
 {
@@ -534,20 +497,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW_OFFSET (0)
 #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH (2)
 #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH_OFFSET (1)
-#define EMBER_AF_DL_ALARM_MASK_LOCKING_MECHANISM_JAMMED (1)
-#define EMBER_AF_DL_ALARM_MASK_LOCKING_MECHANISM_JAMMED_OFFSET (0)
-#define EMBER_AF_DL_ALARM_MASK_LOCK_RESET_TO_FACTORY_DEFAULTS (2)
-#define EMBER_AF_DL_ALARM_MASK_LOCK_RESET_TO_FACTORY_DEFAULTS_OFFSET (1)
-#define EMBER_AF_DL_ALARM_MASK_RESERVED (4)
-#define EMBER_AF_DL_ALARM_MASK_RESERVED_OFFSET (2)
-#define EMBER_AF_DL_ALARM_MASK_RF_MODULE_POWER_CYCLED (8)
-#define EMBER_AF_DL_ALARM_MASK_RF_MODULE_POWER_CYCLED_OFFSET (3)
-#define EMBER_AF_DL_ALARM_MASK_WRONG_CODE_ENTRY_LIMIT (16)
-#define EMBER_AF_DL_ALARM_MASK_WRONG_CODE_ENTRY_LIMIT_OFFSET (4)
-#define EMBER_AF_DL_ALARM_MASK_FRONT_ESCUTCHEON_REMOVED_FROM_MAIN (32)
-#define EMBER_AF_DL_ALARM_MASK_FRONT_ESCUTCHEON_REMOVED_FROM_MAIN_OFFSET (5)
-#define EMBER_AF_DL_ALARM_MASK_FORCED_DOOR_OPEN_UNDER_DOOR_LOCKED_CONDITION (64)
-#define EMBER_AF_DL_ALARM_MASK_FORCED_DOOR_OPEN_UNDER_DOOR_LOCKED_CONDITION_OFFSET (6)
 #define EMBER_AF_DL_CREDENTIAL_RULE_MASK_SINGLE (1)
 #define EMBER_AF_DL_CREDENTIAL_RULE_MASK_SINGLE_OFFSET (0)
 #define EMBER_AF_DL_CREDENTIAL_RULE_MASK_DUAL (2)
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
index f21eb136f4ecf3..615d0ed7d8c47e 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
@@ -1742,6 +1742,10 @@ namespace ActiveNetworkFaults {
 static constexpr AttributeId Id = 0x00000007;
 } // namespace ActiveNetworkFaults
 
+namespace TestEventTriggersEnabled {
+static constexpr AttributeId Id = 0x00000008;
+} // namespace TestEventTriggersEnabled
+
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
@@ -2800,10 +2804,6 @@ namespace OpenPeriod {
 static constexpr AttributeId Id = 0x00000006;
 } // namespace OpenPeriod
 
-namespace NumberOfLogRecordsSupported {
-static constexpr AttributeId Id = 0x00000010;
-} // namespace NumberOfLogRecordsSupported
-
 namespace NumberOfTotalUsersSupported {
 static constexpr AttributeId Id = 0x00000011;
 } // namespace NumberOfTotalUsersSupported
@@ -2852,10 +2852,6 @@ namespace NumberOfCredentialsSupportedPerUser {
 static constexpr AttributeId Id = 0x0000001C;
 } // namespace NumberOfCredentialsSupportedPerUser
 
-namespace EnableLogging {
-static constexpr AttributeId Id = 0x00000020;
-} // namespace EnableLogging
-
 namespace Language {
 static constexpr AttributeId Id = 0x00000021;
 } // namespace Language
@@ -2924,38 +2920,6 @@ namespace ExpiringUserTimeout {
 static constexpr AttributeId Id = 0x00000035;
 } // namespace ExpiringUserTimeout
 
-namespace AlarmMask {
-static constexpr AttributeId Id = 0x00000040;
-} // namespace AlarmMask
-
-namespace KeypadOperationEventMask {
-static constexpr AttributeId Id = 0x00000041;
-} // namespace KeypadOperationEventMask
-
-namespace RemoteOperationEventMask {
-static constexpr AttributeId Id = 0x00000042;
-} // namespace RemoteOperationEventMask
-
-namespace ManualOperationEventMask {
-static constexpr AttributeId Id = 0x00000043;
-} // namespace ManualOperationEventMask
-
-namespace RFIDOperationEventMask {
-static constexpr AttributeId Id = 0x00000044;
-} // namespace RFIDOperationEventMask
-
-namespace KeypadProgrammingEventMask {
-static constexpr AttributeId Id = 0x00000045;
-} // namespace KeypadProgrammingEventMask
-
-namespace RemoteProgrammingEventMask {
-static constexpr AttributeId Id = 0x00000046;
-} // namespace RemoteProgrammingEventMask
-
-namespace RFIDProgrammingEventMask {
-static constexpr AttributeId Id = 0x00000047;
-} // namespace RFIDProgrammingEventMask
-
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
@@ -3372,10 +3336,6 @@ namespace SystemMode {
 static constexpr AttributeId Id = 0x0000001C;
 } // namespace SystemMode
 
-namespace AlarmMask {
-static constexpr AttributeId Id = 0x0000001D;
-} // namespace AlarmMask
-
 namespace ThermostatRunningMode {
 static constexpr AttributeId Id = 0x0000001E;
 } // namespace ThermostatRunningMode
@@ -5561,116 +5521,6 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace Attributes
 } // namespace SodiumConcentrationMeasurement
 
-namespace IasZone {
-namespace Attributes {
-
-namespace ZoneState {
-static constexpr AttributeId Id = 0x00000000;
-} // namespace ZoneState
-
-namespace ZoneType {
-static constexpr AttributeId Id = 0x00000001;
-} // namespace ZoneType
-
-namespace ZoneStatus {
-static constexpr AttributeId Id = 0x00000002;
-} // namespace ZoneStatus
-
-namespace IasCieAddress {
-static constexpr AttributeId Id = 0x00000010;
-} // namespace IasCieAddress
-
-namespace ZoneId {
-static constexpr AttributeId Id = 0x00000011;
-} // namespace ZoneId
-
-namespace NumberOfZoneSensitivityLevelsSupported {
-static constexpr AttributeId Id = 0x00000012;
-} // namespace NumberOfZoneSensitivityLevelsSupported
-
-namespace CurrentZoneSensitivityLevel {
-static constexpr AttributeId Id = 0x00000013;
-} // namespace CurrentZoneSensitivityLevel
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
-
-namespace AcceptedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
-} // namespace AcceptedCommandList
-
-namespace AttributeList {
-static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
-} // namespace AttributeList
-
-namespace FeatureMap {
-static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace IasZone
-
-namespace IasAce {
-namespace Attributes {
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
-
-namespace AcceptedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
-} // namespace AcceptedCommandList
-
-namespace AttributeList {
-static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
-} // namespace AttributeList
-
-namespace FeatureMap {
-static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace IasAce
-
-namespace IasWd {
-namespace Attributes {
-
-namespace MaxDuration {
-static constexpr AttributeId Id = 0x00000000;
-} // namespace MaxDuration
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
-
-namespace AcceptedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
-} // namespace AcceptedCommandList
-
-namespace AttributeList {
-static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
-} // namespace AttributeList
-
-namespace FeatureMap {
-static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace IasWd
-
 namespace WakeOnLan {
 namespace Attributes {
 
@@ -6099,332 +5949,156 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace Attributes
 } // namespace AccountLogin
 
-namespace TestCluster {
+namespace Messaging {
 namespace Attributes {
 
-namespace Boolean {
-static constexpr AttributeId Id = 0x00000000;
-} // namespace Boolean
-
-namespace Bitmap8 {
-static constexpr AttributeId Id = 0x00000001;
-} // namespace Bitmap8
-
-namespace Bitmap16 {
-static constexpr AttributeId Id = 0x00000002;
-} // namespace Bitmap16
-
-namespace Bitmap32 {
-static constexpr AttributeId Id = 0x00000003;
-} // namespace Bitmap32
-
-namespace Bitmap64 {
-static constexpr AttributeId Id = 0x00000004;
-} // namespace Bitmap64
-
-namespace Int8u {
-static constexpr AttributeId Id = 0x00000005;
-} // namespace Int8u
-
-namespace Int16u {
-static constexpr AttributeId Id = 0x00000006;
-} // namespace Int16u
-
-namespace Int24u {
-static constexpr AttributeId Id = 0x00000007;
-} // namespace Int24u
-
-namespace Int32u {
-static constexpr AttributeId Id = 0x00000008;
-} // namespace Int32u
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
 
-namespace Int40u {
-static constexpr AttributeId Id = 0x00000009;
-} // namespace Int40u
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
 
-namespace Int48u {
-static constexpr AttributeId Id = 0x0000000A;
-} // namespace Int48u
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
 
-namespace Int56u {
-static constexpr AttributeId Id = 0x0000000B;
-} // namespace Int56u
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
 
-namespace Int64u {
-static constexpr AttributeId Id = 0x0000000C;
-} // namespace Int64u
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
 
-namespace Int8s {
-static constexpr AttributeId Id = 0x0000000D;
-} // namespace Int8s
+} // namespace Attributes
+} // namespace Messaging
 
-namespace Int16s {
-static constexpr AttributeId Id = 0x0000000E;
-} // namespace Int16s
+namespace ApplianceIdentification {
+namespace Attributes {
 
-namespace Int24s {
-static constexpr AttributeId Id = 0x0000000F;
-} // namespace Int24s
+namespace BasicIdentification {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace BasicIdentification
 
-namespace Int32s {
+namespace CompanyName {
 static constexpr AttributeId Id = 0x00000010;
-} // namespace Int32s
+} // namespace CompanyName
 
-namespace Int40s {
+namespace CompanyId {
 static constexpr AttributeId Id = 0x00000011;
-} // namespace Int40s
+} // namespace CompanyId
 
-namespace Int48s {
+namespace BrandName {
 static constexpr AttributeId Id = 0x00000012;
-} // namespace Int48s
+} // namespace BrandName
 
-namespace Int56s {
+namespace BrandId {
 static constexpr AttributeId Id = 0x00000013;
-} // namespace Int56s
+} // namespace BrandId
 
-namespace Int64s {
+namespace Model {
 static constexpr AttributeId Id = 0x00000014;
-} // namespace Int64s
+} // namespace Model
 
-namespace Enum8 {
+namespace PartNumber {
 static constexpr AttributeId Id = 0x00000015;
-} // namespace Enum8
+} // namespace PartNumber
 
-namespace Enum16 {
+namespace ProductRevision {
 static constexpr AttributeId Id = 0x00000016;
-} // namespace Enum16
+} // namespace ProductRevision
 
-namespace FloatSingle {
+namespace SoftwareRevision {
 static constexpr AttributeId Id = 0x00000017;
-} // namespace FloatSingle
+} // namespace SoftwareRevision
 
-namespace FloatDouble {
+namespace ProductTypeName {
 static constexpr AttributeId Id = 0x00000018;
-} // namespace FloatDouble
+} // namespace ProductTypeName
 
-namespace OctetString {
+namespace ProductTypeId {
 static constexpr AttributeId Id = 0x00000019;
-} // namespace OctetString
+} // namespace ProductTypeId
 
-namespace ListInt8u {
+namespace CecedSpecificationVersion {
 static constexpr AttributeId Id = 0x0000001A;
-} // namespace ListInt8u
+} // namespace CecedSpecificationVersion
 
-namespace ListOctetString {
-static constexpr AttributeId Id = 0x0000001B;
-} // namespace ListOctetString
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
 
-namespace ListStructOctetString {
-static constexpr AttributeId Id = 0x0000001C;
-} // namespace ListStructOctetString
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
 
-namespace LongOctetString {
-static constexpr AttributeId Id = 0x0000001D;
-} // namespace LongOctetString
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
 
-namespace CharString {
-static constexpr AttributeId Id = 0x0000001E;
-} // namespace CharString
-
-namespace LongCharString {
-static constexpr AttributeId Id = 0x0000001F;
-} // namespace LongCharString
-
-namespace EpochUs {
-static constexpr AttributeId Id = 0x00000020;
-} // namespace EpochUs
-
-namespace EpochS {
-static constexpr AttributeId Id = 0x00000021;
-} // namespace EpochS
-
-namespace VendorId {
-static constexpr AttributeId Id = 0x00000022;
-} // namespace VendorId
-
-namespace ListNullablesAndOptionalsStruct {
-static constexpr AttributeId Id = 0x00000023;
-} // namespace ListNullablesAndOptionalsStruct
-
-namespace EnumAttr {
-static constexpr AttributeId Id = 0x00000024;
-} // namespace EnumAttr
-
-namespace StructAttr {
-static constexpr AttributeId Id = 0x00000025;
-} // namespace StructAttr
-
-namespace RangeRestrictedInt8u {
-static constexpr AttributeId Id = 0x00000026;
-} // namespace RangeRestrictedInt8u
-
-namespace RangeRestrictedInt8s {
-static constexpr AttributeId Id = 0x00000027;
-} // namespace RangeRestrictedInt8s
-
-namespace RangeRestrictedInt16u {
-static constexpr AttributeId Id = 0x00000028;
-} // namespace RangeRestrictedInt16u
-
-namespace RangeRestrictedInt16s {
-static constexpr AttributeId Id = 0x00000029;
-} // namespace RangeRestrictedInt16s
-
-namespace ListLongOctetString {
-static constexpr AttributeId Id = 0x0000002A;
-} // namespace ListLongOctetString
-
-namespace ListFabricScoped {
-static constexpr AttributeId Id = 0x0000002B;
-} // namespace ListFabricScoped
-
-namespace TimedWriteBoolean {
-static constexpr AttributeId Id = 0x00000030;
-} // namespace TimedWriteBoolean
-
-namespace GeneralErrorBoolean {
-static constexpr AttributeId Id = 0x00000031;
-} // namespace GeneralErrorBoolean
-
-namespace ClusterErrorBoolean {
-static constexpr AttributeId Id = 0x00000032;
-} // namespace ClusterErrorBoolean
-
-namespace Unsupported {
-static constexpr AttributeId Id = 0x000000FF;
-} // namespace Unsupported
-
-namespace NullableBoolean {
-static constexpr AttributeId Id = 0x00004000;
-} // namespace NullableBoolean
-
-namespace NullableBitmap8 {
-static constexpr AttributeId Id = 0x00004001;
-} // namespace NullableBitmap8
-
-namespace NullableBitmap16 {
-static constexpr AttributeId Id = 0x00004002;
-} // namespace NullableBitmap16
-
-namespace NullableBitmap32 {
-static constexpr AttributeId Id = 0x00004003;
-} // namespace NullableBitmap32
-
-namespace NullableBitmap64 {
-static constexpr AttributeId Id = 0x00004004;
-} // namespace NullableBitmap64
-
-namespace NullableInt8u {
-static constexpr AttributeId Id = 0x00004005;
-} // namespace NullableInt8u
-
-namespace NullableInt16u {
-static constexpr AttributeId Id = 0x00004006;
-} // namespace NullableInt16u
-
-namespace NullableInt24u {
-static constexpr AttributeId Id = 0x00004007;
-} // namespace NullableInt24u
-
-namespace NullableInt32u {
-static constexpr AttributeId Id = 0x00004008;
-} // namespace NullableInt32u
-
-namespace NullableInt40u {
-static constexpr AttributeId Id = 0x00004009;
-} // namespace NullableInt40u
-
-namespace NullableInt48u {
-static constexpr AttributeId Id = 0x0000400A;
-} // namespace NullableInt48u
-
-namespace NullableInt56u {
-static constexpr AttributeId Id = 0x0000400B;
-} // namespace NullableInt56u
-
-namespace NullableInt64u {
-static constexpr AttributeId Id = 0x0000400C;
-} // namespace NullableInt64u
-
-namespace NullableInt8s {
-static constexpr AttributeId Id = 0x0000400D;
-} // namespace NullableInt8s
-
-namespace NullableInt16s {
-static constexpr AttributeId Id = 0x0000400E;
-} // namespace NullableInt16s
-
-namespace NullableInt24s {
-static constexpr AttributeId Id = 0x0000400F;
-} // namespace NullableInt24s
-
-namespace NullableInt32s {
-static constexpr AttributeId Id = 0x00004010;
-} // namespace NullableInt32s
-
-namespace NullableInt40s {
-static constexpr AttributeId Id = 0x00004011;
-} // namespace NullableInt40s
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
 
-namespace NullableInt48s {
-static constexpr AttributeId Id = 0x00004012;
-} // namespace NullableInt48s
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
 
-namespace NullableInt56s {
-static constexpr AttributeId Id = 0x00004013;
-} // namespace NullableInt56s
+} // namespace Attributes
+} // namespace ApplianceIdentification
 
-namespace NullableInt64s {
-static constexpr AttributeId Id = 0x00004014;
-} // namespace NullableInt64s
+namespace MeterIdentification {
+namespace Attributes {
 
-namespace NullableEnum8 {
-static constexpr AttributeId Id = 0x00004015;
-} // namespace NullableEnum8
+namespace CompanyName {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace CompanyName
 
-namespace NullableEnum16 {
-static constexpr AttributeId Id = 0x00004016;
-} // namespace NullableEnum16
+namespace MeterTypeId {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace MeterTypeId
 
-namespace NullableFloatSingle {
-static constexpr AttributeId Id = 0x00004017;
-} // namespace NullableFloatSingle
+namespace DataQualityId {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace DataQualityId
 
-namespace NullableFloatDouble {
-static constexpr AttributeId Id = 0x00004018;
-} // namespace NullableFloatDouble
+namespace CustomerName {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace CustomerName
 
-namespace NullableOctetString {
-static constexpr AttributeId Id = 0x00004019;
-} // namespace NullableOctetString
+namespace Model {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace Model
 
-namespace NullableCharString {
-static constexpr AttributeId Id = 0x0000401E;
-} // namespace NullableCharString
+namespace PartNumber {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace PartNumber
 
-namespace NullableEnumAttr {
-static constexpr AttributeId Id = 0x00004024;
-} // namespace NullableEnumAttr
+namespace ProductRevision {
+static constexpr AttributeId Id = 0x00000008;
+} // namespace ProductRevision
 
-namespace NullableStruct {
-static constexpr AttributeId Id = 0x00004025;
-} // namespace NullableStruct
+namespace SoftwareRevision {
+static constexpr AttributeId Id = 0x0000000A;
+} // namespace SoftwareRevision
 
-namespace NullableRangeRestrictedInt8u {
-static constexpr AttributeId Id = 0x00004026;
-} // namespace NullableRangeRestrictedInt8u
+namespace UtilityName {
+static constexpr AttributeId Id = 0x0000000B;
+} // namespace UtilityName
 
-namespace NullableRangeRestrictedInt8s {
-static constexpr AttributeId Id = 0x00004027;
-} // namespace NullableRangeRestrictedInt8s
+namespace Pod {
+static constexpr AttributeId Id = 0x0000000C;
+} // namespace Pod
 
-namespace NullableRangeRestrictedInt16u {
-static constexpr AttributeId Id = 0x00004028;
-} // namespace NullableRangeRestrictedInt16u
+namespace AvailablePower {
+static constexpr AttributeId Id = 0x0000000D;
+} // namespace AvailablePower
 
-namespace NullableRangeRestrictedInt16s {
-static constexpr AttributeId Id = 0x00004029;
-} // namespace NullableRangeRestrictedInt16s
+namespace PowerThreshold {
+static constexpr AttributeId Id = 0x0000000E;
+} // namespace PowerThreshold
 
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
@@ -6447,9 +6121,9 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace TestCluster
+} // namespace MeterIdentification
 
-namespace Messaging {
+namespace ApplianceEventsAndAlert {
 namespace Attributes {
 
 namespace GeneratedCommandList {
@@ -6473,196 +6147,22 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace Messaging
+} // namespace ApplianceEventsAndAlert
 
-namespace ApplianceIdentification {
+namespace ApplianceStatistics {
 namespace Attributes {
 
-namespace BasicIdentification {
+namespace LogMaxSize {
 static constexpr AttributeId Id = 0x00000000;
-} // namespace BasicIdentification
+} // namespace LogMaxSize
 
-namespace CompanyName {
-static constexpr AttributeId Id = 0x00000010;
-} // namespace CompanyName
+namespace LogQueueMaxSize {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace LogQueueMaxSize
 
-namespace CompanyId {
-static constexpr AttributeId Id = 0x00000011;
-} // namespace CompanyId
-
-namespace BrandName {
-static constexpr AttributeId Id = 0x00000012;
-} // namespace BrandName
-
-namespace BrandId {
-static constexpr AttributeId Id = 0x00000013;
-} // namespace BrandId
-
-namespace Model {
-static constexpr AttributeId Id = 0x00000014;
-} // namespace Model
-
-namespace PartNumber {
-static constexpr AttributeId Id = 0x00000015;
-} // namespace PartNumber
-
-namespace ProductRevision {
-static constexpr AttributeId Id = 0x00000016;
-} // namespace ProductRevision
-
-namespace SoftwareRevision {
-static constexpr AttributeId Id = 0x00000017;
-} // namespace SoftwareRevision
-
-namespace ProductTypeName {
-static constexpr AttributeId Id = 0x00000018;
-} // namespace ProductTypeName
-
-namespace ProductTypeId {
-static constexpr AttributeId Id = 0x00000019;
-} // namespace ProductTypeId
-
-namespace CecedSpecificationVersion {
-static constexpr AttributeId Id = 0x0000001A;
-} // namespace CecedSpecificationVersion
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
-
-namespace AcceptedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
-} // namespace AcceptedCommandList
-
-namespace AttributeList {
-static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
-} // namespace AttributeList
-
-namespace FeatureMap {
-static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplianceIdentification
-
-namespace MeterIdentification {
-namespace Attributes {
-
-namespace CompanyName {
-static constexpr AttributeId Id = 0x00000000;
-} // namespace CompanyName
-
-namespace MeterTypeId {
-static constexpr AttributeId Id = 0x00000001;
-} // namespace MeterTypeId
-
-namespace DataQualityId {
-static constexpr AttributeId Id = 0x00000004;
-} // namespace DataQualityId
-
-namespace CustomerName {
-static constexpr AttributeId Id = 0x00000005;
-} // namespace CustomerName
-
-namespace Model {
-static constexpr AttributeId Id = 0x00000006;
-} // namespace Model
-
-namespace PartNumber {
-static constexpr AttributeId Id = 0x00000007;
-} // namespace PartNumber
-
-namespace ProductRevision {
-static constexpr AttributeId Id = 0x00000008;
-} // namespace ProductRevision
-
-namespace SoftwareRevision {
-static constexpr AttributeId Id = 0x0000000A;
-} // namespace SoftwareRevision
-
-namespace UtilityName {
-static constexpr AttributeId Id = 0x0000000B;
-} // namespace UtilityName
-
-namespace Pod {
-static constexpr AttributeId Id = 0x0000000C;
-} // namespace Pod
-
-namespace AvailablePower {
-static constexpr AttributeId Id = 0x0000000D;
-} // namespace AvailablePower
-
-namespace PowerThreshold {
-static constexpr AttributeId Id = 0x0000000E;
-} // namespace PowerThreshold
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
-
-namespace AcceptedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
-} // namespace AcceptedCommandList
-
-namespace AttributeList {
-static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
-} // namespace AttributeList
-
-namespace FeatureMap {
-static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace MeterIdentification
-
-namespace ApplianceEventsAndAlert {
-namespace Attributes {
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
-
-namespace AcceptedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
-} // namespace AcceptedCommandList
-
-namespace AttributeList {
-static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
-} // namespace AttributeList
-
-namespace FeatureMap {
-static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
-} // namespace FeatureMap
-
-namespace ClusterRevision {
-static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace ApplianceEventsAndAlert
-
-namespace ApplianceStatistics {
-namespace Attributes {
-
-namespace LogMaxSize {
-static constexpr AttributeId Id = 0x00000000;
-} // namespace LogMaxSize
-
-namespace LogQueueMaxSize {
-static constexpr AttributeId Id = 0x00000001;
-} // namespace LogQueueMaxSize
-
-namespace GeneratedCommandList {
-static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
-} // namespace GeneratedCommandList
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
 
 namespace AcceptedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
@@ -7221,6 +6721,356 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 } // namespace Attributes
 } // namespace ElectricalMeasurement
 
+namespace TestCluster {
+namespace Attributes {
+
+namespace Boolean {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace Boolean
+
+namespace Bitmap8 {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace Bitmap8
+
+namespace Bitmap16 {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace Bitmap16
+
+namespace Bitmap32 {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace Bitmap32
+
+namespace Bitmap64 {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace Bitmap64
+
+namespace Int8u {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace Int8u
+
+namespace Int16u {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace Int16u
+
+namespace Int24u {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace Int24u
+
+namespace Int32u {
+static constexpr AttributeId Id = 0x00000008;
+} // namespace Int32u
+
+namespace Int40u {
+static constexpr AttributeId Id = 0x00000009;
+} // namespace Int40u
+
+namespace Int48u {
+static constexpr AttributeId Id = 0x0000000A;
+} // namespace Int48u
+
+namespace Int56u {
+static constexpr AttributeId Id = 0x0000000B;
+} // namespace Int56u
+
+namespace Int64u {
+static constexpr AttributeId Id = 0x0000000C;
+} // namespace Int64u
+
+namespace Int8s {
+static constexpr AttributeId Id = 0x0000000D;
+} // namespace Int8s
+
+namespace Int16s {
+static constexpr AttributeId Id = 0x0000000E;
+} // namespace Int16s
+
+namespace Int24s {
+static constexpr AttributeId Id = 0x0000000F;
+} // namespace Int24s
+
+namespace Int32s {
+static constexpr AttributeId Id = 0x00000010;
+} // namespace Int32s
+
+namespace Int40s {
+static constexpr AttributeId Id = 0x00000011;
+} // namespace Int40s
+
+namespace Int48s {
+static constexpr AttributeId Id = 0x00000012;
+} // namespace Int48s
+
+namespace Int56s {
+static constexpr AttributeId Id = 0x00000013;
+} // namespace Int56s
+
+namespace Int64s {
+static constexpr AttributeId Id = 0x00000014;
+} // namespace Int64s
+
+namespace Enum8 {
+static constexpr AttributeId Id = 0x00000015;
+} // namespace Enum8
+
+namespace Enum16 {
+static constexpr AttributeId Id = 0x00000016;
+} // namespace Enum16
+
+namespace FloatSingle {
+static constexpr AttributeId Id = 0x00000017;
+} // namespace FloatSingle
+
+namespace FloatDouble {
+static constexpr AttributeId Id = 0x00000018;
+} // namespace FloatDouble
+
+namespace OctetString {
+static constexpr AttributeId Id = 0x00000019;
+} // namespace OctetString
+
+namespace ListInt8u {
+static constexpr AttributeId Id = 0x0000001A;
+} // namespace ListInt8u
+
+namespace ListOctetString {
+static constexpr AttributeId Id = 0x0000001B;
+} // namespace ListOctetString
+
+namespace ListStructOctetString {
+static constexpr AttributeId Id = 0x0000001C;
+} // namespace ListStructOctetString
+
+namespace LongOctetString {
+static constexpr AttributeId Id = 0x0000001D;
+} // namespace LongOctetString
+
+namespace CharString {
+static constexpr AttributeId Id = 0x0000001E;
+} // namespace CharString
+
+namespace LongCharString {
+static constexpr AttributeId Id = 0x0000001F;
+} // namespace LongCharString
+
+namespace EpochUs {
+static constexpr AttributeId Id = 0x00000020;
+} // namespace EpochUs
+
+namespace EpochS {
+static constexpr AttributeId Id = 0x00000021;
+} // namespace EpochS
+
+namespace VendorId {
+static constexpr AttributeId Id = 0x00000022;
+} // namespace VendorId
+
+namespace ListNullablesAndOptionalsStruct {
+static constexpr AttributeId Id = 0x00000023;
+} // namespace ListNullablesAndOptionalsStruct
+
+namespace EnumAttr {
+static constexpr AttributeId Id = 0x00000024;
+} // namespace EnumAttr
+
+namespace StructAttr {
+static constexpr AttributeId Id = 0x00000025;
+} // namespace StructAttr
+
+namespace RangeRestrictedInt8u {
+static constexpr AttributeId Id = 0x00000026;
+} // namespace RangeRestrictedInt8u
+
+namespace RangeRestrictedInt8s {
+static constexpr AttributeId Id = 0x00000027;
+} // namespace RangeRestrictedInt8s
+
+namespace RangeRestrictedInt16u {
+static constexpr AttributeId Id = 0x00000028;
+} // namespace RangeRestrictedInt16u
+
+namespace RangeRestrictedInt16s {
+static constexpr AttributeId Id = 0x00000029;
+} // namespace RangeRestrictedInt16s
+
+namespace ListLongOctetString {
+static constexpr AttributeId Id = 0x0000002A;
+} // namespace ListLongOctetString
+
+namespace ListFabricScoped {
+static constexpr AttributeId Id = 0x0000002B;
+} // namespace ListFabricScoped
+
+namespace TimedWriteBoolean {
+static constexpr AttributeId Id = 0x00000030;
+} // namespace TimedWriteBoolean
+
+namespace GeneralErrorBoolean {
+static constexpr AttributeId Id = 0x00000031;
+} // namespace GeneralErrorBoolean
+
+namespace ClusterErrorBoolean {
+static constexpr AttributeId Id = 0x00000032;
+} // namespace ClusterErrorBoolean
+
+namespace Unsupported {
+static constexpr AttributeId Id = 0x000000FF;
+} // namespace Unsupported
+
+namespace NullableBoolean {
+static constexpr AttributeId Id = 0x00004000;
+} // namespace NullableBoolean
+
+namespace NullableBitmap8 {
+static constexpr AttributeId Id = 0x00004001;
+} // namespace NullableBitmap8
+
+namespace NullableBitmap16 {
+static constexpr AttributeId Id = 0x00004002;
+} // namespace NullableBitmap16
+
+namespace NullableBitmap32 {
+static constexpr AttributeId Id = 0x00004003;
+} // namespace NullableBitmap32
+
+namespace NullableBitmap64 {
+static constexpr AttributeId Id = 0x00004004;
+} // namespace NullableBitmap64
+
+namespace NullableInt8u {
+static constexpr AttributeId Id = 0x00004005;
+} // namespace NullableInt8u
+
+namespace NullableInt16u {
+static constexpr AttributeId Id = 0x00004006;
+} // namespace NullableInt16u
+
+namespace NullableInt24u {
+static constexpr AttributeId Id = 0x00004007;
+} // namespace NullableInt24u
+
+namespace NullableInt32u {
+static constexpr AttributeId Id = 0x00004008;
+} // namespace NullableInt32u
+
+namespace NullableInt40u {
+static constexpr AttributeId Id = 0x00004009;
+} // namespace NullableInt40u
+
+namespace NullableInt48u {
+static constexpr AttributeId Id = 0x0000400A;
+} // namespace NullableInt48u
+
+namespace NullableInt56u {
+static constexpr AttributeId Id = 0x0000400B;
+} // namespace NullableInt56u
+
+namespace NullableInt64u {
+static constexpr AttributeId Id = 0x0000400C;
+} // namespace NullableInt64u
+
+namespace NullableInt8s {
+static constexpr AttributeId Id = 0x0000400D;
+} // namespace NullableInt8s
+
+namespace NullableInt16s {
+static constexpr AttributeId Id = 0x0000400E;
+} // namespace NullableInt16s
+
+namespace NullableInt24s {
+static constexpr AttributeId Id = 0x0000400F;
+} // namespace NullableInt24s
+
+namespace NullableInt32s {
+static constexpr AttributeId Id = 0x00004010;
+} // namespace NullableInt32s
+
+namespace NullableInt40s {
+static constexpr AttributeId Id = 0x00004011;
+} // namespace NullableInt40s
+
+namespace NullableInt48s {
+static constexpr AttributeId Id = 0x00004012;
+} // namespace NullableInt48s
+
+namespace NullableInt56s {
+static constexpr AttributeId Id = 0x00004013;
+} // namespace NullableInt56s
+
+namespace NullableInt64s {
+static constexpr AttributeId Id = 0x00004014;
+} // namespace NullableInt64s
+
+namespace NullableEnum8 {
+static constexpr AttributeId Id = 0x00004015;
+} // namespace NullableEnum8
+
+namespace NullableEnum16 {
+static constexpr AttributeId Id = 0x00004016;
+} // namespace NullableEnum16
+
+namespace NullableFloatSingle {
+static constexpr AttributeId Id = 0x00004017;
+} // namespace NullableFloatSingle
+
+namespace NullableFloatDouble {
+static constexpr AttributeId Id = 0x00004018;
+} // namespace NullableFloatDouble
+
+namespace NullableOctetString {
+static constexpr AttributeId Id = 0x00004019;
+} // namespace NullableOctetString
+
+namespace NullableCharString {
+static constexpr AttributeId Id = 0x0000401E;
+} // namespace NullableCharString
+
+namespace NullableEnumAttr {
+static constexpr AttributeId Id = 0x00004024;
+} // namespace NullableEnumAttr
+
+namespace NullableStruct {
+static constexpr AttributeId Id = 0x00004025;
+} // namespace NullableStruct
+
+namespace NullableRangeRestrictedInt8u {
+static constexpr AttributeId Id = 0x00004026;
+} // namespace NullableRangeRestrictedInt8u
+
+namespace NullableRangeRestrictedInt8s {
+static constexpr AttributeId Id = 0x00004027;
+} // namespace NullableRangeRestrictedInt8s
+
+namespace NullableRangeRestrictedInt16u {
+static constexpr AttributeId Id = 0x00004028;
+} // namespace NullableRangeRestrictedInt16u
+
+namespace NullableRangeRestrictedInt16s {
+static constexpr AttributeId Id = 0x00004029;
+} // namespace NullableRangeRestrictedInt16s
+
+namespace GeneratedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
+} // namespace GeneratedCommandList
+
+namespace AcceptedCommandList {
+static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id;
+} // namespace AcceptedCommandList
+
+namespace AttributeList {
+static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id;
+} // namespace AttributeList
+
+namespace FeatureMap {
+static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id;
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace TestCluster
+
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
index f313e9b37cca0b..4c4d17c7a13210 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
@@ -310,15 +310,6 @@ static constexpr ClusterId Id = 0x00000428;
 namespace SodiumConcentrationMeasurement {
 static constexpr ClusterId Id = 0x00000429;
 } // namespace SodiumConcentrationMeasurement
-namespace IasZone {
-static constexpr ClusterId Id = 0x00000500;
-} // namespace IasZone
-namespace IasAce {
-static constexpr ClusterId Id = 0x00000501;
-} // namespace IasAce
-namespace IasWd {
-static constexpr ClusterId Id = 0x00000502;
-} // namespace IasWd
 namespace WakeOnLan {
 static constexpr ClusterId Id = 0x00000503;
 } // namespace WakeOnLan
@@ -355,9 +346,6 @@ static constexpr ClusterId Id = 0x0000050D;
 namespace AccountLogin {
 static constexpr ClusterId Id = 0x0000050E;
 } // namespace AccountLogin
-namespace TestCluster {
-static constexpr ClusterId Id = 0x0000050F;
-} // namespace TestCluster
 namespace Messaging {
 static constexpr ClusterId Id = 0x00000703;
 } // namespace Messaging
@@ -376,6 +364,9 @@ static constexpr ClusterId Id = 0x00000B03;
 namespace ElectricalMeasurement {
 static constexpr ClusterId Id = 0x00000B04;
 } // namespace ElectricalMeasurement
+namespace TestCluster {
+static constexpr ClusterId Id = 0xFFF1FC05;
+} // namespace TestCluster
 
 } // namespace Clusters
 } // namespace app
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
index 042e1717dd1670..b4979dbe3dd9e3 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
@@ -234,6 +234,10 @@ namespace StopWithOnOff {
 static constexpr CommandId Id = 0x00000007;
 } // namespace StopWithOnOff
 
+namespace MoveToClosestFrequency {
+static constexpr CommandId Id = 0x00000008;
+} // namespace MoveToClosestFrequency
+
 } // namespace Commands
 } // namespace LevelControl
 
@@ -607,6 +611,16 @@ static constexpr CommandId Id = 0x00000001;
 } // namespace Commands
 } // namespace DiagnosticLogs
 
+namespace GeneralDiagnostics {
+namespace Commands {
+
+namespace TestEventTrigger {
+static constexpr CommandId Id = 0x00000000;
+} // namespace TestEventTrigger
+
+} // namespace Commands
+} // namespace GeneralDiagnostics
+
 namespace SoftwareDiagnostics {
 namespace Commands {
 
@@ -716,10 +730,6 @@ namespace AddTrustedRootCertificate {
 static constexpr CommandId Id = 0x0000000B;
 } // namespace AddTrustedRootCertificate
 
-namespace RemoveTrustedRootCertificate {
-static constexpr CommandId Id = 0x0000000C;
-} // namespace RemoveTrustedRootCertificate
-
 } // namespace Commands
 } // namespace OperationalCredentials
 
@@ -778,46 +788,6 @@ namespace UnlockWithTimeout {
 static constexpr CommandId Id = 0x00000003;
 } // namespace UnlockWithTimeout
 
-namespace GetLogRecord {
-static constexpr CommandId Id = 0x00000004;
-} // namespace GetLogRecord
-
-namespace GetLogRecordResponse {
-static constexpr CommandId Id = 0x00000004;
-} // namespace GetLogRecordResponse
-
-namespace SetPINCode {
-static constexpr CommandId Id = 0x00000005;
-} // namespace SetPINCode
-
-namespace GetPINCode {
-static constexpr CommandId Id = 0x00000006;
-} // namespace GetPINCode
-
-namespace GetPINCodeResponse {
-static constexpr CommandId Id = 0x00000006;
-} // namespace GetPINCodeResponse
-
-namespace ClearPINCode {
-static constexpr CommandId Id = 0x00000007;
-} // namespace ClearPINCode
-
-namespace ClearAllPINCodes {
-static constexpr CommandId Id = 0x00000008;
-} // namespace ClearAllPINCodes
-
-namespace SetUserStatus {
-static constexpr CommandId Id = 0x00000009;
-} // namespace SetUserStatus
-
-namespace GetUserStatus {
-static constexpr CommandId Id = 0x0000000A;
-} // namespace GetUserStatus
-
-namespace GetUserStatusResponse {
-static constexpr CommandId Id = 0x0000000A;
-} // namespace GetUserStatusResponse
-
 namespace SetWeekDaySchedule {
 static constexpr CommandId Id = 0x0000000B;
 } // namespace SetWeekDaySchedule
@@ -866,38 +836,6 @@ namespace ClearHolidaySchedule {
 static constexpr CommandId Id = 0x00000013;
 } // namespace ClearHolidaySchedule
 
-namespace SetUserType {
-static constexpr CommandId Id = 0x00000014;
-} // namespace SetUserType
-
-namespace GetUserType {
-static constexpr CommandId Id = 0x00000015;
-} // namespace GetUserType
-
-namespace GetUserTypeResponse {
-static constexpr CommandId Id = 0x00000015;
-} // namespace GetUserTypeResponse
-
-namespace SetRFIDCode {
-static constexpr CommandId Id = 0x00000016;
-} // namespace SetRFIDCode
-
-namespace GetRFIDCode {
-static constexpr CommandId Id = 0x00000017;
-} // namespace GetRFIDCode
-
-namespace GetRFIDCodeResponse {
-static constexpr CommandId Id = 0x00000017;
-} // namespace GetRFIDCodeResponse
-
-namespace ClearRFIDCode {
-static constexpr CommandId Id = 0x00000018;
-} // namespace ClearRFIDCode
-
-namespace ClearAllRFIDCodes {
-static constexpr CommandId Id = 0x00000019;
-} // namespace ClearAllRFIDCodes
-
 namespace SetUser {
 static constexpr CommandId Id = 0x0000001A;
 } // namespace SetUser
@@ -914,14 +852,6 @@ namespace ClearUser {
 static constexpr CommandId Id = 0x0000001D;
 } // namespace ClearUser
 
-namespace OperatingEventNotification {
-static constexpr CommandId Id = 0x00000020;
-} // namespace OperatingEventNotification
-
-namespace ProgrammingEventNotification {
-static constexpr CommandId Id = 0x00000021;
-} // namespace ProgrammingEventNotification
-
 namespace SetCredential {
 static constexpr CommandId Id = 0x00000022;
 } // namespace SetCredential
@@ -1008,10 +938,6 @@ namespace SetWeeklySchedule {
 static constexpr CommandId Id = 0x00000001;
 } // namespace SetWeeklySchedule
 
-namespace GetRelayStatusLogResponse {
-static constexpr CommandId Id = 0x00000001;
-} // namespace GetRelayStatusLogResponse
-
 namespace GetWeeklySchedule {
 static constexpr CommandId Id = 0x00000002;
 } // namespace GetWeeklySchedule
@@ -1020,10 +946,6 @@ namespace ClearWeeklySchedule {
 static constexpr CommandId Id = 0x00000003;
 } // namespace ClearWeeklySchedule
 
-namespace GetRelayStatusLog {
-static constexpr CommandId Id = 0x00000004;
-} // namespace GetRelayStatusLog
-
 } // namespace Commands
 } // namespace Thermostat
 
@@ -1109,136 +1031,6 @@ static constexpr CommandId Id = 0x0000004C;
 } // namespace Commands
 } // namespace ColorControl
 
-namespace IasZone {
-namespace Commands {
-
-namespace ZoneEnrollResponse {
-static constexpr CommandId Id = 0x00000000;
-} // namespace ZoneEnrollResponse
-
-namespace ZoneStatusChangeNotification {
-static constexpr CommandId Id = 0x00000000;
-} // namespace ZoneStatusChangeNotification
-
-namespace InitiateNormalOperationMode {
-static constexpr CommandId Id = 0x00000001;
-} // namespace InitiateNormalOperationMode
-
-namespace ZoneEnrollRequest {
-static constexpr CommandId Id = 0x00000001;
-} // namespace ZoneEnrollRequest
-
-namespace InitiateTestMode {
-static constexpr CommandId Id = 0x00000002;
-} // namespace InitiateTestMode
-
-namespace InitiateNormalOperationModeResponse {
-static constexpr CommandId Id = 0x00000002;
-} // namespace InitiateNormalOperationModeResponse
-
-namespace InitiateTestModeResponse {
-static constexpr CommandId Id = 0x00000003;
-} // namespace InitiateTestModeResponse
-
-} // namespace Commands
-} // namespace IasZone
-
-namespace IasAce {
-namespace Commands {
-
-namespace Arm {
-static constexpr CommandId Id = 0x00000000;
-} // namespace Arm
-
-namespace ArmResponse {
-static constexpr CommandId Id = 0x00000000;
-} // namespace ArmResponse
-
-namespace Bypass {
-static constexpr CommandId Id = 0x00000001;
-} // namespace Bypass
-
-namespace GetZoneIdMapResponse {
-static constexpr CommandId Id = 0x00000001;
-} // namespace GetZoneIdMapResponse
-
-namespace Emergency {
-static constexpr CommandId Id = 0x00000002;
-} // namespace Emergency
-
-namespace GetZoneInformationResponse {
-static constexpr CommandId Id = 0x00000002;
-} // namespace GetZoneInformationResponse
-
-namespace Fire {
-static constexpr CommandId Id = 0x00000003;
-} // namespace Fire
-
-namespace ZoneStatusChanged {
-static constexpr CommandId Id = 0x00000003;
-} // namespace ZoneStatusChanged
-
-namespace Panic {
-static constexpr CommandId Id = 0x00000004;
-} // namespace Panic
-
-namespace PanelStatusChanged {
-static constexpr CommandId Id = 0x00000004;
-} // namespace PanelStatusChanged
-
-namespace GetZoneIdMap {
-static constexpr CommandId Id = 0x00000005;
-} // namespace GetZoneIdMap
-
-namespace GetPanelStatusResponse {
-static constexpr CommandId Id = 0x00000005;
-} // namespace GetPanelStatusResponse
-
-namespace GetZoneInformation {
-static constexpr CommandId Id = 0x00000006;
-} // namespace GetZoneInformation
-
-namespace SetBypassedZoneList {
-static constexpr CommandId Id = 0x00000006;
-} // namespace SetBypassedZoneList
-
-namespace GetPanelStatus {
-static constexpr CommandId Id = 0x00000007;
-} // namespace GetPanelStatus
-
-namespace BypassResponse {
-static constexpr CommandId Id = 0x00000007;
-} // namespace BypassResponse
-
-namespace GetBypassedZoneList {
-static constexpr CommandId Id = 0x00000008;
-} // namespace GetBypassedZoneList
-
-namespace GetZoneStatusResponse {
-static constexpr CommandId Id = 0x00000008;
-} // namespace GetZoneStatusResponse
-
-namespace GetZoneStatus {
-static constexpr CommandId Id = 0x00000009;
-} // namespace GetZoneStatus
-
-} // namespace Commands
-} // namespace IasAce
-
-namespace IasWd {
-namespace Commands {
-
-namespace StartWarning {
-static constexpr CommandId Id = 0x00000000;
-} // namespace StartWarning
-
-namespace Squawk {
-static constexpr CommandId Id = 0x00000001;
-} // namespace Squawk
-
-} // namespace Commands
-} // namespace IasWd
-
 namespace Channel {
 namespace Commands {
 
@@ -1451,6 +1243,114 @@ static constexpr CommandId Id = 0x00000003;
 } // namespace Commands
 } // namespace AccountLogin
 
+namespace Messaging {
+namespace Commands {
+
+namespace DisplayMessage {
+static constexpr CommandId Id = 0x00000000;
+} // namespace DisplayMessage
+
+namespace GetLastMessage {
+static constexpr CommandId Id = 0x00000000;
+} // namespace GetLastMessage
+
+namespace CancelMessage {
+static constexpr CommandId Id = 0x00000001;
+} // namespace CancelMessage
+
+namespace MessageConfirmation {
+static constexpr CommandId Id = 0x00000001;
+} // namespace MessageConfirmation
+
+namespace DisplayProtectedMessage {
+static constexpr CommandId Id = 0x00000002;
+} // namespace DisplayProtectedMessage
+
+namespace GetMessageCancellation {
+static constexpr CommandId Id = 0x00000002;
+} // namespace GetMessageCancellation
+
+namespace CancelAllMessages {
+static constexpr CommandId Id = 0x00000003;
+} // namespace CancelAllMessages
+
+} // namespace Commands
+} // namespace Messaging
+
+namespace ApplianceEventsAndAlert {
+namespace Commands {
+
+namespace GetAlerts {
+static constexpr CommandId Id = 0x00000000;
+} // namespace GetAlerts
+
+namespace GetAlertsResponse {
+static constexpr CommandId Id = 0x00000000;
+} // namespace GetAlertsResponse
+
+namespace AlertsNotification {
+static constexpr CommandId Id = 0x00000001;
+} // namespace AlertsNotification
+
+namespace EventsNotification {
+static constexpr CommandId Id = 0x00000002;
+} // namespace EventsNotification
+
+} // namespace Commands
+} // namespace ApplianceEventsAndAlert
+
+namespace ApplianceStatistics {
+namespace Commands {
+
+namespace LogNotification {
+static constexpr CommandId Id = 0x00000000;
+} // namespace LogNotification
+
+namespace LogRequest {
+static constexpr CommandId Id = 0x00000000;
+} // namespace LogRequest
+
+namespace LogResponse {
+static constexpr CommandId Id = 0x00000001;
+} // namespace LogResponse
+
+namespace LogQueueRequest {
+static constexpr CommandId Id = 0x00000001;
+} // namespace LogQueueRequest
+
+namespace LogQueueResponse {
+static constexpr CommandId Id = 0x00000002;
+} // namespace LogQueueResponse
+
+namespace StatisticsAvailable {
+static constexpr CommandId Id = 0x00000003;
+} // namespace StatisticsAvailable
+
+} // namespace Commands
+} // namespace ApplianceStatistics
+
+namespace ElectricalMeasurement {
+namespace Commands {
+
+namespace GetProfileInfoResponseCommand {
+static constexpr CommandId Id = 0x00000000;
+} // namespace GetProfileInfoResponseCommand
+
+namespace GetProfileInfoCommand {
+static constexpr CommandId Id = 0x00000000;
+} // namespace GetProfileInfoCommand
+
+namespace GetMeasurementProfileResponseCommand {
+static constexpr CommandId Id = 0x00000001;
+} // namespace GetMeasurementProfileResponseCommand
+
+namespace GetMeasurementProfileCommand {
+static constexpr CommandId Id = 0x00000001;
+} // namespace GetMeasurementProfileCommand
+
+} // namespace Commands
+} // namespace ElectricalMeasurement
+
 namespace TestCluster {
 namespace Commands {
 
@@ -1593,114 +1493,6 @@ static constexpr CommandId Id = 0x00000015;
 } // namespace Commands
 } // namespace TestCluster
 
-namespace Messaging {
-namespace Commands {
-
-namespace DisplayMessage {
-static constexpr CommandId Id = 0x00000000;
-} // namespace DisplayMessage
-
-namespace GetLastMessage {
-static constexpr CommandId Id = 0x00000000;
-} // namespace GetLastMessage
-
-namespace CancelMessage {
-static constexpr CommandId Id = 0x00000001;
-} // namespace CancelMessage
-
-namespace MessageConfirmation {
-static constexpr CommandId Id = 0x00000001;
-} // namespace MessageConfirmation
-
-namespace DisplayProtectedMessage {
-static constexpr CommandId Id = 0x00000002;
-} // namespace DisplayProtectedMessage
-
-namespace GetMessageCancellation {
-static constexpr CommandId Id = 0x00000002;
-} // namespace GetMessageCancellation
-
-namespace CancelAllMessages {
-static constexpr CommandId Id = 0x00000003;
-} // namespace CancelAllMessages
-
-} // namespace Commands
-} // namespace Messaging
-
-namespace ApplianceEventsAndAlert {
-namespace Commands {
-
-namespace GetAlerts {
-static constexpr CommandId Id = 0x00000000;
-} // namespace GetAlerts
-
-namespace GetAlertsResponse {
-static constexpr CommandId Id = 0x00000000;
-} // namespace GetAlertsResponse
-
-namespace AlertsNotification {
-static constexpr CommandId Id = 0x00000001;
-} // namespace AlertsNotification
-
-namespace EventsNotification {
-static constexpr CommandId Id = 0x00000002;
-} // namespace EventsNotification
-
-} // namespace Commands
-} // namespace ApplianceEventsAndAlert
-
-namespace ApplianceStatistics {
-namespace Commands {
-
-namespace LogNotification {
-static constexpr CommandId Id = 0x00000000;
-} // namespace LogNotification
-
-namespace LogRequest {
-static constexpr CommandId Id = 0x00000000;
-} // namespace LogRequest
-
-namespace LogResponse {
-static constexpr CommandId Id = 0x00000001;
-} // namespace LogResponse
-
-namespace LogQueueRequest {
-static constexpr CommandId Id = 0x00000001;
-} // namespace LogQueueRequest
-
-namespace LogQueueResponse {
-static constexpr CommandId Id = 0x00000002;
-} // namespace LogQueueResponse
-
-namespace StatisticsAvailable {
-static constexpr CommandId Id = 0x00000003;
-} // namespace StatisticsAvailable
-
-} // namespace Commands
-} // namespace ApplianceStatistics
-
-namespace ElectricalMeasurement {
-namespace Commands {
-
-namespace GetProfileInfoResponseCommand {
-static constexpr CommandId Id = 0x00000000;
-} // namespace GetProfileInfoResponseCommand
-
-namespace GetProfileInfoCommand {
-static constexpr CommandId Id = 0x00000000;
-} // namespace GetProfileInfoCommand
-
-namespace GetMeasurementProfileResponseCommand {
-static constexpr CommandId Id = 0x00000001;
-} // namespace GetMeasurementProfileResponseCommand
-
-namespace GetMeasurementProfileCommand {
-static constexpr CommandId Id = 0x00000001;
-} // namespace GetMeasurementProfileCommand
-
-} // namespace Commands
-} // namespace ElectricalMeasurement
-
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
index 12ae28dcde6f69..a79175a20136da 100644
--- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
+++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
@@ -25,388 +25,385 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, "Power Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, "Device Temperature Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, "Identify" },
 #else
 #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, "Groups" },
 #else
 #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, "Scenes" },
 #else
 #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/Off" },
+#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, "On/Off" },
 #else
 #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, "On/off Switch Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, "Level Control" },
 #else
 #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, "Alarms" },
 #else
 #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, "Time" },
 #else
 #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, "Binary Input (Basic)" },
 #else
 #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, "Power Profile" },
 #else
 #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, "Appliance Control" },
 #else
 #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PWM_CLUSTER_SERVER) || defined(ZCL_USING_PWM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PWM_CLUSTER { ZCL_PWM_CLUSTER_ID, 28, "Pulse Width Modulation" },
+#define CHIP_PRINTCLUSTER_PWM_CLUSTER { ZCL_PWM_CLUSTER_ID, "Pulse Width Modulation" },
 #else
 #define CHIP_PRINTCLUSTER_PWM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, "Descriptor" },
 #else
 #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 30, "Binding" },
+#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, "Binding" },
 #else
 #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_ACCESS_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER { ZCL_ACCESS_CONTROL_CLUSTER_ID, 31, "Access Control" },
+#define CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER { ZCL_ACCESS_CONTROL_CLUSTER_ID, "Access Control" },
 #else
 #define CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, "Poll Control" },
 #else
 #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER) || defined(ZCL_USING_BRIDGED_ACTIONS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER { ZCL_BRIDGED_ACTIONS_CLUSTER_ID, 37, "Bridged Actions" },
+#define CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER { ZCL_BRIDGED_ACTIONS_CLUSTER_ID, "Bridged Actions" },
 #else
 #define CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, "Basic" },
 #else
 #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER) || defined(ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER { ZCL_OTA_PROVIDER_CLUSTER_ID, 41, "OTA Software Update Provider" },
+#define CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER { ZCL_OTA_PROVIDER_CLUSTER_ID, "OTA Software Update Provider" },
 #else
 #define CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER) || defined(ZCL_USING_OTA_REQUESTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER { ZCL_OTA_REQUESTOR_CLUSTER_ID, 42, "OTA Software Update Requestor" },
+#define CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER { ZCL_OTA_REQUESTOR_CLUSTER_ID, "OTA Software Update Requestor" },
 #else
 #define CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_LOCALIZATION_CONFIGURATION_CLUSTER                                                                       \
-    { ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID, 43, "Localization Configuration" },
+    { ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID, "Localization Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_LOCALIZATION_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER) || defined(ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER                                                                         \
-    { ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID, 44, "Time Format Localization" },
+#define CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER { ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID, "Time Format Localization" },
 #else
 #define CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER) || defined(ZCL_USING_UNIT_LOCALIZATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_UNIT_LOCALIZATION_CLUSTER { ZCL_UNIT_LOCALIZATION_CLUSTER_ID, 45, "Unit Localization" },
+#define CHIP_PRINTCLUSTER_UNIT_LOCALIZATION_CLUSTER { ZCL_UNIT_LOCALIZATION_CLUSTER_ID, "Unit Localization" },
 #else
 #define CHIP_PRINTCLUSTER_UNIT_LOCALIZATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_POWER_SOURCE_CONFIGURATION_CLUSTER                                                                       \
-    { ZCL_POWER_SOURCE_CONFIGURATION_CLUSTER_ID, 46, "Power Source Configuration" },
+    { ZCL_POWER_SOURCE_CONFIGURATION_CLUSTER_ID, "Power Source Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_POWER_SOURCE_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_SOURCE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_SOURCE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_SOURCE_CLUSTER { ZCL_POWER_SOURCE_CLUSTER_ID, 47, "Power Source" },
+#define CHIP_PRINTCLUSTER_POWER_SOURCE_CLUSTER { ZCL_POWER_SOURCE_CLUSTER_ID, "Power Source" },
 #else
 #define CHIP_PRINTCLUSTER_POWER_SOURCE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, "General Commissioning" },
 #else
 #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, "Network Commissioning" },
 #else
 #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTIC_LOGS_CLUSTER { ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID, 50, "Diagnostic Logs" },
+#define CHIP_PRINTCLUSTER_DIAGNOSTIC_LOGS_CLUSTER { ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID, "Diagnostic Logs" },
 #else
 #define CHIP_PRINTCLUSTER_DIAGNOSTIC_LOGS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_DIAGNOSTICS_CLUSTER { ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID, 51, "General Diagnostics" },
+#define CHIP_PRINTCLUSTER_GENERAL_DIAGNOSTICS_CLUSTER { ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID, "General Diagnostics" },
 #else
 #define CHIP_PRINTCLUSTER_GENERAL_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SOFTWARE_DIAGNOSTICS_CLUSTER { ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID, 52, "Software Diagnostics" },
+#define CHIP_PRINTCLUSTER_SOFTWARE_DIAGNOSTICS_CLUSTER { ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID, "Software Diagnostics" },
 #else
 #define CHIP_PRINTCLUSTER_SOFTWARE_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_THREAD_NETWORK_DIAGNOSTICS_CLUSTER                                                                       \
-    { ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID, 53, "Thread Network Diagnostics" },
+    { ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID, "Thread Network Diagnostics" },
 #else
 #define CHIP_PRINTCLUSTER_THREAD_NETWORK_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WIFI_NETWORK_DIAGNOSTICS_CLUSTER                                                                         \
-    { ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID, 54, "WiFi Network Diagnostics" },
+#define CHIP_PRINTCLUSTER_WIFI_NETWORK_DIAGNOSTICS_CLUSTER { ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID, "WiFi Network Diagnostics" },
 #else
 #define CHIP_PRINTCLUSTER_WIFI_NETWORK_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER                                                                     \
-    { ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID, 55, "Ethernet Network Diagnostics" },
+    { ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID, "Ethernet Network Diagnostics" },
 #else
 #define CHIP_PRINTCLUSTER_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_SYNCHRONIZATION_CLUSTER_SERVER) || defined(ZCL_USING_TIME_SYNCHRONIZATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_SYNCHRONIZATION_CLUSTER { ZCL_TIME_SYNCHRONIZATION_CLUSTER_ID, 56, "Time Synchronization" },
+#define CHIP_PRINTCLUSTER_TIME_SYNCHRONIZATION_CLUSTER { ZCL_TIME_SYNCHRONIZATION_CLUSTER_ID, "Time Synchronization" },
 #else
 #define CHIP_PRINTCLUSTER_TIME_SYNCHRONIZATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_CLUSTER { ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, 57, "Bridged Device Basic" },
+#define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_CLUSTER { ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, "Bridged Device Basic" },
 #else
 #define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SWITCH_CLUSTER_SERVER) || defined(ZCL_USING_SWITCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SWITCH_CLUSTER { ZCL_SWITCH_CLUSTER_ID, 59, "Switch" },
+#define CHIP_PRINTCLUSTER_SWITCH_CLUSTER { ZCL_SWITCH_CLUSTER_ID, "Switch" },
 #else
 #define CHIP_PRINTCLUSTER_SWITCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER                                                                      \
-    { ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID, 60, "AdministratorCommissioning" },
+    { ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID, "AdministratorCommissioning" },
 #else
 #define CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER) || defined(ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OPERATIONAL_CREDENTIALS_CLUSTER { ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID, 62, "Operational Credentials" },
+#define CHIP_PRINTCLUSTER_OPERATIONAL_CREDENTIALS_CLUSTER { ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID, "Operational Credentials" },
 #else
 #define CHIP_PRINTCLUSTER_OPERATIONAL_CREDENTIALS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 63, "Group Key Management" },
+#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, "Group Key Management" },
 #else
 #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FIXED_LABEL_CLUSTER_SERVER) || defined(ZCL_USING_FIXED_LABEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FIXED_LABEL_CLUSTER { ZCL_FIXED_LABEL_CLUSTER_ID, 64, "Fixed Label" },
+#define CHIP_PRINTCLUSTER_FIXED_LABEL_CLUSTER { ZCL_FIXED_LABEL_CLUSTER_ID, "Fixed Label" },
 #else
 #define CHIP_PRINTCLUSTER_FIXED_LABEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_USER_LABEL_CLUSTER_SERVER) || defined(ZCL_USING_USER_LABEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_USER_LABEL_CLUSTER { ZCL_USER_LABEL_CLUSTER_ID, 65, "User Label" },
+#define CHIP_PRINTCLUSTER_USER_LABEL_CLUSTER { ZCL_USER_LABEL_CLUSTER_ID, "User Label" },
 #else
 #define CHIP_PRINTCLUSTER_USER_LABEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PROXY_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_PROXY_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PROXY_CONFIGURATION_CLUSTER { ZCL_PROXY_CONFIGURATION_CLUSTER_ID, 66, "Proxy Configuration" },
+#define CHIP_PRINTCLUSTER_PROXY_CONFIGURATION_CLUSTER { ZCL_PROXY_CONFIGURATION_CLUSTER_ID, "Proxy Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_PROXY_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PROXY_DISCOVERY_CLUSTER_SERVER) || defined(ZCL_USING_PROXY_DISCOVERY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PROXY_DISCOVERY_CLUSTER { ZCL_PROXY_DISCOVERY_CLUSTER_ID, 67, "Proxy Discovery" },
+#define CHIP_PRINTCLUSTER_PROXY_DISCOVERY_CLUSTER { ZCL_PROXY_DISCOVERY_CLUSTER_ID, "Proxy Discovery" },
 #else
 #define CHIP_PRINTCLUSTER_PROXY_DISCOVERY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PROXY_VALID_CLUSTER_SERVER) || defined(ZCL_USING_PROXY_VALID_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER { ZCL_PROXY_VALID_CLUSTER_ID, 68, "Proxy Valid" },
+#define CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER { ZCL_PROXY_VALID_CLUSTER_ID, "Proxy Valid" },
 #else
 #define CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER) || defined(ZCL_USING_BOOLEAN_STATE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER { ZCL_BOOLEAN_STATE_CLUSTER_ID, 69, "Boolean State" },
+#define CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER { ZCL_BOOLEAN_STATE_CLUSTER_ID, "Boolean State" },
 #else
 #define CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MODE_SELECT_CLUSTER_SERVER) || defined(ZCL_USING_MODE_SELECT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER { ZCL_MODE_SELECT_CLUSTER_ID, 80, "Mode Select" },
+#define CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER { ZCL_MODE_SELECT_CLUSTER_ID, "Mode Select" },
 #else
 #define CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, "Shade Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, "Door Lock" },
 #else
 #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, "Window Covering" },
 #else
 #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, "Barrier Control" },
 #else
 #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, "Pump Configuration and Control" },
 #else
 #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, "Thermostat" },
 #else
 #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, "Fan Control" },
 #else
 #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, "Dehumidification Control" },
 #else
 #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, "Thermostat User Interface Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, "Color Control" },
 #else
 #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, "Ballast Configuration" },
 #else
 #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUMINANCE_MEASUREMENT_CLUSTER                                                                          \
-    { ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+#define CHIP_PRINTCLUSTER_ILLUMINANCE_MEASUREMENT_CLUSTER { ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID, "Illuminance Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_ILLUMINANCE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, "Temperature Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, "Pressure Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, "Flow Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
@@ -414,13 +411,13 @@
 #if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
     defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, "Relative Humidity Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, "Occupancy Sensing" },
 #else
 #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
@@ -428,7 +425,7 @@
 #if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
     defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Carbon Monoxide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -436,7 +433,7 @@
 #if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
     defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Carbon Dioxide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -444,7 +441,7 @@
 #if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
     defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Ethylene Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -452,7 +449,7 @@
 #if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
     defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Ethylene Oxide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -460,7 +457,7 @@
 #if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
     defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Hydrogen Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -468,7 +465,7 @@
 #if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
     defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Hydrogen Sulphide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -476,7 +473,7 @@
 #if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
     defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Nitric Oxide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -484,7 +481,7 @@
 #if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
     defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Nitrogen Dioxide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -492,7 +489,7 @@
 #if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
     defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Oxygen Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -500,7 +497,7 @@
 #if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
     defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Ozone Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -508,7 +505,7 @@
 #if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
     defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Sulfur Dioxide Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -516,7 +513,7 @@
 #if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
     defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Dissolved Oxygen Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -524,7 +521,7 @@
 #if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
     defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Bromate Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -532,7 +529,7 @@
 #if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
     defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Chloramines Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -540,7 +537,7 @@
 #if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
     defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Chlorine Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -548,8 +545,7 @@
 #if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
     defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -557,7 +553,7 @@
 #if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
     defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Fluoride Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -565,7 +561,7 @@
 #if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
     defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Haloacetic Acids Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -573,7 +569,7 @@
 #if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
     defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Total Trihalomethanes Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -581,7 +577,7 @@
 #if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
     defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Total Coliform Bacteria Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -589,7 +585,7 @@
 #if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
     defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Turbidity Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -597,7 +593,7 @@
 #if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
     defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Copper Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -605,7 +601,7 @@
 #if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
     defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Lead Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -613,7 +609,7 @@
 #if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
     defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Manganese Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -621,7 +617,7 @@
 #if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
     defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Sulfate Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -629,7 +625,7 @@
 #if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
     defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Bromodichloromethane Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -637,7 +633,7 @@
 #if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
     defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Bromoform Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -645,7 +641,7 @@
 #if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
     defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Chlorodibromomethane Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -653,7 +649,7 @@
 #if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
     defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Chloroform Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
@@ -661,145 +657,126 @@
 #if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
     defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, "Sodium Concentration Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
-#else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
-#endif
-
-#if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
-#else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
-#endif
-
-#if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
-#else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
-#endif
-
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, "Wake on LAN" },
 #else
 #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHANNEL_CLUSTER { ZCL_CHANNEL_CLUSTER_ID, 1284, "Channel" },
+#define CHIP_PRINTCLUSTER_CHANNEL_CLUSTER { ZCL_CHANNEL_CLUSTER_ID, "Channel" },
 #else
 #define CHIP_PRINTCLUSTER_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, "Target Navigator" },
 #else
 #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, "Media Playback" },
 #else
 #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, "Media Input" },
 #else
 #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, "Low Power" },
 #else
 #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, "Keypad Input" },
 #else
 #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launcher" },
+#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, "Content Launcher" },
 #else
 #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, "Audio Output" },
 #else
 #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, "Application Launcher" },
 #else
 #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, "Application Basic" },
 #else
 #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, "Account Login" },
 #else
 #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TEST_CLUSTER_SERVER) || defined(ZCL_USING_TEST_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEST_CLUSTER { ZCL_TEST_CLUSTER_ID, 1295, "Test Cluster" },
-#else
-#define CHIP_PRINTCLUSTER_TEST_CLUSTER
-#endif
-
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, "Messaging" },
 #else
 #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, "Appliance Identification" },
 #else
 #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, "Meter Identification" },
 #else
 #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, "Appliance Events and Alert" },
 #else
 #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, "Appliance Statistics" },
 #else
 #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, "Electrical Measurement" },
 #else
 #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
+#if defined(ZCL_USING_TEST_CLUSTER_SERVER) || defined(ZCL_USING_TEST_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_TEST_CLUSTER { ZCL_TEST_CLUSTER_ID, "Test Cluster" },
+#else
+#define CHIP_PRINTCLUSTER_TEST_CLUSTER
+#endif
+
 #define CLUSTER_IDS_TO_NAMES                                                                                                       \
     CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
     CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
@@ -896,9 +873,6 @@
     CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
     CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
     CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
     CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_CHANNEL_CLUSTER                                                                                              \
     CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
@@ -911,12 +885,12 @@
     CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
     CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
     CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_TEST_CLUSTER                                                                                                 \
     CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
     CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
     CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
     CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
     CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
+    CHIP_PRINTCLUSTER_TEST_CLUSTER
 
 #define MAX_CLUSTER_NAME_LENGTH 52
diff --git a/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h
index 8c19024e86dfdc..8600cae67484a1 100644
--- a/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h
@@ -37,5 +37,18 @@ typedef void (*AccessControlAclListAttributeCallback)(
 typedef void (*AccessControlExtensionListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & data);
+typedef void (*AccessControlGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*AccessControlAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*AccessControlAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*BindingBindingListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
+typedef void (*BindingGeneratedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BindingAttributeListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/zzz_generated/bridge-app/zap-generated/CHIPClusters.h b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h
index 9f5073338704b1..2b8d6be3f76f10 100644
--- a/zzz_generated/bridge-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h
@@ -37,5 +37,12 @@ class DLL_EXPORT AccessControlCluster : public ClusterBase
     ~AccessControlCluster() {}
 };
 
+class DLL_EXPORT BindingCluster : public ClusterBase
+{
+public:
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
+};
+
 } // namespace Controller
 } // namespace chip
diff --git a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
index 10d76b6fc10dd3..ab2cbd240a5998 100644
--- a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,153 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
+namespace Identify {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::Identify::Id: {
+            Commands::Identify::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfIdentifyClusterIdentifyCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::TriggerEffect::Id: {
+            Commands::TriggerEffect::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfIdentifyClusterTriggerEffectCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace Identify
+
 namespace LevelControl {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -515,16 +662,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -561,6 +698,15 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::Identify::Id:
+        Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::LevelControl::Id:
         Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
index 0902df70661b0c..c4d061504588cc 100644
--- a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
@@ -26,12 +26,15 @@
     MatterAccessControlPluginServerInitCallback();                                                                                 \
     MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterBridgedActionsPluginServerInitCallback();                                                                                \
     MatterDescriptorPluginServerInitCallback();                                                                                    \
     MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
     MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
diff --git a/zzz_generated/bridge-app/zap-generated/access.h b/zzz_generated/bridge-app/zap-generated/access.h
index bf9386f8e1a709..eb6bab6034bfba 100644
--- a/zzz_generated/bridge-app/zap-generated/access.h
+++ b/zzz_generated/bridge-app/zap-generated/access.h
@@ -38,6 +38,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -60,6 +61,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -82,6 +84,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -103,6 +106,7 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
@@ -116,6 +120,7 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
@@ -129,6 +134,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
@@ -144,6 +150,12 @@
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -158,7 +170,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -169,6 +180,12 @@
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -183,7 +200,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -194,6 +210,12 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -208,7 +230,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
index 319a43152e3933..7eeef79f72fcc9 100644
--- a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
@@ -38,6 +38,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_BASIC_CLUSTER_ID:
         emberAfBasicClusterInitCallback(endpoint);
         break;
+    case ZCL_BINDING_CLUSTER_ID:
+        emberAfBindingClusterInitCallback(endpoint);
+        break;
+    case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
+        emberAfBridgedActionsClusterInitCallback(endpoint);
+        break;
     case ZCL_DESCRIPTOR_CLUSTER_ID:
         emberAfDescriptorClusterInitCallback(endpoint);
         break;
@@ -47,15 +53,18 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID:
         emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
         break;
-    case ZCL_FIXED_LABEL_CLUSTER_ID:
-        emberAfFixedLabelClusterInitCallback(endpoint);
-        break;
     case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
         emberAfGeneralCommissioningClusterInitCallback(endpoint);
         break;
     case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID:
         emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
         break;
+    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
+    case ZCL_IDENTIFY_CLUSTER_ID:
+        emberAfIdentifyClusterInitCallback(endpoint);
+        break;
     case ZCL_LEVEL_CONTROL_CLUSTER_ID:
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
@@ -113,6 +122,16 @@ void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint)
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfBindingClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -128,17 +147,22 @@ void __attribute__((weak)) emberAfEthernetNetworkDiagnosticsClusterInitCallback(
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfFixedLabelClusterInitCallback(EndpointId endpoint)
+void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(EndpointId endpoint)
+void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint)
+void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
     (void) endpoint;
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
index c74e8d6047b63e..30a995e86f6f4a 100644
--- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
@@ -38,26 +38,6 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #else // !BIGENDIAN_CPU
@@ -73,31 +53,11 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (8)
+#define GENERATED_DEFAULTS_COUNT (2)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -125,12 +85,12 @@
         /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                              \
         { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */                                                       \
                                                                                                                                    \
-        /* Endpoint: 1, Cluster: Level Control (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 } /* options */        \
+        /* Endpoint: 2, Cluster: Level Control (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 } /* options */        \
     }
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 225
+#define GENERATED_ATTRIBUTE_COUNT 240
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -264,7 +224,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -278,69 +240,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                          /* ActiveNetworkFaultsList */                        \
@@ -410,10 +405,16 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
-            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: User Label (server) */                                                                        \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
@@ -421,15 +422,35 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
+            /* Endpoint: 1, Cluster: Identify (server) */                                                                          \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0) }, /* identify time */        \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x0) },                             /* identify type */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                            /* FeatureMap */           \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },                              /* ClusterRevision */      \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* device list */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* server list */       \
+            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* client list */       \
+            { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* parts list */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 1, Cluster: Bridged Actions (server) */                                                                   \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */     \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+                                                                                                                                   \
+            /* Endpoint: 2, Cluster: On/Off (server) */                                                                            \
             { 0x00000000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */                                         \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },   /* FeatureMap */                                    \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },     /* ClusterRevision */                               \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
+            /* Endpoint: 2, Cluster: Level Control (server) */                                                                     \
             { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x00) }, /* current level */        \
             { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* remaining time */       \
-            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                            /* min level */            \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                            /* min level */            \
             { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xFE) },                            /* max level */            \
             { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* current frequency */    \
             { 0x00000005, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* min frequency */        \
@@ -452,7 +473,7 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(3) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
+            /* Endpoint: 2, Cluster: Descriptor (server) */                                                                        \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
             { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
             { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
@@ -460,17 +481,12 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Switch (server) */                                                                            \
+            /* Endpoint: 2, Cluster: Switch (server) */                                                                            \
             { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },    /* number of positions */                             \
             { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) },    /* current position */                                \
             { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) },    /* multi press max */                                 \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Fixed Label (server) */                                                                       \
-            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
     }
 
 // This is an array of EmberAfCluster structures.
@@ -491,6 +507,10 @@
         (EmberAfGenericClusterFunction) emberAfTimeFormatLocalizationClusterServerInitCallback,                                    \
         (EmberAfGenericClusterFunction) MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback,                      \
     };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
+        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
+        (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback,                                       \
+    };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
         (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
     };                                                                                                                             \
@@ -532,22 +552,19 @@
   /*   GeneratedCommandList (index=21)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=23) */ \
-  0x00000000 /* ResetWatermarks */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=25) */ \
-  0x00000000 /* ResetCounts */, \
+  0x00000000 /* TestEventTrigger */, \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=27) */ \
+  /*   AcceptedCommandList (index=26) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=31) */ \
+  /*   AcceptedCommandList (index=30) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -556,22 +573,37 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=41)*/ \
+  /*   GeneratedCommandList (index=39)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=46) */ \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=44) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=49)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Identify (server) */\
+  /*   AcceptedCommandList (index=52) */ \
+  0x00000000 /* Identify */, \
+  0x00000040 /* TriggerEffect */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 2, Cluster: On/Off (server) */\
+  /*   AcceptedCommandList (index=55) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=50) */ \
+  /* Endpoint: 2, Cluster: Level Control (server) */\
+  /*   AcceptedCommandList (index=59) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -586,7 +618,7 @@
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 24
+#define GENERATED_CLUSTER_COUNT 27
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
@@ -704,30 +736,30 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(66), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(76), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(77), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(83), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr ,\
@@ -736,7 +768,7 @@
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(147), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(148), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -747,51 +779,51 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(162), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(163), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(173), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(174), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
     },\
   { \
-      /* Endpoint: 0, Cluster: Fixed Label (server) */ \
-      .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
-      .attributeCount = 3, \
+      /* Endpoint: 0, Cluster: Group Key Management (server) */ \
+      .clusterId = 0x0000003F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
+      .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(189), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(193), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -800,31 +832,75 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: On/Off (server) */ \
+      /* Endpoint: 1, Cluster: Identify (server) */ \
+      .clusterId = 0x00000003,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(196), \
+      .attributeCount = 4, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayIdentifyServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Descriptor (server) */ \
+      .clusterId = 0x0000001D,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Binding (client) */ \
+      .clusterId = 0x0000001E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributeCount = 0, \
+      .clusterSize = 0, \
+      .mask = ZAP_CLUSTER_MASK(CLIENT), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
+      .clusterId = 0x00000025,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributeCount = 4, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 2, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(192), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(210), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: Level Control (server) */ \
+      /* Endpoint: 2, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: Descriptor (server) */ \
+      /* Endpoint: 2, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(229), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -833,9 +909,9 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: Switch (server) */ \
+      /* Endpoint: 2, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(217), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(235), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -843,29 +919,18 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
-  { \
-      /* Endpoint: 1, Cluster: Fixed Label (server) */ \
-      .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(222), \
-      .attributeCount = 3, \
-      .clusterSize = 6, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
 }
 
 // clang-format on
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 23
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 25
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 19, 471 }, { ZAP_CLUSTER_INDEX(19), 5, 53 },                                                       \
+        { ZAP_CLUSTER_INDEX(0), 19, 230 }, { ZAP_CLUSTER_INDEX(19), 4, 21 }, { ZAP_CLUSTER_INDEX(23), 4, 47 },                     \
     }
 
 // Largest attribute size is needed for various buffers
@@ -877,50 +942,50 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (524)
+#define ATTRIBUTE_MAX_SIZE (298)
 
 // Number of fixed endpoints
-#define FIXED_ENDPOINT_COUNT (2)
+#define FIXED_ENDPOINT_COUNT (3)
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
 #define FIXED_ENDPOINT_ARRAY                                                                                                       \
     {                                                                                                                              \
-        0x0000, 0x0001                                                                                                             \
+        0x0000, 0x0001, 0x0002                                                                                                     \
     }
 
 // Array of profile ids
 #define FIXED_PROFILE_IDS                                                                                                          \
     {                                                                                                                              \
-        0x0103, 0x0103                                                                                                             \
+        0x0103, 0x0103, 0x0103                                                                                                     \
     }
 
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
     {                                                                                                                              \
-        { 0x000E, 1 }, { 0x0101, 1 }                                                                                               \
+        { 0x0016, 1 }, { 0x000E, 1 }, { 0x0101, 1 }                                                                                \
     }
 
 // Array of device type offsets
 #define FIXED_DEVICE_TYPE_OFFSETS                                                                                                  \
     {                                                                                                                              \
-        0, 1                                                                                                                       \
+        0, 1, 2                                                                                                                    \
     }
 
 // Array of device type lengths
 #define FIXED_DEVICE_TYPE_LENGTHS                                                                                                  \
     {                                                                                                                              \
-        1, 1                                                                                                                       \
+        1, 1, 1                                                                                                                    \
     }
 
 // Array of endpoint types supported on each endpoint
 #define FIXED_ENDPOINT_TYPES                                                                                                       \
     {                                                                                                                              \
-        0, 1                                                                                                                       \
+        0, 1, 2                                                                                                                    \
     }
 
 // Array of networks supported on each endpoint
 #define FIXED_NETWORKS                                                                                                             \
     {                                                                                                                              \
-        0, 0                                                                                                                       \
+        0, 0, 0                                                                                                                    \
     }
diff --git a/zzz_generated/bridge-app/zap-generated/gen_config.h b/zzz_generated/bridge-app/zap-generated/gen_config.h
index 79f8ce56879bd3..50d6788e443a49 100644
--- a/zzz_generated/bridge-app/zap-generated/gen_config.h
+++ b/zzz_generated/bridge-app/zap-generated/gen_config.h
@@ -33,12 +33,15 @@
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
 #define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -73,6 +76,15 @@
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
+// Use this macro to check if the server side of the Bridged Actions cluster is included
+#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
@@ -88,11 +100,6 @@
 #define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
@@ -103,6 +110,16 @@
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
 // Use this macro to check if the server side of the Level Control cluster is included
 #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 94e23a5844166c..0ff724199e486f 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -128,9 +128,6 @@
 | ChlorodibromomethaneConcentrationMeasurement                        | 0x0427 |
 | ChloroformConcentrationMeasurement                                  | 0x0428 |
 | SodiumConcentrationMeasurement                                      | 0x0429 |
-| IasZone                                                             | 0x0500 |
-| IasAce                                                              | 0x0501 |
-| IasWd                                                               | 0x0502 |
 | WakeOnLan                                                           | 0x0503 |
 | Channel                                                             | 0x0504 |
 | TargetNavigator                                                     | 0x0505 |
@@ -143,13 +140,13 @@
 | ApplicationLauncher                                                 | 0x050C |
 | ApplicationBasic                                                    | 0x050D |
 | AccountLogin                                                        | 0x050E |
-| TestCluster                                                         | 0x050F |
 | Messaging                                                           | 0x0703 |
 | ApplianceIdentification                                             | 0x0B00 |
 | MeterIdentification                                                 | 0x0B01 |
 | ApplianceEventsAndAlert                                             | 0x0B02 |
 | ApplianceStatistics                                                 | 0x0B03 |
 | ElectricalMeasurement                                               | 0x0B04 |
+| TestCluster                                                         | 0xFFF1FC05|
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
@@ -2633,6 +2630,7 @@ class WriteOnOffSwitchConfigurationSwitchActions : public WriteAttribute
 | * MoveWithOnOff                                                     |   0x05 |
 | * StepWithOnOff                                                     |   0x06 |
 | * StopWithOnOff                                                     |   0x07 |
+| * MoveToClosestFrequency                                            |   0x08 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * CurrentLevel                                                      | 0x0000 |
@@ -2913,6 +2911,37 @@ class LevelControlStopWithOnOff : public ClusterCommand
     chip::app::Clusters::LevelControl::Commands::StopWithOnOff::Type mRequest;
 };
 
+/*
+ * Command MoveToClosestFrequency
+ */
+class LevelControlMoveToClosestFrequency : public ClusterCommand
+{
+public:
+    LevelControlMoveToClosestFrequency(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("move-to-closest-frequency", credsIssuerConfig)
+    {
+        AddArgument("Frequency", 0, UINT16_MAX, &mRequest.frequency);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000008) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000008, 0x00000008, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000008) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000008, 0x00000008, mRequest);
+    }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::MoveToClosestFrequency::Type mRequest;
+};
+
 class WriteLevelControlOptions : public WriteAttribute
 {
 public:
@@ -5991,6 +6020,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand
 | Cluster GeneralDiagnostics                                          | 0x0033 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * TestEventTrigger                                                  |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * NetworkInterfaces                                                 | 0x0000 |
@@ -6001,6 +6031,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand
 | * ActiveHardwareFaults                                              | 0x0005 |
 | * ActiveRadioFaults                                                 | 0x0006 |
 | * ActiveNetworkFaults                                               | 0x0007 |
+| * TestEventTriggersEnabled                                          | 0x0008 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -6014,6 +6045,38 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand
 | * BootReason                                                        | 0x0003 |
 \*----------------------------------------------------------------------------*/
 
+/*
+ * Command TestEventTrigger
+ */
+class GeneralDiagnosticsTestEventTrigger : public ClusterCommand
+{
+public:
+    GeneralDiagnosticsTestEventTrigger(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("test-event-trigger", credsIssuerConfig)
+    {
+        AddArgument("EnableKey", &mRequest.enableKey);
+        AddArgument("EventTrigger", 0, UINT64_MAX, &mRequest.eventTrigger);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) command (0x00000000) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000033, 0x00000000, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) command (0x00000000) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000033, 0x00000000, mRequest);
+    }
+
+private:
+    chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
+};
+
 /*----------------------------------------------------------------------------*\
 | Cluster SoftwareDiagnostics                                         | 0x0034 |
 |------------------------------------------------------------------------------|
@@ -6521,7 +6584,6 @@ class AdministratorCommissioningRevokeCommissioning : public ClusterCommand
 | * UpdateFabricLabel                                                 |   0x09 |
 | * RemoveFabric                                                      |   0x0A |
 | * AddTrustedRootCertificate                                         |   0x0B |
-| * RemoveTrustedRootCertificate                                      |   0x0C |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * NOCs                                                              | 0x0000 |
@@ -6610,6 +6672,7 @@ class OperationalCredentialsCSRRequest : public ClusterCommand
     OperationalCredentialsCSRRequest(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("csrrequest", credsIssuerConfig)
     {
         AddArgument("CSRNonce", &mRequest.CSRNonce);
+        AddArgument("IsForUpdateNOC", 0, 1, &mRequest.isForUpdateNOC);
         ClusterCommand::AddArguments();
     }
 
@@ -6642,7 +6705,7 @@ class OperationalCredentialsAddNOC : public ClusterCommand
         AddArgument("NOCValue", &mRequest.NOCValue);
         AddArgument("ICACValue", &mRequest.ICACValue);
         AddArgument("IPKValue", &mRequest.IPKValue);
-        AddArgument("CaseAdminNode", 0, UINT64_MAX, &mRequest.caseAdminNode);
+        AddArgument("CaseAdminSubject", 0, UINT64_MAX, &mRequest.caseAdminSubject);
         AddArgument("AdminVendorId", 0, UINT16_MAX, &mRequest.adminVendorId);
         ClusterCommand::AddArguments();
     }
@@ -6789,37 +6852,6 @@ class OperationalCredentialsAddTrustedRootCertificate : public ClusterCommand
     chip::app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Type mRequest;
 };
 
-/*
- * Command RemoveTrustedRootCertificate
- */
-class OperationalCredentialsRemoveTrustedRootCertificate : public ClusterCommand
-{
-public:
-    OperationalCredentialsRemoveTrustedRootCertificate(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("remove-trusted-root-certificate", credsIssuerConfig)
-    {
-        AddArgument("TrustedRootIdentifier", &mRequest.trustedRootIdentifier);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000C) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000003E, 0x0000000C, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000C) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000003E, 0x0000000C, mRequest);
-    }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Type mRequest;
-};
-
 /*----------------------------------------------------------------------------*\
 | Cluster GroupKeyManagement                                          | 0x003F |
 |------------------------------------------------------------------------------|
@@ -7330,13 +7362,6 @@ class WriteShadeConfigurationMode : public WriteAttribute
 | * LockDoor                                                          |   0x00 |
 | * UnlockDoor                                                        |   0x01 |
 | * UnlockWithTimeout                                                 |   0x03 |
-| * GetLogRecord                                                      |   0x04 |
-| * SetPINCode                                                        |   0x05 |
-| * GetPINCode                                                        |   0x06 |
-| * ClearPINCode                                                      |   0x07 |
-| * ClearAllPINCodes                                                  |   0x08 |
-| * SetUserStatus                                                     |   0x09 |
-| * GetUserStatus                                                     |   0x0A |
 | * SetWeekDaySchedule                                                |   0x0B |
 | * GetWeekDaySchedule                                                |   0x0C |
 | * ClearWeekDaySchedule                                              |   0x0D |
@@ -7346,12 +7371,6 @@ class WriteShadeConfigurationMode : public WriteAttribute
 | * SetHolidaySchedule                                                |   0x11 |
 | * GetHolidaySchedule                                                |   0x12 |
 | * ClearHolidaySchedule                                              |   0x13 |
-| * SetUserType                                                       |   0x14 |
-| * GetUserType                                                       |   0x15 |
-| * SetRFIDCode                                                       |   0x16 |
-| * GetRFIDCode                                                       |   0x17 |
-| * ClearRFIDCode                                                     |   0x18 |
-| * ClearAllRFIDCodes                                                 |   0x19 |
 | * SetUser                                                           |   0x1A |
 | * GetUser                                                           |   0x1B |
 | * ClearUser                                                         |   0x1D |
@@ -7367,7 +7386,6 @@ class WriteShadeConfigurationMode : public WriteAttribute
 | * DoorOpenEvents                                                    | 0x0004 |
 | * DoorClosedEvents                                                  | 0x0005 |
 | * OpenPeriod                                                        | 0x0006 |
-| * NumberOfLogRecordsSupported                                       | 0x0010 |
 | * NumberOfTotalUsersSupported                                       | 0x0011 |
 | * NumberOfPINUsersSupported                                         | 0x0012 |
 | * NumberOfRFIDUsersSupported                                        | 0x0013 |
@@ -7380,7 +7398,6 @@ class WriteShadeConfigurationMode : public WriteAttribute
 | * MinRFIDCodeLength                                                 | 0x001A |
 | * CredentialRulesSupport                                            | 0x001B |
 | * NumberOfCredentialsSupportedPerUser                               | 0x001C |
-| * EnableLogging                                                     | 0x0020 |
 | * Language                                                          | 0x0021 |
 | * LEDSettings                                                       | 0x0022 |
 | * AutoRelockTime                                                    | 0x0023 |
@@ -7398,14 +7415,6 @@ class WriteShadeConfigurationMode : public WriteAttribute
 | * SendPINOverTheAir                                                 | 0x0032 |
 | * RequirePINforRemoteOperation                                      | 0x0033 |
 | * ExpiringUserTimeout                                               | 0x0035 |
-| * AlarmMask                                                         | 0x0040 |
-| * KeypadOperationEventMask                                          | 0x0041 |
-| * RemoteOperationEventMask                                          | 0x0042 |
-| * ManualOperationEventMask                                          | 0x0043 |
-| * RFIDOperationEventMask                                            | 0x0044 |
-| * KeypadProgrammingEventMask                                        | 0x0045 |
-| * RemoteProgrammingEventMask                                        | 0x0046 |
-| * RFIDProgrammingEventMask                                          | 0x0047 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -7512,219 +7521,6 @@ class DoorLockUnlockWithTimeout : public ClusterCommand
     chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest;
 };
 
-/*
- * Command GetLogRecord
- */
-class DoorLockGetLogRecord : public ClusterCommand
-{
-public:
-    DoorLockGetLogRecord(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-log-record", credsIssuerConfig)
-    {
-        AddArgument("LogIndex", 0, UINT16_MAX, &mRequest.logIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000004) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000004, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000004) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000004, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetLogRecord::Type mRequest;
-};
-
-/*
- * Command SetPINCode
- */
-class DoorLockSetPINCode : public ClusterCommand
-{
-public:
-    DoorLockSetPINCode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-pincode", credsIssuerConfig)
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("Pin", &mRequest.pin);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000005) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000005, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000005) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000005, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetPINCode::Type mRequest;
-};
-
-/*
- * Command GetPINCode
- */
-class DoorLockGetPINCode : public ClusterCommand
-{
-public:
-    DoorLockGetPINCode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-pincode", credsIssuerConfig)
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000006) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000006, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000006) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000006, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetPINCode::Type mRequest;
-};
-
-/*
- * Command ClearPINCode
- */
-class DoorLockClearPINCode : public ClusterCommand
-{
-public:
-    DoorLockClearPINCode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-pincode", credsIssuerConfig)
-    {
-        AddArgument("PinSlotIndex", 0, UINT16_MAX, &mRequest.pinSlotIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000007) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000007, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000007) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000007, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearPINCode::Type mRequest;
-};
-
-/*
- * Command ClearAllPINCodes
- */
-class DoorLockClearAllPINCodes : public ClusterCommand
-{
-public:
-    DoorLockClearAllPINCodes(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-all-pincodes", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000008) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000008, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000008) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000008, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearAllPINCodes::Type mRequest;
-};
-
-/*
- * Command SetUserStatus
- */
-class DoorLockSetUserStatus : public ClusterCommand
-{
-public:
-    DoorLockSetUserStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-user-status", credsIssuerConfig)
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000009) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000009, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000009) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000009, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetUserStatus::Type mRequest;
-};
-
-/*
- * Command GetUserStatus
- */
-class DoorLockGetUserStatus : public ClusterCommand
-{
-public:
-    DoorLockGetUserStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-user-status", credsIssuerConfig)
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000A) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000000A, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000A) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000000A, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetUserStatus::Type mRequest;
-};
-
 /*
  * Command SetWeekDaySchedule
  */
@@ -8021,293 +7817,109 @@ class DoorLockClearHolidaySchedule : public ClusterCommand
 };
 
 /*
- * Command SetUserType
+ * Command SetUser
  */
-class DoorLockSetUserType : public ClusterCommand
+class DoorLockSetUser : public ClusterCommand
 {
 public:
-    DoorLockSetUserType(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-user-type", credsIssuerConfig)
+    DoorLockSetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-user", credsIssuerConfig)
     {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
+        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("UserName", &mRequest.userName);
+        AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId);
+        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
         AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
+        AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000014) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001A) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000014, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000001A, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000014) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001A) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000014, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000001A, mRequest);
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetUserType::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::SetUser::Type mRequest;
 };
 
 /*
- * Command GetUserType
+ * Command GetUser
  */
-class DoorLockGetUserType : public ClusterCommand
+class DoorLockGetUser : public ClusterCommand
 {
 public:
-    DoorLockGetUserType(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-user-type", credsIssuerConfig)
+    DoorLockGetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-user", credsIssuerConfig)
     {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000015) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001B) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000015, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000001B, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000015) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001B) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000015, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000001B, mRequest);
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetUserType::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::GetUser::Type mRequest;
 };
 
 /*
- * Command SetRFIDCode
+ * Command ClearUser
  */
-class DoorLockSetRFIDCode : public ClusterCommand
+class DoorLockClearUser : public ClusterCommand
 {
 public:
-    DoorLockSetRFIDCode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-rfidcode", credsIssuerConfig)
+    DoorLockClearUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-user", credsIssuerConfig)
     {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("RfidCode", &mRequest.rfidCode);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000016) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001D) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000016, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000001D, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000016) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001D) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000016, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000001D, mRequest);
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::SetRFIDCode::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::ClearUser::Type mRequest;
 };
 
 /*
- * Command GetRFIDCode
+ * Command SetCredential
  */
-class DoorLockGetRFIDCode : public ClusterCommand
+class DoorLockSetCredential : public ClusterCommand
 {
 public:
-    DoorLockGetRFIDCode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-rfidcode", credsIssuerConfig)
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000017) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000017, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000017) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000017, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetRFIDCode::Type mRequest;
-};
-
-/*
- * Command ClearRFIDCode
- */
-class DoorLockClearRFIDCode : public ClusterCommand
-{
-public:
-    DoorLockClearRFIDCode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-rfidcode", credsIssuerConfig)
-    {
-        AddArgument("RfidSlotIndex", 0, UINT16_MAX, &mRequest.rfidSlotIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000018) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000018, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000018) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000018, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearRFIDCode::Type mRequest;
-};
-
-/*
- * Command ClearAllRFIDCodes
- */
-class DoorLockClearAllRFIDCodes : public ClusterCommand
-{
-public:
-    DoorLockClearAllRFIDCodes(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("clear-all-rfidcodes", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000019) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000019, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000019) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000019, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearAllRFIDCodes::Type mRequest;
-};
-
-/*
- * Command SetUser
- */
-class DoorLockSetUser : public ClusterCommand
-{
-public:
-    DoorLockSetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-user", credsIssuerConfig)
-    {
-        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("UserName", &mRequest.userName);
-        AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001A) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000001A, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001A) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000001A, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetUser::Type mRequest;
-};
-
-/*
- * Command GetUser
- */
-class DoorLockGetUser : public ClusterCommand
-{
-public:
-    DoorLockGetUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-user", credsIssuerConfig)
-    {
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001B) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000001B, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001B) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000001B, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetUser::Type mRequest;
-};
-
-/*
- * Command ClearUser
- */
-class DoorLockClearUser : public ClusterCommand
-{
-public:
-    DoorLockClearUser(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("clear-user", credsIssuerConfig)
-    {
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001D) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000101, 0x0000001D, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001D) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x0000001D, mRequest);
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearUser::Type mRequest;
-};
-
-/*
- * Command SetCredential
- */
-class DoorLockSetCredential : public ClusterCommand
-{
-public:
-    DoorLockSetCredential(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("set-credential", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
+    DoorLockSetCredential(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-credential", credsIssuerConfig), mComplex_Credential(&mRequest.credential)
     {
         AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
         AddArgument("Credential", &mComplex_Credential);
@@ -8481,32 +8093,6 @@ class WriteDoorLockOpenPeriod : public WriteAttribute
     uint16_t mValue;
 };
 
-class WriteDoorLockEnableLogging : public WriteAttribute
-{
-public:
-    WriteDoorLockEnableLogging(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("EnableLogging", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "enable-logging");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockEnableLogging() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000020, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000020, mValue);
-    }
-
-private:
-    bool mValue;
-};
-
 class WriteDoorLockLanguage : public WriteAttribute
 {
 public:
@@ -8769,7 +8355,7 @@ class WriteDoorLockLocalProgrammingFeatures : public WriteAttribute
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> mValue;
+    chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> mValue;
 };
 
 class WriteDoorLockWrongCodeEntryLimit : public WriteAttribute
@@ -8907,321 +8493,106 @@ class WriteDoorLockExpiringUserTimeout : public WriteAttribute
     uint16_t mValue;
 };
 
-class WriteDoorLockAlarmMask : public WriteAttribute
+/*----------------------------------------------------------------------------*\
+| Cluster WindowCovering                                              | 0x0102 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * UpOrOpen                                                          |   0x00 |
+| * DownOrClose                                                       |   0x01 |
+| * StopMotion                                                        |   0x02 |
+| * GoToLiftValue                                                     |   0x04 |
+| * GoToLiftPercentage                                                |   0x05 |
+| * GoToTiltValue                                                     |   0x07 |
+| * GoToTiltPercentage                                                |   0x08 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Type                                                              | 0x0000 |
+| * PhysicalClosedLimitLift                                           | 0x0001 |
+| * PhysicalClosedLimitTilt                                           | 0x0002 |
+| * CurrentPositionLift                                               | 0x0003 |
+| * CurrentPositionTilt                                               | 0x0004 |
+| * NumberOfActuationsLift                                            | 0x0005 |
+| * NumberOfActuationsTilt                                            | 0x0006 |
+| * ConfigStatus                                                      | 0x0007 |
+| * CurrentPositionLiftPercentage                                     | 0x0008 |
+| * CurrentPositionTiltPercentage                                     | 0x0009 |
+| * OperationalStatus                                                 | 0x000A |
+| * TargetPositionLiftPercent100ths                                   | 0x000B |
+| * TargetPositionTiltPercent100ths                                   | 0x000C |
+| * EndProductType                                                    | 0x000D |
+| * CurrentPositionLiftPercent100ths                                  | 0x000E |
+| * CurrentPositionTiltPercent100ths                                  | 0x000F |
+| * InstalledOpenLimitLift                                            | 0x0010 |
+| * InstalledClosedLimitLift                                          | 0x0011 |
+| * InstalledOpenLimitTilt                                            | 0x0012 |
+| * InstalledClosedLimitTilt                                          | 0x0013 |
+| * Mode                                                              | 0x0017 |
+| * SafetyStatus                                                      | 0x001A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command UpOrOpen
+ */
+class WindowCoveringUpOrOpen : public ClusterCommand
 {
 public:
-    WriteDoorLockAlarmMask(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("AlarmMask", credsIssuerConfig)
+    WindowCoveringUpOrOpen(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("up-or-open", credsIssuerConfig)
     {
-        AddArgument("attr-name", "alarm-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteDoorLockAlarmMask() {}
-
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000040, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000000) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000102, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000040, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000000) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000102, 0x00000000, mRequest);
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> mValue;
+    chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Type mRequest;
 };
 
-class WriteDoorLockKeypadOperationEventMask : public WriteAttribute
+/*
+ * Command DownOrClose
+ */
+class WindowCoveringDownOrClose : public ClusterCommand
 {
 public:
-    WriteDoorLockKeypadOperationEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("KeypadOperationEventMask", credsIssuerConfig)
+    WindowCoveringDownOrClose(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("down-or-close", credsIssuerConfig)
     {
-        AddArgument("attr-name", "keypad-operation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteDoorLockKeypadOperationEventMask() {}
-
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000041, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000001) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000102, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000041, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000001) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000102, 0x00000001, mRequest);
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> mValue;
-};
-
-class WriteDoorLockRemoteOperationEventMask : public WriteAttribute
-{
-public:
-    WriteDoorLockRemoteOperationEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RemoteOperationEventMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "remote-operation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRemoteOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000042, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000042, mValue);
-    }
-
-private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> mValue;
-};
-
-class WriteDoorLockManualOperationEventMask : public WriteAttribute
-{
-public:
-    WriteDoorLockManualOperationEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("ManualOperationEventMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "manual-operation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockManualOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000043, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000043, mValue);
-    }
-
-private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> mValue;
-};
-
-class WriteDoorLockRFIDOperationEventMask : public WriteAttribute
-{
-public:
-    WriteDoorLockRFIDOperationEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RFIDOperationEventMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "rfidoperation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRFIDOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000044, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000044, mValue);
-    }
-
-private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> mValue;
-};
-
-class WriteDoorLockKeypadProgrammingEventMask : public WriteAttribute
-{
-public:
-    WriteDoorLockKeypadProgrammingEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("KeypadProgrammingEventMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "keypad-programming-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockKeypadProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000045, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000045, mValue);
-    }
-
-private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> mValue;
-};
-
-class WriteDoorLockRemoteProgrammingEventMask : public WriteAttribute
-{
-public:
-    WriteDoorLockRemoteProgrammingEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RemoteProgrammingEventMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "remote-programming-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRemoteProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000046, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000046, mValue);
-    }
-
-private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> mValue;
-};
-
-class WriteDoorLockRFIDProgrammingEventMask : public WriteAttribute
-{
-public:
-    WriteDoorLockRFIDProgrammingEventMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RFIDProgrammingEventMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "rfidprogramming-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRFIDProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000101, 0x00000047, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000101, 0x00000047, mValue);
-    }
-
-private:
-    chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> mValue;
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster WindowCovering                                              | 0x0102 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * UpOrOpen                                                          |   0x00 |
-| * DownOrClose                                                       |   0x01 |
-| * StopMotion                                                        |   0x02 |
-| * GoToLiftValue                                                     |   0x04 |
-| * GoToLiftPercentage                                                |   0x05 |
-| * GoToTiltValue                                                     |   0x07 |
-| * GoToTiltPercentage                                                |   0x08 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Type                                                              | 0x0000 |
-| * PhysicalClosedLimitLift                                           | 0x0001 |
-| * PhysicalClosedLimitTilt                                           | 0x0002 |
-| * CurrentPositionLift                                               | 0x0003 |
-| * CurrentPositionTilt                                               | 0x0004 |
-| * NumberOfActuationsLift                                            | 0x0005 |
-| * NumberOfActuationsTilt                                            | 0x0006 |
-| * ConfigStatus                                                      | 0x0007 |
-| * CurrentPositionLiftPercentage                                     | 0x0008 |
-| * CurrentPositionTiltPercentage                                     | 0x0009 |
-| * OperationalStatus                                                 | 0x000A |
-| * TargetPositionLiftPercent100ths                                   | 0x000B |
-| * TargetPositionTiltPercent100ths                                   | 0x000C |
-| * EndProductType                                                    | 0x000D |
-| * CurrentPositionLiftPercent100ths                                  | 0x000E |
-| * CurrentPositionTiltPercent100ths                                  | 0x000F |
-| * InstalledOpenLimitLift                                            | 0x0010 |
-| * InstalledClosedLimitLift                                          | 0x0011 |
-| * InstalledOpenLimitTilt                                            | 0x0012 |
-| * InstalledClosedLimitTilt                                          | 0x0013 |
-| * Mode                                                              | 0x0017 |
-| * SafetyStatus                                                      | 0x001A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command UpOrOpen
- */
-class WindowCoveringUpOrOpen : public ClusterCommand
-{
-public:
-    WindowCoveringUpOrOpen(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("up-or-open", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000102, 0x00000000, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000102, 0x00000000, mRequest);
-    }
-
-private:
-    chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Type mRequest;
-};
-
-/*
- * Command DownOrClose
- */
-class WindowCoveringDownOrClose : public ClusterCommand
-{
-public:
-    WindowCoveringDownOrClose(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("down-or-close", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000001) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000102, 0x00000001, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000001) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000102, 0x00000001, mRequest);
-    }
-
-private:
-    chip::app::Clusters::WindowCovering::Commands::DownOrClose::Type mRequest;
+    chip::app::Clusters::WindowCovering::Commands::DownOrClose::Type mRequest;
 };
 
 /*
@@ -9400,7 +8771,7 @@ class WriteWindowCoveringMode : public WriteAttribute
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> mValue;
+    chip::BitMask<chip::app::Clusters::WindowCovering::Mode> mValue;
 };
 
 /*----------------------------------------------------------------------------*\
@@ -9824,7 +9195,6 @@ class WritePumpConfigurationAndControlControlMode : public WriteAttribute
 | * SetWeeklySchedule                                                 |   0x01 |
 | * GetWeeklySchedule                                                 |   0x02 |
 | * ClearWeeklySchedule                                               |   0x03 |
-| * GetRelayStatusLog                                                 |   0x04 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * LocalTemperature                                                  | 0x0000 |
@@ -9850,7 +9220,6 @@ class WritePumpConfigurationAndControlControlMode : public WriteAttribute
 | * RemoteSensing                                                     | 0x001A |
 | * ControlSequenceOfOperation                                        | 0x001B |
 | * SystemMode                                                        | 0x001C |
-| * AlarmMask                                                         | 0x001D |
 | * ThermostatRunningMode                                             | 0x001E |
 | * StartOfWeek                                                       | 0x0020 |
 | * NumberOfWeeklyTransitions                                         | 0x0021 |
@@ -10017,36 +9386,6 @@ class ThermostatClearWeeklySchedule : public ClusterCommand
     chip::app::Clusters::Thermostat::Commands::ClearWeeklySchedule::Type mRequest;
 };
 
-/*
- * Command GetRelayStatusLog
- */
-class ThermostatGetRelayStatusLog : public ClusterCommand
-{
-public:
-    ThermostatGetRelayStatusLog(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-relay-status-log", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000004) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000201, 0x00000004, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000004) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000201, 0x00000004, mRequest);
-    }
-
-private:
-    chip::app::Clusters::Thermostat::Commands::GetRelayStatusLog::Type mRequest;
-};
-
 class WriteThermostatHVACSystemTypeConfiguration : public WriteAttribute
 {
 public:
@@ -13612,21 +12951,12 @@ class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster IasZone                                                     | 0x0500 |
+| Cluster WakeOnLan                                                   | 0x0503 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ZoneEnrollResponse                                                |   0x00 |
-| * InitiateNormalOperationMode                                       |   0x01 |
-| * InitiateTestMode                                                  |   0x02 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ZoneState                                                         | 0x0000 |
-| * ZoneType                                                          | 0x0001 |
-| * ZoneStatus                                                        | 0x0002 |
-| * IasCieAddress                                                     | 0x0010 |
-| * ZoneId                                                            | 0x0011 |
-| * NumberOfZoneSensitivityLevelsSupported                            | 0x0012 |
-| * CurrentZoneSensitivityLevel                                       | 0x0013 |
+| * MACAddress                                                        | 0x0000 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -13636,168 +12966,193 @@ class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command ZoneEnrollResponse
- */
-class IasZoneZoneEnrollResponse : public ClusterCommand
-{
-public:
-    IasZoneZoneEnrollResponse(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("zone-enroll-response", credsIssuerConfig)
-    {
-        AddArgument("EnrollResponseCode", 0, UINT8_MAX, &mRequest.enrollResponseCode);
-        AddArgument("ZoneId", 0, UINT8_MAX, &mRequest.zoneId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000500) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000500, 0x00000000, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000500) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000500, 0x00000000, mRequest);
-    }
-
-private:
-    chip::app::Clusters::IasZone::Commands::ZoneEnrollResponse::Type mRequest;
-};
+/*----------------------------------------------------------------------------*\
+| Cluster Channel                                                     | 0x0504 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ChangeChannel                                                     |   0x00 |
+| * ChangeChannelByNumber                                             |   0x02 |
+| * SkipChannel                                                       |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ChannelList                                                       | 0x0000 |
+| * Lineup                                                            | 0x0001 |
+| * CurrentChannel                                                    | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
 /*
- * Command InitiateNormalOperationMode
+ * Command ChangeChannel
  */
-class IasZoneInitiateNormalOperationMode : public ClusterCommand
+class ChannelChangeChannel : public ClusterCommand
 {
 public:
-    IasZoneInitiateNormalOperationMode(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("initiate-normal-operation-mode", credsIssuerConfig)
+    ChannelChangeChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-channel", credsIssuerConfig)
     {
+        AddArgument("Match", &mRequest.match);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000500) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000500, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000504, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000500) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000500, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000504, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasZone::Commands::InitiateNormalOperationMode::Type mRequest;
+    chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest;
 };
 
 /*
- * Command InitiateTestMode
+ * Command ChangeChannelByNumber
  */
-class IasZoneInitiateTestMode : public ClusterCommand
+class ChannelChangeChannelByNumber : public ClusterCommand
 {
 public:
-    IasZoneInitiateTestMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("initiate-test-mode", credsIssuerConfig)
+    ChannelChangeChannelByNumber(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("change-channel-by-number", credsIssuerConfig)
     {
-        AddArgument("TestModeDuration", 0, UINT8_MAX, &mRequest.testModeDuration);
-        AddArgument("CurrentZoneSensitivityLevel", 0, UINT8_MAX, &mRequest.currentZoneSensitivityLevel);
+        AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber);
+        AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000500) command (0x00000002) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000500, 0x00000002, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000504, 0x00000002, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000500) command (0x00000002) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000500, 0x00000002, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000504, 0x00000002, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasZone::Commands::InitiateTestMode::Type mRequest;
+    chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest;
 };
 
-class WriteIasZoneIasCieAddress : public WriteAttribute
+/*
+ * Command SkipChannel
+ */
+class ChannelSkipChannel : public ClusterCommand
 {
 public:
-    WriteIasZoneIasCieAddress(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("IasCieAddress", credsIssuerConfig)
+    ChannelSkipChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-channel", credsIssuerConfig)
     {
-        AddArgument("attr-name", "ias-cie-address");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("Count", 0, UINT16_MAX, &mRequest.count);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteIasZoneIasCieAddress() {}
-
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000500, 0x00000010, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000504, 0x00000003, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000500, 0x00000010, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000504, 0x00000003, mRequest);
     }
 
 private:
-    chip::NodeId mValue;
+    chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest;
 };
 
-class WriteIasZoneCurrentZoneSensitivityLevel : public WriteAttribute
+/*----------------------------------------------------------------------------*\
+| Cluster TargetNavigator                                             | 0x0505 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * NavigateTarget                                                    |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * TargetList                                                        | 0x0000 |
+| * CurrentTarget                                                     | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command NavigateTarget
+ */
+class TargetNavigatorNavigateTarget : public ClusterCommand
 {
 public:
-    WriteIasZoneCurrentZoneSensitivityLevel(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("CurrentZoneSensitivityLevel", credsIssuerConfig)
+    TargetNavigatorNavigateTarget(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("navigate-target", credsIssuerConfig)
     {
-        AddArgument("attr-name", "current-zone-sensitivity-level");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("Target", 0, UINT8_MAX, &mRequest.target);
+        AddArgument("Data", &mRequest.data);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteIasZoneCurrentZoneSensitivityLevel() {}
-
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000500, 0x00000013, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) command (0x00000000) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000505, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000500, 0x00000013, mValue);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) command (0x00000000) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000505, 0x00000000, mRequest);
     }
 
 private:
-    uint8_t mValue;
+    chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster IasAce                                                      | 0x0501 |
+| Cluster MediaPlayback                                               | 0x0506 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Arm                                                               |   0x00 |
-| * Bypass                                                            |   0x01 |
-| * Emergency                                                         |   0x02 |
-| * Fire                                                              |   0x03 |
-| * Panic                                                             |   0x04 |
-| * GetZoneIdMap                                                      |   0x05 |
-| * GetZoneInformation                                                |   0x06 |
-| * GetPanelStatus                                                    |   0x07 |
-| * GetBypassedZoneList                                               |   0x08 |
-| * GetZoneStatus                                                     |   0x09 |
+| * Play                                                              |   0x00 |
+| * Pause                                                             |   0x01 |
+| * StopPlayback                                                      |   0x02 |
+| * StartOver                                                         |   0x03 |
+| * Previous                                                          |   0x04 |
+| * Next                                                              |   0x05 |
+| * Rewind                                                            |   0x06 |
+| * FastForward                                                       |   0x07 |
+| * SkipForward                                                       |   0x08 |
+| * SkipBackward                                                      |   0x09 |
+| * Seek                                                              |   0x0B |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * CurrentState                                                      | 0x0000 |
+| * StartTime                                                         | 0x0001 |
+| * Duration                                                          | 0x0002 |
+| * SampledPosition                                                   | 0x0003 |
+| * PlaybackSpeed                                                     | 0x0004 |
+| * SeekRangeEnd                                                      | 0x0005 |
+| * SeekRangeStart                                                    | 0x0006 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -13808,319 +13163,339 @@ class WriteIasZoneCurrentZoneSensitivityLevel : public WriteAttribute
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Arm
+ * Command Play
+ */
+class MediaPlaybackPlay : public ClusterCommand
+{
+public:
+    MediaPlaybackPlay(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("play", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000000, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000000, mRequest);
+    }
+
+private:
+    chip::app::Clusters::MediaPlayback::Commands::Play::Type mRequest;
+};
+
+/*
+ * Command Pause
  */
-class IasAceArm : public ClusterCommand
+class MediaPlaybackPause : public ClusterCommand
 {
 public:
-    IasAceArm(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("arm", credsIssuerConfig)
+    MediaPlaybackPause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
     {
-        AddArgument("ArmMode", 0, UINT8_MAX, &mRequest.armMode);
-        AddArgument("ArmDisarmCode", &mRequest.armDisarmCode);
-        AddArgument("ZoneId", 0, UINT8_MAX, &mRequest.zoneId);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000001, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::Arm::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Pause::Type mRequest;
 };
 
 /*
- * Command Bypass
+ * Command StopPlayback
  */
-class IasAceBypass : public ClusterCommand
+class MediaPlaybackStopPlayback : public ClusterCommand
 {
 public:
-    IasAceBypass(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("bypass", credsIssuerConfig), mComplex_ZoneIds(&mRequest.zoneIds)
+    MediaPlaybackStopPlayback(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-playback", credsIssuerConfig)
     {
-        AddArgument("NumberOfZones", 0, UINT8_MAX, &mRequest.numberOfZones);
-        AddArgument("ZoneIds", &mComplex_ZoneIds);
-        AddArgument("ArmDisarmCode", &mRequest.armDisarmCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000002, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000002, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::Bypass::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_ZoneIds;
+    chip::app::Clusters::MediaPlayback::Commands::StopPlayback::Type mRequest;
 };
 
 /*
- * Command Emergency
+ * Command StartOver
  */
-class IasAceEmergency : public ClusterCommand
+class MediaPlaybackStartOver : public ClusterCommand
 {
 public:
-    IasAceEmergency(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("emergency", credsIssuerConfig)
+    MediaPlaybackStartOver(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-over", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000002) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000002, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000003, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000002) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000002, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000003, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::Emergency::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::StartOver::Type mRequest;
 };
 
 /*
- * Command Fire
+ * Command Previous
  */
-class IasAceFire : public ClusterCommand
+class MediaPlaybackPrevious : public ClusterCommand
 {
 public:
-    IasAceFire(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fire", credsIssuerConfig)
+    MediaPlaybackPrevious(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("previous", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000003) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000003, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000004, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000003) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000003, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000004, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::Fire::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Previous::Type mRequest;
 };
 
 /*
- * Command Panic
+ * Command Next
  */
-class IasAcePanic : public ClusterCommand
+class MediaPlaybackNext : public ClusterCommand
 {
 public:
-    IasAcePanic(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("panic", credsIssuerConfig)
+    MediaPlaybackNext(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("next", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000004) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000004, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000005, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000004) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000004, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000005, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::Panic::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Next::Type mRequest;
 };
 
 /*
- * Command GetZoneIdMap
+ * Command Rewind
  */
-class IasAceGetZoneIdMap : public ClusterCommand
+class MediaPlaybackRewind : public ClusterCommand
 {
 public:
-    IasAceGetZoneIdMap(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-zone-id-map", credsIssuerConfig)
+    MediaPlaybackRewind(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rewind", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000005) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000005, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000006, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000005) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000005, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000006, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::GetZoneIdMap::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Rewind::Type mRequest;
 };
 
 /*
- * Command GetZoneInformation
+ * Command FastForward
  */
-class IasAceGetZoneInformation : public ClusterCommand
+class MediaPlaybackFastForward : public ClusterCommand
 {
 public:
-    IasAceGetZoneInformation(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-zone-information", credsIssuerConfig)
+    MediaPlaybackFastForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fast-forward", credsIssuerConfig)
     {
-        AddArgument("ZoneId", 0, UINT8_MAX, &mRequest.zoneId);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000006) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000006, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000007, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000006) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000006, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000007, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::GetZoneInformation::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::FastForward::Type mRequest;
 };
 
 /*
- * Command GetPanelStatus
+ * Command SkipForward
  */
-class IasAceGetPanelStatus : public ClusterCommand
+class MediaPlaybackSkipForward : public ClusterCommand
 {
 public:
-    IasAceGetPanelStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-panel-status", credsIssuerConfig)
+    MediaPlaybackSkipForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-forward", credsIssuerConfig)
     {
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000007) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000007, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000008, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000007) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000007, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000008, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::GetPanelStatus::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::SkipForward::Type mRequest;
 };
 
 /*
- * Command GetBypassedZoneList
+ * Command SkipBackward
  */
-class IasAceGetBypassedZoneList : public ClusterCommand
+class MediaPlaybackSkipBackward : public ClusterCommand
 {
 public:
-    IasAceGetBypassedZoneList(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-bypassed-zone-list", credsIssuerConfig)
+    MediaPlaybackSkipBackward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-backward", credsIssuerConfig)
     {
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000008) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000008, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000009, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000008) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000008, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000009, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::GetBypassedZoneList::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Type mRequest;
 };
 
 /*
- * Command GetZoneStatus
+ * Command Seek
  */
-class IasAceGetZoneStatus : public ClusterCommand
+class MediaPlaybackSeek : public ClusterCommand
 {
 public:
-    IasAceGetZoneStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-zone-status", credsIssuerConfig)
+    MediaPlaybackSeek(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("seek", credsIssuerConfig)
     {
-        AddArgument("StartingZoneId", 0, UINT8_MAX, &mRequest.startingZoneId);
-        AddArgument("MaxNumberOfZoneIds", 0, UINT8_MAX, &mRequest.maxNumberOfZoneIds);
-        AddArgument("ZoneStatusMaskFlag", 0, 1, &mRequest.zoneStatusMaskFlag);
-        AddArgument("ZoneStatusMask", 0, UINT16_MAX, &mRequest.zoneStatusMask);
+        AddArgument("Position", 0, UINT64_MAX, &mRequest.position);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000009) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000501, 0x00000009, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x0000000B, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000501) command (0x00000009) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000501, 0x00000009, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x0000000B, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasAce::Commands::GetZoneStatus::Type mRequest;
+    chip::app::Clusters::MediaPlayback::Commands::Seek::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster IasWd                                                       | 0x0502 |
+| Cluster MediaInput                                                  | 0x0507 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * StartWarning                                                      |   0x00 |
-| * Squawk                                                            |   0x01 |
+| * SelectInput                                                       |   0x00 |
+| * ShowInputStatus                                                   |   0x01 |
+| * HideInputStatus                                                   |   0x02 |
+| * RenameInput                                                       |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MaxDuration                                                       | 0x0000 |
+| * InputList                                                         | 0x0000 |
+| * CurrentInput                                                      | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -14131,232 +13506,176 @@ class IasAceGetZoneStatus : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command StartWarning
+ * Command SelectInput
  */
-class IasWdStartWarning : public ClusterCommand
+class MediaInputSelectInput : public ClusterCommand
 {
 public:
-    IasWdStartWarning(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-warning", credsIssuerConfig)
+    MediaInputSelectInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-input", credsIssuerConfig)
     {
-        AddArgument("WarningInfo", 0, UINT8_MAX, &mRequest.warningInfo);
-        AddArgument("WarningDuration", 0, UINT16_MAX, &mRequest.warningDuration);
-        AddArgument("StrobeDutyCycle", 0, UINT8_MAX, &mRequest.strobeDutyCycle);
-        AddArgument("StrobeLevel", 0, UINT8_MAX, &mRequest.strobeLevel);
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000502) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000502, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000502) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000502, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasWd::Commands::StartWarning::Type mRequest;
+    chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest;
 };
 
 /*
- * Command Squawk
+ * Command ShowInputStatus
  */
-class IasWdSquawk : public ClusterCommand
+class MediaInputShowInputStatus : public ClusterCommand
 {
 public:
-    IasWdSquawk(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("squawk", credsIssuerConfig)
+    MediaInputShowInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("show-input-status", credsIssuerConfig)
     {
-        AddArgument("SquawkInfo", 0, UINT8_MAX, &mRequest.squawkInfo);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000502) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000502, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000502) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000502, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000001, mRequest);
     }
 
 private:
-    chip::app::Clusters::IasWd::Commands::Squawk::Type mRequest;
+    chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type mRequest;
 };
 
-class WriteIasWdMaxDuration : public WriteAttribute
+/*
+ * Command HideInputStatus
+ */
+class MediaInputHideInputStatus : public ClusterCommand
 {
 public:
-    WriteIasWdMaxDuration(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("MaxDuration", credsIssuerConfig)
+    MediaInputHideInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("hide-input-status", credsIssuerConfig)
     {
-        AddArgument("attr-name", "max-duration");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteIasWdMaxDuration() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000502, 0x00000000, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000502, 0x00000000, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster WakeOnLan                                                   | 0x0503 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MACAddress                                                        | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster Channel                                                     | 0x0504 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ChangeChannel                                                     |   0x00 |
-| * ChangeChannelByNumber                                             |   0x02 |
-| * SkipChannel                                                       |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * ChannelList                                                       | 0x0000 |
-| * Lineup                                                            | 0x0001 |
-| * CurrentChannel                                                    | 0x0002 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command ChangeChannel
- */
-class ChannelChangeChannel : public ClusterCommand
-{
-public:
-    ChannelChangeChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-channel", credsIssuerConfig)
-    {
-        AddArgument("Match", &mRequest.match);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000002) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000504, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000002, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000002) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000504, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000002, mRequest);
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest;
+    chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type mRequest;
 };
 
 /*
- * Command ChangeChannelByNumber
+ * Command RenameInput
  */
-class ChannelChangeChannelByNumber : public ClusterCommand
+class MediaInputRenameInput : public ClusterCommand
 {
 public:
-    ChannelChangeChannelByNumber(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("change-channel-by-number", credsIssuerConfig)
+    MediaInputRenameInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-input", credsIssuerConfig)
     {
-        AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber);
-        AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber);
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("Name", &mRequest.name);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000003) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000504, 0x00000002, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000003, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000003) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000504, 0x00000002, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000003, mRequest);
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest;
+    chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster LowPower                                                    | 0x0508 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Sleep                                                             |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command SkipChannel
+ * Command Sleep
  */
-class ChannelSkipChannel : public ClusterCommand
+class LowPowerSleep : public ClusterCommand
 {
 public:
-    ChannelSkipChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-channel", credsIssuerConfig)
+    LowPowerSleep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("sleep", credsIssuerConfig)
     {
-        AddArgument("Count", 0, UINT16_MAX, &mRequest.count);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000504, 0x00000003, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000508, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000504, 0x00000003, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000508, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest;
+    chip::app::Clusters::LowPower::Commands::Sleep::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster TargetNavigator                                             | 0x0505 |
+| Cluster KeypadInput                                                 | 0x0509 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * NavigateTarget                                                    |   0x00 |
+| * SendKey                                                           |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * TargetList                                                        | 0x0000 |
-| * CurrentTarget                                                     | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -14367,61 +13686,45 @@ class ChannelSkipChannel : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command NavigateTarget
+ * Command SendKey
  */
-class TargetNavigatorNavigateTarget : public ClusterCommand
+class KeypadInputSendKey : public ClusterCommand
 {
 public:
-    TargetNavigatorNavigateTarget(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("navigate-target", credsIssuerConfig)
+    KeypadInputSendKey(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("send-key", credsIssuerConfig)
     {
-        AddArgument("Target", 0, UINT8_MAX, &mRequest.target);
-        AddArgument("Data", &mRequest.data);
+        AddArgument("KeyCode", 0, UINT8_MAX, &mRequest.keyCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000505, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000509, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000505, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000509, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest;
+    chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster MediaPlayback                                               | 0x0506 |
+| Cluster ContentLauncher                                             | 0x050A |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Play                                                              |   0x00 |
-| * Pause                                                             |   0x01 |
-| * StopPlayback                                                      |   0x02 |
-| * StartOver                                                         |   0x03 |
-| * Previous                                                          |   0x04 |
-| * Next                                                              |   0x05 |
-| * Rewind                                                            |   0x06 |
-| * FastForward                                                       |   0x07 |
-| * SkipForward                                                       |   0x08 |
-| * SkipBackward                                                      |   0x09 |
-| * Seek                                                              |   0x0B |
+| * LaunchContent                                                     |   0x00 |
+| * LaunchURL                                                         |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * CurrentState                                                      | 0x0000 |
-| * StartTime                                                         | 0x0001 |
-| * Duration                                                          | 0x0002 |
-| * SampledPosition                                                   | 0x0003 |
-| * PlaybackSpeed                                                     | 0x0004 |
-| * SeekRangeEnd                                                      | 0x0005 |
-| * SeekRangeStart                                                    | 0x0006 |
+| * AcceptHeader                                                      | 0x0000 |
+| * SupportedStreamingProtocols                                       | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -14432,339 +13735,359 @@ class TargetNavigatorNavigateTarget : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Play
+ * Command LaunchContent
  */
-class MediaPlaybackPlay : public ClusterCommand
+class ContentLauncherLaunchContent : public ClusterCommand
 {
 public:
-    MediaPlaybackPlay(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("play", credsIssuerConfig)
+    ContentLauncherLaunchContent(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("launch-content", credsIssuerConfig), mComplex_Search(&mRequest.search)
     {
+        AddArgument("Search", &mComplex_Search);
+        AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay);
+        AddArgument("Data", &mRequest.data);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050A, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050A, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Play::Type mRequest;
+    chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type> mComplex_Search;
 };
 
 /*
- * Command Pause
+ * Command LaunchURL
  */
-class MediaPlaybackPause : public ClusterCommand
+class ContentLauncherLaunchURL : public ClusterCommand
 {
 public:
-    MediaPlaybackPause(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause", credsIssuerConfig)
+    ContentLauncherLaunchURL(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("launch-url", credsIssuerConfig), mComplex_BrandingInformation(&mRequest.brandingInformation)
     {
+        AddArgument("ContentURL", &mRequest.contentURL);
+        AddArgument("DisplayString", &mRequest.displayString);
+        AddArgument("BrandingInformation", &mComplex_BrandingInformation);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050A, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050A, 0x00000001, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Pause::Type mRequest;
+    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type>>
+        mComplex_BrandingInformation;
 };
 
-/*
- * Command StopPlayback
- */
-class MediaPlaybackStopPlayback : public ClusterCommand
+class WriteContentLauncherSupportedStreamingProtocols : public WriteAttribute
 {
 public:
-    MediaPlaybackStopPlayback(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-playback", credsIssuerConfig)
+    WriteContentLauncherSupportedStreamingProtocols(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("SupportedStreamingProtocols", credsIssuerConfig)
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "supported-streaming-protocols");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteContentLauncherSupportedStreamingProtocols() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000002, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050A, 0x00000001, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000002, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050A, 0x00000001, mValue);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::StopPlayback::Type mRequest;
+    uint32_t mValue;
 };
 
-/*
- * Command StartOver
- */
-class MediaPlaybackStartOver : public ClusterCommand
-{
-public:
-    MediaPlaybackStartOver(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-over", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000003, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000003, mRequest);
-    }
-
-private:
-    chip::app::Clusters::MediaPlayback::Commands::StartOver::Type mRequest;
-};
+/*----------------------------------------------------------------------------*\
+| Cluster AudioOutput                                                 | 0x050B |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SelectOutput                                                      |   0x00 |
+| * RenameOutput                                                      |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * OutputList                                                        | 0x0000 |
+| * CurrentOutput                                                     | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
 /*
- * Command Previous
+ * Command SelectOutput
  */
-class MediaPlaybackPrevious : public ClusterCommand
+class AudioOutputSelectOutput : public ClusterCommand
 {
 public:
-    MediaPlaybackPrevious(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("previous", credsIssuerConfig)
+    AudioOutputSelectOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-output", credsIssuerConfig)
     {
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000004, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050B, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000004, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050B, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Previous::Type mRequest;
+    chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest;
 };
 
 /*
- * Command Next
+ * Command RenameOutput
  */
-class MediaPlaybackNext : public ClusterCommand
+class AudioOutputRenameOutput : public ClusterCommand
 {
 public:
-    MediaPlaybackNext(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("next", credsIssuerConfig)
+    AudioOutputRenameOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-output", credsIssuerConfig)
     {
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("Name", &mRequest.name);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000005, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050B, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000005, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050B, 0x00000001, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Next::Type mRequest;
+    chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest;
 };
 
-/*
- * Command Rewind
- */
-class MediaPlaybackRewind : public ClusterCommand
-{
-public:
-    MediaPlaybackRewind(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rewind", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000006, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000006, mRequest);
-    }
-
-private:
-    chip::app::Clusters::MediaPlayback::Commands::Rewind::Type mRequest;
-};
+/*----------------------------------------------------------------------------*\
+| Cluster ApplicationLauncher                                         | 0x050C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * LaunchApp                                                         |   0x00 |
+| * StopApp                                                           |   0x01 |
+| * HideApp                                                           |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CatalogList                                                       | 0x0000 |
+| * CurrentApp                                                        | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
 /*
- * Command FastForward
+ * Command LaunchApp
  */
-class MediaPlaybackFastForward : public ClusterCommand
+class ApplicationLauncherLaunchApp : public ClusterCommand
 {
 public:
-    MediaPlaybackFastForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("fast-forward", credsIssuerConfig)
+    ApplicationLauncherLaunchApp(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("launch-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
     {
+        AddArgument("Application", &mComplex_Application);
+        AddArgument("Data", &mRequest.data);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000007, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000007, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::FastForward::Type mRequest;
+    chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
 /*
- * Command SkipForward
+ * Command StopApp
  */
-class MediaPlaybackSkipForward : public ClusterCommand
+class ApplicationLauncherStopApp : public ClusterCommand
 {
 public:
-    MediaPlaybackSkipForward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-forward", credsIssuerConfig)
+    ApplicationLauncherStopApp(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("stop-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
+        AddArgument("Application", &mComplex_Application);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000008, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000008, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000001, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::SkipForward::Type mRequest;
+    chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
 /*
- * Command SkipBackward
+ * Command HideApp
  */
-class MediaPlaybackSkipBackward : public ClusterCommand
+class ApplicationLauncherHideApp : public ClusterCommand
 {
 public:
-    MediaPlaybackSkipBackward(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-backward", credsIssuerConfig)
+    ApplicationLauncherHideApp(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("hide-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
+        AddArgument("Application", &mComplex_Application);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x00000009, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000002, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x00000009, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000002, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Type mRequest;
+    chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
-/*
- * Command Seek
- */
-class MediaPlaybackSeek : public ClusterCommand
+class WriteApplicationLauncherCurrentApp : public WriteAttribute
 {
 public:
-    MediaPlaybackSeek(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("seek", credsIssuerConfig)
+    WriteApplicationLauncherCurrentApp(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("CurrentApp", credsIssuerConfig), mComplex(&mValue)
     {
-        AddArgument("Position", 0, UINT64_MAX, &mRequest.position);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "current-app");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteApplicationLauncherCurrentApp() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000506, 0x0000000B, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000001, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000506, 0x0000000B, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000001, mValue);
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Seek::Type mRequest;
+    chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type>>
+        mComplex;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster MediaInput                                                  | 0x0507 |
+| Cluster ApplicationBasic                                            | 0x050D |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SelectInput                                                       |   0x00 |
-| * ShowInputStatus                                                   |   0x01 |
-| * HideInputStatus                                                   |   0x02 |
-| * RenameInput                                                       |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * InputList                                                         | 0x0000 |
-| * CurrentInput                                                      | 0x0001 |
+| * VendorName                                                        | 0x0000 |
+| * VendorID                                                          | 0x0001 |
+| * ApplicationName                                                   | 0x0002 |
+| * ProductID                                                         | 0x0003 |
+| * Application                                                       | 0x0004 |
+| * Status                                                            | 0x0005 |
+| * ApplicationVersion                                                | 0x0006 |
+| * AllowedVendorList                                                 | 0x0007 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*\
+| Cluster AccountLogin                                                | 0x050E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * GetSetupPIN                                                       |   0x00 |
+| * Login                                                             |   0x02 |
+| * Logout                                                            |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -14775,131 +14098,225 @@ class MediaPlaybackSeek : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command SelectInput
+ * Command GetSetupPIN
  */
-class MediaInputSelectInput : public ClusterCommand
+class AccountLoginGetSetupPIN : public ClusterCommand
 {
 public:
-    MediaInputSelectInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-input", credsIssuerConfig)
+    AccountLoginGetSetupPIN(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-setup-pin", credsIssuerConfig)
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050E, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050E, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest;
+    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest;
 };
 
 /*
- * Command ShowInputStatus
+ * Command Login
  */
-class MediaInputShowInputStatus : public ClusterCommand
+class AccountLoginLogin : public ClusterCommand
 {
 public:
-    MediaInputShowInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("show-input-status", credsIssuerConfig)
+    AccountLoginLogin(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("login", credsIssuerConfig)
     {
+        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
+        AddArgument("SetupPIN", &mRequest.setupPIN);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050E, 0x00000002, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050E, 0x00000002, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type mRequest;
+    chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest;
 };
 
 /*
- * Command HideInputStatus
+ * Command Logout
  */
-class MediaInputHideInputStatus : public ClusterCommand
+class AccountLoginLogout : public ClusterCommand
 {
 public:
-    MediaInputHideInputStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("hide-input-status", credsIssuerConfig)
+    AccountLoginLogout(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("logout", credsIssuerConfig)
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000002) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000002, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050E, 0x00000003, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000002) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000002, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050E, 0x00000003, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type mRequest;
+    chip::app::Clusters::AccountLogin::Commands::Logout::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster Messaging                                                   | 0x0703 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * GetLastMessage                                                    |   0x00 |
+| * MessageConfirmation                                               |   0x01 |
+| * GetMessageCancellation                                            |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command RenameInput
+ * Command GetLastMessage
  */
-class MediaInputRenameInput : public ClusterCommand
+class MessagingGetLastMessage : public ClusterCommand
 {
 public:
-    MediaInputRenameInput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-input", credsIssuerConfig)
+    MessagingGetLastMessage(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-last-message", credsIssuerConfig)
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        AddArgument("Name", &mRequest.name);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000003) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000507, 0x00000003, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000003) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000507, 0x00000003, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest;
+    chip::app::Clusters::Messaging::Commands::GetLastMessage::Type mRequest;
+};
+
+/*
+ * Command MessageConfirmation
+ */
+class MessagingMessageConfirmation : public ClusterCommand
+{
+public:
+    MessagingMessageConfirmation(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("message-confirmation", credsIssuerConfig)
+    {
+        AddArgument("MessageId", 0, UINT32_MAX, &mRequest.messageId);
+        AddArgument("ConfirmationTime", 0, UINT32_MAX, &mRequest.confirmationTime);
+        AddArgument("MessageConfirmationControl", 0, UINT8_MAX, &mRequest.messageConfirmationControl);
+        AddArgument("MessageResponse", &mRequest.messageResponse);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000001) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000001, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000001) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000001, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Messaging::Commands::MessageConfirmation::Type mRequest;
+};
+
+/*
+ * Command GetMessageCancellation
+ */
+class MessagingGetMessageCancellation : public ClusterCommand
+{
+public:
+    MessagingGetMessageCancellation(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-message-cancellation", credsIssuerConfig)
+    {
+        AddArgument("EarliestImplementationTime", 0, UINT32_MAX, &mRequest.earliestImplementationTime);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000002) on endpoint %u", endpointIds.at(0));
+
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000002, mRequest);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000002) on Group %u", groupId);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000002, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Messaging::Commands::GetMessageCancellation::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster LowPower                                                    | 0x0508 |
+| Cluster ApplianceIdentification                                     | 0x0B00 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Sleep                                                             |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * BasicIdentification                                               | 0x0000 |
+| * CompanyName                                                       | 0x0010 |
+| * CompanyId                                                         | 0x0011 |
+| * BrandName                                                         | 0x0012 |
+| * BrandId                                                           | 0x0013 |
+| * Model                                                             | 0x0014 |
+| * PartNumber                                                        | 0x0015 |
+| * ProductRevision                                                   | 0x0016 |
+| * SoftwareRevision                                                  | 0x0017 |
+| * ProductTypeName                                                   | 0x0018 |
+| * ProductTypeId                                                     | 0x0019 |
+| * CecedSpecificationVersion                                         | 0x001A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -14909,40 +14326,65 @@ class MediaInputRenameInput : public ClusterCommand
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-/*
- * Command Sleep
- */
-class LowPowerSleep : public ClusterCommand
+/*----------------------------------------------------------------------------*\
+| Cluster MeterIdentification                                         | 0x0B01 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CompanyName                                                       | 0x0000 |
+| * MeterTypeId                                                       | 0x0001 |
+| * DataQualityId                                                     | 0x0004 |
+| * CustomerName                                                      | 0x0005 |
+| * Model                                                             | 0x0006 |
+| * PartNumber                                                        | 0x0007 |
+| * ProductRevision                                                   | 0x0008 |
+| * SoftwareRevision                                                  | 0x000A |
+| * UtilityName                                                       | 0x000B |
+| * Pod                                                               | 0x000C |
+| * AvailablePower                                                    | 0x000D |
+| * PowerThreshold                                                    | 0x000E |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+class WriteMeterIdentificationCustomerName : public WriteAttribute
 {
 public:
-    LowPowerSleep(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("sleep", credsIssuerConfig)
+    WriteMeterIdentificationCustomerName(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("CustomerName", credsIssuerConfig)
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "customer-name");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteMeterIdentificationCustomerName() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000508, 0x00000000, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B01, 0x00000005, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000508, 0x00000000, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B01, 0x00000005, mValue);
     }
 
 private:
-    chip::app::Clusters::LowPower::Commands::Sleep::Type mRequest;
+    chip::CharSpan mValue;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster KeypadInput                                                 | 0x0509 |
+| Cluster ApplianceEventsAndAlert                                     | 0x0B02 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SendKey                                                           |   0x00 |
+| * GetAlerts                                                         |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * GeneratedCommandList                                              | 0xFFF8 |
@@ -14955,45 +14397,44 @@ class LowPowerSleep : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command SendKey
+ * Command GetAlerts
  */
-class KeypadInputSendKey : public ClusterCommand
+class ApplianceEventsAndAlertGetAlerts : public ClusterCommand
 {
 public:
-    KeypadInputSendKey(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("send-key", credsIssuerConfig)
+    ApplianceEventsAndAlertGetAlerts(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-alerts", credsIssuerConfig)
     {
-        AddArgument("KeyCode", 0, UINT8_MAX, &mRequest.keyCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B02) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000509, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B02, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B02) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000509, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B02, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest;
+    chip::app::Clusters::ApplianceEventsAndAlert::Commands::GetAlerts::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster ContentLauncher                                             | 0x050A |
+| Cluster ApplianceStatistics                                         | 0x0B03 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * LaunchContent                                                     |   0x00 |
-| * LaunchURL                                                         |   0x01 |
+| * LogRequest                                                        |   0x00 |
+| * LogQueueRequest                                                   |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * AcceptHeader                                                      | 0x0000 |
-| * SupportedStreamingProtocols                                       | 0x0001 |
+| * LogMaxSize                                                        | 0x0000 |
+| * LogQueueMaxSize                                                   | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -15004,111 +14445,201 @@ class KeypadInputSendKey : public ClusterCommand
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command LaunchContent
+ * Command LogRequest
  */
-class ContentLauncherLaunchContent : public ClusterCommand
+class ApplianceStatisticsLogRequest : public ClusterCommand
 {
 public:
-    ContentLauncherLaunchContent(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("launch-content", credsIssuerConfig), mComplex_Search(&mRequest.search)
+    ApplianceStatisticsLogRequest(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("log-request", credsIssuerConfig)
     {
-        AddArgument("Search", &mComplex_Search);
-        AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay);
-        AddArgument("Data", &mRequest.data);
+        AddArgument("LogId", 0, UINT32_MAX, &mRequest.logId);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050A, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B03, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050A, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B03, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type> mComplex_Search;
+    chip::app::Clusters::ApplianceStatistics::Commands::LogRequest::Type mRequest;
 };
 
 /*
- * Command LaunchURL
+ * Command LogQueueRequest
  */
-class ContentLauncherLaunchURL : public ClusterCommand
+class ApplianceStatisticsLogQueueRequest : public ClusterCommand
 {
 public:
-    ContentLauncherLaunchURL(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("launch-url", credsIssuerConfig), mComplex_BrandingInformation(&mRequest.brandingInformation)
+    ApplianceStatisticsLogQueueRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("log-queue-request", credsIssuerConfig)
     {
-        AddArgument("ContentURL", &mRequest.contentURL);
-        AddArgument("DisplayString", &mRequest.displayString);
-        AddArgument("BrandingInformation", &mComplex_BrandingInformation);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050A, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B03, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050A, 0x00000001, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type>>
-        mComplex_BrandingInformation;
-};
-
-class WriteContentLauncherSupportedStreamingProtocols : public WriteAttribute
-{
-public:
-    WriteContentLauncherSupportedStreamingProtocols(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("SupportedStreamingProtocols", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "supported-streaming-protocols");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteContentLauncherSupportedStreamingProtocols() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050A, 0x00000001, mValue);
-    }
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000001) on Group %u", groupId);
 
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050A, 0x00000001, mValue);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B03, 0x00000001, mRequest);
     }
 
 private:
-    uint32_t mValue;
+    chip::app::Clusters::ApplianceStatistics::Commands::LogQueueRequest::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster AudioOutput                                                 | 0x050B |
+| Cluster ElectricalMeasurement                                       | 0x0B04 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SelectOutput                                                      |   0x00 |
-| * RenameOutput                                                      |   0x01 |
+| * GetProfileInfoCommand                                             |   0x00 |
+| * GetMeasurementProfileCommand                                      |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * OutputList                                                        | 0x0000 |
-| * CurrentOutput                                                     | 0x0001 |
+| * MeasurementType                                                   | 0x0000 |
+| * DcVoltage                                                         | 0x0100 |
+| * DcVoltageMin                                                      | 0x0101 |
+| * DcVoltageMax                                                      | 0x0102 |
+| * DcCurrent                                                         | 0x0103 |
+| * DcCurrentMin                                                      | 0x0104 |
+| * DcCurrentMax                                                      | 0x0105 |
+| * DcPower                                                           | 0x0106 |
+| * DcPowerMin                                                        | 0x0107 |
+| * DcPowerMax                                                        | 0x0108 |
+| * DcVoltageMultiplier                                               | 0x0200 |
+| * DcVoltageDivisor                                                  | 0x0201 |
+| * DcCurrentMultiplier                                               | 0x0202 |
+| * DcCurrentDivisor                                                  | 0x0203 |
+| * DcPowerMultiplier                                                 | 0x0204 |
+| * DcPowerDivisor                                                    | 0x0205 |
+| * AcFrequency                                                       | 0x0300 |
+| * AcFrequencyMin                                                    | 0x0301 |
+| * AcFrequencyMax                                                    | 0x0302 |
+| * NeutralCurrent                                                    | 0x0303 |
+| * TotalActivePower                                                  | 0x0304 |
+| * TotalReactivePower                                                | 0x0305 |
+| * TotalApparentPower                                                | 0x0306 |
+| * Measured1stHarmonicCurrent                                        | 0x0307 |
+| * Measured3rdHarmonicCurrent                                        | 0x0308 |
+| * Measured5thHarmonicCurrent                                        | 0x0309 |
+| * Measured7thHarmonicCurrent                                        | 0x030A |
+| * Measured9thHarmonicCurrent                                        | 0x030B |
+| * Measured11thHarmonicCurrent                                       | 0x030C |
+| * MeasuredPhase1stHarmonicCurrent                                   | 0x030D |
+| * MeasuredPhase3rdHarmonicCurrent                                   | 0x030E |
+| * MeasuredPhase5thHarmonicCurrent                                   | 0x030F |
+| * MeasuredPhase7thHarmonicCurrent                                   | 0x0310 |
+| * MeasuredPhase9thHarmonicCurrent                                   | 0x0311 |
+| * MeasuredPhase11thHarmonicCurrent                                  | 0x0312 |
+| * AcFrequencyMultiplier                                             | 0x0400 |
+| * AcFrequencyDivisor                                                | 0x0401 |
+| * PowerMultiplier                                                   | 0x0402 |
+| * PowerDivisor                                                      | 0x0403 |
+| * HarmonicCurrentMultiplier                                         | 0x0404 |
+| * PhaseHarmonicCurrentMultiplier                                    | 0x0405 |
+| * InstantaneousVoltage                                              | 0x0500 |
+| * InstantaneousLineCurrent                                          | 0x0501 |
+| * InstantaneousActiveCurrent                                        | 0x0502 |
+| * InstantaneousReactiveCurrent                                      | 0x0503 |
+| * InstantaneousPower                                                | 0x0504 |
+| * RmsVoltage                                                        | 0x0505 |
+| * RmsVoltageMin                                                     | 0x0506 |
+| * RmsVoltageMax                                                     | 0x0507 |
+| * RmsCurrent                                                        | 0x0508 |
+| * RmsCurrentMin                                                     | 0x0509 |
+| * RmsCurrentMax                                                     | 0x050A |
+| * ActivePower                                                       | 0x050B |
+| * ActivePowerMin                                                    | 0x050C |
+| * ActivePowerMax                                                    | 0x050D |
+| * ReactivePower                                                     | 0x050E |
+| * ApparentPower                                                     | 0x050F |
+| * PowerFactor                                                       | 0x0510 |
+| * AverageRmsVoltageMeasurementPeriod                                | 0x0511 |
+| * AverageRmsUnderVoltageCounter                                     | 0x0513 |
+| * RmsExtremeOverVoltagePeriod                                       | 0x0514 |
+| * RmsExtremeUnderVoltagePeriod                                      | 0x0515 |
+| * RmsVoltageSagPeriod                                               | 0x0516 |
+| * RmsVoltageSwellPeriod                                             | 0x0517 |
+| * AcVoltageMultiplier                                               | 0x0600 |
+| * AcVoltageDivisor                                                  | 0x0601 |
+| * AcCurrentMultiplier                                               | 0x0602 |
+| * AcCurrentDivisor                                                  | 0x0603 |
+| * AcPowerMultiplier                                                 | 0x0604 |
+| * AcPowerDivisor                                                    | 0x0605 |
+| * OverloadAlarmsMask                                                | 0x0700 |
+| * VoltageOverload                                                   | 0x0701 |
+| * CurrentOverload                                                   | 0x0702 |
+| * AcOverloadAlarmsMask                                              | 0x0800 |
+| * AcVoltageOverload                                                 | 0x0801 |
+| * AcCurrentOverload                                                 | 0x0802 |
+| * AcActivePowerOverload                                             | 0x0803 |
+| * AcReactivePowerOverload                                           | 0x0804 |
+| * AverageRmsOverVoltage                                             | 0x0805 |
+| * AverageRmsUnderVoltage                                            | 0x0806 |
+| * RmsExtremeOverVoltage                                             | 0x0807 |
+| * RmsExtremeUnderVoltage                                            | 0x0808 |
+| * RmsVoltageSag                                                     | 0x0809 |
+| * RmsVoltageSwell                                                   | 0x080A |
+| * LineCurrentPhaseB                                                 | 0x0901 |
+| * ActiveCurrentPhaseB                                               | 0x0902 |
+| * ReactiveCurrentPhaseB                                             | 0x0903 |
+| * RmsVoltagePhaseB                                                  | 0x0905 |
+| * RmsVoltageMinPhaseB                                               | 0x0906 |
+| * RmsVoltageMaxPhaseB                                               | 0x0907 |
+| * RmsCurrentPhaseB                                                  | 0x0908 |
+| * RmsCurrentMinPhaseB                                               | 0x0909 |
+| * RmsCurrentMaxPhaseB                                               | 0x090A |
+| * ActivePowerPhaseB                                                 | 0x090B |
+| * ActivePowerMinPhaseB                                              | 0x090C |
+| * ActivePowerMaxPhaseB                                              | 0x090D |
+| * ReactivePowerPhaseB                                               | 0x090E |
+| * ApparentPowerPhaseB                                               | 0x090F |
+| * PowerFactorPhaseB                                                 | 0x0910 |
+| * AverageRmsVoltageMeasurementPeriodPhaseB                          | 0x0911 |
+| * AverageRmsOverVoltageCounterPhaseB                                | 0x0912 |
+| * AverageRmsUnderVoltageCounterPhaseB                               | 0x0913 |
+| * RmsExtremeOverVoltagePeriodPhaseB                                 | 0x0914 |
+| * RmsExtremeUnderVoltagePeriodPhaseB                                | 0x0915 |
+| * RmsVoltageSagPeriodPhaseB                                         | 0x0916 |
+| * RmsVoltageSwellPeriodPhaseB                                       | 0x0917 |
+| * LineCurrentPhaseC                                                 | 0x0A01 |
+| * ActiveCurrentPhaseC                                               | 0x0A02 |
+| * ReactiveCurrentPhaseC                                             | 0x0A03 |
+| * RmsVoltagePhaseC                                                  | 0x0A05 |
+| * RmsVoltageMinPhaseC                                               | 0x0A06 |
+| * RmsVoltageMaxPhaseC                                               | 0x0A07 |
+| * RmsCurrentPhaseC                                                  | 0x0A08 |
+| * RmsCurrentMinPhaseC                                               | 0x0A09 |
+| * RmsCurrentMaxPhaseC                                               | 0x0A0A |
+| * ActivePowerPhaseC                                                 | 0x0A0B |
+| * ActivePowerMinPhaseC                                              | 0x0A0C |
+| * ActivePowerMaxPhaseC                                              | 0x0A0D |
+| * ReactivePowerPhaseC                                               | 0x0A0E |
+| * ApparentPowerPhaseC                                               | 0x0A0F |
+| * PowerFactorPhaseC                                                 | 0x0A10 |
+| * AverageRmsVoltageMeasurementPeriodPhaseC                          | 0x0A11 |
+| * AverageRmsOverVoltageCounterPhaseC                                | 0x0A12 |
+| * AverageRmsUnderVoltageCounterPhaseC                               | 0x0A13 |
+| * RmsExtremeOverVoltagePeriodPhaseC                                 | 0x0A14 |
+| * RmsExtremeUnderVoltagePeriodPhaseC                                | 0x0A15 |
+| * RmsVoltageSagPeriodPhaseC                                         | 0x0A16 |
+| * RmsVoltageSwellPeriodPhaseC                                       | 0x0A17 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -15119,345 +14650,286 @@ class WriteContentLauncherSupportedStreamingProtocols : public WriteAttribute
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command SelectOutput
+ * Command GetProfileInfoCommand
  */
-class AudioOutputSelectOutput : public ClusterCommand
+class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand
 {
 public:
-    AudioOutputSelectOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("select-output", credsIssuerConfig)
+    ElectricalMeasurementGetProfileInfoCommand(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-profile-info-command", credsIssuerConfig)
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050B, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050B, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000000, mRequest);
     }
 
 private:
-    chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest;
+    chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Type mRequest;
 };
 
 /*
- * Command RenameOutput
+ * Command GetMeasurementProfileCommand
  */
-class AudioOutputRenameOutput : public ClusterCommand
+class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand
 {
 public:
-    AudioOutputRenameOutput(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("rename-output", credsIssuerConfig)
+    ElectricalMeasurementGetMeasurementProfileCommand(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("get-measurement-profile-command", credsIssuerConfig)
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        AddArgument("Name", &mRequest.name);
+        AddArgument("AttributeId", 0, UINT16_MAX, &mRequest.attributeId);
+        AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime);
+        AddArgument("NumberOfIntervals", 0, UINT8_MAX, &mRequest.numberOfIntervals);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050B, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050B, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000001, mRequest);
     }
 
 private:
-    chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest;
+    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ApplicationLauncher                                         | 0x050C |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * LaunchApp                                                         |   0x00 |
-| * StopApp                                                           |   0x01 |
-| * HideApp                                                           |   0x02 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CatalogList                                                       | 0x0000 |
-| * CurrentApp                                                        | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command LaunchApp
- */
-class ApplicationLauncherLaunchApp : public ClusterCommand
+class WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public WriteAttribute
 {
 public:
-    ApplicationLauncherLaunchApp(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("launch-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
+    WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("AverageRmsVoltageMeasurementPeriod", credsIssuerConfig)
     {
-        AddArgument("Application", &mComplex_Application);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
-    }
+        AddArgument("attr-name", "average-rms-voltage-measurement-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000000, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000511, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000000, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000511, mValue);
     }
 
 private:
-    chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
+    uint16_t mValue;
 };
 
-/*
- * Command StopApp
- */
-class ApplicationLauncherStopApp : public ClusterCommand
+class WriteElectricalMeasurementAverageRmsUnderVoltageCounter : public WriteAttribute
 {
 public:
-    ApplicationLauncherStopApp(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("stop-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
+    WriteElectricalMeasurementAverageRmsUnderVoltageCounter(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("AverageRmsUnderVoltageCounter", credsIssuerConfig)
     {
-        AddArgument("Application", &mComplex_Application);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "average-rms-under-voltage-counter");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteElectricalMeasurementAverageRmsUnderVoltageCounter() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000001, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000513, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000001, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000513, mValue);
     }
 
 private:
-    chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
+    uint16_t mValue;
 };
 
-/*
- * Command HideApp
- */
-class ApplicationLauncherHideApp : public ClusterCommand
+class WriteElectricalMeasurementRmsExtremeOverVoltagePeriod : public WriteAttribute
 {
 public:
-    ApplicationLauncherHideApp(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("hide-app", credsIssuerConfig), mComplex_Application(&mRequest.application)
+    WriteElectricalMeasurementRmsExtremeOverVoltagePeriod(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("RmsExtremeOverVoltagePeriod", credsIssuerConfig)
     {
-        AddArgument("Application", &mComplex_Application);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "rms-extreme-over-voltage-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000002, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000514, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000002, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000514, mValue);
     }
 
 private:
-    chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
+    uint16_t mValue;
 };
 
-class WriteApplicationLauncherCurrentApp : public WriteAttribute
+class WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod : public WriteAttribute
 {
 public:
-    WriteApplicationLauncherCurrentApp(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("CurrentApp", credsIssuerConfig), mComplex(&mValue)
+    WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("RmsExtremeUnderVoltagePeriod", credsIssuerConfig)
     {
-        AddArgument("attr-name", "current-app");
-        AddArgument("attr-value", &mComplex);
+        AddArgument("attr-name", "rms-extreme-under-voltage-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteApplicationLauncherCurrentApp() {}
+    ~WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050C, 0x00000001, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000515, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050C, 0x00000001, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000515, mValue);
     }
 
 private:
-    chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type>>
-        mComplex;
+    uint16_t mValue;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ApplicationBasic                                            | 0x050D |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * VendorName                                                        | 0x0000 |
-| * VendorID                                                          | 0x0001 |
-| * ApplicationName                                                   | 0x0002 |
-| * ProductID                                                         | 0x0003 |
-| * Application                                                       | 0x0004 |
-| * Status                                                            | 0x0005 |
-| * ApplicationVersion                                                | 0x0006 |
-| * AllowedVendorList                                                 | 0x0007 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+class WriteElectricalMeasurementRmsVoltageSagPeriod : public WriteAttribute
+{
+public:
+    WriteElectricalMeasurementRmsVoltageSagPeriod(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("RmsVoltageSagPeriod", credsIssuerConfig)
+    {
+        AddArgument("attr-name", "rms-voltage-sag-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
 
-/*----------------------------------------------------------------------------*\
-| Cluster AccountLogin                                                | 0x050E |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * GetSetupPIN                                                       |   0x00 |
-| * Login                                                             |   0x02 |
-| * Logout                                                            |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+    ~WriteElectricalMeasurementRmsVoltageSagPeriod() {}
 
-/*
- * Command GetSetupPIN
- */
-class AccountLoginGetSetupPIN : public ClusterCommand
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000516, mValue);
+    }
+
+    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
+    {
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000516, mValue);
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class WriteElectricalMeasurementRmsVoltageSwellPeriod : public WriteAttribute
 {
 public:
-    AccountLoginGetSetupPIN(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-setup-pin", credsIssuerConfig)
+    WriteElectricalMeasurementRmsVoltageSwellPeriod(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("RmsVoltageSwellPeriod", credsIssuerConfig)
     {
-        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "rms-voltage-swell-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteElectricalMeasurementRmsVoltageSwellPeriod() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050E, 0x00000000, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000517, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050E, 0x00000000, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000517, mValue);
     }
 
 private:
-    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest;
+    uint16_t mValue;
 };
 
-/*
- * Command Login
- */
-class AccountLoginLogin : public ClusterCommand
+class WriteElectricalMeasurementOverloadAlarmsMask : public WriteAttribute
 {
 public:
-    AccountLoginLogin(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("login", credsIssuerConfig)
+    WriteElectricalMeasurementOverloadAlarmsMask(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("OverloadAlarmsMask", credsIssuerConfig)
     {
-        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
-        AddArgument("SetupPIN", &mRequest.setupPIN);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "overload-alarms-mask");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteElectricalMeasurementOverloadAlarmsMask() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050E, 0x00000002, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000700, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050E, 0x00000002, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000700, mValue);
     }
 
 private:
-    chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest;
+    uint8_t mValue;
 };
 
-/*
- * Command Logout
- */
-class AccountLoginLogout : public ClusterCommand
+class WriteElectricalMeasurementAcOverloadAlarmsMask : public WriteAttribute
 {
 public:
-    AccountLoginLogout(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("logout", credsIssuerConfig)
+    WriteElectricalMeasurementAcOverloadAlarmsMask(CredentialIssuerCommands * credsIssuerConfig) :
+        WriteAttribute("AcOverloadAlarmsMask", credsIssuerConfig)
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "ac-overload-alarms-mask");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteElectricalMeasurementAcOverloadAlarmsMask() {}
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050E, 0x00000003, mRequest);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000800, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050E, 0x00000003, mRequest);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000800, mValue);
     }
 
 private:
-    chip::app::Clusters::AccountLogin::Commands::Logout::Type mRequest;
+    uint16_t mValue;
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster TestCluster                                                 | 0x050F |
+| Cluster TestCluster                                                 | 0xFFF1FC05|
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * Test                                                              |   0x00 |
@@ -15589,16 +15061,16 @@ class TestClusterTest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000000) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000000) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000000, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000000, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000000) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000000) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000000, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000000, mRequest);
     }
 
 private:
@@ -15618,16 +15090,16 @@ class TestClusterTestNotHandled : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000001) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000001) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000001, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000001, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000001) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000001) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000001, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000001, mRequest);
     }
 
 private:
@@ -15647,16 +15119,16 @@ class TestClusterTestSpecific : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000002) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000002) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000002, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000002, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000002) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000002) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000002, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000002, mRequest);
     }
 
 private:
@@ -15677,16 +15149,16 @@ class TestClusterTestUnknownCommand : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000003) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000003) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000003, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000003, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000003) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000003) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000003, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000003, mRequest);
     }
 
 private:
@@ -15709,16 +15181,16 @@ class TestClusterTestAddArguments : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000004) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000004) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000004, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000004, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000004) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000004) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000004, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000004, mRequest);
     }
 
 private:
@@ -15740,16 +15212,16 @@ class TestClusterTestSimpleArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000005) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000005) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000005, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000005, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000005) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000005) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000005, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000005, mRequest);
     }
 
 private:
@@ -15777,16 +15249,16 @@ class TestClusterTestStructArrayArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000006) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000006) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000006, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000006, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000006) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000006) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000006, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000006, mRequest);
     }
 
 private:
@@ -15814,16 +15286,16 @@ class TestClusterTestStructArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000007) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000007) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000007, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000007, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000007) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000007) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000007, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000007, mRequest);
     }
 
 private:
@@ -15846,16 +15318,16 @@ class TestClusterTestNestedStructArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000008) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000008) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000008, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000008, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000008) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000008) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000008, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000008, mRequest);
     }
 
 private:
@@ -15878,16 +15350,16 @@ class TestClusterTestListStructArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000009) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000009) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000009, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000009, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000009) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000009) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000009, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000009, mRequest);
     }
 
 private:
@@ -15911,16 +15383,16 @@ class TestClusterTestListInt8UArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000A) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000A) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000A, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000A, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000A) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000A) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000A, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000A, mRequest);
     }
 
 private:
@@ -15943,16 +15415,16 @@ class TestClusterTestNestedStructListArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000B) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000B) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000B, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000B, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000B) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000B) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000B, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000B, mRequest);
     }
 
 private:
@@ -15975,16 +15447,16 @@ class TestClusterTestListNestedStructListArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000C) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000C) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000C, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000C, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000C) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000C) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000C, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000C, mRequest);
     }
 
 private:
@@ -16008,16 +15480,16 @@ class TestClusterTestListInt8UReverseRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000D) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000D) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000D, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000D, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000D) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000D) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000D, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000D, mRequest);
     }
 
 private:
@@ -16041,16 +15513,16 @@ class TestClusterTestEnumsRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000E) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000E) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000E, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000E, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000E) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000E) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000E, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000E, mRequest);
     }
 
 private:
@@ -16072,16 +15544,16 @@ class TestClusterTestNullableOptionalRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000F) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000F) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000F, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000F, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000F) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000F) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000F, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000F, mRequest);
     }
 
 private:
@@ -16117,16 +15589,16 @@ class TestClusterTestComplexNullableOptionalRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000010) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000010) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000010, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000010, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000010) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000010) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000010, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000010, mRequest);
     }
 
 private:
@@ -16162,16 +15634,16 @@ class TestClusterSimpleStructEchoRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000011) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000011) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000011, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000011, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000011) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000011) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000011, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000011, mRequest);
     }
 
 private:
@@ -16193,16 +15665,16 @@ class TestClusterTimedInvokeRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000012) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000012) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000012, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000012, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000012) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000012) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000012, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000012, mRequest);
     }
 
 private:
@@ -16224,16 +15696,16 @@ class TestClusterTestSimpleOptionalArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000013) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000013) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000013, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000013, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000013) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000013) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000013, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000013, mRequest);
     }
 
 private:
@@ -16257,16 +15729,16 @@ class TestClusterTestEmitTestEventRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000014) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000014) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000014, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000014, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000014) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000014) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000014, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000014, mRequest);
     }
 
 private:
@@ -16288,16 +15760,16 @@ class TestClusterTestEmitTestFabricScopedEventRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000015) on endpoint %u", endpointIds.at(0));
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000015) on endpoint %u", endpointIds.at(0));
 
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000015, mRequest);
+        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000015, mRequest);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000015) on Group %u", groupId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000015) on Group %u", groupId);
 
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000015, mRequest);
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000015, mRequest);
     }
 
 private:
@@ -16318,12 +15790,12 @@ class WriteTestClusterBoolean : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000000, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000000, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000000, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000000, mValue);
     }
 
 private:
@@ -16344,16 +15816,16 @@ class WriteTestClusterBitmap8 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000001, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000001, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000001, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000001, mValue);
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> mValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> mValue;
 };
 
 class WriteTestClusterBitmap16 : public WriteAttribute
@@ -16370,16 +15842,16 @@ class WriteTestClusterBitmap16 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000002, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000002, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000002, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000002, mValue);
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> mValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> mValue;
 };
 
 class WriteTestClusterBitmap32 : public WriteAttribute
@@ -16396,16 +15868,16 @@ class WriteTestClusterBitmap32 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000003, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000003, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000003, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000003, mValue);
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> mValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> mValue;
 };
 
 class WriteTestClusterBitmap64 : public WriteAttribute
@@ -16422,16 +15894,16 @@ class WriteTestClusterBitmap64 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000004, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000004, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000004, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000004, mValue);
     }
 
 private:
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> mValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> mValue;
 };
 
 class WriteTestClusterInt8u : public WriteAttribute
@@ -16448,12 +15920,12 @@ class WriteTestClusterInt8u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000005, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000005, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000005, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000005, mValue);
     }
 
 private:
@@ -16474,12 +15946,12 @@ class WriteTestClusterInt16u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000006, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000006, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000006, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000006, mValue);
     }
 
 private:
@@ -16500,12 +15972,12 @@ class WriteTestClusterInt24u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000007, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000007, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000007, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000007, mValue);
     }
 
 private:
@@ -16526,12 +15998,12 @@ class WriteTestClusterInt32u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000008, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000008, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000008, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000008, mValue);
     }
 
 private:
@@ -16552,12 +16024,12 @@ class WriteTestClusterInt40u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000009, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000009, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000009, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000009, mValue);
     }
 
 private:
@@ -16578,12 +16050,12 @@ class WriteTestClusterInt48u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000A, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000A, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000A, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000A, mValue);
     }
 
 private:
@@ -16604,12 +16076,12 @@ class WriteTestClusterInt56u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000B, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000B, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000B, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000B, mValue);
     }
 
 private:
@@ -16630,12 +16102,12 @@ class WriteTestClusterInt64u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000C, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000C, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000C, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000C, mValue);
     }
 
 private:
@@ -16656,12 +16128,12 @@ class WriteTestClusterInt8s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000D, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000D, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000D, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000D, mValue);
     }
 
 private:
@@ -16682,12 +16154,12 @@ class WriteTestClusterInt16s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000E, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000E, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000E, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000E, mValue);
     }
 
 private:
@@ -16708,12 +16180,12 @@ class WriteTestClusterInt24s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000000F, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000000F, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000000F, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000000F, mValue);
     }
 
 private:
@@ -16734,12 +16206,12 @@ class WriteTestClusterInt32s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000010, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000010, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000010, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000010, mValue);
     }
 
 private:
@@ -16760,12 +16232,12 @@ class WriteTestClusterInt40s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000011, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000011, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000011, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000011, mValue);
     }
 
 private:
@@ -16786,12 +16258,12 @@ class WriteTestClusterInt48s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000012, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000012, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000012, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000012, mValue);
     }
 
 private:
@@ -16812,12 +16284,12 @@ class WriteTestClusterInt56s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000013, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000013, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000013, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000013, mValue);
     }
 
 private:
@@ -16838,12 +16310,12 @@ class WriteTestClusterInt64s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000014, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000014, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000014, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000014, mValue);
     }
 
 private:
@@ -16864,12 +16336,12 @@ class WriteTestClusterEnum8 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000015, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000015, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000015, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000015, mValue);
     }
 
 private:
@@ -16890,12 +16362,12 @@ class WriteTestClusterEnum16 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000016, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000016, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000016, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000016, mValue);
     }
 
 private:
@@ -16916,12 +16388,12 @@ class WriteTestClusterFloatSingle : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000017, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000017, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000017, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000017, mValue);
     }
 
 private:
@@ -16942,12 +16414,12 @@ class WriteTestClusterFloatDouble : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000018, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000018, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000018, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000018, mValue);
     }
 
 private:
@@ -16968,12 +16440,12 @@ class WriteTestClusterOctetString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000019, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000019, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000019, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000019, mValue);
     }
 
 private:
@@ -16995,12 +16467,12 @@ class WriteTestClusterListInt8u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000001A, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000001A, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000001A, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000001A, mValue);
     }
 
 private:
@@ -17023,12 +16495,12 @@ class WriteTestClusterListOctetString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000001B, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000001B, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000001B, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000001B, mValue);
     }
 
 private:
@@ -17051,12 +16523,12 @@ class WriteTestClusterListStructOctetString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000001C, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000001C, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000001C, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000001C, mValue);
     }
 
 private:
@@ -17080,12 +16552,12 @@ class WriteTestClusterLongOctetString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000001D, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000001D, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000001D, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000001D, mValue);
     }
 
 private:
@@ -17106,12 +16578,12 @@ class WriteTestClusterCharString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000001E, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000001E, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000001E, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000001E, mValue);
     }
 
 private:
@@ -17133,12 +16605,12 @@ class WriteTestClusterLongCharString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000001F, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000001F, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000001F, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000001F, mValue);
     }
 
 private:
@@ -17159,12 +16631,12 @@ class WriteTestClusterEpochUs : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000020, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000020, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000020, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000020, mValue);
     }
 
 private:
@@ -17185,12 +16657,12 @@ class WriteTestClusterEpochS : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000021, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000021, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000021, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000021, mValue);
     }
 
 private:
@@ -17211,12 +16683,12 @@ class WriteTestClusterVendorId : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000022, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000022, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000022, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000022, mValue);
     }
 
 private:
@@ -17238,12 +16710,12 @@ class WriteTestClusterListNullablesAndOptionalsStruct : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000023, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000023, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000023, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000023, mValue);
     }
 
 private:
@@ -17267,12 +16739,12 @@ class WriteTestClusterEnumAttr : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000024, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000024, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000024, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000024, mValue);
     }
 
 private:
@@ -17294,12 +16766,12 @@ class WriteTestClusterStructAttr : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000025, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000025, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000025, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000025, mValue);
     }
 
 private:
@@ -17322,12 +16794,12 @@ class WriteTestClusterRangeRestrictedInt8u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000026, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000026, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000026, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000026, mValue);
     }
 
 private:
@@ -17349,12 +16821,12 @@ class WriteTestClusterRangeRestrictedInt8s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000027, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000027, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000027, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000027, mValue);
     }
 
 private:
@@ -17376,12 +16848,12 @@ class WriteTestClusterRangeRestrictedInt16u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000028, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000028, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000028, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000028, mValue);
     }
 
 private:
@@ -17403,12 +16875,12 @@ class WriteTestClusterRangeRestrictedInt16s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000029, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000029, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000029, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000029, mValue);
     }
 
 private:
@@ -17430,12 +16902,12 @@ class WriteTestClusterListLongOctetString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000002A, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000002A, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000002A, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000002A, mValue);
     }
 
 private:
@@ -17458,12 +16930,12 @@ class WriteTestClusterListFabricScoped : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000002B, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000002B, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000002B, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000002B, mValue);
     }
 
 private:
@@ -17487,12 +16959,12 @@ class WriteTestClusterTimedWriteBoolean : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000030, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000030, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000030, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000030, mValue);
     }
 
 private:
@@ -17514,12 +16986,12 @@ class WriteTestClusterGeneralErrorBoolean : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000031, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000031, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000031, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000031, mValue);
     }
 
 private:
@@ -17541,12 +17013,12 @@ class WriteTestClusterClusterErrorBoolean : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00000032, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00000032, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00000032, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00000032, mValue);
     }
 
 private:
@@ -17567,12 +17039,12 @@ class WriteTestClusterUnsupported : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x000000FF, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x000000FF, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x000000FF, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x000000FF, mValue);
     }
 
 private:
@@ -17594,12 +17066,12 @@ class WriteTestClusterNullableBoolean : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004000, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004000, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004000, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004000, mValue);
     }
 
 private:
@@ -17621,16 +17093,16 @@ class WriteTestClusterNullableBitmap8 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004001, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004001, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004001, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004001, mValue);
     }
 
 private:
-    chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> mValue;
+    chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> mValue;
 };
 
 class WriteTestClusterNullableBitmap16 : public WriteAttribute
@@ -17648,16 +17120,16 @@ class WriteTestClusterNullableBitmap16 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004002, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004002, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004002, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004002, mValue);
     }
 
 private:
-    chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> mValue;
+    chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> mValue;
 };
 
 class WriteTestClusterNullableBitmap32 : public WriteAttribute
@@ -17675,16 +17147,16 @@ class WriteTestClusterNullableBitmap32 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004003, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004003, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004003, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004003, mValue);
     }
 
 private:
-    chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> mValue;
+    chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> mValue;
 };
 
 class WriteTestClusterNullableBitmap64 : public WriteAttribute
@@ -17702,16 +17174,16 @@ class WriteTestClusterNullableBitmap64 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004004, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004004, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004004, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004004, mValue);
     }
 
 private:
-    chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> mValue;
+    chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> mValue;
 };
 
 class WriteTestClusterNullableInt8u : public WriteAttribute
@@ -17728,12 +17200,12 @@ class WriteTestClusterNullableInt8u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004005, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004005, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004005, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004005, mValue);
     }
 
 private:
@@ -17755,12 +17227,12 @@ class WriteTestClusterNullableInt16u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004006, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004006, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004006, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004006, mValue);
     }
 
 private:
@@ -17782,12 +17254,12 @@ class WriteTestClusterNullableInt24u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004007, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004007, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004007, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004007, mValue);
     }
 
 private:
@@ -17809,12 +17281,12 @@ class WriteTestClusterNullableInt32u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004008, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004008, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004008, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004008, mValue);
     }
 
 private:
@@ -17836,12 +17308,12 @@ class WriteTestClusterNullableInt40u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004009, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004009, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004009, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004009, mValue);
     }
 
 private:
@@ -17863,12 +17335,12 @@ class WriteTestClusterNullableInt48u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400A, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000400A, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400A, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000400A, mValue);
     }
 
 private:
@@ -17890,12 +17362,12 @@ class WriteTestClusterNullableInt56u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400B, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000400B, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400B, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000400B, mValue);
     }
 
 private:
@@ -17917,12 +17389,12 @@ class WriteTestClusterNullableInt64u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400C, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000400C, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400C, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000400C, mValue);
     }
 
 private:
@@ -17943,12 +17415,12 @@ class WriteTestClusterNullableInt8s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400D, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000400D, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400D, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000400D, mValue);
     }
 
 private:
@@ -17970,12 +17442,12 @@ class WriteTestClusterNullableInt16s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400E, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000400E, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400E, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000400E, mValue);
     }
 
 private:
@@ -17997,12 +17469,12 @@ class WriteTestClusterNullableInt24s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400F, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000400F, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400F, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000400F, mValue);
     }
 
 private:
@@ -18024,12 +17496,12 @@ class WriteTestClusterNullableInt32s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004010, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004010, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004010, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004010, mValue);
     }
 
 private:
@@ -18051,12 +17523,12 @@ class WriteTestClusterNullableInt40s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004011, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004011, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004011, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004011, mValue);
     }
 
 private:
@@ -18078,12 +17550,12 @@ class WriteTestClusterNullableInt48s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004012, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004012, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004012, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004012, mValue);
     }
 
 private:
@@ -18105,12 +17577,12 @@ class WriteTestClusterNullableInt56s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004013, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004013, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004013, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004013, mValue);
     }
 
 private:
@@ -18132,12 +17604,12 @@ class WriteTestClusterNullableInt64s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004014, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004014, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004014, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004014, mValue);
     }
 
 private:
@@ -18158,12 +17630,12 @@ class WriteTestClusterNullableEnum8 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004015, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004015, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004015, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004015, mValue);
     }
 
 private:
@@ -18185,12 +17657,12 @@ class WriteTestClusterNullableEnum16 : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004016, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004016, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004016, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004016, mValue);
     }
 
 private:
@@ -18212,12 +17684,12 @@ class WriteTestClusterNullableFloatSingle : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004017, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004017, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004017, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004017, mValue);
     }
 
 private:
@@ -18239,12 +17711,12 @@ class WriteTestClusterNullableFloatDouble : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004018, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004018, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004018, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004018, mValue);
     }
 
 private:
@@ -18266,12 +17738,12 @@ class WriteTestClusterNullableOctetString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004019, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004019, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004019, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004019, mValue);
     }
 
 private:
@@ -18293,12 +17765,12 @@ class WriteTestClusterNullableCharString : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000401E, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x0000401E, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000401E, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x0000401E, mValue);
     }
 
 private:
@@ -18320,12 +17792,12 @@ class WriteTestClusterNullableEnumAttr : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004024, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004024, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004024, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004024, mValue);
     }
 
 private:
@@ -18347,12 +17819,12 @@ class WriteTestClusterNullableStruct : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004025, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004025, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004025, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004025, mValue);
     }
 
 private:
@@ -18375,12 +17847,12 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004026, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004026, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004026, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004026, mValue);
     }
 
 private:
@@ -18402,12 +17874,12 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004027, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004027, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004027, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004027, mValue);
     }
 
 private:
@@ -18429,12 +17901,12 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004028, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004028, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004028, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004028, mValue);
     }
 
 private:
@@ -18456,12 +17928,12 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public WriteAttribute
 
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
     {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004029, mValue);
+        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0xFFF1FC05, 0x00004029, mValue);
     }
 
     CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
     {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004029, mValue);
+        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0xFFF1FC05, 0x00004029, mValue);
     }
 
 private:
@@ -18469,2061 +17941,249 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public WriteAttribute
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster Messaging                                                   | 0x0703 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * GetLastMessage                                                    |   0x00 |
-| * MessageConfirmation                                               |   0x01 |
-| * GetMessageCancellation                                            |   0x02 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
+| Register all Clusters commands                                               |
 \*----------------------------------------------------------------------------*/
-
-/*
- * Command GetLastMessage
- */
-class MessagingGetLastMessage : public ClusterCommand
+void registerClusterPowerConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-public:
-    MessagingGetLastMessage(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-last-message", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000000, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000000, mRequest);
-    }
-
-private:
-    chip::app::Clusters::Messaging::Commands::GetLastMessage::Type mRequest;
-};
-
-/*
- * Command MessageConfirmation
- */
-class MessagingMessageConfirmation : public ClusterCommand
-{
-public:
-    MessagingMessageConfirmation(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("message-confirmation", credsIssuerConfig)
-    {
-        AddArgument("MessageId", 0, UINT32_MAX, &mRequest.messageId);
-        AddArgument("ConfirmationTime", 0, UINT32_MAX, &mRequest.confirmationTime);
-        AddArgument("MessageConfirmationControl", 0, UINT8_MAX, &mRequest.messageConfirmationControl);
-        AddArgument("MessageResponse", &mRequest.messageResponse);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000001) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000001, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000001) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000001, mRequest);
-    }
-
-private:
-    chip::app::Clusters::Messaging::Commands::MessageConfirmation::Type mRequest;
-};
-
-/*
- * Command GetMessageCancellation
- */
-class MessagingGetMessageCancellation : public ClusterCommand
-{
-public:
-    MessagingGetMessageCancellation(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-message-cancellation", credsIssuerConfig)
-    {
-        AddArgument("EarliestImplementationTime", 0, UINT32_MAX, &mRequest.earliestImplementationTime);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000002) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000002, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000002) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000002, mRequest);
-    }
-
-private:
-    chip::app::Clusters::Messaging::Commands::GetMessageCancellation::Type mRequest;
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster ApplianceIdentification                                     | 0x0B00 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * BasicIdentification                                               | 0x0000 |
-| * CompanyName                                                       | 0x0010 |
-| * CompanyId                                                         | 0x0011 |
-| * BrandName                                                         | 0x0012 |
-| * BrandId                                                           | 0x0013 |
-| * Model                                                             | 0x0014 |
-| * PartNumber                                                        | 0x0015 |
-| * ProductRevision                                                   | 0x0016 |
-| * SoftwareRevision                                                  | 0x0017 |
-| * ProductTypeName                                                   | 0x0018 |
-| * ProductTypeId                                                     | 0x0019 |
-| * CecedSpecificationVersion                                         | 0x001A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*\
-| Cluster MeterIdentification                                         | 0x0B01 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CompanyName                                                       | 0x0000 |
-| * MeterTypeId                                                       | 0x0001 |
-| * DataQualityId                                                     | 0x0004 |
-| * CustomerName                                                      | 0x0005 |
-| * Model                                                             | 0x0006 |
-| * PartNumber                                                        | 0x0007 |
-| * ProductRevision                                                   | 0x0008 |
-| * SoftwareRevision                                                  | 0x000A |
-| * UtilityName                                                       | 0x000B |
-| * Pod                                                               | 0x000C |
-| * AvailablePower                                                    | 0x000D |
-| * PowerThreshold                                                    | 0x000E |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-class WriteMeterIdentificationCustomerName : public WriteAttribute
-{
-public:
-    WriteMeterIdentificationCustomerName(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("CustomerName", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "customer-name");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteMeterIdentificationCustomerName() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B01, 0x00000005, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B01, 0x00000005, mValue);
-    }
-
-private:
-    chip::CharSpan mValue;
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster ApplianceEventsAndAlert                                     | 0x0B02 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * GetAlerts                                                         |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command GetAlerts
- */
-class ApplianceEventsAndAlertGetAlerts : public ClusterCommand
-{
-public:
-    ApplianceEventsAndAlertGetAlerts(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-alerts", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B02) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B02, 0x00000000, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B02) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B02, 0x00000000, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ApplianceEventsAndAlert::Commands::GetAlerts::Type mRequest;
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster ApplianceStatistics                                         | 0x0B03 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * LogRequest                                                        |   0x00 |
-| * LogQueueRequest                                                   |   0x01 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * LogMaxSize                                                        | 0x0000 |
-| * LogQueueMaxSize                                                   | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command LogRequest
- */
-class ApplianceStatisticsLogRequest : public ClusterCommand
-{
-public:
-    ApplianceStatisticsLogRequest(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("log-request", credsIssuerConfig)
-    {
-        AddArgument("LogId", 0, UINT32_MAX, &mRequest.logId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B03, 0x00000000, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B03, 0x00000000, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ApplianceStatistics::Commands::LogRequest::Type mRequest;
-};
-
-/*
- * Command LogQueueRequest
- */
-class ApplianceStatisticsLogQueueRequest : public ClusterCommand
-{
-public:
-    ApplianceStatisticsLogQueueRequest(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("log-queue-request", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000001) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B03, 0x00000001, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B03) command (0x00000001) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B03, 0x00000001, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ApplianceStatistics::Commands::LogQueueRequest::Type mRequest;
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster ElectricalMeasurement                                       | 0x0B04 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * GetProfileInfoCommand                                             |   0x00 |
-| * GetMeasurementProfileCommand                                      |   0x01 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasurementType                                                   | 0x0000 |
-| * DcVoltage                                                         | 0x0100 |
-| * DcVoltageMin                                                      | 0x0101 |
-| * DcVoltageMax                                                      | 0x0102 |
-| * DcCurrent                                                         | 0x0103 |
-| * DcCurrentMin                                                      | 0x0104 |
-| * DcCurrentMax                                                      | 0x0105 |
-| * DcPower                                                           | 0x0106 |
-| * DcPowerMin                                                        | 0x0107 |
-| * DcPowerMax                                                        | 0x0108 |
-| * DcVoltageMultiplier                                               | 0x0200 |
-| * DcVoltageDivisor                                                  | 0x0201 |
-| * DcCurrentMultiplier                                               | 0x0202 |
-| * DcCurrentDivisor                                                  | 0x0203 |
-| * DcPowerMultiplier                                                 | 0x0204 |
-| * DcPowerDivisor                                                    | 0x0205 |
-| * AcFrequency                                                       | 0x0300 |
-| * AcFrequencyMin                                                    | 0x0301 |
-| * AcFrequencyMax                                                    | 0x0302 |
-| * NeutralCurrent                                                    | 0x0303 |
-| * TotalActivePower                                                  | 0x0304 |
-| * TotalReactivePower                                                | 0x0305 |
-| * TotalApparentPower                                                | 0x0306 |
-| * Measured1stHarmonicCurrent                                        | 0x0307 |
-| * Measured3rdHarmonicCurrent                                        | 0x0308 |
-| * Measured5thHarmonicCurrent                                        | 0x0309 |
-| * Measured7thHarmonicCurrent                                        | 0x030A |
-| * Measured9thHarmonicCurrent                                        | 0x030B |
-| * Measured11thHarmonicCurrent                                       | 0x030C |
-| * MeasuredPhase1stHarmonicCurrent                                   | 0x030D |
-| * MeasuredPhase3rdHarmonicCurrent                                   | 0x030E |
-| * MeasuredPhase5thHarmonicCurrent                                   | 0x030F |
-| * MeasuredPhase7thHarmonicCurrent                                   | 0x0310 |
-| * MeasuredPhase9thHarmonicCurrent                                   | 0x0311 |
-| * MeasuredPhase11thHarmonicCurrent                                  | 0x0312 |
-| * AcFrequencyMultiplier                                             | 0x0400 |
-| * AcFrequencyDivisor                                                | 0x0401 |
-| * PowerMultiplier                                                   | 0x0402 |
-| * PowerDivisor                                                      | 0x0403 |
-| * HarmonicCurrentMultiplier                                         | 0x0404 |
-| * PhaseHarmonicCurrentMultiplier                                    | 0x0405 |
-| * InstantaneousVoltage                                              | 0x0500 |
-| * InstantaneousLineCurrent                                          | 0x0501 |
-| * InstantaneousActiveCurrent                                        | 0x0502 |
-| * InstantaneousReactiveCurrent                                      | 0x0503 |
-| * InstantaneousPower                                                | 0x0504 |
-| * RmsVoltage                                                        | 0x0505 |
-| * RmsVoltageMin                                                     | 0x0506 |
-| * RmsVoltageMax                                                     | 0x0507 |
-| * RmsCurrent                                                        | 0x0508 |
-| * RmsCurrentMin                                                     | 0x0509 |
-| * RmsCurrentMax                                                     | 0x050A |
-| * ActivePower                                                       | 0x050B |
-| * ActivePowerMin                                                    | 0x050C |
-| * ActivePowerMax                                                    | 0x050D |
-| * ReactivePower                                                     | 0x050E |
-| * ApparentPower                                                     | 0x050F |
-| * PowerFactor                                                       | 0x0510 |
-| * AverageRmsVoltageMeasurementPeriod                                | 0x0511 |
-| * AverageRmsUnderVoltageCounter                                     | 0x0513 |
-| * RmsExtremeOverVoltagePeriod                                       | 0x0514 |
-| * RmsExtremeUnderVoltagePeriod                                      | 0x0515 |
-| * RmsVoltageSagPeriod                                               | 0x0516 |
-| * RmsVoltageSwellPeriod                                             | 0x0517 |
-| * AcVoltageMultiplier                                               | 0x0600 |
-| * AcVoltageDivisor                                                  | 0x0601 |
-| * AcCurrentMultiplier                                               | 0x0602 |
-| * AcCurrentDivisor                                                  | 0x0603 |
-| * AcPowerMultiplier                                                 | 0x0604 |
-| * AcPowerDivisor                                                    | 0x0605 |
-| * OverloadAlarmsMask                                                | 0x0700 |
-| * VoltageOverload                                                   | 0x0701 |
-| * CurrentOverload                                                   | 0x0702 |
-| * AcOverloadAlarmsMask                                              | 0x0800 |
-| * AcVoltageOverload                                                 | 0x0801 |
-| * AcCurrentOverload                                                 | 0x0802 |
-| * AcActivePowerOverload                                             | 0x0803 |
-| * AcReactivePowerOverload                                           | 0x0804 |
-| * AverageRmsOverVoltage                                             | 0x0805 |
-| * AverageRmsUnderVoltage                                            | 0x0806 |
-| * RmsExtremeOverVoltage                                             | 0x0807 |
-| * RmsExtremeUnderVoltage                                            | 0x0808 |
-| * RmsVoltageSag                                                     | 0x0809 |
-| * RmsVoltageSwell                                                   | 0x080A |
-| * LineCurrentPhaseB                                                 | 0x0901 |
-| * ActiveCurrentPhaseB                                               | 0x0902 |
-| * ReactiveCurrentPhaseB                                             | 0x0903 |
-| * RmsVoltagePhaseB                                                  | 0x0905 |
-| * RmsVoltageMinPhaseB                                               | 0x0906 |
-| * RmsVoltageMaxPhaseB                                               | 0x0907 |
-| * RmsCurrentPhaseB                                                  | 0x0908 |
-| * RmsCurrentMinPhaseB                                               | 0x0909 |
-| * RmsCurrentMaxPhaseB                                               | 0x090A |
-| * ActivePowerPhaseB                                                 | 0x090B |
-| * ActivePowerMinPhaseB                                              | 0x090C |
-| * ActivePowerMaxPhaseB                                              | 0x090D |
-| * ReactivePowerPhaseB                                               | 0x090E |
-| * ApparentPowerPhaseB                                               | 0x090F |
-| * PowerFactorPhaseB                                                 | 0x0910 |
-| * AverageRmsVoltageMeasurementPeriodPhaseB                          | 0x0911 |
-| * AverageRmsOverVoltageCounterPhaseB                                | 0x0912 |
-| * AverageRmsUnderVoltageCounterPhaseB                               | 0x0913 |
-| * RmsExtremeOverVoltagePeriodPhaseB                                 | 0x0914 |
-| * RmsExtremeUnderVoltagePeriodPhaseB                                | 0x0915 |
-| * RmsVoltageSagPeriodPhaseB                                         | 0x0916 |
-| * RmsVoltageSwellPeriodPhaseB                                       | 0x0917 |
-| * LineCurrentPhaseC                                                 | 0x0A01 |
-| * ActiveCurrentPhaseC                                               | 0x0A02 |
-| * ReactiveCurrentPhaseC                                             | 0x0A03 |
-| * RmsVoltagePhaseC                                                  | 0x0A05 |
-| * RmsVoltageMinPhaseC                                               | 0x0A06 |
-| * RmsVoltageMaxPhaseC                                               | 0x0A07 |
-| * RmsCurrentPhaseC                                                  | 0x0A08 |
-| * RmsCurrentMinPhaseC                                               | 0x0A09 |
-| * RmsCurrentMaxPhaseC                                               | 0x0A0A |
-| * ActivePowerPhaseC                                                 | 0x0A0B |
-| * ActivePowerMinPhaseC                                              | 0x0A0C |
-| * ActivePowerMaxPhaseC                                              | 0x0A0D |
-| * ReactivePowerPhaseC                                               | 0x0A0E |
-| * ApparentPowerPhaseC                                               | 0x0A0F |
-| * PowerFactorPhaseC                                                 | 0x0A10 |
-| * AverageRmsVoltageMeasurementPeriodPhaseC                          | 0x0A11 |
-| * AverageRmsOverVoltageCounterPhaseC                                | 0x0A12 |
-| * AverageRmsUnderVoltageCounterPhaseC                               | 0x0A13 |
-| * RmsExtremeOverVoltagePeriodPhaseC                                 | 0x0A14 |
-| * RmsExtremeUnderVoltagePeriodPhaseC                                | 0x0A15 |
-| * RmsVoltageSagPeriodPhaseC                                         | 0x0A16 |
-| * RmsVoltageSwellPeriodPhaseC                                       | 0x0A17 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command GetProfileInfoCommand
- */
-class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand
-{
-public:
-    ElectricalMeasurementGetProfileInfoCommand(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-profile-info-command", credsIssuerConfig)
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000000) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000000, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000000) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000000, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoCommand::Type mRequest;
-};
-
-/*
- * Command GetMeasurementProfileCommand
- */
-class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand
-{
-public:
-    ElectricalMeasurementGetMeasurementProfileCommand(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("get-measurement-profile-command", credsIssuerConfig)
-    {
-        AddArgument("AttributeId", 0, UINT16_MAX, &mRequest.attributeId);
-        AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime);
-        AddArgument("NumberOfIntervals", 0, UINT8_MAX, &mRequest.numberOfIntervals);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000001) on endpoint %u", endpointIds.at(0));
-
-        return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000001, mRequest);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000001) on Group %u", groupId);
-
-        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000001, mRequest);
-    }
-
-private:
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest;
-};
-
-class WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("AverageRmsVoltageMeasurementPeriod", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "average-rms-voltage-measurement-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000511, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000511, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class WriteElectricalMeasurementAverageRmsUnderVoltageCounter : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementAverageRmsUnderVoltageCounter(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("AverageRmsUnderVoltageCounter", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "average-rms-under-voltage-counter");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementAverageRmsUnderVoltageCounter() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000513, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000513, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class WriteElectricalMeasurementRmsExtremeOverVoltagePeriod : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementRmsExtremeOverVoltagePeriod(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RmsExtremeOverVoltagePeriod", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "rms-extreme-over-voltage-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000514, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000514, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RmsExtremeUnderVoltagePeriod", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "rms-extreme-under-voltage-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000515, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000515, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class WriteElectricalMeasurementRmsVoltageSagPeriod : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementRmsVoltageSagPeriod(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RmsVoltageSagPeriod", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "rms-voltage-sag-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsVoltageSagPeriod() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000516, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000516, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class WriteElectricalMeasurementRmsVoltageSwellPeriod : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementRmsVoltageSwellPeriod(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("RmsVoltageSwellPeriod", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "rms-voltage-swell-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsVoltageSwellPeriod() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000517, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000517, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class WriteElectricalMeasurementOverloadAlarmsMask : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementOverloadAlarmsMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("OverloadAlarmsMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "overload-alarms-mask");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementOverloadAlarmsMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000700, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000700, mValue);
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class WriteElectricalMeasurementAcOverloadAlarmsMask : public WriteAttribute
-{
-public:
-    WriteElectricalMeasurementAcOverloadAlarmsMask(CredentialIssuerCommands * credsIssuerConfig) :
-        WriteAttribute("AcOverloadAlarmsMask", credsIssuerConfig)
-    {
-        AddArgument("attr-name", "ac-overload-alarms-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementAcOverloadAlarmsMask() {}
-
-    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
-    {
-        return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000B04, 0x00000800, mValue);
-    }
-
-    CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
-    {
-        return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000B04, 0x00000800, mValue);
-    }
-
-private:
-    uint16_t mValue;
-};
-
-/*----------------------------------------------------------------------------*\
-| Register all Clusters commands                                               |
-\*----------------------------------------------------------------------------*/
-void registerClusterPowerConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::PowerConfiguration;
-
-    const char * clusterName = "PowerConfiguration";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                     //
-        make_unique<ReadAttribute>(Id, "mains-voltage", Attributes::MainsVoltage::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "mains-frequency", Attributes::MainsFrequency::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "mains-alarm-mask", Attributes::MainsAlarmMask::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "mains-voltage-min-threshold", Attributes::MainsVoltageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "mains-voltage-max-threshold", Attributes::MainsVoltageMaxThreshold::Id,
-                                   credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "mains-voltage-dwell-trip", Attributes::MainsVoltageDwellTrip::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "battery-percentage-remaining", Attributes::BatteryPercentageRemaining::Id,
-                                   credsIssuerConfig),                                                                   //
-        make_unique<ReadAttribute>(Id, "battery-manufacturer", Attributes::BatteryManufacturer::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "battery-size", Attributes::BatterySize::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "battery-ahr-rating", Attributes::BatteryAhrRating::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "battery-rated-voltage", Attributes::BatteryRatedVoltage::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-alarm-mask", Attributes::BatteryAlarmMask::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery-voltage-min-threshold", Attributes::BatteryVoltageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-voltage-threshold1", Attributes::BatteryVoltageThreshold1::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-voltage-threshold2", Attributes::BatteryVoltageThreshold2::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-voltage-threshold3", Attributes::BatteryVoltageThreshold3::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-percentage-min-threshold", Attributes::BatteryPercentageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-percentage-threshold1", Attributes::BatteryPercentageThreshold1::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-percentage-threshold2", Attributes::BatteryPercentageThreshold2::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-percentage-threshold3", Attributes::BatteryPercentageThreshold3::Id,
-                                   credsIssuerConfig),                                                               //
-        make_unique<ReadAttribute>(Id, "battery-alarm-state", Attributes::BatteryAlarmState::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2voltage", Attributes::Battery2Voltage::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery2percentage-remaining", Attributes::Battery2PercentageRemaining::Id,
-                                   credsIssuerConfig),                                                                    //
-        make_unique<ReadAttribute>(Id, "battery2manufacturer", Attributes::Battery2Manufacturer::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "battery2size", Attributes::Battery2Size::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "battery2ahr-rating", Attributes::Battery2AhrRating::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery2quantity", Attributes::Battery2Quantity::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "battery2rated-voltage", Attributes::Battery2RatedVoltage::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2alarm-mask", Attributes::Battery2AlarmMask::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery2voltage-min-threshold", Attributes::Battery2VoltageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2voltage-threshold1", Attributes::Battery2VoltageThreshold1::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2voltage-threshold2", Attributes::Battery2VoltageThreshold2::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2voltage-threshold3", Attributes::Battery2VoltageThreshold3::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2percentage-min-threshold", Attributes::Battery2PercentageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2percentage-threshold1", Attributes::Battery2PercentageThreshold1::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2percentage-threshold2", Attributes::Battery2PercentageThreshold2::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery2percentage-threshold3", Attributes::Battery2PercentageThreshold3::Id,
-                                   credsIssuerConfig),                                                                //
-        make_unique<ReadAttribute>(Id, "battery2alarm-state", Attributes::Battery2AlarmState::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3voltage", Attributes::Battery3Voltage::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "battery3percentage-remaining", Attributes::Battery3PercentageRemaining::Id,
-                                   credsIssuerConfig),                                                                    //
-        make_unique<ReadAttribute>(Id, "battery3manufacturer", Attributes::Battery3Manufacturer::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "battery3size", Attributes::Battery3Size::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "battery3ahr-rating", Attributes::Battery3AhrRating::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery3quantity", Attributes::Battery3Quantity::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "battery3rated-voltage", Attributes::Battery3RatedVoltage::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3alarm-mask", Attributes::Battery3AlarmMask::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery3voltage-min-threshold", Attributes::Battery3VoltageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3voltage-threshold1", Attributes::Battery3VoltageThreshold1::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3voltage-threshold2", Attributes::Battery3VoltageThreshold2::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3voltage-threshold3", Attributes::Battery3VoltageThreshold3::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3percentage-min-threshold", Attributes::Battery3PercentageMinThreshold::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3percentage-threshold1", Attributes::Battery3PercentageThreshold1::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3percentage-threshold2", Attributes::Battery3PercentageThreshold2::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery3percentage-threshold3", Attributes::Battery3PercentageThreshold3::Id,
-                                   credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "battery3alarm-state", Attributes::Battery3AlarmState::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WritePowerConfigurationMainsAlarmMask>(credsIssuerConfig),                                             //
-        make_unique<WritePowerConfigurationMainsVoltageMinThreshold>(credsIssuerConfig),                                   //
-        make_unique<WritePowerConfigurationMainsVoltageMaxThreshold>(credsIssuerConfig),                                   //
-        make_unique<WritePowerConfigurationMainsVoltageDwellTrip>(credsIssuerConfig),                                      //
-        make_unique<WritePowerConfigurationBatteryManufacturer>(credsIssuerConfig),                                        //
-        make_unique<WritePowerConfigurationBatterySize>(credsIssuerConfig),                                                //
-        make_unique<WritePowerConfigurationBatteryAhrRating>(credsIssuerConfig),                                           //
-        make_unique<WritePowerConfigurationBatteryQuantity>(credsIssuerConfig),                                            //
-        make_unique<WritePowerConfigurationBatteryRatedVoltage>(credsIssuerConfig),                                        //
-        make_unique<WritePowerConfigurationBatteryAlarmMask>(credsIssuerConfig),                                           //
-        make_unique<WritePowerConfigurationBatteryVoltageMinThreshold>(credsIssuerConfig),                                 //
-        make_unique<WritePowerConfigurationBatteryVoltageThreshold1>(credsIssuerConfig),                                   //
-        make_unique<WritePowerConfigurationBatteryVoltageThreshold2>(credsIssuerConfig),                                   //
-        make_unique<WritePowerConfigurationBatteryVoltageThreshold3>(credsIssuerConfig),                                   //
-        make_unique<WritePowerConfigurationBatteryPercentageMinThreshold>(credsIssuerConfig),                              //
-        make_unique<WritePowerConfigurationBatteryPercentageThreshold1>(credsIssuerConfig),                                //
-        make_unique<WritePowerConfigurationBatteryPercentageThreshold2>(credsIssuerConfig),                                //
-        make_unique<WritePowerConfigurationBatteryPercentageThreshold3>(credsIssuerConfig),                                //
-        make_unique<WritePowerConfigurationBattery2Manufacturer>(credsIssuerConfig),                                       //
-        make_unique<WritePowerConfigurationBattery2Size>(credsIssuerConfig),                                               //
-        make_unique<WritePowerConfigurationBattery2AhrRating>(credsIssuerConfig),                                          //
-        make_unique<WritePowerConfigurationBattery2Quantity>(credsIssuerConfig),                                           //
-        make_unique<WritePowerConfigurationBattery2RatedVoltage>(credsIssuerConfig),                                       //
-        make_unique<WritePowerConfigurationBattery2AlarmMask>(credsIssuerConfig),                                          //
-        make_unique<WritePowerConfigurationBattery2VoltageMinThreshold>(credsIssuerConfig),                                //
-        make_unique<WritePowerConfigurationBattery2VoltageThreshold1>(credsIssuerConfig),                                  //
-        make_unique<WritePowerConfigurationBattery2VoltageThreshold2>(credsIssuerConfig),                                  //
-        make_unique<WritePowerConfigurationBattery2VoltageThreshold3>(credsIssuerConfig),                                  //
-        make_unique<WritePowerConfigurationBattery2PercentageMinThreshold>(credsIssuerConfig),                             //
-        make_unique<WritePowerConfigurationBattery2PercentageThreshold1>(credsIssuerConfig),                               //
-        make_unique<WritePowerConfigurationBattery2PercentageThreshold2>(credsIssuerConfig),                               //
-        make_unique<WritePowerConfigurationBattery2PercentageThreshold3>(credsIssuerConfig),                               //
-        make_unique<WritePowerConfigurationBattery3Manufacturer>(credsIssuerConfig),                                       //
-        make_unique<WritePowerConfigurationBattery3Size>(credsIssuerConfig),                                               //
-        make_unique<WritePowerConfigurationBattery3AhrRating>(credsIssuerConfig),                                          //
-        make_unique<WritePowerConfigurationBattery3Quantity>(credsIssuerConfig),                                           //
-        make_unique<WritePowerConfigurationBattery3RatedVoltage>(credsIssuerConfig),                                       //
-        make_unique<WritePowerConfigurationBattery3AlarmMask>(credsIssuerConfig),                                          //
-        make_unique<WritePowerConfigurationBattery3VoltageMinThreshold>(credsIssuerConfig),                                //
-        make_unique<WritePowerConfigurationBattery3VoltageThreshold1>(credsIssuerConfig),                                  //
-        make_unique<WritePowerConfigurationBattery3VoltageThreshold2>(credsIssuerConfig),                                  //
-        make_unique<WritePowerConfigurationBattery3VoltageThreshold3>(credsIssuerConfig),                                  //
-        make_unique<WritePowerConfigurationBattery3PercentageMinThreshold>(credsIssuerConfig),                             //
-        make_unique<WritePowerConfigurationBattery3PercentageThreshold1>(credsIssuerConfig),                               //
-        make_unique<WritePowerConfigurationBattery3PercentageThreshold2>(credsIssuerConfig),                               //
-        make_unique<WritePowerConfigurationBattery3PercentageThreshold3>(credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "mains-voltage", Attributes::MainsVoltage::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "mains-frequency", Attributes::MainsFrequency::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "mains-alarm-mask", Attributes::MainsAlarmMask::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "mains-voltage-min-threshold", Attributes::MainsVoltageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "mains-voltage-max-threshold", Attributes::MainsVoltageMaxThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "mains-voltage-dwell-trip", Attributes::MainsVoltageDwellTrip::Id,
-                                        credsIssuerConfig),                                                        //
-        make_unique<SubscribeAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-percentage-remaining", Attributes::BatteryPercentageRemaining::Id,
-                                        credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "battery-manufacturer", Attributes::BatteryManufacturer::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "battery-size", Attributes::BatterySize::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "battery-ahr-rating", Attributes::BatteryAhrRating::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "battery-rated-voltage", Attributes::BatteryRatedVoltage::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-alarm-mask", Attributes::BatteryAlarmMask::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery-voltage-min-threshold", Attributes::BatteryVoltageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-voltage-threshold1", Attributes::BatteryVoltageThreshold1::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-voltage-threshold2", Attributes::BatteryVoltageThreshold2::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-voltage-threshold3", Attributes::BatteryVoltageThreshold3::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-percentage-min-threshold", Attributes::BatteryPercentageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-percentage-threshold1", Attributes::BatteryPercentageThreshold1::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-percentage-threshold2", Attributes::BatteryPercentageThreshold2::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-percentage-threshold3", Attributes::BatteryPercentageThreshold3::Id,
-                                        credsIssuerConfig),                                                               //
-        make_unique<SubscribeAttribute>(Id, "battery-alarm-state", Attributes::BatteryAlarmState::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2voltage", Attributes::Battery2Voltage::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery2percentage-remaining", Attributes::Battery2PercentageRemaining::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "battery2manufacturer", Attributes::Battery2Manufacturer::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "battery2size", Attributes::Battery2Size::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "battery2ahr-rating", Attributes::Battery2AhrRating::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery2quantity", Attributes::Battery2Quantity::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "battery2rated-voltage", Attributes::Battery2RatedVoltage::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2alarm-mask", Attributes::Battery2AlarmMask::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery2voltage-min-threshold", Attributes::Battery2VoltageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2voltage-threshold1", Attributes::Battery2VoltageThreshold1::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2voltage-threshold2", Attributes::Battery2VoltageThreshold2::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2voltage-threshold3", Attributes::Battery2VoltageThreshold3::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2percentage-min-threshold", Attributes::Battery2PercentageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2percentage-threshold1", Attributes::Battery2PercentageThreshold1::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2percentage-threshold2", Attributes::Battery2PercentageThreshold2::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery2percentage-threshold3", Attributes::Battery2PercentageThreshold3::Id,
-                                        credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "battery2alarm-state", Attributes::Battery2AlarmState::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3voltage", Attributes::Battery3Voltage::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "battery3percentage-remaining", Attributes::Battery3PercentageRemaining::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "battery3manufacturer", Attributes::Battery3Manufacturer::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "battery3size", Attributes::Battery3Size::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "battery3ahr-rating", Attributes::Battery3AhrRating::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery3quantity", Attributes::Battery3Quantity::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "battery3rated-voltage", Attributes::Battery3RatedVoltage::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3alarm-mask", Attributes::Battery3AlarmMask::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery3voltage-min-threshold", Attributes::Battery3VoltageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3voltage-threshold1", Attributes::Battery3VoltageThreshold1::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3voltage-threshold2", Attributes::Battery3VoltageThreshold2::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3voltage-threshold3", Attributes::Battery3VoltageThreshold3::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3percentage-min-threshold", Attributes::Battery3PercentageMinThreshold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3percentage-threshold1", Attributes::Battery3PercentageThreshold1::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3percentage-threshold2", Attributes::Battery3PercentageThreshold2::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery3percentage-threshold3", Attributes::Battery3PercentageThreshold3::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "battery3alarm-state", Attributes::Battery3AlarmState::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterDeviceTemperatureConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::DeviceTemperatureConfiguration;
-
-    const char * clusterName = "DeviceTemperatureConfiguration";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "current-temperature", Attributes::CurrentTemperature::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "min-temp-experienced", Attributes::MinTempExperienced::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "max-temp-experienced", Attributes::MaxTempExperienced::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "over-temp-total-dwell", Attributes::OverTempTotalDwell::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "device-temp-alarm-mask", Attributes::DeviceTempAlarmMask::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "low-temp-threshold", Attributes::LowTempThreshold::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "high-temp-threshold", Attributes::HighTempThreshold::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "low-temp-dwell-trip-point", Attributes::LowTempDwellTripPoint::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "high-temp-dwell-trip-point", Attributes::HighTempDwellTripPoint::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),                      //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<WriteDeviceTemperatureConfigurationDeviceTempAlarmMask>(credsIssuerConfig),                                  //
-        make_unique<WriteDeviceTemperatureConfigurationLowTempThreshold>(credsIssuerConfig),                                     //
-        make_unique<WriteDeviceTemperatureConfigurationHighTempThreshold>(credsIssuerConfig),                                    //
-        make_unique<WriteDeviceTemperatureConfigurationLowTempDwellTripPoint>(credsIssuerConfig),                                //
-        make_unique<WriteDeviceTemperatureConfigurationHighTempDwellTripPoint>(credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, "current-temperature", Attributes::CurrentTemperature::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "min-temp-experienced", Attributes::MinTempExperienced::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "max-temp-experienced", Attributes::MaxTempExperienced::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "over-temp-total-dwell", Attributes::OverTempTotalDwell::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "device-temp-alarm-mask", Attributes::DeviceTempAlarmMask::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "low-temp-threshold", Attributes::LowTempThreshold::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "high-temp-threshold", Attributes::HighTempThreshold::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "low-temp-dwell-trip-point", Attributes::LowTempDwellTripPoint::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "high-temp-dwell-trip-point", Attributes::HighTempDwellTripPoint::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Identify;
-
-    const char * clusterName = "Identify";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),    //
-        make_unique<IdentifyIdentify>(credsIssuerConfig),      //
-        make_unique<IdentifyTriggerEffect>(credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "identify-type", Attributes::IdentifyType::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteIdentifyIdentifyTime>(credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "identify-type", Attributes::IdentifyType::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterGroups(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Groups;
-
-    const char * clusterName = "Groups";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
-        make_unique<GroupsAddGroup>(credsIssuerConfig),              //
-        make_unique<GroupsViewGroup>(credsIssuerConfig),             //
-        make_unique<GroupsGetGroupMembership>(credsIssuerConfig),    //
-        make_unique<GroupsRemoveGroup>(credsIssuerConfig),           //
-        make_unique<GroupsRemoveAllGroups>(credsIssuerConfig),       //
-        make_unique<GroupsAddGroupIfIdentifying>(credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterScenes(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Scenes;
-
-    const char * clusterName = "Scenes";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),       //
-        make_unique<ScenesAddScene>(credsIssuerConfig),           //
-        make_unique<ScenesViewScene>(credsIssuerConfig),          //
-        make_unique<ScenesRemoveScene>(credsIssuerConfig),        //
-        make_unique<ScenesRemoveAllScenes>(credsIssuerConfig),    //
-        make_unique<ScenesStoreScene>(credsIssuerConfig),         //
-        make_unique<ScenesRecallScene>(credsIssuerConfig),        //
-        make_unique<ScenesGetSceneMembership>(credsIssuerConfig), //
-        make_unique<ScenesEnhancedAddScene>(credsIssuerConfig),   //
-        make_unique<ScenesEnhancedViewScene>(credsIssuerConfig),  //
-        make_unique<ScenesCopyScene>(credsIssuerConfig),          //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::OnOff;
-
-    const char * clusterName = "OnOff";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
-        make_unique<OnOffOff>(credsIssuerConfig),                     //
-        make_unique<OnOffOn>(credsIssuerConfig),                      //
-        make_unique<OnOffToggle>(credsIssuerConfig),                  //
-        make_unique<OnOffOffWithEffect>(credsIssuerConfig),           //
-        make_unique<OnOffOnWithRecallGlobalScene>(credsIssuerConfig), //
-        make_unique<OnOffOnWithTimedOff>(credsIssuerConfig),          //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                     //
-        make_unique<ReadAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteOnOffOnTime>(credsIssuerConfig),                                                                       //
-        make_unique<WriteOnOffOffWaitTime>(credsIssuerConfig),                                                                  //
-        make_unique<WriteOnOffStartUpOnOff>(credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::OnOffSwitchConfiguration;
-
-    const char * clusterName = "OnOffSwitchConfiguration";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "switch-actions", Attributes::SwitchActions::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteOnOffSwitchConfigurationSwitchActions>(credsIssuerConfig),                                             //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "switch-actions", Attributes::SwitchActions::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::LevelControl;
-
-    const char * clusterName = "LevelControl";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),               //
-        make_unique<LevelControlMoveToLevel>(credsIssuerConfig),          //
-        make_unique<LevelControlMove>(credsIssuerConfig),                 //
-        make_unique<LevelControlStep>(credsIssuerConfig),                 //
-        make_unique<LevelControlStop>(credsIssuerConfig),                 //
-        make_unique<LevelControlMoveToLevelWithOnOff>(credsIssuerConfig), //
-        make_unique<LevelControlMoveWithOnOff>(credsIssuerConfig),        //
-        make_unique<LevelControlStepWithOnOff>(credsIssuerConfig),        //
-        make_unique<LevelControlStopWithOnOff>(credsIssuerConfig),        //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteLevelControlOptions>(credsIssuerConfig),                                                               //
-        make_unique<WriteLevelControlOnOffTransitionTime>(credsIssuerConfig),                                                   //
-        make_unique<WriteLevelControlOnLevel>(credsIssuerConfig),                                                               //
-        make_unique<WriteLevelControlOnTransitionTime>(credsIssuerConfig),                                                      //
-        make_unique<WriteLevelControlOffTransitionTime>(credsIssuerConfig),                                                     //
-        make_unique<WriteLevelControlDefaultMoveRate>(credsIssuerConfig),                                                       //
-        make_unique<WriteLevelControlStartUpCurrentLevel>(credsIssuerConfig),                                                   //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterAlarms(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Alarms;
-
-    const char * clusterName = "Alarms";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),   //
-        make_unique<AlarmsResetAlarm>(credsIssuerConfig),     //
-        make_unique<AlarmsResetAllAlarms>(credsIssuerConfig), //
-        make_unique<AlarmsGetAlarm>(credsIssuerConfig),       //
-        make_unique<AlarmsResetAlarmLog>(credsIssuerConfig),  //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "alarm-count", Attributes::AlarmCount::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "alarm-count", Attributes::AlarmCount::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterTime(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Time;
-
-    const char * clusterName = "Time";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "time", Attributes::Time::Id, credsIssuerConfig),                                        //
-        make_unique<ReadAttribute>(Id, "time-status", Attributes::TimeStatus::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "dst-start", Attributes::DstStart::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "dst-end", Attributes::DstEnd::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "dst-shift", Attributes::DstShift::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "standard-time", Attributes::StandardTime::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "last-set-time", Attributes::LastSetTime::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "valid-until-time", Attributes::ValidUntilTime::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteTimeTime>(credsIssuerConfig),                                                                          //
-        make_unique<WriteTimeTimeStatus>(credsIssuerConfig),                                                                    //
-        make_unique<WriteTimeTimeZone>(credsIssuerConfig),                                                                      //
-        make_unique<WriteTimeDstStart>(credsIssuerConfig),                                                                      //
-        make_unique<WriteTimeDstEnd>(credsIssuerConfig),                                                                        //
-        make_unique<WriteTimeDstShift>(credsIssuerConfig),                                                                      //
-        make_unique<WriteTimeValidUntilTime>(credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "time", Attributes::Time::Id, credsIssuerConfig),                                   //
-        make_unique<SubscribeAttribute>(Id, "time-status", Attributes::TimeStatus::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "dst-start", Attributes::DstStart::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "dst-end", Attributes::DstEnd::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "dst-shift", Attributes::DstShift::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "standard-time", Attributes::StandardTime::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "last-set-time", Attributes::LastSetTime::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "valid-until-time", Attributes::ValidUntilTime::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::BinaryInputBasic;
-
-    const char * clusterName = "BinaryInputBasic";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "application-type", Attributes::ApplicationType::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteBinaryInputBasicActiveText>(credsIssuerConfig),                                                        //
-        make_unique<WriteBinaryInputBasicDescription>(credsIssuerConfig),                                                       //
-        make_unique<WriteBinaryInputBasicInactiveText>(credsIssuerConfig),                                                      //
-        make_unique<WriteBinaryInputBasicOutOfService>(credsIssuerConfig),                                                      //
-        make_unique<WriteBinaryInputBasicPresentValue>(credsIssuerConfig),                                                      //
-        make_unique<WriteBinaryInputBasicReliability>(credsIssuerConfig),                                                       //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "application-type", Attributes::ApplicationType::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterPowerProfile(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::PowerProfile;
-
-    const char * clusterName = "PowerProfile";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                 //
-        make_unique<PowerProfilePowerProfileRequest>(credsIssuerConfig),                    //
-        make_unique<PowerProfilePowerProfileStateRequest>(credsIssuerConfig),               //
-        make_unique<PowerProfileGetPowerProfilePriceResponse>(credsIssuerConfig),           //
-        make_unique<PowerProfileGetOverallSchedulePriceResponse>(credsIssuerConfig),        //
-        make_unique<PowerProfileEnergyPhasesScheduleNotification>(credsIssuerConfig),       //
-        make_unique<PowerProfileEnergyPhasesScheduleResponse>(credsIssuerConfig),           //
-        make_unique<PowerProfilePowerProfileScheduleConstraintsRequest>(credsIssuerConfig), //
-        make_unique<PowerProfileEnergyPhasesScheduleStateRequest>(credsIssuerConfig),       //
-        make_unique<PowerProfileGetPowerProfilePriceExtendedResponse>(credsIssuerConfig),   //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "total-profile-num", Attributes::TotalProfileNum::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "multiple-scheduling", Attributes::MultipleScheduling::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "energy-formatting", Attributes::EnergyFormatting::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "energy-remote", Attributes::EnergyRemote::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "schedule-mode", Attributes::ScheduleMode::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WritePowerProfileScheduleMode>(credsIssuerConfig),                                                          //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "total-profile-num", Attributes::TotalProfileNum::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "multiple-scheduling", Attributes::MultipleScheduling::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "energy-formatting", Attributes::EnergyFormatting::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "energy-remote", Attributes::EnergyRemote::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "schedule-mode", Attributes::ScheduleMode::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterApplianceControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::ApplianceControl;
-
-    const char * clusterName = "ApplianceControl";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                  //
-        make_unique<ApplianceControlExecutionOfACommand>(credsIssuerConfig), //
-        make_unique<ApplianceControlSignalState>(credsIssuerConfig),         //
-        make_unique<ApplianceControlWriteFunctions>(credsIssuerConfig),      //
-        make_unique<ApplianceControlOverloadPauseResume>(credsIssuerConfig), //
-        make_unique<ApplianceControlOverloadPause>(credsIssuerConfig),       //
-        make_unique<ApplianceControlOverloadWarning>(credsIssuerConfig),     //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "finish-time", Attributes::FinishTime::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "finish-time", Attributes::FinishTime::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::PulseWidthModulation;
-
-    const char * clusterName = "PulseWidthModulation";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Descriptor;
-
-    const char * clusterName = "Descriptor";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "device-list", Attributes::DeviceList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "parts-list", Attributes::PartsList::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "device-list", Attributes::DeviceList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "parts-list", Attributes::PartsList::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBinding(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Binding;
-
-    const char * clusterName = "Binding";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "binding", Attributes::Binding::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteBindingBinding>(credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "binding", Attributes::Binding::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::AccessControl;
-
-    const char * clusterName = "AccessControl";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                         //
-        make_unique<ReadAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteAccessControlAcl>(credsIssuerConfig),                                                             //
-        make_unique<WriteAccessControlExtension>(credsIssuerConfig),                                                       //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                        //
-        make_unique<ReadEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id, credsIssuerConfig), //
-        make_unique<ReadEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
-                               credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id,
-                                    credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
-                                    credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterPollControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::PollControl;
-
-    const char * clusterName = "PollControl";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),              //
-        make_unique<PollControlCheckInResponse>(credsIssuerConfig),      //
-        make_unique<PollControlFastPollStop>(credsIssuerConfig),         //
-        make_unique<PollControlSetLongPollInterval>(credsIssuerConfig),  //
-        make_unique<PollControlSetShortPollInterval>(credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "check-in-interval", Attributes::CheckInInterval::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "long-poll-interval", Attributes::LongPollInterval::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "short-poll-interval", Attributes::ShortPollInterval::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "fast-poll-timeout", Attributes::FastPollTimeout::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "check-in-interval-min", Attributes::CheckInIntervalMin::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "long-poll-interval-min", Attributes::LongPollIntervalMin::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "fast-poll-timeout-max", Attributes::FastPollTimeoutMax::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WritePollControlCheckInInterval>(credsIssuerConfig),                                                        //
-        make_unique<WritePollControlFastPollTimeout>(credsIssuerConfig),                                                        //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "check-in-interval", Attributes::CheckInInterval::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "long-poll-interval", Attributes::LongPollInterval::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "short-poll-interval", Attributes::ShortPollInterval::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "fast-poll-timeout", Attributes::FastPollTimeout::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "check-in-interval-min", Attributes::CheckInIntervalMin::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "long-poll-interval-min", Attributes::LongPollIntervalMin::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "fast-poll-timeout-max", Attributes::FastPollTimeoutMax::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBridgedActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::BridgedActions;
-
-    const char * clusterName = "BridgedActions";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
-        make_unique<BridgedActionsInstantAction>(credsIssuerConfig),               //
-        make_unique<BridgedActionsInstantActionWithTransition>(credsIssuerConfig), //
-        make_unique<BridgedActionsStartAction>(credsIssuerConfig),                 //
-        make_unique<BridgedActionsStartActionWithDuration>(credsIssuerConfig),     //
-        make_unique<BridgedActionsStopAction>(credsIssuerConfig),                  //
-        make_unique<BridgedActionsPauseAction>(credsIssuerConfig),                 //
-        make_unique<BridgedActionsPauseActionWithDuration>(credsIssuerConfig),     //
-        make_unique<BridgedActionsResumeAction>(credsIssuerConfig),                //
-        make_unique<BridgedActionsEnableAction>(credsIssuerConfig),                //
-        make_unique<BridgedActionsEnableActionWithDuration>(credsIssuerConfig),    //
-        make_unique<BridgedActionsDisableAction>(credsIssuerConfig),               //
-        make_unique<BridgedActionsDisableActionWithDuration>(credsIssuerConfig),   //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "setup-url", Attributes::SetupUrl::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "setup-url", Attributes::SetupUrl::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                 //
-        make_unique<ReadEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                            //
-        make_unique<SubscribeEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::Basic;
-
-    const char * clusterName = "Basic";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),   //
-        make_unique<BasicMfgSpecificPing>(credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::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),                       //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<WriteBasicNodeLabel>(credsIssuerConfig),                                                                      //
-        make_unique<WriteBasicLocation>(credsIssuerConfig),                                                                       //
-        make_unique<WriteBasicLocalConfigDisabled>(credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::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),                  //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<ReadEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                        //
-        make_unique<ReadEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                      //
-        make_unique<ReadEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                             //
-        make_unique<ReadEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
-        make_unique<SubscribeEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
+    using namespace chip::app::Clusters::PowerConfiguration;
 
-    const char * clusterName = "OtaSoftwareUpdateProvider";
+    const char * clusterName = "PowerConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
-        make_unique<OtaSoftwareUpdateProviderQueryImage>(credsIssuerConfig),          //
-        make_unique<OtaSoftwareUpdateProviderApplyUpdateRequest>(credsIssuerConfig),  //
-        make_unique<OtaSoftwareUpdateProviderNotifyUpdateApplied>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                     //
+        make_unique<ReadAttribute>(Id, "mains-voltage", Attributes::MainsVoltage::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "mains-frequency", Attributes::MainsFrequency::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "mains-alarm-mask", Attributes::MainsAlarmMask::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "mains-voltage-min-threshold", Attributes::MainsVoltageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "mains-voltage-max-threshold", Attributes::MainsVoltageMaxThreshold::Id,
+                                   credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "mains-voltage-dwell-trip", Attributes::MainsVoltageDwellTrip::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "battery-percentage-remaining", Attributes::BatteryPercentageRemaining::Id,
+                                   credsIssuerConfig),                                                                   //
+        make_unique<ReadAttribute>(Id, "battery-manufacturer", Attributes::BatteryManufacturer::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "battery-size", Attributes::BatterySize::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "battery-ahr-rating", Attributes::BatteryAhrRating::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "battery-rated-voltage", Attributes::BatteryRatedVoltage::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-alarm-mask", Attributes::BatteryAlarmMask::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery-voltage-min-threshold", Attributes::BatteryVoltageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-voltage-threshold1", Attributes::BatteryVoltageThreshold1::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-voltage-threshold2", Attributes::BatteryVoltageThreshold2::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-voltage-threshold3", Attributes::BatteryVoltageThreshold3::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-percentage-min-threshold", Attributes::BatteryPercentageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-percentage-threshold1", Attributes::BatteryPercentageThreshold1::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-percentage-threshold2", Attributes::BatteryPercentageThreshold2::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-percentage-threshold3", Attributes::BatteryPercentageThreshold3::Id,
+                                   credsIssuerConfig),                                                               //
+        make_unique<ReadAttribute>(Id, "battery-alarm-state", Attributes::BatteryAlarmState::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2voltage", Attributes::Battery2Voltage::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery2percentage-remaining", Attributes::Battery2PercentageRemaining::Id,
+                                   credsIssuerConfig),                                                                    //
+        make_unique<ReadAttribute>(Id, "battery2manufacturer", Attributes::Battery2Manufacturer::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "battery2size", Attributes::Battery2Size::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "battery2ahr-rating", Attributes::Battery2AhrRating::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery2quantity", Attributes::Battery2Quantity::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "battery2rated-voltage", Attributes::Battery2RatedVoltage::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2alarm-mask", Attributes::Battery2AlarmMask::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery2voltage-min-threshold", Attributes::Battery2VoltageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2voltage-threshold1", Attributes::Battery2VoltageThreshold1::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2voltage-threshold2", Attributes::Battery2VoltageThreshold2::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2voltage-threshold3", Attributes::Battery2VoltageThreshold3::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2percentage-min-threshold", Attributes::Battery2PercentageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2percentage-threshold1", Attributes::Battery2PercentageThreshold1::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2percentage-threshold2", Attributes::Battery2PercentageThreshold2::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery2percentage-threshold3", Attributes::Battery2PercentageThreshold3::Id,
+                                   credsIssuerConfig),                                                                //
+        make_unique<ReadAttribute>(Id, "battery2alarm-state", Attributes::Battery2AlarmState::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3voltage", Attributes::Battery3Voltage::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "battery3percentage-remaining", Attributes::Battery3PercentageRemaining::Id,
+                                   credsIssuerConfig),                                                                    //
+        make_unique<ReadAttribute>(Id, "battery3manufacturer", Attributes::Battery3Manufacturer::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "battery3size", Attributes::Battery3Size::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "battery3ahr-rating", Attributes::Battery3AhrRating::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery3quantity", Attributes::Battery3Quantity::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "battery3rated-voltage", Attributes::Battery3RatedVoltage::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3alarm-mask", Attributes::Battery3AlarmMask::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery3voltage-min-threshold", Attributes::Battery3VoltageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3voltage-threshold1", Attributes::Battery3VoltageThreshold1::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3voltage-threshold2", Attributes::Battery3VoltageThreshold2::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3voltage-threshold3", Attributes::Battery3VoltageThreshold3::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3percentage-min-threshold", Attributes::Battery3PercentageMinThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3percentage-threshold1", Attributes::Battery3PercentageThreshold1::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3percentage-threshold2", Attributes::Battery3PercentageThreshold2::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery3percentage-threshold3", Attributes::Battery3PercentageThreshold3::Id,
+                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "battery3alarm-state", Attributes::Battery3AlarmState::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WritePowerConfigurationMainsAlarmMask>(credsIssuerConfig),                                             //
+        make_unique<WritePowerConfigurationMainsVoltageMinThreshold>(credsIssuerConfig),                                   //
+        make_unique<WritePowerConfigurationMainsVoltageMaxThreshold>(credsIssuerConfig),                                   //
+        make_unique<WritePowerConfigurationMainsVoltageDwellTrip>(credsIssuerConfig),                                      //
+        make_unique<WritePowerConfigurationBatteryManufacturer>(credsIssuerConfig),                                        //
+        make_unique<WritePowerConfigurationBatterySize>(credsIssuerConfig),                                                //
+        make_unique<WritePowerConfigurationBatteryAhrRating>(credsIssuerConfig),                                           //
+        make_unique<WritePowerConfigurationBatteryQuantity>(credsIssuerConfig),                                            //
+        make_unique<WritePowerConfigurationBatteryRatedVoltage>(credsIssuerConfig),                                        //
+        make_unique<WritePowerConfigurationBatteryAlarmMask>(credsIssuerConfig),                                           //
+        make_unique<WritePowerConfigurationBatteryVoltageMinThreshold>(credsIssuerConfig),                                 //
+        make_unique<WritePowerConfigurationBatteryVoltageThreshold1>(credsIssuerConfig),                                   //
+        make_unique<WritePowerConfigurationBatteryVoltageThreshold2>(credsIssuerConfig),                                   //
+        make_unique<WritePowerConfigurationBatteryVoltageThreshold3>(credsIssuerConfig),                                   //
+        make_unique<WritePowerConfigurationBatteryPercentageMinThreshold>(credsIssuerConfig),                              //
+        make_unique<WritePowerConfigurationBatteryPercentageThreshold1>(credsIssuerConfig),                                //
+        make_unique<WritePowerConfigurationBatteryPercentageThreshold2>(credsIssuerConfig),                                //
+        make_unique<WritePowerConfigurationBatteryPercentageThreshold3>(credsIssuerConfig),                                //
+        make_unique<WritePowerConfigurationBattery2Manufacturer>(credsIssuerConfig),                                       //
+        make_unique<WritePowerConfigurationBattery2Size>(credsIssuerConfig),                                               //
+        make_unique<WritePowerConfigurationBattery2AhrRating>(credsIssuerConfig),                                          //
+        make_unique<WritePowerConfigurationBattery2Quantity>(credsIssuerConfig),                                           //
+        make_unique<WritePowerConfigurationBattery2RatedVoltage>(credsIssuerConfig),                                       //
+        make_unique<WritePowerConfigurationBattery2AlarmMask>(credsIssuerConfig),                                          //
+        make_unique<WritePowerConfigurationBattery2VoltageMinThreshold>(credsIssuerConfig),                                //
+        make_unique<WritePowerConfigurationBattery2VoltageThreshold1>(credsIssuerConfig),                                  //
+        make_unique<WritePowerConfigurationBattery2VoltageThreshold2>(credsIssuerConfig),                                  //
+        make_unique<WritePowerConfigurationBattery2VoltageThreshold3>(credsIssuerConfig),                                  //
+        make_unique<WritePowerConfigurationBattery2PercentageMinThreshold>(credsIssuerConfig),                             //
+        make_unique<WritePowerConfigurationBattery2PercentageThreshold1>(credsIssuerConfig),                               //
+        make_unique<WritePowerConfigurationBattery2PercentageThreshold2>(credsIssuerConfig),                               //
+        make_unique<WritePowerConfigurationBattery2PercentageThreshold3>(credsIssuerConfig),                               //
+        make_unique<WritePowerConfigurationBattery3Manufacturer>(credsIssuerConfig),                                       //
+        make_unique<WritePowerConfigurationBattery3Size>(credsIssuerConfig),                                               //
+        make_unique<WritePowerConfigurationBattery3AhrRating>(credsIssuerConfig),                                          //
+        make_unique<WritePowerConfigurationBattery3Quantity>(credsIssuerConfig),                                           //
+        make_unique<WritePowerConfigurationBattery3RatedVoltage>(credsIssuerConfig),                                       //
+        make_unique<WritePowerConfigurationBattery3AlarmMask>(credsIssuerConfig),                                          //
+        make_unique<WritePowerConfigurationBattery3VoltageMinThreshold>(credsIssuerConfig),                                //
+        make_unique<WritePowerConfigurationBattery3VoltageThreshold1>(credsIssuerConfig),                                  //
+        make_unique<WritePowerConfigurationBattery3VoltageThreshold2>(credsIssuerConfig),                                  //
+        make_unique<WritePowerConfigurationBattery3VoltageThreshold3>(credsIssuerConfig),                                  //
+        make_unique<WritePowerConfigurationBattery3PercentageMinThreshold>(credsIssuerConfig),                             //
+        make_unique<WritePowerConfigurationBattery3PercentageThreshold1>(credsIssuerConfig),                               //
+        make_unique<WritePowerConfigurationBattery3PercentageThreshold2>(credsIssuerConfig),                               //
+        make_unique<WritePowerConfigurationBattery3PercentageThreshold3>(credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "mains-voltage", Attributes::MainsVoltage::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "mains-frequency", Attributes::MainsFrequency::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "mains-alarm-mask", Attributes::MainsAlarmMask::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "mains-voltage-min-threshold", Attributes::MainsVoltageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "mains-voltage-max-threshold", Attributes::MainsVoltageMaxThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "mains-voltage-dwell-trip", Attributes::MainsVoltageDwellTrip::Id,
+                                        credsIssuerConfig),                                                        //
+        make_unique<SubscribeAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-percentage-remaining", Attributes::BatteryPercentageRemaining::Id,
+                                        credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "battery-manufacturer", Attributes::BatteryManufacturer::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "battery-size", Attributes::BatterySize::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "battery-ahr-rating", Attributes::BatteryAhrRating::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "battery-rated-voltage", Attributes::BatteryRatedVoltage::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-alarm-mask", Attributes::BatteryAlarmMask::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery-voltage-min-threshold", Attributes::BatteryVoltageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-voltage-threshold1", Attributes::BatteryVoltageThreshold1::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-voltage-threshold2", Attributes::BatteryVoltageThreshold2::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-voltage-threshold3", Attributes::BatteryVoltageThreshold3::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-percentage-min-threshold", Attributes::BatteryPercentageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-percentage-threshold1", Attributes::BatteryPercentageThreshold1::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-percentage-threshold2", Attributes::BatteryPercentageThreshold2::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-percentage-threshold3", Attributes::BatteryPercentageThreshold3::Id,
+                                        credsIssuerConfig),                                                               //
+        make_unique<SubscribeAttribute>(Id, "battery-alarm-state", Attributes::BatteryAlarmState::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2voltage", Attributes::Battery2Voltage::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery2percentage-remaining", Attributes::Battery2PercentageRemaining::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "battery2manufacturer", Attributes::Battery2Manufacturer::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "battery2size", Attributes::Battery2Size::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "battery2ahr-rating", Attributes::Battery2AhrRating::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery2quantity", Attributes::Battery2Quantity::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "battery2rated-voltage", Attributes::Battery2RatedVoltage::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2alarm-mask", Attributes::Battery2AlarmMask::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery2voltage-min-threshold", Attributes::Battery2VoltageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2voltage-threshold1", Attributes::Battery2VoltageThreshold1::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2voltage-threshold2", Attributes::Battery2VoltageThreshold2::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2voltage-threshold3", Attributes::Battery2VoltageThreshold3::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2percentage-min-threshold", Attributes::Battery2PercentageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2percentage-threshold1", Attributes::Battery2PercentageThreshold1::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2percentage-threshold2", Attributes::Battery2PercentageThreshold2::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery2percentage-threshold3", Attributes::Battery2PercentageThreshold3::Id,
+                                        credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "battery2alarm-state", Attributes::Battery2AlarmState::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3voltage", Attributes::Battery3Voltage::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "battery3percentage-remaining", Attributes::Battery3PercentageRemaining::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "battery3manufacturer", Attributes::Battery3Manufacturer::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "battery3size", Attributes::Battery3Size::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "battery3ahr-rating", Attributes::Battery3AhrRating::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery3quantity", Attributes::Battery3Quantity::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "battery3rated-voltage", Attributes::Battery3RatedVoltage::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3alarm-mask", Attributes::Battery3AlarmMask::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery3voltage-min-threshold", Attributes::Battery3VoltageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3voltage-threshold1", Attributes::Battery3VoltageThreshold1::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3voltage-threshold2", Attributes::Battery3VoltageThreshold2::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3voltage-threshold3", Attributes::Battery3VoltageThreshold3::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3percentage-min-threshold", Attributes::Battery3PercentageMinThreshold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3percentage-threshold1", Attributes::Battery3PercentageThreshold1::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3percentage-threshold2", Attributes::Battery3PercentageThreshold2::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery3percentage-threshold3", Attributes::Battery3PercentageThreshold3::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "battery3alarm-state", Attributes::Battery3AlarmState::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),                //
@@ -20538,38 +18198,53 @@ void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIss
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDeviceTemperatureConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OtaSoftwareUpdateRequestor;
+    using namespace chip::app::Clusters::DeviceTemperatureConfiguration;
 
-    const char * clusterName = "OtaSoftwareUpdateRequestor";
+    const char * clusterName = "DeviceTemperatureConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                            //
-        make_unique<OtaSoftwareUpdateRequestorAnnounceOtaProvider>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteOtaSoftwareUpdateRequestorDefaultOtaProviders>(credsIssuerConfig),                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "current-temperature", Attributes::CurrentTemperature::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "min-temp-experienced", Attributes::MinTempExperienced::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "max-temp-experienced", Attributes::MaxTempExperienced::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "over-temp-total-dwell", Attributes::OverTempTotalDwell::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "device-temp-alarm-mask", Attributes::DeviceTempAlarmMask::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "low-temp-threshold", Attributes::LowTempThreshold::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "high-temp-threshold", Attributes::HighTempThreshold::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "low-temp-dwell-trip-point", Attributes::LowTempDwellTripPoint::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "high-temp-dwell-trip-point", Attributes::HighTempDwellTripPoint::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),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<WriteDeviceTemperatureConfigurationDeviceTempAlarmMask>(credsIssuerConfig),                                  //
+        make_unique<WriteDeviceTemperatureConfigurationLowTempThreshold>(credsIssuerConfig),                                     //
+        make_unique<WriteDeviceTemperatureConfigurationHighTempThreshold>(credsIssuerConfig),                                    //
+        make_unique<WriteDeviceTemperatureConfigurationLowTempDwellTripPoint>(credsIssuerConfig),                                //
+        make_unique<WriteDeviceTemperatureConfigurationHighTempDwellTripPoint>(credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "current-temperature", Attributes::CurrentTemperature::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "min-temp-experienced", Attributes::MinTempExperienced::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "max-temp-experienced", Attributes::MaxTempExperienced::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "over-temp-total-dwell", Attributes::OverTempTotalDwell::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "device-temp-alarm-mask", Attributes::DeviceTempAlarmMask::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "low-temp-threshold", Attributes::LowTempThreshold::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "high-temp-threshold", Attributes::HighTempThreshold::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "low-temp-dwell-trip-point", Attributes::LowTempDwellTripPoint::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "high-temp-dwell-trip-point", Attributes::HighTempDwellTripPoint::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),                //
@@ -20578,90 +18253,41 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                       //
-        make_unique<ReadEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),        //
-        make_unique<ReadEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                  //
-        make_unique<SubscribeEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),   //
-        make_unique<SubscribeEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),     //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterLocalizationConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LocalizationConfiguration;
+    using namespace chip::app::Clusters::Identify;
 
-    const char * clusterName = "LocalizationConfiguration";
+    const char * clusterName = "Identify";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),    //
+        make_unique<IdentifyIdentify>(credsIssuerConfig),      //
+        make_unique<IdentifyTriggerEffect>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "identify-type", Attributes::IdentifyType::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteLocalizationConfigurationActiveLocale>(credsIssuerConfig),                                             //
+        make_unique<WriteIdentifyIdentifyTime>(credsIssuerConfig),                                                              //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "supported-locales", Attributes::SupportedLocales::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::TimeFormatLocalization;
-
-    const char * clusterName = "TimeFormatLocalization";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::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),                    //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                    //
-        make_unique<WriteTimeFormatLocalizationHourFormat>(credsIssuerConfig),                                                 //
-        make_unique<WriteTimeFormatLocalizationActiveCalendarType>(credsIssuerConfig),                                         //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "identify-type", Attributes::IdentifyType::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),                //
@@ -20676,31 +18302,36 @@ void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuer
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterUnitLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterGroups(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::UnitLocalization;
+    using namespace chip::app::Clusters::Groups;
 
-    const char * clusterName = "UnitLocalization";
+    const char * clusterName = "Groups";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),          //
+        make_unique<GroupsAddGroup>(credsIssuerConfig),              //
+        make_unique<GroupsViewGroup>(credsIssuerConfig),             //
+        make_unique<GroupsGetGroupMembership>(credsIssuerConfig),    //
+        make_unique<GroupsRemoveGroup>(credsIssuerConfig),           //
+        make_unique<GroupsRemoveAllGroups>(credsIssuerConfig),       //
+        make_unique<GroupsAddGroupIfIdentifying>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteUnitLocalizationTemperatureUnit>(credsIssuerConfig),                                                   //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::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),                //
@@ -20715,22 +18346,37 @@ void registerClusterUnitLocalization(Commands & commands, CredentialIssuerComman
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterScenes(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PowerSourceConfiguration;
+    using namespace chip::app::Clusters::Scenes;
 
-    const char * clusterName = "PowerSourceConfiguration";
+    const char * clusterName = "Scenes";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),       //
+        make_unique<ScenesAddScene>(credsIssuerConfig),           //
+        make_unique<ScenesViewScene>(credsIssuerConfig),          //
+        make_unique<ScenesRemoveScene>(credsIssuerConfig),        //
+        make_unique<ScenesRemoveAllScenes>(credsIssuerConfig),    //
+        make_unique<ScenesStoreScene>(credsIssuerConfig),         //
+        make_unique<ScenesRecallScene>(credsIssuerConfig),        //
+        make_unique<ScenesGetSceneMembership>(credsIssuerConfig), //
+        make_unique<ScenesEnhancedAddScene>(credsIssuerConfig),   //
+        make_unique<ScenesEnhancedViewScene>(credsIssuerConfig),  //
+        make_unique<ScenesCopyScene>(credsIssuerConfig),          //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "sources", Attributes::Sources::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::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),                     //
@@ -20738,7 +18384,12 @@ void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssu
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "sources", Attributes::Sources::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "last-configured-by", Attributes::LastConfiguredBy::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),                //
@@ -20753,111 +18404,47 @@ void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssu
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PowerSource;
+    using namespace chip::app::Clusters::OnOff;
 
-    const char * clusterName = "PowerSource";
+    const char * clusterName = "OnOff";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
+        make_unique<OnOffOff>(credsIssuerConfig),                     //
+        make_unique<OnOffOn>(credsIssuerConfig),                      //
+        make_unique<OnOffToggle>(credsIssuerConfig),                  //
+        make_unique<OnOffOffWithEffect>(credsIssuerConfig),           //
+        make_unique<OnOffOnWithRecallGlobalScene>(credsIssuerConfig), //
+        make_unique<OnOffOnWithTimedOff>(credsIssuerConfig),          //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                             //
-        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
-                                   credsIssuerConfig),                                                                           //
-        make_unique<ReadAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "battery-percent-remaining", Attributes::BatteryPercentRemaining::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-time-remaining", Attributes::BatteryTimeRemaining::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "battery-charge-level", Attributes::BatteryChargeLevel::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "battery-replacement-needed", Attributes::BatteryReplacementNeeded::Id,
-                                   credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "battery-replaceability", Attributes::BatteryReplaceability::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-present", Attributes::BatteryPresent::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "active-battery-faults", Attributes::ActiveBatteryFaults::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "battery-replacement-description", Attributes::BatteryReplacementDescription::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-common-designation", Attributes::BatteryCommonDesignation::Id,
-                                   credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "battery-ansidesignation", Attributes::BatteryANSIDesignation::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-iecdesignation", Attributes::BatteryIECDesignation::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "battery-approved-chemistry", Attributes::BatteryApprovedChemistry::Id,
-                                   credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "battery-capacity", Attributes::BatteryCapacity::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "battery-charge-state", Attributes::BatteryChargeState::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-time-to-full-charge", Attributes::BatteryTimeToFullCharge::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "battery-functional-while-charging", Attributes::BatteryFunctionalWhileCharging::Id,
-                                   credsIssuerConfig),                                                                         //
-        make_unique<ReadAttribute>(Id, "battery-charging-current", Attributes::BatteryChargingCurrent::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "active-battery-charge-faults", Attributes::ActiveBatteryChargeFaults::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "battery-percent-remaining", Attributes::BatteryPercentRemaining::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "battery-time-remaining", Attributes::BatteryTimeRemaining::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-charge-level", Attributes::BatteryChargeLevel::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "battery-replacement-needed", Attributes::BatteryReplacementNeeded::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "battery-replaceability", Attributes::BatteryReplaceability::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-present", Attributes::BatteryPresent::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "active-battery-faults", Attributes::ActiveBatteryFaults::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "battery-replacement-description", Attributes::BatteryReplacementDescription::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-common-designation", Attributes::BatteryCommonDesignation::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-ansidesignation", Attributes::BatteryANSIDesignation::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "battery-iecdesignation", Attributes::BatteryIECDesignation::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-approved-chemistry", Attributes::BatteryApprovedChemistry::Id,
-                                        credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "battery-capacity", Attributes::BatteryCapacity::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "battery-charge-state", Attributes::BatteryChargeState::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-time-to-full-charge", Attributes::BatteryTimeToFullCharge::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-functional-while-charging", Attributes::BatteryFunctionalWhileCharging::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "battery-charging-current", Attributes::BatteryChargingCurrent::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-battery-charge-faults", Attributes::ActiveBatteryChargeFaults::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                     //
+        make_unique<ReadAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteOnOffOnTime>(credsIssuerConfig),                                                                       //
+        make_unique<WriteOnOffOffWaitTime>(credsIssuerConfig),                                                                  //
+        make_unique<WriteOnOffStartUpOnOff>(credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "on-time", Attributes::OnTime::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "off-wait-time", Attributes::OffWaitTime::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "start-up-on-off", Attributes::StartUpOnOff::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),                //
@@ -20872,45 +18459,33 @@ void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands *
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::GeneralCommissioning;
+    using namespace chip::app::Clusters::OnOffSwitchConfiguration;
 
-    const char * clusterName = "GeneralCommissioning";
+    const char * clusterName = "OnOffSwitchConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
-        make_unique<GeneralCommissioningArmFailSafe>(credsIssuerConfig),           //
-        make_unique<GeneralCommissioningSetRegulatoryConfig>(credsIssuerConfig),   //
-        make_unique<GeneralCommissioningCommissioningComplete>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteGeneralCommissioningBreadcrumb>(credsIssuerConfig),                                               //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id,
-                                        credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "switch-actions", Attributes::SwitchActions::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteOnOffSwitchConfigurationSwitchActions>(credsIssuerConfig),                                             //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "switch-actions", Attributes::SwitchActions::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),                //
@@ -20925,53 +18500,72 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::NetworkCommissioning;
+    using namespace chip::app::Clusters::LevelControl;
 
-    const char * clusterName = "NetworkCommissioning";
+    const char * clusterName = "LevelControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
-        make_unique<NetworkCommissioningScanNetworks>(credsIssuerConfig),             //
-        make_unique<NetworkCommissioningAddOrUpdateWiFiNetwork>(credsIssuerConfig),   //
-        make_unique<NetworkCommissioningAddOrUpdateThreadNetwork>(credsIssuerConfig), //
-        make_unique<NetworkCommissioningRemoveNetwork>(credsIssuerConfig),            //
-        make_unique<NetworkCommissioningConnectNetwork>(credsIssuerConfig),           //
-        make_unique<NetworkCommissioningReorderNetwork>(credsIssuerConfig),           //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<LevelControlMoveToLevel>(credsIssuerConfig),            //
+        make_unique<LevelControlMove>(credsIssuerConfig),                   //
+        make_unique<LevelControlStep>(credsIssuerConfig),                   //
+        make_unique<LevelControlStop>(credsIssuerConfig),                   //
+        make_unique<LevelControlMoveToLevelWithOnOff>(credsIssuerConfig),   //
+        make_unique<LevelControlMoveWithOnOff>(credsIssuerConfig),          //
+        make_unique<LevelControlStepWithOnOff>(credsIssuerConfig),          //
+        make_unique<LevelControlStopWithOnOff>(credsIssuerConfig),          //
+        make_unique<LevelControlMoveToClosestFrequency>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                    //
-        make_unique<ReadAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::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),                   //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<WriteNetworkCommissioningInterfaceEnabled>(credsIssuerConfig),                                            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<SubscribeAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteLevelControlOptions>(credsIssuerConfig),                                                               //
+        make_unique<WriteLevelControlOnOffTransitionTime>(credsIssuerConfig),                                                   //
+        make_unique<WriteLevelControlOnLevel>(credsIssuerConfig),                                                               //
+        make_unique<WriteLevelControlOnTransitionTime>(credsIssuerConfig),                                                      //
+        make_unique<WriteLevelControlOffTransitionTime>(credsIssuerConfig),                                                     //
+        make_unique<WriteLevelControlDefaultMoveRate>(credsIssuerConfig),                                                       //
+        make_unique<WriteLevelControlStartUpCurrentLevel>(credsIssuerConfig),                                                   //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "current-frequency", Attributes::CurrentFrequency::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "min-frequency", Attributes::MinFrequency::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "max-frequency", Attributes::MaxFrequency::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "on-off-transition-time", Attributes::OnOffTransitionTime::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "on-level", Attributes::OnLevel::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "on-transition-time", Attributes::OnTransitionTime::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "off-transition-time", Attributes::OffTransitionTime::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "default-move-rate", Attributes::DefaultMoveRate::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "start-up-current-level", Attributes::StartUpCurrentLevel::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),                //
@@ -20986,22 +18580,26 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterAlarms(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DiagnosticLogs;
+    using namespace chip::app::Clusters::Alarms;
 
-    const char * clusterName = "DiagnosticLogs";
+    const char * clusterName = "Alarms";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
-        make_unique<DiagnosticLogsRetrieveLogsRequest>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),   //
+        make_unique<AlarmsResetAlarm>(credsIssuerConfig),     //
+        make_unique<AlarmsResetAllAlarms>(credsIssuerConfig), //
+        make_unique<AlarmsGetAlarm>(credsIssuerConfig),       //
+        make_unique<AlarmsResetAlarmLog>(credsIssuerConfig),  //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "alarm-count", Attributes::AlarmCount::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),                     //
@@ -21009,6 +18607,7 @@ void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "alarm-count", Attributes::AlarmCount::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),                //
@@ -21023,11 +18622,11 @@ void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTime(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::GeneralDiagnostics;
+    using namespace chip::app::Clusters::Time;
 
-    const char * clusterName = "GeneralDiagnostics";
+    const char * clusterName = "Time";
 
     commands_list clusterCommands = {
         //
@@ -21037,85 +18636,157 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                     //
-        make_unique<ReadAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "boot-reasons", Attributes::BootReasons::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::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),                       //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "boot-reasons", Attributes::BootReasons::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::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),                  //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "time", Attributes::Time::Id, credsIssuerConfig),                                        //
+        make_unique<ReadAttribute>(Id, "time-status", Attributes::TimeStatus::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "dst-start", Attributes::DstStart::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "dst-end", Attributes::DstEnd::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "dst-shift", Attributes::DstShift::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "standard-time", Attributes::StandardTime::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "last-set-time", Attributes::LastSetTime::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "valid-until-time", Attributes::ValidUntilTime::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteTimeTime>(credsIssuerConfig),                                                                          //
+        make_unique<WriteTimeTimeStatus>(credsIssuerConfig),                                                                    //
+        make_unique<WriteTimeTimeZone>(credsIssuerConfig),                                                                      //
+        make_unique<WriteTimeDstStart>(credsIssuerConfig),                                                                      //
+        make_unique<WriteTimeDstEnd>(credsIssuerConfig),                                                                        //
+        make_unique<WriteTimeDstShift>(credsIssuerConfig),                                                                      //
+        make_unique<WriteTimeValidUntilTime>(credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "time", Attributes::Time::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeAttribute>(Id, "time-status", Attributes::TimeStatus::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "dst-start", Attributes::DstStart::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "dst-end", Attributes::DstEnd::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "dst-shift", Attributes::DstShift::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "standard-time", Attributes::StandardTime::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "local-time", Attributes::LocalTime::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "last-set-time", Attributes::LastSetTime::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "valid-until-time", Attributes::ValidUntilTime::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::BinaryInputBasic;
+
+    const char * clusterName = "BinaryInputBasic";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "application-type", Attributes::ApplicationType::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteBinaryInputBasicActiveText>(credsIssuerConfig),                                                        //
+        make_unique<WriteBinaryInputBasicDescription>(credsIssuerConfig),                                                       //
+        make_unique<WriteBinaryInputBasicInactiveText>(credsIssuerConfig),                                                      //
+        make_unique<WriteBinaryInputBasicOutOfService>(credsIssuerConfig),                                                      //
+        make_unique<WriteBinaryInputBasicPresentValue>(credsIssuerConfig),                                                      //
+        make_unique<WriteBinaryInputBasicReliability>(credsIssuerConfig),                                                       //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "application-type", Attributes::ApplicationType::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                //
-        make_unique<ReadEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),            //
-        make_unique<ReadEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),        //
-        make_unique<ReadEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                           //
-        make_unique<SubscribeEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),       //
-        make_unique<SubscribeEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),   //
-        make_unique<SubscribeEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                    //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPowerProfile(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::SoftwareDiagnostics;
+    using namespace chip::app::Clusters::PowerProfile;
 
-    const char * clusterName = "SoftwareDiagnostics";
+    const char * clusterName = "PowerProfile";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<SoftwareDiagnosticsResetWatermarks>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                 //
+        make_unique<PowerProfilePowerProfileRequest>(credsIssuerConfig),                    //
+        make_unique<PowerProfilePowerProfileStateRequest>(credsIssuerConfig),               //
+        make_unique<PowerProfileGetPowerProfilePriceResponse>(credsIssuerConfig),           //
+        make_unique<PowerProfileGetOverallSchedulePriceResponse>(credsIssuerConfig),        //
+        make_unique<PowerProfileEnergyPhasesScheduleNotification>(credsIssuerConfig),       //
+        make_unique<PowerProfileEnergyPhasesScheduleResponse>(credsIssuerConfig),           //
+        make_unique<PowerProfilePowerProfileScheduleConstraintsRequest>(credsIssuerConfig), //
+        make_unique<PowerProfileEnergyPhasesScheduleStateRequest>(credsIssuerConfig),       //
+        make_unique<PowerProfileGetPowerProfilePriceExtendedResponse>(credsIssuerConfig),   //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                       //
-        make_unique<ReadAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "total-profile-num", Attributes::TotalProfileNum::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "multiple-scheduling", Attributes::MultipleScheduling::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "energy-formatting", Attributes::EnergyFormatting::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "energy-remote", Attributes::EnergyRemote::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "schedule-mode", Attributes::ScheduleMode::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WritePowerProfileScheduleMode>(credsIssuerConfig),                                                          //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "total-profile-num", Attributes::TotalProfileNum::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "multiple-scheduling", Attributes::MultipleScheduling::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "energy-formatting", Attributes::EnergyFormatting::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "energy-remote", Attributes::EnergyRemote::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "schedule-mode", Attributes::ScheduleMode::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),                //
@@ -21124,182 +18795,46 @@ void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCom
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                   //
-        make_unique<ReadEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                              //
-        make_unique<SubscribeEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterApplianceControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
+    using namespace chip::app::Clusters::ApplianceControl;
 
-    const char * clusterName = "ThreadNetworkDiagnostics";
+    const char * clusterName = "ApplianceControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
         make_unique<ClusterCommand>(Id, credsIssuerConfig),                  //
-        make_unique<ThreadNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                                     //
-        make_unique<ReadAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "neighbor-table-list", Attributes::NeighborTableList::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "route-table-list", Attributes::RouteTableList::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "better-partition-attach-attempt-count", Attributes::BetterPartitionAttachAttemptCount::Id,
-                                   credsIssuerConfig),                                                                         //
-        make_unique<ReadAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
-                                   credsIssuerConfig),                                                                          //
-        make_unique<ReadAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
-                                   credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
-                                   credsIssuerConfig),                                                            //
-        make_unique<ReadAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "channel-mask", Attributes::ChannelMask::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
-                                   credsIssuerConfig),                                                                            //
-        make_unique<ReadAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::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),                       //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                                  //
-        make_unique<SubscribeAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "neighbor-table-list", Attributes::NeighborTableList::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "route-table-list", Attributes::RouteTableList::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "better-partition-attach-attempt-count",
-                                        Attributes::BetterPartitionAttachAttemptCount::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
-                                        credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
-                                        credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
-                                        credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "channel-mask", Attributes::ChannelMask::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ApplianceControlExecutionOfACommand>(credsIssuerConfig), //
+        make_unique<ApplianceControlSignalState>(credsIssuerConfig),         //
+        make_unique<ApplianceControlWriteFunctions>(credsIssuerConfig),      //
+        make_unique<ApplianceControlOverloadPauseResume>(credsIssuerConfig), //
+        make_unique<ApplianceControlOverloadPause>(credsIssuerConfig),       //
+        make_unique<ApplianceControlOverloadWarning>(credsIssuerConfig),     //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "finish-time", Attributes::FinishTime::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "finish-time", Attributes::FinishTime::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::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),                //
@@ -21308,43 +18843,27 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
-        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::WiFiNetworkDiagnostics;
+    using namespace chip::app::Clusters::PulseWidthModulation;
 
-    const char * clusterName = "WiFiNetworkDiagnostics";
+    const char * clusterName = "PulseWidthModulation";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
-        make_unique<WiFiNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                                      //
-        make_unique<ReadAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                                        //
-        make_unique<ReadAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::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),                     //
@@ -21352,82 +18871,206 @@ void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuer
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                                   //
-        make_unique<SubscribeAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id,
+        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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Descriptor;
+
+    const char * clusterName = "Descriptor";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "device-list", Attributes::DeviceList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "parts-list", Attributes::PartsList::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "device-list", Attributes::DeviceList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "parts-list", Attributes::PartsList::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBinding(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Binding;
+
+    const char * clusterName = "Binding";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "binding", Attributes::Binding::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteBindingBinding>(credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "binding", Attributes::Binding::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::AccessControl;
+
+    const char * clusterName = "AccessControl";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                         //
+        make_unique<ReadAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteAccessControlAcl>(credsIssuerConfig),                                                             //
+        make_unique<WriteAccessControlExtension>(credsIssuerConfig),                                                       //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "acl", Attributes::Acl::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "extension", Attributes::Extension::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "subjects-per-access-control-entry", Attributes::SubjectsPerAccessControlEntry::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::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),                 //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "targets-per-access-control-entry", Attributes::TargetsPerAccessControlEntry::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "access-control-entries-per-fabric", Attributes::AccessControlEntriesPerFabric::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                             //
-        make_unique<ReadEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),                 //
-        make_unique<ReadEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),          //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                        //
-        make_unique<SubscribeEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),            //
-        make_unique<SubscribeEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),     //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                        //
+        make_unique<ReadEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
+                               credsIssuerConfig),          //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id,
+                                    credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
+                                    credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPollControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::EthernetNetworkDiagnostics;
+    using namespace chip::app::Clusters::PollControl;
 
-    const char * clusterName = "EthernetNetworkDiagnostics";
+    const char * clusterName = "PollControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                    //
-        make_unique<EthernetNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),              //
+        make_unique<PollControlCheckInResponse>(credsIssuerConfig),      //
+        make_unique<PollControlFastPollStop>(credsIssuerConfig),         //
+        make_unique<PollControlSetLongPollInterval>(credsIssuerConfig),  //
+        make_unique<PollControlSetShortPollInterval>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "check-in-interval", Attributes::CheckInInterval::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "long-poll-interval", Attributes::LongPollInterval::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "short-poll-interval", Attributes::ShortPollInterval::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "fast-poll-timeout", Attributes::FastPollTimeout::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "check-in-interval-min", Attributes::CheckInIntervalMin::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "long-poll-interval-min", Attributes::LongPollIntervalMin::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "fast-poll-timeout-max", Attributes::FastPollTimeoutMax::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WritePollControlCheckInInterval>(credsIssuerConfig),                                                        //
+        make_unique<WritePollControlFastPollTimeout>(credsIssuerConfig),                                                        //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "check-in-interval", Attributes::CheckInInterval::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "long-poll-interval", Attributes::LongPollInterval::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "short-poll-interval", Attributes::ShortPollInterval::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "fast-poll-timeout", Attributes::FastPollTimeout::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "check-in-interval-min", Attributes::CheckInIntervalMin::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "long-poll-interval-min", Attributes::LongPollIntervalMin::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "fast-poll-timeout-max", Attributes::FastPollTimeoutMax::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),                //
@@ -21442,21 +19085,36 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIs
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBridgedActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TimeSynchronization;
+    using namespace chip::app::Clusters::BridgedActions;
 
-    const char * clusterName = "TimeSynchronization";
+    const char * clusterName = "BridgedActions";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
+        make_unique<BridgedActionsInstantAction>(credsIssuerConfig),               //
+        make_unique<BridgedActionsInstantActionWithTransition>(credsIssuerConfig), //
+        make_unique<BridgedActionsStartAction>(credsIssuerConfig),                 //
+        make_unique<BridgedActionsStartActionWithDuration>(credsIssuerConfig),     //
+        make_unique<BridgedActionsStopAction>(credsIssuerConfig),                  //
+        make_unique<BridgedActionsPauseAction>(credsIssuerConfig),                 //
+        make_unique<BridgedActionsPauseActionWithDuration>(credsIssuerConfig),     //
+        make_unique<BridgedActionsResumeAction>(credsIssuerConfig),                //
+        make_unique<BridgedActionsEnableAction>(credsIssuerConfig),                //
+        make_unique<BridgedActionsEnableActionWithDuration>(credsIssuerConfig),    //
+        make_unique<BridgedActionsDisableAction>(credsIssuerConfig),               //
+        make_unique<BridgedActionsDisableActionWithDuration>(credsIssuerConfig),   //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "setup-url", Attributes::SetupUrl::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),                     //
@@ -21464,6 +19122,9 @@ void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCom
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "setup-url", Attributes::SetupUrl::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),                //
@@ -21472,31 +19133,39 @@ void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCom
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                 //
+        make_unique<ReadEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                            //
+        make_unique<SubscribeEvent>(Id, "state-changed", Events::StateChanged::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBridgedDeviceBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BridgedDeviceBasic;
+    using namespace chip::app::Clusters::Basic;
 
-    const char * clusterName = "BridgedDeviceBasic";
+    const char * clusterName = "Basic";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),   //
+        make_unique<BasicMfgSpecificPing>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),              //
         make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                             //
         make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                                 //
         make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                               //
         make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                                  //
         make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),                   //
         make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig),      //
         make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),                   //
@@ -21506,20 +19175,27 @@ void registerClusterBridgedDeviceBasic(Commands & commands, CredentialIssuerComm
         make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                             //
         make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                         //
         make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),          //
         make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                                //
         make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::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),                       //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<WriteBridgedDeviceBasicNodeLabel>(credsIssuerConfig),                                                         //
+        make_unique<WriteBasicNodeLabel>(credsIssuerConfig),                                                                      //
+        make_unique<WriteBasicLocation>(credsIssuerConfig),                                                                       //
+        make_unique<WriteBasicLocalConfigDisabled>(credsIssuerConfig),                                                            //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
         make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
         make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                          //
         make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "location", Attributes::Location::Id, credsIssuerConfig),                             //
         make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
         make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
@@ -21529,8 +19205,10 @@ void registerClusterBridgedDeviceBasic(Commands & commands, CredentialIssuerComm
         make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
         make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
         make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "local-config-disabled", Attributes::LocalConfigDisabled::Id, credsIssuerConfig),     //
         make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
         make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "capability-minima", Attributes::CapabilityMinima::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),                  //
@@ -21553,24 +19231,24 @@ void registerClusterBridgedDeviceBasic(Commands & commands, CredentialIssuerComm
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Switch;
+    using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
 
-    const char * clusterName = "Switch";
+    const char * clusterName = "OtaSoftwareUpdateProvider";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
+        make_unique<OtaSoftwareUpdateProviderQueryImage>(credsIssuerConfig),          //
+        make_unique<OtaSoftwareUpdateProviderApplyUpdateRequest>(credsIssuerConfig),  //
+        make_unique<OtaSoftwareUpdateProviderNotifyUpdateApplied>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::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),                     //
@@ -21578,9 +19256,6 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::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),                //
@@ -21589,57 +19264,44 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
-        make_unique<ReadEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),                 //
-        make_unique<ReadEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),                   //
-        make_unique<ReadEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                         //
-        make_unique<ReadEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),                   //
-        make_unique<ReadEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                     //
-        make_unique<ReadEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),        //
-        make_unique<ReadEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<SubscribeEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),            //
-        make_unique<SubscribeEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),              //
-        make_unique<SubscribeEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),              //
-        make_unique<SubscribeEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                //
-        make_unique<SubscribeEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),   //
-        make_unique<SubscribeEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterAdministratorCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::AdministratorCommissioning;
+    using namespace chip::app::Clusters::OtaSoftwareUpdateRequestor;
 
-    const char * clusterName = "AdministratorCommissioning";
+    const char * clusterName = "OtaSoftwareUpdateRequestor";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                     //
-        make_unique<AdministratorCommissioningOpenCommissioningWindow>(credsIssuerConfig),      //
-        make_unique<AdministratorCommissioningOpenBasicCommissioningWindow>(credsIssuerConfig), //
-        make_unique<AdministratorCommissioningRevokeCommissioning>(credsIssuerConfig),          //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                            //
+        make_unique<OtaSoftwareUpdateRequestorAnnounceOtaProvider>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteOtaSoftwareUpdateRequestorDefaultOtaProviders>(credsIssuerConfig),                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "update-state-progress", Attributes::UpdateStateProgress::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),                //
@@ -21648,56 +19310,45 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                       //
+        make_unique<ReadEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),        //
+        make_unique<ReadEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),          //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                  //
+        make_unique<SubscribeEvent>(Id, "state-transition", Events::StateTransition::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "version-applied", Events::VersionApplied::Id, credsIssuerConfig),   //
+        make_unique<SubscribeEvent>(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig),     //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOperationalCredentials(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLocalizationConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OperationalCredentials;
+    using namespace chip::app::Clusters::LocalizationConfiguration;
 
-    const char * clusterName = "OperationalCredentials";
+    const char * clusterName = "LocalizationConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                 //
-        make_unique<OperationalCredentialsAttestationRequest>(credsIssuerConfig),           //
-        make_unique<OperationalCredentialsCertificateChainRequest>(credsIssuerConfig),      //
-        make_unique<OperationalCredentialsCSRRequest>(credsIssuerConfig),                   //
-        make_unique<OperationalCredentialsAddNOC>(credsIssuerConfig),                       //
-        make_unique<OperationalCredentialsUpdateNOC>(credsIssuerConfig),                    //
-        make_unique<OperationalCredentialsUpdateFabricLabel>(credsIssuerConfig),            //
-        make_unique<OperationalCredentialsRemoveFabric>(credsIssuerConfig),                 //
-        make_unique<OperationalCredentialsAddTrustedRootCertificate>(credsIssuerConfig),    //
-        make_unique<OperationalCredentialsRemoveTrustedRootCertificate>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                         //
-        make_unique<ReadAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::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),                      //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                    //
-        make_unique<SubscribeAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "supported-locales", Attributes::SupportedLocales::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteLocalizationConfigurationActiveLocale>(credsIssuerConfig),                                             //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "supported-locales", Attributes::SupportedLocales::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),                //
@@ -21712,41 +19363,36 @@ void registerClusterOperationalCredentials(Commands & commands, CredentialIssuer
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::GroupKeyManagement;
+    using namespace chip::app::Clusters::TimeFormatLocalization;
 
-    const char * clusterName = "GroupKeyManagement";
+    const char * clusterName = "TimeFormatLocalization";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                     //
-        make_unique<GroupKeyManagementKeySetWrite>(credsIssuerConfig),          //
-        make_unique<GroupKeyManagementKeySetRead>(credsIssuerConfig),           //
-        make_unique<GroupKeyManagementKeySetRemove>(credsIssuerConfig),         //
-        make_unique<GroupKeyManagementKeySetReadAllIndices>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                       //
-        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, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::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),                    //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                    //
-        make_unique<WriteGroupKeyManagementGroupKeyMap>(credsIssuerConfig),                                                    //
+        make_unique<WriteTimeFormatLocalizationHourFormat>(credsIssuerConfig),                                                 //
+        make_unique<WriteTimeFormatLocalizationActiveCalendarType>(credsIssuerConfig),                                         //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "max-groups-per-fabric", Attributes::MaxGroupsPerFabric::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "max-group-keys-per-fabric", Attributes::MaxGroupKeysPerFabric::Id,
+        make_unique<SubscribeAttribute>(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id,
                                         credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
@@ -21762,11 +19408,50 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterUnitLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::UnitLocalization;
+
+    const char * clusterName = "UnitLocalization";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteUnitLocalizationTemperatureUnit>(credsIssuerConfig),                                                   //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "temperature-unit", Attributes::TemperatureUnit::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::FixedLabel;
+    using namespace chip::app::Clusters::PowerSourceConfiguration;
 
-    const char * clusterName = "FixedLabel";
+    const char * clusterName = "PowerSourceConfiguration";
 
     commands_list clusterCommands = {
         //
@@ -21777,7 +19462,7 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "sources", Attributes::Sources::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),                     //
@@ -21785,7 +19470,7 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "sources", Attributes::Sources::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),                //
@@ -21800,11 +19485,11 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::UserLabel;
+    using namespace chip::app::Clusters::PowerSource;
 
-    const char * clusterName = "UserLabel";
+    const char * clusterName = "PowerSource";
 
     commands_list clusterCommands = {
         //
@@ -21814,17 +19499,97 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteUserLabelLabelList>(credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                             //
+        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
+                                   credsIssuerConfig),                                                                           //
+        make_unique<ReadAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "battery-percent-remaining", Attributes::BatteryPercentRemaining::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-time-remaining", Attributes::BatteryTimeRemaining::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "battery-charge-level", Attributes::BatteryChargeLevel::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "battery-replacement-needed", Attributes::BatteryReplacementNeeded::Id,
+                                   credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "battery-replaceability", Attributes::BatteryReplaceability::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-present", Attributes::BatteryPresent::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "active-battery-faults", Attributes::ActiveBatteryFaults::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "battery-replacement-description", Attributes::BatteryReplacementDescription::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-common-designation", Attributes::BatteryCommonDesignation::Id,
+                                   credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "battery-ansidesignation", Attributes::BatteryANSIDesignation::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-iecdesignation", Attributes::BatteryIECDesignation::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "battery-approved-chemistry", Attributes::BatteryApprovedChemistry::Id,
+                                   credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "battery-capacity", Attributes::BatteryCapacity::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "battery-charge-state", Attributes::BatteryChargeState::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-time-to-full-charge", Attributes::BatteryTimeToFullCharge::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "battery-functional-while-charging", Attributes::BatteryFunctionalWhileCharging::Id,
+                                   credsIssuerConfig),                                                                         //
+        make_unique<ReadAttribute>(Id, "battery-charging-current", Attributes::BatteryChargingCurrent::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "active-battery-charge-faults", Attributes::ActiveBatteryChargeFaults::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "order", Attributes::Order::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "wired-current-type", Attributes::WiredCurrentType::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "wired-assessed-current", Attributes::WiredAssessedCurrent::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "wired-nominal-voltage", Attributes::WiredNominalVoltage::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "wired-maximum-current", Attributes::WiredMaximumCurrent::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "wired-present", Attributes::WiredPresent::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "battery-voltage", Attributes::BatteryVoltage::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "battery-percent-remaining", Attributes::BatteryPercentRemaining::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "battery-time-remaining", Attributes::BatteryTimeRemaining::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-charge-level", Attributes::BatteryChargeLevel::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "battery-replacement-needed", Attributes::BatteryReplacementNeeded::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "battery-replaceability", Attributes::BatteryReplaceability::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-present", Attributes::BatteryPresent::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "active-battery-faults", Attributes::ActiveBatteryFaults::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "battery-replacement-description", Attributes::BatteryReplacementDescription::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-common-designation", Attributes::BatteryCommonDesignation::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-ansidesignation", Attributes::BatteryANSIDesignation::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "battery-iecdesignation", Attributes::BatteryIECDesignation::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-approved-chemistry", Attributes::BatteryApprovedChemistry::Id,
+                                        credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "battery-capacity", Attributes::BatteryCapacity::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "battery-quantity", Attributes::BatteryQuantity::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "battery-charge-state", Attributes::BatteryChargeState::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-time-to-full-charge", Attributes::BatteryTimeToFullCharge::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-functional-while-charging", Attributes::BatteryFunctionalWhileCharging::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "battery-charging-current", Attributes::BatteryChargingCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-battery-charge-faults", Attributes::ActiveBatteryChargeFaults::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),                //
@@ -21839,28 +19604,45 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ProxyConfiguration;
+    using namespace chip::app::Clusters::GeneralCommissioning;
 
-    const char * clusterName = "ProxyConfiguration";
+    const char * clusterName = "GeneralCommissioning";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
+        make_unique<GeneralCommissioningArmFailSafe>(credsIssuerConfig),           //
+        make_unique<GeneralCommissioningSetRegulatoryConfig>(credsIssuerConfig),   //
+        make_unique<GeneralCommissioningCommissioningComplete>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteGeneralCommissioningBreadcrumb>(credsIssuerConfig),                                               //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id,
+                                        credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::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),                //
@@ -21875,28 +19657,53 @@ void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerComm
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ProxyDiscovery;
+    using namespace chip::app::Clusters::NetworkCommissioning;
 
-    const char * clusterName = "ProxyDiscovery";
+    const char * clusterName = "NetworkCommissioning";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                           //
+        make_unique<NetworkCommissioningScanNetworks>(credsIssuerConfig),             //
+        make_unique<NetworkCommissioningAddOrUpdateWiFiNetwork>(credsIssuerConfig),   //
+        make_unique<NetworkCommissioningAddOrUpdateThreadNetwork>(credsIssuerConfig), //
+        make_unique<NetworkCommissioningRemoveNetwork>(credsIssuerConfig),            //
+        make_unique<NetworkCommissioningConnectNetwork>(credsIssuerConfig),           //
+        make_unique<NetworkCommissioningReorderNetwork>(credsIssuerConfig),           //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                    //
+        make_unique<ReadAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::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),                   //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<WriteNetworkCommissioningInterfaceEnabled>(credsIssuerConfig),                                            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<SubscribeAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::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),                //
@@ -21911,17 +19718,18 @@ void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ProxyValid;
+    using namespace chip::app::Clusters::DiagnosticLogs;
 
-    const char * clusterName = "ProxyValid";
+    const char * clusterName = "DiagnosticLogs";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
+        make_unique<DiagnosticLogsRetrieveLogsRequest>(credsIssuerConfig), //
         //
         // Attributes
         //
@@ -21941,36 +19749,110 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::GeneralDiagnostics;
+
+    const char * clusterName = "GeneralDiagnostics";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<GeneralDiagnosticsTestEventTrigger>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<ReadAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "boot-reasons", Attributes::BootReasons::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::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),                       //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "up-time", Attributes::UpTime::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeAttribute>(Id, "total-operational-hours", Attributes::TotalOperationalHours::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "boot-reasons", Attributes::BootReasons::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                //
+        make_unique<ReadEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),        //
+        make_unique<ReadEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                           //
+        make_unique<SubscribeEvent>(Id, "hardware-fault-change", Events::HardwareFaultChange::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "radio-fault-change", Events::RadioFaultChange::Id, credsIssuerConfig),       //
+        make_unique<SubscribeEvent>(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig),   //
+        make_unique<SubscribeEvent>(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig),                    //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BooleanState;
+    using namespace chip::app::Clusters::SoftwareDiagnostics;
 
-    const char * clusterName = "BooleanState";
+    const char * clusterName = "SoftwareDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
+        make_unique<SoftwareDiagnosticsResetWatermarks>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "state-value", Attributes::StateValue::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                       //
+        make_unique<ReadAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::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),                //
@@ -21979,51 +19861,182 @@ void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands *
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                               //
-        make_unique<ReadEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                          //
-        make_unique<SubscribeEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                   //
+        make_unique<ReadEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                              //
+        make_unique<SubscribeEvent>(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ModeSelect;
+    using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
 
-    const char * clusterName = "ModeSelect";
+    const char * clusterName = "ThreadNetworkDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
-        make_unique<ModeSelectChangeToMode>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                  //
+        make_unique<ThreadNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteModeSelectStartUpMode>(credsIssuerConfig),                                                             //
-        make_unique<WriteModeSelectOnMode>(credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                                     //
+        make_unique<ReadAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "neighbor-table-list", Attributes::NeighborTableList::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "route-table-list", Attributes::RouteTableList::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "better-partition-attach-attempt-count", Attributes::BetterPartitionAttachAttemptCount::Id,
+                                   credsIssuerConfig),                                                                         //
+        make_unique<ReadAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
+                                   credsIssuerConfig),                                                                          //
+        make_unique<ReadAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
+                                   credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
+                                   credsIssuerConfig),                                                            //
+        make_unique<ReadAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "channel-mask", Attributes::ChannelMask::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
+                                   credsIssuerConfig),                                                                            //
+        make_unique<ReadAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::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),                       //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "channel", Attributes::Channel::Id, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig),                                  //
+        make_unique<SubscribeAttribute>(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "neighbor-table-list", Attributes::NeighborTableList::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "route-table-list", Attributes::RouteTableList::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "better-partition-attach-attempt-count",
+                                        Attributes::BetterPartitionAttachAttemptCount::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "parent-change-count", Attributes::ParentChangeCount::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "tx-total-count", Attributes::TxTotalCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "tx-unicast-count", Attributes::TxUnicastCount::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "tx-broadcast-count", Attributes::TxBroadcastCount::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "tx-ack-requested-count", Attributes::TxAckRequestedCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-acked-count", Attributes::TxAckedCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "tx-no-ack-requested-count", Attributes::TxNoAckRequestedCount::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "tx-data-count", Attributes::TxDataCount::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "tx-data-poll-count", Attributes::TxDataPollCount::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "tx-beacon-count", Attributes::TxBeaconCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "tx-beacon-request-count", Attributes::TxBeaconRequestCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-other-count", Attributes::TxOtherCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "tx-retry-count", Attributes::TxRetryCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "tx-direct-max-retry-expiry-count", Attributes::TxDirectMaxRetryExpiryCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-indirect-max-retry-expiry-count", Attributes::TxIndirectMaxRetryExpiryCount::Id,
+                                        credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "tx-err-cca-count", Attributes::TxErrCcaCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "tx-err-abort-count", Attributes::TxErrAbortCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "tx-err-busy-channel-count", Attributes::TxErrBusyChannelCount::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "rx-total-count", Attributes::RxTotalCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "rx-unicast-count", Attributes::RxUnicastCount::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "rx-broadcast-count", Attributes::RxBroadcastCount::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rx-data-count", Attributes::RxDataCount::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "rx-data-poll-count", Attributes::RxDataPollCount::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "rx-beacon-count", Attributes::RxBeaconCount::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "rx-beacon-request-count", Attributes::RxBeaconRequestCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-other-count", Attributes::RxOtherCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "rx-address-filtered-count", Attributes::RxAddressFilteredCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-dest-addr-filtered-count", Attributes::RxDestAddrFilteredCount::Id,
+                                        credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "rx-duplicated-count", Attributes::RxDuplicatedCount::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rx-err-no-frame-count", Attributes::RxErrNoFrameCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-err-unknown-neighbor-count", Attributes::RxErrUnknownNeighborCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rx-err-invalid-src-addr-count", Attributes::RxErrInvalidSrcAddrCount::Id,
+                                        credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "rx-err-sec-count", Attributes::RxErrSecCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "rx-err-fcs-count", Attributes::RxErrFcsCount::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "rx-err-other-count", Attributes::RxErrOtherCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-timestamp", Attributes::ActiveTimestamp::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "pending-timestamp", Attributes::PendingTimestamp::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "delay", Attributes::Delay::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "security-policy", Attributes::SecurityPolicy::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "channel-mask", Attributes::ChannelMask::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::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),                //
@@ -22032,276 +20045,126 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
+        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterShadeConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ShadeConfiguration;
+    using namespace chip::app::Clusters::WiFiNetworkDiagnostics;
 
-    const char * clusterName = "ShadeConfiguration";
+    const char * clusterName = "WiFiNetworkDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                //
+        make_unique<WiFiNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "physical-closed-limit", Attributes::PhysicalClosedLimit::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "motor-step-size", Attributes::MotorStepSize::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                                    //
-        make_unique<ReadAttribute>(Id, "closed-limit", Attributes::ClosedLimit::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "mode", Attributes::Mode::Id, credsIssuerConfig),                                        //
+        make_unique<ReadAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                                      //
+        make_unique<ReadAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                                        //
+        make_unique<ReadAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteShadeConfigurationStatus>(credsIssuerConfig),                                                          //
-        make_unique<WriteShadeConfigurationClosedLimit>(credsIssuerConfig),                                                     //
-        make_unique<WriteShadeConfigurationMode>(credsIssuerConfig),                                                            //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "physical-closed-limit", Attributes::PhysicalClosedLimit::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "motor-step-size", Attributes::MotorStepSize::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, "closed-limit", Attributes::ClosedLimit::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "mode", Attributes::Mode::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeAttribute>(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "packet-unicast-rx-count", Attributes::PacketUnicastRxCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "packet-unicast-tx-count", Attributes::PacketUnicastTxCount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-max-rate", Attributes::CurrentMaxRate::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::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),                 //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),             //
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                             //
+        make_unique<ReadEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),                 //
+        make_unique<ReadEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),          //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                        //
+        make_unique<SubscribeEvent>(Id, "disconnection", Events::Disconnection::Id, credsIssuerConfig),            //
+        make_unique<SubscribeEvent>(Id, "association-failure", Events::AssociationFailure::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig),     //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DoorLock;
+    using namespace chip::app::Clusters::EthernetNetworkDiagnostics;
 
-    const char * clusterName = "DoorLock";
+    const char * clusterName = "EthernetNetworkDiagnostics";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
-        make_unique<DoorLockLockDoor>(credsIssuerConfig),             //
-        make_unique<DoorLockUnlockDoor>(credsIssuerConfig),           //
-        make_unique<DoorLockUnlockWithTimeout>(credsIssuerConfig),    //
-        make_unique<DoorLockGetLogRecord>(credsIssuerConfig),         //
-        make_unique<DoorLockSetPINCode>(credsIssuerConfig),           //
-        make_unique<DoorLockGetPINCode>(credsIssuerConfig),           //
-        make_unique<DoorLockClearPINCode>(credsIssuerConfig),         //
-        make_unique<DoorLockClearAllPINCodes>(credsIssuerConfig),     //
-        make_unique<DoorLockSetUserStatus>(credsIssuerConfig),        //
-        make_unique<DoorLockGetUserStatus>(credsIssuerConfig),        //
-        make_unique<DoorLockSetWeekDaySchedule>(credsIssuerConfig),   //
-        make_unique<DoorLockGetWeekDaySchedule>(credsIssuerConfig),   //
-        make_unique<DoorLockClearWeekDaySchedule>(credsIssuerConfig), //
-        make_unique<DoorLockSetYearDaySchedule>(credsIssuerConfig),   //
-        make_unique<DoorLockGetYearDaySchedule>(credsIssuerConfig),   //
-        make_unique<DoorLockClearYearDaySchedule>(credsIssuerConfig), //
-        make_unique<DoorLockSetHolidaySchedule>(credsIssuerConfig),   //
-        make_unique<DoorLockGetHolidaySchedule>(credsIssuerConfig),   //
-        make_unique<DoorLockClearHolidaySchedule>(credsIssuerConfig), //
-        make_unique<DoorLockSetUserType>(credsIssuerConfig),          //
-        make_unique<DoorLockGetUserType>(credsIssuerConfig),          //
-        make_unique<DoorLockSetRFIDCode>(credsIssuerConfig),          //
-        make_unique<DoorLockGetRFIDCode>(credsIssuerConfig),          //
-        make_unique<DoorLockClearRFIDCode>(credsIssuerConfig),        //
-        make_unique<DoorLockClearAllRFIDCodes>(credsIssuerConfig),    //
-        make_unique<DoorLockSetUser>(credsIssuerConfig),              //
-        make_unique<DoorLockGetUser>(credsIssuerConfig),              //
-        make_unique<DoorLockClearUser>(credsIssuerConfig),            //
-        make_unique<DoorLockSetCredential>(credsIssuerConfig),        //
-        make_unique<DoorLockGetCredentialStatus>(credsIssuerConfig),  //
-        make_unique<DoorLockClearCredential>(credsIssuerConfig),      //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                    //
+        make_unique<EthernetNetworkDiagnosticsResetCounts>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                         //
-        make_unique<ReadAttribute>(Id, "lock-state", Attributes::LockState::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "lock-type", Attributes::LockType::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "actuator-enabled", Attributes::ActuatorEnabled::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "door-state", Attributes::DoorState::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "door-open-events", Attributes::DoorOpenEvents::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "door-closed-events", Attributes::DoorClosedEvents::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "open-period", Attributes::OpenPeriod::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "number-of-log-records-supported", Attributes::NumberOfLogRecordsSupported::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-total-users-supported", Attributes::NumberOfTotalUsersSupported::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-pinusers-supported", Attributes::NumberOfPINUsersSupported::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-rfidusers-supported", Attributes::NumberOfRFIDUsersSupported::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-week-day-schedules-supported-per-user",
-                                   Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-year-day-schedules-supported-per-user",
-                                   Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-holiday-schedules-supported", Attributes::NumberOfHolidaySchedulesSupported::Id,
-                                   credsIssuerConfig),                                                                         //
-        make_unique<ReadAttribute>(Id, "max-pincode-length", Attributes::MaxPINCodeLength::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "min-pincode-length", Attributes::MinPINCodeLength::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "max-rfidcode-length", Attributes::MaxRFIDCodeLength::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "min-rfidcode-length", Attributes::MinRFIDCodeLength::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "credential-rules-support", Attributes::CredentialRulesSupport::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-credentials-supported-per-user",
-                                   Attributes::NumberOfCredentialsSupportedPerUser::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "enable-logging", Attributes::EnableLogging::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "language", Attributes::Language::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "ledsettings", Attributes::LEDSettings::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "auto-relock-time", Attributes::AutoRelockTime::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "sound-volume", Attributes::SoundVolume::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "operating-mode", Attributes::OperatingMode::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "supported-operating-modes", Attributes::SupportedOperatingModes::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "default-configuration-register", Attributes::DefaultConfigurationRegister::Id,
-                                   credsIssuerConfig),                                                                            //
-        make_unique<ReadAttribute>(Id, "enable-local-programming", Attributes::EnableLocalProgramming::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "enable-one-touch-locking", Attributes::EnableOneTouchLocking::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "enable-inside-status-led", Attributes::EnableInsideStatusLED::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "enable-privacy-mode-button", Attributes::EnablePrivacyModeButton::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "local-programming-features", Attributes::LocalProgrammingFeatures::Id,
-                                   credsIssuerConfig),                                                                    //
-        make_unique<ReadAttribute>(Id, "wrong-code-entry-limit", Attributes::WrongCodeEntryLimit::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "user-code-temporary-disable-time", Attributes::UserCodeTemporaryDisableTime::Id,
-                                   credsIssuerConfig),                                                                //
-        make_unique<ReadAttribute>(Id, "send-pinover-the-air", Attributes::SendPINOverTheAir::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "require-pinfor-remote-operation", Attributes::RequirePINforRemoteOperation::Id,
-                                   credsIssuerConfig),                                                                   //
-        make_unique<ReadAttribute>(Id, "expiring-user-timeout", Attributes::ExpiringUserTimeout::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "alarm-mask", Attributes::AlarmMask::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "keypad-operation-event-mask", Attributes::KeypadOperationEventMask::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "remote-operation-event-mask", Attributes::RemoteOperationEventMask::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "manual-operation-event-mask", Attributes::ManualOperationEventMask::Id,
-                                   credsIssuerConfig),                                                                         //
-        make_unique<ReadAttribute>(Id, "rfidoperation-event-mask", Attributes::RFIDOperationEventMask::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "keypad-programming-event-mask", Attributes::KeypadProgrammingEventMask::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "remote-programming-event-mask", Attributes::RemoteProgrammingEventMask::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rfidprogramming-event-mask", Attributes::RFIDProgrammingEventMask::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteDoorLockDoorOpenEvents>(credsIssuerConfig),                                                       //
-        make_unique<WriteDoorLockDoorClosedEvents>(credsIssuerConfig),                                                     //
-        make_unique<WriteDoorLockOpenPeriod>(credsIssuerConfig),                                                           //
-        make_unique<WriteDoorLockEnableLogging>(credsIssuerConfig),                                                        //
-        make_unique<WriteDoorLockLanguage>(credsIssuerConfig),                                                             //
-        make_unique<WriteDoorLockLEDSettings>(credsIssuerConfig),                                                          //
-        make_unique<WriteDoorLockAutoRelockTime>(credsIssuerConfig),                                                       //
-        make_unique<WriteDoorLockSoundVolume>(credsIssuerConfig),                                                          //
-        make_unique<WriteDoorLockOperatingMode>(credsIssuerConfig),                                                        //
-        make_unique<WriteDoorLockEnableLocalProgramming>(credsIssuerConfig),                                               //
-        make_unique<WriteDoorLockEnableOneTouchLocking>(credsIssuerConfig),                                                //
-        make_unique<WriteDoorLockEnableInsideStatusLED>(credsIssuerConfig),                                                //
-        make_unique<WriteDoorLockEnablePrivacyModeButton>(credsIssuerConfig),                                              //
-        make_unique<WriteDoorLockLocalProgrammingFeatures>(credsIssuerConfig),                                             //
-        make_unique<WriteDoorLockWrongCodeEntryLimit>(credsIssuerConfig),                                                  //
-        make_unique<WriteDoorLockUserCodeTemporaryDisableTime>(credsIssuerConfig),                                         //
-        make_unique<WriteDoorLockSendPINOverTheAir>(credsIssuerConfig),                                                    //
-        make_unique<WriteDoorLockRequirePINforRemoteOperation>(credsIssuerConfig),                                         //
-        make_unique<WriteDoorLockExpiringUserTimeout>(credsIssuerConfig),                                                  //
-        make_unique<WriteDoorLockAlarmMask>(credsIssuerConfig),                                                            //
-        make_unique<WriteDoorLockKeypadOperationEventMask>(credsIssuerConfig),                                             //
-        make_unique<WriteDoorLockRemoteOperationEventMask>(credsIssuerConfig),                                             //
-        make_unique<WriteDoorLockManualOperationEventMask>(credsIssuerConfig),                                             //
-        make_unique<WriteDoorLockRFIDOperationEventMask>(credsIssuerConfig),                                               //
-        make_unique<WriteDoorLockKeypadProgrammingEventMask>(credsIssuerConfig),                                           //
-        make_unique<WriteDoorLockRemoteProgrammingEventMask>(credsIssuerConfig),                                           //
-        make_unique<WriteDoorLockRFIDProgrammingEventMask>(credsIssuerConfig),                                             //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "lock-state", Attributes::LockState::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "lock-type", Attributes::LockType::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "actuator-enabled", Attributes::ActuatorEnabled::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "door-state", Attributes::DoorState::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "door-open-events", Attributes::DoorOpenEvents::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "door-closed-events", Attributes::DoorClosedEvents::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "open-period", Attributes::OpenPeriod::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "number-of-log-records-supported", Attributes::NumberOfLogRecordsSupported::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-total-users-supported", Attributes::NumberOfTotalUsersSupported::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-pinusers-supported", Attributes::NumberOfPINUsersSupported::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-rfidusers-supported", Attributes::NumberOfRFIDUsersSupported::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-week-day-schedules-supported-per-user",
-                                        Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-year-day-schedules-supported-per-user",
-                                        Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-holiday-schedules-supported",
-                                        Attributes::NumberOfHolidaySchedulesSupported::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "max-pincode-length", Attributes::MaxPINCodeLength::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "min-pincode-length", Attributes::MinPINCodeLength::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "max-rfidcode-length", Attributes::MaxRFIDCodeLength::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "min-rfidcode-length", Attributes::MinRFIDCodeLength::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "credential-rules-support", Attributes::CredentialRulesSupport::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-credentials-supported-per-user",
-                                        Attributes::NumberOfCredentialsSupportedPerUser::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "enable-logging", Attributes::EnableLogging::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "language", Attributes::Language::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "ledsettings", Attributes::LEDSettings::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "auto-relock-time", Attributes::AutoRelockTime::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "sound-volume", Attributes::SoundVolume::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "operating-mode", Attributes::OperatingMode::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "supported-operating-modes", Attributes::SupportedOperatingModes::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "default-configuration-register", Attributes::DefaultConfigurationRegister::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "enable-local-programming", Attributes::EnableLocalProgramming::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "enable-one-touch-locking", Attributes::EnableOneTouchLocking::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "enable-inside-status-led", Attributes::EnableInsideStatusLED::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "enable-privacy-mode-button", Attributes::EnablePrivacyModeButton::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "local-programming-features", Attributes::LocalProgrammingFeatures::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "wrong-code-entry-limit", Attributes::WrongCodeEntryLimit::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "user-code-temporary-disable-time", Attributes::UserCodeTemporaryDisableTime::Id,
-                                        credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "send-pinover-the-air", Attributes::SendPINOverTheAir::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "require-pinfor-remote-operation", Attributes::RequirePINforRemoteOperation::Id,
-                                        credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "expiring-user-timeout", Attributes::ExpiringUserTimeout::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "alarm-mask", Attributes::AlarmMask::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "keypad-operation-event-mask", Attributes::KeypadOperationEventMask::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "remote-operation-event-mask", Attributes::RemoteOperationEventMask::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "manual-operation-event-mask", Attributes::ManualOperationEventMask::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rfidoperation-event-mask", Attributes::RFIDOperationEventMask::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "keypad-programming-event-mask", Attributes::KeypadProgrammingEventMask::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "remote-programming-event-mask", Attributes::RemoteProgrammingEventMask::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rfidprogramming-event-mask", Attributes::RFIDProgrammingEventMask::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "time-since-reset", Attributes::TimeSinceReset::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),                //
@@ -22310,118 +20173,210 @@ void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * cre
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
-        make_unique<ReadEvent>(Id, "door-lock-alarm", Events::DoorLockAlarm::Id, credsIssuerConfig),                //
-        make_unique<ReadEvent>(Id, "door-state-change", Events::DoorStateChange::Id, credsIssuerConfig),            //
-        make_unique<ReadEvent>(Id, "lock-operation", Events::LockOperation::Id, credsIssuerConfig),                 //
-        make_unique<ReadEvent>(Id, "lock-operation-error", Events::LockOperationError::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "lock-user-change", Events::LockUserChange::Id, credsIssuerConfig),              //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
-        make_unique<SubscribeEvent>(Id, "door-lock-alarm", Events::DoorLockAlarm::Id, credsIssuerConfig),           //
-        make_unique<SubscribeEvent>(Id, "door-state-change", Events::DoorStateChange::Id, credsIssuerConfig),       //
-        make_unique<SubscribeEvent>(Id, "lock-operation", Events::LockOperation::Id, credsIssuerConfig),            //
-        make_unique<SubscribeEvent>(Id, "lock-operation-error", Events::LockOperationError::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "lock-user-change", Events::LockUserChange::Id, credsIssuerConfig),         //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterWindowCovering(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::WindowCovering;
+    using namespace chip::app::Clusters::TimeSynchronization;
 
-    const char * clusterName = "WindowCovering";
+    const char * clusterName = "TimeSynchronization";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),               //
-        make_unique<WindowCoveringUpOrOpen>(credsIssuerConfig),           //
-        make_unique<WindowCoveringDownOrClose>(credsIssuerConfig),        //
-        make_unique<WindowCoveringStopMotion>(credsIssuerConfig),         //
-        make_unique<WindowCoveringGoToLiftValue>(credsIssuerConfig),      //
-        make_unique<WindowCoveringGoToLiftPercentage>(credsIssuerConfig), //
-        make_unique<WindowCoveringGoToTiltValue>(credsIssuerConfig),      //
-        make_unique<WindowCoveringGoToTiltPercentage>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBridgedDeviceBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::BridgedDeviceBasic;
+
+    const char * clusterName = "BridgedDeviceBasic";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "type", Attributes::Type::Id, credsIssuerConfig),                                          //
-        make_unique<ReadAttribute>(Id, "physical-closed-limit-lift", Attributes::PhysicalClosedLimitLift::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "physical-closed-limit-tilt", Attributes::PhysicalClosedLimitTilt::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-position-lift", Attributes::CurrentPositionLift::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "current-position-tilt", Attributes::CurrentPositionTilt::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "number-of-actuations-lift", Attributes::NumberOfActuationsLift::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "number-of-actuations-tilt", Attributes::NumberOfActuationsTilt::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "config-status", Attributes::ConfigStatus::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "current-position-lift-percentage", Attributes::CurrentPositionLiftPercentage::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-position-tilt-percentage", Attributes::CurrentPositionTiltPercentage::Id,
-                                   credsIssuerConfig),                                                              //
-        make_unique<ReadAttribute>(Id, "operational-status", Attributes::OperationalStatus::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "target-position-lift-percent100ths", Attributes::TargetPositionLiftPercent100ths::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "target-position-tilt-percent100ths", Attributes::TargetPositionTiltPercent100ths::Id,
-                                   credsIssuerConfig),                                                         //
-        make_unique<ReadAttribute>(Id, "end-product-type", Attributes::EndProductType::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-position-lift-percent100ths", Attributes::CurrentPositionLiftPercent100ths::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-position-tilt-percent100ths", Attributes::CurrentPositionTiltPercent100ths::Id,
-                                   credsIssuerConfig),                                                                          //
-        make_unique<ReadAttribute>(Id, "installed-open-limit-lift", Attributes::InstalledOpenLimitLift::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "installed-closed-limit-lift", Attributes::InstalledClosedLimitLift::Id,
-                                   credsIssuerConfig),                                                                          //
-        make_unique<ReadAttribute>(Id, "installed-open-limit-tilt", Attributes::InstalledOpenLimitTilt::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "installed-closed-limit-tilt", Attributes::InstalledClosedLimitTilt::Id,
-                                   credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "mode", Attributes::Mode::Id, credsIssuerConfig),                                   //
-        make_unique<ReadAttribute>(Id, "safety-status", Attributes::SafetyStatus::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteWindowCoveringMode>(credsIssuerConfig),                                                           //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "type", Attributes::Type::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeAttribute>(Id, "physical-closed-limit-lift", Attributes::PhysicalClosedLimitLift::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "physical-closed-limit-tilt", Attributes::PhysicalClosedLimitTilt::Id,
-                                        credsIssuerConfig),                                                                   //
-        make_unique<SubscribeAttribute>(Id, "current-position-lift", Attributes::CurrentPositionLift::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-position-tilt", Attributes::CurrentPositionTilt::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-actuations-lift", Attributes::NumberOfActuationsLift::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-actuations-tilt", Attributes::NumberOfActuationsTilt::Id,
-                                        credsIssuerConfig),                                                    //
-        make_unique<SubscribeAttribute>(Id, "config-status", Attributes::ConfigStatus::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-position-lift-percentage", Attributes::CurrentPositionLiftPercentage::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-position-tilt-percentage", Attributes::CurrentPositionTiltPercentage::Id,
-                                        credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, "operational-status", Attributes::OperationalStatus::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "target-position-lift-percent100ths", Attributes::TargetPositionLiftPercent100ths::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "target-position-tilt-percent100ths", Attributes::TargetPositionTiltPercent100ths::Id,
-                                        credsIssuerConfig),                                                         //
-        make_unique<SubscribeAttribute>(Id, "end-product-type", Attributes::EndProductType::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-position-lift-percent100ths", Attributes::CurrentPositionLiftPercent100ths::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-position-tilt-percent100ths", Attributes::CurrentPositionTiltPercent100ths::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "installed-open-limit-lift", Attributes::InstalledOpenLimitLift::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "installed-closed-limit-lift", Attributes::InstalledClosedLimitLift::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "installed-open-limit-tilt", Attributes::InstalledOpenLimitTilt::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "installed-closed-limit-tilt", Attributes::InstalledClosedLimitTilt::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "mode", Attributes::Mode::Id, credsIssuerConfig),                                   //
-        make_unique<SubscribeAttribute>(Id, "safety-status", Attributes::SafetyStatus::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "unique-id", Attributes::UniqueID::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),                       //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                   //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<WriteBridgedDeviceBasicNodeLabel>(credsIssuerConfig),                                                         //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "unique-id", Attributes::UniqueID::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),                  //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),              //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<ReadEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                        //
+        make_unique<ReadEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                      //
+        make_unique<ReadEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                             //
+        make_unique<ReadEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                    //
+        make_unique<SubscribeEvent>(Id, "start-up", Events::StartUp::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeEvent>(Id, "shut-down", Events::ShutDown::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeEvent>(Id, "leave", Events::Leave::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeEvent>(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Switch;
+
+    const char * clusterName = "Switch";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "multi-press-max", Attributes::MultiPressMax::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),                 //
+        make_unique<ReadEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),                   //
+        make_unique<ReadEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                         //
+        make_unique<ReadEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),                   //
+        make_unique<ReadEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                     //
+        make_unique<ReadEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),        //
+        make_unique<ReadEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<SubscribeEvent>(Id, "switch-latched", Events::SwitchLatched::Id, credsIssuerConfig),            //
+        make_unique<SubscribeEvent>(Id, "initial-press", Events::InitialPress::Id, credsIssuerConfig),              //
+        make_unique<SubscribeEvent>(Id, "long-press", Events::LongPress::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeEvent>(Id, "short-release", Events::ShortRelease::Id, credsIssuerConfig),              //
+        make_unique<SubscribeEvent>(Id, "long-release", Events::LongRelease::Id, credsIssuerConfig),                //
+        make_unique<SubscribeEvent>(Id, "multi-press-ongoing", Events::MultiPressOngoing::Id, credsIssuerConfig),   //
+        make_unique<SubscribeEvent>(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterAdministratorCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::AdministratorCommissioning;
+
+    const char * clusterName = "AdministratorCommissioning";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                     //
+        make_unique<AdministratorCommissioningOpenCommissioningWindow>(credsIssuerConfig),      //
+        make_unique<AdministratorCommissioningOpenBasicCommissioningWindow>(credsIssuerConfig), //
+        make_unique<AdministratorCommissioningRevokeCommissioning>(credsIssuerConfig),          //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "admin-vendor-id", Attributes::AdminVendorId::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),                //
@@ -22436,60 +20391,49 @@ void registerClusterWindowCovering(Commands & commands, CredentialIssuerCommands
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOperationalCredentials(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BarrierControl;
+    using namespace chip::app::Clusters::OperationalCredentials;
 
-    const char * clusterName = "BarrierControl";
+    const char * clusterName = "OperationalCredentials";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                      //
-        make_unique<BarrierControlBarrierControlGoToPercent>(credsIssuerConfig), //
-        make_unique<BarrierControlBarrierControlStop>(credsIssuerConfig),        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                              //
+        make_unique<OperationalCredentialsAttestationRequest>(credsIssuerConfig),        //
+        make_unique<OperationalCredentialsCertificateChainRequest>(credsIssuerConfig),   //
+        make_unique<OperationalCredentialsCSRRequest>(credsIssuerConfig),                //
+        make_unique<OperationalCredentialsAddNOC>(credsIssuerConfig),                    //
+        make_unique<OperationalCredentialsUpdateNOC>(credsIssuerConfig),                 //
+        make_unique<OperationalCredentialsUpdateFabricLabel>(credsIssuerConfig),         //
+        make_unique<OperationalCredentialsRemoveFabric>(credsIssuerConfig),              //
+        make_unique<OperationalCredentialsAddTrustedRootCertificate>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<ReadAttribute>(Id, "barrier-moving-state", Attributes::BarrierMovingState::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "barrier-safety-status", Attributes::BarrierSafetyStatus::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "barrier-capabilities", Attributes::BarrierCapabilities::Id, credsIssuerConfig),  //
-        make_unique<ReadAttribute>(Id, "barrier-open-events", Attributes::BarrierOpenEvents::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "barrier-close-events", Attributes::BarrierCloseEvents::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "barrier-command-open-events", Attributes::BarrierCommandOpenEvents::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "barrier-command-close-events", Attributes::BarrierCommandCloseEvents::Id,
-                                   credsIssuerConfig),                                                                        //
-        make_unique<ReadAttribute>(Id, "barrier-open-period", Attributes::BarrierOpenPeriod::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "barrier-close-period", Attributes::BarrierClosePeriod::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "barrier-position", Attributes::BarrierPosition::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),                   //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<WriteBarrierControlBarrierOpenEvents>(credsIssuerConfig),                                                 //
-        make_unique<WriteBarrierControlBarrierCloseEvents>(credsIssuerConfig),                                                //
-        make_unique<WriteBarrierControlBarrierCommandOpenEvents>(credsIssuerConfig),                                          //
-        make_unique<WriteBarrierControlBarrierCommandCloseEvents>(credsIssuerConfig),                                         //
-        make_unique<WriteBarrierControlBarrierOpenPeriod>(credsIssuerConfig),                                                 //
-        make_unique<WriteBarrierControlBarrierClosePeriod>(credsIssuerConfig),                                                //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<SubscribeAttribute>(Id, "barrier-moving-state", Attributes::BarrierMovingState::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "barrier-safety-status", Attributes::BarrierSafetyStatus::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "barrier-capabilities", Attributes::BarrierCapabilities::Id, credsIssuerConfig),  //
-        make_unique<SubscribeAttribute>(Id, "barrier-open-events", Attributes::BarrierOpenEvents::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "barrier-close-events", Attributes::BarrierCloseEvents::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "barrier-command-open-events", Attributes::BarrierCommandOpenEvents::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "barrier-command-close-events", Attributes::BarrierCommandCloseEvents::Id,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                         //
+        make_unique<ReadAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::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),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig),                                    //
+        make_unique<SubscribeAttribute>(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id,
                                         credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "barrier-open-period", Attributes::BarrierOpenPeriod::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "barrier-close-period", Attributes::BarrierClosePeriod::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "barrier-position", Attributes::BarrierPosition::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "current-fabric-index", Attributes::CurrentFabricIndex::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),                //
@@ -22504,80 +20448,42 @@ void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PumpConfigurationAndControl;
+    using namespace chip::app::Clusters::GroupKeyManagement;
 
-    const char * clusterName = "PumpConfigurationAndControl";
+    const char * clusterName = "GroupKeyManagement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                     //
+        make_unique<GroupKeyManagementKeySetWrite>(credsIssuerConfig),          //
+        make_unique<GroupKeyManagementKeySetRead>(credsIssuerConfig),           //
+        make_unique<GroupKeyManagementKeySetRemove>(credsIssuerConfig),         //
+        make_unique<GroupKeyManagementKeySetReadAllIndices>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "max-pressure", Attributes::MaxPressure::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "max-speed", Attributes::MaxSpeed::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "max-flow", Attributes::MaxFlow::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "min-const-pressure", Attributes::MinConstPressure::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "max-const-pressure", Attributes::MaxConstPressure::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "min-comp-pressure", Attributes::MinCompPressure::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "max-comp-pressure", Attributes::MaxCompPressure::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "min-const-speed", Attributes::MinConstSpeed::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "max-const-speed", Attributes::MaxConstSpeed::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "min-const-flow", Attributes::MinConstFlow::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "max-const-flow", Attributes::MaxConstFlow::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-const-temp", Attributes::MinConstTemp::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "max-const-temp", Attributes::MaxConstTemp::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "pump-status", Attributes::PumpStatus::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "effective-operation-mode", Attributes::EffectiveOperationMode::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "effective-control-mode", Attributes::EffectiveControlMode::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "capacity", Attributes::Capacity::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "speed", Attributes::Speed::Id, credsIssuerConfig),                                     //
-        make_unique<ReadAttribute>(Id, "lifetime-running-hours", Attributes::LifetimeRunningHours::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "power", Attributes::Power::Id, credsIssuerConfig),                                     //
-        make_unique<ReadAttribute>(Id, "lifetime-energy-consumed", Attributes::LifetimeEnergyConsumed::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "operation-mode", Attributes::OperationMode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "control-mode", Attributes::ControlMode::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                       //
+        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, "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),                    //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                    //
-        make_unique<WritePumpConfigurationAndControlLifetimeRunningHours>(credsIssuerConfig),                                  //
-        make_unique<WritePumpConfigurationAndControlLifetimeEnergyConsumed>(credsIssuerConfig),                                //
-        make_unique<WritePumpConfigurationAndControlOperationMode>(credsIssuerConfig),                                         //
-        make_unique<WritePumpConfigurationAndControlControlMode>(credsIssuerConfig),                                           //
+        make_unique<WriteGroupKeyManagementGroupKeyMap>(credsIssuerConfig),                                                    //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "max-pressure", Attributes::MaxPressure::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "max-speed", Attributes::MaxSpeed::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "max-flow", Attributes::MaxFlow::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "min-const-pressure", Attributes::MinConstPressure::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "max-const-pressure", Attributes::MaxConstPressure::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "min-comp-pressure", Attributes::MinCompPressure::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "max-comp-pressure", Attributes::MaxCompPressure::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "min-const-speed", Attributes::MinConstSpeed::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "max-const-speed", Attributes::MaxConstSpeed::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "min-const-flow", Attributes::MinConstFlow::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "max-const-flow", Attributes::MaxConstFlow::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-const-temp", Attributes::MinConstTemp::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "max-const-temp", Attributes::MaxConstTemp::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "pump-status", Attributes::PumpStatus::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "effective-operation-mode", Attributes::EffectiveOperationMode::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "effective-control-mode", Attributes::EffectiveControlMode::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "capacity", Attributes::Capacity::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "speed", Attributes::Speed::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, "lifetime-running-hours", Attributes::LifetimeRunningHours::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "power", Attributes::Power::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeAttribute>(Id, "lifetime-energy-consumed", Attributes::LifetimeEnergyConsumed::Id,
+        make_unique<SubscribeAttribute>(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig),                     //
+        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, "operation-mode", Attributes::OperationMode::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "control-mode", Attributes::ControlMode::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),                //
@@ -22586,233 +20492,111 @@ void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialI
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                            //
-        make_unique<ReadEvent>(Id, "supply-voltage-low", Events::SupplyVoltageLow::Id, credsIssuerConfig),                        //
-        make_unique<ReadEvent>(Id, "supply-voltage-high", Events::SupplyVoltageHigh::Id, credsIssuerConfig),                      //
-        make_unique<ReadEvent>(Id, "power-missing-phase", Events::PowerMissingPhase::Id, credsIssuerConfig),                      //
-        make_unique<ReadEvent>(Id, "system-pressure-low", Events::SystemPressureLow::Id, credsIssuerConfig),                      //
-        make_unique<ReadEvent>(Id, "system-pressure-high", Events::SystemPressureHigh::Id, credsIssuerConfig),                    //
-        make_unique<ReadEvent>(Id, "dry-running", Events::DryRunning::Id, credsIssuerConfig),                                     //
-        make_unique<ReadEvent>(Id, "motor-temperature-high", Events::MotorTemperatureHigh::Id, credsIssuerConfig),                //
-        make_unique<ReadEvent>(Id, "pump-motor-fatal-failure", Events::PumpMotorFatalFailure::Id, credsIssuerConfig),             //
-        make_unique<ReadEvent>(Id, "electronic-temperature-high", Events::ElectronicTemperatureHigh::Id, credsIssuerConfig),      //
-        make_unique<ReadEvent>(Id, "pump-blocked", Events::PumpBlocked::Id, credsIssuerConfig),                                   //
-        make_unique<ReadEvent>(Id, "sensor-failure", Events::SensorFailure::Id, credsIssuerConfig),                               //
-        make_unique<ReadEvent>(Id, "electronic-non-fatal-failure", Events::ElectronicNonFatalFailure::Id, credsIssuerConfig),     //
-        make_unique<ReadEvent>(Id, "electronic-fatal-failure", Events::ElectronicFatalFailure::Id, credsIssuerConfig),            //
-        make_unique<ReadEvent>(Id, "general-fault", Events::GeneralFault::Id, credsIssuerConfig),                                 //
-        make_unique<ReadEvent>(Id, "leakage", Events::Leakage::Id, credsIssuerConfig),                                            //
-        make_unique<ReadEvent>(Id, "air-detection", Events::AirDetection::Id, credsIssuerConfig),                                 //
-        make_unique<ReadEvent>(Id, "turbine-operation", Events::TurbineOperation::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                       //
-        make_unique<SubscribeEvent>(Id, "supply-voltage-low", Events::SupplyVoltageLow::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeEvent>(Id, "supply-voltage-high", Events::SupplyVoltageHigh::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeEvent>(Id, "power-missing-phase", Events::PowerMissingPhase::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeEvent>(Id, "system-pressure-low", Events::SystemPressureLow::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeEvent>(Id, "system-pressure-high", Events::SystemPressureHigh::Id, credsIssuerConfig),               //
-        make_unique<SubscribeEvent>(Id, "dry-running", Events::DryRunning::Id, credsIssuerConfig),                                //
-        make_unique<SubscribeEvent>(Id, "motor-temperature-high", Events::MotorTemperatureHigh::Id, credsIssuerConfig),           //
-        make_unique<SubscribeEvent>(Id, "pump-motor-fatal-failure", Events::PumpMotorFatalFailure::Id, credsIssuerConfig),        //
-        make_unique<SubscribeEvent>(Id, "electronic-temperature-high", Events::ElectronicTemperatureHigh::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "pump-blocked", Events::PumpBlocked::Id, credsIssuerConfig),                              //
-        make_unique<SubscribeEvent>(Id, "sensor-failure", Events::SensorFailure::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeEvent>(Id, "electronic-non-fatal-failure", Events::ElectronicNonFatalFailure::Id,
-                                    credsIssuerConfig),                                                                     //
-        make_unique<SubscribeEvent>(Id, "electronic-fatal-failure", Events::ElectronicFatalFailure::Id, credsIssuerConfig), //
-        make_unique<SubscribeEvent>(Id, "general-fault", Events::GeneralFault::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeEvent>(Id, "leakage", Events::Leakage::Id, credsIssuerConfig),                                 //
-        make_unique<SubscribeEvent>(Id, "air-detection", Events::AirDetection::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeEvent>(Id, "turbine-operation", Events::TurbineOperation::Id, credsIssuerConfig),              //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::FixedLabel;
+
+    const char * clusterName = "FixedLabel";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::UserLabel;
+
+    const char * clusterName = "UserLabel";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "label-list", Attributes::LabelList::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteUserLabelLabelList>(credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "label-list", Attributes::LabelList::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Thermostat;
+    using namespace chip::app::Clusters::ProxyConfiguration;
 
-    const char * clusterName = "Thermostat";
+    const char * clusterName = "ProxyConfiguration";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),            //
-        make_unique<ThermostatSetpointRaiseLower>(credsIssuerConfig),  //
-        make_unique<ThermostatSetWeeklySchedule>(credsIssuerConfig),   //
-        make_unique<ThermostatGetWeeklySchedule>(credsIssuerConfig),   //
-        make_unique<ThermostatClearWeeklySchedule>(credsIssuerConfig), //
-        make_unique<ThermostatGetRelayStatusLog>(credsIssuerConfig),   //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<ReadAttribute>(Id, "local-temperature", Attributes::LocalTemperature::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "outdoor-temperature", Attributes::OutdoorTemperature::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "abs-min-heat-setpoint-limit", Attributes::AbsMinHeatSetpointLimit::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "abs-max-heat-setpoint-limit", Attributes::AbsMaxHeatSetpointLimit::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "abs-min-cool-setpoint-limit", Attributes::AbsMinCoolSetpointLimit::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "abs-max-cool-setpoint-limit", Attributes::AbsMaxCoolSetpointLimit::Id,
-                                   credsIssuerConfig),                                                          //
-        make_unique<ReadAttribute>(Id, "picooling-demand", Attributes::PICoolingDemand::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "piheating-demand", Attributes::PIHeatingDemand::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "hvacsystem-type-configuration", Attributes::HVACSystemTypeConfiguration::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "local-temperature-calibration", Attributes::LocalTemperatureCalibration::Id,
-                                   credsIssuerConfig),                                                                           //
-        make_unique<ReadAttribute>(Id, "occupied-cooling-setpoint", Attributes::OccupiedCoolingSetpoint::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "occupied-heating-setpoint", Attributes::OccupiedHeatingSetpoint::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "unoccupied-cooling-setpoint", Attributes::UnoccupiedCoolingSetpoint::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "unoccupied-heating-setpoint", Attributes::UnoccupiedHeatingSetpoint::Id,
-                                   credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "min-heat-setpoint-limit", Attributes::MinHeatSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "max-heat-setpoint-limit", Attributes::MaxHeatSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "min-cool-setpoint-limit", Attributes::MinCoolSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "max-cool-setpoint-limit", Attributes::MaxCoolSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "min-setpoint-dead-band", Attributes::MinSetpointDeadBand::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "remote-sensing", Attributes::RemoteSensing::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "control-sequence-of-operation", Attributes::ControlSequenceOfOperation::Id,
-                                   credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "system-mode", Attributes::SystemMode::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "alarm-mask", Attributes::AlarmMask::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "thermostat-running-mode", Attributes::ThermostatRunningMode::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "start-of-week", Attributes::StartOfWeek::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "number-of-weekly-transitions", Attributes::NumberOfWeeklyTransitions::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "number-of-daily-transitions", Attributes::NumberOfDailyTransitions::Id,
-                                   credsIssuerConfig),                                                                           //
-        make_unique<ReadAttribute>(Id, "temperature-setpoint-hold", Attributes::TemperatureSetpointHold::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "temperature-setpoint-hold-duration", Attributes::TemperatureSetpointHoldDuration::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "thermostat-programming-operation-mode", Attributes::ThermostatProgrammingOperationMode::Id,
-                                   credsIssuerConfig),                                                                         //
-        make_unique<ReadAttribute>(Id, "thermostat-running-state", Attributes::ThermostatRunningState::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "setpoint-change-source", Attributes::SetpointChangeSource::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "setpoint-change-amount", Attributes::SetpointChangeAmount::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "setpoint-change-source-timestamp", Attributes::SetpointChangeSourceTimestamp::Id,
-                                   credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "occupied-setback", Attributes::OccupiedSetback::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "occupied-setback-min", Attributes::OccupiedSetbackMin::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "occupied-setback-max", Attributes::OccupiedSetbackMax::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "unoccupied-setback", Attributes::UnoccupiedSetback::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "unoccupied-setback-min", Attributes::UnoccupiedSetbackMin::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "unoccupied-setback-max", Attributes::UnoccupiedSetbackMax::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "emergency-heat-delta", Attributes::EmergencyHeatDelta::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "actype", Attributes::ACType::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "accapacity", Attributes::ACCapacity::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "acrefrigerant-type", Attributes::ACRefrigerantType::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "accompressor-type", Attributes::ACCompressorType::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "acerror-code", Attributes::ACErrorCode::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "aclouver-position", Attributes::ACLouverPosition::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "accoil-temperature", Attributes::ACCoilTemperature::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "accapacityformat", Attributes::ACCapacityformat::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteThermostatHVACSystemTypeConfiguration>(credsIssuerConfig),                                        //
-        make_unique<WriteThermostatLocalTemperatureCalibration>(credsIssuerConfig),                                        //
-        make_unique<WriteThermostatOccupiedCoolingSetpoint>(credsIssuerConfig),                                            //
-        make_unique<WriteThermostatOccupiedHeatingSetpoint>(credsIssuerConfig),                                            //
-        make_unique<WriteThermostatUnoccupiedCoolingSetpoint>(credsIssuerConfig),                                          //
-        make_unique<WriteThermostatUnoccupiedHeatingSetpoint>(credsIssuerConfig),                                          //
-        make_unique<WriteThermostatMinHeatSetpointLimit>(credsIssuerConfig),                                               //
-        make_unique<WriteThermostatMaxHeatSetpointLimit>(credsIssuerConfig),                                               //
-        make_unique<WriteThermostatMinCoolSetpointLimit>(credsIssuerConfig),                                               //
-        make_unique<WriteThermostatMaxCoolSetpointLimit>(credsIssuerConfig),                                               //
-        make_unique<WriteThermostatMinSetpointDeadBand>(credsIssuerConfig),                                                //
-        make_unique<WriteThermostatRemoteSensing>(credsIssuerConfig),                                                      //
-        make_unique<WriteThermostatControlSequenceOfOperation>(credsIssuerConfig),                                         //
-        make_unique<WriteThermostatSystemMode>(credsIssuerConfig),                                                         //
-        make_unique<WriteThermostatTemperatureSetpointHold>(credsIssuerConfig),                                            //
-        make_unique<WriteThermostatTemperatureSetpointHoldDuration>(credsIssuerConfig),                                    //
-        make_unique<WriteThermostatThermostatProgrammingOperationMode>(credsIssuerConfig),                                 //
-        make_unique<WriteThermostatOccupiedSetback>(credsIssuerConfig),                                                    //
-        make_unique<WriteThermostatUnoccupiedSetback>(credsIssuerConfig),                                                  //
-        make_unique<WriteThermostatEmergencyHeatDelta>(credsIssuerConfig),                                                 //
-        make_unique<WriteThermostatACType>(credsIssuerConfig),                                                             //
-        make_unique<WriteThermostatACCapacity>(credsIssuerConfig),                                                         //
-        make_unique<WriteThermostatACRefrigerantType>(credsIssuerConfig),                                                  //
-        make_unique<WriteThermostatACCompressorType>(credsIssuerConfig),                                                   //
-        make_unique<WriteThermostatACErrorCode>(credsIssuerConfig),                                                        //
-        make_unique<WriteThermostatACLouverPosition>(credsIssuerConfig),                                                   //
-        make_unique<WriteThermostatACCapacityformat>(credsIssuerConfig),                                                   //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "local-temperature", Attributes::LocalTemperature::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "outdoor-temperature", Attributes::OutdoorTemperature::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "abs-min-heat-setpoint-limit", Attributes::AbsMinHeatSetpointLimit::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "abs-max-heat-setpoint-limit", Attributes::AbsMaxHeatSetpointLimit::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "abs-min-cool-setpoint-limit", Attributes::AbsMinCoolSetpointLimit::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "abs-max-cool-setpoint-limit", Attributes::AbsMaxCoolSetpointLimit::Id,
-                                        credsIssuerConfig),                                                          //
-        make_unique<SubscribeAttribute>(Id, "picooling-demand", Attributes::PICoolingDemand::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "piheating-demand", Attributes::PIHeatingDemand::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "hvacsystem-type-configuration", Attributes::HVACSystemTypeConfiguration::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "local-temperature-calibration", Attributes::LocalTemperatureCalibration::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "occupied-cooling-setpoint", Attributes::OccupiedCoolingSetpoint::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "occupied-heating-setpoint", Attributes::OccupiedHeatingSetpoint::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "unoccupied-cooling-setpoint", Attributes::UnoccupiedCoolingSetpoint::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "unoccupied-heating-setpoint", Attributes::UnoccupiedHeatingSetpoint::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "min-heat-setpoint-limit", Attributes::MinHeatSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "max-heat-setpoint-limit", Attributes::MaxHeatSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "min-cool-setpoint-limit", Attributes::MinCoolSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "max-cool-setpoint-limit", Attributes::MaxCoolSetpointLimit::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "min-setpoint-dead-band", Attributes::MinSetpointDeadBand::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "remote-sensing", Attributes::RemoteSensing::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "control-sequence-of-operation", Attributes::ControlSequenceOfOperation::Id,
-                                        credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, "system-mode", Attributes::SystemMode::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "alarm-mask", Attributes::AlarmMask::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "thermostat-running-mode", Attributes::ThermostatRunningMode::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "start-of-week", Attributes::StartOfWeek::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "number-of-weekly-transitions", Attributes::NumberOfWeeklyTransitions::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "number-of-daily-transitions", Attributes::NumberOfDailyTransitions::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "temperature-setpoint-hold", Attributes::TemperatureSetpointHold::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "temperature-setpoint-hold-duration", Attributes::TemperatureSetpointHoldDuration::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "thermostat-programming-operation-mode",
-                                        Attributes::ThermostatProgrammingOperationMode::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "thermostat-running-state", Attributes::ThermostatRunningState::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "setpoint-change-source", Attributes::SetpointChangeSource::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "setpoint-change-amount", Attributes::SetpointChangeAmount::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "setpoint-change-source-timestamp", Attributes::SetpointChangeSourceTimestamp::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "occupied-setback", Attributes::OccupiedSetback::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "occupied-setback-min", Attributes::OccupiedSetbackMin::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "occupied-setback-max", Attributes::OccupiedSetbackMax::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "unoccupied-setback", Attributes::UnoccupiedSetback::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "unoccupied-setback-min", Attributes::UnoccupiedSetbackMin::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "unoccupied-setback-max", Attributes::UnoccupiedSetbackMax::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "emergency-heat-delta", Attributes::EmergencyHeatDelta::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "actype", Attributes::ACType::Id, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, "accapacity", Attributes::ACCapacity::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "acrefrigerant-type", Attributes::ACRefrigerantType::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "accompressor-type", Attributes::ACCompressorType::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "acerror-code", Attributes::ACErrorCode::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "aclouver-position", Attributes::ACLouverPosition::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "accoil-temperature", Attributes::ACCoilTemperature::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "accapacityformat", Attributes::ACCapacityformat::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(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),                //
@@ -22827,11 +20611,11 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::FanControl;
+    using namespace chip::app::Clusters::ProxyDiscovery;
 
-    const char * clusterName = "FanControl";
+    const char * clusterName = "ProxyDiscovery";
 
     commands_list clusterCommands = {
         //
@@ -22842,41 +20626,13 @@ void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * c
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "fan-mode", Attributes::FanMode::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "fan-mode-sequence", Attributes::FanModeSequence::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "percent-setting", Attributes::PercentSetting::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "percent-current", Attributes::PercentCurrent::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "speed-max", Attributes::SpeedMax::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "speed-setting", Attributes::SpeedSetting::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "speed-current", Attributes::SpeedCurrent::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "rock-support", Attributes::RockSupport::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "rock-setting", Attributes::RockSetting::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "wind-support", Attributes::WindSupport::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "wind-setting", Attributes::WindSetting::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteFanControlFanMode>(credsIssuerConfig),                                                                 //
-        make_unique<WriteFanControlFanModeSequence>(credsIssuerConfig),                                                         //
-        make_unique<WriteFanControlPercentSetting>(credsIssuerConfig),                                                          //
-        make_unique<WriteFanControlSpeedSetting>(credsIssuerConfig),                                                            //
-        make_unique<WriteFanControlRockSetting>(credsIssuerConfig),                                                             //
-        make_unique<WriteFanControlWindSetting>(credsIssuerConfig),                                                             //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "fan-mode", Attributes::FanMode::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "fan-mode-sequence", Attributes::FanModeSequence::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "percent-setting", Attributes::PercentSetting::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "percent-current", Attributes::PercentCurrent::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "speed-max", Attributes::SpeedMax::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "speed-setting", Attributes::SpeedSetting::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "speed-current", Attributes::SpeedCurrent::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "rock-support", Attributes::RockSupport::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "rock-setting", Attributes::RockSetting::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "wind-support", Attributes::WindSupport::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "wind-setting", Attributes::WindSetting::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),                //
@@ -22891,11 +20647,11 @@ void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * c
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterDehumidificationControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DehumidificationControl;
+    using namespace chip::app::Clusters::ProxyValid;
 
-    const char * clusterName = "DehumidificationControl";
+    const char * clusterName = "ProxyValid";
 
     commands_list clusterCommands = {
         //
@@ -22906,43 +20662,13 @@ void registerClusterDehumidificationControl(Commands & commands, CredentialIssue
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "relative-humidity", Attributes::RelativeHumidity::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "dehumidification-cooling", Attributes::DehumidificationCooling::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "rh-dehumidification-setpoint", Attributes::RhDehumidificationSetpoint::Id,
-                                   credsIssuerConfig),                                                                          //
-        make_unique<ReadAttribute>(Id, "relative-humidity-mode", Attributes::RelativeHumidityMode::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "dehumidification-lockout", Attributes::DehumidificationLockout::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "dehumidification-hysteresis", Attributes::DehumidificationHysteresis::Id,
-                                   credsIssuerConfig),                                                                           //
-        make_unique<ReadAttribute>(Id, "dehumidification-max-cool", Attributes::DehumidificationMaxCool::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "relative-humidity-display", Attributes::RelativeHumidityDisplay::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),                      //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<WriteDehumidificationControlRhDehumidificationSetpoint>(credsIssuerConfig),                                  //
-        make_unique<WriteDehumidificationControlRelativeHumidityMode>(credsIssuerConfig),                                        //
-        make_unique<WriteDehumidificationControlDehumidificationLockout>(credsIssuerConfig),                                     //
-        make_unique<WriteDehumidificationControlDehumidificationHysteresis>(credsIssuerConfig),                                  //
-        make_unique<WriteDehumidificationControlDehumidificationMaxCool>(credsIssuerConfig),                                     //
-        make_unique<WriteDehumidificationControlRelativeHumidityDisplay>(credsIssuerConfig),                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, "relative-humidity", Attributes::RelativeHumidity::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "dehumidification-cooling", Attributes::DehumidificationCooling::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rh-dehumidification-setpoint", Attributes::RhDehumidificationSetpoint::Id,
-                                        credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, "relative-humidity-mode", Attributes::RelativeHumidityMode::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "dehumidification-lockout", Attributes::DehumidificationLockout::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "dehumidification-hysteresis", Attributes::DehumidificationHysteresis::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "dehumidification-max-cool", Attributes::DehumidificationMaxCool::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "relative-humidity-display", Attributes::RelativeHumidityDisplay::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(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),                //
@@ -22957,11 +20683,11 @@ void registerClusterDehumidificationControl(Commands & commands, CredentialIssue
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ThermostatUserInterfaceConfiguration;
+    using namespace chip::app::Clusters::BooleanState;
 
-    const char * clusterName = "ThermostatUserInterfaceConfiguration";
+    const char * clusterName = "BooleanState";
 
     commands_list clusterCommands = {
         //
@@ -22971,26 +20697,16 @@ void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, Cr
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadAttribute>(Id, "temperature-display-mode", Attributes::TemperatureDisplayMode::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "keypad-lockout", Attributes::KeypadLockout::Id, credsIssuerConfig),                    //
-        make_unique<ReadAttribute>(Id, "schedule-programming-visibility", Attributes::ScheduleProgrammingVisibility::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode>(credsIssuerConfig),                   //
-        make_unique<WriteThermostatUserInterfaceConfigurationKeypadLockout>(credsIssuerConfig),                            //
-        make_unique<WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "temperature-display-mode", Attributes::TemperatureDisplayMode::Id,
-                                        credsIssuerConfig),                                                      //
-        make_unique<SubscribeAttribute>(Id, "keypad-lockout", Attributes::KeypadLockout::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "schedule-programming-visibility", Attributes::ScheduleProgrammingVisibility::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "state-value", Attributes::StateValue::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "state-value", Attributes::StateValue::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),                //
@@ -22999,182 +20715,51 @@ void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, Cr
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                               //
+        make_unique<ReadEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                          //
+        make_unique<SubscribeEvent>(Id, "state-change", Events::StateChange::Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ColorControl;
+    using namespace chip::app::Clusters::ModeSelect;
 
-    const char * clusterName = "ColorControl";
+    const char * clusterName = "ModeSelect";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                         //
-        make_unique<ColorControlMoveToHue>(credsIssuerConfig),                      //
-        make_unique<ColorControlMoveHue>(credsIssuerConfig),                        //
-        make_unique<ColorControlStepHue>(credsIssuerConfig),                        //
-        make_unique<ColorControlMoveToSaturation>(credsIssuerConfig),               //
-        make_unique<ColorControlMoveSaturation>(credsIssuerConfig),                 //
-        make_unique<ColorControlStepSaturation>(credsIssuerConfig),                 //
-        make_unique<ColorControlMoveToHueAndSaturation>(credsIssuerConfig),         //
-        make_unique<ColorControlMoveToColor>(credsIssuerConfig),                    //
-        make_unique<ColorControlMoveColor>(credsIssuerConfig),                      //
-        make_unique<ColorControlStepColor>(credsIssuerConfig),                      //
-        make_unique<ColorControlMoveToColorTemperature>(credsIssuerConfig),         //
-        make_unique<ColorControlEnhancedMoveToHue>(credsIssuerConfig),              //
-        make_unique<ColorControlEnhancedMoveHue>(credsIssuerConfig),                //
-        make_unique<ColorControlEnhancedStepHue>(credsIssuerConfig),                //
-        make_unique<ColorControlEnhancedMoveToHueAndSaturation>(credsIssuerConfig), //
-        make_unique<ColorControlColorLoopSet>(credsIssuerConfig),                   //
-        make_unique<ColorControlStopMoveStep>(credsIssuerConfig),                   //
-        make_unique<ColorControlMoveColorTemperature>(credsIssuerConfig),           //
-        make_unique<ColorControlStepColorTemperature>(credsIssuerConfig),           //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),     //
+        make_unique<ModeSelectChangeToMode>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<ReadAttribute>(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "color-temperature", Attributes::ColorTemperature::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "primary1x", Attributes::Primary1X::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary1y", Attributes::Primary1Y::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary1intensity", Attributes::Primary1Intensity::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "primary2x", Attributes::Primary2X::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary2y", Attributes::Primary2Y::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary2intensity", Attributes::Primary2Intensity::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "primary3x", Attributes::Primary3X::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary3y", Attributes::Primary3Y::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary3intensity", Attributes::Primary3Intensity::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "primary4x", Attributes::Primary4X::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary4y", Attributes::Primary4Y::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary4intensity", Attributes::Primary4Intensity::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "primary5x", Attributes::Primary5X::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary5y", Attributes::Primary5Y::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary5intensity", Attributes::Primary5Intensity::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "primary6x", Attributes::Primary6X::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary6y", Attributes::Primary6Y::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "primary6intensity", Attributes::Primary6Intensity::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "white-point-x", Attributes::WhitePointX::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "white-point-y", Attributes::WhitePointY::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "color-point-rx", Attributes::ColorPointRX::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "color-point-ry", Attributes::ColorPointRY::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "color-point-rintensity", Attributes::ColorPointRIntensity::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "color-point-gx", Attributes::ColorPointGX::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "color-point-gy", Attributes::ColorPointGY::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "color-point-gintensity", Attributes::ColorPointGIntensity::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "color-point-bx", Attributes::ColorPointBX::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "color-point-by", Attributes::ColorPointBY::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "color-point-bintensity", Attributes::ColorPointBIntensity::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "enhanced-current-hue", Attributes::EnhancedCurrentHue::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "enhanced-color-mode", Attributes::EnhancedColorMode::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "color-loop-active", Attributes::ColorLoopActive::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "color-loop-direction", Attributes::ColorLoopDirection::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "color-loop-time", Attributes::ColorLoopTime::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "color-loop-start-enhanced-hue", Attributes::ColorLoopStartEnhancedHue::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "color-loop-stored-enhanced-hue", Attributes::ColorLoopStoredEnhancedHue::Id,
-                                   credsIssuerConfig),                                                              //
-        make_unique<ReadAttribute>(Id, "color-capabilities", Attributes::ColorCapabilities::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "color-temp-physical-min-mireds", Attributes::ColorTempPhysicalMinMireds::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "color-temp-physical-max-mireds", Attributes::ColorTempPhysicalMaxMireds::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "couple-color-temp-to-level-min-mireds", Attributes::CoupleColorTempToLevelMinMireds::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "start-up-color-temperature-mireds", Attributes::StartUpColorTemperatureMireds::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteColorControlOptions>(credsIssuerConfig),                                                               //
-        make_unique<WriteColorControlWhitePointX>(credsIssuerConfig),                                                           //
-        make_unique<WriteColorControlWhitePointY>(credsIssuerConfig),                                                           //
-        make_unique<WriteColorControlColorPointRX>(credsIssuerConfig),                                                          //
-        make_unique<WriteColorControlColorPointRY>(credsIssuerConfig),                                                          //
-        make_unique<WriteColorControlColorPointRIntensity>(credsIssuerConfig),                                                  //
-        make_unique<WriteColorControlColorPointGX>(credsIssuerConfig),                                                          //
-        make_unique<WriteColorControlColorPointGY>(credsIssuerConfig),                                                          //
-        make_unique<WriteColorControlColorPointGIntensity>(credsIssuerConfig),                                                  //
-        make_unique<WriteColorControlColorPointBX>(credsIssuerConfig),                                                          //
-        make_unique<WriteColorControlColorPointBY>(credsIssuerConfig),                                                          //
-        make_unique<WriteColorControlColorPointBIntensity>(credsIssuerConfig),                                                  //
-        make_unique<WriteColorControlStartUpColorTemperatureMireds>(credsIssuerConfig),                                         //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "color-temperature", Attributes::ColorTemperature::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
-        make_unique<SubscribeAttribute>(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "primary1x", Attributes::Primary1X::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary1y", Attributes::Primary1Y::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary1intensity", Attributes::Primary1Intensity::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "primary2x", Attributes::Primary2X::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary2y", Attributes::Primary2Y::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary2intensity", Attributes::Primary2Intensity::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "primary3x", Attributes::Primary3X::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary3y", Attributes::Primary3Y::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary3intensity", Attributes::Primary3Intensity::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "primary4x", Attributes::Primary4X::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary4y", Attributes::Primary4Y::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary4intensity", Attributes::Primary4Intensity::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "primary5x", Attributes::Primary5X::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary5y", Attributes::Primary5Y::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary5intensity", Attributes::Primary5Intensity::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "primary6x", Attributes::Primary6X::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary6y", Attributes::Primary6Y::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "primary6intensity", Attributes::Primary6Intensity::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "white-point-x", Attributes::WhitePointX::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "white-point-y", Attributes::WhitePointY::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "color-point-rx", Attributes::ColorPointRX::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "color-point-ry", Attributes::ColorPointRY::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "color-point-rintensity", Attributes::ColorPointRIntensity::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "color-point-gx", Attributes::ColorPointGX::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "color-point-gy", Attributes::ColorPointGY::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "color-point-gintensity", Attributes::ColorPointGIntensity::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "color-point-bx", Attributes::ColorPointBX::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "color-point-by", Attributes::ColorPointBY::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "color-point-bintensity", Attributes::ColorPointBIntensity::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "enhanced-current-hue", Attributes::EnhancedCurrentHue::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "enhanced-color-mode", Attributes::EnhancedColorMode::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "color-loop-active", Attributes::ColorLoopActive::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "color-loop-direction", Attributes::ColorLoopDirection::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "color-loop-time", Attributes::ColorLoopTime::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "color-loop-start-enhanced-hue", Attributes::ColorLoopStartEnhancedHue::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "color-loop-stored-enhanced-hue", Attributes::ColorLoopStoredEnhancedHue::Id,
-                                        credsIssuerConfig),                                                              //
-        make_unique<SubscribeAttribute>(Id, "color-capabilities", Attributes::ColorCapabilities::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "color-temp-physical-min-mireds", Attributes::ColorTempPhysicalMinMireds::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "color-temp-physical-max-mireds", Attributes::ColorTempPhysicalMaxMireds::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "couple-color-temp-to-level-min-mireds",
-                                        Attributes::CoupleColorTempToLevelMinMireds::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "start-up-color-temperature-mireds", Attributes::StartUpColorTemperatureMireds::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "on-mode", Attributes::OnMode::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteModeSelectStartUpMode>(credsIssuerConfig),                                                             //
+        make_unique<WriteModeSelectOnMode>(credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "description", Attributes::Description::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "on-mode", Attributes::OnMode::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),                //
@@ -23189,11 +20774,11 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands *
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterShadeConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BallastConfiguration;
+    using namespace chip::app::Clusters::ShadeConfiguration;
 
-    const char * clusterName = "BallastConfiguration";
+    const char * clusterName = "ShadeConfiguration";
 
     commands_list clusterCommands = {
         //
@@ -23203,61 +20788,199 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "physical-min-level", Attributes::PhysicalMinLevel::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "physical-max-level", Attributes::PhysicalMaxLevel::Id, credsIssuerConfig),               //
-        make_unique<ReadAttribute>(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "power-on-level", Attributes::PowerOnLevel::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "power-on-fade-time", Attributes::PowerOnFadeTime::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "lamp-quality", Attributes::LampQuality::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "lamp-manufacturer", Attributes::LampManufacturer::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "lamp-rated-hours", Attributes::LampRatedHours::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "lamp-burn-hours", Attributes::LampBurnHours::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "lamp-alarm-mode", Attributes::LampAlarmMode::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "lamp-burn-hours-trip-point", Attributes::LampBurnHoursTripPoint::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),                      //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<WriteBallastConfigurationMinLevel>(credsIssuerConfig),                                                       //
-        make_unique<WriteBallastConfigurationMaxLevel>(credsIssuerConfig),                                                       //
-        make_unique<WriteBallastConfigurationPowerOnLevel>(credsIssuerConfig),                                                   //
-        make_unique<WriteBallastConfigurationPowerOnFadeTime>(credsIssuerConfig),                                                //
-        make_unique<WriteBallastConfigurationIntrinsicBallastFactor>(credsIssuerConfig),                                         //
-        make_unique<WriteBallastConfigurationBallastFactorAdjustment>(credsIssuerConfig),                                        //
-        make_unique<WriteBallastConfigurationLampType>(credsIssuerConfig),                                                       //
-        make_unique<WriteBallastConfigurationLampManufacturer>(credsIssuerConfig),                                               //
-        make_unique<WriteBallastConfigurationLampRatedHours>(credsIssuerConfig),                                                 //
-        make_unique<WriteBallastConfigurationLampBurnHours>(credsIssuerConfig),                                                  //
-        make_unique<WriteBallastConfigurationLampAlarmMode>(credsIssuerConfig),                                                  //
-        make_unique<WriteBallastConfigurationLampBurnHoursTripPoint>(credsIssuerConfig),                                         //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
-        make_unique<SubscribeAttribute>(Id, "physical-min-level", Attributes::PhysicalMinLevel::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "physical-max-level", Attributes::PhysicalMaxLevel::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "power-on-level", Attributes::PowerOnLevel::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "power-on-fade-time", Attributes::PowerOnFadeTime::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "physical-closed-limit", Attributes::PhysicalClosedLimit::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "motor-step-size", Attributes::MotorStepSize::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                                    //
+        make_unique<ReadAttribute>(Id, "closed-limit", Attributes::ClosedLimit::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "mode", Attributes::Mode::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteShadeConfigurationStatus>(credsIssuerConfig),                                                          //
+        make_unique<WriteShadeConfigurationClosedLimit>(credsIssuerConfig),                                                     //
+        make_unique<WriteShadeConfigurationMode>(credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "physical-closed-limit", Attributes::PhysicalClosedLimit::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "motor-step-size", Attributes::MotorStepSize::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, "closed-limit", Attributes::ClosedLimit::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "mode", Attributes::Mode::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::DoorLock;
+
+    const char * clusterName = "DoorLock";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
+        make_unique<DoorLockLockDoor>(credsIssuerConfig),             //
+        make_unique<DoorLockUnlockDoor>(credsIssuerConfig),           //
+        make_unique<DoorLockUnlockWithTimeout>(credsIssuerConfig),    //
+        make_unique<DoorLockSetWeekDaySchedule>(credsIssuerConfig),   //
+        make_unique<DoorLockGetWeekDaySchedule>(credsIssuerConfig),   //
+        make_unique<DoorLockClearWeekDaySchedule>(credsIssuerConfig), //
+        make_unique<DoorLockSetYearDaySchedule>(credsIssuerConfig),   //
+        make_unique<DoorLockGetYearDaySchedule>(credsIssuerConfig),   //
+        make_unique<DoorLockClearYearDaySchedule>(credsIssuerConfig), //
+        make_unique<DoorLockSetHolidaySchedule>(credsIssuerConfig),   //
+        make_unique<DoorLockGetHolidaySchedule>(credsIssuerConfig),   //
+        make_unique<DoorLockClearHolidaySchedule>(credsIssuerConfig), //
+        make_unique<DoorLockSetUser>(credsIssuerConfig),              //
+        make_unique<DoorLockGetUser>(credsIssuerConfig),              //
+        make_unique<DoorLockClearUser>(credsIssuerConfig),            //
+        make_unique<DoorLockSetCredential>(credsIssuerConfig),        //
+        make_unique<DoorLockGetCredentialStatus>(credsIssuerConfig),  //
+        make_unique<DoorLockClearCredential>(credsIssuerConfig),      //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                         //
+        make_unique<ReadAttribute>(Id, "lock-state", Attributes::LockState::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "lock-type", Attributes::LockType::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "actuator-enabled", Attributes::ActuatorEnabled::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "door-state", Attributes::DoorState::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "door-open-events", Attributes::DoorOpenEvents::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "door-closed-events", Attributes::DoorClosedEvents::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "open-period", Attributes::OpenPeriod::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "number-of-total-users-supported", Attributes::NumberOfTotalUsersSupported::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-pinusers-supported", Attributes::NumberOfPINUsersSupported::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-rfidusers-supported", Attributes::NumberOfRFIDUsersSupported::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-week-day-schedules-supported-per-user",
+                                   Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-year-day-schedules-supported-per-user",
+                                   Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-holiday-schedules-supported", Attributes::NumberOfHolidaySchedulesSupported::Id,
+                                   credsIssuerConfig),                                                                         //
+        make_unique<ReadAttribute>(Id, "max-pincode-length", Attributes::MaxPINCodeLength::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "min-pincode-length", Attributes::MinPINCodeLength::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "max-rfidcode-length", Attributes::MaxRFIDCodeLength::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "min-rfidcode-length", Attributes::MinRFIDCodeLength::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "credential-rules-support", Attributes::CredentialRulesSupport::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-credentials-supported-per-user",
+                                   Attributes::NumberOfCredentialsSupportedPerUser::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "language", Attributes::Language::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "ledsettings", Attributes::LEDSettings::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "auto-relock-time", Attributes::AutoRelockTime::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "sound-volume", Attributes::SoundVolume::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "operating-mode", Attributes::OperatingMode::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "supported-operating-modes", Attributes::SupportedOperatingModes::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "default-configuration-register", Attributes::DefaultConfigurationRegister::Id,
+                                   credsIssuerConfig),                                                                            //
+        make_unique<ReadAttribute>(Id, "enable-local-programming", Attributes::EnableLocalProgramming::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "enable-one-touch-locking", Attributes::EnableOneTouchLocking::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "enable-inside-status-led", Attributes::EnableInsideStatusLED::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "enable-privacy-mode-button", Attributes::EnablePrivacyModeButton::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "local-programming-features", Attributes::LocalProgrammingFeatures::Id,
+                                   credsIssuerConfig),                                                                    //
+        make_unique<ReadAttribute>(Id, "wrong-code-entry-limit", Attributes::WrongCodeEntryLimit::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "user-code-temporary-disable-time", Attributes::UserCodeTemporaryDisableTime::Id,
+                                   credsIssuerConfig),                                                                //
+        make_unique<ReadAttribute>(Id, "send-pinover-the-air", Attributes::SendPINOverTheAir::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "require-pinfor-remote-operation", Attributes::RequirePINforRemoteOperation::Id,
+                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "expiring-user-timeout", Attributes::ExpiringUserTimeout::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteDoorLockDoorOpenEvents>(credsIssuerConfig),                                                       //
+        make_unique<WriteDoorLockDoorClosedEvents>(credsIssuerConfig),                                                     //
+        make_unique<WriteDoorLockOpenPeriod>(credsIssuerConfig),                                                           //
+        make_unique<WriteDoorLockLanguage>(credsIssuerConfig),                                                             //
+        make_unique<WriteDoorLockLEDSettings>(credsIssuerConfig),                                                          //
+        make_unique<WriteDoorLockAutoRelockTime>(credsIssuerConfig),                                                       //
+        make_unique<WriteDoorLockSoundVolume>(credsIssuerConfig),                                                          //
+        make_unique<WriteDoorLockOperatingMode>(credsIssuerConfig),                                                        //
+        make_unique<WriteDoorLockEnableLocalProgramming>(credsIssuerConfig),                                               //
+        make_unique<WriteDoorLockEnableOneTouchLocking>(credsIssuerConfig),                                                //
+        make_unique<WriteDoorLockEnableInsideStatusLED>(credsIssuerConfig),                                                //
+        make_unique<WriteDoorLockEnablePrivacyModeButton>(credsIssuerConfig),                                              //
+        make_unique<WriteDoorLockLocalProgrammingFeatures>(credsIssuerConfig),                                             //
+        make_unique<WriteDoorLockWrongCodeEntryLimit>(credsIssuerConfig),                                                  //
+        make_unique<WriteDoorLockUserCodeTemporaryDisableTime>(credsIssuerConfig),                                         //
+        make_unique<WriteDoorLockSendPINOverTheAir>(credsIssuerConfig),                                                    //
+        make_unique<WriteDoorLockRequirePINforRemoteOperation>(credsIssuerConfig),                                         //
+        make_unique<WriteDoorLockExpiringUserTimeout>(credsIssuerConfig),                                                  //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "lock-state", Attributes::LockState::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "lock-type", Attributes::LockType::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "actuator-enabled", Attributes::ActuatorEnabled::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "door-state", Attributes::DoorState::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "door-open-events", Attributes::DoorOpenEvents::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "door-closed-events", Attributes::DoorClosedEvents::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "open-period", Attributes::OpenPeriod::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "number-of-total-users-supported", Attributes::NumberOfTotalUsersSupported::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id,
-                                        credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "lamp-quality", Attributes::LampQuality::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "lamp-manufacturer", Attributes::LampManufacturer::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "lamp-rated-hours", Attributes::LampRatedHours::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "lamp-burn-hours", Attributes::LampBurnHours::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "lamp-alarm-mode", Attributes::LampAlarmMode::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "lamp-burn-hours-trip-point", Attributes::LampBurnHoursTripPoint::Id,
+        make_unique<SubscribeAttribute>(Id, "number-of-pinusers-supported", Attributes::NumberOfPINUsersSupported::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-rfidusers-supported", Attributes::NumberOfRFIDUsersSupported::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-week-day-schedules-supported-per-user",
+                                        Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-year-day-schedules-supported-per-user",
+                                        Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-holiday-schedules-supported",
+                                        Attributes::NumberOfHolidaySchedulesSupported::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "max-pincode-length", Attributes::MaxPINCodeLength::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "min-pincode-length", Attributes::MinPINCodeLength::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "max-rfidcode-length", Attributes::MaxRFIDCodeLength::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "min-rfidcode-length", Attributes::MinRFIDCodeLength::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "credential-rules-support", Attributes::CredentialRulesSupport::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-credentials-supported-per-user",
+                                        Attributes::NumberOfCredentialsSupportedPerUser::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "language", Attributes::Language::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "ledsettings", Attributes::LEDSettings::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "auto-relock-time", Attributes::AutoRelockTime::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "sound-volume", Attributes::SoundVolume::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "operating-mode", Attributes::OperatingMode::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "supported-operating-modes", Attributes::SupportedOperatingModes::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "default-configuration-register", Attributes::DefaultConfigurationRegister::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "enable-local-programming", Attributes::EnableLocalProgramming::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "enable-one-touch-locking", Attributes::EnableOneTouchLocking::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "enable-inside-status-led", Attributes::EnableInsideStatusLED::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "enable-privacy-mode-button", Attributes::EnablePrivacyModeButton::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "local-programming-features", Attributes::LocalProgrammingFeatures::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "wrong-code-entry-limit", Attributes::WrongCodeEntryLimit::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "user-code-temporary-disable-time", Attributes::UserCodeTemporaryDisableTime::Id,
+                                        credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "send-pinover-the-air", Attributes::SendPINOverTheAir::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "require-pinfor-remote-operation", Attributes::RequirePINforRemoteOperation::Id,
                                         credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "expiring-user-timeout", Attributes::ExpiringUserTimeout::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),                //
@@ -23266,142 +20989,118 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterIlluminanceMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::IlluminanceMeasurement;
-
-    const char * clusterName = "IlluminanceMeasurement";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "light-sensor-type", Attributes::LightSensorType::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "light-sensor-type", Attributes::LightSensorType::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
-    };
-
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::TemperatureMeasurement;
-
-    const char * clusterName = "TemperatureMeasurement";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
-        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        //
-        // Events
-        //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                              //
+        make_unique<ReadEvent>(Id, "door-lock-alarm", Events::DoorLockAlarm::Id, credsIssuerConfig),                //
+        make_unique<ReadEvent>(Id, "door-state-change", Events::DoorStateChange::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "lock-operation", Events::LockOperation::Id, credsIssuerConfig),                 //
+        make_unique<ReadEvent>(Id, "lock-operation-error", Events::LockOperationError::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "lock-user-change", Events::LockUserChange::Id, credsIssuerConfig),              //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                         //
+        make_unique<SubscribeEvent>(Id, "door-lock-alarm", Events::DoorLockAlarm::Id, credsIssuerConfig),           //
+        make_unique<SubscribeEvent>(Id, "door-state-change", Events::DoorStateChange::Id, credsIssuerConfig),       //
+        make_unique<SubscribeEvent>(Id, "lock-operation", Events::LockOperation::Id, credsIssuerConfig),            //
+        make_unique<SubscribeEvent>(Id, "lock-operation-error", Events::LockOperationError::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "lock-user-change", Events::LockUserChange::Id, credsIssuerConfig),         //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterWindowCovering(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::PressureMeasurement;
+    using namespace chip::app::Clusters::WindowCovering;
 
-    const char * clusterName = "PressureMeasurement";
+    const char * clusterName = "WindowCovering";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),               //
+        make_unique<WindowCoveringUpOrOpen>(credsIssuerConfig),           //
+        make_unique<WindowCoveringDownOrClose>(credsIssuerConfig),        //
+        make_unique<WindowCoveringStopMotion>(credsIssuerConfig),         //
+        make_unique<WindowCoveringGoToLiftValue>(credsIssuerConfig),      //
+        make_unique<WindowCoveringGoToLiftPercentage>(credsIssuerConfig), //
+        make_unique<WindowCoveringGoToTiltValue>(credsIssuerConfig),      //
+        make_unique<WindowCoveringGoToTiltPercentage>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "scaled-value", Attributes::ScaledValue::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "min-scaled-value", Attributes::MinScaledValue::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "max-scaled-value", Attributes::MaxScaledValue::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "scaled-tolerance", Attributes::ScaledTolerance::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "scale", Attributes::Scale::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "scaled-value", Attributes::ScaledValue::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "min-scaled-value", Attributes::MinScaledValue::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "max-scaled-value", Attributes::MaxScaledValue::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "scaled-tolerance", Attributes::ScaledTolerance::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "scale", Attributes::Scale::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "type", Attributes::Type::Id, credsIssuerConfig),                                          //
+        make_unique<ReadAttribute>(Id, "physical-closed-limit-lift", Attributes::PhysicalClosedLimitLift::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "physical-closed-limit-tilt", Attributes::PhysicalClosedLimitTilt::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-position-lift", Attributes::CurrentPositionLift::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "current-position-tilt", Attributes::CurrentPositionTilt::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "number-of-actuations-lift", Attributes::NumberOfActuationsLift::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "number-of-actuations-tilt", Attributes::NumberOfActuationsTilt::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "config-status", Attributes::ConfigStatus::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "current-position-lift-percentage", Attributes::CurrentPositionLiftPercentage::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-position-tilt-percentage", Attributes::CurrentPositionTiltPercentage::Id,
+                                   credsIssuerConfig),                                                              //
+        make_unique<ReadAttribute>(Id, "operational-status", Attributes::OperationalStatus::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "target-position-lift-percent100ths", Attributes::TargetPositionLiftPercent100ths::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "target-position-tilt-percent100ths", Attributes::TargetPositionTiltPercent100ths::Id,
+                                   credsIssuerConfig),                                                         //
+        make_unique<ReadAttribute>(Id, "end-product-type", Attributes::EndProductType::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-position-lift-percent100ths", Attributes::CurrentPositionLiftPercent100ths::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "current-position-tilt-percent100ths", Attributes::CurrentPositionTiltPercent100ths::Id,
+                                   credsIssuerConfig),                                                                          //
+        make_unique<ReadAttribute>(Id, "installed-open-limit-lift", Attributes::InstalledOpenLimitLift::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "installed-closed-limit-lift", Attributes::InstalledClosedLimitLift::Id,
+                                   credsIssuerConfig),                                                                          //
+        make_unique<ReadAttribute>(Id, "installed-open-limit-tilt", Attributes::InstalledOpenLimitTilt::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "installed-closed-limit-tilt", Attributes::InstalledClosedLimitTilt::Id,
+                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "mode", Attributes::Mode::Id, credsIssuerConfig),                                   //
+        make_unique<ReadAttribute>(Id, "safety-status", Attributes::SafetyStatus::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteWindowCoveringMode>(credsIssuerConfig),                                                           //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "type", Attributes::Type::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeAttribute>(Id, "physical-closed-limit-lift", Attributes::PhysicalClosedLimitLift::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "physical-closed-limit-tilt", Attributes::PhysicalClosedLimitTilt::Id,
+                                        credsIssuerConfig),                                                                   //
+        make_unique<SubscribeAttribute>(Id, "current-position-lift", Attributes::CurrentPositionLift::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-position-tilt", Attributes::CurrentPositionTilt::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-actuations-lift", Attributes::NumberOfActuationsLift::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-actuations-tilt", Attributes::NumberOfActuationsTilt::Id,
+                                        credsIssuerConfig),                                                    //
+        make_unique<SubscribeAttribute>(Id, "config-status", Attributes::ConfigStatus::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-position-lift-percentage", Attributes::CurrentPositionLiftPercentage::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-position-tilt-percentage", Attributes::CurrentPositionTiltPercentage::Id,
+                                        credsIssuerConfig),                                                              //
+        make_unique<SubscribeAttribute>(Id, "operational-status", Attributes::OperationalStatus::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "target-position-lift-percent100ths", Attributes::TargetPositionLiftPercent100ths::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "target-position-tilt-percent100ths", Attributes::TargetPositionTiltPercent100ths::Id,
+                                        credsIssuerConfig),                                                         //
+        make_unique<SubscribeAttribute>(Id, "end-product-type", Attributes::EndProductType::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-position-lift-percent100ths", Attributes::CurrentPositionLiftPercent100ths::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "current-position-tilt-percent100ths", Attributes::CurrentPositionTiltPercent100ths::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "installed-open-limit-lift", Attributes::InstalledOpenLimitLift::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "installed-closed-limit-lift", Attributes::InstalledClosedLimitLift::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "installed-open-limit-tilt", Attributes::InstalledOpenLimitTilt::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "installed-closed-limit-tilt", Attributes::InstalledClosedLimitTilt::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "mode", Attributes::Mode::Id, credsIssuerConfig),                                   //
+        make_unique<SubscribeAttribute>(Id, "safety-status", Attributes::SafetyStatus::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),                //
@@ -23416,36 +21115,60 @@ void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCom
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::FlowMeasurement;
+    using namespace chip::app::Clusters::BarrierControl;
 
-    const char * clusterName = "FlowMeasurement";
+    const char * clusterName = "BarrierControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                      //
+        make_unique<BarrierControlBarrierControlGoToPercent>(credsIssuerConfig), //
+        make_unique<BarrierControlBarrierControlStop>(credsIssuerConfig),        //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadAttribute>(Id, "barrier-moving-state", Attributes::BarrierMovingState::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "barrier-safety-status", Attributes::BarrierSafetyStatus::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "barrier-capabilities", Attributes::BarrierCapabilities::Id, credsIssuerConfig),  //
+        make_unique<ReadAttribute>(Id, "barrier-open-events", Attributes::BarrierOpenEvents::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "barrier-close-events", Attributes::BarrierCloseEvents::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "barrier-command-open-events", Attributes::BarrierCommandOpenEvents::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "barrier-command-close-events", Attributes::BarrierCommandCloseEvents::Id,
+                                   credsIssuerConfig),                                                                        //
+        make_unique<ReadAttribute>(Id, "barrier-open-period", Attributes::BarrierOpenPeriod::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "barrier-close-period", Attributes::BarrierClosePeriod::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "barrier-position", Attributes::BarrierPosition::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),                   //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<WriteBarrierControlBarrierOpenEvents>(credsIssuerConfig),                                                 //
+        make_unique<WriteBarrierControlBarrierCloseEvents>(credsIssuerConfig),                                                //
+        make_unique<WriteBarrierControlBarrierCommandOpenEvents>(credsIssuerConfig),                                          //
+        make_unique<WriteBarrierControlBarrierCommandCloseEvents>(credsIssuerConfig),                                         //
+        make_unique<WriteBarrierControlBarrierOpenPeriod>(credsIssuerConfig),                                                 //
+        make_unique<WriteBarrierControlBarrierClosePeriod>(credsIssuerConfig),                                                //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<SubscribeAttribute>(Id, "barrier-moving-state", Attributes::BarrierMovingState::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "barrier-safety-status", Attributes::BarrierSafetyStatus::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "barrier-capabilities", Attributes::BarrierCapabilities::Id, credsIssuerConfig),  //
+        make_unique<SubscribeAttribute>(Id, "barrier-open-events", Attributes::BarrierOpenEvents::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "barrier-close-events", Attributes::BarrierCloseEvents::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "barrier-command-open-events", Attributes::BarrierCommandOpenEvents::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "barrier-command-close-events", Attributes::BarrierCommandCloseEvents::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "barrier-open-period", Attributes::BarrierOpenPeriod::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "barrier-close-period", Attributes::BarrierClosePeriod::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "barrier-position", Attributes::BarrierPosition::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),                //
@@ -23460,11 +21183,11 @@ void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommand
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::RelativeHumidityMeasurement;
+    using namespace chip::app::Clusters::PumpConfigurationAndControl;
 
-    const char * clusterName = "RelativeHumidityMeasurement";
+    const char * clusterName = "PumpConfigurationAndControl";
 
     commands_list clusterCommands = {
         //
@@ -23474,22 +21197,66 @@ void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialI
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "max-pressure", Attributes::MaxPressure::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "max-speed", Attributes::MaxSpeed::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "max-flow", Attributes::MaxFlow::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "min-const-pressure", Attributes::MinConstPressure::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "max-const-pressure", Attributes::MaxConstPressure::Id, credsIssuerConfig),             //
+        make_unique<ReadAttribute>(Id, "min-comp-pressure", Attributes::MinCompPressure::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "max-comp-pressure", Attributes::MaxCompPressure::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "min-const-speed", Attributes::MinConstSpeed::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "max-const-speed", Attributes::MaxConstSpeed::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "min-const-flow", Attributes::MinConstFlow::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "max-const-flow", Attributes::MaxConstFlow::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-const-temp", Attributes::MinConstTemp::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "max-const-temp", Attributes::MaxConstTemp::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "pump-status", Attributes::PumpStatus::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "effective-operation-mode", Attributes::EffectiveOperationMode::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "effective-control-mode", Attributes::EffectiveControlMode::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "capacity", Attributes::Capacity::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "speed", Attributes::Speed::Id, credsIssuerConfig),                                     //
+        make_unique<ReadAttribute>(Id, "lifetime-running-hours", Attributes::LifetimeRunningHours::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "power", Attributes::Power::Id, credsIssuerConfig),                                     //
+        make_unique<ReadAttribute>(Id, "lifetime-energy-consumed", Attributes::LifetimeEnergyConsumed::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "operation-mode", Attributes::OperationMode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "control-mode", Attributes::ControlMode::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),                    //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                    //
+        make_unique<WritePumpConfigurationAndControlLifetimeRunningHours>(credsIssuerConfig),                                  //
+        make_unique<WritePumpConfigurationAndControlLifetimeEnergyConsumed>(credsIssuerConfig),                                //
+        make_unique<WritePumpConfigurationAndControlOperationMode>(credsIssuerConfig),                                         //
+        make_unique<WritePumpConfigurationAndControlControlMode>(credsIssuerConfig),                                           //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "max-pressure", Attributes::MaxPressure::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "max-speed", Attributes::MaxSpeed::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "max-flow", Attributes::MaxFlow::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "min-const-pressure", Attributes::MinConstPressure::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "max-const-pressure", Attributes::MaxConstPressure::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "min-comp-pressure", Attributes::MinCompPressure::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "max-comp-pressure", Attributes::MaxCompPressure::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "min-const-speed", Attributes::MinConstSpeed::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "max-const-speed", Attributes::MaxConstSpeed::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "min-const-flow", Attributes::MinConstFlow::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "max-const-flow", Attributes::MaxConstFlow::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-const-temp", Attributes::MinConstTemp::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "max-const-temp", Attributes::MaxConstTemp::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "pump-status", Attributes::PumpStatus::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "effective-operation-mode", Attributes::EffectiveOperationMode::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "effective-control-mode", Attributes::EffectiveControlMode::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "capacity", Attributes::Capacity::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "speed", Attributes::Speed::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "lifetime-running-hours", Attributes::LifetimeRunningHours::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "power", Attributes::Power::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeAttribute>(Id, "lifetime-energy-consumed", Attributes::LifetimeEnergyConsumed::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "operation-mode", Attributes::OperationMode::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "control-mode", Attributes::ControlMode::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),                //
@@ -23498,87 +21265,230 @@ void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialI
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                            //
+        make_unique<ReadEvent>(Id, "supply-voltage-low", Events::SupplyVoltageLow::Id, credsIssuerConfig),                        //
+        make_unique<ReadEvent>(Id, "supply-voltage-high", Events::SupplyVoltageHigh::Id, credsIssuerConfig),                      //
+        make_unique<ReadEvent>(Id, "power-missing-phase", Events::PowerMissingPhase::Id, credsIssuerConfig),                      //
+        make_unique<ReadEvent>(Id, "system-pressure-low", Events::SystemPressureLow::Id, credsIssuerConfig),                      //
+        make_unique<ReadEvent>(Id, "system-pressure-high", Events::SystemPressureHigh::Id, credsIssuerConfig),                    //
+        make_unique<ReadEvent>(Id, "dry-running", Events::DryRunning::Id, credsIssuerConfig),                                     //
+        make_unique<ReadEvent>(Id, "motor-temperature-high", Events::MotorTemperatureHigh::Id, credsIssuerConfig),                //
+        make_unique<ReadEvent>(Id, "pump-motor-fatal-failure", Events::PumpMotorFatalFailure::Id, credsIssuerConfig),             //
+        make_unique<ReadEvent>(Id, "electronic-temperature-high", Events::ElectronicTemperatureHigh::Id, credsIssuerConfig),      //
+        make_unique<ReadEvent>(Id, "pump-blocked", Events::PumpBlocked::Id, credsIssuerConfig),                                   //
+        make_unique<ReadEvent>(Id, "sensor-failure", Events::SensorFailure::Id, credsIssuerConfig),                               //
+        make_unique<ReadEvent>(Id, "electronic-non-fatal-failure", Events::ElectronicNonFatalFailure::Id, credsIssuerConfig),     //
+        make_unique<ReadEvent>(Id, "electronic-fatal-failure", Events::ElectronicFatalFailure::Id, credsIssuerConfig),            //
+        make_unique<ReadEvent>(Id, "general-fault", Events::GeneralFault::Id, credsIssuerConfig),                                 //
+        make_unique<ReadEvent>(Id, "leakage", Events::Leakage::Id, credsIssuerConfig),                                            //
+        make_unique<ReadEvent>(Id, "air-detection", Events::AirDetection::Id, credsIssuerConfig),                                 //
+        make_unique<ReadEvent>(Id, "turbine-operation", Events::TurbineOperation::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                       //
+        make_unique<SubscribeEvent>(Id, "supply-voltage-low", Events::SupplyVoltageLow::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeEvent>(Id, "supply-voltage-high", Events::SupplyVoltageHigh::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeEvent>(Id, "power-missing-phase", Events::PowerMissingPhase::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeEvent>(Id, "system-pressure-low", Events::SystemPressureLow::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeEvent>(Id, "system-pressure-high", Events::SystemPressureHigh::Id, credsIssuerConfig),               //
+        make_unique<SubscribeEvent>(Id, "dry-running", Events::DryRunning::Id, credsIssuerConfig),                                //
+        make_unique<SubscribeEvent>(Id, "motor-temperature-high", Events::MotorTemperatureHigh::Id, credsIssuerConfig),           //
+        make_unique<SubscribeEvent>(Id, "pump-motor-fatal-failure", Events::PumpMotorFatalFailure::Id, credsIssuerConfig),        //
+        make_unique<SubscribeEvent>(Id, "electronic-temperature-high", Events::ElectronicTemperatureHigh::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "pump-blocked", Events::PumpBlocked::Id, credsIssuerConfig),                              //
+        make_unique<SubscribeEvent>(Id, "sensor-failure", Events::SensorFailure::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeEvent>(Id, "electronic-non-fatal-failure", Events::ElectronicNonFatalFailure::Id,
+                                    credsIssuerConfig),                                                                     //
+        make_unique<SubscribeEvent>(Id, "electronic-fatal-failure", Events::ElectronicFatalFailure::Id, credsIssuerConfig), //
+        make_unique<SubscribeEvent>(Id, "general-fault", Events::GeneralFault::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeEvent>(Id, "leakage", Events::Leakage::Id, credsIssuerConfig),                                 //
+        make_unique<SubscribeEvent>(Id, "air-detection", Events::AirDetection::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeEvent>(Id, "turbine-operation", Events::TurbineOperation::Id, credsIssuerConfig),              //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOccupancySensing(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OccupancySensing;
+    using namespace chip::app::Clusters::Thermostat;
 
-    const char * clusterName = "OccupancySensing";
+    const char * clusterName = "Thermostat";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),            //
+        make_unique<ThermostatSetpointRaiseLower>(credsIssuerConfig),  //
+        make_unique<ThermostatSetWeeklySchedule>(credsIssuerConfig),   //
+        make_unique<ThermostatGetWeeklySchedule>(credsIssuerConfig),   //
+        make_unique<ThermostatClearWeeklySchedule>(credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<ReadAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<ReadAttribute>(Id, "local-temperature", Attributes::LocalTemperature::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "outdoor-temperature", Attributes::OutdoorTemperature::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "abs-min-heat-setpoint-limit", Attributes::AbsMinHeatSetpointLimit::Id,
                                    credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id,
+        make_unique<ReadAttribute>(Id, "abs-max-heat-setpoint-limit", Attributes::AbsMaxHeatSetpointLimit::Id,
                                    credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id,
+        make_unique<ReadAttribute>(Id, "abs-min-cool-setpoint-limit", Attributes::AbsMinCoolSetpointLimit::Id,
                                    credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "pir-unoccupied-to-occupied-threshold", Attributes::PirUnoccupiedToOccupiedThreshold::Id,
+        make_unique<ReadAttribute>(Id, "abs-max-cool-setpoint-limit", Attributes::AbsMaxCoolSetpointLimit::Id,
+                                   credsIssuerConfig),                                                          //
+        make_unique<ReadAttribute>(Id, "picooling-demand", Attributes::PICoolingDemand::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "piheating-demand", Attributes::PIHeatingDemand::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "hvacsystem-type-configuration", Attributes::HVACSystemTypeConfiguration::Id,
                                    credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "ultrasonic-occupied-to-unoccupied-delay",
-                                   Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "ultrasonic-unoccupied-to-occupied-delay",
-                                   Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "ultrasonic-unoccupied-to-occupied-threshold",
-                                   Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "physical-contact-occupied-to-unoccupied-delay",
-                                   Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "physical-contact-unoccupied-to-occupied-delay",
-                                   Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "physical-contact-unoccupied-to-occupied-threshold",
-                                   Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::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),                   //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                   //
-        make_unique<WriteOccupancySensingPirOccupiedToUnoccupiedDelay>(credsIssuerConfig),                                    //
-        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedDelay>(credsIssuerConfig),                                    //
-        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedThreshold>(credsIssuerConfig),                                //
-        make_unique<WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(credsIssuerConfig),                             //
-        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(credsIssuerConfig),                             //
-        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(credsIssuerConfig),                         //
-        make_unique<WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(credsIssuerConfig),                        //
-        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(credsIssuerConfig),                        //
-        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<SubscribeAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id,
+        make_unique<ReadAttribute>(Id, "local-temperature-calibration", Attributes::LocalTemperatureCalibration::Id,
+                                   credsIssuerConfig),                                                                           //
+        make_unique<ReadAttribute>(Id, "occupied-cooling-setpoint", Attributes::OccupiedCoolingSetpoint::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "occupied-heating-setpoint", Attributes::OccupiedHeatingSetpoint::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "unoccupied-cooling-setpoint", Attributes::UnoccupiedCoolingSetpoint::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "unoccupied-heating-setpoint", Attributes::UnoccupiedHeatingSetpoint::Id,
+                                   credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "min-heat-setpoint-limit", Attributes::MinHeatSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "max-heat-setpoint-limit", Attributes::MaxHeatSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "min-cool-setpoint-limit", Attributes::MinCoolSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "max-cool-setpoint-limit", Attributes::MaxCoolSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "min-setpoint-dead-band", Attributes::MinSetpointDeadBand::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "remote-sensing", Attributes::RemoteSensing::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "control-sequence-of-operation", Attributes::ControlSequenceOfOperation::Id,
+                                   credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "system-mode", Attributes::SystemMode::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "thermostat-running-mode", Attributes::ThermostatRunningMode::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "start-of-week", Attributes::StartOfWeek::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "number-of-weekly-transitions", Attributes::NumberOfWeeklyTransitions::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "number-of-daily-transitions", Attributes::NumberOfDailyTransitions::Id,
+                                   credsIssuerConfig),                                                                           //
+        make_unique<ReadAttribute>(Id, "temperature-setpoint-hold", Attributes::TemperatureSetpointHold::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "temperature-setpoint-hold-duration", Attributes::TemperatureSetpointHoldDuration::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "thermostat-programming-operation-mode", Attributes::ThermostatProgrammingOperationMode::Id,
+                                   credsIssuerConfig),                                                                         //
+        make_unique<ReadAttribute>(Id, "thermostat-running-state", Attributes::ThermostatRunningState::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "setpoint-change-source", Attributes::SetpointChangeSource::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "setpoint-change-amount", Attributes::SetpointChangeAmount::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "setpoint-change-source-timestamp", Attributes::SetpointChangeSourceTimestamp::Id,
+                                   credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "occupied-setback", Attributes::OccupiedSetback::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "occupied-setback-min", Attributes::OccupiedSetbackMin::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "occupied-setback-max", Attributes::OccupiedSetbackMax::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "unoccupied-setback", Attributes::UnoccupiedSetback::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "unoccupied-setback-min", Attributes::UnoccupiedSetbackMin::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "unoccupied-setback-max", Attributes::UnoccupiedSetbackMax::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "emergency-heat-delta", Attributes::EmergencyHeatDelta::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "actype", Attributes::ACType::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "accapacity", Attributes::ACCapacity::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "acrefrigerant-type", Attributes::ACRefrigerantType::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "accompressor-type", Attributes::ACCompressorType::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "acerror-code", Attributes::ACErrorCode::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "aclouver-position", Attributes::ACLouverPosition::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "accoil-temperature", Attributes::ACCoilTemperature::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "accapacityformat", Attributes::ACCapacityformat::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteThermostatHVACSystemTypeConfiguration>(credsIssuerConfig),                                        //
+        make_unique<WriteThermostatLocalTemperatureCalibration>(credsIssuerConfig),                                        //
+        make_unique<WriteThermostatOccupiedCoolingSetpoint>(credsIssuerConfig),                                            //
+        make_unique<WriteThermostatOccupiedHeatingSetpoint>(credsIssuerConfig),                                            //
+        make_unique<WriteThermostatUnoccupiedCoolingSetpoint>(credsIssuerConfig),                                          //
+        make_unique<WriteThermostatUnoccupiedHeatingSetpoint>(credsIssuerConfig),                                          //
+        make_unique<WriteThermostatMinHeatSetpointLimit>(credsIssuerConfig),                                               //
+        make_unique<WriteThermostatMaxHeatSetpointLimit>(credsIssuerConfig),                                               //
+        make_unique<WriteThermostatMinCoolSetpointLimit>(credsIssuerConfig),                                               //
+        make_unique<WriteThermostatMaxCoolSetpointLimit>(credsIssuerConfig),                                               //
+        make_unique<WriteThermostatMinSetpointDeadBand>(credsIssuerConfig),                                                //
+        make_unique<WriteThermostatRemoteSensing>(credsIssuerConfig),                                                      //
+        make_unique<WriteThermostatControlSequenceOfOperation>(credsIssuerConfig),                                         //
+        make_unique<WriteThermostatSystemMode>(credsIssuerConfig),                                                         //
+        make_unique<WriteThermostatTemperatureSetpointHold>(credsIssuerConfig),                                            //
+        make_unique<WriteThermostatTemperatureSetpointHoldDuration>(credsIssuerConfig),                                    //
+        make_unique<WriteThermostatThermostatProgrammingOperationMode>(credsIssuerConfig),                                 //
+        make_unique<WriteThermostatOccupiedSetback>(credsIssuerConfig),                                                    //
+        make_unique<WriteThermostatUnoccupiedSetback>(credsIssuerConfig),                                                  //
+        make_unique<WriteThermostatEmergencyHeatDelta>(credsIssuerConfig),                                                 //
+        make_unique<WriteThermostatACType>(credsIssuerConfig),                                                             //
+        make_unique<WriteThermostatACCapacity>(credsIssuerConfig),                                                         //
+        make_unique<WriteThermostatACRefrigerantType>(credsIssuerConfig),                                                  //
+        make_unique<WriteThermostatACCompressorType>(credsIssuerConfig),                                                   //
+        make_unique<WriteThermostatACErrorCode>(credsIssuerConfig),                                                        //
+        make_unique<WriteThermostatACLouverPosition>(credsIssuerConfig),                                                   //
+        make_unique<WriteThermostatACCapacityformat>(credsIssuerConfig),                                                   //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "local-temperature", Attributes::LocalTemperature::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "outdoor-temperature", Attributes::OutdoorTemperature::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "abs-min-heat-setpoint-limit", Attributes::AbsMinHeatSetpointLimit::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id,
+        make_unique<SubscribeAttribute>(Id, "abs-max-heat-setpoint-limit", Attributes::AbsMaxHeatSetpointLimit::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id,
+        make_unique<SubscribeAttribute>(Id, "abs-min-cool-setpoint-limit", Attributes::AbsMinCoolSetpointLimit::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "pir-unoccupied-to-occupied-threshold",
-                                        Attributes::PirUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ultrasonic-occupied-to-unoccupied-delay",
-                                        Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ultrasonic-unoccupied-to-occupied-delay",
-                                        Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ultrasonic-unoccupied-to-occupied-threshold",
-                                        Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "physical-contact-occupied-to-unoccupied-delay",
-                                        Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "physical-contact-unoccupied-to-occupied-delay",
-                                        Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "physical-contact-unoccupied-to-occupied-threshold",
-                                        Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "abs-max-cool-setpoint-limit", Attributes::AbsMaxCoolSetpointLimit::Id,
+                                        credsIssuerConfig),                                                          //
+        make_unique<SubscribeAttribute>(Id, "picooling-demand", Attributes::PICoolingDemand::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "piheating-demand", Attributes::PIHeatingDemand::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "hvacsystem-type-configuration", Attributes::HVACSystemTypeConfiguration::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "local-temperature-calibration", Attributes::LocalTemperatureCalibration::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "occupied-cooling-setpoint", Attributes::OccupiedCoolingSetpoint::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "occupied-heating-setpoint", Attributes::OccupiedHeatingSetpoint::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "unoccupied-cooling-setpoint", Attributes::UnoccupiedCoolingSetpoint::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "unoccupied-heating-setpoint", Attributes::UnoccupiedHeatingSetpoint::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "min-heat-setpoint-limit", Attributes::MinHeatSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "max-heat-setpoint-limit", Attributes::MaxHeatSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "min-cool-setpoint-limit", Attributes::MinCoolSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "max-cool-setpoint-limit", Attributes::MaxCoolSetpointLimit::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "min-setpoint-dead-band", Attributes::MinSetpointDeadBand::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "remote-sensing", Attributes::RemoteSensing::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "control-sequence-of-operation", Attributes::ControlSequenceOfOperation::Id,
+                                        credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, "system-mode", Attributes::SystemMode::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "thermostat-running-mode", Attributes::ThermostatRunningMode::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "start-of-week", Attributes::StartOfWeek::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "number-of-weekly-transitions", Attributes::NumberOfWeeklyTransitions::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "number-of-daily-transitions", Attributes::NumberOfDailyTransitions::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "temperature-setpoint-hold", Attributes::TemperatureSetpointHold::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "temperature-setpoint-hold-duration", Attributes::TemperatureSetpointHoldDuration::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "thermostat-programming-operation-mode",
+                                        Attributes::ThermostatProgrammingOperationMode::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "thermostat-running-state", Attributes::ThermostatRunningState::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "setpoint-change-source", Attributes::SetpointChangeSource::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "setpoint-change-amount", Attributes::SetpointChangeAmount::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "setpoint-change-source-timestamp", Attributes::SetpointChangeSourceTimestamp::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "occupied-setback", Attributes::OccupiedSetback::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "occupied-setback-min", Attributes::OccupiedSetbackMin::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "occupied-setback-max", Attributes::OccupiedSetbackMax::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "unoccupied-setback", Attributes::UnoccupiedSetback::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "unoccupied-setback-min", Attributes::UnoccupiedSetbackMin::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "unoccupied-setback-max", Attributes::UnoccupiedSetbackMax::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "emergency-heat-delta", Attributes::EmergencyHeatDelta::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "actype", Attributes::ACType::Id, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, "accapacity", Attributes::ACCapacity::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "acrefrigerant-type", Attributes::ACRefrigerantType::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "accompressor-type", Attributes::ACCompressorType::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "acerror-code", Attributes::ACErrorCode::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "aclouver-position", Attributes::ACLouverPosition::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "accoil-temperature", Attributes::ACCoilTemperature::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "accapacityformat", Attributes::ACCapacityformat::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),                //
@@ -23593,11 +21503,11 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::CarbonMonoxideConcentrationMeasurement;
+    using namespace chip::app::Clusters::FanControl;
 
-    const char * clusterName = "CarbonMonoxideConcentrationMeasurement";
+    const char * clusterName = "FanControl";
 
     commands_list clusterCommands = {
         //
@@ -23608,21 +21518,41 @@ void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands,
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "fan-mode", Attributes::FanMode::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "fan-mode-sequence", Attributes::FanModeSequence::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "percent-setting", Attributes::PercentSetting::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "percent-current", Attributes::PercentCurrent::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "speed-max", Attributes::SpeedMax::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "speed-setting", Attributes::SpeedSetting::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "speed-current", Attributes::SpeedCurrent::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "rock-support", Attributes::RockSupport::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "rock-setting", Attributes::RockSetting::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "wind-support", Attributes::WindSupport::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "wind-setting", Attributes::WindSetting::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteFanControlFanMode>(credsIssuerConfig),                                                                 //
+        make_unique<WriteFanControlFanModeSequence>(credsIssuerConfig),                                                         //
+        make_unique<WriteFanControlPercentSetting>(credsIssuerConfig),                                                          //
+        make_unique<WriteFanControlSpeedSetting>(credsIssuerConfig),                                                            //
+        make_unique<WriteFanControlRockSetting>(credsIssuerConfig),                                                             //
+        make_unique<WriteFanControlWindSetting>(credsIssuerConfig),                                                             //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "fan-mode", Attributes::FanMode::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "fan-mode-sequence", Attributes::FanModeSequence::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "percent-setting", Attributes::PercentSetting::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "percent-current", Attributes::PercentCurrent::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "speed-max", Attributes::SpeedMax::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "speed-setting", Attributes::SpeedSetting::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "speed-current", Attributes::SpeedCurrent::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "rock-support", Attributes::RockSupport::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "rock-setting", Attributes::RockSetting::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "wind-support", Attributes::WindSupport::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "wind-setting", Attributes::WindSetting::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),                //
@@ -23637,11 +21567,11 @@ void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands,
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDehumidificationControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::CarbonDioxideConcentrationMeasurement;
+    using namespace chip::app::Clusters::DehumidificationControl;
 
-    const char * clusterName = "CarbonDioxideConcentrationMeasurement";
+    const char * clusterName = "DehumidificationControl";
 
     commands_list clusterCommands = {
         //
@@ -23652,21 +21582,43 @@ void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, C
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "relative-humidity", Attributes::RelativeHumidity::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "dehumidification-cooling", Attributes::DehumidificationCooling::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "rh-dehumidification-setpoint", Attributes::RhDehumidificationSetpoint::Id,
+                                   credsIssuerConfig),                                                                          //
+        make_unique<ReadAttribute>(Id, "relative-humidity-mode", Attributes::RelativeHumidityMode::Id, credsIssuerConfig),      //
+        make_unique<ReadAttribute>(Id, "dehumidification-lockout", Attributes::DehumidificationLockout::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "dehumidification-hysteresis", Attributes::DehumidificationHysteresis::Id,
+                                   credsIssuerConfig),                                                                           //
+        make_unique<ReadAttribute>(Id, "dehumidification-max-cool", Attributes::DehumidificationMaxCool::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "relative-humidity-display", Attributes::RelativeHumidityDisplay::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),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<WriteDehumidificationControlRhDehumidificationSetpoint>(credsIssuerConfig),                                  //
+        make_unique<WriteDehumidificationControlRelativeHumidityMode>(credsIssuerConfig),                                        //
+        make_unique<WriteDehumidificationControlDehumidificationLockout>(credsIssuerConfig),                                     //
+        make_unique<WriteDehumidificationControlDehumidificationHysteresis>(credsIssuerConfig),                                  //
+        make_unique<WriteDehumidificationControlDehumidificationMaxCool>(credsIssuerConfig),                                     //
+        make_unique<WriteDehumidificationControlRelativeHumidityDisplay>(credsIssuerConfig),                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "relative-humidity", Attributes::RelativeHumidity::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "dehumidification-cooling", Attributes::DehumidificationCooling::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rh-dehumidification-setpoint", Attributes::RhDehumidificationSetpoint::Id,
+                                        credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "relative-humidity-mode", Attributes::RelativeHumidityMode::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "dehumidification-lockout", Attributes::DehumidificationLockout::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "dehumidification-hysteresis", Attributes::DehumidificationHysteresis::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "dehumidification-max-cool", Attributes::DehumidificationMaxCool::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "relative-humidity-display", Attributes::RelativeHumidityDisplay::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),                //
@@ -23681,36 +21633,40 @@ void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, C
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterEthyleneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
-{
-    using namespace chip::app::Clusters::EthyleneConcentrationMeasurement;
-
-    const char * clusterName = "EthyleneConcentrationMeasurement";
-
-    commands_list clusterCommands = {
-        //
-        // Commands
-        //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        //
-        // Attributes
-        //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::ThermostatUserInterfaceConfiguration;
+
+    const char * clusterName = "ThermostatUserInterfaceConfiguration";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, "temperature-display-mode", Attributes::TemperatureDisplayMode::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "keypad-lockout", Attributes::KeypadLockout::Id, credsIssuerConfig),                    //
+        make_unique<ReadAttribute>(Id, "schedule-programming-visibility", Attributes::ScheduleProgrammingVisibility::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode>(credsIssuerConfig),                   //
+        make_unique<WriteThermostatUserInterfaceConfigurationKeypadLockout>(credsIssuerConfig),                            //
+        make_unique<WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "temperature-display-mode", Attributes::TemperatureDisplayMode::Id,
+                                        credsIssuerConfig),                                                      //
+        make_unique<SubscribeAttribute>(Id, "keypad-lockout", Attributes::KeypadLockout::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "schedule-programming-visibility", Attributes::ScheduleProgrammingVisibility::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),                //
@@ -23725,36 +21681,176 @@ void registerClusterEthyleneConcentrationMeasurement(Commands & commands, Creden
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterEthyleneOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::EthyleneOxideConcentrationMeasurement;
+    using namespace chip::app::Clusters::ColorControl;
 
-    const char * clusterName = "EthyleneOxideConcentrationMeasurement";
+    const char * clusterName = "ColorControl";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                         //
+        make_unique<ColorControlMoveToHue>(credsIssuerConfig),                      //
+        make_unique<ColorControlMoveHue>(credsIssuerConfig),                        //
+        make_unique<ColorControlStepHue>(credsIssuerConfig),                        //
+        make_unique<ColorControlMoveToSaturation>(credsIssuerConfig),               //
+        make_unique<ColorControlMoveSaturation>(credsIssuerConfig),                 //
+        make_unique<ColorControlStepSaturation>(credsIssuerConfig),                 //
+        make_unique<ColorControlMoveToHueAndSaturation>(credsIssuerConfig),         //
+        make_unique<ColorControlMoveToColor>(credsIssuerConfig),                    //
+        make_unique<ColorControlMoveColor>(credsIssuerConfig),                      //
+        make_unique<ColorControlStepColor>(credsIssuerConfig),                      //
+        make_unique<ColorControlMoveToColorTemperature>(credsIssuerConfig),         //
+        make_unique<ColorControlEnhancedMoveToHue>(credsIssuerConfig),              //
+        make_unique<ColorControlEnhancedMoveHue>(credsIssuerConfig),                //
+        make_unique<ColorControlEnhancedStepHue>(credsIssuerConfig),                //
+        make_unique<ColorControlEnhancedMoveToHueAndSaturation>(credsIssuerConfig), //
+        make_unique<ColorControlColorLoopSet>(credsIssuerConfig),                   //
+        make_unique<ColorControlStopMoveStep>(credsIssuerConfig),                   //
+        make_unique<ColorControlMoveColorTemperature>(credsIssuerConfig),           //
+        make_unique<ColorControlStepColorTemperature>(credsIssuerConfig),           //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig),        //
+        make_unique<ReadAttribute>(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "color-temperature", Attributes::ColorTemperature::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "primary1x", Attributes::Primary1X::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary1y", Attributes::Primary1Y::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary1intensity", Attributes::Primary1Intensity::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "primary2x", Attributes::Primary2X::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary2y", Attributes::Primary2Y::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary2intensity", Attributes::Primary2Intensity::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "primary3x", Attributes::Primary3X::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary3y", Attributes::Primary3Y::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary3intensity", Attributes::Primary3Intensity::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "primary4x", Attributes::Primary4X::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary4y", Attributes::Primary4Y::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary4intensity", Attributes::Primary4Intensity::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "primary5x", Attributes::Primary5X::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary5y", Attributes::Primary5Y::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary5intensity", Attributes::Primary5Intensity::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "primary6x", Attributes::Primary6X::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary6y", Attributes::Primary6Y::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "primary6intensity", Attributes::Primary6Intensity::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "white-point-x", Attributes::WhitePointX::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "white-point-y", Attributes::WhitePointY::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "color-point-rx", Attributes::ColorPointRX::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "color-point-ry", Attributes::ColorPointRY::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "color-point-rintensity", Attributes::ColorPointRIntensity::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "color-point-gx", Attributes::ColorPointGX::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "color-point-gy", Attributes::ColorPointGY::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "color-point-gintensity", Attributes::ColorPointGIntensity::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "color-point-bx", Attributes::ColorPointBX::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "color-point-by", Attributes::ColorPointBY::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "color-point-bintensity", Attributes::ColorPointBIntensity::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "enhanced-current-hue", Attributes::EnhancedCurrentHue::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "enhanced-color-mode", Attributes::EnhancedColorMode::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "color-loop-active", Attributes::ColorLoopActive::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "color-loop-direction", Attributes::ColorLoopDirection::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "color-loop-time", Attributes::ColorLoopTime::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "color-loop-start-enhanced-hue", Attributes::ColorLoopStartEnhancedHue::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "color-loop-stored-enhanced-hue", Attributes::ColorLoopStoredEnhancedHue::Id,
+                                   credsIssuerConfig),                                                              //
+        make_unique<ReadAttribute>(Id, "color-capabilities", Attributes::ColorCapabilities::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "color-temp-physical-min-mireds", Attributes::ColorTempPhysicalMinMireds::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "color-temp-physical-max-mireds", Attributes::ColorTempPhysicalMaxMireds::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "couple-color-temp-to-level-min-mireds", Attributes::CoupleColorTempToLevelMinMireds::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "start-up-color-temperature-mireds", Attributes::StartUpColorTemperatureMireds::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteColorControlOptions>(credsIssuerConfig),                                                               //
+        make_unique<WriteColorControlWhitePointX>(credsIssuerConfig),                                                           //
+        make_unique<WriteColorControlWhitePointY>(credsIssuerConfig),                                                           //
+        make_unique<WriteColorControlColorPointRX>(credsIssuerConfig),                                                          //
+        make_unique<WriteColorControlColorPointRY>(credsIssuerConfig),                                                          //
+        make_unique<WriteColorControlColorPointRIntensity>(credsIssuerConfig),                                                  //
+        make_unique<WriteColorControlColorPointGX>(credsIssuerConfig),                                                          //
+        make_unique<WriteColorControlColorPointGY>(credsIssuerConfig),                                                          //
+        make_unique<WriteColorControlColorPointGIntensity>(credsIssuerConfig),                                                  //
+        make_unique<WriteColorControlColorPointBX>(credsIssuerConfig),                                                          //
+        make_unique<WriteColorControlColorPointBY>(credsIssuerConfig),                                                          //
+        make_unique<WriteColorControlColorPointBIntensity>(credsIssuerConfig),                                                  //
+        make_unique<WriteColorControlStartUpColorTemperatureMireds>(credsIssuerConfig),                                         //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "color-temperature", Attributes::ColorTemperature::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "options", Attributes::Options::Id, credsIssuerConfig),                             //
+        make_unique<SubscribeAttribute>(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "primary1x", Attributes::Primary1X::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary1y", Attributes::Primary1Y::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary1intensity", Attributes::Primary1Intensity::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "primary2x", Attributes::Primary2X::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary2y", Attributes::Primary2Y::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary2intensity", Attributes::Primary2Intensity::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "primary3x", Attributes::Primary3X::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary3y", Attributes::Primary3Y::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary3intensity", Attributes::Primary3Intensity::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "primary4x", Attributes::Primary4X::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary4y", Attributes::Primary4Y::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary4intensity", Attributes::Primary4Intensity::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "primary5x", Attributes::Primary5X::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary5y", Attributes::Primary5Y::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary5intensity", Attributes::Primary5Intensity::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "primary6x", Attributes::Primary6X::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary6y", Attributes::Primary6Y::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "primary6intensity", Attributes::Primary6Intensity::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "white-point-x", Attributes::WhitePointX::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "white-point-y", Attributes::WhitePointY::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "color-point-rx", Attributes::ColorPointRX::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "color-point-ry", Attributes::ColorPointRY::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "color-point-rintensity", Attributes::ColorPointRIntensity::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "color-point-gx", Attributes::ColorPointGX::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "color-point-gy", Attributes::ColorPointGY::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "color-point-gintensity", Attributes::ColorPointGIntensity::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "color-point-bx", Attributes::ColorPointBX::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "color-point-by", Attributes::ColorPointBY::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "color-point-bintensity", Attributes::ColorPointBIntensity::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "enhanced-current-hue", Attributes::EnhancedCurrentHue::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "enhanced-color-mode", Attributes::EnhancedColorMode::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "color-loop-active", Attributes::ColorLoopActive::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "color-loop-direction", Attributes::ColorLoopDirection::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "color-loop-time", Attributes::ColorLoopTime::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "color-loop-start-enhanced-hue", Attributes::ColorLoopStartEnhancedHue::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "color-loop-stored-enhanced-hue", Attributes::ColorLoopStoredEnhancedHue::Id,
+                                        credsIssuerConfig),                                                              //
+        make_unique<SubscribeAttribute>(Id, "color-capabilities", Attributes::ColorCapabilities::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "color-temp-physical-min-mireds", Attributes::ColorTempPhysicalMinMireds::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "color-temp-physical-max-mireds", Attributes::ColorTempPhysicalMaxMireds::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "couple-color-temp-to-level-min-mireds",
+                                        Attributes::CoupleColorTempToLevelMinMireds::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "start-up-color-temperature-mireds", Attributes::StartUpColorTemperatureMireds::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),                //
@@ -23769,11 +21865,11 @@ void registerClusterEthyleneOxideConcentrationMeasurement(Commands & commands, C
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterHydrogenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::HydrogenConcentrationMeasurement;
+    using namespace chip::app::Clusters::BallastConfiguration;
 
-    const char * clusterName = "HydrogenConcentrationMeasurement";
+    const char * clusterName = "BallastConfiguration";
 
     commands_list clusterCommands = {
         //
@@ -23783,22 +21879,61 @@ void registerClusterHydrogenConcentrationMeasurement(Commands & commands, Creden
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "physical-min-level", Attributes::PhysicalMinLevel::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "physical-max-level", Attributes::PhysicalMaxLevel::Id, credsIssuerConfig),               //
+        make_unique<ReadAttribute>(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "power-on-level", Attributes::PowerOnLevel::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "power-on-fade-time", Attributes::PowerOnFadeTime::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "lamp-quality", Attributes::LampQuality::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "lamp-manufacturer", Attributes::LampManufacturer::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "lamp-rated-hours", Attributes::LampRatedHours::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "lamp-burn-hours", Attributes::LampBurnHours::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "lamp-alarm-mode", Attributes::LampAlarmMode::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "lamp-burn-hours-trip-point", Attributes::LampBurnHoursTripPoint::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),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<WriteBallastConfigurationMinLevel>(credsIssuerConfig),                                                       //
+        make_unique<WriteBallastConfigurationMaxLevel>(credsIssuerConfig),                                                       //
+        make_unique<WriteBallastConfigurationPowerOnLevel>(credsIssuerConfig),                                                   //
+        make_unique<WriteBallastConfigurationPowerOnFadeTime>(credsIssuerConfig),                                                //
+        make_unique<WriteBallastConfigurationIntrinsicBallastFactor>(credsIssuerConfig),                                         //
+        make_unique<WriteBallastConfigurationBallastFactorAdjustment>(credsIssuerConfig),                                        //
+        make_unique<WriteBallastConfigurationLampType>(credsIssuerConfig),                                                       //
+        make_unique<WriteBallastConfigurationLampManufacturer>(credsIssuerConfig),                                               //
+        make_unique<WriteBallastConfigurationLampRatedHours>(credsIssuerConfig),                                                 //
+        make_unique<WriteBallastConfigurationLampBurnHours>(credsIssuerConfig),                                                  //
+        make_unique<WriteBallastConfigurationLampAlarmMode>(credsIssuerConfig),                                                  //
+        make_unique<WriteBallastConfigurationLampBurnHoursTripPoint>(credsIssuerConfig),                                         //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "physical-min-level", Attributes::PhysicalMinLevel::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "physical-max-level", Attributes::PhysicalMaxLevel::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "power-on-level", Attributes::PowerOnLevel::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "power-on-fade-time", Attributes::PowerOnFadeTime::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id,
+                                        credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "lamp-quality", Attributes::LampQuality::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "lamp-manufacturer", Attributes::LampManufacturer::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "lamp-rated-hours", Attributes::LampRatedHours::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "lamp-burn-hours", Attributes::LampBurnHours::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "lamp-alarm-mode", Attributes::LampAlarmMode::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "lamp-burn-hours-trip-point", Attributes::LampBurnHoursTripPoint::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),                //
@@ -23813,11 +21948,11 @@ void registerClusterHydrogenConcentrationMeasurement(Commands & commands, Creden
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterHydrogenSulphideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterIlluminanceMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::HydrogenSulphideConcentrationMeasurement;
+    using namespace chip::app::Clusters::IlluminanceMeasurement;
 
-    const char * clusterName = "HydrogenSulphideConcentrationMeasurement";
+    const char * clusterName = "IlluminanceMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -23832,6 +21967,7 @@ void registerClusterHydrogenSulphideConcentrationMeasurement(Commands & commands
         make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
         make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
         make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "light-sensor-type", Attributes::LightSensorType::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),                     //
@@ -23843,6 +21979,7 @@ void registerClusterHydrogenSulphideConcentrationMeasurement(Commands & commands
         make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "light-sensor-type", Attributes::LightSensorType::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),                //
@@ -23857,11 +21994,11 @@ void registerClusterHydrogenSulphideConcentrationMeasurement(Commands & commands
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterNitricOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::NitricOxideConcentrationMeasurement;
+    using namespace chip::app::Clusters::TemperatureMeasurement;
 
-    const char * clusterName = "NitricOxideConcentrationMeasurement";
+    const char * clusterName = "TemperatureMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -23901,11 +22038,11 @@ void registerClusterNitricOxideConcentrationMeasurement(Commands & commands, Cre
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::NitrogenDioxideConcentrationMeasurement;
+    using namespace chip::app::Clusters::PressureMeasurement;
 
-    const char * clusterName = "NitrogenDioxideConcentrationMeasurement";
+    const char * clusterName = "PressureMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -23920,6 +22057,11 @@ void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands,
         make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
         make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
         make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "scaled-value", Attributes::ScaledValue::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "min-scaled-value", Attributes::MinScaledValue::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "max-scaled-value", Attributes::MaxScaledValue::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "scaled-tolerance", Attributes::ScaledTolerance::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "scale", Attributes::Scale::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),                     //
@@ -23931,6 +22073,11 @@ void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands,
         make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
         make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<SubscribeAttribute>(Id, "scaled-value", Attributes::ScaledValue::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "min-scaled-value", Attributes::MinScaledValue::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "max-scaled-value", Attributes::MaxScaledValue::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "scaled-tolerance", Attributes::ScaledTolerance::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "scale", Attributes::Scale::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),                //
@@ -23945,11 +22092,11 @@ void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands,
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OxygenConcentrationMeasurement;
+    using namespace chip::app::Clusters::FlowMeasurement;
 
-    const char * clusterName = "OxygenConcentrationMeasurement";
+    const char * clusterName = "FlowMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -23989,11 +22136,11 @@ void registerClusterOxygenConcentrationMeasurement(Commands & commands, Credenti
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOzoneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::OzoneConcentrationMeasurement;
+    using namespace chip::app::Clusters::RelativeHumidityMeasurement;
 
-    const char * clusterName = "OzoneConcentrationMeasurement";
+    const char * clusterName = "RelativeHumidityMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24033,11 +22180,11 @@ void registerClusterOzoneConcentrationMeasurement(Commands & commands, Credentia
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOccupancySensing(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::SulfurDioxideConcentrationMeasurement;
+    using namespace chip::app::Clusters::OccupancySensing;
 
-    const char * clusterName = "SulfurDioxideConcentrationMeasurement";
+    const char * clusterName = "OccupancySensing";
 
     commands_list clusterCommands = {
         //
@@ -24047,22 +22194,67 @@ void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, C
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<ReadAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "pir-unoccupied-to-occupied-threshold", Attributes::PirUnoccupiedToOccupiedThreshold::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "ultrasonic-occupied-to-unoccupied-delay",
+                                   Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "ultrasonic-unoccupied-to-occupied-delay",
+                                   Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "ultrasonic-unoccupied-to-occupied-threshold",
+                                   Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "physical-contact-occupied-to-unoccupied-delay",
+                                   Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "physical-contact-unoccupied-to-occupied-delay",
+                                   Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "physical-contact-unoccupied-to-occupied-threshold",
+                                   Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::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),                   //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                   //
+        make_unique<WriteOccupancySensingPirOccupiedToUnoccupiedDelay>(credsIssuerConfig),                                    //
+        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedDelay>(credsIssuerConfig),                                    //
+        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedThreshold>(credsIssuerConfig),                                //
+        make_unique<WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(credsIssuerConfig),                             //
+        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(credsIssuerConfig),                             //
+        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(credsIssuerConfig),                         //
+        make_unique<WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(credsIssuerConfig),                        //
+        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(credsIssuerConfig),                        //
+        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                               //
+        make_unique<SubscribeAttribute>(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "pir-unoccupied-to-occupied-threshold",
+                                        Attributes::PirUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ultrasonic-occupied-to-unoccupied-delay",
+                                        Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ultrasonic-unoccupied-to-occupied-delay",
+                                        Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ultrasonic-unoccupied-to-occupied-threshold",
+                                        Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "physical-contact-occupied-to-unoccupied-delay",
+                                        Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "physical-contact-unoccupied-to-occupied-delay",
+                                        Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "physical-contact-unoccupied-to-occupied-threshold",
+                                        Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::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),                //
@@ -24077,11 +22269,11 @@ void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, C
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterDissolvedOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::DissolvedOxygenConcentrationMeasurement;
+    using namespace chip::app::Clusters::CarbonMonoxideConcentrationMeasurement;
 
-    const char * clusterName = "DissolvedOxygenConcentrationMeasurement";
+    const char * clusterName = "CarbonMonoxideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24121,11 +22313,11 @@ void registerClusterDissolvedOxygenConcentrationMeasurement(Commands & commands,
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBromateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BromateConcentrationMeasurement;
+    using namespace chip::app::Clusters::CarbonDioxideConcentrationMeasurement;
 
-    const char * clusterName = "BromateConcentrationMeasurement";
+    const char * clusterName = "CarbonDioxideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24165,11 +22357,11 @@ void registerClusterBromateConcentrationMeasurement(Commands & commands, Credent
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterChloraminesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterEthyleneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ChloraminesConcentrationMeasurement;
+    using namespace chip::app::Clusters::EthyleneConcentrationMeasurement;
 
-    const char * clusterName = "ChloraminesConcentrationMeasurement";
+    const char * clusterName = "EthyleneConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24209,11 +22401,11 @@ void registerClusterChloraminesConcentrationMeasurement(Commands & commands, Cre
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterChlorineConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterEthyleneOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ChlorineConcentrationMeasurement;
+    using namespace chip::app::Clusters::EthyleneOxideConcentrationMeasurement;
 
-    const char * clusterName = "ChlorineConcentrationMeasurement";
+    const char * clusterName = "EthyleneOxideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24253,11 +22445,11 @@ void registerClusterChlorineConcentrationMeasurement(Commands & commands, Creden
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterFecalColiformAndEColiConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterHydrogenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::FecalColiformAndEColiConcentrationMeasurement;
+    using namespace chip::app::Clusters::HydrogenConcentrationMeasurement;
 
-    const char * clusterName = "FecalColiformAndEColiConcentrationMeasurement";
+    const char * clusterName = "HydrogenConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24297,11 +22489,11 @@ void registerClusterFecalColiformAndEColiConcentrationMeasurement(Commands & com
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterFluorideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterHydrogenSulphideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::FluorideConcentrationMeasurement;
+    using namespace chip::app::Clusters::HydrogenSulphideConcentrationMeasurement;
 
-    const char * clusterName = "FluorideConcentrationMeasurement";
+    const char * clusterName = "HydrogenSulphideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24341,11 +22533,11 @@ void registerClusterFluorideConcentrationMeasurement(Commands & commands, Creden
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterHaloaceticAcidsConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterNitricOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::HaloaceticAcidsConcentrationMeasurement;
+    using namespace chip::app::Clusters::NitricOxideConcentrationMeasurement;
 
-    const char * clusterName = "HaloaceticAcidsConcentrationMeasurement";
+    const char * clusterName = "NitricOxideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24385,11 +22577,11 @@ void registerClusterHaloaceticAcidsConcentrationMeasurement(Commands & commands,
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTotalTrihalomethanesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TotalTrihalomethanesConcentrationMeasurement;
+    using namespace chip::app::Clusters::NitrogenDioxideConcentrationMeasurement;
 
-    const char * clusterName = "TotalTrihalomethanesConcentrationMeasurement";
+    const char * clusterName = "NitrogenDioxideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24429,11 +22621,11 @@ void registerClusterTotalTrihalomethanesConcentrationMeasurement(Commands & comm
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTotalColiformBacteriaConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TotalColiformBacteriaConcentrationMeasurement;
+    using namespace chip::app::Clusters::OxygenConcentrationMeasurement;
 
-    const char * clusterName = "TotalColiformBacteriaConcentrationMeasurement";
+    const char * clusterName = "OxygenConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24473,11 +22665,11 @@ void registerClusterTotalColiformBacteriaConcentrationMeasurement(Commands & com
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTurbidityConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterOzoneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TurbidityConcentrationMeasurement;
+    using namespace chip::app::Clusters::OzoneConcentrationMeasurement;
 
-    const char * clusterName = "TurbidityConcentrationMeasurement";
+    const char * clusterName = "OzoneConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24517,11 +22709,11 @@ void registerClusterTurbidityConcentrationMeasurement(Commands & commands, Crede
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterCopperConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::CopperConcentrationMeasurement;
+    using namespace chip::app::Clusters::SulfurDioxideConcentrationMeasurement;
 
-    const char * clusterName = "CopperConcentrationMeasurement";
+    const char * clusterName = "SulfurDioxideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24561,11 +22753,11 @@ void registerClusterCopperConcentrationMeasurement(Commands & commands, Credenti
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterLeadConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterDissolvedOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LeadConcentrationMeasurement;
+    using namespace chip::app::Clusters::DissolvedOxygenConcentrationMeasurement;
 
-    const char * clusterName = "LeadConcentrationMeasurement";
+    const char * clusterName = "DissolvedOxygenConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24605,11 +22797,11 @@ void registerClusterLeadConcentrationMeasurement(Commands & commands, Credential
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterManganeseConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBromateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ManganeseConcentrationMeasurement;
+    using namespace chip::app::Clusters::BromateConcentrationMeasurement;
 
-    const char * clusterName = "ManganeseConcentrationMeasurement";
+    const char * clusterName = "BromateConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24649,11 +22841,11 @@ void registerClusterManganeseConcentrationMeasurement(Commands & commands, Crede
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSulfateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterChloraminesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::SulfateConcentrationMeasurement;
+    using namespace chip::app::Clusters::ChloraminesConcentrationMeasurement;
 
-    const char * clusterName = "SulfateConcentrationMeasurement";
+    const char * clusterName = "ChloraminesConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24693,11 +22885,11 @@ void registerClusterSulfateConcentrationMeasurement(Commands & commands, Credent
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBromodichloromethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterChlorineConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BromodichloromethaneConcentrationMeasurement;
+    using namespace chip::app::Clusters::ChlorineConcentrationMeasurement;
 
-    const char * clusterName = "BromodichloromethaneConcentrationMeasurement";
+    const char * clusterName = "ChlorineConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24737,11 +22929,11 @@ void registerClusterBromodichloromethaneConcentrationMeasurement(Commands & comm
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterBromoformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterFecalColiformAndEColiConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::BromoformConcentrationMeasurement;
+    using namespace chip::app::Clusters::FecalColiformAndEColiConcentrationMeasurement;
 
-    const char * clusterName = "BromoformConcentrationMeasurement";
+    const char * clusterName = "FecalColiformAndEColiConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24781,11 +22973,11 @@ void registerClusterBromoformConcentrationMeasurement(Commands & commands, Crede
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterChlorodibromomethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterFluorideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ChlorodibromomethaneConcentrationMeasurement;
+    using namespace chip::app::Clusters::FluorideConcentrationMeasurement;
 
-    const char * clusterName = "ChlorodibromomethaneConcentrationMeasurement";
+    const char * clusterName = "FluorideConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24825,11 +23017,11 @@ void registerClusterChlorodibromomethaneConcentrationMeasurement(Commands & comm
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterChloroformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterHaloaceticAcidsConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ChloroformConcentrationMeasurement;
+    using namespace chip::app::Clusters::HaloaceticAcidsConcentrationMeasurement;
 
-    const char * clusterName = "ChloroformConcentrationMeasurement";
+    const char * clusterName = "HaloaceticAcidsConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24869,11 +23061,11 @@ void registerClusterChloroformConcentrationMeasurement(Commands & commands, Cred
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSodiumConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTotalTrihalomethanesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::SodiumConcentrationMeasurement;
+    using namespace chip::app::Clusters::TotalTrihalomethanesConcentrationMeasurement;
 
-    const char * clusterName = "SodiumConcentrationMeasurement";
+    const char * clusterName = "TotalTrihalomethanesConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -24913,51 +23105,36 @@ void registerClusterSodiumConcentrationMeasurement(Commands & commands, Credenti
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterIasZone(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTotalColiformBacteriaConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::IasZone;
+    using namespace chip::app::Clusters::TotalColiformBacteriaConcentrationMeasurement;
 
-    const char * clusterName = "IasZone";
+    const char * clusterName = "TotalColiformBacteriaConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                 //
-        make_unique<IasZoneZoneEnrollResponse>(credsIssuerConfig),          //
-        make_unique<IasZoneInitiateNormalOperationMode>(credsIssuerConfig), //
-        make_unique<IasZoneInitiateTestMode>(credsIssuerConfig),            //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                   //
-        make_unique<ReadAttribute>(Id, "zone-state", Attributes::ZoneState::Id, credsIssuerConfig),          //
-        make_unique<ReadAttribute>(Id, "zone-type", Attributes::ZoneType::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "zone-status", Attributes::ZoneStatus::Id, credsIssuerConfig),        //
-        make_unique<ReadAttribute>(Id, "ias-cie-address", Attributes::IasCieAddress::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "zone-id", Attributes::ZoneId::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "number-of-zone-sensitivity-levels-supported",
-                                   Attributes::NumberOfZoneSensitivityLevelsSupported::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "current-zone-sensitivity-level", Attributes::CurrentZoneSensitivityLevel::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteIasZoneIasCieAddress>(credsIssuerConfig),                                                         //
-        make_unique<WriteIasZoneCurrentZoneSensitivityLevel>(credsIssuerConfig),                                           //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "zone-state", Attributes::ZoneState::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "zone-type", Attributes::ZoneType::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "zone-status", Attributes::ZoneStatus::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "ias-cie-address", Attributes::IasCieAddress::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "zone-id", Attributes::ZoneId::Id, credsIssuerConfig),                         //
-        make_unique<SubscribeAttribute>(Id, "number-of-zone-sensitivity-levels-supported",
-                                        Attributes::NumberOfZoneSensitivityLevelsSupported::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "current-zone-sensitivity-level", Attributes::CurrentZoneSensitivityLevel::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -24972,31 +23149,25 @@ void registerClusterIasZone(Commands & commands, CredentialIssuerCommands * cred
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterIasAce(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTurbidityConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::IasAce;
+    using namespace chip::app::Clusters::TurbidityConcentrationMeasurement;
 
-    const char * clusterName = "IasAce";
+    const char * clusterName = "TurbidityConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
-        make_unique<IasAceArm>(credsIssuerConfig),                 //
-        make_unique<IasAceBypass>(credsIssuerConfig),              //
-        make_unique<IasAceEmergency>(credsIssuerConfig),           //
-        make_unique<IasAceFire>(credsIssuerConfig),                //
-        make_unique<IasAcePanic>(credsIssuerConfig),               //
-        make_unique<IasAceGetZoneIdMap>(credsIssuerConfig),        //
-        make_unique<IasAceGetZoneInformation>(credsIssuerConfig),  //
-        make_unique<IasAceGetPanelStatus>(credsIssuerConfig),      //
-        make_unique<IasAceGetBypassedZoneList>(credsIssuerConfig), //
-        make_unique<IasAceGetZoneStatus>(credsIssuerConfig),       //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25004,6 +23175,10 @@ void registerClusterIasAce(Commands & commands, CredentialIssuerCommands * creds
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25018,33 +23193,36 @@ void registerClusterIasAce(Commands & commands, CredentialIssuerCommands * creds
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterIasWd(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterCopperConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::IasWd;
+    using namespace chip::app::Clusters::CopperConcentrationMeasurement;
 
-    const char * clusterName = "IasWd";
+    const char * clusterName = "CopperConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
         make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        make_unique<IasWdStartWarning>(credsIssuerConfig),  //
-        make_unique<IasWdSquawk>(credsIssuerConfig),        //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "max-duration", Attributes::MaxDuration::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteIasWdMaxDuration>(credsIssuerConfig),                                                                  //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "max-duration", Attributes::MaxDuration::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25059,11 +23237,11 @@ void registerClusterIasWd(Commands & commands, CredentialIssuerCommands * credsI
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterLeadConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::WakeOnLan;
+    using namespace chip::app::Clusters::LeadConcentrationMeasurement;
 
-    const char * clusterName = "WakeOnLan";
+    const char * clusterName = "LeadConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
@@ -25074,7 +23252,10 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25082,7 +23263,10 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25097,27 +23281,25 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterChannel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterManganeseConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::Channel;
+    using namespace chip::app::Clusters::ManganeseConcentrationMeasurement;
 
-    const char * clusterName = "Channel";
+    const char * clusterName = "ManganeseConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
-        make_unique<ChannelChangeChannel>(credsIssuerConfig),         //
-        make_unique<ChannelChangeChannelByNumber>(credsIssuerConfig), //
-        make_unique<ChannelSkipChannel>(credsIssuerConfig),           //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig),                                    //
-        make_unique<ReadAttribute>(Id, "current-channel", Attributes::CurrentChannel::Id, credsIssuerConfig),                   //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25125,9 +23307,10 @@ void registerClusterChannel(Commands & commands, CredentialIssuerCommands * cred
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, "current-channel", Attributes::CurrentChannel::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25142,24 +23325,25 @@ void registerClusterChannel(Commands & commands, CredentialIssuerCommands * cred
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterSulfateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TargetNavigator;
+    using namespace chip::app::Clusters::SulfateConcentrationMeasurement;
 
-    const char * clusterName = "TargetNavigator";
+    const char * clusterName = "SulfateConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),            //
-        make_unique<TargetNavigatorNavigateTarget>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "current-target", Attributes::CurrentTarget::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25167,8 +23351,10 @@ void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommand
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "current-target", Attributes::CurrentTarget::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25183,39 +23369,25 @@ void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommand
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBromodichloromethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::MediaPlayback;
+    using namespace chip::app::Clusters::BromodichloromethaneConcentrationMeasurement;
 
-    const char * clusterName = "MediaPlayback";
+    const char * clusterName = "BromodichloromethaneConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
-        make_unique<MediaPlaybackPlay>(credsIssuerConfig),         //
-        make_unique<MediaPlaybackPause>(credsIssuerConfig),        //
-        make_unique<MediaPlaybackStopPlayback>(credsIssuerConfig), //
-        make_unique<MediaPlaybackStartOver>(credsIssuerConfig),    //
-        make_unique<MediaPlaybackPrevious>(credsIssuerConfig),     //
-        make_unique<MediaPlaybackNext>(credsIssuerConfig),         //
-        make_unique<MediaPlaybackRewind>(credsIssuerConfig),       //
-        make_unique<MediaPlaybackFastForward>(credsIssuerConfig),  //
-        make_unique<MediaPlaybackSkipForward>(credsIssuerConfig),  //
-        make_unique<MediaPlaybackSkipBackward>(credsIssuerConfig), //
-        make_unique<MediaPlaybackSeek>(credsIssuerConfig),         //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "duration", Attributes::Duration::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "sampled-position", Attributes::SampledPosition::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "playback-speed", Attributes::PlaybackSpeed::Id, credsIssuerConfig),                     //
-        make_unique<ReadAttribute>(Id, "seek-range-end", Attributes::SeekRangeEnd::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "seek-range-start", Attributes::SeekRangeStart::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25223,13 +23395,10 @@ void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "duration", Attributes::Duration::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeAttribute>(Id, "sampled-position", Attributes::SampledPosition::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "playback-speed", Attributes::PlaybackSpeed::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "seek-range-end", Attributes::SeekRangeEnd::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "seek-range-start", Attributes::SeekRangeStart::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25244,27 +23413,25 @@ void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterBromoformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::MediaInput;
+    using namespace chip::app::Clusters::BromoformConcentrationMeasurement;
 
-    const char * clusterName = "MediaInput";
+    const char * clusterName = "BromoformConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
-        make_unique<MediaInputSelectInput>(credsIssuerConfig),     //
-        make_unique<MediaInputShowInputStatus>(credsIssuerConfig), //
-        make_unique<MediaInputHideInputStatus>(credsIssuerConfig), //
-        make_unique<MediaInputRenameInput>(credsIssuerConfig),     //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "current-input", Attributes::CurrentInput::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25272,8 +23439,10 @@ void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * c
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "current-input", Attributes::CurrentInput::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25288,22 +23457,25 @@ void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * c
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterChlorodibromomethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::LowPower;
+    using namespace chip::app::Clusters::ChlorodibromomethaneConcentrationMeasurement;
 
-    const char * clusterName = "LowPower";
+    const char * clusterName = "ChlorodibromomethaneConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
         make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        make_unique<LowPowerSleep>(credsIssuerConfig),      //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25311,6 +23483,10 @@ void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * cre
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25325,22 +23501,25 @@ void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * cre
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterChloroformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::KeypadInput;
+    using namespace chip::app::Clusters::ChloroformConcentrationMeasurement;
 
-    const char * clusterName = "KeypadInput";
+    const char * clusterName = "ChloroformConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
         make_unique<ClusterCommand>(Id, credsIssuerConfig), //
-        make_unique<KeypadInputSendKey>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
@@ -25348,6 +23527,10 @@ void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25362,37 +23545,36 @@ void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands *
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterSodiumConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ContentLauncher;
+    using namespace chip::app::Clusters::SodiumConcentrationMeasurement;
 
-    const char * clusterName = "ContentLauncher";
+    const char * clusterName = "SodiumConcentrationMeasurement";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
-        make_unique<ContentLauncherLaunchContent>(credsIssuerConfig), //
-        make_unique<ContentLauncherLaunchURL>(credsIssuerConfig),     //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                //
-        make_unique<ReadAttribute>(Id, "accept-header", Attributes::AcceptHeader::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "supported-streaming-protocols", Attributes::SupportedStreamingProtocols::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),                //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteContentLauncherSupportedStreamingProtocols>(credsIssuerConfig),                                   //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "accept-header", Attributes::AcceptHeader::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "supported-streaming-protocols", Attributes::SupportedStreamingProtocols::Id,
-                                        credsIssuerConfig),                                                                     //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "tolerance", Attributes::Tolerance::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "tolerance", Attributes::Tolerance::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),                //
@@ -25407,25 +23589,22 @@ void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommand
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::AudioOutput;
+    using namespace chip::app::Clusters::WakeOnLan;
 
-    const char * clusterName = "AudioOutput";
+    const char * clusterName = "WakeOnLan";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),      //
-        make_unique<AudioOutputSelectOutput>(credsIssuerConfig), //
-        make_unique<AudioOutputRenameOutput>(credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "current-output", Attributes::CurrentOutput::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "macaddress", Attributes::MACAddress::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),                     //
@@ -25433,8 +23612,7 @@ void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "current-output", Attributes::CurrentOutput::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "macaddress", Attributes::MACAddress::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),                //
@@ -25449,36 +23627,37 @@ void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands *
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterChannel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ApplicationLauncher;
+    using namespace chip::app::Clusters::Channel;
 
-    const char * clusterName = "ApplicationLauncher";
+    const char * clusterName = "Channel";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
         make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
-        make_unique<ApplicationLauncherLaunchApp>(credsIssuerConfig), //
-        make_unique<ApplicationLauncherStopApp>(credsIssuerConfig),   //
-        make_unique<ApplicationLauncherHideApp>(credsIssuerConfig),   //
+        make_unique<ChannelChangeChannel>(credsIssuerConfig),         //
+        make_unique<ChannelChangeChannelByNumber>(credsIssuerConfig), //
+        make_unique<ChannelSkipChannel>(credsIssuerConfig),           //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "catalog-list", Attributes::CatalogList::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "current-app", Attributes::CurrentApp::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig),                                    //
+        make_unique<ReadAttribute>(Id, "current-channel", Attributes::CurrentChannel::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),                     //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
-        make_unique<WriteApplicationLauncherCurrentApp>(credsIssuerConfig),                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "catalog-list", Attributes::CatalogList::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "current-app", Attributes::CurrentApp::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, "current-channel", Attributes::CurrentChannel::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),                //
@@ -25493,29 +23672,24 @@ void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCom
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterApplicationBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::ApplicationBasic;
+    using namespace chip::app::Clusters::TargetNavigator;
 
-    const char * clusterName = "ApplicationBasic";
+    const char * clusterName = "TargetNavigator";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),            //
+        make_unique<TargetNavigatorNavigateTarget>(credsIssuerConfig), //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
-        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "application-name", Attributes::ApplicationName::Id, credsIssuerConfig),                 //
-        make_unique<ReadAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "application", Attributes::Application::Id, credsIssuerConfig),                          //
-        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                                    //
-        make_unique<ReadAttribute>(Id, "application-version", Attributes::ApplicationVersion::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "allowed-vendor-list", Attributes::AllowedVendorList::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "current-target", Attributes::CurrentTarget::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),                     //
@@ -25523,14 +23697,8 @@ void registerClusterApplicationBasic(Commands & commands, CredentialIssuerComman
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
-        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "application-name", Attributes::ApplicationName::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "application", Attributes::Application::Id, credsIssuerConfig),                     //
-        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                               //
-        make_unique<SubscribeAttribute>(Id, "application-version", Attributes::ApplicationVersion::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "allowed-vendor-list", Attributes::AllowedVendorList::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "current-target", Attributes::CurrentTarget::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),                //
@@ -25545,24 +23713,39 @@ void registerClusterApplicationBasic(Commands & commands, CredentialIssuerComman
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::AccountLogin;
+    using namespace chip::app::Clusters::MediaPlayback;
 
-    const char * clusterName = "AccountLogin";
+    const char * clusterName = "MediaPlayback";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),      //
-        make_unique<AccountLoginGetSetupPIN>(credsIssuerConfig), //
-        make_unique<AccountLoginLogin>(credsIssuerConfig),       //
-        make_unique<AccountLoginLogout>(credsIssuerConfig),      //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
+        make_unique<MediaPlaybackPlay>(credsIssuerConfig),         //
+        make_unique<MediaPlaybackPause>(credsIssuerConfig),        //
+        make_unique<MediaPlaybackStopPlayback>(credsIssuerConfig), //
+        make_unique<MediaPlaybackStartOver>(credsIssuerConfig),    //
+        make_unique<MediaPlaybackPrevious>(credsIssuerConfig),     //
+        make_unique<MediaPlaybackNext>(credsIssuerConfig),         //
+        make_unique<MediaPlaybackRewind>(credsIssuerConfig),       //
+        make_unique<MediaPlaybackFastForward>(credsIssuerConfig),  //
+        make_unique<MediaPlaybackSkipForward>(credsIssuerConfig),  //
+        make_unique<MediaPlaybackSkipBackward>(credsIssuerConfig), //
+        make_unique<MediaPlaybackSeek>(credsIssuerConfig),         //
         //
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "duration", Attributes::Duration::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "sampled-position", Attributes::SampledPosition::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "playback-speed", Attributes::PlaybackSpeed::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "seek-range-end", Attributes::SeekRangeEnd::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "seek-range-start", Attributes::SeekRangeStart::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),                     //
@@ -25570,6 +23753,13 @@ void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands *
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
         make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "duration", Attributes::Duration::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeAttribute>(Id, "sampled-position", Attributes::SampledPosition::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "playback-speed", Attributes::PlaybackSpeed::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "seek-range-end", Attributes::SeekRangeEnd::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "seek-range-start", Attributes::SeekRangeStart::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),                //
@@ -25584,303 +23774,154 @@ void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands *
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTestCluster(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::TestCluster;
+    using namespace chip::app::Clusters::MediaInput;
 
-    const char * clusterName = "TestCluster";
+    const char * clusterName = "MediaInput";
 
     commands_list clusterCommands = {
         //
         // Commands
         //
-        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                 //
-        make_unique<TestClusterTest>(credsIssuerConfig),                                    //
-        make_unique<TestClusterTestNotHandled>(credsIssuerConfig),                          //
-        make_unique<TestClusterTestSpecific>(credsIssuerConfig),                            //
-        make_unique<TestClusterTestUnknownCommand>(credsIssuerConfig),                      //
-        make_unique<TestClusterTestAddArguments>(credsIssuerConfig),                        //
-        make_unique<TestClusterTestSimpleArgumentRequest>(credsIssuerConfig),               //
-        make_unique<TestClusterTestStructArrayArgumentRequest>(credsIssuerConfig),          //
-        make_unique<TestClusterTestStructArgumentRequest>(credsIssuerConfig),               //
-        make_unique<TestClusterTestNestedStructArgumentRequest>(credsIssuerConfig),         //
-        make_unique<TestClusterTestListStructArgumentRequest>(credsIssuerConfig),           //
-        make_unique<TestClusterTestListInt8UArgumentRequest>(credsIssuerConfig),            //
-        make_unique<TestClusterTestNestedStructListArgumentRequest>(credsIssuerConfig),     //
-        make_unique<TestClusterTestListNestedStructListArgumentRequest>(credsIssuerConfig), //
-        make_unique<TestClusterTestListInt8UReverseRequest>(credsIssuerConfig),             //
-        make_unique<TestClusterTestEnumsRequest>(credsIssuerConfig),                        //
-        make_unique<TestClusterTestNullableOptionalRequest>(credsIssuerConfig),             //
-        make_unique<TestClusterTestComplexNullableOptionalRequest>(credsIssuerConfig),      //
-        make_unique<TestClusterSimpleStructEchoRequest>(credsIssuerConfig),                 //
-        make_unique<TestClusterTimedInvokeRequest>(credsIssuerConfig),                      //
-        make_unique<TestClusterTestSimpleOptionalArgumentRequest>(credsIssuerConfig),       //
-        make_unique<TestClusterTestEmitTestEventRequest>(credsIssuerConfig),                //
-        make_unique<TestClusterTestEmitTestFabricScopedEventRequest>(credsIssuerConfig),    //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),        //
+        make_unique<MediaInputSelectInput>(credsIssuerConfig),     //
+        make_unique<MediaInputShowInputStatus>(credsIssuerConfig), //
+        make_unique<MediaInputHideInputStatus>(credsIssuerConfig), //
+        make_unique<MediaInputRenameInput>(credsIssuerConfig),     //
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                    //
-        make_unique<ReadAttribute>(Id, "boolean", Attributes::Boolean::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "bitmap8", Attributes::Bitmap8::Id, credsIssuerConfig),                                //
-        make_unique<ReadAttribute>(Id, "bitmap16", Attributes::Bitmap16::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "bitmap32", Attributes::Bitmap32::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "bitmap64", Attributes::Bitmap64::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "int8u", Attributes::Int8u::Id, credsIssuerConfig),                                    //
-        make_unique<ReadAttribute>(Id, "int16u", Attributes::Int16u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int24u", Attributes::Int24u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int32u", Attributes::Int32u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int40u", Attributes::Int40u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int48u", Attributes::Int48u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int56u", Attributes::Int56u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int64u", Attributes::Int64u::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int8s", Attributes::Int8s::Id, credsIssuerConfig),                                    //
-        make_unique<ReadAttribute>(Id, "int16s", Attributes::Int16s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int24s", Attributes::Int24s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int32s", Attributes::Int32s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int40s", Attributes::Int40s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int48s", Attributes::Int48s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int56s", Attributes::Int56s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "int64s", Attributes::Int64s::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "enum8", Attributes::Enum8::Id, credsIssuerConfig),                                    //
-        make_unique<ReadAttribute>(Id, "enum16", Attributes::Enum16::Id, credsIssuerConfig),                                  //
-        make_unique<ReadAttribute>(Id, "float-single", Attributes::FloatSingle::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "float-double", Attributes::FloatDouble::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "octet-string", Attributes::OctetString::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "list-int8u", Attributes::ListInt8u::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "list-octet-string", Attributes::ListOctetString::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "list-struct-octet-string", Attributes::ListStructOctetString::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "long-octet-string", Attributes::LongOctetString::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "char-string", Attributes::CharString::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "long-char-string", Attributes::LongCharString::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "epoch-us", Attributes::EpochUs::Id, credsIssuerConfig),                               //
-        make_unique<ReadAttribute>(Id, "epoch-s", Attributes::EpochS::Id, credsIssuerConfig),                                 //
-        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorId::Id, credsIssuerConfig),                             //
-        make_unique<ReadAttribute>(Id, "list-nullables-and-optionals-struct", Attributes::ListNullablesAndOptionalsStruct::Id,
-                                   credsIssuerConfig),                                                                       //
-        make_unique<ReadAttribute>(Id, "enum-attr", Attributes::EnumAttr::Id, credsIssuerConfig),                            //
-        make_unique<ReadAttribute>(Id, "struct-attr", Attributes::StructAttr::Id, credsIssuerConfig),                        //
-        make_unique<ReadAttribute>(Id, "range-restricted-int8u", Attributes::RangeRestrictedInt8u::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "range-restricted-int8s", Attributes::RangeRestrictedInt8s::Id, credsIssuerConfig),   //
-        make_unique<ReadAttribute>(Id, "range-restricted-int16u", Attributes::RangeRestrictedInt16u::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "range-restricted-int16s", Attributes::RangeRestrictedInt16s::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "list-long-octet-string", Attributes::ListLongOctetString::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "list-fabric-scoped", Attributes::ListFabricScoped::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "timed-write-boolean", Attributes::TimedWriteBoolean::Id, credsIssuerConfig),         //
-        make_unique<ReadAttribute>(Id, "general-error-boolean", Attributes::GeneralErrorBoolean::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "cluster-error-boolean", Attributes::ClusterErrorBoolean::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "unsupported", Attributes::Unsupported::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "nullable-boolean", Attributes::NullableBoolean::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "nullable-bitmap8", Attributes::NullableBitmap8::Id, credsIssuerConfig),              //
-        make_unique<ReadAttribute>(Id, "nullable-bitmap16", Attributes::NullableBitmap16::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "nullable-bitmap32", Attributes::NullableBitmap32::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "nullable-bitmap64", Attributes::NullableBitmap64::Id, credsIssuerConfig),            //
-        make_unique<ReadAttribute>(Id, "nullable-int8u", Attributes::NullableInt8u::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "nullable-int16u", Attributes::NullableInt16u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int24u", Attributes::NullableInt24u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int32u", Attributes::NullableInt32u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int40u", Attributes::NullableInt40u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int48u", Attributes::NullableInt48u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int56u", Attributes::NullableInt56u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int64u", Attributes::NullableInt64u::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int8s", Attributes::NullableInt8s::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "nullable-int16s", Attributes::NullableInt16s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int24s", Attributes::NullableInt24s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int32s", Attributes::NullableInt32s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int40s", Attributes::NullableInt40s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int48s", Attributes::NullableInt48s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int56s", Attributes::NullableInt56s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-int64s", Attributes::NullableInt64s::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-enum8", Attributes::NullableEnum8::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "nullable-enum16", Attributes::NullableEnum16::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-float-single", Attributes::NullableFloatSingle::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "nullable-float-double", Attributes::NullableFloatDouble::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "nullable-octet-string", Attributes::NullableOctetString::Id, credsIssuerConfig),     //
-        make_unique<ReadAttribute>(Id, "nullable-char-string", Attributes::NullableCharString::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "nullable-enum-attr", Attributes::NullableEnumAttr::Id, credsIssuerConfig),           //
-        make_unique<ReadAttribute>(Id, "nullable-struct", Attributes::NullableStruct::Id, credsIssuerConfig),                //
-        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int8u", Attributes::NullableRangeRestrictedInt8u::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int8s", Attributes::NullableRangeRestrictedInt8s::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int16u", Attributes::NullableRangeRestrictedInt16u::Id,
-                                   credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int16s", Attributes::NullableRangeRestrictedInt16s::Id,
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "current-input", Attributes::CurrentInput::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "current-input", Attributes::CurrentInput::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::LowPower;
+
+    const char * clusterName = "LowPower";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<LowPowerSleep>(credsIssuerConfig),      //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::KeypadInput;
+
+    const char * clusterName = "KeypadInput";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        make_unique<KeypadInputSendKey>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::ContentLauncher;
+
+    const char * clusterName = "ContentLauncher";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
+        make_unique<ContentLauncherLaunchContent>(credsIssuerConfig), //
+        make_unique<ContentLauncherLaunchURL>(credsIssuerConfig),     //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                //
+        make_unique<ReadAttribute>(Id, "accept-header", Attributes::AcceptHeader::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "supported-streaming-protocols", Attributes::SupportedStreamingProtocols::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),                //
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
-        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
-        make_unique<WriteTestClusterBoolean>(credsIssuerConfig),                                                           //
-        make_unique<WriteTestClusterBitmap8>(credsIssuerConfig),                                                           //
-        make_unique<WriteTestClusterBitmap16>(credsIssuerConfig),                                                          //
-        make_unique<WriteTestClusterBitmap32>(credsIssuerConfig),                                                          //
-        make_unique<WriteTestClusterBitmap64>(credsIssuerConfig),                                                          //
-        make_unique<WriteTestClusterInt8u>(credsIssuerConfig),                                                             //
-        make_unique<WriteTestClusterInt16u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt24u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt32u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt40u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt48u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt56u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt64u>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt8s>(credsIssuerConfig),                                                             //
-        make_unique<WriteTestClusterInt16s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt24s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt32s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt40s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt48s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt56s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterInt64s>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterEnum8>(credsIssuerConfig),                                                             //
-        make_unique<WriteTestClusterEnum16>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterFloatSingle>(credsIssuerConfig),                                                       //
-        make_unique<WriteTestClusterFloatDouble>(credsIssuerConfig),                                                       //
-        make_unique<WriteTestClusterOctetString>(credsIssuerConfig),                                                       //
-        make_unique<WriteTestClusterListInt8u>(credsIssuerConfig),                                                         //
-        make_unique<WriteTestClusterListOctetString>(credsIssuerConfig),                                                   //
-        make_unique<WriteTestClusterListStructOctetString>(credsIssuerConfig),                                             //
-        make_unique<WriteTestClusterLongOctetString>(credsIssuerConfig),                                                   //
-        make_unique<WriteTestClusterCharString>(credsIssuerConfig),                                                        //
-        make_unique<WriteTestClusterLongCharString>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterEpochUs>(credsIssuerConfig),                                                           //
-        make_unique<WriteTestClusterEpochS>(credsIssuerConfig),                                                            //
-        make_unique<WriteTestClusterVendorId>(credsIssuerConfig),                                                          //
-        make_unique<WriteTestClusterListNullablesAndOptionalsStruct>(credsIssuerConfig),                                   //
-        make_unique<WriteTestClusterEnumAttr>(credsIssuerConfig),                                                          //
-        make_unique<WriteTestClusterStructAttr>(credsIssuerConfig),                                                        //
-        make_unique<WriteTestClusterRangeRestrictedInt8u>(credsIssuerConfig),                                              //
-        make_unique<WriteTestClusterRangeRestrictedInt8s>(credsIssuerConfig),                                              //
-        make_unique<WriteTestClusterRangeRestrictedInt16u>(credsIssuerConfig),                                             //
-        make_unique<WriteTestClusterRangeRestrictedInt16s>(credsIssuerConfig),                                             //
-        make_unique<WriteTestClusterListLongOctetString>(credsIssuerConfig),                                               //
-        make_unique<WriteTestClusterListFabricScoped>(credsIssuerConfig),                                                  //
-        make_unique<WriteTestClusterTimedWriteBoolean>(credsIssuerConfig),                                                 //
-        make_unique<WriteTestClusterGeneralErrorBoolean>(credsIssuerConfig),                                               //
-        make_unique<WriteTestClusterClusterErrorBoolean>(credsIssuerConfig),                                               //
-        make_unique<WriteTestClusterUnsupported>(credsIssuerConfig),                                                       //
-        make_unique<WriteTestClusterNullableBoolean>(credsIssuerConfig),                                                   //
-        make_unique<WriteTestClusterNullableBitmap8>(credsIssuerConfig),                                                   //
-        make_unique<WriteTestClusterNullableBitmap16>(credsIssuerConfig),                                                  //
-        make_unique<WriteTestClusterNullableBitmap32>(credsIssuerConfig),                                                  //
-        make_unique<WriteTestClusterNullableBitmap64>(credsIssuerConfig),                                                  //
-        make_unique<WriteTestClusterNullableInt8u>(credsIssuerConfig),                                                     //
-        make_unique<WriteTestClusterNullableInt16u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt24u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt32u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt40u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt48u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt56u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt64u>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt8s>(credsIssuerConfig),                                                     //
-        make_unique<WriteTestClusterNullableInt16s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt24s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt32s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt40s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt48s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt56s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableInt64s>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableEnum8>(credsIssuerConfig),                                                     //
-        make_unique<WriteTestClusterNullableEnum16>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableFloatSingle>(credsIssuerConfig),                                               //
-        make_unique<WriteTestClusterNullableFloatDouble>(credsIssuerConfig),                                               //
-        make_unique<WriteTestClusterNullableOctetString>(credsIssuerConfig),                                               //
-        make_unique<WriteTestClusterNullableCharString>(credsIssuerConfig),                                                //
-        make_unique<WriteTestClusterNullableEnumAttr>(credsIssuerConfig),                                                  //
-        make_unique<WriteTestClusterNullableStruct>(credsIssuerConfig),                                                    //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt8u>(credsIssuerConfig),                                      //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt8s>(credsIssuerConfig),                                      //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt16u>(credsIssuerConfig),                                     //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt16s>(credsIssuerConfig),                                     //
-        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
-        make_unique<SubscribeAttribute>(Id, "boolean", Attributes::Boolean::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "bitmap8", Attributes::Bitmap8::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "bitmap16", Attributes::Bitmap16::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "bitmap32", Attributes::Bitmap32::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "bitmap64", Attributes::Bitmap64::Id, credsIssuerConfig),                      //
-        make_unique<SubscribeAttribute>(Id, "int8u", Attributes::Int8u::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "int16u", Attributes::Int16u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int24u", Attributes::Int24u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int32u", Attributes::Int32u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int40u", Attributes::Int40u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int48u", Attributes::Int48u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int56u", Attributes::Int56u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int64u", Attributes::Int64u::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int8s", Attributes::Int8s::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "int16s", Attributes::Int16s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int24s", Attributes::Int24s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int32s", Attributes::Int32s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int40s", Attributes::Int40s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int48s", Attributes::Int48s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int56s", Attributes::Int56s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "int64s", Attributes::Int64s::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "enum8", Attributes::Enum8::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "enum16", Attributes::Enum16::Id, credsIssuerConfig),                          //
-        make_unique<SubscribeAttribute>(Id, "float-single", Attributes::FloatSingle::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "float-double", Attributes::FloatDouble::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "octet-string", Attributes::OctetString::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "list-int8u", Attributes::ListInt8u::Id, credsIssuerConfig),                   //
-        make_unique<SubscribeAttribute>(Id, "list-octet-string", Attributes::ListOctetString::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "list-struct-octet-string", Attributes::ListStructOctetString::Id,
-                                        credsIssuerConfig),                                                           //
-        make_unique<SubscribeAttribute>(Id, "long-octet-string", Attributes::LongOctetString::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "char-string", Attributes::CharString::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "long-char-string", Attributes::LongCharString::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "epoch-us", Attributes::EpochUs::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "epoch-s", Attributes::EpochS::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorId::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "list-nullables-and-optionals-struct", Attributes::ListNullablesAndOptionalsStruct::Id,
-                                        credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, "enum-attr", Attributes::EnumAttr::Id, credsIssuerConfig),                            //
-        make_unique<SubscribeAttribute>(Id, "struct-attr", Attributes::StructAttr::Id, credsIssuerConfig),                        //
-        make_unique<SubscribeAttribute>(Id, "range-restricted-int8u", Attributes::RangeRestrictedInt8u::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "range-restricted-int8s", Attributes::RangeRestrictedInt8s::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "range-restricted-int16u", Attributes::RangeRestrictedInt16u::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "range-restricted-int16s", Attributes::RangeRestrictedInt16s::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "list-long-octet-string", Attributes::ListLongOctetString::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "list-fabric-scoped", Attributes::ListFabricScoped::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "timed-write-boolean", Attributes::TimedWriteBoolean::Id, credsIssuerConfig),         //
-        make_unique<SubscribeAttribute>(Id, "general-error-boolean", Attributes::GeneralErrorBoolean::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "cluster-error-boolean", Attributes::ClusterErrorBoolean::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "unsupported", Attributes::Unsupported::Id, credsIssuerConfig),                       //
-        make_unique<SubscribeAttribute>(Id, "nullable-boolean", Attributes::NullableBoolean::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "nullable-bitmap8", Attributes::NullableBitmap8::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "nullable-bitmap16", Attributes::NullableBitmap16::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "nullable-bitmap32", Attributes::NullableBitmap32::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "nullable-bitmap64", Attributes::NullableBitmap64::Id, credsIssuerConfig),            //
-        make_unique<SubscribeAttribute>(Id, "nullable-int8u", Attributes::NullableInt8u::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "nullable-int16u", Attributes::NullableInt16u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int24u", Attributes::NullableInt24u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int32u", Attributes::NullableInt32u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int40u", Attributes::NullableInt40u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int48u", Attributes::NullableInt48u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int56u", Attributes::NullableInt56u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int64u", Attributes::NullableInt64u::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int8s", Attributes::NullableInt8s::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "nullable-int16s", Attributes::NullableInt16s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int24s", Attributes::NullableInt24s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int32s", Attributes::NullableInt32s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int40s", Attributes::NullableInt40s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int48s", Attributes::NullableInt48s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int56s", Attributes::NullableInt56s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-int64s", Attributes::NullableInt64s::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-enum8", Attributes::NullableEnum8::Id, credsIssuerConfig),                  //
-        make_unique<SubscribeAttribute>(Id, "nullable-enum16", Attributes::NullableEnum16::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-float-single", Attributes::NullableFloatSingle::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "nullable-float-double", Attributes::NullableFloatDouble::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "nullable-octet-string", Attributes::NullableOctetString::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "nullable-char-string", Attributes::NullableCharString::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "nullable-enum-attr", Attributes::NullableEnumAttr::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "nullable-struct", Attributes::NullableStruct::Id, credsIssuerConfig),                //
-        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int8u", Attributes::NullableRangeRestrictedInt8u::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int8s", Attributes::NullableRangeRestrictedInt8s::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int16u", Attributes::NullableRangeRestrictedInt16u::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int16s", Attributes::NullableRangeRestrictedInt16s::Id,
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteContentLauncherSupportedStreamingProtocols>(credsIssuerConfig),                                   //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "accept-header", Attributes::AcceptHeader::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "supported-streaming-protocols", Attributes::SupportedStreamingProtocols::Id,
                                         credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
@@ -25890,12 +23931,185 @@ void registerClusterTestCluster(Commands & commands, CredentialIssuerCommands *
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                     //
-        make_unique<ReadEvent>(Id, "test-event", Events::TestEvent::Id, credsIssuerConfig),                                //
-        make_unique<ReadEvent>(Id, "test-fabric-scoped-event", Events::TestFabricScopedEvent::Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                //
-        make_unique<SubscribeEvent>(Id, "test-event", Events::TestEvent::Id, credsIssuerConfig),                           //
-        make_unique<SubscribeEvent>(Id, "test-fabric-scoped-event", Events::TestFabricScopedEvent::Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::AudioOutput;
+
+    const char * clusterName = "AudioOutput";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),      //
+        make_unique<AudioOutputSelectOutput>(credsIssuerConfig), //
+        make_unique<AudioOutputRenameOutput>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "current-output", Attributes::CurrentOutput::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "current-output", Attributes::CurrentOutput::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::ApplicationLauncher;
+
+    const char * clusterName = "ApplicationLauncher";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),           //
+        make_unique<ApplicationLauncherLaunchApp>(credsIssuerConfig), //
+        make_unique<ApplicationLauncherStopApp>(credsIssuerConfig),   //
+        make_unique<ApplicationLauncherHideApp>(credsIssuerConfig),   //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "catalog-list", Attributes::CatalogList::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "current-app", Attributes::CurrentApp::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<WriteApplicationLauncherCurrentApp>(credsIssuerConfig),                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "catalog-list", Attributes::CatalogList::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "current-app", Attributes::CurrentApp::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterApplicationBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::ApplicationBasic;
+
+    const char * clusterName = "ApplicationBasic";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                      //
+        make_unique<ReadAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "application-name", Attributes::ApplicationName::Id, credsIssuerConfig),                 //
+        make_unique<ReadAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "application", Attributes::Application::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                                    //
+        make_unique<ReadAttribute>(Id, "application-version", Attributes::ApplicationVersion::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "allowed-vendor-list", Attributes::AllowedVendorList::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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                                 //
+        make_unique<SubscribeAttribute>(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "application-name", Attributes::ApplicationName::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "application", Attributes::Application::Id, credsIssuerConfig),                     //
+        make_unique<SubscribeAttribute>(Id, "status", Attributes::Status::Id, credsIssuerConfig),                               //
+        make_unique<SubscribeAttribute>(Id, "application-version", Attributes::ApplicationVersion::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "allowed-vendor-list", Attributes::AllowedVendorList::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::AccountLogin;
+
+    const char * clusterName = "AccountLogin";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),      //
+        make_unique<AccountLoginGetSetupPIN>(credsIssuerConfig), //
+        make_unique<AccountLoginLogin>(credsIssuerConfig),       //
+        make_unique<AccountLoginLogout>(credsIssuerConfig),      //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(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),                     //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                 //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -26369,144 +24583,456 @@ void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerC
                                         credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "measured9th-harmonic-current", Attributes::Measured9thHarmonicCurrent::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured11th-harmonic-current", Attributes::Measured11thHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "measured11th-harmonic-current", Attributes::Measured11thHarmonicCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "measured-phase1st-harmonic-current", Attributes::MeasuredPhase1stHarmonicCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "measured-phase3rd-harmonic-current", Attributes::MeasuredPhase3rdHarmonicCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "measured-phase5th-harmonic-current", Attributes::MeasuredPhase5thHarmonicCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "measured-phase7th-harmonic-current", Attributes::MeasuredPhase7thHarmonicCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "measured-phase9th-harmonic-current", Attributes::MeasuredPhase9thHarmonicCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "measured-phase11th-harmonic-current", Attributes::MeasuredPhase11thHarmonicCurrent::Id,
+                                        credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, "ac-frequency-multiplier", Attributes::AcFrequencyMultiplier::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ac-frequency-divisor", Attributes::AcFrequencyDivisor::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "power-multiplier", Attributes::PowerMultiplier::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "power-divisor", Attributes::PowerDivisor::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "harmonic-current-multiplier", Attributes::HarmonicCurrentMultiplier::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "phase-harmonic-current-multiplier", Attributes::PhaseHarmonicCurrentMultiplier::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "instantaneous-voltage", Attributes::InstantaneousVoltage::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "instantaneous-line-current", Attributes::InstantaneousLineCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "instantaneous-active-current", Attributes::InstantaneousActiveCurrent::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "instantaneous-reactive-current", Attributes::InstantaneousReactiveCurrent::Id,
+                                        credsIssuerConfig),                                                                //
+        make_unique<SubscribeAttribute>(Id, "instantaneous-power", Attributes::InstantaneousPower::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage", Attributes::RmsVoltage::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-min", Attributes::RmsVoltageMin::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-max", Attributes::RmsVoltageMax::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-current", Attributes::RmsCurrent::Id, credsIssuerConfig),                 //
+        make_unique<SubscribeAttribute>(Id, "rms-current-min", Attributes::RmsCurrentMin::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-current-max", Attributes::RmsCurrentMax::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "active-power", Attributes::ActivePower::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "active-power-min", Attributes::ActivePowerMin::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "active-power-max", Attributes::ActivePowerMax::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "reactive-power", Attributes::ReactivePower::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "apparent-power", Attributes::ApparentPower::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "power-factor", Attributes::PowerFactor::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "average-rms-voltage-measurement-period",
+                                        Attributes::AverageRmsVoltageMeasurementPeriod::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage-counter", Attributes::AverageRmsUnderVoltageCounter::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage-period", Attributes::RmsExtremeOverVoltagePeriod::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage-period", Attributes::RmsExtremeUnderVoltagePeriod::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag-period", Attributes::RmsVoltageSagPeriod::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell-period", Attributes::RmsVoltageSwellPeriod::Id,
+                                        credsIssuerConfig),                                                                      //
+        make_unique<SubscribeAttribute>(Id, "ac-voltage-multiplier", Attributes::AcVoltageMultiplier::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "ac-voltage-divisor", Attributes::AcVoltageDivisor::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "ac-current-multiplier", Attributes::AcCurrentMultiplier::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "ac-current-divisor", Attributes::AcCurrentDivisor::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "ac-power-multiplier", Attributes::AcPowerMultiplier::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "ac-power-divisor", Attributes::AcPowerDivisor::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "overload-alarms-mask", Attributes::OverloadAlarmsMask::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "voltage-overload", Attributes::VoltageOverload::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "current-overload", Attributes::CurrentOverload::Id, credsIssuerConfig),             //
+        make_unique<SubscribeAttribute>(Id, "ac-overload-alarms-mask", Attributes::AcOverloadAlarmsMask::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ac-voltage-overload", Attributes::AcVoltageOverload::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "ac-current-overload", Attributes::AcCurrentOverload::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "ac-active-power-overload", Attributes::AcActivePowerOverload::Id,
+                                        credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "ac-reactive-power-overload", Attributes::AcReactivePowerOverload::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured-phase1st-harmonic-current", Attributes::MeasuredPhase1stHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "average-rms-over-voltage", Attributes::AverageRmsOverVoltage::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured-phase3rd-harmonic-current", Attributes::MeasuredPhase3rdHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage", Attributes::AverageRmsUnderVoltage::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured-phase5th-harmonic-current", Attributes::MeasuredPhase5thHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage", Attributes::RmsExtremeOverVoltage::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured-phase7th-harmonic-current", Attributes::MeasuredPhase7thHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage", Attributes::RmsExtremeUnderVoltage::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag", Attributes::RmsVoltageSag::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell", Attributes::RmsVoltageSwell::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "line-current-phase-b", Attributes::LineCurrentPhaseB::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "active-current-phase-b", Attributes::ActiveCurrentPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "reactive-current-phase-b", Attributes::ReactiveCurrentPhaseB::Id,
+                                        credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-phase-b", Attributes::RmsVoltagePhaseB::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-min-phase-b", Attributes::RmsVoltageMinPhaseB::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-max-phase-b", Attributes::RmsVoltageMaxPhaseB::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rms-current-phase-b", Attributes::RmsCurrentPhaseB::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-current-min-phase-b", Attributes::RmsCurrentMinPhaseB::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rms-current-max-phase-b", Attributes::RmsCurrentMaxPhaseB::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "active-power-phase-b", Attributes::ActivePowerPhaseB::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "active-power-min-phase-b", Attributes::ActivePowerMinPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-power-max-phase-b", Attributes::ActivePowerMaxPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "reactive-power-phase-b", Attributes::ReactivePowerPhaseB::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "apparent-power-phase-b", Attributes::ApparentPowerPhaseB::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "power-factor-phase-b", Attributes::PowerFactorPhaseB::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "average-rms-voltage-measurement-period-phase-b",
+                                        Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "average-rms-over-voltage-counter-phase-b",
+                                        Attributes::AverageRmsOverVoltageCounterPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage-counter-phase-b",
+                                        Attributes::AverageRmsUnderVoltageCounterPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage-period-phase-b",
+                                        Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage-period-phase-b",
+                                        Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag-period-phase-b", Attributes::RmsVoltageSagPeriodPhaseB::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured-phase9th-harmonic-current", Attributes::MeasuredPhase9thHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell-period-phase-b", Attributes::RmsVoltageSwellPeriodPhaseB::Id,
+                                        credsIssuerConfig),                                                                    //
+        make_unique<SubscribeAttribute>(Id, "line-current-phase-c", Attributes::LineCurrentPhaseC::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "active-current-phase-c", Attributes::ActiveCurrentPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "reactive-current-phase-c", Attributes::ReactiveCurrentPhaseC::Id,
+                                        credsIssuerConfig),                                                                       //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-phase-c", Attributes::RmsVoltagePhaseC::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-min-phase-c", Attributes::RmsVoltageMinPhaseC::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-max-phase-c", Attributes::RmsVoltageMaxPhaseC::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rms-current-phase-c", Attributes::RmsCurrentPhaseC::Id, credsIssuerConfig),          //
+        make_unique<SubscribeAttribute>(Id, "rms-current-min-phase-c", Attributes::RmsCurrentMinPhaseC::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "rms-current-max-phase-c", Attributes::RmsCurrentMaxPhaseC::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "active-power-phase-c", Attributes::ActivePowerPhaseC::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "active-power-min-phase-c", Attributes::ActivePowerMinPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "active-power-max-phase-c", Attributes::ActivePowerMaxPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "reactive-power-phase-c", Attributes::ReactivePowerPhaseC::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "apparent-power-phase-c", Attributes::ApparentPowerPhaseC::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "power-factor-phase-c", Attributes::PowerFactorPhaseC::Id, credsIssuerConfig),        //
+        make_unique<SubscribeAttribute>(Id, "average-rms-voltage-measurement-period-phase-c",
+                                        Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "average-rms-over-voltage-counter-phase-c",
+                                        Attributes::AverageRmsOverVoltageCounterPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage-counter-phase-c",
+                                        Attributes::AverageRmsUnderVoltageCounterPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage-period-phase-c",
+                                        Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage-period-phase-c",
+                                        Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag-period-phase-c", Attributes::RmsVoltageSagPeriodPhaseC::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "measured-phase11th-harmonic-current", Attributes::MeasuredPhase11thHarmonicCurrent::Id,
+        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell-period-phase-c", Attributes::RmsVoltageSwellPeriodPhaseC::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),                //
+        make_unique<SubscribeAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        //
+        // Events
+        //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterTestCluster(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::TestCluster;
+
+    const char * clusterName = "TestCluster";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                                 //
+        make_unique<TestClusterTest>(credsIssuerConfig),                                    //
+        make_unique<TestClusterTestNotHandled>(credsIssuerConfig),                          //
+        make_unique<TestClusterTestSpecific>(credsIssuerConfig),                            //
+        make_unique<TestClusterTestUnknownCommand>(credsIssuerConfig),                      //
+        make_unique<TestClusterTestAddArguments>(credsIssuerConfig),                        //
+        make_unique<TestClusterTestSimpleArgumentRequest>(credsIssuerConfig),               //
+        make_unique<TestClusterTestStructArrayArgumentRequest>(credsIssuerConfig),          //
+        make_unique<TestClusterTestStructArgumentRequest>(credsIssuerConfig),               //
+        make_unique<TestClusterTestNestedStructArgumentRequest>(credsIssuerConfig),         //
+        make_unique<TestClusterTestListStructArgumentRequest>(credsIssuerConfig),           //
+        make_unique<TestClusterTestListInt8UArgumentRequest>(credsIssuerConfig),            //
+        make_unique<TestClusterTestNestedStructListArgumentRequest>(credsIssuerConfig),     //
+        make_unique<TestClusterTestListNestedStructListArgumentRequest>(credsIssuerConfig), //
+        make_unique<TestClusterTestListInt8UReverseRequest>(credsIssuerConfig),             //
+        make_unique<TestClusterTestEnumsRequest>(credsIssuerConfig),                        //
+        make_unique<TestClusterTestNullableOptionalRequest>(credsIssuerConfig),             //
+        make_unique<TestClusterTestComplexNullableOptionalRequest>(credsIssuerConfig),      //
+        make_unique<TestClusterSimpleStructEchoRequest>(credsIssuerConfig),                 //
+        make_unique<TestClusterTimedInvokeRequest>(credsIssuerConfig),                      //
+        make_unique<TestClusterTestSimpleOptionalArgumentRequest>(credsIssuerConfig),       //
+        make_unique<TestClusterTestEmitTestEventRequest>(credsIssuerConfig),                //
+        make_unique<TestClusterTestEmitTestFabricScopedEventRequest>(credsIssuerConfig),    //
+        //
+        // Attributes
+        //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                    //
+        make_unique<ReadAttribute>(Id, "boolean", Attributes::Boolean::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "bitmap8", Attributes::Bitmap8::Id, credsIssuerConfig),                                //
+        make_unique<ReadAttribute>(Id, "bitmap16", Attributes::Bitmap16::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "bitmap32", Attributes::Bitmap32::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "bitmap64", Attributes::Bitmap64::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "int8u", Attributes::Int8u::Id, credsIssuerConfig),                                    //
+        make_unique<ReadAttribute>(Id, "int16u", Attributes::Int16u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int24u", Attributes::Int24u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int32u", Attributes::Int32u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int40u", Attributes::Int40u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int48u", Attributes::Int48u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int56u", Attributes::Int56u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int64u", Attributes::Int64u::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int8s", Attributes::Int8s::Id, credsIssuerConfig),                                    //
+        make_unique<ReadAttribute>(Id, "int16s", Attributes::Int16s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int24s", Attributes::Int24s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int32s", Attributes::Int32s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int40s", Attributes::Int40s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int48s", Attributes::Int48s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int56s", Attributes::Int56s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "int64s", Attributes::Int64s::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "enum8", Attributes::Enum8::Id, credsIssuerConfig),                                    //
+        make_unique<ReadAttribute>(Id, "enum16", Attributes::Enum16::Id, credsIssuerConfig),                                  //
+        make_unique<ReadAttribute>(Id, "float-single", Attributes::FloatSingle::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "float-double", Attributes::FloatDouble::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "octet-string", Attributes::OctetString::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "list-int8u", Attributes::ListInt8u::Id, credsIssuerConfig),                           //
+        make_unique<ReadAttribute>(Id, "list-octet-string", Attributes::ListOctetString::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "list-struct-octet-string", Attributes::ListStructOctetString::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "long-octet-string", Attributes::LongOctetString::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "char-string", Attributes::CharString::Id, credsIssuerConfig),                         //
+        make_unique<ReadAttribute>(Id, "long-char-string", Attributes::LongCharString::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "epoch-us", Attributes::EpochUs::Id, credsIssuerConfig),                               //
+        make_unique<ReadAttribute>(Id, "epoch-s", Attributes::EpochS::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "vendor-id", Attributes::VendorId::Id, credsIssuerConfig),                             //
+        make_unique<ReadAttribute>(Id, "list-nullables-and-optionals-struct", Attributes::ListNullablesAndOptionalsStruct::Id,
+                                   credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "enum-attr", Attributes::EnumAttr::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "struct-attr", Attributes::StructAttr::Id, credsIssuerConfig),                        //
+        make_unique<ReadAttribute>(Id, "range-restricted-int8u", Attributes::RangeRestrictedInt8u::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "range-restricted-int8s", Attributes::RangeRestrictedInt8s::Id, credsIssuerConfig),   //
+        make_unique<ReadAttribute>(Id, "range-restricted-int16u", Attributes::RangeRestrictedInt16u::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "range-restricted-int16s", Attributes::RangeRestrictedInt16s::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "list-long-octet-string", Attributes::ListLongOctetString::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "list-fabric-scoped", Attributes::ListFabricScoped::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "timed-write-boolean", Attributes::TimedWriteBoolean::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "general-error-boolean", Attributes::GeneralErrorBoolean::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "cluster-error-boolean", Attributes::ClusterErrorBoolean::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "unsupported", Attributes::Unsupported::Id, credsIssuerConfig),                       //
+        make_unique<ReadAttribute>(Id, "nullable-boolean", Attributes::NullableBoolean::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "nullable-bitmap8", Attributes::NullableBitmap8::Id, credsIssuerConfig),              //
+        make_unique<ReadAttribute>(Id, "nullable-bitmap16", Attributes::NullableBitmap16::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "nullable-bitmap32", Attributes::NullableBitmap32::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "nullable-bitmap64", Attributes::NullableBitmap64::Id, credsIssuerConfig),            //
+        make_unique<ReadAttribute>(Id, "nullable-int8u", Attributes::NullableInt8u::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "nullable-int16u", Attributes::NullableInt16u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int24u", Attributes::NullableInt24u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int32u", Attributes::NullableInt32u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int40u", Attributes::NullableInt40u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int48u", Attributes::NullableInt48u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int56u", Attributes::NullableInt56u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int64u", Attributes::NullableInt64u::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int8s", Attributes::NullableInt8s::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "nullable-int16s", Attributes::NullableInt16s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int24s", Attributes::NullableInt24s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int32s", Attributes::NullableInt32s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int40s", Attributes::NullableInt40s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int48s", Attributes::NullableInt48s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int56s", Attributes::NullableInt56s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-int64s", Attributes::NullableInt64s::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-enum8", Attributes::NullableEnum8::Id, credsIssuerConfig),                  //
+        make_unique<ReadAttribute>(Id, "nullable-enum16", Attributes::NullableEnum16::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-float-single", Attributes::NullableFloatSingle::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "nullable-float-double", Attributes::NullableFloatDouble::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "nullable-octet-string", Attributes::NullableOctetString::Id, credsIssuerConfig),     //
+        make_unique<ReadAttribute>(Id, "nullable-char-string", Attributes::NullableCharString::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "nullable-enum-attr", Attributes::NullableEnumAttr::Id, credsIssuerConfig),           //
+        make_unique<ReadAttribute>(Id, "nullable-struct", Attributes::NullableStruct::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int8u", Attributes::NullableRangeRestrictedInt8u::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int8s", Attributes::NullableRangeRestrictedInt8s::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int16u", Attributes::NullableRangeRestrictedInt16u::Id,
+                                   credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "nullable-range-restricted-int16s", Attributes::NullableRangeRestrictedInt16s::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),                //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
+        make_unique<WriteAttribute>(Id, credsIssuerConfig),                                                                //
+        make_unique<WriteTestClusterBoolean>(credsIssuerConfig),                                                           //
+        make_unique<WriteTestClusterBitmap8>(credsIssuerConfig),                                                           //
+        make_unique<WriteTestClusterBitmap16>(credsIssuerConfig),                                                          //
+        make_unique<WriteTestClusterBitmap32>(credsIssuerConfig),                                                          //
+        make_unique<WriteTestClusterBitmap64>(credsIssuerConfig),                                                          //
+        make_unique<WriteTestClusterInt8u>(credsIssuerConfig),                                                             //
+        make_unique<WriteTestClusterInt16u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt24u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt32u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt40u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt48u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt56u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt64u>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt8s>(credsIssuerConfig),                                                             //
+        make_unique<WriteTestClusterInt16s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt24s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt32s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt40s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt48s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt56s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterInt64s>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterEnum8>(credsIssuerConfig),                                                             //
+        make_unique<WriteTestClusterEnum16>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterFloatSingle>(credsIssuerConfig),                                                       //
+        make_unique<WriteTestClusterFloatDouble>(credsIssuerConfig),                                                       //
+        make_unique<WriteTestClusterOctetString>(credsIssuerConfig),                                                       //
+        make_unique<WriteTestClusterListInt8u>(credsIssuerConfig),                                                         //
+        make_unique<WriteTestClusterListOctetString>(credsIssuerConfig),                                                   //
+        make_unique<WriteTestClusterListStructOctetString>(credsIssuerConfig),                                             //
+        make_unique<WriteTestClusterLongOctetString>(credsIssuerConfig),                                                   //
+        make_unique<WriteTestClusterCharString>(credsIssuerConfig),                                                        //
+        make_unique<WriteTestClusterLongCharString>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterEpochUs>(credsIssuerConfig),                                                           //
+        make_unique<WriteTestClusterEpochS>(credsIssuerConfig),                                                            //
+        make_unique<WriteTestClusterVendorId>(credsIssuerConfig),                                                          //
+        make_unique<WriteTestClusterListNullablesAndOptionalsStruct>(credsIssuerConfig),                                   //
+        make_unique<WriteTestClusterEnumAttr>(credsIssuerConfig),                                                          //
+        make_unique<WriteTestClusterStructAttr>(credsIssuerConfig),                                                        //
+        make_unique<WriteTestClusterRangeRestrictedInt8u>(credsIssuerConfig),                                              //
+        make_unique<WriteTestClusterRangeRestrictedInt8s>(credsIssuerConfig),                                              //
+        make_unique<WriteTestClusterRangeRestrictedInt16u>(credsIssuerConfig),                                             //
+        make_unique<WriteTestClusterRangeRestrictedInt16s>(credsIssuerConfig),                                             //
+        make_unique<WriteTestClusterListLongOctetString>(credsIssuerConfig),                                               //
+        make_unique<WriteTestClusterListFabricScoped>(credsIssuerConfig),                                                  //
+        make_unique<WriteTestClusterTimedWriteBoolean>(credsIssuerConfig),                                                 //
+        make_unique<WriteTestClusterGeneralErrorBoolean>(credsIssuerConfig),                                               //
+        make_unique<WriteTestClusterClusterErrorBoolean>(credsIssuerConfig),                                               //
+        make_unique<WriteTestClusterUnsupported>(credsIssuerConfig),                                                       //
+        make_unique<WriteTestClusterNullableBoolean>(credsIssuerConfig),                                                   //
+        make_unique<WriteTestClusterNullableBitmap8>(credsIssuerConfig),                                                   //
+        make_unique<WriteTestClusterNullableBitmap16>(credsIssuerConfig),                                                  //
+        make_unique<WriteTestClusterNullableBitmap32>(credsIssuerConfig),                                                  //
+        make_unique<WriteTestClusterNullableBitmap64>(credsIssuerConfig),                                                  //
+        make_unique<WriteTestClusterNullableInt8u>(credsIssuerConfig),                                                     //
+        make_unique<WriteTestClusterNullableInt16u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt24u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt32u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt40u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt48u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt56u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt64u>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt8s>(credsIssuerConfig),                                                     //
+        make_unique<WriteTestClusterNullableInt16s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt24s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt32s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt40s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt48s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt56s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableInt64s>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableEnum8>(credsIssuerConfig),                                                     //
+        make_unique<WriteTestClusterNullableEnum16>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableFloatSingle>(credsIssuerConfig),                                               //
+        make_unique<WriteTestClusterNullableFloatDouble>(credsIssuerConfig),                                               //
+        make_unique<WriteTestClusterNullableOctetString>(credsIssuerConfig),                                               //
+        make_unique<WriteTestClusterNullableCharString>(credsIssuerConfig),                                                //
+        make_unique<WriteTestClusterNullableEnumAttr>(credsIssuerConfig),                                                  //
+        make_unique<WriteTestClusterNullableStruct>(credsIssuerConfig),                                                    //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt8u>(credsIssuerConfig),                                      //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt8s>(credsIssuerConfig),                                      //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt16u>(credsIssuerConfig),                                     //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt16s>(credsIssuerConfig),                                     //
+        make_unique<SubscribeAttribute>(Id, credsIssuerConfig),                                                            //
+        make_unique<SubscribeAttribute>(Id, "boolean", Attributes::Boolean::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "bitmap8", Attributes::Bitmap8::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "bitmap16", Attributes::Bitmap16::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "bitmap32", Attributes::Bitmap32::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "bitmap64", Attributes::Bitmap64::Id, credsIssuerConfig),                      //
+        make_unique<SubscribeAttribute>(Id, "int8u", Attributes::Int8u::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "int16u", Attributes::Int16u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int24u", Attributes::Int24u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int32u", Attributes::Int32u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int40u", Attributes::Int40u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int48u", Attributes::Int48u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int56u", Attributes::Int56u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int64u", Attributes::Int64u::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int8s", Attributes::Int8s::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "int16s", Attributes::Int16s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int24s", Attributes::Int24s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int32s", Attributes::Int32s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int40s", Attributes::Int40s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int48s", Attributes::Int48s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int56s", Attributes::Int56s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "int64s", Attributes::Int64s::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "enum8", Attributes::Enum8::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "enum16", Attributes::Enum16::Id, credsIssuerConfig),                          //
+        make_unique<SubscribeAttribute>(Id, "float-single", Attributes::FloatSingle::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "float-double", Attributes::FloatDouble::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "octet-string", Attributes::OctetString::Id, credsIssuerConfig),               //
+        make_unique<SubscribeAttribute>(Id, "list-int8u", Attributes::ListInt8u::Id, credsIssuerConfig),                   //
+        make_unique<SubscribeAttribute>(Id, "list-octet-string", Attributes::ListOctetString::Id, credsIssuerConfig),      //
+        make_unique<SubscribeAttribute>(Id, "list-struct-octet-string", Attributes::ListStructOctetString::Id,
+                                        credsIssuerConfig),                                                           //
+        make_unique<SubscribeAttribute>(Id, "long-octet-string", Attributes::LongOctetString::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "char-string", Attributes::CharString::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "long-char-string", Attributes::LongCharString::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "epoch-us", Attributes::EpochUs::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "epoch-s", Attributes::EpochS::Id, credsIssuerConfig),                    //
+        make_unique<SubscribeAttribute>(Id, "vendor-id", Attributes::VendorId::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "list-nullables-and-optionals-struct", Attributes::ListNullablesAndOptionalsStruct::Id,
                                         credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, "ac-frequency-multiplier", Attributes::AcFrequencyMultiplier::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ac-frequency-divisor", Attributes::AcFrequencyDivisor::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "power-multiplier", Attributes::PowerMultiplier::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "power-divisor", Attributes::PowerDivisor::Id, credsIssuerConfig),                    //
-        make_unique<SubscribeAttribute>(Id, "harmonic-current-multiplier", Attributes::HarmonicCurrentMultiplier::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "phase-harmonic-current-multiplier", Attributes::PhaseHarmonicCurrentMultiplier::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "instantaneous-voltage", Attributes::InstantaneousVoltage::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "instantaneous-line-current", Attributes::InstantaneousLineCurrent::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "instantaneous-active-current", Attributes::InstantaneousActiveCurrent::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "instantaneous-reactive-current", Attributes::InstantaneousReactiveCurrent::Id,
-                                        credsIssuerConfig),                                                                //
-        make_unique<SubscribeAttribute>(Id, "instantaneous-power", Attributes::InstantaneousPower::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage", Attributes::RmsVoltage::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-min", Attributes::RmsVoltageMin::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-max", Attributes::RmsVoltageMax::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-current", Attributes::RmsCurrent::Id, credsIssuerConfig),                 //
-        make_unique<SubscribeAttribute>(Id, "rms-current-min", Attributes::RmsCurrentMin::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-current-max", Attributes::RmsCurrentMax::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "active-power", Attributes::ActivePower::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "active-power-min", Attributes::ActivePowerMin::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "active-power-max", Attributes::ActivePowerMax::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "reactive-power", Attributes::ReactivePower::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "apparent-power", Attributes::ApparentPower::Id, credsIssuerConfig),           //
-        make_unique<SubscribeAttribute>(Id, "power-factor", Attributes::PowerFactor::Id, credsIssuerConfig),               //
-        make_unique<SubscribeAttribute>(Id, "average-rms-voltage-measurement-period",
-                                        Attributes::AverageRmsVoltageMeasurementPeriod::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage-counter", Attributes::AverageRmsUnderVoltageCounter::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage-period", Attributes::RmsExtremeOverVoltagePeriod::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage-period", Attributes::RmsExtremeUnderVoltagePeriod::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag-period", Attributes::RmsVoltageSagPeriod::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell-period", Attributes::RmsVoltageSwellPeriod::Id,
-                                        credsIssuerConfig),                                                                      //
-        make_unique<SubscribeAttribute>(Id, "ac-voltage-multiplier", Attributes::AcVoltageMultiplier::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "ac-voltage-divisor", Attributes::AcVoltageDivisor::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "ac-current-multiplier", Attributes::AcCurrentMultiplier::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "ac-current-divisor", Attributes::AcCurrentDivisor::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "ac-power-multiplier", Attributes::AcPowerMultiplier::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "ac-power-divisor", Attributes::AcPowerDivisor::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "overload-alarms-mask", Attributes::OverloadAlarmsMask::Id, credsIssuerConfig),      //
-        make_unique<SubscribeAttribute>(Id, "voltage-overload", Attributes::VoltageOverload::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "current-overload", Attributes::CurrentOverload::Id, credsIssuerConfig),             //
-        make_unique<SubscribeAttribute>(Id, "ac-overload-alarms-mask", Attributes::AcOverloadAlarmsMask::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ac-voltage-overload", Attributes::AcVoltageOverload::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "ac-current-overload", Attributes::AcCurrentOverload::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "ac-active-power-overload", Attributes::AcActivePowerOverload::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "ac-reactive-power-overload", Attributes::AcReactivePowerOverload::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-over-voltage", Attributes::AverageRmsOverVoltage::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage", Attributes::AverageRmsUnderVoltage::Id,
-                                        credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage", Attributes::RmsExtremeOverVoltage::Id,
+        make_unique<SubscribeAttribute>(Id, "enum-attr", Attributes::EnumAttr::Id, credsIssuerConfig),                            //
+        make_unique<SubscribeAttribute>(Id, "struct-attr", Attributes::StructAttr::Id, credsIssuerConfig),                        //
+        make_unique<SubscribeAttribute>(Id, "range-restricted-int8u", Attributes::RangeRestrictedInt8u::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "range-restricted-int8s", Attributes::RangeRestrictedInt8s::Id, credsIssuerConfig),   //
+        make_unique<SubscribeAttribute>(Id, "range-restricted-int16u", Attributes::RangeRestrictedInt16u::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "range-restricted-int16s", Attributes::RangeRestrictedInt16s::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "list-long-octet-string", Attributes::ListLongOctetString::Id, credsIssuerConfig),    //
+        make_unique<SubscribeAttribute>(Id, "list-fabric-scoped", Attributes::ListFabricScoped::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "timed-write-boolean", Attributes::TimedWriteBoolean::Id, credsIssuerConfig),         //
+        make_unique<SubscribeAttribute>(Id, "general-error-boolean", Attributes::GeneralErrorBoolean::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "cluster-error-boolean", Attributes::ClusterErrorBoolean::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "unsupported", Attributes::Unsupported::Id, credsIssuerConfig),                       //
+        make_unique<SubscribeAttribute>(Id, "nullable-boolean", Attributes::NullableBoolean::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "nullable-bitmap8", Attributes::NullableBitmap8::Id, credsIssuerConfig),              //
+        make_unique<SubscribeAttribute>(Id, "nullable-bitmap16", Attributes::NullableBitmap16::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "nullable-bitmap32", Attributes::NullableBitmap32::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "nullable-bitmap64", Attributes::NullableBitmap64::Id, credsIssuerConfig),            //
+        make_unique<SubscribeAttribute>(Id, "nullable-int8u", Attributes::NullableInt8u::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "nullable-int16u", Attributes::NullableInt16u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int24u", Attributes::NullableInt24u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int32u", Attributes::NullableInt32u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int40u", Attributes::NullableInt40u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int48u", Attributes::NullableInt48u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int56u", Attributes::NullableInt56u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int64u", Attributes::NullableInt64u::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int8s", Attributes::NullableInt8s::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "nullable-int16s", Attributes::NullableInt16s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int24s", Attributes::NullableInt24s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int32s", Attributes::NullableInt32s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int40s", Attributes::NullableInt40s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int48s", Attributes::NullableInt48s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int56s", Attributes::NullableInt56s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-int64s", Attributes::NullableInt64s::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-enum8", Attributes::NullableEnum8::Id, credsIssuerConfig),                  //
+        make_unique<SubscribeAttribute>(Id, "nullable-enum16", Attributes::NullableEnum16::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-float-single", Attributes::NullableFloatSingle::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "nullable-float-double", Attributes::NullableFloatDouble::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "nullable-octet-string", Attributes::NullableOctetString::Id, credsIssuerConfig),     //
+        make_unique<SubscribeAttribute>(Id, "nullable-char-string", Attributes::NullableCharString::Id, credsIssuerConfig),       //
+        make_unique<SubscribeAttribute>(Id, "nullable-enum-attr", Attributes::NullableEnumAttr::Id, credsIssuerConfig),           //
+        make_unique<SubscribeAttribute>(Id, "nullable-struct", Attributes::NullableStruct::Id, credsIssuerConfig),                //
+        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int8u", Attributes::NullableRangeRestrictedInt8u::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage", Attributes::RmsExtremeUnderVoltage::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag", Attributes::RmsVoltageSag::Id, credsIssuerConfig),              //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell", Attributes::RmsVoltageSwell::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "line-current-phase-b", Attributes::LineCurrentPhaseB::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "active-current-phase-b", Attributes::ActiveCurrentPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "reactive-current-phase-b", Attributes::ReactiveCurrentPhaseB::Id,
-                                        credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-phase-b", Attributes::RmsVoltagePhaseB::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-min-phase-b", Attributes::RmsVoltageMinPhaseB::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-max-phase-b", Attributes::RmsVoltageMaxPhaseB::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rms-current-phase-b", Attributes::RmsCurrentPhaseB::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-current-min-phase-b", Attributes::RmsCurrentMinPhaseB::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rms-current-max-phase-b", Attributes::RmsCurrentMaxPhaseB::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "active-power-phase-b", Attributes::ActivePowerPhaseB::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "active-power-min-phase-b", Attributes::ActivePowerMinPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-power-max-phase-b", Attributes::ActivePowerMaxPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "reactive-power-phase-b", Attributes::ReactivePowerPhaseB::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "apparent-power-phase-b", Attributes::ApparentPowerPhaseB::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "power-factor-phase-b", Attributes::PowerFactorPhaseB::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "average-rms-voltage-measurement-period-phase-b",
-                                        Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-over-voltage-counter-phase-b",
-                                        Attributes::AverageRmsOverVoltageCounterPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage-counter-phase-b",
-                                        Attributes::AverageRmsUnderVoltageCounterPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage-period-phase-b",
-                                        Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage-period-phase-b",
-                                        Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag-period-phase-b", Attributes::RmsVoltageSagPeriodPhaseB::Id,
+        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int8s", Attributes::NullableRangeRestrictedInt8s::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell-period-phase-b", Attributes::RmsVoltageSwellPeriodPhaseB::Id,
-                                        credsIssuerConfig),                                                                    //
-        make_unique<SubscribeAttribute>(Id, "line-current-phase-c", Attributes::LineCurrentPhaseC::Id, credsIssuerConfig),     //
-        make_unique<SubscribeAttribute>(Id, "active-current-phase-c", Attributes::ActiveCurrentPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "reactive-current-phase-c", Attributes::ReactiveCurrentPhaseC::Id,
-                                        credsIssuerConfig),                                                                       //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-phase-c", Attributes::RmsVoltagePhaseC::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-min-phase-c", Attributes::RmsVoltageMinPhaseC::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-max-phase-c", Attributes::RmsVoltageMaxPhaseC::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rms-current-phase-c", Attributes::RmsCurrentPhaseC::Id, credsIssuerConfig),          //
-        make_unique<SubscribeAttribute>(Id, "rms-current-min-phase-c", Attributes::RmsCurrentMinPhaseC::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "rms-current-max-phase-c", Attributes::RmsCurrentMaxPhaseC::Id, credsIssuerConfig),   //
-        make_unique<SubscribeAttribute>(Id, "active-power-phase-c", Attributes::ActivePowerPhaseC::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "active-power-min-phase-c", Attributes::ActivePowerMinPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "active-power-max-phase-c", Attributes::ActivePowerMaxPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "reactive-power-phase-c", Attributes::ReactivePowerPhaseC::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "apparent-power-phase-c", Attributes::ApparentPowerPhaseC::Id, credsIssuerConfig),    //
-        make_unique<SubscribeAttribute>(Id, "power-factor-phase-c", Attributes::PowerFactorPhaseC::Id, credsIssuerConfig),        //
-        make_unique<SubscribeAttribute>(Id, "average-rms-voltage-measurement-period-phase-c",
-                                        Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-over-voltage-counter-phase-c",
-                                        Attributes::AverageRmsOverVoltageCounterPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "average-rms-under-voltage-counter-phase-c",
-                                        Attributes::AverageRmsUnderVoltageCounterPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-over-voltage-period-phase-c",
-                                        Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-extreme-under-voltage-period-phase-c",
-                                        Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id, credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-sag-period-phase-c", Attributes::RmsVoltageSagPeriodPhaseC::Id,
+        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int16u", Attributes::NullableRangeRestrictedInt16u::Id,
                                         credsIssuerConfig), //
-        make_unique<SubscribeAttribute>(Id, "rms-voltage-swell-period-phase-c", Attributes::RmsVoltageSwellPeriodPhaseC::Id,
+        make_unique<SubscribeAttribute>(Id, "nullable-range-restricted-int16s", Attributes::NullableRangeRestrictedInt16s::Id,
                                         credsIssuerConfig),                                                                     //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
@@ -26516,8 +25042,12 @@ void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerC
         //
         // Events
         //
-        make_unique<ReadEvent>(Id, credsIssuerConfig),      //
-        make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
+        make_unique<ReadEvent>(Id, credsIssuerConfig),                                                                     //
+        make_unique<ReadEvent>(Id, "test-event", Events::TestEvent::Id, credsIssuerConfig),                                //
+        make_unique<ReadEvent>(Id, "test-fabric-scoped-event", Events::TestFabricScopedEvent::Id, credsIssuerConfig),      //
+        make_unique<SubscribeEvent>(Id, credsIssuerConfig),                                                                //
+        make_unique<SubscribeEvent>(Id, "test-event", Events::TestEvent::Id, credsIssuerConfig),                           //
+        make_unique<SubscribeEvent>(Id, "test-fabric-scoped-event", Events::TestFabricScopedEvent::Id, credsIssuerConfig), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -26637,9 +25167,6 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue
     registerClusterChlorodibromomethaneConcentrationMeasurement(commands, credsIssuerConfig);
     registerClusterChloroformConcentrationMeasurement(commands, credsIssuerConfig);
     registerClusterSodiumConcentrationMeasurement(commands, credsIssuerConfig);
-    registerClusterIasZone(commands, credsIssuerConfig);
-    registerClusterIasAce(commands, credsIssuerConfig);
-    registerClusterIasWd(commands, credsIssuerConfig);
     registerClusterWakeOnLan(commands, credsIssuerConfig);
     registerClusterChannel(commands, credsIssuerConfig);
     registerClusterTargetNavigator(commands, credsIssuerConfig);
@@ -26652,12 +25179,12 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue
     registerClusterApplicationLauncher(commands, credsIssuerConfig);
     registerClusterApplicationBasic(commands, credsIssuerConfig);
     registerClusterAccountLogin(commands, credsIssuerConfig);
-    registerClusterTestCluster(commands, credsIssuerConfig);
     registerClusterMessaging(commands, credsIssuerConfig);
     registerClusterApplianceIdentification(commands, credsIssuerConfig);
     registerClusterMeterIdentification(commands, credsIssuerConfig);
     registerClusterApplianceEventsAndAlert(commands, credsIssuerConfig);
     registerClusterApplianceStatistics(commands, credsIssuerConfig);
     registerClusterElectricalMeasurement(commands, credsIssuerConfig);
+    registerClusterTestCluster(commands, credsIssuerConfig);
     registerClusterSubscriptions(commands, credsIssuerConfig);
 }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index b24c809a4a5c3d..7a45aad94a559e 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -831,32 +831,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::GroupKeyManagement::St
     ComplexArgumentParser::Finalize(request.epochKey2);
     ComplexArgumentParser::Finalize(request.epochStartTime2);
 }
-CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::IasAce::Structs::IasAceZoneStatusResult::Type & request,
-                                        Json::Value & value)
-{
-    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
-
-    ReturnErrorOnFailure(
-        ComplexArgumentParser::EnsureMemberExist("IasAceZoneStatusResult.zoneId", "zoneId", value.isMember("zoneId")));
-    ReturnErrorOnFailure(
-        ComplexArgumentParser::EnsureMemberExist("IasAceZoneStatusResult.zoneStatus", "zoneStatus", value.isMember("zoneStatus")));
-
-    char labelWithMember[kMaxLabelLength];
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "zoneId");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.zoneId, value["zoneId"]));
-
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "zoneStatus");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.zoneStatus, value["zoneStatus"]));
-
-    return CHIP_NO_ERROR;
-}
-
-void ComplexArgumentParser::Finalize(chip::app::Clusters::IasAce::Structs::IasAceZoneStatusResult::Type & request)
-{
-    ComplexArgumentParser::Finalize(request.zoneId);
-    ComplexArgumentParser::Finalize(request.zoneStatus);
-}
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::MediaInput::Structs::InputInfo::Type & request,
                                         Json::Value & value)
 {
@@ -2063,24 +2037,24 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
     ReturnErrorOnFailure(
-        ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.fabricIndex", "fabricIndex", value.isMember("fabricIndex")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.operationalCert", "operationalCert",
-                                                                  value.isMember("operationalCert")));
+        ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.member1", "member1", value.isMember("member1")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.member2", "member2", value.isMember("member2")));
 
     char labelWithMember[kMaxLabelLength];
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"]));
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "member1");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.member1, value["member1"]));
 
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "operationalCert");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.operationalCert, value["operationalCert"]));
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "member2");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.member2, value["member2"]));
 
     return CHIP_NO_ERROR;
 }
 
 void ComplexArgumentParser::Finalize(chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type & request)
 {
-    ComplexArgumentParser::Finalize(request.fabricIndex);
-    ComplexArgumentParser::Finalize(request.operationalCert);
+    ComplexArgumentParser::Finalize(request.member1);
+    ComplexArgumentParser::Finalize(request.member2);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
                                         chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type & request,
@@ -2183,29 +2157,34 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
     ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadMetrics.id", "id", value.isMember("id")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadMetrics.name", "name", value.isMember("name")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadMetrics.stackFreeCurrent", "stackFreeCurrent",
-                                                                  value.isMember("stackFreeCurrent")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThreadMetrics.stackFreeMinimum", "stackFreeMinimum",
-                                                                  value.isMember("stackFreeMinimum")));
-    ReturnErrorOnFailure(
-        ComplexArgumentParser::EnsureMemberExist("ThreadMetrics.stackSize", "stackSize", value.isMember("stackSize")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "id");
     ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.id, value["id"]));
 
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"]));
+    if (value.isMember("name"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"]));
+    }
 
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "stackFreeCurrent");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.stackFreeCurrent, value["stackFreeCurrent"]));
+    if (value.isMember("stackFreeCurrent"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "stackFreeCurrent");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.stackFreeCurrent, value["stackFreeCurrent"]));
+    }
 
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "stackFreeMinimum");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.stackFreeMinimum, value["stackFreeMinimum"]));
+    if (value.isMember("stackFreeMinimum"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "stackFreeMinimum");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.stackFreeMinimum, value["stackFreeMinimum"]));
+    }
 
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "stackSize");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.stackSize, value["stackSize"]));
+    if (value.isMember("stackSize"))
+    {
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "stackSize");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.stackSize, value["stackSize"]));
+    }
 
     return CHIP_NO_ERROR;
 }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 643a3a013d1eac..326862a91f05b4 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -119,10 +119,6 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::GroupKeyManagem
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::IasAce::Structs::IasAceZoneStatusResult::Type & request,
-                        Json::Value & value);
-
-static void Finalize(chip::app::Clusters::IasAce::Structs::IasAceZoneStatusResult::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::MediaInput::Structs::InputInfo::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 130c71a49aacd5..753614018dae70 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -845,30 +845,6 @@ 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::IasAce::Structs::IasAceZoneStatusResult::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    {
-        CHIP_ERROR err = LogValue("ZoneId", indent + 1, value.zoneId);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ZoneId'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("ZoneStatus", indent + 1, value.zoneStatus);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ZoneStatus'");
-            return err;
-        }
-    }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType & value)
 {
@@ -2203,18 +2179,18 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex);
+        CHIP_ERROR err = LogValue("Member1", indent + 1, value.member1);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member1'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("OperationalCert", indent + 1, value.operationalCert);
+        CHIP_ERROR err = LogValue("Member2", indent + 1, value.member2);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OperationalCert'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member2'");
             return err;
         }
     }
@@ -3665,40 +3641,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetLogRecordResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("logEntryId", indent + 1, value.logEntryId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("timestamp", indent + 1, value.timestamp));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("eventType", indent + 1, value.eventType));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("source", indent + 1, value.source));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("eventIdOrAlarmCode", indent + 1, value.eventIdOrAlarmCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("pin", indent + 1, value.pin));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetPINCodeResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("pin", indent + 1, value.pin));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetUserStatusResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value)
 {
@@ -3738,26 +3680,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetUserTypeResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetRFIDCodeResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("rfidCode", indent + 1, value.rfidCode));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const DoorLock::Commands::GetUserResponse::DecodableType & value)
 {
@@ -3775,34 +3697,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::OperatingEventNotification::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("operationEventSource", indent + 1, value.operationEventSource));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("operationEventCode", indent + 1, value.operationEventCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("pin", indent + 1, value.pin));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localTime", indent + 1, value.localTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::ProgrammingEventNotification::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("programEventSource", indent + 1, value.programEventSource));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("programEventCode", indent + 1, value.programEventCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userId", indent + 1, value.userId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("pin", indent + 1, value.pin));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localTime", indent + 1, value.localTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const DoorLock::Commands::SetCredentialResponse::DecodableType & value)
 {
@@ -4293,19 +4187,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("timeOfDay", indent + 1, value.timeOfDay));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("relayStatus", indent + 1, value.relayStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localTemperature", indent + 1, value.localTemperature));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("humidityInPercentage", indent + 1, value.humidityInPercentage));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("setpoint", indent + 1, value.setpoint));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("unreadEntries", indent + 1, value.unreadEntries));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
 
 CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data)
 {
@@ -5613,11 +5494,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OpenPeriod", 1, value);
         }
-        case DoorLock::Attributes::NumberOfLogRecordsSupported::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfLogRecordsSupported", 1, value);
-        }
         case DoorLock::Attributes::NumberOfTotalUsersSupported::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -5669,7 +5545,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("MinRFIDCodeLength", 1, value);
         }
         case DoorLock::Attributes::CredentialRulesSupport::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value;
+            chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("CredentialRulesSupport", 1, value);
         }
@@ -5678,11 +5554,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("NumberOfCredentialsSupportedPerUser", 1, value);
         }
-        case DoorLock::Attributes::EnableLogging::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnableLogging", 1, value);
-        }
         case DoorLock::Attributes::Language::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -5709,12 +5580,12 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("OperatingMode", 1, value);
         }
         case DoorLock::Attributes::SupportedOperatingModes::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value;
+            chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SupportedOperatingModes", 1, value);
         }
         case DoorLock::Attributes::DefaultConfigurationRegister::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value;
+            chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DefaultConfigurationRegister", 1, value);
         }
@@ -5739,7 +5610,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("EnablePrivacyModeButton", 1, value);
         }
         case DoorLock::Attributes::LocalProgrammingFeatures::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value;
+            chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LocalProgrammingFeatures", 1, value);
         }
@@ -5768,46 +5639,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ExpiringUserTimeout", 1, value);
         }
-        case DoorLock::Attributes::AlarmMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlAlarmMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AlarmMask", 1, value);
-        }
-        case DoorLock::Attributes::KeypadOperationEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("KeypadOperationEventMask", 1, value);
-        }
-        case DoorLock::Attributes::RemoteOperationEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteOperationEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemoteOperationEventMask", 1, value);
-        }
-        case DoorLock::Attributes::ManualOperationEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlManualOperationEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ManualOperationEventMask", 1, value);
-        }
-        case DoorLock::Attributes::RFIDOperationEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDOperationEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RFIDOperationEventMask", 1, value);
-        }
-        case DoorLock::Attributes::KeypadProgrammingEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlKeypadOperationEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("KeypadProgrammingEventMask", 1, value);
-        }
-        case DoorLock::Attributes::RemoteProgrammingEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlRemoteProgrammingEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemoteProgrammingEventMask", 1, value);
-        }
-        case DoorLock::Attributes::RFIDProgrammingEventMask::Id: {
-            chip::BitFlags<chip::app::Clusters::DoorLock::DlRFIDProgrammingEventMask> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RFIDProgrammingEventMask", 1, value);
-        }
         case DoorLock::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -6857,6 +6688,11 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
         }
+        case GeneralDiagnostics::Attributes::TestEventTriggersEnabled::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TestEventTriggersEnabled", 1, value);
+        }
         case GeneralDiagnostics::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -8218,7 +8054,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("MaxConstTemp", 1, value);
         }
         case PumpConfigurationAndControl::Attributes::PumpStatus::Id: {
-            chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
+            chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PumpStatus", 1, value);
         }
@@ -8606,22 +8442,22 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("boolean", 1, value);
         }
         case TestCluster::Attributes::Bitmap8::Id: {
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("bitmap8", 1, value);
         }
         case TestCluster::Attributes::Bitmap16::Id: {
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("bitmap16", 1, value);
         }
         case TestCluster::Attributes::Bitmap32::Id: {
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("bitmap32", 1, value);
         }
         case TestCluster::Attributes::Bitmap64::Id: {
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("bitmap64", 1, value);
         }
@@ -8849,22 +8685,22 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("nullable_boolean", 1, value);
         }
         case TestCluster::Attributes::NullableBitmap8::Id: {
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("nullable_bitmap8", 1, value);
         }
         case TestCluster::Attributes::NullableBitmap16::Id: {
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("nullable_bitmap16", 1, value);
         }
         case TestCluster::Attributes::NullableBitmap32::Id: {
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("nullable_bitmap32", 1, value);
         }
         case TestCluster::Attributes::NullableBitmap64::Id: {
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("nullable_bitmap64", 1, value);
         }
@@ -9154,11 +8990,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SystemMode", 1, value);
         }
-        case Thermostat::Attributes::AlarmMask::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AlarmMask", 1, value);
-        }
         case Thermostat::Attributes::ThermostatRunningMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -9372,7 +9203,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("channel", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("RoutingRole", 1, value);
         }
@@ -9415,27 +9246,27 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("RouteTableList", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::PartitionId::Id: {
-            uint32_t value;
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PartitionId", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::Weighting::Id: {
-            uint8_t value;
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("weighting", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::DataVersion::Id: {
-            uint8_t value;
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DataVersion", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id: {
-            uint8_t value;
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("StableDataVersion", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id: {
-            uint8_t value;
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LeaderRouterId", 1, value);
         }
@@ -9650,34 +9481,33 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("RxErrOtherCount", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id: {
-            uint64_t value;
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ActiveTimestamp", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id: {
-            uint64_t value;
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PendingTimestamp", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::Delay::Id: {
-            uint32_t value;
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("delay", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SecurityPolicy", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id: {
-            chip::ByteSpan value;
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ChannelMask", 1, value);
         }
         case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: {
-            chip::app::DataModel::DecodableList<
+            chip::app::DataModel::Nullable<
                 chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>
                 value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -10005,7 +9835,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("NumberOfActuationsTilt", 1, value);
         }
         case WindowCovering::Attributes::ConfigStatus::Id: {
-            chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+            chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ConfigStatus", 1, value);
         }
@@ -10070,7 +9900,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("InstalledClosedLimitTilt", 1, value);
         }
         case WindowCovering::Attributes::Mode::Id: {
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Mode", 1, value);
         }
@@ -10179,21 +10009,6 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
     case DoorLock::Id: {
         switch (path.mCommandId)
         {
-        case DoorLock::Commands::GetLogRecordResponse::Id: {
-            DoorLock::Commands::GetLogRecordResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetLogRecordResponse", 1, value);
-        }
-        case DoorLock::Commands::GetPINCodeResponse::Id: {
-            DoorLock::Commands::GetPINCodeResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetPINCodeResponse", 1, value);
-        }
-        case DoorLock::Commands::GetUserStatusResponse::Id: {
-            DoorLock::Commands::GetUserStatusResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetUserStatusResponse", 1, value);
-        }
         case DoorLock::Commands::GetWeekDayScheduleResponse::Id: {
             DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -10209,31 +10024,11 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GetHolidayScheduleResponse", 1, value);
         }
-        case DoorLock::Commands::GetUserTypeResponse::Id: {
-            DoorLock::Commands::GetUserTypeResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetUserTypeResponse", 1, value);
-        }
-        case DoorLock::Commands::GetRFIDCodeResponse::Id: {
-            DoorLock::Commands::GetRFIDCodeResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetRFIDCodeResponse", 1, value);
-        }
         case DoorLock::Commands::GetUserResponse::Id: {
             DoorLock::Commands::GetUserResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GetUserResponse", 1, value);
         }
-        case DoorLock::Commands::OperatingEventNotification::Id: {
-            DoorLock::Commands::OperatingEventNotification::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperatingEventNotification", 1, value);
-        }
-        case DoorLock::Commands::ProgrammingEventNotification::Id: {
-            DoorLock::Commands::ProgrammingEventNotification::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProgrammingEventNotification", 1, value);
-        }
         case DoorLock::Commands::SetCredentialResponse::Id: {
             DoorLock::Commands::SetCredentialResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -10547,11 +10342,6 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GetWeeklyScheduleResponse", 1, value);
         }
-        case Thermostat::Commands::GetRelayStatusLogResponse::Id: {
-            Thermostat::Commands::GetRelayStatusLogResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetRelayStatusLogResponse", 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 bfd45f3c7ec56e..2f4fbcbc175a24 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -68,8 +68,6 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType & value);
 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::IasAce::Structs::IasAceZoneStatusResult::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -276,28 +274,14 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetUserStatusResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::OperatingEventNotification::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::ProgrammingEventNotification::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -404,5 +388,3 @@ LogValue(const char * label, size_t indent,
          const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & value);
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index bff137ed1a47f9..d641bfcb2ed17c 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -64,17 +64,14 @@ class TestList : public Command
         printf("Test_TC_CC_9_1\n");
         printf("Test_TC_CC_9_2\n");
         printf("Test_TC_CC_9_3\n");
-        printf("Test_TC_DM_1_1\n");
-        printf("Test_TC_DM_3_1\n");
-        printf("Test_TC_DM_2_2\n");
+        printf("Test_TC_DM_2_1\n");
         printf("Test_TC_EMR_1_1\n");
-        printf("Test_TC_ETHDIAG_1_1\n");
-        printf("Test_TC_ETHDIAG_2_1\n");
+        printf("Test_TC_DGETH_2_1\n");
+        printf("Test_TC_DGETH_2_2\n");
         printf("Test_TC_FLW_1_1\n");
         printf("Test_TC_FLW_2_1\n");
-        printf("Test_TC_FLW_2_2\n");
-        printf("Test_TC_GC_1_1\n");
-        printf("Test_TC_GC_2_1\n");
+        printf("Test_TC_CGEN_1_1\n");
+        printf("Test_TC_CGEN_2_1\n");
         printf("Test_TC_I_1_1\n");
         printf("Test_TC_I_2_1\n");
         printf("Test_TC_I_2_3\n");
@@ -100,7 +97,6 @@ class TestList : public Command
         printf("Test_TC_MC_1_11\n");
         printf("Test_TC_MC_1_12\n");
         printf("Test_TC_MC_2_1\n");
-        printf("Test_TC_MC_3_1\n");
         printf("Test_TC_MC_3_2\n");
         printf("Test_TC_MC_3_3\n");
         printf("Test_TC_MC_3_4\n");
@@ -126,6 +122,8 @@ class TestList : public Command
         printf("Test_TC_MF_1_4\n");
         printf("Test_TC_MF_1_5\n");
         printf("Test_TC_MF_1_6\n");
+        printf("Test_TC_MF_1_9\n");
+        printf("Test_TC_MF_1_10\n");
         printf("Test_TC_MF_1_15\n");
         printf("OTA_SuccessfulTransfer\n");
         printf("Test_TC_OCC_1_1\n");
@@ -147,13 +145,10 @@ class TestList : public Command
         printf("Test_TC_PSCFG_1_1\n");
         printf("Test_TC_RH_1_1\n");
         printf("Test_TC_RH_2_1\n");
-        printf("Test_TC_RH_2_2\n");
         printf("Test_TC_SC_4_2\n");
         printf("Test_TC_SWTCH_2_1\n");
-        printf("Test_TC_SWTCH_2_2\n");
         printf("Test_TC_TM_1_1\n");
         printf("Test_TC_TM_2_1\n");
-        printf("Test_TC_TM_2_2\n");
         printf("Test_TC_TSTAT_1_1\n");
         printf("Test_TC_TSTAT_2_1\n");
         printf("Test_TC_TSTAT_2_2\n");
@@ -166,8 +161,8 @@ class TestList : public Command
         printf("Test_TC_DIAG_TH_NW_2_3\n");
         printf("Test_TC_ULABEL_1_1\n");
         printf("Test_TC_ULABEL_2_2\n");
-        printf("Test_TC_WIFIDIAG_1_1\n");
-        printf("Test_TC_WIFIDIAG_3_1\n");
+        printf("Test_TC_DGWIFI_2_1\n");
+        printf("Test_TC_DGWIFI_2_3\n");
         printf("Test_TC_WNCV_1_1\n");
         printf("Test_TC_WNCV_2_1\n");
         printf("Test_TC_WNCV_2_2\n");
@@ -228,8 +223,9 @@ class TestList : public Command
         printf("Test_TC_DL_2_2\n");
         printf("Test_TC_DL_2_3\n");
         printf("Test_TC_DL_2_4\n");
-        printf("Test_TC_DL_2_8\n");
-        printf("Test_TC_DL_2_11\n");
+        printf("Test_TC_DL_2_5\n");
+        printf("Test_TC_DL_2_7\n");
+        printf("Test_TC_DL_2_9\n");
         printf("TestGroupMessaging\n");
         printf("TestGroupsCluster\n");
         printf("TestGroupKeyManagementCluster\n");
@@ -252,6 +248,9 @@ class ManualTestList : public Command
         printf("Test_TC_DD_1_10\n");
         printf("Test_TC_DD_1_11\n");
         printf("Test_TC_DD_1_12\n");
+        printf("Test_TC_DD_1_13\n");
+        printf("Test_TC_DD_1_14\n");
+        printf("Test_TC_DD_1_15\n");
         printf("Test_TC_DD_2_1\n");
         printf("Test_TC_DD_2_2\n");
         printf("Test_TC_DD_3_1\n");
@@ -268,20 +267,24 @@ class ManualTestList : public Command
         printf("Test_TC_DD_3_12\n");
         printf("Test_TC_DD_3_13\n");
         printf("Test_TC_DD_3_14\n");
-        printf("Test_TC_DD_4_1\n");
+        printf("Test_TC_DD_3_15\n");
+        printf("Test_TC_DD_3_16\n");
+        printf("Test_TC_DD_3_17\n");
+        printf("Test_TC_DD_3_18\n");
+        printf("Test_TC_DD_3_19\n");
+        printf("Test_TC_DD_3_20\n");
         printf("TestGroupDemoCommand\n");
         printf("TestGroupDemoConfig\n");
-        printf("Test_TC_BDX_1_1\n");
+        printf("Test_TC_GR_1_1\n");
+        printf("Test_TC_GR_2_1\n");
+        printf("Test_TC_GR_2_2\n");
+        printf("Test_TC_GR_2_3\n");
+        printf("Test_TC_GR_3_1\n");
+        printf("Test_TC_GR_3_2\n");
         printf("Test_TC_BDX_1_2\n");
-        printf("Test_TC_BDX_1_3\n");
         printf("Test_TC_BDX_1_4\n");
-        printf("Test_TC_BDX_1_5\n");
-        printf("Test_TC_BDX_1_6\n");
         printf("Test_TC_BDX_2_1\n");
         printf("Test_TC_BDX_2_2\n");
-        printf("Test_TC_BDX_2_3\n");
-        printf("Test_TC_BDX_2_4\n");
-        printf("Test_TC_BDX_2_5\n");
         printf("Test_TC_BR_1\n");
         printf("Test_TC_BR_2\n");
         printf("Test_TC_BR_3\n");
@@ -289,11 +292,14 @@ class ManualTestList : public Command
         printf("Test_TC_BRAC_2_2\n");
         printf("Test_TC_BRAC_3_1\n");
         printf("Test_TC_DA_1_3\n");
+        printf("Test_TC_DM_1_1\n");
         printf("Test_TC_DM_1_2\n");
-        printf("Test_TC_DM_1_4\n");
-        printf("Test_TC_DM_2_1\n");
+        printf("Test_TC_DM_1_3\n");
+        printf("Test_TC_DM_2_2\n");
         printf("Test_TC_DM_2_4\n");
+        printf("Test_TC_DM_3_1\n");
         printf("Test_TC_DM_3_2\n");
+        printf("Test_TC_DM_3_3\n");
         printf("Test_TC_DM_3_4\n");
         printf("Test_TC_DM_4_1\n");
         printf("Test_TC_DM_4_2\n");
@@ -316,14 +322,19 @@ class ManualTestList : public Command
         printf("Test_TC_DM_4_19\n");
         printf("Test_TC_DM_4_20\n");
         printf("Test_TC_DM_4_21\n");
-        printf("Test_TC_Diag_Log_2_1\n");
-        printf("Test_TC_Diag_Log_2_2\n");
-        printf("Test_TC_Diag_Log_2_3\n");
+        printf("Test_TC_DLOG_1_1\n");
+        printf("Test_TC_DLOG_2_1\n");
+        printf("Test_TC_DLOG_2_2\n");
+        printf("Test_TC_DLOG_3_1\n");
         printf("Test_TC_DESC_1_1\n");
-        printf("Test_TC_ETHDIAG_1_2\n");
-        printf("Test_TC_GC_2_2\n");
-        printf("Test_TC_GC_2_3\n");
-        printf("Test_TC_GC_2_4\n");
+        printf("Test_TC_DESC_2_1\n");
+        printf("Test_TC_DESC_2_2\n");
+        printf("Test_TC_DGETH_1_1\n");
+        printf("Test_TC_DGETH_3_1\n");
+        printf("Test_TC_DGETH_3_2\n");
+        printf("Test_TC_CGEN_2_2\n");
+        printf("Test_TC_CGEN_2_3\n");
+        printf("Test_TC_CGEN_2_4\n");
         printf("Test_TC_GENDIAG_1_1\n");
         printf("Test_TC_GENDIAG_1_2\n");
         printf("Test_TC_GENDIAG_2_1\n");
@@ -340,6 +351,7 @@ class ManualTestList : public Command
         printf("Test_TC_IDM_3_2\n");
         printf("Test_TC_IDM_4_1\n");
         printf("Test_TC_IDM_4_2\n");
+        printf("Test_TC_IDM_4_3\n");
         printf("Test_TC_IDM_5_1\n");
         printf("Test_TC_IDM_5_2\n");
         printf("Test_TC_IDM_6_1\n");
@@ -348,25 +360,36 @@ class ManualTestList : public Command
         printf("Test_TC_IDM_6_4\n");
         printf("Test_TC_IDM_7_1\n");
         printf("Test_TC_MC_2_2\n");
+        printf("Test_TC_MC_3_7_1\n");
+        printf("Test_TC_MC_3_8_1\n");
+        printf("Test_TC_MC_3_9_1\n");
+        printf("Test_TC_MC_3_14\n");
+        printf("Test_TC_MC_3_15\n");
+        printf("Test_TC_MC_3_16\n");
+        printf("Test_TC_MC_3_17\n");
         printf("Test_TC_MC_4_1\n");
+        printf("Test_TC_MC_5_4\n");
+        printf("Test_TC_MC_5_5\n");
+        printf("Test_TC_MC_5_6\n");
         printf("Test_TC_MC_6_1\n");
         printf("Test_TC_MC_6_2\n");
         printf("Test_TC_MC_6_3\n");
         printf("Test_TC_MC_6_4\n");
-        printf("Test_TC_MC_8_2\n");
-        printf("Test_TC_MC_9_2\n");
-        printf("Test_TC_MC_10_2\n");
+        printf("Test_TC_MC_6_5\n");
+        printf("Test_TC_MC_6_7\n");
+        printf("Test_TC_MC_7_3\n");
+        printf("Test_TC_MC_7_4\n");
         printf("Test_TC_MC_10_3\n");
-        printf("Test_TC_MC_10_4\n");
         printf("Test_TC_MC_10_5\n");
-        printf("Test_TC_MC_10_6\n");
         printf("Test_TC_MC_10_7\n");
+        printf("Test_TC_MC_11_1\n");
+        printf("Test_TC_MC_11_2\n");
+        printf("Test_TC_MC_12_1\n");
+        printf("Test_TC_MC_12_2\n");
         printf("Test_TC_MF_1_1\n");
         printf("Test_TC_MF_1_2\n");
         printf("Test_TC_MF_1_7\n");
         printf("Test_TC_MF_1_8\n");
-        printf("Test_TC_MF_1_9\n");
-        printf("Test_TC_MF_1_10\n");
         printf("Test_TC_MF_1_11\n");
         printf("Test_TC_MF_1_12\n");
         printf("Test_TC_MF_1_13\n");
@@ -399,6 +422,7 @@ class ManualTestList : public Command
         printf("Test_TC_SU_2_5\n");
         printf("Test_TC_SU_2_6\n");
         printf("Test_TC_SU_2_7\n");
+        printf("Test_TC_SU_2_8\n");
         printf("Test_TC_SU_3_1\n");
         printf("Test_TC_SU_3_2\n");
         printf("Test_TC_SU_3_3\n");
@@ -418,10 +442,13 @@ class ManualTestList : public Command
         printf("Test_TC_SC_4_9\n");
         printf("Test_TC_SC_4_10\n");
         printf("Test_TC_SWDIAG_1_2\n");
-        printf("Test_TC_WIFIDIAG_1_2\n");
-        printf("Test_TC_WIFIDIAG_2_1\n");
+        printf("Test_TC_DGWIFI_1_1\n");
+        printf("Test_TC_DGWIFI_2_2\n");
+        printf("Test_TC_DGWIFI_3_1\n");
+        printf("Test_TC_DGWIFI_3_2\n");
         printf("Test_TC_WNCV_6_1\n");
         printf("Test_TC_WNCV_7_1\n");
+        printf("Test_TC_FLW_2_2\n");
         printf("Test_TC_FLW_3_1\n");
         printf("Test_TC_OCC_2_2\n");
         printf("Test_TC_OCC_2_3\n");
@@ -442,44 +469,27 @@ class ManualTestList : public Command
         printf("Test_TC_CC_6_4\n");
         printf("Test_TC_CC_7_5\n");
         printf("Test_TC_CC_9_4\n");
+        printf("Test_TC_DL_1_1\n");
         printf("Test_TC_DL_2_1\n");
-        printf("Test_TC_DL_2_5\n");
         printf("Test_TC_DL_2_6\n");
-        printf("Test_TC_DL_2_7\n");
+        printf("Test_TC_DL_2_8\n");
         printf("Test_TC_DL_2_10\n");
-        printf("Test_TC_DL_2_13\n");
-        printf("Test_TC_DL_2_14\n");
-        printf("Test_TC_DL_2_15\n");
-        printf("Test_TC_DL_2_16\n");
-        printf("Test_TC_DL_2_17\n");
         printf("Test_TC_LC_2_3\n");
         printf("Test_TC_LC_2_4\n");
         printf("Test_TC_LC_2_5\n");
-        printf("Test_TC_LO_1_1\n");
+        printf("Test_TC_LCFG_1_1\n");
+        printf("Test_TC_LCFG_2_1\n");
+        printf("Test_TC_LCFG_3_1\n");
         printf("Test_TC_LVL_2_3\n");
-        printf("Test_TC_NC_1_1\n");
-        printf("Test_TC_NC_1_2\n");
-        printf("Test_TC_NC_1_3\n");
-        printf("Test_TC_NC_1_4\n");
-        printf("Test_TC_NC_1_5\n");
-        printf("Test_TC_NC_1_6\n");
-        printf("Test_TC_NC_1_7\n");
-        printf("Test_TC_NC_1_8\n");
-        printf("Test_TC_NC_1_9\n");
-        printf("Test_TC_NC_1_10\n");
-        printf("Test_TC_NC_1_11\n");
-        printf("Test_TC_NC_1_12\n");
-        printf("Test_TC_NC_1_13\n");
-        printf("Test_TC_NC_1_14\n");
-        printf("Test_TC_NC_1_15\n");
-        printf("Test_TC_NC_1_16\n");
-        printf("Test_TC_NC_1_17\n");
-        printf("Test_TC_NC_1_18\n");
+        printf("Test_TC_LVL_8_1\n");
         printf("Test_TC_OO_3_1\n");
         printf("Test_TC_OO_3_2\n");
+        printf("Test_TC_RH_2_2\n");
         printf("Test_TC_RH_3_1\n");
         printf("Test_TC_SWTCH_1_1\n");
+        printf("Test_TC_SWTCH_2_2\n");
         printf("Test_TC_SWTCH_3_1\n");
+        printf("Test_TC_TM_2_2\n");
         printf("Test_TC_TM_3_1\n");
         printf("Test_TC_TSTAT_3_1\n");
         printf("Test_TC_TSTAT_3_2\n");
@@ -488,6 +498,23 @@ class ManualTestList : public Command
         printf("Test_TC_DIAG_TH_NW_2_7\n");
         printf("Test_TC_DIAG_TH_NW_2_8\n");
         printf("Test_TC_DIAG_TH_NW_2_9\n");
+        printf("Test_TC_ACT_1_1\n");
+        printf("Test_TC_ACT_2_1\n");
+        printf("Test_TC_ACT_2_2\n");
+        printf("Test_TC_ACT_3_1\n");
+        printf("Test_TC_TFL_1_1\n");
+        printf("Test_TC_TFL_1_2\n");
+        printf("Test_TC_TFL_2_1\n");
+        printf("Test_TC_TFL_2_2\n");
+        printf("Test_TC_UL_1_1\n");
+        printf("Test_TC_UL_1_2\n");
+        printf("Test_TC_UL_2_1\n");
+        printf("Test_TC_UL_2_2\n");
+        printf("Test_TC_FLABEL_1_1\n");
+        printf("Test_TC_FLABEL_2_1\n");
+        printf("Test_TC_FLABEL_2_2\n");
+        printf("Test_TC_BIND_1_1\n");
+        printf("Test_TC_BIND_2_1\n");
 
         return CHIP_NO_ERROR;
     }
@@ -2524,7 +2551,7 @@ class Test_TC_BOOL_1_1Suite : public TestCommand
 class Test_TC_BOOL_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_BOOL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_2_1", 3, credsIssuerConfig)
+    Test_TC_BOOL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_2_1", 2, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -2567,13 +2594,6 @@ class Test_TC_BOOL_2_1Suite : public TestCommand
                 bool value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("stateValue", value, 0));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                bool value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "bool"));
             }
             break;
@@ -2604,11 +2624,6 @@ class Test_TC_BOOL_2_1Suite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BooleanState::Id, BooleanState::Attributes::StateValue::Id, true,
                                  chip::NullOptional);
         }
-        case 2: {
-            LogStep(2, "Read mandatory non-global attribute constraints: StateValue");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BooleanState::Id, BooleanState::Attributes::StateValue::Id, true,
-                                 chip::NullOptional);
-        }
         }
         return CHIP_NO_ERROR;
     }
@@ -10464,7 +10479,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10487,7 +10502,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10510,7 +10525,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(4);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(4);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 30U;
@@ -10533,7 +10548,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(8);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(8);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10556,7 +10571,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(1);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10591,7 +10606,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10626,7 +10641,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(1);
             value.time            = 0U;
@@ -10649,7 +10664,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(1);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10684,7 +10699,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10747,7 +10762,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10770,7 +10785,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(2);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10805,7 +10820,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10840,7 +10855,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(1);
             value.time            = 0U;
@@ -10863,7 +10878,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(2);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -10898,7 +10913,7 @@ class Test_TC_CC_9_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -11151,7 +11166,7 @@ class Test_TC_CC_9_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(15);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(15);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 30U;
@@ -11198,7 +11213,7 @@ class Test_TC_CC_9_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(1);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -11227,7 +11242,7 @@ class Test_TC_CC_9_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(2);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(1);
             value.time            = 0U;
@@ -11250,7 +11265,7 @@ class Test_TC_CC_9_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -11503,7 +11518,7 @@ class Test_TC_CC_9_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(15);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(15);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 30U;
@@ -11544,7 +11559,7 @@ class Test_TC_CC_9_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(1);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -11579,7 +11594,7 @@ class Test_TC_CC_9_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(4);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(4);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 60U;
@@ -11602,7 +11617,7 @@ class Test_TC_CC_9_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CR_COLORLOOPSET"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type value;
-            value.updateFlags     = static_cast<chip::BitFlags<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
+            value.updateFlags     = static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(1);
             value.action          = static_cast<chip::app::Clusters::ColorControl::ColorLoopAction>(0);
             value.direction       = static_cast<chip::app::Clusters::ColorControl::ColorLoopDirection>(0);
             value.time            = 0U;
@@ -11649,10 +11664,10 @@ class Test_TC_CC_9_3Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_1_1Suite : public TestCommand
+class Test_TC_DM_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_1", 20, credsIssuerConfig)
+    Test_TC_DM_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_1", 19, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -11660,7 +11675,7 @@ class Test_TC_DM_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_1_1Suite() {}
+    ~Test_TC_DM_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -11746,8 +11761,7 @@ class Test_TC_DM_1_1Suite : public TestCommand
                 chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "string"));
-                VerifyOrReturn(CheckConstraintFormat("value", "", "ISO 3166-1 alpha-2"));
-                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 2));
+                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 16));
             }
             break;
         case 8:
@@ -11770,22 +11784,11 @@ class Test_TC_DM_1_1Suite : public TestCommand
             break;
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint32_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
-            }
+            shouldContinue = true;
             break;
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::CharSpan value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "string"));
-                VerifyOrReturn(CheckConstraintFormat("value", "", "ASCII"));
-                VerifyOrReturn(CheckConstraintMinLength("value", value.size(), 1));
-                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 64));
-            }
+            shouldContinue = true;
             break;
         case 12:
             if (IsUnsupported(status.mStatus))
@@ -11797,39 +11800,14 @@ class Test_TC_DM_1_1Suite : public TestCommand
                 chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "string"));
-                VerifyOrReturn(CheckConstraintFormat("value", "", "ISO 8601"));
-                VerifyOrReturn(CheckConstraintMinLength("value", value.size(), 8));
-                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 16));
+                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 32));
             }
             break;
         case 13:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::CharSpan value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "string"));
-                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 32));
-            }
+            shouldContinue = true;
             break;
         case 14:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::CharSpan value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "string"));
-                VerifyOrReturn(CheckConstraintFormat("value", "", "RFC3986"));
-                VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 256));
-            }
-            break;
-        case 15:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -11842,7 +11820,7 @@ class Test_TC_DM_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 64));
             }
             break;
-        case 16:
+        case 15:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -11855,7 +11833,7 @@ class Test_TC_DM_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 32));
             }
             break;
-        case 17:
+        case 16:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -11867,7 +11845,7 @@ class Test_TC_DM_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "boolean"));
             }
             break;
-        case 18:
+        case 17:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -11879,7 +11857,7 @@ class Test_TC_DM_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "boolean"));
             }
             break;
-        case 19:
+        case 18:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -11960,54 +11938,63 @@ class Test_TC_DM_1_1Suite : public TestCommand
                                  chip::NullOptional);
         }
         case 10: {
-            LogStep(10, "Query SoftwareVersion");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersion::Id, true,
-                                 chip::NullOptional);
+            LogStep(10, "TH reads SoftwareVersionString from the DUT and Verify it is of type string and verify the format");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
         case 11: {
-            LogStep(11, "Query SoftwareVersionString");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersionString::Id, true,
-                                 chip::NullOptional);
+            LogStep(11, "TH reads ManufacturingDate from the DUT and Verify it is of type string and verify the format");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
         case 12: {
-            LogStep(12, "Query ManufacturingDate");
-            VerifyOrDo(!ShouldSkip("MANF_DATE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::ManufacturingDate::Id, true,
-                                 chip::NullOptional);
-        }
-        case 13: {
-            LogStep(13, "Query PartNumber");
+            LogStep(12, "Query PartNumber");
             VerifyOrDo(!ShouldSkip("PART_NUM"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::PartNumber::Id, true,
                                  chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "Query ProductURL");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::ProductURL::Id, true,
-                                 chip::NullOptional);
+        case 13: {
+            LogStep(13, "TH reads ProductURL from the DUT and Verify it is of type string and verify the format");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
-        case 15: {
-            LogStep(15, "Query ProductLabel");
+        case 14: {
+            LogStep(14, "Query ProductLabel");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::ProductLabel::Id, true,
                                  chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "Query SerialNumber");
+        case 15: {
+            LogStep(15, "Query SerialNumber");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::SerialNumber::Id, true,
                                  chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "Query LocalConfigDisabled");
+        case 16: {
+            LogStep(16, "Query LocalConfigDisabled");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::LocalConfigDisabled::Id, true,
                                  chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "Query Reachable");
+        case 17: {
+            LogStep(17, "Query Reachable");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::Reachable::Id, true,
                                  chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "Query UniqueID");
+        case 18: {
+            LogStep(18, "Query UniqueID");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::UniqueID::Id, true,
                                  chip::NullOptional);
         }
@@ -12016,112 +12003,10 @@ class Test_TC_DM_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_3_1Suite : public TestCommand
-{
-public:
-    Test_TC_DM_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_1", 3, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_DM_3_1Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
-            }
-            break;
-        case 2:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType>
-                    value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Query MaxNetworks");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), NetworkCommissioning::Id,
-                                 NetworkCommissioning::Attributes::MaxNetworks::Id, true, chip::NullOptional);
-        }
-        case 2: {
-            LogStep(2, "Query Networks");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), NetworkCommissioning::Id,
-                                 NetworkCommissioning::Attributes::Networks::Id, true, chip::NullOptional);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_DM_2_2Suite : public TestCommand
+class Test_TC_EMR_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_2", 5, credsIssuerConfig)
+    Test_TC_EMR_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_EMR_1_1", 6, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -12129,7 +12014,7 @@ class Test_TC_DM_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_2_2Suite() {}
+    ~Test_TC_EMR_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -12161,163 +12046,34 @@ class Test_TC_DM_2_2Suite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::DecodableList<
-                    chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType>
-                    value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("fabrics", iter_0, 0));
-                    VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0)));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("fabrics", iter_0, 1));
-                }
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
+                VerifyOrReturn(CheckValue("clusterRevision", value, 3U));
             }
             break;
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint8_t value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("supportedFabrics", value, 16));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
         case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            break;
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint8_t value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("commissionedFabrics", value, 1));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                VerifyOrReturn(CheckValue("clusterRevision", value, 3U));
             }
             break;
-        case 4:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::DecodableList<chip::ByteSpan> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Query fabrics list");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
-                                 OperationalCredentials::Attributes::Fabrics::Id, true, chip::NullOptional);
-        }
-        case 2: {
-            LogStep(2, "Query Supported Fabrics");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
-                                 OperationalCredentials::Attributes::SupportedFabrics::Id, true, chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Query Commissioned Fabrics");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
-                                 OperationalCredentials::Attributes::CommissionedFabrics::Id, true, chip::NullOptional);
-        }
-        case 4: {
-            LogStep(4, "Query User Trusted Root Certificates");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
-                                 OperationalCredentials::Attributes::TrustedRootCertificates::Id, true, chip::NullOptional);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_EMR_1_1Suite : public TestCommand
-{
-public:
-    Test_TC_EMR_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_EMR_1_1", 6, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_EMR_1_1Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("clusterRevision", value, 3U));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("clusterRevision", value, 3U));
-            }
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
+                chip::app::DataModel::DecodableList<chip::AttributeId> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
@@ -12378,11 +12134,10 @@ class Test_TC_EMR_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_ETHDIAG_1_1Suite : public TestCommand
+class Test_TC_DGETH_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_ETHDIAG_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_ETHDIAG_1_1", 10, credsIssuerConfig)
+    Test_TC_DGETH_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGETH_2_1", 17, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -12390,7 +12145,7 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_ETHDIAG_1_1Suite() {}
+    ~Test_TC_DGETH_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -12446,6 +12201,10 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
             }
             break;
         case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -12453,7 +12212,11 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
-        case 5:
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -12461,7 +12224,11 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
-        case 6:
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -12469,7 +12236,11 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
-        case 7:
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -12477,7 +12248,11 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
-        case 8:
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -12485,7 +12260,11 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "bool"));
             }
             break;
-        case 9:
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -12493,6 +12272,10 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -12531,45 +12314,122 @@ class Test_TC_ETHDIAG_1_1Suite : public TestCommand
                                  EthernetNetworkDiagnostics::Attributes::PacketRxCount::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Read PacketTxCount attribute constraints");
+            LogStep(4, "Read PacketRxCount value from DUT and verify the number of packets received on ethernet network interface");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "Read PacketTxCount attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), EthernetNetworkDiagnostics::Id,
                                  EthernetNetworkDiagnostics::Attributes::PacketTxCount::Id, true, chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "Read TxErrCount attribute constraints");
+        case 6: {
+            LogStep(6, "Read PacketTxCount value from DUT and verify the number of packets received on ethernet network interface");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
+        case 7: {
+            LogStep(7, "Read TxErrCount attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), EthernetNetworkDiagnostics::Id,
                                  EthernetNetworkDiagnostics::Attributes::TxErrCount::Id, true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Read CollisionCount attribute constraints");
+        case 8: {
+            LogStep(8,
+                    "Read TxErrCount value from DUT and verify value indicates the number of failed packet transmission on "
+                    "ethernet network interface");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
+        case 9: {
+            LogStep(9, "Read CollisionCount attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), EthernetNetworkDiagnostics::Id,
                                  EthernetNetworkDiagnostics::Attributes::CollisionCount::Id, true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "Read OverrunCount attribute constraints");
+        case 10: {
+            LogStep(10,
+                    "Read CollisionCount value from DUT and verify value indicates the number of collision occurred while "
+                    "transmitting packets on ethernet network interface");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
+        case 11: {
+            LogStep(11, "Read OverrunCount attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), EthernetNetworkDiagnostics::Id,
                                  EthernetNetworkDiagnostics::Attributes::OverrunCount::Id, true, chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "Read CarrierDetect attribute constraints");
+        case 12: {
+            LogStep(12,
+                    "Read OverrunCount value from DUT and verify value indicates the number of packets dropped due to lack of "
+                    "buffer memory on ethernet network interface");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
+        case 13: {
+            LogStep(13, "Read CarrierDetect attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), EthernetNetworkDiagnostics::Id,
                                  EthernetNetworkDiagnostics::Attributes::CarrierDetect::Id, true, chip::NullOptional);
         }
-        case 9: {
-            LogStep(9, "Read TimeSinceReset attribute constraints");
+        case 14: {
+            LogStep(14,
+                    "Read CarrierDetect value from DUT and verify value indicates the presence of carrier detect control signal on "
+                    "ethernet network interface");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
+        case 15: {
+            LogStep(15, "Read TimeSinceReset attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), EthernetNetworkDiagnostics::Id,
                                  EthernetNetworkDiagnostics::Attributes::TimeSinceReset::Id, true, chip::NullOptional);
         }
+        case 16: {
+            LogStep(16, "Read TimeSinceReset value from DUT and verify the value indicates the duration of time, in minutes");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
+        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_ETHDIAG_2_1Suite : public TestCommand
+class Test_TC_DGETH_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_ETHDIAG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_ETHDIAG_2_1", 7, credsIssuerConfig)
+    Test_TC_DGETH_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGETH_2_2", 7, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -12577,7 +12437,7 @@ class Test_TC_ETHDIAG_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_ETHDIAG_2_1Suite() {}
+    ~Test_TC_DGETH_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -13120,10 +12980,10 @@ class Test_TC_FLW_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_FLW_2_2Suite : public TestCommand
+class Test_TC_CGEN_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_FLW_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_2_2", 3, credsIssuerConfig)
+    Test_TC_CGEN_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CGEN_1_1", 7, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -13131,7 +12991,7 @@ class Test_TC_FLW_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_FLW_2_2Suite() {}
+    ~Test_TC_CGEN_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -13163,177 +13023,84 @@ class Test_TC_FLW_2_2Suite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint16_t> value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("clusterRevision", value, 1U));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
         case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint16_t> value;
+                chip::app::DataModel::DecodableList<chip::AttributeId> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "read the mandatory attribute: MeasuredValue");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), FlowMeasurement::Id,
-                                 FlowMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
-        }
-        case 2: {
-            LogStep(2, "read the mandatory attribute: MeasuredValue");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), FlowMeasurement::Id,
-                                 FlowMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_GC_1_1Suite : public TestCommand
-{
-public:
-    Test_TC_GC_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GC_1_1", 7, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_GC_1_1Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("clusterRevision", value, 1U));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 0));
-                    VerifyOrReturn(CheckValue("attributeList[0]", iter_0.GetValue(), 0UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 1));
-                    VerifyOrReturn(CheckValue("attributeList[1]", iter_0.GetValue(), 1UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 2));
-                    VerifyOrReturn(CheckValue("attributeList[2]", iter_0.GetValue(), 2UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 3));
-                    VerifyOrReturn(CheckValue("attributeList[3]", iter_0.GetValue(), 3UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 4));
-                    VerifyOrReturn(CheckValue("attributeList[4]", iter_0.GetValue(), 65528UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 5));
-                    VerifyOrReturn(CheckValue("attributeList[5]", iter_0.GetValue(), 65529UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 6));
-                    VerifyOrReturn(CheckValue("attributeList[6]", iter_0.GetValue(), 65531UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 7));
-                    VerifyOrReturn(CheckValue("attributeList[7]", iter_0.GetValue(), 65532UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 8));
-                    VerifyOrReturn(CheckValue("attributeList[8]", iter_0.GetValue(), 65533UL));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("attributeList", iter_0, 9));
-                }
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::CommandId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("acceptedCommandList", iter_0, 0));
-                    VerifyOrReturn(CheckValue("acceptedCommandList[0]", iter_0.GetValue(), 0UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("acceptedCommandList", iter_0, 1));
-                    VerifyOrReturn(CheckValue("acceptedCommandList[1]", iter_0.GetValue(), 2UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("acceptedCommandList", iter_0, 2));
-                    VerifyOrReturn(CheckValue("acceptedCommandList[2]", iter_0.GetValue(), 4UL));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("acceptedCommandList", iter_0, 3));
-                }
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
-            }
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::CommandId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("generatedCommandList", iter_0, 0));
-                    VerifyOrReturn(CheckValue("generatedCommandList[0]", iter_0.GetValue(), 1UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("generatedCommandList", iter_0, 1));
-                    VerifyOrReturn(CheckValue("generatedCommandList[1]", iter_0.GetValue(), 3UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("generatedCommandList", iter_0, 2));
-                    VerifyOrReturn(CheckValue("generatedCommandList[2]", iter_0.GetValue(), 5UL));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("generatedCommandList", iter_0, 3));
-                }
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 0));
+                    VerifyOrReturn(CheckValue("attributeList[0]", iter_0.GetValue(), 0UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 1));
+                    VerifyOrReturn(CheckValue("attributeList[1]", iter_0.GetValue(), 1UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 2));
+                    VerifyOrReturn(CheckValue("attributeList[2]", iter_0.GetValue(), 2UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 3));
+                    VerifyOrReturn(CheckValue("attributeList[3]", iter_0.GetValue(), 3UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 4));
+                    VerifyOrReturn(CheckValue("attributeList[4]", iter_0.GetValue(), 65528UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 5));
+                    VerifyOrReturn(CheckValue("attributeList[5]", iter_0.GetValue(), 65529UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 6));
+                    VerifyOrReturn(CheckValue("attributeList[6]", iter_0.GetValue(), 65531UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 7));
+                    VerifyOrReturn(CheckValue("attributeList[7]", iter_0.GetValue(), 65532UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 8));
+                    VerifyOrReturn(CheckValue("attributeList[8]", iter_0.GetValue(), 65533UL));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("attributeList", iter_0, 9));
+                }
+                VerifyOrReturn(CheckConstraintType("value", "", "list"));
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<chip::CommandId> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("acceptedCommandList", iter_0, 0));
+                    VerifyOrReturn(CheckValue("acceptedCommandList[0]", iter_0.GetValue(), 0UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("acceptedCommandList", iter_0, 1));
+                    VerifyOrReturn(CheckValue("acceptedCommandList[1]", iter_0.GetValue(), 2UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("acceptedCommandList", iter_0, 2));
+                    VerifyOrReturn(CheckValue("acceptedCommandList[2]", iter_0.GetValue(), 4UL));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("acceptedCommandList", iter_0, 3));
+                }
+                VerifyOrReturn(CheckConstraintType("value", "", "list"));
+            }
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<chip::CommandId> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("generatedCommandList", iter_0, 0));
+                    VerifyOrReturn(CheckValue("generatedCommandList[0]", iter_0.GetValue(), 1UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("generatedCommandList", iter_0, 1));
+                    VerifyOrReturn(CheckValue("generatedCommandList[1]", iter_0.GetValue(), 3UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("generatedCommandList", iter_0, 2));
+                    VerifyOrReturn(CheckValue("generatedCommandList[2]", iter_0.GetValue(), 5UL));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("generatedCommandList", iter_0, 3));
+                }
+                VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
         default:
@@ -13407,10 +13174,10 @@ class Test_TC_GC_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_GC_2_1Suite : public TestCommand
+class Test_TC_CGEN_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_GC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GC_2_1", 7, credsIssuerConfig)
+    Test_TC_CGEN_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CGEN_2_1", 7, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -13418,7 +13185,7 @@ class Test_TC_GC_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GC_2_1Suite() {}
+    ~Test_TC_CGEN_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -14772,8 +14539,10 @@ class Test_TC_LVL_2_1Suite : public TestCommand
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("minLevel", value, 0));
+                VerifyOrReturn(CheckValue("minLevel", value, 1));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 1));
             }
             break;
         case 6:
@@ -17095,7 +16864,7 @@ class Test_TC_MC_1_4Suite : public TestCommand
 class Test_TC_MC_1_5Suite : public TestCommand
 {
 public:
-    Test_TC_MC_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_1_5", 8, credsIssuerConfig)
+    Test_TC_MC_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_1_5", 7, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -17138,17 +16907,10 @@ class Test_TC_MC_1_5Suite : public TestCommand
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("clusterRevision", value, 1U));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
-        case 3:
+        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -17166,19 +16928,17 @@ class Test_TC_MC_1_5Suite : public TestCommand
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 4));
                     VerifyOrReturn(CheckValue("attributeList[4]", iter_0.GetValue(), 65531UL));
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 5));
-                    VerifyOrReturn(CheckValue("attributeList[5]", iter_0.GetValue(), 65532UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 6));
-                    VerifyOrReturn(CheckValue("attributeList[6]", iter_0.GetValue(), 65533UL));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("attributeList", iter_0, 7));
+                    VerifyOrReturn(CheckValue("attributeList[5]", iter_0.GetValue(), 65533UL));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("attributeList", iter_0, 6));
                 }
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 4:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 5:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -17190,7 +16950,7 @@ class Test_TC_MC_1_5Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 6:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -17202,7 +16962,7 @@ class Test_TC_MC_1_5Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 7:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -17234,18 +16994,13 @@ class Test_TC_MC_1_5Suite : public TestCommand
                                  chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Read the global attribute constraints: ClusterRevision");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WakeOnLan::Id, WakeOnLan::Attributes::ClusterRevision::Id, true,
-                                 chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Read the global attribute: AttributeList");
+            LogStep(2, "Read the global attribute: AttributeList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WakeOnLan::Id, WakeOnLan::Attributes::AttributeList::Id, true,
                                  chip::NullOptional);
         }
-        case 4: {
-            LogStep(4,
+        case 3: {
+            LogStep(3,
                     "Read EventList attribute from the DUT and Verify that the DUT response provides a list of supported events.");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
@@ -17255,18 +17010,18 @@ class Test_TC_MC_1_5Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 5: {
-            LogStep(5, "Read the global attribute: AcceptedCommandList");
+        case 4: {
+            LogStep(4, "Read the global attribute: AcceptedCommandList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WakeOnLan::Id, WakeOnLan::Attributes::AcceptedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Read the global attribute: GeneratedCommandList");
+        case 5: {
+            LogStep(5, "Read the global attribute: GeneratedCommandList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WakeOnLan::Id, WakeOnLan::Attributes::GeneratedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "Read FeatureMap attribute from the DUT and Verify that the DUT response");
+        case 6: {
+            LogStep(6, "Read FeatureMap attribute from the DUT and Verify that the DUT response");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
@@ -17470,7 +17225,7 @@ class Test_TC_MC_1_6Suite : public TestCommand
 class Test_TC_MC_1_7Suite : public TestCommand
 {
 public:
-    Test_TC_MC_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_1_7", 7, credsIssuerConfig)
+    Test_TC_MC_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_1_7", 6, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -17513,17 +17268,10 @@ class Test_TC_MC_1_7Suite : public TestCommand
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("clusterRevision", value, 1U));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
-        case 3:
+        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -17559,7 +17307,7 @@ class Test_TC_MC_1_7Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 4:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -17593,7 +17341,7 @@ class Test_TC_MC_1_7Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 5:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -17607,7 +17355,7 @@ class Test_TC_MC_1_7Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 6:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -17639,30 +17387,25 @@ class Test_TC_MC_1_7Suite : public TestCommand
                                  true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Read the global attribute constraints: ClusterRevision");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id, MediaPlayback::Attributes::ClusterRevision::Id,
-                                 true, chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Read the global attribute: AttributeList");
+            LogStep(2, "Read the global attribute: AttributeList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id, MediaPlayback::Attributes::AttributeList::Id,
                                  true, chip::NullOptional);
         }
-        case 4: {
-            LogStep(4, "Read the global attribute: AcceptedCommandList");
+        case 3: {
+            LogStep(3, "Read the global attribute: AcceptedCommandList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id,
                                  MediaPlayback::Attributes::AcceptedCommandList::Id, true, chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "Read the global attribute: GeneratedCommandList");
+        case 4: {
+            LogStep(4, "Read the global attribute: GeneratedCommandList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id,
                                  MediaPlayback::Attributes::GeneratedCommandList::Id, true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6,
+        case 5: {
+            LogStep(5,
                     "Read FeatureMap attribute from the DUT and Verify that the DUT values based on feature/PICS support:Bit 0 - "
                     "Set to 1 if the DUT supports Advanced Seek (PICS_ADVANCEDSEEK is true) Bit 1 - Set to 1 if the DUT supports "
                     "Variable Speed (PICS_VARIABLESPEED is true)");
@@ -18226,18 +17969,18 @@ class Test_TC_MC_1_10Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "read the global attribute: ClusterRevision");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::ClusterRevision::Id, true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "Read the global attribute constraints: ClusterRevision");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::ClusterRevision::Id, true, chip::NullOptional);
         }
         case 3: {
             LogStep(3, "Read the global attribute: AttributeList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
         case 4: {
@@ -18254,13 +17997,13 @@ class Test_TC_MC_1_10Suite : public TestCommand
         case 5: {
             LogStep(5, "Read the global attribute: AcceptedCommandList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::AcceptedCommandList::Id, true, chip::NullOptional);
         }
         case 6: {
             LogStep(6, "Read the global attribute: GeneratedCommandList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::GeneratedCommandList::Id, true, chip::NullOptional);
         }
         case 7: {
@@ -18612,12 +18355,12 @@ class Test_TC_MC_1_12Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "read the global attribute: ClusterRevision");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AccountLogin::Id, AccountLogin::Attributes::ClusterRevision::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), AccountLogin::Id, AccountLogin::Attributes::ClusterRevision::Id,
                                  true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "Read the global attribute: AttributeList");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AccountLogin::Id, AccountLogin::Attributes::AttributeList::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), AccountLogin::Id, AccountLogin::Attributes::AttributeList::Id,
                                  true, chip::NullOptional);
         }
         case 3: {
@@ -18634,13 +18377,13 @@ class Test_TC_MC_1_12Suite : public TestCommand
         case 4: {
             LogStep(4, "Read the global attribute: AcceptedCommandList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AccountLogin::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), AccountLogin::Id,
                                  AccountLogin::Attributes::AcceptedCommandList::Id, true, chip::NullOptional);
         }
         case 5: {
             LogStep(5, "Read the global attribute: GeneratedCommandList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AccountLogin::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), AccountLogin::Id,
                                  AccountLogin::Attributes::GeneratedCommandList::Id, true, chip::NullOptional);
         }
         case 6: {
@@ -18724,7 +18467,7 @@ class Test_TC_MC_2_1Suite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Put the device into low power mode");
+            LogStep(1, "TH sends Sleep command to DUT");
             ListFreer listFreer;
             chip::app::Clusters::LowPower::Commands::Sleep::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), LowPower::Id, LowPower::Commands::Sleep::Id, value,
@@ -18737,10 +18480,10 @@ class Test_TC_MC_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_3_1Suite : public TestCommand
+class Test_TC_MC_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_MC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_1", 16, credsIssuerConfig)
+    Test_TC_MC_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_2", 3, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -18748,7 +18491,7 @@ class Test_TC_MC_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_3_1Suite() {}
+    ~Test_TC_MC_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -18791,93 +18534,6 @@ class Test_TC_MC_3_1Suite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
             }
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -18901,117 +18557,7 @@ class Test_TC_MC_3_1Suite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Send Select");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(0);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 2: {
-            LogStep(2, "Send Up");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(1);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 3: {
-            LogStep(3, "Send Down");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(2);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 4: {
-            LogStep(4, "Send Left");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(3);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 5: {
-            LogStep(5, "Send Right");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(4);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 6: {
-            LogStep(6, "Send RightUp");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(5);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 7: {
-            LogStep(7, "Send RightDown");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(6);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 8: {
-            LogStep(8, "Send LeftUp");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(7);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 9: {
-            LogStep(9, "Send LeftDown");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(8);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 10: {
-            LogStep(10, "Send RootMenu");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(9);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 11: {
-            LogStep(11, "Send SetupMenu");
+            LogStep(1, "TH sends CEC Settings Keys(0x0A) to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19021,148 +18567,12 @@ class Test_TC_MC_3_1Suite : public TestCommand
 
             );
         }
-        case 12: {
-            LogStep(12, "Send ContentsMenu");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(11);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 13: {
-            LogStep(13, "Send FavoriteMenu");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(12);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 14: {
-            LogStep(14, "Send Exit");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(13);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 15: {
-            LogStep(15, "Send Invalid");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(255);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_MC_3_2Suite : public TestCommand
-{
-public:
-    Test_TC_MC_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_2", 3, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_MC_3_2Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Send RootMenu");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(9);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
-                               chip::NullOptional
-
-            );
-        }
         case 2: {
-            LogStep(2, "Send SetupMenu");
+            LogStep(2, "TH sends CEC Home Keys(0x09) to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
-            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(10);
+            value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(9);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Commands::SendKey::Id, value,
                                chip::NullOptional
 
@@ -19535,7 +18945,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Send RootMenu");
+            LogStep(1, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19546,7 +18956,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 2: {
-            LogStep(2, "Send RootMenu");
+            LogStep(2, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19557,7 +18967,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 3: {
-            LogStep(3, "Send RootMenu");
+            LogStep(3, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19568,7 +18978,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 4: {
-            LogStep(4, "Send RootMenu");
+            LogStep(4, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19579,7 +18989,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 5: {
-            LogStep(5, "Send RootMenu");
+            LogStep(5, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19590,7 +19000,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 6: {
-            LogStep(6, "Send RootMenu");
+            LogStep(6, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19601,7 +19011,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 7: {
-            LogStep(7, "Send RootMenu");
+            LogStep(7, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19612,7 +19022,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 8: {
-            LogStep(8, "Send RootMenu");
+            LogStep(8, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19623,7 +19033,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 9: {
-            LogStep(9, "Send RootMenu");
+            LogStep(9, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -19634,7 +19044,7 @@ class Test_TC_MC_3_4Suite : public TestCommand
             );
         }
         case 10: {
-            LogStep(10, "Send RootMenu");
+            LogStep(10, "TH sends same KeyPad input codes to DUT");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
@@ -21144,11 +20554,13 @@ class Test_TC_MC_7_2Suite : public TestCommand
 class Test_TC_MC_8_1Suite : public TestCommand
 {
 public:
-    Test_TC_MC_8_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_8_1", 3, credsIssuerConfig)
+    Test_TC_MC_8_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_8_1", 8, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("targetvalue1", 0, UINT8_MAX, &mTargetvalue1);
+        AddArgument("targetvalue2", 0, UINT8_MAX, &mTargetvalue2);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
@@ -21163,8 +20575,12 @@ class Test_TC_MC_8_1Suite : public TestCommand
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint8_t> mTargetvalue1;
+    chip::Optional<uint8_t> mTargetvalue2;
     chip::Optional<uint16_t> mTimeout;
 
+    chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> TargetListValues;
+
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
     //
@@ -21195,6 +20611,47 @@ class Test_TC_MC_8_1Suite : public TestCommand
                 chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
+                TargetListValues = value;
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("currentTarget", value, mTargetvalue1.HasValue() ? mTargetvalue1.Value() : 1));
+            }
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "list"));
+            }
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+            }
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("currentTarget", value, mTargetvalue2.HasValue() ? mTargetvalue2.Value() : 2));
             }
             break;
         default:
@@ -21229,6 +20686,45 @@ class Test_TC_MC_8_1Suite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TargetNavigator::Id, TargetNavigator::Attributes::TargetList::Id,
                                  true, chip::NullOptional);
         }
+        case 3: {
+            LogStep(3, "Sends a NavigateTarget command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type value;
+            value.target = mTargetvalue1.HasValue() ? mTargetvalue1.Value() : 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), TargetNavigator::Id, TargetNavigator::Commands::NavigateTarget::Id,
+                               value, chip::NullOptional
+
+            );
+        }
+        case 4: {
+            LogStep(4, "Reads the CurrentTarget attribute");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TargetNavigator::Id,
+                                 TargetNavigator::Attributes::CurrentTarget::Id, true, chip::NullOptional);
+        }
+        case 5: {
+            LogStep(5, "Reads the TargetList attribute");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TargetNavigator::Id, TargetNavigator::Attributes::TargetList::Id,
+                                 true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "Sends a NavigateTarget command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type value;
+            value.target = mTargetvalue2.HasValue() ? mTargetvalue2.Value() : 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), TargetNavigator::Id, TargetNavigator::Commands::NavigateTarget::Id,
+                               value, chip::NullOptional
+
+            );
+        }
+        case 7: {
+            LogStep(7, "Reads the CurrentTarget attribute");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TargetNavigator::Id,
+                                 TargetNavigator::Attributes::CurrentTarget::Id, true, chip::NullOptional);
+        }
         }
         return CHIP_NO_ERROR;
     }
@@ -21378,43 +20874,42 @@ class Test_TC_MC_9_1Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Reads the VendorName attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id, ApplicationBasic::Attributes::VendorName::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id, ApplicationBasic::Attributes::VendorName::Id,
                                  true, chip::NullOptional);
         }
         case 3: {
             LogStep(3, "Reads the VendorID attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id, ApplicationBasic::Attributes::VendorID::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id, ApplicationBasic::Attributes::VendorID::Id,
                                  true, chip::NullOptional);
         }
         case 4: {
             LogStep(4, "Reads the ApplicationName attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::ApplicationName::Id, true, chip::NullOptional);
         }
         case 5: {
             LogStep(5, "Reads the ProductID attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id, ApplicationBasic::Attributes::ProductID::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id, ApplicationBasic::Attributes::ProductID::Id,
                                  true, chip::NullOptional);
         }
         case 6: {
             LogStep(6, "Reads the Application attribute");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::Application::Id, true, chip::NullOptional);
         }
         case 7: {
             LogStep(7, "Reads the Status attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id, ApplicationBasic::Attributes::Status::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id, ApplicationBasic::Attributes::Status::Id,
                                  true, chip::NullOptional);
         }
         case 8: {
             LogStep(8, "Reads the ApplicationVersion attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::ApplicationVersion::Id, true, chip::NullOptional);
         }
         case 9: {
             LogStep(9, "Reads the AllowedVendorList attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationBasic::Id,
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(3), ApplicationBasic::Id,
                                  ApplicationBasic::Attributes::AllowedVendorList::Id, true, chip::NullOptional);
         }
         }
@@ -22198,7 +21693,7 @@ class Test_TC_MF_1_4Suite : public TestCommand
 class Test_TC_MF_1_5Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_5", 17, credsIssuerConfig)
+    Test_TC_MF_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_5", 14, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
@@ -22252,38 +21747,26 @@ class Test_TC_MF_1_5Suite : public TestCommand
             shouldContinue = true;
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             shouldContinue = true;
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
             break;
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             shouldContinue = true;
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
-            shouldContinue = true;
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -22291,14 +21774,14 @@ class Test_TC_MF_1_5Suite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest", 8)));
             }
             break;
-        case 14:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 15:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 16:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             shouldContinue = true;
             break;
@@ -22354,40 +21837,19 @@ class Test_TC_MF_1_5Suite : public TestCommand
             LogStep(3, "Wait for PIXIT_COMM_WIN(180) + 10 seconds");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
+            value.ms = 190000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
         case 4: {
-            LogStep(4, "Wait for PIXIT_COMM_WIN(180) + 10 seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 5: {
-            LogStep(5, "Wait for PIXIT_COMM_WIN(180) + 10 seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 6: {
-            LogStep(6, "Wait for PIXIT_COMM_WIN(180) + 10 seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 28000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 7: {
-            LogStep(7, "TH_CR2 starts a commissioning process with DUT_CE");
+            LogStep(4, "TH_CR2 starts a commissioning process with DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
             value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
             return PairWithCode(kIdentityBeta, value);
         }
-        case 8: {
-            LogStep(8, "TH_CR1 opens a new commissioning window on DUT_CE");
+        case 5: {
+            LogStep(5, "TH_CR1 opens a new commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -22406,8 +21868,8 @@ class Test_TC_MF_1_5Suite : public TestCommand
 
             );
         }
-        case 9: {
-            LogStep(9, "TH_CR1 revokes the commissioning window on DUT_CE");
+        case 6: {
+            LogStep(6, "TH_CR1 revokes the commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
@@ -22416,16 +21878,16 @@ class Test_TC_MF_1_5Suite : public TestCommand
 
             );
         }
-        case 10: {
-            LogStep(10, "TH_CR2 starts a commissioning process with DUT_CE");
+        case 7: {
+            LogStep(7, "TH_CR2 starts a commissioning process with DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
             value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
             return PairWithCode(kIdentityBeta, value);
         }
-        case 11: {
-            LogStep(11, "TH_CR1 revokes the commissioning window on DUT_CE");
+        case 8: {
+            LogStep(8, "TH_CR1 revokes the commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
@@ -22434,21 +21896,21 @@ class Test_TC_MF_1_5Suite : public TestCommand
 
             );
         }
-        case 12: {
-            LogStep(12, "TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE");
+        case 9: {
+            LogStep(9, "TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("chiptestgarbage: not in length on purpose", 8);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 13: {
-            LogStep(13, "TH_CR1 read the mandatory attribute NodeLabel of DUT_CE");
+        case 10: {
+            LogStep(10, "TH_CR1 read the mandatory attribute NodeLabel of DUT_CE");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
                                  chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "TH_CR1 opens a new commissioning window on DUT_CE");
+        case 11: {
+            LogStep(11, "TH_CR1 opens a new commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -22467,8 +21929,8 @@ class Test_TC_MF_1_5Suite : public TestCommand
 
             );
         }
-        case 15: {
-            LogStep(15, "TH_CR2 starts a commissioning process with DUT_CE");
+        case 12: {
+            LogStep(12, "TH_CR2 starts a commissioning process with DUT_CE");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
@@ -22476,8 +21938,8 @@ class Test_TC_MF_1_5Suite : public TestCommand
             value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
             return PairWithCode(kIdentityBeta, value);
         }
-        case 16: {
-            LogStep(16, "TH_CR3 starts a commissioning process with DUT_CE");
+        case 13: {
+            LogStep(13, "TH_CR3 starts a commissioning process with DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
@@ -22492,7 +21954,7 @@ class Test_TC_MF_1_5Suite : public TestCommand
 class Test_TC_MF_1_6Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_6", 19, credsIssuerConfig)
+    Test_TC_MF_1_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_6", 16, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
@@ -22550,38 +22012,26 @@ class Test_TC_MF_1_6Suite : public TestCommand
             shouldContinue = true;
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             shouldContinue = true;
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
             break;
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             shouldContinue = true;
             break;
         case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
-            shouldContinue = true;
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -22589,18 +22039,18 @@ class Test_TC_MF_1_6Suite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest", 8)));
             }
             break;
-        case 15:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 16:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 17:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 18:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             shouldContinue = true;
             break;
@@ -22655,40 +22105,19 @@ class Test_TC_MF_1_6Suite : public TestCommand
             LogStep(4, "Wait for PIXIT_COMM_WIN(180) + 10");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
+            value.ms = 190000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
         case 5: {
-            LogStep(5, "Wait for PIXIT_COMM_WIN(180) + 10");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 6: {
-            LogStep(6, "Wait for PIXIT_COMM_WIN(180) + 10");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 7: {
-            LogStep(7, "Wait for PIXIT_COMM_WIN(180) + 10");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 28000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 8: {
-            LogStep(8, "Commission from beta");
+            LogStep(5, "Commission from beta");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
             value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
             return PairWithCode(kIdentityBeta, value);
         }
-        case 9: {
-            LogStep(9, "TH_CR1 opens a commissioning window on DUT_CE");
+        case 6: {
+            LogStep(6, "TH_CR1 opens a commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -22698,8 +22127,8 @@ class Test_TC_MF_1_6Suite : public TestCommand
 
             );
         }
-        case 10: {
-            LogStep(10, "TH_CR1 revokes the commissioning window on DUT_CE");
+        case 7: {
+            LogStep(7, "TH_CR1 revokes the commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
@@ -22708,16 +22137,16 @@ class Test_TC_MF_1_6Suite : public TestCommand
 
             );
         }
-        case 11: {
-            LogStep(11, "Commission from beta");
+        case 8: {
+            LogStep(8, "Commission from beta");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
             value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
             return PairWithCode(kIdentityBeta, value);
         }
-        case 12: {
-            LogStep(12, "TH_CR1 revokes the commissioning window on DUT_CE");
+        case 9: {
+            LogStep(9, "TH_CR1 revokes the commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
@@ -22726,21 +22155,21 @@ class Test_TC_MF_1_6Suite : public TestCommand
 
             );
         }
-        case 13: {
-            LogStep(13, "TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE");
+        case 10: {
+            LogStep(10, "TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("chiptestgarbage: not in length on purpose", 8);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "TH_CR1 read the mandatory attribute NodeLabel of DUT_CE");
+        case 11: {
+            LogStep(11, "TH_CR1 read the mandatory attribute NodeLabel of DUT_CE");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
                                  chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "TH_CR1 opens a commissioning window on DUT_CE");
+        case 12: {
+            LogStep(12, "TH_CR1 opens a commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -22750,23 +22179,394 @@ class Test_TC_MF_1_6Suite : public TestCommand
 
             );
         }
-        case 16: {
-            LogStep(16, "Commission from beta");
+        case 13: {
+            LogStep(13, "Commission from beta");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
             value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
             return PairWithCode(kIdentityBeta, value);
         }
-        case 17: {
-            LogStep(17, "TH_CR2 starts a commissioning process on DUT_CE");
+        case 14: {
+            LogStep(14, "TH_CR2 starts a commissioning process on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
             value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
             return WaitForCommissionee(kIdentityBeta, value);
         }
+        case 15: {
+            LogStep(15, "TH_CR3 starts a commissioning process with DUT_CE");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
+            value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+            return PairWithCode(kIdentityGamma, value);
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_MF_1_9Suite : public TestCommand
+{
+public:
+    Test_TC_MF_1_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_9", 25, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+        AddArgument("nodeIdForDuplicateCommissioning", 0, UINT64_MAX, &mNodeIdForDuplicateCommissioning);
+        AddArgument("nodeId2", 0, UINT64_MAX, &mNodeId2);
+        AddArgument("nodeId3", 0, UINT64_MAX, &mNodeId3);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
+        AddArgument("payload", &mPayload);
+        AddArgument("payload2", &mPayload2);
+    }
+
+    ~Test_TC_MF_1_9Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(700)); }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<uint16_t> mTimeout;
+    chip::Optional<chip::NodeId> mNodeIdForDuplicateCommissioning;
+    chip::Optional<chip::NodeId> mNodeId2;
+    chip::Optional<chip::NodeId> mNodeId3;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mDiscriminator;
+    chip::Optional<chip::CharSpan> mPayload;
+    chip::Optional<chip::CharSpan> mPayload2;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        case 0: {
+            LogStep(0, "Reboot target device");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+            return Reboot(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "TH_CR1 starts a commissioning process with DUT_CE");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 2: {
+            LogStep(2, "TH_CR1 opens a new commissioning window on DUT_CE");
+            ListFreer listFreer;
+            chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
+            value.commissioningTimeout = 180U;
+            value.PAKEVerifier         = chip::ByteSpan(
+                chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                             "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                             "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357"
+                                             "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"),
+                97);
+            value.discriminator = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840U;
+            value.iterations    = 1000UL;
+            value.salt = chip::ByteSpan(chip::Uint8::from_const_char("SPAKE2P Key Saltgarbage: not in length on purpose"), 16);
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
+                               AdministratorCommissioning::Commands::OpenCommissioningWindow::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 3: {
+            LogStep(3, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 4: {
+            LogStep(4, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 5: {
+            LogStep(5, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 6: {
+            LogStep(6, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 7: {
+            LogStep(7, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 8: {
+            LogStep(8, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 9: {
+            LogStep(9, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 10: {
+            LogStep(10, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 11: {
+            LogStep(11, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 12: {
+            LogStep(12, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 13: {
+            LogStep(13, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 14: {
+            LogStep(14, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 15: {
+            LogStep(15, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 16: {
+            LogStep(16, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 17: {
+            LogStep(17, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
         case 18: {
-            LogStep(18, "TH_CR3 starts a commissioning process with DUT_CE");
+            LogStep(18, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 19: {
+            LogStep(19, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 20: {
+            LogStep(20, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 21: {
+            LogStep(21, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 22: {
+            LogStep(22, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 23: {
+            LogStep(23, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 24: {
+            LogStep(24, "TH_CR3 starts a commissioning process with DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
@@ -22778,10 +22578,10 @@ class Test_TC_MF_1_6Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_15Suite : public TestCommand
+class Test_TC_MF_1_10Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_15", 24, credsIssuerConfig)
+    Test_TC_MF_1_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_10", 25, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
@@ -22791,11 +22591,373 @@ class Test_TC_MF_1_15Suite : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
         AddArgument("payload", &mPayload);
+        AddArgument("payload2", &mPayload2);
     }
 
-    ~Test_TC_MF_1_15Suite() {}
+    ~Test_TC_MF_1_10Suite() {}
 
-    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(500)); }
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(700)); }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<uint16_t> mTimeout;
+    chip::Optional<chip::NodeId> mNodeIdForDuplicateCommissioning;
+    chip::Optional<chip::NodeId> mNodeId2;
+    chip::Optional<chip::NodeId> mNodeId3;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mDiscriminator;
+    chip::Optional<chip::CharSpan> mPayload;
+    chip::Optional<chip::CharSpan> mPayload2;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            shouldContinue = true;
+            break;
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        case 0: {
+            LogStep(0, "Reboot target device");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+            return Reboot(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "TH_CR1 starts a commissioning process with DUT_CE");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 2: {
+            LogStep(2, "TH_CR1 opens a commissioning window on DUT_CE");
+            ListFreer listFreer;
+            chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
+            value.commissioningTimeout = 180U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
+                               AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 3: {
+            LogStep(3, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 4: {
+            LogStep(4, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 5: {
+            LogStep(5, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 6: {
+            LogStep(6, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 7: {
+            LogStep(7, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 8: {
+            LogStep(8, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 9: {
+            LogStep(9, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 10: {
+            LogStep(10, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 11: {
+            LogStep(11, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 12: {
+            LogStep(12, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 13: {
+            LogStep(13, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 14: {
+            LogStep(14, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 15: {
+            LogStep(15, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 16: {
+            LogStep(16, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 17: {
+            LogStep(17, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 18: {
+            LogStep(18, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 19: {
+            LogStep(19, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 20: {
+            LogStep(20, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 21: {
+            LogStep(21, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 22: {
+            LogStep(22, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 23: {
+            LogStep(23, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+            value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+            return PairWithCode(kIdentityBeta, value);
+        }
+        case 24: {
+            LogStep(24, "TH_CR3 starts a commissioning process with DUT_CE");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
+            value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:0000000000I31506010", 22);
+            return PairWithCode(kIdentityGamma, value);
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_MF_1_15Suite : public TestCommand
+{
+public:
+    Test_TC_MF_1_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_15", 18, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+        AddArgument("nodeIdForDuplicateCommissioning", 0, UINT64_MAX, &mNodeIdForDuplicateCommissioning);
+        AddArgument("nodeId2", 0, UINT64_MAX, &mNodeId2);
+        AddArgument("nodeId3", 0, UINT64_MAX, &mNodeId3);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
+        AddArgument("payload", &mPayload);
+    }
+
+    ~Test_TC_MF_1_15Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(500)); }
 
 private:
     chip::Optional<chip::NodeId> mNodeId;
@@ -22881,23 +23043,11 @@ class Test_TC_MF_1_15Suite : public TestCommand
             break;
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
             break;
         case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 17:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<
@@ -22917,26 +23067,14 @@ class Test_TC_MF_1_15Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 21:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 22:
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 23:
+        case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         default:
@@ -23059,32 +23197,11 @@ class Test_TC_MF_1_15Suite : public TestCommand
             LogStep(11, "Wait for the expiration of PIXIT_COMM_WIN seconds");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
+            value.ms = 180000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
         case 12: {
-            LogStep(12, "Wait for the expiration of PIXIT_COMM_WIN seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 13: {
-            LogStep(13, "Wait for the expiration of PIXIT_COMM_WIN seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 14: {
-            LogStep(14, "Wait for the expiration of PIXIT_COMM_WIN seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 18000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 15: {
-            LogStep(15, "TH_CR1 re-opens new commissioning window on DUT_CE");
+            LogStep(12, "TH_CR1 re-opens new commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -23103,8 +23220,8 @@ class Test_TC_MF_1_15Suite : public TestCommand
 
             );
         }
-        case 16: {
-            LogStep(16, "TH_CR3 opens a new commissioning window on DUT_CE");
+        case 13: {
+            LogStep(13, "TH_CR3 opens a new commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -23123,41 +23240,20 @@ class Test_TC_MF_1_15Suite : public TestCommand
 
             );
         }
-        case 17: {
-            LogStep(17, "TH_CR1 reads the list of Fabrics on DUT_CE");
+        case 14: {
+            LogStep(14, "TH_CR1 reads the list of Fabrics on DUT_CE");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
                                  OperationalCredentials::Attributes::Fabrics::Id, false, chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "Wait for the expiration of PIXIT_COMM_WIN seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 19: {
-            LogStep(19, "Wait for the expiration of PIXIT_COMM_WIN seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 20: {
-            LogStep(20, "Wait for the expiration of PIXIT_COMM_WIN seconds");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 54000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 21: {
-            LogStep(21, "Wait for the expiration of PIXIT_COMM_WIN seconds");
+        case 15: {
+            LogStep(15, "Wait for the expiration of PIXIT_COMM_WIN seconds");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 18000UL;
+            value.ms = 180000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 22: {
-            LogStep(22, "TH_CR1 opens a new commissioning window on DUT_CE");
+        case 16: {
+            LogStep(16, "TH_CR1 opens a new commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -23176,8 +23272,8 @@ class Test_TC_MF_1_15Suite : public TestCommand
 
             );
         }
-        case 23: {
-            LogStep(23, "TH_CR2 opens a new commissioning window on DUT_CE");
+        case 17: {
+            LogStep(17, "TH_CR2 opens a new commissioning window on DUT_CE");
             ListFreer listFreer;
             chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value;
             value.commissioningTimeout = 180U;
@@ -23651,7 +23747,7 @@ class Test_TC_OCC_1_1Suite : public TestCommand
 class Test_TC_OCC_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_OCC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OCC_2_1", 10, credsIssuerConfig)
+    Test_TC_OCC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OCC_2_1", 43, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -23710,6 +23806,14 @@ class Test_TC_OCC_2_1Suite : public TestCommand
             }
             break;
         case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupancySensorType", value, 0));
+            }
+            break;
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -23719,36 +23823,389 @@ class Test_TC_OCC_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3));
             }
             break;
-        case 5:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
-        case 6:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupancySensorType", value, 0));
+                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3));
             }
             break;
-        case 7:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "map8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 7));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 273));
             }
             break;
-        case 8:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
-        case 9:
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "map8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 273));
+            }
+            break;
+        case 11:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("pirOccupiedToUnoccupiedDelay", value, 0U));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+            }
+            break;
+        case 12:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("pirOccupiedToUnoccupiedDelay", value, 0U));
+            }
+            break;
+        case 14:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedDelay", value, 0U));
+            }
+            break;
+        case 15:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+            }
+            break;
+        case 16:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedDelay", value, 0U));
+            }
+            break;
+        case 18:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedThreshold", value, 1));
+            }
+            break;
+        case 19:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 254));
+            }
+            break;
+        case 20:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedThreshold", value, 1));
+            }
+            break;
+        case 22:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("ultrasonicOccupiedToUnoccupiedDelay", value, 0U));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+            }
+            break;
+        case 23:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("ultrasonicOccupiedToUnoccupiedDelay", value, 0U));
+            }
+            break;
+        case 25:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedDelay", value, 0U));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+            }
+            break;
+        case 26:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedDelay", value, 0U));
+            }
+            break;
+        case 28:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedThreshold", value, 1));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 254));
+            }
+            break;
+        case 29:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 30:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupancySensorTypeBitmap", value, 1));
+                VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedThreshold", value, 1));
+            }
+            break;
+        case 31:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("physicalContactOccupiedToUnoccupiedDelay", value, 0U));
+            }
+            break;
+        case 32:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+            }
+            break;
+        case 33:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("physicalContactOccupiedToUnoccupiedDelay", value, 0U));
+            }
+            break;
+        case 35:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedDelay", value, 0U));
+            }
+            break;
+        case 36:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+            }
+            break;
+        case 37:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 38:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedDelay", value, 0U));
+            }
+            break;
+        case 39:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedThreshold", value, 1));
+            }
+            break;
+        case 40:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 254));
+            }
+            break;
+        case 41:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 42:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedThreshold", value, 1));
             }
             break;
         default:
@@ -23792,12 +24249,17 @@ class Test_TC_OCC_2_1Suite : public TestCommand
                                  true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Reads mandatory attribute constrains: OccupancySensorType");
+            LogStep(4, "Reads mandatory attribute: OccupancySensorType");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
                                  OccupancySensing::Attributes::OccupancySensorType::Id, true, chip::NullOptional);
         }
         case 5: {
-            LogStep(5, "Writes the respective default value to mandatory attribute: OccupancySensorType");
+            LogStep(5, "Reads mandatory attribute constrains: OccupancySensorType");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::OccupancySensorType::Id, true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "Writes the respective default value to mandatory attribute: OccupancySensorType");
             ListFreer listFreer;
             uint8_t value;
             value = 0;
@@ -23805,18 +24267,18 @@ class Test_TC_OCC_2_1Suite : public TestCommand
                                   OccupancySensing::Attributes::OccupancySensorType::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Reads back mandatory attribute: OccupancySensorType");
+        case 7: {
+            LogStep(7, "Reads back mandatory attribute: OccupancySensorType");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
                                  OccupancySensing::Attributes::OccupancySensorType::Id, true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "Reads mandatory attribute constrains: OccupancySensorTypeBitmap");
+        case 8: {
+            LogStep(8, "Reads mandatory attribute constrains: OccupancySensorTypeBitmap");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
                                  OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id, true, chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "Writes the respective default value to mandatory attribute: OccupancySensorTypeBitmap");
+        case 9: {
+            LogStep(9, "Writes the respective default value to mandatory attribute: OccupancySensorTypeBitmap");
             ListFreer listFreer;
             uint8_t value;
             value = 1;
@@ -23824,11 +24286,218 @@ class Test_TC_OCC_2_1Suite : public TestCommand
                                   OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 9: {
-            LogStep(9, "Reads back mandatory attribute: OccupancySensorTypeBitmap");
+        case 10: {
+            LogStep(10, "Reads back mandatory attribute: OccupancySensorTypeBitmap");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
                                  OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id, true, chip::NullOptional);
         }
+        case 11: {
+            LogStep(11, "Reads optional attribute: PIROccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 12: {
+            LogStep(12, "Writes the respective default value to optional attribute: PIROccupiedToUnoccupiedDelay");
+            ListFreer listFreer;
+            uint16_t value;
+            value = 0U;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 13: {
+            LogStep(13, "Reads back optional attribute: PIROccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 14: {
+            LogStep(14, "Reads optional attribute: PIRUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 15: {
+            LogStep(15, "Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 16: {
+            LogStep(16, "Writes the respective default value to optional attribute: PIRUnoccupiedToOccupiedDelay");
+            ListFreer listFreer;
+            uint16_t value;
+            value = 0U;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 17: {
+            LogStep(17, "Reads back optional attribute: PIRUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 18: {
+            LogStep(18, "Reads optional attribute: PIRUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional);
+        }
+        case 19: {
+            LogStep(19, "Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional);
+        }
+        case 20: {
+            LogStep(20, "Writes the respective default value to optional attribute: PIRUnoccupiedToOccupiedThreshold");
+            ListFreer listFreer;
+            uint8_t value;
+            value = 1;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 21: {
+            LogStep(21, "Reads back optional attribute: PIRUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional);
+        }
+        case 22: {
+            LogStep(22, "Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 23: {
+            LogStep(23, "Writes the respective default value to optional attribute: UltrasonicOccupiedToUnoccupiedDelay");
+            ListFreer listFreer;
+            uint16_t value;
+            value = 0U;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 24: {
+            LogStep(24, "Read back optional attribute: UltrasonicOccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 25: {
+            LogStep(25, "Read attribute: UltrasonicUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 26: {
+            LogStep(26, "Writes the respective default value to optional attribute: UltrasonicUnoccupiedToOccupiedDelay");
+            ListFreer listFreer;
+            uint16_t value;
+            value = 0U;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 27: {
+            LogStep(27, "Read back attribute: UltrasonicUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional);
+        }
+        case 28: {
+            LogStep(28, "Read attribute: UltrasonicUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, true,
+                                 chip::NullOptional);
+        }
+        case 29: {
+            LogStep(29, "Writes the respective default value to optional attribute: UltrasonicUnoccupiedToOccupiedThreshold");
+            ListFreer listFreer;
+            uint8_t value;
+            value = 1;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 30: {
+            LogStep(30, "Read back attribute: UltrasonicUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, true,
+                                 chip::NullOptional);
+        }
+        case 31: {
+            LogStep(31, "Reads optional attribute: PhysicalContactOccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, true,
+                                 chip::NullOptional);
+        }
+        case 32: {
+            LogStep(32, "Reads optional attribute constrains: PhysicalContactOccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, true,
+                                 chip::NullOptional);
+        }
+        case 33: {
+            LogStep(33, "Writes the respective default value to optional attribute: PhysicalContactOccupiedToUnoccupiedDelay");
+            ListFreer listFreer;
+            uint16_t value;
+            value = 0U;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 34: {
+            LogStep(34, "Reads back optional attribute: PhysicalContactOccupiedToUnoccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, true,
+                                 chip::NullOptional);
+        }
+        case 35: {
+            LogStep(35, "Reads optional attribute: PhysicalContactUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, true,
+                                 chip::NullOptional);
+        }
+        case 36: {
+            LogStep(36, "Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, true,
+                                 chip::NullOptional);
+        }
+        case 37: {
+            LogStep(37, "Writes the respective default value to optional attribute: PhysicalContactUnoccupiedToOccupiedDelay");
+            ListFreer listFreer;
+            uint16_t value;
+            value = 0U;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 38: {
+            LogStep(38, "Reads back optional attribute: PhysicalContactUnoccupiedToOccupiedDelay");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, true,
+                                 chip::NullOptional);
+        }
+        case 39: {
+            LogStep(39, "Reads optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, true,
+                                 chip::NullOptional);
+        }
+        case 40: {
+            LogStep(40, "Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, true,
+                                 chip::NullOptional);
+        }
+        case 41: {
+            LogStep(41, "Writes the respective default value to optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold");
+            ListFreer listFreer;
+            uint8_t value;
+            value = 1;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                  OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 42: {
+            LogStep(42, "Reads back optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id,
+                                 OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, true,
+                                 chip::NullOptional);
+        }
         }
         return CHIP_NO_ERROR;
     }
@@ -25511,7 +26180,7 @@ class Test_TC_OO_2_4Suite : public TestCommand
 class Test_TC_PS_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_PS_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PS_1_1", 8, credsIssuerConfig)
+    Test_TC_PS_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PS_1_1", 7, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -25554,17 +26223,10 @@ class Test_TC_PS_1_1Suite : public TestCommand
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("clusterRevision", value, 1U));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
-        case 3:
+        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -25598,11 +26260,11 @@ class Test_TC_PS_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 4:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 5:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -25614,7 +26276,7 @@ class Test_TC_PS_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 6:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -25626,7 +26288,7 @@ class Test_TC_PS_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 7:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -25662,18 +26324,13 @@ class Test_TC_PS_1_1Suite : public TestCommand
                                  true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Read the global attribute constraints: ClusterRevision");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PowerSource::Id, PowerSource::Attributes::ClusterRevision::Id,
-                                 true, chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Read the global attribute: AttributeList");
+            LogStep(2, "Read the global attribute: AttributeList");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PowerSource::Id, PowerSource::Attributes::AttributeList::Id, true,
                                  chip::NullOptional);
         }
-        case 4: {
-            LogStep(4,
+        case 3: {
+            LogStep(3,
                     "Read EventList attribute from the DUT and Verify that the DUT response provides a list of supported events.");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
@@ -25683,18 +26340,18 @@ class Test_TC_PS_1_1Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 5: {
-            LogStep(5, "Read the global attribute: AcceptedCommandList");
+        case 4: {
+            LogStep(4, "Read the global attribute: AcceptedCommandList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PowerSource::Id, PowerSource::Attributes::AcceptedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Read the global attribute: GeneratedCommandList");
+        case 5: {
+            LogStep(5, "Read the global attribute: GeneratedCommandList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PowerSource::Id, PowerSource::Attributes::GeneratedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "read the optional global attribute: FeatureMap");
+        case 6: {
+            LogStep(6, "read the optional global attribute: FeatureMap");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PowerSource::Id, PowerSource::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
@@ -26821,7 +27478,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
 class Test_TC_PCC_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_PCC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_2_1", 50, credsIssuerConfig)
+    Test_TC_PCC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_2_1", 24, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -26864,6 +27521,8 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
         case 2:
@@ -26872,6 +27531,8 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
         case 3:
@@ -26880,81 +27541,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
-            }
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
-            }
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-            }
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-            }
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
-            }
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
-            }
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-            }
-            break;
-        case 13:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -26964,9 +27555,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 14:
+        case 5:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -26976,9 +27569,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 15:
+        case 6:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -26988,9 +27583,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 16:
+        case 7:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27000,9 +27597,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 17:
+        case 8:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27012,9 +27611,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 18:
+        case 9:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27024,9 +27625,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 19:
+        case 10:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27036,9 +27639,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 20:
+        case 11:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27048,9 +27653,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 21:
+        case 12:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27060,10 +27667,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, -27315));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 22:
+        case 13:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27073,199 +27681,55 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, -27315));
-            }
-            break;
-        case 23:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("pumpStatus", value, 0U));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 24:
+        case 14:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
+                chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "map16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 8U));
             }
             break;
-        case 25:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 26:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint32_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("lifetimeRunningHours", value));
-                VerifyOrReturn(CheckValue("lifetimeRunningHours.Value()", value.Value(), 0UL));
-            }
-            break;
-        case 27:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint32_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint24"));
-            }
-            break;
-        case 28:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint32_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint24"));
-            }
-            break;
-        case 29:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint32_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("lifetimeEnergyConsumed", value));
-                VerifyOrReturn(CheckValue("lifetimeEnergyConsumed.Value()", value.Value(), 0UL));
-            }
-            break;
-        case 30:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint32_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
-            }
-            break;
-        case 31:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-            }
-            break;
-        case 33:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<int16_t> value;
+                chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3));
             }
             break;
-        case 34:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<int16_t> value;
+                chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 7));
             }
             break;
-        case 35:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -32768));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 36:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 37:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 38:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 39:
+        case 18:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27275,82 +27739,25 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 40:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, -27315));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
-            }
-            break;
-        case 41:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, -27315));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
-            }
-            break;
-        case 42:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("pumpStatus", value, 0U));
-            }
-            break;
-        case 43:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::BitFlags<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "map16"));
-            }
-            break;
-        case 44:
+        case 19:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 45:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("lifetimeRunningHours", value));
-                VerifyOrReturn(CheckValue("lifetimeRunningHours.Value()", value.Value(), 0UL));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint24"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 16777215UL));
             }
             break;
-        case 46:
+        case 20:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27360,9 +27767,11 @@ class Test_TC_PCC_2_1Suite : public TestCommand
                 chip::app::DataModel::Nullable<uint32_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint24"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 16777215UL));
             }
             break;
-        case 47:
+        case 21:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -27371,32 +27780,33 @@ class Test_TC_PCC_2_1Suite : public TestCommand
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint24"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL));
             }
             break;
-        case 48:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint32_t> value;
+                chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("lifetimeEnergyConsumed", value));
-                VerifyOrReturn(CheckValue("lifetimeEnergyConsumed.Value()", value.Value(), 0UL));
+                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3));
             }
             break;
-        case 49:
+        case 23:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint32_t> value;
+                chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 7));
             }
             break;
         default:
@@ -27422,254 +27832,119 @@ class Test_TC_PCC_2_1Suite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "read the mandatory attribute: MaxPressure");
+            LogStep(1, "Read the mandatory attribute: MaxPressure");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::MaxPressure::Id, true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "read the mandatory attribute: MaxSpeed");
+            LogStep(2, "Read the mandatory attribute: MaxSpeed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::MaxSpeed::Id, true, chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "read the mandatory attribute: MaxFlow");
+            LogStep(3, "Read the mandatory attribute: MaxFlow");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::MaxFlow::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "read the mandatory attribute: EffectiveOperationMode");
+            LogStep(4, "Read the optional attribute: MinConstPressure");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MinConstPressure::Id, true, chip::NullOptional);
         }
         case 5: {
-            LogStep(5, "read the mandatory attribute: EffectiveControlMode");
+            LogStep(5, "Read the optional attribute: MaxConstPressure");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MaxConstPressure::Id, true, chip::NullOptional);
         }
         case 6: {
-            LogStep(6, "read the mandatory attribute: Capacity");
+            LogStep(6, "Read the optional attribute: MinCompPressure");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::Capacity::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MinCompPressure::Id, true, chip::NullOptional);
         }
         case 7: {
-            LogStep(7, "read the mandatory attribute: MaxPressure");
+            LogStep(7, "Read the optional attribute: MaxCompPressure");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxPressure::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MaxCompPressure::Id, true, chip::NullOptional);
         }
         case 8: {
-            LogStep(8, "read the mandatory attribute: MaxSpeed");
+            LogStep(8, "Read the optional attribute: MinConstSpeed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxSpeed::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MinConstSpeed::Id, true, chip::NullOptional);
         }
         case 9: {
-            LogStep(9, "read the mandatory attribute: MaxFlow");
+            LogStep(9, "Read the optional attribute: MaxConstSpeed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxFlow::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MaxConstSpeed::Id, true, chip::NullOptional);
         }
         case 10: {
-            LogStep(10, "read the mandatory attribute: EffectiveOperationMode");
+            LogStep(10, "Read the optional attribute: MinConstFlow");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MinConstFlow::Id, true, chip::NullOptional);
         }
         case 11: {
-            LogStep(11, "read the mandatory attribute: EffectiveControlMode");
+            LogStep(11, "Read the optional attribute: MaxConstFlow");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MaxConstFlow::Id, true, chip::NullOptional);
         }
         case 12: {
-            LogStep(12, "read the mandatory attribute: Capacity");
+            LogStep(12, "Read the optional attribute: MinConstTemp");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::Capacity::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MinConstTemp::Id, true, chip::NullOptional);
         }
         case 13: {
-            LogStep(13, "read the optional attribute: MinConstPressure");
+            LogStep(13, "Read the optional attribute: MaxConstTemp");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstPressure::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::MaxConstTemp::Id, true, chip::NullOptional);
         }
         case 14: {
-            LogStep(14, "read the optional attribute: MaxConstPressure");
+            LogStep(14, "Read the optional attribute: PumpStatus");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstPressure::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::PumpStatus::Id, true, chip::NullOptional);
         }
         case 15: {
-            LogStep(15, "read the optional attribute: MinCompPressure");
+            LogStep(15, "Read attribute: EffectiveOperationMode");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinCompPressure::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id, true, chip::NullOptional);
         }
         case 16: {
-            LogStep(16, "read the optional attribute: MaxCompPressure");
+            LogStep(16, "Read attribute: EffectiveControlMode");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxCompPressure::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
         case 17: {
-            LogStep(17, "read the optional attribute: MinConstSpeed");
+            LogStep(17, "Read attribute: Capacity");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstSpeed::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::Capacity::Id, true, chip::NullOptional);
         }
         case 18: {
-            LogStep(18, "read the optional attribute: MaxConstSpeed");
+            LogStep(18, "Read the optional attribute: Speed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstSpeed::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::Speed::Id, true, chip::NullOptional);
         }
         case 19: {
-            LogStep(19, "read the optional attribute: MinConstFlow");
+            LogStep(19, "Read the optional attribute: LifetimeRunningHours");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstFlow::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id, true, chip::NullOptional);
         }
         case 20: {
-            LogStep(20, "read the optional attribute: MaxConstFlow");
+            LogStep(20, "Read the optional attribute: Power");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstFlow::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::Power::Id, true, chip::NullOptional);
         }
         case 21: {
-            LogStep(21, "read the optional attribute: MinConstTemp");
+            LogStep(21, "Read the optional attribute: LifetimeEnergyConsumed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstTemp::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id, true, chip::NullOptional);
         }
         case 22: {
-            LogStep(22, "read the optional attribute: MaxConstTemp");
+            LogStep(22, "Read optional attribute: OperationMode");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstTemp::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::OperationMode::Id, true, chip::NullOptional);
         }
         case 23: {
-            LogStep(23, "read the optional attribute: PumpStatus");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::PumpStatus::Id, true, chip::NullOptional);
-        }
-        case 24: {
-            LogStep(24, "read the optional attribute: PumpStatus");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::PumpStatus::Id, true, chip::NullOptional);
-        }
-        case 25: {
-            LogStep(25, "read the optional attribute: Speed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::Speed::Id, true, chip::NullOptional);
-        }
-        case 26: {
-            LogStep(26, "read the optional attribute: LifetimeRunningHours");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id, true, chip::NullOptional);
-        }
-        case 27: {
-            LogStep(27, "read the optional attribute: LifetimeRunningHours");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id, true, chip::NullOptional);
-        }
-        case 28: {
-            LogStep(28, "read the optional attribute: Power");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::Power::Id, true, chip::NullOptional);
-        }
-        case 29: {
-            LogStep(29, "read the optional attribute: LifetimeEnergyConsumed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id, true, chip::NullOptional);
-        }
-        case 30: {
-            LogStep(30, "read the optional attribute: LifetimeEnergyConsumed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id, true, chip::NullOptional);
-        }
-        case 31: {
-            LogStep(31, "write to the optional attribute: LifetimeEnergyConsumed");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<uint32_t> value;
-            value.SetNonNull();
-            value.Value() = 0UL;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                  PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 32: {
-            LogStep(32, "read the optional attribute: MinConstPressure");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstPressure::Id, true, chip::NullOptional);
-        }
-        case 33: {
-            LogStep(33, "read the optional attribute: MaxConstPressure");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstPressure::Id, true, chip::NullOptional);
-        }
-        case 34: {
-            LogStep(34, "read the optional attribute: MinCompPressure");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinCompPressure::Id, true, chip::NullOptional);
-        }
-        case 35: {
-            LogStep(35, "read the optional attribute: MaxCompPressure");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxCompPressure::Id, true, chip::NullOptional);
-        }
-        case 36: {
-            LogStep(36, "read the optional attribute: MinConstSpeed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstSpeed::Id, true, chip::NullOptional);
-        }
-        case 37: {
-            LogStep(37, "read the optional attribute: MaxConstSpeed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstSpeed::Id, true, chip::NullOptional);
-        }
-        case 38: {
-            LogStep(38, "read the optional attribute: MinConstFlow");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstFlow::Id, true, chip::NullOptional);
-        }
-        case 39: {
-            LogStep(39, "read the optional attribute: MaxConstFlow");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstFlow::Id, true, chip::NullOptional);
-        }
-        case 40: {
-            LogStep(40, "read the optional attribute: MinConstTemp");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MinConstTemp::Id, true, chip::NullOptional);
-        }
-        case 41: {
-            LogStep(41, "read the optional attribute: MaxConstTemp");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::MaxConstTemp::Id, true, chip::NullOptional);
-        }
-        case 42: {
-            LogStep(42, "read the optional attribute: PumpStatus");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::PumpStatus::Id, true, chip::NullOptional);
-        }
-        case 43: {
-            LogStep(43, "read the optional attribute: PumpStatus");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::PumpStatus::Id, true, chip::NullOptional);
-        }
-        case 44: {
-            LogStep(44, "read the optional attribute: Speed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::Speed::Id, true, chip::NullOptional);
-        }
-        case 45: {
-            LogStep(45, "read the optional attribute: LifetimeRunningHours");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id, true, chip::NullOptional);
-        }
-        case 46: {
-            LogStep(46, "read the optional attribute: LifetimeRunningHours");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id, true, chip::NullOptional);
-        }
-        case 47: {
-            LogStep(47, "read the optional attribute: Power");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::Power::Id, true, chip::NullOptional);
-        }
-        case 48: {
-            LogStep(48, "read the optional attribute: LifetimeEnergyConsumed");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id, true, chip::NullOptional);
-        }
-        case 49: {
-            LogStep(49, "read the optional attribute: LifetimeEnergyConsumed");
+            LogStep(23, "Read optional attribute: ControlMode");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::ControlMode::Id, true, chip::NullOptional);
         }
         }
         return CHIP_NO_ERROR;
@@ -28782,122 +29057,10 @@ class Test_TC_RH_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_RH_2_2Suite : public TestCommand
-{
-public:
-    Test_TC_RH_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_2_2", 4, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_RH_2_2Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
-            }
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<uint16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Reads constraints of attribute: MinMeasuredValue");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
-                                 RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
-        }
-        case 2: {
-            LogStep(2, "Reads MeasuredValue attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_RELATIVEHUMIDITY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
-                                 RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Read the mandatory attribute: MeasuredValue");
-            VerifyOrDo(!ShouldSkip("A_RELATIVEHUMIDITY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
-                                 RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
 class Test_TC_SC_4_2Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_2", 23, credsIssuerConfig)
+    Test_TC_SC_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_2", 48, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -28988,6 +29151,10 @@ class Test_TC_SC_4_2Suite : public TestCommand
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintIsUpperCase("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintIsHexString("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintMinLength("value.hostName", value.hostName.size(), 12));
+                VerifyOrReturn(CheckConstraintMaxLength("value.hostName", value.hostName.size(), 12));
             }
             shouldContinue = true;
             break;
@@ -28996,6 +29163,10 @@ class Test_TC_SC_4_2Suite : public TestCommand
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintIsUpperCase("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintIsHexString("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintMinLength("value.hostName", value.hostName.size(), 16));
+                VerifyOrReturn(CheckConstraintMaxLength("value.hostName", value.hostName.size(), 16));
             }
             shouldContinue = true;
             break;
@@ -29016,6 +29187,30 @@ class Test_TC_SC_4_2Suite : public TestCommand
             shouldContinue = true;
             break;
         case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29025,7 +29220,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 10:
+        case 13:
             if (IsUnsupported(status.mStatus))
             {
                 shouldContinue = true;
@@ -29040,7 +29235,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 11:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29054,7 +29249,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 12:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29068,7 +29263,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 13:
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29078,7 +29273,18 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 14:
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckValue("deviceType", value.deviceType, mDeviceType.HasValue() ? mDeviceType.Value() : 5U));
+                VerifyOrReturn(CheckConstraintMaxValue("value.deviceType", value.deviceType, 999U));
+            }
+            shouldContinue = true;
+            break;
+        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29088,7 +29294,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 15:
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29098,7 +29304,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 16:
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29108,7 +29314,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 17:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29118,7 +29324,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 18:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
@@ -29128,197 +29334,586 @@ class Test_TC_SC_4_2Suite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 19:
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 20:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 21:
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 22:
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckConstraintIsUpperCase("value.instanceName", value.instanceName, true));
+                VerifyOrReturn(CheckConstraintIsHexString("value.instanceName", value.instanceName, true));
+                VerifyOrReturn(CheckConstraintMinLength("value.instanceName", value.instanceName.size(), 16));
+                VerifyOrReturn(CheckConstraintMaxLength("value.instanceName", value.instanceName.size(), 16));
+                VerifyOrReturn(CheckConstraintNotValue("value.instanceName", value.instanceName, deviceInstanceNameBeforeReboot1));
+            }
+            shouldContinue = true;
+            break;
+        case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintIsUpperCase("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintIsHexString("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintMinLength("value.hostName", value.hostName.size(), 12));
+                VerifyOrReturn(CheckConstraintMaxLength("value.hostName", value.hostName.size(), 12));
+            }
             shouldContinue = true;
             break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintIsUpperCase("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintIsHexString("value.hostName", value.hostName, true));
+                VerifyOrReturn(CheckConstraintMinLength("value.hostName", value.hostName.size(), 16));
+                VerifyOrReturn(CheckConstraintMaxLength("value.hostName", value.hostName.size(), 16));
+            }
+            shouldContinue = true;
+            break;
+        case 30:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 32:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            shouldContinue = true;
+            break;
+        case 35:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
 
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
+                VerifyOrReturn(CheckValue("vendorId", value.vendorId, mVendorId.HasValue() ? mVendorId.Value() : 65521U));
+            }
+            shouldContinue = true;
+            break;
+        case 36:
+            if (IsUnsupported(status.mStatus))
+            {
+                shouldContinue = true;
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
 
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Stop target device");
-            ListFreer listFreer;
-            chip::app::Clusters::SystemCommands::Commands::Stop::Type value;
-            return Stop(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Start target device with the provided discriminator for basic commissioning advertisement");
-            ListFreer listFreer;
-            chip::app::Clusters::SystemCommands::Commands::Start::Type value;
-            value.discriminator.Emplace();
-            value.discriminator.Value() = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840U;
-            return Start(kIdentityAlpha, value);
-        }
-        case 2: {
-            LogStep(2, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 3: {
-            LogStep(3,
-                    "TH is put in Commissioning Mode using Open Basic Commissioning Window command and starts advertising "
-                    "Commissionable Node Discovery service using DNS-SD");
-            ListFreer listFreer;
-            chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
-            value.commissioningTimeout = 180U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
-                               AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id, value,
-                               chip::Optional<uint16_t>(10000), chip::NullOptional
+                VerifyOrReturn(CheckValue("productId", value.productId, mProductId.HasValue() ? mProductId.Value() : 32769U));
+            }
+            shouldContinue = true;
+            break;
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
 
-            );
-        }
-        case 4: {
-            LogStep(4, "Check Instance Name");
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
-            return FindCommissionable(kIdentityAlpha, value);
-        }
-        case 5: {
-            LogStep(5, "Check Long Discriminator _L");
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByLongDiscriminator::Type value;
-            value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL;
-            return FindCommissionableByLongDiscriminator(kIdentityAlpha, value);
-        }
-        case 6: {
-            LogStep(6, "Check Short Discriminator (_S)");
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByShortDiscriminator::Type value;
-            value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL;
-            return FindCommissionableByShortDiscriminator(kIdentityAlpha, value);
-        }
-        case 7: {
-            LogStep(7, "Check Vendor ID (_V)");
-            VerifyOrDo(!ShouldSkip("VENDOR_SUBTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByVendorId::Type value;
-            value.value = mVendorId.HasValue() ? mVendorId.Value() : 65521ULL;
-            return FindCommissionableByVendorId(kIdentityAlpha, value);
-        }
-        case 8: {
-            LogStep(8, "Check Commissioning Mode (_CM)");
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByCommissioningMode::Type value;
-            return FindCommissionableByCommissioningMode(kIdentityAlpha, value);
-        }
-        case 9: {
-            LogStep(9, "TXT key for Vendor ID and Product ID (VP)");
-            VerifyOrDo(!ShouldSkip("VP_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
-            return FindCommissionable(kIdentityAlpha, value);
-        }
-        case 10: {
-            LogStep(10, "TXT key for Vendor ID and Product ID (VP)");
-            VerifyOrDo(!ShouldSkip("VP_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
-            return FindCommissionable(kIdentityAlpha, value);
-        }
-        case 11: {
-            LogStep(11, "Optional TXT key for MRP Retry Interval Idle (CRI)");
-            VerifyOrDo(!ShouldSkip("CRI_COMM_DISCOVERY_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
-            return FindCommissionable(kIdentityAlpha, value);
-        }
-        case 12: {
-            LogStep(12, "Optional TXT key for MRP Retry Interval Active (CRA)");
-            VerifyOrDo(!ShouldSkip("CRA_COMM_DISCOVERY_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
-            return FindCommissionable(kIdentityAlpha, value);
-        }
-        case 13: {
-            LogStep(13, "TXT key for commissioning mode (CM)");
+                if (value.mrpRetryIntervalIdle.HasValue())
+                {
+                    VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalIdle.Value()", value.mrpRetryIntervalIdle.Value(),
+                                                           3600000UL));
+                }
+            }
+            shouldContinue = true;
+            break;
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                if (value.mrpRetryIntervalActive.HasValue())
+                {
+                    VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalActive.Value()",
+                                                           value.mrpRetryIntervalActive.Value(), 3600000UL));
+                }
+            }
+            shouldContinue = true;
+            break;
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckValue("commissioningMode", value.commissioningMode, 1));
+            }
+            shouldContinue = true;
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckValue("deviceType", value.deviceType, mDeviceType.HasValue() ? mDeviceType.Value() : 5U));
+                VerifyOrReturn(CheckConstraintMaxValue("value.deviceType", value.deviceType, 999U));
+            }
+            shouldContinue = true;
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckConstraintMaxLength("value.deviceName", value.deviceName.size(), 32));
+            }
+            shouldContinue = true;
+            break;
+        case 42:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckConstraintMaxValue("value.rotatingIdLen", value.rotatingIdLen, 100ULL));
+            }
+            shouldContinue = true;
+            break;
+        case 43:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckConstraintNotValue("value.pairingHint", value.pairingHint, 0U));
+            }
+            shouldContinue = true;
+            break;
+        case 44:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckConstraintMaxLength("value.pairingInstruction", value.pairingInstruction.size(), 128));
+            }
+            shouldContinue = true;
+            break;
+        case 45:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+
+                VerifyOrReturn(CheckConstraintMinValue("value.numIPs", value.numIPs, 1));
+            }
+            shouldContinue = true;
+            break;
+        case 46:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 47:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        case 0: {
+            LogStep(0, "Stop target device");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Stop::Type value;
+            return Stop(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "Start target device with the provided discriminator for basic commissioning advertisement");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Start::Type value;
+            value.discriminator.Emplace();
+            value.discriminator.Value() = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840U;
+            return Start(kIdentityAlpha, value);
+        }
+        case 2: {
+            LogStep(2, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 3: {
+            LogStep(3,
+                    "TH is put in Commissioning Mode using Open Basic Commissioning Window command and starts advertising "
+                    "Commissionable Node Discovery service using DNS-SD");
+            ListFreer listFreer;
+            chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
+            value.commissioningTimeout = 180U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
+                               AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 4: {
+            LogStep(4, "Check Instance Name");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "Check Hostname");
+            VerifyOrDo(!ShouldSkip("(WIFI || ETH) && !THREAD"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 6: {
+            LogStep(6, "Check Hostname");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && (!WIFI && !ETH) && THREAD"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 7: {
+            LogStep(7, "Check Long Discriminator _L");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByLongDiscriminator::Type value;
+            value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL;
+            return FindCommissionableByLongDiscriminator(kIdentityAlpha, value);
+        }
+        case 8: {
+            LogStep(8, "Check Short Discriminator (_S)");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByShortDiscriminator::Type value;
+            value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL;
+            return FindCommissionableByShortDiscriminator(kIdentityAlpha, value);
+        }
+        case 9: {
+            LogStep(9, "Check Vendor ID (_V)");
+            VerifyOrDo(!ShouldSkip("VENDOR_SUBTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByVendorId::Type value;
+            value.value = mVendorId.HasValue() ? mVendorId.Value() : 65521ULL;
+            return FindCommissionableByVendorId(kIdentityAlpha, value);
+        }
+        case 10: {
+            LogStep(10, "Check Device Type ID (_T)");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && DEVTYPE_SUBTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByDeviceType::Type value;
+            value.value = mDeviceType.HasValue() ? mDeviceType.Value() : 5ULL;
+            return FindCommissionableByDeviceType(kIdentityAlpha, value);
+        }
+        case 11: {
+            LogStep(11, "Check Commissioning Mode (_CM)");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByCommissioningMode::Type value;
+            return FindCommissionableByCommissioningMode(kIdentityAlpha, value);
+        }
+        case 12: {
+            LogStep(12, "TXT key for Vendor ID and Product ID (VP)");
+            VerifyOrDo(!ShouldSkip("VP_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 13: {
+            LogStep(13, "TXT key for Vendor ID and Product ID (VP)");
+            VerifyOrDo(!ShouldSkip("VP_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
             return FindCommissionable(kIdentityAlpha, value);
         }
         case 14: {
-            LogStep(14, "Optional TXT key for device name (DN)");
-            VerifyOrDo(!ShouldSkip("DN_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(14, "Optional TXT key for MRP Retry Interval Idle (CRI)");
+            VerifyOrDo(!ShouldSkip("CRI_COMM_DISCOVERY_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
             return FindCommissionable(kIdentityAlpha, value);
         }
         case 15: {
-            LogStep(15, "Optional TXT key for rotating device identifier (RI)");
-            VerifyOrDo(!ShouldSkip("RI_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(15, "Optional TXT key for MRP Retry Interval Active (CRA)");
+            VerifyOrDo(!ShouldSkip("CRA_COMM_DISCOVERY_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
             return FindCommissionable(kIdentityAlpha, value);
         }
         case 16: {
-            LogStep(16, "Optional TXT key for pairing hint (PH)");
-            VerifyOrDo(!ShouldSkip("PH_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(16, "TXT key for commissioning mode (CM)");
             ListFreer listFreer;
             chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
             return FindCommissionable(kIdentityAlpha, value);
         }
         case 17: {
-            LogStep(17, "Optional TXT key for pairing instructions (PI)");
-            VerifyOrDo(!ShouldSkip("PI_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(17, "Optional TXT key for device type (DT)");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && DT_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
             return FindCommissionable(kIdentityAlpha, value);
         }
         case 18: {
-            LogStep(18, "Check IPs");
+            LogStep(18, "Optional TXT key for device name (DN)");
+            VerifyOrDo(!ShouldSkip("DN_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
             return FindCommissionable(kIdentityAlpha, value);
         }
         case 19: {
-            LogStep(19, "Stop target device");
+            LogStep(19, "Optional TXT key for rotating device identifier (RI)");
+            VerifyOrDo(!ShouldSkip("RI_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 20: {
+            LogStep(20, "Optional TXT key for pairing hint (PH)");
+            VerifyOrDo(!ShouldSkip("PH_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 21: {
+            LogStep(21, "Optional TXT key for pairing instructions (PI)");
+            VerifyOrDo(!ShouldSkip("PI_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 22: {
+            LogStep(22, "Check IPs");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 23: {
+            LogStep(23, "Stop target device");
             ListFreer listFreer;
             chip::app::Clusters::SystemCommands::Commands::Stop::Type value;
             return Stop(kIdentityAlpha, value);
         }
-        case 20: {
-            LogStep(20, "Start target device with the provided discriminator for basic commissioning advertisement");
+        case 24: {
+            LogStep(24, "Start target device with the provided discriminator for basic commissioning advertisement");
             ListFreer listFreer;
             chip::app::Clusters::SystemCommands::Commands::Start::Type value;
             value.discriminator.Emplace();
             value.discriminator.Value() = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840U;
             return Start(kIdentityAlpha, value);
         }
-        case 21: {
-            LogStep(21, "Log commands");
+        case 25: {
+            LogStep(25, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 26: {
+            LogStep(26, "Open Commissioning Window");
+            ListFreer listFreer;
+            chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
+            value.commissioningTimeout = 180U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
+                               AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 27: {
+            LogStep(27, "Check Instance Name");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 28: {
+            LogStep(28, "Check Hostname");
+            VerifyOrDo(!ShouldSkip("(WIFI || ETH) && !THREAD"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 29: {
+            LogStep(29, "Check Hostname");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && (!WIFI && !ETH) && THREAD"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 30: {
+            LogStep(30, "Check Long Discriminator _L");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByLongDiscriminator::Type value;
+            value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL;
+            return FindCommissionableByLongDiscriminator(kIdentityAlpha, value);
+        }
+        case 31: {
+            LogStep(31, "Check Short Discriminator (_S)");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByShortDiscriminator::Type value;
+            value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL;
+            return FindCommissionableByShortDiscriminator(kIdentityAlpha, value);
+        }
+        case 32: {
+            LogStep(32, "Check Vendor ID (_V)");
+            VerifyOrDo(!ShouldSkip("VENDOR_SUBTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByVendorId::Type value;
+            value.value = mVendorId.HasValue() ? mVendorId.Value() : 65521ULL;
+            return FindCommissionableByVendorId(kIdentityAlpha, value);
+        }
+        case 33: {
+            LogStep(33, "Check Device Type ID (_T)");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && DEVTYPE_SUBTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByDeviceType::Type value;
+            value.value = mDeviceType.HasValue() ? mDeviceType.Value() : 5ULL;
+            return FindCommissionableByDeviceType(kIdentityAlpha, value);
+        }
+        case 34: {
+            LogStep(34, "Check Commissioning Mode (_CM)");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByCommissioningMode::Type value;
+            return FindCommissionableByCommissioningMode(kIdentityAlpha, value);
+        }
+        case 35: {
+            LogStep(35, "TXT key for Vendor ID and Product ID (VP)");
+            VerifyOrDo(!ShouldSkip("VP_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 36: {
+            LogStep(36, "TXT key for Vendor ID and Product ID (VP)");
+            VerifyOrDo(!ShouldSkip("VP_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 37: {
+            LogStep(37, "Optional TXT key for MRP Retry Interval Idle (CRI)");
+            VerifyOrDo(!ShouldSkip("CRI_COMM_DISCOVERY_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 38: {
+            LogStep(38, "Optional TXT key for MRP Retry Interval Active (CRA)");
+            VerifyOrDo(!ShouldSkip("CRA_COMM_DISCOVERY_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 39: {
+            LogStep(39, "TXT key for commissioning mode (CM)");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 40: {
+            LogStep(40, "Optional TXT key for device type (DT)");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && DT_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 41: {
+            LogStep(41, "Optional TXT key for device name (DN)");
+            VerifyOrDo(!ShouldSkip("DN_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 42: {
+            LogStep(42, "Optional TXT key for rotating device identifier (RI)");
+            VerifyOrDo(!ShouldSkip("RI_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 43: {
+            LogStep(43, "Optional TXT key for pairing hint (PH)");
+            VerifyOrDo(!ShouldSkip("PH_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 44: {
+            LogStep(44, "Optional TXT key for pairing instructions (PI)");
+            VerifyOrDo(!ShouldSkip("PI_KEY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 45: {
+            LogStep(45, "Check IPs");
+            ListFreer listFreer;
+            chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionable::Type value;
+            return FindCommissionable(kIdentityAlpha, value);
+        }
+        case 46: {
+            LogStep(46, "Log commands");
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::Log::Type value;
             value.message = chip::Span<const char>(
                 "TH adds an unknown key/value pair in the advertised datagarbage: not in length on purpose", 56);
             return Log(kIdentityAlpha, value);
         }
-        case 22: {
-            LogStep(22, "Log commands");
+        case 47: {
+            LogStep(47, "Log commands");
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::Log::Type value;
             value.message =
@@ -29333,7 +29928,7 @@ class Test_TC_SC_4_2Suite : public TestCommand
 class Test_TC_SWTCH_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_SWTCH_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_2_1", 7, credsIssuerConfig)
+    Test_TC_SWTCH_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_2_1", 4, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -29376,47 +29971,26 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("numberOfPositions", value, 2));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 2));
             }
             break;
-        case 3:
+        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("currentPosition", value, 0));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
             }
             break;
-        case 5:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("multiPressMax", value, 2));
-            }
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 2));
             }
@@ -29449,27 +30023,12 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand
                                  chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Read NumberOfPositions attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::NumberOfPositions::Id, true,
-                                 chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Read CurrentPosition attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::CurrentPosition::Id, true,
-                                 chip::NullOptional);
-        }
-        case 4: {
-            LogStep(4, "Read CurrentPosition attribute");
+            LogStep(2, "Read CurrentPosition attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::CurrentPosition::Id, true,
                                  chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "Read MultiPressMax attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::MultiPressMax::Id, true,
-                                 chip::NullOptional);
-        }
-        case 6: {
-            LogStep(6, "Read MultiPressMax attribute");
+        case 3: {
+            LogStep(3, "Read MultiPressMax attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::MultiPressMax::Id, true,
                                  chip::NullOptional);
         }
@@ -29478,10 +30037,10 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SWTCH_2_2Suite : public TestCommand
+class Test_TC_TM_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_SWTCH_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_2_2", 38, credsIssuerConfig)
+    Test_TC_TM_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_1_1", 6, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -29489,7 +30048,7 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SWTCH_2_2Suite() {}
+    ~Test_TC_TM_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -29523,524 +30082,34 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand
             shouldContinue = true;
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("currentPosition", value, 0));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint8_t value;
+                chip::app::DataModel::DecodableList<chip::AttributeId> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("currentPosition", value, 0));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 0));
+                    VerifyOrReturn(CheckValue("attributeList[0]", iter_0.GetValue(), 0UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 1));
+                    VerifyOrReturn(CheckValue("attributeList[1]", iter_0.GetValue(), 1UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 2));
+                    VerifyOrReturn(CheckValue("attributeList[2]", iter_0.GetValue(), 2UL));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 3));
+                    VerifyOrReturn(CheckValue("attributeList[3]", iter_0.GetValue(), 3UL));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("attributeList", iter_0, 4));
+                }
+                VerifyOrReturn(CheckConstraintType("value", "", "list"));
             }
             break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 22:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 23:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Set up subscription to SwitchLatched eventgarbage: not in length on purpose", 42);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 2: {
-            LogStep(2, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator sets switch to first positiongarbage: not in length on purpose", 38);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 3: {
-            LogStep(3, "Read CurrentPosition attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::CurrentPosition::Id, true,
-                                 chip::NullOptional);
-        }
-        case 4: {
-            LogStep(4, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator sets switch to second positiongarbage: not in length on purpose", 39);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 5: {
-            LogStep(5, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Set up subscription to InitialPress eventgarbage: not in length on purpose", 41);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 6: {
-            LogStep(6, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 7: {
-            LogStep(7, "Read CurrentPosition attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::CurrentPosition::Id, true,
-                                 chip::NullOptional);
-        }
-        case 8: {
-            LogStep(8, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator sets switch to second positiongarbage: not in length on purpose", 39);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 9: {
-            LogStep(9, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Operator does not operate switch (release switch)garbage: not in length on purpose", 49);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 10: {
-            LogStep(10, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Set up subscription to InitialPress and ShortRelease eventsgarbage: not in length on purpose", 59);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 11: {
-            LogStep(11, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 12: {
-            LogStep(12, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 13: {
-            LogStep(13, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 14: {
-            LogStep(14, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator operates switch for 5 secondsgarbage: not in length on purpose", 38);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 15: {
-            LogStep(15, "Wait 3000ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 3000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 16: {
-            LogStep(16, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 17: {
-            LogStep(17, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>(
-                "Set up subscription to InitialPress, LongPress, ShortRelease, LongRelease eventsgarbage: not in length on purpose",
-                80);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 18: {
-            LogStep(18, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 19: {
-            LogStep(19, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 20: {
-            LogStep(20, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 21: {
-            LogStep(21, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator operates switch for 5 secondsgarbage: not in length on purpose", 38);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 22: {
-            LogStep(22, "Wait 3000ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 3000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 23: {
-            LogStep(23, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 24: {
-            LogStep(24, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Set up subscription to InitialPress, ShortRelease, MultiPressOngoing, "
-                                                   "MultiPressComplete eventsgarbage: not in length on purpose",
-                                                   95);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 25: {
-            LogStep(25, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 26: {
-            LogStep(26, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 27: {
-            LogStep(27, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 28: {
-            LogStep(28, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 29: {
-            LogStep(29, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 30: {
-            LogStep(30, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 31: {
-            LogStep(31, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 32: {
-            LogStep(32, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 33: {
-            LogStep(33, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 34: {
-            LogStep(34, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 35: {
-            LogStep(35, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 36: {
-            LogStep(36, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message =
-                chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        case 37: {
-            LogStep(37, "User interaction needed");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-            value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-            return UserPrompt(kIdentityAlpha, value);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_TM_1_1Suite : public TestCommand
-{
-public:
-    Test_TC_TM_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_1_1", 6, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_TM_1_1Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 0));
-                    VerifyOrReturn(CheckValue("attributeList[0]", iter_0.GetValue(), 0UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 1));
-                    VerifyOrReturn(CheckValue("attributeList[1]", iter_0.GetValue(), 1UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 2));
-                    VerifyOrReturn(CheckValue("attributeList[2]", iter_0.GetValue(), 2UL));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("attributeList", iter_0, 3));
-                    VerifyOrReturn(CheckValue("attributeList[3]", iter_0.GetValue(), 3UL));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("attributeList", iter_0, 4));
-                }
-                VerifyOrReturn(CheckConstraintType("value", "", "list"));
-            }
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 5:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -30254,131 +30323,6 @@ class Test_TC_TM_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_TM_2_2Suite : public TestCommand
-{
-public:
-    Test_TC_TM_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_2_2", 5, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_TM_2_2Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, -27315));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32766));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, -27314));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
-            }
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<int16_t> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "read the mandatory attribute: MinMeasuredValue");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
-                                 TemperatureMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
-        }
-        case 2: {
-            LogStep(2, "read the mandatory attribute: MaxMeasuredValue");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
-                                 TemperatureMeasurement::Attributes::MaxMeasuredValue::Id, true, chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "Reads MeasuredValue attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_TEMPERATURE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
-                                 TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
-        }
-        case 4: {
-            LogStep(4, "Read the mandatory attribute: MeasuredValue");
-            VerifyOrDo(!ShouldSkip("A_TEMPERATURE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
-                                 TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
 class Test_TC_TSTAT_1_1Suite : public TestCommand
 {
 public:
@@ -31414,7 +31358,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand
 class Test_TC_TSTAT_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_TSTAT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_2_2", 50, credsIssuerConfig)
+    Test_TC_TSTAT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_2_2", 78, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -31482,24 +31426,27 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2000));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2250));
             }
             break;
         case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 6:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 5:
+        case 7:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -31510,10 +31457,18 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
             break;
-        case 7:
+        case 8:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 8:
+        case 9:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -31521,55 +31476,167 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 2100));
             }
             break;
-        case 9:
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 12:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 10:
+        case 13:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("unoccupiedCoolingSetpoint", value, 2600));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1600));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
+            }
+            break;
+        case 14:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 11:
+        case 15:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("minHeatSetpointLimit", value, 700));
+                VerifyOrReturn(CheckValue("unoccupiedCoolingSetpoint", value, 2500));
+            }
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 18:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("unoccupiedHeatingSetpoint", value, 2000));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 700));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
             break;
-        case 12:
+        case 21:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 13:
+        case 22:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("minHeatSetpointLimit", value, 2000));
+                VerifyOrReturn(CheckValue("unoccupiedHeatingSetpoint", value, 2500));
             }
             break;
-        case 14:
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 25:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 15:
+        case 26:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 16:
+        case 27:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("maxHeatSetpointLimit", value, 3000));
+                VerifyOrReturn(CheckValue("minHeatSetpointLimit", value, 700));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 700));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
             break;
-        case 17:
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 30:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 18:
+        case 31:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 32:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -31577,13 +31644,20 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("maxHeatSetpointLimit", value, 2000));
             }
             break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 20:
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 35:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 21:
+        case 36:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -31598,14 +31672,14 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
             }
             break;
-        case 22:
+        case 37:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 23:
+        case 38:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -31617,21 +31691,27 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("minCoolSetpointLimit", value, 2000));
             }
             break;
-        case 24:
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 41:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 25:
+        case 42:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 26:
+        case 43:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -31646,80 +31726,95 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
             }
             break;
-        case 27:
+        case 44:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 45:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 46:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 28:
+        case 47:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                int16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("maxCoolSetpointLimit", value, 2000));
-            }
             break;
-        case 29:
+        case 48:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 30:
+        case 49:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
+        case 50:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("minSetpointDeadBand", value, 25));
+                VerifyOrReturn(CheckConstraintType("value", "", "temp-s8"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 25));
+            }
             break;
-        case 35:
+        case 51:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 36:
+        case 52:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("minSetpointDeadBand", value, 5));
+            }
             break;
-        case 37:
+        case 53:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 54:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 55:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 38:
+        case 56:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 39:
+        case 57:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::Thermostat::ThermostatControlSequence value;
@@ -31730,10 +31825,10 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 5));
             }
             break;
-        case 40:
+        case 58:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 41:
+        case 59:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::Thermostat::ThermostatControlSequence value;
@@ -31741,45 +31836,147 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("controlSequenceOfOperation", value, 2));
             }
             break;
-        case 42:
+        case 60:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 43:
+        case 61:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, -30));
+            }
             break;
-        case 44:
+        case 62:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 63:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 30));
+            }
             break;
-        case 45:
+        case 64:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 46:
+        case 65:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 66:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, -30));
+            }
             break;
-        case 47:
+        case 67:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 48:
+        case 68:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 69:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 30));
+            }
+            break;
+        case 70:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 49:
+        case 71:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 72:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, -30));
+            }
+            break;
+        case 73:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, -30));
+            }
+            break;
+        case 74:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 75:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 76:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 30));
+            }
+            break;
+        case 77:
+            if (IsUnsupported(status.mStatus))
+            {
+                return;
+            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 30));
+            }
             break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
@@ -31814,7 +32011,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2000;
+            value = 2250;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
@@ -31826,33 +32023,43 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint attribute");
+            LogStep(4, "Writes OccupiedCoolingSetpoint to value below the MinCoolSetpointLimit");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 1600;
+            value = 30;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
         case 5: {
-            LogStep(5, "Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute");
+            LogStep(5, "Writes OccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2600;
+            value = 4000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
         case 6: {
-            LogStep(6, "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
+            LogStep(6, "Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2600;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 7: {
+            LogStep(7, "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute");
+        case 8: {
+            LogStep(8, "Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -31861,79 +32068,201 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute");
+        case 9: {
+            LogStep(9, "Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 9: {
-            LogStep(9, "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
+        case 10: {
+            LogStep(10, "Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 700;
+            value = 600;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 10: {
-            LogStep(10, "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
+        case 11: {
+            LogStep(11, "Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 3000;
+            value = 4010;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 11: {
-            LogStep(11, "Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
-                                 true, chip::NullOptional);
-        }
         case 12: {
-            LogStep(12, "Writes a value back that is different but valid for MinHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(12, "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
-                                  value, chip::NullOptional, chip::NullOptional);
+            value = 700;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
         }
         case 13: {
-            LogStep(13, "Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute");
+            LogStep(13, "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 14: {
+            LogStep(14, "Writes a value back that is different but valid for UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2500;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 15: {
+            LogStep(15, "Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 16: {
+            LogStep(16, "Writes UnoccupiedCoolingSetpoint to value below the MinHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1002;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 17: {
+            LogStep(17, "Writes UnoccupiedCoolingSetpoint to value above the MaxHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 4010;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 18: {
+            LogStep(18, "Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1800;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 19: {
+            LogStep(19, "Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 20: {
+            LogStep(20, "Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 21: {
+            LogStep(21, "Writes a value back that is different but valid for UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2500;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 22: {
+            LogStep(22, "Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 23: {
+            LogStep(23, "Writes UnoccupiedHeatingSetpoint to value below the MinHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 500;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 24: {
+            LogStep(24, "Writes UnoccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 4010;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 25: {
+            LogStep(25, "Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1800;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 26: {
+            LogStep(26, "Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 27: {
+            LogStep(27, "Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range");
             VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute");
+        case 28: {
+            LogStep(28, "Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit ");
             VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 700;
+            value = 650;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute");
+        case 29: {
+            LogStep(29, "Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit ");
             VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 3000;
+            value = 4050;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
-                                 true, chip::NullOptional);
+        case 30: {
+            LogStep(30, "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 700;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "Writes a value back that is different but valid for MaxHeatSetpointLimit attribute");
+        case 31: {
+            LogStep(31, "Writes a value back that is different but valid for MaxHeatSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -31941,38 +32270,47 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute");
+        case 32: {
+            LogStep(32, "Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute");
+        case 33: {
+            LogStep(33, "Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit ");
             VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 700;
+            value = 500;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 20: {
-            LogStep(20, "Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit attribute");
+        case 34: {
+            LogStep(34, "Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit ");
             VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 3000;
+            value = 4000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 21: {
-            LogStep(21, "Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
+        case 35: {
+            LogStep(35, "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 700;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 36: {
+            LogStep(36, "Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
             VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 22: {
-            LogStep(22, "Writes a value back that is different but valid for MinCoolSetpointLimit attribute");
+        case 37: {
+            LogStep(37, "Writes a value back that is different but valid for MinCoolSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -31980,14 +32318,32 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 23: {
-            LogStep(23, "Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute");
+        case 38: {
+            LogStep(38, "Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 24: {
-            LogStep(24, "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute");
+        case 39: {
+            LogStep(39, "Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 40: {
+            LogStep(40, "Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 4000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 41: {
+            LogStep(41, "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -31995,8 +32351,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 25: {
-            LogStep(25, "Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute");
+        case 42: {
+            LogStep(42, "Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32004,38 +32360,32 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 26: {
-            LogStep(26, "Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
+        case 43: {
+            LogStep(43, "Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
             VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 27: {
-            LogStep(27, "Writes a value back that is different but valid for MaxCoolSetpointLimit attribute");
+        case 44: {
+            LogStep(44, "Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit ");
             VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2000;
+            value = 1000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 28: {
-            LogStep(28, "Reads it back again to confirm the successful write of MaxCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
-                                 true, chip::NullOptional);
-        }
-        case 29: {
-            LogStep(29, "Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit attribute");
+        case 45: {
+            LogStep(45, "Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit ");
             VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 1600;
+            value = 4000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 30: {
-            LogStep(30, "Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute");
+        case 46: {
+            LogStep(46, "Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute");
             VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32043,8 +32393,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 31: {
-            LogStep(31, "Writes (sets back) the limit of MinHeatSetpointLimit to MinHeatSetpointLimit attribute");
+        case 47: {
+            LogStep(47, "Writes (sets back) default value of MinHeatSetpointLimit");
             VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32052,77 +32402,89 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 32: {
-            LogStep(32, "Writes (sets back) the limit of MaxHeatSetpointLimit to MinHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 48: {
+            LogStep(48, "Writes (sets back) default value of MinCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 3000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+            value = 1600;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 33: {
-            LogStep(33, "Writes (sets back) the limit of MinHeatSetpointLimit to MaxHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 49: {
+            LogStep(49, "Writes (sets back) default value of MaxCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 700;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+            value = 3200;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 34: {
-            LogStep(34, "Writes (sets back) the limit of MaxHeatSetpointLimit to MaxHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 50: {
+            LogStep(50, "Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
+                                 true, chip::NullOptional);
+        }
+        case 51: {
+            LogStep(51, "Writes a value back that is different but valid for MinSetpointDeadBand attribute");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 3000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+            int8_t value;
+            value = 5;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 35: {
-            LogStep(35, "Writes (sets back) the limit of MinCoolSetpointLimit to MinCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 52: {
+            LogStep(52, "Reads it back again to confirm the successful write of MinSetpointDeadBand attribute");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
+                                 true, chip::NullOptional);
+        }
+        case 53: {
+            LogStep(53, "Writes the value below MinSetpointDeadBand");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 1600;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
+            int8_t value;
+            value = -1;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 36: {
-            LogStep(36, "Writes (sets back) the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 54: {
+            LogStep(54, "Writes the value above MinSetpointDeadBand ");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 3200;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
+            int8_t value;
+            value = 30;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 37: {
-            LogStep(37, "Writes (sets back) the limit of MinCoolSetpointLimit to MaxCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 55: {
+            LogStep(55, "Writes the min limit of MinSetpointDeadBand");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 1600;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
+            int8_t value;
+            value = 0;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 38: {
-            LogStep(38, "Writes (sets back) the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 56: {
+            LogStep(56, "Writes the max limit of MinSetpointDeadBand");
+            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 3200;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
+            int8_t value;
+            value = 25;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 39: {
-            LogStep(39, "Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid");
+        case 57: {
+            LogStep(57, "Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid");
             VerifyOrDo(!ShouldSkip("A_CONTROLSEQUENCEOFOPERATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::ControlSequenceOfOperation::Id, true, chip::NullOptional);
         }
-        case 40: {
-            LogStep(40, "Write Attribute command for ControlSequenceOfOperation with a new valid value");
+        case 58: {
+            LogStep(58, "Write Attribute command for ControlSequenceOfOperation with a new valid value");
             VerifyOrDo(!ShouldSkip("A_CONTROLSEQUENCEOFOPERATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::ThermostatControlSequence value;
@@ -32131,34 +32493,54 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::ControlSequenceOfOperation::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 41: {
-            LogStep(41, "Read it back again to confirm the successful write");
+        case 59: {
+            LogStep(59, "Read it back again to confirm the successful write");
             VerifyOrDo(!ShouldSkip("A_CONTROLSEQUENCEOFOPERATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::ControlSequenceOfOperation::Id, true, chip::NullOptional);
         }
-        case 42: {
-            LogStep(42, "Sets OccupiedHeatingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 60: {
+            LogStep(60, "Sends SetpointRaise Command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 2000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
-                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
+            chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
+            value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(0);
+            value.amount = -30;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Commands::SetpointRaiseLower::Id, value,
+                               chip::NullOptional
+
+            );
         }
-        case 43: {
-            LogStep(43, "Sets OccupiedHeatingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 61: {
+            LogStep(61, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 62: {
+            LogStep(62, "Sends SetpointRaise Command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 2000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
-                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
+            chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
+            value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(0);
+            value.amount = 30;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Commands::SetpointRaiseLower::Id, value,
+                               chip::NullOptional
+
+            );
         }
-        case 44: {
-            LogStep(44, "Sets OccupiedCoolingSetpoint to default value");
+        case 63: {
+            LogStep(63, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 64: {
+            LogStep(64, "Sets OccupiedCoolingSetpoint to default value");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32167,8 +32549,28 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 45: {
-            LogStep(45, "Sets OccupiedCoolingSetpoint to default value");
+        case 65: {
+            LogStep(65, "Sends SetpointRaise Command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
+            value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(1);
+            value.amount = -30;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Commands::SetpointRaiseLower::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 66: {
+            LogStep(66, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 67: {
+            LogStep(67, "Sets OccupiedCoolingSetpoint to default value");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32177,8 +32579,28 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 46: {
-            LogStep(46, "Sets OccupiedCoolingSetpoint to default value");
+        case 68: {
+            LogStep(68, "Sends SetpointRaise Command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
+            value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(1);
+            value.amount = 30;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Commands::SetpointRaiseLower::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 69: {
+            LogStep(69, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 70: {
+            LogStep(70, "Sets OccupiedCoolingSetpoint to default value");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32187,18 +32609,34 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 47: {
-            LogStep(47, "Sets OccupiedHeatingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 71: {
+            LogStep(71, "Sends SetpointRaise Command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 2000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
-                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
+            chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
+            value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(2);
+            value.amount = -30;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Commands::SetpointRaiseLower::Id, value,
+                               chip::NullOptional
+
+            );
         }
-        case 48: {
-            LogStep(48, "Sets OccupiedCoolingSetpoint to default value");
+        case 72: {
+            LogStep(72, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 73: {
+            LogStep(73, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 74: {
+            LogStep(74, "Sets OccupiedCoolingSetpoint to default value");
             VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
@@ -32207,15 +32645,32 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 49: {
-            LogStep(49, "Sets OccupiedHeatingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 75: {
+            LogStep(75, "Sends SetpointRaise Command");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            int16_t value;
-            value = 2000;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
-                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
+            chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
+            value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(2);
+            value.amount = 30;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Commands::SetpointRaiseLower::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 76: {
+            LogStep(76, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 77: {
+            LogStep(77, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
         }
         return CHIP_NO_ERROR;
@@ -32988,7 +33443,7 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
 {
 public:
     Test_TC_DIAG_TH_NW_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_DIAG_TH_NW_1_2", 66, credsIssuerConfig)
+        TestCommand("Test_TC_DIAG_TH_NW_1_2", 68, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -33030,38 +33485,41 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckValueNull("channel", value));
             }
             break;
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint8_t> value;
+                chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "RoutingRole"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 6));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::CharSpan> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("networkName", value));
-                VerifyOrReturn(CheckValueAsString("networkName.Value()", value.Value(), chip::CharSpan("", 0)));
+                VerifyOrReturn(CheckValueNull("routingRole", value));
             }
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
+            {
+                chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "RoutingRole"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 6));
+            }
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint16_t> value;
+                chip::app::DataModel::Nullable<chip::CharSpan> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckValueNull("networkName", value));
             }
             break;
         case 6:
@@ -33071,9 +33529,9 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint64_t> value;
+                chip::app::DataModel::Nullable<uint16_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
         case 8:
@@ -33081,24 +33539,28 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             shouldContinue = true;
             break;
         case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint64_t value;
+                chip::app::DataModel::Nullable<uint64_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
+            {
+                uint64_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+            }
             break;
         case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -33106,32 +33568,24 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             break;
         case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint32_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
-            }
+            shouldContinue = true;
             break;
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
-            }
+            shouldContinue = true;
             break;
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint8_t value;
+                chip::app::DataModel::Nullable<uint32_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
             }
             break;
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint8_t value;
+                chip::app::DataModel::Nullable<uint8_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
             }
@@ -33139,7 +33593,7 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint8_t value;
+                chip::app::DataModel::Nullable<uint8_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
             }
@@ -33147,17 +33601,17 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
         case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint16_t value;
+                chip::app::DataModel::Nullable<uint8_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
             }
             break;
         case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint16_t value;
+                chip::app::DataModel::Nullable<uint8_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
             }
             break;
         case 21:
@@ -33211,17 +33665,17 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
         case 27:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint32_t value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
         case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint32_t value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
         case 29:
@@ -33467,37 +33921,41 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
         case 59:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint64_t value;
+                uint32_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
             }
             break;
         case 60:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint64_t value;
+                uint32_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
             }
             break;
         case 61:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint32_t value;
+                chip::app::DataModel::Nullable<uint64_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
             }
             break;
         case 62:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
+            {
+                chip::app::DataModel::Nullable<uint64_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+            }
             break;
         case 63:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::ByteSpan value;
+                chip::app::DataModel::Nullable<uint32_t> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "octstr"));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
             }
             break;
         case 64:
@@ -33505,6 +33963,18 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             shouldContinue = true;
             break;
         case 65:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::ByteSpan> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "octstr"));
+            }
+            break;
+        case 66:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 67:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> value;
@@ -33535,22 +34005,32 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Validate constraints of attribute: Channel");
+            LogStep(1, "read configured Channel attribute value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::Channel::Id, true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "read RoutingRole atribute from DUT");
+            LogStep(2, "Validate constraints of attribute: Channel");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::RoutingRole::Id, true, chip::NullOptional);
+                                 ThreadNetworkDiagnostics::Attributes::Channel::Id, true, chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "read NetworkName attribute from DUT");
+            LogStep(3, "read RoutingRole atribute from DUT");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::NetworkName::Id, true, chip::NullOptional);
+                                 ThreadNetworkDiagnostics::Attributes::RoutingRole::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4,
+            LogStep(4, "Validate constraints of attribute: RoutingRole");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
+                                 ThreadNetworkDiagnostics::Attributes::RoutingRole::Id, true, chip::NullOptional);
+        }
+        case 5: {
+            LogStep(5, "read NetworkName attribute from DUT");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
+                                 ThreadNetworkDiagnostics::Attributes::NetworkName::Id, true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6,
                     "read NetworkName attribute from DUT and verify response value, If value is NULL then verify that RoutingRole "
                     "is set to 1");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
@@ -33561,13 +34041,13 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 5: {
-            LogStep(5, "read PanId attribute from DUT");
+        case 7: {
+            LogStep(7, "read PanId attribute from DUT");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::PanId::Id, true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6,
+        case 8: {
+            LogStep(8,
                     "read PanId attribute from DUT and verify response value, If value is NULL then verify that RoutingRole is set "
                     "to 1");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
@@ -33578,13 +34058,13 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 7: {
-            LogStep(7, "Validate constraints of attribute: ExtendedPanId");
+        case 9: {
+            LogStep(9, "Validate constraints of attribute: ExtendedPanId");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id, true, chip::NullOptional);
         }
-        case 8: {
-            LogStep(8,
+        case 10: {
+            LogStep(10,
                     "read ExtendedPanId attribute from DUT and verify response value, If value is NULL then verify that "
                     "RoutingRole is set to 1");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
@@ -33595,8 +34075,8 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 9: {
-            LogStep(9,
+        case 11: {
+            LogStep(11,
                     "read MeshLocalPrefix attribute from DUT and verify response value, If value is NULL then verify that "
                     "RoutingRole is set to 1");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
@@ -33607,14 +34087,14 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 10: {
-            LogStep(10, "Validate constraints of attribute: OverrunCount");
+        case 12: {
+            LogStep(12, "Validate constraints of attribute: OverrunCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::OverrunCount::Id, true, chip::NullOptional);
         }
-        case 11: {
+        case 13: {
             LogStep(
-                11,
+                13,
                 "read OverrunCount attribute from DUT and verify response value, If the Overruncount is greater than zero or not");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
@@ -33624,8 +34104,8 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 12: {
-            LogStep(12,
+        case 14: {
+            LogStep(14,
                     "read NeighborTableList attribute from DUT and Verify that the NeighborTable List size is Zero or greater and "
                     "verify each node types");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
@@ -33636,8 +34116,8 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 13: {
-            LogStep(13,
+        case 15: {
+            LogStep(15,
                     "read RouteTableList attribute from DUT and Verify that the RouteTableList List size is Zero or greater and "
                     "verify each node types");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
@@ -33648,249 +34128,249 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 14: {
-            LogStep(14, "Validate constraints of attribute: PartitionId");
+        case 16: {
+            LogStep(16, "Validate constraints of attribute: PartitionId");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::PartitionId::Id, true, chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "Validate constraints of attribute: weighting");
+        case 17: {
+            LogStep(17, "Validate constraints of attribute: weighting");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::Weighting::Id, true, chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "Validate constraints of attribute: DataVersion");
+        case 18: {
+            LogStep(18, "Validate constraints of attribute: DataVersion");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::DataVersion::Id, true, chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "Validate constraints of attribute: StableDataVersion");
+        case 19: {
+            LogStep(19, "Validate constraints of attribute: StableDataVersion");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id, true, chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "Validate constraints of attribute: LeaderRouterId");
+        case 20: {
+            LogStep(20, "Validate constraints of attribute: LeaderRouterId");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id, true, chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "Validate constraints of attribute: DetachedRoleCount");
+        case 21: {
+            LogStep(21, "Validate constraints of attribute: DetachedRoleCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id, true, chip::NullOptional);
         }
-        case 20: {
-            LogStep(20, "Validate constraints of attribute: ChildRoleCount");
+        case 22: {
+            LogStep(22, "Validate constraints of attribute: ChildRoleCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id, true, chip::NullOptional);
         }
-        case 21: {
-            LogStep(21, "Validate constraints of attribute: RouterRoleCount");
+        case 23: {
+            LogStep(23, "Validate constraints of attribute: RouterRoleCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id, true, chip::NullOptional);
         }
-        case 22: {
-            LogStep(22, "Validate constraints of attribute: LeaderRoleCount");
+        case 24: {
+            LogStep(24, "Validate constraints of attribute: LeaderRoleCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id, true, chip::NullOptional);
         }
-        case 23: {
-            LogStep(23, "Validate constraints of attribute: AttachAttemptCount");
+        case 25: {
+            LogStep(25, "Validate constraints of attribute: AttachAttemptCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id, true, chip::NullOptional);
         }
-        case 24: {
-            LogStep(24, "Validate constraints of attribute: PartitionIdChangeCount");
+        case 26: {
+            LogStep(26, "Validate constraints of attribute: PartitionIdChangeCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id, true, chip::NullOptional);
         }
-        case 25: {
-            LogStep(25, "Validate constraints of attribute: BetterPartitionAttachAttemptCount");
+        case 27: {
+            LogStep(27, "Validate constraints of attribute: BetterPartitionAttachAttemptCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id, true,
                                  chip::NullOptional);
         }
-        case 26: {
-            LogStep(26, "Validate constraints of attribute: ParentChangeCount");
+        case 28: {
+            LogStep(28, "Validate constraints of attribute: ParentChangeCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id, true, chip::NullOptional);
         }
-        case 27: {
-            LogStep(27, "Validate constraints of attribute: TxTotalCount");
+        case 29: {
+            LogStep(29, "Validate constraints of attribute: TxTotalCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id, true, chip::NullOptional);
         }
-        case 28: {
-            LogStep(28, "Validate constraints of attribute: TxUnicastCount");
+        case 30: {
+            LogStep(30, "Validate constraints of attribute: TxUnicastCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id, true, chip::NullOptional);
         }
-        case 29: {
-            LogStep(29, "Validate constraints of attribute: TxBroadcastCount");
+        case 31: {
+            LogStep(31, "Validate constraints of attribute: TxBroadcastCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id, true, chip::NullOptional);
         }
-        case 30: {
-            LogStep(30, "Validate constraints of attribute: TxNoAckRequestedCount");
+        case 32: {
+            LogStep(32, "Validate constraints of attribute: TxNoAckRequestedCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id, true, chip::NullOptional);
         }
-        case 31: {
-            LogStep(31, "Validate constraints of attribute: TxDataCount");
+        case 33: {
+            LogStep(33, "Validate constraints of attribute: TxDataCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxDataCount::Id, true, chip::NullOptional);
         }
-        case 32: {
-            LogStep(32, "Validate constraints of attribute: TxDataPollCount");
+        case 34: {
+            LogStep(34, "Validate constraints of attribute: TxDataPollCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id, true, chip::NullOptional);
         }
-        case 33: {
-            LogStep(33, "Validate constraints of attribute: TxBeaconCount");
+        case 35: {
+            LogStep(35, "Validate constraints of attribute: TxBeaconCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id, true, chip::NullOptional);
         }
-        case 34: {
-            LogStep(34, "Validate constraints of attribute: TxBeaconRequestCount");
+        case 36: {
+            LogStep(36, "Validate constraints of attribute: TxBeaconRequestCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id, true, chip::NullOptional);
         }
-        case 35: {
-            LogStep(35, "Validate constraints of attribute: TxOtherCount");
+        case 37: {
+            LogStep(37, "Validate constraints of attribute: TxOtherCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id, true, chip::NullOptional);
         }
-        case 36: {
-            LogStep(36, "Validate constraints of attribute: TxRetryCount");
+        case 38: {
+            LogStep(38, "Validate constraints of attribute: TxRetryCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id, true, chip::NullOptional);
         }
-        case 37: {
-            LogStep(37, "Validate constraints of attribute: TxDirectMaxRetryExpiryCount");
+        case 39: {
+            LogStep(39, "Validate constraints of attribute: TxDirectMaxRetryExpiryCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id, true, chip::NullOptional);
         }
-        case 38: {
-            LogStep(38, "Validate constraints of attribute: TxIndirectMaxRetryExpiryCount");
+        case 40: {
+            LogStep(40, "Validate constraints of attribute: TxIndirectMaxRetryExpiryCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id, true, chip::NullOptional);
         }
-        case 39: {
-            LogStep(39, "Validate constraints of attribute: TxErrCcaCount");
+        case 41: {
+            LogStep(41, "Validate constraints of attribute: TxErrCcaCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id, true, chip::NullOptional);
         }
-        case 40: {
-            LogStep(40, "Validate constraints of attribute: TxErrAbortCount");
+        case 42: {
+            LogStep(42, "Validate constraints of attribute: TxErrAbortCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id, true, chip::NullOptional);
         }
-        case 41: {
-            LogStep(41, "Validate constraints of attribute: TxErrBusyChannelCount");
+        case 43: {
+            LogStep(43, "Validate constraints of attribute: TxErrBusyChannelCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id, true, chip::NullOptional);
         }
-        case 42: {
-            LogStep(42, "Validate constraints of attribute: RxTotalCount");
+        case 44: {
+            LogStep(44, "Validate constraints of attribute: RxTotalCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id, true, chip::NullOptional);
         }
-        case 43: {
-            LogStep(43, "Validate constraints of attribute: RxUnicastCount");
+        case 45: {
+            LogStep(45, "Validate constraints of attribute: RxUnicastCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id, true, chip::NullOptional);
         }
-        case 44: {
-            LogStep(44, "Validate constraints of attribute: RxBroadcastCount");
+        case 46: {
+            LogStep(46, "Validate constraints of attribute: RxBroadcastCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id, true, chip::NullOptional);
         }
-        case 45: {
-            LogStep(45, "Validate constraints of attribute: RxDataCount");
+        case 47: {
+            LogStep(47, "Validate constraints of attribute: RxDataCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxDataCount::Id, true, chip::NullOptional);
         }
-        case 46: {
-            LogStep(46, "Validate constraints of attribute: RxDataPollCount");
+        case 48: {
+            LogStep(48, "Validate constraints of attribute: RxDataPollCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id, true, chip::NullOptional);
         }
-        case 47: {
-            LogStep(47, "Validate constraints of attribute: RxBeaconCount");
+        case 49: {
+            LogStep(49, "Validate constraints of attribute: RxBeaconCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id, true, chip::NullOptional);
         }
-        case 48: {
-            LogStep(48, "Validate constraints of attribute: RxBeaconRequestCount");
+        case 50: {
+            LogStep(50, "Validate constraints of attribute: RxBeaconRequestCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id, true, chip::NullOptional);
         }
-        case 49: {
-            LogStep(49, "Validate constraints of attribute: RxOtherCount");
+        case 51: {
+            LogStep(51, "Validate constraints of attribute: RxOtherCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id, true, chip::NullOptional);
         }
-        case 50: {
-            LogStep(50, "Validate constraints of attribute: RxAddressFilteredCount");
+        case 52: {
+            LogStep(52, "Validate constraints of attribute: RxAddressFilteredCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id, true, chip::NullOptional);
         }
-        case 51: {
-            LogStep(51, "Validate constraints of attribute: RxDestAddrFilteredCount");
+        case 53: {
+            LogStep(53, "Validate constraints of attribute: RxDestAddrFilteredCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id, true, chip::NullOptional);
         }
-        case 52: {
-            LogStep(52, "Validate constraints of attribute: RxDuplicatedCount");
+        case 54: {
+            LogStep(54, "Validate constraints of attribute: RxDuplicatedCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id, true, chip::NullOptional);
         }
-        case 53: {
-            LogStep(53, "Validate constraints of attribute: RxErrNoFrameCount");
+        case 55: {
+            LogStep(55, "Validate constraints of attribute: RxErrNoFrameCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id, true, chip::NullOptional);
         }
-        case 54: {
-            LogStep(54, "Validate constraints of attribute: RxErrUnknownNeighborCount");
+        case 56: {
+            LogStep(56, "Validate constraints of attribute: RxErrUnknownNeighborCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id, true, chip::NullOptional);
         }
-        case 55: {
-            LogStep(55, "Validate constraints of attribute: RxErrInvalidSrcAddrCount");
+        case 57: {
+            LogStep(57, "Validate constraints of attribute: RxErrInvalidSrcAddrCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id, true, chip::NullOptional);
         }
-        case 56: {
-            LogStep(56, "Validate constraints of attribute: RxErrInvalidSrcAddrCount");
+        case 58: {
+            LogStep(58, "Validate constraints of attribute: RxErrInvalidSrcAddrCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id, true, chip::NullOptional);
         }
-        case 57: {
-            LogStep(57, "Validate constraints of attribute: RxErrFcsCount");
+        case 59: {
+            LogStep(59, "Validate constraints of attribute: RxErrFcsCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id, true, chip::NullOptional);
         }
-        case 58: {
-            LogStep(58, "Validate constraints of attribute: RxErrOtherCount");
+        case 60: {
+            LogStep(60, "Validate constraints of attribute: RxErrOtherCount");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id, true, chip::NullOptional);
         }
-        case 59: {
-            LogStep(59, "Validate constraints of attribute: ActiveTimestamp");
+        case 61: {
+            LogStep(61, "Validate constraints of attribute: ActiveTimestamp");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id, true, chip::NullOptional);
         }
-        case 60: {
-            LogStep(60, "Validate constraints of attribute: PendingTimestamp");
+        case 62: {
+            LogStep(62, "Validate constraints of attribute: PendingTimestamp");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id, true, chip::NullOptional);
         }
-        case 61: {
-            LogStep(61, "Validate constraints of attribute: delay");
+        case 63: {
+            LogStep(63, "Validate constraints of attribute: delay");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::Delay::Id, true, chip::NullOptional);
         }
-        case 62: {
-            LogStep(62, "read SecurityPolicy struct attribute from DUT and Verify the each field");
+        case 64: {
+            LogStep(64, "read SecurityPolicy struct attribute from DUT and Verify the each field");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
@@ -33899,13 +34379,13 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 63: {
-            LogStep(63, "Validate constraints of attribute: ChannelPage0Mask");
+        case 65: {
+            LogStep(65, "Validate constraints of attribute: ChannelPage0Mask");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::ChannelMask::Id, true, chip::NullOptional);
         }
-        case 64: {
-            LogStep(64, "read OperationalDatasetComponents struct attribute from DUT and Verify the each field");
+        case 66: {
+            LogStep(66, "read OperationalDatasetComponents struct attribute from DUT and Verify the each field");
             VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
@@ -33914,8 +34394,8 @@ class Test_TC_DIAG_TH_NW_1_2Suite : public TestCommand
             value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
             return UserPrompt(kIdentityAlpha, value);
         }
-        case 65: {
-            LogStep(65, "read ActiveNetworkFaults attribute value");
+        case 67: {
+            LogStep(67, "read ActiveNetworkFaults attribute value");
             VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id, true, chip::NullOptional);
@@ -34791,11 +35271,10 @@ class Test_TC_ULABEL_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
+class Test_TC_DGWIFI_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_WIFIDIAG_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_WIFIDIAG_1_1", 7, credsIssuerConfig)
+    Test_TC_DGWIFI_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGWIFI_2_1", 14, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -34803,7 +35282,7 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_WIFIDIAG_1_1Suite() {}
+    ~Test_TC_DGWIFI_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -34843,14 +35322,6 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
             }
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNull("securityType", value));
-            }
-            break;
-        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> value;
@@ -34858,7 +35329,7 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "enum"));
             }
             break;
-        case 4:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> value;
@@ -34868,7 +35339,7 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 5));
             }
             break;
-        case 5:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -34876,7 +35347,7 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
             }
             break;
-        case 6:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -34886,6 +35357,70 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 0));
             }
             break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+            }
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+            }
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+            }
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+            }
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+            }
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint32"));
+            }
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint64_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+            }
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint64_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint64"));
+            }
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -34914,40 +35449,81 @@ class Test_TC_WIFIDIAG_1_1Suite : public TestCommand
                                  GeneralDiagnostics::Attributes::NetworkInterfaces::Id, true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Reads SecurityType attribute from DUT");
+            LogStep(2, "Reads SecurityType attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
                                  WiFiNetworkDiagnostics::Attributes::SecurityType::Id, true, chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Reads SecurityType attribute constraints");
+            LogStep(3, "Reads WiFiVersion attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
-                                 WiFiNetworkDiagnostics::Attributes::SecurityType::Id, true, chip::NullOptional);
+                                 WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Reads WiFiVersion attribute constraints");
+            LogStep(4, "Reads ChannelNumber attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
-                                 WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id, true, chip::NullOptional);
+                                 WiFiNetworkDiagnostics::Attributes::ChannelNumber::Id, true, chip::NullOptional);
         }
         case 5: {
-            LogStep(5, "Reads ChannelNumber attribute constraints");
+            LogStep(5, "Reads RSSI attribute constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
-                                 WiFiNetworkDiagnostics::Attributes::ChannelNumber::Id, true, chip::NullOptional);
+                                 WiFiNetworkDiagnostics::Attributes::Rssi::Id, true, chip::NullOptional);
         }
         case 6: {
-            LogStep(6, "Reads RSSI attribute constraints");
+            LogStep(6, "Reads BeaconLostCount attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
-                                 WiFiNetworkDiagnostics::Attributes::Rssi::Id, true, chip::NullOptional);
+                                 WiFiNetworkDiagnostics::Attributes::BeaconLostCount::Id, true, chip::NullOptional);
+        }
+        case 7: {
+            LogStep(7, "Reads BeaconRxCount attribute constraints");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::BeaconRxCount::Id, true, chip::NullOptional);
+        }
+        case 8: {
+            LogStep(8, "Reads PacketMulticastRxCount attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::Id, true, chip::NullOptional);
+        }
+        case 9: {
+            LogStep(9, "Reads PacketMulticastTxCount attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::Id, true, chip::NullOptional);
+        }
+        case 10: {
+            LogStep(10, "Reads PacketUnicastRxCount attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id, true, chip::NullOptional);
+        }
+        case 11: {
+            LogStep(11, "Reads PacketUnicastTxCount attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::Id, true, chip::NullOptional);
+        }
+        case 12: {
+            LogStep(12, "Reads CurrentMaxRate attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::Id, true, chip::NullOptional);
+        }
+        case 13: {
+            LogStep(13, "Reads OverrunCount attribute constraints");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), WiFiNetworkDiagnostics::Id,
+                                 WiFiNetworkDiagnostics::Attributes::OverrunCount::Id, true, chip::NullOptional);
         }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_WIFIDIAG_3_1Suite : public TestCommand
+class Test_TC_DGWIFI_2_3Suite : public TestCommand
 {
 public:
-    Test_TC_WIFIDIAG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_WIFIDIAG_3_1", 8, credsIssuerConfig)
+    Test_TC_DGWIFI_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGWIFI_2_3", 8, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -34955,7 +35531,7 @@ class Test_TC_WIFIDIAG_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_WIFIDIAG_3_1Suite() {}
+    ~Test_TC_DGWIFI_2_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -35304,7 +35880,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand
 class Test_TC_WNCV_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_WNCV_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_1", 55, credsIssuerConfig)
+    Test_TC_WNCV_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_1", 26, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -35352,40 +35928,16 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
             }
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::WindowCovering::Type value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 250));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "map8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 63));
             }
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "map8"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 128));
-            }
-            break;
-        case 7:
+        case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -35395,19 +35947,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 63));
             }
             break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "map8"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 128));
-            }
-            break;
-        case 10:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::WindowCovering::EndProductType value;
@@ -35417,40 +35957,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 23));
             }
             break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::WindowCovering::EndProductType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 250));
-            }
-            break;
-        case 13:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "map8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 15));
             }
             break;
-        case 14:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("mode", value, 8));
-            }
-            break;
-        case 16:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
@@ -35460,19 +35980,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
             }
             break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 20000U));
-            }
-            break;
-        case 19:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
@@ -35482,19 +35990,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
             }
             break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 20000U));
-            }
-            break;
-        case 22:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
@@ -35504,19 +36000,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
             }
             break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 20000U));
-            }
-            break;
-        case 25:
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
@@ -35526,19 +36010,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
             }
             break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 20000U));
-            }
-            break;
-        case 28:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -35548,10 +36020,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 30:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -35561,7 +36030,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 31:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -35571,10 +36040,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 33:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -35584,30 +36050,29 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 34:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintType("value", "", "map16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 2047U));
             }
             break;
-        case 35:
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
-        case 36:
+        case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
+                VerifyOrReturn(CheckConstraintType("value", "", "map16"));
+                VerifyOrReturn(CheckConstraintNotValue("value", value, 4096U));
             }
             break;
-        case 37:
+        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -35617,10 +36082,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 39:
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -35630,29 +36092,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "map16"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 2047U));
-            }
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "map16"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 4096U));
-            }
-            break;
-        case 43:
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -35662,10 +36102,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 45:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -35675,30 +36112,27 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 46:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint16_t> value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 48:
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<uint16_t> value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
             }
             break;
-        case 49:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
@@ -35708,19 +36142,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 100));
             }
             break;
-        case 50:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 51:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "Percent"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 200));
-            }
-            break;
-        case 52:
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
@@ -35730,18 +36152,6 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 100));
             }
             break;
-        case 53:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 54:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "", "Percent"));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 200));
-            }
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -35765,346 +36175,158 @@ class Test_TC_WNCV_2_1Suite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "2: read the RO mandatory attribute default: Type");
+            LogStep(1, "1a: read the RO mandatory attribute default: Type");
+            VerifyOrDo(!ShouldSkip("A_TYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Type::Id, true,
                                  chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "3a: write a value into the RO mandatory attribute: Type");
-            ListFreer listFreer;
-            chip::app::Clusters::WindowCovering::Type value;
-            value = static_cast<chip::app::Clusters::WindowCovering::Type>(250);
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Type::Id, value,
-                                  chip::NullOptional, chip::NullOptional);
-        }
-        case 3: {
-            LogStep(3, "3b: reads back the RO mandatory attribute: Type");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Type::Id, true,
-                                 chip::NullOptional);
-        }
-        case 4: {
-            LogStep(4, "2: read the RO mandatory attribute default: ConfigStatus");
+            LogStep(2, "1b: read the RO mandatory attribute default: ConfigStatus");
+            VerifyOrDo(!ShouldSkip("A_CONFIGSTATUS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::ConfigStatus::Id,
                                  true, chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "3a: write a value into the RO mandatory attribute: ConfigStatus");
-            ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus>>(128);
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::ConfigStatus::Id,
-                                  value, chip::NullOptional, chip::NullOptional);
-        }
-        case 6: {
-            LogStep(6, "3b: reads back the RO mandatory attribute: ConfigStatus");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::ConfigStatus::Id,
-                                 true, chip::NullOptional);
-        }
-        case 7: {
-            LogStep(7, "2: read the RO mandatory attribute default: OperationalStatus");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::OperationalStatus::Id, true, chip::NullOptional);
-        }
-        case 8: {
-            LogStep(8, "3a: write a value into the RO mandatory attribute: OperationalStatus");
-            ListFreer listFreer;
-            uint8_t value;
-            value = 128;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::OperationalStatus::Id, value, chip::NullOptional, chip::NullOptional);
-        }
-        case 9: {
-            LogStep(9, "3b: reads back the RO mandatory attribute: OperationalStatus");
+        case 3: {
+            LogStep(3, "1c: read the RO mandatory attribute default: OperationalStatus");
+            VerifyOrDo(!ShouldSkip("A_OPERATIONALSTATUS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::OperationalStatus::Id, true, chip::NullOptional);
         }
-        case 10: {
-            LogStep(10, "2: read the RO mandatory attribute default: EndProductType");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::EndProductType::Id,
-                                 true, chip::NullOptional);
-        }
-        case 11: {
-            LogStep(11, "3a: write a value into the RO mandatory attribute: EndProductType");
-            ListFreer listFreer;
-            chip::app::Clusters::WindowCovering::EndProductType value;
-            value = static_cast<chip::app::Clusters::WindowCovering::EndProductType>(250);
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::EndProductType::Id, value, chip::NullOptional, chip::NullOptional);
-        }
-        case 12: {
-            LogStep(12, "3b: reads back the RO mandatory attribute: EndProductType");
+        case 4: {
+            LogStep(4, "1d: read the RO mandatory attribute default: EndProductType");
+            VerifyOrDo(!ShouldSkip("A_ENDPRODUCTTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::EndProductType::Id,
                                  true, chip::NullOptional);
         }
-        case 13: {
-            LogStep(13, "2: read the RW mandatory attribute default: Mode");
+        case 5: {
+            LogStep(5, "1e: read the RW mandatory attribute default: Mode");
+            VerifyOrDo(!ShouldSkip("A_MODE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, true,
                                  chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "3a: write a value into the RW mandatory attribute:: Mode");
+        case 6: {
+            LogStep(6, "1f: write a value into the RW mandatory attribute:: Mode");
+            VerifyOrDo(!ShouldSkip("A_MODE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(8);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "3b: reads back the RW mandatory attribute: Mode");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, true,
-                                 chip::NullOptional);
-        }
-        case 16: {
-            LogStep(16, "2: read the RO optional attribute default: TargetPositionLiftPercent100ths");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id, true, chip::NullOptional);
-        }
-        case 17: {
-            LogStep(17, "3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
-            value.SetNonNull();
-            value.Value() = 20000U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 18: {
-            LogStep(18, "3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths");
+        case 7: {
+            LogStep(7, "2a: read the RO optional attribute default: TargetPositionLiftPercent100ths");
+            VerifyOrDo(!ShouldSkip("A_TARGETPOSITIONLIFTPERCENT100THS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id, true, chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "2: read the RO optional attribute default: TargetPositionTiltPercent100ths");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id, true, chip::NullOptional);
-        }
-        case 20: {
-            LogStep(20, "3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
-            value.SetNonNull();
-            value.Value() = 20000U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 21: {
-            LogStep(21, "3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths");
+        case 8: {
+            LogStep(8, "2b: read the RO optional attribute default: TargetPositionTiltPercent100ths");
+            VerifyOrDo(!ShouldSkip("A_TARGETPOSITIONTILTPERCENT100THS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id, true, chip::NullOptional);
         }
-        case 22: {
-            LogStep(22, "2: read the RO optional attribute default: CurrentPositionLiftPercent100ths");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, true, chip::NullOptional);
-        }
-        case 23: {
-            LogStep(23, "3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
-            value.SetNonNull();
-            value.Value() = 20000U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 24: {
-            LogStep(24, "3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths");
+        case 9: {
+            LogStep(9, "2c: read the RO optional attribute default: CurrentPositionLiftPercent100ths");
+            VerifyOrDo(!ShouldSkip("A_CURRENTPOSITIONLIFTPERCENT100THS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, true, chip::NullOptional);
         }
-        case 25: {
-            LogStep(25, "2: read the RO optional attribute default: CurrentPositionTiltPercent100ths");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, true, chip::NullOptional);
-        }
-        case 26: {
-            LogStep(26, "3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
-            value.SetNonNull();
-            value.Value() = 20000U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 27: {
-            LogStep(27, "3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths");
+        case 10: {
+            LogStep(10, "2d: read the RO optional attribute default: CurrentPositionTiltPercent100ths");
+            VerifyOrDo(!ShouldSkip("A_CURRENTPOSITIONTILTPERCENT100THS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, true, chip::NullOptional);
         }
-        case 28: {
-            LogStep(28, "2: read the RO optional attribute default: InstalledOpenLimitLift");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::InstalledOpenLimitLift::Id, true, chip::NullOptional);
-        }
-        case 29: {
-            LogStep(29, "3a: write a value into the RO optional attribute: InstalledOpenLimitLift");
-            ListFreer listFreer;
-            uint16_t value;
-            value = 255U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::InstalledOpenLimitLift::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 30: {
-            LogStep(30, "3b: reads back the RO optional attribute: InstalledOpenLimitLift");
+        case 11: {
+            LogStep(11, "2e: read the RO optional attribute default: InstalledOpenLimitLift");
+            VerifyOrDo(!ShouldSkip("A_INSTALLEDOPENLIMITLIFT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::InstalledOpenLimitLift::Id, true, chip::NullOptional);
         }
-        case 31: {
-            LogStep(31, "2: read the RO optional attribute default: InstalledClosedLimitLift");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::InstalledClosedLimitLift::Id, true, chip::NullOptional);
-        }
-        case 32: {
-            LogStep(32, "3a: write a value into the RO optional attribute: InstalledClosedLimitLift");
-            ListFreer listFreer;
-            uint16_t value;
-            value = 255U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::InstalledClosedLimitLift::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 33: {
-            LogStep(33, "3b: reads back the RO optional attribute: InstalledClosedLimitLift");
+        case 12: {
+            LogStep(12, "2f: read the RO optional attribute default: InstalledClosedLimitLift");
+            VerifyOrDo(!ShouldSkip("A_INSTALLEDCLOSEDLIMITLIFT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::InstalledClosedLimitLift::Id, true, chip::NullOptional);
         }
-        case 34: {
-            LogStep(34, "2: read the RO optional attribute default: InstalledOpenLimitTilt");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::InstalledOpenLimitTilt::Id, true, chip::NullOptional);
-        }
-        case 35: {
-            LogStep(35, "3a: write a value into the RO optional attribute: InstalledOpenLimitTilt");
-            ListFreer listFreer;
-            uint16_t value;
-            value = 255U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::InstalledOpenLimitTilt::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 36: {
-            LogStep(36, "3b: reads back the RO optional attribute: InstalledOpenLimitTilt");
+        case 13: {
+            LogStep(13, "2g: read the RO optional attribute default: InstalledOpenLimitTilt");
+            VerifyOrDo(!ShouldSkip("A_INSTALLEDOPENLIMITTILT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::InstalledOpenLimitTilt::Id, true, chip::NullOptional);
         }
-        case 37: {
-            LogStep(37, "2: read the RO optional attribute default: InstalledClosedLimitTilt");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::InstalledClosedLimitTilt::Id, true, chip::NullOptional);
-        }
-        case 38: {
-            LogStep(38, "3a: write a value into the RO optional attribute: InstalledClosedLimitTilt");
-            ListFreer listFreer;
-            uint16_t value;
-            value = 255U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::InstalledClosedLimitTilt::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 39: {
-            LogStep(39, "3b: reads back the RO optional attribute: InstalledClosedLimitTilt");
+        case 14: {
+            LogStep(14, "2h: read the RO optional attribute default: InstalledClosedLimitTilt");
+            VerifyOrDo(!ShouldSkip("A_INSTALLEDCLOSEDLIMITTILT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::InstalledClosedLimitTilt::Id, true, chip::NullOptional);
         }
-        case 40: {
-            LogStep(40, "4: read the RO mandatory attribute default: SafetyStatus");
+        case 15: {
+            LogStep(15, "3a: read the RO mandatory attribute default: SafetyStatus");
+            VerifyOrDo(!ShouldSkip("A_SAFETYSTATUS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::SafetyStatus::Id,
                                  true, chip::NullOptional);
         }
-        case 41: {
-            LogStep(41, "5a: write a value into the RO mandatory attribute: SafetyStatus");
+        case 16: {
+            LogStep(16, "3a.2: write a value into the RO mandatory attribute: SafetyStatus");
+            VerifyOrDo(!ShouldSkip("A_SAFETYSTATUS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             uint16_t value;
             value = 4096U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::SafetyStatus::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 42: {
-            LogStep(42, "5b: reads back the RO mandatory attribute: SafetyStatus");
+        case 17: {
+            LogStep(17, "3a.3: reads back the RO mandatory attribute: SafetyStatus");
+            VerifyOrDo(!ShouldSkip("A_SAFETYSTATUS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::SafetyStatus::Id,
                                  true, chip::NullOptional);
         }
-        case 43: {
-            LogStep(43, "4: read the RO optional attribute default: CurrentPositionLift");
+        case 18: {
+            LogStep(18, "3b: read the RO optional attribute default: PhysicalClosedLimitLift");
+            VerifyOrDo(!ShouldSkip("A_PHYSICALCLOSEDLIMITLIFT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionLift::Id, true, chip::NullOptional);
+                                 WindowCovering::Attributes::PhysicalClosedLimitLift::Id, true, chip::NullOptional);
         }
-        case 44: {
-            LogStep(44, "5a: write a value into the RO optional attribute: CurrentPositionLift");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<uint16_t> value;
-            value.SetNonNull();
-            value.Value() = 255U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::CurrentPositionLift::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
+        case 19: {
+            LogStep(19, "3c: read the RO optional attribute default: PhysicalClosedLimitTilt");
+            VerifyOrDo(!ShouldSkip("A_PHYSICALCLOSEDLIMITTILT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::PhysicalClosedLimitTilt::Id, true, chip::NullOptional);
         }
-        case 45: {
-            LogStep(45, "5b: reads back the RO optional attribute: CurrentPositionLift");
+        case 20: {
+            LogStep(20, "3d: read the RO optional attribute default: CurrentPositionLift");
+            VerifyOrDo(!ShouldSkip("A_CURRENTPOSITIONLIFT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionLift::Id, true, chip::NullOptional);
         }
-        case 46: {
-            LogStep(46, "4: read the RO optional attribute default: CurrentPositionTilt");
+        case 21: {
+            LogStep(21, "3e: read the RO optional attribute default: CurrentPositionTilt");
+            VerifyOrDo(!ShouldSkip("A_CURRENTPOSITIONTILT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionTilt::Id, true, chip::NullOptional);
         }
-        case 47: {
-            LogStep(47, "5a: write a value into the RO optional attribute: CurrentPositionTilt");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<uint16_t> value;
-            value.SetNonNull();
-            value.Value() = 255U;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::CurrentPositionTilt::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 48: {
-            LogStep(48, "5b: reads back the RO optional attribute: CurrentPositionTilt");
+        case 22: {
+            LogStep(22, "3f: read the RO optional attribute default: NumberOfActuationsLift");
+            VerifyOrDo(!ShouldSkip("A_NUMBEROFACTUATIONSLIFT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionTilt::Id, true, chip::NullOptional);
+                                 WindowCovering::Attributes::NumberOfActuationsLift::Id, true, chip::NullOptional);
         }
-        case 49: {
-            LogStep(49, "4: read the RO optional attribute default: CurrentPositionLiftPercentage");
+        case 23: {
+            LogStep(23, "3g: read the RO optional attribute default: NumberOfActuationsTilt");
+            VerifyOrDo(!ShouldSkip("A_NUMBEROFACTUATIONSTILT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, true, chip::NullOptional);
+                                 WindowCovering::Attributes::NumberOfActuationsTilt::Id, true, chip::NullOptional);
         }
-        case 50: {
-            LogStep(50, "5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::Percent> value;
-            value.SetNonNull();
-            value.Value() = 200;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 51: {
-            LogStep(51, "5b: reads back the RO optional attribute: CurrentPositionLiftPercentage");
+        case 24: {
+            LogStep(24, "3h: read the RO optional attribute default: CurrentPositionLiftPercentage");
+            VerifyOrDo(!ShouldSkip("A_CURRENTPOSITIONLIFTPERCENTAGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, true, chip::NullOptional);
         }
-        case 52: {
-            LogStep(52, "4: read the RO optional attribute default: CurrentPositionTiltPercentage");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionTiltPercentage::Id, true, chip::NullOptional);
-        }
-        case 53: {
-            LogStep(53, "5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::Percent> value;
-            value.SetNonNull();
-            value.Value() = 200;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                  WindowCovering::Attributes::CurrentPositionTiltPercentage::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 54: {
-            LogStep(54, "5b: reads back the RO optional attribute: CurrentPositionTiltPercentage");
+        case 25: {
+            LogStep(25, "3i:read the RO optional attribute default: CurrentPositionTiltPercentage");
+            VerifyOrDo(!ShouldSkip("A_CURRENTPOSITIONTILTPERCENTAGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionTiltPercentage::Id, true, chip::NullOptional);
         }
@@ -36234,8 +36456,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> configStatusValA;
-    chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> configStatusValB;
+    chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> configStatusValA;
+    chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> configStatusValB;
 
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
@@ -36259,7 +36481,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 4));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36271,7 +36493,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36283,7 +36505,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36299,7 +36521,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36308,7 +36530,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36323,7 +36545,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36339,7 +36561,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 1));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36348,7 +36570,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
+                chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
@@ -36383,8 +36605,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
             LogStep(1, "1a: TH set the Mode Attribute bit0 of the DUT");
             VerifyOrDo(!ShouldSkip("WNCV_REVERSAL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(1);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(1);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -36398,8 +36620,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
             LogStep(3, "1c: TH clear the Mode Attribute bit0 of the DUT");
             VerifyOrDo(!ShouldSkip("WNCV_REVERSAL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(0);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -36413,8 +36635,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
             LogStep(5, "2a: TH set the Mode Attribute bit1 of the DUT");
             VerifyOrDo(!ShouldSkip("WNCV_CALIBRATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(2);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(2);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -36438,8 +36660,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
             LogStep(8, "2d: TH clear the Mode Attribute bit1 of the DUT");
             VerifyOrDo(!ShouldSkip("WNCV_CALIBRATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(0);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -36469,8 +36691,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
             LogStep(12, "3a: TH set the Mode Attribute bit2 of the DUT");
             VerifyOrDo(!ShouldSkip("WNCV_MAINTENANCE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(4);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(4);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -36494,8 +36716,8 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
             LogStep(15, "3d: TH clear the Mode Attribute bit2 of the DUT");
             VerifyOrDo(!ShouldSkip("WNCV_MAINTENANCE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::WindowCovering::Mode> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::WindowCovering::Mode>>(0);
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Mode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -36529,7 +36751,7 @@ class Test_TC_WNCV_2_3Suite : public TestCommand
 class Test_TC_WNCV_2_4Suite : public TestCommand
 {
 public:
-    Test_TC_WNCV_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_4", 3, credsIssuerConfig)
+    Test_TC_WNCV_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_4", 2, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -36567,14 +36789,6 @@ class Test_TC_WNCV_2_4Suite : public TestCommand
             shouldContinue = true;
             break;
         case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::WindowCovering::Type value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("type", value, 0));
-            }
-            break;
-        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::WindowCovering::Type value;
@@ -36612,12 +36826,6 @@ class Test_TC_WNCV_2_4Suite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Type::Id, true,
                                  chip::NullOptional);
         }
-        case 2: {
-            LogStep(2, "Reads Type attribute constraints");
-            VerifyOrDo(!ShouldSkip("A_TYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::Type::Id, true,
-                                 chip::NullOptional);
-        }
         }
         return CHIP_NO_ERROR;
     }
@@ -36626,7 +36834,7 @@ class Test_TC_WNCV_2_4Suite : public TestCommand
 class Test_TC_WNCV_2_5Suite : public TestCommand
 {
 public:
-    Test_TC_WNCV_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_5", 3, credsIssuerConfig)
+    Test_TC_WNCV_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_5", 2, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -36669,13 +36877,6 @@ class Test_TC_WNCV_2_5Suite : public TestCommand
                 chip::app::Clusters::WindowCovering::EndProductType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("endProductType", value, 0));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::WindowCovering::EndProductType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 23));
@@ -36709,12 +36910,6 @@ class Test_TC_WNCV_2_5Suite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::EndProductType::Id,
                                  true, chip::NullOptional);
         }
-        case 2: {
-            LogStep(2, "Reads EndProductType attribute constraints from DUT");
-            VerifyOrDo(!ShouldSkip("A_ENDPRODUCTTYPE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Attributes::EndProductType::Id,
-                                 true, chip::NullOptional);
-        }
         }
         return CHIP_NO_ERROR;
     }
@@ -37805,7 +38000,7 @@ class Test_TC_WNCV_3_3Suite : public TestCommand
 class Test_TC_WNCV_3_4Suite : public TestCommand
 {
 public:
-    Test_TC_WNCV_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_4", 9, credsIssuerConfig)
+    Test_TC_WNCV_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_4", 10, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -37861,6 +38056,14 @@ class Test_TC_WNCV_3_4Suite : public TestCommand
             shouldContinue = true;
             break;
         case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("operationalStatus", value, 0));
+            }
+            break;
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
@@ -37869,7 +38072,7 @@ class Test_TC_WNCV_3_4Suite : public TestCommand
                 VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 0U));
             }
             break;
-        case 6:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
@@ -37878,7 +38081,7 @@ class Test_TC_WNCV_3_4Suite : public TestCommand
                 VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 0));
             }
             break;
-        case 7:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
@@ -37887,7 +38090,7 @@ class Test_TC_WNCV_3_4Suite : public TestCommand
                 VerifyOrReturn(CheckValue("currentPositionTiltPercent100ths.Value()", value.Value(), 0U));
             }
             break;
-        case 8:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
@@ -37951,26 +38154,31 @@ class Test_TC_WNCV_3_4Suite : public TestCommand
             return WaitForMs(kIdentityAlpha, value);
         }
         case 5: {
-            LogStep(5, "3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT");
+            LogStep(5, "2c: TH reads OperationalStatus attribute from DUT");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::OperationalStatus::Id, true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT");
             VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT");
+        case 7: {
+            LogStep(7, "3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT");
             VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT");
+        case 8: {
+            LogStep(8, "3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT");
             VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, true, chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT");
+        case 9: {
+            LogStep(9, "3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT");
             VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
@@ -37984,7 +38192,7 @@ class Test_TC_WNCV_3_4Suite : public TestCommand
 class Test_TC_WNCV_3_5Suite : public TestCommand
 {
 public:
-    Test_TC_WNCV_3_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_5", 9, credsIssuerConfig)
+    Test_TC_WNCV_3_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_5", 10, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -38040,204 +38248,6 @@ class Test_TC_WNCV_3_5Suite : public TestCommand
             shouldContinue = true;
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercent100ths", value));
-                VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 10000U));
-            }
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercentage", value));
-                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 100));
-            }
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("currentPositionTiltPercent100ths", value));
-                VerifyOrReturn(CheckValue("currentPositionTiltPercent100ths.Value()", value.Value(), 10000U));
-            }
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("currentPositionTiltPercentage", value));
-                VerifyOrReturn(CheckValue("currentPositionTiltPercentage.Value()", value.Value(), 100));
-            }
-            break;
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        case 0: {
-            LogStep(0, "0: Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction");
-            ListFreer listFreer;
-            chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Type value;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Commands::UpOrOpen::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 2: {
-            LogStep(2, "1b: TH Waits for fastMotionDuration seconds movement(s) on the device");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 3: {
-            LogStep(3, "2a: TH sends DownOrClose command to DUT");
-            ListFreer listFreer;
-            chip::app::Clusters::WindowCovering::Commands::DownOrClose::Type value;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Commands::DownOrClose::Id, value,
-                               chip::NullOptional
-
-            );
-        }
-        case 4: {
-            LogStep(4, "2b: TH Waits for fullMotionDuration seconds movement(s) on the device");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 5: {
-            LogStep(5, "3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT");
-            VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, true, chip::NullOptional);
-        }
-        case 6: {
-            LogStep(6, "3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT");
-            VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, true, chip::NullOptional);
-        }
-        case 7: {
-            LogStep(7, "3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT");
-            VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, true, chip::NullOptional);
-        }
-        case 8: {
-            LogStep(8, "3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT");
-            VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
-                                 WindowCovering::Attributes::CurrentPositionTiltPercentage::Id, true, chip::NullOptional);
-        }
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_WNCV_4_1Suite : public TestCommand
-{
-public:
-    Test_TC_WNCV_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_4_1", 18, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_WNCV_4_1Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mFullMotionDuration;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, 0U));
-            }
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("targetPositionLiftPercent100ths", value));
-                VerifyOrReturn(CheckValue("targetPositionLiftPercent100ths.Value()", value.Value(), 2500U));
-            }
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -38245,68 +38255,279 @@ class Test_TC_WNCV_4_1Suite : public TestCommand
                 VerifyOrReturn(CheckValue("operationalStatus", value, 0));
             }
             break;
-        case 9:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercent100ths", value));
-                VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 2500U));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 10000U));
             }
             break;
-        case 10:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercentage", value));
-                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 25));
-            }
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::Nullable<chip::Percent100ths> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("targetPositionLiftPercent100ths", value));
-                VerifyOrReturn(CheckValue("targetPositionLiftPercent100ths.Value()", value.Value(), 7520U));
-            }
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint8_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("operationalStatus", value, 0));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 100));
             }
             break;
-        case 16:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent100ths> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercent100ths", value));
-                VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 7520U));
+                VerifyOrReturn(CheckValueNonNull("currentPositionTiltPercent100ths", value));
+                VerifyOrReturn(CheckValue("currentPositionTiltPercent100ths.Value()", value.Value(), 10000U));
             }
             break;
-        case 17:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercentage", value));
-                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 75));
+                VerifyOrReturn(CheckValueNonNull("currentPositionTiltPercentage", value));
+                VerifyOrReturn(CheckValue("currentPositionTiltPercentage.Value()", value.Value(), 100));
+            }
+            break;
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        case 0: {
+            LogStep(0, "0: Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction");
+            ListFreer listFreer;
+            chip::app::Clusters::WindowCovering::Commands::UpOrOpen::Type value;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Commands::UpOrOpen::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 2: {
+            LogStep(2, "1b: TH Waits for fastMotionDuration seconds movement(s) on the device");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 3: {
+            LogStep(3, "2a: TH sends DownOrClose command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::WindowCovering::Commands::DownOrClose::Type value;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id, WindowCovering::Commands::DownOrClose::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 4: {
+            LogStep(4, "2b: TH Waits for fullMotionDuration seconds movement(s) on the device");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "2c: TH reads OperationalStatus attribute from DUT");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::OperationalStatus::Id, true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT");
+            VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, true, chip::NullOptional);
+        }
+        case 7: {
+            LogStep(7, "3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT");
+            VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, true, chip::NullOptional);
+        }
+        case 8: {
+            LogStep(8, "3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT");
+            VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, true, chip::NullOptional);
+        }
+        case 9: {
+            LogStep(9, "3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT");
+            VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::CurrentPositionTiltPercentage::Id, true, chip::NullOptional);
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_WNCV_4_1Suite : public TestCommand
+{
+public:
+    Test_TC_WNCV_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_4_1", 18, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_WNCV_4_1Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mFullMotionDuration;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent100ths> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintNotValue("value", value, 0U));
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent100ths> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("targetPositionLiftPercent100ths", value));
+                VerifyOrReturn(CheckValue("targetPositionLiftPercent100ths.Value()", value.Value(), 2500U));
+            }
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("operationalStatus", value, 0));
+            }
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent100ths> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercent100ths", value));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 2500U));
+            }
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercentage", value));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 25));
+            }
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent100ths> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("targetPositionLiftPercent100ths", value));
+                VerifyOrReturn(CheckValue("targetPositionLiftPercent100ths.Value()", value.Value(), 7520U));
+            }
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("operationalStatus", value, 0));
+            }
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent100ths> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercent100ths", value));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercent100ths.Value()", value.Value(), 7520U));
+            }
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercentage", value));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(), 75));
             }
             break;
         default:
@@ -38755,7 +38976,7 @@ class Test_TC_WNCV_4_2Suite : public TestCommand
 class Test_TC_WNCV_4_3Suite : public TestCommand
 {
 public:
-    Test_TC_WNCV_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_4_3", 5, credsIssuerConfig)
+    Test_TC_WNCV_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_4_3", 6, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -38805,7 +39026,16 @@ class Test_TC_WNCV_4_3Suite : public TestCommand
             }
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::Percent> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("currentPositionLiftPercentage", value));
+                VerifyOrReturn(CheckValue("currentPositionLiftPercentage.Value()", value.Value(),
+                                          static_cast<uint8_t>(attrCurrentPositionLiftPercent100ths.Value() / 100)));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 100));
+            }
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -38813,6 +39043,9 @@ class Test_TC_WNCV_4_3Suite : public TestCommand
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -38842,7 +39075,16 @@ class Test_TC_WNCV_4_3Suite : public TestCommand
                                  WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id, true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "2b: TH sends GoToLiftPercentage command with BadParam to DUT");
+            LogStep(2,
+                    "1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from DUT + assert "
+                    "CurrentPositionLiftPercent100ths/100 equals CurrentPositionLiftPercentage");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
+                                 WindowCovering::Attributes::CurrentPositionLiftPercentage::Id, true, chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "2b: TH sends GoToLiftPercentage command with BadParam to DUT");
             VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
@@ -38853,8 +39095,8 @@ class Test_TC_WNCV_4_3Suite : public TestCommand
 
             );
         }
-        case 3: {
-            LogStep(3, "3a: TH sends GoToLiftPercentage command with 10001 to DUT");
+        case 4: {
+            LogStep(4, "3a: TH sends GoToLiftPercentage command with 10001 to DUT");
             VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
@@ -38865,8 +39107,8 @@ class Test_TC_WNCV_4_3Suite : public TestCommand
 
             );
         }
-        case 4: {
-            LogStep(4, "4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT");
+        case 5: {
+            LogStep(5, "4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT");
             VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
@@ -38907,7 +39149,6 @@ class Test_TC_WNCV_4_4Suite : public TestCommand
     chip::Optional<uint16_t> mTimeout;
 
     chip::app::DataModel::Nullable<chip::Percent100ths> attrCurrentPositionTiltPercent100ths;
-    chip::app::DataModel::Nullable<chip::Percent> attrCurrentPositionTiltPercentage;
 
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
@@ -38940,9 +39181,11 @@ class Test_TC_WNCV_4_4Suite : public TestCommand
             {
                 chip::app::DataModel::Nullable<chip::Percent> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("currentPositionTiltPercentage", value));
+                VerifyOrReturn(CheckValue("currentPositionTiltPercentage.Value()", value.Value(),
+                                          static_cast<uint8_t>(attrCurrentPositionTiltPercent100ths.Value() / 100)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 100));
-                attrCurrentPositionTiltPercentage = value;
             }
             break;
         case 3:
@@ -38983,8 +39226,10 @@ class Test_TC_WNCV_4_4Suite : public TestCommand
                                  WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id, true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "1b: If (PA_TL & TL) TH reads CurrentPositionTiltPercentage from DUT");
-            VerifyOrDo(!ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE"),
+            LogStep(2,
+                    "1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from DUT + assert "
+                    "CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage");
+            VerifyOrDo(!ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONTILTPERCENTAGE"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), WindowCovering::Id,
                                  WindowCovering::Attributes::CurrentPositionTiltPercentage::Id, true, chip::NullOptional);
@@ -41417,7 +41662,7 @@ class TV_MediaInputClusterSuite : public TestCommand
 class TestClusterSuite : public TestCommand
 {
 public:
-    TestClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestCluster", 487, credsIssuerConfig)
+    TestClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestCluster", 489, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -41451,7 +41696,7 @@ class TestClusterSuite : public TestCommand
     chip::Optional<uint16_t> mTimeout;
 
     chip::app::DataModel::Nullable<bool> booValueNull;
-    chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> nullableValue254;
+    chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> nullableValue254;
     chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> nullableEnumAttr254;
     uint8_t * nullableOctetStrTestValueBuffer = nullptr;
     chip::app::DataModel::Nullable<chip::ByteSpan> nullableOctetStrTestValue;
@@ -41532,7 +41777,7 @@ class TestClusterSuite : public TestCommand
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap8", value, 0));
             }
@@ -41543,7 +41788,7 @@ class TestClusterSuite : public TestCommand
         case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap8", value, 255));
             }
@@ -41554,7 +41799,7 @@ class TestClusterSuite : public TestCommand
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap8", value, 0));
             }
@@ -41562,7 +41807,7 @@ class TestClusterSuite : public TestCommand
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap16", value, 0U));
             }
@@ -41573,7 +41818,7 @@ class TestClusterSuite : public TestCommand
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap16", value, 65535U));
             }
@@ -41584,7 +41829,7 @@ class TestClusterSuite : public TestCommand
         case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap16", value, 0U));
             }
@@ -41592,7 +41837,7 @@ class TestClusterSuite : public TestCommand
         case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap32", value, 0UL));
             }
@@ -41603,7 +41848,7 @@ class TestClusterSuite : public TestCommand
         case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap32", value, 4294967295UL));
             }
@@ -41614,7 +41859,7 @@ class TestClusterSuite : public TestCommand
         case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap32", value, 0UL));
             }
@@ -41622,7 +41867,7 @@ class TestClusterSuite : public TestCommand
         case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap64", value, 0ULL));
             }
@@ -41633,7 +41878,7 @@ class TestClusterSuite : public TestCommand
         case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap64", value, 18446744073709551615ULL));
             }
@@ -41644,7 +41889,7 @@ class TestClusterSuite : public TestCommand
         case 30:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap64", value, 0ULL));
             }
@@ -42126,7 +42371,7 @@ class TestClusterSuite : public TestCommand
                 chip::ByteSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueAsString("octetString", value,
-                                                  chip::ByteSpan(chip::Uint8::from_const_char("\015\012\377\042\240"), 5)));
+                                                  chip::ByteSpan(chip::Uint8::from_const_char("\x00\x01\x02\x03\x04\x05"), 6)));
             }
             break;
         case 112:
@@ -42137,12 +42382,12 @@ class TestClusterSuite : public TestCommand
             {
                 chip::ByteSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(
-                    CheckValueAsString("octetString", value, chip::ByteSpan(chip::Uint8::from_const_char("TestValue"), 9)));
+                VerifyOrReturn(CheckValueAsString("octetString", value,
+                                                  chip::ByteSpan(chip::Uint8::from_const_char("\015\012\377\042\240"), 5)));
             }
             break;
         case 114:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 115:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -42154,20 +42399,32 @@ class TestClusterSuite : public TestCommand
             }
             break;
         case 116:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 117:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::ByteSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueAsString("longOctetString", value, chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
+                VerifyOrReturn(
+                    CheckValueAsString("octetString", value, chip::ByteSpan(chip::Uint8::from_const_char("TestValue"), 9)));
             }
             break;
         case 118:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 119:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::ByteSpan value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueAsString("longOctetString", value, chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
+            }
+            break;
+        case 120:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 121:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::ByteSpan value;
@@ -42182,10 +42439,10 @@ class TestClusterSuite : public TestCommand
                         300)));
             }
             break;
-        case 120:
+        case 122:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 121:
+        case 123:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -42193,10 +42450,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("charString", value, chip::CharSpan("", 0)));
             }
             break;
-        case 122:
+        case 124:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 123:
+        case 125:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -42204,10 +42461,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("charString", value, chip::CharSpan("☉T☉", 7)));
             }
             break;
-        case 124:
+        case 126:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 125:
+        case 127:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -42215,10 +42472,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("charString", value, chip::CharSpan("☉T☉", 7)));
             }
             break;
-        case 126:
+        case 128:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 127:
+        case 129:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -42226,10 +42483,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("longCharString", value, chip::CharSpan("", 0)));
             }
             break;
-        case 128:
+        case 130:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 129:
+        case 131:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -42243,10 +42500,10 @@ class TestClusterSuite : public TestCommand
                         900)));
             }
             break;
-        case 130:
+        case 132:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 131:
+        case 133:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::ByteSpan> value;
@@ -42301,10 +42558,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 132:
+        case 134:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 133:
+        case 135:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::ByteSpan> value;
@@ -42370,7 +42627,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 134:
+        case 136:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -42378,10 +42635,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochUs", value, 0ULL));
             }
             break;
-        case 135:
+        case 137:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 136:
+        case 138:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -42389,10 +42646,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochUs", value, 18446744073709551615ULL));
             }
             break;
-        case 137:
+        case 139:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 138:
+        case 140:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -42400,7 +42657,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochUs", value, 0ULL));
             }
             break;
-        case 139:
+        case 141:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -42408,10 +42665,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochS", value, 0UL));
             }
             break;
-        case 140:
+        case 142:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 141:
+        case 143:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -42419,10 +42676,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochS", value, 4294967295UL));
             }
             break;
-        case 142:
+        case 144:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 143:
+        case 145:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -42430,7 +42687,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochS", value, 0UL));
             }
             break;
-        case 144:
+        case 146:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -42442,20 +42699,20 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("unsupported", value, 0));
             }
             break;
-        case 145:
+        case 147:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 146:
+        case 148:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
-        case 147:
+        case 149:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
-        case 148:
+        case 150:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::VendorId value;
@@ -42463,10 +42720,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("vendorId", value, 0U));
             }
             break;
-        case 149:
+        case 151:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 150:
+        case 152:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::VendorId value;
@@ -42474,10 +42731,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("vendorId", value, 17U));
             }
             break;
-        case 151:
+        case 153:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 152:
+        case 154:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType value;
@@ -42487,7 +42744,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("arg2", value.arg2, 101));
             }
             break;
-        case 153:
+        case 155:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42495,7 +42752,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 154:
+        case 156:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42503,7 +42760,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 155:
+        case 157:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42511,7 +42768,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 156:
+        case 158:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42519,7 +42776,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 157:
+        case 159:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42527,7 +42784,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 158:
+        case 160:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42535,7 +42792,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 159:
+        case 161:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType value;
@@ -42551,7 +42808,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("arg1.h", value.arg1.h, 0.1));
             }
             break;
-        case 160:
+        case 162:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42559,7 +42816,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 161:
+        case 163:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42567,7 +42824,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 162:
+        case 164:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType value;
@@ -42596,7 +42853,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 163:
+        case 165:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType value;
@@ -42607,7 +42864,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 164:
+        case 166:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42615,7 +42872,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 165:
+        case 167:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42623,7 +42880,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 166:
+        case 168:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42631,7 +42888,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 167:
+        case 169:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType value;
@@ -42639,10 +42896,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 168:
+        case 170:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 169:
+        case 171:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<uint8_t> value;
@@ -42661,10 +42918,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 170:
+        case 172:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 171:
+        case 173:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::ByteSpan> value;
@@ -42687,10 +42944,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 172:
+        case 174:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 173:
+        case 175:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType>
@@ -42699,26 +42956,26 @@ class TestClusterSuite : public TestCommand
                 {
                     auto iter_0 = value.begin();
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("listStructOctetString", iter_0, 0));
-                    VerifyOrReturn(CheckValue("listStructOctetString[0].fabricIndex", iter_0.GetValue().fabricIndex, 0ULL));
-                    VerifyOrReturn(CheckValueAsString("listStructOctetString[0].operationalCert", iter_0.GetValue().operationalCert,
+                    VerifyOrReturn(CheckValue("listStructOctetString[0].member1", iter_0.GetValue().member1, 0ULL));
+                    VerifyOrReturn(CheckValueAsString("listStructOctetString[0].member2", iter_0.GetValue().member2,
                                                       chip::ByteSpan(chip::Uint8::from_const_char("Test0"), 5)));
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("listStructOctetString", iter_0, 1));
-                    VerifyOrReturn(CheckValue("listStructOctetString[1].fabricIndex", iter_0.GetValue().fabricIndex, 1ULL));
-                    VerifyOrReturn(CheckValueAsString("listStructOctetString[1].operationalCert", iter_0.GetValue().operationalCert,
+                    VerifyOrReturn(CheckValue("listStructOctetString[1].member1", iter_0.GetValue().member1, 1ULL));
+                    VerifyOrReturn(CheckValueAsString("listStructOctetString[1].member2", iter_0.GetValue().member2,
                                                       chip::ByteSpan(chip::Uint8::from_const_char("Test1"), 5)));
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("listStructOctetString", iter_0, 2));
-                    VerifyOrReturn(CheckValue("listStructOctetString[2].fabricIndex", iter_0.GetValue().fabricIndex, 2ULL));
-                    VerifyOrReturn(CheckValueAsString("listStructOctetString[2].operationalCert", iter_0.GetValue().operationalCert,
+                    VerifyOrReturn(CheckValue("listStructOctetString[2].member1", iter_0.GetValue().member1, 2ULL));
+                    VerifyOrReturn(CheckValueAsString("listStructOctetString[2].member2", iter_0.GetValue().member2,
                                                       chip::ByteSpan(chip::Uint8::from_const_char("Test2"), 5)));
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("listStructOctetString", iter_0, 3));
-                    VerifyOrReturn(CheckValue("listStructOctetString[3].fabricIndex", iter_0.GetValue().fabricIndex, 3ULL));
-                    VerifyOrReturn(CheckValueAsString("listStructOctetString[3].operationalCert", iter_0.GetValue().operationalCert,
+                    VerifyOrReturn(CheckValue("listStructOctetString[3].member1", iter_0.GetValue().member1, 3ULL));
+                    VerifyOrReturn(CheckValueAsString("listStructOctetString[3].member2", iter_0.GetValue().member2,
                                                       chip::ByteSpan(chip::Uint8::from_const_char("Test3"), 5)));
                     VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("listStructOctetString", iter_0, 4));
                 }
             }
             break;
-        case 174:
+        case 176:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType value;
@@ -42736,7 +42993,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("originalValue.Value().Value()", value.originalValue.Value().Value(), 5));
             }
             break;
-        case 175:
+        case 177:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType value;
@@ -42744,7 +43001,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("wasPresent", value.wasPresent, false));
             }
             break;
-        case 176:
+        case 178:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<
@@ -42765,10 +43022,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 177:
+        case 179:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 178:
+        case 180:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<
@@ -42802,10 +43059,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 179:
+        case 181:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 180:
+        case 182:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -42815,10 +43072,10 @@ class TestClusterSuite : public TestCommand
                 booValueNull = value;
             }
             break;
-        case 181:
+        case 183:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 182:
+        case 184:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -42827,7 +43084,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBoolean.Value()", value.Value(), true));
             }
             break;
-        case 183:
+        case 185:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -42835,25 +43092,25 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, booValueNull));
             }
             break;
-        case 184:
+        case 186:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 185:
+        case 187:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap8", value));
                 VerifyOrReturn(CheckValue("nullableBitmap8.Value()", value.Value(), 254));
             }
             break;
-        case 186:
+        case 188:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 187:
+        case 189:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap8", value));
                 VerifyOrReturn(CheckValue("nullableBitmap8.Value()", value.Value(), 254));
@@ -42861,134 +43118,134 @@ class TestClusterSuite : public TestCommand
                 nullableValue254 = value;
             }
             break;
-        case 188:
+        case 190:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 189:
+        case 191:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNull("nullableBitmap8", value));
             }
             break;
-        case 190:
+        case 192:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableValue254));
             }
             break;
-        case 191:
+        case 193:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 192:
+        case 194:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap16", value));
                 VerifyOrReturn(CheckValue("nullableBitmap16.Value()", value.Value(), 65534U));
             }
             break;
-        case 193:
+        case 195:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 194:
+        case 196:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap16", value));
                 VerifyOrReturn(CheckValue("nullableBitmap16.Value()", value.Value(), 65534U));
             }
             break;
-        case 195:
+        case 197:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 196:
+        case 198:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNull("nullableBitmap16", value));
             }
             break;
-        case 197:
+        case 199:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 198:
+        case 200:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap32", value));
                 VerifyOrReturn(CheckValue("nullableBitmap32.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 199:
+        case 201:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 200:
+        case 202:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap32", value));
                 VerifyOrReturn(CheckValue("nullableBitmap32.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 201:
+        case 203:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 202:
+        case 204:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNull("nullableBitmap32", value));
             }
             break;
-        case 203:
+        case 205:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 204:
+        case 206:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap64", value));
                 VerifyOrReturn(CheckValue("nullableBitmap64.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 205:
+        case 207:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 206:
+        case 208:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableBitmap64", value));
                 VerifyOrReturn(CheckValue("nullableBitmap64.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 207:
+        case 209:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 208:
+        case 210:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+                chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNull("nullableBitmap64", value));
             }
             break;
-        case 209:
+        case 211:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 210:
+        case 212:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -42997,10 +43254,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8u.Value()", value.Value(), 0));
             }
             break;
-        case 211:
+        case 213:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 212:
+        case 214:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43009,10 +43266,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8u.Value()", value.Value(), 254));
             }
             break;
-        case 213:
+        case 215:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 214:
+        case 216:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43021,7 +43278,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8u.Value()", value.Value(), 254));
             }
             break;
-        case 215:
+        case 217:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43029,10 +43286,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("value", value));
             }
             break;
-        case 216:
+        case 218:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 217:
+        case 219:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43040,7 +43297,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt8u", value));
             }
             break;
-        case 218:
+        case 220:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43049,7 +43306,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 254));
             }
             break;
-        case 219:
+        case 221:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43057,10 +43314,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 254));
             }
             break;
-        case 220:
+        case 222:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 221:
+        case 223:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43069,7 +43326,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 254));
             }
             break;
-        case 222:
+        case 224:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43077,10 +43334,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 129));
             }
             break;
-        case 223:
+        case 225:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 224:
+        case 226:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43089,10 +43346,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16u.Value()", value.Value(), 0U));
             }
             break;
-        case 225:
+        case 227:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 226:
+        case 228:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43101,10 +43358,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16u.Value()", value.Value(), 65534U));
             }
             break;
-        case 227:
+        case 229:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 228:
+        case 230:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43113,10 +43370,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16u.Value()", value.Value(), 65534U));
             }
             break;
-        case 229:
+        case 231:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 230:
+        case 232:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43124,7 +43381,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt16u", value));
             }
             break;
-        case 231:
+        case 233:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43133,7 +43390,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U));
             }
             break;
-        case 232:
+        case 234:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43141,10 +43398,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 65534U));
             }
             break;
-        case 233:
+        case 235:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 234:
+        case 236:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43153,7 +43410,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U));
             }
             break;
-        case 235:
+        case 237:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43161,10 +43418,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 32001U));
             }
             break;
-        case 236:
+        case 238:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 237:
+        case 239:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43173,10 +43430,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32u.Value()", value.Value(), 0UL));
             }
             break;
-        case 238:
+        case 240:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 239:
+        case 241:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43185,10 +43442,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32u.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 240:
+        case 242:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 241:
+        case 243:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43197,10 +43454,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32u.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 242:
+        case 244:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 243:
+        case 245:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43208,7 +43465,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt32u", value));
             }
             break;
-        case 244:
+        case 246:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43217,7 +43474,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967294UL));
             }
             break;
-        case 245:
+        case 247:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43225,10 +43482,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 4294967294UL));
             }
             break;
-        case 246:
+        case 248:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 247:
+        case 249:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43237,7 +43494,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967294UL));
             }
             break;
-        case 248:
+        case 250:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -43245,10 +43502,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 2147483648UL));
             }
             break;
-        case 249:
+        case 251:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 250:
+        case 252:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43257,10 +43514,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64u.Value()", value.Value(), 0ULL));
             }
             break;
-        case 251:
+        case 253:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 252:
+        case 254:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43269,10 +43526,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64u.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 253:
+        case 255:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 254:
+        case 256:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43281,10 +43538,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64u.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 255:
+        case 257:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 256:
+        case 258:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43292,7 +43549,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt64u", value));
             }
             break;
-        case 257:
+        case 259:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43301,7 +43558,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 18446744073709551614ULL));
             }
             break;
-        case 258:
+        case 260:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43309,10 +43566,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 18446744073709551614ULL));
             }
             break;
-        case 259:
+        case 261:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 260:
+        case 262:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43321,7 +43578,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 18446744073709551614ULL));
             }
             break;
-        case 261:
+        case 263:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -43329,10 +43586,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 18000000000000000001ULL));
             }
             break;
-        case 262:
+        case 264:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 263:
+        case 265:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43341,10 +43598,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8s.Value()", value.Value(), -127));
             }
             break;
-        case 264:
+        case 266:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 265:
+        case 267:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43353,10 +43610,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8s.Value()", value.Value(), -127));
             }
             break;
-        case 266:
+        case 268:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 267:
+        case 269:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43364,7 +43621,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt8s", value));
             }
             break;
-        case 268:
+        case 270:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43373,7 +43630,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
             }
             break;
-        case 269:
+        case 271:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43381,10 +43638,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -127));
             }
             break;
-        case 270:
+        case 272:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 271:
+        case 273:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43393,7 +43650,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
             }
             break;
-        case 272:
+        case 274:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -43401,10 +43658,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -126));
             }
             break;
-        case 273:
+        case 275:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 274:
+        case 276:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43413,10 +43670,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16s.Value()", value.Value(), -32767));
             }
             break;
-        case 275:
+        case 277:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 276:
+        case 278:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43425,10 +43682,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16s.Value()", value.Value(), -32767));
             }
             break;
-        case 277:
+        case 279:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 278:
+        case 280:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43436,7 +43693,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt16s", value));
             }
             break;
-        case 279:
+        case 281:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43445,7 +43702,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 280:
+        case 282:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43453,10 +43710,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -32767));
             }
             break;
-        case 281:
+        case 283:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 282:
+        case 284:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43465,7 +43722,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 283:
+        case 285:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -43473,10 +43730,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -32766));
             }
             break;
-        case 284:
+        case 286:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 285:
+        case 287:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43485,10 +43742,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32s.Value()", value.Value(), -2147483647L));
             }
             break;
-        case 286:
+        case 288:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 287:
+        case 289:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43497,10 +43754,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32s.Value()", value.Value(), -2147483647L));
             }
             break;
-        case 288:
+        case 290:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 289:
+        case 291:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43508,7 +43765,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt32s", value));
             }
             break;
-        case 290:
+        case 292:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43517,7 +43774,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 2147483647L));
             }
             break;
-        case 291:
+        case 293:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43525,10 +43782,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -2147483647L));
             }
             break;
-        case 292:
+        case 294:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 293:
+        case 295:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43537,7 +43794,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 2147483647L));
             }
             break;
-        case 294:
+        case 296:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -43545,10 +43802,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -2147483646L));
             }
             break;
-        case 295:
+        case 297:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 296:
+        case 298:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43557,10 +43814,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64s.Value()", value.Value(), -9223372036854775807LL));
             }
             break;
-        case 297:
+        case 299:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 298:
+        case 300:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43569,10 +43826,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64s.Value()", value.Value(), -9223372036854775807LL));
             }
             break;
-        case 299:
+        case 301:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 300:
+        case 302:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43580,7 +43837,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt64s", value));
             }
             break;
-        case 301:
+        case 303:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43589,7 +43846,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 9223372036854775807LL));
             }
             break;
-        case 302:
+        case 304:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43597,10 +43854,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -9223372036854775807LL));
             }
             break;
-        case 303:
+        case 305:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 304:
+        case 306:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43609,7 +43866,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 9223372036854775807LL));
             }
             break;
-        case 305:
+        case 307:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -43617,10 +43874,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -9223372036854775806LL));
             }
             break;
-        case 306:
+        case 308:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 307:
+        case 309:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -43629,10 +43886,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), 0.1f));
             }
             break;
-        case 308:
+        case 310:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 309:
+        case 311:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -43641,10 +43898,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), INFINITY));
             }
             break;
-        case 310:
+        case 312:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 311:
+        case 313:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -43653,10 +43910,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), -INFINITY));
             }
             break;
-        case 312:
+        case 314:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 313:
+        case 315:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -43664,10 +43921,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableFloatSingle", value));
             }
             break;
-        case 314:
+        case 316:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 315:
+        case 317:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -43676,10 +43933,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), 0.0f));
             }
             break;
-        case 316:
+        case 318:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 317:
+        case 319:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -43688,10 +43945,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), 0.1234567890123));
             }
             break;
-        case 318:
+        case 320:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 319:
+        case 321:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -43700,10 +43957,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), INFINITY));
             }
             break;
-        case 320:
+        case 322:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 321:
+        case 323:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -43712,10 +43969,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), -INFINITY));
             }
             break;
-        case 322:
+        case 324:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 323:
+        case 325:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -43723,10 +43980,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableFloatDouble", value));
             }
             break;
-        case 324:
+        case 326:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 325:
+        case 327:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -43735,10 +43992,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), 0));
             }
             break;
-        case 326:
+        case 328:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 327:
+        case 329:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43747,10 +44004,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum8.Value()", value.Value(), 0));
             }
             break;
-        case 328:
+        case 330:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 329:
+        case 331:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43759,10 +44016,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum8.Value()", value.Value(), 254));
             }
             break;
-        case 330:
+        case 332:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 331:
+        case 333:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43771,10 +44028,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum8.Value()", value.Value(), 254));
             }
             break;
-        case 332:
+        case 334:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 333:
+        case 335:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -43782,10 +44039,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableEnum8", value));
             }
             break;
-        case 334:
+        case 336:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 335:
+        case 337:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43794,10 +44051,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum16.Value()", value.Value(), 0U));
             }
             break;
-        case 336:
+        case 338:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 337:
+        case 339:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43806,10 +44063,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum16.Value()", value.Value(), 65534U));
             }
             break;
-        case 338:
+        case 340:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 339:
+        case 341:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43818,10 +44075,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum16.Value()", value.Value(), 65534U));
             }
             break;
-        case 340:
+        case 342:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 341:
+        case 343:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -43829,10 +44086,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableEnum16", value));
             }
             break;
-        case 342:
+        case 344:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 343:
+        case 345:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
@@ -43841,10 +44098,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 0));
             }
             break;
-        case 344:
+        case 346:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 345:
+        case 347:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
@@ -43853,10 +44110,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 254));
             }
             break;
-        case 346:
+        case 348:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 347:
+        case 349:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
@@ -43867,10 +44124,10 @@ class TestClusterSuite : public TestCommand
                 nullableEnumAttr254 = value;
             }
             break;
-        case 348:
+        case 350:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 349:
+        case 351:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
@@ -43878,7 +44135,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableEnumAttr", value));
             }
             break;
-        case 350:
+        case 352:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
@@ -43886,7 +44143,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableEnumAttr254));
             }
             break;
-        case 351:
+        case 353:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -43896,10 +44153,10 @@ class TestClusterSuite : public TestCommand
                                                   chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
             }
             break;
-        case 352:
+        case 354:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 353:
+        case 355:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -43924,10 +44181,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 354:
+        case 356:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 355:
+        case 357:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -43935,10 +44192,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableOctetString", value));
             }
             break;
-        case 356:
+        case 358:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 357:
+        case 359:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -43948,7 +44205,7 @@ class TestClusterSuite : public TestCommand
                                                   chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
             }
             break;
-        case 358:
+        case 360:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -43956,7 +44213,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableOctetStrTestValue));
             }
             break;
-        case 359:
+        case 361:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -43965,10 +44222,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nullableCharString.Value()", value.Value(), chip::CharSpan("", 0)));
             }
             break;
-        case 360:
+        case 362:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 361:
+        case 363:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -43992,7 +44249,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 362:
+        case 364:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -44008,10 +44265,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 363:
+        case 365:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 364:
+        case 366:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -44019,10 +44276,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableCharString", value));
             }
             break;
-        case 365:
+        case 367:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 366:
+        case 368:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -44031,7 +44288,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nullableCharString.Value()", value.Value(), chip::CharSpan("", 0)));
             }
             break;
-        case 367:
+        case 369:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -44039,19 +44296,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableCharStringSave));
             }
             break;
-        case 368:
+        case 370:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
-        case 369:
+        case 371:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
-        case 370:
+        case 372:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_VALUE));
             break;
-        case 371:
+        case 373:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 372:
+        case 374:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<uint8_t> value;
@@ -44070,10 +44327,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 373:
+        case 375:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 374:
+        case 376:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<uint8_t> value;
@@ -44093,7 +44350,7 @@ class TestClusterSuite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 375:
+        case 377:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -44101,19 +44358,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 70));
             }
             break;
-        case 376:
+        case 378:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 377:
+        case 379:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 378:
+        case 380:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 379:
+        case 381:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 380:
+        case 382:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -44121,10 +44378,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 70));
             }
             break;
-        case 381:
+        case 383:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 382:
+        case 384:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -44132,10 +44389,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 20));
             }
             break;
-        case 383:
+        case 385:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 384:
+        case 386:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -44143,10 +44400,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 100));
             }
             break;
-        case 385:
+        case 387:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 386:
+        case 388:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -44154,7 +44411,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 50));
             }
             break;
-        case 387:
+        case 389:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -44162,19 +44419,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 200U));
             }
             break;
-        case 388:
+        case 390:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 389:
+        case 391:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 390:
+        case 392:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 391:
+        case 393:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 392:
+        case 394:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -44182,10 +44439,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 200U));
             }
             break;
-        case 393:
+        case 395:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 394:
+        case 396:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -44193,10 +44450,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 100U));
             }
             break;
-        case 395:
+        case 397:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 396:
+        case 398:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -44204,10 +44461,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 1000U));
             }
             break;
-        case 397:
+        case 399:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 398:
+        case 400:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -44215,7 +44472,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 500U));
             }
             break;
-        case 399:
+        case 401:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -44223,19 +44480,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, -20));
             }
             break;
-        case 400:
+        case 402:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 401:
+        case 403:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 402:
+        case 404:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 403:
+        case 405:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 404:
+        case 406:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -44243,10 +44500,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, -20));
             }
             break;
-        case 405:
+        case 407:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 406:
+        case 408:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -44254,10 +44511,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, -40));
             }
             break;
-        case 407:
+        case 409:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 408:
+        case 410:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -44265,10 +44522,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, 50));
             }
             break;
-        case 409:
+        case 411:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 410:
+        case 412:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -44276,7 +44533,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, 6));
             }
             break;
-        case 411:
+        case 413:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -44284,19 +44541,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, -100));
             }
             break;
-        case 412:
+        case 414:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 413:
+        case 415:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 414:
+        case 416:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 415:
+        case 417:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 416:
+        case 418:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -44304,10 +44561,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, -100));
             }
             break;
-        case 417:
+        case 419:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 418:
+        case 420:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -44315,10 +44572,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, -150));
             }
             break;
-        case 419:
+        case 421:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 420:
+        case 422:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -44326,10 +44583,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, 200));
             }
             break;
-        case 421:
+        case 423:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 422:
+        case 424:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -44337,7 +44594,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, 7));
             }
             break;
-        case 423:
+        case 425:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -44346,19 +44603,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 70));
             }
             break;
-        case 424:
+        case 426:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 425:
+        case 427:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 426:
+        case 428:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 427:
+        case 429:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 428:
+        case 430:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -44367,10 +44624,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 70));
             }
             break;
-        case 429:
+        case 431:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 430:
+        case 432:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -44379,10 +44636,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 20));
             }
             break;
-        case 431:
+        case 433:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 432:
+        case 434:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -44391,10 +44648,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 100));
             }
             break;
-        case 433:
+        case 435:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 434:
+        case 436:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -44403,10 +44660,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 50));
             }
             break;
-        case 435:
+        case 437:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 436:
+        case 438:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -44414,7 +44671,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt8u", value));
             }
             break;
-        case 437:
+        case 439:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -44423,19 +44680,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 200U));
             }
             break;
-        case 438:
+        case 440:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 439:
+        case 441:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 440:
+        case 442:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 441:
+        case 443:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 442:
+        case 444:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -44444,10 +44701,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 200U));
             }
             break;
-        case 443:
+        case 445:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 444:
+        case 446:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -44456,10 +44713,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 100U));
             }
             break;
-        case 445:
+        case 447:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 446:
+        case 448:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -44468,10 +44725,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 1000U));
             }
             break;
-        case 447:
+        case 449:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 448:
+        case 450:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -44480,10 +44737,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 500U));
             }
             break;
-        case 449:
+        case 451:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 450:
+        case 452:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -44491,7 +44748,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt16u", value));
             }
             break;
-        case 451:
+        case 453:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -44500,19 +44757,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), -20));
             }
             break;
-        case 452:
+        case 454:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 453:
+        case 455:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 454:
+        case 456:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 455:
+        case 457:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 456:
+        case 458:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -44521,10 +44778,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), -20));
             }
             break;
-        case 457:
+        case 459:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 458:
+        case 460:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -44533,10 +44790,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), -40));
             }
             break;
-        case 459:
+        case 461:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 460:
+        case 462:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -44545,10 +44802,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), 50));
             }
             break;
-        case 461:
+        case 463:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 462:
+        case 464:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -44557,10 +44814,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), 6));
             }
             break;
-        case 463:
+        case 465:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 464:
+        case 466:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -44568,7 +44825,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt8s", value));
             }
             break;
-        case 465:
+        case 467:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -44577,19 +44834,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), -100));
             }
             break;
-        case 466:
+        case 468:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 467:
+        case 469:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 468:
+        case 470:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 469:
+        case 471:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 470:
+        case 472:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -44598,10 +44855,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), -100));
             }
             break;
-        case 471:
+        case 473:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 472:
+        case 474:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -44610,10 +44867,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), -150));
             }
             break;
-        case 473:
+        case 475:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 474:
+        case 476:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -44622,10 +44879,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), 200));
             }
             break;
-        case 475:
+        case 477:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 476:
+        case 478:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -44634,10 +44891,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), 7));
             }
             break;
-        case 477:
+        case 479:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 478:
+        case 480:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -44645,19 +44902,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt16s", value));
             }
             break;
-        case 479:
+        case 481:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
-        case 480:
+        case 482:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 481:
+        case 483:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
-        case 482:
+        case 484:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 483:
+        case 485:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -44704,7 +44961,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 484:
+        case 486:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -44733,10 +44990,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 485:
+        case 487:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 486:
+        case 488:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType value;
@@ -44861,8 +45118,8 @@ class TestClusterSuite : public TestCommand
         case 12: {
             LogStep(12, "Write attribute BITMAP8 Max Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(255);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(255);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap8::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44874,8 +45131,8 @@ class TestClusterSuite : public TestCommand
         case 14: {
             LogStep(14, "Write attribute BITMAP8 Min Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(0);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap8::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44892,8 +45149,8 @@ class TestClusterSuite : public TestCommand
         case 17: {
             LogStep(17, "Write attribute BITMAP16 Max Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(65535U);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(65535U);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap16::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44905,8 +45162,8 @@ class TestClusterSuite : public TestCommand
         case 19: {
             LogStep(19, "Write attribute BITMAP16 Min Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(0U);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(0U);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap16::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44923,8 +45180,8 @@ class TestClusterSuite : public TestCommand
         case 22: {
             LogStep(22, "Write attribute BITMAP32 Max Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(4294967295UL);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(4294967295UL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44936,8 +45193,8 @@ class TestClusterSuite : public TestCommand
         case 24: {
             LogStep(24, "Write attribute BITMAP32 Min Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(0UL);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(0UL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44954,8 +45211,8 @@ class TestClusterSuite : public TestCommand
         case 27: {
             LogStep(27, "Write attribute BITMAP64 Max Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(18446744073709551615ULL);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(18446744073709551615ULL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap64::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -44967,8 +45224,8 @@ class TestClusterSuite : public TestCommand
         case 29: {
             LogStep(29, "Write attribute BITMAP64 Min Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(0ULL);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(0ULL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap64::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -45472,28 +45729,28 @@ class TestClusterSuite : public TestCommand
                                  chip::NullOptional);
         }
         case 110: {
-            LogStep(110, "Write attribute OCTET_STRING with weird chars");
+            LogStep(110, "Write attribute OCTET_STRING with hex: format");
             ListFreer listFreer;
             chip::ByteSpan value;
-            value = chip::ByteSpan(chip::Uint8::from_const_char("\015\012\377\042\240garbage: not in length on purpose"), 5);
+            value = chip::ByteSpan(chip::Uint8::from_const_char("\x00\x01\x02\x03\x04\x05garbage: not in length on purpose"), 6);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
         case 111: {
-            LogStep(111, "Read attribute OCTET_STRING with weird chars");
+            LogStep(111, "Read attribute OCTET_STRING with hex: format");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, true,
                                  chip::NullOptional);
         }
         case 112: {
-            LogStep(112, "Write attribute OCTET_STRING");
+            LogStep(112, "Write attribute OCTET_STRING with weird chars");
             ListFreer listFreer;
             chip::ByteSpan value;
-            value = chip::ByteSpan(chip::Uint8::from_const_char("TestValuegarbage: not in length on purpose"), 9);
+            value = chip::ByteSpan(chip::Uint8::from_const_char("\015\012\377\042\240garbage: not in length on purpose"), 5);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
         case 113: {
-            LogStep(113, "Read attribute OCTET_STRING");
+            LogStep(113, "Read attribute OCTET_STRING with weird chars");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, true,
                                  chip::NullOptional);
         }
@@ -45501,7 +45758,7 @@ class TestClusterSuite : public TestCommand
             LogStep(114, "Write attribute OCTET_STRING");
             ListFreer listFreer;
             chip::ByteSpan value;
-            value = chip::ByteSpan(chip::Uint8::from_const_char("TestValueLongerThan10garbage: not in length on purpose"), 21);
+            value = chip::ByteSpan(chip::Uint8::from_const_char("TestValuegarbage: not in length on purpose"), 9);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -45514,17 +45771,30 @@ class TestClusterSuite : public TestCommand
             LogStep(116, "Write attribute OCTET_STRING");
             ListFreer listFreer;
             chip::ByteSpan value;
-            value = chip::ByteSpan(chip::Uint8::from_const_char("garbage: not in length on purpose"), 0);
+            value = chip::ByteSpan(chip::Uint8::from_const_char("TestValueLongerThan10garbage: not in length on purpose"), 21);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
         case 117: {
-            LogStep(117, "Read attribute LONG_OCTET_STRING Default Value");
+            LogStep(117, "Read attribute OCTET_STRING");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, true,
+                                 chip::NullOptional);
+        }
+        case 118: {
+            LogStep(118, "Write attribute OCTET_STRING");
+            ListFreer listFreer;
+            chip::ByteSpan value;
+            value = chip::ByteSpan(chip::Uint8::from_const_char("garbage: not in length on purpose"), 0);
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::OctetString::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 119: {
+            LogStep(119, "Read attribute LONG_OCTET_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 118: {
-            LogStep(118, "Write attribute LONG_OCTET_STRING");
+        case 120: {
+            LogStep(120, "Write attribute LONG_OCTET_STRING");
             ListFreer listFreer;
             chip::ByteSpan value;
             value = chip::ByteSpan(
@@ -45536,65 +45806,65 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 119: {
-            LogStep(119, "Read attribute LONG_OCTET_STRING");
+        case 121: {
+            LogStep(121, "Read attribute LONG_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 120: {
-            LogStep(120, "Write attribute LONG_OCTET_STRING");
+        case 122: {
+            LogStep(122, "Write attribute LONG_OCTET_STRING");
             ListFreer listFreer;
             chip::ByteSpan value;
             value = chip::ByteSpan(chip::Uint8::from_const_char("garbage: not in length on purpose"), 0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 121: {
-            LogStep(121, "Read attribute CHAR_STRING Default Value");
+        case 123: {
+            LogStep(123, "Read attribute CHAR_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 122: {
-            LogStep(122, "Write attribute CHAR_STRING");
+        case 124: {
+            LogStep(124, "Write attribute CHAR_STRING");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("☉T☉garbage: not in length on purpose", 7);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 123: {
-            LogStep(123, "Read attribute CHAR_STRING");
+        case 125: {
+            LogStep(125, "Read attribute CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 124: {
-            LogStep(124, "Write attribute CHAR_STRING - Value too long");
+        case 126: {
+            LogStep(126, "Write attribute CHAR_STRING - Value too long");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("☉TestValueLongerThan10☉garbage: not in length on purpose", 27);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 125: {
-            LogStep(125, "Read attribute CHAR_STRING");
+        case 127: {
+            LogStep(127, "Read attribute CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 126: {
-            LogStep(126, "Write attribute CHAR_STRING - Empty");
+        case 128: {
+            LogStep(128, "Write attribute CHAR_STRING - Empty");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("garbage: not in length on purpose", 0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 127: {
-            LogStep(127, "Read attribute LONG_CHAR_STRING Default Value");
+        case 129: {
+            LogStep(129, "Read attribute LONG_CHAR_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongCharString::Id, true,
                                  chip::NullOptional);
         }
-        case 128: {
-            LogStep(128, "Write attribute LONG_CHAR_STRING");
+        case 130: {
+            LogStep(130, "Write attribute LONG_CHAR_STRING");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>(
@@ -45605,26 +45875,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 129: {
-            LogStep(129, "Read attribute LONG_CHAR_STRING");
+        case 131: {
+            LogStep(131, "Read attribute LONG_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongCharString::Id, true,
                                  chip::NullOptional);
         }
-        case 130: {
-            LogStep(130, "Write attribute LONG_CHAR_STRING");
+        case 132: {
+            LogStep(132, "Write attribute LONG_CHAR_STRING");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("garbage: not in length on purpose", 0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::LongCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 131: {
-            LogStep(131, "Read attribute LIST_LONG_OCTET_STRING (for chunked read)");
+        case 133: {
+            LogStep(133, "Read attribute LIST_LONG_OCTET_STRING (for chunked read)");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListLongOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 132: {
-            LogStep(132, "Write attribute LIST_LONG_OCTET_STRING (for chunked write)");
+        case 134: {
+            LogStep(134, "Write attribute LIST_LONG_OCTET_STRING (for chunked write)");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::ByteSpan> value;
 
@@ -45681,88 +45951,88 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListLongOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 133: {
-            LogStep(133, "Read attribute LIST_LONG_OCTET_STRING (for chunked read)");
+        case 135: {
+            LogStep(135, "Read attribute LIST_LONG_OCTET_STRING (for chunked read)");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListLongOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 134: {
-            LogStep(134, "Read attribute EPOCH_US Default Value");
+        case 136: {
+            LogStep(136, "Read attribute EPOCH_US Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochUs::Id, true,
                                  chip::NullOptional);
         }
-        case 135: {
-            LogStep(135, "Write attribute EPOCH_US Max Value");
+        case 137: {
+            LogStep(137, "Write attribute EPOCH_US Max Value");
             ListFreer listFreer;
             uint64_t value;
             value = 18446744073709551615ULL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochUs::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 136: {
-            LogStep(136, "Read attribute EPOCH_US Max Value");
+        case 138: {
+            LogStep(138, "Read attribute EPOCH_US Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochUs::Id, true,
                                  chip::NullOptional);
         }
-        case 137: {
-            LogStep(137, "Write attribute EPOCH_US Min Value");
+        case 139: {
+            LogStep(139, "Write attribute EPOCH_US Min Value");
             ListFreer listFreer;
             uint64_t value;
             value = 0ULL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochUs::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 138: {
-            LogStep(138, "Read attribute EPOCH_US Min Value");
+        case 140: {
+            LogStep(140, "Read attribute EPOCH_US Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochUs::Id, true,
                                  chip::NullOptional);
         }
-        case 139: {
-            LogStep(139, "Read attribute EPOCH_S Default Value");
+        case 141: {
+            LogStep(141, "Read attribute EPOCH_S Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochS::Id, true,
                                  chip::NullOptional);
         }
-        case 140: {
-            LogStep(140, "Write attribute EPOCH_S Max Value");
+        case 142: {
+            LogStep(142, "Write attribute EPOCH_S Max Value");
             ListFreer listFreer;
             uint32_t value;
             value = 4294967295UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochS::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 141: {
-            LogStep(141, "Read attribute EPOCH_S Max Value");
+        case 143: {
+            LogStep(143, "Read attribute EPOCH_S Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochS::Id, true,
                                  chip::NullOptional);
         }
-        case 142: {
-            LogStep(142, "Write attribute EPOCH_S Min Value");
+        case 144: {
+            LogStep(144, "Write attribute EPOCH_S Min Value");
             ListFreer listFreer;
             uint32_t value;
             value = 0UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochS::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 143: {
-            LogStep(143, "Read attribute EPOCH_S Min Value");
+        case 145: {
+            LogStep(145, "Read attribute EPOCH_S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::EpochS::Id, true,
                                  chip::NullOptional);
         }
-        case 144: {
-            LogStep(144, "Read attribute UNSUPPORTED");
+        case 146: {
+            LogStep(146, "Read attribute UNSUPPORTED");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Unsupported::Id, true,
                                  chip::NullOptional);
         }
-        case 145: {
-            LogStep(145, "Writeattribute UNSUPPORTED");
+        case 147: {
+            LogStep(147, "Writeattribute UNSUPPORTED");
             ListFreer listFreer;
             bool value;
             value = 0;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Unsupported::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 146: {
-            LogStep(146, "Send Test Command to unsupported endpoint");
+        case 148: {
+            LogStep(148, "Send Test Command to unsupported endpoint");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::Test::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(200), TestCluster::Id, TestCluster::Commands::Test::Id, value,
@@ -45770,8 +46040,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 147: {
-            LogStep(147, "Send Test Command to unsupported cluster");
+        case 149: {
+            LogStep(149, "Send Test Command to unsupported cluster");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::Test::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(0), TestCluster::Id, TestCluster::Commands::Test::Id, value,
@@ -45779,34 +46049,34 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 148: {
-            LogStep(148, "Read attribute vendor_id Default Value");
+        case 150: {
+            LogStep(150, "Read attribute vendor_id Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::VendorId::Id, true,
                                  chip::NullOptional);
         }
-        case 149: {
-            LogStep(149, "Write attribute vendor_id");
+        case 151: {
+            LogStep(151, "Write attribute vendor_id");
             ListFreer listFreer;
             chip::VendorId value;
             value = static_cast<chip::VendorId>(17);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::VendorId::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 150: {
-            LogStep(150, "Read attribute vendor_id");
+        case 152: {
+            LogStep(152, "Read attribute vendor_id");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::VendorId::Id, true,
                                  chip::NullOptional);
         }
-        case 151: {
-            LogStep(151, "Restore attribute vendor_id");
+        case 153: {
+            LogStep(153, "Restore attribute vendor_id");
             ListFreer listFreer;
             chip::VendorId value;
             value = static_cast<chip::VendorId>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::VendorId::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 152: {
-            LogStep(152, "Send a command with a vendor_id and enum");
+        case 154: {
+            LogStep(154, "Send a command with a vendor_id and enum");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestEnumsRequest::Type value;
             value.arg1 = static_cast<chip::VendorId>(20003);
@@ -45816,8 +46086,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 153: {
-            LogStep(153, "Send Test Command With Struct Argument and arg1.b is true");
+        case 155: {
+            LogStep(155, "Send Test Command With Struct Argument and arg1.b is true");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestStructArgumentRequest::Type value;
 
@@ -45826,7 +46096,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.g = 0.0f;
             value.arg1.h = 0;
 
@@ -45835,8 +46105,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 154: {
-            LogStep(154, "Send Test Command With Struct Argument and arg1.b is false");
+        case 156: {
+            LogStep(156, "Send Test Command With Struct Argument and arg1.b is false");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestStructArgumentRequest::Type value;
 
@@ -45845,7 +46115,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.g = 0.0f;
             value.arg1.h = 0;
 
@@ -45854,8 +46124,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 155: {
-            LogStep(155, "Send Test Command With Nested Struct Argument and arg1.c.b is true");
+        case 157: {
+            LogStep(157, "Send Test Command With Nested Struct Argument and arg1.c.b is true");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestNestedStructArgumentRequest::Type value;
 
@@ -45867,7 +46137,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.c.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.c.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.c.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.c.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.c.g = 0.0f;
             value.arg1.c.h = 0;
 
@@ -45876,8 +46146,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 156: {
-            LogStep(156, "Send Test Command With Nested Struct Argument arg1.c.b is false");
+        case 158: {
+            LogStep(158, "Send Test Command With Nested Struct Argument arg1.c.b is false");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestNestedStructArgumentRequest::Type value;
 
@@ -45889,7 +46159,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.c.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.c.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.c.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.c.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.c.g = 0.0f;
             value.arg1.c.h = 0;
 
@@ -45898,8 +46168,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 157: {
-            LogStep(157, "Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true");
+        case 159: {
+            LogStep(159, "Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestNestedStructListArgumentRequest::Type value;
 
@@ -45911,7 +46181,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.c.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.c.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.c.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.c.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.c.g = 0.0f;
             value.arg1.c.h = 0;
 
@@ -45925,7 +46195,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_1->mList[0].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                 listHolder_1->mList[0].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                listHolder_1->mList[0].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_1->mList[0].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_1->mList[0].g = 0.0f;
                 listHolder_1->mList[0].h = 0;
 
@@ -45935,7 +46205,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_1->mList[1].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                 listHolder_1->mList[1].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                listHolder_1->mList[1].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_1->mList[1].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_1->mList[1].g = 0.0f;
                 listHolder_1->mList[1].h = 0;
 
@@ -45977,8 +46247,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 158: {
-            LogStep(158, "Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false");
+        case 160: {
+            LogStep(160, "Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestNestedStructListArgumentRequest::Type value;
 
@@ -45990,7 +46260,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.c.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.c.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.c.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.c.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.c.g = 0.0f;
             value.arg1.c.h = 0;
 
@@ -46004,7 +46274,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_1->mList[0].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                 listHolder_1->mList[0].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                listHolder_1->mList[0].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_1->mList[0].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_1->mList[0].g = 0.0f;
                 listHolder_1->mList[0].h = 0;
 
@@ -46014,7 +46284,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_1->mList[1].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                 listHolder_1->mList[1].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                listHolder_1->mList[1].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_1->mList[1].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_1->mList[1].g = 0.0f;
                 listHolder_1->mList[1].h = 0;
 
@@ -46056,8 +46326,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 159: {
-            LogStep(159, "Send Test Command With Struct Argument and see what we get back");
+        case 161: {
+            LogStep(161, "Send Test Command With Struct Argument and see what we get back");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::SimpleStructEchoRequest::Type value;
 
@@ -46066,7 +46336,7 @@ class TestClusterSuite : public TestCommand
             value.arg1.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.arg1.d = chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
             value.arg1.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-            value.arg1.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+            value.arg1.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
             value.arg1.g = 0.1f;
             value.arg1.h = 0.1;
 
@@ -46075,8 +46345,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 160: {
-            LogStep(160, "Send Test Command With List of INT8U and none of them is set to 0");
+        case 162: {
+            LogStep(162, "Send Test Command With List of INT8U and none of them is set to 0");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListInt8UArgumentRequest::Type value;
 
@@ -46099,8 +46369,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 161: {
-            LogStep(161, "Send Test Command With List of INT8U and one of them is set to 0");
+        case 163: {
+            LogStep(163, "Send Test Command With List of INT8U and one of them is set to 0");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListInt8UArgumentRequest::Type value;
 
@@ -46124,8 +46394,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 162: {
-            LogStep(162, "Send Test Command With List of INT8U and get it reversed");
+        case 164: {
+            LogStep(164, "Send Test Command With List of INT8U and get it reversed");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseRequest::Type value;
 
@@ -46148,8 +46418,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 163: {
-            LogStep(163, "Send Test Command With empty List of INT8U and get an empty list back");
+        case 165: {
+            LogStep(165, "Send Test Command With empty List of INT8U and get an empty list back");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseRequest::Type value;
 
@@ -46159,8 +46429,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 164: {
-            LogStep(164, "Send Test Command With List of Struct Argument and arg1.b of first item is true");
+        case 166: {
+            LogStep(166, "Send Test Command With List of Struct Argument and arg1.b of first item is true");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListStructArgumentRequest::Type value;
 
@@ -46174,7 +46444,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_0->mList[0].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("first_octet_stringgarbage: not in length on purpose"), 18);
                 listHolder_0->mList[0].e = chip::Span<const char>("first_char_stringgarbage: not in length on purpose", 17);
-                listHolder_0->mList[0].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_0->mList[0].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_0->mList[0].g = 0.0f;
                 listHolder_0->mList[0].h = 0;
 
@@ -46184,7 +46454,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_0->mList[1].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("second_octet_stringgarbage: not in length on purpose"), 19);
                 listHolder_0->mList[1].e = chip::Span<const char>("second_char_stringgarbage: not in length on purpose", 18);
-                listHolder_0->mList[1].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_0->mList[1].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_0->mList[1].g = 0.0f;
                 listHolder_0->mList[1].h = 0;
 
@@ -46196,8 +46466,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 165: {
-            LogStep(165, "Send Test Command With List of Struct Argument and arg1.b of first item is false");
+        case 167: {
+            LogStep(167, "Send Test Command With List of Struct Argument and arg1.b of first item is false");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListStructArgumentRequest::Type value;
 
@@ -46211,7 +46481,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_0->mList[0].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("second_octet_stringgarbage: not in length on purpose"), 19);
                 listHolder_0->mList[0].e = chip::Span<const char>("second_char_stringgarbage: not in length on purpose", 18);
-                listHolder_0->mList[0].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_0->mList[0].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_0->mList[0].g = 0.0f;
                 listHolder_0->mList[0].h = 0;
 
@@ -46221,7 +46491,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_0->mList[1].d =
                     chip::ByteSpan(chip::Uint8::from_const_char("first_octet_stringgarbage: not in length on purpose"), 18);
                 listHolder_0->mList[1].e = chip::Span<const char>("first_char_stringgarbage: not in length on purpose", 17);
-                listHolder_0->mList[1].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_0->mList[1].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_0->mList[1].g = 0.0f;
                 listHolder_0->mList[1].h = 0;
 
@@ -46233,8 +46503,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 166: {
-            LogStep(166,
+        case 168: {
+            LogStep(168,
                     "Send Test Command With List of Nested Struct List Argument and all fields b of elements of arg1.d are true");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListNestedStructListArgumentRequest::Type value;
@@ -46252,7 +46522,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_0->mList[0].c.d =
                     chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
                 listHolder_0->mList[0].c.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-                listHolder_0->mList[0].c.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_0->mList[0].c.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_0->mList[0].c.g = 0.0f;
                 listHolder_0->mList[0].c.h = 0;
 
@@ -46266,7 +46536,7 @@ class TestClusterSuite : public TestCommand
                     listHolder_2->mList[0].d =
                         chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                     listHolder_2->mList[0].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                    listHolder_2->mList[0].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                    listHolder_2->mList[0].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                     listHolder_2->mList[0].g = 0.0f;
                     listHolder_2->mList[0].h = 0;
 
@@ -46276,7 +46546,7 @@ class TestClusterSuite : public TestCommand
                     listHolder_2->mList[1].d =
                         chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                     listHolder_2->mList[1].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                    listHolder_2->mList[1].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                    listHolder_2->mList[1].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                     listHolder_2->mList[1].g = 0.0f;
                     listHolder_2->mList[1].h = 0;
 
@@ -46322,8 +46592,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 167: {
-            LogStep(167, "Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false");
+        case 169: {
+            LogStep(169, "Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestListNestedStructListArgumentRequest::Type value;
 
@@ -46340,7 +46610,7 @@ class TestClusterSuite : public TestCommand
                 listHolder_0->mList[0].c.d =
                     chip::ByteSpan(chip::Uint8::from_const_char("octet_stringgarbage: not in length on purpose"), 12);
                 listHolder_0->mList[0].c.e = chip::Span<const char>("char_stringgarbage: not in length on purpose", 11);
-                listHolder_0->mList[0].c.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                listHolder_0->mList[0].c.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                 listHolder_0->mList[0].c.g = 0.0f;
                 listHolder_0->mList[0].c.h = 0;
 
@@ -46354,7 +46624,7 @@ class TestClusterSuite : public TestCommand
                     listHolder_2->mList[0].d =
                         chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                     listHolder_2->mList[0].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                    listHolder_2->mList[0].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                    listHolder_2->mList[0].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                     listHolder_2->mList[0].g = 0.0f;
                     listHolder_2->mList[0].h = 0;
 
@@ -46364,7 +46634,7 @@ class TestClusterSuite : public TestCommand
                     listHolder_2->mList[1].d =
                         chip::ByteSpan(chip::Uint8::from_const_char("nested_octet_stringgarbage: not in length on purpose"), 19);
                     listHolder_2->mList[1].e = chip::Span<const char>("nested_char_stringgarbage: not in length on purpose", 18);
-                    listHolder_2->mList[1].f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
+                    listHolder_2->mList[1].f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(1);
                     listHolder_2->mList[1].g = 0.0f;
                     listHolder_2->mList[1].h = 0;
 
@@ -46410,8 +46680,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 168: {
-            LogStep(168, "Write attribute LIST With List of INT8U and none of them is set to 0");
+        case 170: {
+            LogStep(170, "Write attribute LIST With List of INT8U and none of them is set to 0");
             ListFreer listFreer;
             chip::app::DataModel::List<const uint8_t> value;
 
@@ -46427,13 +46697,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 169: {
-            LogStep(169, "Read attribute LIST With List of INT8U");
+        case 171: {
+            LogStep(171, "Read attribute LIST With List of INT8U");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 170: {
-            LogStep(170, "Write attribute LIST With List of OCTET_STRING");
+        case 172: {
+            LogStep(172, "Write attribute LIST With List of OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::ByteSpan> value;
 
@@ -46449,13 +46719,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 171: {
-            LogStep(171, "Read attribute LIST With List of OCTET_STRING");
+        case 173: {
+            LogStep(173, "Read attribute LIST With List of OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 172: {
-            LogStep(172, "Write attribute LIST With List of LIST_STRUCT_OCTET_STRING");
+        case 174: {
+            LogStep(174, "Write attribute LIST With List of LIST_STRUCT_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type> value;
 
@@ -46463,20 +46733,20 @@ class TestClusterSuite : public TestCommand
                 auto * listHolder_0 = new ListHolder<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type>(4);
                 listFreer.add(listHolder_0);
 
-                listHolder_0->mList[0].fabricIndex = 0ULL;
-                listHolder_0->mList[0].operationalCert =
+                listHolder_0->mList[0].member1 = 0ULL;
+                listHolder_0->mList[0].member2 =
                     chip::ByteSpan(chip::Uint8::from_const_char("Test0garbage: not in length on purpose"), 5);
 
-                listHolder_0->mList[1].fabricIndex = 1ULL;
-                listHolder_0->mList[1].operationalCert =
+                listHolder_0->mList[1].member1 = 1ULL;
+                listHolder_0->mList[1].member2 =
                     chip::ByteSpan(chip::Uint8::from_const_char("Test1garbage: not in length on purpose"), 5);
 
-                listHolder_0->mList[2].fabricIndex = 2ULL;
-                listHolder_0->mList[2].operationalCert =
+                listHolder_0->mList[2].member1 = 2ULL;
+                listHolder_0->mList[2].member2 =
                     chip::ByteSpan(chip::Uint8::from_const_char("Test2garbage: not in length on purpose"), 5);
 
-                listHolder_0->mList[3].fabricIndex = 3ULL;
-                listHolder_0->mList[3].operationalCert =
+                listHolder_0->mList[3].member1 = 3ULL;
+                listHolder_0->mList[3].member2 =
                     chip::ByteSpan(chip::Uint8::from_const_char("Test3garbage: not in length on purpose"), 5);
 
                 value = chip::app::DataModel::List<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type>(
@@ -46486,13 +46756,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::ListStructOctetString::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 173: {
-            LogStep(173, "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING");
+        case 175: {
+            LogStep(175, "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::ListStructOctetString::Id, true, chip::NullOptional);
         }
-        case 174: {
-            LogStep(174, "Send Test Command with optional arg set.");
+        case 176: {
+            LogStep(176, "Send Test Command with optional arg set.");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestNullableOptionalRequest::Type value;
             value.arg1.Emplace();
@@ -46503,8 +46773,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 175: {
-            LogStep(175, "Send Test Command without its optional arg.");
+        case 177: {
+            LogStep(177, "Send Test Command without its optional arg.");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestNullableOptionalRequest::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
@@ -46512,13 +46782,13 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 176: {
-            LogStep(176, "Read list of structs containing nullables and optionals");
+        case 178: {
+            LogStep(178, "Read list of structs containing nullables and optionals");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::ListNullablesAndOptionalsStruct::Id, true, chip::NullOptional);
         }
-        case 177: {
-            LogStep(177, "Write list of structs containing nullables and optionals");
+        case 179: {
+            LogStep(179, "Write list of structs containing nullables and optionals");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type> value;
 
@@ -46548,26 +46818,26 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::ListNullablesAndOptionalsStruct::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 178: {
-            LogStep(178, "Read list of structs containing nullables and optionals after writing");
+        case 180: {
+            LogStep(180, "Read list of structs containing nullables and optionals after writing");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::ListNullablesAndOptionalsStruct::Id, true, chip::NullOptional);
         }
-        case 179: {
-            LogStep(179, "Write attribute NULLABLE_BOOLEAN null");
+        case 181: {
+            LogStep(181, "Write attribute NULLABLE_BOOLEAN null");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<bool> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 180: {
-            LogStep(180, "Read attribute NULLABLE_BOOLEAN null");
+        case 182: {
+            LogStep(182, "Read attribute NULLABLE_BOOLEAN null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 181: {
-            LogStep(181, "Write attribute NULLABLE_BOOLEAN True");
+        case 183: {
+            LogStep(183, "Write attribute NULLABLE_BOOLEAN True");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<bool> value;
             value.SetNonNull();
@@ -46575,187 +46845,187 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 182: {
-            LogStep(182, "Read attribute NULLABLE_BOOLEAN True");
+        case 184: {
+            LogStep(184, "Read attribute NULLABLE_BOOLEAN True");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 183: {
-            LogStep(183, "Read attribute NULLABLE_BOOLEAN not null");
+        case 185: {
+            LogStep(185, "Read attribute NULLABLE_BOOLEAN not null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 184: {
-            LogStep(184, "Write attribute NULLABLE_BITMAP8 Max Value");
+        case 186: {
+            LogStep(186, "Write attribute NULLABLE_BITMAP8 Max Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
             value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(254);
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(254);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 185: {
-            LogStep(185, "Read attribute NULLABLE_BITMAP8 Max Value");
+        case 187: {
+            LogStep(187, "Read attribute NULLABLE_BITMAP8 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 186: {
-            LogStep(186, "Write attribute NULLABLE_BITMAP8 Invalid Value");
+        case 188: {
+            LogStep(188, "Write attribute NULLABLE_BITMAP8 Invalid Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
             value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(255);
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(255);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 187: {
-            LogStep(187, "Read attribute NULLABLE_BITMAP8 unchanged Value");
+        case 189: {
+            LogStep(189, "Read attribute NULLABLE_BITMAP8 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 188: {
-            LogStep(188, "Write attribute NULLABLE_BITMAP8 null Value");
+        case 190: {
+            LogStep(190, "Write attribute NULLABLE_BITMAP8 null Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 189: {
-            LogStep(189, "Read attribute NULLABLE_BITMAP8 null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
-                                 true, chip::NullOptional);
-        }
-        case 190: {
-            LogStep(190, "Read attribute NULLABLE_BITMAP8 not 254 Value");
+        case 191: {
+            LogStep(191, "Read attribute NULLABLE_BITMAP8 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 191: {
-            LogStep(191, "Write attribute NULLABLE_BITMAP16 Max Value");
-            ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
-            value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(65534U);
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
-                                  value, chip::NullOptional, chip::NullOptional);
-        }
         case 192: {
-            LogStep(192, "Read attribute NULLABLE_BITMAP16 Max Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
+            LogStep(192, "Read attribute NULLABLE_BITMAP8 not 254 Value");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
         case 193: {
-            LogStep(193, "Write attribute NULLABLE_BITMAP16 Invalid Value");
+            LogStep(193, "Write attribute NULLABLE_BITMAP16 Max Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
             value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(65535U);
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(65534U);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 194: {
-            LogStep(194, "Read attribute NULLABLE_BITMAP16 unchanged Value");
+            LogStep(194, "Read attribute NULLABLE_BITMAP16 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
                                  true, chip::NullOptional);
         }
         case 195: {
-            LogStep(195, "Write attribute NULLABLE_BITMAP16 null Value");
+            LogStep(195, "Write attribute NULLABLE_BITMAP16 Invalid Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
-            value.SetNull();
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+            value.SetNonNull();
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(65535U);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 196: {
-            LogStep(196, "Read attribute NULLABLE_BITMAP16 null Value");
+            LogStep(196, "Read attribute NULLABLE_BITMAP16 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
                                  true, chip::NullOptional);
         }
         case 197: {
-            LogStep(197, "Write attribute NULLABLE_BITMAP32 Max Value");
+            LogStep(197, "Write attribute NULLABLE_BITMAP16 null Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
-            value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(4294967294UL);
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+            value.SetNull();
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 198: {
-            LogStep(198, "Read attribute NULLABLE_BITMAP32 Max Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
+            LogStep(198, "Read attribute NULLABLE_BITMAP16 null Value");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap16::Id,
                                  true, chip::NullOptional);
         }
         case 199: {
-            LogStep(199, "Write attribute NULLABLE_BITMAP32 Invalid Value");
+            LogStep(199, "Write attribute NULLABLE_BITMAP32 Max Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
             value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(4294967295UL);
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(4294967294UL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 200: {
-            LogStep(200, "Read attribute NULLABLE_BITMAP32 unchanged Value");
+            LogStep(200, "Read attribute NULLABLE_BITMAP32 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
                                  true, chip::NullOptional);
         }
         case 201: {
-            LogStep(201, "Write attribute NULLABLE_BITMAP32 null Value");
+            LogStep(201, "Write attribute NULLABLE_BITMAP32 Invalid Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
-            value.SetNull();
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+            value.SetNonNull();
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(4294967295UL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 202: {
-            LogStep(202, "Read attribute NULLABLE_BITMAP32 null Value");
+            LogStep(202, "Read attribute NULLABLE_BITMAP32 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
                                  true, chip::NullOptional);
         }
         case 203: {
-            LogStep(203, "Write attribute NULLABLE_BITMAP64 Max Value");
+            LogStep(203, "Write attribute NULLABLE_BITMAP32 null Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
-            value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(18446744073709551614ULL);
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
+            value.SetNull();
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 204: {
-            LogStep(204, "Read attribute NULLABLE_BITMAP64 Max Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
+            LogStep(204, "Read attribute NULLABLE_BITMAP32 null Value");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap32::Id,
                                  true, chip::NullOptional);
         }
         case 205: {
-            LogStep(205, "Write attribute NULLABLE_BITMAP64 Invalid Value");
+            LogStep(205, "Write attribute NULLABLE_BITMAP64 Max Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
             value.SetNonNull();
-            value.Value() = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(18446744073709551615ULL);
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(18446744073709551614ULL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 206: {
-            LogStep(206, "Read attribute NULLABLE_BITMAP64 unchanged Value");
+            LogStep(206, "Read attribute NULLABLE_BITMAP64 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
                                  true, chip::NullOptional);
         }
         case 207: {
-            LogStep(207, "Write attribute NULLABLE_BITMAP64 null Value");
+            LogStep(207, "Write attribute NULLABLE_BITMAP64 Invalid Value");
             ListFreer listFreer;
-            chip::app::DataModel::Nullable<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
-            value.SetNull();
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+            value.SetNonNull();
+            value.Value() = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(18446744073709551615ULL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
         case 208: {
-            LogStep(208, "Read attribute NULLABLE_BITMAP64 null Value");
+            LogStep(208, "Read attribute NULLABLE_BITMAP64 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
                                  true, chip::NullOptional);
         }
         case 209: {
-            LogStep(209, "Write attribute NULLABLE_INT8U Min Value");
+            LogStep(209, "Write attribute NULLABLE_BITMAP64 null Value");
+            ListFreer listFreer;
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+            value.SetNull();
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 210: {
+            LogStep(210, "Read attribute NULLABLE_BITMAP64 null Value");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableBitmap64::Id,
+                                 true, chip::NullOptional);
+        }
+        case 211: {
+            LogStep(211, "Write attribute NULLABLE_INT8U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -46763,13 +47033,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 210: {
-            LogStep(210, "Read attribute NULLABLE_INT8U Min Value");
+        case 212: {
+            LogStep(212, "Read attribute NULLABLE_INT8U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 211: {
-            LogStep(211, "Write attribute NULLABLE_INT8U Max Value");
+        case 213: {
+            LogStep(213, "Write attribute NULLABLE_INT8U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -46777,13 +47047,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 212: {
-            LogStep(212, "Read attribute NULLABLE_INT8U Max Value");
+        case 214: {
+            LogStep(214, "Read attribute NULLABLE_INT8U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 213: {
-            LogStep(213, "Write attribute NULLABLE_INT8U Invalid Value");
+        case 215: {
+            LogStep(215, "Write attribute NULLABLE_INT8U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -46791,41 +47061,41 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 214: {
-            LogStep(214, "Read attribute NULLABLE_INT8U unchanged Value");
+        case 216: {
+            LogStep(216, "Read attribute NULLABLE_INT8U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 215: {
-            LogStep(215, "Read attribute NULLABLE_INT8U unchanged Value with constraint");
+        case 217: {
+            LogStep(217, "Read attribute NULLABLE_INT8U unchanged Value with constraint");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 216: {
-            LogStep(216, "Write attribute NULLABLE_INT8U null Value");
+        case 218: {
+            LogStep(218, "Write attribute NULLABLE_INT8U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 217: {
-            LogStep(217, "Read attribute NULLABLE_INT8U null Value");
+        case 219: {
+            LogStep(219, "Read attribute NULLABLE_INT8U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 218: {
-            LogStep(218, "Read attribute NULLABLE_INT8U null Value & range");
+        case 220: {
+            LogStep(220, "Read attribute NULLABLE_INT8U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 219: {
-            LogStep(219, "Read attribute NULLABLE_INT8U null Value & not");
+        case 221: {
+            LogStep(221, "Read attribute NULLABLE_INT8U null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 220: {
-            LogStep(220, "Write attribute NULLABLE_INT8U Value");
+        case 222: {
+            LogStep(222, "Write attribute NULLABLE_INT8U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -46833,18 +47103,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 221: {
-            LogStep(221, "Read attribute NULLABLE_INT8U Value in range");
+        case 223: {
+            LogStep(223, "Read attribute NULLABLE_INT8U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 222: {
-            LogStep(222, "Read attribute NULLABLE_INT8U notValue OK");
+        case 224: {
+            LogStep(224, "Read attribute NULLABLE_INT8U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 223: {
-            LogStep(223, "Write attribute NULLABLE_INT16U Min Value");
+        case 225: {
+            LogStep(225, "Write attribute NULLABLE_INT16U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -46852,13 +47122,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 224: {
-            LogStep(224, "Read attribute NULLABLE_INT16U Min Value");
+        case 226: {
+            LogStep(226, "Read attribute NULLABLE_INT16U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 225: {
-            LogStep(225, "Write attribute NULLABLE_INT16U Max Value");
+        case 227: {
+            LogStep(227, "Write attribute NULLABLE_INT16U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -46866,13 +47136,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 226: {
-            LogStep(226, "Read attribute NULLABLE_INT16U Max Value");
+        case 228: {
+            LogStep(228, "Read attribute NULLABLE_INT16U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 227: {
-            LogStep(227, "Write attribute NULLABLE_INT16U Invalid Value");
+        case 229: {
+            LogStep(229, "Write attribute NULLABLE_INT16U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -46880,36 +47150,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 228: {
-            LogStep(228, "Read attribute NULLABLE_INT16U unchanged Value");
+        case 230: {
+            LogStep(230, "Read attribute NULLABLE_INT16U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 229: {
-            LogStep(229, "Write attribute NULLABLE_INT16U null Value");
+        case 231: {
+            LogStep(231, "Write attribute NULLABLE_INT16U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 230: {
-            LogStep(230, "Read attribute NULLABLE_INT16U null Value");
+        case 232: {
+            LogStep(232, "Read attribute NULLABLE_INT16U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 231: {
-            LogStep(231, "Read attribute NULLABLE_INT16U null Value & range");
+        case 233: {
+            LogStep(233, "Read attribute NULLABLE_INT16U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 232: {
-            LogStep(232, "Read attribute NULLABLE_INT16U null Value & not");
+        case 234: {
+            LogStep(234, "Read attribute NULLABLE_INT16U null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 233: {
-            LogStep(233, "Write attribute NULLABLE_INT16U Value");
+        case 235: {
+            LogStep(235, "Write attribute NULLABLE_INT16U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -46917,18 +47187,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 234: {
-            LogStep(234, "Read attribute NULLABLE_INT16U Value in range");
+        case 236: {
+            LogStep(236, "Read attribute NULLABLE_INT16U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 235: {
-            LogStep(235, "Read attribute NULLABLE_INT16U notValue OK");
+        case 237: {
+            LogStep(237, "Read attribute NULLABLE_INT16U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 236: {
-            LogStep(236, "Write attribute NULLABLE_INT32U Min Value");
+        case 238: {
+            LogStep(238, "Write attribute NULLABLE_INT32U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -46936,13 +47206,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 237: {
-            LogStep(237, "Read attribute NULLABLE_INT32U Min Value");
+        case 239: {
+            LogStep(239, "Read attribute NULLABLE_INT32U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 238: {
-            LogStep(238, "Write attribute NULLABLE_INT32U Max Value");
+        case 240: {
+            LogStep(240, "Write attribute NULLABLE_INT32U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -46950,13 +47220,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 239: {
-            LogStep(239, "Read attribute NULLABLE_INT32U Max Value");
+        case 241: {
+            LogStep(241, "Read attribute NULLABLE_INT32U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 240: {
-            LogStep(240, "Write attribute NULLABLE_INT32U Invalid Value");
+        case 242: {
+            LogStep(242, "Write attribute NULLABLE_INT32U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -46964,36 +47234,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 241: {
-            LogStep(241, "Read attribute NULLABLE_INT32U unchanged Value");
+        case 243: {
+            LogStep(243, "Read attribute NULLABLE_INT32U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 242: {
-            LogStep(242, "Write attribute NULLABLE_INT32U null Value");
+        case 244: {
+            LogStep(244, "Write attribute NULLABLE_INT32U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 243: {
-            LogStep(243, "Read attribute NULLABLE_INT32U null Value");
+        case 245: {
+            LogStep(245, "Read attribute NULLABLE_INT32U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 244: {
-            LogStep(244, "Read attribute NULLABLE_INT32U null Value & range");
+        case 246: {
+            LogStep(246, "Read attribute NULLABLE_INT32U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 245: {
-            LogStep(245, "Read attribute NULLABLE_INT32U null Value & not");
+        case 247: {
+            LogStep(247, "Read attribute NULLABLE_INT32U null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 246: {
-            LogStep(246, "Write attribute NULLABLE_INT32U Value");
+        case 248: {
+            LogStep(248, "Write attribute NULLABLE_INT32U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -47001,18 +47271,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 247: {
-            LogStep(247, "Read attribute NULLABLE_INT32U Value in range");
+        case 249: {
+            LogStep(249, "Read attribute NULLABLE_INT32U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 248: {
-            LogStep(248, "Read attribute NULLABLE_INT32U notValue OK");
+        case 250: {
+            LogStep(250, "Read attribute NULLABLE_INT32U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 249: {
-            LogStep(249, "Write attribute NULLABLE_INT64U Min Value");
+        case 251: {
+            LogStep(251, "Write attribute NULLABLE_INT64U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -47020,13 +47290,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 250: {
-            LogStep(250, "Read attribute NULLABLE_INT64U Min Value");
+        case 252: {
+            LogStep(252, "Read attribute NULLABLE_INT64U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 251: {
-            LogStep(251, "Write attribute NULLABLE_INT64U Max Value");
+        case 253: {
+            LogStep(253, "Write attribute NULLABLE_INT64U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -47034,13 +47304,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 252: {
-            LogStep(252, "Read attribute NULLABLE_INT64U Max Value");
+        case 254: {
+            LogStep(254, "Read attribute NULLABLE_INT64U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 253: {
-            LogStep(253, "Write attribute NULLABLE_INT64U Invalid Value");
+        case 255: {
+            LogStep(255, "Write attribute NULLABLE_INT64U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -47048,36 +47318,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 254: {
-            LogStep(254, "Read attribute NULLABLE_INT64U unchanged Value");
+        case 256: {
+            LogStep(256, "Read attribute NULLABLE_INT64U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 255: {
-            LogStep(255, "Write attribute NULLABLE_INT64U null Value");
+        case 257: {
+            LogStep(257, "Write attribute NULLABLE_INT64U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 256: {
-            LogStep(256, "Read attribute NULLABLE_INT64U null Value");
+        case 258: {
+            LogStep(258, "Read attribute NULLABLE_INT64U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 257: {
-            LogStep(257, "Read attribute NULLABLE_INT64U null Value & range");
+        case 259: {
+            LogStep(259, "Read attribute NULLABLE_INT64U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 258: {
-            LogStep(258, "Read attribute NULLABLE_INT64U null Value & not");
+        case 260: {
+            LogStep(260, "Read attribute NULLABLE_INT64U null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 259: {
-            LogStep(259, "Write attribute NULLABLE_INT64U Value");
+        case 261: {
+            LogStep(261, "Write attribute NULLABLE_INT64U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -47085,18 +47355,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 260: {
-            LogStep(260, "Read attribute NULLABLE_INT64U Value in range");
+        case 262: {
+            LogStep(262, "Read attribute NULLABLE_INT64U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 261: {
-            LogStep(261, "Read attribute NULLABLE_INT64U notValue OK");
+        case 263: {
+            LogStep(263, "Read attribute NULLABLE_INT64U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 262: {
-            LogStep(262, "Write attribute NULLABLE_INT8S Min Value");
+        case 264: {
+            LogStep(264, "Write attribute NULLABLE_INT8S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -47104,13 +47374,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 263: {
-            LogStep(263, "Read attribute NULLABLE_INT8S Min Value");
+        case 265: {
+            LogStep(265, "Read attribute NULLABLE_INT8S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 264: {
-            LogStep(264, "Write attribute NULLABLE_INT8S Invalid Value");
+        case 266: {
+            LogStep(266, "Write attribute NULLABLE_INT8S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -47118,36 +47388,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 265: {
-            LogStep(265, "Read attribute NULLABLE_INT8S unchanged Value");
+        case 267: {
+            LogStep(267, "Read attribute NULLABLE_INT8S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 266: {
-            LogStep(266, "Write attribute NULLABLE_INT8S null Value");
+        case 268: {
+            LogStep(268, "Write attribute NULLABLE_INT8S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 267: {
-            LogStep(267, "Read attribute NULLABLE_INT8S null Value");
+        case 269: {
+            LogStep(269, "Read attribute NULLABLE_INT8S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 268: {
-            LogStep(268, "Read attribute NULLABLE_INT8S null Value & range");
+        case 270: {
+            LogStep(270, "Read attribute NULLABLE_INT8S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 269: {
-            LogStep(269, "Read attribute NULLABLE_INT8S null Value & not");
+        case 271: {
+            LogStep(271, "Read attribute NULLABLE_INT8S null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 270: {
-            LogStep(270, "Write attribute NULLABLE_INT8S Value");
+        case 272: {
+            LogStep(272, "Write attribute NULLABLE_INT8S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -47155,18 +47425,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 271: {
-            LogStep(271, "Read attribute NULLABLE_INT8S Value in range");
+        case 273: {
+            LogStep(273, "Read attribute NULLABLE_INT8S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 272: {
-            LogStep(272, "Read attribute NULLABLE_INT8S notValue OK");
+        case 274: {
+            LogStep(274, "Read attribute NULLABLE_INT8S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 273: {
-            LogStep(273, "Write attribute NULLABLE_INT16S Min Value");
+        case 275: {
+            LogStep(275, "Write attribute NULLABLE_INT16S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -47174,13 +47444,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 274: {
-            LogStep(274, "Read attribute NULLABLE_INT16S Min Value");
+        case 276: {
+            LogStep(276, "Read attribute NULLABLE_INT16S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 275: {
-            LogStep(275, "Write attribute NULLABLE_INT16S Invalid Value");
+        case 277: {
+            LogStep(277, "Write attribute NULLABLE_INT16S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -47188,36 +47458,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 276: {
-            LogStep(276, "Read attribute NULLABLE_INT16S unchanged Value");
+        case 278: {
+            LogStep(278, "Read attribute NULLABLE_INT16S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 277: {
-            LogStep(277, "Write attribute NULLABLE_INT16S null Value");
+        case 279: {
+            LogStep(279, "Write attribute NULLABLE_INT16S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 278: {
-            LogStep(278, "Read attribute NULLABLE_INT16S null Value");
+        case 280: {
+            LogStep(280, "Read attribute NULLABLE_INT16S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 279: {
-            LogStep(279, "Read attribute NULLABLE_INT16S null Value & range");
+        case 281: {
+            LogStep(281, "Read attribute NULLABLE_INT16S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 280: {
-            LogStep(280, "Read attribute NULLABLE_INT16S null Value & not");
+        case 282: {
+            LogStep(282, "Read attribute NULLABLE_INT16S null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 281: {
-            LogStep(281, "Write attribute NULLABLE_INT16S Value");
+        case 283: {
+            LogStep(283, "Write attribute NULLABLE_INT16S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -47225,18 +47495,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 282: {
-            LogStep(282, "Read attribute NULLABLE_INT16S Value in range");
+        case 284: {
+            LogStep(284, "Read attribute NULLABLE_INT16S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 283: {
-            LogStep(283, "Read attribute NULLABLE_INT16S notValue OK");
+        case 285: {
+            LogStep(285, "Read attribute NULLABLE_INT16S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 284: {
-            LogStep(284, "Write attribute NULLABLE_INT32S Min Value");
+        case 286: {
+            LogStep(286, "Write attribute NULLABLE_INT32S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNonNull();
@@ -47244,13 +47514,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 285: {
-            LogStep(285, "Read attribute NULLABLE_INT32S Min Value");
+        case 287: {
+            LogStep(287, "Read attribute NULLABLE_INT32S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 286: {
-            LogStep(286, "Write attribute NULLABLE_INT32S Invalid Value");
+        case 288: {
+            LogStep(288, "Write attribute NULLABLE_INT32S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNonNull();
@@ -47258,36 +47528,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 287: {
-            LogStep(287, "Read attribute NULLABLE_INT32S unchanged Value");
+        case 289: {
+            LogStep(289, "Read attribute NULLABLE_INT32S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 288: {
-            LogStep(288, "Write attribute NULLABLE_INT32S null Value");
+        case 290: {
+            LogStep(290, "Write attribute NULLABLE_INT32S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 289: {
-            LogStep(289, "Read attribute NULLABLE_INT32S null Value");
+        case 291: {
+            LogStep(291, "Read attribute NULLABLE_INT32S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 290: {
-            LogStep(290, "Read attribute NULLABLE_INT32S null Value & range");
+        case 292: {
+            LogStep(292, "Read attribute NULLABLE_INT32S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 291: {
-            LogStep(291, "Read attribute NULLABLE_INT32S null Value & not");
+        case 293: {
+            LogStep(293, "Read attribute NULLABLE_INT32S null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 292: {
-            LogStep(292, "Write attribute NULLABLE_INT32S Value");
+        case 294: {
+            LogStep(294, "Write attribute NULLABLE_INT32S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNonNull();
@@ -47295,18 +47565,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 293: {
-            LogStep(293, "Read attribute NULLABLE_INT32S Value in range");
+        case 295: {
+            LogStep(295, "Read attribute NULLABLE_INT32S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 294: {
-            LogStep(294, "Read attribute NULLABLE_INT32S notValue OK");
+        case 296: {
+            LogStep(296, "Read attribute NULLABLE_INT32S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 295: {
-            LogStep(295, "Write attribute NULLABLE_INT64S Min Value");
+        case 297: {
+            LogStep(297, "Write attribute NULLABLE_INT64S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNonNull();
@@ -47314,13 +47584,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 296: {
-            LogStep(296, "Read attribute NULLABLE_INT64S Min Value");
+        case 298: {
+            LogStep(298, "Read attribute NULLABLE_INT64S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 297: {
-            LogStep(297, "Write attribute NULLABLE_INT64S Invalid Value");
+        case 299: {
+            LogStep(299, "Write attribute NULLABLE_INT64S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNonNull();
@@ -47328,36 +47598,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 298: {
-            LogStep(298, "Read attribute NULLABLE_INT64S unchanged Value");
+        case 300: {
+            LogStep(300, "Read attribute NULLABLE_INT64S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 299: {
-            LogStep(299, "Write attribute NULLABLE_INT64S null Value");
+        case 301: {
+            LogStep(301, "Write attribute NULLABLE_INT64S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 300: {
-            LogStep(300, "Read attribute NULLABLE_INT64S null Value");
+        case 302: {
+            LogStep(302, "Read attribute NULLABLE_INT64S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 301: {
-            LogStep(301, "Read attribute NULLABLE_INT64S null Value & range");
+        case 303: {
+            LogStep(303, "Read attribute NULLABLE_INT64S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 302: {
-            LogStep(302, "Read attribute NULLABLE_INT64S null Value & not");
+        case 304: {
+            LogStep(304, "Read attribute NULLABLE_INT64S null Value & not");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 303: {
-            LogStep(303, "Write attribute NULLABLE_INT64S Value");
+        case 305: {
+            LogStep(305, "Write attribute NULLABLE_INT64S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNonNull();
@@ -47365,18 +47635,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 304: {
-            LogStep(304, "Read attribute NULLABLE_INT64S Value in range");
+        case 306: {
+            LogStep(306, "Read attribute NULLABLE_INT64S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 305: {
-            LogStep(305, "Read attribute NULLABLE_INT64S notValue OK");
+        case 307: {
+            LogStep(307, "Read attribute NULLABLE_INT64S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 306: {
-            LogStep(306, "Write attribute NULLABLE_SINGLE medium Value");
+        case 308: {
+            LogStep(308, "Write attribute NULLABLE_SINGLE medium Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -47384,13 +47654,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 307: {
-            LogStep(307, "Read attribute NULLABLE_SINGLE medium Value");
+        case 309: {
+            LogStep(309, "Read attribute NULLABLE_SINGLE medium Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 308: {
-            LogStep(308, "Write attribute NULLABLE_SINGLE largest Value");
+        case 310: {
+            LogStep(310, "Write attribute NULLABLE_SINGLE largest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -47398,13 +47668,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 309: {
-            LogStep(309, "Read attribute NULLABLE_SINGLE largest Value");
+        case 311: {
+            LogStep(311, "Read attribute NULLABLE_SINGLE largest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 310: {
-            LogStep(310, "Write attribute NULLABLE_SINGLE smallest Value");
+        case 312: {
+            LogStep(312, "Write attribute NULLABLE_SINGLE smallest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -47412,26 +47682,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 311: {
-            LogStep(311, "Read attribute NULLABLE_SINGLE smallest Value");
+        case 313: {
+            LogStep(313, "Read attribute NULLABLE_SINGLE smallest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 312: {
-            LogStep(312, "Write attribute NULLABLE_SINGLE null Value");
+        case 314: {
+            LogStep(314, "Write attribute NULLABLE_SINGLE null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 313: {
-            LogStep(313, "Read attribute NULLABLE_SINGLE null Value");
+        case 315: {
+            LogStep(315, "Read attribute NULLABLE_SINGLE null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 314: {
-            LogStep(314, "Write attribute NULLABLE_SINGLE 0 Value");
+        case 316: {
+            LogStep(316, "Write attribute NULLABLE_SINGLE 0 Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -47439,13 +47709,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 315: {
-            LogStep(315, "Read attribute NULLABLE_SINGLE 0 Value");
+        case 317: {
+            LogStep(317, "Read attribute NULLABLE_SINGLE 0 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 316: {
-            LogStep(316, "Write attribute NULLABLE_DOUBLE medium Value");
+        case 318: {
+            LogStep(318, "Write attribute NULLABLE_DOUBLE medium Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -47453,13 +47723,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 317: {
-            LogStep(317, "Read attribute NULLABLE_DOUBLE medium Value");
+        case 319: {
+            LogStep(319, "Read attribute NULLABLE_DOUBLE medium Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 318: {
-            LogStep(318, "Write attribute NULLABLE_DOUBLE largest Value");
+        case 320: {
+            LogStep(320, "Write attribute NULLABLE_DOUBLE largest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -47467,13 +47737,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 319: {
-            LogStep(319, "Read attribute NULLABLE_DOUBLE largest Value");
+        case 321: {
+            LogStep(321, "Read attribute NULLABLE_DOUBLE largest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 320: {
-            LogStep(320, "Write attribute NULLABLE_DOUBLE smallest Value");
+        case 322: {
+            LogStep(322, "Write attribute NULLABLE_DOUBLE smallest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -47481,26 +47751,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 321: {
-            LogStep(321, "Read attribute NULLABLE_DOUBLE smallest Value");
+        case 323: {
+            LogStep(323, "Read attribute NULLABLE_DOUBLE smallest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 322: {
-            LogStep(322, "Write attribute NULLABLE_DOUBLE null Value");
+        case 324: {
+            LogStep(324, "Write attribute NULLABLE_DOUBLE null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 323: {
-            LogStep(323, "Read attribute NULLABLE_DOUBLE null Value");
+        case 325: {
+            LogStep(325, "Read attribute NULLABLE_DOUBLE null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 324: {
-            LogStep(324, "Write attribute NULLABLE_DOUBLE 0 Value");
+        case 326: {
+            LogStep(326, "Write attribute NULLABLE_DOUBLE 0 Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -47508,13 +47778,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 325: {
-            LogStep(325, "Read attribute NULLABLE_DOUBLE 0 Value");
+        case 327: {
+            LogStep(327, "Read attribute NULLABLE_DOUBLE 0 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 326: {
-            LogStep(326, "Write attribute NULLABLE_ENUM8 Min Value");
+        case 328: {
+            LogStep(328, "Write attribute NULLABLE_ENUM8 Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -47522,13 +47792,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 327: {
-            LogStep(327, "Read attribute NULLABLE_ENUM8 Min Value");
+        case 329: {
+            LogStep(329, "Read attribute NULLABLE_ENUM8 Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 328: {
-            LogStep(328, "Write attribute NULLABLE_ENUM8 Max Value");
+        case 330: {
+            LogStep(330, "Write attribute NULLABLE_ENUM8 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -47536,13 +47806,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 329: {
-            LogStep(329, "Read attribute NULLABLE_ENUM8 Max Value");
+        case 331: {
+            LogStep(331, "Read attribute NULLABLE_ENUM8 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 330: {
-            LogStep(330, "Write attribute NULLABLE_ENUM8 Invalid Value");
+        case 332: {
+            LogStep(332, "Write attribute NULLABLE_ENUM8 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -47550,26 +47820,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 331: {
-            LogStep(331, "Read attribute NULLABLE_ENUM8 unchanged Value");
+        case 333: {
+            LogStep(333, "Read attribute NULLABLE_ENUM8 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 332: {
-            LogStep(332, "Write attribute NULLABLE_ENUM8 null Value");
+        case 334: {
+            LogStep(334, "Write attribute NULLABLE_ENUM8 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 333: {
-            LogStep(333, "Read attribute NULLABLE_ENUM8 null Value");
+        case 335: {
+            LogStep(335, "Read attribute NULLABLE_ENUM8 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 334: {
-            LogStep(334, "Write attribute NULLABLE_ENUM16 Min Value");
+        case 336: {
+            LogStep(336, "Write attribute NULLABLE_ENUM16 Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -47577,13 +47847,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 335: {
-            LogStep(335, "Read attribute NULLABLE_ENUM16 Min Value");
+        case 337: {
+            LogStep(337, "Read attribute NULLABLE_ENUM16 Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 336: {
-            LogStep(336, "Write attribute NULLABLE_ENUM16 Max Value");
+        case 338: {
+            LogStep(338, "Write attribute NULLABLE_ENUM16 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -47591,13 +47861,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 337: {
-            LogStep(337, "Read attribute NULLABLE_ENUM16 Max Value");
+        case 339: {
+            LogStep(339, "Read attribute NULLABLE_ENUM16 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 338: {
-            LogStep(338, "Write attribute NULLABLE_ENUM16 Invalid Value");
+        case 340: {
+            LogStep(340, "Write attribute NULLABLE_ENUM16 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -47605,26 +47875,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 339: {
-            LogStep(339, "Read attribute NULLABLE_ENUM16 unchanged Value");
+        case 341: {
+            LogStep(341, "Read attribute NULLABLE_ENUM16 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 340: {
-            LogStep(340, "Write attribute NULLABLE_ENUM16 null Value");
+        case 342: {
+            LogStep(342, "Write attribute NULLABLE_ENUM16 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 341: {
-            LogStep(341, "Read attribute NULLABLE_ENUM16 null Value");
+        case 343: {
+            LogStep(343, "Read attribute NULLABLE_ENUM16 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 342: {
-            LogStep(342, "Write attribute NULLABLE_SIMPLE_ENUM Min Value");
+        case 344: {
+            LogStep(344, "Write attribute NULLABLE_SIMPLE_ENUM Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
             value.SetNonNull();
@@ -47632,13 +47902,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 343: {
-            LogStep(343, "Read attribute NULLABLE_SIMPLE_ENUM Min Value");
+        case 345: {
+            LogStep(345, "Read attribute NULLABLE_SIMPLE_ENUM Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 344: {
-            LogStep(344, "Write attribute NULLABLE_SIMPLE_ENUM Max Value");
+        case 346: {
+            LogStep(346, "Write attribute NULLABLE_SIMPLE_ENUM Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
             value.SetNonNull();
@@ -47646,13 +47916,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 345: {
-            LogStep(345, "Read attribute NULLABLE_SIMPLE_ENUM Max Value");
+        case 347: {
+            LogStep(347, "Read attribute NULLABLE_SIMPLE_ENUM Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 346: {
-            LogStep(346, "Write attribute NULLABLE_SIMPLE_ENUM Invalid Value");
+        case 348: {
+            LogStep(348, "Write attribute NULLABLE_SIMPLE_ENUM Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
             value.SetNonNull();
@@ -47660,36 +47930,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 347: {
-            LogStep(347, "Read attribute NULLABLE_SIMPLE_ENUM unchanged Value");
+        case 349: {
+            LogStep(349, "Read attribute NULLABLE_SIMPLE_ENUM unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 348: {
-            LogStep(348, "Write attribute NULLABLE_SIMPLE_ENUM null Value");
+        case 350: {
+            LogStep(350, "Write attribute NULLABLE_SIMPLE_ENUM null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 349: {
-            LogStep(349, "Read attribute NULLABLE_SIMPLE_ENUM null Value");
+        case 351: {
+            LogStep(351, "Read attribute NULLABLE_SIMPLE_ENUM null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 350: {
-            LogStep(350, "Read attribute NULLABLE_SIMPLE_ENUM not 254 Value");
+        case 352: {
+            LogStep(352, "Read attribute NULLABLE_SIMPLE_ENUM not 254 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 351: {
-            LogStep(351, "Read attribute NULLABLE_OCTET_STRING Default Value");
+        case 353: {
+            LogStep(353, "Read attribute NULLABLE_OCTET_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 352: {
-            LogStep(352, "Write attribute NULLABLE_OCTET_STRING");
+        case 354: {
+            LogStep(354, "Write attribute NULLABLE_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::ByteSpan> value;
             value.SetNonNull();
@@ -47697,26 +47967,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 353: {
-            LogStep(353, "Read attribute NULLABLE_OCTET_STRING");
+        case 355: {
+            LogStep(355, "Read attribute NULLABLE_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 354: {
-            LogStep(354, "Write attribute NULLABLE_OCTET_STRING");
+        case 356: {
+            LogStep(356, "Write attribute NULLABLE_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::ByteSpan> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 355: {
-            LogStep(355, "Read attribute NULLABLE_OCTET_STRING");
+        case 357: {
+            LogStep(357, "Read attribute NULLABLE_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 356: {
-            LogStep(356, "Write attribute NULLABLE_OCTET_STRING");
+        case 358: {
+            LogStep(358, "Write attribute NULLABLE_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::ByteSpan> value;
             value.SetNonNull();
@@ -47724,23 +47994,23 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 357: {
-            LogStep(357, "Read attribute NULLABLE_OCTET_STRING");
+        case 359: {
+            LogStep(359, "Read attribute NULLABLE_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 358: {
-            LogStep(358, "Read attribute NULLABLE_OCTET_STRING not TestValue");
+        case 360: {
+            LogStep(360, "Read attribute NULLABLE_OCTET_STRING not TestValue");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 359: {
-            LogStep(359, "Read attribute NULLABLE_CHAR_STRING Default Value");
+        case 361: {
+            LogStep(361, "Read attribute NULLABLE_CHAR_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 360: {
-            LogStep(360, "Write attribute NULLABLE_CHAR_STRING");
+        case 362: {
+            LogStep(362, "Write attribute NULLABLE_CHAR_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::CharSpan> value;
             value.SetNonNull();
@@ -47748,31 +48018,31 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 361: {
-            LogStep(361, "Read attribute NULLABLE_CHAR_STRING");
+        case 363: {
+            LogStep(363, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 362: {
-            LogStep(362, "Read attribute NULLABLE_CHAR_STRING");
+        case 364: {
+            LogStep(364, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 363: {
-            LogStep(363, "Write attribute NULLABLE_CHAR_STRING - Value too long");
+        case 365: {
+            LogStep(365, "Write attribute NULLABLE_CHAR_STRING - Value too long");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::CharSpan> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 364: {
-            LogStep(364, "Read attribute NULLABLE_CHAR_STRING");
+        case 366: {
+            LogStep(366, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 365: {
-            LogStep(365, "Write attribute NULLABLE_CHAR_STRING - Empty");
+        case 367: {
+            LogStep(367, "Write attribute NULLABLE_CHAR_STRING - Empty");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::CharSpan> value;
             value.SetNonNull();
@@ -47780,28 +48050,28 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 366: {
-            LogStep(366, "Read attribute NULLABLE_CHAR_STRING");
+        case 368: {
+            LogStep(368, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 367: {
-            LogStep(367, "Read attribute NULLABLE_CHAR_STRING not ☉T☉");
+        case 369: {
+            LogStep(369, "Read attribute NULLABLE_CHAR_STRING not ☉T☉");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 368: {
-            LogStep(368, "Read attribute from nonexistent endpoint.");
+        case 370: {
+            LogStep(370, "Read attribute from nonexistent endpoint.");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(200), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 369: {
-            LogStep(369, "Read attribute from nonexistent cluster.");
+        case 371: {
+            LogStep(371, "Read attribute from nonexistent cluster.");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 370: {
-            LogStep(370, "Send a command that takes an optional parameter but do not set it.");
+        case 372: {
+            LogStep(372, "Send a command that takes an optional parameter but do not set it.");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestSimpleOptionalArgumentRequest::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
@@ -47809,8 +48079,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 371: {
-            LogStep(371, "Send a command that takes an optional parameter but do not set it.");
+        case 373: {
+            LogStep(373, "Send a command that takes an optional parameter but do not set it.");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Commands::TestSimpleOptionalArgumentRequest::Type value;
             value.arg1.Emplace();
@@ -47820,13 +48090,13 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 372: {
-            LogStep(372, "Subscribe to list attribute");
+        case 374: {
+            LogStep(374, "Subscribe to list attribute");
             return SubscribeAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, 2, 5,
                                       true, chip::NullOptional, chip::NullOptional);
         }
-        case 373: {
-            LogStep(373, "Write subscribed-to list attribute");
+        case 375: {
+            LogStep(375, "Write subscribed-to list attribute");
             ListFreer listFreer;
             chip::app::DataModel::List<const uint8_t> value;
 
@@ -47842,98 +48112,98 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 374: {
-            LogStep(374, "Check for list attribute report");
+        case 376: {
+            LogStep(376, "Check for list attribute report");
             return WaitForReport();
         }
-        case 375: {
-            LogStep(375, "Read range-restricted unsigned 8-bit integer");
+        case 377: {
+            LogStep(377, "Read range-restricted unsigned 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 376: {
-            LogStep(376, "Write min value to a range-restricted unsigned 8-bit integer");
+        case 378: {
+            LogStep(378, "Write min value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 0;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 377: {
-            LogStep(377, "Write just-below-range value to a range-restricted unsigned 8-bit integer");
+        case 379: {
+            LogStep(379, "Write just-below-range value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 19;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 378: {
-            LogStep(378, "Write just-above-range value to a range-restricted unsigned 8-bit integer");
+        case 380: {
+            LogStep(380, "Write just-above-range value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 101;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 379: {
-            LogStep(379, "Write max value to a range-restricted unsigned 8-bit integer");
+        case 381: {
+            LogStep(381, "Write max value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 255;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 380: {
-            LogStep(380, "Verify range-restricted unsigned 8-bit integer value has not changed");
+        case 382: {
+            LogStep(382, "Verify range-restricted unsigned 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 381: {
-            LogStep(381, "Write min valid value to a range-restricted unsigned 8-bit integer");
+        case 383: {
+            LogStep(383, "Write min valid value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 20;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 382: {
-            LogStep(382, "Verify range-restricted unsigned 8-bit integer value is at min valid");
+        case 384: {
+            LogStep(384, "Verify range-restricted unsigned 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 383: {
-            LogStep(383, "Write max valid value to a range-restricted unsigned 8-bit integer");
+        case 385: {
+            LogStep(385, "Write max valid value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 100;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 384: {
-            LogStep(384, "Verify range-restricted unsigned 8-bit integer value is at max valid");
+        case 386: {
+            LogStep(386, "Verify range-restricted unsigned 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 385: {
-            LogStep(385, "Write middle valid value to a range-restricted unsigned 8-bit integer");
+        case 387: {
+            LogStep(387, "Write middle valid value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 50;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 386: {
-            LogStep(386, "Verify range-restricted unsigned 8-bit integer value is at mid valid");
+        case 388: {
+            LogStep(388, "Verify range-restricted unsigned 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 387: {
-            LogStep(387, "Read range-restricted unsigned 16-bit integer");
+        case 389: {
+            LogStep(389, "Read range-restricted unsigned 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 388: {
-            LogStep(388, "Write min value to a range-restricted unsigned 16-bit integer");
+        case 390: {
+            LogStep(390, "Write min value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 0U;
@@ -47941,8 +48211,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 389: {
-            LogStep(389, "Write just-below-range value to a range-restricted unsigned 16-bit integer");
+        case 391: {
+            LogStep(391, "Write just-below-range value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 99U;
@@ -47950,8 +48220,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 390: {
-            LogStep(390, "Write just-above-range value to a range-restricted unsigned 16-bit integer");
+        case 392: {
+            LogStep(392, "Write just-above-range value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 1001U;
@@ -47959,8 +48229,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 391: {
-            LogStep(391, "Write max value to a range-restricted unsigned 16-bit integer");
+        case 393: {
+            LogStep(393, "Write max value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 65535U;
@@ -47968,13 +48238,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 392: {
-            LogStep(392, "Verify range-restricted unsigned 16-bit integer value has not changed");
+        case 394: {
+            LogStep(394, "Verify range-restricted unsigned 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 393: {
-            LogStep(393, "Write min valid value to a range-restricted unsigned 16-bit integer");
+        case 395: {
+            LogStep(395, "Write min valid value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 100U;
@@ -47982,13 +48252,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 394: {
-            LogStep(394, "Verify range-restricted unsigned 16-bit integer value is at min valid");
+        case 396: {
+            LogStep(396, "Verify range-restricted unsigned 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 395: {
-            LogStep(395, "Write max valid value to a range-restricted unsigned 16-bit integer");
+        case 397: {
+            LogStep(397, "Write max valid value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 1000U;
@@ -47996,13 +48266,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 396: {
-            LogStep(396, "Verify range-restricted unsigned 16-bit integer value is at max valid");
+        case 398: {
+            LogStep(398, "Verify range-restricted unsigned 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 397: {
-            LogStep(397, "Write middle valid value to a range-restricted unsigned 16-bit integer");
+        case 399: {
+            LogStep(399, "Write middle valid value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 500U;
@@ -48010,99 +48280,99 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 398: {
-            LogStep(398, "Verify range-restricted unsigned 16-bit integer value is at mid valid");
+        case 400: {
+            LogStep(400, "Verify range-restricted unsigned 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 399: {
-            LogStep(399, "Read range-restricted signed 8-bit integer");
+        case 401: {
+            LogStep(401, "Read range-restricted signed 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 400: {
-            LogStep(400, "Write min value to a range-restricted signed 8-bit integer");
+        case 402: {
+            LogStep(402, "Write min value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = -128;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 401: {
-            LogStep(401, "Write just-below-range value to a range-restricted signed 8-bit integer");
+        case 403: {
+            LogStep(403, "Write just-below-range value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = -41;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 402: {
-            LogStep(402, "Write just-above-range value to a range-restricted signed 8-bit integer");
+        case 404: {
+            LogStep(404, "Write just-above-range value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 51;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 403: {
-            LogStep(403, "Write max value to a range-restricted signed 8-bit integer");
+        case 405: {
+            LogStep(405, "Write max value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 127;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 404: {
-            LogStep(404, "Verify range-restricted signed 8-bit integer value has not changed");
+        case 406: {
+            LogStep(406, "Verify range-restricted signed 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 405: {
-            LogStep(405, "Write min valid value to a range-restricted signed 8-bit integer");
+        case 407: {
+            LogStep(407, "Write min valid value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = -40;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 406: {
-            LogStep(406, "Verify range-restricted signed 8-bit integer value is at min valid");
+        case 408: {
+            LogStep(408, "Verify range-restricted signed 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 407: {
-            LogStep(407, "Write max valid value to a range-restricted signed 8-bit integer");
+        case 409: {
+            LogStep(409, "Write max valid value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 50;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 408: {
-            LogStep(408, "Verify range-restricted signed 8-bit integer value is at max valid");
+        case 410: {
+            LogStep(410, "Verify range-restricted signed 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 409: {
-            LogStep(409, "Write middle valid value to a range-restricted signed 8-bit integer");
+        case 411: {
+            LogStep(411, "Write middle valid value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 6;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                   TestCluster::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 410: {
-            LogStep(410, "Verify range-restricted signed 8-bit integer value is at mid valid");
+        case 412: {
+            LogStep(412, "Verify range-restricted signed 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 411: {
-            LogStep(411, "Read range-restricted signed 16-bit integer");
+        case 413: {
+            LogStep(413, "Read range-restricted signed 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 412: {
-            LogStep(412, "Write min value to a range-restricted signed 16-bit integer");
+        case 414: {
+            LogStep(414, "Write min value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = -32768;
@@ -48110,8 +48380,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 413: {
-            LogStep(413, "Write just-below-range value to a range-restricted signed 16-bit integer");
+        case 415: {
+            LogStep(415, "Write just-below-range value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = -151;
@@ -48119,8 +48389,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 414: {
-            LogStep(414, "Write just-above-range value to a range-restricted signed 16-bit integer");
+        case 416: {
+            LogStep(416, "Write just-above-range value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 201;
@@ -48128,8 +48398,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 415: {
-            LogStep(415, "Write max value to a range-restricted signed 16-bit integer");
+        case 417: {
+            LogStep(417, "Write max value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 32767;
@@ -48137,13 +48407,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 416: {
-            LogStep(416, "Verify range-restricted signed 16-bit integer value has not changed");
+        case 418: {
+            LogStep(418, "Verify range-restricted signed 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 417: {
-            LogStep(417, "Write min valid value to a range-restricted signed 16-bit integer");
+        case 419: {
+            LogStep(419, "Write min valid value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = -150;
@@ -48151,13 +48421,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 418: {
-            LogStep(418, "Verify range-restricted signed 16-bit integer value is at min valid");
+        case 420: {
+            LogStep(420, "Verify range-restricted signed 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 419: {
-            LogStep(419, "Write max valid value to a range-restricted signed 16-bit integer");
+        case 421: {
+            LogStep(421, "Write max valid value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 200;
@@ -48165,13 +48435,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 420: {
-            LogStep(420, "Verify range-restricted signed 16-bit integer value is at max valid");
+        case 422: {
+            LogStep(422, "Verify range-restricted signed 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 421: {
-            LogStep(421, "Write middle valid value to a range-restricted signed 16-bit integer");
+        case 423: {
+            LogStep(423, "Write middle valid value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 7;
@@ -48179,18 +48449,18 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 422: {
-            LogStep(422, "Verify range-restricted signed 16-bit integer value is at mid valid");
+        case 424: {
+            LogStep(424, "Verify range-restricted signed 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 423: {
-            LogStep(423, "Read nullable range-restricted unsigned 8-bit integer");
+        case 425: {
+            LogStep(425, "Read nullable range-restricted unsigned 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 424: {
-            LogStep(424, "Write min value to a nullable range-restricted unsigned 8-bit integer");
+        case 426: {
+            LogStep(426, "Write min value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48199,8 +48469,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 425: {
-            LogStep(425, "Write just-below-range value to a nullable range-restricted unsigned 8-bit integer");
+        case 427: {
+            LogStep(427, "Write just-below-range value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48209,8 +48479,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 426: {
-            LogStep(426, "Write just-above-range value to a nullable range-restricted unsigned 8-bit integer");
+        case 428: {
+            LogStep(428, "Write just-above-range value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48219,8 +48489,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 427: {
-            LogStep(427, "Write max value to a nullable range-restricted unsigned 8-bit integer");
+        case 429: {
+            LogStep(429, "Write max value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48229,13 +48499,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 428: {
-            LogStep(428, "Verify nullable range-restricted unsigned 8-bit integer value has not changed");
+        case 430: {
+            LogStep(430, "Verify nullable range-restricted unsigned 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 429: {
-            LogStep(429, "Write min valid value to a nullable range-restricted unsigned 8-bit integer");
+        case 431: {
+            LogStep(431, "Write min valid value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48244,13 +48514,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 430: {
-            LogStep(430, "Verify nullable range-restricted unsigned 8-bit integer value is at min valid");
+        case 432: {
+            LogStep(432, "Verify nullable range-restricted unsigned 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 431: {
-            LogStep(431, "Write max valid value to a nullable range-restricted unsigned 8-bit integer");
+        case 433: {
+            LogStep(433, "Write max valid value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48259,13 +48529,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 432: {
-            LogStep(432, "Verify nullable range-restricted unsigned 8-bit integer value is at max valid");
+        case 434: {
+            LogStep(434, "Verify nullable range-restricted unsigned 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 433: {
-            LogStep(433, "Write middle valid value to a nullable range-restricted unsigned 8-bit integer");
+        case 435: {
+            LogStep(435, "Write middle valid value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -48274,13 +48544,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 434: {
-            LogStep(434, "Verify nullable range-restricted unsigned 8-bit integer value is at mid valid");
+        case 436: {
+            LogStep(436, "Verify nullable range-restricted unsigned 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 435: {
-            LogStep(435, "Write null value to a nullable range-restricted unsigned 8-bit integer");
+        case 437: {
+            LogStep(437, "Write null value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNull();
@@ -48288,18 +48558,18 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 436: {
-            LogStep(436, "Verify nullable range-restricted unsigned 8-bit integer value is null");
+        case 438: {
+            LogStep(438, "Verify nullable range-restricted unsigned 8-bit integer value is null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 437: {
-            LogStep(437, "Read nullable range-restricted unsigned 16-bit integer");
+        case 439: {
+            LogStep(439, "Read nullable range-restricted unsigned 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 438: {
-            LogStep(438, "Write min value to a nullable range-restricted unsigned 16-bit integer");
+        case 440: {
+            LogStep(440, "Write min value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48308,8 +48578,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 439: {
-            LogStep(439, "Write just-below-range value to a nullable range-restricted unsigned 16-bit integer");
+        case 441: {
+            LogStep(441, "Write just-below-range value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48318,8 +48588,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 440: {
-            LogStep(440, "Write just-above-range value to a nullable range-restricted unsigned 16-bit integer");
+        case 442: {
+            LogStep(442, "Write just-above-range value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48328,8 +48598,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 441: {
-            LogStep(441, "Write max value to a nullable range-restricted unsigned 16-bit integer");
+        case 443: {
+            LogStep(443, "Write max value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48338,13 +48608,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 442: {
-            LogStep(442, "Verify nullable range-restricted unsigned 16-bit integer value has not changed");
+        case 444: {
+            LogStep(444, "Verify nullable range-restricted unsigned 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 443: {
-            LogStep(443, "Write min valid value to a nullable range-restricted unsigned 16-bit integer");
+        case 445: {
+            LogStep(445, "Write min valid value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48353,13 +48623,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 444: {
-            LogStep(444, "Verify nullable range-restricted unsigned 16-bit integer value is at min valid");
+        case 446: {
+            LogStep(446, "Verify nullable range-restricted unsigned 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 445: {
-            LogStep(445, "Write max valid value to a nullable range-restricted unsigned 16-bit integer");
+        case 447: {
+            LogStep(447, "Write max valid value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48368,13 +48638,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 446: {
-            LogStep(446, "Verify nullable range-restricted unsigned 16-bit integer value is at max valid");
+        case 448: {
+            LogStep(448, "Verify nullable range-restricted unsigned 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 447: {
-            LogStep(447, "Write middle valid value to a nullable range-restricted unsigned 16-bit integer");
+        case 449: {
+            LogStep(449, "Write middle valid value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -48383,13 +48653,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 448: {
-            LogStep(448, "Verify nullable range-restricted unsigned 16-bit integer value is at mid valid");
+        case 450: {
+            LogStep(450, "Verify nullable range-restricted unsigned 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 449: {
-            LogStep(449, "Write null value to a nullable range-restricted unsigned 16-bit integer");
+        case 451: {
+            LogStep(451, "Write null value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNull();
@@ -48397,18 +48667,18 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 450: {
-            LogStep(450, "Verify nullable range-restricted unsigned 16-bit integer value is null");
+        case 452: {
+            LogStep(452, "Verify nullable range-restricted unsigned 16-bit integer value is null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 451: {
-            LogStep(451, "Read nullable range-restricted signed 8-bit integer");
+        case 453: {
+            LogStep(453, "Read nullable range-restricted signed 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 452: {
-            LogStep(452, "Write min value to a nullable range-restricted signed 8-bit integer");
+        case 454: {
+            LogStep(454, "Write min value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48417,8 +48687,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 453: {
-            LogStep(453, "Write just-below-range value to a nullable range-restricted signed 8-bit integer");
+        case 455: {
+            LogStep(455, "Write just-below-range value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48427,8 +48697,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 454: {
-            LogStep(454, "Write just-above-range value to a nullable range-restricted signed 8-bit integer");
+        case 456: {
+            LogStep(456, "Write just-above-range value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48437,8 +48707,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 455: {
-            LogStep(455, "Write max value to a nullable range-restricted signed 8-bit integer");
+        case 457: {
+            LogStep(457, "Write max value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48447,13 +48717,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 456: {
-            LogStep(456, "Verify nullable range-restricted signed 8-bit integer value has not changed");
+        case 458: {
+            LogStep(458, "Verify nullable range-restricted signed 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 457: {
-            LogStep(457, "Write min valid value to a nullable range-restricted signed 8-bit integer");
+        case 459: {
+            LogStep(459, "Write min valid value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48462,13 +48732,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 458: {
-            LogStep(458, "Verify nullable range-restricted signed 8-bit integer value is at min valid");
+        case 460: {
+            LogStep(460, "Verify nullable range-restricted signed 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 459: {
-            LogStep(459, "Write max valid value to a nullable range-restricted signed 8-bit integer");
+        case 461: {
+            LogStep(461, "Write max valid value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48477,13 +48747,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 460: {
-            LogStep(460, "Verify nullable range-restricted signed 8-bit integer value is at max valid");
+        case 462: {
+            LogStep(462, "Verify nullable range-restricted signed 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 461: {
-            LogStep(461, "Write middle valid value to a nullable range-restricted signed 8-bit integer");
+        case 463: {
+            LogStep(463, "Write middle valid value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -48492,13 +48762,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 462: {
-            LogStep(462, "Verify nullable range-restricted signed 8-bit integer value is at mid valid");
+        case 464: {
+            LogStep(464, "Verify nullable range-restricted signed 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 463: {
-            LogStep(463, "Write null value to a nullable range-restricted signed 8-bit integer");
+        case 465: {
+            LogStep(465, "Write null value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNull();
@@ -48506,18 +48776,18 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 464: {
-            LogStep(464, "Verify nullable range-restricted signed 8-bit integer value is at null");
+        case 466: {
+            LogStep(466, "Verify nullable range-restricted signed 8-bit integer value is at null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 465: {
-            LogStep(465, "Read nullable range-restricted signed 16-bit integer");
+        case 467: {
+            LogStep(467, "Read nullable range-restricted signed 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 466: {
-            LogStep(466, "Write min value to a nullable range-restricted signed 16-bit integer");
+        case 468: {
+            LogStep(468, "Write min value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48526,8 +48796,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 467: {
-            LogStep(467, "Write just-below-range value to a nullable range-restricted signed 16-bit integer");
+        case 469: {
+            LogStep(469, "Write just-below-range value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48536,8 +48806,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 468: {
-            LogStep(468, "Write just-above-range value to a nullable range-restricted signed 16-bit integer");
+        case 470: {
+            LogStep(470, "Write just-above-range value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48546,8 +48816,8 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 469: {
-            LogStep(469, "Write max value to a nullable range-restricted signed 16-bit integer");
+        case 471: {
+            LogStep(471, "Write max value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48556,13 +48826,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 470: {
-            LogStep(470, "Verify nullable range-restricted signed 16-bit integer value has not changed");
+        case 472: {
+            LogStep(472, "Verify nullable range-restricted signed 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 471: {
-            LogStep(471, "Write min valid value to a nullable range-restricted signed 16-bit integer");
+        case 473: {
+            LogStep(473, "Write min valid value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48571,13 +48841,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 472: {
-            LogStep(472, "Verify nullable range-restricted signed 16-bit integer value is at min valid");
+        case 474: {
+            LogStep(474, "Verify nullable range-restricted signed 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 473: {
-            LogStep(473, "Write max valid value to a nullable range-restricted signed 16-bit integer");
+        case 475: {
+            LogStep(475, "Write max valid value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48586,13 +48856,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 474: {
-            LogStep(474, "Verify nullable range-restricted signed 16-bit integer value is at max valid");
+        case 476: {
+            LogStep(476, "Verify nullable range-restricted signed 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 475: {
-            LogStep(475, "Write middle valid value to a nullable range-restricted signed 16-bit integer");
+        case 477: {
+            LogStep(477, "Write middle valid value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -48601,13 +48871,13 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 476: {
-            LogStep(476, "Verify nullable range-restricted signed 16-bit integer value is at mid valid");
+        case 478: {
+            LogStep(478, "Verify nullable range-restricted signed 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 477: {
-            LogStep(477, "Write null value to a nullable range-restricted signed 16-bit integer");
+        case 479: {
+            LogStep(479, "Write null value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNull();
@@ -48615,49 +48885,49 @@ class TestClusterSuite : public TestCommand
                                   TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 478: {
-            LogStep(478, "Verify nullable range-restricted signed 16-bit integer value is null");
+        case 480: {
+            LogStep(480, "Verify nullable range-restricted signed 16-bit integer value is null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id,
                                  TestCluster::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 479: {
-            LogStep(479, "Write attribute that returns general status on write");
+        case 481: {
+            LogStep(481, "Write attribute that returns general status on write");
             ListFreer listFreer;
             bool value;
             value = false;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::GeneralErrorBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 480: {
-            LogStep(480, "Write attribute that returns cluster-specific status on write");
+        case 482: {
+            LogStep(482, "Write attribute that returns cluster-specific status on write");
             ListFreer listFreer;
             bool value;
             value = false;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ClusterErrorBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 481: {
-            LogStep(481, "Read attribute that returns general status on read");
+        case 483: {
+            LogStep(483, "Read attribute that returns general status on read");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::GeneralErrorBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 482: {
-            LogStep(482, "read attribute that returns cluster-specific status on read");
+        case 484: {
+            LogStep(484, "read attribute that returns cluster-specific status on read");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ClusterErrorBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 483: {
-            LogStep(483, "read AcceptedCommandList attribute");
+        case 485: {
+            LogStep(485, "read AcceptedCommandList attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::AcceptedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 484: {
-            LogStep(484, "read GeneratedCommandList attribute");
+        case 486: {
+            LogStep(486, "read GeneratedCommandList attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::GeneratedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 485: {
-            LogStep(485, "Write struct-typed attribute");
+        case 487: {
+            LogStep(487, "Write struct-typed attribute");
             ListFreer listFreer;
             chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type value;
 
@@ -48666,15 +48936,15 @@ class TestClusterSuite : public TestCommand
             value.c = static_cast<chip::app::Clusters::TestCluster::SimpleEnum>(2);
             value.d = chip::ByteSpan(chip::Uint8::from_const_char("abcgarbage: not in length on purpose"), 3);
             value.e = chip::Span<const char>("garbage: not in length on purpose", 0);
-            value.f = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::SimpleBitmap>>(17);
+            value.f = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::SimpleBitmap>>(17);
             value.g = 1.5f;
             value.h = 3.14159265358979;
 
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::StructAttr::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 486: {
-            LogStep(486, "Read struct-typed attribute");
+        case 488: {
+            LogStep(488, "Read struct-typed attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::StructAttr::Id, true,
                                  chip::NullOptional);
         }
@@ -49022,7 +49292,7 @@ class TestClusterComplexTypesSuite : public TestCommand
 class TestConstraintsSuite : public TestCommand
 {
 public:
-    TestConstraintsSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", 22, credsIssuerConfig)
+    TestConstraintsSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", 26, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -49063,6 +49333,31 @@ class TestConstraintsSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<uint8_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintContains("value", value, 2));
+                VerifyOrReturn(CheckConstraintContains("value", value, 3));
+                VerifyOrReturn(CheckConstraintContains("value", value, 4));
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<uint8_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintExcludes("value", value, 0));
+                VerifyOrReturn(CheckConstraintExcludes("value", value, 5));
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -49070,7 +49365,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 5UL));
             }
             break;
-        case 3:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -49078,7 +49373,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 5UL));
             }
             break;
-        case 4:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -49086,13 +49381,13 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 6UL));
             }
             break;
-        case 5:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49100,7 +49395,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMinLength("value", value.size(), 5));
             }
             break;
-        case 8:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49108,7 +49403,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 20));
             }
             break;
-        case 9:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49116,7 +49411,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintStartsWith("value", value, "**"));
             }
             break;
-        case 10:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49124,10 +49419,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintEndsWith("value", value, "**"));
             }
             break;
-        case 11:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 12:
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49136,10 +49431,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsLowerCase("value", value, true));
             }
             break;
-        case 13:
+        case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 14:
+        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49148,10 +49443,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsLowerCase("value", value, false));
             }
             break;
-        case 15:
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 16:
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49160,10 +49455,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsLowerCase("value", value, false));
             }
             break;
-        case 17:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 18:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49171,10 +49466,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsHexString("value", value, false));
             }
             break;
-        case 19:
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 20:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -49182,7 +49477,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsHexString("value", value, true));
             }
             break;
-        case 21:
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         default:
@@ -49208,131 +49503,167 @@ class TestConstraintsSuite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Write attribute INT32U Value");
+            LogStep(1, "Write attribute LIST With List of INT8U");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const uint8_t> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<uint8_t>(4);
+                listFreer.add(listHolder_0);
+                listHolder_0->mList[0] = 1;
+                listHolder_0->mList[1] = 2;
+                listHolder_0->mList[2] = 3;
+                listHolder_0->mList[3] = 4;
+                value                  = chip::app::DataModel::List<uint8_t>(listHolder_0->mList, 4);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 2: {
+            LogStep(2, "Read attribute LIST With Partial List of INT8U that should be in it");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "Read attribute LIST With Partial List of INT8U that should not be included");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 4: {
+            LogStep(4, "Write attribute LIST Back to Default Value");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const uint8_t> value;
+
+            value = chip::app::DataModel::List<uint8_t>();
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::ListInt8u::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 5: {
+            LogStep(5, "Write attribute INT32U Value");
             ListFreer listFreer;
             uint32_t value;
             value = 5UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 2: {
-            LogStep(2, "Read attribute INT32U Value MinValue Constraints");
+        case 6: {
+            LogStep(6, "Read attribute INT32U Value MinValue Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, true,
                                  chip::NullOptional);
         }
-        case 3: {
-            LogStep(3, "Read attribute INT32U Value MaxValue Constraints");
+        case 7: {
+            LogStep(7, "Read attribute INT32U Value MaxValue Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, true,
                                  chip::NullOptional);
         }
-        case 4: {
-            LogStep(4, "Read attribute INT32U Value NotValue Constraints");
+        case 8: {
+            LogStep(8, "Read attribute INT32U Value NotValue Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, true,
                                  chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "Write attribute INT32U Value Back to Default Value");
+        case 9: {
+            LogStep(9, "Write attribute INT32U Value Back to Default Value");
             ListFreer listFreer;
             uint32_t value;
             value = 0UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Write attribute CHAR_STRING Value");
+        case 10: {
+            LogStep(10, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("** Test **garbage: not in length on purpose", 10);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "Read attribute CHAR_STRING Value MinLength Constraints");
+        case 11: {
+            LogStep(11, "Read attribute CHAR_STRING Value MinLength Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "Read attribute CHAR_STRING Value MaxLength Constraints");
+        case 12: {
+            LogStep(12, "Read attribute CHAR_STRING Value MaxLength Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 9: {
-            LogStep(9, "Read attribute CHAR_STRING Value StartsWith Constraints");
+        case 13: {
+            LogStep(13, "Read attribute CHAR_STRING Value StartsWith Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 10: {
-            LogStep(10, "Read attribute CHAR_STRING Value EndsWith Constraints");
+        case 14: {
+            LogStep(14, "Read attribute CHAR_STRING Value EndsWith Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 11: {
-            LogStep(11, "Write attribute CHAR_STRING Value");
+        case 15: {
+            LogStep(15, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("lowercasegarbage: not in length on purpose", 9);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 12: {
-            LogStep(12, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
+        case 16: {
+            LogStep(16, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 13: {
-            LogStep(13, "Write attribute CHAR_STRING Value");
+        case 17: {
+            LogStep(17, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("UPPERCASEgarbage: not in length on purpose", 9);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
+        case 18: {
+            LogStep(18, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "Write attribute CHAR_STRING Value");
+        case 19: {
+            LogStep(19, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("lowUPPERgarbage: not in length on purpose", 8);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
+        case 20: {
+            LogStep(20, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "Write attribute CHAR_STRING Value");
+        case 21: {
+            LogStep(21, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("ABCDEF012Vgarbage: not in length on purpose", 10);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "Read attribute CHAR_STRING Value isHexString Constraints");
+        case 22: {
+            LogStep(22, "Read attribute CHAR_STRING Value isHexString Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "Write attribute CHAR_STRING Value");
+        case 23: {
+            LogStep(23, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("ABCDEF0123garbage: not in length on purpose", 10);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 20: {
-            LogStep(20, "Read attribute CHAR_STRING Value isHexString Constraints");
+        case 24: {
+            LogStep(24, "Read attribute CHAR_STRING Value isHexString Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 21: {
-            LogStep(21, "Write attribute CHAR_STRING Value Back to Default Value");
+        case 25: {
+            LogStep(25, "Write attribute CHAR_STRING Value Back to Default Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("garbage: not in length on purpose", 0);
@@ -50378,10 +50709,10 @@ class TestSaveAsSuite : public TestCommand
 
     uint8_t TestAddArgumentDefaultValue;
     bool readAttributeBooleanDefaultValue;
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> readAttributeBitmap8DefaultValue;
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> readAttributeBitmap16DefaultValue;
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> readAttributeBitmap32DefaultValue;
-    chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> readAttributeBitmap64DefaultValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> readAttributeBitmap8DefaultValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> readAttributeBitmap16DefaultValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> readAttributeBitmap32DefaultValue;
+    chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> readAttributeBitmap64DefaultValue;
     uint8_t readAttributeInt8uDefaultValue;
     uint16_t readAttributeInt16uDefaultValue;
     uint32_t readAttributeInt32uDefaultValue;
@@ -50481,7 +50812,7 @@ class TestSaveAsSuite : public TestCommand
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap8", value, 0));
 
@@ -50494,7 +50825,7 @@ class TestSaveAsSuite : public TestCommand
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintNotValue("value", value, readAttributeBitmap8DefaultValue));
             }
@@ -50505,7 +50836,7 @@ class TestSaveAsSuite : public TestCommand
         case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap8", value, readAttributeBitmap8DefaultValue));
             }
@@ -50513,7 +50844,7 @@ class TestSaveAsSuite : public TestCommand
         case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap16", value, 0U));
 
@@ -50526,7 +50857,7 @@ class TestSaveAsSuite : public TestCommand
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintNotValue("value", value, readAttributeBitmap16DefaultValue));
             }
@@ -50537,7 +50868,7 @@ class TestSaveAsSuite : public TestCommand
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap16", value, readAttributeBitmap16DefaultValue));
             }
@@ -50545,7 +50876,7 @@ class TestSaveAsSuite : public TestCommand
         case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap32", value, 0UL));
 
@@ -50558,7 +50889,7 @@ class TestSaveAsSuite : public TestCommand
         case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintNotValue("value", value, readAttributeBitmap32DefaultValue));
             }
@@ -50569,7 +50900,7 @@ class TestSaveAsSuite : public TestCommand
         case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap32", value, readAttributeBitmap32DefaultValue));
             }
@@ -50577,7 +50908,7 @@ class TestSaveAsSuite : public TestCommand
         case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap64", value, 0ULL));
 
@@ -50590,7 +50921,7 @@ class TestSaveAsSuite : public TestCommand
         case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintNotValue("value", value, readAttributeBitmap64DefaultValue));
             }
@@ -50601,7 +50932,7 @@ class TestSaveAsSuite : public TestCommand
         case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+                chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("bitmap64", value, readAttributeBitmap64DefaultValue));
             }
@@ -51253,8 +51584,8 @@ class TestSaveAsSuite : public TestCommand
         case 10: {
             LogStep(10, "Write attribute BITMAP8 Not Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(1);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>>(1);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap8::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -51266,7 +51597,7 @@ class TestSaveAsSuite : public TestCommand
         case 12: {
             LogStep(12, "Write attribute BITMAP8 Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
             value = readAttributeBitmap8DefaultValue;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap8::Id, value,
                                   chip::NullOptional, chip::NullOptional);
@@ -51284,8 +51615,8 @@ class TestSaveAsSuite : public TestCommand
         case 15: {
             LogStep(15, "Write attribute BITMAP16 Not Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(1U);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>>(1U);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap16::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -51297,7 +51628,7 @@ class TestSaveAsSuite : public TestCommand
         case 17: {
             LogStep(17, "Write attribute BITMAP16 Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
             value = readAttributeBitmap16DefaultValue;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap16::Id, value,
                                   chip::NullOptional, chip::NullOptional);
@@ -51315,8 +51646,8 @@ class TestSaveAsSuite : public TestCommand
         case 20: {
             LogStep(20, "Write attribute BITMAP32 Not Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(1UL);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>>(1UL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -51328,7 +51659,7 @@ class TestSaveAsSuite : public TestCommand
         case 22: {
             LogStep(22, "Write attribute BITMAP32 Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
             value = readAttributeBitmap32DefaultValue;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, value,
                                   chip::NullOptional, chip::NullOptional);
@@ -51346,8 +51677,8 @@ class TestSaveAsSuite : public TestCommand
         case 25: {
             LogStep(25, "Write attribute BITMAP64 Not Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
-            value = static_cast<chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(1ULL);
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>>(1ULL);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap64::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -51359,7 +51690,7 @@ class TestSaveAsSuite : public TestCommand
         case 27: {
             LogStep(27, "Write attribute BITMAP64 Default Value");
             ListFreer listFreer;
-            chip::BitFlags<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
             value = readAttributeBitmap64DefaultValue;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap64::Id, value,
                                   chip::NullOptional, chip::NullOptional);
@@ -54665,7 +54996,7 @@ class TestUserLabelClusterSuite : public TestCommand
 class TestArmFailSafeSuite : public TestCommand
 {
 public:
-    TestArmFailSafeSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestArmFailSafe", 5, credsIssuerConfig)
+    TestArmFailSafeSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestArmFailSafe", 9, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
@@ -54736,6 +55067,18 @@ class TestArmFailSafeSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -54785,6 +55128,55 @@ class TestArmFailSafeSuite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
                                  chip::NullOptional);
         }
+        case 5: {
+            LogStep(5, "Invoke AddTrustedRootCertificate without fail-safe");
+            ListFreer listFreer;
+            chip::app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Type value;
+            value.rootCertificate = chip::ByteSpan(chip::Uint8::from_const_char("00000000garbage: not in length on purpose"), 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
+                               OperationalCredentials::Commands::AddTrustedRootCertificate::Id, value, chip::NullOptional
+
+            );
+        }
+        case 6: {
+            LogStep(6, "Invoke AddNOC without fail-safe");
+            ListFreer listFreer;
+            chip::app::Clusters::OperationalCredentials::Commands::AddNOC::Type value;
+            value.NOCValue = chip::ByteSpan(chip::Uint8::from_const_char("00112233garbage: not in length on purpose"), 8);
+            value.IPKValue = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007garbage: not in length on purpose"),
+                16);
+            value.caseAdminSubject = 1234ULL;
+            value.adminVendorId    = static_cast<chip::VendorId>(65521);
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
+                               OperationalCredentials::Commands::AddNOC::Id, value, chip::NullOptional
+
+            );
+        }
+        case 7: {
+            LogStep(7, "Invoke UpdateNOC without fail-safe");
+            ListFreer listFreer;
+            chip::app::Clusters::OperationalCredentials::Commands::UpdateNOC::Type value;
+            value.NOCValue = chip::ByteSpan(chip::Uint8::from_const_char("00112233garbage: not in length on purpose"), 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
+                               OperationalCredentials::Commands::UpdateNOC::Id, value, chip::NullOptional
+
+            );
+        }
+        case 8: {
+            LogStep(8, "Invoke CSRRequest without fail-safe");
+            ListFreer listFreer;
+            chip::app::Clusters::OperationalCredentials::Commands::CSRRequest::Type value;
+            value.CSRNonce = chip::ByteSpan(
+                chip::Uint8::from_const_char("\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007\000\001\002\003\004"
+                                             "\005\006\007\000\001\002\003\004\005\006\007garbage: not in length on purpose"),
+                32);
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id,
+                               OperationalCredentials::Commands::CSRRequest::Id, value, chip::NullOptional
+
+            );
+        }
         }
         return CHIP_NO_ERROR;
     }
@@ -55954,7 +56346,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 {
 public:
     DL_UsersAndCredentialsSuite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("DL_UsersAndCredentials", 113, credsIssuerConfig)
+        TestCommand("DL_UsersAndCredentials", 114, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -56018,8 +56410,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 2:
@@ -56070,8 +56461,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 7:
@@ -56109,8 +56499,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 10:
@@ -56146,8 +56535,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 12:
@@ -56183,8 +56571,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 14:
@@ -56220,8 +56607,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 16:
@@ -56257,8 +56643,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 18:
@@ -56294,8 +56679,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 20:
@@ -56331,8 +56715,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 22:
@@ -56403,7 +56786,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
                 VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
             }
             break;
         case 28:
@@ -56439,7 +56822,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
                 VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
             }
             break;
         case 30:
@@ -56474,8 +56857,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 34:
@@ -56527,8 +56909,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 37:
@@ -56587,8 +56968,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 41:
@@ -56607,8 +56987,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 42:
@@ -56665,8 +57044,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 48:
@@ -56721,8 +57099,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 50:
@@ -56741,8 +57118,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 51:
@@ -56983,7 +57359,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
                 VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
             }
             break;
         case 67:
@@ -57045,7 +57421,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
                 VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
             }
             break;
         case 69:
@@ -57065,7 +57441,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U));
+                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
             }
             break;
         case 71:
@@ -57111,7 +57487,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
                 VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
             }
             break;
         case 72:
@@ -57131,7 +57507,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U));
+                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U));
             }
             break;
         case 74:
@@ -57157,8 +57533,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 75:
@@ -57192,7 +57567,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
+                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U));
             }
             break;
         case 78:
@@ -57209,7 +57584,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U));
+                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U));
             }
             break;
         case 79:
@@ -57226,7 +57601,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U));
+                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U));
             }
             break;
         case 80:
@@ -57265,8 +57640,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 81:
@@ -57292,8 +57666,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 82:
@@ -57354,8 +57727,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 87:
@@ -57371,8 +57743,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 88:
@@ -57388,8 +57759,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
-                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 7U));
+                VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex));
             }
             break;
         case 89:
@@ -57415,8 +57785,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 90:
@@ -57442,8 +57811,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 3U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 91:
@@ -57469,8 +57837,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 4U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 92:
@@ -57496,8 +57863,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 5U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 93:
@@ -57561,8 +57927,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
                 VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 96:
@@ -57640,8 +58005,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
                 VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex));
 
-                VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex));
-                VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U));
+                VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex));
             }
             break;
         case 106:
@@ -57739,6 +58103,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 7U));
             }
             break;
+        case 113:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -59340,6 +59707,16 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 
             );
         }
+        case 113: {
+            LogStep(113, "Final clean-up");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearUser::Type value;
+            value.userIndex = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearUser::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
         }
         return CHIP_NO_ERROR;
     }
@@ -59348,7 +59725,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
 class DL_LockUnlockSuite : public TestCommand
 {
 public:
-    DL_LockUnlockSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_LockUnlock", 11, credsIssuerConfig)
+    DL_LockUnlockSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_LockUnlock", 15, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -59386,6 +59763,30 @@ class DL_LockUnlockSuite : public TestCommand
             shouldContinue = true;
             break;
         case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("lockState", value));
+                VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 2));
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNonNull("lockState", value));
+                VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 1));
+            }
+            break;
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
@@ -59399,10 +59800,10 @@ class DL_LockUnlockSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
             }
             break;
-        case 2:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 3:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
@@ -59411,10 +59812,10 @@ class DL_LockUnlockSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 1));
             }
             break;
-        case 4:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 5:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
@@ -59423,10 +59824,10 @@ class DL_LockUnlockSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 2));
             }
             break;
-        case 6:
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 7:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
@@ -59435,10 +59836,10 @@ class DL_LockUnlockSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 2));
             }
             break;
-        case 8:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 9:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
@@ -59447,7 +59848,7 @@ class DL_LockUnlockSuite : public TestCommand
                 VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 1));
             }
             break;
-        case 10:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         default:
@@ -59473,7 +59874,35 @@ class DL_LockUnlockSuite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Create new PIN credential and lock/unlock user");
+            LogStep(1, "Try to unlock the door without PIN");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 2: {
+            LogStep(2, "Verify that lock state attribute value is set to Unlocked");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true,
+                                 chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "Try to unlock the door without a PIN");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 4: {
+            LogStep(4, "Verify that lock state attribute value is set to Locked");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true,
+                                 chip::NullOptional);
+        }
+        case 5: {
+            LogStep(5, "Create new PIN credential and lock/unlock user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
             value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
@@ -59490,8 +59919,8 @@ class DL_LockUnlockSuite : public TestCommand
 
             );
         }
-        case 2: {
-            LogStep(2, "Try to unlock the door with invalid PIN");
+        case 6: {
+            LogStep(6, "Try to unlock the door with invalid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
             value.pinCode.Emplace();
@@ -59501,13 +59930,13 @@ class DL_LockUnlockSuite : public TestCommand
 
             );
         }
-        case 3: {
-            LogStep(3, "Verify that lock state attribute value is set to Locked");
+        case 7: {
+            LogStep(7, "Verify that lock state attribute value is set to Locked");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true,
                                  chip::NullOptional);
         }
-        case 4: {
-            LogStep(4, "Try to unlock the door with valid PIN");
+        case 8: {
+            LogStep(8, "Try to unlock the door with valid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
             value.pinCode.Emplace();
@@ -59517,13 +59946,13 @@ class DL_LockUnlockSuite : public TestCommand
 
             );
         }
-        case 5: {
-            LogStep(5, "Verify that lock state attribute value is set to Unlocked");
+        case 9: {
+            LogStep(9, "Verify that lock state attribute value is set to Unlocked");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true,
                                  chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Try to lock the door with invalid PIN");
+        case 10: {
+            LogStep(10, "Try to lock the door with invalid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
             value.pinCode.Emplace();
@@ -59533,13 +59962,13 @@ class DL_LockUnlockSuite : public TestCommand
 
             );
         }
-        case 7: {
-            LogStep(7, "Verify that lock state attribute value is set to Unlocked");
+        case 11: {
+            LogStep(11, "Verify that lock state attribute value is set to Unlocked");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true,
                                  chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "Try to unlock the door with valid PIN");
+        case 12: {
+            LogStep(12, "Try to unlock the door with valid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
             value.pinCode.Emplace();
@@ -59549,13 +59978,13 @@ class DL_LockUnlockSuite : public TestCommand
 
             );
         }
-        case 9: {
-            LogStep(9, "Verify that lock state attribute value is set to Locked");
+        case 13: {
+            LogStep(13, "Verify that lock state attribute value is set to Locked");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true,
                                  chip::NullOptional);
         }
-        case 10: {
-            LogStep(10, "Clean the created credential");
+        case 14: {
+            LogStep(14, "Clean the created credential");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
@@ -59576,7 +60005,7 @@ class DL_LockUnlockSuite : public TestCommand
 class DL_SchedulesSuite : public TestCommand
 {
 public:
-    DL_SchedulesSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_Schedules", 84, credsIssuerConfig)
+    DL_SchedulesSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_Schedules", 127, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -59600,6 +60029,7 @@ class DL_SchedulesSuite : public TestCommand
     uint16_t NumberOfTotalUsersSupported;
     uint8_t NumberOfWeekDaySchedulesSupportedPerUser;
     uint8_t NumberOfYearDaySchedulesSupportedPerUser;
+    uint8_t NumberOfHolidaySchedulesSupported;
 
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
@@ -59662,7 +60092,14 @@ class DL_SchedulesSuite : public TestCommand
             }
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint8_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("numberOfHolidaySchedulesSupported", value, 10));
+
+                NumberOfHolidaySchedulesSupported = value;
+            }
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
@@ -59674,10 +60111,10 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
             break;
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
@@ -59704,6 +60141,9 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59715,7 +60155,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 20:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59727,7 +60167,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 21:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59740,7 +60180,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 22:
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59752,7 +60192,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 23:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59764,7 +60204,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 24:
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59776,9 +60216,6 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
         case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
@@ -59789,12 +60226,15 @@ class DL_SchedulesSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
         case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
             break;
         case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 32:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59806,7 +60246,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 32:
+        case 33:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59818,7 +60258,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 33:
+        case 34:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59831,7 +60271,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 34:
+        case 35:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59843,7 +60283,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 35:
+        case 36:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59855,7 +60295,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 133));
             }
             break;
-        case 36:
+        case 37:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59867,10 +60307,75 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 37:
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 42:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+            }
             break;
-        case 38:
+        case 43:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 0));
+
+                VerifyOrReturn(CheckValue("status", value.status, 133));
+            }
+            break;
+        case 44:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(
+                    CheckValue("holidayIndex", value.holidayIndex, static_cast<uint8_t>(NumberOfHolidaySchedulesSupported + 1)));
+
+                VerifyOrReturn(CheckValue("status", value.status, 133));
+            }
+            break;
+        case 45:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 46:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
+            break;
+        case 47:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 48:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59897,10 +60402,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0));
             }
             break;
-        case 39:
+        case 49:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 40:
+        case 50:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59918,37 +60423,101 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
             }
             break;
-        case 41:
+        case 51:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 42:
+        case 52:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 43:
+        case 53:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 44:
+        case 54:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 45:
+        case 55:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
             break;
-        case 46:
+        case 56:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask));
+                VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1));
+
+                VerifyOrReturn(CheckValuePresent("startHour", value.startHour));
+                VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 15));
+
+                VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute));
+                VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 16));
+
+                VerifyOrReturn(CheckValuePresent("endHour", value.endHour));
+                VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 18));
+
+                VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute));
+                VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0));
+            }
+            break;
+        case 57:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+            }
+            break;
+        case 58:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
+            break;
+        case 59:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 47:
+        case 60:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 48:
+        case 61:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 49:
+        case 62:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
             break;
-        case 50:
+        case 63:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
             break;
-        case 51:
+        case 64:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -59975,7 +60544,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0));
             }
             break;
-        case 52:
+        case 65:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -59993,10 +60562,99 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
             }
             break;
-        case 53:
+        case 66:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
             break;
-        case 54:
+        case 67:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 68:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 69:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask));
+                VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1));
+
+                VerifyOrReturn(CheckValuePresent("startHour", value.startHour));
+                VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 15));
+
+                VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute));
+                VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 16));
+
+                VerifyOrReturn(CheckValuePresent("endHour", value.endHour));
+                VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 18));
+
+                VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute));
+                VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0));
+            }
+            break;
+        case 70:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+            }
+            break;
+        case 71:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
+            break;
+        case 72:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 73:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60023,10 +60681,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59));
             }
             break;
-        case 55:
+        case 74:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 56:
+        case 75:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60044,10 +60702,32 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL));
             }
             break;
-        case 57:
+        case 76:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 58:
+        case 77:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 123456UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 1234567UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 1));
+            }
+            break;
+        case 78:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 79:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60059,10 +60739,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 59:
+        case 80:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 60:
+        case 81:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60074,7 +60754,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 61:
+        case 82:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60092,7 +60772,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
             }
             break;
-        case 62:
+        case 83:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60110,13 +60790,51 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL));
             }
             break;
-        case 63:
+        case 84:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
+            break;
+        case 85:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 123456UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 1234567UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 1));
+            }
+            break;
+        case 86:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 64:
+        case 87:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 65:
+        case 88:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60128,10 +60846,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 66:
+        case 89:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 67:
+        case 90:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60143,7 +60861,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 68:
+        case 91:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60170,16 +60888,16 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59));
             }
             break;
-        case 69:
+        case 92:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 70:
+        case 93:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 71:
+        case 94:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 72:
+        case 95:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60206,10 +60924,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59));
             }
             break;
-        case 73:
+        case 96:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 74:
+        case 97:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60227,10 +60945,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL));
             }
             break;
-        case 75:
+        case 98:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 76:
+        case 99:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60257,10 +60975,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59));
             }
             break;
-        case 77:
+        case 100:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 78:
+        case 101:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60278,10 +60996,10 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 7777777UL));
             }
             break;
-        case 79:
+        case 102:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 80:
+        case 103:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60293,7 +61011,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 81:
+        case 104:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60305,7 +61023,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 82:
+        case 105:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
@@ -60317,7 +61035,7 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
-        case 83:
+        case 106:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
@@ -60329,6 +61047,263 @@ class DL_SchedulesSuite : public TestCommand
                 VerifyOrReturn(CheckValue("status", value.status, 139));
             }
             break;
+        case 107:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
+            break;
+        case 108:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 123456UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 1234567UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 1));
+            }
+            break;
+        case 109:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 110:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, NumberOfHolidaySchedulesSupported));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 1UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 100UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 4));
+            }
+            break;
+        case 111:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex));
+                VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U));
+
+                VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex));
+                VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U));
+            }
+            break;
+        case 112:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 113:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 114:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 115:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0));
+            }
+            break;
+        case 116:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2));
+
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+            }
+            break;
+        case 117:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, NumberOfHolidaySchedulesSupported));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 1UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 100UL));
+
+                VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode));
+                VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 4));
+            }
+            break;
+        case 118:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask));
+                VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1));
+
+                VerifyOrReturn(CheckValuePresent("startHour", value.startHour));
+                VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0));
+
+                VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute));
+                VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0));
+
+                VerifyOrReturn(CheckValuePresent("endHour", value.endHour));
+                VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23));
+
+                VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute));
+                VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59));
+            }
+            break;
+        case 119:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL));
+            }
+            break;
+        case 120:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 121:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1));
+
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+            }
+            break;
+        case 122:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2));
+
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+            }
+            break;
+        case 123:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, NumberOfHolidaySchedulesSupported));
+
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+            }
+            break;
+        case 124:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask));
+                VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1));
+
+                VerifyOrReturn(CheckValuePresent("startHour", value.startHour));
+                VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0));
+
+                VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute));
+                VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0));
+
+                VerifyOrReturn(CheckValuePresent("endHour", value.endHour));
+                VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23));
+
+                VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute));
+                VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59));
+            }
+            break;
+        case 125:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1));
+
+                VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
+
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime));
+                VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL));
+
+                VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime));
+                VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL));
+            }
+            break;
+        case 126:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -60385,12 +61360,17 @@ class DL_SchedulesSuite : public TestCommand
                                  DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id, true, chip::NullOptional);
         }
         case 5: {
-            LogStep(5, "Create Week Day schedule with 0 index");
+            LogStep(5, "Get Max number of Holiday schedules and verify default value");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id,
+                                 DoorLock::Attributes::NumberOfHolidaySchedulesSupported::Id, true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "Create Week Day schedule with 0 index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 0;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60400,13 +61380,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 6: {
-            LogStep(6, "Create Week Day schedule with out-of-bounds index");
+        case 7: {
+            LogStep(7, "Create Week Day schedule with out-of-bounds index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = static_cast<uint8_t>(NumberOfWeekDaySchedulesSupportedPerUser + 1);
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60416,13 +61396,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 7: {
-            LogStep(7, "Create Week Day schedule with 0 user index");
+        case 8: {
+            LogStep(8, "Create Week Day schedule with 0 user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 0U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60432,13 +61412,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 8: {
-            LogStep(8, "Create Week Day schedule with out-of-bounds user index");
+        case 9: {
+            LogStep(9, "Create Week Day schedule with out-of-bounds user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = static_cast<uint16_t>(NumberOfTotalUsersSupported + 1);
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60448,13 +61428,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 9: {
-            LogStep(9, "Create Week Day schedule for non-existing user");
+        case 10: {
+            LogStep(10, "Create Week Day schedule for non-existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 2U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60464,13 +61444,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 10: {
-            LogStep(10, "Create Week Day schedule with 0 days mask");
+        case 11: {
+            LogStep(11, "Create Week Day schedule with 0 days mask");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(0);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(0);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60480,13 +61460,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 11: {
-            LogStep(11, "Create Week Day schedule for Sunday and Monday");
+        case 12: {
+            LogStep(12, "Create Week Day schedule for Sunday and Monday");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(3);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(3);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60496,13 +61476,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 12: {
-            LogStep(12, "Create Week Day schedule for Sunday Wednesday and Saturday");
+        case 13: {
+            LogStep(13, "Create Week Day schedule for Sunday Wednesday and Saturday");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(73);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(73);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60512,13 +61492,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 13: {
-            LogStep(13, "Create Week Day schedule with invalid start hour");
+        case 14: {
+            LogStep(14, "Create Week Day schedule with invalid start hour");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 24;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60528,13 +61508,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 14: {
-            LogStep(14, "Create Week Day schedule with invalid start minute");
+        case 15: {
+            LogStep(15, "Create Week Day schedule with invalid start minute");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 60;
             value.endHour      = 18;
@@ -60544,13 +61524,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 15: {
-            LogStep(15, "Create Week Day schedule with invalid end hour");
+        case 16: {
+            LogStep(16, "Create Week Day schedule with invalid end hour");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 24;
@@ -60560,13 +61540,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 16: {
-            LogStep(16, "Create Week Day schedule with invalid end minute");
+        case 17: {
+            LogStep(17, "Create Week Day schedule with invalid end minute");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60576,13 +61556,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 17: {
-            LogStep(17, "Create Week Day schedule with start hour later that end hour");
+        case 18: {
+            LogStep(18, "Create Week Day schedule with start hour later that end hour");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 19;
             value.startMinute  = 16;
             value.endHour      = 18;
@@ -60592,13 +61572,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 18: {
-            LogStep(18, "Create Week Day schedule with start minute later that end minute when hours are equal");
+        case 19: {
+            LogStep(19, "Create Week Day schedule with start minute later that end minute when hours are equal");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 15;
             value.startMinute  = 50;
             value.endHour      = 15;
@@ -60608,8 +61588,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 19: {
-            LogStep(19, "Make sure that previous operations did not create a schedule");
+        case 20: {
+            LogStep(20, "Make sure that previous operations did not create a schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60619,8 +61599,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 20: {
-            LogStep(20, "Get Week Day schedule with 0 index");
+        case 21: {
+            LogStep(21, "Get Week Day schedule with 0 index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 0;
@@ -60630,8 +61610,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 21: {
-            LogStep(21, "Get Week Day schedule with out-of-bounds index");
+        case 22: {
+            LogStep(22, "Get Week Day schedule with out-of-bounds index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = static_cast<uint8_t>(NumberOfWeekDaySchedulesSupportedPerUser + 1);
@@ -60641,8 +61621,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 22: {
-            LogStep(22, "Get Week Day schedule with 0 user index");
+        case 23: {
+            LogStep(23, "Get Week Day schedule with 0 user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60652,8 +61632,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 23: {
-            LogStep(23, "Get Week Day schedule with out-of-bounds user index");
+        case 24: {
+            LogStep(24, "Get Week Day schedule with out-of-bounds user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60663,8 +61643,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 24: {
-            LogStep(24, "Get Week Day schedule with non-existing user index");
+        case 25: {
+            LogStep(25, "Get Week Day schedule with non-existing user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60674,8 +61654,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 25: {
-            LogStep(25, "Create Year Day schedule with 0 index");
+        case 26: {
+            LogStep(26, "Create Year Day schedule with 0 index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 0;
@@ -60687,8 +61667,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 26: {
-            LogStep(26, "Create Year Day schedule with out-of-bounds index");
+        case 27: {
+            LogStep(27, "Create Year Day schedule with out-of-bounds index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = static_cast<uint8_t>(NumberOfYearDaySchedulesSupportedPerUser + 1);
@@ -60700,8 +61680,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 27: {
-            LogStep(27, "Create Year Day schedule with 0 user index");
+        case 28: {
+            LogStep(28, "Create Year Day schedule with 0 user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 1;
@@ -60713,8 +61693,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 28: {
-            LogStep(28, "Create Year Day schedule with out-of-bounds user index");
+        case 29: {
+            LogStep(29, "Create Year Day schedule with out-of-bounds user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 1;
@@ -60726,8 +61706,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 29: {
-            LogStep(29, "Create Year Day schedule for non-existing user");
+        case 30: {
+            LogStep(30, "Create Year Day schedule for non-existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 1;
@@ -60739,8 +61719,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 30: {
-            LogStep(30, "Create Year Day schedule with start hour later that end hour");
+        case 31: {
+            LogStep(31, "Create Year Day schedule with start hour later that end hour");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 1;
@@ -60752,8 +61732,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 31: {
-            LogStep(31, "Make sure that previous operations did not create a schedule");
+        case 32: {
+            LogStep(32, "Make sure that previous operations did not create a schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60763,8 +61743,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 32: {
-            LogStep(32, "Get Year Day schedule with 0 index");
+        case 33: {
+            LogStep(33, "Get Year Day schedule with 0 index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 0;
@@ -60774,8 +61754,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 33: {
-            LogStep(33, "Get Year Day schedule with out-of-bounds index");
+        case 34: {
+            LogStep(34, "Get Year Day schedule with out-of-bounds index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = static_cast<uint8_t>(NumberOfYearDaySchedulesSupportedPerUser + 1);
@@ -60785,8 +61765,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 34: {
-            LogStep(34, "Get Year Day schedule with 0 user index");
+        case 35: {
+            LogStep(35, "Get Year Day schedule with 0 user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60796,8 +61776,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 35: {
-            LogStep(35, "Get Year Day schedule with out-of-bounds user index");
+        case 36: {
+            LogStep(36, "Get Year Day schedule with out-of-bounds user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60807,8 +61787,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 36: {
-            LogStep(36, "Get Year Day schedule with non-existing user index");
+        case 37: {
+            LogStep(37, "Get Year Day schedule with non-existing user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60818,70 +61798,175 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 37: {
-            LogStep(37, "Create Week Day schedule with valid parameters");
-            ListFreer listFreer;
-            chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
-            value.weekDayIndex = 1;
-            value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
-            value.startHour    = 15;
-            value.startMinute  = 16;
-            value.endHour      = 18;
-            value.endMinute    = 0;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetWeekDaySchedule::Id, value,
-                               chip::NullOptional
-
-            );
-        }
         case 38: {
-            LogStep(38, "Verify created schedule");
+            LogStep(38, "Create Holiday schedule with 0 index");
             ListFreer listFreer;
-            chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
-            value.weekDayIndex = 1;
-            value.userIndex    = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetWeekDaySchedule::Id, value,
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = 0;
+            value.localStartTime = 12345UL;
+            value.localEndTime   = 12345689UL;
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
             );
         }
         case 39: {
-            LogStep(39, "Create Year Day schedule with valid parameters");
+            LogStep(39, "Create Holiday schedule with out-of-bounds index");
             ListFreer listFreer;
-            chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
-            value.yearDayIndex   = 1;
-            value.userIndex      = 1U;
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = static_cast<uint8_t>(NumberOfHolidaySchedulesSupported + 1);
             value.localStartTime = 12345UL;
             value.localEndTime   = 12345689UL;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetYearDaySchedule::Id, value,
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
             );
         }
         case 40: {
-            LogStep(40, "Verify created schedule");
+            LogStep(40, "Create Holiday schedule with start hour later that end hour");
             ListFreer listFreer;
-            chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
-            value.yearDayIndex = 1;
-            value.userIndex    = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetYearDaySchedule::Id, value,
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = 1;
+            value.localStartTime = 12345689UL;
+            value.localEndTime   = 12345688UL;
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
             );
         }
         case 41: {
-            LogStep(41, "Clear Week Day schedule with 0 index");
+            LogStep(41, "Create Holiday schedule with invalid operating mode");
             ListFreer listFreer;
-            chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
-            value.weekDayIndex = 0;
-            value.userIndex    = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearWeekDaySchedule::Id, value,
-                               chip::NullOptional
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = 1;
+            value.localStartTime = 12345UL;
+            value.localEndTime   = 12345689UL;
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(5);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
+                               chip::NullOptional
 
             );
         }
         case 42: {
-            LogStep(42, "Clear Week Day schedule with out-of-bounds index");
+            LogStep(42, "Make sure that previous operations did not create a schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 43: {
+            LogStep(43, "Get Holiday schedule with 0 index");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 0;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 44: {
+            LogStep(44, "Get Holiday schedule with out-of-bounds index");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = static_cast<uint8_t>(NumberOfHolidaySchedulesSupported + 1);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 45: {
+            LogStep(45, "Create Holiday schedule with valid parameters");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = 1;
+            value.localStartTime = 12345UL;
+            value.localEndTime   = 12345689UL;
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 46: {
+            LogStep(46, "Verify created schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 47: {
+            LogStep(47, "Create Week Day schedule with valid parameters");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.startHour    = 15;
+            value.startMinute  = 16;
+            value.endHour      = 18;
+            value.endMinute    = 0;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 48: {
+            LogStep(48, "Verify created schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 49: {
+            LogStep(49, "Create Year Day schedule with valid parameters");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
+            value.yearDayIndex   = 1;
+            value.userIndex      = 1U;
+            value.localStartTime = 12345UL;
+            value.localEndTime   = 12345689UL;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 50: {
+            LogStep(50, "Verify created schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
+            value.yearDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 51: {
+            LogStep(51, "Clear Week Day schedule with 0 index");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
+            value.weekDayIndex = 0;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 52: {
+            LogStep(52, "Clear Week Day schedule with out-of-bounds index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = static_cast<uint8_t>(NumberOfWeekDaySchedulesSupportedPerUser + 1);
@@ -60891,8 +61976,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 43: {
-            LogStep(43, "Clear Week Day schedule with 0 user index");
+        case 53: {
+            LogStep(53, "Clear Week Day schedule with 0 user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60902,8 +61987,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 44: {
-            LogStep(44, "Clear Week Day schedule with out-of-bounds user index");
+        case 54: {
+            LogStep(54, "Clear Week Day schedule with out-of-bounds user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60913,8 +61998,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 45: {
-            LogStep(45, "Clear Week Day schedule with non-existing user");
+        case 55: {
+            LogStep(55, "Clear Week Day schedule with non-existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60924,8 +62009,40 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 46: {
-            LogStep(46, "Clear Year Day schedule with 0 index");
+        case 56: {
+            LogStep(56, "Make sure that week day schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 57: {
+            LogStep(57, "Make sure that year day schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
+            value.yearDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 58: {
+            LogStep(58, "Make sure that holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 59: {
+            LogStep(59, "Clear Year Day schedule with 0 index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = 0;
@@ -60935,8 +62052,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 47: {
-            LogStep(47, "Clear Year Day schedule with out-of-bounds index");
+        case 60: {
+            LogStep(60, "Clear Year Day schedule with out-of-bounds index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = static_cast<uint8_t>(NumberOfYearDaySchedulesSupportedPerUser + 1);
@@ -60946,8 +62063,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 48: {
-            LogStep(48, "Clear Year Day schedule with 0 user index");
+        case 61: {
+            LogStep(61, "Clear Year Day schedule with 0 user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60957,8 +62074,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 49: {
-            LogStep(49, "Clear Year Day schedule with out-of-bounds user index");
+        case 62: {
+            LogStep(62, "Clear Year Day schedule with out-of-bounds user index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60968,8 +62085,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 50: {
-            LogStep(50, "Clear Year Day schedule with non-existing user");
+        case 63: {
+            LogStep(63, "Clear Year Day schedule with non-existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -60979,8 +62096,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 51: {
-            LogStep(51, "Make sure that week day schedule was not deleted");
+        case 64: {
+            LogStep(64, "Make sure that week day schedule was not deleted");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -60990,8 +62107,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 52: {
-            LogStep(52, "Make sure that year day schedule was not deleted");
+        case 65: {
+            LogStep(65, "Make sure that year day schedule was not deleted");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -61001,13 +62118,75 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 53: {
-            LogStep(53, "Create another Week Day schedule with valid parameters");
+        case 66: {
+            LogStep(66, "Make sure that holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 67: {
+            LogStep(67, "Clear Holiday schedule with 0 index");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type value;
+            value.holidayIndex = 0;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 68: {
+            LogStep(68, "Clear Holiday schedule with out-of-bounds index");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type value;
+            value.holidayIndex = static_cast<uint8_t>(NumberOfYearDaySchedulesSupportedPerUser + 1);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 69: {
+            LogStep(69, "Make sure that week day schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 70: {
+            LogStep(70, "Make sure that year day schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
+            value.yearDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 71: {
+            LogStep(71, "Make sure that holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 72: {
+            LogStep(72, "Create another Week Day schedule with valid parameters");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 2;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2);
             value.startHour    = 0;
             value.startMinute  = 0;
             value.endHour      = 23;
@@ -61017,8 +62196,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 54: {
-            LogStep(54, "Verify created week day schedule");
+        case 73: {
+            LogStep(73, "Verify created week day schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 2;
@@ -61028,8 +62207,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 55: {
-            LogStep(55, "Create another Year Day schedule with valid parameters");
+        case 74: {
+            LogStep(74, "Create another Year Day schedule with valid parameters");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 2;
@@ -61041,8 +62220,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 56: {
-            LogStep(56, "Verify created year day schedule");
+        case 75: {
+            LogStep(75, "Verify created year day schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 2;
@@ -61052,8 +62231,31 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 57: {
-            LogStep(57, "Clear a single week day schedule for the first user");
+        case 76: {
+            LogStep(76, "Create another Holiday schedule with valid parameters");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = 2;
+            value.localStartTime = 123456UL;
+            value.localEndTime   = 1234567UL;
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(1);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 77: {
+            LogStep(77, "Verify created holiday schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 78: {
+            LogStep(78, "Clear a single week day schedule for the first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -61063,8 +62265,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 58: {
-            LogStep(58, "Verify cleared week day schedule");
+        case 79: {
+            LogStep(79, "Verify cleared week day schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -61074,8 +62276,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 59: {
-            LogStep(59, "Clear all remaining week day schedules for the first user");
+        case 80: {
+            LogStep(80, "Clear all remaining week day schedules for the first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = 254;
@@ -61085,8 +62287,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 60: {
-            LogStep(60, "Verify cleared week schedule");
+        case 81: {
+            LogStep(81, "Verify cleared week schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 2;
@@ -61096,8 +62298,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 61: {
-            LogStep(61, "Make sure that first year day schedule was not deleted");
+        case 82: {
+            LogStep(82, "Make sure that first year day schedule was not deleted");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -61107,8 +62309,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 62: {
-            LogStep(62, "Make sure that second year day schedule was not deleted");
+        case 83: {
+            LogStep(83, "Make sure that second year day schedule was not deleted");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 2;
@@ -61118,13 +62320,33 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 63: {
-            LogStep(63, "Create another Week Day schedule with valid parameters");
+        case 84: {
+            LogStep(84, "Make sure that first holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 85: {
+            LogStep(85, "Make sure that second holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 86: {
+            LogStep(86, "Create another Week Day schedule with valid parameters");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2);
             value.startHour    = 0;
             value.startMinute  = 0;
             value.endHour      = 23;
@@ -61134,8 +62356,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 64: {
-            LogStep(64, "Clear a single year day schedule for the first user");
+        case 87: {
+            LogStep(87, "Clear a single year day schedule for the first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -61145,8 +62367,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 65: {
-            LogStep(65, "Verify cleared year day schedule");
+        case 88: {
+            LogStep(88, "Verify cleared year day schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -61156,8 +62378,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 66: {
-            LogStep(66, "Clear all remaining year schedules for the first user");
+        case 89: {
+            LogStep(89, "Clear all remaining year schedules for the first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type value;
             value.yearDayIndex = 254;
@@ -61167,8 +62389,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 67: {
-            LogStep(67, "Verify that second year day schedule was cleared");
+        case 90: {
+            LogStep(90, "Verify that second year day schedule was cleared");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 2;
@@ -61178,8 +62400,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 68: {
-            LogStep(68, "Verify created week day schedule");
+        case 91: {
+            LogStep(91, "Verify created week day schedule");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -61189,8 +62411,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 69: {
-            LogStep(69, "Clear all remaining week day schedules for the first user");
+        case 92: {
+            LogStep(92, "Clear all remaining week day schedules for the first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type value;
             value.weekDayIndex = 254;
@@ -61200,8 +62422,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 70: {
-            LogStep(70, "Create new user without credential so we can add more schedules to it");
+        case 93: {
+            LogStep(93, "Create new user without credential so we can add more schedules to it");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
             value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
@@ -61216,13 +62438,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 71: {
-            LogStep(71, "Create Week Day schedule with valid parameters for first user");
+        case 94: {
+            LogStep(94, "Create Week Day schedule with valid parameters for first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
             value.startHour    = 0;
             value.startMinute  = 0;
             value.endHour      = 23;
@@ -61232,8 +62454,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 72: {
-            LogStep(72, "Verify created week day schedule for first user");
+        case 95: {
+            LogStep(95, "Verify created week day schedule for first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -61243,8 +62465,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 73: {
-            LogStep(73, "Create Year Day schedule for first user");
+        case 96: {
+            LogStep(96, "Create Year Day schedule for first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 4;
@@ -61256,8 +62478,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 74: {
-            LogStep(74, "Verify created year day schedule for first");
+        case 97: {
+            LogStep(97, "Verify created year day schedule for first");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 4;
@@ -61267,13 +62489,13 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 75: {
-            LogStep(75, "Create Week Day schedule with valid parameters for second user");
+        case 98: {
+            LogStep(98, "Create Week Day schedule with valid parameters for second user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 4;
             value.userIndex    = 2U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(64);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(64);
             value.startHour    = 23;
             value.startMinute  = 0;
             value.endHour      = 23;
@@ -61283,8 +62505,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 76: {
-            LogStep(76, "Verify created week day schedule for first user");
+        case 99: {
+            LogStep(99, "Verify created week day schedule for first user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 4;
@@ -61294,8 +62516,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 77: {
-            LogStep(77, "Create Year Day schedule for second user");
+        case 100: {
+            LogStep(100, "Create Year Day schedule for second user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
             value.yearDayIndex   = 1;
@@ -61307,8 +62529,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 78: {
-            LogStep(78, "Verify created year day schedule for first");
+        case 101: {
+            LogStep(101, "Verify created year day schedule for first");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -61318,8 +62540,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 79: {
-            LogStep(79, "Cleanup");
+        case 102: {
+            LogStep(102, "Cleanup the user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::ClearUser::Type value;
             value.userIndex = 65534U;
@@ -61328,8 +62550,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 80: {
-            LogStep(80, "Make sure clearing first user also cleared week day schedules");
+        case 103: {
+            LogStep(103, "Make sure clearing first user also cleared week day schedules");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
@@ -61339,8 +62561,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 81: {
-            LogStep(81, "Make sure clearing first user also cleared year day schedules");
+        case 104: {
+            LogStep(104, "Make sure clearing first user also cleared year day schedules");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 4;
@@ -61350,8 +62572,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 82: {
-            LogStep(82, "Make sure clearing second user also cleared week day schedules");
+        case 105: {
+            LogStep(105, "Make sure clearing second user also cleared week day schedules");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
             value.weekDayIndex = 4;
@@ -61361,8 +62583,8 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
-        case 83: {
-            LogStep(83, "Make sure clearing second user also cleared year day schedules");
+        case 106: {
+            LogStep(106, "Make sure clearing second user also cleared year day schedules");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
             value.yearDayIndex = 1;
@@ -61372,6 +62594,230 @@ class DL_SchedulesSuite : public TestCommand
 
             );
         }
+        case 107: {
+            LogStep(107, "Make sure that first holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 108: {
+            LogStep(108, "Make sure that second holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 109: {
+            LogStep(109, "Create another Holiday schedule at the last slot");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type value;
+            value.holidayIndex   = NumberOfHolidaySchedulesSupported;
+            value.localStartTime = 1UL;
+            value.localEndTime   = 100UL;
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(4);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 110: {
+            LogStep(110, "Verify Created Holiday Schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = NumberOfHolidaySchedulesSupported;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 111: {
+            LogStep(111, "Create new PIN credential and schedule user");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNull();
+            value.userStatus.SetNull();
+            value.userType.SetNull();
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 112: {
+            LogStep(112, "Create Week Day schedule for first user");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1);
+            value.startHour    = 0;
+            value.startMinute  = 0;
+            value.endHour      = 23;
+            value.endMinute    = 59;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 113: {
+            LogStep(113, "Create Year Day schedule for first user");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type value;
+            value.yearDayIndex   = 1;
+            value.userIndex      = 1U;
+            value.localStartTime = 9000UL;
+            value.localEndTime   = 888888888UL;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 114: {
+            LogStep(114, "Clear a single holiday schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type value;
+            value.holidayIndex = 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 115: {
+            LogStep(115, "Make sure that first holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 116: {
+            LogStep(116, "Make sure that second holiday schedule was deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 117: {
+            LogStep(117, "Make sure that third holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = NumberOfHolidaySchedulesSupported;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 118: {
+            LogStep(118, "Make sure clearing holiday schedule did not clear week day schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 119: {
+            LogStep(119, "Make sure clearing holiday schedule did not clear year day schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
+            value.yearDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 120: {
+            LogStep(120, "Clear all remaining holiday schedules");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type value;
+            value.holidayIndex = 254;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 121: {
+            LogStep(121, "Make sure that first holiday is still deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 1;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 122: {
+            LogStep(122, "Make sure that second holiday schedule was deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = 2;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 123: {
+            LogStep(123, "Make sure that third holiday schedule was not deleted");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type value;
+            value.holidayIndex = NumberOfHolidaySchedulesSupported;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetHolidaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 124: {
+            LogStep(124, "Make sure clearing holiday schedule did not clear week day schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type value;
+            value.weekDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetWeekDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 125: {
+            LogStep(125, "Make sure clearing holiday schedule did not clear year day schedule");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type value;
+            value.yearDayIndex = 1;
+            value.userIndex    = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetYearDaySchedule::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 126: {
+            LogStep(126, "Final Cleanup");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearUser::Type value;
+            value.userIndex = 65534U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearUser::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
         }
         return CHIP_NO_ERROR;
     }
@@ -62035,10 +63481,10 @@ class Test_TC_DL_2_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_8Suite : public TestCommand
+class Test_TC_DL_2_5Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_8", 10, credsIssuerConfig)
+    Test_TC_DL_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_5", 10, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -62046,7 +63492,7 @@ class Test_TC_DL_2_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_8Suite() {}
+    ~Test_TC_DL_2_5Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -62247,7 +63693,7 @@ class Test_TC_DL_2_8Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2);
             value.startHour    = 15;
             value.startMinute  = 45;
             value.endHour      = 16;
@@ -62274,7 +63720,7 @@ class Test_TC_DL_2_8Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 0;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitFlags<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(7);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(7);
             value.startHour    = 15;
             value.startMinute  = 45;
             value.endHour      = 16;
@@ -62322,10 +63768,10 @@ class Test_TC_DL_2_8Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_11Suite : public TestCommand
+class Test_TC_DL_2_7Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_11", 13, credsIssuerConfig)
+    Test_TC_DL_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_7", 13, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -62333,7 +63779,7 @@ class Test_TC_DL_2_11Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_11Suite() {}
+    ~Test_TC_DL_2_7Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -62670,10 +64116,10 @@ class Test_TC_DL_2_11Suite : public TestCommand
     }
 };
 
-class TestGroupMessagingSuite : public TestCommand
+class Test_TC_DL_2_9Suite : public TestCommand
 {
 public:
-    TestGroupMessagingSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupMessaging", 15, credsIssuerConfig)
+    Test_TC_DL_2_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_9", 17, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -62681,7 +64127,7 @@ class TestGroupMessagingSuite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~TestGroupMessagingSuite() {}
+    ~Test_TC_DL_2_9Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -62694,6 +64140,8 @@ class TestGroupMessagingSuite : public TestCommand
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
+    uint16_t NumberOfTotalUsersSupported;
+
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
     //
@@ -62713,78 +64161,105 @@ class TestGroupMessagingSuite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
+                uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 0));
+                VerifyOrReturn(CheckValue("numberOfTotalUsersSupported", value, 10U));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+                NumberOfTotalUsersSupported = value;
             }
             break;
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 0));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
             }
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value.credentialExists", "", "boolean"));
+                VerifyOrReturn(CheckConstraintMinValue("value.userIndex", value.userIndex, 1U));
+            }
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
             break;
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::CharSpan value;
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
             break;
         case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::CharSpan value;
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("xyzzy", 5)));
             }
             break;
-        case 10:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 11:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::CharSpan value;
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
-        case 12:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 13:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                bool value;
+                chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("onOff", value, 1));
+
+                VerifyOrReturn(CheckValueNull("userIndex", value.userIndex));
             }
             break;
-        case 14:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+            }
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
             break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
@@ -62809,222 +64284,301 @@ class TestGroupMessagingSuite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Add Group 1 (endpoint 1)");
-            ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
-            value.groupId   = 257U;
-            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
-
-            );
+            LogStep(1, "TH reads NumberOfTotalUsersSupported attribute and saves for future use.");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id,
+                                 DoorLock::Attributes::NumberOfTotalUsersSupported::Id, true, chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Add Group 2 (endpoint 0)");
+            LogStep(2, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
-            value.groupId   = 258U;
-            value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 1U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
 
             );
         }
         case 3: {
-            LogStep(3, "KeySet Write 1");
+            LogStep(3, "TH sends Get Credential Status Command");
             ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+            chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.groupKeySet.groupKeySetID = 417U;
-            value.groupKeySet.groupKeySecurityPolicy =
-                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
-            value.groupKeySet.epochKey0.SetNonNull();
-            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime0.SetNonNull();
-            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
-            value.groupKeySet.epochKey1.SetNonNull();
-            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime1.SetNonNull();
-            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
-            value.groupKeySet.epochKey2.SetNonNull();
-            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime2.SetNonNull();
-            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
 
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
+                               chip::NullOptional
 
             );
         }
         case 4: {
-            LogStep(4, "KeySet Write 2");
+            LogStep(4, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
 
-            value.groupKeySet.groupKeySetID = 418U;
-            value.groupKeySet.groupKeySecurityPolicy =
-                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
-            value.groupKeySet.epochKey0.SetNonNull();
-            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime0.SetNonNull();
-            value.groupKeySet.epochStartTime0.Value() = 2220000ULL;
-            value.groupKeySet.epochKey1.SetNonNull();
-            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime1.SetNonNull();
-            value.groupKeySet.epochStartTime1.Value() = 2220001ULL;
-            value.groupKeySet.epochKey2.SetNonNull();
-            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime2.SetNonNull();
-            value.groupKeySet.epochStartTime2.Value() = 2220002ULL;
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
 
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("1234garbage: not in length on purpose"), 4);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 2U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(5);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(10);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
 
             );
         }
         case 5: {
-            LogStep(5, "Write Group Keys");
+            LogStep(5, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
-
-            {
-                auto * listHolder_0 = new ListHolder<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(2);
-                listFreer.add(listHolder_0);
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
 
-                listHolder_0->mList[0].groupId       = 257U;
-                listHolder_0->mList[0].groupKeySetID = 417U;
-                listHolder_0->mList[0].fabricIndex   = 1;
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
 
-                listHolder_0->mList[1].groupId       = 258U;
-                listHolder_0->mList[1].groupKeySetID = 418U;
-                listHolder_0->mList[1].fabricIndex   = 1;
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 2U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
 
-                value = chip::app::DataModel::List<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(
-                    listHolder_0->mList, 2);
-            }
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                                  GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional);
+            );
         }
         case 6: {
-            LogStep(6, "Install ACLs");
+            LogStep(6, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
-
-            {
-                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(2);
-                listFreer.add(listHolder_0);
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
 
-                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
-                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
-                listHolder_0->mList[0].subjects.SetNull();
-                listHolder_0->mList[0].targets.SetNull();
-                listHolder_0->mList[0].fabricIndex = 0;
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
 
-                listHolder_0->mList[1].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(4);
-                listHolder_0->mList[1].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(3);
-                listHolder_0->mList[1].subjects.SetNull();
-                listHolder_0->mList[1].targets.SetNull();
-                listHolder_0->mList[1].fabricIndex = 0;
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 2U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
 
-                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
-                    listHolder_0->mList, 2);
-            }
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
-                                  chip::NullOptional, chip::NullOptional);
+            );
         }
         case 7: {
-            LogStep(7, "Read initial Attribute value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
-                                 chip::NullOptional);
+            LogStep(7, "TH sends Set Credential Command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 2U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 3U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 8: {
-            LogStep(8, "Group Write Attribute");
+            LogStep(8, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::CharSpan value;
-            value = chip::Span<const char>("xyzzygarbage: not in length on purpose", 5);
-            return WriteGroupAttribute(kIdentityAlpha, 258, Basic::Id, Basic::Attributes::NodeLabel::Id, value, chip::NullOptional);
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 3U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 3U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 9: {
-            LogStep(9, "Read back Attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
-                                 chip::NullOptional);
+            LogStep(9, "TH sends Clear Credential Command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
+            value.credential.SetNonNull();
+
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialIndex = 1U;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 10: {
-            LogStep(10, "Restore initial Attribute value");
+            LogStep(10, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::CharSpan value;
-            value = chip::Span<const char>("garbage: not in length on purpose", 0);
-            return WriteGroupAttribute(kIdentityAlpha, 258, Basic::Id, Basic::Attributes::NodeLabel::Id, value, chip::NullOptional);
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 2U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 11: {
-            LogStep(11, "Read back Attribute");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
-                                 chip::NullOptional);
+            LogStep(11, "TH sends Clear Credential Command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
+            value.credential.SetNonNull();
+
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialIndex = 65534U;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 12: {
-            LogStep(12, "Turn On the light to see attribute change");
+            LogStep(12, "TH sends Set Credential Command to DUT");
             ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::On::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 2U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 13: {
-            LogStep(13, "Check on/off attribute value is true after on command for endpoint 1");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
+            LogStep(13, "TH sends Clear Credential Command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
+            value.credential.SetNonNull();
+
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialIndex = 65534U;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         case 14: {
-            LogStep(14, "Cleanup ACLs");
+            LogStep(14, "TH sends Get Credential Status Command");
             ListFreer listFreer;
-            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
+            chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            {
-                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(1);
-                listFreer.add(listHolder_0);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
 
-                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
-                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
-                listHolder_0->mList[0].subjects.SetNull();
-                listHolder_0->mList[0].targets.SetNull();
-                listHolder_0->mList[0].fabricIndex = 0;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
+                               chip::NullOptional
 
-                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
-                    listHolder_0->mList, 1);
-            }
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
-                                  chip::NullOptional, chip::NullOptional);
+            );
+        }
+        case 15: {
+            LogStep(15, "TH sends Set Credential Command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialIndex = 1U;
+
+            value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.userIndex.SetNonNull();
+            value.userIndex.Value() = 2U;
+            value.userStatus.SetNonNull();
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userType.SetNonNull();
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
+        }
+        case 16: {
+            LogStep(16, "TH sends Clear Credential Command to DUT");
+            ListFreer listFreer;
+            chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
+            value.credential.SetNonNull();
+
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(8);
+            value.credential.Value().credentialIndex = 2U;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
+
+            );
         }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class TestGroupsClusterSuite : public TestCommand
+class TestGroupMessagingSuite : public TestCommand
 {
 public:
-    TestGroupsClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupsCluster", 19, credsIssuerConfig)
+    TestGroupMessagingSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupMessaging", 41, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("nodeId2", 0, UINT64_MAX, &mNodeId2);
+        AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
+        AddArgument("payload", &mPayload);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~TestGroupsClusterSuite() {}
+    ~TestGroupMessagingSuite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -63035,6 +64589,9 @@ class TestGroupsClusterSuite : public TestCommand
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<chip::NodeId> mNodeId2;
+    chip::Optional<uint16_t> mDiscriminator;
+    chip::Optional<chip::CharSpan> mPayload;
     chip::Optional<uint16_t> mTimeout;
 
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
@@ -63056,195 +64613,209 @@ class TestGroupsClusterSuite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 135));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 0U));
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
             }
             break;
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
             }
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 0));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
-            }
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 0));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
-
-                VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
-            }
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U));
-            }
             break;
         case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value;
+                chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNull("capacity", value.capacity));
-
-                {
-                    auto iter_0 = value.groupList.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value.groupList)>("groupList", iter_0, 0));
-                    VerifyOrReturn(CheckValue("groupList[0]", iter_0.GetValue(), 1U));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value.groupList)>("groupList", iter_0, 1));
-                }
+                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
-        case 7:
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U));
+                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("xyzzy", 5)));
             }
             break;
-        case 8:
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 0));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
-
-                VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
+                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
-        case 9:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
+                bool value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 135));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 0U));
+                VerifyOrReturn(CheckValue("onOff", value, 0));
             }
             break;
-        case 10:
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
+                bool value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 4U));
+                VerifyOrReturn(CheckValue("onOff", value, 1));
             }
             break;
-        case 11:
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("status", value.status, 0));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
-
-                VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
             }
             break;
-        case 12:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U));
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
             }
             break;
-        case 13:
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 29:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value;
+                chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNull("capacity", value.capacity));
-
-                {
-                    auto iter_0 = value.groupList.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value.groupList)>("groupList", iter_0, 0));
-                    VerifyOrReturn(CheckValue("groupList[0]", iter_0.GetValue(), 1U));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value.groupList)>("groupList", iter_0, 1));
-                }
+                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
-        case 14:
+        case 30:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 15:
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 32:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
+                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("xyzzy", 5)));
             }
             break;
-        case 16:
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 35:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                chip::CharSpan value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U));
+                VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0)));
             }
             break;
-        case 17:
+        case 36:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                bool value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 139));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U));
+                VerifyOrReturn(CheckValue("onOff", value, 0));
             }
             break;
-        case 18:
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 39:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value;
+                bool value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValueNull("capacity", value.capacity));
-
-                {
-                    auto iter_0 = value.groupList.begin();
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value.groupList)>("groupList", iter_0, 0));
-                }
+                VerifyOrReturn(CheckValue("onOff", value, 1));
             }
             break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -63268,214 +64839,498 @@ class TestGroupsClusterSuite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "View Group 0 (invalid)");
+            LogStep(1, "Add Group 1 (endpoint 1)");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 0U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 257U;
+            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
 
             );
         }
         case 2: {
-            LogStep(2, "View Group 1 (not found)");
+            LogStep(2, "Add Group 2 (endpoint 0)");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 258U;
+            value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
 
             );
         }
         case 3: {
-            LogStep(3, "Add Group 1 (new)");
+            LogStep(3, "KeySet Write 1");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
-            value.groupId   = 1U;
-            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 417U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
 
             );
         }
         case 4: {
-            LogStep(4, "View Group 1 (new)");
+            LogStep(4, "KeySet Write 2");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 418U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 2220000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 2220001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 2220002ULL;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
 
             );
         }
         case 5: {
-            LogStep(5, "View Group 2 (not found)");
+            LogStep(5, "Write Group Keys");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 4369U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
+            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
 
-            );
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(2);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].groupId       = 257U;
+                listHolder_0->mList[0].groupKeySetID = 417U;
+                listHolder_0->mList[0].fabricIndex   = 0;
+
+                listHolder_0->mList[1].groupId       = 258U;
+                listHolder_0->mList[1].groupKeySetID = 418U;
+                listHolder_0->mList[1].fabricIndex   = 0;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(
+                    listHolder_0->mList, 2);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                                  GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional);
         }
         case 6: {
-            LogStep(6, "Get Group Membership 1 (all)");
+            LogStep(6, "Install ACLs");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::GetGroupMembership::Type value;
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
 
-            value.groupList = chip::app::DataModel::List<chip::GroupId>();
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::GetGroupMembership::Id, value,
-                               chip::NullOptional
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(2);
+                listFreer.add(listHolder_0);
 
-            );
+                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
+                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
+                listHolder_0->mList[0].subjects.SetNull();
+                listHolder_0->mList[0].targets.SetNull();
+                listHolder_0->mList[0].fabricIndex = 0;
+
+                listHolder_0->mList[1].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(4);
+                listHolder_0->mList[1].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(3);
+                listHolder_0->mList[1].subjects.SetNull();
+                listHolder_0->mList[1].targets.SetNull();
+                listHolder_0->mList[1].fabricIndex = 0;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
+                    listHolder_0->mList, 2);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
         }
         case 7: {
-            LogStep(7, "View Group 3 (not found)");
-            ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 32767U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            LogStep(7, "Read initial Attribute value");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
+                                 chip::NullOptional);
         }
         case 8: {
-            LogStep(8, "View Group 1 (existing)");
+            LogStep(8, "Group Write Attribute");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            chip::CharSpan value;
+            value = chip::Span<const char>("xyzzygarbage: not in length on purpose", 5);
+            return WriteGroupAttribute(kIdentityAlpha, 258, Basic::Id, Basic::Attributes::NodeLabel::Id, value, chip::NullOptional);
         }
         case 9: {
-            LogStep(9, "Remove Group 0 (invalid)");
+            LogStep(9, "Wait for write 1");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
-            value.groupId = 0U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 100UL;
+            return WaitForMs(kIdentityAlpha, value);
         }
         case 10: {
-            LogStep(10, "Remove Group 4 (not found)");
-            ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
-            value.groupId = 4U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            LogStep(10, "Read back Attribute");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
+                                 chip::NullOptional);
         }
         case 11: {
-            LogStep(11, "View Group 1 (not removed)");
+            LogStep(11, "Restore initial Attribute value");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            chip::CharSpan value;
+            value = chip::Span<const char>("garbage: not in length on purpose", 0);
+            return WriteGroupAttribute(kIdentityAlpha, 258, Basic::Id, Basic::Attributes::NodeLabel::Id, value, chip::NullOptional);
         }
         case 12: {
-            LogStep(12, "View Group 2 (removed)");
+            LogStep(12, "Wait for write 2");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 4369U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 100UL;
+            return WaitForMs(kIdentityAlpha, value);
         }
         case 13: {
-            LogStep(13, "Get Group Membership 3");
-            ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::GetGroupMembership::Type value;
-
-            {
-                auto * listHolder_0 = new ListHolder<chip::GroupId>(4);
-                listFreer.add(listHolder_0);
-                listHolder_0->mList[0] = 1U;
-                listHolder_0->mList[1] = 2U;
-                listHolder_0->mList[2] = 4369U;
-                listHolder_0->mList[3] = 3U;
-                value.groupList        = chip::app::DataModel::List<chip::GroupId>(listHolder_0->mList, 4);
-            }
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::GetGroupMembership::Id, value,
-                               chip::NullOptional
-
-            );
+            LogStep(13, "Read back Attribute");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
+                                 chip::NullOptional);
         }
         case 14: {
-            LogStep(14, "Remove All");
-            ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value,
-                               chip::NullOptional
-
-            );
+            LogStep(14, "Check on/off attribute value is false for endpoint 1");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 15: {
-            LogStep(15, "View Group 1 (removed)");
+            LogStep(15, "Turn On the light to see attribute change");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 1U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
         }
         case 16: {
-            LogStep(16, "View Group 2 (still removed)");
+            LogStep(16, "Wait for command 3");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 4369U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
-
-            );
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 100UL;
+            return WaitForMs(kIdentityAlpha, value);
         }
         case 17: {
-            LogStep(17, "View Group 3 (removed)");
+            LogStep(17, "Check on/off attribute value is true after on command for endpoint 1");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
+        }
+        case 18: {
+            LogStep(18, "Turn off the light to get ready for the next test");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
-            value.groupId = 32767U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
-                               chip::NullOptional
+            chip::app::Clusters::OnOff::Commands::Off::Type value;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
 
             );
         }
-        case 18: {
-            LogStep(18, "Get Group Membership 4");
+        case 19: {
+            LogStep(19, "Cleanup ACLs");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::GetGroupMembership::Type value;
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
 
             {
-                auto * listHolder_0 = new ListHolder<chip::GroupId>(5);
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(1);
                 listFreer.add(listHolder_0);
-                listHolder_0->mList[0] = 1U;
-                listHolder_0->mList[1] = 2U;
-                listHolder_0->mList[2] = 4369U;
-                listHolder_0->mList[3] = 3U;
-                listHolder_0->mList[4] = 32767U;
-                value.groupList        = chip::app::DataModel::List<chip::GroupId>(listHolder_0->mList, 5);
+
+                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
+                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
+                listHolder_0->mList[0].subjects.SetNull();
+                listHolder_0->mList[0].targets.SetNull();
+                listHolder_0->mList[0].fabricIndex = 0;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
+                    listHolder_0->mList, 1);
             }
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::GetGroupMembership::Id, value,
-                               chip::NullOptional
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 20: {
+            LogStep(20, "Open Commissioning Window from alpha");
+            ListFreer listFreer;
+            chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type value;
+            value.commissioningTimeout = 180U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), AdministratorCommissioning::Id,
+                               AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id, value,
+                               chip::Optional<uint16_t>(10000), chip::NullOptional
 
             );
         }
+        case 21: {
+            LogStep(21, "Commission from gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+            value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 1126240820ULL;
+            value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+            return PairWithCode(kIdentityGamma, value);
         }
-        return CHIP_NO_ERROR;
-    }
+        case 22: {
+            LogStep(22, "Wait for the commissioned device to be retrieved for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 1126240820ULL;
+            return WaitForCommissionee(kIdentityGamma, value);
+        }
+        case 23: {
+            LogStep(23, "Add Group 1 (endpoint 1) for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 257U;
+            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityGamma, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+
+            );
+        }
+        case 24: {
+            LogStep(24, "Add Group 2 (endpoint 0) for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 258U;
+            value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityGamma, GetEndpoint(0), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+
+            );
+        }
+        case 25: {
+            LogStep(25, "KeySet Write 1 for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 417U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
+
+            return SendCommand(kIdentityGamma, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+
+            );
+        }
+        case 26: {
+            LogStep(26, "KeySet Write 2 for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 418U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 2220000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 2220001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 2220002ULL;
+
+            return SendCommand(kIdentityGamma, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+
+            );
+        }
+        case 27: {
+            LogStep(27, "Write Group Keys for gamma");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(2);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].groupId       = 257U;
+                listHolder_0->mList[0].groupKeySetID = 417U;
+                listHolder_0->mList[0].fabricIndex   = 0;
+
+                listHolder_0->mList[1].groupId       = 258U;
+                listHolder_0->mList[1].groupKeySetID = 418U;
+                listHolder_0->mList[1].fabricIndex   = 0;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(
+                    listHolder_0->mList, 2);
+            }
+            return WriteAttribute(kIdentityGamma, GetEndpoint(0), GroupKeyManagement::Id,
+                                  GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional);
+        }
+        case 28: {
+            LogStep(28, "Install ACLs for gamma");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(2);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
+                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
+                listHolder_0->mList[0].subjects.SetNull();
+                listHolder_0->mList[0].targets.SetNull();
+                listHolder_0->mList[0].fabricIndex = 0;
+
+                listHolder_0->mList[1].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(4);
+                listHolder_0->mList[1].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(3);
+                listHolder_0->mList[1].subjects.SetNull();
+                listHolder_0->mList[1].targets.SetNull();
+                listHolder_0->mList[1].fabricIndex = 0;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
+                    listHolder_0->mList, 2);
+            }
+            return WriteAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 29: {
+            LogStep(29, "Read initial Attribute value for gamma");
+            return ReadAttribute(kIdentityGamma, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
+                                 chip::NullOptional);
+        }
+        case 30: {
+            LogStep(30, "Group Write Attribute for gamma");
+            ListFreer listFreer;
+            chip::CharSpan value;
+            value = chip::Span<const char>("xyzzygarbage: not in length on purpose", 5);
+            return WriteGroupAttribute(kIdentityGamma, 258, Basic::Id, Basic::Attributes::NodeLabel::Id, value, chip::NullOptional);
+        }
+        case 31: {
+            LogStep(31, "Wait for write 1 for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 100UL;
+            return WaitForMs(kIdentityGamma, value);
+        }
+        case 32: {
+            LogStep(32, "Read back Attribute for gamma");
+            return ReadAttribute(kIdentityGamma, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
+                                 chip::NullOptional);
+        }
+        case 33: {
+            LogStep(33, "Restore initial Attribute value for gamma");
+            ListFreer listFreer;
+            chip::CharSpan value;
+            value = chip::Span<const char>("garbage: not in length on purpose", 0);
+            return WriteGroupAttribute(kIdentityGamma, 258, Basic::Id, Basic::Attributes::NodeLabel::Id, value, chip::NullOptional);
+        }
+        case 34: {
+            LogStep(34, "Wait for write 2 for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 100UL;
+            return WaitForMs(kIdentityGamma, value);
+        }
+        case 35: {
+            LogStep(35, "Read back Attribute for gamma");
+            return ReadAttribute(kIdentityGamma, GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id, true,
+                                 chip::NullOptional);
+        }
+        case 36: {
+            LogStep(36, "Check on/off attribute value is false for endpoint 1 for gamma");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
+        }
+        case 37: {
+            LogStep(37, "Turn On the light to see attribute change for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityGamma, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+        }
+        case 38: {
+            LogStep(38, "Wait for command 3 for gamma");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 100UL;
+            return WaitForMs(kIdentityGamma, value);
+        }
+        case 39: {
+            LogStep(39, "Check on/off attribute value is true after on command for endpoint 1 for gamma");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
+        }
+        case 40: {
+            LogStep(40, "Cleanup ACLs for gamma");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(1);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
+                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
+                listHolder_0->mList[0].subjects.SetNull();
+                listHolder_0->mList[0].targets.SetNull();
+                listHolder_0->mList[0].fabricIndex = 0;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
+                    listHolder_0->mList, 1);
+            }
+            return WriteAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
 };
 
-class TestGroupKeyManagementClusterSuite : public TestCommand
+class TestGroupsClusterSuite : public TestCommand
 {
 public:
-    TestGroupKeyManagementClusterSuite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("TestGroupKeyManagementCluster", 18, credsIssuerConfig)
+    TestGroupsClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupsCluster", 19, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -63483,7 +65338,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~TestGroupKeyManagementClusterSuite() {}
+    ~TestGroupsClusterSuite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -63515,17 +65370,21 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint16_t value;
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 2U));
+                VerifyOrReturn(CheckValue("status", value.status, 135));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 0U));
             }
             break;
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                uint16_t value;
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("maxGroupKeysPerFabric", value, 2U));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
             }
             break;
         case 3:
@@ -63535,133 +65394,170 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("status", value.status, 0));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
             }
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("status", value.status, 0));
 
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
+
+                VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
             }
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U));
+            }
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNull("capacity", value.capacity));
+
+                {
+                    auto iter_0 = value.groupList.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value.groupList)>("groupList", iter_0, 0));
+                    VerifyOrReturn(CheckValue("groupList[0]", iter_0.GetValue(), 1U));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value.groupList)>("groupList", iter_0, 1));
+                }
+            }
             break;
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("groupKeySet.groupKeySetID", value.groupKeySet.groupKeySetID, 417U));
-                VerifyOrReturn(CheckValue("groupKeySet.groupKeySecurityPolicy", value.groupKeySet.groupKeySecurityPolicy, 0));
-                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey0", value.groupKeySet.epochKey0));
-                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime0", value.groupKeySet.epochStartTime0));
-                VerifyOrReturn(
-                    CheckValue("groupKeySet.epochStartTime0.Value()", value.groupKeySet.epochStartTime0.Value(), 1110000ULL));
-                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey1", value.groupKeySet.epochKey1));
-                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime1", value.groupKeySet.epochStartTime1));
-                VerifyOrReturn(
-                    CheckValue("groupKeySet.epochStartTime1.Value()", value.groupKeySet.epochStartTime1.Value(), 1110001ULL));
-                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey2", value.groupKeySet.epochKey2));
-                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime2", value.groupKeySet.epochStartTime2));
-                VerifyOrReturn(
-                    CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 1110002ULL));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U));
             }
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
+
+                VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
+            }
             break;
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 135));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 0U));
+            }
             break;
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::DecodableList<
-                    chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
-                    value;
+                chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupKeyMap", iter_0, 0));
-                    VerifyOrReturn(CheckValue("groupKeyMap[0].groupId", iter_0.GetValue().groupId, 257U));
-                    VerifyOrReturn(CheckValue("groupKeyMap[0].groupKeySetID", iter_0.GetValue().groupKeySetID, 417U));
-                    VerifyOrReturn(CheckValue("groupKeyMap[0].fabricIndex", iter_0.GetValue().fabricIndex, 1));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupKeyMap", iter_0, 1));
-                    VerifyOrReturn(CheckValue("groupKeyMap[1].groupId", iter_0.GetValue().groupId, 258U));
-                    VerifyOrReturn(CheckValue("groupKeyMap[1].groupKeySetID", iter_0.GetValue().groupKeySetID, 418U));
-                    VerifyOrReturn(CheckValue("groupKeyMap[1].fabricIndex", iter_0.GetValue().fabricIndex, 1));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("groupKeyMap", iter_0, 2));
-                }
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 4U));
             }
             break;
         case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::DecodableList<
-                    chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
-                    value;
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                {
-                    auto iter_0 = value.begin();
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 0));
-                    VerifyOrReturn(CheckValue("groupTable[0].groupId", iter_0.GetValue().groupId, 257U));
-                    VerifyOrReturn(CheckValuePresent("groupTable[0].groupName", iter_0.GetValue().groupName));
-                    VerifyOrReturn(CheckValueAsString("groupTable[0].groupName.Value()", iter_0.GetValue().groupName.Value(),
-                                                      chip::CharSpan("Group #1", 8)));
-                    VerifyOrReturn(CheckValue("groupTable[0].fabricIndex", iter_0.GetValue().fabricIndex, 1));
-                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 1));
-                    VerifyOrReturn(CheckValue("groupTable[1].groupId", iter_0.GetValue().groupId, 258U));
-                    VerifyOrReturn(CheckValuePresent("groupTable[1].groupName", iter_0.GetValue().groupName));
-                    VerifyOrReturn(CheckValueAsString("groupTable[1].groupName.Value()", iter_0.GetValue().groupName.Value(),
-                                                      chip::CharSpan("Group #2", 8)));
-                    VerifyOrReturn(CheckValue("groupTable[1].fabricIndex", iter_0.GetValue().fabricIndex, 1));
-                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("groupTable", iter_0, 2));
-                }
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
+
+                VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8)));
             }
             break;
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U));
+            }
             break;
         case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value;
+                chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("groupKeySet.groupKeySetID", value.groupKeySet.groupKeySetID, 418U));
-                VerifyOrReturn(CheckValue("groupKeySet.groupKeySecurityPolicy", value.groupKeySet.groupKeySecurityPolicy, 1));
-                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey0", value.groupKeySet.epochKey0));
-                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime0", value.groupKeySet.epochStartTime0));
-                VerifyOrReturn(
-                    CheckValue("groupKeySet.epochStartTime0.Value()", value.groupKeySet.epochStartTime0.Value(), 2110000ULL));
-                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey1", value.groupKeySet.epochKey1));
-                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime1", value.groupKeySet.epochStartTime1));
-                VerifyOrReturn(
-                    CheckValue("groupKeySet.epochStartTime1.Value()", value.groupKeySet.epochStartTime1.Value(), 2110001ULL));
-                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey2", value.groupKeySet.epochKey2));
-                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime2", value.groupKeySet.epochStartTime2));
-                VerifyOrReturn(
-                    CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 2110002ULL));
+                VerifyOrReturn(CheckValueNull("capacity", value.capacity));
+
+                {
+                    auto iter_0 = value.groupList.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value.groupList)>("groupList", iter_0, 0));
+                    VerifyOrReturn(CheckValue("groupList[0]", iter_0.GetValue(), 1U));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value.groupList)>("groupList", iter_0, 1));
+                }
             }
             break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 1U));
+            }
             break;
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U));
+            }
             break;
         case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 139));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U));
+            }
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValueNull("capacity", value.capacity));
+
+                {
+                    auto iter_0 = value.groupList.begin();
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value.groupList)>("groupList", iter_0, 0));
+                }
+            }
             break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
@@ -63686,117 +65582,564 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
             return WaitForCommissionee(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Read maxGroupsPerFabric");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                                 GroupKeyManagement::Attributes::MaxGroupsPerFabric::Id, true, chip::NullOptional);
+            LogStep(1, "View Group 0 (invalid)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 0U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
         }
         case 2: {
-            LogStep(2, "Read maxGroupKeysPerFabric");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                                 GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id, true, chip::NullOptional);
+            LogStep(2, "View First Group (not found)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
         }
         case 3: {
-            LogStep(3, "Add Group 1");
+            LogStep(3, "Add First Group (new)");
             ListFreer listFreer;
             chip::app::Clusters::Groups::Commands::AddGroup::Type value;
-            value.groupId   = 257U;
+            value.groupId   = 1U;
             value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
 
             );
         }
         case 4: {
-            LogStep(4, "Add Group 2");
+            LogStep(4, "View First Group (new)");
             ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
-            value.groupId   = 258U;
-            value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
 
             );
         }
         case 5: {
-            LogStep(5, "KeySet Write 1");
+            LogStep(5, "View Second Group (not found)");
             ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
-
-            value.groupKeySet.groupKeySetID = 417U;
-            value.groupKeySet.groupKeySecurityPolicy =
-                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
-            value.groupKeySet.epochKey0.SetNonNull();
-            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime0.SetNonNull();
-            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
-            value.groupKeySet.epochKey1.SetNonNull();
-            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime1.SetNonNull();
-            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
-            value.groupKeySet.epochKey2.SetNonNull();
-            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime2.SetNonNull();
-            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
-
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 4369U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
 
             );
         }
         case 6: {
-            LogStep(6, "KeySet Write 2");
+            LogStep(6, "Get Group Membership 1 (all)");
             ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
-
-            value.groupKeySet.groupKeySetID = 418U;
-            value.groupKeySet.groupKeySecurityPolicy =
-                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(1);
-            value.groupKeySet.epochKey0.SetNonNull();
-            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime0.SetNonNull();
-            value.groupKeySet.epochStartTime0.Value() = 2110000ULL;
-            value.groupKeySet.epochKey1.SetNonNull();
-            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime1.SetNonNull();
-            value.groupKeySet.epochStartTime1.Value() = 2110001ULL;
-            value.groupKeySet.epochKey2.SetNonNull();
-            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime2.SetNonNull();
-            value.groupKeySet.epochStartTime2.Value() = 2110002ULL;
+            chip::app::Clusters::Groups::Commands::GetGroupMembership::Type value;
 
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+            value.groupList = chip::app::DataModel::List<chip::GroupId>();
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::GetGroupMembership::Id, value,
+                               chip::NullOptional
 
             );
         }
         case 7: {
-            LogStep(7, "KeySet Read");
+            LogStep(7, "View Group 3 (not found)");
             ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value;
-            value.groupKeySetID = 417U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Commands::KeySetRead::Id,
-                               value, chip::NullOptional
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 32767U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
 
             );
         }
         case 8: {
-            LogStep(8, "Write Group Keys (invalid)");
+            LogStep(8, "View First Group (existing)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 9: {
+            LogStep(9, "Remove Group 0 (invalid)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
+            value.groupId = 0U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 10: {
+            LogStep(10, "Remove Group 4 (not found)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
+            value.groupId = 4U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 11: {
+            LogStep(11, "View First Group (not removed)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 12: {
+            LogStep(12, "View Second Group (removed)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 4369U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 13: {
+            LogStep(13, "Get Group Membership 3");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::GetGroupMembership::Type value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::GroupId>(4);
+                listFreer.add(listHolder_0);
+                listHolder_0->mList[0] = 1U;
+                listHolder_0->mList[1] = 2U;
+                listHolder_0->mList[2] = 4369U;
+                listHolder_0->mList[3] = 3U;
+                value.groupList        = chip::app::DataModel::List<chip::GroupId>(listHolder_0->mList, 4);
+            }
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::GetGroupMembership::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 14: {
+            LogStep(14, "Remove All");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 15: {
+            LogStep(15, "View First Group (removed)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 1U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 16: {
+            LogStep(16, "View Second Group (still removed)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 4369U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 17: {
+            LogStep(17, "View Group 3 (removed)");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::ViewGroup::Type value;
+            value.groupId = 32767U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::ViewGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 18: {
+            LogStep(18, "Get Group Membership 4");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::GetGroupMembership::Type value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::GroupId>(5);
+                listFreer.add(listHolder_0);
+                listHolder_0->mList[0] = 1U;
+                listHolder_0->mList[1] = 2U;
+                listHolder_0->mList[2] = 4369U;
+                listHolder_0->mList[3] = 3U;
+                listHolder_0->mList[4] = 32767U;
+                value.groupList        = chip::app::DataModel::List<chip::GroupId>(listHolder_0->mList, 5);
+            }
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::GetGroupMembership::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class TestGroupKeyManagementClusterSuite : public TestCommand
+{
+public:
+    TestGroupKeyManagementClusterSuite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("TestGroupKeyManagementCluster", 20, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~TestGroupKeyManagementClusterSuite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 2U));
+            }
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("maxGroupKeysPerFabric", value, 2U));
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 258U));
+            }
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("groupKeySet.groupKeySetID", value.groupKeySet.groupKeySetID, 417U));
+                VerifyOrReturn(CheckValue("groupKeySet.groupKeySecurityPolicy", value.groupKeySet.groupKeySecurityPolicy, 0));
+                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey0", value.groupKeySet.epochKey0));
+                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime0", value.groupKeySet.epochStartTime0));
+                VerifyOrReturn(
+                    CheckValue("groupKeySet.epochStartTime0.Value()", value.groupKeySet.epochStartTime0.Value(), 1110000ULL));
+                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey1", value.groupKeySet.epochKey1));
+                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime1", value.groupKeySet.epochStartTime1));
+                VerifyOrReturn(
+                    CheckValue("groupKeySet.epochStartTime1.Value()", value.groupKeySet.epochStartTime1.Value(), 1110001ULL));
+                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey2", value.groupKeySet.epochKey2));
+                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime2", value.groupKeySet.epochStartTime2));
+                VerifyOrReturn(
+                    CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 1110002ULL));
+            }
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<
+                    chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
+                    value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupKeyMap", iter_0, 0));
+                    VerifyOrReturn(CheckValue("groupKeyMap[0].groupId", iter_0.GetValue().groupId, 257U));
+                    VerifyOrReturn(CheckValue("groupKeyMap[0].groupKeySetID", iter_0.GetValue().groupKeySetID, 417U));
+                    VerifyOrReturn(CheckValue("groupKeyMap[0].fabricIndex", iter_0.GetValue().fabricIndex, 1));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupKeyMap", iter_0, 1));
+                    VerifyOrReturn(CheckValue("groupKeyMap[1].groupId", iter_0.GetValue().groupId, 258U));
+                    VerifyOrReturn(CheckValue("groupKeyMap[1].groupKeySetID", iter_0.GetValue().groupKeySetID, 418U));
+                    VerifyOrReturn(CheckValue("groupKeyMap[1].fabricIndex", iter_0.GetValue().fabricIndex, 1));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("groupKeyMap", iter_0, 2));
+                }
+            }
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<
+                    chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
+                    value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 0));
+                    VerifyOrReturn(CheckValue("groupTable[0].groupId", iter_0.GetValue().groupId, 257U));
+                    VerifyOrReturn(CheckValuePresent("groupTable[0].groupName", iter_0.GetValue().groupName));
+                    VerifyOrReturn(CheckValueAsString("groupTable[0].groupName.Value()", iter_0.GetValue().groupName.Value(),
+                                                      chip::CharSpan("Group #1", 8)));
+                    VerifyOrReturn(CheckValue("groupTable[0].fabricIndex", iter_0.GetValue().fabricIndex, 1));
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 1));
+                    VerifyOrReturn(CheckValue("groupTable[1].groupId", iter_0.GetValue().groupId, 258U));
+                    VerifyOrReturn(CheckValuePresent("groupTable[1].groupName", iter_0.GetValue().groupName));
+                    VerifyOrReturn(CheckValueAsString("groupTable[1].groupName.Value()", iter_0.GetValue().groupName.Value(),
+                                                      chip::CharSpan("Group #2", 8)));
+                    VerifyOrReturn(CheckValue("groupTable[1].fabricIndex", iter_0.GetValue().fabricIndex, 1));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("groupTable", iter_0, 2));
+                }
+            }
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("groupKeySet.groupKeySetID", value.groupKeySet.groupKeySetID, 418U));
+                VerifyOrReturn(CheckValue("groupKeySet.groupKeySecurityPolicy", value.groupKeySet.groupKeySecurityPolicy, 1));
+                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey0", value.groupKeySet.epochKey0));
+                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime0", value.groupKeySet.epochStartTime0));
+                VerifyOrReturn(
+                    CheckValue("groupKeySet.epochStartTime0.Value()", value.groupKeySet.epochStartTime0.Value(), 2110000ULL));
+                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey1", value.groupKeySet.epochKey1));
+                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime1", value.groupKeySet.epochStartTime1));
+                VerifyOrReturn(
+                    CheckValue("groupKeySet.epochStartTime1.Value()", value.groupKeySet.epochStartTime1.Value(), 2110001ULL));
+                VerifyOrReturn(CheckValueNull("groupKeySet.epochKey2", value.groupKeySet.epochKey2));
+                VerifyOrReturn(CheckValueNonNull("groupKeySet.epochStartTime2", value.groupKeySet.epochStartTime2));
+                VerifyOrReturn(
+                    CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 2110002ULL));
+            }
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+            }
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::DecodableList<
+                    chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
+                    value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                {
+                    auto iter_0 = value.begin();
+                    VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 0));
+                    VerifyOrReturn(CheckValue("groupTable[0].groupId", iter_0.GetValue().groupId, 258U));
+                    VerifyOrReturn(CheckValuePresent("groupTable[0].groupName", iter_0.GetValue().groupName));
+                    VerifyOrReturn(CheckValueAsString("groupTable[0].groupName.Value()", iter_0.GetValue().groupName.Value(),
+                                                      chip::CharSpan("Group #2", 8)));
+                    VerifyOrReturn(CheckValue("groupTable[0].fabricIndex", iter_0.GetValue().fabricIndex, 1));
+                    VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("groupTable", iter_0, 1));
+                }
+            }
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "Read maxGroupsPerFabric");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                                 GroupKeyManagement::Attributes::MaxGroupsPerFabric::Id, true, chip::NullOptional);
+        }
+        case 2: {
+            LogStep(2, "Read maxGroupKeysPerFabric");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                                 GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id, true, chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "Add Group 1");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 257U;
+            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+
+            );
+        }
+        case 4: {
+            LogStep(4, "Add Group 2");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 258U;
+            value.groupName = chip::Span<const char>("Group #2garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+
+            );
+        }
+        case 5: {
+            LogStep(5, "KeySet Write 1");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 417U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+
+            );
+        }
+        case 6: {
+            LogStep(6, "KeySet Write 2");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 418U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(1);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 2110000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 2110001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 2110002ULL;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+
+            );
+        }
+        case 7: {
+            LogStep(7, "KeySet Read");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value;
+            value.groupKeySetID = 417U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Commands::KeySetRead::Id,
+                               value, chip::NullOptional
+
+            );
+        }
+        case 8: {
+            LogStep(8, "Write Group Keys (invalid)");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
 
@@ -63878,43 +66221,1570 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
             );
         }
         case 15: {
-            LogStep(15, "Remove All");
+            LogStep(15, "Remove Group 1");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
+            value.groupId = 257U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
+                               chip::NullOptional
+
+            );
+        }
+        case 16: {
+            LogStep(16, "Read GroupTable 2");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                                 GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional);
+        }
+        case 17: {
+            LogStep(17, "Remove All");
             ListFreer listFreer;
             chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value,
                                chip::NullOptional
 
-            );
+            );
+        }
+        case 18: {
+            LogStep(18, "KeySet Remove 2");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value;
+            value.groupKeySetID = 418U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetRemove::Id, value, chip::NullOptional
+
+            );
+        }
+        case 19: {
+            LogStep(19, "KeySet Read (also removed)");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value;
+            value.groupKeySetID = 418U;
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Commands::KeySetRead::Id,
+                               value, chip::NullOptional
+
+            );
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_5Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_5", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_5Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_6Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_6", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_6Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_7Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_7", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_7Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_8Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_8", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_8Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_9Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_9", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_9Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_10Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_10", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_10Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_11Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_11", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_11Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_12Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_12", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_12Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_13Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_13", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_13Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_14Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_14", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_14Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_1_15Suite : public TestCommand
+{
+public:
+    Test_TC_DD_1_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_15", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_1_15Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_2_1Suite : public TestCommand
+{
+public:
+    Test_TC_DD_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_2_1", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_2_1Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_2_2Suite : public TestCommand
+{
+public:
+    Test_TC_DD_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_2_2", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_2_2Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_1Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_1", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_1Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_2Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_2", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_2Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_3Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_3", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_3Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_4Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_4", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_4Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_5Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_5", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_5Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_6Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_6", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_6Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_7Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_7", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_7Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_8Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_8", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_8Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_9Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_9", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_9Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_10Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_10", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_10Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_11Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_11", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_11Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_12Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_12", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_12Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_13Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_13", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_13Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DD_3_14Suite : public TestCommand
+{
+public:
+    Test_TC_DD_3_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_14", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_DD_3_14Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
-        case 16: {
-            LogStep(16, "KeySet Remove 2");
-            ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value;
-            value.groupKeySetID = 418U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                               GroupKeyManagement::Commands::KeySetRemove::Id, value, chip::NullOptional
 
-            );
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
         }
-        case 17: {
-            LogStep(17, "KeySet Read (also removed)");
-            ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value;
-            value.groupKeySetID = 418U;
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Commands::KeySetRead::Id,
-                               value, chip::NullOptional
+    }
 
-            );
-        }
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_5Suite : public TestCommand
+class Test_TC_DD_3_15Suite : public TestCommand
 {
 public:
-    Test_TC_DD_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_5", 1, credsIssuerConfig)
+    Test_TC_DD_3_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_15", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -63922,7 +67792,7 @@ class Test_TC_DD_1_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_5Suite() {}
+    ~Test_TC_DD_3_15Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -63947,10 +67817,6 @@ class Test_TC_DD_1_5Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -63966,25 +67832,15 @@ class Test_TC_DD_1_5Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Step 1");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>(
-                "Verify that the onboarding payload for NFC tags SHALL use NDEF URI Record Type Definition as defined by NFC Forum "
-                "in URI Record Type Definition RTD URIgarbage: not in length on purpose",
-                151);
-            return Log(kIdentityAlpha, value);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_6Suite : public TestCommand
+class Test_TC_DD_3_16Suite : public TestCommand
 {
 public:
-    Test_TC_DD_1_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_6", 3, credsIssuerConfig)
+    Test_TC_DD_3_16Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_16", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -63992,7 +67848,7 @@ class Test_TC_DD_1_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_6Suite() {}
+    ~Test_TC_DD_3_16Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64017,18 +67873,6 @@ class Test_TC_DD_1_6Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -64044,41 +67888,15 @@ class Test_TC_DD_1_6Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Step 1");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message =
-                chip::Span<const char>("Scan the DUTs QR code using a QR code readergarbage: not in length on purpose", 44);
-            return Log(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Step 1 verification");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message =
-                chip::Span<const char>("Verify the QR code gets scanned successfully and the QR code must be of sufficient size "
-                                       "and contrast respective to surface material as to be readable with standard readers such "
-                                       "as smartphones in normal lighting conditionsgarbage: not in length on purpose",
-                                       221);
-            return Log(kIdentityAlpha, value);
-        }
-        case 2: {
-            LogStep(2, "Step 2 verificaiton");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Verify QR code version is 1 or highergarbage: not in length on purpose", 37);
-            return Log(kIdentityAlpha, value);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_7Suite : public TestCommand
+class Test_TC_DD_3_17Suite : public TestCommand
 {
 public:
-    Test_TC_DD_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_7", 2, credsIssuerConfig)
+    Test_TC_DD_3_17Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_17", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64086,7 +67904,7 @@ class Test_TC_DD_1_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_7Suite() {}
+    ~Test_TC_DD_3_17Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64111,14 +67929,6 @@ class Test_TC_DD_1_7Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -64134,34 +67944,15 @@ class Test_TC_DD_1_7Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Precondition");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Verify manual pairing code is printed on the device or in additional provided "
-                                                   "materialsgarbage: not in length on purpose",
-                                                   87);
-            return Log(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Step 1");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message =
-                chip::Span<const char>("Verify that the Manual Pairing Code should be printed using a minimum font size of 6 "
-                                       "points typically producing a typeface height of 2.1 mmgarbage: not in length on purpose",
-                                       139);
-            return Log(kIdentityAlpha, value);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_8Suite : public TestCommand
+class Test_TC_DD_3_18Suite : public TestCommand
 {
 public:
-    Test_TC_DD_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_8", 2, credsIssuerConfig)
+    Test_TC_DD_3_18Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_18", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64169,7 +67960,7 @@ class Test_TC_DD_1_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_8Suite() {}
+    ~Test_TC_DD_3_18Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64194,14 +67985,6 @@ class Test_TC_DD_1_8Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -64217,31 +68000,15 @@ class Test_TC_DD_1_8Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Step 1");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Scan the device QR code using DUTgarbage: not in length on purpose", 33);
-            return Log(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Step 1 verification");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Verify the DUT is able to scan and parse the QR code successfully to onboard "
-                                                   "the device onto the CHIP networkgarbage: not in length on purpose",
-                                                   109);
-            return Log(kIdentityAlpha, value);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_9Suite : public TestCommand
+class Test_TC_DD_3_19Suite : public TestCommand
 {
 public:
-    Test_TC_DD_1_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_9", 3, credsIssuerConfig)
+    Test_TC_DD_3_19Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_19", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64249,7 +68016,7 @@ class Test_TC_DD_1_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_9Suite() {}
+    ~Test_TC_DD_3_19Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64274,18 +68041,6 @@ class Test_TC_DD_1_9Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -64301,42 +68056,15 @@ class Test_TC_DD_1_9Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Precondition");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Verify that the manual pairing code is printed on the device or in additional "
-                                                   "provided materialsgarbage: not in length on purpose",
-                                                   96);
-            return Log(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Step 1");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Provide the 11 digit or 21 digit pairing code from the Device in text speech "
-                                                   "or any format supported by DUTgarbage: not in length on purpose",
-                                                   107);
-            return Log(kIdentityAlpha, value);
-        }
-        case 2: {
-            LogStep(2, "Step 1 verification");
-            ListFreer listFreer;
-            chip::app::Clusters::LogCommands::Commands::Log::Type value;
-            value.message = chip::Span<const char>("Verify that the manual pairing code can be provided to DUT and parsed to "
-                                                   "onboard the device onto the CHIP networkgarbage: not in length on purpose",
-                                                   113);
-            return Log(kIdentityAlpha, value);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_10Suite : public TestCommand
+class Test_TC_DD_3_20Suite : public TestCommand
 {
 public:
-    Test_TC_DD_1_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_10", 0, credsIssuerConfig)
+    Test_TC_DD_3_20Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_20", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64344,7 +68072,7 @@ class Test_TC_DD_1_10Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_10Suite() {}
+    ~Test_TC_DD_3_20Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64389,10 +68117,11 @@ class Test_TC_DD_1_10Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_1_11Suite : public TestCommand
+class TestGroupDemoCommandSuite : public TestCommand
 {
 public:
-    Test_TC_DD_1_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_11", 0, credsIssuerConfig)
+    TestGroupDemoCommandSuite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("TestGroupDemoCommand", 21, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64400,7 +68129,7 @@ class Test_TC_DD_1_11Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_11Suite() {}
+    ~TestGroupDemoCommandSuite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64425,6 +68154,80 @@ class Test_TC_DD_1_11Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -64440,15 +68243,153 @@ class Test_TC_DD_1_11Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "Turn On the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+        }
+        case 2: {
+            LogStep(2, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 3: {
+            LogStep(3, "Turn Off the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::Off::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
+        }
+        case 4: {
+            LogStep(4, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "Turn On the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+        }
+        case 6: {
+            LogStep(6, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 7: {
+            LogStep(7, "Turn Off the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::Off::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
+        }
+        case 8: {
+            LogStep(8, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 9: {
+            LogStep(9, "Turn On the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+        }
+        case 10: {
+            LogStep(10, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 11: {
+            LogStep(11, "Turn Off the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::Off::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
+        }
+        case 12: {
+            LogStep(12, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 13: {
+            LogStep(13, "Turn On the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+        }
+        case 14: {
+            LogStep(14, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 15: {
+            LogStep(15, "Turn Off the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::Off::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
+        }
+        case 16: {
+            LogStep(16, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 17: {
+            LogStep(17, "Turn On the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::On::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
+        }
+        case 18: {
+            LogStep(18, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
+        case 19: {
+            LogStep(19, "Turn Off the light to see attribute change");
+            ListFreer listFreer;
+            chip::app::Clusters::OnOff::Commands::Off::Type value;
+            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
+        }
+        case 20: {
+            LogStep(20, "Wait 100ms");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+            value.ms = 1000UL;
+            return WaitForMs(kIdentityAlpha, value);
+        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_1_12Suite : public TestCommand
+class TestGroupDemoConfigSuite : public TestCommand
 {
 public:
-    Test_TC_DD_1_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_12", 0, credsIssuerConfig)
+    TestGroupDemoConfigSuite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("TestGroupDemoConfig", 5, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64456,7 +68397,7 @@ class Test_TC_DD_1_12Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_1_12Suite() {}
+    ~TestGroupDemoConfigSuite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64481,6 +68422,29 @@ class Test_TC_DD_1_12Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("status", value.status, 0));
+
+                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
+            }
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -64496,15 +68460,120 @@ class Test_TC_DD_1_12Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "Add Group 1 - endpoint 1");
+            ListFreer listFreer;
+            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
+            value.groupId   = 257U;
+            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
+            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
+
+            );
+        }
+        case 2: {
+            LogStep(2, "KeySet Write 1");
+            ListFreer listFreer;
+            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
+
+            value.groupKeySet.groupKeySetID = 417U;
+            value.groupKeySet.groupKeySecurityPolicy =
+                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
+            value.groupKeySet.epochKey0.SetNonNull();
+            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime0.SetNonNull();
+            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
+            value.groupKeySet.epochKey1.SetNonNull();
+            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime1.SetNonNull();
+            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
+            value.groupKeySet.epochKey2.SetNonNull();
+            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
+                chip::Uint8::from_const_char(
+                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
+                16);
+            value.groupKeySet.epochStartTime2.SetNonNull();
+            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
+
+            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
+
+            );
+        }
+        case 3: {
+            LogStep(3, "Map Group Key Set to group ID on a given fabric");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(1);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].groupId       = 257U;
+                listHolder_0->mList[0].groupKeySetID = 417U;
+                listHolder_0->mList[0].fabricIndex   = 1;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(
+                    listHolder_0->mList, 1);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+                                  GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional);
+        }
+        case 4: {
+            LogStep(4, "Install ACLs for test");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(2);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
+                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
+                listHolder_0->mList[0].subjects.SetNull();
+                listHolder_0->mList[0].targets.SetNull();
+                listHolder_0->mList[0].fabricIndex = 1;
+
+                listHolder_0->mList[1].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(3);
+                listHolder_0->mList[1].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(3);
+                listHolder_0->mList[1].subjects.SetNonNull();
+
+                {
+                    auto * listHolder_3 = new ListHolder<uint64_t>(1);
+                    listFreer.add(listHolder_3);
+                    listHolder_3->mList[0]                  = 257ULL;
+                    listHolder_0->mList[1].subjects.Value() = chip::app::DataModel::List<uint64_t>(listHolder_3->mList, 1);
+                }
+                listHolder_0->mList[1].targets.SetNull();
+                listHolder_0->mList[1].fabricIndex = 1;
+
+                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
+                    listHolder_0->mList, 2);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DD_2_1Suite : public TestCommand
+class Test_TC_GR_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_2_1", 0, credsIssuerConfig)
+    Test_TC_GR_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GR_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64512,7 +68581,7 @@ class Test_TC_DD_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_2_1Suite() {}
+    ~Test_TC_GR_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64557,10 +68626,10 @@ class Test_TC_DD_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_2_2Suite : public TestCommand
+class Test_TC_GR_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_2_2", 0, credsIssuerConfig)
+    Test_TC_GR_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GR_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64568,7 +68637,7 @@ class Test_TC_DD_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_2_2Suite() {}
+    ~Test_TC_GR_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64613,10 +68682,10 @@ class Test_TC_DD_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_1Suite : public TestCommand
+class Test_TC_GR_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_1", 0, credsIssuerConfig)
+    Test_TC_GR_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GR_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64624,7 +68693,7 @@ class Test_TC_DD_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_1Suite() {}
+    ~Test_TC_GR_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64669,10 +68738,10 @@ class Test_TC_DD_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_2Suite : public TestCommand
+class Test_TC_GR_2_3Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_2", 0, credsIssuerConfig)
+    Test_TC_GR_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GR_2_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64680,7 +68749,7 @@ class Test_TC_DD_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_2Suite() {}
+    ~Test_TC_GR_2_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64725,10 +68794,10 @@ class Test_TC_DD_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_3Suite : public TestCommand
+class Test_TC_GR_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_3", 0, credsIssuerConfig)
+    Test_TC_GR_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GR_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64736,7 +68805,7 @@ class Test_TC_DD_3_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_3Suite() {}
+    ~Test_TC_GR_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64781,10 +68850,10 @@ class Test_TC_DD_3_3Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_4Suite : public TestCommand
+class Test_TC_GR_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_4", 0, credsIssuerConfig)
+    Test_TC_GR_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GR_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64792,7 +68861,7 @@ class Test_TC_DD_3_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_4Suite() {}
+    ~Test_TC_GR_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64837,10 +68906,10 @@ class Test_TC_DD_3_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_5Suite : public TestCommand
+class Test_TC_BDX_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_5", 0, credsIssuerConfig)
+    Test_TC_BDX_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64848,7 +68917,7 @@ class Test_TC_DD_3_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_5Suite() {}
+    ~Test_TC_BDX_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64893,10 +68962,10 @@ class Test_TC_DD_3_5Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_6Suite : public TestCommand
+class Test_TC_BDX_1_4Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_6", 0, credsIssuerConfig)
+    Test_TC_BDX_1_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64904,7 +68973,7 @@ class Test_TC_DD_3_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_6Suite() {}
+    ~Test_TC_BDX_1_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -64949,10 +69018,10 @@ class Test_TC_DD_3_6Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_7Suite : public TestCommand
+class Test_TC_BDX_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_7", 0, credsIssuerConfig)
+    Test_TC_BDX_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -64960,7 +69029,7 @@ class Test_TC_DD_3_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_7Suite() {}
+    ~Test_TC_BDX_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65005,10 +69074,10 @@ class Test_TC_DD_3_7Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_8Suite : public TestCommand
+class Test_TC_BDX_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_8", 0, credsIssuerConfig)
+    Test_TC_BDX_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65016,7 +69085,7 @@ class Test_TC_DD_3_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_8Suite() {}
+    ~Test_TC_BDX_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65061,10 +69130,10 @@ class Test_TC_DD_3_8Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_9Suite : public TestCommand
+class Test_TC_BR_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_9", 0, credsIssuerConfig)
+    Test_TC_BR_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65072,7 +69141,7 @@ class Test_TC_DD_3_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_9Suite() {}
+    ~Test_TC_BR_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65117,10 +69186,10 @@ class Test_TC_DD_3_9Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_10Suite : public TestCommand
+class Test_TC_BR_2Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_10", 0, credsIssuerConfig)
+    Test_TC_BR_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65128,7 +69197,7 @@ class Test_TC_DD_3_10Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_10Suite() {}
+    ~Test_TC_BR_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65173,10 +69242,10 @@ class Test_TC_DD_3_10Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_11Suite : public TestCommand
+class Test_TC_BR_3Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_11", 0, credsIssuerConfig)
+    Test_TC_BR_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65184,7 +69253,7 @@ class Test_TC_DD_3_11Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_11Suite() {}
+    ~Test_TC_BR_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65229,10 +69298,10 @@ class Test_TC_DD_3_11Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_12Suite : public TestCommand
+class Test_TC_BRAC_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_12", 0, credsIssuerConfig)
+    Test_TC_BRAC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65240,7 +69309,7 @@ class Test_TC_DD_3_12Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_12Suite() {}
+    ~Test_TC_BRAC_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65285,10 +69354,10 @@ class Test_TC_DD_3_12Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_13Suite : public TestCommand
+class Test_TC_BRAC_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_13", 0, credsIssuerConfig)
+    Test_TC_BRAC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65296,7 +69365,7 @@ class Test_TC_DD_3_13Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_13Suite() {}
+    ~Test_TC_BRAC_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65341,10 +69410,10 @@ class Test_TC_DD_3_13Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_3_14Suite : public TestCommand
+class Test_TC_BRAC_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_DD_3_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_3_14", 0, credsIssuerConfig)
+    Test_TC_BRAC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65352,7 +69421,7 @@ class Test_TC_DD_3_14Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_3_14Suite() {}
+    ~Test_TC_BRAC_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65397,10 +69466,10 @@ class Test_TC_DD_3_14Suite : public TestCommand
     }
 };
 
-class Test_TC_DD_4_1Suite : public TestCommand
+class Test_TC_DA_1_3Suite : public TestCommand
 {
 public:
-    Test_TC_DD_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_4_1", 0, credsIssuerConfig)
+    Test_TC_DA_1_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DA_1_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65408,7 +69477,7 @@ class Test_TC_DD_4_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DD_4_1Suite() {}
+    ~Test_TC_DA_1_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65453,11 +69522,10 @@ class Test_TC_DD_4_1Suite : public TestCommand
     }
 };
 
-class TestGroupDemoCommandSuite : public TestCommand
+class Test_TC_DM_1_1Suite : public TestCommand
 {
 public:
-    TestGroupDemoCommandSuite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("TestGroupDemoCommand", 21, credsIssuerConfig)
+    Test_TC_DM_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65465,7 +69533,7 @@ class TestGroupDemoCommandSuite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~TestGroupDemoCommandSuite() {}
+    ~Test_TC_DM_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65490,80 +69558,6 @@ class TestGroupDemoCommandSuite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -65579,153 +69573,15 @@ class TestGroupDemoCommandSuite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Turn On the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::On::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
-        }
-        case 2: {
-            LogStep(2, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 3: {
-            LogStep(3, "Turn Off the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::Off::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
-        }
-        case 4: {
-            LogStep(4, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 5: {
-            LogStep(5, "Turn On the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::On::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
-        }
-        case 6: {
-            LogStep(6, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 7: {
-            LogStep(7, "Turn Off the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::Off::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
-        }
-        case 8: {
-            LogStep(8, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 9: {
-            LogStep(9, "Turn On the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::On::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
-        }
-        case 10: {
-            LogStep(10, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 11: {
-            LogStep(11, "Turn Off the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::Off::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
-        }
-        case 12: {
-            LogStep(12, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 13: {
-            LogStep(13, "Turn On the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::On::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
-        }
-        case 14: {
-            LogStep(14, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 15: {
-            LogStep(15, "Turn Off the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::Off::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
-        }
-        case 16: {
-            LogStep(16, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 17: {
-            LogStep(17, "Turn On the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::On::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::On::Id, value);
-        }
-        case 18: {
-            LogStep(18, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
-        case 19: {
-            LogStep(19, "Turn Off the light to see attribute change");
-            ListFreer listFreer;
-            chip::app::Clusters::OnOff::Commands::Off::Type value;
-            return SendGroupCommand(kIdentityAlpha, 257, OnOff::Id, OnOff::Commands::Off::Id, value);
-        }
-        case 20: {
-            LogStep(20, "Wait 100ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 1000UL;
-            return WaitForMs(kIdentityAlpha, value);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class TestGroupDemoConfigSuite : public TestCommand
+class Test_TC_DM_1_2Suite : public TestCommand
 {
 public:
-    TestGroupDemoConfigSuite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("TestGroupDemoConfig", 5, credsIssuerConfig)
+    Test_TC_DM_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65733,7 +69589,7 @@ class TestGroupDemoConfigSuite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~TestGroupDemoConfigSuite() {}
+    ~Test_TC_DM_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65758,29 +69614,6 @@ class TestGroupDemoConfigSuite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            shouldContinue = true;
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("status", value.status, 0));
-
-                VerifyOrReturn(CheckValue("groupId", value.groupId, 257U));
-            }
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -65796,120 +69629,15 @@ class TestGroupDemoConfigSuite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
-        case 0: {
-            LogStep(0, "Wait for the commissioned device to be retrieved");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-            return WaitForCommissionee(kIdentityAlpha, value);
-        }
-        case 1: {
-            LogStep(1, "Add Group 1 - endpoint 1");
-            ListFreer listFreer;
-            chip::app::Clusters::Groups::Commands::AddGroup::Type value;
-            value.groupId   = 257U;
-            value.groupName = chip::Span<const char>("Group #1garbage: not in length on purpose", 8);
-            return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::AddGroup::Id, value, chip::NullOptional
-
-            );
-        }
-        case 2: {
-            LogStep(2, "KeySet Write 1");
-            ListFreer listFreer;
-            chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
-
-            value.groupKeySet.groupKeySetID = 417U;
-            value.groupKeySet.groupKeySecurityPolicy =
-                static_cast<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy>(0);
-            value.groupKeySet.epochKey0.SetNonNull();
-            value.groupKeySet.epochKey0.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime0.SetNonNull();
-            value.groupKeySet.epochStartTime0.Value() = 1110000ULL;
-            value.groupKeySet.epochKey1.SetNonNull();
-            value.groupKeySet.epochKey1.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime1.SetNonNull();
-            value.groupKeySet.epochStartTime1.Value() = 1110001ULL;
-            value.groupKeySet.epochKey2.SetNonNull();
-            value.groupKeySet.epochKey2.Value() = chip::ByteSpan(
-                chip::Uint8::from_const_char(
-                    "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317garbage: not in length on purpose"),
-                16);
-            value.groupKeySet.epochStartTime2.SetNonNull();
-            value.groupKeySet.epochStartTime2.Value() = 1110002ULL;
-
-            return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                               GroupKeyManagement::Commands::KeySetWrite::Id, value, chip::NullOptional
-
-            );
-        }
-        case 3: {
-            LogStep(3, "Map Group Key Set to group ID on a given fabric");
-            ListFreer listFreer;
-            chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
-
-            {
-                auto * listHolder_0 = new ListHolder<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(1);
-                listFreer.add(listHolder_0);
-
-                listHolder_0->mList[0].groupId       = 257U;
-                listHolder_0->mList[0].groupKeySetID = 417U;
-                listHolder_0->mList[0].fabricIndex   = 1;
-
-                value = chip::app::DataModel::List<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>(
-                    listHolder_0->mList, 1);
-            }
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
-                                  GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional);
-        }
-        case 4: {
-            LogStep(4, "Install ACLs for test");
-            ListFreer listFreer;
-            chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> value;
-
-            {
-                auto * listHolder_0 = new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(2);
-                listFreer.add(listHolder_0);
-
-                listHolder_0->mList[0].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(5);
-                listHolder_0->mList[0].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(2);
-                listHolder_0->mList[0].subjects.SetNull();
-                listHolder_0->mList[0].targets.SetNull();
-                listHolder_0->mList[0].fabricIndex = 1;
-
-                listHolder_0->mList[1].privilege = static_cast<chip::app::Clusters::AccessControl::Privilege>(3);
-                listHolder_0->mList[1].authMode  = static_cast<chip::app::Clusters::AccessControl::AuthMode>(3);
-                listHolder_0->mList[1].subjects.SetNonNull();
-
-                {
-                    auto * listHolder_3 = new ListHolder<uint64_t>(1);
-                    listFreer.add(listHolder_3);
-                    listHolder_3->mList[0]                  = 257ULL;
-                    listHolder_0->mList[1].subjects.Value() = chip::app::DataModel::List<uint64_t>(listHolder_3->mList, 1);
-                }
-                listHolder_0->mList[1].targets.SetNull();
-                listHolder_0->mList[1].fabricIndex = 1;
-
-                value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>(
-                    listHolder_0->mList, 2);
-            }
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value,
-                                  chip::NullOptional, chip::NullOptional);
-        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_BDX_1_1Suite : public TestCommand
+class Test_TC_DM_1_3Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_1", 0, credsIssuerConfig)
+    Test_TC_DM_1_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65917,7 +69645,7 @@ class Test_TC_BDX_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_1_1Suite() {}
+    ~Test_TC_DM_1_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65962,10 +69690,10 @@ class Test_TC_BDX_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_1_2Suite : public TestCommand
+class Test_TC_DM_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_2", 0, credsIssuerConfig)
+    Test_TC_DM_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_2", 13, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -65973,7 +69701,7 @@ class Test_TC_BDX_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_1_2Suite() {}
+    ~Test_TC_DM_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -65986,6 +69714,8 @@ class Test_TC_BDX_1_2Suite : public TestCommand
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
+    uint32_t SoftwareVersionValue;
+
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
     //
@@ -65998,6 +69728,75 @@ class Test_TC_BDX_1_2Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint8"));
+                SoftwareVersionValue = value;
+            }
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                bool value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "bool"));
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("softwareVersion", value, SoftwareVersionValue));
+            }
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                bool value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "bool"));
+            }
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -66013,71 +69812,94 @@ class Test_TC_BDX_1_2Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
         }
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_BDX_1_3Suite : public TestCommand
-{
-public:
-    Test_TC_BDX_1_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_3", 0, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_BDX_1_3Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        case 1: {
+            LogStep(1, "Query SoftwareVersion");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersion::Id, true,
+                                 chip::NullOptional);
         }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        case 2: {
+            LogStep(2, "Query Reachable Fabrics");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::Reachable::Id, true,
+                                 chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "Reboot target device");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+            return Reboot(kIdentityAlpha, value);
+        }
+        case 4: {
+            LogStep(4, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "Query SoftwareVersion");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersion::Id, true,
+                                 chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "Reboot target device");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+            return Reboot(kIdentityAlpha, value);
+        }
+        case 7: {
+            LogStep(7, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 8: {
+            LogStep(8, "Factory Reset the accessory");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::FactoryReset::Type value;
+            return FactoryReset(kIdentityAlpha, value);
+        }
+        case 9: {
+            LogStep(9, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 10: {
+            LogStep(10, "Reboot target device");
+            ListFreer listFreer;
+            chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+            return Reboot(kIdentityAlpha, value);
+        }
+        case 11: {
+            LogStep(11, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 12: {
+            LogStep(12, "Query Reachable Fabrics");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Basic::Id, Basic::Attributes::Reachable::Id, true,
+                                 chip::NullOptional);
         }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_BDX_1_4Suite : public TestCommand
+class Test_TC_DM_2_4Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_1_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_4", 0, credsIssuerConfig)
+    Test_TC_DM_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66085,7 +69907,7 @@ class Test_TC_BDX_1_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_1_4Suite() {}
+    ~Test_TC_DM_2_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66130,10 +69952,10 @@ class Test_TC_BDX_1_4Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_1_5Suite : public TestCommand
+class Test_TC_DM_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_5", 0, credsIssuerConfig)
+    Test_TC_DM_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66141,7 +69963,7 @@ class Test_TC_BDX_1_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_1_5Suite() {}
+    ~Test_TC_DM_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66186,10 +70008,10 @@ class Test_TC_BDX_1_5Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_1_6Suite : public TestCommand
+class Test_TC_DM_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_1_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_6", 0, credsIssuerConfig)
+    Test_TC_DM_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66197,7 +70019,7 @@ class Test_TC_BDX_1_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_1_6Suite() {}
+    ~Test_TC_DM_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66242,10 +70064,10 @@ class Test_TC_BDX_1_6Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_2_1Suite : public TestCommand
+class Test_TC_DM_3_3Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_1", 0, credsIssuerConfig)
+    Test_TC_DM_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66253,7 +70075,7 @@ class Test_TC_BDX_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_2_1Suite() {}
+    ~Test_TC_DM_3_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66298,10 +70120,10 @@ class Test_TC_BDX_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_2_2Suite : public TestCommand
+class Test_TC_DM_3_4Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_2", 0, credsIssuerConfig)
+    Test_TC_DM_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66309,7 +70131,7 @@ class Test_TC_BDX_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_2_2Suite() {}
+    ~Test_TC_DM_3_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66354,10 +70176,10 @@ class Test_TC_BDX_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_2_3Suite : public TestCommand
+class Test_TC_DM_4_1Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_3", 0, credsIssuerConfig)
+    Test_TC_DM_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66365,7 +70187,7 @@ class Test_TC_BDX_2_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_2_3Suite() {}
+    ~Test_TC_DM_4_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66410,10 +70232,10 @@ class Test_TC_BDX_2_3Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_2_4Suite : public TestCommand
+class Test_TC_DM_4_2Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_4", 0, credsIssuerConfig)
+    Test_TC_DM_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66421,7 +70243,7 @@ class Test_TC_BDX_2_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_2_4Suite() {}
+    ~Test_TC_DM_4_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66466,10 +70288,10 @@ class Test_TC_BDX_2_4Suite : public TestCommand
     }
 };
 
-class Test_TC_BDX_2_5Suite : public TestCommand
+class Test_TC_DM_4_3Suite : public TestCommand
 {
 public:
-    Test_TC_BDX_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_5", 0, credsIssuerConfig)
+    Test_TC_DM_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66477,7 +70299,7 @@ class Test_TC_BDX_2_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BDX_2_5Suite() {}
+    ~Test_TC_DM_4_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66522,10 +70344,10 @@ class Test_TC_BDX_2_5Suite : public TestCommand
     }
 };
 
-class Test_TC_BR_1Suite : public TestCommand
+class Test_TC_DM_4_4Suite : public TestCommand
 {
 public:
-    Test_TC_BR_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_1", 0, credsIssuerConfig)
+    Test_TC_DM_4_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66533,7 +70355,7 @@ class Test_TC_BR_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BR_1Suite() {}
+    ~Test_TC_DM_4_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66578,10 +70400,10 @@ class Test_TC_BR_1Suite : public TestCommand
     }
 };
 
-class Test_TC_BR_2Suite : public TestCommand
+class Test_TC_DM_4_5Suite : public TestCommand
 {
 public:
-    Test_TC_BR_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_2", 0, credsIssuerConfig)
+    Test_TC_DM_4_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_5", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66589,7 +70411,7 @@ class Test_TC_BR_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BR_2Suite() {}
+    ~Test_TC_DM_4_5Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66634,10 +70456,10 @@ class Test_TC_BR_2Suite : public TestCommand
     }
 };
 
-class Test_TC_BR_3Suite : public TestCommand
+class Test_TC_DM_4_6Suite : public TestCommand
 {
 public:
-    Test_TC_BR_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_3", 0, credsIssuerConfig)
+    Test_TC_DM_4_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_6", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66645,7 +70467,7 @@ class Test_TC_BR_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BR_3Suite() {}
+    ~Test_TC_DM_4_6Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66690,10 +70512,10 @@ class Test_TC_BR_3Suite : public TestCommand
     }
 };
 
-class Test_TC_BRAC_2_1Suite : public TestCommand
+class Test_TC_DM_4_7Suite : public TestCommand
 {
 public:
-    Test_TC_BRAC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_2_1", 0, credsIssuerConfig)
+    Test_TC_DM_4_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_7", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66701,7 +70523,7 @@ class Test_TC_BRAC_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BRAC_2_1Suite() {}
+    ~Test_TC_DM_4_7Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66746,10 +70568,10 @@ class Test_TC_BRAC_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_BRAC_2_2Suite : public TestCommand
+class Test_TC_DM_4_8Suite : public TestCommand
 {
 public:
-    Test_TC_BRAC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_2_2", 0, credsIssuerConfig)
+    Test_TC_DM_4_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_8", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66757,7 +70579,7 @@ class Test_TC_BRAC_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BRAC_2_2Suite() {}
+    ~Test_TC_DM_4_8Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66802,10 +70624,10 @@ class Test_TC_BRAC_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_BRAC_3_1Suite : public TestCommand
+class Test_TC_DM_4_9Suite : public TestCommand
 {
 public:
-    Test_TC_BRAC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_3_1", 0, credsIssuerConfig)
+    Test_TC_DM_4_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_9", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66813,7 +70635,7 @@ class Test_TC_BRAC_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_BRAC_3_1Suite() {}
+    ~Test_TC_DM_4_9Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66858,10 +70680,10 @@ class Test_TC_BRAC_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DA_1_3Suite : public TestCommand
+class Test_TC_DM_4_10Suite : public TestCommand
 {
 public:
-    Test_TC_DA_1_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DA_1_3", 0, credsIssuerConfig)
+    Test_TC_DM_4_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_10", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66869,7 +70691,7 @@ class Test_TC_DA_1_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DA_1_3Suite() {}
+    ~Test_TC_DM_4_10Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66914,10 +70736,10 @@ class Test_TC_DA_1_3Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_1_2Suite : public TestCommand
+class Test_TC_DM_4_11Suite : public TestCommand
 {
 public:
-    Test_TC_DM_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_2", 0, credsIssuerConfig)
+    Test_TC_DM_4_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_11", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66925,7 +70747,7 @@ class Test_TC_DM_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_1_2Suite() {}
+    ~Test_TC_DM_4_11Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -66970,10 +70792,10 @@ class Test_TC_DM_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_1_4Suite : public TestCommand
+class Test_TC_DM_4_12Suite : public TestCommand
 {
 public:
-    Test_TC_DM_1_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_4", 0, credsIssuerConfig)
+    Test_TC_DM_4_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_12", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -66981,7 +70803,7 @@ class Test_TC_DM_1_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_1_4Suite() {}
+    ~Test_TC_DM_4_12Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67026,10 +70848,10 @@ class Test_TC_DM_1_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_2_1Suite : public TestCommand
+class Test_TC_DM_4_13Suite : public TestCommand
 {
 public:
-    Test_TC_DM_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_1", 0, credsIssuerConfig)
+    Test_TC_DM_4_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_13", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67037,7 +70859,7 @@ class Test_TC_DM_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_2_1Suite() {}
+    ~Test_TC_DM_4_13Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67082,10 +70904,10 @@ class Test_TC_DM_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_2_4Suite : public TestCommand
+class Test_TC_DM_4_14Suite : public TestCommand
 {
 public:
-    Test_TC_DM_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_4", 0, credsIssuerConfig)
+    Test_TC_DM_4_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_14", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67093,7 +70915,7 @@ class Test_TC_DM_2_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_2_4Suite() {}
+    ~Test_TC_DM_4_14Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67138,10 +70960,10 @@ class Test_TC_DM_2_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_3_2Suite : public TestCommand
+class Test_TC_DM_4_15Suite : public TestCommand
 {
 public:
-    Test_TC_DM_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_2", 0, credsIssuerConfig)
+    Test_TC_DM_4_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_15", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67149,7 +70971,7 @@ class Test_TC_DM_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_3_2Suite() {}
+    ~Test_TC_DM_4_15Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67194,10 +71016,10 @@ class Test_TC_DM_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_3_4Suite : public TestCommand
+class Test_TC_DM_4_16Suite : public TestCommand
 {
 public:
-    Test_TC_DM_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_4", 0, credsIssuerConfig)
+    Test_TC_DM_4_16Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_16", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67205,7 +71027,7 @@ class Test_TC_DM_3_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_3_4Suite() {}
+    ~Test_TC_DM_4_16Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67250,10 +71072,10 @@ class Test_TC_DM_3_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_1Suite : public TestCommand
+class Test_TC_DM_4_17Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_1", 0, credsIssuerConfig)
+    Test_TC_DM_4_17Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_17", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67261,7 +71083,7 @@ class Test_TC_DM_4_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_1Suite() {}
+    ~Test_TC_DM_4_17Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67306,10 +71128,10 @@ class Test_TC_DM_4_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_2Suite : public TestCommand
+class Test_TC_DM_4_18Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_2", 0, credsIssuerConfig)
+    Test_TC_DM_4_18Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_18", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67317,7 +71139,7 @@ class Test_TC_DM_4_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_2Suite() {}
+    ~Test_TC_DM_4_18Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67362,10 +71184,10 @@ class Test_TC_DM_4_2Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_3Suite : public TestCommand
+class Test_TC_DM_4_19Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_3", 0, credsIssuerConfig)
+    Test_TC_DM_4_19Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_19", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67373,7 +71195,7 @@ class Test_TC_DM_4_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_3Suite() {}
+    ~Test_TC_DM_4_19Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67418,10 +71240,10 @@ class Test_TC_DM_4_3Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_4Suite : public TestCommand
+class Test_TC_DM_4_20Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_4", 0, credsIssuerConfig)
+    Test_TC_DM_4_20Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_20", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67429,7 +71251,7 @@ class Test_TC_DM_4_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_4Suite() {}
+    ~Test_TC_DM_4_20Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67474,10 +71296,10 @@ class Test_TC_DM_4_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_5Suite : public TestCommand
+class Test_TC_DM_4_21Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_5", 0, credsIssuerConfig)
+    Test_TC_DM_4_21Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_21", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67485,7 +71307,7 @@ class Test_TC_DM_4_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_5Suite() {}
+    ~Test_TC_DM_4_21Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67530,10 +71352,10 @@ class Test_TC_DM_4_5Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_6Suite : public TestCommand
+class Test_TC_DLOG_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_6", 0, credsIssuerConfig)
+    Test_TC_DLOG_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67541,7 +71363,7 @@ class Test_TC_DM_4_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_6Suite() {}
+    ~Test_TC_DLOG_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67586,10 +71408,10 @@ class Test_TC_DM_4_6Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_7Suite : public TestCommand
+class Test_TC_DLOG_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_7", 0, credsIssuerConfig)
+    Test_TC_DLOG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67597,7 +71419,7 @@ class Test_TC_DM_4_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_7Suite() {}
+    ~Test_TC_DLOG_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67642,10 +71464,10 @@ class Test_TC_DM_4_7Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_8Suite : public TestCommand
+class Test_TC_DLOG_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_8", 0, credsIssuerConfig)
+    Test_TC_DLOG_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67653,7 +71475,7 @@ class Test_TC_DM_4_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_8Suite() {}
+    ~Test_TC_DLOG_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67698,10 +71520,10 @@ class Test_TC_DM_4_8Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_9Suite : public TestCommand
+class Test_TC_DLOG_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_9", 0, credsIssuerConfig)
+    Test_TC_DLOG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67709,7 +71531,7 @@ class Test_TC_DM_4_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_9Suite() {}
+    ~Test_TC_DLOG_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67754,10 +71576,10 @@ class Test_TC_DM_4_9Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_10Suite : public TestCommand
+class Test_TC_DESC_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_10", 0, credsIssuerConfig)
+    Test_TC_DESC_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DESC_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67765,7 +71587,7 @@ class Test_TC_DM_4_10Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_10Suite() {}
+    ~Test_TC_DESC_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67810,10 +71632,10 @@ class Test_TC_DM_4_10Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_11Suite : public TestCommand
+class Test_TC_DESC_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_11", 0, credsIssuerConfig)
+    Test_TC_DESC_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DESC_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67821,7 +71643,7 @@ class Test_TC_DM_4_11Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_11Suite() {}
+    ~Test_TC_DESC_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67866,10 +71688,10 @@ class Test_TC_DM_4_11Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_12Suite : public TestCommand
+class Test_TC_DESC_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_12", 0, credsIssuerConfig)
+    Test_TC_DESC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DESC_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67877,7 +71699,7 @@ class Test_TC_DM_4_12Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_12Suite() {}
+    ~Test_TC_DESC_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67922,10 +71744,10 @@ class Test_TC_DM_4_12Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_13Suite : public TestCommand
+class Test_TC_DGETH_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_13", 0, credsIssuerConfig)
+    Test_TC_DGETH_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGETH_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67933,7 +71755,7 @@ class Test_TC_DM_4_13Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_13Suite() {}
+    ~Test_TC_DGETH_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -67978,10 +71800,10 @@ class Test_TC_DM_4_13Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_14Suite : public TestCommand
+class Test_TC_DGETH_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_14", 0, credsIssuerConfig)
+    Test_TC_DGETH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGETH_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -67989,7 +71811,7 @@ class Test_TC_DM_4_14Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_14Suite() {}
+    ~Test_TC_DGETH_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68034,10 +71856,10 @@ class Test_TC_DM_4_14Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_15Suite : public TestCommand
+class Test_TC_DGETH_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_15", 0, credsIssuerConfig)
+    Test_TC_DGETH_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGETH_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68045,7 +71867,7 @@ class Test_TC_DM_4_15Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_15Suite() {}
+    ~Test_TC_DGETH_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68090,10 +71912,10 @@ class Test_TC_DM_4_15Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_16Suite : public TestCommand
+class Test_TC_CGEN_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_16Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_16", 0, credsIssuerConfig)
+    Test_TC_CGEN_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CGEN_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68101,7 +71923,7 @@ class Test_TC_DM_4_16Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_16Suite() {}
+    ~Test_TC_CGEN_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68146,10 +71968,10 @@ class Test_TC_DM_4_16Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_17Suite : public TestCommand
+class Test_TC_CGEN_2_3Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_17Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_17", 0, credsIssuerConfig)
+    Test_TC_CGEN_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CGEN_2_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68157,7 +71979,7 @@ class Test_TC_DM_4_17Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_17Suite() {}
+    ~Test_TC_CGEN_2_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68202,10 +72024,10 @@ class Test_TC_DM_4_17Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_18Suite : public TestCommand
+class Test_TC_CGEN_2_4Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_18Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_18", 0, credsIssuerConfig)
+    Test_TC_CGEN_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CGEN_2_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68213,7 +72035,7 @@ class Test_TC_DM_4_18Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_18Suite() {}
+    ~Test_TC_CGEN_2_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68258,10 +72080,11 @@ class Test_TC_DM_4_18Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_19Suite : public TestCommand
+class Test_TC_GENDIAG_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_19Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_19", 0, credsIssuerConfig)
+    Test_TC_GENDIAG_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_GENDIAG_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68269,7 +72092,7 @@ class Test_TC_DM_4_19Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_19Suite() {}
+    ~Test_TC_GENDIAG_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68314,10 +72137,11 @@ class Test_TC_DM_4_19Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_20Suite : public TestCommand
+class Test_TC_GENDIAG_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_20Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_20", 0, credsIssuerConfig)
+    Test_TC_GENDIAG_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_GENDIAG_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68325,7 +72149,7 @@ class Test_TC_DM_4_20Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_20Suite() {}
+    ~Test_TC_GENDIAG_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68370,10 +72194,11 @@ class Test_TC_DM_4_20Suite : public TestCommand
     }
 };
 
-class Test_TC_DM_4_21Suite : public TestCommand
+class Test_TC_GENDIAG_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DM_4_21Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_4_21", 0, credsIssuerConfig)
+    Test_TC_GENDIAG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_GENDIAG_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68381,7 +72206,7 @@ class Test_TC_DM_4_21Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DM_4_21Suite() {}
+    ~Test_TC_GENDIAG_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68426,11 +72251,10 @@ class Test_TC_DM_4_21Suite : public TestCommand
     }
 };
 
-class Test_TC_Diag_Log_2_1Suite : public TestCommand
+class Test_TC_I_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_Diag_Log_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_Diag_Log_2_1", 0, credsIssuerConfig)
+    Test_TC_I_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_I_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68438,7 +72262,7 @@ class Test_TC_Diag_Log_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_Diag_Log_2_1Suite() {}
+    ~Test_TC_I_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68483,11 +72307,10 @@ class Test_TC_Diag_Log_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_Diag_Log_2_2Suite : public TestCommand
+class Test_TC_I_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_Diag_Log_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_Diag_Log_2_2", 0, credsIssuerConfig)
+    Test_TC_I_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_I_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68495,7 +72318,7 @@ class Test_TC_Diag_Log_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_Diag_Log_2_2Suite() {}
+    ~Test_TC_I_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68540,11 +72363,10 @@ class Test_TC_Diag_Log_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_Diag_Log_2_3Suite : public TestCommand
+class Test_TC_I_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_Diag_Log_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_Diag_Log_2_3", 0, credsIssuerConfig)
+    Test_TC_I_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_I_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68552,7 +72374,7 @@ class Test_TC_Diag_Log_2_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_Diag_Log_2_3Suite() {}
+    ~Test_TC_I_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68597,10 +72419,10 @@ class Test_TC_Diag_Log_2_3Suite : public TestCommand
     }
 };
 
-class Test_TC_DESC_1_1Suite : public TestCommand
+class Test_TC_ILL_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DESC_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DESC_1_1", 0, credsIssuerConfig)
+    Test_TC_ILL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ILL_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68608,7 +72430,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DESC_1_1Suite() {}
+    ~Test_TC_ILL_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68653,11 +72475,10 @@ class Test_TC_DESC_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_ETHDIAG_1_2Suite : public TestCommand
+class Test_TC_ILL_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_ETHDIAG_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_ETHDIAG_1_2", 0, credsIssuerConfig)
+    Test_TC_ILL_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ILL_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68665,7 +72486,7 @@ class Test_TC_ETHDIAG_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_ETHDIAG_1_2Suite() {}
+    ~Test_TC_ILL_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68710,10 +72531,10 @@ class Test_TC_ETHDIAG_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_GC_2_2Suite : public TestCommand
+class Test_TC_IDM_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_GC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GC_2_2", 0, credsIssuerConfig)
+    Test_TC_IDM_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68721,7 +72542,7 @@ class Test_TC_GC_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GC_2_2Suite() {}
+    ~Test_TC_IDM_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68766,10 +72587,10 @@ class Test_TC_GC_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_GC_2_3Suite : public TestCommand
+class Test_TC_IDM_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_GC_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GC_2_3", 0, credsIssuerConfig)
+    Test_TC_IDM_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68777,7 +72598,7 @@ class Test_TC_GC_2_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GC_2_3Suite() {}
+    ~Test_TC_IDM_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68822,10 +72643,10 @@ class Test_TC_GC_2_3Suite : public TestCommand
     }
 };
 
-class Test_TC_GC_2_4Suite : public TestCommand
+class Test_TC_IDM_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_GC_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_GC_2_4", 0, credsIssuerConfig)
+    Test_TC_IDM_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68833,7 +72654,7 @@ class Test_TC_GC_2_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GC_2_4Suite() {}
+    ~Test_TC_IDM_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68878,11 +72699,10 @@ class Test_TC_GC_2_4Suite : public TestCommand
     }
 };
 
-class Test_TC_GENDIAG_1_1Suite : public TestCommand
+class Test_TC_IDM_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_GENDIAG_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_GENDIAG_1_1", 0, credsIssuerConfig)
+    Test_TC_IDM_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68890,7 +72710,7 @@ class Test_TC_GENDIAG_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GENDIAG_1_1Suite() {}
+    ~Test_TC_IDM_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68935,11 +72755,10 @@ class Test_TC_GENDIAG_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_GENDIAG_1_2Suite : public TestCommand
+class Test_TC_IDM_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_GENDIAG_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_GENDIAG_1_2", 0, credsIssuerConfig)
+    Test_TC_IDM_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -68947,7 +72766,7 @@ class Test_TC_GENDIAG_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GENDIAG_1_2Suite() {}
+    ~Test_TC_IDM_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -68992,11 +72811,10 @@ class Test_TC_GENDIAG_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_GENDIAG_2_1Suite : public TestCommand
+class Test_TC_IDM_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_GENDIAG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_GENDIAG_2_1", 0, credsIssuerConfig)
+    Test_TC_IDM_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69004,7 +72822,7 @@ class Test_TC_GENDIAG_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_GENDIAG_2_1Suite() {}
+    ~Test_TC_IDM_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69049,10 +72867,10 @@ class Test_TC_GENDIAG_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_I_2_2Suite : public TestCommand
+class Test_TC_IDM_4_1Suite : public TestCommand
 {
 public:
-    Test_TC_I_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_I_2_2", 0, credsIssuerConfig)
+    Test_TC_IDM_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_4_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69060,7 +72878,7 @@ class Test_TC_I_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_I_2_2Suite() {}
+    ~Test_TC_IDM_4_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69105,10 +72923,10 @@ class Test_TC_I_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_I_3_1Suite : public TestCommand
+class Test_TC_IDM_4_2Suite : public TestCommand
 {
 public:
-    Test_TC_I_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_I_3_1", 0, credsIssuerConfig)
+    Test_TC_IDM_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_4_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69116,7 +72934,7 @@ class Test_TC_I_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_I_3_1Suite() {}
+    ~Test_TC_IDM_4_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69161,10 +72979,10 @@ class Test_TC_I_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_I_3_2Suite : public TestCommand
+class Test_TC_IDM_4_3Suite : public TestCommand
 {
 public:
-    Test_TC_I_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_I_3_2", 0, credsIssuerConfig)
+    Test_TC_IDM_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_4_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69172,7 +72990,7 @@ class Test_TC_I_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_I_3_2Suite() {}
+    ~Test_TC_IDM_4_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69217,10 +73035,10 @@ class Test_TC_I_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_ILL_2_2Suite : public TestCommand
+class Test_TC_IDM_5_1Suite : public TestCommand
 {
 public:
-    Test_TC_ILL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ILL_2_2", 0, credsIssuerConfig)
+    Test_TC_IDM_5_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_5_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69228,7 +73046,7 @@ class Test_TC_ILL_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_ILL_2_2Suite() {}
+    ~Test_TC_IDM_5_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69273,10 +73091,10 @@ class Test_TC_ILL_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_ILL_3_1Suite : public TestCommand
+class Test_TC_IDM_5_2Suite : public TestCommand
 {
 public:
-    Test_TC_ILL_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ILL_3_1", 0, credsIssuerConfig)
+    Test_TC_IDM_5_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_5_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69284,7 +73102,7 @@ class Test_TC_ILL_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_ILL_3_1Suite() {}
+    ~Test_TC_IDM_5_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69329,10 +73147,10 @@ class Test_TC_ILL_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_1_1Suite : public TestCommand
+class Test_TC_IDM_6_1Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_1_1", 0, credsIssuerConfig)
+    Test_TC_IDM_6_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69340,7 +73158,7 @@ class Test_TC_IDM_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_1_1Suite() {}
+    ~Test_TC_IDM_6_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69385,10 +73203,10 @@ class Test_TC_IDM_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_1_2Suite : public TestCommand
+class Test_TC_IDM_6_2Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_1_2", 0, credsIssuerConfig)
+    Test_TC_IDM_6_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69396,7 +73214,7 @@ class Test_TC_IDM_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_1_2Suite() {}
+    ~Test_TC_IDM_6_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69441,10 +73259,10 @@ class Test_TC_IDM_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_2_1Suite : public TestCommand
+class Test_TC_IDM_6_3Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_2_1", 0, credsIssuerConfig)
+    Test_TC_IDM_6_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69452,7 +73270,7 @@ class Test_TC_IDM_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_2_1Suite() {}
+    ~Test_TC_IDM_6_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69497,10 +73315,10 @@ class Test_TC_IDM_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_2_2Suite : public TestCommand
+class Test_TC_IDM_6_4Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_2_2", 0, credsIssuerConfig)
+    Test_TC_IDM_6_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69508,7 +73326,7 @@ class Test_TC_IDM_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_2_2Suite() {}
+    ~Test_TC_IDM_6_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69553,10 +73371,10 @@ class Test_TC_IDM_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_3_1Suite : public TestCommand
+class Test_TC_IDM_7_1Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_3_1", 0, credsIssuerConfig)
+    Test_TC_IDM_7_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_7_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69564,7 +73382,7 @@ class Test_TC_IDM_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_3_1Suite() {}
+    ~Test_TC_IDM_7_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69609,10 +73427,10 @@ class Test_TC_IDM_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_3_2Suite : public TestCommand
+class Test_TC_MC_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_3_2", 0, credsIssuerConfig)
+    Test_TC_MC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69620,7 +73438,7 @@ class Test_TC_IDM_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_3_2Suite() {}
+    ~Test_TC_MC_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69665,10 +73483,10 @@ class Test_TC_IDM_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_4_1Suite : public TestCommand
+class Test_TC_MC_3_7_1Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_4_1", 0, credsIssuerConfig)
+    Test_TC_MC_3_7_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_7_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69676,7 +73494,7 @@ class Test_TC_IDM_4_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_4_1Suite() {}
+    ~Test_TC_MC_3_7_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69721,10 +73539,10 @@ class Test_TC_IDM_4_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_4_2Suite : public TestCommand
+class Test_TC_MC_3_8_1Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_4_2", 0, credsIssuerConfig)
+    Test_TC_MC_3_8_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_8_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69732,7 +73550,7 @@ class Test_TC_IDM_4_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_4_2Suite() {}
+    ~Test_TC_MC_3_8_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69777,10 +73595,10 @@ class Test_TC_IDM_4_2Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_5_1Suite : public TestCommand
+class Test_TC_MC_3_9_1Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_5_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_5_1", 0, credsIssuerConfig)
+    Test_TC_MC_3_9_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_9_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69788,7 +73606,7 @@ class Test_TC_IDM_5_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_5_1Suite() {}
+    ~Test_TC_MC_3_9_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69833,10 +73651,10 @@ class Test_TC_IDM_5_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_5_2Suite : public TestCommand
+class Test_TC_MC_3_14Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_5_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_5_2", 0, credsIssuerConfig)
+    Test_TC_MC_3_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_14", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69844,7 +73662,7 @@ class Test_TC_IDM_5_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_5_2Suite() {}
+    ~Test_TC_MC_3_14Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69889,10 +73707,10 @@ class Test_TC_IDM_5_2Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_6_1Suite : public TestCommand
+class Test_TC_MC_3_15Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_6_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_1", 0, credsIssuerConfig)
+    Test_TC_MC_3_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_15", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69900,7 +73718,7 @@ class Test_TC_IDM_6_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_6_1Suite() {}
+    ~Test_TC_MC_3_15Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -69945,10 +73763,10 @@ class Test_TC_IDM_6_1Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_6_2Suite : public TestCommand
+class Test_TC_MC_3_16Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_6_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_2", 0, credsIssuerConfig)
+    Test_TC_MC_3_16Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_16", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -69956,7 +73774,7 @@ class Test_TC_IDM_6_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_6_2Suite() {}
+    ~Test_TC_MC_3_16Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -70001,10 +73819,10 @@ class Test_TC_IDM_6_2Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_6_3Suite : public TestCommand
+class Test_TC_MC_3_17Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_6_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_3", 0, credsIssuerConfig)
+    Test_TC_MC_3_17Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_17", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -70012,7 +73830,7 @@ class Test_TC_IDM_6_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_6_3Suite() {}
+    ~Test_TC_MC_3_17Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -70057,10 +73875,10 @@ class Test_TC_IDM_6_3Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_6_4Suite : public TestCommand
+class Test_TC_MC_4_1Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_6_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_6_4", 0, credsIssuerConfig)
+    Test_TC_MC_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_4_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -70068,7 +73886,7 @@ class Test_TC_IDM_6_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_6_4Suite() {}
+    ~Test_TC_MC_4_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -70113,10 +73931,10 @@ class Test_TC_IDM_6_4Suite : public TestCommand
     }
 };
 
-class Test_TC_IDM_7_1Suite : public TestCommand
+class Test_TC_MC_5_4Suite : public TestCommand
 {
 public:
-    Test_TC_IDM_7_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_IDM_7_1", 0, credsIssuerConfig)
+    Test_TC_MC_5_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_5_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -70124,7 +73942,7 @@ class Test_TC_IDM_7_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_IDM_7_1Suite() {}
+    ~Test_TC_MC_5_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -70169,10 +73987,10 @@ class Test_TC_IDM_7_1Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_2_2Suite : public TestCommand
+class Test_TC_MC_5_5Suite : public TestCommand
 {
 public:
-    Test_TC_MC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_2_2", 0, credsIssuerConfig)
+    Test_TC_MC_5_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_5_5", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -70180,7 +73998,7 @@ class Test_TC_MC_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_2_2Suite() {}
+    ~Test_TC_MC_5_5Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -70225,10 +74043,10 @@ class Test_TC_MC_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_4_1Suite : public TestCommand
+class Test_TC_MC_5_6Suite : public TestCommand
 {
 public:
-    Test_TC_MC_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_4_1", 0, credsIssuerConfig)
+    Test_TC_MC_5_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_5_6", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -70236,7 +74054,7 @@ class Test_TC_MC_4_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_4_1Suite() {}
+    ~Test_TC_MC_5_6Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71381,10 +75199,10 @@ class Test_TC_MC_6_4Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_8_2Suite : public TestCommand
+class Test_TC_MC_6_5Suite : public TestCommand
 {
 public:
-    Test_TC_MC_8_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_8_2", 0, credsIssuerConfig)
+    Test_TC_MC_6_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_6_5", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71392,7 +75210,7 @@ class Test_TC_MC_8_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_8_2Suite() {}
+    ~Test_TC_MC_6_5Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71437,10 +75255,10 @@ class Test_TC_MC_8_2Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_9_2Suite : public TestCommand
+class Test_TC_MC_6_7Suite : public TestCommand
 {
 public:
-    Test_TC_MC_9_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_9_2", 0, credsIssuerConfig)
+    Test_TC_MC_6_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_6_7", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71448,7 +75266,7 @@ class Test_TC_MC_9_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_9_2Suite() {}
+    ~Test_TC_MC_6_7Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71493,10 +75311,10 @@ class Test_TC_MC_9_2Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_10_2Suite : public TestCommand
+class Test_TC_MC_7_3Suite : public TestCommand
 {
 public:
-    Test_TC_MC_10_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_2", 0, credsIssuerConfig)
+    Test_TC_MC_7_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_7_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71504,7 +75322,7 @@ class Test_TC_MC_10_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_10_2Suite() {}
+    ~Test_TC_MC_7_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71549,10 +75367,10 @@ class Test_TC_MC_10_2Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_10_3Suite : public TestCommand
+class Test_TC_MC_7_4Suite : public TestCommand
 {
 public:
-    Test_TC_MC_10_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_3", 0, credsIssuerConfig)
+    Test_TC_MC_7_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_7_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71560,7 +75378,7 @@ class Test_TC_MC_10_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_10_3Suite() {}
+    ~Test_TC_MC_7_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71605,10 +75423,10 @@ class Test_TC_MC_10_3Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_10_4Suite : public TestCommand
+class Test_TC_MC_10_3Suite : public TestCommand
 {
 public:
-    Test_TC_MC_10_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_4", 0, credsIssuerConfig)
+    Test_TC_MC_10_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71616,7 +75434,7 @@ class Test_TC_MC_10_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_10_4Suite() {}
+    ~Test_TC_MC_10_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71717,10 +75535,10 @@ class Test_TC_MC_10_5Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_10_6Suite : public TestCommand
+class Test_TC_MC_10_7Suite : public TestCommand
 {
 public:
-    Test_TC_MC_10_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_6", 0, credsIssuerConfig)
+    Test_TC_MC_10_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_7", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71728,7 +75546,7 @@ class Test_TC_MC_10_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_10_6Suite() {}
+    ~Test_TC_MC_10_7Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71773,10 +75591,10 @@ class Test_TC_MC_10_6Suite : public TestCommand
     }
 };
 
-class Test_TC_MC_10_7Suite : public TestCommand
+class Test_TC_MC_11_1Suite : public TestCommand
 {
 public:
-    Test_TC_MC_10_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_10_7", 0, credsIssuerConfig)
+    Test_TC_MC_11_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_11_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71784,7 +75602,7 @@ class Test_TC_MC_10_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MC_10_7Suite() {}
+    ~Test_TC_MC_11_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71829,10 +75647,10 @@ class Test_TC_MC_10_7Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_1Suite : public TestCommand
+class Test_TC_MC_11_2Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_1", 0, credsIssuerConfig)
+    Test_TC_MC_11_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_11_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71840,7 +75658,7 @@ class Test_TC_MF_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MF_1_1Suite() {}
+    ~Test_TC_MC_11_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71885,10 +75703,10 @@ class Test_TC_MF_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_2Suite : public TestCommand
+class Test_TC_MC_12_1Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_2", 0, credsIssuerConfig)
+    Test_TC_MC_12_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_12_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71896,7 +75714,7 @@ class Test_TC_MF_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MF_1_2Suite() {}
+    ~Test_TC_MC_12_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71941,10 +75759,10 @@ class Test_TC_MF_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_7Suite : public TestCommand
+class Test_TC_MC_12_2Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_7", 0, credsIssuerConfig)
+    Test_TC_MC_12_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_12_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -71952,7 +75770,7 @@ class Test_TC_MF_1_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MF_1_7Suite() {}
+    ~Test_TC_MC_12_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -71997,10 +75815,10 @@ class Test_TC_MF_1_7Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_8Suite : public TestCommand
+class Test_TC_MF_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_8", 0, credsIssuerConfig)
+    Test_TC_MF_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -72008,7 +75826,7 @@ class Test_TC_MF_1_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MF_1_8Suite() {}
+    ~Test_TC_MF_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -72053,10 +75871,10 @@ class Test_TC_MF_1_8Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_9Suite : public TestCommand
+class Test_TC_MF_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_9", 0, credsIssuerConfig)
+    Test_TC_MF_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -72064,7 +75882,7 @@ class Test_TC_MF_1_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MF_1_9Suite() {}
+    ~Test_TC_MF_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -72109,10 +75927,10 @@ class Test_TC_MF_1_9Suite : public TestCommand
     }
 };
 
-class Test_TC_MF_1_10Suite : public TestCommand
+class Test_TC_MF_1_7Suite : public TestCommand
 {
 public:
-    Test_TC_MF_1_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_10", 0, credsIssuerConfig)
+    Test_TC_MF_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_7", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -72120,7 +75938,63 @@ class Test_TC_MF_1_10Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_MF_1_10Suite() {}
+    ~Test_TC_MF_1_7Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_MF_1_8Suite : public TestCommand
+{
+public:
+    Test_TC_MF_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MF_1_8", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_MF_1_8Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74081,10 +77955,178 @@ class Test_TC_SU_2_6Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_2_7Suite : public TestCommand
+class Test_TC_SU_2_7Suite : public TestCommand
+{
+public:
+    Test_TC_SU_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_7", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_SU_2_7Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_SU_2_8Suite : public TestCommand
+{
+public:
+    Test_TC_SU_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_8", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_SU_2_8Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_SU_3_1Suite : public TestCommand
+{
+public:
+    Test_TC_SU_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_1", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_SU_3_1Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_SU_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_SU_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_7", 0, credsIssuerConfig)
+    Test_TC_SU_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74092,7 +78134,7 @@ class Test_TC_SU_2_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_2_7Suite() {}
+    ~Test_TC_SU_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74137,10 +78179,10 @@ class Test_TC_SU_2_7Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_3_1Suite : public TestCommand
+class Test_TC_SU_3_3Suite : public TestCommand
 {
 public:
-    Test_TC_SU_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_1", 0, credsIssuerConfig)
+    Test_TC_SU_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74148,7 +78190,7 @@ class Test_TC_SU_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_3_1Suite() {}
+    ~Test_TC_SU_3_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74193,10 +78235,10 @@ class Test_TC_SU_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_3_2Suite : public TestCommand
+class Test_TC_SU_3_4Suite : public TestCommand
 {
 public:
-    Test_TC_SU_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_2", 0, credsIssuerConfig)
+    Test_TC_SU_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74204,7 +78246,7 @@ class Test_TC_SU_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_3_2Suite() {}
+    ~Test_TC_SU_3_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74249,10 +78291,10 @@ class Test_TC_SU_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_3_3Suite : public TestCommand
+class Test_TC_SU_4_1Suite : public TestCommand
 {
 public:
-    Test_TC_SU_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_3", 0, credsIssuerConfig)
+    Test_TC_SU_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_4_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74260,7 +78302,7 @@ class Test_TC_SU_3_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_3_3Suite() {}
+    ~Test_TC_SU_4_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74305,10 +78347,10 @@ class Test_TC_SU_3_3Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_3_4Suite : public TestCommand
+class Test_TC_SU_4_2Suite : public TestCommand
 {
 public:
-    Test_TC_SU_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_4", 0, credsIssuerConfig)
+    Test_TC_SU_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_4_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74316,7 +78358,7 @@ class Test_TC_SU_3_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_3_4Suite() {}
+    ~Test_TC_SU_4_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74361,10 +78403,10 @@ class Test_TC_SU_3_4Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_4_1Suite : public TestCommand
+class Test_TC_PSCFG_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_SU_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_4_1", 0, credsIssuerConfig)
+    Test_TC_PSCFG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PSCFG_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74372,7 +78414,7 @@ class Test_TC_SU_4_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_4_1Suite() {}
+    ~Test_TC_PSCFG_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74417,10 +78459,10 @@ class Test_TC_SU_4_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SU_4_2Suite : public TestCommand
+class Test_TC_PSCFG_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_SU_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_4_2", 0, credsIssuerConfig)
+    Test_TC_PSCFG_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PSCFG_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74428,7 +78470,7 @@ class Test_TC_SU_4_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SU_4_2Suite() {}
+    ~Test_TC_PSCFG_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74473,10 +78515,10 @@ class Test_TC_SU_4_2Suite : public TestCommand
     }
 };
 
-class Test_TC_PSCFG_2_1Suite : public TestCommand
+class Test_TC_PSCFG_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_PSCFG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PSCFG_2_1", 0, credsIssuerConfig)
+    Test_TC_PSCFG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PSCFG_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74484,7 +78526,7 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_PSCFG_2_1Suite() {}
+    ~Test_TC_PSCFG_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74529,10 +78571,10 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_PSCFG_2_2Suite : public TestCommand
+class Test_TC_SC_4_1Suite : public TestCommand
 {
 public:
-    Test_TC_PSCFG_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PSCFG_2_2", 0, credsIssuerConfig)
+    Test_TC_SC_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74540,7 +78582,7 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_PSCFG_2_2Suite() {}
+    ~Test_TC_SC_4_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74585,10 +78627,10 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand
     }
 };
 
-class Test_TC_PSCFG_3_1Suite : public TestCommand
+class Test_TC_SC_4_3Suite : public TestCommand
 {
 public:
-    Test_TC_PSCFG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PSCFG_3_1", 0, credsIssuerConfig)
+    Test_TC_SC_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74596,7 +78638,7 @@ class Test_TC_PSCFG_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_PSCFG_3_1Suite() {}
+    ~Test_TC_SC_4_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74641,10 +78683,10 @@ class Test_TC_PSCFG_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_1Suite : public TestCommand
+class Test_TC_SC_4_4Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_1", 0, credsIssuerConfig)
+    Test_TC_SC_4_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74652,7 +78694,7 @@ class Test_TC_SC_4_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_1Suite() {}
+    ~Test_TC_SC_4_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74697,10 +78739,10 @@ class Test_TC_SC_4_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_3Suite : public TestCommand
+class Test_TC_SC_4_5Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_3", 0, credsIssuerConfig)
+    Test_TC_SC_4_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_5", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74708,7 +78750,7 @@ class Test_TC_SC_4_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_3Suite() {}
+    ~Test_TC_SC_4_5Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74753,10 +78795,10 @@ class Test_TC_SC_4_3Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_4Suite : public TestCommand
+class Test_TC_SC_4_6Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_4", 0, credsIssuerConfig)
+    Test_TC_SC_4_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_6", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74764,7 +78806,7 @@ class Test_TC_SC_4_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_4Suite() {}
+    ~Test_TC_SC_4_6Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74809,10 +78851,10 @@ class Test_TC_SC_4_4Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_5Suite : public TestCommand
+class Test_TC_SC_4_7Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_5", 0, credsIssuerConfig)
+    Test_TC_SC_4_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_7", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74820,7 +78862,7 @@ class Test_TC_SC_4_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_5Suite() {}
+    ~Test_TC_SC_4_7Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74865,10 +78907,10 @@ class Test_TC_SC_4_5Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_6Suite : public TestCommand
+class Test_TC_SC_4_8Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_6", 0, credsIssuerConfig)
+    Test_TC_SC_4_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_8", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74876,7 +78918,7 @@ class Test_TC_SC_4_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_6Suite() {}
+    ~Test_TC_SC_4_8Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74921,10 +78963,10 @@ class Test_TC_SC_4_6Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_7Suite : public TestCommand
+class Test_TC_SC_4_9Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_7", 0, credsIssuerConfig)
+    Test_TC_SC_4_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_9", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74932,7 +78974,7 @@ class Test_TC_SC_4_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_7Suite() {}
+    ~Test_TC_SC_4_9Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -74977,10 +79019,10 @@ class Test_TC_SC_4_7Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_8Suite : public TestCommand
+class Test_TC_SC_4_10Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_8", 0, credsIssuerConfig)
+    Test_TC_SC_4_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_10", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -74988,7 +79030,7 @@ class Test_TC_SC_4_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_8Suite() {}
+    ~Test_TC_SC_4_10Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -75033,10 +79075,10 @@ class Test_TC_SC_4_8Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_9Suite : public TestCommand
+class Test_TC_SWDIAG_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_9", 0, credsIssuerConfig)
+    Test_TC_SWDIAG_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWDIAG_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -75044,7 +79086,7 @@ class Test_TC_SC_4_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_9Suite() {}
+    ~Test_TC_SWDIAG_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -75089,10 +79131,10 @@ class Test_TC_SC_4_9Suite : public TestCommand
     }
 };
 
-class Test_TC_SC_4_10Suite : public TestCommand
+class Test_TC_DGWIFI_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_SC_4_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_4_10", 0, credsIssuerConfig)
+    Test_TC_DGWIFI_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGWIFI_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -75100,7 +79142,7 @@ class Test_TC_SC_4_10Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SC_4_10Suite() {}
+    ~Test_TC_DGWIFI_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -75145,10 +79187,10 @@ class Test_TC_SC_4_10Suite : public TestCommand
     }
 };
 
-class Test_TC_SWDIAG_1_2Suite : public TestCommand
+class Test_TC_DGWIFI_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_SWDIAG_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWDIAG_1_2", 0, credsIssuerConfig)
+    Test_TC_DGWIFI_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGWIFI_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -75156,7 +79198,7 @@ class Test_TC_SWDIAG_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SWDIAG_1_2Suite() {}
+    ~Test_TC_DGWIFI_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -75201,11 +79243,10 @@ class Test_TC_SWDIAG_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_WIFIDIAG_1_2Suite : public TestCommand
+class Test_TC_DGWIFI_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_WIFIDIAG_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_WIFIDIAG_1_2", 0, credsIssuerConfig)
+    Test_TC_DGWIFI_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGWIFI_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -75213,7 +79254,7 @@ class Test_TC_WIFIDIAG_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_WIFIDIAG_1_2Suite() {}
+    ~Test_TC_DGWIFI_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -75258,11 +79299,10 @@ class Test_TC_WIFIDIAG_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_WIFIDIAG_2_1Suite : public TestCommand
+class Test_TC_DGWIFI_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_WIFIDIAG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_WIFIDIAG_2_1", 0, credsIssuerConfig)
+    Test_TC_DGWIFI_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGWIFI_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -75270,7 +79310,7 @@ class Test_TC_WIFIDIAG_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_WIFIDIAG_2_1Suite() {}
+    ~Test_TC_DGWIFI_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -75427,6 +79467,116 @@ class Test_TC_WNCV_7_1Suite : public TestCommand
     }
 };
 
+class Test_TC_FLW_2_2Suite : public TestCommand
+{
+public:
+    Test_TC_FLW_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_2_2", 4, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_FLW_2_2Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::app::DataModel::Nullable<uint16_t> ValueBeforeChange;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<uint16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                ValueBeforeChange = value;
+            }
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<uint16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintNotValue("value", value, ValueBeforeChange));
+            }
+            break;
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "read the mandatory attribute: MeasuredValue");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), FlowMeasurement::Id,
+                                 FlowMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 2: {
+            LogStep(2, "operate on DUT to change the flow significantly");
+            VerifyOrDo(!ShouldSkip("MANUAL_FLOW_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::Log::Type value;
+            value.message =
+                chip::Span<const char>("Operate on device to change the flow significantlygarbage: not in length on purpose", 50);
+            return Log(kIdentityAlpha, value);
+        }
+        case 3: {
+            LogStep(3, "read the mandatory attribute: MeasuredValue");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), FlowMeasurement::Id,
+                                 FlowMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
+        }
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
 class Test_TC_FLW_3_1Suite : public TestCommand
 {
 public:
@@ -76602,10 +80752,10 @@ class Test_TC_CC_9_4Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_1Suite : public TestCommand
+class Test_TC_DL_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_1", 0, credsIssuerConfig)
+    Test_TC_DL_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -76613,7 +80763,7 @@ class Test_TC_DL_2_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_1Suite() {}
+    ~Test_TC_DL_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -76658,10 +80808,10 @@ class Test_TC_DL_2_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_5Suite : public TestCommand
+class Test_TC_DL_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_5", 0, credsIssuerConfig)
+    Test_TC_DL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -76669,7 +80819,7 @@ class Test_TC_DL_2_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_5Suite() {}
+    ~Test_TC_DL_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -76770,10 +80920,10 @@ class Test_TC_DL_2_6Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_7Suite : public TestCommand
+class Test_TC_DL_2_8Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_7", 0, credsIssuerConfig)
+    Test_TC_DL_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_8", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -76781,7 +80931,7 @@ class Test_TC_DL_2_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_7Suite() {}
+    ~Test_TC_DL_2_8Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -76882,10 +81032,10 @@ class Test_TC_DL_2_10Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_13Suite : public TestCommand
+class Test_TC_LC_2_3Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_13", 0, credsIssuerConfig)
+    Test_TC_LC_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LC_2_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -76893,7 +81043,7 @@ class Test_TC_DL_2_13Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_13Suite() {}
+    ~Test_TC_LC_2_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -76938,10 +81088,10 @@ class Test_TC_DL_2_13Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_14Suite : public TestCommand
+class Test_TC_LC_2_4Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_14", 0, credsIssuerConfig)
+    Test_TC_LC_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LC_2_4", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -76949,7 +81099,7 @@ class Test_TC_DL_2_14Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_14Suite() {}
+    ~Test_TC_LC_2_4Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -76994,10 +81144,10 @@ class Test_TC_DL_2_14Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_15Suite : public TestCommand
+class Test_TC_LC_2_5Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_15", 0, credsIssuerConfig)
+    Test_TC_LC_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LC_2_5", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77005,7 +81155,7 @@ class Test_TC_DL_2_15Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_15Suite() {}
+    ~Test_TC_LC_2_5Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77050,10 +81200,10 @@ class Test_TC_DL_2_15Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_16Suite : public TestCommand
+class Test_TC_LCFG_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_16Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_16", 0, credsIssuerConfig)
+    Test_TC_LCFG_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LCFG_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77061,7 +81211,7 @@ class Test_TC_DL_2_16Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_16Suite() {}
+    ~Test_TC_LCFG_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77106,10 +81256,10 @@ class Test_TC_DL_2_16Suite : public TestCommand
     }
 };
 
-class Test_TC_DL_2_17Suite : public TestCommand
+class Test_TC_LCFG_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DL_2_17Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DL_2_17", 0, credsIssuerConfig)
+    Test_TC_LCFG_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LCFG_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77117,7 +81267,7 @@ class Test_TC_DL_2_17Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DL_2_17Suite() {}
+    ~Test_TC_LCFG_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77162,10 +81312,10 @@ class Test_TC_DL_2_17Suite : public TestCommand
     }
 };
 
-class Test_TC_LC_2_3Suite : public TestCommand
+class Test_TC_LCFG_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_LC_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LC_2_3", 0, credsIssuerConfig)
+    Test_TC_LCFG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LCFG_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77173,7 +81323,7 @@ class Test_TC_LC_2_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_LC_2_3Suite() {}
+    ~Test_TC_LCFG_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77218,10 +81368,10 @@ class Test_TC_LC_2_3Suite : public TestCommand
     }
 };
 
-class Test_TC_LC_2_4Suite : public TestCommand
+class Test_TC_LVL_2_3Suite : public TestCommand
 {
 public:
-    Test_TC_LC_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LC_2_4", 0, credsIssuerConfig)
+    Test_TC_LVL_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_2_3", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77229,7 +81379,7 @@ class Test_TC_LC_2_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_LC_2_4Suite() {}
+    ~Test_TC_LVL_2_3Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77274,10 +81424,10 @@ class Test_TC_LC_2_4Suite : public TestCommand
     }
 };
 
-class Test_TC_LC_2_5Suite : public TestCommand
+class Test_TC_LVL_8_1Suite : public TestCommand
 {
 public:
-    Test_TC_LC_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LC_2_5", 0, credsIssuerConfig)
+    Test_TC_LVL_8_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_8_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77285,7 +81435,7 @@ class Test_TC_LC_2_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_LC_2_5Suite() {}
+    ~Test_TC_LVL_8_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77330,10 +81480,10 @@ class Test_TC_LC_2_5Suite : public TestCommand
     }
 };
 
-class Test_TC_LO_1_1Suite : public TestCommand
+class Test_TC_OO_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_LO_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LO_1_1", 0, credsIssuerConfig)
+    Test_TC_OO_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77341,7 +81491,7 @@ class Test_TC_LO_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_LO_1_1Suite() {}
+    ~Test_TC_OO_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77386,10 +81536,10 @@ class Test_TC_LO_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_LVL_2_3Suite : public TestCommand
+class Test_TC_OO_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_LVL_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_2_3", 0, credsIssuerConfig)
+    Test_TC_OO_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77397,7 +81547,7 @@ class Test_TC_LVL_2_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_LVL_2_3Suite() {}
+    ~Test_TC_OO_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77442,10 +81592,10 @@ class Test_TC_LVL_2_3Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_1Suite : public TestCommand
+class Test_TC_RH_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_1", 0, credsIssuerConfig)
+    Test_TC_RH_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_2_2", 6, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77453,7 +81603,7 @@ class Test_TC_NC_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_1Suite() {}
+    ~Test_TC_RH_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77466,6 +81616,8 @@ class Test_TC_NC_1_1Suite : public TestCommand
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
+    chip::app::DataModel::Nullable<uint16_t> ValueBeforeChange;
+
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
     //
@@ -77478,6 +81630,54 @@ class Test_TC_NC_1_1Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<uint16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U));
+            }
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<uint16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<uint16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U));
+                ValueBeforeChange = value;
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<uint16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintNotValue("value", value, ValueBeforeChange));
+            }
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -77493,15 +81693,54 @@ class Test_TC_NC_1_1Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "Reads constraints of attribute: MinMeasuredValue");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
+                                 RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 2: {
+            LogStep(2, "Reads constraints of attribute: MaxMeasuredValue");
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
+                                 RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "Reads MeasuredValue attribute from DUT");
+            VerifyOrDo(!ShouldSkip("A_RELATIVEHUMIDITY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
+                                 RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 4: {
+            LogStep(4, "Operate on device to change the relative humidity significantly");
+            VerifyOrDo(!ShouldSkip("MANUAL_RELATIVEHUMIDITY_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::Log::Type value;
+            value.message = chip::Span<const char>(
+                "Operate on device to change the relative humidity significantlygarbage: not in length on purpose", 63);
+            return Log(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "Read the mandatory attribute: MeasuredValue");
+            VerifyOrDo(!ShouldSkip("A_RELATIVEHUMIDITY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
+                                 RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
+        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_NC_1_2Suite : public TestCommand
+class Test_TC_RH_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_2", 0, credsIssuerConfig)
+    Test_TC_RH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77509,7 +81748,7 @@ class Test_TC_NC_1_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_2Suite() {}
+    ~Test_TC_RH_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77554,10 +81793,10 @@ class Test_TC_NC_1_2Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_3Suite : public TestCommand
+class Test_TC_SWTCH_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_3", 0, credsIssuerConfig)
+    Test_TC_SWTCH_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77565,7 +81804,7 @@ class Test_TC_NC_1_3Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_3Suite() {}
+    ~Test_TC_SWTCH_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77610,10 +81849,10 @@ class Test_TC_NC_1_3Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_4Suite : public TestCommand
+class Test_TC_SWTCH_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_4", 0, credsIssuerConfig)
+    Test_TC_SWTCH_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77621,7 +81860,7 @@ class Test_TC_NC_1_4Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_4Suite() {}
+    ~Test_TC_SWTCH_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77666,10 +81905,10 @@ class Test_TC_NC_1_4Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_5Suite : public TestCommand
+class Test_TC_SWTCH_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_5", 0, credsIssuerConfig)
+    Test_TC_SWTCH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77677,7 +81916,7 @@ class Test_TC_NC_1_5Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_5Suite() {}
+    ~Test_TC_SWTCH_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77722,10 +81961,10 @@ class Test_TC_NC_1_5Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_6Suite : public TestCommand
+class Test_TC_TM_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_6", 0, credsIssuerConfig)
+    Test_TC_TM_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_2_2", 6, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77733,7 +81972,7 @@ class Test_TC_NC_1_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_6Suite() {}
+    ~Test_TC_TM_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77746,6 +81985,8 @@ class Test_TC_NC_1_6Suite : public TestCommand
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
+    chip::app::DataModel::Nullable<int16_t> valueBeforeChange;
+
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
 
     //
@@ -77758,6 +81999,52 @@ class Test_TC_NC_1_6Suite : public TestCommand
 
         switch (mTestIndex - 1)
         {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<int16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -27315));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32766));
+            }
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<int16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, -27314));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
+            }
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<int16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                valueBeforeChange = value;
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                chip::app::DataModel::Nullable<int16_t> value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "", "uint16"));
+                VerifyOrReturn(CheckConstraintNotValue("value", value, valueBeforeChange));
+            }
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -77773,15 +82060,53 @@ class Test_TC_NC_1_6Suite : public TestCommand
         using namespace chip::app::Clusters;
         switch (testIndex)
         {
+        case 0: {
+            LogStep(0, "Wait for the commissioned device to be retrieved");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+            value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+            return WaitForCommissionee(kIdentityAlpha, value);
+        }
+        case 1: {
+            LogStep(1, "read the mandatory attribute: MinMeasuredValue");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
+                                 TemperatureMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 2: {
+            LogStep(2, "read the mandatory attribute: MaxMeasuredValue");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
+                                 TemperatureMeasurement::Attributes::MaxMeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 3: {
+            LogStep(3, "Reads MeasuredValue attribute from DUT");
+            VerifyOrDo(!ShouldSkip("A_TEMPERATURE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
+                                 TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
+        }
+        case 4: {
+            LogStep(4, "Operate on device to change the temperature significantly");
+            VerifyOrDo(!ShouldSkip("MANUAL_TEMPERATURE_CHANGE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::Log::Type value;
+            value.message = chip::Span<const char>(
+                "Operate on device to change the temperature significantlygarbage: not in length on purpose", 57);
+            return Log(kIdentityAlpha, value);
+        }
+        case 5: {
+            LogStep(5, "Read the mandatory attribute: MeasuredValue");
+            VerifyOrDo(!ShouldSkip("A_TEMPERATURE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
+                                 TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
+        }
         }
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_NC_1_7Suite : public TestCommand
+class Test_TC_TM_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_7", 0, credsIssuerConfig)
+    Test_TC_TM_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77789,7 +82114,7 @@ class Test_TC_NC_1_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_7Suite() {}
+    ~Test_TC_TM_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77834,10 +82159,10 @@ class Test_TC_NC_1_7Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_8Suite : public TestCommand
+class Test_TC_TSTAT_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_8", 0, credsIssuerConfig)
+    Test_TC_TSTAT_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77845,7 +82170,7 @@ class Test_TC_NC_1_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_8Suite() {}
+    ~Test_TC_TSTAT_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77890,10 +82215,10 @@ class Test_TC_NC_1_8Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_9Suite : public TestCommand
+class Test_TC_TSTAT_3_2Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_9Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_9", 0, credsIssuerConfig)
+    Test_TC_TSTAT_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_3_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77901,7 +82226,7 @@ class Test_TC_NC_1_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_9Suite() {}
+    ~Test_TC_TSTAT_3_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -77946,10 +82271,10 @@ class Test_TC_NC_1_9Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_10Suite : public TestCommand
+class Test_TC_TSUIC_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_10Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_10", 0, credsIssuerConfig)
+    Test_TC_TSUIC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSUIC_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -77957,7 +82282,7 @@ class Test_TC_NC_1_10Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_10Suite() {}
+    ~Test_TC_TSUIC_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78002,10 +82327,11 @@ class Test_TC_NC_1_10Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_11Suite : public TestCommand
+class Test_TC_DIAG_TH_NW_2_6Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_11Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_11", 0, credsIssuerConfig)
+    Test_TC_DIAG_TH_NW_2_6Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_DIAG_TH_NW_2_6", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78013,7 +82339,7 @@ class Test_TC_NC_1_11Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_11Suite() {}
+    ~Test_TC_DIAG_TH_NW_2_6Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78058,10 +82384,11 @@ class Test_TC_NC_1_11Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_12Suite : public TestCommand
+class Test_TC_DIAG_TH_NW_2_7Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_12Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_12", 0, credsIssuerConfig)
+    Test_TC_DIAG_TH_NW_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_DIAG_TH_NW_2_7", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78069,7 +82396,7 @@ class Test_TC_NC_1_12Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_12Suite() {}
+    ~Test_TC_DIAG_TH_NW_2_7Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78114,10 +82441,11 @@ class Test_TC_NC_1_12Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_13Suite : public TestCommand
+class Test_TC_DIAG_TH_NW_2_8Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_13Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_13", 0, credsIssuerConfig)
+    Test_TC_DIAG_TH_NW_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_DIAG_TH_NW_2_8", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78125,7 +82453,7 @@ class Test_TC_NC_1_13Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_13Suite() {}
+    ~Test_TC_DIAG_TH_NW_2_8Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78170,10 +82498,11 @@ class Test_TC_NC_1_13Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_14Suite : public TestCommand
+class Test_TC_DIAG_TH_NW_2_9Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_14Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_14", 0, credsIssuerConfig)
+    Test_TC_DIAG_TH_NW_2_9Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_DIAG_TH_NW_2_9", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78181,7 +82510,7 @@ class Test_TC_NC_1_14Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_14Suite() {}
+    ~Test_TC_DIAG_TH_NW_2_9Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78226,10 +82555,10 @@ class Test_TC_NC_1_14Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_15Suite : public TestCommand
+class Test_TC_ACT_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_15Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_15", 0, credsIssuerConfig)
+    Test_TC_ACT_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78237,7 +82566,7 @@ class Test_TC_NC_1_15Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_15Suite() {}
+    ~Test_TC_ACT_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78282,10 +82611,10 @@ class Test_TC_NC_1_15Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_16Suite : public TestCommand
+class Test_TC_ACT_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_16Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_16", 0, credsIssuerConfig)
+    Test_TC_ACT_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78293,7 +82622,7 @@ class Test_TC_NC_1_16Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_16Suite() {}
+    ~Test_TC_ACT_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78338,10 +82667,10 @@ class Test_TC_NC_1_16Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_17Suite : public TestCommand
+class Test_TC_ACT_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_17Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_17", 0, credsIssuerConfig)
+    Test_TC_ACT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78349,7 +82678,7 @@ class Test_TC_NC_1_17Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_17Suite() {}
+    ~Test_TC_ACT_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78394,10 +82723,10 @@ class Test_TC_NC_1_17Suite : public TestCommand
     }
 };
 
-class Test_TC_NC_1_18Suite : public TestCommand
+class Test_TC_ACT_3_1Suite : public TestCommand
 {
 public:
-    Test_TC_NC_1_18Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_NC_1_18", 0, credsIssuerConfig)
+    Test_TC_ACT_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_3_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78405,7 +82734,7 @@ class Test_TC_NC_1_18Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_NC_1_18Suite() {}
+    ~Test_TC_ACT_3_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78450,10 +82779,10 @@ class Test_TC_NC_1_18Suite : public TestCommand
     }
 };
 
-class Test_TC_OO_3_1Suite : public TestCommand
+class Test_TC_TFL_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_OO_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_3_1", 0, credsIssuerConfig)
+    Test_TC_TFL_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TFL_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78461,7 +82790,7 @@ class Test_TC_OO_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_OO_3_1Suite() {}
+    ~Test_TC_TFL_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78506,10 +82835,10 @@ class Test_TC_OO_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_OO_3_2Suite : public TestCommand
+class Test_TC_TFL_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_OO_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_3_2", 0, credsIssuerConfig)
+    Test_TC_TFL_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TFL_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78517,7 +82846,7 @@ class Test_TC_OO_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_OO_3_2Suite() {}
+    ~Test_TC_TFL_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78562,10 +82891,10 @@ class Test_TC_OO_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_RH_3_1Suite : public TestCommand
+class Test_TC_TFL_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_RH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_3_1", 0, credsIssuerConfig)
+    Test_TC_TFL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TFL_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78573,7 +82902,7 @@ class Test_TC_RH_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_RH_3_1Suite() {}
+    ~Test_TC_TFL_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78618,10 +82947,10 @@ class Test_TC_RH_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SWTCH_1_1Suite : public TestCommand
+class Test_TC_TFL_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_SWTCH_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_1_1", 0, credsIssuerConfig)
+    Test_TC_TFL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TFL_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78629,7 +82958,7 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SWTCH_1_1Suite() {}
+    ~Test_TC_TFL_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78674,10 +83003,10 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand
     }
 };
 
-class Test_TC_SWTCH_3_1Suite : public TestCommand
+class Test_TC_UL_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_SWTCH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_3_1", 0, credsIssuerConfig)
+    Test_TC_UL_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_UL_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78685,7 +83014,7 @@ class Test_TC_SWTCH_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_SWTCH_3_1Suite() {}
+    ~Test_TC_UL_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78730,10 +83059,10 @@ class Test_TC_SWTCH_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_TM_3_1Suite : public TestCommand
+class Test_TC_UL_1_2Suite : public TestCommand
 {
 public:
-    Test_TC_TM_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_3_1", 0, credsIssuerConfig)
+    Test_TC_UL_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_UL_1_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78741,7 +83070,7 @@ class Test_TC_TM_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_TM_3_1Suite() {}
+    ~Test_TC_UL_1_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78786,10 +83115,10 @@ class Test_TC_TM_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_TSTAT_3_1Suite : public TestCommand
+class Test_TC_UL_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_TSTAT_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_3_1", 0, credsIssuerConfig)
+    Test_TC_UL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_UL_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78797,7 +83126,7 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_TSTAT_3_1Suite() {}
+    ~Test_TC_UL_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78842,10 +83171,10 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_TSTAT_3_2Suite : public TestCommand
+class Test_TC_UL_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_TSTAT_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_3_2", 0, credsIssuerConfig)
+    Test_TC_UL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_UL_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78853,7 +83182,7 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_TSTAT_3_2Suite() {}
+    ~Test_TC_UL_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78898,10 +83227,10 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand
     }
 };
 
-class Test_TC_TSUIC_3_1Suite : public TestCommand
+class Test_TC_FLABEL_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_TSUIC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSUIC_3_1", 0, credsIssuerConfig)
+    Test_TC_FLABEL_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLABEL_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78909,7 +83238,7 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_TSUIC_3_1Suite() {}
+    ~Test_TC_FLABEL_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -78954,11 +83283,10 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DIAG_TH_NW_2_6Suite : public TestCommand
+class Test_TC_FLABEL_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DIAG_TH_NW_2_6Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_DIAG_TH_NW_2_6", 0, credsIssuerConfig)
+    Test_TC_FLABEL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLABEL_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -78966,7 +83294,7 @@ class Test_TC_DIAG_TH_NW_2_6Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DIAG_TH_NW_2_6Suite() {}
+    ~Test_TC_FLABEL_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -79011,11 +83339,10 @@ class Test_TC_DIAG_TH_NW_2_6Suite : public TestCommand
     }
 };
 
-class Test_TC_DIAG_TH_NW_2_7Suite : public TestCommand
+class Test_TC_FLABEL_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_DIAG_TH_NW_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_DIAG_TH_NW_2_7", 0, credsIssuerConfig)
+    Test_TC_FLABEL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLABEL_2_2", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -79023,7 +83350,7 @@ class Test_TC_DIAG_TH_NW_2_7Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DIAG_TH_NW_2_7Suite() {}
+    ~Test_TC_FLABEL_2_2Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -79068,11 +83395,10 @@ class Test_TC_DIAG_TH_NW_2_7Suite : public TestCommand
     }
 };
 
-class Test_TC_DIAG_TH_NW_2_8Suite : public TestCommand
+class Test_TC_BIND_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_DIAG_TH_NW_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_DIAG_TH_NW_2_8", 0, credsIssuerConfig)
+    Test_TC_BIND_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BIND_1_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -79080,7 +83406,7 @@ class Test_TC_DIAG_TH_NW_2_8Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DIAG_TH_NW_2_8Suite() {}
+    ~Test_TC_BIND_1_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -79125,11 +83451,10 @@ class Test_TC_DIAG_TH_NW_2_8Suite : public TestCommand
     }
 };
 
-class Test_TC_DIAG_TH_NW_2_9Suite : public TestCommand
+class Test_TC_BIND_2_1Suite : public TestCommand
 {
 public:
-    Test_TC_DIAG_TH_NW_2_9Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_DIAG_TH_NW_2_9", 0, credsIssuerConfig)
+    Test_TC_BIND_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BIND_2_1", 0, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -79137,7 +83462,7 @@ class Test_TC_DIAG_TH_NW_2_9Suite : public TestCommand
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
-    ~Test_TC_DIAG_TH_NW_2_9Suite() {}
+    ~Test_TC_BIND_2_1Suite() {}
 
     chip::System::Clock::Timeout GetWaitDuration() const override
     {
@@ -79222,17 +83547,14 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_CC_9_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_CC_9_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_CC_9_3Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DM_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DM_3_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DM_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DM_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_EMR_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_ETHDIAG_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_ETHDIAG_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGETH_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGETH_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_FLW_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_FLW_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_FLW_2_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_GC_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_GC_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_CGEN_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_CGEN_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_I_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_I_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_I_2_3Suite>(credsIssuerConfig),
@@ -79258,7 +83580,6 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_MC_1_11Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_1_12Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MC_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_3_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_3_4Suite>(credsIssuerConfig),
@@ -79284,6 +83605,8 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_MF_1_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_6Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MF_1_9Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MF_1_10Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_15Suite>(credsIssuerConfig),
         make_unique<OTA_SuccessfulTransferSuite>(credsIssuerConfig),
         make_unique<Test_TC_OCC_1_1Suite>(credsIssuerConfig),
@@ -79305,13 +83628,10 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_PSCFG_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_RH_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_RH_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_RH_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_4_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_SWTCH_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_SWTCH_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_TM_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_TM_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_TM_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_TSTAT_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_TSTAT_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_TSTAT_2_2Suite>(credsIssuerConfig),
@@ -79324,8 +83644,8 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DIAG_TH_NW_2_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_ULABEL_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_ULABEL_2_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_WIFIDIAG_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_WIFIDIAG_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGWIFI_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGWIFI_2_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_WNCV_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_WNCV_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_WNCV_2_2Suite>(credsIssuerConfig),
@@ -79386,8 +83706,9 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DL_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_DL_2_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_DL_2_4Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_8Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_11Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DL_2_5Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DL_2_7Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DL_2_9Suite>(credsIssuerConfig),
         make_unique<TestGroupMessagingSuite>(credsIssuerConfig),
         make_unique<TestGroupsClusterSuite>(credsIssuerConfig),
         make_unique<TestGroupKeyManagementClusterSuite>(credsIssuerConfig),
@@ -79399,6 +83720,9 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DD_1_10Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_1_11Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_1_12Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_1_13Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_1_14Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_1_15Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_3_1Suite>(credsIssuerConfig),
@@ -79415,20 +83739,24 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DD_3_12Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_3_13Suite>(credsIssuerConfig),
         make_unique<Test_TC_DD_3_14Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DD_4_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_3_15Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_3_16Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_3_17Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_3_18Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_3_19Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DD_3_20Suite>(credsIssuerConfig),
         make_unique<TestGroupDemoCommandSuite>(credsIssuerConfig),
         make_unique<TestGroupDemoConfigSuite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_GR_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_GR_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_GR_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_GR_2_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_GR_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_GR_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_BDX_1_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_1_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_BDX_1_4Suite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_1_5Suite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_1_6Suite>(credsIssuerConfig),
         make_unique<Test_TC_BDX_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_BDX_2_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_2_3Suite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_2_4Suite>(credsIssuerConfig),
-        make_unique<Test_TC_BDX_2_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_BR_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_BR_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_BR_3Suite>(credsIssuerConfig),
@@ -79436,11 +83764,14 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_BRAC_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_BRAC_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DA_1_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DM_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_1_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DM_1_4Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DM_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DM_1_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DM_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_2_4Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DM_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_3_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DM_3_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_3_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_4_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_4_2Suite>(credsIssuerConfig),
@@ -79463,14 +83794,19 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DM_4_19Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_4_20Suite>(credsIssuerConfig),
         make_unique<Test_TC_DM_4_21Suite>(credsIssuerConfig),
-        make_unique<Test_TC_Diag_Log_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_Diag_Log_2_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_Diag_Log_2_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DLOG_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DLOG_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DLOG_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DLOG_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DESC_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_ETHDIAG_1_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_GC_2_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_GC_2_3Suite>(credsIssuerConfig),
-        make_unique<Test_TC_GC_2_4Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DESC_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DESC_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGETH_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGETH_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGETH_3_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_CGEN_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_CGEN_2_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_CGEN_2_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_GENDIAG_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_GENDIAG_1_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_GENDIAG_2_1Suite>(credsIssuerConfig),
@@ -79487,6 +83823,7 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_IDM_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_IDM_4_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_IDM_4_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_IDM_4_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_IDM_5_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_IDM_5_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_IDM_6_1Suite>(credsIssuerConfig),
@@ -79495,25 +83832,36 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_IDM_6_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_IDM_7_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_7_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_8_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_9_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_14Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_15Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_16Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_3_17Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_4_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_5_4Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_5_5Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_5_6Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_6_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_6_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_6_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_6_4Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MC_8_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MC_9_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MC_10_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_6_5Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_6_7Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_7_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_7_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_10_3Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MC_10_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_10_5Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MC_10_6Suite>(credsIssuerConfig),
         make_unique<Test_TC_MC_10_7Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_11_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_11_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_12_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_MC_12_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_7Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_8Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MF_1_9Suite>(credsIssuerConfig),
-        make_unique<Test_TC_MF_1_10Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_11Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_12Suite>(credsIssuerConfig),
         make_unique<Test_TC_MF_1_13Suite>(credsIssuerConfig),
@@ -79546,6 +83894,7 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_SU_2_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_SU_2_6Suite>(credsIssuerConfig),
         make_unique<Test_TC_SU_2_7Suite>(credsIssuerConfig),
+        make_unique<Test_TC_SU_2_8Suite>(credsIssuerConfig),
         make_unique<Test_TC_SU_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_SU_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_SU_3_3Suite>(credsIssuerConfig),
@@ -79565,10 +83914,13 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_SC_4_9Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_4_10Suite>(credsIssuerConfig),
         make_unique<Test_TC_SWDIAG_1_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_WIFIDIAG_1_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_WIFIDIAG_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGWIFI_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGWIFI_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGWIFI_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DGWIFI_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_WNCV_6_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_WNCV_7_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_FLW_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_FLW_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_OCC_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_OCC_2_3Suite>(credsIssuerConfig),
@@ -79589,44 +83941,27 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_CC_6_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_CC_7_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_CC_9_4Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DL_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DL_2_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_DL_2_6Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_7Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DL_2_8Suite>(credsIssuerConfig),
         make_unique<Test_TC_DL_2_10Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_13Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_14Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_15Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_16Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DL_2_17Suite>(credsIssuerConfig),
         make_unique<Test_TC_LC_2_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_LC_2_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_LC_2_5Suite>(credsIssuerConfig),
-        make_unique<Test_TC_LO_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_LCFG_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_LCFG_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_LCFG_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_LVL_2_3Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_2Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_3Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_4Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_5Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_6Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_7Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_8Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_9Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_10Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_11Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_12Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_13Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_14Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_15Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_16Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_17Suite>(credsIssuerConfig),
-        make_unique<Test_TC_NC_1_18Suite>(credsIssuerConfig),
+        make_unique<Test_TC_LVL_8_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_OO_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_OO_3_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_RH_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_RH_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_SWTCH_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_SWTCH_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_SWTCH_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_TM_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_TM_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_TSTAT_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_TSTAT_3_2Suite>(credsIssuerConfig),
@@ -79635,6 +83970,23 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DIAG_TH_NW_2_7Suite>(credsIssuerConfig),
         make_unique<Test_TC_DIAG_TH_NW_2_8Suite>(credsIssuerConfig),
         make_unique<Test_TC_DIAG_TH_NW_2_9Suite>(credsIssuerConfig),
+        make_unique<Test_TC_ACT_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_ACT_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_ACT_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_ACT_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_TFL_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_TFL_1_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_TFL_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_TFL_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_UL_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_UL_1_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_UL_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_UL_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_FLABEL_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_FLABEL_2_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_FLABEL_2_2Suite>(credsIssuerConfig),
+        make_unique<Test_TC_BIND_1_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_BIND_2_1Suite>(credsIssuerConfig),
 #endif // CONFIG_ENABLE_YAML_TESTS
     };
 
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
index 5114f1445d7ede..a1ae4558ce883f 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
@@ -473,14 +473,6 @@ typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
         data);
-typedef void (*ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & data);
-typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & data);
 typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
 typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
index f5d4d26b38a990..209cb7cda99b59 100644
--- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
+++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
@@ -766,8 +766,8 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: Test Cluster (client) */ \
-      .clusterId = 0x0000050F,  \
+      /* Endpoint: 1, Cluster: Electrical Measurement (client) */ \
+      .clusterId = 0x00000B04,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(0), \
       .attributeCount = 0, \
       .clusterSize = 0, \
@@ -777,8 +777,8 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: Electrical Measurement (client) */ \
-      .clusterId = 0x00000B04,  \
+      /* Endpoint: 1, Cluster: Test Cluster (client) */ \
+      .clusterId = 0xFFF1FC05,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(0), \
       .attributeCount = 0, \
       .clusterSize = 0, \
diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h
similarity index 98%
rename from zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h
rename to zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h
index 03b33c9847d21f..6b499b60008112 100644
--- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h
@@ -407,8 +407,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)writeAttributeLockTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeActuatorEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeDoorStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfLogRecordsSupportedWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeNumberOfTotalUsersSupportedWithValue:(NSNumber * _Nonnull)value
                                          completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeNumberOfPINUsersSupportedWithValue:(NSNumber * _Nonnull)value
@@ -730,6 +728,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)writeAttributeActiveHardwareFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeActiveRadioFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeActiveNetworkFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTestEventTriggersEnabledWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1326,7 +1326,6 @@ NS_ASSUME_NONNULL_BEGIN
                                      completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value
                                    completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeStartOfWeekWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1386,11 +1385,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeNeighborTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeRouteTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWeightingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWeightingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeDetachedRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeChildRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeRouterRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1445,12 +1444,14 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)writeAttributeRxErrSecCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeRxErrFcsCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeRxErrOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSecurityPolicyWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeChannelMaskWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOperationalDatasetComponentsWithValue:(NSArray * _Nonnull)value
+- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOperationalDatasetComponentsWithValue:
+            (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value
                                           completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeActiveNetworkFaultsListWithValue:(NSArray * _Nonnull)value
                                      completionHandler:(StatusCompletion)completionHandler;
diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm
similarity index 99%
rename from zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm
rename to zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm
index 2c02c805f89134..e685dbe0682138 100644
--- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm
@@ -5392,25 +5392,6 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeNumberOfLogRecordsSupportedWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfLogRecordsSupported::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
 - (void)writeAttributeNumberOfTotalUsersSupportedWithValue:(NSNumber * _Nonnull)value
                                          completionHandler:(StatusCompletion)completionHandler
 {
@@ -9795,6 +9776,25 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
+- (void)writeAttributeTestEventTriggersEnabledWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -16738,10 +16738,22 @@ new CHIPDefaultSuccessCallbackBridge(
                         }
                         auto element_0 = (CHIPSoftwareDiagnosticsClusterThreadMetrics *) value[i_0];
                         listHolder_0->mList[i_0].id = element_0.id.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
-                        listHolder_0->mList[i_0].stackFreeCurrent = element_0.stackFreeCurrent.unsignedIntValue;
-                        listHolder_0->mList[i_0].stackFreeMinimum = element_0.stackFreeMinimum.unsignedIntValue;
-                        listHolder_0->mList[i_0].stackSize = element_0.stackSize.unsignedIntValue;
+                        if (element_0.name != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].name.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.name];
+                        }
+                        if (element_0.stackFreeCurrent != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].stackFreeCurrent.Emplace();
+                            definedValue_2 = element_0.stackFreeCurrent.unsignedIntValue;
+                        }
+                        if (element_0.stackFreeMinimum != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].stackFreeMinimum.Emplace();
+                            definedValue_2 = element_0.stackFreeMinimum.unsignedIntValue;
+                        }
+                        if (element_0.stackSize != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].stackSize.Emplace();
+                            definedValue_2 = element_0.stackSize.unsignedIntValue;
+                        }
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -18014,24 +18026,6 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AlarmMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
 - (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value
                                    completionHandler:(StatusCompletion)completionHandler
 {
@@ -18674,7 +18668,7 @@ new CHIPDefaultSuccessCallbackBridge(
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18902,7 +18896,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18913,14 +18907,19 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWeightingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWeightingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18931,14 +18930,19 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18949,14 +18953,19 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18967,14 +18976,19 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18985,7 +18999,12 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -19758,7 +19777,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19769,14 +19788,19 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19787,14 +19811,19 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19805,14 +19834,20 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSecurityPolicyWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19823,28 +19858,12 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::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) {
-                        if (![value[i_0] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterSecurityPolicy class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPThreadNetworkDiagnosticsClusterSecurityPolicy *) value[i_0];
-                        listHolder_0->mList[i_0].rotationTime = element_0.rotationTime.unsignedShortValue;
-                        listHolder_0->mList[i_0].flags = element_0.flags.unsignedShortValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.rotationTime = value.rotationTime.unsignedShortValue;
+                nonNullValue_0.flags = value.flags.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -19852,7 +19871,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeChannelMaskWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19863,14 +19882,20 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asByteSpan:value];
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asByteSpan:value];
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOperationalDatasetComponentsWithValue:(NSArray * _Nonnull)value
+- (void)writeAttributeOperationalDatasetComponentsWithValue:
+            (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value
                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -19882,38 +19907,22 @@ new CHIPDefaultSuccessCallbackBridge(
             ListFreer listFreer;
             using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::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) {
-                        if (![value[i_0] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents *) value[i_0];
-                        listHolder_0->mList[i_0].activeTimestampPresent = element_0.activeTimestampPresent.boolValue;
-                        listHolder_0->mList[i_0].pendingTimestampPresent = element_0.pendingTimestampPresent.boolValue;
-                        listHolder_0->mList[i_0].masterKeyPresent = element_0.masterKeyPresent.boolValue;
-                        listHolder_0->mList[i_0].networkNamePresent = element_0.networkNamePresent.boolValue;
-                        listHolder_0->mList[i_0].extendedPanIdPresent = element_0.extendedPanIdPresent.boolValue;
-                        listHolder_0->mList[i_0].meshLocalPrefixPresent = element_0.meshLocalPrefixPresent.boolValue;
-                        listHolder_0->mList[i_0].delayPresent = element_0.delayPresent.boolValue;
-                        listHolder_0->mList[i_0].panIdPresent = element_0.panIdPresent.boolValue;
-                        listHolder_0->mList[i_0].channelPresent = element_0.channelPresent.boolValue;
-                        listHolder_0->mList[i_0].pskcPresent = element_0.pskcPresent.boolValue;
-                        listHolder_0->mList[i_0].securityPolicyPresent = element_0.securityPolicyPresent.boolValue;
-                        listHolder_0->mList[i_0].channelMaskPresent = element_0.channelMaskPresent.boolValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.activeTimestampPresent = value.activeTimestampPresent.boolValue;
+                nonNullValue_0.pendingTimestampPresent = value.pendingTimestampPresent.boolValue;
+                nonNullValue_0.masterKeyPresent = value.masterKeyPresent.boolValue;
+                nonNullValue_0.networkNamePresent = value.networkNamePresent.boolValue;
+                nonNullValue_0.extendedPanIdPresent = value.extendedPanIdPresent.boolValue;
+                nonNullValue_0.meshLocalPrefixPresent = value.meshLocalPrefixPresent.boolValue;
+                nonNullValue_0.delayPresent = value.delayPresent.boolValue;
+                nonNullValue_0.panIdPresent = value.panIdPresent.boolValue;
+                nonNullValue_0.channelPresent = value.channelPresent.boolValue;
+                nonNullValue_0.pskcPresent = value.pskcPresent.boolValue;
+                nonNullValue_0.securityPolicyPresent = value.securityPolicyPresent.boolValue;
+                nonNullValue_0.channelMaskPresent = value.channelMaskPresent.boolValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
similarity index 76%
rename from zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h
rename to zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index d9dcdccd5a4fba..f9282c04ffae87 100644
--- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -130,9 +130,6 @@
 | ChlorodibromomethaneConcentrationMeasurement                        | 0x0427 |
 | ChloroformConcentrationMeasurement                                  | 0x0428 |
 | SodiumConcentrationMeasurement                                      | 0x0429 |
-| IasZone                                                             | 0x0500 |
-| IasAce                                                              | 0x0501 |
-| IasWd                                                               | 0x0502 |
 | WakeOnLan                                                           | 0x0503 |
 | Channel                                                             | 0x0504 |
 | TargetNavigator                                                     | 0x0505 |
@@ -145,13 +142,13 @@
 | ApplicationLauncher                                                 | 0x050C |
 | ApplicationBasic                                                    | 0x050D |
 | AccountLogin                                                        | 0x050E |
-| TestCluster                                                         | 0x050F |
 | Messaging                                                           | 0x0703 |
 | ApplianceIdentification                                             | 0x0B00 |
 | MeterIdentification                                                 | 0x0B01 |
 | ApplianceEventsAndAlert                                             | 0x0B02 |
 | ApplianceStatistics                                                 | 0x0B03 |
 | ElectricalMeasurement                                               | 0x0B04 |
+| TestCluster                                                         | 0xFFF1FC05|
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
@@ -321,23 +318,20 @@ class SubscribeAttributeAccessControlAcl : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAclWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                               params:params
-                              subscriptionEstablished:nullptr
-                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                            NSLog(@"AccessControl.Acl response %@", [value description]);
-                                            if (error || !mWait) {
-                                                SetCommandExitStatus(error);
-                                            }
-                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.Acl response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -443,23 +437,20 @@ class SubscribeAttributeAccessControlExtension : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeExtensionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"AccessControl.Extension response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.Extension response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -510,27 +501,21 @@ class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public Subs
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"AccessControl.SubjectsPerAccessControlEntry response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.SubjectsPerAccessControlEntry response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -581,26 +566,21 @@ class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public Subsc
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"AccessControl.TargetsPerAccessControlEntry response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.TargetsPerAccessControlEntry response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -651,27 +631,21 @@ class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public Subs
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"AccessControl.AccessControlEntriesPerFabric response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.AccessControlEntriesPerFabric response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -722,24 +696,20 @@ class SubscribeAttributeAccessControlGeneratedCommandList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"AccessControl.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -789,25 +759,21 @@ class SubscribeAttributeAccessControlAcceptedCommandList : public SubscribeAttri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"AccessControl.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -858,23 +824,20 @@ class SubscribeAttributeAccessControlAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"AccessControl.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -925,23 +888,20 @@ class SubscribeAttributeAccessControlFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"AccessControl.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -992,23 +952,20 @@ class SubscribeAttributeAccessControlClusterRevision : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"AccessControl.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -1150,16 +1107,17 @@ class AccountLoginLogout : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster logoutWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster logoutWithParams:params
+                    completionHandler:^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1215,24 +1173,20 @@ class SubscribeAttributeAccountLoginGeneratedCommandList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"AccountLogin.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1282,25 +1236,21 @@ class SubscribeAttributeAccountLoginAcceptedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"AccountLogin.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1351,23 +1301,20 @@ class SubscribeAttributeAccountLoginAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"AccountLogin.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1418,23 +1365,20 @@ class SubscribeAttributeAccountLoginFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"AccountLogin.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1485,23 +1429,20 @@ class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"AccountLogin.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -1650,16 +1591,17 @@ class AdministratorCommissioningRevokeCommissioning : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster revokeCommissioningWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster revokeCommissioningWithParams:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1718,25 +1660,21 @@ class SubscribeAttributeAdministratorCommissioningWindowStatus : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeWindowStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"AdministratorCommissioning.WindowStatus response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeWindowStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.WindowStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1791,24 +1729,20 @@ class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAdminFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"AdministratorCommissioning.AdminFabricIndex response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.AdminFabricIndex response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1863,24 +1797,20 @@ class SubscribeAttributeAdministratorCommissioningAdminVendorId : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAdminVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"AdministratorCommissioning.AdminVendorId response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.AdminVendorId response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -1935,24 +1865,20 @@ class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"AdministratorCommissioning.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2007,24 +1933,20 @@ class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"AdministratorCommissioning.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2079,24 +2001,20 @@ class SubscribeAttributeAdministratorCommissioningAttributeList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"AdministratorCommissioning.AttributeList response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2151,23 +2069,20 @@ class SubscribeAttributeAdministratorCommissioningFeatureMap : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"AdministratorCommissioning.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2222,24 +2137,20 @@ class SubscribeAttributeAdministratorCommissioningClusterRevision : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"AdministratorCommissioning.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -2317,23 +2228,20 @@ class SubscribeAttributeApplicationBasicVendorName : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ApplicationBasic.VendorName response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.VendorName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2388,23 +2296,20 @@ class SubscribeAttributeApplicationBasicVendorID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ApplicationBasic.VendorID response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.VendorID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2459,23 +2364,20 @@ class SubscribeAttributeApplicationBasicApplicationName : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeApplicationNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ApplicationBasic.ApplicationName response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.ApplicationName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2530,23 +2432,20 @@ class SubscribeAttributeApplicationBasicProductID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ApplicationBasic.ProductID response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.ProductID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2601,26 +2500,21 @@ class SubscribeAttributeApplicationBasicApplication : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeApplicationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
-                                               NSError * _Nullable error) {
-                                               NSLog(@"ApplicationBasic.Application response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+        [cluster subscribeAttributeApplicationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.Application response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2675,23 +2569,20 @@ class SubscribeAttributeApplicationBasicStatus : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"ApplicationBasic.Status response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.Status response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2746,24 +2637,20 @@ class SubscribeAttributeApplicationBasicApplicationVersion : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeApplicationVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ApplicationBasic.ApplicationVersion response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.ApplicationVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2817,25 +2704,21 @@ class SubscribeAttributeApplicationBasicAllowedVendorList : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAllowedVendorListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ApplicationBasic.AllowedVendorList response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+        [cluster subscribeAttributeAllowedVendorListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.AllowedVendorList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2890,24 +2773,20 @@ class SubscribeAttributeApplicationBasicGeneratedCommandList : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ApplicationBasic.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -2962,24 +2841,20 @@ class SubscribeAttributeApplicationBasicAcceptedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ApplicationBasic.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3034,23 +2909,20 @@ class SubscribeAttributeApplicationBasicAttributeList : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ApplicationBasic.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3105,23 +2977,20 @@ class SubscribeAttributeApplicationBasicFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ApplicationBasic.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3176,23 +3045,20 @@ class SubscribeAttributeApplicationBasicClusterRevision : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ApplicationBasic.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -3435,23 +3301,20 @@ class SubscribeAttributeApplicationLauncherCatalogList : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCatalogListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ApplicationLauncher.CatalogList response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.CatalogList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3565,24 +3428,20 @@ class SubscribeAttributeApplicationLauncherCurrentApp : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentAppWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                   NSError * _Nullable error) {
-                                                   NSLog(@"ApplicationLauncher.CurrentApp response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.CurrentApp response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3637,24 +3496,20 @@ class SubscribeAttributeApplicationLauncherGeneratedCommandList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ApplicationLauncher.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3709,24 +3564,20 @@ class SubscribeAttributeApplicationLauncherAcceptedCommandList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ApplicationLauncher.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3781,23 +3632,20 @@ class SubscribeAttributeApplicationLauncherAttributeList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ApplicationLauncher.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3852,23 +3700,20 @@ class SubscribeAttributeApplicationLauncherFeatureMap : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ApplicationLauncher.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -3922,25 +3767,21 @@ class SubscribeAttributeApplicationLauncherClusterRevision : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ApplicationLauncher.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -4102,23 +3943,20 @@ class SubscribeAttributeAudioOutputOutputList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOutputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"AudioOutput.OutputList response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.OutputList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4169,23 +4007,20 @@ class SubscribeAttributeAudioOutputCurrentOutput : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentOutputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"AudioOutput.CurrentOutput response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.CurrentOutput response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4235,25 +4070,21 @@ class SubscribeAttributeAudioOutputGeneratedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"AudioOutput.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4303,25 +4134,21 @@ class SubscribeAttributeAudioOutputAcceptedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"AudioOutput.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4372,23 +4199,20 @@ class SubscribeAttributeAudioOutputAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"AudioOutput.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4439,23 +4263,20 @@ class SubscribeAttributeAudioOutputFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"AudioOutput.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4506,23 +4327,20 @@ class SubscribeAttributeAudioOutputClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"AudioOutput.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -4619,16 +4437,17 @@ class BarrierControlBarrierControlStop : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster barrierControlStopWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster barrierControlStopWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -4683,25 +4502,21 @@ class SubscribeAttributeBarrierControlBarrierMovingState : public SubscribeAttri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierMovingStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BarrierControl.BarrierMovingState response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeBarrierMovingStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierMovingState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4752,24 +4567,20 @@ class SubscribeAttributeBarrierControlBarrierSafetyStatus : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBarrierSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BarrierControl.BarrierSafetyStatus response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierSafetyStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4820,24 +4631,20 @@ class SubscribeAttributeBarrierControlBarrierCapabilities : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBarrierCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BarrierControl.BarrierCapabilities response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCapabilities response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -4925,25 +4732,21 @@ class SubscribeAttributeBarrierControlBarrierOpenEvents : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BarrierControl.BarrierOpenEvents response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+        [cluster subscribeAttributeBarrierOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierOpenEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5031,25 +4834,21 @@ class SubscribeAttributeBarrierControlBarrierCloseEvents : public SubscribeAttri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BarrierControl.BarrierCloseEvents response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeBarrierCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCloseEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5138,26 +4937,21 @@ class SubscribeAttributeBarrierControlBarrierCommandOpenEvents : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierCommandOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BarrierControl.BarrierCommandOpenEvents response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeBarrierCommandOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCommandOpenEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5246,26 +5040,21 @@ class SubscribeAttributeBarrierControlBarrierCommandCloseEvents : public Subscri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierCommandCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"BarrierControl.BarrierCommandCloseEvents response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeBarrierCommandCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCommandCloseEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5353,25 +5142,21 @@ class SubscribeAttributeBarrierControlBarrierOpenPeriod : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BarrierControl.BarrierOpenPeriod response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+        [cluster subscribeAttributeBarrierOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierOpenPeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5459,25 +5244,21 @@ class SubscribeAttributeBarrierControlBarrierClosePeriod : public SubscribeAttri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBarrierClosePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BarrierControl.BarrierClosePeriod response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeBarrierClosePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierClosePeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5528,23 +5309,20 @@ class SubscribeAttributeBarrierControlBarrierPosition : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBarrierPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"BarrierControl.BarrierPosition response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierPosition response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5595,24 +5373,20 @@ class SubscribeAttributeBarrierControlGeneratedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"BarrierControl.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5663,24 +5437,20 @@ class SubscribeAttributeBarrierControlAcceptedCommandList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BarrierControl.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5731,23 +5501,20 @@ class SubscribeAttributeBarrierControlAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BarrierControl.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5798,23 +5565,20 @@ class SubscribeAttributeBarrierControlFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BarrierControl.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -5865,23 +5629,20 @@ class SubscribeAttributeBarrierControlClusterRevision : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"BarrierControl.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -5947,16 +5708,17 @@ class BasicMfgSpecificPing : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster mfgSpecificPingWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster mfgSpecificPingWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
@@ -6012,23 +5774,20 @@ class SubscribeAttributeBasicDataModelRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDataModelRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"Basic.DataModelRevision response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.DataModelRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6079,23 +5838,20 @@ class SubscribeAttributeBasicVendorName : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Basic.VendorName response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.VendorName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6146,23 +5902,20 @@ class SubscribeAttributeBasicVendorID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"Basic.VendorID response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.VendorID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6213,23 +5966,20 @@ class SubscribeAttributeBasicProductName : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"Basic.ProductName response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ProductName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6280,23 +6030,20 @@ class SubscribeAttributeBasicProductID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"Basic.ProductID response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ProductID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6387,23 +6134,20 @@ class SubscribeAttributeBasicNodeLabel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"Basic.NodeLabel response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.NodeLabel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6494,23 +6238,20 @@ class SubscribeAttributeBasicLocation : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLocationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"Basic.Location response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.Location response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6561,23 +6302,20 @@ class SubscribeAttributeBasicHardwareVersion : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Basic.HardwareVersion response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.HardwareVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6627,25 +6365,21 @@ class SubscribeAttributeBasicHardwareVersionString : public SubscribeAttribute {
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Basic.HardwareVersionString response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+        [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.HardwareVersionString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6696,23 +6430,20 @@ class SubscribeAttributeBasicSoftwareVersion : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Basic.SoftwareVersion response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.SoftwareVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6762,25 +6493,21 @@ class SubscribeAttributeBasicSoftwareVersionString : public SubscribeAttribute {
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Basic.SoftwareVersionString response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+        [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.SoftwareVersionString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6831,23 +6558,20 @@ class SubscribeAttributeBasicManufacturingDate : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"Basic.ManufacturingDate response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ManufacturingDate response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6898,23 +6622,20 @@ class SubscribeAttributeBasicPartNumber : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Basic.PartNumber response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.PartNumber response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -6965,23 +6686,20 @@ class SubscribeAttributeBasicProductURL : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Basic.ProductURL response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ProductURL response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7032,23 +6750,20 @@ class SubscribeAttributeBasicProductLabel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"Basic.ProductLabel response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ProductLabel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7099,23 +6814,20 @@ class SubscribeAttributeBasicSerialNumber : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"Basic.SerialNumber response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.SerialNumber response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7204,23 +6916,20 @@ class SubscribeAttributeBasicLocalConfigDisabled : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLocalConfigDisabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Basic.LocalConfigDisabled response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.LocalConfigDisabled response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7271,23 +6980,20 @@ class SubscribeAttributeBasicReachable : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"Basic.Reachable response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.Reachable response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7338,23 +7044,20 @@ class SubscribeAttributeBasicUniqueID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"Basic.UniqueID response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.UniqueID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7406,24 +7109,20 @@ class SubscribeAttributeBasicCapabilityMinima : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCapabilityMinimaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                         NSError * _Nullable error) {
-                                                         NSLog(@"Basic.CapabilityMinima response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.CapabilityMinima response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7474,23 +7173,20 @@ class SubscribeAttributeBasicGeneratedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Basic.GeneratedCommandList response %@", [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7541,23 +7237,20 @@ class SubscribeAttributeBasicAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Basic.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7608,23 +7301,20 @@ class SubscribeAttributeBasicAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Basic.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7675,23 +7365,20 @@ class SubscribeAttributeBasicFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Basic.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7742,23 +7429,20 @@ class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Basic.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -7879,23 +7563,20 @@ class SubscribeAttributeBinaryInputBasicActiveText : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BinaryInputBasic.ActiveText response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.ActiveText response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -7992,23 +7673,20 @@ class SubscribeAttributeBinaryInputBasicDescription : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"BinaryInputBasic.Description response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.Description response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8105,23 +7783,20 @@ class SubscribeAttributeBinaryInputBasicInactiveText : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInactiveTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BinaryInputBasic.InactiveText response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.InactiveText response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8216,23 +7891,20 @@ class SubscribeAttributeBinaryInputBasicOutOfService : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOutOfServiceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BinaryInputBasic.OutOfService response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.OutOfService response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8287,23 +7959,20 @@ class SubscribeAttributeBinaryInputBasicPolarity : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePolarityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"BinaryInputBasic.Polarity response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.Polarity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8398,23 +8067,20 @@ class SubscribeAttributeBinaryInputBasicPresentValue : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePresentValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BinaryInputBasic.PresentValue response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.PresentValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8509,23 +8175,20 @@ class SubscribeAttributeBinaryInputBasicReliability : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReliabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"BinaryInputBasic.Reliability response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.Reliability response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8580,23 +8243,20 @@ class SubscribeAttributeBinaryInputBasicStatusFlags : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStatusFlagsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"BinaryInputBasic.StatusFlags response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.StatusFlags response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8651,23 +8311,20 @@ class SubscribeAttributeBinaryInputBasicApplicationType : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeApplicationTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"BinaryInputBasic.ApplicationType response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.ApplicationType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8722,24 +8379,20 @@ class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"BinaryInputBasic.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8794,24 +8447,20 @@ class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BinaryInputBasic.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8866,23 +8515,20 @@ class SubscribeAttributeBinaryInputBasicAttributeList : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BinaryInputBasic.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -8937,23 +8583,20 @@ class SubscribeAttributeBinaryInputBasicFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BinaryInputBasic.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9008,23 +8651,20 @@ class SubscribeAttributeBinaryInputBasicClusterRevision : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"BinaryInputBasic.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -9164,23 +8804,20 @@ class SubscribeAttributeBindingBinding : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBindingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"Binding.Binding response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.Binding response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9230,25 +8867,21 @@ class SubscribeAttributeBindingGeneratedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Binding.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9299,23 +8932,20 @@ class SubscribeAttributeBindingAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Binding.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9366,23 +8996,20 @@ class SubscribeAttributeBindingAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Binding.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9433,23 +9060,20 @@ class SubscribeAttributeBindingFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Binding.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9500,23 +9124,20 @@ class SubscribeAttributeBindingClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Binding.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -9584,23 +9205,20 @@ class SubscribeAttributeBooleanStateStateValue : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStateValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BooleanState.StateValue response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanState.StateValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9651,24 +9269,20 @@ class SubscribeAttributeBooleanStateGeneratedCommandList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"BooleanState.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanState.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9718,25 +9332,21 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"BooleanState.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanState.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9787,23 +9397,20 @@ class SubscribeAttributeBooleanStateAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BooleanState.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanState.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9854,23 +9461,20 @@ class SubscribeAttributeBooleanStateFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BooleanState.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanState.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -9921,23 +9525,20 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"BooleanState.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanState.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -10630,23 +10231,20 @@ class SubscribeAttributeBridgedActionsActionList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActionListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedActions.ActionList response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.ActionList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -10697,23 +10295,20 @@ class SubscribeAttributeBridgedActionsEndpointList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEndpointListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BridgedActions.EndpointList response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.EndpointList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -10764,23 +10359,20 @@ class SubscribeAttributeBridgedActionsSetupUrl : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSetupUrlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -10831,24 +10423,20 @@ class SubscribeAttributeBridgedActionsGeneratedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"BridgedActions.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -10899,24 +10487,20 @@ class SubscribeAttributeBridgedActionsAcceptedCommandList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BridgedActions.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -10967,23 +10551,20 @@ class SubscribeAttributeBridgedActionsAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BridgedActions.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11034,23 +10615,20 @@ class SubscribeAttributeBridgedActionsFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11101,23 +10679,20 @@ class SubscribeAttributeBridgedActionsClusterRevision : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -11206,23 +10781,20 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11277,23 +10849,20 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11348,23 +10917,20 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11461,23 +11027,20 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11531,25 +11094,21 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11604,24 +11163,20 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11675,25 +11230,21 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11748,24 +11299,20 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11820,24 +11367,20 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11892,23 +11435,20 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -11963,23 +11503,20 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12034,23 +11571,20 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12105,23 +11639,20 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12176,23 +11707,20 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12247,23 +11775,20 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12318,24 +11843,20 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12390,24 +11911,20 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12462,23 +11979,20 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12533,23 +12047,20 @@ class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12603,25 +12114,21 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -12831,23 +12338,20 @@ class SubscribeAttributeChannelChannelList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeChannelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"Channel.ChannelList response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.ChannelList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12898,25 +12402,21 @@ class SubscribeAttributeChannelLineup : public SubscribeAttribute {
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeLineupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                             params:params
-                            subscriptionEstablished:nullptr
-                                      reportHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) {
-                                          NSLog(@"Channel.Lineup response %@", [value description]);
-                                          if (error || !mWait) {
-                                              SetCommandExitStatus(error);
-                                          }
-                                      }];
+        [cluster subscribeAttributeLineupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.Lineup response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -12968,24 +12468,20 @@ class SubscribeAttributeChannelCurrentChannel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(
-                                                       CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"Channel.CurrentChannel response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.CurrentChannel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -13035,25 +12531,21 @@ class SubscribeAttributeChannelGeneratedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Channel.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -13104,23 +12596,20 @@ class SubscribeAttributeChannelAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Channel.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -13171,23 +12660,20 @@ class SubscribeAttributeChannelAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Channel.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -13238,23 +12724,20 @@ class SubscribeAttributeChannelFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Channel.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -13305,23 +12788,20 @@ class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Channel.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -14438,23 +13918,20 @@ class SubscribeAttributeColorControlCurrentHue : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ColorControl.CurrentHue response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CurrentHue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14505,23 +13982,20 @@ class SubscribeAttributeColorControlCurrentSaturation : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentSaturationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.CurrentSaturation response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CurrentSaturation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14572,23 +14046,20 @@ class SubscribeAttributeColorControlRemainingTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ColorControl.RemainingTime response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.RemainingTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14639,23 +14110,20 @@ class SubscribeAttributeColorControlCurrentX : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ColorControl.CurrentX response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CurrentX response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14706,23 +14174,20 @@ class SubscribeAttributeColorControlCurrentY : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ColorControl.CurrentY response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CurrentY response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14773,23 +14238,20 @@ class SubscribeAttributeColorControlDriftCompensation : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDriftCompensationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.DriftCompensation response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.DriftCompensation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14840,23 +14302,20 @@ class SubscribeAttributeColorControlCompensationText : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCompensationTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ColorControl.CompensationText response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CompensationText response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14907,23 +14366,20 @@ class SubscribeAttributeColorControlColorTemperature : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ColorControl.ColorTemperature response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTemperature response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -14974,23 +14430,20 @@ class SubscribeAttributeColorControlColorMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.ColorMode response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15079,23 +14532,20 @@ class SubscribeAttributeColorControlOptions : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ColorControl.Options response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Options response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15146,23 +14596,20 @@ class SubscribeAttributeColorControlNumberOfPrimaries : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNumberOfPrimariesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.NumberOfPrimaries response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.NumberOfPrimaries response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15213,23 +14660,20 @@ class SubscribeAttributeColorControlPrimary1X : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary1XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary1X response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary1X response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15280,23 +14724,20 @@ class SubscribeAttributeColorControlPrimary1Y : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary1YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary1Y response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary1Y response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15347,23 +14788,20 @@ class SubscribeAttributeColorControlPrimary1Intensity : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary1IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.Primary1Intensity response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary1Intensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15414,23 +14852,20 @@ class SubscribeAttributeColorControlPrimary2X : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary2XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary2X response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary2X response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15481,23 +14916,20 @@ class SubscribeAttributeColorControlPrimary2Y : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary2YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary2Y response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary2Y response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15548,23 +14980,20 @@ class SubscribeAttributeColorControlPrimary2Intensity : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary2IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.Primary2Intensity response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary2Intensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15615,23 +15044,20 @@ class SubscribeAttributeColorControlPrimary3X : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary3XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary3X response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary3X response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15682,23 +15108,20 @@ class SubscribeAttributeColorControlPrimary3Y : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary3YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary3Y response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary3Y response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15749,23 +15172,20 @@ class SubscribeAttributeColorControlPrimary3Intensity : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary3IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.Primary3Intensity response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary3Intensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15816,23 +15236,20 @@ class SubscribeAttributeColorControlPrimary4X : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary4XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary4X response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary4X response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15883,23 +15300,20 @@ class SubscribeAttributeColorControlPrimary4Y : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary4YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary4Y response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary4Y response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -15950,23 +15364,20 @@ class SubscribeAttributeColorControlPrimary4Intensity : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary4IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.Primary4Intensity response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary4Intensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16017,23 +15428,20 @@ class SubscribeAttributeColorControlPrimary5X : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary5XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary5X response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary5X response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16084,23 +15492,20 @@ class SubscribeAttributeColorControlPrimary5Y : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary5YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary5Y response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary5Y response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16151,23 +15556,20 @@ class SubscribeAttributeColorControlPrimary5Intensity : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary5IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.Primary5Intensity response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary5Intensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16218,23 +15620,20 @@ class SubscribeAttributeColorControlPrimary6X : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary6XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary6X response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary6X response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16285,23 +15684,20 @@ class SubscribeAttributeColorControlPrimary6Y : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary6YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ColorControl.Primary6Y response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary6Y response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16352,23 +15748,20 @@ class SubscribeAttributeColorControlPrimary6Intensity : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePrimary6IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.Primary6Intensity response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary6Intensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16457,23 +15850,20 @@ class SubscribeAttributeColorControlWhitePointX : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWhitePointXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ColorControl.WhitePointX response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.WhitePointX response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16562,23 +15952,20 @@ class SubscribeAttributeColorControlWhitePointY : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWhitePointYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ColorControl.WhitePointY response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.WhitePointY response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16667,23 +16054,20 @@ class SubscribeAttributeColorControlColorPointRX : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointRXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ColorControl.ColorPointRX response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointRX response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16772,23 +16156,20 @@ class SubscribeAttributeColorControlColorPointRY : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointRYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ColorControl.ColorPointRY response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointRY response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16877,24 +16258,20 @@ class SubscribeAttributeColorControlColorPointRIntensity : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointRIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ColorControl.ColorPointRIntensity response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointRIntensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -16983,23 +16360,20 @@ class SubscribeAttributeColorControlColorPointGX : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointGXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ColorControl.ColorPointGX response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointGX response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17088,23 +16462,20 @@ class SubscribeAttributeColorControlColorPointGY : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointGYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ColorControl.ColorPointGY response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointGY response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17193,24 +16564,20 @@ class SubscribeAttributeColorControlColorPointGIntensity : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointGIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ColorControl.ColorPointGIntensity response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointGIntensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17299,23 +16666,20 @@ class SubscribeAttributeColorControlColorPointBX : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointBXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ColorControl.ColorPointBX response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointBX response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17404,23 +16768,20 @@ class SubscribeAttributeColorControlColorPointBY : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointBYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ColorControl.ColorPointBY response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointBY response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17509,24 +16870,20 @@ class SubscribeAttributeColorControlColorPointBIntensity : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorPointBIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ColorControl.ColorPointBIntensity response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointBIntensity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17576,25 +16933,21 @@ class SubscribeAttributeColorControlEnhancedCurrentHue : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeEnhancedCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ColorControl.EnhancedCurrentHue response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeEnhancedCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.EnhancedCurrentHue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17645,23 +16998,20 @@ class SubscribeAttributeColorControlEnhancedColorMode : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEnhancedColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.EnhancedColorMode response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.EnhancedColorMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17712,23 +17062,20 @@ class SubscribeAttributeColorControlColorLoopActive : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorLoopActiveWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ColorControl.ColorLoopActive response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopActive response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17778,25 +17125,21 @@ class SubscribeAttributeColorControlColorLoopDirection : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeColorLoopDirectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ColorControl.ColorLoopDirection response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeColorLoopDirectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopDirection response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17847,23 +17190,20 @@ class SubscribeAttributeColorControlColorLoopTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorLoopTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ColorControl.ColorLoopTime response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17914,26 +17254,21 @@ class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ColorControl.ColorLoopStartEnhancedHue response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopStartEnhancedHue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -17984,26 +17319,21 @@ class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ColorControl.ColorLoopStoredEnhancedHue response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopStoredEnhancedHue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18054,23 +17384,20 @@ class SubscribeAttributeColorControlColorCapabilities : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeColorCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ColorControl.ColorCapabilities response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorCapabilities response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18121,26 +17448,21 @@ class SubscribeAttributeColorControlColorTempPhysicalMinMireds : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ColorControl.ColorTempPhysicalMinMireds response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTempPhysicalMinMireds response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18191,26 +17513,21 @@ class SubscribeAttributeColorControlColorTempPhysicalMaxMireds : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ColorControl.ColorTempPhysicalMaxMireds response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTempPhysicalMaxMireds response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18261,28 +17578,21 @@ class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public Sub
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                      params:params
-                                                     subscriptionEstablished:nullptr
-                                                               reportHandler:^(
-                                                                   NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                   NSLog(
-                                                                       @"ColorControl.CoupleColorTempToLevelMinMireds response %@",
-                                                                       [value description]);
-                                                                   if (error || !mWait) {
-                                                                       SetCommandExitStatus(error);
-                                                                   }
-                                                               }];
+        [cluster subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CoupleColorTempToLevelMinMireds response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18372,27 +17682,21 @@ class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public Subsc
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"ColorControl.StartUpColorTemperatureMireds response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.StartUpColorTemperatureMireds response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18443,24 +17747,20 @@ class SubscribeAttributeColorControlGeneratedCommandList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ColorControl.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18510,25 +17810,21 @@ class SubscribeAttributeColorControlAcceptedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ColorControl.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18579,23 +17875,20 @@ class SubscribeAttributeColorControlAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ColorControl.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18646,23 +17939,20 @@ class SubscribeAttributeColorControlFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ColorControl.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -18713,23 +18003,20 @@ class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ColorControl.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -19123,23 +18410,20 @@ class SubscribeAttributeContentLauncherAcceptHeader : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptHeaderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ContentLauncher.AcceptHeader response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.AcceptHeader response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19229,26 +18513,21 @@ class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public Subs
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSupportedStreamingProtocolsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ContentLauncher.SupportedStreamingProtocols response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeSupportedStreamingProtocolsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.SupportedStreamingProtocols response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19299,24 +18578,20 @@ class SubscribeAttributeContentLauncherGeneratedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ContentLauncher.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19367,24 +18642,20 @@ class SubscribeAttributeContentLauncherAcceptedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ContentLauncher.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19435,23 +18706,20 @@ class SubscribeAttributeContentLauncherAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ContentLauncher.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19502,23 +18770,20 @@ class SubscribeAttributeContentLauncherFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ContentLauncher.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19569,23 +18834,20 @@ class SubscribeAttributeContentLauncherClusterRevision : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ContentLauncher.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -19655,23 +18917,20 @@ class SubscribeAttributeDescriptorDeviceList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDeviceListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Descriptor.DeviceList response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.DeviceList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19722,23 +18981,20 @@ class SubscribeAttributeDescriptorServerList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeServerListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Descriptor.ServerList response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.ServerList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19789,23 +19045,20 @@ class SubscribeAttributeDescriptorClientList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClientListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Descriptor.ClientList response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.ClientList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19856,23 +19109,20 @@ class SubscribeAttributeDescriptorPartsList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePartsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"Descriptor.PartsList response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.PartsList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19922,25 +19172,21 @@ class SubscribeAttributeDescriptorGeneratedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Descriptor.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -19990,25 +19236,21 @@ class SubscribeAttributeDescriptorAcceptedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"Descriptor.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20059,23 +19301,20 @@ class SubscribeAttributeDescriptorAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Descriptor.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20126,23 +19365,20 @@ class SubscribeAttributeDescriptorFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Descriptor.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20193,23 +19429,20 @@ class SubscribeAttributeDescriptorClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Descriptor.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -20327,24 +19560,20 @@ class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"DiagnosticLogs.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20395,24 +19624,20 @@ class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DiagnosticLogs.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20463,23 +19688,20 @@ class SubscribeAttributeDiagnosticLogsAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"DiagnosticLogs.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20530,23 +19752,20 @@ class SubscribeAttributeDiagnosticLogsFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"DiagnosticLogs.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -20597,23 +19816,20 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"DiagnosticLogs.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -20623,13 +19839,6 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 | * LockDoor                                                          |   0x00 |
 | * UnlockDoor                                                        |   0x01 |
 | * UnlockWithTimeout                                                 |   0x03 |
-| * GetLogRecord                                                      |   0x04 |
-| * SetPINCode                                                        |   0x05 |
-| * GetPINCode                                                        |   0x06 |
-| * ClearPINCode                                                      |   0x07 |
-| * ClearAllPINCodes                                                  |   0x08 |
-| * SetUserStatus                                                     |   0x09 |
-| * GetUserStatus                                                     |   0x0A |
 | * SetWeekDaySchedule                                                |   0x0B |
 | * GetWeekDaySchedule                                                |   0x0C |
 | * ClearWeekDaySchedule                                              |   0x0D |
@@ -20639,12 +19848,6 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 | * SetHolidaySchedule                                                |   0x11 |
 | * GetHolidaySchedule                                                |   0x12 |
 | * ClearHolidaySchedule                                              |   0x13 |
-| * SetUserType                                                       |   0x14 |
-| * GetUserType                                                       |   0x15 |
-| * SetRFIDCode                                                       |   0x16 |
-| * GetRFIDCode                                                       |   0x17 |
-| * ClearRFIDCode                                                     |   0x18 |
-| * ClearAllRFIDCodes                                                 |   0x19 |
 | * SetUser                                                           |   0x1A |
 | * GetUser                                                           |   0x1B |
 | * ClearUser                                                         |   0x1D |
@@ -20660,7 +19863,6 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 | * DoorOpenEvents                                                    | 0x0004 |
 | * DoorClosedEvents                                                  | 0x0005 |
 | * OpenPeriod                                                        | 0x0006 |
-| * NumberOfLogRecordsSupported                                       | 0x0010 |
 | * NumberOfTotalUsersSupported                                       | 0x0011 |
 | * NumberOfPINUsersSupported                                         | 0x0012 |
 | * NumberOfRFIDUsersSupported                                        | 0x0013 |
@@ -20673,7 +19875,6 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 | * MinRFIDCodeLength                                                 | 0x001A |
 | * CredentialRulesSupport                                            | 0x001B |
 | * NumberOfCredentialsSupportedPerUser                               | 0x001C |
-| * EnableLogging                                                     | 0x0020 |
 | * Language                                                          | 0x0021 |
 | * LEDSettings                                                       | 0x0022 |
 | * AutoRelockTime                                                    | 0x0023 |
@@ -20691,14 +19892,6 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
 | * SendPINOverTheAir                                                 | 0x0032 |
 | * RequirePINforRemoteOperation                                      | 0x0033 |
 | * ExpiringUserTimeout                                               | 0x0035 |
-| * AlarmMask                                                         | 0x0040 |
-| * KeypadOperationEventMask                                          | 0x0041 |
-| * RemoteOperationEventMask                                          | 0x0042 |
-| * ManualOperationEventMask                                          | 0x0043 |
-| * RFIDOperationEventMask                                            | 0x0044 |
-| * KeypadProgrammingEventMask                                        | 0x0045 |
-| * RemoteProgrammingEventMask                                        | 0x0046 |
-| * RFIDProgrammingEventMask                                          | 0x0047 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -20859,332 +20052,6 @@ class DoorLockUnlockWithTimeout : public ClusterCommand {
     chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest;
 };
 
-/*
- * Command GetLogRecord
- */
-class DoorLockGetLogRecord : public ClusterCommand {
-public:
-    DoorLockGetLogRecord()
-        : ClusterCommand("get-log-record")
-    {
-        AddArgument("LogIndex", 0, UINT16_MAX, &mRequest.logIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000004) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetLogRecordParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.logIndex = [NSNumber numberWithUnsignedShort:mRequest.logIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getLogRecordWithParams:params
-                          completionHandler:^(
-                              CHIPDoorLockClusterGetLogRecordResponseParams * _Nullable values, NSError * _Nullable error) {
-                              NSLog(@"Values: %@", values);
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetLogRecord::Type mRequest;
-};
-
-/*
- * Command SetPINCode
- */
-class DoorLockSetPINCode : public ClusterCommand {
-public:
-    DoorLockSetPINCode()
-        : ClusterCommand("set-pincode")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("Pin", &mRequest.pin);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000005) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetPINCodeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        if (mRequest.userStatus.IsNull()) {
-            params.userStatus = nil;
-        } else {
-            params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus.Value())];
-        }
-        if (mRequest.userType.IsNull()) {
-            params.userType = nil;
-        } else {
-            params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType.Value())];
-        }
-        params.pin = [NSData dataWithBytes:mRequest.pin.data() length:mRequest.pin.size()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setPINCodeWithParams:params
-                        completionHandler:^(NSError * _Nullable error) {
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetPINCode::Type mRequest;
-};
-
-/*
- * Command GetPINCode
- */
-class DoorLockGetPINCode : public ClusterCommand {
-public:
-    DoorLockGetPINCode()
-        : ClusterCommand("get-pincode")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000006) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetPINCodeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                getPINCodeWithParams:params
-                   completionHandler:^(CHIPDoorLockClusterGetPINCodeResponseParams * _Nullable values, NSError * _Nullable error) {
-                       NSLog(@"Values: %@", values);
-                       responsesNeeded--;
-                       if (error != nil) {
-                           mError = error;
-                           LogNSError("Error", error);
-                       }
-                       if (responsesNeeded == 0) {
-                           SetCommandExitStatus(mError);
-                       }
-                   }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetPINCode::Type mRequest;
-};
-
-/*
- * Command ClearPINCode
- */
-class DoorLockClearPINCode : public ClusterCommand {
-public:
-    DoorLockClearPINCode()
-        : ClusterCommand("clear-pincode")
-    {
-        AddArgument("PinSlotIndex", 0, UINT16_MAX, &mRequest.pinSlotIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000007) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearPINCodeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.pinSlotIndex = [NSNumber numberWithUnsignedShort:mRequest.pinSlotIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearPINCodeWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearPINCode::Type mRequest;
-};
-
-/*
- * Command ClearAllPINCodes
- */
-class DoorLockClearAllPINCodes : public ClusterCommand {
-public:
-    DoorLockClearAllPINCodes()
-        : ClusterCommand("clear-all-pincodes")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000008) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearAllPINCodesParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearAllPINCodesWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-/*
- * Command SetUserStatus
- */
-class DoorLockSetUserStatus : public ClusterCommand {
-public:
-    DoorLockSetUserStatus()
-        : ClusterCommand("set-user-status")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000009) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetUserStatusParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setUserStatusWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetUserStatus::Type mRequest;
-};
-
-/*
- * Command GetUserStatus
- */
-class DoorLockGetUserStatus : public ClusterCommand {
-public:
-    DoorLockGetUserStatus()
-        : ClusterCommand("get-user-status")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000A) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetUserStatusParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getUserStatusWithParams:params
-                           completionHandler:^(
-                               CHIPDoorLockClusterGetUserStatusResponseParams * _Nullable values, NSError * _Nullable error) {
-                               NSLog(@"Values: %@", values);
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetUserStatus::Type mRequest;
-};
-
 /*
  * Command SetWeekDaySchedule
  */
@@ -21619,286 +20486,6 @@ class DoorLockClearHolidaySchedule : public ClusterCommand {
     chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type mRequest;
 };
 
-/*
- * Command SetUserType
- */
-class DoorLockSetUserType : public ClusterCommand {
-public:
-    DoorLockSetUserType()
-        : ClusterCommand("set-user-type")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000014) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetUserTypeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setUserTypeWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetUserType::Type mRequest;
-};
-
-/*
- * Command GetUserType
- */
-class DoorLockGetUserType : public ClusterCommand {
-public:
-    DoorLockGetUserType()
-        : ClusterCommand("get-user-type")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000015) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetUserTypeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getUserTypeWithParams:params
-                         completionHandler:^(
-                             CHIPDoorLockClusterGetUserTypeResponseParams * _Nullable values, NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetUserType::Type mRequest;
-};
-
-/*
- * Command SetRFIDCode
- */
-class DoorLockSetRFIDCode : public ClusterCommand {
-public:
-    DoorLockSetRFIDCode()
-        : ClusterCommand("set-rfidcode")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("RfidCode", &mRequest.rfidCode);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000016) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetRFIDCodeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        if (mRequest.userStatus.IsNull()) {
-            params.userStatus = nil;
-        } else {
-            params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus.Value())];
-        }
-        if (mRequest.userType.IsNull()) {
-            params.userType = nil;
-        } else {
-            params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType.Value())];
-        }
-        params.rfidCode = [NSData dataWithBytes:mRequest.rfidCode.data() length:mRequest.rfidCode.size()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setRFIDCodeWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetRFIDCode::Type mRequest;
-};
-
-/*
- * Command GetRFIDCode
- */
-class DoorLockGetRFIDCode : public ClusterCommand {
-public:
-    DoorLockGetRFIDCode()
-        : ClusterCommand("get-rfidcode")
-    {
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000017) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetRFIDCodeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getRFIDCodeWithParams:params
-                         completionHandler:^(
-                             CHIPDoorLockClusterGetRFIDCodeResponseParams * _Nullable values, NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetRFIDCode::Type mRequest;
-};
-
-/*
- * Command ClearRFIDCode
- */
-class DoorLockClearRFIDCode : public ClusterCommand {
-public:
-    DoorLockClearRFIDCode()
-        : ClusterCommand("clear-rfidcode")
-    {
-        AddArgument("RfidSlotIndex", 0, UINT16_MAX, &mRequest.rfidSlotIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000018) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearRFIDCodeParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.rfidSlotIndex = [NSNumber numberWithUnsignedShort:mRequest.rfidSlotIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearRFIDCodeWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearRFIDCode::Type mRequest;
-};
-
-/*
- * Command ClearAllRFIDCodes
- */
-class DoorLockClearAllRFIDCodes : public ClusterCommand {
-public:
-    DoorLockClearAllRFIDCodes()
-        : ClusterCommand("clear-all-rfidcodes")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000019) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearAllRFIDCodesParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearAllRFIDCodesWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
 /*
  * Command SetUser
  */
@@ -22244,130 +20831,6 @@ class DoorLockClearCredential : public ClusterCommand {
         mComplex_Credential;
 };
 
-/*
- * Command OperatingEventNotification
- */
-class DoorLockOperatingEventNotification : public ClusterCommand {
-public:
-    DoorLockOperatingEventNotification()
-        : ClusterCommand("operating-event-notification")
-    {
-        AddArgument("OperationEventSource", 0, UINT8_MAX, &mRequest.operationEventSource);
-        AddArgument("OperationEventCode", 0, UINT8_MAX, &mRequest.operationEventCode);
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("Pin", &mRequest.pin);
-        AddArgument("LocalTime", 0, UINT32_MAX, &mRequest.localTime);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000020) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterOperatingEventNotificationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.operationEventSource = [NSNumber numberWithUnsignedChar:mRequest.operationEventSource];
-        params.operationEventCode = [NSNumber numberWithUnsignedChar:mRequest.operationEventCode];
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        params.pin = [NSData dataWithBytes:mRequest.pin.data() length:mRequest.pin.size()];
-        params.localTime = [NSNumber numberWithUnsignedInt:mRequest.localTime];
-        if (mRequest.data.HasValue()) {
-            params.data = [[NSString alloc] initWithBytes:mRequest.data.Value().data()
-                                                   length:mRequest.data.Value().size()
-                                                 encoding:NSUTF8StringEncoding];
-        } else {
-            params.data = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster operatingEventNotificationWithParams:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            responsesNeeded--;
-                                            if (error != nil) {
-                                                mError = error;
-                                                LogNSError("Error", error);
-                                            }
-                                            if (responsesNeeded == 0) {
-                                                SetCommandExitStatus(mError);
-                                            }
-                                        }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::OperatingEventNotification::Type mRequest;
-};
-
-/*
- * Command ProgrammingEventNotification
- */
-class DoorLockProgrammingEventNotification : public ClusterCommand {
-public:
-    DoorLockProgrammingEventNotification()
-        : ClusterCommand("programming-event-notification")
-    {
-        AddArgument("ProgramEventSource", 0, UINT8_MAX, &mRequest.programEventSource);
-        AddArgument("ProgramEventCode", 0, UINT8_MAX, &mRequest.programEventCode);
-        AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId);
-        AddArgument("Pin", &mRequest.pin);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("LocalTime", 0, UINT32_MAX, &mRequest.localTime);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000021) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterProgrammingEventNotificationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.programEventSource = [NSNumber numberWithUnsignedChar:mRequest.programEventSource];
-        params.programEventCode = [NSNumber numberWithUnsignedChar:mRequest.programEventCode];
-        params.userId = [NSNumber numberWithUnsignedShort:mRequest.userId];
-        params.pin = [NSData dataWithBytes:mRequest.pin.data() length:mRequest.pin.size()];
-        params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType)];
-        params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus)];
-        params.localTime = [NSNumber numberWithUnsignedInt:mRequest.localTime];
-        if (mRequest.data.HasValue()) {
-            params.data = [[NSString alloc] initWithBytes:mRequest.data.Value().data()
-                                                   length:mRequest.data.Value().size()
-                                                 encoding:NSUTF8StringEncoding];
-        } else {
-            params.data = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster programmingEventNotificationWithParams:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              responsesNeeded--;
-                                              if (error != nil) {
-                                                  mError = error;
-                                                  LogNSError("Error", error);
-                                              }
-                                              if (responsesNeeded == 0) {
-                                                  SetCommandExitStatus(mError);
-                                              }
-                                          }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ProgrammingEventNotification::Type mRequest;
-};
-
 /*
  * Attribute LockState
  */
@@ -22416,23 +20879,20 @@ class SubscribeAttributeDoorLockLockState : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLockStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"DoorLock.LockState response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LockState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -22483,23 +20943,20 @@ class SubscribeAttributeDoorLockLockType : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLockTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"DoorLock.LockType response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LockType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -22550,23 +21007,20 @@ class SubscribeAttributeDoorLockActuatorEnabled : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActuatorEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"DoorLock.ActuatorEnabled response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.ActuatorEnabled response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -22617,23 +21071,20 @@ class SubscribeAttributeDoorLockDoorState : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDoorStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"DoorLock.DoorState response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.DoorState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -22722,23 +21173,20 @@ class SubscribeAttributeDoorLockDoorOpenEvents : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDoorOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"DoorLock.DoorOpenEvents response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.DoorOpenEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -22827,23 +21275,20 @@ class SubscribeAttributeDoorLockDoorClosedEvents : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDoorClosedEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"DoorLock.DoorClosedEvents response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.DoorClosedEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -22932,93 +21377,20 @@ class SubscribeAttributeDoorLockOpenPeriod : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"DoorLock.OpenPeriod response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute NumberOfLogRecordsSupported
- */
-class ReadDoorLockNumberOfLogRecordsSupported : public ReadAttribute {
-public:
-    ReadDoorLockNumberOfLogRecordsSupported()
-        : ReadAttribute("number-of-log-records-supported")
-    {
-    }
-
-    ~ReadDoorLockNumberOfLogRecordsSupported() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000010) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeNumberOfLogRecordsSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfLogRecordsSupported response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock NumberOfLogRecordsSupported read Error", error);
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.OpenPeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
                 }
-                SetCommandExitStatus(error);
             }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeDoorLockNumberOfLogRecordsSupported : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockNumberOfLogRecordsSupported()
-        : SubscribeAttribute("number-of-log-records-supported")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockNumberOfLogRecordsSupported() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000010) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfLogRecordsSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"DoorLock.NumberOfLogRecordsSupported response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23069,26 +21441,21 @@ class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"DoorLock.NumberOfTotalUsersSupported response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfTotalUsersSupported response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23139,26 +21506,21 @@ class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"DoorLock.NumberOfPINUsersSupported response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfPINUsersSupported response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23209,26 +21571,21 @@ class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"DoorLock.NumberOfRFIDUsersSupported response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfRFIDUsersSupported response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23281,27 +21638,20 @@ class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : publi
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"DoorLock."
-                                                                                  @"NumberOfWeekDaySchedulesSupportedPerUser "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfWeekDaySchedulesSupportedPerUser response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23354,27 +21704,20 @@ class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : publi
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"DoorLock."
-                                                                                  @"NumberOfYearDaySchedulesSupportedPerUser "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfYearDaySchedulesSupportedPerUser response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23425,28 +21768,21 @@ class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public Subsc
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                        params:params
-                                                       subscriptionEstablished:nullptr
-                                                                 reportHandler:^(
-                                                                     NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                     NSLog(
-                                                                         @"DoorLock.NumberOfHolidaySchedulesSupported response %@",
-                                                                         [value description]);
-                                                                     if (error || !mWait) {
-                                                                         SetCommandExitStatus(error);
-                                                                     }
-                                                                 }];
+        [cluster subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfHolidaySchedulesSupported response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23497,23 +21833,20 @@ class SubscribeAttributeDoorLockMaxPINCodeLength : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"DoorLock.MaxPINCodeLength response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MaxPINCodeLength response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23564,23 +21897,20 @@ class SubscribeAttributeDoorLockMinPINCodeLength : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"DoorLock.MinPINCodeLength response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MinPINCodeLength response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23631,23 +21961,20 @@ class SubscribeAttributeDoorLockMaxRFIDCodeLength : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"DoorLock.MaxRFIDCodeLength response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MaxRFIDCodeLength response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23698,23 +22025,20 @@ class SubscribeAttributeDoorLockMinRFIDCodeLength : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"DoorLock.MinRFIDCodeLength response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MinRFIDCodeLength response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23765,24 +22089,20 @@ class SubscribeAttributeDoorLockCredentialRulesSupport : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCredentialRulesSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"DoorLock.CredentialRulesSupport response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.CredentialRulesSupport response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -23834,131 +22154,20 @@ class SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"DoorLock.NumberOfCredentialsSupportedPerUser "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute EnableLogging
- */
-class ReadDoorLockEnableLogging : public ReadAttribute {
-public:
-    ReadDoorLockEnableLogging()
-        : ReadAttribute("enable-logging")
-    {
-    }
-
-    ~ReadDoorLockEnableLogging() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000020) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnableLoggingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.EnableLogging response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock EnableLogging read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockEnableLogging : public WriteAttribute {
-public:
-    WriteDoorLockEnableLogging()
-        : WriteAttribute("enable-logging")
-    {
-        AddArgument("attr-name", "enable-logging");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockEnableLogging() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000020) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeEnableLoggingWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("DoorLock EnableLogging write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeDoorLockEnableLogging : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockEnableLogging()
-        : SubscribeAttribute("enable-logging")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockEnableLogging() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000020) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnableLoggingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"DoorLock.EnableLogging response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfCredentialsSupportedPerUser response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24049,23 +22258,20 @@ class SubscribeAttributeDoorLockLanguage : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLanguageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"DoorLock.Language response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.Language response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24154,23 +22360,20 @@ class SubscribeAttributeDoorLockLEDSettings : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLEDSettingsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"DoorLock.LEDSettings response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LEDSettings response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24259,23 +22462,20 @@ class SubscribeAttributeDoorLockAutoRelockTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAutoRelockTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"DoorLock.AutoRelockTime response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.AutoRelockTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24364,23 +22564,20 @@ class SubscribeAttributeDoorLockSoundVolume : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSoundVolumeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"DoorLock.SoundVolume response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.SoundVolume response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24469,23 +22666,20 @@ class SubscribeAttributeDoorLockOperatingMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOperatingModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"DoorLock.OperatingMode response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.OperatingMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24537,24 +22731,20 @@ class SubscribeAttributeDoorLockSupportedOperatingModes : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSupportedOperatingModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"DoorLock.SupportedOperatingModes response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.SupportedOperatingModes response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24605,26 +22795,21 @@ class SubscribeAttributeDoorLockDefaultConfigurationRegister : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeDefaultConfigurationRegisterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"DoorLock.DefaultConfigurationRegister response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeDefaultConfigurationRegisterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.DefaultConfigurationRegister response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24713,24 +22898,20 @@ class SubscribeAttributeDoorLockEnableLocalProgramming : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEnableLocalProgrammingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"DoorLock.EnableLocalProgramming response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnableLocalProgramming response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24818,25 +22999,21 @@ class SubscribeAttributeDoorLockEnableOneTouchLocking : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeEnableOneTouchLockingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"DoorLock.EnableOneTouchLocking response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+        [cluster subscribeAttributeEnableOneTouchLockingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnableOneTouchLocking response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -24924,25 +23101,21 @@ class SubscribeAttributeDoorLockEnableInsideStatusLED : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeEnableInsideStatusLEDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"DoorLock.EnableInsideStatusLED response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+        [cluster subscribeAttributeEnableInsideStatusLEDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnableInsideStatusLED response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25032,24 +23205,20 @@ class SubscribeAttributeDoorLockEnablePrivacyModeButton : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEnablePrivacyModeButtonWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"DoorLock.EnablePrivacyModeButton response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnablePrivacyModeButton response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25138,26 +23307,21 @@ class SubscribeAttributeDoorLockLocalProgrammingFeatures : public SubscribeAttri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeLocalProgrammingFeaturesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.LocalProgrammingFeatures response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeLocalProgrammingFeaturesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LocalProgrammingFeatures response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25246,23 +23410,20 @@ class SubscribeAttributeDoorLockWrongCodeEntryLimit : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWrongCodeEntryLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.WrongCodeEntryLimit response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.WrongCodeEntryLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25351,26 +23512,21 @@ class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"DoorLock.UserCodeTemporaryDisableTime response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.UserCodeTemporaryDisableTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25459,23 +23615,20 @@ class SubscribeAttributeDoorLockSendPINOverTheAir : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSendPINOverTheAirWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"DoorLock.SendPINOverTheAir response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.SendPINOverTheAir response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25564,26 +23717,21 @@ class SubscribeAttributeDoorLockRequirePINforRemoteOperation : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRequirePINforRemoteOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"DoorLock.RequirePINforRemoteOperation response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeRequirePINforRemoteOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.RequirePINforRemoteOperation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -25672,882 +23820,20 @@ class SubscribeAttributeDoorLockExpiringUserTimeout : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeExpiringUserTimeoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.ExpiringUserTimeout response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute AlarmMask
- */
-class ReadDoorLockAlarmMask : public ReadAttribute {
-public:
-    ReadDoorLockAlarmMask()
-        : ReadAttribute("alarm-mask")
-    {
-    }
-
-    ~ReadDoorLockAlarmMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000040) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAlarmMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.AlarmMask response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock AlarmMask read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockAlarmMask : public WriteAttribute {
-public:
-    WriteDoorLockAlarmMask()
-        : WriteAttribute("alarm-mask")
-    {
-        AddArgument("attr-name", "alarm-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockAlarmMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000040) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeAlarmMaskWithValue:value
-                                           params:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    if (error != nil) {
-                                        LogNSError("DoorLock AlarmMask write Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockAlarmMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockAlarmMask()
-        : SubscribeAttribute("alarm-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockAlarmMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000040) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAlarmMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"DoorLock.AlarmMask response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute KeypadOperationEventMask
- */
-class ReadDoorLockKeypadOperationEventMask : public ReadAttribute {
-public:
-    ReadDoorLockKeypadOperationEventMask()
-        : ReadAttribute("keypad-operation-event-mask")
-    {
-    }
-
-    ~ReadDoorLockKeypadOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000041) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeKeypadOperationEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.KeypadOperationEventMask response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock KeypadOperationEventMask read Error", error);
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.ExpiringUserTimeout response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
                 }
-                SetCommandExitStatus(error);
             }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockKeypadOperationEventMask : public WriteAttribute {
-public:
-    WriteDoorLockKeypadOperationEventMask()
-        : WriteAttribute("keypad-operation-event-mask")
-    {
-        AddArgument("attr-name", "keypad-operation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockKeypadOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000041) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeKeypadOperationEventMaskWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("DoorLock KeypadOperationEventMask write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockKeypadOperationEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockKeypadOperationEventMask()
-        : SubscribeAttribute("keypad-operation-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockKeypadOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000041) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeKeypadOperationEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.KeypadOperationEventMask response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute RemoteOperationEventMask
- */
-class ReadDoorLockRemoteOperationEventMask : public ReadAttribute {
-public:
-    ReadDoorLockRemoteOperationEventMask()
-        : ReadAttribute("remote-operation-event-mask")
-    {
-    }
-
-    ~ReadDoorLockRemoteOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000042) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeRemoteOperationEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.RemoteOperationEventMask response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock RemoteOperationEventMask read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockRemoteOperationEventMask : public WriteAttribute {
-public:
-    WriteDoorLockRemoteOperationEventMask()
-        : WriteAttribute("remote-operation-event-mask")
-    {
-        AddArgument("attr-name", "remote-operation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRemoteOperationEventMask() {}
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000042) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRemoteOperationEventMaskWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("DoorLock RemoteOperationEventMask write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockRemoteOperationEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockRemoteOperationEventMask()
-        : SubscribeAttribute("remote-operation-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockRemoteOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000042) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRemoteOperationEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.RemoteOperationEventMask response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute ManualOperationEventMask
- */
-class ReadDoorLockManualOperationEventMask : public ReadAttribute {
-public:
-    ReadDoorLockManualOperationEventMask()
-        : ReadAttribute("manual-operation-event-mask")
-    {
-    }
-
-    ~ReadDoorLockManualOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000043) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeManualOperationEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.ManualOperationEventMask response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock ManualOperationEventMask read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockManualOperationEventMask : public WriteAttribute {
-public:
-    WriteDoorLockManualOperationEventMask()
-        : WriteAttribute("manual-operation-event-mask")
-    {
-        AddArgument("attr-name", "manual-operation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockManualOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000043) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeManualOperationEventMaskWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("DoorLock ManualOperationEventMask write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockManualOperationEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockManualOperationEventMask()
-        : SubscribeAttribute("manual-operation-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockManualOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000043) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeManualOperationEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.ManualOperationEventMask response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute RFIDOperationEventMask
- */
-class ReadDoorLockRFIDOperationEventMask : public ReadAttribute {
-public:
-    ReadDoorLockRFIDOperationEventMask()
-        : ReadAttribute("rfidoperation-event-mask")
-    {
-    }
-
-    ~ReadDoorLockRFIDOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000044) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRFIDOperationEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.RFIDOperationEventMask response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock RFIDOperationEventMask read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockRFIDOperationEventMask : public WriteAttribute {
-public:
-    WriteDoorLockRFIDOperationEventMask()
-        : WriteAttribute("rfidoperation-event-mask")
-    {
-        AddArgument("attr-name", "rfidoperation-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRFIDOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000044) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRFIDOperationEventMaskWithValue:value
-                                                        params:params
-                                             completionHandler:^(NSError * _Nullable error) {
-                                                 if (error != nil) {
-                                                     LogNSError("DoorLock RFIDOperationEventMask write Error", error);
-                                                 }
-                                                 SetCommandExitStatus(error);
-                                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockRFIDOperationEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockRFIDOperationEventMask()
-        : SubscribeAttribute("rfidoperation-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockRFIDOperationEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000044) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRFIDOperationEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"DoorLock.RFIDOperationEventMask response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute KeypadProgrammingEventMask
- */
-class ReadDoorLockKeypadProgrammingEventMask : public ReadAttribute {
-public:
-    ReadDoorLockKeypadProgrammingEventMask()
-        : ReadAttribute("keypad-programming-event-mask")
-    {
-    }
-
-    ~ReadDoorLockKeypadProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000045) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeKeypadProgrammingEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.KeypadProgrammingEventMask response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock KeypadProgrammingEventMask read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockKeypadProgrammingEventMask : public WriteAttribute {
-public:
-    WriteDoorLockKeypadProgrammingEventMask()
-        : WriteAttribute("keypad-programming-event-mask")
-    {
-        AddArgument("attr-name", "keypad-programming-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockKeypadProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000045) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeKeypadProgrammingEventMaskWithValue:value
-                                                            params:params
-                                                 completionHandler:^(NSError * _Nullable error) {
-                                                     if (error != nil) {
-                                                         LogNSError("DoorLock KeypadProgrammingEventMask write Error", error);
-                                                     }
-                                                     SetCommandExitStatus(error);
-                                                 }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockKeypadProgrammingEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockKeypadProgrammingEventMask()
-        : SubscribeAttribute("keypad-programming-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockKeypadProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000045) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeKeypadProgrammingEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"DoorLock.KeypadProgrammingEventMask response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute RemoteProgrammingEventMask
- */
-class ReadDoorLockRemoteProgrammingEventMask : public ReadAttribute {
-public:
-    ReadDoorLockRemoteProgrammingEventMask()
-        : ReadAttribute("remote-programming-event-mask")
-    {
-    }
-
-    ~ReadDoorLockRemoteProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000046) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeRemoteProgrammingEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.RemoteProgrammingEventMask response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock RemoteProgrammingEventMask read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockRemoteProgrammingEventMask : public WriteAttribute {
-public:
-    WriteDoorLockRemoteProgrammingEventMask()
-        : WriteAttribute("remote-programming-event-mask")
-    {
-        AddArgument("attr-name", "remote-programming-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRemoteProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000046) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRemoteProgrammingEventMaskWithValue:value
-                                                            params:params
-                                                 completionHandler:^(NSError * _Nullable error) {
-                                                     if (error != nil) {
-                                                         LogNSError("DoorLock RemoteProgrammingEventMask write Error", error);
-                                                     }
-                                                     SetCommandExitStatus(error);
-                                                 }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockRemoteProgrammingEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockRemoteProgrammingEventMask()
-        : SubscribeAttribute("remote-programming-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockRemoteProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000046) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRemoteProgrammingEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"DoorLock.RemoteProgrammingEventMask response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute RFIDProgrammingEventMask
- */
-class ReadDoorLockRFIDProgrammingEventMask : public ReadAttribute {
-public:
-    ReadDoorLockRFIDProgrammingEventMask()
-        : ReadAttribute("rfidprogramming-event-mask")
-    {
-    }
-
-    ~ReadDoorLockRFIDProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000047) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeRFIDProgrammingEventMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.RFIDProgrammingEventMask response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock RFIDProgrammingEventMask read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockRFIDProgrammingEventMask : public WriteAttribute {
-public:
-    WriteDoorLockRFIDProgrammingEventMask()
-        : WriteAttribute("rfidprogramming-event-mask")
-    {
-        AddArgument("attr-name", "rfidprogramming-event-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRFIDProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000047) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRFIDProgrammingEventMaskWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("DoorLock RFIDProgrammingEventMask write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockRFIDProgrammingEventMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeDoorLockRFIDProgrammingEventMask()
-        : SubscribeAttribute("rfidprogramming-event-mask")
-    {
-    }
-
-    ~SubscribeAttributeDoorLockRFIDProgrammingEventMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000047) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRFIDProgrammingEventMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.RFIDProgrammingEventMask response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -26597,25 +23883,21 @@ class SubscribeAttributeDoorLockGeneratedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"DoorLock.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -26666,23 +23948,20 @@ class SubscribeAttributeDoorLockAcceptedCommandList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"DoorLock.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -26733,23 +24012,20 @@ class SubscribeAttributeDoorLockAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"DoorLock.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -26800,23 +24076,20 @@ class SubscribeAttributeDoorLockFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"DoorLock.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -26867,23 +24140,20 @@ class SubscribeAttributeDoorLockClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"DoorLock.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -27056,16 +24326,17 @@ class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster getProfileInfoCommandWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster getProfileInfoCommandWithParams:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       responsesNeeded--;
+                                       if (error != nil) {
+                                           mError = error;
+                                           LogNSError("Error", error);
+                                       }
+                                       if (responsesNeeded == 0) {
+                                           SetCommandExitStatus(mError);
+                                       }
+                                   }];
         }
         return CHIP_NO_ERROR;
     }
@@ -27174,25 +24445,21 @@ class SubscribeAttributeElectricalMeasurementMeasurementType : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasurementTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.MeasurementType response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeMeasurementTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasurementType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27247,23 +24514,20 @@ class SubscribeAttributeElectricalMeasurementDcVoltage : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.DcVoltage response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27318,23 +24582,20 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMin : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ElectricalMeasurement.DcVoltageMin response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27389,23 +24650,20 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMax : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ElectricalMeasurement.DcVoltageMax response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27460,23 +24718,20 @@ class SubscribeAttributeElectricalMeasurementDcCurrent : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.DcCurrent response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27531,23 +24786,20 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMin : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ElectricalMeasurement.DcCurrentMin response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27602,23 +24854,20 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMax : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ElectricalMeasurement.DcCurrentMax response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27673,23 +24922,20 @@ class SubscribeAttributeElectricalMeasurementDcPower : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ElectricalMeasurement.DcPower response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcPower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27744,23 +24990,20 @@ class SubscribeAttributeElectricalMeasurementDcPowerMin : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcPowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.DcPowerMin response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcPowerMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27815,23 +25058,20 @@ class SubscribeAttributeElectricalMeasurementDcPowerMax : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcPowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.DcPowerMax response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcPowerMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27886,24 +25126,20 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMultiplier : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcVoltageMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.DcVoltageMultiplier response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -27958,24 +25194,20 @@ class SubscribeAttributeElectricalMeasurementDcVoltageDivisor : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcVoltageDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.DcVoltageDivisor response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28030,24 +25262,20 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMultiplier : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.DcCurrentMultiplier response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28102,24 +25330,20 @@ class SubscribeAttributeElectricalMeasurementDcCurrentDivisor : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcCurrentDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.DcCurrentDivisor response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28174,24 +25398,20 @@ class SubscribeAttributeElectricalMeasurementDcPowerMultiplier : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDcPowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.DcPowerMultiplier response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcPowerMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28245,25 +25465,21 @@ class SubscribeAttributeElectricalMeasurementDcPowerDivisor : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeDcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.DcPowerDivisor response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeDcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcPowerDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28318,23 +25534,20 @@ class SubscribeAttributeElectricalMeasurementAcFrequency : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ElectricalMeasurement.AcFrequency response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28388,25 +25601,21 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMin : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcFrequencyMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.AcFrequencyMin response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeAcFrequencyMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcFrequencyMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28460,25 +25669,21 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMax : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcFrequencyMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.AcFrequencyMax response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeAcFrequencyMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcFrequencyMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28532,25 +25737,21 @@ class SubscribeAttributeElectricalMeasurementNeutralCurrent : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNeutralCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.NeutralCurrent response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeNeutralCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.NeutralCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28605,24 +25806,20 @@ class SubscribeAttributeElectricalMeasurementTotalActivePower : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTotalActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.TotalActivePower response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.TotalActivePower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28677,24 +25874,20 @@ class SubscribeAttributeElectricalMeasurementTotalReactivePower : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTotalReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ElectricalMeasurement.TotalReactivePower response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.TotalReactivePower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28749,24 +25942,20 @@ class SubscribeAttributeElectricalMeasurementTotalApparentPower : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTotalApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ElectricalMeasurement.TotalApparentPower response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.TotalApparentPower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28821,26 +26010,21 @@ class SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.Measured1stHarmonicCurrent response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured1stHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28895,26 +26079,21 @@ class SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.Measured3rdHarmonicCurrent response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured3rdHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -28969,26 +26148,21 @@ class SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.Measured5thHarmonicCurrent response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured5thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29043,26 +26217,21 @@ class SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.Measured7thHarmonicCurrent response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured7thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29117,26 +26286,21 @@ class SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.Measured9thHarmonicCurrent response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured9thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29191,27 +26355,21 @@ class SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent : publi
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(
-                                                                   @"ElectricalMeasurement.Measured11thHarmonicCurrent response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured11thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29267,26 +26425,20 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent : p
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"ElectricalMeasurement."
-                                                                              @"MeasuredPhase1stHarmonicCurrent response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasuredPhase1stHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29342,26 +26494,20 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : p
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"ElectricalMeasurement."
-                                                                              @"MeasuredPhase3rdHarmonicCurrent response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasuredPhase3rdHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29417,26 +26563,20 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent : p
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"ElectricalMeasurement."
-                                                                              @"MeasuredPhase5thHarmonicCurrent response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasuredPhase5thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29492,26 +26632,20 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent : p
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"ElectricalMeasurement."
-                                                                              @"MeasuredPhase7thHarmonicCurrent response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasuredPhase7thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29567,26 +26701,20 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent : p
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"ElectricalMeasurement."
-                                                                              @"MeasuredPhase9thHarmonicCurrent response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasuredPhase9thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29642,26 +26770,20 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent :
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                            params:params
-                                                           subscriptionEstablished:nullptr
-                                                                     reportHandler:^(
-                                                                         NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                         NSLog(@"ElectricalMeasurement."
-                                                                               @"MeasuredPhase11thHarmonicCurrent response %@",
-                                                                             [value description]);
-                                                                         if (error || !mWait) {
-                                                                             SetCommandExitStatus(error);
-                                                                         }
-                                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.MeasuredPhase11thHarmonicCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29716,24 +26838,20 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcFrequencyMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.AcFrequencyMultiplier response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcFrequencyMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29788,24 +26906,20 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyDivisor : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcFrequencyDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ElectricalMeasurement.AcFrequencyDivisor response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcFrequencyDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29859,25 +26973,21 @@ class SubscribeAttributeElectricalMeasurementPowerMultiplier : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.PowerMultiplier response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributePowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.PowerMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -29932,23 +27042,20 @@ class SubscribeAttributeElectricalMeasurementPowerDivisor : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"ElectricalMeasurement.PowerDivisor response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.PowerDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30003,26 +27110,21 @@ class SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.HarmonicCurrentMultiplier response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.HarmonicCurrentMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30078,26 +27180,20 @@ class SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier : pu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                          params:params
-                                                         subscriptionEstablished:nullptr
-                                                                   reportHandler:^(
-                                                                       NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                       NSLog(@"ElectricalMeasurement."
-                                                                             @"PhaseHarmonicCurrentMultiplier response %@",
-                                                                           [value description]);
-                                                                       if (error || !mWait) {
-                                                                           SetCommandExitStatus(error);
-                                                                       }
-                                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.PhaseHarmonicCurrentMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30152,24 +27248,20 @@ class SubscribeAttributeElectricalMeasurementInstantaneousVoltage : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInstantaneousVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.InstantaneousVoltage response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30224,26 +27316,21 @@ class SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent : public S
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeInstantaneousLineCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.InstantaneousLineCurrent response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeInstantaneousLineCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousLineCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30298,26 +27385,21 @@ class SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeInstantaneousActiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.InstantaneousActiveCurrent response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeInstantaneousActiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousActiveCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30372,27 +27454,21 @@ class SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent : publ
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"ElectricalMeasurement.InstantaneousReactiveCurrent "
-                                                                      @"response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousReactiveCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30447,24 +27523,20 @@ class SubscribeAttributeElectricalMeasurementInstantaneousPower : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInstantaneousPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ElectricalMeasurement.InstantaneousPower response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousPower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30519,23 +27591,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltage : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.RmsVoltage response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30589,25 +27658,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.RmsVoltageMin response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRmsVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30661,25 +27726,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.RmsVoltageMax response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRmsVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30734,23 +27795,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrent : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.RmsCurrent response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30804,25 +27862,21 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.RmsCurrentMin response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRmsCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30876,25 +27930,21 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.RmsCurrentMax response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRmsCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -30949,23 +27999,20 @@ class SubscribeAttributeElectricalMeasurementActivePower : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ElectricalMeasurement.ActivePower response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31019,25 +28066,21 @@ class SubscribeAttributeElectricalMeasurementActivePowerMin : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeActivePowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.ActivePowerMin response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeActivePowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31091,25 +28134,21 @@ class SubscribeAttributeElectricalMeasurementActivePowerMax : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeActivePowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.ActivePowerMax response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeActivePowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31163,25 +28202,21 @@ class SubscribeAttributeElectricalMeasurementReactivePower : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.ReactivePower response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ReactivePower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31235,25 +28270,21 @@ class SubscribeAttributeElectricalMeasurementApparentPower : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.ApparentPower response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ApparentPower response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31308,23 +28339,20 @@ class SubscribeAttributeElectricalMeasurementPowerFactor : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePowerFactorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ElectricalMeasurement.PowerFactor response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.PowerFactor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31422,26 +28450,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"ElectricalMeasurement."
-                                                                                 @"AverageRmsVoltageMeasurementPeriod response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31539,26 +28561,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter : pub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                         params:params
-                                                        subscriptionEstablished:nullptr
-                                                                  reportHandler:^(
-                                                                      NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                      NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounter "
-                                                                            @"response %@",
-                                                                          [value description]);
-                                                                      if (error || !mWait) {
-                                                                          SetCommandExitStatus(error);
-                                                                      }
-                                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounter response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31655,27 +28671,21 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod : publi
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(
-                                                                   @"ElectricalMeasurement.RmsExtremeOverVoltagePeriod response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31772,27 +28782,21 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod : publ
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriod "
-                                                                      @"response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31887,24 +28891,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageSagPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriod response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -31999,24 +28999,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriod response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriod response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32071,24 +29067,20 @@ class SubscribeAttributeElectricalMeasurementAcVoltageMultiplier : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcVoltageMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.AcVoltageMultiplier response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcVoltageMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32143,24 +29135,20 @@ class SubscribeAttributeElectricalMeasurementAcVoltageDivisor : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcVoltageDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.AcVoltageDivisor response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcVoltageDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32215,24 +29203,20 @@ class SubscribeAttributeElectricalMeasurementAcCurrentMultiplier : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.AcCurrentMultiplier response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcCurrentMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32287,24 +29271,20 @@ class SubscribeAttributeElectricalMeasurementAcCurrentDivisor : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcCurrentDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.AcCurrentDivisor response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcCurrentDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32359,24 +29339,20 @@ class SubscribeAttributeElectricalMeasurementAcPowerMultiplier : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcPowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.AcPowerMultiplier response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcPowerMultiplier response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32430,25 +29406,21 @@ class SubscribeAttributeElectricalMeasurementAcPowerDivisor : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ElectricalMeasurement.AcPowerDivisor response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeAcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcPowerDivisor response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32543,24 +29515,20 @@ class SubscribeAttributeElectricalMeasurementOverloadAlarmsMask : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOverloadAlarmsMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ElectricalMeasurement.OverloadAlarmsMask response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.OverloadAlarmsMask response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32614,25 +29582,21 @@ class SubscribeAttributeElectricalMeasurementVoltageOverload : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.VoltageOverload response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.VoltageOverload response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32686,25 +29650,21 @@ class SubscribeAttributeElectricalMeasurementCurrentOverload : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.CurrentOverload response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.CurrentOverload response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32799,24 +29759,20 @@ class SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.AcOverloadAlarmsMask response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcOverloadAlarmsMask response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32871,24 +29827,20 @@ class SubscribeAttributeElectricalMeasurementAcVoltageOverload : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.AcVoltageOverload response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcVoltageOverload response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -32943,24 +29895,20 @@ class SubscribeAttributeElectricalMeasurementAcCurrentOverload : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.AcCurrentOverload response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcCurrentOverload response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33015,24 +29963,20 @@ class SubscribeAttributeElectricalMeasurementAcActivePowerOverload : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcActivePowerOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.AcActivePowerOverload response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcActivePowerOverload response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33088,24 +30032,20 @@ class SubscribeAttributeElectricalMeasurementAcReactivePowerOverload : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcReactivePowerOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"ElectricalMeasurement.AcReactivePowerOverload response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcReactivePowerOverload response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33160,24 +30100,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAverageRmsOverVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.AverageRmsOverVoltage response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33232,24 +30168,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAverageRmsUnderVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltage response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33304,24 +30236,20 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsExtremeOverVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltage response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33376,24 +30304,20 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltage response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33447,25 +30371,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSag : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageSagWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.RmsVoltageSag response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRmsVoltageSagWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSag response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33519,25 +30439,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwell : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageSwellWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.RmsVoltageSwell response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeRmsVoltageSwellWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwell response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33592,24 +30508,20 @@ class SubscribeAttributeElectricalMeasurementLineCurrentPhaseB : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLineCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.LineCurrentPhaseB response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.LineCurrentPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33664,24 +30576,20 @@ class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33736,24 +30644,20 @@ class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReactiveCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseB response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33808,24 +30712,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltagePhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.RmsVoltagePhaseB response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltagePhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33880,24 +30780,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -33952,24 +30848,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34024,24 +30916,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.RmsCurrentPhaseB response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34096,24 +30984,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34168,24 +31052,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34240,24 +31120,20 @@ class SubscribeAttributeElectricalMeasurementActivePowerPhaseB : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.ActivePowerPhaseB response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34312,24 +31188,20 @@ class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseB response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34384,24 +31256,20 @@ class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseB response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34456,24 +31324,20 @@ class SubscribeAttributeElectricalMeasurementReactivePowerPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReactivePowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.ReactivePowerPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ReactivePowerPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34528,24 +31392,20 @@ class SubscribeAttributeElectricalMeasurementApparentPowerPhaseB : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeApparentPowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.ApparentPowerPhaseB response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ApparentPowerPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34600,24 +31460,20 @@ class SubscribeAttributeElectricalMeasurementPowerFactorPhaseB : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePowerFactorPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.PowerFactorPhaseB response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.PowerFactorPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34674,27 +31530,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodP
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"ElectricalMeasurement."
-                                                                                  @"AverageRmsVoltageMeasurementPeriodPhaseB "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34750,26 +31599,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"ElectricalMeasurement."
-                                                                                 @"AverageRmsOverVoltageCounterPhaseB response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34824,28 +31667,21 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                          params:params
-                                                         subscriptionEstablished:nullptr
-                                                                   reportHandler:^(
-                                                                       NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                       NSLog(@"ElectricalMeasurement."
-                                                                             @"AverageRmsUnderVoltageCounterPhaseB response %@",
-                                                                           [value description]);
-                                                                       if (error || !mWait) {
-                                                                           SetCommandExitStatus(error);
-                                                                       }
-                                                                   }];
+        [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34901,26 +31737,20 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB :
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                             params:params
-                                                            subscriptionEstablished:nullptr
-                                                                      reportHandler:^(
-                                                                          NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                          NSLog(@"ElectricalMeasurement."
-                                                                                @"RmsExtremeOverVoltagePeriodPhaseB response %@",
-                                                                              [value description]);
-                                                                          if (error || !mWait) {
-                                                                              SetCommandExitStatus(error);
-                                                                          }
-                                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -34976,26 +31806,20 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"ElectricalMeasurement."
-                                                                                 @"RmsExtremeUnderVoltagePeriodPhaseB response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35050,26 +31874,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseB response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35124,27 +31943,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB : publi
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(
-                                                                   @"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseB response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseB response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35199,24 +32012,20 @@ class SubscribeAttributeElectricalMeasurementLineCurrentPhaseC : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLineCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.LineCurrentPhaseC response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.LineCurrentPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35271,24 +32080,20 @@ class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35343,24 +32148,20 @@ class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReactiveCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseC response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35415,24 +32216,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltagePhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.RmsVoltagePhaseC response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltagePhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35487,24 +32284,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35559,24 +32352,20 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35631,24 +32420,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ElectricalMeasurement.RmsCurrentPhaseC response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35703,24 +32488,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35775,24 +32556,20 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35847,24 +32624,20 @@ class SubscribeAttributeElectricalMeasurementActivePowerPhaseC : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.ActivePowerPhaseC response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35919,24 +32692,20 @@ class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseC response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -35991,24 +32760,20 @@ class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActivePowerMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseC response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36063,24 +32828,20 @@ class SubscribeAttributeElectricalMeasurementReactivePowerPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeReactivePowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.ReactivePowerPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ReactivePowerPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36135,24 +32896,20 @@ class SubscribeAttributeElectricalMeasurementApparentPowerPhaseC : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeApparentPowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.ApparentPowerPhaseC response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ApparentPowerPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36207,24 +32964,20 @@ class SubscribeAttributeElectricalMeasurementPowerFactorPhaseC : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePowerFactorPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ElectricalMeasurement.PowerFactorPhaseC response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.PowerFactorPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36281,27 +33034,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodP
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"ElectricalMeasurement."
-                                                                                  @"AverageRmsVoltageMeasurementPeriodPhaseC "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36357,26 +33103,20 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"ElectricalMeasurement."
-                                                                                 @"AverageRmsOverVoltageCounterPhaseC response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36431,28 +33171,21 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                          params:params
-                                                         subscriptionEstablished:nullptr
-                                                                   reportHandler:^(
-                                                                       NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                       NSLog(@"ElectricalMeasurement."
-                                                                             @"AverageRmsUnderVoltageCounterPhaseC response %@",
-                                                                           [value description]);
-                                                                       if (error || !mWait) {
-                                                                           SetCommandExitStatus(error);
-                                                                       }
-                                                                   }];
+        [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36508,26 +33241,20 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC :
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                             params:params
-                                                            subscriptionEstablished:nullptr
-                                                                      reportHandler:^(
-                                                                          NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                          NSLog(@"ElectricalMeasurement."
-                                                                                @"RmsExtremeOverVoltagePeriodPhaseC response %@",
-                                                                              [value description]);
-                                                                          if (error || !mWait) {
-                                                                              SetCommandExitStatus(error);
-                                                                          }
-                                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36583,26 +33310,20 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"ElectricalMeasurement."
-                                                                                 @"RmsExtremeUnderVoltagePeriodPhaseC response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36657,26 +33378,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseC response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36731,27 +33447,21 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC : publi
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(
-                                                                   @"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseC response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseC response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36806,24 +33516,20 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ElectricalMeasurement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36878,24 +33584,20 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ElectricalMeasurement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -36949,25 +33651,21 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ElectricalMeasurement.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37022,23 +33720,20 @@ class SubscribeAttributeElectricalMeasurementFeatureMap : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37092,25 +33787,21 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ElectricalMeasurement.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -37163,16 +33854,17 @@ class EthernetNetworkDiagnosticsResetCounts : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster resetCountsWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
         }
         return CHIP_NO_ERROR;
     }
@@ -37232,23 +33924,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePHYRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"EthernetNetworkDiagnostics.PHYRate response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.PHYRate response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37303,23 +33992,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFullDuplexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"EthernetNetworkDiagnostics.FullDuplex response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.FullDuplex response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37374,24 +34060,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePacketRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"EthernetNetworkDiagnostics.PacketRxCount response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.PacketRxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37446,24 +34128,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePacketTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"EthernetNetworkDiagnostics.PacketTxCount response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.PacketTxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37518,23 +34196,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxErrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"EthernetNetworkDiagnostics.TxErrCount response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.TxErrCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37589,24 +34264,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCollisionCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"EthernetNetworkDiagnostics.CollisionCount response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.CollisionCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37660,25 +34331,21 @@ class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"EthernetNetworkDiagnostics.OverrunCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.OverrunCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37733,24 +34400,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCarrierDetectWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"EthernetNetworkDiagnostics.CarrierDetect response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.CarrierDetect response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37805,24 +34468,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTimeSinceResetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"EthernetNetworkDiagnostics.TimeSinceReset response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.TimeSinceReset response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37877,24 +34536,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"EthernetNetworkDiagnostics.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -37949,24 +34604,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"EthernetNetworkDiagnostics.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38021,24 +34672,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"EthernetNetworkDiagnostics.AttributeList response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38093,23 +34740,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"EthernetNetworkDiagnostics.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38164,24 +34808,20 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"EthernetNetworkDiagnostics.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -38296,23 +34936,20 @@ class SubscribeAttributeFanControlFanMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFanModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"FanControl.FanMode response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.FanMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38401,23 +35038,20 @@ class SubscribeAttributeFanControlFanModeSequence : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFanModeSequenceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"FanControl.FanModeSequence response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.FanModeSequence response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38506,23 +35140,20 @@ class SubscribeAttributeFanControlPercentSetting : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePercentSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"FanControl.PercentSetting response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.PercentSetting response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38573,23 +35204,20 @@ class SubscribeAttributeFanControlPercentCurrent : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePercentCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"FanControl.PercentCurrent response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.PercentCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38640,23 +35268,20 @@ class SubscribeAttributeFanControlSpeedMax : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSpeedMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"FanControl.SpeedMax response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.SpeedMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38745,23 +35370,20 @@ class SubscribeAttributeFanControlSpeedSetting : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSpeedSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"FanControl.SpeedSetting response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.SpeedSetting response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38812,23 +35434,20 @@ class SubscribeAttributeFanControlSpeedCurrent : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSpeedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"FanControl.SpeedCurrent response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.SpeedCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38879,23 +35498,20 @@ class SubscribeAttributeFanControlRockSupport : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRockSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"FanControl.RockSupport response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.RockSupport response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -38984,23 +35600,20 @@ class SubscribeAttributeFanControlRockSetting : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRockSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"FanControl.RockSetting response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.RockSetting response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39051,23 +35664,20 @@ class SubscribeAttributeFanControlWindSupport : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWindSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"FanControl.WindSupport response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.WindSupport response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39156,23 +35766,20 @@ class SubscribeAttributeFanControlWindSetting : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWindSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"FanControl.WindSetting response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.WindSetting response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39222,25 +35829,21 @@ class SubscribeAttributeFanControlGeneratedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"FanControl.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39290,25 +35893,21 @@ class SubscribeAttributeFanControlAcceptedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"FanControl.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39359,23 +35958,20 @@ class SubscribeAttributeFanControlAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"FanControl.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39426,23 +36022,20 @@ class SubscribeAttributeFanControlFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"FanControl.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39493,23 +36086,20 @@ class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"FanControl.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -39576,23 +36166,20 @@ class SubscribeAttributeFixedLabelLabelList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"FixedLabel.LabelList response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.LabelList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39642,25 +36229,21 @@ class SubscribeAttributeFixedLabelGeneratedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"FixedLabel.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39710,25 +36293,21 @@ class SubscribeAttributeFixedLabelAcceptedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"FixedLabel.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39779,23 +36358,20 @@ class SubscribeAttributeFixedLabelAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"FixedLabel.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39846,23 +36422,20 @@ class SubscribeAttributeFixedLabelFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"FixedLabel.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -39913,23 +36486,20 @@ class SubscribeAttributeFixedLabelClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"FixedLabel.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -39999,23 +36569,20 @@ class SubscribeAttributeFlowMeasurementMeasuredValue : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"FlowMeasurement.MeasuredValue response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.MeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40065,25 +36632,21 @@ class SubscribeAttributeFlowMeasurementMinMeasuredValue : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"FlowMeasurement.MinMeasuredValue response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.MinMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40133,25 +36696,21 @@ class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"FlowMeasurement.MaxMeasuredValue response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.MaxMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40202,23 +36761,20 @@ class SubscribeAttributeFlowMeasurementTolerance : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"FlowMeasurement.Tolerance response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.Tolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40269,24 +36825,20 @@ class SubscribeAttributeFlowMeasurementGeneratedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"FlowMeasurement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40337,24 +36889,20 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"FlowMeasurement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40405,23 +36953,20 @@ class SubscribeAttributeFlowMeasurementAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"FlowMeasurement.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40472,23 +37017,20 @@ class SubscribeAttributeFlowMeasurementFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"FlowMeasurement.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40539,23 +37081,20 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"FlowMeasurement.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -40711,18 +37250,20 @@ class GeneralCommissioningCommissioningComplete : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster commissioningCompleteWithCompletionHandler:^(
-                CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster commissioningCompleteWithParams:params
+                                   completionHandler:^(
+                                       CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values,
+                                       NSError * _Nullable error) {
+                                       NSLog(@"Values: %@", values);
+                                       responsesNeeded--;
+                                       if (error != nil) {
+                                           mError = error;
+                                           LogNSError("Error", error);
+                                       }
+                                       if (responsesNeeded == 0) {
+                                           SetCommandExitStatus(mError);
+                                       }
+                                   }];
         }
         return CHIP_NO_ERROR;
     }
@@ -40822,23 +37363,20 @@ class SubscribeAttributeGeneralCommissioningBreadcrumb : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBreadcrumbWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GeneralCommissioning.Breadcrumb response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.Breadcrumb response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40893,28 +37431,21 @@ class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public Subs
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBasicCommissioningInfoWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(
-                                                          CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
-                                                          NSError * _Nullable error) {
-                                                          NSLog(@"GeneralCommissioning.BasicCommissioningInfo response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+        [cluster subscribeAttributeBasicCommissioningInfoWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.BasicCommissioningInfo response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -40969,24 +37500,20 @@ class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRegulatoryConfigWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"GeneralCommissioning.RegulatoryConfig response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.RegulatoryConfig response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41041,24 +37568,20 @@ class SubscribeAttributeGeneralCommissioningLocationCapability : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLocationCapabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"GeneralCommissioning.LocationCapability response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.LocationCapability response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41113,27 +37636,21 @@ class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : publi
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSupportsConcurrentConnectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"GeneralCommissioning.SupportsConcurrentConnection response "
-                                                                      @"%@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeSupportsConcurrentConnectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.SupportsConcurrentConnection response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41188,24 +37705,20 @@ class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"GeneralCommissioning.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41260,24 +37773,20 @@ class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"GeneralCommissioning.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41332,23 +37841,20 @@ class SubscribeAttributeGeneralCommissioningAttributeList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"GeneralCommissioning.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41403,23 +37909,20 @@ class SubscribeAttributeGeneralCommissioningFeatureMap : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GeneralCommissioning.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41473,31 +37976,28 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GeneralCommissioning.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
 | Cluster GeneralDiagnostics                                          | 0x0033 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * TestEventTrigger                                                  |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * NetworkInterfaces                                                 | 0x0000 |
@@ -41508,6 +38008,7 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
 | * ActiveHardwareFaults                                              | 0x0005 |
 | * ActiveRadioFaults                                                 | 0x0006 |
 | * ActiveNetworkFaults                                               | 0x0007 |
+| * TestEventTriggersEnabled                                          | 0x0008 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -41521,6 +38022,54 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
 | * BootReason                                                        | 0x0003 |
 \*----------------------------------------------------------------------------*/
 
+/*
+ * Command TestEventTrigger
+ */
+class GeneralDiagnosticsTestEventTrigger : public ClusterCommand {
+public:
+    GeneralDiagnosticsTestEventTrigger()
+        : ClusterCommand("test-event-trigger")
+    {
+        AddArgument("EnableKey", &mRequest.enableKey);
+        AddArgument("EventTrigger", 0, UINT64_MAX, &mRequest.eventTrigger);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) command (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPGeneralDiagnosticsClusterTestEventTriggerParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.enableKey = [NSData dataWithBytes:mRequest.enableKey.data() length:mRequest.enableKey.size()];
+        params.eventTrigger = [NSNumber numberWithUnsignedLongLong:mRequest.eventTrigger];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testEventTriggerWithParams:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
+};
+
 /*
  * Attribute NetworkInterfaces
  */
@@ -41573,24 +38122,20 @@ class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNetworkInterfacesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"GeneralDiagnostics.NetworkInterfaces response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.NetworkInterfaces response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41645,23 +38190,20 @@ class SubscribeAttributeGeneralDiagnosticsRebootCount : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRebootCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"GeneralDiagnostics.RebootCount response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.RebootCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41716,23 +38258,20 @@ class SubscribeAttributeGeneralDiagnosticsUpTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUpTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"GeneralDiagnostics.UpTime response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.UpTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41787,24 +38326,20 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTotalOperationalHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"GeneralDiagnostics.TotalOperationalHours response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.TotalOperationalHours response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41859,23 +38394,20 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBootReasonsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -41930,24 +38462,20 @@ class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveHardwareFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"GeneralDiagnostics.ActiveHardwareFaults response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ActiveHardwareFaults response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42002,24 +38530,20 @@ class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveRadioFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"GeneralDiagnostics.ActiveRadioFaults response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ActiveRadioFaults response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42074,23 +38598,88 @@ class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveNetworkFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"GeneralDiagnostics.ActiveNetworkFaults response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ActiveNetworkFaults response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
 
+/*
+ * Attribute TestEventTriggersEnabled
+ */
+class ReadGeneralDiagnosticsTestEventTriggersEnabled : public ReadAttribute {
+public:
+    ReadGeneralDiagnosticsTestEventTriggersEnabled()
+        : ReadAttribute("test-event-triggers-enabled")
+    {
+    }
+
+    ~ReadGeneralDiagnosticsTestEventTriggersEnabled() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster
+            readAttributeTestEventTriggersEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.TestEventTriggersEnabled response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("GeneralDiagnostics TestEventTriggersEnabled read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
+};
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public SubscribeAttribute {
+public:
+    SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled()
+        : SubscribeAttribute("test-event-triggers-enabled")
     {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
+    }
+
+    ~SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeTestEventTriggersEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.TestEventTriggersEnabled response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
     }
 };
 
@@ -42146,24 +38735,20 @@ class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"GeneralDiagnostics.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42218,24 +38803,20 @@ class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"GeneralDiagnostics.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42290,23 +38871,20 @@ class SubscribeAttributeGeneralDiagnosticsAttributeList : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"GeneralDiagnostics.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42361,23 +38939,20 @@ class SubscribeAttributeGeneralDiagnosticsFeatureMap : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GeneralDiagnostics.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42431,25 +39006,21 @@ class SubscribeAttributeGeneralDiagnosticsClusterRevision : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GeneralDiagnostics.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -42823,23 +39394,20 @@ class SubscribeAttributeGroupKeyManagementGroupKeyMap : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGroupKeyMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42897,23 +39465,20 @@ class SubscribeAttributeGroupKeyManagementGroupTable : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGroupTableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -42968,24 +39533,20 @@ class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxGroupsPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"GroupKeyManagement.MaxGroupsPerFabric response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.MaxGroupsPerFabric response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43040,24 +39601,20 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"GroupKeyManagement.MaxGroupKeysPerFabric response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.MaxGroupKeysPerFabric response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43112,24 +39669,20 @@ class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"GroupKeyManagement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43184,24 +39737,20 @@ class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"GroupKeyManagement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43256,23 +39805,20 @@ class SubscribeAttributeGroupKeyManagementAttributeList : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"GroupKeyManagement.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43327,23 +39873,20 @@ class SubscribeAttributeGroupKeyManagementFeatureMap : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GroupKeyManagement.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43397,25 +39940,21 @@ class SubscribeAttributeGroupKeyManagementClusterRevision : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"GroupKeyManagement.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -43659,16 +40198,17 @@ class GroupsRemoveAllGroups : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster removeAllGroupsWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster removeAllGroupsWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
@@ -43772,23 +40312,20 @@ class SubscribeAttributeGroupsNameSupport : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"Groups.NameSupport response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.NameSupport response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43839,23 +40376,20 @@ class SubscribeAttributeGroupsGeneratedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Groups.GeneratedCommandList response %@", [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43906,23 +40440,20 @@ class SubscribeAttributeGroupsAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Groups.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -43973,23 +40504,20 @@ class SubscribeAttributeGroupsAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Groups.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44040,23 +40568,20 @@ class SubscribeAttributeGroupsFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Groups.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44107,23 +40632,20 @@ class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Groups.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -44321,23 +40843,20 @@ class SubscribeAttributeIdentifyIdentifyTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeIdentifyTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"Identify.IdentifyTime response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.IdentifyTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44388,23 +40907,20 @@ class SubscribeAttributeIdentifyIdentifyType : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeIdentifyTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"Identify.IdentifyType response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.IdentifyType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44454,25 +40970,21 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Identify.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44523,23 +41035,20 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Identify.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44590,23 +41099,20 @@ class SubscribeAttributeIdentifyAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Identify.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44657,23 +41163,20 @@ class SubscribeAttributeIdentifyFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Identify.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44724,23 +41227,20 @@ class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Identify.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -44814,25 +41314,21 @@ class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"IlluminanceMeasurement.MeasuredValue response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.MeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44887,24 +41383,20 @@ class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"IlluminanceMeasurement.MinMeasuredValue response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.MinMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -44959,24 +41451,20 @@ class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"IlluminanceMeasurement.MaxMeasuredValue response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.MaxMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45031,23 +41519,20 @@ class SubscribeAttributeIlluminanceMeasurementTolerance : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"IlluminanceMeasurement.Tolerance response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.Tolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45102,24 +41587,20 @@ class SubscribeAttributeIlluminanceMeasurementLightSensorType : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLightSensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"IlluminanceMeasurement.LightSensorType response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.LightSensorType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45174,24 +41655,20 @@ class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"IlluminanceMeasurement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45246,24 +41723,20 @@ class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"IlluminanceMeasurement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45317,25 +41790,21 @@ class SubscribeAttributeIlluminanceMeasurementAttributeList : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"IlluminanceMeasurement.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45390,23 +41859,20 @@ class SubscribeAttributeIlluminanceMeasurementFeatureMap : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"IlluminanceMeasurement.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45461,24 +41927,20 @@ class SubscribeAttributeIlluminanceMeasurementClusterRevision : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"IlluminanceMeasurement.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -45590,25 +42052,21 @@ class SubscribeAttributeKeypadInputGeneratedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"KeypadInput.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45658,25 +42116,21 @@ class SubscribeAttributeKeypadInputAcceptedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"KeypadInput.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45727,23 +42181,20 @@ class SubscribeAttributeKeypadInputAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"KeypadInput.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45794,23 +42245,20 @@ class SubscribeAttributeKeypadInputFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"KeypadInput.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -45861,23 +42309,20 @@ class SubscribeAttributeKeypadInputClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"KeypadInput.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -45892,6 +42337,7 @@ class SubscribeAttributeKeypadInputClusterRevision : public SubscribeAttribute {
 | * MoveWithOnOff                                                     |   0x05 |
 | * StepWithOnOff                                                     |   0x06 |
 | * StopWithOnOff                                                     |   0x07 |
+| * MoveToClosestFrequency                                            |   0x08 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * CurrentLevel                                                      | 0x0000 |
@@ -46278,16 +42724,17 @@ class LevelControlStopWithOnOff : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster stopWithOnOffWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster stopWithOnOffWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
         }
         return CHIP_NO_ERROR;
     }
@@ -46295,6 +42742,50 @@ class LevelControlStopWithOnOff : public ClusterCommand {
 private:
 };
 
+/*
+ * Command MoveToClosestFrequency
+ */
+class LevelControlMoveToClosestFrequency : public ClusterCommand {
+public:
+    LevelControlMoveToClosestFrequency()
+        : ClusterCommand("move-to-closest-frequency")
+    {
+        AddArgument("Frequency", 0, UINT16_MAX, &mRequest.frequency);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000008) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterMoveToClosestFrequencyParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.frequency = [NSNumber numberWithUnsignedShort:mRequest.frequency];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToClosestFrequencyWithParams:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        responsesNeeded--;
+                                        if (error != nil) {
+                                            mError = error;
+                                            LogNSError("Error", error);
+                                        }
+                                        if (responsesNeeded == 0) {
+                                            SetCommandExitStatus(mError);
+                                        }
+                                    }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::MoveToClosestFrequency::Type mRequest;
+};
+
 /*
  * Attribute CurrentLevel
  */
@@ -46343,23 +42834,20 @@ class SubscribeAttributeLevelControlCurrentLevel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"LevelControl.CurrentLevel response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.CurrentLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46410,23 +42898,20 @@ class SubscribeAttributeLevelControlRemainingTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"LevelControl.RemainingTime response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.RemainingTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46477,23 +42962,20 @@ class SubscribeAttributeLevelControlMinLevel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"LevelControl.MinLevel response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.MinLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46544,23 +43026,20 @@ class SubscribeAttributeLevelControlMaxLevel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"LevelControl.MaxLevel response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.MaxLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46611,23 +43090,20 @@ class SubscribeAttributeLevelControlCurrentFrequency : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"LevelControl.CurrentFrequency response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.CurrentFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46678,23 +43154,20 @@ class SubscribeAttributeLevelControlMinFrequency : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"LevelControl.MinFrequency response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.MinFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46745,23 +43218,20 @@ class SubscribeAttributeLevelControlMaxFrequency : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"LevelControl.MaxFrequency response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.MaxFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46850,23 +43320,20 @@ class SubscribeAttributeLevelControlOptions : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"LevelControl.Options response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.Options response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -46954,25 +43421,21 @@ class SubscribeAttributeLevelControlOnOffTransitionTime : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeOnOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"LevelControl.OnOffTransitionTime response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeOnOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.OnOffTransitionTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47061,23 +43524,20 @@ class SubscribeAttributeLevelControlOnLevel : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOnLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"LevelControl.OnLevel response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.OnLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47166,23 +43626,20 @@ class SubscribeAttributeLevelControlOnTransitionTime : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOnTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"LevelControl.OnTransitionTime response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.OnTransitionTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47271,23 +43728,20 @@ class SubscribeAttributeLevelControlOffTransitionTime : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"LevelControl.OffTransitionTime response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.OffTransitionTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47376,23 +43830,20 @@ class SubscribeAttributeLevelControlDefaultMoveRate : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDefaultMoveRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"LevelControl.DefaultMoveRate response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.DefaultMoveRate response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47480,25 +43931,21 @@ class SubscribeAttributeLevelControlStartUpCurrentLevel : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeStartUpCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"LevelControl.StartUpCurrentLevel response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeStartUpCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.StartUpCurrentLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47549,24 +43996,20 @@ class SubscribeAttributeLevelControlGeneratedCommandList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"LevelControl.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47616,25 +44059,21 @@ class SubscribeAttributeLevelControlAcceptedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"LevelControl.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47685,23 +44124,20 @@ class SubscribeAttributeLevelControlAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"LevelControl.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47752,23 +44188,20 @@ class SubscribeAttributeLevelControlFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"LevelControl.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -47819,23 +44252,20 @@ class SubscribeAttributeLevelControlClusterRevision : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"LevelControl.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -47948,25 +44378,21 @@ class SubscribeAttributeLocalizationConfigurationActiveLocale : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeActiveLocaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"LocalizationConfiguration.ActiveLocale response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeActiveLocaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.ActiveLocale response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48021,24 +44447,20 @@ class SubscribeAttributeLocalizationConfigurationSupportedLocales : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSupportedLocalesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"LocalizationConfiguration.SupportedLocales response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.SupportedLocales response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48093,24 +44515,20 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"LocalizationConfiguration.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48165,24 +44583,20 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"LocalizationConfiguration.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48236,25 +44650,21 @@ class SubscribeAttributeLocalizationConfigurationAttributeList : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"LocalizationConfiguration.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48309,23 +44719,20 @@ class SubscribeAttributeLocalizationConfigurationFeatureMap : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"LocalizationConfiguration.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48380,24 +44787,20 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"LocalizationConfiguration.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -48439,16 +44842,17 @@ class LowPowerSleep : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster sleepWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster sleepWithParams:params
+                   completionHandler:^(NSError * _Nullable error) {
+                       responsesNeeded--;
+                       if (error != nil) {
+                           mError = error;
+                           LogNSError("Error", error);
+                       }
+                       if (responsesNeeded == 0) {
+                           SetCommandExitStatus(mError);
+                       }
+                   }];
         }
         return CHIP_NO_ERROR;
     }
@@ -48503,25 +44907,21 @@ class SubscribeAttributeLowPowerGeneratedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"LowPower.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48572,23 +44972,20 @@ class SubscribeAttributeLowPowerAcceptedCommandList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"LowPower.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48639,23 +45036,20 @@ class SubscribeAttributeLowPowerAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"LowPower.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48706,23 +45100,20 @@ class SubscribeAttributeLowPowerFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"LowPower.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -48773,23 +45164,20 @@ class SubscribeAttributeLowPowerClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"LowPower.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -48880,16 +45268,17 @@ class MediaInputShowInputStatus : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster showInputStatusWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster showInputStatusWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
@@ -48920,16 +45309,17 @@ class MediaInputHideInputStatus : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster hideInputStatusWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster hideInputStatusWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49033,23 +45423,20 @@ class SubscribeAttributeMediaInputInputList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"MediaInput.InputList response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.InputList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -49100,23 +45487,20 @@ class SubscribeAttributeMediaInputCurrentInput : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentInputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"MediaInput.CurrentInput response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.CurrentInput response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -49166,25 +45550,21 @@ class SubscribeAttributeMediaInputGeneratedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"MediaInput.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -49234,25 +45614,21 @@ class SubscribeAttributeMediaInputAcceptedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"MediaInput.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -49303,23 +45679,20 @@ class SubscribeAttributeMediaInputAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"MediaInput.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -49370,23 +45743,20 @@ class SubscribeAttributeMediaInputFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"MediaInput.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -49437,23 +45807,20 @@ class SubscribeAttributeMediaInputClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"MediaInput.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -49512,18 +45879,19 @@ class MediaPlaybackPlay : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster playWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster
+                   playWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49554,18 +45922,19 @@ class MediaPlaybackPause : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster pauseWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster
+                  pauseWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49596,18 +45965,19 @@ class MediaPlaybackStopPlayback : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster stopPlaybackWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster stopPlaybackWithParams:params
+                          completionHandler:^(
+                              CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49638,18 +46008,19 @@ class MediaPlaybackStartOver : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster startOverWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster startOverWithParams:params
+                       completionHandler:^(
+                           CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49680,18 +46051,19 @@ class MediaPlaybackPrevious : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster previousWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster
+                previousWithParams:params
+                 completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                     NSLog(@"Values: %@", values);
+                     responsesNeeded--;
+                     if (error != nil) {
+                         mError = error;
+                         LogNSError("Error", error);
+                     }
+                     if (responsesNeeded == 0) {
+                         SetCommandExitStatus(mError);
+                     }
+                 }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49722,18 +46094,19 @@ class MediaPlaybackNext : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster nextWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster
+                   nextWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49764,18 +46137,19 @@ class MediaPlaybackRewind : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster rewindWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster
+                 rewindWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49806,18 +46180,19 @@ class MediaPlaybackFastForward : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster fastForwardWithCompletionHandler:^(
-                CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster fastForwardWithParams:params
+                         completionHandler:^(
+                             CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                             NSLog(@"Values: %@", values);
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
         }
         return CHIP_NO_ERROR;
     }
@@ -50011,23 +46386,20 @@ class SubscribeAttributeMediaPlaybackCurrentState : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"MediaPlayback.CurrentState response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.CurrentState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50078,23 +46450,20 @@ class SubscribeAttributeMediaPlaybackStartTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStartTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"MediaPlayback.StartTime response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.StartTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50145,23 +46514,20 @@ class SubscribeAttributeMediaPlaybackDuration : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"MediaPlayback.Duration response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.Duration response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50213,24 +46579,20 @@ class SubscribeAttributeMediaPlaybackSampledPosition : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSampledPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                        NSError * _Nullable error) {
-                                                        NSLog(@"MediaPlayback.SampledPosition response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.SampledPosition response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50281,23 +46643,20 @@ class SubscribeAttributeMediaPlaybackPlaybackSpeed : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePlaybackSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"MediaPlayback.PlaybackSpeed response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.PlaybackSpeed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50348,23 +46707,20 @@ class SubscribeAttributeMediaPlaybackSeekRangeEnd : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSeekRangeEndWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"MediaPlayback.SeekRangeEnd response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.SeekRangeEnd response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50415,23 +46771,20 @@ class SubscribeAttributeMediaPlaybackSeekRangeStart : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSeekRangeStartWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"MediaPlayback.SeekRangeStart response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.SeekRangeStart response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50482,24 +46835,20 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"MediaPlayback.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50549,25 +46898,21 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public SubscribeAttri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"MediaPlayback.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50618,23 +46963,20 @@ class SubscribeAttributeMediaPlaybackAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"MediaPlayback.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50685,23 +47027,20 @@ class SubscribeAttributeMediaPlaybackFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"MediaPlayback.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50752,23 +47091,20 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"MediaPlayback.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -50885,23 +47221,20 @@ class SubscribeAttributeModeSelectDescription : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ModeSelect.Description response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.Description response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -50952,23 +47285,20 @@ class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStandardNamespaceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51019,23 +47349,20 @@ class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSupportedModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51086,23 +47413,20 @@ class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51191,23 +47515,20 @@ class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStartUpModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51296,23 +47617,20 @@ class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOnModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"ModeSelect.OnMode response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.OnMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51362,25 +47680,21 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51430,25 +47744,21 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51499,23 +47809,20 @@ class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ModeSelect.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51566,23 +47873,20 @@ class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -51633,23 +47937,20 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -52073,23 +48374,20 @@ class SubscribeAttributeNetworkCommissioningMaxNetworks : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"NetworkCommissioning.MaxNetworks response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.MaxNetworks response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52144,23 +48442,20 @@ class SubscribeAttributeNetworkCommissioningNetworks : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"NetworkCommissioning.Networks response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.Networks response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52215,24 +48510,20 @@ class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeScanMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"NetworkCommissioning.ScanMaxTimeSeconds response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ScanMaxTimeSeconds response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52287,24 +48578,20 @@ class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeConnectMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"NetworkCommissioning.ConnectMaxTimeSeconds response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ConnectMaxTimeSeconds response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52399,24 +48686,20 @@ class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInterfaceEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"NetworkCommissioning.InterfaceEnabled response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.InterfaceEnabled response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52471,24 +48754,20 @@ class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLastNetworkingStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"NetworkCommissioning.LastNetworkingStatus response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.LastNetworkingStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52543,23 +48822,20 @@ class SubscribeAttributeNetworkCommissioningLastNetworkID : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLastNetworkIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"NetworkCommissioning.LastNetworkID response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.LastNetworkID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52614,24 +48890,20 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLastConnectErrorValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"NetworkCommissioning.LastConnectErrorValue response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.LastConnectErrorValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52686,24 +48958,20 @@ class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"NetworkCommissioning.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52758,24 +49026,20 @@ class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"NetworkCommissioning.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52830,23 +49094,20 @@ class SubscribeAttributeNetworkCommissioningAttributeList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"NetworkCommissioning.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52901,23 +49162,20 @@ class SubscribeAttributeNetworkCommissioningFeatureMap : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"NetworkCommissioning.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -52971,25 +49229,21 @@ class SubscribeAttributeNetworkCommissioningClusterRevision : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"NetworkCommissioning.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -53253,24 +49507,20 @@ class SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OtaSoftwareUpdateProvider.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateProvider.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53325,24 +49575,20 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OtaSoftwareUpdateProvider.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateProvider.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53396,25 +49642,21 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"OtaSoftwareUpdateProvider.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateProvider.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53469,23 +49711,20 @@ class SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OtaSoftwareUpdateProvider.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateProvider.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53540,24 +49779,20 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"OtaSoftwareUpdateProvider.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateProvider.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -53754,24 +49989,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDefaultOtaProvidersWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OtaSoftwareUpdateRequestor.DefaultOtaProviders response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.DefaultOtaProviders response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53826,24 +50057,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUpdatePossibleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"OtaSoftwareUpdateRequestor.UpdatePossible response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.UpdatePossible response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53897,25 +50124,21 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUpdateStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"OtaSoftwareUpdateRequestor.UpdateState response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+        [cluster subscribeAttributeUpdateStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.UpdateState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -53970,24 +50193,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUpdateStateProgressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OtaSoftwareUpdateRequestor.UpdateStateProgress response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.UpdateStateProgress response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54042,24 +50261,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OtaSoftwareUpdateRequestor.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54114,24 +50329,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OtaSoftwareUpdateRequestor.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54186,24 +50397,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"OtaSoftwareUpdateRequestor.AttributeList response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54258,23 +50465,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OtaSoftwareUpdateRequestor.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54329,24 +50533,20 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"OtaSoftwareUpdateRequestor.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -54428,23 +50628,20 @@ class SubscribeAttributeOccupancySensingOccupancy : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"OccupancySensing.Occupancy response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.Occupancy response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54499,24 +50696,20 @@ class SubscribeAttributeOccupancySensingOccupancySensorType : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupancySensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OccupancySensing.OccupancySensorType response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.OccupancySensorType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54571,26 +50764,21 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Subsc
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OccupancySensing.OccupancySensorTypeBitmap response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.OccupancySensorTypeBitmap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54686,26 +50874,21 @@ class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public Su
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"OccupancySensing.PirOccupiedToUnoccupiedDelay response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PirOccupiedToUnoccupiedDelay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54801,26 +50984,21 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public Su
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedDelay response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedDelay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -54918,26 +51096,20 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : publi
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                            params:params
-                                                           subscriptionEstablished:nullptr
-                                                                     reportHandler:^(
-                                                                         NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                         NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedThreshold "
-                                                                               @"response %@",
-                                                                             [value description]);
-                                                                         if (error || !mWait) {
-                                                                             SetCommandExitStatus(error);
-                                                                         }
-                                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedThreshold response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55035,28 +51207,21 @@ class SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : pu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                          params:params
-                                                         subscriptionEstablished:nullptr
-                                                                   reportHandler:^(
-                                                                       NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                       NSLog(@"OccupancySensing."
-                                                                             @"UltrasonicOccupiedToUnoccupiedDelay response %@",
-                                                                           [value description]);
-                                                                       if (error || !mWait) {
-                                                                           SetCommandExitStatus(error);
-                                                                       }
-                                                                   }];
+        [cluster subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.UltrasonicOccupiedToUnoccupiedDelay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55154,28 +51319,21 @@ class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : pu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                          params:params
-                                                         subscriptionEstablished:nullptr
-                                                                   reportHandler:^(
-                                                                       NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                       NSLog(@"OccupancySensing."
-                                                                             @"UltrasonicUnoccupiedToOccupiedDelay response %@",
-                                                                           [value description]);
-                                                                       if (error || !mWait) {
-                                                                           SetCommandExitStatus(error);
-                                                                       }
-                                                                   }];
+        [cluster subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedDelay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55275,27 +51433,20 @@ class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"OccupancySensing."
-                                                                                 @"UltrasonicUnoccupiedToOccupiedThreshold "
-                                                                                 @"response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedThreshold response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55395,27 +51546,20 @@ class SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"OccupancySensing."
-                                                                                  @"PhysicalContactOccupiedToUnoccupiedDelay "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PhysicalContactOccupiedToUnoccupiedDelay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55515,27 +51659,20 @@ class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster
             subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                               params:params
-                                                              subscriptionEstablished:nullptr
-                                                                        reportHandler:^(
-                                                                            NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                            NSLog(@"OccupancySensing."
-                                                                                  @"PhysicalContactUnoccupiedToOccupiedDelay "
-                                                                                  @"response %@",
-                                                                                [value description]);
-                                                                            if (error || !mWait) {
-                                                                                SetCommandExitStatus(error);
-                                                                            }
-                                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedDelay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55636,28 +51773,20 @@ class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThres
         [cluster
             subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber
                                                                                               numberWithUnsignedInt:mMinInterval]
-                                                                              maxInterval:[NSNumber
-                                                                                              numberWithUnsignedInt:mMaxInterval]
-                                                                                   params:params
-                                                                  subscriptionEstablished:nullptr
-                                                                            reportHandler:^(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error) {
-                                                                                NSLog(@"OccupancySensing."
-                                                                                      @"PhysicalContactUnoccupiedToOccupiedThreshol"
-                                                                                      @"d response %@",
-                                                                                    [value description]);
-                                                                                if (error || !mWait) {
-                                                                                    SetCommandExitStatus(error);
-                                                                                }
-                                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedThreshold response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55712,24 +51841,20 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OccupancySensing.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55784,24 +51909,20 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OccupancySensing.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55856,23 +51977,20 @@ class SubscribeAttributeOccupancySensingAttributeList : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"OccupancySensing.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55927,23 +52045,20 @@ class SubscribeAttributeOccupancySensingFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OccupancySensing.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -55998,23 +52113,20 @@ class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"OccupancySensing.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -56066,16 +52178,17 @@ class OnOffOff : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster offWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster offWithParams:params
+                 completionHandler:^(NSError * _Nullable error) {
+                     responsesNeeded--;
+                     if (error != nil) {
+                         mError = error;
+                         LogNSError("Error", error);
+                     }
+                     if (responsesNeeded == 0) {
+                         SetCommandExitStatus(mError);
+                     }
+                 }];
         }
         return CHIP_NO_ERROR;
     }
@@ -56106,16 +52219,17 @@ class OnOffOn : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster onWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster onWithParams:params
+                completionHandler:^(NSError * _Nullable error) {
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -56146,16 +52260,17 @@ class OnOffToggle : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster toggleWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster toggleWithParams:params
+                    completionHandler:^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -56232,16 +52347,17 @@ class OnOffOnWithRecallGlobalScene : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster onWithRecallGlobalSceneWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster onWithRecallGlobalSceneWithParams:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
         }
         return CHIP_NO_ERROR;
     }
@@ -56345,23 +52461,20 @@ class SubscribeAttributeOnOffOnOff : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"OnOff.OnOff response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.OnOff response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56412,23 +52525,20 @@ class SubscribeAttributeOnOffGlobalSceneControl : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGlobalSceneControlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"OnOff.GlobalSceneControl response %@", [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.GlobalSceneControl response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56517,23 +52627,20 @@ class SubscribeAttributeOnOffOnTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOnTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"OnOff.OnTime response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.OnTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56622,23 +52729,20 @@ class SubscribeAttributeOnOffOffWaitTime : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOffWaitTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"OnOff.OffWaitTime response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.OffWaitTime response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56727,23 +52831,20 @@ class SubscribeAttributeOnOffStartUpOnOff : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStartUpOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"OnOff.StartUpOnOff response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.StartUpOnOff response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56794,23 +52895,20 @@ class SubscribeAttributeOnOffGeneratedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OnOff.GeneratedCommandList response %@", [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56861,23 +52959,20 @@ class SubscribeAttributeOnOffAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OnOff.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56928,23 +53023,20 @@ class SubscribeAttributeOnOffAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"OnOff.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -56995,23 +53087,20 @@ class SubscribeAttributeOnOffFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OnOff.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57062,23 +53151,20 @@ class SubscribeAttributeOnOffClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"OnOff.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -57150,23 +53236,20 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSwitchTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OnOffSwitchConfiguration.SwitchType response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.SwitchType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57260,25 +53343,21 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSwitchActionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"OnOffSwitchConfiguration.SwitchActions response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeSwitchActionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.SwitchActions response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57333,24 +53412,20 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OnOffSwitchConfiguration.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57405,24 +53480,20 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OnOffSwitchConfiguration.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57476,25 +53547,21 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"OnOffSwitchConfiguration.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57549,23 +53616,20 @@ class SubscribeAttributeOnOffSwitchConfigurationFeatureMap : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OnOffSwitchConfiguration.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -57620,24 +53684,20 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"OnOffSwitchConfiguration.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -57652,7 +53712,6 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public Subscri
 | * UpdateFabricLabel                                                 |   0x09 |
 | * RemoveFabric                                                      |   0x0A |
 | * AddTrustedRootCertificate                                         |   0x0B |
-| * RemoveTrustedRootCertificate                                      |   0x0C |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * NOCs                                                              | 0x0000 |
@@ -57776,6 +53835,7 @@ class OperationalCredentialsCSRRequest : public ClusterCommand {
         : ClusterCommand("csrrequest")
     {
         AddArgument("CSRNonce", &mRequest.CSRNonce);
+        AddArgument("IsForUpdateNOC", 0, 1, &mRequest.isForUpdateNOC);
         ClusterCommand::AddArguments();
     }
 
@@ -57791,6 +53851,11 @@ class OperationalCredentialsCSRRequest : public ClusterCommand {
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.csrNonce = [NSData dataWithBytes:mRequest.CSRNonce.data() length:mRequest.CSRNonce.size()];
+        if (mRequest.isForUpdateNOC.HasValue()) {
+            params.isForUpdateNOC = [NSNumber numberWithBool:mRequest.isForUpdateNOC.Value()];
+        } else {
+            params.isForUpdateNOC = nil;
+        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
@@ -57826,7 +53891,7 @@ class OperationalCredentialsAddNOC : public ClusterCommand {
         AddArgument("NOCValue", &mRequest.NOCValue);
         AddArgument("ICACValue", &mRequest.ICACValue);
         AddArgument("IPKValue", &mRequest.IPKValue);
-        AddArgument("CaseAdminNode", 0, UINT64_MAX, &mRequest.caseAdminNode);
+        AddArgument("CaseAdminSubject", 0, UINT64_MAX, &mRequest.caseAdminSubject);
         AddArgument("AdminVendorId", 0, UINT16_MAX, &mRequest.adminVendorId);
         ClusterCommand::AddArguments();
     }
@@ -57849,7 +53914,7 @@ class OperationalCredentialsAddNOC : public ClusterCommand {
             params.icacValue = nil;
         }
         params.ipkValue = [NSData dataWithBytes:mRequest.IPKValue.data() length:mRequest.IPKValue.size()];
-        params.caseAdminNode = [NSNumber numberWithUnsignedLongLong:mRequest.caseAdminNode];
+        params.caseAdminSubject = [NSNumber numberWithUnsignedLongLong:mRequest.caseAdminSubject];
         params.adminVendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.adminVendorId)];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
@@ -58073,53 +54138,6 @@ class OperationalCredentialsAddTrustedRootCertificate : public ClusterCommand {
     chip::app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Type mRequest;
 };
 
-/*
- * Command RemoveTrustedRootCertificate
- */
-class OperationalCredentialsRemoveTrustedRootCertificate : public ClusterCommand {
-public:
-    OperationalCredentialsRemoveTrustedRootCertificate()
-        : ClusterCommand("remove-trusted-root-certificate")
-    {
-        AddArgument("TrustedRootIdentifier", &mRequest.trustedRootIdentifier);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000C) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterRemoveTrustedRootCertificateParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.trustedRootIdentifier = [NSData dataWithBytes:mRequest.trustedRootIdentifier.data()
-                                                      length:mRequest.trustedRootIdentifier.size()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster removeTrustedRootCertificateWithParams:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              responsesNeeded--;
-                                              if (error != nil) {
-                                                  mError = error;
-                                                  LogNSError("Error", error);
-                                              }
-                                              if (responsesNeeded == 0) {
-                                                  SetCommandExitStatus(mError);
-                                              }
-                                          }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Type mRequest;
-};
-
 /*
  * Attribute NOCs
  */
@@ -58175,23 +54193,20 @@ class SubscribeAttributeOperationalCredentialsNOCs : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNOCsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                params:params
-                               subscriptionEstablished:nullptr
-                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                             NSLog(@"OperationalCredentials.NOCs response %@", [value description]);
-                                             if (error || !mWait) {
-                                                 SetCommandExitStatus(error);
-                                             }
-                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.NOCs response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58249,23 +54264,20 @@ class SubscribeAttributeOperationalCredentialsFabrics : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"OperationalCredentials.Fabrics response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.Fabrics response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58320,24 +54332,20 @@ class SubscribeAttributeOperationalCredentialsSupportedFabrics : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSupportedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"OperationalCredentials.SupportedFabrics response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.SupportedFabrics response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58392,24 +54400,20 @@ class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCommissionedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OperationalCredentials.CommissionedFabrics response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.CommissionedFabrics response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58464,24 +54468,20 @@ class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTrustedRootCertificatesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"OperationalCredentials.TrustedRootCertificates response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.TrustedRootCertificates response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58536,24 +54536,20 @@ class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"OperationalCredentials.CurrentFabricIndex response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.CurrentFabricIndex response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58608,24 +54604,20 @@ class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"OperationalCredentials.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58680,24 +54672,20 @@ class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"OperationalCredentials.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58751,25 +54739,21 @@ class SubscribeAttributeOperationalCredentialsAttributeList : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"OperationalCredentials.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58824,23 +54808,20 @@ class SubscribeAttributeOperationalCredentialsFeatureMap : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"OperationalCredentials.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -58895,24 +54876,20 @@ class SubscribeAttributeOperationalCredentialsClusterRevision : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"OperationalCredentials.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -59009,23 +54986,20 @@ class SubscribeAttributePowerSourceStatus : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"PowerSource.Status response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.Status response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59076,23 +55050,20 @@ class SubscribeAttributePowerSourceOrder : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOrderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"PowerSource.Order response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.Order response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59143,23 +55114,20 @@ class SubscribeAttributePowerSourceDescription : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"PowerSource.Description response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.Description response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59210,26 +55178,21 @@ class SubscribeAttributePowerSourceWiredAssessedInputVoltage : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeWiredAssessedInputVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PowerSource.WiredAssessedInputVoltage response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeWiredAssessedInputVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredAssessedInputVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59280,26 +55243,21 @@ class SubscribeAttributePowerSourceWiredAssessedInputFrequency : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"PowerSource.WiredAssessedInputFrequency response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredAssessedInputFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59350,23 +55308,20 @@ class SubscribeAttributePowerSourceWiredCurrentType : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWiredCurrentTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"PowerSource.WiredCurrentType response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredCurrentType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59416,25 +55371,21 @@ class SubscribeAttributePowerSourceWiredAssessedCurrent : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeWiredAssessedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSource.WiredAssessedCurrent response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeWiredAssessedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredAssessedCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59484,25 +55435,21 @@ class SubscribeAttributePowerSourceWiredNominalVoltage : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeWiredNominalVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"PowerSource.WiredNominalVoltage response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeWiredNominalVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredNominalVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59552,25 +55499,21 @@ class SubscribeAttributePowerSourceWiredMaximumCurrent : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeWiredMaximumCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"PowerSource.WiredMaximumCurrent response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeWiredMaximumCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredMaximumCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59621,23 +55564,20 @@ class SubscribeAttributePowerSourceWiredPresent : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWiredPresentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"PowerSource.WiredPresent response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredPresent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59688,23 +55628,20 @@ class SubscribeAttributePowerSourceActiveWiredFaults : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveWiredFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"PowerSource.ActiveWiredFaults response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveWiredFaults response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59755,23 +55692,20 @@ class SubscribeAttributePowerSourceBatteryVoltage : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"PowerSource.BatteryVoltage response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59823,24 +55757,20 @@ class SubscribeAttributePowerSourceBatteryPercentRemaining : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryPercentRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"PowerSource.BatteryPercentRemaining response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryPercentRemaining response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59890,25 +55820,21 @@ class SubscribeAttributePowerSourceBatteryTimeRemaining : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryTimeRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSource.BatteryTimeRemaining response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeBatteryTimeRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryTimeRemaining response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -59958,25 +55884,21 @@ class SubscribeAttributePowerSourceBatteryChargeLevel : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryChargeLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PowerSource.BatteryChargeLevel response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeBatteryChargeLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryChargeLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60027,26 +55949,21 @@ class SubscribeAttributePowerSourceBatteryReplacementNeeded : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryReplacementNeededWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"PowerSource.BatteryReplacementNeeded response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeBatteryReplacementNeededWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryReplacementNeeded response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60097,24 +56014,20 @@ class SubscribeAttributePowerSourceBatteryReplaceability : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryReplaceabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"PowerSource.BatteryReplaceability response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryReplaceability response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60165,23 +56078,20 @@ class SubscribeAttributePowerSourceBatteryPresent : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryPresentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"PowerSource.BatteryPresent response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryPresent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60231,25 +56141,21 @@ class SubscribeAttributePowerSourceActiveBatteryFaults : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeActiveBatteryFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"PowerSource.ActiveBatteryFaults response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeActiveBatteryFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveBatteryFaults response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60300,27 +56206,21 @@ class SubscribeAttributePowerSourceBatteryReplacementDescription : public Subscr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryReplacementDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSString * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"PowerSource.BatteryReplacementDescription response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeBatteryReplacementDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryReplacementDescription response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60371,26 +56271,21 @@ class SubscribeAttributePowerSourceBatteryCommonDesignation : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryCommonDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"PowerSource.BatteryCommonDesignation response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeBatteryCommonDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryCommonDesignation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60441,24 +56336,20 @@ class SubscribeAttributePowerSourceBatteryANSIDesignation : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryANSIDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"PowerSource.BatteryANSIDesignation response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryANSIDesignation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60509,24 +56400,20 @@ class SubscribeAttributePowerSourceBatteryIECDesignation : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryIECDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"PowerSource.BatteryIECDesignation response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryIECDesignation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60577,26 +56464,21 @@ class SubscribeAttributePowerSourceBatteryApprovedChemistry : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryApprovedChemistryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"PowerSource.BatteryApprovedChemistry response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeBatteryApprovedChemistryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryApprovedChemistry response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60647,23 +56529,20 @@ class SubscribeAttributePowerSourceBatteryCapacity : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSource.BatteryCapacity response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryCapacity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60714,23 +56593,20 @@ class SubscribeAttributePowerSourceBatteryQuantity : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryQuantityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSource.BatteryQuantity response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryQuantity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60780,25 +56656,21 @@ class SubscribeAttributePowerSourceBatteryChargeState : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryChargeStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PowerSource.BatteryChargeState response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeBatteryChargeStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryChargeState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60850,24 +56722,20 @@ class SubscribeAttributePowerSourceBatteryTimeToFullCharge : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryTimeToFullChargeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"PowerSource.BatteryTimeToFullCharge response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryTimeToFullCharge response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60918,27 +56786,21 @@ class SubscribeAttributePowerSourceBatteryFunctionalWhileCharging : public Subsc
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                     params:params
-                                                    subscriptionEstablished:nullptr
-                                                              reportHandler:^(
-                                                                  NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                  NSLog(@"PowerSource.BatteryFunctionalWhileCharging response %@",
-                                                                      [value description]);
-                                                                  if (error || !mWait) {
-                                                                      SetCommandExitStatus(error);
-                                                                  }
-                                                              }];
+        [cluster subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryFunctionalWhileCharging response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -60989,24 +56851,20 @@ class SubscribeAttributePowerSourceBatteryChargingCurrent : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBatteryChargingCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"PowerSource.BatteryChargingCurrent response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryChargingCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61057,26 +56915,21 @@ class SubscribeAttributePowerSourceActiveBatteryChargeFaults : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PowerSource.ActiveBatteryChargeFaults response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveBatteryChargeFaults response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61126,25 +56979,21 @@ class SubscribeAttributePowerSourceGeneratedCommandList : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSource.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61194,25 +57043,21 @@ class SubscribeAttributePowerSourceAcceptedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"PowerSource.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61263,23 +57108,20 @@ class SubscribeAttributePowerSourceAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PowerSource.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61330,23 +57172,20 @@ class SubscribeAttributePowerSourceFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"PowerSource.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61397,23 +57236,20 @@ class SubscribeAttributePowerSourceClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSource.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -61484,23 +57320,20 @@ class SubscribeAttributePowerSourceConfigurationSources : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSourcesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"PowerSourceConfiguration.Sources response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.Sources response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61555,24 +57388,20 @@ class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PowerSourceConfiguration.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61627,24 +57456,20 @@ class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"PowerSourceConfiguration.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61698,25 +57523,21 @@ class SubscribeAttributePowerSourceConfigurationAttributeList : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"PowerSourceConfiguration.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61771,23 +57592,20 @@ class SubscribeAttributePowerSourceConfigurationFeatureMap : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"PowerSourceConfiguration.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -61842,24 +57660,20 @@ class SubscribeAttributePowerSourceConfigurationClusterRevision : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PowerSourceConfiguration.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -61938,23 +57752,20 @@ class SubscribeAttributePressureMeasurementMeasuredValue : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PressureMeasurement.MeasuredValue response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62008,25 +57819,21 @@ class SubscribeAttributePressureMeasurementMinMeasuredValue : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"PressureMeasurement.MinMeasuredValue response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MinMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62080,25 +57887,21 @@ class SubscribeAttributePressureMeasurementMaxMeasuredValue : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"PressureMeasurement.MaxMeasuredValue response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MaxMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62153,23 +57956,20 @@ class SubscribeAttributePressureMeasurementTolerance : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"PressureMeasurement.Tolerance response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.Tolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62224,23 +58024,20 @@ class SubscribeAttributePressureMeasurementScaledValue : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"PressureMeasurement.ScaledValue response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.ScaledValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62294,25 +58091,21 @@ class SubscribeAttributePressureMeasurementMinScaledValue : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"PressureMeasurement.MinScaledValue response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeMinScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MinScaledValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62366,25 +58159,21 @@ class SubscribeAttributePressureMeasurementMaxScaledValue : public SubscribeAttr
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"PressureMeasurement.MaxScaledValue response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeMaxScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MaxScaledValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62438,25 +58227,21 @@ class SubscribeAttributePressureMeasurementScaledTolerance : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeScaledToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"PressureMeasurement.ScaledTolerance response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeScaledToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.ScaledTolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62511,23 +58296,20 @@ class SubscribeAttributePressureMeasurementScale : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeScaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"PressureMeasurement.Scale response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.Scale response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62582,24 +58364,20 @@ class SubscribeAttributePressureMeasurementGeneratedCommandList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PressureMeasurement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62654,24 +58432,20 @@ class SubscribeAttributePressureMeasurementAcceptedCommandList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"PressureMeasurement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62726,23 +58500,20 @@ class SubscribeAttributePressureMeasurementAttributeList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PressureMeasurement.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62797,23 +58568,20 @@ class SubscribeAttributePressureMeasurementFeatureMap : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"PressureMeasurement.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -62867,25 +58635,21 @@ class SubscribeAttributePressureMeasurementClusterRevision : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"PressureMeasurement.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -62994,25 +58758,21 @@ class SubscribeAttributePumpConfigurationAndControlMaxPressure : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"PumpConfigurationAndControl.MaxPressure response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+        [cluster subscribeAttributeMaxPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63067,23 +58827,20 @@ class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"PumpConfigurationAndControl.MaxSpeed response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxSpeed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63138,23 +58895,20 @@ class SubscribeAttributePumpConfigurationAndControlMaxFlow : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"PumpConfigurationAndControl.MaxFlow response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxFlow response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63209,24 +58963,20 @@ class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"PumpConfigurationAndControl.MinConstPressure response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63281,24 +59031,20 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"PumpConfigurationAndControl.MaxConstPressure response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63353,24 +59099,20 @@ class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PumpConfigurationAndControl.MinCompPressure response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinCompPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63425,24 +59167,20 @@ class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PumpConfigurationAndControl.MaxCompPressure response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxCompPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63497,24 +59235,20 @@ class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PumpConfigurationAndControl.MinConstSpeed response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstSpeed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63569,24 +59303,20 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PumpConfigurationAndControl.MaxConstSpeed response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstSpeed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63640,25 +59370,21 @@ class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public Subscri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"PumpConfigurationAndControl.MinConstFlow response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeMinConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstFlow response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63712,25 +59438,21 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public Subscri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"PumpConfigurationAndControl.MaxConstFlow response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeMaxConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstFlow response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63784,25 +59506,21 @@ class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public Subscri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"PumpConfigurationAndControl.MinConstTemp response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeMinConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstTemp response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63856,25 +59574,21 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public Subscri
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"PumpConfigurationAndControl.MaxConstTemp response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeMaxConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstTemp response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -63928,25 +59642,21 @@ class SubscribeAttributePumpConfigurationAndControlPumpStatus : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePumpStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"PumpConfigurationAndControl.PumpStatus response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+        [cluster subscribeAttributePumpStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.PumpStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64000,26 +59710,21 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : publ
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeEffectiveOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"PumpConfigurationAndControl.EffectiveOperationMode response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+        [cluster subscribeAttributeEffectiveOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.EffectiveOperationMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64074,24 +59779,20 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEffectiveControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PumpConfigurationAndControl.EffectiveControlMode response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.EffectiveControlMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64146,23 +59847,20 @@ class SubscribeAttributePumpConfigurationAndControlCapacity : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"PumpConfigurationAndControl.Capacity response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.Capacity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64217,23 +59915,20 @@ class SubscribeAttributePumpConfigurationAndControlSpeed : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"PumpConfigurationAndControl.Speed response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.Speed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64329,24 +60024,20 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLifetimeRunningHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PumpConfigurationAndControl.LifetimeRunningHours response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.LifetimeRunningHours response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64401,23 +60092,20 @@ class SubscribeAttributePumpConfigurationAndControlPower : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"PumpConfigurationAndControl.Power response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.Power response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64512,26 +60200,21 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : publ
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeLifetimeEnergyConsumedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"PumpConfigurationAndControl.LifetimeEnergyConsumed response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+        [cluster subscribeAttributeLifetimeEnergyConsumedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.LifetimeEnergyConsumed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64626,24 +60309,20 @@ class SubscribeAttributePumpConfigurationAndControlOperationMode : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PumpConfigurationAndControl.OperationMode response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.OperationMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64737,25 +60416,21 @@ class SubscribeAttributePumpConfigurationAndControlControlMode : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"PumpConfigurationAndControl.ControlMode response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+        [cluster subscribeAttributeControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.ControlMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64810,24 +60485,20 @@ class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"PumpConfigurationAndControl.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64882,24 +60553,20 @@ class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"PumpConfigurationAndControl.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -64954,24 +60621,20 @@ class SubscribeAttributePumpConfigurationAndControlAttributeList : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"PumpConfigurationAndControl.AttributeList response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65025,25 +60688,21 @@ class SubscribeAttributePumpConfigurationAndControlFeatureMap : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"PumpConfigurationAndControl.FeatureMap response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65098,24 +60757,20 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"PumpConfigurationAndControl.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -65189,24 +60844,20 @@ class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"RelativeHumidityMeasurement.MeasuredValue response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.MeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65261,24 +60912,20 @@ class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"RelativeHumidityMeasurement.MinMeasuredValue response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.MinMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65333,24 +60980,20 @@ class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"RelativeHumidityMeasurement.MaxMeasuredValue response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.MaxMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65405,23 +61048,20 @@ class SubscribeAttributeRelativeHumidityMeasurementTolerance : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"RelativeHumidityMeasurement.Tolerance response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.Tolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65476,24 +61116,20 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"RelativeHumidityMeasurement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65548,24 +61184,20 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"RelativeHumidityMeasurement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65620,24 +61252,20 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"RelativeHumidityMeasurement.AttributeList response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65691,25 +61319,21 @@ class SubscribeAttributeRelativeHumidityMeasurementFeatureMap : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"RelativeHumidityMeasurement.FeatureMap response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -65764,24 +61388,20 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"RelativeHumidityMeasurement.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RelativeHumidityMeasurement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -66436,23 +62056,20 @@ class SubscribeAttributeScenesSceneCount : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSceneCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Scenes.SceneCount response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.SceneCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66503,23 +62120,20 @@ class SubscribeAttributeScenesCurrentScene : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentSceneWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"Scenes.CurrentScene response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.CurrentScene response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66570,23 +62184,20 @@ class SubscribeAttributeScenesCurrentGroup : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentGroupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"Scenes.CurrentGroup response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.CurrentGroup response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66637,23 +62248,20 @@ class SubscribeAttributeScenesSceneValid : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSceneValidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Scenes.SceneValid response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.SceneValid response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66704,23 +62312,20 @@ class SubscribeAttributeScenesNameSupport : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"Scenes.NameSupport response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.NameSupport response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66771,23 +62376,20 @@ class SubscribeAttributeScenesLastConfiguredBy : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLastConfiguredByWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Scenes.LastConfiguredBy response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.LastConfiguredBy response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66838,23 +62440,20 @@ class SubscribeAttributeScenesGeneratedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Scenes.GeneratedCommandList response %@", [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66905,23 +62504,20 @@ class SubscribeAttributeScenesAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Scenes.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -66972,23 +62568,20 @@ class SubscribeAttributeScenesAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Scenes.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67039,23 +62632,20 @@ class SubscribeAttributeScenesFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Scenes.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67106,23 +62696,20 @@ class SubscribeAttributeScenesClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Scenes.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -67171,16 +62758,17 @@ class SoftwareDiagnosticsResetWatermarks : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster resetWatermarksWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster resetWatermarksWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
@@ -67240,23 +62828,20 @@ class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeThreadMetricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"SoftwareDiagnostics.ThreadMetrics response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.ThreadMetrics response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67310,25 +62895,21 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentHeapFreeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"SoftwareDiagnostics.CurrentHeapFree response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeCurrentHeapFreeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.CurrentHeapFree response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67382,25 +62963,21 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentHeapUsedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"SoftwareDiagnostics.CurrentHeapUsed response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeCurrentHeapUsedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.CurrentHeapUsed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67455,26 +63032,21 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public Sub
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"SoftwareDiagnostics.CurrentHeapHighWatermark response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.CurrentHeapHighWatermark response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67529,24 +63101,20 @@ class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"SoftwareDiagnostics.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67601,24 +63169,20 @@ class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"SoftwareDiagnostics.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67673,23 +63237,20 @@ class SubscribeAttributeSoftwareDiagnosticsAttributeList : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"SoftwareDiagnostics.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67744,23 +63305,20 @@ class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"SoftwareDiagnostics.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67814,25 +63372,21 @@ class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"SoftwareDiagnostics.ClusterRevision response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -67908,23 +63462,20 @@ class SubscribeAttributeSwitchNumberOfPositions : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNumberOfPositionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"Switch.NumberOfPositions response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.NumberOfPositions response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -67975,23 +63526,20 @@ class SubscribeAttributeSwitchCurrentPosition : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Switch.CurrentPosition response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.CurrentPosition response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68042,23 +63590,20 @@ class SubscribeAttributeSwitchMultiPressMax : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMultiPressMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Switch.MultiPressMax response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.MultiPressMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68109,23 +63654,20 @@ class SubscribeAttributeSwitchGeneratedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Switch.GeneratedCommandList response %@", [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68176,23 +63718,20 @@ class SubscribeAttributeSwitchAcceptedCommandList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Switch.AcceptedCommandList response %@", [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68243,23 +63782,20 @@ class SubscribeAttributeSwitchAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Switch.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68310,23 +63846,20 @@ class SubscribeAttributeSwitchFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Switch.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68377,23 +63910,20 @@ class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Switch.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -68516,23 +64046,20 @@ class SubscribeAttributeTargetNavigatorTargetList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTargetListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TargetNavigator.TargetList response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.TargetList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68583,23 +64110,20 @@ class SubscribeAttributeTargetNavigatorCurrentTarget : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentTargetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TargetNavigator.CurrentTarget response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.CurrentTarget response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68650,24 +64174,20 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"TargetNavigator.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68718,24 +64238,20 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"TargetNavigator.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68786,23 +64302,20 @@ class SubscribeAttributeTargetNavigatorAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TargetNavigator.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68853,23 +64366,20 @@ class SubscribeAttributeTargetNavigatorFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TargetNavigator.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -68920,23 +64430,20 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TargetNavigator.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -69009,25 +64516,21 @@ class SubscribeAttributeTemperatureMeasurementMeasuredValue : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TemperatureMeasurement.MeasuredValue response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.MeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69082,24 +64585,20 @@ class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TemperatureMeasurement.MinMeasuredValue response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.MinMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69154,24 +64653,20 @@ class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TemperatureMeasurement.MaxMeasuredValue response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.MaxMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69226,23 +64721,20 @@ class SubscribeAttributeTemperatureMeasurementTolerance : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"TemperatureMeasurement.Tolerance response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.Tolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69297,24 +64789,20 @@ class SubscribeAttributeTemperatureMeasurementGeneratedCommandList : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"TemperatureMeasurement.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69369,24 +64857,20 @@ class SubscribeAttributeTemperatureMeasurementAcceptedCommandList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"TemperatureMeasurement.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69440,25 +64924,21 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TemperatureMeasurement.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69513,23 +64993,20 @@ class SubscribeAttributeTemperatureMeasurementFeatureMap : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TemperatureMeasurement.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -69584,28 +65061,24 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TemperatureMeasurement.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster TestCluster                                                 | 0x050F |
+| Cluster TestCluster                                                 | 0xFFF1FC05|
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * Test                                                              |   0x00 |
@@ -69737,7 +65210,7 @@ class TestClusterTest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -69747,16 +65220,17 @@ class TestClusterTest : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster testWithParams:params
+                  completionHandler:^(NSError * _Nullable error) {
+                      responsesNeeded--;
+                      if (error != nil) {
+                          mError = error;
+                          LogNSError("Error", error);
+                      }
+                      if (responsesNeeded == 0) {
+                          SetCommandExitStatus(mError);
+                      }
+                  }];
         }
         return CHIP_NO_ERROR;
     }
@@ -69777,7 +65251,7 @@ class TestClusterTestNotHandled : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -69787,16 +65261,17 @@ class TestClusterTestNotHandled : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testNotHandledWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster testNotHandledWithParams:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
         }
         return CHIP_NO_ERROR;
     }
@@ -69817,7 +65292,7 @@ class TestClusterTestSpecific : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -69827,18 +65302,19 @@ class TestClusterTestSpecific : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testSpecificWithCompletionHandler:^(
-                CHIPTestClusterClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster testSpecificWithParams:params
+                          completionHandler:^(
+                              CHIPTestClusterClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
         }
         return CHIP_NO_ERROR;
     }
@@ -69859,7 +65335,7 @@ class TestClusterTestUnknownCommand : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -69869,16 +65345,17 @@ class TestClusterTestUnknownCommand : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testUnknownCommandWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster testUnknownCommandWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -69901,7 +65378,7 @@ class TestClusterTestAddArguments : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -69948,7 +65425,7 @@ class TestClusterTestSimpleArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70004,7 +65481,7 @@ class TestClusterTestStructArrayArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70164,7 +65641,7 @@ class TestClusterTestStructArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70222,7 +65699,7 @@ class TestClusterTestNestedStructArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70283,7 +65760,7 @@ class TestClusterTestListStructArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70350,7 +65827,7 @@ class TestClusterTestListInt8UArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70406,7 +65883,7 @@ class TestClusterTestNestedStructListArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70513,7 +65990,7 @@ class TestClusterTestListNestedStructListArgumentRequest : public ClusterCommand
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70630,7 +66107,7 @@ class TestClusterTestListInt8UReverseRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70687,7 +66164,7 @@ class TestClusterTestEnumsRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70734,7 +66211,7 @@ class TestClusterTestNullableOptionalRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -70806,7 +66283,7 @@ class TestClusterTestComplexNullableOptionalRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71012,7 +66489,7 @@ class TestClusterSimpleStructEchoRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71068,7 +66545,7 @@ class TestClusterTimedInvokeRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71078,16 +66555,17 @@ class TestClusterTimedInvokeRequest : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster timedInvokeRequestWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster timedInvokeRequestWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
         }
         return CHIP_NO_ERROR;
     }
@@ -71109,7 +66587,7 @@ class TestClusterTestSimpleOptionalArgumentRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71159,7 +66637,7 @@ class TestClusterTestEmitTestEventRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71207,7 +66685,7 @@ class TestClusterTestEmitTestFabricScopedEventRequest : public ClusterCommand {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) command (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71255,7 +66733,7 @@ class ReadTestClusterBoolean : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71284,7 +66762,7 @@ class WriteTestClusterBoolean : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71319,7 +66797,7 @@ class SubscribeAttributeTestClusterBoolean : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71327,23 +66805,20 @@ class SubscribeAttributeTestClusterBoolean : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"TestCluster.Boolean response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Boolean response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71360,7 +66835,7 @@ class ReadTestClusterBitmap8 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71389,7 +66864,7 @@ class WriteTestClusterBitmap8 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71424,7 +66899,7 @@ class SubscribeAttributeTestClusterBitmap8 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71432,23 +66907,20 @@ class SubscribeAttributeTestClusterBitmap8 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"TestCluster.Bitmap8 response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Bitmap8 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71465,7 +66937,7 @@ class ReadTestClusterBitmap16 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71494,7 +66966,7 @@ class WriteTestClusterBitmap16 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71529,7 +67001,7 @@ class SubscribeAttributeTestClusterBitmap16 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71537,23 +67009,20 @@ class SubscribeAttributeTestClusterBitmap16 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TestCluster.Bitmap16 response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Bitmap16 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71570,7 +67039,7 @@ class ReadTestClusterBitmap32 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71599,7 +67068,7 @@ class WriteTestClusterBitmap32 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71634,7 +67103,7 @@ class SubscribeAttributeTestClusterBitmap32 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71642,23 +67111,20 @@ class SubscribeAttributeTestClusterBitmap32 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TestCluster.Bitmap32 response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Bitmap32 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71675,7 +67141,7 @@ class ReadTestClusterBitmap64 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71704,7 +67170,7 @@ class WriteTestClusterBitmap64 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71739,7 +67205,7 @@ class SubscribeAttributeTestClusterBitmap64 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71747,23 +67213,20 @@ class SubscribeAttributeTestClusterBitmap64 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TestCluster.Bitmap64 response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Bitmap64 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71780,7 +67243,7 @@ class ReadTestClusterInt8u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71809,7 +67272,7 @@ class WriteTestClusterInt8u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71844,7 +67307,7 @@ class SubscribeAttributeTestClusterInt8u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71852,23 +67315,20 @@ class SubscribeAttributeTestClusterInt8u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"TestCluster.Int8u response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int8u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71885,7 +67345,7 @@ class ReadTestClusterInt16u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -71914,7 +67374,7 @@ class WriteTestClusterInt16u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -71949,7 +67409,7 @@ class SubscribeAttributeTestClusterInt16u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -71957,23 +67417,20 @@ class SubscribeAttributeTestClusterInt16u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int16u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int16u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -71990,7 +67447,7 @@ class ReadTestClusterInt24u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72019,7 +67476,7 @@ class WriteTestClusterInt24u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72054,7 +67511,7 @@ class SubscribeAttributeTestClusterInt24u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72062,23 +67519,20 @@ class SubscribeAttributeTestClusterInt24u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int24u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int24u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72095,7 +67549,7 @@ class ReadTestClusterInt32u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72124,7 +67578,7 @@ class WriteTestClusterInt32u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72159,7 +67613,7 @@ class SubscribeAttributeTestClusterInt32u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72167,23 +67621,20 @@ class SubscribeAttributeTestClusterInt32u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int32u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int32u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72200,7 +67651,7 @@ class ReadTestClusterInt40u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72229,7 +67680,7 @@ class WriteTestClusterInt40u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72264,7 +67715,7 @@ class SubscribeAttributeTestClusterInt40u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72272,23 +67723,20 @@ class SubscribeAttributeTestClusterInt40u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int40u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int40u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72305,7 +67753,7 @@ class ReadTestClusterInt48u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72334,7 +67782,7 @@ class WriteTestClusterInt48u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72369,7 +67817,7 @@ class SubscribeAttributeTestClusterInt48u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72377,23 +67825,20 @@ class SubscribeAttributeTestClusterInt48u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int48u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int48u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72410,7 +67855,7 @@ class ReadTestClusterInt56u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72439,7 +67884,7 @@ class WriteTestClusterInt56u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72474,7 +67919,7 @@ class SubscribeAttributeTestClusterInt56u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72482,23 +67927,20 @@ class SubscribeAttributeTestClusterInt56u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int56u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int56u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72515,7 +67957,7 @@ class ReadTestClusterInt64u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72544,7 +67986,7 @@ class WriteTestClusterInt64u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72579,7 +68021,7 @@ class SubscribeAttributeTestClusterInt64u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72587,23 +68029,20 @@ class SubscribeAttributeTestClusterInt64u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int64u response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int64u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72620,7 +68059,7 @@ class ReadTestClusterInt8s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72649,7 +68088,7 @@ class WriteTestClusterInt8s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72684,7 +68123,7 @@ class SubscribeAttributeTestClusterInt8s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72692,23 +68131,20 @@ class SubscribeAttributeTestClusterInt8s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"TestCluster.Int8s response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int8s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72725,7 +68161,7 @@ class ReadTestClusterInt16s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72754,7 +68190,7 @@ class WriteTestClusterInt16s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72789,7 +68225,7 @@ class SubscribeAttributeTestClusterInt16s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72797,23 +68233,20 @@ class SubscribeAttributeTestClusterInt16s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int16s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int16s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72830,7 +68263,7 @@ class ReadTestClusterInt24s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72859,7 +68292,7 @@ class WriteTestClusterInt24s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72894,7 +68327,7 @@ class SubscribeAttributeTestClusterInt24s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -72902,23 +68335,20 @@ class SubscribeAttributeTestClusterInt24s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int24s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int24s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -72935,7 +68365,7 @@ class ReadTestClusterInt32s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -72964,7 +68394,7 @@ class WriteTestClusterInt32s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -72999,7 +68429,7 @@ class SubscribeAttributeTestClusterInt32s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73007,23 +68437,20 @@ class SubscribeAttributeTestClusterInt32s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int32s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int32s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73040,7 +68467,7 @@ class ReadTestClusterInt40s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73069,7 +68496,7 @@ class WriteTestClusterInt40s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73104,7 +68531,7 @@ class SubscribeAttributeTestClusterInt40s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73112,23 +68539,20 @@ class SubscribeAttributeTestClusterInt40s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int40s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int40s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73145,7 +68569,7 @@ class ReadTestClusterInt48s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73174,7 +68598,7 @@ class WriteTestClusterInt48s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73209,7 +68633,7 @@ class SubscribeAttributeTestClusterInt48s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73217,23 +68641,20 @@ class SubscribeAttributeTestClusterInt48s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int48s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int48s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73250,7 +68671,7 @@ class ReadTestClusterInt56s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73279,7 +68700,7 @@ class WriteTestClusterInt56s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73314,7 +68735,7 @@ class SubscribeAttributeTestClusterInt56s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73322,23 +68743,20 @@ class SubscribeAttributeTestClusterInt56s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int56s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int56s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73355,7 +68773,7 @@ class ReadTestClusterInt64s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73384,7 +68802,7 @@ class WriteTestClusterInt64s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73419,7 +68837,7 @@ class SubscribeAttributeTestClusterInt64s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73427,23 +68845,20 @@ class SubscribeAttributeTestClusterInt64s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Int64s response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int64s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73460,7 +68875,7 @@ class ReadTestClusterEnum8 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73489,7 +68904,7 @@ class WriteTestClusterEnum8 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73524,7 +68939,7 @@ class SubscribeAttributeTestClusterEnum8 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73532,23 +68947,20 @@ class SubscribeAttributeTestClusterEnum8 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"TestCluster.Enum8 response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Enum8 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73565,7 +68977,7 @@ class ReadTestClusterEnum16 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73594,7 +69006,7 @@ class WriteTestClusterEnum16 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73629,7 +69041,7 @@ class SubscribeAttributeTestClusterEnum16 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73637,23 +69049,20 @@ class SubscribeAttributeTestClusterEnum16 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.Enum16 response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Enum16 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73670,7 +69079,7 @@ class ReadTestClusterFloatSingle : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73699,7 +69108,7 @@ class WriteTestClusterFloatSingle : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73734,7 +69143,7 @@ class SubscribeAttributeTestClusterFloatSingle : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73742,23 +69151,20 @@ class SubscribeAttributeTestClusterFloatSingle : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"TestCluster.FloatSingle response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.FloatSingle response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73775,7 +69181,7 @@ class ReadTestClusterFloatDouble : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73804,7 +69210,7 @@ class WriteTestClusterFloatDouble : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73839,7 +69245,7 @@ class SubscribeAttributeTestClusterFloatDouble : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73847,23 +69253,20 @@ class SubscribeAttributeTestClusterFloatDouble : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"TestCluster.FloatDouble response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.FloatDouble response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73880,7 +69283,7 @@ class ReadTestClusterOctetString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -73909,7 +69312,7 @@ class WriteTestClusterOctetString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -73944,7 +69347,7 @@ class SubscribeAttributeTestClusterOctetString : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -73952,23 +69355,20 @@ class SubscribeAttributeTestClusterOctetString : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"TestCluster.OctetString response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.OctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -73985,7 +69385,7 @@ class ReadTestClusterListInt8u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74015,7 +69415,7 @@ class WriteTestClusterListInt8u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74060,7 +69460,7 @@ class SubscribeAttributeTestClusterListInt8u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74068,23 +69468,20 @@ class SubscribeAttributeTestClusterListInt8u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeListInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"TestCluster.ListInt8u response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListInt8u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74101,7 +69498,7 @@ class ReadTestClusterListOctetString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74131,7 +69528,7 @@ class WriteTestClusterListOctetString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74176,7 +69573,7 @@ class SubscribeAttributeTestClusterListOctetString : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74184,23 +69581,20 @@ class SubscribeAttributeTestClusterListOctetString : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeListOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.ListOctetString response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListOctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74217,7 +69611,7 @@ class ReadTestClusterListStructOctetString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74247,7 +69641,7 @@ class WriteTestClusterListStructOctetString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74260,9 +69654,8 @@ class WriteTestClusterListStructOctetString : public WriteAttribute {
             for (auto & entry_0 : mValue) {
                 CHIPTestClusterClusterTestListStructOctet * newElement_0;
                 newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedLongLong:entry_0.fabricIndex];
-                newElement_0.operationalCert = [NSData dataWithBytes:entry_0.operationalCert.data()
-                                                              length:entry_0.operationalCert.size()];
+                newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
+                newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
                 [array_0 addObject:newElement_0];
             }
             value = array_0;
@@ -74296,7 +69689,7 @@ class SubscribeAttributeTestClusterListStructOctetString : public SubscribeAttri
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74304,24 +69697,20 @@ class SubscribeAttributeTestClusterListStructOctetString : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeListStructOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"TestCluster.ListStructOctetString response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListStructOctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74338,7 +69727,7 @@ class ReadTestClusterLongOctetString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74367,7 +69756,7 @@ class WriteTestClusterLongOctetString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74402,7 +69791,7 @@ class SubscribeAttributeTestClusterLongOctetString : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74410,23 +69799,20 @@ class SubscribeAttributeTestClusterLongOctetString : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.LongOctetString response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.LongOctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74443,7 +69829,7 @@ class ReadTestClusterCharString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74472,7 +69858,7 @@ class WriteTestClusterCharString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74509,7 +69895,7 @@ class SubscribeAttributeTestClusterCharString : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74517,23 +69903,20 @@ class SubscribeAttributeTestClusterCharString : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TestCluster.CharString response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.CharString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74550,7 +69933,7 @@ class ReadTestClusterLongCharString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000001F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74579,7 +69962,7 @@ class WriteTestClusterLongCharString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000001F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74616,7 +69999,7 @@ class SubscribeAttributeTestClusterLongCharString : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000001F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74624,23 +70007,20 @@ class SubscribeAttributeTestClusterLongCharString : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLongCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.LongCharString response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.LongCharString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74657,7 +70037,7 @@ class ReadTestClusterEpochUs : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74686,7 +70066,7 @@ class WriteTestClusterEpochUs : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74721,7 +70101,7 @@ class SubscribeAttributeTestClusterEpochUs : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74729,23 +70109,20 @@ class SubscribeAttributeTestClusterEpochUs : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEpochUsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"TestCluster.EpochUs response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.EpochUs response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74762,7 +70139,7 @@ class ReadTestClusterEpochS : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74791,7 +70168,7 @@ class WriteTestClusterEpochS : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74826,7 +70203,7 @@ class SubscribeAttributeTestClusterEpochS : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74834,23 +70211,20 @@ class SubscribeAttributeTestClusterEpochS : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEpochSWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"TestCluster.EpochS response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.EpochS response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74867,7 +70241,7 @@ class ReadTestClusterVendorId : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -74896,7 +70270,7 @@ class WriteTestClusterVendorId : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -74931,7 +70305,7 @@ class SubscribeAttributeTestClusterVendorId : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -74939,23 +70313,20 @@ class SubscribeAttributeTestClusterVendorId : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TestCluster.VendorId response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.VendorId response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -74972,7 +70343,7 @@ class ReadTestClusterListNullablesAndOptionalsStruct : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000023) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75003,7 +70374,7 @@ class WriteTestClusterListNullablesAndOptionalsStruct : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75202,34 +70573,28 @@ class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public Subs
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                      params:params
-                                                     subscriptionEstablished:nullptr
-                                                               reportHandler:^(
-                                                                   NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                   NSLog(@"TestCluster.ListNullablesAndOptionalsStruct response %@",
-                                                                       [value description]);
-                                                                   if (error || !mWait) {
-                                                                       SetCommandExitStatus(error);
-                                                                   }
-                                                               }];
+        [cluster subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListNullablesAndOptionalsStruct response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75246,7 +70611,7 @@ class ReadTestClusterEnumAttr : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75275,7 +70640,7 @@ class WriteTestClusterEnumAttr : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75310,7 +70675,7 @@ class SubscribeAttributeTestClusterEnumAttr : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -75318,23 +70683,20 @@ class SubscribeAttributeTestClusterEnumAttr : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TestCluster.EnumAttr response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.EnumAttr response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75351,7 +70713,7 @@ class ReadTestClusterStructAttr : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75382,7 +70744,7 @@ class WriteTestClusterStructAttr : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75427,7 +70789,7 @@ class SubscribeAttributeTestClusterStructAttr : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -75435,24 +70797,20 @@ class SubscribeAttributeTestClusterStructAttr : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStructAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                   NSError * _Nullable error) {
-                                                   NSLog(@"TestCluster.StructAttr response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.StructAttr response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75469,7 +70827,7 @@ class ReadTestClusterRangeRestrictedInt8u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000026) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75498,7 +70856,7 @@ class WriteTestClusterRangeRestrictedInt8u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75533,32 +70891,28 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8u : public SubscribeAttrib
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.RangeRestrictedInt8u response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt8u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75575,7 +70929,7 @@ class ReadTestClusterRangeRestrictedInt8s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000027) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75604,7 +70958,7 @@ class WriteTestClusterRangeRestrictedInt8s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75639,32 +70993,28 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8s : public SubscribeAttrib
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.RangeRestrictedInt8s response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt8s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75681,7 +71031,7 @@ class ReadTestClusterRangeRestrictedInt16u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000028) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75710,7 +71060,7 @@ class WriteTestClusterRangeRestrictedInt16u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75745,7 +71095,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public SubscribeAttri
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -75753,24 +71103,20 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"TestCluster.RangeRestrictedInt16u response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt16u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75787,7 +71133,7 @@ class ReadTestClusterRangeRestrictedInt16s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75816,7 +71162,7 @@ class WriteTestClusterRangeRestrictedInt16s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75851,7 +71197,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public SubscribeAttri
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -75859,24 +71205,20 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"TestCluster.RangeRestrictedInt16s response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt16s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -75893,7 +71235,7 @@ class ReadTestClusterListLongOctetString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -75923,7 +71265,7 @@ class WriteTestClusterListLongOctetString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000002A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -75968,32 +71310,28 @@ class SubscribeAttributeTestClusterListLongOctetString : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeListLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.ListLongOctetString response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeListLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListLongOctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76010,7 +71348,7 @@ class ReadTestClusterListFabricScoped : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76043,7 +71381,7 @@ class WriteTestClusterListFabricScoped : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76138,7 +71476,7 @@ class SubscribeAttributeTestClusterListFabricScoped : public SubscribeAttribute
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76146,23 +71484,20 @@ class SubscribeAttributeTestClusterListFabricScoped : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeListFabricScopedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TestCluster.ListFabricScoped response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListFabricScoped response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76179,7 +71514,7 @@ class ReadTestClusterTimedWriteBoolean : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76208,7 +71543,7 @@ class WriteTestClusterTimedWriteBoolean : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76243,7 +71578,7 @@ class SubscribeAttributeTestClusterTimedWriteBoolean : public SubscribeAttribute
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76251,23 +71586,20 @@ class SubscribeAttributeTestClusterTimedWriteBoolean : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTimedWriteBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"TestCluster.TimedWriteBoolean response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.TimedWriteBoolean response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76284,7 +71616,7 @@ class ReadTestClusterGeneralErrorBoolean : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76313,7 +71645,7 @@ class WriteTestClusterGeneralErrorBoolean : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76348,32 +71680,28 @@ class SubscribeAttributeTestClusterGeneralErrorBoolean : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneralErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.GeneralErrorBoolean response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeGeneralErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.GeneralErrorBoolean response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76390,7 +71718,7 @@ class ReadTestClusterClusterErrorBoolean : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76419,7 +71747,7 @@ class WriteTestClusterClusterErrorBoolean : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76454,32 +71782,28 @@ class SubscribeAttributeTestClusterClusterErrorBoolean : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeClusterErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.ClusterErrorBoolean response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeClusterErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ClusterErrorBoolean response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76496,7 +71820,7 @@ class ReadTestClusterUnsupported : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x000000FF) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x000000FF) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76525,7 +71849,7 @@ class WriteTestClusterUnsupported : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x000000FF) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x000000FF) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76560,7 +71884,7 @@ class SubscribeAttributeTestClusterUnsupported : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x000000FF) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x000000FF) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76568,23 +71892,20 @@ class SubscribeAttributeTestClusterUnsupported : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUnsupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"TestCluster.Unsupported response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Unsupported response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76601,7 +71922,7 @@ class ReadTestClusterNullableBoolean : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76630,7 +71951,7 @@ class WriteTestClusterNullableBoolean : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76665,7 +71986,7 @@ class SubscribeAttributeTestClusterNullableBoolean : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76673,23 +71994,20 @@ class SubscribeAttributeTestClusterNullableBoolean : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.NullableBoolean response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableBoolean response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76706,7 +72024,7 @@ class ReadTestClusterNullableBitmap8 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76735,7 +72053,7 @@ class WriteTestClusterNullableBitmap8 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76770,7 +72088,7 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76778,23 +72096,20 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.NullableBitmap8 response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableBitmap8 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76811,7 +72126,7 @@ class ReadTestClusterNullableBitmap16 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76840,7 +72155,7 @@ class WriteTestClusterNullableBitmap16 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76875,7 +72190,7 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public SubscribeAttribute
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76883,23 +72198,20 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TestCluster.NullableBitmap16 response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableBitmap16 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -76916,7 +72228,7 @@ class ReadTestClusterNullableBitmap32 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -76945,7 +72257,7 @@ class WriteTestClusterNullableBitmap32 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -76980,7 +72292,7 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public SubscribeAttribute
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -76988,23 +72300,20 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TestCluster.NullableBitmap32 response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableBitmap32 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77021,7 +72330,7 @@ class ReadTestClusterNullableBitmap64 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77050,7 +72359,7 @@ class WriteTestClusterNullableBitmap64 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77085,7 +72394,7 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public SubscribeAttribute
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77093,23 +72402,20 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TestCluster.NullableBitmap64 response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableBitmap64 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77126,7 +72432,7 @@ class ReadTestClusterNullableInt8u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77155,7 +72461,7 @@ class WriteTestClusterNullableInt8u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77190,7 +72496,7 @@ class SubscribeAttributeTestClusterNullableInt8u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77198,23 +72504,20 @@ class SubscribeAttributeTestClusterNullableInt8u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TestCluster.NullableInt8u response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt8u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77231,7 +72534,7 @@ class ReadTestClusterNullableInt16u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77260,7 +72563,7 @@ class WriteTestClusterNullableInt16u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77295,7 +72598,7 @@ class SubscribeAttributeTestClusterNullableInt16u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77303,23 +72606,20 @@ class SubscribeAttributeTestClusterNullableInt16u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt16u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt16u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77336,7 +72636,7 @@ class ReadTestClusterNullableInt24u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77365,7 +72665,7 @@ class WriteTestClusterNullableInt24u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77400,7 +72700,7 @@ class SubscribeAttributeTestClusterNullableInt24u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77408,23 +72708,20 @@ class SubscribeAttributeTestClusterNullableInt24u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt24u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt24u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77441,7 +72738,7 @@ class ReadTestClusterNullableInt32u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77470,7 +72767,7 @@ class WriteTestClusterNullableInt32u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77505,7 +72802,7 @@ class SubscribeAttributeTestClusterNullableInt32u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77513,23 +72810,20 @@ class SubscribeAttributeTestClusterNullableInt32u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt32u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt32u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77546,7 +72840,7 @@ class ReadTestClusterNullableInt40u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77575,7 +72869,7 @@ class WriteTestClusterNullableInt40u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77610,7 +72904,7 @@ class SubscribeAttributeTestClusterNullableInt40u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77618,23 +72912,20 @@ class SubscribeAttributeTestClusterNullableInt40u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt40u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt40u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77651,7 +72942,7 @@ class ReadTestClusterNullableInt48u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77680,7 +72971,7 @@ class WriteTestClusterNullableInt48u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77715,7 +73006,7 @@ class SubscribeAttributeTestClusterNullableInt48u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77723,23 +73014,20 @@ class SubscribeAttributeTestClusterNullableInt48u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt48u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt48u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77756,7 +73044,7 @@ class ReadTestClusterNullableInt56u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77785,7 +73073,7 @@ class WriteTestClusterNullableInt56u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77820,7 +73108,7 @@ class SubscribeAttributeTestClusterNullableInt56u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77828,23 +73116,20 @@ class SubscribeAttributeTestClusterNullableInt56u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt56u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt56u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77861,7 +73146,7 @@ class ReadTestClusterNullableInt64u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77890,7 +73175,7 @@ class WriteTestClusterNullableInt64u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -77925,7 +73210,7 @@ class SubscribeAttributeTestClusterNullableInt64u : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -77933,23 +73218,20 @@ class SubscribeAttributeTestClusterNullableInt64u : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt64u response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt64u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -77966,7 +73248,7 @@ class ReadTestClusterNullableInt8s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -77995,7 +73277,7 @@ class WriteTestClusterNullableInt8s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78030,7 +73312,7 @@ class SubscribeAttributeTestClusterNullableInt8s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78038,23 +73320,20 @@ class SubscribeAttributeTestClusterNullableInt8s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TestCluster.NullableInt8s response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt8s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78071,7 +73350,7 @@ class ReadTestClusterNullableInt16s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78100,7 +73379,7 @@ class WriteTestClusterNullableInt16s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78135,7 +73414,7 @@ class SubscribeAttributeTestClusterNullableInt16s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78143,23 +73422,20 @@ class SubscribeAttributeTestClusterNullableInt16s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt16s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt16s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78176,7 +73452,7 @@ class ReadTestClusterNullableInt24s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78205,7 +73481,7 @@ class WriteTestClusterNullableInt24s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78240,7 +73516,7 @@ class SubscribeAttributeTestClusterNullableInt24s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78248,23 +73524,20 @@ class SubscribeAttributeTestClusterNullableInt24s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt24s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt24s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78281,7 +73554,7 @@ class ReadTestClusterNullableInt32s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78310,7 +73583,7 @@ class WriteTestClusterNullableInt32s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78345,7 +73618,7 @@ class SubscribeAttributeTestClusterNullableInt32s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78353,23 +73626,20 @@ class SubscribeAttributeTestClusterNullableInt32s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt32s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt32s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78386,7 +73656,7 @@ class ReadTestClusterNullableInt40s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78415,7 +73685,7 @@ class WriteTestClusterNullableInt40s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78450,7 +73720,7 @@ class SubscribeAttributeTestClusterNullableInt40s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78458,23 +73728,20 @@ class SubscribeAttributeTestClusterNullableInt40s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt40s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt40s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78491,7 +73758,7 @@ class ReadTestClusterNullableInt48s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78520,7 +73787,7 @@ class WriteTestClusterNullableInt48s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78555,7 +73822,7 @@ class SubscribeAttributeTestClusterNullableInt48s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78563,23 +73830,20 @@ class SubscribeAttributeTestClusterNullableInt48s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt48s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt48s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78596,7 +73860,7 @@ class ReadTestClusterNullableInt56s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78625,7 +73889,7 @@ class WriteTestClusterNullableInt56s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78660,7 +73924,7 @@ class SubscribeAttributeTestClusterNullableInt56s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78668,23 +73932,20 @@ class SubscribeAttributeTestClusterNullableInt56s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt56s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt56s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78701,7 +73962,7 @@ class ReadTestClusterNullableInt64s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78730,7 +73991,7 @@ class WriteTestClusterNullableInt64s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78765,7 +74026,7 @@ class SubscribeAttributeTestClusterNullableInt64s : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78773,23 +74034,20 @@ class SubscribeAttributeTestClusterNullableInt64s : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableInt64s response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt64s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78806,7 +74064,7 @@ class ReadTestClusterNullableEnum8 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78835,7 +74093,7 @@ class WriteTestClusterNullableEnum8 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78870,7 +74128,7 @@ class SubscribeAttributeTestClusterNullableEnum8 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78878,23 +74136,20 @@ class SubscribeAttributeTestClusterNullableEnum8 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TestCluster.NullableEnum8 response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableEnum8 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -78911,7 +74166,7 @@ class ReadTestClusterNullableEnum16 : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -78940,7 +74195,7 @@ class WriteTestClusterNullableEnum16 : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -78975,7 +74230,7 @@ class SubscribeAttributeTestClusterNullableEnum16 : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -78983,23 +74238,20 @@ class SubscribeAttributeTestClusterNullableEnum16 : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableEnum16 response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableEnum16 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79016,7 +74268,7 @@ class ReadTestClusterNullableFloatSingle : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79045,7 +74297,7 @@ class WriteTestClusterNullableFloatSingle : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79080,32 +74332,28 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableFloatSingle response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeNullableFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableFloatSingle response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79122,7 +74370,7 @@ class ReadTestClusterNullableFloatDouble : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79151,7 +74399,7 @@ class WriteTestClusterNullableFloatDouble : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79186,32 +74434,28 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableFloatDouble response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeNullableFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableFloatDouble response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79228,7 +74472,7 @@ class ReadTestClusterNullableOctetString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79257,7 +74501,7 @@ class WriteTestClusterNullableOctetString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79292,32 +74536,28 @@ class SubscribeAttributeTestClusterNullableOctetString : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableOctetString response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeNullableOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableOctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79334,7 +74574,7 @@ class ReadTestClusterNullableCharString : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000401E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000401E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79363,7 +74603,7 @@ class WriteTestClusterNullableCharString : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000401E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000401E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79400,32 +74640,28 @@ class SubscribeAttributeTestClusterNullableCharString : public SubscribeAttribut
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000401E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000401E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TestCluster.NullableCharString response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+        [cluster subscribeAttributeNullableCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableCharString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79442,7 +74678,7 @@ class ReadTestClusterNullableEnumAttr : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79471,7 +74707,7 @@ class WriteTestClusterNullableEnumAttr : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79506,7 +74742,7 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public SubscribeAttribute
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -79514,23 +74750,20 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"TestCluster.NullableEnumAttr response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableEnumAttr response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79547,7 +74780,7 @@ class ReadTestClusterNullableStruct : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79578,7 +74811,7 @@ class WriteTestClusterNullableStruct : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79629,7 +74862,7 @@ class SubscribeAttributeTestClusterNullableStruct : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -79637,24 +74870,20 @@ class SubscribeAttributeTestClusterNullableStruct : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNullableStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                       NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.NullableStruct response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableStruct response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79671,7 +74900,7 @@ class ReadTestClusterNullableRangeRestrictedInt8u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004026) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79701,7 +74930,7 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79737,33 +74966,28 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public Subscri
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"TestCluster.NullableRangeRestrictedInt8u response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt8u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79780,7 +75004,7 @@ class ReadTestClusterNullableRangeRestrictedInt8s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004027) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79810,7 +75034,7 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79846,33 +75070,28 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public Subscri
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"TestCluster.NullableRangeRestrictedInt8s response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt8s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79889,7 +75108,7 @@ class ReadTestClusterNullableRangeRestrictedInt16u : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004028) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -79919,7 +75138,7 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -79955,34 +75174,28 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public Subscr
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"TestCluster.NullableRangeRestrictedInt16u response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt16u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -79999,7 +75212,7 @@ class ReadTestClusterNullableRangeRestrictedInt16s : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -80029,7 +75242,7 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public WriteAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
@@ -80065,34 +75278,28 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public Subscr
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"TestCluster.NullableRangeRestrictedInt16s response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt16s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80109,7 +75316,7 @@ class ReadTestClusterGeneratedCommandList : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -80135,32 +75342,28 @@ class SubscribeAttributeTestClusterGeneratedCommandList : public SubscribeAttrib
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80177,7 +75380,7 @@ class ReadTestClusterAcceptedCommandList : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -80203,32 +75406,28 @@ class SubscribeAttributeTestClusterAcceptedCommandList : public SubscribeAttribu
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"TestCluster.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80245,7 +75444,7 @@ class ReadTestClusterAttributeList : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -80271,7 +75470,7 @@ class SubscribeAttributeTestClusterAttributeList : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -80279,23 +75478,20 @@ class SubscribeAttributeTestClusterAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"TestCluster.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80312,7 +75508,7 @@ class ReadTestClusterFeatureMap : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -80338,7 +75534,7 @@ class SubscribeAttributeTestClusterFeatureMap : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -80346,23 +75542,20 @@ class SubscribeAttributeTestClusterFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TestCluster.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80379,7 +75572,7 @@ class ReadTestClusterClusterRevision : public ReadAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
@@ -80405,7 +75598,7 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
@@ -80413,23 +75606,20 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TestCluster.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -80440,7 +75630,6 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
 | * SetWeeklySchedule                                                 |   0x01 |
 | * GetWeeklySchedule                                                 |   0x02 |
 | * ClearWeeklySchedule                                               |   0x03 |
-| * GetRelayStatusLog                                                 |   0x04 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * LocalTemperature                                                  | 0x0000 |
@@ -80466,7 +75655,6 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
 | * RemoteSensing                                                     | 0x001A |
 | * ControlSequenceOfOperation                                        | 0x001B |
 | * SystemMode                                                        | 0x001C |
-| * AlarmMask                                                         | 0x001D |
 | * ThermostatRunningMode                                             | 0x001E |
 | * StartOfWeek                                                       | 0x0020 |
 | * NumberOfWeeklyTransitions                                         | 0x0021 |
@@ -80692,58 +75880,17 @@ class ThermostatClearWeeklySchedule : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster clearWeeklyScheduleWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-/*
- * Command GetRelayStatusLog
- */
-class ThermostatGetRelayStatusLog : public ClusterCommand {
-public:
-    ThermostatGetRelayStatusLog()
-        : ClusterCommand("get-relay-status-log")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000004) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPThermostatClusterGetRelayStatusLogParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getRelayStatusLogWithCompletionHandler:^(
-                CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable values, NSError * _Nullable error) {
-                NSLog(@"Values: %@", values);
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster clearWeeklyScheduleWithParams:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
         }
         return CHIP_NO_ERROR;
     }
@@ -80799,23 +75946,20 @@ class SubscribeAttributeThermostatLocalTemperature : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLocalTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Thermostat.LocalTemperature response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.LocalTemperature response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80866,23 +76010,20 @@ class SubscribeAttributeThermostatOutdoorTemperature : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOutdoorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"Thermostat.OutdoorTemperature response %@", [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OutdoorTemperature response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -80933,23 +76074,20 @@ class SubscribeAttributeThermostatOccupancy : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"Thermostat.Occupancy response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.Occupancy response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81001,24 +76139,20 @@ class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.AbsMinHeatSetpointLimit response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMinHeatSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81070,24 +76204,20 @@ class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.AbsMaxHeatSetpointLimit response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMaxHeatSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81139,24 +76269,20 @@ class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.AbsMinCoolSetpointLimit response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMinCoolSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81208,24 +76334,20 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.AbsMaxCoolSetpointLimit response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMaxCoolSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81276,23 +76398,20 @@ class SubscribeAttributeThermostatPICoolingDemand : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePICoolingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.PICoolingDemand response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.PICoolingDemand response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81343,23 +76462,20 @@ class SubscribeAttributeThermostatPIHeatingDemand : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePIHeatingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81448,26 +76564,21 @@ class SubscribeAttributeThermostatHVACSystemTypeConfiguration : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81556,26 +76667,21 @@ class SubscribeAttributeThermostatLocalTemperatureCalibration : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeLocalTemperatureCalibrationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"Thermostat.LocalTemperatureCalibration response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeLocalTemperatureCalibrationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.LocalTemperatureCalibration response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81665,24 +76771,20 @@ class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.OccupiedCoolingSetpoint response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedCoolingSetpoint response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81772,24 +76874,20 @@ class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.OccupiedHeatingSetpoint response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedHeatingSetpoint response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81878,26 +76976,21 @@ class SubscribeAttributeThermostatUnoccupiedCoolingSetpoint : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Thermostat.UnoccupiedCoolingSetpoint response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedCoolingSetpoint response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -81986,26 +77079,21 @@ class SubscribeAttributeThermostatUnoccupiedHeatingSetpoint : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Thermostat.UnoccupiedHeatingSetpoint response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedHeatingSetpoint response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82093,25 +77181,21 @@ class SubscribeAttributeThermostatMinHeatSetpointLimit : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.MinHeatSetpointLimit response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MinHeatSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82199,25 +77283,21 @@ class SubscribeAttributeThermostatMaxHeatSetpointLimit : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.MaxHeatSetpointLimit response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MaxHeatSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82305,25 +77385,21 @@ class SubscribeAttributeThermostatMinCoolSetpointLimit : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.MinCoolSetpointLimit response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MinCoolSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82411,25 +77487,21 @@ class SubscribeAttributeThermostatMaxCoolSetpointLimit : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.MaxCoolSetpointLimit response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MaxCoolSetpointLimit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82517,25 +77589,21 @@ class SubscribeAttributeThermostatMinSetpointDeadBand : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeMinSetpointDeadBandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"Thermostat.MinSetpointDeadBand response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeMinSetpointDeadBandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MinSetpointDeadBand response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82624,23 +77692,20 @@ class SubscribeAttributeThermostatRemoteSensing : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRemoteSensingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Thermostat.RemoteSensing response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.RemoteSensing response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82729,26 +77794,21 @@ class SubscribeAttributeThermostatControlSequenceOfOperation : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeControlSequenceOfOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"Thermostat.ControlSequenceOfOperation response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+        [cluster subscribeAttributeControlSequenceOfOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ControlSequenceOfOperation response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82837,90 +77897,20 @@ class SubscribeAttributeThermostatSystemMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSystemModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Thermostat.SystemMode response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
-};
-
-/*
- * Attribute AlarmMask
- */
-class ReadThermostatAlarmMask : public ReadAttribute {
-public:
-    ReadThermostatAlarmMask()
-        : ReadAttribute("alarm-mask")
-    {
-    }
-
-    ~ReadThermostatAlarmMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAlarmMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.AlarmMask response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Thermostat AlarmMask read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeThermostatAlarmMask : public SubscribeAttribute {
-public:
-    SubscribeAttributeThermostatAlarmMask()
-        : SubscribeAttribute("alarm-mask")
-    {
-    }
-
-    ~SubscribeAttributeThermostatAlarmMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAlarmMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"Thermostat.AlarmMask response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SystemMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -82971,24 +77961,20 @@ class SubscribeAttributeThermostatThermostatRunningMode : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeThermostatRunningModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"Thermostat.ThermostatRunningMode response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ThermostatRunningMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83039,23 +78025,20 @@ class SubscribeAttributeThermostatStartOfWeek : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStartOfWeekWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"Thermostat.StartOfWeek response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.StartOfWeek response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83106,26 +78089,21 @@ class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"Thermostat.NumberOfWeeklyTransitions response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.NumberOfWeeklyTransitions response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83176,26 +78154,21 @@ class SubscribeAttributeThermostatNumberOfDailyTransitions : public SubscribeAtt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfDailyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"Thermostat.NumberOfDailyTransitions response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeNumberOfDailyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.NumberOfDailyTransitions response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83285,24 +78258,20 @@ class SubscribeAttributeThermostatTemperatureSetpointHold : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTemperatureSetpointHoldWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"Thermostat.TemperatureSetpointHold response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.TemperatureSetpointHold response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83392,27 +78361,21 @@ class SubscribeAttributeThermostatTemperatureSetpointHoldDuration : public Subsc
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                      params:params
-                                                     subscriptionEstablished:nullptr
-                                                               reportHandler:^(
-                                                                   NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                   NSLog(@"Thermostat.TemperatureSetpointHoldDuration response %@",
-                                                                       [value description]);
-                                                                   if (error || !mWait) {
-                                                                       SetCommandExitStatus(error);
-                                                                   }
-                                                               }];
+        [cluster subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.TemperatureSetpointHoldDuration response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83504,26 +78467,20 @@ class SubscribeAttributeThermostatThermostatProgrammingOperationMode : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                              params:params
-                                                             subscriptionEstablished:nullptr
-                                                                       reportHandler:^(
-                                                                           NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                           NSLog(@"Thermostat.ThermostatProgrammingOperationMode "
-                                                                                 @"response %@",
-                                                                               [value description]);
-                                                                           if (error || !mWait) {
-                                                                               SetCommandExitStatus(error);
-                                                                           }
-                                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ThermostatProgrammingOperationMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83574,24 +78531,20 @@ class SubscribeAttributeThermostatThermostatRunningState : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeThermostatRunningStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"Thermostat.ThermostatRunningState response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ThermostatRunningState response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83641,25 +78594,21 @@ class SubscribeAttributeThermostatSetpointChangeSource : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSetpointChangeSourceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.SetpointChangeSource response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeSetpointChangeSourceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SetpointChangeSource response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83709,25 +78658,21 @@ class SubscribeAttributeThermostatSetpointChangeAmount : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeSetpointChangeAmountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.SetpointChangeAmount response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeSetpointChangeAmountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SetpointChangeAmount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83779,25 +78724,20 @@ class SubscribeAttributeThermostatSetpointChangeSourceTimestamp : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                         params:params
-                                                        subscriptionEstablished:nullptr
-                                                                  reportHandler:^(
-                                                                      NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                      NSLog(@"Thermostat.SetpointChangeSourceTimestamp response %@",
-                                                                          [value description]);
-                                                                      if (error || !mWait) {
-                                                                          SetCommandExitStatus(error);
-                                                                      }
-                                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SetpointChangeSourceTimestamp response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83886,23 +78826,20 @@ class SubscribeAttributeThermostatOccupiedSetback : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.OccupiedSetback response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedSetback response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -83953,23 +78890,20 @@ class SubscribeAttributeThermostatOccupiedSetbackMin : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84020,23 +78954,20 @@ class SubscribeAttributeThermostatOccupiedSetbackMax : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84125,23 +79056,20 @@ class SubscribeAttributeThermostatUnoccupiedSetback : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeUnoccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84191,25 +79119,21 @@ class SubscribeAttributeThermostatUnoccupiedSetbackMin : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUnoccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeUnoccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84259,25 +79183,21 @@ class SubscribeAttributeThermostatUnoccupiedSetbackMax : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84366,23 +79286,20 @@ class SubscribeAttributeThermostatEmergencyHeatDelta : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEmergencyHeatDeltaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84471,23 +79388,20 @@ class SubscribeAttributeThermostatACType : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                  params:params
-                                 subscriptionEstablished:nullptr
-                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                               NSLog(@"Thermostat.ACType response %@", [value description]);
-                                               if (error || !mWait) {
-                                                   SetCommandExitStatus(error);
-                                               }
-                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84576,23 +79490,20 @@ class SubscribeAttributeThermostatACCapacity : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Thermostat.ACCapacity response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACCapacity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84681,23 +79592,20 @@ class SubscribeAttributeThermostatACRefrigerantType : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACRefrigerantTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84786,23 +79694,20 @@ class SubscribeAttributeThermostatACCompressorType : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACCompressorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Thermostat.ACCompressorType response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACCompressorType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84891,23 +79796,20 @@ class SubscribeAttributeThermostatACErrorCode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACErrorCodeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"Thermostat.ACErrorCode response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACErrorCode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -84996,23 +79898,20 @@ class SubscribeAttributeThermostatACLouverPosition : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACLouverPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Thermostat.ACLouverPosition response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACLouverPosition response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85063,23 +79962,20 @@ class SubscribeAttributeThermostatACCoilTemperature : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACCoilTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85168,23 +80064,20 @@ class SubscribeAttributeThermostatACCapacityformat : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeACCapacityformatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"Thermostat.ACCapacityformat response %@", [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ACCapacityformat response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85234,25 +80127,21 @@ class SubscribeAttributeThermostatGeneratedCommandList : public SubscribeAttribu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85302,25 +80191,21 @@ class SubscribeAttributeThermostatAcceptedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"Thermostat.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85371,23 +80256,20 @@ class SubscribeAttributeThermostatAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"Thermostat.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85438,23 +80320,20 @@ class SubscribeAttributeThermostatFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"Thermostat.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85505,23 +80384,20 @@ class SubscribeAttributeThermostatClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"Thermostat.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -85633,25 +80509,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMo
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTemperatureDisplayModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ThermostatUserInterfaceConfiguration.TemperatureDisplayMode "
-                                                                     @"response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.TemperatureDisplayMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85743,24 +80614,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : publ
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeKeypadLockoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ThermostatUserInterfaceConfiguration.KeypadLockout response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.KeypadLockout response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85855,26 +80722,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingV
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                         params:params
-                                                        subscriptionEstablished:nullptr
-                                                                  reportHandler:^(
-                                                                      NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                      NSLog(@"ThermostatUserInterfaceConfiguration."
-                                                                            @"ScheduleProgrammingVisibility response %@",
-                                                                          [value description]);
-                                                                      if (error || !mWait) {
-                                                                          SetCommandExitStatus(error);
-                                                                      }
-                                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85927,25 +80788,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ThermostatUserInterfaceConfiguration.GeneratedCommandList "
-                                                                   @"response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -85997,27 +80853,21 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(
-                                                           @"ThermostatUserInterfaceConfiguration.AcceptedCommandList response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86070,24 +80920,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : publ
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"ThermostatUserInterfaceConfiguration.AttributeList response %@",
-                                                          [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86140,24 +80986,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ThermostatUserInterfaceConfiguration.FeatureMap response %@",
-                                                       [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86210,24 +81052,20 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThermostatUserInterfaceConfiguration.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -86335,16 +81173,17 @@ class ThreadNetworkDiagnosticsResetCounts : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster resetCountsWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
         }
         return CHIP_NO_ERROR;
     }
@@ -86404,23 +81243,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannel : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.Channel response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.Channel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86475,23 +81311,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRoutingRoleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.RoutingRole response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RoutingRole response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86546,23 +81379,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNetworkNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.NetworkName response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.NetworkName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86617,23 +81447,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsPanId : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"ThreadNetworkDiagnostics.PanId response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.PanId response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86687,25 +81514,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeExtendedPanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.ExtendedPanId response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeExtendedPanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ExtendedPanId response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86760,24 +81583,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMeshLocalPrefixWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.MeshLocalPrefix response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.MeshLocalPrefix response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86831,25 +81650,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.OverrunCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.OverrunCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86904,24 +81719,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNeighborTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ThreadNetworkDiagnostics.NeighborTableList response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.NeighborTableList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -86976,24 +81787,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRouteTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ThreadNetworkDiagnostics.RouteTableList response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RouteTableList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87048,23 +81855,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePartitionIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.PartitionId response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.PartitionId response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87119,23 +81923,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWeightingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"ThreadNetworkDiagnostics.Weighting response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.Weighting response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87190,23 +81991,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.DataVersion response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.DataVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87261,24 +82059,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeStableDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ThreadNetworkDiagnostics.StableDataVersion response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.StableDataVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87333,24 +82127,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLeaderRouterIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ThreadNetworkDiagnostics.LeaderRouterId response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.LeaderRouterId response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87405,24 +82195,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDetachedRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ThreadNetworkDiagnostics.DetachedRoleCount response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.DetachedRoleCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87477,24 +82263,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeChildRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ThreadNetworkDiagnostics.ChildRoleCount response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ChildRoleCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87549,24 +82331,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRouterRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.RouterRoleCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RouterRoleCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87621,24 +82399,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLeaderRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.LeaderRoleCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.LeaderRoleCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87693,24 +82467,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ThreadNetworkDiagnostics.AttachAttemptCount response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.AttachAttemptCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87765,24 +82535,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePartitionIdChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ThreadNetworkDiagnostics.PartitionIdChangeCount response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.PartitionIdChangeCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87838,26 +82604,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCoun
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                             params:params
-                                                            subscriptionEstablished:nullptr
-                                                                      reportHandler:^(
-                                                                          NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                          NSLog(@"ThreadNetworkDiagnostics."
-                                                                                @"BetterPartitionAttachAttemptCount response %@",
-                                                                              [value description]);
-                                                                          if (error || !mWait) {
-                                                                              SetCommandExitStatus(error);
-                                                                          }
-                                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.BetterPartitionAttachAttemptCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87912,24 +82672,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeParentChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ThreadNetworkDiagnostics.ParentChangeCount response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ParentChangeCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -87983,25 +82739,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.TxTotalCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeTxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxTotalCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88056,24 +82808,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ThreadNetworkDiagnostics.TxUnicastCount response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxUnicastCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88128,24 +82876,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ThreadNetworkDiagnostics.TxBroadcastCount response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxBroadcastCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88200,24 +82944,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ThreadNetworkDiagnostics.TxAckRequestedCount response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxAckRequestedCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88271,25 +83011,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxAckedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.TxAckedCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeTxAckedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxAckedCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88344,24 +83080,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxNoAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ThreadNetworkDiagnostics.TxNoAckRequestedCount response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxNoAckRequestedCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88416,23 +83148,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.TxDataCount response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxDataCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88487,24 +83216,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.TxDataPollCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxDataPollCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88558,25 +83283,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.TxBeaconCount response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeTxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxBeaconCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88631,24 +83352,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ThreadNetworkDiagnostics.TxBeaconRequestCount response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxBeaconRequestCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88702,25 +83419,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.TxOtherCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeTxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxOtherCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88774,25 +83487,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxRetryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.TxRetryCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeTxRetryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxRetryCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88847,27 +83556,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : pu
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ThreadNetworkDiagnostics.TxDirectMaxRetryExpiryCount "
-                                                                     @"response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+        [cluster subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxDirectMaxRetryExpiryCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88923,26 +83626,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount :
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                         params:params
-                                                        subscriptionEstablished:nullptr
-                                                                  reportHandler:^(
-                                                                      NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                      NSLog(@"ThreadNetworkDiagnostics."
-                                                                            @"TxIndirectMaxRetryExpiryCount response %@",
-                                                                          [value description]);
-                                                                      if (error || !mWait) {
-                                                                          SetCommandExitStatus(error);
-                                                                      }
-                                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxIndirectMaxRetryExpiryCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -88996,25 +83693,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeTxErrCcaCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.TxErrCcaCount response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeTxErrCcaCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxErrCcaCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89069,24 +83762,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxErrAbortCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.TxErrAbortCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxErrAbortCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89141,24 +83830,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTxErrBusyChannelCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                 params:params
-                                                subscriptionEstablished:nullptr
-                                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                              NSLog(@"ThreadNetworkDiagnostics.TxErrBusyChannelCount response %@",
-                                                                  [value description]);
-                                                              if (error || !mWait) {
-                                                                  SetCommandExitStatus(error);
-                                                              }
-                                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxErrBusyChannelCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89212,25 +83897,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.RxTotalCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeRxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxTotalCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89285,24 +83966,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ThreadNetworkDiagnostics.RxUnicastCount response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxUnicastCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89357,24 +84034,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ThreadNetworkDiagnostics.RxBroadcastCount response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxBroadcastCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89429,23 +84102,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.RxDataCount response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxDataCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89500,24 +84170,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.RxDataPollCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxDataPollCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89571,25 +84237,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.RxBeaconCount response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxBeaconCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89644,24 +84306,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ThreadNetworkDiagnostics.RxBeaconRequestCount response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxBeaconRequestCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89715,25 +84373,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                   params:params
-                                  subscriptionEstablished:nullptr
-                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                NSLog(@"ThreadNetworkDiagnostics.RxOtherCount response %@", [value description]);
-                                                if (error || !mWait) {
-                                                    SetCommandExitStatus(error);
-                                                }
-                                            }];
+        [cluster subscribeAttributeRxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxOtherCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89788,24 +84442,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxAddressFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"ThreadNetworkDiagnostics.RxAddressFilteredCount response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxAddressFilteredCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89860,26 +84510,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxDestAddrFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ThreadNetworkDiagnostics.RxDestAddrFilteredCount response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+        [cluster subscribeAttributeRxDestAddrFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxDestAddrFilteredCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -89934,24 +84579,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxDuplicatedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ThreadNetworkDiagnostics.RxDuplicatedCount response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxDuplicatedCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90006,24 +84647,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxErrNoFrameCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                        maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                             params:params
-                                            subscriptionEstablished:nullptr
-                                                      reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                          NSLog(@"ThreadNetworkDiagnostics.RxErrNoFrameCount response %@",
-                                                              [value description]);
-                                                          if (error || !mWait) {
-                                                              SetCommandExitStatus(error);
-                                                          }
-                                                      }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrNoFrameCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90078,27 +84715,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : publ
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(
-                                                                 @"ThreadNetworkDiagnostics.RxErrUnknownNeighborCount response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+        [cluster subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrUnknownNeighborCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90153,26 +84784,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : publi
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ThreadNetworkDiagnostics.RxErrInvalidSrcAddrCount response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrInvalidSrcAddrCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90226,25 +84852,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxErrSecCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.RxErrSecCount response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRxErrSecCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrSecCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90298,25 +84920,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeRxErrFcsCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.RxErrFcsCount response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeRxErrFcsCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrFcsCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90371,24 +84989,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRxErrOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.RxErrOtherCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrOtherCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90443,24 +85057,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.ActiveTimestamp response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ActiveTimestamp response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90515,24 +85125,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePendingTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                            params:params
-                                           subscriptionEstablished:nullptr
-                                                     reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                         NSLog(@"ThreadNetworkDiagnostics.PendingTimestamp response %@",
-                                                             [value description]);
-                                                         if (error || !mWait) {
-                                                             SetCommandExitStatus(error);
-                                                         }
-                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.PendingTimestamp response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90587,23 +85193,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsDelay : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"ThreadNetworkDiagnostics.Delay response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.Delay response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90626,7 +85229,8 @@ class ReadThreadNetworkDiagnosticsSecurityPolicy : public ReadAttribute {
         CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
                                                                                              endpoint:endpointId
                                                                                                 queue:callbackQueue];
-        [cluster readAttributeSecurityPolicyWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+        [cluster readAttributeSecurityPolicyWithCompletionHandler:^(
+            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
             NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]);
             if (error != nil) {
                 LogNSError("ThreadNetworkDiagnostics SecurityPolicy read Error", error);
@@ -90658,24 +85262,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public Subscrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSecurityPolicyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@",
-                                                           [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90730,23 +85330,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeChannelMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90769,14 +85366,14 @@ class ReadThreadNetworkDiagnosticsOperationalDatasetComponents : public ReadAttr
         CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
                                                                                              endpoint:endpointId
                                                                                                 queue:callbackQueue];
-        [cluster
-            readAttributeOperationalDatasetComponentsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ThreadNetworkDiagnostics OperationalDatasetComponents read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        [cluster readAttributeOperationalDatasetComponentsWithCompletionHandler:^(
+            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics OperationalDatasetComponents read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
@@ -90801,27 +85398,22 @@ class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : p
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeOperationalDatasetComponentsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents "
-                                                                      @"response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+        [cluster subscribeAttributeOperationalDatasetComponentsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(
+                CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90875,26 +85467,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeActiveNetworkFaultsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"ThreadNetworkDiagnostics.ActiveNetworkFaultsList response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+        [cluster subscribeAttributeActiveNetworkFaultsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ActiveNetworkFaultsList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -90949,24 +85536,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"ThreadNetworkDiagnostics.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91021,24 +85604,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public Sub
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"ThreadNetworkDiagnostics.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91092,25 +85671,21 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public Subscribe
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"ThreadNetworkDiagnostics.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91165,23 +85740,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"ThreadNetworkDiagnostics.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91236,24 +85808,20 @@ class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public Subscri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"ThreadNetworkDiagnostics.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -91366,23 +85934,20 @@ class SubscribeAttributeTimeFormatLocalizationHourFormat : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeHourFormatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TimeFormatLocalization.HourFormat response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.HourFormat response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91477,24 +86042,20 @@ class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public Subscr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeActiveCalendarTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                         maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                              params:params
-                                             subscriptionEstablished:nullptr
-                                                       reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                           NSLog(@"TimeFormatLocalization.ActiveCalendarType response %@",
-                                                               [value description]);
-                                                           if (error || !mWait) {
-                                                               SetCommandExitStatus(error);
-                                                           }
-                                                       }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.ActiveCalendarType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91549,24 +86110,20 @@ class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSupportedCalendarTypesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"TimeFormatLocalization.SupportedCalendarTypes response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.SupportedCalendarTypes response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91621,24 +86178,20 @@ class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"TimeFormatLocalization.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91693,24 +86246,20 @@ class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"TimeFormatLocalization.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91764,25 +86313,21 @@ class SubscribeAttributeTimeFormatLocalizationAttributeList : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"TimeFormatLocalization.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91837,23 +86382,20 @@ class SubscribeAttributeTimeFormatLocalizationFeatureMap : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"TimeFormatLocalization.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -91908,24 +86450,20 @@ class SubscribeAttributeTimeFormatLocalizationClusterRevision : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"TimeFormatLocalization.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -92036,23 +86574,20 @@ class SubscribeAttributeUnitLocalizationTemperatureUnit : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTemperatureUnitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"UnitLocalization.TemperatureUnit response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.TemperatureUnit response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92107,24 +86642,20 @@ class SubscribeAttributeUnitLocalizationGeneratedCommandList : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"UnitLocalization.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92179,24 +86710,20 @@ class SubscribeAttributeUnitLocalizationAcceptedCommandList : public SubscribeAt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"UnitLocalization.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92251,23 +86778,20 @@ class SubscribeAttributeUnitLocalizationAttributeList : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"UnitLocalization.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92322,23 +86846,20 @@ class SubscribeAttributeUnitLocalizationFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"UnitLocalization.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92393,23 +86914,20 @@ class SubscribeAttributeUnitLocalizationClusterRevision : public SubscribeAttrib
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"UnitLocalization.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -92531,23 +87049,20 @@ class SubscribeAttributeUserLabelLabelList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"UserLabel.LabelList response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.LabelList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92597,25 +87112,21 @@ class SubscribeAttributeUserLabelGeneratedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"UserLabel.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92665,25 +87176,21 @@ class SubscribeAttributeUserLabelAcceptedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"UserLabel.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92734,23 +87241,20 @@ class SubscribeAttributeUserLabelAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"UserLabel.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92801,23 +87305,20 @@ class SubscribeAttributeUserLabelFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"UserLabel.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -92868,23 +87369,20 @@ class SubscribeAttributeUserLabelClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"UserLabel.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -92951,23 +87449,20 @@ class SubscribeAttributeWakeOnLanMACAddress : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeMACAddressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"WakeOnLan.MACAddress response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.MACAddress response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93017,25 +87512,21 @@ class SubscribeAttributeWakeOnLanGeneratedCommandList : public SubscribeAttribut
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"WakeOnLan.GeneratedCommandList response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93085,25 +87576,21 @@ class SubscribeAttributeWakeOnLanAcceptedCommandList : public SubscribeAttribute
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"WakeOnLan.AcceptedCommandList response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93154,23 +87641,20 @@ class SubscribeAttributeWakeOnLanAttributeList : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"WakeOnLan.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93221,23 +87705,20 @@ class SubscribeAttributeWakeOnLanFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"WakeOnLan.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93288,23 +87769,20 @@ class SubscribeAttributeWakeOnLanClusterRevision : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"WakeOnLan.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -93364,16 +87842,17 @@ class WiFiNetworkDiagnosticsResetCounts : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster resetCountsWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
         }
         return CHIP_NO_ERROR;
     }
@@ -93433,23 +87912,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBssidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                 params:params
-                                subscriptionEstablished:nullptr
-                                          reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                                              NSLog(@"WiFiNetworkDiagnostics.Bssid response %@", [value description]);
-                                              if (error || !mWait) {
-                                                  SetCommandExitStatus(error);
-                                              }
-                                          }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.Bssid response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93504,23 +87980,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSecurityTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"WiFiNetworkDiagnostics.SecurityType response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.SecurityType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93575,23 +88048,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeWiFiVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                  maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                       params:params
-                                      subscriptionEstablished:nullptr
-                                                reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                    NSLog(@"WiFiNetworkDiagnostics.WiFiVersion response %@", [value description]);
-                                                    if (error || !mWait) {
-                                                        SetCommandExitStatus(error);
-                                                    }
-                                                }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.WiFiVersion response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93645,25 +88115,21 @@ class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeChannelNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"WiFiNetworkDiagnostics.ChannelNumber response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeChannelNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.ChannelNumber response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93718,23 +88184,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeRssiWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                params:params
-                               subscriptionEstablished:nullptr
-                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                             NSLog(@"WiFiNetworkDiagnostics.Rssi response %@", [value description]);
-                                             if (error || !mWait) {
-                                                 SetCommandExitStatus(error);
-                                             }
-                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.Rssi response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93789,24 +88252,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeBeaconLostCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"WiFiNetworkDiagnostics.BeaconLostCount response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.BeaconLostCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93860,25 +88319,21 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeBeaconRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"WiFiNetworkDiagnostics.BeaconRxCount response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeBeaconRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.BeaconRxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -93933,24 +88388,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePacketMulticastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"WiFiNetworkDiagnostics.PacketMulticastRxCount response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.PacketMulticastRxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94005,24 +88456,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public Su
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePacketMulticastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"WiFiNetworkDiagnostics.PacketMulticastTxCount response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.PacketMulticastTxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94077,24 +88524,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePacketUnicastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"WiFiNetworkDiagnostics.PacketUnicastRxCount response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.PacketUnicastRxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94149,24 +88592,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePacketUnicastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"WiFiNetworkDiagnostics.PacketUnicastTxCount response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.PacketUnicastTxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94220,25 +88659,21 @@ class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public SubscribeA
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentMaxRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                     params:params
-                                    subscriptionEstablished:nullptr
-                                              reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                  NSLog(@"WiFiNetworkDiagnostics.CurrentMaxRate response %@", [value description]);
-                                                  if (error || !mWait) {
-                                                      SetCommandExitStatus(error);
-                                                  }
-                                              }];
+        [cluster subscribeAttributeCurrentMaxRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.CurrentMaxRate response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94293,23 +88728,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"WiFiNetworkDiagnostics.OverrunCount response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.OverrunCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94364,24 +88796,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public Subs
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"WiFiNetworkDiagnostics.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94436,24 +88864,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public Subsc
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"WiFiNetworkDiagnostics.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94507,25 +88931,21 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public SubscribeAt
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                    params:params
-                                   subscriptionEstablished:nullptr
-                                             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                 NSLog(@"WiFiNetworkDiagnostics.AttributeList response %@", [value description]);
-                                                 if (error || !mWait) {
-                                                     SetCommandExitStatus(error);
-                                                 }
-                                             }];
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94580,23 +89000,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public SubscribeAttri
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"WiFiNetworkDiagnostics.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -94651,24 +89068,20 @@ class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"WiFiNetworkDiagnostics.ClusterRevision response %@",
-                                                            [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -94738,16 +89151,17 @@ class WindowCoveringUpOrOpen : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster upOrOpenWithParams:params
+                      completionHandler:^(NSError * _Nullable error) {
+                          responsesNeeded--;
+                          if (error != nil) {
+                              mError = error;
+                              LogNSError("Error", error);
+                          }
+                          if (responsesNeeded == 0) {
+                              SetCommandExitStatus(mError);
+                          }
+                      }];
         }
         return CHIP_NO_ERROR;
     }
@@ -94778,16 +89192,17 @@ class WindowCoveringDownOrClose : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster downOrCloseWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
         }
         return CHIP_NO_ERROR;
     }
@@ -94818,16 +89233,17 @@ class WindowCoveringStopMotion : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable error) {
-                responsesNeeded--;
-                if (error != nil) {
-                    mError = error;
-                    LogNSError("Error", error);
-                }
-                if (responsesNeeded == 0) {
-                    SetCommandExitStatus(mError);
-                }
-            }];
+            [cluster stopMotionWithParams:params
+                        completionHandler:^(NSError * _Nullable error) {
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
         }
         return CHIP_NO_ERROR;
     }
@@ -95059,23 +89475,20 @@ class SubscribeAttributeWindowCoveringType : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                params:params
-                               subscriptionEstablished:nullptr
-                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                             NSLog(@"WindowCovering.Type response %@", [value description]);
-                                             if (error || !mWait) {
-                                                 SetCommandExitStatus(error);
-                                             }
-                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.Type response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95127,24 +89540,20 @@ class SubscribeAttributeWindowCoveringPhysicalClosedLimitLift : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePhysicalClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"WindowCovering.PhysicalClosedLimitLift response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.PhysicalClosedLimitLift response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95196,24 +89605,20 @@ class SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt : public Subscribe
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributePhysicalClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                              maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                   params:params
-                                                  subscriptionEstablished:nullptr
-                                                            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                NSLog(@"WindowCovering.PhysicalClosedLimitTilt response %@",
-                                                                    [value description]);
-                                                                if (error || !mWait) {
-                                                                    SetCommandExitStatus(error);
-                                                                }
-                                                            }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.PhysicalClosedLimitTilt response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95264,24 +89669,20 @@ class SubscribeAttributeWindowCoveringCurrentPositionLift : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentPositionLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"WindowCovering.CurrentPositionLift response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionLift response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95332,24 +89733,20 @@ class SubscribeAttributeWindowCoveringCurrentPositionTilt : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentPositionTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"WindowCovering.CurrentPositionTilt response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionTilt response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95400,24 +89797,20 @@ class SubscribeAttributeWindowCoveringNumberOfActuationsLift : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNumberOfActuationsLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"WindowCovering.NumberOfActuationsLift response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.NumberOfActuationsLift response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95468,24 +89861,20 @@ class SubscribeAttributeWindowCoveringNumberOfActuationsTilt : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeNumberOfActuationsTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"WindowCovering.NumberOfActuationsTilt response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.NumberOfActuationsTilt response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95536,23 +89925,20 @@ class SubscribeAttributeWindowCoveringConfigStatus : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeConfigStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"WindowCovering.ConfigStatus response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.ConfigStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95603,27 +89989,21 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public Sub
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"WindowCovering.CurrentPositionLiftPercentage response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionLiftPercentage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95674,27 +90054,21 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public Sub
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                               maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                    params:params
-                                                   subscriptionEstablished:nullptr
-                                                             reportHandler:^(
-                                                                 NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                 NSLog(@"WindowCovering.CurrentPositionTiltPercentage response %@",
-                                                                     [value description]);
-                                                                 if (error || !mWait) {
-                                                                     SetCommandExitStatus(error);
-                                                                 }
-                                                             }];
+        [cluster subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionTiltPercentage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95744,25 +90118,21 @@ class SubscribeAttributeWindowCoveringOperationalStatus : public SubscribeAttrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"WindowCovering.OperationalStatus response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.OperationalStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95814,26 +90184,20 @@ class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"WindowCovering.TargetPositionLiftPercent100ths "
-                                                                              @"response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.TargetPositionLiftPercent100ths response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95885,26 +90249,20 @@ class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public S
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                           params:params
-                                                          subscriptionEstablished:nullptr
-                                                                    reportHandler:^(
-                                                                        NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                        NSLog(@"WindowCovering.TargetPositionTiltPercent100ths "
-                                                                              @"response %@",
-                                                                            [value description]);
-                                                                        if (error || !mWait) {
-                                                                            SetCommandExitStatus(error);
-                                                                        }
-                                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.TargetPositionTiltPercent100ths response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -95955,23 +90313,20 @@ class SubscribeAttributeWindowCoveringEndProductType : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeEndProductTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                     maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                          params:params
-                                         subscriptionEstablished:nullptr
-                                                   reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                       NSLog(@"WindowCovering.EndProductType response %@", [value description]);
-                                                       if (error || !mWait) {
-                                                           SetCommandExitStatus(error);
-                                                       }
-                                                   }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.EndProductType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96023,26 +90378,20 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                            params:params
-                                                           subscriptionEstablished:nullptr
-                                                                     reportHandler:^(
-                                                                         NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                         NSLog(@"WindowCovering.CurrentPositionLiftPercent100ths "
-                                                                               @"response %@",
-                                                                             [value description]);
-                                                                         if (error || !mWait) {
-                                                                             SetCommandExitStatus(error);
-                                                                         }
-                                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionLiftPercent100ths response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96094,26 +90443,20 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                                       maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                            params:params
-                                                           subscriptionEstablished:nullptr
-                                                                     reportHandler:^(
-                                                                         NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                         NSLog(@"WindowCovering.CurrentPositionTiltPercent100ths "
-                                                                               @"response %@",
-                                                                             [value description]);
-                                                                         if (error || !mWait) {
-                                                                             SetCommandExitStatus(error);
-                                                                         }
-                                                                     }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionTiltPercent100ths response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96164,24 +90507,20 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInstalledOpenLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"WindowCovering.InstalledOpenLimitLift response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.InstalledOpenLimitLift response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96232,26 +90571,21 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeInstalledClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"WindowCovering.InstalledClosedLimitLift response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeInstalledClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.InstalledClosedLimitLift response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96302,24 +90636,20 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public SubscribeA
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeInstalledOpenLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                  params:params
-                                                 subscriptionEstablished:nullptr
-                                                           reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                               NSLog(@"WindowCovering.InstalledOpenLimitTilt response %@",
-                                                                   [value description]);
-                                                               if (error || !mWait) {
-                                                                   SetCommandExitStatus(error);
-                                                               }
-                                                           }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.InstalledOpenLimitTilt response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96370,26 +90700,21 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public Subscrib
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeInstalledClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"WindowCovering.InstalledClosedLimitTilt response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+        [cluster subscribeAttributeInstalledClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.InstalledClosedLimitTilt response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96478,23 +90803,20 @@ class SubscribeAttributeWindowCoveringMode : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                params:params
-                               subscriptionEstablished:nullptr
-                                         reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                             NSLog(@"WindowCovering.Mode response %@", [value description]);
-                                             if (error || !mWait) {
-                                                 SetCommandExitStatus(error);
-                                             }
-                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.Mode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96545,23 +90867,20 @@ class SubscribeAttributeWindowCoveringSafetyStatus : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                   maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                        params:params
-                                       subscriptionEstablished:nullptr
-                                                 reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                     NSLog(@"WindowCovering.SafetyStatus response %@", [value description]);
-                                                     if (error || !mWait) {
-                                                         SetCommandExitStatus(error);
-                                                     }
-                                                 }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.SafetyStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96612,24 +90931,20 @@ class SubscribeAttributeWindowCoveringGeneratedCommandList : public SubscribeAtt
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                           maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                                params:params
-                                               subscriptionEstablished:nullptr
-                                                         reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                             NSLog(@"WindowCovering.GeneratedCommandList response %@",
-                                                                 [value description]);
-                                                             if (error || !mWait) {
-                                                                 SetCommandExitStatus(error);
-                                                             }
-                                                         }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96680,24 +90995,20 @@ class SubscribeAttributeWindowCoveringAcceptedCommandList : public SubscribeAttr
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                          maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                               params:params
-                                              subscriptionEstablished:nullptr
-                                                        reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            NSLog(@"WindowCovering.AcceptedCommandList response %@",
-                                                                [value description]);
-                                                            if (error || !mWait) {
-                                                                SetCommandExitStatus(error);
-                                                            }
-                                                        }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96748,23 +91059,20 @@ class SubscribeAttributeWindowCoveringAttributeList : public SubscribeAttribute
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                    maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                         params:params
-                                        subscriptionEstablished:nullptr
-                                                  reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                      NSLog(@"WindowCovering.AttributeList response %@", [value description]);
-                                                      if (error || !mWait) {
-                                                          SetCommandExitStatus(error);
-                                                      }
-                                                  }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96815,23 +91123,20 @@ class SubscribeAttributeWindowCoveringFeatureMap : public SubscribeAttribute {
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                 maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                      params:params
-                                     subscriptionEstablished:nullptr
-                                               reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                   NSLog(@"WindowCovering.FeatureMap response %@", [value description]);
-                                                   if (error || !mWait) {
-                                                       SetCommandExitStatus(error);
-                                                   }
-                                               }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*
@@ -96882,23 +91187,20 @@ class SubscribeAttributeWindowCoveringClusterRevision : public SubscribeAttribut
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
         [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-                                                      maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-                                                           params:params
-                                          subscriptionEstablished:nullptr
-                                                    reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                        NSLog(@"WindowCovering.ClusterRevision response %@", [value description]);
-                                                        if (error || !mWait) {
-                                                            SetCommandExitStatus(error);
-                                                        }
-                                                    }];
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10);
-    }
 };
 
 /*----------------------------------------------------------------------------*\
@@ -97730,13 +92032,6 @@ void registerClusterDoorLock(Commands & commands)
         make_unique<DoorLockLockDoor>(), //
         make_unique<DoorLockUnlockDoor>(), //
         make_unique<DoorLockUnlockWithTimeout>(), //
-        make_unique<DoorLockGetLogRecord>(), //
-        make_unique<DoorLockSetPINCode>(), //
-        make_unique<DoorLockGetPINCode>(), //
-        make_unique<DoorLockClearPINCode>(), //
-        make_unique<DoorLockClearAllPINCodes>(), //
-        make_unique<DoorLockSetUserStatus>(), //
-        make_unique<DoorLockGetUserStatus>(), //
         make_unique<DoorLockSetWeekDaySchedule>(), //
         make_unique<DoorLockGetWeekDaySchedule>(), //
         make_unique<DoorLockClearWeekDaySchedule>(), //
@@ -97746,20 +92041,12 @@ void registerClusterDoorLock(Commands & commands)
         make_unique<DoorLockSetHolidaySchedule>(), //
         make_unique<DoorLockGetHolidaySchedule>(), //
         make_unique<DoorLockClearHolidaySchedule>(), //
-        make_unique<DoorLockSetUserType>(), //
-        make_unique<DoorLockGetUserType>(), //
-        make_unique<DoorLockSetRFIDCode>(), //
-        make_unique<DoorLockGetRFIDCode>(), //
-        make_unique<DoorLockClearRFIDCode>(), //
-        make_unique<DoorLockClearAllRFIDCodes>(), //
         make_unique<DoorLockSetUser>(), //
         make_unique<DoorLockGetUser>(), //
         make_unique<DoorLockClearUser>(), //
         make_unique<DoorLockSetCredential>(), //
         make_unique<DoorLockGetCredentialStatus>(), //
         make_unique<DoorLockClearCredential>(), //
-        make_unique<DoorLockOperatingEventNotification>(), //
-        make_unique<DoorLockProgrammingEventNotification>(), //
         make_unique<ReadAttribute>(Id), //
         make_unique<ReadDoorLockLockState>(), //
         make_unique<WriteAttribute>(Id), //
@@ -97780,8 +92067,6 @@ void registerClusterDoorLock(Commands & commands)
         make_unique<ReadDoorLockOpenPeriod>(), //
         make_unique<WriteDoorLockOpenPeriod>(), //
         make_unique<SubscribeAttributeDoorLockOpenPeriod>(), //
-        make_unique<ReadDoorLockNumberOfLogRecordsSupported>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfLogRecordsSupported>(), //
         make_unique<ReadDoorLockNumberOfTotalUsersSupported>(), //
         make_unique<SubscribeAttributeDoorLockNumberOfTotalUsersSupported>(), //
         make_unique<ReadDoorLockNumberOfPINUsersSupported>(), //
@@ -97806,9 +92091,6 @@ void registerClusterDoorLock(Commands & commands)
         make_unique<SubscribeAttributeDoorLockCredentialRulesSupport>(), //
         make_unique<ReadDoorLockNumberOfCredentialsSupportedPerUser>(), //
         make_unique<SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser>(), //
-        make_unique<ReadDoorLockEnableLogging>(), //
-        make_unique<WriteDoorLockEnableLogging>(), //
-        make_unique<SubscribeAttributeDoorLockEnableLogging>(), //
         make_unique<ReadDoorLockLanguage>(), //
         make_unique<WriteDoorLockLanguage>(), //
         make_unique<SubscribeAttributeDoorLockLanguage>(), //
@@ -97858,30 +92140,6 @@ void registerClusterDoorLock(Commands & commands)
         make_unique<ReadDoorLockExpiringUserTimeout>(), //
         make_unique<WriteDoorLockExpiringUserTimeout>(), //
         make_unique<SubscribeAttributeDoorLockExpiringUserTimeout>(), //
-        make_unique<ReadDoorLockAlarmMask>(), //
-        make_unique<WriteDoorLockAlarmMask>(), //
-        make_unique<SubscribeAttributeDoorLockAlarmMask>(), //
-        make_unique<ReadDoorLockKeypadOperationEventMask>(), //
-        make_unique<WriteDoorLockKeypadOperationEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockKeypadOperationEventMask>(), //
-        make_unique<ReadDoorLockRemoteOperationEventMask>(), //
-        make_unique<WriteDoorLockRemoteOperationEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockRemoteOperationEventMask>(), //
-        make_unique<ReadDoorLockManualOperationEventMask>(), //
-        make_unique<WriteDoorLockManualOperationEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockManualOperationEventMask>(), //
-        make_unique<ReadDoorLockRFIDOperationEventMask>(), //
-        make_unique<WriteDoorLockRFIDOperationEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockRFIDOperationEventMask>(), //
-        make_unique<ReadDoorLockKeypadProgrammingEventMask>(), //
-        make_unique<WriteDoorLockKeypadProgrammingEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockKeypadProgrammingEventMask>(), //
-        make_unique<ReadDoorLockRemoteProgrammingEventMask>(), //
-        make_unique<WriteDoorLockRemoteProgrammingEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockRemoteProgrammingEventMask>(), //
-        make_unique<ReadDoorLockRFIDProgrammingEventMask>(), //
-        make_unique<WriteDoorLockRFIDProgrammingEventMask>(), //
-        make_unique<SubscribeAttributeDoorLockRFIDProgrammingEventMask>(), //
         make_unique<ReadDoorLockGeneratedCommandList>(), //
         make_unique<SubscribeAttributeDoorLockGeneratedCommandList>(), //
         make_unique<ReadDoorLockAcceptedCommandList>(), //
@@ -98391,6 +92649,7 @@ void registerClusterGeneralDiagnostics(Commands & commands)
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<GeneralDiagnosticsTestEventTrigger>(), //
         make_unique<ReadAttribute>(Id), //
         make_unique<ReadGeneralDiagnosticsNetworkInterfaces>(), //
         make_unique<WriteAttribute>(Id), //
@@ -98410,6 +92669,8 @@ void registerClusterGeneralDiagnostics(Commands & commands)
         make_unique<SubscribeAttributeGeneralDiagnosticsActiveRadioFaults>(), //
         make_unique<ReadGeneralDiagnosticsActiveNetworkFaults>(), //
         make_unique<SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults>(), //
+        make_unique<ReadGeneralDiagnosticsTestEventTriggersEnabled>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled>(), //
         make_unique<ReadGeneralDiagnosticsGeneratedCommandList>(), //
         make_unique<SubscribeAttributeGeneralDiagnosticsGeneratedCommandList>(), //
         make_unique<ReadGeneralDiagnosticsAcceptedCommandList>(), //
@@ -98604,6 +92865,7 @@ void registerClusterLevelControl(Commands & commands)
         make_unique<LevelControlMoveWithOnOff>(), //
         make_unique<LevelControlStepWithOnOff>(), //
         make_unique<LevelControlStopWithOnOff>(), //
+        make_unique<LevelControlMoveToClosestFrequency>(), //
         make_unique<ReadAttribute>(Id), //
         make_unique<ReadLevelControlCurrentLevel>(), //
         make_unique<WriteAttribute>(Id), //
@@ -99094,7 +93356,6 @@ void registerClusterOperationalCredentials(Commands & commands)
         make_unique<OperationalCredentialsUpdateFabricLabel>(), //
         make_unique<OperationalCredentialsRemoveFabric>(), //
         make_unique<OperationalCredentialsAddTrustedRootCertificate>(), //
-        make_unique<OperationalCredentialsRemoveTrustedRootCertificate>(), //
         make_unique<ReadAttribute>(Id), //
         make_unique<ReadOperationalCredentialsNOCs>(), //
         make_unique<WriteAttribute>(Id), //
@@ -99866,7 +94127,6 @@ void registerClusterThermostat(Commands & commands)
         make_unique<ThermostatSetWeeklySchedule>(), //
         make_unique<ThermostatGetWeeklySchedule>(), //
         make_unique<ThermostatClearWeeklySchedule>(), //
-        make_unique<ThermostatGetRelayStatusLog>(), //
         make_unique<ReadAttribute>(Id), //
         make_unique<ReadThermostatLocalTemperature>(), //
         make_unique<WriteAttribute>(Id), //
@@ -99930,8 +94190,6 @@ void registerClusterThermostat(Commands & commands)
         make_unique<ReadThermostatSystemMode>(), //
         make_unique<WriteThermostatSystemMode>(), //
         make_unique<SubscribeAttributeThermostatSystemMode>(), //
-        make_unique<ReadThermostatAlarmMask>(), //
-        make_unique<SubscribeAttributeThermostatAlarmMask>(), //
         make_unique<ReadThermostatThermostatRunningMode>(), //
         make_unique<SubscribeAttributeThermostatThermostatRunningMode>(), //
         make_unique<ReadThermostatStartOfWeek>(), //
diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
similarity index 90%
rename from zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h
rename to zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index c51367252f4f47..40014b616daf36 100644
--- a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -63,17 +63,14 @@ class TestList : public Command {
         printf("Test_TC_CC_9_1\n");
         printf("Test_TC_CC_9_2\n");
         printf("Test_TC_CC_9_3\n");
-        printf("Test_TC_DM_1_1\n");
-        printf("Test_TC_DM_3_1\n");
-        printf("Test_TC_DM_2_2\n");
+        printf("Test_TC_DM_2_1\n");
         printf("Test_TC_EMR_1_1\n");
-        printf("Test_TC_ETHDIAG_1_1\n");
-        printf("Test_TC_ETHDIAG_2_1\n");
+        printf("Test_TC_DGETH_2_1\n");
+        printf("Test_TC_DGETH_2_2\n");
         printf("Test_TC_FLW_1_1\n");
         printf("Test_TC_FLW_2_1\n");
-        printf("Test_TC_FLW_2_2\n");
-        printf("Test_TC_GC_1_1\n");
-        printf("Test_TC_GC_2_1\n");
+        printf("Test_TC_CGEN_1_1\n");
+        printf("Test_TC_CGEN_2_1\n");
         printf("Test_TC_I_1_1\n");
         printf("Test_TC_I_2_1\n");
         printf("Test_TC_I_2_3\n");
@@ -99,7 +96,6 @@ class TestList : public Command {
         printf("Test_TC_MC_1_11\n");
         printf("Test_TC_MC_1_12\n");
         printf("Test_TC_MC_2_1\n");
-        printf("Test_TC_MC_3_1\n");
         printf("Test_TC_MC_3_2\n");
         printf("Test_TC_MC_3_3\n");
         printf("Test_TC_MC_3_4\n");
@@ -125,6 +121,8 @@ class TestList : public Command {
         printf("Test_TC_MF_1_4\n");
         printf("Test_TC_MF_1_5\n");
         printf("Test_TC_MF_1_6\n");
+        printf("Test_TC_MF_1_9\n");
+        printf("Test_TC_MF_1_10\n");
         printf("Test_TC_MF_1_15\n");
         printf("OTA_SuccessfulTransfer\n");
         printf("Test_TC_OCC_1_1\n");
@@ -146,26 +144,19 @@ class TestList : public Command {
         printf("Test_TC_PSCFG_1_1\n");
         printf("Test_TC_RH_1_1\n");
         printf("Test_TC_RH_2_1\n");
-        printf("Test_TC_RH_2_2\n");
         printf("Test_TC_SWTCH_2_1\n");
-        printf("Test_TC_SWTCH_2_2\n");
         printf("Test_TC_TM_1_1\n");
         printf("Test_TC_TM_2_1\n");
-        printf("Test_TC_TM_2_2\n");
         printf("Test_TC_TSTAT_1_1\n");
         printf("Test_TC_TSTAT_2_1\n");
         printf("Test_TC_TSTAT_2_2\n");
         printf("Test_TC_TSUIC_1_1\n");
         printf("Test_TC_TSUIC_2_1\n");
         printf("Test_TC_TSUIC_2_2\n");
-        printf("Test_TC_DIAG_TH_NW_1_1\n");
-        printf("Test_TC_DIAG_TH_NW_1_2\n");
-        printf("Test_TC_DIAG_TH_NW_2_2\n");
-        printf("Test_TC_DIAG_TH_NW_2_3\n");
         printf("Test_TC_ULABEL_1_1\n");
         printf("Test_TC_ULABEL_2_2\n");
-        printf("Test_TC_WIFIDIAG_1_1\n");
-        printf("Test_TC_WIFIDIAG_3_1\n");
+        printf("Test_TC_DGWIFI_2_1\n");
+        printf("Test_TC_DGWIFI_2_3\n");
         printf("Test_TC_WNCV_1_1\n");
         printf("Test_TC_WNCV_2_1\n");
         printf("Test_TC_WNCV_2_2\n");
@@ -223,8 +214,9 @@ class TestList : public Command {
         printf("Test_TC_DL_2_2\n");
         printf("Test_TC_DL_2_3\n");
         printf("Test_TC_DL_2_4\n");
-        printf("Test_TC_DL_2_8\n");
-        printf("Test_TC_DL_2_11\n");
+        printf("Test_TC_DL_2_5\n");
+        printf("Test_TC_DL_2_7\n");
+        printf("Test_TC_DL_2_9\n");
         printf("TestGroupsCluster\n");
         printf("TestGroupKeyManagementCluster\n");
 
@@ -1971,18 +1963,16 @@ class TestAccessControlCluster : public TestCommandBridge {
         CHIPTestAccessControl * cluster = [[CHIPTestAccessControl alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate resource minima (SubjectsPerAccessControlEntry) Error: %@", err);
+        [cluster
+            readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Validate resource minima (SubjectsPerAccessControlEntry) Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("subjectsPerAccessControlEntry", [value unsignedShortValue], 4U));
-            }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
@@ -1993,18 +1983,16 @@ class TestAccessControlCluster : public TestCommandBridge {
         CHIPTestAccessControl * cluster = [[CHIPTestAccessControl alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetsPerAccessControlEntryWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate resource minima (TargetsPerAccessControlEntry) Error: %@", err);
+        [cluster
+            readAttributeTargetsPerAccessControlEntryWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Validate resource minima (TargetsPerAccessControlEntry) Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("targetsPerAccessControlEntry", [value unsignedShortValue], 3U));
-            }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
@@ -2015,18 +2003,16 @@ class TestAccessControlCluster : public TestCommandBridge {
         CHIPTestAccessControl * cluster = [[CHIPTestAccessControl alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAccessControlEntriesPerFabricWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate resource minima (AccessControlEntriesPerFabric) Error: %@", err);
+        [cluster
+            readAttributeAccessControlEntriesPerFabricWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Validate resource minima (AccessControlEntriesPerFabric) Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("accessControlEntriesPerFabric", [value unsignedShortValue], 3U));
-            }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
@@ -2638,12 +2624,8 @@ class Test_TC_BI_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("statusFlags", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("statusFlags", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("statusFlags", [value unsignedCharValue], 15));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("statusFlags", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("statusFlags", [value unsignedCharValue], 15));
 
             NextTest();
         }];
@@ -3386,10 +3368,6 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge {
             ChipLogProgress(chipTool, " ***** Test Step 1 : Read mandatory non-global attribute: StateValue\n");
             err = TestReadMandatoryNonGlobalAttributeStateValue_1();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read mandatory non-global attribute constraints: StateValue\n");
-            err = TestReadMandatoryNonGlobalAttributeConstraintsStateValue_2();
-            break;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -3407,9 +3385,6 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge {
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -3423,7 +3398,7 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
+    const uint16_t mTestCount = 2;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -3453,23 +3428,6 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("StateValue", actualValue, 0));
             }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadMandatoryNonGlobalAttributeConstraintsStateValue_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestBooleanState * cluster = [[CHIPTestBooleanState alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeStateValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read mandatory non-global attribute constraints: StateValue Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
             VerifyOrReturn(CheckConstraintType("stateValue", "", "bool"));
             NextTest();
         }];
@@ -4602,12 +4560,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -4649,12 +4603,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -4696,12 +4646,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -4743,12 +4689,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorMode", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("colorMode", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("colorMode", [value unsignedCharValue], 2));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("colorMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("colorMode", [value unsignedCharValue], 2));
 
             NextTest();
         }];
@@ -4976,12 +4918,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorCapabilities", "", "map16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorCapabilities", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorCapabilities", [value unsignedShortValue], 31U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorCapabilities", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorCapabilities", [value unsignedShortValue], 31U));
 
             NextTest();
         }];
@@ -5018,22 +4956,18 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         CHIPTestColorControl * cluster = [[CHIPTestColorControl alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ColorTempPhysicalMinMireds Error: %@", err);
+        [cluster
+            readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Validate constraints of attribute: ColorTempPhysicalMinMireds Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "", "uint16"));
-            if (value != nil) {
+                VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "", "uint16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTempPhysicalMinMireds", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTempPhysicalMinMireds", [value unsignedShortValue], 65279U));
-            }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
@@ -5067,22 +5001,18 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
         CHIPTestColorControl * cluster = [[CHIPTestColorControl alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ColorTempPhysicalMaxMireds Error: %@", err);
+        [cluster
+            readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Validate constraints of attribute: ColorTempPhysicalMaxMireds Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "", "uint16"));
-            if (value != nil) {
+                VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "", "uint16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTempPhysicalMaxMireds", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTempPhysicalMaxMireds", [value unsignedShortValue], 65279U));
-            }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
@@ -5105,14 +5035,9 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("coupleColorTempToLevelMinMireds", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(
-                    CheckConstraintMinValue<uint16_t>("coupleColorTempToLevelMinMireds", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(
-                    CheckConstraintMaxValue<uint16_t>("coupleColorTempToLevelMinMireds", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("coupleColorTempToLevelMinMireds", [value unsignedShortValue], 0U));
+            VerifyOrReturn(
+                CheckConstraintMaxValue<uint16_t>("coupleColorTempToLevelMinMireds", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5138,13 +5063,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("startUpColorTemperatureMireds", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("startUpColorTemperatureMireds", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(
-                    CheckConstraintMaxValue<uint16_t>("startUpColorTemperatureMireds", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("startUpColorTemperatureMireds", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("startUpColorTemperatureMireds", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5197,12 +5117,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("driftCompensation", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("driftCompensation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("driftCompensation", [value unsignedCharValue], 4));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("driftCompensation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("driftCompensation", [value unsignedCharValue], 4));
 
             NextTest();
         }];
@@ -5245,11 +5161,10 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("numberOfPrimaries", "", "uint8"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("numberOfPrimaries", "", "uint8"));
                 VerifyOrReturn(CheckConstraintMinValue<uint8_t>("numberOfPrimaries", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("numberOfPrimaries", [value unsignedCharValue], 6));
             }
 
@@ -5271,12 +5186,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary1X", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary1X", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary1X", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary1X", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary1X", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5296,12 +5207,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary1Y", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary1Y", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary1Y", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary1Y", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary1Y", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5320,7 +5227,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("primary1Intensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("primary1Intensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5339,12 +5250,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary2X", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary2X", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary2X", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary2X", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary2X", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5364,12 +5271,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary2Y", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary2Y", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary2Y", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary2Y", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary2Y", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5388,7 +5291,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("primary2Intensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("primary2Intensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5407,12 +5314,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary3X", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary3X", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary3X", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary3X", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary3X", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5432,12 +5335,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary3Y", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary3Y", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary3Y", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary3Y", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary3Y", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5456,7 +5355,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("primary3Intensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("primary3Intensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5475,12 +5378,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary4X", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary4X", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary4X", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary4X", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary4X", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5500,12 +5399,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary4Y", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary4Y", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary4Y", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary4Y", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary4Y", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5524,7 +5419,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("primary4Intensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("primary4Intensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5543,12 +5442,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary5X", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary5X", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary5X", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary5X", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary5X", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5568,12 +5463,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary5Y", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary5Y", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary5Y", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary5Y", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary5Y", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5592,7 +5483,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("primary5Intensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("primary5Intensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5611,12 +5506,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary6X", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary6X", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary6X", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary6X", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary6X", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5636,12 +5527,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("primary6Y", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary6Y", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary6Y", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("primary6Y", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("primary6Y", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5660,7 +5547,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("primary6Intensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("primary6Intensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5684,12 +5575,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("whitePointX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("whitePointX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("whitePointX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("whitePointX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("whitePointX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5714,12 +5601,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("whitePointY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("whitePointY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("whitePointY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("whitePointY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("whitePointY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5744,12 +5627,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorPointRX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointRX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointRX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointRX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointRX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5774,12 +5653,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorPointRY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointRY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointRY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointRY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointRY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5803,7 +5678,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("colorPointRIntensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("colorPointRIntensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5827,12 +5706,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorPointGX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointGX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointGX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointGX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointGX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5857,12 +5732,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorPointGY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointGY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointGY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointGY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointGY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5886,7 +5757,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("colorPointGIntensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("colorPointGIntensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -5910,12 +5785,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorPointBX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointBX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointBX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointBX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointBX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5940,12 +5811,8 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorPointBY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointBY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointBY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorPointBY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorPointBY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -5969,7 +5836,11 @@ class Test_TC_CC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("colorPointBIntensity", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("colorPointBIntensity", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -6354,12 +6225,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6410,12 +6277,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6442,12 +6305,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6474,12 +6333,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6530,12 +6385,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6562,12 +6413,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6594,12 +6441,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6650,12 +6493,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6682,12 +6521,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6714,12 +6549,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6770,12 +6601,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6802,12 +6629,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -6834,12 +6657,8 @@ class Test_TC_CC_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7264,12 +7083,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7319,12 +7134,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7351,12 +7162,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7383,12 +7190,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7438,12 +7241,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7470,12 +7269,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7502,12 +7297,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7557,12 +7348,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7589,12 +7376,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7621,12 +7404,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7676,12 +7455,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7708,12 +7483,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -7740,12 +7511,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8004,12 +7771,8 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8060,12 +7823,8 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8116,12 +7875,8 @@ class Test_TC_CC_3_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8390,12 +8145,8 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8445,12 +8196,8 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8477,12 +8224,8 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -8509,12 +8252,8 @@ class Test_TC_CC_4_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9044,12 +8783,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9099,12 +8834,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9131,12 +8862,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9163,12 +8890,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9218,12 +8941,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9250,12 +8969,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9282,12 +8997,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9337,12 +9048,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9369,12 +9076,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9401,12 +9104,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9456,12 +9155,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9488,12 +9183,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9520,12 +9211,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9575,12 +9262,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9607,12 +9290,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9639,12 +9318,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9694,12 +9369,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9726,12 +9397,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -9758,12 +9425,8 @@ class Test_TC_CC_4_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10022,12 +9685,8 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10078,12 +9737,8 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10134,12 +9789,8 @@ class Test_TC_CC_4_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10393,12 +10044,8 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10418,12 +10065,8 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10474,12 +10117,8 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10499,12 +10138,8 @@ class Test_TC_CC_4_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -10758,12 +10393,8 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -10783,12 +10414,8 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -10839,12 +10466,8 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -10864,12 +10487,8 @@ class Test_TC_CC_5_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11146,12 +10765,8 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11171,12 +10786,8 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11226,12 +10837,8 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11251,12 +10858,8 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11297,12 +10900,8 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11322,12 +10921,8 @@ class Test_TC_CC_5_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11581,12 +11176,8 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11606,12 +11197,8 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11662,12 +11249,8 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11687,12 +11270,8 @@ class Test_TC_CC_5_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11930,12 +11509,8 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -11985,12 +11560,8 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12417,12 +11988,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12474,12 +12041,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12506,12 +12069,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12538,12 +12097,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12595,12 +12150,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12627,12 +12178,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12659,12 +12206,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12741,12 +12284,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12773,12 +12312,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12805,12 +12340,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12887,12 +12418,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12919,12 +12446,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -12951,12 +12474,8 @@ class Test_TC_CC_6_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13271,12 +12790,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13329,12 +12844,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13361,12 +12872,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13393,12 +12900,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13451,12 +12954,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13483,12 +12982,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13515,12 +13010,8 @@ class Test_TC_CC_6_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -13977,12 +13468,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14033,12 +13520,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14065,12 +13548,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14097,12 +13576,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14153,12 +13628,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14185,12 +13656,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14217,12 +13684,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14273,12 +13736,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14305,12 +13764,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14337,12 +13792,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14393,12 +13844,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14425,12 +13872,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14457,12 +13900,8 @@ class Test_TC_CC_7_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14813,12 +14252,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14868,12 +14303,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14900,12 +14331,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14932,12 +14359,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -14980,12 +14403,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15035,12 +14454,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15067,12 +14482,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15099,12 +14510,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15147,12 +14554,8 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15411,12 +14814,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15467,12 +14866,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15523,12 +14918,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15767,12 +15158,8 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -15823,12 +15210,8 @@ class Test_TC_CC_7_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -16299,12 +15682,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -16345,12 +15724,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -16377,12 +15752,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentHue", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentHue", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -16425,12 +15796,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -16471,12 +15838,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -16503,12 +15866,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentSaturation", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentSaturation", [value unsignedCharValue], 254));
 
             NextTest();
         }];
@@ -16551,12 +15910,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16576,12 +15931,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16622,12 +15973,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16647,12 +15994,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16679,12 +16022,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentX", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentX", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentX", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16704,12 +16043,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentY", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentY", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentY", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16754,12 +16089,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16800,12 +16131,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16832,12 +16159,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("colorTemperature", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("colorTemperature", [value unsignedShortValue], 65279U));
 
             NextTest();
         }];
@@ -16880,12 +16203,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -16926,12 +16245,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -16958,12 +16273,8 @@ class Test_TC_CC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 65535U));
 
             NextTest();
         }];
@@ -20290,11 +19601,11 @@ class Test_TC_CC_9_3 : public TestCommandBridge {
     }
 };
 
-class Test_TC_DM_1_1 : public TestCommandBridge {
+class Test_TC_DM_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DM_1_1()
-        : TestCommandBridge("Test_TC_DM_1_1")
+    Test_TC_DM_2_1()
+        : TestCommandBridge("Test_TC_DM_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -20304,7 +19615,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DM_1_1() {}
+    ~Test_TC_DM_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -20312,11 +19623,11 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DM_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DM_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DM_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DM_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -20369,52 +19680,61 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
             err = TestQueryHardwareVersionString_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Query SoftwareVersion\n");
-            err = TestQuerySoftwareVersion_10();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 10 : TH reads SoftwareVersionString from the DUT and Verify it is of type string and verify the "
+                "format\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestThReadsSoftwareVersionStringFromTheDutAndVerifyItIsOfTypeStringAndVerifyTheFormat_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Query SoftwareVersionString\n");
-            err = TestQuerySoftwareVersionString_11();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 11 : TH reads ManufacturingDate from the DUT and Verify it is of type string and verify the "
+                "format\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestThReadsManufacturingDateFromTheDutAndVerifyItIsOfTypeStringAndVerifyTheFormat_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Query ManufacturingDate\n");
-            if (ShouldSkip("MANF_DATE")) {
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Query PartNumber\n");
+            if (ShouldSkip("PART_NUM")) {
                 NextTest();
                 return;
             }
-            err = TestQueryManufacturingDate_12();
+            err = TestQueryPartNumber_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Query PartNumber\n");
-            if (ShouldSkip("PART_NUM")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 13 : TH reads ProductURL from the DUT and Verify it is of type string and verify the format\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestQueryPartNumber_13();
+            err = TestThReadsProductURLFromTheDutAndVerifyItIsOfTypeStringAndVerifyTheFormat_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Query ProductURL\n");
-            err = TestQueryProductURL_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Query ProductLabel\n");
+            err = TestQueryProductLabel_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Query ProductLabel\n");
-            err = TestQueryProductLabel_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Query SerialNumber\n");
+            err = TestQuerySerialNumber_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Query SerialNumber\n");
-            err = TestQuerySerialNumber_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Query LocalConfigDisabled\n");
+            err = TestQueryLocalConfigDisabled_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Query LocalConfigDisabled\n");
-            err = TestQueryLocalConfigDisabled_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Query Reachable\n");
+            err = TestQueryReachable_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Query Reachable\n");
-            err = TestQueryReachable_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Query UniqueID\n");
-            err = TestQueryUniqueID_19();
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Query UniqueID\n");
+            err = TestQueryUniqueID_18();
             break;
         }
 
@@ -20484,9 +19804,6 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -20500,7 +19817,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 20;
+    const uint16_t mTestCount = 19;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -20637,8 +19954,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("location", "", "string"));
-            VerifyOrReturn(CheckConstraintFormat("location", "", "ISO 3166-1 alpha-2"));
-            VerifyOrReturn(CheckConstraintMaxLength("location", [value length], 2));
+            VerifyOrReturn(CheckConstraintMaxLength("location", [value length], 16));
             NextTest();
         }];
 
@@ -20683,72 +19999,25 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQuerySoftwareVersion_10()
+    CHIP_ERROR TestThReadsSoftwareVersionStringFromTheDutAndVerifyItIsOfTypeStringAndVerifyTheFormat_10()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSoftwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query SoftwareVersion Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("softwareVersion", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestQuerySoftwareVersionString_11()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSoftwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query SoftwareVersionString Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("softwareVersionString", "", "string"));
-            VerifyOrReturn(CheckConstraintFormat("softwareVersionString", "", "ASCII"));
-            VerifyOrReturn(CheckConstraintMinLength("softwareVersionString", [value length], 1));
-            VerifyOrReturn(CheckConstraintMaxLength("softwareVersionString", [value length], 64));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestQueryManufacturingDate_12()
+    CHIP_ERROR TestThReadsManufacturingDateFromTheDutAndVerifyItIsOfTypeStringAndVerifyTheFormat_11()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeManufacturingDateWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query ManufacturingDate Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("manufacturingDate", "", "string"));
-            VerifyOrReturn(CheckConstraintFormat("manufacturingDate", "", "ISO 8601"));
-            VerifyOrReturn(CheckConstraintMinLength("manufacturingDate", [value length], 8));
-            VerifyOrReturn(CheckConstraintMaxLength("manufacturingDate", [value length], 16));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestQueryPartNumber_13()
+    CHIP_ERROR TestQueryPartNumber_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -20772,32 +20041,16 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQueryProductURL_14()
+    CHIP_ERROR TestThReadsProductURLFromTheDutAndVerifyItIsOfTypeStringAndVerifyTheFormat_13()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeProductURLWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query ProductURL Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("productURL", "", "string"));
-            VerifyOrReturn(CheckConstraintFormat("productURL", "", "RFC3986"));
-            VerifyOrReturn(CheckConstraintMaxLength("productURL", [value length], 256));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestQueryProductLabel_15()
+    CHIP_ERROR TestQueryProductLabel_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -20821,7 +20074,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQuerySerialNumber_16()
+    CHIP_ERROR TestQuerySerialNumber_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -20845,7 +20098,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQueryLocalConfigDisabled_17()
+    CHIP_ERROR TestQueryLocalConfigDisabled_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -20868,7 +20121,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQueryReachable_18()
+    CHIP_ERROR TestQueryReachable_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -20891,7 +20144,7 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQueryUniqueID_19()
+    CHIP_ERROR TestQueryUniqueID_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -20916,11 +20169,11 @@ class Test_TC_DM_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_DM_3_1 : public TestCommandBridge {
+class Test_TC_EMR_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DM_3_1()
-        : TestCommandBridge("Test_TC_DM_3_1")
+    Test_TC_EMR_1_1()
+        : TestCommandBridge("Test_TC_EMR_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -20930,7 +20183,7 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DM_3_1() {}
+    ~Test_TC_EMR_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -20938,11 +20191,11 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DM_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_EMR_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DM_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_EMR_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -20959,12 +20212,25 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Query MaxNetworks\n");
-            err = TestQueryMaxNetworks_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Query Networks\n");
-            err = TestQueryNetworks_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
+            break;
+        case 3:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : write the default values to mandatory global attribute: ClusterRevision\n");
+            err = TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : reads back global attribute: ClusterRevision\n");
+            err = TestReadsBackGlobalAttributeClusterRevision_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
+            err = TestReadTheGlobalAttributeAttributeList_5();
             break;
         }
 
@@ -20986,6 +20252,15 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -20999,7 +20274,7 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
+    const uint16_t mTestCount = 6;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -21013,50 +20288,111 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestQueryMaxNetworks_1()
+    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestNetworkCommissioning * cluster = [[CHIPTestNetworkCommissioning alloc] initWithDevice:device
-                                                                                             endpoint:0
-                                                                                                queue:mCallbackQueue];
+        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
+                                                                                               endpoint:1
+                                                                                                  queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxNetworksWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query MaxNetworks Error: %@", err);
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
             }
 
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
+                                                                                               endpoint:1
+                                                                                                  queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
+
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxNetworks", "", "uint8"));
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestQueryNetworks_2()
+    CHIP_ERROR TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestNetworkCommissioning * cluster = [[CHIPTestNetworkCommissioning alloc] initWithDevice:device
-                                                                                             endpoint:0
-                                                                                                queue:mCallbackQueue];
+        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
+                                                                                               endpoint:1
+                                                                                                  queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNetworksWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query Networks Error: %@", err);
+        id clusterRevisionArgument;
+        clusterRevisionArgument = [NSNumber numberWithUnsignedShort:1U];
+        [cluster
+            writeAttributeClusterRevisionWithValue:clusterRevisionArgument
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(
+                                         @"write the default values to mandatory global attribute: ClusterRevision Error: %@", err);
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                     NextTest();
+                                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackGlobalAttributeClusterRevision_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
+                                                                                               endpoint:1
+                                                                                                  queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"reads back global attribute: ClusterRevision Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
             }
 
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
+                                                                                               endpoint:1
+                                                                                                  queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
+
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("networks", "", "list"));
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
@@ -21064,11 +20400,11 @@ class Test_TC_DM_3_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_DM_2_2 : public TestCommandBridge {
+class Test_TC_DGETH_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DM_2_2()
-        : TestCommandBridge("Test_TC_DM_2_2")
+    Test_TC_DGETH_2_1()
+        : TestCommandBridge("Test_TC_DGETH_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -21078,7 +20414,7 @@ class Test_TC_DM_2_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DM_2_2() {}
+    ~Test_TC_DGETH_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -21086,11 +20422,11 @@ class Test_TC_DM_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DM_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DM_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DGETH_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -21107,20 +20443,110 @@ class Test_TC_DM_2_2 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Query fabrics list\n");
-            err = TestQueryFabricsList_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read PHYRate attribute constraints\n");
+            err = TestReadPHYRateAttributeConstraints_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Query Supported Fabrics\n");
-            err = TestQuerySupportedFabrics_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read FullDuplex attribute constraints\n");
+            err = TestReadFullDuplexAttributeConstraints_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Query Commissioned Fabrics\n");
-            err = TestQueryCommissionedFabrics_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read PacketRxCount attribute constraints\n");
+            err = TestReadPacketRxCountAttributeConstraints_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Query User Trusted Root Certificates\n");
-            err = TestQueryUserTrustedRootCertificates_4();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 4 : Read PacketRxCount value from DUT and verify the number of packets received on ethernet "
+                "network interface\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadPacketRxCountValueFromDutAndVerifyTheNumberOfPacketsReceivedOnEthernetNetworkInterface_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read PacketTxCount attribute constraints\n");
+            err = TestReadPacketTxCountAttributeConstraints_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 6 : Read PacketTxCount value from DUT and verify the number of packets received on ethernet "
+                "network interface\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadPacketTxCountValueFromDutAndVerifyTheNumberOfPacketsReceivedOnEthernetNetworkInterface_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read TxErrCount attribute constraints\n");
+            err = TestReadTxErrCountAttributeConstraints_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 8 : Read TxErrCount value from DUT and verify value indicates the number of failed packet "
+                "transmission on ethernet network interface\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTxErrCountValueFromDutAndVerifyValueIndicatesTheNumberOfFailedPacketTransmissionOnEthernetNetworkInterface_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Read CollisionCount attribute constraints\n");
+            err = TestReadCollisionCountAttributeConstraints_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 10 : Read CollisionCount value from DUT and verify value indicates the number of collision "
+                "occurred while transmitting packets on ethernet network interface\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadCollisionCountValueFromDutAndVerifyValueIndicatesTheNumberOfCollisionOccurredWhileTransmittingPacketsOnEthernetNetworkInterface_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Read OverrunCount attribute constraints\n");
+            err = TestReadOverrunCountAttributeConstraints_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 12 : Read OverrunCount value from DUT and verify value indicates the number of packets dropped "
+                "due to lack of buffer memory on ethernet network interface\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadOverrunCountValueFromDutAndVerifyValueIndicatesTheNumberOfPacketsDroppedDueToLackOfBufferMemoryOnEthernetNetworkInterface_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Read CarrierDetect attribute constraints\n");
+            err = TestReadCarrierDetectAttributeConstraints_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 14 : Read CarrierDetect value from DUT and verify value indicates the presence of carrier detect "
+                "control signal on ethernet network interface\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadCarrierDetectValueFromDutAndVerifyValueIndicatesThePresenceOfCarrierDetectControlSignalOnEthernetNetworkInterface_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Read TimeSinceReset attribute constraints\n");
+            err = TestReadTimeSinceResetAttributeConstraints_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 16 : Read TimeSinceReset value from DUT and verify the value indicates the duration of time, in "
+                "minutes\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTimeSinceResetValueFromDutAndVerifyTheValueIndicatesTheDurationOfTimeInMinutes_16();
             break;
         }
 
@@ -21148,482 +20574,40 @@ class Test_TC_DM_2_2 : public TestCommandBridge {
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 5;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestQueryFabricsList_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = [NSNumber numberWithBool:true];
-        [cluster readAttributeFabricsWithParams:params
-                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-                                  NSLog(@"Query fabrics list Error: %@", err);
-
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                  {
-                                      id actualValue = value;
-                                      VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(1)));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @""));
-                                  }
-
-                                  VerifyOrReturn(CheckConstraintType("fabrics", "", "list"));
-                                  NextTest();
-                              }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestQuerySupportedFabrics_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSupportedFabricsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query Supported Fabrics Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("SupportedFabrics", actualValue, 16));
-            }
-
-            VerifyOrReturn(CheckConstraintType("supportedFabrics", "", "uint8"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestQueryCommissionedFabrics_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCommissionedFabricsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query Commissioned Fabrics Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("CommissionedFabrics", actualValue, 1));
-            }
-
-            VerifyOrReturn(CheckConstraintType("commissionedFabrics", "", "uint8"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestQueryUserTrustedRootCertificates_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeTrustedRootCertificatesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Query User Trusted Root Certificates Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("trustedRootCertificates", "", "list"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_EMR_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_EMR_1_1()
-        : TestCommandBridge("Test_TC_EMR_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_EMR_1_1() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_EMR_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_EMR_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeClusterRevision_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
-            break;
-        case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : write the default values to mandatory global attribute: ClusterRevision\n");
-            err = TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : reads back global attribute: ClusterRevision\n");
-            err = TestReadsBackGlobalAttributeClusterRevision_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
-            err = TestReadTheGlobalAttributeAttributeList_5();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
-                                                                                               endpoint:1
-                                                                                                  queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
-                                                                                               endpoint:1
-                                                                                                  queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
-                                                                                               endpoint:1
-                                                                                                  queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id clusterRevisionArgument;
-        clusterRevisionArgument = [NSNumber numberWithUnsignedShort:1U];
-        [cluster
-            writeAttributeClusterRevisionWithValue:clusterRevisionArgument
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(
-                                         @"write the default values to mandatory global attribute: ClusterRevision Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                     NextTest();
-                                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadsBackGlobalAttributeClusterRevision_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
-                                                                                               endpoint:1
-                                                                                                  queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"reads back global attribute: ClusterRevision Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestElectricalMeasurement * cluster = [[CHIPTestElectricalMeasurement alloc] initWithDevice:device
-                                                                                               endpoint:1
-                                                                                                  queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_ETHDIAG_1_1()
-        : TestCommandBridge("Test_TC_ETHDIAG_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_ETHDIAG_1_1() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ETHDIAG_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ETHDIAG_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read PHYRate attribute constraints\n");
-            err = TestReadPHYRateAttributeConstraints_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read FullDuplex attribute constraints\n");
-            err = TestReadFullDuplexAttributeConstraints_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read PacketRxCount attribute constraints\n");
-            err = TestReadPacketRxCountAttributeConstraints_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read PacketTxCount attribute constraints\n");
-            err = TestReadPacketTxCountAttributeConstraints_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read TxErrCount attribute constraints\n");
-            err = TestReadTxErrCountAttributeConstraints_5();
-            break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read CollisionCount attribute constraints\n");
-            err = TestReadCollisionCountAttributeConstraints_6();
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read OverrunCount attribute constraints\n");
-            err = TestReadOverrunCountAttributeConstraints_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read CarrierDetect attribute constraints\n");
-            err = TestReadCarrierDetectAttributeConstraints_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Read TimeSinceReset attribute constraints\n");
-            err = TestReadTimeSinceResetAttributeConstraints_9();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 1:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 2:
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 3:
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 4:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 5:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 8:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 9:
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         }
@@ -21639,7 +20623,7 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 17;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -21666,11 +20650,10 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue<uint8_t>("PHYRate", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("PHYRate", [value unsignedCharValue], 9));
             }
 
@@ -21693,7 +20676,11 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("fullDuplex", "", "bool"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("fullDuplex", "", "bool"));
+            }
+
             NextTest();
         }];
 
@@ -21720,7 +20707,16 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadPacketTxCountAttributeConstraints_4()
+    CHIP_ERROR TestReadPacketRxCountValueFromDutAndVerifyTheNumberOfPacketsReceivedOnEthernetNetworkInterface_4()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadPacketTxCountAttributeConstraints_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestEthernetNetworkDiagnostics * cluster = [[CHIPTestEthernetNetworkDiagnostics alloc] initWithDevice:device
@@ -21740,7 +20736,16 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTxErrCountAttributeConstraints_5()
+    CHIP_ERROR TestReadPacketTxCountValueFromDutAndVerifyTheNumberOfPacketsReceivedOnEthernetNetworkInterface_6()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadTxErrCountAttributeConstraints_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestEthernetNetworkDiagnostics * cluster = [[CHIPTestEthernetNetworkDiagnostics alloc] initWithDevice:device
@@ -21760,7 +20765,17 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadCollisionCountAttributeConstraints_6()
+    CHIP_ERROR
+    TestReadTxErrCountValueFromDutAndVerifyValueIndicatesTheNumberOfFailedPacketTransmissionOnEthernetNetworkInterface_8()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadCollisionCountAttributeConstraints_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestEthernetNetworkDiagnostics * cluster = [[CHIPTestEthernetNetworkDiagnostics alloc] initWithDevice:device
@@ -21780,7 +20795,17 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadOverrunCountAttributeConstraints_7()
+    CHIP_ERROR
+    TestReadCollisionCountValueFromDutAndVerifyValueIndicatesTheNumberOfCollisionOccurredWhileTransmittingPacketsOnEthernetNetworkInterface_10()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadOverrunCountAttributeConstraints_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestEthernetNetworkDiagnostics * cluster = [[CHIPTestEthernetNetworkDiagnostics alloc] initWithDevice:device
@@ -21800,7 +20825,17 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadCarrierDetectAttributeConstraints_8()
+    CHIP_ERROR
+    TestReadOverrunCountValueFromDutAndVerifyValueIndicatesTheNumberOfPacketsDroppedDueToLackOfBufferMemoryOnEthernetNetworkInterface_12()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadCarrierDetectAttributeConstraints_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestEthernetNetworkDiagnostics * cluster = [[CHIPTestEthernetNetworkDiagnostics alloc] initWithDevice:device
@@ -21813,14 +20848,28 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("carrierDetect", "", "bool"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("carrierDetect", "", "bool"));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTimeSinceResetAttributeConstraints_9()
+    CHIP_ERROR
+    TestReadCarrierDetectValueFromDutAndVerifyValueIndicatesThePresenceOfCarrierDetectControlSignalOnEthernetNetworkInterface_14()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadTimeSinceResetAttributeConstraints_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestEthernetNetworkDiagnostics * cluster = [[CHIPTestEthernetNetworkDiagnostics alloc] initWithDevice:device
@@ -21839,13 +20888,22 @@ class Test_TC_ETHDIAG_1_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR TestReadTimeSinceResetValueFromDutAndVerifyTheValueIndicatesTheDurationOfTimeInMinutes_16()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
 };
 
-class Test_TC_ETHDIAG_2_1 : public TestCommandBridge {
+class Test_TC_DGETH_2_2 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_ETHDIAG_2_1()
-        : TestCommandBridge("Test_TC_ETHDIAG_2_1")
+    Test_TC_DGETH_2_2()
+        : TestCommandBridge("Test_TC_DGETH_2_2")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -21855,7 +20913,7 @@ class Test_TC_ETHDIAG_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_ETHDIAG_2_1() {}
+    ~Test_TC_DGETH_2_2() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -21863,11 +20921,11 @@ class Test_TC_ETHDIAG_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ETHDIAG_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_2_2\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ETHDIAG_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DGETH_2_2\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -22558,7 +21616,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -22576,7 +21638,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -22594,7 +21660,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -22672,7 +21742,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -22690,7 +21764,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -22708,7 +21786,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -22759,12 +21841,8 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
 
             NextTest();
         }];
@@ -22824,11 +21902,11 @@ class Test_TC_FLW_2_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_FLW_2_2 : public TestCommandBridge {
+class Test_TC_CGEN_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_FLW_2_2()
-        : TestCommandBridge("Test_TC_FLW_2_2")
+    Test_TC_CGEN_1_1()
+        : TestCommandBridge("Test_TC_CGEN_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -22838,7 +21916,7 @@ class Test_TC_FLW_2_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_FLW_2_2() {}
+    ~Test_TC_CGEN_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -22846,145 +21924,11 @@ class Test_TC_FLW_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLW_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_CGEN_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_FLW_2_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: MeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMeasuredValue_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: MeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMeasuredValue_2();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestFlowMeasurement * cluster = [[CHIPTestFlowMeasurement alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MeasuredValue Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestFlowMeasurement * cluster = [[CHIPTestFlowMeasurement alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MeasuredValue Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_GC_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_GC_1_1()
-        : TestCommandBridge("Test_TC_GC_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_GC_1_1() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_GC_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_GC_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_CGEN_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -23239,11 +22183,11 @@ class Test_TC_GC_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_GC_2_1 : public TestCommandBridge {
+class Test_TC_CGEN_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_GC_2_1()
-        : TestCommandBridge("Test_TC_GC_2_1")
+    Test_TC_CGEN_2_1()
+        : TestCommandBridge("Test_TC_CGEN_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -23253,7 +22197,7 @@ class Test_TC_GC_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_GC_2_1() {}
+    ~Test_TC_CGEN_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -23261,11 +22205,11 @@ class Test_TC_GC_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_GC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_CGEN_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_GC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_CGEN_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -23451,12 +22395,8 @@ class Test_TC_GC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("regulatoryConfig", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("regulatoryConfig", [value unsignedCharValue], 2));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("regulatoryConfig", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("regulatoryConfig", [value unsignedCharValue], 2));
 
             NextTest();
         }];
@@ -23477,12 +22417,8 @@ class Test_TC_GC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("locationCapability", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("locationCapability", [value unsignedCharValue], 2));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("locationCapability", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("locationCapability", [value unsignedCharValue], 2));
 
             NextTest();
         }];
@@ -23925,12 +22861,8 @@ class Test_TC_I_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("identifyType", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("identifyType", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("identifyType", [value unsignedCharValue], 5));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("identifyType", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("identifyType", [value unsignedCharValue], 5));
 
             NextTest();
         }];
@@ -24914,11 +23846,10 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("minMeasuredValue", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("minMeasuredValue", [value unsignedShortValue], 65533U));
             }
 
@@ -24941,11 +23872,10 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxMeasuredValue", [value unsignedShortValue], 2U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("maxMeasuredValue", [value unsignedShortValue], 65534U));
             }
 
@@ -24969,12 +23899,8 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
 
             NextTest();
         }];
@@ -24995,7 +23921,11 @@ class Test_TC_ILL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("lightSensorType", "", "enum8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("lightSensorType", "", "enum8"));
+            }
+
             NextTest();
         }];
 
@@ -25562,10 +24492,13 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("min level", actualValue, 0));
+                VerifyOrReturn(CheckValue("min level", actualValue, 1));
             }
 
             VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("minLevel", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("minLevel", [value unsignedCharValue], 1));
+
             NextTest();
         }];
 
@@ -25693,7 +24626,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -25711,7 +24648,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -25729,7 +24670,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -25747,7 +24692,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -25788,7 +24737,11 @@ class Test_TC_LVL_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -26109,7 +25062,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -26152,8 +25109,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
                 VerifyOrReturn(CheckValueNonNull("on level", actualValue));
                 VerifyOrReturn(CheckValue("on level", actualValue, 254));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8"));
             NextTest();
         }];
 
@@ -26171,7 +25131,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -26214,8 +25178,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
                 VerifyOrReturn(CheckValueNonNull("on transition time", actualValue));
                 VerifyOrReturn(CheckValue("on transition time", actualValue, 100U));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16"));
             NextTest();
         }];
 
@@ -26233,7 +25200,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16"));
+            }
+
             NextTest();
         }];
 
@@ -26276,8 +25247,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
                 VerifyOrReturn(CheckValueNonNull("off transition time", actualValue));
                 VerifyOrReturn(CheckValue("off transition time", actualValue, 100U));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16"));
             NextTest();
         }];
 
@@ -26300,8 +25274,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
                 VerifyOrReturn(CheckValueNonNull("default move rate", actualValue));
                 VerifyOrReturn(CheckValue("default move rate", actualValue, 50));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
             NextTest();
         }];
 
@@ -26344,8 +25321,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
                 VerifyOrReturn(CheckValueNonNull("default move rate", actualValue));
                 VerifyOrReturn(CheckValue("default move rate", actualValue, 100));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
             NextTest();
         }];
 
@@ -26363,7 +25343,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8"));
+            }
+
             NextTest();
         }];
 
@@ -26406,8 +25390,11 @@ class Test_TC_LVL_2_2 : public TestCommandBridge {
                 VerifyOrReturn(CheckValueNonNull("start up current level", actualValue));
                 VerifyOrReturn(CheckValue("start up current level", actualValue, 254));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8"));
             NextTest();
         }];
 
@@ -27228,12 +26215,8 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("current level", actualValue, 1));
             }
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentLevel", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentLevel", [value unsignedCharValue], 1));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentLevel", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentLevel", [value unsignedCharValue], 1));
 
             NextTest();
         }];
@@ -27253,7 +26236,10 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8"));
+            }
             {
                 DefaultMoveRateValue = value;
             }
@@ -27305,9 +26291,7 @@ class Test_TC_LVL_4_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentLevel", value, 255));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("currentLevel", value, 255));
 
             NextTest();
         }];
@@ -27642,9 +26626,7 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentLevel", value, CurrentlevelValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("currentLevel", value, CurrentlevelValue));
 
             NextTest();
         }];
@@ -27972,12 +26954,8 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentLevel", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentLevel", [value unsignedCharValue], 1));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentLevel", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("currentLevel", [value unsignedCharValue], 1));
             {
                 CurrentLevelValue = value;
             }
@@ -28050,9 +27028,7 @@ class Test_TC_LVL_6_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentLevel", value, CurrentLevelValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("currentLevel", value, CurrentLevelValue));
 
             NextTest();
         }];
@@ -29290,43 +28266,39 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
             err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeAttributeList_3();
+            err = TestReadTheGlobalAttributeAttributeList_2();
             break;
-        case 4:
+        case 3:
             ChipLogProgress(chipTool,
-                " ***** Test Step 4 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
                 "supported events.\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4();
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
+            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
-            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
-            break;
-        case 7:
             ChipLogProgress(
-                chipTool, " ***** Test Step 7 : Read FeatureMap attribute from the DUT and Verify that the DUT response\n");
+                chipTool, " ***** Test Step 6 : Read FeatureMap attribute from the DUT and Verify that the DUT response\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_7();
+            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_6();
             break;
         }
 
@@ -29360,9 +28332,6 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -29376,7 +28345,7 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 8;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -29406,23 +28375,6 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
             }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWakeOnLan * cluster = [[CHIPTestWakeOnLan alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
             VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
@@ -29430,7 +28382,7 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWakeOnLan * cluster = [[CHIPTestWakeOnLan alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -29443,14 +28395,13 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(7)));
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(6)));
                 VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
                 VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
                 VerifyOrReturn(CheckValue("", actualValue[2], 65528UL));
                 VerifyOrReturn(CheckValue("", actualValue[3], 65529UL));
                 VerifyOrReturn(CheckValue("", actualValue[4], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[6], 65533UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 65533UL));
             }
 
             VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
@@ -29460,7 +28411,7 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -29469,7 +28420,7 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWakeOnLan * cluster = [[CHIPTestWakeOnLan alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -29492,7 +28443,7 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWakeOnLan * cluster = [[CHIPTestWakeOnLan alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -29515,7 +28466,7 @@ class Test_TC_MC_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_7()
+    CHIP_ERROR TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_6()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -29856,43 +28807,39 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
             err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeAttributeList_3();
+            err = TestReadTheGlobalAttributeAttributeList_2();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AcceptedCommandList\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
+            err = TestReadTheGlobalAttributeAcceptedCommandList_3();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: GeneratedCommandList\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
+            err = TestReadTheGlobalAttributeGeneratedCommandList_4();
             break;
-        case 6:
+        case 5:
             ChipLogProgress(chipTool,
-                " ***** Test Step 6 : Read FeatureMap attribute from the DUT and Verify that the DUT values based on feature/PICS "
+                " ***** Test Step 5 : Read FeatureMap attribute from the DUT and Verify that the DUT values based on feature/PICS "
                 "support:Bit 0 - Set to 1 if the DUT supports Advanced Seek (PICS_ADVANCEDSEEK is true) Bit 1 - Set to 1 if the "
                 "DUT supports Variable Speed (PICS_VARIABLESPEED is true)\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutValuesBasedOnFeaturePicsSupportBit0SetTo1IfTheDutSupportsAdvancedSeekPicsAdvancedseekIsTrueBit1SetTo1IfTheDutSupportsVariableSpeedPicsVariablespeedIsTrue_6();
+            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutValuesBasedOnFeaturePicsSupportBit0SetTo1IfTheDutSupportsAdvancedSeekPicsAdvancedseekIsTrueBit1SetTo1IfTheDutSupportsVariableSpeedPicsVariablespeedIsTrue_5();
             break;
         }
 
@@ -29923,9 +28870,6 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -29939,7 +28883,7 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    const uint16_t mTestCount = 6;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -29969,23 +28913,6 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
             }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
             VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
@@ -29993,7 +28920,7 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -30028,7 +28955,7 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -30062,7 +28989,7 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -30087,7 +29014,7 @@ class Test_TC_MC_1_7 : public TestCommandBridge {
     }
 
     CHIP_ERROR
-    TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutValuesBasedOnFeaturePicsSupportBit0SetTo1IfTheDutSupportsAdvancedSeekPicsAdvancedseekIsTrueBit1SetTo1IfTheDutSupportsVariableSpeedPicsVariablespeedIsTrue_6()
+    TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutValuesBasedOnFeaturePicsSupportBit0SetTo1IfTheDutSupportsAdvancedSeekPicsAdvancedseekIsTrueBit1SetTo1IfTheDutSupportsVariableSpeedPicsVariablespeedIsTrue_5()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -30841,7 +29768,7 @@ class Test_TC_MC_1_10 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -30865,7 +29792,7 @@ class Test_TC_MC_1_10 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -30885,7 +29812,7 @@ class Test_TC_MC_1_10 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -30932,7 +29859,7 @@ class Test_TC_MC_1_10 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -30959,7 +29886,7 @@ class Test_TC_MC_1_10 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -31434,7 +30361,7 @@ class Test_TC_MC_1_12 : public TestCommandBridge {
     CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
@@ -31457,7 +30384,7 @@ class Test_TC_MC_1_12 : public TestCommandBridge {
     CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -31494,7 +30421,7 @@ class Test_TC_MC_1_12 : public TestCommandBridge {
     CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -31520,7 +30447,7 @@ class Test_TC_MC_1_12 : public TestCommandBridge {
     CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -31594,8 +30521,8 @@ class Test_TC_MC_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Put the device into low power mode\n");
-            err = TestPutTheDeviceIntoLowPowerMode_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends Sleep command to DUT\n");
+            err = TestThSendsSleepCommandToDut_1();
             break;
         }
 
@@ -31641,14 +30568,14 @@ class Test_TC_MC_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestPutTheDeviceIntoLowPowerMode_1()
+    CHIP_ERROR TestThSendsSleepCommandToDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestLowPower * cluster = [[CHIPTestLowPower alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster sleepWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Put the device into low power mode Error: %@", err);
+            NSLog(@"TH sends Sleep command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -31659,11 +30586,11 @@ class Test_TC_MC_2_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_MC_3_1 : public TestCommandBridge {
+class Test_TC_MC_3_2 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MC_3_1()
-        : TestCommandBridge("Test_TC_MC_3_1")
+    Test_TC_MC_3_2()
+        : TestCommandBridge("Test_TC_MC_3_2")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -31673,7 +30600,7 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_MC_3_1() {}
+    ~Test_TC_MC_3_2() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -31681,11 +30608,11 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_2\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_2\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -31702,124 +30629,222 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Select\n");
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends CEC Settings Keys(0x0A) to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendSelect_1();
+            err = TestThSendsCecSettingsKeys0x0AToDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Send Up\n");
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends CEC Home Keys(0x09) to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendUp_2();
+            err = TestThSendsCecHomeKeys0x09ToDut_2();
             break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Send Down\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendDown_3();
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Left\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendLeft_4();
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send Right\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRight_5();
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Send RightUp\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRightUp_6();
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 3;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestThSendsCecSettingsKeys0x0AToDut_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
+        params.keyCode = [NSNumber numberWithUnsignedChar:10];
+        [cluster sendKeyWithParams:params
+                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"TH sends CEC Settings Keys(0x0A) to DUT Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestThSendsCecHomeKeys0x09ToDut_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
+        [cluster sendKeyWithParams:params
+                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"TH sends CEC Home Keys(0x09) to DUT Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_MC_3_3 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_MC_3_3()
+        : TestCommandBridge("Test_TC_MC_3_3")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_MC_3_3() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_3\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_3\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Send RightDown\n");
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Numbers1\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendRightDown_7();
+            err = TestSendNumbers1_1();
             break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Send LeftUp\n");
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Send Numbers2\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendLeftUp_8();
+            err = TestSendNumbers2_2();
             break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Send LeftDown\n");
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Send Numbers3\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendLeftDown_9();
+            err = TestSendNumbers3_3();
             break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Send RootMenu\n");
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Numbers4\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendRootMenu_10();
+            err = TestSendNumbers4_4();
             break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Send SetupMenu\n");
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Send Numbers5\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendSetupMenu_11();
+            err = TestSendNumbers5_5();
             break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Send ContentsMenu\n");
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Send Numbers6\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendContentsMenu_12();
+            err = TestSendNumbers6_6();
             break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Send FavoriteMenu\n");
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Send Numbers7\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendFavoriteMenu_13();
+            err = TestSendNumbers7_7();
             break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Send Exit\n");
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Send Numbers8\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendExit_14();
+            err = TestSendNumbers8_8();
             break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Send Invalid\n");
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Send Numbers9\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendInvalid_15();
+            err = TestSendNumbers9_9();
             break;
         }
 
@@ -31862,24 +30887,6 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
         }
 
         // Go on to the next test.
@@ -31893,7 +30900,7 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 16;
+    const uint16_t mTestCount = 10;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -31907,157 +30914,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendSelect_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:0];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Select Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendUp_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:1];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Up Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendDown_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:2];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Down Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendLeft_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:3];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Left Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRight_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:4];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Right Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRightUp_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:5];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RightUp Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRightDown_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:6];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RightDown Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendLeftUp_8()
+    CHIP_ERROR TestSendNumbers1_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:7];
+        params.keyCode = [NSNumber numberWithUnsignedChar:33];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send LeftUp Error: %@", err);
+                     NSLog(@"Send Numbers1 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32067,17 +30934,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendLeftDown_9()
+    CHIP_ERROR TestSendNumbers2_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:8];
+        params.keyCode = [NSNumber numberWithUnsignedChar:34];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send LeftDown Error: %@", err);
+                     NSLog(@"Send Numbers2 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32087,17 +30954,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendRootMenu_10()
+    CHIP_ERROR TestSendNumbers3_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
+        params.keyCode = [NSNumber numberWithUnsignedChar:35];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
+                     NSLog(@"Send Numbers3 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32107,17 +30974,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetupMenu_11()
+    CHIP_ERROR TestSendNumbers4_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:10];
+        params.keyCode = [NSNumber numberWithUnsignedChar:36];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send SetupMenu Error: %@", err);
+                     NSLog(@"Send Numbers4 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32127,17 +30994,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendContentsMenu_12()
+    CHIP_ERROR TestSendNumbers5_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:11];
+        params.keyCode = [NSNumber numberWithUnsignedChar:37];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send ContentsMenu Error: %@", err);
+                     NSLog(@"Send Numbers5 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32147,17 +31014,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendFavoriteMenu_13()
+    CHIP_ERROR TestSendNumbers6_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:12];
+        params.keyCode = [NSNumber numberWithUnsignedChar:38];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send FavoriteMenu Error: %@", err);
+                     NSLog(@"Send Numbers6 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32167,17 +31034,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendExit_14()
+    CHIP_ERROR TestSendNumbers7_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:13];
+        params.keyCode = [NSNumber numberWithUnsignedChar:39];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Exit Error: %@", err);
+                     NSLog(@"Send Numbers7 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32187,142 +31054,17 @@ class Test_TC_MC_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendInvalid_15()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:255];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Invalid Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_MC_3_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MC_3_2()
-        : TestCommandBridge("Test_TC_MC_3_2")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_MC_3_2() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_2\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Send SetupMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendSetupMenu_2();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestSendRootMenu_1()
+    CHIP_ERROR TestSendNumbers8_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
+        params.keyCode = [NSNumber numberWithUnsignedChar:40];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
+                     NSLog(@"Send Numbers8 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32332,17 +31074,17 @@ class Test_TC_MC_3_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetupMenu_2()
+    CHIP_ERROR TestSendNumbers9_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:10];
+        params.keyCode = [NSNumber numberWithUnsignedChar:41];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send SetupMenu Error: %@", err);
+                     NSLog(@"Send Numbers9 Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32353,11 +31095,11 @@ class Test_TC_MC_3_2 : public TestCommandBridge {
     }
 };
 
-class Test_TC_MC_3_3 : public TestCommandBridge {
+class Test_TC_MC_3_4 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MC_3_3()
-        : TestCommandBridge("Test_TC_MC_3_3")
+    Test_TC_MC_3_4()
+        : TestCommandBridge("Test_TC_MC_3_4")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -32367,7 +31109,7 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_MC_3_3() {}
+    ~Test_TC_MC_3_4() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -32375,11 +31117,11 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_3\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_4\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_3\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_4\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -32396,76 +31138,84 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Numbers1\n");
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers1_1();
+            err = TestThSendsSameKeyPadInputCodesToDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Send Numbers2\n");
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers2_2();
+            err = TestThSendsSameKeyPadInputCodesToDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Send Numbers3\n");
+            ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers3_3();
+            err = TestThSendsSameKeyPadInputCodesToDut_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Numbers4\n");
+            ChipLogProgress(chipTool, " ***** Test Step 4 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers4_4();
+            err = TestThSendsSameKeyPadInputCodesToDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send Numbers5\n");
+            ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers5_5();
+            err = TestThSendsSameKeyPadInputCodesToDut_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Send Numbers6\n");
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers6_6();
+            err = TestThSendsSameKeyPadInputCodesToDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Send Numbers7\n");
+            ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers7_7();
+            err = TestThSendsSameKeyPadInputCodesToDut_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Send Numbers8\n");
+            ChipLogProgress(chipTool, " ***** Test Step 8 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers8_8();
+            err = TestThSendsSameKeyPadInputCodesToDut_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Send Numbers9\n");
+            ChipLogProgress(chipTool, " ***** Test Step 9 : TH sends same KeyPad input codes to DUT\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestSendNumbers9_9();
+            err = TestThSendsSameKeyPadInputCodesToDut_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH sends same KeyPad input codes to DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestThSendsSameKeyPadInputCodesToDut_10();
             break;
         }
 
@@ -32508,6 +31258,9 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -32521,7 +31274,7 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 11;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -32535,17 +31288,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendNumbers1_1()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:33];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers1 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32555,17 +31308,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers2_2()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:34];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers2 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32575,17 +31328,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers3_3()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:35];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers3 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32595,17 +31348,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers4_4()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:36];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers4 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32615,17 +31368,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers5_5()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:37];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers5 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32635,17 +31388,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers6_6()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:38];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers6 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32655,17 +31408,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers7_7()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:39];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers7 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32675,17 +31428,17 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers8_8()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:40];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers8 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32695,17 +31448,37 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendNumbers9_9()
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:41];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
         [cluster sendKeyWithParams:params
                  completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Numbers9 Error: %@", err);
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestThSendsSameKeyPadInputCodesToDut_10()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
+        params.keyCode = [NSNumber numberWithUnsignedChar:9];
+        [cluster sendKeyWithParams:params
+                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"TH sends same KeyPad input codes to DUT Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -32716,11 +31489,11 @@ class Test_TC_MC_3_3 : public TestCommandBridge {
     }
 };
 
-class Test_TC_MC_3_4 : public TestCommandBridge {
+class Test_TC_MC_3_5 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MC_3_4()
-        : TestCommandBridge("Test_TC_MC_3_4")
+    Test_TC_MC_3_5()
+        : TestCommandBridge("Test_TC_MC_3_5")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -32730,7 +31503,7 @@ class Test_TC_MC_3_4 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_MC_3_4() {}
+    ~Test_TC_MC_3_5() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -32738,11 +31511,11 @@ class Test_TC_MC_3_4 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_4\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_5\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_4\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_5\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -32759,84 +31532,8 @@ class Test_TC_MC_3_4 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Send RootMenu\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestSendRootMenu_10();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read CatalogList attribute.\n");
+            err = TestReadCatalogListAttribute_1();
             break;
         }
 
@@ -32855,33 +31552,6 @@ class Test_TC_MC_3_4 : public TestCommandBridge {
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -32895,7 +31565,7 @@ class Test_TC_MC_3_4 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 11;
+    const uint16_t mTestCount = 2;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -32909,324 +31579,33 @@ class Test_TC_MC_3_4 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendRootMenu_1()
+    CHIP_ERROR TestReadCatalogListAttribute_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
+        [cluster readAttributeCatalogListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read CatalogList attribute. Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     NextTest();
-                 }];
+            VerifyOrReturn(CheckConstraintType("catalogList", "", "list"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestSendRootMenu_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_8()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_9()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendRootMenu_10()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:9];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send RootMenu Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_MC_3_5 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MC_3_5()
-        : TestCommandBridge("Test_TC_MC_3_5")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_MC_3_5() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MC_3_5\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MC_3_5\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read CatalogList attribute.\n");
-            err = TestReadCatalogListAttribute_1();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 2;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadCatalogListAttribute_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCatalogListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read CatalogList attribute. Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("catalogList", "", "list"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_MC_3_6 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MC_3_6()
-        : TestCommandBridge("Test_TC_MC_3_6")
-        , mTestIndex(0)
+class Test_TC_MC_3_6 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_MC_3_6()
+        : TestCommandBridge("Test_TC_MC_3_6")
+        , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -33333,8 +31712,11 @@ class Test_TC_MC_3_6 : public TestCommandBridge {
                 id actualValue = value;
                 VerifyOrReturn(CheckValueNull("CurrentApp", actualValue));
             }
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentApp", "", "ApplicationEP"));
+            }
 
-            VerifyOrReturn(CheckConstraintType("currentApp", "", "ApplicationEP"));
             NextTest();
         }];
 
@@ -35045,7 +33427,11 @@ class Test_TC_MC_5_3 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentChannel", "", "list"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentChannel", "", "list"));
+            }
+
             NextTest();
         }];
 
@@ -35404,6 +33790,8 @@ class Test_TC_MC_8_1 : public TestCommandBridge {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("targetvalue1", 0, UINT8_MAX, &mTargetvalue1);
+        AddArgument("targetvalue2", 0, UINT8_MAX, &mTargetvalue2);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
@@ -35444,6 +33832,42 @@ class Test_TC_MC_8_1 : public TestCommandBridge {
             ChipLogProgress(chipTool, " ***** Test Step 2 : Reads the TargetList attribute\n");
             err = TestReadsTheTargetListAttribute_2();
             break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Sends a NavigateTarget command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsANavigateTargetCommand_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads the CurrentTarget attribute\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsTheCurrentTargetAttribute_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Reads the TargetList attribute\n");
+            err = TestReadsTheTargetListAttribute_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Sends a NavigateTarget command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsANavigateTargetCommand_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads the CurrentTarget attribute\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsTheCurrentTargetAttribute_7();
+            break;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -35464,6 +33888,21 @@ class Test_TC_MC_8_1 : public TestCommandBridge {
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -35477,11 +33916,13 @@ class Test_TC_MC_8_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
+    const uint16_t mTestCount = 8;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint8_t> mTargetvalue1;
+    chip::Optional<uint8_t> mTargetvalue2;
     chip::Optional<uint16_t> mTimeout;
 
     CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
@@ -35508,6 +33949,7 @@ class Test_TC_MC_8_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+    NSArray * _Nonnull TargetListValues;
 
     CHIP_ERROR TestReadsTheTargetListAttribute_2()
     {
@@ -35521,6 +33963,126 @@ class Test_TC_MC_8_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("targetList", "", "list"));
+            {
+                TargetListValues = value;
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendsANavigateTargetCommand_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init];
+        params.target = mTargetvalue1.HasValue() ? [NSNumber numberWithUnsignedChar:mTargetvalue1.Value()]
+                                                 : [NSNumber numberWithUnsignedChar:1];
+        [cluster navigateTargetWithParams:params
+                        completionHandler:^(
+                            CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable err) {
+                            NSLog(@"Sends a NavigateTarget command Error: %@", err);
+
+                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                            {
+                                id actualValue = values.status;
+                                VerifyOrReturn(CheckValue("status", actualValue, 0));
+                            }
+
+                            NextTest();
+                        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsTheCurrentTargetAttribute_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentTargetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads the CurrentTarget attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("CurrentTarget", actualValue, mTargetvalue1.HasValue() ? mTargetvalue1.Value() : 1));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsTheTargetListAttribute_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeTargetListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads the TargetList attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("targetList", "", "list"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendsANavigateTargetCommand_6()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init];
+        params.target = mTargetvalue2.HasValue() ? [NSNumber numberWithUnsignedChar:mTargetvalue2.Value()]
+                                                 : [NSNumber numberWithUnsignedChar:2];
+        [cluster navigateTargetWithParams:params
+                        completionHandler:^(
+                            CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable err) {
+                            NSLog(@"Sends a NavigateTarget command Error: %@", err);
+
+                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                            {
+                                id actualValue = values.status;
+                                VerifyOrReturn(CheckValue("status", actualValue, 0));
+                            }
+
+                            NextTest();
+                        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsTheCurrentTargetAttribute_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentTargetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads the CurrentTarget attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("CurrentTarget", actualValue, mTargetvalue2.HasValue() ? mTargetvalue2.Value() : 2));
+            }
+
             NextTest();
         }];
 
@@ -35592,10 +34154,6 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Reads the Application attribute\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
             err = TestReadsTheApplicationAttribute_6();
             break;
         case 7:
@@ -35689,7 +34247,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35710,7 +34268,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35730,7 +34288,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35751,7 +34309,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35771,7 +34329,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35792,7 +34350,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35801,12 +34359,8 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("status", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("status", [value unsignedCharValue], 3));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("status", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("status", [value unsignedCharValue], 3));
 
             NextTest();
         }];
@@ -35818,7 +34372,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -35839,7 +34393,7 @@ class Test_TC_MC_9_1 : public TestCommandBridge {
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:1
+                                                                                     endpoint:3
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
@@ -37176,60 +35730,48 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
             err = TestWaitForPixitCommWin18010Seconds_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Wait for PIXIT_COMM_WIN(180) + 10 seconds\n");
-            err = TestWaitForPixitCommWin18010Seconds_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : TH_CR2 starts a commissioning process with DUT_CE\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCe_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Wait for PIXIT_COMM_WIN(180) + 10 seconds\n");
-            err = TestWaitForPixitCommWin18010Seconds_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : TH_CR1 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr1OpensANewCommissioningWindowOnDutCe_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Wait for PIXIT_COMM_WIN(180) + 10 seconds\n");
-            err = TestWaitForPixitCommWin18010Seconds_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH_CR1 revokes the commissioning window on DUT_CE\n");
+            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_6();
             break;
         case 7:
             ChipLogProgress(chipTool, " ***** Test Step 7 : TH_CR2 starts a commissioning process with DUT_CE\n");
             err = TestThCr2StartsACommissioningProcessWithDutCe_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : TH_CR1 opens a new commissioning window on DUT_CE\n");
-            err = TestThCr1OpensANewCommissioningWindowOnDutCe_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : TH_CR1 revokes the commissioning window on DUT_CE\n");
+            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : TH_CR1 revokes the commissioning window on DUT_CE\n");
-            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE\n");
+            err = TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH_CR2 starts a commissioning process with DUT_CE\n");
-            err = TestThCr2StartsACommissioningProcessWithDutCe_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH_CR1 read the mandatory attribute NodeLabel of DUT_CE\n");
+            err = TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : TH_CR1 revokes the commissioning window on DUT_CE\n");
-            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : TH_CR1 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr1OpensANewCommissioningWindowOnDutCe_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE\n");
-            err = TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : TH_CR1 read the mandatory attribute NodeLabel of DUT_CE\n");
-            err = TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : TH_CR1 opens a new commissioning window on DUT_CE\n");
-            err = TestThCr1OpensANewCommissioningWindowOnDutCe_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : TH_CR2 starts a commissioning process with DUT_CE\n");
+            ChipLogProgress(chipTool, " ***** Test Step 12 : TH_CR2 starts a commissioning process with DUT_CE\n");
             if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestThCr2StartsACommissioningProcessWithDutCe_15();
+            err = TestThCr2StartsACommissioningProcessWithDutCe_12();
             break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : TH_CR3 starts a commissioning process with DUT_CE\n");
-            err = TestThCr3StartsACommissioningProcessWithDutCe_16();
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : TH_CR3 starts a commissioning process with DUT_CE\n");
+            err = TestThCr3StartsACommissioningProcessWithDutCe_13();
             break;
         }
 
@@ -37255,7 +35797,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -37267,30 +35809,21 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         }
@@ -37303,7 +35836,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 17;
+    const uint16_t mTestCount = 14;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<uint16_t> mTimeout;
@@ -37361,32 +35894,11 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
     CHIP_ERROR TestWaitForPixitCommWin18010Seconds_3()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForPixitCommWin18010Seconds_4()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForPixitCommWin18010Seconds_5()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForPixitCommWin18010Seconds_6()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 28000UL;
+        value.ms = 190000UL;
         return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_7()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_4()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -37394,7 +35906,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_8()
+    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37425,7 +35937,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_9()
+    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37444,7 +35956,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_10()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_7()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -37452,7 +35964,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_11()
+    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37470,7 +35982,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_12()
+    CHIP_ERROR TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -37490,7 +36002,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_13()
+    CHIP_ERROR TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -37512,7 +36024,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_14()
+    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37543,7 +36055,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_15()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_12()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -37551,7 +36063,7 @@ class Test_TC_MF_1_5 : public TestCommandBridge {
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_16()
+    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_13()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
@@ -37624,60 +36136,48 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
             err = TestWaitForPixitCommWin18010_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Wait for PIXIT_COMM_WIN(180) + 10\n");
-            err = TestWaitForPixitCommWin18010_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Commission from beta\n");
+            err = TestCommissionFromBeta_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Wait for PIXIT_COMM_WIN(180) + 10\n");
-            err = TestWaitForPixitCommWin18010_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH_CR1 opens a commissioning window on DUT_CE\n");
+            err = TestThCr1OpensACommissioningWindowOnDutCe_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Wait for PIXIT_COMM_WIN(180) + 10\n");
-            err = TestWaitForPixitCommWin18010_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : TH_CR1 revokes the commissioning window on DUT_CE\n");
+            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_7();
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : Commission from beta\n");
             err = TestCommissionFromBeta_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : TH_CR1 opens a commissioning window on DUT_CE\n");
-            err = TestThCr1OpensACommissioningWindowOnDutCe_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : TH_CR1 revokes the commissioning window on DUT_CE\n");
+            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH_CR1 revokes the commissioning window on DUT_CE\n");
-            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE\n");
+            err = TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Commission from beta\n");
-            err = TestCommissionFromBeta_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : TH_CR1 read the mandatory attribute NodeLabel of DUT_CE\n");
+            err = TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : TH_CR1 revokes the commissioning window on DUT_CE\n");
-            err = TestThCr1RevokesTheCommissioningWindowOnDutCe_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : TH_CR1 opens a commissioning window on DUT_CE\n");
+            err = TestThCr1OpensACommissioningWindowOnDutCe_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : TH_CR1 writes the mandatory attribute NodeLabel of DUT_CE\n");
-            err = TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Commission from beta\n");
+            err = TestCommissionFromBeta_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : TH_CR1 read the mandatory attribute NodeLabel of DUT_CE\n");
-            err = TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : TH_CR2 starts a commissioning process on DUT_CE\n");
+            err = TestThCr2StartsACommissioningProcessOnDutCe_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : TH_CR1 opens a commissioning window on DUT_CE\n");
-            err = TestThCr1OpensACommissioningWindowOnDutCe_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Commission from beta\n");
-            err = TestCommissionFromBeta_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : TH_CR2 starts a commissioning process on DUT_CE\n");
-            err = TestThCr2StartsACommissioningProcessOnDutCe_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : TH_CR3 starts a commissioning process with DUT_CE\n");
-            err = TestThCr3StartsACommissioningProcessWithDutCe_18();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : TH_CR3 starts a commissioning process with DUT_CE\n");
+            err = TestThCr3StartsACommissioningProcessWithDutCe_15();
             break;
         }
 
@@ -37706,7 +36206,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -37718,16 +36218,16 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -37736,15 +36236,6 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         }
@@ -37757,7 +36248,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 19;
+    const uint16_t mTestCount = 16;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<uint16_t> mTimeout;
@@ -37814,32 +36305,11 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
     CHIP_ERROR TestWaitForPixitCommWin18010_4()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
+        value.ms = 190000UL;
         return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestWaitForPixitCommWin18010_5()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForPixitCommWin18010_6()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForPixitCommWin18010_7()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 28000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestCommissionFromBeta_8()
+    CHIP_ERROR TestCommissionFromBeta_5()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -37847,7 +36317,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_9()
+    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37869,7 +36339,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_10()
+    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37888,7 +36358,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCommissionFromBeta_11()
+    CHIP_ERROR TestCommissionFromBeta_8()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -37896,7 +36366,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_12()
+    CHIP_ERROR TestThCr1RevokesTheCommissioningWindowOnDutCe_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37914,7 +36384,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_13()
+    CHIP_ERROR TestThCr1WritesTheMandatoryAttributeNodeLabelOfDutCe_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -37934,7 +36404,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_14()
+    CHIP_ERROR TestThCr1ReadTheMandatoryAttributeNodeLabelOfDutCe_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -37956,7 +36426,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_15()
+    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -37978,7 +36448,7 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCommissionFromBeta_16()
+    CHIP_ERROR TestCommissionFromBeta_13()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -37986,14 +36456,14 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr2StartsACommissioningProcessOnDutCe_17()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessOnDutCe_14()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
         return WaitForCommissionee("beta", value);
     }
 
-    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_18()
+    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_15()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
@@ -38002,11 +36472,11 @@ class Test_TC_MF_1_6 : public TestCommandBridge {
     }
 };
 
-class Test_TC_MF_1_15 : public TestCommandBridge {
+class Test_TC_MF_1_9 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_MF_1_15()
-        : TestCommandBridge("Test_TC_MF_1_15")
+    Test_TC_MF_1_9()
+        : TestCommandBridge("Test_TC_MF_1_9")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -38017,10 +36487,11 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
         AddArgument("payload", &mPayload);
+        AddArgument("payload2", &mPayload2);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_MF_1_15() {}
+    ~Test_TC_MF_1_9() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -38028,11 +36499,11 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MF_1_15\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MF_1_9\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MF_1_15\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MF_1_9\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -38053,92 +36524,117 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
             err = TestThCr1StartsACommissioningProcessWithDutCe_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH_CR1 opens a commissioning window on DUT_CE\n");
-            err = TestThCr1OpensACommissioningWindowOnDutCe_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH_CR1 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr1OpensANewCommissioningWindowOnDutCe_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Commission from gamma\n");
-            err = TestCommissionFromGamma_3();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : TH_CR3 starts a commissioning process with DUT_CE\n");
-            err = TestThCr3StartsACommissioningProcessWithDutCe_4();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : TH_CR1 opens a commissioning window on DUT_CE\n");
-            err = TestThCr1OpensACommissioningWindowOnDutCe_5();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Commission from beta\n");
-            err = TestCommissionFromBeta_6();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : TH_CR2 starts a commissioning process with DUT_CE\n");
-            err = TestThCr2StartsACommissioningProcessWithDutCe_7();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : TH_CR1 opens a commissioning window on DUT_CE\n");
-            err = TestThCr1OpensACommissioningWindowOnDutCe_8();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : TH_CR1 opens a new commissioning window on DUT_CE\n");
-            err = TestThCr1OpensANewCommissioningWindowOnDutCe_9();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH_CR1 reads the list of Fabrics on DUT_CE\n");
-            err = TestThCr1ReadsTheListOfFabricsOnDutCe_10();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 10 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_11();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 11 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_12();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 12 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_13();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 13 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_14();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : TH_CR1 re-opens new commissioning window on DUT_CE\n");
-            err = TestThCr1ReOpensNewCommissioningWindowOnDutCe_15();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 15 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : TH_CR3 opens a new commissioning window on DUT_CE\n");
-            err = TestThCr3OpensANewCommissioningWindowOnDutCe_16();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : TH_CR1 reads the list of Fabrics on DUT_CE\n");
-            err = TestThCr1ReadsTheListOfFabricsOnDutCe_17();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 17 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_18();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_19();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 19 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_19();
             break;
         case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_20();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 20 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_20();
             break;
         case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
-            err = TestWaitForTheExpirationOfPixitCommWinSeconds_21();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 21 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_21();
             break;
         case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : TH_CR1 opens a new commissioning window on DUT_CE\n");
-            err = TestThCr1OpensANewCommissioningWindowOnDutCe_22();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_22();
             break;
         case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : TH_CR2 opens a new commissioning window on DUT_CE\n");
-            err = TestThCr2OpensANewCommissioningWindowOnDutCe_23();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 23 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : TH_CR3 starts a commissioning process with DUT_CE\n");
+            err = TestThCr3StartsACommissioningProcessWithDutCe_24();
             break;
         }
 
@@ -38161,79 +36657,82 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
         }
 
         // Go on to the next test.
         ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(500)); }
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(700)); }
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 24;
+    const uint16_t mTestCount = 25;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<uint16_t> mTimeout;
@@ -38243,6 +36742,7 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mDiscriminator;
     chip::Optional<chip::CharSpan> mPayload;
+    chip::Optional<chip::CharSpan> mPayload2;
 
     CHIP_ERROR TestRebootTargetDevice_0()
     {
@@ -38257,7 +36757,7 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_2()
+    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
@@ -38265,394 +36765,227 @@ class Test_TC_MF_1_15 : public TestCommandBridge {
                                                                                                             queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
         params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        [cluster openBasicCommissioningWindowWithParams:params
-                                      completionHandler:^(NSError * _Nullable err) {
-                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
+        params.pakeVerifier =
+            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
+                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
+                                   length:97];
+        params.discriminator = mDiscriminator.HasValue() ? [NSNumber numberWithUnsignedShort:mDiscriminator.Value()]
+                                                         : [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(@"TH_CR1 opens a new commissioning window on DUT_CE Error: %@", err);
 
-                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                          NextTest();
-                                      }];
+                                     NextTest();
+                                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCommissionFromGamma_3()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_3()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
-        value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
-        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
-        return PairWithCode("gamma", value);
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_4()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_4()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
-        return WaitForCommissionee("gamma", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_5()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_5()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        [cluster openBasicCommissioningWindowWithParams:params
-                                      completionHandler:^(NSError * _Nullable err) {
-                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
-
-                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                          NextTest();
-                                      }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestCommissionFromBeta_6()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_6()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
-        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
         return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_7()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_7()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
         value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
-        return WaitForCommissionee("beta", value);
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_8()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_8()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        [cluster openBasicCommissioningWindowWithParams:params
-                                      completionHandler:^(NSError * _Nullable err) {
-                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
-
-                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                          NextTest();
-                                      }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_9()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_9()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        params.pakeVerifier =
-            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
-                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
-                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
-                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
-                                   length:97];
-        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
-        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
-        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
-        [cluster openCommissioningWindowWithParams:params
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(@"TH_CR1 opens a new commissioning window on DUT_CE Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
-                                     NextTest();
-                                 }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1ReadsTheListOfFabricsOnDutCe_10()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_10()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = [NSNumber numberWithBool:false];
-        [cluster readAttributeFabricsWithParams:params
-                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-                                  NSLog(@"TH_CR1 reads the list of Fabrics on DUT_CE Error: %@", err);
-
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                  {
-                                      id actualValue = value;
-                                      VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(3)));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @""));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[1]).label, @""));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[2]).label, @""));
-                                  }
-
-                                  VerifyOrReturn(CheckConstraintType("fabrics", "", "list"));
-                                  NextTest();
-                              }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_11()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_11()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_12()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_12()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_13()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_13()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_14()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_14()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 18000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1ReOpensNewCommissioningWindowOnDutCe_15()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_15()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        params.pakeVerifier =
-            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
-                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
-                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
-                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
-                                   length:97];
-        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
-        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
-        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
-        [cluster openCommissioningWindowWithParams:params
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(@"TH_CR1 re-opens new commissioning window on DUT_CE Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                     NextTest();
-                                 }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr3OpensANewCommissioningWindowOnDutCe_16()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_16()
     {
-        CHIPDevice * device = GetDevice("gamma");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        params.pakeVerifier =
-            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
-                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
-                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
-                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
-                                   length:97];
-        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
-        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
-        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
-        [cluster openCommissioningWindowWithParams:params
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(@"TH_CR3 opens a new commissioning window on DUT_CE Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
-                                     NextTest();
-                                 }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1ReadsTheListOfFabricsOnDutCe_17()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_17()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = [NSNumber numberWithBool:false];
-        [cluster readAttributeFabricsWithParams:params
-                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-                                  NSLog(@"TH_CR1 reads the list of Fabrics on DUT_CE Error: %@", err);
-
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                  {
-                                      id actualValue = value;
-                                      VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(3)));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @""));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[1]).label, @""));
-                                      VerifyOrReturn(CheckValueAsString("Label",
-                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[2]).label, @""));
-                                  }
-
-                                  VerifyOrReturn(CheckConstraintType("fabrics", "", "list"));
-                                  NextTest();
-                              }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_18()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_18()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_19()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_19()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_20()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_20()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 54000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_21()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_21()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 18000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_22()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_22()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        params.pakeVerifier =
-            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
-                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
-                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
-                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
-                                   length:97];
-        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
-        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
-        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
-        [cluster openCommissioningWindowWithParams:params
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(@"TH_CR1 opens a new commissioning window on DUT_CE Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                     NextTest();
-                                 }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestThCr2OpensANewCommissioningWindowOnDutCe_23()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_23()
     {
-        CHIPDevice * device = GetDevice("beta");
-        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
-        params.pakeVerifier =
-            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
-                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
-                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
-                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
-                                   length:97];
-        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
-        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
-        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
-        [cluster openCommissioningWindowWithParams:params
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(@"TH_CR2 opens a new commissioning window on DUT_CE Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
-                                     NextTest();
-                                 }];
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_24()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
+        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+        return PairWithCode("gamma", value);
     }
 };
 
-class OTA_SuccessfulTransfer : public TestCommandBridge {
+class Test_TC_MF_1_10 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    OTA_SuccessfulTransfer()
-        : TestCommandBridge("OTA_SuccessfulTransfer")
+    Test_TC_MF_1_10()
+        : TestCommandBridge("Test_TC_MF_1_10")
         , mTestIndex(0)
     {
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("requestorNodeId", 0, UINT64_MAX, &mRequestorNodeId);
-        AddArgument("providerNodeId", 0, UINT64_MAX, &mProviderNodeId);
-        AddArgument("providerPayload", &mProviderPayload);
-        AddArgument("providerDiscriminator", 0, UINT16_MAX, &mProviderDiscriminator);
-        AddArgument("providerPort", 0, UINT16_MAX, &mProviderPort);
-        AddArgument("providerKvs", &mProviderKvs);
-        AddArgument("otaImageFilePath", &mOtaImageFilePath);
-        AddArgument("rawImageFilePath", &mRawImageFilePath);
-        AddArgument("rawImageContent", &mRawImageContent);
-        AddArgument("downloadImageFilePath", &mDownloadImageFilePath);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+        AddArgument("nodeIdForDuplicateCommissioning", 0, UINT64_MAX, &mNodeIdForDuplicateCommissioning);
+        AddArgument("nodeId2", 0, UINT64_MAX, &mNodeId2);
+        AddArgument("nodeId3", 0, UINT64_MAX, &mNodeId3);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
+        AddArgument("payload", &mPayload);
+        AddArgument("payload2", &mPayload2);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~OTA_SuccessfulTransfer() {}
+    ~Test_TC_MF_1_10() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -38660,11 +36993,11 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: OTA_SuccessfulTransfer\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MF_1_10\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: OTA_SuccessfulTransfer\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MF_1_10\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -38677,54 +37010,131 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Create OTA image\n");
-            err = TestCreateOtaImage_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Reboot target device\n");
+            err = TestRebootTargetDevice_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Start the provider with an image\n");
-            err = TestStartTheProviderWithAnImage_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH_CR1 starts a commissioning process with DUT_CE\n");
+            err = TestThCr1StartsACommissioningProcessWithDutCe_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Commission the provider from alpha\n");
-            err = TestCommissionTheProviderFromAlpha_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH_CR1 opens a commissioning window on DUT_CE\n");
+            err = TestThCr1OpensACommissioningWindowOnDutCe_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Wait for the commissioned provider to be retrieved for alpha\n");
-            err = TestWaitForTheCommissionedProviderToBeRetrievedForAlpha_3();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Install ACL for QueryImage\n");
-            err = TestInstallAclForQueryImage_4();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Stop the requestor\n");
-            err = TestStopTheRequestor_5();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Start the requestor with an OTA download path\n");
-            err = TestStartTheRequestorWithAnOtaDownloadPath_6();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Wait for the commissioned requestor to be retrieved for alpha\n");
-            err = TestWaitForTheCommissionedRequestorToBeRetrievedForAlpha_7();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Send an announce OTA provider command to the requestor\n");
-            err = TestSendAnAnnounceOtaProviderCommandToTheRequestor_8();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Wait for transfer complete message\n");
-            err = TestWaitForTransferCompleteMessage_9();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Compare original file to downloaded file\n");
-            err = TestCompareOriginalFileToDownloadedFile_10();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 10 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_10();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
+        case 11:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 11 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_11();
+            break;
+        case 12:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 12 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_12();
+            break;
+        case 13:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 13 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_13();
+            break;
+        case 14:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_14();
+            break;
+        case 15:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 15 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_15();
+            break;
+        case 16:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_16();
+            break;
+        case 17:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 17 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_17();
+            break;
+        case 18:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_18();
+            break;
+        case 19:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 19 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_19();
+            break;
+        case 20:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 20 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_20();
+            break;
+        case 21:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 21 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_21();
+            break;
+        case 22:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_22();
+            break;
+        case 23:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 23 : TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : TH_CR3 starts a commissioning process with DUT_CE\n");
+            err = TestThCr3StartsACommissioningProcessWithDutCe_24();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
         }
     }
 
@@ -38741,28 +37151,70 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         }
 
@@ -38770,205 +37222,253 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
         ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(700)); }
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 11;
+    const uint16_t mTestCount = 25;
 
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<chip::NodeId> mRequestorNodeId;
-    chip::Optional<chip::NodeId> mProviderNodeId;
-    chip::Optional<chip::CharSpan> mProviderPayload;
-    chip::Optional<uint16_t> mProviderDiscriminator;
-    chip::Optional<uint16_t> mProviderPort;
-    chip::Optional<chip::CharSpan> mProviderKvs;
-    chip::Optional<chip::CharSpan> mOtaImageFilePath;
-    chip::Optional<chip::CharSpan> mRawImageFilePath;
-    chip::Optional<chip::CharSpan> mRawImageContent;
-    chip::Optional<chip::CharSpan> mDownloadImageFilePath;
+    chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<uint16_t> mTimeout;
+    chip::Optional<chip::NodeId> mNodeIdForDuplicateCommissioning;
+    chip::Optional<chip::NodeId> mNodeId2;
+    chip::Optional<chip::NodeId> mNodeId3;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mDiscriminator;
+    chip::Optional<chip::CharSpan> mPayload;
+    chip::Optional<chip::CharSpan> mPayload2;
 
-    CHIP_ERROR TestCreateOtaImage_0()
+    CHIP_ERROR TestRebootTargetDevice_0()
     {
-        chip::app::Clusters::SystemCommands::Commands::CreateOtaImage::Type value;
-        value.otaImageFilePath
-            = mOtaImageFilePath.HasValue() ? mOtaImageFilePath.Value() : chip::Span<const char>("/tmp/otaImage", 13);
-        value.rawImageFilePath
-            = mRawImageFilePath.HasValue() ? mRawImageFilePath.Value() : chip::Span<const char>("/tmp/rawImage", 13);
-        value.rawImageContent
-            = mRawImageContent.HasValue() ? mRawImageContent.Value() : chip::Span<const char>("Have a hootenanny!", 18);
-        return CreateOtaImage("alpha", value);
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
     }
 
-    CHIP_ERROR TestStartTheProviderWithAnImage_1()
+    CHIP_ERROR TestThCr1StartsACommissioningProcessWithDutCe_1()
     {
-        chip::app::Clusters::SystemCommands::Commands::Start::Type value;
-        value.registerKey.Emplace();
-        value.registerKey.Value() = chip::Span<const char>("chip-ota-provider-appgarbage: not in length on purpose", 21);
-        value.discriminator.Emplace();
-        value.discriminator.Value() = mProviderDiscriminator.HasValue() ? mProviderDiscriminator.Value() : 50U;
-        value.port.Emplace();
-        value.port.Value() = mProviderPort.HasValue() ? mProviderPort.Value() : 5560U;
-        value.kvs.Emplace();
-        value.kvs.Value() = mProviderKvs.HasValue() ? mProviderKvs.Value() : chip::Span<const char>("/tmp/chip_kvs_provider", 22);
-        value.filepath.Emplace();
-        value.filepath.Value()
-            = mOtaImageFilePath.HasValue() ? mOtaImageFilePath.Value() : chip::Span<const char>("/tmp/otaImage", 13);
-        return Start("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestCommissionTheProviderFromAlpha_2()
+    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        [cluster openBasicCommissioningWindowWithParams:params
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
+
+                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_3()
     {
         chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
-        value.nodeId = mProviderNodeId.HasValue() ? mProviderNodeId.Value() : 12648430ULL;
-        value.payload
-            = mProviderPayload.HasValue() ? mProviderPayload.Value() : chip::Span<const char>("MT:-24J0IX4122-.548G00", 22);
-        return PairWithCode("alpha", value);
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheCommissionedProviderToBeRetrievedForAlpha_3()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_4()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mProviderNodeId.HasValue() ? mProviderNodeId.Value() : 12648430ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestInstallAclForQueryImage_4()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_5()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccessControl * cluster = [[CHIPTestAccessControl alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-        id aclArgument;
-        {
-            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
-            temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init];
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5];
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2];
-            {
-                NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [NSNumber numberWithUnsignedLongLong:112233ULL];
-                ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = temp_3;
-            }
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil;
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:1];
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_6()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-            temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init];
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:3];
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2];
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil;
-            {
-                NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[CHIPAccessControlClusterTarget alloc] init];
-                ((CHIPAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:41UL];
-                ((CHIPAccessControlClusterTarget *) temp_3[0]).endpoint = nil;
-                ((CHIPAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_7()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-                ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3;
-            }
-            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:1];
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_8()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-            aclArgument = temp_0;
-        }
-        [cluster writeAttributeAclWithValue:aclArgument
-                          completionHandler:^(NSError * _Nullable err) {
-                              NSLog(@"Install ACL for QueryImage Error: %@", err);
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_9()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_10()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-                              NextTest();
-                          }];
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_11()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_12()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestStopTheRequestor_5()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_13()
     {
-        chip::app::Clusters::SystemCommands::Commands::Stop::Type value;
-        return Stop("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestStartTheRequestorWithAnOtaDownloadPath_6()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_14()
     {
-        chip::app::Clusters::SystemCommands::Commands::Start::Type value;
-        value.otaDownloadPath.Emplace();
-        value.otaDownloadPath.Value() = mDownloadImageFilePath.HasValue() ? mDownloadImageFilePath.Value()
-                                                                          : chip::Span<const char>("/tmp/downloadedImage", 20);
-        return Start("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTheCommissionedRequestorToBeRetrievedForAlpha_7()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_15()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mRequestorNodeId.HasValue() ? mRequestorNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestSendAnAnnounceOtaProviderCommandToTheRequestor_8()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_16()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOtaSoftwareUpdateRequestor * cluster = [[CHIPTestOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                         endpoint:0
-                                                                                                            queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-        __auto_type * params = [[CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init];
-        params.providerNodeId = mProviderNodeId.HasValue() ? [NSNumber numberWithUnsignedLongLong:mProviderNodeId.Value()]
-                                                           : [NSNumber numberWithUnsignedLongLong:12648430ULL];
-        params.vendorId = [NSNumber numberWithUnsignedShort:0U];
-        params.announcementReason = [NSNumber numberWithUnsignedChar:0];
-        params.endpoint
-            = mEndpoint.HasValue() ? [NSNumber numberWithUnsignedShort:mEndpoint.Value()] : [NSNumber numberWithUnsignedShort:0U];
-        [cluster announceOtaProviderWithParams:params
-                             completionHandler:^(NSError * _Nullable err) {
-                                 NSLog(@"Send an announce OTA provider command to the requestor Error: %@", err);
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_17()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_18()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-                                 NextTest();
-                             }];
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_19()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_20()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestWaitForTransferCompleteMessage_9()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_21()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMessage::Type value;
-        value.registerKey.Emplace();
-        value.registerKey.Value() = chip::Span<const char>("defaultgarbage: not in length on purpose", 7);
-        value.message = chip::Span<const char>("OTA image downloadedgarbage: not in length on purpose", 20);
-        return WaitForMessage("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
     }
 
-    CHIP_ERROR TestCompareOriginalFileToDownloadedFile_10()
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_22()
     {
-        chip::app::Clusters::SystemCommands::Commands::CompareFiles::Type value;
-        value.file1 = mRawImageFilePath.HasValue() ? mRawImageFilePath.Value() : chip::Span<const char>("/tmp/rawImage", 13);
-        value.file2 = mDownloadImageFilePath.HasValue() ? mDownloadImageFilePath.Value()
-                                                        : chip::Span<const char>("/tmp/downloadedImage", 20);
-        return CompareFiles("alpha", value);
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
+
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCeUsingInvalidSetupCode_23()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload2.HasValue() ? mPayload2.Value() : chip::Span<const char>("MT:0000000000I.0648G00", 22);
+        return PairWithCode("beta", value);
+    }
+
+    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_24()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
+        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:0000000000I31506010", 22);
+        return PairWithCode("gamma", value);
     }
 };
 
-class Test_TC_OCC_1_1 : public TestCommandBridge {
+class Test_TC_MF_1_15 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OCC_1_1()
-        : TestCommandBridge("Test_TC_OCC_1_1")
+    Test_TC_MF_1_15()
+        : TestCommandBridge("Test_TC_MF_1_15")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+        AddArgument("nodeIdForDuplicateCommissioning", 0, UINT64_MAX, &mNodeIdForDuplicateCommissioning);
+        AddArgument("nodeId2", 0, UINT64_MAX, &mNodeId2);
+        AddArgument("nodeId3", 0, UINT64_MAX, &mNodeId3);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator);
+        AddArgument("payload", &mPayload);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_OCC_1_1() {}
+    ~Test_TC_MF_1_15() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -38976,11 +37476,11 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_MF_1_15\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OCC_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_MF_1_15\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -38993,56 +37493,76 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Reboot target device\n");
+            err = TestRebootTargetDevice_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeClusterRevision_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH_CR1 starts a commissioning process with DUT_CE\n");
+            err = TestThCr1StartsACommissioningProcessWithDutCe_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH_CR1 opens a commissioning window on DUT_CE\n");
+            err = TestThCr1OpensACommissioningWindowOnDutCe_2();
             break;
         case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : write the default values to mandatory global attribute: ClusterRevision\n");
-            err = TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Commission from gamma\n");
+            err = TestCommissionFromGamma_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : reads back global attribute: ClusterRevision\n");
-            err = TestReadsBackGlobalAttributeClusterRevision_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : TH_CR3 starts a commissioning process with DUT_CE\n");
+            err = TestThCr3StartsACommissioningProcessWithDutCe_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
-            err = TestReadTheGlobalAttributeAttributeList_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : TH_CR1 opens a commissioning window on DUT_CE\n");
+            err = TestThCr1OpensACommissioningWindowOnDutCe_5();
             break;
         case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
-                "supported events.\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Commission from beta\n");
+            err = TestCommissionFromBeta_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read the global attribute: AcceptedCommandList\n");
-            err = TestReadTheGlobalAttributeAcceptedCommandList_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : TH_CR2 starts a commissioning process with DUT_CE\n");
+            err = TestThCr2StartsACommissioningProcessWithDutCe_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : TH_CR1 opens a commissioning window on DUT_CE\n");
+            err = TestThCr1OpensACommissioningWindowOnDutCe_8();
             break;
         case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : Read FeatureMap attribute from the DUT and Verify that the DUT response\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : TH_CR1 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr1OpensANewCommissioningWindowOnDutCe_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH_CR1 reads the list of Fabrics on DUT_CE\n");
+            err = TestThCr1ReadsTheListOfFabricsOnDutCe_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
+            err = TestWaitForTheExpirationOfPixitCommWinSeconds_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : TH_CR1 re-opens new commissioning window on DUT_CE\n");
+            err = TestThCr1ReOpensNewCommissioningWindowOnDutCe_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : TH_CR3 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr3OpensANewCommissioningWindowOnDutCe_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : TH_CR1 reads the list of Fabrics on DUT_CE\n");
+            err = TestThCr1ReadsTheListOfFabricsOnDutCe_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Wait for the expiration of PIXIT_COMM_WIN seconds\n");
+            err = TestWaitForTheExpirationOfPixitCommWinSeconds_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : TH_CR1 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr1OpensANewCommissioningWindowOnDutCe_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : TH_CR2 opens a new commissioning window on DUT_CE\n");
+            err = TestThCr2OpensANewCommissioningWindowOnDutCe_17();
             break;
         }
 
@@ -39065,7 +37585,7 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -39083,220 +37603,420 @@ class Test_TC_OCC_1_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
         }
 
         // Go on to the next test.
         ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+    chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(500)); }
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 18;
 
     chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
+    chip::Optional<chip::NodeId> mNodeIdForDuplicateCommissioning;
+    chip::Optional<chip::NodeId> mNodeId2;
+    chip::Optional<chip::NodeId> mNodeId3;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mDiscriminator;
+    chip::Optional<chip::CharSpan> mPayload;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestRebootTargetDevice_0()
+    {
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
+
+    CHIP_ERROR TestThCr1StartsACommissioningProcessWithDutCe_1()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
+    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        [cluster openBasicCommissioningWindowWithParams:params
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
-            }
+                                          NextTest();
+                                      }];
 
-            NextTest();
-        }];
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCommissionFromGamma_3()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
+        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+        return PairWithCode("gamma", value);
+    }
+
+    CHIP_ERROR TestThCr3StartsACommissioningProcessWithDutCe_4()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL;
+        return WaitForCommissionee("gamma", value);
+    }
+
+    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        [cluster openBasicCommissioningWindowWithParams:params
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
+
+                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                          NextTest();
+                                      }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
+    CHIP_ERROR TestCommissionFromBeta_6()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        value.payload = mPayload.HasValue() ? mPayload.Value() : chip::Span<const char>("MT:-24J0AFN00KA0648G00", 22);
+        return PairWithCode("beta", value);
+    }
+
+    CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_7()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
+        return WaitForCommissionee("beta", value);
+    }
+
+    CHIP_ERROR TestThCr1OpensACommissioningWindowOnDutCe_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        [cluster openBasicCommissioningWindowWithParams:params
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"TH_CR1 opens a commissioning window on DUT_CE Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
-            NextTest();
-        }];
+                                          NextTest();
+                                      }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3()
+    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id clusterRevisionArgument;
-        clusterRevisionArgument = [NSNumber numberWithUnsignedShort:3U];
-        [cluster
-            writeAttributeClusterRevisionWithValue:clusterRevisionArgument
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        params.pakeVerifier =
+            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
+                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
+                                   length:97];
+        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params
                                  completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(
-                                         @"write the default values to mandatory global attribute: ClusterRevision Error: %@", err);
+                                     NSLog(@"TH_CR1 opens a new commissioning window on DUT_CE Error: %@", err);
 
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
                                      NextTest();
                                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackGlobalAttributeClusterRevision_4()
+    CHIP_ERROR TestThCr1ReadsTheListOfFabricsOnDutCe_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"reads back global attribute: ClusterRevision Error: %@", err);
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = [NSNumber numberWithBool:false];
+        [cluster readAttributeFabricsWithParams:params
+                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+                                  NSLog(@"TH_CR1 reads the list of Fabrics on DUT_CE Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
-            }
+                                  {
+                                      id actualValue = value;
+                                      VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(3)));
+                                      VerifyOrReturn(CheckValueAsString("Label",
+                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @""));
+                                      VerifyOrReturn(CheckValueAsString("Label",
+                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[1]).label, @""));
+                                      VerifyOrReturn(CheckValueAsString("Label",
+                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[2]).label, @""));
+                                  }
 
-            NextTest();
-        }];
+                                  VerifyOrReturn(CheckConstraintType("fabrics", "", "list"));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_5()
+    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_11()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 180000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR TestThCr1ReOpensNewCommissioningWindowOnDutCe_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        params.pakeVerifier =
+            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
+                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
+                                   length:97];
+        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(@"TH_CR1 re-opens new commissioning window on DUT_CE Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
-            NextTest();
-        }];
+                                     NextTest();
+                                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6()
+    CHIP_ERROR TestThCr3OpensANewCommissioningWindowOnDutCe_13()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("gamma");
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        params.pakeVerifier =
+            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
+                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
+                                   length:97];
+        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(@"TH_CR3 opens a new commissioning window on DUT_CE Error: %@", err);
+
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
+                                     NextTest();
+                                 }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_7()
+    CHIP_ERROR TestThCr1ReadsTheListOfFabricsOnDutCe_14()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AcceptedCommandList Error: %@", err);
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = [NSNumber numberWithBool:false];
+        [cluster readAttributeFabricsWithParams:params
+                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+                                  NSLog(@"TH_CR1 reads the list of Fabrics on DUT_CE Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
-            NextTest();
-        }];
+                                  {
+                                      id actualValue = value;
+                                      VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(3)));
+                                      VerifyOrReturn(CheckValueAsString("Label",
+                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @""));
+                                      VerifyOrReturn(CheckValueAsString("Label",
+                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[1]).label, @""));
+                                      VerifyOrReturn(CheckValueAsString("Label",
+                                          ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[2]).label, @""));
+                                  }
+
+                                  VerifyOrReturn(CheckConstraintType("fabrics", "", "list"));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_8()
+    CHIP_ERROR TestWaitForTheExpirationOfPixitCommWinSeconds_15()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 180000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR TestThCr1OpensANewCommissioningWindowOnDutCe_16()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: GeneratedCommandList Error: %@", err);
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        params.pakeVerifier =
+            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
+                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
+                                   length:97];
+        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(@"TH_CR1 opens a new commissioning window on DUT_CE Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
-            NextTest();
-        }];
+                                     NextTest();
+                                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9()
+    CHIP_ERROR TestThCr2OpensANewCommissioningWindowOnDutCe_17()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter '0' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("0garbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("beta");
+        CHIPTestAdministratorCommissioning * cluster = [[CHIPTestAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:180U];
+        params.pakeVerifier =
+            [[NSData alloc] initWithBytes:"\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#"
+                                          "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+"
+                                          "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326"
+                                          "\360,D4\362\275\322z\244\371\316\247\015s\216L"
+                                   length:97];
+        params.discriminator = [NSNumber numberWithUnsignedShort:3840U];
+        params.iterations = [NSNumber numberWithUnsignedInt:1000UL];
+        params.salt = [[NSData alloc] initWithBytes:"SPAKE2P Key Salt" length:16];
+        [cluster openCommissioningWindowWithParams:params
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(@"TH_CR2 opens a new commissioning window on DUT_CE Error: %@", err);
+
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
+                                     NextTest();
+                                 }];
+
+        return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_OCC_2_1 : public TestCommandBridge {
+class OTA_SuccessfulTransfer : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OCC_2_1()
-        : TestCommandBridge("Test_TC_OCC_2_1")
+    OTA_SuccessfulTransfer()
+        : TestCommandBridge("OTA_SuccessfulTransfer")
         , mTestIndex(0)
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("requestorNodeId", 0, UINT64_MAX, &mRequestorNodeId);
+        AddArgument("providerNodeId", 0, UINT64_MAX, &mProviderNodeId);
+        AddArgument("providerPayload", &mProviderPayload);
+        AddArgument("providerDiscriminator", 0, UINT16_MAX, &mProviderDiscriminator);
+        AddArgument("providerPort", 0, UINT16_MAX, &mProviderPort);
+        AddArgument("providerKvs", &mProviderKvs);
+        AddArgument("otaImageFilePath", &mOtaImageFilePath);
+        AddArgument("rawImageFilePath", &mRawImageFilePath);
+        AddArgument("rawImageContent", &mRawImageContent);
+        AddArgument("downloadImageFilePath", &mDownloadImageFilePath);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_OCC_2_1() {}
+    ~OTA_SuccessfulTransfer() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -39304,11 +38024,11 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: OTA_SuccessfulTransfer\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OCC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: OTA_SuccessfulTransfer\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -39321,47 +38041,48 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Create OTA image\n");
+            err = TestCreateOtaImage_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads mandatory attribute constrains: Occupancy\n");
-            err = TestReadsMandatoryAttributeConstrainsOccupancy_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Start the provider with an image\n");
+            err = TestStartTheProviderWithAnImage_1();
             break;
         case 2:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 2 : Writes the respective default value to mandatory attribute: Occupancy\n");
-            err = TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancy_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Commission the provider from alpha\n");
+            err = TestCommissionTheProviderFromAlpha_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads back mandatory attribute: Occupancy\n");
-            err = TestReadsBackMandatoryAttributeOccupancy_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Wait for the commissioned provider to be retrieved for alpha\n");
+            err = TestWaitForTheCommissionedProviderToBeRetrievedForAlpha_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads mandatory attribute constrains: OccupancySensorType\n");
-            err = TestReadsMandatoryAttributeConstrainsOccupancySensorType_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Install ACL for QueryImage\n");
+            err = TestInstallAclForQueryImage_4();
             break;
         case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : Writes the respective default value to mandatory attribute: OccupancySensorType\n");
-            err = TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorType_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Stop the requestor\n");
+            err = TestStopTheRequestor_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Reads back mandatory attribute: OccupancySensorType\n");
-            err = TestReadsBackMandatoryAttributeOccupancySensorType_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Start the requestor with an OTA download path\n");
+            err = TestStartTheRequestorWithAnOtaDownloadPath_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads mandatory attribute constrains: OccupancySensorTypeBitmap\n");
-            err = TestReadsMandatoryAttributeConstrainsOccupancySensorTypeBitmap_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Wait for the commissioned requestor to be retrieved for alpha\n");
+            err = TestWaitForTheCommissionedRequestorToBeRetrievedForAlpha_7();
             break;
         case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : Writes the respective default value to mandatory attribute: OccupancySensorTypeBitmap\n");
-            err = TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorTypeBitmap_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Send an announce OTA provider command to the requestor\n");
+            err = TestSendAnAnnounceOtaProviderCommandToTheRequestor_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Reads back mandatory attribute: OccupancySensorTypeBitmap\n");
-            err = TestReadsBackMandatoryAttributeOccupancySensorTypeBitmap_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Wait for transfer complete message\n");
+            err = TestWaitForTransferCompleteMessage_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Compare original file to downloaded file\n");
+            err = TestCompareOriginalFileToDownloadedFile_10();
             break;
         }
 
@@ -39381,7 +38102,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -39390,7 +38111,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -39399,11 +38120,14 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -39417,250 +38141,188 @@ class Test_TC_OCC_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 11;
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<chip::NodeId> mRequestorNodeId;
+    chip::Optional<chip::NodeId> mProviderNodeId;
+    chip::Optional<chip::CharSpan> mProviderPayload;
+    chip::Optional<uint16_t> mProviderDiscriminator;
+    chip::Optional<uint16_t> mProviderPort;
+    chip::Optional<chip::CharSpan> mProviderKvs;
+    chip::Optional<chip::CharSpan> mOtaImageFilePath;
+    chip::Optional<chip::CharSpan> mRawImageFilePath;
+    chip::Optional<chip::CharSpan> mRawImageContent;
+    chip::Optional<chip::CharSpan> mDownloadImageFilePath;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestCreateOtaImage_0()
+    {
+        chip::app::Clusters::SystemCommands::Commands::CreateOtaImage::Type value;
+        value.otaImageFilePath
+            = mOtaImageFilePath.HasValue() ? mOtaImageFilePath.Value() : chip::Span<const char>("/tmp/otaImage", 13);
+        value.rawImageFilePath
+            = mRawImageFilePath.HasValue() ? mRawImageFilePath.Value() : chip::Span<const char>("/tmp/rawImage", 13);
+        value.rawImageContent
+            = mRawImageContent.HasValue() ? mRawImageContent.Value() : chip::Span<const char>("Have a hootenanny!", 18);
+        return CreateOtaImage("alpha", value);
+    }
+
+    CHIP_ERROR TestStartTheProviderWithAnImage_1()
+    {
+        chip::app::Clusters::SystemCommands::Commands::Start::Type value;
+        value.registerKey.Emplace();
+        value.registerKey.Value() = chip::Span<const char>("chip-ota-provider-appgarbage: not in length on purpose", 21);
+        value.discriminator.Emplace();
+        value.discriminator.Value() = mProviderDiscriminator.HasValue() ? mProviderDiscriminator.Value() : 50U;
+        value.port.Emplace();
+        value.port.Value() = mProviderPort.HasValue() ? mProviderPort.Value() : 5560U;
+        value.kvs.Emplace();
+        value.kvs.Value() = mProviderKvs.HasValue() ? mProviderKvs.Value() : chip::Span<const char>("/tmp/chip_kvs_provider", 22);
+        value.filepath.Emplace();
+        value.filepath.Value()
+            = mOtaImageFilePath.HasValue() ? mOtaImageFilePath.Value() : chip::Span<const char>("/tmp/otaImage", 13);
+        return Start("alpha", value);
+    }
+
+    CHIP_ERROR TestCommissionTheProviderFromAlpha_2()
+    {
+        chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
+        value.nodeId = mProviderNodeId.HasValue() ? mProviderNodeId.Value() : 12648430ULL;
+        value.payload
+            = mProviderPayload.HasValue() ? mProviderPayload.Value() : chip::Span<const char>("MT:-24J0IX4122-.548G00", 22);
+        return PairWithCode("alpha", value);
+    }
+
+    CHIP_ERROR TestWaitForTheCommissionedProviderToBeRetrievedForAlpha_3()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        value.nodeId = mProviderNodeId.HasValue() ? mProviderNodeId.Value() : 12648430ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancy_1()
+    CHIP_ERROR TestInstallAclForQueryImage_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestAccessControl * cluster = [[CHIPTestAccessControl alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads mandatory attribute constrains: Occupancy Error: %@", err);
+        id aclArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init];
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5];
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2];
+            {
+                NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
+                temp_3[0] = [NSNumber numberWithUnsignedLongLong:112233ULL];
+                ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = temp_3;
+            }
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil;
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:1];
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init];
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:3];
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2];
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil;
+            {
+                NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
+                temp_3[0] = [[CHIPAccessControlClusterTarget alloc] init];
+                ((CHIPAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:41UL];
+                ((CHIPAccessControlClusterTarget *) temp_3[0]).endpoint = nil;
+                ((CHIPAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
 
-            VerifyOrReturn(CheckConstraintType("occupancy", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancy", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancy", [value unsignedCharValue], 1));
+                ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3;
             }
+            ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:1];
 
-            NextTest();
-        }];
+            aclArgument = temp_0;
+        }
+        [cluster writeAttributeAclWithValue:aclArgument
+                          completionHandler:^(NSError * _Nullable err) {
+                              NSLog(@"Install ACL for QueryImage Error: %@", err);
+
+                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                              NextTest();
+                          }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancy_2()
+    CHIP_ERROR TestStopTheRequestor_5()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        chip::app::Clusters::SystemCommands::Commands::Stop::Type value;
+        return Stop("alpha", value);
+    }
 
-        id occupancyArgument;
-        occupancyArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeOccupancyWithValue:occupancyArgument
-                                completionHandler:^(NSError * _Nullable err) {
-                                    NSLog(@"Writes the respective default value to mandatory attribute: Occupancy Error: %@", err);
-
-                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                    NextTest();
-                                }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadsBackMandatoryAttributeOccupancy_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads back mandatory attribute: Occupancy Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("occupancy", actualValue, 0));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancySensorType_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads mandatory attribute constrains: OccupancySensorType Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("occupancySensorType", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancySensorType", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancySensorType", [value unsignedCharValue], 3));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorType_5()
+    CHIP_ERROR TestStartTheRequestorWithAnOtaDownloadPath_6()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id occupancySensorTypeArgument;
-        occupancySensorTypeArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeOccupancySensorTypeWithValue:occupancySensorTypeArgument
-                                          completionHandler:^(NSError * _Nullable err) {
-                                              NSLog(@"Writes the respective default value to mandatory attribute: "
-                                                    @"OccupancySensorType Error: %@",
-                                                  err);
-
-                                              VerifyOrReturn(
-                                                  CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                              NextTest();
-                                          }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::SystemCommands::Commands::Start::Type value;
+        value.otaDownloadPath.Emplace();
+        value.otaDownloadPath.Value() = mDownloadImageFilePath.HasValue() ? mDownloadImageFilePath.Value()
+                                                                          : chip::Span<const char>("/tmp/downloadedImage", 20);
+        return Start("alpha", value);
     }
 
-    CHIP_ERROR TestReadsBackMandatoryAttributeOccupancySensorType_6()
+    CHIP_ERROR TestWaitForTheCommissionedRequestorToBeRetrievedForAlpha_7()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads back mandatory attribute: OccupancySensorType Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("occupancy sensor type", actualValue, 0));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mRequestorNodeId.HasValue() ? mRequestorNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancySensorTypeBitmap_7()
+    CHIP_ERROR TestSendAnAnnounceOtaProviderCommandToTheRequestor_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
+        CHIPTestOtaSoftwareUpdateRequestor * cluster = [[CHIPTestOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                         endpoint:0
+                                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeOccupancySensorTypeBitmapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Reads mandatory attribute constrains: OccupancySensorTypeBitmap Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init];
+        params.providerNodeId = mProviderNodeId.HasValue() ? [NSNumber numberWithUnsignedLongLong:mProviderNodeId.Value()]
+                                                           : [NSNumber numberWithUnsignedLongLong:12648430ULL];
+        params.vendorId = [NSNumber numberWithUnsignedShort:0U];
+        params.announcementReason = [NSNumber numberWithUnsignedChar:0];
+        params.endpoint
+            = mEndpoint.HasValue() ? [NSNumber numberWithUnsignedShort:mEndpoint.Value()] : [NSNumber numberWithUnsignedShort:0U];
+        [cluster announceOtaProviderWithParams:params
+                             completionHandler:^(NSError * _Nullable err) {
+                                 NSLog(@"Send an announce OTA provider command to the requestor Error: %@", err);
 
-                VerifyOrReturn(CheckConstraintType("occupancySensorTypeBitmap", "", "map8"));
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancySensorTypeBitmap", [value unsignedCharValue], 1));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancySensorTypeBitmap", [value unsignedCharValue], 7));
-                }
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                NextTest();
-            }];
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorTypeBitmap_8()
+    CHIP_ERROR TestWaitForTransferCompleteMessage_9()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id occupancySensorTypeBitmapArgument;
-        occupancySensorTypeBitmapArgument = [NSNumber numberWithUnsignedChar:1];
-        [cluster writeAttributeOccupancySensorTypeBitmapWithValue:occupancySensorTypeBitmapArgument
-                                                completionHandler:^(NSError * _Nullable err) {
-                                                    NSLog(@"Writes the respective default value to mandatory attribute: "
-                                                          @"OccupancySensorTypeBitmap Error: %@",
-                                                        err);
-
-                                                    VerifyOrReturn(CheckValue(
-                                                        "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                    NextTest();
-                                                }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMessage::Type value;
+        value.registerKey.Emplace();
+        value.registerKey.Value() = chip::Span<const char>("defaultgarbage: not in length on purpose", 7);
+        value.message = chip::Span<const char>("OTA image downloadedgarbage: not in length on purpose", 20);
+        return WaitForMessage("alpha", value);
     }
 
-    CHIP_ERROR TestReadsBackMandatoryAttributeOccupancySensorTypeBitmap_9()
+    CHIP_ERROR TestCompareOriginalFileToDownloadedFile_10()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
-                                                                                     endpoint:1
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeOccupancySensorTypeBitmapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Reads back mandatory attribute: OccupancySensorTypeBitmap Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("occupancy sensor type bitmap", actualValue, 1));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::SystemCommands::Commands::CompareFiles::Type value;
+        value.file1 = mRawImageFilePath.HasValue() ? mRawImageFilePath.Value() : chip::Span<const char>("/tmp/rawImage", 13);
+        value.file2 = mDownloadImageFilePath.HasValue() ? mDownloadImageFilePath.Value()
+                                                        : chip::Span<const char>("/tmp/downloadedImage", 20);
+        return CompareFiles("alpha", value);
     }
 };
 
-class Test_TC_OO_1_1 : public TestCommandBridge {
+class Test_TC_OCC_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OO_1_1()
-        : TestCommandBridge("Test_TC_OO_1_1")
+    Test_TC_OCC_1_1()
+        : TestCommandBridge("Test_TC_OCC_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -39670,7 +38332,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_OO_1_1() {}
+    ~Test_TC_OCC_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -39678,11 +38340,11 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OCC_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -39703,42 +38365,48 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
             err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheGlobalAttributeAttributeList_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
             break;
         case 3:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : write the default values to mandatory global attribute: ClusterRevision\n");
+            err = TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : reads back global attribute: ClusterRevision\n");
+            err = TestReadsBackGlobalAttributeClusterRevision_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
+            err = TestReadTheGlobalAttributeAttributeList_5();
+            break;
+        case 6:
             ChipLogProgress(chipTool,
-                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                " ***** Test Step 6 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
                 "supported events.\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
-            if (ShouldSkip("OO_LT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read the global attribute: AcceptedCommandList\n");
+            err = TestReadTheGlobalAttributeAcceptedCommandList_7();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_8();
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : read the optional global attribute: FeatureMap\n");
-            if (ShouldSkip("OO_LT")) {
+        case 9:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : Read FeatureMap attribute from the DUT and Verify that the DUT response\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheOptionalGlobalAttributeFeatureMap_6();
+            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9();
             break;
         }
 
@@ -39761,7 +38429,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -39772,6 +38440,15 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -39785,7 +38462,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    const uint16_t mTestCount = 10;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -39802,7 +38479,9 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
     CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
@@ -39812,9 +38491,28 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
             }
 
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
             VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
@@ -39822,27 +38520,66 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
+    CHIP_ERROR TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
+        id clusterRevisionArgument;
+        clusterRevisionArgument = [NSNumber numberWithUnsignedShort:3U];
+        [cluster
+            writeAttributeClusterRevisionWithValue:clusterRevisionArgument
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(
+                                         @"write the default values to mandatory global attribute: ClusterRevision Error: %@", err);
+
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                     NextTest();
+                                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackGlobalAttributeClusterRevision_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"reads back global attribute: ClusterRevision Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(5)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 16384UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 16385UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 16386UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 16387UL));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
             }
 
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
             VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
@@ -39850,7 +38587,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -39859,10 +38596,12 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -39870,17 +38609,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(6)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 64UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 65UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 66UL));
-            }
-
             VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
@@ -39888,10 +38616,12 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -39899,11 +38629,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
-            }
-
             VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
@@ -39911,35 +38636,21 @@ class Test_TC_OO_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalGlobalAttributeFeatureMap_6()
+    CHIP_ERROR TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional global attribute: FeatureMap Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL));
-            }
-
-            VerifyOrReturn(CheckConstraintType("featureMap", "", "map32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter '0' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("0garbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 };
 
-class Test_TC_OO_2_1 : public TestCommandBridge {
+class Test_TC_OCC_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OO_2_1()
-        : TestCommandBridge("Test_TC_OO_2_1")
+    Test_TC_OCC_2_1()
+        : TestCommandBridge("Test_TC_OCC_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -39949,7 +38660,7 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_OO_2_1() {}
+    ~Test_TC_OCC_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -39957,11 +38668,11 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OCC_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -39978,329 +38689,199 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: OnOff\n");
-            err = TestReadTheMandatoryAttributeOnOff_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads mandatory attribute constrains: Occupancy\n");
+            err = TestReadsMandatoryAttributeConstrainsOccupancy_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read LT attribute: GlobalSceneControl\n");
-            err = TestReadLtAttributeGlobalSceneControl_2();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 2 : Writes the respective default value to mandatory attribute: Occupancy\n");
+            err = TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancy_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : read LT attribute: OnTime\n");
-            err = TestReadLtAttributeOnTime_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads back mandatory attribute: Occupancy\n");
+            err = TestReadsBackMandatoryAttributeOccupancy_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : read LT attribute: OffWaitTime\n");
-            err = TestReadLtAttributeOffWaitTime_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads mandatory attribute: OccupancySensorType\n");
+            err = TestReadsMandatoryAttributeOccupancySensorType_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : read LT attribute: StartUpOnOff\n");
-            err = TestReadLtAttributeStartUpOnOff_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Reads mandatory attribute constrains: OccupancySensorType\n");
+            err = TestReadsMandatoryAttributeConstrainsOccupancySensorType_5();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 6:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : Writes the respective default value to mandatory attribute: OccupancySensorType\n");
+            err = TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorType_6();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads back mandatory attribute: OccupancySensorType\n");
+            err = TestReadsBackMandatoryAttributeOccupancySensorType_7();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Reads mandatory attribute constrains: OccupancySensorTypeBitmap\n");
+            err = TestReadsMandatoryAttributeConstrainsOccupancySensorTypeBitmap_8();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 9:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 9 : Writes the respective default value to mandatory attribute: OccupancySensorTypeBitmap\n");
+            err = TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorTypeBitmap_9();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Reads back mandatory attribute: OccupancySensorTypeBitmap\n");
+            err = TestReadsBackMandatoryAttributeOccupancySensorTypeBitmap_10();
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Reads optional attribute: PIROccupiedToUnoccupiedDelay\n");
+            err = TestReadsOptionalAttributePIROccupiedToUnoccupiedDelay_11();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadTheMandatoryAttributeOnOff_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: OnOff Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("onOff", "", "bool"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadLtAttributeGlobalSceneControl_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read LT attribute: GlobalSceneControl Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("globalSceneControl", "", "bool"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadLtAttributeOnTime_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read LT attribute: OnTime Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("onTime", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadLtAttributeOffWaitTime_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read LT attribute: OffWaitTime Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("offWaitTime", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadLtAttributeStartUpOnOff_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeStartUpOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read LT attribute: StartUpOnOff Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("startUpOnOff", "", "enum8"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_OO_2_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OO_2_2()
-        : TestCommandBridge("Test_TC_OO_2_2")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_OO_2_2() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_2\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+        case 12:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 12 : Writes the respective default value to optional attribute: PIROccupiedToUnoccupiedDelay\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributePIROccupiedToUnoccupiedDelay_12();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Off Command\n");
-            err = TestSendOffCommand_1();
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Reads back optional attribute: PIROccupiedToUnoccupiedDelay\n");
+            err = TestReadsBackOptionalAttributePIROccupiedToUnoccupiedDelay_13();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Check on/off attribute value is false after off command\n");
-            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_2();
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Reads optional attribute: PIRUnoccupiedToOccupiedDelay\n");
+            err = TestReadsOptionalAttributePIRUnoccupiedToOccupiedDelay_14();
             break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Send On Command\n");
-            err = TestSendOnCommand_3();
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay\n");
+            err = TestReadsOptionalAttributeConstrainsPIRUnoccupiedToOccupiedDelay_15();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Check on/off attribute value is true after on command\n");
-            err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_4();
+        case 16:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 16 : Writes the respective default value to optional attribute: PIRUnoccupiedToOccupiedDelay\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributePIRUnoccupiedToOccupiedDelay_16();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send On Command\n");
-            err = TestSendOnCommand_5();
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Reads back optional attribute: PIRUnoccupiedToOccupiedDelay\n");
+            err = TestReadsBackOptionalAttributePIRUnoccupiedToOccupiedDelay_17();
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Check on/off attribute value is true after on command\n");
-            err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_6();
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Reads optional attribute: PIRUnoccupiedToOccupiedThreshold\n");
+            err = TestReadsOptionalAttributePIRUnoccupiedToOccupiedThreshold_18();
             break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Send Off Command\n");
-            err = TestSendOffCommand_7();
+        case 19:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 19 : Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold\n");
+            err = TestReadsOptionalAttributeConstrainsPIRUnoccupiedToOccupiedThreshold_19();
             break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Check on/off attribute value is false after off command\n");
-            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_8();
+        case 20:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 20 : Writes the respective default value to optional attribute: "
+                "PIRUnoccupiedToOccupiedThreshold\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributePIRUnoccupiedToOccupiedThreshold_20();
             break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Send Off Command\n");
-            err = TestSendOffCommand_9();
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Reads back optional attribute: PIRUnoccupiedToOccupiedThreshold\n");
+            err = TestReadsBackOptionalAttributePIRUnoccupiedToOccupiedThreshold_21();
             break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Check on/off attribute value is false after off command\n");
-            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_10();
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay\n");
+            err = TestReadOptionalAttributeUltrasonicOccupiedToUnoccupiedDelay_22();
             break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Send Toggle Command\n");
-            err = TestSendToggleCommand_11();
+        case 23:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 23 : Writes the respective default value to optional attribute: "
+                "UltrasonicOccupiedToUnoccupiedDelay\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributeUltrasonicOccupiedToUnoccupiedDelay_23();
             break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Wait 1000ms\n");
-            err = TestWait1000ms_12();
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Read back optional attribute: UltrasonicOccupiedToUnoccupiedDelay\n");
+            err = TestReadBackOptionalAttributeUltrasonicOccupiedToUnoccupiedDelay_24();
             break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Check on/off attribute value is true after toggle command\n");
-            err = TestCheckOnOffAttributeValueIsTrueAfterToggleCommand_13();
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Read attribute: UltrasonicUnoccupiedToOccupiedDelay\n");
+            err = TestReadAttributeUltrasonicUnoccupiedToOccupiedDelay_25();
             break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Send Toggle Command\n");
-            err = TestSendToggleCommand_14();
+        case 26:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 26 : Writes the respective default value to optional attribute: "
+                "UltrasonicUnoccupiedToOccupiedDelay\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributeUltrasonicUnoccupiedToOccupiedDelay_26();
             break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Wait 1000ms\n");
-            err = TestWait1000ms_15();
+        case 27:
+            ChipLogProgress(chipTool, " ***** Test Step 27 : Read back attribute: UltrasonicUnoccupiedToOccupiedDelay\n");
+            err = TestReadBackAttributeUltrasonicUnoccupiedToOccupiedDelay_27();
             break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Check on/off attribute value is false after toggle command\n");
-            err = TestCheckOnOffAttributeValueIsFalseAfterToggleCommand_16();
+        case 28:
+            ChipLogProgress(chipTool, " ***** Test Step 28 : Read attribute: UltrasonicUnoccupiedToOccupiedThreshold\n");
+            err = TestReadAttributeUltrasonicUnoccupiedToOccupiedThreshold_28();
             break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : User prompt Set OnOff attribute manually to on\n");
-            err = TestUserPromptSetOnOffAttributeManuallyToOn_17();
+        case 29:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 29 : Writes the respective default value to optional attribute: "
+                "UltrasonicUnoccupiedToOccupiedThreshold\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributeUltrasonicUnoccupiedToOccupiedThreshold_29();
             break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Check on/off attribute value is true after on command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_18();
+        case 30:
+            ChipLogProgress(chipTool, " ***** Test Step 30 : Read back attribute: UltrasonicUnoccupiedToOccupiedThreshold\n");
+            err = TestReadBackAttributeUltrasonicUnoccupiedToOccupiedThreshold_30();
             break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : User prompt Set OnOff attribute manually to off\n");
-            err = TestUserPromptSetOnOffAttributeManuallyToOff_19();
+        case 31:
+            ChipLogProgress(chipTool, " ***** Test Step 31 : Reads optional attribute: PhysicalContactOccupiedToUnoccupiedDelay\n");
+            err = TestReadsOptionalAttributePhysicalContactOccupiedToUnoccupiedDelay_31();
             break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Check on/off attribute value is false after off command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_20();
+        case 32:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 32 : Reads optional attribute constrains: PhysicalContactOccupiedToUnoccupiedDelay\n");
+            err = TestReadsOptionalAttributeConstrainsPhysicalContactOccupiedToUnoccupiedDelay_32();
             break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Reset Off Command\n");
-            err = TestResetOffCommand_21();
+        case 33:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 33 : Writes the respective default value to optional attribute: "
+                "PhysicalContactOccupiedToUnoccupiedDelay\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributePhysicalContactOccupiedToUnoccupiedDelay_33();
             break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Check on/off attribute value is false after off command\n");
-            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_22();
+        case 34:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 34 : Reads back optional attribute: PhysicalContactOccupiedToUnoccupiedDelay\n");
+            err = TestReadsBackOptionalAttributePhysicalContactOccupiedToUnoccupiedDelay_34();
+            break;
+        case 35:
+            ChipLogProgress(chipTool, " ***** Test Step 35 : Reads optional attribute: PhysicalContactUnoccupiedToOccupiedDelay\n");
+            err = TestReadsOptionalAttributePhysicalContactUnoccupiedToOccupiedDelay_35();
+            break;
+        case 36:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 36 : Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedDelay\n");
+            err = TestReadsOptionalAttributeConstrainsPhysicalContactUnoccupiedToOccupiedDelay_36();
+            break;
+        case 37:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 37 : Writes the respective default value to optional attribute: "
+                "PhysicalContactUnoccupiedToOccupiedDelay\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributePhysicalContactUnoccupiedToOccupiedDelay_37();
+            break;
+        case 38:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 38 : Reads back optional attribute: PhysicalContactUnoccupiedToOccupiedDelay\n");
+            err = TestReadsBackOptionalAttributePhysicalContactUnoccupiedToOccupiedDelay_38();
+            break;
+        case 39:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 39 : Reads optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold\n");
+            err = TestReadsOptionalAttributePhysicalContactUnoccupiedToOccupiedThreshold_39();
+            break;
+        case 40:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 40 : Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedThreshold\n");
+            err = TestReadsOptionalAttributeConstrainsPhysicalContactUnoccupiedToOccupiedThreshold_40();
+            break;
+        case 41:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 41 : Writes the respective default value to optional attribute: "
+                "PhysicalContactUnoccupiedToOccupiedThreshold\n");
+            err = TestWritesTheRespectiveDefaultValueToOptionalAttributePhysicalContactUnoccupiedToOccupiedThreshold_41();
+            break;
+        case 42:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 42 : Reads back optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold\n");
+            err = TestReadsBackOptionalAttributePhysicalContactUnoccupiedToOccupiedThreshold_42();
             break;
         }
 
@@ -40320,7 +38901,7 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -40332,7 +38913,7 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -40341,7 +38922,7 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -40382,6 +38963,66 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 30:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 32:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 35:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 36:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 42:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -40395,7 +39036,7 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 23;
+    const uint16_t mTestCount = 43;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -40409,76 +39050,90 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendOffCommand_1()
+    CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancy_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Off Command Error: %@", err);
+        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads mandatory attribute constrains: Occupancy Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintType("occupancy", "", "map8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancy", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancy", [value unsignedCharValue], 1));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_2()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancy_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
-            }
+        id occupancyArgument;
+        occupancyArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeOccupancyWithValue:occupancyArgument
+                                completionHandler:^(NSError * _Nullable err) {
+                                    NSLog(@"Writes the respective default value to mandatory attribute: Occupancy Error: %@", err);
 
-            NextTest();
-        }];
+                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                    NextTest();
+                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOnCommand_3()
+    CHIP_ERROR TestReadsBackMandatoryAttributeOccupancy_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
+        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back mandatory attribute: Occupancy Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("occupancy", actualValue, 0));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterOnCommand_4()
+    CHIP_ERROR TestReadsMandatoryAttributeOccupancySensorType_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads mandatory attribute: OccupancySensorType Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("occupancy sensor type", actualValue, 0));
             }
 
             NextTest();
@@ -40487,161 +39142,375 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOnCommand_5()
+    CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancySensorType_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
+        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads mandatory attribute constrains: OccupancySensorType Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintType("occupancySensorType", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancySensorType", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancySensorType", [value unsignedCharValue], 3));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterOnCommand_6()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorType_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
-            }
+        id occupancySensorTypeArgument;
+        occupancySensorTypeArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeOccupancySensorTypeWithValue:occupancySensorTypeArgument
+                                          completionHandler:^(NSError * _Nullable err) {
+                                              NSLog(@"Writes the respective default value to mandatory attribute: "
+                                                    @"OccupancySensorType Error: %@",
+                                                  err);
 
-            NextTest();
-        }];
+                                              VerifyOrReturn(
+                                                  CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                              NextTest();
+                                          }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOffCommand_7()
+    CHIP_ERROR TestReadsBackMandatoryAttributeOccupancySensorType_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Off Command Error: %@", err);
+        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back mandatory attribute: OccupancySensorType Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintType("occupancySensorType", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancySensorType", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancySensorType", [value unsignedCharValue], 3));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_8()
+    CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancySensorTypeBitmap_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+        [cluster
+            readAttributeOccupancySensorTypeBitmapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads mandatory attribute constrains: OccupancySensorTypeBitmap Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
-            }
+                VerifyOrReturn(CheckConstraintType("occupancySensorTypeBitmap", "", "map8"));
+                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancySensorTypeBitmap", [value unsignedCharValue], 1));
+                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancySensorTypeBitmap", [value unsignedCharValue], 273));
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOffCommand_9()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToMandatoryAttributeOccupancySensorTypeBitmap_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Off Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id occupancySensorTypeBitmapArgument;
+        occupancySensorTypeBitmapArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster writeAttributeOccupancySensorTypeBitmapWithValue:occupancySensorTypeBitmapArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes the respective default value to mandatory attribute: "
+                                                          @"OccupancySensorTypeBitmap Error: %@",
+                                                        err);
 
-            NextTest();
-        }];
+                                                    VerifyOrReturn(CheckValue(
+                                                        "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                                    NextTest();
+                                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_10()
+    CHIP_ERROR TestReadsBackMandatoryAttributeOccupancySensorTypeBitmap_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+        [cluster
+            readAttributeOccupancySensorTypeBitmapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads back mandatory attribute: OccupancySensorTypeBitmap Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
-            }
+                VerifyOrReturn(CheckConstraintType("occupancySensorTypeBitmap", "", "map8"));
+                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("occupancySensorTypeBitmap", [value unsignedCharValue], 1));
+                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("occupancySensorTypeBitmap", [value unsignedCharValue], 273));
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendToggleCommand_11()
+    CHIP_ERROR TestReadsOptionalAttributePIROccupiedToUnoccupiedDelay_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster toggleWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Toggle Command Error: %@", err);
+        [cluster
+            readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads optional attribute: PIROccupiedToUnoccupiedDelay Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
 
-            NextTest();
-        }];
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("PIR occupied to unoccupied delay", actualValue, 0U));
+                }
+
+                VerifyOrReturn(CheckConstraintType("pirOccupiedToUnoccupiedDelay", "", "uint16"));
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWait1000ms_12()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributePIROccupiedToUnoccupiedDelay_12()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id pirOccupiedToUnoccupiedDelayArgument;
+        pirOccupiedToUnoccupiedDelayArgument = [NSNumber numberWithUnsignedShort:0U];
+        [cluster writeAttributePirOccupiedToUnoccupiedDelayWithValue:pirOccupiedToUnoccupiedDelayArgument
+                                                   completionHandler:^(NSError * _Nullable err) {
+                                                       NSLog(@"Writes the respective default value to optional attribute: "
+                                                             @"PIROccupiedToUnoccupiedDelay Error: %@",
+                                                           err);
+
+                                                       if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                           NextTest();
+                                                           return;
+                                                       }
+
+                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                       NextTest();
+                                                   }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterToggleCommand_13()
+    CHIP_ERROR TestReadsBackOptionalAttributePIROccupiedToUnoccupiedDelay_13()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after toggle command Error: %@", err);
+        [cluster
+            readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads back optional attribute: PIROccupiedToUnoccupiedDelay Error: %@", err);
+
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("PIR occupied to unoccupied delay", actualValue, 0U));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributePIRUnoccupiedToOccupiedDelay_14()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads optional attribute: PIRUnoccupiedToOccupiedDelay Error: %@", err);
+
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("PIR unoccupied to occupied delay", actualValue, 0U));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributeConstrainsPIRUnoccupiedToOccupiedDelay_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay Error: %@", err);
+
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedDelay", "", "uint16"));
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributePIRUnoccupiedToOccupiedDelay_16()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id pirUnoccupiedToOccupiedDelayArgument;
+        pirUnoccupiedToOccupiedDelayArgument = [NSNumber numberWithUnsignedShort:0U];
+        [cluster writeAttributePirUnoccupiedToOccupiedDelayWithValue:pirUnoccupiedToOccupiedDelayArgument
+                                                   completionHandler:^(NSError * _Nullable err) {
+                                                       NSLog(@"Writes the respective default value to optional attribute: "
+                                                             @"PIRUnoccupiedToOccupiedDelay Error: %@",
+                                                           err);
+
+                                                       if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                           NextTest();
+                                                           return;
+                                                       }
+
+                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                       NextTest();
+                                                   }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOptionalAttributePIRUnoccupiedToOccupiedDelay_17()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads back optional attribute: PIRUnoccupiedToOccupiedDelay Error: %@", err);
+
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("PIR unoccupied to occupied delay", actualValue, 0U));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributePIRUnoccupiedToOccupiedThreshold_18()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute: PIRUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("PIR unoccupied to occupied threshold", actualValue, 1));
             }
 
             NextTest();
@@ -40650,44 +39519,86 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendToggleCommand_14()
+    CHIP_ERROR TestReadsOptionalAttributeConstrainsPIRUnoccupiedToOccupiedThreshold_19()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster toggleWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Toggle Command Error: %@", err);
+        [cluster readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedThreshold", "", "uint8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWait1000ms_15()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributePIRUnoccupiedToOccupiedThreshold_20()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id pirUnoccupiedToOccupiedThresholdArgument;
+        pirUnoccupiedToOccupiedThresholdArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster writeAttributePirUnoccupiedToOccupiedThresholdWithValue:pirUnoccupiedToOccupiedThresholdArgument
+                                                       completionHandler:^(NSError * _Nullable err) {
+                                                           NSLog(@"Writes the respective default value to optional attribute: "
+                                                                 @"PIRUnoccupiedToOccupiedThreshold Error: %@",
+                                                               err);
+
+                                                           if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                               NextTest();
+                                                               return;
+                                                           }
+
+                                                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                           NextTest();
+                                                       }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterToggleCommand_16()
+    CHIP_ERROR TestReadsBackOptionalAttributePIRUnoccupiedToOccupiedThreshold_21()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after toggle command Error: %@", err);
+        [cluster readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back optional attribute: PIRUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("PIR unoccupied to occupied threshold", actualValue, 1));
             }
 
             NextTest();
@@ -40696,58 +39607,88 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptSetOnOffAttributeManuallyToOn_17()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Operate on device to set OnOff attribute manually to ongarbage: not in length on purpose", 55);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterOnCommand_18()
+    CHIP_ERROR TestReadOptionalAttributeUltrasonicOccupiedToUnoccupiedDelay_22()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
+        [cluster readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("ultrasonic occupied to unoccupied delay", actualValue, 0U));
             }
 
+            VerifyOrReturn(CheckConstraintType("ultrasonicOccupiedToUnoccupiedDelay", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserPromptSetOnOffAttributeManuallyToOff_19()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributeUltrasonicOccupiedToUnoccupiedDelay_23()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Operate on device to set OnOff attribute manually to offgarbage: not in length on purpose", 56);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id ultrasonicOccupiedToUnoccupiedDelayArgument;
+        ultrasonicOccupiedToUnoccupiedDelayArgument = [NSNumber numberWithUnsignedShort:0U];
+        [cluster writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:ultrasonicOccupiedToUnoccupiedDelayArgument
+                                                          completionHandler:^(NSError * _Nullable err) {
+                                                              NSLog(@"Writes the respective default value to optional attribute: "
+                                                                    @"UltrasonicOccupiedToUnoccupiedDelay Error: %@",
+                                                                  err);
+
+                                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                                  NextTest();
+                                                                  return;
+                                                              }
+
+                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                              NextTest();
+                                                          }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_20()
+    CHIP_ERROR TestReadBackOptionalAttributeUltrasonicOccupiedToUnoccupiedDelay_24()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+        [cluster readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read back optional attribute: UltrasonicOccupiedToUnoccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("ultrasonic occupied to unoccupied delay", actualValue, 0U));
             }
 
             NextTest();
@@ -40756,37 +39697,88 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestResetOffCommand_21()
+    CHIP_ERROR TestReadAttributeUltrasonicUnoccupiedToOccupiedDelay_25()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Reset Off Command Error: %@", err);
+        [cluster readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute: UltrasonicUnoccupiedToOccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied delay", actualValue, 0U));
+            }
+
+            VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedDelay", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_22()
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributeUltrasonicUnoccupiedToOccupiedDelay_26()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
+        id ultrasonicUnoccupiedToOccupiedDelayArgument;
+        ultrasonicUnoccupiedToOccupiedDelayArgument = [NSNumber numberWithUnsignedShort:0U];
+        [cluster writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:ultrasonicUnoccupiedToOccupiedDelayArgument
+                                                          completionHandler:^(NSError * _Nullable err) {
+                                                              NSLog(@"Writes the respective default value to optional attribute: "
+                                                                    @"UltrasonicUnoccupiedToOccupiedDelay Error: %@",
+                                                                  err);
+
+                                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                                  NextTest();
+                                                                  return;
+                                                              }
+
+                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                              NextTest();
+                                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadBackAttributeUltrasonicUnoccupiedToOccupiedDelay_27()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read back attribute: UltrasonicUnoccupiedToOccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied delay", actualValue, 0U));
             }
 
             NextTest();
@@ -40794,405 +39786,541 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_OO_2_3 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OO_2_3()
-        : TestCommandBridge("Test_TC_OO_2_3")
-        , mTestIndex(0)
+    CHIP_ERROR TestReadAttributeUltrasonicUnoccupiedToOccupiedThreshold_28()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~Test_TC_OO_2_3() {}
+        [cluster readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute: UltrasonicUnoccupiedToOccupiedThreshold Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied threshold", actualValue, 1));
+            }
+
+            VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedThreshold", "", "uint16"));
+            VerifyOrReturn(
+                CheckConstraintMinValue<uint8_t>("ultrasonicUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1));
+            VerifyOrReturn(
+                CheckConstraintMaxValue<uint8_t>("ultrasonicUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributeUltrasonicUnoccupiedToOccupiedThreshold_29()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_3\n");
-        }
+        id ultrasonicUnoccupiedToOccupiedThresholdArgument;
+        ultrasonicUnoccupiedToOccupiedThresholdArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster
+            writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:ultrasonicUnoccupiedToOccupiedThresholdArgument
+                                                         completionHandler:^(NSError * _Nullable err) {
+                                                             NSLog(@"Writes the respective default value to optional attribute: "
+                                                                   @"UltrasonicUnoccupiedToOccupiedThreshold Error: %@",
+                                                                 err);
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_3\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+                                                             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                                 NextTest();
+                                                                 return;
+                                                             }
 
-        Wait();
+                                                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send On Command\n");
-            if (ShouldSkip("CR_ON")) {
+                                                             NextTest();
+                                                         }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadBackAttributeUltrasonicUnoccupiedToOccupiedThreshold_30()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read back attribute: UltrasonicUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestSendOnCommand_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Wait 1000ms\n");
-            err = TestWait1000ms_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied threshold", actualValue, 1));
             }
-            err = TestReadsOnOffAttributeFromDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads GlobalSceneControl attribute from DUT\n");
-            if (ShouldSkip("A_GLOBALSCENECONTROL")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributePhysicalContactOccupiedToUnoccupiedDelay_31()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute: PhysicalContactOccupiedToUnoccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsGlobalSceneControlAttributeFromDut_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send On Command\n");
-            if (ShouldSkip("CR_ON")) {
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("physical contact occupied to unoccupied delay", actualValue, 0U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributeConstrainsPhysicalContactOccupiedToUnoccupiedDelay_32()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute constrains: PhysicalContactOccupiedToUnoccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestSendOnCommand_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Wait 1000ms\n");
-            err = TestWait1000ms_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("physicalContactOccupiedToUnoccupiedDelay", "", "uint16"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributePhysicalContactOccupiedToUnoccupiedDelay_33()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id physicalContactOccupiedToUnoccupiedDelayArgument;
+        physicalContactOccupiedToUnoccupiedDelayArgument = [NSNumber numberWithUnsignedShort:0U];
+        [cluster
+            writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:physicalContactOccupiedToUnoccupiedDelayArgument
+                                                          completionHandler:^(NSError * _Nullable err) {
+                                                              NSLog(@"Writes the respective default value to optional attribute: "
+                                                                    @"PhysicalContactOccupiedToUnoccupiedDelay Error: %@",
+                                                                  err);
+
+                                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                                  NextTest();
+                                                                  return;
+                                                              }
+
+                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                              NextTest();
+                                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOptionalAttributePhysicalContactOccupiedToUnoccupiedDelay_34()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back optional attribute: PhysicalContactOccupiedToUnoccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnOffAttributeFromDut_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Reads GlobalSceneControl attribute from DUT\n");
-            if (ShouldSkip("A_GLOBALSCENECONTROL")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsGlobalSceneControlAttributeFromDut_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Send On Command\n");
-            if (ShouldSkip("CR_ON")) {
-                NextTest();
-                return;
-            }
-            err = TestSendOnCommand_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Wait 1000ms\n");
-            err = TestWait1000ms_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnOffAttributeFromDut_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Reads GlobalSceneControl attribute from DUT\n");
-            if (ShouldSkip("A_GLOBALSCENECONTROL")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsGlobalSceneControlAttributeFromDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnTimeAttributeFromDut_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOffWaitTimeAttributeFromDut_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Send On Command\n");
-            if (ShouldSkip("CR_ON")) {
-                NextTest();
-                return;
-            }
-            err = TestSendOnCommand_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnOffAttributeFromDut_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnTimeAttributeFromDut_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOffWaitTimeAttributeFromDut_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Send Off Command\n");
-            if (ShouldSkip("CR_OFF")) {
-                NextTest();
-                return;
-            }
-            err = TestSendOffCommand_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnOffAttributeFromDut_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnTimeAttributeFromDut_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnOffAttributeFromDut_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnTimeAttributeFromDut_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOffWaitTimeAttributeFromDut_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Send On Command\n");
-            if (ShouldSkip("CR_ON")) {
-                NextTest();
-                return;
-            }
-            err = TestSendOnCommand_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnTimeAttributeFromDut_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOffWaitTimeAttributeFromDut_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : Send Off Command\n");
-            if (ShouldSkip("CR_OFF")) {
-                NextTest();
-                return;
-            }
-            err = TestSendOffCommand_28();
-            break;
-        case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnOffAttributeFromDut_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("physical contact occupied to unoccupied delay", actualValue, 0U));
             }
-            err = TestReadsOnTimeAttributeFromDut_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributePhysicalContactUnoccupiedToOccupiedDelay_35()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute: PhysicalContactUnoccupiedToOccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnOffAttributeFromDut_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("physical contact unoccupied to occupied delay", actualValue, 0U));
             }
-            err = TestReadsOnTimeAttributeFromDut_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : Send On Command\n");
-            if (ShouldSkip("CR_ON")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributeConstrainsPhysicalContactUnoccupiedToOccupiedDelay_36()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestSendOnCommand_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedDelay", "", "uint16"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributePhysicalContactUnoccupiedToOccupiedDelay_37()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id physicalContactUnoccupiedToOccupiedDelayArgument;
+        physicalContactUnoccupiedToOccupiedDelayArgument = [NSNumber numberWithUnsignedShort:0U];
+        [cluster
+            writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:physicalContactUnoccupiedToOccupiedDelayArgument
+                                                          completionHandler:^(NSError * _Nullable err) {
+                                                              NSLog(@"Writes the respective default value to optional attribute: "
+                                                                    @"PhysicalContactUnoccupiedToOccupiedDelay Error: %@",
+                                                                  err);
+
+                                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                                  NextTest();
+                                                                  return;
+                                                              }
+
+                                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                              NextTest();
+                                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOptionalAttributePhysicalContactUnoccupiedToOccupiedDelay_38()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back optional attribute: PhysicalContactUnoccupiedToOccupiedDelay Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnOffAttributeFromDut_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("physical contact unoccupied to occupied delay", actualValue, 0U));
             }
-            err = TestReadsOnTimeAttributeFromDut_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributePhysicalContactUnoccupiedToOccupiedThreshold_39()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOffWaitTimeAttributeFromDut_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : Send Off Command\n");
-            if (ShouldSkip("CR_OFF")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("physical contact unoccupied to occupied threshold", actualValue, 1));
             }
-            err = TestSendOffCommand_37();
-            break;
-        case 38:
-            ChipLogProgress(chipTool, " ***** Test Step 38 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOptionalAttributeConstrainsPhysicalContactUnoccupiedToOccupiedThreshold_40()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads optional attribute constrains: PhysicalContactUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnOffAttributeFromDut_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedThreshold", "", "uint8"));
+            VerifyOrReturn(
+                CheckConstraintMinValue<uint8_t>("physicalContactUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1));
+            VerifyOrReturn(
+                CheckConstraintMaxValue<uint8_t>("physicalContactUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheRespectiveDefaultValueToOptionalAttributePhysicalContactUnoccupiedToOccupiedThreshold_41()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id physicalContactUnoccupiedToOccupiedThresholdArgument;
+        physicalContactUnoccupiedToOccupiedThresholdArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster
+            writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:physicalContactUnoccupiedToOccupiedThresholdArgument
+                                                              completionHandler:^(NSError * _Nullable err) {
+                                                                  NSLog(
+                                                                      @"Writes the respective default value to optional attribute: "
+                                                                      @"PhysicalContactUnoccupiedToOccupiedThreshold Error: %@",
+                                                                      err);
+
+                                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                                      NextTest();
+                                                                      return;
+                                                                  }
+
+                                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                                  NextTest();
+                                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOptionalAttributePhysicalContactUnoccupiedToOccupiedThreshold_42()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOccupancySensing * cluster = [[CHIPTestOccupancySensing alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back optional attribute: PhysicalContactUnoccupiedToOccupiedThreshold Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnTimeAttributeFromDut_39();
-            break;
-        case 40:
-            ChipLogProgress(chipTool, " ***** Test Step 40 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("physical contact unoccupied to occupied threshold", actualValue, 1));
             }
-            err = TestReadsOnOffAttributeFromDut_40();
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_OO_1_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_OO_1_1()
+        : TestCommandBridge("Test_TC_OO_1_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_OO_1_1() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_1_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_1_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOnTimeAttributeFromDut_41();
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadsOffWaitTimeAttributeFromDut_42();
+            err = TestReadTheGlobalAttributeAttributeList_2();
             break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : Reads OnOff attribute from DUT\n");
-            if (ShouldSkip("A_ONOFF")) {
+        case 3:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                "supported events.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnOffAttributeFromDut_43();
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
             break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : Reads OnTime attribute from DUT\n");
-            if (ShouldSkip("A_ONTIME")) {
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
+            if (ShouldSkip("OO_LT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsOnTimeAttributeFromDut_44();
+            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
             break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : Reads OffWaitTime attribute from DUT\n");
-            if (ShouldSkip("A_OFFWAITTIME")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsOffWaitTimeAttributeFromDut_45();
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
             break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : Send Off Command\n");
-            if (ShouldSkip("CR_OFF")) {
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : read the optional global attribute: FeatureMap\n");
+            if (ShouldSkip("OO_LT")) {
                 NextTest();
                 return;
             }
-            err = TestSendOffCommand_46();
+            err = TestReadTheOptionalGlobalAttributeFeatureMap_6();
             break;
         }
 
@@ -41226,126 +40354,6 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -41359,7 +40367,7 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 47;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -41373,368 +40381,366 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendOnCommand_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWait1000ms_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_3()
+    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U));
             }
 
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsGlobalSceneControlAttributeFromDut_4()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads GlobalSceneControl attribute from DUT Error: %@", err);
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("GlobalSceneControl", actualValue, 1));
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(5)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 16384UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 16385UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 16386UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 16387UL));
             }
 
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOnCommand_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWait1000ms_6()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_7()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AcceptedCommandList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(6)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 64UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 65UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 66UL));
             }
 
+            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsGlobalSceneControlAttributeFromDut_8()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads GlobalSceneControl attribute from DUT Error: %@", err);
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: GeneratedCommandList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("GlobalSceneControl", actualValue, 1));
+                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
             }
 
+            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOnCommand_9()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWait1000ms_10()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_11()
+    CHIP_ERROR TestReadTheOptionalGlobalAttributeFeatureMap_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the optional global attribute: FeatureMap Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL));
             }
 
+            VerifyOrReturn(CheckConstraintType("featureMap", "", "map32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestReadsGlobalSceneControlAttributeFromDut_12()
+class Test_TC_OO_2_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_OO_2_1()
+        : TestCommandBridge("Test_TC_OO_2_1")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads GlobalSceneControl attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("GlobalSceneControl", actualValue, 1));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_13()
+    ~Test_TC_OO_2_1() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_1\n");
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
+        Wait();
 
-            NextTest();
-        }];
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: OnOff\n");
+            err = TestReadTheMandatoryAttributeOnOff_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : read LT attribute: GlobalSceneControl\n");
+            err = TestReadLtAttributeGlobalSceneControl_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : read LT attribute: OnTime\n");
+            err = TestReadLtAttributeOnTime_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : read LT attribute: OffWaitTime\n");
+            err = TestReadLtAttributeOffWaitTime_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : read LT attribute: StartUpOnOff\n");
+            err = TestReadLtAttributeStartUpOnOff_5();
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_14()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
-            }
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 6;
 
-            NextTest();
-        }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendOnCommand_15()
+    CHIP_ERROR TestReadTheMandatoryAttributeOnOff_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: OnOff Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintType("onOff", "", "bool"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_16()
+    CHIP_ERROR TestReadLtAttributeGlobalSceneControl_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read LT attribute: GlobalSceneControl Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
             }
 
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("globalSceneControl", "", "bool"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_17()
+    CHIP_ERROR TestReadLtAttributeOnTime_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            NSLog(@"read LT attribute: OnTime Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
             }
 
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("onTime", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_18()
+    CHIP_ERROR TestReadLtAttributeOffWaitTime_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            NSLog(@"read LT attribute: OffWaitTime Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
             }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSendOffCommand_19()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Off Command Error: %@", err);
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintType("offWaitTime", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_20()
+    CHIP_ERROR TestReadLtAttributeStartUpOnOff_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+        [cluster readAttributeStartUpOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read LT attribute: StartUpOnOff Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("startUpOnOff", "", "enum8"));
             }
 
             NextTest();
@@ -41742,157 +40748,254 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_21()
+class Test_TC_OO_2_2 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_OO_2_2()
+        : TestCommandBridge("Test_TC_OO_2_2")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+    ~Test_TC_OO_2_2() {}
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_2\n");
+        }
 
-            NextTest();
-        }];
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_2\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-        return CHIP_NO_ERROR;
-    }
+        Wait();
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_22()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Off Command\n");
+            err = TestSendOffCommand_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Check on/off attribute value is false after off command\n");
+            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Send On Command\n");
+            err = TestSendOnCommand_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Check on/off attribute value is true after on command\n");
+            err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Send On Command\n");
+            err = TestSendOnCommand_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Check on/off attribute value is true after on command\n");
+            err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Send Off Command\n");
+            err = TestSendOffCommand_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Check on/off attribute value is false after off command\n");
+            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Send Off Command\n");
+            err = TestSendOffCommand_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Check on/off attribute value is false after off command\n");
+            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Send Toggle Command\n");
+            err = TestSendToggleCommand_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Wait 1000ms\n");
+            err = TestWait1000ms_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Check on/off attribute value is true after toggle command\n");
+            err = TestCheckOnOffAttributeValueIsTrueAfterToggleCommand_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Send Toggle Command\n");
+            err = TestSendToggleCommand_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Wait 1000ms\n");
+            err = TestWait1000ms_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Check on/off attribute value is false after toggle command\n");
+            err = TestCheckOnOffAttributeValueIsFalseAfterToggleCommand_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : User prompt Set OnOff attribute manually to on\n");
+            err = TestUserPromptSetOnOffAttributeManuallyToOn_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Check on/off attribute value is true after on command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
             }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_23()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : User prompt Set OnOff attribute manually to off\n");
+            err = TestUserPromptSetOnOffAttributeManuallyToOff_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Check on/off attribute value is false after off command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
             }
+            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Reset Off Command\n");
+            err = TestResetOffCommand_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Check on/off attribute value is false after off command\n");
+            err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_22();
+            break;
+        }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_24()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
-            }
-
-            NextTest();
-        }];
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR TestSendOnCommand_25()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send On Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_26()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
-
-            NextTest();
-        }];
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 23;
 
-        return CHIP_NO_ERROR;
-    }
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_27()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendOffCommand_28()
+    CHIP_ERROR TestSendOffCommand_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -41909,14 +41012,14 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_29()
+    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -41931,64 +41034,37 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_30()
+    CHIP_ERROR TestSendOnCommand_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send On Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_31()
+    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterOnCommand_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_32()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -41997,7 +41073,7 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOnCommand_33()
+    CHIP_ERROR TestSendOnCommand_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -42014,14 +41090,14 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_34()
+    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterOnCommand_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42036,42 +41112,37 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_35()
+    CHIP_ERROR TestSendOffCommand_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Off Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_36()
+    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
 
             NextTest();
@@ -42080,7 +41151,7 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOffCommand_37()
+    CHIP_ERROR TestSendOffCommand_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -42097,14 +41168,14 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_38()
+    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42119,42 +41190,44 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_39()
+    CHIP_ERROR TestSendToggleCommand_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+        [cluster toggleWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Toggle Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_40()
+    CHIP_ERROR TestWait1000ms_12()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterToggleCommand_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+            NSLog(@"Check on/off attribute value is true after toggle command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -42163,42 +41236,44 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_41()
+    CHIP_ERROR TestSendToggleCommand_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+        [cluster toggleWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Toggle Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_42()
+    CHIP_ERROR TestWait1000ms_15()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterToggleCommand_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Check on/off attribute value is false after toggle command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
 
             NextTest();
@@ -42207,20 +41282,28 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnOffAttributeFromDut_43()
+    CHIP_ERROR TestUserPromptSetOnOffAttributeManuallyToOn_17()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Operate on device to set OnOff attribute manually to ongarbage: not in length on purpose", 55);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestCheckOnOffAttributeValueIsTrueAfterOnCommand_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+            NSLog(@"Check on/off attribute value is true after on command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -42229,20 +41312,28 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOnTimeAttributeFromDut_44()
+    CHIP_ERROR TestUserPromptSetOnOffAttributeManuallyToOff_19()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Operate on device to set OnOff attribute manually to offgarbage: not in length on purpose", 56);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
 
             NextTest();
@@ -42251,39 +41342,39 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_45()
+    CHIP_ERROR TestResetOffCommand_21()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Reset Off Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendOffCommand_46()
+    CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Send Off Command Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Check on/off attribute value is false after off command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            }
+
             NextTest();
         }];
 
@@ -42291,11 +41382,11 @@ class Test_TC_OO_2_3 : public TestCommandBridge {
     }
 };
 
-class Test_TC_OO_2_4 : public TestCommandBridge {
+class Test_TC_OO_2_3 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_OO_2_4()
-        : TestCommandBridge("Test_TC_OO_2_4")
+    Test_TC_OO_2_3()
+        : TestCommandBridge("Test_TC_OO_2_3")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -42305,7 +41396,7 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_OO_2_4() {}
+    ~Test_TC_OO_2_3() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -42313,11 +41404,11 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_4\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_3\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_4\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_3\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -42334,104 +41425,360 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends On command to DUT\n");
-            err = TestThSendsOnCommandToDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Send On Command\n");
+            if (ShouldSkip("CR_ON")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOnCommand_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH writes a value of 0 to StartUpOnOff attribute of DUT\n");
-            err = TestThWritesAValueOf0ToStartUpOnOffAttributeOfDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Wait 1000ms\n");
+            err = TestWait1000ms_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads the StartUpOnOff attribute from the DUT\n");
-            err = TestThReadsTheStartUpOnOffAttributeFromTheDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Power off DUT\n");
-            err = TestPowerOffDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads GlobalSceneControl attribute from DUT\n");
+            if (ShouldSkip("A_GLOBALSCENECONTROL")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsGlobalSceneControlAttributeFromDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Send On Command\n");
+            if (ShouldSkip("CR_ON")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOnCommand_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads the OnOff attribute from the DUT\n");
-            err = TestThReadsTheOnOffAttributeFromTheDut_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Wait 1000ms\n");
+            err = TestWait1000ms_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : TH writes a value of 1 to StartUpOnOff attribute of DUT\n");
-            err = TestThWritesAValueOf1ToStartUpOnOffAttributeOfDut_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Power off DUT\n");
-            err = TestPowerOffDut_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Reads GlobalSceneControl attribute from DUT\n");
+            if (ShouldSkip("A_GLOBALSCENECONTROL")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsGlobalSceneControlAttributeFromDut_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Send On Command\n");
+            if (ShouldSkip("CR_ON")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOnCommand_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads the OnOff attribute from the DUT\n");
-            err = TestThReadsTheOnOffAttributeFromTheDut_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Wait 1000ms\n");
+            err = TestWait1000ms_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : TH writes a value of 2 to StartUpOnOff attribute of DUT\n");
-            err = TestThWritesAValueOf2ToStartUpOnOffAttributeOfDut_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Power off DUT\n");
-            err = TestPowerOffDut_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Reads GlobalSceneControl attribute from DUT\n");
+            if (ShouldSkip("A_GLOBALSCENECONTROL")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsGlobalSceneControlAttributeFromDut_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : TH reads the OnOff attribute from the DUT\n");
-            err = TestThReadsTheOnOffAttributeFromTheDut_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Power off DUT\n");
-            err = TestPowerOffDut_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Send On Command\n");
+            if (ShouldSkip("CR_ON")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOnCommand_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads the OnOff attribute from the DUT\n");
-            err = TestThReadsTheOnOffAttributeFromTheDut_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : TH writes NULL to StartUpOnOff attribute of DUT\n");
-            err = TestThWritesNullToStartUpOnOffAttributeOfDut_18();
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Power off DUT\n");
-            err = TestPowerOffDut_19();
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Send Off Command\n");
+            if (ShouldSkip("CR_OFF")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOffCommand_19();
             break;
         case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_20();
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_20();
             break;
         case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : TH reads the OnOff attribute from the DUT\n");
-            err = TestThReadsTheOnOffAttributeFromTheDut_21();
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_21();
             break;
         case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : TH sends Off command to DUT\n");
-            err = TestThSendsOffCommandToDut_22();
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_22();
             break;
         case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Power off DUT\n");
-            err = TestPowerOffDut_23();
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_23();
             break;
         case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_24();
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_24();
             break;
         case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : TH reads the OnOff attribute from the DUT\n");
-            err = TestThReadsTheOnOffAttributeFromTheDut_25();
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Send On Command\n");
+            if (ShouldSkip("CR_ON")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOnCommand_25();
+            break;
+        case 26:
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_26();
+            break;
+        case 27:
+            ChipLogProgress(chipTool, " ***** Test Step 27 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_27();
+            break;
+        case 28:
+            ChipLogProgress(chipTool, " ***** Test Step 28 : Send Off Command\n");
+            if (ShouldSkip("CR_OFF")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOffCommand_28();
+            break;
+        case 29:
+            ChipLogProgress(chipTool, " ***** Test Step 29 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_29();
+            break;
+        case 30:
+            ChipLogProgress(chipTool, " ***** Test Step 30 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_30();
+            break;
+        case 31:
+            ChipLogProgress(chipTool, " ***** Test Step 31 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_31();
+            break;
+        case 32:
+            ChipLogProgress(chipTool, " ***** Test Step 32 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_32();
+            break;
+        case 33:
+            ChipLogProgress(chipTool, " ***** Test Step 33 : Send On Command\n");
+            if (ShouldSkip("CR_ON")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOnCommand_33();
+            break;
+        case 34:
+            ChipLogProgress(chipTool, " ***** Test Step 34 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_34();
+            break;
+        case 35:
+            ChipLogProgress(chipTool, " ***** Test Step 35 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_35();
+            break;
+        case 36:
+            ChipLogProgress(chipTool, " ***** Test Step 36 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_36();
+            break;
+        case 37:
+            ChipLogProgress(chipTool, " ***** Test Step 37 : Send Off Command\n");
+            if (ShouldSkip("CR_OFF")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOffCommand_37();
+            break;
+        case 38:
+            ChipLogProgress(chipTool, " ***** Test Step 38 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_38();
+            break;
+        case 39:
+            ChipLogProgress(chipTool, " ***** Test Step 39 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_39();
+            break;
+        case 40:
+            ChipLogProgress(chipTool, " ***** Test Step 40 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_40();
+            break;
+        case 41:
+            ChipLogProgress(chipTool, " ***** Test Step 41 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_41();
+            break;
+        case 42:
+            ChipLogProgress(chipTool, " ***** Test Step 42 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_42();
+            break;
+        case 43:
+            ChipLogProgress(chipTool, " ***** Test Step 43 : Reads OnOff attribute from DUT\n");
+            if (ShouldSkip("A_ONOFF")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnOffAttributeFromDut_43();
+            break;
+        case 44:
+            ChipLogProgress(chipTool, " ***** Test Step 44 : Reads OnTime attribute from DUT\n");
+            if (ShouldSkip("A_ONTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOnTimeAttributeFromDut_44();
+            break;
+        case 45:
+            ChipLogProgress(chipTool, " ***** Test Step 45 : Reads OffWaitTime attribute from DUT\n");
+            if (ShouldSkip("A_OFFWAITTIME")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOffWaitTimeAttributeFromDut_45();
+            break;
+        case 46:
+            ChipLogProgress(chipTool, " ***** Test Step 46 : Send Off Command\n");
+            if (ShouldSkip("CR_OFF")) {
+                NextTest();
+                return;
+            }
+            err = TestSendOffCommand_46();
             break;
         }
 
@@ -42522,6 +41869,69 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 30:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 32:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 35:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 36:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 42:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 43:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 44:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 45:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 46:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -42535,7 +41945,7 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 26;
+    const uint16_t mTestCount = 47;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -42549,14 +41959,14 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThSendsOnCommandToDut_1()
+    CHIP_ERROR TestSendOnCommand_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"TH sends On command to DUT Error: %@", err);
+            NSLog(@"Send On Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42566,41 +41976,27 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThWritesAValueOf0ToStartUpOnOffAttributeOfDut_2()
+    CHIP_ERROR TestWait1000ms_2()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id startUpOnOffArgument;
-        startUpOnOffArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(@"TH writes a value of 0 to StartUpOnOff attribute of DUT Error: %@", err);
-
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                       NextTest();
-                                   }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsTheStartUpOnOffAttributeFromTheDut_3()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeStartUpOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the StartUpOnOff attribute from the DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("StartUpOnOff", actualValue));
-                VerifyOrReturn(CheckValue("StartUpOnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -42609,33 +42005,20 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestPowerOffDut_4()
-    {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_5()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_6()
+    CHIP_ERROR TestReadsGlobalSceneControlAttributeFromDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
+        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads GlobalSceneControl attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("GlobalSceneControl", actualValue, 1));
             }
 
             NextTest();
@@ -42644,47 +42027,38 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThWritesAValueOf1ToStartUpOnOffAttributeOfDut_7()
+    CHIP_ERROR TestSendOnCommand_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id startUpOnOffArgument;
-        startUpOnOffArgument = [NSNumber numberWithUnsignedChar:1];
-        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(@"TH writes a value of 1 to StartUpOnOff attribute of DUT Error: %@", err);
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send On Command Error: %@", err);
 
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                       NextTest();
-                                   }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestPowerOffDut_8()
-    {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
-    }
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_9()
+    CHIP_ERROR TestWait1000ms_6()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_10()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42699,53 +42073,66 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThWritesAValueOf2ToStartUpOnOffAttributeOfDut_11()
+    CHIP_ERROR TestReadsGlobalSceneControlAttributeFromDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id startUpOnOffArgument;
-        startUpOnOffArgument = [NSNumber numberWithUnsignedChar:2];
-        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(@"TH writes a value of 2 to StartUpOnOff attribute of DUT Error: %@", err);
-
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads GlobalSceneControl attribute from DUT Error: %@", err);
 
-                                       NextTest();
-                                   }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        return CHIP_NO_ERROR;
-    }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("GlobalSceneControl", actualValue, 1));
+            }
 
-    CHIP_ERROR TestPowerOffDut_12()
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendOnCommand_9()
     {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send On Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_13()
+    CHIP_ERROR TestWait1000ms_10()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_14()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -42754,33 +42141,42 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestPowerOffDut_15()
+    CHIP_ERROR TestReadsGlobalSceneControlAttributeFromDut_12()
     {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_16()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads GlobalSceneControl attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("GlobalSceneControl", actualValue, 1));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_17()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
             }
 
             NextTest();
@@ -42789,47 +42185,53 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThWritesNullToStartUpOnOffAttributeOfDut_18()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id startUpOnOffArgument;
-        startUpOnOffArgument = nil;
-        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(@"TH writes NULL to StartUpOnOff attribute of DUT Error: %@", err);
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
 
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                       NextTest();
-                                   }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestPowerOffDut_19()
+    CHIP_ERROR TestSendOnCommand_15()
     {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_20()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send On Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_21()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42844,44 +42246,75 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThSendsOffCommandToDut_22()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"TH sends Off command to DUT Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestPowerOffDut_23()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_18()
     {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_24()
+    CHIP_ERROR TestSendOffCommand_19()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Off Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_25()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -42895,164 +42328,87 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_PS_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_PS_1_1()
-        : TestCommandBridge("Test_TC_PS_1_1")
-        , mTestIndex(0)
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_21()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~Test_TC_PS_1_1() {}
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_1_1\n");
-        }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PS_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            NextTest();
+        }];
 
-        Wait();
+        return CHIP_NO_ERROR;
+    }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeClusterRevision_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheGlobalAttributeAttributeList_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 4 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
-                "supported events.\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_22()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
-            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : read the optional global attribute: FeatureMap\n");
-            err = TestReadTheOptionalGlobalAttributeFeatureMap_7();
-            break;
-        }
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_23()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 8;
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+            NextTest();
+        }];
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_24()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
             }
 
             NextTest();
@@ -43061,127 +42417,142 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
+    CHIP_ERROR TestSendOnCommand_25()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send On Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_26()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(11)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 14UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 15UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 16UL));
-                VerifyOrReturn(CheckValue("", actualValue[6], 65528UL));
-                VerifyOrReturn(CheckValue("", actualValue[7], 65529UL));
-                VerifyOrReturn(CheckValue("", actualValue[8], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[9], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[10], 65533UL));
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
             }
 
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_27()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
+    CHIP_ERROR TestSendOffCommand_28()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AcceptedCommandList Error: %@", err);
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Off Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_29()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
 
-            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_30()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: GeneratedCommandList Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
             }
 
-            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalGlobalAttributeFeatureMap_7()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_31()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional global attribute: FeatureMap Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 2UL));
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
 
             NextTest();
@@ -43189,439 +42560,60 @@ class Test_TC_PS_1_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_PS_2_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_PS_2_1()
-        : TestCommandBridge("Test_TC_PS_2_1")
-        , mTestIndex(0)
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_32()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~Test_TC_PS_2_1() {}
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_2_1\n");
-        }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PS_2_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            NextTest();
+        }];
 
-        Wait();
+        return CHIP_NO_ERROR;
+    }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Test Harness Client reads Status attribute from Server DUT\n");
-            err = TestTestHarnessClientReadsStatusAttributeFromServerDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Test Harness Client reads Order attribute from Server DUT\n");
-            err = TestTestHarnessClientReadsOrderAttributeFromServerDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Test Harness Client reads Description attribute from Server DUT\n");
-            err = TestTestHarnessClientReadsDescriptionAttributeFromServerDut_3();
-            break;
-        case 4:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 4 : Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredAssessedInputVoltageAttribueFromServerDut_4();
-            break;
-        case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredAssessedInputFrequencyAttributeFromServerDut_5();
-            break;
-        case 6:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 6 : Test Harness Client reads WiredCurrentType attribute from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredCurrentTypeAttributeFromServerDut_6();
-            break;
-        case 7:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 7 : Test Harness Client reads WiredAssessedCurrent attribute from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredAssessedCurrentAttributeFromServerDut_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Test Harness Client reads WiredNominalVoltage from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredNominalVoltageFromServerDut_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Test Harness Client reads WiredMaximumCurrent from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredMaximumCurrentFromServerDut_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Test Harness Client reads WiredPresent from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsWiredPresentFromServerDut_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Test Harness Client reads ActiveWiredFaults from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsActiveWiredFaultsFromServerDut_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Test Harness Client reads BatVoltage from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatVoltageFromServerDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Test Harness Client reads BatPercentRemaining from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatPercentRemainingFromServerDut_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Test Harness Client reads BatTimeRemaining from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatTimeRemainingFromServerDut_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Test Harness Client reads BatChargeLevel from Server DUT\n");
-            err = TestTestHarnessClientReadsBatChargeLevelFromServerDut_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Test Harness Client reads BatReplacementNeeded from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatReplacementNeededFromServerDut_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Test Harness Client reads BatReplaceability from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatReplaceabilityFromServerDut_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Test Harness Client reads BatPresent from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatPresentFromServerDut_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Test Harness Client readsActiveBatFaults from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsActiveBatFaultsFromServerDut_19();
-            break;
-        case 20:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 20 : Test Harness Client reads BatReplacementDescription from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatReplacementDescriptionFromServerDut_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Test Harness Client reads BatCommonDesignation from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatCommonDesignationFromServerDut_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Test Harness Client reads BatANSIDesignation from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatANSIDesignationFromServerDut_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Test Harness Client reads BatIECDesignation from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatIECDesignationFromServerDut_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Test Harness Client reads BatApprovedChemistry from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatApprovedChemistryFromServerDut_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Test Harness Client reads BatCapacity from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatCapacityFromServerDut_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : Test Harness Client reads BatQuantity from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatQuantityFromServerDut_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : Test Harness Client reads BatChargeState from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatChargeStateFromServerDut_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : Test Harness Client reads BatTimeToFullCharge from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatTimeToFullChargeFromServerDut_28();
-            break;
-        case 29:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 29 : Test Harness Client reads BatFunctionalWhileCharging from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatFunctionalWhileChargingFromServerDut_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : Test Harness Client reads BatChargingCurrent from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsBatChargingCurrentFromServerDut_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : Test Harness Client reads ActiveBatChargeFaults from Server DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestTestHarnessClientReadsActiveBatChargeFaultsFromServerDut_31();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestSendOnCommand_33()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send On Command Error: %@", err);
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 32;
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+            NextTest();
+        }];
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsStatusAttributeFromServerDut_1()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_34()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads Status attribute from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("status", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("status", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("status", [value unsignedCharValue], 3));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -43630,97 +42622,103 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsOrderAttributeFromServerDut_2()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_35()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOrderWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads Order attribute from Server DUT Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("order", "", "uint8"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsDescriptionAttributeFromServerDut_3()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_36()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads Description attribute from Server DUT Error: %@", err);
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("description", "", "string"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredAssessedInputVoltageAttribueFromServerDut_4()
+    CHIP_ERROR TestSendOffCommand_37()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeWiredAssessedInputVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT Error: %@", err);
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Off Command Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("wiredAssessedInputVoltage", "", "uint32"));
-                NextTest();
-            }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredAssessedInputFrequencyAttributeFromServerDut_5()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_38()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeWiredAssessedInputFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("wiredAssessedInputFrequency", "", "uint16"));
-                NextTest();
-            }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredCurrentTypeAttributeFromServerDut_6()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_39()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeWiredCurrentTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads WiredCurrentType attribute from Server DUT Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("wiredCurrentType", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("wiredCurrentType", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("wiredCurrentType", [value unsignedCharValue], 1));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
             }
 
             NextTest();
@@ -43729,291 +42727,556 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredAssessedCurrentAttributeFromServerDut_7()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_40()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeWiredAssessedCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads WiredAssessedCurrent attribute from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("wiredAssessedCurrent", "", "uint32"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredNominalVoltageFromServerDut_8()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_41()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeWiredNominalVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads WiredNominalVoltage from Server DUT Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("wiredNominalVoltage", "", "uint32"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredMaximumCurrentFromServerDut_9()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_42()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeWiredMaximumCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads WiredMaximumCurrent from Server DUT Error: %@", err);
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("wiredMaximumCurrent", "", "uint32"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsWiredPresentFromServerDut_10()
+    CHIP_ERROR TestReadsOnOffAttributeFromDut_43()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeWiredPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads WiredPresent from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnOff attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("wiredPresent", "", "bool"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsActiveWiredFaultsFromServerDut_11()
+    CHIP_ERROR TestReadsOnTimeAttributeFromDut_44()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeActiveWiredFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads ActiveWiredFaults from Server DUT Error: %@", err);
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OnTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("activeWiredFaults", "", "list"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatVoltageFromServerDut_12()
+    CHIP_ERROR TestReadsOffWaitTimeAttributeFromDut_45()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatVoltage from Server DUT Error: %@", err);
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OffWaitTime attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryVoltage", "", "uint32"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OffWaitTime", actualValue, 0U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatPercentRemainingFromServerDut_13()
+    CHIP_ERROR TestSendOffCommand_46()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryPercentRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatPercentRemaining from Server DUT Error: %@", err);
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Send Off Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryPercentRemaining", "", "uint8"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestTestHarnessClientReadsBatTimeRemainingFromServerDut_14()
+class Test_TC_OO_2_4 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_OO_2_4()
+        : TestCommandBridge("Test_TC_OO_2_4")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-        [cluster readAttributeBatteryTimeRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatTimeRemaining from Server DUT Error: %@", err);
+    ~Test_TC_OO_2_4() {}
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            VerifyOrReturn(CheckConstraintType("batteryTimeRemaining", "", "uint32"));
-            NextTest();
-        }];
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_4\n");
+        }
 
-        return CHIP_NO_ERROR;
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_OO_2_4\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends On command to DUT\n");
+            err = TestThSendsOnCommandToDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH writes a value of 0 to StartUpOnOff attribute of DUT\n");
+            err = TestThWritesAValueOf0ToStartUpOnOffAttributeOfDut_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads the StartUpOnOff attribute from the DUT\n");
+            err = TestThReadsTheStartUpOnOffAttributeFromTheDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Power off DUT\n");
+            err = TestPowerOffDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads the OnOff attribute from the DUT\n");
+            err = TestThReadsTheOnOffAttributeFromTheDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : TH writes a value of 1 to StartUpOnOff attribute of DUT\n");
+            err = TestThWritesAValueOf1ToStartUpOnOffAttributeOfDut_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Power off DUT\n");
+            err = TestPowerOffDut_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads the OnOff attribute from the DUT\n");
+            err = TestThReadsTheOnOffAttributeFromTheDut_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : TH writes a value of 2 to StartUpOnOff attribute of DUT\n");
+            err = TestThWritesAValueOf2ToStartUpOnOffAttributeOfDut_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Power off DUT\n");
+            err = TestPowerOffDut_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : TH reads the OnOff attribute from the DUT\n");
+            err = TestThReadsTheOnOffAttributeFromTheDut_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Power off DUT\n");
+            err = TestPowerOffDut_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads the OnOff attribute from the DUT\n");
+            err = TestThReadsTheOnOffAttributeFromTheDut_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : TH writes NULL to StartUpOnOff attribute of DUT\n");
+            err = TestThWritesNullToStartUpOnOffAttributeOfDut_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Power off DUT\n");
+            err = TestPowerOffDut_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : TH reads the OnOff attribute from the DUT\n");
+            err = TestThReadsTheOnOffAttributeFromTheDut_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : TH sends Off command to DUT\n");
+            err = TestThSendsOffCommandToDut_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Power off DUT\n");
+            err = TestPowerOffDut_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_24();
+            break;
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : TH reads the OnOff attribute from the DUT\n");
+            err = TestThReadsTheOnOffAttributeFromTheDut_25();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatChargeLevelFromServerDut_15()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        [cluster readAttributeBatteryChargeLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatChargeLevel from Server DUT Error: %@", err);
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-            VerifyOrReturn(CheckConstraintType("batteryChargeLevel", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("batteryChargeLevel", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("batteryChargeLevel", [value unsignedCharValue], 2));
-            }
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 26;
 
-            NextTest();
-        }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatReplacementNeededFromServerDut_16()
+    CHIP_ERROR TestThSendsOnCommandToDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryReplacementNeededWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatReplacementNeeded from Server DUT Error: %@", err);
+        [cluster onWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"TH sends On command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryReplacementNeeded", "", "bool"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatReplaceabilityFromServerDut_17()
+    CHIP_ERROR TestThWritesAValueOf0ToStartUpOnOffAttributeOfDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryReplaceabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatReplaceability from Server DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id startUpOnOffArgument;
+        startUpOnOffArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
+                                   completionHandler:^(NSError * _Nullable err) {
+                                       NSLog(@"TH writes a value of 0 to StartUpOnOff attribute of DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("batteryReplaceability", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("batteryReplaceability", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("batteryReplaceability", [value unsignedCharValue], 3));
-            }
+                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                       NextTest();
+                                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatPresentFromServerDut_18()
+    CHIP_ERROR TestThReadsTheStartUpOnOffAttributeFromTheDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatPresent from Server DUT Error: %@", err);
+        [cluster readAttributeStartUpOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the StartUpOnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryPresent", "", "bool"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("StartUpOnOff", actualValue));
+                VerifyOrReturn(CheckValue("StartUpOnOff", actualValue, 0));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsActiveBatFaultsFromServerDut_19()
+    CHIP_ERROR TestPowerOffDut_4()
+    {
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_5()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeActiveBatteryFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client readsActiveBatFaults from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("activeBatteryFaults", "", "list"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatReplacementDescriptionFromServerDut_20()
+    CHIP_ERROR TestThWritesAValueOf1ToStartUpOnOffAttributeOfDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeBatteryReplacementDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Test Harness Client reads BatReplacementDescription from Server DUT Error: %@", err);
+        id startUpOnOffArgument;
+        startUpOnOffArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
+                                   completionHandler:^(NSError * _Nullable err) {
+                                       NSLog(@"TH writes a value of 1 to StartUpOnOff attribute of DUT Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("batteryReplacementDescription", "", "string"));
-                VerifyOrReturn(CheckConstraintMaxLength("batteryReplacementDescription", [value length], 60));
-                NextTest();
-            }];
+                                       NextTest();
+                                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatCommonDesignationFromServerDut_21()
+    CHIP_ERROR TestPowerOffDut_8()
+    {
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_9()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryCommonDesignationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatCommonDesignation from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryCommonDesignation", "", "uint32"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("batteryCommonDesignation", [value unsignedIntValue], 0UL));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("batteryCommonDesignation", [value unsignedIntValue], 80UL));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
             }
 
             NextTest();
@@ -44022,61 +43285,53 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatANSIDesignationFromServerDut_22()
+    CHIP_ERROR TestThWritesAValueOf2ToStartUpOnOffAttributeOfDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryANSIDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatANSIDesignation from Server DUT Error: %@", err);
+        id startUpOnOffArgument;
+        startUpOnOffArgument = [NSNumber numberWithUnsignedChar:2];
+        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
+                                   completionHandler:^(NSError * _Nullable err) {
+                                       NSLog(@"TH writes a value of 2 to StartUpOnOff attribute of DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryANSIDesignation", "", "string"));
-            VerifyOrReturn(CheckConstraintMaxLength("batteryANSIDesignation", [value length], 20));
-            NextTest();
-        }];
+                                       NextTest();
+                                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatIECDesignationFromServerDut_23()
+    CHIP_ERROR TestPowerOffDut_12()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeBatteryIECDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatIECDesignation from Server DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("batteryIECDesignation", "", "string"));
-            VerifyOrReturn(CheckConstraintMaxLength("batteryIECDesignation", [value length], 20));
-            NextTest();
-        }];
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_13()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatApprovedChemistryFromServerDut_24()
+    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_14()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryApprovedChemistryWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatApprovedChemistry from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryApprovedChemistry", "", "uint32"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("batteryApprovedChemistry", [value unsignedIntValue], 0UL));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("batteryApprovedChemistry", [value unsignedIntValue], 32UL));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
             }
 
             NextTest();
@@ -44085,134 +43340,142 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatCapacityFromServerDut_25()
+    CHIP_ERROR TestPowerOffDut_15()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeBatteryCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatCapacity from Server DUT Error: %@", err);
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("batteryCapacity", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_16()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatQuantityFromServerDut_26()
+    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_17()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryQuantityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatQuantity from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryQuantity", "", "uint8"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatChargeStateFromServerDut_27()
+    CHIP_ERROR TestThWritesNullToStartUpOnOffAttributeOfDut_18()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryChargeStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatChargeState from Server DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id startUpOnOffArgument;
+        startUpOnOffArgument = nil;
+        [cluster writeAttributeStartUpOnOffWithValue:startUpOnOffArgument
+                                   completionHandler:^(NSError * _Nullable err) {
+                                       NSLog(@"TH writes NULL to StartUpOnOff attribute of DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("batteryChargeState", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("batteryChargeState", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("batteryChargeState", [value unsignedCharValue], 3));
-            }
+                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                       NextTest();
+                                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatTimeToFullChargeFromServerDut_28()
+    CHIP_ERROR TestPowerOffDut_19()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeBatteryTimeToFullChargeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatTimeToFullCharge from Server DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("batteryTimeToFullCharge", "", "uint32"));
-            NextTest();
-        }];
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_20()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatFunctionalWhileChargingFromServerDut_29()
+    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_21()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatFunctionalWhileCharging from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryFunctionalWhileCharging", "", "bool"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 1));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsBatChargingCurrentFromServerDut_30()
+    CHIP_ERROR TestThSendsOffCommandToDut_22()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBatteryChargingCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads BatChargingCurrent from Server DUT Error: %@", err);
+        [cluster offWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"TH sends Off command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("batteryChargingCurrent", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTestHarnessClientReadsActiveBatChargeFaultsFromServerDut_31()
+    CHIP_ERROR TestPowerOffDut_23()
+    {
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
+    }
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_24()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestThReadsTheOnOffAttributeFromTheDut_25()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestOnOff * cluster = [[CHIPTestOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeActiveBatteryChargeFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Test Harness Client reads ActiveBatChargeFaults from Server DUT Error: %@", err);
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the OnOff attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("activeBatteryChargeFaults", "", "list"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OnOff", actualValue, 0));
+            }
+
             NextTest();
         }];
 
@@ -44220,11 +43483,11 @@ class Test_TC_PS_2_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_PRS_1_1 : public TestCommandBridge {
+class Test_TC_PS_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_PRS_1_1()
-        : TestCommandBridge("Test_TC_PRS_1_1")
+    Test_TC_PS_1_1()
+        : TestCommandBridge("Test_TC_PS_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -44234,7 +43497,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_PRS_1_1() {}
+    ~Test_TC_PS_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -44242,11 +43505,11 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PRS_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PS_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -44263,62 +43526,38 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the global attribute: ClusterRevision\n");
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
             err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
-            break;
-        case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : Write the default values to mandatory global attribute: ClusterRevision\n");
-            err = TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads back global attribute: ClusterRevision\n");
-            err = TestReadsBackGlobalAttributeClusterRevision_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global mandatory attribute constraints: AttributeList\n");
-            err = TestReadTheGlobalMandatoryAttributeConstraintsAttributeList_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
-                "supported events.\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6();
+            err = TestReadTheGlobalAttributeAttributeList_2();
             break;
-        case 7:
+        case 3:
             ChipLogProgress(chipTool,
-                " ***** Test Step 7 : Read AcceptedCommandList attribute from the DUT and Verify that the DUT response\n");
+                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                "supported events.\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_7();
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
             break;
-        case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : Read GeneratedCommandList attribute from the DUT and Verify that the DUT response\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_8();
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
+            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
             break;
-        case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : Read FeatureMap attribute from the DUT and Verify that the DUT response\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9();
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : read the optional global attribute: FeatureMap\n");
+            err = TestReadTheOptionalGlobalAttributeFeatureMap_6();
             break;
         }
 
@@ -44341,7 +43580,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -44352,15 +43591,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -44374,7 +43604,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -44391,156 +43621,143 @@ class Test_TC_PRS_1_1 : public TestCommandBridge {
     CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: ClusterRevision Error: %@", err);
+            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
             }
 
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(11)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 14UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 15UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 16UL));
+                VerifyOrReturn(CheckValue("", actualValue[6], 65528UL));
+                VerifyOrReturn(CheckValue("", actualValue[7], 65529UL));
+                VerifyOrReturn(CheckValue("", actualValue[8], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[9], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[10], 65533UL));
+            }
+
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id clusterRevisionArgument;
-        clusterRevisionArgument = [NSNumber numberWithUnsignedShort:3U];
-        [cluster
-            writeAttributeClusterRevisionWithValue:clusterRevisionArgument
-                                 completionHandler:^(NSError * _Nullable err) {
-                                     NSLog(
-                                         @"Write the default values to mandatory global attribute: ClusterRevision Error: %@", err);
-
-                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                     NextTest();
-                                 }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadsBackGlobalAttributeClusterRevision_4()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads back global attribute: ClusterRevision Error: %@", err);
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AcceptedCommandList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
+                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(0)));
             }
 
+            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalMandatoryAttributeConstraintsAttributeList_5()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global mandatory attribute constraints: AttributeList Error: %@", err);
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: GeneratedCommandList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+            }
+
+            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6()
+    CHIP_ERROR TestReadTheOptionalGlobalAttributeFeatureMap_6()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_7()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the optional global attribute: FeatureMap Error: %@", err);
 
-    CHIP_ERROR TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_8()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    CHIP_ERROR TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter '0' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("0garbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 2UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_PRS_2_1 : public TestCommandBridge {
+class Test_TC_PS_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_PRS_2_1()
-        : TestCommandBridge("Test_TC_PRS_2_1")
+    Test_TC_PS_2_1()
+        : TestCommandBridge("Test_TC_PS_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -44550,7 +43767,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_PRS_2_1() {}
+    ~Test_TC_PS_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -44558,11 +43775,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PRS_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PS_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -44579,81 +43796,349 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the mandatory attribute constraints: MeasuredValue\n");
-            err = TestReadTheMandatoryAttributeConstraintsMeasuredValue_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Test Harness Client reads Status attribute from Server DUT\n");
+            err = TestTestHarnessClientReadsStatusAttributeFromServerDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the mandatory attribute constraints: MinMeasuredValue\n");
-            err = TestReadTheMandatoryAttributeConstraintsMinMeasuredValue_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Test Harness Client reads Order attribute from Server DUT\n");
+            err = TestTestHarnessClientReadsOrderAttributeFromServerDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the mandatory attribute constraints: MaxMeasuredValue\n");
-            err = TestReadTheMandatoryAttributeConstraintsMaxMeasuredValue_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Test Harness Client reads Description attribute from Server DUT\n");
+            err = TestTestHarnessClientReadsDescriptionAttributeFromServerDut_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the optional attribute: Tolerance\n");
-            err = TestReadTheOptionalAttributeTolerance_4();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredAssessedInputVoltageAttribueFromServerDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the optional attribute: ScaledValue\n");
-            err = TestReadTheOptionalAttributeScaledValue_5();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredAssessedInputFrequencyAttributeFromServerDut_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the optional attribute: MinScaledValue\n");
-            err = TestReadTheOptionalAttributeMinScaledValue_6();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : Test Harness Client reads WiredCurrentType attribute from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredCurrentTypeAttributeFromServerDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read the optional attribute: MaxScaledValue\n");
-            err = TestReadTheOptionalAttributeMaxScaledValue_7();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : Test Harness Client reads WiredAssessedCurrent attribute from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredAssessedCurrentAttributeFromServerDut_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read the optional attribute: ScaledTolerance\n");
-            err = TestReadTheOptionalAttributeScaledTolerance_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Test Harness Client reads WiredNominalVoltage from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredNominalVoltageFromServerDut_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Read the optional attribute: Scale\n");
-            err = TestReadTheOptionalAttributeScale_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Test Harness Client reads WiredMaximumCurrent from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredMaximumCurrentFromServerDut_9();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Test Harness Client reads WiredPresent from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsWiredPresentFromServerDut_10();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Test Harness Client reads ActiveWiredFaults from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsActiveWiredFaultsFromServerDut_11();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Test Harness Client reads BatVoltage from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatVoltageFromServerDut_12();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Test Harness Client reads BatPercentRemaining from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatPercentRemainingFromServerDut_13();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Test Harness Client reads BatTimeRemaining from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatTimeRemainingFromServerDut_14();
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Test Harness Client reads BatChargeLevel from Server DUT\n");
+            err = TestTestHarnessClientReadsBatChargeLevelFromServerDut_15();
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Test Harness Client reads BatReplacementNeeded from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatReplacementNeededFromServerDut_16();
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Test Harness Client reads BatReplaceability from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatReplaceabilityFromServerDut_17();
             break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Test Harness Client reads BatPresent from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatPresentFromServerDut_18();
             break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Test Harness Client readsActiveBatFaults from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsActiveBatFaultsFromServerDut_19();
+            break;
+        case 20:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 20 : Test Harness Client reads BatReplacementDescription from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatReplacementDescriptionFromServerDut_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Test Harness Client reads BatCommonDesignation from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatCommonDesignationFromServerDut_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Test Harness Client reads BatANSIDesignation from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatANSIDesignationFromServerDut_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Test Harness Client reads BatIECDesignation from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatIECDesignationFromServerDut_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Test Harness Client reads BatApprovedChemistry from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatApprovedChemistryFromServerDut_24();
+            break;
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Test Harness Client reads BatCapacity from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatCapacityFromServerDut_25();
+            break;
+        case 26:
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Test Harness Client reads BatQuantity from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatQuantityFromServerDut_26();
+            break;
+        case 27:
+            ChipLogProgress(chipTool, " ***** Test Step 27 : Test Harness Client reads BatChargeState from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatChargeStateFromServerDut_27();
+            break;
+        case 28:
+            ChipLogProgress(chipTool, " ***** Test Step 28 : Test Harness Client reads BatTimeToFullCharge from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatTimeToFullChargeFromServerDut_28();
+            break;
+        case 29:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 29 : Test Harness Client reads BatFunctionalWhileCharging from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatFunctionalWhileChargingFromServerDut_29();
+            break;
+        case 30:
+            ChipLogProgress(chipTool, " ***** Test Step 30 : Test Harness Client reads BatChargingCurrent from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsBatChargingCurrentFromServerDut_30();
+            break;
+        case 31:
+            ChipLogProgress(chipTool, " ***** Test Step 31 : Test Harness Client reads ActiveBatChargeFaults from Server DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestTestHarnessClientReadsActiveBatChargeFaultsFromServerDut_31();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 30:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         }
 
@@ -44668,7 +44153,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 32;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -44682,26 +44167,20 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMeasuredValue_1()
+    CHIP_ERROR TestTestHarnessClientReadsStatusAttributeFromServerDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the mandatory attribute constraints: MeasuredValue Error: %@", err);
+        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads Status attribute from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("measuredValue", [value shortValue], -32768));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("measuredValue", [value shortValue], 32767));
-            }
+            VerifyOrReturn(CheckConstraintType("status", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("status", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("status", [value unsignedCharValue], 3));
 
             NextTest();
         }];
@@ -44709,85 +44188,94 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMinMeasuredValue_2()
+    CHIP_ERROR TestTestHarnessClientReadsOrderAttributeFromServerDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the mandatory attribute constraints: MinMeasuredValue Error: %@", err);
+        [cluster readAttributeOrderWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads Order attribute from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -32768));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32767));
-            }
-
+            VerifyOrReturn(CheckConstraintType("order", "", "uint8"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMaxMeasuredValue_3()
+    CHIP_ERROR TestTestHarnessClientReadsDescriptionAttributeFromServerDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the mandatory attribute constraints: MaxMeasuredValue Error: %@", err);
+        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads Description attribute from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], -32768));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
-            }
-
+            VerifyOrReturn(CheckConstraintType("description", "", "string"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeTolerance_4()
+    CHIP_ERROR TestTestHarnessClientReadsWiredAssessedInputVoltageAttribueFromServerDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional attribute: Tolerance Error: %@", err);
+        [cluster
+            readAttributeWiredAssessedInputVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Test Harness Client reads WiredAssessedInputVoltage attribue from Server DUT Error: %@", err);
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                VerifyOrReturn(CheckConstraintType("wiredAssessedInputVoltage", "", "uint32"));
                 NextTest();
-                return;
-            }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsWiredAssessedInputFrequencyAttributeFromServerDut_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeWiredAssessedInputFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Test Harness Client reads WiredAssessedInputFrequency attribute from Server DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                VerifyOrReturn(CheckConstraintType("wiredAssessedInputFrequency", "", "uint16"));
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsWiredCurrentTypeAttributeFromServerDut_6()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeWiredCurrentTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads WiredCurrentType attribute from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("tolerance", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
-            }
+            VerifyOrReturn(CheckConstraintType("wiredCurrentType", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("wiredCurrentType", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("wiredCurrentType", [value unsignedCharValue], 1));
 
             NextTest();
         }];
@@ -44795,441 +44283,470 @@ class Test_TC_PRS_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeScaledValue_5()
+    CHIP_ERROR TestTestHarnessClientReadsWiredAssessedCurrentAttributeFromServerDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional attribute: ScaledValue Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeWiredAssessedCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads WiredAssessedCurrent attribute from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("scaledValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("scaledValue", [value shortValue], -32768));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("scaledValue", [value shortValue], 32767));
-            }
-
+            VerifyOrReturn(CheckConstraintType("wiredAssessedCurrent", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinScaledValue_6()
+    CHIP_ERROR TestTestHarnessClientReadsWiredNominalVoltageFromServerDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional attribute: MinScaledValue Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeWiredNominalVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads WiredNominalVoltage from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minScaledValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minScaledValue", [value shortValue], -32768));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minScaledValue", [value shortValue], 32767));
-            }
-
+            VerifyOrReturn(CheckConstraintType("wiredNominalVoltage", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxScaledValue_7()
+    CHIP_ERROR TestTestHarnessClientReadsWiredMaximumCurrentFromServerDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional attribute: MaxScaledValue Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeWiredMaximumCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads WiredMaximumCurrent from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxScaledValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxScaledValue", [value shortValue], -32768));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxScaledValue", [value shortValue], 32767));
-            }
-
+            VerifyOrReturn(CheckConstraintType("wiredMaximumCurrent", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeScaledTolerance_8()
+    CHIP_ERROR TestTestHarnessClientReadsWiredPresentFromServerDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeScaledToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional attribute: ScaledTolerance Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeWiredPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads WiredPresent from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("scaledTolerance", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("scaledTolerance", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("scaledTolerance", [value unsignedShortValue], 2048U));
-            }
-
+            VerifyOrReturn(CheckConstraintType("wiredPresent", "", "bool"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeScale_9()
+    CHIP_ERROR TestTestHarnessClientReadsActiveWiredFaultsFromServerDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeScaleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional attribute: Scale Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeActiveWiredFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads ActiveWiredFaults from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("scale", "", "int8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int8_t>("scale", [value charValue], -127));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int8_t>("scale", [value charValue], 127));
-            }
-
+            VerifyOrReturn(CheckConstraintType("activeWiredFaults", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_PCC_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_PCC_1_1()
-        : TestCommandBridge("Test_TC_PCC_1_1")
-        , mTestIndex(0)
+    CHIP_ERROR TestTestHarnessClientReadsBatVoltageFromServerDut_12()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatVoltage from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryVoltage", "", "uint32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_PCC_1_1() {}
+    CHIP_ERROR TestTestHarnessClientReadsBatPercentRemainingFromServerDut_13()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+        [cluster readAttributeBatteryPercentRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatPercentRemaining from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryPercentRemaining", "", "uint8"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsBatTimeRemainingFromServerDut_14()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_1_1\n");
-        }
+        [cluster readAttributeBatteryTimeRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatTimeRemaining from Server DUT Error: %@", err);
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PCC_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        Wait();
+            VerifyOrReturn(CheckConstraintType("batteryTimeRemaining", "", "uint32"));
+            NextTest();
+        }];
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads the ClusterRevision attribute from the DUT\n");
-            err = TestThReadsTheClusterRevisionAttributeFromTheDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads the FeatureMap attribute from the DUT\n");
-            err = TestThReadsTheFeatureMapAttributeFromTheDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads the AttributeList attribute from the DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsTheAttributeListAttributeFromTheDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads the EventList attribute from the DUT\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsTheEventListAttributeFromTheDut_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : TH reads the AcceptedCommandList attribute from the DUT\n");
-            err = TestThReadsTheAcceptedCommandListAttributeFromTheDut_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads the GeneratedCommandList attribute from the DUT\n");
-            err = TestThReadsTheGeneratedCommandListAttributeFromTheDut_6();
-            break;
-        }
+        return CHIP_NO_ERROR;
+    }
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+    CHIP_ERROR TestTestHarnessClientReadsBatChargeLevelFromServerDut_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryChargeLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatChargeLevel from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryChargeLevel", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("batteryChargeLevel", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("batteryChargeLevel", [value unsignedCharValue], 2));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestTestHarnessClientReadsBatReplacementNeededFromServerDut_16()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
+        [cluster readAttributeBatteryReplacementNeededWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatReplacementNeeded from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryReplacementNeeded", "", "bool"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    CHIP_ERROR TestTestHarnessClientReadsBatReplaceabilityFromServerDut_17()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryReplaceabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatReplaceability from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryReplaceability", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("batteryReplaceability", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("batteryReplaceability", [value unsignedCharValue], 3));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    CHIP_ERROR TestTestHarnessClientReadsBatPresentFromServerDut_18()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+        [cluster readAttributeBatteryPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatPresent from Server DUT Error: %@", err);
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryPresent", "", "bool"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsActiveBatFaultsFromServerDut_19()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeActiveBatteryFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client readsActiveBatFaults from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("activeBatteryFaults", "", "list"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheClusterRevisionAttributeFromTheDut_1()
+    CHIP_ERROR TestTestHarnessClientReadsBatReplacementDescriptionFromServerDut_20()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the ClusterRevision attribute from the DUT Error: %@", err);
+        [cluster
+            readAttributeBatteryReplacementDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Test Harness Client reads BatReplacementDescription from Server DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                VerifyOrReturn(CheckConstraintType("batteryReplacementDescription", "", "string"));
+                VerifyOrReturn(CheckConstraintMaxLength("batteryReplacementDescription", [value length], 60));
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsBatCommonDesignationFromServerDut_21()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryCommonDesignationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatCommonDesignation from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
-            }
+            VerifyOrReturn(CheckConstraintType("batteryCommonDesignation", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint32_t>("batteryCommonDesignation", [value unsignedIntValue], 0UL));
+            VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("batteryCommonDesignation", [value unsignedIntValue], 80UL));
 
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheFeatureMapAttributeFromTheDut_2()
+    CHIP_ERROR TestTestHarnessClientReadsBatANSIDesignationFromServerDut_22()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the FeatureMap attribute from the DUT Error: %@", err);
+        [cluster readAttributeBatteryANSIDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatANSIDesignation from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL));
-            }
+            VerifyOrReturn(CheckConstraintType("batteryANSIDesignation", "", "string"));
+            VerifyOrReturn(CheckConstraintMaxLength("batteryANSIDesignation", [value length], 20));
+            NextTest();
+        }];
 
-            VerifyOrReturn(CheckConstraintType("featureMap", "", "map32"));
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsBatIECDesignationFromServerDut_23()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryIECDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatIECDesignation from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryIECDesignation", "", "string"));
+            VerifyOrReturn(CheckConstraintMaxLength("batteryIECDesignation", [value length], 20));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheAttributeListAttributeFromTheDut_3()
+    CHIP_ERROR TestTestHarnessClientReadsBatApprovedChemistryFromServerDut_24()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the AttributeList attribute from the DUT Error: %@", err);
+        [cluster readAttributeBatteryApprovedChemistryWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatApprovedChemistry from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(13)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 17UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 18UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 19UL));
-                VerifyOrReturn(CheckValue("", actualValue[6], 32UL));
-                VerifyOrReturn(CheckValue("", actualValue[7], 65528UL));
-                VerifyOrReturn(CheckValue("", actualValue[8], 65529UL));
-                VerifyOrReturn(CheckValue("", actualValue[9], 65530UL));
-                VerifyOrReturn(CheckValue("", actualValue[10], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[11], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[12], 65533UL));
-            }
+            VerifyOrReturn(CheckConstraintType("batteryApprovedChemistry", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint32_t>("batteryApprovedChemistry", [value unsignedIntValue], 0UL));
+            VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("batteryApprovedChemistry", [value unsignedIntValue], 32UL));
 
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheEventListAttributeFromTheDut_4()
+    CHIP_ERROR TestTestHarnessClientReadsBatCapacityFromServerDut_25()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatCapacity from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryCapacity", "", "uint32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheAcceptedCommandListAttributeFromTheDut_5()
+    CHIP_ERROR TestTestHarnessClientReadsBatQuantityFromServerDut_26()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the AcceptedCommandList attribute from the DUT Error: %@", err);
+        [cluster readAttributeBatteryQuantityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatQuantity from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(0)));
-            }
+            VerifyOrReturn(CheckConstraintType("batteryQuantity", "", "uint8"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsBatChargeStateFromServerDut_27()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryChargeStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatChargeState from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryChargeState", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("batteryChargeState", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("batteryChargeState", [value unsignedCharValue], 3));
 
-            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheGeneratedCommandListAttributeFromTheDut_6()
+    CHIP_ERROR TestTestHarnessClientReadsBatTimeToFullChargeFromServerDut_28()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads the GeneratedCommandList attribute from the DUT Error: %@", err);
+        [cluster readAttributeBatteryTimeToFullChargeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatTimeToFullCharge from Server DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
-            }
+            VerifyOrReturn(CheckConstraintType("batteryTimeToFullCharge", "", "uint32"));
+            NextTest();
+        }];
 
-            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsBatFunctionalWhileChargingFromServerDut_29()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatFunctionalWhileCharging from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryFunctionalWhileCharging", "", "bool"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsBatChargingCurrentFromServerDut_30()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBatteryChargingCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads BatChargingCurrent from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("batteryChargingCurrent", "", "uint32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTestHarnessClientReadsActiveBatChargeFaultsFromServerDut_31()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPowerSource * cluster = [[CHIPTestPowerSource alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeActiveBatteryChargeFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Test Harness Client reads ActiveBatChargeFaults from Server DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("activeBatteryChargeFaults", "", "list"));
             NextTest();
         }];
 
@@ -45237,11 +44754,11 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_PCC_2_1 : public TestCommandBridge {
+class Test_TC_PRS_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_PCC_2_1()
-        : TestCommandBridge("Test_TC_PCC_2_1")
+    Test_TC_PRS_1_1()
+        : TestCommandBridge("Test_TC_PRS_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -45251,7 +44768,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_PCC_2_1() {}
+    ~Test_TC_PRS_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -45259,11 +44776,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PCC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PRS_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -45280,200 +44797,356 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: MaxPressure\n");
-            err = TestReadTheMandatoryAttributeMaxPressure_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the global attribute: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: MaxSpeed\n");
-            err = TestReadTheMandatoryAttributeMaxSpeed_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute constraints: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeConstraintsClusterRevision_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : read the mandatory attribute: MaxFlow\n");
-            err = TestReadTheMandatoryAttributeMaxFlow_3();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : Write the default values to mandatory global attribute: ClusterRevision\n");
+            err = TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : read the mandatory attribute: EffectiveOperationMode\n");
-            err = TestReadTheMandatoryAttributeEffectiveOperationMode_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads back global attribute: ClusterRevision\n");
+            err = TestReadsBackGlobalAttributeClusterRevision_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : read the mandatory attribute: EffectiveControlMode\n");
-            err = TestReadTheMandatoryAttributeEffectiveControlMode_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global mandatory attribute constraints: AttributeList\n");
+            err = TestReadTheGlobalMandatoryAttributeConstraintsAttributeList_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : read the mandatory attribute: Capacity\n");
-            err = TestReadTheMandatoryAttributeCapacity_6();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 6 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                "supported events.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : read the mandatory attribute: MaxPressure\n");
-            err = TestReadTheMandatoryAttributeMaxPressure_7();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 7 : Read AcceptedCommandList attribute from the DUT and Verify that the DUT response\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : read the mandatory attribute: MaxSpeed\n");
-            err = TestReadTheMandatoryAttributeMaxSpeed_8();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 8 : Read GeneratedCommandList attribute from the DUT and Verify that the DUT response\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : read the mandatory attribute: MaxFlow\n");
-            err = TestReadTheMandatoryAttributeMaxFlow_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : read the mandatory attribute: EffectiveOperationMode\n");
-            err = TestReadTheMandatoryAttributeEffectiveOperationMode_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : read the mandatory attribute: EffectiveControlMode\n");
-            err = TestReadTheMandatoryAttributeEffectiveControlMode_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : read the mandatory attribute: Capacity\n");
-            err = TestReadTheMandatoryAttributeCapacity_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : read the optional attribute: MinConstPressure\n");
-            err = TestReadTheOptionalAttributeMinConstPressure_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : read the optional attribute: MaxConstPressure\n");
-            err = TestReadTheOptionalAttributeMaxConstPressure_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : read the optional attribute: MinCompPressure\n");
-            err = TestReadTheOptionalAttributeMinCompPressure_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : read the optional attribute: MaxCompPressure\n");
-            err = TestReadTheOptionalAttributeMaxCompPressure_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : read the optional attribute: MinConstSpeed\n");
-            err = TestReadTheOptionalAttributeMinConstSpeed_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : read the optional attribute: MaxConstSpeed\n");
-            err = TestReadTheOptionalAttributeMaxConstSpeed_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : read the optional attribute: MinConstFlow\n");
-            err = TestReadTheOptionalAttributeMinConstFlow_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : read the optional attribute: MaxConstFlow\n");
-            err = TestReadTheOptionalAttributeMaxConstFlow_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : read the optional attribute: MinConstTemp\n");
-            err = TestReadTheOptionalAttributeMinConstTemp_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : read the optional attribute: MaxConstTemp\n");
-            err = TestReadTheOptionalAttributeMaxConstTemp_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : read the optional attribute: PumpStatus\n");
-            err = TestReadTheOptionalAttributePumpStatus_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : read the optional attribute: PumpStatus\n");
-            err = TestReadTheOptionalAttributePumpStatus_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : read the optional attribute: Speed\n");
-            err = TestReadTheOptionalAttributeSpeed_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : read the optional attribute: LifetimeRunningHours\n");
-            err = TestReadTheOptionalAttributeLifetimeRunningHours_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : read the optional attribute: LifetimeRunningHours\n");
-            err = TestReadTheOptionalAttributeLifetimeRunningHours_27();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : Read FeatureMap attribute from the DUT and Verify that the DUT response\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9();
             break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : read the optional attribute: Power\n");
-            err = TestReadTheOptionalAttributePower_28();
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : read the optional attribute: LifetimeEnergyConsumed\n");
-            err = TestReadTheOptionalAttributeLifetimeEnergyConsumed_29();
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : read the optional attribute: LifetimeEnergyConsumed\n");
-            err = TestReadTheOptionalAttributeLifetimeEnergyConsumed_30();
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : write to the optional attribute: LifetimeEnergyConsumed\n");
-            err = TestWriteToTheOptionalAttributeLifetimeEnergyConsumed_31();
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
             break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : read the optional attribute: MinConstPressure\n");
-            err = TestReadTheOptionalAttributeMinConstPressure_32();
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : read the optional attribute: MaxConstPressure\n");
-            err = TestReadTheOptionalAttributeMaxConstPressure_33();
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : read the optional attribute: MinCompPressure\n");
-            err = TestReadTheOptionalAttributeMinCompPressure_34();
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : read the optional attribute: MaxCompPressure\n");
-            err = TestReadTheOptionalAttributeMaxCompPressure_35();
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : read the optional attribute: MinConstSpeed\n");
-            err = TestReadTheOptionalAttributeMinConstSpeed_36();
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : read the optional attribute: MaxConstSpeed\n");
-            err = TestReadTheOptionalAttributeMaxConstSpeed_37();
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 38:
-            ChipLogProgress(chipTool, " ***** Test Step 38 : read the optional attribute: MinConstFlow\n");
-            err = TestReadTheOptionalAttributeMinConstFlow_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : read the optional attribute: MaxConstFlow\n");
-            err = TestReadTheOptionalAttributeMaxConstFlow_39();
-            break;
-        case 40:
-            ChipLogProgress(chipTool, " ***** Test Step 40 : read the optional attribute: MinConstTemp\n");
-            err = TestReadTheOptionalAttributeMinConstTemp_40();
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 10;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: ClusterRevision Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute constraints: ClusterRevision Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWriteTheDefaultValuesToMandatoryGlobalAttributeClusterRevision_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id clusterRevisionArgument;
+        clusterRevisionArgument = [NSNumber numberWithUnsignedShort:3U];
+        [cluster
+            writeAttributeClusterRevisionWithValue:clusterRevisionArgument
+                                 completionHandler:^(NSError * _Nullable err) {
+                                     NSLog(
+                                         @"Write the default values to mandatory global attribute: ClusterRevision Error: %@", err);
+
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                     NextTest();
+                                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackGlobalAttributeClusterRevision_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back global attribute: ClusterRevision Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalMandatoryAttributeConstraintsAttributeList_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global mandatory attribute constraints: AttributeList Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_6()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_7()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponse_8()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadFeatureMapAttributeFromTheDutAndVerifyThatTheDutResponse_9()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter '0' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("0garbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+};
+
+class Test_TC_PRS_2_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_PRS_2_1()
+        : TestCommandBridge("Test_TC_PRS_2_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_PRS_2_1() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_2_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PRS_2_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : read the optional attribute: MaxConstTemp\n");
-            err = TestReadTheOptionalAttributeMaxConstTemp_41();
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the mandatory attribute constraints: MeasuredValue\n");
+            err = TestReadTheMandatoryAttributeConstraintsMeasuredValue_1();
             break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : read the optional attribute: PumpStatus\n");
-            err = TestReadTheOptionalAttributePumpStatus_42();
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the mandatory attribute constraints: MinMeasuredValue\n");
+            err = TestReadTheMandatoryAttributeConstraintsMinMeasuredValue_2();
             break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : read the optional attribute: PumpStatus\n");
-            err = TestReadTheOptionalAttributePumpStatus_43();
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the mandatory attribute constraints: MaxMeasuredValue\n");
+            err = TestReadTheMandatoryAttributeConstraintsMaxMeasuredValue_3();
             break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : read the optional attribute: Speed\n");
-            err = TestReadTheOptionalAttributeSpeed_44();
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the optional attribute: Tolerance\n");
+            err = TestReadTheOptionalAttributeTolerance_4();
             break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : read the optional attribute: LifetimeRunningHours\n");
-            err = TestReadTheOptionalAttributeLifetimeRunningHours_45();
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the optional attribute: ScaledValue\n");
+            err = TestReadTheOptionalAttributeScaledValue_5();
             break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : read the optional attribute: LifetimeRunningHours\n");
-            err = TestReadTheOptionalAttributeLifetimeRunningHours_46();
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the optional attribute: MinScaledValue\n");
+            err = TestReadTheOptionalAttributeMinScaledValue_6();
             break;
-        case 47:
-            ChipLogProgress(chipTool, " ***** Test Step 47 : read the optional attribute: Power\n");
-            err = TestReadTheOptionalAttributePower_47();
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read the optional attribute: MaxScaledValue\n");
+            err = TestReadTheOptionalAttributeMaxScaledValue_7();
             break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : read the optional attribute: LifetimeEnergyConsumed\n");
-            err = TestReadTheOptionalAttributeLifetimeEnergyConsumed_48();
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read the optional attribute: ScaledTolerance\n");
+            err = TestReadTheOptionalAttributeScaledTolerance_8();
             break;
-        case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : read the optional attribute: LifetimeEnergyConsumed\n");
-            err = TestReadTheOptionalAttributeLifetimeEnergyConsumed_49();
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Read the optional attribute: Scale\n");
+            err = TestReadTheOptionalAttributeScale_9();
             break;
         }
 
@@ -45516,126 +45189,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -45649,7 +45202,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 50;
+    const uint16_t mTestCount = 10;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -45663,187 +45216,396 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxPressure_1()
+    CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMeasuredValue_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxPressure Error: %@", err);
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the mandatory attribute constraints: MeasuredValue Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxPressure", "", "int16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("measuredValue", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("measuredValue", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxSpeed_2()
+    CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMinMeasuredValue_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxSpeed Error: %@", err);
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the mandatory attribute constraints: MinMeasuredValue Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxSpeed", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxFlow_3()
+    CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMaxMeasuredValue_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxFlow Error: %@", err);
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the mandatory attribute constraints: MaxMeasuredValue Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxFlow", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeEffectiveOperationMode_4()
+    CHIP_ERROR TestReadTheOptionalAttributeTolerance_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEffectiveOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: EffectiveOperationMode Error: %@", err);
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: Tolerance Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("effectiveOperationMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintType("tolerance", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeEffectiveControlMode_5()
+    CHIP_ERROR TestReadTheOptionalAttributeScaledValue_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEffectiveControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: EffectiveControlMode Error: %@", err);
+        [cluster readAttributeScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: ScaledValue Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("effectiveControlMode", "", "enum8"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("scaledValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("scaledValue", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("scaledValue", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeCapacity_6()
+    CHIP_ERROR TestReadTheOptionalAttributeMinScaledValue_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: Capacity Error: %@", err);
+        [cluster readAttributeMinScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MinScaledValue Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("capacity", "", "int16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minScaledValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minScaledValue", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minScaledValue", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxPressure_7()
+    CHIP_ERROR TestReadTheOptionalAttributeMaxScaledValue_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxPressure Error: %@", err);
+        [cluster readAttributeMaxScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MaxScaledValue Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxPressure", "", "int16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxScaledValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxScaledValue", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxScaledValue", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxSpeed_8()
+    CHIP_ERROR TestReadTheOptionalAttributeScaledTolerance_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxSpeed Error: %@", err);
+        [cluster readAttributeScaledToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: ScaledTolerance Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxSpeed", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("scaledTolerance", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("scaledTolerance", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("scaledTolerance", [value unsignedShortValue], 2048U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxFlow_9()
+    CHIP_ERROR TestReadTheOptionalAttributeScale_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestPressureMeasurement * cluster = [[CHIPTestPressureMeasurement alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxFlow Error: %@", err);
+        [cluster readAttributeScaleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: Scale Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxFlow", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("scale", "", "int8"));
+            VerifyOrReturn(CheckConstraintMinValue<int8_t>("scale", [value charValue], -127));
+            VerifyOrReturn(CheckConstraintMaxValue<int8_t>("scale", [value charValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
+
+class Test_TC_PCC_1_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_PCC_1_1()
+        : TestCommandBridge("Test_TC_PCC_1_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_PCC_1_1() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_1_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PCC_1_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads the ClusterRevision attribute from the DUT\n");
+            err = TestThReadsTheClusterRevisionAttributeFromTheDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads the FeatureMap attribute from the DUT\n");
+            err = TestThReadsTheFeatureMapAttributeFromTheDut_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads the AttributeList attribute from the DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestThReadsTheAttributeListAttributeFromTheDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads the EventList attribute from the DUT\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestThReadsTheEventListAttributeFromTheDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : TH reads the AcceptedCommandList attribute from the DUT\n");
+            err = TestThReadsTheAcceptedCommandListAttributeFromTheDut_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads the GeneratedCommandList attribute from the DUT\n");
+            err = TestThReadsTheGeneratedCommandListAttributeFromTheDut_6();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 7;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeEffectiveOperationMode_10()
+    CHIP_ERROR TestThReadsTheClusterRevisionAttributeFromTheDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45851,19 +45613,24 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEffectiveOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: EffectiveOperationMode Error: %@", err);
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the ClusterRevision attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("effectiveOperationMode", "", "enum8"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
+            }
+
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeEffectiveControlMode_11()
+    CHIP_ERROR TestThReadsTheFeatureMapAttributeFromTheDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45871,19 +45638,24 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEffectiveControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: EffectiveControlMode Error: %@", err);
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the FeatureMap attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("effectiveControlMode", "", "enum8"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL));
+            }
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "", "map32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeCapacity_12()
+    CHIP_ERROR TestThReadsTheAttributeListAttributeFromTheDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45891,19 +45663,46 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: Capacity Error: %@", err);
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the AttributeList attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("capacity", "", "int16"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(13)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 17UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 18UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 19UL));
+                VerifyOrReturn(CheckValue("", actualValue[6], 32UL));
+                VerifyOrReturn(CheckValue("", actualValue[7], 65528UL));
+                VerifyOrReturn(CheckValue("", actualValue[8], 65529UL));
+                VerifyOrReturn(CheckValue("", actualValue[9], 65530UL));
+                VerifyOrReturn(CheckValue("", actualValue[10], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[11], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[12], 65533UL));
+            }
+
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstPressure_13()
+    CHIP_ERROR TestThReadsTheEventListAttributeFromTheDut_4()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestThReadsTheAcceptedCommandListAttributeFromTheDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45911,24 +45710,24 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstPressure Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the AcceptedCommandList attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minConstPressure", "", "int16"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+            }
+
+            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstPressure_14()
+    CHIP_ERROR TestThReadsTheGeneratedCommandListAttributeFromTheDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45936,24 +45735,269 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstPressure Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads the GeneratedCommandList attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstPressure", "", "int16"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+            }
+
+            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
+
+class Test_TC_PCC_2_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_PCC_2_1()
+        : TestCommandBridge("Test_TC_PCC_2_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_PCC_2_1() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_PCC_2_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the mandatory attribute: MaxPressure\n");
+            err = TestReadTheMandatoryAttributeMaxPressure_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the mandatory attribute: MaxSpeed\n");
+            err = TestReadTheMandatoryAttributeMaxSpeed_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the mandatory attribute: MaxFlow\n");
+            err = TestReadTheMandatoryAttributeMaxFlow_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the optional attribute: MinConstPressure\n");
+            err = TestReadTheOptionalAttributeMinConstPressure_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the optional attribute: MaxConstPressure\n");
+            err = TestReadTheOptionalAttributeMaxConstPressure_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the optional attribute: MinCompPressure\n");
+            err = TestReadTheOptionalAttributeMinCompPressure_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read the optional attribute: MaxCompPressure\n");
+            err = TestReadTheOptionalAttributeMaxCompPressure_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read the optional attribute: MinConstSpeed\n");
+            err = TestReadTheOptionalAttributeMinConstSpeed_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Read the optional attribute: MaxConstSpeed\n");
+            err = TestReadTheOptionalAttributeMaxConstSpeed_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Read the optional attribute: MinConstFlow\n");
+            err = TestReadTheOptionalAttributeMinConstFlow_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Read the optional attribute: MaxConstFlow\n");
+            err = TestReadTheOptionalAttributeMaxConstFlow_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Read the optional attribute: MinConstTemp\n");
+            err = TestReadTheOptionalAttributeMinConstTemp_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Read the optional attribute: MaxConstTemp\n");
+            err = TestReadTheOptionalAttributeMaxConstTemp_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Read the optional attribute: PumpStatus\n");
+            err = TestReadTheOptionalAttributePumpStatus_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Read attribute: EffectiveOperationMode\n");
+            err = TestReadAttributeEffectiveOperationMode_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Read attribute: EffectiveControlMode\n");
+            err = TestReadAttributeEffectiveControlMode_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Read attribute: Capacity\n");
+            err = TestReadAttributeCapacity_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Read the optional attribute: Speed\n");
+            err = TestReadTheOptionalAttributeSpeed_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Read the optional attribute: LifetimeRunningHours\n");
+            err = TestReadTheOptionalAttributeLifetimeRunningHours_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Read the optional attribute: Power\n");
+            err = TestReadTheOptionalAttributePower_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Read the optional attribute: LifetimeEnergyConsumed\n");
+            err = TestReadTheOptionalAttributeLifetimeEnergyConsumed_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Read optional attribute: OperationMode\n");
+            err = TestReadOptionalAttributeOperationMode_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Read optional attribute: ControlMode\n");
+            err = TestReadOptionalAttributeControlMode_23();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 24;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinCompPressure_15()
+    CHIP_ERROR TestReadTheMandatoryAttributeMaxPressure_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45961,24 +46005,25 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinCompPressure Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeMaxPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the mandatory attribute: MaxPressure Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minCompPressure", "", "int16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxPressure", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxPressure", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxPressure", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxCompPressure_16()
+    CHIP_ERROR TestReadTheMandatoryAttributeMaxSpeed_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -45986,24 +46031,25 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxCompPressure Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeMaxSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the mandatory attribute: MaxSpeed Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxCompPressure", "", "int16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxSpeed", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxSpeed", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("maxSpeed", [value unsignedShortValue], 65535U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstSpeed_17()
+    CHIP_ERROR TestReadTheMandatoryAttributeMaxFlow_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46011,24 +46057,25 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstSpeed Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeMaxFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the mandatory attribute: MaxFlow Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minConstSpeed", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxFlow", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxFlow", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("maxFlow", [value unsignedShortValue], 65535U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstSpeed_18()
+    CHIP_ERROR TestReadTheOptionalAttributeMinConstPressure_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46036,8 +46083,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstSpeed Error: %@", err);
+        [cluster readAttributeMinConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MinConstPressure Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46046,14 +46093,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstSpeed", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minConstPressure", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minConstPressure", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minConstPressure", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstFlow_19()
+    CHIP_ERROR TestReadTheOptionalAttributeMaxConstPressure_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46061,8 +46114,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstFlow Error: %@", err);
+        [cluster readAttributeMaxConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MaxConstPressure Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46071,14 +46124,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minConstFlow", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxConstPressure", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxConstPressure", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxConstPressure", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstFlow_20()
+    CHIP_ERROR TestReadTheOptionalAttributeMinCompPressure_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46086,8 +46145,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstFlow Error: %@", err);
+        [cluster readAttributeMinCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MinCompPressure Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46096,14 +46155,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstFlow", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minCompPressure", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minCompPressure", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minCompPressure", [value shortValue], 32767));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstTemp_21()
+    CHIP_ERROR TestReadTheOptionalAttributeMaxCompPressure_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46111,8 +46176,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstTemp Error: %@", err);
+        [cluster readAttributeMaxCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MaxCompPressure Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46121,9 +46186,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minConstTemp", "", "int16"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minConstTemp", [value shortValue], -27315));
+
+                VerifyOrReturn(CheckConstraintType("maxCompPressure", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxCompPressure", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxCompPressure", [value shortValue], 32767));
             }
 
             NextTest();
@@ -46132,7 +46199,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstTemp_22()
+    CHIP_ERROR TestReadTheOptionalAttributeMinConstSpeed_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46140,8 +46207,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstTemp Error: %@", err);
+        [cluster readAttributeMinConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MinConstSpeed Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46150,38 +46217,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstTemp", "", "int16"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxConstTemp", [value shortValue], -27315));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributePumpStatus_23()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: PumpStatus Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PumpStatus", actualValue, 0U));
+                VerifyOrReturn(CheckConstraintType("minConstSpeed", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("minConstSpeed", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("minConstSpeed", [value unsignedShortValue], 65535U));
             }
 
             NextTest();
@@ -46190,7 +46230,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributePumpStatus_24()
+    CHIP_ERROR TestReadTheOptionalAttributeMaxConstSpeed_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46198,8 +46238,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: PumpStatus Error: %@", err);
+        [cluster readAttributeMaxConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MaxConstSpeed Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46208,39 +46248,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("pumpStatus", "", "map16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeSpeed_25()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: Speed Error: %@", err);
+            if (value != nil) {
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                VerifyOrReturn(CheckConstraintType("maxConstSpeed", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxConstSpeed", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("maxConstSpeed", [value unsignedShortValue], 65535U));
             }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("speed", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeRunningHours_26()
+    CHIP_ERROR TestReadTheOptionalAttributeMinConstFlow_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46248,8 +46269,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeRunningHours Error: %@", err);
+        [cluster readAttributeMinConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MinConstFlow Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46258,44 +46279,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LifetimeRunningHours", actualValue));
-                VerifyOrReturn(CheckValue("LifetimeRunningHours", actualValue, 0UL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeRunningHours_27()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeRunningHours Error: %@", err);
+            if (value != nil) {
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                VerifyOrReturn(CheckConstraintType("minConstFlow", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("minConstFlow", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("minConstFlow", [value unsignedShortValue], 65535U));
             }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("lifetimeRunningHours", "", "uint24"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributePower_28()
+    CHIP_ERROR TestReadTheOptionalAttributeMaxConstFlow_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46303,8 +46300,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: Power Error: %@", err);
+        [cluster readAttributeMaxConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MaxConstFlow Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46313,35 +46310,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("power", "", "uint24"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeEnergyConsumed_29()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeEnergyConsumed Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            if (value != nil) {
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LifetimeEnergyConsumed", actualValue));
-                VerifyOrReturn(CheckValue("LifetimeEnergyConsumed", actualValue, 0UL));
+                VerifyOrReturn(CheckConstraintType("maxConstFlow", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxConstFlow", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("maxConstFlow", [value unsignedShortValue], 65535U));
             }
 
             NextTest();
@@ -46350,7 +46323,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeEnergyConsumed_30()
+    CHIP_ERROR TestReadTheOptionalAttributeMinConstTemp_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46358,8 +46331,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeEnergyConsumed Error: %@", err);
+        [cluster readAttributeMinConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MinConstTemp Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46368,66 +46341,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("lifetimeEnergyConsumed", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWriteToTheOptionalAttributeLifetimeEnergyConsumed_31()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id lifetimeEnergyConsumedArgument;
-        lifetimeEnergyConsumedArgument = [NSNumber numberWithUnsignedInt:0UL];
-        [cluster writeAttributeLifetimeEnergyConsumedWithValue:lifetimeEnergyConsumedArgument
-                                             completionHandler:^(NSError * _Nullable err) {
-                                                 NSLog(@"write to the optional attribute: LifetimeEnergyConsumed Error: %@", err);
-
-                                                 if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                     NextTest();
-                                                     return;
-                                                 }
-
-                                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                 NextTest();
-                                             }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstPressure_32()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMinConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstPressure Error: %@", err);
+            if (value != nil) {
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                VerifyOrReturn(CheckConstraintType("minConstTemp", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minConstTemp", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minConstTemp", [value shortValue], 32767));
             }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("minConstPressure", "", "int16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstPressure_33()
+    CHIP_ERROR TestReadTheOptionalAttributeMaxConstTemp_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46435,8 +46362,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstPressure Error: %@", err);
+        [cluster readAttributeMaxConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: MaxConstTemp Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46445,39 +46372,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstPressure", "", "int16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeMinCompPressure_34()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMinCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinCompPressure Error: %@", err);
+            if (value != nil) {
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                VerifyOrReturn(CheckConstraintType("maxConstTemp", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxConstTemp", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxConstTemp", [value shortValue], 32767));
             }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("minCompPressure", "", "int16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxCompPressure_35()
+    CHIP_ERROR TestReadTheOptionalAttributePumpStatus_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46485,8 +46393,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxCompPressure Error: %@", err);
+        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: PumpStatus Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46495,39 +46403,17 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxCompPressure", "", "int16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstSpeed_36()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMinConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstSpeed Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckConstraintType("pumpStatus", "", "map16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("pumpStatus", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("pumpStatus", [value unsignedShortValue], 8U));
 
-            VerifyOrReturn(CheckConstraintType("minConstSpeed", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstSpeed_37()
+    CHIP_ERROR TestReadAttributeEffectiveOperationMode_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46535,49 +46421,22 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstSpeed Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeEffectiveOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute: EffectiveOperationMode Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstSpeed", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstFlow_38()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMinConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstFlow Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckConstraintType("effectiveOperationMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("effectiveOperationMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("effectiveOperationMode", [value unsignedCharValue], 3));
 
-            VerifyOrReturn(CheckConstraintType("minConstFlow", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstFlow_39()
+    CHIP_ERROR TestReadAttributeEffectiveControlMode_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46585,24 +46444,22 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstFlow Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeEffectiveControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute: EffectiveControlMode Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstFlow", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("effectiveControlMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("effectiveControlMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("effectiveControlMode", [value unsignedCharValue], 7));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMinConstTemp_40()
+    CHIP_ERROR TestReadAttributeCapacity_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46610,22 +46467,16 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MinConstTemp Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute: Capacity Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minConstTemp", "", "int16"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minConstTemp", [value shortValue], -27315));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minConstTemp", [value shortValue], 32767));
+
+                VerifyOrReturn(CheckConstraintType("capacity", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("capacity", [value shortValue], -32768));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("capacity", [value shortValue], 32767));
             }
 
             NextTest();
@@ -46634,7 +46485,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeMaxConstTemp_41()
+    CHIP_ERROR TestReadTheOptionalAttributeSpeed_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46642,8 +46493,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: MaxConstTemp Error: %@", err);
+        [cluster readAttributeSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: Speed Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46652,12 +46503,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxConstTemp", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxConstTemp", [value shortValue], -27315));
-            }
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxConstTemp", [value shortValue], 32767));
+
+                VerifyOrReturn(CheckConstraintType("speed", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("speed", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("speed", [value unsignedShortValue], 65535U));
             }
 
             NextTest();
@@ -46666,7 +46516,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributePumpStatus_42()
+    CHIP_ERROR TestReadTheOptionalAttributeLifetimeRunningHours_19()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46674,8 +46524,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: PumpStatus Error: %@", err);
+        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: LifetimeRunningHours Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46684,43 +46534,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PumpStatus", actualValue, 0U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributePumpStatus_43()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: PumpStatus Error: %@", err);
+            if (value != nil) {
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                VerifyOrReturn(CheckConstraintType("lifetimeRunningHours", "", "uint24"));
+                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("lifetimeRunningHours", [value unsignedIntValue], 0UL));
+                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("lifetimeRunningHours", [value unsignedIntValue], 16777215UL));
             }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("pumpStatus", "", "map16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeSpeed_44()
+    CHIP_ERROR TestReadTheOptionalAttributePower_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46728,8 +46555,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: Speed Error: %@", err);
+        [cluster readAttributePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: Power Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46738,30 +46565,11 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("speed", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeRunningHours_45()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeRunningHours Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            if (value != nil) {
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LifetimeRunningHours", actualValue));
-                VerifyOrReturn(CheckValue("LifetimeRunningHours", actualValue, 0UL));
+                VerifyOrReturn(CheckConstraintType("power", "", "uint24"));
+                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("power", [value unsignedIntValue], 0UL));
+                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("power", [value unsignedIntValue], 16777215UL));
             }
 
             NextTest();
@@ -46770,7 +46578,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeRunningHours_46()
+    CHIP_ERROR TestReadTheOptionalAttributeLifetimeEnergyConsumed_21()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46778,8 +46586,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeRunningHours Error: %@", err);
+        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional attribute: LifetimeEnergyConsumed Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46788,39 +46596,20 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("lifetimeRunningHours", "", "uint24"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributePower_47()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: Power Error: %@", err);
+            if (value != nil) {
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
+                VerifyOrReturn(CheckConstraintType("lifetimeEnergyConsumed", "", "uint32"));
+                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("lifetimeEnergyConsumed", [value unsignedIntValue], 0UL));
+                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("lifetimeEnergyConsumed", [value unsignedIntValue], 4294967295UL));
             }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("power", "", "uint24"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeEnergyConsumed_48()
+    CHIP_ERROR TestReadOptionalAttributeOperationMode_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46828,21 +46617,14 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeEnergyConsumed Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        [cluster readAttributeOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read optional attribute: OperationMode Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LifetimeEnergyConsumed", actualValue));
-                VerifyOrReturn(CheckValue("LifetimeEnergyConsumed", actualValue, 0UL));
-            }
+            VerifyOrReturn(CheckConstraintType("operationMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationMode", [value unsignedCharValue], 3));
 
             NextTest();
         }];
@@ -46850,7 +46632,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeLifetimeEnergyConsumed_49()
+    CHIP_ERROR TestReadOptionalAttributeControlMode_23()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestPumpConfigurationAndControl * cluster = [[CHIPTestPumpConfigurationAndControl alloc] initWithDevice:device
@@ -46858,8 +46640,8 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
                                                                                                               queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: LifetimeEnergyConsumed Error: %@", err);
+        [cluster readAttributeControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read optional attribute: ControlMode Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -46868,7 +46650,10 @@ class Test_TC_PCC_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("lifetimeEnergyConsumed", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("controlMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("controlMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("controlMode", [value unsignedCharValue], 7));
+
             NextTest();
         }];
 
@@ -48814,11 +48599,10 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("measuredValue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("measuredValue", [value unsignedShortValue], 10000U));
             }
 
@@ -48841,11 +48625,10 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("minMeasuredValue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("minMeasuredValue", [value unsignedShortValue], 9999U));
             }
 
@@ -48868,11 +48651,10 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
             if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxMeasuredValue", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("maxMeasuredValue", [value unsignedShortValue], 10000U));
             }
 
@@ -48901,12 +48683,8 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
 
             NextTest();
         }];
@@ -48915,11 +48693,11 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_RH_2_2 : public TestCommandBridge {
+class Test_TC_SWTCH_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_RH_2_2()
-        : TestCommandBridge("Test_TC_RH_2_2")
+    Test_TC_SWTCH_2_1()
+        : TestCommandBridge("Test_TC_SWTCH_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -48929,7 +48707,7 @@ class Test_TC_RH_2_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_RH_2_2() {}
+    ~Test_TC_SWTCH_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -48937,11 +48715,11 @@ class Test_TC_RH_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_SWTCH_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_RH_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_SWTCH_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -48958,24 +48736,16 @@ class Test_TC_RH_2_2 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads constraints of attribute: MinMeasuredValue\n");
-            err = TestReadsConstraintsOfAttributeMinMeasuredValue_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read NumberOfPositions attribute\n");
+            err = TestReadNumberOfPositionsAttribute_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads MeasuredValue attribute from DUT\n");
-            if (ShouldSkip("A_RELATIVEHUMIDITY")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsMeasuredValueAttributeFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read CurrentPosition attribute\n");
+            err = TestReadCurrentPositionAttribute_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the mandatory attribute: MeasuredValue\n");
-            if (ShouldSkip("A_RELATIVEHUMIDITY")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheMandatoryAttributeMeasuredValue_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read MultiPressMax attribute\n");
+            err = TestReadMultiPressMaxAttribute_3();
             break;
         }
 
@@ -49027,74 +48797,75 @@ class Test_TC_RH_2_2 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsConstraintsOfAttributeMinMeasuredValue_1()
+    CHIP_ERROR TestReadNumberOfPositionsAttribute_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestRelativeHumidityMeasurement * cluster = [[CHIPTestRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of attribute: MinMeasuredValue Error: %@", err);
+        [cluster readAttributeNumberOfPositionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read NumberOfPositions attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("minMeasuredValue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("minMeasuredValue", [value unsignedShortValue], 9999U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("number of positions", actualValue, 2));
             }
 
+            VerifyOrReturn(CheckConstraintType("numberOfPositions", "", "uint8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("numberOfPositions", [value unsignedCharValue], 2));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMeasuredValueAttributeFromDut_2()
+    CHIP_ERROR TestReadCurrentPositionAttribute_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestRelativeHumidityMeasurement * cluster = [[CHIPTestRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads MeasuredValue attribute from DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read CurrentPosition attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("measuredValue", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("measuredValue", [value unsignedShortValue], 10000U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("current position", actualValue, 0));
             }
 
+            VerifyOrReturn(CheckConstraintType("currentPosition", "", "uint8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentPosition", [value unsignedCharValue], 0));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_3()
+    CHIP_ERROR TestReadMultiPressMaxAttribute_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestRelativeHumidityMeasurement * cluster = [[CHIPTestRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                           endpoint:1
-                                                                                                              queue:mCallbackQueue];
+        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the mandatory attribute: MeasuredValue Error: %@", err);
+        [cluster readAttributeMultiPressMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read MultiPressMax attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("multi press max", actualValue, 2));
+            }
+
+            VerifyOrReturn(CheckConstraintType("multiPressMax", "", "uint8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("multiPressMax", [value unsignedCharValue], 2));
+
             NextTest();
         }];
 
@@ -49102,11 +48873,11 @@ class Test_TC_RH_2_2 : public TestCommandBridge {
     }
 };
 
-class Test_TC_SWTCH_2_1 : public TestCommandBridge {
+class Test_TC_TM_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_SWTCH_2_1()
-        : TestCommandBridge("Test_TC_SWTCH_2_1")
+    Test_TC_TM_1_1()
+        : TestCommandBridge("Test_TC_TM_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -49116,7 +48887,7 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_SWTCH_2_1() {}
+    ~Test_TC_TM_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -49124,11 +48895,11 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_SWTCH_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TM_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_SWTCH_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TM_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -49145,28 +48916,52 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read NumberOfPositions attribute\n");
-            err = TestReadNumberOfPositionsAttribute_1();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : Read ClusterRevision attribute from the DUT and Verify that the DUT response indicates "
+                "ClusterRevision attribute has the value 4\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadClusterRevisionAttributeFromTheDutAndVerifyThatTheDutResponseIndicatesClusterRevisionAttributeHasTheValue4_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read NumberOfPositions attribute\n");
-            err = TestReadNumberOfPositionsAttribute_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeAttributeList_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read CurrentPosition attribute\n");
-            err = TestReadCurrentPositionAttribute_3();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                "supported events.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read CurrentPosition attribute\n");
-            err = TestReadCurrentPositionAttribute_4();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 4 : Read AcceptedCommandList attribute from the DUT and Verify that the DUT response provides a "
+                "list of supported commands,This list SHALL include all the mandatory commands.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommandsThisListShallIncludeAllTheMandatoryCommands_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read MultiPressMax attribute\n");
-            err = TestReadMultiPressMaxAttribute_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read MultiPressMax attribute\n");
-            err = TestReadMultiPressMaxAttribute_6();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 5 : Read GeneratedCommandList attribute from the DUT and Verify that the DUT response provides a "
+                "list of supported commands.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommands_5();
             break;
         }
 
@@ -49197,9 +48992,6 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -49213,7 +49005,7 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    const uint16_t mTestCount = 6;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -49227,64 +49019,201 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadNumberOfPositionsAttribute_1()
+    CHIP_ERROR
+    TestReadClusterRevisionAttributeFromTheDutAndVerifyThatTheDutResponseIndicatesClusterRevisionAttributeHasTheValue4_1()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter ClusterRevision attribute valuegarbage: not in length on purpose", 44);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("4garbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
+                                                                                                 endpoint:1
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNumberOfPositionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read NumberOfPositions attribute Error: %@", err);
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("number of positions", actualValue, 2));
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(4)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 3UL));
             }
 
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNumberOfPositionsAttribute_2()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
 
-        [cluster readAttributeNumberOfPositionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read NumberOfPositions attribute Error: %@", err);
+    CHIP_ERROR
+    TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommandsThisListShallIncludeAllTheMandatoryCommands_4()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    CHIP_ERROR TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommands_5()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+};
 
-            VerifyOrReturn(CheckConstraintType("numberOfPositions", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("numberOfPositions", [value unsignedCharValue], 2));
-            }
+class Test_TC_TM_2_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_TM_2_1()
+        : TestCommandBridge("Test_TC_TM_2_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-            NextTest();
-        }];
+    ~Test_TC_TM_2_1() {}
 
-        return CHIP_NO_ERROR;
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TM_2_1\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TM_2_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: MeasuredValue\n");
+            err = TestReadTheMandatoryAttributeMeasuredValue_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: MinMeasuredValue\n");
+            err = TestReadTheMandatoryAttributeMinMeasuredValue_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : read the mandatory attribute: MaxMeasuredValue\n");
+            err = TestReadTheMandatoryAttributeMaxMeasuredValue_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : read the optional attribute: Tolerance\n");
+            err = TestReadTheOptionalAttributeTolerance_4();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 5;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadCurrentPositionAttribute_3()
+    CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
+                                                                                                 endpoint:1
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read CurrentPosition attribute Error: %@", err);
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: MeasuredValue Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("current position", actualValue, 0));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
             }
 
             NextTest();
@@ -49293,20 +49222,24 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadCurrentPositionAttribute_4()
+    CHIP_ERROR TestReadTheMandatoryAttributeMinMeasuredValue_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
+                                                                                                 endpoint:1
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read CurrentPosition attribute Error: %@", err);
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: MinMeasuredValue Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPosition", "", "uint8"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("currentPosition", [value unsignedCharValue], 0));
+
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -27315));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32766));
             }
 
             NextTest();
@@ -49315,20 +49248,24 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadMultiPressMaxAttribute_5()
+    CHIP_ERROR TestReadTheMandatoryAttributeMaxMeasuredValue_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
+                                                                                                 endpoint:1
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMultiPressMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read MultiPressMax attribute Error: %@", err);
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: MaxMeasuredValue Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("multi press max", actualValue, 2));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], -27314));
+                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
             }
 
             NextTest();
@@ -49337,21 +49274,27 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadMultiPressMaxAttribute_6()
+    CHIP_ERROR TestReadTheOptionalAttributeTolerance_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
+                                                                                                 endpoint:1
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMultiPressMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read MultiPressMax attribute Error: %@", err);
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the optional attribute: Tolerance Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("multiPressMax", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("multiPressMax", [value unsignedCharValue], 2));
-            }
+            VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
 
             NextTest();
         }];
@@ -49360,11 +49303,11 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_SWTCH_2_2 : public TestCommandBridge {
+class Test_TC_TSTAT_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_SWTCH_2_2()
-        : TestCommandBridge("Test_TC_SWTCH_2_2")
+    Test_TC_TSTAT_1_1()
+        : TestCommandBridge("Test_TC_TSTAT_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -49374,7 +49317,7 @@ class Test_TC_SWTCH_2_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_SWTCH_2_2() {}
+    ~Test_TC_TSTAT_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -49382,11 +49325,11 @@ class Test_TC_SWTCH_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_SWTCH_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_SWTCH_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSTAT_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -49403,152 +49346,48 @@ class Test_TC_SWTCH_2_2 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : User interaction needed\n");
-            err = TestUserInteractionNeeded_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : User interaction needed\n");
-            err = TestUserInteractionNeeded_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the optional global attribute constraints: FeatureMap\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheOptionalGlobalAttributeConstraintsFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read CurrentPosition attribute\n");
-            err = TestReadCurrentPositionAttribute_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeAttributeList_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : User interaction needed\n");
-            err = TestUserInteractionNeeded_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: EventList\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeEventList_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : User interaction needed\n");
-            err = TestUserInteractionNeeded_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : User interaction needed\n");
-            err = TestUserInteractionNeeded_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read CurrentPosition attribute\n");
-            err = TestReadCurrentPositionAttribute_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : User interaction needed\n");
-            err = TestUserInteractionNeeded_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : User interaction needed\n");
-            err = TestUserInteractionNeeded_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : User interaction needed\n");
-            err = TestUserInteractionNeeded_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : User interaction needed\n");
-            err = TestUserInteractionNeeded_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : User interaction needed\n");
-            err = TestUserInteractionNeeded_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : User interaction needed\n");
-            err = TestUserInteractionNeeded_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : User interaction needed\n");
-            err = TestUserInteractionNeeded_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Wait 3000ms\n");
-            err = TestWait3000ms_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : User interaction needed\n");
-            err = TestUserInteractionNeeded_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : User interaction needed\n");
-            err = TestUserInteractionNeeded_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : User interaction needed\n");
-            err = TestUserInteractionNeeded_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : User interaction needed\n");
-            err = TestUserInteractionNeeded_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : User interaction needed\n");
-            err = TestUserInteractionNeeded_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : User interaction needed\n");
-            err = TestUserInteractionNeeded_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Wait 3000ms\n");
-            err = TestWait3000ms_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : User interaction needed\n");
-            err = TestUserInteractionNeeded_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : User interaction needed\n");
-            err = TestUserInteractionNeeded_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : User interaction needed\n");
-            err = TestUserInteractionNeeded_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : User interaction needed\n");
-            err = TestUserInteractionNeeded_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : User interaction needed\n");
-            err = TestUserInteractionNeeded_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : User interaction needed\n");
-            err = TestUserInteractionNeeded_28();
-            break;
-        case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : User interaction needed\n");
-            err = TestUserInteractionNeeded_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : User interaction needed\n");
-            err = TestUserInteractionNeeded_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : User interaction needed\n");
-            err = TestUserInteractionNeeded_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : User interaction needed\n");
-            err = TestUserInteractionNeeded_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : User interaction needed\n");
-            err = TestUserInteractionNeeded_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : User interaction needed\n");
-            err = TestUserInteractionNeeded_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : User interaction needed\n");
-            err = TestUserInteractionNeeded_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : User interaction needed\n");
-            err = TestUserInteractionNeeded_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : User interaction needed\n");
-            err = TestUserInteractionNeeded_37();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
             break;
         }
 
@@ -49582,99 +49421,6 @@ class Test_TC_SWTCH_2_2 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -49688,7 +49434,7 @@ class Test_TC_SWTCH_2_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 38;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -49702,311 +49448,116 @@ class Test_TC_SWTCH_2_2 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestUserInteractionNeeded_1()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Set up subscription to SwitchLatched eventgarbage: not in length on purpose", 42);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_2()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator sets switch to first positiongarbage: not in length on purpose", 38);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadCurrentPositionAttribute_3()
+    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read CurrentPosition attribute Error: %@", err);
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("current position", actualValue, 0));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U));
             }
 
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserInteractionNeeded_4()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator sets switch to second positiongarbage: not in length on purpose", 39);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_5()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Set up subscription to InitialPress eventgarbage: not in length on purpose", 41);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_6()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadCurrentPositionAttribute_7()
+    CHIP_ERROR TestReadTheOptionalGlobalAttributeConstraintsFeatureMap_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestSwitch * cluster = [[CHIPTestSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read CurrentPosition attribute Error: %@", err);
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the optional global attribute constraints: FeatureMap Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("current position", actualValue, 0));
+                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL));
             }
 
+            VerifyOrReturn(CheckConstraintType("featureMap", "", "map32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserInteractionNeeded_8()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator sets switch to second positiongarbage: not in length on purpose", 39);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_9()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Operator does not operate switch (release switch)garbage: not in length on purpose", 49);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_10()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Set up subscription to InitialPress and ShortRelease eventsgarbage: not in length on purpose", 59);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_11()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_12()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_13()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_14()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator operates switch for 5 secondsgarbage: not in length on purpose", 38);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWait3000ms_15()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 3000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_16()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_17()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Set up subscription to InitialPress, LongPress, ShortRelease, LongRelease eventsgarbage: not in length on purpose",
-            80);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_18()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_19()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_20()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_21()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator operates switch for 5 secondsgarbage: not in length on purpose", 38);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWait3000ms_22()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 3000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_23()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_24()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Set up subscription to InitialPress, ShortRelease, MultiPressOngoing, "
-                                               "MultiPressComplete eventsgarbage: not in length on purpose",
-            95);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_25()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator does not operate switchgarbage: not in length on purpose", 32);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_26()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_27()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_28()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator operates switch (press briefly)garbage: not in length on purpose", 40);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestUserInteractionNeeded_29()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestUserInteractionNeeded_30()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-        return UserPrompt("alpha", value);
-    }
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
 
-    CHIP_ERROR TestUserInteractionNeeded_31()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    CHIP_ERROR TestUserInteractionNeeded_32()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-        return UserPrompt("alpha", value);
-    }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(8)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 27UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 28UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 65528UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 65529UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[6], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[7], 65533UL));
+            }
 
-    CHIP_ERROR TestUserInteractionNeeded_33()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
-        return UserPrompt("alpha", value);
-    }
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
+            NextTest();
+        }];
 
-    CHIP_ERROR TestUserInteractionNeeded_34()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
-        return UserPrompt("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserInteractionNeeded_35()
+    CHIP_ERROR TestReadTheGlobalAttributeEventList_4()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestUserInteractionNeeded_36()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Operator operates switch again (press briefly)garbage: not in length on purpose", 46);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestUserInteractionNeeded_37()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Operator releases switchgarbage: not in length on purpose", 24);
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
 };
 
-class Test_TC_TM_1_1 : public TestCommandBridge {
+class Test_TC_TSTAT_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TM_1_1()
-        : TestCommandBridge("Test_TC_TM_1_1")
+    Test_TC_TSTAT_2_1()
+        : TestCommandBridge("Test_TC_TSTAT_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -50016,7 +49567,7 @@ class Test_TC_TM_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_TM_1_1() {}
+    ~Test_TC_TSTAT_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -50024,11 +49575,11 @@ class Test_TC_TM_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TM_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TM_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSTAT_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -50045,234 +49596,415 @@ class Test_TC_TM_1_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 1 : Reads constraints of mandatory attributes from DUT: LocalTemperature\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutLocalTemperature_1();
+            break;
+        case 2:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 2 : Reads constraints of mandatory attributes from DUT: AbsMinHeatSetpointLimit\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutAbsMinHeatSetpointLimit_2();
+            break;
+        case 3:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : Reads constraints of mandatory attributes from DUT: AbsMaxHeatSetpointLimit\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutAbsMaxHeatSetpointLimit_3();
+            break;
+        case 4:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : Reads constraints of optional attributes from DUT: AbsMinCoolSetpointLimit\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutAbsMinCoolSetpointLimit_4();
+            break;
+        case 5:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : Reads constraints of optional attributes from DUT: AbsMaxCoolSetpointLimit\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutAbsMaxCoolSetpointLimit_5();
+            break;
+        case 6:
             ChipLogProgress(chipTool,
-                " ***** Test Step 1 : Read ClusterRevision attribute from the DUT and Verify that the DUT response indicates "
-                "ClusterRevision attribute has the value 4\n");
+                " ***** Test Step 6 : Read PICoolingDemand attribute from the DUT Verify that the DUT responds with a uint8 "
+                "value.The value has to be in the range of 0 to 100\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadClusterRevisionAttributeFromTheDutAndVerifyThatTheDutResponseIndicatesClusterRevisionAttributeHasTheValue4_1();
+            err = TestReadPICoolingDemandAttributeFromTheDutVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_6();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+        case 7:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 7 : Read PIHeatingDemand attribute from the DUT and Verify that the DUT responds with a uint8 "
+                "value.The value has to be in the range of 0 to 100\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeAttributeList_2();
+            err = TestReadPIHeatingDemandAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_7();
             break;
-        case 3:
+        case 8:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : Reads constraints of optional attributes from DUT: OccupiedCoolingSetpoint\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutOccupiedCoolingSetpoint_8();
+            break;
+        case 9:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : Reads constraints of mandatory attributes from DUT: OccupiedHeatingSetpoint\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutOccupiedHeatingSetpoint_9();
+            break;
+        case 10:
             ChipLogProgress(chipTool,
-                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
-                "supported events.\n");
+                " ***** Test Step 10 : Read UnoccupiedCoolingSetpoint attribute from the DUT and Verify that the DUT responds with "
+                "an int16 value\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
+            err = TestReadUnoccupiedCoolingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_10();
             break;
-        case 4:
+        case 11:
             ChipLogProgress(chipTool,
-                " ***** Test Step 4 : Read AcceptedCommandList attribute from the DUT and Verify that the DUT response provides a "
-                "list of supported commands,This list SHALL include all the mandatory commands.\n");
+                " ***** Test Step 11 : Read UnoccupiedHeatingSetpoint attribute from the DUT and Verify that the DUT responds with "
+                "an int16 value\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommandsThisListShallIncludeAllTheMandatoryCommands_4();
+            err = TestReadUnoccupiedHeatingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_11();
             break;
-        case 5:
+        case 12:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 12 : Reads constraints of mandatory attributes from DUT: MinHeatSetpointLimit\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutMinHeatSetpointLimit_12();
+            break;
+        case 13:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 13 : Reads constraints of mandatory attributes from DUT: MaxHeatSetpointLimit\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutMaxHeatSetpointLimit_13();
+            break;
+        case 14:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : Reads constraints of optional attributes from DUT: MinCoolSetpointLimit\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutMinCoolSetpointLimit_14();
+            break;
+        case 15:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 15 : Reads constraints of optional attributes from DUT: MaxCoolSetpointLimit\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutMaxCoolSetpointLimit_15();
+            break;
+        case 16:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : Reads constraints of mandatory attributes from DUT: ControlSequenceOfOperation\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutControlSequenceOfOperation_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Reads constraints of mandatory attributes from DUT: SystemMode\n");
+            err = TestReadsConstraintsOfMandatoryAttributesFromDutSystemMode_17();
+            break;
+        case 18:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : Read OutdoorTemperature attribute from the DUT and Verify the datatype\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadOutdoorTemperatureAttributeFromTheDutAndVerifyTheDatatype_18();
+            break;
+        case 19:
             ChipLogProgress(chipTool,
-                " ***** Test Step 5 : Read GeneratedCommandList attribute from the DUT and Verify that the DUT response provides a "
-                "list of supported commands.\n");
+                " ***** Test Step 19 : Read Occupancy attribute from the DUT and Verify the datatype and response value\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommands_5();
+            err = TestReadOccupancyAttributeFromTheDutAndVerifyTheDatatypeAndResponseValue_19();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 20:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 20 : Read HVACSystemTypeConfiguration attribute from the DUT and Verify that the DUT responds "
+                "with a map8 value. The value has to be in the range of 0x00 to 0x3f\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadHVACSystemTypeConfigurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x3f_20();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 21:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 21 : Read LocalTemperatureCalibration attribute from the DUT and Verify that the DUT responds "
+                "with an int8 value.The value has to be in the range of -25 to 25\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadLocalTemperatureCalibrationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt8ValueTheValueHasToBeInTheRangeOf25To25_21();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 22:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : Reads constraints of optional attributes from DUT: MinSetpointDeadBand\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutMinSetpointDeadBand_22();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 23:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 23 : Read RemoteSensing attribute from the DUT and Verify that the DUT responds with a map8 "
+                "value. The value has to be in the range of 0x00 to 0x07\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadRemoteSensingAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_23();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 24:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 24 : Read AlarmMask attribute from the DUT and Verify that the DUT responds with a map8 "
+                "value.The value has to be in the range of 0x00 to 0x07.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadAlarmMaskAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_24();
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 25:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 25 : Read ThermostatRunningMode attribute from the DUT and Verify that the DUT responds with an "
+                "enum8 value.The value has to be 0, 3 or 4\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadThermostatRunningModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe03Or4_25();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR
-    TestReadClusterRevisionAttributeFromTheDutAndVerifyThatTheDutResponseIndicatesClusterRevisionAttributeHasTheValue4_1()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter ClusterRevision attribute valuegarbage: not in length on purpose", 44);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("4garbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(4)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 3UL));
+        case 26:
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Reads constraints of optional attributes from DUT: StartOfWeek\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutStartOfWeek_26();
+            break;
+        case 27:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 27 : Reads constraints of optional attributes from DUT: NumberOfWeeklyTransitions\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutNumberOfWeeklyTransitions_27();
+            break;
+        case 28:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 28 : Reads constraints of optional attributes from DUT: NumberOfDailyTransitions\n");
+            err = TestReadsConstraintsOfOptionalAttributesFromDutNumberOfDailyTransitions_28();
+            break;
+        case 29:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 29 : Read TemperatureSetpointHold attribute from the DUT and Verify that the DUT responds with "
+                "an enum8 value.The value has to 0 or 1\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
             }
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR
-    TestReadAcceptedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommandsThisListShallIncludeAllTheMandatoryCommands_4()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadGeneratedCommandListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedCommands_5()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-};
-
-class Test_TC_TM_2_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TM_2_1()
-        : TestCommandBridge("Test_TC_TM_2_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_TM_2_1() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TM_2_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TM_2_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            err = TestReadTemperatureSetpointHoldAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasTo0Or1_29();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: MeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMeasuredValue_1();
+        case 30:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 30 : Read TemperatureSetpointHoldDuration attribute from the DUT and Verify that the DUT "
+                "responds with a uint16 value or NULL.The value has to be in the range of 0 to 1440\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTemperatureSetpointHoldDurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16ValueOrNULLTheValueHasToBeInTheRangeOf0To1440_30();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: MinMeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMinMeasuredValue_2();
+        case 31:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 31 : Read ThermostatProgrammingOperationMode attribute from the DUT and Verify that the DUT "
+                "responds with a map8 value.The value has to be in the range of 0x00 to 0x07\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadThermostatProgrammingOperationModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_31();
             break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : read the mandatory attribute: MaxMeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMaxMeasuredValue_3();
+        case 32:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 32 : Read ThermostatRunningState attribute from the DUT and Verify that the DUT responds with a "
+                "map16 value.The value has to be in the range of 0x00 to 0x7F\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadThermostatRunningStateAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap16ValueTheValueHasToBeInTheRangeOf0x00To0x7F_32();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : read the optional attribute: Tolerance\n");
-            err = TestReadTheOptionalAttributeTolerance_4();
+        case 33:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 33 : Read SetpointChangeSource attribute from the DUT and Verify that the DUT responds with an "
+                "enum8 value. The value has to be in the range of 0 to 2\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadSetpointChangeSourceAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To2_33();
+            break;
+        case 34:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 34 : Read SetpointChangeAmount attribute from the DUT and Verify that the DUT responds with an "
+                "int16 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadSetpointChangeAmountAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_34();
+            break;
+        case 35:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 35 : Read SetpointChangeSourceTimestamp attribute from the DUT and Verify that the DUT responds "
+                "with a utc value\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadSetpointChangeSourceTimestampAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUtcValue_35();
+            break;
+        case 36:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 36 : Read OccupiedSetback attribute from the DUT and Verify that the DUT responds with a uint8 "
+                "value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadOccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_36();
+            break;
+        case 37:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 37 : Read OccupiedSetbackMin attribute from the DUT and Verify that the DUT responds with a "
+                "uint8 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadOccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_37();
+            break;
+        case 38:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 38 : Read OccupiedSetbackMax attribute from the DUT and Verify that the DUT responds with a "
+                "uint8 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadOccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_38();
+            break;
+        case 39:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 39 : Read UnoccupiedSetback attribute from the DUT and Verify that the DUT responds with a uint8 "
+                "value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadUnoccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_39();
+            break;
+        case 40:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 40 : Read UnoccupiedSetbackMin attribute from the DUT and Verify that the DUT responds with a "
+                "uint8 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadUnoccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_40();
+            break;
+        case 41:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 41 : Read UnoccupiedSetbackMax attribute from the DUT and Verify that the DUT responds with a "
+                "uint8 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadUnoccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_41();
+            break;
+        case 42:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 42 : Read EmergencyHeatDelta attribute from the DUT and Verify that the DUT responds with a "
+                "uint8 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadEmergencyHeatDeltaAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_42();
+            break;
+        case 43:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 43 : Read ACType attribute from the DUT and Verify that the DUT responds with an enum8 value. "
+                "The value has to be in the range of 0 to 4\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To4_43();
+            break;
+        case 44:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 44 : Read ACCapacity attribute from the DUT and Verify that the DUT responds with a uint16 "
+                "value\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACCapacityAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16Value_44();
+            break;
+        case 45:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 45 : Read ACRefrigerantType attribute from the DUT and VVerify that the DUT responds with an "
+                "enum8 value.The value has to be in the range of 0 to 3\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACRefrigerantTypeAttributeFromTheDutAndVVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_45();
+            break;
+        case 46:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 46 : Read ACCompressorType attribute from the DUT and Verify that the DUT responds with an enum8 "
+                "value.The value has to be in the range of 0 to 3\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACCompressorTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_46();
+            break;
+        case 47:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 47 : Read ACErrorCode attribute from the DUT and Verify that the DUT responds with a map32 "
+                "value\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACErrorCodeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap32Value_47();
+            break;
+        case 48:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 48 : Read ACLouverPosition attribute from the DUT and Verify that the DUT responds with an enum8 "
+                "value.The value has to be in the range of 1 to 5\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACLouverPositionAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf1To5_48();
+            break;
+        case 49:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 49 : Read ACCoilTemperature attribute from the DUT and Verify that the DUT responds with an "
+                "int16 value or NULL\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACCoilTemperatureAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_49();
+            break;
+        case 50:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 50 : Read ACCapacityFormat attribute from the DUT and Verify that the DUT responds with an enum8 "
+                "value.The value has to be 0.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadACCapacityFormatAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe0_50();
             break;
         }
 
@@ -50300,6 +50032,144 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 30:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 32:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 35:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 36:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 42:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 43:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 44:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 45:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 46:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 47:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 48:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 49:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 50:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -50313,7 +50183,7 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 5;
+    const uint16_t mTestCount = 51;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -50327,46 +50197,42 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_1()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutLocalTemperature_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MeasuredValue Error: %@", err);
+        [cluster readAttributeLocalTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: LocalTemperature Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("localTemperature", "", "int16"));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMinMeasuredValue_2()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutAbsMinHeatSetpointLimit_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MinMeasuredValue Error: %@", err);
+        [cluster readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: AbsMinHeatSetpointLimit Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -27315));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32766));
-            }
+            VerifyOrReturn(CheckConstraintType("absMinHeatSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMinHeatSetpointLimit", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMinHeatSetpointLimit", [value shortValue], 3000));
 
             NextTest();
         }];
@@ -50374,26 +50240,20 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxMeasuredValue_3()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutAbsMaxHeatSetpointLimit_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxMeasuredValue Error: %@", err);
+        [cluster readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: AbsMaxHeatSetpointLimit Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], -27314));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
-            }
+            VerifyOrReturn(CheckConstraintType("absMaxHeatSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMaxHeatSetpointLimit", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMaxHeatSetpointLimit", [value shortValue], 3000));
 
             NextTest();
         }];
@@ -50401,16 +50261,14 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeTolerance_4()
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutAbsMinCoolSetpointLimit_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the optional attribute: Tolerance Error: %@", err);
+        [cluster readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: AbsMinCoolSetpointLimit Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -50419,160 +50277,81 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
-            }
+            VerifyOrReturn(CheckConstraintType("absMinCoolSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMinCoolSetpointLimit", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMinCoolSetpointLimit", [value shortValue], 3200));
 
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
-};
-
-class Test_TC_TM_2_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TM_2_2()
-        : TestCommandBridge("Test_TC_TM_2_2")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_TM_2_2() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutAbsMaxCoolSetpointLimit_5()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TM_2_2\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TM_2_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        Wait();
+        [cluster readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: AbsMaxCoolSetpointLimit Error: %@", err);
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: MinMeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMinMeasuredValue_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: MaxMeasuredValue\n");
-            err = TestReadTheMandatoryAttributeMaxMeasuredValue_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads MeasuredValue attribute from DUT\n");
-            if (ShouldSkip("A_TEMPERATURE")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsMeasuredValueAttributeFromDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the mandatory attribute: MeasuredValue\n");
-            if (ShouldSkip("A_TEMPERATURE")) {
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadTheMandatoryAttributeMeasuredValue_4();
-            break;
-        }
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+            VerifyOrReturn(CheckConstraintType("absMaxCoolSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMaxCoolSetpointLimit", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMaxCoolSetpointLimit", [value shortValue], 3200));
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    CHIP_ERROR
+    TestReadPICoolingDemandAttributeFromTheDutVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_6()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 5;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR
+    TestReadPIHeatingDemandAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_7()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMinMeasuredValue_1()
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutOccupiedCoolingSetpoint_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MinMeasuredValue Error: %@", err);
+        [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: OccupiedCoolingSetpoint Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -27315));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32766));
-            }
+            VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 2600));
 
             NextTest();
         }];
@@ -50580,26 +50359,20 @@ class Test_TC_TM_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMaxMeasuredValue_2()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutOccupiedHeatingSetpoint_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: MaxMeasuredValue Error: %@", err);
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: OccupiedHeatingSetpoint Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], -27314));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
-            }
+            VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 2600));
 
             NextTest();
         }];
@@ -50607,270 +50380,227 @@ class Test_TC_TM_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMeasuredValueAttributeFromDut_3()
+    CHIP_ERROR TestReadUnoccupiedCoolingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_10()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadUnoccupiedHeatingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_11()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutMinHeatSetpointLimit_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads MeasuredValue attribute from DUT Error: %@", err);
+        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: MinHeatSetpointLimit Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("minHeatSetpointLimit", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minHeatSetpointLimit", [value shortValue], 3000));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_4()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutMaxHeatSetpointLimit_13()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTemperatureMeasurement * cluster = [[CHIPTestTemperatureMeasurement alloc] initWithDevice:device
-                                                                                                 endpoint:1
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the mandatory attribute: MeasuredValue Error: %@", err);
+        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: MaxHeatSetpointLimit Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 3000));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
-};
-
-class Test_TC_TSTAT_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TSTAT_1_1()
-        : TestCommandBridge("Test_TC_TSTAT_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_TSTAT_1_1() {}
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutMinCoolSetpointLimit_14()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSTAT_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        Wait();
+        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: MinCoolSetpointLimit Error: %@", err);
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the global attribute: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeClusterRevision_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the optional global attribute constraints: FeatureMap\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheOptionalGlobalAttributeConstraintsFeatureMap_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheGlobalAttributeAttributeList_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: EventList\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheGlobalAttributeEventList_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
-            break;
-        }
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+            VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("minCoolSetpointLimit", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minCoolSetpointLimit", [value shortValue], 3200));
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutMaxCoolSetpointLimit_15()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: MaxCoolSetpointLimit Error: %@", err);
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 3200));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutControlSequenceOfOperation_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the global attribute: ClusterRevision Error: %@", err);
+        [cluster
+            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads constraints of mandatory attributes from DUT: ControlSequenceOfOperation Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U));
-            }
+                VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 0));
+                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 5));
 
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalGlobalAttributeConstraintsFeatureMap_2()
+    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutSystemMode_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the optional global attribute constraints: FeatureMap Error: %@", err);
+        [cluster readAttributeSystemModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of mandatory attributes from DUT: SystemMode Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL));
-            }
+            VerifyOrReturn(CheckConstraintType("systemMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("systemMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("systemMode", [value unsignedCharValue], 9));
 
-            VerifyOrReturn(CheckConstraintType("featureMap", "", "map32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
+    CHIP_ERROR TestReadOutdoorTemperatureAttributeFromTheDutAndVerifyTheDatatype_18()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadOccupancyAttributeFromTheDutAndVerifyTheDatatypeAndResponseValue_19()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadHVACSystemTypeConfigurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x3f_20()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadLocalTemperatureCalibrationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt8ValueTheValueHasToBeInTheRangeOf25To25_21()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutMinSetpointDeadBand_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
+        [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: MinSetpointDeadBand Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(8)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 27UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 28UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 65528UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 65529UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[6], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[7], 65533UL));
-            }
+            VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "", "int8"));
+            VerifyOrReturn(CheckConstraintMinValue<int8_t>("minSetpointDeadBand", [value charValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<int8_t>("minSetpointDeadBand", [value charValue], 25));
 
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeEventList_4()
+    CHIP_ERROR
+    TestReadRemoteSensingAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_23()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -50879,7 +50609,8 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
+    CHIP_ERROR
+    TestReadAlarmMaskAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_24()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -50888,7 +50619,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
+    CHIP_ERROR TestReadThermostatRunningModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe03Or4_25()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -50896,43 +50627,321 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
         value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
-};
 
-class Test_TC_TSTAT_2_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TSTAT_2_1()
-        : TestCommandBridge("Test_TC_TSTAT_2_1")
-        , mTestIndex(0)
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutStartOfWeek_26()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~Test_TC_TSTAT_2_1() {}
+        [cluster readAttributeStartOfWeekWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: StartOfWeek Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_2_1\n");
-        }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSTAT_2_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            VerifyOrReturn(CheckConstraintType("startOfWeek", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("startOfWeek", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("startOfWeek", [value unsignedCharValue], 6));
 
-        Wait();
+            NextTest();
+        }];
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutNumberOfWeeklyTransitions_27()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads constraints of optional attributes from DUT: NumberOfWeeklyTransitions Error: %@", err);
+
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                VerifyOrReturn(CheckConstraintType("numberOfWeeklyTransitions", "", "uint8"));
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutNumberOfDailyTransitions_28()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeNumberOfDailyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads constraints of optional attributes from DUT: NumberOfDailyTransitions Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("numberOfDailyTransitions", "", "uint8"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTemperatureSetpointHoldAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasTo0Or1_29()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadTemperatureSetpointHoldDurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16ValueOrNULLTheValueHasToBeInTheRangeOf0To1440_30()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadThermostatProgrammingOperationModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_31()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadThermostatRunningStateAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap16ValueTheValueHasToBeInTheRangeOf0x00To0x7F_32()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadSetpointChangeSourceAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To2_33()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadSetpointChangeAmountAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_34()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadSetpointChangeSourceTimestampAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUtcValue_35()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadOccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_36()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadOccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_37()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadOccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_38()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadUnoccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_39()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadUnoccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_40()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadUnoccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_41()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadEmergencyHeatDeltaAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_42()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadACTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To4_43()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadACCapacityAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16Value_44()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadACRefrigerantTypeAttributeFromTheDutAndVVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_45()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadACCompressorTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_46()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadACErrorCodeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap32Value_47()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR
+    TestReadACLouverPositionAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf1To5_48()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadACCoilTemperatureAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_49()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadACCapacityFormatAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe0_50()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+};
+
+class Test_TC_TSTAT_2_2 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_TSTAT_2_2()
+        : TestCommandBridge("Test_TC_TSTAT_2_2")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_TSTAT_2_2() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_2_2\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSTAT_2_2\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
         // but before our function call returns, we won't end up with an
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
@@ -50941,415 +50950,689 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 1 : Reads constraints of mandatory attributes from DUT: LocalTemperature\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutLocalTemperature_1();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsOccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_1();
             break;
         case 2:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 2 : Reads constraints of mandatory attributes from DUT: AbsMinHeatSetpointLimit\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutAbsMinHeatSetpointLimit_2();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 2 : Writes a value back that is different but valid for OccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueBackThatIsDifferentButValidForOccupiedCoolingSetpointAttribute_2();
             break;
         case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : Reads constraints of mandatory attributes from DUT: AbsMaxHeatSetpointLimit\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutAbsMaxHeatSetpointLimit_3();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 3 : Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedCoolingSetpointAttribute_3();
             break;
         case 4:
             ChipLogProgress(
-                chipTool, " ***** Test Step 4 : Reads constraints of optional attributes from DUT: AbsMinCoolSetpointLimit\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutAbsMinCoolSetpointLimit_4();
+                chipTool, " ***** Test Step 4 : Writes OccupiedCoolingSetpoint to value below the MinCoolSetpointLimit\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesOccupiedCoolingSetpointToValueBelowTheMinCoolSetpointLimit_4();
             break;
         case 5:
             ChipLogProgress(
-                chipTool, " ***** Test Step 5 : Reads constraints of optional attributes from DUT: AbsMaxCoolSetpointLimit\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutAbsMaxCoolSetpointLimit_5();
+                chipTool, " ***** Test Step 5 : Writes OccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesOccupiedCoolingSetpointToValueAboveTheMaxCoolSetpointLimit_5();
             break;
         case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : Read PICoolingDemand attribute from the DUT Verify that the DUT responds with a uint8 "
-                "value.The value has to be in the range of 0 to 100\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadPICoolingDemandAttributeFromTheDutVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_6();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_6();
             break;
         case 7:
             ChipLogProgress(chipTool,
-                " ***** Test Step 7 : Read PIHeatingDemand attribute from the DUT and Verify that the DUT responds with a uint8 "
-                "value.The value has to be in the range of 0 to 100\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 7 : Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadPIHeatingDemandAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_7();
+            err = TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_7();
             break;
         case 8:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 8 : Reads constraints of optional attributes from DUT: OccupiedCoolingSetpoint\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutOccupiedCoolingSetpoint_8();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 8 : Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_8();
             break;
         case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : Reads constraints of mandatory attributes from DUT: OccupiedHeatingSetpoint\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutOccupiedHeatingSetpoint_9();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 9 : Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_9();
             break;
         case 10:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 10 : Read UnoccupiedCoolingSetpoint attribute from the DUT and Verify that the DUT responds with "
-                "an int16 value\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 10 : Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit\n");
+            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadUnoccupiedCoolingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_10();
+            err = TestWritesOccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_10();
             break;
         case 11:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 11 : Read UnoccupiedHeatingSetpoint attribute from the DUT and Verify that the DUT responds with "
-                "an int16 value\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 11 : Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit\n");
+            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadUnoccupiedHeatingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_11();
+            err = TestWritesOccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_11();
             break;
         case 12:
             ChipLogProgress(
-                chipTool, " ***** Test Step 12 : Reads constraints of mandatory attributes from DUT: MinHeatSetpointLimit\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutMinHeatSetpointLimit_12();
+                chipTool, " ***** Test Step 12 : Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_12();
             break;
         case 13:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 13 : Reads constraints of mandatory attributes from DUT: MaxHeatSetpointLimit\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutMaxHeatSetpointLimit_13();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 13 : Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsUnoccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_13();
             break;
         case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : Reads constraints of optional attributes from DUT: MinCoolSetpointLimit\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutMinCoolSetpointLimit_14();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 14 : Writes a value back that is different but valid for UnoccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueBackThatIsDifferentButValidForUnoccupiedCoolingSetpointAttribute_14();
             break;
         case 15:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 15 : Reads constraints of optional attributes from DUT: MaxCoolSetpointLimit\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutMaxCoolSetpointLimit_15();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 15 : Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint "
+                "attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedCoolingSetpointAttribute_15();
             break;
         case 16:
             ChipLogProgress(
-                chipTool, " ***** Test Step 16 : Reads constraints of mandatory attributes from DUT: ControlSequenceOfOperation\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutControlSequenceOfOperation_16();
+                chipTool, " ***** Test Step 16 : Writes UnoccupiedCoolingSetpoint to value below the MinHeatSetpointLimit\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesUnoccupiedCoolingSetpointToValueBelowTheMinHeatSetpointLimit_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Reads constraints of mandatory attributes from DUT: SystemMode\n");
-            err = TestReadsConstraintsOfMandatoryAttributesFromDutSystemMode_17();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 17 : Writes UnoccupiedCoolingSetpoint to value above the MaxHeatSetpointLimit\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesUnoccupiedCoolingSetpointToValueAboveTheMaxHeatSetpointLimit_17();
             break;
         case 18:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 18 : Read OutdoorTemperature attribute from the DUT and Verify the datatype\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 18 : Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadOutdoorTemperatureAttributeFromTheDutAndVerifyTheDatatype_18();
+            err = TestWritesTheLimitOfMinCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_18();
             break;
         case 19:
             ChipLogProgress(chipTool,
-                " ***** Test Step 19 : Read Occupancy attribute from the DUT and Verify the datatype and response value\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 19 : Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadOccupancyAttributeFromTheDutAndVerifyTheDatatypeAndResponseValue_19();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_19();
             break;
         case 20:
             ChipLogProgress(chipTool,
-                " ***** Test Step 20 : Read HVACSystemTypeConfiguration attribute from the DUT and Verify that the DUT responds "
-                "with a map8 value. The value has to be in the range of 0x00 to 0x3f\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 20 : Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadHVACSystemTypeConfigurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x3f_20();
+            err = TestReadsUnoccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_20();
             break;
         case 21:
             ChipLogProgress(chipTool,
-                " ***** Test Step 21 : Read LocalTemperatureCalibration attribute from the DUT and Verify that the DUT responds "
-                "with an int8 value.The value has to be in the range of -25 to 25\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 21 : Writes a value back that is different but valid for UnoccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadLocalTemperatureCalibrationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt8ValueTheValueHasToBeInTheRangeOf25To25_21();
+            err = TestWritesAValueBackThatIsDifferentButValidForUnoccupiedHeatingSetpointAttribute_21();
             break;
         case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : Reads constraints of optional attributes from DUT: MinSetpointDeadBand\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutMinSetpointDeadBand_22();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 22 : Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint "
+                "attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedHeatingSetpointAttribute_22();
             break;
         case 23:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 23 : Read RemoteSensing attribute from the DUT and Verify that the DUT responds with a map8 "
-                "value. The value has to be in the range of 0x00 to 0x07\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 23 : Writes UnoccupiedHeatingSetpoint to value below the MinHeatSetpointLimit\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadRemoteSensingAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_23();
+            err = TestWritesUnoccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_23();
             break;
         case 24:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 24 : Read AlarmMask attribute from the DUT and Verify that the DUT responds with a map8 "
-                "value.The value has to be in the range of 0x00 to 0x07.\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 24 : Writes UnoccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadAlarmMaskAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_24();
+            err = TestWritesUnoccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_24();
             break;
         case 25:
             ChipLogProgress(chipTool,
-                " ***** Test Step 25 : Read ThermostatRunningMode attribute from the DUT and Verify that the DUT responds with an "
-                "enum8 value.The value has to be 0, 3 or 4\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 25 : Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
                 NextTest();
                 return;
             }
-            err = TestReadThermostatRunningModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe03Or4_25();
+            err = TestWritesTheLimitOfMinHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_25();
             break;
         case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : Reads constraints of optional attributes from DUT: StartOfWeek\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutStartOfWeek_26();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 26 : Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesTheLimitOfMaxHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_26();
             break;
         case 27:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 27 : Reads constraints of optional attributes from DUT: NumberOfWeeklyTransitions\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutNumberOfWeeklyTransitions_27();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 27 : Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_27();
             break;
         case 28:
             ChipLogProgress(
-                chipTool, " ***** Test Step 28 : Reads constraints of optional attributes from DUT: NumberOfDailyTransitions\n");
-            err = TestReadsConstraintsOfOptionalAttributesFromDutNumberOfDailyTransitions_28();
+                chipTool, " ***** Test Step 28 : Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit \n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesMinHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_28();
             break;
         case 29:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 29 : Read TemperatureSetpointHold attribute from the DUT and Verify that the DUT responds with "
-                "an enum8 value.The value has to 0 or 1\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 29 : Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit \n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadTemperatureSetpointHoldAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasTo0Or1_29();
+            err = TestWritesMinHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_29();
             break;
         case 30:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 30 : Read TemperatureSetpointHoldDuration attribute from the DUT and Verify that the DUT "
-                "responds with a uint16 value or NULL.The value has to be in the range of 0 to 1440\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 30 : Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadTemperatureSetpointHoldDurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16ValueOrNULLTheValueHasToBeInTheRangeOf0To1440_30();
+            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_30();
             break;
         case 31:
             ChipLogProgress(chipTool,
-                " ***** Test Step 31 : Read ThermostatProgrammingOperationMode attribute from the DUT and Verify that the DUT "
-                "responds with a map8 value.The value has to be in the range of 0x00 to 0x07\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 31 : Writes a value back that is different but valid for MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadThermostatProgrammingOperationModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_31();
+            err = TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_31();
             break;
         case 32:
             ChipLogProgress(chipTool,
-                " ***** Test Step 32 : Read ThermostatRunningState attribute from the DUT and Verify that the DUT responds with a "
-                "map16 value.The value has to be in the range of 0x00 to 0x7F\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 32 : Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadThermostatRunningStateAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap16ValueTheValueHasToBeInTheRangeOf0x00To0x7F_32();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_32();
             break;
         case 33:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 33 : Read SetpointChangeSource attribute from the DUT and Verify that the DUT responds with an "
-                "enum8 value. The value has to be in the range of 0 to 2\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 33 : Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit \n");
+            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadSetpointChangeSourceAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To2_33();
+            err = TestWritesMaxHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_33();
             break;
         case 34:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 34 : Read SetpointChangeAmount attribute from the DUT and Verify that the DUT responds with an "
-                "int16 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 34 : Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit \n");
+            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadSetpointChangeAmountAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_34();
+            err = TestWritesMaxHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_34();
             break;
         case 35:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 35 : Read SetpointChangeSourceTimestamp attribute from the DUT and Verify that the DUT responds "
-                "with a utc value\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 35 : Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadSetpointChangeSourceTimestampAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUtcValue_35();
+            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_35();
             break;
         case 36:
             ChipLogProgress(chipTool,
-                " ***** Test Step 36 : Read OccupiedSetback attribute from the DUT and Verify that the DUT responds with a uint8 "
-                "value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 36 : Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadOccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_36();
+            err = TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_36();
             break;
         case 37:
             ChipLogProgress(chipTool,
-                " ***** Test Step 37 : Read OccupiedSetbackMin attribute from the DUT and Verify that the DUT responds with a "
-                "uint8 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 37 : Writes a value back that is different but valid for MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadOccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_37();
+            err = TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_37();
             break;
         case 38:
             ChipLogProgress(chipTool,
-                " ***** Test Step 38 : Read OccupiedSetbackMax attribute from the DUT and Verify that the DUT responds with a "
-                "uint8 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 38 : Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadOccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_38();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_38();
             break;
         case 39:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 39 : Read UnoccupiedSetback attribute from the DUT and Verify that the DUT responds with a uint8 "
-                "value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 39 : Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit \n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadUnoccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_39();
+            err = TestWritesMinCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_39();
             break;
         case 40:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 40 : Read UnoccupiedSetbackMin attribute from the DUT and Verify that the DUT responds with a "
-                "uint8 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 40 : Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit \n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadUnoccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_40();
+            err = TestWritesMinCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_40();
             break;
         case 41:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 41 : Read UnoccupiedSetbackMax attribute from the DUT and Verify that the DUT responds with a "
-                "uint8 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 41 : Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadUnoccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_41();
+            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_41();
             break;
         case 42:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 42 : Read EmergencyHeatDelta attribute from the DUT and Verify that the DUT responds with a "
-                "uint8 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 42 : Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadEmergencyHeatDeltaAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_42();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_42();
             break;
         case 43:
             ChipLogProgress(chipTool,
-                " ***** Test Step 43 : Read ACType attribute from the DUT and Verify that the DUT responds with an enum8 value. "
-                "The value has to be in the range of 0 to 4\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 43 : Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To4_43();
+            err = TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_43();
             break;
         case 44:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 44 : Read ACCapacity attribute from the DUT and Verify that the DUT responds with a uint16 "
-                "value\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 44 : Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit \n");
+            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACCapacityAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16Value_44();
+            err = TestWritesMaxCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_44();
             break;
         case 45:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 45 : Read ACRefrigerantType attribute from the DUT and VVerify that the DUT responds with an "
-                "enum8 value.The value has to be in the range of 0 to 3\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 45 : Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit \n");
+            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACRefrigerantTypeAttributeFromTheDutAndVVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_45();
+            err = TestWritesMaxCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_45();
             break;
         case 46:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 46 : Read ACCompressorType attribute from the DUT and Verify that the DUT responds with an enum8 "
-                "value.The value has to be in the range of 0 to 3\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 46 : Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
+            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACCompressorTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_46();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_46();
             break;
         case 47:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 47 : Read ACErrorCode attribute from the DUT and Verify that the DUT responds with a map32 "
-                "value\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 47 : Writes (sets back) default value of MinHeatSetpointLimit\n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACErrorCodeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap32Value_47();
+            err = TestWritesSetsBackDefaultValueOfMinHeatSetpointLimit_47();
             break;
         case 48:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 48 : Read ACLouverPosition attribute from the DUT and Verify that the DUT responds with an enum8 "
-                "value.The value has to be in the range of 1 to 5\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 48 : Writes (sets back) default value of MinCoolSetpointLimit\n");
+            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACLouverPositionAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf1To5_48();
+            err = TestWritesSetsBackDefaultValueOfMinCoolSetpointLimit_48();
             break;
         case 49:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 49 : Read ACCoilTemperature attribute from the DUT and Verify that the DUT responds with an "
-                "int16 value or NULL\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 49 : Writes (sets back) default value of MaxCoolSetpointLimit\n");
+            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadACCoilTemperatureAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_49();
+            err = TestWritesSetsBackDefaultValueOfMaxCoolSetpointLimit_49();
             break;
         case 50:
             ChipLogProgress(chipTool,
-                " ***** Test Step 50 : Read ACCapacityFormat attribute from the DUT and Verify that the DUT responds with an enum8 "
-                "value.The value has to be 0.\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 50 : Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
                 NextTest();
                 return;
             }
-            err = TestReadACCapacityFormatAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe0_50();
+            err = TestReadsMinSetpointDeadBandAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_50();
+            break;
+        case 51:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 51 : Writes a value back that is different but valid for MinSetpointDeadBand attribute\n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueBackThatIsDifferentButValidForMinSetpointDeadBandAttribute_51();
+            break;
+        case 52:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 52 : Reads it back again to confirm the successful write of MinSetpointDeadBand attribute\n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinSetpointDeadBandAttribute_52();
+            break;
+        case 53:
+            ChipLogProgress(chipTool, " ***** Test Step 53 : Writes the value below MinSetpointDeadBand\n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesTheValueBelowMinSetpointDeadBand_53();
+            break;
+        case 54:
+            ChipLogProgress(chipTool, " ***** Test Step 54 : Writes the value above MinSetpointDeadBand \n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesTheValueAboveMinSetpointDeadBand_54();
+            break;
+        case 55:
+            ChipLogProgress(chipTool, " ***** Test Step 55 : Writes the min limit of MinSetpointDeadBand\n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesTheMinLimitOfMinSetpointDeadBand_55();
+            break;
+        case 56:
+            ChipLogProgress(chipTool, " ***** Test Step 56 : Writes the max limit of MinSetpointDeadBand\n");
+            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesTheMaxLimitOfMinSetpointDeadBand_56();
+            break;
+        case 57:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 57 : Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid\n");
+            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_57();
+            break;
+        case 58:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 58 : Write Attribute command for ControlSequenceOfOperation with a new valid value\n");
+            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
+                NextTest();
+                return;
+            }
+            err = TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_58();
+            break;
+        case 59:
+            ChipLogProgress(chipTool, " ***** Test Step 59 : Read it back again to confirm the successful write\n");
+            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
+                NextTest();
+                return;
+            }
+            err = TestReadItBackAgainToConfirmTheSuccessfulWrite_59();
+            break;
+        case 60:
+            ChipLogProgress(chipTool, " ***** Test Step 60 : Sends SetpointRaise Command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommand_60();
+            break;
+        case 61:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 61 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_61();
+            break;
+        case 62:
+            ChipLogProgress(chipTool, " ***** Test Step 62 : Sends SetpointRaise Command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommand_62();
+            break;
+        case 63:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 63 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_63();
+            break;
+        case 64:
+            ChipLogProgress(chipTool, " ***** Test Step 64 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_64();
+            break;
+        case 65:
+            ChipLogProgress(chipTool, " ***** Test Step 65 : Sends SetpointRaise Command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommand_65();
+            break;
+        case 66:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 66 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_66();
+            break;
+        case 67:
+            ChipLogProgress(chipTool, " ***** Test Step 67 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_67();
+            break;
+        case 68:
+            ChipLogProgress(chipTool, " ***** Test Step 68 : Sends SetpointRaise Command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommand_68();
+            break;
+        case 69:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 69 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_69();
+            break;
+        case 70:
+            ChipLogProgress(chipTool, " ***** Test Step 70 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_70();
+            break;
+        case 71:
+            ChipLogProgress(chipTool, " ***** Test Step 71 : Sends SetpointRaise Command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommand_71();
+            break;
+        case 72:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 72 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_72();
+            break;
+        case 73:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 73 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_73();
+            break;
+        case 74:
+            ChipLogProgress(chipTool, " ***** Test Step 74 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_74();
+            break;
+        case 75:
+            ChipLogProgress(chipTool, " ***** Test Step 75 : Sends SetpointRaise Command\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommand_75();
+            break;
+        case 76:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 76 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_76();
+            break;
+        case 77:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 77 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_77();
             break;
         }
 
@@ -51375,10 +51658,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51393,10 +51676,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51411,10 +51694,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51432,10 +51715,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51447,10 +51730,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 30:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51462,10 +51745,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 35:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51480,10 +51763,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 41:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51495,10 +51778,10 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 46:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -51515,6 +51798,87 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
         case 50:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 51:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 52:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 53:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 54:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 55:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 56:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 57:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 58:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 59:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 60:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 61:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 62:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 63:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 64:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 65:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 66:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 67:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 68:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 69:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 70:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 71:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 72:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 73:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 74:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 75:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 76:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 77:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -51528,7 +51892,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 51;
+    const uint16_t mTestCount = 78;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -51542,82 +51906,73 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutLocalTemperature_1()
+    CHIP_ERROR TestReadsOccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLocalTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: LocalTemperature Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("localTemperature", "", "int16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutAbsMinHeatSetpointLimit_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
+                err);
 
-        [cluster readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: AbsMinHeatSetpointLimit Error: %@", err);
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("absMinHeatSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMinHeatSetpointLimit", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMinHeatSetpointLimit", [value shortValue], 3000));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2600));
             }
 
+            VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 2600));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutAbsMaxHeatSetpointLimit_3()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForOccupiedCoolingSetpointAttribute_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: AbsMaxHeatSetpointLimit Error: %@", err);
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2250];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes a value back that is different but valid for "
+                                                        @"OccupiedCoolingSetpoint attribute Error: %@",
+                                                      err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
 
-            VerifyOrReturn(CheckConstraintType("absMaxHeatSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMaxHeatSetpointLimit", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMaxHeatSetpointLimit", [value shortValue], 3000));
-            }
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                                  NextTest();
+                                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutAbsMinCoolSetpointLimit_4()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedCoolingSetpointAttribute_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: AbsMinCoolSetpointLimit Error: %@", err);
+        [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -51626,12 +51981,9 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("absMinCoolSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMinCoolSetpointLimit", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMinCoolSetpointLimit", [value shortValue], 3200));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2250));
             }
 
             NextTest();
@@ -51640,103 +51992,165 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutAbsMaxCoolSetpointLimit_5()
+    CHIP_ERROR TestWritesOccupiedCoolingSetpointToValueBelowTheMinCoolSetpointLimit_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: AbsMaxCoolSetpointLimit Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:30];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes OccupiedCoolingSetpoint to value below the MinCoolSetpointLimit "
+                                                        @"Error: %@",
+                                                      err);
 
-            VerifyOrReturn(CheckConstraintType("absMaxCoolSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("absMaxCoolSetpointLimit", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("absMaxCoolSetpointLimit", [value shortValue], 3200));
-            }
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
 
-            NextTest();
-        }];
+                                                  VerifyOrReturn(
+                                                      CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                  NextTest();
+                                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR
-    TestReadPICoolingDemandAttributeFromTheDutVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_6()
+    CHIP_ERROR TestWritesOccupiedCoolingSetpointToValueAboveTheMaxCoolSetpointLimit_5()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR
-    TestReadPIHeatingDemandAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueTheValueHasToBeInTheRangeOf0To100_7()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:4000];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes OccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit "
+                                                        @"Error: %@",
+                                                      err);
+
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
+
+                                                  VerifyOrReturn(
+                                                      CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutOccupiedCoolingSetpoint_8()
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: OccupiedCoolingSetpoint Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint "
+                                                        @"attribute Error: %@",
+                                                      err);
+
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
+
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
+                err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
                 return;
             }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 2600));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2000));
             }
 
+            VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 3000));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutOccupiedHeatingSetpoint_9()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2100];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes a value back that is different but valid for "
+                                                        @"OccupiedHeatingSetpoint attribute Error: %@",
+                                                      err);
+
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
+
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: OccupiedHeatingSetpoint Error: %@", err);
+            NSLog(@"Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 2600));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2100));
             }
 
             NextTest();
@@ -51745,82 +52159,98 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadUnoccupiedCoolingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_10()
+    CHIP_ERROR TestWritesOccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_10()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestReadUnoccupiedHeatingSetpointAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16Value_11()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:600];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit "
+                                                        @"Error: %@",
+                                                      err);
+
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
+
+                                                  VerifyOrReturn(
+                                                      CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutMinHeatSetpointLimit_12()
+    CHIP_ERROR TestWritesOccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: MinHeatSetpointLimit Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:4010];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit "
+                                                        @"Error: %@",
+                                                      err);
 
-            VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minHeatSetpointLimit", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minHeatSetpointLimit", [value shortValue], 3000));
-            }
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
 
-            NextTest();
-        }];
+                                                  VerifyOrReturn(
+                                                      CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                  NextTest();
+                                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutMaxHeatSetpointLimit_13()
+    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: MaxHeatSetpointLimit Error: %@", err);
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:700];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint "
+                                                        @"attribute Error: %@",
+                                                      err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
 
-            VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 3000));
-            }
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                                  NextTest();
+                                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutMinCoolSetpointLimit_14()
+    CHIP_ERROR TestReadsUnoccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: MinCoolSetpointLimit Error: %@", err);
+        [cluster readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
+                err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -51829,68 +52259,68 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minCoolSetpointLimit", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minCoolSetpointLimit", [value shortValue], 3200));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("UnoccupiedCoolingSetpoint", actualValue, 2600));
             }
 
+            VerifyOrReturn(CheckConstraintType("unoccupiedCoolingSetpoint", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("unoccupiedCoolingSetpoint", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("unoccupiedCoolingSetpoint", [value shortValue], 3200));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutMaxCoolSetpointLimit_15()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForUnoccupiedCoolingSetpointAttribute_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: MaxCoolSetpointLimit Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        id unoccupiedCoolingSetpointArgument;
+        unoccupiedCoolingSetpointArgument = [NSNumber numberWithShort:2500];
+        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes a value back that is different but valid for "
+                                                          @"UnoccupiedCoolingSetpoint attribute Error: %@",
+                                                        err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-            VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 3200));
-            }
+                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                                    NextTest();
+                                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutControlSequenceOfOperation_16()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedCoolingSetpointAttribute_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster
-            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Reads constraints of mandatory attributes from DUT: ControlSequenceOfOperation Error: %@", err);
+            readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint attribute Error: %@", err);
+
+                if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                    NextTest();
+                    return;
+                }
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8"));
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMinValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 5));
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("UnoccupiedCoolingSetpoint", actualValue, 2500));
                 }
 
                 NextTest();
@@ -51899,136 +52329,125 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutSystemMode_17()
+    CHIP_ERROR TestWritesUnoccupiedCoolingSetpointToValueBelowTheMinHeatSetpointLimit_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSystemModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of mandatory attributes from DUT: SystemMode Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id unoccupiedCoolingSetpointArgument;
+        unoccupiedCoolingSetpointArgument = [NSNumber numberWithShort:1002];
+        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes UnoccupiedCoolingSetpoint to value below the "
+                                                          @"MinHeatSetpointLimit Error: %@",
+                                                        err);
 
-            VerifyOrReturn(CheckConstraintType("systemMode", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("systemMode", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("systemMode", [value unsignedCharValue], 9));
-            }
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-            NextTest();
-        }];
+                                                    VerifyOrReturn(CheckValue(
+                                                        "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                    NextTest();
+                                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadOutdoorTemperatureAttributeFromTheDutAndVerifyTheDatatype_18()
+    CHIP_ERROR TestWritesUnoccupiedCoolingSetpointToValueAboveTheMaxHeatSetpointLimit_17()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestReadOccupancyAttributeFromTheDutAndVerifyTheDatatypeAndResponseValue_19()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        id unoccupiedCoolingSetpointArgument;
+        unoccupiedCoolingSetpointArgument = [NSNumber numberWithShort:4010];
+        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes UnoccupiedCoolingSetpoint to value above the "
+                                                          @"MaxHeatSetpointLimit Error: %@",
+                                                        err);
 
-    CHIP_ERROR
-    TestReadHVACSystemTypeConfigurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x3f_20()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-    CHIP_ERROR
-    TestReadLocalTemperatureCalibrationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt8ValueTheValueHasToBeInTheRangeOf25To25_21()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+                                                    VerifyOrReturn(CheckValue(
+                                                        "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                    NextTest();
+                                                }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutMinSetpointDeadBand_22()
+    CHIP_ERROR TestWritesTheLimitOfMinCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: MinSetpointDeadBand Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        id unoccupiedCoolingSetpointArgument;
+        unoccupiedCoolingSetpointArgument = [NSNumber numberWithShort:1800];
+        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint "
+                                                          @"attribute Error: %@",
+                                                        err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-            VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "", "int8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int8_t>("minSetpointDeadBand", [value charValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int8_t>("minSetpointDeadBand", [value charValue], 25));
-            }
+                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                                    NextTest();
+                                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR
-    TestReadRemoteSensingAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_23()
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_19()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR
-    TestReadAlarmMaskAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_24()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        id unoccupiedCoolingSetpointArgument;
+        unoccupiedCoolingSetpointArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint "
+                                                          @"attribute Error: %@",
+                                                        err);
 
-    CHIP_ERROR TestReadThermostatRunningModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe03Or4_25()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
+
+                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                    NextTest();
+                                                }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutStartOfWeek_26()
+    CHIP_ERROR TestReadsUnoccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeStartOfWeekWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: StartOfWeek Error: %@", err);
+        [cluster readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
+                err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -52037,29 +52456,57 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("startOfWeek", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("startOfWeek", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("startOfWeek", [value unsignedCharValue], 6));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("UnoccupiedHeatingSetpoint", actualValue, 2000));
             }
 
+            VerifyOrReturn(CheckConstraintType("unoccupiedHeatingSetpoint", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("unoccupiedHeatingSetpoint", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("unoccupiedHeatingSetpoint", [value shortValue], 3000));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutNumberOfWeeklyTransitions_27()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForUnoccupiedHeatingSetpointAttribute_21()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id unoccupiedHeatingSetpointArgument;
+        unoccupiedHeatingSetpointArgument = [NSNumber numberWithShort:2500];
+        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:unoccupiedHeatingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes a value back that is different but valid for "
+                                                          @"UnoccupiedHeatingSetpoint attribute Error: %@",
+                                                        err);
+
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
+
+                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                    NextTest();
+                                                }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedHeatingSetpointAttribute_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster
-            readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Reads constraints of optional attributes from DUT: NumberOfWeeklyTransitions Error: %@", err);
+            readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint attribute Error: %@", err);
 
                 if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                     NextTest();
@@ -52068,919 +52515,1242 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge {
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("numberOfWeeklyTransitions", "", "uint8"));
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("UnoccupiedHeatingSetpoint", actualValue, 2500));
+                }
+
                 NextTest();
             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsConstraintsOfOptionalAttributesFromDutNumberOfDailyTransitions_28()
+    CHIP_ERROR TestWritesUnoccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_23()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNumberOfDailyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads constraints of optional attributes from DUT: NumberOfDailyTransitions Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+        id unoccupiedHeatingSetpointArgument;
+        unoccupiedHeatingSetpointArgument = [NSNumber numberWithShort:500];
+        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:unoccupiedHeatingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes UnoccupiedHeatingSetpoint to value below the "
+                                                          @"MinHeatSetpointLimit Error: %@",
+                                                        err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-            VerifyOrReturn(CheckConstraintType("numberOfDailyTransitions", "", "uint8"));
-            NextTest();
-        }];
+                                                    VerifyOrReturn(CheckValue(
+                                                        "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                    NextTest();
+                                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTemperatureSetpointHoldAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasTo0Or1_29()
+    CHIP_ERROR TestWritesUnoccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_24()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR
-    TestReadTemperatureSetpointHoldDurationAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16ValueOrNULLTheValueHasToBeInTheRangeOf0To1440_30()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        id unoccupiedHeatingSetpointArgument;
+        unoccupiedHeatingSetpointArgument = [NSNumber numberWithShort:4010];
+        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:unoccupiedHeatingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes UnoccupiedHeatingSetpoint to value above the "
+                                                          @"MaxHeatSetpointLimit Error: %@",
+                                                        err);
 
-    CHIP_ERROR
-    TestReadThermostatProgrammingOperationModeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap8ValueTheValueHasToBeInTheRangeOf0x00To0x07_31()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-    CHIP_ERROR
-    TestReadThermostatRunningStateAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap16ValueTheValueHasToBeInTheRangeOf0x00To0x7F_32()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+                                                    VerifyOrReturn(CheckValue(
+                                                        "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                    NextTest();
+                                                }];
 
-    CHIP_ERROR
-    TestReadSetpointChangeSourceAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To2_33()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadSetpointChangeAmountAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_34()
+    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_25()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestReadSetpointChangeSourceTimestampAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUtcValue_35()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        id unoccupiedHeatingSetpointArgument;
+        unoccupiedHeatingSetpointArgument = [NSNumber numberWithShort:1800];
+        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:unoccupiedHeatingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint "
+                                                          @"attribute Error: %@",
+                                                        err);
 
-    CHIP_ERROR TestReadOccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_36()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
 
-    CHIP_ERROR TestReadOccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_37()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    CHIP_ERROR TestReadOccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_38()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+                                                    NextTest();
+                                                }];
 
-    CHIP_ERROR TestReadUnoccupiedSetbackAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_39()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadUnoccupiedSetbackMinAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_40()
+    CHIP_ERROR TestWritesTheLimitOfMaxHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_26()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id unoccupiedHeatingSetpointArgument;
+        unoccupiedHeatingSetpointArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:unoccupiedHeatingSetpointArgument
+                                                completionHandler:^(NSError * _Nullable err) {
+                                                    NSLog(@"Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint "
+                                                          @"attribute Error: %@",
+                                                        err);
+
+                                                    if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                        NextTest();
+                                                        return;
+                                                    }
+
+                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                    NextTest();
+                                                }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadUnoccupiedSetbackMaxAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_41()
+    CHIP_ERROR TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_27()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    CHIP_ERROR TestReadEmergencyHeatDeltaAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint8ValueOrNull_42()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
 
-    CHIP_ERROR TestReadACTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To4_43()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 700));
+            }
+
+            VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("minHeatSetpointLimit", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minHeatSetpointLimit", [value shortValue], 3000));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadACCapacityAttributeFromTheDutAndVerifyThatTheDutRespondsWithAUint16Value_44()
+    CHIP_ERROR TestWritesMinHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_28()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:650];
+        [cluster
+            writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(
+                                              @"Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR
-    TestReadACRefrigerantTypeAttributeFromTheDutAndVVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_45()
+    CHIP_ERROR TestWritesMinHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_29()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:4050];
+        [cluster
+            writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(
+                                              @"Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR
-    TestReadACCompressorTypeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf0To3_46()
+    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_30()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadACErrorCodeAttributeFromTheDutAndVerifyThatTheDutRespondsWithAMap32Value_47()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_31()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes a value back that is different but valid for MaxHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR
-    TestReadACLouverPositionAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBeInTheRangeOf1To5_48()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_32()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 2000));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadACCoilTemperatureAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnInt16ValueOrNull_49()
+    CHIP_ERROR TestWritesMaxHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_33()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:500];
+        [cluster
+            writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(
+                                              @"Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadACCapacityFormatAttributeFromTheDutAndVerifyThatTheDutRespondsWithAnEnum8ValueTheValueHasToBe0_50()
+    CHIP_ERROR TestWritesMaxHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_34()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:4000];
+        [cluster
+            writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(
+                                              @"Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_TSTAT_2_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TSTAT_2_2()
-        : TestCommandBridge("Test_TC_TSTAT_2_2")
-        , mTestIndex(0)
+    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_35()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~Test_TC_TSTAT_2_2() {}
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_2_2\n");
-        }
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSTAT_2_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+                                               NextTest();
+                                           }];
 
-        Wait();
+        return CHIP_NO_ERROR;
+    }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 1 : Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is "
-                "within range\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+    CHIP_ERROR TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_36()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsOccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 2 : Writes a value back that is different but valid for OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 1600));
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForOccupiedCoolingSetpointAttribute_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 3 : Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+
+            VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("minCoolSetpointLimit", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minCoolSetpointLimit", [value shortValue], 3200));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_37()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes a value back that is different but valid for MinCoolSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_38()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedCoolingSetpointAttribute_3();
-            break;
-        case 4:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 4 : Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 2000));
             }
-            err = TestWritesTheLimitOfMinCoolSetpointLimitToOccupiedCoolingSetpointAttribute_4();
-            break;
-        case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMinCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_39()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:1000];
+        [cluster
+            writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(
+                                              @"Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMinCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_40()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:4000];
+        [cluster
+            writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_41()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
+        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_42()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
+        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute "
+                                                     @"Error: %@",
+                                                   err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_43()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
-                "within range\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 3200));
             }
-            err = TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 7 : Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+
+            VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 1600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 3200));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMaxCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_44()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxCoolSetpointLimitArgument;
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:1000];
+        [cluster
+            writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(
+                                              @"Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMaxCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_45()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxCoolSetpointLimitArgument;
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:4000];
+        [cluster
+            writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit  Error: %@",
+                                              err);
+
+                                          if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                              NextTest();
+                                              return;
+                                          }
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_46()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxCoolSetpointLimitArgument;
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
+        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute "
+                                                     @"Error: %@",
+                                                   err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesSetsBackDefaultValueOfMinHeatSetpointLimit_47()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes (sets back) default value of MinHeatSetpointLimit Error: %@", err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesSetsBackDefaultValueOfMinCoolSetpointLimit_48()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
+        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes (sets back) default value of MinCoolSetpointLimit Error: %@", err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesSetsBackDefaultValueOfMaxCoolSetpointLimit_49()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxCoolSetpointLimitArgument;
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
+        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes (sets back) default value of MaxCoolSetpointLimit Error: %@", err);
+
+                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                   NextTest();
+                                                   return;
+                                               }
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsMinSetpointDeadBandAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_50()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within range Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MinSetpointDeadBand", actualValue, 25));
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_8();
-            break;
-        case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+
+            VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "", "temp-s8"));
+            VerifyOrReturn(CheckConstraintMinValue<int8_t>("minSetpointDeadBand", [value charValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<int8_t>("minSetpointDeadBand", [value charValue], 25));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinSetpointDeadBandAttribute_51()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minSetpointDeadBandArgument;
+        minSetpointDeadBandArgument = [NSNumber numberWithChar:5];
+        [cluster writeAttributeMinSetpointDeadBandWithValue:minSetpointDeadBandArgument
+                                          completionHandler:^(NSError * _Nullable err) {
+                                              NSLog(@"Writes a value back that is different but valid for MinSetpointDeadBand "
+                                                    @"attribute Error: %@",
+                                                  err);
+
+                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                  NextTest();
+                                                  return;
+                                              }
+
+                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                              NextTest();
+                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinSetpointDeadBandAttribute_52()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of MinSetpointDeadBand attribute Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_9();
-            break;
-        case 10:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 10 : Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MinSetpointDeadBand", actualValue, 5));
             }
-            err = TestWritesTheLimitOfMaxHeatSetpointLimitToOccupiedHeatingSetpointAttribute_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 11 : Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheValueBelowMinSetpointDeadBand_53()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minSetpointDeadBandArgument;
+        minSetpointDeadBandArgument = [NSNumber numberWithChar:-1];
+        [cluster writeAttributeMinSetpointDeadBandWithValue:minSetpointDeadBandArgument
+                                          completionHandler:^(NSError * _Nullable err) {
+                                              NSLog(@"Writes the value below MinSetpointDeadBand Error: %@", err);
+
+                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                  NextTest();
+                                                  return;
+                                              }
+
+                                              VerifyOrReturn(
+                                                  CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                              NextTest();
+                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheValueAboveMinSetpointDeadBand_54()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minSetpointDeadBandArgument;
+        minSetpointDeadBandArgument = [NSNumber numberWithChar:30];
+        [cluster writeAttributeMinSetpointDeadBandWithValue:minSetpointDeadBandArgument
+                                          completionHandler:^(NSError * _Nullable err) {
+                                              NSLog(@"Writes the value above MinSetpointDeadBand  Error: %@", err);
+
+                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                  NextTest();
+                                                  return;
+                                              }
+
+                                              VerifyOrReturn(
+                                                  CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                              NextTest();
+                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheMinLimitOfMinSetpointDeadBand_55()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minSetpointDeadBandArgument;
+        minSetpointDeadBandArgument = [NSNumber numberWithChar:0];
+        [cluster writeAttributeMinSetpointDeadBandWithValue:minSetpointDeadBandArgument
+                                          completionHandler:^(NSError * _Nullable err) {
+                                              NSLog(@"Writes the min limit of MinSetpointDeadBand Error: %@", err);
+
+                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                  NextTest();
+                                                  return;
+                                              }
+
+                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                              NextTest();
+                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheMaxLimitOfMinSetpointDeadBand_56()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minSetpointDeadBandArgument;
+        minSetpointDeadBandArgument = [NSNumber numberWithChar:25];
+        [cluster writeAttributeMinSetpointDeadBandWithValue:minSetpointDeadBandArgument
+                                          completionHandler:^(NSError * _Nullable err) {
+                                              NSLog(@"Writes the max limit of MinSetpointDeadBand Error: %@", err);
+
+                                              if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                  NextTest();
+                                                  return;
+                                              }
+
+                                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                              NextTest();
+                                          }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_57()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 4));
+                }
+
+                VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 0));
+                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 5));
+
                 NextTest();
-                return;
-            }
-            err = TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 12 : Writes a value back that is different but valid for MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_58()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id controlSequenceOfOperationArgument;
+        controlSequenceOfOperationArgument = [NSNumber numberWithUnsignedChar:2];
+        [cluster writeAttributeControlSequenceOfOperationWithValue:controlSequenceOfOperationArgument
+                                                 completionHandler:^(NSError * _Nullable err) {
+                                                     NSLog(@"Write Attribute command for ControlSequenceOfOperation with a new "
+                                                           @"valid value Error: %@",
+                                                         err);
+
+                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                     NextTest();
+                                                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadItBackAgainToConfirmTheSuccessfulWrite_59()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Read it back again to confirm the successful write Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 2));
+                }
+
                 NextTest();
-                return;
-            }
-            err = TestWritesAValueBackThatIsDifferentButValidForMinHeatSetpointLimitAttribute_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 13 : Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendsSetpointRaiseCommand_60()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:0];
+        params.amount = [NSNumber numberWithChar:-30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_61()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinHeatSetpointLimitAttribute_13();
-            break;
-        case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, -30));
             }
-            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_14();
-            break;
-        case 15:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 15 : Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendsSetpointRaiseCommand_62()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:0];
+        params.amount = [NSNumber numberWithChar:30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_63()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 16 : Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 30));
             }
-            err = TestReadsMaxHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 17 : Writes a value back that is different but valid for MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_64()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
+
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
+
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendsSetpointRaiseCommand_65()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:1];
+        params.amount = [NSNumber numberWithChar:-30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_66()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 18 : Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_18();
-            break;
-        case 19:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 19 : Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_19();
-            break;
-        case 20:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 20 : Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMaxHeatSetpointLimitAttribute_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 21 : Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 22 : Writes a value back that is different but valid for MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 23 : Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_23();
-            break;
-        case 24:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 24 : Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_24();
-            break;
-        case 25:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 25 : Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 26 : Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 27 : Writes a value back that is different but valid for MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueBackThatIsDifferentButValidForMaxCoolSetpointLimitAttribute_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 28 : Reads it back again to confirm the successful write of MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxCoolSetpointLimitAttribute_28();
-            break;
-        case 29:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 29 : Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMaxCoolSetpointLimitAttribute_29();
-            break;
-        case 30:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 30 : Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 31 : Writes (sets back) the limit of MinHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 32 : Writes (sets back) the limit of MaxHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 33 : Writes (sets back) the limit of MinHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 34 : Writes (sets back) the limit of MaxHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMaxHeatSetpointLimitToMaxHeatSetpointLimitAttribute_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 35 : Writes (sets back) the limit of MinCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 36 : Writes (sets back) the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 37 : Writes (sets back) the limit of MinCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMinCoolSetpointLimitToMaxCoolSetpointLimitAttribute_37();
-            break;
-        case 38:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 38 : Writes (sets back) the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesSetsBackTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 39 : Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid\n");
-            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_39();
-            break;
-        case 40:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 40 : Write Attribute command for ControlSequenceOfOperation with a new valid value\n");
-            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
-                NextTest();
-                return;
-            }
-            err = TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_40();
-            break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : Read it back again to confirm the successful write\n");
-            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
-                NextTest();
-                return;
-            }
-            err = TestReadItBackAgainToConfirmTheSuccessfulWrite_41();
-            break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : Sets OccupiedHeatingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedHeatingSetpointToDefaultValue_42();
-            break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : Sets OccupiedHeatingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedHeatingSetpointToDefaultValue_43();
-            break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_44();
-            break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_45();
-            break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_46();
-            break;
-        case 47:
-            ChipLogProgress(chipTool, " ***** Test Step 47 : Sets OccupiedHeatingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedHeatingSetpointToDefaultValue_47();
-            break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
-                NextTest();
-                return;
-            }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_48();
-            break;
-        case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : Sets OccupiedHeatingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
-                NextTest();
-                return;
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, -30));
             }
-            err = TestSetsOccupiedHeatingSetpointToDefaultValue_49();
-            break;
-        }
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_67()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
+
+                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                                                      NextTest();
+                                                      return;
+                                                  }
+
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    CHIP_ERROR TestSendsSetpointRaiseCommand_68()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 50;
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:1];
+        params.amount = [NSNumber numberWithChar:30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_1()
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_69()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
-                err);
+            NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -52991,15 +53761,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2600));
-            }
-
-            VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 2600));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 30));
             }
 
             NextTest();
@@ -53008,19 +53770,17 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForOccupiedCoolingSetpointAttribute_2()
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_70()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2000];
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
         [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
                                               completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes a value back that is different but valid for "
-                                                        @"OccupiedCoolingSetpoint attribute Error: %@",
-                                                      err);
+                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
 
                                                   if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                                                       NextTest();
@@ -53035,14 +53795,35 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedCoolingSetpointAttribute_3()
+    CHIP_ERROR TestSendsSetpointRaiseCommand_71()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:2];
+        params.amount = [NSNumber numberWithChar:-30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_72()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute Error: %@", err);
+            NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
             if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                 NextTest();
@@ -53053,7 +53834,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2000));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, -30));
             }
 
             NextTest();
@@ -53062,34 +53843,34 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMinCoolSetpointLimitToOccupiedCoolingSetpointAttribute_4()
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_73()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:1600];
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint "
-                                                        @"attribute Error: %@",
-                                                      err);
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
 
-                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                  NextTest();
-                                              }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, -30));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_5()
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_74()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -53099,9 +53880,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
         [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
                                               completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint "
-                                                        @"attribute Error: %@",
-                                                      err);
+                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
 
                                                   if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
                                                       NextTest();
@@ -53116,73 +53895,73 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_6()
+    CHIP_ERROR TestSendsSetpointRaiseCommand_75()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
-                err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2000));
-            }
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:2];
+        params.amount = [NSNumber numberWithChar:30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 3000));
-            }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_7()
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_76()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2100];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes a value back that is different but valid for "
-                                                        @"OccupiedHeatingSetpoint attribute Error: %@",
-                                                      err);
+        [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
-                                                  NextTest();
-                                              }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 30));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_8()
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_77()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute Error: %@", err);
+            NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
+
+            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+                NextTest();
+                return;
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2100));
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 30));
             }
 
             NextTest();
@@ -53190,193 +53969,385 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_9()
+class Test_TC_TSUIC_1_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_TSUIC_1_1()
+        : TestCommandBridge("Test_TC_TSUIC_1_1")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:700];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint "
-                                                        @"attribute Error: %@",
-                                                      err);
+    ~Test_TC_TSUIC_1_1() {}
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-                                                  NextTest();
-                                              }];
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_1_1\n");
+        }
 
-        return CHIP_NO_ERROR;
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSUIC_1_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH read ClusterRevision attribute from the DUT\n");
+            err = TestThReadClusterRevisionAttributeFromTheDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeAttributeList_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                "supported events.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
+            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxHeatSetpointLimitToOccupiedHeatingSetpointAttribute_10()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:3000];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint "
-                                                        @"attribute Error: %@",
-                                                      err);
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-                                                  NextTest();
-                                              }];
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 6;
 
-        return CHIP_NO_ERROR;
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_11()
+    CHIP_ERROR TestThReadClusterRevisionAttributeFromTheDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(
-                @"Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH read ClusterRevision attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 700));
-            }
-
-            VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minHeatSetpointLimit", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minHeatSetpointLimit", [value shortValue], 3000));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinHeatSetpointLimitAttribute_12()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id minHeatSetpointLimitArgument;
-        minHeatSetpointLimitArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes a value back that is different but valid for MinHeatSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(3)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+            }
+
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinHeatSetpointLimitAttribute_13()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute Error: %@", err);
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: AcceptedCommandList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 2000));
+                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(0)));
             }
 
+            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_14()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id minHeatSetpointLimitArgument;
-        minHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
-        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: GeneratedCommandList Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+            }
+
+            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
+};
+
+class Test_TC_TSUIC_2_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_TSUIC_2_1()
+        : TestCommandBridge("Test_TC_TSUIC_2_1")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_TSUIC_2_1() {}
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_15()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        id minHeatSetpointLimitArgument;
-        minHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
-        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_1\n");
+        }
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSUIC_2_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-                                               NextTest();
-                                           }];
+        Wait();
 
-        return CHIP_NO_ERROR;
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: TemperatureDisplayMode\n");
+            err = TestReadTheMandatoryAttributeTemperatureDisplayMode_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: TemperatureDisplayMode\n");
+            err = TestReadTheMandatoryAttributeTemperatureDisplayMode_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : read the mandatory attribute: KeypadLockout\n");
+            err = TestReadTheMandatoryAttributeKeypadLockout_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : read the mandatory attribute: KeypadLockout\n");
+            err = TestReadTheMandatoryAttributeKeypadLockout_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : read the optional attribute: ScheduleProgrammingVisibility\n");
+            err = TestReadTheOptionalAttributeScheduleProgrammingVisibility_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : read the optional attribute: ScheduleProgrammingVisibility\n");
+            err = TestReadTheOptionalAttributeScheduleProgrammingVisibility_6();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 7;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsMaxHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_16()
+    CHIP_ERROR TestReadTheMandatoryAttributeTemperatureDisplayMode_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(
-                @"Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
+        [cluster readAttributeTemperatureDisplayModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: TemperatureDisplayMode Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 3000));
-            }
-
-            VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 700));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 3000));
+                VerifyOrReturn(CheckValue("temperature display mode", actualValue, 0));
             }
 
             NextTest();
@@ -53385,42 +54356,43 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_17()
+    CHIP_ERROR TestReadTheMandatoryAttributeTemperatureDisplayMode_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxHeatSetpointLimitArgument;
-        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes a value back that is different but valid for MaxHeatSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        [cluster readAttributeTemperatureDisplayModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: TemperatureDisplayMode Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+            VerifyOrReturn(CheckConstraintType("temperatureDisplayMode", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("temperatureDisplayMode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("temperatureDisplayMode", [value unsignedCharValue], 1));
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_18()
+    CHIP_ERROR TestReadTheMandatoryAttributeKeypadLockout_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute Error: %@", err);
+        [cluster readAttributeKeypadLockoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: KeypadLockout Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 2000));
+                VerifyOrReturn(CheckValue("keypad lockout", actualValue, 0));
             }
 
             NextTest();
@@ -53429,796 +54401,744 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_19()
+    CHIP_ERROR TestReadTheMandatoryAttributeKeypadLockout_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxHeatSetpointLimitArgument;
-        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
-        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        [cluster readAttributeKeypadLockoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"read the mandatory attribute: KeypadLockout Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+            VerifyOrReturn(CheckConstraintType("keypadLockout", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("keypadLockout", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("keypadLockout", [value unsignedCharValue], 5));
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMaxHeatSetpointLimitAttribute_20()
+    CHIP_ERROR TestReadTheOptionalAttributeScheduleProgrammingVisibility_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxHeatSetpointLimitArgument;
-        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
-        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        [cluster
+            readAttributeScheduleProgrammingVisibilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"read the optional attribute: ScheduleProgrammingVisibility Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("schedule programming visibility", actualValue, 0));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_21()
+    CHIP_ERROR TestReadTheOptionalAttributeScheduleProgrammingVisibility_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(
-                @"Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster
+            readAttributeScheduleProgrammingVisibilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"read the optional attribute: ScheduleProgrammingVisibility Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 1600));
-            }
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("minCoolSetpointLimit", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minCoolSetpointLimit", [value shortValue], 3200));
-            }
+                VerifyOrReturn(CheckConstraintType("scheduleProgrammingVisibility", "", "enum8"));
+                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("scheduleProgrammingVisibility", [value unsignedCharValue], 0));
+                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("scheduleProgrammingVisibility", [value unsignedCharValue], 1));
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_22()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id minCoolSetpointLimitArgument;
-        minCoolSetpointLimitArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes a value back that is different but valid for MinCoolSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+class Test_TC_TSUIC_2_2 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_TSUIC_2_2()
+        : TestCommandBridge("Test_TC_TSUIC_2_2")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    ~Test_TC_TSUIC_2_2() {}
 
-                                               NextTest();
-                                           }];
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        return CHIP_NO_ERROR;
-    }
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_2\n");
+        }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_23()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSUIC_2_2\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute Error: %@", err);
+        Wait();
 
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Writes a value of 0 to TemperatureDisplayMode attribute of DUT\n");
+            if (ShouldSkip("A_TEMPERATURE_DISPLAY_MODE")) {
                 NextTest();
                 return;
             }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 2000));
+            err = TestWritesAValueOf0ToTemperatureDisplayModeAttributeOfDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Verify device temperature displayed in °C\n");
+            err = TestVerifyDeviceTemperatureDisplayedInc_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Writes a value of 1 to TemperatureDisplayMode attribute of DUT\n");
+            if (ShouldSkip("A_TEMPERATURE_DISPLAY_MODE")) {
+                NextTest();
+                return;
             }
+            err = TestWritesAValueOf1ToTemperatureDisplayModeAttributeOfDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Verify device temperature displayed in °F\n");
+            err = TestVerifyDeviceTemperatureDisplayedInf_4();
+            break;
+        case 5:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : Writes a value of greater than 1 to TemperatureDisplayMode attribute of DUT\n");
+            if (ShouldSkip("A_TEMPERATURE_DISPLAY_MODE")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOfGreaterThan1ToTemperatureDisplayModeAttributeOfDut_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Writes a value of 0 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf0ToKeypadLockoutAttributeOfDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Verify all device functionality available to the user\n");
+            err = TestVerifyAllDeviceFunctionalityAvailableToTheUser_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Writes a value of 1 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf1ToKeypadLockoutAttributeOfDut_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Verify device operates at Level 1 reduced functionality\n");
+            err = TestVerifyDeviceOperatesAtLevel1ReducedFunctionality_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Writes a value of 2 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf2ToKeypadLockoutAttributeOfDut_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Verify device operates at Level 2 reduced functionality\n");
+            err = TestVerifyDeviceOperatesAtLevel2ReducedFunctionality_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Writes a value of 3 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf3ToKeypadLockoutAttributeOfDut_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Verify device operates at Level 3 reduced functionality\n");
+            err = TestVerifyDeviceOperatesAtLevel3ReducedFunctionality_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Writes a value of 4 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf4ToKeypadLockoutAttributeOfDut_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Verify device operates at Level 4 reduced functionality\n");
+            err = TestVerifyDeviceOperatesAtLevel4ReducedFunctionality_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Writes a value of 5 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf5ToKeypadLockoutAttributeOfDut_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Verify device operates at least functionality level\n");
+            err = TestVerifyDeviceOperatesAtLeastFunctionalityLevel_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Writes a value of greater than 5 to KeypadLockout attribute of DUT\n");
+            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOfGreaterThan5ToKeypadLockoutAttributeOfDut_18();
+            break;
+        case 19:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 19 : Writes a value of 0 to ScheduleProgrammingVisibility attribute of DUT\n");
+            if (ShouldSkip("A_SCHEDULE_PROGRAMMING_VISIBILITY")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf0ToScheduleProgrammingVisibilityAttributeOfDut_19();
+            break;
+        case 20:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 20 : Verify local schedule programming functionality is enabled at the thermostat\n");
+            err = TestVerifyLocalScheduleProgrammingFunctionalityIsEnabledAtTheThermostat_20();
+            break;
+        case 21:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 21 : Writes a value of 1 to ScheduleProgrammingVisibility attribute of DUT\n");
+            if (ShouldSkip("A_SCHEDULE_PROGRAMMING_VISIBILITY")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOf1ToScheduleProgrammingVisibilityAttributeOfDut_21();
+            break;
+        case 22:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : Verify local schedule programming functionality is disabled at the thermostat\n");
+            err = TestVerifyLocalScheduleProgrammingFunctionalityIsDisabledAtTheThermostat_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 23 : Writes a value of greater than 1 to ScheduleProgrammingVisibility attribute of DUT\n");
+            if (ShouldSkip("A_SCHEDULE_PROGRAMMING_VISIBILITY")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesAValueOfGreaterThan1ToScheduleProgrammingVisibilityAttributeOfDut_23();
+            break;
+        }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_24()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        }
 
-        id minCoolSetpointLimitArgument;
-        minCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
-        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
 
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 24;
 
-                                               NextTest();
-                                           }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_25()
+    CHIP_ERROR TestWritesAValueOf0ToTemperatureDisplayModeAttributeOfDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id minCoolSetpointLimitArgument;
-        minCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
-        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute "
-                                                     @"Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+        id temperatureDisplayModeArgument;
+        temperatureDisplayModeArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument
+                                        completionHandler:^(NSError * _Nullable err) {
+                                            NSLog(@"Writes a value of 0 to TemperatureDisplayMode attribute of DUT Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+                                            NextTest();
+                                        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_26()
+    CHIP_ERROR TestVerifyDeviceTemperatureDisplayedInc_2()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Verify device temperature displayed in °Cgarbage: not in length on purpose", 42);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestWritesAValueOf1ToTemperatureDisplayModeAttributeOfDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(
-                @"Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 3200));
-            }
+        id temperatureDisplayModeArgument;
+        temperatureDisplayModeArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster
+            writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument
+                                        completionHandler:^(NSError * _Nullable err) {
+                                            NSLog(@"Writes a value of 1 to TemperatureDisplayMode attribute of DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 1600));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxCoolSetpointLimit", [value shortValue], 3200));
-            }
+                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                            NextTest();
+                                        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMaxCoolSetpointLimitAttribute_27()
+    CHIP_ERROR TestVerifyDeviceTemperatureDisplayedInf_4()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Verify device temperature displayed in °Fgarbage: not in length on purpose", 42);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestWritesAValueOfGreaterThan1ToTemperatureDisplayModeAttributeOfDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxCoolSetpointLimitArgument;
-        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes a value back that is different but valid for MaxCoolSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id temperatureDisplayModeArgument;
+        temperatureDisplayModeArgument = [NSNumber numberWithUnsignedChar:2];
+        [cluster writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument
+                                             completionHandler:^(NSError * _Nullable err) {
+                                                 NSLog(@"Writes a value of greater than 1 to TemperatureDisplayMode attribute of "
+                                                       @"DUT Error: %@",
+                                                     err);
 
-                                               NextTest();
-                                           }];
+                                                 VerifyOrReturn(
+                                                     CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                 NextTest();
+                                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxCoolSetpointLimitAttribute_28()
+    CHIP_ERROR TestWritesAValueOf0ToKeypadLockoutAttributeOfDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads it back again to confirm the successful write of MaxCoolSetpointLimit attribute Error: %@", err);
-
-            if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of 0 to KeypadLockout attribute of DUT Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 2000));
-            }
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMaxCoolSetpointLimitAttribute_29()
+    CHIP_ERROR TestVerifyAllDeviceFunctionalityAvailableToTheUser_7()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message
+            = chip::Span<const char>("Verify all device functionality available to the usergarbage: not in length on purpose", 53);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestWritesAValueOf1ToKeypadLockoutAttributeOfDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxCoolSetpointLimitArgument;
-        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
-        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit "
-                                                     @"attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of 1 to KeypadLockout attribute of DUT Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_30()
+    CHIP_ERROR TestVerifyDeviceOperatesAtLevel1ReducedFunctionality_9()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Verify device operates at Level 1 reduced functionalitygarbage: not in length on purpose", 55);
+        return UserPrompt("alpha", value);
+    }
+
+    CHIP_ERROR TestWritesAValueOf2ToKeypadLockoutAttributeOfDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxCoolSetpointLimitArgument;
-        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
-        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute "
-                                                     @"Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_31()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id minHeatSetpointLimitArgument;
-        minHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
-        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MinHeatSetpointLimit to "
-                                                     @"MinHeatSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_32()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id minHeatSetpointLimitArgument;
-        minHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
-        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MaxHeatSetpointLimit to "
-                                                     @"MinHeatSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_33()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id maxHeatSetpointLimitArgument;
-        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
-        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MinHeatSetpointLimit to "
-                                                     @"MaxHeatSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMaxHeatSetpointLimitToMaxHeatSetpointLimitAttribute_34()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id maxHeatSetpointLimitArgument;
-        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
-        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MaxHeatSetpointLimit to "
-                                                     @"MaxHeatSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_35()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id minCoolSetpointLimitArgument;
-        minCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
-        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MinCoolSetpointLimit to "
-                                                     @"MinCoolSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_36()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id minCoolSetpointLimitArgument;
-        minCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
-        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MaxCoolSetpointLimit to "
-                                                     @"MinCoolSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:2];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of 2 to KeypadLockout attribute of DUT Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMinCoolSetpointLimitToMaxCoolSetpointLimitAttribute_37()
+    CHIP_ERROR TestVerifyDeviceOperatesAtLevel2ReducedFunctionality_11()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id maxCoolSetpointLimitArgument;
-        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
-        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MinCoolSetpointLimit to "
-                                                     @"MaxCoolSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                               NextTest();
-                                           }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Verify device operates at Level 2 reduced functionalitygarbage: not in length on purpose", 55);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestWritesSetsBackTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_38()
+    CHIP_ERROR TestWritesAValueOf3ToKeypadLockoutAttributeOfDut_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id maxCoolSetpointLimitArgument;
-        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:3200];
-        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
-                                           completionHandler:^(NSError * _Nullable err) {
-                                               NSLog(@"Writes (sets back) the limit of MaxCoolSetpointLimit to "
-                                                     @"MaxCoolSetpointLimit attribute Error: %@",
-                                                   err);
-
-                                               if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:3];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of 3 to KeypadLockout attribute of DUT Error: %@", err);
 
-                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                               NextTest();
-                                           }];
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_39()
+    CHIP_ERROR TestVerifyDeviceOperatesAtLevel3ReducedFunctionality_13()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 4));
-                }
-
-                VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8"));
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMinValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("controlSequenceOfOperation", [value unsignedCharValue], 5));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Verify device operates at Level 3 reduced functionalitygarbage: not in length on purpose", 55);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_40()
+    CHIP_ERROR TestWritesAValueOf4ToKeypadLockoutAttributeOfDut_14()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id controlSequenceOfOperationArgument;
-        controlSequenceOfOperationArgument = [NSNumber numberWithUnsignedChar:2];
-        [cluster writeAttributeControlSequenceOfOperationWithValue:controlSequenceOfOperationArgument
-                                                 completionHandler:^(NSError * _Nullable err) {
-                                                     NSLog(@"Write Attribute command for ControlSequenceOfOperation with a new "
-                                                           @"valid value Error: %@",
-                                                         err);
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:4];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of 4 to KeypadLockout attribute of DUT Error: %@", err);
 
-                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                     NextTest();
-                                                 }];
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadItBackAgainToConfirmTheSuccessfulWrite_41()
+    CHIP_ERROR TestVerifyDeviceOperatesAtLevel4ReducedFunctionality_15()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Read it back again to confirm the successful write Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 2));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Verify device operates at Level 4 reduced functionalitygarbage: not in length on purpose", 55);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_42()
+    CHIP_ERROR TestWritesAValueOf5ToKeypadLockoutAttributeOfDut_16()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:5];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of 5 to KeypadLockout attribute of DUT Error: %@", err);
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                  NextTest();
-                                              }];
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_43()
+    CHIP_ERROR TestVerifyDeviceOperatesAtLeastFunctionalityLevel_17()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
-
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                  NextTest();
-                                              }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message
+            = chip::Span<const char>("Verify device operates at least functionality levelgarbage: not in length on purpose", 51);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_44()
+    CHIP_ERROR TestWritesAValueOfGreaterThan5ToKeypadLockoutAttributeOfDut_18()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
-
-                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id keypadLockoutArgument;
+        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:6];
+        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
+                                    completionHandler:^(NSError * _Nullable err) {
+                                        NSLog(@"Writes a value of greater than 5 to KeypadLockout attribute of DUT Error: %@", err);
 
-                                                  NextTest();
-                                              }];
+                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                        NextTest();
+                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_45()
+    CHIP_ERROR TestWritesAValueOf0ToScheduleProgrammingVisibilityAttributeOfDut_19()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
-
-                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+        id scheduleProgrammingVisibilityArgument;
+        scheduleProgrammingVisibilityArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument
+                                                    completionHandler:^(NSError * _Nullable err) {
+                                                        NSLog(@"Writes a value of 0 to ScheduleProgrammingVisibility attribute of "
+                                                              @"DUT Error: %@",
+                                                            err);
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                  NextTest();
-                                              }];
+                                                        NextTest();
+                                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_46()
+    CHIP_ERROR TestVerifyLocalScheduleProgrammingFunctionalityIsEnabledAtTheThermostat_20()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
-
-                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                  NextTest();
-                                              }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Verify local schedule programming functionality is enabled at the thermostatgarbage: not in length on purpose", 76);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_47()
+    CHIP_ERROR TestWritesAValueOf1ToScheduleProgrammingVisibilityAttributeOfDut_21()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
+        id scheduleProgrammingVisibilityArgument;
+        scheduleProgrammingVisibilityArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument
+                                                    completionHandler:^(NSError * _Nullable err) {
+                                                        NSLog(@"Writes a value of 1 to ScheduleProgrammingVisibility attribute of "
+                                                              @"DUT Error: %@",
+                                                            err);
 
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                  NextTest();
-                                              }];
+                                                        NextTest();
+                                                    }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_48()
+    CHIP_ERROR TestVerifyLocalScheduleProgrammingFunctionalityIsDisabledAtTheThermostat_22()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
-
-                                                  if (err.code == MatterInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                  NextTest();
-                                              }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>(
+            "Verify local schedule programming functionality is disabled at the thermostatgarbage: not in length on purpose", 77);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_49()
+    CHIP_ERROR TestWritesAValueOfGreaterThan1ToScheduleProgrammingVisibilityAttributeOfDut_23()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostat * cluster = [[CHIPTestThermostat alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedHeatingSetpointArgument;
-        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
-                                              completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
-
-                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id scheduleProgrammingVisibilityArgument;
+        scheduleProgrammingVisibilityArgument = [NSNumber numberWithUnsignedChar:2];
+        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument
+                                                    completionHandler:^(NSError * _Nullable err) {
+                                                        NSLog(@"Writes a value of greater than 1 to ScheduleProgrammingVisibility "
+                                                              @"attribute of DUT Error: %@",
+                                                            err);
 
-                                                  NextTest();
-                                              }];
+                                                        VerifyOrReturn(CheckValue(
+                                                            "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                        NextTest();
+                                                    }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_TSUIC_1_1 : public TestCommandBridge {
+class Test_TC_ULABEL_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TSUIC_1_1()
-        : TestCommandBridge("Test_TC_TSUIC_1_1")
+    Test_TC_ULABEL_1_1()
+        : TestCommandBridge("Test_TC_ULABEL_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -54228,7 +55148,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_TSUIC_1_1() {}
+    ~Test_TC_ULABEL_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -54236,11 +55156,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSUIC_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ULABEL_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -54257,34 +55177,42 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH read ClusterRevision attribute from the DUT\n");
-            err = TestThReadClusterRevisionAttributeFromTheDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the global attribute: ClusterRevision\n");
+            err = TestReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the optional global attribute: FeatureMap\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeAttributeList_2();
+            err = TestReadTheOptionalGlobalAttributeFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 3 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
-                "supported events.\n");
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3();
+            err = TestReadTheGlobalAttributeAttributeList_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
-            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 4 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
+                "supported events.\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
+            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
             break;
         }
 
@@ -54315,6 +55243,9 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -54328,7 +55259,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -54342,21 +55273,20 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThReadClusterRevisionAttributeFromTheDut_1()
+    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH read ClusterRevision attribute from the DUT Error: %@", err);
+            NSLog(@"Read the global attribute: ClusterRevision Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
@@ -54366,34 +55296,25 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_2()
+    CHIP_ERROR TestReadTheOptionalGlobalAttributeFeatureMap_2()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(3)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
-            }
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
-            NextTest();
-        }];
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
+    }
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
+    {
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_3()
+    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -54402,11 +55323,10 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -54426,11 +55346,10 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -54451,11 +55370,11 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_TSUIC_2_1 : public TestCommandBridge {
+class Test_TC_ULABEL_2_2 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TSUIC_2_1()
-        : TestCommandBridge("Test_TC_TSUIC_2_1")
+    Test_TC_ULABEL_2_2()
+        : TestCommandBridge("Test_TC_ULABEL_2_2")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -54465,7 +55384,7 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_TSUIC_2_1() {}
+    ~Test_TC_ULABEL_2_2() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -54473,11 +55392,11 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_2\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSUIC_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ULABEL_2_2\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -54494,28 +55413,12 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: TemperatureDisplayMode\n");
-            err = TestReadTheMandatoryAttributeTemperatureDisplayMode_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH writes LabelList attribute from the DUT\n");
+            err = TestThWritesLabelListAttributeFromTheDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: TemperatureDisplayMode\n");
-            err = TestReadTheMandatoryAttributeTemperatureDisplayMode_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : read the mandatory attribute: KeypadLockout\n");
-            err = TestReadTheMandatoryAttributeKeypadLockout_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : read the mandatory attribute: KeypadLockout\n");
-            err = TestReadTheMandatoryAttributeKeypadLockout_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : read the optional attribute: ScheduleProgrammingVisibility\n");
-            err = TestReadTheOptionalAttributeScheduleProgrammingVisibility_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : read the optional attribute: ScheduleProgrammingVisibility\n");
-            err = TestReadTheOptionalAttributeScheduleProgrammingVisibility_6();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads LabelList attribute from the DUT\n");
+            err = TestThReadsLabelListAttributeFromTheDut_2();
             break;
         }
 
@@ -54537,18 +55440,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -54562,7 +55453,7 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    const uint16_t mTestCount = 3;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -54576,96 +55467,71 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeTemperatureDisplayMode_1()
+    CHIP_ERROR TestThWritesLabelListAttributeFromTheDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTemperatureDisplayModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: TemperatureDisplayMode Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("temperature display mode", actualValue, 0));
-            }
-
-            NextTest();
-        }];
+        id labelListArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [[CHIPUserLabelClusterLabelStruct alloc] init];
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[0]).label = @"roomName";
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[0]).value = @"master bedroom 1";
 
-        return CHIP_NO_ERROR;
-    }
+            temp_0[1] = [[CHIPUserLabelClusterLabelStruct alloc] init];
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[1]).label = @"Orientation";
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[1]).value = @"east";
 
-    CHIP_ERROR TestReadTheMandatoryAttributeTemperatureDisplayMode_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+            temp_0[2] = [[CHIPUserLabelClusterLabelStruct alloc] init];
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[2]).label = @"floor";
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[2]).value = @"2";
 
-        [cluster readAttributeTemperatureDisplayModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: TemperatureDisplayMode Error: %@", err);
+            temp_0[3] = [[CHIPUserLabelClusterLabelStruct alloc] init];
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[3]).label = @"roomType";
+            ((CHIPUserLabelClusterLabelStruct *) temp_0[3]).value = @"bedroom";
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            labelListArgument = temp_0;
+        }
+        [cluster writeAttributeLabelListWithValue:labelListArgument
+                                completionHandler:^(NSError * _Nullable err) {
+                                    NSLog(@"TH writes LabelList attribute from the DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("temperatureDisplayMode", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("temperatureDisplayMode", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("temperatureDisplayMode", [value unsignedCharValue], 1));
-            }
+                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                    NextTest();
+                                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheMandatoryAttributeKeypadLockout_3()
+    CHIP_ERROR TestThReadsLabelListAttributeFromTheDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeKeypadLockoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: KeypadLockout Error: %@", err);
+        [cluster readAttributeLabelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads LabelList attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("keypad lockout", actualValue, 0));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheMandatoryAttributeKeypadLockout_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeKeypadLockoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read the mandatory attribute: KeypadLockout Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("keypadLockout", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("keypadLockout", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("keypadLockout", [value unsignedCharValue], 5));
+                VerifyOrReturn(CheckValue("label list", [actualValue count], static_cast<uint32_t>(4)));
+                VerifyOrReturn(
+                    CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[0]).label, @"roomName"));
+                VerifyOrReturn(
+                    CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[0]).value, @"master bedroom 1"));
+                VerifyOrReturn(
+                    CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[1]).label, @"Orientation"));
+                VerifyOrReturn(CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[1]).value, @"east"));
+                VerifyOrReturn(CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[2]).label, @"floor"));
+                VerifyOrReturn(CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[2]).value, @"2"));
+                VerifyOrReturn(
+                    CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[3]).label, @"roomType"));
+                VerifyOrReturn(CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[3]).value, @"bedroom"));
             }
 
             NextTest();
@@ -54673,64 +55539,13 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-
-    CHIP_ERROR TestReadTheOptionalAttributeScheduleProgrammingVisibility_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeScheduleProgrammingVisibilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"read the optional attribute: ScheduleProgrammingVisibility Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("schedule programming visibility", actualValue, 0));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheOptionalAttributeScheduleProgrammingVisibility_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeScheduleProgrammingVisibilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"read the optional attribute: ScheduleProgrammingVisibility Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("scheduleProgrammingVisibility", "", "enum8"));
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMinValue<uint8_t>("scheduleProgrammingVisibility", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("scheduleProgrammingVisibility", [value unsignedCharValue], 1));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
 };
 
-class Test_TC_TSUIC_2_2 : public TestCommandBridge {
+class Test_TC_DGWIFI_2_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_TSUIC_2_2()
-        : TestCommandBridge("Test_TC_TSUIC_2_2")
+    Test_TC_DGWIFI_2_1()
+        : TestCommandBridge("Test_TC_DGWIFI_2_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -54740,7 +55555,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_TSUIC_2_2() {}
+    ~Test_TC_DGWIFI_2_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -54748,11 +55563,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_2_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TSUIC_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DGWIFI_2_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -54769,154 +55584,84 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Writes a value of 0 to TemperatureDisplayMode attribute of DUT\n");
-            if (ShouldSkip("A_TEMPERATURE_DISPLAY_MODE")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueOf0ToTemperatureDisplayModeAttributeOfDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads NetworkInterface structure attribute from DUT\n");
+            err = TestReadsNetworkInterfaceStructureAttributeFromDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Verify device temperature displayed in °C\n");
-            err = TestVerifyDeviceTemperatureDisplayedInc_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads SecurityType attribute constraints\n");
+            err = TestReadsSecurityTypeAttributeConstraints_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Writes a value of 1 to TemperatureDisplayMode attribute of DUT\n");
-            if (ShouldSkip("A_TEMPERATURE_DISPLAY_MODE")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueOf1ToTemperatureDisplayModeAttributeOfDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads WiFiVersion attribute constraints\n");
+            err = TestReadsWiFiVersionAttributeConstraints_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Verify device temperature displayed in °F\n");
-            err = TestVerifyDeviceTemperatureDisplayedInf_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads ChannelNumber attribute constraints\n");
+            err = TestReadsChannelNumberAttributeConstraints_4();
             break;
         case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : Writes a value of greater than 1 to TemperatureDisplayMode attribute of DUT\n");
-            if (ShouldSkip("A_TEMPERATURE_DISPLAY_MODE")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueOfGreaterThan1ToTemperatureDisplayModeAttributeOfDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Reads RSSI attribute constraints\n");
+            err = TestReadsRssiAttributeConstraints_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Writes a value of 0 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Reads BeaconLostCount attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOf0ToKeypadLockoutAttributeOfDut_6();
+            err = TestReadsBeaconLostCountAttributeConstraints_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Verify all device functionality available to the user\n");
-            err = TestVerifyAllDeviceFunctionalityAvailableToTheUser_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads BeaconRxCount attribute constraints\n");
+            err = TestReadsBeaconRxCountAttributeConstraints_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Writes a value of 1 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Reads PacketMulticastRxCount attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOf1ToKeypadLockoutAttributeOfDut_8();
+            err = TestReadsPacketMulticastRxCountAttributeConstraints_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Verify device operates at Level 1 reduced functionality\n");
-            err = TestVerifyDeviceOperatesAtLevel1ReducedFunctionality_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Writes a value of 2 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueOf2ToKeypadLockoutAttributeOfDut_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Verify device operates at Level 2 reduced functionality\n");
-            err = TestVerifyDeviceOperatesAtLevel2ReducedFunctionality_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Writes a value of 3 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueOf3ToKeypadLockoutAttributeOfDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Verify device operates at Level 3 reduced functionality\n");
-            err = TestVerifyDeviceOperatesAtLevel3ReducedFunctionality_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Writes a value of 4 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
-                NextTest();
-                return;
-            }
-            err = TestWritesAValueOf4ToKeypadLockoutAttributeOfDut_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Verify device operates at Level 4 reduced functionality\n");
-            err = TestVerifyDeviceOperatesAtLevel4ReducedFunctionality_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Writes a value of 5 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Reads PacketMulticastTxCount attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOf5ToKeypadLockoutAttributeOfDut_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Verify device operates at least functionality level\n");
-            err = TestVerifyDeviceOperatesAtLeastFunctionalityLevel_17();
+            err = TestReadsPacketMulticastTxCountAttributeConstraints_9();
             break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Writes a value of greater than 5 to KeypadLockout attribute of DUT\n");
-            if (ShouldSkip("A_KEYPAD_LOCKOUT")) {
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Reads PacketUnicastRxCount attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOfGreaterThan5ToKeypadLockoutAttributeOfDut_18();
+            err = TestReadsPacketUnicastRxCountAttributeConstraints_10();
             break;
-        case 19:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 19 : Writes a value of 0 to ScheduleProgrammingVisibility attribute of DUT\n");
-            if (ShouldSkip("A_SCHEDULE_PROGRAMMING_VISIBILITY")) {
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Reads PacketUnicastTxCount attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOf0ToScheduleProgrammingVisibilityAttributeOfDut_19();
-            break;
-        case 20:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 20 : Verify local schedule programming functionality is enabled at the thermostat\n");
-            err = TestVerifyLocalScheduleProgrammingFunctionalityIsEnabledAtTheThermostat_20();
+            err = TestReadsPacketUnicastTxCountAttributeConstraints_11();
             break;
-        case 21:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 21 : Writes a value of 1 to ScheduleProgrammingVisibility attribute of DUT\n");
-            if (ShouldSkip("A_SCHEDULE_PROGRAMMING_VISIBILITY")) {
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Reads CurrentMaxRate attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOf1ToScheduleProgrammingVisibilityAttributeOfDut_21();
-            break;
-        case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : Verify local schedule programming functionality is disabled at the thermostat\n");
-            err = TestVerifyLocalScheduleProgrammingFunctionalityIsDisabledAtTheThermostat_22();
+            err = TestReadsCurrentMaxRateAttributeConstraints_12();
             break;
-        case 23:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 23 : Writes a value of greater than 1 to ScheduleProgrammingVisibility attribute of DUT\n");
-            if (ShouldSkip("A_SCHEDULE_PROGRAMMING_VISIBILITY")) {
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Reads OverrunCount attribute constraints\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueOfGreaterThan1ToScheduleProgrammingVisibilityAttributeOfDut_23();
+            err = TestReadsOverrunCountAttributeConstraints_13();
             break;
         }
 
@@ -54945,7 +55690,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -54971,36 +55716,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         }
 
         // Go on to the next test.
@@ -55014,7 +55729,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 24;
+    const uint16_t mTestCount = 14;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -55028,372 +55743,292 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestWritesAValueOf0ToTemperatureDisplayModeAttributeOfDut_1()
+    CHIP_ERROR TestReadsNetworkInterfaceStructureAttributeFromDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestGeneralDiagnostics * cluster = [[CHIPTestGeneralDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:0
+                                                                                            queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id temperatureDisplayModeArgument;
-        temperatureDisplayModeArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster
-            writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument
-                                        completionHandler:^(NSError * _Nullable err) {
-                                            NSLog(@"Writes a value of 0 to TemperatureDisplayMode attribute of DUT Error: %@", err);
+        [cluster readAttributeNetworkInterfacesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads NetworkInterface structure attribute from DUT Error: %@", err);
 
-                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                            NextTest();
-                                        }];
+            VerifyOrReturn(CheckConstraintType("networkInterfaces", "", "list"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyDeviceTemperatureDisplayedInc_2()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Verify device temperature displayed in °Cgarbage: not in length on purpose", 42);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOf1ToTemperatureDisplayModeAttributeOfDut_3()
+    CHIP_ERROR TestReadsSecurityTypeAttributeConstraints_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id temperatureDisplayModeArgument;
-        temperatureDisplayModeArgument = [NSNumber numberWithUnsignedChar:1];
-        [cluster
-            writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument
-                                        completionHandler:^(NSError * _Nullable err) {
-                                            NSLog(@"Writes a value of 1 to TemperatureDisplayMode attribute of DUT Error: %@", err);
+        [cluster readAttributeSecurityTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads SecurityType attribute constraints Error: %@", err);
 
-                                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                            NextTest();
-                                        }];
+            if (value != nil) {
 
-        return CHIP_NO_ERROR;
-    }
+                VerifyOrReturn(CheckConstraintType("securityType", "", "enum"));
+            }
 
-    CHIP_ERROR TestVerifyDeviceTemperatureDisplayedInf_4()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Verify device temperature displayed in °Fgarbage: not in length on purpose", 42);
-        return UserPrompt("alpha", value);
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueOfGreaterThan1ToTemperatureDisplayModeAttributeOfDut_5()
+    CHIP_ERROR TestReadsWiFiVersionAttributeConstraints_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id temperatureDisplayModeArgument;
-        temperatureDisplayModeArgument = [NSNumber numberWithUnsignedChar:2];
-        [cluster writeAttributeTemperatureDisplayModeWithValue:temperatureDisplayModeArgument
-                                             completionHandler:^(NSError * _Nullable err) {
-                                                 NSLog(@"Writes a value of greater than 1 to TemperatureDisplayMode attribute of "
-                                                       @"DUT Error: %@",
-                                                     err);
+        [cluster readAttributeWiFiVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads WiFiVersion attribute constraints Error: %@", err);
 
-                                                 VerifyOrReturn(
-                                                     CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                                 NextTest();
-                                             }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("wiFiVersion", "", "enum"));
+                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("wiFiVersion", [value unsignedCharValue], 0));
+                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("wiFiVersion", [value unsignedCharValue], 5));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueOf0ToKeypadLockoutAttributeOfDut_6()
+    CHIP_ERROR TestReadsChannelNumberAttributeConstraints_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of 0 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributeChannelNumberWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads ChannelNumber attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                        NextTest();
-                                    }];
+            if (value != nil) {
 
-        return CHIP_NO_ERROR;
-    }
+                VerifyOrReturn(CheckConstraintType("channelNumber", "", "uint16"));
+            }
 
-    CHIP_ERROR TestVerifyAllDeviceFunctionalityAvailableToTheUser_7()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Verify all device functionality available to the usergarbage: not in length on purpose", 53);
-        return UserPrompt("alpha", value);
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueOf1ToKeypadLockoutAttributeOfDut_8()
+    CHIP_ERROR TestReadsRssiAttributeConstraints_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:1];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of 1 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributeRssiWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads RSSI attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                        NextTest();
-                                    }];
+            if (value != nil) {
 
-        return CHIP_NO_ERROR;
-    }
+                VerifyOrReturn(CheckConstraintType("rssi", "", "int8"));
+                VerifyOrReturn(CheckConstraintMinValue<int8_t>("rssi", [value charValue], -120));
+                VerifyOrReturn(CheckConstraintMaxValue<int8_t>("rssi", [value charValue], 0));
+            }
 
-    CHIP_ERROR TestVerifyDeviceOperatesAtLevel1ReducedFunctionality_9()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 1 reduced functionalitygarbage: not in length on purpose", 55);
-        return UserPrompt("alpha", value);
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueOf2ToKeypadLockoutAttributeOfDut_10()
+    CHIP_ERROR TestReadsBeaconLostCountAttributeConstraints_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:2];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of 2 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributeBeaconLostCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads BeaconLostCount attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                        NextTest();
-                                    }];
+            VerifyOrReturn(CheckConstraintType("beaconLostCount", "", "uint32"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyDeviceOperatesAtLevel2ReducedFunctionality_11()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 2 reduced functionalitygarbage: not in length on purpose", 55);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOf3ToKeypadLockoutAttributeOfDut_12()
+    CHIP_ERROR TestReadsBeaconRxCountAttributeConstraints_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:3];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of 3 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributeBeaconRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads BeaconRxCount attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                        NextTest();
-                                    }];
+            VerifyOrReturn(CheckConstraintType("beaconRxCount", "", "uint32"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyDeviceOperatesAtLevel3ReducedFunctionality_13()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 3 reduced functionalitygarbage: not in length on purpose", 55);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOf4ToKeypadLockoutAttributeOfDut_14()
+    CHIP_ERROR TestReadsPacketMulticastRxCountAttributeConstraints_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:4];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of 4 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributePacketMulticastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketMulticastRxCount attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                        NextTest();
-                                    }];
+            VerifyOrReturn(CheckConstraintType("packetMulticastRxCount", "", "uint32"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyDeviceOperatesAtLevel4ReducedFunctionality_15()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify device operates at Level 4 reduced functionalitygarbage: not in length on purpose", 55);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOf5ToKeypadLockoutAttributeOfDut_16()
+    CHIP_ERROR TestReadsPacketMulticastTxCountAttributeConstraints_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:5];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of 5 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributePacketMulticastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketMulticastTxCount attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                        NextTest();
-                                    }];
+            VerifyOrReturn(CheckConstraintType("packetMulticastTxCount", "", "uint32"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyDeviceOperatesAtLeastFunctionalityLevel_17()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message
-            = chip::Span<const char>("Verify device operates at least functionality levelgarbage: not in length on purpose", 51);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOfGreaterThan5ToKeypadLockoutAttributeOfDut_18()
+    CHIP_ERROR TestReadsPacketUnicastRxCountAttributeConstraints_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id keypadLockoutArgument;
-        keypadLockoutArgument = [NSNumber numberWithUnsignedChar:6];
-        [cluster writeAttributeKeypadLockoutWithValue:keypadLockoutArgument
-                                    completionHandler:^(NSError * _Nullable err) {
-                                        NSLog(@"Writes a value of greater than 5 to KeypadLockout attribute of DUT Error: %@", err);
+        [cluster readAttributePacketUnicastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketUnicastRxCount attribute constraints Error: %@", err);
 
-                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                        NextTest();
-                                    }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("packetUnicastRxCount", "", "uint32"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueOf0ToScheduleProgrammingVisibilityAttributeOfDut_19()
+    CHIP_ERROR TestReadsPacketUnicastTxCountAttributeConstraints_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id scheduleProgrammingVisibilityArgument;
-        scheduleProgrammingVisibilityArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument
-                                                    completionHandler:^(NSError * _Nullable err) {
-                                                        NSLog(@"Writes a value of 0 to ScheduleProgrammingVisibility attribute of "
-                                                              @"DUT Error: %@",
-                                                            err);
+        [cluster readAttributePacketUnicastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketUnicastTxCount attribute constraints Error: %@", err);
 
-                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                        NextTest();
-                                                    }];
+            VerifyOrReturn(CheckConstraintType("packetUnicastTxCount", "", "uint32"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyLocalScheduleProgrammingFunctionalityIsEnabledAtTheThermostat_20()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify local schedule programming functionality is enabled at the thermostatgarbage: not in length on purpose", 76);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOf1ToScheduleProgrammingVisibilityAttributeOfDut_21()
+    CHIP_ERROR TestReadsCurrentMaxRateAttributeConstraints_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id scheduleProgrammingVisibilityArgument;
-        scheduleProgrammingVisibilityArgument = [NSNumber numberWithUnsignedChar:1];
-        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument
-                                                    completionHandler:^(NSError * _Nullable err) {
-                                                        NSLog(@"Writes a value of 1 to ScheduleProgrammingVisibility attribute of "
-                                                              @"DUT Error: %@",
-                                                            err);
+        [cluster readAttributeCurrentMaxRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads CurrentMaxRate attribute constraints Error: %@", err);
 
-                                                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                                        NextTest();
-                                                    }];
+            VerifyOrReturn(CheckConstraintType("currentMaxRate", "", "uint64"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyLocalScheduleProgrammingFunctionalityIsDisabledAtTheThermostat_22()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>(
-            "Verify local schedule programming functionality is disabled at the thermostatgarbage: not in length on purpose", 77);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestWritesAValueOfGreaterThan1ToScheduleProgrammingVisibilityAttributeOfDut_23()
+    CHIP_ERROR TestReadsOverrunCountAttributeConstraints_13()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPTestThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id scheduleProgrammingVisibilityArgument;
-        scheduleProgrammingVisibilityArgument = [NSNumber numberWithUnsignedChar:2];
-        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:scheduleProgrammingVisibilityArgument
-                                                    completionHandler:^(NSError * _Nullable err) {
-                                                        NSLog(@"Writes a value of greater than 1 to ScheduleProgrammingVisibility "
-                                                              @"attribute of DUT Error: %@",
-                                                            err);
+        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads OverrunCount attribute constraints Error: %@", err);
 
-                                                        VerifyOrReturn(CheckValue(
-                                                            "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                                        NextTest();
-                                                    }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("overrunCount", "", "uint64"));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
+class Test_TC_DGWIFI_2_3 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DIAG_TH_NW_1_1()
-        : TestCommandBridge("Test_TC_DIAG_TH_NW_1_1")
+    Test_TC_DGWIFI_2_3()
+        : TestCommandBridge("Test_TC_DGWIFI_2_3")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -55403,7 +56038,7 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DIAG_TH_NW_1_1() {}
+    ~Test_TC_DGWIFI_2_3() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -55411,11 +56046,11 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DIAG_TH_NW_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_2_3\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DIAG_TH_NW_1_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DGWIFI_2_3\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -55432,12 +56067,60 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Sends ResetCounts command\n");
-            err = TestSendsResetCountsCommand_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends ResetCounts command to DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestThSendsResetCountsCommandToDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the Overruncount attribute\n");
-            err = TestReadTheOverruncountAttribute_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads BeaconLostCount attribute from DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBeaconLostCountAttributeFromDut_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads BeaconRxCount attribute from DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBeaconRxCountAttributeFromDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads PacketMulticastRxCount attribute from DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsPacketMulticastRxCountAttributeFromDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Reads PacketMulticastTxCount attribute from DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsPacketMulticastTxCountAttributeFromDut_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Reads PacketUnicastRxCount attribute from DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsPacketUnicastRxCountAttributeFromDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads PacketUnicastTxCount attribute from DUT\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsPacketUnicastTxCountAttributeFromDut_7();
             break;
         }
 
@@ -55459,6 +56142,21 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -55472,7 +56170,7 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
+    const uint16_t mTestCount = 8;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -55486,16 +56184,16 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestSendsResetCountsCommand_1()
+    CHIP_ERROR TestThSendsResetCountsCommandToDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Sends ResetCounts command Error: %@", err);
+            NSLog(@"TH sends ResetCounts command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -55505,22 +56203,142 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOverruncountAttribute_2()
+    CHIP_ERROR TestReadsBeaconLostCountAttributeFromDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the Overruncount attribute Error: %@", err);
+        [cluster readAttributeBeaconLostCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads BeaconLostCount attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OverrunCount", actualValue, 0ULL));
+                VerifyOrReturn(CheckValue("BeaconLostCount", actualValue, 0UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBeaconRxCountAttributeFromDut_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeBeaconRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads BeaconRxCount attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("BeaconRxCount", actualValue, 0UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsPacketMulticastRxCountAttributeFromDut_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePacketMulticastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketMulticastRxCount attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("PacketMulticastRxCount", actualValue, 0UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsPacketMulticastTxCountAttributeFromDut_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePacketMulticastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketMulticastTxCount attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("PacketMulticastTxCount", actualValue, 0UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsPacketUnicastRxCountAttributeFromDut_6()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePacketUnicastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketUnicastRxCount attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("PacketUnicastRxCount", actualValue, 0UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsPacketUnicastTxCountAttributeFromDut_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributePacketUnicastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads PacketUnicastTxCount attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("PacketUnicastTxCount", actualValue, 0UL));
             }
 
             NextTest();
@@ -55530,11 +56348,11 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
+class Test_TC_WNCV_1_1 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DIAG_TH_NW_1_2()
-        : TestCommandBridge("Test_TC_DIAG_TH_NW_1_2")
+    Test_TC_WNCV_1_1()
+        : TestCommandBridge("Test_TC_WNCV_1_1")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -55544,7 +56362,7 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DIAG_TH_NW_1_2() {}
+    ~Test_TC_WNCV_1_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -55552,11 +56370,11 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DIAG_TH_NW_1_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_1_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DIAG_TH_NW_1_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_1_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -55573,321 +56391,40 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Validate constraints of attribute: Channel\n");
-            err = TestValidateConstraintsOfAttributeChannel_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads from the DUT the (0xFFFD) ClusterRevision attribute\n");
+            err = TestThReadsFromTheDutThe0xFFFDClusterRevisionAttribute_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : read RoutingRole atribute from DUT\n");
-            err = TestReadRoutingRoleAtributeFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads from the DUT the (0xFFFC) FeatureMap attribute\n");
+            err = TestThReadsFromTheDutThe0xFFFCFeatureMapAttribute_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : read NetworkName attribute from DUT\n");
-            err = TestReadNetworkNameAttributeFromDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 4 : read NetworkName attribute from DUT and verify response value, If value is NULL then verify "
-                "that RoutingRole is set to 1\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadNetworkNameAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : read PanId attribute from DUT\n");
-            err = TestReadPanIdAttributeFromDut_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : read PanId attribute from DUT and verify response value, If value is NULL then verify that "
-                "RoutingRole is set to 1\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads from the DUT the (0xFFFB) AttributeList attribute\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadPanIdAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Validate constraints of attribute: ExtendedPanId\n");
-            err = TestValidateConstraintsOfAttributeExtendedPanId_7();
+            err = TestThReadsFromTheDutThe0xFFFBAttributeListAttribute_3();
             break;
-        case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : read ExtendedPanId attribute from DUT and verify response value, If value is NULL then "
-                "verify that RoutingRole is set to 1\n");
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads from the DUT the (0xFFFA) EventList attribute\n");
             if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
                 return;
             }
-            err = TestReadExtendedPanIdAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_8();
+            err = TestThReadsFromTheDutThe0xFFFAEventListAttribute_4();
             break;
-        case 9:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 9 : read MeshLocalPrefix attribute from DUT and verify response value, If value is NULL then "
-                "verify that RoutingRole is set to 1\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
                 NextTest();
                 return;
             }
-            err = TestReadMeshLocalPrefixAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_9();
+            err = TestThReadsFromTheDutThe0xFFF9AcceptedCommandListAttribute_5();
             break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Validate constraints of attribute: OverrunCount\n");
-            err = TestValidateConstraintsOfAttributeOverrunCount_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 11 : read OverrunCount attribute from DUT and verify response value, If the Overruncount is "
-                "greater than zero or not\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadOverrunCountAttributeFromDutAndVerifyResponseValueIfTheOverruncountIsGreaterThanZeroOrNot_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 12 : read NeighborTableList attribute from DUT and Verify that the NeighborTable List size is "
-                "Zero or greater and verify each node types\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadNeighborTableListAttributeFromDutAndVerifyThatTheNeighborTableListSizeIsZeroOrGreaterAndVerifyEachNodeTypes_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 13 : read RouteTableList attribute from DUT and Verify that the RouteTableList List size is Zero "
-                "or greater and verify each node types\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadRouteTableListAttributeFromDutAndVerifyThatTheRouteTableListListSizeIsZeroOrGreaterAndVerifyEachNodeTypes_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Validate constraints of attribute: PartitionId\n");
-            err = TestValidateConstraintsOfAttributePartitionId_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Validate constraints of attribute: weighting\n");
-            err = TestValidateConstraintsOfAttributeWeighting_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Validate constraints of attribute: DataVersion\n");
-            err = TestValidateConstraintsOfAttributeDataVersion_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Validate constraints of attribute: StableDataVersion\n");
-            err = TestValidateConstraintsOfAttributeStableDataVersion_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Validate constraints of attribute: LeaderRouterId\n");
-            err = TestValidateConstraintsOfAttributeLeaderRouterId_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Validate constraints of attribute: DetachedRoleCount\n");
-            err = TestValidateConstraintsOfAttributeDetachedRoleCount_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Validate constraints of attribute: ChildRoleCount\n");
-            err = TestValidateConstraintsOfAttributeChildRoleCount_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Validate constraints of attribute: RouterRoleCount\n");
-            err = TestValidateConstraintsOfAttributeRouterRoleCount_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Validate constraints of attribute: LeaderRoleCount\n");
-            err = TestValidateConstraintsOfAttributeLeaderRoleCount_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Validate constraints of attribute: AttachAttemptCount\n");
-            err = TestValidateConstraintsOfAttributeAttachAttemptCount_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Validate constraints of attribute: PartitionIdChangeCount\n");
-            err = TestValidateConstraintsOfAttributePartitionIdChangeCount_24();
-            break;
-        case 25:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 25 : Validate constraints of attribute: BetterPartitionAttachAttemptCount\n");
-            err = TestValidateConstraintsOfAttributeBetterPartitionAttachAttemptCount_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : Validate constraints of attribute: ParentChangeCount\n");
-            err = TestValidateConstraintsOfAttributeParentChangeCount_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : Validate constraints of attribute: TxTotalCount\n");
-            err = TestValidateConstraintsOfAttributeTxTotalCount_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : Validate constraints of attribute: TxUnicastCount\n");
-            err = TestValidateConstraintsOfAttributeTxUnicastCount_28();
-            break;
-        case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : Validate constraints of attribute: TxBroadcastCount\n");
-            err = TestValidateConstraintsOfAttributeTxBroadcastCount_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : Validate constraints of attribute: TxNoAckRequestedCount\n");
-            err = TestValidateConstraintsOfAttributeTxNoAckRequestedCount_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : Validate constraints of attribute: TxDataCount\n");
-            err = TestValidateConstraintsOfAttributeTxDataCount_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : Validate constraints of attribute: TxDataPollCount\n");
-            err = TestValidateConstraintsOfAttributeTxDataPollCount_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : Validate constraints of attribute: TxBeaconCount\n");
-            err = TestValidateConstraintsOfAttributeTxBeaconCount_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : Validate constraints of attribute: TxBeaconRequestCount\n");
-            err = TestValidateConstraintsOfAttributeTxBeaconRequestCount_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : Validate constraints of attribute: TxOtherCount\n");
-            err = TestValidateConstraintsOfAttributeTxOtherCount_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : Validate constraints of attribute: TxRetryCount\n");
-            err = TestValidateConstraintsOfAttributeTxRetryCount_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : Validate constraints of attribute: TxDirectMaxRetryExpiryCount\n");
-            err = TestValidateConstraintsOfAttributeTxDirectMaxRetryExpiryCount_37();
-            break;
-        case 38:
-            ChipLogProgress(chipTool, " ***** Test Step 38 : Validate constraints of attribute: TxIndirectMaxRetryExpiryCount\n");
-            err = TestValidateConstraintsOfAttributeTxIndirectMaxRetryExpiryCount_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : Validate constraints of attribute: TxErrCcaCount\n");
-            err = TestValidateConstraintsOfAttributeTxErrCcaCount_39();
-            break;
-        case 40:
-            ChipLogProgress(chipTool, " ***** Test Step 40 : Validate constraints of attribute: TxErrAbortCount\n");
-            err = TestValidateConstraintsOfAttributeTxErrAbortCount_40();
-            break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : Validate constraints of attribute: TxErrBusyChannelCount\n");
-            err = TestValidateConstraintsOfAttributeTxErrBusyChannelCount_41();
-            break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : Validate constraints of attribute: RxTotalCount\n");
-            err = TestValidateConstraintsOfAttributeRxTotalCount_42();
-            break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : Validate constraints of attribute: RxUnicastCount\n");
-            err = TestValidateConstraintsOfAttributeRxUnicastCount_43();
-            break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : Validate constraints of attribute: RxBroadcastCount\n");
-            err = TestValidateConstraintsOfAttributeRxBroadcastCount_44();
-            break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : Validate constraints of attribute: RxDataCount\n");
-            err = TestValidateConstraintsOfAttributeRxDataCount_45();
-            break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : Validate constraints of attribute: RxDataPollCount\n");
-            err = TestValidateConstraintsOfAttributeRxDataPollCount_46();
-            break;
-        case 47:
-            ChipLogProgress(chipTool, " ***** Test Step 47 : Validate constraints of attribute: RxBeaconCount\n");
-            err = TestValidateConstraintsOfAttributeRxBeaconCount_47();
-            break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : Validate constraints of attribute: RxBeaconRequestCount\n");
-            err = TestValidateConstraintsOfAttributeRxBeaconRequestCount_48();
-            break;
-        case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : Validate constraints of attribute: RxOtherCount\n");
-            err = TestValidateConstraintsOfAttributeRxOtherCount_49();
-            break;
-        case 50:
-            ChipLogProgress(chipTool, " ***** Test Step 50 : Validate constraints of attribute: RxAddressFilteredCount\n");
-            err = TestValidateConstraintsOfAttributeRxAddressFilteredCount_50();
-            break;
-        case 51:
-            ChipLogProgress(chipTool, " ***** Test Step 51 : Validate constraints of attribute: RxDestAddrFilteredCount\n");
-            err = TestValidateConstraintsOfAttributeRxDestAddrFilteredCount_51();
-            break;
-        case 52:
-            ChipLogProgress(chipTool, " ***** Test Step 52 : Validate constraints of attribute: RxDuplicatedCount\n");
-            err = TestValidateConstraintsOfAttributeRxDuplicatedCount_52();
-            break;
-        case 53:
-            ChipLogProgress(chipTool, " ***** Test Step 53 : Validate constraints of attribute: RxErrNoFrameCount\n");
-            err = TestValidateConstraintsOfAttributeRxErrNoFrameCount_53();
-            break;
-        case 54:
-            ChipLogProgress(chipTool, " ***** Test Step 54 : Validate constraints of attribute: RxErrUnknownNeighborCount\n");
-            err = TestValidateConstraintsOfAttributeRxErrUnknownNeighborCount_54();
-            break;
-        case 55:
-            ChipLogProgress(chipTool, " ***** Test Step 55 : Validate constraints of attribute: RxErrInvalidSrcAddrCount\n");
-            err = TestValidateConstraintsOfAttributeRxErrInvalidSrcAddrCount_55();
-            break;
-        case 56:
-            ChipLogProgress(chipTool, " ***** Test Step 56 : Validate constraints of attribute: RxErrInvalidSrcAddrCount\n");
-            err = TestValidateConstraintsOfAttributeRxErrInvalidSrcAddrCount_56();
-            break;
-        case 57:
-            ChipLogProgress(chipTool, " ***** Test Step 57 : Validate constraints of attribute: RxErrFcsCount\n");
-            err = TestValidateConstraintsOfAttributeRxErrFcsCount_57();
-            break;
-        case 58:
-            ChipLogProgress(chipTool, " ***** Test Step 58 : Validate constraints of attribute: RxErrOtherCount\n");
-            err = TestValidateConstraintsOfAttributeRxErrOtherCount_58();
-            break;
-        case 59:
-            ChipLogProgress(chipTool, " ***** Test Step 59 : Validate constraints of attribute: ActiveTimestamp\n");
-            err = TestValidateConstraintsOfAttributeActiveTimestamp_59();
-            break;
-        case 60:
-            ChipLogProgress(chipTool, " ***** Test Step 60 : Validate constraints of attribute: PendingTimestamp\n");
-            err = TestValidateConstraintsOfAttributePendingTimestamp_60();
-            break;
-        case 61:
-            ChipLogProgress(chipTool, " ***** Test Step 61 : Validate constraints of attribute: delay\n");
-            err = TestValidateConstraintsOfAttributeDelay_61();
-            break;
-        case 62:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 62 : read SecurityPolicy struct attribute from DUT and Verify the each field\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadSecurityPolicyStructAttributeFromDutAndVerifyTheEachField_62();
-            break;
-        case 63:
-            ChipLogProgress(chipTool, " ***** Test Step 63 : Validate constraints of attribute: ChannelPage0Mask\n");
-            err = TestValidateConstraintsOfAttributeChannelPage0Mask_63();
-            break;
-        case 64:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 64 : read OperationalDatasetComponents struct attribute from DUT and Verify the each field\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadOperationalDatasetComponentsStructAttributeFromDutAndVerifyTheEachField_64();
-            break;
-        case 65:
-            ChipLogProgress(chipTool, " ***** Test Step 65 : read ActiveNetworkFaults attribute value\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestReadActiveNetworkFaultsAttributeValue_65();
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute\n");
+            err = TestThReadsFromTheDutThe0xFFF8GeneratedCommandListAttribute_6();
             break;
         }
 
@@ -55921,183 +56458,6 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 50:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 51:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 52:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 53:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 54:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 55:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 56:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 57:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 58:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 59:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 60:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 61:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 62:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 63:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 64:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 65:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -56111,7 +56471,7 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 66;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -56125,46 +56485,46 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeChannel_1()
+    CHIP_ERROR TestThReadsFromTheDutThe0xFFFDClusterRevisionAttribute_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeChannelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: Channel Error: %@", err);
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads from the DUT the (0xFFFD) ClusterRevision attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("channel", "", "uint16"));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U));
+            }
+
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("clusterRevision", [value unsignedShortValue], 5U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("clusterRevision", [value unsignedShortValue], 200U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRoutingRoleAtributeFromDut_2()
+    CHIP_ERROR TestThReadsFromTheDutThe0xFFFCFeatureMapAttribute_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRoutingRoleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read RoutingRole atribute from DUT Error: %@", err);
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads from the DUT the (0xFFFC) FeatureMap attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("routingRole", "", "RoutingRole"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("routingRole", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("routingRole", [value unsignedCharValue], 6));
-            }
+            VerifyOrReturn(CheckConstraintType("featureMap", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint32_t>("featureMap", [value unsignedIntValue], 0UL));
+            VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("featureMap", [value unsignedIntValue], 32768UL));
 
             NextTest();
         }];
@@ -56172,32 +56532,41 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNetworkNameAttributeFromDut_3()
+    CHIP_ERROR TestThReadsFromTheDutThe0xFFFBAttributeListAttribute_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNetworkNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read NetworkName attribute from DUT Error: %@", err);
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads from the DUT the (0xFFFB) AttributeList attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("NetworkName", actualValue));
-                VerifyOrReturn(CheckValueAsString("NetworkName", actualValue, @""));
+                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(11)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 7UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 10UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 13UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 23UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 26UL));
+                VerifyOrReturn(CheckValue("", actualValue[6], 65528UL));
+                VerifyOrReturn(CheckValue("", actualValue[7], 65529UL));
+                VerifyOrReturn(CheckValue("", actualValue[8], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[9], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[10], 65533UL));
             }
 
+            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNetworkNameAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_4()
+    CHIP_ERROR TestThReadsFromTheDutThe0xFFFAEventListAttribute_4()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -56206,1087 +56575,1097 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestReadPanIdAttributeFromDut_5()
+    CHIP_ERROR TestThReadsFromTheDutThe0xFFF9AcceptedCommandListAttribute_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePanIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read PanId attribute from DUT Error: %@", err);
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("panId", "", "uint16"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadPanIdAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_6()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeExtendedPanId_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeExtendedPanIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ExtendedPanId Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(3)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+            }
 
-            VerifyOrReturn(CheckConstraintType("extendedPanId", "", "uint64"));
+            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadExtendedPanIdAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_8()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadMeshLocalPrefixAttributeFromDutAndVerifyResponseValueIfValueIsNullThenVerifyThatRoutingRoleIsSetTo1_9()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeOverrunCount_10()
+    CHIP_ERROR TestThReadsFromTheDutThe0xFFF8GeneratedCommandListAttribute_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: OverrunCount Error: %@", err);
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("overrunCount", "", "uint64"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadOverrunCountAttributeFromDutAndVerifyResponseValueIfTheOverruncountIsGreaterThanZeroOrNot_11()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR
-    TestReadNeighborTableListAttributeFromDutAndVerifyThatTheNeighborTableListSizeIsZeroOrGreaterAndVerifyEachNodeTypes_12()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR
-    TestReadRouteTableListAttributeFromDutAndVerifyThatTheRouteTableListListSizeIsZeroOrGreaterAndVerifyEachNodeTypes_13()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributePartitionId_14()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributePartitionIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: PartitionId Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+            }
 
-            VerifyOrReturn(CheckConstraintType("partitionId", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeWeighting_15()
+class Test_TC_WNCV_2_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_2_1()
+        : TestCommandBridge("Test_TC_WNCV_2_1")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeWeightingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: weighting Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("weighting", "", "uint8"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_WNCV_2_1() {}
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeDataVersion_16()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        [cluster readAttributeDataVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: DataVersion Error: %@", err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_1\n");
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            VerifyOrReturn(CheckConstraintType("dataVersion", "", "uint8"));
-            NextTest();
-        }];
+        Wait();
 
-        return CHIP_NO_ERROR;
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : 1a: read the RO mandatory attribute default: Type\n");
+            if (ShouldSkip("A_TYPE")) {
+                NextTest();
+                return;
+            }
+            err = Test1aReadTheRoMandatoryAttributeDefaultType_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: read the RO mandatory attribute default: ConfigStatus\n");
+            if (ShouldSkip("A_CONFIGSTATUS")) {
+                NextTest();
+                return;
+            }
+            err = Test1bReadTheRoMandatoryAttributeDefaultConfigStatus_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 1c: read the RO mandatory attribute default: OperationalStatus\n");
+            if (ShouldSkip("A_OPERATIONALSTATUS")) {
+                NextTest();
+                return;
+            }
+            err = Test1cReadTheRoMandatoryAttributeDefaultOperationalStatus_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 1d: read the RO mandatory attribute default: EndProductType\n");
+            if (ShouldSkip("A_ENDPRODUCTTYPE")) {
+                NextTest();
+                return;
+            }
+            err = Test1dReadTheRoMandatoryAttributeDefaultEndProductType_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 1e: read the RW mandatory attribute default: Mode\n");
+            if (ShouldSkip("A_MODE")) {
+                NextTest();
+                return;
+            }
+            err = Test1eReadTheRwMandatoryAttributeDefaultMode_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : 1f: write a value into the RW mandatory attribute:: Mode\n");
+            if (ShouldSkip("A_MODE")) {
+                NextTest();
+                return;
+            }
+            err = Test1fWriteAValueIntoTheRwMandatoryAttributeMode_6();
+            break;
+        case 7:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : 2a: read the RO optional attribute default: TargetPositionLiftPercent100ths\n");
+            if (ShouldSkip("A_TARGETPOSITIONLIFTPERCENT100THS")) {
+                NextTest();
+                return;
+            }
+            err = Test2aReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_7();
+            break;
+        case 8:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : 2b: read the RO optional attribute default: TargetPositionTiltPercent100ths\n");
+            if (ShouldSkip("A_TARGETPOSITIONTILTPERCENT100THS")) {
+                NextTest();
+                return;
+            }
+            err = Test2bReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_8();
+            break;
+        case 9:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : 2c: read the RO optional attribute default: CurrentPositionLiftPercent100ths\n");
+            if (ShouldSkip("A_CURRENTPOSITIONLIFTPERCENT100THS")) {
+                NextTest();
+                return;
+            }
+            err = Test2cReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_9();
+            break;
+        case 10:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 10 : 2d: read the RO optional attribute default: CurrentPositionTiltPercent100ths\n");
+            if (ShouldSkip("A_CURRENTPOSITIONTILTPERCENT100THS")) {
+                NextTest();
+                return;
+            }
+            err = Test2dReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : 2e: read the RO optional attribute default: InstalledOpenLimitLift\n");
+            if (ShouldSkip("A_INSTALLEDOPENLIMITLIFT")) {
+                NextTest();
+                return;
+            }
+            err = Test2eReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_11();
+            break;
+        case 12:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 12 : 2f: read the RO optional attribute default: InstalledClosedLimitLift\n");
+            if (ShouldSkip("A_INSTALLEDCLOSEDLIMITLIFT")) {
+                NextTest();
+                return;
+            }
+            err = Test2fReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : 2g: read the RO optional attribute default: InstalledOpenLimitTilt\n");
+            if (ShouldSkip("A_INSTALLEDOPENLIMITTILT")) {
+                NextTest();
+                return;
+            }
+            err = Test2gReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_13();
+            break;
+        case 14:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : 2h: read the RO optional attribute default: InstalledClosedLimitTilt\n");
+            if (ShouldSkip("A_INSTALLEDCLOSEDLIMITTILT")) {
+                NextTest();
+                return;
+            }
+            err = Test2hReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 3a: read the RO mandatory attribute default: SafetyStatus\n");
+            if (ShouldSkip("A_SAFETYSTATUS")) {
+                NextTest();
+                return;
+            }
+            err = Test3aReadTheRoMandatoryAttributeDefaultSafetyStatus_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : 3a.2: write a value into the RO mandatory attribute: SafetyStatus\n");
+            if (ShouldSkip("A_SAFETYSTATUS")) {
+                NextTest();
+                return;
+            }
+            err = Test3a2WriteAValueIntoTheRoMandatoryAttributeSafetyStatus_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : 3a.3: reads back the RO mandatory attribute: SafetyStatus\n");
+            if (ShouldSkip("A_SAFETYSTATUS")) {
+                NextTest();
+                return;
+            }
+            err = Test3a3ReadsBackTheRoMandatoryAttributeSafetyStatus_17();
+            break;
+        case 18:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : 3b: read the RO optional attribute default: PhysicalClosedLimitLift\n");
+            if (ShouldSkip("A_PHYSICALCLOSEDLIMITLIFT")) {
+                NextTest();
+                return;
+            }
+            err = Test3bReadTheRoOptionalAttributeDefaultPhysicalClosedLimitLift_18();
+            break;
+        case 19:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 19 : 3c: read the RO optional attribute default: PhysicalClosedLimitTilt\n");
+            if (ShouldSkip("A_PHYSICALCLOSEDLIMITTILT")) {
+                NextTest();
+                return;
+            }
+            err = Test3cReadTheRoOptionalAttributeDefaultPhysicalClosedLimitTilt_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : 3d: read the RO optional attribute default: CurrentPositionLift\n");
+            if (ShouldSkip("A_CURRENTPOSITIONLIFT")) {
+                NextTest();
+                return;
+            }
+            err = Test3dReadTheRoOptionalAttributeDefaultCurrentPositionLift_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : 3e: read the RO optional attribute default: CurrentPositionTilt\n");
+            if (ShouldSkip("A_CURRENTPOSITIONTILT")) {
+                NextTest();
+                return;
+            }
+            err = Test3eReadTheRoOptionalAttributeDefaultCurrentPositionTilt_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : 3f: read the RO optional attribute default: NumberOfActuationsLift\n");
+            if (ShouldSkip("A_NUMBEROFACTUATIONSLIFT")) {
+                NextTest();
+                return;
+            }
+            err = Test3fReadTheRoOptionalAttributeDefaultNumberOfActuationsLift_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : 3g: read the RO optional attribute default: NumberOfActuationsTilt\n");
+            if (ShouldSkip("A_NUMBEROFACTUATIONSTILT")) {
+                NextTest();
+                return;
+            }
+            err = Test3gReadTheRoOptionalAttributeDefaultNumberOfActuationsTilt_23();
+            break;
+        case 24:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 24 : 3h: read the RO optional attribute default: CurrentPositionLiftPercentage\n");
+            if (ShouldSkip("A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3hReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_24();
+            break;
+        case 25:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 25 : 3i:read the RO optional attribute default: CurrentPositionTiltPercentage\n");
+            if (ShouldSkip("A_CURRENTPOSITIONTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3ireadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_25();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeStableDataVersion_17()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeStableDataVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: StableDataVersion Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("stableDataVersion", "", "uint8"));
-            NextTest();
-        }];
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeLeaderRouterId_18()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeLeaderRouterIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: LeaderRouterId Error: %@", err);
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 26;
 
-            VerifyOrReturn(CheckConstraintType("leaderRouterId", "", "uint8"));
-            NextTest();
-        }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeDetachedRoleCount_19()
+    CHIP_ERROR Test1aReadTheRoMandatoryAttributeDefaultType_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeDetachedRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: DetachedRoleCount Error: %@", err);
+        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1a: read the RO mandatory attribute default: Type Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("detachedRoleCount", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("type", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("type", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("type", [value unsignedCharValue], 9));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeChildRoleCount_20()
+    CHIP_ERROR Test1bReadTheRoMandatoryAttributeDefaultConfigStatus_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeChildRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ChildRoleCount Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1b: read the RO mandatory attribute default: ConfigStatus Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("childRoleCount", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("configStatus", "", "map8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 63));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRouterRoleCount_21()
+    CHIP_ERROR Test1cReadTheRoMandatoryAttributeDefaultOperationalStatus_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRouterRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RouterRoleCount Error: %@", err);
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1c: read the RO mandatory attribute default: OperationalStatus Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("routerRoleCount", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationalStatus", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationalStatus", [value unsignedCharValue], 63));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeLeaderRoleCount_22()
+    CHIP_ERROR Test1dReadTheRoMandatoryAttributeDefaultEndProductType_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLeaderRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: LeaderRoleCount Error: %@", err);
+        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1d: read the RO mandatory attribute default: EndProductType Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("leaderRoleCount", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("endProductType", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("endProductType", [value unsignedCharValue], 23));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeAttachAttemptCount_23()
+    CHIP_ERROR Test1eReadTheRwMandatoryAttributeDefaultMode_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttachAttemptCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: AttachAttemptCount Error: %@", err);
+        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1e: read the RW mandatory attribute default: Mode Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("attachAttemptCount", "", "uint16"));
+            VerifyOrReturn(CheckConstraintType("mode", "", "map8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("mode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("mode", [value unsignedCharValue], 15));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributePartitionIdChangeCount_24()
+    CHIP_ERROR Test1fWriteAValueIntoTheRwMandatoryAttributeMode_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePartitionIdChangeCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: PartitionIdChangeCount Error: %@", err);
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"1f: write a value into the RW mandatory attribute:: Mode Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("partitionIdChangeCount", "", "uint16"));
-            NextTest();
-        }];
+                               NextTest();
+                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeBetterPartitionAttachAttemptCount_25()
+    CHIP_ERROR Test2aReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:^(
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: BetterPartitionAttachAttemptCount Error: %@", err);
+            NSLog(@"2a: read the RO optional attribute default: TargetPositionLiftPercent100ths Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("betterPartitionAttachAttemptCount", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "Percent100ths"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeParentChangeCount_26()
+    CHIP_ERROR Test2bReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeParentChangeCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ParentChangeCount Error: %@", err);
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2b: read the RO optional attribute default: TargetPositionTiltPercent100ths Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("parentChangeCount", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "Percent100ths"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxTotalCount_27()
+    CHIP_ERROR Test2cReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxTotalCount Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: read the RO optional attribute default: CurrentPositionLiftPercent100ths Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txTotalCount", "", "uint32"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "Percent100ths"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxUnicastCount_28()
+    CHIP_ERROR Test2dReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxUnicastCount Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2d: read the RO optional attribute default: CurrentPositionTiltPercent100ths Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txUnicastCount", "", "uint32"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "Percent100ths"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxBroadcastCount_29()
+    CHIP_ERROR Test2eReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxBroadcastCount Error: %@", err);
+        [cluster readAttributeInstalledOpenLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2e: read the RO optional attribute default: InstalledOpenLimitLift Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txBroadcastCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedOpenLimitLift", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedOpenLimitLift", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxNoAckRequestedCount_30()
+    CHIP_ERROR Test2fReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxNoAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxNoAckRequestedCount Error: %@", err);
+        [cluster readAttributeInstalledClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2f: read the RO optional attribute default: InstalledClosedLimitLift Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txNoAckRequestedCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedClosedLimitLift", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedClosedLimitLift", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxDataCount_31()
+    CHIP_ERROR Test2gReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_13()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxDataCount Error: %@", err);
+        [cluster readAttributeInstalledOpenLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2g: read the RO optional attribute default: InstalledOpenLimitTilt Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txDataCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedOpenLimitTilt", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedOpenLimitTilt", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxDataPollCount_32()
+    CHIP_ERROR Test2hReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_14()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxDataPollCount Error: %@", err);
+        [cluster readAttributeInstalledClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2h: read the RO optional attribute default: InstalledClosedLimitTilt Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txDataPollCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedClosedLimitTilt", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedClosedLimitTilt", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxBeaconCount_33()
+    CHIP_ERROR Test3aReadTheRoMandatoryAttributeDefaultSafetyStatus_15()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxBeaconCount Error: %@", err);
+        [cluster readAttributeSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3a: read the RO mandatory attribute default: SafetyStatus Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txBeaconCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("safetyStatus", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("safetyStatus", [value unsignedShortValue], 2047U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxBeaconRequestCount_34()
+    CHIP_ERROR Test3a2WriteAValueIntoTheRoMandatoryAttributeSafetyStatus_16()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxBeaconRequestCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        id safetyStatusArgument;
+        safetyStatusArgument = [NSNumber numberWithUnsignedShort:4096U];
+        [cluster writeAttributeSafetyStatusWithValue:safetyStatusArgument
+                                   completionHandler:^(NSError * _Nullable err) {
+                                       NSLog(@"3a.2: write a value into the RO mandatory attribute: SafetyStatus Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("txBeaconRequestCount", "", "uint32"));
-            NextTest();
-        }];
+                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+                                       NextTest();
+                                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxOtherCount_35()
+    CHIP_ERROR Test3a3ReadsBackTheRoMandatoryAttributeSafetyStatus_17()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxOtherCount Error: %@", err);
+        [cluster readAttributeSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3a.3: reads back the RO mandatory attribute: SafetyStatus Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txOtherCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16"));
+            VerifyOrReturn(CheckConstraintNotValue("safetyStatus", value, 4096U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxRetryCount_36()
+    CHIP_ERROR Test3bReadTheRoOptionalAttributeDefaultPhysicalClosedLimitLift_18()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxRetryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxRetryCount Error: %@", err);
+        [cluster readAttributePhysicalClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3b: read the RO optional attribute default: PhysicalClosedLimitLift Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txRetryCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("physicalClosedLimitLift", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("physicalClosedLimitLift", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("physicalClosedLimitLift", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxDirectMaxRetryExpiryCount_37()
+    CHIP_ERROR Test3cReadTheRoOptionalAttributeDefaultPhysicalClosedLimitTilt_19()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Validate constraints of attribute: TxDirectMaxRetryExpiryCount Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("txDirectMaxRetryExpiryCount", "", "uint32"));
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxIndirectMaxRetryExpiryCount_38()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        [cluster readAttributePhysicalClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3c: read the RO optional attribute default: PhysicalClosedLimitTilt Error: %@", err);
 
-        [cluster
-            readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Validate constraints of attribute: TxIndirectMaxRetryExpiryCount Error: %@", err);
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckConstraintType("physicalClosedLimitTilt", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("physicalClosedLimitTilt", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("physicalClosedLimitTilt", [value unsignedShortValue], 65535U));
 
-                VerifyOrReturn(CheckConstraintType("txIndirectMaxRetryExpiryCount", "", "uint32"));
-                NextTest();
-            }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxErrCcaCount_39()
+    CHIP_ERROR Test3dReadTheRoOptionalAttributeDefaultCurrentPositionLift_20()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxErrCcaCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxErrCcaCount Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3d: read the RO optional attribute default: CurrentPositionLift Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txErrCcaCount", "", "uint32"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionLift", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentPositionLift", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentPositionLift", [value unsignedShortValue], 65535U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxErrAbortCount_40()
+    CHIP_ERROR Test3eReadTheRoOptionalAttributeDefaultCurrentPositionTilt_21()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxErrAbortCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxErrAbortCount Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3e: read the RO optional attribute default: CurrentPositionTilt Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txErrAbortCount", "", "uint32"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionTilt", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentPositionTilt", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentPositionTilt", [value unsignedShortValue], 65535U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeTxErrBusyChannelCount_41()
+    CHIP_ERROR Test3fReadTheRoOptionalAttributeDefaultNumberOfActuationsLift_22()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxErrBusyChannelCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: TxErrBusyChannelCount Error: %@", err);
+        [cluster readAttributeNumberOfActuationsLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3f: read the RO optional attribute default: NumberOfActuationsLift Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txErrBusyChannelCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("numberOfActuationsLift", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("numberOfActuationsLift", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("numberOfActuationsLift", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxTotalCount_42()
+    CHIP_ERROR Test3gReadTheRoOptionalAttributeDefaultNumberOfActuationsTilt_23()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxTotalCount Error: %@", err);
+        [cluster readAttributeNumberOfActuationsTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3g: read the RO optional attribute default: NumberOfActuationsTilt Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("rxTotalCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintType("numberOfActuationsTilt", "", "uint16"));
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("numberOfActuationsTilt", [value unsignedShortValue], 0U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("numberOfActuationsTilt", [value unsignedShortValue], 65535U));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxUnicastCount_43()
+    CHIP_ERROR Test3hReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_24()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxUnicastCount Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3h: read the RO optional attribute default: CurrentPositionLiftPercentage Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("rxUnicastCount", "", "uint32"));
-            NextTest();
-        }];
+                if (value != nil) {
+
+                    VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "Percent"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 100));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxBroadcastCount_44()
+    CHIP_ERROR Test3ireadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_25()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxBroadcastCount Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3i:read the RO optional attribute default: CurrentPositionTiltPercentage Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                if (value != nil) {
 
-            VerifyOrReturn(CheckConstraintType("rxBroadcastCount", "", "uint32"));
-            NextTest();
-        }];
+                    VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "Percent"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxDataCount_45()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxDataCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDataCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxDataPollCount_46()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxDataPollCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDataPollCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxBeaconCount_47()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxBeaconCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxBeaconCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxBeaconRequestCount_48()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxBeaconRequestCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxBeaconRequestCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxOtherCount_49()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxOtherCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxOtherCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxAddressFilteredCount_50()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxAddressFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxAddressFilteredCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxAddressFilteredCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxDestAddrFilteredCount_51()
+class Test_TC_WNCV_2_2 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_2_2()
+        : TestCommandBridge("Test_TC_WNCV_2_2")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDestAddrFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxDestAddrFilteredCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDestAddrFilteredCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxDuplicatedCount_52()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDuplicatedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxDuplicatedCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDuplicatedCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+    ~Test_TC_WNCV_2_2() {}
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxErrNoFrameCount_53()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrNoFrameCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxErrNoFrameCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrNoFrameCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxErrUnknownNeighborCount_54()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_2\n");
+        }
 
-        [cluster
-            readAttributeRxErrUnknownNeighborCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Validate constraints of attribute: RxErrUnknownNeighborCount Error: %@", err);
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_2\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        Wait();
 
-                VerifyOrReturn(CheckConstraintType("rxErrUnknownNeighborCount", "", "uint32"));
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : Reads ConfigStatus attribute from DUT, if (PA & LF) value of bit 3 must be 1b else 0b & if "
+                "(PA & TL) value of bit 4 must be 1b else 0b\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
                 NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxErrInvalidSrcAddrCount_55()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxErrInvalidSrcAddrCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrInvalidSrcAddrCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxErrInvalidSrcAddrCount_56()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrSecCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxErrInvalidSrcAddrCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrSecCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxErrFcsCount_57()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrFcsCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxErrFcsCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrFcsCount", "", "uint32"));
-            NextTest();
-        }];
+                return;
+            }
+            err = TestReadsConfigStatusAttributeFromDutIfPaLfValueOfBit3MustBe1bElse0bIfPaTlValueOfBit4MustBe1bElse0b_1();
+            break;
+        case 2:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 2 : Reads ConfigStatus attribute from DUT, value of bit 0 must be 1b operational\n");
+            if (ShouldSkip("PICS_USER_PROMPT")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsConfigStatusAttributeFromDutValueOfBit0MustBe1bOperational_2();
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeRxErrOtherCount_58()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: RxErrOtherCount Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrOtherCount", "", "uint32"));
-            NextTest();
-        }];
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeActiveTimestamp_59()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeActiveTimestampWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ActiveTimestamp Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("activeTimestamp", "", "uint64"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributePendingTimestamp_60()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributePendingTimestampWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: PendingTimestamp Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("pendingTimestamp", "", "uint64"));
-            NextTest();
-        }];
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 3;
 
-        return CHIP_NO_ERROR;
-    }
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeDelay_61()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: delay Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("delay", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadSecurityPolicyStructAttributeFromDutAndVerifyTheEachField_62()
+    CHIP_ERROR TestReadsConfigStatusAttributeFromDutIfPaLfValueOfBit3MustBe1bElse0bIfPaTlValueOfBit4MustBe1bElse0b_1()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -57295,27 +57674,7 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         return UserPrompt("alpha", value);
     }
 
-    CHIP_ERROR TestValidateConstraintsOfAttributeChannelPage0Mask_63()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeChannelMaskWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Validate constraints of attribute: ChannelPage0Mask Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("channelMask", "", "octstr"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadOperationalDatasetComponentsStructAttributeFromDutAndVerifyTheEachField_64()
+    CHIP_ERROR TestReadsConfigStatusAttributeFromDutValueOfBit0MustBe1bOperational_2()
     {
         chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
         value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -57323,33 +57682,13 @@ class Test_TC_DIAG_TH_NW_1_2 : public TestCommandBridge {
         value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
         return UserPrompt("alpha", value);
     }
-
-    CHIP_ERROR TestReadActiveNetworkFaultsAttributeValue_65()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeActiveNetworkFaultsListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"read ActiveNetworkFaults attribute value Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("activeNetworkFaultsList", "", "list"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
 };
 
-class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
+class Test_TC_WNCV_2_3 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DIAG_TH_NW_2_2()
-        : TestCommandBridge("Test_TC_DIAG_TH_NW_2_2")
+    Test_TC_WNCV_2_3()
+        : TestCommandBridge("Test_TC_WNCV_2_3")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -57359,7 +57698,7 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DIAG_TH_NW_2_2() {}
+    ~Test_TC_WNCV_2_3() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -57367,11 +57706,11 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DIAG_TH_NW_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_3\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DIAG_TH_NW_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_3\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -57388,72 +57727,149 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads TxTotalCount attribute value from DUT\n");
-            err = TestThReadsTxTotalCountAttributeValueFromDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : 1a: TH set the Mode Attribute bit0 of the DUT\n");
+            if (ShouldSkip("WNCV_REVERSAL")) {
+                NextTest();
+                return;
+            }
+            err = Test1aThSetTheModeAttributeBit0OfTheDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads TxUnicastCount attribute value from DUT\n");
-            err = TestThReadsTxUnicastCountAttributeValueFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH reads ConfigStatus attribute from DUT\n");
+            if (ShouldSkip("WNCV_REVERSAL")) {
+                NextTest();
+                return;
+            }
+            err = Test1bThReadsConfigStatusAttributeFromDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads TxBroadcastCount attribute value from DUT\n");
-            err = TestThReadsTxBroadcastCountAttributeValueFromDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 1c: TH clear the Mode Attribute bit0 of the DUT\n");
+            if (ShouldSkip("WNCV_REVERSAL")) {
+                NextTest();
+                return;
+            }
+            err = Test1cThClearTheModeAttributeBit0OfTheDut_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads TxAckRequestedCount attribute value from DUT\n");
-            err = TestThReadsTxAckRequestedCountAttributeValueFromDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 1d: TH reads ConfigStatus attribute from DUT\n");
+            if (ShouldSkip("WNCV_REVERSAL")) {
+                NextTest();
+                return;
+            }
+            err = Test1dThReadsConfigStatusAttributeFromDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : TH reads TxAckedCount attribute value from DUT\n");
-            err = TestThReadsTxAckedCountAttributeValueFromDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 2a: TH set the Mode Attribute bit1 of the DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2aThSetTheModeAttributeBit1OfTheDut_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads TxNoAckRequestedCount attribute value from DUT\n");
-            err = TestThReadsTxNoAckRequestedCountAttributeValueFromDut_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : 2b: TH reads ConfigStatus attribute from DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2bThReadsConfigStatusAttributeFromDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : TH reads TxDataCount attribute value from DUT\n");
-            err = TestThReadsTxDataCountAttributeValueFromDut_7();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : 2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2cIfConfigStatusBit00ThSendDownOrCloseCommandToTheDut_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : TH reads TxDataPollCount attribute value from DUT\n");
-            err = TestThReadsTxDataPollCountAttributeValueFromDut_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : 2d: TH clear the Mode Attribute bit1 of the DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2dThClearTheModeAttributeBit1OfTheDut_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : TH reads TxBeaconCount attribute value from DUT\n");
-            err = TestThReadsTxBeaconCountAttributeValueFromDut_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : 2e: TH reads ConfigStatus attribute from DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2eThReadsConfigStatusAttributeFromDut_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads TxBeaconRequestCount attribute value from DUT\n");
-            err = TestThReadsTxBeaconRequestCountAttributeValueFromDut_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : 2f: TH reads the Mode Attribute from the DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2fThReadsTheModeAttributeFromTheDut_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads TxOtherCount attribute value from DUT\n");
-            err = TestThReadsTxOtherCountAttributeValueFromDut_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : 2g: TH send DownOrClose command to the DUT\n");
+            if (ShouldSkip("WNCV_CALIBRATION")) {
+                NextTest();
+                return;
+            }
+            err = Test2gThSendDownOrCloseCommandToTheDut_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads TxRetryCount attribute value from DUT\n");
-            err = TestThReadsTxRetryCountAttributeValueFromDut_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : 3a: TH set the Mode Attribute bit2 of the DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3aThSetTheModeAttributeBit2OfTheDut_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : TH reads TxDirectMaxRetryExpiryCount attribute value from DUT\n");
-            err = TestThReadsTxDirectMaxRetryExpiryCountAttributeValueFromDut_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : 3c: TH reads ConfigStatus attribute from DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3cThReadsConfigStatusAttributeFromDut_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : TH reads TxIndirectMaxRetryExpiryCount attribute value from DUT\n");
-            err = TestThReadsTxIndirectMaxRetryExpiryCountAttributeValueFromDut_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : 3c: TH send DownOrClose command to the DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3cThSendDownOrCloseCommandToTheDut_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : TH reads TxErrCcaCount attribute value from DUT\n");
-            err = TestThReadsTxErrCcaCountAttributeValueFromDut_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 3d: TH clear the Mode Attribute bit2 of the DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3dThClearTheModeAttributeBit2OfTheDut_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : TH reads TxErrAbortCount attribute value from DUT\n");
-            err = TestThReadsTxErrAbortCountAttributeValueFromDut_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : 3e: TH reads ConfigStatus attribute from DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3eThReadsConfigStatusAttributeFromDut_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads TxErrBusyChannelCount attribute value from DUT\n");
-            err = TestThReadsTxErrBusyChannelCountAttributeValueFromDut_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : 3f: TH reads the Mode Attribute from the DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3fThReadsTheModeAttributeFromTheDut_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : 3g: TH send DownOrClose command to the DUT\n");
+            if (ShouldSkip("WNCV_MAINTENANCE")) {
+                NextTest();
+                return;
+            }
+            err = Test3gThSendDownOrCloseCommandToTheDut_18();
             break;
         }
 
@@ -57488,7 +57904,7 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -57509,7 +57925,7 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_BUSY));
             break;
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -57520,6 +57936,9 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -57533,7 +57952,7 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 19;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -57547,342 +57966,354 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsTxTotalCountAttributeValueFromDut_1()
+    CHIP_ERROR Test1aThSetTheModeAttributeBit0OfTheDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxTotalCount attribute value from DUT Error: %@", err);
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:1];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"1a: TH set the Mode Attribute bit0 of the DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txTotalCount", "", "uint32"));
-            NextTest();
-        }];
+                               NextTest();
+                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxUnicastCountAttributeValueFromDut_2()
+    CHIP_ERROR Test1bThReadsConfigStatusAttributeFromDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxUnicastCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1b: TH reads ConfigStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txUnicastCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 4));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxBroadcastCountAttributeValueFromDut_3()
+    CHIP_ERROR Test1cThClearTheModeAttributeBit0OfTheDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxBroadcastCount attribute value from DUT Error: %@", err);
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"1c: TH clear the Mode Attribute bit0 of the DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txBroadcastCount", "", "uint32"));
-            NextTest();
-        }];
+                               NextTest();
+                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxAckRequestedCountAttributeValueFromDut_4()
+    CHIP_ERROR Test1dThReadsConfigStatusAttributeFromDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxAckRequestedCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1d: TH reads ConfigStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txAckRequestedCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxAckedCountAttributeValueFromDut_5()
+    CHIP_ERROR Test2aThSetTheModeAttributeBit1OfTheDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxAckedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxAckedCount attribute value from DUT Error: %@", err);
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:2];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"2a: TH set the Mode Attribute bit1 of the DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txAckedCount", "", "uint32"));
-            NextTest();
-        }];
+                               NextTest();
+                           }];
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull configStatusValA;
 
-    CHIP_ERROR TestThReadsTxNoAckRequestedCountAttributeValueFromDut_6()
+    CHIP_ERROR Test2bThReadsConfigStatusAttributeFromDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxNoAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxNoAckRequestedCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2b: TH reads ConfigStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txNoAckRequestedCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+            {
+                configStatusValA = value;
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxDataCountAttributeValueFromDut_7()
+    CHIP_ERROR Test2cIfConfigStatusBit00ThSendDownOrCloseCommandToTheDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxDataCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("txDataCount", "", "uint32"));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxDataPollCountAttributeValueFromDut_8()
+    CHIP_ERROR Test2dThClearTheModeAttributeBit1OfTheDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxDataPollCount attribute value from DUT Error: %@", err);
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"2d: TH clear the Mode Attribute bit1 of the DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txDataPollCount", "", "uint32"));
-            NextTest();
-        }];
+                               NextTest();
+                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxBeaconCountAttributeValueFromDut_9()
+    CHIP_ERROR Test2eThReadsConfigStatusAttributeFromDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxBeaconCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2e: TH reads ConfigStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txBeaconCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 1));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxBeaconRequestCountAttributeValueFromDut_10()
+    CHIP_ERROR Test2fThReadsTheModeAttributeFromTheDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxBeaconRequestCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2f: TH reads the Mode Attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txBeaconRequestCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("mode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("mode", [value unsignedCharValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxOtherCountAttributeValueFromDut_11()
+    CHIP_ERROR Test2gThSendDownOrCloseCommandToTheDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxOtherCount attribute value from DUT Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2g: TH send DownOrClose command to the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txOtherCount", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxRetryCountAttributeValueFromDut_12()
+    CHIP_ERROR Test3aThSetTheModeAttributeBit2OfTheDut_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:4];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"3a: TH set the Mode Attribute bit2 of the DUT Error: %@", err);
+
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                               NextTest();
+                           }];
+
+        return CHIP_NO_ERROR;
+    }
+    NSNumber * _Nonnull configStatusValB;
+
+    CHIP_ERROR Test3cThReadsConfigStatusAttributeFromDut_13()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxRetryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxRetryCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3c: TH reads ConfigStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txRetryCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+            {
+                configStatusValB = value;
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxDirectMaxRetryExpiryCountAttributeValueFromDut_13()
+    CHIP_ERROR Test3cThSendDownOrCloseCommandToTheDut_14()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"TH reads TxDirectMaxRetryExpiryCount attribute value from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"3c: TH send DownOrClose command to the DUT Error: %@", err);
 
-                VerifyOrReturn(CheckConstraintType("txDirectMaxRetryExpiryCount", "", "uint32"));
-                NextTest();
-            }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_BUSY));
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxIndirectMaxRetryExpiryCountAttributeValueFromDut_14()
+    CHIP_ERROR Test3dThClearTheModeAttributeBit2OfTheDut_15()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"TH reads TxIndirectMaxRetryExpiryCount attribute value from DUT Error: %@", err);
+        id modeArgument;
+        modeArgument = [NSNumber numberWithUnsignedChar:0];
+        [cluster writeAttributeModeWithValue:modeArgument
+                           completionHandler:^(NSError * _Nullable err) {
+                               NSLog(@"3d: TH clear the Mode Attribute bit2 of the DUT Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("txIndirectMaxRetryExpiryCount", "", "uint32"));
-                NextTest();
-            }];
+                               NextTest();
+                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxErrCcaCountAttributeValueFromDut_15()
+    CHIP_ERROR Test3eThReadsConfigStatusAttributeFromDut_16()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxErrCcaCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxErrCcaCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3e: TH reads ConfigStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txErrCcaCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 1));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxErrAbortCountAttributeValueFromDut_16()
+    CHIP_ERROR Test3fThReadsTheModeAttributeFromTheDut_17()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxErrAbortCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxErrAbortCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3f: TH reads the Mode Attribute from the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txErrAbortCount", "", "uint32"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("mode", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("mode", [value unsignedCharValue], 127));
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTxErrBusyChannelCountAttributeValueFromDut_17()
+    CHIP_ERROR Test3gThSendDownOrCloseCommandToTheDut_18()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTxErrBusyChannelCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads TxErrBusyChannelCount attribute value from DUT Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"3g: TH send DownOrClose command to the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("txErrBusyChannelCount", "", "uint32"));
             NextTest();
         }];
 
@@ -57890,11 +58321,11 @@ class Test_TC_DIAG_TH_NW_2_2 : public TestCommandBridge {
     }
 };
 
-class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
+class Test_TC_WNCV_2_4 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DIAG_TH_NW_2_3()
-        : TestCommandBridge("Test_TC_DIAG_TH_NW_2_3")
+    Test_TC_WNCV_2_4()
+        : TestCommandBridge("Test_TC_WNCV_2_4")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -57904,7 +58335,7 @@ class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DIAG_TH_NW_2_3() {}
+    ~Test_TC_WNCV_2_4() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -57912,11 +58343,11 @@ class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DIAG_TH_NW_2_3\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_4\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DIAG_TH_NW_2_3\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_4\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -57933,77 +58364,12 @@ class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads RxTotalCount attribute value from DUT\n");
-            err = TestThReadsRxTotalCountAttributeValueFromDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads RxUnicastCount attribute value from DUT\n");
-            err = TestThReadsRxUnicastCountAttributeValueFromDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads RxBroadcastCount attribute value from DUT\n");
-            err = TestThReadsRxBroadcastCountAttributeValueFromDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads RxDataCount attribute value from DUT\n");
-            err = TestThReadsRxDataCountAttributeValueFromDut_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : TH reads RxDataPollCount attribute value from DUT\n");
-            err = TestThReadsRxDataPollCountAttributeValueFromDut_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads RxBeaconCount attribute value from DUT\n");
-            err = TestThReadsRxBeaconCountAttributeValueFromDut_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : TH reads RxBeaconRequestCount attribute value from DUT\n");
-            err = TestThReadsRxBeaconRequestCountAttributeValueFromDut_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : TH reads RxOtherCount attribute value from DUT\n");
-            err = TestThReadsRxOtherCountAttributeValueFromDut_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : TH reads RxAddressFilteredCount attribute value from DUT\n");
-            err = TestThReadsRxAddressFilteredCountAttributeValueFromDut_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads RxDestAddrFilteredCount attribute value from DUT\n");
-            err = TestThReadsRxDestAddrFilteredCountAttributeValueFromDut_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads RxDuplicatedCount attribute value from DUT\n");
-            err = TestThReadsRxDuplicatedCountAttributeValueFromDut_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads RxErrNoFrameCount attribute value from DUT\n");
-            err = TestThReadsRxErrNoFrameCountAttributeValueFromDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : TH reads RxErrUnknownNeighborCount attribute value from DUT\n");
-            err = TestThReadsRxErrUnknownNeighborCountAttributeValueFromDut_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 14 : TH reads RxErrInvalidScrAddrCount attribute value from DUT and verify data type\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads Type attribute from DUT\n");
+            if (ShouldSkip("A_TYPE")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsRxErrInvalidScrAddrCountAttributeValueFromDutAndVerifyDataType_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : TH reads RxErrSecCount attribute value from DUT\n");
-            err = TestThReadsRxErrSecCountAttributeValueFromDut_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : TH reads RxErrFcsCount attribute value from DUT\n");
-            err = TestThReadsRxErrFcsCountAttributeValueFromDut_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads RxErrOtherCount attribute value from DUT\n");
-            err = TestThReadsRxErrOtherCountAttributeValueFromDut_17();
+            err = TestReadsTypeAttributeFromDut_1();
             break;
         }
 
@@ -58022,54 +58388,6 @@ class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -58083,7 +58401,7 @@ class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 2;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -58097,369 +58415,181 @@ class Test_TC_DIAG_TH_NW_2_3 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsRxTotalCountAttributeValueFromDut_1()
+    CHIP_ERROR TestReadsTypeAttributeFromDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxTotalCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads Type attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("rxTotalCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsRxUnicastCountAttributeValueFromDut_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxUnicastCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckConstraintType("type", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("type", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("type", [value unsignedCharValue], 9));
 
-            VerifyOrReturn(CheckConstraintType("rxUnicastCount", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestThReadsRxBroadcastCountAttributeValueFromDut_3()
+class Test_TC_WNCV_2_5 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_2_5()
+        : TestCommandBridge("Test_TC_WNCV_2_5")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxBroadcastCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxBroadcastCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR TestThReadsRxDataCountAttributeValueFromDut_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxDataCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDataCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+    ~Test_TC_WNCV_2_5() {}
 
-    CHIP_ERROR TestThReadsRxDataPollCountAttributeValueFromDut_5()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxDataPollCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDataPollCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-    CHIP_ERROR TestThReadsRxBeaconCountAttributeValueFromDut_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_5\n");
+        }
 
-        [cluster readAttributeRxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxBeaconCount attribute value from DUT Error: %@", err);
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_5\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        Wait();
 
-            VerifyOrReturn(CheckConstraintType("rxBeaconCount", "", "uint32"));
-            NextTest();
-        }];
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads EndProductType attribute from DUT\n");
+            if (ShouldSkip("A_ENDPRODUCTTYPE")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsEndProductTypeAttributeFromDut_1();
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestThReadsRxBeaconRequestCountAttributeValueFromDut_7()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxBeaconRequestCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxBeaconRequestCount", "", "uint32"));
-            NextTest();
-        }];
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR TestThReadsRxOtherCountAttributeValueFromDut_8()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxOtherCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxOtherCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
     }
 
-    CHIP_ERROR TestThReadsRxAddressFilteredCountAttributeValueFromDut_9()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxAddressFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxAddressFilteredCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxAddressFilteredCount", "", "uint32"));
-            NextTest();
-        }];
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 2;
 
-        return CHIP_NO_ERROR;
-    }
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestThReadsRxDestAddrFilteredCountAttributeValueFromDut_10()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxDestAddrFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxDestAddrFilteredCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxDestAddrFilteredCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsRxDuplicatedCountAttributeValueFromDut_11()
+    CHIP_ERROR TestReadsEndProductTypeAttributeFromDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRxDuplicatedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxDuplicatedCount attribute value from DUT Error: %@", err);
+        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads EndProductType attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("rxDuplicatedCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsRxErrNoFrameCountAttributeValueFromDut_12()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrNoFrameCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxErrNoFrameCount attribute value from DUT Error: %@", err);
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("EndProductType", actualValue, 0));
+            }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("endProductType", [value unsignedCharValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("endProductType", [value unsignedCharValue], 23));
 
-            VerifyOrReturn(CheckConstraintType("rxErrNoFrameCount", "", "uint32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR TestThReadsRxErrUnknownNeighborCountAttributeValueFromDut_13()
+class Test_TC_WNCV_3_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_3_1()
+        : TestCommandBridge("Test_TC_WNCV_3_1")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeRxErrUnknownNeighborCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"TH reads RxErrUnknownNeighborCount attribute value from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("rxErrUnknownNeighborCount", "", "uint32"));
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR TestThReadsRxErrInvalidScrAddrCountAttributeValueFromDutAndVerifyDataType_14()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
+    ~Test_TC_WNCV_3_1() {}
 
-    CHIP_ERROR TestThReadsRxErrSecCountAttributeValueFromDut_15()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        [cluster readAttributeRxErrSecCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxErrSecCount attribute value from DUT Error: %@", err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_1\n");
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_1\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            VerifyOrReturn(CheckConstraintType("rxErrSecCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsRxErrFcsCountAttributeValueFromDut_16()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrFcsCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxErrFcsCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrFcsCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsRxErrOtherCountAttributeValueFromDut_17()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestThreadNetworkDiagnostics * cluster = [[CHIPTestThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                     endpoint:0
-                                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeRxErrOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads RxErrOtherCount attribute value from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("rxErrOtherCount", "", "uint32"));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_ULABEL_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_ULABEL_1_1()
-        : TestCommandBridge("Test_TC_ULABEL_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_ULABEL_1_1() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ULABEL_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
+        Wait();
 
         // Ensure we increment mTestIndex before we start running the relevant
         // command.  That way if we lose the timeslice after we send the message
@@ -58467,46 +58597,172 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read the global attribute: ClusterRevision\n");
-            err = TestReadTheGlobalAttributeClusterRevision_1();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read the optional global attribute: FeatureMap\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheOptionalGlobalAttributeFeatureMap_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH Waits for 10 seconds movement(s) on the device\n");
+            err = Test1bThWaitsFor10SecondsMovementsOnTheDevice_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheGlobalAttributeAttributeList_3();
+            err = Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3();
             break;
         case 4:
             ChipLogProgress(chipTool,
-                " ***** Test Step 4 : Read EventList attribute from the DUT and Verify that the DUT response provides a list of "
-                "supported events.\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+                " ***** Test Step 4 : 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4();
+            err = Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
-            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 6 : 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Report: 2: Subscribe to DUT reports on OperationalStatus attribute\n");
+            err = TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : 2: Subscribe to DUT reports on OperationalStatus attribute\n");
+            err = Test2SubscribeToDutReportsOnOperationalStatusAttribute_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : 2a: TH sends UpOrOpen command to DUT\n");
+            err = Test2aThSendsUpOrOpenCommandToDut_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : 2b: DUT updates its attributes\n");
+            err = Test2bDutUpdatesItsAttributes_10();
+            break;
+        case 11:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 11 : 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11();
+            break;
+        case 12:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 12 : 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : 2e: TH leave the device moving for 2 seconds\n");
+            err = Test2eThLeaveTheDeviceMovingFor2Seconds_13();
+            break;
+        case 14:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : 3a1: Verify DUT reports OperationalStatus attribute to TH after a UpOrOpen\n");
+            err = Test3a1VerifyDutReportsOperationalStatusAttributeToThAfterAUpOrOpen_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 3a2: DUT updates its attributes\n");
+            err = Test3a2DutUpdatesItsAttributes_15();
+            break;
+        case 16:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 17 : 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17();
+            break;
+        case 18:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 19 : 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : 4a: TH sends a StopMotion command to DUT\n");
+            err = Test4aThSendsAStopMotionCommandToDut_20();
+            break;
+        case 21:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 21 : 4b: TH waits for 3 seconds the end of inertial movement(s) on the device\n");
+            err = Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21();
+            break;
+        case 22:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion\n");
+            err = Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : 5a: TH waits for x seconds attributes update on the device\n");
+            err = Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23();
+            break;
+        case 24:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 24 : 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24();
+            break;
+        case 25:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 25 : 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25();
             break;
         }
 
@@ -58540,6 +58796,63 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -58553,449 +58866,384 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    const uint16_t mTestCount = 26;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
+    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: ClusterRevision Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
-            }
-
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalGlobalAttributeFeatureMap_2()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadEventListAttributeFromTheDutAndVerifyThatTheDutResponseProvidesAListOfSupportedEvents_4()
+    CHIP_ERROR Test1bThWaitsFor10SecondsMovementsOnTheDevice_2()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 10000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
+    CHIP_ERROR Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: AcceptedCommandList Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 1U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
             }
 
-            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
+    CHIP_ERROR Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the global attribute: GeneratedCommandList Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
-            }
+                if (value != nil) {
 
-            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
-            NextTest();
-        }];
+                    VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 1));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 100));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_ULABEL_2_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_ULABEL_2_2()
-        : TestCommandBridge("Test_TC_ULABEL_2_2")
-        , mTestIndex(0)
+    CHIP_ERROR Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_ULABEL_2_2() {}
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_2\n");
-        }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_ULABEL_2_2\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            if (value != nil) {
 
-        Wait();
+                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 1U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
+            }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH writes LabelList attribute from the DUT\n");
-            err = TestThWritesLabelListAttributeFromTheDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads LabelList attribute from the DUT\n");
-            err = TestThReadsLabelListAttributeFromTheDut_2();
-            break;
-        }
+            NextTest();
+        }];
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
+                if (value != nil) {
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+                    VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 1));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
+                }
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
     }
+    bool testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled = false;
+    ResponseHandler _Nullable test_Test_TC_WNCV_3_1_OperationalStatus_Reported = nil;
 
-    CHIP_ERROR TestThWritesLabelListAttributeFromTheDut_1()
+    CHIP_ERROR TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id labelListArgument;
-        {
-            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
-            temp_0[0] = [[CHIPUserLabelClusterLabelStruct alloc] init];
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[0]).label = @"roomName";
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[0]).value = @"master bedroom 1";
-
-            temp_0[1] = [[CHIPUserLabelClusterLabelStruct alloc] init];
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[1]).label = @"Orientation";
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[1]).value = @"east";
+        test_Test_TC_WNCV_3_1_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Report: 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
 
-            temp_0[2] = [[CHIPUserLabelClusterLabelStruct alloc] init];
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[2]).label = @"floor";
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[2]).value = @"2";
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            temp_0[3] = [[CHIPUserLabelClusterLabelStruct alloc] init];
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[3]).label = @"roomType";
-            ((CHIPUserLabelClusterLabelStruct *) temp_0[3]).value = @"bedroom";
+            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
+            testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled = true;
+        };
 
-            labelListArgument = temp_0;
-        }
-        [cluster writeAttributeLabelListWithValue:labelListArgument
-                                completionHandler:^(NSError * _Nullable err) {
-                                    NSLog(@"TH writes LabelList attribute from the DUT Error: %@", err);
+        NextTest();
+        return CHIP_NO_ERROR;
+    }
 
-                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    CHIP_ERROR Test2SubscribeToDutReportsOnOperationalStatusAttribute_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                    NextTest();
-                                }];
+        uint16_t minIntervalArgument = 4U;
+        uint16_t maxIntervalArgument = 5U;
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:minIntervalArgument]
+            maxInterval:[NSNumber numberWithUnsignedInt:maxIntervalArgument]
+            params:params
+            subscriptionEstablished:^{
+                VerifyOrReturn(
+                    testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
+                NextTest();
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                if (test_Test_TC_WNCV_3_1_OperationalStatus_Reported != nil) {
+                    ResponseHandler callback = test_Test_TC_WNCV_3_1_OperationalStatus_Reported;
+                    test_Test_TC_WNCV_3_1_OperationalStatus_Reported = nil;
+                    callback(value, err);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsLabelListAttributeFromTheDut_2()
+    CHIP_ERROR Test2aThSendsUpOrOpenCommandToDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestUserLabel * cluster = [[CHIPTestUserLabel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLabelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads LabelList attribute from the DUT Error: %@", err);
+        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2a: TH sends UpOrOpen command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("label list", [actualValue count], static_cast<uint32_t>(4)));
-                VerifyOrReturn(
-                    CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[0]).label, @"roomName"));
-                VerifyOrReturn(
-                    CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[0]).value, @"master bedroom 1"));
-                VerifyOrReturn(
-                    CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[1]).label, @"Orientation"));
-                VerifyOrReturn(CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[1]).value, @"east"));
-                VerifyOrReturn(CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[2]).label, @"floor"));
-                VerifyOrReturn(CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[2]).value, @"2"));
-                VerifyOrReturn(
-                    CheckValueAsString("label", ((CHIPUserLabelClusterLabelStruct *) actualValue[3]).label, @"roomType"));
-                VerifyOrReturn(CheckValueAsString("value", ((CHIPUserLabelClusterLabelStruct *) actualValue[3]).value, @"bedroom"));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_WIFIDIAG_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WIFIDIAG_1_1()
-        : TestCommandBridge("Test_TC_WIFIDIAG_1_1")
-        , mTestIndex(0)
+    CHIP_ERROR Test2bDutUpdatesItsAttributes_10()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 100UL;
+        return WaitForMs("alpha", value);
     }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WIFIDIAG_1_1() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+    CHIP_ERROR Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WIFIDIAG_1_1\n");
-        }
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WIFIDIAG_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        Wait();
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 0U));
+            }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads NetworkInterface structure attribute from DUT\n");
-            err = TestReadsNetworkInterfaceStructureAttributeFromDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads SecurityType attribute from DUT\n");
-            err = TestReadsSecurityTypeAttributeFromDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads SecurityType attribute constraints\n");
-            err = TestReadsSecurityTypeAttributeConstraints_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads WiFiVersion attribute constraints\n");
-            err = TestReadsWiFiVersionAttributeConstraints_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Reads ChannelNumber attribute constraints\n");
-            err = TestReadsChannelNumberAttributeConstraints_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Reads RSSI attribute constraints\n");
-            err = TestReadsRssiAttributeConstraints_6();
-            break;
-        }
+            NextTest();
+        }];
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 0U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    CHIP_ERROR Test2eThLeaveTheDeviceMovingFor2Seconds_13()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 2000UL;
+        return WaitForMs("alpha", value);
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    CHIP_ERROR Test3a1VerifyDutReportsOperationalStatusAttributeToThAfterAUpOrOpen_14()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+        test_Test_TC_WNCV_3_1_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3a1: Verify DUT reports OperationalStatus attribute to TH after a UpOrOpen Error: %@", err);
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationalStatus", [value unsignedCharValue], 5));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationalStatus", [value unsignedCharValue], 21));
+
+            NextTest();
+        };
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test3a2DutUpdatesItsAttributes_15()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 2000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestReadsNetworkInterfaceStructureAttributeFromDut_1()
+    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestGeneralDiagnostics * cluster = [[CHIPTestGeneralDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:0
-                                                                                            queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNetworkInterfacesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads NetworkInterface structure attribute from DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("networkInterfaces", "", "list"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 9999U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsSecurityTypeAttributeFromDut_2()
+    CHIP_ERROR Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSecurityTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads SecurityType attribute from DUT Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                if (value != nil) {
+
+                    VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 99));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNull("SecurityType", actualValue));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 9999U));
             }
 
             NextTest();
@@ -59004,45 +59252,71 @@ class Test_TC_WIFIDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsSecurityTypeAttributeConstraints_3()
+    CHIP_ERROR Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSecurityTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads SecurityType attribute constraints Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                if (value != nil) {
+
+                    VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 99));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test4aThSendsAStopMotionCommandToDut_20()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"4a: TH sends a StopMotion command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("securityType", "", "enum"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsWiFiVersionAttributeConstraints_4()
+    CHIP_ERROR Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 3000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeWiFiVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads WiFiVersion attribute constraints Error: %@", err);
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("wiFiVersion", "", "enum"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("wiFiVersion", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("wiFiVersion", [value unsignedCharValue], 5));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
@@ -59051,45 +59325,59 @@ class Test_TC_WIFIDIAG_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsChannelNumberAttributeConstraints_5()
+    CHIP_ERROR Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeChannelNumberWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads ChannelNumber attribute constraints Error: %@", err);
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("channelNumber", "", "uint16"));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 9999U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsRssiAttributeConstraints_6()
+    CHIP_ERROR Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeRssiWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads RSSI attribute constraints Error: %@", err);
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("rssi", "", "int8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<int8_t>("rssi", [value charValue], -120));
-            }
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<int8_t>("rssi", [value charValue], 0));
+
+                VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 9999U));
             }
 
             NextTest();
@@ -59099,11 +59387,11 @@ class Test_TC_WIFIDIAG_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
+class Test_TC_WNCV_3_2 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WIFIDIAG_3_1()
-        : TestCommandBridge("Test_TC_WIFIDIAG_3_1")
+    Test_TC_WNCV_3_2()
+        : TestCommandBridge("Test_TC_WNCV_3_2")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -59113,7 +59401,7 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WIFIDIAG_3_1() {}
+    ~Test_TC_WNCV_3_2() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -59121,11 +59409,11 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WIFIDIAG_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_2\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WIFIDIAG_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_2\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -59138,90 +59426,198 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends ResetCounts command to DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestThSendsResetCountsCommandToDut_1();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 1 : 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads BeaconLostCount attribute from DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsBeaconLostCountAttributeFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH Waits for 10 seconds movement(s) on the device\n");
+            err = Test1bThWaitsFor10SecondsMovementsOnTheDevice_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Reads BeaconRxCount attribute from DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBeaconRxCountAttributeFromDut_3();
+            err = Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Reads PacketMulticastRxCount attribute from DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 4 : 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = TestReadsPacketMulticastRxCountAttributeFromDut_4();
+            err = Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Reads PacketMulticastTxCount attribute from DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 5 : 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
                 NextTest();
                 return;
             }
-            err = TestReadsPacketMulticastTxCountAttributeFromDut_5();
+            err = Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Reads PacketUnicastRxCount attribute from DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 6 : 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = TestReadsPacketUnicastRxCountAttributeFromDut_6();
+            err = Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Reads PacketUnicastTxCount attribute from DUT\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Report: 2: Subscribe to DUT reports on OperationalStatus attribute\n");
+            err = TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : 2: Subscribe to DUT reports on OperationalStatus attribute\n");
+            err = Test2SubscribeToDutReportsOnOperationalStatusAttribute_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : 2a: TH sends DownOrClose command to DUT\n");
+            err = Test2aThSendsDownOrCloseCommandToDut_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : 2b: DUT updates its attributes\n");
+            err = Test2bDutUpdatesItsAttributes_10();
+            break;
+        case 11:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 11 : 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = TestReadsPacketUnicastTxCountAttributeFromDut_7();
+            err = Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 12:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 12 : 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : 2e: TH leave the device moving for 2 seconds\n");
+            err = Test2eThLeaveTheDeviceMovingFor2Seconds_13();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 14:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : 3a: Verify DUT reports OperationalStatus attribute to TH after a DownOrClose\n");
+            err = Test3aVerifyDutReportsOperationalStatusAttributeToThAfterADownOrClose_14();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 3a2: DUT updates its attributes\n");
+            err = Test3a2DutUpdatesItsAttributes_15();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 16:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 17 : 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17();
+            break;
+        case 18:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 19 : 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : 4a: TH sends a StopMotion command to DUT\n");
+            err = Test4aThSendsAStopMotionCommandToDut_20();
+            break;
+        case 21:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 21 : 4b: TH waits for 3 seconds the end of inertial movement(s) on the device\n");
+            err = Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21();
+            break;
+        case 22:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion\n");
+            err = Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : 5a: TH waits for x seconds attributes update on the device\n");
+            err = Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23();
+            break;
+        case 24:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 24 : 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24();
+            break;
+        case 25:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 25 : 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -59232,6 +59628,60 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -59245,30 +59695,28 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 8;
+    const uint16_t mTestCount = 26;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestThSendsResetCountsCommandToDut_1()
+    CHIP_ERROR Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"TH sends ResetCounts command to DUT Error: %@", err);
+        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -59278,22 +59726,32 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBeaconLostCountAttributeFromDut_2()
+    CHIP_ERROR Test1bThWaitsFor10SecondsMovementsOnTheDevice_2()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 10000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBeaconLostCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads BeaconLostCount attribute from DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("BeaconLostCount", actualValue, 0UL));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 9999U));
             }
 
             NextTest();
@@ -59302,46 +59760,52 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBeaconRxCountAttributeFromDut_3()
+    CHIP_ERROR Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeBeaconRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads BeaconRxCount attribute from DUT Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("BeaconRxCount", actualValue, 0UL));
-            }
+                if (value != nil) {
 
-            NextTest();
-        }];
+                    VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 99));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsPacketMulticastRxCountAttributeFromDut_4()
+    CHIP_ERROR Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePacketMulticastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads PacketMulticastRxCount attribute from DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PacketMulticastRxCount", actualValue, 0UL));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 9999U));
             }
 
             NextTest();
@@ -59350,238 +59814,125 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsPacketMulticastTxCountAttributeFromDut_5()
+    CHIP_ERROR Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePacketMulticastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads PacketMulticastTxCount attribute from DUT Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PacketMulticastTxCount", actualValue, 0UL));
-            }
+                if (value != nil) {
 
-            NextTest();
-        }];
+                    VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 99));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
+    bool testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled = false;
+    ResponseHandler _Nullable test_Test_TC_WNCV_3_2_OperationalStatus_Reported = nil;
 
-    CHIP_ERROR TestReadsPacketUnicastRxCountAttributeFromDut_6()
+    CHIP_ERROR TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePacketUnicastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads PacketUnicastRxCount attribute from DUT Error: %@", err);
+        test_Test_TC_WNCV_3_2_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Report: 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PacketUnicastRxCount", actualValue, 0UL));
-            }
-
-            NextTest();
-        }];
+            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
+            testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled = true;
+        };
 
+        NextTest();
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsPacketUnicastTxCountAttributeFromDut_7()
+    CHIP_ERROR Test2SubscribeToDutReportsOnOperationalStatusAttribute_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWiFiNetworkDiagnostics * cluster = [[CHIPTestWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:0
-                                                                                                    queue:mCallbackQueue];
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributePacketUnicastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads PacketUnicastTxCount attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PacketUnicastTxCount", actualValue, 0UL));
+        uint16_t minIntervalArgument = 4U;
+        uint16_t maxIntervalArgument = 5U;
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:minIntervalArgument]
+            maxInterval:[NSNumber numberWithUnsignedInt:maxIntervalArgument]
+            params:params
+            subscriptionEstablished:^{
+                VerifyOrReturn(
+                    testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
+                NextTest();
             }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
 
-            NextTest();
-        }];
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                if (test_Test_TC_WNCV_3_2_OperationalStatus_Reported != nil) {
+                    ResponseHandler callback = test_Test_TC_WNCV_3_2_OperationalStatus_Reported;
+                    test_Test_TC_WNCV_3_2_OperationalStatus_Reported = nil;
+                    callback(value, err);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
-};
-
-class Test_TC_WNCV_1_1 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_1_1()
-        : TestCommandBridge("Test_TC_WNCV_1_1")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_WNCV_1_1() {}
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+    CHIP_ERROR Test2aThSendsDownOrCloseCommandToDut_9()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_1_1\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_1_1\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads from the DUT the (0xFFFD) ClusterRevision attribute\n");
-            err = TestThReadsFromTheDutThe0xFFFDClusterRevisionAttribute_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads from the DUT the (0xFFFC) FeatureMap attribute\n");
-            err = TestThReadsFromTheDutThe0xFFFCFeatureMapAttribute_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads from the DUT the (0xFFFB) AttributeList attribute\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsFromTheDutThe0xFFFBAttributeListAttribute_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads from the DUT the (0xFFFA) EventList attribute\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsFromTheDutThe0xFFFAEventListAttribute_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsFromTheDutThe0xFFF9AcceptedCommandListAttribute_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute\n");
-            err = TestThReadsFromTheDutThe0xFFF8GeneratedCommandListAttribute_6();
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2a: TH sends DownOrClose command to DUT Error: %@", err);
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+            NextTest();
+        }];
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        return CHIP_NO_ERROR;
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test2bDutUpdatesItsAttributes_10()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 100UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestThReadsFromTheDutThe0xFFFDClusterRevisionAttribute_1()
+    CHIP_ERROR Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads from the DUT the (0xFFFD) ClusterRevision attribute Error: %@", err);
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U));
-            }
-
-            VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("clusterRevision", [value unsignedShortValue], 5U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("clusterRevision", [value unsignedShortValue], 200U));
+                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 10000U));
             }
 
             NextTest();
@@ -59590,23 +59941,22 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsFromTheDutThe0xFFFCFeatureMapAttribute_2()
+    CHIP_ERROR Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads from the DUT the (0xFFFC) FeatureMap attribute Error: %@", err);
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("featureMap", "", "uint32"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("featureMap", [value unsignedIntValue], 0UL));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("featureMap", [value unsignedIntValue], 32768UL));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 10000U));
             }
 
             NextTest();
@@ -59615,92 +59965,250 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsFromTheDutThe0xFFFBAttributeListAttribute_3()
+    CHIP_ERROR Test2eThLeaveTheDeviceMovingFor2Seconds_13()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 2000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test3aVerifyDutReportsOperationalStatusAttributeToThAfterADownOrClose_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads from the DUT the (0xFFFB) AttributeList attribute Error: %@", err);
+        test_Test_TC_WNCV_3_2_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3a: Verify DUT reports OperationalStatus attribute to TH after a DownOrClose Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(11)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 7UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 10UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 13UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 23UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 26UL));
-                VerifyOrReturn(CheckValue("", actualValue[6], 65528UL));
-                VerifyOrReturn(CheckValue("", actualValue[7], 65529UL));
-                VerifyOrReturn(CheckValue("", actualValue[8], 65531UL));
-                VerifyOrReturn(CheckValue("", actualValue[9], 65532UL));
-                VerifyOrReturn(CheckValue("", actualValue[10], 65533UL));
+            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationalStatus", [value unsignedCharValue], 10));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationalStatus", [value unsignedCharValue], 42));
+
+            NextTest();
+        };
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test3a2DutUpdatesItsAttributes_15()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 2000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 1U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
             }
 
-            VerifyOrReturn(CheckConstraintType("attributeList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsFromTheDutThe0xFFFAEventListAttribute_4()
+    CHIP_ERROR Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17()
     {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                if (value != nil) {
+
+                    VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 1));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 100));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsFromTheDutThe0xFFF9AcceptedCommandListAttribute_5()
+    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast<uint32_t>(3)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 1U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
             }
 
-            VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsFromTheDutThe0xFFF8GeneratedCommandListAttribute_6()
+    CHIP_ERROR Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                if (value != nil) {
+
+                    VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 1));
+                    VerifyOrReturn(
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test4aThSendsAStopMotionCommandToDut_20()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"4a: TH sends a StopMotion command to DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 3000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast<uint32_t>(0)));
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 1000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 1U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            if (value != nil) {
+
+                VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "uint16"));
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 1U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
             }
 
-            VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list"));
             NextTest();
         }];
 
@@ -59708,11 +60216,11 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_WNCV_2_1 : public TestCommandBridge {
+class Test_TC_WNCV_3_3 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_2_1()
-        : TestCommandBridge("Test_TC_WNCV_2_1")
+    Test_TC_WNCV_3_3()
+        : TestCommandBridge("Test_TC_WNCV_3_3")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -59722,7 +60230,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_2_1() {}
+    ~Test_TC_WNCV_3_3() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -59730,11 +60238,11 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_3\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_3\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -59747,251 +60255,94 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : 2: read the RO mandatory attribute default: Type\n");
-            err = Test2ReadTheRoMandatoryAttributeDefaultType_1();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 3a: write a value into the RO mandatory attribute: Type\n");
-            err = Test3aWriteAValueIntoTheRoMandatoryAttributeType_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH Waits for 6-8 seconds movement(s) on the device\n");
+            err = Test1bThWaitsFor68SecondsMovementsOnTheDevice_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 3b: reads back the RO mandatory attribute: Type\n");
-            err = Test3bReadsBackTheRoMandatoryAttributeType_3();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : 1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction\n");
+            err = Test1cThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 2: read the RO mandatory attribute default: ConfigStatus\n");
-            err = Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 1d: TH Waits for 2 seconds movement(s) on the device\n");
+            err = Test1dThWaitsFor2SecondsMovementsOnTheDevice_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : 3a: write a value into the RO mandatory attribute: ConfigStatus\n");
-            err = Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Report: 2: Subscribe to DUT reports on OperationalStatus attribute\n");
+            err = TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : 3b: reads back the RO mandatory attribute: ConfigStatus\n");
-            err = Test3bReadsBackTheRoMandatoryAttributeConfigStatus_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : 2: Subscribe to DUT reports on OperationalStatus attribute\n");
+            err = Test2SubscribeToDutReportsOnOperationalStatusAttribute_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : 2: read the RO mandatory attribute default: OperationalStatus\n");
-            err = Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : 2a: TH sends a StopMotion command to DUT\n");
+            err = Test2aThSendsAStopMotionCommandToDut_7();
             break;
         case 8:
             ChipLogProgress(
-                chipTool, " ***** Test Step 8 : 3a: write a value into the RO mandatory attribute: OperationalStatus\n");
-            err = Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_8();
+                chipTool, " ***** Test Step 8 : 2b: TH waits for 3 seconds the end of inertial movement(s) on the device\n");
+            err = Test2bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : 3b: reads back the RO mandatory attribute: OperationalStatus\n");
-            err = Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_9();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : 2c: Verify DUT reports OperationalStatus attribute to TH after a StopMotion\n");
+            err = Test2cVerifyDutReportsOperationalStatusAttributeToThAfterAStopMotion_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : 2: read the RO mandatory attribute default: EndProductType\n");
-            err = Test2ReadTheRoMandatoryAttributeDefaultEndProductType_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : 2d: TH waits for 100ms - 3s attributes update on the device\n");
+            err = Test2dThWaitsFor100ms3sAttributesUpdateOnTheDevice_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : 3a: write a value into the RO mandatory attribute: EndProductType\n");
-            err = Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : 2e: TH reads OperationalStatus attribute from DUT\n");
+            err = Test2eThReadsOperationalStatusAttributeFromDut_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : 3b: reads back the RO mandatory attribute: EndProductType\n");
-            err = Test3bReadsBackTheRoMandatoryAttributeEndProductType_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : 2: read the RW mandatory attribute default: Mode\n");
-            err = Test2ReadTheRwMandatoryAttributeDefaultMode_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : 3a: write a value into the RW mandatory attribute:: Mode\n");
-            err = Test3aWriteAValueIntoTheRwMandatoryAttributeMode_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 3b: reads back the RW mandatory attribute: Mode\n");
-            err = Test3bReadsBackTheRwMandatoryAttributeMode_15();
-            break;
-        case 16:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 16 : 2: read the RO optional attribute default: TargetPositionLiftPercent100ths\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 17 : 3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_17();
-            break;
-        case 18:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 18 : 3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths\n");
-            err = Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_18();
-            break;
-        case 19:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 19 : 2: read the RO optional attribute default: TargetPositionTiltPercent100ths\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 20 : 3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_20();
-            break;
-        case 21:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 21 : 3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths\n");
-            err = Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_21();
-            break;
-        case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : 2: read the RO optional attribute default: CurrentPositionLiftPercent100ths\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 23 : 3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_23();
-            break;
-        case 24:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 24 : 3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths\n");
-            err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_24();
-            break;
-        case 25:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 25 : 2: read the RO optional attribute default: CurrentPositionTiltPercent100ths\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 26 : 3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_26();
-            break;
-        case 27:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 27 : 3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths\n");
-            err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : 2: read the RO optional attribute default: InstalledOpenLimitLift\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_28();
-            break;
-        case 29:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 29 : 3a: write a value into the RO optional attribute: InstalledOpenLimitLift\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : 3b: reads back the RO optional attribute: InstalledOpenLimitLift\n");
-            err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_30();
-            break;
-        case 31:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 31 : 2: read the RO optional attribute default: InstalledClosedLimitLift\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_31();
-            break;
-        case 32:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 32 : 3a: write a value into the RO optional attribute: InstalledClosedLimitLift\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : 3b: reads back the RO optional attribute: InstalledClosedLimitLift\n");
-            err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : 2: read the RO optional attribute default: InstalledOpenLimitTilt\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_34();
-            break;
-        case 35:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 35 : 3a: write a value into the RO optional attribute: InstalledOpenLimitTilt\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : 3b: reads back the RO optional attribute: InstalledOpenLimitTilt\n");
-            err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_36();
-            break;
-        case 37:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 37 : 2: read the RO optional attribute default: InstalledClosedLimitTilt\n");
-            err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_37();
-            break;
-        case 38:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 38 : 3a: write a value into the RO optional attribute: InstalledClosedLimitTilt\n");
-            err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : 3b: reads back the RO optional attribute: InstalledClosedLimitTilt\n");
-            err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_39();
-            break;
-        case 40:
-            ChipLogProgress(chipTool, " ***** Test Step 40 : 4: read the RO mandatory attribute default: SafetyStatus\n");
-            err = Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_40();
-            break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : 5a: write a value into the RO mandatory attribute: SafetyStatus\n");
-            err = Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_41();
-            break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : 5b: reads back the RO mandatory attribute: SafetyStatus\n");
-            err = Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_42();
-            break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : 4: read the RO optional attribute default: CurrentPositionLift\n");
-            err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_43();
-            break;
-        case 44:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 44 : 5a: write a value into the RO optional attribute: CurrentPositionLift\n");
-            err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_44();
-            break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : 5b: reads back the RO optional attribute: CurrentPositionLift\n");
-            err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_45();
-            break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : 4: read the RO optional attribute default: CurrentPositionTilt\n");
-            err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_46();
-            break;
-        case 47:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 47 : 5a: write a value into the RO optional attribute: CurrentPositionTilt\n");
-            err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_47();
-            break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : 5b: reads back the RO optional attribute: CurrentPositionTilt\n");
-            err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_48();
-            break;
-        case 49:
             ChipLogProgress(
-                chipTool, " ***** Test Step 49 : 4: read the RO optional attribute default: CurrentPositionLiftPercentage\n");
-            err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_49();
+                chipTool, " ***** Test Step 12 : 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_12();
             break;
-        case 50:
+        case 13:
             ChipLogProgress(chipTool,
-                " ***** Test Step 50 : 5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage\n");
-            err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_50();
-            break;
-        case 51:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 51 : 5b: reads back the RO optional attribute: CurrentPositionLiftPercentage\n");
-            err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_51();
+                " ***** Test Step 13 : 3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal "
+                "with CurrentPositionLiftPercent100ths from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
+            }
+            err = Test3bIfPaLfThReadsTargetPositionLiftPercent100thsAttribute3cItMustBeEqualWithCurrentPositionLiftPercent100thsFromDut_13();
             break;
-        case 52:
+        case 14:
             ChipLogProgress(
-                chipTool, " ***** Test Step 52 : 4: read the RO optional attribute default: CurrentPositionTiltPercentage\n");
-            err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_52();
+                chipTool, " ***** Test Step 14 : 4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test4aIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_14();
             break;
-        case 53:
+        case 15:
             ChipLogProgress(chipTool,
-                " ***** Test Step 53 : 5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage\n");
-            err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_53();
-            break;
-        case 54:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 54 : 5b: reads back the RO optional attribute: CurrentPositionTiltPercentage\n");
-            err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_54();
+                " ***** Test Step 15 : 4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal "
+                "with CurrentPositionTiltPercent100ths from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test4bIfPaTlThReadsTargetPositionTiltPercent100thsAttribute4cItMustBeEqualWithCurrentPositionTiltPercent100thsFromDut_15();
             break;
         }
 
@@ -60011,7 +60362,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -60020,7 +60371,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -60029,7 +60380,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -60038,7 +60389,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -60052,123 +60403,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 50:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 51:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 52:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 53:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-            break;
-        case 54:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -60182,212 +60416,187 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 55;
+    const uint16_t mTestCount = 16;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultType_1()
+    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO mandatory attribute default: Type Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("type", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("type", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("type", [value unsignedCharValue], 9));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeType_2()
+    CHIP_ERROR Test1bThWaitsFor68SecondsMovementsOnTheDevice_2()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id typeArgument;
-        typeArgument = [NSNumber numberWithUnsignedChar:250];
-        [cluster writeAttributeTypeWithValue:typeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"3a: write a value into the RO mandatory attribute: Type Error: %@", err);
-
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                               NextTest();
-                           }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 6000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeType_3()
+    CHIP_ERROR Test1cThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO mandatory attribute: Type Error: %@", err);
+        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("type", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("type", value, 250));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_4()
+    CHIP_ERROR Test1dThWaitsFor2SecondsMovementsOnTheDevice_4()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 2000UL;
+        return WaitForMs("alpha", value);
+    }
+    bool testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled = false;
+    ResponseHandler _Nullable test_Test_TC_WNCV_3_3_OperationalStatus_Reported = nil;
+
+    CHIP_ERROR TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO mandatory attribute default: ConfigStatus Error: %@", err);
+        test_Test_TC_WNCV_3_3_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Report: 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("configStatus", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 63));
-            }
-
-            NextTest();
-        }];
+            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
+            testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled = true;
+        };
 
+        NextTest();
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_5()
+    CHIP_ERROR Test2SubscribeToDutReportsOnOperationalStatusAttribute_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id configStatusArgument;
-        configStatusArgument = [NSNumber numberWithUnsignedChar:128];
-        [cluster writeAttributeConfigStatusWithValue:configStatusArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(@"3a: write a value into the RO mandatory attribute: ConfigStatus Error: %@", err);
+        uint16_t minIntervalArgument = 4U;
+        uint16_t maxIntervalArgument = 5U;
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:minIntervalArgument]
+            maxInterval:[NSNumber numberWithUnsignedInt:maxIntervalArgument]
+            params:params
+            subscriptionEstablished:^{
+                VerifyOrReturn(
+                    testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
+                NextTest();
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
 
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                       NextTest();
-                                   }];
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                if (test_Test_TC_WNCV_3_3_OperationalStatus_Reported != nil) {
+                    ResponseHandler callback = test_Test_TC_WNCV_3_3_OperationalStatus_Reported;
+                    test_Test_TC_WNCV_3_3_OperationalStatus_Reported = nil;
+                    callback(value, err);
+                }
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeConfigStatus_6()
+    CHIP_ERROR Test2aThSendsAStopMotionCommandToDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO mandatory attribute: ConfigStatus Error: %@", err);
+        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2a: TH sends a StopMotion command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("configStatus", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("configStatus", value, 128));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_7()
+    CHIP_ERROR Test2bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_8()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 3000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test2cVerifyDutReportsOperationalStatusAttributeToThAfterAStopMotion_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO mandatory attribute default: OperationalStatus Error: %@", err);
+        test_Test_TC_WNCV_3_3_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: Verify DUT reports OperationalStatus attribute to TH after a StopMotion Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationalStatus", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationalStatus", [value unsignedCharValue], 63));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
-        }];
+        };
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_8()
+    CHIP_ERROR Test2dThWaitsFor100ms3sAttributesUpdateOnTheDevice_10()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id operationalStatusArgument;
-        operationalStatusArgument = [NSNumber numberWithUnsignedChar:128];
-        [cluster
-            writeAttributeOperationalStatusWithValue:operationalStatusArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(
-                                           @"3a: write a value into the RO mandatory attribute: OperationalStatus Error: %@", err);
-
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                       NextTest();
-                                   }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 2000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_9()
+    CHIP_ERROR Test2eThReadsOperationalStatusAttributeFromDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO mandatory attribute: OperationalStatus Error: %@", err);
+            NSLog(@"2e: TH reads OperationalStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("operationalStatus", value, 128));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
@@ -60395,24 +60604,29 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nullable attrCurrentPositionLift;
 
-    CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultEndProductType_10()
+    CHIP_ERROR Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO mandatory attribute default: EndProductType Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("endProductType", [value unsignedCharValue], 0));
+
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("endProductType", [value unsignedCharValue], 23));
+            {
+                attrCurrentPositionLift = value;
             }
 
             NextTest();
@@ -60421,40 +60635,29 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_11()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id endProductTypeArgument;
-        endProductTypeArgument = [NSNumber numberWithUnsignedChar:250];
-        [cluster
-            writeAttributeEndProductTypeWithValue:endProductTypeArgument
-                                completionHandler:^(NSError * _Nullable err) {
-                                    NSLog(@"3a: write a value into the RO mandatory attribute: EndProductType Error: %@", err);
-
-                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                    NextTest();
-                                }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeEndProductType_12()
+    CHIP_ERROR
+    Test3bIfPaLfThReadsTargetPositionLiftPercent100thsAttribute3cItMustBeEqualWithCurrentPositionLiftPercent100thsFromDut_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO mandatory attribute: EndProductType Error: %@", err);
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal with "
+                  @"CurrentPositionLiftPercent100ths from DUT Error: %@",
+                err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("endProductType", value, 250));
+            {
+                id actualValue = value;
+                if (attrCurrentPositionLift == nil) {
+                    VerifyOrReturn(CheckValueNull("TargetPositionLiftPercent100ths", actualValue));
+                } else {
+                    VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
+                    VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, attrCurrentPositionLift));
+                }
             }
 
             NextTest();
@@ -60462,24 +60665,29 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nullable attrCurrentPositionTilt;
 
-    CHIP_ERROR Test2ReadTheRwMandatoryAttributeDefaultMode_13()
+    CHIP_ERROR Test4aIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RW mandatory attribute default: Mode Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("mode", "", "map8"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("mode", [value unsignedCharValue], 0));
+
+                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
+                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("mode", [value unsignedCharValue], 15));
+            {
+                attrCurrentPositionTilt = value;
             }
 
             NextTest();
@@ -60488,40 +60696,29 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRwMandatoryAttributeMode_14()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:8];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"3a: write a value into the RW mandatory attribute:: Mode Error: %@", err);
-
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                               NextTest();
-                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3bReadsBackTheRwMandatoryAttributeMode_15()
+    CHIP_ERROR
+    Test4bIfPaTlThReadsTargetPositionTiltPercent100thsAttribute4cItMustBeEqualWithCurrentPositionTiltPercent100thsFromDut_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RW mandatory attribute: Mode Error: %@", err);
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal with "
+                  @"CurrentPositionTiltPercent100ths from DUT Error: %@",
+                err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("Mode", actualValue, 8));
+                if (attrCurrentPositionTilt == nil) {
+                    VerifyOrReturn(CheckValueNull("TargetPositionTiltPercent100ths", actualValue));
+                } else {
+                    VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
+                    VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, attrCurrentPositionTilt));
+                }
             }
 
             NextTest();
@@ -60529,145 +60726,243 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_16()
+class Test_TC_WNCV_3_4 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_3_4()
+        : TestCommandBridge("Test_TC_WNCV_3_4")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("fastMotionDuration", 0, UINT16_MAX, &mFastMotionDuration);
+        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: TargetPositionLiftPercent100ths Error: %@", err);
+    ~Test_TC_WNCV_3_4() {}
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 0U));
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_4\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_4\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
+            break;
+        case 2:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 2 : 1b: TH Waits for fastMotionDuration seconds movement(s) on the device\n");
+            err = Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 2a: TH sends UpOrOpen command to DUT\n");
+            err = Test2aThSendsUpOrOpenCommandToDut_3();
+            break;
+        case 4:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : 2b: TH Waits for fullMotionDuration seconds movement(s) on the device\n");
+            err = Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 2c: TH reads OperationalStatus attribute from DUT\n");
+            err = Test2cThReadsOperationalStatusAttributeFromDut_5();
+            break;
+        case 6:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            err = Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 7 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_7();
+            break;
+        case 8:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 9 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
             }
+            err = Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_9();
+            break;
+        }
 
-            NextTest();
-        }];
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
 
-        return CHIP_NO_ERROR;
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_17()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-        id targetPositionLiftPercent100thsArgument;
-        targetPositionLiftPercent100thsArgument = [NSNumber numberWithUnsignedShort:20000U];
-        [cluster writeAttributeTargetPositionLiftPercent100thsWithValue:targetPositionLiftPercent100thsArgument
-                                                      completionHandler:^(NSError * _Nullable err) {
-                                                          NSLog(@"3a: write a value into the RO optional attribute: "
-                                                                @"TargetPositionLiftPercent100ths Error: %@",
-                                                              err);
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 10;
 
-                                                          VerifyOrReturn(CheckValue(
-                                                              "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                          NextTest();
-                                                      }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mFastMotionDuration;
+    chip::Optional<uint16_t> mFullMotionDuration;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_18()
+    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("targetPositionLiftPercent100ths", value, 20000U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_19()
+    CHIP_ERROR Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test2aThSendsUpOrOpenCommandToDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: TargetPositionTiltPercent100ths Error: %@", err);
+        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2a: TH sends UpOrOpen command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_20()
+    CHIP_ERROR Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id targetPositionTiltPercent100thsArgument;
-        targetPositionTiltPercent100thsArgument = [NSNumber numberWithUnsignedShort:20000U];
-        [cluster writeAttributeTargetPositionTiltPercent100thsWithValue:targetPositionTiltPercent100thsArgument
-                                                      completionHandler:^(NSError * _Nullable err) {
-                                                          NSLog(@"3a: write a value into the RO optional attribute: "
-                                                                @"TargetPositionTiltPercent100ths Error: %@",
-                                                              err);
-
-                                                          VerifyOrReturn(CheckValue(
-                                                              "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                          NextTest();
-                                                      }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_21()
+    CHIP_ERROR Test2cThReadsOperationalStatusAttributeFromDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths Error: %@", err);
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: TH reads OperationalStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("targetPositionTiltPercent100ths", value, 20000U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
@@ -60676,7 +60971,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_22()
+    CHIP_ERROR Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -60684,18 +60979,14 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: CurrentPositionLiftPercent100ths Error: %@", err);
+            NSLog(@"3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 0U));
             }
 
             NextTest();
@@ -60704,43 +60995,46 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_23()
+    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id currentPositionLiftPercent100thsArgument;
-        currentPositionLiftPercent100thsArgument = [NSNumber numberWithUnsignedShort:20000U];
-        [cluster writeAttributeCurrentPositionLiftPercent100thsWithValue:currentPositionLiftPercent100thsArgument
-                                                       completionHandler:^(NSError * _Nullable err) {
-                                                           NSLog(@"3a: write a value into the RO optional attribute: "
-                                                                 @"CurrentPositionLiftPercent100ths Error: %@",
-                                                               err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
 
-                                                           VerifyOrReturn(CheckValue(
-                                                               "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                           NextTest();
-                                                       }];
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 0));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_24()
+    CHIP_ERROR Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths Error: %@", err);
+            NSLog(@"3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercent100ths", value, 20000U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 0U));
             }
 
             NextTest();
@@ -60749,425 +61043,266 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_25()
+    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: CurrentPositionTiltPercent100ths Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
-            }
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 0));
+                }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_26()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id currentPositionTiltPercent100thsArgument;
-        currentPositionTiltPercent100thsArgument = [NSNumber numberWithUnsignedShort:20000U];
-        [cluster writeAttributeCurrentPositionTiltPercent100thsWithValue:currentPositionTiltPercent100thsArgument
-                                                       completionHandler:^(NSError * _Nullable err) {
-                                                           NSLog(@"3a: write a value into the RO optional attribute: "
-                                                                 @"CurrentPositionTiltPercent100ths Error: %@",
-                                                               err);
-
-                                                           VerifyOrReturn(CheckValue(
-                                                               "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_27()
+class Test_TC_WNCV_3_5 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_3_5()
+        : TestCommandBridge("Test_TC_WNCV_3_5")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "Percent100ths"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercent100ths", value, 20000U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("fastMotionDuration", 0, UINT16_MAX, &mFastMotionDuration);
+        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_28()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInstalledOpenLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: InstalledOpenLimitLift Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedOpenLimitLift", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedOpenLimitLift", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+    ~Test_TC_WNCV_3_5() {}
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_29()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id installedOpenLimitLiftArgument;
-        installedOpenLimitLiftArgument = [NSNumber numberWithUnsignedShort:255U];
-        [cluster writeAttributeInstalledOpenLimitLiftWithValue:installedOpenLimitLiftArgument
-                                             completionHandler:^(NSError * _Nullable err) {
-                                                 NSLog(@"3a: write a value into the RO optional attribute: InstalledOpenLimitLift "
-                                                       @"Error: %@",
-                                                     err);
-
-                                                 VerifyOrReturn(
-                                                     CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                 NextTest();
-                                             }];
-
-        return CHIP_NO_ERROR;
-    }
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_30()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_5\n");
+        }
 
-        [cluster readAttributeInstalledOpenLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: InstalledOpenLimitLift Error: %@", err);
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_5\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        Wait();
 
-            VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedOpenLimitLift", [value unsignedShortValue], 0U));
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 1 : 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1();
+            break;
+        case 2:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 2 : 1b: TH Waits for fastMotionDuration seconds movement(s) on the device\n");
+            err = Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 2a: TH sends DownOrClose command to DUT\n");
+            err = Test2aThSendsDownOrCloseCommandToDut_3();
+            break;
+        case 4:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : 2b: TH Waits for fullMotionDuration seconds movement(s) on the device\n");
+            err = Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 2c: TH reads OperationalStatus attribute from DUT\n");
+            err = Test2cThReadsOperationalStatusAttributeFromDut_5();
+            break;
+        case 6:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+                NextTest();
+                return;
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedOpenLimitLift", [value unsignedShortValue], 65535U));
+            err = Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 7 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
             }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_31()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInstalledClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: InstalledClosedLimitLift Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedClosedLimitLift", [value unsignedShortValue], 0U));
+            err = Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_7();
+            break;
+        case 8:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedClosedLimitLift", [value unsignedShortValue], 65535U));
+            err = Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 9 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
+                NextTest();
+                return;
             }
+            err = Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_9();
+            break;
+        }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_32()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id installedClosedLimitLiftArgument;
-        installedClosedLimitLiftArgument = [NSNumber numberWithUnsignedShort:255U];
-        [cluster writeAttributeInstalledClosedLimitLiftWithValue:installedClosedLimitLiftArgument
-                                               completionHandler:^(NSError * _Nullable err) {
-                                                   NSLog(@"3a: write a value into the RO optional attribute: "
-                                                         @"InstalledClosedLimitLift Error: %@",
-                                                       err);
-
-                                                   VerifyOrReturn(CheckValue(
-                                                       "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                   NextTest();
-                                               }];
-
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_33()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInstalledClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: InstalledClosedLimitLift Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedClosedLimitLift", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedClosedLimitLift", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_34()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInstalledOpenLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: InstalledOpenLimitTilt Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedOpenLimitTilt", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedOpenLimitTilt", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_35()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id installedOpenLimitTiltArgument;
-        installedOpenLimitTiltArgument = [NSNumber numberWithUnsignedShort:255U];
-        [cluster writeAttributeInstalledOpenLimitTiltWithValue:installedOpenLimitTiltArgument
-                                             completionHandler:^(NSError * _Nullable err) {
-                                                 NSLog(@"3a: write a value into the RO optional attribute: InstalledOpenLimitTilt "
-                                                       @"Error: %@",
-                                                     err);
-
-                                                 VerifyOrReturn(
-                                                     CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                 NextTest();
-                                             }];
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 10;
 
-        return CHIP_NO_ERROR;
-    }
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mFastMotionDuration;
+    chip::Optional<uint16_t> mFullMotionDuration;
+    chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_36()
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInstalledOpenLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: InstalledOpenLimitTilt Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedOpenLimitTilt", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedOpenLimitTilt", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_37()
+    CHIP_ERROR Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeInstalledClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2: read the RO optional attribute default: InstalledClosedLimitTilt Error: %@", err);
+        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedClosedLimitTilt", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedClosedLimitTilt", [value unsignedShortValue], 65535U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_38()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id installedClosedLimitTiltArgument;
-        installedClosedLimitTiltArgument = [NSNumber numberWithUnsignedShort:255U];
-        [cluster writeAttributeInstalledClosedLimitTiltWithValue:installedClosedLimitTiltArgument
-                                               completionHandler:^(NSError * _Nullable err) {
-                                                   NSLog(@"3a: write a value into the RO optional attribute: "
-                                                         @"InstalledClosedLimitTilt Error: %@",
-                                                       err);
-
-                                                   VerifyOrReturn(CheckValue(
-                                                       "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                   NextTest();
-                                               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_39()
+    CHIP_ERROR Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInstalledClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: reads back the RO optional attribute: InstalledClosedLimitTilt Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("installedClosedLimitTilt", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("installedClosedLimitTilt", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_40()
+    CHIP_ERROR Test2aThSendsDownOrCloseCommandToDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4: read the RO mandatory attribute default: SafetyStatus Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2a: TH sends DownOrClose command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("safetyStatus", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("safetyStatus", [value unsignedShortValue], 2047U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_41()
+    CHIP_ERROR Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id safetyStatusArgument;
-        safetyStatusArgument = [NSNumber numberWithUnsignedShort:4096U];
-        [cluster writeAttributeSafetyStatusWithValue:safetyStatusArgument
-                                   completionHandler:^(NSError * _Nullable err) {
-                                       NSLog(@"5a: write a value into the RO mandatory attribute: SafetyStatus Error: %@", err);
-
-                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                       NextTest();
-                                   }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_42()
+    CHIP_ERROR Test2cThReadsOperationalStatusAttributeFromDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: reads back the RO mandatory attribute: SafetyStatus Error: %@", err);
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: TH reads OperationalStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("safetyStatus", value, 4096U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
@@ -61176,23 +61311,22 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_43()
+    CHIP_ERROR Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4: read the RO optional attribute default: CurrentPositionLift Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionLift", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentPositionLift", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentPositionLift", [value unsignedShortValue], 65535U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 10000U));
             }
 
             NextTest();
@@ -61201,117 +61335,46 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_44()
+    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id currentPositionLiftArgument;
-        currentPositionLiftArgument = [NSNumber numberWithUnsignedShort:255U];
         [cluster
-            writeAttributeCurrentPositionLiftWithValue:currentPositionLiftArgument
-                                     completionHandler:^(NSError * _Nullable err) {
-                                         NSLog(@"5a: write a value into the RO optional attribute: CurrentPositionLift Error: %@",
-                                             err);
-
-                                         VerifyOrReturn(
-                                             CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                         NextTest();
-                                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_45()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentPositionLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: reads back the RO optional attribute: CurrentPositionLift Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("currentPositionLift", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentPositionLift", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentPositionLift", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_46()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentPositionTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4: read the RO optional attribute default: CurrentPositionTilt Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("currentPositionTilt", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentPositionTilt", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentPositionTilt", [value unsignedShortValue], 65535U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
 
-    CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_47()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        id currentPositionTiltArgument;
-        currentPositionTiltArgument = [NSNumber numberWithUnsignedShort:255U];
-        [cluster
-            writeAttributeCurrentPositionTiltWithValue:currentPositionTiltArgument
-                                     completionHandler:^(NSError * _Nullable err) {
-                                         NSLog(@"5a: write a value into the RO optional attribute: CurrentPositionTilt Error: %@",
-                                             err);
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 100));
+                }
 
-                                         VerifyOrReturn(
-                                             CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                         NextTest();
-                                     }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_48()
+    CHIP_ERROR Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: reads back the RO optional attribute: CurrentPositionTilt Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionTilt", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("currentPositionTilt", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("currentPositionTilt", [value unsignedShortValue], 65535U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 10000U));
             }
 
             NextTest();
@@ -61320,26 +61383,22 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_49()
+    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"4: read the RO optional attribute default: CurrentPositionLiftPercentage Error: %@", err);
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "Percent"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 100));
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 100));
                 }
 
                 NextTest();
@@ -61347,141 +61406,24 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_50()
+class Test_TC_WNCV_4_1 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_4_1()
+        : TestCommandBridge("Test_TC_WNCV_4_1")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-        id currentPositionLiftPercentageArgument;
-        currentPositionLiftPercentageArgument = [NSNumber numberWithUnsignedChar:200];
-        [cluster writeAttributeCurrentPositionLiftPercentageWithValue:currentPositionLiftPercentageArgument
-                                                    completionHandler:^(NSError * _Nullable err) {
-                                                        NSLog(@"5a: write a value into the RO optional attribute: "
-                                                              @"CurrentPositionLiftPercentage Error: %@",
-                                                            err);
-
-                                                        VerifyOrReturn(CheckValue(
-                                                            "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                        NextTest();
-                                                    }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_51()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"5b: reads back the RO optional attribute: CurrentPositionLiftPercentage Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "Percent"));
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercentage", value, 200));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_52()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"4: read the RO optional attribute default: CurrentPositionTiltPercentage Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "Percent"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_53()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id currentPositionTiltPercentageArgument;
-        currentPositionTiltPercentageArgument = [NSNumber numberWithUnsignedChar:200];
-        [cluster writeAttributeCurrentPositionTiltPercentageWithValue:currentPositionTiltPercentageArgument
-                                                    completionHandler:^(NSError * _Nullable err) {
-                                                        NSLog(@"5a: write a value into the RO optional attribute: "
-                                                              @"CurrentPositionTiltPercentage Error: %@",
-                                                            err);
-
-                                                        VerifyOrReturn(CheckValue(
-                                                            "status", err ? err.code : 0, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-                                                        NextTest();
-                                                    }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_54()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"5b: reads back the RO optional attribute: CurrentPositionTiltPercentage Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "Percent"));
-                if (value != nil) {
-                    VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercentage", value, 200));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_WNCV_2_2 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_2_2()
-        : TestCommandBridge("Test_TC_WNCV_2_2")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_WNCV_2_2() {}
+    ~Test_TC_WNCV_4_1() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -61489,11 +61431,11 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_1\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_1\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -61506,280 +61448,120 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
             ChipLogProgress(chipTool,
-                " ***** Test Step 1 : Reads ConfigStatus attribute from DUT, if (PA & LF) value of bit 3 must be 1b else 0b & if "
-                "(PA & TL) value of bit 4 must be 1b else 0b\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsConfigStatusAttributeFromDutIfPaLfValueOfBit3MustBe1bElse0bIfPaTlValueOfBit4MustBe1bElse0b_1();
-            break;
-        case 2:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 2 : Reads ConfigStatus attribute from DUT, value of bit 0 must be 1b operational\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsConfigStatusAttributeFromDutValueOfBit0MustBe1bOperational_2();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadsConfigStatusAttributeFromDutIfPaLfValueOfBit3MustBe1bElse0bIfPaTlValueOfBit4MustBe1bElse0b_1()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestReadsConfigStatusAttributeFromDutValueOfBit0MustBe1bOperational_2()
-    {
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-};
-
-class Test_TC_WNCV_2_3 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_2_3()
-        : TestCommandBridge("Test_TC_WNCV_2_3")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_WNCV_2_3() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_3\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_3\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : 1a: TH set the Mode Attribute bit0 of the DUT\n");
-            if (ShouldSkip("WNCV_REVERSAL")) {
-                NextTest();
-                return;
-            }
-            err = Test1aThSetTheModeAttributeBit0OfTheDut_1();
+                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH reads ConfigStatus attribute from DUT\n");
-            if (ShouldSkip("WNCV_REVERSAL")) {
-                NextTest();
-                return;
-            }
-            err = Test1bThReadsConfigStatusAttributeFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH waits for x seconds movement(s) on the DUT\n");
+            err = Test1bThWaitsForXSecondsMovementsOnTheDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 1c: TH clear the Mode Attribute bit0 of the DUT\n");
-            if (ShouldSkip("WNCV_REVERSAL")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
                 NextTest();
                 return;
             }
-            err = Test1cThClearTheModeAttributeBit0OfTheDut_3();
+            err = Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 1d: TH reads ConfigStatus attribute from DUT\n");
-            if (ShouldSkip("WNCV_REVERSAL")) {
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 2a: TH sends GoToLiftPercentage command with 25 percent to DUT\n");
+            if (ShouldSkip("WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test1dThReadsConfigStatusAttributeFromDut_4();
+            err = Test2aThSendsGoToLiftPercentageCommandWith25PercentToDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : 2a: TH set the Mode Attribute bit1 of the DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
-                NextTest();
-                return;
-            }
-            err = Test2aThSetTheModeAttributeBit1OfTheDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 2b: DUT updates its attributes\n");
+            err = Test2bDutUpdatesItsAttributes_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : 2b: TH reads ConfigStatus attribute from DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
                 NextTest();
                 return;
             }
-            err = Test2bThReadsConfigStatusAttributeFromDut_6();
+            err = Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_6();
             break;
         case 7:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 7 : 2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
-                NextTest();
-                return;
-            }
-            err = Test2cIfConfigStatusBit00ThSendDownOrCloseCommandToTheDut_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : 3a: TH set a timeout of X minutes for failure\n");
+            err = Test3aThSetATimeoutOfXMinutesForFailure_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : 2d: TH clear the Mode Attribute bit1 of the DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
-                NextTest();
-                return;
-            }
-            err = Test2dThClearTheModeAttributeBit1OfTheDut_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : 3b: TH reads OperationalStatus attribute from DUT\n");
+            err = Test3bThReadsOperationalStatusAttributeFromDut_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : 2e: TH reads ConfigStatus attribute from DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : 3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
                 NextTest();
                 return;
             }
-            err = Test2eThReadsConfigStatusAttributeFromDut_9();
+            err = Test3cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : 2f: TH reads the Mode Attribute from the DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 10 : 3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test2fThReadsTheModeAttributeFromTheDut_10();
+            err = Test3dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : 2g: TH send DownOrClose command to the DUT\n");
-            if (ShouldSkip("WNCV_CALIBRATION")) {
+            ChipLogProgress(chipTool, " ***** Test Step 11 : 4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT\n");
+            if (ShouldSkip("WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test2gThSendDownOrCloseCommandToTheDut_11();
+            err = Test4aThSendsGoToLiftPercentageCommandWith7520PercentToDut_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : 3a: TH set the Mode Attribute bit2 of the DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
-                NextTest();
-                return;
-            }
-            err = Test3aThSetTheModeAttributeBit2OfTheDut_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : 4b: DUT updates its attributes\n");
+            err = Test4bDutUpdatesItsAttributes_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : 3c: TH reads ConfigStatus attribute from DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 13 : 4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
                 NextTest();
                 return;
             }
-            err = Test3cThReadsConfigStatusAttributeFromDut_13();
+            err = Test4cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : 3c: TH send DownOrClose command to the DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
-                NextTest();
-                return;
-            }
-            err = Test3cThSendDownOrCloseCommandToTheDut_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : 5a: TH waits for x seconds movement(s) on the DUT\n");
+            err = Test5aThWaitsForXSecondsMovementsOnTheDut_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 3d: TH clear the Mode Attribute bit2 of the DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
-                NextTest();
-                return;
-            }
-            err = Test3dThClearTheModeAttributeBit2OfTheDut_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 5b: TH reads OperationalStatus attribute from DUT\n");
+            err = Test5bThReadsOperationalStatusAttributeFromDut_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : 3e: TH reads ConfigStatus attribute from DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : 5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
                 NextTest();
                 return;
             }
-            err = Test3eThReadsConfigStatusAttributeFromDut_16();
+            err = Test5cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : 3f: TH reads the Mode Attribute from the DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
-                NextTest();
-                return;
-            }
-            err = Test3fThReadsTheModeAttributeFromTheDut_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : 3g: TH send DownOrClose command to the DUT\n");
-            if (ShouldSkip("WNCV_MAINTENANCE")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 17 : 5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_LF && WNCV_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test3gThSendDownOrCloseCommandToTheDut_18();
+            err = Test5dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17();
             break;
         }
 
@@ -61814,7 +61596,7 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -61835,7 +61617,7 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_BUSY));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -61846,9 +61628,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -61862,57 +61641,60 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 19;
+    const uint16_t mTestCount = 18;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mFullMotionDuration;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSetTheModeAttributeBit0OfTheDut_1()
+    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:1];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"1a: TH set the Mode Attribute bit0 of the DUT Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
 
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                               NextTest();
-                           }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1bThReadsConfigStatusAttributeFromDut_2()
+    CHIP_ERROR Test1bThWaitsForXSecondsMovementsOnTheDut_2()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1b: TH reads ConfigStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 4));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
             }
+            VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercent100ths", value, 0U));
 
             NextTest();
         }];
@@ -61920,42 +61702,49 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1cThClearTheModeAttributeBit0OfTheDut_3()
+    CHIP_ERROR Test2aThSendsGoToLiftPercentageCommandWith25PercentToDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"1c: TH clear the Mode Attribute bit0 of the DUT Error: %@", err);
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:2500U];
+        [cluster goToLiftPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"2a: TH sends GoToLiftPercentage command with 25 percent to DUT Error: %@", err);
 
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                               NextTest();
-                           }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1dThReadsConfigStatusAttributeFromDut_4()
+    CHIP_ERROR Test2bDutUpdatesItsAttributes_5()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 100UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1d: TH reads ConfigStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 2500U));
             }
 
             NextTest();
@@ -61964,46 +61753,27 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2aThSetTheModeAttributeBit1OfTheDut_5()
+    CHIP_ERROR Test3aThSetATimeoutOfXMinutesForFailure_7()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:2];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"2a: TH set the Mode Attribute bit1 of the DUT Error: %@", err);
-
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                               NextTest();
-                           }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
     }
-    NSNumber * _Nonnull configStatusValA;
 
-    CHIP_ERROR Test2bThReadsConfigStatusAttributeFromDut_6()
+    CHIP_ERROR Test3bThReadsOperationalStatusAttributeFromDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2b: TH reads ConfigStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3b: TH reads OperationalStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
-            }
             {
-                configStatusValA = value;
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
@@ -62012,147 +61782,97 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2cIfConfigStatusBit00ThSendDownOrCloseCommandToTheDut_7()
+    CHIP_ERROR Test3cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2c: If (ConfigStatus bit0 == 0) TH send DownOrClose command to the DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 2500U));
+            }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2dThClearTheModeAttributeBit1OfTheDut_8()
+    CHIP_ERROR Test3dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"2d: TH clear the Mode Attribute bit1 of the DUT Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
 
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                               NextTest();
-                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test2eThReadsConfigStatusAttributeFromDut_9()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2e: TH reads ConfigStatus attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 1));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test2fThReadsTheModeAttributeFromTheDut_10()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2f: TH reads the Mode Attribute from the DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("mode", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("mode", [value unsignedCharValue], 127));
-            }
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 25));
+                }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2gThSendDownOrCloseCommandToTheDut_11()
+    CHIP_ERROR Test4aThSendsGoToLiftPercentageCommandWith7520PercentToDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2g: TH send DownOrClose command to the DUT Error: %@", err);
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:7520U];
+        [cluster goToLiftPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aThSetTheModeAttributeBit2OfTheDut_12()
+    CHIP_ERROR Test4bDutUpdatesItsAttributes_12()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:4];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"3a: TH set the Mode Attribute bit2 of the DUT Error: %@", err);
-
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                               NextTest();
-                           }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 100UL;
+        return WaitForMs("alpha", value);
     }
-    NSNumber * _Nonnull configStatusValB;
 
-    CHIP_ERROR Test3cThReadsConfigStatusAttributeFromDut_13()
+    CHIP_ERROR Test4cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3c: TH reads ConfigStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
-            }
             {
-                configStatusValB = value;
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 7520U));
             }
 
             NextTest();
@@ -62161,58 +61881,27 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3cThSendDownOrCloseCommandToTheDut_14()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"3c: TH send DownOrClose command to the DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_BUSY));
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3dThClearTheModeAttributeBit2OfTheDut_15()
+    CHIP_ERROR Test5aThWaitsForXSecondsMovementsOnTheDut_14()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id modeArgument;
-        modeArgument = [NSNumber numberWithUnsignedChar:0];
-        [cluster writeAttributeModeWithValue:modeArgument
-                           completionHandler:^(NSError * _Nullable err) {
-                               NSLog(@"3d: TH clear the Mode Attribute bit2 of the DUT Error: %@", err);
-
-                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                               NextTest();
-                           }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test3eThReadsConfigStatusAttributeFromDut_16()
+    CHIP_ERROR Test5bThReadsOperationalStatusAttributeFromDut_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3e: TH reads ConfigStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5b: TH reads OperationalStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("configStatus", [value unsignedCharValue], 1));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("configStatus", [value unsignedCharValue], 127));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
 
             NextTest();
@@ -62221,22 +61910,22 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3fThReadsTheModeAttributeFromTheDut_17()
+    CHIP_ERROR Test5cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3f: TH reads the Mode Attribute from the DUT Error: %@", err);
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("mode", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("mode", [value unsignedCharValue], 127));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 7520U));
             }
 
             NextTest();
@@ -62245,39 +61934,47 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3gThSendDownOrCloseCommandToTheDut_18()
+    CHIP_ERROR Test5dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"3g: TH send DownOrClose command to the DUT Error: %@", err);
+        [cluster
+            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 75));
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_WNCV_2_4 : public TestCommandBridge {
+class Test_TC_WNCV_4_2 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_2_4()
-        : TestCommandBridge("Test_TC_WNCV_2_4")
+    Test_TC_WNCV_4_2()
+        : TestCommandBridge("Test_TC_WNCV_4_2")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_2_4() {}
+    ~Test_TC_WNCV_4_2() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -62285,11 +61982,11 @@ class Test_TC_WNCV_2_4 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_4\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_2\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_4\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_2\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -62302,24 +61999,120 @@ class Test_TC_WNCV_2_4 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads Type attribute from DUT\n");
-            if (ShouldSkip("A_TYPE")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
+            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH waits for x seconds movement(s) on the DUT\n");
+            err = Test1bThWaitsForXSecondsMovementsOnTheDut_2();
+            break;
+        case 3:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : 1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
                 NextTest();
                 return;
             }
-            err = TestReadsTypeAttributeFromDut_1();
+            err = Test1cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_3();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads Type attribute constraints\n");
-            if (ShouldSkip("A_TYPE")) {
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 2a: TH sends GoToTiltPercentage command with 30 percent to DUT\n");
+            if (ShouldSkip("WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test2aThSendsGoToTiltPercentageCommandWith30PercentToDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 2b: DUT updates its attributes\n");
+            err = Test2bDutUpdatesItsAttributes_5();
+            break;
+        case 6:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : 2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test2cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : 3a: TH set a timeout of X minutes for failure\n");
+            err = Test3aThSetATimeoutOfXMinutesForFailure_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : 3b: TH reads OperationalStatus attribute from DUT\n");
+            err = Test3bThReadsOperationalStatusAttributeFromDut_8();
+            break;
+        case 9:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 10 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : 4a: TH sends GoToTiltPercentage command with 60.20 percent to DUT\n");
+            if (ShouldSkip("WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test4aThSendsGoToTiltPercentageCommandWith6020PercentToDut_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : 4b: DUT updates its attributes\n");
+            err = Test4bDutUpdatesItsAttributes_12();
+            break;
+        case 13:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 13 : 4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test4cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : 5a: TH waits for x seconds movement(s) on the DUT\n");
+            err = Test5aThWaitsForXSecondsMovementsOnTheDut_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 5b: TH reads OperationalStatus attribute from DUT\n");
+            err = Test5bThReadsOperationalStatusAttributeFromDut_15();
+            break;
+        case 16:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 16 : 5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
+                NextTest();
+                return;
+            }
+            err = Test5cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 17 : 5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
+            if (ShouldSkip("WNCV_PA_TL && WNCV_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = TestReadsTypeAttributeConstraints_2();
+            err = Test5dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_17();
             break;
         }
 
@@ -62341,6 +62134,51 @@ class Test_TC_WNCV_2_4 : public TestCommandBridge {
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -62354,187 +62192,110 @@ class Test_TC_WNCV_2_4 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
+    const uint16_t mTestCount = 18;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mFullMotionDuration;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadsTypeAttributeFromDut_1()
+    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads Type attribute from DUT Error: %@", err);
+        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("Type", actualValue, 0));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsTypeAttributeConstraints_2()
+    CHIP_ERROR Test1bThWaitsForXSecondsMovementsOnTheDut_2()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test1cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads Type attribute constraints Error: %@", err);
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("type", "", "enum8"));
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("type", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("type", [value unsignedCharValue], 9));
             }
+            VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercent100ths", value, 0U));
 
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
-};
-
-class Test_TC_WNCV_2_5 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_2_5()
-        : TestCommandBridge("Test_TC_WNCV_2_5")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_WNCV_2_5() {}
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+    CHIP_ERROR Test2aThSendsGoToTiltPercentageCommandWith30PercentToDut_4()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_5\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_2_5\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Reads EndProductType attribute from DUT\n");
-            if (ShouldSkip("A_ENDPRODUCTTYPE")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsEndProductTypeAttributeFromDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Reads EndProductType attribute constraints from DUT\n");
-            if (ShouldSkip("A_ENDPRODUCTTYPE")) {
-                NextTest();
-                return;
-            }
-            err = TestReadsEndProductTypeAttributeConstraintsFromDut_2();
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:3000U];
+        [cluster goToTiltPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"2a: TH sends GoToTiltPercentage command with 30 percent to DUT Error: %@", err);
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+                                NextTest();
+                            }];
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        return CHIP_NO_ERROR;
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 3;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test2bDutUpdatesItsAttributes_5()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 100UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR TestReadsEndProductTypeAttributeFromDut_1()
+    CHIP_ERROR Test2cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads EndProductType attribute from DUT Error: %@", err);
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("EndProductType", actualValue, 0));
+                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 3000U));
             }
 
             NextTest();
@@ -62543,23 +62304,179 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsEndProductTypeAttributeConstraintsFromDut_2()
+    CHIP_ERROR Test3aThSetATimeoutOfXMinutesForFailure_7()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads EndProductType attribute constraints from DUT Error: %@", err);
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test3bThReadsOperationalStatusAttributeFromDut_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3b: TH reads OperationalStatus attribute from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("endProductType", [value unsignedCharValue], 0));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("endProductType", [value unsignedCharValue], 23));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_9()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 3000U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_10()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 30));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test4aThSendsGoToTiltPercentageCommandWith6020PercentToDut_11()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:6005U];
+        [cluster goToTiltPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"4a: TH sends GoToTiltPercentage command with 60.20 percent to DUT Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test4bDutUpdatesItsAttributes_12()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 100UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test4cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_13()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 6005U));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test5aThWaitsForXSecondsMovementsOnTheDut_14()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR Test5bThReadsOperationalStatusAttributeFromDut_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR Test5cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_16()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
+                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 6005U));
             }
 
             NextTest();
@@ -62567,13 +62484,37 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR Test5dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_17()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 60));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
-class Test_TC_WNCV_3_1 : public TestCommandBridge {
+class Test_TC_WNCV_4_3 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_3_1()
-        : TestCommandBridge("Test_TC_WNCV_3_1")
+    Test_TC_WNCV_4_3()
+        : TestCommandBridge("Test_TC_WNCV_4_3")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -62583,7 +62524,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_3_1() {}
+    ~Test_TC_WNCV_4_3() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -62591,11 +62532,11 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_3\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_3\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -62612,168 +62553,47 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
             err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH Waits for 10 seconds movement(s) on the device\n");
-            err = Test1bThWaitsFor10SecondsMovementsOnTheDevice_2();
-            break;
-        case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 4 : 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4();
-            break;
-        case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Report: 2: Subscribe to DUT reports on OperationalStatus attribute\n");
-            err = TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : 2: Subscribe to DUT reports on OperationalStatus attribute\n");
-            err = Test2SubscribeToDutReportsOnOperationalStatusAttribute_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : 2a: TH sends UpOrOpen command to DUT\n");
-            err = Test2aThSendsUpOrOpenCommandToDut_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : 2b: DUT updates its attributes\n");
-            err = Test2bDutUpdatesItsAttributes_10();
-            break;
-        case 11:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 11 : 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11();
-            break;
-        case 12:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 12 : 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : 2e: TH leave the device moving for 2 seconds\n");
-            err = Test2eThLeaveTheDeviceMovingFor2Seconds_13();
-            break;
-        case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : 3a1: Verify DUT reports OperationalStatus attribute to TH after a UpOrOpen\n");
-            err = Test3a1VerifyDutReportsOperationalStatusAttributeToThAfterAUpOrOpen_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 3a2: DUT updates its attributes\n");
-            err = Test3a2DutUpdatesItsAttributes_15();
-            break;
-        case 16:
             ChipLogProgress(
-                chipTool, " ***** Test Step 16 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+                chipTool, " ***** Test Step 1 : 1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT\n");
             if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16();
+            err = Test1aIfPaLfLfThReadsCurrentPositionLiftPercent100thsFromDut_1();
             break;
-        case 17:
+        case 2:
             ChipLogProgress(chipTool,
-                " ***** Test Step 17 : 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17();
-            break;
-        case 18:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 18 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                " ***** Test Step 2 : 1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from DUT + assert "
+                "CurrentPositionLiftPercent100ths/100 equals CurrentPositionLiftPercentage\n");
+            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18();
+            err = Test1b1cIfPaLfLfThReadsCurrentPositionLiftPercentageFromDutAssertCurrentPositionLiftPercent100ths100EqualsCurrentPositionLiftPercentage_2();
             break;
-        case 19:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 19 : 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 2b: TH sends GoToLiftPercentage command with BadParam to DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : 4a: TH sends a StopMotion command to DUT\n");
-            err = Test4aThSendsAStopMotionCommandToDut_20();
-            break;
-        case 21:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 21 : 4b: TH waits for 3 seconds the end of inertial movement(s) on the device\n");
-            err = Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21();
-            break;
-        case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion\n");
-            err = Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : 5a: TH waits for x seconds attributes update on the device\n");
-            err = Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23();
+            err = Test2bThSendsGoToLiftPercentageCommandWithBadParamToDut_3();
             break;
-        case 24:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 24 : 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 3a: TH sends GoToLiftPercentage command with 10001 to DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24();
+            err = Test3aThSendsGoToLiftPercentageCommandWith10001ToDut_4();
             break;
-        case 25:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 25 : 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
                 NextTest();
                 return;
             }
-            err = Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25();
+            err = Test4aThSendsGoToLiftPercentageCommandWith0xFFFFToDut_5();
             break;
         }
 
@@ -62796,73 +62616,13 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         }
 
@@ -62877,7 +62637,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 26;
+    const uint16_t mTestCount = 6;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -62890,32 +62650,9 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
+    NSNumber * _Nullable attrCurrentPositionLiftPercent100ths;
 
-    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test1bThWaitsFor10SecondsMovementsOnTheDevice_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 10000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3()
+    CHIP_ERROR Test1aIfPaLfLfThReadsCurrentPositionLiftPercent100thsFromDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -62923,19 +62660,20 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            NSLog(@"1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
+                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
                 VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
                     "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
             }
+            {
+                attrCurrentPositionLiftPercent100ths = value;
+            }
 
             NextTest();
         }];
@@ -62943,7 +62681,8 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4()
+    CHIP_ERROR
+    Test1b1cIfPaLfLfThReadsCurrentPositionLiftPercentageFromDutAssertCurrentPositionLiftPercent100ths100EqualsCurrentPositionLiftPercentage_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -62951,16 +62690,22 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster
             readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+                NSLog(@"1b 1c: If (PA_LF & LF) TH reads CurrentPositionLiftPercentage from DUT + assert "
+                      @"CurrentPositionLiftPercent100ths/100 equals CurrentPositionLiftPercentage Error: %@",
+                    err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 1));
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue,
+                        [attrCurrentPositionLiftPercent100ths unsignedShortValue] / 100));
                 }
                 if (value != nil) {
+
+                    VerifyOrReturn(
+                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
                     VerifyOrReturn(
                         CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 100));
                 }
@@ -62971,282 +62716,207 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5()
+    CHIP_ERROR Test2bThSendsGoToLiftPercentageCommandWithBadParamToDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
-            }
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:12288U];
+        [cluster goToLiftPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"2b: TH sends GoToLiftPercentage command with BadParam to DUT Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6()
+    CHIP_ERROR Test3aThSendsGoToLiftPercentageCommandWith10001ToDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:10001U];
+        [cluster goToLiftPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"3a: TH sends GoToLiftPercentage command with 10001 to DUT Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 1));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
-                }
-
-                NextTest();
-            }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
-    bool testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled = false;
-    ResponseHandler _Nullable test_Test_TC_WNCV_3_1_OperationalStatus_Reported = nil;
 
-    CHIP_ERROR TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7()
+    CHIP_ERROR Test4aThSendsGoToLiftPercentageCommandWith0xFFFFToDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        test_Test_TC_WNCV_3_1_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Report: 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:65535U];
+        [cluster goToLiftPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled = true;
-        };
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                NextTest();
+                            }];
 
-        NextTest();
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test2SubscribeToDutReportsOnOperationalStatusAttribute_8()
+class Test_TC_WNCV_4_4 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_WNCV_4_4()
+        : TestCommandBridge("Test_TC_WNCV_4_4")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        uint16_t minIntervalArgument = 4U;
-        uint16_t maxIntervalArgument = 5U;
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:minIntervalArgument]
-            maxInterval:[NSNumber numberWithUnsignedInt:maxIntervalArgument]
-            params:params
-            subscriptionEstablished:^{
-                VerifyOrReturn(
-                    testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
-                NextTest();
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-                if (test_Test_TC_WNCV_3_1_OperationalStatus_Reported != nil) {
-                    ResponseHandler callback = test_Test_TC_WNCV_3_1_OperationalStatus_Reported;
-                    test_Test_TC_WNCV_3_1_OperationalStatus_Reported = nil;
-                    callback(value, err);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR Test2aThSendsUpOrOpenCommandToDut_9()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2a: TH sends UpOrOpen command to DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+    ~Test_TC_WNCV_4_4() {}
 
-    CHIP_ERROR Test2bDutUpdatesItsAttributes_10()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 100UL;
-        return WaitForMs("alpha", value);
-    }
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-    CHIP_ERROR Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_4\n");
+        }
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_4\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        Wait();
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 0U));
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
+            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 1 : 1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
+                NextTest();
+                return;
             }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 0U));
+            err = Test1aIfPaTlTlThReadsCurrentPositionTiltPercent100thsFromDut_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 2 : 1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from DUT + assert "
+                "CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage\n");
+            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+                NextTest();
+                return;
             }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test2eThLeaveTheDeviceMovingFor2Seconds_13()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 2000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test3a1VerifyDutReportsOperationalStatusAttributeToThAfterAUpOrOpen_14()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        test_Test_TC_WNCV_3_1_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3a1: Verify DUT reports OperationalStatus attribute to TH after a UpOrOpen Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationalStatus", [value unsignedCharValue], 5));
+            err = Test1b1cIfPaLfLfThReadsCurrentPositionTiltPercentageFromDutAssertCurrentPositionTiltPercent100ths100EqualsCurrentPositionTiltPercentage_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 2b: TH sends GoToTiltPercentage command with BadParam to DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL || WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
+                NextTest();
+                return;
             }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationalStatus", [value unsignedCharValue], 21));
+            err = Test2bThSendsGoToTiltPercentageCommandWithBadParamToDut_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 3a: TH sends GoToTiltPercentage command with 10001 to DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL || WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
+                NextTest();
+                return;
             }
+            err = Test3aThSendsGoToTiltPercentageCommandWith10001ToDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL || WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
+                NextTest();
+                return;
+            }
+            err = Test4aThSendsGoToTiltPercentageCommandWith0xFFFFToDut_5();
+            break;
+        }
 
-            NextTest();
-        };
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3a2DutUpdatesItsAttributes_15()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 2000UL;
-        return WaitForMs("alpha", value);
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 9999U));
-            }
-
-            NextTest();
-        }];
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 99));
-                }
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 6;
 
-                NextTest();
-            }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
+    NSNumber * _Nullable attrCurrentPositionTiltPercent100ths;
 
-    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18()
+    CHIP_ERROR Test1aIfPaTlTlThReadsCurrentPositionTiltPercent100thsFromDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -63254,18 +62924,19 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            NSLog(@"1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
                     "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 9999U));
+                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
+            }
+            {
+                attrCurrentPositionTiltPercent100ths = value;
             }
 
             NextTest();
@@ -63274,7 +62945,8 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19()
+    CHIP_ERROR
+    Test1b1cIfPaLfLfThReadsCurrentPositionTiltPercentageFromDutAssertCurrentPositionTiltPercent100ths100EqualsCurrentPositionTiltPercentage_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -63282,18 +62954,24 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
 
         [cluster
             readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+                NSLog(@"1b 1c: If (PA_LF & LF) TH reads CurrentPositionTiltPercentage from DUT + assert "
+                      @"CurrentPositionTiltPercent100ths/100 equals CurrentPositionTiltPercentage Error: %@",
+                    err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
+                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue,
+                        [attrCurrentPositionTiltPercent100ths unsignedShortValue] / 100));
+                }
                 if (value != nil) {
+
                     VerifyOrReturn(
                         CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
                     VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 99));
+                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
                 }
 
                 NextTest();
@@ -63302,121 +62980,69 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4aThSendsAStopMotionCommandToDut_20()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"4a: TH sends a StopMotion command to DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 3000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22()
+    CHIP_ERROR Test2bThSendsGoToTiltPercentageCommandWithBadParamToDut_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
-            }
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:12288U];
+        [cluster goToTiltPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"2b: TH sends GoToTiltPercentage command with BadParam to DUT Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24()
+    CHIP_ERROR Test3aThSendsGoToTiltPercentageCommandWith10001ToDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 9999U));
-            }
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:10001U];
+        [cluster goToTiltPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"3a: TH sends GoToTiltPercentage command with 10001 to DUT Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25()
+    CHIP_ERROR Test4aThSendsGoToTiltPercentageCommandWith0xFFFFToDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 9999U));
-            }
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:65535U];
+        [cluster goToTiltPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_WNCV_3_2 : public TestCommandBridge {
+class Test_TC_WNCV_4_5 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_3_2()
-        : TestCommandBridge("Test_TC_WNCV_3_2")
+    Test_TC_WNCV_4_5()
+        : TestCommandBridge("Test_TC_WNCV_4_5")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -63426,7 +63052,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_3_2() {}
+    ~Test_TC_WNCV_4_5() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -63434,11 +63060,11 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_5\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_5\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -63451,172 +63077,94 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : 0a: Wait for the commissioned device to be retrieved\n");
+            err = Test0aWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 1 : 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : 0b: TH sends UpOrOpen command to preposition the DUT\n");
+            err = Test0bThSendsUpOrOpenCommandToPrepositionTheDut_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH Waits for 10 seconds movement(s) on the device\n");
-            err = Test1bThWaitsFor10SecondsMovementsOnTheDevice_2();
-            break;
-        case 3:
             ChipLogProgress(
-                chipTool, " ***** Test Step 3 : 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
+                chipTool, " ***** Test Step 2 : 1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT\n");
             if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3();
+            err = Test1aIfPaLfLfThSendsGoToLiftPercentageCommandWith90ToDut_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : 1b: TH Waits for 100ms-1s\n");
+            err = Test1bThWaitsFor100ms1s_3();
             break;
         case 4:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 4 : 1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : 1c: TH sends StopMotion command to DUT\n");
+            err = Test1cThSendsStopMotionCommandToDut_4();
             break;
         case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : 1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : 1d: TH Waits for 100ms-1s\n");
+            err = Test1dThWaitsFor100ms1s_5();
             break;
         case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : 1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : 2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT\n");
+            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
                 NextTest();
                 return;
             }
-            err = Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6();
+            err = Test2aIfPaTlTlThSendsGoToTiltPercentageCommandWith90ToDut_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Report: 2: Subscribe to DUT reports on OperationalStatus attribute\n");
-            err = TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : 2b: TH Waits for 100ms-1s\n");
+            err = Test2bThWaitsFor100ms1s_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : 2: Subscribe to DUT reports on OperationalStatus attribute\n");
-            err = Test2SubscribeToDutReportsOnOperationalStatusAttribute_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : 2c: TH sends StopMotion command to DUT\n");
+            err = Test2cThSendsStopMotionCommandToDut_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : 2a: TH sends DownOrClose command to DUT\n");
-            err = Test2aThSendsDownOrCloseCommandToDut_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : 2d: TH Waits for 100ms-1s\n");
+            err = Test2dThWaitsFor100ms1s_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : 2b: DUT updates its attributes\n");
-            err = Test2bDutUpdatesItsAttributes_10();
-            break;
-        case 11:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 11 : 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            ChipLogProgress(chipTool, " ***** Test Step 10 : 3a: TH reads CurrentPositionLiftPercent100ths from DUT\n");
             if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11();
+            err = Test3aThReadsCurrentPositionLiftPercent100thsFromDut_10();
             break;
-        case 12:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 12 : 2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : 3b: TH reads CurrentPositionTiltPercent100ths from DUT\n");
             if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
                 NextTest();
                 return;
             }
-            err = Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12();
+            err = Test3bThReadsCurrentPositionTiltPercent100thsFromDut_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : 3c: reboot/restart the DUT\n");
+            err = Test3cRebootRestartTheDut_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : 2e: TH leave the device moving for 2 seconds\n");
-            err = Test2eThLeaveTheDeviceMovingFor2Seconds_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : 3d: Wait for the commissioned device to be retrieved\n");
+            err = Test3dWaitForTheCommissionedDeviceToBeRetrieved_13();
             break;
         case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : 3a: Verify DUT reports OperationalStatus attribute to TH after a DownOrClose\n");
-            err = Test3aVerifyDutReportsOperationalStatusAttributeToThAfterADownOrClose_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 3a2: DUT updates its attributes\n");
-            err = Test3a2DutUpdatesItsAttributes_15();
-            break;
-        case 16:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 16 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 17 : 3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17();
-            break;
-        case 18:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 18 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 19 : 3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : 4a: TH sends a StopMotion command to DUT\n");
-            err = Test4aThSendsAStopMotionCommandToDut_20();
-            break;
-        case 21:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 21 : 4b: TH waits for 3 seconds the end of inertial movement(s) on the device\n");
-            err = Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21();
-            break;
-        case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : 4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion\n");
-            err = Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : 5a: TH waits for x seconds attributes update on the device\n");
-            err = Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23();
-            break;
-        case 24:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 24 : 5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
+            ChipLogProgress(chipTool, " ***** Test Step 14 : 3e: TH reads CurrentPositionLiftPercent100ths from DUT\n");
             if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
                 NextTest();
                 return;
             }
-            err = Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24();
+            err = Test3eThReadsCurrentPositionLiftPercent100thsFromDut_14();
             break;
-        case 25:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 25 : 5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : 3f: TH reads CurrentPositionTiltPercent100ths from DUT\n");
             if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
                 NextTest();
                 return;
             }
-            err = Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25();
+            err = Test3fThReadsCurrentPositionTiltPercent100thsFromDut_15();
             break;
         }
 
@@ -63677,36 +63225,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -63720,28 +63238,28 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 26;
+    const uint16_t mTestCount = 16;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR Test0aWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1()
+    CHIP_ERROR Test0bThSendsUpOrOpenCommandToPrepositionTheDut_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
+            NSLog(@"0b: TH sends UpOrOpen command to preposition the DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63751,185 +63269,92 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1bThWaitsFor10SecondsMovementsOnTheDevice_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 10000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3()
+    CHIP_ERROR Test1aIfPaLfLfThSendsGoToLiftPercentageCommandWith90ToDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:9000U];
+        [cluster goToLiftPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT Error: %@", err);
 
-            VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 9999U));
-            }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_4()
+    CHIP_ERROR Test1bThWaitsFor100ms1s_3()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"1d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 99));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 500UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test1eIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_5()
+    CHIP_ERROR Test1cThSendsStopMotionCommandToDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1e: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"1c: TH sends StopMotion command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 9999U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1fIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_6()
+    CHIP_ERROR Test1dThWaitsFor100ms1s_5()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"1f: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 99));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 500UL;
+        return WaitForMs("alpha", value);
     }
-    bool testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled = false;
-    ResponseHandler _Nullable test_Test_TC_WNCV_3_2_OperationalStatus_Reported = nil;
 
-    CHIP_ERROR TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_7()
+    CHIP_ERROR Test2aIfPaTlTlThSendsGoToTiltPercentageCommandWith90ToDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        test_Test_TC_WNCV_3_2_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Report: 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:9000U];
+        [cluster goToTiltPercentageWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled = true;
-        };
+                                NextTest();
+                            }];
 
-        NextTest();
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2SubscribeToDutReportsOnOperationalStatusAttribute_8()
+    CHIP_ERROR Test2bThWaitsFor100ms1s_7()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        uint16_t minIntervalArgument = 4U;
-        uint16_t maxIntervalArgument = 5U;
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:minIntervalArgument]
-            maxInterval:[NSNumber numberWithUnsignedInt:maxIntervalArgument]
-            params:params
-            subscriptionEstablished:^{
-                VerifyOrReturn(
-                    testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
-                NextTest();
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-                if (test_Test_TC_WNCV_3_2_OperationalStatus_Reported != nil) {
-                    ResponseHandler callback = test_Test_TC_WNCV_3_2_OperationalStatus_Reported;
-                    test_Test_TC_WNCV_3_2_OperationalStatus_Reported = nil;
-                    callback(value, err);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 500UL;
+        return WaitForMs("alpha", value);
     }
 
-    CHIP_ERROR Test2aThSendsDownOrCloseCommandToDut_9()
+    CHIP_ERROR Test2cThSendsStopMotionCommandToDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2a: TH sends DownOrClose command to DUT Error: %@", err);
+        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"2c: TH sends StopMotion command to DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -63939,29 +63364,31 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2bDutUpdatesItsAttributes_10()
+    CHIP_ERROR Test2dThWaitsFor100ms1s_9()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 100UL;
+        value.ms = 500UL;
         return WaitForMs("alpha", value);
     }
+    NSNumber * _Nullable attrCurrentPositionLiftPercent100ths;
 
-    CHIP_ERROR Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_11()
+    CHIP_ERROR Test3aThReadsCurrentPositionLiftPercent100thsFromDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            NSLog(@"3a: TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            if (value != nil) {
+            }
+            VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercent100ths", value, 0U));
             {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 10000U));
+                attrCurrentPositionLiftPercent100ths = value;
             }
 
             NextTest();
@@ -63969,23 +63396,25 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nullable attrCurrentPositionTiltPercent100ths;
 
-    CHIP_ERROR Test2dIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_12()
+    CHIP_ERROR Test3bThReadsCurrentPositionTiltPercent100thsFromDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2d: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            NSLog(@"3b: TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            if (value != nil) {
+            }
+            VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercent100ths", value, 0U));
             {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 10000U));
+                attrCurrentPositionTiltPercent100ths = value;
             }
 
             NextTest();
@@ -63994,46 +63423,20 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2eThLeaveTheDeviceMovingFor2Seconds_13()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 2000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test3aVerifyDutReportsOperationalStatusAttributeToThAfterADownOrClose_14()
+    CHIP_ERROR Test3cRebootRestartTheDut_12()
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        test_Test_TC_WNCV_3_2_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3a: Verify DUT reports OperationalStatus attribute to TH after a DownOrClose Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("operationalStatus", [value unsignedCharValue], 10));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("operationalStatus", [value unsignedCharValue], 42));
-            }
-
-            NextTest();
-        };
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
+        return Reboot("alpha", value);
     }
 
-    CHIP_ERROR Test3a2DutUpdatesItsAttributes_15()
+    CHIP_ERROR Test3dWaitForTheCommissionedDeviceToBeRetrieved_13()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 2000UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16()
+    CHIP_ERROR Test3eThReadsCurrentPositionLiftPercent100thsFromDut_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -64041,18 +63444,19 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+            NSLog(@"3e: TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            {
+                id actualValue = value;
+                if (attrCurrentPositionLiftPercent100ths == nil) {
+                    VerifyOrReturn(CheckValueNull("CurrentPositionLiftPercent100ths", actualValue));
+                } else {
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
+                    VerifyOrReturn(
+                        CheckValue("CurrentPositionLiftPercent100ths", actualValue, attrCurrentPositionLiftPercent100ths));
+                }
             }
 
             NextTest();
@@ -64061,35 +63465,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3cIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3c: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 1));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionLiftPercentage", [value unsignedCharValue], 100));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_18()
+    CHIP_ERROR Test3fThReadsCurrentPositionTiltPercent100thsFromDut_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -64097,18 +63473,19 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+            NSLog(@"3f: TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
+            {
+                id actualValue = value;
+                if (attrCurrentPositionTiltPercent100ths == nil) {
+                    VerifyOrReturn(CheckValueNull("CurrentPositionTiltPercent100ths", actualValue));
+                } else {
+                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
+                    VerifyOrReturn(
+                        CheckValue("CurrentPositionTiltPercent100ths", actualValue, attrCurrentPositionTiltPercent100ths));
+                }
             }
 
             NextTest();
@@ -64116,108 +63493,132 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test3eIfPaLfThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_19()
+class TV_TargetNavigatorCluster : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    TV_TargetNavigatorCluster()
+        : TestCommandBridge("TV_TargetNavigatorCluster")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3e: If (PA & LF) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8"));
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 1));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR Test4aThSendsAStopMotionCommandToDut_20()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"4a: TH sends a StopMotion command to DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
+    ~TV_TargetNavigatorCluster() {}
 
-    CHIP_ERROR Test4bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_21()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 3000UL;
-        return WaitForMs("alpha", value);
-    }
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-    CHIP_ERROR Test4cVerifyDutUpdateOperationalStatusAttributeToThAfterAStopMotion_22()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: TV_TargetNavigatorCluster\n");
+        }
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4c: Verify DUT update OperationalStatus attribute to TH after a StopMotion Error: %@", err);
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: TV_TargetNavigatorCluster\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        Wait();
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
-            }
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Target Navigator list\n");
+            err = TestReadAttributeTargetNavigatorList_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute current navigator target\n");
+            err = TestReadAttributeCurrentNavigatorTarget_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Navigate Target Request Command\n");
+            err = TestNavigateTargetRequestCommand_3();
+            break;
+        }
 
-            NextTest();
-        }];
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
 
-        return CHIP_NO_ERROR;
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR Test5aThWaitsForXSecondsAttributesUpdateOnTheDevice_23()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1000UL;
-        return WaitForMs("alpha", value);
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
     }
 
-    CHIP_ERROR Test5bIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_24()
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 4;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestReadAttributeTargetNavigatorList_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeTargetListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute Target Navigator list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "targetPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("TargetList", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("identifier", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[0]).identifier, 1));
+                VerifyOrReturn(
+                    CheckValueAsString("name", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[0]).name, @"exampleName"));
+                VerifyOrReturn(CheckValue("identifier", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[1]).identifier, 2));
+                VerifyOrReturn(
+                    CheckValueAsString("name", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[1]).name, @"exampleName"));
             }
 
             NextTest();
@@ -64226,26 +63627,20 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_25()
+    CHIP_ERROR TestReadAttributeCurrentNavigatorTarget_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeCurrentTargetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute current navigator target Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "uint16"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 1U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "targetPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("CurrentTarget", actualValue, 0));
             }
 
             NextTest();
@@ -64253,13 +63648,45 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR TestNavigateTargetRequestCommand_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init];
+        params.target = [NSNumber numberWithUnsignedChar:1];
+        params.data = @"1";
+        [cluster navigateTargetWithParams:params
+                        completionHandler:^(
+                            CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable err) {
+                            NSLog(@"Navigate Target Request Command Error: %@", err);
+
+                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                            {
+                                id actualValue = values.status;
+                                VerifyOrReturn(CheckValue("status", actualValue, 0));
+                            }
+
+                            {
+                                id actualValue = values.data;
+                                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+                            }
+
+                            NextTest();
+                        }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
-class Test_TC_WNCV_3_3 : public TestCommandBridge {
+class TV_AudioOutputCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_3_3()
-        : TestCommandBridge("Test_TC_WNCV_3_3")
+    TV_AudioOutputCluster()
+        : TestCommandBridge("TV_AudioOutputCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -64269,7 +63696,7 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_3_3() {}
+    ~TV_AudioOutputCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -64277,11 +63704,11 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_3\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_AudioOutputCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_3\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_AudioOutputCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -64294,94 +63721,28 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Audio Output list\n");
+            err = TestReadAttributeAudioOutputList_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH Waits for 6-8 seconds movement(s) on the device\n");
-            err = Test1bThWaitsFor68SecondsMovementsOnTheDevice_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute current audio output\n");
+            err = TestReadAttributeCurrentAudioOutput_2();
             break;
         case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : 1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction\n");
-            err = Test1cThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Select Output Command\n");
+            err = TestSelectOutputCommand_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 1d: TH Waits for 2 seconds movement(s) on the device\n");
-            err = Test1dThWaitsFor2SecondsMovementsOnTheDevice_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Rename Output Command\n");
+            err = TestRenameOutputCommand_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Report: 2: Subscribe to DUT reports on OperationalStatus attribute\n");
-            err = TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : 2: Subscribe to DUT reports on OperationalStatus attribute\n");
-            err = Test2SubscribeToDutReportsOnOperationalStatusAttribute_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : 2a: TH sends a StopMotion command to DUT\n");
-            err = Test2aThSendsAStopMotionCommandToDut_7();
-            break;
-        case 8:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 8 : 2b: TH waits for 3 seconds the end of inertial movement(s) on the device\n");
-            err = Test2bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_8();
-            break;
-        case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : 2c: Verify DUT reports OperationalStatus attribute to TH after a StopMotion\n");
-            err = Test2cVerifyDutReportsOperationalStatusAttributeToThAfterAStopMotion_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : 2d: TH waits for 100ms - 3s attributes update on the device\n");
-            err = Test2dThWaitsFor100ms3sAttributesUpdateOnTheDevice_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : 2e: TH reads OperationalStatus attribute from DUT\n");
-            err = Test2eThReadsOperationalStatusAttributeFromDut_11();
-            break;
-        case 12:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 12 : 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 13 : 3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal "
-                "with CurrentPositionLiftPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3bIfPaLfThReadsTargetPositionLiftPercent100thsAttribute3cItMustBeEqualWithCurrentPositionLiftPercent100thsFromDut_13();
-            break;
-        case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : 4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test4aIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 15 : 4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal "
-                "with CurrentPositionTiltPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test4bIfPaTlThReadsTargetPositionTiltPercent100thsAttribute4cItMustBeEqualWithCurrentPositionTiltPercent100thsFromDut_15();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute Audio Output list\n");
+            err = TestReadAttributeAudioOutputList_5();
             break;
         }
 
@@ -64412,36 +63773,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -64455,425 +63786,215 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 16;
+    const uint16_t mTestCount = 6;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
+    CHIP_ERROR TestReadAttributeAudioOutputList_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+        [cluster readAttributeOutputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute Audio Output list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OutputList", [actualValue count], static_cast<uint32_t>(3)));
+                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).index, 1));
+                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).outputType, 0));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).name, @"HDMI"));
+                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).index, 2));
+                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).outputType, 0));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).name, @"HDMI"));
+                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).index, 3));
+                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).outputType, 0));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).name, @"HDMI"));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1bThWaitsFor68SecondsMovementsOnTheDevice_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test1cThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_3()
+    CHIP_ERROR TestReadAttributeCurrentAudioOutput_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1c: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
+        [cluster readAttributeCurrentOutputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute current audio output Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("CurrentOutput", actualValue, 1));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1dThWaitsFor2SecondsMovementsOnTheDevice_4()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 2000UL;
-        return WaitForMs("alpha", value);
-    }
-    bool testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled = false;
-    ResponseHandler _Nullable test_Test_TC_WNCV_3_3_OperationalStatus_Reported = nil;
-
-    CHIP_ERROR TestReport2SubscribeToDutReportsOnOperationalStatusAttribute_5()
+    CHIP_ERROR TestSelectOutputCommand_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        test_Test_TC_WNCV_3_3_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Report: 2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8"));
-            testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled = true;
-        };
-
-        NextTest();
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test2SubscribeToDutReportsOnOperationalStatusAttribute_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        __auto_type * params = [[CHIPAudioOutputClusterSelectOutputParams alloc] init];
+        params.index = [NSNumber numberWithUnsignedChar:1];
+        [cluster selectOutputWithParams:params
+                      completionHandler:^(NSError * _Nullable err) {
+                          NSLog(@"Select Output Command Error: %@", err);
 
-        uint16_t minIntervalArgument = 4U;
-        uint16_t maxIntervalArgument = 5U;
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:minIntervalArgument]
-            maxInterval:[NSNumber numberWithUnsignedInt:maxIntervalArgument]
-            params:params
-            subscriptionEstablished:^{
-                VerifyOrReturn(
-                    testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
-                NextTest();
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"2: Subscribe to DUT reports on OperationalStatus attribute Error: %@", err);
+                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-                if (test_Test_TC_WNCV_3_3_OperationalStatus_Reported != nil) {
-                    ResponseHandler callback = test_Test_TC_WNCV_3_3_OperationalStatus_Reported;
-                    test_Test_TC_WNCV_3_3_OperationalStatus_Reported = nil;
-                    callback(value, err);
-                }
-            }];
+                          NextTest();
+                      }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2aThSendsAStopMotionCommandToDut_7()
+    CHIP_ERROR TestRenameOutputCommand_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2a: TH sends a StopMotion command to DUT Error: %@", err);
+        __auto_type * params = [[CHIPAudioOutputClusterRenameOutputParams alloc] init];
+        params.index = [NSNumber numberWithUnsignedChar:1];
+        params.name = @"HDMI Test";
+        [cluster renameOutputWithParams:params
+                      completionHandler:^(NSError * _Nullable err) {
+                          NSLog(@"Rename Output Command Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                          NextTest();
+                      }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2bThWaitsFor3SecondsTheEndOfInertialMovementsOnTheDevice_8()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 3000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test2cVerifyDutReportsOperationalStatusAttributeToThAfterAStopMotion_9()
+    CHIP_ERROR TestReadAttributeAudioOutputList_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        test_Test_TC_WNCV_3_3_OperationalStatus_Reported = ^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2c: Verify DUT reports OperationalStatus attribute to TH after a StopMotion Error: %@", err);
+        [cluster readAttributeOutputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute Audio Output list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+                VerifyOrReturn(CheckValue("OutputList", [actualValue count], static_cast<uint32_t>(3)));
+                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).index, 1));
+                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).outputType, 0));
+                VerifyOrReturn(
+                    CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).name, @"HDMI Test"));
+                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).index, 2));
+                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).outputType, 0));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).name, @"HDMI"));
+                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).index, 3));
+                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).outputType, 0));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).name, @"HDMI"));
             }
 
             NextTest();
-        };
+        }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test2dThWaitsFor100ms3sAttributesUpdateOnTheDevice_10()
+class TV_ApplicationLauncherCluster : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    TV_ApplicationLauncherCluster()
+        : TestCommandBridge("TV_ApplicationLauncherCluster")
+        , mTestIndex(0)
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 2000UL;
-        return WaitForMs("alpha", value);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR Test2eThReadsOperationalStatusAttributeFromDut_11()
+    ~TV_ApplicationLauncherCluster() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2e: TH reads OperationalStatus attribute from DUT Error: %@", err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationLauncherCluster\n");
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: TV_ApplicationLauncherCluster\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
-            }
+        Wait();
 
-            NextTest();
-        }];
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Application Launcher list\n");
+            err = TestReadAttributeApplicationLauncherList_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute application launcher app\n");
+            err = TestReadAttributeApplicationLauncherApp_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Launch App Command\n");
+            err = TestLaunchAppCommand_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Stop App Command\n");
+            err = TestStopAppCommand_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Hide App Command\n");
+            err = TestHideAppCommand_5();
+            break;
+        }
 
-        return CHIP_NO_ERROR;
-    }
-    NSNumber * _Nullable attrCurrentPositionLift;
-
-    CHIP_ERROR Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_12()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
-            }
-            {
-                attrCurrentPositionLift = value;
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR
-    Test3bIfPaLfThReadsTargetPositionLiftPercent100thsAttribute3cItMustBeEqualWithCurrentPositionLiftPercent100thsFromDut_13()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute 3c: it Must be equal with "
-                  @"CurrentPositionLiftPercent100ths from DUT Error: %@",
-                err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                if (attrCurrentPositionLift == nil) {
-                    VerifyOrReturn(CheckValueNull("TargetPositionLiftPercent100ths", actualValue));
-                } else {
-                    VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
-                    VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, attrCurrentPositionLift));
-                }
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-    NSNumber * _Nullable attrCurrentPositionTilt;
-
-    CHIP_ERROR Test4aIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_14()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4a: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
-            }
-            {
-                attrCurrentPositionTilt = value;
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR
-    Test4bIfPaTlThReadsTargetPositionTiltPercent100thsAttribute4cItMustBeEqualWithCurrentPositionTiltPercent100thsFromDut_15()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4b: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute 4c: it Must be equal with "
-                  @"CurrentPositionTiltPercent100ths from DUT Error: %@",
-                err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                if (attrCurrentPositionTilt == nil) {
-                    VerifyOrReturn(CheckValueNull("TargetPositionTiltPercent100ths", actualValue));
-                } else {
-                    VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
-                    VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, attrCurrentPositionTilt));
-                }
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class Test_TC_WNCV_3_4 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_3_4()
-        : TestCommandBridge("Test_TC_WNCV_3_4")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("fastMotionDuration", 0, UINT16_MAX, &mFastMotionDuration);
-        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_WNCV_3_4() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_4\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_4\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
-            break;
-        case 2:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 2 : 1b: TH Waits for fastMotionDuration seconds movement(s) on the device\n");
-            err = Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 2a: TH sends UpOrOpen command to DUT\n");
-            err = Test2aThSendsUpOrOpenCommandToDut_3();
-            break;
-        case 4:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 4 : 2b: TH Waits for fullMotionDuration seconds movement(s) on the device\n");
-            err = Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4();
-            break;
-        case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_6();
-            break;
-        case 7:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 7 : 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_8();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
     void OnStatusUpdate(const chip::app::StatusIB & status) override
@@ -64897,15 +64018,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -64919,110 +64031,138 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 9;
+    const uint16_t mTestCount = 6;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mFastMotionDuration;
-    chip::Optional<uint16_t> mFullMotionDuration;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
+    CHIP_ERROR TestReadAttributeApplicationLauncherList_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+        [cluster readAttributeCatalogListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute Application Launcher list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("CatalogList", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 123U));
+                VerifyOrReturn(CheckValue("", actualValue[1], 456U));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test2aThSendsUpOrOpenCommandToDut_3()
+    CHIP_ERROR TestReadAttributeApplicationLauncherApp_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2a: TH sends UpOrOpen command to DUT Error: %@", err);
+        [cluster readAttributeCurrentAppWithCompletionHandler:^(
+            CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute application launcher app Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNull("CurrentApp", actualValue));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_5()
+    CHIP_ERROR TestLaunchAppCommand_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        __auto_type * params = [[CHIPApplicationLauncherClusterLaunchAppParams alloc] init];
+        params.application = [[CHIPApplicationLauncherClusterApplication alloc] init];
+        ((CHIPApplicationLauncherClusterApplication *) params.application).catalogVendorId =
+            [NSNumber numberWithUnsignedShort:123U];
+        ((CHIPApplicationLauncherClusterApplication *) params.application).applicationId = @"applicationId";
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        params.data = [[NSData alloc] initWithBytes:"data" length:4];
+        [cluster launchAppWithParams:params
+                   completionHandler:^(
+                       CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
+                       NSLog(@"Launch App Command Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 0U));
-            }
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                       {
+                           id actualValue = values.status;
+                           VerifyOrReturn(CheckValue("status", actualValue, 0));
+                       }
+
+                       {
+                           id actualValue = values.data;
+                           VerifyOrReturn(CheckValueAsString("data", actualValue, [[NSData alloc] initWithBytes:"data" length:4]));
+                       }
+
+                       NextTest();
+                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_6()
+    CHIP_ERROR TestStopAppCommand_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
+        __auto_type * params = [[CHIPApplicationLauncherClusterStopAppParams alloc] init];
+        params.application = [[CHIPApplicationLauncherClusterApplication alloc] init];
+        ((CHIPApplicationLauncherClusterApplication *) params.application).catalogVendorId =
+            [NSNumber numberWithUnsignedShort:123U];
+        ((CHIPApplicationLauncherClusterApplication *) params.application).applicationId = @"applicationId";
+
         [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
+            stopAppWithParams:params
+            completionHandler:^(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
+                NSLog(@"Stop App Command Error: %@", err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                 {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 0));
+                    id actualValue = values.status;
+                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                }
+
+                {
+                    id actualValue = values.data;
+                    VerifyOrReturn(CheckValueAsString("data", actualValue, [[NSData alloc] initWithBytes:"data" length:4]));
                 }
 
                 NextTest();
@@ -65031,46 +64171,35 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_7()
+    CHIP_ERROR TestHideAppCommand_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
+                                                                                           endpoint:1
+                                                                                              queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 0U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_8()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        __auto_type * params = [[CHIPApplicationLauncherClusterHideAppParams alloc] init];
+        params.application = [[CHIPApplicationLauncherClusterApplication alloc] init];
+        ((CHIPApplicationLauncherClusterApplication *) params.application).catalogVendorId =
+            [NSNumber numberWithUnsignedShort:123U];
+        ((CHIPApplicationLauncherClusterApplication *) params.application).applicationId = @"applicationId";
 
         [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+            hideAppWithParams:params
+            completionHandler:^(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
+                NSLog(@"Hide App Command Error: %@", err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                 {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 0));
+                    id actualValue = values.status;
+                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                }
+
+                {
+                    id actualValue = values.data;
+                    VerifyOrReturn(CheckValueAsString("data", actualValue, [[NSData alloc] initWithBytes:"data" length:4]));
                 }
 
                 NextTest();
@@ -65080,23 +64209,21 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge {
     }
 };
 
-class Test_TC_WNCV_3_5 : public TestCommandBridge {
+class TV_KeypadInputCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_3_5()
-        : TestCommandBridge("Test_TC_WNCV_3_5")
+    TV_KeypadInputCluster()
+        : TestCommandBridge("TV_KeypadInputCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("fastMotionDuration", 0, UINT16_MAX, &mFastMotionDuration);
-        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_3_5() {}
+    ~TV_KeypadInputCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -65104,11 +64231,11 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_5\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_KeypadInputCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_3_5\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_KeypadInputCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -65121,63 +64248,12 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 1 : 1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1();
-            break;
-        case 2:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 2 : 1b: TH Waits for fastMotionDuration seconds movement(s) on the device\n");
-            err = Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 2a: TH sends DownOrClose command to DUT\n");
-            err = Test2aThSendsDownOrCloseCommandToDut_3();
-            break;
-        case 4:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 4 : 2b: TH Waits for fullMotionDuration seconds movement(s) on the device\n");
-            err = Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4();
-            break;
-        case 5:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 5 : 3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 6 : 3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_6();
-            break;
-        case 7:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 7 : 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_8();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Key Command\n");
+            err = TestSendKeyCommand_1();
             break;
         }
 
@@ -65196,27 +64272,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -65230,183 +64285,343 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 9;
+    const uint16_t mTestCount = 2;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mFastMotionDuration;
-    chip::Optional<uint16_t> mFullMotionDuration;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1()
+    CHIP_ERROR TestSendKeyCommand_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends UpOrOpen command to preposition the DUT in the opposite direction Error: %@", err);
+        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
+        params.keyCode = [NSNumber numberWithUnsignedChar:3];
+        [cluster sendKeyWithParams:params
+                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Send Key Command Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                     {
+                         id actualValue = values.status;
+                         VerifyOrReturn(CheckValue("status", actualValue, 0));
+                     }
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test1bThWaitsForFastMotionDurationSecondsMovementsOnTheDevice_2()
+class TV_AccountLoginCluster : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    TV_AccountLoginCluster()
+        : TestCommandBridge("TV_AccountLoginCluster")
+        , mTestIndex(0)
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL;
-        return WaitForMs("alpha", value);
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR Test2aThSendsDownOrCloseCommandToDut_3()
+    ~TV_AccountLoginCluster() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2a: TH sends DownOrClose command to DUT Error: %@", err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: TV_AccountLoginCluster\n");
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: TV_AccountLoginCluster\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            NextTest();
-        }];
+        Wait();
 
-        return CHIP_NO_ERROR;
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Get Setup PIN Command\n");
+            err = TestGetSetupPinCommand_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Login Command\n");
+            err = TestLoginCommand_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Logout Command\n");
+            err = TestLogoutCommand_3();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR Test2bThWaitsForFullMotionDurationSecondsMovementsOnTheDevice_4()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 4;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test3aIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_5()
+    CHIP_ERROR TestGetSetupPinCommand_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3a: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        __auto_type * params = [[CHIPAccountLoginClusterGetSetupPINParams alloc] init];
+        params.tempAccountIdentifier = @"asdf";
+        [cluster
+            getSetupPINWithParams:params
+                completionHandler:^(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable err) {
+                    NSLog(@"Get Setup PIN Command Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 10000U));
-            }
+                    {
+                        id actualValue = values.setupPIN;
+                        VerifyOrReturn(CheckValueAsString("setupPIN", actualValue, @"tempPin123"));
+                    }
 
-            NextTest();
-        }];
+                    NextTest();
+                }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3bIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_6()
+    CHIP_ERROR TestLoginCommand_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3b: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPAccountLoginClusterLoginParams alloc] init];
+        params.tempAccountIdentifier = @"asdf";
+        params.setupPIN = @"tempPin123";
+        [cluster loginWithParams:params
+               completionHandler:^(NSError * _Nullable err) {
+                   NSLog(@"Login Command Error: %@", err);
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 100));
-                }
+                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                NextTest();
-            }];
+                   NextTest();
+               }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_7()
+    CHIP_ERROR TestLogoutCommand_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster logoutWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Logout Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 10000U));
-            }
-
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
+};
+
+class TV_WakeOnLanCluster : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    TV_WakeOnLanCluster()
+        : TestCommandBridge("TV_WakeOnLanCluster")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~TV_WakeOnLanCluster() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: TV_WakeOnLanCluster\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: TV_WakeOnLanCluster\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read mac address\n");
+            err = TestReadMacAddress_1();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 2;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
 
-    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_8()
+    CHIP_ERROR TestReadMacAddress_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestWakeOnLan * cluster = [[CHIPTestWakeOnLan alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+        [cluster readAttributeMACAddressWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read mac address Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 100));
-                }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueAsString("MACAddress", actualValue, @"00:00:00:00:00"));
+            }
 
-                NextTest();
-            }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_WNCV_4_1 : public TestCommandBridge {
+class TV_ApplicationBasicCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_4_1()
-        : TestCommandBridge("Test_TC_WNCV_4_1")
+    TV_ApplicationBasicCluster()
+        : TestCommandBridge("TV_ApplicationBasicCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_4_1() {}
+    ~TV_ApplicationBasicCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -65414,11 +64629,11 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_1\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationBasicCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_1\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_ApplicationBasicCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -65431,120 +64646,40 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute vendor name\n");
+            err = TestReadAttributeVendorName_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH waits for x seconds movement(s) on the DUT\n");
-            err = Test1bThWaitsForXSecondsMovementsOnTheDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute vendor id\n");
+            err = TestReadAttributeVendorId_2();
             break;
         case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : 1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute application name\n");
+            err = TestReadAttributeApplicationName_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 2a: TH sends GoToLiftPercentage command with 25 percent to DUT\n");
-            if (ShouldSkip("WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test2aThSendsGoToLiftPercentageCommandWith25PercentToDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute product id\n");
+            err = TestReadAttributeProductId_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : 2b: DUT updates its attributes\n");
-            err = Test2bDutUpdatesItsAttributes_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute application status\n");
+            err = TestReadAttributeApplicationStatus_5();
             break;
         case 6:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 6 : 2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute application status\n");
+            err = TestReadAttributeApplicationStatus_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : 3a: TH set a timeout of X minutes for failure\n");
-            err = Test3aThSetATimeoutOfXMinutesForFailure_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute application version\n");
+            err = TestReadAttributeApplicationVersion_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : 3b: TH reads OperationalStatus attribute from DUT\n");
-            err = Test3bThReadsOperationalStatusAttributeFromDut_8();
-            break;
-        case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : 3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 10 : 3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : 4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT\n");
-            if (ShouldSkip("WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test4aThSendsGoToLiftPercentageCommandWith7520PercentToDut_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : 4b: DUT updates its attributes\n");
-            err = Test4bDutUpdatesItsAttributes_12();
-            break;
-        case 13:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 13 : 4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test4cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : 5a: TH waits for x seconds movement(s) on the DUT\n");
-            err = Test5aThWaitsForXSecondsMovementsOnTheDut_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 5b: TH reads OperationalStatus attribute from DUT\n");
-            err = Test5bThReadsOperationalStatusAttributeFromDut_15();
-            break;
-        case 16:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 16 : 5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test5cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 17 : 5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_LF && WNCV_LF && A_CURRENTPOSITIONLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test5dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute application allowed vendor list\n");
+            err = TestReadAttributeApplicationAllowedVendorList_8();
             break;
         }
 
@@ -65584,33 +64719,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -65624,59 +64732,60 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 9;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mFullMotionDuration;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
+    CHIP_ERROR TestReadAttributeVendorName_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute vendor name Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueAsString("VendorName", actualValue, @"exampleVendorName1"));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1bThWaitsForXSecondsMovementsOnTheDut_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test1cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_3()
+    CHIP_ERROR TestReadAttributeVendorId_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute vendor id Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercent100ths", value, 0U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("VendorID", actualValue, 1U));
             }
 
             NextTest();
@@ -65685,78 +64794,46 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2aThSendsGoToLiftPercentageCommandWith25PercentToDut_4()
+    CHIP_ERROR TestReadAttributeApplicationName_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:2500U];
-        [cluster goToLiftPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"2a: TH sends GoToLiftPercentage command with 25 percent to DUT Error: %@", err);
+        [cluster readAttributeApplicationNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute application name Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueAsString("ApplicationName", actualValue, @"exampleName1"));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2bDutUpdatesItsAttributes_5()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 100UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test2cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 2500U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test3aThSetATimeoutOfXMinutesForFailure_7()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test3bThReadsOperationalStatusAttributeFromDut_8()
+    CHIP_ERROR TestReadAttributeProductId_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeProductIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute product id Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+                VerifyOrReturn(CheckValue("ProductID", actualValue, 1U));
             }
 
             NextTest();
@@ -65765,22 +64842,22 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_9()
+    CHIP_ERROR TestReadAttributeApplicationStatus_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute application status Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 2500U));
+                VerifyOrReturn(CheckValue("Status", actualValue, 0));
             }
 
             NextTest();
@@ -65789,73 +64866,26 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_10()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 25));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test4aThSendsGoToLiftPercentageCommandWith7520PercentToDut_11()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:7520U];
-        [cluster goToLiftPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"4a: TH sends GoToLiftPercentage command with 75.20 percent to DUT Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR Test4bDutUpdatesItsAttributes_12()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 100UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test4cIfPaLfThReadsTargetPositionLiftPercent100thsAttributeFromDut_13()
+    CHIP_ERROR TestReadAttributeApplicationStatus_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4c: If (PA & LF) TH reads TargetPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeApplicationWithCompletionHandler:^(
+            CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute application status Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionLiftPercent100ths", actualValue, 7520U));
+                VerifyOrReturn(CheckValue("catalogVendorId",
+                    ((CHIPApplicationBasicClusterApplicationBasicApplication *) actualValue).catalogVendorId, 123U));
+                VerifyOrReturn(CheckValueAsString("applicationId",
+                    ((CHIPApplicationBasicClusterApplicationBasicApplication *) actualValue).applicationId, @"applicationId"));
             }
 
             NextTest();
@@ -65864,27 +64894,22 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5aThWaitsForXSecondsMovementsOnTheDut_14()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test5bThReadsOperationalStatusAttributeFromDut_15()
+    CHIP_ERROR TestReadAttributeApplicationVersion_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+        [cluster readAttributeApplicationVersionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute application version Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+                VerifyOrReturn(CheckValueAsString("ApplicationVersion", actualValue, @"exampleVersion"));
             }
 
             NextTest();
@@ -65893,22 +64918,24 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5cIfPaLfThReadsCurrentPositionLiftPercent100thsAttributeFromDut_16()
+    CHIP_ERROR TestReadAttributeApplicationAllowedVendorList_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
+                                                                                     endpoint:3
+                                                                                        queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5c: If (PA & LF) TH reads CurrentPositionLiftPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeAllowedVendorListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute application allowed vendor list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionLiftPercent100ths", actualValue, 7520U));
+                VerifyOrReturn(CheckValue("AllowedVendorList", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 1U));
+                VerifyOrReturn(CheckValue("", actualValue[1], 456U));
             }
 
             NextTest();
@@ -65916,48 +64943,23 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-
-    CHIP_ERROR Test5dIfPaLfThReadsCurrentPositionLiftPercentageOptionalAttributeFromDut_17()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"5d: If (PA & LF) TH reads CurrentPositionLiftPercentage optional attribute from DUT Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionLiftPercentage", actualValue, 75));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
 };
 
-class Test_TC_WNCV_4_2 : public TestCommandBridge {
+class TV_MediaPlaybackCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_4_2()
-        : TestCommandBridge("Test_TC_WNCV_4_2")
+    TV_MediaPlaybackCluster()
+        : TestCommandBridge("TV_MediaPlaybackCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("fullMotionDuration", 0, UINT16_MAX, &mFullMotionDuration);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_4_2() {}
+    ~TV_MediaPlaybackCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -65965,11 +64967,11 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_2\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_MediaPlaybackCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_2\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_MediaPlaybackCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -65982,120 +64984,92 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 1 : 1a: TH sends DownOrClose command to preposition the DUT in the opposite direction\n");
-            err = Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute playback state\n");
+            err = TestReadAttributePlaybackState_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: TH waits for x seconds movement(s) on the DUT\n");
-            err = Test1bThWaitsForXSecondsMovementsOnTheDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute start time\n");
+            err = TestReadAttributeStartTime_2();
             break;
         case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : 1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test1cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute duration\n");
+            err = TestReadAttributeDuration_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 2a: TH sends GoToTiltPercentage command with 30 percent to DUT\n");
-            if (ShouldSkip("WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test2aThSendsGoToTiltPercentageCommandWith30PercentToDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute position\n");
+            err = TestReadAttributePosition_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : 2b: DUT updates its attributes\n");
-            err = Test2bDutUpdatesItsAttributes_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute playback speed\n");
+            err = TestReadAttributePlaybackSpeed_5();
             break;
         case 6:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 6 : 2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test2cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute seek range end\n");
+            err = TestReadAttributeSeekRangeEnd_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : 3a: TH set a timeout of X minutes for failure\n");
-            err = Test3aThSetATimeoutOfXMinutesForFailure_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute seek range start\n");
+            err = TestReadAttributeSeekRangeStart_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : 3b: TH reads OperationalStatus attribute from DUT\n");
-            err = Test3bThReadsOperationalStatusAttributeFromDut_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Media Playback Play Command\n");
+            err = TestMediaPlaybackPlayCommand_8();
             break;
         case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : 3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Media Playback Pause Command\n");
+            err = TestMediaPlaybackPauseCommand_9();
             break;
         case 10:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 10 : 3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Media Playback Stop Command\n");
+            err = TestMediaPlaybackStopCommand_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : 4a: TH sends GoToTiltPercentage command with 60.20 percent to DUT\n");
-            if (ShouldSkip("WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test4aThSendsGoToTiltPercentageCommandWith6020PercentToDut_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Media Playback Start Over Command\n");
+            err = TestMediaPlaybackStartOverCommand_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : 4b: DUT updates its attributes\n");
-            err = Test4bDutUpdatesItsAttributes_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Media Playback Previous Command\n");
+            err = TestMediaPlaybackPreviousCommand_12();
             break;
         case 13:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 13 : 4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test4cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Media Playback Next Command\n");
+            err = TestMediaPlaybackNextCommand_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : 5a: TH waits for x seconds movement(s) on the DUT\n");
-            err = Test5aThWaitsForXSecondsMovementsOnTheDut_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Media Playback Rewind Command\n");
+            err = TestMediaPlaybackRewindCommand_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 5b: TH reads OperationalStatus attribute from DUT\n");
-            err = Test5bThReadsOperationalStatusAttributeFromDut_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Media Playback Fast Forward Command\n");
+            err = TestMediaPlaybackFastForwardCommand_15();
             break;
         case 16:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 16 : 5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test5cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Media Playback Skip Forward Command\n");
+            err = TestMediaPlaybackSkipForwardCommand_16();
             break;
         case 17:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 17 : 5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT\n");
-            if (ShouldSkip("WNCV_PA_TL && WNCV_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test5dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Read attribute position after skip forward\n");
+            err = TestReadAttributePositionAfterSkipForward_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Media Playback Skip Backward Command\n");
+            err = TestMediaPlaybackSkipBackwardCommand_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Read attribute position after skip backward\n");
+            err = TestReadAttributePositionAfterSkipBackward_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Media Playback Seek Command\n");
+            err = TestMediaPlaybackSeekCommand_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Read attribute position after seek\n");
+            err = TestReadAttributePositionAfterSeek_21();
             break;
         }
 
@@ -66162,6 +65136,18 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -66175,59 +65161,57 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 22;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mFullMotionDuration;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1()
+    CHIP_ERROR TestReadAttributePlaybackState_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1a: TH sends DownOrClose command to preposition the DUT in the opposite direction Error: %@", err);
+        [cluster readAttributeCurrentStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute playback state Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("CurrentState", actualValue, 0));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test1bThWaitsForXSecondsMovementsOnTheDut_2()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test1cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_3()
+    CHIP_ERROR TestReadAttributeStartTime_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeStartTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute start time Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercent100ths", value, 0U));
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("StartTime", actualValue));
+                VerifyOrReturn(CheckValue("StartTime", actualValue, 0ULL));
             }
 
             NextTest();
@@ -66236,49 +65220,47 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2aThSendsGoToTiltPercentageCommandWith30PercentToDut_4()
+    CHIP_ERROR TestReadAttributeDuration_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:3000U];
-        [cluster goToTiltPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"2a: TH sends GoToTiltPercentage command with 30 percent to DUT Error: %@", err);
+        [cluster readAttributeDurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute duration Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("Duration", actualValue));
+                VerifyOrReturn(CheckValue("Duration", actualValue, 80000ULL));
+            }
 
-        return CHIP_NO_ERROR;
-    }
+            NextTest();
+        }];
 
-    CHIP_ERROR Test2bDutUpdatesItsAttributes_5()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 100UL;
-        return WaitForMs("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_6()
+    CHIP_ERROR TestReadAttributePosition_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"2c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeSampledPositionWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute position Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 3000U));
+                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
+                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
+                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
+                VerifyOrReturn(CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 0ULL));
             }
 
             NextTest();
@@ -66287,27 +65269,20 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aThSetATimeoutOfXMinutesForFailure_7()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR Test3bThReadsOperationalStatusAttributeFromDut_8()
+    CHIP_ERROR TestReadAttributePlaybackSpeed_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+        [cluster readAttributePlaybackSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute playback speed Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+                VerifyOrReturn(CheckValue("PlaybackSpeed", actualValue, 0.0f));
             }
 
             NextTest();
@@ -66316,22 +65291,21 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_9()
+    CHIP_ERROR TestReadAttributeSeekRangeEnd_6()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster readAttributeSeekRangeEndWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute seek range end Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 3000U));
+                VerifyOrReturn(CheckValueNonNull("SeekRangeEnd", actualValue));
+                VerifyOrReturn(CheckValue("SeekRangeEnd", actualValue, 80000ULL));
             }
 
             NextTest();
@@ -66340,73 +65314,77 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_10()
+    CHIP_ERROR TestReadAttributeSeekRangeStart_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"3d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+        [cluster readAttributeSeekRangeStartWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute seek range start Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 30));
-                }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("SeekRangeStart", actualValue));
+                VerifyOrReturn(CheckValue("SeekRangeStart", actualValue, 0ULL));
+            }
 
-                NextTest();
-            }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4aThSendsGoToTiltPercentageCommandWith6020PercentToDut_11()
+    CHIP_ERROR TestMediaPlaybackPlayCommand_8()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:6005U];
-        [cluster goToTiltPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"4a: TH sends GoToTiltPercentage command with 60.20 percent to DUT Error: %@", err);
+        [cluster playWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Play Command Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+            {
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
 
-        return CHIP_NO_ERROR;
-    }
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+            }
 
-    CHIP_ERROR Test4bDutUpdatesItsAttributes_12()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 100UL;
-        return WaitForMs("alpha", value);
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4cIfPaTlThReadsTargetPositionTiltPercent100thsAttributeFromDut_13()
+    CHIP_ERROR TestMediaPlaybackPauseCommand_9()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"4c: If (PA & TL) TH reads TargetPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster pauseWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Pause Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("TargetPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("TargetPositionTiltPercent100ths", actualValue, 6005U));
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
+
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
             }
 
             NextTest();
@@ -66415,27 +65393,54 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5aThWaitsForXSecondsMovementsOnTheDut_14()
+    CHIP_ERROR TestMediaPlaybackStopCommand_10()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = mFullMotionDuration.HasValue() ? mFullMotionDuration.Value() : 6000UL;
-        return WaitForMs("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster stopPlaybackWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Stop Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
+
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5bThReadsOperationalStatusAttributeFromDut_15()
+    CHIP_ERROR TestMediaPlaybackStartOverCommand_11()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5b: TH reads OperationalStatus attribute from DUT Error: %@", err);
+        [cluster startOverWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Start Over Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OperationalStatus", actualValue, 0));
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
+
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
             }
 
             NextTest();
@@ -66444,22 +65449,26 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5cIfPaTlThReadsCurrentPositionTiltPercent100thsAttributeFromDut_16()
+    CHIP_ERROR TestMediaPlaybackPreviousCommand_12()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"5c: If (PA & TL) TH reads CurrentPositionTiltPercent100ths attribute from DUT Error: %@", err);
+        [cluster previousWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Previous Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
-                VerifyOrReturn(CheckValue("CurrentPositionTiltPercent100ths", actualValue, 6005U));
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
+
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
             }
 
             NextTest();
@@ -66468,182 +65477,139 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test5dIfPaTlThReadsCurrentPositionTiltPercentageOptionalAttributeFromDut_17()
+    CHIP_ERROR TestMediaPlaybackNextCommand_13()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"5d: If (PA & TL) TH reads CurrentPositionTiltPercentage optional attribute from DUT Error: %@", err);
+        [cluster nextWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Next Command Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercentage", actualValue));
-                    VerifyOrReturn(CheckValue("CurrentPositionTiltPercentage", actualValue, 60));
-                }
+            {
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
 
-                NextTest();
-            }];
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class Test_TC_WNCV_4_3 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_4_3()
-        : TestCommandBridge("Test_TC_WNCV_4_3")
-        , mTestIndex(0)
+    CHIP_ERROR TestMediaPlaybackRewindCommand_14()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~Test_TC_WNCV_4_3() {}
+        [cluster rewindWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Rewind Command Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_3\n");
-        }
+            {
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
+            }
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_3\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+            }
 
-        Wait();
+            NextTest();
+        }];
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 1 : 1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test1aIfPaLfLfThReadsCurrentPositionLiftPercent100thsFromDut_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 2b: TH sends GoToLiftPercentage command with BadParam to DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test2bThSendsGoToLiftPercentageCommandWithBadParamToDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 3a: TH sends GoToLiftPercentage command with 10001 to DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
-                NextTest();
-                return;
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestMediaPlaybackFastForwardCommand_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster fastForwardWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+            NSLog(@"Media Playback Fast Forward Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = values.status;
+                VerifyOrReturn(CheckValue("status", actualValue, 0));
             }
-            err = Test3aThSendsGoToLiftPercentageCommandWith10001ToDut_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF || WNCV_LF && CR_GOTOLIFTPERCENTAGE")) {
-                NextTest();
-                return;
+
+            {
+                id actualValue = values.data;
+                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
             }
-            err = Test4aThSendsGoToLiftPercentageCommandWith0xFFFFToDut_4();
-            break;
-        }
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestMediaPlaybackSkipForwardCommand_16()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+        __auto_type * params = [[CHIPMediaPlaybackClusterSkipForwardParams alloc] init];
+        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:500ULL];
+        [cluster
+            skipForwardWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+                    NSLog(@"Media Playback Skip Forward Command Error: %@", err);
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 5;
+                    {
+                        id actualValue = values.status;
+                        VerifyOrReturn(CheckValue("status", actualValue, 0));
+                    }
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+                    {
+                        id actualValue = values.data;
+                        VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+                    }
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+                    NextTest();
+                }];
+
+        return CHIP_NO_ERROR;
     }
-    NSNumber * _Nullable attrCurrentPositionLiftPercent100ths;
 
-    CHIP_ERROR Test1aIfPaLfLfThReadsCurrentPositionLiftPercent100thsFromDut_1()
+    CHIP_ERROR TestReadAttributePositionAfterSkipForward_17()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1a: If (PA_LF & LF) TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+        [cluster readAttributeSampledPositionWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute position after skip forward Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionLiftPercent100ths", [value unsignedShortValue], 10000U));
-            }
             {
-                attrCurrentPositionLiftPercent100ths = value;
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
+                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
+                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
+                VerifyOrReturn(CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 500ULL));
             }
 
             NextTest();
@@ -66652,69 +65618,126 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2bThSendsGoToLiftPercentageCommandWithBadParamToDut_2()
+    CHIP_ERROR TestMediaPlaybackSkipBackwardCommand_18()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:12288U];
-        [cluster goToLiftPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"2b: TH sends GoToLiftPercentage command with BadParam to DUT Error: %@", err);
+        __auto_type * params = [[CHIPMediaPlaybackClusterSkipBackwardParams alloc] init];
+        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:100ULL];
+        [cluster
+            skipBackwardWithParams:params
+                 completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Media Playback Skip Backward Command Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                NextTest();
-                            }];
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.status;
+                         VerifyOrReturn(CheckValue("status", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.data;
+                         VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+                     }
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aThSendsGoToLiftPercentageCommandWith10001ToDut_3()
+    CHIP_ERROR TestReadAttributePositionAfterSkipBackward_19()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:10001U];
-        [cluster goToLiftPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"3a: TH sends GoToLiftPercentage command with 10001 to DUT Error: %@", err);
+        [cluster readAttributeSampledPositionWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute position after skip backward Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                NextTest();
-                            }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
+                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
+                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
+                VerifyOrReturn(CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 400ULL));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4aThSendsGoToLiftPercentageCommandWith0xFFFFToDut_4()
+    CHIP_ERROR TestMediaPlaybackSeekCommand_20()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:65535U];
-        [cluster goToLiftPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"4a: TH sends GoToLiftPercentage command with 0xFFFF to DUT Error: %@", err);
+        __auto_type * params = [[CHIPMediaPlaybackClusterSeekParams alloc] init];
+        params.position = [NSNumber numberWithUnsignedLongLong:1000ULL];
+        [cluster seekWithParams:params
+              completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
+                  NSLog(@"Media Playback Seek Command Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                NextTest();
-                            }];
+                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                  {
+                      id actualValue = values.status;
+                      VerifyOrReturn(CheckValue("status", actualValue, 0));
+                  }
+
+                  {
+                      id actualValue = values.data;
+                      VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+                  }
+
+                  NextTest();
+              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadAttributePositionAfterSeek_21()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeSampledPositionWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute position after seek Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
+                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
+                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
+                VerifyOrReturn(
+                    CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 1000ULL));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_WNCV_4_4 : public TestCommandBridge {
+class TV_ChannelCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_4_4()
-        : TestCommandBridge("Test_TC_WNCV_4_4")
+    TV_ChannelCluster()
+        : TestCommandBridge("TV_ChannelCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -66724,7 +65747,7 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_4_4() {}
+    ~TV_ChannelCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -66732,11 +65755,11 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_4\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_ChannelCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_4\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_ChannelCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -66749,49 +65772,32 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0: Wait for the commissioned device to be retrieved\n");
-            err = Test0WaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 1 : 1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test1aIfPaTlTlThReadsCurrentPositionTiltPercent100thsFromDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Channel list\n");
+            err = TestReadAttributeChannelList_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : 1b: If (PA_TL & TL) TH reads CurrentPositionTiltPercentage from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL && A_CURRENTPOSITIONTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test1bIfPaTlTlThReadsCurrentPositionTiltPercentageFromDut_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute channel lineup\n");
+            err = TestReadAttributeChannelLineup_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 2b: TH sends GoToTiltPercentage command with BadParam to DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL || WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test2bThSendsGoToTiltPercentageCommandWithBadParamToDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute current channel\n");
+            err = TestReadAttributeCurrentChannel_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 3a: TH sends GoToTiltPercentage command with 10001 to DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL || WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test3aThSendsGoToTiltPercentageCommandWith10001ToDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Change Channel Command\n");
+            err = TestChangeChannelCommand_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : 4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL || WNCV_TL && CR_GOTOTILTPERCENTAGE")) {
-                NextTest();
-                return;
-            }
-            err = Test4aThSendsGoToTiltPercentageCommandWith0xFFFFToDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Change Channel By Number Command\n");
+            err = TestChangeChannelByNumberCommand_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Skip Channel Command\n");
+            err = TestSkipChannelCommand_6();
             break;
         }
 
@@ -66814,13 +65820,16 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         }
 
@@ -66835,43 +65844,63 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
+    const uint16_t mTestCount = 7;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
-    NSNumber * _Nullable attrCurrentPositionTiltPercent100ths;
 
-    CHIP_ERROR Test1aIfPaTlTlThReadsCurrentPositionTiltPercent100thsFromDut_1()
+    CHIP_ERROR TestReadAttributeChannelList_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"1a: If (PA_TL & TL) TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
+        [cluster readAttributeChannelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute Channel list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<chip::Percent100ths>(
-                    "currentPositionTiltPercent100ths", [value unsignedShortValue], 10000U));
-            }
             {
-                attrCurrentPositionTiltPercent100ths = value;
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ChannelList", [actualValue count], static_cast<uint32_t>(4)));
+                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[0]).majorNumber, 6U));
+                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[0]).minorNumber, 0U));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[0]).name, @"ABC"));
+                VerifyOrReturn(
+                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[0]).callSign, @"KAAL-TV"));
+                VerifyOrReturn(CheckValueAsString(
+                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[0]).affiliateCallSign, @"KAAL"));
+                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[1]).majorNumber, 9U));
+                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[1]).minorNumber, 1U));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[1]).name, @"PBS"));
+                VerifyOrReturn(
+                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[1]).callSign, @"KCTS-TV"));
+                VerifyOrReturn(CheckValueAsString(
+                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[1]).affiliateCallSign, @"KCTS"));
+                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[2]).majorNumber, 9U));
+                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[2]).minorNumber, 2U));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[2]).name, @"PBS Kids"));
+                VerifyOrReturn(
+                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[2]).callSign, @"KCTS-TV"));
+                VerifyOrReturn(CheckValueAsString(
+                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[2]).affiliateCallSign, @"KCTS"));
+                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[3]).majorNumber, 9U));
+                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[3]).minorNumber, 3U));
+                VerifyOrReturn(
+                    CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[3]).name, @"World Channel"));
+                VerifyOrReturn(
+                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[3]).callSign, @"KCTS-TV"));
+                VerifyOrReturn(CheckValueAsString(
+                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[3]).affiliateCallSign, @"KCTS"));
             }
 
             NextTest();
@@ -66879,30 +65908,29 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nullable attrCurrentPositionTiltPercentage;
 
-    CHIP_ERROR Test1bIfPaTlTlThReadsCurrentPositionTiltPercentageFromDut_2()
+    CHIP_ERROR TestReadAttributeChannelLineup_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster
-            readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"1b: If (PA_TL & TL) TH reads CurrentPositionTiltPercentage from DUT Error: %@", err);
+            readAttributeLineupWithCompletionHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Read attribute channel lineup Error: %@", err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMinValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 0));
-                }
-                if (value != nil) {
-                    VerifyOrReturn(
-                        CheckConstraintMaxValue<chip::Percent>("currentPositionTiltPercentage", [value unsignedCharValue], 100));
-                }
                 {
-                    attrCurrentPositionTiltPercentage = value;
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValueNonNull("Lineup", actualValue));
+                    VerifyOrReturn(CheckValueAsString(
+                        "operatorName", ((CHIPChannelClusterLineupInfo *) actualValue).operatorName, @"Comcast"));
+                    VerifyOrReturn(CheckValueAsString(
+                        "lineupName", ((CHIPChannelClusterLineupInfo *) actualValue).lineupName, @"Comcast King County"));
+                    VerifyOrReturn(
+                        CheckValueAsString("postalCode", ((CHIPChannelClusterLineupInfo *) actualValue).postalCode, @"98052"));
+                    VerifyOrReturn(CheckValue("lineupInfoType", ((CHIPChannelClusterLineupInfo *) actualValue).lineupInfoType, 0));
                 }
 
                 NextTest();
@@ -66911,69 +65939,114 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2bThSendsGoToTiltPercentageCommandWithBadParamToDut_3()
+    CHIP_ERROR TestReadAttributeCurrentChannel_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:12288U];
-        [cluster goToTiltPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"2b: TH sends GoToTiltPercentage command with BadParam to DUT Error: %@", err);
+        [cluster readAttributeCurrentChannelWithCompletionHandler:^(
+            CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute current channel Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                NextTest();
-                            }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue));
+                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue).majorNumber, 6U));
+                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue).minorNumber, 0U));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue).name, @"ABC"));
+                VerifyOrReturn(
+                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue).callSign, @"KAAL-TV"));
+                VerifyOrReturn(CheckValueAsString(
+                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue).affiliateCallSign, @"KAAL"));
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3aThSendsGoToTiltPercentageCommandWith10001ToDut_4()
+    CHIP_ERROR TestChangeChannelCommand_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:10001U];
-        [cluster goToTiltPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"3a: TH sends GoToTiltPercentage command with 10001 to DUT Error: %@", err);
+        __auto_type * params = [[CHIPChannelClusterChangeChannelParams alloc] init];
+        params.match = @"PBS";
+        [cluster
+            changeChannelWithParams:params
+                  completionHandler:^(CHIPChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Change Channel Command Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                NextTest();
-                            }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.data;
+                          VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test4aThSendsGoToTiltPercentageCommandWith0xFFFFToDut_5()
+    CHIP_ERROR TestChangeChannelByNumberCommand_5()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:65535U];
-        [cluster goToTiltPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"4a: TH sends GoToTiltPercentage command with 0xFFFF to DUT Error: %@", err);
+        __auto_type * params = [[CHIPChannelClusterChangeChannelByNumberParams alloc] init];
+        params.majorNumber = [NSNumber numberWithUnsignedShort:6U];
+        params.minorNumber = [NSNumber numberWithUnsignedShort:0U];
+        [cluster changeChannelByNumberWithParams:params
+                               completionHandler:^(NSError * _Nullable err) {
+                                   NSLog(@"Change Channel By Number Command Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                NextTest();
-                            }];
+                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                   NextTest();
+                               }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSkipChannelCommand_6()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPChannelClusterSkipChannelParams alloc] init];
+        params.count = [NSNumber numberWithUnsignedShort:1U];
+        [cluster skipChannelWithParams:params
+                     completionHandler:^(NSError * _Nullable err) {
+                         NSLog(@"Skip Channel Command Error: %@", err);
+
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                         NextTest();
+                     }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_WNCV_4_5 : public TestCommandBridge {
+class TV_LowPowerCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_WNCV_4_5()
-        : TestCommandBridge("Test_TC_WNCV_4_5")
+    TV_LowPowerCluster()
+        : TestCommandBridge("TV_LowPowerCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -66983,7 +66056,7 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_WNCV_4_5() {}
+    ~TV_LowPowerCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -66991,11 +66064,11 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_5\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_LowPowerCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_WNCV_4_5\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_LowPowerCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -67008,94 +66081,12 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         // incorrect mTestIndex value observed when we get the response.
         switch (mTestIndex++) {
         case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : 0a: Wait for the commissioned device to be retrieved\n");
-            err = Test0aWaitForTheCommissionedDeviceToBeRetrieved_0();
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : 0b: TH sends UpOrOpen command to preposition the DUT\n");
-            err = Test0bThSendsUpOrOpenCommandToPrepositionTheDut_1();
-            break;
-        case 2:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 2 : 1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test1aIfPaLfLfThSendsGoToLiftPercentageCommandWith90ToDut_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : 1b: TH Waits for 100ms-1s\n");
-            err = Test1bThWaitsFor100ms1s_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : 1c: TH sends StopMotion command to DUT\n");
-            err = Test1cThSendsStopMotionCommandToDut_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : 1d: TH Waits for 100ms-1s\n");
-            err = Test1dThWaitsFor100ms1s_5();
-            break;
-        case 6:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 6 : 2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test2aIfPaTlTlThSendsGoToTiltPercentageCommandWith90ToDut_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : 2b: TH Waits for 100ms-1s\n");
-            err = Test2bThWaitsFor100ms1s_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : 2c: TH sends StopMotion command to DUT\n");
-            err = Test2cThSendsStopMotionCommandToDut_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : 2d: TH Waits for 100ms-1s\n");
-            err = Test2dThWaitsFor100ms1s_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : 3a: TH reads CurrentPositionLiftPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3aThReadsCurrentPositionLiftPercent100thsFromDut_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : 3b: TH reads CurrentPositionTiltPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test3bThReadsCurrentPositionTiltPercent100thsFromDut_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : 3c: reboot/restart the DUT\n");
-            err = Test3cRebootRestartTheDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : 3d: Wait for the commissioned device to be retrieved\n");
-            err = Test3dWaitForTheCommissionedDeviceToBeRetrieved_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : 3e: TH reads CurrentPositionLiftPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_LF && WNCV_PA_LF")) {
-                NextTest();
-                return;
-            }
-            err = Test3eThReadsCurrentPositionLiftPercent100thsFromDut_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : 3f: TH reads CurrentPositionTiltPercent100ths from DUT\n");
-            if (ShouldSkip("WNCV_TL && WNCV_PA_TL")) {
-                NextTest();
-                return;
-            }
-            err = Test3fThReadsCurrentPositionTiltPercent100thsFromDut_15();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Sleep Input Status Command\n");
+            err = TestSleepInputStatusCommand_1();
             break;
         }
 
@@ -67114,48 +66105,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -67169,28 +66118,28 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 16;
+    const uint16_t mTestCount = 2;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test0aWaitForTheCommissionedDeviceToBeRetrieved_0()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
         chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
         value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test0bThSendsUpOrOpenCommandToPrepositionTheDut_1()
+    CHIP_ERROR TestSleepInputStatusCommand_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestLowPower * cluster = [[CHIPTestLowPower alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"0b: TH sends UpOrOpen command to preposition the DUT Error: %@", err);
+        [cluster sleepWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Sleep Input Status Command Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -67199,238 +66148,435 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+};
 
-    CHIP_ERROR Test1aIfPaLfLfThSendsGoToLiftPercentageCommandWith90ToDut_2()
+class TV_ContentLauncherCluster : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    TV_ContentLauncherCluster()
+        : TestCommandBridge("TV_ContentLauncherCluster")
+        , mTestIndex(0)
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:9000U];
-        [cluster goToLiftPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"1a: If (PA_LF & LF) TH sends GoToLiftPercentage command with 90%% to DUT Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    CHIP_ERROR Test1bThWaitsFor100ms1s_3()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 500UL;
-        return WaitForMs("alpha", value);
-    }
+    ~TV_ContentLauncherCluster() {}
 
-    CHIP_ERROR Test1cThSendsStopMotionCommandToDut_4()
+    /////////// TestCommand Interface /////////
+    void NextTest() override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"1c: TH sends StopMotion command to DUT Error: %@", err);
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: TV_ContentLauncherCluster\n");
+        }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: TV_ContentLauncherCluster\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-            NextTest();
-        }];
+        Wait();
 
-        return CHIP_NO_ERROR;
-    }
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute accept header list\n");
+            err = TestReadAttributeAcceptHeaderList_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute supported streaming protocols\n");
+            err = TestReadAttributeSupportedStreamingProtocols_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Launch Content Command\n");
+            err = TestLaunchContentCommand_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Launch URL Command\n");
+            err = TestLaunchUrlCommand_4();
+            break;
+        }
 
-    CHIP_ERROR Test1dThWaitsFor100ms1s_5()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 500UL;
-        return WaitForMs("alpha", value);
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR Test2aIfPaTlTlThSendsGoToTiltPercentageCommandWith90ToDut_6()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:9000U];
-        [cluster goToTiltPercentageWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"2a: If (PA_TL & TL) TH sends GoToTiltPercentage command with 90%% to DUT Error: %@", err);
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-                                NextTest();
-                            }];
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 5;
 
-        return CHIP_NO_ERROR;
-    }
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-    CHIP_ERROR Test2bThWaitsFor100ms1s_7()
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 500UL;
-        return WaitForMs("alpha", value);
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR Test2cThSendsStopMotionCommandToDut_8()
+    CHIP_ERROR TestReadAttributeAcceptHeaderList_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"2c: TH sends StopMotion command to DUT Error: %@", err);
+        [cluster readAttributeAcceptHeaderWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute accept header list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("AcceptHeader", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValueAsString("", actualValue[0], @"example"));
+                VerifyOrReturn(CheckValueAsString("", actualValue[1], @"example"));
+            }
+
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test2dThWaitsFor100ms1s_9()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 500UL;
-        return WaitForMs("alpha", value);
-    }
-    NSNumber * _Nullable attrCurrentPositionLiftPercent100ths;
-
-    CHIP_ERROR Test3aThReadsCurrentPositionLiftPercent100thsFromDut_10()
+    CHIP_ERROR TestReadAttributeSupportedStreamingProtocols_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3a: TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+        [cluster
+            readAttributeSupportedStreamingProtocolsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Read attribute supported streaming protocols Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercent100ths", value, 0U));
-            }
-            {
-                attrCurrentPositionLiftPercent100ths = value;
-            }
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("SupportedStreamingProtocols", actualValue, 0UL));
+                }
 
-            NextTest();
-        }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nullable attrCurrentPositionTiltPercent100ths;
 
-    CHIP_ERROR Test3bThReadsCurrentPositionTiltPercent100thsFromDut_11()
+    CHIP_ERROR TestLaunchContentCommand_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3b: TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercent100ths", value, 0U));
-            }
+        __auto_type * params = [[CHIPContentLauncherClusterLaunchContentParams alloc] init];
+        params.search = [[CHIPContentLauncherClusterContentSearch alloc] init];
+        {
+            NSMutableArray * temp_1 = [[NSMutableArray alloc] init];
+            temp_1[0] = [[CHIPContentLauncherClusterParameter alloc] init];
+            ((CHIPContentLauncherClusterParameter *) temp_1[0]).type = [NSNumber numberWithUnsignedChar:1];
+            ((CHIPContentLauncherClusterParameter *) temp_1[0]).value = @"exampleValue";
             {
-                attrCurrentPositionTiltPercent100ths = value;
+                NSMutableArray * temp_4 = [[NSMutableArray alloc] init];
+                temp_4[0] = [[CHIPContentLauncherClusterAdditionalInfo alloc] init];
+                ((CHIPContentLauncherClusterAdditionalInfo *) temp_4[0]).name = @"name";
+                ((CHIPContentLauncherClusterAdditionalInfo *) temp_4[0]).value = @"value";
+
+                ((CHIPContentLauncherClusterParameter *) temp_1[0]).externalIDList = temp_4;
             }
 
-            NextTest();
-        }];
+            ((CHIPContentLauncherClusterContentSearch *) params.search).parameterList = temp_1;
+        }
 
-        return CHIP_NO_ERROR;
-    }
+        params.autoPlay = [NSNumber numberWithBool:true];
+        params.data = @"exampleData";
+        [cluster
+            launchContentWithParams:params
+                  completionHandler:^(CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Launch Content Command Error: %@", err);
 
-    CHIP_ERROR Test3cRebootRestartTheDut_12()
-    {
-        chip::app::Clusters::SystemCommands::Commands::Reboot::Type value;
-        return Reboot("alpha", value);
-    }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    CHIP_ERROR Test3dWaitForTheCommissionedDeviceToBeRetrieved_13()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.data;
+                          VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData"));
+                      }
+
+                      NextTest();
+                  }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR Test3eThReadsCurrentPositionLiftPercent100thsFromDut_14()
+    CHIP_ERROR TestLaunchUrlCommand_4()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3e: TH reads CurrentPositionLiftPercent100ths from DUT Error: %@", err);
+        __auto_type * params = [[CHIPContentLauncherClusterLaunchURLParams alloc] init];
+        params.contentURL = @"exampleUrl";
+        params.displayString = @"exampleDisplayString";
+        params.brandingInformation = [[CHIPContentLauncherClusterBrandingInformation alloc] init];
+        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).providerName = @"exampleName";
+        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).background =
+            [[CHIPContentLauncherClusterStyleInformation alloc] init];
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .background)
+            .imageUrl
+            = @"exampleUrl";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .background)
+            .color
+            = @"exampleColor";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .background)
+            .size
+            = [[CHIPContentLauncherClusterDimension alloc] init];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .background)
+                .size)
+            .width
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .background)
+                .size)
+            .height
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .background)
+                .size)
+            .metric
+            = [NSNumber numberWithUnsignedChar:0];
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).logo =
+            [[CHIPContentLauncherClusterStyleInformation alloc] init];
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .logo)
+            .imageUrl
+            = @"exampleUrl";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .logo)
+            .color
+            = @"exampleColor";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .logo)
+            .size
+            = [[CHIPContentLauncherClusterDimension alloc] init];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .logo)
+                .size)
+            .width
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .logo)
+                .size)
+            .height
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .logo)
+                .size)
+            .metric
+            = [NSNumber numberWithUnsignedChar:0];
 
-            {
-                id actualValue = value;
-                if (attrCurrentPositionLiftPercent100ths == nil) {
-                    VerifyOrReturn(CheckValueNull("CurrentPositionLiftPercent100ths", actualValue));
-                } else {
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionLiftPercent100ths", actualValue));
-                    VerifyOrReturn(
-                        CheckValue("CurrentPositionLiftPercent100ths", actualValue, attrCurrentPositionLiftPercent100ths));
-                }
-            }
+        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).progressBar =
+            [[CHIPContentLauncherClusterStyleInformation alloc] init];
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .progressBar)
+            .imageUrl
+            = @"exampleUrl";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .progressBar)
+            .color
+            = @"exampleColor";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .progressBar)
+            .size
+            = [[CHIPContentLauncherClusterDimension alloc] init];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .progressBar)
+                .size)
+            .width
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .progressBar)
+                .size)
+            .height
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .progressBar)
+                .size)
+            .metric
+            = [NSNumber numberWithUnsignedChar:0];
 
-            NextTest();
-        }];
+        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).splash =
+            [[CHIPContentLauncherClusterStyleInformation alloc] init];
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .splash)
+            .imageUrl
+            = @"exampleUrl";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .splash)
+            .color
+            = @"exampleColor";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .splash)
+            .size
+            = [[CHIPContentLauncherClusterDimension alloc] init];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .splash)
+                .size)
+            .width
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .splash)
+                .size)
+            .height
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .splash)
+                .size)
+            .metric
+            = [NSNumber numberWithUnsignedChar:0];
 
-        return CHIP_NO_ERROR;
-    }
+        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).waterMark =
+            [[CHIPContentLauncherClusterStyleInformation alloc] init];
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .waterMark)
+            .imageUrl
+            = @"exampleUrl";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .waterMark)
+            .color
+            = @"exampleColor";
+        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                             params.brandingInformation)
+                .waterMark)
+            .size
+            = [[CHIPContentLauncherClusterDimension alloc] init];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .waterMark)
+                .size)
+            .width
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .waterMark)
+                .size)
+            .height
+            = [NSNumber numberWithDouble:0];
+        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
+                                                                                                      params.brandingInformation)
+                                                      .waterMark)
+                .size)
+            .metric
+            = [NSNumber numberWithUnsignedChar:0];
 
-    CHIP_ERROR Test3fThReadsCurrentPositionTiltPercent100thsFromDut_15()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        [cluster launchURLWithParams:params
+                   completionHandler:^(CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) {
+                       NSLog(@"Launch URL Command Error: %@", err);
 
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"3f: TH reads CurrentPositionTiltPercent100ths from DUT Error: %@", err);
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                       {
+                           id actualValue = values.status;
+                           VerifyOrReturn(CheckValue("status", actualValue, 0));
+                       }
 
-            {
-                id actualValue = value;
-                if (attrCurrentPositionTiltPercent100ths == nil) {
-                    VerifyOrReturn(CheckValueNull("CurrentPositionTiltPercent100ths", actualValue));
-                } else {
-                    VerifyOrReturn(CheckValueNonNull("CurrentPositionTiltPercent100ths", actualValue));
-                    VerifyOrReturn(
-                        CheckValue("CurrentPositionTiltPercent100ths", actualValue, attrCurrentPositionTiltPercent100ths));
-                }
-            }
+                       {
+                           id actualValue = values.data;
+                           VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData"));
+                       }
 
-            NextTest();
-        }];
+                       NextTest();
+                   }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class TV_TargetNavigatorCluster : public TestCommandBridge {
+class TV_MediaInputCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_TargetNavigatorCluster()
-        : TestCommandBridge("TV_TargetNavigatorCluster")
+    TV_MediaInputCluster()
+        : TestCommandBridge("TV_MediaInputCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -67440,7 +66586,7 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~TV_TargetNavigatorCluster() {}
+    ~TV_MediaInputCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -67448,11 +66594,11 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_TargetNavigatorCluster\n");
+            ChipLogProgress(chipTool, " **** Test Start: TV_MediaInputCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_TargetNavigatorCluster\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TV_MediaInputCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -67469,16 +66615,32 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Target Navigator list\n");
-            err = TestReadAttributeTargetNavigatorList_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute media input list\n");
+            err = TestReadAttributeMediaInputList_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute current navigator target\n");
-            err = TestReadAttributeCurrentNavigatorTarget_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read current media input\n");
+            err = TestReadCurrentMediaInput_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Navigate Target Request Command\n");
-            err = TestNavigateTargetRequestCommand_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Select Input Command\n");
+            err = TestSelectInputCommand_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Hide Input Status Command\n");
+            err = TestHideInputStatusCommand_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Show Input Status Command\n");
+            err = TestShowInputStatusCommand_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Rename Input Command\n");
+            err = TestRenameInputCommand_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute media input list\n");
+            err = TestReadAttributeMediaInputList_7();
             break;
         }
 
@@ -67503,6 +66665,18 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -67516,7 +66690,7 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 4;
+    const uint16_t mTestCount = 8;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -67530,26 +66704,32 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadAttributeTargetNavigatorList_1()
+    CHIP_ERROR TestReadAttributeMediaInputList_1()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeTargetListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Target Navigator list Error: %@", err);
+        [cluster readAttributeInputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute media input list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("TargetList", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("identifier", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[0]).identifier, 1));
+                VerifyOrReturn(CheckValue("InputList", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).index, 1));
+                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).inputType, 4));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).name, @"HDMI"));
                 VerifyOrReturn(
-                    CheckValueAsString("name", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[0]).name, @"exampleName"));
-                VerifyOrReturn(CheckValue("identifier", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[1]).identifier, 2));
+                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).descriptionString,
+                        @"High-Definition Multimedia Interface"));
+                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).index, 2));
+                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).inputType, 4));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).name, @"HDMI"));
                 VerifyOrReturn(
-                    CheckValueAsString("name", ((CHIPTargetNavigatorClusterTargetInfo *) actualValue[1]).name, @"exampleName"));
+                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).descriptionString,
+                        @"High-Definition Multimedia Interface"));
             }
 
             NextTest();
@@ -67558,20 +66738,20 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCurrentNavigatorTarget_2()
+    CHIP_ERROR TestReadCurrentMediaInput_2()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeCurrentTargetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute current navigator target Error: %@", err);
+        [cluster readAttributeCurrentInputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read current media input Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("CurrentTarget", actualValue, 0));
+                VerifyOrReturn(CheckValue("CurrentInput", actualValue, 1));
             }
 
             NextTest();
@@ -67580,275 +66760,107 @@ class TV_TargetNavigatorCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestNavigateTargetRequestCommand_3()
+    CHIP_ERROR TestSelectInputCommand_3()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestTargetNavigator * cluster = [[CHIPTestTargetNavigator alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init];
-        params.target = [NSNumber numberWithUnsignedChar:1];
-        params.data = @"1";
-        [cluster navigateTargetWithParams:params
-                        completionHandler:^(
-                            CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable err) {
-                            NSLog(@"Navigate Target Request Command Error: %@", err);
+        __auto_type * params = [[CHIPMediaInputClusterSelectInputParams alloc] init];
+        params.index = [NSNumber numberWithUnsignedChar:1];
+        [cluster selectInputWithParams:params
+                     completionHandler:^(NSError * _Nullable err) {
+                         NSLog(@"Select Input Command Error: %@", err);
 
-                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                            {
-                                id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0));
-                            }
+                         NextTest();
+                     }];
 
-                            {
-                                id actualValue = values.data;
-                                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-                            }
+        return CHIP_NO_ERROR;
+    }
 
-                            NextTest();
-                        }];
+    CHIP_ERROR TestHideInputStatusCommand_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster hideInputStatusWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Hide Input Status Command Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class TV_AudioOutputCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_AudioOutputCluster()
-        : TestCommandBridge("TV_AudioOutputCluster")
-        , mTestIndex(0)
+    CHIP_ERROR TestShowInputStatusCommand_5()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~TV_AudioOutputCluster() {}
+        [cluster showInputStatusWithCompletionHandler:^(NSError * _Nullable err) {
+            NSLog(@"Show Input Status Command Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRenameInputCommand_6()
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_AudioOutputCluster\n");
-        }
+        __auto_type * params = [[CHIPMediaInputClusterRenameInputParams alloc] init];
+        params.index = [NSNumber numberWithUnsignedChar:1];
+        params.name = @"HDMI Test";
+        [cluster renameInputWithParams:params
+                     completionHandler:^(NSError * _Nullable err) {
+                         NSLog(@"Rename Input Command Error: %@", err);
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_AudioOutputCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Audio Output list\n");
-            err = TestReadAttributeAudioOutputList_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute current audio output\n");
-            err = TestReadAttributeCurrentAudioOutput_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Select Output Command\n");
-            err = TestSelectOutputCommand_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Rename Output Command\n");
-            err = TestRenameOutputCommand_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute Audio Output list\n");
-            err = TestReadAttributeAudioOutputList_5();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributeAudioOutputList_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeOutputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Audio Output list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OutputList", [actualValue count], static_cast<uint32_t>(3)));
-                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).index, 1));
-                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).outputType, 0));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).name, @"HDMI"));
-                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).index, 2));
-                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).outputType, 0));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).name, @"HDMI"));
-                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).index, 3));
-                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).outputType, 0));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).name, @"HDMI"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeCurrentAudioOutput_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentOutputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute current audio output Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("CurrentOutput", actualValue, 1));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSelectOutputCommand_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAudioOutputClusterSelectOutputParams alloc] init];
-        params.index = [NSNumber numberWithUnsignedChar:1];
-        [cluster selectOutputWithParams:params
-                      completionHandler:^(NSError * _Nullable err) {
-                          NSLog(@"Select Output Command Error: %@", err);
-
-                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                          NextTest();
-                      }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRenameOutputCommand_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAudioOutputClusterRenameOutputParams alloc] init];
-        params.index = [NSNumber numberWithUnsignedChar:1];
-        params.name = @"HDMI Test";
-        [cluster renameOutputWithParams:params
-                      completionHandler:^(NSError * _Nullable err) {
-                          NSLog(@"Rename Output Command Error: %@", err);
-
-                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                          NextTest();
-                      }];
+                         NextTest();
+                     }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeAudioOutputList_5()
+    CHIP_ERROR TestReadAttributeMediaInputList_7()
     {
         CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAudioOutput * cluster = [[CHIPTestAudioOutput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOutputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Audio Output list Error: %@", err);
+        [cluster readAttributeInputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute media input list Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OutputList", [actualValue count], static_cast<uint32_t>(3)));
-                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).index, 1));
-                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).outputType, 0));
+                VerifyOrReturn(CheckValue("InputList", [actualValue count], static_cast<uint32_t>(2)));
+                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).index, 1));
+                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).inputType, 4));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).name, @"HDMI Test"));
                 VerifyOrReturn(
-                    CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[0]).name, @"HDMI Test"));
-                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).index, 2));
-                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).outputType, 0));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[1]).name, @"HDMI"));
-                VerifyOrReturn(CheckValue("index", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).index, 3));
-                VerifyOrReturn(CheckValue("outputType", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).outputType, 0));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPAudioOutputClusterOutputInfo *) actualValue[2]).name, @"HDMI"));
+                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).descriptionString,
+                        @"High-Definition Multimedia Interface"));
+                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).index, 2));
+                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).inputType, 4));
+                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).name, @"HDMI"));
+                VerifyOrReturn(
+                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).descriptionString,
+                        @"High-Definition Multimedia Interface"));
             }
 
             NextTest();
@@ -67858,11 +66870,11 @@ class TV_AudioOutputCluster : public TestCommandBridge {
     }
 };
 
-class TV_ApplicationLauncherCluster : public TestCommandBridge {
+class TestCluster : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_ApplicationLauncherCluster()
-        : TestCommandBridge("TV_ApplicationLauncherCluster")
+    TestCluster()
+        : TestCommandBridge("TestCluster")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -67872,7 +66884,7 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~TV_ApplicationLauncherCluster() {}
+    ~TestCluster() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -67880,11 +66892,11 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationLauncherCluster\n");
+            ChipLogProgress(chipTool, " **** Test Start: TestCluster\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_ApplicationLauncherCluster\n");
+            ChipLogProgress(chipTool, " **** Test Complete: TestCluster\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -67901,3287 +66913,344 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Application Launcher list\n");
-            err = TestReadAttributeApplicationLauncherList_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Test Command\n");
+            err = TestSendTestCommand_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute application launcher app\n");
-            err = TestReadAttributeApplicationLauncherApp_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Send Test Not Handled Command\n");
+            err = TestSendTestNotHandledCommand_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Launch App Command\n");
-            err = TestLaunchAppCommand_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Send Test Specific Command\n");
+            err = TestSendTestSpecificCommand_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Stop App Command\n");
-            err = TestStopAppCommand_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Test Add Arguments Command\n");
+            err = TestSendTestAddArgumentsCommand_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Hide App Command\n");
-            err = TestHideAppCommand_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Send failing Test Add Arguments Command\n");
+            err = TestSendFailingTestAddArgumentsCommand_5();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute BOOLEAN Default Value\n");
+            err = TestReadAttributeBooleanDefaultValue_6();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Write attribute BOOLEAN True\n");
+            err = TestWriteAttributeBooleanTrue_7();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute BOOLEAN True\n");
+            err = TestReadAttributeBooleanTrue_8();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Write attribute BOOLEAN False\n");
+            err = TestWriteAttributeBooleanFalse_9();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Read attribute BOOLEAN False\n");
+            err = TestReadAttributeBooleanFalse_10();
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Read attribute BITMAP8 Default Value\n");
+            err = TestReadAttributeBitmap8DefaultValue_11();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 6;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationLauncherList_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCatalogListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Application Launcher list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("CatalogList", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 123U));
-                VerifyOrReturn(CheckValue("", actualValue[1], 456U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationLauncherApp_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentAppWithCompletionHandler:^(
-            CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application launcher app Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNull("CurrentApp", actualValue));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestLaunchAppCommand_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPApplicationLauncherClusterLaunchAppParams alloc] init];
-        params.application = [[CHIPApplicationLauncherClusterApplication alloc] init];
-        ((CHIPApplicationLauncherClusterApplication *) params.application).catalogVendorId =
-            [NSNumber numberWithUnsignedShort:123U];
-        ((CHIPApplicationLauncherClusterApplication *) params.application).applicationId = @"applicationId";
-
-        params.data = [[NSData alloc] initWithBytes:"data" length:4];
-        [cluster launchAppWithParams:params
-                   completionHandler:^(
-                       CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"Launch App Command Error: %@", err);
-
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                       {
-                           id actualValue = values.status;
-                           VerifyOrReturn(CheckValue("status", actualValue, 0));
-                       }
-
-                       {
-                           id actualValue = values.data;
-                           VerifyOrReturn(CheckValueAsString("data", actualValue, [[NSData alloc] initWithBytes:"data" length:4]));
-                       }
-
-                       NextTest();
-                   }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStopAppCommand_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPApplicationLauncherClusterStopAppParams alloc] init];
-        params.application = [[CHIPApplicationLauncherClusterApplication alloc] init];
-        ((CHIPApplicationLauncherClusterApplication *) params.application).catalogVendorId =
-            [NSNumber numberWithUnsignedShort:123U];
-        ((CHIPApplicationLauncherClusterApplication *) params.application).applicationId = @"applicationId";
-
-        [cluster
-            stopAppWithParams:params
-            completionHandler:^(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                NSLog(@"Stop App Command Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = values.status;
-                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                }
-
-                {
-                    id actualValue = values.data;
-                    VerifyOrReturn(CheckValueAsString("data", actualValue, [[NSData alloc] initWithBytes:"data" length:4]));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestHideAppCommand_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationLauncher * cluster = [[CHIPTestApplicationLauncher alloc] initWithDevice:device
-                                                                                           endpoint:1
-                                                                                              queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPApplicationLauncherClusterHideAppParams alloc] init];
-        params.application = [[CHIPApplicationLauncherClusterApplication alloc] init];
-        ((CHIPApplicationLauncherClusterApplication *) params.application).catalogVendorId =
-            [NSNumber numberWithUnsignedShort:123U];
-        ((CHIPApplicationLauncherClusterApplication *) params.application).applicationId = @"applicationId";
-
-        [cluster
-            hideAppWithParams:params
-            completionHandler:^(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
-                NSLog(@"Hide App Command Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = values.status;
-                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                }
-
-                {
-                    id actualValue = values.data;
-                    VerifyOrReturn(CheckValueAsString("data", actualValue, [[NSData alloc] initWithBytes:"data" length:4]));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_KeypadInputCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_KeypadInputCluster()
-        : TestCommandBridge("TV_KeypadInputCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_KeypadInputCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_KeypadInputCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_KeypadInputCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Write attribute BITMAP8 Max Value\n");
+            err = TestWriteAttributeBitmap8MaxValue_12();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Key Command\n");
-            err = TestSendKeyCommand_1();
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute BITMAP8 Max Value\n");
+            err = TestReadAttributeBitmap8MaxValue_13();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Write attribute BITMAP8 Min Value\n");
+            err = TestWriteAttributeBitmap8MinValue_14();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 2;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestSendKeyCommand_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestKeypadInput * cluster = [[CHIPTestKeypadInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.keyCode = [NSNumber numberWithUnsignedChar:3];
-        [cluster sendKeyWithParams:params
-                 completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Send Key Command Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.status;
-                         VerifyOrReturn(CheckValue("status", actualValue, 0));
-                     }
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_AccountLoginCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_AccountLoginCluster()
-        : TestCommandBridge("TV_AccountLoginCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_AccountLoginCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_AccountLoginCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_AccountLoginCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Read attribute BITMAP8 Min Value\n");
+            err = TestReadAttributeBitmap8MinValue_15();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Get Setup PIN Command\n");
-            err = TestGetSetupPinCommand_1();
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Read attribute BITMAP16 Default Value\n");
+            err = TestReadAttributeBitmap16DefaultValue_16();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Login Command\n");
-            err = TestLoginCommand_2();
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Write attribute BITMAP16 Max Value\n");
+            err = TestWriteAttributeBitmap16MaxValue_17();
             break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Logout Command\n");
-            err = TestLogoutCommand_3();
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Read attribute BITMAP16 Max Value\n");
+            err = TestReadAttributeBitmap16MaxValue_18();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Write attribute BITMAP16 Min Value\n");
+            err = TestWriteAttributeBitmap16MinValue_19();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Read attribute BITMAP16 Min Value\n");
+            err = TestReadAttributeBitmap16MinValue_20();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Read attribute BITMAP32 Default Value\n");
+            err = TestReadAttributeBitmap32DefaultValue_21();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Write attribute BITMAP32 Max Value\n");
+            err = TestWriteAttributeBitmap32MaxValue_22();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 4;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestGetSetupPinCommand_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAccountLoginClusterGetSetupPINParams alloc] init];
-        params.tempAccountIdentifier = @"asdf";
-        [cluster
-            getSetupPINWithParams:params
-                completionHandler:^(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable err) {
-                    NSLog(@"Get Setup PIN Command Error: %@", err);
-
-                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                    {
-                        id actualValue = values.setupPIN;
-                        VerifyOrReturn(CheckValueAsString("setupPIN", actualValue, @"tempPin123"));
-                    }
-
-                    NextTest();
-                }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestLoginCommand_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPAccountLoginClusterLoginParams alloc] init];
-        params.tempAccountIdentifier = @"asdf";
-        params.setupPIN = @"tempPin123";
-        [cluster loginWithParams:params
-               completionHandler:^(NSError * _Nullable err) {
-                   NSLog(@"Login Command Error: %@", err);
-
-                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                   NextTest();
-               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestLogoutCommand_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestAccountLogin * cluster = [[CHIPTestAccountLogin alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster logoutWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Logout Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_WakeOnLanCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_WakeOnLanCluster()
-        : TestCommandBridge("TV_WakeOnLanCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_WakeOnLanCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_WakeOnLanCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_WakeOnLanCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Read attribute BITMAP32 Max Value\n");
+            err = TestReadAttributeBitmap32MaxValue_23();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read mac address\n");
-            err = TestReadMacAddress_1();
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Write attribute BITMAP32 Min Value\n");
+            err = TestWriteAttributeBitmap32MinValue_24();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Read attribute BITMAP32 Min Value\n");
+            err = TestReadAttributeBitmap32MinValue_25();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 26:
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Read attribute BITMAP64 Default Value\n");
+            err = TestReadAttributeBitmap64DefaultValue_26();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 2;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadMacAddress_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestWakeOnLan * cluster = [[CHIPTestWakeOnLan alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeMACAddressWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read mac address Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueAsString("MACAddress", actualValue, @"00:00:00:00:00"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_ApplicationBasicCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_ApplicationBasicCluster()
-        : TestCommandBridge("TV_ApplicationBasicCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_ApplicationBasicCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationBasicCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_ApplicationBasicCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+        case 27:
+            ChipLogProgress(chipTool, " ***** Test Step 27 : Write attribute BITMAP64 Max Value\n");
+            err = TestWriteAttributeBitmap64MaxValue_27();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute vendor name\n");
-            err = TestReadAttributeVendorName_1();
+        case 28:
+            ChipLogProgress(chipTool, " ***** Test Step 28 : Read attribute BITMAP64 Max Value\n");
+            err = TestReadAttributeBitmap64MaxValue_28();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute vendor id\n");
-            err = TestReadAttributeVendorId_2();
+        case 29:
+            ChipLogProgress(chipTool, " ***** Test Step 29 : Write attribute BITMAP64 Min Value\n");
+            err = TestWriteAttributeBitmap64MinValue_29();
             break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute application name\n");
-            err = TestReadAttributeApplicationName_3();
+        case 30:
+            ChipLogProgress(chipTool, " ***** Test Step 30 : Read attribute BITMAP64 Min Value\n");
+            err = TestReadAttributeBitmap64MinValue_30();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute product id\n");
-            err = TestReadAttributeProductId_4();
+        case 31:
+            ChipLogProgress(chipTool, " ***** Test Step 31 : Read attribute INT8U Default Value\n");
+            err = TestReadAttributeInt8uDefaultValue_31();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute application status\n");
-            err = TestReadAttributeApplicationStatus_5();
+        case 32:
+            ChipLogProgress(chipTool, " ***** Test Step 32 : Write attribute INT8U Max Value\n");
+            err = TestWriteAttributeInt8uMaxValue_32();
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute application status\n");
-            err = TestReadAttributeApplicationStatus_6();
+        case 33:
+            ChipLogProgress(chipTool, " ***** Test Step 33 : Read attribute INT8U Max Value\n");
+            err = TestReadAttributeInt8uMaxValue_33();
             break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute application version\n");
-            err = TestReadAttributeApplicationVersion_7();
+        case 34:
+            ChipLogProgress(chipTool, " ***** Test Step 34 : Write attribute INT8U Min Value\n");
+            err = TestWriteAttributeInt8uMinValue_34();
             break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute application allowed vendor list\n");
-            err = TestReadAttributeApplicationAllowedVendorList_8();
+        case 35:
+            ChipLogProgress(chipTool, " ***** Test Step 35 : Read attribute INT8U Min Value\n");
+            err = TestReadAttributeInt8uMinValue_35();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 36:
+            ChipLogProgress(chipTool, " ***** Test Step 36 : Read attribute INT16U Default Value\n");
+            err = TestReadAttributeInt16uDefaultValue_36();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 37:
+            ChipLogProgress(chipTool, " ***** Test Step 37 : Write attribute INT16U Max Value\n");
+            err = TestWriteAttributeInt16uMaxValue_37();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 38:
+            ChipLogProgress(chipTool, " ***** Test Step 38 : Read attribute INT16U Max Value\n");
+            err = TestReadAttributeInt16uMaxValue_38();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 39:
+            ChipLogProgress(chipTool, " ***** Test Step 39 : Write attribute INT16U Min Value\n");
+            err = TestWriteAttributeInt16uMinValue_39();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 40:
+            ChipLogProgress(chipTool, " ***** Test Step 40 : Read attribute INT16U Min Value\n");
+            err = TestReadAttributeInt16uMinValue_40();
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 41:
+            ChipLogProgress(chipTool, " ***** Test Step 41 : Read attribute INT32U Default Value\n");
+            err = TestReadAttributeInt32uDefaultValue_41();
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 42:
+            ChipLogProgress(chipTool, " ***** Test Step 42 : Write attribute INT32U Max Value\n");
+            err = TestWriteAttributeInt32uMaxValue_42();
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 43:
+            ChipLogProgress(chipTool, " ***** Test Step 43 : Read attribute INT32U Max Value\n");
+            err = TestReadAttributeInt32uMaxValue_43();
             break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 44:
+            ChipLogProgress(chipTool, " ***** Test Step 44 : Write attribute INT32U Min Value\n");
+            err = TestWriteAttributeInt32uMinValue_44();
             break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 9;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributeVendorName_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor name Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueAsString("VendorName", actualValue, @"exampleVendorName1"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeVendorId_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute vendor id Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("VendorID", actualValue, 1U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationName_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeApplicationNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application name Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueAsString("ApplicationName", actualValue, @"exampleName1"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeProductId_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeProductIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute product id Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ProductID", actualValue, 1U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationStatus_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application status Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("Status", actualValue, 0));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationStatus_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeApplicationWithCompletionHandler:^(
-            CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application status Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("catalogVendorId",
-                    ((CHIPApplicationBasicClusterApplicationBasicApplication *) actualValue).catalogVendorId, 123U));
-                VerifyOrReturn(CheckValueAsString("applicationId",
-                    ((CHIPApplicationBasicClusterApplicationBasicApplication *) actualValue).applicationId, @"applicationId"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationVersion_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeApplicationVersionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application version Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueAsString("ApplicationVersion", actualValue, @"exampleVersion"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeApplicationAllowedVendorList_8()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestApplicationBasic * cluster = [[CHIPTestApplicationBasic alloc] initWithDevice:device
-                                                                                     endpoint:3
-                                                                                        queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAllowedVendorListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute application allowed vendor list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AllowedVendorList", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 1U));
-                VerifyOrReturn(CheckValue("", actualValue[1], 456U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_MediaPlaybackCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_MediaPlaybackCluster()
-        : TestCommandBridge("TV_MediaPlaybackCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_MediaPlaybackCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_MediaPlaybackCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_MediaPlaybackCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+        case 45:
+            ChipLogProgress(chipTool, " ***** Test Step 45 : Read attribute INT32U Min Value\n");
+            err = TestReadAttributeInt32uMinValue_45();
             break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute playback state\n");
-            err = TestReadAttributePlaybackState_1();
+        case 46:
+            ChipLogProgress(chipTool, " ***** Test Step 46 : Read attribute INT64U Default Value\n");
+            err = TestReadAttributeInt64uDefaultValue_46();
             break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute start time\n");
-            err = TestReadAttributeStartTime_2();
+        case 47:
+            ChipLogProgress(chipTool, " ***** Test Step 47 : Write attribute INT64U Max Value\n");
+            err = TestWriteAttributeInt64uMaxValue_47();
             break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute duration\n");
-            err = TestReadAttributeDuration_3();
+        case 48:
+            ChipLogProgress(chipTool, " ***** Test Step 48 : Read attribute INT64U Max Value\n");
+            err = TestReadAttributeInt64uMaxValue_48();
             break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute position\n");
-            err = TestReadAttributePosition_4();
+        case 49:
+            ChipLogProgress(chipTool, " ***** Test Step 49 : Write attribute INT64U Min Value\n");
+            err = TestWriteAttributeInt64uMinValue_49();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute playback speed\n");
-            err = TestReadAttributePlaybackSpeed_5();
+        case 50:
+            ChipLogProgress(chipTool, " ***** Test Step 50 : Read attribute INT64U Min Value\n");
+            err = TestReadAttributeInt64uMinValue_50();
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute seek range end\n");
-            err = TestReadAttributeSeekRangeEnd_6();
+        case 51:
+            ChipLogProgress(chipTool, " ***** Test Step 51 : Read attribute INT8S Default Value\n");
+            err = TestReadAttributeInt8sDefaultValue_51();
             break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute seek range start\n");
-            err = TestReadAttributeSeekRangeStart_7();
+        case 52:
+            ChipLogProgress(chipTool, " ***** Test Step 52 : Write attribute INT8S Max Value\n");
+            err = TestWriteAttributeInt8sMaxValue_52();
             break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Media Playback Play Command\n");
-            err = TestMediaPlaybackPlayCommand_8();
+        case 53:
+            ChipLogProgress(chipTool, " ***** Test Step 53 : Read attribute INT8S Max Value\n");
+            err = TestReadAttributeInt8sMaxValue_53();
             break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Media Playback Pause Command\n");
-            err = TestMediaPlaybackPauseCommand_9();
+        case 54:
+            ChipLogProgress(chipTool, " ***** Test Step 54 : Write attribute INT8S Min Value\n");
+            err = TestWriteAttributeInt8sMinValue_54();
             break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Media Playback Stop Command\n");
-            err = TestMediaPlaybackStopCommand_10();
+        case 55:
+            ChipLogProgress(chipTool, " ***** Test Step 55 : Read attribute INT8S Min Value\n");
+            err = TestReadAttributeInt8sMinValue_55();
             break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Media Playback Start Over Command\n");
-            err = TestMediaPlaybackStartOverCommand_11();
+        case 56:
+            ChipLogProgress(chipTool, " ***** Test Step 56 : Write attribute INT8S Default Value\n");
+            err = TestWriteAttributeInt8sDefaultValue_56();
             break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Media Playback Previous Command\n");
-            err = TestMediaPlaybackPreviousCommand_12();
+        case 57:
+            ChipLogProgress(chipTool, " ***** Test Step 57 : Read attribute INT8S Default Value\n");
+            err = TestReadAttributeInt8sDefaultValue_57();
             break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Media Playback Next Command\n");
-            err = TestMediaPlaybackNextCommand_13();
+        case 58:
+            ChipLogProgress(chipTool, " ***** Test Step 58 : Read attribute INT16S Default Value\n");
+            err = TestReadAttributeInt16sDefaultValue_58();
             break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Media Playback Rewind Command\n");
-            err = TestMediaPlaybackRewindCommand_14();
+        case 59:
+            ChipLogProgress(chipTool, " ***** Test Step 59 : Write attribute INT16S Max Value\n");
+            err = TestWriteAttributeInt16sMaxValue_59();
             break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Media Playback Fast Forward Command\n");
-            err = TestMediaPlaybackFastForwardCommand_15();
+        case 60:
+            ChipLogProgress(chipTool, " ***** Test Step 60 : Read attribute INT16S Max Value\n");
+            err = TestReadAttributeInt16sMaxValue_60();
             break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Media Playback Skip Forward Command\n");
-            err = TestMediaPlaybackSkipForwardCommand_16();
+        case 61:
+            ChipLogProgress(chipTool, " ***** Test Step 61 : Write attribute INT16S Min Value\n");
+            err = TestWriteAttributeInt16sMinValue_61();
             break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Read attribute position after skip forward\n");
-            err = TestReadAttributePositionAfterSkipForward_17();
+        case 62:
+            ChipLogProgress(chipTool, " ***** Test Step 62 : Read attribute INT16S Min Value\n");
+            err = TestReadAttributeInt16sMinValue_62();
             break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Media Playback Skip Backward Command\n");
-            err = TestMediaPlaybackSkipBackwardCommand_18();
+        case 63:
+            ChipLogProgress(chipTool, " ***** Test Step 63 : Write attribute INT16S Default Value\n");
+            err = TestWriteAttributeInt16sDefaultValue_63();
             break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Read attribute position after skip backward\n");
-            err = TestReadAttributePositionAfterSkipBackward_19();
+        case 64:
+            ChipLogProgress(chipTool, " ***** Test Step 64 : Read attribute INT16S Default Value\n");
+            err = TestReadAttributeInt16sDefaultValue_64();
             break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Media Playback Seek Command\n");
-            err = TestMediaPlaybackSeekCommand_20();
+        case 65:
+            ChipLogProgress(chipTool, " ***** Test Step 65 : Read attribute INT32S Default Value\n");
+            err = TestReadAttributeInt32sDefaultValue_65();
             break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Read attribute position after seek\n");
-            err = TestReadAttributePositionAfterSeek_21();
+        case 66:
+            ChipLogProgress(chipTool, " ***** Test Step 66 : Write attribute INT32S Max Value\n");
+            err = TestWriteAttributeInt32sMaxValue_66();
             break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 67:
+            ChipLogProgress(chipTool, " ***** Test Step 67 : Read attribute INT32S Max Value\n");
+            err = TestReadAttributeInt32sMaxValue_67();
             break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 68:
+            ChipLogProgress(chipTool, " ***** Test Step 68 : Write attribute INT32S Min Value\n");
+            err = TestWriteAttributeInt32sMinValue_68();
             break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 69:
+            ChipLogProgress(chipTool, " ***** Test Step 69 : Read attribute INT32S Min Value\n");
+            err = TestReadAttributeInt32sMinValue_69();
             break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 70:
+            ChipLogProgress(chipTool, " ***** Test Step 70 : Write attribute INT32S Default Value\n");
+            err = TestWriteAttributeInt32sDefaultValue_70();
             break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 71:
+            ChipLogProgress(chipTool, " ***** Test Step 71 : Read attribute INT32S Default Value\n");
+            err = TestReadAttributeInt32sDefaultValue_71();
             break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 72:
+            ChipLogProgress(chipTool, " ***** Test Step 72 : Read attribute INT64S Default Value\n");
+            err = TestReadAttributeInt64sDefaultValue_72();
             break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 73:
+            ChipLogProgress(chipTool, " ***** Test Step 73 : Write attribute INT64S Max Value\n");
+            err = TestWriteAttributeInt64sMaxValue_73();
             break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 74:
+            ChipLogProgress(chipTool, " ***** Test Step 74 : Read attribute INT64S Max Value\n");
+            err = TestReadAttributeInt64sMaxValue_74();
             break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 75:
+            ChipLogProgress(chipTool, " ***** Test Step 75 : Write attribute INT64S Min Value\n");
+            err = TestWriteAttributeInt64sMinValue_75();
             break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 76:
+            ChipLogProgress(chipTool, " ***** Test Step 76 : Read attribute INT64S Min Value\n");
+            err = TestReadAttributeInt64sMinValue_76();
             break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 77:
+            ChipLogProgress(chipTool, " ***** Test Step 77 : Write attribute INT64S Default Value\n");
+            err = TestWriteAttributeInt64sDefaultValue_77();
             break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 78:
+            ChipLogProgress(chipTool, " ***** Test Step 78 : Read attribute INT64S Default Value\n");
+            err = TestReadAttributeInt64sDefaultValue_78();
             break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 79:
+            ChipLogProgress(chipTool, " ***** Test Step 79 : Read attribute SINGLE Default Value\n");
+            err = TestReadAttributeSingleDefaultValue_79();
             break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 80:
+            ChipLogProgress(chipTool, " ***** Test Step 80 : Write attribute SINGLE medium Value\n");
+            err = TestWriteAttributeSingleMediumValue_80();
             break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 81:
+            ChipLogProgress(chipTool, " ***** Test Step 81 : Read attribute SINGLE medium Value\n");
+            err = TestReadAttributeSingleMediumValue_81();
             break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 82:
+            ChipLogProgress(chipTool, " ***** Test Step 82 : Write attribute SINGLE large Value\n");
+            err = TestWriteAttributeSingleLargeValue_82();
             break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 83:
+            ChipLogProgress(chipTool, " ***** Test Step 83 : Read attribute SINGLE large Value\n");
+            err = TestReadAttributeSingleLargeValue_83();
             break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+        case 84:
+            ChipLogProgress(chipTool, " ***** Test Step 84 : Write attribute SINGLE small Value\n");
+            err = TestWriteAttributeSingleSmallValue_84();
             break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 22;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributePlaybackState_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute playback state Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("CurrentState", actualValue, 0));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeStartTime_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeStartTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute start time Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("StartTime", actualValue));
-                VerifyOrReturn(CheckValue("StartTime", actualValue, 0ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeDuration_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeDurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute duration Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("Duration", actualValue));
-                VerifyOrReturn(CheckValue("Duration", actualValue, 80000ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributePosition_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSampledPositionWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
-                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
-                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
-                VerifyOrReturn(CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 0ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributePlaybackSpeed_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributePlaybackSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute playback speed Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("PlaybackSpeed", actualValue, 0.0f));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeSeekRangeEnd_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSeekRangeEndWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute seek range end Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("SeekRangeEnd", actualValue));
-                VerifyOrReturn(CheckValue("SeekRangeEnd", actualValue, 80000ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeSeekRangeStart_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSeekRangeStartWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute seek range start Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("SeekRangeStart", actualValue));
-                VerifyOrReturn(CheckValue("SeekRangeStart", actualValue, 0ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackPlayCommand_8()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster playWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Play Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackPauseCommand_9()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster pauseWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Pause Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackStopCommand_10()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster stopPlaybackWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Stop Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackStartOverCommand_11()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster startOverWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Start Over Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackPreviousCommand_12()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster previousWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Previous Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackNextCommand_13()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster nextWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Next Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackRewindCommand_14()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster rewindWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Rewind Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackFastForwardCommand_15()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster fastForwardWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-            NSLog(@"Media Playback Fast Forward Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = values.status;
-                VerifyOrReturn(CheckValue("status", actualValue, 0));
-            }
-
-            {
-                id actualValue = values.data;
-                VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackSkipForwardCommand_16()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPMediaPlaybackClusterSkipForwardParams alloc] init];
-        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:500ULL];
-        [cluster
-            skipForwardWithParams:params
-                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                    NSLog(@"Media Playback Skip Forward Command Error: %@", err);
-
-                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                    {
-                        id actualValue = values.status;
-                        VerifyOrReturn(CheckValue("status", actualValue, 0));
-                    }
-
-                    {
-                        id actualValue = values.data;
-                        VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-                    }
-
-                    NextTest();
-                }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributePositionAfterSkipForward_17()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSampledPositionWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position after skip forward Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
-                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
-                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
-                VerifyOrReturn(CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 500ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackSkipBackwardCommand_18()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPMediaPlaybackClusterSkipBackwardParams alloc] init];
-        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:100ULL];
-        [cluster
-            skipBackwardWithParams:params
-                 completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Media Playback Skip Backward Command Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.status;
-                         VerifyOrReturn(CheckValue("status", actualValue, 0));
-                     }
-
-                     {
-                         id actualValue = values.data;
-                         VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-                     }
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributePositionAfterSkipBackward_19()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSampledPositionWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position after skip backward Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
-                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
-                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
-                VerifyOrReturn(CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 400ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestMediaPlaybackSeekCommand_20()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPMediaPlaybackClusterSeekParams alloc] init];
-        params.position = [NSNumber numberWithUnsignedLongLong:1000ULL];
-        [cluster seekWithParams:params
-              completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable err) {
-                  NSLog(@"Media Playback Seek Command Error: %@", err);
-
-                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                  {
-                      id actualValue = values.status;
-                      VerifyOrReturn(CheckValue("status", actualValue, 0));
-                  }
-
-                  {
-                      id actualValue = values.data;
-                      VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-                  }
-
-                  NextTest();
-              }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributePositionAfterSeek_21()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaPlayback * cluster = [[CHIPTestMediaPlayback alloc] initWithDevice:device endpoint:3 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSampledPositionWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute position after seek Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("SampledPosition", actualValue));
-                VerifyOrReturn(CheckValue("updatedAt", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).updatedAt, 0ULL));
-                VerifyOrReturn(CheckValueNonNull("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position));
-                VerifyOrReturn(
-                    CheckValue("position", ((CHIPMediaPlaybackClusterPlaybackPosition *) actualValue).position, 1000ULL));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_ChannelCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_ChannelCluster()
-        : TestCommandBridge("TV_ChannelCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_ChannelCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_ChannelCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_ChannelCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute Channel list\n");
-            err = TestReadAttributeChannelList_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute channel lineup\n");
-            err = TestReadAttributeChannelLineup_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute current channel\n");
-            err = TestReadAttributeCurrentChannel_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Change Channel Command\n");
-            err = TestChangeChannelCommand_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Change Channel By Number Command\n");
-            err = TestChangeChannelByNumberCommand_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Skip Channel Command\n");
-            err = TestSkipChannelCommand_6();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributeChannelList_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeChannelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute Channel list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("ChannelList", [actualValue count], static_cast<uint32_t>(4)));
-                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[0]).majorNumber, 6U));
-                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[0]).minorNumber, 0U));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[0]).name, @"ABC"));
-                VerifyOrReturn(
-                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[0]).callSign, @"KAAL-TV"));
-                VerifyOrReturn(CheckValueAsString(
-                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[0]).affiliateCallSign, @"KAAL"));
-                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[1]).majorNumber, 9U));
-                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[1]).minorNumber, 1U));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[1]).name, @"PBS"));
-                VerifyOrReturn(
-                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[1]).callSign, @"KCTS-TV"));
-                VerifyOrReturn(CheckValueAsString(
-                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[1]).affiliateCallSign, @"KCTS"));
-                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[2]).majorNumber, 9U));
-                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[2]).minorNumber, 2U));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[2]).name, @"PBS Kids"));
-                VerifyOrReturn(
-                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[2]).callSign, @"KCTS-TV"));
-                VerifyOrReturn(CheckValueAsString(
-                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[2]).affiliateCallSign, @"KCTS"));
-                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[3]).majorNumber, 9U));
-                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue[3]).minorNumber, 3U));
-                VerifyOrReturn(
-                    CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue[3]).name, @"World Channel"));
-                VerifyOrReturn(
-                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue[3]).callSign, @"KCTS-TV"));
-                VerifyOrReturn(CheckValueAsString(
-                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue[3]).affiliateCallSign, @"KCTS"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeChannelLineup_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeLineupWithCompletionHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Read attribute channel lineup Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValueNonNull("Lineup", actualValue));
-                    VerifyOrReturn(CheckValueAsString(
-                        "operatorName", ((CHIPChannelClusterLineupInfo *) actualValue).operatorName, @"Comcast"));
-                    VerifyOrReturn(CheckValueAsString(
-                        "lineupName", ((CHIPChannelClusterLineupInfo *) actualValue).lineupName, @"Comcast King County"));
-                    VerifyOrReturn(
-                        CheckValueAsString("postalCode", ((CHIPChannelClusterLineupInfo *) actualValue).postalCode, @"98052"));
-                    VerifyOrReturn(CheckValue("lineupInfoType", ((CHIPChannelClusterLineupInfo *) actualValue).lineupInfoType, 0));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeCurrentChannel_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentChannelWithCompletionHandler:^(
-            CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute current channel Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue));
-                VerifyOrReturn(CheckValue("majorNumber", ((CHIPChannelClusterChannelInfo *) actualValue).majorNumber, 6U));
-                VerifyOrReturn(CheckValue("minorNumber", ((CHIPChannelClusterChannelInfo *) actualValue).minorNumber, 0U));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPChannelClusterChannelInfo *) actualValue).name, @"ABC"));
-                VerifyOrReturn(
-                    CheckValueAsString("callSign", ((CHIPChannelClusterChannelInfo *) actualValue).callSign, @"KAAL-TV"));
-                VerifyOrReturn(CheckValueAsString(
-                    "affiliateCallSign", ((CHIPChannelClusterChannelInfo *) actualValue).affiliateCallSign, @"KAAL"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestChangeChannelCommand_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPChannelClusterChangeChannelParams alloc] init];
-        params.match = @"PBS";
-        [cluster
-            changeChannelWithParams:params
-                  completionHandler:^(CHIPChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Change Channel Command Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
-
-                      {
-                          id actualValue = values.data;
-                          VerifyOrReturn(CheckValueAsString("data", actualValue, @"data response"));
-                      }
-
-                      NextTest();
-                  }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestChangeChannelByNumberCommand_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPChannelClusterChangeChannelByNumberParams alloc] init];
-        params.majorNumber = [NSNumber numberWithUnsignedShort:6U];
-        params.minorNumber = [NSNumber numberWithUnsignedShort:0U];
-        [cluster changeChannelByNumberWithParams:params
-                               completionHandler:^(NSError * _Nullable err) {
-                                   NSLog(@"Change Channel By Number Command Error: %@", err);
-
-                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                   NextTest();
-                               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSkipChannelCommand_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestChannel * cluster = [[CHIPTestChannel alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPChannelClusterSkipChannelParams alloc] init];
-        params.count = [NSNumber numberWithUnsignedShort:1U];
-        [cluster skipChannelWithParams:params
-                     completionHandler:^(NSError * _Nullable err) {
-                         NSLog(@"Skip Channel Command Error: %@", err);
-
-                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                         NextTest();
-                     }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_LowPowerCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_LowPowerCluster()
-        : TestCommandBridge("TV_LowPowerCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_LowPowerCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_LowPowerCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_LowPowerCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Sleep Input Status Command\n");
-            err = TestSleepInputStatusCommand_1();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 2;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestSleepInputStatusCommand_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestLowPower * cluster = [[CHIPTestLowPower alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster sleepWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Sleep Input Status Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_ContentLauncherCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_ContentLauncherCluster()
-        : TestCommandBridge("TV_ContentLauncherCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_ContentLauncherCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_ContentLauncherCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_ContentLauncherCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute accept header list\n");
-            err = TestReadAttributeAcceptHeaderList_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute supported streaming protocols\n");
-            err = TestReadAttributeSupportedStreamingProtocols_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Launch Content Command\n");
-            err = TestLaunchContentCommand_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Launch URL Command\n");
-            err = TestLaunchUrlCommand_4();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 5;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributeAcceptHeaderList_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAcceptHeaderWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute accept header list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AcceptHeader", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValueAsString("", actualValue[0], @"example"));
-                VerifyOrReturn(CheckValueAsString("", actualValue[1], @"example"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeSupportedStreamingProtocols_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster
-            readAttributeSupportedStreamingProtocolsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Read attribute supported streaming protocols Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("SupportedStreamingProtocols", actualValue, 0UL));
-                }
-
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestLaunchContentCommand_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPContentLauncherClusterLaunchContentParams alloc] init];
-        params.search = [[CHIPContentLauncherClusterContentSearch alloc] init];
-        {
-            NSMutableArray * temp_1 = [[NSMutableArray alloc] init];
-            temp_1[0] = [[CHIPContentLauncherClusterParameter alloc] init];
-            ((CHIPContentLauncherClusterParameter *) temp_1[0]).type = [NSNumber numberWithUnsignedChar:1];
-            ((CHIPContentLauncherClusterParameter *) temp_1[0]).value = @"exampleValue";
-            {
-                NSMutableArray * temp_4 = [[NSMutableArray alloc] init];
-                temp_4[0] = [[CHIPContentLauncherClusterAdditionalInfo alloc] init];
-                ((CHIPContentLauncherClusterAdditionalInfo *) temp_4[0]).name = @"name";
-                ((CHIPContentLauncherClusterAdditionalInfo *) temp_4[0]).value = @"value";
-
-                ((CHIPContentLauncherClusterParameter *) temp_1[0]).externalIDList = temp_4;
-            }
-
-            ((CHIPContentLauncherClusterContentSearch *) params.search).parameterList = temp_1;
-        }
-
-        params.autoPlay = [NSNumber numberWithBool:true];
-        params.data = @"exampleData";
-        [cluster
-            launchContentWithParams:params
-                  completionHandler:^(CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Launch Content Command Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
-
-                      {
-                          id actualValue = values.data;
-                          VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData"));
-                      }
-
-                      NextTest();
-                  }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestLaunchUrlCommand_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestContentLauncher * cluster = [[CHIPTestContentLauncher alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPContentLauncherClusterLaunchURLParams alloc] init];
-        params.contentURL = @"exampleUrl";
-        params.displayString = @"exampleDisplayString";
-        params.brandingInformation = [[CHIPContentLauncherClusterBrandingInformation alloc] init];
-        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).providerName = @"exampleName";
-        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).background =
-            [[CHIPContentLauncherClusterStyleInformation alloc] init];
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .background)
-            .imageUrl
-            = @"exampleUrl";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .background)
-            .color
-            = @"exampleColor";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .background)
-            .size
-            = [[CHIPContentLauncherClusterDimension alloc] init];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .background)
-                .size)
-            .width
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .background)
-                .size)
-            .height
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .background)
-                .size)
-            .metric
-            = [NSNumber numberWithUnsignedChar:0];
-
-        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).logo =
-            [[CHIPContentLauncherClusterStyleInformation alloc] init];
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .logo)
-            .imageUrl
-            = @"exampleUrl";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .logo)
-            .color
-            = @"exampleColor";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .logo)
-            .size
-            = [[CHIPContentLauncherClusterDimension alloc] init];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .logo)
-                .size)
-            .width
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .logo)
-                .size)
-            .height
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .logo)
-                .size)
-            .metric
-            = [NSNumber numberWithUnsignedChar:0];
-
-        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).progressBar =
-            [[CHIPContentLauncherClusterStyleInformation alloc] init];
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .progressBar)
-            .imageUrl
-            = @"exampleUrl";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .progressBar)
-            .color
-            = @"exampleColor";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .progressBar)
-            .size
-            = [[CHIPContentLauncherClusterDimension alloc] init];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .progressBar)
-                .size)
-            .width
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .progressBar)
-                .size)
-            .height
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .progressBar)
-                .size)
-            .metric
-            = [NSNumber numberWithUnsignedChar:0];
-
-        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).splash =
-            [[CHIPContentLauncherClusterStyleInformation alloc] init];
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .splash)
-            .imageUrl
-            = @"exampleUrl";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .splash)
-            .color
-            = @"exampleColor";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .splash)
-            .size
-            = [[CHIPContentLauncherClusterDimension alloc] init];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .splash)
-                .size)
-            .width
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .splash)
-                .size)
-            .height
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .splash)
-                .size)
-            .metric
-            = [NSNumber numberWithUnsignedChar:0];
-
-        ((CHIPContentLauncherClusterBrandingInformation *) params.brandingInformation).waterMark =
-            [[CHIPContentLauncherClusterStyleInformation alloc] init];
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .waterMark)
-            .imageUrl
-            = @"exampleUrl";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .waterMark)
-            .color
-            = @"exampleColor";
-        ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                             params.brandingInformation)
-                .waterMark)
-            .size
-            = [[CHIPContentLauncherClusterDimension alloc] init];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .waterMark)
-                .size)
-            .width
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .waterMark)
-                .size)
-            .height
-            = [NSNumber numberWithDouble:0];
-        ((CHIPContentLauncherClusterDimension *) ((CHIPContentLauncherClusterStyleInformation *) ((CHIPContentLauncherClusterBrandingInformation *)
-                                                                                                      params.brandingInformation)
-                                                      .waterMark)
-                .size)
-            .metric
-            = [NSNumber numberWithUnsignedChar:0];
-
-        [cluster launchURLWithParams:params
-                   completionHandler:^(CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"Launch URL Command Error: %@", err);
-
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                       {
-                           id actualValue = values.status;
-                           VerifyOrReturn(CheckValue("status", actualValue, 0));
-                       }
-
-                       {
-                           id actualValue = values.data;
-                           VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData"));
-                       }
-
-                       NextTest();
-                   }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TV_MediaInputCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TV_MediaInputCluster()
-        : TestCommandBridge("TV_MediaInputCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TV_MediaInputCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TV_MediaInputCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TV_MediaInputCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute media input list\n");
-            err = TestReadAttributeMediaInputList_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read current media input\n");
-            err = TestReadCurrentMediaInput_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Select Input Command\n");
-            err = TestSelectInputCommand_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Hide Input Status Command\n");
-            err = TestHideInputStatusCommand_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Show Input Status Command\n");
-            err = TestShowInputStatusCommand_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Rename Input Command\n");
-            err = TestRenameInputCommand_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute media input list\n");
-            err = TestReadAttributeMediaInputList_7();
-            break;
-        }
-
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
-    }
-
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
-    {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
-
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 8;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
-    }
-
-    CHIP_ERROR TestReadAttributeMediaInputList_1()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute media input list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("InputList", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).index, 1));
-                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).inputType, 4));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).name, @"HDMI"));
-                VerifyOrReturn(
-                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).descriptionString,
-                        @"High-Definition Multimedia Interface"));
-                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).index, 2));
-                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).inputType, 4));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).name, @"HDMI"));
-                VerifyOrReturn(
-                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).descriptionString,
-                        @"High-Definition Multimedia Interface"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadCurrentMediaInput_2()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeCurrentInputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read current media input Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("CurrentInput", actualValue, 1));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestSelectInputCommand_3()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPMediaInputClusterSelectInputParams alloc] init];
-        params.index = [NSNumber numberWithUnsignedChar:1];
-        [cluster selectInputWithParams:params
-                     completionHandler:^(NSError * _Nullable err) {
-                         NSLog(@"Select Input Command Error: %@", err);
-
-                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                         NextTest();
-                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestHideInputStatusCommand_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster hideInputStatusWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Hide Input Status Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestShowInputStatusCommand_5()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster showInputStatusWithCompletionHandler:^(NSError * _Nullable err) {
-            NSLog(@"Show Input Status Command Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestRenameInputCommand_6()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPMediaInputClusterRenameInputParams alloc] init];
-        params.index = [NSNumber numberWithUnsignedChar:1];
-        params.name = @"HDMI Test";
-        [cluster renameInputWithParams:params
-                     completionHandler:^(NSError * _Nullable err) {
-                         NSLog(@"Rename Input Command Error: %@", err);
-
-                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                         NextTest();
-                     }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeMediaInputList_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestMediaInput * cluster = [[CHIPTestMediaInput alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeInputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute media input list Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("InputList", [actualValue count], static_cast<uint32_t>(2)));
-                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).index, 1));
-                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).inputType, 4));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).name, @"HDMI Test"));
-                VerifyOrReturn(
-                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[0]).descriptionString,
-                        @"High-Definition Multimedia Interface"));
-                VerifyOrReturn(CheckValue("index", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).index, 2));
-                VerifyOrReturn(CheckValue("inputType", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).inputType, 4));
-                VerifyOrReturn(CheckValueAsString("name", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).name, @"HDMI"));
-                VerifyOrReturn(
-                    CheckValueAsString("description", ((CHIPMediaInputClusterInputInfo *) actualValue[1]).descriptionString,
-                        @"High-Definition Multimedia Interface"));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-class TestCluster : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    TestCluster()
-        : TestCommandBridge("TestCluster")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~TestCluster() {}
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: TestCluster\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: TestCluster\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
-
-        Wait();
-
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Send Test Command\n");
-            err = TestSendTestCommand_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Send Test Not Handled Command\n");
-            err = TestSendTestNotHandledCommand_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Send Test Specific Command\n");
-            err = TestSendTestSpecificCommand_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Test Add Arguments Command\n");
-            err = TestSendTestAddArgumentsCommand_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send failing Test Add Arguments Command\n");
-            err = TestSendFailingTestAddArgumentsCommand_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute BOOLEAN Default Value\n");
-            err = TestReadAttributeBooleanDefaultValue_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Write attribute BOOLEAN True\n");
-            err = TestWriteAttributeBooleanTrue_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute BOOLEAN True\n");
-            err = TestReadAttributeBooleanTrue_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Write attribute BOOLEAN False\n");
-            err = TestWriteAttributeBooleanFalse_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Read attribute BOOLEAN False\n");
-            err = TestReadAttributeBooleanFalse_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Read attribute BITMAP8 Default Value\n");
-            err = TestReadAttributeBitmap8DefaultValue_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Write attribute BITMAP8 Max Value\n");
-            err = TestWriteAttributeBitmap8MaxValue_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute BITMAP8 Max Value\n");
-            err = TestReadAttributeBitmap8MaxValue_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Write attribute BITMAP8 Min Value\n");
-            err = TestWriteAttributeBitmap8MinValue_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Read attribute BITMAP8 Min Value\n");
-            err = TestReadAttributeBitmap8MinValue_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Read attribute BITMAP16 Default Value\n");
-            err = TestReadAttributeBitmap16DefaultValue_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Write attribute BITMAP16 Max Value\n");
-            err = TestWriteAttributeBitmap16MaxValue_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Read attribute BITMAP16 Max Value\n");
-            err = TestReadAttributeBitmap16MaxValue_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Write attribute BITMAP16 Min Value\n");
-            err = TestWriteAttributeBitmap16MinValue_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Read attribute BITMAP16 Min Value\n");
-            err = TestReadAttributeBitmap16MinValue_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Read attribute BITMAP32 Default Value\n");
-            err = TestReadAttributeBitmap32DefaultValue_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Write attribute BITMAP32 Max Value\n");
-            err = TestWriteAttributeBitmap32MaxValue_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Read attribute BITMAP32 Max Value\n");
-            err = TestReadAttributeBitmap32MaxValue_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Write attribute BITMAP32 Min Value\n");
-            err = TestWriteAttributeBitmap32MinValue_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Read attribute BITMAP32 Min Value\n");
-            err = TestReadAttributeBitmap32MinValue_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : Read attribute BITMAP64 Default Value\n");
-            err = TestReadAttributeBitmap64DefaultValue_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : Write attribute BITMAP64 Max Value\n");
-            err = TestWriteAttributeBitmap64MaxValue_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : Read attribute BITMAP64 Max Value\n");
-            err = TestReadAttributeBitmap64MaxValue_28();
-            break;
-        case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : Write attribute BITMAP64 Min Value\n");
-            err = TestWriteAttributeBitmap64MinValue_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : Read attribute BITMAP64 Min Value\n");
-            err = TestReadAttributeBitmap64MinValue_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : Read attribute INT8U Default Value\n");
-            err = TestReadAttributeInt8uDefaultValue_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : Write attribute INT8U Max Value\n");
-            err = TestWriteAttributeInt8uMaxValue_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : Read attribute INT8U Max Value\n");
-            err = TestReadAttributeInt8uMaxValue_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : Write attribute INT8U Min Value\n");
-            err = TestWriteAttributeInt8uMinValue_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : Read attribute INT8U Min Value\n");
-            err = TestReadAttributeInt8uMinValue_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : Read attribute INT16U Default Value\n");
-            err = TestReadAttributeInt16uDefaultValue_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : Write attribute INT16U Max Value\n");
-            err = TestWriteAttributeInt16uMaxValue_37();
-            break;
-        case 38:
-            ChipLogProgress(chipTool, " ***** Test Step 38 : Read attribute INT16U Max Value\n");
-            err = TestReadAttributeInt16uMaxValue_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : Write attribute INT16U Min Value\n");
-            err = TestWriteAttributeInt16uMinValue_39();
-            break;
-        case 40:
-            ChipLogProgress(chipTool, " ***** Test Step 40 : Read attribute INT16U Min Value\n");
-            err = TestReadAttributeInt16uMinValue_40();
-            break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : Read attribute INT32U Default Value\n");
-            err = TestReadAttributeInt32uDefaultValue_41();
-            break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : Write attribute INT32U Max Value\n");
-            err = TestWriteAttributeInt32uMaxValue_42();
-            break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : Read attribute INT32U Max Value\n");
-            err = TestReadAttributeInt32uMaxValue_43();
-            break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : Write attribute INT32U Min Value\n");
-            err = TestWriteAttributeInt32uMinValue_44();
-            break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : Read attribute INT32U Min Value\n");
-            err = TestReadAttributeInt32uMinValue_45();
-            break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : Read attribute INT64U Default Value\n");
-            err = TestReadAttributeInt64uDefaultValue_46();
-            break;
-        case 47:
-            ChipLogProgress(chipTool, " ***** Test Step 47 : Write attribute INT64U Max Value\n");
-            err = TestWriteAttributeInt64uMaxValue_47();
-            break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : Read attribute INT64U Max Value\n");
-            err = TestReadAttributeInt64uMaxValue_48();
-            break;
-        case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : Write attribute INT64U Min Value\n");
-            err = TestWriteAttributeInt64uMinValue_49();
-            break;
-        case 50:
-            ChipLogProgress(chipTool, " ***** Test Step 50 : Read attribute INT64U Min Value\n");
-            err = TestReadAttributeInt64uMinValue_50();
-            break;
-        case 51:
-            ChipLogProgress(chipTool, " ***** Test Step 51 : Read attribute INT8S Default Value\n");
-            err = TestReadAttributeInt8sDefaultValue_51();
-            break;
-        case 52:
-            ChipLogProgress(chipTool, " ***** Test Step 52 : Write attribute INT8S Max Value\n");
-            err = TestWriteAttributeInt8sMaxValue_52();
-            break;
-        case 53:
-            ChipLogProgress(chipTool, " ***** Test Step 53 : Read attribute INT8S Max Value\n");
-            err = TestReadAttributeInt8sMaxValue_53();
-            break;
-        case 54:
-            ChipLogProgress(chipTool, " ***** Test Step 54 : Write attribute INT8S Min Value\n");
-            err = TestWriteAttributeInt8sMinValue_54();
-            break;
-        case 55:
-            ChipLogProgress(chipTool, " ***** Test Step 55 : Read attribute INT8S Min Value\n");
-            err = TestReadAttributeInt8sMinValue_55();
-            break;
-        case 56:
-            ChipLogProgress(chipTool, " ***** Test Step 56 : Write attribute INT8S Default Value\n");
-            err = TestWriteAttributeInt8sDefaultValue_56();
-            break;
-        case 57:
-            ChipLogProgress(chipTool, " ***** Test Step 57 : Read attribute INT8S Default Value\n");
-            err = TestReadAttributeInt8sDefaultValue_57();
-            break;
-        case 58:
-            ChipLogProgress(chipTool, " ***** Test Step 58 : Read attribute INT16S Default Value\n");
-            err = TestReadAttributeInt16sDefaultValue_58();
-            break;
-        case 59:
-            ChipLogProgress(chipTool, " ***** Test Step 59 : Write attribute INT16S Max Value\n");
-            err = TestWriteAttributeInt16sMaxValue_59();
-            break;
-        case 60:
-            ChipLogProgress(chipTool, " ***** Test Step 60 : Read attribute INT16S Max Value\n");
-            err = TestReadAttributeInt16sMaxValue_60();
-            break;
-        case 61:
-            ChipLogProgress(chipTool, " ***** Test Step 61 : Write attribute INT16S Min Value\n");
-            err = TestWriteAttributeInt16sMinValue_61();
-            break;
-        case 62:
-            ChipLogProgress(chipTool, " ***** Test Step 62 : Read attribute INT16S Min Value\n");
-            err = TestReadAttributeInt16sMinValue_62();
-            break;
-        case 63:
-            ChipLogProgress(chipTool, " ***** Test Step 63 : Write attribute INT16S Default Value\n");
-            err = TestWriteAttributeInt16sDefaultValue_63();
-            break;
-        case 64:
-            ChipLogProgress(chipTool, " ***** Test Step 64 : Read attribute INT16S Default Value\n");
-            err = TestReadAttributeInt16sDefaultValue_64();
-            break;
-        case 65:
-            ChipLogProgress(chipTool, " ***** Test Step 65 : Read attribute INT32S Default Value\n");
-            err = TestReadAttributeInt32sDefaultValue_65();
-            break;
-        case 66:
-            ChipLogProgress(chipTool, " ***** Test Step 66 : Write attribute INT32S Max Value\n");
-            err = TestWriteAttributeInt32sMaxValue_66();
-            break;
-        case 67:
-            ChipLogProgress(chipTool, " ***** Test Step 67 : Read attribute INT32S Max Value\n");
-            err = TestReadAttributeInt32sMaxValue_67();
-            break;
-        case 68:
-            ChipLogProgress(chipTool, " ***** Test Step 68 : Write attribute INT32S Min Value\n");
-            err = TestWriteAttributeInt32sMinValue_68();
-            break;
-        case 69:
-            ChipLogProgress(chipTool, " ***** Test Step 69 : Read attribute INT32S Min Value\n");
-            err = TestReadAttributeInt32sMinValue_69();
-            break;
-        case 70:
-            ChipLogProgress(chipTool, " ***** Test Step 70 : Write attribute INT32S Default Value\n");
-            err = TestWriteAttributeInt32sDefaultValue_70();
-            break;
-        case 71:
-            ChipLogProgress(chipTool, " ***** Test Step 71 : Read attribute INT32S Default Value\n");
-            err = TestReadAttributeInt32sDefaultValue_71();
-            break;
-        case 72:
-            ChipLogProgress(chipTool, " ***** Test Step 72 : Read attribute INT64S Default Value\n");
-            err = TestReadAttributeInt64sDefaultValue_72();
-            break;
-        case 73:
-            ChipLogProgress(chipTool, " ***** Test Step 73 : Write attribute INT64S Max Value\n");
-            err = TestWriteAttributeInt64sMaxValue_73();
-            break;
-        case 74:
-            ChipLogProgress(chipTool, " ***** Test Step 74 : Read attribute INT64S Max Value\n");
-            err = TestReadAttributeInt64sMaxValue_74();
-            break;
-        case 75:
-            ChipLogProgress(chipTool, " ***** Test Step 75 : Write attribute INT64S Min Value\n");
-            err = TestWriteAttributeInt64sMinValue_75();
-            break;
-        case 76:
-            ChipLogProgress(chipTool, " ***** Test Step 76 : Read attribute INT64S Min Value\n");
-            err = TestReadAttributeInt64sMinValue_76();
-            break;
-        case 77:
-            ChipLogProgress(chipTool, " ***** Test Step 77 : Write attribute INT64S Default Value\n");
-            err = TestWriteAttributeInt64sDefaultValue_77();
-            break;
-        case 78:
-            ChipLogProgress(chipTool, " ***** Test Step 78 : Read attribute INT64S Default Value\n");
-            err = TestReadAttributeInt64sDefaultValue_78();
-            break;
-        case 79:
-            ChipLogProgress(chipTool, " ***** Test Step 79 : Read attribute SINGLE Default Value\n");
-            err = TestReadAttributeSingleDefaultValue_79();
-            break;
-        case 80:
-            ChipLogProgress(chipTool, " ***** Test Step 80 : Write attribute SINGLE medium Value\n");
-            err = TestWriteAttributeSingleMediumValue_80();
-            break;
-        case 81:
-            ChipLogProgress(chipTool, " ***** Test Step 81 : Read attribute SINGLE medium Value\n");
-            err = TestReadAttributeSingleMediumValue_81();
-            break;
-        case 82:
-            ChipLogProgress(chipTool, " ***** Test Step 82 : Write attribute SINGLE large Value\n");
-            err = TestWriteAttributeSingleLargeValue_82();
-            break;
-        case 83:
-            ChipLogProgress(chipTool, " ***** Test Step 83 : Read attribute SINGLE large Value\n");
-            err = TestReadAttributeSingleLargeValue_83();
-            break;
-        case 84:
-            ChipLogProgress(chipTool, " ***** Test Step 84 : Write attribute SINGLE small Value\n");
-            err = TestWriteAttributeSingleSmallValue_84();
-            break;
-        case 85:
-            ChipLogProgress(chipTool, " ***** Test Step 85 : Read attribute SINGLE small Value\n");
-            err = TestReadAttributeSingleSmallValue_85();
+        case 85:
+            ChipLogProgress(chipTool, " ***** Test Step 85 : Read attribute SINGLE small Value\n");
+            err = TestReadAttributeSingleSmallValue_85();
             break;
         case 86:
             ChipLogProgress(chipTool, " ***** Test Step 86 : Write attribute SINGLE Default Value\n");
@@ -71280,20 +67349,20 @@ class TestCluster : public TestCommandBridge {
             err = TestReadAttributeOctetStringWithEmbeddedNull_109();
             break;
         case 110:
-            ChipLogProgress(chipTool, " ***** Test Step 110 : Write attribute OCTET_STRING with weird chars\n");
-            err = TestWriteAttributeOctetStringWithWeirdChars_110();
+            ChipLogProgress(chipTool, " ***** Test Step 110 : Write attribute OCTET_STRING with hex: format\n");
+            err = TestWriteAttributeOctetStringWithHexFormat_110();
             break;
         case 111:
-            ChipLogProgress(chipTool, " ***** Test Step 111 : Read attribute OCTET_STRING with weird chars\n");
-            err = TestReadAttributeOctetStringWithWeirdChars_111();
+            ChipLogProgress(chipTool, " ***** Test Step 111 : Read attribute OCTET_STRING with hex: format\n");
+            err = TestReadAttributeOctetStringWithHexFormat_111();
             break;
         case 112:
-            ChipLogProgress(chipTool, " ***** Test Step 112 : Write attribute OCTET_STRING\n");
-            err = TestWriteAttributeOctetString_112();
+            ChipLogProgress(chipTool, " ***** Test Step 112 : Write attribute OCTET_STRING with weird chars\n");
+            err = TestWriteAttributeOctetStringWithWeirdChars_112();
             break;
         case 113:
-            ChipLogProgress(chipTool, " ***** Test Step 113 : Read attribute OCTET_STRING\n");
-            err = TestReadAttributeOctetString_113();
+            ChipLogProgress(chipTool, " ***** Test Step 113 : Read attribute OCTET_STRING with weird chars\n");
+            err = TestReadAttributeOctetStringWithWeirdChars_113();
             break;
         case 114:
             ChipLogProgress(chipTool, " ***** Test Step 114 : Write attribute OCTET_STRING\n");
@@ -71308,965 +67377,965 @@ class TestCluster : public TestCommandBridge {
             err = TestWriteAttributeOctetString_116();
             break;
         case 117:
-            ChipLogProgress(chipTool, " ***** Test Step 117 : Read attribute LONG_OCTET_STRING Default Value\n");
-            err = TestReadAttributeLongOctetStringDefaultValue_117();
+            ChipLogProgress(chipTool, " ***** Test Step 117 : Read attribute OCTET_STRING\n");
+            err = TestReadAttributeOctetString_117();
             break;
         case 118:
-            ChipLogProgress(chipTool, " ***** Test Step 118 : Write attribute LONG_OCTET_STRING\n");
-            err = TestWriteAttributeLongOctetString_118();
+            ChipLogProgress(chipTool, " ***** Test Step 118 : Write attribute OCTET_STRING\n");
+            err = TestWriteAttributeOctetString_118();
             break;
         case 119:
-            ChipLogProgress(chipTool, " ***** Test Step 119 : Read attribute LONG_OCTET_STRING\n");
-            err = TestReadAttributeLongOctetString_119();
+            ChipLogProgress(chipTool, " ***** Test Step 119 : Read attribute LONG_OCTET_STRING Default Value\n");
+            err = TestReadAttributeLongOctetStringDefaultValue_119();
             break;
         case 120:
             ChipLogProgress(chipTool, " ***** Test Step 120 : Write attribute LONG_OCTET_STRING\n");
             err = TestWriteAttributeLongOctetString_120();
             break;
         case 121:
-            ChipLogProgress(chipTool, " ***** Test Step 121 : Read attribute CHAR_STRING Default Value\n");
-            err = TestReadAttributeCharStringDefaultValue_121();
+            ChipLogProgress(chipTool, " ***** Test Step 121 : Read attribute LONG_OCTET_STRING\n");
+            err = TestReadAttributeLongOctetString_121();
             break;
         case 122:
-            ChipLogProgress(chipTool, " ***** Test Step 122 : Write attribute CHAR_STRING\n");
-            err = TestWriteAttributeCharString_122();
+            ChipLogProgress(chipTool, " ***** Test Step 122 : Write attribute LONG_OCTET_STRING\n");
+            err = TestWriteAttributeLongOctetString_122();
             break;
         case 123:
-            ChipLogProgress(chipTool, " ***** Test Step 123 : Read attribute CHAR_STRING\n");
-            err = TestReadAttributeCharString_123();
+            ChipLogProgress(chipTool, " ***** Test Step 123 : Read attribute CHAR_STRING Default Value\n");
+            err = TestReadAttributeCharStringDefaultValue_123();
             break;
         case 124:
-            ChipLogProgress(chipTool, " ***** Test Step 124 : Write attribute CHAR_STRING - Value too long\n");
-            err = TestWriteAttributeCharStringValueTooLong_124();
+            ChipLogProgress(chipTool, " ***** Test Step 124 : Write attribute CHAR_STRING\n");
+            err = TestWriteAttributeCharString_124();
             break;
         case 125:
             ChipLogProgress(chipTool, " ***** Test Step 125 : Read attribute CHAR_STRING\n");
             err = TestReadAttributeCharString_125();
             break;
         case 126:
-            ChipLogProgress(chipTool, " ***** Test Step 126 : Write attribute CHAR_STRING - Empty\n");
-            err = TestWriteAttributeCharStringEmpty_126();
+            ChipLogProgress(chipTool, " ***** Test Step 126 : Write attribute CHAR_STRING - Value too long\n");
+            err = TestWriteAttributeCharStringValueTooLong_126();
             break;
         case 127:
-            ChipLogProgress(chipTool, " ***** Test Step 127 : Read attribute LONG_CHAR_STRING Default Value\n");
-            err = TestReadAttributeLongCharStringDefaultValue_127();
+            ChipLogProgress(chipTool, " ***** Test Step 127 : Read attribute CHAR_STRING\n");
+            err = TestReadAttributeCharString_127();
             break;
         case 128:
-            ChipLogProgress(chipTool, " ***** Test Step 128 : Write attribute LONG_CHAR_STRING\n");
-            err = TestWriteAttributeLongCharString_128();
+            ChipLogProgress(chipTool, " ***** Test Step 128 : Write attribute CHAR_STRING - Empty\n");
+            err = TestWriteAttributeCharStringEmpty_128();
             break;
         case 129:
-            ChipLogProgress(chipTool, " ***** Test Step 129 : Read attribute LONG_CHAR_STRING\n");
-            err = TestReadAttributeLongCharString_129();
+            ChipLogProgress(chipTool, " ***** Test Step 129 : Read attribute LONG_CHAR_STRING Default Value\n");
+            err = TestReadAttributeLongCharStringDefaultValue_129();
             break;
         case 130:
             ChipLogProgress(chipTool, " ***** Test Step 130 : Write attribute LONG_CHAR_STRING\n");
             err = TestWriteAttributeLongCharString_130();
             break;
         case 131:
-            ChipLogProgress(chipTool, " ***** Test Step 131 : Read attribute LIST_LONG_OCTET_STRING (for chunked read)\n");
-            err = TestReadAttributeListLongOctetStringForChunkedRead_131();
+            ChipLogProgress(chipTool, " ***** Test Step 131 : Read attribute LONG_CHAR_STRING\n");
+            err = TestReadAttributeLongCharString_131();
             break;
         case 132:
-            ChipLogProgress(chipTool, " ***** Test Step 132 : Write attribute LIST_LONG_OCTET_STRING (for chunked write)\n");
-            err = TestWriteAttributeListLongOctetStringForChunkedWrite_132();
+            ChipLogProgress(chipTool, " ***** Test Step 132 : Write attribute LONG_CHAR_STRING\n");
+            err = TestWriteAttributeLongCharString_132();
             break;
         case 133:
             ChipLogProgress(chipTool, " ***** Test Step 133 : Read attribute LIST_LONG_OCTET_STRING (for chunked read)\n");
             err = TestReadAttributeListLongOctetStringForChunkedRead_133();
             break;
         case 134:
-            ChipLogProgress(chipTool, " ***** Test Step 134 : Read attribute EPOCH_US Default Value\n");
-            err = TestReadAttributeEpochUsDefaultValue_134();
+            ChipLogProgress(chipTool, " ***** Test Step 134 : Write attribute LIST_LONG_OCTET_STRING (for chunked write)\n");
+            err = TestWriteAttributeListLongOctetStringForChunkedWrite_134();
             break;
         case 135:
-            ChipLogProgress(chipTool, " ***** Test Step 135 : Write attribute EPOCH_US Max Value\n");
-            err = TestWriteAttributeEpochUsMaxValue_135();
+            ChipLogProgress(chipTool, " ***** Test Step 135 : Read attribute LIST_LONG_OCTET_STRING (for chunked read)\n");
+            err = TestReadAttributeListLongOctetStringForChunkedRead_135();
             break;
         case 136:
-            ChipLogProgress(chipTool, " ***** Test Step 136 : Read attribute EPOCH_US Max Value\n");
-            err = TestReadAttributeEpochUsMaxValue_136();
+            ChipLogProgress(chipTool, " ***** Test Step 136 : Read attribute EPOCH_US Default Value\n");
+            err = TestReadAttributeEpochUsDefaultValue_136();
             break;
         case 137:
-            ChipLogProgress(chipTool, " ***** Test Step 137 : Write attribute EPOCH_US Min Value\n");
-            err = TestWriteAttributeEpochUsMinValue_137();
+            ChipLogProgress(chipTool, " ***** Test Step 137 : Write attribute EPOCH_US Max Value\n");
+            err = TestWriteAttributeEpochUsMaxValue_137();
             break;
         case 138:
-            ChipLogProgress(chipTool, " ***** Test Step 138 : Read attribute EPOCH_US Min Value\n");
-            err = TestReadAttributeEpochUsMinValue_138();
+            ChipLogProgress(chipTool, " ***** Test Step 138 : Read attribute EPOCH_US Max Value\n");
+            err = TestReadAttributeEpochUsMaxValue_138();
             break;
         case 139:
-            ChipLogProgress(chipTool, " ***** Test Step 139 : Read attribute EPOCH_S Default Value\n");
-            err = TestReadAttributeEpochSDefaultValue_139();
+            ChipLogProgress(chipTool, " ***** Test Step 139 : Write attribute EPOCH_US Min Value\n");
+            err = TestWriteAttributeEpochUsMinValue_139();
             break;
         case 140:
-            ChipLogProgress(chipTool, " ***** Test Step 140 : Write attribute EPOCH_S Max Value\n");
-            err = TestWriteAttributeEpochSMaxValue_140();
+            ChipLogProgress(chipTool, " ***** Test Step 140 : Read attribute EPOCH_US Min Value\n");
+            err = TestReadAttributeEpochUsMinValue_140();
             break;
         case 141:
-            ChipLogProgress(chipTool, " ***** Test Step 141 : Read attribute EPOCH_S Max Value\n");
-            err = TestReadAttributeEpochSMaxValue_141();
+            ChipLogProgress(chipTool, " ***** Test Step 141 : Read attribute EPOCH_S Default Value\n");
+            err = TestReadAttributeEpochSDefaultValue_141();
             break;
         case 142:
-            ChipLogProgress(chipTool, " ***** Test Step 142 : Write attribute EPOCH_S Min Value\n");
-            err = TestWriteAttributeEpochSMinValue_142();
+            ChipLogProgress(chipTool, " ***** Test Step 142 : Write attribute EPOCH_S Max Value\n");
+            err = TestWriteAttributeEpochSMaxValue_142();
             break;
         case 143:
-            ChipLogProgress(chipTool, " ***** Test Step 143 : Read attribute EPOCH_S Min Value\n");
-            err = TestReadAttributeEpochSMinValue_143();
+            ChipLogProgress(chipTool, " ***** Test Step 143 : Read attribute EPOCH_S Max Value\n");
+            err = TestReadAttributeEpochSMaxValue_143();
             break;
         case 144:
-            ChipLogProgress(chipTool, " ***** Test Step 144 : Read attribute UNSUPPORTED\n");
-            err = TestReadAttributeUnsupported_144();
+            ChipLogProgress(chipTool, " ***** Test Step 144 : Write attribute EPOCH_S Min Value\n");
+            err = TestWriteAttributeEpochSMinValue_144();
             break;
         case 145:
-            ChipLogProgress(chipTool, " ***** Test Step 145 : Writeattribute UNSUPPORTED\n");
-            err = TestWriteattributeUnsupported_145();
+            ChipLogProgress(chipTool, " ***** Test Step 145 : Read attribute EPOCH_S Min Value\n");
+            err = TestReadAttributeEpochSMinValue_145();
             break;
         case 146:
-            ChipLogProgress(chipTool, " ***** Test Step 146 : Send Test Command to unsupported endpoint\n");
-            err = TestSendTestCommandToUnsupportedEndpoint_146();
+            ChipLogProgress(chipTool, " ***** Test Step 146 : Read attribute UNSUPPORTED\n");
+            err = TestReadAttributeUnsupported_146();
             break;
         case 147:
-            ChipLogProgress(chipTool, " ***** Test Step 147 : Send Test Command to unsupported cluster\n");
-            err = TestSendTestCommandToUnsupportedCluster_147();
+            ChipLogProgress(chipTool, " ***** Test Step 147 : Writeattribute UNSUPPORTED\n");
+            err = TestWriteattributeUnsupported_147();
             break;
         case 148:
-            ChipLogProgress(chipTool, " ***** Test Step 148 : Read attribute vendor_id Default Value\n");
-            err = TestReadAttributeVendorIdDefaultValue_148();
+            ChipLogProgress(chipTool, " ***** Test Step 148 : Send Test Command to unsupported endpoint\n");
+            err = TestSendTestCommandToUnsupportedEndpoint_148();
             break;
         case 149:
-            ChipLogProgress(chipTool, " ***** Test Step 149 : Write attribute vendor_id\n");
-            err = TestWriteAttributeVendorId_149();
+            ChipLogProgress(chipTool, " ***** Test Step 149 : Send Test Command to unsupported cluster\n");
+            err = TestSendTestCommandToUnsupportedCluster_149();
             break;
         case 150:
-            ChipLogProgress(chipTool, " ***** Test Step 150 : Read attribute vendor_id\n");
-            err = TestReadAttributeVendorId_150();
+            ChipLogProgress(chipTool, " ***** Test Step 150 : Read attribute vendor_id Default Value\n");
+            err = TestReadAttributeVendorIdDefaultValue_150();
             break;
         case 151:
-            ChipLogProgress(chipTool, " ***** Test Step 151 : Restore attribute vendor_id\n");
-            err = TestRestoreAttributeVendorId_151();
+            ChipLogProgress(chipTool, " ***** Test Step 151 : Write attribute vendor_id\n");
+            err = TestWriteAttributeVendorId_151();
             break;
         case 152:
-            ChipLogProgress(chipTool, " ***** Test Step 152 : Send a command with a vendor_id and enum\n");
-            err = TestSendACommandWithAVendorIdAndEnum_152();
+            ChipLogProgress(chipTool, " ***** Test Step 152 : Read attribute vendor_id\n");
+            err = TestReadAttributeVendorId_152();
             break;
         case 153:
-            ChipLogProgress(chipTool, " ***** Test Step 153 : Send Test Command With Struct Argument and arg1.b is true\n");
-            err = TestSendTestCommandWithStructArgumentAndArg1bIsTrue_153();
+            ChipLogProgress(chipTool, " ***** Test Step 153 : Restore attribute vendor_id\n");
+            err = TestRestoreAttributeVendorId_153();
             break;
         case 154:
-            ChipLogProgress(chipTool, " ***** Test Step 154 : Send Test Command With Struct Argument and arg1.b is false\n");
-            err = TestSendTestCommandWithStructArgumentAndArg1bIsFalse_154();
+            ChipLogProgress(chipTool, " ***** Test Step 154 : Send a command with a vendor_id and enum\n");
+            err = TestSendACommandWithAVendorIdAndEnum_154();
             break;
         case 155:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 155 : Send Test Command With Nested Struct Argument and arg1.c.b is true\n");
-            err = TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_155();
+            ChipLogProgress(chipTool, " ***** Test Step 155 : Send Test Command With Struct Argument and arg1.b is true\n");
+            err = TestSendTestCommandWithStructArgumentAndArg1bIsTrue_155();
             break;
         case 156:
-            ChipLogProgress(chipTool, " ***** Test Step 156 : Send Test Command With Nested Struct Argument arg1.c.b is false\n");
-            err = TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_156();
+            ChipLogProgress(chipTool, " ***** Test Step 156 : Send Test Command With Struct Argument and arg1.b is false\n");
+            err = TestSendTestCommandWithStructArgumentAndArg1bIsFalse_156();
             break;
         case 157:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 157 : Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true\n");
-            err = TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_157();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 157 : Send Test Command With Nested Struct Argument and arg1.c.b is true\n");
+            err = TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_157();
             break;
         case 158:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 158 : Send Test Command With Nested Struct List Argument and some fields b of arg1.d are "
-                "false\n");
-            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_158();
+            ChipLogProgress(chipTool, " ***** Test Step 158 : Send Test Command With Nested Struct Argument arg1.c.b is false\n");
+            err = TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_158();
             break;
         case 159:
-            ChipLogProgress(chipTool, " ***** Test Step 159 : Send Test Command With Struct Argument and see what we get back\n");
-            err = TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_159();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 159 : Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true\n");
+            err = TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_159();
             break;
         case 160:
-            ChipLogProgress(chipTool, " ***** Test Step 160 : Send Test Command With List of INT8U and none of them is set to 0\n");
-            err = TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_160();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 160 : Send Test Command With Nested Struct List Argument and some fields b of arg1.d are "
+                "false\n");
+            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_160();
             break;
         case 161:
-            ChipLogProgress(chipTool, " ***** Test Step 161 : Send Test Command With List of INT8U and one of them is set to 0\n");
-            err = TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_161();
+            ChipLogProgress(chipTool, " ***** Test Step 161 : Send Test Command With Struct Argument and see what we get back\n");
+            err = TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_161();
             break;
         case 162:
-            ChipLogProgress(chipTool, " ***** Test Step 162 : Send Test Command With List of INT8U and get it reversed\n");
-            err = TestSendTestCommandWithListOfInt8uAndGetItReversed_162();
+            ChipLogProgress(chipTool, " ***** Test Step 162 : Send Test Command With List of INT8U and none of them is set to 0\n");
+            err = TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_162();
             break;
         case 163:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 163 : Send Test Command With empty List of INT8U and get an empty list back\n");
-            err = TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_163();
+            ChipLogProgress(chipTool, " ***** Test Step 163 : Send Test Command With List of INT8U and one of them is set to 0\n");
+            err = TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_163();
             break;
         case 164:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 164 : Send Test Command With List of Struct Argument and arg1.b of first item is true\n");
-            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_164();
+            ChipLogProgress(chipTool, " ***** Test Step 164 : Send Test Command With List of INT8U and get it reversed\n");
+            err = TestSendTestCommandWithListOfInt8uAndGetItReversed_164();
             break;
         case 165:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 165 : Send Test Command With List of Struct Argument and arg1.b of first item is false\n");
-            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_165();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 165 : Send Test Command With empty List of INT8U and get an empty list back\n");
+            err = TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_165();
             break;
         case 166:
             ChipLogProgress(chipTool,
-                " ***** Test Step 166 : Send Test Command With List of Nested Struct List Argument and all fields b of elements of "
-                "arg1.d are true\n");
-            err = TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_166();
+                " ***** Test Step 166 : Send Test Command With List of Struct Argument and arg1.b of first item is true\n");
+            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_166();
             break;
         case 167:
             ChipLogProgress(chipTool,
-                " ***** Test Step 167 : Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d "
-                "are false\n");
-            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_167();
+                " ***** Test Step 167 : Send Test Command With List of Struct Argument and arg1.b of first item is false\n");
+            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_167();
             break;
         case 168:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 168 : Write attribute LIST With List of INT8U and none of them is set to 0\n");
-            err = TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_168();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 168 : Send Test Command With List of Nested Struct List Argument and all fields b of elements of "
+                "arg1.d are true\n");
+            err = TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_168();
             break;
         case 169:
-            ChipLogProgress(chipTool, " ***** Test Step 169 : Read attribute LIST With List of INT8U\n");
-            err = TestReadAttributeListWithListOfInt8u_169();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 169 : Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d "
+                "are false\n");
+            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_169();
             break;
         case 170:
-            ChipLogProgress(chipTool, " ***** Test Step 170 : Write attribute LIST With List of OCTET_STRING\n");
-            err = TestWriteAttributeListWithListOfOctetString_170();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 170 : Write attribute LIST With List of INT8U and none of them is set to 0\n");
+            err = TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_170();
             break;
         case 171:
-            ChipLogProgress(chipTool, " ***** Test Step 171 : Read attribute LIST With List of OCTET_STRING\n");
-            err = TestReadAttributeListWithListOfOctetString_171();
+            ChipLogProgress(chipTool, " ***** Test Step 171 : Read attribute LIST With List of INT8U\n");
+            err = TestReadAttributeListWithListOfInt8u_171();
             break;
         case 172:
-            ChipLogProgress(chipTool, " ***** Test Step 172 : Write attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
-            err = TestWriteAttributeListWithListOfListStructOctetString_172();
+            ChipLogProgress(chipTool, " ***** Test Step 172 : Write attribute LIST With List of OCTET_STRING\n");
+            err = TestWriteAttributeListWithListOfOctetString_172();
             break;
         case 173:
-            ChipLogProgress(chipTool, " ***** Test Step 173 : Read attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
-            err = TestReadAttributeListWithListOfListStructOctetString_173();
+            ChipLogProgress(chipTool, " ***** Test Step 173 : Read attribute LIST With List of OCTET_STRING\n");
+            err = TestReadAttributeListWithListOfOctetString_173();
             break;
         case 174:
-            ChipLogProgress(chipTool, " ***** Test Step 174 : Send Test Command with optional arg set.\n");
-            err = TestSendTestCommandWithOptionalArgSet_174();
+            ChipLogProgress(chipTool, " ***** Test Step 174 : Write attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
+            err = TestWriteAttributeListWithListOfListStructOctetString_174();
             break;
         case 175:
-            ChipLogProgress(chipTool, " ***** Test Step 175 : Send Test Command without its optional arg.\n");
-            err = TestSendTestCommandWithoutItsOptionalArg_175();
+            ChipLogProgress(chipTool, " ***** Test Step 175 : Read attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
+            err = TestReadAttributeListWithListOfListStructOctetString_175();
             break;
         case 176:
-            ChipLogProgress(chipTool, " ***** Test Step 176 : Read list of structs containing nullables and optionals\n");
-            err = TestReadListOfStructsContainingNullablesAndOptionals_176();
+            ChipLogProgress(chipTool, " ***** Test Step 176 : Send Test Command with optional arg set.\n");
+            err = TestSendTestCommandWithOptionalArgSet_176();
             break;
         case 177:
-            ChipLogProgress(chipTool, " ***** Test Step 177 : Write list of structs containing nullables and optionals\n");
-            err = TestWriteListOfStructsContainingNullablesAndOptionals_177();
+            ChipLogProgress(chipTool, " ***** Test Step 177 : Send Test Command without its optional arg.\n");
+            err = TestSendTestCommandWithoutItsOptionalArg_177();
             break;
         case 178:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 178 : Read list of structs containing nullables and optionals after writing\n");
-            err = TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_178();
+            ChipLogProgress(chipTool, " ***** Test Step 178 : Read list of structs containing nullables and optionals\n");
+            err = TestReadListOfStructsContainingNullablesAndOptionals_178();
             break;
         case 179:
-            ChipLogProgress(chipTool, " ***** Test Step 179 : Write attribute NULLABLE_BOOLEAN null\n");
-            err = TestWriteAttributeNullableBooleanNull_179();
+            ChipLogProgress(chipTool, " ***** Test Step 179 : Write list of structs containing nullables and optionals\n");
+            err = TestWriteListOfStructsContainingNullablesAndOptionals_179();
             break;
         case 180:
-            ChipLogProgress(chipTool, " ***** Test Step 180 : Read attribute NULLABLE_BOOLEAN null\n");
-            err = TestReadAttributeNullableBooleanNull_180();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 180 : Read list of structs containing nullables and optionals after writing\n");
+            err = TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_180();
             break;
         case 181:
-            ChipLogProgress(chipTool, " ***** Test Step 181 : Write attribute NULLABLE_BOOLEAN True\n");
-            err = TestWriteAttributeNullableBooleanTrue_181();
+            ChipLogProgress(chipTool, " ***** Test Step 181 : Write attribute NULLABLE_BOOLEAN null\n");
+            err = TestWriteAttributeNullableBooleanNull_181();
             break;
         case 182:
-            ChipLogProgress(chipTool, " ***** Test Step 182 : Read attribute NULLABLE_BOOLEAN True\n");
-            err = TestReadAttributeNullableBooleanTrue_182();
+            ChipLogProgress(chipTool, " ***** Test Step 182 : Read attribute NULLABLE_BOOLEAN null\n");
+            err = TestReadAttributeNullableBooleanNull_182();
             break;
         case 183:
-            ChipLogProgress(chipTool, " ***** Test Step 183 : Read attribute NULLABLE_BOOLEAN not null\n");
-            err = TestReadAttributeNullableBooleanNotNull_183();
+            ChipLogProgress(chipTool, " ***** Test Step 183 : Write attribute NULLABLE_BOOLEAN True\n");
+            err = TestWriteAttributeNullableBooleanTrue_183();
             break;
         case 184:
-            ChipLogProgress(chipTool, " ***** Test Step 184 : Write attribute NULLABLE_BITMAP8 Max Value\n");
-            err = TestWriteAttributeNullableBitmap8MaxValue_184();
+            ChipLogProgress(chipTool, " ***** Test Step 184 : Read attribute NULLABLE_BOOLEAN True\n");
+            err = TestReadAttributeNullableBooleanTrue_184();
             break;
         case 185:
-            ChipLogProgress(chipTool, " ***** Test Step 185 : Read attribute NULLABLE_BITMAP8 Max Value\n");
-            err = TestReadAttributeNullableBitmap8MaxValue_185();
+            ChipLogProgress(chipTool, " ***** Test Step 185 : Read attribute NULLABLE_BOOLEAN not null\n");
+            err = TestReadAttributeNullableBooleanNotNull_185();
             break;
         case 186:
-            ChipLogProgress(chipTool, " ***** Test Step 186 : Write attribute NULLABLE_BITMAP8 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap8InvalidValue_186();
+            ChipLogProgress(chipTool, " ***** Test Step 186 : Write attribute NULLABLE_BITMAP8 Max Value\n");
+            err = TestWriteAttributeNullableBitmap8MaxValue_186();
             break;
         case 187:
-            ChipLogProgress(chipTool, " ***** Test Step 187 : Read attribute NULLABLE_BITMAP8 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap8UnchangedValue_187();
+            ChipLogProgress(chipTool, " ***** Test Step 187 : Read attribute NULLABLE_BITMAP8 Max Value\n");
+            err = TestReadAttributeNullableBitmap8MaxValue_187();
             break;
         case 188:
-            ChipLogProgress(chipTool, " ***** Test Step 188 : Write attribute NULLABLE_BITMAP8 null Value\n");
-            err = TestWriteAttributeNullableBitmap8NullValue_188();
+            ChipLogProgress(chipTool, " ***** Test Step 188 : Write attribute NULLABLE_BITMAP8 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap8InvalidValue_188();
             break;
         case 189:
-            ChipLogProgress(chipTool, " ***** Test Step 189 : Read attribute NULLABLE_BITMAP8 null Value\n");
-            err = TestReadAttributeNullableBitmap8NullValue_189();
+            ChipLogProgress(chipTool, " ***** Test Step 189 : Read attribute NULLABLE_BITMAP8 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap8UnchangedValue_189();
             break;
         case 190:
-            ChipLogProgress(chipTool, " ***** Test Step 190 : Read attribute NULLABLE_BITMAP8 not 254 Value\n");
-            err = TestReadAttributeNullableBitmap8Not254Value_190();
+            ChipLogProgress(chipTool, " ***** Test Step 190 : Write attribute NULLABLE_BITMAP8 null Value\n");
+            err = TestWriteAttributeNullableBitmap8NullValue_190();
             break;
         case 191:
-            ChipLogProgress(chipTool, " ***** Test Step 191 : Write attribute NULLABLE_BITMAP16 Max Value\n");
-            err = TestWriteAttributeNullableBitmap16MaxValue_191();
+            ChipLogProgress(chipTool, " ***** Test Step 191 : Read attribute NULLABLE_BITMAP8 null Value\n");
+            err = TestReadAttributeNullableBitmap8NullValue_191();
             break;
         case 192:
-            ChipLogProgress(chipTool, " ***** Test Step 192 : Read attribute NULLABLE_BITMAP16 Max Value\n");
-            err = TestReadAttributeNullableBitmap16MaxValue_192();
+            ChipLogProgress(chipTool, " ***** Test Step 192 : Read attribute NULLABLE_BITMAP8 not 254 Value\n");
+            err = TestReadAttributeNullableBitmap8Not254Value_192();
             break;
         case 193:
-            ChipLogProgress(chipTool, " ***** Test Step 193 : Write attribute NULLABLE_BITMAP16 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap16InvalidValue_193();
+            ChipLogProgress(chipTool, " ***** Test Step 193 : Write attribute NULLABLE_BITMAP16 Max Value\n");
+            err = TestWriteAttributeNullableBitmap16MaxValue_193();
             break;
         case 194:
-            ChipLogProgress(chipTool, " ***** Test Step 194 : Read attribute NULLABLE_BITMAP16 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap16UnchangedValue_194();
+            ChipLogProgress(chipTool, " ***** Test Step 194 : Read attribute NULLABLE_BITMAP16 Max Value\n");
+            err = TestReadAttributeNullableBitmap16MaxValue_194();
             break;
         case 195:
-            ChipLogProgress(chipTool, " ***** Test Step 195 : Write attribute NULLABLE_BITMAP16 null Value\n");
-            err = TestWriteAttributeNullableBitmap16NullValue_195();
+            ChipLogProgress(chipTool, " ***** Test Step 195 : Write attribute NULLABLE_BITMAP16 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap16InvalidValue_195();
             break;
         case 196:
-            ChipLogProgress(chipTool, " ***** Test Step 196 : Read attribute NULLABLE_BITMAP16 null Value\n");
-            err = TestReadAttributeNullableBitmap16NullValue_196();
+            ChipLogProgress(chipTool, " ***** Test Step 196 : Read attribute NULLABLE_BITMAP16 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap16UnchangedValue_196();
             break;
         case 197:
-            ChipLogProgress(chipTool, " ***** Test Step 197 : Write attribute NULLABLE_BITMAP32 Max Value\n");
-            err = TestWriteAttributeNullableBitmap32MaxValue_197();
+            ChipLogProgress(chipTool, " ***** Test Step 197 : Write attribute NULLABLE_BITMAP16 null Value\n");
+            err = TestWriteAttributeNullableBitmap16NullValue_197();
             break;
         case 198:
-            ChipLogProgress(chipTool, " ***** Test Step 198 : Read attribute NULLABLE_BITMAP32 Max Value\n");
-            err = TestReadAttributeNullableBitmap32MaxValue_198();
+            ChipLogProgress(chipTool, " ***** Test Step 198 : Read attribute NULLABLE_BITMAP16 null Value\n");
+            err = TestReadAttributeNullableBitmap16NullValue_198();
             break;
         case 199:
-            ChipLogProgress(chipTool, " ***** Test Step 199 : Write attribute NULLABLE_BITMAP32 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap32InvalidValue_199();
+            ChipLogProgress(chipTool, " ***** Test Step 199 : Write attribute NULLABLE_BITMAP32 Max Value\n");
+            err = TestWriteAttributeNullableBitmap32MaxValue_199();
             break;
         case 200:
-            ChipLogProgress(chipTool, " ***** Test Step 200 : Read attribute NULLABLE_BITMAP32 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap32UnchangedValue_200();
+            ChipLogProgress(chipTool, " ***** Test Step 200 : Read attribute NULLABLE_BITMAP32 Max Value\n");
+            err = TestReadAttributeNullableBitmap32MaxValue_200();
             break;
         case 201:
-            ChipLogProgress(chipTool, " ***** Test Step 201 : Write attribute NULLABLE_BITMAP32 null Value\n");
-            err = TestWriteAttributeNullableBitmap32NullValue_201();
+            ChipLogProgress(chipTool, " ***** Test Step 201 : Write attribute NULLABLE_BITMAP32 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap32InvalidValue_201();
             break;
         case 202:
-            ChipLogProgress(chipTool, " ***** Test Step 202 : Read attribute NULLABLE_BITMAP32 null Value\n");
-            err = TestReadAttributeNullableBitmap32NullValue_202();
+            ChipLogProgress(chipTool, " ***** Test Step 202 : Read attribute NULLABLE_BITMAP32 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap32UnchangedValue_202();
             break;
         case 203:
-            ChipLogProgress(chipTool, " ***** Test Step 203 : Write attribute NULLABLE_BITMAP64 Max Value\n");
-            err = TestWriteAttributeNullableBitmap64MaxValue_203();
+            ChipLogProgress(chipTool, " ***** Test Step 203 : Write attribute NULLABLE_BITMAP32 null Value\n");
+            err = TestWriteAttributeNullableBitmap32NullValue_203();
             break;
         case 204:
-            ChipLogProgress(chipTool, " ***** Test Step 204 : Read attribute NULLABLE_BITMAP64 Max Value\n");
-            err = TestReadAttributeNullableBitmap64MaxValue_204();
+            ChipLogProgress(chipTool, " ***** Test Step 204 : Read attribute NULLABLE_BITMAP32 null Value\n");
+            err = TestReadAttributeNullableBitmap32NullValue_204();
             break;
         case 205:
-            ChipLogProgress(chipTool, " ***** Test Step 205 : Write attribute NULLABLE_BITMAP64 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap64InvalidValue_205();
+            ChipLogProgress(chipTool, " ***** Test Step 205 : Write attribute NULLABLE_BITMAP64 Max Value\n");
+            err = TestWriteAttributeNullableBitmap64MaxValue_205();
             break;
         case 206:
-            ChipLogProgress(chipTool, " ***** Test Step 206 : Read attribute NULLABLE_BITMAP64 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap64UnchangedValue_206();
+            ChipLogProgress(chipTool, " ***** Test Step 206 : Read attribute NULLABLE_BITMAP64 Max Value\n");
+            err = TestReadAttributeNullableBitmap64MaxValue_206();
             break;
         case 207:
-            ChipLogProgress(chipTool, " ***** Test Step 207 : Write attribute NULLABLE_BITMAP64 null Value\n");
-            err = TestWriteAttributeNullableBitmap64NullValue_207();
+            ChipLogProgress(chipTool, " ***** Test Step 207 : Write attribute NULLABLE_BITMAP64 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap64InvalidValue_207();
             break;
         case 208:
-            ChipLogProgress(chipTool, " ***** Test Step 208 : Read attribute NULLABLE_BITMAP64 null Value\n");
-            err = TestReadAttributeNullableBitmap64NullValue_208();
+            ChipLogProgress(chipTool, " ***** Test Step 208 : Read attribute NULLABLE_BITMAP64 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap64UnchangedValue_208();
             break;
         case 209:
-            ChipLogProgress(chipTool, " ***** Test Step 209 : Write attribute NULLABLE_INT8U Min Value\n");
-            err = TestWriteAttributeNullableInt8uMinValue_209();
+            ChipLogProgress(chipTool, " ***** Test Step 209 : Write attribute NULLABLE_BITMAP64 null Value\n");
+            err = TestWriteAttributeNullableBitmap64NullValue_209();
             break;
         case 210:
-            ChipLogProgress(chipTool, " ***** Test Step 210 : Read attribute NULLABLE_INT8U Min Value\n");
-            err = TestReadAttributeNullableInt8uMinValue_210();
+            ChipLogProgress(chipTool, " ***** Test Step 210 : Read attribute NULLABLE_BITMAP64 null Value\n");
+            err = TestReadAttributeNullableBitmap64NullValue_210();
             break;
         case 211:
-            ChipLogProgress(chipTool, " ***** Test Step 211 : Write attribute NULLABLE_INT8U Max Value\n");
-            err = TestWriteAttributeNullableInt8uMaxValue_211();
+            ChipLogProgress(chipTool, " ***** Test Step 211 : Write attribute NULLABLE_INT8U Min Value\n");
+            err = TestWriteAttributeNullableInt8uMinValue_211();
             break;
         case 212:
-            ChipLogProgress(chipTool, " ***** Test Step 212 : Read attribute NULLABLE_INT8U Max Value\n");
-            err = TestReadAttributeNullableInt8uMaxValue_212();
+            ChipLogProgress(chipTool, " ***** Test Step 212 : Read attribute NULLABLE_INT8U Min Value\n");
+            err = TestReadAttributeNullableInt8uMinValue_212();
             break;
         case 213:
-            ChipLogProgress(chipTool, " ***** Test Step 213 : Write attribute NULLABLE_INT8U Invalid Value\n");
-            err = TestWriteAttributeNullableInt8uInvalidValue_213();
+            ChipLogProgress(chipTool, " ***** Test Step 213 : Write attribute NULLABLE_INT8U Max Value\n");
+            err = TestWriteAttributeNullableInt8uMaxValue_213();
             break;
         case 214:
-            ChipLogProgress(chipTool, " ***** Test Step 214 : Read attribute NULLABLE_INT8U unchanged Value\n");
-            err = TestReadAttributeNullableInt8uUnchangedValue_214();
+            ChipLogProgress(chipTool, " ***** Test Step 214 : Read attribute NULLABLE_INT8U Max Value\n");
+            err = TestReadAttributeNullableInt8uMaxValue_214();
             break;
         case 215:
-            ChipLogProgress(chipTool, " ***** Test Step 215 : Read attribute NULLABLE_INT8U unchanged Value with constraint\n");
-            err = TestReadAttributeNullableInt8uUnchangedValueWithConstraint_215();
+            ChipLogProgress(chipTool, " ***** Test Step 215 : Write attribute NULLABLE_INT8U Invalid Value\n");
+            err = TestWriteAttributeNullableInt8uInvalidValue_215();
             break;
         case 216:
-            ChipLogProgress(chipTool, " ***** Test Step 216 : Write attribute NULLABLE_INT8U null Value\n");
-            err = TestWriteAttributeNullableInt8uNullValue_216();
+            ChipLogProgress(chipTool, " ***** Test Step 216 : Read attribute NULLABLE_INT8U unchanged Value\n");
+            err = TestReadAttributeNullableInt8uUnchangedValue_216();
             break;
         case 217:
-            ChipLogProgress(chipTool, " ***** Test Step 217 : Read attribute NULLABLE_INT8U null Value\n");
-            err = TestReadAttributeNullableInt8uNullValue_217();
+            ChipLogProgress(chipTool, " ***** Test Step 217 : Read attribute NULLABLE_INT8U unchanged Value with constraint\n");
+            err = TestReadAttributeNullableInt8uUnchangedValueWithConstraint_217();
             break;
         case 218:
-            ChipLogProgress(chipTool, " ***** Test Step 218 : Read attribute NULLABLE_INT8U null Value & range\n");
-            err = TestReadAttributeNullableInt8uNullValueRange_218();
+            ChipLogProgress(chipTool, " ***** Test Step 218 : Write attribute NULLABLE_INT8U null Value\n");
+            err = TestWriteAttributeNullableInt8uNullValue_218();
             break;
         case 219:
-            ChipLogProgress(chipTool, " ***** Test Step 219 : Read attribute NULLABLE_INT8U null Value & not\n");
-            err = TestReadAttributeNullableInt8uNullValueNot_219();
+            ChipLogProgress(chipTool, " ***** Test Step 219 : Read attribute NULLABLE_INT8U null Value\n");
+            err = TestReadAttributeNullableInt8uNullValue_219();
             break;
         case 220:
-            ChipLogProgress(chipTool, " ***** Test Step 220 : Write attribute NULLABLE_INT8U Value\n");
-            err = TestWriteAttributeNullableInt8uValue_220();
+            ChipLogProgress(chipTool, " ***** Test Step 220 : Read attribute NULLABLE_INT8U null Value & range\n");
+            err = TestReadAttributeNullableInt8uNullValueRange_220();
             break;
         case 221:
-            ChipLogProgress(chipTool, " ***** Test Step 221 : Read attribute NULLABLE_INT8U Value in range\n");
-            err = TestReadAttributeNullableInt8uValueInRange_221();
+            ChipLogProgress(chipTool, " ***** Test Step 221 : Read attribute NULLABLE_INT8U null Value & not\n");
+            err = TestReadAttributeNullableInt8uNullValueNot_221();
             break;
         case 222:
-            ChipLogProgress(chipTool, " ***** Test Step 222 : Read attribute NULLABLE_INT8U notValue OK\n");
-            err = TestReadAttributeNullableInt8uNotValueOk_222();
+            ChipLogProgress(chipTool, " ***** Test Step 222 : Write attribute NULLABLE_INT8U Value\n");
+            err = TestWriteAttributeNullableInt8uValue_222();
             break;
         case 223:
-            ChipLogProgress(chipTool, " ***** Test Step 223 : Write attribute NULLABLE_INT16U Min Value\n");
-            err = TestWriteAttributeNullableInt16uMinValue_223();
+            ChipLogProgress(chipTool, " ***** Test Step 223 : Read attribute NULLABLE_INT8U Value in range\n");
+            err = TestReadAttributeNullableInt8uValueInRange_223();
             break;
         case 224:
-            ChipLogProgress(chipTool, " ***** Test Step 224 : Read attribute NULLABLE_INT16U Min Value\n");
-            err = TestReadAttributeNullableInt16uMinValue_224();
+            ChipLogProgress(chipTool, " ***** Test Step 224 : Read attribute NULLABLE_INT8U notValue OK\n");
+            err = TestReadAttributeNullableInt8uNotValueOk_224();
             break;
         case 225:
-            ChipLogProgress(chipTool, " ***** Test Step 225 : Write attribute NULLABLE_INT16U Max Value\n");
-            err = TestWriteAttributeNullableInt16uMaxValue_225();
+            ChipLogProgress(chipTool, " ***** Test Step 225 : Write attribute NULLABLE_INT16U Min Value\n");
+            err = TestWriteAttributeNullableInt16uMinValue_225();
             break;
         case 226:
-            ChipLogProgress(chipTool, " ***** Test Step 226 : Read attribute NULLABLE_INT16U Max Value\n");
-            err = TestReadAttributeNullableInt16uMaxValue_226();
+            ChipLogProgress(chipTool, " ***** Test Step 226 : Read attribute NULLABLE_INT16U Min Value\n");
+            err = TestReadAttributeNullableInt16uMinValue_226();
             break;
         case 227:
-            ChipLogProgress(chipTool, " ***** Test Step 227 : Write attribute NULLABLE_INT16U Invalid Value\n");
-            err = TestWriteAttributeNullableInt16uInvalidValue_227();
+            ChipLogProgress(chipTool, " ***** Test Step 227 : Write attribute NULLABLE_INT16U Max Value\n");
+            err = TestWriteAttributeNullableInt16uMaxValue_227();
             break;
         case 228:
-            ChipLogProgress(chipTool, " ***** Test Step 228 : Read attribute NULLABLE_INT16U unchanged Value\n");
-            err = TestReadAttributeNullableInt16uUnchangedValue_228();
+            ChipLogProgress(chipTool, " ***** Test Step 228 : Read attribute NULLABLE_INT16U Max Value\n");
+            err = TestReadAttributeNullableInt16uMaxValue_228();
             break;
         case 229:
-            ChipLogProgress(chipTool, " ***** Test Step 229 : Write attribute NULLABLE_INT16U null Value\n");
-            err = TestWriteAttributeNullableInt16uNullValue_229();
+            ChipLogProgress(chipTool, " ***** Test Step 229 : Write attribute NULLABLE_INT16U Invalid Value\n");
+            err = TestWriteAttributeNullableInt16uInvalidValue_229();
             break;
         case 230:
-            ChipLogProgress(chipTool, " ***** Test Step 230 : Read attribute NULLABLE_INT16U null Value\n");
-            err = TestReadAttributeNullableInt16uNullValue_230();
+            ChipLogProgress(chipTool, " ***** Test Step 230 : Read attribute NULLABLE_INT16U unchanged Value\n");
+            err = TestReadAttributeNullableInt16uUnchangedValue_230();
             break;
         case 231:
-            ChipLogProgress(chipTool, " ***** Test Step 231 : Read attribute NULLABLE_INT16U null Value & range\n");
-            err = TestReadAttributeNullableInt16uNullValueRange_231();
+            ChipLogProgress(chipTool, " ***** Test Step 231 : Write attribute NULLABLE_INT16U null Value\n");
+            err = TestWriteAttributeNullableInt16uNullValue_231();
             break;
         case 232:
-            ChipLogProgress(chipTool, " ***** Test Step 232 : Read attribute NULLABLE_INT16U null Value & not\n");
-            err = TestReadAttributeNullableInt16uNullValueNot_232();
+            ChipLogProgress(chipTool, " ***** Test Step 232 : Read attribute NULLABLE_INT16U null Value\n");
+            err = TestReadAttributeNullableInt16uNullValue_232();
             break;
         case 233:
-            ChipLogProgress(chipTool, " ***** Test Step 233 : Write attribute NULLABLE_INT16U Value\n");
-            err = TestWriteAttributeNullableInt16uValue_233();
+            ChipLogProgress(chipTool, " ***** Test Step 233 : Read attribute NULLABLE_INT16U null Value & range\n");
+            err = TestReadAttributeNullableInt16uNullValueRange_233();
             break;
         case 234:
-            ChipLogProgress(chipTool, " ***** Test Step 234 : Read attribute NULLABLE_INT16U Value in range\n");
-            err = TestReadAttributeNullableInt16uValueInRange_234();
+            ChipLogProgress(chipTool, " ***** Test Step 234 : Read attribute NULLABLE_INT16U null Value & not\n");
+            err = TestReadAttributeNullableInt16uNullValueNot_234();
             break;
         case 235:
-            ChipLogProgress(chipTool, " ***** Test Step 235 : Read attribute NULLABLE_INT16U notValue OK\n");
-            err = TestReadAttributeNullableInt16uNotValueOk_235();
+            ChipLogProgress(chipTool, " ***** Test Step 235 : Write attribute NULLABLE_INT16U Value\n");
+            err = TestWriteAttributeNullableInt16uValue_235();
             break;
         case 236:
-            ChipLogProgress(chipTool, " ***** Test Step 236 : Write attribute NULLABLE_INT32U Min Value\n");
-            err = TestWriteAttributeNullableInt32uMinValue_236();
+            ChipLogProgress(chipTool, " ***** Test Step 236 : Read attribute NULLABLE_INT16U Value in range\n");
+            err = TestReadAttributeNullableInt16uValueInRange_236();
             break;
         case 237:
-            ChipLogProgress(chipTool, " ***** Test Step 237 : Read attribute NULLABLE_INT32U Min Value\n");
-            err = TestReadAttributeNullableInt32uMinValue_237();
+            ChipLogProgress(chipTool, " ***** Test Step 237 : Read attribute NULLABLE_INT16U notValue OK\n");
+            err = TestReadAttributeNullableInt16uNotValueOk_237();
             break;
         case 238:
-            ChipLogProgress(chipTool, " ***** Test Step 238 : Write attribute NULLABLE_INT32U Max Value\n");
-            err = TestWriteAttributeNullableInt32uMaxValue_238();
+            ChipLogProgress(chipTool, " ***** Test Step 238 : Write attribute NULLABLE_INT32U Min Value\n");
+            err = TestWriteAttributeNullableInt32uMinValue_238();
             break;
         case 239:
-            ChipLogProgress(chipTool, " ***** Test Step 239 : Read attribute NULLABLE_INT32U Max Value\n");
-            err = TestReadAttributeNullableInt32uMaxValue_239();
+            ChipLogProgress(chipTool, " ***** Test Step 239 : Read attribute NULLABLE_INT32U Min Value\n");
+            err = TestReadAttributeNullableInt32uMinValue_239();
             break;
         case 240:
-            ChipLogProgress(chipTool, " ***** Test Step 240 : Write attribute NULLABLE_INT32U Invalid Value\n");
-            err = TestWriteAttributeNullableInt32uInvalidValue_240();
+            ChipLogProgress(chipTool, " ***** Test Step 240 : Write attribute NULLABLE_INT32U Max Value\n");
+            err = TestWriteAttributeNullableInt32uMaxValue_240();
             break;
         case 241:
-            ChipLogProgress(chipTool, " ***** Test Step 241 : Read attribute NULLABLE_INT32U unchanged Value\n");
-            err = TestReadAttributeNullableInt32uUnchangedValue_241();
+            ChipLogProgress(chipTool, " ***** Test Step 241 : Read attribute NULLABLE_INT32U Max Value\n");
+            err = TestReadAttributeNullableInt32uMaxValue_241();
             break;
         case 242:
-            ChipLogProgress(chipTool, " ***** Test Step 242 : Write attribute NULLABLE_INT32U null Value\n");
-            err = TestWriteAttributeNullableInt32uNullValue_242();
+            ChipLogProgress(chipTool, " ***** Test Step 242 : Write attribute NULLABLE_INT32U Invalid Value\n");
+            err = TestWriteAttributeNullableInt32uInvalidValue_242();
             break;
         case 243:
-            ChipLogProgress(chipTool, " ***** Test Step 243 : Read attribute NULLABLE_INT32U null Value\n");
-            err = TestReadAttributeNullableInt32uNullValue_243();
+            ChipLogProgress(chipTool, " ***** Test Step 243 : Read attribute NULLABLE_INT32U unchanged Value\n");
+            err = TestReadAttributeNullableInt32uUnchangedValue_243();
             break;
         case 244:
-            ChipLogProgress(chipTool, " ***** Test Step 244 : Read attribute NULLABLE_INT32U null Value & range\n");
-            err = TestReadAttributeNullableInt32uNullValueRange_244();
+            ChipLogProgress(chipTool, " ***** Test Step 244 : Write attribute NULLABLE_INT32U null Value\n");
+            err = TestWriteAttributeNullableInt32uNullValue_244();
             break;
         case 245:
-            ChipLogProgress(chipTool, " ***** Test Step 245 : Read attribute NULLABLE_INT32U null Value & not\n");
-            err = TestReadAttributeNullableInt32uNullValueNot_245();
+            ChipLogProgress(chipTool, " ***** Test Step 245 : Read attribute NULLABLE_INT32U null Value\n");
+            err = TestReadAttributeNullableInt32uNullValue_245();
             break;
         case 246:
-            ChipLogProgress(chipTool, " ***** Test Step 246 : Write attribute NULLABLE_INT32U Value\n");
-            err = TestWriteAttributeNullableInt32uValue_246();
+            ChipLogProgress(chipTool, " ***** Test Step 246 : Read attribute NULLABLE_INT32U null Value & range\n");
+            err = TestReadAttributeNullableInt32uNullValueRange_246();
             break;
         case 247:
-            ChipLogProgress(chipTool, " ***** Test Step 247 : Read attribute NULLABLE_INT32U Value in range\n");
-            err = TestReadAttributeNullableInt32uValueInRange_247();
+            ChipLogProgress(chipTool, " ***** Test Step 247 : Read attribute NULLABLE_INT32U null Value & not\n");
+            err = TestReadAttributeNullableInt32uNullValueNot_247();
             break;
         case 248:
-            ChipLogProgress(chipTool, " ***** Test Step 248 : Read attribute NULLABLE_INT32U notValue OK\n");
-            err = TestReadAttributeNullableInt32uNotValueOk_248();
+            ChipLogProgress(chipTool, " ***** Test Step 248 : Write attribute NULLABLE_INT32U Value\n");
+            err = TestWriteAttributeNullableInt32uValue_248();
             break;
         case 249:
-            ChipLogProgress(chipTool, " ***** Test Step 249 : Write attribute NULLABLE_INT64U Min Value\n");
-            err = TestWriteAttributeNullableInt64uMinValue_249();
+            ChipLogProgress(chipTool, " ***** Test Step 249 : Read attribute NULLABLE_INT32U Value in range\n");
+            err = TestReadAttributeNullableInt32uValueInRange_249();
             break;
         case 250:
-            ChipLogProgress(chipTool, " ***** Test Step 250 : Read attribute NULLABLE_INT64U Min Value\n");
-            err = TestReadAttributeNullableInt64uMinValue_250();
+            ChipLogProgress(chipTool, " ***** Test Step 250 : Read attribute NULLABLE_INT32U notValue OK\n");
+            err = TestReadAttributeNullableInt32uNotValueOk_250();
             break;
         case 251:
-            ChipLogProgress(chipTool, " ***** Test Step 251 : Write attribute NULLABLE_INT64U Max Value\n");
-            err = TestWriteAttributeNullableInt64uMaxValue_251();
+            ChipLogProgress(chipTool, " ***** Test Step 251 : Write attribute NULLABLE_INT64U Min Value\n");
+            err = TestWriteAttributeNullableInt64uMinValue_251();
             break;
         case 252:
-            ChipLogProgress(chipTool, " ***** Test Step 252 : Read attribute NULLABLE_INT64U Max Value\n");
-            err = TestReadAttributeNullableInt64uMaxValue_252();
+            ChipLogProgress(chipTool, " ***** Test Step 252 : Read attribute NULLABLE_INT64U Min Value\n");
+            err = TestReadAttributeNullableInt64uMinValue_252();
             break;
         case 253:
-            ChipLogProgress(chipTool, " ***** Test Step 253 : Write attribute NULLABLE_INT64U Invalid Value\n");
-            err = TestWriteAttributeNullableInt64uInvalidValue_253();
+            ChipLogProgress(chipTool, " ***** Test Step 253 : Write attribute NULLABLE_INT64U Max Value\n");
+            err = TestWriteAttributeNullableInt64uMaxValue_253();
             break;
         case 254:
-            ChipLogProgress(chipTool, " ***** Test Step 254 : Read attribute NULLABLE_INT64U unchanged Value\n");
-            err = TestReadAttributeNullableInt64uUnchangedValue_254();
+            ChipLogProgress(chipTool, " ***** Test Step 254 : Read attribute NULLABLE_INT64U Max Value\n");
+            err = TestReadAttributeNullableInt64uMaxValue_254();
             break;
         case 255:
-            ChipLogProgress(chipTool, " ***** Test Step 255 : Write attribute NULLABLE_INT64U null Value\n");
-            err = TestWriteAttributeNullableInt64uNullValue_255();
+            ChipLogProgress(chipTool, " ***** Test Step 255 : Write attribute NULLABLE_INT64U Invalid Value\n");
+            err = TestWriteAttributeNullableInt64uInvalidValue_255();
             break;
         case 256:
-            ChipLogProgress(chipTool, " ***** Test Step 256 : Read attribute NULLABLE_INT64U null Value\n");
-            err = TestReadAttributeNullableInt64uNullValue_256();
+            ChipLogProgress(chipTool, " ***** Test Step 256 : Read attribute NULLABLE_INT64U unchanged Value\n");
+            err = TestReadAttributeNullableInt64uUnchangedValue_256();
             break;
         case 257:
-            ChipLogProgress(chipTool, " ***** Test Step 257 : Read attribute NULLABLE_INT64U null Value & range\n");
-            err = TestReadAttributeNullableInt64uNullValueRange_257();
+            ChipLogProgress(chipTool, " ***** Test Step 257 : Write attribute NULLABLE_INT64U null Value\n");
+            err = TestWriteAttributeNullableInt64uNullValue_257();
             break;
         case 258:
-            ChipLogProgress(chipTool, " ***** Test Step 258 : Read attribute NULLABLE_INT64U null Value & not\n");
-            err = TestReadAttributeNullableInt64uNullValueNot_258();
+            ChipLogProgress(chipTool, " ***** Test Step 258 : Read attribute NULLABLE_INT64U null Value\n");
+            err = TestReadAttributeNullableInt64uNullValue_258();
             break;
         case 259:
-            ChipLogProgress(chipTool, " ***** Test Step 259 : Write attribute NULLABLE_INT64U Value\n");
-            err = TestWriteAttributeNullableInt64uValue_259();
+            ChipLogProgress(chipTool, " ***** Test Step 259 : Read attribute NULLABLE_INT64U null Value & range\n");
+            err = TestReadAttributeNullableInt64uNullValueRange_259();
             break;
         case 260:
-            ChipLogProgress(chipTool, " ***** Test Step 260 : Read attribute NULLABLE_INT64U Value in range\n");
-            err = TestReadAttributeNullableInt64uValueInRange_260();
+            ChipLogProgress(chipTool, " ***** Test Step 260 : Read attribute NULLABLE_INT64U null Value & not\n");
+            err = TestReadAttributeNullableInt64uNullValueNot_260();
             break;
         case 261:
-            ChipLogProgress(chipTool, " ***** Test Step 261 : Read attribute NULLABLE_INT64U notValue OK\n");
-            err = TestReadAttributeNullableInt64uNotValueOk_261();
+            ChipLogProgress(chipTool, " ***** Test Step 261 : Write attribute NULLABLE_INT64U Value\n");
+            err = TestWriteAttributeNullableInt64uValue_261();
             break;
         case 262:
-            ChipLogProgress(chipTool, " ***** Test Step 262 : Write attribute NULLABLE_INT8S Min Value\n");
-            err = TestWriteAttributeNullableInt8sMinValue_262();
+            ChipLogProgress(chipTool, " ***** Test Step 262 : Read attribute NULLABLE_INT64U Value in range\n");
+            err = TestReadAttributeNullableInt64uValueInRange_262();
             break;
         case 263:
-            ChipLogProgress(chipTool, " ***** Test Step 263 : Read attribute NULLABLE_INT8S Min Value\n");
-            err = TestReadAttributeNullableInt8sMinValue_263();
+            ChipLogProgress(chipTool, " ***** Test Step 263 : Read attribute NULLABLE_INT64U notValue OK\n");
+            err = TestReadAttributeNullableInt64uNotValueOk_263();
             break;
         case 264:
-            ChipLogProgress(chipTool, " ***** Test Step 264 : Write attribute NULLABLE_INT8S Invalid Value\n");
-            err = TestWriteAttributeNullableInt8sInvalidValue_264();
+            ChipLogProgress(chipTool, " ***** Test Step 264 : Write attribute NULLABLE_INT8S Min Value\n");
+            err = TestWriteAttributeNullableInt8sMinValue_264();
             break;
         case 265:
-            ChipLogProgress(chipTool, " ***** Test Step 265 : Read attribute NULLABLE_INT8S unchanged Value\n");
-            err = TestReadAttributeNullableInt8sUnchangedValue_265();
+            ChipLogProgress(chipTool, " ***** Test Step 265 : Read attribute NULLABLE_INT8S Min Value\n");
+            err = TestReadAttributeNullableInt8sMinValue_265();
             break;
         case 266:
-            ChipLogProgress(chipTool, " ***** Test Step 266 : Write attribute NULLABLE_INT8S null Value\n");
-            err = TestWriteAttributeNullableInt8sNullValue_266();
+            ChipLogProgress(chipTool, " ***** Test Step 266 : Write attribute NULLABLE_INT8S Invalid Value\n");
+            err = TestWriteAttributeNullableInt8sInvalidValue_266();
             break;
         case 267:
-            ChipLogProgress(chipTool, " ***** Test Step 267 : Read attribute NULLABLE_INT8S null Value\n");
-            err = TestReadAttributeNullableInt8sNullValue_267();
+            ChipLogProgress(chipTool, " ***** Test Step 267 : Read attribute NULLABLE_INT8S unchanged Value\n");
+            err = TestReadAttributeNullableInt8sUnchangedValue_267();
             break;
         case 268:
-            ChipLogProgress(chipTool, " ***** Test Step 268 : Read attribute NULLABLE_INT8S null Value & range\n");
-            err = TestReadAttributeNullableInt8sNullValueRange_268();
+            ChipLogProgress(chipTool, " ***** Test Step 268 : Write attribute NULLABLE_INT8S null Value\n");
+            err = TestWriteAttributeNullableInt8sNullValue_268();
             break;
         case 269:
-            ChipLogProgress(chipTool, " ***** Test Step 269 : Read attribute NULLABLE_INT8S null Value & not\n");
-            err = TestReadAttributeNullableInt8sNullValueNot_269();
+            ChipLogProgress(chipTool, " ***** Test Step 269 : Read attribute NULLABLE_INT8S null Value\n");
+            err = TestReadAttributeNullableInt8sNullValue_269();
             break;
         case 270:
-            ChipLogProgress(chipTool, " ***** Test Step 270 : Write attribute NULLABLE_INT8S Value\n");
-            err = TestWriteAttributeNullableInt8sValue_270();
+            ChipLogProgress(chipTool, " ***** Test Step 270 : Read attribute NULLABLE_INT8S null Value & range\n");
+            err = TestReadAttributeNullableInt8sNullValueRange_270();
             break;
         case 271:
-            ChipLogProgress(chipTool, " ***** Test Step 271 : Read attribute NULLABLE_INT8S Value in range\n");
-            err = TestReadAttributeNullableInt8sValueInRange_271();
+            ChipLogProgress(chipTool, " ***** Test Step 271 : Read attribute NULLABLE_INT8S null Value & not\n");
+            err = TestReadAttributeNullableInt8sNullValueNot_271();
             break;
         case 272:
-            ChipLogProgress(chipTool, " ***** Test Step 272 : Read attribute NULLABLE_INT8S notValue OK\n");
-            err = TestReadAttributeNullableInt8sNotValueOk_272();
+            ChipLogProgress(chipTool, " ***** Test Step 272 : Write attribute NULLABLE_INT8S Value\n");
+            err = TestWriteAttributeNullableInt8sValue_272();
             break;
         case 273:
-            ChipLogProgress(chipTool, " ***** Test Step 273 : Write attribute NULLABLE_INT16S Min Value\n");
-            err = TestWriteAttributeNullableInt16sMinValue_273();
+            ChipLogProgress(chipTool, " ***** Test Step 273 : Read attribute NULLABLE_INT8S Value in range\n");
+            err = TestReadAttributeNullableInt8sValueInRange_273();
             break;
         case 274:
-            ChipLogProgress(chipTool, " ***** Test Step 274 : Read attribute NULLABLE_INT16S Min Value\n");
-            err = TestReadAttributeNullableInt16sMinValue_274();
+            ChipLogProgress(chipTool, " ***** Test Step 274 : Read attribute NULLABLE_INT8S notValue OK\n");
+            err = TestReadAttributeNullableInt8sNotValueOk_274();
             break;
         case 275:
-            ChipLogProgress(chipTool, " ***** Test Step 275 : Write attribute NULLABLE_INT16S Invalid Value\n");
-            err = TestWriteAttributeNullableInt16sInvalidValue_275();
+            ChipLogProgress(chipTool, " ***** Test Step 275 : Write attribute NULLABLE_INT16S Min Value\n");
+            err = TestWriteAttributeNullableInt16sMinValue_275();
             break;
         case 276:
-            ChipLogProgress(chipTool, " ***** Test Step 276 : Read attribute NULLABLE_INT16S unchanged Value\n");
-            err = TestReadAttributeNullableInt16sUnchangedValue_276();
+            ChipLogProgress(chipTool, " ***** Test Step 276 : Read attribute NULLABLE_INT16S Min Value\n");
+            err = TestReadAttributeNullableInt16sMinValue_276();
             break;
         case 277:
-            ChipLogProgress(chipTool, " ***** Test Step 277 : Write attribute NULLABLE_INT16S null Value\n");
-            err = TestWriteAttributeNullableInt16sNullValue_277();
+            ChipLogProgress(chipTool, " ***** Test Step 277 : Write attribute NULLABLE_INT16S Invalid Value\n");
+            err = TestWriteAttributeNullableInt16sInvalidValue_277();
             break;
         case 278:
-            ChipLogProgress(chipTool, " ***** Test Step 278 : Read attribute NULLABLE_INT16S null Value\n");
-            err = TestReadAttributeNullableInt16sNullValue_278();
+            ChipLogProgress(chipTool, " ***** Test Step 278 : Read attribute NULLABLE_INT16S unchanged Value\n");
+            err = TestReadAttributeNullableInt16sUnchangedValue_278();
             break;
         case 279:
-            ChipLogProgress(chipTool, " ***** Test Step 279 : Read attribute NULLABLE_INT16S null Value & range\n");
-            err = TestReadAttributeNullableInt16sNullValueRange_279();
+            ChipLogProgress(chipTool, " ***** Test Step 279 : Write attribute NULLABLE_INT16S null Value\n");
+            err = TestWriteAttributeNullableInt16sNullValue_279();
             break;
         case 280:
-            ChipLogProgress(chipTool, " ***** Test Step 280 : Read attribute NULLABLE_INT16S null Value & not\n");
-            err = TestReadAttributeNullableInt16sNullValueNot_280();
+            ChipLogProgress(chipTool, " ***** Test Step 280 : Read attribute NULLABLE_INT16S null Value\n");
+            err = TestReadAttributeNullableInt16sNullValue_280();
             break;
         case 281:
-            ChipLogProgress(chipTool, " ***** Test Step 281 : Write attribute NULLABLE_INT16S Value\n");
-            err = TestWriteAttributeNullableInt16sValue_281();
+            ChipLogProgress(chipTool, " ***** Test Step 281 : Read attribute NULLABLE_INT16S null Value & range\n");
+            err = TestReadAttributeNullableInt16sNullValueRange_281();
             break;
         case 282:
-            ChipLogProgress(chipTool, " ***** Test Step 282 : Read attribute NULLABLE_INT16S Value in range\n");
-            err = TestReadAttributeNullableInt16sValueInRange_282();
+            ChipLogProgress(chipTool, " ***** Test Step 282 : Read attribute NULLABLE_INT16S null Value & not\n");
+            err = TestReadAttributeNullableInt16sNullValueNot_282();
             break;
         case 283:
-            ChipLogProgress(chipTool, " ***** Test Step 283 : Read attribute NULLABLE_INT16S notValue OK\n");
-            err = TestReadAttributeNullableInt16sNotValueOk_283();
+            ChipLogProgress(chipTool, " ***** Test Step 283 : Write attribute NULLABLE_INT16S Value\n");
+            err = TestWriteAttributeNullableInt16sValue_283();
             break;
         case 284:
-            ChipLogProgress(chipTool, " ***** Test Step 284 : Write attribute NULLABLE_INT32S Min Value\n");
-            err = TestWriteAttributeNullableInt32sMinValue_284();
+            ChipLogProgress(chipTool, " ***** Test Step 284 : Read attribute NULLABLE_INT16S Value in range\n");
+            err = TestReadAttributeNullableInt16sValueInRange_284();
             break;
         case 285:
-            ChipLogProgress(chipTool, " ***** Test Step 285 : Read attribute NULLABLE_INT32S Min Value\n");
-            err = TestReadAttributeNullableInt32sMinValue_285();
+            ChipLogProgress(chipTool, " ***** Test Step 285 : Read attribute NULLABLE_INT16S notValue OK\n");
+            err = TestReadAttributeNullableInt16sNotValueOk_285();
             break;
         case 286:
-            ChipLogProgress(chipTool, " ***** Test Step 286 : Write attribute NULLABLE_INT32S Invalid Value\n");
-            err = TestWriteAttributeNullableInt32sInvalidValue_286();
+            ChipLogProgress(chipTool, " ***** Test Step 286 : Write attribute NULLABLE_INT32S Min Value\n");
+            err = TestWriteAttributeNullableInt32sMinValue_286();
             break;
         case 287:
-            ChipLogProgress(chipTool, " ***** Test Step 287 : Read attribute NULLABLE_INT32S unchanged Value\n");
-            err = TestReadAttributeNullableInt32sUnchangedValue_287();
+            ChipLogProgress(chipTool, " ***** Test Step 287 : Read attribute NULLABLE_INT32S Min Value\n");
+            err = TestReadAttributeNullableInt32sMinValue_287();
             break;
         case 288:
-            ChipLogProgress(chipTool, " ***** Test Step 288 : Write attribute NULLABLE_INT32S null Value\n");
-            err = TestWriteAttributeNullableInt32sNullValue_288();
+            ChipLogProgress(chipTool, " ***** Test Step 288 : Write attribute NULLABLE_INT32S Invalid Value\n");
+            err = TestWriteAttributeNullableInt32sInvalidValue_288();
             break;
         case 289:
-            ChipLogProgress(chipTool, " ***** Test Step 289 : Read attribute NULLABLE_INT32S null Value\n");
-            err = TestReadAttributeNullableInt32sNullValue_289();
+            ChipLogProgress(chipTool, " ***** Test Step 289 : Read attribute NULLABLE_INT32S unchanged Value\n");
+            err = TestReadAttributeNullableInt32sUnchangedValue_289();
             break;
         case 290:
-            ChipLogProgress(chipTool, " ***** Test Step 290 : Read attribute NULLABLE_INT32S null Value & range\n");
-            err = TestReadAttributeNullableInt32sNullValueRange_290();
+            ChipLogProgress(chipTool, " ***** Test Step 290 : Write attribute NULLABLE_INT32S null Value\n");
+            err = TestWriteAttributeNullableInt32sNullValue_290();
             break;
         case 291:
-            ChipLogProgress(chipTool, " ***** Test Step 291 : Read attribute NULLABLE_INT32S null Value & not\n");
-            err = TestReadAttributeNullableInt32sNullValueNot_291();
+            ChipLogProgress(chipTool, " ***** Test Step 291 : Read attribute NULLABLE_INT32S null Value\n");
+            err = TestReadAttributeNullableInt32sNullValue_291();
             break;
         case 292:
-            ChipLogProgress(chipTool, " ***** Test Step 292 : Write attribute NULLABLE_INT32S Value\n");
-            err = TestWriteAttributeNullableInt32sValue_292();
+            ChipLogProgress(chipTool, " ***** Test Step 292 : Read attribute NULLABLE_INT32S null Value & range\n");
+            err = TestReadAttributeNullableInt32sNullValueRange_292();
             break;
         case 293:
-            ChipLogProgress(chipTool, " ***** Test Step 293 : Read attribute NULLABLE_INT32S Value in range\n");
-            err = TestReadAttributeNullableInt32sValueInRange_293();
+            ChipLogProgress(chipTool, " ***** Test Step 293 : Read attribute NULLABLE_INT32S null Value & not\n");
+            err = TestReadAttributeNullableInt32sNullValueNot_293();
             break;
         case 294:
-            ChipLogProgress(chipTool, " ***** Test Step 294 : Read attribute NULLABLE_INT32S notValue OK\n");
-            err = TestReadAttributeNullableInt32sNotValueOk_294();
+            ChipLogProgress(chipTool, " ***** Test Step 294 : Write attribute NULLABLE_INT32S Value\n");
+            err = TestWriteAttributeNullableInt32sValue_294();
             break;
         case 295:
-            ChipLogProgress(chipTool, " ***** Test Step 295 : Write attribute NULLABLE_INT64S Min Value\n");
-            err = TestWriteAttributeNullableInt64sMinValue_295();
+            ChipLogProgress(chipTool, " ***** Test Step 295 : Read attribute NULLABLE_INT32S Value in range\n");
+            err = TestReadAttributeNullableInt32sValueInRange_295();
             break;
         case 296:
-            ChipLogProgress(chipTool, " ***** Test Step 296 : Read attribute NULLABLE_INT64S Min Value\n");
-            err = TestReadAttributeNullableInt64sMinValue_296();
+            ChipLogProgress(chipTool, " ***** Test Step 296 : Read attribute NULLABLE_INT32S notValue OK\n");
+            err = TestReadAttributeNullableInt32sNotValueOk_296();
             break;
         case 297:
-            ChipLogProgress(chipTool, " ***** Test Step 297 : Write attribute NULLABLE_INT64S Invalid Value\n");
-            err = TestWriteAttributeNullableInt64sInvalidValue_297();
+            ChipLogProgress(chipTool, " ***** Test Step 297 : Write attribute NULLABLE_INT64S Min Value\n");
+            err = TestWriteAttributeNullableInt64sMinValue_297();
             break;
         case 298:
-            ChipLogProgress(chipTool, " ***** Test Step 298 : Read attribute NULLABLE_INT64S unchanged Value\n");
-            err = TestReadAttributeNullableInt64sUnchangedValue_298();
+            ChipLogProgress(chipTool, " ***** Test Step 298 : Read attribute NULLABLE_INT64S Min Value\n");
+            err = TestReadAttributeNullableInt64sMinValue_298();
             break;
         case 299:
-            ChipLogProgress(chipTool, " ***** Test Step 299 : Write attribute NULLABLE_INT64S null Value\n");
-            err = TestWriteAttributeNullableInt64sNullValue_299();
+            ChipLogProgress(chipTool, " ***** Test Step 299 : Write attribute NULLABLE_INT64S Invalid Value\n");
+            err = TestWriteAttributeNullableInt64sInvalidValue_299();
             break;
         case 300:
-            ChipLogProgress(chipTool, " ***** Test Step 300 : Read attribute NULLABLE_INT64S null Value\n");
-            err = TestReadAttributeNullableInt64sNullValue_300();
+            ChipLogProgress(chipTool, " ***** Test Step 300 : Read attribute NULLABLE_INT64S unchanged Value\n");
+            err = TestReadAttributeNullableInt64sUnchangedValue_300();
             break;
         case 301:
-            ChipLogProgress(chipTool, " ***** Test Step 301 : Read attribute NULLABLE_INT64S null Value & range\n");
-            err = TestReadAttributeNullableInt64sNullValueRange_301();
+            ChipLogProgress(chipTool, " ***** Test Step 301 : Write attribute NULLABLE_INT64S null Value\n");
+            err = TestWriteAttributeNullableInt64sNullValue_301();
             break;
         case 302:
-            ChipLogProgress(chipTool, " ***** Test Step 302 : Read attribute NULLABLE_INT64S null Value & not\n");
-            err = TestReadAttributeNullableInt64sNullValueNot_302();
+            ChipLogProgress(chipTool, " ***** Test Step 302 : Read attribute NULLABLE_INT64S null Value\n");
+            err = TestReadAttributeNullableInt64sNullValue_302();
             break;
         case 303:
-            ChipLogProgress(chipTool, " ***** Test Step 303 : Write attribute NULLABLE_INT64S Value\n");
-            err = TestWriteAttributeNullableInt64sValue_303();
+            ChipLogProgress(chipTool, " ***** Test Step 303 : Read attribute NULLABLE_INT64S null Value & range\n");
+            err = TestReadAttributeNullableInt64sNullValueRange_303();
             break;
         case 304:
-            ChipLogProgress(chipTool, " ***** Test Step 304 : Read attribute NULLABLE_INT64S Value in range\n");
-            err = TestReadAttributeNullableInt64sValueInRange_304();
+            ChipLogProgress(chipTool, " ***** Test Step 304 : Read attribute NULLABLE_INT64S null Value & not\n");
+            err = TestReadAttributeNullableInt64sNullValueNot_304();
             break;
         case 305:
-            ChipLogProgress(chipTool, " ***** Test Step 305 : Read attribute NULLABLE_INT64S notValue OK\n");
-            err = TestReadAttributeNullableInt64sNotValueOk_305();
+            ChipLogProgress(chipTool, " ***** Test Step 305 : Write attribute NULLABLE_INT64S Value\n");
+            err = TestWriteAttributeNullableInt64sValue_305();
             break;
         case 306:
-            ChipLogProgress(chipTool, " ***** Test Step 306 : Write attribute NULLABLE_SINGLE medium Value\n");
-            err = TestWriteAttributeNullableSingleMediumValue_306();
+            ChipLogProgress(chipTool, " ***** Test Step 306 : Read attribute NULLABLE_INT64S Value in range\n");
+            err = TestReadAttributeNullableInt64sValueInRange_306();
             break;
         case 307:
-            ChipLogProgress(chipTool, " ***** Test Step 307 : Read attribute NULLABLE_SINGLE medium Value\n");
-            err = TestReadAttributeNullableSingleMediumValue_307();
+            ChipLogProgress(chipTool, " ***** Test Step 307 : Read attribute NULLABLE_INT64S notValue OK\n");
+            err = TestReadAttributeNullableInt64sNotValueOk_307();
             break;
         case 308:
-            ChipLogProgress(chipTool, " ***** Test Step 308 : Write attribute NULLABLE_SINGLE largest Value\n");
-            err = TestWriteAttributeNullableSingleLargestValue_308();
+            ChipLogProgress(chipTool, " ***** Test Step 308 : Write attribute NULLABLE_SINGLE medium Value\n");
+            err = TestWriteAttributeNullableSingleMediumValue_308();
             break;
         case 309:
-            ChipLogProgress(chipTool, " ***** Test Step 309 : Read attribute NULLABLE_SINGLE largest Value\n");
-            err = TestReadAttributeNullableSingleLargestValue_309();
+            ChipLogProgress(chipTool, " ***** Test Step 309 : Read attribute NULLABLE_SINGLE medium Value\n");
+            err = TestReadAttributeNullableSingleMediumValue_309();
             break;
         case 310:
-            ChipLogProgress(chipTool, " ***** Test Step 310 : Write attribute NULLABLE_SINGLE smallest Value\n");
-            err = TestWriteAttributeNullableSingleSmallestValue_310();
+            ChipLogProgress(chipTool, " ***** Test Step 310 : Write attribute NULLABLE_SINGLE largest Value\n");
+            err = TestWriteAttributeNullableSingleLargestValue_310();
             break;
         case 311:
-            ChipLogProgress(chipTool, " ***** Test Step 311 : Read attribute NULLABLE_SINGLE smallest Value\n");
-            err = TestReadAttributeNullableSingleSmallestValue_311();
+            ChipLogProgress(chipTool, " ***** Test Step 311 : Read attribute NULLABLE_SINGLE largest Value\n");
+            err = TestReadAttributeNullableSingleLargestValue_311();
             break;
         case 312:
-            ChipLogProgress(chipTool, " ***** Test Step 312 : Write attribute NULLABLE_SINGLE null Value\n");
-            err = TestWriteAttributeNullableSingleNullValue_312();
+            ChipLogProgress(chipTool, " ***** Test Step 312 : Write attribute NULLABLE_SINGLE smallest Value\n");
+            err = TestWriteAttributeNullableSingleSmallestValue_312();
             break;
         case 313:
-            ChipLogProgress(chipTool, " ***** Test Step 313 : Read attribute NULLABLE_SINGLE null Value\n");
-            err = TestReadAttributeNullableSingleNullValue_313();
+            ChipLogProgress(chipTool, " ***** Test Step 313 : Read attribute NULLABLE_SINGLE smallest Value\n");
+            err = TestReadAttributeNullableSingleSmallestValue_313();
             break;
         case 314:
-            ChipLogProgress(chipTool, " ***** Test Step 314 : Write attribute NULLABLE_SINGLE 0 Value\n");
-            err = TestWriteAttributeNullableSingle0Value_314();
+            ChipLogProgress(chipTool, " ***** Test Step 314 : Write attribute NULLABLE_SINGLE null Value\n");
+            err = TestWriteAttributeNullableSingleNullValue_314();
             break;
         case 315:
-            ChipLogProgress(chipTool, " ***** Test Step 315 : Read attribute NULLABLE_SINGLE 0 Value\n");
-            err = TestReadAttributeNullableSingle0Value_315();
+            ChipLogProgress(chipTool, " ***** Test Step 315 : Read attribute NULLABLE_SINGLE null Value\n");
+            err = TestReadAttributeNullableSingleNullValue_315();
             break;
         case 316:
-            ChipLogProgress(chipTool, " ***** Test Step 316 : Write attribute NULLABLE_DOUBLE medium Value\n");
-            err = TestWriteAttributeNullableDoubleMediumValue_316();
+            ChipLogProgress(chipTool, " ***** Test Step 316 : Write attribute NULLABLE_SINGLE 0 Value\n");
+            err = TestWriteAttributeNullableSingle0Value_316();
             break;
         case 317:
-            ChipLogProgress(chipTool, " ***** Test Step 317 : Read attribute NULLABLE_DOUBLE medium Value\n");
-            err = TestReadAttributeNullableDoubleMediumValue_317();
+            ChipLogProgress(chipTool, " ***** Test Step 317 : Read attribute NULLABLE_SINGLE 0 Value\n");
+            err = TestReadAttributeNullableSingle0Value_317();
             break;
         case 318:
-            ChipLogProgress(chipTool, " ***** Test Step 318 : Write attribute NULLABLE_DOUBLE largest Value\n");
-            err = TestWriteAttributeNullableDoubleLargestValue_318();
+            ChipLogProgress(chipTool, " ***** Test Step 318 : Write attribute NULLABLE_DOUBLE medium Value\n");
+            err = TestWriteAttributeNullableDoubleMediumValue_318();
             break;
         case 319:
-            ChipLogProgress(chipTool, " ***** Test Step 319 : Read attribute NULLABLE_DOUBLE largest Value\n");
-            err = TestReadAttributeNullableDoubleLargestValue_319();
+            ChipLogProgress(chipTool, " ***** Test Step 319 : Read attribute NULLABLE_DOUBLE medium Value\n");
+            err = TestReadAttributeNullableDoubleMediumValue_319();
             break;
         case 320:
-            ChipLogProgress(chipTool, " ***** Test Step 320 : Write attribute NULLABLE_DOUBLE smallest Value\n");
-            err = TestWriteAttributeNullableDoubleSmallestValue_320();
+            ChipLogProgress(chipTool, " ***** Test Step 320 : Write attribute NULLABLE_DOUBLE largest Value\n");
+            err = TestWriteAttributeNullableDoubleLargestValue_320();
             break;
         case 321:
-            ChipLogProgress(chipTool, " ***** Test Step 321 : Read attribute NULLABLE_DOUBLE smallest Value\n");
-            err = TestReadAttributeNullableDoubleSmallestValue_321();
+            ChipLogProgress(chipTool, " ***** Test Step 321 : Read attribute NULLABLE_DOUBLE largest Value\n");
+            err = TestReadAttributeNullableDoubleLargestValue_321();
             break;
         case 322:
-            ChipLogProgress(chipTool, " ***** Test Step 322 : Write attribute NULLABLE_DOUBLE null Value\n");
-            err = TestWriteAttributeNullableDoubleNullValue_322();
+            ChipLogProgress(chipTool, " ***** Test Step 322 : Write attribute NULLABLE_DOUBLE smallest Value\n");
+            err = TestWriteAttributeNullableDoubleSmallestValue_322();
             break;
         case 323:
-            ChipLogProgress(chipTool, " ***** Test Step 323 : Read attribute NULLABLE_DOUBLE null Value\n");
-            err = TestReadAttributeNullableDoubleNullValue_323();
+            ChipLogProgress(chipTool, " ***** Test Step 323 : Read attribute NULLABLE_DOUBLE smallest Value\n");
+            err = TestReadAttributeNullableDoubleSmallestValue_323();
             break;
         case 324:
-            ChipLogProgress(chipTool, " ***** Test Step 324 : Write attribute NULLABLE_DOUBLE 0 Value\n");
-            err = TestWriteAttributeNullableDouble0Value_324();
+            ChipLogProgress(chipTool, " ***** Test Step 324 : Write attribute NULLABLE_DOUBLE null Value\n");
+            err = TestWriteAttributeNullableDoubleNullValue_324();
             break;
         case 325:
-            ChipLogProgress(chipTool, " ***** Test Step 325 : Read attribute NULLABLE_DOUBLE 0 Value\n");
-            err = TestReadAttributeNullableDouble0Value_325();
+            ChipLogProgress(chipTool, " ***** Test Step 325 : Read attribute NULLABLE_DOUBLE null Value\n");
+            err = TestReadAttributeNullableDoubleNullValue_325();
             break;
         case 326:
-            ChipLogProgress(chipTool, " ***** Test Step 326 : Write attribute NULLABLE_ENUM8 Min Value\n");
-            err = TestWriteAttributeNullableEnum8MinValue_326();
+            ChipLogProgress(chipTool, " ***** Test Step 326 : Write attribute NULLABLE_DOUBLE 0 Value\n");
+            err = TestWriteAttributeNullableDouble0Value_326();
             break;
         case 327:
-            ChipLogProgress(chipTool, " ***** Test Step 327 : Read attribute NULLABLE_ENUM8 Min Value\n");
-            err = TestReadAttributeNullableEnum8MinValue_327();
+            ChipLogProgress(chipTool, " ***** Test Step 327 : Read attribute NULLABLE_DOUBLE 0 Value\n");
+            err = TestReadAttributeNullableDouble0Value_327();
             break;
         case 328:
-            ChipLogProgress(chipTool, " ***** Test Step 328 : Write attribute NULLABLE_ENUM8 Max Value\n");
-            err = TestWriteAttributeNullableEnum8MaxValue_328();
+            ChipLogProgress(chipTool, " ***** Test Step 328 : Write attribute NULLABLE_ENUM8 Min Value\n");
+            err = TestWriteAttributeNullableEnum8MinValue_328();
             break;
         case 329:
-            ChipLogProgress(chipTool, " ***** Test Step 329 : Read attribute NULLABLE_ENUM8 Max Value\n");
-            err = TestReadAttributeNullableEnum8MaxValue_329();
+            ChipLogProgress(chipTool, " ***** Test Step 329 : Read attribute NULLABLE_ENUM8 Min Value\n");
+            err = TestReadAttributeNullableEnum8MinValue_329();
             break;
         case 330:
-            ChipLogProgress(chipTool, " ***** Test Step 330 : Write attribute NULLABLE_ENUM8 Invalid Value\n");
-            err = TestWriteAttributeNullableEnum8InvalidValue_330();
+            ChipLogProgress(chipTool, " ***** Test Step 330 : Write attribute NULLABLE_ENUM8 Max Value\n");
+            err = TestWriteAttributeNullableEnum8MaxValue_330();
             break;
         case 331:
-            ChipLogProgress(chipTool, " ***** Test Step 331 : Read attribute NULLABLE_ENUM8 unchanged Value\n");
-            err = TestReadAttributeNullableEnum8UnchangedValue_331();
+            ChipLogProgress(chipTool, " ***** Test Step 331 : Read attribute NULLABLE_ENUM8 Max Value\n");
+            err = TestReadAttributeNullableEnum8MaxValue_331();
             break;
         case 332:
-            ChipLogProgress(chipTool, " ***** Test Step 332 : Write attribute NULLABLE_ENUM8 null Value\n");
-            err = TestWriteAttributeNullableEnum8NullValue_332();
+            ChipLogProgress(chipTool, " ***** Test Step 332 : Write attribute NULLABLE_ENUM8 Invalid Value\n");
+            err = TestWriteAttributeNullableEnum8InvalidValue_332();
             break;
         case 333:
-            ChipLogProgress(chipTool, " ***** Test Step 333 : Read attribute NULLABLE_ENUM8 null Value\n");
-            err = TestReadAttributeNullableEnum8NullValue_333();
+            ChipLogProgress(chipTool, " ***** Test Step 333 : Read attribute NULLABLE_ENUM8 unchanged Value\n");
+            err = TestReadAttributeNullableEnum8UnchangedValue_333();
             break;
         case 334:
-            ChipLogProgress(chipTool, " ***** Test Step 334 : Write attribute NULLABLE_ENUM16 Min Value\n");
-            err = TestWriteAttributeNullableEnum16MinValue_334();
+            ChipLogProgress(chipTool, " ***** Test Step 334 : Write attribute NULLABLE_ENUM8 null Value\n");
+            err = TestWriteAttributeNullableEnum8NullValue_334();
             break;
         case 335:
-            ChipLogProgress(chipTool, " ***** Test Step 335 : Read attribute NULLABLE_ENUM16 Min Value\n");
-            err = TestReadAttributeNullableEnum16MinValue_335();
+            ChipLogProgress(chipTool, " ***** Test Step 335 : Read attribute NULLABLE_ENUM8 null Value\n");
+            err = TestReadAttributeNullableEnum8NullValue_335();
             break;
         case 336:
-            ChipLogProgress(chipTool, " ***** Test Step 336 : Write attribute NULLABLE_ENUM16 Max Value\n");
-            err = TestWriteAttributeNullableEnum16MaxValue_336();
+            ChipLogProgress(chipTool, " ***** Test Step 336 : Write attribute NULLABLE_ENUM16 Min Value\n");
+            err = TestWriteAttributeNullableEnum16MinValue_336();
             break;
         case 337:
-            ChipLogProgress(chipTool, " ***** Test Step 337 : Read attribute NULLABLE_ENUM16 Max Value\n");
-            err = TestReadAttributeNullableEnum16MaxValue_337();
+            ChipLogProgress(chipTool, " ***** Test Step 337 : Read attribute NULLABLE_ENUM16 Min Value\n");
+            err = TestReadAttributeNullableEnum16MinValue_337();
             break;
         case 338:
-            ChipLogProgress(chipTool, " ***** Test Step 338 : Write attribute NULLABLE_ENUM16 Invalid Value\n");
-            err = TestWriteAttributeNullableEnum16InvalidValue_338();
+            ChipLogProgress(chipTool, " ***** Test Step 338 : Write attribute NULLABLE_ENUM16 Max Value\n");
+            err = TestWriteAttributeNullableEnum16MaxValue_338();
             break;
         case 339:
-            ChipLogProgress(chipTool, " ***** Test Step 339 : Read attribute NULLABLE_ENUM16 unchanged Value\n");
-            err = TestReadAttributeNullableEnum16UnchangedValue_339();
+            ChipLogProgress(chipTool, " ***** Test Step 339 : Read attribute NULLABLE_ENUM16 Max Value\n");
+            err = TestReadAttributeNullableEnum16MaxValue_339();
             break;
         case 340:
-            ChipLogProgress(chipTool, " ***** Test Step 340 : Write attribute NULLABLE_ENUM16 null Value\n");
-            err = TestWriteAttributeNullableEnum16NullValue_340();
+            ChipLogProgress(chipTool, " ***** Test Step 340 : Write attribute NULLABLE_ENUM16 Invalid Value\n");
+            err = TestWriteAttributeNullableEnum16InvalidValue_340();
             break;
         case 341:
-            ChipLogProgress(chipTool, " ***** Test Step 341 : Read attribute NULLABLE_ENUM16 null Value\n");
-            err = TestReadAttributeNullableEnum16NullValue_341();
+            ChipLogProgress(chipTool, " ***** Test Step 341 : Read attribute NULLABLE_ENUM16 unchanged Value\n");
+            err = TestReadAttributeNullableEnum16UnchangedValue_341();
             break;
         case 342:
-            ChipLogProgress(chipTool, " ***** Test Step 342 : Write attribute NULLABLE_SIMPLE_ENUM Min Value\n");
-            err = TestWriteAttributeNullableSimpleEnumMinValue_342();
+            ChipLogProgress(chipTool, " ***** Test Step 342 : Write attribute NULLABLE_ENUM16 null Value\n");
+            err = TestWriteAttributeNullableEnum16NullValue_342();
             break;
         case 343:
-            ChipLogProgress(chipTool, " ***** Test Step 343 : Read attribute NULLABLE_SIMPLE_ENUM Min Value\n");
-            err = TestReadAttributeNullableSimpleEnumMinValue_343();
+            ChipLogProgress(chipTool, " ***** Test Step 343 : Read attribute NULLABLE_ENUM16 null Value\n");
+            err = TestReadAttributeNullableEnum16NullValue_343();
             break;
         case 344:
-            ChipLogProgress(chipTool, " ***** Test Step 344 : Write attribute NULLABLE_SIMPLE_ENUM Max Value\n");
-            err = TestWriteAttributeNullableSimpleEnumMaxValue_344();
+            ChipLogProgress(chipTool, " ***** Test Step 344 : Write attribute NULLABLE_SIMPLE_ENUM Min Value\n");
+            err = TestWriteAttributeNullableSimpleEnumMinValue_344();
             break;
         case 345:
-            ChipLogProgress(chipTool, " ***** Test Step 345 : Read attribute NULLABLE_SIMPLE_ENUM Max Value\n");
-            err = TestReadAttributeNullableSimpleEnumMaxValue_345();
+            ChipLogProgress(chipTool, " ***** Test Step 345 : Read attribute NULLABLE_SIMPLE_ENUM Min Value\n");
+            err = TestReadAttributeNullableSimpleEnumMinValue_345();
             break;
         case 346:
-            ChipLogProgress(chipTool, " ***** Test Step 346 : Write attribute NULLABLE_SIMPLE_ENUM Invalid Value\n");
-            err = TestWriteAttributeNullableSimpleEnumInvalidValue_346();
+            ChipLogProgress(chipTool, " ***** Test Step 346 : Write attribute NULLABLE_SIMPLE_ENUM Max Value\n");
+            err = TestWriteAttributeNullableSimpleEnumMaxValue_346();
             break;
         case 347:
-            ChipLogProgress(chipTool, " ***** Test Step 347 : Read attribute NULLABLE_SIMPLE_ENUM unchanged Value\n");
-            err = TestReadAttributeNullableSimpleEnumUnchangedValue_347();
+            ChipLogProgress(chipTool, " ***** Test Step 347 : Read attribute NULLABLE_SIMPLE_ENUM Max Value\n");
+            err = TestReadAttributeNullableSimpleEnumMaxValue_347();
             break;
         case 348:
-            ChipLogProgress(chipTool, " ***** Test Step 348 : Write attribute NULLABLE_SIMPLE_ENUM null Value\n");
-            err = TestWriteAttributeNullableSimpleEnumNullValue_348();
+            ChipLogProgress(chipTool, " ***** Test Step 348 : Write attribute NULLABLE_SIMPLE_ENUM Invalid Value\n");
+            err = TestWriteAttributeNullableSimpleEnumInvalidValue_348();
             break;
         case 349:
-            ChipLogProgress(chipTool, " ***** Test Step 349 : Read attribute NULLABLE_SIMPLE_ENUM null Value\n");
-            err = TestReadAttributeNullableSimpleEnumNullValue_349();
+            ChipLogProgress(chipTool, " ***** Test Step 349 : Read attribute NULLABLE_SIMPLE_ENUM unchanged Value\n");
+            err = TestReadAttributeNullableSimpleEnumUnchangedValue_349();
             break;
         case 350:
-            ChipLogProgress(chipTool, " ***** Test Step 350 : Read attribute NULLABLE_SIMPLE_ENUM not 254 Value\n");
-            err = TestReadAttributeNullableSimpleEnumNot254Value_350();
+            ChipLogProgress(chipTool, " ***** Test Step 350 : Write attribute NULLABLE_SIMPLE_ENUM null Value\n");
+            err = TestWriteAttributeNullableSimpleEnumNullValue_350();
             break;
         case 351:
-            ChipLogProgress(chipTool, " ***** Test Step 351 : Read attribute NULLABLE_OCTET_STRING Default Value\n");
-            err = TestReadAttributeNullableOctetStringDefaultValue_351();
+            ChipLogProgress(chipTool, " ***** Test Step 351 : Read attribute NULLABLE_SIMPLE_ENUM null Value\n");
+            err = TestReadAttributeNullableSimpleEnumNullValue_351();
             break;
         case 352:
-            ChipLogProgress(chipTool, " ***** Test Step 352 : Write attribute NULLABLE_OCTET_STRING\n");
-            err = TestWriteAttributeNullableOctetString_352();
+            ChipLogProgress(chipTool, " ***** Test Step 352 : Read attribute NULLABLE_SIMPLE_ENUM not 254 Value\n");
+            err = TestReadAttributeNullableSimpleEnumNot254Value_352();
             break;
         case 353:
-            ChipLogProgress(chipTool, " ***** Test Step 353 : Read attribute NULLABLE_OCTET_STRING\n");
-            err = TestReadAttributeNullableOctetString_353();
+            ChipLogProgress(chipTool, " ***** Test Step 353 : Read attribute NULLABLE_OCTET_STRING Default Value\n");
+            err = TestReadAttributeNullableOctetStringDefaultValue_353();
             break;
         case 354:
             ChipLogProgress(chipTool, " ***** Test Step 354 : Write attribute NULLABLE_OCTET_STRING\n");
@@ -72285,610 +68354,618 @@ class TestCluster : public TestCommandBridge {
             err = TestReadAttributeNullableOctetString_357();
             break;
         case 358:
-            ChipLogProgress(chipTool, " ***** Test Step 358 : Read attribute NULLABLE_OCTET_STRING not TestValue\n");
-            err = TestReadAttributeNullableOctetStringNotTestValue_358();
+            ChipLogProgress(chipTool, " ***** Test Step 358 : Write attribute NULLABLE_OCTET_STRING\n");
+            err = TestWriteAttributeNullableOctetString_358();
             break;
         case 359:
-            ChipLogProgress(chipTool, " ***** Test Step 359 : Read attribute NULLABLE_CHAR_STRING Default Value\n");
-            err = TestReadAttributeNullableCharStringDefaultValue_359();
+            ChipLogProgress(chipTool, " ***** Test Step 359 : Read attribute NULLABLE_OCTET_STRING\n");
+            err = TestReadAttributeNullableOctetString_359();
             break;
         case 360:
-            ChipLogProgress(chipTool, " ***** Test Step 360 : Write attribute NULLABLE_CHAR_STRING\n");
-            err = TestWriteAttributeNullableCharString_360();
+            ChipLogProgress(chipTool, " ***** Test Step 360 : Read attribute NULLABLE_OCTET_STRING not TestValue\n");
+            err = TestReadAttributeNullableOctetStringNotTestValue_360();
             break;
         case 361:
-            ChipLogProgress(chipTool, " ***** Test Step 361 : Read attribute NULLABLE_CHAR_STRING\n");
-            err = TestReadAttributeNullableCharString_361();
+            ChipLogProgress(chipTool, " ***** Test Step 361 : Read attribute NULLABLE_CHAR_STRING Default Value\n");
+            err = TestReadAttributeNullableCharStringDefaultValue_361();
             break;
         case 362:
-            ChipLogProgress(chipTool, " ***** Test Step 362 : Read attribute NULLABLE_CHAR_STRING\n");
-            err = TestReadAttributeNullableCharString_362();
+            ChipLogProgress(chipTool, " ***** Test Step 362 : Write attribute NULLABLE_CHAR_STRING\n");
+            err = TestWriteAttributeNullableCharString_362();
             break;
         case 363:
-            ChipLogProgress(chipTool, " ***** Test Step 363 : Write attribute NULLABLE_CHAR_STRING - Value too long\n");
-            err = TestWriteAttributeNullableCharStringValueTooLong_363();
+            ChipLogProgress(chipTool, " ***** Test Step 363 : Read attribute NULLABLE_CHAR_STRING\n");
+            err = TestReadAttributeNullableCharString_363();
             break;
         case 364:
             ChipLogProgress(chipTool, " ***** Test Step 364 : Read attribute NULLABLE_CHAR_STRING\n");
             err = TestReadAttributeNullableCharString_364();
             break;
         case 365:
-            ChipLogProgress(chipTool, " ***** Test Step 365 : Write attribute NULLABLE_CHAR_STRING - Empty\n");
-            err = TestWriteAttributeNullableCharStringEmpty_365();
+            ChipLogProgress(chipTool, " ***** Test Step 365 : Write attribute NULLABLE_CHAR_STRING - Value too long\n");
+            err = TestWriteAttributeNullableCharStringValueTooLong_365();
             break;
         case 366:
             ChipLogProgress(chipTool, " ***** Test Step 366 : Read attribute NULLABLE_CHAR_STRING\n");
             err = TestReadAttributeNullableCharString_366();
             break;
         case 367:
-            ChipLogProgress(chipTool, " ***** Test Step 367 : Read attribute NULLABLE_CHAR_STRING not ☉T☉\n");
-            err = TestReadAttributeNullableCharStringNott_367();
+            ChipLogProgress(chipTool, " ***** Test Step 367 : Write attribute NULLABLE_CHAR_STRING - Empty\n");
+            err = TestWriteAttributeNullableCharStringEmpty_367();
             break;
         case 368:
-            ChipLogProgress(chipTool, " ***** Test Step 368 : Read attribute from nonexistent endpoint.\n");
-            err = TestReadAttributeFromNonexistentEndpoint_368();
+            ChipLogProgress(chipTool, " ***** Test Step 368 : Read attribute NULLABLE_CHAR_STRING\n");
+            err = TestReadAttributeNullableCharString_368();
             break;
         case 369:
-            ChipLogProgress(chipTool, " ***** Test Step 369 : Read attribute from nonexistent cluster.\n");
-            err = TestReadAttributeFromNonexistentCluster_369();
+            ChipLogProgress(chipTool, " ***** Test Step 369 : Read attribute NULLABLE_CHAR_STRING not ☉T☉\n");
+            err = TestReadAttributeNullableCharStringNott_369();
             break;
         case 370:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 370 : Send a command that takes an optional parameter but do not set it.\n");
-            err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_370();
+            ChipLogProgress(chipTool, " ***** Test Step 370 : Read attribute from nonexistent endpoint.\n");
+            err = TestReadAttributeFromNonexistentEndpoint_370();
             break;
         case 371:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 371 : Send a command that takes an optional parameter but do not set it.\n");
-            err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_371();
+            ChipLogProgress(chipTool, " ***** Test Step 371 : Read attribute from nonexistent cluster.\n");
+            err = TestReadAttributeFromNonexistentCluster_371();
             break;
         case 372:
-            ChipLogProgress(chipTool, " ***** Test Step 372 : Report: Subscribe to list attribute\n");
-            err = TestReportSubscribeToListAttribute_372();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 372 : Send a command that takes an optional parameter but do not set it.\n");
+            err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_372();
             break;
         case 373:
-            ChipLogProgress(chipTool, " ***** Test Step 373 : Subscribe to list attribute\n");
-            err = TestSubscribeToListAttribute_373();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 373 : Send a command that takes an optional parameter but do not set it.\n");
+            err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_373();
             break;
         case 374:
-            ChipLogProgress(chipTool, " ***** Test Step 374 : Write subscribed-to list attribute\n");
-            err = TestWriteSubscribedToListAttribute_374();
+            ChipLogProgress(chipTool, " ***** Test Step 374 : Report: Subscribe to list attribute\n");
+            err = TestReportSubscribeToListAttribute_374();
             break;
         case 375:
-            ChipLogProgress(chipTool, " ***** Test Step 375 : Check for list attribute report\n");
-            err = TestCheckForListAttributeReport_375();
+            ChipLogProgress(chipTool, " ***** Test Step 375 : Subscribe to list attribute\n");
+            err = TestSubscribeToListAttribute_375();
             break;
         case 376:
-            ChipLogProgress(chipTool, " ***** Test Step 376 : Read range-restricted unsigned 8-bit integer\n");
-            err = TestReadRangeRestrictedUnsigned8BitInteger_376();
+            ChipLogProgress(chipTool, " ***** Test Step 376 : Write subscribed-to list attribute\n");
+            err = TestWriteSubscribedToListAttribute_376();
             break;
         case 377:
-            ChipLogProgress(chipTool, " ***** Test Step 377 : Write min value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_377();
+            ChipLogProgress(chipTool, " ***** Test Step 377 : Check for list attribute report\n");
+            err = TestCheckForListAttributeReport_377();
             break;
         case 378:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 378 : Write just-below-range value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_378();
+            ChipLogProgress(chipTool, " ***** Test Step 378 : Read range-restricted unsigned 8-bit integer\n");
+            err = TestReadRangeRestrictedUnsigned8BitInteger_378();
             break;
         case 379:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 379 : Write just-above-range value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_379();
+            ChipLogProgress(chipTool, " ***** Test Step 379 : Write min value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_379();
             break;
         case 380:
-            ChipLogProgress(chipTool, " ***** Test Step 380 : Write max value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_380();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 380 : Write just-below-range value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_380();
             break;
         case 381:
             ChipLogProgress(
-                chipTool, " ***** Test Step 381 : Verify range-restricted unsigned 8-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_381();
+                chipTool, " ***** Test Step 381 : Write just-above-range value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_381();
             break;
         case 382:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 382 : Write min valid value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_382();
+            ChipLogProgress(chipTool, " ***** Test Step 382 : Write max value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_382();
             break;
         case 383:
             ChipLogProgress(
-                chipTool, " ***** Test Step 383 : Verify range-restricted unsigned 8-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_383();
+                chipTool, " ***** Test Step 383 : Verify range-restricted unsigned 8-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_383();
             break;
         case 384:
             ChipLogProgress(
-                chipTool, " ***** Test Step 384 : Write max valid value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_384();
+                chipTool, " ***** Test Step 384 : Write min valid value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_384();
             break;
         case 385:
             ChipLogProgress(
-                chipTool, " ***** Test Step 385 : Verify range-restricted unsigned 8-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_385();
+                chipTool, " ***** Test Step 385 : Verify range-restricted unsigned 8-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_385();
             break;
         case 386:
             ChipLogProgress(
-                chipTool, " ***** Test Step 386 : Write middle valid value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_386();
+                chipTool, " ***** Test Step 386 : Write max valid value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_386();
             break;
         case 387:
             ChipLogProgress(
-                chipTool, " ***** Test Step 387 : Verify range-restricted unsigned 8-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_387();
+                chipTool, " ***** Test Step 387 : Verify range-restricted unsigned 8-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_387();
             break;
         case 388:
-            ChipLogProgress(chipTool, " ***** Test Step 388 : Read range-restricted unsigned 16-bit integer\n");
-            err = TestReadRangeRestrictedUnsigned16BitInteger_388();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 388 : Write middle valid value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_388();
             break;
         case 389:
-            ChipLogProgress(chipTool, " ***** Test Step 389 : Write min value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_389();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 389 : Verify range-restricted unsigned 8-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_389();
             break;
         case 390:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 390 : Write just-below-range value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_390();
+            ChipLogProgress(chipTool, " ***** Test Step 390 : Read range-restricted unsigned 16-bit integer\n");
+            err = TestReadRangeRestrictedUnsigned16BitInteger_390();
             break;
         case 391:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 391 : Write just-above-range value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_391();
+            ChipLogProgress(chipTool, " ***** Test Step 391 : Write min value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_391();
             break;
         case 392:
-            ChipLogProgress(chipTool, " ***** Test Step 392 : Write max value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_392();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 392 : Write just-below-range value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_392();
             break;
         case 393:
             ChipLogProgress(
-                chipTool, " ***** Test Step 393 : Verify range-restricted unsigned 16-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_393();
+                chipTool, " ***** Test Step 393 : Write just-above-range value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_393();
             break;
         case 394:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 394 : Write min valid value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_394();
+            ChipLogProgress(chipTool, " ***** Test Step 394 : Write max value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_394();
             break;
         case 395:
             ChipLogProgress(
-                chipTool, " ***** Test Step 395 : Verify range-restricted unsigned 16-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_395();
+                chipTool, " ***** Test Step 395 : Verify range-restricted unsigned 16-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_395();
             break;
         case 396:
             ChipLogProgress(
-                chipTool, " ***** Test Step 396 : Write max valid value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_396();
+                chipTool, " ***** Test Step 396 : Write min valid value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_396();
             break;
         case 397:
             ChipLogProgress(
-                chipTool, " ***** Test Step 397 : Verify range-restricted unsigned 16-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_397();
+                chipTool, " ***** Test Step 397 : Verify range-restricted unsigned 16-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_397();
             break;
         case 398:
             ChipLogProgress(
-                chipTool, " ***** Test Step 398 : Write middle valid value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_398();
+                chipTool, " ***** Test Step 398 : Write max valid value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_398();
             break;
         case 399:
             ChipLogProgress(
-                chipTool, " ***** Test Step 399 : Verify range-restricted unsigned 16-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_399();
+                chipTool, " ***** Test Step 399 : Verify range-restricted unsigned 16-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_399();
             break;
         case 400:
-            ChipLogProgress(chipTool, " ***** Test Step 400 : Read range-restricted signed 8-bit integer\n");
-            err = TestReadRangeRestrictedSigned8BitInteger_400();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 400 : Write middle valid value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_400();
             break;
         case 401:
-            ChipLogProgress(chipTool, " ***** Test Step 401 : Write min value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedSigned8BitInteger_401();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 401 : Verify range-restricted unsigned 16-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_401();
             break;
         case 402:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 402 : Write just-below-range value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_402();
+            ChipLogProgress(chipTool, " ***** Test Step 402 : Read range-restricted signed 8-bit integer\n");
+            err = TestReadRangeRestrictedSigned8BitInteger_402();
             break;
         case 403:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 403 : Write just-above-range value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_403();
+            ChipLogProgress(chipTool, " ***** Test Step 403 : Write min value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedSigned8BitInteger_403();
             break;
         case 404:
-            ChipLogProgress(chipTool, " ***** Test Step 404 : Write max value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedSigned8BitInteger_404();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 404 : Write just-below-range value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_404();
             break;
         case 405:
             ChipLogProgress(
-                chipTool, " ***** Test Step 405 : Verify range-restricted signed 8-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_405();
+                chipTool, " ***** Test Step 405 : Write just-above-range value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_405();
             break;
         case 406:
-            ChipLogProgress(chipTool, " ***** Test Step 406 : Write min valid value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_406();
+            ChipLogProgress(chipTool, " ***** Test Step 406 : Write max value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedSigned8BitInteger_406();
             break;
         case 407:
             ChipLogProgress(
-                chipTool, " ***** Test Step 407 : Verify range-restricted signed 8-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_407();
+                chipTool, " ***** Test Step 407 : Verify range-restricted signed 8-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_407();
             break;
         case 408:
-            ChipLogProgress(chipTool, " ***** Test Step 408 : Write max valid value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_408();
+            ChipLogProgress(chipTool, " ***** Test Step 408 : Write min valid value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_408();
             break;
         case 409:
             ChipLogProgress(
-                chipTool, " ***** Test Step 409 : Verify range-restricted signed 8-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_409();
+                chipTool, " ***** Test Step 409 : Verify range-restricted signed 8-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_409();
             break;
         case 410:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 410 : Write middle valid value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_410();
+            ChipLogProgress(chipTool, " ***** Test Step 410 : Write max valid value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_410();
             break;
         case 411:
             ChipLogProgress(
-                chipTool, " ***** Test Step 411 : Verify range-restricted signed 8-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_411();
+                chipTool, " ***** Test Step 411 : Verify range-restricted signed 8-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_411();
             break;
         case 412:
-            ChipLogProgress(chipTool, " ***** Test Step 412 : Read range-restricted signed 16-bit integer\n");
-            err = TestReadRangeRestrictedSigned16BitInteger_412();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 412 : Write middle valid value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_412();
             break;
         case 413:
-            ChipLogProgress(chipTool, " ***** Test Step 413 : Write min value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedSigned16BitInteger_413();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 413 : Verify range-restricted signed 8-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_413();
             break;
         case 414:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 414 : Write just-below-range value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_414();
+            ChipLogProgress(chipTool, " ***** Test Step 414 : Read range-restricted signed 16-bit integer\n");
+            err = TestReadRangeRestrictedSigned16BitInteger_414();
             break;
         case 415:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 415 : Write just-above-range value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_415();
+            ChipLogProgress(chipTool, " ***** Test Step 415 : Write min value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedSigned16BitInteger_415();
             break;
         case 416:
-            ChipLogProgress(chipTool, " ***** Test Step 416 : Write max value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedSigned16BitInteger_416();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 416 : Write just-below-range value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_416();
             break;
         case 417:
             ChipLogProgress(
-                chipTool, " ***** Test Step 417 : Verify range-restricted signed 16-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_417();
+                chipTool, " ***** Test Step 417 : Write just-above-range value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_417();
             break;
         case 418:
-            ChipLogProgress(chipTool, " ***** Test Step 418 : Write min valid value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_418();
+            ChipLogProgress(chipTool, " ***** Test Step 418 : Write max value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedSigned16BitInteger_418();
             break;
         case 419:
             ChipLogProgress(
-                chipTool, " ***** Test Step 419 : Verify range-restricted signed 16-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_419();
+                chipTool, " ***** Test Step 419 : Verify range-restricted signed 16-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_419();
             break;
         case 420:
-            ChipLogProgress(chipTool, " ***** Test Step 420 : Write max valid value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_420();
+            ChipLogProgress(chipTool, " ***** Test Step 420 : Write min valid value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_420();
             break;
         case 421:
             ChipLogProgress(
-                chipTool, " ***** Test Step 421 : Verify range-restricted signed 16-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_421();
+                chipTool, " ***** Test Step 421 : Verify range-restricted signed 16-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_421();
             break;
         case 422:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 422 : Write middle valid value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_422();
+            ChipLogProgress(chipTool, " ***** Test Step 422 : Write max valid value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_422();
             break;
         case 423:
             ChipLogProgress(
-                chipTool, " ***** Test Step 423 : Verify range-restricted signed 16-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_423();
+                chipTool, " ***** Test Step 423 : Verify range-restricted signed 16-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_423();
             break;
         case 424:
-            ChipLogProgress(chipTool, " ***** Test Step 424 : Read nullable range-restricted unsigned 8-bit integer\n");
-            err = TestReadNullableRangeRestrictedUnsigned8BitInteger_424();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 424 : Write middle valid value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_424();
             break;
         case 425:
             ChipLogProgress(
-                chipTool, " ***** Test Step 425 : Write min value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_425();
+                chipTool, " ***** Test Step 425 : Verify range-restricted signed 16-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_425();
             break;
         case 426:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 426 : Write just-below-range value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_426();
+            ChipLogProgress(chipTool, " ***** Test Step 426 : Read nullable range-restricted unsigned 8-bit integer\n");
+            err = TestReadNullableRangeRestrictedUnsigned8BitInteger_426();
             break;
         case 427:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 427 : Write just-above-range value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_427();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 427 : Write min value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_427();
             break;
         case 428:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 428 : Write max value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_428();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 428 : Write just-below-range value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_428();
             break;
         case 429:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 429 : Verify nullable range-restricted unsigned 8-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_429();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 429 : Write just-above-range value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_429();
             break;
         case 430:
             ChipLogProgress(
-                chipTool, " ***** Test Step 430 : Write min valid value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_430();
+                chipTool, " ***** Test Step 430 : Write max value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_430();
             break;
         case 431:
             ChipLogProgress(
-                chipTool, " ***** Test Step 431 : Verify nullable range-restricted unsigned 8-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_431();
+                chipTool, " ***** Test Step 431 : Verify nullable range-restricted unsigned 8-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_431();
             break;
         case 432:
             ChipLogProgress(
-                chipTool, " ***** Test Step 432 : Write max valid value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_432();
+                chipTool, " ***** Test Step 432 : Write min valid value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_432();
             break;
         case 433:
             ChipLogProgress(
-                chipTool, " ***** Test Step 433 : Verify nullable range-restricted unsigned 8-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_433();
+                chipTool, " ***** Test Step 433 : Verify nullable range-restricted unsigned 8-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_433();
             break;
         case 434:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 434 : Write middle valid value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_434();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 434 : Write max valid value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_434();
             break;
         case 435:
             ChipLogProgress(
-                chipTool, " ***** Test Step 435 : Verify nullable range-restricted unsigned 8-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_435();
+                chipTool, " ***** Test Step 435 : Verify nullable range-restricted unsigned 8-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_435();
             break;
         case 436:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 436 : Write null value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_436();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 436 : Write middle valid value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_436();
             break;
         case 437:
             ChipLogProgress(
-                chipTool, " ***** Test Step 437 : Verify nullable range-restricted unsigned 8-bit integer value is null\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_437();
+                chipTool, " ***** Test Step 437 : Verify nullable range-restricted unsigned 8-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_437();
             break;
         case 438:
-            ChipLogProgress(chipTool, " ***** Test Step 438 : Read nullable range-restricted unsigned 16-bit integer\n");
-            err = TestReadNullableRangeRestrictedUnsigned16BitInteger_438();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 438 : Write null value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_438();
             break;
         case 439:
             ChipLogProgress(
-                chipTool, " ***** Test Step 439 : Write min value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_439();
+                chipTool, " ***** Test Step 439 : Verify nullable range-restricted unsigned 8-bit integer value is null\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_439();
             break;
         case 440:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 440 : Write just-below-range value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_440();
+            ChipLogProgress(chipTool, " ***** Test Step 440 : Read nullable range-restricted unsigned 16-bit integer\n");
+            err = TestReadNullableRangeRestrictedUnsigned16BitInteger_440();
             break;
         case 441:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 441 : Write just-above-range value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_441();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 441 : Write min value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_441();
             break;
         case 442:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 442 : Write max value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_442();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 442 : Write just-below-range value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_442();
             break;
         case 443:
             ChipLogProgress(chipTool,
-                " ***** Test Step 443 : Verify nullable range-restricted unsigned 16-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_443();
+                " ***** Test Step 443 : Write just-above-range value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_443();
             break;
         case 444:
             ChipLogProgress(
-                chipTool, " ***** Test Step 444 : Write min valid value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_444();
+                chipTool, " ***** Test Step 444 : Write max value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_444();
             break;
         case 445:
             ChipLogProgress(chipTool,
-                " ***** Test Step 445 : Verify nullable range-restricted unsigned 16-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_445();
+                " ***** Test Step 445 : Verify nullable range-restricted unsigned 16-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_445();
             break;
         case 446:
             ChipLogProgress(
-                chipTool, " ***** Test Step 446 : Write max valid value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_446();
+                chipTool, " ***** Test Step 446 : Write min valid value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_446();
             break;
         case 447:
             ChipLogProgress(chipTool,
-                " ***** Test Step 447 : Verify nullable range-restricted unsigned 16-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_447();
+                " ***** Test Step 447 : Verify nullable range-restricted unsigned 16-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_447();
             break;
         case 448:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 448 : Write middle valid value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_448();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 448 : Write max valid value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_448();
             break;
         case 449:
             ChipLogProgress(chipTool,
-                " ***** Test Step 449 : Verify nullable range-restricted unsigned 16-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_449();
+                " ***** Test Step 449 : Verify nullable range-restricted unsigned 16-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_449();
             break;
         case 450:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 450 : Write null value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_450();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 450 : Write middle valid value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_450();
             break;
         case 451:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 451 : Verify nullable range-restricted unsigned 16-bit integer value is null\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_451();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 451 : Verify nullable range-restricted unsigned 16-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_451();
             break;
         case 452:
-            ChipLogProgress(chipTool, " ***** Test Step 452 : Read nullable range-restricted signed 8-bit integer\n");
-            err = TestReadNullableRangeRestrictedSigned8BitInteger_452();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 452 : Write null value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_452();
             break;
         case 453:
             ChipLogProgress(
-                chipTool, " ***** Test Step 453 : Write min value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_453();
+                chipTool, " ***** Test Step 453 : Verify nullable range-restricted unsigned 16-bit integer value is null\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_453();
             break;
         case 454:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 454 : Write just-below-range value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_454();
+            ChipLogProgress(chipTool, " ***** Test Step 454 : Read nullable range-restricted signed 8-bit integer\n");
+            err = TestReadNullableRangeRestrictedSigned8BitInteger_454();
             break;
         case 455:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 455 : Write just-above-range value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_455();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 455 : Write min value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_455();
             break;
         case 456:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 456 : Write max value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_456();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 456 : Write just-below-range value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_456();
             break;
         case 457:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 457 : Verify nullable range-restricted signed 8-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_457();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 457 : Write just-above-range value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_457();
             break;
         case 458:
             ChipLogProgress(
-                chipTool, " ***** Test Step 458 : Write min valid value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_458();
+                chipTool, " ***** Test Step 458 : Write max value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_458();
             break;
         case 459:
             ChipLogProgress(
-                chipTool, " ***** Test Step 459 : Verify nullable range-restricted signed 8-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_459();
+                chipTool, " ***** Test Step 459 : Verify nullable range-restricted signed 8-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_459();
             break;
         case 460:
             ChipLogProgress(
-                chipTool, " ***** Test Step 460 : Write max valid value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_460();
+                chipTool, " ***** Test Step 460 : Write min valid value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_460();
             break;
         case 461:
             ChipLogProgress(
-                chipTool, " ***** Test Step 461 : Verify nullable range-restricted signed 8-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_461();
+                chipTool, " ***** Test Step 461 : Verify nullable range-restricted signed 8-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_461();
             break;
         case 462:
             ChipLogProgress(
-                chipTool, " ***** Test Step 462 : Write middle valid value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_462();
+                chipTool, " ***** Test Step 462 : Write max valid value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_462();
             break;
         case 463:
             ChipLogProgress(
-                chipTool, " ***** Test Step 463 : Verify nullable range-restricted signed 8-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_463();
+                chipTool, " ***** Test Step 463 : Verify nullable range-restricted signed 8-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_463();
             break;
         case 464:
             ChipLogProgress(
-                chipTool, " ***** Test Step 464 : Write null value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_464();
+                chipTool, " ***** Test Step 464 : Write middle valid value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_464();
             break;
         case 465:
             ChipLogProgress(
-                chipTool, " ***** Test Step 465 : Verify nullable range-restricted signed 8-bit integer value is at null\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_465();
+                chipTool, " ***** Test Step 465 : Verify nullable range-restricted signed 8-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_465();
             break;
         case 466:
-            ChipLogProgress(chipTool, " ***** Test Step 466 : Read nullable range-restricted signed 16-bit integer\n");
-            err = TestReadNullableRangeRestrictedSigned16BitInteger_466();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 466 : Write null value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_466();
             break;
         case 467:
             ChipLogProgress(
-                chipTool, " ***** Test Step 467 : Write min value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_467();
+                chipTool, " ***** Test Step 467 : Verify nullable range-restricted signed 8-bit integer value is at null\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_467();
             break;
         case 468:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 468 : Write just-below-range value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_468();
+            ChipLogProgress(chipTool, " ***** Test Step 468 : Read nullable range-restricted signed 16-bit integer\n");
+            err = TestReadNullableRangeRestrictedSigned16BitInteger_468();
             break;
         case 469:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 469 : Write just-above-range value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_469();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 469 : Write min value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_469();
             break;
         case 470:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 470 : Write max value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_470();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 470 : Write just-below-range value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_470();
             break;
         case 471:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 471 : Verify nullable range-restricted signed 16-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_471();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 471 : Write just-above-range value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_471();
             break;
         case 472:
             ChipLogProgress(
-                chipTool, " ***** Test Step 472 : Write min valid value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_472();
+                chipTool, " ***** Test Step 472 : Write max value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_472();
             break;
         case 473:
             ChipLogProgress(
-                chipTool, " ***** Test Step 473 : Verify nullable range-restricted signed 16-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_473();
+                chipTool, " ***** Test Step 473 : Verify nullable range-restricted signed 16-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_473();
             break;
         case 474:
             ChipLogProgress(
-                chipTool, " ***** Test Step 474 : Write max valid value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_474();
+                chipTool, " ***** Test Step 474 : Write min valid value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_474();
             break;
         case 475:
             ChipLogProgress(
-                chipTool, " ***** Test Step 475 : Verify nullable range-restricted signed 16-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_475();
+                chipTool, " ***** Test Step 475 : Verify nullable range-restricted signed 16-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_475();
             break;
         case 476:
             ChipLogProgress(
-                chipTool, " ***** Test Step 476 : Write middle valid value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_476();
+                chipTool, " ***** Test Step 476 : Write max valid value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_476();
             break;
         case 477:
             ChipLogProgress(
-                chipTool, " ***** Test Step 477 : Verify nullable range-restricted signed 16-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_477();
+                chipTool, " ***** Test Step 477 : Verify nullable range-restricted signed 16-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_477();
             break;
         case 478:
             ChipLogProgress(
-                chipTool, " ***** Test Step 478 : Write null value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_478();
+                chipTool, " ***** Test Step 478 : Write middle valid value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_478();
             break;
         case 479:
             ChipLogProgress(
-                chipTool, " ***** Test Step 479 : Verify nullable range-restricted signed 16-bit integer value is null\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_479();
+                chipTool, " ***** Test Step 479 : Verify nullable range-restricted signed 16-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_479();
             break;
         case 480:
-            ChipLogProgress(chipTool, " ***** Test Step 480 : Write attribute that returns general status on write\n");
-            err = TestWriteAttributeThatReturnsGeneralStatusOnWrite_480();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 480 : Write null value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_480();
             break;
         case 481:
-            ChipLogProgress(chipTool, " ***** Test Step 481 : Write attribute that returns cluster-specific status on write\n");
-            err = TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_481();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 481 : Verify nullable range-restricted signed 16-bit integer value is null\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_481();
             break;
         case 482:
-            ChipLogProgress(chipTool, " ***** Test Step 482 : Read attribute that returns general status on read\n");
-            err = TestReadAttributeThatReturnsGeneralStatusOnRead_482();
+            ChipLogProgress(chipTool, " ***** Test Step 482 : Write attribute that returns general status on write\n");
+            err = TestWriteAttributeThatReturnsGeneralStatusOnWrite_482();
             break;
         case 483:
-            ChipLogProgress(chipTool, " ***** Test Step 483 : read attribute that returns cluster-specific status on read\n");
-            err = TestReadAttributeThatReturnsClusterSpecificStatusOnRead_483();
+            ChipLogProgress(chipTool, " ***** Test Step 483 : Write attribute that returns cluster-specific status on write\n");
+            err = TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_483();
             break;
         case 484:
-            ChipLogProgress(chipTool, " ***** Test Step 484 : read AcceptedCommandList attribute\n");
-            err = TestReadAcceptedCommandListAttribute_484();
+            ChipLogProgress(chipTool, " ***** Test Step 484 : Read attribute that returns general status on read\n");
+            err = TestReadAttributeThatReturnsGeneralStatusOnRead_484();
             break;
         case 485:
-            ChipLogProgress(chipTool, " ***** Test Step 485 : read GeneratedCommandList attribute\n");
-            err = TestReadGeneratedCommandListAttribute_485();
+            ChipLogProgress(chipTool, " ***** Test Step 485 : read attribute that returns cluster-specific status on read\n");
+            err = TestReadAttributeThatReturnsClusterSpecificStatusOnRead_485();
             break;
         case 486:
-            ChipLogProgress(chipTool, " ***** Test Step 486 : Write struct-typed attribute\n");
-            err = TestWriteStructTypedAttribute_486();
+            ChipLogProgress(chipTool, " ***** Test Step 486 : read AcceptedCommandList attribute\n");
+            err = TestReadAcceptedCommandListAttribute_486();
             break;
         case 487:
-            ChipLogProgress(chipTool, " ***** Test Step 487 : Read struct-typed attribute\n");
-            err = TestReadStructTypedAttribute_487();
+            ChipLogProgress(chipTool, " ***** Test Step 487 : read GeneratedCommandList attribute\n");
+            err = TestReadGeneratedCommandListAttribute_487();
+            break;
+        case 488:
+            ChipLogProgress(chipTool, " ***** Test Step 488 : Write struct-typed attribute\n");
+            err = TestWriteStructTypedAttribute_488();
+            break;
+        case 489:
+            ChipLogProgress(chipTool, " ***** Test Step 489 : Read struct-typed attribute\n");
+            err = TestReadStructTypedAttribute_489();
             break;
         }
 
@@ -73244,13 +69321,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 114:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 115:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 116:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 117:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73274,13 +69351,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 124:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 125:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 126:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 127:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73340,16 +69417,16 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 146:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 147:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 148:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
         case 149:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
         case 150:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73460,13 +69537,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 186:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 187:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 188:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 189:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73481,13 +69558,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 193:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 194:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 195:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 196:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73499,13 +69576,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 199:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 200:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 201:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 202:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73517,13 +69594,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 205:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 206:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 207:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 208:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73541,13 +69618,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 213:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 214:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 215:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 216:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73583,13 +69660,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 227:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 228:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 229:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 230:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73622,13 +69699,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 240:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 241:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 242:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 243:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73661,13 +69738,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 253:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 254:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 255:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 256:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73694,13 +69771,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 264:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 265:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 266:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 267:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73727,13 +69804,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 275:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 276:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 277:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 278:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73760,13 +69837,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 286:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 287:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 288:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 289:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73793,13 +69870,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 297:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 298:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 299:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 300:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73892,13 +69969,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 330:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 331:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 332:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 333:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73916,13 +69993,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 338:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 339:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 340:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 341:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -73940,13 +70017,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 346:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 347:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 348:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 349:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74006,19 +70083,19 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 368:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 369:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 370:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_VALUE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
         case 371:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
         case 372:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_VALUE));
             break;
         case 373:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74033,10 +70110,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 377:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 378:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 379:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74045,10 +70122,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 381:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 382:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 383:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74069,10 +70146,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 389:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 390:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 391:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74081,10 +70158,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 393:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 394:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 395:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74105,10 +70182,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 401:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 402:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 403:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74117,10 +70194,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 405:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 406:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 407:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74141,10 +70218,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 413:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 414:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 415:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74153,10 +70230,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 417:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 418:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 419:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74177,10 +70254,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 425:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 426:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 427:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74189,10 +70266,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 429:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 430:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 431:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74219,10 +70296,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 439:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 440:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 441:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74231,10 +70308,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 443:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 444:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 445:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74261,10 +70338,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 453:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 454:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 455:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74273,10 +70350,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 457:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 458:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 459:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74303,10 +70380,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 467:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 468:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 469:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -74315,10 +70392,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 471:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 472:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 473:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74342,10 +70419,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 480:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 481:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 482:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
@@ -74354,10 +70431,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 484:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
         case 485:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 486:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -74365,6 +70442,12 @@ class TestCluster : public TestCommandBridge {
         case 487:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 488:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 489:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -74378,7 +70461,7 @@ class TestCluster : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 488;
+    const uint16_t mTestCount = 490;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -76699,7 +72782,50 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeOctetStringWithWeirdChars_110()
+    CHIP_ERROR TestWriteAttributeOctetStringWithHexFormat_110()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id octetStringArgument;
+        octetStringArgument = [[NSData alloc] initWithBytes:"\x00\x01\x02\x03\x04\x05" length:6];
+        [cluster writeAttributeOctetStringWithValue:octetStringArgument
+                                  completionHandler:^(NSError * _Nullable err) {
+                                      NSLog(@"Write attribute OCTET_STRING with hex: format Error: %@", err);
+
+                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                      NextTest();
+                                  }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadAttributeOctetStringWithHexFormat_111()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute OCTET_STRING with hex: format Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueAsString(
+                    "octet_string", actualValue, [[NSData alloc] initWithBytes:"\x00\x01\x02\x03\x04\x05" length:6]));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWriteAttributeOctetStringWithWeirdChars_112()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76719,7 +72845,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeOctetStringWithWeirdChars_111()
+    CHIP_ERROR TestReadAttributeOctetStringWithWeirdChars_113()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76742,7 +72868,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeOctetString_112()
+    CHIP_ERROR TestWriteAttributeOctetString_114()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76762,7 +72888,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeOctetString_113()
+    CHIP_ERROR TestReadAttributeOctetString_115()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76785,7 +72911,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeOctetString_114()
+    CHIP_ERROR TestWriteAttributeOctetString_116()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76804,7 +72930,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeOctetString_115()
+    CHIP_ERROR TestReadAttributeOctetString_117()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76827,7 +72953,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeOctetString_116()
+    CHIP_ERROR TestWriteAttributeOctetString_118()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76847,7 +72973,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeLongOctetStringDefaultValue_117()
+    CHIP_ERROR TestReadAttributeLongOctetStringDefaultValue_119()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76869,7 +72995,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeLongOctetString_118()
+    CHIP_ERROR TestWriteAttributeLongOctetString_120()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76893,7 +73019,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeLongOctetString_119()
+    CHIP_ERROR TestReadAttributeLongOctetString_121()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76921,7 +73047,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeLongOctetString_120()
+    CHIP_ERROR TestWriteAttributeLongOctetString_122()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76941,7 +73067,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringDefaultValue_121()
+    CHIP_ERROR TestReadAttributeCharStringDefaultValue_123()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76963,7 +73089,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharString_122()
+    CHIP_ERROR TestWriteAttributeCharString_124()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -76983,7 +73109,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharString_123()
+    CHIP_ERROR TestReadAttributeCharString_125()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77005,7 +73131,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValueTooLong_124()
+    CHIP_ERROR TestWriteAttributeCharStringValueTooLong_126()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77024,7 +73150,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharString_125()
+    CHIP_ERROR TestReadAttributeCharString_127()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77046,7 +73172,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringEmpty_126()
+    CHIP_ERROR TestWriteAttributeCharStringEmpty_128()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77066,7 +73192,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeLongCharStringDefaultValue_127()
+    CHIP_ERROR TestReadAttributeLongCharStringDefaultValue_129()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77088,7 +73214,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeLongCharString_128()
+    CHIP_ERROR TestWriteAttributeLongCharString_130()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77111,7 +73237,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeLongCharString_129()
+    CHIP_ERROR TestReadAttributeLongCharString_131()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77136,7 +73262,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeLongCharString_130()
+    CHIP_ERROR TestWriteAttributeLongCharString_132()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77156,7 +73282,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListLongOctetStringForChunkedRead_131()
+    CHIP_ERROR TestReadAttributeListLongOctetStringForChunkedRead_133()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77214,7 +73340,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListLongOctetStringForChunkedWrite_132()
+    CHIP_ERROR TestWriteAttributeListLongOctetStringForChunkedWrite_134()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77277,7 +73403,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListLongOctetStringForChunkedRead_133()
+    CHIP_ERROR TestReadAttributeListLongOctetStringForChunkedRead_135()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77344,7 +73470,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochUsDefaultValue_134()
+    CHIP_ERROR TestReadAttributeEpochUsDefaultValue_136()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77366,7 +73492,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochUsMaxValue_135()
+    CHIP_ERROR TestWriteAttributeEpochUsMaxValue_137()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77386,7 +73512,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochUsMaxValue_136()
+    CHIP_ERROR TestReadAttributeEpochUsMaxValue_138()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77408,7 +73534,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochUsMinValue_137()
+    CHIP_ERROR TestWriteAttributeEpochUsMinValue_139()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77428,7 +73554,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochUsMinValue_138()
+    CHIP_ERROR TestReadAttributeEpochUsMinValue_140()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77450,7 +73576,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochSDefaultValue_139()
+    CHIP_ERROR TestReadAttributeEpochSDefaultValue_141()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77472,7 +73598,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochSMaxValue_140()
+    CHIP_ERROR TestWriteAttributeEpochSMaxValue_142()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77492,7 +73618,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochSMaxValue_141()
+    CHIP_ERROR TestReadAttributeEpochSMaxValue_143()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77514,7 +73640,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochSMinValue_142()
+    CHIP_ERROR TestWriteAttributeEpochSMinValue_144()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77534,7 +73660,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochSMinValue_143()
+    CHIP_ERROR TestReadAttributeEpochSMinValue_145()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77556,7 +73682,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeUnsupported_144()
+    CHIP_ERROR TestReadAttributeUnsupported_146()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77583,7 +73709,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteattributeUnsupported_145()
+    CHIP_ERROR TestWriteattributeUnsupported_147()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77608,7 +73734,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandToUnsupportedEndpoint_146()
+    CHIP_ERROR TestSendTestCommandToUnsupportedEndpoint_148()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:200 queue:mCallbackQueue];
@@ -77624,7 +73750,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandToUnsupportedCluster_147()
+    CHIP_ERROR TestSendTestCommandToUnsupportedCluster_149()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -77640,7 +73766,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeVendorIdDefaultValue_148()
+    CHIP_ERROR TestReadAttributeVendorIdDefaultValue_150()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77662,7 +73788,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeVendorId_149()
+    CHIP_ERROR TestWriteAttributeVendorId_151()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77682,7 +73808,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeVendorId_150()
+    CHIP_ERROR TestReadAttributeVendorId_152()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77704,7 +73830,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestRestoreAttributeVendorId_151()
+    CHIP_ERROR TestRestoreAttributeVendorId_153()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77724,7 +73850,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandWithAVendorIdAndEnum_152()
+    CHIP_ERROR TestSendACommandWithAVendorIdAndEnum_154()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77756,7 +73882,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsTrue_153()
+    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsTrue_155()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77791,7 +73917,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsFalse_154()
+    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsFalse_156()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77826,7 +73952,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_155()
+    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_157()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77872,7 +73998,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_156()
+    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_158()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -77918,7 +74044,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_157()
+    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_159()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78010,7 +74136,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_158()
+    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_160()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78102,7 +74228,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_159()
+    CHIP_ERROR TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_161()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78147,7 +74273,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_160()
+    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_162()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78186,7 +74312,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_161()
+    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_163()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78225,7 +74351,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndGetItReversed_162()
+    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndGetItReversed_164()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78273,7 +74399,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_163()
+    CHIP_ERROR TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_165()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78303,7 +74429,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_164()
+    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_166()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78354,7 +74480,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_165()
+    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_167()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78405,7 +74531,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_166()
+    CHIP_ERROR TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_168()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78503,7 +74629,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_167()
+    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_169()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78601,7 +74727,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_168()
+    CHIP_ERROR TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_170()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78628,7 +74754,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListWithListOfInt8u_169()
+    CHIP_ERROR TestReadAttributeListWithListOfInt8u_171()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78654,7 +74780,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListWithListOfOctetString_170()
+    CHIP_ERROR TestWriteAttributeListWithListOfOctetString_172()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78681,7 +74807,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListWithListOfOctetString_171()
+    CHIP_ERROR TestReadAttributeListWithListOfOctetString_173()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78707,7 +74833,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListWithListOfListStructOctetString_172()
+    CHIP_ERROR TestWriteAttributeListWithListOfListStructOctetString_174()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78717,24 +74843,20 @@ class TestCluster : public TestCommandBridge {
         {
             NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
             temp_0[0] = [[CHIPTestClusterClusterTestListStructOctet alloc] init];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedLongLong:0ULL];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).operationalCert = [[NSData alloc] initWithBytes:"Test0"
-                                                                                                               length:5];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).member1 = [NSNumber numberWithUnsignedLongLong:0ULL];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).member2 = [[NSData alloc] initWithBytes:"Test0" length:5];
 
             temp_0[1] = [[CHIPTestClusterClusterTestListStructOctet alloc] init];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedLongLong:1ULL];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).operationalCert = [[NSData alloc] initWithBytes:"Test1"
-                                                                                                               length:5];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).member1 = [NSNumber numberWithUnsignedLongLong:1ULL];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).member2 = [[NSData alloc] initWithBytes:"Test1" length:5];
 
             temp_0[2] = [[CHIPTestClusterClusterTestListStructOctet alloc] init];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedLongLong:2ULL];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).operationalCert = [[NSData alloc] initWithBytes:"Test2"
-                                                                                                               length:5];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).member1 = [NSNumber numberWithUnsignedLongLong:2ULL];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).member2 = [[NSData alloc] initWithBytes:"Test2" length:5];
 
             temp_0[3] = [[CHIPTestClusterClusterTestListStructOctet alloc] init];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).fabricIndex = [NSNumber numberWithUnsignedLongLong:3ULL];
-            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).operationalCert = [[NSData alloc] initWithBytes:"Test3"
-                                                                                                               length:5];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).member1 = [NSNumber numberWithUnsignedLongLong:3ULL];
+            ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).member2 = [[NSData alloc] initWithBytes:"Test3" length:5];
 
             listStructOctetStringArgument = temp_0;
         }
@@ -78750,7 +74872,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListWithListOfListStructOctetString_173()
+    CHIP_ERROR TestReadAttributeListWithListOfListStructOctetString_175()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78764,25 +74886,17 @@ class TestCluster : public TestCommandBridge {
             {
                 id actualValue = value;
                 VerifyOrReturn(CheckValue("list_struct_octet_string", [actualValue count], static_cast<uint32_t>(4)));
-                VerifyOrReturn(
-                    CheckValue("fabricIndex", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).fabricIndex, 0ULL));
-                VerifyOrReturn(CheckValueAsString("operationalCert",
-                    ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).operationalCert,
+                VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).member1, 0ULL));
+                VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).member2,
                     [[NSData alloc] initWithBytes:"Test0" length:5]));
-                VerifyOrReturn(
-                    CheckValue("fabricIndex", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).fabricIndex, 1ULL));
-                VerifyOrReturn(CheckValueAsString("operationalCert",
-                    ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).operationalCert,
+                VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).member1, 1ULL));
+                VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).member2,
                     [[NSData alloc] initWithBytes:"Test1" length:5]));
-                VerifyOrReturn(
-                    CheckValue("fabricIndex", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).fabricIndex, 2ULL));
-                VerifyOrReturn(CheckValueAsString("operationalCert",
-                    ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).operationalCert,
+                VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).member1, 2ULL));
+                VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).member2,
                     [[NSData alloc] initWithBytes:"Test2" length:5]));
-                VerifyOrReturn(
-                    CheckValue("fabricIndex", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).fabricIndex, 3ULL));
-                VerifyOrReturn(CheckValueAsString("operationalCert",
-                    ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).operationalCert,
+                VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).member1, 3ULL));
+                VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).member2,
                     [[NSData alloc] initWithBytes:"Test3" length:5]));
             }
 
@@ -78792,7 +74906,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithOptionalArgSet_174()
+    CHIP_ERROR TestSendTestCommandWithOptionalArgSet_176()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78835,7 +74949,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithoutItsOptionalArg_175()
+    CHIP_ERROR TestSendTestCommandWithoutItsOptionalArg_177()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78861,7 +74975,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionals_176()
+    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionals_178()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78892,7 +75006,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteListOfStructsContainingNullablesAndOptionals_177()
+    CHIP_ERROR TestWriteListOfStructsContainingNullablesAndOptionals_179()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78928,7 +75042,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_178()
+    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_180()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78966,7 +75080,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBooleanNull_179()
+    CHIP_ERROR TestWriteAttributeNullableBooleanNull_181()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -78987,7 +75101,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSNumber * _Nullable booValueNull;
 
-    CHIP_ERROR TestReadAttributeNullableBooleanNull_180()
+    CHIP_ERROR TestReadAttributeNullableBooleanNull_182()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79012,7 +75126,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBooleanTrue_181()
+    CHIP_ERROR TestWriteAttributeNullableBooleanTrue_183()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79032,7 +75146,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBooleanTrue_182()
+    CHIP_ERROR TestReadAttributeNullableBooleanTrue_184()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79055,7 +75169,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBooleanNotNull_183()
+    CHIP_ERROR TestReadAttributeNullableBooleanNotNull_185()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79067,8 +75181,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableBoolean", value, booValueNull));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableBoolean", value, booValueNull));
 
             NextTest();
         }];
@@ -79076,7 +75190,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap8MaxValue_184()
+    CHIP_ERROR TestWriteAttributeNullableBitmap8MaxValue_186()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79096,7 +75210,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8MaxValue_185()
+    CHIP_ERROR TestReadAttributeNullableBitmap8MaxValue_187()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79119,7 +75233,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap8InvalidValue_186()
+    CHIP_ERROR TestWriteAttributeNullableBitmap8InvalidValue_188()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79140,7 +75254,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSNumber * _Nullable nullableValue254;
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8UnchangedValue_187()
+    CHIP_ERROR TestReadAttributeNullableBitmap8UnchangedValue_189()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79166,7 +75280,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap8NullValue_188()
+    CHIP_ERROR TestWriteAttributeNullableBitmap8NullValue_190()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79186,7 +75300,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8NullValue_189()
+    CHIP_ERROR TestReadAttributeNullableBitmap8NullValue_191()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79208,7 +75322,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8Not254Value_190()
+    CHIP_ERROR TestReadAttributeNullableBitmap8Not254Value_192()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79220,8 +75334,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableBitmap8", value, nullableValue254));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableBitmap8", value, nullableValue254));
 
             NextTest();
         }];
@@ -79229,7 +75343,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap16MaxValue_191()
+    CHIP_ERROR TestWriteAttributeNullableBitmap16MaxValue_193()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79249,7 +75363,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap16MaxValue_192()
+    CHIP_ERROR TestReadAttributeNullableBitmap16MaxValue_194()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79272,7 +75386,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap16InvalidValue_193()
+    CHIP_ERROR TestWriteAttributeNullableBitmap16InvalidValue_195()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79292,7 +75406,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap16UnchangedValue_194()
+    CHIP_ERROR TestReadAttributeNullableBitmap16UnchangedValue_196()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79315,7 +75429,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap16NullValue_195()
+    CHIP_ERROR TestWriteAttributeNullableBitmap16NullValue_197()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79335,7 +75449,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap16NullValue_196()
+    CHIP_ERROR TestReadAttributeNullableBitmap16NullValue_198()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79357,7 +75471,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap32MaxValue_197()
+    CHIP_ERROR TestWriteAttributeNullableBitmap32MaxValue_199()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79377,7 +75491,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap32MaxValue_198()
+    CHIP_ERROR TestReadAttributeNullableBitmap32MaxValue_200()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79400,7 +75514,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap32InvalidValue_199()
+    CHIP_ERROR TestWriteAttributeNullableBitmap32InvalidValue_201()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79420,7 +75534,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap32UnchangedValue_200()
+    CHIP_ERROR TestReadAttributeNullableBitmap32UnchangedValue_202()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79443,7 +75557,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap32NullValue_201()
+    CHIP_ERROR TestWriteAttributeNullableBitmap32NullValue_203()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79463,7 +75577,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap32NullValue_202()
+    CHIP_ERROR TestReadAttributeNullableBitmap32NullValue_204()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79485,7 +75599,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap64MaxValue_203()
+    CHIP_ERROR TestWriteAttributeNullableBitmap64MaxValue_205()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79505,7 +75619,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap64MaxValue_204()
+    CHIP_ERROR TestReadAttributeNullableBitmap64MaxValue_206()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79528,7 +75642,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap64InvalidValue_205()
+    CHIP_ERROR TestWriteAttributeNullableBitmap64InvalidValue_207()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79548,7 +75662,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap64UnchangedValue_206()
+    CHIP_ERROR TestReadAttributeNullableBitmap64UnchangedValue_208()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79571,7 +75685,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap64NullValue_207()
+    CHIP_ERROR TestWriteAttributeNullableBitmap64NullValue_209()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79591,7 +75705,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap64NullValue_208()
+    CHIP_ERROR TestReadAttributeNullableBitmap64NullValue_210()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79613,7 +75727,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uMinValue_209()
+    CHIP_ERROR TestWriteAttributeNullableInt8uMinValue_211()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79633,7 +75747,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uMinValue_210()
+    CHIP_ERROR TestReadAttributeNullableInt8uMinValue_212()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79656,7 +75770,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uMaxValue_211()
+    CHIP_ERROR TestWriteAttributeNullableInt8uMaxValue_213()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79676,7 +75790,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uMaxValue_212()
+    CHIP_ERROR TestReadAttributeNullableInt8uMaxValue_214()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79699,7 +75813,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uInvalidValue_213()
+    CHIP_ERROR TestWriteAttributeNullableInt8uInvalidValue_215()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79718,7 +75832,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValue_214()
+    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValue_216()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79741,7 +75855,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValueWithConstraint_215()
+    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValueWithConstraint_217()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79752,6 +75866,8 @@ class TestCluster : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            if (value != nil) {
+            }
             VerifyOrReturn(CheckValueNonNull("nullableInt8u", value));
 
             NextTest();
@@ -79760,7 +75876,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uNullValue_216()
+    CHIP_ERROR TestWriteAttributeNullableInt8uNullValue_218()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79780,7 +75896,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNullValue_217()
+    CHIP_ERROR TestReadAttributeNullableInt8uNullValue_219()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79802,7 +75918,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNullValueRange_218()
+    CHIP_ERROR TestReadAttributeNullableInt8uNullValueRange_220()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79814,9 +75930,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint8_t>("nullableInt8u", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("nullableInt8u", [value unsignedCharValue], 254));
             }
 
@@ -79826,7 +75941,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNullValueNot_219()
+    CHIP_ERROR TestReadAttributeNullableInt8uNullValueNot_221()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79838,8 +75953,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt8u", value, 254));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt8u", value, 254));
 
             NextTest();
         }];
@@ -79847,7 +75962,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uValue_220()
+    CHIP_ERROR TestWriteAttributeNullableInt8uValue_222()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79867,7 +75982,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uValueInRange_221()
+    CHIP_ERROR TestReadAttributeNullableInt8uValueInRange_223()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79879,9 +75994,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint8_t>("nullableInt8u", [value unsignedCharValue], 0));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("nullableInt8u", [value unsignedCharValue], 254));
             }
 
@@ -79891,7 +76005,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNotValueOk_222()
+    CHIP_ERROR TestReadAttributeNullableInt8uNotValueOk_224()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79903,8 +76017,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt8u", value, 129));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt8u", value, 129));
 
             NextTest();
         }];
@@ -79912,7 +76026,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uMinValue_223()
+    CHIP_ERROR TestWriteAttributeNullableInt16uMinValue_225()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79932,7 +76046,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uMinValue_224()
+    CHIP_ERROR TestReadAttributeNullableInt16uMinValue_226()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79955,7 +76069,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uMaxValue_225()
+    CHIP_ERROR TestWriteAttributeNullableInt16uMaxValue_227()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79975,7 +76089,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uMaxValue_226()
+    CHIP_ERROR TestReadAttributeNullableInt16uMaxValue_228()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -79998,7 +76112,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uInvalidValue_227()
+    CHIP_ERROR TestWriteAttributeNullableInt16uInvalidValue_229()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80018,7 +76132,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uUnchangedValue_228()
+    CHIP_ERROR TestReadAttributeNullableInt16uUnchangedValue_230()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80041,7 +76155,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uNullValue_229()
+    CHIP_ERROR TestWriteAttributeNullableInt16uNullValue_231()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80061,7 +76175,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNullValue_230()
+    CHIP_ERROR TestReadAttributeNullableInt16uNullValue_232()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80083,7 +76197,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNullValueRange_231()
+    CHIP_ERROR TestReadAttributeNullableInt16uNullValueRange_233()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80095,9 +76209,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("nullableInt16u", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("nullableInt16u", [value unsignedShortValue], 65534U));
             }
 
@@ -80107,7 +76220,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNullValueNot_232()
+    CHIP_ERROR TestReadAttributeNullableInt16uNullValueNot_234()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80119,8 +76232,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt16u", value, 65534U));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt16u", value, 65534U));
 
             NextTest();
         }];
@@ -80128,7 +76241,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uValue_233()
+    CHIP_ERROR TestWriteAttributeNullableInt16uValue_235()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80148,7 +76261,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uValueInRange_234()
+    CHIP_ERROR TestReadAttributeNullableInt16uValueInRange_236()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80160,9 +76273,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint16_t>("nullableInt16u", [value unsignedShortValue], 0U));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("nullableInt16u", [value unsignedShortValue], 65534U));
             }
 
@@ -80172,7 +76284,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNotValueOk_235()
+    CHIP_ERROR TestReadAttributeNullableInt16uNotValueOk_237()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80184,8 +76296,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt16u", value, 32001U));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt16u", value, 32001U));
 
             NextTest();
         }];
@@ -80193,7 +76305,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uMinValue_236()
+    CHIP_ERROR TestWriteAttributeNullableInt32uMinValue_238()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80213,7 +76325,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uMinValue_237()
+    CHIP_ERROR TestReadAttributeNullableInt32uMinValue_239()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80236,7 +76348,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uMaxValue_238()
+    CHIP_ERROR TestWriteAttributeNullableInt32uMaxValue_240()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80256,7 +76368,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uMaxValue_239()
+    CHIP_ERROR TestReadAttributeNullableInt32uMaxValue_241()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80279,7 +76391,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uInvalidValue_240()
+    CHIP_ERROR TestWriteAttributeNullableInt32uInvalidValue_242()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80299,7 +76411,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uUnchangedValue_241()
+    CHIP_ERROR TestReadAttributeNullableInt32uUnchangedValue_243()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80322,7 +76434,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uNullValue_242()
+    CHIP_ERROR TestWriteAttributeNullableInt32uNullValue_244()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80342,7 +76454,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNullValue_243()
+    CHIP_ERROR TestReadAttributeNullableInt32uNullValue_245()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80364,7 +76476,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNullValueRange_244()
+    CHIP_ERROR TestReadAttributeNullableInt32uNullValueRange_246()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80376,9 +76488,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint32_t>("nullableInt32u", [value unsignedIntValue], 0UL));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("nullableInt32u", [value unsignedIntValue], 4294967294UL));
             }
 
@@ -80388,7 +76499,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNullValueNot_245()
+    CHIP_ERROR TestReadAttributeNullableInt32uNullValueNot_247()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80400,8 +76511,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt32u", value, 4294967294UL));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt32u", value, 4294967294UL));
 
             NextTest();
         }];
@@ -80409,7 +76520,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uValue_246()
+    CHIP_ERROR TestWriteAttributeNullableInt32uValue_248()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80429,7 +76540,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uValueInRange_247()
+    CHIP_ERROR TestReadAttributeNullableInt32uValueInRange_249()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80441,9 +76552,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint32_t>("nullableInt32u", [value unsignedIntValue], 0UL));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("nullableInt32u", [value unsignedIntValue], 4294967294UL));
             }
 
@@ -80453,7 +76563,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNotValueOk_248()
+    CHIP_ERROR TestReadAttributeNullableInt32uNotValueOk_250()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80465,8 +76575,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt32u", value, 2147483648UL));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt32u", value, 2147483648UL));
 
             NextTest();
         }];
@@ -80474,7 +76584,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uMinValue_249()
+    CHIP_ERROR TestWriteAttributeNullableInt64uMinValue_251()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80494,7 +76604,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uMinValue_250()
+    CHIP_ERROR TestReadAttributeNullableInt64uMinValue_252()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80517,7 +76627,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uMaxValue_251()
+    CHIP_ERROR TestWriteAttributeNullableInt64uMaxValue_253()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80537,7 +76647,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uMaxValue_252()
+    CHIP_ERROR TestReadAttributeNullableInt64uMaxValue_254()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80560,7 +76670,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uInvalidValue_253()
+    CHIP_ERROR TestWriteAttributeNullableInt64uInvalidValue_255()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80580,7 +76690,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uUnchangedValue_254()
+    CHIP_ERROR TestReadAttributeNullableInt64uUnchangedValue_256()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80603,7 +76713,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uNullValue_255()
+    CHIP_ERROR TestWriteAttributeNullableInt64uNullValue_257()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80623,7 +76733,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNullValue_256()
+    CHIP_ERROR TestReadAttributeNullableInt64uNullValue_258()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80645,7 +76755,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNullValueRange_257()
+    CHIP_ERROR TestReadAttributeNullableInt64uNullValueRange_259()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80657,9 +76767,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint64_t>("nullableInt64u", [value unsignedLongLongValue], 0ULL));
-            }
-            if (value != nil) {
                 VerifyOrReturn(
                     CheckConstraintMaxValue<uint64_t>("nullableInt64u", [value unsignedLongLongValue], 18446744073709551614ULL));
             }
@@ -80670,7 +76779,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNullValueNot_258()
+    CHIP_ERROR TestReadAttributeNullableInt64uNullValueNot_260()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80682,8 +76791,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt64u", value, 18446744073709551614ULL));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt64u", value, 18446744073709551614ULL));
 
             NextTest();
         }];
@@ -80691,7 +76800,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uValue_259()
+    CHIP_ERROR TestWriteAttributeNullableInt64uValue_261()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80711,7 +76820,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uValueInRange_260()
+    CHIP_ERROR TestReadAttributeNullableInt64uValueInRange_262()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80723,9 +76832,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<uint64_t>("nullableInt64u", [value unsignedLongLongValue], 0ULL));
-            }
-            if (value != nil) {
                 VerifyOrReturn(
                     CheckConstraintMaxValue<uint64_t>("nullableInt64u", [value unsignedLongLongValue], 18446744073709551614ULL));
             }
@@ -80736,7 +76844,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNotValueOk_261()
+    CHIP_ERROR TestReadAttributeNullableInt64uNotValueOk_263()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80748,8 +76856,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt64u", value, 18000000000000000001ULL));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt64u", value, 18000000000000000001ULL));
 
             NextTest();
         }];
@@ -80757,7 +76865,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sMinValue_262()
+    CHIP_ERROR TestWriteAttributeNullableInt8sMinValue_264()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80777,7 +76885,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sMinValue_263()
+    CHIP_ERROR TestReadAttributeNullableInt8sMinValue_265()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80800,7 +76908,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sInvalidValue_264()
+    CHIP_ERROR TestWriteAttributeNullableInt8sInvalidValue_266()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80819,7 +76927,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sUnchangedValue_265()
+    CHIP_ERROR TestReadAttributeNullableInt8sUnchangedValue_267()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80842,7 +76950,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sNullValue_266()
+    CHIP_ERROR TestWriteAttributeNullableInt8sNullValue_268()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80862,7 +76970,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNullValue_267()
+    CHIP_ERROR TestReadAttributeNullableInt8sNullValue_269()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80884,7 +76992,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNullValueRange_268()
+    CHIP_ERROR TestReadAttributeNullableInt8sNullValueRange_270()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80896,9 +77004,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int8_t>("nullableInt8s", [value charValue], -127));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int8_t>("nullableInt8s", [value charValue], 127));
             }
 
@@ -80908,7 +77015,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNullValueNot_269()
+    CHIP_ERROR TestReadAttributeNullableInt8sNullValueNot_271()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80920,8 +77027,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt8s", value, -127));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt8s", value, -127));
 
             NextTest();
         }];
@@ -80929,7 +77036,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sValue_270()
+    CHIP_ERROR TestWriteAttributeNullableInt8sValue_272()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80949,7 +77056,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sValueInRange_271()
+    CHIP_ERROR TestReadAttributeNullableInt8sValueInRange_273()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80961,9 +77068,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int8_t>("nullableInt8s", [value charValue], -127));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int8_t>("nullableInt8s", [value charValue], 127));
             }
 
@@ -80973,7 +77079,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNotValueOk_272()
+    CHIP_ERROR TestReadAttributeNullableInt8sNotValueOk_274()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -80985,8 +77091,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt8s", value, -126));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt8s", value, -126));
 
             NextTest();
         }];
@@ -80994,7 +77100,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sMinValue_273()
+    CHIP_ERROR TestWriteAttributeNullableInt16sMinValue_275()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81014,7 +77120,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sMinValue_274()
+    CHIP_ERROR TestReadAttributeNullableInt16sMinValue_276()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81037,7 +77143,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sInvalidValue_275()
+    CHIP_ERROR TestWriteAttributeNullableInt16sInvalidValue_277()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81057,7 +77163,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sUnchangedValue_276()
+    CHIP_ERROR TestReadAttributeNullableInt16sUnchangedValue_278()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81080,7 +77186,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sNullValue_277()
+    CHIP_ERROR TestWriteAttributeNullableInt16sNullValue_279()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81100,7 +77206,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNullValue_278()
+    CHIP_ERROR TestReadAttributeNullableInt16sNullValue_280()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81122,7 +77228,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNullValueRange_279()
+    CHIP_ERROR TestReadAttributeNullableInt16sNullValueRange_281()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81134,9 +77240,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("nullableInt16s", [value shortValue], -32767));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("nullableInt16s", [value shortValue], 32767));
             }
 
@@ -81146,7 +77251,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNullValueNot_280()
+    CHIP_ERROR TestReadAttributeNullableInt16sNullValueNot_282()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81158,8 +77263,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt16s", value, -32767));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt16s", value, -32767));
 
             NextTest();
         }];
@@ -81167,7 +77272,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sValue_281()
+    CHIP_ERROR TestWriteAttributeNullableInt16sValue_283()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81187,7 +77292,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sValueInRange_282()
+    CHIP_ERROR TestReadAttributeNullableInt16sValueInRange_284()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81199,9 +77304,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("nullableInt16s", [value shortValue], -32767));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("nullableInt16s", [value shortValue], 32767));
             }
 
@@ -81211,7 +77315,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNotValueOk_283()
+    CHIP_ERROR TestReadAttributeNullableInt16sNotValueOk_285()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81223,8 +77327,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt16s", value, -32766));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt16s", value, -32766));
 
             NextTest();
         }];
@@ -81232,7 +77336,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sMinValue_284()
+    CHIP_ERROR TestWriteAttributeNullableInt32sMinValue_286()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81252,7 +77356,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sMinValue_285()
+    CHIP_ERROR TestReadAttributeNullableInt32sMinValue_287()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81275,7 +77379,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sInvalidValue_286()
+    CHIP_ERROR TestWriteAttributeNullableInt32sInvalidValue_288()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81295,7 +77399,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sUnchangedValue_287()
+    CHIP_ERROR TestReadAttributeNullableInt32sUnchangedValue_289()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81318,7 +77422,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sNullValue_288()
+    CHIP_ERROR TestWriteAttributeNullableInt32sNullValue_290()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81338,7 +77442,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNullValue_289()
+    CHIP_ERROR TestReadAttributeNullableInt32sNullValue_291()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81360,7 +77464,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNullValueRange_290()
+    CHIP_ERROR TestReadAttributeNullableInt32sNullValueRange_292()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81372,9 +77476,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int32_t>("nullableInt32s", [value intValue], -2147483647L));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int32_t>("nullableInt32s", [value intValue], 2147483647L));
             }
 
@@ -81384,7 +77487,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNullValueNot_291()
+    CHIP_ERROR TestReadAttributeNullableInt32sNullValueNot_293()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81396,8 +77499,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt32s", value, -2147483647L));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt32s", value, -2147483647L));
 
             NextTest();
         }];
@@ -81405,7 +77508,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sValue_292()
+    CHIP_ERROR TestWriteAttributeNullableInt32sValue_294()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81425,7 +77528,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sValueInRange_293()
+    CHIP_ERROR TestReadAttributeNullableInt32sValueInRange_295()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81437,9 +77540,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int32_t>("nullableInt32s", [value intValue], -2147483647L));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int32_t>("nullableInt32s", [value intValue], 2147483647L));
             }
 
@@ -81449,7 +77551,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNotValueOk_294()
+    CHIP_ERROR TestReadAttributeNullableInt32sNotValueOk_296()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81461,8 +77563,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt32s", value, -2147483646L));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt32s", value, -2147483646L));
 
             NextTest();
         }];
@@ -81470,7 +77572,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sMinValue_295()
+    CHIP_ERROR TestWriteAttributeNullableInt64sMinValue_297()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81490,7 +77592,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sMinValue_296()
+    CHIP_ERROR TestReadAttributeNullableInt64sMinValue_298()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81513,7 +77615,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sInvalidValue_297()
+    CHIP_ERROR TestWriteAttributeNullableInt64sInvalidValue_299()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81533,7 +77635,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sUnchangedValue_298()
+    CHIP_ERROR TestReadAttributeNullableInt64sUnchangedValue_300()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81556,7 +77658,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sNullValue_299()
+    CHIP_ERROR TestWriteAttributeNullableInt64sNullValue_301()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81576,7 +77678,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNullValue_300()
+    CHIP_ERROR TestReadAttributeNullableInt64sNullValue_302()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81598,7 +77700,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNullValueRange_301()
+    CHIP_ERROR TestReadAttributeNullableInt64sNullValueRange_303()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81610,9 +77712,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int64_t>("nullableInt64s", [value longLongValue], -9223372036854775807LL));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int64_t>("nullableInt64s", [value longLongValue], 9223372036854775807LL));
             }
 
@@ -81622,7 +77723,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNullValueNot_302()
+    CHIP_ERROR TestReadAttributeNullableInt64sNullValueNot_304()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81634,8 +77735,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt64s", value, -9223372036854775807LL));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt64s", value, -9223372036854775807LL));
 
             NextTest();
         }];
@@ -81643,7 +77744,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sValue_303()
+    CHIP_ERROR TestWriteAttributeNullableInt64sValue_305()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81663,7 +77764,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sValueInRange_304()
+    CHIP_ERROR TestReadAttributeNullableInt64sValueInRange_306()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81675,9 +77776,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
+
                 VerifyOrReturn(CheckConstraintMinValue<int64_t>("nullableInt64s", [value longLongValue], -9223372036854775807LL));
-            }
-            if (value != nil) {
                 VerifyOrReturn(CheckConstraintMaxValue<int64_t>("nullableInt64s", [value longLongValue], 9223372036854775807LL));
             }
 
@@ -81687,7 +77787,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNotValueOk_305()
+    CHIP_ERROR TestReadAttributeNullableInt64sNotValueOk_307()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81699,8 +77799,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableInt64s", value, -9223372036854775806LL));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableInt64s", value, -9223372036854775806LL));
 
             NextTest();
         }];
@@ -81708,7 +77808,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleMediumValue_306()
+    CHIP_ERROR TestWriteAttributeNullableSingleMediumValue_308()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81728,7 +77828,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleMediumValue_307()
+    CHIP_ERROR TestReadAttributeNullableSingleMediumValue_309()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81751,7 +77851,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleLargestValue_308()
+    CHIP_ERROR TestWriteAttributeNullableSingleLargestValue_310()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81771,7 +77871,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleLargestValue_309()
+    CHIP_ERROR TestReadAttributeNullableSingleLargestValue_311()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81794,7 +77894,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleSmallestValue_310()
+    CHIP_ERROR TestWriteAttributeNullableSingleSmallestValue_312()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81814,7 +77914,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleSmallestValue_311()
+    CHIP_ERROR TestReadAttributeNullableSingleSmallestValue_313()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81837,7 +77937,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleNullValue_312()
+    CHIP_ERROR TestWriteAttributeNullableSingleNullValue_314()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81857,7 +77957,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleNullValue_313()
+    CHIP_ERROR TestReadAttributeNullableSingleNullValue_315()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81879,7 +77979,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingle0Value_314()
+    CHIP_ERROR TestWriteAttributeNullableSingle0Value_316()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81899,7 +77999,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingle0Value_315()
+    CHIP_ERROR TestReadAttributeNullableSingle0Value_317()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81922,7 +78022,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleMediumValue_316()
+    CHIP_ERROR TestWriteAttributeNullableDoubleMediumValue_318()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81942,7 +78042,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleMediumValue_317()
+    CHIP_ERROR TestReadAttributeNullableDoubleMediumValue_319()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81965,7 +78065,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleLargestValue_318()
+    CHIP_ERROR TestWriteAttributeNullableDoubleLargestValue_320()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -81985,7 +78085,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleLargestValue_319()
+    CHIP_ERROR TestReadAttributeNullableDoubleLargestValue_321()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82008,7 +78108,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleSmallestValue_320()
+    CHIP_ERROR TestWriteAttributeNullableDoubleSmallestValue_322()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82028,7 +78128,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleSmallestValue_321()
+    CHIP_ERROR TestReadAttributeNullableDoubleSmallestValue_323()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82051,7 +78151,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleNullValue_322()
+    CHIP_ERROR TestWriteAttributeNullableDoubleNullValue_324()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82071,7 +78171,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleNullValue_323()
+    CHIP_ERROR TestReadAttributeNullableDoubleNullValue_325()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82093,7 +78193,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDouble0Value_324()
+    CHIP_ERROR TestWriteAttributeNullableDouble0Value_326()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82113,7 +78213,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDouble0Value_325()
+    CHIP_ERROR TestReadAttributeNullableDouble0Value_327()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82136,7 +78236,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8MinValue_326()
+    CHIP_ERROR TestWriteAttributeNullableEnum8MinValue_328()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82156,7 +78256,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8MinValue_327()
+    CHIP_ERROR TestReadAttributeNullableEnum8MinValue_329()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82179,7 +78279,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8MaxValue_328()
+    CHIP_ERROR TestWriteAttributeNullableEnum8MaxValue_330()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82199,7 +78299,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8MaxValue_329()
+    CHIP_ERROR TestReadAttributeNullableEnum8MaxValue_331()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82222,7 +78322,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8InvalidValue_330()
+    CHIP_ERROR TestWriteAttributeNullableEnum8InvalidValue_332()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82241,7 +78341,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8UnchangedValue_331()
+    CHIP_ERROR TestReadAttributeNullableEnum8UnchangedValue_333()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82264,7 +78364,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8NullValue_332()
+    CHIP_ERROR TestWriteAttributeNullableEnum8NullValue_334()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82284,7 +78384,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8NullValue_333()
+    CHIP_ERROR TestReadAttributeNullableEnum8NullValue_335()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82306,7 +78406,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16MinValue_334()
+    CHIP_ERROR TestWriteAttributeNullableEnum16MinValue_336()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82326,7 +78426,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16MinValue_335()
+    CHIP_ERROR TestReadAttributeNullableEnum16MinValue_337()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82349,7 +78449,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16MaxValue_336()
+    CHIP_ERROR TestWriteAttributeNullableEnum16MaxValue_338()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82369,7 +78469,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16MaxValue_337()
+    CHIP_ERROR TestReadAttributeNullableEnum16MaxValue_339()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82392,7 +78492,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16InvalidValue_338()
+    CHIP_ERROR TestWriteAttributeNullableEnum16InvalidValue_340()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82412,7 +78512,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16UnchangedValue_339()
+    CHIP_ERROR TestReadAttributeNullableEnum16UnchangedValue_341()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82435,7 +78535,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16NullValue_340()
+    CHIP_ERROR TestWriteAttributeNullableEnum16NullValue_342()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82455,7 +78555,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16NullValue_341()
+    CHIP_ERROR TestReadAttributeNullableEnum16NullValue_343()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82477,7 +78577,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMinValue_342()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMinValue_344()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82497,7 +78597,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumMinValue_343()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumMinValue_345()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82520,7 +78620,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMaxValue_344()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMaxValue_346()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82540,7 +78640,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumMaxValue_345()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumMaxValue_347()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82563,7 +78663,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumInvalidValue_346()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumInvalidValue_348()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82584,7 +78684,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSNumber * _Nullable nullableEnumAttr254;
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumUnchangedValue_347()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumUnchangedValue_349()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82610,7 +78710,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumNullValue_348()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumNullValue_350()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82630,7 +78730,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumNullValue_349()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumNullValue_351()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82652,7 +78752,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumNot254Value_350()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumNot254Value_352()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82664,8 +78764,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableEnumAttr", value, nullableEnumAttr254));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableEnumAttr", value, nullableEnumAttr254));
 
             NextTest();
         }];
@@ -82673,7 +78773,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetStringDefaultValue_351()
+    CHIP_ERROR TestReadAttributeNullableOctetStringDefaultValue_353()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82697,7 +78797,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableOctetString_352()
+    CHIP_ERROR TestWriteAttributeNullableOctetString_354()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82718,7 +78818,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSData * _Nullable nullableOctetStrTestValue;
 
-    CHIP_ERROR TestReadAttributeNullableOctetString_353()
+    CHIP_ERROR TestReadAttributeNullableOctetString_355()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82745,7 +78845,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableOctetString_354()
+    CHIP_ERROR TestWriteAttributeNullableOctetString_356()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82765,7 +78865,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetString_355()
+    CHIP_ERROR TestReadAttributeNullableOctetString_357()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82787,7 +78887,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableOctetString_356()
+    CHIP_ERROR TestWriteAttributeNullableOctetString_358()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82807,7 +78907,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetString_357()
+    CHIP_ERROR TestReadAttributeNullableOctetString_359()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82831,7 +78931,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetStringNotTestValue_358()
+    CHIP_ERROR TestReadAttributeNullableOctetStringNotTestValue_360()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82843,8 +78943,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableOctetString", value, nullableOctetStrTestValue));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableOctetString", value, nullableOctetStrTestValue));
 
             NextTest();
         }];
@@ -82852,7 +78952,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharStringDefaultValue_359()
+    CHIP_ERROR TestReadAttributeNullableCharStringDefaultValue_361()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82875,7 +78975,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableCharString_360()
+    CHIP_ERROR TestWriteAttributeNullableCharString_362()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82896,7 +78996,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSString * _Nullable nullableCharStringSave;
 
-    CHIP_ERROR TestReadAttributeNullableCharString_361()
+    CHIP_ERROR TestReadAttributeNullableCharString_363()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82922,7 +79022,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharString_362()
+    CHIP_ERROR TestReadAttributeNullableCharString_364()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82949,7 +79049,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableCharStringValueTooLong_363()
+    CHIP_ERROR TestWriteAttributeNullableCharStringValueTooLong_365()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82969,7 +79069,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharString_364()
+    CHIP_ERROR TestReadAttributeNullableCharString_366()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -82991,7 +79091,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableCharStringEmpty_365()
+    CHIP_ERROR TestWriteAttributeNullableCharStringEmpty_367()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83011,7 +79111,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharString_366()
+    CHIP_ERROR TestReadAttributeNullableCharString_368()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83034,7 +79134,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharStringNott_367()
+    CHIP_ERROR TestReadAttributeNullableCharStringNott_369()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83046,8 +79146,8 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nullableCharString", value, nullableCharStringSave));
             }
+            VerifyOrReturn(CheckConstraintNotValue("nullableCharString", value, nullableCharStringSave));
 
             NextTest();
         }];
@@ -83055,7 +79155,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeFromNonexistentEndpoint_368()
+    CHIP_ERROR TestReadAttributeFromNonexistentEndpoint_370()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:200 queue:mCallbackQueue];
@@ -83071,7 +79171,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeFromNonexistentCluster_369()
+    CHIP_ERROR TestReadAttributeFromNonexistentCluster_371()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue];
@@ -83087,7 +79187,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_370()
+    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_372()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83107,7 +79207,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_371()
+    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_373()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83128,10 +79228,10 @@ class TestCluster : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    bool testSendClusterTestCluster_372_WaitForReport_Fulfilled = false;
+    bool testSendClusterTestCluster_374_WaitForReport_Fulfilled = false;
     ResponseHandler _Nullable test_TestCluster_list_int8u_Reported = nil;
 
-    CHIP_ERROR TestReportSubscribeToListAttribute_372()
+    CHIP_ERROR TestReportSubscribeToListAttribute_374()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83151,14 +79251,14 @@ class TestCluster : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("", actualValue[3], 4));
             }
 
-            testSendClusterTestCluster_372_WaitForReport_Fulfilled = true;
+            testSendClusterTestCluster_374_WaitForReport_Fulfilled = true;
         };
 
         NextTest();
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSubscribeToListAttribute_373()
+    CHIP_ERROR TestSubscribeToListAttribute_375()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83172,7 +79272,7 @@ class TestCluster : public TestCommandBridge {
             params:params
             subscriptionEstablished:^{
                 VerifyOrReturn(
-                    testSendClusterTestCluster_372_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
+                    testSendClusterTestCluster_374_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
                 NextTest();
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -83189,7 +79289,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteSubscribedToListAttribute_374()
+    CHIP_ERROR TestWriteSubscribedToListAttribute_376()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83216,7 +79316,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckForListAttributeReport_375()
+    CHIP_ERROR TestCheckForListAttributeReport_377()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83242,7 +79342,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedUnsigned8BitInteger_376()
+    CHIP_ERROR TestReadRangeRestrictedUnsigned8BitInteger_378()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83264,7 +79364,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_377()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_379()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83285,7 +79385,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_378()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_380()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83307,7 +79407,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_379()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_381()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83329,7 +79429,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_380()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_382()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83350,7 +79450,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_381()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_383()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83372,7 +79472,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_382()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_384()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83394,7 +79494,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_383()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_385()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83416,7 +79516,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_384()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_386()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83438,7 +79538,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_385()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_387()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83460,7 +79560,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_386()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_388()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83482,7 +79582,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_387()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_389()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83504,7 +79604,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedUnsigned16BitInteger_388()
+    CHIP_ERROR TestReadRangeRestrictedUnsigned16BitInteger_390()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83526,7 +79626,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_389()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_391()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83547,7 +79647,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_390()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_392()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83569,7 +79669,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_391()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_393()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83591,7 +79691,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_392()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_394()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83612,7 +79712,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_393()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_395()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83634,7 +79734,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_394()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_396()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83656,7 +79756,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_395()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_397()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83678,7 +79778,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_396()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_398()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83700,7 +79800,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_397()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_399()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83722,7 +79822,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_398()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_400()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83745,7 +79845,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_399()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_401()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83767,7 +79867,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedSigned8BitInteger_400()
+    CHIP_ERROR TestReadRangeRestrictedSigned8BitInteger_402()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83789,7 +79889,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned8BitInteger_401()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned8BitInteger_403()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83809,7 +79909,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_402()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_404()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83832,7 +79932,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_403()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_405()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83855,7 +79955,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned8BitInteger_404()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned8BitInteger_406()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83875,7 +79975,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_405()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_407()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83897,7 +79997,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_406()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_408()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83918,7 +80018,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_407()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_409()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83940,7 +80040,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_408()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_410()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83961,7 +80061,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_409()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_411()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -83983,7 +80083,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_410()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_412()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84005,7 +80105,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_411()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_413()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84027,7 +80127,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedSigned16BitInteger_412()
+    CHIP_ERROR TestReadRangeRestrictedSigned16BitInteger_414()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84049,7 +80149,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned16BitInteger_413()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned16BitInteger_415()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84070,7 +80170,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_414()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_416()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84092,7 +80192,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_415()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_417()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84114,7 +80214,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned16BitInteger_416()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned16BitInteger_418()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84135,7 +80235,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_417()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_419()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84157,7 +80257,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_418()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_420()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84179,7 +80279,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_419()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_421()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84201,7 +80301,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_420()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_422()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84223,7 +80323,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_421()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_423()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84245,7 +80345,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_422()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_424()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84267,7 +80367,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_423()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_425()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84289,7 +80389,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned8BitInteger_424()
+    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned8BitInteger_426()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84313,7 +80413,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_425()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_427()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84335,7 +80435,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_426()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_428()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84357,7 +80457,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_427()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_429()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84379,7 +80479,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_428()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_430()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84401,7 +80501,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_429()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_431()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84425,7 +80525,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_430()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_432()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84447,7 +80547,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_431()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_433()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84471,7 +80571,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_432()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_434()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84493,7 +80593,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_433()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_435()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84517,7 +80617,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_434()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_436()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84539,7 +80639,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_435()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_437()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84563,7 +80663,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_436()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_438()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84585,7 +80685,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_437()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_439()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84608,7 +80708,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned16BitInteger_438()
+    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned16BitInteger_440()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84632,7 +80732,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_439()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_441()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84654,7 +80754,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_440()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_442()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84676,7 +80776,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_441()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_443()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84698,7 +80798,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_442()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_444()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84720,7 +80820,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_443()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_445()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84744,7 +80844,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_444()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_446()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84766,7 +80866,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_445()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_447()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84790,7 +80890,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_446()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_448()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84812,7 +80912,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_447()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_449()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84836,7 +80936,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_448()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_450()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84858,7 +80958,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_449()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_451()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84882,7 +80982,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_450()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_452()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84904,7 +81004,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_451()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_453()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84927,7 +81027,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedSigned8BitInteger_452()
+    CHIP_ERROR TestReadNullableRangeRestrictedSigned8BitInteger_454()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84951,7 +81051,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_453()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_455()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84973,7 +81073,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_454()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_456()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -84995,7 +81095,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_455()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_457()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85017,7 +81117,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_456()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_458()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85039,7 +81139,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_457()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_459()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85063,7 +81163,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_458()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_460()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85085,7 +81185,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_459()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_461()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85109,7 +81209,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_460()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_462()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85131,7 +81231,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_461()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_463()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85155,7 +81255,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_462()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_464()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85177,7 +81277,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_463()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_465()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85201,7 +81301,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_464()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_466()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85223,7 +81323,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_465()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_467()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85246,7 +81346,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedSigned16BitInteger_466()
+    CHIP_ERROR TestReadNullableRangeRestrictedSigned16BitInteger_468()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85270,7 +81370,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_467()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_469()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85292,7 +81392,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_468()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_470()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85314,7 +81414,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_469()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_471()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85336,7 +81436,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_470()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_472()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85358,7 +81458,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_471()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_473()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85382,7 +81482,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_472()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_474()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85404,7 +81504,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_473()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_475()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85428,7 +81528,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_474()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_476()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85450,7 +81550,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_475()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_477()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85474,7 +81574,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_476()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_478()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85496,7 +81596,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_477()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_479()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85520,7 +81620,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_478()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_480()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85542,7 +81642,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_479()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_481()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85565,7 +81665,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeThatReturnsGeneralStatusOnWrite_480()
+    CHIP_ERROR TestWriteAttributeThatReturnsGeneralStatusOnWrite_482()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85585,7 +81685,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_481()
+    CHIP_ERROR TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_483()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85605,7 +81705,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeThatReturnsGeneralStatusOnRead_482()
+    CHIP_ERROR TestReadAttributeThatReturnsGeneralStatusOnRead_484()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85621,7 +81721,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeThatReturnsClusterSpecificStatusOnRead_483()
+    CHIP_ERROR TestReadAttributeThatReturnsClusterSpecificStatusOnRead_485()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85637,7 +81737,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAcceptedCommandListAttribute_484()
+    CHIP_ERROR TestReadAcceptedCommandListAttribute_486()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85677,7 +81777,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadGeneratedCommandListAttribute_485()
+    CHIP_ERROR TestReadGeneratedCommandListAttribute_487()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85708,7 +81808,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteStructTypedAttribute_486()
+    CHIP_ERROR TestWriteStructTypedAttribute_488()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85737,7 +81837,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadStructTypedAttribute_487()
+    CHIP_ERROR TestReadStructTypedAttribute_489()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -85812,62 +81912,61 @@ class TestConstraints : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Write attribute INT32U Value\n");
-            err = TestWriteAttributeInt32uValue_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Write attribute LIST With List of INT8U\n");
+            err = TestWriteAttributeListWithListOfInt8u_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute INT32U Value MinValue Constraints\n");
-            err = TestReadAttributeInt32uValueMinValueConstraints_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute LIST With Partial List of INT8U that should be in it\n");
+            err = TestReadAttributeListWithPartialListOfInt8uThatShouldBeInIt_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute INT32U Value MaxValue Constraints\n");
-            err = TestReadAttributeInt32uValueMaxValueConstraints_3();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : Read attribute LIST With Partial List of INT8U that should not be included\n");
+            err = TestReadAttributeListWithPartialListOfInt8uThatShouldNotBeIncluded_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute INT32U Value NotValue Constraints\n");
-            err = TestReadAttributeInt32uValueNotValueConstraints_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Write attribute LIST Back to Default Value\n");
+            err = TestWriteAttributeListBackToDefaultValue_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Write attribute INT32U Value Back to Default Value\n");
-            err = TestWriteAttributeInt32uValueBackToDefaultValue_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Write attribute INT32U Value\n");
+            err = TestWriteAttributeInt32uValue_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute INT32U Value MinValue Constraints\n");
+            err = TestReadAttributeInt32uValueMinValueConstraints_6();
             break;
         case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute CHAR_STRING Value MinLength Constraints\n");
-            err = TestReadAttributeCharStringValueMinLengthConstraints_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute INT32U Value MaxValue Constraints\n");
+            err = TestReadAttributeInt32uValueMaxValueConstraints_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute CHAR_STRING Value MaxLength Constraints\n");
-            err = TestReadAttributeCharStringValueMaxLengthConstraints_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute INT32U Value NotValue Constraints\n");
+            err = TestReadAttributeInt32uValueNotValueConstraints_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Read attribute CHAR_STRING Value StartsWith Constraints\n");
-            err = TestReadAttributeCharStringValueStartsWithConstraints_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Write attribute INT32U Value Back to Default Value\n");
+            err = TestWriteAttributeInt32uValueBackToDefaultValue_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Read attribute CHAR_STRING Value EndsWith Constraints\n");
-            err = TestReadAttributeCharStringValueEndsWithConstraints_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Read attribute CHAR_STRING Value MinLength Constraints\n");
+            err = TestReadAttributeCharStringValueMinLengthConstraints_11();
             break;
         case 12:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 12 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
-            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Read attribute CHAR_STRING Value MaxLength Constraints\n");
+            err = TestReadAttributeCharStringValueMaxLengthConstraints_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute CHAR_STRING Value StartsWith Constraints\n");
+            err = TestReadAttributeCharStringValueStartsWithConstraints_13();
             break;
         case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
-            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Read attribute CHAR_STRING Value EndsWith Constraints\n");
+            err = TestReadAttributeCharStringValueEndsWithConstraints_14();
             break;
         case 15:
             ChipLogProgress(chipTool, " ***** Test Step 15 : Write attribute CHAR_STRING Value\n");
@@ -85883,20 +81982,38 @@ class TestConstraints : public TestCommandBridge {
             err = TestWriteAttributeCharStringValue_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Read attribute CHAR_STRING Value isHexString Constraints\n");
-            err = TestReadAttributeCharStringValueIsHexStringConstraints_18();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 18 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
+            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_18();
             break;
         case 19:
             ChipLogProgress(chipTool, " ***** Test Step 19 : Write attribute CHAR_STRING Value\n");
             err = TestWriteAttributeCharStringValue_19();
             break;
         case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Read attribute CHAR_STRING Value isHexString Constraints\n");
-            err = TestReadAttributeCharStringValueIsHexStringConstraints_20();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 20 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
+            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_20();
             break;
         case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Write attribute CHAR_STRING Value Back to Default Value\n");
-            err = TestWriteAttributeCharStringValueBackToDefaultValue_21();
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Read attribute CHAR_STRING Value isHexString Constraints\n");
+            err = TestReadAttributeCharStringValueIsHexStringConstraints_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Read attribute CHAR_STRING Value isHexString Constraints\n");
+            err = TestReadAttributeCharStringValueIsHexStringConstraints_24();
+            break;
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Write attribute CHAR_STRING Value Back to Default Value\n");
+            err = TestWriteAttributeCharStringValueBackToDefaultValue_25();
             break;
         }
 
@@ -85975,6 +82092,18 @@ class TestConstraints : public TestCommandBridge {
         case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -85988,7 +82117,7 @@ class TestConstraints : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 22;
+    const uint16_t mTestCount = 26;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -86002,7 +82131,98 @@ class TestConstraints : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestWriteAttributeInt32uValue_1()
+    CHIP_ERROR TestWriteAttributeListWithListOfInt8u_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id listInt8uArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [NSNumber numberWithUnsignedChar:1];
+            temp_0[1] = [NSNumber numberWithUnsignedChar:2];
+            temp_0[2] = [NSNumber numberWithUnsignedChar:3];
+            temp_0[3] = [NSNumber numberWithUnsignedChar:4];
+            listInt8uArgument = temp_0;
+        }
+        [cluster writeAttributeListInt8uWithValue:listInt8uArgument
+                                completionHandler:^(NSError * _Nullable err) {
+                                    NSLog(@"Write attribute LIST With List of INT8U Error: %@", err);
+
+                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                    NextTest();
+                                }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadAttributeListWithPartialListOfInt8uThatShouldBeInIt_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeListInt8uWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute LIST With Partial List of INT8U that should be in it Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintContains("listInt8u", value, 2));
+            VerifyOrReturn(CheckConstraintContains("listInt8u", value, 3));
+            VerifyOrReturn(CheckConstraintContains("listInt8u", value, 4));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadAttributeListWithPartialListOfInt8uThatShouldNotBeIncluded_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeListInt8uWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read attribute LIST With Partial List of INT8U that should not be included Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintExcludes("listInt8u", value, 0));
+            VerifyOrReturn(CheckConstraintExcludes("listInt8u", value, 5));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWriteAttributeListBackToDefaultValue_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id listInt8uArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            listInt8uArgument = temp_0;
+        }
+        [cluster writeAttributeListInt8uWithValue:listInt8uArgument
+                                completionHandler:^(NSError * _Nullable err) {
+                                    NSLog(@"Write attribute LIST Back to Default Value Error: %@", err);
+
+                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                    NextTest();
+                                }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWriteAttributeInt32uValue_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86022,7 +82242,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeInt32uValueMinValueConstraints_2()
+    CHIP_ERROR TestReadAttributeInt32uValueMinValueConstraints_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86033,9 +82253,7 @@ class TestConstraints : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint32_t>("int32u", [value unsignedIntValue], 5UL));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint32_t>("int32u", [value unsignedIntValue], 5UL));
 
             NextTest();
         }];
@@ -86043,7 +82261,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeInt32uValueMaxValueConstraints_3()
+    CHIP_ERROR TestReadAttributeInt32uValueMaxValueConstraints_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86054,9 +82272,7 @@ class TestConstraints : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("int32u", [value unsignedIntValue], 5UL));
-            }
+            VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("int32u", [value unsignedIntValue], 5UL));
 
             NextTest();
         }];
@@ -86064,7 +82280,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeInt32uValueNotValueConstraints_4()
+    CHIP_ERROR TestReadAttributeInt32uValueNotValueConstraints_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86075,9 +82291,7 @@ class TestConstraints : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int32u", value, 6UL));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int32u", value, 6UL));
 
             NextTest();
         }];
@@ -86085,7 +82299,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeInt32uValueBackToDefaultValue_5()
+    CHIP_ERROR TestWriteAttributeInt32uValueBackToDefaultValue_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86105,7 +82319,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_6()
+    CHIP_ERROR TestWriteAttributeCharStringValue_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86125,7 +82339,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueMinLengthConstraints_7()
+    CHIP_ERROR TestReadAttributeCharStringValueMinLengthConstraints_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86143,7 +82357,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueMaxLengthConstraints_8()
+    CHIP_ERROR TestReadAttributeCharStringValueMaxLengthConstraints_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86161,7 +82375,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueStartsWithConstraints_9()
+    CHIP_ERROR TestReadAttributeCharStringValueStartsWithConstraints_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86179,7 +82393,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueEndsWithConstraints_10()
+    CHIP_ERROR TestReadAttributeCharStringValueEndsWithConstraints_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86197,7 +82411,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_11()
+    CHIP_ERROR TestWriteAttributeCharStringValue_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86217,7 +82431,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_12()
+    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86236,7 +82450,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_13()
+    CHIP_ERROR TestWriteAttributeCharStringValue_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86256,7 +82470,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_14()
+    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86275,7 +82489,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_15()
+    CHIP_ERROR TestWriteAttributeCharStringValue_19()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86295,7 +82509,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_16()
+    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86314,7 +82528,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_17()
+    CHIP_ERROR TestWriteAttributeCharStringValue_21()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86334,7 +82548,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_18()
+    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86352,7 +82566,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_19()
+    CHIP_ERROR TestWriteAttributeCharStringValue_23()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86372,7 +82586,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_20()
+    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_24()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -86390,7 +82604,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValueBackToDefaultValue_21()
+    CHIP_ERROR TestWriteAttributeCharStringValueBackToDefaultValue_25()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -87540,20 +83754,18 @@ class TestSaveAs : public TestCommandBridge {
         __auto_type * params = [[CHIPTestClusterClusterTestAddArgumentsParams alloc] init];
         params.arg1 = [NSNumber numberWithUnsignedChar:3];
         params.arg2 = [TestAddArgumentDefaultValue copy];
-        [cluster testAddArgumentsWithParams:params
-                          completionHandler:^(
-                              CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
-                              NSLog(@"Send Test Add Arguments Command Error: %@", err);
+        [cluster
+            testAddArgumentsWithParams:params
+                     completionHandler:^(
+                         CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable err) {
+                         NSLog(@"Send Test Add Arguments Command Error: %@", err);
 
-                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                              if (values.returnValue != nil) {
-                                  VerifyOrReturn(
-                                      CheckConstraintNotValue("returnValue", values.returnValue, TestAddArgumentDefaultValue));
-                              }
+                         VerifyOrReturn(CheckConstraintNotValue("returnValue", values.returnValue, TestAddArgumentDefaultValue));
 
-                              NextTest();
-                          }];
+                         NextTest();
+                     }];
 
         return CHIP_NO_ERROR;
     }
@@ -87615,9 +83827,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("boolean", value, readAttributeBooleanDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("boolean", value, readAttributeBooleanDefaultValue));
 
             NextTest();
         }];
@@ -87724,9 +83934,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("bitmap8", value, readAttributeBitmap8DefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("bitmap8", value, readAttributeBitmap8DefaultValue));
 
             NextTest();
         }];
@@ -87833,9 +84041,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("bitmap16", value, readAttributeBitmap16DefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("bitmap16", value, readAttributeBitmap16DefaultValue));
 
             NextTest();
         }];
@@ -87942,9 +84148,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("bitmap32", value, readAttributeBitmap32DefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("bitmap32", value, readAttributeBitmap32DefaultValue));
 
             NextTest();
         }];
@@ -88051,9 +84255,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("bitmap64", value, readAttributeBitmap64DefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("bitmap64", value, readAttributeBitmap64DefaultValue));
 
             NextTest();
         }];
@@ -88160,9 +84362,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int8u", value, readAttributeInt8uDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int8u", value, readAttributeInt8uDefaultValue));
 
             NextTest();
         }];
@@ -88269,9 +84469,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int16u", value, readAttributeInt16uDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int16u", value, readAttributeInt16uDefaultValue));
 
             NextTest();
         }];
@@ -88378,9 +84576,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int32u", value, readAttributeInt32uDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int32u", value, readAttributeInt32uDefaultValue));
 
             NextTest();
         }];
@@ -88487,9 +84683,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int64u", value, readAttributeInt64uDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int64u", value, readAttributeInt64uDefaultValue));
 
             NextTest();
         }];
@@ -88596,9 +84790,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int8s", value, readAttributeInt8sDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int8s", value, readAttributeInt8sDefaultValue));
 
             NextTest();
         }];
@@ -88705,9 +84897,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int16s", value, readAttributeInt16sDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int16s", value, readAttributeInt16sDefaultValue));
 
             NextTest();
         }];
@@ -88814,9 +85004,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int32s", value, readAttributeInt32sDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int32s", value, readAttributeInt32sDefaultValue));
 
             NextTest();
         }];
@@ -88923,9 +85111,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("int64s", value, readAttributeInt64sDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("int64s", value, readAttributeInt64sDefaultValue));
 
             NextTest();
         }];
@@ -89032,9 +85218,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("enum8", value, readAttributeEnum8DefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("enum8", value, readAttributeEnum8DefaultValue));
 
             NextTest();
         }];
@@ -89141,9 +85325,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("enum16", value, readAttributeEnum16DefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("enum16", value, readAttributeEnum16DefaultValue));
 
             NextTest();
         }];
@@ -89250,9 +85432,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("epochUs", value, readAttributeEpochUSDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("epochUs", value, readAttributeEpochUSDefaultValue));
 
             NextTest();
         }];
@@ -89359,9 +85539,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("epochS", value, readAttributeEpochSDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("epochS", value, readAttributeEpochSDefaultValue));
 
             NextTest();
         }];
@@ -89468,9 +85646,7 @@ class TestSaveAs : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("vendorId", value, readAttributeVendorIdDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("vendorId", value, readAttributeVendorIdDefaultValue));
 
             NextTest();
         }];
@@ -89605,9 +85781,7 @@ class TestSaveAs : public TestCommandBridge {
                 VerifyOrReturn(CheckValueAsString("char_string", actualValue, @"NotDefault"));
             }
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("charString", value, readAttributeCharStringDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("charString", value, readAttributeCharStringDefaultValue));
             {
                 readAttributeCharStringNotDefaultValue = value;
             }
@@ -89634,9 +85808,7 @@ class TestSaveAs : public TestCommandBridge {
                 VerifyOrReturn(CheckValueAsString("char_string", actualValue, readAttributeCharStringNotDefaultValue));
             }
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("charString", value, readAttributeCharStringDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("charString", value, readAttributeCharStringDefaultValue));
 
             NextTest();
         }];
@@ -89792,9 +85964,7 @@ class TestSaveAs : public TestCommandBridge {
                     CheckValueAsString("octet_string", actualValue, [[NSData alloc] initWithBytes:"NotDefault" length:10]));
             }
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("octetString", value, readAttributeOctetStringDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("octetString", value, readAttributeOctetStringDefaultValue));
             {
                 readAttributeOctetStringNotDefaultValue = value;
             }
@@ -89821,9 +85991,7 @@ class TestSaveAs : public TestCommandBridge {
                 VerifyOrReturn(CheckValueAsString("octet_string", actualValue, readAttributeOctetStringNotDefaultValue));
             }
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("octetString", value, readAttributeOctetStringDefaultValue));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("octetString", value, readAttributeOctetStringDefaultValue));
 
             NextTest();
         }];
@@ -92071,9 +88239,7 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("supportedFabrics", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("supportedFabrics", [value unsignedCharValue], 4));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("supportedFabrics", [value unsignedCharValue], 4));
 
             NextTest();
         }];
@@ -92095,9 +88261,7 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("commissionedFabrics", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint8_t>("commissionedFabrics", [value unsignedCharValue], 1));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("commissionedFabrics", [value unsignedCharValue], 1));
 
             NextTest();
         }];
@@ -92120,9 +88284,7 @@ class TestOperationalCredentialsCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentFabricIndex", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::FabricIndex>("currentFabricIndex", [value unsignedCharValue], 1));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<chip::FabricIndex>("currentFabricIndex", [value unsignedCharValue], 1));
             {
                 ourFabricIndex = value;
             }
@@ -93310,9 +89472,7 @@ class TestSelfFabricRemoval : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("currentFabricIndex", "", "uint8"));
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<chip::FabricIndex>("currentFabricIndex", [value unsignedCharValue], 1));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<chip::FabricIndex>("currentFabricIndex", [value unsignedCharValue], 1));
             {
                 ourFabricIndex = value;
             }
@@ -94468,6 +90628,22 @@ class TestArmFailSafe : public TestCommandBridge {
             ChipLogProgress(chipTool, " ***** Test Step 4 : Reads NodeLabel mandatory attribute of target device\n");
             err = TestReadsNodeLabelMandatoryAttributeOfTargetDevice_4();
             break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Invoke AddTrustedRootCertificate without fail-safe\n");
+            err = TestInvokeAddTrustedRootCertificateWithoutFailSafe_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Invoke AddNOC without fail-safe\n");
+            err = TestInvokeAddNOCWithoutFailSafe_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Invoke UpdateNOC without fail-safe\n");
+            err = TestInvokeUpdateNOCWithoutFailSafe_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Invoke CSRRequest without fail-safe\n");
+            err = TestInvokeCSRRequestWithoutFailSafe_8();
+            break;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -94494,6 +90670,18 @@ class TestArmFailSafe : public TestCommandBridge {
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+            break;
         }
 
         // Go on to the next test.
@@ -94507,7 +90695,7 @@ class TestArmFailSafe : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 5;
+    const uint16_t mTestCount = 9;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::EndpointId> mEndpoint;
@@ -94606,6 +90794,99 @@ class TestArmFailSafe : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR TestInvokeAddTrustedRootCertificateWithoutFailSafe_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams alloc] init];
+        params.rootCertificate = [[NSData alloc] initWithBytes:"00000000" length:8];
+        [cluster addTrustedRootCertificateWithParams:params
+                                   completionHandler:^(NSError * _Nullable err) {
+                                       NSLog(@"Invoke AddTrustedRootCertificate without fail-safe Error: %@", err);
+
+                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+                                       NextTest();
+                                   }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestInvokeAddNOCWithoutFailSafe_6()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPOperationalCredentialsClusterAddNOCParams alloc] init];
+        params.nocValue = [[NSData alloc] initWithBytes:"00112233" length:8];
+        params.ipkValue = [[NSData alloc] initWithBytes:"\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007"
+                                                 length:16];
+        params.caseAdminSubject = [NSNumber numberWithUnsignedLongLong:1234ULL];
+        params.adminVendorId = [NSNumber numberWithUnsignedShort:65521U];
+        [cluster
+             addNOCWithParams:params
+            completionHandler:^(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
+                NSLog(@"Invoke AddNOC without fail-safe Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestInvokeUpdateNOCWithoutFailSafe_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateNOCParams alloc] init];
+        params.nocValue = [[NSData alloc] initWithBytes:"00112233" length:8];
+        [cluster
+            updateNOCWithParams:params
+              completionHandler:^(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable err) {
+                  NSLog(@"Invoke UpdateNOC without fail-safe Error: %@", err);
+
+                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+                  NextTest();
+              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestInvokeCSRRequestWithoutFailSafe_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestOperationalCredentials * cluster = [[CHIPTestOperationalCredentials alloc] initWithDevice:device
+                                                                                                 endpoint:0
+                                                                                                    queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPOperationalCredentialsClusterCSRRequestParams alloc] init];
+        params.csrNonce = [[NSData alloc] initWithBytes:"\000\001\002\003\004\005\006\007\000\001\002\003\004\005\006\007\000\001"
+                                                        "\002\003\004\005\006\007\000\001\002\003\004\005\006\007"
+                                                 length:32];
+        [cluster
+            CSRRequestWithParams:params
+               completionHandler:^(CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable values, NSError * _Nullable err) {
+                   NSLog(@"Invoke CSRRequest without fail-safe Error: %@", err);
+
+                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILSAFE_REQUIRED));
+                   NextTest();
+               }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 class TestFanControl : public TestCommandBridge {
@@ -95822,9 +92103,7 @@ class TestMultiAdmin : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintNotValue("nodeLabel", value, readFromAlpha));
-            }
+            VerifyOrReturn(CheckConstraintNotValue("nodeLabel", value, readFromAlpha));
 
             NextTest();
         }];
@@ -97164,6 +93443,10 @@ class DL_UsersAndCredentials : public TestCommandBridge {
             ChipLogProgress(chipTool, " ***** Test Step 112 : Try to create sixth PIN credential and make sure it fails\n");
             err = TestTryToCreateSixthPinCredentialAndMakeSureItFails_112();
             break;
+        case 113:
+            ChipLogProgress(chipTool, " ***** Test Step 113 : Final clean-up\n");
+            err = TestFinalCleanUp_113();
+            break;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -97514,34 +93797,198 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         case 112:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 113:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
         ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 114;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestReadAvailableUserSlotAndVerifyResponseFields_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read available user slot and verify response fields Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+    NSNumber * _Nonnull NumberOfTotalUsersSupported;
+
+    CHIP_ERROR TestGetNumberOfSupportedUsersAndVerifyDefaultValue_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Get number of supported users and verify default value Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
+                }
+                {
+                    NumberOfTotalUsersSupported = value;
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadFailsForUserWithIndex0_3()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read fails for user with index 0 Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 113;
+    CHIP_ERROR TestReadFailsForUserWithIndexGreaterThanNumberOfUsersSupported_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read fails for user with index greater than Number Of Users Supported Error: %@", err);
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewUserWithDefaultParameters_5()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userName = nil;
+        params.userUniqueId = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = nil;
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"Create new user with default parameters Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAvailableUserSlotAndVerifyResponseFields_1()
+    CHIP_ERROR TestReadTheUserBackAndVerifyItsFields_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -97551,7 +93998,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read available user slot and verify response fields Error: %@", err);
+                     NSLog(@"Read the user back and verify its fields Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97562,7 +94009,8 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
                      }
 
                      {
@@ -97572,17 +94020,20 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
                      }
 
                      {
                          id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
                      }
 
                      {
@@ -97592,18 +94043,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -97611,89 +94063,254 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfTotalUsersSupported;
 
-    CHIP_ERROR TestGetNumberOfSupportedUsersAndVerifyDefaultValue_2()
+    CHIP_ERROR TestSetUserAtTheOccupiedIndexFailsWithAppropriateResponse_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Get number of supported users and verify default value Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userName = nil;
+        params.userUniqueId = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = nil;
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"Set user at the occupied index fails with appropriate response Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 1));
+                     NextTest();
+                 }];
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
-                }
-                {
-                    NumberOfTotalUsersSupported = value;
-                }
+        return CHIP_NO_ERROR;
+    }
 
-                NextTest();
-            }];
+    CHIP_ERROR TestModifyUserNameForExistingUser_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userName = @"new_user";
+        params.userUniqueId = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = nil;
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"Modify userName for existing user Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadFailsForUserWithIndex0_3()
+    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read fails for user with index 0 Error: %@", err);
+                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                      NextTest();
                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadFailsForUserWithIndexGreaterThanNumberOfUsersSupported_4()
+    CHIP_ERROR TestModifyUserUniqueIdForExistingUser_10()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userName = nil;
+        params.userUniqueId = [NSNumber numberWithUnsignedInt:305441741UL];
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = nil;
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"Modify userUniqueId for existing user Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read fails for user with index greater than Number Of Users Supported Error: %@", err);
+                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                      NextTest();
                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewUserWithDefaultParameters_5()
+    CHIP_ERROR TestModifyUserStatusForExistingUser_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
         params.userUniqueId = nil;
-        params.userStatus = nil;
+        params.userStatus = [NSNumber numberWithUnsignedChar:3];
         params.userType = nil;
         params.credentialRule = nil;
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Create new user with default parameters Error: %@", err);
+                     NSLog(@"Modify userStatus for existing user Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97703,7 +94320,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserBackAndVerifyItsFields_6()
+    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -97713,7 +94330,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user back and verify its fields Error: %@", err);
+                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97725,18 +94342,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                      {
                          id actualValue = values.userName;
                          VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
                      }
 
                      {
                          id actualValue = values.userStatus;
                          VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 3));
                      }
 
                      {
@@ -97770,8 +94388,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -97780,32 +94397,213 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetUserAtTheOccupiedIndexFailsWithAppropriateResponse_7()
+    CHIP_ERROR TestModifyUserTypeForExistingUser_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
         params.userUniqueId = nil;
         params.userStatus = nil;
-        params.userType = nil;
+        params.userType = [NSNumber numberWithUnsignedChar:6];
         params.credentialRule = nil;
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Set user at the occupied index fails with appropriate response Error: %@", err);
+                     NSLog(@"Modify userType for existing user Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 3));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 6));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestModifyCredentialRuleForExistingUser_16()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userName = nil;
+        params.userUniqueId = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = [NSNumber numberWithUnsignedChar:2];
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"Modify credentialRule for existing user Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_17()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 3));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 6));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 2));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 1));
                      NextTest();
                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyUserNameForExistingUser_8()
+    CHIP_ERROR TestModifyAllFieldsForExistingUser_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -97814,14 +94612,14 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userName = @"new_user";
-        params.userUniqueId = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        params.credentialRule = nil;
+        params.userName = @"test_user";
+        params.userUniqueId = [NSNumber numberWithUnsignedInt:466460832UL];
+        params.userStatus = [NSNumber numberWithUnsignedChar:1];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        params.credentialRule = [NSNumber numberWithUnsignedChar:1];
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Modify userName for existing user Error: %@", err);
+                     NSLog(@"Modify all fields for existing user Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97831,7 +94629,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_9()
+    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_19()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -97853,12 +94651,13 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                      {
                          id actualValue = values.userName;
                          VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user"));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
+                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 466460832UL));
                      }
 
                      {
@@ -97876,7 +94675,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                      {
                          id actualValue = values.credentialRule;
                          VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 1));
                      }
 
                      {
@@ -97898,8 +94697,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -97908,23 +94706,23 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyUserUniqueIdForExistingUser_10()
+    CHIP_ERROR TestAddAnotherUserWithNonDefaultFields_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userName = nil;
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:305441741UL];
-        params.userStatus = nil;
-        params.userType = nil;
-        params.credentialRule = nil;
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userName = @"test_user2";
+        params.userUniqueId = [NSNumber numberWithUnsignedInt:12648430UL];
+        params.userStatus = [NSNumber numberWithUnsignedChar:1];
+        params.userType = [NSNumber numberWithUnsignedChar:1];
+        params.credentialRule = [NSNumber numberWithUnsignedChar:2];
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Modify userUniqueId for existing user Error: %@", err);
+                     NSLog(@"Add another user with non-default fields Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -97934,35 +94732,35 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_11()
+    CHIP_ERROR TestReadTheNewUserBackAndVerifyItsFields_21()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                     NSLog(@"Read the new user back and verify its fields Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                      {
                          id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
                      }
 
                      {
                          id actualValue = values.userName;
                          VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user2"));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
                          VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 12648430UL));
                      }
 
                      {
@@ -97974,13 +94772,13 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                      {
                          id actualValue = values.userType;
                          VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.credentialRule;
                          VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 2));
                      }
 
                      {
@@ -98002,8 +94800,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -98012,23 +94809,23 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyUserStatusForExistingUser_12()
+    CHIP_ERROR TestCreateUserInTheLastSlot_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userName = nil;
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NumberOfTotalUsersSupported copy];
+        params.userName = @"last_user";
         params.userUniqueId = nil;
-        params.userStatus = [NSNumber numberWithUnsignedChar:3];
+        params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Modify userStatus for existing user Error: %@", err);
+                     NSLog(@"Create user in the last slot Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98038,41 +94835,40 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_13()
+    CHIP_ERROR TestReadTheLastUserBackAndVerifyItsFields_23()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userIndex = [NumberOfTotalUsersSupported copy];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                     NSLog(@"Read the last user back and verify its fields Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                      {
                          id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported));
                      }
 
                      {
                          id actualValue = values.userName;
                          VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"last_user"));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
                      }
 
                      {
                          id actualValue = values.userStatus;
                          VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 3));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
                      }
 
                      {
@@ -98106,8 +94902,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -98116,33 +94911,77 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyUserTypeForExistingUser_14()
+    CHIP_ERROR TestUserCreationInThe0SlotFails_24()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
         params.userName = nil;
         params.userUniqueId = nil;
         params.userStatus = nil;
-        params.userType = [NSNumber numberWithUnsignedChar:6];
+        params.userType = nil;
         params.credentialRule = nil;
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Modify userType for existing user Error: %@", err);
+                     NSLog(@"User creation in the 0 slot fails Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestUserCreationInTheOutOfBoundsSlotFails_25()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        params.userName = nil;
+        params.userUniqueId = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = nil;
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"User creation in the out-of-bounds slot fails Error: %@", err);
 
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                      NextTest();
                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_15()
+    CHIP_ERROR TestClearFirstUser_26()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Clear first user Error: %@", err);
+
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                       NextTest();
+                   }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadClearedUserAndVerifyItIsAvailable_27()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -98152,7 +94991,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                     NSLog(@"Read cleared user and verify it is available Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98163,32 +95002,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
                      }
 
                      {
                          id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 3));
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
                      }
 
                      {
                          id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 6));
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
                      }
 
                      {
                          id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
                      }
 
                      {
@@ -98198,14 +95032,12 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
                      }
 
                      {
@@ -98220,23 +95052,23 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyCredentialRuleForExistingUser_16()
+    CHIP_ERROR TestCreateNewUserInTheClearedSlot_28()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
         params.userUniqueId = nil;
         params.userStatus = nil;
         params.userType = nil;
-        params.credentialRule = [NSNumber numberWithUnsignedChar:2];
+        params.credentialRule = nil;
         [cluster setUserWithParams:params
                  completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Modify credentialRule for existing user Error: %@", err);
+                     NSLog(@"Create new user in the cleared slot Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98246,7 +95078,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_17()
+    CHIP_ERROR TestReadTheUserInThePreviouslyClearedSlotAndVerifyItsFields_29()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -98256,7 +95088,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                     NSLog(@"Read the user in the previously cleared slot and verify its fields Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98268,31 +95100,30 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                      {
                          id actualValue = values.userName;
                          VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
                      }
 
                      {
                          id actualValue = values.userStatus;
                          VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 3));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.userType;
                          VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 6));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
                      }
 
                      {
                          id actualValue = values.credentialRule;
                          VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 2));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
                      }
 
                      {
@@ -98324,79 +95155,106 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyAllFieldsForExistingUser_18()
+    CHIP_ERROR TestClearUserWithIndex0Fails_30()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userName = @"test_user";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:466460832UL];
-        params.userStatus = [NSNumber numberWithUnsignedChar:1];
-        params.userType = [NSNumber numberWithUnsignedChar:0];
-        params.credentialRule = [NSNumber numberWithUnsignedChar:1];
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Modify all fields for existing user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Clear user with index 0 fails Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                       NextTest();
+                   }];
 
-                     NextTest();
-                 }];
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestClearUserWithOutOfBoundsIndexFails_31()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Clear user with out-of-bounds index fails Error: %@", err);
+
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                       NextTest();
+                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheModifiedUserBackAndVerifyItsFields_19()
+    CHIP_ERROR TestClearAllUsers_32()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:65534U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Clear all users Error: %@", err);
+
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                       NextTest();
+                   }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadFirstClearedUserAndVerifyItIsAvailable_33()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the modified user back and verify its fields Error: %@", err);
+                     NSLog(@"Read first cleared user and verify it is available Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                      {
                          id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
                      }
 
                      {
                          id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user"));
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 466460832UL));
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
                      }
 
                      {
                          id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
                      }
 
                      {
                          id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
                      }
 
                      {
                          id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
                      }
 
                      {
@@ -98406,20 +95264,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -98428,79 +95283,48 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestAddAnotherUserWithNonDefaultFields_20()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        params.userName = @"test_user2";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:12648430UL];
-        params.userStatus = [NSNumber numberWithUnsignedChar:1];
-        params.userType = [NSNumber numberWithUnsignedChar:1];
-        params.credentialRule = [NSNumber numberWithUnsignedChar:2];
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Add another user with non-default fields Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadTheNewUserBackAndVerifyItsFields_21()
+    CHIP_ERROR TestReadLastClearedUserAndVerifyItIsAvailable_34()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userIndex = [NumberOfTotalUsersSupported copy];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the new user back and verify its fields Error: %@", err);
+                     NSLog(@"Read last cleared user and verify it is available Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                      {
                          id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported));
                      }
 
                      {
                          id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user2"));
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
                      }
 
                      {
                          id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                         VerifyOrReturn(CheckValue("userUniqueId", actualValue, 12648430UL));
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
                      }
 
                      {
                          id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
                      }
 
                      {
                          id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
                      }
 
                      {
                          id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 2));
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
                      }
 
                      {
@@ -98510,20 +95334,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -98531,56 +95352,199 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull NumberOfPINUsersSupported;
 
-    CHIP_ERROR TestCreateUserInTheLastSlot_22()
+    CHIP_ERROR TestGetNumberOfSupportedPinCredentialsAndVerifyDefaultValue_35()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        [cluster
+            readAttributeNumberOfPINUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Get number of supported PIN credentials and verify default value Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("NumberOfPINUsersSupported", actualValue, 10U));
+                }
+                {
+                    NumberOfPINUsersSupported = value;
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCheckThatPinCredentialDoesNotExist_36()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Check that PIN credential does not exist Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadingPinCredentialWithIndex0Fails_37()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Reading PIN credential with index 0 fails Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                                 NextTest();
+                             }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadingPinCredentialWithOutOfBoundsIndexFails_38()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Reading PIN credential with out-of-bounds index fails Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                                 NextTest();
+                             }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewPinCredentialAndUser_39()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NumberOfTotalUsersSupported copy];
-        params.userName = @"last_user";
-        params.userUniqueId = nil;
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
+        params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
-        params.credentialRule = nil;
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Create user in the last slot Error: %@", err);
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential and user Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                      }
 
-                     NextTest();
-                 }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheLastUserBackAndVerifyItsFields_23()
+    CHIP_ERROR TestVerifyCreatedUser_40()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NumberOfTotalUsersSupported copy];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the last user back and verify its fields Error: %@", err);
+                     NSLog(@"Verify created user Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                      {
                          id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported));
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                      }
 
                      {
                          id actualValue = values.userName;
                          VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @"last_user"));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
                      }
 
                      {
@@ -98608,7 +95572,12 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
+                         VerifyOrReturn(
+                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
+                         VerifyOrReturn(CheckValue(
+                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
                      }
 
                      {
@@ -98634,174 +95603,317 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserCreationInThe0SlotFails_24()
+    CHIP_ERROR TestVerifyCreatedPinCredential_41()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Verify created PIN credential Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                 }
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewPinCredentialAndUserWithIndex0Fails_42()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.userName = nil;
-        params.userUniqueId = nil;
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
-        params.credentialRule = nil;
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"User creation in the 0 slot fails Error: %@", err);
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential and user with index 0 fails Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                     NextTest();
-                 }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestUserCreationInTheOutOfBoundsSlotFails_25()
+    CHIP_ERROR TestCreateNewPinCredentialAndUserWithOutOfBoundsIndexFails_43()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        params.userName = nil;
-        params.userUniqueId = nil;
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
-        params.credentialRule = nil;
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"User creation in the out-of-bounds slot fails Error: %@", err);
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential and user with out-of-bounds index fails Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                     NextTest();
-                 }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull NumberOfRFIDUsersSupported;
 
-    CHIP_ERROR TestClearFirstUser_26()
+    CHIP_ERROR TestGetNumberOfSupportedRfidCredentialsAndVerifyDefaultValue_44()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearUserWithParams:params
-                   completionHandler:^(NSError * _Nullable err) {
-                       NSLog(@"Clear first user Error: %@", err);
+        [cluster
+            readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Get number of supported RFID credentials and verify default value Error: %@", err);
 
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                       NextTest();
-                   }];
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("NumberOfRFIDUsersSupported", actualValue, 10U));
+                }
+                {
+                    NumberOfRFIDUsersSupported = value;
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadClearedUserAndVerifyItIsAvailable_27()
+    CHIP_ERROR TestReadingRfidCredentialWithIndex0Fails_45()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read cleared user and verify it is available Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Reading RFID credential with index 0 fails Error: %@", err);
 
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                     }
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                                 NextTest();
+                             }];
 
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+    CHIP_ERROR TestReadingRfidCredentialWithOutOfBoundsIndexFails_46()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Reading RFID credential with out-of-bounds index fails Error: %@", err);
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                                 NextTest();
+                             }];
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+    CHIP_ERROR TestCheckThatRfidCredentialDoesNotExist_47()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                     }
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Check that RFID credential does not exist Error: %@", err);
 
-                     NextTest();
-                 }];
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewUserInTheClearedSlot_28()
+    CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_48()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userName = nil;
-        params.userUniqueId = nil;
         params.userStatus = nil;
         params.userType = nil;
-        params.credentialRule = nil;
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Create new user in the cleared slot Error: %@", err);
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     NextTest();
-                 }];
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserInThePreviouslyClearedSlotAndVerifyItsFields_29()
+    CHIP_ERROR TestVerifyModifiedUser_49()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -98811,7 +95923,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user in the previously cleared slot and verify its fields Error: %@", err);
+                     NSLog(@"Verify modified user Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -98851,7 +95963,16 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(2)));
+                         VerifyOrReturn(
+                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
+                         VerifyOrReturn(CheckValue(
+                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                         VerifyOrReturn(
+                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
+                         VerifyOrReturn(CheckValue(
+                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
                      }
 
                      {
@@ -98860,367 +95981,590 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                          VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
                      }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                     }
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestVerifyCreatedCredential_50()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Verify created credential Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                 }
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewRfidCredentialAndUserWithIndex0Fails_51()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new RFID credential and user with index 0 fails Error: %@", err);
+
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                      }
+
+                      NextTest();
+                  }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewRfidCredentialAndUserWithOutOfBoundsIndexFails_52()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new RFID credential and user with out-of-bounds index fails Error: %@", err);
+
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                     }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                      }
 
-                     NextTest();
-                 }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearUserWithIndex0Fails_30()
+    CHIP_ERROR TestCreateNewCredentialAndTryToAddItTo0User_53()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        [cluster clearUserWithParams:params
-                   completionHandler:^(NSError * _Nullable err) {
-                       NSLog(@"Clear user with index 0 fails Error: %@", err);
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new credential and try to add it to 0 user Error: %@", err);
 
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                       NextTest();
-                   }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearUserWithOutOfBoundsIndexFails_31()
+    CHIP_ERROR TestCreateNewCredentialAndTryToAddItToOutOfBoundsUser_54()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        [cluster clearUserWithParams:params
-                   completionHandler:^(NSError * _Nullable err) {
-                       NSLog(@"Clear user with out-of-bounds index fails Error: %@", err);
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new credential and try to add it to out-of-bounds user Error: %@", err);
 
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                       NextTest();
-                   }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearAllUsers_32()
+    CHIP_ERROR TestCreateNewPinWithTooShortData_55()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:65534U];
-        [cluster clearUserWithParams:params
-                   completionHandler:^(NSError * _Nullable err) {
-                       NSLog(@"Clear all users Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        params.credentialData = [[NSData alloc] initWithBytes:"12345" length:5];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN with too short data Error: %@", err);
 
-                       NextTest();
-                   }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadFirstClearedUserAndVerifyItIsAvailable_33()
+    CHIP_ERROR TestCreateNewPinWithTooLongData_56()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read first cleared user and verify it is available Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
-                     }
-
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+        params.credentialData = [[NSData alloc] initWithBytes:"123456789" length:9];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN with too long data Error: %@", err);
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                     }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
 
-                     NextTest();
-                 }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadLastClearedUserAndVerifyItIsAvailable_34()
+    CHIP_ERROR TestCreateNewRfidWithTooShortData_57()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NumberOfTotalUsersSupported copy];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read last cleared user and verify it is available Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported));
-                     }
-
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data" length:9];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new RFID with too short data Error: %@", err);
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
 
-                     NextTest();
-                 }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfPINUsersSupported;
 
-    CHIP_ERROR TestGetNumberOfSupportedPinCredentialsAndVerifyDefaultValue_35()
+    CHIP_ERROR TestCreateNewPinWithProgrammingUserTypeFails_58()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.userStatus = nil;
+        params.userType = [NSNumber numberWithUnsignedChar:3];
         [cluster
-            readAttributeNumberOfPINUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Get number of supported PIN credentials and verify default value Error: %@", err);
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN with Programming user type fails Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("NumberOfPINUsersSupported", actualValue, 10U));
-                }
-                {
-                    NumberOfPINUsersSupported = value;
-                }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
 
-                NextTest();
-            }];
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckThatPinCredentialDoesNotExist_36()
+    CHIP_ERROR TestCreateNewRfidWithTooShortData_59()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Check that PIN credential does not exist Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+        params.credentialData = [[NSData alloc] initWithBytes:"very_long_rfid_data_to_test_boundaries" length:38];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new RFID with too short data Error: %@", err);
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                                 }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
 
-                                 NextTest();
-                             }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadingPinCredentialWithIndex0Fails_37()
+    CHIP_ERROR TestCreateNewPinCredentialWithDataTheWouldCauseDuplicate_60()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Reading PIN credential with index 0 fails Error: %@", err);
+        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential with data the would cause duplicate Error: %@", err);
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                                 NextTest();
-                             }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 2));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadingPinCredentialWithOutOfBoundsIndexFails_38()
+    CHIP_ERROR TestCreateNewRfidCredentialWithDataTheWouldCauseDuplicate_61()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Reading PIN credential with out-of-bounds index fails Error: %@", err);
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new RFID credential with data the would cause duplicate Error: %@", err);
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                                 NextTest();
-                             }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 2));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndUser_39()
+    CHIP_ERROR TestModifyCredentialDataOfExistingPinCredential_62()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
-        params.userIndex = nil;
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and user Error: %@", err);
+                      NSLog(@"Modify credentialData of existing PIN credential Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -99231,14 +96575,13 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
                       }
 
                       NextTest();
@@ -99247,142 +96590,53 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedUser_40()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Verify created user Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                     }
-
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
-                     }
-
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
-                     }
-
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
-                     }
-
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
-                     }
-
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
-                         VerifyOrReturn(
-                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
-                         VerifyOrReturn(CheckValue(
-                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
-                     }
-
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                     }
-
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                     }
-
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
-                     }
-
-                     NextTest();
-                 }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestVerifyCreatedPinCredential_41()
+    CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithOldData_63()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Verify created PIN credential Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
-                                 }
+        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Verify that credential was changed by creating new credential with old data Error: %@", err);
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                 }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                                 }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                                 }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                      }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                                 }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                      }
 
-                                 NextTest();
-                             }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndUserWithIndex0Fails_42()
+    CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithNewData_64()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -99392,7 +96646,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -99401,13 +96655,13 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and user with index 0 fails Error: %@", err);
+                      NSLog(@"Verify that credential was changed by creating new credential with new data Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                       {
                           id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                          VerifyOrReturn(CheckValue("status", actualValue, 2));
                       }
 
                       {
@@ -99418,7 +96672,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
                       }
 
                       NextTest();
@@ -99427,7 +96681,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndUserWithOutOfBoundsIndexFails_43()
+    CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_65()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -99436,24 +96690,23 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = nil;
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_7890" length:14];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and user with out-of-bounds index fails Error: %@", err);
+                      NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                       {
                           id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
                       }
 
                       {
@@ -99463,7 +96716,8 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
                       }
 
                       NextTest();
@@ -99471,132 +96725,99 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfRFIDUsersSupported;
 
-    CHIP_ERROR TestGetNumberOfSupportedRfidCredentialsAndVerifyDefaultValue_44()
+    CHIP_ERROR TestVerifyModifiedUser_66()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster
-            readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Get number of supported RFID credentials and verify default value Error: %@", err);
+            getUserWithParams:params
+            completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                NSLog(@"Verify modified user Error: %@", err);
 
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                 {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("NumberOfRFIDUsersSupported", actualValue, 10U));
+                    id actualValue = values.userIndex;
+                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                 }
+
                 {
-                    NumberOfRFIDUsersSupported = value;
+                    id actualValue = values.userName;
+                    VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                    VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
                 }
 
-                NextTest();
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadingRfidCredentialWithIndex0Fails_45()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Reading RFID credential with index 0 fails Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                                 NextTest();
-                             }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadingRfidCredentialWithOutOfBoundsIndexFails_46()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Reading RFID credential with out-of-bounds index fails Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                                 NextTest();
-                             }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestCheckThatRfidCredentialDoesNotExist_47()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+                {
+                    id actualValue = values.userUniqueId;
+                    VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                }
 
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Check that RFID credential does not exist Error: %@", err);
+                {
+                    id actualValue = values.userStatus;
+                    VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                    VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                }
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                {
+                    id actualValue = values.userType;
+                    VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                    VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                }
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+                {
+                    id actualValue = values.credentialRule;
+                    VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                    VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                }
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+                {
+                    id actualValue = values.credentials;
+                    VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                    VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(3)));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U));
+                }
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+                {
+                    id actualValue = values.creatorFabricIndex;
+                    VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                    VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+                {
+                    id actualValue = values.lastModifiedFabricIndex;
+                    VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                    VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                                 }
+                {
+                    id actualValue = values.nextUserIndex;
+                    VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
+                    VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                }
 
-                                 NextTest();
-                             }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_48()
+    CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_67()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -99605,10 +96826,10 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16];
+        params.credentialData = [[NSData alloc] initWithBytes:"789012" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userStatus = nil;
         params.userType = nil;
@@ -99632,7 +96853,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
                       }
 
                       NextTest();
@@ -99641,7 +96862,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyModifiedUser_49()
+    CHIP_ERROR TestVerifyModifiedUser_68()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -99649,85 +96870,117 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Verify modified user Error: %@", err);
+        [cluster
+            getUserWithParams:params
+            completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                NSLog(@"Verify modified user Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                     }
+                {
+                    id actualValue = values.userIndex;
+                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                }
 
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
-                     }
+                {
+                    id actualValue = values.userName;
+                    VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                    VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                }
 
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+                {
+                    id actualValue = values.userUniqueId;
+                    VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                }
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
-                     }
+                {
+                    id actualValue = values.userStatus;
+                    VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                    VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                }
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
-                     }
+                {
+                    id actualValue = values.userType;
+                    VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                    VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                }
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
-                     }
+                {
+                    id actualValue = values.credentialRule;
+                    VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                    VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                }
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(2)));
-                         VerifyOrReturn(
-                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
-                         VerifyOrReturn(CheckValue(
-                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
-                         VerifyOrReturn(
-                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
-                         VerifyOrReturn(CheckValue(
-                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
-                     }
+                {
+                    id actualValue = values.credentials;
+                    VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                    VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(4)));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[3]).credentialType, 1));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[3]).credentialIndex, 5U));
+                }
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                     }
+                {
+                    id actualValue = values.creatorFabricIndex;
+                    VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                    VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                     }
+                {
+                    id actualValue = values.lastModifiedFabricIndex;
+                    VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                    VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                }
+
+                {
+                    id actualValue = values.nextUserIndex;
+                    VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
+                    VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestClearFirstPinCredential_69()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clear first PIN credential Error: %@", err);
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
-                     }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     NextTest();
-                 }];
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedCredential_50()
+    CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_70()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -99735,43 +96988,40 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                              completionHandler:^(
                                  CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Verify created credential Error: %@", err);
+                                 NSLog(@"Read back the credential and make sure it is deleted Error: %@", err);
 
                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                  {
                                      id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
                                  }
 
                                  {
                                      id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
                                  }
 
                                  {
                                      id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
                                  }
 
                                  {
                                      id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
                                  }
 
                                  {
                                      id actualValue = values.nextCredentialIndex;
                                      VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
                                  }
 
                                  NextTest();
@@ -99780,232 +97030,241 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialAndUserWithIndex0Fails_51()
+    CHIP_ERROR TestReadTheUserBackAndMakeSurePinCredentialIsDeleted_71()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential and user with index 0 fails Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+            getUserWithParams:params
+            completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                NSLog(@"Read the user back and make sure PIN credential is deleted Error: %@", err);
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                      }
+                {
+                    id actualValue = values.userIndex;
+                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                }
 
-                      NextTest();
-                  }];
+                {
+                    id actualValue = values.userName;
+                    VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                    VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                }
 
-        return CHIP_NO_ERROR;
-    }
+                {
+                    id actualValue = values.userUniqueId;
+                    VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                }
 
-    CHIP_ERROR TestCreateNewRfidCredentialAndUserWithOutOfBoundsIndexFails_52()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                {
+                    id actualValue = values.userStatus;
+                    VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                    VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                }
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
+                {
+                    id actualValue = values.userType;
+                    VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                    VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                }
 
-        params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential and user with out-of-bounds index fails Error: %@", err);
+                {
+                    id actualValue = values.credentialRule;
+                    VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                    VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                }
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                {
+                    id actualValue = values.credentials;
+                    VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                    VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(3)));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 2));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 2U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 4U));
+                    VerifyOrReturn(
+                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialType, 1));
+                    VerifyOrReturn(
+                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 5U));
+                }
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+                {
+                    id actualValue = values.creatorFabricIndex;
+                    VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                    VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                {
+                    id actualValue = values.lastModifiedFabricIndex;
+                    VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                    VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
-                      }
+                {
+                    id actualValue = values.nextUserIndex;
+                    VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
+                    VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                }
 
-                      NextTest();
-                  }];
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewCredentialAndTryToAddItTo0User_53()
+    CHIP_ERROR TestClearTheSecondPinCredential_72()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new credential and try to add it to 0 user Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
-
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clear the second PIN credential Error: %@", err);
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      NextTest();
-                  }];
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewCredentialAndTryToAddItToOutOfBoundsUser_54()
+    CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_73()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new credential and try to add it to out-of-bounds user Error: %@", err);
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Read back the credential and make sure it is deleted Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
 
-                      NextTest();
-                  }];
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinWithTooShortData_55()
+    CHIP_ERROR TestReadTheUserBackAndMakeSureRelatedUserIsDeleted_74()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user back and make sure related user is deleted Error: %@", err);
 
-        params.credentialData = [[NSData alloc] initWithBytes:"12345" length:5];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN with too short data Error: %@", err);
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                     }
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
 
-                      NextTest();
-                  }];
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinWithTooLongData_56()
+    CHIP_ERROR TestCreateNewRfidCredentialWithUser_75()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -100014,34 +97273,35 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456789" length:9];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_12345" length:15];
+        params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN with too long data Error: %@", err);
+                      NSLog(@"Create new RFID credential with user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                       {
                           id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
                       }
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
                       }
 
                       NextTest();
@@ -100050,277 +97310,331 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidWithTooShortData_57()
+    CHIP_ERROR TestClearAllTheRfidCredentials_76()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data" length:9];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID with too short data Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clear all the RFID credentials Error: %@", err);
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      NextTest();
-                  }];
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinWithProgrammingUserTypeFails_58()
+    CHIP_ERROR TestReadBackTheFistRfidCredentialAndMakeSureItIsDeleted_77()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.userStatus = nil;
-        params.userType = [NSNumber numberWithUnsignedChar:3];
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN with Programming user type fails Error: %@", err);
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Read back the fist RFID credential and make sure it is deleted Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
 
-                      NextTest();
-                  }];
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidWithTooShortData_59()
+    CHIP_ERROR TestReadBackTheSecondRfidCredentialAndMakeSureItIsDeleted_78()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"very_long_rfid_data_to_test_boundaries" length:38];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID with too short data Error: %@", err);
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Read back the second RFID credential and make sure it is deleted Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
-                      }
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 }
 
-                      NextTest();
-                  }];
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialWithDataTheWouldCauseDuplicate_60()
+    CHIP_ERROR TestReadBackTheThirdRfidCredentialAndMakeSureItIsDeleted_79()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential with data the would cause duplicate Error: %@", err);
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Read back the third RFID credential and make sure it is deleted Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 2));
-                      }
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
-                      }
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
 
-                      NextTest();
-                  }];
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialWithDataTheWouldCauseDuplicate_61()
+    CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItHasOnlyPinCredential_80()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user related with first RFID back and make sure it has only PIN credential Error: %@", err);
 
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential with data the would cause duplicate Error: %@", err);
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 2));
-                      }
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                     }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
-                      }
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                     }
 
-                      NextTest();
-                  }];
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
+                         VerifyOrReturn(
+                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
+                         VerifyOrReturn(CheckValue(
+                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 5U));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestModifyCredentialDataOfExistingPinCredential_62()
+    CHIP_ERROR TestReadTheUserRelatedWithSecondRfidBackAndMakeSureItIsDeleted_81()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user related with second RFID back and make sure it is deleted Error: %@", err);
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Modify credentialData of existing PIN credential Error: %@", err);
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                     }
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                      }
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
 
-                      NextTest();
-                  }];
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithOldData_63()
+    CHIP_ERROR TestCreateNewPinCredentialWithUser_82()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -100330,16 +97644,16 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Verify that credential was changed by creating new credential with old data Error: %@", err);
+                      NSLog(@"Create new PIN credential with user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100357,7 +97671,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
                       }
 
                       NextTest();
@@ -100366,7 +97680,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithNewData_64()
+    CHIP_ERROR TestCreateNewRfidCredentialWithUser_83()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -100375,34 +97689,35 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_1234" length:14];
         params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Verify that credential was changed by creating new credential with new data Error: %@", err);
+                      NSLog(@"Create new RFID credential with user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                       {
                           id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 2));
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
                       }
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
                       }
 
                       NextTest();
@@ -100411,7 +97726,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_65()
+    CHIP_ERROR TestCreateAnotherRfidCredentialWithUser_84()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -100421,16 +97736,16 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_7890" length:14];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_9876" length:14];
+        params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
+                      NSLog(@"Create another RFID credential with user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100441,13 +97756,14 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 4U));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
                       }
 
                       NextTest();
@@ -100456,261 +97772,125 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyModifiedUser_66()
+    CHIP_ERROR TestClearAllTheCredentials_85()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster
-            getUserWithParams:params
-            completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                NSLog(@"Verify modified user Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = values.userIndex;
-                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                }
-
-                {
-                    id actualValue = values.userName;
-                    VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                    VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
-                }
-
-                {
-                    id actualValue = values.userUniqueId;
-                    VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                }
-
-                {
-                    id actualValue = values.userStatus;
-                    VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                    VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
-                }
-
-                {
-                    id actualValue = values.userType;
-                    VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                    VerifyOrReturn(CheckValue("userType", actualValue, 0));
-                }
-
-                {
-                    id actualValue = values.credentialRule;
-                    VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                    VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
-                }
-
-                {
-                    id actualValue = values.credentials;
-                    VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                    VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(3)));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U));
-                }
-
-                {
-                    id actualValue = values.creatorFabricIndex;
-                    VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                    VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                }
-
-                {
-                    id actualValue = values.lastModifiedFabricIndex;
-                    VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                    VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                }
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = nil;
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clear all the credentials Error: %@", err);
 
-                {
-                    id actualValue = values.nextUserIndex;
-                    VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                    VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                NextTest();
-            }];
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_67()
+    CHIP_ERROR TestReadBackTheFirstPinCredentialAndMakeSureItIsDeleted_86()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"789012" length:6];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential and add it to existing user Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
-
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
-
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
-                      }
-
-                      NextTest();
-                  }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestVerifyModifiedUser_68()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster
-            getUserWithParams:params
-            completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                NSLog(@"Verify modified user Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                {
-                    id actualValue = values.userIndex;
-                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                }
-
-                {
-                    id actualValue = values.userName;
-                    VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                    VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
-                }
-
-                {
-                    id actualValue = values.userUniqueId;
-                    VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                }
-
-                {
-                    id actualValue = values.userStatus;
-                    VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                    VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
-                }
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-                {
-                    id actualValue = values.userType;
-                    VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                    VerifyOrReturn(CheckValue("userType", actualValue, 0));
-                }
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Read back the first PIN credential and make sure it is deleted Error: %@", err);
 
-                {
-                    id actualValue = values.credentialRule;
-                    VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                    VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
-                }
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                {
-                    id actualValue = values.credentials;
-                    VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                    VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(4)));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[3]).credentialType, 1));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[3]).credentialIndex, 5U));
-                }
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
 
-                {
-                    id actualValue = values.creatorFabricIndex;
-                    VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                    VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                }
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
 
-                {
-                    id actualValue = values.lastModifiedFabricIndex;
-                    VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                    VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                }
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
 
-                {
-                    id actualValue = values.nextUserIndex;
-                    VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                    VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                }
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
 
-                NextTest();
-            }];
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearFirstPinCredential_69()
+    CHIP_ERROR TestReadBackTheFirstRfidCredentialAndMakeSureItIsDeleted_87()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clear first PIN credential Error: %@", err);
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Read back the first RFID credential and make sure it is deleted Error: %@", err);
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             NextTest();
-                         }];
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_70()
+    CHIP_ERROR TestReadBackTheSecondPinCredentialAndMakeSureItIsDeleted_88()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -100719,12 +97899,12 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
 
         [cluster getCredentialStatusWithParams:params
                              completionHandler:^(
                                  CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the credential and make sure it is deleted Error: %@", err);
+                                 NSLog(@"Read back the second PIN credential and make sure it is deleted Error: %@", err);
 
                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100750,8 +97930,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                  {
                                      id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
                                  }
 
                                  NextTest();
@@ -100760,7 +97939,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserBackAndMakeSurePinCredentialIsDeleted_71()
+    CHIP_ERROR TestReadTheUserRelatedWithFirstPinBackAndMakeSureItIsDeleted_89()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -100768,184 +97947,390 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster
-            getUserWithParams:params
-            completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                NSLog(@"Read the user back and make sure PIN credential is deleted Error: %@", err);
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user related with first PIN back and make sure it is deleted Error: %@", err);
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                {
-                    id actualValue = values.userIndex;
-                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                }
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                     }
 
-                {
-                    id actualValue = values.userName;
-                    VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                    VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
-                }
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
 
-                {
-                    id actualValue = values.userUniqueId;
-                    VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                }
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
 
-                {
-                    id actualValue = values.userStatus;
-                    VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                    VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
-                }
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
 
-                {
-                    id actualValue = values.userType;
-                    VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                    VerifyOrReturn(CheckValue("userType", actualValue, 0));
-                }
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
 
-                {
-                    id actualValue = values.credentialRule;
-                    VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                    VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
-                }
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
 
-                {
-                    id actualValue = values.credentials;
-                    VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                    VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(3)));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 2));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 2U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 4U));
-                    VerifyOrReturn(
-                        CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialType, 1));
-                    VerifyOrReturn(
-                        CheckValue("CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 5U));
-                }
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
 
-                {
-                    id actualValue = values.creatorFabricIndex;
-                    VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                    VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                }
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
 
-                {
-                    id actualValue = values.lastModifiedFabricIndex;
-                    VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                    VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                }
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
 
-                {
-                    id actualValue = values.nextUserIndex;
-                    VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                    VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                }
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
 
-                NextTest();
-            }];
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearTheSecondPinCredential_72()
+    CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItIsDeleted_90()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user related with first RFID back and make sure it is deleted Error: %@", err);
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clear the second PIN credential Error: %@", err);
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                     }
 
-                             NextTest();
-                         }];
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_73()
+    CHIP_ERROR TestReadTheUserRelatedWithSecondPinBackAndMakeSureItIsDeleted_91()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:3U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user related with second PIN back and make sure it is deleted Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheUserRelatedWithLastRfidBackAndMakeSureItIsDeleted_92()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:4U];
+        [cluster getUserWithParams:params
+                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
+                     NSLog(@"Read the user related with last RFID back and make sure it is deleted Error: %@", err);
+
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                     {
+                         id actualValue = values.userIndex;
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 4U));
+                     }
+
+                     {
+                         id actualValue = values.userName;
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userUniqueId;
+                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userStatus;
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.userType;
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentialRule;
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.credentials;
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.creatorFabricIndex;
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.lastModifiedFabricIndex;
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                     }
+
+                     {
+                         id actualValue = values.nextUserIndex;
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                     }
+
+                     NextTest();
+                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewProgrammingPinCredentialWithInvalidIndex_93()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the credential and make sure it is deleted Error: %@", err);
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new Programming PIN credential with invalid index Error: %@", err);
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                      }
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                      }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+                      NextTest();
+                  }];
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
-                                 }
+        return CHIP_NO_ERROR;
+    }
 
-                                 NextTest();
-                             }];
+    CHIP_ERROR TestCreateNewProgrammingPinCredentialWithValidIndex_94()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new Programming PIN credential with valid index Error: %@", err);
+
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserBackAndMakeSureRelatedUserIsDeleted_74()
+    CHIP_ERROR TestVerifyCreatedUser_95()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user back and make sure related user is deleted Error: %@", err);
+                     NSLog(@"Verify created user Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                      {
                          id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                      }
 
                      {
                          id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
+                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
                      }
 
                      {
@@ -100955,38 +98340,47 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
+                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
+                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
                      }
 
                      {
                          id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
+                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
                      }
 
                      {
                          id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
+                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
+                         VerifyOrReturn(
+                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 0));
+                         VerifyOrReturn(CheckValue(
+                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 0U));
                      }
 
                      {
                          id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
                      }
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -100995,26 +98389,78 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialWithUser_75()
+    CHIP_ERROR TestVerifyCreatedProgrammingPinCredential_96()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Verify created programming PIN credential Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                 }
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 }
+
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                                 }
+
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
+                                     VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                                 }
+
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestModifyTheProgrammingPinCredential_97()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_12345" length:15];
+        params.credentialData = [[NSData alloc] initWithBytes:"654321" length:6];
         params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential with user Error: %@", err);
+                      NSLog(@"Modify the Programming PIN credential Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101025,14 +98471,12 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
                       }
 
                       NextTest();
@@ -101041,7 +98485,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearAllTheRfidCredentials_76()
+    CHIP_ERROR TestClearingProgrammingPinFails_98()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -101049,172 +98493,153 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster clearCredentialWithParams:params
                          completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clear all the RFID credentials Error: %@", err);
-
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                             NSLog(@"Clearing Programming PIN fails Error: %@", err);
 
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                              NextTest();
                          }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheFistRfidCredentialAndMakeSureItIsDeleted_77()
+    CHIP_ERROR TestClearingProgrammingPinWithInvalidIndexFails_99()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the fist RFID credential and make sure it is deleted Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clearing Programming PIN with invalid index fails Error: %@", err);
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                             NextTest();
+                         }];
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+        return CHIP_NO_ERROR;
+    }
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+    CHIP_ERROR TestClearingPinCredentialWithZeroIndexFails_100()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                                 }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clearing PIN credential with zero index fails Error: %@", err);
 
-                                 NextTest();
-                             }];
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheSecondRfidCredentialAndMakeSureItIsDeleted_78()
+    CHIP_ERROR TestClearingPinCredentialWithOutOfBoundIndexFails_101()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the second RFID credential and make sure it is deleted Error: %@", err);
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clearing PIN credential with out-of-bound index fails Error: %@", err);
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                             NextTest();
+                         }];
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+        return CHIP_NO_ERROR;
+    }
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+    CHIP_ERROR TestClearingRfidCredentialWithZeroIndexFails_102()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                                 }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clearing RFID credential with zero index fails Error: %@", err);
 
-                                 NextTest();
-                             }];
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheThirdRfidCredentialAndMakeSureItIsDeleted_79()
+    CHIP_ERROR TestClearingRfidCredentialWithOutOfBoundIndexFails_103()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the third RFID credential and make sure it is deleted Error: %@", err);
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
+            [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clearing RFID credential with out-of-bound index fails Error: %@", err);
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                             NextTest();
+                         }];
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+        return CHIP_NO_ERROR;
+    }
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+    CHIP_ERROR TestClearTheProgrammingPinUser_104()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Clear the Programming PIN user Error: %@", err);
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
-                                 }
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                 NextTest();
-                             }];
+                       NextTest();
+                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItHasOnlyPinCredential_80()
+    CHIP_ERROR TestMakeSureProgrammingPinUserIsDeleted_105()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -101224,7 +98649,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getUserWithParams:params
                  completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user related with first RFID back and make sure it has only PIN credential Error: %@", err);
+                     NSLog(@"Make sure Programming PIN user is deleted Error: %@", err);
 
                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101235,8 +98660,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                         VerifyOrReturn(CheckValueNull("userName", actualValue));
                      }
 
                      {
@@ -101246,48 +98670,37 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                      {
                          id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
                      }
 
                      {
                          id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
+                         VerifyOrReturn(CheckValueNull("userType", actualValue));
                      }
 
                      {
                          id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
+                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
                      }
 
                      {
                          id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
-                         VerifyOrReturn(
-                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1));
-                         VerifyOrReturn(CheckValue(
-                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 5U));
+                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
                      }
 
                      {
                          id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
+                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
                      }
 
                      {
                          id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                         VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
                      }
 
                      NextTest();
@@ -101296,78 +98709,56 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserRelatedWithSecondRfidBackAndMakeSureItIsDeleted_81()
+    CHIP_ERROR TestMakeSureProgrammingPinCredentialIsDeleted_106()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user related with second RFID back and make sure it is deleted Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
-                     }
-
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"Make sure programming PIN credential is deleted Error: %@", err);
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+                                 {
+                                     id actualValue = values.credentialExists;
+                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                 }
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+                                 {
+                                     id actualValue = values.creatorFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                 }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+                                 {
+                                     id actualValue = values.lastModifiedFabricIndex;
+                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                 }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                     }
+                                 {
+                                     id actualValue = values.nextCredentialIndex;
+                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 }
 
-                     NextTest();
-                 }];
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialWithUser_82()
+    CHIP_ERROR TestCreateNewPinCredentialAndUser_107()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -101379,14 +98770,14 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential with user Error: %@", err);
+                      NSLog(@"Create new PIN credential and user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101398,7 +98789,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
                       {
                           id actualValue = values.userIndex;
                           VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                       }
 
                       {
@@ -101413,7 +98804,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewRfidCredentialWithUser_83()
+    CHIP_ERROR TestCreateSecondPinCredentialAndAddItToExistingUser_108()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -101422,17 +98813,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_1234" length:14];
-        params.userIndex = nil;
+        params.credentialData = [[NSData alloc] initWithBytes:"000001" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new RFID credential with user Error: %@", err);
+                      NSLog(@"Create second PIN credential and add it to existing user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101443,8 +98834,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
                       }
 
                       {
@@ -101459,7 +98849,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateAnotherRfidCredentialWithUser_84()
+    CHIP_ERROR TestCreateThirdPinCredentialAndAddItToExistingUser_109()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -101468,17 +98858,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_9876" length:14];
-        params.userIndex = nil;
+        params.credentialData = [[NSData alloc] initWithBytes:"000002" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create another RFID credential with user Error: %@", err);
+                      NSLog(@"Create third PIN credential and add it to existing user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -101489,477 +98879,443 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 4U));
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
                           VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
                       }
 
-                      NextTest();
-                  }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestClearAllTheCredentials_85()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = nil;
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clear all the credentials Error: %@", err);
-
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                             NextTest();
-                         }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadBackTheFirstPinCredentialAndMakeSureItIsDeleted_86()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the first PIN credential and make sure it is deleted Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
-
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
-
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
-
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
-
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                                 }
-
-                                 NextTest();
-                             }];
-
+                      NextTest();
+                  }];
+
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheFirstRfidCredentialAndMakeSureItIsDeleted_87()
+    CHIP_ERROR TestCreateFourthPinCredentialAndAddItToExistingUser_110()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the first RFID credential and make sure it is deleted Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+        params.credentialData = [[NSData alloc] initWithBytes:"000003" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create fourth PIN credential and add it to existing user Error: %@", err);
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                                 }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                      }
 
-                                 NextTest();
-                             }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadBackTheSecondPinCredentialAndMakeSureItIsDeleted_88()
+    CHIP_ERROR TestCreateFifthPinCredentialAndAddItToExistingUser_111()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Read back the second PIN credential and make sure it is deleted Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+        params.credentialData = [[NSData alloc] initWithBytes:"000004" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create fifth PIN credential and add it to existing user Error: %@", err);
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
-                                 }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
+                      }
 
-                                 NextTest();
-                             }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserRelatedWithFirstPinBackAndMakeSureItIsDeleted_89()
+    CHIP_ERROR TestTryToCreateSixthPinCredentialAndMakeSureItFails_112()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user related with first PIN back and make sure it is deleted Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                     }
-
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+        params.credentialData = [[NSData alloc] initWithBytes:"000005" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Try to create sixth PIN credential and make sure it fails Error: %@", err);
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 137));
+                      }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                      }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
-                     }
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
+                      }
 
-                     NextTest();
-                 }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItIsDeleted_90()
+    CHIP_ERROR TestFinalCleanUp_113()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user related with first RFID back and make sure it is deleted Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Final clean-up Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
-                     }
+                       NextTest();
+                   }];
 
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
+};
 
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+class DL_LockUnlock : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    DL_LockUnlock()
+        : TestCommandBridge("DL_LockUnlock")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
+    ~DL_LockUnlock() {}
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: DL_LockUnlock\n");
+        }
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: DL_LockUnlock\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+        Wait();
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Try to unlock the door without PIN\n");
+            err = TestTryToUnlockTheDoorWithoutPin_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Verify that lock state attribute value is set to Unlocked\n");
+            err = TestVerifyThatLockStateAttributeValueIsSetToUnlocked_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Try to unlock the door without a PIN\n");
+            err = TestTryToUnlockTheDoorWithoutAPin_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Verify that lock state attribute value is set to Locked\n");
+            err = TestVerifyThatLockStateAttributeValueIsSetToLocked_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Create new PIN credential and lock/unlock user\n");
+            err = TestCreateNewPinCredentialAndLockUnlockUser_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Try to unlock the door with invalid PIN\n");
+            err = TestTryToUnlockTheDoorWithInvalidPin_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Verify that lock state attribute value is set to Locked\n");
+            err = TestVerifyThatLockStateAttributeValueIsSetToLocked_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Try to unlock the door with valid PIN\n");
+            err = TestTryToUnlockTheDoorWithValidPin_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Verify that lock state attribute value is set to Unlocked\n");
+            err = TestVerifyThatLockStateAttributeValueIsSetToUnlocked_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Try to lock the door with invalid PIN\n");
+            err = TestTryToLockTheDoorWithInvalidPin_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Verify that lock state attribute value is set to Unlocked\n");
+            err = TestVerifyThatLockStateAttributeValueIsSetToUnlocked_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Try to unlock the door with valid PIN\n");
+            err = TestTryToUnlockTheDoorWithValidPin_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Verify that lock state attribute value is set to Locked\n");
+            err = TestVerifyThatLockStateAttributeValueIsSetToLocked_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Clean the created credential\n");
+            err = TestCleanTheCreatedCredential_14();
+            break;
+        }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 3U));
-                     }
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
 
-                     NextTest();
-                 }];
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
     }
 
-    CHIP_ERROR TestReadTheUserRelatedWithSecondPinBackAndMakeSureItIsDeleted_91()
+    chip::System::Clock::Timeout GetWaitDuration() const override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:3U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user related with second PIN back and make sure it is deleted Error: %@", err);
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 15;
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
-                     }
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
 
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
+    CHIP_ERROR TestTryToUnlockTheDoorWithoutPin_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
+        [cluster unlockDoorWithParams:params
+                    completionHandler:^(NSError * _Nullable err) {
+                        NSLog(@"Try to unlock the door without PIN Error: %@", err);
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
+                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+                        NextTest();
+                    }];
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToUnlocked_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Verify that lock state attribute value is set to Unlocked Error: %@", err);
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 4U));
-                     }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 2));
+            }
 
-                     NextTest();
-                 }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheUserRelatedWithLastRfidBackAndMakeSureItIsDeleted_92()
+    CHIP_ERROR TestTryToUnlockTheDoorWithoutAPin_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:4U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Read the user related with last RFID back and make sure it is deleted Error: %@", err);
-
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 4U));
-                     }
-
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
-
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
+        [cluster lockDoorWithParams:params
+                  completionHandler:^(NSError * _Nullable err) {
+                      NSLog(@"Try to unlock the door without a PIN Error: %@", err);
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+                      NextTest();
+                  }];
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToLocked_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Verify that lock state attribute value is set to Locked Error: %@", err);
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 5U));
-                     }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
+            }
 
-                     NextTest();
-                 }];
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewProgrammingPinCredentialWithInvalidIndex_93()
+    CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockUser_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -101968,7 +99324,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
@@ -101978,23 +99334,25 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new Programming PIN credential with invalid index Error: %@", err);
+                      NSLog(@"Create new PIN credential and lock/unlock user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                       {
                           id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 133));
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
                       }
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
                       }
 
                       NextTest();
@@ -102003,205 +99361,1193 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewProgrammingPinCredentialWithValidIndex_94()
+    CHIP_ERROR TestTryToUnlockTheDoorWithInvalidPin_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
+        params.pinCode = [[NSData alloc] initWithBytes:"000000" length:6];
+        [cluster unlockDoorWithParams:params
+                    completionHandler:^(NSError * _Nullable err) {
+                        NSLog(@"Try to unlock the door with invalid PIN Error: %@", err);
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new Programming PIN credential with valid index Error: %@", err);
+                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
+                        NextTest();
+                    }];
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        return CHIP_NO_ERROR;
+    }
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToLocked_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                      }
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Verify that lock state attribute value is set to Locked Error: %@", err);
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
-                      }
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTryToUnlockTheDoorWithValidPin_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
+        params.pinCode = [[NSData alloc] initWithBytes:"123456" length:6];
+        [cluster unlockDoorWithParams:params
+                    completionHandler:^(NSError * _Nullable err) {
+                        NSLog(@"Try to unlock the door with valid PIN Error: %@", err);
+
+                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                        NextTest();
+                    }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToUnlocked_9()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Verify that lock state attribute value is set to Unlocked Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 2));
+            }
+
+            NextTest();
+        }];
 
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestTryToLockTheDoorWithInvalidPin_10()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
+        params.pinCode = [[NSData alloc] initWithBytes:"000000" length:6];
+        [cluster lockDoorWithParams:params
+                  completionHandler:^(NSError * _Nullable err) {
+                      NSLog(@"Try to lock the door with invalid PIN Error: %@", err);
+
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
                       NextTest();
                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedUser_95()
+    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToUnlocked_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Verify created user Error: %@", err);
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Verify that lock state attribute value is set to Unlocked Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                     }
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 2));
+            }
 
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                         VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
-                     }
+            NextTest();
+        }];
 
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                         VerifyOrReturn(CheckValue("userStatus", actualValue, 1));
-                     }
+    CHIP_ERROR TestTryToUnlockTheDoorWithValidPin_12()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                         VerifyOrReturn(CheckValue("userType", actualValue, 0));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
+        params.pinCode = [[NSData alloc] initWithBytes:"123456" length:6];
+        [cluster lockDoorWithParams:params
+                  completionHandler:^(NSError * _Nullable err) {
+                      NSLog(@"Try to unlock the door with valid PIN Error: %@", err);
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                         VerifyOrReturn(CheckValue("credentialRule", actualValue, 0));
-                     }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                         VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
-                         VerifyOrReturn(
-                             CheckValue("CredentialType", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialType, 0));
-                         VerifyOrReturn(CheckValue(
-                             "CredentialIndex", ((CHIPDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 0U));
-                     }
+                      NextTest();
+                  }];
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                         VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                     }
+    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToLocked_13()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
-                     }
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Verify that lock state attribute value is set to Locked Error: %@", err);
 
-                     NextTest();
-                 }];
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCleanTheCreatedCredential_14()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"Clean the created credential Error: %@", err);
+
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                             NextTest();
+                         }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class DL_Schedules : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    DL_Schedules()
+        : TestCommandBridge("DL_Schedules")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~DL_Schedules() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: DL_Schedules\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: DL_Schedules\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Create new PIN credential and schedule user\n");
+            err = TestCreateNewPinCredentialAndScheduleUser_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Get number of supported users\n");
+            err = TestGetNumberOfSupportedUsers_2();
+            break;
+        case 3:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : Get Max number of Week Day schedules for user and verify default value\n");
+            err = TestGetMaxNumberOfWeekDaySchedulesForUserAndVerifyDefaultValue_3();
+            break;
+        case 4:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : Get Max number of Year Day schedules for user and verify default value\n");
+            err = TestGetMaxNumberOfYearDaySchedulesForUserAndVerifyDefaultValue_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Get Max number of Holiday schedules and verify default value\n");
+            err = TestGetMaxNumberOfHolidaySchedulesAndVerifyDefaultValue_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Create Week Day schedule with 0 index\n");
+            err = TestCreateWeekDayScheduleWith0Index_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Create Week Day schedule with out-of-bounds index\n");
+            err = TestCreateWeekDayScheduleWithOutOfBoundsIndex_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Create Week Day schedule with 0 user index\n");
+            err = TestCreateWeekDayScheduleWith0UserIndex_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Create Week Day schedule with out-of-bounds user index\n");
+            err = TestCreateWeekDayScheduleWithOutOfBoundsUserIndex_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Create Week Day schedule for non-existing user\n");
+            err = TestCreateWeekDayScheduleForNonExistingUser_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Create Week Day schedule with 0 days mask\n");
+            err = TestCreateWeekDayScheduleWith0DaysMask_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Create Week Day schedule for Sunday and Monday\n");
+            err = TestCreateWeekDayScheduleForSundayAndMonday_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Create Week Day schedule for Sunday Wednesday and Saturday\n");
+            err = TestCreateWeekDayScheduleForSundayWednesdayAndSaturday_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Create Week Day schedule with invalid start hour\n");
+            err = TestCreateWeekDayScheduleWithInvalidStartHour_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Create Week Day schedule with invalid start minute\n");
+            err = TestCreateWeekDayScheduleWithInvalidStartMinute_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Create Week Day schedule with invalid end hour\n");
+            err = TestCreateWeekDayScheduleWithInvalidEndHour_16();
+            break;
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Create Week Day schedule with invalid end minute\n");
+            err = TestCreateWeekDayScheduleWithInvalidEndMinute_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Create Week Day schedule with start hour later that end hour\n");
+            err = TestCreateWeekDayScheduleWithStartHourLaterThatEndHour_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 19 : Create Week Day schedule with start minute later that end minute when hours are equal\n");
+            err = TestCreateWeekDayScheduleWithStartMinuteLaterThatEndMinuteWhenHoursAreEqual_19();
+            break;
+        case 20:
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Make sure that previous operations did not create a schedule\n");
+            err = TestMakeSureThatPreviousOperationsDidNotCreateASchedule_20();
+            break;
+        case 21:
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Get Week Day schedule with 0 index\n");
+            err = TestGetWeekDayScheduleWith0Index_21();
+            break;
+        case 22:
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Get Week Day schedule with out-of-bounds index\n");
+            err = TestGetWeekDayScheduleWithOutOfBoundsIndex_22();
+            break;
+        case 23:
+            ChipLogProgress(chipTool, " ***** Test Step 23 : Get Week Day schedule with 0 user index\n");
+            err = TestGetWeekDayScheduleWith0UserIndex_23();
+            break;
+        case 24:
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Get Week Day schedule with out-of-bounds user index\n");
+            err = TestGetWeekDayScheduleWithOutOfBoundsUserIndex_24();
+            break;
+        case 25:
+            ChipLogProgress(chipTool, " ***** Test Step 25 : Get Week Day schedule with non-existing user index\n");
+            err = TestGetWeekDayScheduleWithNonExistingUserIndex_25();
+            break;
+        case 26:
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Create Year Day schedule with 0 index\n");
+            err = TestCreateYearDayScheduleWith0Index_26();
+            break;
+        case 27:
+            ChipLogProgress(chipTool, " ***** Test Step 27 : Create Year Day schedule with out-of-bounds index\n");
+            err = TestCreateYearDayScheduleWithOutOfBoundsIndex_27();
+            break;
+        case 28:
+            ChipLogProgress(chipTool, " ***** Test Step 28 : Create Year Day schedule with 0 user index\n");
+            err = TestCreateYearDayScheduleWith0UserIndex_28();
+            break;
+        case 29:
+            ChipLogProgress(chipTool, " ***** Test Step 29 : Create Year Day schedule with out-of-bounds user index\n");
+            err = TestCreateYearDayScheduleWithOutOfBoundsUserIndex_29();
+            break;
+        case 30:
+            ChipLogProgress(chipTool, " ***** Test Step 30 : Create Year Day schedule for non-existing user\n");
+            err = TestCreateYearDayScheduleForNonExistingUser_30();
+            break;
+        case 31:
+            ChipLogProgress(chipTool, " ***** Test Step 31 : Create Year Day schedule with start hour later that end hour\n");
+            err = TestCreateYearDayScheduleWithStartHourLaterThatEndHour_31();
+            break;
+        case 32:
+            ChipLogProgress(chipTool, " ***** Test Step 32 : Make sure that previous operations did not create a schedule\n");
+            err = TestMakeSureThatPreviousOperationsDidNotCreateASchedule_32();
+            break;
+        case 33:
+            ChipLogProgress(chipTool, " ***** Test Step 33 : Get Year Day schedule with 0 index\n");
+            err = TestGetYearDayScheduleWith0Index_33();
+            break;
+        case 34:
+            ChipLogProgress(chipTool, " ***** Test Step 34 : Get Year Day schedule with out-of-bounds index\n");
+            err = TestGetYearDayScheduleWithOutOfBoundsIndex_34();
+            break;
+        case 35:
+            ChipLogProgress(chipTool, " ***** Test Step 35 : Get Year Day schedule with 0 user index\n");
+            err = TestGetYearDayScheduleWith0UserIndex_35();
+            break;
+        case 36:
+            ChipLogProgress(chipTool, " ***** Test Step 36 : Get Year Day schedule with out-of-bounds user index\n");
+            err = TestGetYearDayScheduleWithOutOfBoundsUserIndex_36();
+            break;
+        case 37:
+            ChipLogProgress(chipTool, " ***** Test Step 37 : Get Year Day schedule with non-existing user index\n");
+            err = TestGetYearDayScheduleWithNonExistingUserIndex_37();
+            break;
+        case 38:
+            ChipLogProgress(chipTool, " ***** Test Step 38 : Create Holiday schedule with 0 index\n");
+            err = TestCreateHolidayScheduleWith0Index_38();
+            break;
+        case 39:
+            ChipLogProgress(chipTool, " ***** Test Step 39 : Create Holiday schedule with out-of-bounds index\n");
+            err = TestCreateHolidayScheduleWithOutOfBoundsIndex_39();
+            break;
+        case 40:
+            ChipLogProgress(chipTool, " ***** Test Step 40 : Create Holiday schedule with start hour later that end hour\n");
+            err = TestCreateHolidayScheduleWithStartHourLaterThatEndHour_40();
+            break;
+        case 41:
+            ChipLogProgress(chipTool, " ***** Test Step 41 : Create Holiday schedule with invalid operating mode\n");
+            err = TestCreateHolidayScheduleWithInvalidOperatingMode_41();
+            break;
+        case 42:
+            ChipLogProgress(chipTool, " ***** Test Step 42 : Make sure that previous operations did not create a schedule\n");
+            err = TestMakeSureThatPreviousOperationsDidNotCreateASchedule_42();
+            break;
+        case 43:
+            ChipLogProgress(chipTool, " ***** Test Step 43 : Get Holiday schedule with 0 index\n");
+            err = TestGetHolidayScheduleWith0Index_43();
+            break;
+        case 44:
+            ChipLogProgress(chipTool, " ***** Test Step 44 : Get Holiday schedule with out-of-bounds index\n");
+            err = TestGetHolidayScheduleWithOutOfBoundsIndex_44();
+            break;
+        case 45:
+            ChipLogProgress(chipTool, " ***** Test Step 45 : Create Holiday schedule with valid parameters\n");
+            err = TestCreateHolidayScheduleWithValidParameters_45();
+            break;
+        case 46:
+            ChipLogProgress(chipTool, " ***** Test Step 46 : Verify created schedule\n");
+            err = TestVerifyCreatedSchedule_46();
+            break;
+        case 47:
+            ChipLogProgress(chipTool, " ***** Test Step 47 : Create Week Day schedule with valid parameters\n");
+            err = TestCreateWeekDayScheduleWithValidParameters_47();
+            break;
+        case 48:
+            ChipLogProgress(chipTool, " ***** Test Step 48 : Verify created schedule\n");
+            err = TestVerifyCreatedSchedule_48();
+            break;
+        case 49:
+            ChipLogProgress(chipTool, " ***** Test Step 49 : Create Year Day schedule with valid parameters\n");
+            err = TestCreateYearDayScheduleWithValidParameters_49();
+            break;
+        case 50:
+            ChipLogProgress(chipTool, " ***** Test Step 50 : Verify created schedule\n");
+            err = TestVerifyCreatedSchedule_50();
+            break;
+        case 51:
+            ChipLogProgress(chipTool, " ***** Test Step 51 : Clear Week Day schedule with 0 index\n");
+            err = TestClearWeekDayScheduleWith0Index_51();
+            break;
+        case 52:
+            ChipLogProgress(chipTool, " ***** Test Step 52 : Clear Week Day schedule with out-of-bounds index\n");
+            err = TestClearWeekDayScheduleWithOutOfBoundsIndex_52();
+            break;
+        case 53:
+            ChipLogProgress(chipTool, " ***** Test Step 53 : Clear Week Day schedule with 0 user index\n");
+            err = TestClearWeekDayScheduleWith0UserIndex_53();
+            break;
+        case 54:
+            ChipLogProgress(chipTool, " ***** Test Step 54 : Clear Week Day schedule with out-of-bounds user index\n");
+            err = TestClearWeekDayScheduleWithOutOfBoundsUserIndex_54();
+            break;
+        case 55:
+            ChipLogProgress(chipTool, " ***** Test Step 55 : Clear Week Day schedule with non-existing user\n");
+            err = TestClearWeekDayScheduleWithNonExistingUser_55();
+            break;
+        case 56:
+            ChipLogProgress(chipTool, " ***** Test Step 56 : Make sure that week day schedule was not deleted\n");
+            err = TestMakeSureThatWeekDayScheduleWasNotDeleted_56();
+            break;
+        case 57:
+            ChipLogProgress(chipTool, " ***** Test Step 57 : Make sure that year day schedule was not deleted\n");
+            err = TestMakeSureThatYearDayScheduleWasNotDeleted_57();
+            break;
+        case 58:
+            ChipLogProgress(chipTool, " ***** Test Step 58 : Make sure that holiday schedule was not deleted\n");
+            err = TestMakeSureThatHolidayScheduleWasNotDeleted_58();
+            break;
+        case 59:
+            ChipLogProgress(chipTool, " ***** Test Step 59 : Clear Year Day schedule with 0 index\n");
+            err = TestClearYearDayScheduleWith0Index_59();
+            break;
+        case 60:
+            ChipLogProgress(chipTool, " ***** Test Step 60 : Clear Year Day schedule with out-of-bounds index\n");
+            err = TestClearYearDayScheduleWithOutOfBoundsIndex_60();
+            break;
+        case 61:
+            ChipLogProgress(chipTool, " ***** Test Step 61 : Clear Year Day schedule with 0 user index\n");
+            err = TestClearYearDayScheduleWith0UserIndex_61();
+            break;
+        case 62:
+            ChipLogProgress(chipTool, " ***** Test Step 62 : Clear Year Day schedule with out-of-bounds user index\n");
+            err = TestClearYearDayScheduleWithOutOfBoundsUserIndex_62();
+            break;
+        case 63:
+            ChipLogProgress(chipTool, " ***** Test Step 63 : Clear Year Day schedule with non-existing user\n");
+            err = TestClearYearDayScheduleWithNonExistingUser_63();
+            break;
+        case 64:
+            ChipLogProgress(chipTool, " ***** Test Step 64 : Make sure that week day schedule was not deleted\n");
+            err = TestMakeSureThatWeekDayScheduleWasNotDeleted_64();
+            break;
+        case 65:
+            ChipLogProgress(chipTool, " ***** Test Step 65 : Make sure that year day schedule was not deleted\n");
+            err = TestMakeSureThatYearDayScheduleWasNotDeleted_65();
+            break;
+        case 66:
+            ChipLogProgress(chipTool, " ***** Test Step 66 : Make sure that holiday schedule was not deleted\n");
+            err = TestMakeSureThatHolidayScheduleWasNotDeleted_66();
+            break;
+        case 67:
+            ChipLogProgress(chipTool, " ***** Test Step 67 : Clear Holiday schedule with 0 index\n");
+            err = TestClearHolidayScheduleWith0Index_67();
+            break;
+        case 68:
+            ChipLogProgress(chipTool, " ***** Test Step 68 : Clear Holiday schedule with out-of-bounds index\n");
+            err = TestClearHolidayScheduleWithOutOfBoundsIndex_68();
+            break;
+        case 69:
+            ChipLogProgress(chipTool, " ***** Test Step 69 : Make sure that week day schedule was not deleted\n");
+            err = TestMakeSureThatWeekDayScheduleWasNotDeleted_69();
+            break;
+        case 70:
+            ChipLogProgress(chipTool, " ***** Test Step 70 : Make sure that year day schedule was not deleted\n");
+            err = TestMakeSureThatYearDayScheduleWasNotDeleted_70();
+            break;
+        case 71:
+            ChipLogProgress(chipTool, " ***** Test Step 71 : Make sure that holiday schedule was not deleted\n");
+            err = TestMakeSureThatHolidayScheduleWasNotDeleted_71();
+            break;
+        case 72:
+            ChipLogProgress(chipTool, " ***** Test Step 72 : Create another Week Day schedule with valid parameters\n");
+            err = TestCreateAnotherWeekDayScheduleWithValidParameters_72();
+            break;
+        case 73:
+            ChipLogProgress(chipTool, " ***** Test Step 73 : Verify created week day schedule\n");
+            err = TestVerifyCreatedWeekDaySchedule_73();
+            break;
+        case 74:
+            ChipLogProgress(chipTool, " ***** Test Step 74 : Create another Year Day schedule with valid parameters\n");
+            err = TestCreateAnotherYearDayScheduleWithValidParameters_74();
+            break;
+        case 75:
+            ChipLogProgress(chipTool, " ***** Test Step 75 : Verify created year day schedule\n");
+            err = TestVerifyCreatedYearDaySchedule_75();
+            break;
+        case 76:
+            ChipLogProgress(chipTool, " ***** Test Step 76 : Create another Holiday schedule with valid parameters\n");
+            err = TestCreateAnotherHolidayScheduleWithValidParameters_76();
+            break;
+        case 77:
+            ChipLogProgress(chipTool, " ***** Test Step 77 : Verify created holiday schedule\n");
+            err = TestVerifyCreatedHolidaySchedule_77();
+            break;
+        case 78:
+            ChipLogProgress(chipTool, " ***** Test Step 78 : Clear a single week day schedule for the first user\n");
+            err = TestClearASingleWeekDayScheduleForTheFirstUser_78();
+            break;
+        case 79:
+            ChipLogProgress(chipTool, " ***** Test Step 79 : Verify cleared week day schedule\n");
+            err = TestVerifyClearedWeekDaySchedule_79();
+            break;
+        case 80:
+            ChipLogProgress(chipTool, " ***** Test Step 80 : Clear all remaining week day schedules for the first user\n");
+            err = TestClearAllRemainingWeekDaySchedulesForTheFirstUser_80();
+            break;
+        case 81:
+            ChipLogProgress(chipTool, " ***** Test Step 81 : Verify cleared week schedule\n");
+            err = TestVerifyClearedWeekSchedule_81();
+            break;
+        case 82:
+            ChipLogProgress(chipTool, " ***** Test Step 82 : Make sure that first year day schedule was not deleted\n");
+            err = TestMakeSureThatFirstYearDayScheduleWasNotDeleted_82();
+            break;
+        case 83:
+            ChipLogProgress(chipTool, " ***** Test Step 83 : Make sure that second year day schedule was not deleted\n");
+            err = TestMakeSureThatSecondYearDayScheduleWasNotDeleted_83();
+            break;
+        case 84:
+            ChipLogProgress(chipTool, " ***** Test Step 84 : Make sure that first holiday schedule was not deleted\n");
+            err = TestMakeSureThatFirstHolidayScheduleWasNotDeleted_84();
+            break;
+        case 85:
+            ChipLogProgress(chipTool, " ***** Test Step 85 : Make sure that second holiday schedule was not deleted\n");
+            err = TestMakeSureThatSecondHolidayScheduleWasNotDeleted_85();
+            break;
+        case 86:
+            ChipLogProgress(chipTool, " ***** Test Step 86 : Create another Week Day schedule with valid parameters\n");
+            err = TestCreateAnotherWeekDayScheduleWithValidParameters_86();
+            break;
+        case 87:
+            ChipLogProgress(chipTool, " ***** Test Step 87 : Clear a single year day schedule for the first user\n");
+            err = TestClearASingleYearDayScheduleForTheFirstUser_87();
+            break;
+        case 88:
+            ChipLogProgress(chipTool, " ***** Test Step 88 : Verify cleared year day schedule\n");
+            err = TestVerifyClearedYearDaySchedule_88();
+            break;
+        case 89:
+            ChipLogProgress(chipTool, " ***** Test Step 89 : Clear all remaining year schedules for the first user\n");
+            err = TestClearAllRemainingYearSchedulesForTheFirstUser_89();
+            break;
+        case 90:
+            ChipLogProgress(chipTool, " ***** Test Step 90 : Verify that second year day schedule was cleared\n");
+            err = TestVerifyThatSecondYearDayScheduleWasCleared_90();
+            break;
+        case 91:
+            ChipLogProgress(chipTool, " ***** Test Step 91 : Verify created week day schedule\n");
+            err = TestVerifyCreatedWeekDaySchedule_91();
+            break;
+        case 92:
+            ChipLogProgress(chipTool, " ***** Test Step 92 : Clear all remaining week day schedules for the first user\n");
+            err = TestClearAllRemainingWeekDaySchedulesForTheFirstUser_92();
+            break;
+        case 93:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 93 : Create new user without credential so we can add more schedules to it\n");
+            err = TestCreateNewUserWithoutCredentialSoWeCanAddMoreSchedulesToIt_93();
+            break;
+        case 94:
+            ChipLogProgress(chipTool, " ***** Test Step 94 : Create Week Day schedule with valid parameters for first user\n");
+            err = TestCreateWeekDayScheduleWithValidParametersForFirstUser_94();
+            break;
+        case 95:
+            ChipLogProgress(chipTool, " ***** Test Step 95 : Verify created week day schedule for first user\n");
+            err = TestVerifyCreatedWeekDayScheduleForFirstUser_95();
+            break;
+        case 96:
+            ChipLogProgress(chipTool, " ***** Test Step 96 : Create Year Day schedule for first user\n");
+            err = TestCreateYearDayScheduleForFirstUser_96();
+            break;
+        case 97:
+            ChipLogProgress(chipTool, " ***** Test Step 97 : Verify created year day schedule for first\n");
+            err = TestVerifyCreatedYearDayScheduleForFirst_97();
+            break;
+        case 98:
+            ChipLogProgress(chipTool, " ***** Test Step 98 : Create Week Day schedule with valid parameters for second user\n");
+            err = TestCreateWeekDayScheduleWithValidParametersForSecondUser_98();
+            break;
+        case 99:
+            ChipLogProgress(chipTool, " ***** Test Step 99 : Verify created week day schedule for first user\n");
+            err = TestVerifyCreatedWeekDayScheduleForFirstUser_99();
+            break;
+        case 100:
+            ChipLogProgress(chipTool, " ***** Test Step 100 : Create Year Day schedule for second user\n");
+            err = TestCreateYearDayScheduleForSecondUser_100();
+            break;
+        case 101:
+            ChipLogProgress(chipTool, " ***** Test Step 101 : Verify created year day schedule for first\n");
+            err = TestVerifyCreatedYearDayScheduleForFirst_101();
+            break;
+        case 102:
+            ChipLogProgress(chipTool, " ***** Test Step 102 : Cleanup the user\n");
+            err = TestCleanupTheUser_102();
+            break;
+        case 103:
+            ChipLogProgress(chipTool, " ***** Test Step 103 : Make sure clearing first user also cleared week day schedules\n");
+            err = TestMakeSureClearingFirstUserAlsoClearedWeekDaySchedules_103();
+            break;
+        case 104:
+            ChipLogProgress(chipTool, " ***** Test Step 104 : Make sure clearing first user also cleared year day schedules\n");
+            err = TestMakeSureClearingFirstUserAlsoClearedYearDaySchedules_104();
+            break;
+        case 105:
+            ChipLogProgress(chipTool, " ***** Test Step 105 : Make sure clearing second user also cleared week day schedules\n");
+            err = TestMakeSureClearingSecondUserAlsoClearedWeekDaySchedules_105();
+            break;
+        case 106:
+            ChipLogProgress(chipTool, " ***** Test Step 106 : Make sure clearing second user also cleared year day schedules\n");
+            err = TestMakeSureClearingSecondUserAlsoClearedYearDaySchedules_106();
+            break;
+        case 107:
+            ChipLogProgress(chipTool, " ***** Test Step 107 : Make sure that first holiday schedule was not deleted\n");
+            err = TestMakeSureThatFirstHolidayScheduleWasNotDeleted_107();
+            break;
+        case 108:
+            ChipLogProgress(chipTool, " ***** Test Step 108 : Make sure that second holiday schedule was not deleted\n");
+            err = TestMakeSureThatSecondHolidayScheduleWasNotDeleted_108();
+            break;
+        case 109:
+            ChipLogProgress(chipTool, " ***** Test Step 109 : Create another Holiday schedule at the last slot\n");
+            err = TestCreateAnotherHolidayScheduleAtTheLastSlot_109();
+            break;
+        case 110:
+            ChipLogProgress(chipTool, " ***** Test Step 110 : Verify Created Holiday Schedule\n");
+            err = TestVerifyCreatedHolidaySchedule_110();
+            break;
+        case 111:
+            ChipLogProgress(chipTool, " ***** Test Step 111 : Create new PIN credential and schedule user\n");
+            err = TestCreateNewPinCredentialAndScheduleUser_111();
+            break;
+        case 112:
+            ChipLogProgress(chipTool, " ***** Test Step 112 : Create Week Day schedule for first user\n");
+            err = TestCreateWeekDayScheduleForFirstUser_112();
+            break;
+        case 113:
+            ChipLogProgress(chipTool, " ***** Test Step 113 : Create Year Day schedule for first user\n");
+            err = TestCreateYearDayScheduleForFirstUser_113();
+            break;
+        case 114:
+            ChipLogProgress(chipTool, " ***** Test Step 114 : Clear a single holiday schedule\n");
+            err = TestClearASingleHolidaySchedule_114();
+            break;
+        case 115:
+            ChipLogProgress(chipTool, " ***** Test Step 115 : Make sure that first holiday schedule was not deleted\n");
+            err = TestMakeSureThatFirstHolidayScheduleWasNotDeleted_115();
+            break;
+        case 116:
+            ChipLogProgress(chipTool, " ***** Test Step 116 : Make sure that second holiday schedule was deleted\n");
+            err = TestMakeSureThatSecondHolidayScheduleWasDeleted_116();
+            break;
+        case 117:
+            ChipLogProgress(chipTool, " ***** Test Step 117 : Make sure that third holiday schedule was not deleted\n");
+            err = TestMakeSureThatThirdHolidayScheduleWasNotDeleted_117();
+            break;
+        case 118:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 118 : Make sure clearing holiday schedule did not clear week day schedule\n");
+            err = TestMakeSureClearingHolidayScheduleDidNotClearWeekDaySchedule_118();
+            break;
+        case 119:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 119 : Make sure clearing holiday schedule did not clear year day schedule\n");
+            err = TestMakeSureClearingHolidayScheduleDidNotClearYearDaySchedule_119();
+            break;
+        case 120:
+            ChipLogProgress(chipTool, " ***** Test Step 120 : Clear all remaining holiday schedules\n");
+            err = TestClearAllRemainingHolidaySchedules_120();
+            break;
+        case 121:
+            ChipLogProgress(chipTool, " ***** Test Step 121 : Make sure that first holiday is still deleted\n");
+            err = TestMakeSureThatFirstHolidayIsStillDeleted_121();
+            break;
+        case 122:
+            ChipLogProgress(chipTool, " ***** Test Step 122 : Make sure that second holiday schedule was deleted\n");
+            err = TestMakeSureThatSecondHolidayScheduleWasDeleted_122();
+            break;
+        case 123:
+            ChipLogProgress(chipTool, " ***** Test Step 123 : Make sure that third holiday schedule was not deleted\n");
+            err = TestMakeSureThatThirdHolidayScheduleWasNotDeleted_123();
+            break;
+        case 124:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 124 : Make sure clearing holiday schedule did not clear week day schedule\n");
+            err = TestMakeSureClearingHolidayScheduleDidNotClearWeekDaySchedule_124();
+            break;
+        case 125:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 125 : Make sure clearing holiday schedule did not clear year day schedule\n");
+            err = TestMakeSureClearingHolidayScheduleDidNotClearYearDaySchedule_125();
+            break;
+        case 126:
+            ChipLogProgress(chipTool, " ***** Test Step 126 : Final Cleanup\n");
+            err = TestFinalCleanup_126();
+            break;
+        }
 
-        return CHIP_NO_ERROR;
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
     }
 
-    CHIP_ERROR TestVerifyCreatedProgrammingPinCredential_96()
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
     {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
-
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Verify created programming PIN credential Error: %@", err);
-
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
-                                 }
-
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                 }
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 19:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 20:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 21:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 29:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 30:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 31:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 32:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 35:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 36:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 38:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 39:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 42:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 43:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 44:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 45:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 46:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 47:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 48:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 49:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 50:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 51:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 52:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 53:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 54:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 55:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 56:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 57:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 58:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 59:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 60:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 61:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 62:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 63:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
+            break;
+        case 64:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 65:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 66:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 67:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 68:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
+            break;
+        case 69:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 70:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 71:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 72:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 73:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 74:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 75:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 76:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 77:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 78:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 79:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 80:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 81:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 82:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 83:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 84:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 85:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 86:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 87:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 88:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 89:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 90:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 91:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 92:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 93:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 94:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 95:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 96:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 97:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 98:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 99:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 100:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 101:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 102:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 103:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 104:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 105:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 106:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 107:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 108:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 109:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 110:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 111:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 112:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 113:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 114:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 115:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 116:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 117:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 118:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 119:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 120:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 121:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 122:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 123:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 124:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 125:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 126:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1));
-                                 }
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                     VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1));
-                                 }
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
-                                 }
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 127;
 
-                                 NextTest();
-                             }];
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
 
-        return CHIP_NO_ERROR;
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestModifyTheProgrammingPinCredential_97()
+    CHIP_ERROR TestCreateNewPinCredentialAndScheduleUser_1()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:2];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"654321" length:6];
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Modify the Programming PIN credential Error: %@", err);
+                      NSLog(@"Create new PIN credential and schedule user Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -102212,12 +100558,14 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                       {
                           id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                       }
 
                       {
                           id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
                       }
 
                       NextTest();
@@ -102225,2094 +100573,1812 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull NumberOfTotalUsersSupported;
 
-    CHIP_ERROR TestClearingProgrammingPinFails_98()
+    CHIP_ERROR TestGetNumberOfSupportedUsers_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster
+            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Get number of supported users Error: %@", err);
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clearing Programming PIN fails Error: %@", err);
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                             NextTest();
-                         }];
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
+                }
+                {
+                    NumberOfTotalUsersSupported = value;
+                }
+
+                NextTest();
+            }];
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUser;
 
-    CHIP_ERROR TestClearingProgrammingPinWithInvalidIndexFails_99()
+    CHIP_ERROR TestGetMaxNumberOfWeekDaySchedulesForUserAndVerifyDefaultValue_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Get Max number of Week Day schedules for user and verify default value Error: %@", err);
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clearing Programming PIN with invalid index fails Error: %@", err);
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                             NextTest();
-                         }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("NumberOfWeekDaySchedulesSupportedPerUser", actualValue, 10));
+            }
+            {
+                NumberOfWeekDaySchedulesSupportedPerUser = value;
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUser;
 
-    CHIP_ERROR TestClearingPinCredentialWithZeroIndexFails_100()
+    CHIP_ERROR TestGetMaxNumberOfYearDaySchedulesForUserAndVerifyDefaultValue_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Get Max number of Year Day schedules for user and verify default value Error: %@", err);
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clearing PIN credential with zero index fails Error: %@", err);
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                             NextTest();
-                         }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("NumberOfYearDaySchedulesSupportedPerUser", actualValue, 10));
+            }
+            {
+                NumberOfYearDaySchedulesSupportedPerUser = value;
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
+    NSNumber * _Nonnull NumberOfHolidaySchedulesSupported;
 
-    CHIP_ERROR TestClearingPinCredentialWithOutOfBoundIndexFails_101()
+    CHIP_ERROR TestGetMaxNumberOfHolidaySchedulesAndVerifyDefaultValue_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
+        [cluster readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Get Max number of Holiday schedules and verify default value Error: %@", err);
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clearing PIN credential with out-of-bound index fails Error: %@", err);
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                             NextTest();
-                         }];
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("NumberOfHolidaySchedulesSupported", actualValue, 10));
+            }
+            {
+                NumberOfHolidaySchedulesSupported = value;
+            }
+
+            NextTest();
+        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearingRfidCredentialWithZeroIndexFails_102()
+    CHIP_ERROR TestCreateWeekDayScheduleWith0Index_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
-
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clearing RFID credential with zero index fails Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with 0 index Error: %@", err);
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                             NextTest();
-                         }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearingRfidCredentialWithOutOfBoundIndexFails_103()
+    CHIP_ERROR TestCreateWeekDayScheduleWithOutOfBoundsIndex_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex =
-            [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
-
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clearing RFID credential with out-of-bound index fails Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with out-of-bounds index Error: %@", err);
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                             NextTest();
-                         }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearTheProgrammingPinUser_104()
+    CHIP_ERROR TestCreateWeekDayScheduleWith0UserIndex_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearUserWithParams:params
-                   completionHandler:^(NSError * _Nullable err) {
-                       NSLog(@"Clear the Programming PIN user Error: %@", err);
-
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with 0 user index Error: %@", err);
 
-                       NextTest();
-                   }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureProgrammingPinUserIsDeleted_105()
+    CHIP_ERROR TestCreateWeekDayScheduleWithOutOfBoundsUserIndex_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getUserWithParams:params
-                 completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) {
-                     NSLog(@"Make sure Programming PIN user is deleted Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with out-of-bounds user index Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                     {
-                         id actualValue = values.userIndex;
-                         VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.userName;
-                         VerifyOrReturn(CheckValueNull("userName", actualValue));
-                     }
+    CHIP_ERROR TestCreateWeekDayScheduleForNonExistingUser_10()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.userUniqueId;
-                         VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule for non-existing user Error: %@", err);
 
-                     {
-                         id actualValue = values.userStatus;
-                         VerifyOrReturn(CheckValueNull("userStatus", actualValue));
-                     }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                NextTest();
+                            }];
 
-                     {
-                         id actualValue = values.userType;
-                         VerifyOrReturn(CheckValueNull("userType", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.credentialRule;
-                         VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
-                     }
+    CHIP_ERROR TestCreateWeekDayScheduleWith0DaysMask_11()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     {
-                         id actualValue = values.credentials;
-                         VerifyOrReturn(CheckValueNull("credentials", actualValue));
-                     }
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:0];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with 0 days mask Error: %@", err);
 
-                     {
-                         id actualValue = values.creatorFabricIndex;
-                         VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                     }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                     {
-                         id actualValue = values.lastModifiedFabricIndex;
-                         VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                     }
+        return CHIP_NO_ERROR;
+    }
 
-                     {
-                         id actualValue = values.nextUserIndex;
-                         VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                         VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
-                     }
+    CHIP_ERROR TestCreateWeekDayScheduleForSundayAndMonday_12()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                     NextTest();
-                 }];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:3];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule for Sunday and Monday Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureProgrammingPinCredentialIsDeleted_106()
+    CHIP_ERROR TestCreateWeekDayScheduleForSundayWednesdayAndSaturday_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:73];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule for Sunday Wednesday and Saturday Error: %@", err);
 
-        [cluster getCredentialStatusWithParams:params
-                             completionHandler:^(
-                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                 NSLog(@"Make sure programming PIN credential is deleted Error: %@", err);
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        return CHIP_NO_ERROR;
+    }
 
-                                 {
-                                     id actualValue = values.credentialExists;
-                                     VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
-                                 }
+    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidStartHour_14()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                 {
-                                     id actualValue = values.userIndex;
-                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                                 }
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:24];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with invalid start hour Error: %@", err);
 
-                                 {
-                                     id actualValue = values.creatorFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
-                                 }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                                 {
-                                     id actualValue = values.lastModifiedFabricIndex;
-                                     VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
-                                 }
+        return CHIP_NO_ERROR;
+    }
 
-                                 {
-                                     id actualValue = values.nextCredentialIndex;
-                                     VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
-                                 }
+    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidStartMinute_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                 NextTest();
-                             }];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:60];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with invalid start minute Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndUser_107()
+    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidEndHour_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:24];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with invalid end hour Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+        return CHIP_NO_ERROR;
+    }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                      }
+    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidEndMinute_17()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                      }
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:60];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with invalid end minute Error: %@", err);
 
-                      NextTest();
-                  }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateSecondPinCredentialAndAddItToExistingUser_108()
+    CHIP_ERROR TestCreateWeekDayScheduleWithStartHourLaterThatEndHour_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"000001" length:6];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create second PIN credential and add it to existing user Error: %@", err);
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:19];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with start hour later that end hour Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+        return CHIP_NO_ERROR;
+    }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+    CHIP_ERROR TestCreateWeekDayScheduleWithStartMinuteLaterThatEndMinuteWhenHoursAreEqual_19()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                      }
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:50];
+        params.endHour = [NSNumber numberWithUnsignedChar:15];
+        params.endMinute = [NSNumber numberWithUnsignedChar:49];
+        [cluster
+            setWeekDayScheduleWithParams:params
+                       completionHandler:^(NSError * _Nullable err) {
+                           NSLog(@"Create Week Day schedule with start minute later that end minute when hours are equal Error: %@",
+                               err);
 
-                      NextTest();
-                  }];
+                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                           NextTest();
+                       }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateThirdPinCredentialAndAddItToExistingUser_109()
+    CHIP_ERROR TestMakeSureThatPreviousOperationsDidNotCreateASchedule_20()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"000002" length:6];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create third PIN credential and add it to existing user Error: %@", err);
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
-                      }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
 
-                      NextTest();
-                  }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateFourthPinCredentialAndAddItToExistingUser_110()
+    CHIP_ERROR TestGetWeekDayScheduleWith0Index_21()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"000003" length:6];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create fourth PIN credential and add it to existing user Error: %@", err);
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Week Day schedule with 0 index Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0));
+                                }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
-                      }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
 
-                      NextTest();
-                  }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateFifthPinCredentialAndAddItToExistingUser_111()
+    CHIP_ERROR TestGetWeekDayScheduleWithOutOfBoundsIndex_22()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"000004" length:6];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create fifth PIN credential and add it to existing user Error: %@", err);
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Week Day schedule with out-of-bounds index Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue,
+                                        [NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1));
+                                }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
-                      }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
 
-                      NextTest();
-                  }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTryToCreateSixthPinCredentialAndMakeSureItFails_112()
+    CHIP_ERROR TestGetWeekDayScheduleWith0UserIndex_23()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"000005" length:6];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Try to create sixth PIN credential and make sure it fails Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Week Day schedule with 0 user index Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 137));
-                      }
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNull("userIndex", actualValue));
-                      }
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 0U));
+                                }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
-                      }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
 
-                      NextTest();
-                  }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class DL_LockUnlock : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    DL_LockUnlock()
-        : TestCommandBridge("DL_LockUnlock")
-        , mTestIndex(0)
+    CHIP_ERROR TestGetWeekDayScheduleWithOutOfBoundsUserIndex_24()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~DL_LockUnlock() {}
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Week Day schedule with out-of-bounds user index Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: DL_LockUnlock\n");
-        }
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: DL_LockUnlock\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue(
+                                        "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
+                                }
 
-        Wait();
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Create new PIN credential and lock/unlock user\n");
-            err = TestCreateNewPinCredentialAndLockUnlockUser_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Try to unlock the door with invalid PIN\n");
-            err = TestTryToUnlockTheDoorWithInvalidPin_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Verify that lock state attribute value is set to Locked\n");
-            err = TestVerifyThatLockStateAttributeValueIsSetToLocked_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Try to unlock the door with valid PIN\n");
-            err = TestTryToUnlockTheDoorWithValidPin_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Verify that lock state attribute value is set to Unlocked\n");
-            err = TestVerifyThatLockStateAttributeValueIsSetToUnlocked_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Try to lock the door with invalid PIN\n");
-            err = TestTryToLockTheDoorWithInvalidPin_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Verify that lock state attribute value is set to Unlocked\n");
-            err = TestVerifyThatLockStateAttributeValueIsSetToUnlocked_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Try to unlock the door with valid PIN\n");
-            err = TestTryToUnlockTheDoorWithValidPin_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Verify that lock state attribute value is set to Locked\n");
-            err = TestVerifyThatLockStateAttributeValueIsSetToLocked_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Clean the created credential\n");
-            err = TestCleanTheCreatedCredential_10();
-            break;
-        }
+                                NextTest();
+                            }];
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestGetWeekDayScheduleWithNonExistingUserIndex_25()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
-    }
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Week Day schedule with non-existing user index Error: %@", err);
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 11;
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                }
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockUser_1()
+    CHIP_ERROR TestCreateYearDayScheduleWith0Index_26()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
-
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and lock/unlock user Error: %@", err);
-
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule with 0 index Error: %@", err);
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                      }
+        return CHIP_NO_ERROR;
+    }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                      }
+    CHIP_ERROR TestCreateYearDayScheduleWithOutOfBoundsIndex_27()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                      NextTest();
-                  }];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule with out-of-bounds index Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTryToUnlockTheDoorWithInvalidPin_2()
+    CHIP_ERROR TestCreateYearDayScheduleWith0UserIndex_28()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
-        params.pinCode = [[NSData alloc] initWithBytes:"000000" length:6];
-        [cluster unlockDoorWithParams:params
-                    completionHandler:^(NSError * _Nullable err) {
-                        NSLog(@"Try to unlock the door with invalid PIN Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule with 0 user index Error: %@", err);
 
-                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
-                        NextTest();
-                    }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToLocked_3()
+    CHIP_ERROR TestCreateYearDayScheduleWithOutOfBoundsUserIndex_29()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify that lock state attribute value is set to Locked Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
-                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
-            }
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule with out-of-bounds user index Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTryToUnlockTheDoorWithValidPin_4()
+    CHIP_ERROR TestCreateYearDayScheduleForNonExistingUser_30()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
-        params.pinCode = [[NSData alloc] initWithBytes:"123456" length:6];
-        [cluster unlockDoorWithParams:params
-                    completionHandler:^(NSError * _Nullable err) {
-                        NSLog(@"Try to unlock the door with valid PIN Error: %@", err);
-
-                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule for non-existing user Error: %@", err);
 
-                        NextTest();
-                    }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToUnlocked_5()
+    CHIP_ERROR TestCreateYearDayScheduleWithStartHourLaterThatEndHour_31()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify that lock state attribute value is set to Unlocked Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
-                VerifyOrReturn(CheckValue("LockState", actualValue, 2));
-            }
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345688UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule with start hour later that end hour Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTryToLockTheDoorWithInvalidPin_6()
+    CHIP_ERROR TestMakeSureThatPreviousOperationsDidNotCreateASchedule_32()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
-        params.pinCode = [[NSData alloc] initWithBytes:"000000" length:6];
-        [cluster lockDoorWithParams:params
-                  completionHandler:^(NSError * _Nullable err) {
-                      NSLog(@"Try to lock the door with invalid PIN Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_FAILURE));
-                      NextTest();
-                  }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToUnlocked_7()
+    CHIP_ERROR TestGetYearDayScheduleWith0Index_33()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify that lock state attribute value is set to Unlocked Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Year Day schedule with 0 index Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
-                VerifyOrReturn(CheckValue("LockState", actualValue, 2));
-            }
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 0));
+                                }
 
-            NextTest();
-        }];
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestTryToUnlockTheDoorWithValidPin_8()
+    CHIP_ERROR TestGetYearDayScheduleWithOutOfBoundsIndex_34()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
-        params.pinCode = [[NSData alloc] initWithBytes:"123456" length:6];
-        [cluster lockDoorWithParams:params
-                  completionHandler:^(NSError * _Nullable err) {
-                      NSLog(@"Try to unlock the door with valid PIN Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Year Day schedule with out-of-bounds index Error: %@", err);
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      NextTest();
-                  }];
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue,
+                                        [NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatLockStateAttributeValueIsSetToLocked_9()
+    CHIP_ERROR TestGetYearDayScheduleWith0UserIndex_35()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Verify that lock state attribute value is set to Locked Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Year Day schedule with 0 user index Error: %@", err);
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
-                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
-            }
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
 
-            NextTest();
-        }];
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 0U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCleanTheCreatedCredential_10()
+    CHIP_ERROR TestGetYearDayScheduleWithOutOfBoundsUserIndex_36()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Year Day schedule with out-of-bounds user index Error: %@", err);
 
-        [cluster clearCredentialWithParams:params
-                         completionHandler:^(NSError * _Nullable err) {
-                             NSLog(@"Clean the created credential Error: %@", err);
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
 
-                             NextTest();
-                         }];
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue(
+                                        "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
-};
 
-class DL_Schedules : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    DL_Schedules()
-        : TestCommandBridge("DL_Schedules")
-        , mTestIndex(0)
+    CHIP_ERROR TestGetYearDayScheduleWithNonExistingUserIndex_37()
     {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    ~DL_Schedules() {}
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Year Day schedule with non-existing user index Error: %@", err);
 
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: DL_Schedules\n");
-        }
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
 
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: DL_Schedules\n");
-            SetCommandExitStatus(CHIP_NO_ERROR);
-            return;
-        }
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                }
 
-        Wait();
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
 
-        // Ensure we increment mTestIndex before we start running the relevant
-        // command.  That way if we lose the timeslice after we send the message
-        // but before our function call returns, we won't end up with an
-        // incorrect mTestIndex value observed when we get the response.
-        switch (mTestIndex++) {
-        case 0:
-            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Create new PIN credential and schedule user\n");
-            err = TestCreateNewPinCredentialAndScheduleUser_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Get number of supported users\n");
-            err = TestGetNumberOfSupportedUsers_2();
-            break;
-        case 3:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 3 : Get Max number of Week Day schedules for user and verify default value\n");
-            err = TestGetMaxNumberOfWeekDaySchedulesForUserAndVerifyDefaultValue_3();
-            break;
-        case 4:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 4 : Get Max number of Year Day schedules for user and verify default value\n");
-            err = TestGetMaxNumberOfYearDaySchedulesForUserAndVerifyDefaultValue_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Create Week Day schedule with 0 index\n");
-            err = TestCreateWeekDayScheduleWith0Index_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Create Week Day schedule with out-of-bounds index\n");
-            err = TestCreateWeekDayScheduleWithOutOfBoundsIndex_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Create Week Day schedule with 0 user index\n");
-            err = TestCreateWeekDayScheduleWith0UserIndex_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Create Week Day schedule with out-of-bounds user index\n");
-            err = TestCreateWeekDayScheduleWithOutOfBoundsUserIndex_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Create Week Day schedule for non-existing user\n");
-            err = TestCreateWeekDayScheduleForNonExistingUser_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Create Week Day schedule with 0 days mask\n");
-            err = TestCreateWeekDayScheduleWith0DaysMask_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Create Week Day schedule for Sunday and Monday\n");
-            err = TestCreateWeekDayScheduleForSundayAndMonday_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Create Week Day schedule for Sunday Wednesday and Saturday\n");
-            err = TestCreateWeekDayScheduleForSundayWednesdayAndSaturday_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Create Week Day schedule with invalid start hour\n");
-            err = TestCreateWeekDayScheduleWithInvalidStartHour_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Create Week Day schedule with invalid start minute\n");
-            err = TestCreateWeekDayScheduleWithInvalidStartMinute_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Create Week Day schedule with invalid end hour\n");
-            err = TestCreateWeekDayScheduleWithInvalidEndHour_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Create Week Day schedule with invalid end minute\n");
-            err = TestCreateWeekDayScheduleWithInvalidEndMinute_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Create Week Day schedule with start hour later that end hour\n");
-            err = TestCreateWeekDayScheduleWithStartHourLaterThatEndHour_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 18 : Create Week Day schedule with start minute later that end minute when hours are equal\n");
-            err = TestCreateWeekDayScheduleWithStartMinuteLaterThatEndMinuteWhenHoursAreEqual_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Make sure that previous operations did not create a schedule\n");
-            err = TestMakeSureThatPreviousOperationsDidNotCreateASchedule_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Get Week Day schedule with 0 index\n");
-            err = TestGetWeekDayScheduleWith0Index_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Get Week Day schedule with out-of-bounds index\n");
-            err = TestGetWeekDayScheduleWithOutOfBoundsIndex_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Get Week Day schedule with 0 user index\n");
-            err = TestGetWeekDayScheduleWith0UserIndex_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Get Week Day schedule with out-of-bounds user index\n");
-            err = TestGetWeekDayScheduleWithOutOfBoundsUserIndex_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Get Week Day schedule with non-existing user index\n");
-            err = TestGetWeekDayScheduleWithNonExistingUserIndex_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Create Year Day schedule with 0 index\n");
-            err = TestCreateYearDayScheduleWith0Index_25();
-            break;
-        case 26:
-            ChipLogProgress(chipTool, " ***** Test Step 26 : Create Year Day schedule with out-of-bounds index\n");
-            err = TestCreateYearDayScheduleWithOutOfBoundsIndex_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : Create Year Day schedule with 0 user index\n");
-            err = TestCreateYearDayScheduleWith0UserIndex_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : Create Year Day schedule with out-of-bounds user index\n");
-            err = TestCreateYearDayScheduleWithOutOfBoundsUserIndex_28();
-            break;
-        case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : Create Year Day schedule for non-existing user\n");
-            err = TestCreateYearDayScheduleForNonExistingUser_29();
-            break;
-        case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : Create Year Day schedule with start hour later that end hour\n");
-            err = TestCreateYearDayScheduleWithStartHourLaterThatEndHour_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : Make sure that previous operations did not create a schedule\n");
-            err = TestMakeSureThatPreviousOperationsDidNotCreateASchedule_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : Get Year Day schedule with 0 index\n");
-            err = TestGetYearDayScheduleWith0Index_32();
-            break;
-        case 33:
-            ChipLogProgress(chipTool, " ***** Test Step 33 : Get Year Day schedule with out-of-bounds index\n");
-            err = TestGetYearDayScheduleWithOutOfBoundsIndex_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : Get Year Day schedule with 0 user index\n");
-            err = TestGetYearDayScheduleWith0UserIndex_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : Get Year Day schedule with out-of-bounds user index\n");
-            err = TestGetYearDayScheduleWithOutOfBoundsUserIndex_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : Get Year Day schedule with non-existing user index\n");
-            err = TestGetYearDayScheduleWithNonExistingUserIndex_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : Create Week Day schedule with valid parameters\n");
-            err = TestCreateWeekDayScheduleWithValidParameters_37();
-            break;
-        case 38:
-            ChipLogProgress(chipTool, " ***** Test Step 38 : Verify created schedule\n");
-            err = TestVerifyCreatedSchedule_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : Create Year Day schedule with valid parameters\n");
-            err = TestCreateYearDayScheduleWithValidParameters_39();
-            break;
-        case 40:
-            ChipLogProgress(chipTool, " ***** Test Step 40 : Verify created schedule\n");
-            err = TestVerifyCreatedSchedule_40();
-            break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : Clear Week Day schedule with 0 index\n");
-            err = TestClearWeekDayScheduleWith0Index_41();
-            break;
-        case 42:
-            ChipLogProgress(chipTool, " ***** Test Step 42 : Clear Week Day schedule with out-of-bounds index\n");
-            err = TestClearWeekDayScheduleWithOutOfBoundsIndex_42();
-            break;
-        case 43:
-            ChipLogProgress(chipTool, " ***** Test Step 43 : Clear Week Day schedule with 0 user index\n");
-            err = TestClearWeekDayScheduleWith0UserIndex_43();
-            break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : Clear Week Day schedule with out-of-bounds user index\n");
-            err = TestClearWeekDayScheduleWithOutOfBoundsUserIndex_44();
-            break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : Clear Week Day schedule with non-existing user\n");
-            err = TestClearWeekDayScheduleWithNonExistingUser_45();
-            break;
-        case 46:
-            ChipLogProgress(chipTool, " ***** Test Step 46 : Clear Year Day schedule with 0 index\n");
-            err = TestClearYearDayScheduleWith0Index_46();
-            break;
-        case 47:
-            ChipLogProgress(chipTool, " ***** Test Step 47 : Clear Year Day schedule with out-of-bounds index\n");
-            err = TestClearYearDayScheduleWithOutOfBoundsIndex_47();
-            break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : Clear Year Day schedule with 0 user index\n");
-            err = TestClearYearDayScheduleWith0UserIndex_48();
-            break;
-        case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : Clear Year Day schedule with out-of-bounds user index\n");
-            err = TestClearYearDayScheduleWithOutOfBoundsUserIndex_49();
-            break;
-        case 50:
-            ChipLogProgress(chipTool, " ***** Test Step 50 : Clear Year Day schedule with non-existing user\n");
-            err = TestClearYearDayScheduleWithNonExistingUser_50();
-            break;
-        case 51:
-            ChipLogProgress(chipTool, " ***** Test Step 51 : Make sure that week day schedule was not deleted\n");
-            err = TestMakeSureThatWeekDayScheduleWasNotDeleted_51();
-            break;
-        case 52:
-            ChipLogProgress(chipTool, " ***** Test Step 52 : Make sure that year day schedule was not deleted\n");
-            err = TestMakeSureThatYearDayScheduleWasNotDeleted_52();
-            break;
-        case 53:
-            ChipLogProgress(chipTool, " ***** Test Step 53 : Create another Week Day schedule with valid parameters\n");
-            err = TestCreateAnotherWeekDayScheduleWithValidParameters_53();
-            break;
-        case 54:
-            ChipLogProgress(chipTool, " ***** Test Step 54 : Verify created week day schedule\n");
-            err = TestVerifyCreatedWeekDaySchedule_54();
-            break;
-        case 55:
-            ChipLogProgress(chipTool, " ***** Test Step 55 : Create another Year Day schedule with valid parameters\n");
-            err = TestCreateAnotherYearDayScheduleWithValidParameters_55();
-            break;
-        case 56:
-            ChipLogProgress(chipTool, " ***** Test Step 56 : Verify created year day schedule\n");
-            err = TestVerifyCreatedYearDaySchedule_56();
-            break;
-        case 57:
-            ChipLogProgress(chipTool, " ***** Test Step 57 : Clear a single week day schedule for the first user\n");
-            err = TestClearASingleWeekDayScheduleForTheFirstUser_57();
-            break;
-        case 58:
-            ChipLogProgress(chipTool, " ***** Test Step 58 : Verify cleared week day schedule\n");
-            err = TestVerifyClearedWeekDaySchedule_58();
-            break;
-        case 59:
-            ChipLogProgress(chipTool, " ***** Test Step 59 : Clear all remaining week day schedules for the first user\n");
-            err = TestClearAllRemainingWeekDaySchedulesForTheFirstUser_59();
-            break;
-        case 60:
-            ChipLogProgress(chipTool, " ***** Test Step 60 : Verify cleared week schedule\n");
-            err = TestVerifyClearedWeekSchedule_60();
-            break;
-        case 61:
-            ChipLogProgress(chipTool, " ***** Test Step 61 : Make sure that first year day schedule was not deleted\n");
-            err = TestMakeSureThatFirstYearDayScheduleWasNotDeleted_61();
-            break;
-        case 62:
-            ChipLogProgress(chipTool, " ***** Test Step 62 : Make sure that second year day schedule was not deleted\n");
-            err = TestMakeSureThatSecondYearDayScheduleWasNotDeleted_62();
-            break;
-        case 63:
-            ChipLogProgress(chipTool, " ***** Test Step 63 : Create another Week Day schedule with valid parameters\n");
-            err = TestCreateAnotherWeekDayScheduleWithValidParameters_63();
-            break;
-        case 64:
-            ChipLogProgress(chipTool, " ***** Test Step 64 : Clear a single year day schedule for the first user\n");
-            err = TestClearASingleYearDayScheduleForTheFirstUser_64();
-            break;
-        case 65:
-            ChipLogProgress(chipTool, " ***** Test Step 65 : Verify cleared year day schedule\n");
-            err = TestVerifyClearedYearDaySchedule_65();
-            break;
-        case 66:
-            ChipLogProgress(chipTool, " ***** Test Step 66 : Clear all remaining year schedules for the first user\n");
-            err = TestClearAllRemainingYearSchedulesForTheFirstUser_66();
-            break;
-        case 67:
-            ChipLogProgress(chipTool, " ***** Test Step 67 : Verify that second year day schedule was cleared\n");
-            err = TestVerifyThatSecondYearDayScheduleWasCleared_67();
-            break;
-        case 68:
-            ChipLogProgress(chipTool, " ***** Test Step 68 : Verify created week day schedule\n");
-            err = TestVerifyCreatedWeekDaySchedule_68();
-            break;
-        case 69:
-            ChipLogProgress(chipTool, " ***** Test Step 69 : Clear all remaining week day schedules for the first user\n");
-            err = TestClearAllRemainingWeekDaySchedulesForTheFirstUser_69();
-            break;
-        case 70:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 70 : Create new user without credential so we can add more schedules to it\n");
-            err = TestCreateNewUserWithoutCredentialSoWeCanAddMoreSchedulesToIt_70();
-            break;
-        case 71:
-            ChipLogProgress(chipTool, " ***** Test Step 71 : Create Week Day schedule with valid parameters for first user\n");
-            err = TestCreateWeekDayScheduleWithValidParametersForFirstUser_71();
-            break;
-        case 72:
-            ChipLogProgress(chipTool, " ***** Test Step 72 : Verify created week day schedule for first user\n");
-            err = TestVerifyCreatedWeekDayScheduleForFirstUser_72();
-            break;
-        case 73:
-            ChipLogProgress(chipTool, " ***** Test Step 73 : Create Year Day schedule for first user\n");
-            err = TestCreateYearDayScheduleForFirstUser_73();
-            break;
-        case 74:
-            ChipLogProgress(chipTool, " ***** Test Step 74 : Verify created year day schedule for first\n");
-            err = TestVerifyCreatedYearDayScheduleForFirst_74();
-            break;
-        case 75:
-            ChipLogProgress(chipTool, " ***** Test Step 75 : Create Week Day schedule with valid parameters for second user\n");
-            err = TestCreateWeekDayScheduleWithValidParametersForSecondUser_75();
-            break;
-        case 76:
-            ChipLogProgress(chipTool, " ***** Test Step 76 : Verify created week day schedule for first user\n");
-            err = TestVerifyCreatedWeekDayScheduleForFirstUser_76();
-            break;
-        case 77:
-            ChipLogProgress(chipTool, " ***** Test Step 77 : Create Year Day schedule for second user\n");
-            err = TestCreateYearDayScheduleForSecondUser_77();
-            break;
-        case 78:
-            ChipLogProgress(chipTool, " ***** Test Step 78 : Verify created year day schedule for first\n");
-            err = TestVerifyCreatedYearDayScheduleForFirst_78();
-            break;
-        case 79:
-            ChipLogProgress(chipTool, " ***** Test Step 79 : Cleanup\n");
-            err = TestCleanup_79();
-            break;
-        case 80:
-            ChipLogProgress(chipTool, " ***** Test Step 80 : Make sure clearing first user also cleared week day schedules\n");
-            err = TestMakeSureClearingFirstUserAlsoClearedWeekDaySchedules_80();
-            break;
-        case 81:
-            ChipLogProgress(chipTool, " ***** Test Step 81 : Make sure clearing first user also cleared year day schedules\n");
-            err = TestMakeSureClearingFirstUserAlsoClearedYearDaySchedules_81();
-            break;
-        case 82:
-            ChipLogProgress(chipTool, " ***** Test Step 82 : Make sure clearing second user also cleared week day schedules\n");
-            err = TestMakeSureClearingSecondUserAlsoClearedWeekDaySchedules_82();
-            break;
-        case 83:
-            ChipLogProgress(chipTool, " ***** Test Step 83 : Make sure clearing second user also cleared year day schedules\n");
-            err = TestMakeSureClearingSecondUserAlsoClearedYearDaySchedules_83();
-            break;
-        }
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateHolidayScheduleWith0Index_38()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:0];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Holiday schedule with 0 index Error: %@", err);
 
-        if (CHIP_NO_ERROR != err) {
-            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
-            SetCommandExitStatus(err);
-        }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
     }
 
-    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    CHIP_ERROR TestCreateHolidayScheduleWithOutOfBoundsIndex_39()
     {
-        switch (mTestIndex - 1) {
-        case 0:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 1:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 2:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 3:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 4:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 5:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 8:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 9:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_FIELD));
-            break;
-        case 50:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
-            break;
-        case 51:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 52:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 53:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 54:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 55:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 56:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 57:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 58:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 59:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 60:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 61:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 62:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 63:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 64:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 65:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 66:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 67:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 68:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 69:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 70:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 71:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 72:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 73:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 74:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 75:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 76:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 77:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 78:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 79:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 80:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 81:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 82:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 83:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        }
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        // Go on to the next test.
-        ContinueOnChipMainThread(CHIP_NO_ERROR);
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupported unsignedCharValue] + 1];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:0];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Holiday schedule with out-of-bounds index Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
     }
 
-    chip::System::Clock::Timeout GetWaitDuration() const override
+    CHIP_ERROR TestCreateHolidayScheduleWithStartHourLaterThatEndHour_40()
     {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345688UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:0];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Holiday schedule with start hour later that end hour Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
     }
 
-private:
-    std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 84;
+    CHIP_ERROR TestCreateHolidayScheduleWithInvalidOperatingMode_41()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:5];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Holiday schedule with invalid operating mode Error: %@", err);
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestMakeSureThatPreviousOperationsDidNotCreateASchedule_42()
     {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndScheduleUser_1()
+    CHIP_ERROR TestGetHolidayScheduleWith0Index_43()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:0];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Holiday schedule with 0 index Error: %@", err);
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
-        [cluster
-            setCredentialWithParams:params
-                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and schedule user Error: %@", err);
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGetHolidayScheduleWithOutOfBoundsIndex_44()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupported unsignedCharValue] + 1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Get Holiday schedule with out-of-bounds index Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue(
+                                        "holidayIndex", actualValue, [NumberOfHolidaySchedulesSupported unsignedCharValue] + 1));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateHolidayScheduleWithValidParameters_45()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:0];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Holiday schedule with valid parameters Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestVerifyCreatedSchedule_46()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify created schedule Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateWeekDayScheduleWithValidParameters_47()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:16];
+        params.endHour = [NSNumber numberWithUnsignedChar:18];
+        params.endMinute = [NSNumber numberWithUnsignedChar:0];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with valid parameters Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestVerifyCreatedSchedule_48()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify created schedule Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 15));
+                                }
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                                {
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 16));
+                                }
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                      }
+                                {
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 18));
+                                }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                      }
+                                {
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 0));
+                                }
 
-                      NextTest();
-                  }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfTotalUsersSupported;
 
-    CHIP_ERROR TestGetNumberOfSupportedUsers_2()
+    CHIP_ERROR TestCreateYearDayScheduleWithValidParameters_49()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Get number of supported users Error: %@", err);
-
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule with valid parameters Error: %@", err);
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
-                }
-                {
-                    NumberOfTotalUsersSupported = value;
-                }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                NextTest();
-            }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUser;
 
-    CHIP_ERROR TestGetMaxNumberOfWeekDaySchedulesForUserAndVerifyDefaultValue_3()
+    CHIP_ERROR TestVerifyCreatedSchedule_50()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of Week Day schedules for user and verify default value Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("NumberOfWeekDaySchedulesSupportedPerUser", actualValue, 10));
-            }
-            {
-                NumberOfWeekDaySchedulesSupportedPerUser = value;
-            }
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify created schedule Error: %@", err);
 
-            NextTest();
-        }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        return CHIP_NO_ERROR;
-    }
-    NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUser;
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
 
-    CHIP_ERROR TestGetMaxNumberOfYearDaySchedulesForUserAndVerifyDefaultValue_4()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-        [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of Year Day schedules for user and verify default value Error: %@", err);
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("NumberOfYearDaySchedulesSupportedPerUser", actualValue, 10));
-            }
-            {
-                NumberOfYearDaySchedulesSupportedPerUser = value;
-            }
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
 
-            NextTest();
-        }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWith0Index_5()
+    CHIP_ERROR TestClearWeekDayScheduleWith0Index_51()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with 0 index Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Week Day schedule with 0 index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithOutOfBoundsIndex_6()
+    CHIP_ERROR TestClearWeekDayScheduleWithOutOfBoundsIndex_52()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with out-of-bounds index Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Week Day schedule with out-of-bounds index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWith0UserIndex_7()
+    CHIP_ERROR TestClearWeekDayScheduleWith0UserIndex_53()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with 0 user index Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Week Day schedule with 0 user index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithOutOfBoundsUserIndex_8()
+    CHIP_ERROR TestClearWeekDayScheduleWithOutOfBoundsUserIndex_54()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with out-of-bounds user index Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Week Day schedule with out-of-bounds user index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleForNonExistingUser_9()
+    CHIP_ERROR TestClearWeekDayScheduleWithNonExistingUser_55()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule for non-existing user Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Week Day schedule with non-existing user Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWith0DaysMask_10()
+    CHIP_ERROR TestMakeSureThatWeekDayScheduleWasNotDeleted_56()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:0];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with 0 days mask Error: %@", err);
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
 
-    CHIP_ERROR TestCreateWeekDayScheduleForSundayAndMonday_11()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:3];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule for Sunday and Monday Error: %@", err);
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 15));
+                                }
+
+                                {
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 16));
+                                }
+
+                                {
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 18));
+                                }
+
+                                {
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 0));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleForSundayWednesdayAndSaturday_12()
+    CHIP_ERROR TestMakeSureThatYearDayScheduleWasNotDeleted_57()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:73];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule for Sunday Wednesday and Saturday Error: %@", err);
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidStartHour_13()
+    CHIP_ERROR TestMakeSureThatHolidayScheduleWasNotDeleted_58()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:24];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with invalid start hour Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that holiday schedule was not deleted Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidStartMinute_14()
+    CHIP_ERROR TestClearYearDayScheduleWith0Index_59()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:60];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with invalid start minute Error: %@", err);
+        [cluster clearYearDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Year Day schedule with 0 index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidEndHour_15()
+    CHIP_ERROR TestClearYearDayScheduleWithOutOfBoundsIndex_60()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:24];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with invalid end hour Error: %@", err);
+        [cluster clearYearDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Year Day schedule with out-of-bounds index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithInvalidEndMinute_16()
+    CHIP_ERROR TestClearYearDayScheduleWith0UserIndex_61()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:60];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with invalid end minute Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        [cluster clearYearDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Year Day schedule with 0 user index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithStartHourLaterThatEndHour_17()
+    CHIP_ERROR TestClearYearDayScheduleWithOutOfBoundsUserIndex_62()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:19];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with start hour later that end hour Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        [cluster clearYearDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Year Day schedule with out-of-bounds user index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithStartMinuteLaterThatEndMinuteWhenHoursAreEqual_18()
+    CHIP_ERROR TestClearYearDayScheduleWithNonExistingUser_63()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:50];
-        params.endHour = [NSNumber numberWithUnsignedChar:15];
-        params.endMinute = [NSNumber numberWithUnsignedChar:49];
-        [cluster
-            setWeekDayScheduleWithParams:params
-                       completionHandler:^(NSError * _Nullable err) {
-                           NSLog(@"Create Week Day schedule with start minute later that end minute when hours are equal Error: %@",
-                               err);
+        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster clearYearDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Year Day schedule with non-existing user Error: %@", err);
 
-                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                           NextTest();
-                       }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureThatPreviousOperationsDidNotCreateASchedule_19()
+    CHIP_ERROR TestMakeSureThatWeekDayScheduleWasNotDeleted_64()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -104324,7 +102390,7 @@ class DL_Schedules : public TestCommandBridge {
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
+                                NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104339,8 +102405,33 @@ class DL_Schedules : public TestCommandBridge {
                                 }
 
                                 {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 15));
+                                }
+
+                                {
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 16));
+                                }
+
+                                {
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 18));
+                                }
+
+                                {
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 0));
                                 }
 
                                 NextTest();
@@ -104349,25 +102440,25 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetWeekDayScheduleWith0Index_20()
+    CHIP_ERROR TestMakeSureThatYearDayScheduleWasNotDeleted_65()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
+        [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Week Day schedule with 0 index Error: %@", err);
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0));
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
                                 }
 
                                 {
@@ -104377,7 +102468,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
                                 }
 
                                 NextTest();
@@ -104386,36 +102487,44 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetWeekDayScheduleWithOutOfBoundsIndex_21()
+    CHIP_ERROR TestMakeSureThatHolidayScheduleWasNotDeleted_66()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Week Day schedule with out-of-bounds index Error: %@", err);
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that holiday schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue,
-                                        [NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
                                 }
 
                                 {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
                                 {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
                                 }
 
                                 NextTest();
@@ -104424,44 +102533,45 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetWeekDayScheduleWith0UserIndex_22()
+    CHIP_ERROR TestClearHolidayScheduleWith0Index_67()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        [cluster getWeekDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Week Day schedule with 0 user index Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:0];
+        [cluster clearHolidayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Holiday schedule with 0 index Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
-                                {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
-                                }
+        return CHIP_NO_ERROR;
+    }
 
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 0U));
-                                }
+    CHIP_ERROR TestClearHolidayScheduleWithOutOfBoundsIndex_68()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
+        [cluster clearHolidayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear Holiday schedule with out-of-bounds index Error: %@", err);
 
-                                NextTest();
-                            }];
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetWeekDayScheduleWithOutOfBoundsUserIndex_23()
+    CHIP_ERROR TestMakeSureThatWeekDayScheduleWasNotDeleted_69()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -104469,11 +102579,11 @@ class DL_Schedules : public TestCommandBridge {
 
         __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Week Day schedule with out-of-bounds user index Error: %@", err);
+                                NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104484,50 +102594,37 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue(
-                                        "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                                 }
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestGetWeekDayScheduleWithNonExistingUserIndex_24()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getWeekDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Week Day schedule with non-existing user index Error: %@", err);
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 15));
+                                }
 
                                 {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 16));
                                 }
 
                                 {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 18));
                                 }
 
                                 {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 0));
                                 }
 
                                 NextTest();
@@ -104536,157 +102633,144 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateYearDayScheduleWith0Index_25()
+    CHIP_ERROR TestMakeSureThatYearDayScheduleWasNotDeleted_70()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule with 0 index Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
-    }
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
 
-    CHIP_ERROR TestCreateYearDayScheduleWithOutOfBoundsIndex_26()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule with out-of-bounds index Error: %@", err);
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
 
-    CHIP_ERROR TestCreateYearDayScheduleWith0UserIndex_27()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule with 0 user index Error: %@", err);
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateYearDayScheduleWithOutOfBoundsUserIndex_28()
+    CHIP_ERROR TestMakeSureThatHolidayScheduleWasNotDeleted_71()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule with out-of-bounds user index Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that holiday schedule was not deleted Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                NextTest();
-                            }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
+                                }
 
-    CHIP_ERROR TestCreateYearDayScheduleForNonExistingUser_29()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule for non-existing user Error: %@", err);
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateYearDayScheduleWithStartHourLaterThatEndHour_30()
+    CHIP_ERROR TestCreateAnotherWeekDayScheduleWithValidParameters_72()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345688UL];
-        [cluster setYearDayScheduleWithParams:params
+        params.daysMask = [NSNumber numberWithUnsignedChar:2];
+        params.startHour = [NSNumber numberWithUnsignedChar:0];
+        params.startMinute = [NSNumber numberWithUnsignedChar:0];
+        params.endHour = [NSNumber numberWithUnsignedChar:23];
+        params.endMinute = [NSNumber numberWithUnsignedChar:59];
+        [cluster setWeekDayScheduleWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule with start hour later that end hour Error: %@", err);
+                                NSLog(@"Create another Week Day schedule with valid parameters Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureThatPreviousOperationsDidNotCreateASchedule_31()
+    CHIP_ERROR TestVerifyCreatedWeekDaySchedule_73()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
+        [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure that previous operations did not create a schedule Error: %@", err);
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify created week day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2));
                                 }
 
                                 {
@@ -104696,44 +102780,32 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestGetYearDayScheduleWith0Index_32()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Year Day schedule with 0 index Error: %@", err);
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 2));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 0));
+                                }
 
                                 {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 0));
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 0));
                                 }
 
                                 {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 23));
                                 }
 
                                 {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 59));
                                 }
 
                                 NextTest();
@@ -104742,73 +102814,68 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetYearDayScheduleWithOutOfBoundsIndex_33()
+    CHIP_ERROR TestCreateAnotherYearDayScheduleWithValidParameters_74()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Year Day schedule with out-of-bounds index Error: %@", err);
+        params.localStartTime = [NSNumber numberWithUnsignedInt:9000UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:888888888UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create another Year Day schedule with valid parameters Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue,
-                                        [NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1));
-                                }
-
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                }
-
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
-                                }
-
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetYearDayScheduleWith0UserIndex_34()
+    CHIP_ERROR TestVerifyCreatedYearDaySchedule_75()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Year Day schedule with 0 user index Error: %@", err);
+                                NSLog(@"Verify created year day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
                                 }
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 0U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                                 }
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
                                 }
 
                                 NextTest();
@@ -104817,73 +102884,67 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetYearDayScheduleWithOutOfBoundsUserIndex_35()
+    CHIP_ERROR TestCreateAnotherHolidayScheduleWithValidParameters_76()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Year Day schedule with out-of-bounds user index Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:123456UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:1234567UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:1];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create another Holiday schedule with valid parameters Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
-                                }
-
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue(
-                                        "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
-                                }
-
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 133));
-                                }
-
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGetYearDayScheduleWithNonExistingUserIndex_36()
+    CHIP_ERROR TestVerifyCreatedHolidaySchedule_77()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getYearDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        [cluster getHolidayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Get Year Day schedule with non-existing user index Error: %@", err);
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify created holiday schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2));
                                 }
 
                                 {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
                                 {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -104892,33 +102953,28 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithValidParameters_37()
+    CHIP_ERROR TestClearASingleWeekDayScheduleForTheFirstUser_78()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:1];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:16];
-        params.endHour = [NSNumber numberWithUnsignedChar:18];
-        params.endMinute = [NSNumber numberWithUnsignedChar:0];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with valid parameters Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear a single week day schedule for the first user Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedSchedule_38()
+    CHIP_ERROR TestVerifyClearedWeekDaySchedule_79()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -104930,7 +102986,7 @@ class DL_Schedules : public TestCommandBridge {
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created schedule Error: %@", err);
+                                NSLog(@"Verify cleared week day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -104946,56 +103002,66 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
                                 }
 
-                                {
-                                    id actualValue = values.daysMask;
-                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
-                                }
+                                NextTest();
+                            }];
 
-                                {
-                                    id actualValue = values.startHour;
-                                    VerifyOrReturn(CheckValue("startHour", actualValue, 15));
-                                }
+        return CHIP_NO_ERROR;
+    }
 
-                                {
-                                    id actualValue = values.startMinute;
-                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 16));
-                                }
+    CHIP_ERROR TestClearAllRemainingWeekDaySchedulesForTheFirstUser_80()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                {
-                                    id actualValue = values.endHour;
-                                    VerifyOrReturn(CheckValue("endHour", actualValue, 18));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:254];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear all remaining week day schedules for the first user Error: %@", err);
 
-                                {
-                                    id actualValue = values.endMinute;
-                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 0));
-                                }
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateYearDayScheduleWithValidParameters_39()
+    CHIP_ERROR TestVerifyClearedWeekSchedule_81()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule with valid parameters Error: %@", err);
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify cleared week schedule Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
 
                                 NextTest();
                             }];
@@ -105003,7 +103069,7 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedSchedule_40()
+    CHIP_ERROR TestMakeSureThatFirstYearDayScheduleWasNotDeleted_82()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -105015,7 +103081,7 @@ class DL_Schedules : public TestCommandBridge {
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created schedule Error: %@", err);
+                                NSLog(@"Make sure that first year day schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105050,207 +103116,288 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearWeekDayScheduleWith0Index_41()
+    CHIP_ERROR TestMakeSureThatSecondYearDayScheduleWasNotDeleted_83()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Week Day schedule with 0 index Error: %@", err);
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that second year day schedule was not deleted Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                  NextTest();
-                              }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
+                                }
 
-    CHIP_ERROR TestClearWeekDayScheduleWithOutOfBoundsIndex_42()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Week Day schedule with out-of-bounds index Error: %@", err);
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                  NextTest();
-                              }];
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearWeekDayScheduleWith0UserIndex_43()
+    CHIP_ERROR TestMakeSureThatFirstHolidayScheduleWasNotDeleted_84()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Week Day schedule with 0 user index Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that first holiday schedule was not deleted Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                  NextTest();
-                              }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
+                                }
 
-    CHIP_ERROR TestClearWeekDayScheduleWithOutOfBoundsUserIndex_44()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Week Day schedule with out-of-bounds user index Error: %@", err);
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                }
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                  NextTest();
-                              }];
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearWeekDayScheduleWithNonExistingUser_45()
+    CHIP_ERROR TestMakeSureThatSecondHolidayScheduleWasNotDeleted_85()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Week Day schedule with non-existing user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that second holiday schedule was not deleted Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                  NextTest();
-                              }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 1));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearYearDayScheduleWith0Index_46()
+    CHIP_ERROR TestCreateAnotherWeekDayScheduleWithValidParameters_86()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearYearDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Year Day schedule with 0 index Error: %@", err);
+        params.daysMask = [NSNumber numberWithUnsignedChar:2];
+        params.startHour = [NSNumber numberWithUnsignedChar:0];
+        params.startMinute = [NSNumber numberWithUnsignedChar:0];
+        params.endHour = [NSNumber numberWithUnsignedChar:23];
+        params.endMinute = [NSNumber numberWithUnsignedChar:59];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create another Week Day schedule with valid parameters Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                  NextTest();
-                              }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearYearDayScheduleWithOutOfBoundsIndex_47()
+    CHIP_ERROR TestClearASingleYearDayScheduleForTheFirstUser_87()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params
                               completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Year Day schedule with out-of-bounds index Error: %@", err);
+                                  NSLog(@"Clear a single year day schedule for the first user Error: %@", err);
+
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                   NextTest();
                               }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearYearDayScheduleWith0UserIndex_48()
+    CHIP_ERROR TestVerifyClearedYearDaySchedule_88()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
         params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:0U];
-        [cluster clearYearDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Year Day schedule with 0 user index Error: %@", err);
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify cleared year day schedule Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
-                                  NextTest();
-                              }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearYearDayScheduleWithOutOfBoundsUserIndex_49()
+    CHIP_ERROR TestClearAllRemainingYearSchedulesForTheFirstUser_89()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:254];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster clearYearDayScheduleWithParams:params
                               completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Year Day schedule with out-of-bounds user index Error: %@", err);
+                                  NSLog(@"Clear all remaining year schedules for the first user Error: %@", err);
+
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_FIELD));
                                   NextTest();
                               }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearYearDayScheduleWithNonExistingUser_50()
+    CHIP_ERROR TestVerifyThatSecondYearDayScheduleWasCleared_90()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster clearYearDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear Year Day schedule with non-existing user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify that second year day schedule was cleared Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_NOT_FOUND));
-                                  NextTest();
-                              }];
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureThatWeekDayScheduleWasNotDeleted_51()
+    CHIP_ERROR TestVerifyCreatedWeekDaySchedule_91()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -105262,7 +103409,7 @@ class DL_Schedules : public TestCommandBridge {
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure that week day schedule was not deleted Error: %@", err);
+                                NSLog(@"Verify created week day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105283,27 +103430,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.daysMask;
-                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 2));
                                 }
 
                                 {
                                     id actualValue = values.startHour;
-                                    VerifyOrReturn(CheckValue("startHour", actualValue, 15));
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 0));
                                 }
 
                                 {
                                     id actualValue = values.startMinute;
-                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 16));
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 0));
                                 }
 
                                 {
                                     id actualValue = values.endHour;
-                                    VerifyOrReturn(CheckValue("endHour", actualValue, 18));
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 23));
                                 }
 
                                 {
                                     id actualValue = values.endMinute;
-                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 0));
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 59));
                                 }
 
                                 NextTest();
@@ -105312,70 +103459,70 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureThatYearDayScheduleWasNotDeleted_52()
+    CHIP_ERROR TestClearAllRemainingWeekDaySchedulesForTheFirstUser_92()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:254];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure that year day schedule was not deleted Error: %@", err);
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear all remaining week day schedules for the first user Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
-                                }
+                                  NextTest();
+                              }];
 
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                }
+        return CHIP_NO_ERROR;
+    }
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                                }
+    CHIP_ERROR TestCreateNewUserWithoutCredentialSoWeCanAddMoreSchedulesToIt_93()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                {
-                                    id actualValue = values.localStartTime;
-                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userName = nil;
+        params.userUniqueId = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        params.credentialRule = nil;
+        [cluster setUserWithParams:params
+                 completionHandler:^(NSError * _Nullable err) {
+                     NSLog(@"Create new user without credential so we can add more schedules to it Error: %@", err);
 
-                                {
-                                    id actualValue = values.localEndTime;
-                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
-                                }
+                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                     NextTest();
+                 }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateAnotherWeekDayScheduleWithValidParameters_53()
+    CHIP_ERROR TestCreateWeekDayScheduleWithValidParametersForFirstUser_94()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:2];
+        params.daysMask = [NSNumber numberWithUnsignedChar:1];
         params.startHour = [NSNumber numberWithUnsignedChar:0];
         params.startMinute = [NSNumber numberWithUnsignedChar:0];
         params.endHour = [NSNumber numberWithUnsignedChar:23];
         params.endMinute = [NSNumber numberWithUnsignedChar:59];
         [cluster setWeekDayScheduleWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create another Week Day schedule with valid parameters Error: %@", err);
+                                NSLog(@"Create Week Day schedule with valid parameters for first user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105385,25 +103532,25 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedWeekDaySchedule_54()
+    CHIP_ERROR TestVerifyCreatedWeekDayScheduleForFirstUser_95()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created week day schedule Error: %@", err);
+                                NSLog(@"Verify created week day schedule for first user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2));
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
                                 }
 
                                 {
@@ -105418,7 +103565,7 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.daysMask;
-                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 2));
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
                                 }
 
                                 {
@@ -105447,20 +103594,20 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateAnotherYearDayScheduleWithValidParameters_55()
+    CHIP_ERROR TestCreateYearDayScheduleForFirstUser_96()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:4];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.localStartTime = [NSNumber numberWithUnsignedInt:9000UL];
         params.localEndTime = [NSNumber numberWithUnsignedInt:888888888UL];
         [cluster setYearDayScheduleWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create another Year Day schedule with valid parameters Error: %@", err);
+                                NSLog(@"Create Year Day schedule for first user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105470,25 +103617,25 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedYearDaySchedule_56()
+    CHIP_ERROR TestVerifyCreatedYearDayScheduleForFirst_97()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:4];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created year day schedule Error: %@", err);
+                                NSLog(@"Verify created year day schedule for first Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4));
                                 }
 
                                 {
@@ -105517,123 +103664,118 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearASingleWeekDayScheduleForTheFirstUser_57()
+    CHIP_ERROR TestCreateWeekDayScheduleWithValidParametersForSecondUser_98()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear a single week day schedule for the first user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:4];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:64];
+        params.startHour = [NSNumber numberWithUnsignedChar:23];
+        params.startMinute = [NSNumber numberWithUnsignedChar:0];
+        params.endHour = [NSNumber numberWithUnsignedChar:23];
+        params.endMinute = [NSNumber numberWithUnsignedChar:59];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Week Day schedule with valid parameters for second user Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                  NextTest();
-                              }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyClearedWeekDaySchedule_58()
+    CHIP_ERROR TestVerifyCreatedWeekDayScheduleForFirstUser_99()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:4];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify cleared week day schedule Error: %@", err);
+                                NSLog(@"Verify created week day schedule for first user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4));
                                 }
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
                                 }
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
-                                NextTest();
-                            }];
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 64));
+                                }
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 23));
+                                }
 
-    CHIP_ERROR TestClearAllRemainingWeekDaySchedulesForTheFirstUser_59()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 0));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:254];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear all remaining week day schedules for the first user Error: %@", err);
+                                {
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 23));
+                                }
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 59));
+                                }
 
-                                  NextTest();
-                              }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyClearedWeekSchedule_60()
+    CHIP_ERROR TestCreateYearDayScheduleForSecondUser_100()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify cleared week schedule Error: %@", err);
+        params.localStartTime = [NSNumber numberWithUnsignedInt:55555UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:7777777UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule for second user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2));
-                                }
-
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                }
-
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
-                                }
-
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureThatFirstYearDayScheduleWasNotDeleted_61()
+    CHIP_ERROR TestVerifyCreatedYearDayScheduleForFirst_101()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -105645,7 +103787,7 @@ class DL_Schedules : public TestCommandBridge {
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure that first year day schedule was not deleted Error: %@", err);
+                                NSLog(@"Verify created year day schedule for first Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -105666,12 +103808,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.localStartTime;
-                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 55555UL));
                                 }
 
                                 {
                                     id actualValue = values.localEndTime;
-                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 7777777UL));
                                 }
 
                                 NextTest();
@@ -105680,119 +103822,82 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureThatSecondYearDayScheduleWasNotDeleted_62()
+    CHIP_ERROR TestCleanupTheUser_102()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure that second year day schedule was not deleted Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
-                                }
-
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                }
-
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                                }
-
-                                {
-                                    id actualValue = values.localStartTime;
-                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:65534U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Cleanup the user Error: %@", err);
 
-                                {
-                                    id actualValue = values.localEndTime;
-                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
-                                }
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                       NextTest();
+                   }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateAnotherWeekDayScheduleWithValidParameters_63()
+    CHIP_ERROR TestMakeSureClearingFirstUserAlsoClearedWeekDaySchedules_103()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
         params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:2];
-        params.startHour = [NSNumber numberWithUnsignedChar:0];
-        params.startMinute = [NSNumber numberWithUnsignedChar:0];
-        params.endHour = [NSNumber numberWithUnsignedChar:23];
-        params.endMinute = [NSNumber numberWithUnsignedChar:59];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create another Week Day schedule with valid parameters Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                NextTest();
-                            }];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure clearing first user also cleared week day schedules Error: %@", err);
 
-        return CHIP_NO_ERROR;
-    }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-    CHIP_ERROR TestClearASingleYearDayScheduleForTheFirstUser_64()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                }
 
-        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearYearDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear a single year day schedule for the first user Error: %@", err);
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
 
-                                  NextTest();
-                              }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyClearedYearDaySchedule_65()
+    CHIP_ERROR TestMakeSureClearingFirstUserAlsoClearedYearDaySchedules_104()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:4];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify cleared year day schedule Error: %@", err);
+                                NSLog(@"Make sure clearing first user also cleared year day schedules Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4));
                                 }
 
                                 {
@@ -105811,51 +103916,67 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearAllRemainingYearSchedulesForTheFirstUser_66()
+    CHIP_ERROR TestMakeSureClearingSecondUserAlsoClearedWeekDaySchedules_105()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:254];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearYearDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear all remaining year schedules for the first user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:4];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure clearing second user also cleared week day schedules Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                  NextTest();
-                              }];
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyThatSecondYearDayScheduleWasCleared_67()
+    CHIP_ERROR TestMakeSureClearingSecondUserAlsoClearedYearDaySchedules_106()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify that second year day schedule was cleared Error: %@", err);
+                                NSLog(@"Make sure clearing second user also cleared year day schedules Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1));
                                 }
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
                                 }
 
                                 {
@@ -105869,60 +103990,90 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedWeekDaySchedule_68()
+    CHIP_ERROR TestMakeSureThatFirstHolidayScheduleWasNotDeleted_107()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created week day schedule Error: %@", err);
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that first holiday schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
                                 }
 
                                 {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
                                 {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
                                 }
 
                                 {
-                                    id actualValue = values.daysMask;
-                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 2));
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
                                 }
 
                                 {
-                                    id actualValue = values.startHour;
-                                    VerifyOrReturn(CheckValue("startHour", actualValue, 0));
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestMakeSureThatSecondHolidayScheduleWasNotDeleted_108()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that second holiday schedule was not deleted Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2));
                                 }
 
                                 {
-                                    id actualValue = values.startMinute;
-                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 0));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
                                 {
-                                    id actualValue = values.endHour;
-                                    VerifyOrReturn(CheckValue("endHour", actualValue, 23));
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL));
                                 }
 
                                 {
-                                    id actualValue = values.endMinute;
-                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 59));
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 1));
                                 }
 
                                 NextTest();
@@ -105931,54 +104082,122 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearAllRemainingWeekDaySchedulesForTheFirstUser_69()
+    CHIP_ERROR TestCreateAnotherHolidayScheduleAtTheLastSlot_109()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:254];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear all remaining week day schedules for the first user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NumberOfHolidaySchedulesSupported copy];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:1UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:100UL];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:4];
+        [cluster setHolidayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create another Holiday schedule at the last slot Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                  NextTest();
-                              }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewUserWithoutCredentialSoWeCanAddMoreSchedulesToIt_70()
+    CHIP_ERROR TestVerifyCreatedHolidaySchedule_110()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NumberOfHolidaySchedulesSupported copy];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Verify Created Holiday Schedule Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 1UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 100UL));
+                                }
+
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 4));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestCreateNewPinCredentialAndScheduleUser_111()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        params.userName = nil;
-        params.userUniqueId = nil;
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = nil;
         params.userStatus = nil;
         params.userType = nil;
-        params.credentialRule = nil;
-        [cluster setUserWithParams:params
-                 completionHandler:^(NSError * _Nullable err) {
-                     NSLog(@"Create new user without credential so we can add more schedules to it Error: %@", err);
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential and schedule user Error: %@", err);
 
-                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                     NextTest();
-                 }];
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                      }
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateWeekDayScheduleWithValidParametersForFirstUser_71()
+    CHIP_ERROR TestCreateWeekDayScheduleForFirstUser_112()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -105994,7 +104213,7 @@ class DL_Schedules : public TestCommandBridge {
         params.endMinute = [NSNumber numberWithUnsignedChar:59];
         [cluster setWeekDayScheduleWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with valid parameters for first user Error: %@", err);
+                                NSLog(@"Create Week Day schedule for first user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106004,60 +104223,87 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedWeekDayScheduleForFirstUser_72()
+    CHIP_ERROR TestCreateYearDayScheduleForFirstUser_113()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created week day schedule for first user Error: %@", err);
+        params.localStartTime = [NSNumber numberWithUnsignedInt:9000UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:888888888UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Create Year Day schedule for first user Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
-                                }
+                                NextTest();
+                            }];
 
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                                }
+        return CHIP_NO_ERROR;
+    }
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                                }
+    CHIP_ERROR TestClearASingleHolidaySchedule_114()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        [cluster clearHolidayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear a single holiday schedule Error: %@", err);
+
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                  NextTest();
+                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestMakeSureThatFirstHolidayScheduleWasNotDeleted_115()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that first holiday schedule was not deleted Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.daysMask;
-                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
                                 }
 
                                 {
-                                    id actualValue = values.startHour;
-                                    VerifyOrReturn(CheckValue("startHour", actualValue, 0));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
                                 }
 
                                 {
-                                    id actualValue = values.startMinute;
-                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 0));
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
                                 }
 
                                 {
-                                    id actualValue = values.endHour;
-                                    VerifyOrReturn(CheckValue("endHour", actualValue, 23));
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
                                 }
 
                                 {
-                                    id actualValue = values.endMinute;
-                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 59));
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 0));
                                 }
 
                                 NextTest();
@@ -106066,53 +104312,55 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateYearDayScheduleForFirstUser_73()
+    CHIP_ERROR TestMakeSureThatSecondHolidayScheduleWasDeleted_116()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:4];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:9000UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:888888888UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule for first user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that second holiday schedule was deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
                                 NextTest();
                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedYearDayScheduleForFirst_74()
+    CHIP_ERROR TestMakeSureThatThirdHolidayScheduleWasNotDeleted_117()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:4];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NumberOfHolidaySchedulesSupported copy];
+        [cluster getHolidayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created year day schedule for first Error: %@", err);
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4));
-                                }
-
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
                                 }
 
                                 {
@@ -106122,39 +104370,18 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.localStartTime;
-                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 1UL));
                                 }
 
                                 {
                                     id actualValue = values.localEndTime;
-                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 100UL));
                                 }
 
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestCreateWeekDayScheduleWithValidParametersForSecondUser_75()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:4];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:64];
-        params.startHour = [NSNumber numberWithUnsignedChar:23];
-        params.startMinute = [NSNumber numberWithUnsignedChar:0];
-        params.endHour = [NSNumber numberWithUnsignedChar:23];
-        params.endMinute = [NSNumber numberWithUnsignedChar:59];
-        [cluster setWeekDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Week Day schedule with valid parameters for second user Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                {
+                                    id actualValue = values.operatingMode;
+                                    VerifyOrReturn(CheckValue("operatingMode", actualValue, 4));
+                                }
 
                                 NextTest();
                             }];
@@ -106162,30 +104389,30 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyCreatedWeekDayScheduleForFirstUser_76()
+    CHIP_ERROR TestMakeSureClearingHolidayScheduleDidNotClearWeekDaySchedule_118()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:4];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created week day schedule for first user Error: %@", err);
+                                NSLog(@"Make sure clearing holiday schedule did not clear week day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4));
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
                                 }
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                                 }
 
                                 {
@@ -106195,12 +104422,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.daysMask;
-                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 64));
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
                                 }
 
                                 {
                                     id actualValue = values.startHour;
-                                    VerifyOrReturn(CheckValue("startHour", actualValue, 23));
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 0));
                                 }
 
                                 {
@@ -106224,30 +104451,7 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateYearDayScheduleForSecondUser_77()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:55555UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:7777777UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Create Year Day schedule for second user Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                NextTest();
-                            }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestVerifyCreatedYearDayScheduleForFirst_78()
+    CHIP_ERROR TestMakeSureClearingHolidayScheduleDidNotClearYearDaySchedule_119()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -106259,7 +104463,7 @@ class DL_Schedules : public TestCommandBridge {
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Verify created year day schedule for first Error: %@", err);
+                                NSLog(@"Make sure clearing holiday schedule did not clear year day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106280,12 +104484,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.localStartTime;
-                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 55555UL));
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
                                 }
 
                                 {
                                     id actualValue = values.localEndTime;
-                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 7777777UL));
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
                                 }
 
                                 NextTest();
@@ -106294,50 +104498,44 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCleanup_79()
+    CHIP_ERROR TestClearAllRemainingHolidaySchedules_120()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
-        params.userIndex = [NSNumber numberWithUnsignedShort:65534U];
-        [cluster clearUserWithParams:params
-                   completionHandler:^(NSError * _Nullable err) {
-                       NSLog(@"Cleanup Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:254];
+        [cluster clearHolidayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear all remaining holiday schedules Error: %@", err);
 
-                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                       NextTest();
-                   }];
+                                  NextTest();
+                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureClearingFirstUserAlsoClearedWeekDaySchedules_80()
+    CHIP_ERROR TestMakeSureThatFirstHolidayIsStillDeleted_121()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:1];
+        [cluster getHolidayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure clearing first user also cleared week day schedules Error: %@", err);
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that first holiday is still deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
-                                }
-
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1));
                                 }
 
                                 {
@@ -106351,30 +104549,55 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureClearingFirstUserAlsoClearedYearDaySchedules_81()
+    CHIP_ERROR TestMakeSureThatSecondHolidayScheduleWasDeleted_122()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:4];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:2];
+        [cluster getHolidayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure clearing first user also cleared year day schedules Error: %@", err);
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that second holiday schedule was deleted Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4));
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2));
                                 }
 
                                 {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestMakeSureThatThirdHolidayScheduleWasNotDeleted_123()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.holidayIndex = [NumberOfHolidaySchedulesSupported copy];
+        [cluster getHolidayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.holidayIndex;
+                                    VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
                                 }
 
                                 {
@@ -106388,35 +104611,60 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureClearingSecondUserAlsoClearedWeekDaySchedules_82()
+    CHIP_ERROR TestMakeSureClearingHolidayScheduleDidNotClearWeekDaySchedule_124()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:4];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getWeekDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure clearing second user also cleared week day schedules Error: %@", err);
+                                NSLog(@"Make sure clearing holiday schedule did not clear week day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
                                     id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4));
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1));
                                 }
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                                 }
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.daysMask;
+                                    VerifyOrReturn(CheckValue("daysMask", actualValue, 1));
+                                }
+
+                                {
+                                    id actualValue = values.startHour;
+                                    VerifyOrReturn(CheckValue("startHour", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.startMinute;
+                                    VerifyOrReturn(CheckValue("startMinute", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.endHour;
+                                    VerifyOrReturn(CheckValue("endHour", actualValue, 23));
+                                }
+
+                                {
+                                    id actualValue = values.endMinute;
+                                    VerifyOrReturn(CheckValue("endMinute", actualValue, 59));
                                 }
 
                                 NextTest();
@@ -106425,7 +104673,7 @@ class DL_Schedules : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestMakeSureClearingSecondUserAlsoClearedYearDaySchedules_83()
+    CHIP_ERROR TestMakeSureClearingHolidayScheduleDidNotClearYearDaySchedule_125()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -106433,11 +104681,11 @@ class DL_Schedules : public TestCommandBridge {
 
         __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
         params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
                                 CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"Make sure clearing second user also cleared year day schedules Error: %@", err);
+                                NSLog(@"Make sure clearing holiday schedule did not clear year day schedule Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -106448,12 +104696,22 @@ class DL_Schedules : public TestCommandBridge {
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
                                 }
 
                                 {
                                     id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
                                 }
 
                                 NextTest();
@@ -106461,6 +104719,26 @@ class DL_Schedules : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR TestFinalCleanup_126()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.userIndex = [NSNumber numberWithUnsignedShort:65534U];
+        [cluster clearUserWithParams:params
+                   completionHandler:^(NSError * _Nullable err) {
+                       NSLog(@"Final Cleanup Error: %@", err);
+
+                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                       NextTest();
+                   }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 class Test_TC_DL_2_2 : public TestCommandBridge {
@@ -107564,48 +105842,560 @@ class Test_TC_DL_2_4 : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("AutoRelockTime", actualValue, 10UL));
             }
 
-            NextTest();
-        }];
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWait5000ms_6()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
+        value.ms = 5000UL;
+        return WaitForMs("alpha", value);
+    }
+
+    CHIP_ERROR TestThReadsLockStateAttribute_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"TH reads LockState attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
+                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+class Test_TC_DL_2_5 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_DL_2_5()
+        : TestCommandBridge("Test_TC_DL_2_5")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_DL_2_5() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DL_2_5\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DL_2_5\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        case 0:
+            ChipLogProgress(chipTool, " ***** Test Step 0 : Wait for the commissioned device to be retrieved\n");
+            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
+            break;
+        case 1:
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Create new PIN credential and lock/unlock user\n");
+            err = TestCreateNewPinCredentialAndLockUnlockUser_1();
+            break;
+        case 2:
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Get Max number of Week Day schedules for user\n");
+            err = TestGetMaxNumberOfWeekDaySchedulesForUser_2();
+            break;
+        case 3:
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Get number of supported users\n");
+            err = TestGetNumberOfSupportedUsers_3();
+            break;
+        case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Set Week Day Schedule Command to DUT\n");
+            err = TestSendSetWeekDayScheduleCommandToDut_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : send GetWeekDay Schedule Command \n");
+            err = TestSendGetWeekDayScheduleCommand_5();
+            break;
+        case 6:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 6 : Send Set Week Day Schedule Command to DUT and verify INVALID_COMMAND response\n");
+            err = TestSendSetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_6();
+            break;
+        case 7:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : send GetWeekDay Schedule Command to DUT and verify INVALID_COMMAND response\n");
+            err = TestSendGetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Clear all week day schedules for the first user\n");
+            err = TestClearAllWeekDaySchedulesForTheFirstUser_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : send GetWeekDay Schedule Command \n");
+            err = TestSendGetWeekDayScheduleCommand_9();
+            break;
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 1:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 2:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 10;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+
+    CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockUser_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential and lock/unlock user Error: %@", err);
+
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                      }
+
+                      NextTest();
+                  }];
+
+        return CHIP_NO_ERROR;
+    }
+    NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUser;
+
+    CHIP_ERROR TestGetMaxNumberOfWeekDaySchedulesForUser_2()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Get Max number of Week Day schedules for user Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("NumberOfWeekDaySchedulesSupportedPerUser", actualValue, 10));
+            }
+            {
+                NumberOfWeekDaySchedulesSupportedPerUser = value;
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+    NSNumber * _Nonnull NumberOfTotalUsersSupported;
+
+    CHIP_ERROR TestGetNumberOfSupportedUsers_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"Get number of supported users Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
+                }
+                {
+                    NumberOfTotalUsersSupported = value;
+                }
+
+                NextTest();
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendSetWeekDayScheduleCommandToDut_4()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:2];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:45];
+        params.endHour = [NSNumber numberWithUnsignedChar:16];
+        params.endMinute = [NSNumber numberWithUnsignedChar:55];
+        [cluster setWeekDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Send Set Week Day Schedule Command to DUT Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendGetWeekDayScheduleCommand_5()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster
+            getWeekDayScheduleWithParams:params
+                       completionHandler:^(
+                           CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                           NSLog(@"send GetWeekDay Schedule Command  Error: %@", err);
+
+                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                           VerifyOrReturn(
+                               CheckConstraintMinValue<uint8_t>("weekDayIndex", [values.weekDayIndex unsignedCharValue], 1));
+
+                           VerifyOrReturn(
+                               CheckConstraintMinValue<uint16_t>("userIndex", [values.userIndex unsignedShortValue], 1U));
+
+                           {
+                               id actualValue = values.status;
+                               VerifyOrReturn(CheckValue("status", actualValue, 0));
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, true));
+                           if (values.daysMask != nil) {
+
+                               VerifyOrReturn(CheckConstraintMinValue<uint8_t>("daysMask", [values.daysMask unsignedCharValue], 0));
+                               VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("daysMask", [values.daysMask unsignedCharValue], 6));
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("startHour", values.startHour, true));
+                           if (values.startHour != nil) {
+
+                               VerifyOrReturn(
+                                   CheckConstraintMinValue<uint8_t>("startHour", [values.startHour unsignedCharValue], 0));
+                               VerifyOrReturn(
+                                   CheckConstraintMaxValue<uint8_t>("startHour", [values.startHour unsignedCharValue], 23));
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("startMinute", values.startMinute, true));
+                           if (values.startMinute != nil) {
+
+                               VerifyOrReturn(
+                                   CheckConstraintMinValue<uint8_t>("startMinute", [values.startMinute unsignedCharValue], 0));
+                               VerifyOrReturn(
+                                   CheckConstraintMaxValue<uint8_t>("startMinute", [values.startMinute unsignedCharValue], 59));
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("endHour", values.endHour, true));
+                           if (values.endHour != nil) {
+
+                               VerifyOrReturn(CheckConstraintMinValue<uint8_t>("endHour", [values.endHour unsignedCharValue], 0));
+                               VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("endHour", [values.endHour unsignedCharValue], 23));
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("endMinute", values.endMinute, true));
+                           if (values.endMinute != nil) {
+
+                               VerifyOrReturn(
+                                   CheckConstraintMinValue<uint8_t>("endMinute", [values.endMinute unsignedCharValue], 0));
+                               VerifyOrReturn(
+                                   CheckConstraintMaxValue<uint8_t>("endMinute", [values.endMinute unsignedCharValue], 59));
+                           }
+
+                           NextTest();
+                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendSetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_6()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.daysMask = [NSNumber numberWithUnsignedChar:7];
+        params.startHour = [NSNumber numberWithUnsignedChar:15];
+        params.startMinute = [NSNumber numberWithUnsignedChar:45];
+        params.endHour = [NSNumber numberWithUnsignedChar:16];
+        params.endMinute = [NSNumber numberWithUnsignedChar:55];
+        [cluster
+            setWeekDayScheduleWithParams:params
+                       completionHandler:^(NSError * _Nullable err) {
+                           NSLog(@"Send Set Week Day Schedule Command to DUT and verify INVALID_COMMAND response Error: %@", err);
+
+                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                           NextTest();
+                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendGetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster
+            getWeekDayScheduleWithParams:params
+                       completionHandler:^(
+                           CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                           NSLog(@"send GetWeekDay Schedule Command to DUT and verify INVALID_COMMAND response Error: %@", err);
+
+                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                           {
+                               id actualValue = values.weekDayIndex;
+                               VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0));
+                           }
+
+                           {
+                               id actualValue = values.userIndex;
+                               VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                           }
+
+                           {
+                               id actualValue = values.status;
+                               VerifyOrReturn(CheckValue("status", actualValue, 133));
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, false));
+                           if (values.daysMask != nil) {
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("startHour", values.startHour, false));
+                           if (values.startHour != nil) {
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("startMinute", values.startMinute, false));
+                           if (values.startMinute != nil) {
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("endHour", values.endHour, false));
+                           if (values.endHour != nil) {
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("endMinute", values.endMinute, false));
+                           if (values.endMinute != nil) {
+                           }
+
+                           NextTest();
+                       }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestClearAllWeekDaySchedulesForTheFirstUser_8()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:254];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster clearWeekDayScheduleWithParams:params
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Clear all week day schedules for the first user Error: %@", err);
+
+                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                  NextTest();
+                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendGetWeekDayScheduleCommand_9()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        [cluster getWeekDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"send GetWeekDay Schedule Command  Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.weekDayIndex;
+                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                }
 
-        return CHIP_NO_ERROR;
-    }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
 
-    CHIP_ERROR TestWait5000ms_6()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 5000UL;
-        return WaitForMs("alpha", value);
-    }
+                                VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, false));
+                                if (values.daysMask != nil) {
+                                }
 
-    CHIP_ERROR TestThReadsLockStateAttribute_7()
-    {
-        CHIPDevice * device = GetDevice("alpha");
-        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+                                VerifyOrReturn(CheckConstraintHasValue("startHour", values.startHour, false));
+                                if (values.startHour != nil) {
+                                }
 
-        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads LockState attribute Error: %@", err);
+                                VerifyOrReturn(CheckConstraintHasValue("startMinute", values.startMinute, false));
+                                if (values.startMinute != nil) {
+                                }
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckConstraintHasValue("endHour", values.endHour, false));
+                                if (values.endHour != nil) {
+                                }
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("LockState", actualValue));
-                VerifyOrReturn(CheckValue("LockState", actualValue, 1));
-            }
+                                VerifyOrReturn(CheckConstraintHasValue("endMinute", values.endMinute, false));
+                                if (values.endMinute != nil) {
+                                }
 
-            NextTest();
-        }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 };
 
-class Test_TC_DL_2_8 : public TestCommandBridge {
+class Test_TC_DL_2_7 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DL_2_8()
-        : TestCommandBridge("Test_TC_DL_2_8")
+    Test_TC_DL_2_7()
+        : TestCommandBridge("Test_TC_DL_2_7")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -107615,7 +106405,7 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DL_2_8() {}
+    ~Test_TC_DL_2_7() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -107623,11 +106413,11 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DL_2_8\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DL_2_7\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DL_2_8\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DL_2_7\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -107648,38 +106438,52 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
             err = TestCreateNewPinCredentialAndLockUnlockUser_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Get Max number of Week Day schedules for user\n");
-            err = TestGetMaxNumberOfWeekDaySchedulesForUser_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Create new PIN credential and lock/unlock for second user\n");
+            err = TestCreateNewPinCredentialAndLockUnlockForSecondUser_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Get number of supported users\n");
-            err = TestGetNumberOfSupportedUsers_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Get Max number of year Day schedules for user\n");
+            err = TestGetMaxNumberOfYearDaySchedulesForUser_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Send Set Week Day Schedule Command to DUT\n");
-            err = TestSendSetWeekDayScheduleCommandToDut_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Get number of supported users\n");
+            err = TestGetNumberOfSupportedUsers_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : send GetWeekDay Schedule Command \n");
-            err = TestSendGetWeekDayScheduleCommand_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Send Set Year Day Schedule Command to DUT\n");
+            err = TestSendSetYearDayScheduleCommandToDut_5();
             break;
         case 6:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 6 : Send Set Week Day Schedule Command to DUT and verify INVALID_COMMAND response\n");
-            err = TestSendSetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : send Get Year Day Schedule Command\n");
+            err = TestSendGetYearDayScheduleCommand_6();
             break;
         case 7:
             ChipLogProgress(
-                chipTool, " ***** Test Step 7 : send GetWeekDay Schedule Command to DUT and verify INVALID_COMMAND response\n");
-            err = TestSendGetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7();
+                chipTool, " ***** Test Step 7 : Send Set Year Day Schedule Command to DUT and verify INVALID_COMMAND response\n");
+            err = TestSendSetYearDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Clear all week day schedules for the first user\n");
-            err = TestClearAllWeekDaySchedulesForTheFirstUser_8();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : send Get Year Day Schedule Command to DUT and Verify INVALID_FIELD response\n");
+            err = TestSendGetYearDayScheduleCommandToDutAndVerifyInvalidFieldResponse_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : send GetWeekDay Schedule Command \n");
-            err = TestSendGetWeekDayScheduleCommand_9();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : send Get Year Day Schedule Command to DUT and verify NOT_FOUND response\n");
+            err = TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_9();
+            break;
+        case 10:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 10 : send Get Year Day Schedule Command  to DUT and verify NOT_FOUND response \n");
+            err = TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_10();
+            break;
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Send Set Year Day Schedule Command to DUT\n");
+            err = TestSendSetYearDayScheduleCommandToDut_11();
+            break;
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : send Get Year Day Schedule Command \n");
+            err = TestSendGetYearDayScheduleCommand_12();
             break;
         }
 
@@ -107711,10 +106515,10 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 6:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -107722,6 +106526,15 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 10:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 11:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -107735,7 +106548,7 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 10;
+    const uint16_t mTestCount = 13;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -107794,26 +106607,72 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUser;
 
-    CHIP_ERROR TestGetMaxNumberOfWeekDaySchedulesForUser_2()
+    CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockForSecondUser_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:^(
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123457" length:6];
+        params.userIndex = nil;
+        params.userStatus = nil;
+        params.userType = nil;
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"Create new PIN credential and lock/unlock for second user Error: %@", err);
+
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      {
+                          id actualValue = values.status;
+                          VerifyOrReturn(CheckValue("status", actualValue, 0));
+                      }
+
+                      {
+                          id actualValue = values.userIndex;
+                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
+                          VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                      }
+
+                      {
+                          id actualValue = values.nextCredentialIndex;
+                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
+                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                      }
+
+                      NextTest();
+                  }];
+
+        return CHIP_NO_ERROR;
+    }
+    NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUser;
+
+    CHIP_ERROR TestGetMaxNumberOfYearDaySchedulesForUser_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of Week Day schedules for user Error: %@", err);
+            NSLog(@"Get Max number of year Day schedules for user Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("NumberOfWeekDaySchedulesSupportedPerUser", actualValue, 10));
+                VerifyOrReturn(CheckValue("NumberOfYearDaySchedulesSupportedPerUser", actualValue, 10));
             }
             {
-                NumberOfWeekDaySchedulesSupportedPerUser = value;
+                NumberOfYearDaySchedulesSupportedPerUser = value;
             }
 
             NextTest();
@@ -107823,7 +106682,7 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
     }
     NSNumber * _Nonnull NumberOfTotalUsersSupported;
 
-    CHIP_ERROR TestGetNumberOfSupportedUsers_3()
+    CHIP_ERROR TestGetNumberOfSupportedUsers_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -107849,23 +106708,20 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetWeekDayScheduleCommandToDut_4()
+    CHIP_ERROR TestSendSetYearDayScheduleCommandToDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:2];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:45];
-        params.endHour = [NSNumber numberWithUnsignedChar:16];
-        params.endMinute = [NSNumber numberWithUnsignedChar:55];
-        [cluster setWeekDayScheduleWithParams:params
+        params.localStartTime = [NSNumber numberWithUnsignedInt:10UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:20UL];
+        [cluster setYearDayScheduleWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Send Set Week Day Schedule Command to DUT Error: %@", err);
+                                NSLog(@"Send Set Year Day Schedule Command to DUT Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -107875,103 +106731,66 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetWeekDayScheduleCommand_5()
+    CHIP_ERROR TestSendGetYearDayScheduleCommand_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:1];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster
-            getWeekDayScheduleWithParams:params
-                       completionHandler:^(
-                           CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                           NSLog(@"send GetWeekDay Schedule Command  Error: %@", err);
-
-                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"send Get Year Day Schedule Command Error: %@", err);
 
-                           if (values.weekDayIndex != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMinValue<uint8_t>("weekDayIndex", [values.weekDayIndex unsignedCharValue], 1));
-                           }
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                           if (values.userIndex != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMinValue<uint16_t>("userIndex", [values.userIndex unsignedShortValue], 1U));
-                           }
+                                VerifyOrReturn(
+                                    CheckConstraintMinValue<uint8_t>("yearDayIndex", [values.yearDayIndex unsignedCharValue], 1));
 
-                           {
-                               id actualValue = values.status;
-                               VerifyOrReturn(CheckValue("status", actualValue, 0));
-                           }
+                                VerifyOrReturn(
+                                    CheckConstraintMinValue<uint16_t>("userIndex", [values.userIndex unsignedShortValue], 1U));
 
-                           if (values.daysMask != nil) {
-                               VerifyOrReturn(CheckConstraintMinValue<uint8_t>("daysMask", [values.daysMask unsignedCharValue], 0));
-                           }
-                           if (values.daysMask != nil) {
-                               VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("daysMask", [values.daysMask unsignedCharValue], 6));
-                           }
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
 
-                           if (values.startHour != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMinValue<uint8_t>("startHour", [values.startHour unsignedCharValue], 0));
-                           }
-                           if (values.startHour != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMaxValue<uint8_t>("startHour", [values.startHour unsignedCharValue], 23));
-                           }
+                                VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, true));
+                                if (values.localStartTime != nil) {
 
-                           if (values.startMinute != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMinValue<uint8_t>("startMinute", [values.startMinute unsignedCharValue], 0));
-                           }
-                           if (values.startMinute != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMaxValue<uint8_t>("startMinute", [values.startMinute unsignedCharValue], 59));
-                           }
+                                    VerifyOrReturn(CheckConstraintType("localStartTime", "", "epoch-s"));
+                                }
 
-                           if (values.endHour != nil) {
-                               VerifyOrReturn(CheckConstraintMinValue<uint8_t>("endHour", [values.endHour unsignedCharValue], 0));
-                           }
-                           if (values.endHour != nil) {
-                               VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("endHour", [values.endHour unsignedCharValue], 23));
-                           }
+                                VerifyOrReturn(CheckConstraintHasValue("localEndTime", values.localEndTime, true));
+                                if (values.localEndTime != nil) {
 
-                           if (values.endMinute != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMinValue<uint8_t>("endMinute", [values.endMinute unsignedCharValue], 0));
-                           }
-                           if (values.endMinute != nil) {
-                               VerifyOrReturn(
-                                   CheckConstraintMaxValue<uint8_t>("endMinute", [values.endMinute unsignedCharValue], 59));
-                           }
+                                    VerifyOrReturn(CheckConstraintType("localEndTime", "", "epoch-s"));
+                                }
 
-                           NextTest();
-                       }];
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_6()
+    CHIP_ERROR TestSendSetYearDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.daysMask = [NSNumber numberWithUnsignedChar:7];
-        params.startHour = [NSNumber numberWithUnsignedChar:15];
-        params.startMinute = [NSNumber numberWithUnsignedChar:45];
-        params.endHour = [NSNumber numberWithUnsignedChar:16];
-        params.endMinute = [NSNumber numberWithUnsignedChar:55];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
+        params.userIndex = [NSNumber numberWithUnsignedShort:10U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:30UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:10UL];
         [cluster
-            setWeekDayScheduleWithParams:params
+            setYearDayScheduleWithParams:params
                        completionHandler:^(NSError * _Nullable err) {
-                           NSLog(@"Send Set Week Day Schedule Command to DUT and verify INVALID_COMMAND response Error: %@", err);
+                           NSLog(@"Send Set Year Day Schedule Command to DUT and verify INVALID_COMMAND response Error: %@", err);
 
                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
                            NextTest();
@@ -107980,31 +106799,31 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetWeekDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7()
+    CHIP_ERROR TestSendGetYearDayScheduleCommandToDutAndVerifyInvalidFieldResponse_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:21U];
         [cluster
-            getWeekDayScheduleWithParams:params
+            getYearDayScheduleWithParams:params
                        completionHandler:^(
-                           CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                           NSLog(@"send GetWeekDay Schedule Command to DUT and verify INVALID_COMMAND response Error: %@", err);
+                           CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                           NSLog(@"send Get Year Day Schedule Command to DUT and Verify INVALID_FIELD response Error: %@", err);
 
                            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                            {
-                               id actualValue = values.weekDayIndex;
-                               VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0));
+                               id actualValue = values.yearDayIndex;
+                               VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
                            }
 
                            {
                                id actualValue = values.userIndex;
-                               VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                               VerifyOrReturn(CheckValue("userIndex", actualValue, 21U));
                            }
 
                            {
@@ -108012,57 +106831,89 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
                                VerifyOrReturn(CheckValue("status", actualValue, 133));
                            }
 
+                           VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false));
+                           if (values.localStartTime != nil) {
+                           }
+
+                           VerifyOrReturn(CheckConstraintHasValue("localEndTime", values.localEndTime, false));
+                           if (values.localEndTime != nil) {
+                           }
+
                            NextTest();
                        }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestClearAllWeekDaySchedulesForTheFirstUser_8()
+    CHIP_ERROR TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_9()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:254];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster clearWeekDayScheduleWithParams:params
-                              completionHandler:^(NSError * _Nullable err) {
-                                  NSLog(@"Clear all week day schedules for the first user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:10];
+        params.userIndex = [NSNumber numberWithUnsignedShort:5U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"send Get Year Day Schedule Command to DUT and verify NOT_FOUND response Error: %@", err);
 
-                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                  NextTest();
-                              }];
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 10));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 5U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
+                                }
+
+                                VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false));
+                                if (values.localStartTime != nil) {
+                                }
+
+                                VerifyOrReturn(CheckConstraintHasValue("localEndTime", values.localEndTime, false));
+                                if (values.localEndTime != nil) {
+                                }
+
+                                NextTest();
+                            }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetWeekDayScheduleCommand_9()
+    CHIP_ERROR TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getWeekDayScheduleWithParams:params
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getYearDayScheduleWithParams:params
                             completionHandler:^(
-                                CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"send GetWeekDay Schedule Command  Error: %@", err);
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"send Get Year Day Schedule Command  to DUT and verify NOT_FOUND response  Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                 {
-                                    id actualValue = values.weekDayIndex;
-                                    VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2));
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
                                 }
 
                                 {
                                     id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
                                 }
 
                                 {
@@ -108070,6 +106921,84 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
                                     VerifyOrReturn(CheckValue("status", actualValue, 139));
                                 }
 
+                                VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false));
+                                if (values.localStartTime != nil) {
+                                }
+
+                                VerifyOrReturn(CheckConstraintHasValue("localEndTime", values.localEndTime, false));
+                                if (values.localEndTime != nil) {
+                                }
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendSetYearDayScheduleCommandToDut_11()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:10UL];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:20UL];
+        [cluster setYearDayScheduleWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Send Set Year Day Schedule Command to DUT Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendGetYearDayScheduleCommand_12()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        [cluster getYearDayScheduleWithParams:params
+                            completionHandler:^(
+                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
+                                NSLog(@"send Get Year Day Schedule Command  Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                {
+                                    id actualValue = values.yearDayIndex;
+                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
+                                }
+
+                                {
+                                    id actualValue = values.userIndex;
+                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                }
+
+                                {
+                                    id actualValue = values.status;
+                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
+                                }
+
+                                {
+                                    id actualValue = values.localStartTime;
+                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 10UL));
+                                }
+
+                                {
+                                    id actualValue = values.localEndTime;
+                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 20UL));
+                                }
+
                                 NextTest();
                             }];
 
@@ -108077,11 +107006,11 @@ class Test_TC_DL_2_8 : public TestCommandBridge {
     }
 };
 
-class Test_TC_DL_2_11 : public TestCommandBridge {
+class Test_TC_DL_2_9 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_DL_2_11()
-        : TestCommandBridge("Test_TC_DL_2_11")
+    Test_TC_DL_2_9()
+        : TestCommandBridge("Test_TC_DL_2_9")
         , mTestIndex(0)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
@@ -108091,7 +107020,7 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_DL_2_11() {}
+    ~Test_TC_DL_2_9() {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -108099,11 +107028,11 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DL_2_11\n");
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_DL_2_9\n");
         }
 
         if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DL_2_11\n");
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DL_2_9\n");
             SetCommandExitStatus(CHIP_NO_ERROR);
             return;
         }
@@ -108120,56 +107049,69 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Create new PIN credential and lock/unlock user\n");
-            err = TestCreateNewPinCredentialAndLockUnlockUser_1();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 1 : TH reads NumberOfTotalUsersSupported attribute and saves for future use.\n");
+            err = TestThReadsNumberOfTotalUsersSupportedAttributeAndSavesForFutureUse_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Create new PIN credential and lock/unlock for second user\n");
-            err = TestCreateNewPinCredentialAndLockUnlockForSecondUser_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Get Max number of year Day schedules for user\n");
-            err = TestGetMaxNumberOfYearDaySchedulesForUser_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends Get Credential Status Command\n");
+            err = TestThSendsGetCredentialStatusCommand_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Get number of supported users\n");
-            err = TestGetNumberOfSupportedUsers_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Send Set Year Day Schedule Command to DUT\n");
-            err = TestSendSetYearDayScheduleCommandToDut_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : send Get Year Day Schedule Command\n");
-            err = TestSendGetYearDayScheduleCommand_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_6();
             break;
         case 7:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 7 : Send Set Year Day Schedule Command to DUT and verify INVALID_COMMAND response\n");
-            err = TestSendSetYearDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7();
+            ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_7();
             break;
         case 8:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 8 : send Get Year Day Schedule Command to DUT and Verify INVALID_FIELD response\n");
-            err = TestSendGetYearDayScheduleCommandToDutAndVerifyInvalidFieldResponse_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_8();
             break;
         case 9:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 9 : send Get Year Day Schedule Command to DUT and verify NOT_FOUND response\n");
-            err = TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_9();
+            ChipLogProgress(chipTool, " ***** Test Step 9 : TH sends Clear Credential Command to DUT\n");
+            err = TestThSendsClearCredentialCommandToDut_9();
             break;
         case 10:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 10 : send Get Year Day Schedule Command  to DUT and verify NOT_FOUND response \n");
-            err = TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_10();
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Send Set Year Day Schedule Command to DUT\n");
-            err = TestSendSetYearDayScheduleCommandToDut_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : TH sends Clear Credential Command to DUT\n");
+            err = TestThSendsClearCredentialCommandToDut_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : send Get Year Day Schedule Command \n");
-            err = TestSendGetYearDayScheduleCommand_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_12();
+            break;
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : TH sends Clear Credential Command to DUT\n");
+            err = TestThSendsClearCredentialCommandToDut_13();
+            break;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : TH sends Get Credential Status Command\n");
+            err = TestThSendsGetCredentialStatusCommand_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : TH sends Set Credential Command to DUT\n");
+            err = TestThSendsSetCredentialCommandToDut_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : TH sends Clear Credential Command to DUT\n");
+            err = TestThSendsClearCredentialCommandToDut_16();
             break;
         }
 
@@ -108204,7 +107146,7 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -108221,6 +107163,18 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
         case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 13:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 14:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND));
+            break;
         }
 
         // Go on to the next test.
@@ -108234,21 +107188,48 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 13;
+    const uint16_t mTestCount = 17;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
+    {
+        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
+        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
+        return WaitForCommissionee("alpha", value);
+    }
+    NSNumber * _Nonnull NumberOfTotalUsersSupported;
+
+    CHIP_ERROR TestThReadsNumberOfTotalUsersSupportedAttributeAndSavesForFutureUse_1()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster
+            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                NSLog(@"TH reads NumberOfTotalUsersSupported attribute and saves for future use. Error: %@", err);
+
+                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                {
+                    id actualValue = value;
+                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
+                }
+                {
+                    NumberOfTotalUsersSupported = value;
+                }
 
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
+                NextTest();
+            }];
 
-    CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
-    {
-        chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value;
-        value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL;
-        return WaitForCommissionee("alpha", value);
+        return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockUser_1()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -108261,40 +107242,54 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
+        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and lock/unlock user Error: %@", err);
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
+                      NextTest();
+                  }];
 
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
-                      }
+        return CHIP_NO_ERROR;
+    }
 
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
-                      }
+    CHIP_ERROR TestThSendsGetCredentialStatusCommand_3()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                      NextTest();
-                  }];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"TH sends Get Credential Status Command Error: %@", err);
+
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 VerifyOrReturn(CheckConstraintType("credentialExists", "", "boolean"));
+                                 if (values.userIndex != nil) {
+
+                                     VerifyOrReturn(
+                                         CheckConstraintMinValue<uint16_t>("userIndex", [values.userIndex unsignedShortValue], 1U));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockForSecondUser_2()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -108304,360 +107299,344 @@ class Test_TC_DL_2_11 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0];
         params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
         ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
-        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-        params.credentialData = [[NSData alloc] initWithBytes:"123457" length:6];
-        params.userIndex = nil;
-        params.userStatus = nil;
-        params.userType = nil;
+        params.credentialData = [[NSData alloc] initWithBytes:"1234" length:4];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:5];
+        params.userType = [NSNumber numberWithUnsignedChar:10];
         [cluster
             setCredentialWithParams:params
                   completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Create new PIN credential and lock/unlock for second user Error: %@", err);
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                      {
-                          id actualValue = values.status;
-                          VerifyOrReturn(CheckValue("status", actualValue, 0));
-                      }
-
-                      {
-                          id actualValue = values.userIndex;
-                          VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                          VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
-                      }
-
-                      {
-                          id actualValue = values.nextCredentialIndex;
-                          VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                          VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
-                      }
-
                       NextTest();
                   }];
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUser;
 
-    CHIP_ERROR TestGetMaxNumberOfYearDaySchedulesForUser_3()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Get Max number of year Day schedules for user Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("NumberOfYearDaySchedulesSupportedPerUser", actualValue, 10));
-            }
-            {
-                NumberOfYearDaySchedulesSupportedPerUser = value;
-            }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            NextTest();
-        }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nonnull NumberOfTotalUsersSupported;
 
-    CHIP_ERROR TestGetNumberOfSupportedUsers_4()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_6()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster
-            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                NSLog(@"Get number of supported users Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-                {
-                    id actualValue = value;
-                    VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U));
-                }
-                {
-                    NumberOfTotalUsersSupported = value;
-                }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                NextTest();
-            }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetYearDayScheduleCommandToDut_5()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_7()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:10UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:20UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Send Set Year Day Schedule Command to DUT Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-                                NextTest();
-                            }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetYearDayScheduleCommand_6()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:1];
-        params.userIndex = [NSNumber numberWithUnsignedShort:1U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"send Get Year Day Schedule Command Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:2];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-                                if (values.yearDayIndex != nil) {
-                                    VerifyOrReturn(CheckConstraintMinValue<uint8_t>(
-                                        "yearDayIndex", [values.yearDayIndex unsignedCharValue], 1));
-                                }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                if (values.userIndex != nil) {
-                                    VerifyOrReturn(
-                                        CheckConstraintMinValue<uint16_t>("userIndex", [values.userIndex unsignedShortValue], 1U));
-                                }
+                      NextTest();
+                  }];
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                                }
+        return CHIP_NO_ERROR;
+    }
 
-                                VerifyOrReturn(CheckConstraintType("localStartTime", "", "epoch-s"));
+    CHIP_ERROR TestThSendsClearCredentialCommandToDut_9()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                VerifyOrReturn(CheckConstraintType("localEndTime", "", "epoch-s"));
-                                NextTest();
-                            }];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"TH sends Clear Credential Command to DUT Error: %@", err);
+
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetYearDayScheduleCommandToDutAndVerifyInvalidCommandResponse_7()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_10()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:0];
-        params.userIndex = [NSNumber numberWithUnsignedShort:10U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:30UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:10UL];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
         [cluster
-            setYearDayScheduleWithParams:params
-                       completionHandler:^(NSError * _Nullable err) {
-                           NSLog(@"Send Set Year Day Schedule Command to DUT and verify INVALID_COMMAND response Error: %@", err);
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
-                           NextTest();
-                       }];
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetYearDayScheduleCommandToDutAndVerifyInvalidFieldResponse_8()
+    CHIP_ERROR TestThSendsClearCredentialCommandToDut_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:21U];
-        [cluster
-            getYearDayScheduleWithParams:params
-                       completionHandler:^(
-                           CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                           NSLog(@"send Get Year Day Schedule Command to DUT and Verify INVALID_FIELD response Error: %@", err);
-
-                           VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                           {
-                               id actualValue = values.yearDayIndex;
-                               VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
-                           }
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
 
-                           {
-                               id actualValue = values.userIndex;
-                               VerifyOrReturn(CheckValue("userIndex", actualValue, 21U));
-                           }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"TH sends Clear Credential Command to DUT Error: %@", err);
 
-                           {
-                               id actualValue = values.status;
-                               VerifyOrReturn(CheckValue("status", actualValue, 133));
-                           }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                           NextTest();
-                       }];
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_9()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:10];
-        params.userIndex = [NSNumber numberWithUnsignedShort:5U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"send Get Year Day Schedule Command to DUT and verify NOT_FOUND response Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 10));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 5U));
-                                }
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
+        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
-                                }
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                      NextTest();
+                  }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetYearDayScheduleCommandToDutAndVerifyNotFoundResponse_10()
+    CHIP_ERROR TestThSendsClearCredentialCommandToDut_13()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"send Get Year Day Schedule Command  to DUT and verify NOT_FOUND response  Error: %@", err);
-
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
 
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
-                                }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"TH sends Clear Credential Command to DUT Error: %@", err);
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 139));
-                                }
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendSetYearDayScheduleCommandToDut_11()
+    CHIP_ERROR TestThSendsGetCredentialStatusCommand_14()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
-        params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:10UL];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:20UL];
-        [cluster setYearDayScheduleWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Send Set Year Day Schedule Command to DUT Error: %@", err);
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+        [cluster getCredentialStatusWithParams:params
+                             completionHandler:^(
+                                 CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
+                                 NSLog(@"TH sends Get Credential Status Command Error: %@", err);
 
-                                NextTest();
-                            }];
+                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                 {
+                                     id actualValue = values.userIndex;
+                                     VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 }
+
+                                 NextTest();
+                             }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendGetYearDayScheduleCommand_12()
+    CHIP_ERROR TestThSendsSetCredentialCommandToDut_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:2];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.operationType = [NSNumber numberWithUnsignedChar:0];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+
+        params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:2U];
-        [cluster getYearDayScheduleWithParams:params
-                            completionHandler:^(
-                                CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) {
-                                NSLog(@"send Get Year Day Schedule Command  Error: %@", err);
+        params.userStatus = [NSNumber numberWithUnsignedChar:0];
+        params.userType = [NSNumber numberWithUnsignedChar:0];
+        [cluster
+            setCredentialWithParams:params
+                  completionHandler:^(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable err) {
+                      NSLog(@"TH sends Set Credential Command to DUT Error: %@", err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                {
-                                    id actualValue = values.yearDayIndex;
-                                    VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2));
-                                }
+                      NextTest();
+                  }];
 
-                                {
-                                    id actualValue = values.userIndex;
-                                    VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
-                                }
+        return CHIP_NO_ERROR;
+    }
 
-                                {
-                                    id actualValue = values.status;
-                                    VerifyOrReturn(CheckValue("status", actualValue, 0));
-                                }
+    CHIP_ERROR TestThSendsClearCredentialCommandToDut_16()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestDoorLock * cluster = [[CHIPTestDoorLock alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-                                {
-                                    id actualValue = values.localStartTime;
-                                    VerifyOrReturn(CheckValue("localStartTime", actualValue, 10UL));
-                                }
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.credential = [[CHIPDoorLockClusterDlCredential alloc] init];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:8];
+        ((CHIPDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
-                                {
-                                    id actualValue = values.localEndTime;
-                                    VerifyOrReturn(CheckValue("localEndTime", actualValue, 20UL));
-                                }
+        [cluster clearCredentialWithParams:params
+                         completionHandler:^(NSError * _Nullable err) {
+                             NSLog(@"TH sends Clear Credential Command to DUT Error: %@", err);
 
-                                NextTest();
-                            }];
+                             VerifyOrReturn(CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_INVALID_COMMAND));
+                             NextTest();
+                         }];
 
         return CHIP_NO_ERROR;
     }
@@ -108710,20 +107689,20 @@ class TestGroupsCluster : public TestCommandBridge {
             err = TestViewGroup0Invalid_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : View Group 1 (not found)\n");
-            err = TestViewGroup1NotFound_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : View First Group (not found)\n");
+            err = TestViewFirstGroupNotFound_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Add Group 1 (new)\n");
-            err = TestAddGroup1New_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Add First Group (new)\n");
+            err = TestAddFirstGroupNew_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : View Group 1 (new)\n");
-            err = TestViewGroup1New_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : View First Group (new)\n");
+            err = TestViewFirstGroupNew_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : View Group 2 (not found)\n");
-            err = TestViewGroup2NotFound_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : View Second Group (not found)\n");
+            err = TestViewSecondGroupNotFound_5();
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Get Group Membership 1 (all)\n");
@@ -108734,8 +107713,8 @@ class TestGroupsCluster : public TestCommandBridge {
             err = TestViewGroup3NotFound_7();
             break;
         case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : View Group 1 (existing)\n");
-            err = TestViewGroup1Existing_8();
+            ChipLogProgress(chipTool, " ***** Test Step 8 : View First Group (existing)\n");
+            err = TestViewFirstGroupExisting_8();
             break;
         case 9:
             ChipLogProgress(chipTool, " ***** Test Step 9 : Remove Group 0 (invalid)\n");
@@ -108746,12 +107725,12 @@ class TestGroupsCluster : public TestCommandBridge {
             err = TestRemoveGroup4NotFound_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : View Group 1 (not removed)\n");
-            err = TestViewGroup1NotRemoved_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : View First Group (not removed)\n");
+            err = TestViewFirstGroupNotRemoved_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : View Group 2 (removed)\n");
-            err = TestViewGroup2Removed_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : View Second Group (removed)\n");
+            err = TestViewSecondGroupRemoved_12();
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Get Group Membership 3\n");
@@ -108762,12 +107741,12 @@ class TestGroupsCluster : public TestCommandBridge {
             err = TestRemoveAll_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : View Group 1 (removed)\n");
-            err = TestViewGroup1Removed_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : View First Group (removed)\n");
+            err = TestViewFirstGroupRemoved_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : View Group 2 (still removed)\n");
-            err = TestViewGroup2StillRemoved_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : View Second Group (still removed)\n");
+            err = TestViewSecondGroupStillRemoved_16();
             break;
         case 17:
             ChipLogProgress(chipTool, " ***** Test Step 17 : View Group 3 (removed)\n");
@@ -108902,7 +107881,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup1NotFound_2()
+    CHIP_ERROR TestViewFirstGroupNotFound_2()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -108912,7 +107891,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:1U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 1 (not found) Error: %@", err);
+                       NSLog(@"View First Group (not found) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108932,7 +107911,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestAddGroup1New_3()
+    CHIP_ERROR TestAddFirstGroupNew_3()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -108943,7 +107922,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupName = @"Group #1";
         [cluster addGroupWithParams:params
                   completionHandler:^(CHIPGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                      NSLog(@"Add Group 1 (new) Error: %@", err);
+                      NSLog(@"Add First Group (new) Error: %@", err);
 
                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108963,7 +107942,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup1New_4()
+    CHIP_ERROR TestViewFirstGroupNew_4()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -108973,7 +107952,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:1U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 1 (new) Error: %@", err);
+                       NSLog(@"View First Group (new) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -108998,7 +107977,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup2NotFound_5()
+    CHIP_ERROR TestViewSecondGroupNotFound_5()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -109008,7 +107987,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:4369U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 2 (not found) Error: %@", err);
+                       NSLog(@"View Second Group (not found) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109093,7 +108072,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup1Existing_8()
+    CHIP_ERROR TestViewFirstGroupExisting_8()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -109103,7 +108082,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:1U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 1 (existing) Error: %@", err);
+                       NSLog(@"View First Group (existing) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109188,7 +108167,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup1NotRemoved_11()
+    CHIP_ERROR TestViewFirstGroupNotRemoved_11()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -109198,7 +108177,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:1U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 1 (not removed) Error: %@", err);
+                       NSLog(@"View First Group (not removed) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109223,7 +108202,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup2Removed_12()
+    CHIP_ERROR TestViewSecondGroupRemoved_12()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -109233,7 +108212,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:4369U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 2 (removed) Error: %@", err);
+                       NSLog(@"View Second Group (removed) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109309,7 +108288,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup1Removed_15()
+    CHIP_ERROR TestViewFirstGroupRemoved_15()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -109319,7 +108298,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:1U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 1 (removed) Error: %@", err);
+                       NSLog(@"View First Group (removed) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109339,7 +108318,7 @@ class TestGroupsCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestViewGroup2StillRemoved_16()
+    CHIP_ERROR TestViewSecondGroupStillRemoved_16()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -109349,7 +108328,7 @@ class TestGroupsCluster : public TestCommandBridge {
         params.groupId = [NSNumber numberWithUnsignedShort:4369U];
         [cluster viewGroupWithParams:params
                    completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                       NSLog(@"View Group 2 (still removed) Error: %@", err);
+                       NSLog(@"View Second Group (still removed) Error: %@", err);
 
                        VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -109538,16 +108517,24 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
             err = TestKeySetReadNotRemoved_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Remove All\n");
-            err = TestRemoveAll_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Remove Group 1\n");
+            err = TestRemoveGroup1_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : KeySet Remove 2\n");
-            err = TestKeySetRemove2_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Read GroupTable 2\n");
+            err = TestReadGroupTable2_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : KeySet Read (also removed)\n");
-            err = TestKeySetReadAlsoRemoved_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Remove All\n");
+            err = TestRemoveAll_17();
+            break;
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : KeySet Remove 2\n");
+            err = TestKeySetRemove2_18();
+            break;
+        case 19:
+            ChipLogProgress(chipTool, " ***** Test Step 19 : KeySet Read (also removed)\n");
+            err = TestKeySetReadAlsoRemoved_19();
             break;
         }
 
@@ -109612,6 +108599,12 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND));
             break;
         }
@@ -109627,7 +108620,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 20;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -109654,9 +108647,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            if (value != nil) {
-                VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxGroupsPerFabric", [value unsignedShortValue], 2U));
-            }
+            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("maxGroupsPerFabric", [value unsignedShortValue], 2U));
 
             NextTest();
         }];
@@ -110117,7 +109108,71 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestRemoveAll_15()
+    CHIP_ERROR TestRemoveGroup1_15()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[CHIPGroupsClusterRemoveGroupParams alloc] init];
+        params.groupId = [NSNumber numberWithUnsignedShort:257U];
+        [cluster removeGroupWithParams:params
+                     completionHandler:^(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable err) {
+                         NSLog(@"Remove Group 1 Error: %@", err);
+
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                         {
+                             id actualValue = values.status;
+                             VerifyOrReturn(CheckValue("status", actualValue, 0));
+                         }
+
+                         {
+                             id actualValue = values.groupId;
+                             VerifyOrReturn(CheckValue("groupId", actualValue, 257U));
+                         }
+
+                         NextTest();
+                     }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadGroupTable2_16()
+    {
+        CHIPDevice * device = GetDevice("alpha");
+        CHIPTestGroupKeyManagement * cluster = [[CHIPTestGroupKeyManagement alloc] initWithDevice:device
+                                                                                         endpoint:0
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = [NSNumber numberWithBool:true];
+        [cluster readAttributeGroupTableWithParams:params
+                                 completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
+                                     NSLog(@"Read GroupTable 2 Error: %@", err);
+
+                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                     {
+                                         id actualValue = value;
+                                         VerifyOrReturn(CheckValue("GroupTable", [actualValue count], static_cast<uint32_t>(1)));
+                                         VerifyOrReturn(CheckValue("GroupId",
+                                             ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupId, 258U));
+                                         VerifyOrReturn(CheckValueAsString("GroupName",
+                                             ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupName,
+                                             @"Group #2"));
+                                         VerifyOrReturn(CheckValue("FabricIndex",
+                                             ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).fabricIndex, 1));
+                                     }
+
+                                     NextTest();
+                                 }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestRemoveAll_17()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroups * cluster = [[CHIPTestGroups alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
@@ -110134,7 +109189,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestKeySetRemove2_16()
+    CHIP_ERROR TestKeySetRemove2_18()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroupKeyManagement * cluster = [[CHIPTestGroupKeyManagement alloc] initWithDevice:device
@@ -110156,7 +109211,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestKeySetReadAlsoRemoved_17()
+    CHIP_ERROR TestKeySetReadAlsoRemoved_19()
     {
         CHIPDevice * device = GetDevice("alpha");
         CHIPTestGroupKeyManagement * cluster = [[CHIPTestGroupKeyManagement alloc] initWithDevice:device
@@ -110219,17 +109274,14 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_CC_9_1>(),
         make_unique<Test_TC_CC_9_2>(),
         make_unique<Test_TC_CC_9_3>(),
-        make_unique<Test_TC_DM_1_1>(),
-        make_unique<Test_TC_DM_3_1>(),
-        make_unique<Test_TC_DM_2_2>(),
+        make_unique<Test_TC_DM_2_1>(),
         make_unique<Test_TC_EMR_1_1>(),
-        make_unique<Test_TC_ETHDIAG_1_1>(),
-        make_unique<Test_TC_ETHDIAG_2_1>(),
+        make_unique<Test_TC_DGETH_2_1>(),
+        make_unique<Test_TC_DGETH_2_2>(),
         make_unique<Test_TC_FLW_1_1>(),
         make_unique<Test_TC_FLW_2_1>(),
-        make_unique<Test_TC_FLW_2_2>(),
-        make_unique<Test_TC_GC_1_1>(),
-        make_unique<Test_TC_GC_2_1>(),
+        make_unique<Test_TC_CGEN_1_1>(),
+        make_unique<Test_TC_CGEN_2_1>(),
         make_unique<Test_TC_I_1_1>(),
         make_unique<Test_TC_I_2_1>(),
         make_unique<Test_TC_I_2_3>(),
@@ -110255,7 +109307,6 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_MC_1_11>(),
         make_unique<Test_TC_MC_1_12>(),
         make_unique<Test_TC_MC_2_1>(),
-        make_unique<Test_TC_MC_3_1>(),
         make_unique<Test_TC_MC_3_2>(),
         make_unique<Test_TC_MC_3_3>(),
         make_unique<Test_TC_MC_3_4>(),
@@ -110281,6 +109332,8 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_MF_1_4>(),
         make_unique<Test_TC_MF_1_5>(),
         make_unique<Test_TC_MF_1_6>(),
+        make_unique<Test_TC_MF_1_9>(),
+        make_unique<Test_TC_MF_1_10>(),
         make_unique<Test_TC_MF_1_15>(),
         make_unique<OTA_SuccessfulTransfer>(),
         make_unique<Test_TC_OCC_1_1>(),
@@ -110302,26 +109355,19 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_PSCFG_1_1>(),
         make_unique<Test_TC_RH_1_1>(),
         make_unique<Test_TC_RH_2_1>(),
-        make_unique<Test_TC_RH_2_2>(),
         make_unique<Test_TC_SWTCH_2_1>(),
-        make_unique<Test_TC_SWTCH_2_2>(),
         make_unique<Test_TC_TM_1_1>(),
         make_unique<Test_TC_TM_2_1>(),
-        make_unique<Test_TC_TM_2_2>(),
         make_unique<Test_TC_TSTAT_1_1>(),
         make_unique<Test_TC_TSTAT_2_1>(),
         make_unique<Test_TC_TSTAT_2_2>(),
         make_unique<Test_TC_TSUIC_1_1>(),
         make_unique<Test_TC_TSUIC_2_1>(),
         make_unique<Test_TC_TSUIC_2_2>(),
-        make_unique<Test_TC_DIAG_TH_NW_1_1>(),
-        make_unique<Test_TC_DIAG_TH_NW_1_2>(),
-        make_unique<Test_TC_DIAG_TH_NW_2_2>(),
-        make_unique<Test_TC_DIAG_TH_NW_2_3>(),
         make_unique<Test_TC_ULABEL_1_1>(),
         make_unique<Test_TC_ULABEL_2_2>(),
-        make_unique<Test_TC_WIFIDIAG_1_1>(),
-        make_unique<Test_TC_WIFIDIAG_3_1>(),
+        make_unique<Test_TC_DGWIFI_2_1>(),
+        make_unique<Test_TC_DGWIFI_2_3>(),
         make_unique<Test_TC_WNCV_1_1>(),
         make_unique<Test_TC_WNCV_2_1>(),
         make_unique<Test_TC_WNCV_2_2>(),
@@ -110379,8 +109425,9 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_DL_2_2>(),
         make_unique<Test_TC_DL_2_3>(),
         make_unique<Test_TC_DL_2_4>(),
-        make_unique<Test_TC_DL_2_8>(),
-        make_unique<Test_TC_DL_2_11>(),
+        make_unique<Test_TC_DL_2_5>(),
+        make_unique<Test_TC_DL_2_7>(),
+        make_unique<Test_TC_DL_2_9>(),
         make_unique<TestGroupsCluster>(),
         make_unique<TestGroupKeyManagementCluster>(),
 #endif // CONFIG_ENABLE_YAML_TESTS
diff --git a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
index 587ab0dd64d22f..c7d1360efc3716 100644
--- a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
@@ -229,6 +229,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace GroupKeyManagement {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -627,16 +664,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -787,6 +814,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GroupKeyManagement::Id:
         Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/light-switch-app/zap-generated/access.h b/zzz_generated/light-switch-app/zap-generated/access.h
index 7be6ab062f370a..7bc14573de66b3 100644
--- a/zzz_generated/light-switch-app/zap-generated/access.h
+++ b/zzz_generated/light-switch-app/zap-generated/access.h
@@ -168,7 +168,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -203,7 +202,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -238,7 +236,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
index 5cc015058c1a99..2f498a79b144e4 100644
--- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
@@ -33,26 +33,6 @@
                                                                                                                                    \
         /* 0 - Breadcrumb, */                                                                                                      \
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                            \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 8 - NetworkName, */                                                                                                 \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 10 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 18 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 26 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 34 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 42 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #else // !BIGENDIAN_CPU
@@ -63,31 +43,11 @@
                                                                                                                                    \
         /* 0 - Breadcrumb, */                                                                                                      \
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                            \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 8 - NetworkName, */                                                                                                 \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 10 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 18 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 26 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 34 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 42 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (7)
+#define GENERATED_DEFAULTS_COUNT (1)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -120,7 +80,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 222
+#define GENERATED_ATTRIBUTE_COUNT 223
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -262,7 +222,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -276,68 +238,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },              /* channel */     \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },               /* RoutingRole */ \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(8) }, /* NetworkName */ \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },       /* PanId */       \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(10) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(18) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(26) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(34) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(42) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -523,30 +519,34 @@
   /*   GeneratedCommandList (index=23)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=25) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=27) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=27) */ \
+  /*   AcceptedCommandList (index=29) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=29) */ \
+  /*   AcceptedCommandList (index=31) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=31) */ \
+  /*   AcceptedCommandList (index=33) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=33) */ \
+  /*   AcceptedCommandList (index=35) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=37) */ \
+  /*   AcceptedCommandList (index=39) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -555,32 +555,31 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=47)*/ \
+  /*   GeneratedCommandList (index=48)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Group Key Management (server) */\
-  /*   AcceptedCommandList (index=52) */ \
+  /*   AcceptedCommandList (index=53) */ \
   0x00000000 /* KeySetWrite */, \
   0x00000001 /* KeySetRead */, \
   0x00000003 /* KeySetRemove */, \
   0x00000004 /* KeySetReadAllIndices */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=57)*/ \
+  /*   GeneratedCommandList (index=58)*/ \
   0x00000002 /* KeySetReadResponse */, \
   0x00000005 /* KeySetReadAllIndicesResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=60) */ \
+  /*   AcceptedCommandList (index=61) */ \
   0x00000000 /* Identify */, \
   0x00000040 /* TriggerEffect */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=63) */ \
+  /*   AcceptedCommandList (index=64) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -588,7 +587,7 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=70)*/ \
+  /*   GeneratedCommandList (index=71)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
@@ -728,61 +727,61 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(72), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(83), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(89), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(154), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(168), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(169), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(180), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -793,40 +792,40 @@
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -837,7 +836,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(203), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -848,7 +847,7 @@
   { \
       /* Endpoint: 1, Cluster: Identify (client) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -859,29 +858,29 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (client) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -892,7 +891,7 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (client) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -903,7 +902,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -914,7 +913,7 @@
   { \
       /* Endpoint: 1, Cluster: Binding (server) */ \
       .clusterId = 0x0000001E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(220), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -925,7 +924,7 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (client) */ \
       .clusterId = 0x00000300,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(222), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(223), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -944,7 +943,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 22, 491 }, { ZAP_CLUSTER_INDEX(22), 8, 26 },                                                       \
+        { ZAP_CLUSTER_INDEX(0), 22, 250 }, { ZAP_CLUSTER_INDEX(22), 8, 26 },                                                       \
     }
 
 // Largest attribute size is needed for various buffers
@@ -956,7 +955,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (517)
+#define ATTRIBUTE_MAX_SIZE (276)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
index 7fb7a6d52d8f47..adf2da73d06244 100644
--- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
@@ -429,6 +429,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace GroupKeyManagement {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1009,16 +1046,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -1172,6 +1199,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GroupKeyManagement::Id:
         Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/lighting-app/zap-generated/access.h b/zzz_generated/lighting-app/zap-generated/access.h
index a3d3005357c0f0..2806b8d11356f8 100644
--- a/zzz_generated/lighting-app/zap-generated/access.h
+++ b/zzz_generated/lighting-app/zap-generated/access.h
@@ -186,7 +186,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -221,7 +220,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -256,7 +254,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
index 60db0d8b8483a6..3a58b7a54bdea1 100644
--- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
@@ -38,26 +38,6 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #else // !BIGENDIAN_CPU
@@ -73,31 +53,11 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (8)
+#define GENERATED_DEFAULTS_COUNT (2)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -139,7 +99,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 270
+#define GENERATED_ATTRIBUTE_COUNT 271
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -281,7 +241,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -295,69 +257,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -479,7 +474,7 @@
             /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
             { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x01) }, /* current level */        \
             { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* remaining time */       \
-            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                            /* min level */            \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },                            /* min level */            \
             { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xFE) },                            /* max level */            \
             { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* current frequency */    \
             { 0x00000005, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                         /* min frequency */        \
@@ -635,30 +630,34 @@
   /*   GeneratedCommandList (index=35)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=37) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=39) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=39) */ \
+  /*   AcceptedCommandList (index=41) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=41) */ \
+  /*   AcceptedCommandList (index=43) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=43) */ \
+  /*   AcceptedCommandList (index=45) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=45) */ \
+  /*   AcceptedCommandList (index=47) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=49) */ \
+  /*   AcceptedCommandList (index=51) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -667,32 +666,31 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=59)*/ \
+  /*   GeneratedCommandList (index=60)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Group Key Management (server) */\
-  /*   AcceptedCommandList (index=64) */ \
+  /*   AcceptedCommandList (index=65) */ \
   0x00000000 /* KeySetWrite */, \
   0x00000001 /* KeySetRead */, \
   0x00000003 /* KeySetRemove */, \
   0x00000004 /* KeySetReadAllIndices */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=69)*/ \
+  /*   GeneratedCommandList (index=70)*/ \
   0x00000002 /* KeySetReadResponse */, \
   0x00000005 /* KeySetReadAllIndicesResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=72) */ \
+  /*   AcceptedCommandList (index=73) */ \
   0x00000000 /* Identify */, \
   0x00000040 /* TriggerEffect */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=75) */ \
+  /*   AcceptedCommandList (index=76) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -700,14 +698,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=82)*/ \
+  /*   GeneratedCommandList (index=83)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=87) */ \
+  /*   AcceptedCommandList (index=88) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
@@ -716,7 +714,7 @@
   0x00000042 /* OnWithTimedOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=94) */ \
+  /*   AcceptedCommandList (index=95) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -727,7 +725,7 @@
   0x00000007 /* StopWithOnOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Color Control (server) */\
-  /*   AcceptedCommandList (index=103) */ \
+  /*   AcceptedCommandList (index=104) */ \
   0x00000000 /* MoveToHue */, \
   0x00000001 /* MoveHue */, \
   0x00000002 /* StepHue */, \
@@ -882,61 +880,61 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(72), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(83), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(89), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(154), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(168), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(169), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(180), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -947,40 +945,40 @@
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(200), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -991,7 +989,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(203), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1002,51 +1000,51 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(213), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(220), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(221), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(236), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1057,18 +1055,18 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (server) */ \
       .clusterId = 0x00000300,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
       .attributeCount = 23, \
       .clusterSize = 40, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayColorControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
       .clusterId = 0x00000406,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(266), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1087,7 +1085,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 22, 492 }, { ZAP_CLUSTER_INDEX(22), 7, 109 },                                                      \
+        { ZAP_CLUSTER_INDEX(0), 22, 251 }, { ZAP_CLUSTER_INDEX(22), 7, 109 },                                                      \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1099,7 +1097,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (601)
+#define ATTRIBUTE_MAX_SIZE (360)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp
index d87cf2cbae535a..9ed0879a184d2c 100644
--- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp
@@ -226,6 +226,33 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
+        case Commands::SetHolidaySchedule::Id: {
+            Commands::SetHolidaySchedule::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::GetHolidaySchedule::Id: {
+            Commands::GetHolidaySchedule::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::ClearHolidaySchedule::Id: {
+            Commands::ClearHolidaySchedule::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
         case Commands::SetUser::Id: {
             Commands::SetUser::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
@@ -392,6 +419,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace Groups {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -772,16 +836,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -935,6 +989,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::Groups::Id:
         Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/lock-app/zap-generated/access.h b/zzz_generated/lock-app/zap-generated/access.h
index 7e0b45dae4cf7b..40c11608f1bec3 100644
--- a/zzz_generated/lock-app/zap-generated/access.h
+++ b/zzz_generated/lock-app/zap-generated/access.h
@@ -45,7 +45,6 @@
     /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -76,7 +75,6 @@
     /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -107,7 +105,6 @@
     /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -137,7 +134,6 @@
     257, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     257, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
@@ -159,7 +155,6 @@
     43, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \
     48, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     49, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
-    51, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
@@ -181,7 +176,6 @@
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
@@ -201,6 +195,9 @@
     257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
     257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
     257, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
     257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
     257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
     257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
@@ -229,7 +226,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -243,6 +239,9 @@
     14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
     15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
     16, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
+    17, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
+    18, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
+    19, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
     26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
     27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
     29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
@@ -271,7 +270,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -285,6 +283,9 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
@@ -313,7 +314,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h
index 454f94063c05a4..cd0a33315180ab 100644
--- a/zzz_generated/lock-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h
@@ -44,34 +44,14 @@
             /* 10 - Breadcrumb, */                                                                                                 \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 18 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 20 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 28 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 36 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 44 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 52 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Power Source (server), big-endian */                                                          \
                                                                                                                                    \
-            /* 59 - Description, */                                                                                                \
+            /* 18 - Description, */                                                                                                \
             7, 'B', 'a', 't', 't', 'e', 'r', 'y',                                                                                  \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Door Lock (server), big-endian */                                                             \
                                                                                                                                    \
-            /* 67 - Language, */                                                                                                   \
+            /* 26 - Language, */                                                                                                   \
             2, 'e', 'n',                                                                                                           \
     }
 
@@ -94,40 +74,20 @@
             /* 10 - Breadcrumb, */                                                                                                 \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 18 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 20 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 28 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 36 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 44 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 52 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Power Source (server), little-endian */                                                       \
                                                                                                                                    \
-            /* 59 - Description, */                                                                                                \
+            /* 18 - Description, */                                                                                                \
             7, 'B', 'a', 't', 't', 'e', 'r', 'y',                                                                                  \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Door Lock (server), little-endian */                                                          \
                                                                                                                                    \
-            /* 67 - Language, */                                                                                                   \
+            /* 26 - Language, */                                                                                                   \
             2, 'e', 'n',                                                                                                           \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (11)
+#define GENERATED_DEFAULTS_COUNT (5)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -169,7 +129,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 259
+#define GENERATED_ATTRIBUTE_COUNT 260
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -319,7 +279,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -333,69 +295,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(18) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(20) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(28) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(36) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(44) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(52) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -508,7 +503,7 @@
             /* Endpoint: 1, Cluster: Power Source (server) */                                                                      \
             { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(1) },              /* Status */                                \
             { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) },              /* Order */                                 \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(59) }, /* Description */                           \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 61, 0, ZAP_LONG_DEFAULTS_INDEX(18) }, /* Description */                           \
             { 0x0000000E, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                /* BatteryChargeLevel */                    \
             { 0x0000000F, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() },              /* BatteryReplacementNeeded */              \
             { 0x00000010, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                /* BatteryReplaceability */                 \
@@ -527,13 +522,14 @@
             { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(10) }, /* NumberOfRFIDUsersSupported */                       \
             { 0x00000014, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(10) },  /* NumberOfWeekDaySchedulesSupportedPerUser */         \
             { 0x00000015, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(10) },  /* NumberOfYearDaySchedulesSupportedPerUser */         \
+            { 0x00000016, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(10) },  /* NumberOfHolidaySchedulesSupported */                \
             { 0x00000017, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(8) },   /* MaxPINCodeLength */                                 \
             { 0x00000018, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(6) },   /* MinPINCodeLength */                                 \
             { 0x00000019, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(20) },  /* MaxRFIDCodeLength */                                \
             { 0x0000001A, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(10) },  /* MinRFIDCodeLength */                                \
             { 0x0000001B, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* CredentialRulesSupport */                           \
             { 0x0000001C, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(5) },   /* NumberOfCredentialsSupportedPerUser */              \
-            { 0x00000021, ZAP_TYPE(CHAR_STRING), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(67) }, /* Language */    \
+            { 0x00000021, ZAP_TYPE(CHAR_STRING), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(26) }, /* Language */    \
             { 0x00000023, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(60) }, /* AutoRelockTime */        \
             { 0x00000024, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
               ZAP_MIN_MAX_DEFAULTS_INDEX(2) }, /* SoundVolume */                                                                   \
@@ -547,10 +543,8 @@
             { 0x00000030, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
               ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* WrongCodeEntryLimit */                                                           \
             { 0x00000031, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
-              ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* UserCodeTemporaryDisableTime */                                                  \
-            { 0x00000033, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                      \
-              ZAP_SIMPLE_DEFAULT(0) },                                           /* RequirePINforRemoteOperation */                \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x113) }, /* FeatureMap */                                  \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(5) },                                   /* UserCodeTemporaryDisableTime */                \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x133) }, /* FeatureMap */                                  \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(6) },       /* ClusterRevision */                             \
     }
 
@@ -625,30 +619,34 @@
   /*   GeneratedCommandList (index=23)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=25) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=27) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=27) */ \
+  /*   AcceptedCommandList (index=29) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=29) */ \
+  /*   AcceptedCommandList (index=31) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=31) */ \
+  /*   AcceptedCommandList (index=33) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=33) */ \
+  /*   AcceptedCommandList (index=35) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=37) */ \
+  /*   AcceptedCommandList (index=39) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -657,20 +655,19 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=47)*/ \
+  /*   GeneratedCommandList (index=48)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=52) */ \
+  /*   AcceptedCommandList (index=53) */ \
   0x00000000 /* Identify */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=54) */ \
+  /*   AcceptedCommandList (index=55) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -678,20 +675,20 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=61)*/ \
+  /*   GeneratedCommandList (index=62)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=66) */ \
+  /*   AcceptedCommandList (index=67) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Door Lock (server) */\
-  /*   AcceptedCommandList (index=70) */ \
+  /*   AcceptedCommandList (index=71) */ \
   0x00000000 /* LockDoor */, \
   0x00000001 /* UnlockDoor */, \
   0x00000003 /* UnlockWithTimeout */, \
@@ -701,6 +698,9 @@
   0x0000000E /* SetYearDaySchedule */, \
   0x0000000F /* GetYearDaySchedule */, \
   0x00000010 /* ClearYearDaySchedule */, \
+  0x00000011 /* SetHolidaySchedule */, \
+  0x00000012 /* GetHolidaySchedule */, \
+  0x00000013 /* ClearHolidaySchedule */, \
   0x0000001A /* SetUser */, \
   0x0000001B /* GetUser */, \
   0x0000001D /* ClearUser */, \
@@ -708,9 +708,10 @@
   0x00000024 /* GetCredentialStatus */, \
   0x00000026 /* ClearCredential */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=86)*/ \
+  /*   GeneratedCommandList (index=90)*/ \
   0x0000000C /* GetWeekDayScheduleResponse */, \
   0x0000000F /* GetYearDayScheduleResponse */, \
+  0x00000012 /* GetHolidayScheduleResponse */, \
   0x0000001C /* GetUserResponse */, \
   0x00000023 /* SetCredentialResponse */, \
   0x00000025 /* GetCredentialStatusResponse */, \
@@ -860,83 +861,83 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(78), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(89), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(94), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(95), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(159), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(160), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(174), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(175), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(185), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(199), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -947,7 +948,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(202), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -958,40 +959,40 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
       .attributeCount = 3, \
       .clusterSize = 8, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(208), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(210), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(217), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1002,7 +1003,7 @@
   { \
       /* Endpoint: 1, Cluster: Power Source (server) */ \
       .clusterId = 0x0000002F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(223), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(224), \
       .attributeCount = 9, \
       .clusterSize = 133, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1013,13 +1014,13 @@
   { \
       /* Endpoint: 1, Cluster: Door Lock (server) */ \
       .clusterId = 0x00000101,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(232), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(233), \
       .attributeCount = 27, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayDoorLockServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
     },\
 }
 
@@ -1032,7 +1033,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 21, 552 }, { ZAP_CLUSTER_INDEX(21), 6, 206 },                                                      \
+        { ZAP_CLUSTER_INDEX(0), 21, 311 }, { ZAP_CLUSTER_INDEX(21), 6, 206 },                                                      \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1044,7 +1045,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (758)
+#define ATTRIBUTE_MAX_SIZE (517)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp
index 07c9453f0d7902..ece8a2796af23e 100644
--- a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp
@@ -41,6 +41,64 @@ namespace app {
 
 namespace Clusters {
 
+namespace AdministratorCommissioning {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::OpenCommissioningWindow::Id: {
+            Commands::OpenCommissioningWindow::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath,
+                                                                                                     commandData);
+            }
+            break;
+        }
+        case Commands::OpenBasicCommissioningWindow::Id: {
+            Commands::OpenBasicCommissioningWindow::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(
+                    apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::RevokeCommissioning::Id: {
+            Commands::RevokeCommissioning::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled =
+                    emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace AdministratorCommissioning
+
 namespace GeneralCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -97,6 +155,107 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
 namespace NetworkCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -285,6 +444,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
+        case Commands::UpdateNOC::Id: {
+            Commands::UpdateNOC::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
         case Commands::UpdateFabricLabel::Id: {
             Commands::UpdateFabricLabel::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
@@ -340,9 +508,18 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
 
     switch (aCommandPath.mClusterId)
     {
+    case Clusters::AdministratorCommissioning::Id:
+        Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::NetworkCommissioning::Id:
         Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
index 4368f88d0e6a2a..d00c484293f91f 100644
--- a/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
@@ -24,9 +24,12 @@
 #define MATTER_PLUGINS_INIT                                                                                                        \
     MatterAccessControlPluginClientInitCallback();                                                                                 \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
     MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
diff --git a/zzz_generated/ota-provider-app/zap-generated/access.h b/zzz_generated/ota-provider-app/zap-generated/access.h
index 677d0e64a5bbd7..ddef6692699751 100644
--- a/zzz_generated/ota-provider-app/zap-generated/access.h
+++ b/zzz_generated/ota-provider-app/zap-generated/access.h
@@ -38,6 +38,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -59,6 +60,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -80,6 +82,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -100,6 +103,7 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -112,6 +116,7 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -124,6 +129,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -132,9 +138,16 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -145,6 +158,7 @@
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
@@ -152,9 +166,16 @@
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -165,6 +186,7 @@
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
     6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
@@ -172,9 +194,16 @@
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -185,6 +214,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
diff --git a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp
index ba55ccb429baf9..d20319aac67bb5 100644
--- a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp
@@ -32,6 +32,9 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_ACCESS_CONTROL_CLUSTER_ID:
         emberAfAccessControlClusterInitCallback(endpoint);
         break;
+    case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
+        emberAfAdministratorCommissioningClusterInitCallback(endpoint);
+        break;
     case ZCL_BASIC_CLUSTER_ID:
         emberAfBasicClusterInitCallback(endpoint);
         break;
@@ -41,6 +44,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
         emberAfGeneralCommissioningClusterInitCallback(endpoint);
         break;
+    case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID:
+        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
     case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID:
         emberAfLocalizationConfigurationClusterInitCallback(endpoint);
         break;
@@ -70,6 +79,11 @@ void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId en
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -85,6 +99,16 @@ void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(Endpoi
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h
index 939e8e688b81a6..d27e790a2729a6 100644
--- a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h
@@ -90,7 +90,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 71
+#define GENERATED_ATTRIBUTE_COUNT 93
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -199,6 +199,31 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(2) },                        /* FeatureMap */               \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* ClusterRevision */          \
                                                                                                                                    \
+            /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \
+            { 0x00000001, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RebootCount */      \
+            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */           \
+            { 0x00000003, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */                                                                   \
+            { 0x00000004, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */       \
+            { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
+            { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
+            { 0x00000000, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* WindowStatus */      \
+            { 0x00000001, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* AdminFabricIndex */ \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AdminVendorId */    \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
+                                                                                                                                   \
             /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                           \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NOCs */              \
             { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Fabrics */           \
@@ -210,6 +235,17 @@
             { 0x00000005, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
               ZAP_EMPTY_DEFAULT() },                                         /* CurrentFabricIndex */                              \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
@@ -280,28 +316,50 @@
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Operational Credentials (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=26) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /*   AcceptedCommandList (index=28) */ \
+  0x00000000 /* OpenCommissioningWindow */, \
+  0x00000001 /* OpenBasicCommissioningWindow */, \
+  0x00000002 /* RevokeCommissioning */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Operational Credentials (server) */\
+  /*   AcceptedCommandList (index=32) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
   0x00000006 /* AddNOC */, \
+  0x00000007 /* UpdateNOC */, \
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=34)*/ \
+  /*   GeneratedCommandList (index=41)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=46) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=51)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
 }
 
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 11
+#define GENERATED_CLUSTER_COUNT 14
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
@@ -393,21 +451,54 @@
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\
       .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
     },\
+  { \
+      /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
+      .clusterId = 0x00000033,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(57), \
+      .attributeCount = 11, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+      .clusterId = 0x0000003C,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(68), \
+      .attributeCount = 5, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(57), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(73), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Group Key Management (server) */ \
+      .clusterId = 0x0000003F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(81), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(65), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(87), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -418,7 +509,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(68), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(90), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -432,12 +523,12 @@
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 10
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 13
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 11, 183 },                                                                                         \
+        { ZAP_CLUSTER_INDEX(0), 14, 201 },                                                                                         \
     }
 
 // Largest attribute size is needed for various buffers
@@ -449,7 +540,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (183)
+#define ATTRIBUTE_MAX_SIZE (201)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (1)
diff --git a/zzz_generated/ota-provider-app/zap-generated/gen_config.h b/zzz_generated/ota-provider-app/zap-generated/gen_config.h
index dfec7d7f1da446..02949858e5f74d 100644
--- a/zzz_generated/ota-provider-app/zap-generated/gen_config.h
+++ b/zzz_generated/ota-provider-app/zap-generated/gen_config.h
@@ -31,9 +31,12 @@
 /**** Cluster endpoint counts ****/
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -52,6 +55,11 @@
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
@@ -67,6 +75,16 @@
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
diff --git a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
index 947ef71a8200f2..38d4d0183bfaeb 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
@@ -155,6 +155,107 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
 namespace NetworkCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -361,16 +462,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -404,6 +495,12 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::NetworkCommissioning::Id:
         Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
index 8b2ab7763f25c6..3ff72a3bcdb136 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
@@ -27,6 +27,8 @@
     MatterBasicPluginServerInitCallback();                                                                                         \
     MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
diff --git a/zzz_generated/ota-requestor-app/zap-generated/access.h b/zzz_generated/ota-requestor-app/zap-generated/access.h
index a2c5f41fc5b05a..ddef6692699751 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/access.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/access.h
@@ -38,6 +38,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -59,6 +60,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -80,6 +82,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -100,6 +103,7 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -112,6 +116,7 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -124,6 +129,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -138,6 +144,10 @@
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -152,7 +162,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -163,6 +172,10 @@
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -177,7 +190,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -188,6 +200,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -202,7 +218,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
index 6e9dd891443c5a..b6c48d90d88d71 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
@@ -44,6 +44,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
         emberAfGeneralCommissioningClusterInitCallback(endpoint);
         break;
+    case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID:
+        emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
+        break;
+    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
     case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID:
         emberAfLocalizationConfigurationClusterInitCallback(endpoint);
         break;
@@ -96,6 +102,16 @@ void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(Endpoi
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h
index 1896d176e9f651..199e47bc19f415 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h
@@ -90,7 +90,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 80
+#define GENERATED_ATTRIBUTE_COUNT 107
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -204,6 +204,23 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(2) },                        /* FeatureMap */               \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* ClusterRevision */          \
                                                                                                                                    \
+            /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \
+            { 0x00000001, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RebootCount */      \
+            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */           \
+            { 0x00000003, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */                                                                   \
+            { 0x00000004, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */       \
+            { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
+            { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
             /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
             { 0x00000000, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* WindowStatus */      \
             { 0x00000001, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
@@ -223,6 +240,17 @@
             { 0x00000005, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
               ZAP_EMPTY_DEFAULT() },                                         /* CurrentFabricIndex */                              \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
@@ -235,6 +263,24 @@
               ZAP_EMPTY_DEFAULT() },                                         /* label list */                                      \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 65534, Cluster: Network Commissioning (server) */                                                         \
+            { 0x00000000, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* MaxNetworks */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Networks */          \
+            { 0x00000002, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ScanMaxTimeSeconds */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+              ZAP_EMPTY_DEFAULT() }, /* ConnectMaxTimeSeconds */                                                                   \
+            { 0x00000004, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),               \
+              ZAP_EMPTY_DEFAULT() }, /* InterfaceEnabled */                                                                        \
+            { 0x00000005, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LastNetworkingStatus */                                                                    \
+            { 0x00000006, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* LastNetworkID */                                                                           \
+            { 0x00000007, ZAP_TYPE(INT32S), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* LastConnectErrorValue */                                                                   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* FeatureMap */     \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
     }
 
 // This is an array of EmberAfCluster structures.
@@ -287,14 +333,18 @@
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=21) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /*   AcceptedCommandList (index=23) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=25) */ \
+  /*   AcceptedCommandList (index=27) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -303,20 +353,44 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=35)*/ \
+  /*   GeneratedCommandList (index=36)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=41) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=46)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 65534, Cluster: Network Commissioning (server) */\
+  /*   AcceptedCommandList (index=49) */ \
+  0x00000000 /* ScanNetworks */, \
+  0x00000002 /* AddOrUpdateWiFiNetwork */, \
+  0x00000003 /* AddOrUpdateThreadNetwork */, \
+  0x00000004 /* RemoveNetwork */, \
+  0x00000006 /* ConnectNetwork */, \
+  0x00000008 /* ReorderNetwork */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=56)*/ \
+  0x00000001 /* ScanNetworksResponse */, \
+  0x00000005 /* NetworkConfigResponse */, \
+  0x00000007 /* ConnectNetworkResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
 }
 
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 12
+#define GENERATED_CLUSTER_COUNT 15
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
@@ -408,32 +482,54 @@
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\
       .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ) ,\
     },\
+  { \
+      /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
+      .clusterId = 0x00000033,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(61), \
+      .attributeCount = 11, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\
+      .generatedCommandList = nullptr ,\
+    },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(61), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(72), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(66), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(77), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Group Key Management (server) */ \
+      .clusterId = 0x0000003F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(85), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(74), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(91), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -444,7 +540,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(77), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(94), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -452,18 +548,29 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
+  { \
+      /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \
+      .clusterId = 0x00000031,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(97), \
+      .attributeCount = 10, \
+      .clusterSize = 0, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
+    },\
 }
 
 // clang-format on
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 11
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 14
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 12, 192 },                                                                                         \
+        { ZAP_CLUSTER_INDEX(0), 14, 204 }, { ZAP_CLUSTER_INDEX(14), 1, 0 },                                                        \
     }
 
 // Largest attribute size is needed for various buffers
@@ -475,52 +582,50 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (192)
+#define ATTRIBUTE_MAX_SIZE (204)
 
 // Number of fixed endpoints
-#define FIXED_ENDPOINT_COUNT (1)
+#define FIXED_ENDPOINT_COUNT (2)
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
 #define FIXED_ENDPOINT_ARRAY                                                                                                       \
     {                                                                                                                              \
-        0x0000                                                                                                                     \
+        0x0000, 0xFFFE                                                                                                             \
     }
 
 // Array of profile ids
 #define FIXED_PROFILE_IDS                                                                                                          \
     {                                                                                                                              \
-        0x0103                                                                                                                     \
+        0x0103, 0x0103                                                                                                             \
     }
 
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
     {                                                                                                                              \
-        {                                                                                                                          \
-            0x0016, 1                                                                                                              \
-        }                                                                                                                          \
+        { 0x0016, 1 }, { 0xF002, 1 }                                                                                               \
     }
 
 // Array of device type offsets
 #define FIXED_DEVICE_TYPE_OFFSETS                                                                                                  \
     {                                                                                                                              \
-        0                                                                                                                          \
+        0, 1                                                                                                                       \
     }
 
 // Array of device type lengths
 #define FIXED_DEVICE_TYPE_LENGTHS                                                                                                  \
     {                                                                                                                              \
-        1                                                                                                                          \
+        1, 1                                                                                                                       \
     }
 
 // Array of endpoint types supported on each endpoint
 #define FIXED_ENDPOINT_TYPES                                                                                                       \
     {                                                                                                                              \
-        0                                                                                                                          \
+        0, 1                                                                                                                       \
     }
 
 // Array of networks supported on each endpoint
 #define FIXED_NETWORKS                                                                                                             \
     {                                                                                                                              \
-        0                                                                                                                          \
+        0, 0                                                                                                                       \
     }
diff --git a/zzz_generated/ota-requestor-app/zap-generated/gen_config.h b/zzz_generated/ota-requestor-app/zap-generated/gen_config.h
index 7599d53c939581..45f325a260e353 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/gen_config.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/gen_config.h
@@ -34,8 +34,10 @@
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -69,6 +71,16 @@
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
diff --git a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
index 8cc17487d0bf64..1e57879feda325 100644
--- a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
@@ -293,6 +293,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace Groups {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -836,16 +873,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -1181,6 +1208,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::Groups::Id:
         Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h
index 6c3a4036a133cb..005d2e04e93ba7 100644
--- a/zzz_generated/placeholder/app1/zap-generated/access.h
+++ b/zzz_generated/placeholder/app1/zap-generated/access.h
@@ -223,7 +223,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -257,7 +256,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -291,7 +289,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
index a27a5144c5c2cd..ed155295d1c014 100644
--- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
@@ -106,7 +106,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 334
+#define GENERATED_ATTRIBUTE_COUNT 335
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -259,7 +259,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -651,6 +653,7 @@
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayThermostatServer[] = {                                                        \
         (EmberAfGenericClusterFunction) emberAfThermostatClusterServerInitCallback,                                                \
+        (EmberAfGenericClusterFunction) MatterThermostatClusterServerPreAttributeChangedCallback,                                  \
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayThermostatUserInterfaceConfigurationServer[] = {                              \
         (EmberAfGenericClusterFunction) MatterThermostatUserInterfaceConfigurationClusterServerPreAttributeChangedCallback,        \
@@ -708,26 +711,30 @@
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=26) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=28) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=28) */ \
+  /*   AcceptedCommandList (index=30) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=30) */ \
+  /*   AcceptedCommandList (index=32) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=32) */ \
+  /*   AcceptedCommandList (index=34) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=36) */ \
+  /*   AcceptedCommandList (index=38) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -736,20 +743,19 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=46)*/ \
+  /*   GeneratedCommandList (index=47)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Mode Select (server) */\
-  /*   AcceptedCommandList (index=51) */ \
+  /*   AcceptedCommandList (index=52) */ \
   0x00000000 /* ChangeToMode */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Window Covering (server) */\
-  /*   AcceptedCommandList (index=53) */ \
+  /*   AcceptedCommandList (index=54) */ \
   0x00000000 /* UpOrOpen */, \
   0x00000001 /* DownOrClose */, \
   0x00000002 /* StopMotion */, \
@@ -758,38 +764,34 @@
   0x00000007 /* GoToTiltValue */, \
   0x00000008 /* GoToTiltPercentage */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Thermostat (server) */\
-  /*   AcceptedCommandList (index=61) */ \
-  0x00000000 /* SetpointRaiseLower */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Target Navigator (server) */\
-  /*   AcceptedCommandList (index=63) */ \
+  /*   AcceptedCommandList (index=62) */ \
   0x00000000 /* NavigateTarget */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=65)*/ \
+  /*   GeneratedCommandList (index=64)*/ \
   0x00000001 /* NavigateTargetResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Keypad Input (server) */\
-  /*   AcceptedCommandList (index=67) */ \
+  /*   AcceptedCommandList (index=66) */ \
   0x00000000 /* SendKey */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=69)*/ \
+  /*   GeneratedCommandList (index=68)*/ \
   0x00000001 /* SendKeyResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Content Launcher (server) */\
-  /*   AcceptedCommandList (index=71) */ \
+  /*   AcceptedCommandList (index=70) */ \
   0x00000000 /* LaunchContent */, \
   0x00000001 /* LaunchURL */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=74)*/ \
+  /*   GeneratedCommandList (index=73)*/ \
   0x00000002 /* LaunchResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=76) */ \
+  /*   AcceptedCommandList (index=75) */ \
   0x00000000 /* Identify */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=78) */ \
+  /*   AcceptedCommandList (index=77) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -797,14 +799,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=85)*/ \
+  /*   GeneratedCommandList (index=84)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Scenes (server) */\
-  /*   AcceptedCommandList (index=90) */ \
+  /*   AcceptedCommandList (index=89) */ \
   0x00000000 /* AddScene */, \
   0x00000001 /* ViewScene */, \
   0x00000002 /* RemoveScene */, \
@@ -813,7 +815,7 @@
   0x00000005 /* RecallScene */, \
   0x00000006 /* GetSceneMembership */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=98)*/ \
+  /*   GeneratedCommandList (index=97)*/ \
   0x00000000 /* AddSceneResponse */, \
   0x00000001 /* ViewSceneResponse */, \
   0x00000002 /* RemoveSceneResponse */, \
@@ -822,13 +824,13 @@
   0x00000006 /* GetSceneMembershipResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=105) */ \
+  /*   AcceptedCommandList (index=104) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=109) */ \
+  /*   AcceptedCommandList (index=108) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -839,7 +841,7 @@
   0x00000007 /* StopWithOnOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Color Control (server) */\
-  /*   AcceptedCommandList (index=118) */ \
+  /*   AcceptedCommandList (index=117) */ \
   0x00000007 /* MoveToColor */, \
   0x00000008 /* MoveColor */, \
   0x00000009 /* StepColor */, \
@@ -967,50 +969,50 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(93), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(103), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(104), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(109), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(110), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(124), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(125), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Switch (client) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(136), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1021,7 +1023,7 @@
   { \
       /* Endpoint: 0, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(136), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1032,18 +1034,18 @@
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(140), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(141), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (client) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(146), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1054,18 +1056,18 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(146), \
       .attributeCount = 7, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Boolean State (server) */ \
       .clusterId = 0x00000045,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1076,7 +1078,7 @@
   { \
       /* Endpoint: 0, Cluster: Mode Select (client) */ \
       .clusterId = 0x00000050,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(156), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1087,29 +1089,29 @@
   { \
       /* Endpoint: 0, Cluster: Mode Select (server) */ \
       .clusterId = 0x00000050,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(156), \
       .attributeCount = 7, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayModeSelectServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Window Covering (server) */ \
       .clusterId = 0x00000102,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(162), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(163), \
       .attributeCount = 20, \
       .clusterSize = 35, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayWindowCoveringServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Pump Configuration and Control (server) */ \
       .clusterId = 0x00000200,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
       .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), \
@@ -1120,18 +1122,18 @@
   { \
       /* Endpoint: 0, Cluster: Thermostat (server) */ \
       .clusterId = 0x00000201,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(208), \
       .attributeCount = 18, \
       .clusterSize = 32, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayThermostatServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (client) */ \
       .clusterId = 0x00000204,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1142,7 +1144,7 @@
   { \
       /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \
       .clusterId = 0x00000204,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1153,7 +1155,7 @@
   { \
       /* Endpoint: 0, Cluster: Illuminance Measurement (server) */ \
       .clusterId = 0x00000400,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(230), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(231), \
       .attributeCount = 7, \
       .clusterSize = 15, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1164,7 +1166,7 @@
   { \
       /* Endpoint: 0, Cluster: Temperature Measurement (client) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1175,7 +1177,7 @@
   { \
       /* Endpoint: 0, Cluster: Temperature Measurement (server) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1186,7 +1188,7 @@
   { \
       /* Endpoint: 0, Cluster: Pressure Measurement (server) */ \
       .clusterId = 0x00000403,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
       .attributeCount = 11, \
       .clusterSize = 23, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1197,7 +1199,7 @@
   { \
       /* Endpoint: 0, Cluster: Flow Measurement (server) */ \
       .clusterId = 0x00000404,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(253), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(254), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1208,7 +1210,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (client) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(260), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1219,7 +1221,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(260), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1230,7 +1232,7 @@
   { \
       /* Endpoint: 0, Cluster: Target Navigator (client) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(266), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1241,18 +1243,18 @@
   { \
       /* Endpoint: 0, Cluster: Target Navigator (server) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(266), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Keypad Input (client) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(270), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1263,18 +1265,18 @@
   { \
       /* Endpoint: 0, Cluster: Keypad Input (server) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(270), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Content Launcher (client) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(272), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1285,18 +1287,18 @@
   { \
       /* Endpoint: 0, Cluster: Content Launcher (server) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(272), \
       .attributeCount = 4, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Application Basic (client) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(276), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1307,7 +1309,7 @@
   { \
       /* Endpoint: 0, Cluster: Application Basic (server) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(276), \
       .attributeCount = 10, \
       .clusterSize = 110, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1318,40 +1320,40 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(285), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(286), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(289), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (server) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(292), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(293), \
       .attributeCount = 7, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayScenesServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (client) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(300), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1362,29 +1364,29 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(300), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(302), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(303), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Basic (server) */ \
       .clusterId = 0x00000028,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(305), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(306), \
       .attributeCount = 22, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1395,12 +1397,12 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (server) */ \
       .clusterId = 0x00000300,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(327), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(328), \
       .attributeCount = 7, \
       .clusterSize = 15, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayColorControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 118 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 117 ) ,\
       .generatedCommandList = nullptr ,\
     },\
 }
diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
index d727a39bbf9e7e..ac30cebcbe163f 100644
--- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
@@ -260,7 +260,7 @@ class Test_TC_DM_3_3_SimulatedSuite : public TestCommand
 class Test_TC_DM_2_3_SimulatedSuite : public TestCommand
 {
 public:
-    Test_TC_DM_2_3_SimulatedSuite() : TestCommand("Test_TC_DM_2_3_Simulated", 10)
+    Test_TC_DM_2_3_SimulatedSuite() : TestCommand("Test_TC_DM_2_3_Simulated", 21)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -288,7 +288,11 @@ class Test_TC_DM_2_3_SimulatedSuite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 9:
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -308,51 +312,93 @@ class Test_TC_DM_2_3_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "Wait for Arm Fail Safe");
-            return WaitCommand(GetEndpoint(0), GeneralCommissioning::Id, GeneralCommissioning::Commands::ArmFailSafe::Id);
+            LogStep(0, "Wait for the device to be commissioned");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissioning::Type value;
+            return WaitForCommissioning(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Wait for Set Regulatory Config");
-            return WaitCommand(GetEndpoint(0), GeneralCommissioning::Id, GeneralCommissioning::Commands::SetRegulatoryConfig::Id);
+            LogStep(1, "Log OnOff Test Startup");
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::Log::Type value;
+            value.message = chip::Span<const char>("*** Basic Cluster Tests Readygarbage: not in length on purpose", 29);
+            return Log(kIdentityAlpha, value);
         }
         case 2: {
-            LogStep(2, "Wait for Attestation Certificate Chain Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::CertificateChainRequest::Id);
+            LogStep(2, "Query Data Model Revision");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::DataModelRevision::Id);
         }
         case 3: {
-            LogStep(3, "Wait for Attestation Certificate Chain Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::CertificateChainRequest::Id);
+            LogStep(3, "Query Vendor Name");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::VendorName::Id);
         }
         case 4: {
-            LogStep(4, "Wait for Attestation Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::AttestationRequest::Id);
+            LogStep(4, "Query VendorID");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::VendorID::Id);
         }
         case 5: {
-            LogStep(5, "Wait for CSR Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Commands::CSRRequest::Id);
+            LogStep(5, "Query Product Name");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductName::Id);
         }
         case 6: {
-            LogStep(6, "Wait for Add Trusted Root Certificate Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::AddTrustedRootCertificate::Id);
+            LogStep(6, "Query ProductID");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductID::Id);
         }
         case 7: {
-            LogStep(7, "Wait for Add Op NOC");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Commands::AddNOC::Id);
+            LogStep(7, "Query Node Label");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id);
         }
         case 8: {
-            LogStep(8, "Wait for Commissioning Complete");
-            return WaitCommand(GetEndpoint(0), GeneralCommissioning::Id, GeneralCommissioning::Commands::CommissioningComplete::Id);
+            LogStep(8, "Query User Location");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::Location::Id);
         }
         case 9: {
-            LogStep(9, "Wait 3000ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 3000UL;
-            return WaitForMs(kIdentityAlpha, value);
+            LogStep(9, "Query HardwareVersion");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::HardwareVersion::Id);
+        }
+        case 10: {
+            LogStep(10, "Query HardwareVersionString");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::HardwareVersionString::Id);
+        }
+        case 11: {
+            LogStep(11, "Query SoftwareVersion");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersion::Id);
+        }
+        case 12: {
+            LogStep(12, "Query SoftwareVersionString");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersionString::Id);
+        }
+        case 13: {
+            LogStep(13, "Query ManufacturingDate");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ManufacturingDate::Id);
+        }
+        case 14: {
+            LogStep(14, "Query PartNumber");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::PartNumber::Id);
+        }
+        case 15: {
+            LogStep(15, "Query ProductURL");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductURL::Id);
+        }
+        case 16: {
+            LogStep(16, "Query ProductLabel");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductLabel::Id);
+        }
+        case 17: {
+            LogStep(17, "Query SerialNumber");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::SerialNumber::Id);
+        }
+        case 18: {
+            LogStep(18, "Query LocalConfigDisabled");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::LocalConfigDisabled::Id);
+        }
+        case 19: {
+            LogStep(19, "Query Reachable");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::Reachable::Id);
+        }
+        case 20: {
+            LogStep(20, "Query UniqueID");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::UniqueID::Id);
         }
         }
         return CHIP_NO_ERROR;
diff --git a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp
index 8cc17487d0bf64..1e57879feda325 100644
--- a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp
@@ -293,6 +293,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace Groups {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -836,16 +873,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -1181,6 +1208,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::Groups::Id:
         Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h
index 6c3a4036a133cb..005d2e04e93ba7 100644
--- a/zzz_generated/placeholder/app2/zap-generated/access.h
+++ b/zzz_generated/placeholder/app2/zap-generated/access.h
@@ -223,7 +223,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -257,7 +256,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -291,7 +289,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
index a27a5144c5c2cd..ed155295d1c014 100644
--- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
@@ -106,7 +106,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 334
+#define GENERATED_ATTRIBUTE_COUNT 335
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -259,7 +259,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -651,6 +653,7 @@
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayThermostatServer[] = {                                                        \
         (EmberAfGenericClusterFunction) emberAfThermostatClusterServerInitCallback,                                                \
+        (EmberAfGenericClusterFunction) MatterThermostatClusterServerPreAttributeChangedCallback,                                  \
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayThermostatUserInterfaceConfigurationServer[] = {                              \
         (EmberAfGenericClusterFunction) MatterThermostatUserInterfaceConfigurationClusterServerPreAttributeChangedCallback,        \
@@ -708,26 +711,30 @@
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=26) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=28) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=28) */ \
+  /*   AcceptedCommandList (index=30) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=30) */ \
+  /*   AcceptedCommandList (index=32) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=32) */ \
+  /*   AcceptedCommandList (index=34) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=36) */ \
+  /*   AcceptedCommandList (index=38) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -736,20 +743,19 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=46)*/ \
+  /*   GeneratedCommandList (index=47)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Mode Select (server) */\
-  /*   AcceptedCommandList (index=51) */ \
+  /*   AcceptedCommandList (index=52) */ \
   0x00000000 /* ChangeToMode */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Window Covering (server) */\
-  /*   AcceptedCommandList (index=53) */ \
+  /*   AcceptedCommandList (index=54) */ \
   0x00000000 /* UpOrOpen */, \
   0x00000001 /* DownOrClose */, \
   0x00000002 /* StopMotion */, \
@@ -758,38 +764,34 @@
   0x00000007 /* GoToTiltValue */, \
   0x00000008 /* GoToTiltPercentage */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Thermostat (server) */\
-  /*   AcceptedCommandList (index=61) */ \
-  0x00000000 /* SetpointRaiseLower */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Target Navigator (server) */\
-  /*   AcceptedCommandList (index=63) */ \
+  /*   AcceptedCommandList (index=62) */ \
   0x00000000 /* NavigateTarget */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=65)*/ \
+  /*   GeneratedCommandList (index=64)*/ \
   0x00000001 /* NavigateTargetResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Keypad Input (server) */\
-  /*   AcceptedCommandList (index=67) */ \
+  /*   AcceptedCommandList (index=66) */ \
   0x00000000 /* SendKey */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=69)*/ \
+  /*   GeneratedCommandList (index=68)*/ \
   0x00000001 /* SendKeyResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Content Launcher (server) */\
-  /*   AcceptedCommandList (index=71) */ \
+  /*   AcceptedCommandList (index=70) */ \
   0x00000000 /* LaunchContent */, \
   0x00000001 /* LaunchURL */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=74)*/ \
+  /*   GeneratedCommandList (index=73)*/ \
   0x00000002 /* LaunchResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=76) */ \
+  /*   AcceptedCommandList (index=75) */ \
   0x00000000 /* Identify */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=78) */ \
+  /*   AcceptedCommandList (index=77) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -797,14 +799,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=85)*/ \
+  /*   GeneratedCommandList (index=84)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Scenes (server) */\
-  /*   AcceptedCommandList (index=90) */ \
+  /*   AcceptedCommandList (index=89) */ \
   0x00000000 /* AddScene */, \
   0x00000001 /* ViewScene */, \
   0x00000002 /* RemoveScene */, \
@@ -813,7 +815,7 @@
   0x00000005 /* RecallScene */, \
   0x00000006 /* GetSceneMembership */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=98)*/ \
+  /*   GeneratedCommandList (index=97)*/ \
   0x00000000 /* AddSceneResponse */, \
   0x00000001 /* ViewSceneResponse */, \
   0x00000002 /* RemoveSceneResponse */, \
@@ -822,13 +824,13 @@
   0x00000006 /* GetSceneMembershipResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=105) */ \
+  /*   AcceptedCommandList (index=104) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=109) */ \
+  /*   AcceptedCommandList (index=108) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -839,7 +841,7 @@
   0x00000007 /* StopWithOnOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Color Control (server) */\
-  /*   AcceptedCommandList (index=118) */ \
+  /*   AcceptedCommandList (index=117) */ \
   0x00000007 /* MoveToColor */, \
   0x00000008 /* MoveColor */, \
   0x00000009 /* StepColor */, \
@@ -967,50 +969,50 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(93), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(103), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(104), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(109), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(110), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(124), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(125), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Switch (client) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(136), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1021,7 +1023,7 @@
   { \
       /* Endpoint: 0, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(135), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(136), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1032,18 +1034,18 @@
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(140), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(141), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (client) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(146), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1054,18 +1056,18 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(145), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(146), \
       .attributeCount = 7, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Boolean State (server) */ \
       .clusterId = 0x00000045,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1076,7 +1078,7 @@
   { \
       /* Endpoint: 0, Cluster: Mode Select (client) */ \
       .clusterId = 0x00000050,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(156), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1087,29 +1089,29 @@
   { \
       /* Endpoint: 0, Cluster: Mode Select (server) */ \
       .clusterId = 0x00000050,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(156), \
       .attributeCount = 7, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayModeSelectServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Window Covering (server) */ \
       .clusterId = 0x00000102,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(162), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(163), \
       .attributeCount = 20, \
       .clusterSize = 35, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayWindowCoveringServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Pump Configuration and Control (server) */ \
       .clusterId = 0x00000200,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
       .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), \
@@ -1120,18 +1122,18 @@
   { \
       /* Endpoint: 0, Cluster: Thermostat (server) */ \
       .clusterId = 0x00000201,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(208), \
       .attributeCount = 18, \
       .clusterSize = 32, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayThermostatServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (client) */ \
       .clusterId = 0x00000204,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1142,7 +1144,7 @@
   { \
       /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \
       .clusterId = 0x00000204,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -1153,7 +1155,7 @@
   { \
       /* Endpoint: 0, Cluster: Illuminance Measurement (server) */ \
       .clusterId = 0x00000400,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(230), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(231), \
       .attributeCount = 7, \
       .clusterSize = 15, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1164,7 +1166,7 @@
   { \
       /* Endpoint: 0, Cluster: Temperature Measurement (client) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1175,7 +1177,7 @@
   { \
       /* Endpoint: 0, Cluster: Temperature Measurement (server) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1186,7 +1188,7 @@
   { \
       /* Endpoint: 0, Cluster: Pressure Measurement (server) */ \
       .clusterId = 0x00000403,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
       .attributeCount = 11, \
       .clusterSize = 23, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1197,7 +1199,7 @@
   { \
       /* Endpoint: 0, Cluster: Flow Measurement (server) */ \
       .clusterId = 0x00000404,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(253), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(254), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1208,7 +1210,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (client) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(260), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1219,7 +1221,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(260), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1230,7 +1232,7 @@
   { \
       /* Endpoint: 0, Cluster: Target Navigator (client) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(266), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1241,18 +1243,18 @@
   { \
       /* Endpoint: 0, Cluster: Target Navigator (server) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(266), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Keypad Input (client) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(270), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1263,18 +1265,18 @@
   { \
       /* Endpoint: 0, Cluster: Keypad Input (server) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(269), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(270), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Content Launcher (client) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(272), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1285,18 +1287,18 @@
   { \
       /* Endpoint: 0, Cluster: Content Launcher (server) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(272), \
       .attributeCount = 4, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Application Basic (client) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(276), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1307,7 +1309,7 @@
   { \
       /* Endpoint: 0, Cluster: Application Basic (server) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(276), \
       .attributeCount = 10, \
       .clusterSize = 110, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1318,40 +1320,40 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(285), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(286), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(289), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (server) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(292), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(293), \
       .attributeCount = 7, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayScenesServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (client) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(300), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1362,29 +1364,29 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(300), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(302), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(303), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Basic (server) */ \
       .clusterId = 0x00000028,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(305), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(306), \
       .attributeCount = 22, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1395,12 +1397,12 @@
   { \
       /* Endpoint: 1, Cluster: Color Control (server) */ \
       .clusterId = 0x00000300,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(327), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(328), \
       .attributeCount = 7, \
       .clusterSize = 15, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayColorControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 118 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 117 ) ,\
       .generatedCommandList = nullptr ,\
     },\
 }
diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
index d727a39bbf9e7e..ac30cebcbe163f 100644
--- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
@@ -260,7 +260,7 @@ class Test_TC_DM_3_3_SimulatedSuite : public TestCommand
 class Test_TC_DM_2_3_SimulatedSuite : public TestCommand
 {
 public:
-    Test_TC_DM_2_3_SimulatedSuite() : TestCommand("Test_TC_DM_2_3_Simulated", 10)
+    Test_TC_DM_2_3_SimulatedSuite() : TestCommand("Test_TC_DM_2_3_Simulated", 21)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -288,7 +288,11 @@ class Test_TC_DM_2_3_SimulatedSuite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 9:
+        case 0:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            shouldContinue = true;
+            break;
+        case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -308,51 +312,93 @@ class Test_TC_DM_2_3_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "Wait for Arm Fail Safe");
-            return WaitCommand(GetEndpoint(0), GeneralCommissioning::Id, GeneralCommissioning::Commands::ArmFailSafe::Id);
+            LogStep(0, "Wait for the device to be commissioned");
+            ListFreer listFreer;
+            chip::app::Clusters::DelayCommands::Commands::WaitForCommissioning::Type value;
+            return WaitForCommissioning(kIdentityAlpha, value);
         }
         case 1: {
-            LogStep(1, "Wait for Set Regulatory Config");
-            return WaitCommand(GetEndpoint(0), GeneralCommissioning::Id, GeneralCommissioning::Commands::SetRegulatoryConfig::Id);
+            LogStep(1, "Log OnOff Test Startup");
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::Log::Type value;
+            value.message = chip::Span<const char>("*** Basic Cluster Tests Readygarbage: not in length on purpose", 29);
+            return Log(kIdentityAlpha, value);
         }
         case 2: {
-            LogStep(2, "Wait for Attestation Certificate Chain Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::CertificateChainRequest::Id);
+            LogStep(2, "Query Data Model Revision");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::DataModelRevision::Id);
         }
         case 3: {
-            LogStep(3, "Wait for Attestation Certificate Chain Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::CertificateChainRequest::Id);
+            LogStep(3, "Query Vendor Name");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::VendorName::Id);
         }
         case 4: {
-            LogStep(4, "Wait for Attestation Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::AttestationRequest::Id);
+            LogStep(4, "Query VendorID");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::VendorID::Id);
         }
         case 5: {
-            LogStep(5, "Wait for CSR Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Commands::CSRRequest::Id);
+            LogStep(5, "Query Product Name");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductName::Id);
         }
         case 6: {
-            LogStep(6, "Wait for Add Trusted Root Certificate Request");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id,
-                               OperationalCredentials::Commands::AddTrustedRootCertificate::Id);
+            LogStep(6, "Query ProductID");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductID::Id);
         }
         case 7: {
-            LogStep(7, "Wait for Add Op NOC");
-            return WaitCommand(GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Commands::AddNOC::Id);
+            LogStep(7, "Query Node Label");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::NodeLabel::Id);
         }
         case 8: {
-            LogStep(8, "Wait for Commissioning Complete");
-            return WaitCommand(GetEndpoint(0), GeneralCommissioning::Id, GeneralCommissioning::Commands::CommissioningComplete::Id);
+            LogStep(8, "Query User Location");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::Location::Id);
         }
         case 9: {
-            LogStep(9, "Wait 3000ms");
-            ListFreer listFreer;
-            chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-            value.ms = 3000UL;
-            return WaitForMs(kIdentityAlpha, value);
+            LogStep(9, "Query HardwareVersion");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::HardwareVersion::Id);
+        }
+        case 10: {
+            LogStep(10, "Query HardwareVersionString");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::HardwareVersionString::Id);
+        }
+        case 11: {
+            LogStep(11, "Query SoftwareVersion");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersion::Id);
+        }
+        case 12: {
+            LogStep(12, "Query SoftwareVersionString");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::SoftwareVersionString::Id);
+        }
+        case 13: {
+            LogStep(13, "Query ManufacturingDate");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ManufacturingDate::Id);
+        }
+        case 14: {
+            LogStep(14, "Query PartNumber");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::PartNumber::Id);
+        }
+        case 15: {
+            LogStep(15, "Query ProductURL");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductURL::Id);
+        }
+        case 16: {
+            LogStep(16, "Query ProductLabel");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::ProductLabel::Id);
+        }
+        case 17: {
+            LogStep(17, "Query SerialNumber");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::SerialNumber::Id);
+        }
+        case 18: {
+            LogStep(18, "Query LocalConfigDisabled");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::LocalConfigDisabled::Id);
+        }
+        case 19: {
+            LogStep(19, "Query Reachable");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::Reachable::Id);
+        }
+        case 20: {
+            LogStep(20, "Query UniqueID");
+            return WaitAttribute(GetEndpoint(0), Basic::Id, Basic::Attributes::UniqueID::Id);
         }
         }
         return CHIP_NO_ERROR;
diff --git a/zzz_generated/pump-app/zap-generated/CHIPClusters.h b/zzz_generated/pump-app/zap-generated/CHIPClusters.h
index 8b3eaa7d4bce1a..14ebe4216c29ba 100644
--- a/zzz_generated/pump-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/pump-app/zap-generated/CHIPClusters.h
@@ -30,13 +30,6 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT FlowMeasurementCluster : public ClusterBase
-{
-public:
-    FlowMeasurementCluster() : ClusterBase(app::Clusters::FlowMeasurement::Id) {}
-    ~FlowMeasurementCluster() {}
-};
-
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
@@ -51,19 +44,5 @@ class DLL_EXPORT OccupancySensingCluster : public ClusterBase
     ~OccupancySensingCluster() {}
 };
 
-class DLL_EXPORT PressureMeasurementCluster : public ClusterBase
-{
-public:
-    PressureMeasurementCluster() : ClusterBase(app::Clusters::PressureMeasurement::Id) {}
-    ~PressureMeasurementCluster() {}
-};
-
-class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
-{
-public:
-    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
-    ~TemperatureMeasurementCluster() {}
-};
-
 } // namespace Controller
 } // namespace chip
diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp
index c780d5f08e1a4b..61326d20165fff 100644
--- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp
@@ -99,43 +99,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace AdministratorCommissioning
 
-namespace DiagnosticLogs {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
-    CHIP_ERROR TLVError = CHIP_NO_ERROR;
-    bool wasHandled     = false;
-    {
-        switch (aCommandPath.mCommandId)
-        {
-        case Commands::RetrieveLogsRequest::Id: {
-            Commands::RetrieveLogsRequest::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
-            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
-                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
-            return;
-        }
-        }
-    }
-
-    if (CHIP_NO_ERROR != TLVError || !wasHandled)
-    {
-        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
-        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
-    }
-}
-
-} // namespace DiagnosticLogs
-
 namespace GeneralCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -192,7 +155,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
-namespace GroupKeyManagement {
+namespace GeneralDiagnostics {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
 {
@@ -201,39 +164,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     {
         switch (aCommandPath.mCommandId)
         {
-        case Commands::KeySetWrite::Id: {
-            Commands::KeySetWrite::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::KeySetRead::Id: {
-            Commands::KeySetRead::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::KeySetRemove::Id: {
-            Commands::KeySetRemove::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::KeySetReadAllIndices::Id: {
-            Commands::KeySetReadAllIndices::DecodableType commandData;
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
@@ -254,9 +190,9 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     }
 }
 
-} // namespace GroupKeyManagement
+} // namespace GeneralDiagnostics
 
-namespace Groups {
+namespace GroupKeyManagement {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
 {
@@ -265,57 +201,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     {
         switch (aCommandPath.mCommandId)
         {
-        case Commands::AddGroup::Id: {
-            Commands::AddGroup::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfGroupsClusterAddGroupCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::ViewGroup::Id: {
-            Commands::ViewGroup::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::GetGroupMembership::Id: {
-            Commands::GetGroupMembership::DecodableType commandData;
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
-        case Commands::RemoveGroup::Id: {
-            Commands::RemoveGroup::DecodableType commandData;
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
-        case Commands::RemoveAllGroups::Id: {
-            Commands::RemoveAllGroups::DecodableType commandData;
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
-        case Commands::AddGroupIfIdentifying::Id: {
-            Commands::AddGroupIfIdentifying::DecodableType commandData;
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
             if (TLVError == CHIP_NO_ERROR)
             {
-                wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData);
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
             }
             break;
         }
@@ -336,7 +254,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
     }
 }
 
-} // namespace Groups
+} // namespace GroupKeyManagement
 
 namespace Identify {
 
@@ -356,15 +274,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::TriggerEffect::Id: {
-            Commands::TriggerEffect::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfIdentifyClusterTriggerEffectCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -502,16 +411,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::AddOrUpdateWiFiNetwork::Id: {
-            Commands::AddOrUpdateWiFiNetwork::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled =
-                    emberAfNetworkCommissioningClusterAddOrUpdateWiFiNetworkCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
         case Commands::AddOrUpdateThreadNetwork::Id: {
             Commands::AddOrUpdateThreadNetwork::DecodableType commandData;
             TLVError = DataModel::Decode(aDataTlv, commandData);
@@ -642,33 +541,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::OffWithEffect::Id: {
-            Commands::OffWithEffect::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::OnWithRecallGlobalScene::Id: {
-            Commands::OnWithRecallGlobalScene::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::OnWithTimedOff::Id: {
-            Commands::OnWithTimedOff::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -772,16 +644,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -801,134 +663,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace OperationalCredentials
 
-namespace Scenes {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
-    CHIP_ERROR TLVError = CHIP_NO_ERROR;
-    bool wasHandled     = false;
-    {
-        switch (aCommandPath.mCommandId)
-        {
-        case Commands::AddScene::Id: {
-            Commands::AddScene::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterAddSceneCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::ViewScene::Id: {
-            Commands::ViewScene::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::RemoveScene::Id: {
-            Commands::RemoveScene::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::RemoveAllScenes::Id: {
-            Commands::RemoveAllScenes::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterRemoveAllScenesCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::StoreScene::Id: {
-            Commands::StoreScene::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::RecallScene::Id: {
-            Commands::RecallScene::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        case Commands::GetSceneMembership::Id: {
-            Commands::GetSceneMembership::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
-            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
-                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
-            return;
-        }
-        }
-    }
-
-    if (CHIP_NO_ERROR != TLVError || !wasHandled)
-    {
-        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
-        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
-    }
-}
-
-} // namespace Scenes
-
-namespace SoftwareDiagnostics {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
-    CHIP_ERROR TLVError = CHIP_NO_ERROR;
-    bool wasHandled     = false;
-    {
-        switch (aCommandPath.mCommandId)
-        {
-        case Commands::ResetWatermarks::Id: {
-            Commands::ResetWatermarks::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
-            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
-                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
-            return;
-        }
-        }
-    }
-
-    if (CHIP_NO_ERROR != TLVError || !wasHandled)
-    {
-        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
-        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
-    }
-}
-
-} // namespace SoftwareDiagnostics
-
 namespace ThreadNetworkDiagnostics {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -977,18 +711,15 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::AdministratorCommissioning::Id:
         Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::DiagnosticLogs::Id:
-        Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GroupKeyManagement::Id:
         Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::Groups::Id:
-        Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::Identify::Id:
         Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
@@ -1007,12 +738,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::OperationalCredentials::Id:
         Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::Scenes::Id:
-        Clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
-    case Clusters::SoftwareDiagnostics::Id:
-        Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::ThreadNetworkDiagnostics::Id:
         Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
index 8126a880e85c6b..85f5573eef2805 100644
--- a/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
@@ -25,32 +25,21 @@
     MatterAccessControlPluginServerInitCallback();                                                                                 \
     MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterBindingPluginServerInitCallback();                                                                                       \
     MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginClientInitCallback();                                                                               \
     MatterFlowMeasurementPluginServerInitCallback();                                                                               \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
     MatterOccupancySensingPluginClientInitCallback();                                                                              \
     MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
     MatterPressureMeasurementPluginServerInitCallback();                                                                           \
     MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
     MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterUserLabelPluginServerInitCallback();
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();
diff --git a/zzz_generated/pump-app/zap-generated/access.h b/zzz_generated/pump-app/zap-generated/access.h
index 3d45ccc23bbc34..bb4e23b8b2e797 100644
--- a/zzz_generated/pump-app/zap-generated/access.h
+++ b/zzz_generated/pump-app/zap-generated/access.h
@@ -36,23 +36,19 @@
     /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
@@ -64,23 +60,19 @@
     /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
@@ -92,23 +84,19 @@
     /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -119,17 +107,13 @@
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
-    40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \
-    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
@@ -138,17 +122,13 @@
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
-    16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     21, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
     33, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \
-    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
@@ -157,17 +137,13 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -184,14 +160,8 @@
     63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
     63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
     63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
-    4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
-    4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
-    4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
     3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
-    49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
@@ -204,11 +174,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -223,14 +188,8 @@
     1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
     3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
     4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
-    3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
-    4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
-    5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
     0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
-    2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
@@ -243,11 +202,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -262,14 +216,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
@@ -282,11 +230,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/pump-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp
index 3148ac54cec69b..e9fde2c7b8c439 100644
--- a/zzz_generated/pump-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/pump-app/zap-generated/callback-stub.cpp
@@ -38,15 +38,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_BASIC_CLUSTER_ID:
         emberAfBasicClusterInitCallback(endpoint);
         break;
+    case ZCL_BINDING_CLUSTER_ID:
+        emberAfBindingClusterInitCallback(endpoint);
+        break;
     case ZCL_DESCRIPTOR_CLUSTER_ID:
         emberAfDescriptorClusterInitCallback(endpoint);
         break;
-    case ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID:
-        emberAfDiagnosticLogsClusterInitCallback(endpoint);
-        break;
-    case ZCL_FIXED_LABEL_CLUSTER_ID:
-        emberAfFixedLabelClusterInitCallback(endpoint);
-        break;
     case ZCL_FLOW_MEASUREMENT_CLUSTER_ID:
         emberAfFlowMeasurementClusterInitCallback(endpoint);
         break;
@@ -59,18 +56,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
         emberAfGroupKeyManagementClusterInitCallback(endpoint);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
-        emberAfGroupsClusterInitCallback(endpoint);
-        break;
     case ZCL_IDENTIFY_CLUSTER_ID:
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
     case ZCL_LEVEL_CONTROL_CLUSTER_ID:
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID:
-        emberAfLocalizationConfigurationClusterInitCallback(endpoint);
-        break;
     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
@@ -95,27 +86,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID:
         emberAfPumpConfigurationAndControlClusterInitCallback(endpoint);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
-        emberAfScenesClusterInitCallback(endpoint);
-        break;
-    case ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID:
-        emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
-        break;
     case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
         emberAfTemperatureMeasurementClusterInitCallback(endpoint);
         break;
     case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID:
         emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
         break;
-    case ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID:
-        emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
-        break;
-    case ZCL_UNIT_LOCALIZATION_CLUSTER_ID:
-        emberAfUnitLocalizationClusterInitCallback(endpoint);
-        break;
-    case ZCL_USER_LABEL_CLUSTER_ID:
-        emberAfUserLabelClusterInitCallback(endpoint);
-        break;
     default:
         // Unrecognized cluster ID
         break;
@@ -137,17 +113,12 @@ void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint)
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
-void __attribute__((weak)) emberAfDiagnosticLogsClusterInitCallback(EndpointId endpoint)
+void __attribute__((weak)) emberAfBindingClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfFixedLabelClusterInitCallback(EndpointId endpoint)
+void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
     (void) endpoint;
@@ -172,11 +143,6 @@ void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(Endpoint
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfGroupsClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
 void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -187,11 +153,6 @@ void __attribute__((weak)) emberAfLevelControlClusterInitCallback(EndpointId end
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
 void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -232,16 +193,6 @@ void __attribute__((weak)) emberAfPumpConfigurationAndControlClusterInitCallback
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfScenesClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
-void __attribute__((weak)) emberAfSoftwareDiagnosticsClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
 void __attribute__((weak)) emberAfTemperatureMeasurementClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -252,21 +203,6 @@ void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(En
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfTimeFormatLocalizationClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
-void __attribute__((weak)) emberAfUnitLocalizationClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
-void __attribute__((weak)) emberAfUserLabelClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
 
 //
 // Non-Cluster Related Callbacks
diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h
index 0bb60d2dea8819..664df947e76c00 100644
--- a/zzz_generated/pump-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h
@@ -29,75 +29,25 @@
 #define GENERATED_DEFAULTS                                                                                                         \
     {                                                                                                                              \
                                                                                                                                    \
-        /* Endpoint: 0, Cluster: Localization Configuration (server), big-endian */                                                \
+        /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                     \
                                                                                                                                    \
-        /* 0 - ActiveLocale, */                                                                                                    \
-        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                 \
-                                                                                                                                   \
-            /* 6 - Breadcrumb, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+        /* 0 - Breadcrumb, */                                                                                                      \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                            \
     }
 
 #else // !BIGENDIAN_CPU
 #define GENERATED_DEFAULTS                                                                                                         \
     {                                                                                                                              \
                                                                                                                                    \
-        /* Endpoint: 0, Cluster: Localization Configuration (server), little-endian */                                             \
-                                                                                                                                   \
-        /* 0 - ActiveLocale, */                                                                                                    \
-        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                              \
-                                                                                                                                   \
-            /* 6 - Breadcrumb, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
+        /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                                  \
                                                                                                                                    \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
+        /* 0 - Breadcrumb, */                                                                                                      \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                            \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (8)
+#define GENERATED_DEFAULTS_COUNT (1)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -118,18 +68,12 @@
     }
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
-#define GENERATED_MIN_MAX_DEFAULT_COUNT 5
+#define GENERATED_MIN_MAX_DEFAULT_COUNT 3
 #define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
     {                                                                                                                              \
                                                                                                                                    \
-        /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                              \
-        { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */                                                       \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
-            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 }, /* StartUpOnOff */                                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
-            { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 }, /* options */                                                      \
+        /* Endpoint: 1, Cluster: Level Control (server) */                                                                         \
+        { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 }, /* options */                                                          \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */                                                    \
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 }, /* OperationMode */                                                \
@@ -140,32 +84,12 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 268
+#define GENERATED_ATTRIBUTE_COUNT 169
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
-        /* Endpoint: 0, Cluster: Identify (server) */                                                                              \
-        { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0) }, /* identify time */            \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x0) },                         /* identify type */            \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                        /* FeatureMap */               \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                          /* ClusterRevision */          \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Groups (server) */                                                                            \
-            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Scenes (server) */                                                                            \
-            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* SceneCount */                                 \
-            { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* CurrentScene */                               \
-            { 0x00000002, ZAP_TYPE(GROUP_ID), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* CurrentGroup */                               \
-            { 0x00000003, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* SceneValid */                                 \
-            { 0x00000004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* NameSupport */                                \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },      /* FeatureMap */                                 \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },        /* ClusterRevision */                            \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Descriptor (server) */                                                                        \
-            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* device list */      \
+        /* Endpoint: 0, Cluster: Descriptor (server) */                                                                            \
+        { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },      /* device list */      \
             { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* server list */      \
             { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* client list */      \
             { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* parts list */       \
@@ -220,50 +144,22 @@
             { 0x0000000E, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
               ZAP_EMPTY_DEFAULT() }, /* ProductLabel */                                                                            \
             { 0x0000000F, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
-              ZAP_EMPTY_DEFAULT() }, /* SerialNumber */                                                                            \
-            { 0x00000010, ZAP_TYPE(BOOLEAN), 1,                                                                                    \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
-              ZAP_SIMPLE_DEFAULT(0) },                                                                  /* LocalConfigDisabled */  \
-            { 0x00000011, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* Reachable */            \
-            { 0x00000012, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON),          \
-              ZAP_EMPTY_DEFAULT() },                                                                        /* UniqueID */         \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* SerialNumber */     \
             { 0x00000013, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CapabilityMinima */ \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0) },    /* FeatureMap */       \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) },      /* ClusterRevision */  \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                     \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                               /* DefaultOtaProviders */       \
             { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) },                        /* UpdatePossible */            \
             { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) },                          /* UpdateState */               \
             { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* UpdateStateProgress */       \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                       /* FeatureMap */                \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                         /* ClusterRevision */           \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(CHAR_STRING), 36, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                  \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                                /* ActiveLocale */      \
-            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedLocales */  \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                          \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1,                                                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                           \
-              ZAP_MIN_MAX_DEFAULTS_INDEX(0) }, /* HourFormat */                                                                    \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
-              ZAP_SIMPLE_DEFAULT(0) }, /* ActiveCalendarType */                                                                    \
-            { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* SupportedCalendarTypes */                          \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Unit Localization (server) */                                                                 \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                         \
-              ZAP_SIMPLE_DEFAULT(0) },                                         /* TemperatureUnit */                               \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x1) }, /* FeatureMap */                                    \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },     /* ClusterRevision */                               \
-                                                                                                                                   \
             /* Endpoint: 0, Cluster: General Commissioning (server) */                                                             \
-            { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(6) }, /* Breadcrumb */        \
+            { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Breadcrumb */        \
             { 0x00000001, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
               ZAP_EMPTY_DEFAULT() }, /* BasicCommissioningInfo */                                                                  \
             { 0x00000002, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RegulatoryConfig */  \
@@ -286,102 +182,48 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(2) },                        /* FeatureMap */               \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                          /* ClusterRevision */          \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                   \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
-                                                                                                                                   \
             /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \
             { 0x00000001, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RebootCount */      \
-            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* UpTime */           \
-            { 0x00000003, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
-              ZAP_EMPTY_DEFAULT() }, /* TotalOperationalHours */                                                                   \
-            { 0x00000004, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* BootReasons */       \
-            { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
-            { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
-            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                              \
-            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() },  /* ThreadMetrics */    \
-            { 0x00000001, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CurrentHeapFree */  \
-            { 0x00000002, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CurrentHeapUsed */  \
-            { 0x00000003, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
-              ZAP_EMPTY_DEFAULT() },                                         /* CurrentHeapHighWatermark */                        \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* MeshLocalPrefix */   \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000F) }, /* FeatureMap */                                 \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* FeatureMap */                                 \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },        /* ClusterRevision */                            \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
@@ -389,7 +231,7 @@
             { 0x00000001, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
               ZAP_EMPTY_DEFAULT() },                                                                        /* AdminFabricIndex */ \
             { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AdminVendorId */    \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) },                                /* FeatureMap */       \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                           \
@@ -416,51 +258,26 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
-            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: User Label (server) */                                                                        \
-            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
-              ZAP_EMPTY_DEFAULT() },                                         /* label list */                                      \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+            /* Endpoint: 1, Cluster: Identify (server) */                                                                          \
+            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0) }, /* identify time */        \
+            { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x2) },                             /* identify type */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                            /* FeatureMap */           \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },                              /* ClusterRevision */      \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
-            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                        /* OnOff */                  \
-            { 0x00004000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) },                           /* GlobalSceneControl */     \
-            { 0x00004001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OnTime */                 \
-            { 0x00004002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OffWaitTime */            \
-            { 0x00004003, ZAP_TYPE(ENUM8), 1,                                                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                           \
-              ZAP_MIN_MAX_DEFAULTS_INDEX(1) },                               /* StartUpOnOff */                                    \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
+            { 0x00000000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */                                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },   /* FeatureMap */                                    \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },     /* ClusterRevision */                               \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
-            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* current level */                                \
-            { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* remaining time */                               \
-            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* min level */                                    \
-            { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xFE) },    /* max level */                                    \
-            { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* current frequency */                            \
-            { 0x00000005, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* min frequency */                                \
-            { 0x00000006, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* max frequency */                                \
+            { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* current level */                                   \
+            { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* min level */                                       \
+            { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xC8) }, /* max level */                                       \
             { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                        \
-              ZAP_MIN_MAX_DEFAULTS_INDEX(2) }, /* options */                                                                       \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                       \
-              ZAP_SIMPLE_DEFAULT(0x0000) }, /* on off transition time */                                                           \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(0) }, /* options */                                                                       \
             { 0x00000011, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
-              ZAP_SIMPLE_DEFAULT(0xFE) }, /* on level */                                                                           \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_EMPTY_DEFAULT() }, /* on transition time */                                                                      \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
-              ZAP_EMPTY_DEFAULT() }, /* off transition time */                                                                     \
-            { 0x00000014, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
-              ZAP_EMPTY_DEFAULT() }, /* default move rate */                                                                       \
-            { 0x00004000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                         \
-              ZAP_EMPTY_DEFAULT() },                                         /* start up current level */                          \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+              ZAP_SIMPLE_DEFAULT(0xFF) },                                    /* on level */                                        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
@@ -471,6 +288,12 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                /* FeatureMap */       \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
                                                                                                                                    \
+            /* Endpoint: 1, Cluster: Binding (server) */                                                                           \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                         /* Binding */                                         \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
             /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */                                                    \
             { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MaxPressure */       \
             { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* MaxSpeed */          \
@@ -485,9 +308,9 @@
             { 0x0000000A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* MaxConstFlow */      \
             { 0x0000000B, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MinConstTemp */      \
             { 0x0000000C, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MaxConstTemp */      \
-            { 0x00000010, ZAP_TYPE(BITMAP16), 2, 0, ZAP_EMPTY_DEFAULT() },                                 /* PumpStatus */        \
-            { 0x00000011, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* EffectiveOperationMode */                               \
-            { 0x00000012, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* EffectiveControlMode */                                 \
+            { 0x00000010, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* PumpStatus */        \
+            { 0x00000011, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* EffectiveOperationMode */                             \
+            { 0x00000012, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* EffectiveControlMode */                               \
             { 0x00000013, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* Capacity */          \
             { 0x00000014, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* Speed */             \
             { 0x00000015, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
@@ -496,9 +319,9 @@
             { 0x00000017, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0x00000000) }, /* LifetimeEnergyConsumed */                                                       \
             { 0x00000020, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
-              ZAP_MIN_MAX_DEFAULTS_INDEX(3) }, /* OperationMode */                                                                 \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(1) }, /* OperationMode */                                                                 \
             { 0x00000021, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE),                          \
-              ZAP_MIN_MAX_DEFAULTS_INDEX(4) },                               /* ControlMode */                                     \
+              ZAP_MIN_MAX_DEFAULTS_INDEX(2) },                               /* ControlMode */                                     \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -506,7 +329,7 @@
             { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MeasuredValue */     \
             { 0x00000001, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MinMeasuredValue */  \
             { 0x00000002, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) }, /* MaxMeasuredValue */  \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },                                   /* Tolerance */         \
+            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0) },                                 /* Tolerance */         \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                                 /* ClusterRevision */   \
                                                                                                                                    \
@@ -514,11 +337,11 @@
             { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* MeasuredValue */     \
             { 0x00000001, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* MinMeasuredValue */  \
             { 0x00000002, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* MaxMeasuredValue */  \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },                                   /* Tolerance */         \
+            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0) },                                 /* Tolerance */         \
             { 0x00000010, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* ScaledValue */       \
             { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) },      /* MinScaledValue */    \
             { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) },      /* MaxScaledValue */    \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },                                   /* ScaledTolerance */   \
+            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0) },                                 /* ScaledTolerance */   \
             { 0x00000014, ZAP_TYPE(INT8S), 1, 0, ZAP_SIMPLE_DEFAULT(0) },                                  /* Scale */             \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },                                 /* ClusterRevision */   \
@@ -527,7 +350,7 @@
             { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* MeasuredValue */     \
             { 0x00000001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* MinMeasuredValue */  \
             { 0x00000002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },        /* MaxMeasuredValue */  \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },                                   /* Tolerance */         \
+            { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0) },                                 /* Tolerance */         \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },                                 /* ClusterRevision */   \
     }
@@ -539,26 +362,12 @@
 
 // Cluster function static arrays
 #define GENERATED_FUNCTION_ARRAYS                                                                                                  \
-    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
-        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
-        (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback,                                       \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {                                                            \
-        (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,                                                    \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {                                                            \
-        (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,                                                    \
-    };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = {                                                             \
         (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback,                                                     \
     };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayLocalizationConfigurationServer[] = {                                         \
-        (EmberAfGenericClusterFunction) emberAfLocalizationConfigurationClusterServerInitCallback,                                 \
-        (EmberAfGenericClusterFunction) MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback,                   \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayTimeFormatLocalizationServer[] = {                                            \
-        (EmberAfGenericClusterFunction) emberAfTimeFormatLocalizationClusterServerInitCallback,                                    \
-        (EmberAfGenericClusterFunction) MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback,                      \
+    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
+        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
+        (EmberAfGenericClusterFunction) MatterIdentifyClusterServerAttributeChangedCallback,                                       \
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
         (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
@@ -574,96 +383,50 @@
 
 // clang-format off
 #define GENERATED_COMMANDS { \
-  /* Endpoint: 0, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=0) */ \
-  0x00000000 /* Identify */, \
-  0x00000040 /* TriggerEffect */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=3) */ \
-  0x00000000 /* AddGroup */, \
-  0x00000001 /* ViewGroup */, \
-  0x00000002 /* GetGroupMembership */, \
-  0x00000003 /* RemoveGroup */, \
-  0x00000004 /* RemoveAllGroups */, \
-  0x00000005 /* AddGroupIfIdentifying */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=10)*/ \
-  0x00000000 /* AddGroupResponse */, \
-  0x00000001 /* ViewGroupResponse */, \
-  0x00000002 /* GetGroupMembershipResponse */, \
-  0x00000003 /* RemoveGroupResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Scenes (server) */\
-  /*   AcceptedCommandList (index=15) */ \
-  0x00000000 /* AddScene */, \
-  0x00000001 /* ViewScene */, \
-  0x00000002 /* RemoveScene */, \
-  0x00000003 /* RemoveAllScenes */, \
-  0x00000004 /* StoreScene */, \
-  0x00000005 /* RecallScene */, \
-  0x00000006 /* GetSceneMembership */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=23)*/ \
-  0x00000000 /* AddSceneResponse */, \
-  0x00000001 /* ViewSceneResponse */, \
-  0x00000002 /* RemoveSceneResponse */, \
-  0x00000003 /* RemoveAllScenesResponse */, \
-  0x00000004 /* StoreSceneResponse */, \
-  0x00000006 /* GetSceneMembershipResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\
-  /*   AcceptedCommandList (index=30) */ \
+  /*   AcceptedCommandList (index=0) */ \
   0x00000000 /* AnnounceOtaProvider */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: General Commissioning (server) */\
-  /*   AcceptedCommandList (index=32) */ \
+  /*   AcceptedCommandList (index=2) */ \
   0x00000000 /* ArmFailSafe */, \
   0x00000002 /* SetRegulatoryConfig */, \
   0x00000004 /* CommissioningComplete */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=36)*/ \
+  /*   GeneratedCommandList (index=6)*/ \
   0x00000001 /* ArmFailSafeResponse */, \
   0x00000003 /* SetRegulatoryConfigResponse */, \
   0x00000005 /* CommissioningCompleteResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Network Commissioning (server) */\
-  /*   AcceptedCommandList (index=40) */ \
+  /*   AcceptedCommandList (index=10) */ \
   0x00000000 /* ScanNetworks */, \
-  0x00000002 /* AddOrUpdateWiFiNetwork */, \
   0x00000003 /* AddOrUpdateThreadNetwork */, \
   0x00000004 /* RemoveNetwork */, \
   0x00000006 /* ConnectNetwork */, \
   0x00000008 /* ReorderNetwork */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=47)*/ \
+  /*   GeneratedCommandList (index=16)*/ \
   0x00000001 /* ScanNetworksResponse */, \
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\
-  /*   AcceptedCommandList (index=51) */ \
-  0x00000000 /* RetrieveLogsRequest */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=53)*/ \
-  0x00000001 /* RetrieveLogsResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
-  /*   AcceptedCommandList (index=55) */ \
-  0x00000000 /* ResetWatermarks */, \
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
+  /*   AcceptedCommandList (index=20) */ \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=57) */ \
+  /*   AcceptedCommandList (index=22) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=59) */ \
+  /*   AcceptedCommandList (index=24) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=63) */ \
+  /*   AcceptedCommandList (index=28) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -672,36 +435,36 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=73)*/ \
+  /*   GeneratedCommandList (index=37)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Group Key Management (server) */\
-  /*   AcceptedCommandList (index=78) */ \
+  /*   AcceptedCommandList (index=42) */ \
   0x00000000 /* KeySetWrite */, \
   0x00000001 /* KeySetRead */, \
   0x00000003 /* KeySetRemove */, \
   0x00000004 /* KeySetReadAllIndices */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=83)*/ \
+  /*   GeneratedCommandList (index=47)*/ \
   0x00000002 /* KeySetReadResponse */, \
   0x00000005 /* KeySetReadAllIndicesResponse */, \
   chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 1, Cluster: Identify (server) */\
+  /*   AcceptedCommandList (index=50) */ \
+  0x00000000 /* Identify */, \
+  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=86) */ \
+  /*   AcceptedCommandList (index=52) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
-  0x00000040 /* OffWithEffect */, \
-  0x00000041 /* OnWithRecallGlobalScene */, \
-  0x00000042 /* OnWithTimedOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=93) */ \
+  /*   AcceptedCommandList (index=56) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -716,47 +479,14 @@
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 33
+#define GENERATED_CLUSTER_COUNT 22
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
-  { \
-      /* Endpoint: 0, Cluster: Identify (server) */ \
-      .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(0), \
-      .attributeCount = 4, \
-      .clusterSize = 9, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
-      .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\
-      .generatedCommandList = nullptr ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Groups (server) */ \
-      .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(4), \
-      .attributeCount = 3, \
-      .clusterSize = 7, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
-      .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Scenes (server) */ \
-      .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(7), \
-      .attributeCount = 7, \
-      .clusterSize = 12, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
-      .functions = chipFuncArrayScenesServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
-    },\
   { \
       /* Endpoint: 0, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(14), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(0), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -767,7 +497,7 @@
   { \
       /* Endpoint: 0, Cluster: Access Control (server) */ \
       .clusterId = 0x0000001F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(20), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(6), \
       .attributeCount = 7, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -778,9 +508,9 @@
   { \
       /* Endpoint: 0, Cluster: Basic (server) */ \
       .clusterId = 0x00000028,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(27), \
-      .attributeCount = 22, \
-      .clusterSize = 41, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(13), \
+      .attributeCount = 19, \
+      .clusterSize = 39, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayBasicServer, \
       .acceptedCommandList = nullptr ,\
@@ -789,7 +519,7 @@
   { \
       /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \
       .clusterId = 0x00000029,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(49), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(32), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -800,194 +530,128 @@
   { \
       /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \
       .clusterId = 0x0000002A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(49), \
-      .attributeCount = 5, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(32), \
+      .attributeCount = 6, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
-      .generatedCommandList = nullptr ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Localization Configuration (server) */ \
-      .clusterId = 0x0000002B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(54), \
-      .attributeCount = 4, \
-      .clusterSize = 42, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
-      .functions = chipFuncArrayLocalizationConfigurationServer, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Time Format Localization (server) */ \
-      .clusterId = 0x0000002C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(58), \
-      .attributeCount = 5, \
-      .clusterSize = 8, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
-      .functions = chipFuncArrayTimeFormatLocalizationServer, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Unit Localization (server) */ \
-      .clusterId = 0x0000002D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(63), \
-      .attributeCount = 3, \
-      .clusterSize = 7, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: General Commissioning (server) */ \
       .clusterId = 0x00000030,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(66), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(38), \
       .attributeCount = 7, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 2 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 6 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Network Commissioning (server) */ \
       .clusterId = 0x00000031,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(73), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(45), \
       .attributeCount = 10, \
       .clusterSize = 48, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \
-      .clusterId = 0x00000032,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(83), \
-      .attributeCount = 2, \
-      .clusterSize = 6, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 16 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(85), \
-      .attributeCount = 10, \
-      .clusterSize = 6, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
-      .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(95), \
-      .attributeCount = 6, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(55), \
+      .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 20 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(101), \
-      .attributeCount = 65, \
-      .clusterSize = 247, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(60), \
+      .attributeCount = 19, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(166), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(79), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(171), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(84), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(92), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
-    },\
-  { \
-      /* Endpoint: 0, Cluster: Fixed Label (server) */ \
-      .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(185), \
-      .attributeCount = 3, \
-      .clusterSize = 6, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
     },\
   { \
-      /* Endpoint: 0, Cluster: User Label (server) */ \
-      .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(188), \
-      .attributeCount = 3, \
-      .clusterSize = 6, \
-      .mask = ZAP_CLUSTER_MASK(SERVER), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      /* Endpoint: 1, Cluster: Identify (server) */ \
+      .clusterId = 0x00000003,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(98), \
+      .attributeCount = 4, \
+      .clusterSize = 9, \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
+      .functions = chipFuncArrayIdentifyServer, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
-      .attributeCount = 7, \
-      .clusterSize = 13, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(102), \
+      .attributeCount = 3, \
+      .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(198), \
-      .attributeCount = 16, \
-      .clusterSize = 27, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(105), \
+      .attributeCount = 7, \
+      .clusterSize = 11, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 93 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(112), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -995,10 +659,21 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
+  { \
+      /* Endpoint: 1, Cluster: Binding (server) */ \
+      .clusterId = 0x0000001E,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(118), \
+      .attributeCount = 3, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = nullptr ,\
+      .generatedCommandList = nullptr ,\
+    },\
   { \
       /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \
       .clusterId = 0x00000200,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(220), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(121), \
       .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), \
@@ -1006,21 +681,10 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
-  { \
-      /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \
-      .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(245), \
-      .attributeCount = 0, \
-      .clusterSize = 0, \
-      .mask = ZAP_CLUSTER_MASK(CLIENT), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
   { \
       /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(245), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(146), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1028,21 +692,10 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
-  { \
-      /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \
-      .clusterId = 0x00000403,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(251), \
-      .attributeCount = 0, \
-      .clusterSize = 0, \
-      .mask = ZAP_CLUSTER_MASK(CLIENT), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
   { \
       /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \
       .clusterId = 0x00000403,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
       .attributeCount = 11, \
       .clusterSize = 23, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1050,21 +703,10 @@
       .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
-  { \
-      /* Endpoint: 1, Cluster: Flow Measurement (client) */ \
-      .clusterId = 0x00000404,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(262), \
-      .attributeCount = 0, \
-      .clusterSize = 0, \
-      .mask = ZAP_CLUSTER_MASK(CLIENT), \
-      .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
-    },\
   { \
       /* Endpoint: 1, Cluster: Flow Measurement (server) */ \
       .clusterId = 0x00000404,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(262), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(163), \
       .attributeCount = 6, \
       .clusterSize = 14, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1075,7 +717,7 @@
   { \
       /* Endpoint: 1, Cluster: Occupancy Sensing (client) */ \
       .clusterId = 0x00000406,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(169), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1089,12 +731,12 @@
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 28
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 20
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 22, 502 }, { ZAP_CLUSTER_INDEX(22), 11, 147 },                                                     \
+        { ZAP_CLUSTER_INDEX(0), 12, 150 }, { ZAP_CLUSTER_INDEX(12), 10, 140 },                                                     \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1103,10 +745,10 @@
 static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, "ATTRIBUTE_LARGEST larger than expected");
 
 // Total size of singleton attributes
-#define ATTRIBUTE_SINGLETONS_SIZE (41)
+#define ATTRIBUTE_SINGLETONS_SIZE (39)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (649)
+#define ATTRIBUTE_MAX_SIZE (290)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/pump-app/zap-generated/gen_config.h b/zzz_generated/pump-app/zap-generated/gen_config.h
index d516a0c2ed2b06..7988c70a4c19a2 100644
--- a/zzz_generated/pump-app/zap-generated/gen_config.h
+++ b/zzz_generated/pump-app/zap-generated/gen_config.h
@@ -32,35 +32,24 @@
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
@@ -79,25 +68,16 @@
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
+
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the client side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_CLIENT
-
 // Use this macro to check if the server side of the Flow Measurement cluster is included
 #define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
@@ -118,11 +98,6 @@
 #define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
 #define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
 // Use this macro to check if the server side of the Identify cluster is included
 #define ZCL_USING_IDENTIFY_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY_SERVER
@@ -137,11 +112,6 @@
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
@@ -170,10 +140,6 @@
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the client side of the Pressure Measurement cluster is included
-#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_CLIENT
-
 // Use this macro to check if the server side of the Pressure Measurement cluster is included
 #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
@@ -184,32 +150,6 @@
 #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
-
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
-
-// Use this macro to check if the client side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
-
 // Use this macro to check if the server side of the Temperature Measurement cluster is included
 #define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
@@ -219,18 +159,3 @@
 #define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
-
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
-
-// Use this macro to check if the server side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL
diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
index 1fbaac613c6dcd..85464b5b392847 100644
--- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace GroupKeyManagement {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -590,16 +627,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -710,6 +737,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GroupKeyManagement::Id:
         Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/pump-controller-app/zap-generated/access.h b/zzz_generated/pump-controller-app/zap-generated/access.h
index 7be6ab062f370a..7bc14573de66b3 100644
--- a/zzz_generated/pump-controller-app/zap-generated/access.h
+++ b/zzz_generated/pump-controller-app/zap-generated/access.h
@@ -168,7 +168,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -203,7 +202,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -238,7 +236,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
index cf152754a4a3d8..fca68d9283b3bd 100644
--- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h
@@ -38,26 +38,6 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #else // !BIGENDIAN_CPU
@@ -73,31 +53,11 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (8)
+#define GENERATED_DEFAULTS_COUNT (2)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -130,7 +90,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 190
+#define GENERATED_ATTRIBUTE_COUNT 191
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -282,7 +242,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -296,69 +258,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -501,22 +496,26 @@
   /*   GeneratedCommandList (index=38)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=40) */ \
+  0x00000000 /* TestEventTrigger */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /*   AcceptedCommandList (index=42) */ \
   0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=42) */ \
+  /*   AcceptedCommandList (index=44) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=44) */ \
+  /*   AcceptedCommandList (index=46) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=48) */ \
+  /*   AcceptedCommandList (index=50) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -525,22 +524,21 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=58)*/ \
+  /*   GeneratedCommandList (index=59)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Group Key Management (server) */\
-  /*   AcceptedCommandList (index=63) */ \
+  /*   AcceptedCommandList (index=64) */ \
   0x00000000 /* KeySetWrite */, \
   0x00000001 /* KeySetRead */, \
   0x00000003 /* KeySetRemove */, \
   0x00000004 /* KeySetReadAllIndices */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=68)*/ \
+  /*   GeneratedCommandList (index=69)*/ \
   0x00000002 /* KeySetReadResponse */, \
   0x00000005 /* KeySetReadAllIndicesResponse */, \
   chip::kInvalidCommandId /* end of list */, \
@@ -700,72 +698,72 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(78), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(89), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(94), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(95), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(159), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(160), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(164), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(165), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(172), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(173), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -776,7 +774,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -787,7 +785,7 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (client) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(184), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(185), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -798,7 +796,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(184), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(185), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -809,7 +807,7 @@
   { \
       /* Endpoint: 1, Cluster: Pump Configuration and Control (client) */ \
       .clusterId = 0x00000200,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -820,7 +818,7 @@
   { \
       /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -831,7 +829,7 @@
   { \
       /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \
       .clusterId = 0x00000403,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -842,7 +840,7 @@
   { \
       /* Endpoint: 1, Cluster: Flow Measurement (client) */ \
       .clusterId = 0x00000404,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(190), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -861,7 +859,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 21, 490 }, { ZAP_CLUSTER_INDEX(21), 6, 4 },                                                        \
+        { ZAP_CLUSTER_INDEX(0), 21, 249 }, { ZAP_CLUSTER_INDEX(21), 6, 4 },                                                        \
     }
 
 // Largest attribute size is needed for various buffers
@@ -873,7 +871,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (41)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (494)
+#define ATTRIBUTE_MAX_SIZE (253)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp
index ce1245902a327f..cd64be13f4c933 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp
@@ -136,6 +136,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace DiagnosticLogs
 
+namespace EthernetNetworkDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetCounts::Id: {
+            Commands::ResetCounts::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace EthernetNetworkDiagnostics
+
 namespace GeneralCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -192,6 +229,107 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
 namespace NetworkCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -350,16 +488,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -393,9 +521,18 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::DiagnosticLogs::Id:
         Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::EthernetNetworkDiagnostics::Id:
+        Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::NetworkCommissioning::Id:
         Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
index da68cbb2b4e726..362242ef8d745c 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
@@ -31,6 +31,7 @@
     MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/access.h b/zzz_generated/temperature-measurement-app/zap-generated/access.h
index 2c0a0bdf2e021d..dbbc07cdd0f8c0 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/access.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/access.h
@@ -38,6 +38,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -59,6 +60,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -80,6 +82,7 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -100,6 +103,7 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -112,6 +116,7 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -124,6 +129,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
@@ -138,6 +144,10 @@
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
@@ -151,7 +161,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -162,6 +171,10 @@
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
@@ -175,7 +188,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -186,6 +198,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
@@ -199,7 +215,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp
index cd1b5d59ee6e47..aed58a11790ccc 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp
@@ -56,6 +56,9 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID:
         emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
         break;
+    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        emberAfGroupKeyManagementClusterInitCallback(endpoint);
+        break;
     case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID:
         emberAfLocalizationConfigurationClusterInitCallback(endpoint);
         break;
@@ -134,6 +137,11 @@ void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(Endpoint
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
index 3b85e38a29cdf1..cb879a8fba6cf0 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h
@@ -90,7 +90,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 135
+#define GENERATED_ATTRIBUTE_COUNT 142
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -224,7 +224,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -295,6 +297,17 @@
             { 0x00000005, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                           \
               ZAP_EMPTY_DEFAULT() },                                         /* CurrentFabricIndex */                              \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
+                                                                                                                                   \
+            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
+            { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
+              ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
+            { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
@@ -376,9 +389,9 @@
   /*   GeneratedCommandList (index=20)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=22) */ \
-  0x00000000 /* ResetWatermarks */, \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
   /*   AcceptedCommandList (index=24) */ \
@@ -400,20 +413,30 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=40)*/ \
+  /*   GeneratedCommandList (index=39)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=44) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=49)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
 }
 
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 19
+#define GENERATED_CLUSTER_COUNT 20
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
@@ -520,28 +543,28 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(66), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(76), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(77), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(79), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(80), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -552,7 +575,7 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(94), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(95), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -563,7 +586,7 @@
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(105), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(106), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -574,18 +597,29 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(110), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(111), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
+    },\
+  { \
+      /* Endpoint: 0, Cluster: Group Key Management (server) */ \
+      .clusterId = 0x0000003F,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(119), \
+      .attributeCount = 6, \
+      .clusterSize = 6, \
+      .mask = ZAP_CLUSTER_MASK(SERVER), \
+      .functions = NULL, \
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(118), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(125), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -596,7 +630,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(121), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(128), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -607,7 +641,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(124), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(131), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -618,7 +652,7 @@
   { \
       /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
       .clusterId = 0x00000402,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(130), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(137), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -632,12 +666,12 @@
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 19
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 20
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 17, 224 }, { ZAP_CLUSTER_INDEX(17), 2, 16 },                                                       \
+        { ZAP_CLUSTER_INDEX(0), 18, 230 }, { ZAP_CLUSTER_INDEX(18), 2, 16 },                                                       \
     }
 
 // Largest attribute size is needed for various buffers
@@ -649,7 +683,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (240)
+#define ATTRIBUTE_MAX_SIZE (246)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h
index 0cb719c581683b..8182f0676f4ee4 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h
@@ -38,6 +38,7 @@
 #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -95,6 +96,11 @@
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp
index 09257ab10bc845..3e268d6de55364 100644
--- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp
@@ -192,6 +192,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace Groups {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -536,16 +573,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -701,15 +728,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::GetRelayStatusLog::Id: {
-            Commands::GetRelayStatusLog::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfThermostatClusterGetRelayStatusLogCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -746,6 +764,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::Groups::Id:
         Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/thermostat/zap-generated/access.h b/zzz_generated/thermostat/zap-generated/access.h
index 0431ddfe496e8e..e0d3abe66c821f 100644
--- a/zzz_generated/thermostat/zap-generated/access.h
+++ b/zzz_generated/thermostat/zap-generated/access.h
@@ -205,7 +205,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -241,7 +240,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -277,7 +275,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
diff --git a/zzz_generated/thermostat/zap-generated/af-gen-event.h b/zzz_generated/thermostat/zap-generated/af-gen-event.h
index 1ac6e779ffc82d..f444588bb40d31 100644
--- a/zzz_generated/thermostat/zap-generated/af-gen-event.h
+++ b/zzz_generated/thermostat/zap-generated/af-gen-event.h
@@ -43,13 +43,10 @@
 #define EMBER_AF_GENERATED_EVENT_CODE                                                                                              \
     EmberEventControl emberAfLevelControlClusterServerTickCallbackControl1;                                                        \
     EmberEventControl emberAfBarrierControlClusterServerTickCallbackControl1;                                                      \
-    EmberEventControl emberAfIasZoneClusterServerTickCallbackControl1;                                                             \
-    extern EmberEventControl emberAfPluginIasZoneServerManageQueueEventControl;                                                    \
     extern void emberAfPluginColorControlServerTempTransitionEventHandler(void);                                                   \
     extern void emberAfPluginColorControlServerXyTransitionEventHandler(void);                                                     \
     extern void emberAfPluginDoorLockServerLockoutEventHandler(void);                                                              \
     extern void emberAfPluginDoorLockServerRelockEventHandler(void);                                                               \
-    extern void emberAfPluginIasZoneServerManageQueueEventHandler(void);                                                           \
     static void clusterTickWrapper(EmberEventControl * control, EmberAfTickFunction callback, chip::EndpointId endpoint)           \
     {                                                                                                                              \
         /* emberAfPushEndpointNetworkIndex(endpoint); */                                                                           \
@@ -66,35 +63,26 @@
     {                                                                                                                              \
         clusterTickWrapper(&emberAfBarrierControlClusterServerTickCallbackControl1,                                                \
                            emberAfBarrierControlClusterServerTickCallback, 1);                                                     \
-    }                                                                                                                              \
-    void emberAfIasZoneClusterServerTickCallbackWrapperFunction1(void)                                                             \
-    {                                                                                                                              \
-        clusterTickWrapper(&emberAfIasZoneClusterServerTickCallbackControl1, emberAfIasZoneClusterServerTickCallback, 1);          \
     }
 
 // EmberEventData structs used to populate the EmberEventData table
 #define EMBER_AF_GENERATED_EVENTS                                                                                                  \
     { &emberAfLevelControlClusterServerTickCallbackControl1, emberAfLevelControlClusterServerTickCallbackWrapperFunction1 },       \
         { &emberAfBarrierControlClusterServerTickCallbackControl1,                                                                 \
-          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },                                                        \
-        { &emberAfIasZoneClusterServerTickCallbackControl1, emberAfIasZoneClusterServerTickCallbackWrapperFunction1 },             \
-        { &emberAfPluginIasZoneServerManageQueueEventControl, emberAfPluginIasZoneServerManageQueueEventHandler },
+          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
 
 #define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
-    "Level Control Cluster Server EP 1", "Barrier Control Cluster Server EP 1", "IAS Zone Cluster Server EP 1",                    \
+    "Level Control Cluster Server EP 1", "Barrier Control Cluster Server EP 1",                                                    \
         "Color Control Cluster Server Plugin HueSatTransition", "Color Control Cluster Server Plugin TempTransition",              \
         "Color Control Cluster Server Plugin XyTransition", "Door Lock Server Cluster Plugin Lockout",                             \
         "Door Lock Server Cluster Plugin Relock", "IAS Zone Server Plugin ManageQueue",
 
 // The length of the event context table used to track and retrieve cluster events
-#define EMBER_AF_EVENT_CONTEXT_LENGTH 3
+#define EMBER_AF_EVENT_CONTEXT_LENGTH 2
 
 // EmberAfEventContext structs used to populate the EmberAfEventContext table
 #define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
     { 0x1, 0x8, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfLevelControlClusterServerTickCallbackControl1 },          \
-        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },  \
-    {                                                                                                                              \
-        0x1, 0x500, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfIasZoneClusterServerTickCallbackControl1              \
-    }
+        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
 
 #endif // __AF_GEN_EVENT__
diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h
index 87daa98af585d8..77ebe359093bc0 100644
--- a/zzz_generated/thermostat/zap-generated/endpoint_config.h
+++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h
@@ -38,26 +38,6 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #else // !BIGENDIAN_CPU
@@ -73,31 +53,11 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (8)
+#define GENERATED_DEFAULTS_COUNT (2)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -141,7 +101,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 259
+#define GENERATED_ATTRIBUTE_COUNT 260
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -290,7 +250,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -304,69 +266,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -580,6 +575,7 @@
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayThermostatServer[] = {                                                        \
         (EmberAfGenericClusterFunction) emberAfThermostatClusterServerInitCallback,                                                \
+        (EmberAfGenericClusterFunction) MatterThermostatClusterServerPreAttributeChangedCallback,                                  \
     };
 
 // clang-format off
@@ -630,22 +626,18 @@
   /*   GeneratedCommandList (index=30)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=32) */ \
-  0x00000000 /* ResetWatermarks */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=34) */ \
-  0x00000000 /* ResetCounts */, \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=36) */ \
+  /*   AcceptedCommandList (index=34) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=40) */ \
+  /*   AcceptedCommandList (index=38) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -654,20 +646,19 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=50)*/ \
+  /*   GeneratedCommandList (index=47)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=55) */ \
+  /*   AcceptedCommandList (index=52) */ \
   0x00000000 /* Identify */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=57) */ \
+  /*   AcceptedCommandList (index=54) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -675,14 +666,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=64)*/ \
+  /*   GeneratedCommandList (index=61)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Scenes (server) */\
-  /*   AcceptedCommandList (index=69) */ \
+  /*   AcceptedCommandList (index=66) */ \
   0x00000000 /* AddScene */, \
   0x00000001 /* ViewScene */, \
   0x00000002 /* RemoveScene */, \
@@ -691,7 +682,7 @@
   0x00000005 /* RecallScene */, \
   0x00000006 /* GetSceneMembership */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=77)*/ \
+  /*   GeneratedCommandList (index=74)*/ \
   0x00000000 /* AddSceneResponse */, \
   0x00000001 /* ViewSceneResponse */, \
   0x00000002 /* RemoveSceneResponse */, \
@@ -700,16 +691,14 @@
   0x00000006 /* GetSceneMembershipResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Thermostat (server) */\
-  /*   AcceptedCommandList (index=84) */ \
+  /*   AcceptedCommandList (index=81) */ \
   0x00000000 /* SetpointRaiseLower */, \
   0x00000001 /* SetWeeklySchedule */, \
   0x00000002 /* GetWeeklySchedule */, \
   0x00000003 /* ClearWeeklySchedule */, \
-  0x00000004 /* GetRelayStatusLog */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=90)*/ \
+  /*   GeneratedCommandList (index=86)*/ \
   0x00000000 /* GetWeeklyScheduleResponse */, \
-  0x00000001 /* GetRelayStatusLogResponse */, \
   chip::kInvalidCommandId /* end of list */, \
 }
 
@@ -856,30 +845,30 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(74), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(84), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(85), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(90), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(91), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr ,\
@@ -888,7 +877,7 @@
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(155), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(156), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -899,40 +888,40 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(170), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(171), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(181), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(182), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(194), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
       .attributeCount = 4, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -943,7 +932,7 @@
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(199), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -954,7 +943,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(202), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -965,7 +954,7 @@
   { \
       /* Endpoint: 1, Cluster: Identify (client) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -976,40 +965,40 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(208), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(209), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (server) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(212), \
       .attributeCount = 7, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayScenesServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Basic (server) */ \
       .clusterId = 0x00000028,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
       .attributeCount = 22, \
       .clusterSize = 41, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -1020,13 +1009,13 @@
   { \
       /* Endpoint: 1, Cluster: Thermostat (server) */ \
       .clusterId = 0x00000201,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(240), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(241), \
       .attributeCount = 19, \
       .clusterSize = 34, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
+      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayThermostatServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
     },\
 }
 
@@ -1039,7 +1028,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 22, 497 }, { ZAP_CLUSTER_INDEX(22), 6, 103 },                                                      \
+        { ZAP_CLUSTER_INDEX(0), 22, 256 }, { ZAP_CLUSTER_INDEX(22), 6, 103 },                                                      \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1051,7 +1040,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (74)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (600)
+#define ATTRIBUTE_MAX_SIZE (359)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
index 2f0684a20266b2..ebfa8dcdd95cb5 100644
--- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
@@ -393,6 +393,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace DiagnosticLogs
 
+namespace EthernetNetworkDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::ResetCounts::Id: {
+            Commands::ResetCounts::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace EthernetNetworkDiagnostics
+
 namespace GeneralCommissioning {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -449,6 +486,107 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
+namespace GroupKeyManagement {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::KeySetWrite::Id: {
+            Commands::KeySetWrite::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRead::Id: {
+            Commands::KeySetRead::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetRemove::Id: {
+            Commands::KeySetRemove::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetRemoveCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        case Commands::KeySetReadAllIndices::Id: {
+            Commands::KeySetReadAllIndices::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GroupKeyManagement
+
 namespace KeypadInput {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -1094,16 +1232,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -1189,9 +1317,18 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::DiagnosticLogs::Id:
         Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::EthernetNetworkDiagnostics::Id:
+        Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
+    case Clusters::GroupKeyManagement::Id:
+        Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::KeypadInput::Id:
         Clusters::KeypadInput::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/tv-app/zap-generated/access.h b/zzz_generated/tv-app/zap-generated/access.h
index 0a6108294d0512..b2f2571d0c6328 100644
--- a/zzz_generated/tv-app/zap-generated/access.h
+++ b/zzz_generated/tv-app/zap-generated/access.h
@@ -150,6 +150,10 @@
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -164,7 +168,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -175,6 +178,10 @@
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -189,7 +196,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -200,6 +206,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
@@ -214,7 +224,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h
index d0987c2a5bfce2..28020740f1904e 100644
--- a/zzz_generated/tv-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h
@@ -39,52 +39,32 @@
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Media Playback (server), big-endian */                                                        \
                                                                                                                                    \
-            /* 55 - StartTime, */                                                                                                  \
+            /* 14 - StartTime, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 63 - Duration, */                                                                                                   \
+            /* 22 - Duration, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 71 - SeekRangeEnd, */                                                                                               \
+            /* 30 - SeekRangeEnd, */                                                                                               \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 79 - SeekRangeStart, */                                                                                             \
+            /* 38 - SeekRangeStart, */                                                                                             \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 3, Cluster: Media Playback (server), big-endian */                                                        \
                                                                                                                                    \
-            /* 87 - StartTime, */                                                                                                  \
+            /* 46 - StartTime, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,                                                                        \
                                                                                                                                    \
-            /* 95 - Duration, */                                                                                                   \
+            /* 54 - Duration, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 103 - SeekRangeEnd, */                                                                                              \
+            /* 62 - SeekRangeEnd, */                                                                                               \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 111 - SeekRangeStart, */                                                                                            \
+            /* 70 - SeekRangeStart, */                                                                                             \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
@@ -102,58 +82,38 @@
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Media Playback (server), little-endian */                                                     \
                                                                                                                                    \
-            /* 55 - StartTime, */                                                                                                  \
+            /* 14 - StartTime, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 63 - Duration, */                                                                                                   \
+            /* 22 - Duration, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 71 - SeekRangeEnd, */                                                                                               \
+            /* 30 - SeekRangeEnd, */                                                                                               \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 79 - SeekRangeStart, */                                                                                             \
+            /* 38 - SeekRangeStart, */                                                                                             \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 3, Cluster: Media Playback (server), little-endian */                                                     \
                                                                                                                                    \
-            /* 87 - StartTime, */                                                                                                  \
+            /* 46 - StartTime, */                                                                                                  \
             0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 95 - Duration, */                                                                                                   \
+            /* 54 - Duration, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 103 - SeekRangeEnd, */                                                                                              \
+            /* 62 - SeekRangeEnd, */                                                                                               \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 111 - SeekRangeStart, */                                                                                            \
+            /* 70 - SeekRangeStart, */                                                                                             \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (16)
+#define GENERATED_DEFAULTS_COUNT (10)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -186,7 +146,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 347
+#define GENERATED_ATTRIBUTE_COUNT 351
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -330,7 +290,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -344,69 +306,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -480,8 +475,12 @@
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE),                 \
               ZAP_EMPTY_DEFAULT() },                                                                       /* GroupKeyMap */       \
             { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* GroupTable */        \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
+            { 0x00000002, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* MaxGroupsPerFabric */                                                                      \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() },                                         /* MaxGroupKeysPerFabric */                           \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */        \
@@ -531,18 +530,18 @@
             /* Endpoint: 1, Cluster: Target Navigator (server) */                                                                  \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TargetList */        \
             { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0) },                                  /* CurrentTarget */     \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0001) },                          /* FeatureMap */        \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Media Playback (server) */                                                                    \
             { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                                  /* CurrentState */   \
-            { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(55) }, /* StartTime */      \
-            { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(63) },   /* Duration */       \
+            { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(14) }, /* StartTime */      \
+            { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(22) },   /* Duration */       \
             { 0x00000003, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() },                                                                        /* SampledPosition */  \
             { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                  /* PlaybackSpeed */    \
-            { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(71) }, /* SeekRangeEnd */     \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(79) }, /* SeekRangeStart */   \
+            { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(30) }, /* SeekRangeEnd */     \
+            { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(38) }, /* SeekRangeStart */   \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x003) },                            /* FeatureMap */       \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
                                                                                                                                    \
@@ -630,15 +629,15 @@
                                                                                                                                    \
             /* Endpoint: 3, Cluster: Media Playback (server) */                                                                    \
             { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                                  /* CurrentState */   \
-            { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(87) }, /* StartTime */      \
-            { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(95) },   /* Duration */       \
+            { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(46) }, /* StartTime */      \
+            { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(54) },   /* Duration */       \
             { 0x00000003, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
-              ZAP_EMPTY_DEFAULT() },                                                                         /* SampledPosition */ \
-            { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_EMPTY_DEFAULT() },                                     /* PlaybackSpeed */   \
-            { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(103) }, /* SeekRangeEnd */    \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(111) }, /* SeekRangeStart */  \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0003) },                            /* FeatureMap */      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                   /* ClusterRevision */ \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* SampledPosition */  \
+            { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_EMPTY_DEFAULT() },                                    /* PlaybackSpeed */    \
+            { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(62) }, /* SeekRangeEnd */     \
+            { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(70) }, /* SeekRangeStart */   \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0003) },                           /* FeatureMap */       \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                  /* ClusterRevision */  \
                                                                                                                                    \
             /* Endpoint: 3, Cluster: Content Launcher (server) */                                                                  \
             { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AcceptHeader */      \
@@ -706,8 +705,9 @@
             { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */      \
             { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },                                     /* Status */           \
             { 0x00000006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationVersion */                            \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },   /* FeatureMap */                                    \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },     /* ClusterRevision */                               \
+            { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AllowedVendorList */ \
+            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                               /* FeatureMap */        \
+            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },                                 /* ClusterRevision */   \
     }
 
 // This is an array of EmberAfCluster structures.
@@ -779,9 +779,9 @@
   /*   GeneratedCommandList (index=28)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=30) */ \
-  0x00000000 /* ResetWatermarks */, \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
   /*   AcceptedCommandList (index=32) */ \
@@ -803,38 +803,48 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=48)*/ \
+  /*   GeneratedCommandList (index=47)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
+  /* Endpoint: 0, Cluster: Group Key Management (server) */\
+  /*   AcceptedCommandList (index=52) */ \
+  0x00000000 /* KeySetWrite */, \
+  0x00000001 /* KeySetRead */, \
+  0x00000003 /* KeySetRemove */, \
+  0x00000004 /* KeySetReadAllIndices */, \
+  chip::kInvalidCommandId /* end of list */, \
+  /*   GeneratedCommandList (index=57)*/ \
+  0x00000002 /* KeySetReadResponse */, \
+  0x00000005 /* KeySetReadAllIndicesResponse */, \
+  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=53) */ \
+  /*   AcceptedCommandList (index=60) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Channel (server) */\
-  /*   AcceptedCommandList (index=57) */ \
+  /*   AcceptedCommandList (index=64) */ \
   0x00000000 /* ChangeChannel */, \
   0x00000002 /* ChangeChannelByNumber */, \
   0x00000003 /* SkipChannel */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=61)*/ \
+  /*   GeneratedCommandList (index=68)*/ \
   0x00000001 /* ChangeChannelResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Target Navigator (server) */\
-  /*   AcceptedCommandList (index=63) */ \
+  /*   AcceptedCommandList (index=70) */ \
   0x00000000 /* NavigateTarget */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=65)*/ \
+  /*   GeneratedCommandList (index=72)*/ \
   0x00000001 /* NavigateTargetResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Media Playback (server) */\
-  /*   AcceptedCommandList (index=67) */ \
+  /*   AcceptedCommandList (index=74) */ \
   0x00000000 /* Play */, \
   0x00000001 /* Pause */, \
   0x00000002 /* StopPlayback */, \
@@ -847,57 +857,57 @@
   0x00000009 /* SkipBackward */, \
   0x0000000B /* Seek */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=79)*/ \
+  /*   GeneratedCommandList (index=86)*/ \
   0x0000000A /* PlaybackResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Media Input (server) */\
-  /*   AcceptedCommandList (index=81) */ \
+  /*   AcceptedCommandList (index=88) */ \
   0x00000000 /* SelectInput */, \
   0x00000001 /* ShowInputStatus */, \
   0x00000002 /* HideInputStatus */, \
   0x00000003 /* RenameInput */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Low Power (server) */\
-  /*   AcceptedCommandList (index=86) */ \
+  /*   AcceptedCommandList (index=93) */ \
   0x00000000 /* Sleep */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Keypad Input (server) */\
-  /*   AcceptedCommandList (index=88) */ \
+  /*   AcceptedCommandList (index=95) */ \
   0x00000000 /* SendKey */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=90)*/ \
+  /*   GeneratedCommandList (index=97)*/ \
   0x00000001 /* SendKeyResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Content Launcher (server) */\
-  /*   AcceptedCommandList (index=92) */ \
+  /*   AcceptedCommandList (index=99) */ \
   0x00000000 /* LaunchContent */, \
   0x00000001 /* LaunchURL */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=95)*/ \
+  /*   GeneratedCommandList (index=102)*/ \
   0x00000002 /* LaunchResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Audio Output (server) */\
-  /*   AcceptedCommandList (index=97) */ \
+  /*   AcceptedCommandList (index=104) */ \
   0x00000000 /* SelectOutput */, \
   0x00000001 /* RenameOutput */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Application Launcher (server) */\
-  /*   AcceptedCommandList (index=100) */ \
+  /*   AcceptedCommandList (index=107) */ \
   0x00000000 /* LaunchApp */, \
   0x00000001 /* StopApp */, \
   0x00000002 /* HideApp */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=104)*/ \
+  /*   GeneratedCommandList (index=111)*/ \
   0x00000003 /* LauncherResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=106) */ \
+  /*   AcceptedCommandList (index=113) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=110) */ \
+  /*   AcceptedCommandList (index=117) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -908,7 +918,7 @@
   0x00000007 /* StopWithOnOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 3, Cluster: Media Playback (server) */\
-  /*   AcceptedCommandList (index=119) */ \
+  /*   AcceptedCommandList (index=126) */ \
   0x00000000 /* Play */, \
   0x00000001 /* Pause */, \
   0x00000002 /* StopPlayback */, \
@@ -921,32 +931,32 @@
   0x00000009 /* SkipBackward */, \
   0x0000000B /* Seek */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=131)*/ \
+  /*   GeneratedCommandList (index=138)*/ \
   0x0000000A /* PlaybackResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 3, Cluster: Content Launcher (server) */\
-  /*   AcceptedCommandList (index=133) */ \
+  /*   AcceptedCommandList (index=140) */ \
   0x00000000 /* LaunchContent */, \
   0x00000001 /* LaunchURL */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=136)*/ \
+  /*   GeneratedCommandList (index=143)*/ \
   0x00000002 /* LaunchResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 3, Cluster: Account Login (server) */\
-  /*   AcceptedCommandList (index=138) */ \
+  /*   AcceptedCommandList (index=145) */ \
   0x00000000 /* GetSetupPIN */, \
   0x00000002 /* Login */, \
   0x00000003 /* Logout */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=142)*/ \
+  /*   GeneratedCommandList (index=149)*/ \
   0x00000001 /* GetSetupPINResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 4, Cluster: Content Launcher (server) */\
-  /*   AcceptedCommandList (index=144) */ \
+  /*   AcceptedCommandList (index=151) */ \
   0x00000000 /* LaunchContent */, \
   0x00000001 /* LaunchURL */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=147)*/ \
+  /*   GeneratedCommandList (index=154)*/ \
   0x00000002 /* LaunchResponse */, \
   chip::kInvalidCommandId /* end of list */, \
 }
@@ -1116,30 +1126,30 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(71), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(81), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(87), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr ,\
@@ -1148,7 +1158,7 @@
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1159,7 +1169,7 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(167), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(168), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1170,7 +1180,7 @@
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1181,7 +1191,7 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (client) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(184), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1192,29 +1202,29 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(184), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
-      .attributeCount = 4, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(192), \
+      .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
-      .generatedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(198), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1225,7 +1235,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1236,7 +1246,7 @@
   { \
       /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
       .clusterId = 0x00000405,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
       .attributeCount = 5, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1247,18 +1257,18 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(209), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(209), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(212), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1269,7 +1279,7 @@
   { \
       /* Endpoint: 1, Cluster: Wake on LAN (server) */ \
       .clusterId = 0x00000503,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(215), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
       .attributeCount = 3, \
       .clusterSize = 39, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1280,128 +1290,128 @@
   { \
       /* Endpoint: 1, Cluster: Channel (server) */ \
       .clusterId = 0x00000504,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(221), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Target Navigator (server) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(223), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(226), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Media Playback (server) */ \
       .clusterId = 0x00000506,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(227), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(230), \
       .attributeCount = 9, \
       .clusterSize = 43, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Media Input (server) */ \
       .clusterId = 0x00000507,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(236), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(239), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Low Power (server) */ \
       .clusterId = 0x00000508,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(240), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 93 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Keypad Input (server) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(245), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Content Launcher (server) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(244), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(247), \
       .attributeCount = 4, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 92 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 99 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Audio Output (server) */ \
       .clusterId = 0x0000050B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(248), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(251), \
       .attributeCount = 4, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Application Launcher (server) */ \
       .clusterId = 0x0000050C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(252), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(255), \
       .attributeCount = 4, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 100 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 107 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 111 ) ,\
     },\
   { \
       /* Endpoint: 2, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(256), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 106 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 113 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 2, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(262), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 110 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 117 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 2, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(275), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(278), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1412,7 +1422,7 @@
   { \
       /* Endpoint: 3, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(281), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(284), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1423,29 +1433,29 @@
   { \
       /* Endpoint: 3, Cluster: Media Playback (server) */ \
       .clusterId = 0x00000506,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(287), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
       .attributeCount = 9, \
       .clusterSize = 43, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 119 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 131 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 126 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 138 ) ,\
     },\
   { \
       /* Endpoint: 3, Cluster: Content Launcher (server) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(296), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
       .attributeCount = 4, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 133 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 136 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 140 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 143 ) ,\
     },\
   { \
       /* Endpoint: 3, Cluster: Application Basic (server) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(300), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(303), \
       .attributeCount = 10, \
       .clusterSize = 110, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1456,18 +1466,18 @@
   { \
       /* Endpoint: 3, Cluster: Account Login (server) */ \
       .clusterId = 0x0000050E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(310), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(313), \
       .attributeCount = 2, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 138 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 142 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 145 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 149 ) ,\
     },\
   { \
       /* Endpoint: 4, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(312), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(315), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1478,18 +1488,18 @@
   { \
       /* Endpoint: 4, Cluster: Content Launcher (server) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(318), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(321), \
       .attributeCount = 4, \
       .clusterSize = 10, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 147 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 151 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 154 ) ,\
     },\
   { \
       /* Endpoint: 4, Cluster: Application Basic (server) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(322), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(325), \
       .attributeCount = 10, \
       .clusterSize = 110, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1500,7 +1510,7 @@
   { \
       /* Endpoint: 5, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(332), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(335), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1511,8 +1521,8 @@
   { \
       /* Endpoint: 5, Cluster: Application Basic (server) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(338), \
-      .attributeCount = 9, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(341), \
+      .attributeCount = 10, \
       .clusterSize = 110, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
@@ -1530,7 +1540,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 26, 501 }, { ZAP_CLUSTER_INDEX(26), 12, 148 }, { ZAP_CLUSTER_INDEX(38), 3, 38 },                   \
+        { ZAP_CLUSTER_INDEX(0), 26, 260 }, { ZAP_CLUSTER_INDEX(26), 12, 148 }, { ZAP_CLUSTER_INDEX(38), 3, 38 },                   \
             { ZAP_CLUSTER_INDEX(41), 5, 173 }, { ZAP_CLUSTER_INDEX(46), 3, 124 }, { ZAP_CLUSTER_INDEX(49), 2, 114 },               \
     }
 
@@ -1543,7 +1553,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (1098)
+#define ATTRIBUTE_MAX_SIZE (857)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (6)
diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp
index ea3a668b5ad6cf..d337e33b7be894 100644
--- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp
@@ -238,6 +238,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace Groups {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -320,43 +357,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace Groups
 
-namespace IasZone {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
-    CHIP_ERROR TLVError = CHIP_NO_ERROR;
-    bool wasHandled     = false;
-    {
-        switch (aCommandPath.mCommandId)
-        {
-        case Commands::ZoneEnrollResponse::Id: {
-            Commands::ZoneEnrollResponse::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(apCommandObj, aCommandPath, commandData);
-            }
-            break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
-            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
-                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
-            return;
-        }
-        }
-    }
-
-    if (CHIP_NO_ERROR != TLVError || !wasHandled)
-    {
-        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
-        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
-    }
-}
-
-} // namespace IasZone
-
 namespace Identify {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -774,16 +774,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -960,12 +950,12 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::Groups::Id:
         Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
-    case Clusters::IasZone::Id:
-        Clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
-        break;
     case Clusters::Identify::Id:
         Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
index 535e20798e1de2..b97ce8097b1993 100644
--- a/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
@@ -43,7 +43,6 @@
     MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIasZonePluginServerInitCallback();                                                                                       \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterKeypadInputPluginClientInitCallback();                                                                                   \
     MatterLevelControlPluginClientInitCallback();                                                                                  \
diff --git a/zzz_generated/tv-casting-app/zap-generated/access.h b/zzz_generated/tv-casting-app/zap-generated/access.h
index 3bf555a57f971a..771b64007d16b9 100644
--- a/zzz_generated/tv-casting-app/zap-generated/access.h
+++ b/zzz_generated/tv-casting-app/zap-generated/access.h
@@ -175,7 +175,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -209,7 +208,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
@@ -243,7 +241,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
diff --git a/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h b/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h
index 1ac6e779ffc82d..9328cd609d7d58 100644
--- a/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h
+++ b/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h
@@ -43,13 +43,10 @@
 #define EMBER_AF_GENERATED_EVENT_CODE                                                                                              \
     EmberEventControl emberAfLevelControlClusterServerTickCallbackControl1;                                                        \
     EmberEventControl emberAfBarrierControlClusterServerTickCallbackControl1;                                                      \
-    EmberEventControl emberAfIasZoneClusterServerTickCallbackControl1;                                                             \
-    extern EmberEventControl emberAfPluginIasZoneServerManageQueueEventControl;                                                    \
     extern void emberAfPluginColorControlServerTempTransitionEventHandler(void);                                                   \
     extern void emberAfPluginColorControlServerXyTransitionEventHandler(void);                                                     \
     extern void emberAfPluginDoorLockServerLockoutEventHandler(void);                                                              \
     extern void emberAfPluginDoorLockServerRelockEventHandler(void);                                                               \
-    extern void emberAfPluginIasZoneServerManageQueueEventHandler(void);                                                           \
     static void clusterTickWrapper(EmberEventControl * control, EmberAfTickFunction callback, chip::EndpointId endpoint)           \
     {                                                                                                                              \
         /* emberAfPushEndpointNetworkIndex(endpoint); */                                                                           \
@@ -66,35 +63,26 @@
     {                                                                                                                              \
         clusterTickWrapper(&emberAfBarrierControlClusterServerTickCallbackControl1,                                                \
                            emberAfBarrierControlClusterServerTickCallback, 1);                                                     \
-    }                                                                                                                              \
-    void emberAfIasZoneClusterServerTickCallbackWrapperFunction1(void)                                                             \
-    {                                                                                                                              \
-        clusterTickWrapper(&emberAfIasZoneClusterServerTickCallbackControl1, emberAfIasZoneClusterServerTickCallback, 1);          \
     }
 
 // EmberEventData structs used to populate the EmberEventData table
 #define EMBER_AF_GENERATED_EVENTS                                                                                                  \
     { &emberAfLevelControlClusterServerTickCallbackControl1, emberAfLevelControlClusterServerTickCallbackWrapperFunction1 },       \
         { &emberAfBarrierControlClusterServerTickCallbackControl1,                                                                 \
-          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },                                                        \
-        { &emberAfIasZoneClusterServerTickCallbackControl1, emberAfIasZoneClusterServerTickCallbackWrapperFunction1 },             \
-        { &emberAfPluginIasZoneServerManageQueueEventControl, emberAfPluginIasZoneServerManageQueueEventHandler },
+          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
 
 #define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
-    "Level Control Cluster Server EP 1", "Barrier Control Cluster Server EP 1", "IAS Zone Cluster Server EP 1",                    \
+    "Level Control Cluster Server EP 1", "Barrier Control Cluster Server EP 1",                                                    \
         "Color Control Cluster Server Plugin HueSatTransition", "Color Control Cluster Server Plugin TempTransition",              \
         "Color Control Cluster Server Plugin XyTransition", "Door Lock Server Cluster Plugin Lockout",                             \
-        "Door Lock Server Cluster Plugin Relock", "IAS Zone Server Plugin ManageQueue",
+        "Door Lock Server Cluster Plugin Relock",
 
 // The length of the event context table used to track and retrieve cluster events
-#define EMBER_AF_EVENT_CONTEXT_LENGTH 3
+#define EMBER_AF_EVENT_CONTEXT_LENGTH 2
 
 // EmberAfEventContext structs used to populate the EmberAfEventContext table
 #define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
     { 0x1, 0x8, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfLevelControlClusterServerTickCallbackControl1 },          \
-        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },  \
-    {                                                                                                                              \
-        0x1, 0x500, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfIasZoneClusterServerTickCallbackControl1              \
-    }
+        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
 
 #endif // __AF_GEN_EVENT__
diff --git a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp
index 66c1e27fc228fa..a0ba1a9ccfbbb7 100644
--- a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp
@@ -89,9 +89,6 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case ZCL_GROUPS_CLUSTER_ID:
         emberAfGroupsClusterInitCallback(endpoint);
         break;
-    case ZCL_IAS_ZONE_CLUSTER_ID:
-        emberAfIasZoneClusterInitCallback(endpoint);
-        break;
     case ZCL_IDENTIFY_CLUSTER_ID:
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
@@ -261,11 +258,6 @@ void __attribute__((weak)) emberAfGroupsClusterInitCallback(EndpointId endpoint)
     // To prevent warning
     (void) endpoint;
 }
-void __attribute__((weak)) emberAfIasZoneClusterInitCallback(EndpointId endpoint)
-{
-    // To prevent warning
-    (void) endpoint;
-}
 void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
index e56f06e8226161..435285504e5f2a 100644
--- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h
@@ -37,42 +37,17 @@
             /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                 \
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: IAS Zone (server), big-endian */                                                              \
-                                                                                                                                   \
-            /* 55 - IAS CIE address, */                                                                                            \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Test Cluster (server), big-endian */                                                          \
                                                                                                                                    \
-            /* 63 - bitmap64, */                                                                                                   \
+            /* 14 - bitmap64, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 71 - int64u, */                                                                                                     \
+            /* 22 - int64u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 79 - int64s, */                                                                                                     \
+            /* 30 - int64s, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
@@ -88,48 +63,23 @@
             /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                              \
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: IAS Zone (server), little-endian */                                                           \
-                                                                                                                                   \
-            /* 55 - IAS CIE address, */                                                                                            \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Test Cluster (server), little-endian */                                                       \
                                                                                                                                    \
-            /* 63 - bitmap64, */                                                                                                   \
+            /* 14 - bitmap64, */                                                                                                   \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 71 - int64u, */                                                                                                     \
+            /* 22 - int64u, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
                                                                                                                                    \
-            /* 79 - int64s, */                                                                                                     \
+            /* 30 - int64s, */                                                                                                     \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (12)
+#define GENERATED_DEFAULTS_COUNT (5)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -171,7 +121,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 305
+#define GENERATED_ATTRIBUTE_COUNT 299
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -315,7 +265,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -329,69 +281,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -576,15 +561,6 @@
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: IAS Zone (server) */                                                                          \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },                                 /* zone state */      \
-            { 0x00000001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() },                                     /* zone type */       \
-            { 0x00000002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* zone status */     \
-            { 0x00000010, ZAP_TYPE(NODE_ID), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(55) }, /* IAS CIE address */ \
-            { 0x00000011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) },                                 /* Zone ID */         \
-            { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },                                 /* FeatureMap */      \
-            { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },                                   /* ClusterRevision */ \
-                                                                                                                                   \
             /* Endpoint: 1, Cluster: Wake on LAN (server) */                                                                       \
             { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* MACAddress */                                    \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) },   /* FeatureMap */                                    \
@@ -595,15 +571,15 @@
             { 0x00000001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },        /* bitmap8 */        \
             { 0x00000002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },       /* bitmap16 */       \
             { 0x00000003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },       /* bitmap32 */       \
-            { 0x00000004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(63) }, /* bitmap64 */       \
+            { 0x00000004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(14) }, /* bitmap64 */       \
             { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int8u */          \
             { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int16u */         \
             { 0x00000008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int32u */         \
-            { 0x0000000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(71) },   /* int64u */         \
+            { 0x0000000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(22) },   /* int64u */         \
             { 0x0000000D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* int8s */          \
             { 0x0000000E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int16s */         \
             { 0x00000010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* int32s */         \
-            { 0x00000014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(79) },   /* int64s */         \
+            { 0x00000014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(30) },   /* int64s */         \
             { 0x00000015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },          /* enum8 */          \
             { 0x00000016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) },         /* enum16 */         \
             { 0x00000019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() },    /* octet_string */   \
@@ -665,11 +641,6 @@
     };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
         (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayIasZoneServer[] = {                                                           \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerInitCallback,                                                   \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerMessageSentCallback,                                            \
-        (EmberAfGenericClusterFunction) MatterIasZoneClusterServerPreAttributeChangedCallback,                                     \
     };
 
 // clang-format off
@@ -716,22 +687,18 @@
   /*   GeneratedCommandList (index=28)*/ \
   0x00000001 /* RetrieveLogsResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=30) */ \
-  0x00000000 /* ResetWatermarks */, \
-  chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
-  /*   AcceptedCommandList (index=32) */ \
-  0x00000000 /* ResetCounts */, \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
-  /*   AcceptedCommandList (index=34) */ \
+  /*   AcceptedCommandList (index=32) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
   0x00000002 /* RevokeCommissioning */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Operational Credentials (server) */\
-  /*   AcceptedCommandList (index=38) */ \
+  /*   AcceptedCommandList (index=36) */ \
   0x00000000 /* AttestationRequest */, \
   0x00000002 /* CertificateChainRequest */, \
   0x00000004 /* CSRRequest */, \
@@ -740,20 +707,19 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=48)*/ \
+  /*   GeneratedCommandList (index=45)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=53) */ \
+  /*   AcceptedCommandList (index=50) */ \
   0x00000000 /* Identify */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=55) */ \
+  /*   AcceptedCommandList (index=52) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -761,14 +727,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=62)*/ \
+  /*   GeneratedCommandList (index=59)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Scenes (server) */\
-  /*   AcceptedCommandList (index=67) */ \
+  /*   AcceptedCommandList (index=64) */ \
   0x00000000 /* AddScene */, \
   0x00000001 /* ViewScene */, \
   0x00000002 /* RemoveScene */, \
@@ -777,7 +743,7 @@
   0x00000005 /* RecallScene */, \
   0x00000006 /* GetSceneMembership */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=75)*/ \
+  /*   GeneratedCommandList (index=72)*/ \
   0x00000000 /* AddSceneResponse */, \
   0x00000001 /* ViewSceneResponse */, \
   0x00000002 /* RemoveSceneResponse */, \
@@ -786,13 +752,13 @@
   0x00000006 /* GetSceneMembershipResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=82) */ \
+  /*   AcceptedCommandList (index=79) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Level Control (server) */\
-  /*   AcceptedCommandList (index=86) */ \
+  /*   AcceptedCommandList (index=83) */ \
   0x00000000 /* MoveToLevel */, \
   0x00000001 /* Move */, \
   0x00000002 /* Step */, \
@@ -803,21 +769,17 @@
   0x00000007 /* StopWithOnOff */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Barrier Control (server) */\
-  /*   AcceptedCommandList (index=95) */ \
+  /*   AcceptedCommandList (index=92) */ \
   0x00000000 /* BarrierControlGoToPercent */, \
   0x00000001 /* BarrierControlStop */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 1, Cluster: IAS Zone (server) */\
-  /*   AcceptedCommandList (index=98) */ \
-  0x00000000 /* ZoneEnrollResponse */, \
-  chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Test Cluster (server) */\
-  /*   AcceptedCommandList (index=100) */ \
+  /*   AcceptedCommandList (index=95) */ \
   0x00000000 /* Test */, \
   0x00000001 /* TestNotHandled */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: On/Off (server) */\
-  /*   AcceptedCommandList (index=103) */ \
+  /*   AcceptedCommandList (index=98) */ \
   0x00000000 /* Off */, \
   0x00000001 /* On */, \
   0x00000002 /* Toggle */, \
@@ -827,7 +789,7 @@
 // clang-format on
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 50
+#define GENERATED_CLUSTER_COUNT 49
 
 // clang-format off
 #define GENERATED_CLUSTERS { \
@@ -956,30 +918,30 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(71), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(81), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(82), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(87), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(88), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr ,\
@@ -988,7 +950,7 @@
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(152), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(153), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -999,40 +961,40 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(167), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(168), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(178), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(179), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(183), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(184), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(192), \
       .attributeCount = 4, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1043,7 +1005,7 @@
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(195), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(196), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1054,7 +1016,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(198), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(199), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1065,40 +1027,40 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(201), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(202), \
       .attributeCount = 3, \
       .clusterSize = 8, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(204), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (server) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(207), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(208), \
       .attributeCount = 7, \
       .clusterSize = 12, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayScenesServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: On/Off (client) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(215), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1109,18 +1071,18 @@
   { \
       /* Endpoint: 1, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(214), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(215), \
       .attributeCount = 7, \
       .clusterSize = 13, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Level Control (client) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(221), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(222), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1131,18 +1093,18 @@
   { \
       /* Endpoint: 1, Cluster: Level Control (server) */ \
       .clusterId = 0x00000008,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(221), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(222), \
       .attributeCount = 16, \
       .clusterSize = 27, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayLevelControlServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \
       .clusterId = 0x0000000F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(237), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(238), \
       .attributeCount = 5, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1153,7 +1115,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (client) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1164,7 +1126,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(242), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(243), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1175,7 +1137,7 @@
   { \
       /* Endpoint: 1, Cluster: Binding (server) */ \
       .clusterId = 0x0000001E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(248), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(249), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1186,7 +1148,7 @@
   { \
       /* Endpoint: 1, Cluster: Switch (server) */ \
       .clusterId = 0x0000003B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(251), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(252), \
       .attributeCount = 4, \
       .clusterSize = 8, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1197,7 +1159,7 @@
   { \
       /* Endpoint: 1, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(255), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(256), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1208,29 +1170,18 @@
   { \
       /* Endpoint: 1, Cluster: Barrier Control (server) */ \
       .clusterId = 0x00000103,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(258), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(259), \
       .attributeCount = 6, \
       .clusterSize = 11, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
-      .generatedCommandList = nullptr ,\
-    },\
-  { \
-      /* Endpoint: 1, Cluster: IAS Zone (server) */ \
-      .clusterId = 0x00000500,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(264), \
-      .attributeCount = 7, \
-      .clusterSize = 20, \
-      .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \
-      .functions = chipFuncArrayIasZoneServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 92 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Wake on LAN (server) */ \
       .clusterId = 0x00000503,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(271), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(265), \
       .attributeCount = 3, \
       .clusterSize = 39, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1241,7 +1192,7 @@
   { \
       /* Endpoint: 1, Cluster: Channel (client) */ \
       .clusterId = 0x00000504,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1252,7 +1203,7 @@
   { \
       /* Endpoint: 1, Cluster: Target Navigator (client) */ \
       .clusterId = 0x00000505,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1263,7 +1214,7 @@
   { \
       /* Endpoint: 1, Cluster: Media Playback (client) */ \
       .clusterId = 0x00000506,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1274,7 +1225,7 @@
   { \
       /* Endpoint: 1, Cluster: Media Input (client) */ \
       .clusterId = 0x00000507,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1285,7 +1236,7 @@
   { \
       /* Endpoint: 1, Cluster: Keypad Input (client) */ \
       .clusterId = 0x00000509,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1296,7 +1247,7 @@
   { \
       /* Endpoint: 1, Cluster: Content Launcher (client) */ \
       .clusterId = 0x0000050A,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1307,7 +1258,7 @@
   { \
       /* Endpoint: 1, Cluster: Audio Output (client) */ \
       .clusterId = 0x0000050B,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1318,7 +1269,7 @@
   { \
       /* Endpoint: 1, Cluster: Application Launcher (client) */ \
       .clusterId = 0x0000050C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1329,7 +1280,7 @@
   { \
       /* Endpoint: 1, Cluster: Application Basic (client) */ \
       .clusterId = 0x0000050D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1340,7 +1291,7 @@
   { \
       /* Endpoint: 1, Cluster: Account Login (client) */ \
       .clusterId = 0x0000050E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1350,30 +1301,30 @@
     },\
   { \
       /* Endpoint: 1, Cluster: Test Cluster (server) */ \
-      .clusterId = 0x0000050F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(274), \
+      .clusterId = 0xFFF1FC05,  \
+      .attributes = ZAP_ATTRIBUTE_INDEX(268), \
       .attributeCount = 22, \
       .clusterSize = 1068, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 100 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 2, Cluster: On/Off (server) */ \
       .clusterId = 0x00000006,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(296), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(290), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayOnOffServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 2, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(299), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(293), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1387,12 +1338,12 @@
 
 #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index])
 
-#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 37
+#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 36
 
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 21, 489 }, { ZAP_CLUSTER_INDEX(21), 27, 1238 }, { ZAP_CLUSTER_INDEX(48), 2, 11 },                  \
+        { ZAP_CLUSTER_INDEX(0), 21, 248 }, { ZAP_CLUSTER_INDEX(21), 26, 1218 }, { ZAP_CLUSTER_INDEX(47), 2, 11 },                  \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1404,7 +1355,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (37)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (1738)
+#define ATTRIBUTE_MAX_SIZE (1477)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (3)
diff --git a/zzz_generated/tv-casting-app/zap-generated/gen_config.h b/zzz_generated/tv-casting-app/zap-generated/gen_config.h
index 845ff96884d8f0..a57dc1933926e2 100644
--- a/zzz_generated/tv-casting-app/zap-generated/gen_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/gen_config.h
@@ -50,7 +50,6 @@
 #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IAS_ZONE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
@@ -175,13 +174,6 @@
 #define EMBER_AF_PLUGIN_GROUPS_SERVER
 #define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the IAS Zone cluster is included
-#define ZCL_USING_IAS_ZONE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IAS_ZONE_SERVER
-#define EMBER_AF_PLUGIN_IAS_ZONE
-// User options for server plugin IAS Zone
-#define EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE 541
-
 // Use this macro to check if the server side of the Identify cluster is included
 #define ZCL_USING_IDENTIFY_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY_SERVER
diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp
index 984b84b6f4d1ff..f1644ef6bde107 100644
--- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp
@@ -155,6 +155,43 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 } // namespace GeneralCommissioning
 
+namespace GeneralDiagnostics {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+    CHIP_ERROR TLVError = CHIP_NO_ERROR;
+    bool wasHandled     = false;
+    {
+        switch (aCommandPath.mCommandId)
+        {
+        case Commands::TestEventTrigger::Id: {
+            Commands::TestEventTrigger::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralDiagnosticsClusterTestEventTriggerCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+            ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+                         ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+            return;
+        }
+        }
+    }
+
+    if (CHIP_NO_ERROR != TLVError || !wasHandled)
+    {
+        apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+        ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+    }
+}
+
+} // namespace GeneralDiagnostics
+
 namespace GroupKeyManagement {
 
 void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -553,16 +590,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
-        case Commands::RemoveTrustedRootCertificate::Id: {
-            Commands::RemoveTrustedRootCertificate::DecodableType commandData;
-            TLVError = DataModel::Decode(aDataTlv, commandData);
-            if (TLVError == CHIP_NO_ERROR)
-            {
-                wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath,
-                                                                                                      commandData);
-            }
-            break;
-        }
         default: {
             // Unrecognized command ID, error status will apply.
             apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
@@ -761,6 +788,9 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
     case Clusters::GeneralCommissioning::Id:
         Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
+    case Clusters::GeneralDiagnostics::Id:
+        Clusters::GeneralDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+        break;
     case Clusters::GroupKeyManagement::Id:
         Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
diff --git a/zzz_generated/window-app/zap-generated/access.h b/zzz_generated/window-app/zap-generated/access.h
index c7b995602bfef6..223b50e01cebc6 100644
--- a/zzz_generated/window-app/zap-generated/access.h
+++ b/zzz_generated/window-app/zap-generated/access.h
@@ -174,7 +174,6 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
@@ -209,7 +208,6 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
@@ -244,7 +242,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h
index a0b476e051bc00..a877730d80c772 100644
--- a/zzz_generated/window-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/window-app/zap-generated/endpoint_config.h
@@ -38,26 +38,6 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */                                            \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #else // !BIGENDIAN_CPU
@@ -73,31 +53,11 @@
                                                                                                                                    \
             /* 6 - Breadcrumb, */                                                                                                  \
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */                                         \
-                                                                                                                                   \
-            /* 14 - NetworkName, */                                                                                                \
-            0x00, 0x00,                                                                                                            \
-                                                                                                                                   \
-            /* 16 - ExtendedPanId, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 24 - OverrunCount, */                                                                                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 32 - ActiveTimestamp, */                                                                                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 40 - PendingTimestamp, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 48 - ChannelMask, */                                                                                                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
     }
 
 #endif // BIGENDIAN_CPU
 
-#define GENERATED_DEFAULTS_COUNT (8)
+#define GENERATED_DEFAULTS_COUNT (2)
 
 #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
 #define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
@@ -133,7 +93,7 @@
 
 #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 273
+#define GENERATED_ATTRIBUTE_COUNT 282
 #define GENERATED_ATTRIBUTES                                                                                                       \
     {                                                                                                                              \
                                                                                                                                    \
@@ -282,7 +242,9 @@
               ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */                                                                    \
             { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
-              ZAP_EMPTY_DEFAULT() },                                         /* ActiveNetworkFaults */                             \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaults */                                                                     \
+            { 0x00000008, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                              \
+              ZAP_EMPTY_DEFAULT() },                                         /* TestEventTriggersEnabled */                        \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
@@ -296,69 +258,102 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) },   /* ClusterRevision */                                 \
                                                                                                                                    \
             /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* channel */                  \
-            { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* RoutingRole */              \
-            { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, ZAP_ATTRIBUTE_MASK(NULLABLE),                                                 \
-              ZAP_LONG_DEFAULTS_INDEX(14) },                                                                /* NetworkName */      \
-            { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x0000) },  /* PanId */            \
-            { 0x00000004, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(16) }, /* ExtendedPanId */    \
-            { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() },  /* MeshLocalPrefix */  \
-            { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(24) },                            /* OverrunCount */     \
+            { 0x00000000, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* channel */                                                                                 \
+            { 0x00000001, ZAP_TYPE(ENUM8), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* RoutingRole */                                                                             \
+            { 0x00000002, ZAP_TYPE(CHAR_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),           \
+              ZAP_EMPTY_DEFAULT() }, /* NetworkName */                                                                             \
+            { 0x00000003, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PanId */                                                                                   \
+            { 0x00000004, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ExtendedPanId */                                                                           \
+            { 0x00000005, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() },                                                                        /* MeshLocalPrefix */  \
+            { 0x00000006, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OverrunCount */     \
             { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \
             { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */    \
-            { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_EMPTY_DEFAULT() },                                   /* PartitionId */       \
-            { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* weighting */         \
-            { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* DataVersion */       \
-            { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* StableDataVersion */ \
-            { 0x0000000D, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },                                    /* LeaderRouterId */    \
-            { 0x0000000E, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* DetachedRoleCount */ \
-            { 0x0000000F, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* ChildRoleCount */    \
-            { 0x00000010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* RouterRoleCount */   \
-            { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },                            /* LeaderRoleCount */   \
-            { 0x00000012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* AttachAttemptCount */                          \
-            { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* PartitionIdChangeCount */                      \
-            { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* BetterPartitionAttachAttemptCount */           \
-            { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* ParentChangeCount */                           \
-            { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxTotalCount */                                \
-            { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxUnicastCount */                              \
-            { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBroadcastCount */                            \
-            { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckRequestedCount */                         \
-            { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxAckedCount */                                \
-            { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxNoAckRequestedCount */                       \
-            { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataCount */                                 \
-            { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDataPollCount */                             \
-            { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconCount */                               \
-            { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxBeaconRequestCount */                        \
-            { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxOtherCount */                                \
-            { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxRetryCount */                                \
-            { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxDirectMaxRetryExpiryCount */                 \
-            { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxIndirectMaxRetryExpiryCount */               \
-            { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrCcaCount */                               \
-            { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrAbortCount */                             \
-            { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* TxErrBusyChannelCount */                       \
-            { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxTotalCount */                                \
-            { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxUnicastCount */                              \
-            { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBroadcastCount */                            \
-            { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataCount */                                 \
-            { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDataPollCount */                             \
-            { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconCount */                               \
-            { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxBeaconRequestCount */                        \
-            { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxOtherCount */                                \
-            { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxAddressFilteredCount */                      \
-            { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDestAddrFilteredCount */                     \
-            { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxDuplicatedCount */                           \
-            { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrNoFrameCount */                           \
-            { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrUnknownNeighborCount */                   \
-            { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrInvalidSrcAddrCount */                    \
-            { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrSecCount */                               \
-            { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrFcsCount */                               \
-            { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* RxErrOtherCount */                             \
-            { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(32) }, /* ActiveTimestamp */                             \
-            { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* PendingTimestamp */                            \
-            { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) },  /* delay */                                       \
-            { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */    \
-            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(48) },                     /* ChannelMask */       \
-            { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
+            { 0x00000009, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionId */                                                                             \
+            { 0x0000000A, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* weighting */                                                                               \
+            { 0x0000000B, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* DataVersion */                                                                             \
+            { 0x0000000C, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */                                                                       \
+            { 0x0000000D, ZAP_TYPE(INT8U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                 \
+              ZAP_EMPTY_DEFAULT() }, /* LeaderRouterId */                                                                          \
+            { 0x0000000E, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* DetachedRoleCount */                                                                       \
+            { 0x0000000F, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ChildRoleCount */   \
+            { 0x00000010, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouterRoleCount */  \
+            { 0x00000011, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* LeaderRoleCount */  \
+            { 0x00000012, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* AttachAttemptCount */                                                                      \
+            { 0x00000013, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* PartitionIdChangeCount */                                                                  \
+            { 0x00000014, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* BetterPartitionAttachAttemptCount */                                                       \
+            { 0x00000015, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* ParentChangeCount */                                                                       \
+            { 0x00000016, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxTotalCount */     \
+            { 0x00000017, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxUnicastCount */   \
+            { 0x00000018, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBroadcastCount */ \
+            { 0x00000019, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxAckRequestedCount */                                                                     \
+            { 0x0000001A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxAckedCount */     \
+            { 0x0000001B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxNoAckRequestedCount */                                                                   \
+            { 0x0000001C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataCount */      \
+            { 0x0000001D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxDataPollCount */  \
+            { 0x0000001E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxBeaconCount */    \
+            { 0x0000001F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxBeaconRequestCount */                                                                    \
+            { 0x00000020, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxOtherCount */     \
+            { 0x00000021, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxRetryCount */     \
+            { 0x00000022, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxDirectMaxRetryExpiryCount */                                                             \
+            { 0x00000023, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxIndirectMaxRetryExpiryCount */                                                           \
+            { 0x00000024, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrCcaCount */    \
+            { 0x00000025, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TxErrAbortCount */  \
+            { 0x00000026, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* TxErrBusyChannelCount */                                                                   \
+            { 0x00000027, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxTotalCount */     \
+            { 0x00000028, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxUnicastCount */   \
+            { 0x00000029, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBroadcastCount */ \
+            { 0x0000002A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataCount */      \
+            { 0x0000002B, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxDataPollCount */  \
+            { 0x0000002C, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxBeaconCount */    \
+            { 0x0000002D, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxBeaconRequestCount */                                                                    \
+            { 0x0000002E, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxOtherCount */     \
+            { 0x0000002F, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxAddressFilteredCount */                                                                  \
+            { 0x00000030, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDestAddrFilteredCount */                                                                 \
+            { 0x00000031, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxDuplicatedCount */                                                                       \
+            { 0x00000032, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrNoFrameCount */                                                                       \
+            { 0x00000033, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrUnknownNeighborCount */                                                               \
+            { 0x00000034, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                               \
+              ZAP_EMPTY_DEFAULT() }, /* RxErrInvalidSrcAddrCount */                                                                \
+            { 0x00000035, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrSecCount */    \
+            { 0x00000036, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrFcsCount */    \
+            { 0x00000037, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RxErrOtherCount */  \
+            { 0x00000038, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* ActiveTimestamp */                                                                         \
+            { 0x00000039, ZAP_TYPE(INT64U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* PendingTimestamp */                                                                        \
+            { 0x0000003A, ZAP_TYPE(INT32U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* delay */                                                                                   \
+            { 0x0000003B, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
+              ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */                                                                          \
+            { 0x0000003C, ZAP_TYPE(OCTET_STRING), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),          \
+              ZAP_EMPTY_DEFAULT() }, /* ChannelMask */                                                                             \
+            { 0x0000003D, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                \
               ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */                                                            \
             { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE),                                                \
               ZAP_EMPTY_DEFAULT() },                                              /* ActiveNetworkFaultsList */                    \
@@ -470,11 +465,17 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Window Covering (server) */                                                                   \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Type */                                            \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x08) },    /* Type */                                         \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* PhysicalClosedLimitLift */                      \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* PhysicalClosedLimitTilt */                      \
             { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPositionLift */                                                                   \
             { 0x00000004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPositionTilt */                                                                   \
+            { 0x00000005, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* NumberOfActuationsLift */                                                           \
+            { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* NumberOfActuationsTilt */                                                           \
             { 0x00000007, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x03) }, /* ConfigStatus */       \
             { 0x00000008, ZAP_TYPE(PERCENT), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                       \
               ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPositionLiftPercentage */                                                         \
@@ -519,11 +520,17 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */  \
                                                                                                                                    \
             /* Endpoint: 2, Cluster: Window Covering (server) */                                                                   \
-            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Type */                                            \
+            { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x08) },    /* Type */                                         \
+            { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* PhysicalClosedLimitLift */                      \
+            { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* PhysicalClosedLimitTilt */                      \
             { 0x00000003, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPositionLift */                                                                   \
             { 0x00000004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                        \
               ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPositionTilt */                                                                   \
+            { 0x00000005, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* NumberOfActuationsLift */                                                           \
+            { 0x00000006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(TOKENIZE),                                                       \
+              ZAP_SIMPLE_DEFAULT(0x0000) }, /* NumberOfActuationsTilt */                                                           \
             { 0x00000007, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x03) }, /* ConfigStatus */       \
             { 0x00000008, ZAP_TYPE(PERCENT), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE),                       \
               ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPositionLiftPercentage */                                                         \
@@ -615,15 +622,15 @@
   0x00000005 /* NetworkConfigResponse */, \
   0x00000007 /* ConnectNetworkResponse */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: General Diagnostics (server) */\
   /*   AcceptedCommandList (index=21) */ \
-  0x00000000 /* ResetWatermarks */, \
+  0x00000000 /* TestEventTrigger */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: Software Diagnostics (server) */\
   /*   AcceptedCommandList (index=23) */ \
-  0x00000000 /* ResetCounts */, \
+  0x00000000 /* ResetWatermarks */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\
+  /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\
   /*   AcceptedCommandList (index=25) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
@@ -643,32 +650,31 @@
   0x00000009 /* UpdateFabricLabel */, \
   0x0000000A /* RemoveFabric */, \
   0x0000000B /* AddTrustedRootCertificate */, \
-  0x0000000C /* RemoveTrustedRootCertificate */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=41)*/ \
+  /*   GeneratedCommandList (index=40)*/ \
   0x00000001 /* AttestationResponse */, \
   0x00000003 /* CertificateChainResponse */, \
   0x00000005 /* CSRResponse */, \
   0x00000008 /* NOCResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 0, Cluster: Group Key Management (server) */\
-  /*   AcceptedCommandList (index=46) */ \
+  /*   AcceptedCommandList (index=45) */ \
   0x00000000 /* KeySetWrite */, \
   0x00000001 /* KeySetRead */, \
   0x00000003 /* KeySetRemove */, \
   0x00000004 /* KeySetReadAllIndices */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=51)*/ \
+  /*   GeneratedCommandList (index=50)*/ \
   0x00000002 /* KeySetReadResponse */, \
   0x00000005 /* KeySetReadAllIndicesResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Identify (server) */\
-  /*   AcceptedCommandList (index=54) */ \
+  /*   AcceptedCommandList (index=53) */ \
   0x00000000 /* Identify */, \
   0x00000040 /* TriggerEffect */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=57) */ \
+  /*   AcceptedCommandList (index=56) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -676,14 +682,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=64)*/ \
+  /*   GeneratedCommandList (index=63)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 1, Cluster: Window Covering (server) */\
-  /*   AcceptedCommandList (index=69) */ \
+  /*   AcceptedCommandList (index=68) */ \
   0x00000000 /* UpOrOpen */, \
   0x00000001 /* DownOrClose */, \
   0x00000002 /* StopMotion */, \
@@ -693,7 +699,7 @@
   0x00000008 /* GoToTiltPercentage */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: Groups (server) */\
-  /*   AcceptedCommandList (index=77) */ \
+  /*   AcceptedCommandList (index=76) */ \
   0x00000000 /* AddGroup */, \
   0x00000001 /* ViewGroup */, \
   0x00000002 /* GetGroupMembership */, \
@@ -701,14 +707,14 @@
   0x00000004 /* RemoveAllGroups */, \
   0x00000005 /* AddGroupIfIdentifying */, \
   chip::kInvalidCommandId /* end of list */, \
-  /*   GeneratedCommandList (index=84)*/ \
+  /*   GeneratedCommandList (index=83)*/ \
   0x00000000 /* AddGroupResponse */, \
   0x00000001 /* ViewGroupResponse */, \
   0x00000002 /* GetGroupMembershipResponse */, \
   0x00000003 /* RemoveGroupResponse */, \
   chip::kInvalidCommandId /* end of list */, \
   /* Endpoint: 2, Cluster: Window Covering (server) */\
-  /*   AcceptedCommandList (index=89) */ \
+  /*   AcceptedCommandList (index=88) */ \
   0x00000000 /* UpOrOpen */, \
   0x00000001 /* DownOrClose */, \
   0x00000002 /* StopMotion */, \
@@ -851,39 +857,39 @@
       /* Endpoint: 0, Cluster: General Diagnostics (server) */ \
       .clusterId = 0x00000033,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(79), \
-      .attributeCount = 10, \
+      .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = nullptr ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
       .clusterId = 0x00000034,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(89), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(90), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
       .clusterId = 0x00000035,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(95), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(96), \
       .attributeCount = 65, \
-      .clusterSize = 247, \
+      .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
       .clusterId = 0x00000036,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(160), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(161), \
       .attributeCount = 15, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -894,18 +900,18 @@
   { \
       /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
       .clusterId = 0x00000037,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(175), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(176), \
       .attributeCount = 11, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\
+      .acceptedCommandList = nullptr ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
       .clusterId = 0x0000003C,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(186), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(187), \
       .attributeCount = 5, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -916,29 +922,29 @@
   { \
       /* Endpoint: 0, Cluster: Operational Credentials (server) */ \
       .clusterId = 0x0000003E,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(191), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(192), \
       .attributeCount = 8, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Group Key Management (server) */ \
       .clusterId = 0x0000003F,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(199), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(200), \
       .attributeCount = 6, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\
     },\
   { \
       /* Endpoint: 0, Cluster: Fixed Label (server) */ \
       .clusterId = 0x00000040,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(205), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(206), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -949,7 +955,7 @@
   { \
       /* Endpoint: 0, Cluster: User Label (server) */ \
       .clusterId = 0x00000041,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(208), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(209), \
       .attributeCount = 3, \
       .clusterSize = 6, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -960,29 +966,29 @@
   { \
       /* Endpoint: 1, Cluster: Identify (server) */ \
       .clusterId = 0x00000003,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(211), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(212), \
       .attributeCount = 4, \
       .clusterSize = 9, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayIdentifyServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(215), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(216), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\
     },\
   { \
       /* Endpoint: 1, Cluster: Scenes (client) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -993,7 +999,7 @@
   { \
       /* Endpoint: 1, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(218), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(219), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1004,29 +1010,29 @@
   { \
       /* Endpoint: 1, Cluster: Window Covering (server) */ \
       .clusterId = 0x00000102,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(224), \
-      .attributeCount = 20, \
-      .clusterSize = 35, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(225), \
+      .attributeCount = 24, \
+      .clusterSize = 43, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayWindowCoveringServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\
       .generatedCommandList = nullptr ,\
     },\
   { \
       /* Endpoint: 2, Cluster: Groups (server) */ \
       .clusterId = 0x00000004,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(244), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(249), \
       .attributeCount = 3, \
       .clusterSize = 7, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
       .functions = chipFuncArrayGroupsServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\
-      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\
+      .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\
     },\
   { \
       /* Endpoint: 2, Cluster: Scenes (client) */ \
       .clusterId = 0x00000005,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(247), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(252), \
       .attributeCount = 0, \
       .clusterSize = 0, \
       .mask = ZAP_CLUSTER_MASK(CLIENT), \
@@ -1037,7 +1043,7 @@
   { \
       /* Endpoint: 2, Cluster: Descriptor (server) */ \
       .clusterId = 0x0000001D,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(247), \
+      .attributes = ZAP_ATTRIBUTE_INDEX(252), \
       .attributeCount = 6, \
       .clusterSize = 4, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -1048,12 +1054,12 @@
   { \
       /* Endpoint: 2, Cluster: Window Covering (server) */ \
       .clusterId = 0x00000102,  \
-      .attributes = ZAP_ATTRIBUTE_INDEX(253), \
-      .attributeCount = 20, \
-      .clusterSize = 35, \
+      .attributes = ZAP_ATTRIBUTE_INDEX(258), \
+      .attributeCount = 24, \
+      .clusterSize = 43, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayWindowCoveringServer, \
-      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\
+      .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
       .generatedCommandList = nullptr ,\
     },\
 }
@@ -1067,7 +1073,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 21, 559 }, { ZAP_CLUSTER_INDEX(21), 5, 55 }, { ZAP_CLUSTER_INDEX(26), 4, 46 },                     \
+        { ZAP_CLUSTER_INDEX(0), 21, 318 }, { ZAP_CLUSTER_INDEX(21), 5, 63 }, { ZAP_CLUSTER_INDEX(26), 4, 54 },                     \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1079,7 +1085,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (41)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (660)
+#define ATTRIBUTE_MAX_SIZE (435)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (3)